X-Git-Url: https://git.xinqibao.xyz/st.git/blobdiff_plain/7f17a70834961cd1ff748b2621c6fc87c069be22..d018c9c8efc3e1781d84d7b7d24e9531bb841b34:/st.c?ds=inline
diff --git a/st.c b/st.c
index 8e1afe2..0db81f4 100644
--- a/st.c
+++ b/st.c
@@ -36,7 +36,8 @@
#define USAGE \
"st " VERSION " (c) 2010-2012 st engineers\n" \
- "usage: st [-t title] [-c class] [-w windowid] [-v] [-e command...]\n"
+ "usage: st [-t title] [-c class] [-g geometry]" \
+ " [-w windowid] [-v] [-f file] [-e command...]\n"
/* XEMBED messages */
#define XEMBED_FOCUS_IN 4
@@ -54,6 +55,7 @@
#define SELECT_TIMEOUT (20*1000) /* 20 ms */
#define DRAW_TIMEOUT (20*1000) /* 20 ms */
+#define REDRAW_TIMEOUT (80*1000) /* 80 ms */
#define SERRNO strerror(errno)
#define MIN(a, b) ((a) < (b) ? (a) : (b))
@@ -74,6 +76,8 @@ enum glyph_attribute {
ATTR_UNDERLINE = 2,
ATTR_BOLD = 4,
ATTR_GFX = 8,
+ ATTR_ITALIC = 16,
+ ATTR_BLINK = 32,
};
enum cursor_movement {
@@ -194,6 +198,8 @@ typedef struct {
XIM xim;
XIC xic;
int scr;
+ Bool isfixed; /* is fixed geometry? */
+ int fx, fy, fw, fh; /* fixed geometry */
int w; /* window width */
int h; /* window height */
int ch; /* char height */
@@ -217,6 +223,7 @@ typedef struct {
struct {int x, y;} b, e;
char *clip;
Atom xtarget;
+ bool alt;
struct timeval tclick1;
struct timeval tclick2;
} Selection;
@@ -233,11 +240,12 @@ typedef struct {
short lbearing;
short rbearing;
XFontSet set;
- } font, bfont;
+ } font, bfont, ifont;
} DC;
static void die(const char*, ...);
static void draw(void);
+static void redraw(void);
static void drawregion(int, int, int, int);
static void execsh(void);
static void sigchld(int);
@@ -284,7 +292,7 @@ static void ttywrite(const char *, size_t);
static void xdraws(char *, Glyph, int, int, int, int);
static void xhints(void);
static void xclear(int, int, int, int);
-static void xcopy();
+static void xcopy(void);
static void xdrawcursor(void);
static void xinit(void);
static void xloadcols(void);
@@ -304,12 +312,13 @@ static void brelease(XEvent *);
static void bpress(XEvent *);
static void bmotion(XEvent *);
static void selnotify(XEvent *);
+static void selclear(XEvent *);
static void selrequest(XEvent *);
static void selinit(void);
static inline bool selected(int, int);
static void selcopy(void);
-static void selpaste();
+static void selpaste(void);
static void selscroll(int, int);
static int utf8decode(char *, long *);
@@ -317,6 +326,9 @@ static int utf8encode(long *, char *);
static int utf8size(char *);
static int isfullutf8(char *, int);
+static void *xmalloc(size_t);
+static void *xrealloc(void *, size_t);
+
static void (*handler[LASTEvent])(XEvent *) = {
[KeyPress] = kpress,
[ClientMessage] = cmessage,
@@ -329,6 +341,7 @@ static void (*handler[LASTEvent])(XEvent *) = {
[MotionNotify] = bmotion,
[ButtonPress] = bpress,
[ButtonRelease] = brelease,
+ [SelectionClear] = selclear,
[SelectionNotify] = selnotify,
[SelectionRequest] = selrequest,
};
@@ -342,11 +355,28 @@ static STREscape strescseq;
static int cmdfd;
static pid_t pid;
static Selection sel;
+static int iofd = -1;
static char **opt_cmd = NULL;
+static char *opt_io = NULL;
static char *opt_title = NULL;
static char *opt_embed = NULL;
static char *opt_class = NULL;
+void *
+xmalloc(size_t len) {
+ void *p = malloc(len);
+ if(!p)
+ die("Out of memory");
+ return p;
+}
+
+void *
+xrealloc(void *p, size_t len) {
+ if((p = realloc(p, len)) == NULL)
+ die("Out of memory");
+ return p;
+}
+
int
utf8decode(char *s, long *u) {
uchar c;
@@ -553,7 +583,7 @@ selcopy(void) {
else {
bufsize = (term.col+1) * (sel.e.y-sel.b.y+1) * UTF_SIZ;
- ptr = str = malloc(bufsize);
+ ptr = str = xmalloc(bufsize);
/* append every set & selected glyph to the selection */
for(y = 0; y < term.row; y++) {
@@ -572,6 +602,7 @@ selcopy(void) {
}
*ptr = 0;
}
+ sel.alt = IS_SET(MODE_ALTSCREEN);
xsetsel(str);
}
@@ -602,6 +633,14 @@ selpaste() {
XConvertSelection(xw.dpy, XA_PRIMARY, sel.xtarget, XA_PRIMARY, xw.win, CurrentTime);
}
+void selclear(XEvent *e) {
+ if(sel.bx == -1)
+ return;
+ sel.bx = -1;
+ tsetdirt(sel.b.y, sel.e.y);
+ draw();
+}
+
void
selrequest(XEvent *e) {
XSelectionRequestEvent *xsre;
@@ -730,6 +769,10 @@ execsh(void) {
char **args;
char *envshell = getenv("SHELL");
+ unsetenv("COLUMNS");
+ unsetenv("LINES");
+ unsetenv("TERMCAP");
+
DEFAULT(envshell, SHELL);
putenv("TERM="TNAME);
args = opt_cmd ? opt_cmd : (char*[]){envshell, "-i", NULL};
@@ -776,6 +819,16 @@ ttynew(void) {
close(s);
cmdfd = m;
signal(SIGCHLD, sigchld);
+ if(opt_io) {
+ if(!strcmp(opt_io, "-")) {
+ iofd = STDOUT_FILENO;
+ } else {
+ if((iofd = open(opt_io, O_WRONLY | O_CREAT, 0666)) < 0) {
+ fprintf(stderr, "Error opening %s:%s\n",
+ opt_io, strerror(errno));
+ }
+ }
+ }
}
}
@@ -828,7 +881,8 @@ ttyresize(int x, int y) {
w.ws_row = term.row;
w.ws_col = term.col;
- w.ws_xpixel = w.ws_ypixel = 0;
+ w.ws_xpixel = xw.w;
+ w.ws_ypixel = xw.h;
if(ioctl(cmdfd, TIOCSWINSZ, &w) < 0)
fprintf(stderr, "Couldn't set window size: %s\n", SERRNO);
}
@@ -871,7 +925,7 @@ treset(void) {
}, .x = 0, .y = 0, .state = CURSOR_DEFAULT};
memset(term.tabs, 0, term.col * sizeof(*term.tabs));
- for (i = TAB; i < term.col; i += TAB)
+ for(i = TAB; i < term.col; i += TAB)
term.tabs[i] = 1;
term.top = 0, term.bot = term.row - 1;
term.mode = MODE_WRAP;
@@ -882,14 +936,14 @@ void
tnew(int col, int row) {
/* set screen size */
term.row = row, term.col = col;
- term.line = malloc(term.row * sizeof(Line));
- term.alt = malloc(term.row * sizeof(Line));
- term.dirty = malloc(term.row * sizeof(*term.dirty));
- term.tabs = malloc(term.col * sizeof(*term.tabs));
+ term.line = xmalloc(term.row * sizeof(Line));
+ term.alt = xmalloc(term.row * sizeof(Line));
+ term.dirty = xmalloc(term.row * sizeof(*term.dirty));
+ term.tabs = xmalloc(term.col * sizeof(*term.tabs));
for(row = 0; row < term.row; row++) {
- term.line[row] = malloc(term.col * sizeof(Glyph));
- term.alt [row] = malloc(term.col * sizeof(Glyph));
+ term.line[row] = xmalloc(term.col * sizeof(Glyph));
+ term.alt [row] = xmalloc(term.col * sizeof(Glyph));
term.dirty[row] = 0;
}
memset(term.tabs, 0, term.col * sizeof(*term.tabs));
@@ -1097,25 +1151,39 @@ tsetattr(int *attr, int l) {
for(i = 0; i < l; i++) {
switch(attr[i]) {
case 0:
- term.c.attr.mode &= ~(ATTR_REVERSE | ATTR_UNDERLINE | ATTR_BOLD);
+ term.c.attr.mode &= ~(ATTR_REVERSE | ATTR_UNDERLINE | ATTR_BOLD \
+ | ATTR_ITALIC | ATTR_BLINK);
term.c.attr.fg = DefaultFG;
term.c.attr.bg = DefaultBG;
break;
case 1:
term.c.attr.mode |= ATTR_BOLD;
break;
+ case 3: /* enter standout (highlight) */
+ term.c.attr.mode |= ATTR_ITALIC;
+ break;
case 4:
term.c.attr.mode |= ATTR_UNDERLINE;
break;
+ case 5:
+ term.c.attr.mode |= ATTR_BLINK;
+ break;
case 7:
term.c.attr.mode |= ATTR_REVERSE;
break;
+ case 21:
case 22:
term.c.attr.mode &= ~ATTR_BOLD;
break;
+ case 23: /* leave standout (highlight) mode */
+ term.c.attr.mode &= ~ATTR_ITALIC;
+ break;
case 24:
term.c.attr.mode &= ~ATTR_UNDERLINE;
break;
+ case 25:
+ term.c.attr.mode &= ~ATTR_BLINK;
+ break;
case 27:
term.c.attr.mode &= ~ATTR_REVERSE;
break;
@@ -1155,7 +1223,7 @@ tsetattr(int *attr, int l) {
else if(BETWEEN(attr[i], 90, 97))
term.c.attr.fg = attr[i] - 90 + 8;
else if(BETWEEN(attr[i], 100, 107))
- term.c.attr.fg = attr[i] - 100 + 8;
+ term.c.attr.bg = attr[i] - 100 + 8;
else
fprintf(stderr, "erresc(default): gfx attr %d unknown\n", attr[i]), csidump();
break;
@@ -1184,7 +1252,7 @@ void
tsetmode(bool priv, bool set, int *args, int narg) {
int *lim, mode;
- for (lim = args + narg; args < lim; ++args) {
+ for(lim = args + narg; args < lim; ++args) {
if(priv) {
switch(*args) {
case 1:
@@ -1193,8 +1261,8 @@ tsetmode(bool priv, bool set, int *args, int narg) {
case 5: /* DECSCNM -- Reverve video */
mode = term.mode;
MODBIT(term.mode,set, MODE_REVERSE);
- if (mode != term.mode)
- draw();
+ if(mode != term.mode)
+ redraw();
break;
case 7:
MODBIT(term.mode, set, MODE_WRAP);
@@ -1218,11 +1286,11 @@ tsetmode(bool priv, bool set, int *args, int narg) {
case 1047:
if(IS_SET(MODE_ALTSCREEN))
tclearregion(0, 0, term.col-1, term.row-1);
- if ((set && !IS_SET(MODE_ALTSCREEN)) ||
+ if((set && !IS_SET(MODE_ALTSCREEN)) ||
(!set && IS_SET(MODE_ALTSCREEN))) {
tswapscreen();
}
- if (*args != 1049)
+ if(*args != 1049)
break;
/* pass through */
case 1048:
@@ -1303,19 +1371,19 @@ csihandle(void) {
}
break;
case 'G': /* CHA -- Move to */
- case '`': /* XXX: HPA -- same? */
+ case '`': /* HPA */
DEFAULT(csiescseq.arg[0], 1);
tmoveto(csiescseq.arg[0]-1, term.c.y);
break;
case 'H': /* CUP -- Move to */
- case 'f': /* XXX: HVP -- same? */
+ case 'f': /* HVP */
DEFAULT(csiescseq.arg[0], 1);
DEFAULT(csiescseq.arg[1], 1);
tmoveto(csiescseq.arg[1]-1, csiescseq.arg[0]-1);
break;
case 'I': /* CHT -- Cursor Forward Tabulation tab stops */
DEFAULT(csiescseq.arg[0], 1);
- while (csiescseq.arg[0]--)
+ while(csiescseq.arg[0]--)
tputtab(1);
break;
case 'J': /* ED -- Clear screen */
@@ -1380,7 +1448,7 @@ csihandle(void) {
break;
case 'Z': /* CBT -- Cursor Backward Tabulation tab stops */
DEFAULT(csiescseq.arg[0], 1);
- while (csiescseq.arg[0]--)
+ while(csiescseq.arg[0]--)
tputtab(0);
break;
case 'd': /* VPA -- Move to */
@@ -1441,7 +1509,7 @@ strhandle(void) {
*/
strparse();
- p = strescseq.buf;
+ p = strescseq.buf;
switch(strescseq.type) {
case ']': /* OSC -- Operating System Command */
@@ -1467,6 +1535,9 @@ strhandle(void) {
break;
}
break;
+ case 'k': /* old title set compatibility */
+ XStoreName(xw.dpy, xw.win, strescseq.buf);
+ break;
case 'P': /* DSC -- Device Control String */
case '_': /* APC -- Application Program Command */
case '^': /* PM -- Privacy Message */
@@ -1511,15 +1582,15 @@ void
tputtab(bool forward) {
unsigned x = term.c.x;
- if (forward) {
- if (x == term.col)
+ if(forward) {
+ if(x == term.col)
return;
- for (++x; x < term.col && !term.tabs[x]; ++x)
+ for(++x; x < term.col && !term.tabs[x]; ++x)
/* nothing */ ;
} else {
- if (x == 0)
+ if(x == 0)
return;
- for (--x; x > 0 && !term.tabs[x]; --x)
+ for(--x; x > 0 && !term.tabs[x]; --x)
/* nothing */ ;
}
tmoveto(x, term.c.y);
@@ -1528,6 +1599,10 @@ tputtab(bool forward) {
void
tputc(char *c) {
char ascii = *c;
+
+ if(iofd != -1)
+ write(iofd, c, 1);
+
if(term.esc & ESC_START) {
if(term.esc & ESC_CSI) {
csiescseq.buf[csiescseq.len++] = ascii;
@@ -1546,7 +1621,7 @@ tputc(char *c) {
break;
default:
strescseq.buf[strescseq.len++] = ascii;
- if (strescseq.len+1 >= STR_BUF_SIZ) {
+ if(strescseq.len+1 >= STR_BUF_SIZ) {
term.esc = 0;
strhandle();
}
@@ -1576,6 +1651,7 @@ tputc(char *c) {
case '_': /* APC -- Application Program Command */
case '^': /* PM -- Privacy Message */
case ']': /* OSC -- Operating System Command */
+ case 'k': /* old title set compatibility */
strreset();
strescseq.type = ascii;
term.esc |= ESC_STR;
@@ -1702,16 +1778,16 @@ tresize(int col, int row) {
}
/* resize to new height */
- term.line = realloc(term.line, row * sizeof(Line));
- term.alt = realloc(term.alt, row * sizeof(Line));
- term.dirty = realloc(term.dirty, row * sizeof(*term.dirty));
- term.tabs = realloc(term.tabs, col * sizeof(*term.tabs));
+ term.line = xrealloc(term.line, row * sizeof(Line));
+ term.alt = xrealloc(term.alt, row * sizeof(Line));
+ term.dirty = xrealloc(term.dirty, row * sizeof(*term.dirty));
+ term.tabs = xrealloc(term.tabs, col * sizeof(*term.tabs));
/* resize each row to new width, zero-pad if needed */
for(i = 0; i < minrow; i++) {
term.dirty[i] = 1;
- term.line[i] = realloc(term.line[i], col * sizeof(Glyph));
- term.alt[i] = realloc(term.alt[i], col * sizeof(Glyph));
+ term.line[i] = xrealloc(term.line[i], col * sizeof(Glyph));
+ term.alt[i] = xrealloc(term.alt[i], col * sizeof(Glyph));
for(x = mincol; x < col; x++) {
term.line[i][x].state = 0;
term.alt[i][x].state = 0;
@@ -1724,13 +1800,13 @@ tresize(int col, int row) {
term.line[i] = calloc(col, sizeof(Glyph));
term.alt [i] = calloc(col, sizeof(Glyph));
}
- if (col > term.col) {
+ if(col > term.col) {
bool *bp = term.tabs + term.col;
memset(bp, 0, sizeof(*term.tabs) * (col - term.col));
- while (--bp > term.tabs && !*bp)
+ while(--bp > term.tabs && !*bp)
/* nothing */ ;
- for (bp += TAB; bp < term.tabs + col; bp += TAB)
+ for(bp += TAB; bp < term.tabs + col; bp += TAB)
*bp = 1;
}
/* update terminal size */
@@ -1783,7 +1859,7 @@ xloadcols(void) {
for(r = 0; r < 24; r++, i++) {
color.red = color.green = color.blue = 0x0808 + 0x0a0a * r;
- if (!XAllocColor(xw.dpy, xw.cmap, &color)) {
+ if(!XAllocColor(xw.dpy, xw.cmap, &color)) {
dc.col[i] = white;
fprintf(stderr, "Could not allocate color %d\n", i);
} else
@@ -1803,16 +1879,25 @@ void
xhints(void) {
XClassHint class = {opt_class ? opt_class : TNAME, TNAME};
XWMHints wm = {.flags = InputHint, .input = 1};
- XSizeHints size = {
- .flags = PSize | PResizeInc | PBaseSize,
- .height = xw.h,
- .width = xw.w,
- .height_inc = xw.ch,
- .width_inc = xw.cw,
- .base_height = 2*BORDER,
- .base_width = 2*BORDER,
- };
- XSetWMProperties(xw.dpy, xw.win, NULL, NULL, NULL, 0, &size, &wm, &class);
+ XSizeHints *sizeh = NULL;
+
+ sizeh = XAllocSizeHints();
+ if(xw.isfixed == False) {
+ sizeh->flags = PSize | PResizeInc | PBaseSize;
+ sizeh->height = xw.h;
+ sizeh->width = xw.w;
+ sizeh->height_inc = xw.ch;
+ sizeh->width_inc = xw.cw;
+ sizeh->base_height = 2*BORDER;
+ sizeh->base_width = 2*BORDER;
+ } else {
+ sizeh->flags = PMaxSize | PMinSize;
+ sizeh->min_width = sizeh->max_width = xw.fw;
+ sizeh->min_height = sizeh->max_height = xw.fh;
+ }
+
+ XSetWMProperties(xw.dpy, xw.win, NULL, NULL, NULL, 0, sizeh, &wm, &class);
+ XFree(sizeh);
}
XFontSet
@@ -1849,14 +1934,20 @@ xgetfontinfo(XFontSet set, int *ascent, int *descent, short *lbearing, short *rb
}
void
-initfonts(char *fontstr, char *bfontstr) {
- if((dc.font.set = xinitfont(fontstr)) == NULL ||
- (dc.bfont.set = xinitfont(bfontstr)) == NULL)
- die("Can't load font %s\n", dc.font.set ? BOLDFONT : FONT);
+initfonts(char *fontstr, char *bfontstr, char *ifontstr) {
+ if((dc.font.set = xinitfont(fontstr)) == NULL)
+ die("Can't load font %s\n", fontstr);
+ if((dc.bfont.set = xinitfont(bfontstr)) == NULL)
+ die("Can't load bfont %s\n", bfontstr);
+ if((dc.ifont.set = xinitfont(ifontstr)) == NULL)
+ die("Can't load ifont %s\n", ifontstr);
+
xgetfontinfo(dc.font.set, &dc.font.ascent, &dc.font.descent,
&dc.font.lbearing, &dc.font.rbearing);
xgetfontinfo(dc.bfont.set, &dc.bfont.ascent, &dc.bfont.descent,
&dc.bfont.lbearing, &dc.bfont.rbearing);
+ xgetfontinfo(dc.ifont.set, &dc.ifont.ascent, &dc.ifont.descent,
+ &dc.ifont.lbearing, &dc.ifont.rbearing);
}
void
@@ -1864,13 +1955,14 @@ xinit(void) {
XSetWindowAttributes attrs;
Cursor cursor;
Window parent;
+ int sw, sh;
if(!(xw.dpy = XOpenDisplay(NULL)))
die("Can't open display\n");
xw.scr = XDefaultScreen(xw.dpy);
/* font */
- initfonts(FONT, BOLDFONT);
+ initfonts(FONT, BOLDFONT, ITALICFONT);
/* XXX: Assuming same size for bold font */
xw.cw = dc.font.rbearing - dc.font.lbearing;
@@ -1880,21 +1972,35 @@ xinit(void) {
xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
xloadcols();
- /* window - default size */
- xw.h = 2*BORDER + term.row * xw.ch;
- xw.w = 2*BORDER + term.col * xw.cw;
+ /* adjust fixed window geometry */
+ if(xw.isfixed) {
+ sw = DisplayWidth(xw.dpy, xw.scr);
+ sh = DisplayHeight(xw.dpy, xw.scr);
+ if(xw.fx < 0)
+ xw.fx = sw + xw.fx - xw.fw - 1;
+ if(xw.fy < 0)
+ xw.fy = sh + xw.fy - xw.fh - 1;
+
+ xw.h = xw.fh;
+ xw.w = xw.fw;
+ } else {
+ /* window - default size */
+ xw.h = 2*BORDER + term.row * xw.ch;
+ xw.w = 2*BORDER + term.col * xw.cw;
+ xw.fx = 0;
+ xw.fy = 0;
+ }
attrs.background_pixel = dc.col[DefaultBG];
attrs.border_pixel = dc.col[DefaultBG];
attrs.bit_gravity = NorthWestGravity;
attrs.event_mask = FocusChangeMask | KeyPressMask
| ExposureMask | VisibilityChangeMask | StructureNotifyMask
- | ButtonMotionMask | ButtonPressMask | ButtonReleaseMask
- | EnterWindowMask | LeaveWindowMask;
+ | ButtonMotionMask | ButtonPressMask | ButtonReleaseMask;
attrs.colormap = xw.cmap;
parent = opt_embed ? strtol(opt_embed, NULL, 0) : XRootWindow(xw.dpy, xw.scr);
- xw.win = XCreateWindow(xw.dpy, parent, 0, 0,
+ xw.win = XCreateWindow(xw.dpy, parent, xw.fx, xw.fy,
xw.w, xw.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput,
XDefaultVisual(xw.dpy, xw.scr),
CWBackPixel | CWBorderPixel | CWBitGravity | CWEventMask
@@ -1949,6 +2055,9 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
fontset = dc.bfont.set;
}
+ if(base.mode & ATTR_ITALIC)
+ fontset = dc.ifont.set;
+
XSetBackground(xw.dpy, dc.gc, dc.col[bg]);
XSetForeground(xw.dpy, dc.gc, dc.col[fg]);
@@ -1973,7 +2082,6 @@ void
xcopy() {
XdbeSwapInfo swpinfo[1] = {{xw.win, XdbeCopied}};
XdbeSwapBuffers(xw.dpy, swpinfo, 1);
-
}
void
@@ -1996,7 +2104,7 @@ xdrawcursor(void) {
} else
xclear(oldx, oldy, oldx, oldy);
- xcopy(oldx, oldy, 1, 1);
+ xcopy();
/* draw the new one */
if(!(term.c.state & CURSOR_HIDE)) {
@@ -2011,7 +2119,15 @@ xdrawcursor(void) {
oldx = term.c.x, oldy = term.c.y;
}
- xcopy(term.c.x, term.c.y, 1, 1);
+ xcopy();
+}
+
+void
+redraw(void) {
+ struct timespec tv = {0, REDRAW_TIMEOUT * 1000};
+ tfulldirt();
+ draw();
+ nanosleep(&tv, NULL);
}
void
@@ -2026,7 +2142,10 @@ drawregion(int x1, int y1, int x2, int y2) {
int ic, ib, x, y, ox, sl;
Glyph base, new;
char buf[DRAW_BUF_SIZ];
+ bool ena_sel = sel.bx != -1, alt = IS_SET(MODE_ALTSCREEN);
+ if((sel.alt && !alt) || (!sel.alt && alt))
+ ena_sel = 0;
if(!(xw.state & WIN_VISIBLE))
return;
@@ -2039,7 +2158,7 @@ drawregion(int x1, int y1, int x2, int y2) {
ic = ib = ox = 0;
for(x = x1; x < x2; x++) {
new = term.line[y][x];
- if(sel.bx != -1 && *(new.c) && selected(x, y))
+ if(ena_sel && *(new.c) && selected(x, y))
new.mode ^= ATTR_REVERSE;
if(ib > 0 && (!(new.state & GLYPH_SET) || ATTRCMP(base, new) ||
ib >= DRAW_BUF_SIZ-UTF_SIZ)) {
@@ -2172,11 +2291,11 @@ void
cmessage(XEvent *e) {
/* See xembed specs
http://standards.freedesktop.org/xembed-spec/xembed-spec-latest.html */
- if (e->xclient.message_type == xw.xembed && e->xclient.format == 32) {
- if (e->xclient.data.l[1] == XEMBED_FOCUS_IN) {
+ if(e->xclient.message_type == xw.xembed && e->xclient.format == 32) {
+ if(e->xclient.data.l[1] == XEMBED_FOCUS_IN) {
xw.state |= WIN_FOCUSED;
xseturgency(0);
- } else if (e->xclient.data.l[1] == XEMBED_FOCUS_OUT) {
+ } else if(e->xclient.data.l[1] == XEMBED_FOCUS_OUT) {
xw.state &= ~WIN_FOCUSED;
}
draw();
@@ -2198,8 +2317,8 @@ resize(XEvent *e) {
return;
if(tresize(col, row))
draw();
- ttyresize(col, row);
xresize(col, row);
+ ttyresize(col, row);
}
bool
@@ -2250,7 +2369,11 @@ run(void) {
int
main(int argc, char *argv[]) {
- int i;
+ int i, bitm, xr, yr;
+ unsigned int wr, hr;
+
+ xw.fw = xw.fh = xw.fx = xw.fy = 0;
+ xw.isfixed = False;
for(i = 1; i < argc; i++) {
switch(argv[i][0] != '-' || argv[i][2] ? -1 : argv[i][1]) {
@@ -2263,10 +2386,34 @@ main(int argc, char *argv[]) {
case 'w':
if(++i < argc) opt_embed = argv[i];
break;
+ case 'f':
+ if(++i < argc) opt_io = argv[i];
+ break;
case 'e':
/* eat every remaining arguments */
if(++i < argc) opt_cmd = &argv[i];
goto run;
+ case 'g':
+ if(++i >= argc)
+ break;
+
+ bitm = XParseGeometry(argv[i], &xr, &yr, &wr, &hr);
+ if(bitm & XValue)
+ xw.fx = xr;
+ if(bitm & YValue)
+ xw.fy = yr;
+ if(bitm & WidthValue)
+ xw.fw = (int)wr;
+ if(bitm & HeightValue)
+ xw.fh = (int)hr;
+ if(bitm & XNegative && xw.fx == 0)
+ xw.fx = -1;
+ if(bitm & XNegative && xw.fy == 0)
+ xw.fy = -1;
+
+ if(xw.fh != 0 && xw.fw != 0)
+ xw.isfixed = True;
+ break;
case 'v':
default:
die(USAGE);
@@ -2282,3 +2429,4 @@ main(int argc, char *argv[]) {
run();
return 0;
}
+