--- sourceforge.net/trunk/rdesktop/xkeymap.c	2003/12/08 15:28:24	553
+++ sourceforge.net/trunk/rdesktop/xkeymap.c	2006/03/27 08:17:34	1199
@@ -1,8 +1,8 @@
-/*
+/* -*- c-basic-offset: 8 -*-
    rdesktop: A Remote Desktop Protocol client.
    User interface services - X keyboard mapping
 
-   Copyright (C) Matthew Chapman 1999-2002
+   Copyright (C) Matthew Chapman 1999-2005
    Copyright (C) Peter Astrand <peter@cendio.se> 2003
    
    This program is free software; you can redistribute it and/or modify
@@ -30,6 +30,7 @@
 #include <ctype.h>
 #include <limits.h>
 #include <time.h>
+#include <string.h>
 #include "rdesktop.h"
 #include "scancodes.h"
 
@@ -39,25 +40,43 @@
 
 extern Display *g_display;
 extern Window g_wnd;
-extern char keymapname[16];
-extern int keylayout;
+extern char g_keymapname[16];
+extern unsigned int g_keylayout;
+extern int g_keyboard_type;
+extern int g_keyboard_subtype;
+extern int g_keyboard_functionkeys;
 extern int g_win_button_size;
 extern BOOL g_enable_compose;
 extern BOOL g_use_rdp5;
 extern BOOL g_numlock_sync;
 
 static BOOL keymap_loaded;
-static key_translation keymap[KEYMAP_SIZE];
+static key_translation *keymap[KEYMAP_SIZE];
 static int min_keycode;
 static uint16 remote_modifier_state = 0;
 static uint16 saved_remote_modifier_state = 0;
 
 static void update_modifier_state(uint8 scancode, BOOL pressed);
 
+/* Free key_translation structure, including linked list */
+static void
+free_key_translation(key_translation * ptr)
+{
+	key_translation *next;
+
+	while (ptr)
+	{
+		next = ptr->next;
+		xfree(ptr);
+		ptr = next;
+	}
+}
+
 static void
 add_to_keymap(char *keyname, uint8 scancode, uint16 modifiers, char *mapname)
 {
 	KeySym keysym;
+	key_translation *tr;
 
 	keysym = XStringToKeysym(keyname);
 	if (keysym == NoSymbol)
@@ -69,19 +88,196 @@
 	DEBUG_KBD(("Adding translation, keysym=0x%x, scancode=0x%x, "
 		   "modifiers=0x%x\n", (unsigned int) keysym, scancode, modifiers));
 
-	keymap[keysym & KEYMAP_MASK].scancode = scancode;
-	keymap[keysym & KEYMAP_MASK].modifiers = modifiers;
+	tr = (key_translation *) xmalloc(sizeof(key_translation));
+	memset(tr, 0, sizeof(key_translation));
+	tr->scancode = scancode;
+	tr->modifiers = modifiers;
+	free_key_translation(keymap[keysym & KEYMAP_MASK]);
+	keymap[keysym & KEYMAP_MASK] = tr;
 
 	return;
 }
 
+static void
+add_sequence(char *rest, char *mapname)
+{
+	KeySym keysym;
+	key_translation *tr, **prev_next;
+	size_t chars;
+	char keyname[KEYMAP_MAX_LINE_LENGTH];
+
+	/* Skip over whitespace after the sequence keyword */
+	chars = strspn(rest, " \t");
+	rest += chars;
+
+	/* Fetch the keysym name */
+	chars = strcspn(rest, " \t\0");
+	STRNCPY(keyname, rest, chars + 1);
+	rest += chars;
+
+	keysym = XStringToKeysym(keyname);
+	if (keysym == NoSymbol)
+	{
+		DEBUG_KBD(("Bad keysym \"%s\" in keymap %s (ignoring line)\n", keyname, mapname));
+		return;
+	}
+
+
+	DEBUG_KBD(("Adding sequence for keysym (0x%lx, %s) -> ", keysym, keyname));
+
+	free_key_translation(keymap[keysym & KEYMAP_MASK]);
+	prev_next = &keymap[keysym & KEYMAP_MASK];
+
+	while (*rest)
+	{
+		/* Skip whitespace */
+		chars = strspn(rest, " \t");
+		rest += chars;
+
+		/* Fetch the keysym name */
+		chars = strcspn(rest, " \t\0");
+		STRNCPY(keyname, rest, chars + 1);
+		rest += chars;
+
+		keysym = XStringToKeysym(keyname);
+		if (keysym == NoSymbol)
+		{
+			DEBUG_KBD(("Bad keysym \"%s\" in keymap %s (ignoring line)\n", keyname,
+				   mapname));
+			return;
+		}
+
+		/* Allocate space for key_translation structure */
+		tr = (key_translation *) xmalloc(sizeof(key_translation));
+		memset(tr, 0, sizeof(key_translation));
+		*prev_next = tr;
+		prev_next = &tr->next;
+		tr->seq_keysym = keysym;
+
+		DEBUG_KBD(("0x%x, ", (unsigned int) keysym));
+	}
+	DEBUG_KBD(("\n"));
+}
+
+BOOL
+xkeymap_from_locale(const char *locale)
+{
+	char *str, *ptr;
+	FILE *fp;
+
+	/* Create a working copy */
+	str = xstrdup(locale);
+
+	/* Truncate at dot and at */
+	ptr = strrchr(str, '.');
+	if (ptr)
+		*ptr = '\0';
+	ptr = strrchr(str, '@');
+	if (ptr)
+		*ptr = '\0';
+
+	/* Replace _ with - */
+	ptr = strrchr(str, '_');
+	if (ptr)
+		*ptr = '-';
+
+	/* Convert to lowercase */
+	ptr = str;
+	while (*ptr)
+	{
+		*ptr = tolower((int) *ptr);
+		ptr++;
+	}
+
+	/* Try to open this keymap (da-dk) */
+	fp = xkeymap_open(str);
+	if (fp == NULL)
+	{
+		/* Truncate at dash */
+		ptr = strrchr(str, '-');
+		if (ptr)
+			*ptr = '\0';
+
+		/* Try the short name (da) */
+		fp = xkeymap_open(str);
+	}
+
+	if (fp)
+	{
+		fclose(fp);
+		STRNCPY(g_keymapname, str, sizeof(g_keymapname));
+		return True;
+	}
+
+	return False;
+}
+
+
+/* Joins two path components. The result should be freed with
+   xfree(). */
+static char *
+pathjoin(const char *a, const char *b)
+{
+	char *result;
+	result = xmalloc(PATH_MAX * 2 + 1);
+
+	if (b[0] == '/')
+	{
+		strncpy(result, b, PATH_MAX);
+	}
+	else
+	{
+		strncpy(result, a, PATH_MAX);
+		strcat(result, "/");
+		strncat(result, b, PATH_MAX);
+	}
+	return result;
+}
+
+/* Try to open a keymap with fopen() */
+FILE *
+xkeymap_open(const char *filename)
+{
+	char *path1, *path2;
+	char *home;
+	FILE *fp;
+
+	/* Try ~/.rdesktop/keymaps */
+	home = getenv("HOME");
+	if (home)
+	{
+		path1 = pathjoin(home, ".rdesktop/keymaps");
+		path2 = pathjoin(path1, filename);
+		xfree(path1);
+		fp = fopen(path2, "r");
+		xfree(path2);
+		if (fp)
+			return fp;
+	}
+
+	/* Try KEYMAP_PATH */
+	path1 = pathjoin(KEYMAP_PATH, filename);
+	fp = fopen(path1, "r");
+	xfree(path1);
+	if (fp)
+		return fp;
+
+	/* Try current directory, in case we are running from the source
+	   tree */
+	path1 = pathjoin("keymaps", filename);
+	fp = fopen(path1, "r");
+	xfree(path1);
+	if (fp)
+		return fp;
+
+	return NULL;
+}
 
 static BOOL
 xkeymap_read(char *mapname)
 {
 	FILE *fp;
 	char line[KEYMAP_MAX_LINE_LENGTH];
-	char path[PATH_MAX], inplace_path[PATH_MAX];
 	unsigned int line_num = 0;
 	unsigned int line_length = 0;
 	char *keyname, *p;
@@ -89,23 +285,11 @@
 	uint8 scancode;
 	uint16 modifiers;
 
-
-	strcpy(path, KEYMAP_PATH);
-	strncat(path, mapname, sizeof(path) - sizeof(KEYMAP_PATH));
-
-	fp = fopen(path, "r");
+	fp = xkeymap_open(mapname);
 	if (fp == NULL)
 	{
-		/* in case we are running from the source tree */
-		strcpy(inplace_path, "keymaps/");
-		strncat(inplace_path, mapname, sizeof(inplace_path) - sizeof("keymaps/"));
-
-		fp = fopen(inplace_path, "r");
-		if (fp == NULL)
-		{
-			error("Failed to open keymap %s\n", path);
-			return False;
-		}
+		error("Failed to open keymap %s\n", mapname);
+		return False;
 	}
 
 	/* FIXME: More tolerant on white space */
@@ -127,29 +311,62 @@
 		}
 
 		/* Include */
-		if (strncmp(line, "include ", 8) == 0)
+		if (str_startswith(line, "include "))
 		{
-			if (!xkeymap_read(line + 8))
+			if (!xkeymap_read(line + sizeof("include ") - 1))
 				return False;
 			continue;
 		}
 
 		/* map */
-		if (strncmp(line, "map ", 4) == 0)
+		if (str_startswith(line, "map "))
 		{
-			keylayout = strtol(line + 4, NULL, 16);
-			DEBUG_KBD(("Keylayout 0x%x\n", keylayout));
+			g_keylayout = strtoul(line + sizeof("map ") - 1, NULL, 16);
+			DEBUG_KBD(("Keylayout 0x%x\n", g_keylayout));
 			continue;
 		}
 
 		/* compose */
-		if (strncmp(line, "enable_compose", 15) == 0)
+		if (str_startswith(line, "enable_compose"))
 		{
 			DEBUG_KBD(("Enabling compose handling\n"));
 			g_enable_compose = True;
 			continue;
 		}
 
+		/* sequence */
+		if (str_startswith(line, "sequence"))
+		{
+			add_sequence(line + sizeof("sequence") - 1, mapname);
+			continue;
+		}
+
+		/* keyboard_type */
+		if (str_startswith(line, "keyboard_type "))
+		{
+			g_keyboard_type = strtol(line + sizeof("keyboard_type ") - 1, NULL, 16);
+			DEBUG_KBD(("keyboard_type 0x%x\n", g_keyboard_type));
+			continue;
+		}
+
+		/* keyboard_subtype */
+		if (str_startswith(line, "keyboard_subtype "))
+		{
+			g_keyboard_subtype =
+				strtol(line + sizeof("keyboard_subtype ") - 1, NULL, 16);
+			DEBUG_KBD(("keyboard_subtype 0x%x\n", g_keyboard_subtype));
+			continue;
+		}
+
+		/* keyboard_functionkeys */
+		if (str_startswith(line, "keyboard_functionkeys "))
+		{
+			g_keyboard_functionkeys =
+				strtol(line + sizeof("keyboard_functionkeys ") - 1, NULL, 16);
+			DEBUG_KBD(("keyboard_functionkeys 0x%x\n", g_keyboard_functionkeys));
+			continue;
+		}
+
 		/* Comment */
 		if (line[0] == '#')
 		{
@@ -225,19 +442,10 @@
 xkeymap_init(void)
 {
 	unsigned int max_keycode;
-	char *mapname_ptr;
-
-	/* Make keymapname lowercase */
-	mapname_ptr = keymapname;
-	while (*mapname_ptr)
-	{
-		*mapname_ptr = tolower((int) *mapname_ptr);
-		mapname_ptr++;
-	}
 
-	if (strcmp(keymapname, "none"))
+	if (strcmp(g_keymapname, "none"))
 	{
-		if (xkeymap_read(keymapname))
+		if (xkeymap_read(g_keymapname))
 			keymap_loaded = True;
 	}
 
@@ -293,8 +501,7 @@
 	}
 }
 
-/* Handles, for example, multi-scancode keypresses (which is not
-   possible via keymap-files) */
+/* Handle special key combinations */
 BOOL
 handle_special_keys(uint32 keysym, unsigned int state, uint32 ev_time, BOOL pressed)
 {
@@ -372,11 +579,20 @@
 			    && (get_key_state(state, XK_Alt_L) || get_key_state(state, XK_Alt_R)))
 				return True;
 			break;
+
 		case XK_Num_Lock:
-			/* FIXME: We might want to do RDP_INPUT_SYNCHRONIZE here, if g_numlock_sync */
-			if (!g_numlock_sync)
-				/* Inhibit */
-				return True;
+			/* Synchronize on key release */
+			if (g_numlock_sync && !pressed)
+				rdp_send_input(0, RDP_INPUT_SYNCHRONIZE, 0,
+					       ui_get_numlock_state(read_keyboard_state()), 0);
+
+			/* Inhibit */
+			return True;
+			break;
+		case XK_Overlay1_Enable:
+			/* Toggle SeamlessRDP */
+			if (pressed)
+				ui_seamless_toggle();
 			break;
 
 	}
@@ -387,58 +603,123 @@
 key_translation
 xkeymap_translate_key(uint32 keysym, unsigned int keycode, unsigned int state)
 {
-	key_translation tr = { 0, 0 };
-
-	tr = keymap[keysym & KEYMAP_MASK];
+	key_translation tr = { 0, 0, 0, 0 };
+	key_translation *ptr;
 
-	if (tr.modifiers & MapInhibitMask)
+	ptr = keymap[keysym & KEYMAP_MASK];
+	if (ptr)
 	{
-		DEBUG_KBD(("Inhibiting key\n"));
-		tr.scancode = 0;
-		return tr;
-	}
+		tr = *ptr;
+		if (tr.seq_keysym == 0)	/* Normal scancode translation */
+		{
+			if (tr.modifiers & MapInhibitMask)
+			{
+				DEBUG_KBD(("Inhibiting key\n"));
+				tr.scancode = 0;
+				return tr;
+			}
+
+			if (tr.modifiers & MapLocalStateMask)
+			{
+				/* The modifiers to send for this key should be obtained
+				   from the local state. Currently, only shift is implemented. */
+				if (state & ShiftMask)
+				{
+					tr.modifiers = MapLeftShiftMask;
+				}
+			}
+
+			if ((tr.modifiers & MapLeftShiftMask)
+			    && ((remote_modifier_state & MapLeftCtrlMask)
+				|| (remote_modifier_state & MapRightCtrlMask))
+			    && get_key_state(state, XK_Caps_Lock))
+			{
+				DEBUG_KBD(("CapsLock + Ctrl pressed, releasing LeftShift\n"));
+				tr.modifiers ^= MapLeftShiftMask;
+			}
 
-	if (tr.modifiers & MapLocalStateMask)
+			DEBUG_KBD(("Found scancode translation, scancode=0x%x, modifiers=0x%x\n",
+				   tr.scancode, tr.modifiers));
+		}
+	}
+	else
 	{
-		/* The modifiers to send for this key should be obtained
-		   from the local state. Currently, only shift is implemented. */
-		if (state & ShiftMask)
+		if (keymap_loaded)
+			warning("No translation for (keysym 0x%lx, %s)\n", keysym,
+				get_ksname(keysym));
+
+		/* not in keymap, try to interpret the raw scancode */
+		if (((int) keycode >= min_keycode) && (keycode <= 0x60))
+		{
+			tr.scancode = keycode - min_keycode;
+
+			/* The modifiers to send for this key should be
+			   obtained from the local state. Currently, only
+			   shift is implemented. */
+			if (state & ShiftMask)
+			{
+				tr.modifiers = MapLeftShiftMask;
+			}
+
+			DEBUG_KBD(("Sending guessed scancode 0x%x\n", tr.scancode));
+		}
+		else
 		{
-			tr.modifiers = MapLeftShiftMask;
+			DEBUG_KBD(("No good guess for keycode 0x%x found\n", keycode));
 		}
 	}
 
-	if (tr.scancode != 0)
-	{
-		DEBUG_KBD(("Found key translation, scancode=0x%x, modifiers=0x%x\n",
-			   tr.scancode, tr.modifiers));
-		return tr;
-	}
+	return tr;
+}
 
-	if (keymap_loaded)
-		warning("No translation for (keysym 0x%lx, %s)\n", keysym, get_ksname(keysym));
+void
+xkeymap_send_keys(uint32 keysym, unsigned int keycode, unsigned int state, uint32 ev_time,
+		  BOOL pressed, uint8 nesting)
+{
+	key_translation tr, *ptr;
+	tr = xkeymap_translate_key(keysym, keycode, state);
 
-	/* not in keymap, try to interpret the raw scancode */
-	if (((int) keycode >= min_keycode) && (keycode <= 0x60))
+	if (tr.seq_keysym == 0)
 	{
-		tr.scancode = keycode - min_keycode;
+		/* Scancode translation */
+		if (tr.scancode == 0)
+			return;
 
-		/* The modifiers to send for this key should be
-		   obtained from the local state. Currently, only
-		   shift is implemented. */
-		if (state & ShiftMask)
+		if (pressed)
 		{
-			tr.modifiers = MapLeftShiftMask;
+			save_remote_modifiers(tr.scancode);
+			ensure_remote_modifiers(ev_time, tr);
+			rdp_send_scancode(ev_time, RDP_KEYPRESS, tr.scancode);
+			restore_remote_modifiers(ev_time, tr.scancode);
 		}
-
-		DEBUG_KBD(("Sending guessed scancode 0x%x\n", tr.scancode));
+		else
+		{
+			rdp_send_scancode(ev_time, RDP_KEYRELEASE, tr.scancode);
+		}
+		return;
 	}
-	else
+
+	/* Sequence, only on key down */
+	if (pressed)
 	{
-		DEBUG_KBD(("No good guess for keycode 0x%x found\n", keycode));
-	}
+		ptr = &tr;
+		do
+		{
+			DEBUG_KBD(("Handling sequence element, keysym=0x%x\n",
+				   (unsigned int) ptr->seq_keysym));
 
-	return tr;
+			if (nesting++ > 32)
+			{
+				error("Sequence nesting too deep\n");
+				return;
+			}
+
+			xkeymap_send_keys(ptr->seq_keysym, keycode, state, ev_time, True, nesting);
+			xkeymap_send_keys(ptr->seq_keysym, keycode, state, ev_time, False, nesting);
+			ptr = ptr->next;
+		}
+		while (ptr);
+	}
 }
 
 uint16
@@ -602,12 +883,16 @@
 unsigned int
 read_keyboard_state()
 {
+#ifdef RDP2VNC
+	return 0;
+#else
 	unsigned int state;
 	Window wdummy;
 	int dummy;
 
 	XQueryPointer(g_display, g_wnd, &wdummy, &wdummy, &dummy, &dummy, &dummy, &dummy, &state);
 	return state;
+#endif
 }
 
 
@@ -652,7 +937,8 @@
 		rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_LALT);
 
 	if (MASK_HAS_BITS(remote_modifier_state, MapRightAltMask) &&
-	    !get_key_state(state, XK_Alt_R) && !get_key_state(state, XK_Mode_switch))
+	    !get_key_state(state, XK_Alt_R) && !get_key_state(state, XK_Mode_switch)
+	    && !get_key_state(state, XK_ISO_Level3_Shift))
 		rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_RALT);
 
 	reset_winkey(ev_time);