Xinqi Bao's Git
projects
/
st.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
Split mode bits between Term and TermWindow
[st.git]
/
x.c
diff --git
a/x.c
b/x.c
index
ddae6b6
..
c5826cf
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 */
@@
-52,6
+51,7
@@
typedef struct {
/* function definitions used in config.h */
static void clipcopy(const Arg *);
static void clippaste(const Arg *);
/* function definitions used in config.h */
static void clipcopy(const Arg *);
static void clippaste(const Arg *);
+static void numlock(const Arg *);
static void selpaste(const Arg *);
static void zoom(const Arg *);
static void zoomabs(const Arg *);
static void selpaste(const Arg *);
static void zoom(const Arg *);
static void zoomabs(const Arg *);
@@
-65,6
+65,7
@@
static void zoomreset(const Arg *);
#define XEMBED_FOCUS_OUT 5
/* macros */
#define XEMBED_FOCUS_OUT 5
/* macros */
+#define IS_SET(flag) ((win.mode & (flag)) != 0)
#define TRUERED(x) (((x) & 0xff0000) >> 8)
#define TRUEGREEN(x) (((x) & 0xff00))
#define TRUEBLUE(x) (((x) & 0xff) << 8)
#define TRUERED(x) (((x) & 0xff0000) >> 8)
#define TRUEGREEN(x) (((x) & 0xff00))
#define TRUEBLUE(x) (((x) & 0xff) << 8)
@@
-157,7
+158,7
@@
static void selnotify(XEvent *);
static void selclear_(XEvent *);
static void selrequest(XEvent *);
static void setsel(char *, Time);
static void selclear_(XEvent *);
static void selrequest(XEvent *);
static void setsel(char *, Time);
-static void mousesel(XEvent *);
+static void mousesel(XEvent *
, int
);
static void mousereport(XEvent *);
static char *kmap(KeySym, uint);
static int match(uint, uint);
static void mousereport(XEvent *);
static char *kmap(KeySym, uint);
static int match(uint, uint);
@@
-197,11
+198,6
@@
static XWindow xw;
static XSelection xsel;
static TermWindow win;
static XSelection xsel;
static TermWindow win;
-enum window_state {
- WIN_VISIBLE = 1,
- WIN_FOCUSED = 2
-};
-
/* Font Ring Cache */
enum {
FRC_NORMAL,
/* Font Ring Cache */
enum {
FRC_NORMAL,
@@
-264,6
+260,12
@@
selpaste(const Arg *dummy)
xw.win, CurrentTime);
}
xw.win, CurrentTime);
}
+void
+numlock(const Arg *dummy)
+{
+ win.mode ^= MODE_NUMLOCK;
+}
+
void
zoom(const Arg *arg)
{
void
zoom(const Arg *arg)
{
@@
-313,7
+315,7
@@
y2row(int y)
}
void
}
void
-mousesel(XEvent *e)
+mousesel(XEvent *e
, int done
)
{
int type, seltype = SEL_REGULAR;
uint state = e->xbutton.state & ~(Button1Mask | forceselmod);
{
int type, seltype = SEL_REGULAR;
uint state = e->xbutton.state & ~(Button1Mask | forceselmod);
@@
-324,8
+326,9
@@
mousesel(XEvent *e)
break;
}
}
break;
}
}
-
- selextend(x2col(e->xbutton.x), y2row(e->xbutton.y), seltype);
+ selextend(x2col(e->xbutton.x), y2row(e->xbutton.y), seltype, done);
+ if (done)
+ setsel(getsel(), e->xbutton.time);
}
void
}
void
@@
-389,7
+392,7
@@
mousereport(XEvent *e)
return;
}
return;
}
- ttywrite(buf, len);
+ ttywrite(buf, len
, 0
);
}
void
}
void
@@
-407,7
+410,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;
}
}
@@
-519,10
+522,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;
@@
-630,16
+633,10
@@
brelease(XEvent *e)
return;
}
return;
}
- if (e->xbutton.button == Button2)
{
+ if (e->xbutton.button == Button2)
selpaste(NULL);
selpaste(NULL);
- } else if (e->xbutton.button == Button1) {
- if (sel.mode == SEL_READY) {
- mousesel(e);
- setsel(getsel(), e->xbutton.time);
- } else
- selclear_(NULL);
- sel.mode = SEL_IDLE;
- }
+ else if (e->xbutton.button == Button1)
+ mousesel(e, 1);
}
void
}
void
@@
-650,11
+647,7
@@
bmotion(XEvent *e)
return;
}
return;
}
- if (!sel.mode)
- return;
-
- sel.mode = SEL_READY;
- mousesel(e);
+ mousesel(e, 0);
}
void
}
void
@@
-1100,6
+1093,7
@@
xinit(void)
XChangeProperty(xw.dpy, xw.win, xw.netwmpid, XA_CARDINAL, 32,
PropModeReplace, (uchar *)&thispid, 1);
XChangeProperty(xw.dpy, xw.win, xw.netwmpid, XA_CARDINAL, 32,
PropModeReplace, (uchar *)&thispid, 1);
+ win.mode = MODE_NUMLOCK;
resettitle();
XMapWindow(xw.dpy, xw.win);
xhints();
resettitle();
XMapWindow(xw.dpy, xw.win);
xhints();
@@
-1329,14
+1323,13
@@
xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
fg = &revfg;
}
fg = &revfg;
}
-
if (base.mode & ATTR_REVERSE) {
temp = fg;
fg = bg;
bg = temp;
}
if (base.mode & ATTR_REVERSE) {
temp = fg;
fg = bg;
bg = temp;
}
- if (base.mode & ATTR_BLINK &&
term
.mode & MODE_BLINK)
+ if (base.mode & ATTR_BLINK &&
win
.mode & MODE_BLINK)
fg = bg;
if (base.mode & ATTR_INVISIBLE)
fg = bg;
if (base.mode & ATTR_INVISIBLE)
@@
-1450,7
+1443,7
@@
xdrawcursor(void)
return;
/* draw the new one */
return;
/* draw the new one */
- if (
win.state & WIN_FOCUSED
) {
+ if (
IS_SET(MODE_FOCUSED)
) {
switch (win.cursor) {
case 7: /* st extension: snowman */
utf8decode("☃", &g.u, UTF_SIZ);
switch (win.cursor) {
case 7: /* st extension: snowman */
utf8decode("☃", &g.u, UTF_SIZ);
@@
-1537,7
+1530,7
@@
drawregion(int x1, int y1, int x2, int y2)
Glyph base, new;
XftGlyphFontSpec *specs;
Glyph base, new;
XftGlyphFontSpec *specs;
- if (!(
win.state & WIN_VISIBLE
))
+ if (!(
IS_SET(MODE_VISIBLE)
))
return;
for (y = y1; y < y2; y++) {
return;
for (y = y1; y < y2; y++) {
@@
-1585,13
+1578,13
@@
visibility(XEvent *ev)
{
XVisibilityEvent *e = &ev->xvisibility;
{
XVisibilityEvent *e = &ev->xvisibility;
- MODBIT(win.
state, e->state != VisibilityFullyObscured, WIN
_VISIBLE);
+ MODBIT(win.
mode, e->state != VisibilityFullyObscured, MODE
_VISIBLE);
}
void
unmap(XEvent *ev)
{
}
void
unmap(XEvent *ev)
{
- win.
state &= ~WIN
_VISIBLE;
+ win.
mode &= ~MODE
_VISIBLE;
}
void
}
void
@@
-1601,6
+1594,15
@@
xsetpointermotion(int set)
XChangeWindowAttributes(xw.dpy, xw.win, CWEventMask, &xw.attrs);
}
XChangeWindowAttributes(xw.dpy, xw.win, CWEventMask, &xw.attrs);
}
+void
+xsetmode(int set, unsigned int flags)
+{
+ int mode = win.mode;
+ MODBIT(win.mode, set, flags);
+ if ((win.mode & MODE_REVERSE) != (mode & MODE_REVERSE))
+ redraw();
+}
+
int
xsetcursor(int cursor)
{
int
xsetcursor(int cursor)
{
@@
-1624,7
+1626,7
@@
xseturgency(int add)
void
xbell(void)
{
void
xbell(void)
{
- if (!(
win.state & WIN_FOCUSED
))
+ if (!(
IS_SET(MODE_FOCUSED)
))
xseturgency(1);
if (bellvolume)
XkbBell(xw.dpy, xw.win, bellvolume, (Atom)NULL);
xseturgency(1);
if (bellvolume)
XkbBell(xw.dpy, xw.win, bellvolume, (Atom)NULL);
@@
-1640,15
+1642,15
@@
focus(XEvent *ev)
if (ev->type == FocusIn) {
XSetICFocus(xw.xic);
if (ev->type == FocusIn) {
XSetICFocus(xw.xic);
- win.
state |= WIN
_FOCUSED;
+ win.
mode |= MODE
_FOCUSED;
xseturgency(0);
if (IS_SET(MODE_FOCUS))
xseturgency(0);
if (IS_SET(MODE_FOCUS))
- ttywrite("\033[I", 3);
+ ttywrite("\033[I", 3
, 0
);
} else {
XUnsetICFocus(xw.xic);
} else {
XUnsetICFocus(xw.xic);
- win.
state &= ~WIN
_FOCUSED;
+ win.
mode &= ~MODE
_FOCUSED;
if (IS_SET(MODE_FOCUS))
if (IS_SET(MODE_FOCUS))
- ttywrite("\033[O", 3);
+ ttywrite("\033[O", 3
, 0
);
}
}
}
}
@@
-1683,15
+1685,12
@@
kmap(KeySym k, uint state)
if (IS_SET(MODE_APPKEYPAD) ? kp->appkey < 0 : kp->appkey > 0)
continue;
if (IS_SET(MODE_APPKEYPAD) ? kp->appkey < 0 : kp->appkey > 0)
continue;
- if (
term.numlock
&& kp->appkey == 2)
+ if (
IS_SET(MODE_NUMLOCK)
&& kp->appkey == 2)
continue;
if (IS_SET(MODE_APPCURSOR) ? kp->appcursor < 0 : kp->appcursor > 0)
continue;
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;
}
@@
-1723,7
+1722,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;
}
@@
-1742,7
+1741,7
@@
kpress(XEvent *ev)
len = 2;
}
}
len = 2;
}
}
- tty
send(buf, len
);
+ tty
write(buf, len, 1
);
}
}
@@
-1755,10
+1754,10
@@
cmessage(XEvent *e)
*/
if (e->xclient.message_type == xw.xembed && e->xclient.format == 32) {
if (e->xclient.data.l[1] == XEMBED_FOCUS_IN) {
*/
if (e->xclient.message_type == xw.xembed && e->xclient.format == 32) {
if (e->xclient.data.l[1] == XEMBED_FOCUS_IN) {
- win.
state |= WIN
_FOCUSED;
+ win.
mode |= MODE
_FOCUSED;
xseturgency(0);
} else if (e->xclient.data.l[1] == XEMBED_FOCUS_OUT) {
xseturgency(0);
} else if (e->xclient.data.l[1] == XEMBED_FOCUS_OUT) {
- win.
state &= ~WIN
_FOCUSED;
+ win.
mode &= ~MODE
_FOCUSED;
}
} else if (e->xclient.data.l[0] == xw.wmdeletewin) {
/* Send SIGHUP to shell */
}
} else if (e->xclient.data.l[0] == xw.wmdeletewin) {
/* Send SIGHUP to shell */
@@
-1823,7
+1822,7
@@
run(void)
if (blinktimeout) {
blinkset = tattrset(ATTR_BLINK);
if (!blinkset)
if (blinktimeout) {
blinkset = tattrset(ATTR_BLINK);
if (!blinkset)
- MODBIT(
term
.mode, 0, MODE_BLINK);
+ MODBIT(
win
.mode, 0, MODE_BLINK);
}
}
}
}
@@
-1838,7
+1837,7
@@
run(void)
dodraw = 0;
if (blinktimeout && TIMEDIFF(now, lastblink) > blinktimeout) {
tsetdirtattr(ATTR_BLINK);
dodraw = 0;
if (blinktimeout && TIMEDIFF(now, lastblink) > blinktimeout) {
tsetdirtattr(ATTR_BLINK);
-
term
.mode ^= MODE_BLINK;
+
win
.mode ^= MODE_BLINK;
lastblink = now;
dodraw = 1;
}
lastblink = now;
dodraw = 1;
}