#include <sys/wait.h>
#include <unistd.h>
#include <X11/Xlib.h>
+#include <X11/Xatom.h>
#include <X11/keysym.h>
#include <X11/Xutil.h>
#include <libutil.h>
#endif
+#define USAGE \
+ "st-" VERSION ", (c) 2010 st engineers\n" \
+ "usage: st [-t title] [-e cmd] [-v]\n"
+
/* Arbitrary sizes */
#define ESC_TITLE_SIZ 256
#define ESC_BUF_SIZ 256
/* Purely graphic info */
typedef struct {
Display* dis;
+ Colormap cmap;
Window win;
Pixmap buf;
+ XIM xim;
+ XIC xic;
int scr;
int w; /* window width */
int h; /* window height */
int bufh; /* pixmap height */
int ch; /* char height */
int cw; /* char width */
- int hasfocus;
+ int focus;
+ int vis; /* is visible */
} XWindow;
typedef struct {
GC gc;
} DC;
+/* TODO: use better name for vars... */
+typedef struct {
+ int mode;
+ int bx, by;
+ int ex, ey;
+ struct {int x, y;} b, e;
+ char *clip;
+} Selection;
+
#include "config.h"
static void die(const char *errstr, ...);
static void tputs(char*, int);
static void treset(void);
static void tresize(int, int);
-static void tscrollup(int);
-static void tscrolldown(int);
+static void tscrollup(int, int);
+static void tscrolldown(int, int);
static void tsetattr(int*, int);
static void tsetchar(char);
static void tsetscroll(int, int);
static void xseturgency(int);
static void expose(XEvent *);
+static void visibility(XEvent *);
+static void unmap(XEvent *);
static char* kmap(KeySym);
static void kpress(XEvent *);
static void resize(XEvent *);
static void focus(XEvent *);
-static void brelease(XEvent *e);
-static void bpress(XEvent *e);
-static void bmotion(XEvent *e);
-
+static void brelease(XEvent *);
+static void bpress(XEvent *);
+static void bmotion(XEvent *);
+static void selection_notify(XEvent *);
+static void selection_request(XEvent *);
static void (*handler[LASTEvent])(XEvent *) = {
[KeyPress] = kpress,
- [Expose] = expose,
[ConfigureNotify] = resize,
+ [VisibilityNotify] = visibility,
+ [UnmapNotify] = unmap,
+ [Expose] = expose,
[FocusIn] = focus,
[FocusOut] = focus,
[MotionNotify] = bmotion,
[ButtonPress] = bpress,
[ButtonRelease] = brelease,
+ [SelectionNotify] = selection_notify,
+ [SelectionRequest] = selection_request,
};
/* Globals */
static CSIEscape escseq;
static int cmdfd;
static pid_t pid;
+static Selection sel;
+static char *opt_cmd = NULL;
+static char *opt_title = NULL;
-/* selection */
-// TODO: use X11 clipboard
-static int selmode = 0;
-static int selbx = -1, selby;
-static int selex, seley;
-int sb[2], se[2];
-static const char *clipboard = NULL;
+void
+selinit(void) {
+ sel.mode = 0;
+ sel.bx = -1;
+ sel.clip = NULL;
+}
static inline int selected(int x, int y) {
- if ((seley==y && selby==y)) {
- int bx = MIN(selbx, selex);
- int ex = MAX(selbx, selex);
- return (x>=bx && x<=ex);
+ if(sel.ey == y && sel.by == y) {
+ int bx = MIN(sel.bx, sel.ex);
+ int ex = MAX(sel.bx, sel.ex);
+ return BETWEEN(x, bx, ex);
}
- return (((y>sb[1] && y<se[1]) || (y==se[1] && x<=se[0])) || \
- (y==sb[1] && x>=sb[0] && (x<=se[0] || sb[1]!=se[1])));
+ return ((sel.b.y < y&&y < sel.e.y) || (y==sel.e.y && x<=sel.e.x))
+ || (y==sel.b.y && x>=sel.b.x && (x<=sel.e.x || sel.b.y!=sel.e.y));
}
static void getbuttoninfo(XEvent *e, int *b, int *x, int *y) {
- if(b) *b = e->xbutton.state,
- *b=*b==4096?5:*b==2048?4:*b==1024?3:*b==512?2:*b==256?1:-1;
+ if(b)
+ *b = e->xbutton.button;
+
*x = e->xbutton.x/xw.cw;
*y = e->xbutton.y/xw.ch;
- sb[0] = selby<seley?selbx:selex;
- sb[1] = MIN(selby, seley);
- se[0] = selby<seley?selex:selbx;
- se[1] = MAX(selby, seley);
+ sel.b.x = sel.by < sel.ey ? sel.bx : sel.ex;
+ sel.b.y = MIN(sel.by, sel.ey);
+ sel.e.x = sel.by < sel.ey ? sel.ex : sel.bx;
+ sel.e.y = MAX(sel.by, sel.ey);
}
static void bpress(XEvent *e) {
- selmode = 1;
- selex = selbx = e->xbutton.x/xw.cw;
- seley = selby = e->xbutton.y/xw.ch;
+ sel.mode = 1;
+ sel.ex = sel.bx = e->xbutton.x/xw.cw;
+ sel.ey = sel.by = e->xbutton.y/xw.ch;
}
static char *getseltext() {
char *str, *ptr;
int ls, x, y, sz;
- if(selbx==-1)
+ if(sel.bx == -1)
return NULL;
- sz = ((xw.w/xw.ch) * (se[1]-sb[1]+2));
- ptr = str = malloc (sz);
+ sz = (term.col+1) * (sel.e.y-sel.b.y+1);
+ ptr = str = malloc(sz);
for(y = 0; y < term.row; y++) {
- for(x = 0; x < term.col; x++) {
- if(term.line[y][x].c && (ls=selected(x, y))) {
- *ptr = term.line[y][x].c;
- ptr++;
- }
- }
- if (ls) {
- *ptr = '\n';
- ptr++;
- }
+ for(x = 0; x < term.col; x++)
+ if(term.line[y][x].state & GLYPH_SET && (ls = selected(x, y)))
+ *ptr = term.line[y][x].c, ptr++;
+ if(ls)
+ *ptr = '\n', ptr++;
}
*ptr = 0;
return str;
}
-static void clipboard_copy(const char *str) {
- free((void *)clipboard);
- clipboard = str;
+static void selection_notify(XEvent *e) {
+ unsigned long nitems;
+ unsigned long length;
+ int format, res;
+ unsigned char *data;
+ Atom type;
+
+ res = XGetWindowProperty(xw.dis, xw.win, XA_PRIMARY, 0, 0, False,
+ AnyPropertyType, &type, &format, &nitems, &length, &data);
+ switch(res) {
+ case BadAtom:
+ case BadValue:
+ case BadWindow:
+ fprintf(stderr, "Invalid paste, XGetWindowProperty0");
+ return;
+ }
+
+ res = XGetWindowProperty(xw.dis, xw.win, XA_PRIMARY, 0, length, False,
+ AnyPropertyType, &type, &format, &nitems, &length, &data);
+ switch(res) {
+ case BadAtom:
+ case BadValue:
+ case BadWindow:
+ fprintf(stderr, "Invalid paste, XGetWindowProperty0");
+ return;
+ }
+
+ if(data) {
+ ttywrite((const char *) data, nitems * format / 8);
+ XFree(data);
+ }
}
-static void clipboard_paste() {
- if(clipboard)
- ttywrite(clipboard, strlen(clipboard));
+static void selpaste() {
+ XConvertSelection(xw.dis, XA_PRIMARY, XA_STRING, XA_PRIMARY, xw.win, CurrentTime);
}
-// TODO: doubleclick to select word
+static void selection_request(XEvent *e)
+{
+ XSelectionRequestEvent *xsre;
+ XSelectionEvent xev;
+ int res;
+ Atom xa_targets;
+
+ xsre = (XSelectionRequestEvent *) e;
+ xev.type = SelectionNotify;
+ xev.requestor = xsre->requestor;
+ xev.selection = xsre->selection;
+ xev.target = xsre->target;
+ xev.time = xsre->time;
+ /* reject */
+ xev.property = None;
+
+ xa_targets = XInternAtom(xw.dis, "TARGETS", 0);
+ if(xsre->target == xa_targets) {
+ /* respond with the supported type */
+ Atom string = XA_STRING;
+ res = XChangeProperty(xsre->display, xsre->requestor, xsre->property, XA_ATOM, 32,
+ PropModeReplace, (unsigned char *) &string, 1);
+ switch(res) {
+ case BadAlloc:
+ case BadAtom:
+ case BadMatch:
+ case BadValue:
+ case BadWindow:
+ fprintf(stderr, "Error in selection_request, TARGETS");
+ break;
+ default:
+ xev.property = xsre->property;
+ }
+ } else if(xsre->target == XA_STRING) {
+ res = XChangeProperty(xsre->display, xsre->requestor, xsre->property,
+ xsre->target, 8, PropModeReplace, (unsigned char *) sel.clip,
+ strlen(sel.clip));
+ switch(res) {
+ case BadAlloc:
+ case BadAtom:
+ case BadMatch:
+ case BadValue:
+ case BadWindow:
+ fprintf(stderr, "Error in selection_request, XA_STRING");
+ break;
+ default:
+ xev.property = xsre->property;
+ }
+ }
+
+ /* all done, send a notification to the listener */
+ res = XSendEvent(xsre->display, xsre->requestor, True, 0, (XEvent *) &xev);
+ switch(res) {
+ case 0:
+ case BadValue:
+ case BadWindow:
+ fprintf(stderr, "Error in selection_requested, XSendEvent");
+ }
+}
+
+static void selcopy(char *str) {
+ /* register the selection for both the clipboard and the primary */
+ Atom clipboard;
+ int res;
+
+ free(sel.clip);
+ sel.clip = str;
+
+ res = XSetSelectionOwner(xw.dis, XA_PRIMARY, xw.win, CurrentTime);
+ switch(res) {
+ case BadAtom:
+ case BadWindow:
+ fprintf(stderr, "Invalid copy, XSetSelectionOwner");
+ return;
+ }
+
+ clipboard = XInternAtom(xw.dis, "CLIPBOARD", 0);
+ res = XSetSelectionOwner(xw.dis, clipboard, xw.win, CurrentTime);
+ switch(res) {
+ case BadAtom:
+ case BadWindow:
+ fprintf(stderr, "Invalid copy, XSetSelectionOwner");
+ return;
+ }
+
+ XFlush(xw.dis);
+}
+
+/* TODO: doubleclick to select word */
static void brelease(XEvent *e) {
int b;
- selmode = 0;
- getbuttoninfo(e, &b, &selex, &seley);
- if(b==4)
- tscrollup(1);
- else
- if(b==5)
- tscrolldown(1);
- else
- if(selbx==selex && selby==seley) {
- selbx = -1;
+ sel.mode = 0;
+ getbuttoninfo(e, &b, &sel.ex, &sel.ey);
+ if(sel.bx==sel.ex && sel.by==sel.ey) {
+ sel.bx = -1;
if(b==2)
- clipboard_paste();
+ selpaste();
} else {
if(b==1)
- clipboard_copy(getseltext());
+ selcopy(getseltext());
}
draw(1);
}
static void bmotion(XEvent *e) {
- if (selmode) {
- getbuttoninfo(e, NULL, &selex, &seley);
+ if (sel.mode) {
+ getbuttoninfo(e, NULL, &sel.ex, &sel.ey);
draw(1);
}
}
void
execsh(void) {
- char *args[3] = {getenv("SHELL"), "-i", NULL};
- DEFAULT(args[0], SHELL); /* if getenv() failed */
- putenv("TERM=" TNAME);
+ char *args[] = {getenv("SHELL"), "-i", NULL};
+ if(opt_cmd)
+ args[0] = opt_cmd, args[1] = NULL;
+ else
+ DEFAULT(args[0], SHELL);
+ putenv("TERM="TNAME);
execvp(args[0], args);
}
void
ttyread(void) {
- char buf[BUFSIZ] = {0};
+ char buf[BUFSIZ];
int ret;
- if((ret = read(cmdfd, buf, BUFSIZ)) < 0)
+ if((ret = read(cmdfd, buf, LEN(buf))) < 0)
die("Couldn't read from shell: %s\n", SERRNO);
else
tputs(buf, ret);
}
void
-tscrolldown (int n) {
+tscrolldown(int orig, int n) {
int i;
Line temp;
- LIMIT(n, 0, term.bot-term.top+1);
+ LIMIT(n, 0, term.bot-orig+1);
- for(i = 0; i < n; i++)
- memset(term.line[term.bot-i], 0, term.col*sizeof(Glyph));
+ tclearregion(0, term.bot-n+1, term.col-1, term.bot);
- for(i = term.bot; i >= term.top+n; i--) {
+ for(i = term.bot; i >= orig+n; i--) {
temp = term.line[i];
term.line[i] = term.line[i-n];
term.line[i-n] = temp;
}
void
-tscrollup (int n) {
+tscrollup(int orig, int n) {
int i;
Line temp;
- LIMIT(n, 0, term.bot-term.top+1);
+ LIMIT(n, 0, term.bot-orig+1);
- for(i = 0; i < n; i++)
- memset(term.line[term.top+i], 0, term.col*sizeof(Glyph));
+ tclearregion(0, orig, term.col-1, orig+n-1);
- for(i = term.top; i <= term.bot-n; i++) {
+ for(i = orig; i <= term.bot-n; i++) {
temp = term.line[i];
term.line[i] = term.line[i+n];
term.line[i+n] = temp;
void
tnewline(void) {
- int y = term.c.y + 1;
- if(y > term.bot)
- tscrollup(1), y = term.bot;
- tmoveto(0, y);
+ int x = term.c.x+1 < term.col ? term.c.x : 0;
+ int y = term.c.y;
+ if(term.c.y == term.bot)
+ tscrollup(term.top, 1);
+ else
+ y++;
+ tmoveto(x, y);
}
void
void
tclearregion(int x1, int y1, int x2, int y2) {
- int y, temp;
+ int x, y, temp;
if(x1 > x2)
temp = x1, x1 = x2, x2 = temp;
LIMIT(y2, 0, term.row-1);
for(y = y1; y <= y2; y++)
- memset(&term.line[y][x1], 0, sizeof(Glyph)*(x2-x1+1));
+ for(x = x1; x <= x2; x++)
+ term.line[y][x].state = 0;
}
void
void
tinsertblankline(int n) {
- int i;
- Line blank;
- int bot = term.bot;
-
- if(term.c.y > term.bot)
- bot = term.row - 1;
- else if(term.c.y < term.top)
- bot = term.top - 1;
- if(term.c.y + n >= bot) {
- tclearregion(0, term.c.y, term.col-1, bot);
+ if(term.c.y < term.top || term.c.y > term.bot)
return;
- }
- for(i = bot; i >= term.c.y+n; i--) {
- /* swap deleted line <-> blanked line */
- blank = term.line[i];
- term.line[i] = term.line[i-n];
- term.line[i-n] = blank;
- /* blank it */
- memset(blank, 0, term.col * sizeof(Glyph));
- }
+
+ tscrolldown(term.c.y, n);
}
void
tdeleteline(int n) {
- int i;
- Line blank;
- int bot = term.bot;
-
- if(term.c.y > term.bot)
- bot = term.row - 1;
- else if(term.c.y < term.top)
- bot = term.top - 1;
- if(term.c.y + n >= bot) {
- tclearregion(0, term.c.y, term.col-1, bot);
+ if(term.c.y < term.top || term.c.y > term.bot)
return;
- }
- for(i = term.c.y; i <= bot-n; i++) {
- /* swap deleted line <-> blanked line */
- blank = term.line[i];
- term.line[i] = term.line[i+n];
- term.line[i+n] = blank;
- /* blank it */
- memset(blank, 0, term.col * sizeof(Glyph));
- }
+
+ tscrollup(term.c.y, n);
}
void
else if(BETWEEN(attr[i], 100, 107))
term.c.attr.fg = attr[i] - 100 + 8;
else
- fprintf(stderr, "erresc: gfx attr %d unknown\n", attr[i]);
+ fprintf(stderr, "erresc: gfx attr %d unknown\n", attr[i]), csidump();
+
break;
}
}
case 2: /* all */
tclearregion(0, 0, term.col-1, term.row-1);
break;
- case 3: /* XXX: erase saved lines (xterm) */
default:
goto unknown;
}
break;
case 'S': /* SU -- Scroll <n> line up */
DEFAULT(escseq.arg[0], 1);
- tscrollup(escseq.arg[0]);
+ tscrollup(term.top, escseq.arg[0]);
break;
case 'T': /* SD -- Scroll <n> line down */
DEFAULT(escseq.arg[0], 1);
- tscrolldown(escseq.arg[0]);
+ tscrolldown(term.top, escseq.arg[0]);
break;
case 'L': /* IL -- Insert <n> blank lines */
DEFAULT(escseq.arg[0], 1);
case 1:
term.mode &= ~MODE_APPKEYPAD;
break;
+ case 5: /* TODO: DECSCNM -- Remove reverse video */
+ break;
case 7:
term.mode &= ~MODE_WRAP;
break;
case 1:
term.mode |= MODE_APPKEYPAD;
break;
+ case 5: /* DECSCNM -- Reverve video */
+ /* TODO: set REVERSE on the whole screen (f) */
+ break;
case 7:
term.mode |= MODE_WRAP;
break;
case 12: /* att610 -- Start blinking cursor (IGNORED) */
- break;
+ /* fallthrough for xterm cvvis = CSI [ ? 12 ; 25 h */
+ if(escseq.narg > 1 && escseq.arg[1] != 25)
+ break;
case 25:
term.c.state &= ~CURSOR_HIDE;
break;
term.esc = 0;
csiparse(), csihandle();
}
- } else if(term.esc & ESC_OSC) {
+ /* TODO: handle other OSC */
+ } else if(term.esc & ESC_OSC) {
if(c == ';') {
term.titlelen = 0;
term.esc = ESC_START | ESC_TITLE;
break;
case 'D': /* IND -- Linefeed */
if(term.c.y == term.bot)
- tscrollup(1);
+ tscrollup(term.top, 1);
else
tmoveto(term.c.x, term.c.y+1);
term.esc = 0;
break;
case 'M': /* RI -- Reverse index */
if(term.c.y == term.top)
- tscrolldown(1);
+ tscrolldown(term.top, 1);
else
tmoveto(term.c.x, term.c.y-1);
term.esc = 0;
term.mode &= ~MODE_APPKEYPAD;
term.esc = 0;
break;
- case '7': /* DECSC -- Save Cursor*/
+ case '7': /* DECSC -- Save Cursor */
tcursor(CURSOR_SAVE);
term.esc = 0;
break;
tnewline();
break;
case '\a':
- if(!xw.hasfocus)
+ if(!xw.focus)
xseturgency(1);
break;
case '\033':
void
tresize(int col, int row) {
- int i;
+ int i, x;
int minrow = MIN(row, term.row);
int mincol = MIN(col, term.col);
+ int slide = term.c.y - row + 1;
if(col < 1 || row < 1)
return;
- /* free uneeded rows */
- for(i = row; i < term.row; i++) {
+ /* free unneeded rows */
+ i = 0;
+ if(slide > 0) {
+ /* slide screen to keep cursor where we expect it -
+ * tscrollup would work here, but we can optimize to
+ * memmove because we're freeing the earlier lines */
+ for(/* i = 0 */; i < slide; i++) {
+ free(term.line[i]);
+ free(term.alt[i]);
+ }
+ memmove(term.line, term.line + slide, row * sizeof(Line));
+ memmove(term.alt, term.alt + slide, row * sizeof(Line));
+ }
+ for(i += row; i < term.row; i++) {
free(term.line[i]);
free(term.alt[i]);
}
/* resize to new height */
term.line = realloc(term.line, row * sizeof(Line));
- term.alt = realloc(term.alt, row * sizeof(Line));
+ term.alt = realloc(term.alt, row * sizeof(Line));
/* resize each row to new width, zero-pad if needed */
for(i = 0; i < minrow; i++) {
term.line[i] = realloc(term.line[i], col * sizeof(Glyph));
term.alt[i] = realloc(term.alt[i], col * sizeof(Glyph));
- memset(term.line[i] + mincol, 0, (col - mincol) * sizeof(Glyph));
- memset(term.alt[i] + mincol, 0, (col - mincol) * sizeof(Glyph));
+ for(x = mincol; x < col; x++) {
+ term.line[i][x].state = 0;
+ term.alt[i][x].state = 0;
+ }
}
/* allocate any new rows */
xloadcols(void) {
int i, r, g, b;
XColor color;
- Colormap cmap = DefaultColormap(xw.dis, xw.scr);
unsigned long white = WhitePixel(xw.dis, xw.scr);
for(i = 0; i < 16; i++) {
- if (!XAllocNamedColor(xw.dis, cmap, colorname[i], &color, &color)) {
+ if (!XAllocNamedColor(xw.dis, xw.cmap, colorname[i], &color, &color)) {
dc.col[i] = white;
fprintf(stderr, "Could not allocate color '%s'\n", colorname[i]);
} else
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, cmap, &color)) {
+ if (!XAllocColor(xw.dis, xw.cmap, &color)) {
dc.col[i] = white;
fprintf(stderr, "Could not allocate color %d\n", i);
} else
for(r = 0; r < 24; r++, i++) {
color.red = color.green = color.blue = 0x0808 + 0x0a0a * r;
- if (!XAllocColor(xw.dis, cmap, &color)) {
+ if (!XAllocColor(xw.dis, xw.cmap, &color)) {
dc.col[i] = white;
fprintf(stderr, "Could not allocate color %d\n", i);
} else
void
xinit(void) {
+ XSetWindowAttributes attrs;
+
if(!(xw.dis = XOpenDisplay(NULL)))
die("Can't open display\n");
xw.scr = XDefaultScreen(xw.dis);
xw.ch = dc.font->ascent + dc.font->descent;
/* colors */
+ xw.cmap = XDefaultColormap(xw.dis, xw.scr);
xloadcols();
- /* windows */
- xw.h = term.row * xw.ch + 2*BORDER;
- xw.w = term.col * xw.cw + 2*BORDER;
- xw.win = XCreateSimpleWindow(xw.dis, XRootWindow(xw.dis, xw.scr), 0, 0,
- xw.w, xw.h, 0,
- dc.col[DefaultBG],
- dc.col[DefaultBG]);
- xw.bufw = xw.w - 2*BORDER;
- xw.bufh = xw.h - 2*BORDER;
+ /* window - default size */
+ xw.bufh = 24 * xw.ch;
+ xw.bufw = 80 * xw.cw;
+ xw.h = xw.bufh + 2*BORDER;
+ xw.w = xw.bufw + 2*BORDER;
+
+ attrs.background_pixel = dc.col[DefaultBG];
+ attrs.border_pixel = dc.col[DefaultBG];
+ attrs.bit_gravity = NorthWestGravity;
+ attrs.event_mask = FocusChangeMask | KeyPressMask
+ | ExposureMask | VisibilityChangeMask | StructureNotifyMask
+ | 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), InputOutput,
+ XDefaultVisual(xw.dis, xw.scr),
+ CWBackPixel | CWBorderPixel | CWBitGravity | CWEventMask
+ | CWColormap,
+ &attrs);
xw.buf = XCreatePixmap(xw.dis, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dis, xw.scr));
- xw.hasfocus = 1;
+
+
+ /* input methods */
+ xw.xim = XOpenIM(xw.dis, NULL, NULL, NULL);
+ xw.xic = XCreateIC(xw.xim, XNInputStyle, XIMPreeditNothing
+ | XIMStatusNothing, XNClientWindow, xw.win,
+ XNFocusWindow, xw.win, NULL);
/* gc */
dc.gc = XCreateGC(xw.dis, xw.win, 0, NULL);
+
XMapWindow(xw.dis, xw.win);
xhints();
- XStoreName(xw.dis, xw.win, "st");
+ XStoreName(xw.dis, xw.win, opt_title ? opt_title : "st");
XSync(xw.dis, 0);
}
XSetForeground(xw.dis, dc.gc, xfg);
if(base.mode & ATTR_GFX)
- for(i = 0; i < len; i++)
- s[i] = gfx[(int)s[i]];
+ for(i = 0; i < len; i++) {
+ char c = gfx[(unsigned int)s[i] % 256];
+ if(c)
+ s[i] = c;
+ else if(s[i] > 0x5f)
+ s[i] -= 0x5f;
+ }
XSetFont(xw.dis, dc.gc, base.mode & ATTR_BOLD ? dc.bfont->fid : dc.font->fid);
XDrawImageString(xw.dis, xw.buf, dc.gc, winx, winy, s, len);
xclear(oldx, oldy, oldx, oldy);
/* draw the new one */
- if(!(term.c.state & CURSOR_HIDE) && xw.hasfocus) {
+ if(!(term.c.state & CURSOR_HIDE) && xw.focus) {
xdraws(&g.c, g, term.c.x, term.c.y, 1);
oldx = term.c.x, oldy = term.c.y;
}
Glyph base, new;
char buf[DRAW_BUF_SIZ];
- XSetForeground(xw.dis, dc.gc, dc.col[DefaultBG]);
- XFillRectangle(xw.dis, xw.buf, dc.gc, 0, 0, xw.bufw, xw.bufh);
+ if(!xw.vis)
+ return;
+
+ xclear(0, 0, term.col-1, term.row-1);
for(y = 0; y < term.row; y++) {
base = term.line[y][0];
i = ox = 0;
for(x = 0; x < term.col; x++) {
new = term.line[y][x];
- if(selbx!=-1 && new.c && selected(x, y))
+ if(sel.bx!=-1 && new.c && selected(x, y))
new.mode ^= ATTR_REVERSE;
if(i > 0 && (!(new.state & GLYPH_SET) || ATTRCMP(base, new) ||
i >= DRAW_BUF_SIZ)) {
}
void
+visibility(XEvent *ev) {
+ XVisibilityEvent *e = &ev->xvisibility;
+ /* XXX if this goes from 0 to 1, need a full redraw for next Expose,
+ * not just a buf copy */
+ xw.vis = e->state != VisibilityFullyObscured;
+}
+
+void
+unmap(XEvent *ev) {
+ xw.vis = 0;
+}
+
+void
xseturgency(int add) {
XWMHints *h = XGetWMHints(xw.dis, xw.win);
h->flags = add ? (h->flags | XUrgencyHint) : (h->flags & ~XUrgencyHint);
void
focus(XEvent *ev) {
- if((xw.hasfocus = ev->type == FocusIn))
+ if((xw.focus = ev->type == FocusIn))
xseturgency(0);
draw(SCREEN_UPDATE);
}
int len;
int meta;
int shift;
+ Status status;
meta = e->state & Mod1Mask;
shift = e->state & ShiftMask;
- len = XLookupString(e, buf, sizeof(buf), &ksym, NULL);
+ len = XmbLookupString(xw.xic, e, buf, sizeof(buf), &ksym, &status);
if((customkey = kmap(ksym)))
ttywrite(customkey, strlen(customkey));
break;
case XK_Insert:
if(shift)
- draw(1), puts("draw!")/* XXX: paste X clipboard */;
+ selpaste();
break;
default:
fprintf(stderr, "errkey: %d\n", (int)ksym);
row = xw.bufh / xw.ch;
tresize(col, row);
ttyresize(col, row);
+ xw.bufh = MAX(1, xw.bufh);
+ xw.bufw = MAX(1, xw.bufw);
XFreePixmap(xw.dis, xw.buf);
- if(xw.bufh<1)
- xw.bufh = 1;
- if(xw.bufw<1)
- xw.bufw = 1;
xw.buf = XCreatePixmap(xw.dis, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dis, xw.scr));
- draw(SCREEN_REDRAW);
}
void
XEvent ev;
fd_set rfd;
int xfd = XConnectionNumber(xw.dis);
- long mask = ExposureMask | KeyPressMask | StructureNotifyMask | FocusChangeMask | PointerMotionMask | ButtonPressMask | ButtonReleaseMask;
-
- XSelectInput(xw.dis, xw.win, mask);
- XResizeWindow(xw.dis, xw.win, xw.w, xw.h); /* XXX: fix resize bug in wmii (?) */
for(;;) {
FD_ZERO(&rfd);
}
while(XPending(xw.dis)) {
XNextEvent(xw.dis, &ev);
+ if (XFilterEvent(&ev, xw.win))
+ continue;
if(handler[ev.type])
(handler[ev.type])(&ev);
}
int
main(int argc, char *argv[]) {
- if(argc == 2 && !strncmp("-v", argv[1], 3))
- die("st-" VERSION ", (c) 2010 st engineers\n");
- else if(argc != 1)
- die("usage: st [-v]\n");
+ int i;
+
+ for(i = 1; i < argc; i++) {
+ switch(argv[i][0] != '-' || argv[i][2] ? -1 : argv[i][1]) {
+ case 't':
+ if(++i < argc) opt_title = argv[i];
+ break;
+ case 'e':
+ if(++i < argc) opt_cmd = argv[i];
+ break;
+ case 'v':
+ default:
+ die(USAGE);
+ }
+ }
setlocale(LC_CTYPE, "");
tnew(80, 24);
ttynew();
xinit();
+ selinit();
run();
return 0;
}
Got questions, comments, patches, etc.? Contact Jason Woofenden