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

Merge pull request #361 from jelly/move_cursor_zoom_to_general_bindings 

Move zoom in/out/reset bindings to general
This commit is contained in:
jelle van der Waa 2016-06-05 14:21:16 +02:00
parent d0ce9bc221 1f1b1e2151
commit 341011343d
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
README.rst
View File

@ -61,6 +61,12 @@ INSERT MODE
+----------------------+---------------------------------------------+ +----------------------+---------------------------------------------+
| ``shift-pagedown`` | scroll down a page | | ``shift-pagedown`` | scroll down a page |
+----------------------+---------------------------------------------+ +----------------------+---------------------------------------------+
| ``ctrl-+`` | increase font size |
+----------------------+---------------------------------------------+
| ``ctrl--`` | decrease font size |
+----------------------+---------------------------------------------+
| ``ctrl-=`` | reset font size to default |
+----------------------+---------------------------------------------+
.. [1] The directory can be set by a process running in the terminal. For .. [1] The directory can be set by a process running in the terminal. For
example, with zsh: example, with zsh:
@ -142,12 +148,6 @@ SELECTION MODE
+-----------------------------------+-----------------------------------------------------------+ +-----------------------------------+-----------------------------------------------------------+
| ``N`` | previous search match | | ``N`` | previous search match |
+-----------------------------------+-----------------------------------------------------------+ +-----------------------------------+-----------------------------------------------------------+
| ``+`` | increase font size |
+-----------------------------------+-----------------------------------------------------------+
| ``-`` | decrease font size |
+-----------------------------------+-----------------------------------------------------------+
| ``=`` | reset font size to default |
+-----------------------------------+-----------------------------------------------------------+
During scrollback search, the current selection is changed to the search match During scrollback search, the current selection is changed to the search match
and copied to the PRIMARY clipboard buffer. and copied to the PRIMARY clipboard buffer.

12
man/termite.1
View File

@ -71,6 +71,12 @@ scroll down a line
scroll up a page scroll up a page
.IP "\fBshift-pagedown\fP" .IP "\fBshift-pagedown\fP"
scroll down a page scroll down a page
.IP "\fBctrl-+\fP"
increase font size
.IP "\fBctrl--\fP"
decrease font size
.IP "\fBctrl-=\fP"
reset font size to default
.SS Selection Mode .SS Selection Mode
In \fBSelection Mode\fP you interact with the interface of \fBtermite\fP In \fBSelection Mode\fP you interact with the interface of \fBtermite\fP
and the visual representation of the programs running within it. You can and the visual representation of the programs running within it. You can
@ -133,12 +139,6 @@ open the current selection as a url and enter insert mode
next search match next search match
.IP "\fBN\fP" .IP "\fBN\fP"
previous search match previous search match
.IP "\fB+\fP"
increase font size
.IP "\fB-\fP"
decrease font size
.IP "\fB=\fP"
reset font size to default
.SS Hints Mode .SS Hints Mode
The The
\fBHints Mode\fP is meant for accessing urls outputted to the terminal. \fBHints Mode\fP is meant for accessing urls outputted to the terminal.

18
termite.cc
View File

@ -909,20 +909,14 @@ gboolean key_press_cb(VteTerminal *vte, GdkEventKey *event, keybind_info *info)
gtk_widget_show(info->panel.da); gtk_widget_show(info->panel.da);
overlay_show(&info->panel, overlay_mode::urlselect, nullptr); overlay_show(&info->panel, overlay_mode::urlselect, nullptr);
break; break;
case GDK_KEY_plus:
increase_font_scale(vte);
break;
case GDK_KEY_minus:
decrease_font_scale(vte);
break;
case GDK_KEY_equal:
reset_font_scale(vte, info->config.font_scale);
break;
} }
return TRUE; return TRUE;
} }
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_plus:
increase_font_scale(vte);
return TRUE;
case GDK_KEY_t: case GDK_KEY_t:
launch_in_directory(vte); launch_in_directory(vte);
return TRUE; return TRUE;
@ -959,6 +953,12 @@ gboolean key_press_cb(VteTerminal *vte, GdkEventKey *event, keybind_info *info)
case GDK_KEY_Tab: case GDK_KEY_Tab:
overlay_show(&info->panel, overlay_mode::completion, vte); overlay_show(&info->panel, overlay_mode::completion, vte);
return TRUE; return TRUE;
case GDK_KEY_minus:
decrease_font_scale(vte);
return TRUE;
case GDK_KEY_equal:
reset_font_scale(vte, info->config.font_scale);
return TRUE;
default: default:
if (modify_key_feed(event, info, modify_table)) if (modify_key_feed(event, info, modify_table))
return TRUE; return TRUE;