[Antiright-devel] antiright ACE-desktop/guidl/Horizontal_Deskbar....

[Jeffrey Bedard]

CVSROOT:        /sources/antiright
Module name:    antiright
Changes by:     Jeffrey Bedard <jefbed> 07/08/05 02:18:17

Modified files:
        ACE-desktop/guidl: Horizontal_Deskbar.gdl 
        xshell         : arguments.c button.c decoration.c 

Log message:
        Fixed conflicts with local changes.  

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/guidl/Horizontal_Deskbar.gdl?cvsroot=antiright&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/antiright/xshell/arguments.c?cvsroot=antiright&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/antiright/xshell/button.c?cvsroot=antiright&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/antiright/xshell/decoration.c?cvsroot=antiright&r1=1.3&r2=1.4

Patches:
Index: ACE-desktop/guidl/Horizontal_Deskbar.gdl
===================================================================
RCS file: 
/sources/antiright/antiright/ACE-desktop/guidl/Horizontal_Deskbar.gdl,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- ACE-desktop/guidl/Horizontal_Deskbar.gdl    2 Aug 2007 18:57:02 -0000       
1.24
+++ ACE-desktop/guidl/Horizontal_Deskbar.gdl    5 Aug 2007 02:18:16 -0000       
1.25
@@ -87,8 +87,6 @@
        ::ACE -A Command & # Run...,gtk-execute::\n
        ::ACE & # ACE_Panel,ACE_32.png::\n
        ::ACE -A Lock,gtk-dialog-authentication";
-//add "separator";
-add button "ACE -A Command ,gtk-execute";
 
 // command prompt
 // The embedded command prompt cannot be used when the undecorated option
@@ -98,6 +96,7 @@
 // For unlabeled items, the space between the item command and the comma allows
 // for a blank label.
 add buttons 
+       "ACE -A Command # Command ,gtk-execute"
        "ACE Lock ,gtk-dialog-authentication",
        "ACE Terminal ,Terminal_32.png",
        "ACE File_Manager ,gtk-open",
@@ -107,6 +106,7 @@
        "ACE Sticky_Note ,Sticky_Note_32.png",
        "ACE Screen ,Screen_32.png",
        "ACE System_Monitor ,System_Monitor_32.png";
+
 add "clock applet";
 
 // Uncomment the following if you want a custom command updated each

Index: xshell/arguments.c
===================================================================
RCS file: /sources/antiright/antiright/xshell/arguments.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- xshell/arguments.c  3 Aug 2007 20:24:30 -0000       1.4
+++ xshell/arguments.c  5 Aug 2007 02:18:16 -0000       1.5
@@ -113,6 +113,38 @@
 }
 
 static void
+set_override_redirect(XShell * xsh)
+{
+       XSetWindowAttributes attr;
+
+       attr.override_redirect=True;
+       XUnmapWindow(xsh->gui.display, xsh->gui.widgets->window);
+       XChangeWindowAttributes(xsh->gui.display, xsh->gui.widgets->window,
+               CWOverrideRedirect, &attr);
+       XMapRaised(xsh->gui.display, xsh->gui.widgets->window);
+}
+
+static void
+parse_geometry_string(XShell * xsh, const char * geometry)
+{
+       unsigned int plus_ind=0;
+       size_t len;
+       char * x;
+       char * y;
+
+       len=strlen(geometry);
+       while(geometry[plus_ind++]!='+' && (plus_ind<len));
+       x=(char *)geometry;
+       x[plus_ind-1]='\0';
+       y=&(x[plus_ind]);
+       xsh->gui.widgets->geometry.x=atoi(x);
+       xsh->gui.widgets->geometry.y=atoi(y);
+#ifdef DEBUG
+       printf("x:%s,y:%s\n", x, y);
+#endif /* DEBUG */
+}
+
+static void
 handle_options(XShell * xsh, int argc, char ** argv, unsigned int * counter)
 {
        switch(argv[*counter][1])

Index: xshell/button.c
===================================================================
RCS file: /sources/antiright/antiright/xshell/button.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- xshell/button.c     23 Jul 2007 01:58:46 -0000      1.2
+++ xshell/button.c     5 Aug 2007 02:18:17 -0000       1.3
@@ -39,9 +39,14 @@
 expose(XWidget * button)
 {
 #ifdef XSH_DECORATE
+       if(button->events.button_press)
        xsh_decorate(button, XSH_DECOR_OUT);
 #endif /* XSH_DECORATE */
        draw_label((XShell *)(button->xsh), button);
+       if(!button->events.button_press)
+       {
+               
+       }
 }
 
 static void

Index: xshell/decoration.c
===================================================================
RCS file: /sources/antiright/antiright/xshell/decoration.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- xshell/decoration.c 22 Jul 2007 21:54:10 -0000      1.3
+++ xshell/decoration.c 5 Aug 2007 02:18:17 -0000       1.4
@@ -25,7 +25,6 @@
 
 #define GRADIENT_DELTA 16
 
-
 static GC
 setup_gc(Display * display, Window window)
 {