fbt/lemonbar
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Account for screen offset when calculating clickable area positions

Browse Source 
Works with XINERAMA now. Tested with:
echo '\ableft1\ac echo left1 \ae\c\abcenter1\ac echo center1 \ae\r\abright1\ac echo right1 \ae\sn\ableft2\ac echo left2 \ae\c\abcenter2\ac echo center2 \ae\r\abright2\ac echo right2 \ae' | ./bar -p
This commit is contained in:
Jurica Vukadin 2014-01-17 14:19:15 +00:00
parent df91bd11f3
commit 68b37a2111
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bar.c
View File

@ -179,13 +179,13 @@ cmd_area_begin (screen_t *screen, int x, int align)
switch (align) { switch (align) {
case ALIGN_L: case ALIGN_L:
area->begin = x; area->begin = x + screen->x;
break; break;
case ALIGN_C: case ALIGN_C:
area->begin = screen->width / 2 + x / 2; area->begin = screen->width / 2 + x / 2 + screen->x;
break; break;
case ALIGN_R: case ALIGN_R:
area->begin = screen->width; area->begin = screen->width + screen->x;
break; break;
} }
@ -208,11 +208,11 @@ cmd_area_end (screen_t *screen, int x, int align)
switch (align) { switch (align) {
case ALIGN_L: case ALIGN_L:
area->end = x; area->end = x + screen->x;
break; break;
case ALIGN_C: case ALIGN_C:
area->begin -= (x - area->begin_x) / 2; area->begin -= (x - area->begin_x) / 2;
area->end = screen->width / 2 + x / 2; area->end = screen->width / 2 + x / 2 + screen->x;
/* /*
* if there were any other center aligned areas * if there were any other center aligned areas
* before this one, adjust their position * before this one, adjust their position
@ -229,7 +229,7 @@ cmd_area_end (screen_t *screen, int x, int align)
break; break;
case ALIGN_R: case ALIGN_R:
area->begin -= (x - area->begin_x); area->begin -= (x - area->begin_x);
area->end = screen->width; area->end = screen->width + screen->x;
/* /*
* if there were any other right aligned areas * if there were any other right aligned areas
* before this one, adjust their position * before this one, adjust their position
@ -721,7 +721,7 @@ main (int argc, char **argv)
case XCB_BUTTON_RELEASE: case XCB_BUTTON_RELEASE:
button_ev = (xcb_button_release_event_t *)ev; button_ev = (xcb_button_release_event_t *)ev;
if (button_ev->detail == MOUSE_BUTTON) if (button_ev->detail == MOUSE_BUTTON)
xcb_handle_event (button_ev->event_x); xcb_handle_event (button_ev->root_x);
} }
free (ev); free (ev);