[Antiright-devel] antiright ./Makefile.in ./configure lib/drawing...

[Jeffrey Bedard]

CVSROOT:        /cvsroot/antiright
Module name:    antiright
Branch:         
Changes by:     Jeffrey Bedard <address@hidden> 05/06/18 01:59:08

Modified files:
        .              : Makefile.in configure 
        lib            : drawing.c drawing.h graph.c library.c library.h 
        src/arshell    : arshell.c arshell.h main.c 
Added files:
        src/wmar       : wmar.c xutils.c xutils.h 

Log message:
        Added wmar slit utility.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/Makefile.in.diff?tr1=1.36&tr2=1.37&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/configure.diff?tr1=1.50&tr2=1.51&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/lib/drawing.c.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/lib/drawing.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/lib/graph.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/lib/library.c.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/lib/library.h.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/src/arshell/arshell.c.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/src/arshell/arshell.h.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/src/arshell/main.c.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/src/wmar/wmar.c?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/src/wmar/xutils.c?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/src/wmar/xutils.h?rev=1.1

Patches:
Index: antiright/Makefile.in
diff -u antiright/Makefile.in:1.36 antiright/Makefile.in:1.37
--- antiright/Makefile.in:1.36  Sat Jun  4 01:04:02 2005
+++ antiright/Makefile.in       Sat Jun 18 01:59:08 2005
@@ -25,7 +25,7 @@
 
 # The above line is where variables will be defined. 
 CFLAGS += $(INCLUDE) $(DEFS) -Wall -W -g
-programs=arshell arcd vdesk
+programs=arshell arcd vdesk afract wmar
 
 all: $(programs)
 
@@ -54,6 +54,16 @@
        $(CC) -o vdesk $(vdesk-objects) $(CFLAGS)\
        $(LIBDIR) -lX11
 
+afract-objects=src/afract/afract.o $(lib-objects)
+afract: $(afract-objects)
+       $(CC) -o afract $(afract-objects) $(CFLAGS)\
+       $(LIBDIR) $(LIBS)
+
+wmar-objects=src/wmar/wmar.o
+wmar: $(wmar-objects)
+       $(CC) -o wmar $(wmar-objects) $(CFLAGS)\
+       $(LIBDIR) -lX11
+
 clean:
        rm -f `find . | grep '.o$$'` $(programs)
 distclean: clean
Index: antiright/configure
diff -u antiright/configure:1.50 antiright/configure:1.51
--- antiright/configure:1.50    Sat Jan 22 20:11:01 2005
+++ antiright/configure Sat Jun 18 01:59:08 2005
@@ -24,7 +24,7 @@
 #
 ###############################################################################
 
-VERSION=2.7
+VERSION=2.8
 DEFS="$DEFS -DPACKAGE_STRING='\"AntiRight_$VERSION\"'"
 
 ICONDIR=/usr/X11R6/include/X11/bitmaps/antiright
Index: antiright/lib/drawing.c
diff -u antiright/lib/drawing.c:1.4 antiright/lib/drawing.c:1.5
--- antiright/lib/drawing.c:1.4 Wed Jun  1 22:06:43 2005
+++ antiright/lib/drawing.c     Sat Jun 18 01:59:08 2005
@@ -56,7 +56,7 @@
 }
 
 void
-antiright_draw_point(struct antiright_drawing_strcuture *drawing,
+antiright_draw_point(struct antiright_drawing_structure *drawing,
                     int x, int y)
 {
   XDrawPoint(XDRAWP, x, y);
@@ -148,3 +148,26 @@
   antiright_draw_allocate_color(drawing, &color);
   XSetForeground(drawing->display, drawing->gc, color.pixel);
 }
+void
+antiright_draw_background(struct antiright_drawing_structure *drawing,
+                         int red_int, int green_int, int blue_int)
+{
+  XColor color;
+  antiright_multiply_colors(&color, red_int, green_int, blue_int);
+  antiright_draw_allocate_color(drawing, &color);
+  XSetBackground(drawing->display, drawing->gc, color.pixel);
+}
+
+void
+antiright_widget_background(Widget widget,
+                           int red_int, int green_int, int blue_int)
+{
+  XColor color;
+  struct antiright_drawing_structure drawing;
+  antiright_drawing_initialize(widget, &drawing);
+  antiright_multiply_colors(&color, red_int, green_int, blue_int);
+  antiright_draw_allocate_color(&drawing, &color);
+  XtVaSetValues(antiright.graph.widget, 
+               XmNbackground, color.pixel, 
+               NULL);
+}
Index: antiright/lib/drawing.h
diff -u antiright/lib/drawing.h:1.1 antiright/lib/drawing.h:1.2
--- antiright/lib/drawing.h:1.1 Thu Jul  8 18:58:03 2004
+++ antiright/lib/drawing.h     Sat Jun 18 01:59:08 2005
@@ -39,6 +39,10 @@
 antiright_drawing_finish(struct antiright_drawing_structure *drawing);
 
 void
+antiright_draw_point(struct antiright_drawing_structure *drawing,
+                    int x, int y);
+
+void
 antiright_draw_line(struct antiright_drawing_structure *drawing,
                    int x1, int y1,
                    int x2, int y2);
@@ -73,3 +77,9 @@
 antiright_draw_foreground(struct antiright_drawing_structure *drawing,
                          int red_int, int green_int, int blue_int);
 
+void
+antiright_draw_background(struct antiright_drawing_structure *drawing,
+                         int red_int, int green_int, int blue_int);
+void
+antiright_widget_background(Widget widget,
+                           int red_int, int green_int, int blue_int);
Index: antiright/lib/graph.c
diff -u antiright/lib/graph.c:1.2 antiright/lib/graph.c:1.3
--- antiright/lib/graph.c:1.2   Sat Jun  4 01:08:17 2005
+++ antiright/lib/graph.c       Sat Jun 18 01:59:08 2005
@@ -240,9 +240,7 @@
 {
   antiright.graph.width=256;
   antiright.graph.height=256;
-  
-  
-  ARCLARG;
+
   antiright_set(XmNwidth, antiright.graph.width);
   antiright_set(XmNheight, antiright.graph.height);
   antiright.graph.widget=XmCreateDrawingArea(parent, "graph", 
Index: antiright/lib/library.c
diff -u antiright/lib/library.c:1.8 antiright/lib/library.c:1.9
--- antiright/lib/library.c:1.8 Fri Jan 21 22:36:30 2005
+++ antiright/lib/library.c     Sat Jun 18 01:59:08 2005
@@ -27,6 +27,55 @@
 /* This is a file in which newly implemented functionality is first
    implemented.  */
 
+void
+antiright_get_file_type(char *filename) 
+{ 
+  int counter;
+  int period_char;
+  int filename_length=strlen(filename);
+  Boolean has_period=False;
+  for(counter=filename_length; counter>0; counter--)
+    {
+      if(filename[counter]=='.')
+       {
+         has_period=True;
+         period_char=counter;
+         break;
+       }
+    }
+  if(has_period)
+    {
+      int extension_counter=0;
+      char extension[period_char];
+      for(counter=(filename_length-period_char); filename[counter]!='\0'; 
counter++)
+       {
+         extension[extension_counter]=filename[counter];
+         extension_counter++;
+       }
+      if(!strncmp("c", extension, period_char))
+       {
+         antiright.workfile_type=C;
+       }
+      else if(!strncmp("h", extension, period_char))
+       {
+         antiright.workfile_type=H;
+       }
+      else if(!strncmp("txt", extension, period_char))
+       {
+         antiright.workfile_type=TXT;
+       }
+      else if(!strncmp("sh", extension, period_char))
+       {
+         antiright.workfile_type=SH;
+       }
+      else
+       {
+         antiright.workfile_type=MISC;
+       }
+    }
+  else
+    antiright.workfile_type=MISC;
+}
 
 
 
Index: antiright/lib/library.h
diff -u antiright/lib/library.h:1.14 antiright/lib/library.h:1.15
--- antiright/lib/library.h:1.14        Mon Jan 24 16:07:55 2005
+++ antiright/lib/library.h     Sat Jun 18 01:59:08 2005
@@ -40,6 +40,7 @@
 #include "edit.h"
 #include "form.h"
 #include "frame.h"
+#include "graph.h"
 #include "help.h"
 #include "label.h"
 #include "list.h"
@@ -63,6 +64,10 @@
 #include <Xlt/FontChooser.h>
 #endif /* HAVE_XLT  */
 
+/* Here is an enumeration of various file types.  */
+enum {TXT,C,H,SH,MISC};
+
+/* Here is the main application structure.  */
 struct antiright_application_structure
 {
   /* This is the display on which antiright.parent_widget runs.  */
@@ -88,6 +93,10 @@
   /* This, if true, prints status messages containing client_data when
      a button is armed.  */
   Boolean arm_status;
+  /* This is the type of the file currently being worked on.  */
+  unsigned int workfile_type;
+  /* This is the graph structure used in plotting applications.  */
+  struct antiright_graph_struct graph;
 };
 
 /* This structure is used in all AntiRight programs.  */
@@ -120,5 +129,8 @@
 #define WARNING 1
 #define EALLOC 2
 
+void
+antiright_get_file_type(char *filename);
+
 #endif /* AR_LIBRARY_H */
 
Index: antiright/src/arshell/arshell.c
diff -u antiright/src/arshell/arshell.c:1.11 
antiright/src/arshell/arshell.c:1.12
--- antiright/src/arshell/arshell.c:1.11        Sat Feb 12 17:57:42 2005
+++ antiright/src/arshell/arshell.c     Sat Jun 18 01:59:08 2005
@@ -73,6 +73,13 @@
 arshell_place_arshell()
 {
   XtRealizeWidget(antiright.parent_widget);
+  if(arshell.use_graph)
+    {
+      antiright_set(XmNresizePolicy, XmRESIZE_NONE);
+      arshell.gui.widgets.work=
+       antiright_create_graph(arshell.gui.widgets.mainwindow);
+      arshell_setup_work_window();
+    }
   arshell_handle_panel_override();
   arshell_check_if_lowered();
 }
@@ -108,7 +115,6 @@
 {
   if(arshell.gui.widgets.work!=NULL)
     {
-      
       XtVaSetValues(arshell.gui.widgets.mainwindow,
                    XmNworkWindow, arshell.gui.widgets.work,
                    XmNcommandWindow, arshell.gui.widgets.row,
@@ -120,6 +126,14 @@
                    XmNworkWindow, arshell.gui.widgets.row,
                    NULL);
     }
+  if(arshell.use_graph)
+    {
+      
+      XtVaSetValues(antiright.parent_widget,
+                   XmNheight, antiright.graph.height+10,
+                   XmNwidth, antiright.graph.width+10,
+                   NULL);
+    }
 }
 
 void
Index: antiright/src/arshell/arshell.h
diff -u antiright/src/arshell/arshell.h:1.17 
antiright/src/arshell/arshell.h:1.18
--- antiright/src/arshell/arshell.h:1.17        Sat Feb 12 17:57:42 2005
+++ antiright/src/arshell/arshell.h     Sat Jun 18 01:59:08 2005
@@ -86,6 +86,7 @@
   XtIntervalId *timer_id;
   int update_frequency;
   Boolean transparency_hacked;
+  Boolean use_graph;
 };
 
 struct arshell_data_struct arshell;
Index: antiright/src/arshell/main.c
diff -u antiright/src/arshell/main.c:1.4 antiright/src/arshell/main.c:1.5
--- antiright/src/arshell/main.c:1.4    Sat Feb 12 17:57:42 2005
+++ antiright/src/arshell/main.c        Sat Jun 18 01:59:08 2005
@@ -31,8 +31,11 @@
   arshell_setup_mainwindow();
   arshell_setup_work_row();
   arshell_initialize_application_data();
+  ARBUG;
   arshell_handle_command_line_arguments(&argc, argv);
+  ARBUG;
   arshell_layout_mainwindow();
+  ARBUG;
   arshell_start_event_loop();
   return(0);
 }