Workspace/WM/properties.c: rename functions.

trunkmaster · trunkmaster · commit 69239d35ee98 · 2026-01-21T17:39:13.000+02:00
diff --git a/Applications/Workspace/WM/application.c b/Applications/Workspace/WM/application.c
@@ -189,7 +189,7 @@ static WWindow *makeMainWindow(WScreen *scr, Window window)
   wwin->main_window = window;
   wwin->wm_hints = XGetWMHints(dpy, window);
 
-  PropGetWMClass(window, &wwin->wm_class, &wwin->wm_instance);
+  wPropertiesGetWMClass(window, &wwin->wm_class, &wwin->wm_instance);
   if (wwin->wm_class != NULL && strcmp(wwin->wm_class, "GNUstep") == 0)
     wwin->flags.is_gnustep = 1;
 
diff --git a/Applications/Workspace/WM/client.c b/Applications/Workspace/WM/client.c
@@ -549,7 +549,7 @@ void wClientCheckProperty(WWindow *wwin, XPropertyEvent *event)
 
     default:
       if (event->atom == w_global.atom.wm.protocols) {
-        PropGetProtocols(wwin->client_win, &wwin->protocols);
+        wPropGetProtocols(wwin->client_win, &wwin->protocols);
 
         // WM_TAKE_FOCUS
         if (wwin->protocols.TAKE_FOCUS)
@@ -612,7 +612,7 @@ void wClientCheckProperty(WWindow *wwin, XPropertyEvent *event)
         }
       } else if (event->atom == w_global.atom.gnustep.wm_attr) {
         GNUstepWMAttributes *attr;
-        if (PropGetGNUstepWMAttr(wwin->client_win, &attr) != False) {
+        if (wPropertiesGetGNUstepWMAttr(wwin->client_win, &attr) != False) {
           wWindowUpdateGNUstepAttr(wwin, attr);
           XFree(attr);
         }
@@ -643,7 +643,7 @@ void wClientGetNormalHints(WWindow *wwin, XWindowAttributes *wattribs, Bool geom
   if (!wwin->normal_hints)
     wwin->normal_hints = XAllocSizeHints();
 
-  if (!PropGetNormalHints(wwin->client_win, wwin->normal_hints, &pre_icccm)) {
+  if (!wPropertiesGetNormalHints(wwin->client_win, wwin->normal_hints, &pre_icccm)) {
     wwin->normal_hints->flags = 0;
   }
   *x = wattribs->x;
diff --git a/Applications/Workspace/WM/dock.c b/Applications/Workspace/WM/dock.c
@@ -3034,7 +3034,7 @@ void wDockTrackWindowLaunch(WDock *dock, Window window)
   Bool found = False;
   char *command = NULL;
 
-  if (!PropGetWMClass(window, &wm_class, &wm_instance)) {
+  if (!wPropertiesGetWMClass(window, &wm_class, &wm_instance)) {
     free(wm_class);
     free(wm_instance);
     return;
diff --git a/Applications/Workspace/WM/motif.c b/Applications/Workspace/WM/motif.c
@@ -169,7 +169,7 @@ static int getMWMHints(Window window, MWMHints *mwmhints)
   if (!_XA_MOTIF_WM_HINTS)
     _XA_MOTIF_WM_HINTS = XInternAtom(dpy, "_MOTIF_WM_HINTS", False);
 
-  data = (unsigned long *)PropGetCheckProperty(window, _XA_MOTIF_WM_HINTS, _XA_MOTIF_WM_HINTS, 32,
+  data = (unsigned long *)wPropertiesGetWindowProperty(window, _XA_MOTIF_WM_HINTS, _XA_MOTIF_WM_HINTS, 32,
                                                0, &count);
 
   if (!data)
diff --git a/Applications/Workspace/WM/properties.c b/Applications/Workspace/WM/properties.c
@@ -27,6 +27,7 @@
 #include <X11/Xatom.h>
 #include <string.h>
 #include <stdlib.h>
+#include <unistd.h>
 
 #include <core/util.h>
 #include <core/log_utils.h>
@@ -36,7 +37,7 @@
 #include "GNUstep.h"
 #include "properties.h"
 
-int PropGetNormalHints(Window window, XSizeHints *size_hints, int *pre_iccm)
+int wPropertiesGetNormalHints(Window window, XSizeHints *size_hints, int *pre_iccm)
 {
   long supplied_hints;
 
@@ -52,7 +53,7 @@ int PropGetNormalHints(Window window, XSizeHints *size_hints, int *pre_iccm)
   return True;
 }
 
-int PropGetWMClass(Window window, char **wm_class, char **wm_instance)
+int wPropertiesGetWMClass(Window window, char **wm_class, char **wm_instance)
 {
   XClassHint *class_hint;
 
@@ -73,7 +74,7 @@ int PropGetWMClass(Window window, char **wm_class, char **wm_instance)
   return True;
 }
 
-void PropGetProtocols(Window window, WProtocols *prots)
+void wPropGetProtocols(Window window, WProtocols *prots)
 {
   Atom *protocols;
   int count, i;
@@ -97,7 +98,7 @@ void PropGetProtocols(Window window, WProtocols *prots)
   XFree(protocols);
 }
 
-unsigned char *PropGetCheckProperty(Window window, Atom hint, Atom type, int format, int count,
+unsigned char *wPropertiesGetWindowProperty(Window window, Atom hint, Atom type, int format, int count,
                                     int *retCount)
 {
   Atom type_ret;
@@ -129,11 +130,11 @@ unsigned char *PropGetCheckProperty(Window window, Atom hint, Atom type, int for
   return data;
 }
 
-int PropGetGNUstepWMAttr(Window window, GNUstepWMAttributes **attr)
+int wPropertiesGetGNUstepWMAttr(Window window, GNUstepWMAttributes **attr)
 {
   unsigned long *data;
 
-  data = (unsigned long *)PropGetCheckProperty(window, w_global.atom.gnustep.wm_attr,
+  data = (unsigned long *)wPropertiesGetWindowProperty(window, w_global.atom.gnustep.wm_attr,
                                                w_global.atom.gnustep.wm_attr, 32, 9, NULL);
 
   if (!data)
@@ -159,23 +160,25 @@ int PropGetGNUstepWMAttr(Window window, GNUstepWMAttributes **attr)
   return True;
 }
 
-void PropSetWMakerProtocols(Window root)
+void wPropertiesSetWMakerProtocols(Window root)
 {
-  Atom protocols[3];
+  // Atom protocols[3];
+  Atom protocols[1];
   int count = 0;
 
-  protocols[count++] = w_global.atom.wmaker.menu;
+  // protocols[count++] = w_global.atom.wmaker.menu;
+  // protocols[count++] = w_global.atom.wmaker.noticeboard;
   protocols[count++] = w_global.atom.wmaker.wm_function;
-  protocols[count++] = w_global.atom.wmaker.noticeboard;
 
   XChangeProperty(dpy, root, w_global.atom.wmaker.wm_protocols, XA_ATOM, 32, PropModeReplace,
                   (unsigned char *)protocols, count);
 }
 
-void PropSetWMName(WScreen *scr, char *name, char *class)
+void wPropertiesSetWMName(WScreen *scr, char *name, char *class)
 {
   static Atom wm_name_atom = 0;
   static Atom wm_class_atom = 0;
+  static Atom wm_pid_atom = 0;
   
   if (scr->info_window == None)
     return;
@@ -186,6 +189,12 @@ void PropSetWMName(WScreen *scr, char *name, char *class)
   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));
+  wm_pid_atom = XInternAtom(dpy, "_NET_WM_PID", False);
+
+  unsigned long pid = getpid();
+  CFLog(kCFLogLevelInfo, CFSTR("WorkspaceManager PID: %i"), pid);
+  XChangeProperty(dpy, scr->info_window, wm_pid_atom, XA_CARDINAL, 32, PropModeReplace,
+                  (unsigned char *)&pid, 1L);
 }
 
 #if 0
@@ -239,12 +248,12 @@ void PropSetIconTileHint(WScreen *scr, RImage *image)
 }
 #endif
 
-Window PropGetClientLeader(Window window)
+Window wPropertiesGetClientLeader(Window window)
 {
   Window *win;
   Window leader;
 
-  win = (Window *)PropGetCheckProperty(window, w_global.atom.wm.client_leader, XA_WINDOW, 32, 1,
+  win = (Window *)wPropertiesGetWindowProperty(window, w_global.atom.wm.client_leader, XA_WINDOW, 32, 1,
                                        NULL);
 
   if (!win)
@@ -256,12 +265,12 @@ Window PropGetClientLeader(Window window)
   return leader;
 }
 
-int PropGetWindowState(Window window)
+int wPropertiesGetWindowState(Window window)
 {
   long *data;
   long state;
 
-  data = (long *)PropGetCheckProperty(window, w_global.atom.wm.state, w_global.atom.wm.state, 32, 1,
+  data = (long *)wPropertiesGetWindowProperty(window, w_global.atom.wm.state, w_global.atom.wm.state, 32, 1,
                                       NULL);
 
   if (!data)
@@ -273,9 +282,9 @@ int PropGetWindowState(Window window)
   return state;
 }
 
-void PropCleanUp(Window root)
+void wPropertiesCleanUp(Window root)
 {
+  // XDeleteProperty(dpy, root, w_global.atom.wmaker.noticeboard);
   XDeleteProperty(dpy, root, w_global.atom.wmaker.wm_protocols);
-  XDeleteProperty(dpy, root, w_global.atom.wmaker.noticeboard);
   XDeleteProperty(dpy, root, XA_WM_ICON_SIZE);
 }
diff --git a/Applications/Workspace/WM/properties.h b/Applications/Workspace/WM/properties.h
@@ -27,21 +27,21 @@
 #include "GNUstep.h"
 #include "window.h"
 
-unsigned char *PropGetCheckProperty(Window window, Atom hint, Atom type, int format, int count,
+unsigned char *wPropertiesGetWindowProperty(Window window, Atom hint, Atom type, int format, int count,
                                     int *retCount);
 
-int PropGetWindowState(Window window);
+int wPropertiesGetWindowState(Window window);
 
-int PropGetNormalHints(Window window, XSizeHints *size_hints, int *pre_iccm);
-void PropGetProtocols(Window window, WProtocols *prots);
-int PropGetWMClass(Window window, char **wm_class, char **wm_instance);
-int PropGetGNUstepWMAttr(Window window, GNUstepWMAttributes **attr);
+int wPropertiesGetNormalHints(Window window, XSizeHints *size_hints, int *pre_iccm);
+void wPropGetProtocols(Window window, WProtocols *prots);
+int wPropertiesGetWMClass(Window window, char **wm_class, char **wm_instance);
+int wPropertiesGetGNUstepWMAttr(Window window, GNUstepWMAttributes **attr);
 
-void PropSetWMakerProtocols(Window root);
-void PropCleanUp(Window root);
-void PropSetWMName(WScreen *scr, char *name, char *class);
+void wPropertiesSetWMakerProtocols(Window root);
+void wPropertiesCleanUp(Window root);
+void wPropertiesSetWMName(WScreen *scr, char *name, char *class);
 // void PropSetIconTileHint(WScreen *scr, RImage *image);
 
-Window PropGetClientLeader(Window window);
+Window wPropertiesGetClientLeader(Window window);
 
 #endif /* __WORKSPACE_WM_PROPERTIES__ */
diff --git a/Applications/Workspace/WM/screen.c b/Applications/Workspace/WM/screen.c
@@ -254,7 +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");
+  wPropertiesSetWMName(scr, "WorkspaceManager", "NextSpace");
 
 #ifdef USE_ICCCM_WMREPLACE
   /* Try to acquire the selection */
@@ -837,13 +837,13 @@ WScreen *wScreenInit(int screen_number)
   XSetIconSizes(dpy, scr->root_win, icon_size, 1);
 
   /* setup WM protocols property in the root window */
-  PropSetWMakerProtocols(scr->root_win);
+  wPropertiesSetWMakerProtocols(scr->root_win);
 
   /* setup our noticeboard */
-  XChangeProperty(dpy, scr->info_window, w_global.atom.wmaker.noticeboard, XA_WINDOW, 32,
-                  PropModeReplace, (unsigned char *)&scr->info_window, 1);
-  XChangeProperty(dpy, scr->root_win, w_global.atom.wmaker.noticeboard, XA_WINDOW, 32,
-                  PropModeReplace, (unsigned char *)&scr->info_window, 1);
+  // XChangeProperty(dpy, scr->info_window, w_global.atom.wmaker.noticeboard, XA_WINDOW, 32,
+  //                 PropModeReplace, (unsigned char *)&scr->info_window, 1);
+  // XChangeProperty(dpy, scr->root_win, w_global.atom.wmaker.noticeboard, XA_WINDOW, 32,
+  //                 PropModeReplace, (unsigned char *)&scr->info_window, 1);
 
 #ifdef BALLOON_TEXT
   /* initialize balloon text stuff */
diff --git a/Applications/Workspace/WM/session.c b/Applications/Workspace/WM/session.c
@@ -171,7 +171,7 @@ static CFTypeRef makeWindowState(WWindow *wwin, WApplication *wapp)
   if (!command)
     return NULL;
 
-  if (PropGetWMClass(win, &class, &instance)) {
+  if (wPropertiesGetWMClass(win, &class, &instance)) {
     if (class && instance) {
       name = CFStringCreateWithFormat(kCFAllocatorDefault, 0, CFSTR("%s.%s"), instance, class);
     } else if (instance) {
diff --git a/Applications/Workspace/WM/shutdown.c b/Applications/Workspace/WM/shutdown.c
@@ -112,7 +112,7 @@ void wShutdown(WMShutdownMode mode)
 
       wScreenSaveState(scr);
       wNETWMCleanup(scr);         /* Delete _NET_* Atoms */
-      PropCleanUp(scr->root_win); /* WM specific properties */
+      wPropertiesCleanUp(scr->root_win); /* WM specific properties */
       XDeleteProperty(dpy, scr->root_win, XInternAtom(dpy, "_XROOTPMAP_ID", False));
       RShutdown();                /* wraster clean exit */
 #if HAVE_SYSLOG_H
@@ -187,7 +187,7 @@ void wRestoreDesktop(WScreen *scr)
   XUngrabServer(dpy);
   XSetInputFocus(dpy, PointerRoot, RevertToParent, CurrentTime);
   wColormapInstallForWindow(scr, NULL);
-  PropCleanUp(scr->root_win);
+  wPropertiesCleanUp(scr->root_win);
   wNETWMCleanup(scr);
   XSync(dpy, 0);
 }
diff --git a/Applications/Workspace/WM/startup.c b/Applications/Workspace/WM/startup.c
@@ -460,7 +460,7 @@ static void _initializeAtoms(void)
   w_global.atom.wmaker.state = XInternAtom(dpy, "_WINDOWMAKER_STATE", False);
   w_global.atom.wmaker.wm_protocols = XInternAtom(dpy, "_WINDOWMAKER_WM_PROTOCOLS", False);
   w_global.atom.wmaker.wm_function = XInternAtom(dpy, "_WINDOWMAKER_WM_FUNCTION", False);
-  w_global.atom.wmaker.noticeboard = XInternAtom(dpy, "_WINDOWMAKER_NOTICEBOARD", False);
+  // w_global.atom.wmaker.noticeboard = XInternAtom(dpy, "_WINDOWMAKER_NOTICEBOARD", False);
   w_global.atom.wmaker.command = XInternAtom(dpy, "_WINDOWMAKER_COMMAND", False);
   w_global.atom.wmaker.icon_size = XInternAtom(dpy, "_WINDOWMAKER_ICON_SIZE", False);
   w_global.atom.wmaker.icon_tile = XInternAtom(dpy, "_WINDOWMAKER_ICON_TILE", False);
diff --git a/Applications/Workspace/WM/window.c b/Applications/Workspace/WM/window.c
@@ -644,7 +644,7 @@ WWindow *wManageWindow(WScreen *scr, Window window)
     return NULL;
   }
 
-  wm_state = PropGetWindowState(window);
+  wm_state = wPropertiesGetWindowState(window);
 
   /* if it's startup and the window is unmapped, don't manage it */
   if (scr->flags.startup && wm_state < 0 && wattribs.map_state == IsUnmapped) {
@@ -676,7 +676,7 @@ WWindow *wManageWindow(WScreen *scr, Window window)
 #endif
 
   /* Get hints and other information in properties */
-  PropGetWMClass(window, &wwin->wm_class, &wwin->wm_instance);
+  wPropertiesGetWMClass(window, &wwin->wm_class, &wwin->wm_instance);
 
   /* setup descriptor */
   wwin->client_win = window;
@@ -694,15 +694,15 @@ WWindow *wManageWindow(WScreen *scr, Window window)
   if (wwin->wm_class != NULL && strcmp(wwin->wm_class, "GNUstep") == 0)
     wwin->flags.is_gnustep = 1;
 
-  if (!PropGetGNUstepWMAttr(window, &wwin->wm_gnustep_attr))
+  if (!wPropertiesGetGNUstepWMAttr(window, &wwin->wm_gnustep_attr))
     wwin->wm_gnustep_attr = NULL;
 
   if (wwin->wm_class != NULL && strcmp(wwin->wm_class, "DockApp") == 0) {
     wwin->flags.is_dockapp = 1;
     withdraw = True;
   }
 
-  wwin->client_leader = PropGetClientLeader(window);
+  wwin->client_leader = wPropertiesGetClientLeader(window);
   if (wwin->client_leader != None)
     wwin->main_window = wwin->client_leader;
 
@@ -734,7 +734,7 @@ WWindow *wManageWindow(WScreen *scr, Window window)
     wwin->group_id = None;
   }
 
-  PropGetProtocols(window, &wwin->protocols);
+  wPropGetProtocols(window, &wwin->protocols);
 
   if (!XGetTransientForHint(dpy, window, &wwin->transient_for)) {
     wwin->transient_for = None;
@@ -797,8 +797,8 @@ WWindow *wManageWindow(WScreen *scr, Window window)
 
 #define ADEQUATE(x) ((x) != None && (x) != wwin->client_win && (x) != fPtr->leader)
 
-    /* // only enter here if PropGetWMClass() succeds */
-    PropGetWMClass(wwin->main_window, &class, &instance);
+    /* // only enter here if wPropertiesGetWMClass() succeds */
+    wPropertiesGetWMClass(wwin->main_window, &class, &instance);
     buffer = wstrconcatdot(instance, class);
 
     for (CFIndex i = 0; i < CFArrayGetCount(scr->fakeGroupLeaders); i++) {
@@ -2705,7 +2705,7 @@ WMagicNumber wWindowGetSavedState(Window win)
   if (!command)
     return NULL;
 
-  if (PropGetWMClass(win, &class, &instance)) {
+  if (wPropertiesGetWMClass(win, &class, &instance)) {
     while (wstate) {
       if (is_same(instance, wstate->instance) && is_same(class, wstate->class) &&
           is_same(command, wstate->command)) {
diff --git a/Applications/Workspace/WM/wmspec.c b/Applications/Workspace/WM/wmspec.c
@@ -394,7 +394,7 @@ int wNETWMGetCurrentDesktopFromHint(WScreen *scr)
   int count;
   unsigned char *prop;
 
-  prop = PropGetCheckProperty(scr->root_win, net_current_desktop, XA_CARDINAL, 0, 1, &count);
+  prop = wPropertiesGetWindowProperty(scr->root_win, net_current_desktop, XA_CARDINAL, 0, 1, &count);
   if (prop) {
     int desktop = *(long *)prop;
     XFree(prop);
@@ -1790,7 +1790,7 @@ char *wNETWMGetWindowName(Window window)
   char *ret;
   int size;
 
-  name = (char *)PropGetCheckProperty(window, net_wm_name, utf8_string, 0, 0, &size);
+  name = (char *)wPropertiesGetWindowProperty(window, net_wm_name, utf8_string, 0, 0, &size);
   if (name) {
     ret = wstrndup(name, size);
     XFree(name);
@@ -1807,7 +1807,7 @@ char *wNETWMGetIconName(Window window)
   char *ret;
   int size;
 
-  name = (char *)PropGetCheckProperty(window, net_wm_icon_name, utf8_string, 0, 0, &size);
+  name = (char *)wPropertiesGetWindowProperty(window, net_wm_icon_name, utf8_string, 0, 0, &size);
   if (name) {
     ret = wstrndup(name, size);
     XFree(name);
@@ -1824,7 +1824,7 @@ void wNETRequestFrameExtents(Window window, WScreen *scr)
   GNUstepWMAttributes *gs_attrs;
   Bool has_border = False, has_titlebar = False, has_resizebar = False;
 
-  if (!PropGetGNUstepWMAttr(window, &gs_attrs)) {
+  if (!wPropertiesGetGNUstepWMAttr(window, &gs_attrs)) {
     Atom type_ret;
     int fmt_ret;
     unsigned long nitems_ret, bytes_after_ret;
