p
/
termo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Less code duplication

This commit is contained in:
Přemysl Eric Janouch 2014-09-23 02:51:08 +02:00
parent c0cc27c555
commit cac1f8373b
1 changed files with 13 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
driver-ti.c
View File

@ -304,13 +304,9 @@ abort_free_ti:
} }
static int static int
start_driver (termkey_t *tk, void *info) write_string (termkey_t *tk, char *string)
{ {
termkey_ti_t *ti = info; if (tk->fd == -1 || !isatty (tk->fd) || !string)
char *start_string = ti->start_string;
size_t len;
if (tk->fd == -1 || !isatty (tk->fd) || !start_string)
return 1; return 1;
/* The terminfo database will contain keys in application cursor key mode. /* The terminfo database will contain keys in application cursor key mode.
@ -318,44 +314,30 @@ start_driver (termkey_t *tk, void *info)
*/ */
// Can't call putp or tputs because they suck and don't give us fd control // Can't call putp or tputs because they suck and don't give us fd control
len = strlen (start_string); size_t len = strlen (string);
while (len) while (len)
{ {
ssize_t written = write (tk->fd, start_string, len); ssize_t written = write (tk->fd, string, len);
if (written == -1) if (written == -1)
return 0; return 0;
start_string += written; string += written;
len -= written; len -= written;
} }
return 1; return 1;
} }
// XXX: this is the same as above only with a different string static int
start_driver (termkey_t *tk, void *info)
{
termkey_ti_t *ti = info;
return write_string (tk, ti->start_string);
}
static int static int
stop_driver (termkey_t *tk, void *info) stop_driver (termkey_t *tk, void *info)
{ {
termkey_ti_t *ti = info; termkey_ti_t *ti = info;
char *stop_string = ti->stop_string; return write_string (tk, ti->stop_string);
size_t len;
if (tk->fd == -1 || !isatty (tk->fd) || !stop_string)
return 1;
/* The terminfo database will contain keys in application cursor key mode.
* We may need to enable that mode
*/
// Can't call putp or tputs because they suck and don't give us fd control
len = strlen (stop_string);
while (len)
{
ssize_t written = write (tk->fd, stop_string, len);
if (written == -1)
return 0;
stop_string += written;
len -= written;
}
return 1;
} }
static void static void