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

systray: don't crap up on odd-sized windows 

Basically, we get the size we want the systray to be drawn at upon drawing
the tray, thus removing the query to the xcb_get_geometry function. As all
windows embedded in the systray are squares, their size is equal to their
height, so we simply force the size to be wibox_height * n x wibox_height,
where n is the number of embedded windows, instead of deriving it from the
largest embedded window (which, for example in the case of wicd, would be
200x200, way too much for one window on a regular wibox).

Signed-off-by: Gregor Best <farhaven@googlemail.com>
Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Gregor Best 2009-05-29 01:31:57 +02:00 committed by Julien Danjou
parent aa9a7b1fc8
commit 9890561fd5
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
widgets/systray.c
View File

@ -32,31 +32,26 @@
#define _NET_SYSTEM_TRAY_ORIENTATION_HORZ 0
#define _NET_SYSTEM_TRAY_ORIENTATION_VERT 1
typedef struct
{
/* systray height */
int height;
} systray_data_t;
static area_t
systray_geometry(widget_t *widget, int screen)
{
area_t geometry;
int phys_screen = screen_virttophys(screen), n = 0;
geometry.height = 0;
int width = 0;
systray_data_t *d = widget->data;
for(int i = 0; i < globalconf.embedded.len; i++)
if(globalconf.embedded.tab[i].phys_screen == phys_screen)
{
xcb_get_geometry_cookie_t geo = xcb_get_geometry(globalconf.connection, globalconf.embedded.tab[i].win);
xcb_get_geometry_reply_t *g = xcb_get_geometry_reply(globalconf.connection, geo, NULL);
n++;
if(g->height > geometry.height)
geometry.height = g->height;
if(g->width > width)
width = g->width;
}
/** \todo use class hints */
geometry.width = width * n;
geometry.width = d->height * n;
geometry.height = d->height;
geometry.x = geometry.y = 0;
return geometry;
@ -87,6 +82,9 @@ systray_draw(widget_t *widget, draw_context_t *ctx,
break;
}
systray_data_t *d = widget->data;
d->height = p->sw.geometry.height;
/* set wibox orientation */
/** \todo stop setting that property on each redraw */
xcb_change_property(globalconf.connection, XCB_PROP_MODE_REPLACE,
@ -105,6 +103,9 @@ widget_systray(widget_t *w)
w->geometry = systray_geometry;
w->extents = systray_extents;
systray_data_t *d = w->data = p_new(systray_data_t, 1);
d->height = 0;
return w;
}
// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80