godzil/wmfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add possible x,y arg in status_surface (w,h,#color OR x,y,w,h,#color)

Browse Source
This commit is contained in:
Martin Duquesnoy 2012-02-06 20:38:26 +01:00
parent c2f108a3ae
commit b753f7cf48
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/status.c
View File

@ -542,17 +542,19 @@ status_flush_surface(void)
} }
static void static void
status_surface(int w, int h, Color bg, char *status) status_surface(int x, int y, int w, int h, Color bg, char *status)
{ {
struct barwin *b; struct barwin *b;
struct screen *s; struct screen *s;
struct status_ctx ctx; struct status_ctx ctx;
int d, x, y; int d;
if(!status) if(!status)
return; return;
XQueryPointer(W->dpy, W->root, (Window*)&d, (Window*)&d, &x, &y, &d, &d, (unsigned int *)&d); if(x + y < 0)
XQueryPointer(W->dpy, W->root, (Window*)&d, (Window*)&d, &x, &y, &d, &d, (unsigned int *)&d);
s = screen_gb_geo(x, y); s = screen_gb_geo(x, y);
if(x + w > s->geo.x + s->geo.w) if(x + w > s->geo.x + s->geo.w)
@ -576,23 +578,23 @@ void
uicb_status_surface(Uicb cmd) uicb_status_surface(Uicb cmd)
{ {
char *p, *ccmd = xstrdup(cmd); char *p, *ccmd = xstrdup(cmd);
int w, h; int s, d = 0, w, h, x = -1, y = -1;
Color bg; Color bg;
if(!ccmd || !(p = strchr(ccmd, ' '))) if(!ccmd || !(p = strchr(ccmd, ' ')))
return; return;
if(sscanf(ccmd, "%d,%d,#%x", &w, &h, &bg) != 3 *p = '\0';
|| !w || !h) ++p;
if(!(((s = sscanf(ccmd, "%d,%d,#%x", &w, &h, &bg)) == 3)
|| (s = sscanf(ccmd, "%d,%d,%d,%d,#%x", &x, &y, &w, &h, &bg)) == 5))
{ {
free(ccmd); free(ccmd);
return; return;
} }
*p = '\0'; status_surface(x, y, w, h, bg, p);
++p;
status_surface(w, h, bg, p);
free(ccmd); free(ccmd);
} }