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

fix comparisons

This commit is contained in:
Julien Danjou 2008-01-05 12:01:09 +01:00
parent 3018282169
commit a34d1bc583
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
event.c
View File

@ -76,7 +76,7 @@ handle_event_buttonpress(XEvent *e)
case Top: case Top:
case Bottom: case Bottom:
for(widget = statusbar->widgets; widget; widget = widget->next) for(widget = statusbar->widgets; widget; widget = widget->next)
if(ev->x >= widget->area.x && ev->x <= widget->area.x + widget->area.width) if(ev->x >= widget->area.x && ev->x < widget->area.x + widget->area.width)
{ {
widget->button_press(widget, ev); widget->button_press(widget, ev);
return; return;
@ -84,7 +84,7 @@ handle_event_buttonpress(XEvent *e)
break; break;
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)
{ {
widget->button_press(widget, ev); widget->button_press(widget, ev);
return; return;
@ -93,7 +93,7 @@ handle_event_buttonpress(XEvent *e)
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->width - ev->y >= widget->area.x
&& statusbar->width - ev->y <= widget->area.x + widget->area.width) && statusbar->width - ev->y < widget->area.x + widget->area.width)
{ {
widget->button_press(widget, ev); widget->button_press(widget, ev);
return; return;

6
widgets/taglist.c
View File

@ -132,7 +132,7 @@ taglist_button_press(Widget *widget, XButtonPressedEvent *ev)
{ {
width = textwidth(vscreen.font, tag->name) + vscreen.font->height; width = textwidth(vscreen.font, tag->name) + vscreen.font->height;
if(ev->x >= widget->area.x + prev_width if(ev->x >= widget->area.x + prev_width
&& ev->x <= widget->area.x + prev_width + width) && ev->x < widget->area.x + prev_width + width)
{ {
snprintf(buf, sizeof(buf), "%d", i); snprintf(buf, sizeof(buf), "%d", i);
b->func(widget->statusbar->screen, buf); b->func(widget->statusbar->screen, buf);
@ -146,7 +146,7 @@ taglist_button_press(Widget *widget, XButtonPressedEvent *ev)
{ {
width = textwidth(vscreen.font, tag->name) + vscreen.font->height; width = textwidth(vscreen.font, tag->name) + vscreen.font->height;
if(ev->y >= widget->area.x + prev_width if(ev->y >= widget->area.x + prev_width
&& ev->y <= widget->area.x + prev_width + width) && ev->y < widget->area.x + prev_width + width)
{ {
snprintf(buf, sizeof(buf), "%d", i); snprintf(buf, sizeof(buf), "%d", i);
b->func(widget->statusbar->screen, buf); b->func(widget->statusbar->screen, buf);
@ -160,7 +160,7 @@ taglist_button_press(Widget *widget, XButtonPressedEvent *ev)
{ {
width = textwidth(vscreen.font, tag->name) + vscreen.font->height; width = textwidth(vscreen.font, tag->name) + vscreen.font->height;
if(widget->statusbar->width - ev->y >= widget->area.x + prev_width if(widget->statusbar->width - ev->y >= widget->area.x + prev_width
&& widget->statusbar->width - ev->y <= widget->area.x + prev_width + width) && widget->statusbar->width - ev->y < widget->area.x + prev_width + width)
{ {
snprintf(buf, sizeof(buf), "%d", i); snprintf(buf, sizeof(buf), "%d", i);
b->func(widget->statusbar->screen, buf); b->func(widget->statusbar->screen, buf);