Xinqi Bao's Git
projects
/
st.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
Limit usage of extern to config.h globals
[st.git]
/
x.c
diff --git
a/x.c
b/x.c
index
96944ee
..
970d6dd
100644
(file)
--- a/
x.c
+++ b/
x.c
@@
-130,7
+130,7
@@
static void xdrawglyphfontspecs(const XftGlyphFontSpec *, Glyph, int, int, int);
static void xdrawglyph(Glyph, int, int);
static void xclear(int, int, int, int);
static int xgeommasktogravity(int);
static void xdrawglyph(Glyph, int, int);
static void xclear(int, int, int, int);
static int xgeommasktogravity(int);
-static void xinit(
void
);
+static void xinit(
int, int
);
static void cresize(int, int);
static void xresize(int, int);
static int xloadfont(Font *, FcPattern *);
static void cresize(int, int);
static void xresize(int, int);
static int xloadfont(Font *, FcPattern *);
@@
-227,6
+227,8
@@
static char *opt_line = NULL;
static char *opt_name = NULL;
static char *opt_title = NULL;
static char *opt_name = NULL;
static char *opt_title = NULL;
+static int oldbutton = 3; /* button event on startup: 3 = release */
+
void
clipcopy(const Arg *dummy)
{
void
clipcopy(const Arg *dummy)
{
@@
-299,18
+301,16
@@
int
x2col(int x)
{
x -= borderpx;
x2col(int x)
{
x -= borderpx;
- x /= win.cw;
-
- return LIMIT(x, 0, term.col-1);
+ LIMIT(x, 0, win.tw - 1);
+ return x / win.cw;
}
int
y2row(int y)
{
y -= borderpx;
}
int
y2row(int y)
{
y -= borderpx;
- y /= win.ch;
-
- return LIMIT(y, 0, term.row-1);
+ LIMIT(y, 0, win.th - 1);
+ return y / win.ch;
}
void
}
void
@@
-984,7
+984,7
@@
xunloadfonts(void)
}
void
}
void
-xinit(
void
)
+xinit(
int cols, int rows
)
{
XGCValues gcvalues;
Cursor cursor;
{
XGCValues gcvalues;
Cursor cursor;
@@
-1009,8
+1009,8
@@
xinit(void)
xloadcols();
/* adjust fixed window geometry */
xloadcols();
/* adjust fixed window geometry */
- win.w = 2 * borderpx +
term.col
* win.cw;
- win.h = 2 * borderpx +
term.row
* win.ch;
+ win.w = 2 * borderpx +
cols
* win.cw;
+ win.h = 2 * borderpx +
rows
* win.ch;
if (xw.gm & XNegative)
xw.l += DisplayWidth(xw.dpy, xw.scr) - win.w - 2;
if (xw.gm & YNegative)
if (xw.gm & XNegative)
xw.l += DisplayWidth(xw.dpy, xw.scr) - win.w - 2;
if (xw.gm & YNegative)
@@
-1042,7
+1042,7
@@
xinit(void)
XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, win.w, win.h);
/* font spec buffer */
XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, win.w, win.h);
/* font spec buffer */
- xw.specbuf = xmalloc(
term.col
* sizeof(GlyphFontSpec));
+ xw.specbuf = xmalloc(
cols
* sizeof(GlyphFontSpec));
/* Xft rendering context */
xw.draw = XftDrawCreate(xw.dpy, xw.buf, xw.vis, xw.cmap);
/* Xft rendering context */
xw.draw = XftDrawCreate(xw.dpy, xw.buf, xw.vis, xw.cmap);
@@
-1337,15
+1337,16
@@
xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
/* Intelligent cleaning up of the borders. */
if (x == 0) {
xclear(0, (y == 0)? 0 : winy, borderpx,
/* Intelligent cleaning up of the borders. */
if (x == 0) {
xclear(0, (y == 0)? 0 : winy, borderpx,
- winy + win.ch + ((y >= term.row-1)? win.h : 0));
+ winy + win.ch +
+ ((winy + win.ch >= borderpx + win.th)? win.h : 0));
}
}
- if (
x + charlen >= term.col
) {
+ if (
winx + width >= borderpx + win.tw
) {
xclear(winx + width, (y == 0)? 0 : winy, win.w,
xclear(winx + width, (y == 0)? 0 : winy, win.w,
- ((
y >= term.row-1
)? win.h : (winy + win.ch)));
+ ((
winy + win.ch >= borderpx + win.th
)? win.h : (winy + win.ch)));
}
if (y == 0)
xclear(winx, 0, winx + width, borderpx);
}
if (y == 0)
xclear(winx, 0, winx + width, borderpx);
- if (
y == term.row-1
)
+ if (
winy + win.ch >= borderpx + win.th
)
xclear(winx, winy + win.ch, winx + width, win.h);
/* Clean up the region we want to draw to. */
xclear(winx, winy + win.ch, winx + width, win.h);
/* Clean up the region we want to draw to. */
@@
-1387,41
+1388,26
@@
xdrawglyph(Glyph g, int x, int y)
}
void
}
void
-xdrawcursor(
void
)
+xdrawcursor(
int cx, int cy, Glyph g, int ox, int oy, Glyph og
)
{
{
- static int oldx = 0, oldy = 0;
- int curx;
- Glyph g = {' ', ATTR_NULL, defaultbg, defaultcs}, og;
Color drawcol;
Color drawcol;
- LIMIT(oldx, 0, term.col-1);
- LIMIT(oldy, 0, term.row-1);
-
- curx = term.c.x;
-
- /* adjust position if in dummy */
- if (term.line[oldy][oldx].mode & ATTR_WDUMMY)
- oldx--;
- if (term.line[term.c.y][curx].mode & ATTR_WDUMMY)
- curx--;
-
/* remove the old cursor */
/* remove the old cursor */
- og = term.line[oldy][oldx];
- if (selected(oldx, oldy))
+ if (selected(ox, oy))
og.mode ^= ATTR_REVERSE;
og.mode ^= ATTR_REVERSE;
- xdrawglyph(og, oldx, oldy);
-
- g.u = term.line[term.c.y][term.c.x].u;
- g.mode |= term.line[term.c.y][term.c.x].mode &
- (ATTR_BOLD | ATTR_ITALIC | ATTR_UNDERLINE | ATTR_STRUCK);
+ xdrawglyph(og, ox, oy);
/*
* Select the right color for the right mode.
*/
/*
* Select the right color for the right mode.
*/
+ g.mode &= ATTR_BOLD|ATTR_ITALIC|ATTR_UNDERLINE|ATTR_STRUCK|ATTR_WIDE;
+ g.fg = defaultbg;
+ g.bg = defaultcs;
+
if (IS_SET(MODE_REVERSE)) {
g.mode |= ATTR_REVERSE;
g.bg = defaultfg;
if (IS_SET(MODE_REVERSE)) {
g.mode |= ATTR_REVERSE;
g.bg = defaultfg;
- if (selected(
term.c.x, term.c.
y)) {
+ if (selected(
cx, c
y)) {
drawcol = dc.col[defaultcs];
g.fg = defaultrcs;
} else {
drawcol = dc.col[defaultcs];
g.fg = defaultrcs;
} else {
@@
-1429,7
+1415,7
@@
xdrawcursor(void)
g.fg = defaultcs;
}
} else {
g.fg = defaultcs;
}
} else {
- if (selected(
term.c.x, term.c.
y)) {
+ if (selected(
cx, c
y)) {
drawcol = dc.col[defaultrcs];
g.fg = defaultfg;
g.bg = defaultrcs;
drawcol = dc.col[defaultrcs];
g.fg = defaultfg;
g.bg = defaultrcs;
@@
-1449,44
+1435,42
@@
xdrawcursor(void)
case 0: /* Blinking Block */
case 1: /* Blinking Block (Default) */
case 2: /* Steady Block */
case 0: /* Blinking Block */
case 1: /* Blinking Block (Default) */
case 2: /* Steady Block */
- g.mode |= term.line[term.c.y][curx].mode & ATTR_WIDE;
- xdrawglyph(g, term.c.x, term.c.y);
+ xdrawglyph(g, cx, cy);
break;
case 3: /* Blinking Underline */
case 4: /* Steady Underline */
XftDrawRect(xw.draw, &drawcol,
break;
case 3: /* Blinking Underline */
case 4: /* Steady Underline */
XftDrawRect(xw.draw, &drawcol,
- borderpx + c
ur
x * win.cw,
- borderpx + (
term.c.
y + 1) * win.ch - \
+ borderpx + cx * win.cw,
+ borderpx + (
c
y + 1) * win.ch - \
cursorthickness,
win.cw, cursorthickness);
break;
case 5: /* Blinking bar */
case 6: /* Steady bar */
XftDrawRect(xw.draw, &drawcol,
cursorthickness,
win.cw, cursorthickness);
break;
case 5: /* Blinking bar */
case 6: /* Steady bar */
XftDrawRect(xw.draw, &drawcol,
- borderpx + c
ur
x * win.cw,
- borderpx +
term.c.
y * win.ch,
+ borderpx + cx * win.cw,
+ borderpx +
c
y * win.ch,
cursorthickness, win.ch);
break;
}
} else {
XftDrawRect(xw.draw, &drawcol,
cursorthickness, win.ch);
break;
}
} else {
XftDrawRect(xw.draw, &drawcol,
- borderpx + c
ur
x * win.cw,
- borderpx +
term.c.
y * win.ch,
+ borderpx + cx * win.cw,
+ borderpx +
c
y * win.ch,
win.cw - 1, 1);
XftDrawRect(xw.draw, &drawcol,
win.cw - 1, 1);
XftDrawRect(xw.draw, &drawcol,
- borderpx + c
ur
x * win.cw,
- borderpx +
term.c.
y * win.ch,
+ borderpx + cx * win.cw,
+ borderpx +
c
y * win.ch,
1, win.ch - 1);
XftDrawRect(xw.draw, &drawcol,
1, win.ch - 1);
XftDrawRect(xw.draw, &drawcol,
- borderpx + (c
ur
x + 1) * win.cw - 1,
- borderpx +
term.c.
y * win.ch,
+ borderpx + (cx + 1) * win.cw - 1,
+ borderpx +
c
y * win.ch,
1, win.ch - 1);
XftDrawRect(xw.draw, &drawcol,
1, win.ch - 1);
XftDrawRect(xw.draw, &drawcol,
- borderpx + c
ur
x * win.cw,
- borderpx + (
term.c.
y + 1) * win.ch - 1,
+ borderpx + cx * win.cw,
+ borderpx + (
c
y + 1) * win.ch - 1,
win.cw, 1);
}
win.cw, 1);
}
- oldx = curx, oldy = term.c.y;
}
void
}
void
@@
-1751,8
+1735,7
@@
cmessage(XEvent *e)
win.mode &= ~MODE_FOCUSED;
}
} else if (e->xclient.data.l[0] == xw.wmdeletewin) {
win.mode &= ~MODE_FOCUSED;
}
} else if (e->xclient.data.l[0] == xw.wmdeletewin) {
- /* Send SIGHUP to shell */
- kill(pid, SIGHUP);
+ ttyhangup();
exit(0);
}
}
exit(0);
}
}
@@
-1773,6
+1756,7
@@
run(void)
int w = win.w, h = win.h;
fd_set rfd;
int xfd = XConnectionNumber(xw.dpy), xev, blinkset = 0, dodraw = 0;
int w = win.w, h = win.h;
fd_set rfd;
int xfd = XConnectionNumber(xw.dpy), xev, blinkset = 0, dodraw = 0;
+ int ttyfd;
struct timespec drawtimeout, *tv = NULL, now, last, lastblink;
long deltatime;
struct timespec drawtimeout, *tv = NULL, now, last, lastblink;
long deltatime;
@@
-1792,7
+1776,7
@@
run(void)
}
} while (ev.type != MapNotify);
}
} while (ev.type != MapNotify);
- tty
new(opt_line
, opt_io, opt_cmd);
+ tty
fd = ttynew(opt_line, shell
, opt_io, opt_cmd);
cresize(w, h);
clock_gettime(CLOCK_MONOTONIC, &last);
cresize(w, h);
clock_gettime(CLOCK_MONOTONIC, &last);
@@
-1800,15
+1784,15
@@
run(void)
for (xev = actionfps;;) {
FD_ZERO(&rfd);
for (xev = actionfps;;) {
FD_ZERO(&rfd);
- FD_SET(
cmd
fd, &rfd);
+ FD_SET(
tty
fd, &rfd);
FD_SET(xfd, &rfd);
FD_SET(xfd, &rfd);
- if (pselect(MAX(xfd,
cmd
fd)+1, &rfd, NULL, NULL, tv, NULL) < 0) {
+ if (pselect(MAX(xfd,
tty
fd)+1, &rfd, NULL, NULL, tv, NULL) < 0) {
if (errno == EINTR)
continue;
die("select failed: %s\n", strerror(errno));
}
if (errno == EINTR)
continue;
die("select failed: %s\n", strerror(errno));
}
- if (FD_ISSET(
cmd
fd, &rfd)) {
+ if (FD_ISSET(
tty
fd, &rfd)) {
ttyread();
if (blinktimeout) {
blinkset = tattrset(ATTR_BLINK);
ttyread();
if (blinktimeout) {
blinkset = tattrset(ATTR_BLINK);
@@
-1852,7
+1836,7
@@
run(void)
if (xev && !FD_ISSET(xfd, &rfd))
xev--;
if (xev && !FD_ISSET(xfd, &rfd))
xev--;
- if (!FD_ISSET(
cmd
fd, &rfd) && !FD_ISSET(xfd, &rfd)) {
+ if (!FD_ISSET(
tty
fd, &rfd) && !FD_ISSET(xfd, &rfd)) {
if (blinkset) {
if (TIMEDIFF(now, lastblink) \
> blinktimeout) {
if (blinkset) {
if (TIMEDIFF(now, lastblink) \
> blinktimeout) {
@@
-1947,8
+1931,10
@@
run:
}
setlocale(LC_CTYPE, "");
XSetLocaleModifiers("");
}
setlocale(LC_CTYPE, "");
XSetLocaleModifiers("");
- tnew(MAX(cols, 1), MAX(rows, 1));
- xinit();
+ cols = MAX(cols, 1);
+ rows = MAX(rows, 1);
+ tnew(cols, rows);
+ xinit(cols, rows);
xsetenv();
selinit();
run();
xsetenv();
selinit();
run();