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

wrap vte_terminal_feed for null-terminated strings

This commit is contained in:
Daniel Micay 2012-07-08 03:36:27 -04:00
parent a5b0e77c99
commit 34f209634a
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
termite.c
View File

@ -117,14 +117,18 @@ static void cursor_moved_cb(VteTerminal *vte, select_info *select) {
vte_terminal_copy_primary(vte); vte_terminal_copy_primary(vte);
} }
static void feed_str(VteTerminal *vte, const char *s) {
vte_terminal_feed(vte, s, (long)strlen(s));
}
static void start_selection(VteTerminal *vte, select_info *select) { static void start_selection(VteTerminal *vte, select_info *select) {
vte_terminal_feed(vte, CSI "s", strlen(CSI "s")); // save cursor position feed_str(vte, CSI "s"); // save cursor position
select->mode = SELECT_ON; select->mode = SELECT_ON;
} }
static void end_selection(VteTerminal *vte, select_info *select) { static void end_selection(VteTerminal *vte, select_info *select) {
vte_terminal_select_none(vte); vte_terminal_select_none(vte);
vte_terminal_feed(vte, CSI "u", strlen(CSI "u")); // restore cursor position feed_str(vte, CSI "u"); // restore cursor position
select->mode = SELECT_OFF; select->mode = SELECT_OFF;
} }
@ -152,26 +156,26 @@ gboolean key_press_cb(VteTerminal *vte, GdkEventKey *event, search_panel_info *i
switch (event->keyval) { switch (event->keyval) {
case GDK_KEY_Left: case GDK_KEY_Left:
case GDK_KEY_h: case GDK_KEY_h:
vte_terminal_feed(vte, CSI "1D", strlen(CSI "1D")); feed_str(vte, CSI "1D");
break; break;
case GDK_KEY_Down: case GDK_KEY_Down:
case GDK_KEY_j: case GDK_KEY_j:
vte_terminal_feed(vte, CSI "1B", strlen(CSI "1B")); feed_str(vte, CSI "1B");
break; break;
case GDK_KEY_Up: case GDK_KEY_Up:
case GDK_KEY_k: case GDK_KEY_k:
vte_terminal_feed(vte, CSI "1A", strlen(CSI "1A")); feed_str(vte, CSI "1A");
break; break;
case GDK_KEY_Right: case GDK_KEY_Right:
case GDK_KEY_l: case GDK_KEY_l:
vte_terminal_feed(vte, CSI "1C", strlen(CSI "1C")); feed_str(vte, CSI "1C");
break; break;
case GDK_KEY_asciicircum: case GDK_KEY_asciicircum:
vte_terminal_feed(vte, CSI "0G", strlen(CSI "0G")); feed_str(vte, CSI "0G");
break; break;
case GDK_KEY_dollar: case GDK_KEY_dollar:
eol = g_strdup_printf(CSI "%ldG", vte_terminal_get_column_count(vte)); eol = g_strdup_printf(CSI "%ldG", vte_terminal_get_column_count(vte));
vte_terminal_feed(vte, eol, (long)strlen(eol)); feed_str(vte, eol);
g_free(eol); g_free(eol);
break; break;
case GDK_KEY_v: case GDK_KEY_v: