--- sourceforge.net/trunk/rdesktop/xwin.c	2002/07/30 07:18:48	82
+++ sourceforge.net/trunk/rdesktop/xwin.c	2002/09/24 06:09:09	188
@@ -32,14 +32,20 @@
 extern BOOL sendmotion;
 extern BOOL fullscreen;
 extern BOOL grab_keyboard;
+extern char title[];
+BOOL enable_compose = False;
 
-Display *display = NULL;
+Display *display;
 static int x_socket;
+static Screen *screen;
 static Window wnd;
 static GC gc;
 static Visual *visual;
 static int depth;
 static int bpp;
+static XIM IM;
+static XIC IC;
+static Cursor current_cursor;
 
 /* endianness */
 static BOOL host_be;
@@ -57,19 +63,11 @@
 }
 
 /* colour maps */
-static BOOL owncolmap;
 static Colormap xcolmap;
-static uint32 white;
 static uint32 *colmap;
-static XIM IM = NULL;
-static XIC IC = NULL;
-
-/* Compose support */
-BOOL enable_compose = False;
 
-#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));
+#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 */
@@ -187,89 +185,53 @@
 	return colour;
 }
 
-static unsigned long
-init_inputmethod(void)
+BOOL
+get_key_state(int keysym)
 {
-	unsigned long filtered_events = 0;
+	int keysymMask = 0, modifierpos, key;
+	Window wDummy1, wDummy2;
+	int iDummy3, iDummy4, iDummy5, iDummy6;
+	unsigned int current_state;
+	int offset;
 
-	IM = XOpenIM(display, NULL, NULL, NULL);
-	if (IM == NULL)
-	{
-		error("Failed to open input method\n");
-	}
+	XModifierKeymap *map = XGetModifierMapping(display);
+	KeyCode keycode = XKeysymToKeycode(display, keysym);
 
-	if (IM != NULL)
+	if (keycode == NoSymbol)
+		return False;
+
+	for (modifierpos = 0; modifierpos < 8; modifierpos++)
 	{
-		/* Must be done after XCreateWindow */
-		IC = XCreateIC(IM, XNInputStyle,
-			       (XIMPreeditNothing | XIMStatusNothing),
-			       XNClientWindow, wnd, XNFocusWindow, wnd, NULL);
+		offset = map->max_keypermod * modifierpos;
 
-		if (IC == NULL)
+		for (key = 0; key < map->max_keypermod; key++)
 		{
-			error("Failed to create input context\n");
-			XCloseIM(IM);
-			IM = NULL;
+			if (map->modifiermap[offset + key] == keycode)
+				keysymMask = 1 << modifierpos;
 		}
 	}
 
-	/* 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;
-}
+	XQueryPointer(display, DefaultRootWindow(display), &wDummy1,
+		      &wDummy2, &iDummy3, &iDummy4, &iDummy5, &iDummy6, &current_state);
 
-static void
-close_inputmethod(void)
-{
-	if (IC != NULL)
-	{
-		XDestroyIC(IC);
-		if (IM != NULL)
-		{
-			XCloseIM(IM);
-			IM = NULL;
-		}
-	}
+	XFreeModifiermap(map);
+
+	return (current_state & keysymMask) ? True : False;
 }
 
 BOOL
 ui_init()
 {
-	Screen *screen;
+	XPixmapFormatValues *pfm;
+	uint16 test;
+	int i;
+
 	display = XOpenDisplay(NULL);
 	if (display == NULL)
 	{
 		error("Failed to open display\n");
 		return False;
 	}
-	if (fullscreen)
-	{
-		screen = DefaultScreenOfDisplay(display);
-		width = WidthOfScreen(screen);
-		height = HeightOfScreen(screen);
-	}
-	return True;
-}
-
-BOOL
-ui_create_window(char *title)
-{
-	XSetWindowAttributes attribs;
-	XClassHint *classhints;
-	XSizeHints *sizehints;
-	unsigned long input_mask;
-	XPixmapFormatValues *pfm;
-	Screen *screen;
-	uint16 test;
-	int i;
 
 	x_socket = ConnectionNumber(display);
 	screen = DefaultScreenOfDisplay(display);
@@ -298,39 +260,75 @@
 		return False;
 	}
 
-	if (depth <= 8)
-		owncolmap = True;
-	else
-		xcolmap = DefaultColormapOfScreen(screen);
+	xcolmap = DefaultColormapOfScreen(screen);
+	gc = XCreateGC(display, RootWindowOfScreen(screen), 0, NULL);
+
+	if (DoesBackingStore(screen) != Always)
+		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
+
+	/* make sure width is a multiple of 4 */
+	width = (width + 3) & ~3;
+
+	if (ownbackstore)
 	{
-		attribs.override_redirect = False;
+		backstore = XCreatePixmap(display, RootWindowOfScreen(screen), width, height, depth);
+
+		/* clear to prevent rubbish being exposed at startup */
+		XSetForeground(display, gc, BlackPixelOfScreen(screen));
+		XFillRectangle(display, backstore, gc, 0, 0, width, height);
 	}
 
-	width = (width + 3) & ~3;	/* make width a multiple of 32 bits */
+	if (enable_compose)
+		IM = XOpenIM(display, NULL, NULL, NULL);
+
+	xkeymap_init();
+	return True;
+}
+
+void
+ui_deinit()
+{
+	if (IM != NULL)
+		XCloseIM(IM);
+
+	if (ownbackstore)
+		XFreePixmap(display, backstore);
+
+	XFreeGC(display, gc);
+	XCloseDisplay(display);
+	display = NULL;
+}
+
+BOOL
+ui_create_window()
+{
+	XSetWindowAttributes attribs;
+	XClassHint *classhints;
+	XSizeHints *sizehints;
+	int wndwidth, wndheight;
+	long input_mask, ic_input_mask;
+	XEvent xevent;
+
+	wndwidth  = fullscreen ? WidthOfScreen(screen)  : width;
+	wndheight = fullscreen ? HeightOfScreen(screen) : height;
+
+	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,
-			    CWBackingStore | CWBackPixel | CWOverrideRedirect, &attribs);
+	wnd = XCreateWindow(display, RootWindowOfScreen(screen), 0, 0, wndwidth, wndheight,
+			    0, CopyFromParent, InputOutput, CopyFromParent,
+			    CWBackPixel | CWBackingStore | CWOverrideRedirect, &attribs);
 
 	XStoreName(display, wnd, title);
 
@@ -352,28 +350,35 @@
 		XFree(sizehints);
 	}
 
-	xkeymap_init2();
+	input_mask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
+		StructureNotifyMask | FocusChangeMask;
 
-	input_mask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask;
 	if (grab_keyboard)
 		input_mask |= EnterWindowMask | LeaveWindowMask;
 	if (sendmotion)
 		input_mask |= PointerMotionMask;
-
 	if (ownbackstore)
 		input_mask |= ExposureMask;
 
-	if (enable_compose)
-		input_mask |= init_inputmethod();
+	if (IM != NULL)
+	{
+		IC = XCreateIC(IM, XNInputStyle, (XIMPreeditNothing | XIMStatusNothing),
+			       XNClientWindow, wnd, XNFocusWindow, wnd, NULL);
 
-	XSelectInput(display, wnd, input_mask);
+		if ((IC != NULL) && (XGetICValues(IC, XNFilterEvents, &ic_input_mask, NULL) == NULL))
+			input_mask |= ic_input_mask;
+	}
 
-	gc = XCreateGC(display, wnd, 0, NULL);
+	XSelectInput(display, wnd, input_mask);
+	XMapWindow(display, wnd);
 
-	if (ownbackstore)
-		backstore = XCreatePixmap(display, wnd, width, height, depth);
+	/* wait for MapNotify */
+	do {
+		XMaskEvent(display, StructureNotifyMask, &xevent);
+	} while (xevent.type != MapNotify);
 
-	XMapWindow(display, wnd);
+	if (fullscreen)
+		XSetInputFocus(display, wnd, RevertToPointerRoot, CurrentTime);
 
 	return True;
 }
@@ -381,23 +386,42 @@
 void
 ui_destroy_window()
 {
-	if (ownbackstore)
-		XFreePixmap(display, backstore);
+	if (IC != NULL)
+		XDestroyIC(IC);
 
-	XFreeGC(display, gc);
+	XDestroyWindow(display, wnd);
+}
 
-	close_inputmethod();
+void
+xwin_toggle_fullscreen()
+{
+	Pixmap contents = 0;
 
-	XDestroyWindow(display, wnd);
-	XCloseDisplay(display);
-	display = NULL;
+	if (!ownbackstore)
+	{
+		/* need to save contents of window */
+		contents = XCreatePixmap(display, wnd, width, height, depth);
+		XCopyArea(display, wnd, contents, gc, 0, 0, width, height, 0, 0);
+	}
+
+	ui_destroy_window();
+	fullscreen = !fullscreen;
+	ui_create_window();
+
+	XDefineCursor(display, wnd, current_cursor);
+
+	if (!ownbackstore)
+	{
+		XCopyArea(display, contents, wnd, gc, 0, 0, width, height, 0, 0);
+		XFreePixmap(display, contents);
+	}
 }
 
+/* Process all events in Xlib queue */
 static void
 xwin_process_events()
 {
 	XEvent xevent;
-
 	KeySym keysym;
 	uint16 button, flags;
 	uint32 ev_time;
@@ -406,20 +430,13 @@
 	char str[256];
 	Status status;
 
-	/* Refresh keyboard mapping if it has changed. This is important for 
-	   Xvnc, since it allocates keycodes dynamically */
-	if (XCheckTypedEvent(display, MappingNotify, &xevent))
+	while (XPending(display) > 0)
 	{
-		if (xevent.xmapping.request == MappingKeyboard
-		    || xevent.xmapping.request == MappingModifier)
-			XRefreshKeyboardMapping(&xevent.xmapping);
-	}
+		XNextEvent(display, &xevent);
 
-	while (XCheckMaskEvent(display, ~0, &xevent))
-	{
-		if (enable_compose && (XFilterEvent(&xevent, None) == True))
+		if ((IC != NULL) && (XFilterEvent(&xevent, None) == True))
 		{
-			DEBUG_KBD("Filtering event\n");
+			DEBUG_KBD(("Filtering event\n"));
 			continue;
 		}
 
@@ -445,28 +462,25 @@
 				else
 				{
 					/* Plain old XLookupString */
-					DEBUG_KBD("No input context, using XLookupString\n");
+					DEBUG_KBD(("\nNo input context, using XLookupString\n"));
 					XLookupString((XKeyEvent *) & xevent,
 						      str, sizeof(str), &keysym, NULL);
 				}
 
 				ksname = get_ksname(keysym);
-				DEBUG_KBD("\nKeyPress for (keysym 0x%lx, %s)\n", keysym, ksname);
+				DEBUG_KBD(("KeyPress for (keysym 0x%lx, %s)\n", keysym, ksname));
 
-				if (inhibit_key(keysym))
-				{
-					DEBUG_KBD("Inhibiting key\n");
+				if (handle_special_keys(keysym, ev_time, True))
 					break;
-				}
 
 				tr = xkeymap_translate_key(keysym,
 							   xevent.xkey.keycode, xevent.xkey.state);
 
-				ensure_remote_modifiers(ev_time, tr);
-
 				if (tr.scancode == 0)
 					break;
 
+				ensure_remote_modifiers(ev_time, tr);
+
 				rdp_send_scancode(ev_time, RDP_KEYPRESS, tr.scancode);
 				break;
 			case KeyRelease:
@@ -474,9 +488,10 @@
 					      sizeof(str), &keysym, NULL);
 
 				ksname = get_ksname(keysym);
-				DEBUG_KBD("\nKeyRelease for (keysym 0x%lx, %s)\n", keysym, ksname);
+				DEBUG_KBD(("\nKeyRelease for (keysym 0x%lx, %s)\n", keysym,
+					   ksname));
 
-				if (inhibit_key(keysym))
+				if (handle_special_keys(keysym, ev_time, False))
 					break;
 
 				tr = xkeymap_translate_key(keysym,
@@ -506,26 +521,21 @@
 					       MOUSE_FLAG_MOVE, xevent.xmotion.x, xevent.xmotion.y);
 				break;
 
-			case FocusIn:
-				/* fall through */
 			case EnterNotify:
 				if (grab_keyboard)
 					XGrabKeyboard(display, wnd, True,
 						      GrabModeAsync, GrabModeAsync, CurrentTime);
 				break;
 
-			case FocusOut:
-				/* reset keys */
-				rdp_send_input(ev_time, RDP_INPUT_SCANCODE,
-					       KBD_FLAG_DOWN | KBD_FLAG_UP, SCANCODE_CHAR_LCTRL, 0);
-				rdp_send_input(ev_time, RDP_INPUT_SCANCODE,
-					       KBD_FLAG_DOWN | KBD_FLAG_UP, SCANCODE_CHAR_LALT, 0);
-				/* fall through */
 			case LeaveNotify:
 				if (grab_keyboard)
 					XUngrabKeyboard(display, CurrentTime);
 				break;
 
+			case FocusIn:
+				reset_modifier_keys();
+				break;
+
 			case Expose:
 				XCopyArea(display, backstore, wnd, gc,
 					  xevent.xexpose.x, xevent.xexpose.y,
@@ -533,6 +543,15 @@
 					  xevent.xexpose.height,
 					  xevent.xexpose.x, xevent.xexpose.y);
 				break;
+
+			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;
+
 		}
 	}
 }
@@ -547,13 +566,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))
 		{
@@ -564,9 +582,6 @@
 				continue;
 		}
 
-		if (FD_ISSET(x_socket, &rfds))
-			xwin_process_events();
-
 		if (FD_ISSET(rdp_socket, &rfds))
 			return;
 	}
@@ -585,7 +600,7 @@
 	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,
 			     (char *) tdata, width, height, 8, 0);
@@ -593,8 +608,7 @@
 	XPutImage(display, bitmap, gc, image, 0, 0, 0, 0, width, height);
 
 	XFree(image);
-	if (!owncolmap)
-		xfree(tdata);
+	xfree(tdata);
 	return (HBITMAP) bitmap;
 }
 
@@ -604,7 +618,7 @@
 	XImage *image;
 	uint8 *tdata;
 
-	tdata = (owncolmap ? data : translate_image(width, height, data));
+	tdata = translate_image(width, height, data);
 	image = XCreateImage(display, visual, depth, ZPixmap, 0,
 			     (char *) tdata, width, height, 8, 0);
 
@@ -619,8 +633,7 @@
 	}
 
 	XFree(image);
-	if (!owncolmap)
-		xfree(tdata);
+	xfree(tdata);
 }
 
 void
@@ -735,7 +748,8 @@
 void
 ui_set_cursor(HCURSOR cursor)
 {
-	XDefineCursor(display, wnd, (Cursor) cursor);
+	current_cursor = (Cursor) cursor;
+	XDefineCursor(display, wnd, current_cursor);
 }
 
 void
@@ -755,67 +769,77 @@
 {
 	COLOURENTRY *entry;
 	int i, ncolours = colours->ncolours;
+	uint32 *map = xmalloc(sizeof(*colmap) * ncolours);
+	XColor xentry;
+	XColor xc_cache[256];
+	uint32 colour;
+	int colLookup = 256;
+	for (i = 0; i < ncolours; i++)
+	{
+		entry = &colours->colours[i];
+		MAKE_XCOLOR(&xentry, entry);
+
+		if (XAllocColor(display, xcolmap, &xentry) == 0)
+		{
+			/* 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;
 
-	if (owncolmap)
-	{
-		XColor *xcolours, *xentry;
-		Colormap map;
-
-		xcolours = xmalloc(sizeof(XColor) * ncolours);
-		for (i = 0; i < ncolours; i++)
-		{
-			entry = &colours->colours[i];
-			xentry = &xcolours[i];
-			xentry->pixel = 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;
 
-		map = XCreateColormap(display, wnd, visual, AllocAll);
-		XStoreColors(display, map, xcolours, ncolours);
+		/* 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;
 
-		xfree(xcolours);
-		return (HCOLOURMAP) map;
-	}
-	else
-	{
-		uint32 *map = xmalloc(sizeof(*colmap) * ncolours);
-		XColor xentry;
-		uint32 colour;
-
-		for (i = 0; i < ncolours; i++)
-		{
-			entry = &colours->colours[i];
-			MAKE_XCOLOR(&xentry, entry);
-
-			if (XAllocColor(display, xcolmap, &xentry) != 0)
-				colour = xentry.pixel;
-			else
-				colour = white;
-
-			/* 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