awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Force systray redraw on BG color change 

This commit makes awesome track the current background color of the systray
window. When Lua applies another color, a redraw of all icons is forced.

Fixes: https://github.com/awesomeWM/awesome/issues/359
Closes: https://github.com/awesomeWM/awesome/pull/402

Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Uli Schlachter 2015-08-12 10:26:27 +02:00
parent d37cc7e9df
commit f320cc74d0
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
globalconf.h
View File

@ -127,6 +127,8 @@ typedef struct
bool registered; bool registered;
/** Systray window parent */ /** Systray window parent */
drawin_t *parent; drawin_t *parent;
/** Background color */
uint32_t background_pixel;
} systray; } systray;
/** The monitor of startup notifications */ /** The monitor of startup notifications */
SnMonitorContext *snmonitor; SnMonitorContext *snmonitor;

17
systray.c
View File

@ -45,12 +45,14 @@ systray_init(void)
xcb_screen_t *xscreen = globalconf.screen; xcb_screen_t *xscreen = globalconf.screen;
globalconf.systray.window = xcb_generate_id(globalconf.connection); globalconf.systray.window = xcb_generate_id(globalconf.connection);
globalconf.systray.background_pixel = xscreen->black_pixel;
xcb_create_window(globalconf.connection, xscreen->root_depth, xcb_create_window(globalconf.connection, xscreen->root_depth,
globalconf.systray.window, globalconf.systray.window,
xscreen->root, xscreen->root,
-1, -1, 1, 1, 0, -1, -1, 1, 1, 0,
XCB_COPY_FROM_PARENT, xscreen->root_visual, XCB_COPY_FROM_PARENT, xscreen->root_visual,
0, NULL); XCB_CW_BACK_PIXEL, (const uint32_t [])
{ xscreen->black_pixel });
atom_name = xcb_atom_name_by_screen("_NET_SYSTEM_TRAY", globalconf.default_screen); atom_name = xcb_atom_name_by_screen("_NET_SYSTEM_TRAY", globalconf.default_screen);
if(!atom_name) if(!atom_name)
@ -255,7 +257,7 @@ luaA_systray_invalidate(void)
} }
static void static void
systray_update(int base_size, bool horizontal, bool reverse) systray_update(int base_size, bool horizontal, bool reverse, bool force_redraw)
{ {
if(base_size <= 0) if(base_size <= 0)
return; return;
@ -287,6 +289,8 @@ systray_update(int base_size, bool horizontal, bool reverse)
XCB_CONFIG_WINDOW_X | XCB_CONFIG_WINDOW_Y | XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT, XCB_CONFIG_WINDOW_X | XCB_CONFIG_WINDOW_Y | XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT,
config_vals); config_vals);
xcb_map_window(globalconf.connection, em->win); xcb_map_window(globalconf.connection, em->win);
if (force_redraw)
xcb_clear_area(globalconf.connection, 1, em->win, 0, 0, 0, 0);
if(horizontal) if(horizontal)
config_vals[0] += base_size; config_vals[0] += base_size;
else else
@ -322,13 +326,18 @@ luaA_systray(lua_State *L)
const char *bg = luaL_checklstring(L, 6, &bg_len); const char *bg = luaL_checklstring(L, 6, &bg_len);
bool revers = lua_toboolean(L, 7); bool revers = lua_toboolean(L, 7);
color_t bg_color; color_t bg_color;
bool force_redraw = false;
if(color_init_reply(color_init_unchecked(&bg_color, bg, bg_len))) if(color_init_reply(color_init_unchecked(&bg_color, bg, bg_len))
&& globalconf.systray.background_pixel != bg_color.pixel)
{ {
uint32_t config_back[] = { bg_color.pixel }; uint32_t config_back[] = { bg_color.pixel };
globalconf.systray.background_pixel = bg_color.pixel;
xcb_change_window_attributes(globalconf.connection, xcb_change_window_attributes(globalconf.connection,
globalconf.systray.window, globalconf.systray.window,
XCB_CW_BACK_PIXEL, config_back); XCB_CW_BACK_PIXEL, config_back);
xcb_clear_area(globalconf.connection, 1, globalconf.systray.window, 0, 0, 0, 0);
force_redraw = true;
} }
if(globalconf.systray.parent != w) if(globalconf.systray.parent != w)
@ -349,7 +358,7 @@ luaA_systray(lua_State *L)
if(globalconf.embedded.len != 0) if(globalconf.embedded.len != 0)
{ {
systray_update(base_size, horiz, revers); systray_update(base_size, horiz, revers, force_redraw);
xcb_map_window(globalconf.connection, xcb_map_window(globalconf.connection,
globalconf.systray.window); globalconf.systray.window);
} }