Make the processevents command general.

1 files changed, 33 insertions, 8 deletions

diff --git a/generic/tkTest.c b/generic/tkTest.c
index a5f1c34..2eaa4de 100644
--- a/generic/tkTest.c
+++ b/generic/tkTest.c
@@ -1688,14 +1688,16 @@ ImageDelete(
  *
  * ProcessEventsObjCmd --
  *
- *	This function implements the "processevents" command. Currently
- *      It processes all <Enter> or <Leave> events on the queue.
+ *      This function implements the "processevents" command which processes
+ *      all queued events of a type specified by one of the arguments to the
+ *      command.  Currently the supported arguments are leave, enter, and
+ *      motion.  Others could be added if needed.
  *
  * Results:
- *	A standard Tcl result.
+ *      A standard Tcl result.
  *
  * Side effects:
- *	Events are processed
+ *      Events are processed
  *
  *----------------------------------------------------------------------
  */
@@ -1705,20 +1707,43 @@ CrossingRestrictProc(
     ClientData arg,
     XEvent *eventPtr)
 {
-    if (eventPtr->type == EnterNotify || eventPtr->type == LeaveNotify) {
-	return TK_PROCESS_EVENT;
+    int *eventTypes = (int *) arg;
+    for (int *t = eventTypes; *t != 0; t++) {
+	if (eventPtr->type == *t) {
+	    return TK_PROCESS_EVENT;
+	}
     }
     return TK_DEFER_EVENT;	
 }
 
-static int ProcessEventsObjCmd(ClientData dummy,
+static int ProcessEventsObjCmd(
+    ClientData dummy,
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj * const objv[])
 {
     ClientData oldArg;
     Tk_RestrictProc *oldProc;
-    oldProc = Tk_RestrictEvents(CrossingRestrictProc, NULL, &oldArg);
+    int index;
+    static const char *const eventTypeNames[] = {
+	"leave", "enter", "motion", NULL};
+    static const int eventTypes[] = {
+	LeaveNotify, EnterNotify, MotionNotify};
+    int whichEvents[100];
+    if (objc < 2) {
+        Tcl_WrongNumArgs(interp, 1, objv, "eventtype ?eventtype ...?");
+        return TCL_ERROR;
+    }
+    for (int n = 1; n < objc; n++) {
+	if (Tcl_GetIndexFromObj(interp, objv[n], eventTypeNames, "eventtype", 0,
+				&index) != TCL_OK) {
+	    return TCL_ERROR;
+	}
+	whichEvents[n - 1] = eventTypes[index];
+    }
+    whichEvents[objc - 1] = 0;
+    oldProc = Tk_RestrictEvents(CrossingRestrictProc, (void *) whichEvents,
+				&oldArg);
     while (Tcl_ServiceEvent(TCL_WINDOW_EVENTS|TCL_DONT_WAIT)) {};
     Tk_RestrictEvents(oldProc, oldArg, &oldArg);
     return TCL_OK;