summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerek Foreman <derekf@osg.samsung.com>2017-01-04 10:33:34 -0600
committerDerek Foreman <derekf@osg.samsung.com>2017-01-05 13:40:31 -0600
commit8328d4db89d0d422677a62de890c10d0180a86f8 (patch)
treec47350bb2e78835af62d0a2f271768d1b1e3dfdb
parent535569985953ffe029fe8230e803b245b8afdd8b (diff)
downloadefl-8328d4db89d0d422677a62de890c10d0180a86f8.tar.gz
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 641dfab516b8de1cf27ca07671ff73de6c8d32bf
-rw-r--r--src/lib/ecore_wl2/ecore_wl2_input.c14
-rw-r--r--src/lib/ecore_wl2/ecore_wl2_private.h2
-rw-r--r--src/lib/ecore_wl2/ecore_wl2_window.c2
3 files changed, 0 insertions, 18 deletions
diff --git a/src/lib/ecore_wl2/ecore_wl2_input.c b/src/lib/ecore_wl2/ecore_wl2_input.c
index 63ee07d9ce..c2fbe48144 100644
--- a/src/lib/ecore_wl2/ecore_wl2_input.c
+++ b/src/lib/ecore_wl2/ecore_wl2_input.c
@@ -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,23 +1496,11 @@ _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)
{
Ecore_Wl2_Input_Devices *devices;
diff --git a/src/lib/ecore_wl2/ecore_wl2_private.h b/src/lib/ecore_wl2/ecore_wl2_private.h
index 84866479a9..56a8c0ce9a 100644
--- a/src/lib/ecore_wl2/ecore_wl2_private.h
+++ b/src/lib/ecore_wl2/ecore_wl2_private.h
@@ -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);
diff --git a/src/lib/ecore_wl2/ecore_wl2_window.c b/src/lib/ecore_wl2/ecore_wl2_window.c
index 33e6c02be0..2314b786d5 100644
--- a/src/lib/ecore_wl2/ecore_wl2_window.c
+++ b/src/lib/ecore_wl2/ecore_wl2_window.c
@@ -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;