Xinqi Bao's Git
projects
/
st.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
added -e and -t option.
[st.git]
/
st.c
diff --git
a/st.c
b/st.c
index
864dfc7
..
f7f9de8
100644
(file)
--- a/
st.c
+++ b/
st.c
@@
-28,6
+28,10
@@
#include <libutil.h>
#endif
#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
/* Arbitrary sizes */
#define ESC_TITLE_SIZ 256
#define ESC_BUF_SIZ 256
@@
-125,6
+129,15
@@
typedef struct {
GC gc;
} DC;
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, ...);
#include "config.h"
static void die(const char *errstr, ...);
@@
-152,8
+165,8
@@
static void tputc(char);
static void tputs(char*, int);
static void treset(void);
static void tresize(int, int);
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 tsetattr(int*, int);
static void tsetchar(char);
static void tsetscroll(int, int);
@@
-177,9
+190,9
@@
static char* kmap(KeySym);
static void kpress(XEvent *);
static void resize(XEvent *);
static void focus(XEvent *);
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 (*handler[LASTEvent])(XEvent *) = {
static void (*handler[LASTEvent])(XEvent *) = {
@@
-200,23
+213,25
@@
static Term term;
static CSIEscape escseq;
static int cmdfd;
static pid_t pid;
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) {
static inline int selected(int x, int y) {
- if
((seley==y && selby==y)
) {
- int bx = MIN(sel
bx, sel
ex);
- int ex = MAX(sel
bx, sel
ex);
- return
if(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) {
}
static void getbuttoninfo(XEvent *e, int *b, int *x, int *y) {
@@
-224,76
+239,66
@@
static void getbuttoninfo(XEvent *e, int *b, int *x, int *y) {
*b=*b==4096?5:*b==2048?4:*b==1024?3:*b==512?2:*b==256?1:-1;
*x = e->xbutton.x/xw.cw;
*y = e->xbutton.y/xw.ch;
*b=*b==4096?5:*b==2048?4:*b==1024?3:*b==512?2:*b==256?1:-1;
*x = e->xbutton.x/xw.cw;
*y = e->xbutton.y/xw.ch;
- s
b[0] = selby<seley?selbx:sel
ex;
- s
b[1] = MIN(selby, sel
ey);
- se
[0] = selby<seley?selex:sel
bx;
- se
[1] = MAX(selby, sel
ey);
+ s
el.b.x = sel.by < sel.ey ? sel.bx : sel.
ex;
+ s
el.b.y = MIN(sel.by, sel.
ey);
+ se
l.e.x = sel.by < sel.ey ? sel.ex : sel.
bx;
+ se
l.e.y = MAX(sel.by, sel.
ey);
}
static void bpress(XEvent *e) {
}
static void bpress(XEvent *e) {
- selmode = 1;
- sel
ex = sel
bx = e->xbutton.x/xw.cw;
- sel
ey = sel
by = 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;
}
static char *getseltext() {
char *str, *ptr;
int ls, x, y, sz;
- if(sel
bx==
-1)
+ if(sel
.bx ==
-1)
return NULL;
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(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;
}
}
*ptr = 0;
return str;
}
-static void clipboard_copy(const char *str) {
- free((void *)clipboard);
- clipboard = str;
+/* TODO: use X11 clipboard */
+static void selcopy(char *str) {
+ free(sel.clip);
+ sel.clip = str;
}
}
-static void
clipboard_
paste() {
- if(
clipboard
)
- ttywrite(
clipboard, strlen(clipboard
));
+static void
sel
paste() {
+ if(
sel.clip
)
+ ttywrite(
sel.clip, strlen(sel.clip
));
}
}
-/
/ TODO: doubleclick to select word
+/
* TODO: doubleclick to select word */
static void brelease(XEvent *e) {
int b;
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)
if(b==2)
-
clipboard_
paste();
+
sel
paste();
} else {
if(b==1)
} else {
if(b==1)
-
clipboard_
copy(getseltext());
+
sel
copy(getseltext());
}
draw(1);
}
static void bmotion(XEvent *e) {
}
draw(1);
}
static void bmotion(XEvent *e) {
- if (selmode) {
- getbuttoninfo(e, NULL, &sel
ex, &sel
ey);
+ if (sel
.
mode) {
+ getbuttoninfo(e, NULL, &sel
.ex, &sel.
ey);
draw(1);
}
}
draw(1);
}
}
@@
-330,9
+335,12
@@
die(const char *errstr, ...) {
void
execsh(void) {
void
execsh(void) {
- char *args[3] = {getenv("SHELL"), "-i", NULL};
- DEFAULT(args[0], "/bin/sh"); /* 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);
}
execvp(args[0], args);
}
@@
-388,10
+396,10
@@
dump(char c) {
void
ttyread(void) {
void
ttyread(void) {
- char buf[BUFSIZ]
= {0}
;
+ char buf[BUFSIZ];
int ret;
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);
die("Couldn't read from shell: %s\n", SERRNO);
else
tputs(buf, ret);
@@
-460,16
+468,15
@@
tswapscreen(void) {
}
void
}
void
-tscrolldown
(
int n) {
+tscrolldown
(int orig,
int n) {
int i;
Line temp;
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;
temp = term.line[i];
term.line[i] = term.line[i-n];
term.line[i-n] = temp;
@@
-477,15
+484,14
@@
tscrolldown (int n) {
}
void
}
void
-tscrollup
(
int n) {
+tscrollup
(int orig,
int n) {
int i;
Line temp;
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;
temp = term.line[i];
term.line[i] = term.line[i+n];
term.line[i+n] = temp;
@@
-494,9
+500,11
@@
tscrollup (int n) {
void
tnewline(void) {
void
tnewline(void) {
- int y = term.c.y + 1;
- if(y > term.bot)
- tscrollup(1), y = term.bot;
+ int y = term.c.y;
+ if(term.c.y == term.bot)
+ tscrollup(term.top, 1);
+ else
+ y++;
tmoveto(0, y);
}
tmoveto(0, y);
}
@@
-588,50
+596,18
@@
tinsertblank(int n) {
void
tinsertblankline(int n) {
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;
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) {
}
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;
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
}
void
@@
-784,7
+760,6
@@
csihandle(void) {
case 2: /* all */
tclearregion(0, 0, term.col-1, term.row-1);
break;
case 2: /* all */
tclearregion(0, 0, term.col-1, term.row-1);
break;
- case 3: /* XXX: erase saved lines (xterm) */
default:
goto unknown;
}
default:
goto unknown;
}
@@
-804,11
+779,11
@@
csihandle(void) {
break;
case 'S': /* SU -- Scroll <n> line up */
DEFAULT(escseq.arg[0], 1);
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);
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);
break;
case 'L': /* IL -- Insert <n> blank lines */
DEFAULT(escseq.arg[0], 1);
@@
-828,22
+803,17
@@
csihandle(void) {
case 25:
term.c.state |= CURSOR_HIDE;
break;
case 25:
term.c.state |= CURSOR_HIDE;
break;
+ case 1049: /* = 1047 and 1048 */
case 1047:
if(IS_SET(MODE_ALTSCREEN)) {
tclearregion(0, 0, term.col-1, term.row-1);
tswapscreen();
}
case 1047:
if(IS_SET(MODE_ALTSCREEN)) {
tclearregion(0, 0, term.col-1, term.row-1);
tswapscreen();
}
- break;
+ if(escseq.arg[0] == 1047)
+ break;
case 1048:
tcursor(CURSOR_LOAD);
break;
case 1048:
tcursor(CURSOR_LOAD);
break;
- case 1049:
- tcursor(CURSOR_LOAD);
- if(IS_SET(MODE_ALTSCREEN)) {
- tclearregion(0, 0, term.col-1, term.row-1);
- tswapscreen();
- }
- break;
default:
goto unknown;
}
default:
goto unknown;
}
@@
-888,22
+858,17
@@
csihandle(void) {
case 25:
term.c.state &= ~CURSOR_HIDE;
break;
case 25:
term.c.state &= ~CURSOR_HIDE;
break;
+ case 1049: /* = 1047 and 1048 */
case 1047:
if(IS_SET(MODE_ALTSCREEN))
tclearregion(0, 0, term.col-1, term.row-1);
else
tswapscreen();
case 1047:
if(IS_SET(MODE_ALTSCREEN))
tclearregion(0, 0, term.col-1, term.row-1);
else
tswapscreen();
- break;
+ if(escseq.arg[0] == 1047)
+ break;
case 1048:
tcursor(CURSOR_SAVE);
break;
case 1048:
tcursor(CURSOR_SAVE);
break;
- case 1049:
- tcursor(CURSOR_SAVE);
- if(IS_SET(MODE_ALTSCREEN))
- tclearregion(0, 0, term.col-1, term.row-1);
- else
- tswapscreen();
- break;
default: goto unknown;
}
} else {
default: goto unknown;
}
} else {
@@
-969,7
+934,8
@@
tputc(char c) {
term.esc = 0;
csiparse(), csihandle();
}
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;
if(c == ';') {
term.titlelen = 0;
term.esc = ESC_START | ESC_TITLE;
@@
-1007,7
+973,7
@@
tputc(char c) {
break;
case 'D': /* IND -- Linefeed */
if(term.c.y == term.bot)
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;
else
tmoveto(term.c.x, term.c.y+1);
term.esc = 0;
@@
-1018,7
+984,7
@@
tputc(char c) {
break;
case 'M': /* RI -- Reverse index */
if(term.c.y == term.top)
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;
else
tmoveto(term.c.x, term.c.y-1);
term.esc = 0;
@@
-1035,7
+1001,7
@@
tputc(char c) {
term.mode &= ~MODE_APPKEYPAD;
term.esc = 0;
break;
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;
tcursor(CURSOR_SAVE);
term.esc = 0;
break;
@@
-1106,7
+1072,7
@@
tresize(int col, int row) {
/* resize to new height */
term.line = realloc(term.line, row * sizeof(Line));
/* 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++) {
/* resize each row to new width, zero-pad if needed */
for(i = 0; i < minrow; i++) {
@@
-1213,20
+1179,26
@@
xinit(void) {
xloadcols();
/* windows */
xloadcols();
/* windows */
- xw.h = term.row * xw.ch + 2*BORDER;
- xw.w = term.col * xw.cw + 2*BORDER;
+ xw.bufh = term.row * xw.ch;
+ xw.bufw = term.col * xw.cw;
+ xw.h = xw.bufh + 2*BORDER;
+ xw.w = xw.bufw + 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.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;
xw.buf = XCreatePixmap(xw.dis, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dis, xw.scr));
/* gc */
dc.gc = XCreateGC(xw.dis, xw.win, 0, NULL);
xw.buf = XCreatePixmap(xw.dis, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dis, xw.scr));
/* gc */
dc.gc = XCreateGC(xw.dis, xw.win, 0, NULL);
+
+ /* event mask */
+ XSelectInput(xw.dis, xw.win, ExposureMask | KeyPressMask
+ | StructureNotifyMask | FocusChangeMask | PointerMotionMask
+ | ButtonPressMask | ButtonReleaseMask);
+
XMapWindow(xw.dis, xw.win);
xhints();
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);
}
XSync(xw.dis, 0);
}
@@
-1321,8
+1293,8
@@
draw(int redraw_all) {
i = ox = 0;
for(x = 0; x < term.col; x++) {
new = term.line[y][x];
i = ox = 0;
for(x = 0; x < term.col; x++) {
new = term.line[y][x];
- if(selbx!=-1 && new.c && selected(x, y))
- new.mode = ATTR_REVERSE;
+ 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)) {
xdraws(buf, base, ox, y, i);
if(i > 0 && (!(new.state & GLYPH_SET) || ATTRCMP(base, new) ||
i >= DRAW_BUF_SIZ)) {
xdraws(buf, base, ox, y, i);
@@
-1407,7
+1379,7
@@
kpress(XEvent *ev) {
break;
case XK_Insert:
if(shift)
break;
case XK_Insert:
if(shift)
-
draw(1), puts("draw!")/* XXX: paste X clipboard */
;
+
selpaste(), draw(1)
;
break;
default:
fprintf(stderr, "errkey: %d\n", (int)ksym);
break;
default:
fprintf(stderr, "errkey: %d\n", (int)ksym);
@@
-1430,6
+1402,8
@@
resize(XEvent *e) {
row = xw.bufh / xw.ch;
tresize(col, row);
ttyresize(col, row);
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);
xw.buf = XCreatePixmap(xw.dis, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dis, xw.scr));
draw(SCREEN_REDRAW);
XFreePixmap(xw.dis, xw.buf);
xw.buf = XCreatePixmap(xw.dis, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dis, xw.scr));
draw(SCREEN_REDRAW);
@@
-1440,12
+1414,8
@@
run(void) {
XEvent ev;
fd_set rfd;
int xfd = XConnectionNumber(xw.dis);
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 (?) */
-
while(1
) {
+
for(;;
) {
FD_ZERO(&rfd);
FD_SET(cmdfd, &rfd);
FD_SET(xfd, &rfd);
FD_ZERO(&rfd);
FD_SET(cmdfd, &rfd);
FD_SET(xfd, &rfd);
@@
-1468,14
+1438,26
@@
run(void) {
int
main(int argc, char *argv[]) {
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();
setlocale(LC_CTYPE, "");
tnew(80, 24);
ttynew();
xinit();
+ selinit();
run();
return 0;
}
run();
return 0;
}