set correct window to ecore events 85/157685/1
authorJengHyun Kang <jhyuni.kang@samsung.com>
Wed, 25 Oct 2017 23:38:55 +0000 (08:38 +0900)
committerJengHyun Kang <jhyuni.kang@samsung.com>
Wed, 25 Oct 2017 23:38:55 +0000 (08:38 +0900)
Change-Id: If39b13daae0d7ba60063d180987ccf42e48ea280

src/e_devicemgr_device.c
src/e_devicemgr_input.c

index 116bb699da740f87d5f1f309620b1da9a91e23be..a319f32fe0b5cd8049cb16dab3e33542f15df4b3 100644 (file)
@@ -1553,9 +1553,9 @@ _e_input_devmgr_generate_pointer_event(Eina_Bool state, int x, int y, int button
    e = calloc(1, sizeof(Ecore_Event_Mouse_Button));
    if (!e) return TIZEN_INPUT_DEVICE_MANAGER_ERROR_NO_SYSTEM_RESOURCES;
 
-   e->window = e_comp->win;
-   e->event_window = e->window;
-   e->root_window = e_comp->root;
+   e->window = e_comp->ee_win;
+   e->event_window = e_comp->ee_win;
+   e->root_window = e_comp->ee_win;
    e->timestamp = (int)(ecore_time_get() * 1000);
    e->same_screen = 1;
 
@@ -1606,9 +1606,9 @@ _e_input_devmgr_generate_pointer_move_event(int x, int y, char *identifier)
    e = calloc(1, sizeof(Ecore_Event_Mouse_Move));
    if (!e) return TIZEN_INPUT_DEVICE_MANAGER_ERROR_NO_SYSTEM_RESOURCES;
 
-   e->window = e_comp->win;
-   e->event_window = e->window;
-   e->root_window = e_comp->root;
+   e->window = e_comp->ee_win;
+   e->event_window = e_comp->ee_win;
+   e->root_window = e_comp->ee_win;
    e->timestamp = (int)(ecore_time_get() * 1000);
    e->same_screen = 1;
 
@@ -1695,9 +1695,9 @@ _e_input_devmgr_generate_touch_event(uint32_t type, uint32_t x, uint32_t y, uint
    e = calloc(1, sizeof(Ecore_Event_Mouse_Button));
    if (!e) return TIZEN_INPUT_DEVICE_MANAGER_ERROR_NO_SYSTEM_RESOURCES;
 
-   e->window = e_comp->win;
-   e->event_window = e->window;
-   e->root_window = e_comp->root;
+   e->window = e_comp->ee_win;
+   e->event_window = e_comp->ee_win;
+   e->root_window = e_comp->ee_win;
    e->timestamp = (int)(ecore_time_get() * 1000);
    e->same_screen = 1;
 
@@ -1738,9 +1738,9 @@ _e_input_devmgr_generate_touch_update_event(uint32_t x, uint32_t y, uint32_t fin
    e = calloc(1, sizeof(Ecore_Event_Mouse_Move));
    if (!e) return TIZEN_INPUT_DEVICE_MANAGER_ERROR_NO_SYSTEM_RESOURCES;
 
-   e->window = e_comp->win;
-   e->event_window = e->window;
-   e->root_window = e_comp->root;
+   e->window = e_comp->ee_win;
+   e->event_window = e_comp->ee_win;
+   e->root_window = e_comp->ee_win;
    e->timestamp = (int)(ecore_time_get() * 1000);
    e->same_screen = 1;
 
index 7952cd2f88c7d33ad26512c99fc75d5c9d4a0163..5b1067c499e80af5bad1622324906e78e1985f4c 100644 (file)
@@ -44,6 +44,11 @@ _e_devicemgr_input_pointer_mouse_remap(int type, void *event)
    ev_key->compose = (char *)eina_stringshare_add(ev_key->key);
    ev_key->timestamp = (int)(ecore_time_get()*1000);
    ev_key->same_screen = 1;
+
+   ev_key->window = e_comp->ee_win;
+   ev_key->event_window = e_comp->ee_win;
+   ev_key->root_window = e_comp->ee_win;
+
    ev_key->keycode = dconfig->conf->input.back_keycode;
 
    if (type == ECORE_EVENT_MOUSE_BUTTON_DOWN)