Federated_Computer/federated-calendar
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

window: simplified key handler code

Browse Source 
Instead of treating every case, use the builtin gtk_search_bar_handle_event function.
This commit is contained in:
Georges Basile Stavracas Neto
2014-12-04 17:10:53 -05:00
committed by Erick Pérez Castellanos
parent 97cfe4fd79
commit c0a16ac06a
1 changed files with 7 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gcal-window.c
+7 -39
View File
@@ -105,7 +105,7 @@ enum
#define SAVE_GEOMETRY_ID_TIMEOUT 100 /* ms */ #define SAVE_GEOMETRY_ID_TIMEOUT 100 /* ms */
static gboolean key_pressed (GtkWidget *widget, static gboolean key_pressed (GtkWidget *widget,
GdkEventKey *event, GdkEvent *event,
gpointer user_data); gpointer user_data);
static void date_updated (GtkButton *buttton, static void date_updated (GtkButton *buttton,
@@ -206,52 +206,20 @@ static void gcal_window_undo_remove_event (GtkButton *b
G_DEFINE_TYPE_WITH_PRIVATE (GcalWindow, gcal_window, GTK_TYPE_APPLICATION_WINDOW) G_DEFINE_TYPE_WITH_PRIVATE (GcalWindow, gcal_window, GTK_TYPE_APPLICATION_WINDOW)
static gboolean static gboolean
key_pressed (GtkWidget *widget, key_pressed (GtkWidget *widget,
GdkEventKey *event, GdkEvent *event,
gpointer user_data) gpointer user_data)
{ {
GcalWindowPrivate *priv; GcalWindowPrivate *priv;
GdkModifierType modifiers;
priv = gcal_window_get_instance_private (GCAL_WINDOW (user_data)); priv = gcal_window_get_instance_private (GCAL_WINDOW (user_data));
modifiers = gtk_accelerator_get_default_mod_mask ();
/* case 1:close leave new event mode */ /* special case: write in new-event-widget entry */
if (priv->new_event_mode &&
event->keyval == GDK_KEY_Escape)
{
set_new_event_mode (GCAL_WINDOW (user_data), FALSE);
return TRUE;
}
/* case 2: write in new-event-widget entry */
if (priv->new_event_mode) if (priv->new_event_mode)
return FALSE; return FALSE;
/* case 3: leave search-mode*/ return gtk_search_bar_handle_event (GTK_SEARCH_BAR (priv->search_bar),
if (priv->search_mode && event->keyval == GDK_KEY_Escape) event);
{
gcal_window_set_search_mode (GCAL_WINDOW (widget), FALSE);
return TRUE;
}
/* case 4: write into search-mode entry */
if (priv->search_mode)
return FALSE;
/* case 5: open search-mode */
if (!priv->search_mode &&
gdk_keyval_to_unicode (event->keyval) != 0 &&
((event->state & modifiers & GDK_META_MASK) == 0) &&
((event->state & modifiers & GDK_SUPER_MASK) == 0) &&
((event->state & modifiers & GDK_HYPER_MASK) == 0) &&
((event->state & modifiers & GDK_CONTROL_MASK) == 0))
{
gcal_window_set_search_mode (GCAL_WINDOW (widget), TRUE);
return FALSE;
}
return FALSE;
} }
static void static void