*** empty log message ***

diff --git a/Changes b/Changes
index 7e48e33..d7917d3 100644 (file)
--- a/Changes
+++ b/Changes
@@ -8,6 +8,9 @@
           crashes when you kill your input method (xterm et al. also crash).
         - fix bugs in x flushing, causing an empty screen after startup
         - fix various memleaks in rxvtd.
+        - fix a bug that kept escape codes to be generated for some
+          keysyms that also have string translations, when not --enable-xim.
+          reported by joel reed.
         - countless minor bugfixes.
 
 1.8  Mon Feb  2 20:09:18 CET 2004

diff --git a/src/command.C b/src/command.C
index 540f9f2..08c6fe6 100644 (file)
--- a/src/command.C
+++ b/src/command.C
@@ -27,6 +27,7 @@
  * Copyright (c) 2001      Marius Gedminas
  *                             - Ctrl/Mod4+Tab works like Meta+Tab (options)
  * Copyright (c) 2003      Rob McMullen <robm@flipturn.org>
+ * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -57,13 +58,13 @@
 void
 rxvt_term::lookup_key (XKeyEvent &ev)
 {
-  int             ctrl, meta, shft, len;
-  unsigned int    newlen;
-  KeySym          keysym;
+  int ctrl, meta, shft, len;
+  unsigned int newlen;
+  KeySym keysym;
 #ifdef DEBUG_CMD
-  static int      debug_key = 1;       /* accessible by a debugger only */
+  static int debug_key = 1;    /* accessible by a debugger only */
 #endif
-  int             valid_keysym;
+  int valid_keysym;
   unsigned char kbuf[KBUFSZ];
 
   /*
@@ -95,7 +96,6 @@ rxvt_term::lookup_key (XKeyEvent &ev)
                                  KBUFSZ, &keysym, &status_return);
       else
 #endif
-
         {
           wchar_t wkbuf[KBUFSZ + 1];
 
@@ -110,7 +110,7 @@ rxvt_term::lookup_key (XKeyEvent &ev)
             SET_LOCALE (locale);
 
           if (status_return == XLookupChars
-                            || status_return == XLookupBoth)
+              || status_return == XLookupBoth)
             {
               wkbuf[len] = 0;
               len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
@@ -122,14 +122,13 @@ rxvt_term::lookup_key (XKeyEvent &ev)
         }
 
       valid_keysym = status_return == XLookupKeySym
-                                   || status_return == XLookupBoth;
+                     || status_return == XLookupBoth;
     }
   else
 #endif
-
     {
       len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose);
-      valid_keysym = !len;
+      valid_keysym = keysym != NoSymbol;
     }
 
   if (valid_keysym)
@@ -164,7 +163,7 @@ rxvt_term::lookup_key (XKeyEvent &ev)
           if (IS_SCROLL_MOD)
             {
 #endif
-              int             lnsppg;
+              int lnsppg;
 
 #ifdef PAGING_CONTEXT_LINES
               lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
@@ -212,7 +211,6 @@ rxvt_term::lookup_key (XKeyEvent &ev)
                 }
             }
 #endif
-
         }
 
       if (shft)
@@ -288,7 +286,6 @@ rxvt_term::lookup_key (XKeyEvent &ev)
             }
           else
 #endif
-
             {
               newlen = 1;
               switch (keysym)
@@ -351,7 +348,6 @@ rxvt_term::lookup_key (XKeyEvent &ev)
                       }
                     break;
 
-
 #ifdef XK_KP_Left
                   case XK_KP_Up:               /* \033Ox or standard */
                   case XK_KP_Down:     /* \033Or or standard */
@@ -484,7 +480,7 @@ rxvt_term::lookup_key (XKeyEvent &ev)
                     break;
 
                   case XK_KP_Multiply: /* "\033Oj" : "*" */
-                  case XK_KP_Add:              /* "\033Ok" : "+" */
+                  case XK_KP_Add:      /* "\033Ok" : "+" */
                   case XK_KP_Separator:        /* "\033Ol" : "," */
                   case XK_KP_Subtract: /* "\033Om" : "-" */
                   case XK_KP_Decimal:  /* "\033On" : "." */

diff --git a/src/defaultfont.C b/src/defaultfont.C
index 864a757..736d4a0 100644 (file)
--- a/src/defaultfont.C
+++ b/src/defaultfont.C
@@ -1,7 +1,7 @@
 /*--------------------------------*-C-*---------------------------------*;
  * File:       defaultfont.C
  *----------------------------------------------------------------------*
- * Copyright (c) 2003      Marc Lehmann rxvt@plan9.de>
+ * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
  *                             - original version.
  *
  * This program is free software; you can redistribute it and/or modify

diff --git a/src/init.C b/src/init.C
index b5011f9..bd13379 100644 (file)
--- a/src/init.C
+++ b/src/init.C
@@ -11,6 +11,7 @@
  *                              - extensive modifications
  * Copyright (c) 1999      D J Hawkey Jr <hawkeyd@visi.com>
  *                              - QNX support
+ * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/src/main.C b/src/main.C
index 16542f0..c4638d9 100644 (file)
--- a/src/main.C
+++ b/src/main.C
@@ -13,6 +13,7 @@
  * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
  * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
  *                              - extensive modifications
+ * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by