summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2017-06-29 13:11:54 -0400
committerMike Blumenkrantz <zmike@osg.samsung.com>2017-06-29 13:11:54 -0400
commitcf599177588dd2aa47d9f535e004004f086dae00 (patch)
tree1894b3a8ec1e348dc4a406efa431206b33947598
parent282257d5432b932af7dd75e228ffc68e22e5214a (diff)
wip
-rw-r--r--comp.c14
-rw-r--r--comp.h1
2 files changed, 8 insertions, 7 deletions
diff --git a/comp.c b/comp.c
index e708eef..5475a43 100644
--- a/comp.c
+++ b/comp.c
@@ -4013,7 +4013,7 @@ comp_seat_proxy_update(Comp_Seat *s)
4013 Eina_Bool drm; 4013 Eina_Bool drm;
4014 4014
4015 if (s->seat) return; 4015 if (s->seat) return;
4016 drm = !elm_win_wl_window_get(elm_win_get(s->c->obj)); 4016 drm = !ecore_evas_wayland2_window_get(ecore_evas_ecore_evas_get(s->c->evas));
4017 it = ecore_wl2_display_inputs_get(s->c->parent_disp); 4017 it = ecore_wl2_display_inputs_get(s->c->parent_disp);
4018 EINA_ITERATOR_FOREACH(it, input) 4018 EINA_ITERATOR_FOREACH(it, input)
4019 { 4019 {
@@ -4188,7 +4188,7 @@ comp_sync_done(void *d EINA_UNUSED, int t EINA_UNUSED, Ecore_Wl2_Event_Sync_Done
4188} 4188}
4189 4189
4190static Eina_Bool 4190static Eina_Bool
4191comp_seat_selection_changed(void *d EINA_UNUSED, int t EINA_UNUSED, Elm_Cnp_Event_Selection_Changed *ev) 4191comp_seat_selection_changed(void *d EINA_UNUSED, int t EINA_UNUSED, Ecore_Wl2_Event_Seat_Selection *ev)
4192{ 4192{
4193 Eina_List *l; 4193 Eina_List *l;
4194 Comp *c; 4194 Comp *c;
@@ -4692,7 +4692,7 @@ comp_mouse_in(void *data, Evas *e, Evas_Object *obj, void *event_info)
4692 ecore_evas_free(s->drag.proxy_win); 4692 ecore_evas_free(s->drag.proxy_win);
4693 if (ecore_x_display_get()) 4693 if (ecore_x_display_get())
4694 { 4694 {
4695 ecore_x_dnd_abort(elm_win_xwindow_get(elm_win_get(s->c->obj))); 4695 ecore_x_dnd_abort(ecore_evas_window_get(ecore_evas_ecore_evas_get(s->c->evas)));
4696 s->drag.x11_owner = 0; 4696 s->drag.x11_owner = 0;
4697 } 4697 }
4698 if (s->ptr.cursor.surface) 4698 if (s->ptr.cursor.surface)
@@ -4780,7 +4780,7 @@ comp_mouse_out(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_in
4780 win = ecore_evas_wayland2_window_get(s->drag.proxy_win); 4780 win = ecore_evas_wayland2_window_get(s->drag.proxy_win);
4781 ecore_wl2_dnd_drag_types_set(s->seat, types); 4781 ecore_wl2_dnd_drag_types_set(s->seat, types);
4782 s->drag.source->proxy_serial = ecore_wl2_dnd_drag_start(s->seat, 4782 s->drag.source->proxy_serial = ecore_wl2_dnd_drag_start(s->seat,
4783 elm_win_wl_window_get(elm_win_get(s->c->obj)), 4783 ecore_evas_wayland2_window_get(ecore_evas_ecore_evas_get(s->c->evas)),
4784 win); 4784 win);
4785 s->drag.source->proxy_send_handler = 4785 s->drag.source->proxy_send_handler =
4786 ecore_event_handler_add(ECORE_WL2_EVENT_DATA_SOURCE_SEND, 4786 ecore_event_handler_add(ECORE_WL2_EVENT_DATA_SOURCE_SEND,
@@ -4788,14 +4788,14 @@ comp_mouse_out(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_in
4788 } 4788 }
4789 else if (ecore_x_display_get()) 4789 else if (ecore_x_display_get())
4790 { 4790 {
4791 Ecore_Window win = elm_win_xwindow_get(elm_win_get(s->c->obj)); 4791 Ecore_Window win = ecore_evas_window_get(ecore_evas_ecore_evas_get(s->c->evas));
4792 Ecore_Window xwin = ecore_evas_window_get(s->drag.proxy_win); 4792 Ecore_Window xwin = ecore_evas_window_get(s->drag.proxy_win);
4793 Ecore_X_Atom actions[] = { ECORE_X_DND_ACTION_MOVE, ECORE_X_DND_ACTION_COPY }; 4793 Ecore_X_Atom actions[] = { ECORE_X_DND_ACTION_MOVE, ECORE_X_DND_ACTION_COPY };
4794 4794
4795 if (s->drag.proxy_win && s->drag.surface) 4795 if (s->drag.proxy_win && s->drag.surface)
4796 { 4796 {
4797 int x, y, ex, ey; 4797 int x, y, ex, ey;
4798 evas_object_geometry_get(elm_win_get(s->c->obj), &ex, &ey, NULL, NULL); 4798 ecore_evas_geometry_get(ecore_evas_ecore_evas_get(s->c->evas), &ex, &ey, NULL, NULL);
4799 evas_object_geometry_get(s->drag.surface->obj, &x, &y, NULL, NULL); 4799 evas_object_geometry_get(s->drag.surface->obj, &x, &y, NULL, NULL);
4800 x += ex, y += ey; 4800 x += ex, y += ey;
4801 ecore_x_window_ignore_set(xwin, 1); 4801 ecore_x_window_ignore_set(xwin, 1);
@@ -4869,7 +4869,7 @@ comp_smart_add(Evas_Object *obj)
4869 if (ecore_x_display_get()) 4869 if (ecore_x_display_get())
4870 { 4870 {
4871 // if proxiedallowed 4871 // if proxiedallowed
4872 ecore_x_dnd_aware_set(elm_win_xwindow_get(elm_win_get(c->obj)), EINA_TRUE); 4872 ecore_x_dnd_aware_set(ecore_evas_window_get(ecore_evas_ecore_evas_get(c->evas)), EINA_TRUE);
4873 if (!comps) x11_init(); 4873 if (!comps) x11_init();
4874 } 4874 }
4875 } 4875 }
diff --git a/comp.h b/comp.h
index d905424..94d5d5c 100644
--- a/comp.h
+++ b/comp.h
@@ -16,4 +16,5 @@ Ecore_Exe *comp_run(Evas_Object *obj, const char *cmd);
16Eina_Bool comp_next(Evas_Object *obj); 16Eina_Bool comp_next(Evas_Object *obj);
17Eina_Bool comp_prev(Evas_Object *obj); 17Eina_Bool comp_prev(Evas_Object *obj);
18void comp_rotate(Evas_Object *obj, Comp_Rotation rot, Eina_Bool rtl); 18void comp_rotate(Evas_Object *obj, Comp_Rotation rot, Eina_Bool rtl);
19void comp_scale_set(Evas_Object *obj, double scale);
19#endif 20#endif