hugok
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ecore_wl2: Remove the rest of the cursor frame callback 

Oops, I made a clean spot, now I need to clean up the rest of this.

ref 641dfab516
This commit is contained in:
Derek Foreman 2017-01-04 10:33:34 -06:00
parent 5355699859
commit 8328d4db89
3 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/lib/ecore_wl2/ecore_wl2_input.c
View File

@ -1459,8 +1459,6 @@ _ecore_wl2_input_del(Ecore_Wl2_Input *input)
if (input->repeat.timer) ecore_timer_del(input->repeat.timer);
_ecore_wl2_input_cursor_update_stop(input);
if (input->cursor.name) eina_stringshare_del(input->cursor.name);
if (input->data.types.data)
@ -1498,22 +1496,10 @@ _ecore_wl2_input_del(Ecore_Wl2_Input *input)
void
_ecore_wl2_input_cursor_set(Ecore_Wl2_Input *input, const char *cursor)
{
_ecore_wl2_input_cursor_update_stop(input);
eina_stringshare_replace(&input->cursor.name, cursor);
if (!cursor) eina_stringshare_replace(&input->cursor.name, "left_ptr");
}
void
_ecore_wl2_input_cursor_update_stop(Ecore_Wl2_Input *input)
{
if (input->cursor.frame_cb)
{
wl_callback_destroy(input->cursor.frame_cb);
input->cursor.frame_cb = NULL;
}
}
void
_ecore_wl2_input_window_remove(Ecore_Wl2_Input *input, Ecore_Wl2_Window *window)
{

2
src/lib/ecore_wl2/ecore_wl2_private.h
View File

@ -360,7 +360,6 @@ struct _Ecore_Wl2_Input
const char *name;
unsigned int size;
struct wl_surface *surface;
struct wl_callback *frame_cb;
int hot_x, hot_y;
} cursor;
@ -455,7 +454,6 @@ void _ecore_wl2_input_grab(Ecore_Wl2_Input *input, Ecore_Wl2_Window *window, uns
void _ecore_wl2_input_cursor_set(Ecore_Wl2_Input *input, const char *cursor);
Eina_Bool _ecore_wl2_input_cursor_update(void *data);
void _ecore_wl2_input_cursor_update_stop(Ecore_Wl2_Input *input);
void _ecore_wl2_input_window_remove(Ecore_Wl2_Input *input, Ecore_Wl2_Window *window);
void _ecore_wl2_dnd_add(Ecore_Wl2_Input *input, struct wl_data_offer *offer);

2
src/lib/ecore_wl2/ecore_wl2_window.c
View File

@ -1240,8 +1240,6 @@ ecore_wl2_window_pointer_set(Ecore_Wl2_Window *window, struct wl_surface *surfac
input = ecore_wl2_window_input_get(window);
if (!input) return;
_ecore_wl2_input_cursor_update_stop(input);
input->cursor.surface = surface;
input->cursor.hot_x = hot_x;
input->cursor.hot_y = hot_y;