Apply e_comp's interfaces

Change-Id: I7db7e4a614246475a82c31774efac0c87506aad9

diff --git a/src/e_dispatch_gesture_event.c b/src/e_dispatch_gesture_event.c
index 6d7de5ad561620db4ffccdf2f046b3e383bd1f70..429ea64ab3eccc36f37cae01fb8bcbddc282f8b3 100644 (file)
--- a/src/e_dispatch_gesture_event.c
+++ b/src/e_dispatch_gesture_event.c
@@ -41,9 +41,9 @@ static void _dispatch_mouse_move_event(int x, int y, int device)
    ev->multi.root.x = x;
    ev->multi.root.y = y;
    ev->multi.device = device + g_context->device_number_shift;
-   ev->window = e_comp->ee_win;
-   ev->event_window = e_comp->ee_win;
-   ev->root_window = e_comp->ee_win;
+   ev->window = e_comp_ee_win_get();
+   ev->event_window = ev->window;
+   ev->root_window = ev->window;
    ev->same_screen = 1;
    ev->dev = _get_device(ECORE_DEVICE_CLASS_TOUCH);
 
@@ -76,9 +76,9 @@ static void _dispatch_mouse_down_event(int x, int y, int device)
    ev->multi.root.x = x;
    ev->multi.root.y = y;
    ev->multi.device = device + g_context->device_number_shift;
-   ev->window = e_comp->ee_win;
-   ev->event_window = e_comp->ee_win;
-   ev->root_window = e_comp->ee_win;
+   ev->window = e_comp_ee_win_get();
+   ev->event_window = ev->window;
+   ev->root_window = ev->window;
    ev->same_screen = 1;
    ev->dev = _get_device(ECORE_DEVICE_CLASS_TOUCH);
 
@@ -111,9 +111,9 @@ static void _dispatch_mouse_up_event(int x, int y, int device)
    ev->multi.root.x = x;
    ev->multi.root.y = y;
    ev->multi.device = device + g_context->device_number_shift;
-   ev->window = e_comp->ee_win;
-   ev->event_window = e_comp->ee_win;
-   ev->root_window = e_comp->ee_win;
+   ev->window = e_comp_ee_win_get();
+   ev->event_window = ev->window;
+   ev->root_window = ev->window;
    ev->same_screen = 1;
    ev->dev = _get_device(ECORE_DEVICE_CLASS_TOUCH);
 

diff --git a/src/e_dispatch_key_event.c b/src/e_dispatch_key_event.c
index a795e3851606ffcc102dc70785ede1c5f401860b..67636dc9cae66047fedba679dc3a970cbd733dd7 100644 (file)
--- a/src/e_dispatch_key_event.c
+++ b/src/e_dispatch_key_event.c
@@ -39,9 +39,9 @@ _create_key_event(KeyEventData *ked)
    ev->key = _xstrdup(ked->info.keyname);
    ev->string = _xstrdup(ked->info.keyname);
    ev->compose = _xstrdup(ked->info.keyname);
-   ev->window = e_comp->ee_win;
-   ev->event_window = e_comp->ee_win;
-   ev->root_window = e_comp->ee_win;
+   ev->window = e_comp_ee_win_get();
+   ev->event_window = ev->window;
+   ev->root_window = ev->window;
    ev->same_screen = 1;
    ev->dev = _get_device(ECORE_DEVICE_CLASS_KEYBOARD);
    ev->keycode = ked->keycode;

diff --git a/src/e_dispatch_rotary_event.c b/src/e_dispatch_rotary_event.c
index 01acf50e7e5406f3fb3c3ee38a6c13b922a5e911..703e1d95f46b72ece968741daf22f70e6cfe7088 100644 (file)
--- a/src/e_dispatch_rotary_event.c
+++ b/src/e_dispatch_rotary_event.c
@@ -21,9 +21,9 @@ _create_wheel_event(int z_coordinate)
    if (!ev)
       return NULL;
 
-   ev->window = e_comp->ee_win;
-   ev->root_window = e_comp->ee_win;
-   ev->event_window = e_comp->ee_win;
+   ev->window = e_comp_ee_win_get();
+   ev->root_window = ev->window;
+   ev->event_window = ev->window;
 
    ev->timestamp= e_util_timestamp_get();
    ev->modifiers = 0;

diff --git a/src/e_screen_reader_gestures.c b/src/e_screen_reader_gestures.c
index 16f1c4c87f5a26f542a3cb1b83597f1e7f9ca149..1b36e217ac46fe9ca159d5d408ad471ece3e2df7 100644 (file)
--- a/src/e_screen_reader_gestures.c
+++ b/src/e_screen_reader_gestures.c
@@ -1529,9 +1529,9 @@ _mouse_move(int type, Ecore_Event_Mouse_Move *event)
    _hover_gesture_mouse_move(ev, cover);
    _tap_gestures_move(ev, cover);
 
-   if (!e_pointer_is_hidden(e_comp->pointer))
+   if (!e_pointer_is_hidden(e_comp_pointer_get()))
      {
-        e_pointer_mouse_move(e_comp->pointer, ev->x, ev->y);
+        e_pointer_mouse_move(e_comp_pointer_get(), ev->x, ev->y);
      }
 
    return EINA_FALSE;