# HG changeset patch # User Richard M. Stallman # Date 820437003 0 # Node ID dceb33c07f9ec6aa23bbbbda3af373041710c258 # Parent 1960e2c77da722597006be7be7da701d58794c70 (XTread_socket): Pass KeyPress events to the toolkit. Make the OTHER label exist unconditionally, and make the gotos unconditional when that is convenient. diff -r 1960e2c77da7 -r dceb33c07f9e src/xterm.c --- a/src/xterm.c Sun Dec 31 16:09:45 1995 +0000 +++ b/src/xterm.c Sun Dec 31 19:10:03 1995 +0000 @@ -3591,10 +3591,7 @@ count++; numchars--; } -#ifdef USE_X_TOOLKIT goto OTHER; -#endif /* USE_X_TOOLKIT */ - break; case MapNotify: /* We use x_top_window_to_frame because map events can come @@ -3623,10 +3620,7 @@ in case this is the second frame. */ record_asynch_buffer_change (); } -#ifdef USE_X_TOOLKIT goto OTHER; -#endif /* USE_X_TOOLKIT */ - break; /* Turn off processing if we become fully obscured. */ case VisibilityNotify: @@ -3790,7 +3784,7 @@ else abort (); } - break; + goto OTHER; /* Here's a possible interpretation of the whole FocusIn-EnterNotify FocusOut-LeaveNotify mess. If you get a @@ -3818,10 +3812,7 @@ so update things that depend on mouse position. */ if (f) note_mouse_movement (f, &event.xmotion); -#ifdef USE_X_TOOLKIT goto OTHER; -#endif /* USE_X_TOOLKIT */ - break; case FocusIn: f = x_any_window_to_frame (dpyinfo, event.xfocus.window); @@ -3835,11 +3826,7 @@ XSetICFocus (FRAME_XIC (f)); #endif -#ifdef USE_X_TOOLKIT goto OTHER; -#endif /* USE_X_TOOLKIT */ - break; - case LeaveNotify: f = x_top_window_to_frame (dpyinfo, event.xcrossing.window); @@ -3860,10 +3847,7 @@ x_new_focus_frame (dpyinfo, 0); } } -#ifdef USE_X_TOOLKIT goto OTHER; -#endif /* USE_X_TOOLKIT */ - break; case FocusOut: f = x_any_window_to_frame (dpyinfo, event.xfocus.window); @@ -3878,10 +3862,7 @@ XUnsetICFocus (FRAME_XIC (f)); #endif -#ifdef USE_X_TOOLKIT goto OTHER; -#endif /* USE_X_TOOLKIT */ - break; case MotionNotify: { @@ -3905,10 +3886,7 @@ clear_mouse_face (dpyinfo); } } -#ifdef USE_X_TOOLKIT goto OTHER; -#endif /* USE_X_TOOLKIT */ - break; case ConfigureNotify: f = x_any_window_to_frame (dpyinfo, event.xconfigure.window); @@ -3997,11 +3975,7 @@ /* #endif */ } } -#ifdef USE_X_TOOLKIT goto OTHER; -#else - break; -#endif case ButtonPress: case ButtonRelease: @@ -4103,14 +4077,11 @@ case MappingKeyboard: XRefreshKeyboardMapping (&event.xmapping); } -#ifdef USE_X_TOOLKIT goto OTHER; -#endif /* USE_X_TOOLKIT */ - break; default: + OTHER: #ifdef USE_X_TOOLKIT - OTHER: BLOCK_INPUT; XtDispatchEvent (&event); UNBLOCK_INPUT;