s3rius/squeekboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ignore motion event when button is pressed.

Browse Source
This commit is contained in:
Daiki Ueno
2010-07-22 15:56:43 +09:00
parent 7c2457e659
commit 94219bd31e
2 changed files with 50 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
eek/eek-clutter-key-actor.c
View File

@ -52,6 +52,7 @@ struct _EekClutterKeyActorPrivate
EekClutterDrawingContext *context;
EekKey *key;
ClutterActor *texture;
gboolean is_pressed;
};
static ClutterActor *get_texture (EekClutterKeyActor *actor);
@ -195,8 +196,11 @@ on_button_press_event (ClutterActor *actor,
EekClutterKeyActorPrivate *priv =
EEK_CLUTTER_KEY_ACTOR_GET_PRIVATE(actor);
/* priv->key will send back PRESSED event of actor. */
g_signal_emit_by_name (priv->key, "pressed");
if (!priv->is_pressed) {
priv->is_pressed = TRUE;
/* priv->key will send back PRESSED event of actor. */
g_signal_emit_by_name (priv->key, "pressed");
}
}
static void
@ -207,8 +211,27 @@ on_button_release_event (ClutterActor *actor,
EekClutterKeyActorPrivate *priv =
EEK_CLUTTER_KEY_ACTOR_GET_PRIVATE(actor);
/* priv->key will send back RELEASED event of actor. */
g_signal_emit_by_name (priv->key, "released");
if (priv->is_pressed) {
priv->is_pressed = FALSE;
/* priv->key will send back RELEASED event of actor. */
g_signal_emit_by_name (priv->key, "released");
}
}
static gboolean
on_leave_event (ClutterActor *actor,
ClutterEvent *event,
gpointer user_data)
{
EekClutterKeyActorPrivate *priv =
EEK_CLUTTER_KEY_ACTOR_GET_PRIVATE(actor);
if (priv->is_pressed) {
priv->is_pressed = FALSE;
/* priv->key will send back RELEASED event of actor. */
g_signal_emit_by_name (priv->key, "released");
}
return FALSE;
}
static void
@ -219,12 +242,15 @@ eek_clutter_key_actor_init (EekClutterKeyActor *self)
priv = self->priv = EEK_CLUTTER_KEY_ACTOR_GET_PRIVATE(self);
priv->key = NULL;
priv->texture = NULL;
clutter_actor_set_reactive (CLUTTER_ACTOR(self), TRUE);
g_signal_connect (self, "button-press-event",
G_CALLBACK (on_button_press_event), NULL);
g_signal_connect (self, "button-release-event",
G_CALLBACK (on_button_release_event), NULL);
g_signal_connect (self, "leave-event",
G_CALLBACK (on_leave_event), NULL);
}
ClutterActor *

23
eek/eek-gtk-keyboard.c
View File

@ -59,6 +59,8 @@ struct _EekGtkKeyboardPrivate
PangoFontDescription *fonts[EEK_KEYSYM_CATEGORY_LAST];
gdouble scale;
EekKey *key;
};
static void prepare_keyboard_pixmap (EekGtkKeyboard *keyboard);
@ -155,6 +157,7 @@ eek_gtk_keyboard_init (EekGtkKeyboard *self)
g_object_unref);
memset (priv->fonts, 0, sizeof priv->fonts);
priv->scale = 1.0;
priv->key = NULL;
}
/**
@ -413,8 +416,8 @@ key_shrink (EekGtkKeyboard *keyboard, EekKey *key)
static gboolean
on_button_event (GtkWidget *widget,
GdkEventButton *event,
gpointer user_data)
GdkEventButton *event,
gpointer user_data)
{
EekElement *keyboard = user_data, *section, *key;
EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(keyboard);
@ -434,12 +437,22 @@ on_button_event (GtkWidget *widget,
if (key)
switch (event->type) {
case GDK_BUTTON_PRESS:
if (priv->key == key)
return FALSE;
if (priv->key) {
key_shrink (EEK_GTK_KEYBOARD(keyboard), EEK_KEY(priv->key));
g_signal_emit_by_name (keyboard, "key-released", priv->key);
}
key_enlarge (EEK_GTK_KEYBOARD(keyboard), EEK_KEY(key));
g_signal_emit_by_name (keyboard, "key-pressed", key);
priv->key = key;
return TRUE;
case GDK_BUTTON_RELEASE:
key_shrink (EEK_GTK_KEYBOARD(keyboard), EEK_KEY(key));
g_signal_emit_by_name (keyboard, "key-released", key);
if (!priv->key)
return FALSE;
key_shrink (EEK_GTK_KEYBOARD(keyboard), EEK_KEY(priv->key));
g_signal_emit_by_name (keyboard, "key-released", priv->key);
priv->key = NULL;
return TRUE;
default:
return FALSE;
@ -447,6 +460,7 @@ on_button_event (GtkWidget *widget,
}
return FALSE;
}
static void
on_size_allocate (GtkWidget *widget,
GtkAllocation *allocation,
@ -469,6 +483,7 @@ on_size_allocate (GtkWidget *widget,
allocation->width / bounds.width :
allocation->height / bounds.height;
}
GtkWidget *
eek_gtk_keyboard_get_widget (EekGtkKeyboard *keyboard)
{