X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=st.c;h=46490798e9b867821c2b7dfb954c7325e16308f1;hb=d5f3d120eae2377b8a2f80c94fbb5e4bd7a6189d;hp=e705fcac01cd52912099d193944493b8b7718a61;hpb=9b404c0dfb99a7fd918760984ba4d0c50d3c87b8;p=st.git

diff --git a/st.c b/st.c
index e705fca..4649079 100644
--- a/st.c
+++ b/st.c
@@ -35,7 +35,7 @@
 
 #define USAGE \
 	"st-" VERSION ", (c) 2010-2011 st engineers\n" \
-	"usage: st [-t title] [-c class] [-v] [-e command...]\n"
+	"usage: st [-t title] [-c class] [-w windowid] [-v] [-e command...]\n"
 
 /* Arbitrary sizes */
 #define ESC_TITLE_SIZ 256
@@ -241,6 +241,8 @@ static void (*handler[LASTEvent])(XEvent *) = {
 	[VisibilityNotify] = visibility,
 	[UnmapNotify] = unmap,
 	[Expose] = expose,
+	[EnterNotify] = focus,
+	[LeaveNotify] = focus,
 	[FocusIn] = focus,
 	[FocusOut] = focus,
 	[MotionNotify] = bmotion,
@@ -260,6 +262,7 @@ static pid_t pid;
 static Selection sel;
 static char **opt_cmd  = NULL;
 static char *opt_title = NULL;
+static char *opt_embed = NULL;
 static char *opt_class = NULL;
 
 int
@@ -483,8 +486,7 @@ selcopy(void) {
 
 void
 selnotify(XEvent *e) {
-	unsigned long nitems;
-	unsigned long ofs, rem;
+	unsigned long nitems, ofs, rem;
 	int format;
 	unsigned char *data;
 	Atom type;
@@ -615,7 +617,7 @@ bmotion(XEvent *e) {
 		if(oldey != sel.ey || oldex != sel.ex) {
 			int starty = MIN(oldey, sel.ey);
 			int endy = MAX(oldey, sel.ey);
-			drawregion(0, (starty > 0 ? starty : 0), term.col, (sel.ey < term.row ? endy+1 : term.row));
+			drawregion(0, (starty > 0 ? starty : 0), term.col, (endy < term.row ? endy+1 : term.row));
 		}
 	}
 }
@@ -767,7 +769,7 @@ tnew(int col, int row) {
 	term.row = row, term.col = col;
 	term.line = malloc(term.row * sizeof(Line));
 	term.alt  = malloc(term.row * sizeof(Line));
-	for(row = 0 ; row < term.row; row++) {
+	for(row = 0; row < term.row; row++) {
 		term.line[row] = malloc(term.col * sizeof(Glyph));
 		term.alt [row] = malloc(term.col * sizeof(Glyph));
 	}
@@ -1141,12 +1143,13 @@ csihandle(void) {
 				term.mode &= ~MODE_MOUSEMOTION;
 				break;
 			case 1049: /* = 1047 and 1048 */
+			case 47:
 			case 1047:
 				if(IS_SET(MODE_ALTSCREEN)) {
 					tclearregion(0, 0, term.col-1, term.row-1);
 					tswapscreen();
 				}
-				if(escseq.arg[0] == 1047)
+				if(escseq.arg[0] != 1049)
 					break;
 			case 1048:
 				tcursor(CURSOR_LOAD);
@@ -1213,12 +1216,13 @@ csihandle(void) {
 				term.mode |= MODE_MOUSEMOTION;
 				break;
 			case 1049: /* = 1047 and 1048 */
+			case 47:
 			case 1047:
 				if(IS_SET(MODE_ALTSCREEN))
 					tclearregion(0, 0, term.col-1, term.row-1);
 				else
 					tswapscreen();
-				if(escseq.arg[0] == 1047)
+				if(escseq.arg[0] != 1049)
 					break;
 			case 1048:
 				tcursor(CURSOR_SAVE);
@@ -1605,6 +1609,7 @@ void
 xinit(void) {
 	XSetWindowAttributes attrs;
 	Cursor cursor;
+	Window parent;
 
 	if(!(xw.dpy = XOpenDisplay(NULL)))
 		die("Can't open display\n");
@@ -1622,8 +1627,8 @@ xinit(void) {
 	xloadcols();
 
 	/* window - default size */
-	xw.bufh = 24 * xw.ch;
-	xw.bufw = 80 * xw.cw;
+	xw.bufh = term.row * xw.ch;
+	xw.bufw = term.col * xw.cw;
 	xw.h = xw.bufh + 2*BORDER;
 	xw.w = xw.bufw + 2*BORDER;
 
@@ -1632,10 +1637,12 @@ xinit(void) {
 	attrs.bit_gravity = NorthWestGravity;
 	attrs.event_mask = FocusChangeMask | KeyPressMask
 		| ExposureMask | VisibilityChangeMask | StructureNotifyMask
-		| ButtonMotionMask | ButtonPressMask | ButtonReleaseMask;
+		| ButtonMotionMask | ButtonPressMask | ButtonReleaseMask
+		| EnterWindowMask | LeaveWindowMask;
 	attrs.colormap = xw.cmap;
 
-	xw.win = XCreateWindow(xw.dpy, XRootWindow(xw.dpy, xw.scr), 0, 0,
+	parent = opt_embed ? strtol(opt_embed, NULL, 0) : XRootWindow(xw.dpy, xw.scr);
+	xw.win = XCreateWindow(xw.dpy, parent, 0, 0,
 			xw.w, xw.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput,
 			XDefaultVisual(xw.dpy, xw.scr),
 			CWBackPixel | CWBorderPixel | CWBitGravity | CWEventMask
@@ -1815,7 +1822,7 @@ xseturgency(int add) {
 
 void
 focus(XEvent *ev) {
-	if(ev->type == FocusIn) {
+	if(ev->type == FocusIn || ev->type == EnterNotify) {
 		xw.state |= WIN_FOCUSED;
 		xseturgency(0);
 	} else
@@ -1942,6 +1949,9 @@ main(int argc, char *argv[]) {
 		case 'c':
 			if(++i < argc) opt_class = argv[i];
 			break;
+		case 'w':
+			if(++i < argc) opt_embed = argv[i];
+			break;
 		case 'e': 
 			/* eat every remaining arguments */
 			if(++i < argc) opt_cmd = &argv[i];