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

store simple window geometry

This commit is contained in:
Julien Danjou 2008-01-23 16:05:52 +01:00
parent f17bf8b334
commit c1569eedf4
4 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.c
View File

@ -355,8 +355,8 @@ config_parse_screen(cfg_t *cfg, int screen)
statusbar->width = cfg_getint(cfgsectmp, "width"); statusbar->width = cfg_getint(cfgsectmp, "width");
statusbar->name = a_strdup(cfg_title(cfgsectmp)); statusbar->name = a_strdup(cfg_title(cfgsectmp));
statusbar->screen = screen; statusbar->screen = screen;
create_widgets(cfgsectmp, statusbar);
statusbar_preinit(statusbar); statusbar_preinit(statusbar);
create_widgets(cfgsectmp, statusbar);
statusbar_list_push(&virtscreen->statusbar, statusbar); statusbar_list_push(&virtscreen->statusbar, statusbar);
} }

18
event.c
View File

@ -88,8 +88,9 @@ handle_event_buttonpress(XEvent *e)
case Right: case Right:
for(widget = statusbar->widgets; widget; widget = widget->next) for(widget = statusbar->widgets; widget; widget = widget->next)
if(ev->y >= widget->area.x && ev->y < widget->area.x + widget->area.width if(ev->y >= widget->area.x && ev->y < widget->area.x + widget->area.width
&& statusbar->height - ev->x >= widget->area.y && statusbar->sw->geometry.height - ev->x >= widget->area.y
&& statusbar->height - ev->x < widget->area.y + widget->area.height) && statusbar->sw->geometry.height - ev->x
< widget->area.y + widget->area.height)
{ {
widget->button_press(widget, ev); widget->button_press(widget, ev);
return; return;
@ -97,8 +98,9 @@ handle_event_buttonpress(XEvent *e)
break; break;
default: default:
for(widget = statusbar->widgets; widget; widget = widget->next) for(widget = statusbar->widgets; widget; widget = widget->next)
if(statusbar->width - ev->y >= widget->area.x if(statusbar->sw->geometry.width - ev->y >= widget->area.x
&& statusbar->width - ev->y < widget->area.x + widget->area.width && statusbar->sw->geometry.width - ev->y
< widget->area.x + widget->area.width
&& ev->x >= widget->area.y && ev->x < widget->area.y + widget->area.height) && ev->x >= widget->area.y && ev->x < widget->area.y + widget->area.height)
{ {
widget->button_press(widget, ev); widget->button_press(widget, ev);
@ -191,6 +193,7 @@ handle_event_configurenotify(XEvent * e)
int screen; int screen;
Area area; Area area;
/* XXX this is all crap -- need to rewrite everything */
for(screen = 0; screen < ScreenCount(e->xany.display); screen++) for(screen = 0; screen < ScreenCount(e->xany.display); screen++)
if(ev->window == RootWindow(e->xany.display, screen) if(ev->window == RootWindow(e->xany.display, screen)
&& (ev->width != DisplayWidth(e->xany.display, screen) && (ev->width != DisplayWidth(e->xany.display, screen)
@ -201,12 +204,7 @@ handle_event_configurenotify(XEvent * e)
/* update statusbar */ /* update statusbar */
area = get_screen_area(screen, NULL, &globalconf.screens[screen].padding); area = get_screen_area(screen, NULL, &globalconf.screens[screen].padding);
globalconf.screens[screen].statusbar->width = area.width; globalconf.screens[screen].statusbar->sw->geometry.width = area.width;
XResizeWindow(e->xany.display,
globalconf.screens[screen].statusbar->sw->window,
globalconf.screens[screen].statusbar->width,
globalconf.screens[screen].statusbar->height);
widget_invalidate_cache(screen, WIDGET_CACHE_ALL); widget_invalidate_cache(screen, WIDGET_CACHE_ALL);
globalconf.screens[screen].need_arrange = True; globalconf.screens[screen].need_arrange = True;

1
structs.h
View File

@ -132,6 +132,7 @@ typedef struct SimpleWindow
{ {
Window window; Window window;
Drawable drawable; Drawable drawable;
Area geometry;
} SimpleWindow; } SimpleWindow;
/** Status bar */ /** Status bar */

6
window.c
View File

@ -185,6 +185,12 @@ simplewindow_new(int phys_screen, int x, int y, unsigned int w, unsigned int h,
SimpleWindow *sw; SimpleWindow *sw;
sw = p_new(SimpleWindow, 1); sw = p_new(SimpleWindow, 1);
sw->geometry.x = x;
sw->geometry.y = y;
sw->geometry.width = w;
sw->geometry.height = h;
wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask
| EnterWindowMask | LeaveWindowMask | StructureNotifyMask; | EnterWindowMask | LeaveWindowMask | StructureNotifyMask;
wa.cursor = globalconf.cursor[CurNormal]; wa.cursor = globalconf.cursor[CurNormal];