takino
/
termite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

selecting a url should exit command mode

This commit is contained in:
Simon Gomizelj 2012-09-27 12:26:12 -04:00
parent 4e8721b365
commit 21d15c0cb6
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
termite.cc
View File

@ -72,7 +72,7 @@ static void launch_browser(char *url);
static void window_title_cb(VteTerminal *vte, gboolean *dynamic_title); static void window_title_cb(VteTerminal *vte, gboolean *dynamic_title);
static gboolean key_press_cb(VteTerminal *vte, GdkEventKey *event, keybind_info *info); static gboolean key_press_cb(VteTerminal *vte, GdkEventKey *event, keybind_info *info);
static gboolean entry_key_press_cb(GtkEntry *entry, GdkEventKey *event, search_panel_info *info); static gboolean entry_key_press_cb(GtkEntry *entry, GdkEventKey *event, keybind_info *info);
static gboolean position_overlay_cb(GtkBin *overlay, GtkWidget *widget, GdkRectangle *alloc); static gboolean position_overlay_cb(GtkBin *overlay, GtkWidget *widget, GdkRectangle *alloc);
static gboolean button_press_cb(VteTerminal *vte, GdkEventButton *event, gboolean *clickable_url); static gboolean button_press_cb(VteTerminal *vte, GdkEventButton *event, gboolean *clickable_url);
static void beep_cb(GtkWidget *vte, gboolean *urgent_on_bell); static void beep_cb(GtkWidget *vte, gboolean *urgent_on_bell);
@ -575,7 +575,7 @@ static void synthesize_keypress(GtkWidget *widget, unsigned keyval) {
gdk_event_put(&new_event); gdk_event_put(&new_event);
} }
gboolean entry_key_press_cb(GtkEntry *entry, GdkEventKey *event, search_panel_info *info) { gboolean entry_key_press_cb(GtkEntry *entry, GdkEventKey *event, keybind_info *info) {
gboolean ret = FALSE; gboolean ret = FALSE;
if (event->keyval == GDK_KEY_Escape) { if (event->keyval == GDK_KEY_Escape) {
@ -583,24 +583,25 @@ gboolean entry_key_press_cb(GtkEntry *entry, GdkEventKey *event, search_panel_in
} else if (event->keyval == GDK_KEY_Return) { } else if (event->keyval == GDK_KEY_Return) {
const char *text = gtk_entry_get_text(entry); const char *text = gtk_entry_get_text(entry);
switch (info->mode) { switch (info->panel.mode) {
case overlay_mode::search: case overlay_mode::search:
search(info->vte, text, false); search(info->panel.vte, text, false);
break; break;
case overlay_mode::rsearch: case overlay_mode::rsearch:
search(info->vte, text, true); search(info->panel.vte, text, true);
break; break;
case overlay_mode::completion: case overlay_mode::completion:
vte_terminal_feed_child(info->vte, text, -1); vte_terminal_feed_child(info->panel.vte, text, -1);
break; break;
case overlay_mode::urlselect: case overlay_mode::urlselect:
launch_url(text, info); launch_url(text, &info->panel);
exit_command_mode(info->panel.vte, &info->select);
break; break;
case overlay_mode::hidden: case overlay_mode::hidden:
break; break;
} }
ret = TRUE; ret = TRUE;
} else if (info->mode == overlay_mode::completion) { } else if (info->panel.mode == overlay_mode::completion) {
if (event->keyval == GDK_KEY_Tab) { if (event->keyval == GDK_KEY_Tab) {
synthesize_keypress(GTK_WIDGET(entry), GDK_KEY_Down); synthesize_keypress(GTK_WIDGET(entry), GDK_KEY_Down);
return TRUE; return TRUE;
@ -614,13 +615,13 @@ gboolean entry_key_press_cb(GtkEntry *entry, GdkEventKey *event, search_panel_in
} }
if (ret) { if (ret) {
if (info->mode == overlay_mode::urlselect) { if (info->panel.mode == overlay_mode::urlselect) {
gtk_widget_hide(info->da); gtk_widget_hide(info->panel.da);
info->url_list.clear(); info->panel.url_list.clear();
} }
info->mode = overlay_mode::hidden; info->panel.mode = overlay_mode::hidden;
gtk_widget_hide(info->panel); gtk_widget_hide(info->panel.panel);
gtk_widget_grab_focus(GTK_WIDGET(info->vte)); gtk_widget_grab_focus(GTK_WIDGET(info->panel.vte));
} }
return ret; return ret;
} }
@ -1091,7 +1092,7 @@ int main(int argc, char **argv) {
g_signal_connect(window, "destroy", G_CALLBACK(gtk_main_quit), NULL); g_signal_connect(window, "destroy", G_CALLBACK(gtk_main_quit), NULL);
g_signal_connect(vte, "child-exited", G_CALLBACK(exit_with_status), NULL); g_signal_connect(vte, "child-exited", G_CALLBACK(exit_with_status), NULL);
g_signal_connect(vte, "key-press-event", G_CALLBACK(key_press_cb), &info); g_signal_connect(vte, "key-press-event", G_CALLBACK(key_press_cb), &info);
g_signal_connect(info.panel.entry, "key-press-event", G_CALLBACK(entry_key_press_cb), &info.panel); g_signal_connect(info.panel.entry, "key-press-event", G_CALLBACK(entry_key_press_cb), &info);
g_signal_connect(panel_overlay, "get-child-position", G_CALLBACK(position_overlay_cb), NULL); g_signal_connect(panel_overlay, "get-child-position", G_CALLBACK(position_overlay_cb), NULL);
g_signal_connect(vte, "button-press-event", G_CALLBACK(button_press_cb), &info.config.clickable_url); g_signal_connect(vte, "button-press-event", G_CALLBACK(button_press_cb), &info.config.clickable_url);
g_signal_connect(vte, "beep", G_CALLBACK(beep_cb), &info.config.urgent_on_bell); g_signal_connect(vte, "beep", G_CALLBACK(beep_cb), &info.config.urgent_on_bell);