# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1225397408 0
# Node ID 878ad37e5a18ea3b45f3ac02e4637d9589177c63
# Parent  6925498cadc8cdd22bd36fa315aa77466880fe33# Parent  23687caad265d8852ddd08843cafc6f558c685e1
merge of '06a7529af082c664858fd154ff5d83244e974f47'
     and 'e017ef61e76c96af0a324ab890f2e6783a8af023'

diff -r 6925498cadc8 -r 878ad37e5a18 ChangeLog
--- a/ChangeLog	Thu Oct 30 20:09:07 2008 +0000
+++ b/ChangeLog	Thu Oct 30 20:10:08 2008 +0000
@@ -18,6 +18,10 @@
 	  of zero), add this to ~/.purple/gtkrc-2.0:
 	      gtk-enable-tooltips = 0
 
+	Finch:
+	* Allow binding meta+arrow keys for actions.
+
+
 version 2.5.2 (10/19/2008):
 	libpurple:
 	* Fixed a crash on removing a custom buddy icon on a buddy.
diff -r 6925498cadc8 -r 878ad37e5a18 finch/libgnt/gntkeys.c
--- a/finch/libgnt/gntkeys.c	Thu Oct 30 20:09:07 2008 +0000
+++ b/finch/libgnt/gntkeys.c	Thu Oct 30 20:10:08 2008 +0000
@@ -102,7 +102,12 @@
 #define INSERT_COMB(k, code) do { \
 		snprintf(key, sizeof(key), "%s%s%s", controls[c], alts[a], k);  \
 		INSERT_KEY(key, code);  \
-	} while (0);
+	} while (0)
+#define INSERT_COMB_CODE(k, c1, c2) do { \
+		char __[32]; \
+		snprintf(__, sizeof(__), "%s%s", c1, c2); \
+		INSERT_COMB(k, __); \
+	} while (0)
 
 	/* Lower-case alphabets */
 	for (a = 0, c = 0; controls[c]; c++, a = 0) {
@@ -124,6 +129,10 @@
 			}
 			if (c == 0) {
 				INSERT_COMB("tab", "\033\t");
+				INSERT_COMB_CODE("up", "\033", GNT_KEY_UP);
+				INSERT_COMB_CODE("down", "\033", GNT_KEY_DOWN);
+				INSERT_COMB_CODE("left", "\033", GNT_KEY_LEFT);
+				INSERT_COMB_CODE("right", "\033", GNT_KEY_RIGHT);
 			}
 		}
 	}
@@ -144,6 +153,8 @@
 
 void gnt_keys_refine(char *text)
 {
+	while (*text == 27 && *(text + 1) == 27)
+		text++;
 	if (*text == 27 && *(text + 1) == '[' &&
 			(*(text + 2) >= 'A' && *(text + 2) <= 'D')) {
 		/* Apparently this is necessary for urxvt and screen and xterm */