Enlightenment CVS committal

Author  : kwo
Project : e16
Module  : e

Dir     : e16/e/src


Modified Files:
        ewmh.c gnome.c 


Log Message:
Shuffle some functions around.

===================================================================
RCS file: /cvs/e/e16/e/src/ewmh.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -3 -r1.113 -r1.114
--- ewmh.c      15 Apr 2007 14:34:46 -0000      1.113
+++ ewmh.c      15 Apr 2007 14:39:07 -0000      1.114
@@ -847,72 +847,6 @@
 }
 
 void
-EWMH_ProcessRootClientMessage(XClientMessageEvent * ev)
-{
-   if (ev->message_type == ECORE_X_ATOM_NET_CURRENT_DESKTOP)
-     {
-       DeskGotoNum(ev->data.l[0]);
-       goto done;
-     }
-   else if (ev->message_type == ECORE_X_ATOM_NET_DESKTOP_VIEWPORT)
-     {
-       DeskCurrentGotoArea(ev->data.l[0] / VRoot.w, ev->data.l[1] / VRoot.h);
-       goto done;
-     }
-   else if (ev->message_type == ECORE_X_ATOM_NET_SHOWING_DESKTOP)
-     {
-       EwinsShowDesktop(ev->data.l[0]);
-       goto done;
-     }
-#if 0                          /* These messages are sent to dedicated window 
*/
-   else if (ev->message_type == ECORE_X_ATOM_NET_STARTUP_INFO_BEGIN)
-     {
-       Eprintf("ECORE_X_ATOM_NET_STARTUP_INFO_BEGIN: %lx: %s\n",
-               ev->window, (char *)ev->data.l);
-       goto done;
-     }
-   else if (ev->message_type == ECORE_X_ATOM_NET_STARTUP_INFO)
-     {
-       Eprintf("ECORE_X_ATOM_NET_STARTUP_INFO      : %lx: %s\n",
-               ev->window, (char *)ev->data.l);
-       goto done;
-     }
-#endif
-
-#if 0                          /* Obsolete? */
-   EWin               *ewin;
-
-   ewin = EwinFindByClient(ev->window);
-   if (ewin == NULL)
-     {
-       /* Some misbehaving clients go here */
-       if (ev->message_type == ECORE_X_ATOM_NET_WM_DESKTOP)
-         {
-            ecore_x_netwm_desktop_set(ev->window, ev->data.l[0]);
-         }
-       else if (ev->message_type == ECORE_X_ATOM_NET_WM_STATE)
-         {
-            ecore_x_window_prop_atom_list_change(ev->window,
-                                                 ECORE_X_ATOM_NET_WM_STATE,
-                                                 ev->data.l[1], ev->data.l[0]);
-            if (ev->data.l[2] ==
-                (long)ECORE_X_ATOM_NET_WM_STATE_MAXIMIZED_HORZ ||
-                ev->data.l[2] ==
-                (long)ECORE_X_ATOM_NET_WM_STATE_MAXIMIZED_VERT)
-               ecore_x_window_prop_atom_list_change(ev->window,
-                                                    ECORE_X_ATOM_NET_WM_STATE,
-                                                    ev->data.l[2],
-                                                    ev->data.l[0]);
-         }
-       goto done;
-     }
-#endif
-
- done:
-   ;
-}
-
-void
 EWMH_ProcessClientClientMessage(EWin * ewin, XClientMessageEvent * ev)
 {
    int                 source;
@@ -1100,6 +1034,72 @@
 /*     source = OPSRC(ev->data.l[0]); */
        /* FIXME - Implement */
      }
+
+ done:
+   ;
+}
+
+void
+EWMH_ProcessRootClientMessage(XClientMessageEvent * ev)
+{
+   if (ev->message_type == ECORE_X_ATOM_NET_CURRENT_DESKTOP)
+     {
+       DeskGotoNum(ev->data.l[0]);
+       goto done;
+     }
+   else if (ev->message_type == ECORE_X_ATOM_NET_DESKTOP_VIEWPORT)
+     {
+       DeskCurrentGotoArea(ev->data.l[0] / VRoot.w, ev->data.l[1] / VRoot.h);
+       goto done;
+     }
+   else if (ev->message_type == ECORE_X_ATOM_NET_SHOWING_DESKTOP)
+     {
+       EwinsShowDesktop(ev->data.l[0]);
+       goto done;
+     }
+#if 0                          /* These messages are sent to dedicated window 
*/
+   else if (ev->message_type == ECORE_X_ATOM_NET_STARTUP_INFO_BEGIN)
+     {
+       Eprintf("ECORE_X_ATOM_NET_STARTUP_INFO_BEGIN: %lx: %s\n",
+               ev->window, (char *)ev->data.l);
+       goto done;
+     }
+   else if (ev->message_type == ECORE_X_ATOM_NET_STARTUP_INFO)
+     {
+       Eprintf("ECORE_X_ATOM_NET_STARTUP_INFO      : %lx: %s\n",
+               ev->window, (char *)ev->data.l);
+       goto done;
+     }
+#endif
+
+#if 0                          /* Obsolete? */
+   EWin               *ewin;
+
+   ewin = EwinFindByClient(ev->window);
+   if (ewin == NULL)
+     {
+       /* Some misbehaving clients go here */
+       if (ev->message_type == ECORE_X_ATOM_NET_WM_DESKTOP)
+         {
+            ecore_x_netwm_desktop_set(ev->window, ev->data.l[0]);
+         }
+       else if (ev->message_type == ECORE_X_ATOM_NET_WM_STATE)
+         {
+            ecore_x_window_prop_atom_list_change(ev->window,
+                                                 ECORE_X_ATOM_NET_WM_STATE,
+                                                 ev->data.l[1], ev->data.l[0]);
+            if (ev->data.l[2] ==
+                (long)ECORE_X_ATOM_NET_WM_STATE_MAXIMIZED_HORZ ||
+                ev->data.l[2] ==
+                (long)ECORE_X_ATOM_NET_WM_STATE_MAXIMIZED_VERT)
+               ecore_x_window_prop_atom_list_change(ev->window,
+                                                    ECORE_X_ATOM_NET_WM_STATE,
+                                                    ev->data.l[2],
+                                                    ev->data.l[0]);
+         }
+       goto done;
+     }
+#endif
 
  done:
    ;
===================================================================
RCS file: /cvs/e/e16/e/src/gnome.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -3 -r1.70 -r1.71
--- gnome.c     15 Apr 2007 14:34:46 -0000      1.70
+++ gnome.c     15 Apr 2007 14:39:07 -0000      1.71
@@ -751,28 +751,6 @@
 }
 
 void
-GNOME_ProcessRootClientMessage(XClientMessageEvent * event)
-{
-   static Atom         a2 = 0, a3 = 0;
-
-   if (!a2)
-      a2 = XInternAtom(disp, "_WIN_AREA", False);
-   if (!a3)
-      a3 = XInternAtom(disp, "_WIN_WORKSPACE", False);
-
-   if (event->message_type == a2)
-     {
-       DeskCurrentGotoArea(event->data.l[0], event->data.l[1]);
-       return;
-     }
-   if (event->message_type == a3)
-     {
-       DeskGotoNum(event->data.l[0]);
-       return;
-     }
-}
-
-void
 GNOME_ProcessClientClientMessage(EWin * ewin, XClientMessageEvent * event)
 {
    static Atom         a4 = 0, a5 = 0;
@@ -820,6 +798,28 @@
                         (event->data.l[1] & WIN_STATE_SHADED) != 0);
          }
        HintsSetWindowState(ewin);
+       return;
+     }
+}
+
+void
+GNOME_ProcessRootClientMessage(XClientMessageEvent * event)
+{
+   static Atom         a2 = 0, a3 = 0;
+
+   if (!a2)
+      a2 = XInternAtom(disp, "_WIN_AREA", False);
+   if (!a3)
+      a3 = XInternAtom(disp, "_WIN_WORKSPACE", False);
+
+   if (event->message_type == a2)
+     {
+       DeskCurrentGotoArea(event->data.l[0], event->data.l[1]);
+       return;
+     }
+   if (event->message_type == a3)
+     {
+       DeskGotoNum(event->data.l[0]);
        return;
      }
 }



-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to