--- rxvt-unicode/src/command.C	2006/02/02 18:04:45	1.305
+++ rxvt-unicode/src/command.C	2006/02/23 19:26:56	1.310
@@ -1,4 +1,4 @@
-/*--------------------------------*-C-*---------------------------------*
+/*----------------------------------------------------------------------*
  * File:	command.C
  *----------------------------------------------------------------------*
  *
@@ -300,9 +300,8 @@
 }
 #endif
 
-/*{{{ Convert the keypress event into a string */
 void
-rxvt_term::lookup_key (XKeyEvent &ev)
+rxvt_term::key_press (XKeyEvent &ev)
 {
   int ctrl, meta, shft, len;
   unsigned int newlen;
@@ -310,6 +309,11 @@
   int valid_keysym;
   char kbuf[KBUFSZ];
 
+#if ISO_14755
+  if (iso14755buf & ISO_14755_52)
+    return;
+#endif
+
   /*
    * use Num_Lock to toggle Keypad on/off.  If Num_Lock is off, allow an
    * escape sequence to toggle the Keypad.
@@ -909,7 +913,83 @@
 
   tt_write (kbuf, (unsigned int)len);
 }
-/*}}} */
+
+void
+rxvt_term::key_release (XKeyEvent &ev)
+{
+#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
+  KeySym keysym;
+
+  keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
+#endif
+
+#if ENABLE_FRILLS || ISO_14755
+  // ISO 14755 support
+  if (iso14755buf)
+    if (iso14755buf & ISO_14755_52)
+      {
+# if ENABLE_OVERLAY
+        scr_overlay_off ();
+# endif
+# if ISO_14755
+        // iso14755 part 5.2 handling: release time
+        // first: controls
+        if ((ev.state & ControlMask)
+             && ((keysym >= 0x40 && keysym <= 0x5f)
+                 || (keysym >= 0x61 && keysym <= 0x7f)))
+          {
+            iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
+            commit_iso14755 ();
+
+            return;
+          }
+
+        for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
+          if (i[0] == keysym)
+            {
+              iso14755buf = ISO_14755_51 | i[1];
+              commit_iso14755 ();
+
+              return;
+            }
+
+        scr_bell ();
+# endif
+        iso14755buf = 0;
+
+        return;
+      }
+    else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
+      {
+# if ENABLE_OVERLAY
+        scr_overlay_off ();
+# endif
+        if (iso14755buf & ISO_14755_51)
+          commit_iso14755 ();
+#if ISO_14755
+        else if (iso14755buf & ISO_14755_STARTED)
+          {
+            iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
+
+            scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
+            scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
+          }
+# endif
+        else
+          iso14755buf = 0;
+      }
+#endif
+
+  if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
+    return;
+
+#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
+  if (!(ev.state & ControlMask))
+    slip_wheel_ev.stop ();
+  else if (keysym == XK_Control_L || keysym == XK_Control_R)
+    mouse_slip_wheel_speed = 0;
+#endif
+}
 
 #if defined (KEYSYM_RESOURCE)
 unsigned int
@@ -1302,87 +1382,12 @@
   switch (ev.type)
     {
       case KeyPress:
-#if ISO_14755
-        if (!(iso14755buf & ISO_14755_52))
-#endif
-          lookup_key (ev.xkey);
-
+        key_press (ev.xkey);
         break;
 
       case KeyRelease:
-        {
-#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
-          KeySym keysym;
-
-          keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
-#endif
-
-#if ENABLE_FRILLS || ISO_14755
-          // ISO 14755 support
-          if (iso14755buf)
-            if (iso14755buf & ISO_14755_52)
-              {
-# if ENABLE_OVERLAY
-                scr_overlay_off ();
-# endif
-# if ISO_14755
-                // iso14755 part 5.2 handling: release time
-                // first: controls
-                if ((ev.xkey.state & ControlMask)
-                     && ((keysym >= 0x40 && keysym <= 0x5f)
-                         || (keysym >= 0x61 && keysym <= 0x7f)))
-                  {
-                    iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
-                    commit_iso14755 ();
-                    goto skip_switch;
-                  }
-
-                for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
-                  if (i[0] == keysym)
-                    {
-                      iso14755buf = ISO_14755_51 | i[1];
-                      commit_iso14755 ();
-                      goto skip_switch;
-                    }
-
-                scr_bell ();
-# endif
-                iso14755buf = 0;
-                break;
-              }
-            else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
-              {
-# if ENABLE_OVERLAY
-                scr_overlay_off ();
-# endif
-                if (iso14755buf & ISO_14755_51)
-                  commit_iso14755 ();
-#if ISO_14755
-                else if (iso14755buf & ISO_14755_STARTED)
-                  {
-                    iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
-
-                    scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
-                    scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
-                  }
-# endif
-                else
-                  iso14755buf = 0;
-              }
-#endif
-
-          if (ev.xany.window == vt
-              && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
-            break;
-
-#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
-          if (!(ev.xkey.state & ControlMask))
-            slip_wheel_ev.stop ();
-          else if (keysym == XK_Control_L || keysym == XK_Control_R)
-            mouse_slip_wheel_speed = 0;
-#endif
-          break;
-        }
+        key_release (ev.xkey);
+        break;
 
       case ButtonPress:
         button_press (ev.xbutton);
@@ -1675,8 +1680,6 @@
         break;
     }
 
-skip_switch: ;
-
 #if defined(CURSOR_BLINK)
   if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
     {
@@ -1713,12 +1716,12 @@
       focus = 1;
       want_refresh = 1;
 
-      HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
+      HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
 
 #if USE_XIM
       if (Input_Context != NULL)
         {
-          IMSetStatusPosition ();
+          IMSetPosition ();
           XSetICFocus (Input_Context);
         }
 #endif
@@ -2764,6 +2767,7 @@
               else
                 {
                   flag = true;
+                  //TODO: due to popular request, implement "skipscroll" option here
                   scr_refresh ();
                   want_refresh = 1;
                 }