Changeset 2663 for trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer-panel.c

Timestamp:

08/08/07 13:49:27 (6 years ago)

Author:

njp

Message:

2007-08-08 Neil J. Patel <njp@…>

• src/moko-dialer-panel.c: (moko_dialer_panel_init), (moko_dialer_panel_pressed): Implement tap-and-hold events for the keys, so you can enter w, + and p.

• src/moko-keypad.c: (on_delete_event), (moko_keypad_init): Implement tap-and-hold for the delete button, so the holf event will cause the texview to 'empty'.

• src/moko-notify.c: Some spacing fixes.

File:

• trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer-panel.c (modified) (4 diffs)

trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer-panel.c

@@ -31 +31 @@
      static gboolean moko_dialer_panel_pressed (MokoDigitButton * button,
                                                 GdkEventButton * event,
-                                                gpointer data);
+                                                MokoDialerPanel *panel);
 
      static gint moko_dialer_panel_signals[LAST_SIGNAL] = { 0 };
@@ -135 +135 @@
 
       g_signal_connect ((gpointer) moko_dialer_panel->buttons[i][j],
+                        "button_press_event", 
+                        G_CALLBACK (moko_dialer_panel_pressed),
+                        moko_dialer_panel);
+      g_signal_connect ((gpointer) moko_dialer_panel->buttons[i][j],
                         "button_release_event",
                         G_CALLBACK (moko_dialer_panel_pressed),
@@ -144 +148 @@
 }
 
-
-
+static gboolean
+moko_dialer_panel_pressed (MokoDigitButton *button, 
+                           GdkEventButton *event,
+                           MokoDialerPanel *panel)
+{
+#define TAP_HOLD_TIME 800
+  static guint32 last_event = 0;
+  gchar value = -1;
+
+  if (event->type == GDK_BUTTON_PRESS)
+  {
+    last_event = event->time;
+  }
+  else if (event->type == GDK_BUTTON_RELEASE)
+  {
+    guint32 diff = event->time - last_event;
+
+    if (diff < TAP_HOLD_TIME)
+    {
+      /* Normal 'clicked' event */
+      value = moko_digit_button_get_left (button);
+      g_signal_emit (panel,
+                     moko_dialer_panel_signals[CLICKED_SIGNAL], 0, value);
+    }
+    else
+    {
+      /* Tap-and-hold event */
+      value = moko_digit_button_get_right (button);
+      
+      if (value == -1)
+        value = moko_digit_button_get_left (button);
+      
+      g_signal_emit (panel,
+                     moko_dialer_panel_signals[CLICKED_SIGNAL], 0, value);
+    }
+  }
+  return FALSE;
+}
+
+/* 
+ * Leave this for when tap-and-hold is implemented at the Gtk-level 
+ */
+#if 0
 static gboolean
 moko_dialer_panel_pressed (MokoDigitButton * button, GdkEventButton * event,
@@ -191 +236 @@
   return FALSE;
 }
-
+#endif