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

Support for multiple statusbar with the same position value 

Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Julien Danjou 2008-03-19 16:32:37 +01:00
parent c496df9fc6
commit 6337115e2e
1 changed files with 50 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
statusbar.c
View File

@ -31,10 +31,17 @@
extern AwesomeConf globalconf; extern AwesomeConf globalconf;
static void static void
statusbar_update_position(Statusbar *statusbar) statusbar_position_update(Statusbar *statusbar)
{ {
Statusbar *sb;
area_t area; area_t area;
if(statusbar->position == Off)
{
XUnmapWindow(globalconf.display, statusbar->sw->window);
return;
}
XMapRaised(globalconf.display, statusbar->sw->window); XMapRaised(globalconf.display, statusbar->sw->window);
/* Top and Bottom Statusbar have prio */ /* Top and Bottom Statusbar have prio */
@ -43,9 +50,39 @@ statusbar_update_position(Statusbar *statusbar)
NULL, NULL,
&globalconf.screens[statusbar->screen].padding); &globalconf.screens[statusbar->screen].padding);
else else
area = screen_get_area(statusbar->screen, area = screen_get_area(statusbar->screen,
globalconf.screens[statusbar->screen].statusbar, globalconf.screens[statusbar->screen].statusbar,
&globalconf.screens[statusbar->screen].padding); &globalconf.screens[statusbar->screen].padding);
for(sb = globalconf.screens[statusbar->screen].statusbar; sb && sb != statusbar; sb = sb->next)
switch(sb->position)
{
case Top:
if(sb->position == statusbar->position)
area.y += sb->height;
break;
case Bottom:
if(sb->position == statusbar->position)
area.height -= sb->height;
break;
case Left:
/* we need to re-add our own value removed in the
* screen_get_area computation */
if(statusbar->position == Left
|| statusbar->position == Right)
{
area.x -= statusbar->sw->geometry.width;
area.width += statusbar->sw->geometry.width;
}
break;
case Right:
if(statusbar->position == Left
|| statusbar->position == Right)
area.width += statusbar->sw->geometry.width;
break;
default:
break;
}
switch(statusbar->position) switch(statusbar->position)
{ {
@ -63,7 +100,6 @@ statusbar_update_position(Statusbar *statusbar)
simplewindow_move(statusbar->sw, area.x + area.width, area.y); simplewindow_move(statusbar->sw, area.x + area.width, area.y);
break; break;
default: default:
XUnmapWindow(globalconf.display, statusbar->sw->window);
break; break;
} }
} }
@ -203,7 +239,7 @@ statusbar_init(Statusbar *statusbar)
statusbar->width = area.width; statusbar->width = area.width;
} }
switch(statusbar->dposition) switch(statusbar->position)
{ {
case Right: case Right:
case Left: case Left:
@ -220,7 +256,7 @@ statusbar_init(Statusbar *statusbar)
widget_calculate_alignments(statusbar->widgets); widget_calculate_alignments(statusbar->widgets);
statusbar_update_position(statusbar); statusbar_position_update(statusbar);
statusbar_draw(statusbar); statusbar_draw(statusbar);
} }
@ -245,7 +281,7 @@ statusbar_refresh()
} }
static Statusbar * static Statusbar *
get_statusbar_byname(int screen, const char *name) statusbar_get_byname(int screen, const char *name)
{ {
Statusbar *sb; Statusbar *sb;
@ -263,8 +299,7 @@ statusbar_toggle(Statusbar *statusbar)
statusbar->position = (statusbar->dposition == Off) ? Top : statusbar->dposition; statusbar->position = (statusbar->dposition == Off) ? Top : statusbar->dposition;
else else
statusbar->position = Off; statusbar->position = Off;
statusbar_update_position(statusbar);
globalconf.screens[statusbar->screen].need_arrange = True; globalconf.screens[statusbar->screen].need_arrange = True;
} }
@ -276,13 +311,17 @@ statusbar_toggle(Statusbar *statusbar)
void void
uicb_statusbar_toggle(int screen, char *arg) uicb_statusbar_toggle(int screen, char *arg)
{ {
Statusbar *sb = get_statusbar_byname(screen, arg); Statusbar *sb = statusbar_get_byname(screen, arg);
if(sb) if(sb)
statusbar_toggle(sb); statusbar_toggle(sb);
else else
for(sb = globalconf.screens[screen].statusbar; sb; sb = sb->next) for(sb = globalconf.screens[screen].statusbar; sb; sb = sb->next)
statusbar_toggle(sb); statusbar_toggle(sb);
for(sb = globalconf.screens[screen].statusbar; sb; sb = sb->next)
statusbar_position_update(sb);
} }
// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80 // vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80