kske
/
st
1
Fork 0
Code Issues Pull Requests Releases Activity

New ttysend() function calls ttywrite() and techo(). Honor MODE_ECHO when pasting in selnotify().

This commit is contained in:
Mark Edgar 2013-10-05 11:49:35 +02:00 committed by Roberto E. Vargas Caballero
parent 939e149544
commit 8e577322a3
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
st.c
View File

@ -386,6 +386,7 @@ static inline bool match(uint, uint);
static void ttynew(void); static void ttynew(void);
static void ttyread(void); static void ttyread(void);
static void ttyresize(void); static void ttyresize(void);
static void ttysend(char *, size_t);
static void ttywrite(const char *, size_t); static void ttywrite(const char *, size_t);
static void xdraws(char *, Glyph, int, int, int, int); static void xdraws(char *, Glyph, int, int, int, int);
@ -893,9 +894,7 @@ bpress(XEvent *e) {
for(mk = mshortcuts; mk < mshortcuts + LEN(mshortcuts); mk++) { for(mk = mshortcuts; mk < mshortcuts + LEN(mshortcuts); mk++) {
if(e->xbutton.button == mk->b if(e->xbutton.button == mk->b
&& match(mk->mask, e->xbutton.state)) { && match(mk->mask, e->xbutton.state)) {
ttywrite(mk->s, strlen(mk->s)); ttysend(mk->s, strlen(mk->s));
if(IS_SET(MODE_ECHO))
techo(mk->s, strlen(mk->s));
return; return;
} }
} }
@ -1031,7 +1030,7 @@ selnotify(XEvent *e) {
if(IS_SET(MODE_BRCKTPASTE)) if(IS_SET(MODE_BRCKTPASTE))
ttywrite("\033[200~", 6); ttywrite("\033[200~", 6);
ttywrite((const char *)data, nitems * format / 8); ttysend((char *)data, nitems * format / 8);
if(IS_SET(MODE_BRCKTPASTE)) if(IS_SET(MODE_BRCKTPASTE))
ttywrite("\033[201~", 6); ttywrite("\033[201~", 6);
XFree(data); XFree(data);
@ -1299,6 +1298,13 @@ ttywrite(const char *s, size_t n) {
die("write error on tty: %s\n", SERRNO); die("write error on tty: %s\n", SERRNO);
} }
void
ttysend(char *s, size_t n) {
ttywrite(s, n);
if(IS_SET(MODE_ECHO))
techo(s, n);
}
void void
ttyresize(void) { ttyresize(void) {
struct winsize w; struct winsize w;
@ -3584,10 +3590,7 @@ kpress(XEvent *ev) {
/* 2. custom keys from config.h */ /* 2. custom keys from config.h */
if((customkey = kmap(ksym, e->state))) { if((customkey = kmap(ksym, e->state))) {
len = strlen(customkey); ttysend(customkey, strlen(customkey));
ttywrite(customkey, len);
if(IS_SET(MODE_ECHO))
techo(customkey, len);
return; return;
} }
@ -3606,9 +3609,7 @@ kpress(XEvent *ev) {
len = 2; len = 2;
} }
} }
ttywrite(buf, len); ttysend(buf, len);
if(IS_SET(MODE_ECHO))
techo(buf, len);
} }