From 974272ee4d206680791a21bc7ff94b7ecec6e4d2 Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Tue, 11 Aug 2009 11:14:32 +0200 Subject: [PATCH] awful.titlebar: replace hooks by signals Signed-off-by: Julien Danjou --- lib/awful/titlebar.lua.in | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/lib/awful/titlebar.lua.in b/lib/awful/titlebar.lua.in index 670d8b46..29cb9296 100644 --- a/lib/awful/titlebar.lua.in +++ b/lib/awful/titlebar.lua.in @@ -19,7 +19,6 @@ local capi = } local abutton = require("awful.button") local beautiful = require("beautiful") -local hooks = require("awful.hooks") local util = require("awful.util") local widget = require("awful.widget") local mouse = require("awful.mouse") @@ -124,24 +123,23 @@ function add(c, args) c.titlebar = tb + c:add_signal("property::icon", update) + c:add_signal("property::name", update) update(c) end --- Update a titlebar. This should be called in some hooks. -- @param c The client to update. -- @param prop The property name which has changed. -function update(c, prop) - if type(c) == "client" and c.titlebar and data[c] then +function update(c) + if c.titlebar and data[c] then local widgets = c.titlebar.widgets - if prop == "name" then - if widgets[2].title then - widgets[2].title.text = " ".. util.escape(c.name) .. " " - end - elseif prop == "icon" then - if widgets[2].appicon then - widgets[2].appicon.image = c.icon - end + if widgets[2].title then + widgets[2].title.text = " ".. util.escape(c.name) .. " " + end + if widgets[2].appicon then + widgets[2].appicon.image = c.icon end if capi.client.focus == c then c.titlebar.fg = data[c].fg_focus @@ -411,6 +409,5 @@ button_groups = { close_buttons, -- Register standards hooks capi.client.add_signal("focus", update) capi.client.add_signal("unfocus", update) -hooks.property.register(update) -- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80