aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormutantturkey <crazycal00@gmail.com>2010-05-08 14:16:17 -0400
committermutantturkey <crazycal00@gmail.com>2010-05-08 14:16:17 -0400
commit7aee9dcec0012c75cafa14ab4b5e7a70bc34c857 (patch)
tree4008c2028b5f6aacb2fa7ff96c31c8fb3ad8efc3
parentc7fc46833b69228f926497b4e6ed713effe4b708 (diff)
key_press_cb only evaluates gdk_keyval_to_lower ONCE instead of every if/then statement, speeds up processing time.
-rw-r--r--sb.c36
1 files changed, 18 insertions, 18 deletions
diff --git a/sb.c b/sb.c
index f8aaa57..d62e63d 100644
--- a/sb.c
+++ b/sb.c
@@ -173,8 +173,8 @@ static void config() {
gtk_box_pack_start(GTK_BOX(w.vbox), w.notebook, TRUE, TRUE, 0);
/* status bar*/
- //w.status = gtk_statusbar_new();
- //gtk_box_pack_start(GTK_BOX(w.vbox), w.status, FALSE, FALSE, 0);
+ w.status = gtk_statusbar_new();
+ gtk_box_pack_start(GTK_BOX(w.vbox), w.status, FALSE, FALSE, 0);
w.win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_window_set_default_size(GTK_WINDOW(w.win), 800, 800);
@@ -193,25 +193,25 @@ static void config() {
}
gboolean key_press_cb (GtkWidget *widget, GdkEventKey *event) {
-
-
+ guint(g) = gdk_keyval_to_lower(event->keyval);
+
if (event->state == GDK_CONTROL_MASK) {
- if (gdk_keyval_to_lower(event->keyval) == GDK_l) { gtk_widget_grab_focus(GTK_WIDGET(w.bar)); return TRUE; }
- if (gdk_keyval_to_lower(event->keyval) == GDK_j) { go_cb(FALSE); return TRUE; }
- if (gdk_keyval_to_lower(event->keyval) == GDK_k) { go_cb(TRUE); return TRUE; }
- if (gdk_keyval_to_lower(event->keyval) == GDK_Page_Up) { gtk_notebook_prev_page(GTK_NOTEBOOK(w.notebook)); }
- if (gdk_keyval_to_lower(event->keyval) == GDK_Page_Down) { gtk_notebook_next_page(GTK_NOTEBOOK(w.notebook)); }
- if (gdk_keyval_to_lower(event->keyval) == GDK_t) { tab_new(); return TRUE; }
- if (gdk_keyval_to_lower(event->keyval) == GDK_w) { tab_close(); return TRUE; }
- if (gdk_keyval_to_lower(event->keyval) == GDK_bracketright) { tab_zoom(TRUE); return TRUE; }
- if (gdk_keyval_to_lower(event->keyval) == GDK_bracketleft) { tab_zoom(FALSE); return TRUE; }
- if (gdk_keyval_to_lower(event->keyval) == GDK_r) { reload(); return TRUE; }
-
- if (gtk_widget_has_focus(w.bar) && gdk_keyval_to_lower(event->keyval) == GDK_Return) { load_uri(g_strconcat(defaultsearchengine, gtk_entry_get_text(GTK_ENTRY(w.bar)), NULL)); return TRUE; }
+ if(g == GDK_l) {gtk_widget_grab_focus(GTK_WIDGET(w.bar)); return TRUE; }
+ if (g == GDK_j) { go_cb(FALSE); return TRUE; }
+ if (g == GDK_k) { go_cb(TRUE); return TRUE; }
+ if (g == GDK_Page_Up) { gtk_notebook_prev_page(GTK_NOTEBOOK(w.notebook)); }
+ if (g == GDK_Page_Down) { gtk_notebook_next_page(GTK_NOTEBOOK(w.notebook)); }
+ if (g == GDK_t) { tab_new(); return TRUE; }
+ if (g == GDK_w) { tab_close(); return TRUE; }
+ if (g == GDK_bracketright) { tab_zoom(TRUE); return TRUE; }
+ if (g == GDK_bracketleft) { tab_zoom(FALSE); return TRUE; }
+ if (g == GDK_r) { reload(); return TRUE; }
+ if (g == GDK_Return) { load_uri(g_strconcat(defaultsearchengine, gtk_entry_get_text(GTK_ENTRY(w.bar)), NULL)); return TRUE; }
else { return FALSE; }
+
}
- if (gtk_widget_has_focus(w.bar) && gdk_keyval_to_lower(event->keyval) == GDK_Escape) { gtk_widget_grab_focus(GTK_WIDGET(w.notebook)); return TRUE; }
-
+ if (gtk_widget_has_focus(w.bar) && g == GDK_Escape) { gtk_widget_grab_focus(GTK_WIDGET(w.notebook)); return TRUE; }
+
return FALSE;
}