Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

client: use atom name to update title 

Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Julien Danjou 2008-07-08 08:42:39 +02:00
parent 63b0457fc4
commit 1d64f8231c
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
client.c
View File

@ -147,16 +147,17 @@ client_getbywin(xcb_window_t w)
/** Update client name attribute with its new title. /** Update client name attribute with its new title.
* \param c The client. * \param c The client.
* \param atom The atom to use to get the name.
* \param Return true if it has been updated.
*/ */
void bool
client_updatetitle(client_t *c) client_updatetitle(client_t *c, xcb_atom_t atom)
{ {
char *name; char *name;
ssize_t len; ssize_t len;
if(!xutil_gettextprop(globalconf.connection, c->win, _NET_WM_NAME, &name, &len)) if(!xutil_gettextprop(globalconf.connection, c->win, atom, &name, &len))
if(!xutil_gettextprop(globalconf.connection, c->win, WM_NAME, &name, &len)) return false;
return;
p_delete(&c->name); p_delete(&c->name);
a_iso2utf8(&c->name, name, len); a_iso2utf8(&c->name, name, len);
@ -166,6 +167,8 @@ client_updatetitle(client_t *c)
luaA_dofunction(globalconf.L, globalconf.hooks.titleupdate, 1); luaA_dofunction(globalconf.L, globalconf.hooks.titleupdate, 1);
widget_invalidate_cache(c->screen, WIDGET_CACHE_CLIENTS); widget_invalidate_cache(c->screen, WIDGET_CACHE_CLIENTS);
return true;
} }
/** Unfocus a client. /** Unfocus a client.
@ -421,7 +424,8 @@ client_manage(xcb_window_t w, xcb_get_geometry_reply_t *wgeom, int screen)
client_raise(c); client_raise(c);
/* update window title */ /* update window title */
client_updatetitle(c); if(!client_updatetitle(c, _NET_WM_NAME))
client_updatetitle(c, WM_NAME);
ewmh_update_net_client_list(c->phys_screen); ewmh_update_net_client_list(c->phys_screen);
widget_invalidate_cache(c->screen, WIDGET_CACHE_CLIENTS); widget_invalidate_cache(c->screen, WIDGET_CACHE_CLIENTS);

2
client.h
View File

@ -39,7 +39,7 @@ bool client_resize(client_t *, area_t, bool);
void client_unmanage(client_t *); void client_unmanage(client_t *);
void client_updatewmhints(client_t *); void client_updatewmhints(client_t *);
xcb_size_hints_t *client_updatesizehints(client_t *); xcb_size_hints_t *client_updatesizehints(client_t *);
void client_updatetitle(client_t *); bool client_updatetitle(client_t *, xcb_atom_t);
void client_saveprops(client_t *); void client_saveprops(client_t *);
void client_kill(client_t *); void client_kill(client_t *);
void client_setfloating(client_t *, bool); void client_setfloating(client_t *, bool);

5
event.c
View File

@ -530,9 +530,8 @@ event_handle_propertynotify(void *data __attribute__ ((unused)),
client_updatesizehints(c); client_updatesizehints(c);
else if (ev->atom == WM_HINTS) else if (ev->atom == WM_HINTS)
client_updatewmhints(c); client_updatewmhints(c);
else if(ev->atom == WM_NAME || ev->atom == _NET_WM_NAME)
if(ev->atom == WM_NAME || ev->atom == _NET_WM_NAME) client_updatetitle(c, ev->atom);
client_updatetitle(c);
} }
return 0; return 0;