Merge pull request #3101 from tpraxl/feature/workspace-variables

Add workspace vars to support DRY when customizing

diff --git a/docs/i3bar-protocol b/docs/i3bar-protocol
index 1a302587819347cff696c497725b3ad521647f79..cf86531cc5f399774e983770719245729693c17a 100644 (file)
--- a/docs/i3bar-protocol
+++ b/docs/i3bar-protocol
@@ -177,7 +177,8 @@ separator_block_width::
 markup::
        A string that indicates how the text of the block should be parsed. Set to
        +"pango"+ to use https://developer.gnome.org/pango/stable/PangoMarkupFormat.html[Pango markup].
-       Set to +"none"+ to not use any markup (default).
+       Set to +"none"+ to not use any markup (default). Pango markup only works
+       if you use a pango font.
 
 If you want to put in your own entries into a block, prefix the key with an
 underscore (_). i3bar will ignore all keys it doesn’t understand, and prefixing

diff --git a/src/floating.c b/src/floating.c
index e2e9d85afa3a8bffdc6e3b71ddaec985276edeb3..85bd8cc051370dc0f3d95f3922df50212425b1cb 100644 (file)
--- a/src/floating.c
+++ b/src/floating.c
@@ -747,8 +747,10 @@ static void xcb_drag_prepare_cb(EV_P_ ev_prepare *w, int revents) {
         if (last_motion_notify != (xcb_motion_notify_event_t *)event)
             free(event);
 
-        if (dragloop->result != DRAGGING)
+        if (dragloop->result != DRAGGING) {
+            free(last_motion_notify);
             return;
+        }
     }
 
     if (last_motion_notify == NULL)