vim: src/os_unix.c comparison

updated for version 7.4.666 Problem: There is a chance that Vim may lock up. Solution: Handle timer events differently. (Aaron Burrow)

comparison

equal deleted inserted replaced

-:28bb3ecefb52
+:781104cb0d06
 static void
 xterm_update()
 {
 XEvent event;
-while (XtAppPending(app_context) && !vim_is_input_buf_full())
+for (;;)
 {
-	XtAppNextEvent(app_context, &event);
+XtInputMask mask = XtAppPending(app_context);
+if (mask == 0 || vim_is_input_buf_full())
+	    break;
+if (mask & XtIMXEvent)
+	{
+	    /* There is an event to process. */
+XtAppNextEvent(app_context, &event);
 #ifdef FEAT_CLIENTSERVER
-	{
+	    {
-	    XPropertyEvent *e = (XPropertyEvent *)&event;
+		XPropertyEvent *e = (XPropertyEvent *)&event;
-	    if (e->type == PropertyNotify && e->window == commWindow
+		if (e->type == PropertyNotify && e->window == commWindow
 		   && e->atom == commProperty && e->state == PropertyNewValue)
-		serverEventProc(xterm_dpy, &event);
+serverEventProc(xterm_dpy, &event);
-	}
+	    }
 #endif
-	XtDispatchEvent(&event);
+XtDispatchEvent(&event);
+}
+	else
+	{
+	    /* There is something else than an event to process. */
+XtAppProcessEvent(app_context, mask);
+}
 }
 }
 int
 clip_xterm_own_selection(cbd)

Mercurial > vim