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

Draw: Fix image shift with systray width

Browse Source
This commit is contained in:
Martin Duquesnoy 2011-06-17 16:21:03 +02:00
parent c1d83e8c8b
commit 83c491527d
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/client.c
View File

@ -385,7 +385,7 @@ client_urgent(Client *c, bool u)
{ {
Client *c = clients; Client *c = clients;
while((c && c->resize[Right] != w) && (c && c->resize[Left] != w)) while(c && (c->resize[Right] != w) && (c->resize[Left] != w))
c = c->next; c = c->next;
return c; return c;
@ -909,7 +909,7 @@ client_moveresize(Client *c, Geo geo, bool r)
client_geo_hints(&geo, c); client_geo_hints(&geo, c);
/* To balance position of window in frame */ /* To balance position of window in frame */
rhx = (((c->wrgeo.width) - geo.width) >> 1); rhx = (c->wrgeo.width - geo.width) >> 1;
} }
c->geo = geo; c->geo = geo;

11
src/draw.c
View File

@ -33,6 +33,8 @@
#include "wmfs.h" #include "wmfs.h"
#ifdef HAVE_IMLIB #ifdef HAVE_IMLIB
static int sw = 0;
/** Draw an image in a drawable /** Draw an image in a drawable
* \param dr Drawable * \param dr Drawable
* \param x X position * \param x X position
@ -44,7 +46,7 @@ draw_image(Drawable dr, int x, int y, int w, int h, char *name)
{ {
Imlib_Image image; Imlib_Image image;
if(!name || !dr) if(!dr)
return; return;
imlib_context_set_display(dpy); imlib_context_set_display(dpy);
@ -82,7 +84,7 @@ parse_image_block(Drawable dr, char *str)
{ {
ImageAttr im; ImageAttr im;
char as; char as;
int i, j, k, sw = systray_get_width(); int i, j, k;
for(i = j = 0; i < (int)strlen(str); ++i, ++j) for(i = j = 0; i < (int)strlen(str); ++i, ++j)
if(sscanf(&str[i], "\\i[%d;%d;%d;%d;%512[^]]]%c", &im.x, &im.y, &im.w, &im.h, im.name, &as) == 6 if(sscanf(&str[i], "\\i[%d;%d;%d;%d;%512[^]]]%c", &im.x, &im.y, &im.w, &im.h, im.name, &as) == 6
@ -95,7 +97,7 @@ parse_image_block(Drawable dr, char *str)
else if(j != i) else if(j != i)
str[j] = str[i]; str[j] = str[i];
for(k = j; k < i; str[k++] = 0); for(sw = 0, k = j; k < i; str[k++] = 0);
return; return;
} }
@ -121,6 +123,9 @@ draw_text(Drawable d, int x, int y, char* fg, char *str)
if(strstr(str, "i[")) if(strstr(str, "i["))
{ {
if(d == infobar[conf.systray.screen].bar->dr)
sw = systray_get_width();
ostr = xstrdup(str); ostr = xstrdup(str);
textlen = strlen(ostr); textlen = strlen(ostr);
parse_image_block(d, str); parse_image_block(d, str);

1
src/status.c
View File

@ -228,6 +228,7 @@ statustext_handle(int sc, char *str)
/* Draw normal text (and possibly colored with \#color\ blocks) */ /* Draw normal text (and possibly colored with \#color\ blocks) */
statustext_normal(sc, ib, str); statustext_normal(sc, ib, str);
sw = 0;
barwin_refresh(ib->bar); barwin_refresh(ib->bar);
free(lastst); free(lastst);