[#2916] Added missing files

sflphone-client-gnome/src/dbus/shortcutsmanager-introspec.xml

+<?xml version="1.0" ?>
+<node name="/org/sflphone/SFLphone">
+  <interface name="org.sflphone.SFLphone.ContactManager">
+    
+  <!-- Contacts related methods -->
+  
+    <!-- Called by the client to get all saved contacts -->
+    <method name="getContacts">
+      <arg type="s" name="accountID" direction="in"/>
+      <arg type="a{ss}" name="details" direction="out"/>
+    </method>
+    
+    <!-- Called by the client to save all local contacts -->
+    <method name="setContacts">
+      <arg type="s" name="accountID" direction="in"/>
+      <arg type="a{ss}" name="details" direction="in"/>
+    </method>
+   
+  <!--      ///////////////////////               -->
+
+  <!-- Presence related methods -->
+ 
+    <!-- Called by the client to set its new presence status -->
+    <method name="setPresence">
+      <arg type="s" name="accountID" direction="in"/>
+      <arg type="s" name="presence" direction="in"/>
+      <arg type="s" name="additionalInfo" direction="in"/>
+    </method>
+  
+    <!-- Called by the daemon when a contact presence changes -->
+    <method name="setContactPresence">
+      <arg type="s" name="accountID" direction="in"/>
+      <arg type="s" name="presence" direction="in"/>
+      <arg type="s" name="additionalInfo" direction="in"/>
+    </method>
+
+  </interface>
+</node>

sflphone-client-gnome/src/shortcuts.c

+/*
+ *  Copyright (C) 2010 Savoir-Faire Linux inc.
+ *  Author: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <string.h>
+#include <stdlib.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+#include <X11/Xlib.h>
+#include <X11/XF86keysym.h>
+#include <gdk/gdkx.h>
+#include <dbus/dbus-glib.h>
+
+#include "shortcuts.h"
+#include "mainwindow.h"
+#include "callable_obj.h"
+#include "sflphone_const.h"
+#include "dbus.h"
+
+// used to store accelerator config
+static Accelerator* accelerators_list;
+
+// used to store config (for dbus calls)
+static GHashTable* shortcutsMap;
+
+/*
+ * Callbacks
+ */
+
+static void
+pick_up_callback()
+{
+  sflphone_pick_up();
+}
+
+static void
+hang_up_callback()
+{
+  sflphone_hang_up();
+}
+
+static void
+popup_window_callback()
+{
+  gtk_widget_hide(GTK_WIDGET(get_main_window()));
+  gtk_widget_show(GTK_WIDGET(get_main_window()));
+  gtk_window_move (GTK_WINDOW (get_main_window ()), dbus_get_window_position_x (), dbus_get_window_position_y ());
+}
+
+static void
+default_callback()
+{
+  ERROR("Missing shortcut callback");
+}
+
+/*
+ * return callback corresponding to a specific action
+ */
+static void*
+get_action_callback(const gchar* action)
+{
+  if(strcmp(action, "pick_up") == 0)
+    return pick_up_callback;
+
+  if(strcmp(action, "hang_up") == 0)
+    return hang_up_callback;
+
+  if(strcmp(action, "popup_window") == 0)
+    return popup_window_callback;
+
+  return default_callback;
+}
+
+/*
+ * Handle bindings
+ */
+
+/*
+ * Remove all existing bindings
+ */
+static void
+remove_bindings()
+{
+  GdkDisplay *display;
+  GdkScreen *screen;
+  GdkWindow *root;
+
+  display = gdk_display_get_default();
+
+  int i = 0;
+  int j = 0;
+  while (accelerators_list[i].action != NULL)
+    {
+      if (accelerators_list[i].value != 0)
+        {
+          for (j = 0; j < gdk_display_get_n_screens(display); j++)
+            {
+              screen = gdk_display_get_screen(display, j);
+
+              if (screen != NULL)
+                {
+                  root = gdk_screen_get_root_window(screen);
+                  ungrab_key(accelerators_list[i].value, root);
+                  gdk_window_remove_filter(root, filter_keys, NULL);
+                }
+            }
+        }
+
+      i++;
+    }
+}
+
+/*
+ * Create all bindings, using stored configuration
+ */
+static void
+create_bindings()
+{
+  GdkDisplay *display;
+  GdkScreen *screen;
+  GdkWindow *root;
+
+  display = gdk_display_get_default();
+
+  int i = 0;
+  int j = 0;
+  while (accelerators_list[i].action != NULL)
+    {
+      if (accelerators_list[i].value != 0)
+        {
+          // update value in hashtable (used for dbus calls)
+          g_hash_table_replace(shortcutsMap, g_strdup(accelerators_list[i].action),
+              GINT_TO_POINTER(accelerators_list[i].value));
+
+          // updated GDK bindings
+          for (j = 0; j < gdk_display_get_n_screens(display); j++)
+            {
+              screen = gdk_display_get_screen(display, j);
+
+              if (screen != NULL)
+                {
+                  root = gdk_screen_get_root_window(screen);
+                  grab_key(accelerators_list[i].value, root);
+                  gdk_window_add_filter(root, filter_keys, NULL);
+                }
+            }
+        }
+      i++;
+    }
+}
+
+/*
+ * Initialize a specific binding
+ */
+static void
+initialize_binding(const gchar* action, const guint code)
+{
+  //initialize_shortcuts_keys();
+  int index = 0;
+  while (accelerators_list[index].action != NULL)
+    {
+      if (strcmp(action, accelerators_list[index].action) == 0)
+        {
+          break;
+        }
+      index++;
+    }
+
+  if (accelerators_list[index].action == NULL)
+    {
+      ERROR("Should not happen: cannot find corresponding action");
+      return;
+    }
+
+  // update config value
+  accelerators_list[index].value = code;
+
+  // update bindings
+  create_bindings();
+}
+
+/*
+ * Prepare accelerators list
+ */
+static void
+initialize_accelerators_list()
+{
+  GList* shortcutsKeys = g_hash_table_get_keys(shortcutsMap);
+
+  accelerators_list = (Accelerator*)malloc((g_list_length(shortcutsKeys) + 1) *sizeof(Accelerator));
+
+  GList* shortcutsKeysElement;
+  int index = 0;
+  for (shortcutsKeysElement = shortcutsKeys; shortcutsKeysElement; shortcutsKeysElement
+      = shortcutsKeysElement->next)
+    {
+      gchar* action = shortcutsKeysElement->data;
+
+      accelerators_list[index].action = g_strdup(action);
+      accelerators_list[index].callback = get_action_callback(action);
+      accelerators_list[index].mask = 0;
+      accelerators_list[index].value = 0;
+
+      index++;
+    }
+
+  // last element must be null
+  accelerators_list[index].action = 0;
+  accelerators_list[index].callback = 0;
+  accelerators_list[index].mask = 0;
+  accelerators_list[index].value = 0;
+}
+
+/*
+ * "Public" functions
+ */
+
+/*
+ * Update current bindings with a new value
+ */
+void
+shortcuts_update_bindings(const guint index, const guint code)
+{
+  // first remove all existing bindings
+  remove_bindings();
+
+  // store new value
+  accelerators_list[index].value = code;
+
+  // recreate all bindings
+  create_bindings();
+
+  // update configuration
+  dbus_set_shortcuts(shortcutsMap);
+}
+
+/*
+ * Initialize bindings with configuration retrieved from dbus
+ */
+void
+shortcuts_initialize_bindings()
+{
+  // get shortcuts stored in config through dbus
+  shortcutsMap = dbus_get_shortcuts();
+
+  // initialize list of keys
+  initialize_accelerators_list();
+
+  // iterate through keys to initialize bindings
+  GList* shortcutsKeys = g_hash_table_get_keys(shortcutsMap);
+  GList* shortcutsKeysElement;
+  for (shortcutsKeysElement = shortcutsKeys; shortcutsKeysElement; shortcutsKeysElement
+      = shortcutsKeysElement->next)
+    {
+      gchar* key = shortcutsKeysElement->data;
+      int shortcut = (size_t) g_hash_table_lookup(shortcutsMap, key);
+      if(shortcut != 0)
+        initialize_binding(key, shortcut);
+    }
+}
+
+/*
+ * Initialize bindings with configuration retrieved from dbus
+ */
+void
+shortcuts_destroy_bindings()
+{
+  // remove bindings
+  remove_bindings();
+
+  // free pointers
+  int index = 0;
+  while (accelerators_list[index].action != NULL)
+    {
+      g_free(accelerators_list[index].action);
+      index++;
+    }
+  free(accelerators_list);
+}
+
+Accelerator*
+shortcuts_get_list()
+{
+  return accelerators_list;
+}
+
+/*
+ * XLib functions
+ */
+
+/*
+ * filter used when an event is catched
+ */
+static GdkFilterReturn
+filter_keys(GdkXEvent *xevent, GdkEvent *event, gpointer data)
+{
+  XEvent *xev;
+  XKeyEvent *key;
+
+  xev = (XEvent *) xevent;
+  if (xev->type != KeyPress)
+    {
+      return GDK_FILTER_CONTINUE;
+    }
+
+  key = (XKeyEvent *) xevent;
+
+  // try to find corresponding action
+  int i = 0;
+  while (accelerators_list[i].action != NULL)
+    {
+      if (accelerators_list[i].value == key->keycode)
+        {
+          DEBUG("catched key for action: %s (%d)", accelerators_list[i].action,
+              accelerators_list[i].value);
+
+          // call associated callback function
+          accelerators_list[i].callback();
+
+          return GDK_FILTER_REMOVE;
+        }
+      i++;
+    }
+
+  DEBUG("Should not be reached :(\n");
+  return GDK_FILTER_CONTINUE;
+}
+
+/*
+ * Remove key "catcher" from GDK layer
+ */
+static void
+ungrab_key(int key_code, GdkWindow *root)
+{
+  gdk_error_trap_push();
+
+  XUngrabKey(GDK_DISPLAY(), key_code, 0, GDK_WINDOW_XID(root));
+  XUngrabKey(GDK_DISPLAY(), key_code, Mod2Mask, GDK_WINDOW_XID(root));
+  XUngrabKey(GDK_DISPLAY(), key_code, Mod5Mask, GDK_WINDOW_XID(root));
+  XUngrabKey(GDK_DISPLAY(), key_code, LockMask, GDK_WINDOW_XID(root));
+  XUngrabKey(GDK_DISPLAY(), key_code, Mod2Mask | Mod5Mask, GDK_WINDOW_XID(root));
+  XUngrabKey(GDK_DISPLAY(), key_code, Mod2Mask | LockMask, GDK_WINDOW_XID(root));
+  XUngrabKey(GDK_DISPLAY(), key_code, Mod5Mask | LockMask, GDK_WINDOW_XID(root));
+  XUngrabKey(GDK_DISPLAY(), key_code, Mod2Mask | Mod5Mask | LockMask,
+      GDK_WINDOW_XID(root));
+
+  gdk_flush();
+  if (gdk_error_trap_pop())
+    {
+      ERROR("Error ungrabbing key");
+    }
+}
+
+/*
+ * Add key "catcher" to GDK layer
+ */
+static void
+grab_key(int key_code, GdkWindow *root)
+{
+
+  gdk_error_trap_push();
+
+  XGrabKey(GDK_DISPLAY(), key_code, 0, GDK_WINDOW_XID(root), True,
+      GrabModeAsync, GrabModeAsync);
+  XGrabKey(GDK_DISPLAY(), key_code, Mod2Mask, GDK_WINDOW_XID(root), True,
+      GrabModeAsync, GrabModeAsync);
+  XGrabKey(GDK_DISPLAY(), key_code, Mod5Mask, GDK_WINDOW_XID(root), True,
+      GrabModeAsync, GrabModeAsync);
+  XGrabKey(GDK_DISPLAY(), key_code, LockMask, GDK_WINDOW_XID(root), True,
+      GrabModeAsync, GrabModeAsync);
+  XGrabKey(GDK_DISPLAY(), key_code, Mod2Mask | Mod5Mask, GDK_WINDOW_XID(root),
+      True, GrabModeAsync, GrabModeAsync);
+  XGrabKey(GDK_DISPLAY(), key_code, Mod2Mask | LockMask, GDK_WINDOW_XID(root),
+      True, GrabModeAsync, GrabModeAsync);
+  XGrabKey(GDK_DISPLAY(), key_code, Mod5Mask | LockMask, GDK_WINDOW_XID(root),
+      True, GrabModeAsync, GrabModeAsync);
+  XGrabKey(GDK_DISPLAY(), key_code, Mod2Mask | Mod5Mask | LockMask,
+      GDK_WINDOW_XID(root), True, GrabModeAsync, GrabModeAsync);
+
+  gdk_flush();
+  if (gdk_error_trap_pop())
+    {
+      ERROR("Error grabbing key");
+    }
+}

sflphone-client-gnome/src/shortcuts.h

+/*
+ *  Copyright (C) 2010 Savoir-Faire Linux inc.
+ *  Author: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef SHORTCUTS_H_
+#define SHORTCUTS_H_
+
+typedef struct
+{
+  gchar *action;
+  GdkModifierType mask;
+  guint value;
+  void
+  (*callback)(void);
+} Accelerator;
+
+static void
+grab_key(int key_code, GdkWindow *root);
+
+static void
+ungrab_key(int key_code, GdkWindow *root);
+
+static GdkFilterReturn
+filter_keys(GdkXEvent *xevent, GdkEvent *event, gpointer data);
+
+static void
+remove_bindings();
+
+static void
+create_bindings();
+
+static void
+pick_up_callback();
+
+static void
+hang_up_callback();
+
+static void
+initialize_binding(const gchar* action, const guint code);
+
+static void
+initialize_shortcuts_keys();
+
+static void*
+get_action_callback(const gchar* action);
+
+/*
+ * "Public" functions
+ */
+
+void
+shortcuts_initialize_bindings();
+
+void
+shortcuts_update_bindings(const guint index, const guint code);
+
+void
+shortcuts_destroy_bindings();
+
+Accelerator*
+shortcuts_get_list();
+
+#endif /* SHORTCUTS_H_ */