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

pausing output needs to be done differently 

XON/XOFF is a fragile solution
This commit is contained in:
Daniel Micay 2012-07-11 18:45:53 -04:00
parent 9bdf88c84a
commit f90d92823c
2 changed files with 2 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.rst
View File

@ -22,8 +22,6 @@ KEYBINDINGS
COMMAND MODE COMMAND MODE
------------------- -------------------
*While in command mode, output is paused.*
* ``escape``: deactivate command mode * ``escape``: deactivate command mode
* ``v``: visual mode * ``v``: visual mode
* ``V``: visual line mode * ``V``: visual line mode
@ -55,5 +53,6 @@ TODO
* hint mode overlay for urls (like elinks/vimperator/pentadactyl) * hint mode overlay for urls (like elinks/vimperator/pentadactyl)
* scrollback search needs to be improved upstream [1]_ * scrollback search needs to be improved upstream [1]_
* expose keybindings in ``termite.cfg`` * expose keybindings in ``termite.cfg``
* output should be paused while in command mode
.. [1] https://bugzilla.gnome.org/show_bug.cgi?id=627886 .. [1] https://bugzilla.gnome.org/show_bug.cgi?id=627886

26
termite.c
View File

@ -3,9 +3,6 @@
#include <stdbool.h> #include <stdbool.h>
#include <string.h> #include <string.h>
#include <termios.h>
#include <unistd.h>
#include <gdk/gdkx.h> #include <gdk/gdkx.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <vte/vte.h> #include <vte/vte.h>
@ -39,7 +36,6 @@ typedef struct select_info {
long begin_row; long begin_row;
long cursor_col; long cursor_col;
long cursor_row; long cursor_row;
tcflag_t ciflag_old;
} select_info; } select_info;
typedef struct search_panel_info { typedef struct search_panel_info {
@ -122,16 +118,6 @@ static void feed_str(VteTerminal *vte, const char *s) {
static void start_selection(VteTerminal *vte, select_info *select) { static void start_selection(VteTerminal *vte, select_info *select) {
feed_str(vte, CSI "?25l"); // hide cursor feed_str(vte, CSI "?25l"); // hide cursor
// enable flow control
int fd = vte_pty_get_fd(vte_terminal_get_pty_object(vte));
struct termios t;
tcgetattr(fd, &t);
select->ciflag_old = t.c_iflag;
t.c_iflag |= IXON;
tcsetattr(fd, TCSANOW, &t);
vte_terminal_feed_child(vte, "\x13", 1); // pause output (XOFF)
select->mode = SELECT_ON; select->mode = SELECT_ON;
vte_terminal_get_cursor_position(vte, &select->cursor_col, &select->cursor_row); vte_terminal_get_cursor_position(vte, &select->cursor_col, &select->cursor_row);
update_selection(vte, select); update_selection(vte, select);
@ -139,16 +125,6 @@ static void start_selection(VteTerminal *vte, select_info *select) {
static void end_selection(VteTerminal *vte, select_info *select) { static void end_selection(VteTerminal *vte, select_info *select) {
feed_str(vte, CSI "?25h"); // show cursor feed_str(vte, CSI "?25h"); // show cursor
vte_terminal_feed_child(vte, "\x11", 1); // resume output (XON)
// restore c_iflag
int fd = vte_pty_get_fd(vte_terminal_get_pty_object(vte));
struct termios t;
tcgetattr(fd, &t);
t.c_iflag = select->ciflag_old;
tcsetattr(fd, TCSANOW, &t);
vte_terminal_select_none(vte); vte_terminal_select_none(vte);
select->mode = SELECT_OFF; select->mode = SELECT_OFF;
} }
@ -762,7 +738,7 @@ int main(int argc, char **argv) {
gtk_container_add(GTK_CONTAINER(overlay), vte); gtk_container_add(GTK_CONTAINER(overlay), vte);
gtk_container_add(GTK_CONTAINER(window), overlay); gtk_container_add(GTK_CONTAINER(window), overlay);
select_info select = {SELECT_OFF, 0, 0, 0, 0, 0}; select_info select = {SELECT_OFF, 0, 0, 0, 0};
search_panel_info info = {vte, entry, alignment, OVERLAY_HIDDEN, select}; search_panel_info info = {vte, entry, alignment, OVERLAY_HIDDEN, select};
g_signal_connect(window, "destroy", G_CALLBACK(gtk_main_quit), NULL); g_signal_connect(window, "destroy", G_CALLBACK(gtk_main_quit), NULL);