--- sourceforge.net/trunk/rdesktop/xwin.c	2002/07/18 16:38:31	64
+++ sourceforge.net/trunk/rdesktop/xwin.c	2002/09/18 12:13:08	185
@@ -20,21 +20,23 @@
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
-#include <X11/XKBlib.h>
 #include <time.h>
 #include <errno.h>
+#define XK_MISCELLANY
+#include <X11/keysymdef.h>
 #include "rdesktop.h"
+#include "scancodes.h"
 
-extern char keymapname[16];
-extern int keylayout;
 extern int width;
 extern int height;
 extern BOOL sendmotion;
 extern BOOL fullscreen;
+extern BOOL grab_keyboard;
+extern char title[];
 
 Display *display;
-XkbDescPtr xkb;
 static int x_socket;
+static Screen *screen;
 static Window wnd;
 static GC gc;
 static Visual *visual;
@@ -49,23 +51,6 @@
 static BOOL ownbackstore;
 static Pixmap backstore;
 
-/* needed to keep track of the modifiers */
-static unsigned int numlock_modifier_mask = 0;
-static unsigned int key_down_state = 0;
-
-
-#define DShift1Mask   (1<<0)
-#define DLockMask     (1<<1)
-#define DControl1Mask (1<<2)
-#define DMod1Mask     (1<<3)
-#define DMod2Mask     (1<<4)
-#define DMod3Mask     (1<<5)
-#define DMod4Mask     (1<<6)
-#define DMod5Mask     (1<<7)
-#define DShift2Mask   (1<<8)
-#define DControl2Mask (1<<9)
-#define DNumLockMask  (1<<10)
-
 #define FILL_RECTANGLE(x,y,cx,cy)\
 { \
 	XFillRectangle(display, wnd, gc, x, y, cx, cy); \
@@ -74,14 +59,19 @@
 }
 
 /* colour maps */
-static BOOL owncolmap;
 static Colormap xcolmap;
-static uint32 white;
 static uint32 *colmap;
 
-#define TRANSLATE(col)		( owncolmap ? col : translate_colour(colmap[col]) )
-#define SET_FOREGROUND(col)	XSetForeground(display, gc, TRANSLATE(col));
-#define SET_BACKGROUND(col)	XSetBackground(display, gc, TRANSLATE(col));
+/* Compose support */
+BOOL enable_compose = False;
+static XIM IM = NULL;
+static XIC IC = NULL;
+
+/* toggle fullscreen globals */
+static unsigned long input_mask;
+
+#define SET_FOREGROUND(col)	XSetForeground(display, gc, translate_colour(colmap[col]));
+#define SET_BACKGROUND(col)	XSetBackground(display, gc, translate_colour(colmap[col]));
 
 static int rop2_map[] = {
 	GXclear,		/* 0 */
@@ -105,11 +95,6 @@
 #define SET_FUNCTION(rop2)	{ if (rop2 != ROP2_COPY) XSetFunction(display, gc, rop2_map[rop2]); }
 #define RESET_FUNCTION(rop2)	{ if (rop2 != ROP2_COPY) XSetFunction(display, gc, GXcopy); }
 
-void xwin_get_numlock_mask();
-void xwin_mod_update(uint32 state, uint32 ev_time);
-void xwin_mod_release(uint32 state, uint32 ev_time, uint32 scancode);
-void xwin_mod_press(uint32 state, uint32 ev_time, uint32 scancode);
-
 static void
 translate8(uint8 * data, uint8 * out, uint8 * end)
 {
@@ -204,53 +189,115 @@
 	return colour;
 }
 
-BOOL
-ui_create_window(char *title)
+static unsigned long
+init_inputmethod(void)
 {
-	XSetWindowAttributes attribs;
-	XClassHint *classhints;
-	XSizeHints *sizehints;
-	unsigned long input_mask;
-	XPixmapFormatValues *pfm;
-	Screen *screen;
-	uint16 test;
-	int i;
+	unsigned long filtered_events = 0;
 
-	int xkb_minor, xkb_major;
-	int xkb_event, xkb_error, xkb_reason;
+	IM = XOpenIM(display, NULL, NULL, NULL);
+	if (IM == NULL)
+	{
+		error("Failed to open input method\n");
+	}
 
-	/* compare compiletime libs with runtime libs. */
-	xkb_major = XkbMajorVersion;
-	xkb_minor = XkbMinorVersion;
-	if (XkbLibraryVersion(&xkb_major, &xkb_minor) == False)
+	if (IM != NULL)
 	{
-		error("please re-compile rdesktop\ncompile time version of xkb is not compatible with\nyour runtime version of the library\n");
-		return False;
+		/* Must be done after XCreateWindow */
+		IC = XCreateIC(IM, XNInputStyle,
+			       (XIMPreeditNothing | XIMStatusNothing),
+			       XNClientWindow, wnd, XNFocusWindow, wnd, NULL);
+
+		if (IC == NULL)
+		{
+			error("Failed to create input context\n");
+			XCloseIM(IM);
+			IM = NULL;
+		}
 	}
 
+	/* For correct Multi_key/Compose processing, I guess.
+	   It seems to work alright anyway, though. */
+	if (IC != NULL)
+	{
+		if (XGetICValues(IC, XNFilterEvents, &filtered_events, NULL) != NULL)
+		{
+			error("Failed to obtain XNFilterEvents value from IC\n");
+			filtered_events = 0;
+		}
+	}
+	return filtered_events;
+}
 
-	display =
-		XkbOpenDisplay(NULL, &xkb_event, &xkb_error, &xkb_major,
-			       &xkb_minor, &xkb_reason);
-	switch (xkb_reason)
+static void
+close_inputmethod(void)
+{
+	if (IC != NULL)
 	{
-		case XkbOD_BadLibraryVersion:
-			error("XkbOD_BadLibraryVersion: XKB extensions in server and the library rdesktop is linked against aren't compatible with each other.\n");
-			break;
-		case XkbOD_ConnectionRefused:
-			error("XkbOD_ConnectionRefused\n");
-			break;
-		case XkbOD_BadServerVersion:
-			error("XkbOD_BadServerVersion\n");
-			break;
-		case XkbOD_NonXkbServer:
-			error("XkbOD_NonXkbServer: XKB extension not present in server\nupdate your X server.\n");
-			break;
-		case XkbOD_Success:
-			DEBUG("XkbOD_Success: Connection established with display\n");
-			break;
+		XDestroyIC(IC);
+		if (IM != NULL)
+		{
+			XCloseIM(IM);
+			IM = NULL;
+		}
+	}
+}
+
+BOOL
+get_key_state(int keysym)
+{
+	int keysymMask = 0, modifierpos, key;
+	Window wDummy1, wDummy2;
+	int iDummy3, iDummy4, iDummy5, iDummy6;
+	unsigned int current_state;
+	int offset;
+
+	XModifierKeymap *map = XGetModifierMapping(display);
+	KeyCode keycode = XKeysymToKeycode(display, keysym);
+
+	if (keycode == NoSymbol)
+		return False;
+
+	for (modifierpos = 0; modifierpos < 8; modifierpos++)
+	{
+		offset = map->max_keypermod * modifierpos;
+
+		for (key = 0; key < map->max_keypermod; key++)
+		{
+			if (map->modifiermap[offset + key] == keycode)
+				keysymMask = 1 << modifierpos;
+		}
 	}
 
+	XQueryPointer(display, DefaultRootWindow(display), &wDummy1,
+		      &wDummy2, &iDummy3, &iDummy4, &iDummy5, &iDummy6, &current_state);
+
+	XFreeModifiermap(map);
+
+	return (current_state & keysymMask) ? True : False;
+}
+
+static void
+xwin_map_window()
+{
+	XEvent xevent;
+
+	XMapWindow(display, wnd);
+
+	/* wait for VisibilityChange */
+	XMaskEvent(display, VisibilityChangeMask, &xevent);
+
+	if (fullscreen)
+		XSetInputFocus(display, wnd, RevertToPointerRoot, CurrentTime);
+}
+
+BOOL
+ui_init()
+{
+	XPixmapFormatValues *pfm;
+	uint16 test;
+	int i;
+
+	display = XOpenDisplay(NULL);
 	if (display == NULL)
 	{
 		error("Failed to open display\n");
@@ -269,8 +316,7 @@
 		   desirable, e.g. 24 bits->32 bits. */
 		while (i--)
 		{
-			if ((pfm[i].depth == depth)
-			    && (pfm[i].bits_per_pixel > bpp))
+			if ((pfm[i].depth == depth) && (pfm[i].bits_per_pixel > bpp))
 			{
 				bpp = pfm[i].bits_per_pixel;
 			}
@@ -285,40 +331,45 @@
 		return False;
 	}
 
-	if (depth <= 8)
-		owncolmap = True;
-	else
-		xcolmap = DefaultColormapOfScreen(screen);
+	xcolmap = DefaultColormapOfScreen(screen);
+
+	if (DoesBackingStore(screen) == NotUseful)
+		ownbackstore = True;
 
 	test = 1;
 	host_be = !(BOOL) (*(uint8 *) (&test));
 	xserver_be = (ImageByteOrder(display) == MSBFirst);
 
-	white = WhitePixelOfScreen(screen);
-	attribs.background_pixel = BlackPixelOfScreen(screen);
-	attribs.backing_store = DoesBackingStore(screen);
-
-	if (attribs.backing_store == NotUseful)
-		ownbackstore = True;
-
 	if (fullscreen)
 	{
-		attribs.override_redirect = True;
 		width = WidthOfScreen(screen);
 		height = HeightOfScreen(screen);
 	}
-	else
-	{
-		attribs.override_redirect = False;
-	}
 
-	width = (width + 3) & ~3;	/* make width a multiple of 32 bits */
+	/* make sure width is a multiple of 4 */
+	width = (width + 3) & ~3;
 
-	wnd = XCreateWindow(display, RootWindowOfScreen(screen),
-			    0, 0, width, height, 0, CopyFromParent,
-			    InputOutput, CopyFromParent,
-			    CWBackingStore | CWBackPixel | CWOverrideRedirect,
-			    &attribs);
+	xkeymap_init();
+	return True;
+}
+
+BOOL
+ui_create_window()
+{
+	XSetWindowAttributes attribs;
+	XClassHint *classhints;
+	XSizeHints *sizehints;
+	XEvent xevent;
+
+	attribs.background_pixel = BlackPixelOfScreen(screen);
+	attribs.backing_store = ownbackstore ? NotUseful : Always;
+	attribs.override_redirect = fullscreen;
+	wnd = XCreateWindow(display, RootWindowOfScreen(screen), 0, 0, width, height,
+			    0, CopyFromParent, InputOutput, CopyFromParent,
+			    CWBackPixel | CWBackingStore | CWOverrideRedirect, &attribs);
+
+	if (ownbackstore)
+		backstore = XCreatePixmap(display, wnd, width, height, depth);
 
 	XStoreName(display, wnd, title);
 
@@ -340,158 +391,148 @@
 		XFree(sizehints);
 	}
 
-	xkeymap_init();
+	input_mask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
+		VisibilityChangeMask | FocusChangeMask;
 
-	input_mask = KeyPressMask | KeyReleaseMask |
-		ButtonPressMask | ButtonReleaseMask |
-		EnterWindowMask | LeaveWindowMask;
+	if (grab_keyboard)
+		input_mask |= EnterWindowMask | LeaveWindowMask;
 	if (sendmotion)
 		input_mask |= PointerMotionMask;
-
 	if (ownbackstore)
 		input_mask |= ExposureMask;
+	if (enable_compose)
+		input_mask |= init_inputmethod();
 
 	XSelectInput(display, wnd, input_mask);
-	gc = XCreateGC(display, wnd, 0, NULL);
-
-	if (ownbackstore)
-		backstore = XCreatePixmap(display, wnd, width, height, depth);
-
-	XMapWindow(display, wnd);
-
-	/* TODO: error texts... make them friendly. */
-	xkb = XkbGetKeyboard(display, XkbAllComponentsMask, XkbUseCoreKbd);
-	if ((int) xkb == BadAlloc || xkb == NULL)
-	{
-		error("XkbGetKeyboard failed.\n");
-		exit(0);
-	}
 
-	/* TODO: error texts... make them friendly. */
-	if (XkbSelectEvents
-	    (display, xkb->device_spec, XkbAllEventsMask,
-	     XkbAllEventsMask) == False)
-	{
-		error("XkbSelectEvents failed.\n");
-		exit(0);
-	}
+	xwin_map_window();
 
-	xwin_get_numlock_mask();
+	/* clear the window so that cached data is not seen */
+	gc = XCreateGC(display, wnd, 0, NULL);
+	XSetForeground(display, gc, 0);
+	FILL_RECTANGLE(0, 0, width, height);
 
 	return True;
 }
 
 void
-xwin_get_numlock_mask()
+ui_destroy_window()
 {
-	KeyCode numlockcode;
-	KeyCode *keycode;
-	XModifierKeymap *modmap;
-	int i, j;
+	if (ownbackstore)
+		XFreePixmap(display, backstore);
 
-	/* Find out if numlock is already defined as a modifier key, and if so where */
-	numlockcode = XKeysymToKeycode(display, 0xFF7F);	/* XF_Num_Lock = 0xFF7F */
-	if (numlockcode)
-	{
-		modmap = XGetModifierMapping(display);
-		if (modmap)
-		{
-			keycode = modmap->modifiermap;
-			for (i = 0; i < 8; i++)
-				for (j = modmap->max_keypermod; j--;)
-				{
-					if (*keycode == numlockcode)
-					{
-						numlock_modifier_mask =
-							(1 << i);
-						i = 8;
-						break;
-					}
-					keycode++;
-				}
-			if (!numlock_modifier_mask)
-			{
-				modmap->modifiermap[7 *
-						    modmap->max_keypermod] =
-					numlockcode;
-				if (XSetModifierMapping(display, modmap) ==
-				    MappingSuccess)
-					numlock_modifier_mask = (1 << 7);
-				else
-					printf("XSetModifierMapping failed!\n");
-			}
-			XFreeModifiermap(modmap);
-		}
-	}
+	XFreeGC(display, gc);
 
-	if (!numlock_modifier_mask)
-		printf("WARNING: Failed to get a numlock modifier mapping.\n");
+	close_inputmethod();
 
+	XDestroyWindow(display, wnd);
+	XCloseDisplay(display);
+	display = NULL;
 }
 
+
 void
-ui_destroy_window()
+xwin_toggle_fullscreen()
 {
-	if (xkb != NULL)
-		XkbFreeKeyboard(xkb, XkbAllControlsMask, True);
+	XEvent xevent;
+	XSetWindowAttributes attribs;
+	int newwidth, newheight;
 
-	if (ownbackstore)
-		XFreePixmap(display, backstore);
+	fullscreen = !fullscreen;
+	newwidth = fullscreen ? WidthOfScreen(screen) : width;
+	newheight = fullscreen ? HeightOfScreen(screen) : height;
 
-	XFreeGC(display, gc);
-	XDestroyWindow(display, wnd);
-	XCloseDisplay(display);
-	display = NULL;
+	XUnmapWindow(display, wnd);
+	attribs.override_redirect = fullscreen;
+	XMoveResizeWindow(display, wnd, 0, 0, newwidth, newheight);
+	XChangeWindowAttributes(display, wnd, CWOverrideRedirect, &attribs);
+	xwin_map_window();
 }
 
+/* Process all events in Xlib queue */
 static void
 xwin_process_events()
 {
 	XEvent xevent;
-
 	KeySym keysym;
-	uint8 scancode;
 	uint16 button, flags;
 	uint32 ev_time;
-	uint32 tmpmods;
+	key_translation tr;
+	char *ksname = NULL;
+	char str[256];
+	Status status;
 
-	while (XCheckMaskEvent(display, ~0, &xevent))
+	while (XPending(display) > 0)
 	{
+		XNextEvent(display, &xevent);
+
+		if (enable_compose && (XFilterEvent(&xevent, None) == True))
+		{
+			DEBUG_KBD(("Filtering event\n"));
+			continue;
+		}
+
 		ev_time = time(NULL);
 		flags = 0;
 
 		switch (xevent.type)
 		{
-			case KeyRelease:
-				flags = KBD_FLAG_DOWN | KBD_FLAG_UP;
-				/* fall through */
 			case KeyPress:
-				if (XkbTranslateKeyCode
-				    (xkb, xevent.xkey.keycode,
-				     xevent.xkey.state, &tmpmods,
-				     &keysym) == False)
+				if (IC != NULL)
+					/* Multi_key compatible version */
+				{
+					XmbLookupString(IC,
+							(XKeyPressedEvent *) &
+							xevent, str, sizeof(str), &keysym, &status);
+					if (!((status == XLookupKeySym) || (status == XLookupBoth)))
+					{
+						error("XmbLookupString failed with status 0x%x\n",
+						      status);
+						break;
+					}
+				}
+				else
+				{
+					/* Plain old XLookupString */
+					DEBUG_KBD(("\nNo input context, using XLookupString\n"));
+					XLookupString((XKeyEvent *) & xevent,
+						      str, sizeof(str), &keysym, NULL);
+				}
+
+				ksname = get_ksname(keysym);
+				DEBUG_KBD(("KeyPress for (keysym 0x%lx, %s)\n", keysym, ksname));
+
+				if (handle_special_keys(keysym, ev_time, True))
+					break;
+
+				tr = xkeymap_translate_key(keysym,
+							   xevent.xkey.keycode, xevent.xkey.state);
+
+				if (tr.scancode == 0)
 					break;
-				scancode =
-					xkeymap_translate_key(keysym,
-							      xevent.xkey.
-							      keycode,
-							      &flags);
 
-				if (scancode == 0)
+				ensure_remote_modifiers(ev_time, tr);
+
+				rdp_send_scancode(ev_time, RDP_KEYPRESS, tr.scancode);
+				break;
+			case KeyRelease:
+				XLookupString((XKeyEvent *) & xevent, str,
+					      sizeof(str), &keysym, NULL);
+
+				ksname = get_ksname(keysym);
+				DEBUG_KBD(("\nKeyRelease for (keysym 0x%lx, %s)\n", keysym,
+					   ksname));
+
+				if (handle_special_keys(keysym, ev_time, False))
 					break;
 
-				/* keep track of the modifiers -- needed for stickykeys... */
-				if (xevent.type == KeyPress)
-					xwin_mod_press(xevent.xkey.state,
-						       ev_time, scancode);
-
-				rdp_send_input(ev_time, RDP_INPUT_SCANCODE,
-					       flags, scancode, 0);
-
-				if (xevent.type == KeyRelease)
-					xwin_mod_release(xevent.xkey.state,
-							 ev_time, scancode);
+				tr = xkeymap_translate_key(keysym,
+							   xevent.xkey.keycode, xevent.xkey.state);
+
+				if (tr.scancode == 0)
+					break;
 
+				rdp_send_scancode(ev_time, RDP_KEYRELEASE, tr.scancode);
 				break;
 
 			case ButtonPress:
@@ -499,36 +540,32 @@
 				/* fall through */
 
 			case ButtonRelease:
-				button = xkeymap_translate_button(xevent.
-								  xbutton.
-								  button);
+				button = xkeymap_translate_button(xevent.xbutton.button);
 				if (button == 0)
 					break;
 
 				rdp_send_input(ev_time, RDP_INPUT_MOUSE,
-					       flags | button,
-					       xevent.xbutton.x,
-					       xevent.xbutton.y);
+					       flags | button, xevent.xbutton.x, xevent.xbutton.y);
 				break;
 
 			case MotionNotify:
 				rdp_send_input(ev_time, RDP_INPUT_MOUSE,
-					       MOUSE_FLAG_MOVE,
-					       xevent.xmotion.x,
-					       xevent.xmotion.y);
+					       MOUSE_FLAG_MOVE, xevent.xmotion.x, xevent.xmotion.y);
 				break;
 
 			case EnterNotify:
-				XGrabKeyboard(display, wnd, True,
-					      GrabModeAsync, GrabModeAsync,
-					      CurrentTime);
-
-				xwin_mod_update(xevent.xcrossing.state,
-						ev_time);
+				if (grab_keyboard)
+					XGrabKeyboard(display, wnd, True,
+						      GrabModeAsync, GrabModeAsync, CurrentTime);
 				break;
 
 			case LeaveNotify:
-				XUngrabKeyboard(display, CurrentTime);
+				if (grab_keyboard)
+					XUngrabKeyboard(display, CurrentTime);
+				break;
+
+			case FocusIn:
+				reset_modifier_keys();
 				break;
 
 			case Expose:
@@ -538,179 +575,16 @@
 					  xevent.xexpose.height,
 					  xevent.xexpose.x, xevent.xexpose.y);
 				break;
-		}
-	}
-}
-
-void
-xwin_mod_update(uint32 state, uint32 ev_time)
-{
-	xwin_mod_press(state, ev_time, 0);
-	xwin_mod_release(state, ev_time, 0);
-}
-
-void
-xwin_mod_release(uint32 state, uint32 ev_time, uint32 scancode)
-{
-	switch (scancode)
-	{
-		case 0x2a:
-			key_down_state &= ~DShift1Mask;
-			break;
-		case 0x36:
-			key_down_state &= ~DShift2Mask;
-			break;
-		case 0x1d:
-			key_down_state &= ~DControl1Mask;
-			break;
-		case 0x9d:
-			key_down_state &= ~DControl2Mask;
-			break;
-		case 0x38:
-			key_down_state &= ~DMod1Mask;
-			break;
-		case 0xb8:
-			key_down_state &= ~DMod2Mask;
-			break;
-	}
-
-	if (!(numlock_modifier_mask & state)
-	    && (key_down_state & DNumLockMask))
-	{
-		rdp_send_input(ev_time, RDP_INPUT_SCANCODE, 0, 0x45, 0);
-		rdp_send_input(ev_time, RDP_INPUT_SCANCODE,
-			       KBD_FLAG_DOWN | KBD_FLAG_UP, 0x45, 0);
-		key_down_state &= ~DNumLockMask;
-	}
-
-	if (!(LockMask & state) && (key_down_state & DLockMask))
-	{
-		rdp_send_input(ev_time, RDP_INPUT_SCANCODE, 0, 0x3a, 0);
-		rdp_send_input(ev_time, RDP_INPUT_SCANCODE,
-			       KBD_FLAG_DOWN | KBD_FLAG_UP, 0x3a, 0);
-		key_down_state &= ~DLockMask;
-
-	}
-
-
-	if (!(ShiftMask & state) && (key_down_state & DShift1Mask))
-	{
-		rdp_send_input(ev_time, RDP_INPUT_SCANCODE, KBD_FLAG_UP, 0x2a,
-			       0);
-		key_down_state &= ~DShift1Mask;
-
-	}
-
-	if (!(ControlMask & state) && (key_down_state & DControl1Mask))
-	{
-		rdp_send_input(ev_time, RDP_INPUT_SCANCODE, KBD_FLAG_UP, 0x1d,
-			       0);
-		key_down_state &= ~DControl1Mask;
-
-	}
-
-	if (!(Mod1Mask & state) && (key_down_state & DMod1Mask))
-	{
-		rdp_send_input(ev_time, RDP_INPUT_SCANCODE, KBD_FLAG_UP, 0x38,
-			       0);
-		key_down_state &= ~DMod1Mask;
-
-	}
-
-	if (!(Mod2Mask & state) && (key_down_state & DMod2Mask))
-	{
-		rdp_send_input(ev_time, RDP_INPUT_SCANCODE, KBD_FLAG_UP, 0xb8,
-			       0);
-		key_down_state &= ~DMod2Mask;
-	}
-}
-
-
-void
-xwin_mod_press(uint32 state, uint32 ev_time, uint32 scancode)
-{
-
-	switch (scancode)
-	{
-		case 0x2a:
-			key_down_state |= DShift1Mask;
-			break;
-		case 0x36:
-			key_down_state |= DShift2Mask;
-			break;
-		case 0x1d:
-			key_down_state |= DControl1Mask;
-			break;
-		case 0x9d:
-			key_down_state |= DControl2Mask;
-			break;
-		case 0x3a:
-			key_down_state ^= DLockMask;
-			break;
-		case 0x45:
-			key_down_state ^= DNumLockMask;
-			break;
-		case 0x38:
-			key_down_state |= DMod1Mask;
-			break;
-		case 0xb8:
-			key_down_state |= DMod2Mask;
-			break;
-	}
-
-	if ((numlock_modifier_mask && state)
-	    && !(key_down_state & DNumLockMask))
-	{
-		rdp_send_input(ev_time, RDP_INPUT_SCANCODE, 0, 0x45, 0);
-		rdp_send_input(ev_time, RDP_INPUT_SCANCODE,
-			       KBD_FLAG_DOWN | KBD_FLAG_UP, 0x45, 0);
-		key_down_state |= DNumLockMask;
-	}
-
-	if ((LockMask & state) && !(key_down_state & DLockMask))
-	{
-		rdp_send_input(ev_time, RDP_INPUT_SCANCODE, 0, 0x3a, 0);
-		rdp_send_input(ev_time, RDP_INPUT_SCANCODE,
-			       KBD_FLAG_DOWN | KBD_FLAG_UP, 0x3a, 0);
-		key_down_state |= DLockMask;
-
-	}
-
-
-	if ((ShiftMask & state)
-	    && !((key_down_state & DShift1Mask)
-		 || (key_down_state & DShift2Mask)))
-	{
-		rdp_send_input(ev_time, RDP_INPUT_SCANCODE, KBD_FLAG_DOWN,
-			       0x2a, 0);
-		key_down_state |= DShift1Mask;
-
-	}
-
-	if ((ControlMask & state)
-	    && !((key_down_state & DControl1Mask)
-		 || (key_down_state & DControl2Mask)))
-	{
-		rdp_send_input(ev_time, RDP_INPUT_SCANCODE, KBD_FLAG_DOWN,
-			       0x1d, 0);
-		key_down_state |= DControl1Mask;
-
-	}
-
-	if ((Mod1Mask & state) && !(key_down_state & DMod1Mask))
-	{
-		rdp_send_input(ev_time, RDP_INPUT_SCANCODE, KBD_FLAG_DOWN,
-			       0x38, 0);
-		key_down_state |= DMod1Mask;
-
-	}
 
-	if ((Mod2Mask & state) && !(key_down_state & DMod2Mask))
-	{
-		rdp_send_input(ev_time, RDP_INPUT_SCANCODE, KBD_FLAG_DOWN,
-			       0xb8, 0);
-		key_down_state |= DMod2Mask;
+			case MappingNotify:
+				/* Refresh keyboard mapping if it has changed. This is important for
+				   Xvnc, since it allocates keycodes dynamically */
+				if (xevent.xmapping.request == MappingKeyboard
+				    || xevent.xmapping.request == MappingModifier)
+					XRefreshKeyboardMapping(&xevent.xmapping);
+				break;
 
+		}
 	}
 }
 
@@ -724,13 +598,12 @@
 
 	while (True)
 	{
+		/* Process any events already waiting */
+		xwin_process_events();
+
 		FD_ZERO(&rfds);
 		FD_SET(rdp_socket, &rfds);
-		if (display != NULL)
-		{
-			FD_SET(x_socket, &rfds);
-			XFlush(display);
-		}
+		FD_SET(x_socket, &rfds);
 
 		switch (select(n, &rfds, NULL, NULL, NULL))
 		{
@@ -741,9 +614,6 @@
 				continue;
 		}
 
-		if (FD_ISSET(x_socket, &rfds))
-			xwin_process_events();
-
 		if (FD_ISSET(rdp_socket, &rfds))
 			return;
 	}
@@ -762,29 +632,27 @@
 	Pixmap bitmap;
 	uint8 *tdata;
 
-	tdata = (owncolmap ? data : translate_image(width, height, data));
+	tdata = translate_image(width, height, data);
 	bitmap = XCreatePixmap(display, wnd, width, height, depth);
-	image = XCreateImage(display, visual, depth, ZPixmap,
-			     0, tdata, width, height, 8, 0);
+	image = XCreateImage(display, visual, depth, ZPixmap, 0,
+			     (char *) tdata, width, height, 8, 0);
 
 	XPutImage(display, bitmap, gc, image, 0, 0, 0, 0, width, height);
 
 	XFree(image);
-	if (!owncolmap)
-		xfree(tdata);
+	xfree(tdata);
 	return (HBITMAP) bitmap;
 }
 
 void
-ui_paint_bitmap(int x, int y, int cx, int cy,
-		int width, int height, uint8 * data)
+ui_paint_bitmap(int x, int y, int cx, int cy, int width, int height, uint8 * data)
 {
 	XImage *image;
 	uint8 *tdata;
 
-	tdata = (owncolmap ? data : translate_image(width, height, data));
-	image = XCreateImage(display, visual, depth, ZPixmap,
-			     0, tdata, width, height, 8, 0);
+	tdata = translate_image(width, height, data);
+	image = XCreateImage(display, visual, depth, ZPixmap, 0,
+			     (char *) tdata, width, height, 8, 0);
 
 	if (ownbackstore)
 	{
@@ -797,8 +665,7 @@
 	}
 
 	XFree(image);
-	if (!owncolmap)
-		xfree(tdata);
+	xfree(tdata);
 }
 
 void
@@ -820,8 +687,8 @@
 	bitmap = XCreatePixmap(display, wnd, width, height, 1);
 	gc = XCreateGC(display, bitmap, 0, NULL);
 
-	image = XCreateImage(display, visual, 1, ZPixmap, 0,
-			     data, width, height, 8, scanline);
+	image = XCreateImage(display, visual, 1, ZPixmap, 0, (char *) data,
+			     width, height, 8, scanline);
 	image->byte_order = MSBFirst;
 	image->bitmap_bit_order = MSBFirst;
 	XInitImage(image);
@@ -840,8 +707,8 @@
 }
 
 HCURSOR
-ui_create_cursor(unsigned int x, unsigned int y, int width,
-		 int height, uint8 * andmask, uint8 * xormask)
+ui_create_cursor(unsigned int x, unsigned int y, int width, int height,
+		 uint8 * andmask, uint8 * xormask)
 {
 	HGLYPH maskglyph, cursorglyph;
 	XColor bg, fg;
@@ -899,8 +766,9 @@
 	cursorglyph = ui_create_glyph(width, height, cursor);
 	maskglyph = ui_create_glyph(width, height, mask);
 
-	xcursor = XCreatePixmapCursor(display, (Pixmap) cursorglyph,
-				      (Pixmap) maskglyph, &fg, &bg, x, y);
+	xcursor =
+		XCreatePixmapCursor(display, (Pixmap) cursorglyph,
+				    (Pixmap) maskglyph, &fg, &bg, x, y);
 
 	ui_destroy_glyph(maskglyph);
 	ui_destroy_glyph(cursorglyph);
@@ -932,67 +800,77 @@
 {
 	COLOURENTRY *entry;
 	int i, ncolours = colours->ncolours;
-
-	if (owncolmap)
+	uint32 *map = xmalloc(sizeof(*colmap) * ncolours);
+	XColor xentry;
+	XColor xc_cache[256];
+	uint32 colour;
+	int colLookup = 256;
+	for (i = 0; i < ncolours; i++)
 	{
-		XColor *xcolours, *xentry;
-		Colormap map;
+		entry = &colours->colours[i];
+		MAKE_XCOLOR(&xentry, entry);
 
-		xcolours = xmalloc(sizeof(XColor) * ncolours);
-		for (i = 0; i < ncolours; i++)
+		if (XAllocColor(display, xcolmap, &xentry) == 0)
 		{
-			entry = &colours->colours[i];
-			xentry = &xcolours[i];
-			xentry->pixel = i;
-			MAKE_XCOLOR(xentry, entry);
-		}
-
-		map = XCreateColormap(display, wnd, visual, AllocAll);
-		XStoreColors(display, map, xcolours, ncolours);
-
-		xfree(xcolours);
-		return (HCOLOURMAP) map;
-	}
-	else
-	{
-		uint32 *map = xmalloc(sizeof(*colmap) * ncolours);
-		XColor xentry;
-		uint32 colour;
+			/* Allocation failed, find closest match. */
+			int j = 256;
+			int nMinDist = 3 * 256 * 256;
+			long nDist = nMinDist;
+
+			/* only get the colors once */
+			while( colLookup-- ){
+				xc_cache[colLookup].pixel = colLookup;
+				xc_cache[colLookup].red = xc_cache[colLookup].green = xc_cache[colLookup].blue = 0;
+				xc_cache[colLookup].flags = 0;
+				XQueryColor(display, DefaultColormap(display, DefaultScreen(display)), &xc_cache[colLookup]);
+			}
+			colLookup = 0;
 
-		for (i = 0; i < ncolours; i++)
-		{
-			entry = &colours->colours[i];
-			MAKE_XCOLOR(&xentry, entry);
+			/* approximate the pixel */
+			while( j-- ){
+				if( xc_cache[j].flags ){
+					nDist = 
+					((long) (xc_cache[j].red >> 8) - (long) (xentry.red >> 8)) *
+					((long) (xc_cache[j].red >> 8) - (long) (xentry.red >> 8)) +
+					((long) (xc_cache[j].green >> 8) - (long) (xentry.green >> 8)) *
+					((long) (xc_cache[j].green >> 8) - (long) (xentry.green >> 8)) +
+					((long) (xc_cache[j].blue >> 8) - (long) (xentry.blue >> 8)) *
+					((long) (xc_cache[j].blue >> 8) - (long) (xentry.blue >> 8));
+				}
+				if( nDist < nMinDist ){
+					nMinDist = nDist;
+					xentry.pixel = j;
+				}
+			}
+		}
+		colour = xentry.pixel;
 
-			if (XAllocColor(display, xcolmap, &xentry) != 0)
-				colour = xentry.pixel;
-			else
-				colour = white;
+		/* update our cache */
+		if( xentry.pixel < 256 ){
+			xc_cache[xentry.pixel].red = xentry.red;
+			xc_cache[xentry.pixel].green = xentry.green;
+			xc_cache[xentry.pixel].blue = xentry.blue;
 
-			/* byte swap here to make translate_image faster */
-			map[i] = translate_colour(colour);
 		}
 
-		return map;
+
+		/* byte swap here to make translate_image faster */
+		map[i] = translate_colour(colour);
 	}
+
+	return map;
 }
 
 void
 ui_destroy_colourmap(HCOLOURMAP map)
 {
-	if (owncolmap)
-		XFreeColormap(display, (Colormap) map);
-	else
-		xfree(map);
+	xfree(map);
 }
 
 void
 ui_set_colourmap(HCOLOURMAP map)
 {
-	if (owncolmap)
-		XSetWindowColormap(display, wnd, (Colormap) map);
-	else
-		colmap = map;
+	colmap = map;
 }
 
 void
@@ -1060,12 +938,12 @@
 			SET_BACKGROUND(fgcolour);
 			XSetFillStyle(display, gc, FillOpaqueStippled);
 			XSetStipple(display, gc, fill);
-			XSetTSOrigin(display, gc, brush->xorigin,
-				     brush->yorigin);
+			XSetTSOrigin(display, gc, brush->xorigin, brush->yorigin);
 
 			FILL_RECTANGLE(x, y, cx, cy);
 
 			XSetFillStyle(display, gc, FillSolid);
+			XSetTSOrigin(display, gc, 0, 0);
 			ui_destroy_glyph((HGLYPH) fill);
 			break;
 
@@ -1084,8 +962,7 @@
 	SET_FUNCTION(opcode);
 	XCopyArea(display, wnd, wnd, gc, srcx, srcy, cx, cy, x, y);
 	if (ownbackstore)
-		XCopyArea(display, backstore, backstore, gc, srcx, srcy,
-			  cx, cy, x, y);
+		XCopyArea(display, backstore, backstore, gc, srcx, srcy, cx, cy, x, y);
 	RESET_FUNCTION(opcode);
 }
 
@@ -1097,8 +974,7 @@
 	SET_FUNCTION(opcode);
 	XCopyArea(display, (Pixmap) src, wnd, gc, srcx, srcy, cx, cy, x, y);
 	if (ownbackstore)
-		XCopyArea(display, (Pixmap) src, backstore, gc, srcx, srcy,
-			  cx, cy, x, y);
+		XCopyArea(display, (Pixmap) src, backstore, gc, srcx, srcy, cx, cy, x, y);
 	RESET_FUNCTION(opcode);
 }
 
@@ -1115,22 +991,18 @@
 	{
 		case 0x69:	/* PDSxxn */
 			ui_memblt(ROP2_XOR, x, y, cx, cy, src, srcx, srcy);
-			ui_patblt(ROP2_NXOR, x, y, cx, cy,
-				  brush, bgcolour, fgcolour);
+			ui_patblt(ROP2_NXOR, x, y, cx, cy, brush, bgcolour, fgcolour);
 			break;
 
 		case 0xb8:	/* PSDPxax */
-			ui_patblt(ROP2_XOR, x, y, cx, cy,
-				  brush, bgcolour, fgcolour);
+			ui_patblt(ROP2_XOR, x, y, cx, cy, brush, bgcolour, fgcolour);
 			ui_memblt(ROP2_AND, x, y, cx, cy, src, srcx, srcy);
-			ui_patblt(ROP2_XOR, x, y, cx, cy,
-				  brush, bgcolour, fgcolour);
+			ui_patblt(ROP2_XOR, x, y, cx, cy, brush, bgcolour, fgcolour);
 			break;
 
 		case 0xc0:	/* PSa */
 			ui_memblt(ROP2_COPY, x, y, cx, cy, src, srcx, srcy);
-			ui_patblt(ROP2_AND, x, y, cx, cy, brush, bgcolour,
-				  fgcolour);
+			ui_patblt(ROP2_AND, x, y, cx, cy, brush, bgcolour, fgcolour);
 			break;
 
 		default:
@@ -1164,14 +1036,14 @@
 void
 ui_draw_glyph(int mixmode,
 	      /* dest */ int x, int y, int cx, int cy,
-	      /* src */ HGLYPH glyph, int srcx, int srcy, int bgcolour,
-	      int fgcolour)
+	      /* src */ HGLYPH glyph, int srcx, int srcy,
+	      int bgcolour, int fgcolour)
 {
 	SET_FOREGROUND(fgcolour);
 	SET_BACKGROUND(bgcolour);
 
-	XSetFillStyle(display, gc, (mixmode == MIX_TRANSPARENT)
-		      ? FillStippled : FillOpaqueStippled);
+	XSetFillStyle(display, gc,
+		      (mixmode == MIX_TRANSPARENT) ? FillStippled : FillOpaqueStippled);
 	XSetStipple(display, gc, (Pixmap) glyph);
 	XSetTSOrigin(display, gc, x, y);
 
@@ -1189,9 +1061,10 @@
       if ((xyoffset & 0x80))\
 	{\
 	  if (flags & TEXT2_VERTICAL) \
-	    y += ttext[++idx] | (ttext[++idx] << 8);\
+	    y += ttext[idx+1] | (ttext[idx+2] << 8);\
 	  else\
-	    x += ttext[++idx] | (ttext[++idx] << 8);\
+	    x += ttext[idx+1] | (ttext[idx+2] << 8);\
+	  idx += 2;\
 	}\
       else\
 	{\
@@ -1214,8 +1087,8 @@
 
 void
 ui_draw_text(uint8 font, uint8 flags, int mixmode, int x, int y,
-	     int clipx, int clipy, int clipcx, int clipcy, int boxx,
-	     int boxy, int boxcx, int boxcy, int bgcolour,
+	     int clipx, int clipy, int clipcx, int clipcy,
+	     int boxx, int boxy, int boxcx, int boxcy, int bgcolour,
 	     int fgcolour, uint8 * text, uint8 length)
 {
 	FONTGLYPH *glyph;
@@ -1240,8 +1113,7 @@
 		{
 			case 0xff:
 				if (i + 2 < length)
-					cache_put_text(text[i + 1], text,
-						       text[i + 2]);
+					cache_put_text(text[i + 1], text, text[i + 2]);
 				else
 				{
 					error("this shouldn't be happening\n");
@@ -1258,8 +1130,7 @@
 				if (entry != NULL)
 				{
 					if ((((uint8 *) (entry->data))[1] ==
-					     0)
-					    && (!(flags & TEXT2_IMPLICIT_X)))
+					     0) && (!(flags & TEXT2_IMPLICIT_X)))
 					{
 						if (flags & TEXT2_VERTICAL)
 							y += text[i + 2];
@@ -1275,9 +1146,7 @@
 					text = &(text[i]);
 					i = 0;
 					for (j = 0; j < entry->size; j++)
-						DO_GLYPH(((uint8 *) (entry->
-								     data)),
-							 j);
+						DO_GLYPH(((uint8 *) (entry->data)), j);
 				}
 				break;
 
@@ -1299,21 +1168,18 @@
 
 	if (ownbackstore)
 	{
-		image = XGetImage(display, backstore, x, y, cx, cy, AllPlanes,
-				  ZPixmap);
+		image = XGetImage(display, backstore, x, y, cx, cy, AllPlanes, ZPixmap);
 	}
 	else
 	{
 		pix = XCreatePixmap(display, wnd, cx, cy, depth);
 		XCopyArea(display, wnd, pix, gc, x, y, cx, cy, 0, 0);
-		image = XGetImage(display, pix, 0, 0, cx, cy, AllPlanes,
-				  ZPixmap);
+		image = XGetImage(display, pix, 0, 0, cx, cy, AllPlanes, ZPixmap);
 		XFreePixmap(display, pix);
 	}
 
 	offset *= bpp / 8;
-	cache_put_desktop(offset, cx, cy, image->bytes_per_line,
-			  bpp / 8, (uint8 *) image->data);
+	cache_put_desktop(offset, cx, cy, image->bytes_per_line, bpp / 8, (uint8 *) image->data);
 
 	XDestroyImage(image);
 }
@@ -1329,9 +1195,8 @@
 	if (data == NULL)
 		return;
 
-	image = XCreateImage(display, visual, depth, ZPixmap,
-			     0, data, cx, cy, BitmapPad(display),
-			     cx * bpp / 8);
+	image = XCreateImage(display, visual, depth, ZPixmap, 0,
+			     (char *) data, cx, cy, BitmapPad(display), cx * bpp / 8);
 
 	if (ownbackstore)
 	{