diff options
| -rw-r--r-- | sb.c | 36 |
1 files changed, 18 insertions, 18 deletions
@@ -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; } |