Merge branch 'release-4.16.1'

[i3/i3] / src / window.c

diff --git a/src/window.c b/src/window.c
index 764cfca5a98267a2f6ae8467aebd9a6d025b66d3..6128255686942f80b74f491a22fb296ef1d47da6 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -1,5 +1,3 @@
-#undef I3__FILE__
-#define I3__FILE__ "window.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *
@@ -11,6 +9,18 @@
  */
 #include "all.h"
 
+/*
+ * Frees an i3Window and all its members.
+ *
+ */
+void window_free(i3Window *win) {
+    FREE(win->class_class);
+    FREE(win->class_instance);
+    i3string_free(win->name);
+    FREE(win->ran_assignments);
+    FREE(win);
+}
+
 /*
  * Updates the WM_CLASS (consisting of the class and instance) for the
  * given window.
@@ -64,8 +74,19 @@ void window_update_name(i3Window *win, xcb_get_property_reply_t *prop, bool befo
     }
 
     i3string_free(win->name);
-    win->name = i3string_from_utf8_with_length(xcb_get_property_value(prop),
-                                               xcb_get_property_value_length(prop));
+
+    /* Truncate the name at the first zero byte. See #3515. */
+    const int len = xcb_get_property_value_length(prop);
+    char *name = sstrndup(xcb_get_property_value(prop), len);
+    win->name = i3string_from_utf8(name);
+    free(name);
+
+    Con *con = con_by_window_id(win->id);
+    if (con != NULL && con->title_format != NULL) {
+        i3String *name = con_parse_title_format(con);
+        ewmh_update_visible_name(win->id, i3string_as_utf8(name));
+        I3STRING_FREE(name);
+    }
     win->name_x_changed = true;
     LOG("_NET_WM_NAME changed to \"%s\"\n", i3string_as_utf8(win->name));
 
@@ -102,8 +123,17 @@ void window_update_name_legacy(i3Window *win, xcb_get_property_reply_t *prop, bo
     }
 
     i3string_free(win->name);
-    win->name = i3string_from_utf8_with_length(xcb_get_property_value(prop),
-                                               xcb_get_property_value_length(prop));
+    const int len = xcb_get_property_value_length(prop);
+    char *name = sstrndup(xcb_get_property_value(prop), len);
+    win->name = i3string_from_utf8(name);
+    free(name);
+
+    Con *con = con_by_window_id(win->id);
+    if (con != NULL && con->title_format != NULL) {
+        i3String *name = con_parse_title_format(con);
+        ewmh_update_visible_name(win->id, i3string_as_utf8(name));
+        I3STRING_FREE(name);
+    }
 
     LOG("WM_NAME changed to \"%s\"\n", i3string_as_utf8(win->name));
     LOG("Using legacy window title. Note that in order to get Unicode window "
@@ -230,6 +260,7 @@ void window_update_role(i3Window *win, xcb_get_property_reply_t *prop, bool befo
  */
 void window_update_type(i3Window *window, xcb_get_property_reply_t *reply) {
     xcb_atom_t new_type = xcb_get_preferred_window_type(reply);
+    free(reply);
     if (new_type == XCB_NONE) {
         DLOG("cannot read _NET_WM_WINDOW_TYPE from window.\n");
         return;
@@ -291,8 +322,11 @@ void window_update_motif_hints(i3Window *win, xcb_get_property_reply_t *prop, bo
      * documentation of this hint is nowhere to be found.
      * For more information see:
      * https://people.gnome.org/~tthurman/docs/metacity/xprops_8h-source.html
-     * http://stackoverflow.com/questions/13787553/detect-if-a-x11-window-has-decorations
+     * https://stackoverflow.com/questions/13787553/detect-if-a-x11-window-has-decorations
      */
+#define MWM_HINTS_FLAGS_FIELD 0
+#define MWM_HINTS_DECORATIONS_FIELD 2
+
 #define MWM_HINTS_DECORATIONS (1 << 1)
 #define MWM_DECOR_ALL (1 << 0)
 #define MWM_DECOR_BORDER (1 << 1)
@@ -306,17 +340,23 @@ void window_update_motif_hints(i3Window *win, xcb_get_property_reply_t *prop, bo
         return;
     }
 
-    /* The property consists of an array of 5 uint64_t's. The first value is a bit
-     * mask of what properties the hint will specify. We are only interested in
-     * MWM_HINTS_DECORATIONS because it indicates that the second value of the
+    /* The property consists of an array of 5 uint32_t's. The first value is a
+     * bit mask of what properties the hint will specify. We are only interested
+     * in MWM_HINTS_DECORATIONS because it indicates that the third value of the
      * array tells us which decorations the window should have, each flag being
-     * a particular decoration. */
-    uint64_t *motif_hints = (uint64_t *)xcb_get_property_value(prop);
-
-    if (motif_border_style != NULL && motif_hints[0] & MWM_HINTS_DECORATIONS) {
-        if (motif_hints[1] & MWM_DECOR_ALL || motif_hints[1] & MWM_DECOR_TITLE)
+     * a particular decoration. Notice that X11 (Xlib) often mentions 32-bit
+     * fields which in reality are implemented using unsigned long variables
+     * (64-bits long on amd64 for example). On the other hand,
+     * xcb_get_property_value() behaves strictly according to documentation,
+     * i.e. returns 32-bit data fields. */
+    uint32_t *motif_hints = (uint32_t *)xcb_get_property_value(prop);
+
+    if (motif_border_style != NULL &&
+        motif_hints[MWM_HINTS_FLAGS_FIELD] & MWM_HINTS_DECORATIONS) {
+        if (motif_hints[MWM_HINTS_DECORATIONS_FIELD] & MWM_DECOR_ALL ||
+            motif_hints[MWM_HINTS_DECORATIONS_FIELD] & MWM_DECOR_TITLE)
             *motif_border_style = BS_NORMAL;
-        else if (motif_hints[1] & MWM_DECOR_BORDER)
+        else if (motif_hints[MWM_HINTS_DECORATIONS_FIELD] & MWM_DECOR_BORDER)
             *motif_border_style = BS_PIXEL;
         else
             *motif_border_style = BS_NONE;
@@ -324,6 +364,8 @@ void window_update_motif_hints(i3Window *win, xcb_get_property_reply_t *prop, bo
 
     FREE(prop);
 
+#undef MWM_HINTS_FLAGS_FIELD
+#undef MWM_HINTS_DECORATIONS_FIELD
 #undef MWM_HINTS_DECORATIONS
 #undef MWM_DECOR_ALL
 #undef MWM_DECOR_BORDER