--- rxvt-unicode/src/command.C	2003/12/05 04:27:20	1.13
+++ rxvt-unicode/src/command.C	2003/12/16 23:04:13	1.15
@@ -1,7 +1,7 @@
 /*--------------------------------*-C-*---------------------------------*
  * File:	command.c
  *----------------------------------------------------------------------*
- * $Id: command.C,v 1.13 2003/12/05 04:27:20 pcg Exp $
+ * $Id: command.C,v 1.15 2003/12/16 23:04:13 pcg Exp $
  *
  * All portions of code are copyright by their respective author/s.
  * Copyright (c) 1992      John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
@@ -63,9 +63,7 @@
 #ifdef DEBUG_CMD
     static int      debug_key = 1;	/* accessible by a debugger only */
 #endif
-#ifdef USE_XIM
     int             valid_keysym;
-#endif
     unsigned char  *kbuf = R->kbuf;
 
 /*
@@ -77,15 +75,20 @@
     shft = (ev->state & ShiftMask);
     ctrl = (ev->state & ControlMask);
     meta = (ev->state & R->ModMetaMask);
-    if (R->numlock_state || (ev->state & R->ModNumLockMask)) {
+
+    if (R->numlock_state || (ev->state & R->ModNumLockMask))
+      {
 	R->numlock_state = (ev->state & R->ModNumLockMask);
 	PrivMode((!R->numlock_state), PrivMode_aplKP);
-    }
+      }
+
+    kbuf[0] = 0;
+
 #ifdef USE_XIM
-    if (R->Input_Context != NULL) {
-	Status          status_return;
+    if (R->Input_Context)
+      {
+	Status status_return;
 
-	kbuf[0] = '\0';
 #ifdef X_HAVE_UTF8_STRING
 	len = Xutf8LookupString(R->Input_Context, ev, (char *)kbuf,
 			      KBUFSZ, &keysym, &status_return);
@@ -95,47 +98,35 @@
 #endif
 	valid_keysym = ((status_return == XLookupKeySym)
 			|| (status_return == XLookupBoth));
-    } else {
-	len = XLookupString(ev, (char *)kbuf, KBUFSZ, &keysym,
-			    &R->compose);
-	valid_keysym = 1;
-    }
-#else				/* USE_XIM */
-    len = XLookupString(ev, (char *)kbuf, KBUFSZ, &keysym,
-			&R->compose);
-/*
- * map unmapped Latin[2-4]/Katakana/Arabic/Cyrillic/Greek entries -> Latin1
- * good for installations with correct fonts, but without XLOCALE
- */
-    if (!len) {
-	if ((keysym >= 0x0100) && (keysym < 0x0800)) {
-	    kbuf[0] = (keysym & 0xFF);
-	    kbuf[1] = '\0';
-	    len = 1;
-	} else
-	    kbuf[0] = '\0';
-    }
-#endif				/* USE_XIM */
+      }
+    else
+#endif
+      {
+	len = XLookupString(ev, (char *)kbuf, KBUFSZ, &keysym, &R->compose);
+	valid_keysym = !len;
+      }
 
-#ifdef USE_XIM
     if (valid_keysym)
-#endif
-    {
+      {
 /* for some backwards compatibility */
 #if defined(HOTKEY_CTRL) || defined(HOTKEY_META)
 # ifdef HOTKEY_CTRL
-	if (ctrl) {
+	if (ctrl)
 # else
-	if (meta) {
+	if (meta)
 # endif
-	    if (keysym == R->ks_bigfont) {
+          {
+	    if (keysym == R->ks_bigfont)
+              {
 		rxvt_change_font(aR_ 0, FONT_UP);
 		return;
-	    } else if (keysym == R->ks_smallfont) {
+	      }
+            else if (keysym == R->ks_smallfont)
+              {
 		rxvt_change_font(aR_ 0, FONT_DN);
 		return;
-	    }
-	}
+	      }
+	  }
 #endif
 
 	if (R->TermWin.saveLines) {
@@ -239,8 +230,8 @@
 # ifdef META8_OPTION
 		    if (R->meta_char == C0_ESC)
 # endif
-			R->tt_write(&ch, 1);
-		R->tt_write(kbuf0, l);
+			R->tt_write (&ch, 1);
+		R->tt_write (kbuf0, l);
 		return;
 	    } else
 #endif
@@ -574,7 +565,7 @@
 #endif
 	/* nil */ ;
 	}
-    }
+      }
 
     if (len <= 0)
 	return;			/* not mapped */
@@ -1157,7 +1148,6 @@
     Window          unused_root, unused_child;
     int             unused_root_x, unused_root_y;
     unsigned int    unused_mask;
-    struct timeval  tp;
 
 #ifdef DEBUG_X
     const char *const eventnames[] =
@@ -1198,49 +1188,16 @@
 	"ClientMessage",
 	"MappingNotify"
     };
-    struct tm      *ltt;
-#endif
-
-    /*
-     * check if we need to get the time for any timeouts
-     */
-
-    for (i = NUM_TIMEOUTS; i--; )
-	if (R->timeout[i].tv_sec) {
-	    want_timeout = 1;
-	    break;
-	}
-
-#ifndef DEBUG_X
-    if (want_timeout)
 #endif
-	(void)gettimeofday(&tp, NULL);
 
 #ifdef DEBUG_X
+    struct timeval  tp;
+    struct tm      *ltt;
+    (void)gettimeofday(&tp, NULL);
     ltt = localtime(&(tp.tv_sec));
     D_X((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev->type], (ev->xany.window == R->TermWin.parent[0] ? "parent" : (ev->xany.window == R->TermWin.vt ? "vt" : (ev->xany.window == R->scrollBar.win ? "scroll" : (ev->xany.window == R->menuBar.win ? "menubar" : "UNKNOWN")))), (ev->xany.window == R->TermWin.parent[0] ? R->TermWin.parent[0] : (ev->xany.window == R->TermWin.vt ? R->TermWin.vt : (ev->xany.window == R->scrollBar.win ? R->scrollBar.win : (ev->xany.window == R->menuBar.win ? R->menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev->xany.send_event ? "S" : " ", ev->xany.serial));
 #endif
 
-    /* X event timeouts */
-    if (want_timeout)
-	for (i = NUM_TIMEOUTS; i--; ) {
-	    if (R->timeout[i].tv_sec == 0)
-		continue;
-	    if ((tp.tv_sec < R->timeout[i].tv_sec)
-		|| (tp.tv_sec == R->timeout[i].tv_sec
-		    && tp.tv_usec < R->timeout[i].tv_usec))
-		continue;
-	    R->timeout[i].tv_sec = 0;
-	    switch(i) {
-	    case TIMEOUT_INCR:
-		rxvt_print_error("data loss: timeout on INCR selection paste");
-		R->selection_wait = Sel_none;
-		break;
-	    default:
-		break;
-	    }
-	}
-
     switch (ev->type) {
     case KeyPress:
 	rxvt_lookup_key(aR_ (XKeyEvent *)ev);