Fix setting of window property strings to use actual number of

[spectrwm] / scrotwm.c

diff --git a/scrotwm.c b/scrotwm.c
index 3f9c3bd0dad64b9cb19fb8a53e640621f0fe4ef7..cd8b68a3535118b240e9631aed16cbf6b515730e 100644 (file)
--- a/scrotwm.c
+++ b/scrotwm.c
@@ -119,15 +119,15 @@ static const char *buildstr = SCROTWM_VERSION;
 #ifdef SWM_DEBUG
 #define DPRINTF(x...)          do { if (swm_debug) fprintf(stderr, x); } while (0)
 #define DNPRINTF(n,x...)       do { if (swm_debug & n) fprintf(stderr, x); } while (0)
-#define        SWM_D_MISC              0x0001
-#define        SWM_D_EVENT             0x0002
-#define        SWM_D_WS                0x0004
-#define        SWM_D_FOCUS             0x0008
-#define        SWM_D_MOVE              0x0010
-#define        SWM_D_STACK             0x0020
-#define        SWM_D_MOUSE             0x0040
-#define        SWM_D_PROP              0x0080
-#define        SWM_D_CLASS             0x0100
+#define SWM_D_MISC             0x0001
+#define SWM_D_EVENT            0x0002
+#define SWM_D_WS               0x0004
+#define SWM_D_FOCUS            0x0008
+#define SWM_D_MOVE             0x0010
+#define SWM_D_STACK            0x0020
+#define SWM_D_MOUSE            0x0040
+#define SWM_D_PROP             0x0080
+#define SWM_D_CLASS            0x0100
 #define SWM_D_KEY              0x0200
 #define SWM_D_QUIRK            0x0400
 #define SWM_D_SPAWN            0x0800
@@ -1317,7 +1317,7 @@ bar_print(struct swm_region *r, char *s)
                x = SWM_BAR_OFFSET;
 
        DRAWSTRING(display, r->bar_window, bar_fs, r->s->bar_gc,
-           x, (bar_fs_extents->max_logical_extent.height - lbox.height) / 2 - 
+           x, (bar_fs_extents->max_logical_extent.height - lbox.height) / 2 -
            lbox.y, s, len);
 }
 
@@ -3280,7 +3280,7 @@ send_to_ws(struct swm_region *r, union arg *args)
                DNPRINTF(SWM_D_PROP, "send_to_ws: set property: _SWM_WS: %s\n",
                    ws_idx_str);
                XChangeProperty(display, win->id, ws_idx_atom, XA_STRING, 8,
-                   PropModeReplace, ws_idx_str, SWM_PROPLEN);
+                   PropModeReplace, ws_idx_str, strlen((char *)ws_idx_str));
        }
 
        stack();
@@ -3973,7 +3973,7 @@ resize(struct ws_win *win, union arg *args)
                        }
 
                        /* horizontal */
-                       if (left) 
+                       if (left)
                                dx = -dx;
 
                        if (args->id == SWM_ARG_ID_CENTER) {
@@ -5878,7 +5878,7 @@ manage_window(Window id)
                DNPRINTF(SWM_D_PROP, "manage_window: set _SWM_WS: %s\n",
                    ws_idx_str);
                XChangeProperty(display, win->id, ws_idx_atom, XA_STRING, 8,
-                   PropModeReplace, ws_idx_str, SWM_PROPLEN);
+                   PropModeReplace, ws_idx_str, strlen((char *)ws_idx_str));
        }
        if (prop)
                XFree(prop);