mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

window: Fix logic for looking up widget default cursor

Browse Source 
We may deref a NULL pointer if there is no grab and no focus widget.
This commit is contained in:
Kristian Høgsberg 2013-08-15 14:15:18 -07:00
parent 08b58c7c12
commit 1a5f0c34ff
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
clients/window.c
View File

@ -2911,12 +2911,15 @@ pointer_handle_motion(void *data, struct wl_pointer *pointer,
widget = input->grab;
else
widget = input->focus_widget;
if (widget && widget->motion_handler)
cursor = widget->motion_handler(input->focus_widget,
input, time, sx, sy,
widget->user_data);
else
cursor = input->focus_widget->default_cursor;
if (widget) {
if (widget->motion_handler)
cursor = widget->motion_handler(input->focus_widget,
input, time, sx, sy,
widget->user_data);
else
cursor = widget->default_cursor;
} else
cursor = CURSOR_LEFT_PTR;
input_set_pointer_image(input, cursor);
}