[Antiright-devel] antiright lib/button.c lib/button.h lib/util.c ...

[Jeffrey Bedard]

CVSROOT:        /cvsroot/antiright
Module name:    antiright
Branch:         
Changes by:     Jeffrey Bedard <address@hidden> 04/12/22 02:46:55

Modified files:
        lib            : button.c button.h util.c util.h 
        src/arshell    : arguments.c arshell-util.c arshell.h layout.c 
                         layout.h 
        src/vdesk      : vdesk.c 

Log message:
        Pre-2.5 tree sync.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/lib/button.c.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/lib/button.h.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/lib/util.c.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/lib/util.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/src/arshell/arguments.c.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/src/arshell/arshell-util.c.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/src/arshell/arshell.h.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/src/arshell/layout.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/src/arshell/layout.h.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/src/vdesk/vdesk.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: antiright/lib/button.c
diff -u antiright/lib/button.c:1.8 antiright/lib/button.c:1.9
--- antiright/lib/button.c:1.8  Sun Aug 29 22:52:58 2004
+++ antiright/lib/button.c      Wed Dec 22 02:46:55 2004
@@ -46,6 +46,20 @@
                    client_data);
   return(button_widget);
 }
+Widget
+antiright_panel_button(Widget parent_widget, 
+                      char* name, 
+                      XtCallbackProc callback, 
+                      XtPointer client_data)
+{
+  Widget button_widget=antiright_button(parent_widget, name, 
+                                       callback, client_data);
+  ARCLARG;
+  antiright_set(XmNalignment, XmALIGNMENT_CENTER);
+  antiright_set_values(button_widget);
+  ARCLARG;
+  return(button_widget);                               
+}
 
 Widget
 antiright_icon_button(Widget parent_widget, 
Index: antiright/lib/button.h
diff -u antiright/lib/button.h:1.2 antiright/lib/button.h:1.3
--- antiright/lib/button.h:1.2  Sat Aug  7 17:13:41 2004
+++ antiright/lib/button.h      Wed Dec 22 02:46:55 2004
@@ -36,6 +36,11 @@
                 /address@hidden@*/
                 XtPointer client_data); /* This is the data passed to
                                            the callback.  */
+Widget
+antiright_panel_button(Widget parent_widget, 
+                      char* name, 
+                      XtCallbackProc callback, 
+                      XtPointer client_data);
 
 Widget
 antiright_icon_button(Widget parent_widget, 
Index: antiright/lib/util.c
diff -u antiright/lib/util.c:1.5 antiright/lib/util.c:1.6
--- antiright/lib/util.c:1.5    Fri Aug 13 18:11:37 2004
+++ antiright/lib/util.c        Wed Dec 22 02:46:55 2004
@@ -75,7 +75,6 @@
   char *text_string;
   char buffer[BUFSIZ];
   FILE *pipe_fp=popen(command_string, "r");
-  
   fgets(buffer, BUFSIZ, pipe_fp);
   asprintf(&text_string, "%s", buffer);
   while(fgets(buffer, BUFSIZ, pipe_fp))
@@ -83,6 +82,27 @@
   pclose(pipe_fp);
   return(text_string);
 }
+void
+antiright_pipe_write(char *command_string, char* data)
+{
+  FILE *pipe_fp=popen(command_string, "w");
+  fprintf(pipe_fp, data);
+  pclose(pipe_fp);
+}
+void
+antiright_fifo_server(char *command_string, char *fifo)
+{
+  FILE *fifo_fp;
+  FILE *pipe_fp=popen(command_string, "w");
+  char buffer[80];
+  while(1)
+    {
+      fifo_fp=fopen(fifo, "r");
+      fgets(buffer, 80, fifo_fp);
+      fprintf(pipe_fp, buffer);
+      fclose(fifo_fp);
+    }
+}
 
 /* Free the returned value!  */
 char*
Index: antiright/lib/util.h
diff -u antiright/lib/util.h:1.1 antiright/lib/util.h:1.2
--- antiright/lib/util.h:1.1    Fri Jul 23 23:19:41 2004
+++ antiright/lib/util.h        Wed Dec 22 02:46:55 2004
@@ -37,6 +37,15 @@
 char*
 antiright_pipe_read(char *command_string);
 
+/* This command pipes DATA into the command specified by
+   COMMAND_STRING.  */
+void
+antiright_pipe_write(char *command_string, char* data);
+
+/* This pipes FIFO into COMMAND.  */
+void
+antiright_fifo_server(char *command_string, char *fifo);
+
 /* This is the xmalloc function for AntiRight applications.  It
    verifies the allocation with an assertion.  */
 void *
Index: antiright/src/arshell/arguments.c
diff -u antiright/src/arshell/arguments.c:1.14 
antiright/src/arshell/arguments.c:1.15
--- antiright/src/arshell/arguments.c:1.14      Sun Dec 19 17:07:26 2004
+++ antiright/src/arshell/arguments.c   Wed Dec 22 02:46:55 2004
@@ -43,6 +43,9 @@
     case 'C': /* Add a color selector.  */
       arshell_color_widget(arshell.gui.widgets.row);
       break;
+    case 'c': /* Add a clockload applet.  */
+      arshell_clockload_applet(arshell.gui.widgets.row);
+      break;
     case 'D': /* Add a dialog.  */
       arshell_handle_dialog_arguments(counter_int, argv);
       break;
Index: antiright/src/arshell/arshell-util.c
diff -u antiright/src/arshell/arshell-util.c:1.7 
antiright/src/arshell/arshell-util.c:1.8
--- antiright/src/arshell/arshell-util.c:1.7    Sat Nov  6 22:52:12 2004
+++ antiright/src/arshell/arshell-util.c        Wed Dec 22 02:46:55 2004
@@ -69,10 +69,14 @@
          XtManageChild(parent_widget);
        }
     }
-  button_widget=antiright_button(parent_widget, command_string,
+  button_widget=antiright_panel_button(parent_widget, command_string,
                                        callback, command_string);
   antiright_set_tooltip(button_widget, command_string);
   arshell_beautify_label(button_widget, command_string);
+  ARCLARG;
+  antiright_set(XmNalignment, XmALIGNMENT_CENTER);
+  antiright_set_values(button_widget);
+  ARCLARG;
   return(button_widget);
 }
 
Index: antiright/src/arshell/arshell.h
diff -u antiright/src/arshell/arshell.h:1.14 
antiright/src/arshell/arshell.h:1.15
--- antiright/src/arshell/arshell.h:1.14        Sun Dec 19 17:08:03 2004
+++ antiright/src/arshell/arshell.h     Wed Dec 22 02:46:55 2004
@@ -36,6 +36,7 @@
 #include "file.h"
 #include "interface_file.h"
 #include "pixmap.h"
+#include "clockload.h"
 
 struct arshell_flags_struct
 {
@@ -67,6 +68,7 @@
   struct arshell_layout_struct layout;
   struct arshell_widgets_struct widgets;
   struct antiright_menubar_structure menubar;
+  struct arshell_clockload_struct clockload;
 };
 
 #ifndef ARSHELL_MAX_STRLEN
Index: antiright/src/arshell/layout.c
diff -u antiright/src/arshell/layout.c:1.3 antiright/src/arshell/layout.c:1.4
--- antiright/src/arshell/layout.c:1.3  Thu Dec 16 23:55:48 2004
+++ antiright/src/arshell/layout.c      Wed Dec 22 02:46:55 2004
@@ -97,3 +97,11 @@
   arshell.gui.layout.row_counter_int--;
 }
 
+void
+arshell_initialize_layout_values()
+{
+  arshell.gui.layout.row_manager_widget=NULL;
+  arshell.gui.layout.row_widget=NULL;
+  arshell.gui.layout.row_counter_int=0;
+  arshell.gui.layout.rows_int=8;
+}
Index: antiright/src/arshell/layout.h
diff -u antiright/src/arshell/layout.h:1.3 antiright/src/arshell/layout.h:1.4
--- antiright/src/arshell/layout.h:1.3  Thu Dec 16 23:55:48 2004
+++ antiright/src/arshell/layout.h      Wed Dec 22 02:46:55 2004
@@ -55,4 +55,7 @@
 void
 arshell_row_layout();
 
+void
+arshell_initialize_layout_values();
+
 #endif /* AR_LAYOUT_H  */
Index: antiright/src/vdesk/vdesk.c
diff -u antiright/src/vdesk/vdesk.c:1.1 antiright/src/vdesk/vdesk.c:1.2
--- antiright/src/vdesk/vdesk.c:1.1     Thu Jul  8 18:58:12 2004
+++ antiright/src/vdesk/vdesk.c Wed Dec 22 02:46:55 2004
@@ -70,9 +70,11 @@
 long 
 get_wm_state(Window w)
 {
-  Atom real_type; int real_format;
+  Atom real_type; 
+  int real_format;
   unsigned long items_read, items_left;
-  long *data, state = WithdrawnState;
+  long *data;
+  register long state = WithdrawnState;
 
   if (XGetWindowProperty(dpy, w, wm_state, 0L, 2L, False,
                         wm_state, &real_type, &real_format,