blackbox

Update of /cvsroot/blackboxwm/blackbox/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13100

Modified Files:
	Screen.cc 
Log Message:
EWMH compliance: we do not support _NET_DESKTOP_GEOMETRY, so we
shouldn't advertise it.  However, even though we don't support it, the
spec says we should set _NET_DESKTOP_GEOMETRY and
_NET_DESKTOP_VIEWPORT to the size of the desktop and 0,0
(respectively)



Index: Screen.cc
===================================================================
RCS file: /cvsroot/blackboxwm/blackbox/src/Screen.cc,v
retrieving revision 1.231
retrieving revision 1.232
diff -C2 -d -r1.231 -r1.232
*** Screen.cc	5 Feb 2004 07:29:05 -0000	1.231
--- Screen.cc	9 Feb 2004 11:47:53 -0000	1.232
***************
*** 165,183 ****
    netwm.setDesktopGeometry(screen_info.rootWindow(),
                             screen_info.width(), screen_info.height());
    netwm.setActiveWindow(screen_info.rootWindow(), None);
    updateWorkareaHint();
    updateDesktopNamesHint();
  
!   Atom supported[46] = {
      netwm.clientList(),
      netwm.clientListStacking(),
      netwm.numberOfDesktops(),
!     netwm.desktopGeometry(),
      netwm.currentDesktop(),
      netwm.desktopNames(),
      netwm.activeWindow(),
      netwm.workarea(),
      netwm.closeWindow(),
      netwm.moveresizeWindow(),
      netwm.wmName(),
      netwm.wmVisibleName(),
--- 165,190 ----
    netwm.setDesktopGeometry(screen_info.rootWindow(),
                             screen_info.width(), screen_info.height());
+   netwm.setDesktopViewport(screen_info.rootWindow(), 0, 0);
    netwm.setActiveWindow(screen_info.rootWindow(), None);
    updateWorkareaHint();
    updateDesktopNamesHint();
  
!   Atom supported[] = {
      netwm.clientList(),
      netwm.clientListStacking(),
      netwm.numberOfDesktops(),
!     // _NET_DESKTOP_GEOMETRY is not supported
!     // _NET_DESKTOP_VIEWPORT is not supported
      netwm.currentDesktop(),
      netwm.desktopNames(),
      netwm.activeWindow(),
      netwm.workarea(),
+     // _NET_VIRTUAL_ROOTS   is not supported
+     // _NET_SHOWING_DESKTOP is not supported
+ 
      netwm.closeWindow(),
      netwm.moveresizeWindow(),
+     // _NET_WM_MOVERESIZE is not supported
+ 
      netwm.wmName(),
      netwm.wmVisibleName(),
***************
*** 185,188 ****
--- 192,196 ----
      netwm.wmVisibleIconName(),
      netwm.wmDesktop(),
+ 
      netwm.wmWindowType(),
      netwm.wmWindowTypeDesktop(),
***************
*** 194,200 ****
      netwm.wmWindowTypeDialog(),
      netwm.wmWindowTypeNormal(),
      netwm.wmState(),
      netwm.wmStateModal(),
!     /* sticky would go here, but we do not need it */
      netwm.wmStateMaximizedVert(),
      netwm.wmStateMaximizedHorz(),
--- 202,209 ----
      netwm.wmWindowTypeDialog(),
      netwm.wmWindowTypeNormal(),
+ 
      netwm.wmState(),
      netwm.wmStateModal(),
!     // _NET_WM_STATE_STICKY is not supported
      netwm.wmStateMaximizedVert(),
      netwm.wmStateMaximizedHorz(),
***************
*** 206,209 ****
--- 215,219 ----
      netwm.wmStateAbove(),
      netwm.wmStateBelow(),
+ 
      netwm.wmAllowedActions(),
      netwm.wmActionMove(),
***************
*** 211,214 ****
--- 221,225 ----
      netwm.wmActionMinimize(),
      netwm.wmActionShade(),
+     // _NET_WM_ACTION_STICK is not supported
      netwm.wmActionMaximizeHorz(),
      netwm.wmActionMaximizeVert(),
***************
*** 216,223 ****
      netwm.wmActionChangeDesktop(),
      netwm.wmActionClose(),
      netwm.wmStrut()
    };
  
!   netwm.setSupported(screen_info.rootWindow(), supported, 46);
  
    unsigned int i, j, nchild;
--- 227,244 ----
      netwm.wmActionChangeDesktop(),
      netwm.wmActionClose(),
+ 
      netwm.wmStrut()
+     // _NET_WM_STRUT_PARTIAL is not supported
+     // _NET_WM_ICON_GEOMETRY is not supported
+     // _NET_WM_ICON          is not supported
+     // _NET_WM_PID           is not supported
+     // _NET_WM_HANDLED_ICONS is not supported
+     // _NET_WM_USER_TIME     is not supported
+ 
+     // _NET_WM_PING          is not supported
    };
  
!   netwm.setSupported(screen_info.rootWindow(), supported,
!                      sizeof(supported) / sizeof(Atom));
  
    unsigned int i, j, nchild;
***************
*** 296,310 ****
                                     blackbox->netwm().supportingWMCheck());
    blackbox->netwm().removeProperty(screen_info.rootWindow(),
!                                     blackbox->netwm().supported());
    blackbox->netwm().removeProperty(screen_info.rootWindow(),
!                                     blackbox->netwm().numberOfDesktops());
    blackbox->netwm().removeProperty(screen_info.rootWindow(),
!                                     blackbox->netwm().desktopGeometry());
    blackbox->netwm().removeProperty(screen_info.rootWindow(),
!                                     blackbox->netwm().currentDesktop());
    blackbox->netwm().removeProperty(screen_info.rootWindow(),
!                                     blackbox->netwm().activeWindow());
    blackbox->netwm().removeProperty(screen_info.rootWindow(),
!                                     blackbox->netwm().workarea());
  }
  
--- 317,333 ----
                                     blackbox->netwm().supportingWMCheck());
    blackbox->netwm().removeProperty(screen_info.rootWindow(),
!                                    blackbox->netwm().supported());
    blackbox->netwm().removeProperty(screen_info.rootWindow(),
!                                    blackbox->netwm().numberOfDesktops());
    blackbox->netwm().removeProperty(screen_info.rootWindow(),
!                                    blackbox->netwm().desktopGeometry());
    blackbox->netwm().removeProperty(screen_info.rootWindow(),
!                                    blackbox->netwm().desktopViewport());
    blackbox->netwm().removeProperty(screen_info.rootWindow(),
!                                    blackbox->netwm().currentDesktop());
    blackbox->netwm().removeProperty(screen_info.rootWindow(),
!                                    blackbox->netwm().activeWindow());
!   blackbox->netwm().removeProperty(screen_info.rootWindow(),
!                                    blackbox->netwm().workarea());
  }