*** /tmp/,RCSt1a09805	Tue May 17 14:12:19 1994
--- contrib/programs/xfeoak/Xfeoak.h	Sun May 15 13:10:35 1994
***************
*** 123,129
  #define XFE_FOCUS_WIN_MASK		(1L <<  2)
  #define XFE_FILTER_EVENTS_MASK		(1L <<  3)
  #define XFE_RESET_STATE_MASK		(1L <<  4)
- #define XFE_RESET_RETURN_MASK		(1L <<  5)
  #ifdef SUPPORT_STRING_CONV
  #define XFE_STRING_CONV_MASK		(1L <<  6)
  #endif

--- 123,128 -----
  #define XFE_FOCUS_WIN_MASK		(1L <<  2)
  #define XFE_FILTER_EVENTS_MASK		(1L <<  3)
  #define XFE_RESET_STATE_MASK		(1L <<  4)
  #ifdef SUPPORT_STRING_CONV
  #define XFE_STRING_CONV_MASK		(1L <<  6)
  #endif
***************
*** 212,218
      Window			 focus_window;
      BITMASK32			 filter_events;
      XIMResetState		 reset_state;
-     XIMResetReturn		 reset_return;
  #ifdef SUPPORT_STRING_CONV
      XIMStringConversionText	*string_conv;
  #endif

--- 211,216 -----
      Window			 focus_window;
      BITMASK32			 filter_events;
      XIMResetState		 reset_state;
  #ifdef SUPPORT_STRING_CONV
      XIMStringConversionText	*string_conv;
  #endif
*** /tmp/,RCSt1a09810	Tue May 17 14:12:20 1994
--- contrib/programs/xfeoak/Xim.c	Sun May 15 13:10:37 1994
***************
*** 1341,1347
  	}
  	*top_mask |= (
  	    XFE_CLIENT_WIN_MASK  | XFE_FOCUS_WIN_MASK    |
! 	    XFE_RESET_STATE_MASK | XFE_RESET_RETURN_MASK |
  	    XFE_PREEDIT_MASK
  #ifdef SUPPORT_HOTKEY
  	    | XFE_HOTKEY_STATE_MASK

--- 1341,1347 -----
  	}
  	*top_mask |= (
  	    XFE_CLIENT_WIN_MASK  | XFE_FOCUS_WIN_MASK    |
! 	    XFE_RESET_STATE_MASK |
  	    XFE_PREEDIT_MASK
  #ifdef SUPPORT_HOTKEY
  	    | XFE_HOTKEY_STATE_MASK
***************
*** 1357,1363
      } else if (inputStyle & XIMPreeditCallbacks) {
  	*top_mask |= (
  	    XFE_CLIENT_WIN_MASK  | XFE_FOCUS_WIN_MASK    |
! 	    XFE_RESET_STATE_MASK | XFE_RESET_RETURN_MASK |
  	    XFE_PREEDIT_MASK
  #ifdef SUPPORT_HOTKEY
  	    | XFE_HOTKEY_STATE_MASK

--- 1357,1363 -----
      } else if (inputStyle & XIMPreeditCallbacks) {
  	*top_mask |= (
  	    XFE_CLIENT_WIN_MASK  | XFE_FOCUS_WIN_MASK    |
! 	    XFE_RESET_STATE_MASK |
  	    XFE_PREEDIT_MASK
  #ifdef SUPPORT_HOTKEY
  	    | XFE_HOTKEY_STATE_MASK
***************
*** 1376,1382
  	}
  	*top_mask |= (
  	    XFE_CLIENT_WIN_MASK  | XFE_FOCUS_WIN_MASK    |
! 	    XFE_RESET_STATE_MASK | XFE_RESET_RETURN_MASK |
  	    XFE_PREEDIT_MASK
  #ifdef SUPPORT_HOTKEY
  	    | XFE_HOTKEY_STATE_MASK

--- 1376,1382 -----
  	}
  	*top_mask |= (
  	    XFE_CLIENT_WIN_MASK  | XFE_FOCUS_WIN_MASK    |
! 	    XFE_RESET_STATE_MASK |
  	    XFE_PREEDIT_MASK
  #ifdef SUPPORT_HOTKEY
  	    | XFE_HOTKEY_STATE_MASK
***************
*** 1393,1399
      } else if (inputStyle & XIMPreeditNothing) {
  	*top_mask |= (
  	    XFE_CLIENT_WIN_MASK  | XFE_FOCUS_WIN_MASK    |
! 	    XFE_RESET_STATE_MASK | XFE_RESET_RETURN_MASK |
  	    XFE_PREEDIT_MASK
  #ifdef SUPPORT_HOTKEY
  	    | XFE_HOTKEY_STATE_MASK

--- 1393,1399 -----
      } else if (inputStyle & XIMPreeditNothing) {
  	*top_mask |= (
  	    XFE_CLIENT_WIN_MASK  | XFE_FOCUS_WIN_MASK    |
! 	    XFE_RESET_STATE_MASK |
  	    XFE_PREEDIT_MASK
  #ifdef SUPPORT_HOTKEY
  	    | XFE_HOTKEY_STATE_MASK
***************
*** 1968,1974
      if (inputStyle & XIMPreeditArea) {
  	*top_mask |= (
  	    XFE_CLIENT_WIN_MASK  | XFE_FOCUS_WIN_MASK    |
! 	    XFE_RESET_STATE_MASK | XFE_RESET_RETURN_MASK |
  	    XFE_PREEDIT_MASK
  #ifdef SUPPORT_STRING_CONV
  	    | XFE_STRING_CONV_MASK

--- 1968,1974 -----
      if (inputStyle & XIMPreeditArea) {
  	*top_mask |= (
  	    XFE_CLIENT_WIN_MASK  | XFE_FOCUS_WIN_MASK    |
! 	    XFE_RESET_STATE_MASK |
  	    XFE_PREEDIT_MASK
  #ifdef SUPPORT_STRING_CONV
  	    | XFE_STRING_CONV_MASK
***************
*** 1988,1994
      } else if (inputStyle & XIMPreeditCallbacks) {
  	*top_mask |= (
  	    XFE_CLIENT_WIN_MASK  | XFE_FOCUS_WIN_MASK    |
! 	    XFE_RESET_STATE_MASK | XFE_RESET_RETURN_MASK |
  	    XFE_PREEDIT_MASK
  #ifdef SUPPORT_STRING_CONV
  	    | XFE_STRING_CONV_MASK

--- 1988,1994 -----
      } else if (inputStyle & XIMPreeditCallbacks) {
  	*top_mask |= (
  	    XFE_CLIENT_WIN_MASK  | XFE_FOCUS_WIN_MASK    |
! 	    XFE_RESET_STATE_MASK |
  	    XFE_PREEDIT_MASK
  #ifdef SUPPORT_STRING_CONV
  	    | XFE_STRING_CONV_MASK
***************
*** 2002,2008
      } else if (inputStyle & XIMPreeditPosition) {
  	*top_mask |= (
  	    XFE_CLIENT_WIN_MASK  | XFE_FOCUS_WIN_MASK    |
! 	    XFE_RESET_STATE_MASK | XFE_RESET_RETURN_MASK |
  	    XFE_PREEDIT_MASK
  #ifdef SUPPORT_STRING_CONV
  	    | XFE_STRING_CONV_MASK

--- 2002,2008 -----
      } else if (inputStyle & XIMPreeditPosition) {
  	*top_mask |= (
  	    XFE_CLIENT_WIN_MASK  | XFE_FOCUS_WIN_MASK    |
! 	    XFE_RESET_STATE_MASK |
  	    XFE_PREEDIT_MASK
  #ifdef SUPPORT_STRING_CONV
  	    | XFE_STRING_CONV_MASK
***************
*** 2022,2028
      } else if (inputStyle & XIMPreeditNothing) {
  	*top_mask |= (
  	    XFE_CLIENT_WIN_MASK  | XFE_FOCUS_WIN_MASK    |
! 	    XFE_RESET_STATE_MASK | XFE_RESET_RETURN_MASK |
  	    XFE_PREEDIT_MASK
  #ifdef SUPPORT_STRING_CONV
  	    | XFE_STRING_CONV_MASK

--- 2022,2028 -----
      } else if (inputStyle & XIMPreeditNothing) {
  	*top_mask |= (
  	    XFE_CLIENT_WIN_MASK  | XFE_FOCUS_WIN_MASK    |
! 	    XFE_RESET_STATE_MASK |
  	    XFE_PREEDIT_MASK
  #ifdef SUPPORT_STRING_CONV
  	    | XFE_STRING_CONV_MASK
*** /tmp/,RCSt1a09815	Tue May 17 14:12:21 1994
--- contrib/programs/xfeoak/XimFormat.c	Sun May 15 13:10:39 1994
***************
*** 264,270
  static Xfe_AttrName	XANFocusWindow	      = {0, 0, XNFocusWindow};
  static Xfe_AttrName	XANFilterEvents	      = {0, 0, XNFilterEvents};
  static Xfe_AttrName	XANResetState	      = {0, 0, XNResetState};
- static Xfe_AttrName	XANResetReturn	      = {0, 0, XNResetReturn};
  #ifdef SUPPORT_STRING_CONV
  static Xfe_AttrName	XANStringConversion   = {0, 0, XNStringConversion};
  #endif

--- 264,269 -----
  static Xfe_AttrName	XANFocusWindow	      = {0, 0, XNFocusWindow};
  static Xfe_AttrName	XANFilterEvents	      = {0, 0, XNFilterEvents};
  static Xfe_AttrName	XANResetState	      = {0, 0, XNResetState};
  #ifdef SUPPORT_STRING_CONV
  static Xfe_AttrName	XANStringConversion   = {0, 0, XNStringConversion};
  #endif
***************
*** 409,418
  
     {&XANResetState, XimType_CARD32, 0, LOC(Xfe_ICAttr, reset_state),
  		XFE_RESET_STATE_MASK, XFE_TOP_MASK_IDX, XFE_NONEST,
- 		Encode32, Decode32},
- 
-    {&XANResetReturn, XimType_CARD32, 0, LOC(Xfe_ICAttr, reset_return),
- 		XFE_RESET_RETURN_MASK, XFE_TOP_MASK_IDX, XFE_NONEST,
  		Encode32, Decode32},
  
  #ifdef SUPPORT_STRING_CONV

--- 408,413 -----
  
     {&XANResetState, XimType_CARD32, 0, LOC(Xfe_ICAttr, reset_state),
  		XFE_RESET_STATE_MASK, XFE_TOP_MASK_IDX, XFE_NONEST,
  		Encode32, Decode32},
  
  #ifdef SUPPORT_STRING_CONV
