forked from enlightenment/terminology
update teamwork usage for new version compat
This commit is contained in:
parent
272e8daa4d
commit
734b652cbf
|
@ -27,7 +27,7 @@ ty_dbus_link_hide(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
ty_dbus_link_mouseout(int64_t win, const char *url, int x, int y)
|
ty_dbus_link_mouseout(uint64_t win, const char *url, int x, int y)
|
||||||
{
|
{
|
||||||
Eldbus_Message *msg;
|
Eldbus_Message *msg;
|
||||||
|
|
||||||
|
@ -38,14 +38,14 @@ ty_dbus_link_mouseout(int64_t win, const char *url, int x, int y)
|
||||||
"org.enlightenment.wm.Teamwork",
|
"org.enlightenment.wm.Teamwork",
|
||||||
"LinkMouseOut");
|
"LinkMouseOut");
|
||||||
|
|
||||||
eldbus_message_arguments_append(msg, "suxii", url, time(NULL), win, x, y);
|
eldbus_message_arguments_append(msg, "sutii", url, time(NULL), win, x, y);
|
||||||
eldbus_object_send(ty_e_object, msg, NULL, NULL, -1);
|
eldbus_object_send(ty_e_object, msg, NULL, NULL, -1);
|
||||||
eina_stringshare_replace(&_current_url, NULL);
|
eina_stringshare_replace(&_current_url, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void
|
void
|
||||||
ty_dbus_link_mousein(int64_t win, const char *url, int x, int y)
|
ty_dbus_link_mousein(uint64_t win, const char *url, int x, int y)
|
||||||
{
|
{
|
||||||
Eldbus_Message *msg;
|
Eldbus_Message *msg;
|
||||||
Eina_Stringshare *u;
|
Eina_Stringshare *u;
|
||||||
|
@ -64,7 +64,7 @@ ty_dbus_link_mousein(int64_t win, const char *url, int x, int y)
|
||||||
"org.enlightenment.wm.Teamwork",
|
"org.enlightenment.wm.Teamwork",
|
||||||
"LinkMouseIn");
|
"LinkMouseIn");
|
||||||
|
|
||||||
eldbus_message_arguments_append(msg, "suxii",
|
eldbus_message_arguments_append(msg, "sutii",
|
||||||
_current_url, time(NULL), win, x, y);
|
_current_url, time(NULL), win, x, y);
|
||||||
eldbus_object_send(ty_e_object, msg, NULL, NULL, -1);
|
eldbus_object_send(ty_e_object, msg, NULL, NULL, -1);
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,8 +2,8 @@
|
||||||
#define _DBUS_H__ 1
|
#define _DBUS_H__ 1
|
||||||
|
|
||||||
void ty_dbus_link_hide(void);
|
void ty_dbus_link_hide(void);
|
||||||
void ty_dbus_link_mousein(int64_t win, const char *url, int x, int y);
|
void ty_dbus_link_mousein(uint64_t win, const char *url, int x, int y);
|
||||||
void ty_dbus_link_mouseout(int64_t win, const char *url, int x, int y);
|
void ty_dbus_link_mouseout(uint64_t win, const char *url, int x, int y);
|
||||||
void ty_dbus_init(void);
|
void ty_dbus_init(void);
|
||||||
void ty_dbus_shutdown(void);
|
void ty_dbus_shutdown(void);
|
||||||
|
|
||||||
|
|
|
@ -554,12 +554,15 @@ _update_link(Evas_Object *obj, Termio *sd,
|
||||||
if ((sd->link.string[0] == '/') || (link_is_url(sd->link.string)))
|
if ((sd->link.string[0] == '/') || (link_is_url(sd->link.string)))
|
||||||
{
|
{
|
||||||
Evas_Coord _x = ox, _y = oy;
|
Evas_Coord _x = ox, _y = oy;
|
||||||
Ecore_Window xwin;
|
uint64_t xwin;
|
||||||
|
|
||||||
_x += sd->mouse.cx * sd->font.chw;
|
_x += sd->mouse.cx * sd->font.chw;
|
||||||
_y += sd->mouse.cy * sd->font.chh;
|
_y += sd->mouse.cy * sd->font.chh;
|
||||||
#if (ELM_VERSION_MAJOR > 1) || (ELM_VERSION_MINOR >= 8)
|
#if (ELM_VERSION_MAJOR > 1) || (ELM_VERSION_MINOR >= 8)
|
||||||
xwin = elm_win_window_id_get(sd->win);
|
xwin = elm_win_window_id_get(sd->win);
|
||||||
|
# if (ELM_VERSION_MAJOR > 1) || (ELM_VERSION_MINOR > 8) // not a typo
|
||||||
|
xwin = ((uint64_t)xwin << 32) + (uint64_t)getpid();
|
||||||
|
# endif
|
||||||
#else
|
#else
|
||||||
xwin = elm_win_xwindow_get(sd->win);
|
xwin = elm_win_xwindow_get(sd->win);
|
||||||
#endif
|
#endif
|
||||||
|
@ -622,7 +625,7 @@ _remove_links(Termio *sd, Evas_Object *obj)
|
||||||
if ((sd->link.string[0] == '/') || (link_is_url(sd->link.string)))
|
if ((sd->link.string[0] == '/') || (link_is_url(sd->link.string)))
|
||||||
{
|
{
|
||||||
Evas_Coord ox, oy;
|
Evas_Coord ox, oy;
|
||||||
Ecore_Window xwin;
|
uint64_t xwin;
|
||||||
|
|
||||||
evas_object_geometry_get(obj, &ox, &oy, NULL, NULL);
|
evas_object_geometry_get(obj, &ox, &oy, NULL, NULL);
|
||||||
|
|
||||||
|
@ -630,6 +633,9 @@ _remove_links(Termio *sd, Evas_Object *obj)
|
||||||
oy += sd->mouse.cy * sd->font.chh;
|
oy += sd->mouse.cy * sd->font.chh;
|
||||||
#if (ELM_VERSION_MAJOR > 1) || (ELM_VERSION_MINOR >= 8)
|
#if (ELM_VERSION_MAJOR > 1) || (ELM_VERSION_MINOR >= 8)
|
||||||
xwin = elm_win_window_id_get(sd->win);
|
xwin = elm_win_window_id_get(sd->win);
|
||||||
|
# if (ELM_VERSION_MAJOR > 1) || (ELM_VERSION_MINOR > 8) // not a typo
|
||||||
|
xwin = ((uint64_t)xwin << 32) + (uint64_t)getpid();
|
||||||
|
# endif
|
||||||
#else
|
#else
|
||||||
xwin = elm_win_xwindow_get(sd->win);
|
xwin = elm_win_xwindow_get(sd->win);
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue