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

Status: Dynamic mouse action: new format \b[x;y;w;h;col;(1;spawn;xterm)]\ (last arg of sequences b,s and i

Browse Source
This commit is contained in:
Martin Duquesnoy 2011-07-31 14:43:09 +02:00
parent 92831181e7
commit 8344b1cc82
3 changed files with 51 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/draw.c
View File

@ -83,15 +83,37 @@ static void
parse_image_block(Drawable dr, char *str)
{
ImageAttr im;
char as;
int i, j, k;
BarWindow *bw;
Geo area;
char as, mouse[512] = { 0 };
int i = 0, j = 0, k, n;
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
for(; i < (int)strlen(str); ++i, ++j)
if((n = sscanf(&str[i], "\\i[%d;%d;%d;%d;%512[^];]]%c",
&im.x, &im.y, &im.w, &im.h, im.name, &as)) == 6
|| (n = sscanf(&str[i], "\\i[%d;%d;%d;%d;%512[^;];%512[^]]]%c",
&im.x, &im.y, &im.w, &im.h, im.name, mouse, &as)) == 7
&& as == '\\')
{
draw_image(dr, im.x - sw, im.y, im.w, im.h, im.name);
/* Etablish clickable area on image */
if(n == 7)
{
area.x = im.x - sw;
area.y = im.y;
area.width = im.w;
area.height = im.h;
/* Associate drawable with window; travel barwins */
SLIST_FOREACH(bw, &bwhead, next)
if(bw->dr == dr)
{
statustext_mouse(mouse, area, bw->win);
break;
}
}
for(++i, --j; str[i] != as || str[i - 1] != ']'; ++i);
}
else if(j != i)

40
src/status.c
View File

@ -39,10 +39,9 @@ static int sw = 0;
* --> (button;func;cmd)\<block>[;;;;]\ add a mouse bind on the block object
*\param str String
*\param area Area of clicking
*\param win Window to click
*\return sm StatusMouse pointer
*\param win Win to click
*/
static void
void
statustext_mouse(char *str, Geo area, Window win)
{
StatusMouse *sm = NULL;
@ -78,16 +77,19 @@ statustext_rectangle(InfoBar *ib, char *str)
{
StatusRec r;
char as, mouse[512] = { 0 };
int i, j, k, n;
int i = 0, j = 0, k, n;
for(i = j = 0; i < (int)strlen(str); ++i, ++j)
if((n = sscanf(&str[i], "%512[^\\]\\b[%d;%d;%d;%d;#%x]%c",
mouse, &r.g.x, &r.g.y, &r.g.width, &r.g.height, &r.color, &as)) == 7
|| n == 6 && as == '\\')
for(; i < (int)strlen(str); ++i, ++j)
if((n = sscanf(&str[i], "\\b[%d;%d;%d;%d;#%x]%c",
&r.g.x, &r.g.y, &r.g.width, &r.g.height, &r.color, &as)) == 6
|| (n = sscanf(&str[i], "\\b[%d;%d;%d;%d;#%x;%512[^]]]%c",
&r.g.x, &r.g.y, &r.g.width, &r.g.height, &r.color, mouse, &as)) == 7
&& as == '\\')
{
draw_rectangle(ib->bar->dr, r.g.x - sw, r.g.y, r.g.width, r.g.height, r.color);
statustext_mouse(mouse, r.g, ib->bar->win);
if(n == 7)
statustext_mouse(mouse, r.g, ib->bar->win);
for(++i, --j; str[i] != as || str[i - 1] != ']'; ++i);
}
@ -162,18 +164,24 @@ statustext_text(InfoBar *ib, char *str)
int i = 0, j = 0, k, n;
for(; i < (int)strlen(str); ++i, ++j)
if((n = sscanf(&str[i], "%512[^\\]\\s[%d;%d;%7[^;];%512[^]]]%c", mouse, &s.x, &s.y, s.color, s.text, &as)) == 6
|| n == 5 && as == '\\')
if((n = sscanf(&str[i], "\\s[%d;%d;%7[^;];%512[^];]]%c",
&s.x, &s.y, s.color, s.text, &as)) == 5
|| (n = sscanf(&str[i], "\\s[%d;%d;%7[^;];%512[^;];%512[^]]]%c",
&s.x, &s.y, s.color, s.text, mouse, &as)) == 6
&& as == '\\')
{
draw_text(ib->bar->dr, s.x - sw, s.y, s.color, s.text);
/* Etablish clickable area on text */
area.height = font.height;
area.width = textw(s.text);
area.x = s.x - sw;
area.y = s.y - area.height;
if(n == 6)
{
area.height = font.height;
area.width = textw(s.text);
area.x = s.x - sw;
area.y = s.y - area.height;
statustext_mouse(mouse, area, ib->bar->win);
statustext_mouse(mouse, area, ib->bar->win);
}
for(++i, --j; str[i] != as || str[i - 1] != ']'; ++i);
}

1
src/wmfs.h
View File

@ -363,6 +363,7 @@ void uicb_screen_prev(uicb_t);
void uicb_screen_prev_sel(uicb_t);
/* status.c */
void statustext_mouse(char *str, Geo area, Drawable dr);
void statustext_handle(int sc, char *str);
/* systray.c */