Enlightenment CVS committal

Author  : sebastid
Project : e17
Module  : apps/e

Dir     : e17/apps/e/src/bin


Modified Files:
        e_border.c e_border.h e_hints.c 


Log Message:
netwm

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -3 -r1.235 -r1.236
--- e_border.c  3 Jun 2005 11:41:19 -0000       1.235
+++ e_border.c  3 Jun 2005 12:23:34 -0000       1.236
@@ -355,6 +355,20 @@
                    {
                       bd->client.netwm.fetch.icon = 1;
                    }
+                 else if (atoms[i] == ECORE_X_ATOM_NET_WM_USER_TIME)
+                   {
+                      bd->client.netwm.fetch.user_time = 1;
+                   }
+                 else if (atoms[i] == ECORE_X_ATOM_NET_WM_STRUT)
+                   {
+                      printf("ECORE_X_ATOM_NET_WM_STRUT\n");
+                      bd->client.netwm.fetch.strut = 1;
+                   }
+                 else if (atoms[i] == ECORE_X_ATOM_NET_WM_STRUT_PARTIAL)
+                   {
+                      printf("ECORE_X_ATOM_NET_WM_STRUT_PARTIAL\n");
+                      bd->client.netwm.fetch.strut = 1;
+                   }
               }
             free(atoms);
          }
@@ -1971,6 +1985,21 @@
        bd->client.netwm.fetch.icon = 1;
        bd->changed = 1;
      }
+   else if (e->atom == ECORE_X_ATOM_NET_WM_USER_TIME)
+     {
+       bd->client.netwm.fetch.user_time = 1;
+       bd->changed = 1;
+     }
+   else if (e->atom == ECORE_X_ATOM_NET_WM_STRUT)
+     {
+       bd->client.netwm.fetch.strut = 1;
+       bd->changed = 1;
+     }
+   else if (e->atom == ECORE_X_ATOM_NET_WM_STRUT_PARTIAL)
+     {
+       bd->client.netwm.fetch.strut = 1;
+       bd->changed = 1;
+     }
    */
    return 1;
 }
@@ -2944,6 +2973,44 @@
          bd->changes.icon = 1;
        bd->client.netwm.fetch.icon = 0;
      }
+   if (bd->client.netwm.fetch.user_time)
+     {
+       ecore_x_netwm_user_time_get(bd->client.win, 
&bd->client.netwm.user_time);
+
+       bd->client.netwm.fetch.user_time = 0;
+     }
+   if (bd->client.netwm.fetch.strut)
+     {
+       if (!ecore_x_netwm_strut_partial_get(bd->client.win,
+                                            &bd->client.netwm.strut.left,
+                                            &bd->client.netwm.strut.right,
+                                            &bd->client.netwm.strut.top,
+                                            &bd->client.netwm.strut.bottom,
+                                            
&bd->client.netwm.strut.left_start_y,
+                                            &bd->client.netwm.strut.left_end_y,
+                                            
&bd->client.netwm.strut.right_start_y,
+                                            
&bd->client.netwm.strut.right_end_y,
+                                            
&bd->client.netwm.strut.top_start_x,
+                                            &bd->client.netwm.strut.top_end_x,
+                                            
&bd->client.netwm.strut.bottom_start_x,
+                                            
&bd->client.netwm.strut.bottom_end_x))
+         {
+            ecore_x_netwm_strut_get(bd->client.win,
+                                    &bd->client.netwm.strut.left, 
&bd->client.netwm.strut.right,
+                                    &bd->client.netwm.strut.top, 
&bd->client.netwm.strut.bottom);
+
+            bd->client.netwm.strut.left_start_y = 0;
+            bd->client.netwm.strut.left_end_y = 0;
+            bd->client.netwm.strut.right_start_y = 0;
+            bd->client.netwm.strut.right_end_y = 0;
+            bd->client.netwm.strut.top_start_x = 0;
+            bd->client.netwm.strut.top_end_x = 0;
+            bd->client.netwm.strut.bottom_start_x = 0;
+            bd->client.netwm.strut.bottom_end_x = 0;
+         }
+
+       bd->client.netwm.fetch.strut = 0;
+     }
    if (bd->changes.icon)
      {
        if (bd->icon_object)
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.h,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -3 -r1.65 -r1.66
--- e_border.h  3 Jun 2005 11:41:19 -0000       1.65
+++ e_border.h  3 Jun 2005 12:23:34 -0000       1.66
@@ -168,6 +168,21 @@
              int height;
              int size;
         } icon;
+        unsigned int user_time;
+        struct {
+             int left;
+             int right;
+             int top;
+             int bottom;
+             int left_start_y;
+             int left_end_y;
+             int right_start_y;
+             int right_end_y;
+             int top_start_x;
+             int top_end_x;
+             int bottom_start_x;
+             int bottom_end_x;
+        } strut;
 
         /* NetWM Window state */
         struct {
@@ -189,6 +204,8 @@
            unsigned char name : 1;
            unsigned char icon_name : 1;
            unsigned char icon : 1;
+           unsigned char user_time : 1;
+           unsigned char strut : 1;
            /* No, fetch on new_client, shouldn't be changed after map.
            unsigned char pid : 1;
            */
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_hints.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- e_hints.c   3 Jun 2005 06:43:23 -0000       1.41
+++ e_hints.c   3 Jun 2005 12:23:34 -0000       1.42
@@ -43,8 +43,6 @@
             ecore_x_netwm_supported(roots[i], ECORE_X_ATOM_NET_CLIENT_LIST, 1);
             ecore_x_netwm_supported(roots[i], 
ECORE_X_ATOM_NET_CLIENT_LIST_STACKING, 1);
 
-            ecore_x_netwm_supported(roots[i], 
ECORE_X_ATOM_NET_DESKTOP_GEOMETRY, 1);
-
             ecore_x_netwm_supported(roots[i], ECORE_X_ATOM_NET_FRAME_EXTENTS, 
1);
 
             ecore_x_netwm_supported(roots[i], ECORE_X_ATOM_NET_SUPPORTED, 1);
@@ -68,6 +66,10 @@
             ecore_x_netwm_supported(roots[i], ECORE_X_ATOM_NET_WM_STATE_ABOVE, 
1);
             ecore_x_netwm_supported(roots[i], ECORE_X_ATOM_NET_WM_STATE_BELOW, 
1);
 
+            ecore_x_netwm_supported(roots[i], ECORE_X_ATOM_NET_WM_STRUT, 1);
+            ecore_x_netwm_supported(roots[i], 
ECORE_X_ATOM_NET_WM_STRUT_PARTIAL, 1);
+
+            ecore_x_netwm_supported(roots[i], ECORE_X_ATOM_NET_WM_USER_TIME, 
1);
             ecore_x_netwm_supported(roots[i], 
ECORE_X_ATOM_NET_WM_VISIBLE_ICON_NAME, 1);
             ecore_x_netwm_supported(roots[i], 
ECORE_X_ATOM_NET_WM_VISIBLE_NAME, 1);
 
@@ -80,6 +82,7 @@
             ecore_x_netwm_supported(roots[i], 
ECORE_X_ATOM_NET_WM_WINDOW_TYPE_SPLASH, 1);
             ecore_x_netwm_supported(roots[i], 
ECORE_X_ATOM_NET_WM_WINDOW_TYPE_DIALOG, 1);
             ecore_x_netwm_supported(roots[i], 
ECORE_X_ATOM_NET_WM_WINDOW_TYPE_NORMAL, 1);
+            ecore_x_netwm_supported(roots[i], ECORE_X_ATOM_NET_WORKAREA, 1);
          }
         free(roots);
      }
@@ -108,7 +111,6 @@
 void
 e_hints_manager_init(E_Manager *man)
 {
-   ecore_x_netwm_desk_size_set(man->root, man->w, man->h);
    e_hints_e16_comms_pretend(man);
 }
 
@@ -1033,7 +1035,9 @@
        deskpos[1] = bd->desk->y;
        ecore_x_window_prop_card32_set(bd->client.win, E_ATOM_DESK, deskpos, 2);
 
+#if 0
        ecore_x_netwm_desktop_set(bd->client.win, current);
+#endif
        bd->client.netwm.desktop = current;
      }
 }




-------------------------------------------------------
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo!
Search APIs Find out how you can build Yahoo! directly into your own
Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to