--- sourceforge.net/trunk/rdesktop/xwin.c 2001/06/20 13:54:48 28 +++ sourceforge.net/trunk/rdesktop/xwin.c 2003/05/19 21:36:33 376 @@ -1,18 +1,18 @@ /* rdesktop: A Remote Desktop Protocol client. - User interface services - X-Windows - Copyright (C) Matthew Chapman 1999-2000 - + User interface services - X Window System + 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 the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. @@ -21,29 +21,90 @@ #include #include #include +#include #include "rdesktop.h" extern int width; extern int height; -extern BOOL motion; -extern BOOL grab_keyboard; +extern BOOL sendmotion; extern BOOL fullscreen; -extern int private_colormap; - -static int bpp; -static int depth; -static Display *display; +extern BOOL grab_keyboard; +extern BOOL hide_decorations; +extern char title[]; +extern int server_bpp; +extern int win_button_size; +BOOL enable_compose = False; +BOOL focused; +BOOL mouse_in_wnd; + +Display *display; +static int x_socket; +static Screen *screen; static Window wnd; static GC gc; static Visual *visual; -static uint32 *colmap; +static int depth; +static int bpp; +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; +static BOOL xserver_be; + +/* software backing store */ +static BOOL ownbackstore; +static Pixmap backstore; + +/* Moving in single app mode */ +static BOOL moving_wnd; +static int move_x_offset = 0; +static int move_y_offset = 0; + +/* MWM decorations */ +#define MWM_HINTS_DECORATIONS (1L << 1) +#define PROP_MOTIF_WM_HINTS_ELEMENTS 5 +typedef struct +{ + uint32 flags; + uint32 functions; + uint32 decorations; + sint32 inputMode; + uint32 status; +} +PropMotifWmHints; + +typedef struct +{ + uint32 red; + uint32 green; + uint32 blue; +} +PixelColour; -#define Ctrans(col) ( private_colormap ? col : colmap[col]) +#define FILL_RECTANGLE(x,y,cx,cy)\ +{ \ + XFillRectangle(display, wnd, gc, x, y, cx, cy); \ + if (ownbackstore) \ + XFillRectangle(display, backstore, gc, x, y, cx, cy); \ +} -#define L_ENDIAN -int screen_msbfirst = 0; +#define FILL_RECTANGLE_BACKSTORE(x,y,cx,cy)\ +{ \ + XFillRectangle(display, ownbackstore ? backstore : wnd, gc, x, y, cx, cy); \ +} -static uint8 *translate(int width, int height, uint8 *data); +/* colour maps */ +BOOL owncolmap = False; +static Colormap xcolmap; +static uint32 *colmap; + +#define TRANSLATE(col) ( server_bpp != 8 ? translate_colour(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)); static int rop2_map[] = { GXclear, /* 0 */ @@ -64,59 +125,420 @@ GXset /* 1 */ }; +#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); } + +static 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) + { + warning("Failed to get atom _MOTIF_WM_HINTS: probably your window manager does not support MWM hints\n"); + return; + } + + XChangeProperty(display, wnd, hintsatom, hintsatom, 32, PropModeReplace, + (unsigned char *) &motif_hints, PROP_MOTIF_WM_HINTS_ELEMENTS); +} + +static PixelColour +split_colour15(uint32 colour) +{ + PixelColour rv; + rv.red = (colour & 0x7c00) >> 10; + rv.red = (rv.red * 0xff) / 0x1f; + rv.green = (colour & 0x03e0) >> 5; + rv.green = (rv.green * 0xff) / 0x1f; + rv.blue = (colour & 0x1f); + rv.blue = (rv.blue * 0xff) / 0x1f; + return rv; +} + +static PixelColour +split_colour16(uint32 colour) +{ + PixelColour rv; + rv.red = (colour & 0xf800) >> 11; + rv.red = (rv.red * 0xff) / 0x1f; + rv.green = (colour & 0x07e0) >> 5; + rv.green = (rv.green * 0xff) / 0x3f; + rv.blue = (colour & 0x001f); + rv.blue = (rv.blue * 0xff) / 0x1f; + return rv; +} + +static PixelColour +split_colour24(uint32 colour) +{ + PixelColour rv; + rv.blue = (colour & 0xff0000) >> 16; + rv.green = (colour & 0xff00) >> 8; + rv.red = (colour & 0xff); + return rv; +} + +static uint32 +make_colour16(PixelColour pc) +{ + pc.red = (pc.red * 0x1f) / 0xff; + pc.green = (pc.green * 0x3f) / 0xff; + pc.blue = (pc.blue * 0x1f) / 0xff; + return (pc.red << 11) | (pc.green << 5) | pc.blue; +} + +static uint32 +make_colour24(PixelColour pc) +{ + return (pc.red << 16) | (pc.green << 8) | pc.blue; +} + +static uint32 +make_colour32(PixelColour pc) +{ + return (pc.red << 16) | (pc.green << 8) | pc.blue; +} + +#define BSWAP16(x) { x = (((x & 0xff) << 8) | (x >> 8)); } +#define BSWAP24(x) { x = (((x & 0xff) << 16) | (x >> 16) | ((x >> 8) & 0xff00)); } +#define BSWAP32(x) { x = (((x & 0xff00ff) << 8) | ((x >> 8) & 0xff00ff)); \ + x = (x << 16) | (x >> 16); } + +static uint32 +translate_colour(uint32 colour) +{ + switch (server_bpp) + { + case 15: + switch (bpp) + { + case 16: + colour = make_colour16(split_colour15(colour)); + break; + case 24: + colour = make_colour24(split_colour15(colour)); + break; + case 32: + colour = make_colour32(split_colour15(colour)); + break; + } + break; + case 16: + switch (bpp) + { + case 16: + break; + case 24: + colour = make_colour24(split_colour16(colour)); + break; + case 32: + colour = make_colour32(split_colour16(colour)); + break; + } + break; + case 24: + switch (bpp) + { + case 16: + colour = make_colour16(split_colour24(colour)); + break; + case 24: + break; + case 32: + colour = make_colour32(split_colour24(colour)); + break; + } + break; + } + switch (bpp) + { + case 16: + if (host_be != xserver_be) + BSWAP16(colour); + break; + + case 24: + if (xserver_be) + BSWAP24(colour); + break; + + case 32: + if (host_be != xserver_be) + BSWAP32(colour); + break; + } + + return colour; +} + +static void +translate8to8(uint8 * data, uint8 * out, uint8 * end) +{ + while (out < end) + *(out++) = (uint8) colmap[*(data++)]; +} + +static void +translate8to16(uint8 * data, uint16 * out, uint16 * end) +{ + while (out < end) + *(out++) = (uint16) colmap[*(data++)]; +} + +/* little endian - conversion happens when colourmap is built */ +static void +translate8to24(uint8 * data, uint8 * out, uint8 * end) +{ + uint32 value; + + while (out < end) + { + value = colmap[*(data++)]; + *(out++) = value; + *(out++) = value >> 8; + *(out++) = value >> 16; + } +} + +static void +translate8to32(uint8 * data, uint32 * out, uint32 * end) +{ + while (out < end) + *(out++) = colmap[*(data++)]; +} + +/* todo the remaining translate function might need some big endian check ?? */ + +static void +translate15to16(uint16 * data, uint16 * out, uint16 * end) +{ + while (out < end) + *(out++) = (uint16) make_colour16(split_colour15(*(data++))); +} + +static void +translate15to24(uint16 * data, uint8 * out, uint8 * end) +{ + uint32 value; + + while (out < end) + { + value = make_colour24(split_colour15(*(data++))); + *(out++) = value; + *(out++) = value >> 8; + *(out++) = value >> 16; + } +} + +static void +translate15to32(uint16 * data, uint32 * out, uint32 * end) +{ + while (out < end) + *(out++) = make_colour32(split_colour15(*(data++))); +} + +static void +translate16to16(uint16 * data, uint16 * out, uint16 * end) +{ + while (out < end) + *(out++) = (uint16) (*(data++)); +} + + +static void +translate16to24(uint16 * data, uint8 * out, uint8 * end) +{ + uint32 value; + + while (out < end) + { + value = make_colour24(split_colour16(*(data++))); + *(out++) = value; + *(out++) = value >> 8; + *(out++) = value >> 16; + } +} + static void -xwin_set_function(uint8 rop2) +translate16to32(uint16 * data, uint32 * out, uint32 * end) { - static uint8 last_rop2 = ROP2_COPY; + while (out < end) + *(out++) = make_colour32(split_colour16(*(data++))); +} - if (last_rop2 != rop2) +static void +translate24to16(uint8 * data, uint16 * out, uint16 * end) +{ + uint32 pixel = 0; + while (out < end) { - XSetFunction(display, gc, rop2_map[rop2]); - last_rop2 = rop2; + pixel = *(data++) << 16; + pixel |= *(data++) << 8; + pixel |= *(data++); + *(out++) = (uint16) make_colour16(split_colour24(pixel)); } } static void -xwin_grab_keyboard() +translate24to24(uint8 * data, uint8 * out, uint8 * end) { - XGrabKeyboard(display, wnd, True, GrabModeAsync, GrabModeAsync, - CurrentTime); + while (out < end) + { + *(out++) = (*(data++)); + } } static void -xwin_ungrab_keyboard() +translate24to32(uint8 * data, uint32 * out, uint32 * end) +{ + uint32 pixel = 0; + while (out < end) + { + pixel = *(data++); + pixel |= *(data++) << 8; + pixel |= *(data++) << 16; + *(out++) = pixel; + } +} + +static uint8 * +translate_image(int width, int height, uint8 * data) +{ + int size = width * height * bpp / 8; + uint8 *out = (uint8*)xmalloc(size); + uint8 *end = out + size; + + switch (server_bpp) + { + case 24: + switch (bpp) + { + case 32: + translate24to32(data, (uint32 *) out, (uint32 *) end); + break; + case 24: + translate24to24(data, out, end); + break; + case 16: + translate24to16(data, (uint16 *) out, (uint16 *) end); + break; + } + break; + case 16: + switch (bpp) + { + case 32: + translate16to32((uint16 *) data, (uint32 *) out, + (uint32 *) end); + break; + case 24: + translate16to24((uint16 *) data, out, end); + break; + case 16: + translate16to16((uint16 *) data, (uint16 *) out, + (uint16 *) end); + break; + } + break; + case 15: + switch (bpp) + { + case 32: + translate15to32((uint16 *) data, (uint32 *) out, + (uint32 *) end); + break; + case 24: + translate15to24((uint16 *) data, out, end); + break; + case 16: + translate15to16((uint16 *) data, (uint16 *) out, + (uint16 *) end); + break; + } + break; + case 8: + switch (bpp) + { + case 8: + translate8to8(data, out, end); + break; + case 16: + translate8to16(data, (uint16 *) out, (uint16 *) end); + break; + case 24: + translate8to24(data, out, end); + break; + case 32: + translate8to32(data, (uint32 *) out, (uint32 *) end); + break; + } + break; + } + return out; +} + +BOOL +get_key_state(unsigned int state, uint32 keysym) { - XUngrabKeyboard(display, CurrentTime); + int modifierpos, key, keysymMask = 0; + int offset; + + KeyCode keycode = XKeysymToKeycode(display, keysym); + + if (keycode == NoSymbol) + return False; + + for (modifierpos = 0; modifierpos < 8; modifierpos++) + { + offset = mod_map->max_keypermod * modifierpos; + + for (key = 0; key < mod_map->max_keypermod; key++) + { + if (mod_map->modifiermap[offset + key] == keycode) + keysymMask |= 1 << modifierpos; + } + } + + return (state & keysymMask) ? True : False; } BOOL -ui_create_window(char *title) +ui_init(void) { - XSetWindowAttributes attribs; - XClassHint *classhints; - XSizeHints *sizehints; - unsigned long input_mask; XPixmapFormatValues *pfm; - int count; + uint16 test; + int i; display = XOpenDisplay(NULL); if (display == NULL) { - ERROR("Failed to open display\n"); + error("Failed to open display: %s\n", XDisplayName(NULL)); return False; } - visual = DefaultVisual(display, DefaultScreen(display)); - depth = DefaultDepth(display, DefaultScreen(display)); - pfm = XListPixmapFormats(display, &count); + x_socket = ConnectionNumber(display); + screen = DefaultScreenOfDisplay(display); + visual = DefaultVisualOfScreen(screen); + depth = DefaultDepthOfScreen(screen); + + pfm = XListPixmapFormats(display, &i); if (pfm != NULL) { - while (count--) + /* Use maximum bpp for this depth - this is generally + desirable, e.g. 24 bits->32 bits. */ + while (i--) { - if ((pfm + count)->depth == depth - && (pfm + count)->bits_per_pixel > bpp) + if ((pfm[i].depth == depth) && (pfm[i].bits_per_pixel > bpp)) { - bpp = (pfm + count)->bits_per_pixel; + bpp = pfm[i].bits_per_pixel; } } XFree(pfm); @@ -124,43 +546,123 @@ if (bpp < 8) { - ERROR("Less than 8 bpp not currently supported.\n"); + error("Less than 8 bpp not currently supported.\n"); XCloseDisplay(display); return False; } - width &= ~3; /* make width nicely divisible */ + if (owncolmap != True) + { + xcolmap = DefaultColormapOfScreen(screen); + if (depth <= 8) + warning("Screen depth is 8 bits or lower: you may want to use -C for a private colourmap\n"); + } + + 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); - attribs.background_pixel = BlackPixel(display, DefaultScreen(display)); - attribs.backing_store = Always; + if ((width == 0) || (height == 0)) + { + /* Fetch geometry from _NET_WORKAREA */ + uint32 x, y, cx, cy; + + if (get_current_workarea(&x, &y, &cx, &cy) == 0) + { + width = cx; + height = cy; + } + else + { + warning("Failed to get workarea: probably your window manager does not support extended hints\n"); + width = 800; + height = 600; + } + } if (fullscreen) { - attribs.override_redirect = True; - width = WidthOfScreen(DefaultScreenOfDisplay(display)); - height = HeightOfScreen(DefaultScreenOfDisplay(display)); - XSetInputFocus(display, PointerRoot, RevertToPointerRoot, - CurrentTime); + 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); } - wnd = XCreateWindow(display, DefaultRootWindow(display), - 0, 0, width, height, 0, CopyFromParent, - InputOutput, CopyFromParent, - CWBackingStore | CWBackPixel | CWOverrideRedirect, - &attribs); + mod_map = XGetModifierMapping(display); + + if (enable_compose) + IM = XOpenIM(display, NULL, NULL, NULL); + + xkeymap_init(); + + /* todo take this out when high colour is done */ + printf("server bpp %d client bpp %d depth %d\n", server_bpp, bpp, depth); + + return True; +} + +void +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; + + 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, 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) - { - classhints->res_name = "rdesktop"; - classhints->res_class = "rdesktop"; + classhints->res_name = classhints->res_class = "rdesktop"; XSetClassHint(display, wnd, classhints); XFree(classhints); } @@ -168,185 +670,366 @@ sizehints = XAllocSizeHints(); if (sizehints) { - sizehints->flags = - PPosition | PSize | PMinSize | PMaxSize | PBaseSize; - sizehints->min_width = width; - sizehints->max_width = width; - sizehints->min_height = height; - sizehints->max_height = height; - sizehints->base_width = width; - sizehints->base_height = height; + sizehints->flags = PMinSize | PMaxSize; + sizehints->min_width = sizehints->max_width = width; + sizehints->min_height = sizehints->max_height = height; XSetWMNormalHints(display, wnd, sizehints); XFree(sizehints); } - input_mask = KeyPressMask | KeyReleaseMask; - input_mask |= ButtonPressMask | ButtonReleaseMask; - if (motion) + input_mask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | + VisibilityChangeMask | FocusChangeMask; + + if (sendmotion) input_mask |= PointerMotionMask; + if (ownbackstore) + input_mask |= ExposureMask; + if (fullscreen || grab_keyboard) + input_mask |= EnterWindowMask; if (grab_keyboard) - input_mask |= EnterWindowMask | LeaveWindowMask; + input_mask |= LeaveWindowMask; - XSelectInput(display, wnd, input_mask); - gc = XCreateGC(display, wnd, 0, NULL); + if (IM != NULL) + { + IC = XCreateIC(IM, XNInputStyle, (XIMPreeditNothing | XIMStatusNothing), + XNClientWindow, wnd, XNFocusWindow, wnd, NULL); + + if ((IC != NULL) + && (XGetICValues(IC, XNFilterEvents, &ic_input_mask, NULL) == NULL)) + input_mask |= ic_input_mask; + } + XSelectInput(display, wnd, input_mask); XMapWindow(display, wnd); + + /* wait for VisibilityNotify */ + do + { + XMaskEvent(display, VisibilityChangeMask, &xevent); + } + while (xevent.type != VisibilityNotify); + + focused = False; + mouse_in_wnd = False; + + /* 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) { - XFreeGC(display, gc); + if (IC != NULL) + XDestroyIC(IC); + XDestroyWindow(display, wnd); - XCloseDisplay(display); - display = NULL; } -static uint8 -xwin_translate_key(unsigned long key) +void +xwin_toggle_fullscreen(void) { - DEBUG("KEY(code=0x%lx)\n", key); + Pixmap contents = 0; - if ((key > 8) && (key <= 0x60)) - return (key - 8); + 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); + } - switch (key) - { - case 0x61: /* home */ - return 0x47 | 0x80; - case 0x62: /* up arrow */ - return 0x48 | 0x80; - case 0x63: /* page up */ - return 0x49 | 0x80; - case 0x64: /* left arrow */ - return 0x4b | 0x80; - case 0x66: /* right arrow */ - return 0x4d | 0x80; - case 0x67: /* end */ - return 0x4f | 0x80; - case 0x68: /* down arrow */ - return 0x50 | 0x80; - case 0x69: /* page down */ - return 0x51 | 0x80; - case 0x6a: /* insert */ - return 0x52 | 0x80; - case 0x6b: /* delete */ - return 0x53 | 0x80; - case 0x6c: /* keypad enter */ - return 0x1c | 0x80; - case 0x6d: /* right ctrl */ - return 0x1d | 0x80; - case 0x6f: /* ctrl - print screen */ - return 0x37 | 0x80; - case 0x70: /* keypad '/' */ - return 0x35 | 0x80; - case 0x71: /* right alt */ - return 0x38 | 0x80; - case 0x72: /* ctrl break */ - return 0x46 | 0x80; - case 0x73: /* left window key */ - return 0xff; /* real scancode is 5b */ - case 0x74: /* right window key */ - return 0xff; /* real scancode is 5c */ - case 0x75: /* menu key */ - return 0x5d | 0x80; - } - - return 0; -} - -static uint16 -xwin_translate_mouse(unsigned long button) -{ - switch (button) - { - case Button1: /* left */ - return MOUSE_FLAG_BUTTON1; - case Button2: /* middle */ - return MOUSE_FLAG_BUTTON3; - case Button3: /* right */ - return MOUSE_FLAG_BUTTON2; - } - - return 0; -} - -void -ui_process_events() -{ - XEvent event; - uint8 scancode; - uint16 button; - uint32 ev_time; + ui_destroy_window(); + fullscreen = !fullscreen; + ui_create_window(); - if (display == NULL) - return; + XDefineCursor(display, wnd, current_cursor); + + if (!ownbackstore) + { + XCopyArea(display, contents, wnd, gc, 0, 0, width, height, 0, 0); + XFreePixmap(display, contents); + } +} - while (XCheckWindowEvent(display, wnd, ~0, &event)) +/* 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 str[256]; + Status status; + unsigned int state; + Window wdummy; + int dummy; + + while (XPending(display) > 0) { - ev_time = time(NULL); + XNextEvent(display, &xevent); + + if ((IC != NULL) && (XFilterEvent(&xevent, None) == True)) + { + DEBUG_KBD(("Filtering event\n")); + continue; + } - switch (event.type) + flags = 0; + + switch (xevent.type) { + case ClientMessage: + /* the window manager told us to quit */ + if ((xevent.xclient.message_type == protocol_atom) + && ((Atom)xevent.xclient.data.l[0] == kill_atom)) + /* Quit */ + return 0; + break; + case KeyPress: - scancode = xwin_translate_key(event.xkey.keycode); - if (scancode == 0) + 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); + } + + DEBUG_KBD(("KeyPress for (keysym 0x%lx, %s)\n", keysym, + get_ksname(keysym))); + + ev_time = time(NULL); + if (handle_special_keys(keysym, xevent.xkey.state, ev_time, True)) + break; + + tr = xkeymap_translate_key(keysym, + xevent.xkey.keycode, xevent.xkey.state); + + if (tr.scancode == 0) break; - rdp_send_input(ev_time, RDP_INPUT_SCANCODE, 0, - scancode, 0); + ensure_remote_modifiers(ev_time, tr); + + rdp_send_scancode(ev_time, RDP_KEYPRESS, tr.scancode); break; case KeyRelease: - scancode = xwin_translate_key(event.xkey.keycode); - if (scancode == 0) + XLookupString((XKeyEvent *) & xevent, str, + sizeof(str), &keysym, NULL); + + DEBUG_KBD(("\nKeyRelease for (keysym 0x%lx, %s)\n", keysym, + get_ksname(keysym))); + + ev_time = time(NULL); + if (handle_special_keys(keysym, xevent.xkey.state, ev_time, False)) break; - rdp_send_input(ev_time, RDP_INPUT_SCANCODE, - KBD_FLAG_DOWN | KBD_FLAG_UP, - scancode, 0); - break; + tr = xkeymap_translate_key(keysym, + xevent.xkey.keycode, xevent.xkey.state); - case ButtonPress: - button = xwin_translate_mouse(event.xbutton.button); - if (button == 0) + if (tr.scancode == 0) break; - rdp_send_input(ev_time, RDP_INPUT_MOUSE, - button | MOUSE_FLAG_DOWN, - event.xbutton.x, - event.xbutton.y); + rdp_send_scancode(ev_time, RDP_KEYRELEASE, tr.scancode); break; + case ButtonPress: + flags = MOUSE_FLAG_DOWN; + /* fall through */ + case ButtonRelease: - button = xwin_translate_mouse(event.xbutton.button); + button = xkeymap_translate_button(xevent.xbutton.button); if (button == 0) break; - rdp_send_input(ev_time, RDP_INPUT_MOUSE, - button, - event.xbutton.x, - event.xbutton.y); + /* If win_button_size is nonzero, enable single app mode */ + if (xevent.xbutton.y < win_button_size) + { + /* Stop moving window when button is released, regardless of cursor position */ + if (moving_wnd && (xevent.type == ButtonRelease)) + moving_wnd = False; + + /* Check from right to left: */ + + if (xevent.xbutton.x >= width - win_button_size) + { + /* The close button, continue */ + ; + } + else if (xevent.xbutton.x >= width - win_button_size * 2) + { + /* The maximize/restore button. Do not send to + server. It might be a good idea to change the + cursor or give some other visible indication + that rdesktop inhibited this click */ + break; + } + else if (xevent.xbutton.x >= width - win_button_size * 3) + { + /* The minimize button. Iconify window. */ + XIconifyWindow(display, wnd, + DefaultScreen(display)); + break; + } + else if (xevent.xbutton.x <= win_button_size) + { + /* The system menu. Ignore. */ + break; + } + else + { + /* The title bar. */ + if ((xevent.type == ButtonPress) && !fullscreen + && hide_decorations) + { + moving_wnd = True; + move_x_offset = xevent.xbutton.x; + move_y_offset = xevent.xbutton.y; + } + break; + + } + } + + 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, - MOUSE_FLAG_MOVE, - event.xmotion.x, - event.xmotion.y); + if (moving_wnd) + { + XMoveWindow(display, wnd, + xevent.xmotion.x_root - move_x_offset, + xevent.xmotion.y_root - move_y_offset); + break; + } + + 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: + 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: + if (xevent.xfocus.mode == NotifyUngrab) + break; + focused = False; + if (xevent.xfocus.mode == NotifyWhileGrabbed) + XUngrabKeyboard(display, CurrentTime); break; case EnterNotify: - if (grab_keyboard) - xwin_grab_keyboard(); + /* 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: - if (grab_keyboard) - xwin_ungrab_keyboard(); + /* 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, + xevent.xexpose.width, + 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; +} + +/* 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; + fd_set rfds; + + FD_ZERO(&rfds); + + while (True) + { + /* Process any events already waiting */ + if (!xwin_process_events()) + /* User quit */ + return 0; + + FD_ZERO(&rfds); + FD_SET(rdp_socket, &rfds); + FD_SET(x_socket, &rfds); + + switch (select(n, &rfds, NULL, NULL, NULL)) + { + case -1: + error("select: %s\n", strerror(errno)); + + case 0: + continue; } + + if (FD_ISSET(rdp_socket, &rfds)) + return 1; } } @@ -357,176 +1040,57 @@ } HBITMAP -ui_create_bitmap(int width, int height, uint8 *data) +ui_create_bitmap(int width, int height, uint8 * data) { XImage *image; Pixmap bitmap; uint8 *tdata; - tdata = (private_colormap ? data : translate(width, height, data)); + + tdata = (owncolmap ? data : translate_image(width, height, data)); bitmap = XCreatePixmap(display, wnd, width, height, depth); - image = - XCreateImage(display, visual, - depth, ZPixmap, - 0, tdata, width, height, BitmapPad(display), 0); + image = XCreateImage(display, visual, depth, ZPixmap, 0, + (char *) tdata, width, height, server_bpp == 8 ? 8 : bpp, 0); - xwin_set_function(ROP2_COPY); XPutImage(display, bitmap, gc, image, 0, 0, 0, 0, width, height); XFree(image); - if (!private_colormap) + if (!owncolmap) 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 = - (private_colormap ? data : translate(width, height, data)); - image = - XCreateImage(display, visual, depth, ZPixmap, 0, tdata, width, - height, BitmapPad(display), 0); - - xwin_set_function(ROP2_COPY); - - /* Window */ - XPutImage(display, wnd, gc, image, 0, 0, x, y, cx, cy); - XFree(image); - if (!private_colormap) - xfree(tdata); -} - -void -ui_destroy_bitmap(HBITMAP bmp) -{ - XFreePixmap(display, (Pixmap) bmp); -} - -HCURSOR -ui_create_cursor(unsigned int x, unsigned int y, int width, - int height, uint8 *mask, uint8 *data) -{ - XImage *imagecursor; - XImage *imagemask; - Pixmap maskbitmap, cursorbitmap; - Cursor cursor; - XColor bg, fg; - GC lgc; - int i, x1, y1, scanlinelen; - uint8 *cdata, *cmask; - uint8 c; - cdata = (uint8 *) malloc(sizeof(uint8) * width * height); - if (!cdata) - return NULL; - scanlinelen = (width + 7) >> 3; - cmask = (uint8 *) malloc(sizeof(uint8) * scanlinelen * height); - if (!cmask) - { - free(cdata); - return NULL; - } - i = (height - 1) * scanlinelen; + uint8 *tdata; + tdata = (owncolmap ? data : translate_image(width, height, data)); + image = XCreateImage(display, visual, depth, ZPixmap, 0, + (char *) tdata, width, height, server_bpp == 8 ? 8 : bpp, 0); - if (!screen_msbfirst) + if (ownbackstore) { - while (i >= 0) - { - for (x1 = 0; x1 < scanlinelen; x1++) - { - c = *(mask++); - cmask[i + x1] = - ((c & 0x1) << 7) | ((c & 0x2) << 5) | - ((c & 0x4) << 3) | ((c & 0x8) << 1) | - ((c & 0x10) >> 1) | ((c & 0x20) >> 3) - | ((c & 0x40) >> 5) | ((c & 0x80) >> - 7); - } - i -= scanlinelen; - } + XPutImage(display, backstore, gc, image, 0, 0, x, y, cx, cy); + XCopyArea(display, backstore, wnd, gc, x, y, cx, cy, x, y); } else { - while (i >= 0) - { - for (x1 = 0; x1 < scanlinelen; x1++) - { - cmask[i + x1] = *(mask++); - } - i -= scanlinelen; - } + XPutImage(display, wnd, gc, image, 0, 0, x, y, cx, cy); } - - fg.red = 0; - fg.blue = 0; - fg.green = 0; - fg.flags = DoRed | DoBlue | DoGreen; - bg.red = 65535; - bg.blue = 65535; - bg.green = 65535; - bg.flags = DoRed | DoBlue | DoGreen; - maskbitmap = XCreatePixmap(display, wnd, width, height, 1); - cursorbitmap = XCreatePixmap(display, wnd, width, height, 1); - lgc = XCreateGC(display, maskbitmap, 0, NULL); - XSetFunction(display, lgc, GXcopy); - imagemask = - XCreateImage(display, visual, 1, XYBitmap, 0, cmask, width, - height, 8, 0); - imagecursor = - XCreateImage(display, visual, 1, XYBitmap, 0, cdata, width, - height, 8, 0); - for (y1 = height - 1; y1 >= 0; y1--) - for (x1 = 0; x1 < width; x1++) - { - if (data[0] >= 0x80 || data[1] >= 0x80 - || data[2] >= 0x80) - if (XGetPixel(imagemask, x1, y1)) - - { - XPutPixel(imagecursor, x1, y1, 0); - XPutPixel(imagemask, x1, y1, 0); /* mask is blank for text cursor! */ - } - - else - XPutPixel(imagecursor, x1, y1, 1); - - else - XPutPixel(imagecursor, x1, y1, - XGetPixel(imagemask, x1, y1)); - data += 3; - } - XPutImage(display, maskbitmap, lgc, imagemask, 0, 0, 0, 0, width, - height); - XPutImage(display, cursorbitmap, lgc, imagecursor, 0, 0, 0, 0, width, - height); XFree(imagemask); - XFree(imagecursor); - free(cmask); - free(cdata); - XFreeGC(display, lgc); - cursor = - XCreatePixmapCursor(display, cursorbitmap, maskbitmap, &fg, - &bg, x, y); - XFreePixmap(display, maskbitmap); - XFreePixmap(display, cursorbitmap); - return (HCURSOR) cursor; -} - -void -ui_set_cursor(HCURSOR cursor) -{ - XDefineCursor(display, wnd, (Cursor) cursor); + XFree(image); + if (!owncolmap) + xfree(tdata); } void -ui_destroy_cursor(HCURSOR cursor) +ui_destroy_bitmap(HBITMAP bmp) { - XFreeCursor(display, (Cursor) cursor); + XFreePixmap(display, (Pixmap) bmp); } HGLYPH -ui_create_glyph(int width, int height, uint8 *data) +ui_create_glyph(int width, int height, uint8 * data) { XImage *image; Pixmap bitmap; @@ -538,17 +1102,16 @@ 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); - XSetFunction(display, gc, GXcopy); XPutImage(display, bitmap, gc, image, 0, 0, 0, 0, width, height); + XFree(image); XFreeGC(display, gc); - return (HGLYPH) bitmap; } @@ -558,47 +1121,189 @@ XFreePixmap(display, (Pixmap) glyph); } -HCOLOURMAP -ui_create_colourmap(COLOURMAP *colours) +HCURSOR +ui_create_cursor(unsigned int x, unsigned int y, int width, int height, + uint8 * andmask, uint8 * xormask) { - if (!private_colormap) + HGLYPH maskglyph, cursorglyph; + XColor bg, fg; + Cursor xcursor; + uint8 *cursor, *pcursor; + uint8 *mask, *pmask; + uint8 nextbit; + int scanline, offset; + int i, j; + + scanline = (width + 7) / 8; + offset = scanline * height; + + cursor = (uint8*)xmalloc(offset); + memset(cursor, 0, offset); + + mask = (uint8*)xmalloc(offset); + memset(mask, 0, offset); + + /* approximate AND and XOR masks with a monochrome X pointer */ + for (i = 0; i < height; i++) { - COLOURENTRY *entry; - int i, ncolours = colours->ncolours; - uint32 *nc = xmalloc(sizeof(*colmap) * ncolours); + offset -= scanline; + pcursor = &cursor[offset]; + pmask = &mask[offset]; + + for (j = 0; j < scanline; j++) + { + for (nextbit = 0x80; nextbit != 0; nextbit >>= 1) + { + if (xormask[0] || xormask[1] || xormask[2]) + { + *pcursor |= (~(*andmask) & nextbit); + *pmask |= nextbit; + } + else + { + *pcursor |= ((*andmask) & nextbit); + *pmask |= (~(*andmask) & nextbit); + } + + xormask += 3; + } + + andmask++; + pcursor++; + pmask++; + } + } + + fg.red = fg.blue = fg.green = 0xffff; + bg.red = bg.blue = bg.green = 0x0000; + fg.flags = bg.flags = DoRed | DoBlue | DoGreen; + + 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); + + ui_destroy_glyph(maskglyph); + ui_destroy_glyph(cursorglyph); + xfree(mask); + xfree(cursor); + return (HCURSOR) xcursor; +} + +void +ui_set_cursor(HCURSOR cursor) +{ + current_cursor = (Cursor) cursor; + XDefineCursor(display, wnd, current_cursor); +} + +void +ui_destroy_cursor(HCURSOR cursor) +{ + XFreeCursor(display, (Cursor) cursor); +} + +#define MAKE_XCOLOR(xc,c) \ + (xc)->red = ((c)->red << 8) | (c)->red; \ + (xc)->green = ((c)->green << 8) | (c)->green; \ + (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 = (uint32*)xmalloc(sizeof(*colmap) * ncolours); + XColor xentry; + XColor xc_cache[256]; + uint32 colour; + int colLookup = 256; for (i = 0; i < ncolours; i++) { - XColor xc; entry = &colours->colours[i]; - xc.red = entry->red << 8; - xc.green = entry->green << 8; - xc.blue = entry->blue << 8; - XAllocColor(display, - DefaultColormap(display, - DefaultScreen(display)), - &xc); - /* XXX Check return value */ - nc[i] = xc.pixel; + 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; + + /* 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 nc; + return map; } else { - COLOURENTRY *entry; XColor *xcolours, *xentry; Colormap map; - int i, ncolours = colours->ncolours; - xcolours = xmalloc(sizeof(XColor) * ncolours); + + xcolours = (XColor*)xmalloc(sizeof(XColor) * ncolours); for (i = 0; i < ncolours; i++) { entry = &colours->colours[i]; xentry = &xcolours[i]; - xentry->pixel = i; - xentry->red = entry->red << 8; - xentry->blue = entry->blue << 8; - xentry->green = entry->green << 8; - xentry->flags = DoRed | DoBlue | DoGreen; + MAKE_XCOLOR(xentry, entry); } map = XCreateColormap(display, wnd, visual, AllocAll); @@ -612,23 +1317,19 @@ void ui_destroy_colourmap(HCOLOURMAP map) { - XFreeColormap(display, (Colormap) map); + if (!owncolmap) + xfree(map); + else + XFreeColormap(display, (Colormap) map); } void ui_set_colourmap(HCOLOURMAP map) { - - /* XXX, change values of all pixels on the screen if the new colmap - * doesn't have the same values as the old one? */ - if (!private_colormap) - colmap = map; + if (!owncolmap) + colmap = (uint32*)map; else - { XSetWindowColormap(display, wnd, (Colormap) map); - if (fullscreen) - XInstallColormap(display, (Colormap) map); - } } void @@ -644,7 +1345,7 @@ } void -ui_reset_clip() +ui_reset_clip(void) { XRectangle rect; @@ -656,7 +1357,7 @@ } void -ui_bell() +ui_bell(void) { XBell(display, 0); } @@ -665,48 +1366,73 @@ ui_destblt(uint8 opcode, /* dest */ int x, int y, int cx, int cy) { - xwin_set_function(opcode); - - XFillRectangle(display, wnd, gc, x, y, cx, cy); + SET_FUNCTION(opcode); + FILL_RECTANGLE(x, y, cx, cy); + RESET_FUNCTION(opcode); } +static uint8 hatch_patterns[] = { + 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, /* 0 - bsHorizontal */ + 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, /* 1 - bsVertical */ + 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01, /* 2 - bsFDiagonal */ + 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, /* 3 - bsBDiagonal */ + 0x08, 0x08, 0x08, 0xff, 0x08, 0x08, 0x08, 0x08, /* 4 - bsCross */ + 0x81, 0x42, 0x24, 0x18, 0x18, 0x24, 0x42, 0x81 /* 5 - bsDiagCross */ +}; + void ui_patblt(uint8 opcode, /* dest */ int x, int y, int cx, int cy, - /* brush */ BRUSH *brush, int bgcolour, int fgcolour) + /* brush */ BRUSH * brush, int bgcolour, int fgcolour) { - Display *dpy = display; Pixmap fill; uint8 i, ipattern[8]; - xwin_set_function(opcode); + SET_FUNCTION(opcode); switch (brush->style) { case 0: /* Solid */ - XSetForeground(dpy, gc, Ctrans(fgcolour)); - XFillRectangle(dpy, wnd, gc, x, y, cx, cy); + SET_FOREGROUND(fgcolour); + FILL_RECTANGLE(x, y, cx, cy); + break; + + case 2: /* Hatch */ + fill = (Pixmap) ui_create_glyph(8, 8, hatch_patterns + brush->pattern[0] * 8); + SET_FOREGROUND(bgcolour); + SET_BACKGROUND(fgcolour); + XSetFillStyle(display, gc, FillOpaqueStippled); + XSetStipple(display, gc, fill); + 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; case 3: /* Pattern */ for (i = 0; i != 8; i++) - ipattern[i] = ~brush->pattern[i]; + ipattern[7 - i] = brush->pattern[i]; fill = (Pixmap) ui_create_glyph(8, 8, ipattern); - XSetForeground(dpy, gc, Ctrans(fgcolour)); - XSetBackground(dpy, gc, Ctrans(bgcolour)); - XSetFillStyle(dpy, gc, FillOpaqueStippled); - XSetStipple(dpy, gc, fill); + SET_FOREGROUND(bgcolour); + SET_BACKGROUND(fgcolour); + XSetFillStyle(display, gc, FillOpaqueStippled); + XSetStipple(display, gc, fill); + XSetTSOrigin(display, gc, brush->xorigin, brush->yorigin); - XFillRectangle(dpy, wnd, gc, x, y, cx, cy); + FILL_RECTANGLE(x, y, cx, cy); - XSetFillStyle(dpy, gc, FillSolid); + XSetFillStyle(display, gc, FillSolid); + XSetTSOrigin(display, gc, 0, 0); ui_destroy_glyph((HGLYPH) fill); break; default: - NOTIMP("brush %d\n", brush->style); + unimpl("brush %d\n", brush->style); } + + RESET_FUNCTION(opcode); } void @@ -714,9 +1440,11 @@ /* dest */ int x, int y, int cx, int cy, /* src */ int srcx, int srcy) { - xwin_set_function(opcode); - + 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); + RESET_FUNCTION(opcode); } void @@ -724,16 +1452,18 @@ /* dest */ int x, int y, int cx, int cy, /* src */ HBITMAP src, int srcx, int srcy) { - xwin_set_function(opcode); - + 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); + RESET_FUNCTION(opcode); } void ui_triblt(uint8 opcode, /* dest */ int x, int y, int cx, int cy, /* src */ HBITMAP src, int srcx, int srcy, - /* brush */ BRUSH *brush, int bgcolour, int fgcolour) + /* brush */ BRUSH * brush, int bgcolour, int fgcolour) { /* This is potentially difficult to do in general. Until someone comes up with a more efficient way of doing it I am using cases. */ @@ -742,26 +1472,22 @@ { 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: + 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: - NOTIMP("triblt 0x%x\n", opcode); + unimpl("triblt 0x%x\n", opcode); ui_memblt(ROP2_COPY, x, y, cx, cy, src, srcx, srcy); } } @@ -769,12 +1495,14 @@ void ui_line(uint8 opcode, /* dest */ int startx, int starty, int endx, int endy, - /* pen */ PEN *pen) + /* pen */ PEN * pen) { - xwin_set_function(opcode); - - XSetForeground(display, gc, Ctrans(pen->colour)); + SET_FUNCTION(opcode); + SET_FOREGROUND(pen->colour); XDrawLine(display, wnd, gc, startx, starty, endx, endy); + if (ownbackstore) + XDrawLine(display, backstore, gc, startx, starty, endx, endy); + RESET_FUNCTION(opcode); } void @@ -782,103 +1510,143 @@ /* dest */ int x, int y, int cx, int cy, /* brush */ int colour) { - xwin_set_function(ROP2_COPY); - - XSetForeground(display, gc, Ctrans(colour)); - XFillRectangle(display, wnd, gc, x, y, cx, cy); + SET_FOREGROUND(colour); + 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, - /* src */ HGLYPH glyph, int srcx, int srcy, int bgcolour, - int fgcolour) + /* src */ HGLYPH glyph, int srcx, int srcy, + int bgcolour, int fgcolour) { - Pixmap pixmap = (Pixmap) glyph; - - xwin_set_function(ROP2_COPY); - - - XSetForeground(display, gc, Ctrans(fgcolour)); - switch (mixmode) - { - case MIX_TRANSPARENT: - XSetStipple(display, gc, pixmap); - XSetFillStyle(display, gc, FillStippled); - XSetTSOrigin(display, gc, x, y); - XFillRectangle(display, wnd, gc, x, y, cx, cy); - XSetFillStyle(display, gc, FillSolid); - break; - - case MIX_OPAQUE: - XSetBackground(display, gc, Ctrans(bgcolour)); -/* XCopyPlane (display, pixmap, back_pixmap, back_gc, srcx, srcy, cx, cy, x, y, 1); */ - XSetStipple(display, gc, pixmap); - XSetFillStyle(display, gc, FillOpaqueStippled); - XSetTSOrigin(display, gc, x, y); - XFillRectangle(display, wnd, gc, x, y, cx, cy); - XSetFillStyle(display, gc, FillSolid); - break; + SET_FOREGROUND(fgcolour); + SET_BACKGROUND(bgcolour); - default: - NOTIMP("mix %d\n", mixmode); - } + XSetFillStyle(display, gc, + (mixmode == MIX_TRANSPARENT) ? FillStippled : FillOpaqueStippled); + XSetStipple(display, gc, (Pixmap) glyph); + XSetTSOrigin(display, gc, x, y); + + FILL_RECTANGLE_BACKSTORE(x, y, cx, cy); + + XSetFillStyle(display, gc, FillSolid); +} + +#define DO_GLYPH(ttext,idx) \ +{\ + glyph = cache_get_font (font, ttext[idx]);\ + if (!(flags & TEXT2_IMPLICIT_X))\ + {\ + xyoffset = ttext[++idx];\ + if ((xyoffset & 0x80))\ + {\ + if (flags & TEXT2_VERTICAL) \ + y += ttext[idx+1] | (ttext[idx+2] << 8);\ + else\ + x += ttext[idx+1] | (ttext[idx+2] << 8);\ + idx += 2;\ + }\ + else\ + {\ + if (flags & TEXT2_VERTICAL) \ + y += xyoffset;\ + else\ + x += xyoffset;\ + }\ + }\ + if (glyph != NULL)\ + {\ + ui_draw_glyph (mixmode, x + glyph->offset,\ + y + glyph->baseline,\ + glyph->width, glyph->height,\ + glyph->pixmap, 0, 0, bgcolour, fgcolour);\ + if (flags & TEXT2_IMPLICIT_X)\ + x += glyph->width;\ + }\ } 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 fgcolour, uint8 *text, uint8 length) + int boxx, int boxy, int boxcx, int boxcy, int bgcolour, + int fgcolour, uint8 * text, uint8 length) { FONTGLYPH *glyph; - int i, xyoffset; + int i, j, xyoffset; + DATABLOB *entry; - xwin_set_function(ROP2_COPY); - XSetForeground(display, gc, Ctrans(bgcolour)); + SET_FOREGROUND(bgcolour); if (boxcx > 1) - XFillRectangle(display, wnd, gc, boxx, boxy, boxcx, boxcy); + { + FILL_RECTANGLE_BACKSTORE(boxx, boxy, boxcx, boxcy); + } else if (mixmode == MIX_OPAQUE) - XFillRectangle(display, wnd, gc, clipx, clipy, clipcx, clipcy); + { + FILL_RECTANGLE_BACKSTORE(clipx, clipy, clipcx, clipcy); + } /* Paint text, character by character */ - for (i = 0; i < length; i++) + for (i = 0; i < length;) { - glyph = cache_get_font(font, text[i]); - - if (!(flags & TEXT2_IMPLICIT_X)) - + switch (text[i]) { - xyoffset = text[++i]; - if ((xyoffset & 0x80)) - { - if (flags & 0x04) /* vertical text */ - y += text[++i] | (text[++i] << 8); + case 0xff: + if (i + 2 < length) + cache_put_text(text[i + 1], text, text[i + 2]); else - x += text[++i] | (text[++i] << 8); - } - else - { - if (flags & 0x04) /* vertical text */ - y += xyoffset; - else - x += xyoffset; - } + { + error("this shouldn't be happening\n"); + exit(1); + } + /* this will move pointer from start to first character after FF command */ + length -= i + 3; + text = &(text[i + 3]); + i = 0; + break; - } - if (glyph != NULL) - { - ui_draw_glyph(mixmode, x + (short) glyph->offset, - y + (short) glyph->baseline, - glyph->width, glyph->height, - glyph->pixmap, 0, 0, - bgcolour, fgcolour); + case 0xfe: + entry = cache_get_text(text[i + 1]); + if (entry != NULL) + { + if ((((uint8 *) (entry->data))[1] == + 0) && (!(flags & TEXT2_IMPLICIT_X))) + { + if (flags & TEXT2_VERTICAL) + y += text[i + 2]; + else + x += text[i + 2]; + } + 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; - if (flags & TEXT2_IMPLICIT_X) - x += glyph->width; + default: + DO_GLYPH(text, i); + i++; + 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 @@ -887,18 +1655,22 @@ Pixmap pix; XImage *image; - pix = XCreatePixmap(display, wnd, cx, cy, depth); - xwin_set_function(ROP2_COPY); - - XCopyArea(display, wnd, pix, gc, x, y, cx, cy, 0, 0); - image = XGetImage(display, pix, 0, 0, cx, cy, AllPlanes, ZPixmap); + if (ownbackstore) + { + 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); + XFreePixmap(display, pix); + } - offset *= bpp/8; - cache_put_desktop(offset, cx, cy, image->bytes_per_line, - bpp/8, image->data); + offset *= bpp / 8; + cache_put_desktop(offset, cx, cy, image->bytes_per_line, bpp / 8, (uint8 *) image->data); XDestroyImage(image); - XFreePixmap(display, pix); } void @@ -907,407 +1679,23 @@ XImage *image; uint8 *data; - offset *= bpp/8; - data = cache_get_desktop(offset, cx, cy, bpp/8); + offset *= bpp / 8; + data = cache_get_desktop(offset, cx, cy, bpp / 8); if (data == NULL) return; - image = - XCreateImage(display, visual, - depth, ZPixmap, - 0, data, cx, cy, BitmapPad(display), - cx * bpp/8); - xwin_set_function(ROP2_COPY); - XPutImage(display, wnd, gc, image, 0, 0, x, y, cx, cy); - XFree(image); -} -/* unroll defines, used to make the loops a bit more readable... */ -#define unroll8Expr(uexp) uexp uexp uexp uexp uexp uexp uexp uexp -#define unroll8Lefts(uexp) case 7: uexp \ - case 6: uexp \ - case 5: uexp \ - case 4: uexp \ - case 3: uexp \ - case 2: uexp \ - case 1: uexp + image = XCreateImage(display, visual, depth, ZPixmap, 0, + (char *) data, cx, cy, BitmapPad(display), cx * bpp / 8); -static uint8 * -translate(int width, int height, uint8 *data) -{ - uint32 i; - uint32 size = width * height; - uint8 *d2 = xmalloc(size * bpp/8); - uint8 *d3 = d2; - uint32 pix; - i = (size & ~0x7); - - /* XXX: where are the bits swapped??? */ -#ifdef L_ENDIAN /* little-endian */ - /* big-endian screen */ - if (screen_msbfirst) + if (ownbackstore) { - switch (bpp) - { - case 32: - while (i) - { - unroll8Expr(pix = colmap[*data++]; - *d3++ = pix >> 24; - *d3++ = pix >> 16; - *d3++ = pix >> 8; - *d3++ = pix;) i -= 8; - } - i = (size & 0x7); - if (i != 0) - switch (i) - { - unroll8Lefts(pix = - colmap - [*data++]; - *d3++ = - pix >> - 24; - *d3++ = - pix >> - 16; - *d3++ = - pix >> 8; - *d3++ = - pix;)} - break; - case 24: - while (i) - { - unroll8Expr(pix = colmap[*data++]; - *d3++ = pix >> 16; - *d3++ = pix >> 8; - *d3++ = pix;) i -= 8; - } - i = (size & 0x7); - if (i != 0) - switch (i) - { - unroll8Lefts(pix = - colmap - [*data++]; - *d3++ = - pix >> - 16; - *d3++ = - pix >> 8; - *d3++ = - pix;)} - break; - case 16: - while (i) - { - unroll8Expr(pix = colmap[*data++]; - *d3++ = pix >> 8; - *d3++ = pix;) i -= 8; - } - i = (size & 0x7); - if (i != 0) - switch (i) - { - unroll8Lefts(pix = - colmap - [*data++]; - *d3++ = - pix >> 8; - *d3++ = - pix;)} - break; - case 8: - while (i) - { - unroll8Expr(pix = colmap[*data++]; - *d3++ = pix; - )i -= 8; - } - i = (size & 0x7); - if (i != 0) - switch (i) - { - unroll8Lefts(pix = - colmap - [*data++]; - *d3++ = - pix;)} - break; - } + XPutImage(display, backstore, gc, image, 0, 0, x, y, cx, cy); + XCopyArea(display, backstore, wnd, gc, x, y, cx, cy, x, y); } else - { /* little-endian screen */ - switch (bpp) - { - case 32: - while (i) - { - unroll8Expr(*((uint32 *) d3) = - colmap[*data++]; - d3 += sizeof(uint32); - )i -= 8; - } - i = (size & 0x7); - if (i != 0) - switch (i) - { - unroll8Lefts(* - ((uint32 - *) d3) -= colmap[*data++]; -d3 += sizeof(uint32); - )} - break; - case 24: - while (i) - { - unroll8Expr(pix = colmap[*data++]; - *d3++ = pix; - *d3++ = pix >> 8; - *d3++ = pix >> 16; - )i -= 8; - } - i = (size & 0x7); - if (i != 0) - switch (i) - { - unroll8Lefts(pix = - colmap - [*data++]; - *d3++ = - pix; - *d3++ = - pix >> 8; - *d3++ = - pix >> - 16;)} - break; - case 16: - while (i) - { - unroll8Expr(pix = colmap[*data++]; - *d3++ = pix; - *d3++ = pix >> 8; - )i -= 8; - } - i = (size & 0x7); - if (i != 0) - switch (i) - { - unroll8Lefts(pix = - colmap - [*data++]; - *d3++ = - pix; - *d3++ = - pix >> 8; - )} - break; - case 8: - while (i) - { - unroll8Expr(pix = colmap[*data++]; - *d3++ = pix; - )i -= 8; - } - i = (size & 0x7); - if (i != 0) - switch (i) - { - unroll8Lefts(pix = - colmap - [*data++]; - *d3++ = - pix;)} - } - } - -#else /* bigendian-compiled */ - if (screen_msbfirst) { - /* big-endian screen */ - switch (bpp) - { - case 32: - while (i) - { - unroll8Expr(*((uint32 *) d3) = - colmap[*data++]; - d3 += sizeof(uint32); - )i -= 8; - } - i = (size & 0x7); - if (i != 0) - switch (i) - { - unroll8Lefts(* - ((uint32 - *) d3) -= colmap[*data++]; -d3 += sizeof(uint32); - )} - break; - case 24: - while (i) - { - unroll8Expr(pix = colmap[*data++]; - *d3++ = pix; - *d3++ = pix >> 8; - *d3++ = pix >> 16; - )i -= 8; - } - i = (size & 0x7); - if (i != 0) - switch (i) - { - unroll8Lefts(pix = - colmap - [*data++]; - *d3++ = - pix; - *d3++ = - pix >> 8; - *d3++ = - pix >> - 16;)} - break; - case 16: - while (i) - { - unroll8Expr(pix = colmap[*data++]; - *d3++ = pix; - *d3++ = pix >> 8; - )i -= 8; - } - i = (size & 0x7); - if (i != 0) - switch (i) - { - unroll8Lefts(pix = - colmap - [*data++]; - *d3++ = - pix; - *d3++ = - pix >> 8; - )} - break; - case 8: - while (i) - { - unroll8Expr(pix = colmap[*data++]; - *d3++ = pix; - )i -= 8; - } - i = (size & 0x7); - if (i != 0) - switch (i) - { - unroll8Lefts(pix = - colmap - [*data++]; - *d3++ = - pix;)} - } + XPutImage(display, wnd, gc, image, 0, 0, x, y, cx, cy); } - else - { - /* little-endian screen */ - switch (bpp) - { - case 32: - while (i) - { - unroll8Expr(pix = colmap[*data++]; - *d3++ = pix; - *d3++ = pix >> 8; - *d3++ = pix >> 16; - *d3++ = pix >> 24; - )i -= 8; - } - i = (size & 0x7); - if (i != 0) - switch (i) - { - unroll8Lefts(pix = - colmap - [*data++]; - *d3++ = - pix; - *d3++ = - pix >> 8; - *d3++ = - pix >> - 16; - *d3++ = - pix >> - 24;)} - break; - case 24: - while (i) - { - unroll8Expr(pix = colmap[*data++]; - *d3++ = pix; - *d3++ = pix >> 8; - *d3++ = pix >> 16; - )i -= 8; - } - i = (size & 0x7); - if (i != 0) - switch (i) - { - unroll8Lefts(pix = - colmap - [*data++]; - *d3++ = - pix; - *d3++ = - pix >> 8; - *d3++ = - pix >> - 16;)} - break; - case 16: - while (i) - { - unroll8Expr(pix = colmap[*data++]; - *d3++ = pix; - *d3++ = pix >> 8; - )i -= 8; - } - i = (size & 0x7); - if (i != 0) - switch (i) - { - unroll8Lefts(pix = - colmap - [*data++]; - *d3++ = - pix; - *d3++ = - pix >> 8; - )} - break; - case 8: - while (i) - { - unroll8Expr(pix = colmap[*data++]; - *d3++ = pix; - )i -= 8; - } - i = (size & 0x7); - if (i != 0) - switch (i) - { - unroll8Lefts(pix = - colmap - [*data++]; - *d3++ = - pix;)} - } - } -#endif - return d2; + XFree(image); }