]> git.armaanb.net Git - chorizo.git/blobdiff - shortcuts.c
draft 8
[chorizo.git] / shortcuts.c
index e881cdcbbababa31a66954104838292ce5b1e0b6..054d48d429454609da61aa22bc0c999ec8685a8b 100644 (file)
@@ -6,8 +6,11 @@
 gboolean
 key_common(GtkWidget *widget, GdkEvent *event, gpointer data)
 {
+       WebKitPrintOperation *operation;
+       gboolean muted;
        struct Client *c = (struct Client *)data;
        gdouble now;
+
        if (event->type == GDK_KEY_PRESS) {
                guint mask = gtk_accelerator_get_default_mod_mask();
                int key = ((GdkEventKey *)event)->keyval;
@@ -15,30 +18,30 @@ key_common(GtkWidget *widget, GdkEvent *event, gpointer data)
                    GDK_CONTROL_MASK) {
                        const char *uri = webkit_web_view_get_uri(
                                WEBKIT_WEB_VIEW(c->web_view));
-                       if (GDK_KEY_y == key) {
+                       switch (key) {
+                       case GDK_KEY_y:
                                downloadmanager_show();
                                return TRUE;
-                       } else if (GDK_KEY_h == key) {
+                       case GDK_KEY_h:
                                webkit_web_view_go_back(
                                        WEBKIT_WEB_VIEW(c->web_view));
                                return TRUE;
-                       } else if (GDK_KEY_l == key) {
+                       case GDK_KEY_l:
                                webkit_web_view_go_forward(
                                        WEBKIT_WEB_VIEW(c->web_view));
                                return TRUE;
-                       } else if (GDK_KEY_s == key) {
+                       case GDK_KEY_s:
                                gtk_widget_grab_focus(c->location);
                                return TRUE;
-                       } else if (GDK_KEY_p == key) {
-                               WebKitPrintOperation *operation =
-                                       webkit_print_operation_new(
-                                               WEBKIT_WEB_VIEW(c->web_view));
+                       case GDK_KEY_p:
+                               operation = webkit_print_operation_new(
+                                       WEBKIT_WEB_VIEW(c->web_view));
                                GtkWidget *toplevel =
                                        gtk_widget_get_toplevel(mw.win);
                                webkit_print_operation_run_dialog(
                                        operation, GTK_WINDOW(toplevel));
                                return TRUE;
-                       } else if (GDK_KEY_g == key) {
+                       case GDK_KEY_g:
                                isearch(c, 2);
                                gtk_widget_grab_focus(c->web_view);
                                if (uri)
@@ -46,7 +49,8 @@ key_common(GtkWidget *widget, GdkEvent *event, gpointer data)
                                                GTK_ENTRY(c->location), uri);
                                webkit_web_view_run_javascript(
                                        WEBKIT_WEB_VIEW(c->web_view),
-                                       "window.getSelection().removeAllRanges();"
+                                       "window.getSelection()"
+                                       ".removeAllRanges();"
                                        "document.activeElement.blur();",
                                        NULL, NULL, c);
                                gtk_widget_hide(c->isearch_box);
@@ -55,137 +59,138 @@ key_common(GtkWidget *widget, GdkEvent *event, gpointer data)
                                gtk_editable_set_position(
                                        GTK_EDITABLE(c->wsearch), -1);
                                return TRUE;
-                       } else if (GDK_KEY_r == key) {
+                       case GDK_KEY_r:
                                webkit_web_view_reload_bypass_cache(
                                        WEBKIT_WEB_VIEW(c->web_view));
                                return TRUE;
-                       } else if (GDK_KEY_j == key) {
+                       case GDK_KEY_j:
                                for (int i = 0; i <= cfg_scroll_lines - 1;
                                     i++) {
                                        event->key.keyval = GDK_KEY_Down;
                                        gdk_event_put(event);
                                }
                                return TRUE;
-                       } else if (GDK_KEY_k == key) {
+                       case GDK_KEY_k:
                                for (int i = 0; i <= cfg_scroll_lines - 1;
                                     i++) {
                                        event->key.keyval = GDK_KEY_Up;
                                        gdk_event_put(event);
                                }
                                return TRUE;
-                       } else if (GDK_KEY_f == key) {
+                       case GDK_KEY_f:
                                isearch_init(c, 1);
                                return TRUE;
-                       } else if (GDK_KEY_q == key) {
+                       case GDK_KEY_q:
                                client_destroy(NULL, c);
                                return TRUE;
-                       } else if (GDK_KEY_1 == key) {
+                       case GDK_KEY_1:
                                change_tab(0, c);
                                return TRUE;
-                       } else if (GDK_KEY_2 == key) {
+                       case GDK_KEY_2:
                                change_tab(1, c);
                                return TRUE;
-                       } else if (GDK_KEY_3 == key) {
+                       case GDK_KEY_3:
                                change_tab(2, c);
                                return TRUE;
-                       } else if (GDK_KEY_4 == key) {
+                       case GDK_KEY_4:
                                change_tab(3, c);
                                return TRUE;
-                       } else if (GDK_KEY_5 == key) {
+                       case GDK_KEY_5:
                                change_tab(4, c);
                                return TRUE;
-                       } else if (GDK_KEY_6 == key) {
+                       case GDK_KEY_6:
                                change_tab(5, c);
                                return TRUE;
-                       } else if (GDK_KEY_7 == key) {
+                       case GDK_KEY_7:
                                change_tab(6, c);
                                gtk_notebook_set_current_page(
                                        GTK_NOTEBOOK(mw.notebook), 6);
                                return TRUE;
-                       } else if (GDK_KEY_8 == key) {
+                       case GDK_KEY_8:
                                change_tab(7, c);
                                return TRUE;
-                       } else if (GDK_KEY_9 == key) {
+                       case GDK_KEY_9:
                                change_tab(8, c);
                                return TRUE;
-                       } else if (GDK_KEY_u == key) {
+                       case GDK_KEY_u:
                                gtk_notebook_prev_page(
                                        GTK_NOTEBOOK(mw.notebook));
                                return TRUE;
-                       } else if (GDK_KEY_m == key) {
-                               gboolean muted = webkit_web_view_get_is_muted(
+                       case GDK_KEY_m:
+                               muted = webkit_web_view_get_is_muted(
                                        WEBKIT_WEB_VIEW(c->web_view));
                                webkit_web_view_set_is_muted(
                                        WEBKIT_WEB_VIEW(c->web_view), !muted);
                                changed_title(G_OBJECT(c->web_view), NULL, c);
                                return TRUE;
-                       } else if (GDK_KEY_t == key) {
+                       case GDK_KEY_t:
                                switch_tab = TRUE;
                                client_new(cfg_home_uri, NULL);
                                return TRUE;
-                       } else if (GDK_KEY_bracketleft == key) {
+                       case GDK_KEY_bracketleft:
                                reopen_tab();
                                return TRUE;
-                       } else if ((GDK_KEY_i == key) || (GDK_KEY_Tab == key)) {
+                       case GDK_KEY_i:
                                gtk_notebook_next_page(
                                        GTK_NOTEBOOK(mw.notebook));
                                return TRUE;
-                       } else if (GDK_KEY_d == key) {
+                       case GDK_KEY_d:
                                gtk_widget_grab_focus(c->wsearch);
                                return TRUE;
-                       } else if (GDK_KEY_equal == key) {
+                       case GDK_KEY_equal:
                                now = webkit_web_view_get_zoom_level(
                                        WEBKIT_WEB_VIEW(c->web_view));
                                webkit_web_view_set_zoom_level(
                                        WEBKIT_WEB_VIEW(c->web_view),
                                        now + 0.1);
                                return TRUE;
-                       } else if (GDK_KEY_minus == key) {
+                       case GDK_KEY_minus:
                                now = webkit_web_view_get_zoom_level(
                                        WEBKIT_WEB_VIEW(c->web_view));
                                webkit_web_view_set_zoom_level(
                                        WEBKIT_WEB_VIEW(c->web_view),
                                        now - 0.1);
                                return TRUE;
-                       } else if (GDK_KEY_0 == key) {
+                       case GDK_KEY_0:
                                webkit_web_view_set_zoom_level(
                                        WEBKIT_WEB_VIEW(c->web_view), 1);
                                return TRUE;
                        }
                } else if ((((GdkEventKey *)event)->state & mask) ==
                           (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) {
-                       if (GDK_KEY_ISO_Left_Tab == key) {
+                       switch (key) {
+                       case GDK_KEY_ISO_Left_Tab:
                                gtk_notebook_prev_page(
                                        GTK_NOTEBOOK(mw.notebook));
                                return TRUE;
-                       } else if (GDK_KEY_T == key) {
+                       case GDK_KEY_T:
                                reopen_tab();
                                return TRUE;
-                       } else if (GDK_KEY_exclam == key) {
+                       case GDK_KEY_exclam:
                                reorder_current_tab(1);
                                return TRUE;
-                       } else if (GDK_KEY_at == key) {
+                       case GDK_KEY_at:
                                reorder_current_tab(2);
                                return TRUE;
-                       } else if (GDK_KEY_numbersign == key) {
+                       case GDK_KEY_numbersign:
                                reorder_current_tab(3);
                                return TRUE;
-                       } else if (GDK_KEY_dollar == key) {
+                       case GDK_KEY_dollar:
                                reorder_current_tab(4);
                                return TRUE;
-                       } else if (GDK_KEY_percent == key) {
+                       case GDK_KEY_percent:
                                reorder_current_tab(5);
                                return TRUE;
-                       } else if (GDK_KEY_asciicircum == key) {
+                       case GDK_KEY_asciicircum:
                                reorder_current_tab(6);
                                return TRUE;
-                       } else if (GDK_KEY_ampersand == key) {
+                       case GDK_KEY_ampersand:
                                reorder_current_tab(7);
                                return TRUE;
-                       } else if (GDK_KEY_asterisk == key) {
+                       case GDK_KEY_asterisk:
                                reorder_current_tab(8);
                                return TRUE;
-                       } else if (GDK_KEY_parenleft == key) {
+                       case GDK_KEY_parenleft:
                                reorder_current_tab(9);
                                return TRUE;
                        }
@@ -220,19 +225,23 @@ key_isearch(GtkWidget *widget, GdkEvent *event, gpointer data)
 
        if (event->type == GDK_KEY_PRESS) {
                int key = ((GdkEventKey *)event)->keyval;
-               if ((GDK_KEY_KP_Enter == key) || (GDK_KEY_Return == key)) {
-                       int direction = (((GdkEventKey *)event)->state &
-                                        GDK_SHIFT_MASK) ?
-                                                     -1 :
-                                                     1;
+               // clang-format off
+               int direction =
+                       (((GdkEventKey *)event)->state & GDK_SHIFT_MASK)
+                               ? -1 : 1;
+               // clang-format on
+               switch (key) {
+               case GDK_KEY_KP_Enter:
+               case GDK_KEY_Return:
                        isearch(c, 0);
                        isearch(c, -1);
                        isearch(c, direction);
                        return TRUE;
-               } else if (GDK_KEY_Escape == key) {
+               case GDK_KEY_Escape:
                        isearch(c, 2);
                        gtk_widget_hide(c->isearch_box);
                        gtk_widget_grab_focus(c->web_view);
+                       return TRUE;
                }
        }
        return FALSE;
@@ -283,8 +292,9 @@ key_location(GtkWidget *widget, GdkEvent *event, gpointer data)
                gboolean shifted = ((((GdkEventKey *)event)->state & mask) ==
                                    GDK_SHIFT_MASK);
                int key = ((GdkEventKey *)event)->keyval;
-
-               if ((GDK_KEY_KP_Enter == key) || (GDK_KEY_Return == key)) {
+               switch (key) {
+               case GDK_KEY_KP_Enter:
+               case GDK_KEY_Return:
                        gtk_widget_grab_focus(c->web_view);
                        t = gtk_entry_get_text(GTK_ENTRY(c->location));
                        if (shifted) {
@@ -296,7 +306,7 @@ key_location(GtkWidget *widget, GdkEvent *event, gpointer data)
                                        ensure_uri_scheme(t));
                        }
                        return TRUE;
-               } else if (GDK_KEY_Escape == key) {
+               case GDK_KEY_Escape:
                        t = webkit_web_view_get_uri(
                                WEBKIT_WEB_VIEW(c->web_view));
                        gtk_entry_set_text(GTK_ENTRY(c->location),