--- sourceforge.net/trunk/rdesktop/xwin.c 2002/09/11 11:45:20 118 +++ sourceforge.net/trunk/rdesktop/xwin.c 2003/01/28 12:07:55 296 @@ -1,7 +1,7 @@ /* rdesktop: A Remote Desktop Protocol client. User interface services - X Window System - Copyright (C) Matthew Chapman 1999-2001 + Copyright (C) Matthew Chapman 1999-2002 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -22,27 +22,32 @@ #include #include #include -#define XK_MISCELLANY -#include #include "rdesktop.h" -#include "scancodes.h" extern int width; extern int height; extern BOOL sendmotion; extern BOOL fullscreen; extern BOOL grab_keyboard; +extern BOOL hide_decorations; extern char title[]; +BOOL enable_compose = False; +BOOL focused; +BOOL mouse_in_wnd; -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 int dpy_width; -static int dpy_height; +static XIM IM; +static XIC IC; +static XModifierKeymap *mod_map; +static Cursor current_cursor; +static Atom protocol_atom, kill_atom; /* endianness */ static BOOL host_be; @@ -52,6 +57,20 @@ static BOOL ownbackstore; static Pixmap backstore; +/* MWM decorations */ +#define MWM_HINTS_DECORATIONS (1L << 1) +#define PROP_MOTIF_WM_HINTS_ELEMENTS 5 +typedef struct +{ + unsigned long flags; + unsigned long functions; + unsigned long decorations; + long inputMode; + unsigned long status; +} +PropMotifWmHints; + + #define FILL_RECTANGLE(x,y,cx,cy)\ { \ XFillRectangle(display, wnd, gc, x, y, cx, cy); \ @@ -59,20 +78,15 @@ XFillRectangle(display, backstore, gc, x, y, cx, cy); \ } +#define FILL_RECTANGLE_BACKSTORE(x,y,cx,cy)\ +{ \ + XFillRectangle(display, ownbackstore ? backstore : wnd, gc, x, y, cx, cy); \ +} + /* colour maps */ -static BOOL owncolmap; +BOOL owncolmap = False; static Colormap xcolmap; -static uint32 white; static uint32 *colmap; -static XIM IM = NULL; -static XIC IC = NULL; - -/* Compose support */ -BOOL enable_compose = False; - -/* toggle fullscreen globals */ -static XSetWindowAttributes attribs; -static unsigned long input_mask; #define TRANSLATE(col) ( owncolmap ? col : translate_colour(colmap[col]) ) #define SET_FOREGROUND(col) XSetForeground(display, gc, TRANSLATE(col)); @@ -100,6 +114,28 @@ #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 +mwm_hide_decorations(void) +{ + PropMotifWmHints motif_hints; + Atom hintsatom; + + /* setup the property */ + motif_hints.flags = MWM_HINTS_DECORATIONS; + motif_hints.decorations = 0; + + /* get the atom for the property */ + hintsatom = XInternAtom(display, "_MOTIF_WM_HINTS", False); + if (!hintsatom) + { + error("Failed to get atom _MOTIF_WM_HINTS\n"); + return; + } + + XChangeProperty(display, wnd, hintsatom, hintsatom, 32, PropModeReplace, + (unsigned char *) &motif_hints, PROP_MOTIF_WM_HINTS_ELEMENTS); +} + static void translate8(uint8 * data, uint8 * out, uint8 * end) { @@ -194,130 +230,176 @@ return colour; } -static unsigned long -init_inputmethod(void) +BOOL +get_key_state(unsigned int state, uint32 keysym) { - unsigned long filtered_events = 0; + int modifierpos, key, keysymMask = 0; + int offset; - IM = XOpenIM(display, NULL, NULL, NULL); - if (IM == NULL) - { - error("Failed to open input method\n"); - } + 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 = mod_map->max_keypermod * modifierpos; - if (IC == NULL) + for (key = 0; key < mod_map->max_keypermod; key++) { - error("Failed to create input context\n"); - XCloseIM(IM); - IM = NULL; + if (mod_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; + return (state & keysymMask) ? True : False; } -static void -close_inputmethod(void) +BOOL +ui_init(void) { - if (IC != NULL) + XPixmapFormatValues *pfm; + uint16 test; + int i; + + display = XOpenDisplay(NULL); + if (display == NULL) { - XDestroyIC(IC); - if (IM != NULL) - { - XCloseIM(IM); - IM = NULL; - } + error("Failed to open display: %s\n", XDisplayName(NULL)); + return False; } -} -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; + x_socket = ConnectionNumber(display); + screen = DefaultScreenOfDisplay(display); + visual = DefaultVisualOfScreen(screen); + depth = DefaultDepthOfScreen(screen); - XModifierKeymap *map = XGetModifierMapping(display); - KeyCode keycode = XKeysymToKeycode(display, keysym); + pfm = XListPixmapFormats(display, &i); + if (pfm != NULL) + { + /* Use maximum bpp for this depth - this is generally + desirable, e.g. 24 bits->32 bits. */ + while (i--) + { + if ((pfm[i].depth == depth) && (pfm[i].bits_per_pixel > bpp)) + { + bpp = pfm[i].bits_per_pixel; + } + } + XFree(pfm); + } - if (keycode == NoSymbol) + if (bpp < 8) + { + error("Less than 8 bpp not currently supported.\n"); + XCloseDisplay(display); return False; + } - for (modifierpos = 0; modifierpos < 8; modifierpos++) + if (owncolmap != True) { - offset = map->max_keypermod * modifierpos; - - for (key = 0; key < map->max_keypermod; key++) + xcolmap = DefaultColormapOfScreen(screen); + if (depth <= 8) { - if (map->modifiermap[offset + key] == keycode) - keysymMask = 1 << modifierpos; + printf("You're using a screen depth of 8-bits or lower\n"); + printf("If you get scewed colours, try the -C switch\n"); } } - XQueryPointer(display, DefaultRootWindow(display), &wDummy1, - &wDummy2, &iDummy3, &iDummy4, &iDummy5, &iDummy6, ¤t_state); - - XFreeModifiermap(map); + gc = XCreateGC(display, RootWindowOfScreen(screen), 0, NULL); - return (current_state & keysymMask) ? True : False; -} + if (DoesBackingStore(screen) != Always) + ownbackstore = True; + test = 1; + host_be = !(BOOL) (*(uint8 *) (&test)); + xserver_be = (ImageByteOrder(display) == MSBFirst); -BOOL -ui_init() -{ - Screen *screen; - display = XOpenDisplay(NULL); - if (display == NULL) + if ((width == 0) || (height == 0)) { - error("Failed to open display\n"); - return False; + /* Fetch geometry from _NET_WORKAREA */ + uint32 xpos, ypos; + + if (get_current_workarea(&xpos, &ypos, &width, &height) < 0) + { + error("Failed to get workarea.\n"); + error("Perhaps your window manager does not support EWMH?\n"); + error("Defaulting to geometry 800x600\n"); + width = 800; + height = 600; + } } + if (fullscreen) { - screen = DefaultScreenOfDisplay(display); width = WidthOfScreen(screen); height = HeightOfScreen(screen); } + + /* make sure width is a multiple of 4 */ + width = (width + 3) & ~3; + + if (ownbackstore) + { + 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); + } + + mod_map = XGetModifierMapping(display); + + if (enable_compose) + IM = XOpenIM(display, NULL, NULL, NULL); + + xkeymap_init(); return True; } void -ui_create_window_obj(int xpos, int ypos, int width, int height, int valuemask) +ui_deinit(void) { + if (IM != NULL) + XCloseIM(IM); + + XFreeModifiermap(mod_map); + + if (ownbackstore) + XFreePixmap(display, backstore); + + XFreeGC(display, gc); + XCloseDisplay(display); + display = NULL; +} + +BOOL +ui_create_window(void) +{ + XSetWindowAttributes attribs; XClassHint *classhints; XSizeHints *sizehints; + int wndwidth, wndheight; + long input_mask, ic_input_mask; XEvent xevent; - Screen *screen; - screen = DefaultScreenOfDisplay(display); + wndwidth = fullscreen ? WidthOfScreen(screen) : width; + wndheight = fullscreen ? HeightOfScreen(screen) : height; - wnd = XCreateWindow(display, RootWindowOfScreen(screen), xpos, - ypos, width, height, 0, CopyFromParent, - InputOutput, CopyFromParent, valuemask, &attribs); + attribs.background_pixel = BlackPixelOfScreen(screen); + attribs.backing_store = ownbackstore ? NotUseful : Always; + attribs.override_redirect = fullscreen; + wnd = XCreateWindow(display, RootWindowOfScreen(screen), 0, 0, wndwidth, wndheight, + 0, CopyFromParent, InputOutput, CopyFromParent, + CWBackPixel | CWBackingStore | CWOverrideRedirect, &attribs); XStoreName(display, wnd, title); + if (hide_decorations) + mwm_hide_decorations(); + classhints = XAllocClassHint(); if (classhints != NULL) { @@ -336,222 +418,121 @@ XFree(sizehints); } - if (enable_compose) - input_mask |= init_inputmethod(); - - XSelectInput(display, wnd, input_mask); - - gc = XCreateGC(display, wnd, 0, NULL); - - XMapWindow(display, wnd); - - /* Wait for VisibilityNotify Event */ - for (;;) - { - XNextEvent(display, &xevent); - if (xevent.type == VisibilityNotify) - break; - } + input_mask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | + VisibilityChangeMask | FocusChangeMask; + if (sendmotion) + input_mask |= PointerMotionMask; if (ownbackstore) - backstore = XCreatePixmap(display, wnd, width, height, depth); - - /* clear the window so that cached data is not viewed upon start... */ - XSetBackground(display, gc, 0); - XSetForeground(display, gc, 0); - FILL_RECTANGLE(0, 0, width, height); - /* make sure the window is focused */ - XSetInputFocus(display, wnd, RevertToPointerRoot, CurrentTime); -} - -BOOL -ui_create_window() -{ - XPixmapFormatValues *pfm; - Screen *screen; - uint16 test; - int i; - - x_socket = ConnectionNumber(display); - screen = DefaultScreenOfDisplay(display); - visual = DefaultVisualOfScreen(screen); - depth = DefaultDepthOfScreen(screen); + input_mask |= ExposureMask; + if (fullscreen || grab_keyboard) + input_mask |= EnterWindowMask; + if (grab_keyboard) + input_mask |= LeaveWindowMask; - pfm = XListPixmapFormats(display, &i); - if (pfm != NULL) + if (IM != NULL) { - /* Use maximum bpp for this depth - this is generally - desirable, e.g. 24 bits->32 bits. */ - while (i--) - { - if ((pfm[i].depth == depth) && (pfm[i].bits_per_pixel > bpp)) - { - bpp = pfm[i].bits_per_pixel; - } - } - XFree(pfm); - } + IC = XCreateIC(IM, XNInputStyle, (XIMPreeditNothing | XIMStatusNothing), + XNClientWindow, wnd, XNFocusWindow, wnd, NULL); - if (bpp < 8) - { - error("Less than 8 bpp not currently supported.\n"); - XCloseDisplay(display); - return False; + if ((IC != NULL) + && (XGetICValues(IC, XNFilterEvents, &ic_input_mask, NULL) == NULL)) + input_mask |= ic_input_mask; } - if (depth <= 8) - owncolmap = True; - else - xcolmap = DefaultColormapOfScreen(screen); - - 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; - - dpy_width = WidthOfScreen(screen); - dpy_height = HeightOfScreen(screen); + XSelectInput(display, wnd, input_mask); + XMapWindow(display, wnd); - if (fullscreen) - { - attribs.override_redirect = True; - width = dpy_width; - height = dpy_height; - } - else + /* wait for VisibilityNotify */ + do { - attribs.override_redirect = False; + XMaskEvent(display, VisibilityChangeMask, &xevent); } + while (xevent.type != VisibilityNotify); - input_mask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | - VisibilityChangeMask | FocusChangeMask; - - if (grab_keyboard) - input_mask |= EnterWindowMask | LeaveWindowMask; - if (sendmotion) - input_mask |= PointerMotionMask; + focused = False; + mouse_in_wnd = False; - if (ownbackstore) - input_mask |= ExposureMask; - - if (fullscreen) - ui_create_window_obj(0, 0, width, height, - CWBackingStore | CWBackPixel | CWOverrideRedirect); - else - ui_create_window_obj(0, 0, width, height, CWBackingStore | CWBackPixel); - - xkeymap_init2(); + /* handle the WM_DELETE_WINDOW protocol */ + protocol_atom = XInternAtom(display, "WM_PROTOCOLS", True); + kill_atom = XInternAtom(display, "WM_DELETE_WINDOW", True); + XSetWMProtocols(display, wnd, &kill_atom, 1); return True; } void -ui_destroy_window() +ui_destroy_window(void) { - if (ownbackstore) - XFreePixmap(display, backstore); - - XFreeGC(display, gc); - - close_inputmethod(); + if (IC != NULL) + XDestroyIC(IC); XDestroyWindow(display, wnd); - XCloseDisplay(display); - display = NULL; } void -reset_keys() +xwin_toggle_fullscreen(void) { - /* reset keys */ - uint32 ev_time; - ev_time = time(NULL); - rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_LCTRL); - rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_LALT); - rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_LSHIFT); - rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_RCTRL); - rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_RALT); - rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_RSHIFT); -} + Pixmap contents = 0; -void -toggle_fullscreen() -{ - /* save window contents */ - Pixmap pixmap; - pixmap = XCreatePixmap(display, wnd, width, height, depth); - if (ownbackstore) - XCopyArea(display, backstore, pixmap, gc, 0, 0, width, height, 0, 0); - else - XCopyArea(display, wnd, pixmap, gc, 0, 0, width, height, 0, 0); - fullscreen = fullscreen ? False : True; - close_inputmethod(); - if (ownbackstore) - XFreePixmap(display, backstore); - XFreeGC(display, gc); - XDestroyWindow(display, wnd); - if (fullscreen) + if (!ownbackstore) { - attribs.override_redirect = True; - ui_create_window_obj(0, 0, dpy_width, dpy_height, - CWBackingStore | CWBackPixel | CWOverrideRedirect); + /* need to save contents of window */ + contents = XCreatePixmap(display, wnd, width, height, depth); + XCopyArea(display, wnd, contents, gc, 0, 0, width, height, 0, 0); } - else + + ui_destroy_window(); + fullscreen = !fullscreen; + ui_create_window(); + + XDefineCursor(display, wnd, current_cursor); + + if (!ownbackstore) { - attribs.override_redirect = False; - ui_create_window_obj(0, 0, width, height, CWBackingStore | CWBackPixel); + XCopyArea(display, contents, wnd, gc, 0, 0, width, height, 0, 0); + XFreePixmap(display, contents); } - ui_set_cursor(cache_get_cursor(0)); - ui_move_pointer(width / 2, height / 2); - reset_keys(); - /* restore window contents */ - if (ownbackstore) - XCopyArea(display, pixmap, backstore, gc, 0, 0, width, height, 0, 0); - XCopyArea(display, pixmap, wnd, gc, 0, 0, width, height, 0, 0); - XFreePixmap(display, pixmap); } -static void -xwin_process_events() +/* Process all events in Xlib queue + Returns 0 after user quit, 1 otherwise */ +static int +xwin_process_events(void) { XEvent xevent; - KeySym keysym; uint16 button, flags; uint32 ev_time; key_translation tr; - char *ksname = NULL; char str[256]; Status status; + unsigned int state; + Window wdummy; + int dummy; - /* 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")); continue; } - ev_time = time(NULL); flags = 0; switch (xevent.type) { + case ClientMessage: + /* the window manager told us to quit */ + if ((xevent.xclient.message_type == protocol_atom) + && (xevent.xclient.data.l[0] == kill_atom)) + /* Quit */ + return 0; + break; + case KeyPress: if (IC != NULL) /* Multi_key compatible version */ @@ -569,15 +550,16 @@ 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, + get_ksname(keysym))); - if (handle_special_keys(keysym, ev_time, True)) + ev_time = time(NULL); + if (handle_special_keys(keysym, xevent.xkey.state, ev_time, True)) break; tr = xkeymap_translate_key(keysym, @@ -590,15 +572,16 @@ 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)); + get_ksname(keysym))); - if (handle_special_keys(keysym, ev_time, False)) + ev_time = time(NULL); + if (handle_special_keys(keysym, xevent.xkey.state, ev_time, False)) break; tr = xkeymap_translate_key(keysym, @@ -619,31 +602,59 @@ if (button == 0) break; - rdp_send_input(ev_time, RDP_INPUT_MOUSE, + rdp_send_input(time(NULL), RDP_INPUT_MOUSE, flags | button, xevent.xbutton.x, xevent.xbutton.y); break; case MotionNotify: - rdp_send_input(ev_time, RDP_INPUT_MOUSE, + if (fullscreen && !focused) + XSetInputFocus(display, wnd, RevertToPointerRoot, + CurrentTime); + rdp_send_input(time(NULL), RDP_INPUT_MOUSE, MOUSE_FLAG_MOVE, xevent.xmotion.x, xevent.xmotion.y); break; case FocusIn: - /* fall through */ - case EnterNotify: - if (grab_keyboard) + if (xevent.xfocus.mode == NotifyGrab) + break; + focused = True; + XQueryPointer(display, wnd, &wdummy, &wdummy, &dummy, &dummy, + &dummy, &dummy, &state); + reset_modifier_keys(state); + if (grab_keyboard && mouse_in_wnd) XGrabKeyboard(display, wnd, True, GrabModeAsync, GrabModeAsync, CurrentTime); break; case FocusOut: - reset_keys(); - /* fall through */ - case LeaveNotify: - if (grab_keyboard) + if (xevent.xfocus.mode == NotifyUngrab) + break; + focused = False; + if (xevent.xfocus.mode == NotifyWhileGrabbed) XUngrabKeyboard(display, CurrentTime); break; + case EnterNotify: + /* we only register for this event when in fullscreen mode */ + /* or grab_keyboard */ + mouse_in_wnd = True; + if (fullscreen) + { + XSetInputFocus(display, wnd, RevertToPointerRoot, + CurrentTime); + break; + } + if (focused) + XGrabKeyboard(display, wnd, True, + GrabModeAsync, GrabModeAsync, CurrentTime); + break; + + case LeaveNotify: + /* we only register for this event when grab_keyboard */ + mouse_in_wnd = False; + XUngrabKeyboard(display, CurrentTime); + break; + case Expose: XCopyArea(display, backstore, wnd, gc, xevent.xexpose.x, xevent.xexpose.y, @@ -651,11 +662,29 @@ 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); + + if (xevent.xmapping.request == MappingModifier) + { + XFreeModifiermap(mod_map); + mod_map = XGetModifierMapping(display); + } + break; + } } + /* Keep going */ + return 1; } -void +/* Returns 0 after user quit, 1 otherwise */ +int ui_select(int rdp_socket) { int n = (rdp_socket > x_socket) ? rdp_socket + 1 : x_socket + 1; @@ -665,13 +694,14 @@ while (True) { + /* Process any events already waiting */ + if (!xwin_process_events()) + /* User quit */ + return 0; + 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)) { @@ -682,11 +712,8 @@ continue; } - if (FD_ISSET(x_socket, &rfds)) - xwin_process_events(); - if (FD_ISSET(rdp_socket, &rfds)) - return; + return 1; } } @@ -853,7 +880,8 @@ void ui_set_cursor(HCURSOR cursor) { - XDefineCursor(display, wnd, (Cursor) cursor); + current_cursor = (Cursor) cursor; + XDefineCursor(display, wnd, current_cursor); } void @@ -868,13 +896,88 @@ (xc)->blue = ((c)->blue << 8) | (c)->blue; \ (xc)->flags = DoRed | DoGreen | DoBlue; + HCOLOURMAP ui_create_colourmap(COLOURMAP * colours) { 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++) + { + entry = &colours->colours[i]; + MAKE_XCOLOR(&xentry, entry); - if (owncolmap) + 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; + + /* 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; + + /* 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; + } + else { XColor *xcolours, *xentry; Colormap map; @@ -894,46 +997,24 @@ 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; - } } void ui_destroy_colourmap(HCOLOURMAP map) { - if (owncolmap) - XFreeColormap(display, (Colormap) map); - else + if (!owncolmap) xfree(map); + else + XFreeColormap(display, (Colormap) map); } void ui_set_colourmap(HCOLOURMAP map) { - if (owncolmap) - XSetWindowColormap(display, wnd, (Colormap) map); - else + if (!owncolmap) colmap = map; + else + XSetWindowColormap(display, wnd, (Colormap) map); } void @@ -949,7 +1030,7 @@ } void -ui_reset_clip() +ui_reset_clip(void) { XRectangle rect; @@ -961,7 +1042,7 @@ } void -ui_bell() +ui_bell(void) { XBell(display, 0); } @@ -1096,6 +1177,7 @@ FILL_RECTANGLE(x, y, cx, cy); } +/* warning, this function only draws on wnd or backstore, not both */ void ui_draw_glyph(int mixmode, /* dest */ int x, int y, int cx, int cy, @@ -1110,7 +1192,7 @@ XSetStipple(display, gc, (Pixmap) glyph); XSetTSOrigin(display, gc, x, y); - FILL_RECTANGLE(x, y, cx, cy); + FILL_RECTANGLE_BACKSTORE(x, y, cx, cy); XSetFillStyle(display, gc, FillSolid); } @@ -1162,11 +1244,11 @@ if (boxcx > 1) { - FILL_RECTANGLE(boxx, boxy, boxcx, boxcy); + FILL_RECTANGLE_BACKSTORE(boxx, boxy, boxcx, boxcy); } else if (mixmode == MIX_OPAQUE) { - FILL_RECTANGLE(clipx, clipy, clipcx, clipcy); + FILL_RECTANGLE_BACKSTORE(clipx, clipy, clipcx, clipcy); } /* Paint text, character by character */ @@ -1180,7 +1262,7 @@ else { error("this shouldn't be happening\n"); - break; + exit(1); } /* this will move pointer from start to first character after FF command */ length -= i + 3; @@ -1200,17 +1282,17 @@ else x += text[i + 2]; } - if (i + 2 < length) - i += 3; - else - i += 2; - length -= i; - /* this will move pointer from start to first character after FE command */ - text = &(text[i]); - i = 0; for (j = 0; j < entry->size; j++) DO_GLYPH(((uint8 *) (entry->data)), j); } + if (i + 2 < length) + i += 3; + else + i += 2; + length -= i; + /* this will move pointer from start to first character after FE command */ + text = &(text[i]); + i = 0; break; default: @@ -1219,8 +1301,15 @@ break; } } - - + if (ownbackstore) + { + if (boxcx > 1) + XCopyArea(display, backstore, wnd, gc, boxx, + boxy, boxcx, boxcy, boxx, boxy); + else + XCopyArea(display, backstore, wnd, gc, clipx, + clipy, clipcx, clipcy, clipx, clipy); + } } void