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
1497dd2
..
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,11
+129,12
@@
typedef struct {
GC gc;
} DC;
GC gc;
} DC;
+/* TODO: use better name for vars... */
typedef struct {
int mode;
int bx, by;
int ex, ey;
typedef struct {
int mode;
int bx, by;
int ex, ey;
-
int b[2], e[2]
;
+
struct {int x, y;} b, e
;
char *clip;
} Selection;
char *clip;
} Selection;
@@
-160,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);
@@
-185,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 *) = {
@@
-209,15
+214,24
@@
static CSIEscape escseq;
static int cmdfd;
static pid_t pid;
static Selection sel;
static int cmdfd;
static pid_t pid;
static Selection sel;
+static char *opt_cmd = NULL;
+static char *opt_title = 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
((sel.ey==y && sel.by==y)
) {
+ if
(sel.ey == y && sel.by == y
) {
int bx = MIN(sel.bx, sel.ex);
int ex = MAX(sel.bx, sel.ex);
int bx = MIN(sel.bx, sel.ex);
int ex = MAX(sel.bx, sel.ex);
- return
(x>=bx && x<=
ex);
+ return
BETWEEN(x, bx,
ex);
}
}
- return ((
(y>sel.b[1] && y<sel.e[1]) || (y==sel.e[1] && x<=sel.e[0])) || \
-
(y==sel.b[1] && x>=sel.b[0] && (x<=sel.e[0] || sel.b[1]!=sel.e[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) {
@@
-225,10
+239,10
@@
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;
- sel.b
[0] = sel.by<sel.ey?sel.bx:
sel.ex;
- sel.b
[1]
= MIN(sel.by, sel.ey);
- sel.e
[0] = sel.by<sel.ey?sel.ex:
sel.bx;
- sel.e
[1]
= MAX(sel.by, sel.ey);
+ 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) {
}
static void bpress(XEvent *e) {
@@
-240,33
+254,28
@@
static void bpress(XEvent *e) {
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) * (sel.e[1]-sel.b[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].state & GLYPH_SET && (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;
}
/* TODO: use X11 clipboard */
}
*ptr = 0;
return str;
}
/* TODO: use X11 clipboard */
-static void
clipboard_
copy(char *str) {
+static void
sel
copy(char *str) {
free(sel.clip);
sel.clip = str;
}
free(sel.clip);
sel.clip = str;
}
-static void
clipboard_
paste() {
+static void
sel
paste() {
if(sel.clip)
ttywrite(sel.clip, strlen(sel.clip));
}
if(sel.clip)
ttywrite(sel.clip, strlen(sel.clip));
}
@@
-276,19
+285,13
@@
static void brelease(XEvent *e) {
int b;
sel.mode = 0;
getbuttoninfo(e, &b, &sel.ex, &sel.ey);
int b;
sel.mode = 0;
getbuttoninfo(e, &b, &sel.ex, &sel.ey);
- if(b==4)
- tscrollup(1);
- else
- if(b==5)
- tscrolldown(1);
- else
if(sel.bx==sel.ex && sel.by==sel.ey) {
sel.bx = -1;
if(b==2)
if(sel.bx==sel.ex && sel.by==sel.ey) {
sel.bx = -1;
if(b==2)
-
clipboard_
paste();
+
sel
paste();
} else {
if(b==1)
} else {
if(b==1)
-
clipboard_
copy(getseltext());
+
sel
copy(getseltext());
}
draw(1);
}
}
draw(1);
}
@@
-332,9
+335,12
@@
die(const char *errstr, ...) {
void
execsh(void) {
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);
}
execvp(args[0], args);
}
@@
-390,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);
@@
-462,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;
@@
-479,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;
@@
-496,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);
}
@@
-590,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
@@
-805,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);
@@
-960,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;
@@
-998,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;
@@
-1009,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;
@@
-1204,18
+1179,18
@@
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
/* event mask */
XSelectInput(xw.dis, xw.win, ExposureMask | KeyPressMask
| StructureNotifyMask | FocusChangeMask | PointerMotionMask
@@
-1223,7
+1198,7
@@
xinit(void) {
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);
}
@@
-1404,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);
@@
-1463,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;
}