[Gaim-commits] SF.net SVN: gaim: [17750] trunk/console/libgnt/gntkeys.c

[<sa...@us...>]

Revision: 17750
          http://svn.sourceforge.net/gaim/?rev=17750&view=rev
Author:   sadrul
Date:     2006-11-14 23:18:16 -0800 (Tue, 14 Nov 2006)

Log Message:
-----------
Fix bug #1596631: keybinding not working with xterm

Modified Paths:
--------------
    trunk/console/libgnt/gntkeys.c

Modified: trunk/console/libgnt/gntkeys.c
===================================================================
--- trunk/console/libgnt/gntkeys.c	2006-11-15 06:00:51 UTC (rev 17749)
+++ trunk/console/libgnt/gntkeys.c	2006-11-15 07:18:16 UTC (rev 17750)
@@ -3,17 +3,27 @@
 #include <stdlib.h>
 #include <string.h>
 
-const char *term;
+static const char *term;
 
 void gnt_keys_refine(char *text)
 {
+	if (term == NULL) {
+		term = getenv("TERM");
+		if (!term)
+			term = "";  /* Just in case */
+	}
+
 	if (*text == 27 && *(text + 1) == '[' && *(text + 3) == '\0' &&
 			(*(text + 2) >= 'A' || *(text + 2) <= 'D')) {
-		if (term == NULL)
-			term = getenv("TERM");
-		/* Apparently this is necessary for urxvt and screen */
-		if (strcmp(term, "screen") == 0 || strcmp(term, "rxvt-unicode") == 0)
+		/* Apparently this is necessary for urxvt and screen and xterm */
+		if (strcmp(term, "screen") == 0 || strcmp(term, "rxvt-unicode") == 0 ||
+				strcmp(term, "xterm") == 0)
 			*(text + 1) = 'O';
+	} else if (*(unsigned char*)text == 195) {
+		if (*(text + 2) == 0 && strcmp(term, "xterm") == 0) {
+			*(text) = 27;
+			*(text + 1) -= 64;  /* Say wha? */
+		}
 	}
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.