X-Git-Url: https://git.xinqibao.xyz/st.git/blobdiff_plain/12435817723b44189bd412937403c401e5bbc136..d581bfccd7c2987e12809383d8ce1f833529b715:/st.c?ds=sidebyside

diff --git a/st.c b/st.c
index 594b0d3..895519d 100644
--- a/st.c
+++ b/st.c
@@ -170,7 +170,7 @@ static void tputtab(void);
 static void tputc(char);
 static void tputs(char*, int);
 static void treset(void);
-static void tresize(int, int);
+static int tresize(int, int);
 static void tscrollup(int, int);
 static void tscrolldown(int, int);
 static void tsetattr(int*, int);
@@ -286,35 +286,24 @@ static char *getseltext() {
 
 static void selection_notify(XEvent *e) {
 	unsigned long nitems;
-	unsigned long length;
-	int format, res;
+	unsigned long ofs, rem;
+	int format;
 	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");
+	ofs = 0;
+	do {
+		if(XGetWindowProperty(xw.dis, xw.win, XA_PRIMARY, ofs, BUFSIZ/4,
+					False, AnyPropertyType, &type, &format,
+					&nitems, &rem, &data)) {
+			fprintf(stderr, "Clipboard allocation failed\n");
 			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);
-	}
+		/* number of 32-bit chunks returned */
+		ofs += nitems * format / 32;
+	} while(rem > 0);
 }
 
 static void selpaste() {
@@ -325,7 +314,6 @@ static void selection_request(XEvent *e)
 {
 	XSelectionRequestEvent *xsre;
 	XSelectionEvent xev;
-	int res;
 	Atom xa_targets;
 
 	xsre = (XSelectionRequestEvent *) e;
@@ -341,70 +329,33 @@ static void selection_request(XEvent *e)
 	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;
-		}
+		XChangeProperty(xsre->display, xsre->requestor, xsre->property,
+				XA_ATOM, 32, PropModeReplace,
+				(unsigned char *) &string, 1);
+		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;
-		}
+		XChangeProperty(xsre->display, xsre->requestor, xsre->property,
+				xsre->target, 8, PropModeReplace,
+				(unsigned char *) sel.clip, strlen(sel.clip));
+		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");
-	}
+	if(!XSendEvent(xsre->display, xsre->requestor, True, 0, (XEvent *) &xev))
+		fprintf(stderr, "Error sending SelectionNotify event\n");
 }
 
 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;
-	}
+	XSetSelectionOwner(xw.dis, XA_PRIMARY, xw.win, CurrentTime);
 
 	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;
-	}
+	XSetSelectionOwner(xw.dis, clipboard, xw.win, CurrentTime);
 
 	XFlush(xw.dis);
 }
@@ -883,10 +834,14 @@ csihandle(void) {
 	case 'J': /* ED -- Clear screen */
 		switch(escseq.arg[0]) {
 		case 0: /* below */
-			tclearregion(term.c.x, term.c.y, term.col-1, term.row-1);
+			tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
+			if(term.c.y < term.row-1)
+				tclearregion(0, term.c.y+1, term.col-1, term.row-1);
 			break;
 		case 1: /* above */
-			tclearregion(0, 0, term.c.x, term.c.y);
+			if(term.c.y > 1)
+				tclearregion(0, 0, term.col-1, term.c.y-1);
+			tclearregion(0, term.c.y, term.c.x, term.c.y);
 			break;
 		case 2: /* all */
 			tclearregion(0, 0, term.col-1, term.row-1);
@@ -1202,7 +1157,7 @@ tputs(char *s, int len) {
 		tputc(*s++);
 }
 
-void
+int
 tresize(int col, int row) {
 	int i, x;
 	int minrow = MIN(row, term.row);
@@ -1210,7 +1165,7 @@ tresize(int col, int row) {
 	int slide = term.c.y - row + 1;
 
 	if(col < 1 || row < 1)
-		return;
+		return 0;
 
 	/* free unneeded rows */
 	i = 0;
@@ -1256,14 +1211,37 @@ tresize(int col, int row) {
 	tmoveto(term.c.x, term.c.y);
 	/* reset scrolling region */
 	tsetscroll(0, row-1);
+	return (slide > 0);
 }
 
 void
 xresize(int col, int row) {
+	Pixmap newbuf;
+	int oldw, oldh;
+
+	oldw = xw.bufw;
+	oldh = xw.bufh;
 	xw.bufw = MAX(1, col * xw.cw);
 	xw.bufh = MAX(1, row * xw.ch);
+	newbuf = XCreatePixmap(xw.dis, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dis, xw.scr));
+	XCopyArea(xw.dis, xw.buf, newbuf, dc.gc, 0, 0, xw.bufw, xw.bufh, 0, 0);
 	XFreePixmap(xw.dis, xw.buf);
-	xw.buf = XCreatePixmap(xw.dis, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dis, xw.scr));
+	XSetForeground(xw.dis, dc.gc, dc.col[DefaultBG]);
+	if(xw.bufw > oldw)
+		XFillRectangle(xw.dis, newbuf, dc.gc, oldw, 0,
+				xw.bufw-oldw, MIN(xw.bufh, oldh));
+	else if(xw.bufw < oldw && (BORDER > 0 || xw.w > xw.bufw))
+		XClearArea(xw.dis, xw.win, BORDER+xw.bufw, BORDER,
+				xw.w-xw.bufh-BORDER, BORDER+MIN(xw.bufh, oldh),
+				False);
+	if(xw.bufh > oldh)
+		XFillRectangle(xw.dis, newbuf, dc.gc, 0, oldh,
+				xw.bufw, xw.bufh-oldh);
+	else if(xw.bufh < oldh && (BORDER > 0 || xw.h > xw.bufh))
+		XClearArea(xw.dis, xw.win, BORDER, BORDER+xw.bufh,
+				xw.w-2*BORDER, xw.h-xw.bufh-BORDER,
+				False);
+	xw.buf = newbuf;
 }
 
 void
@@ -1628,7 +1606,8 @@ resize(XEvent *e) {
 	row = (xw.h - 2*BORDER) / xw.ch;
 	if(col == term.col && row == term.row)
 		return;
-	tresize(col, row);
+	if(tresize(col, row))
+		draw(SCREEN_REDRAW);
 	ttyresize(col, row);
 	xresize(col, row);
 }