From 6adb897aad99b5ad100bcc1a1e7c12a8d3580ecb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Thu, 27 Jan 2011 00:23:32 +0100 Subject: application-appstore: support for ApplicationScrollSignal method When the ApplicationScrollSignal is called from indicator-application the XAyatanaScrollAction method provided by libappindicator is called with the scroll event data. So: indicator-application now is listening for that signal ("scroll-entry"), registering a call-back function. When it gets called, it finds the scrolled application and informs (via dbus) indicator-application-service that a scroll event has been registered for that application. Now the service (that is connected to every indicatorapp running) sends (via dbus, again) to the correct application the scroll-event informations. --- src/application-service-appstore.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'src/application-service-appstore.c') diff --git a/src/application-service-appstore.c b/src/application-service-appstore.c index 481d886..abe0089 100644 --- a/src/application-service-appstore.c +++ b/src/application-service-appstore.c @@ -260,6 +260,32 @@ bus_method_call (GDBusConnection * connection, const gchar * sender, if (g_strcmp0(method, "GetApplications") == 0) { retval = get_applications(service); + } else if (g_strcmp0(method, "ApplicationScrollSignal") == 0) { + Application *app = NULL; + const gchar *dbusaddress; + const gchar *dbusobject; + gint delta; + guint direction; + + g_variant_get (params, "(&s&siu)", &dbusaddress, &dbusobject, + &delta, &direction); + + GList *l; + for (l = service->priv->applications; l != NULL; l = l->next) { + Application *a = l->data; + + if (g_strcmp0(a->dbus_name, dbusaddress) == 0 && + g_strcmp0(a->menu, dbusobject) == 0) { + app = a; + break; + } + } + + if (app != NULL && app->dbus_proxy != NULL) { + g_dbus_proxy_call(app->dbus_proxy, "XAyatanaScrollAction", + g_variant_new("(iu)", delta, direction), + G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL, NULL); + } } else { g_warning("Calling method '%s' on the indicator service and it's unknown", method); } -- cgit v1.2.3 From df3e14484ca574da270a2e7d38a82e25e6b86ca1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Sat, 29 Jan 2011 03:26:08 +0100 Subject: Using the SNI method "Scroll" instead of "XAyatanaScrollAction" --- src/application-service-appstore.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) (limited to 'src/application-service-appstore.c') diff --git a/src/application-service-appstore.c b/src/application-service-appstore.c index abe0089..e6169a0 100644 --- a/src/application-service-appstore.c +++ b/src/application-service-appstore.c @@ -260,10 +260,11 @@ bus_method_call (GDBusConnection * connection, const gchar * sender, if (g_strcmp0(method, "GetApplications") == 0) { retval = get_applications(service); - } else if (g_strcmp0(method, "ApplicationScrollSignal") == 0) { + } else if (g_strcmp0(method, "ApplicationScrollEvent") == 0) { Application *app = NULL; const gchar *dbusaddress; const gchar *dbusobject; + gchar *orientation = NULL; gint delta; guint direction; @@ -281,9 +282,22 @@ bus_method_call (GDBusConnection * connection, const gchar * sender, } } - if (app != NULL && app->dbus_proxy != NULL) { - g_dbus_proxy_call(app->dbus_proxy, "XAyatanaScrollAction", - g_variant_new("(iu)", delta, direction), + switch (direction) { + case GDK_SCROLL_UP: + delta = -delta; + case GDK_SCROLL_DOWN: + orientation = "vertical"; + break; + + case GDK_SCROLL_LEFT: + delta = -delta; + case GDK_SCROLL_RIGHT: + orientation = "horizontal"; + } + + if (app != NULL && app->dbus_proxy != NULL && orientation != NULL) { + g_dbus_proxy_call(app->dbus_proxy, "Scroll", + g_variant_new("(is)", delta, orientation), G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL, NULL); } } else { -- cgit v1.2.3 From 70bc5ad4a4296583313a461642b908a8b6490069 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Sat, 29 Jan 2011 03:33:18 +0100 Subject: Use INDICATOR_OBJECT_SCROLL instead of GDK_SCROLL enum value --- src/application-service-appstore.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/application-service-appstore.c') diff --git a/src/application-service-appstore.c b/src/application-service-appstore.c index e6169a0..7cadc13 100644 --- a/src/application-service-appstore.c +++ b/src/application-service-appstore.c @@ -283,15 +283,15 @@ bus_method_call (GDBusConnection * connection, const gchar * sender, } switch (direction) { - case GDK_SCROLL_UP: + case INDICATOR_OBJECT_SCROLL_UP: delta = -delta; - case GDK_SCROLL_DOWN: + case INDICATOR_OBJECT_SCROLL_DOWN: orientation = "vertical"; break; - case GDK_SCROLL_LEFT: + case INDICATOR_OBJECT_SCROLL_LEFT: delta = -delta; - case GDK_SCROLL_RIGHT: + case INDICATOR_OBJECT_SCROLL_RIGHT: orientation = "horizontal"; } -- cgit v1.2.3