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

{start,end}_selection -> {enter,exit}_command_mode

This commit is contained in:
Daniel Micay 2012-09-22 03:37:21 -04:00
parent 8163fa1e6d
commit 1c3a31626e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
termite.cc
View File

@ -226,14 +226,14 @@ static void update_selection(VteTerminal *vte, const select_info *select) {
vte_terminal_copy_primary(vte); vte_terminal_copy_primary(vte);
} }
static void start_selection(VteTerminal *vte, select_info *select) { static void enter_command_mode(VteTerminal *vte, select_info *select) {
vte_terminal_disconnect_pty_read(vte); vte_terminal_disconnect_pty_read(vte);
select->mode = vi_mode::command; select->mode = vi_mode::command;
vte_terminal_get_cursor_position(vte, &select->origin_col, &select->origin_row); vte_terminal_get_cursor_position(vte, &select->origin_col, &select->origin_row);
update_selection(vte, select); update_selection(vte, select);
} }
static void end_selection(VteTerminal *vte, select_info *select) { static void exit_command_mode(VteTerminal *vte, select_info *select) {
vte_terminal_set_cursor_position(vte, select->origin_col, select->origin_row); vte_terminal_set_cursor_position(vte, select->origin_col, select->origin_row);
vte_terminal_connect_pty_read(vte); vte_terminal_connect_pty_read(vte);
vte_terminal_select_none(vte); vte_terminal_select_none(vte);
@ -481,7 +481,7 @@ gboolean key_press_cb(VteTerminal *vte, GdkEventKey *event, keybind_info *info)
toggle_visual(vte, &info->select, vi_mode::visual_line); toggle_visual(vte, &info->select, vi_mode::visual_line);
break; break;
case GDK_KEY_Escape: case GDK_KEY_Escape:
end_selection(vte, &info->select); exit_command_mode(vte, &info->select);
break; break;
case GDK_KEY_y: case GDK_KEY_y:
vte_terminal_copy_clipboard(vte); vte_terminal_copy_clipboard(vte);
@ -511,7 +511,7 @@ gboolean key_press_cb(VteTerminal *vte, GdkEventKey *event, keybind_info *info)
break; break;
case GDK_KEY_Return: case GDK_KEY_Return:
open_selection(vte); open_selection(vte);
end_selection(vte, &info->select); exit_command_mode(vte, &info->select);
break; break;
case GDK_KEY_x: case GDK_KEY_x:
find_urls(vte, &info->panel); find_urls(vte, &info->panel);
@ -524,7 +524,7 @@ gboolean key_press_cb(VteTerminal *vte, GdkEventKey *event, keybind_info *info)
if (modifiers == (GDK_CONTROL_MASK|GDK_SHIFT_MASK)) { if (modifiers == (GDK_CONTROL_MASK|GDK_SHIFT_MASK)) {
switch (gdk_keyval_to_lower(event->keyval)) { switch (gdk_keyval_to_lower(event->keyval)) {
case GDK_KEY_space: case GDK_KEY_space:
start_selection(vte, &info->select); enter_command_mode(vte, &info->select);
return TRUE; return TRUE;
case GDK_KEY_c: case GDK_KEY_c:
vte_terminal_copy_clipboard(vte); vte_terminal_copy_clipboard(vte);