Merge branch 'awesomeWM:master' into FeZoli-patch-1

Author: FeZoli

lib/awful/menu.lua

@@ -108,7 +108,7 @@ menu.menu_keys = { up = { "Up", "k" },
               down = { "Down", "j" },
               back = { "Left", "h" },
               exec = { "Return" },
-              enter = { "Right", "l" },
+              enter = { "Right", "l", "KP_Enter" },
               close = { "Escape" } }
 
 

lib/gears/string.lua

@@ -87,6 +87,7 @@ function gstring.query_to_pattern(q)
     return s
 end
 
+
 --- Split separates a string containing a delimiter into the list of
 -- substrings between that delimiter.
 -- @tparam string str String to be splitted
@@ -110,6 +111,33 @@ function gstring.split(str, delimiter)
     return result
 end
 
+
+--- Pattern split separates a string by a pattern to the table of substrings.
+-- @tparam string str String to be splitted
+-- @tparam string[opt="\n"] pattern Pattern the target string will
+--   be splitted by.
+-- @treturn table A list of substrings.
+-- @staticfct gears.string.split
+function gstring.psplit(str, pattern)
+    pattern = pattern or "\n"
+    local result = {}
+    if #pattern == 0 then
+        for index = 1, #str do
+            result[#result+1] = str:sub(index, index)
+        end
+        return result
+    end
+    local pos = 1
+    for match in str:gmatch(pattern) do
+        local start_pos, end_pos = str:find(match, pos, true)
+        result[#result+1] = str:sub(pos, start_pos-1)
+        pos = end_pos+1
+    end
+    result[#result+1] = str:sub(pos, #str)
+    return result
+end
+
+
 --- Check if a string starts with another string.
 -- @DOC_text_gears_string_startswith_EXAMPLE@
 -- @tparam string str String to search

lib/naughty/dbus.lua

@@ -69,6 +69,9 @@ local function sendNotificationClosed(notificationId, reason)
     if reason <= 0 then
         reason = cst.notification_closed_reason.undefined
     end
+    if reason == cst.notification_closed_reason.dismissed_by_user then
+        sendActionInvoked(notificationId, "default")
+    end
     if bus_connection then
         bus_connection:emit_signal(nil, "/org/freedesktop/Notifications",
         "org.freedesktop.Notifications", "NotificationClosed",

objects/drawable.c

@@ -141,10 +141,10 @@ drawable_set_geometry(lua_State *L, int didx, area_t geom)
     area_t old = d->geometry;
     d->geometry = geom;
 
-    bool size_changed = (old.width != geom.width) || (old.height != geom.height);
-    if (size_changed)
+    bool area_changed = !AREA_EQUAL(old, geom);
+    if (area_changed)
         drawable_unset_surface(d);
-    if (size_changed && geom.width > 0 && geom.height > 0)
+    if (area_changed && geom.width > 0 && geom.height > 0)
     {
         d->pixmap = xcb_generate_id(globalconf.connection);
         xcb_create_pixmap(globalconf.connection, globalconf.default_depth, d->pixmap,
@@ -155,7 +155,7 @@ drawable_set_geometry(lua_State *L, int didx, area_t geom)
         luaA_object_emit_signal(L, didx, "property::surface", 0);
     }
 
-    if (!AREA_EQUAL(old, geom))
+    if (area_changed)
         luaA_object_emit_signal(L, didx, "property::geometry", 0);
     if (old.x != geom.x)
         luaA_object_emit_signal(L, didx, "property::x", 0);

spec/gears/string_spec.lua

@@ -57,6 +57,20 @@ describe("gears.string", function()
         assert.is_same(gstring.split("foo.", "."), {"foo", ""})
         assert.is_same(gstring.split("foo.bar", "."), {"foo", "bar"})
     end)
+
+    describe("psplit", function()
+        assert.is_same(gstring.psplit("", ""), {})
+        assert.is_same(gstring.psplit(".", ""), {"."})
+        assert.is_same(gstring.psplit("foo", ""), {"f", "o", "o"})
+        assert.is_same(gstring.psplit("foo.", ""), {"f", "o", "o", "."})
+        assert.is_same(gstring.psplit("foo.bar", "%."), {"foo", "bar"})
+
+        assert.is_same(gstring.psplit("", "."), {""})
+        assert.is_same(gstring.psplit("a", "."), {"", ""})
+        assert.is_same(gstring.psplit("foo", "."), {"", "", "", ""})
+        assert.is_same(gstring.psplit("foo.", "%W"), {"foo", ""})
+        assert.is_same(gstring.psplit(".foo.2.5.bar.73", "%.%d"), {".foo", "", ".bar", "3"})
+    end)
 end)
 
 -- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80