#include <X11/Xutil.h>
#include <X11/cursorfont.h>
#include <X11/keysym.h>
-#include <X11/extensions/Xdbe.h>
#include <X11/Xft/Xft.h>
#include <fontconfig/fontconfig.h>
static void xdrawcursor(void);
static void xinit(void);
static void xloadcols(void);
+static int xsetcolorname(int, const char *);
static int xloadfont(Font *, FcPattern *);
static void xloadfonts(char *, int);
+static void xsettitle(char *);
static void xresettitle(void);
static void xseturgency(int);
static void xsetsel(char*);
static char *opt_class = NULL;
static char *opt_font = NULL;
-bool usedbe = False;
-
static char *usedfont = NULL;
static int usedfontsize = 0;
void
bmotion(XEvent *e) {
- int oldey, oldex;
+ int oldey, oldex, oldsby, oldsey;
if(IS_SET(MODE_MOUSE)) {
mousereport(e);
oldey = sel.ey;
oldex = sel.ex;
+ oldsby = sel.b.y;
+ oldsey = sel.e.y;
getbuttoninfo(e);
if(oldey != sel.ey || oldex != sel.ex) {
- tsetdirt(sel.b.y, sel.e.y);
+ tsetdirt(MIN(sel.b.y, oldsby), MAX(sel.e.y, oldsey));
}
}
void
strhandle(void) {
- char *p;
+ char *p = NULL;
+ int i, j, narg;
- /*
- * TODO: make this being useful in case of color palette change.
- */
strparse();
-
- p = strescseq.buf;
+ narg = strescseq.narg;
switch(strescseq.type) {
case ']': /* OSC -- Operating System Command */
- switch(p[0]) {
- case '0':
- case '1':
- case '2':
- /*
- * TODO: Handle special chars in string, like umlauts.
- */
- if(p[1] == ';') {
- XStoreName(xw.dpy, xw.win, strescseq.buf+2);
- }
- break;
- case ';':
- XStoreName(xw.dpy, xw.win, strescseq.buf+1);
+ switch(i = atoi(strescseq.args[0])) {
+ case 0:
+ case 1:
+ case 2:
+ if(narg > 1)
+ xsettitle(strescseq.args[1]);
break;
- case '4': /* TODO: Set color (arg0) to "rgb:%hexr/$hexg/$hexb" (arg1) */
+ case 4: /* color set */
+ if(narg < 3)
+ break;
+ p = strescseq.args[2];
+ /* fall through */
+ case 104: /* color reset, here p = NULL */
+ j = (narg > 1) ? atoi(strescseq.args[1]) : -1;
+ if (!xsetcolorname(j, p)) {
+ fprintf(stderr, "erresc: invalid color %s\n", p);
+ } else {
+ /*
+ * TODO if defaultbg color is changed, borders
+ * are dirty
+ */
+ redraw(0);
+ }
break;
default:
fprintf(stderr, "erresc: unknown str ");
}
break;
case 'k': /* old title set compatibility */
- XStoreName(xw.dpy, xw.win, strescseq.buf);
+ xsettitle(strescseq.args[0]);
break;
case 'P': /* DSC -- Device Control String */
case '_': /* APC -- Application Program Command */
* TODO: Implement parsing like for CSI when required.
* Format: ESC type cmd ';' arg0 [';' argn] ESC \
*/
- return;
+ int narg = 0;
+ char *start = strescseq.buf, *end = start + strescseq.len;
+ strescseq.args[0] = start;
+ while(start < end && narg < LEN(strescseq.args)) {
+ start = memchr(start, ';', end - start);
+ if(!start)
+ break;
+ *start++ = '\0';
+ if(start < end) {
+ strescseq.args[++narg] = start;
+ }
+ }
+ strescseq.narg = narg + 1;
}
void
xw.tw = MAX(1, col * xw.cw);
xw.th = MAX(1, row * xw.ch);
- if(!usedbe) {
- XFreePixmap(xw.dpy, xw.buf);
- xw.buf = XCreatePixmap(xw.dpy, xw.win, xw.w, xw.h,
- DefaultDepth(xw.dpy, xw.scr));
- XSetForeground(xw.dpy, dc.gc, dc.col[IS_SET(MODE_REVERSE) ? defaultfg : defaultbg].pixel);
- XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, xw.w, xw.h);
- }
+ XFreePixmap(xw.dpy, xw.buf);
+ xw.buf = XCreatePixmap(xw.dpy, xw.win, xw.w, xw.h,
+ DefaultDepth(xw.dpy, xw.scr));
+ XSetForeground(xw.dpy, dc.gc, dc.col[IS_SET(MODE_REVERSE) ? defaultfg : defaultbg].pixel);
+ XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, xw.w, xw.h);
XftDrawChange(xw.draw, xw.buf);
}
+static inline ushort
+sixd_to_16bit(int x) {
+ return x == 0 ? 0 : 0x3737 + 0x2828 * x;
+}
+
void
xloadcols(void) {
int i, r, g, b;
for(i = 16, r = 0; r < 6; r++) {
for(g = 0; g < 6; g++) {
for(b = 0; b < 6; b++) {
- color.red = r == 0 ? 0 : 0x3737 + 0x2828 * r;
- color.green = g == 0 ? 0 : 0x3737 + 0x2828 * g;
- color.blue = b == 0 ? 0 : 0x3737 + 0x2828 * b;
+ color.red = sixd_to_16bit(r);
+ color.green = sixd_to_16bit(g);
+ color.blue = sixd_to_16bit(b);
if(!XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &color, &dc.col[i])) {
die("Could not allocate color %d\n", i);
}
}
}
+int
+xsetcolorname(int x, const char *name) {
+ XRenderColor color = { .alpha = 0xffff };
+ Colour colour;
+ if (x < 0 || x > LEN(colorname))
+ return -1;
+ if(!name) {
+ if(16 <= x && x < 16 + 216) {
+ int r = (x - 16) / 36, g = ((x - 16) % 36) / 6, b = (x - 16) % 6;
+ color.red = sixd_to_16bit(r);
+ color.green = sixd_to_16bit(g);
+ color.blue = sixd_to_16bit(b);
+ if(!XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &color, &colour))
+ return 0; /* something went wrong */
+ dc.col[x] = colour;
+ return 1;
+ } else if (16 + 216 <= x && x < 256) {
+ color.red = color.green = color.blue = 0x0808 + 0x0a0a * (x - (16 + 216));
+ if(!XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &color, &colour))
+ return 0; /* something went wrong */
+ dc.col[x] = colour;
+ return 1;
+ } else {
+ name = colorname[x];
+ }
+ }
+ if(!XftColorAllocName(xw.dpy, xw.vis, xw.cmap, name, &colour))
+ return 0;
+ dc.col[x] = colour;
+ return 1;
+}
+
void
xtermclear(int col1, int row1, int col2, int row2) {
XftDrawRect(xw.draw,
XGCValues gcvalues;
Cursor cursor;
Window parent;
- int sw, sh, major, minor;
+ int sw, sh;
if(!(xw.dpy = XOpenDisplay(NULL)))
die("Can't open display\n");
| CWColormap,
&attrs);
- /* double buffering */
- /*
- if(XdbeQueryExtension(xw.dpy, &major, &minor)) {
- xw.buf = XdbeAllocateBackBufferName(xw.dpy, xw.win,
- XdbeBackground);
- usedbe = True;
- } else {
- */
- memset(&gcvalues, 0, sizeof(gcvalues));
- gcvalues.graphics_exposures = False;
- dc.gc = XCreateGC(xw.dpy, parent, GCGraphicsExposures,
- &gcvalues);
- xw.buf = XCreatePixmap(xw.dpy, xw.win, xw.w, xw.h,
- DefaultDepth(xw.dpy, xw.scr));
- XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel);
- XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, xw.w, xw.h);
- //xw.buf = xw.win;
- /*
- }
- */
+ memset(&gcvalues, 0, sizeof(gcvalues));
+ gcvalues.graphics_exposures = False;
+ dc.gc = XCreateGC(xw.dpy, parent, GCGraphicsExposures,
+ &gcvalues);
+ xw.buf = XCreatePixmap(xw.dpy, xw.win, xw.w, xw.h,
+ DefaultDepth(xw.dpy, xw.scr));
+ XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel);
+ XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, xw.w, xw.h);
/* Xft rendering context */
xw.draw = XftDrawCreate(xw.dpy, xw.buf, xw.vis, xw.cmap);
}
}
+
+void
+xsettitle(char *p) {
+ XTextProperty prop;
+
+ Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
+ &prop);
+ XSetWMName(xw.dpy, xw.win, &prop);
+}
+
void
xresettitle(void) {
- XStoreName(xw.dpy, xw.win, opt_title ? opt_title : "st");
+ xsettitle(opt_title ? opt_title : "st");
}
void
void
draw(void) {
- XdbeSwapInfo swpinfo[1] = {{xw.win, XdbeCopied}};
-
drawregion(0, 0, term.col, term.row);
- if(usedbe) {
- XdbeSwapBuffers(xw.dpy, swpinfo, 1);
- } else {
- XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, 0, 0, xw.w,
- xw.h, 0, 0);
- XSetForeground(xw.dpy, dc.gc, dc.col[IS_SET(MODE_REVERSE) ? defaultfg : defaultbg].pixel);
- }
+ XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, 0, 0, xw.w,
+ xw.h, 0, 0);
+ XSetForeground(xw.dpy, dc.gc,
+ dc.col[IS_SET(MODE_REVERSE)?
+ defaultfg : defaultbg].pixel);
}
void