[Antiright-devel] antiright ./Makefile.in lib/library.c src/arshe...

[Jeffrey Bedard]

CVSROOT:        /cvsroot/antiright
Module name:    antiright
Branch:         
Changes by:     Jeffrey Bedard <address@hidden> 04/11/06 22:52:12

Modified files:
        .              : Makefile.in 
        lib            : library.c 
        src/arshell    : arshell-util.c color.c interface_file.c 

Log message:
        Code cleanups and refactorings for 2.3 release.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/Makefile.in.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/lib/library.c.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/src/arshell/arshell-util.c.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/src/arshell/color.c.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/src/arshell/interface_file.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: antiright/Makefile.in
diff -u antiright/Makefile.in:1.29 antiright/Makefile.in:1.30
--- antiright/Makefile.in:1.29  Sun Sep  5 01:56:37 2004
+++ antiright/Makefile.in       Sat Nov  6 22:52:12 2004
@@ -26,6 +26,7 @@
 # The above line is where variables will be defined. 
 CFLAGS += $(INCLUDE) $(DEFS) -Wall -W -g -fno-strict-aliasing
 programs=arshell arcd vdesk
+
 all: $(programs)
 
 lib-objects=lib/button.o lib/drawing.o lib/edit.o lib/form.o lib/frame.o\
Index: antiright/lib/library.c
diff -u antiright/lib/library.c:1.6 antiright/lib/library.c:1.7
--- antiright/lib/library.c:1.6 Sun Aug 29 03:06:20 2004
+++ antiright/lib/library.c     Sat Nov  6 22:52:12 2004
@@ -32,8 +32,8 @@
 {
   XtUnmanageChild(widget);
   XtDestroyWidget(widget);
-  call_data=(XtPointer)NULL;
-  client_data=(XtPointer)NULL;
+  call_data=NULL;
+  client_data=NULL;
 }
 
 void
@@ -50,9 +50,8 @@
                     XtPointer call_data)
 {
   antiright_command((Widget)client_data);
-  
-  widget=(Widget)NULL;
-  call_data=(Widget)NULL;
+  widget=NULL;
+  call_data=NULL;
 }
 
 void 
@@ -67,8 +66,8 @@
                    XtPointer call_data)
 {
   antiright_system(client_data);
-  widget = (Widget)NULL;
-  call_data = (XtPointer)NULL;
+  widget=NULL;
+  call_data=NULL;
 }
 
 void 
@@ -86,16 +85,25 @@
   XmStringGetLtoR(motif_string, XmSTRING_DEFAULT_CHARSET, &c_string);
   return(c_string);
 }
-
+XmString
+antiright_motif_string(char *string)
+{
+  return(XmStringCreateLocalized(string));
+}
 void
-antiright_set_tooltip(Widget widget, char *tooltip_string)
+antiright_xmstring_resource(Widget widget, String name, char *string)
 {
-#ifdef XmNtoolTipString
-  XmString motif_string=XmStringCreateLocalized(tooltip_string);
+  XmString motif_string=antiright_motif_string(string);
   XtVaSetValues(widget,
-               XmNtoolTipString, motif_string,
+               name, motif_string,
                NULL);
   XmStringFree(motif_string);
+}
+void
+antiright_set_tooltip(Widget widget, char *tooltip_string)
+{
+#ifdef XmNtoolTipString
+  antiright_xmstring_resource(widget, XmNtoolTipString, tooltip_string);
 #else
   widget=NULL;
   tooltip_string=NULL;
Index: antiright/src/arshell/arshell-util.c
diff -u antiright/src/arshell/arshell-util.c:1.6 
antiright/src/arshell/arshell-util.c:1.7
--- antiright/src/arshell/arshell-util.c:1.6    Wed Aug 25 23:50:18 2004
+++ antiright/src/arshell/arshell-util.c        Sat Nov  6 22:52:12 2004
@@ -76,16 +76,22 @@
   return(button_widget);
 }
 
-Widget
-arshell_progress_bar(Widget parent)
+void
+arshell_set_progress_bar_arguments()
 {
-  Widget progress;
   antiright_set(XmNorientation, XmHORIZONTAL);
   antiright_set(XmNshowArrows, False);
   antiright_set(XmNmaximum, 100);
   antiright_set(XmNminimum, 0);
   antiright_set(XmNsliderSize, 1);
   antiright_set(XmNeditable, False);
+}
+
+Widget
+arshell_progress_bar(Widget parent)
+{
+  Widget progress;
+  arshell_set_progress_bar_arguments();
   progress=XmCreateScrollBar(parent, "progress", 
                             antiright.arguments, antiright.arguments_int);
   XtManageChild(progress);
Index: antiright/src/arshell/color.c
diff -u antiright/src/arshell/color.c:1.4 antiright/src/arshell/color.c:1.5
--- antiright/src/arshell/color.c:1.4   Sun Aug 29 02:57:51 2004
+++ antiright/src/arshell/color.c       Sat Nov  6 22:52:12 2004
@@ -82,25 +82,27 @@
   arcolor_update_preview();
 }
 
-Widget 
-arcolor_scale(Widget parent_widget, 
-             char *title_string)
+void
+arcolor_set_scale_resources()
 {
-  XmString title_motif_string;
-  Widget scale_widget;
-  
-  title_motif_string=
-    XmStringCreateLocalized(title_string);
+  ARCLARG;
   antiright_set(XmNorientation, XmHORIZONTAL);
   antiright_set(XmNmaximum, 255);
   antiright_set(XmNwidth, 255);
   antiright_set(XmNvalue, 0);
   antiright_set(XmNshowValue, True);
+}
+
+Widget 
+arcolor_scale(Widget parent_widget, 
+             char *title_string)
+{
+  Widget scale_widget;
+  XmString title_motif_string=XmStringCreateLocalized(title_string);
+  arcolor_set_scale_resources();
   antiright_set(XmNtitleString, (XtArgVal)title_motif_string);
-  scale_widget=XmCreateScale(parent_widget,
-                            "scale_widget",
-                            antiright.arguments,
-                            antiright.arguments_int);
+  scale_widget=XmCreateScale(parent_widget,"scale_widget",
+                            antiright.arguments, antiright.arguments_int);
   XmStringFree(title_motif_string);
   XtManageChild(scale_widget);
 
Index: antiright/src/arshell/interface_file.c
diff -u antiright/src/arshell/interface_file.c:1.2 
antiright/src/arshell/interface_file.c:1.3
--- antiright/src/arshell/interface_file.c:1.2  Sun Oct  3 01:47:10 2004
+++ antiright/src/arshell/interface_file.c      Sat Nov  6 22:52:12 2004
@@ -27,6 +27,8 @@
 arshell_interface_system_cb(Widget widget, XtPointer client_data,
                            XtPointer call_data)
 {
+  call_data=NULL;
+  client_data=NULL;
   antiright_system(widget->core.name);
 }
 
@@ -59,6 +61,7 @@
 int
 arshell_interface_status_cb(yacl_list *call_data)
 {
+  call_data=NULL;
   puts("status");
   antiright_create_status_bar(arshell.gui.widgets.mainwindow);
   return(0);
@@ -66,6 +69,7 @@
 int
 arshell_interface_menubar_cb(yacl_list *call_data)
 {
+  call_data=NULL;
   arshell_default_menubar_action();
   return(0);
 }
@@ -114,12 +118,14 @@
 int
 arshell_interface_color_cb(yacl_list *call_data)
 {
+  call_data=NULL;
   arshell_color_widget(arshell.gui.widgets.row);
   return(0);
 }
 int
 arshell_interface_work_cb(yacl_list *call_data)
 {
+  call_data=NULL;
   arshell_create_text_work_area();
   return(0);
 }