|
|
|
@ -29,9 +29,11 @@ typedef struct {
|
|
|
|
} Shortcut;
|
|
|
|
} Shortcut;
|
|
|
|
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
typedef struct {
|
|
|
|
uint b;
|
|
|
|
uint mod;
|
|
|
|
uint mask;
|
|
|
|
uint button;
|
|
|
|
char *s;
|
|
|
|
void (*func)(const Arg *);
|
|
|
|
|
|
|
|
const Arg arg;
|
|
|
|
|
|
|
|
uint release;
|
|
|
|
} MouseShortcut;
|
|
|
|
} MouseShortcut;
|
|
|
|
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
typedef struct {
|
|
|
|
@ -48,19 +50,15 @@ typedef struct {
|
|
|
|
#define XK_NO_MOD 0
|
|
|
|
#define XK_NO_MOD 0
|
|
|
|
#define XK_SWITCH_MOD (1<<13)
|
|
|
|
#define XK_SWITCH_MOD (1<<13)
|
|
|
|
|
|
|
|
|
|
|
|
/* alpha */
|
|
|
|
|
|
|
|
#define OPAQUE 0Xff
|
|
|
|
|
|
|
|
#define USE_ARGB (alpha != OPAQUE && opt_embed == NULL)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* function definitions used in config.h */
|
|
|
|
/* function definitions used in config.h */
|
|
|
|
static void clipcopy(const Arg *);
|
|
|
|
static void clipcopy(const Arg *);
|
|
|
|
static void clippaste(const Arg *);
|
|
|
|
static void clippaste(const Arg *);
|
|
|
|
static void numlock(const Arg *);
|
|
|
|
static void numlock(const Arg *);
|
|
|
|
static void selpaste(const Arg *);
|
|
|
|
static void selpaste(const Arg *);
|
|
|
|
static void swapcolors(const Arg *);
|
|
|
|
|
|
|
|
static void zoom(const Arg *);
|
|
|
|
static void zoom(const Arg *);
|
|
|
|
static void zoomabs(const Arg *);
|
|
|
|
static void zoomabs(const Arg *);
|
|
|
|
static void zoomreset(const Arg *);
|
|
|
|
static void zoomreset(const Arg *);
|
|
|
|
|
|
|
|
static void ttysend(const Arg *);
|
|
|
|
|
|
|
|
|
|
|
|
/* config.h for applying patches and the configuration. */
|
|
|
|
/* config.h for applying patches and the configuration. */
|
|
|
|
#include "config.h"
|
|
|
|
#include "config.h"
|
|
|
|
@ -96,19 +94,17 @@ typedef struct {
|
|
|
|
Drawable buf;
|
|
|
|
Drawable buf;
|
|
|
|
GlyphFontSpec *specbuf; /* font spec buffer used for rendering */
|
|
|
|
GlyphFontSpec *specbuf; /* font spec buffer used for rendering */
|
|
|
|
Atom xembed, wmdeletewin, netwmname, netwmpid;
|
|
|
|
Atom xembed, wmdeletewin, netwmname, netwmpid;
|
|
|
|
|
|
|
|
struct {
|
|
|
|
XIM xim;
|
|
|
|
XIM xim;
|
|
|
|
XIC xic;
|
|
|
|
XIC xic;
|
|
|
|
|
|
|
|
XPoint spot;
|
|
|
|
|
|
|
|
XVaNestedList spotlist;
|
|
|
|
|
|
|
|
} ime;
|
|
|
|
Draw draw;
|
|
|
|
Draw draw;
|
|
|
|
Visual *vis;
|
|
|
|
Visual *vis;
|
|
|
|
XSetWindowAttributes attrs;
|
|
|
|
XSetWindowAttributes attrs;
|
|
|
|
/* Here, we use the term *pointer* to differentiate the cursor
|
|
|
|
|
|
|
|
* one sees when hovering the mouse over the terminal from, e.g.,
|
|
|
|
|
|
|
|
* a green rectangle where text would be entered. */
|
|
|
|
|
|
|
|
Cursor vpointer, bpointer; /* visible and hidden pointers */
|
|
|
|
|
|
|
|
int pointerisvisible;
|
|
|
|
|
|
|
|
int scr;
|
|
|
|
int scr;
|
|
|
|
int isfixed; /* is fixed geometry? */
|
|
|
|
int isfixed; /* is fixed geometry? */
|
|
|
|
int depth; /* bit depth */
|
|
|
|
|
|
|
|
int l, t; /* left and top offset */
|
|
|
|
int l, t; /* left and top offset */
|
|
|
|
int gm; /* geometry mask */
|
|
|
|
int gm; /* geometry mask */
|
|
|
|
} XWindow;
|
|
|
|
} XWindow;
|
|
|
|
@ -150,6 +146,10 @@ static void xdrawglyphfontspecs(const XftGlyphFontSpec *, Glyph, int, int, int);
|
|
|
|
static void xdrawglyph(Glyph, int, int);
|
|
|
|
static void xdrawglyph(Glyph, int, int);
|
|
|
|
static void xclear(int, int, int, int);
|
|
|
|
static void xclear(int, int, int, int);
|
|
|
|
static int xgeommasktogravity(int);
|
|
|
|
static int xgeommasktogravity(int);
|
|
|
|
|
|
|
|
static int ximopen(Display *);
|
|
|
|
|
|
|
|
static void ximinstantiate(Display *, XPointer, XPointer);
|
|
|
|
|
|
|
|
static void ximdestroy(XIM, XPointer, XPointer);
|
|
|
|
|
|
|
|
static int xicdestroy(XIC, XPointer, XPointer);
|
|
|
|
static void xinit(int, int);
|
|
|
|
static void xinit(int, int);
|
|
|
|
static void cresize(int, int);
|
|
|
|
static void cresize(int, int);
|
|
|
|
static void xresize(int, int);
|
|
|
|
static void xresize(int, int);
|
|
|
|
@ -171,6 +171,8 @@ static void kpress(XEvent *);
|
|
|
|
static void cmessage(XEvent *);
|
|
|
|
static void cmessage(XEvent *);
|
|
|
|
static void resize(XEvent *);
|
|
|
|
static void resize(XEvent *);
|
|
|
|
static void focus(XEvent *);
|
|
|
|
static void focus(XEvent *);
|
|
|
|
|
|
|
|
static uint buttonmask(uint);
|
|
|
|
|
|
|
|
static int mouseaction(XEvent *, uint);
|
|
|
|
static void brelease(XEvent *);
|
|
|
|
static void brelease(XEvent *);
|
|
|
|
static void bpress(XEvent *);
|
|
|
|
static void bpress(XEvent *);
|
|
|
|
static void bmotion(XEvent *);
|
|
|
|
static void bmotion(XEvent *);
|
|
|
|
@ -234,8 +236,9 @@ typedef struct {
|
|
|
|
} Fontcache;
|
|
|
|
} Fontcache;
|
|
|
|
|
|
|
|
|
|
|
|
/* Fontcache is an array now. A new font will be appended to the array. */
|
|
|
|
/* Fontcache is an array now. A new font will be appended to the array. */
|
|
|
|
static Fontcache frc[16];
|
|
|
|
static Fontcache *frc = NULL;
|
|
|
|
static int frclen = 0;
|
|
|
|
static int frclen = 0;
|
|
|
|
|
|
|
|
static int frccap = 0;
|
|
|
|
static char *usedfont = NULL;
|
|
|
|
static char *usedfont = NULL;
|
|
|
|
static double usedfontsize = 0;
|
|
|
|
static double usedfontsize = 0;
|
|
|
|
static double defaultfontsize = 0;
|
|
|
|
static double defaultfontsize = 0;
|
|
|
|
@ -251,21 +254,6 @@ static char *opt_title = NULL;
|
|
|
|
|
|
|
|
|
|
|
|
static int oldbutton = 3; /* button event on startup: 3 = release */
|
|
|
|
static int oldbutton = 3; /* button event on startup: 3 = release */
|
|
|
|
|
|
|
|
|
|
|
|
int usealtcolors = 0; /* 1 to use alternate palette */
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
|
|
|
swapcolors(const Arg *dummy)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
usealtcolors = !usealtcolors;
|
|
|
|
|
|
|
|
xloadcols();
|
|
|
|
|
|
|
|
redraw();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const char* getcolorname(int i)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
return (usealtcolors) ? altcolorname[i] : colorname[i];
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
void
|
|
|
|
clipcopy(const Arg *dummy)
|
|
|
|
clipcopy(const Arg *dummy)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
@ -334,6 +322,12 @@ zoomreset(const Arg *arg)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
|
|
|
ttysend(const Arg *arg)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
ttywrite(arg->s, strlen(arg->s), 1);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
int
|
|
|
|
evcol(XEvent *e)
|
|
|
|
evcol(XEvent *e)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
@ -354,7 +348,7 @@ void
|
|
|
|
mousesel(XEvent *e, int done)
|
|
|
|
mousesel(XEvent *e, int done)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
int type, seltype = SEL_REGULAR;
|
|
|
|
int type, seltype = SEL_REGULAR;
|
|
|
|
uint state = e->xbutton.state & ~(Button1Mask | forceselmod);
|
|
|
|
uint state = e->xbutton.state & ~(Button1Mask | forcemousemod);
|
|
|
|
|
|
|
|
|
|
|
|
for (type = 1; type < LEN(selmasks); ++type) {
|
|
|
|
for (type = 1; type < LEN(selmasks); ++type) {
|
|
|
|
if (match(selmasks[type], state)) {
|
|
|
|
if (match(selmasks[type], state)) {
|
|
|
|
@ -430,25 +424,51 @@ mousereport(XEvent *e)
|
|
|
|
ttywrite(buf, len, 0);
|
|
|
|
ttywrite(buf, len, 0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
uint
|
|
|
|
|
|
|
|
buttonmask(uint button)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
return button == Button1 ? Button1Mask
|
|
|
|
|
|
|
|
: button == Button2 ? Button2Mask
|
|
|
|
|
|
|
|
: button == Button3 ? Button3Mask
|
|
|
|
|
|
|
|
: button == Button4 ? Button4Mask
|
|
|
|
|
|
|
|
: button == Button5 ? Button5Mask
|
|
|
|
|
|
|
|
: 0;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
|
|
|
mouseaction(XEvent *e, uint release)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
MouseShortcut *ms;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* ignore Button<N>mask for Button<N> - it's set on release */
|
|
|
|
|
|
|
|
uint state = e->xbutton.state & ~buttonmask(e->xbutton.button);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
for (ms = mshortcuts; ms < mshortcuts + LEN(mshortcuts); ms++) {
|
|
|
|
|
|
|
|
if (ms->release == release &&
|
|
|
|
|
|
|
|
ms->button == e->xbutton.button &&
|
|
|
|
|
|
|
|
(match(ms->mod, state) || /* exact or forced */
|
|
|
|
|
|
|
|
match(ms->mod, state & ~forcemousemod))) {
|
|
|
|
|
|
|
|
ms->func(&(ms->arg));
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
void
|
|
|
|
bpress(XEvent *e)
|
|
|
|
bpress(XEvent *e)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
struct timespec now;
|
|
|
|
struct timespec now;
|
|
|
|
MouseShortcut *ms;
|
|
|
|
|
|
|
|
int snap;
|
|
|
|
int snap;
|
|
|
|
|
|
|
|
|
|
|
|
if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) {
|
|
|
|
if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forcemousemod)) {
|
|
|
|
mousereport(e);
|
|
|
|
mousereport(e);
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
for (ms = mshortcuts; ms < mshortcuts + LEN(mshortcuts); ms++) {
|
|
|
|
if (mouseaction(e, 0))
|
|
|
|
if (e->xbutton.button == ms->b
|
|
|
|
|
|
|
|
&& match(ms->mask, e->xbutton.state)) {
|
|
|
|
|
|
|
|
ttywrite(ms->s, strlen(ms->s), 1);
|
|
|
|
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (e->xbutton.button == Button1) {
|
|
|
|
if (e->xbutton.button == Button1) {
|
|
|
|
/*
|
|
|
|
/*
|
|
|
|
@ -653,8 +673,6 @@ setsel(char *str, Time t)
|
|
|
|
XSetSelectionOwner(xw.dpy, XA_PRIMARY, xw.win, t);
|
|
|
|
XSetSelectionOwner(xw.dpy, XA_PRIMARY, xw.win, t);
|
|
|
|
if (XGetSelectionOwner(xw.dpy, XA_PRIMARY) != xw.win)
|
|
|
|
if (XGetSelectionOwner(xw.dpy, XA_PRIMARY) != xw.win)
|
|
|
|
selclear();
|
|
|
|
selclear();
|
|
|
|
|
|
|
|
|
|
|
|
clipcopy(NULL);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
void
|
|
|
|
@ -666,28 +684,21 @@ xsetsel(char *str)
|
|
|
|
void
|
|
|
|
void
|
|
|
|
brelease(XEvent *e)
|
|
|
|
brelease(XEvent *e)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) {
|
|
|
|
if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forcemousemod)) {
|
|
|
|
mousereport(e);
|
|
|
|
mousereport(e);
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (e->xbutton.button == Button2)
|
|
|
|
if (mouseaction(e, 1))
|
|
|
|
selpaste(NULL);
|
|
|
|
return;
|
|
|
|
else if (e->xbutton.button == Button1)
|
|
|
|
if (e->xbutton.button == Button1)
|
|
|
|
mousesel(e, 1);
|
|
|
|
mousesel(e, 1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
void
|
|
|
|
bmotion(XEvent *e)
|
|
|
|
bmotion(XEvent *e)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (!xw.pointerisvisible) {
|
|
|
|
if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forcemousemod)) {
|
|
|
|
XDefineCursor(xw.dpy, xw.win, xw.vpointer);
|
|
|
|
|
|
|
|
xw.pointerisvisible = 1;
|
|
|
|
|
|
|
|
if (!IS_SET(MODE_MOUSEMANY))
|
|
|
|
|
|
|
|
xsetpointermotion(0);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) {
|
|
|
|
|
|
|
|
mousereport(e);
|
|
|
|
mousereport(e);
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -707,6 +718,8 @@ cresize(int width, int height)
|
|
|
|
|
|
|
|
|
|
|
|
col = (win.w - 2 * borderpx) / win.cw;
|
|
|
|
col = (win.w - 2 * borderpx) / win.cw;
|
|
|
|
row = (win.h - 2 * borderpx) / win.ch;
|
|
|
|
row = (win.h - 2 * borderpx) / win.ch;
|
|
|
|
|
|
|
|
col = MAX(1, col);
|
|
|
|
|
|
|
|
row = MAX(1, row);
|
|
|
|
|
|
|
|
|
|
|
|
tresize(col, row);
|
|
|
|
tresize(col, row);
|
|
|
|
xresize(col, row);
|
|
|
|
xresize(col, row);
|
|
|
|
@ -716,12 +729,12 @@ cresize(int width, int height)
|
|
|
|
void
|
|
|
|
void
|
|
|
|
xresize(int col, int row)
|
|
|
|
xresize(int col, int row)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
win.tw = MAX(1, col * win.cw);
|
|
|
|
win.tw = col * win.cw;
|
|
|
|
win.th = MAX(1, row * win.ch);
|
|
|
|
win.th = row * win.ch;
|
|
|
|
|
|
|
|
|
|
|
|
XFreePixmap(xw.dpy, xw.buf);
|
|
|
|
XFreePixmap(xw.dpy, xw.buf);
|
|
|
|
xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h,
|
|
|
|
xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h,
|
|
|
|
xw.depth);
|
|
|
|
DefaultDepth(xw.dpy, xw.scr));
|
|
|
|
XftDrawChange(xw.draw, xw.buf);
|
|
|
|
XftDrawChange(xw.draw, xw.buf);
|
|
|
|
xclear(0, 0, win.w, win.h);
|
|
|
|
xclear(0, 0, win.w, win.h);
|
|
|
|
|
|
|
|
|
|
|
|
@ -753,7 +766,7 @@ xloadcolor(int i, const char *name, Color *ncolor)
|
|
|
|
return XftColorAllocValue(xw.dpy, xw.vis,
|
|
|
|
return XftColorAllocValue(xw.dpy, xw.vis,
|
|
|
|
xw.cmap, &color, ncolor);
|
|
|
|
xw.cmap, &color, ncolor);
|
|
|
|
} else
|
|
|
|
} else
|
|
|
|
name = getcolorname(i);
|
|
|
|
name = colorname[i];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return XftColorAllocName(xw.dpy, xw.vis, xw.cmap, name, ncolor);
|
|
|
|
return XftColorAllocName(xw.dpy, xw.vis, xw.cmap, name, ncolor);
|
|
|
|
@ -766,28 +779,20 @@ xloadcols(void)
|
|
|
|
static int loaded;
|
|
|
|
static int loaded;
|
|
|
|
Color *cp;
|
|
|
|
Color *cp;
|
|
|
|
|
|
|
|
|
|
|
|
dc.collen = MAX(LEN(colorname), LEN(altcolorname));
|
|
|
|
|
|
|
|
dc.col = xmalloc(dc.collen * sizeof(Color));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (loaded) {
|
|
|
|
if (loaded) {
|
|
|
|
for (cp = dc.col; cp < &dc.col[dc.collen]; ++cp)
|
|
|
|
for (cp = dc.col; cp < &dc.col[dc.collen]; ++cp)
|
|
|
|
XftColorFree(xw.dpy, xw.vis, xw.cmap, cp);
|
|
|
|
XftColorFree(xw.dpy, xw.vis, xw.cmap, cp);
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
dc.collen = MAX(LEN(colorname), 256);
|
|
|
|
|
|
|
|
dc.col = xmalloc(dc.collen * sizeof(Color));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < dc.collen; i++)
|
|
|
|
for (i = 0; i < dc.collen; i++)
|
|
|
|
if (!xloadcolor(i, NULL, &dc.col[i])) {
|
|
|
|
if (!xloadcolor(i, NULL, &dc.col[i])) {
|
|
|
|
if (getcolorname(i))
|
|
|
|
if (colorname[i])
|
|
|
|
die("Could not allocate color '%s'\n", getcolorname(i));
|
|
|
|
die("could not allocate color '%s'\n", colorname[i]);
|
|
|
|
else
|
|
|
|
else
|
|
|
|
die("Could not allocate color %d\n", i);
|
|
|
|
die("could not allocate color %d\n", i);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* set alpha value of bg color */
|
|
|
|
|
|
|
|
if (USE_ARGB) {
|
|
|
|
|
|
|
|
dc.col[defaultbg].color.alpha = alpha << 8;
|
|
|
|
|
|
|
|
dc.col[defaultbg].color.red = ((dc.col[defaultbg].color.red >> 8) * alpha / 255) << 8;
|
|
|
|
|
|
|
|
dc.col[defaultbg].color.green = ((dc.col[defaultbg].color.green >> 8) * alpha / 255) << 8;
|
|
|
|
|
|
|
|
dc.col[defaultbg].color.blue = ((dc.col[defaultbg].color.blue >> 8) * alpha / 255) << 8;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
loaded = 1;
|
|
|
|
loaded = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -800,7 +805,6 @@ xsetcolorname(int x, const char *name)
|
|
|
|
if (!BETWEEN(x, 0, dc.collen))
|
|
|
|
if (!BETWEEN(x, 0, dc.collen))
|
|
|
|
return 1;
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (!xloadcolor(x, name, &ncolor))
|
|
|
|
if (!xloadcolor(x, name, &ncolor))
|
|
|
|
return 1;
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
|
|
|
|
@ -810,17 +814,6 @@ xsetcolorname(int x, const char *name)
|
|
|
|
return 0;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
|
|
|
xtermclear(int col1, int row1, int col2, int row2)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
XftDrawRect(xw.draw,
|
|
|
|
|
|
|
|
&dc.col[IS_SET(MODE_REVERSE) ? defaultfg : defaultbg],
|
|
|
|
|
|
|
|
borderpx + col1 * win.cw,
|
|
|
|
|
|
|
|
borderpx + row1 * win.ch,
|
|
|
|
|
|
|
|
(col2-col1+1) * win.cw,
|
|
|
|
|
|
|
|
(row2-row1+1) * win.ch);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
/*
|
|
|
|
* Absolute coordinates.
|
|
|
|
* Absolute coordinates.
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@ -842,15 +835,17 @@ xhints(void)
|
|
|
|
|
|
|
|
|
|
|
|
sizeh = XAllocSizeHints();
|
|
|
|
sizeh = XAllocSizeHints();
|
|
|
|
|
|
|
|
|
|
|
|
sizeh->flags = PSize | PResizeInc | PBaseSize;
|
|
|
|
sizeh->flags = PSize | PResizeInc | PBaseSize | PMinSize;
|
|
|
|
sizeh->height = win.h;
|
|
|
|
sizeh->height = win.h;
|
|
|
|
sizeh->width = win.w;
|
|
|
|
sizeh->width = win.w;
|
|
|
|
sizeh->height_inc = win.ch;
|
|
|
|
sizeh->height_inc = win.ch;
|
|
|
|
sizeh->width_inc = win.cw;
|
|
|
|
sizeh->width_inc = win.cw;
|
|
|
|
sizeh->base_height = 2 * borderpx;
|
|
|
|
sizeh->base_height = 2 * borderpx;
|
|
|
|
sizeh->base_width = 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_width = sizeh->max_width = win.w;
|
|
|
|
sizeh->min_height = sizeh->max_height = win.h;
|
|
|
|
sizeh->min_height = sizeh->max_height = win.h;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -923,7 +918,7 @@ xloadfont(Font *f, FcPattern *pattern)
|
|
|
|
if ((XftPatternGetInteger(f->match->pattern, "slant", 0,
|
|
|
|
if ((XftPatternGetInteger(f->match->pattern, "slant", 0,
|
|
|
|
&haveattr) != XftResultMatch) || haveattr < wantattr) {
|
|
|
|
&haveattr) != XftResultMatch) || haveattr < wantattr) {
|
|
|
|
f->badslant = 1;
|
|
|
|
f->badslant = 1;
|
|
|
|
fputs("st: font slant does not match\n", stderr);
|
|
|
|
fputs("font slant does not match\n", stderr);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@ -932,7 +927,7 @@ xloadfont(Font *f, FcPattern *pattern)
|
|
|
|
if ((XftPatternGetInteger(f->match->pattern, "weight", 0,
|
|
|
|
if ((XftPatternGetInteger(f->match->pattern, "weight", 0,
|
|
|
|
&haveattr) != XftResultMatch) || haveattr != wantattr) {
|
|
|
|
&haveattr) != XftResultMatch) || haveattr != wantattr) {
|
|
|
|
f->badweight = 1;
|
|
|
|
f->badweight = 1;
|
|
|
|
fputs("st: font weight does not match\n", stderr);
|
|
|
|
fputs("font weight does not match\n", stderr);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@ -960,14 +955,13 @@ xloadfonts(char *fontstr, double fontsize)
|
|
|
|
FcPattern *pattern;
|
|
|
|
FcPattern *pattern;
|
|
|
|
double fontval;
|
|
|
|
double fontval;
|
|
|
|
|
|
|
|
|
|
|
|
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) {
|
|
|
|
if (fontsize > 1) {
|
|
|
|
FcPatternDel(pattern, FC_PIXEL_SIZE);
|
|
|
|
FcPatternDel(pattern, FC_PIXEL_SIZE);
|
|
|
|
@ -993,7 +987,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) {
|
|
|
|
if (usedfontsize < 0) {
|
|
|
|
FcPatternGetDouble(dc.font.match->pattern,
|
|
|
|
FcPatternGetDouble(dc.font.match->pattern,
|
|
|
|
@ -1010,17 +1004,17 @@ xloadfonts(char *fontstr, double fontsize)
|
|
|
|
FcPatternDel(pattern, FC_SLANT);
|
|
|
|
FcPatternDel(pattern, FC_SLANT);
|
|
|
|
FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC);
|
|
|
|
FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC);
|
|
|
|
if (xloadfont(&dc.ifont, pattern))
|
|
|
|
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);
|
|
|
|
FcPatternDel(pattern, FC_WEIGHT);
|
|
|
|
FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_BOLD);
|
|
|
|
FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_BOLD);
|
|
|
|
if (xloadfont(&dc.ibfont, pattern))
|
|
|
|
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);
|
|
|
|
FcPatternDel(pattern, FC_SLANT);
|
|
|
|
FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ROMAN);
|
|
|
|
FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ROMAN);
|
|
|
|
if (xloadfont(&dc.bfont, pattern))
|
|
|
|
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);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -1047,66 +1041,83 @@ xunloadfonts(void)
|
|
|
|
xunloadfont(&dc.ibfont);
|
|
|
|
xunloadfont(&dc.ibfont);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
|
|
|
ximopen(Display *dpy)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
XIMCallback imdestroy = { .client_data = NULL, .callback = ximdestroy };
|
|
|
|
|
|
|
|
XICCallback icdestroy = { .client_data = NULL, .callback = xicdestroy };
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
xw.ime.xim = XOpenIM(xw.dpy, NULL, NULL, NULL);
|
|
|
|
|
|
|
|
if (xw.ime.xim == NULL)
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (XSetIMValues(xw.ime.xim, XNDestroyCallback, &imdestroy, NULL))
|
|
|
|
|
|
|
|
fprintf(stderr, "XSetIMValues: "
|
|
|
|
|
|
|
|
"Could not set XNDestroyCallback.\n");
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
xw.ime.spotlist = XVaCreateNestedList(0, XNSpotLocation, &xw.ime.spot,
|
|
|
|
|
|
|
|
NULL);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (xw.ime.xic == NULL) {
|
|
|
|
|
|
|
|
xw.ime.xic = XCreateIC(xw.ime.xim, XNInputStyle,
|
|
|
|
|
|
|
|
XIMPreeditNothing | XIMStatusNothing,
|
|
|
|
|
|
|
|
XNClientWindow, xw.win,
|
|
|
|
|
|
|
|
XNDestroyCallback, &icdestroy,
|
|
|
|
|
|
|
|
NULL);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if (xw.ime.xic == NULL)
|
|
|
|
|
|
|
|
fprintf(stderr, "XCreateIC: Could not create input context.\n");
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
|
|
|
ximinstantiate(Display *dpy, XPointer client, XPointer call)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
if (ximopen(dpy))
|
|
|
|
|
|
|
|
XUnregisterIMInstantiateCallback(xw.dpy, NULL, NULL, NULL,
|
|
|
|
|
|
|
|
ximinstantiate, NULL);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
|
|
|
ximdestroy(XIM xim, XPointer client, XPointer call)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
xw.ime.xim = NULL;
|
|
|
|
|
|
|
|
XRegisterIMInstantiateCallback(xw.dpy, NULL, NULL, NULL,
|
|
|
|
|
|
|
|
ximinstantiate, NULL);
|
|
|
|
|
|
|
|
XFree(xw.ime.spotlist);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
|
|
|
xicdestroy(XIC xim, XPointer client, XPointer call)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
xw.ime.xic = NULL;
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
void
|
|
|
|
xinit(int cols, int rows)
|
|
|
|
xinit(int cols, int rows)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
XGCValues gcvalues;
|
|
|
|
XGCValues gcvalues;
|
|
|
|
|
|
|
|
Cursor cursor;
|
|
|
|
Window parent;
|
|
|
|
Window parent;
|
|
|
|
pid_t thispid = getpid();
|
|
|
|
pid_t thispid = getpid();
|
|
|
|
XColor xmousefg, xmousebg;
|
|
|
|
XColor xmousefg, xmousebg;
|
|
|
|
Pixmap blankpm;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (!(xw.dpy = XOpenDisplay(NULL)))
|
|
|
|
if (!(xw.dpy = XOpenDisplay(NULL)))
|
|
|
|
die("Can't open display\n");
|
|
|
|
die("can't open display\n");
|
|
|
|
xw.scr = XDefaultScreen(xw.dpy);
|
|
|
|
xw.scr = XDefaultScreen(xw.dpy);
|
|
|
|
xw.depth = (USE_ARGB) ? 32: XDefaultDepth(xw.dpy, xw.scr);
|
|
|
|
|
|
|
|
if (!USE_ARGB)
|
|
|
|
|
|
|
|
xw.vis = XDefaultVisual(xw.dpy, xw.scr);
|
|
|
|
xw.vis = XDefaultVisual(xw.dpy, xw.scr);
|
|
|
|
else {
|
|
|
|
|
|
|
|
XVisualInfo *vis;
|
|
|
|
|
|
|
|
XRenderPictFormat *fmt;
|
|
|
|
|
|
|
|
int nvi;
|
|
|
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
XVisualInfo tpl = {
|
|
|
|
|
|
|
|
.screen = xw.scr,
|
|
|
|
|
|
|
|
.depth = 32,
|
|
|
|
|
|
|
|
.class = TrueColor
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
vis = XGetVisualInfo(xw.dpy,
|
|
|
|
|
|
|
|
VisualScreenMask | VisualDepthMask | VisualClassMask,
|
|
|
|
|
|
|
|
&tpl, &nvi);
|
|
|
|
|
|
|
|
xw.vis = NULL;
|
|
|
|
|
|
|
|
for (i = 0; i < nvi; i++) {
|
|
|
|
|
|
|
|
fmt = XRenderFindVisualFormat(xw.dpy, vis[i].visual);
|
|
|
|
|
|
|
|
if (fmt->type == PictTypeDirect && fmt->direct.alphaMask) {
|
|
|
|
|
|
|
|
xw.vis = vis[i].visual;
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
XFree(vis);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (!xw.vis) {
|
|
|
|
|
|
|
|
fprintf(stderr, "Couldn't find ARGB visual.\n");
|
|
|
|
|
|
|
|
exit(1);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* font */
|
|
|
|
/* font */
|
|
|
|
if (!FcInit())
|
|
|
|
if (!FcInit())
|
|
|
|
die("Could not init fontconfig.\n");
|
|
|
|
die("could not init fontconfig.\n");
|
|
|
|
|
|
|
|
|
|
|
|
usedfont = (opt_font == NULL)? font : opt_font;
|
|
|
|
usedfont = (opt_font == NULL)? font : opt_font;
|
|
|
|
xloadfonts(usedfont, 0);
|
|
|
|
xloadfonts(usedfont, 0);
|
|
|
|
|
|
|
|
|
|
|
|
/* colors */
|
|
|
|
/* colors */
|
|
|
|
if (!USE_ARGB)
|
|
|
|
|
|
|
|
xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
|
|
|
|
xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
|
|
|
|
else
|
|
|
|
|
|
|
|
xw.cmap = XCreateColormap(xw.dpy, XRootWindow(xw.dpy, xw.scr),
|
|
|
|
|
|
|
|
xw.vis, None);
|
|
|
|
|
|
|
|
xloadcols();
|
|
|
|
xloadcols();
|
|
|
|
|
|
|
|
|
|
|
|
/* adjust fixed window geometry */
|
|
|
|
/* adjust fixed window geometry */
|
|
|
|
@ -1121,7 +1132,7 @@ xinit(int cols, int rows)
|
|
|
|
xw.attrs.background_pixel = dc.col[defaultbg].pixel;
|
|
|
|
xw.attrs.background_pixel = dc.col[defaultbg].pixel;
|
|
|
|
xw.attrs.border_pixel = dc.col[defaultbg].pixel;
|
|
|
|
xw.attrs.border_pixel = dc.col[defaultbg].pixel;
|
|
|
|
xw.attrs.bit_gravity = NorthWestGravity;
|
|
|
|
xw.attrs.bit_gravity = NorthWestGravity;
|
|
|
|
xw.attrs.event_mask = FocusChangeMask | KeyPressMask
|
|
|
|
xw.attrs.event_mask = FocusChangeMask | KeyPressMask | KeyReleaseMask
|
|
|
|
| ExposureMask | VisibilityChangeMask | StructureNotifyMask
|
|
|
|
| ExposureMask | VisibilityChangeMask | StructureNotifyMask
|
|
|
|
| ButtonMotionMask | ButtonPressMask | ButtonReleaseMask;
|
|
|
|
| ButtonMotionMask | ButtonPressMask | ButtonReleaseMask;
|
|
|
|
xw.attrs.colormap = xw.cmap;
|
|
|
|
xw.attrs.colormap = xw.cmap;
|
|
|
|
@ -1129,15 +1140,16 @@ xinit(int cols, int rows)
|
|
|
|
if (!(opt_embed && (parent = strtol(opt_embed, NULL, 0))))
|
|
|
|
if (!(opt_embed && (parent = strtol(opt_embed, NULL, 0))))
|
|
|
|
parent = XRootWindow(xw.dpy, xw.scr);
|
|
|
|
parent = XRootWindow(xw.dpy, xw.scr);
|
|
|
|
xw.win = XCreateWindow(xw.dpy, parent, xw.l, xw.t,
|
|
|
|
xw.win = XCreateWindow(xw.dpy, parent, xw.l, xw.t,
|
|
|
|
win.w, win.h, 0, xw.depth, InputOutput,
|
|
|
|
win.w, win.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput,
|
|
|
|
xw.vis, CWBackPixel | CWBorderPixel | CWBitGravity
|
|
|
|
xw.vis, CWBackPixel | CWBorderPixel | CWBitGravity
|
|
|
|
| CWEventMask | CWColormap, &xw.attrs);
|
|
|
|
| CWEventMask | CWColormap, &xw.attrs);
|
|
|
|
|
|
|
|
|
|
|
|
memset(&gcvalues, 0, sizeof(gcvalues));
|
|
|
|
memset(&gcvalues, 0, sizeof(gcvalues));
|
|
|
|
gcvalues.graphics_exposures = False;
|
|
|
|
gcvalues.graphics_exposures = False;
|
|
|
|
xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h, xw.depth);
|
|
|
|
dc.gc = XCreateGC(xw.dpy, parent, GCGraphicsExposures,
|
|
|
|
dc.gc = XCreateGC(xw.dpy, (USE_ARGB) ? xw.buf: parent,
|
|
|
|
&gcvalues);
|
|
|
|
GCGraphicsExposures, &gcvalues);
|
|
|
|
xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h,
|
|
|
|
|
|
|
|
DefaultDepth(xw.dpy, xw.scr));
|
|
|
|
XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel);
|
|
|
|
XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel);
|
|
|
|
XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, win.w, win.h);
|
|
|
|
XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, win.w, win.h);
|
|
|
|
|
|
|
|
|
|
|
|
@ -1148,44 +1160,28 @@ xinit(int cols, int rows)
|
|
|
|
xw.draw = XftDrawCreate(xw.dpy, xw.buf, xw.vis, xw.cmap);
|
|
|
|
xw.draw = XftDrawCreate(xw.dpy, xw.buf, xw.vis, xw.cmap);
|
|
|
|
|
|
|
|
|
|
|
|
/* input methods */
|
|
|
|
/* input methods */
|
|
|
|
if ((xw.xim = XOpenIM(xw.dpy, NULL, NULL, NULL)) == NULL) {
|
|
|
|
if (!ximopen(xw.dpy)) {
|
|
|
|
XSetLocaleModifiers("@im=local");
|
|
|
|
XRegisterIMInstantiateCallback(xw.dpy, NULL, NULL, NULL,
|
|
|
|
if ((xw.xim = XOpenIM(xw.dpy, NULL, NULL, NULL)) == NULL) {
|
|
|
|
ximinstantiate, NULL);
|
|
|
|
XSetLocaleModifiers("@im=");
|
|
|
|
|
|
|
|
if ((xw.xim = XOpenIM(xw.dpy,
|
|
|
|
|
|
|
|
NULL, NULL, NULL)) == NULL) {
|
|
|
|
|
|
|
|
die("XOpenIM failed. Could not open input"
|
|
|
|
|
|
|
|
" device.\n");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
xw.xic = XCreateIC(xw.xim, XNInputStyle, XIMPreeditNothing
|
|
|
|
|
|
|
|
| XIMStatusNothing, XNClientWindow, xw.win,
|
|
|
|
|
|
|
|
XNFocusWindow, xw.win, NULL);
|
|
|
|
|
|
|
|
if (xw.xic == NULL)
|
|
|
|
|
|
|
|
die("XCreateIC failed. Could not obtain input method.\n");
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* white cursor, black outline */
|
|
|
|
/* white cursor, black outline */
|
|
|
|
xw.pointerisvisible = 1;
|
|
|
|
cursor = XCreateFontCursor(xw.dpy, mouseshape);
|
|
|
|
xw.vpointer = XCreateFontCursor(xw.dpy, mouseshape);
|
|
|
|
XDefineCursor(xw.dpy, xw.win, cursor);
|
|
|
|
XDefineCursor(xw.dpy, xw.win, xw.vpointer);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (XParseColor(xw.dpy, xw.cmap, getcolorname(mousefg), &xmousefg) == 0) {
|
|
|
|
if (XParseColor(xw.dpy, xw.cmap, colorname[mousefg], &xmousefg) == 0) {
|
|
|
|
xmousefg.red = 0xffff;
|
|
|
|
xmousefg.red = 0xffff;
|
|
|
|
xmousefg.green = 0xffff;
|
|
|
|
xmousefg.green = 0xffff;
|
|
|
|
xmousefg.blue = 0xffff;
|
|
|
|
xmousefg.blue = 0xffff;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (XParseColor(xw.dpy, xw.cmap, getcolorname(mousefg), &xmousebg) == 0) {
|
|
|
|
if (XParseColor(xw.dpy, xw.cmap, colorname[mousebg], &xmousebg) == 0) {
|
|
|
|
xmousebg.red = 0x0000;
|
|
|
|
xmousebg.red = 0x0000;
|
|
|
|
xmousebg.green = 0x0000;
|
|
|
|
xmousebg.green = 0x0000;
|
|
|
|
xmousebg.blue = 0x0000;
|
|
|
|
xmousebg.blue = 0x0000;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
XRecolorCursor(xw.dpy, xw.vpointer, &xmousefg, &xmousebg);
|
|
|
|
XRecolorCursor(xw.dpy, cursor, &xmousefg, &xmousebg);
|
|
|
|
blankpm = XCreateBitmapFromData(xw.dpy, xw.win, &(char){0}, 1, 1);
|
|
|
|
|
|
|
|
xw.bpointer = XCreatePixmapCursor(xw.dpy, blankpm, blankpm,
|
|
|
|
|
|
|
|
&xmousefg, &xmousebg, 0, 0);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
xw.xembed = XInternAtom(xw.dpy, "_XEMBED", False);
|
|
|
|
xw.xembed = XInternAtom(xw.dpy, "_XEMBED", False);
|
|
|
|
xw.wmdeletewin = XInternAtom(xw.dpy, "WM_DELETE_WINDOW", False);
|
|
|
|
xw.wmdeletewin = XInternAtom(xw.dpy, "WM_DELETE_WINDOW", False);
|
|
|
|
@ -1198,8 +1194,8 @@ xinit(int cols, int rows)
|
|
|
|
|
|
|
|
|
|
|
|
win.mode = MODE_NUMLOCK;
|
|
|
|
win.mode = MODE_NUMLOCK;
|
|
|
|
resettitle();
|
|
|
|
resettitle();
|
|
|
|
XMapWindow(xw.dpy, xw.win);
|
|
|
|
|
|
|
|
xhints();
|
|
|
|
xhints();
|
|
|
|
|
|
|
|
XMapWindow(xw.dpy, xw.win);
|
|
|
|
XSync(xw.dpy, False);
|
|
|
|
XSync(xw.dpy, False);
|
|
|
|
|
|
|
|
|
|
|
|
clock_gettime(CLOCK_MONOTONIC, &xsel.tclick1);
|
|
|
|
clock_gettime(CLOCK_MONOTONIC, &xsel.tclick1);
|
|
|
|
@ -1309,13 +1305,10 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
|
|
|
|
fontpattern = FcFontSetMatch(0, fcsets, 1,
|
|
|
|
fontpattern = FcFontSetMatch(0, fcsets, 1,
|
|
|
|
fcpattern, &fcres);
|
|
|
|
fcpattern, &fcres);
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
/* Allocate memory for the new cache entry. */
|
|
|
|
* Overwrite or create the new cache entry.
|
|
|
|
if (frclen >= frccap) {
|
|
|
|
*/
|
|
|
|
frccap += 16;
|
|
|
|
if (frclen >= LEN(frc)) {
|
|
|
|
frc = xrealloc(frc, frccap * sizeof(Fontcache));
|
|
|
|
frclen = LEN(frc) - 1;
|
|
|
|
|
|
|
|
XftFontClose(xw.dpy, frc[frclen].font);
|
|
|
|
|
|
|
|
frc[frclen].unicodep = 0;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
frc[frclen].font = XftFontOpenPattern(xw.dpy,
|
|
|
|
frc[frclen].font = XftFontOpenPattern(xw.dpy,
|
|
|
|
@ -1389,7 +1382,7 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
|
|
|
|
|
|
|
|
|
|
|
|
/* Change basic system colors [0-7] to bright system colors [8-15] */
|
|
|
|
/* Change basic system colors [0-7] to bright system colors [8-15] */
|
|
|
|
if ((base.mode & ATTR_BOLD_FAINT) == ATTR_BOLD && BETWEEN(base.fg, 0, 7))
|
|
|
|
if ((base.mode & ATTR_BOLD_FAINT) == ATTR_BOLD && BETWEEN(base.fg, 0, 7))
|
|
|
|
fg = &dc.col[base.fg];
|
|
|
|
fg = &dc.col[base.fg + 8];
|
|
|
|
|
|
|
|
|
|
|
|
if (IS_SET(MODE_REVERSE)) {
|
|
|
|
if (IS_SET(MODE_REVERSE)) {
|
|
|
|
if (fg == &dc.col[defaultfg]) {
|
|
|
|
if (fg == &dc.col[defaultfg]) {
|
|
|
|
@ -1645,6 +1638,18 @@ xfinishdraw(void)
|
|
|
|
defaultfg : defaultbg].pixel);
|
|
|
|
defaultfg : defaultbg].pixel);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
|
|
|
xximspot(int x, int y)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
if (xw.ime.xic == NULL)
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
xw.ime.spot.x = borderpx + x * win.cw;
|
|
|
|
|
|
|
|
xw.ime.spot.y = borderpx + (y + 1) * win.ch;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
XSetICValues(xw.ime.xic, XNPreeditAttributes, xw.ime.spotlist, NULL);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
void
|
|
|
|
expose(XEvent *ev)
|
|
|
|
expose(XEvent *ev)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
@ -1668,8 +1673,6 @@ unmap(XEvent *ev)
|
|
|
|
void
|
|
|
|
void
|
|
|
|
xsetpointermotion(int set)
|
|
|
|
xsetpointermotion(int set)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (!set && !xw.pointerisvisible)
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
MODBIT(xw.attrs.event_mask, set, PointerMotionMask);
|
|
|
|
MODBIT(xw.attrs.event_mask, set, PointerMotionMask);
|
|
|
|
XChangeWindowAttributes(xw.dpy, xw.win, CWEventMask, &xw.attrs);
|
|
|
|
XChangeWindowAttributes(xw.dpy, xw.win, CWEventMask, &xw.attrs);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -1721,13 +1724,15 @@ focus(XEvent *ev)
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
|
|
if (ev->type == FocusIn) {
|
|
|
|
if (ev->type == FocusIn) {
|
|
|
|
XSetICFocus(xw.xic);
|
|
|
|
if (xw.ime.xic)
|
|
|
|
|
|
|
|
XSetICFocus(xw.ime.xic);
|
|
|
|
win.mode |= MODE_FOCUSED;
|
|
|
|
win.mode |= MODE_FOCUSED;
|
|
|
|
xseturgency(0);
|
|
|
|
xseturgency(0);
|
|
|
|
if (IS_SET(MODE_FOCUS))
|
|
|
|
if (IS_SET(MODE_FOCUS))
|
|
|
|
ttywrite("\033[I", 3, 0);
|
|
|
|
ttywrite("\033[I", 3, 0);
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
XUnsetICFocus(xw.xic);
|
|
|
|
if (xw.ime.xic)
|
|
|
|
|
|
|
|
XUnsetICFocus(xw.ime.xic);
|
|
|
|
win.mode &= ~MODE_FOCUSED;
|
|
|
|
win.mode &= ~MODE_FOCUSED;
|
|
|
|
if (IS_SET(MODE_FOCUS))
|
|
|
|
if (IS_SET(MODE_FOCUS))
|
|
|
|
ttywrite("\033[O", 3, 0);
|
|
|
|
ttywrite("\033[O", 3, 0);
|
|
|
|
@ -1782,22 +1787,19 @@ kpress(XEvent *ev)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
XKeyEvent *e = &ev->xkey;
|
|
|
|
XKeyEvent *e = &ev->xkey;
|
|
|
|
KeySym ksym;
|
|
|
|
KeySym ksym;
|
|
|
|
char buf[32], *customkey;
|
|
|
|
char buf[64], *customkey;
|
|
|
|
int len;
|
|
|
|
int len;
|
|
|
|
Rune c;
|
|
|
|
Rune c;
|
|
|
|
Status status;
|
|
|
|
Status status;
|
|
|
|
Shortcut *bp;
|
|
|
|
Shortcut *bp;
|
|
|
|
|
|
|
|
|
|
|
|
if (xw.pointerisvisible) {
|
|
|
|
|
|
|
|
XDefineCursor(xw.dpy, xw.win, xw.bpointer);
|
|
|
|
|
|
|
|
xsetpointermotion(1);
|
|
|
|
|
|
|
|
xw.pointerisvisible = 0;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (IS_SET(MODE_KBDLOCK))
|
|
|
|
if (IS_SET(MODE_KBDLOCK))
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
|
|
len = XmbLookupString(xw.xic, e, buf, sizeof buf, &ksym, &status);
|
|
|
|
if (xw.ime.xic)
|
|
|
|
|
|
|
|
len = XmbLookupString(xw.ime.xic, e, buf, sizeof buf, &ksym, &status);
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
len = XLookupString(e, buf, sizeof buf, &ksym, NULL);
|
|
|
|
/* 1. shortcuts */
|
|
|
|
/* 1. shortcuts */
|
|
|
|
for (bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) {
|
|
|
|
for (bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) {
|
|
|
|
if (ksym == bp->keysym && match(bp->mod, e->state)) {
|
|
|
|
if (ksym == bp->keysym && match(bp->mod, e->state)) {
|
|
|
|
@ -1830,7 +1832,6 @@ kpress(XEvent *ev)
|
|
|
|
ttywrite(buf, len, 1);
|
|
|
|
ttywrite(buf, len, 1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
void
|
|
|
|
cmessage(XEvent *e)
|
|
|
|
cmessage(XEvent *e)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
@ -2027,7 +2028,7 @@ main(int argc, char *argv[])
|
|
|
|
opt_embed = EARGF(usage());
|
|
|
|
opt_embed = EARGF(usage());
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
case 'v':
|
|
|
|
case 'v':
|
|
|
|
die("%s " VERSION " (c) 2010-2016 st engineers\n", argv0);
|
|
|
|
die("%s " VERSION "\n", argv0);
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
default:
|
|
|
|
usage();
|
|
|
|
usage();
|
|
|
|
|
Toerd@archlinux
5 years ago