Workspace/WM: setting _NET_WM_NAME and WM_CLASS for window manager's properties.

Author: trunkmaster

Applications/Workspace/WM/defaults.c

@@ -2446,7 +2446,7 @@ static int setIconTile(WScreen * scr, WDefaultEntry * entry, void *tdata, void *
   scr->icon_tile = img;
 
   /* put the icon in the noticeboard hint */
-  PropSetIconTileHint(scr, img);
+  // PropSetIconTileHint(scr, img);
 
   if (!wPreferences.flags.noclip || wPreferences.flags.clip_merged_in_dock) {
     if (scr->clip_tile) {
@@ -2513,14 +2513,14 @@ static int setMiniwindowTile(WScreen *scr, WDefaultEntry *entry, void *tdata, vo
   scr->miniwindow_tile = img;
 
   /* put the icon in the noticeboard hint */
-  /* PropSetIconTileHint(scr, img); */
+  // PropSetIconTileHint(scr, img);
 
-  /* scr->icon_tile_pixmap = pixmap; */
+  // scr->icon_tile_pixmap = pixmap;
 
   /* icon back color for shadowing */
-  /*  if (scr->icon_back_texture)
-      wTextureDestroy(scr, (WTexture *) scr->icon_back_texture);
-      scr->icon_back_texture = wTextureMakeSolid(scr, &((*texture)->any.color));*/
+  // if (scr->icon_back_texture)
+  //   wTextureDestroy(scr, (WTexture *)scr->icon_back_texture);
+  // scr->icon_back_texture = wTextureMakeSolid(scr, &((*texture)->any.color));
 
   /* Free the texture as nobody else will use it, nor refer to it.  */
   if (!entry->addr)

Applications/Workspace/WM/properties.c

@@ -172,6 +172,23 @@ void PropSetWMakerProtocols(Window root)
                   (unsigned char *)protocols, count);
 }
 
+void PropSetWMName(WScreen *scr, char *name, char *class)
+{
+  static Atom wm_name_atom = 0;
+  static Atom wm_class_atom = 0;
+  
+  if (scr->info_window == None)
+    return;
+
+  wm_name_atom = XInternAtom(dpy, "_NET_WM_NAME", False);
+  XChangeProperty(dpy, scr->info_window, wm_name_atom, XA_STRING, 8, PropModeReplace,
+                  (unsigned char *)name, strlen(name));
+  wm_class_atom = XInternAtom(dpy, "WM_CLASS", False);
+  XChangeProperty(dpy, scr->info_window, wm_class_atom, XA_STRING, 8, PropModeReplace,
+                  (unsigned char *)class, strlen(class));
+}
+
+#if 0
 void PropSetIconTileHint(WScreen *scr, RImage *image)
 {
   static Atom imageAtom = 0;
@@ -220,6 +237,7 @@ void PropSetIconTileHint(WScreen *scr, RImage *image)
                   PropModeReplace, tmp, image->width * image->height * 4 + 4);
   wfree(tmp);
 }
+#endif
 
 Window PropGetClientLeader(Window window)
 {

Applications/Workspace/WM/properties.h

@@ -39,7 +39,8 @@ int PropGetGNUstepWMAttr(Window window, GNUstepWMAttributes **attr);
 
 void PropSetWMakerProtocols(Window root);
 void PropCleanUp(Window root);
-void PropSetIconTileHint(WScreen *scr, RImage *image);
+void PropSetWMName(WScreen *scr, char *name, char *class);
+// void PropSetIconTileHint(WScreen *scr, RImage *image);
 
 Window PropGetClientLeader(Window window);
 

Applications/Workspace/WM/screen.c

@@ -254,6 +254,7 @@ static Bool replace_existing_wm(WScreen *scr)
 
   /* for our window manager info notice board and the selection owner */
   scr->info_window = XCreateSimpleWindow(dpy, scr->root_win, 0, 0, 10, 10, 0, 0, 0);
+  PropSetWMName(scr, "WorkspaceManager", "NextSpace");
 
 #ifdef USE_ICCCM_WMREPLACE
   /* Try to acquire the selection */