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

window: Remove window enter/leave handlers

Browse Source
This commit is contained in:
Kristian Høgsberg
2012-01-09 09:32:07 -05:00
parent ac7619f3f4
commit ab9e79ffc2
2 changed files with 0 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/window.c
-23
View File
@@ -132,8 +132,6 @@ struct window {
window_button_handler_t button_handler; window_button_handler_t button_handler;
window_keyboard_focus_handler_t keyboard_focus_handler; window_keyboard_focus_handler_t keyboard_focus_handler;
window_motion_handler_t motion_handler; window_motion_handler_t motion_handler;
window_enter_handler_t enter_handler;
window_leave_handler_t leave_handler;
window_data_handler_t data_handler; window_data_handler_t data_handler;
window_drop_handler_t drop_handler; window_drop_handler_t drop_handler;
window_close_handler_t close_handler; window_close_handler_t close_handler;
@@ -1446,8 +1444,6 @@ input_remove_pointer_focus(struct input *input, uint32_t time)
window_set_focus_widget(window, NULL, NULL, 0, 0, 0); window_set_focus_widget(window, NULL, NULL, 0, 0, 0);
if (window->leave_handler)
window->leave_handler(window, input, time, window->user_data);
input->pointer_focus = NULL; input->pointer_focus = NULL;
input->current_pointer_image = POINTER_UNSET; input->current_pointer_image = POINTER_UNSET;
} }
@@ -1477,11 +1473,6 @@ input_handle_pointer_focus(void *data,
input->sy = sy; input->sy = sy;
pointer = POINTER_LEFT_PTR; pointer = POINTER_LEFT_PTR;
if (window->enter_handler)
pointer = window->enter_handler(window, input,
time, sx, sy,
window->user_data);
widget = window_find_widget(window, x, y); widget = window_find_widget(window, x, y);
window_set_focus_widget(window, widget, input, time, sx, sy); window_set_focus_widget(window, widget, input, time, sx, sy);
@@ -2050,20 +2041,6 @@ window_set_motion_handler(struct window *window,
window->motion_handler = handler; window->motion_handler = handler;
} }
void
window_set_enter_handler(struct window *window,
window_enter_handler_t handler)
{
window->enter_handler = handler;
}
void
window_set_leave_handler(struct window *window,
window_leave_handler_t handler)
{
window->leave_handler = handler;
}
void void
window_set_keyboard_focus_handler(struct window *window, window_set_keyboard_focus_handler(struct window *window,
window_keyboard_focus_handler_t handler) window_keyboard_focus_handler_t handler)
clients/window.h
-14
View File
@@ -172,13 +172,6 @@ typedef void (*window_button_handler_t)(struct window *window,
struct input *input, uint32_t time, struct input *input, uint32_t time,
int button, int state, void *data); int button, int state, void *data);
typedef int (*window_enter_handler_t)(struct window *window,
struct input *input, uint32_t time,
int32_t x, int32_t y, void *data);
typedef void (*window_leave_handler_t)(struct window *window,
struct input *input, uint32_t time,
void *data);
typedef int (*window_motion_handler_t)(struct window *window, typedef int (*window_motion_handler_t)(struct window *window,
struct input *input, uint32_t time, struct input *input, uint32_t time,
int32_t x, int32_t y, int32_t x, int32_t y,
@@ -326,13 +319,6 @@ void
window_set_motion_handler(struct window *window, window_set_motion_handler(struct window *window,
window_motion_handler_t handler); window_motion_handler_t handler);
void
window_set_enter_handler(struct window *window,
window_enter_handler_t handler);
void
window_set_leave_handler(struct window *window,
window_leave_handler_t handler);
void void
window_set_keyboard_focus_handler(struct window *window, window_set_keyboard_focus_handler(struct window *window,
window_keyboard_focus_handler_t handler); window_keyboard_focus_handler_t handler);