Xinqi Bao's Git
projects
/
st.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
Move CRLF input processing into ttywrite
[st.git]
/
x.c
diff --git
a/x.c
b/x.c
index
a7f619e
..
76fb910
100644
(file)
--- a/
x.c
+++ b/
x.c
@@
-38,10
+38,9
@@
typedef struct {
KeySym k;
uint mask;
char *s;
KeySym k;
uint mask;
char *s;
- /* three
valued logic variables: 0 indifferent, 1 on, -1 off */
+ /* three
-
valued logic variables: 0 indifferent, 1 on, -1 off */
signed char appkey; /* application keypad */
signed char appcursor; /* application cursor */
signed char appkey; /* application keypad */
signed char appcursor; /* application cursor */
- signed char crlf; /* crlf mode */
} Key;
/* X modifiers */
} Key;
/* X modifiers */
@@
-390,7
+389,7
@@
mousereport(XEvent *e)
return;
}
return;
}
- ttywrite(buf, len);
+ ttywrite(buf, len
, 0
);
}
void
}
void
@@
-408,7
+407,7
@@
bpress(XEvent *e)
for (ms = mshortcuts; ms < mshortcuts + LEN(mshortcuts); ms++) {
if (e->xbutton.button == ms->b
&& match(ms->mask, e->xbutton.state)) {
for (ms = mshortcuts; ms < mshortcuts + LEN(mshortcuts); ms++) {
if (e->xbutton.button == ms->b
&& match(ms->mask, e->xbutton.state)) {
- tty
send(ms->s, strlen(ms->s)
);
+ tty
write(ms->s, strlen(ms->s), 1
);
return;
}
}
return;
}
}
@@
-520,10
+519,10
@@
selnotify(XEvent *e)
}
if (IS_SET(MODE_BRCKTPASTE) && ofs == 0)
}
if (IS_SET(MODE_BRCKTPASTE) && ofs == 0)
- ttywrite("\033[200~", 6);
- tty
send((char *)data, nitems * format / 8
);
+ ttywrite("\033[200~", 6
, 0
);
+ tty
write((char *)data, nitems * format / 8, 1
);
if (IS_SET(MODE_BRCKTPASTE) && rem == 0)
if (IS_SET(MODE_BRCKTPASTE) && rem == 0)
- ttywrite("\033[201~", 6);
+ ttywrite("\033[201~", 6
, 0
);
XFree(data);
/* number of 32-bit chunks returned */
ofs += nitems * format / 32;
XFree(data);
/* number of 32-bit chunks returned */
ofs += nitems * format / 32;
@@
-1634,12
+1633,12
@@
focus(XEvent *ev)
win.state |= WIN_FOCUSED;
xseturgency(0);
if (IS_SET(MODE_FOCUS))
win.state |= WIN_FOCUSED;
xseturgency(0);
if (IS_SET(MODE_FOCUS))
- ttywrite("\033[I", 3);
+ ttywrite("\033[I", 3
, 0
);
} else {
XUnsetICFocus(xw.xic);
win.state &= ~WIN_FOCUSED;
if (IS_SET(MODE_FOCUS))
} else {
XUnsetICFocus(xw.xic);
win.state &= ~WIN_FOCUSED;
if (IS_SET(MODE_FOCUS))
- ttywrite("\033[O", 3);
+ ttywrite("\033[O", 3
, 0
);
}
}
}
}
@@
-1680,9
+1679,6
@@
kmap(KeySym k, uint state)
if (IS_SET(MODE_APPCURSOR) ? kp->appcursor < 0 : kp->appcursor > 0)
continue;
if (IS_SET(MODE_APPCURSOR) ? kp->appcursor < 0 : kp->appcursor > 0)
continue;
- if (IS_SET(MODE_CRLF) ? kp->crlf < 0 : kp->crlf > 0)
- continue;
-
return kp->s;
}
return kp->s;
}
@@
-1714,7
+1710,7
@@
kpress(XEvent *ev)
/* 2. custom keys from config.h */
if ((customkey = kmap(ksym, e->state))) {
/* 2. custom keys from config.h */
if ((customkey = kmap(ksym, e->state))) {
- tty
send(customkey, strlen(customkey)
);
+ tty
write(customkey, strlen(customkey), 1
);
return;
}
return;
}
@@
-1733,7
+1729,7
@@
kpress(XEvent *ev)
len = 2;
}
}
len = 2;
}
}
- tty
send(buf, len
);
+ tty
write(buf, len, 1
);
}
}