Xinqi Bao's Git
projects
/
st.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
Revert "Fix crash when cursor color is truecolor"
[st.git]
/
x.c
diff --git
a/x.c
b/x.c
index
970d6dd
..
b51821d
100644
(file)
--- a/
x.c
+++ b/
x.c
@@
-1,15
+1,15
@@
/* See LICENSE for license details. */
#include <errno.h>
/* See LICENSE for license details. */
#include <errno.h>
+#include <math.h>
+#include <limits.h>
#include <locale.h>
#include <signal.h>
#include <locale.h>
#include <signal.h>
-#include <stdint.h>
#include <sys/select.h>
#include <time.h>
#include <unistd.h>
#include <libgen.h>
#include <X11/Xatom.h>
#include <X11/Xlib.h>
#include <sys/select.h>
#include <time.h>
#include <unistd.h>
#include <libgen.h>
#include <X11/Xatom.h>
#include <X11/Xlib.h>
-#include <X11/Xutil.h>
#include <X11/cursorfont.h>
#include <X11/keysym.h>
#include <X11/Xft/Xft.h>
#include <X11/cursorfont.h>
#include <X11/keysym.h>
#include <X11/Xft/Xft.h>
@@
-75,6
+75,15
@@
typedef XftColor Color;
typedef XftGlyphFontSpec GlyphFontSpec;
/* Purely graphic info */
typedef XftGlyphFontSpec GlyphFontSpec;
/* Purely graphic info */
+typedef struct {
+ int tw, th; /* tty width and height */
+ int w, h; /* window width and height */
+ int ch; /* char height */
+ int cw; /* char width */
+ int mode; /* window state/mode flags */
+ int cursor; /* cursor style */
+} TermWindow;
+
typedef struct {
Display *dpy;
Colormap cmap;
typedef struct {
Display *dpy;
Colormap cmap;
@@
-133,14
+142,16
@@
static int xgeommasktogravity(int);
static void xinit(int, int);
static void cresize(int, int);
static void xresize(int, int);
static void xinit(int, int);
static void cresize(int, int);
static void xresize(int, int);
+static void xhints(void);
+static int xloadcolor(int, const char *, Color *);
static int xloadfont(Font *, FcPattern *);
static void xloadfonts(char *, double);
static void xunloadfont(Font *);
static void xunloadfonts(void);
static void xsetenv(void);
static void xseturgency(int);
static int xloadfont(Font *, FcPattern *);
static void xloadfonts(char *, double);
static void xunloadfont(Font *);
static void xunloadfonts(void);
static void xsetenv(void);
static void xseturgency(int);
-static int
x2col(int
);
-static int
y2row(int
);
+static int
evcol(XEvent *
);
+static int
evrow(XEvent *
);
static void expose(XEvent *);
static void visibility(XEvent *);
static void expose(XEvent *);
static void visibility(XEvent *);
@@
-234,8
+245,8
@@
clipcopy(const Arg *dummy)
{
Atom clipboard;
{
Atom clipboard;
- if (xsel.clipboard != NULL)
-
free(xsel.clipboard)
;
+ free(xsel.clipboard);
+
xsel.clipboard = NULL
;
if (xsel.primary != NULL) {
xsel.clipboard = xstrdup(xsel.primary);
if (xsel.primary != NULL) {
xsel.clipboard = xstrdup(xsel.primary);
@@
-298,17
+309,17
@@
zoomreset(const Arg *arg)
}
int
}
int
-
x2col(int x
)
+
evcol(XEvent *e
)
{
{
-
x -=
borderpx;
+
int x = e->xbutton.x -
borderpx;
LIMIT(x, 0, win.tw - 1);
return x / win.cw;
}
int
LIMIT(x, 0, win.tw - 1);
return x / win.cw;
}
int
-
y2row(int y
)
+
evrow(XEvent *e
)
{
{
-
y -=
borderpx;
+
int y = e->xbutton.y -
borderpx;
LIMIT(y, 0, win.th - 1);
return y / win.ch;
}
LIMIT(y, 0, win.th - 1);
return y / win.ch;
}
@@
-325,7
+336,7
@@
mousesel(XEvent *e, int done)
break;
}
}
break;
}
}
- selextend(
x2col(e->xbutton.x), y2row(e->xbutton.y
), seltype, done);
+ selextend(
evcol(e), evrow(e
), seltype, done);
if (done)
setsel(getsel(), e->xbutton.time);
}
if (done)
setsel(getsel(), e->xbutton.time);
}
@@
-333,9
+344,8
@@
mousesel(XEvent *e, int done)
void
mousereport(XEvent *e)
{
void
mousereport(XEvent *e)
{
- int x = x2col(e->xbutton.x), y = y2row(e->xbutton.y),
- button = e->xbutton.button, state = e->xbutton.state,
- len;
+ int len, x = evcol(e), y = evrow(e),
+ button = e->xbutton.button, state = e->xbutton.state;
char buf[40];
static int ox, oy;
char buf[40];
static int ox, oy;
@@
-430,7
+440,7
@@
bpress(XEvent *e)
xsel.tclick2 = xsel.tclick1;
xsel.tclick1 = now;
xsel.tclick2 = xsel.tclick1;
xsel.tclick1 = now;
- selstart(
x2col(e->xbutton.x), y2row(e->xbutton.y
), snap);
+ selstart(
evcol(e), evrow(e
), snap);
}
}
}
}
@@
-454,18
+464,16
@@
selnotify(XEvent *e)
ulong nitems, ofs, rem;
int format;
uchar *data, *last, *repl;
ulong nitems, ofs, rem;
int format;
uchar *data, *last, *repl;
- Atom type, incratom, property;
+ Atom type, incratom, property
= None
;
incratom = XInternAtom(xw.dpy, "INCR", 0);
ofs = 0;
incratom = XInternAtom(xw.dpy, "INCR", 0);
ofs = 0;
- if (e->type == SelectionNotify)
{
+ if (e->type == SelectionNotify)
property = e->xselection.property;
property = e->xselection.property;
- } else if(e->type == PropertyNotify) {
+ else if (e->type == PropertyNotify)
property = e->xproperty.atom;
property = e->xproperty.atom;
- } else {
- return;
- }
+
if (property == None)
return;
if (property == None)
return;
@@
-610,12
+618,15
@@
selrequest(XEvent *e)
void
setsel(char *str, Time t)
{
void
setsel(char *str, Time t)
{
+ if (!str)
+ return;
+
free(xsel.primary);
xsel.primary = str;
XSetSelectionOwner(xw.dpy, XA_PRIMARY, xw.win, t);
if (XGetSelectionOwner(xw.dpy, XA_PRIMARY) != xw.win)
free(xsel.primary);
xsel.primary = str;
XSetSelectionOwner(xw.dpy, XA_PRIMARY, xw.win, t);
if (XGetSelectionOwner(xw.dpy, XA_PRIMARY) != xw.win)
- selclear
_(NULL
);
+ selclear
(
);
}
void
}
void
@@
-661,6
+672,8
@@
cresize(int width, int height)
col = (win.w - 2 * borderpx) / win.cw;
row = (win.h - 2 * borderpx) / win.ch;
col = (win.w - 2 * borderpx) / win.cw;
row = (win.h - 2 * borderpx) / win.ch;
+ col = MAX(1, col);
+ row = MAX(1, row);
tresize(col, row);
xresize(col, row);
tresize(col, row);
xresize(col, row);
@@
-670,8
+683,8
@@
cresize(int width, int height)
void
xresize(int col, int row)
{
void
xresize(int col, int row)
{
- win.tw =
MAX(1, col * win.cw)
;
- win.th =
MAX(1, row * win.ch)
;
+ win.tw =
col * win.cw
;
+ win.th =
row * win.ch
;
XFreePixmap(xw.dpy, xw.buf);
xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h,
XFreePixmap(xw.dpy, xw.buf);
xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h,
@@
-731,9
+744,9
@@
xloadcols(void)
for (i = 0; i < dc.collen; i++)
if (!xloadcolor(i, NULL, &dc.col[i])) {
if (colorname[i])
for (i = 0; i < dc.collen; i++)
if (!xloadcolor(i, NULL, &dc.col[i])) {
if (colorname[i])
- die("
C
ould not allocate color '%s'\n", colorname[i]);
+ die("
c
ould not allocate color '%s'\n", colorname[i]);
else
else
- die("
C
ould not allocate color %d\n", i);
+ die("
c
ould not allocate color %d\n", i);
}
loaded = 1;
}
}
loaded = 1;
}
@@
-773,19
+786,21
@@
xhints(void)
XClassHint class = {opt_name ? opt_name : termname,
opt_class ? opt_class : termname};
XWMHints wm = {.flags = InputHint, .input = 1};
XClassHint class = {opt_name ? opt_name : termname,
opt_class ? opt_class : termname};
XWMHints wm = {.flags = InputHint, .input = 1};
- XSizeHints *sizeh
= NULL
;
+ XSizeHints *sizeh;
sizeh = XAllocSizeHints();
sizeh = XAllocSizeHints();
- sizeh->flags = PSize | PResizeInc | PBaseSize;
+ sizeh->flags = PSize | PResizeInc | PBaseSize
| PMinSize
;
sizeh->height = win.h;
sizeh->width = win.w;
sizeh->height_inc = win.ch;
sizeh->width_inc = win.cw;
sizeh->base_height = 2 * borderpx;
sizeh->base_width = 2 * borderpx;
sizeh->height = win.h;
sizeh->width = win.w;
sizeh->height_inc = win.ch;
sizeh->width_inc = win.cw;
sizeh->base_height = 2 * borderpx;
sizeh->base_width = 2 * borderpx;
+ sizeh->min_height = win.ch + 2 * borderpx;
+ sizeh->min_width = win.cw + 2 * borderpx;
if (xw.isfixed) {
if (xw.isfixed) {
- sizeh->flags |= PMaxSize
| PMinSize
;
+ sizeh->flags |= PMaxSize;
sizeh->min_width = sizeh->max_width = win.w;
sizeh->min_height = sizeh->max_height = win.h;
}
sizeh->min_width = sizeh->max_width = win.w;
sizeh->min_height = sizeh->max_height = win.h;
}
@@
-858,7
+873,7
@@
xloadfont(Font *f, FcPattern *pattern)
if ((XftPatternGetInteger(f->match->pattern, "slant", 0,
&haveattr) != XftResultMatch) || haveattr < wantattr) {
f->badslant = 1;
if ((XftPatternGetInteger(f->match->pattern, "slant", 0,
&haveattr) != XftResultMatch) || haveattr < wantattr) {
f->badslant = 1;
- fputs("
st:
font slant does not match\n", stderr);
+ fputs("font slant does not match\n", stderr);
}
}
}
}
@@
-867,7
+882,7
@@
xloadfont(Font *f, FcPattern *pattern)
if ((XftPatternGetInteger(f->match->pattern, "weight", 0,
&haveattr) != XftResultMatch) || haveattr != wantattr) {
f->badweight = 1;
if ((XftPatternGetInteger(f->match->pattern, "weight", 0,
&haveattr) != XftResultMatch) || haveattr != wantattr) {
f->badweight = 1;
- fputs("
st:
font weight does not match\n", stderr);
+ fputs("font weight does not match\n", stderr);
}
}
}
}
@@
-894,16
+909,14
@@
xloadfonts(char *fontstr, double fontsize)
{
FcPattern *pattern;
double fontval;
{
FcPattern *pattern;
double fontval;
- float ceilf(float);
- if (fontstr[0] == '-')
{
+ if (fontstr[0] == '-')
pattern = XftXlfdParse(fontstr, False, False);
pattern = XftXlfdParse(fontstr, False, False);
- } else {
+ else
pattern = FcNameParse((FcChar8 *)fontstr);
pattern = FcNameParse((FcChar8 *)fontstr);
- }
if (!pattern)
if (!pattern)
- die("
st:
can't open font %s\n", fontstr);
+ die("can't open font %s\n", fontstr);
if (fontsize > 1) {
FcPatternDel(pattern, FC_PIXEL_SIZE);
if (fontsize > 1) {
FcPatternDel(pattern, FC_PIXEL_SIZE);
@@
-929,7
+942,7
@@
xloadfonts(char *fontstr, double fontsize)
}
if (xloadfont(&dc.font, pattern))
}
if (xloadfont(&dc.font, pattern))
- die("
st:
can't open font %s\n", fontstr);
+ die("can't open font %s\n", fontstr);
if (usedfontsize < 0) {
FcPatternGetDouble(dc.font.match->pattern,
if (usedfontsize < 0) {
FcPatternGetDouble(dc.font.match->pattern,
@@
-946,17
+959,17
@@
xloadfonts(char *fontstr, double fontsize)
FcPatternDel(pattern, FC_SLANT);
FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC);
if (xloadfont(&dc.ifont, pattern))
FcPatternDel(pattern, FC_SLANT);
FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC);
if (xloadfont(&dc.ifont, pattern))
- die("
st:
can't open font %s\n", fontstr);
+ die("can't open font %s\n", fontstr);
FcPatternDel(pattern, FC_WEIGHT);
FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_BOLD);
if (xloadfont(&dc.ibfont, pattern))
FcPatternDel(pattern, FC_WEIGHT);
FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_BOLD);
if (xloadfont(&dc.ibfont, pattern))
- die("
st:
can't open font %s\n", fontstr);
+ die("can't open font %s\n", fontstr);
FcPatternDel(pattern, FC_SLANT);
FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ROMAN);
if (xloadfont(&dc.bfont, pattern))
FcPatternDel(pattern, FC_SLANT);
FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ROMAN);
if (xloadfont(&dc.bfont, pattern))
- die("
st:
can't open font %s\n", fontstr);
+ die("can't open font %s\n", fontstr);
FcPatternDestroy(pattern);
}
FcPatternDestroy(pattern);
}
@@
-993,13
+1006,13
@@
xinit(int cols, int rows)
XColor xmousefg, xmousebg;
if (!(xw.dpy = XOpenDisplay(NULL)))
XColor xmousefg, xmousebg;
if (!(xw.dpy = XOpenDisplay(NULL)))
- die("
C
an't open display\n");
+ die("
c
an't open display\n");
xw.scr = XDefaultScreen(xw.dpy);
xw.vis = XDefaultVisual(xw.dpy, xw.scr);
/* font */
if (!FcInit())
xw.scr = XDefaultScreen(xw.dpy);
xw.vis = XDefaultVisual(xw.dpy, xw.scr);
/* font */
if (!FcInit())
- die("
C
ould not init fontconfig.\n");
+ die("
c
ould not init fontconfig.\n");
usedfont = (opt_font == NULL)? font : opt_font;
xloadfonts(usedfont, 0);
usedfont = (opt_font == NULL)? font : opt_font;
xloadfonts(usedfont, 0);
@@
-1397,41
+1410,36
@@
xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
og.mode ^= ATTR_REVERSE;
xdrawglyph(og, ox, oy);
og.mode ^= ATTR_REVERSE;
xdrawglyph(og, ox, oy);
+ if (IS_SET(MODE_HIDE))
+ return;
+
/*
* Select the right color for the right mode.
*/
g.mode &= ATTR_BOLD|ATTR_ITALIC|ATTR_UNDERLINE|ATTR_STRUCK|ATTR_WIDE;
/*
* 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 (selected(cx, cy)) {
- drawcol = dc.col[defaultcs];
- g.fg = defaultrcs;
- } else {
- drawcol = dc.col[defaultrcs];
- g.fg = defaultcs;
- }
+ if (selected(cx, cy)) {
+ drawcol = dc.col[g.bg];
} else {
} else {
- if (selected(cx, cy)) {
- drawcol = dc.col[defaultrcs];
- g.fg = defaultfg;
- g.bg = defaultrcs;
- } else {
- drawcol = dc.col[defaultcs];
- }
+ g.mode |= ATTR_REVERSE;
+
+ if (g.mode & ATTR_BOLD && BETWEEN(g.fg, 0, 7))
+ drawcol = dc.col[g.fg + 8];
+ else
+ drawcol = dc.col[g.fg];
}
}
- if (IS_SET(MODE_HIDE))
- return;
+ if (IS_SET(MODE_REVERSE)) {
+ drawcol.color.red = ~drawcol.color.red;
+ drawcol.color.green = ~drawcol.color.green;
+ drawcol.color.blue = ~drawcol.color.blue;
+ }
/* draw the new one */
if (IS_SET(MODE_FOCUSED)) {
switch (win.cursor) {
/* draw the new one */
if (IS_SET(MODE_FOCUSED)) {
switch (win.cursor) {
- case 7: /* st extension: snowman */
-
utf8decode("☃", &g.u, UTF_SIZ)
;
+ case 7: /* st extension: snowman
(U+2603)
*/
+
g.u = 0x2603
;
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 */
@@
-1486,7
+1494,7
@@
void
xsettitle(char *p)
{
XTextProperty prop;
xsettitle(char *p)
{
XTextProperty prop;
- DEFAULT(p,
"st"
);
+ DEFAULT(p,
opt_title
);
Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
&prop);
Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
&prop);
@@
-1916,19
+1924,19
@@
main(int argc, char *argv[])
opt_embed = EARGF(usage());
break;
case 'v':
opt_embed = EARGF(usage());
break;
case 'v':
- die("%s " VERSION "
(c) 2010-2016 st engineers
\n", argv0);
+ die("%s " VERSION "\n", argv0);
break;
default:
usage();
} ARGEND;
run:
break;
default:
usage();
} ARGEND;
run:
- if (argc > 0) {
- /* eat all remaining arguments */
+ if (argc > 0) /* eat all remaining arguments */
opt_cmd = argv;
opt_cmd = argv;
- if (!opt_title && !opt_line)
- opt_title = basename(xstrdup(argv[0]));
- }
+
+ if (!opt_title)
+ opt_title = (opt_line || !opt_cmd) ? "st" : opt_cmd[0];
+
setlocale(LC_CTYPE, "");
XSetLocaleModifiers("");
cols = MAX(cols, 1);
setlocale(LC_CTYPE, "");
XSetLocaleModifiers("");
cols = MAX(cols, 1);