diff options
author | Peter Hutterer <peter.hutterer@who-t.net> | 2011-11-07 11:45:40 +1000 |
---|---|---|
committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-11-07 11:45:40 +1000 |
commit | fc6a9c70a0c431a6c289e70399f236643399ac35 (patch) | |
tree | 2b04a727aeb37438520699d29900952992a9a686 | |
parent | 97ae9b0ce77b001e9651c48a3092132da4820293 (diff) |
Call it blackbar, not toolbar
This isn't really a toolbar and won't be one, I guess.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r-- | multitouch.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/multitouch.c b/multitouch.c index eb3550e..6f3e27b 100644 --- a/multitouch.c +++ b/multitouch.c @@ -52,7 +52,7 @@ struct multitouch { Screen* screen; Window root; Window win; - Window toolbar; + Window blackbar; GC gc; Visual *visual; int xi_opcode; @@ -139,13 +139,13 @@ static void init_windows(struct multitouch *mt) XISelectEvents(mt->dpy, win, &evmask, 1); mt->win = win; - mt->toolbar = subwin; + mt->blackbar = subwin; - /* grab touch events on toolbar */ + /* grab touch events on blackbar */ modifiers.modifiers = XIAnyModifier; - if (XIGrabTouchBegin(mt->dpy, XIAllMasterDevices, mt->toolbar, + if (XIGrabTouchBegin(mt->dpy, XIAllMasterDevices, mt->blackbar, XINoOwnerEvents, &evmask, 1, &modifiers) != 0) - error("Failed to establish passive grab on toolbar\n"); + error("Failed to establish passive grab on blackbar\n"); XSync(mt->dpy, False); } @@ -223,7 +223,7 @@ static void print_event(struct multitouch *mt, XIDeviceEvent* event) msg("Event: %s (%d)\n", type, event->deviceid); msg("\t%.2f/%.2f (%.2f/%.2f)\n", event->event_x, event->event_y, event->root_x, event->root_y); msg("\ttouchid: %d\n", event->detail); - msg("\ton %s\n", event->event == mt->win ? "window" : "toolbar"); + msg("\ton %s\n", event->event == mt->win ? "window" : "blackbar"); } static void paint_touch_begin(struct multitouch *mt, XIDeviceEvent *event) @@ -360,7 +360,7 @@ static void handle_grabbed_event(struct multitouch *mt, XIDeviceEvent *event) static void paint_event(struct multitouch *mt, XIDeviceEvent *event) { - if (event->event == mt->toolbar) + if (event->event == mt->blackbar) { handle_grabbed_event(mt, event); return; |