X-Git-Url: https://jasonwoof.com/gitweb/?p=st.git;a=blobdiff_plain;f=st.c;h=ce8c5c992dd83dd949255374244658d6584e2b09;hp=00fca99788da317c7853138ab8d4b3d7795c59c9;hb=8365f93099bcfa6a708f3608cd3eb43c150a166e;hpb=580302f3179ef3f24cf0329755686dfa7100996b

diff --git a/st.c b/st.c
index 00fca99..ce8c5c9 100644
--- a/st.c
+++ b/st.c
@@ -996,6 +996,8 @@ selnotify(XEvent *e) {
 
 	ofs = 0;
 	xsev = (XSelectionEvent *)e;
+	if (xsev->property == None)
+	    return;
 	do {
 		if(XGetWindowProperty(xw.dpy, xw.win, xsev->property, ofs,
 					BUFSIZ/4, False, AnyPropertyType,
@@ -2270,12 +2272,23 @@ strhandle(void) {
 
 void
 strparse(void) {
+	int c;
 	char *p = strescseq.buf;
 
 	strescseq.narg = 0;
 	strescseq.buf[strescseq.len] = '\0';
-	while(p && strescseq.narg < STR_ARG_SIZ)
-		strescseq.args[strescseq.narg++] = strsep(&p, ";");
+
+	if(*p == '\0')
+		return;
+
+	while(strescseq.narg < STR_ARG_SIZ) {
+		strescseq.args[strescseq.narg++] = p;
+		while((c = *p) != ';' && c != '\0')
+			++p;
+		if(c == '\0')
+			return;
+		*p++ = '\0';
+	}
 }
 
 void
@@ -3941,15 +3954,16 @@ run(void) {
 		}
 		if(FD_ISSET(cmdfd, &rfd)) {
 			ttyread();
-			if(blinktimeout) {
-				blinkset = tattrset(ATTR_BLINK);
-				if(!blinkset)
-					MODBIT(term.mode, 0, MODE_BLINK);
-			}
 		}
 
-		if(FD_ISSET(xfd, &rfd))
+		if(FD_ISSET(xfd, &rfd)) {
 			xev = actionfps;
+			if(blinktimeout) {
+				lastblink = now;
+				MODBIT(term.mode, 1, MODE_BLINK);
+				blinkset = 1;
+			}
+		}
 
 		clock_gettime(CLOCK_MONOTONIC, &now);
 		drawtimeout.tv_sec = 0;