projects
/
profile
/
ivi
/
weston-ivi-shell.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
547cadf
)
Only invoke shell button bindings if there's a pointer focus surface
author
Kristian Høgsberg
<krh@bitplanet.net>
Wed, 13 Apr 2011 15:52:54 +0000
(11:52 -0400)
committer
Kristian Høgsberg
<krh@bitplanet.net>
Wed, 13 Apr 2011 15:52:54 +0000
(11:52 -0400)
compositor/shell.c
patch
|
blob
|
history
diff --git
a/compositor/shell.c
b/compositor/shell.c
index
c480e9a
..
c842b97
100644
(file)
--- a/
compositor/shell.c
+++ b/
compositor/shell.c
@@
-671,6
+671,9
@@
move_binding(struct wl_input_device *device, uint32_t time,
struct wlsc_surface *surface =
(struct wlsc_surface *) device->pointer_focus;
+ if (surface == NULL)
+ return;
+
shell_move(NULL,
(struct wl_shell *) &compositor->shell,
&surface->surface, device, time);
@@
-686,6
+689,9
@@
resize_binding(struct wl_input_device *device, uint32_t time,
uint32_t edges = 0;
int32_t x, y;
+ if (surface == NULL)
+ return;
+
x = device->grab_x - surface->x;
y = device->grab_y - surface->y;