summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <m.blumenkran@samsung.com>2013-09-10 13:57:01 +0100
committerMike Blumenkrantz <m.blumenkran@samsung.com>2013-09-10 13:57:45 +0100
commit70d71d21a01c9786cf6d8eba92c9c64676efd5ad (patch)
treee20b38c26dfd054b51bbf43c3679d1e2ceb11616
parent6bfac4be48c69eec890db80364b3ed540f929b30 (diff)
use new elm_win_window_id_get to return wayland-compatible surface id: terminology is now wayland-teamwork compatible
-rw-r--r--src/bin/termio.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/bin/termio.c b/src/bin/termio.c
index 5c3e9a8..ffe76af 100644
--- a/src/bin/termio.c
+++ b/src/bin/termio.c
@@ -470,11 +470,15 @@ _update_link(Evas_Object *obj, Termio *sd,
470 if ((sd->link.string[0] == '/') || (link_is_url(sd->link.string))) 470 if ((sd->link.string[0] == '/') || (link_is_url(sd->link.string)))
471 { 471 {
472 Evas_Coord _x = ox, _y = oy; 472 Evas_Coord _x = ox, _y = oy;
473 Ecore_X_Window xwin; 473 Ecore_Window xwin;
474 474
475 _x += sd->mouse.cx * sd->font.chw; 475 _x += sd->mouse.cx * sd->font.chw;
476 _y += sd->mouse.cy * sd->font.chh; 476 _y += sd->mouse.cy * sd->font.chh;
477#if (ELM_VERSION_MAJOR > 1) || (ELM_VERSION_MINOR >= 8)
478 xwin = elm_win_window_id_get(sd->win);
479#else
477 xwin = elm_win_xwindow_get(sd->win); 480 xwin = elm_win_xwindow_get(sd->win);
481#endif
478 ty_dbus_link_mousein(xwin, sd->link.string, _x, _y); 482 ty_dbus_link_mousein(xwin, sd->link.string, _x, _y);
479 } 483 }
480 for (y = sd->link.y1; y <= sd->link.y2; y++) 484 for (y = sd->link.y1; y <= sd->link.y2; y++)
@@ -540,7 +544,11 @@ _remove_links(Termio *sd, Evas_Object *obj)
540 544
541 ox += sd->mouse.cx * sd->font.chw; 545 ox += sd->mouse.cx * sd->font.chw;
542 oy += sd->mouse.cy * sd->font.chh; 546 oy += sd->mouse.cy * sd->font.chh;
543 xwin = elm_win_xwindow_get(sd->win); 547#if (ELM_VERSION_MAJOR > 1) || (ELM_VERSION_MINOR >= 8)
548 xwin = elm_win_window_id_get(sd->win);
549#else
550 xwin = elm_win_xwindow_get(sd->win);
551#endif
544 ty_dbus_link_mouseout(xwin, sd->link.string, ox, oy); 552 ty_dbus_link_mouseout(xwin, sd->link.string, ox, oy);
545 } 553 }
546 free(sd->link.string); 554 free(sd->link.string);