ts/xw.dis/xw.dpy/ - st - [fork] customized build of st, the simple terminal | |
git clone git://src.adamsgaard.dk/st | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit 00ba6969f863c75536910a0138b5161bbd0638c9 | |
parent b61925b5d6fd8af0ad0ccc922db60dff1746cfe2 | |
Author: Aurélien Aptel <[email protected]> | |
Date: Fri, 26 Nov 2010 22:11:31 +0100 | |
s/xw.dis/xw.dpy/ | |
Diffstat: | |
M st.c | 109 ++++++++++++++++-------------… | |
1 file changed, 55 insertions(+), 54 deletions(-) | |
--- | |
diff --git a/st.c b/st.c | |
t@@ -110,7 +110,7 @@ typedef struct { | |
/* Purely graphic info */ | |
typedef struct { | |
- Display* dis; | |
+ Display* dpy; | |
Colormap cmap; | |
Window win; | |
Pixmap buf; | |
t@@ -437,7 +437,7 @@ selnotify(XEvent *e) { | |
ofs = 0; | |
do { | |
- if(XGetWindowProperty(xw.dis, xw.win, XA_PRIMARY, ofs, BUFSIZ/… | |
+ if(XGetWindowProperty(xw.dpy, xw.win, XA_PRIMARY, ofs, BUFSIZ/… | |
False, AnyPropertyType, &type, &format, | |
&nitems, &rem, &data)) { | |
fprintf(stderr, "Clipboard allocation failed\n"); | |
t@@ -452,7 +452,7 @@ selnotify(XEvent *e) { | |
void | |
selpaste() { | |
- XConvertSelection(xw.dis, XA_PRIMARY, XA_STRING, XA_PRIMARY, xw.win, C… | |
+ XConvertSelection(xw.dpy, XA_PRIMARY, XA_STRING, XA_PRIMARY, xw.win, C… | |
} | |
void | |
t@@ -470,7 +470,7 @@ selrequest(XEvent *e) { | |
/* reject */ | |
xev.property = None; | |
- xa_targets = XInternAtom(xw.dis, "TARGETS", 0); | |
+ xa_targets = XInternAtom(xw.dpy, "TARGETS", 0); | |
if(xsre->target == xa_targets) { | |
/* respond with the supported type */ | |
Atom string = XA_STRING; | |
t@@ -498,12 +498,12 @@ xsetsel(char *str) { | |
free(sel.clip); | |
sel.clip = str; | |
- XSetSelectionOwner(xw.dis, XA_PRIMARY, xw.win, CurrentTime); | |
+ XSetSelectionOwner(xw.dpy, XA_PRIMARY, xw.win, CurrentTime); | |
- clipboard = XInternAtom(xw.dis, "CLIPBOARD", 0); | |
- XSetSelectionOwner(xw.dis, clipboard, xw.win, CurrentTime); | |
+ clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0); | |
+ XSetSelectionOwner(xw.dpy, clipboard, xw.win, CurrentTime); | |
- XFlush(xw.dis); | |
+ XFlush(xw.dpy); | |
} | |
/* TODO: doubleclick to select word */ | |
t@@ -1185,7 +1185,7 @@ tputc(char *c) { | |
if(ascii == '\a' || term.titlelen+1 >= ESC_TITLE_SIZ) { | |
term.esc = 0; | |
term.title[term.titlelen] = '\0'; | |
- XStoreName(xw.dis, xw.win, term.title); | |
+ XStoreName(xw.dpy, xw.win, term.title); | |
} else { | |
term.title[term.titlelen++] = ascii; | |
} | |
t@@ -1360,22 +1360,22 @@ xresize(int col, int row) { | |
oldh = xw.bufh; | |
xw.bufw = MAX(1, col * xw.cw); | |
xw.bufh = MAX(1, row * xw.ch); | |
- newbuf = XCreatePixmap(xw.dis, xw.win, xw.bufw, xw.bufh, XDefaultDepth… | |
- XCopyArea(xw.dis, xw.buf, newbuf, dc.gc, 0, 0, xw.bufw, xw.bufh, 0, 0); | |
- XFreePixmap(xw.dis, xw.buf); | |
- XSetForeground(xw.dis, dc.gc, dc.col[DefaultBG]); | |
+ newbuf = XCreatePixmap(xw.dpy, xw.win, xw.bufw, xw.bufh, XDefaultDepth… | |
+ XCopyArea(xw.dpy, xw.buf, newbuf, dc.gc, 0, 0, xw.bufw, xw.bufh, 0, 0); | |
+ XFreePixmap(xw.dpy, xw.buf); | |
+ XSetForeground(xw.dpy, dc.gc, dc.col[DefaultBG]); | |
if(xw.bufw > oldw) | |
- XFillRectangle(xw.dis, newbuf, dc.gc, oldw, 0, | |
+ XFillRectangle(xw.dpy, newbuf, dc.gc, oldw, 0, | |
xw.bufw-oldw, MIN(xw.bufh, oldh)); | |
else if(xw.bufw < oldw && (BORDER > 0 || xw.w > xw.bufw)) | |
- XClearArea(xw.dis, xw.win, BORDER+xw.bufw, BORDER, | |
+ XClearArea(xw.dpy, xw.win, BORDER+xw.bufw, BORDER, | |
xw.w-xw.bufh-BORDER, BORDER+MIN(xw.bufh, oldh), | |
False); | |
if(xw.bufh > oldh) | |
- XFillRectangle(xw.dis, newbuf, dc.gc, 0, oldh, | |
+ XFillRectangle(xw.dpy, newbuf, dc.gc, 0, oldh, | |
xw.bufw, xw.bufh-oldh); | |
else if(xw.bufh < oldh && (BORDER > 0 || xw.h > xw.bufh)) | |
- XClearArea(xw.dis, xw.win, BORDER, BORDER+xw.bufh, | |
+ XClearArea(xw.dpy, xw.win, BORDER, BORDER+xw.bufh, | |
xw.w-2*BORDER, xw.h-xw.bufh-BORDER, | |
False); | |
xw.buf = newbuf; | |
t@@ -1385,10 +1385,10 @@ void | |
xloadcols(void) { | |
int i, r, g, b; | |
XColor color; | |
- unsigned long white = WhitePixel(xw.dis, xw.scr); | |
+ unsigned long white = WhitePixel(xw.dpy, xw.scr); | |
for(i = 0; i < 16; i++) { | |
- if (!XAllocNamedColor(xw.dis, xw.cmap, colorname[i], &color, &… | |
+ if (!XAllocNamedColor(xw.dpy, xw.cmap, colorname[i], &color, &… | |
dc.col[i] = white; | |
fprintf(stderr, "Could not allocate color '%s'\n", col… | |
} else | |
t@@ -1402,7 +1402,7 @@ xloadcols(void) { | |
color.red = r == 0 ? 0 : 0x3737 + 0x2828 * r; | |
color.green = g == 0 ? 0 : 0x3737 + 0x2828 * g; | |
color.blue = b == 0 ? 0 : 0x3737 + 0x2828 * b; | |
- if (!XAllocColor(xw.dis, xw.cmap, &color)) { | |
+ if (!XAllocColor(xw.dpy, xw.cmap, &color)) { | |
dc.col[i] = white; | |
fprintf(stderr, "Could not allocate co… | |
} else | |
t@@ -1412,7 +1412,7 @@ xloadcols(void) { | |
for(r = 0; r < 24; r++, i++) { | |
color.red = color.green = color.blue = 0x0808 + 0x0a0a * r; | |
- if (!XAllocColor(xw.dis, xw.cmap, &color)) { | |
+ if (!XAllocColor(xw.dpy, xw.cmap, &color)) { | |
dc.col[i] = white; | |
fprintf(stderr, "Could not allocate color %d\n", i); | |
} else | |
t@@ -1422,8 +1422,8 @@ xloadcols(void) { | |
void | |
xclear(int x1, int y1, int x2, int y2) { | |
- XSetForeground(xw.dis, dc.gc, dc.col[DefaultBG]); | |
- XFillRectangle(xw.dis, xw.buf, dc.gc, | |
+ XSetForeground(xw.dpy, dc.gc, dc.col[DefaultBG]); | |
+ XFillRectangle(xw.dpy, xw.buf, dc.gc, | |
x1 * xw.cw, y1 * xw.ch, | |
(x2-x1+1) * xw.cw, (y2-y1+1) * xw.ch); | |
} | |
t@@ -1442,7 +1442,7 @@ xhints(void) | |
.base_height = 2*BORDER, | |
.base_width = 2*BORDER, | |
}; | |
- XSetWMProperties(xw.dis, xw.win, NULL, NULL, NULL, 0, &size, &wm, &cla… | |
+ XSetWMProperties(xw.dpy, xw.win, NULL, NULL, NULL, 0, &size, &wm, &cla… | |
} | |
XFontSet | |
t@@ -1453,7 +1453,7 @@ xinitfont(char *fontstr) | |
int n; | |
missing = NULL; | |
- set = XCreateFontSet(xw.dis, fontstr, &missing, &n, &def); | |
+ set = XCreateFontSet(xw.dpy, fontstr, &missing, &n, &def); | |
if(missing) { | |
while(n--) | |
fprintf(stderr, "st: missing fontset: %s\n", missing[n… | |
t@@ -1496,9 +1496,9 @@ void | |
xinit(void) { | |
XSetWindowAttributes attrs; | |
- if(!(xw.dis = XOpenDisplay(NULL))) | |
+ if(!(xw.dpy = XOpenDisplay(NULL))) | |
die("Can't open display\n"); | |
- xw.scr = XDefaultScreen(xw.dis); | |
+ xw.scr = XDefaultScreen(xw.dpy); | |
/* font */ | |
initfonts(FONT, BOLDFONT); | |
t@@ -1508,7 +1508,7 @@ xinit(void) { | |
xw.ch = dc.font.ascent + dc.font.descent; | |
/* colors */ | |
- xw.cmap = XDefaultColormap(xw.dis, xw.scr); | |
+ xw.cmap = XDefaultColormap(xw.dpy, xw.scr); | |
xloadcols(); | |
/* window - default size */ | |
t@@ -1525,27 +1525,27 @@ xinit(void) { | |
| PointerMotionMask | ButtonPressMask | ButtonReleaseMask; | |
attrs.colormap = xw.cmap; | |
- xw.win = XCreateWindow(xw.dis, XRootWindow(xw.dis, xw.scr), 0, 0, | |
- xw.w, xw.h, 0, XDefaultDepth(xw.dis, xw.scr), InputOut… | |
- XDefaultVisual(xw.dis, xw.scr), | |
+ xw.win = XCreateWindow(xw.dpy, XRootWindow(xw.dpy, xw.scr), 0, 0, | |
+ xw.w, xw.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOut… | |
+ XDefaultVisual(xw.dpy, xw.scr), | |
CWBackPixel | CWBorderPixel | CWBitGravity | CWEventMa… | |
| CWColormap, | |
&attrs); | |
- xw.buf = XCreatePixmap(xw.dis, xw.win, xw.bufw, xw.bufh, XDefaultDepth… | |
+ xw.buf = XCreatePixmap(xw.dpy, xw.win, xw.bufw, xw.bufh, XDefaultDepth… | |
/* input methods */ | |
- xw.xim = XOpenIM(xw.dis, NULL, NULL, NULL); | |
+ xw.xim = XOpenIM(xw.dpy, NULL, NULL, NULL); | |
xw.xic = XCreateIC(xw.xim, XNInputStyle, XIMPreeditNothing | |
| XIMStatusNothing, XNClientWindow,… | |
XNFocusWindow, xw.win, NULL); | |
/* gc */ | |
- dc.gc = XCreateGC(xw.dis, xw.win, 0, NULL); | |
+ dc.gc = XCreateGC(xw.dpy, xw.win, 0, NULL); | |
- XMapWindow(xw.dis, xw.win); | |
+ XMapWindow(xw.dpy, xw.win); | |
xhints(); | |
- XStoreName(xw.dis, xw.win, opt_title ? opt_title : "st"); | |
- XSync(xw.dis, 0); | |
+ XStoreName(xw.dpy, xw.win, opt_title ? opt_title : "st"); | |
+ XSync(xw.dpy, 0); | |
} | |
void | |
t@@ -1559,10 +1559,10 @@ xdraws(char *s, Glyph base, int x, int y, int charlen,… | |
else | |
xfg = dc.col[base.fg], xbg = dc.col[base.bg]; | |
- XSetBackground(xw.dis, dc.gc, xbg); | |
- XSetForeground(xw.dis, dc.gc, xfg); | |
+ XSetBackground(xw.dpy, dc.gc, xbg); | |
+ XSetForeground(xw.dpy, dc.gc, xfg); | |
- if(base.mode & ATTR_GFX) | |
+ if(base.mode & ATTR_GFX) { | |
for(i = 0; i < bytelen; i++) { | |
char c = gfx[(unsigned int)s[i] % 256]; | |
if(c) | |
t@@ -1570,12 +1570,13 @@ xdraws(char *s, Glyph base, int x, int y, int charlen,… | |
else if(s[i] > 0x5f) | |
s[i] -= 0x5f; | |
} | |
+ } | |
- XmbDrawImageString(xw.dis, xw.buf, base.mode & ATTR_BOLD ? dc.bfont.se… | |
+ XmbDrawImageString(xw.dpy, xw.buf, base.mode & ATTR_BOLD ? dc.bfont.se… | |
dc.gc, winx, winy, s, bytelen); | |
if(base.mode & ATTR_UNDERLINE) | |
- XDrawLine(xw.dis, xw.buf, dc.gc, winx, winy+1, winx+width-1, w… | |
+ XDrawLine(xw.dpy, xw.buf, dc.gc, winx, winy+1, winx+width-1, w… | |
} | |
void | |
t@@ -1612,9 +1613,9 @@ void | |
xdrawc(int x, int y, Glyph g) { | |
int sl = utf8size(g.c); | |
XRectangle r = { x * xw.cw, y * xw.ch, xw.cw, xw.ch }; | |
- XSetBackground(xw.dis, dc.gc, dc.col[g.bg]); | |
- XSetForeground(xw.dis, dc.gc, dc.col[g.fg]); | |
- XmbDrawImageString(xw.dis, xw.buf, g.mode&ATTR_BOLD?dc.bfont.fs:dc.fon… | |
+ XSetBackground(xw.dpy, dc.gc, dc.col[g.bg]); | |
+ XSetForeground(xw.dpy, dc.gc, dc.col[g.fg]); | |
+ XmbDrawImageString(xw.dpy, xw.buf, g.mode&ATTR_BOLD?dc.bfont.fs:dc.fon… | |
dc.gc, r.x, r.y+dc.font.ascent, g.c, sl); | |
} | |
t@@ -1629,8 +1630,8 @@ draw(int dummy) { | |
xdrawc(x, y, term.line[y][x]); | |
xdrawcursor(); | |
- XCopyArea(xw.dis, xw.buf, xw.win, dc.gc, 0, 0, xw.bufw, xw.bufh, BORDE… | |
- XFlush(xw.dis); | |
+ XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, 0, 0, xw.bufw, xw.bufh, BORDE… | |
+ XFlush(xw.dpy); | |
} | |
#else | |
t@@ -1672,7 +1673,7 @@ draw(int redraw_all) { | |
xdraws(buf, base, ox, y, ic, ib); | |
} | |
xdrawcursor(); | |
- XCopyArea(xw.dis, xw.buf, xw.win, dc.gc, 0, 0, xw.bufw, xw.bufh, BORDE… | |
+ XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, 0, 0, xw.bufw, xw.bufh, BORDE… | |
} | |
#endif | |
t@@ -1686,7 +1687,7 @@ expose(XEvent *ev) { | |
draw(SCREEN_REDRAW); | |
} | |
} else | |
- XCopyArea(xw.dis, xw.buf, xw.win, dc.gc, e->x-BORDER, e->y-BOR… | |
+ XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, e->x-BORDER, e->y-BOR… | |
e->width, e->height, e->x, e->y); | |
} | |
t@@ -1707,9 +1708,9 @@ unmap(XEvent *ev) { | |
void | |
xseturgency(int add) { | |
- XWMHints *h = XGetWMHints(xw.dis, xw.win); | |
+ XWMHints *h = XGetWMHints(xw.dpy, xw.win); | |
h->flags = add ? (h->flags | XUrgencyHint) : (h->flags & ~XUrgencyHint… | |
- XSetWMHints(xw.dis, xw.win, h); | |
+ XSetWMHints(xw.dpy, xw.win, h); | |
XFree(h); | |
} | |
t@@ -1806,7 +1807,7 @@ void | |
run(void) { | |
XEvent ev; | |
fd_set rfd; | |
- int xfd = XConnectionNumber(xw.dis); | |
+ int xfd = XConnectionNumber(xw.dpy); | |
for(;;) { | |
FD_ZERO(&rfd); | |
t@@ -1821,8 +1822,8 @@ run(void) { | |
ttyread(); | |
draw(SCREEN_UPDATE); | |
} | |
- while(XPending(xw.dis)) { | |
- XNextEvent(xw.dis, &ev); | |
+ while(XPending(xw.dpy)) { | |
+ XNextEvent(xw.dpy, &ev); | |
if (XFilterEvent(&ev, xw.win)) | |
continue; | |
if(handler[ev.type]) |