--- sourceforge.net/trunk/rdesktop/xwin.c 2001/06/20 13:54:48 28 +++ sourceforge.net/trunk/rdesktop/xwin.c 2002/04/10 14:07:56 44 @@ -1,7 +1,7 @@ /* 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-2001 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 @@ -21,29 +21,48 @@ #include #include #include +#include #include "rdesktop.h" +extern char keymapname[16]; +extern int keylayout; 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; +static int x_socket; static Window wnd; static GC gc; static Visual *visual; -static uint32 *colmap; - -#define Ctrans(col) ( private_colormap ? col : colmap[col]) +static int depth; +static int bpp; -#define L_ENDIAN -int screen_msbfirst = 0; +/* endianness */ +static BOOL host_be; +static BOOL xserver_be; + +/* software backing store */ +static BOOL ownbackstore; +static Pixmap backstore; + +#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); \ +} + +/* colour maps */ +static BOOL owncolmap; +static Colormap xcolmap; +static uint32 white; +static uint32 *colmap; -static uint8 *translate(int width, int height, uint8 *data); +#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)); static int rop2_map[] = { GXclear, /* 0 */ @@ -64,29 +83,101 @@ 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 -xwin_set_function(uint8 rop2) +translate8(uint8 *data, uint8 *out, uint8 *end) { - static uint8 last_rop2 = ROP2_COPY; + while (out < end) + *(out++) = (uint8)colmap[*(data++)]; +} - if (last_rop2 != rop2) +static void +translate16(uint8 *data, uint16 *out, uint16 *end) +{ + while (out < end) + *(out++) = (uint16)colmap[*(data++)]; +} + +/* little endian - conversion happens when colourmap is built */ +static void +translate24(uint8 *data, uint8 *out, uint8 *end) +{ + uint32 value; + + while (out < end) { - XSetFunction(display, gc, rop2_map[rop2]); - last_rop2 = rop2; + value = colmap[*(data++)]; + *(out++) = value; + *(out++) = value >> 8; + *(out++) = value >> 16; } } static void -xwin_grab_keyboard() +translate32(uint8 *data, uint32 *out, uint32 *end) { - XGrabKeyboard(display, wnd, True, GrabModeAsync, GrabModeAsync, - CurrentTime); + while (out < end) + *(out++) = colmap[*(data++)]; } -static void -xwin_ungrab_keyboard() +static uint8 * +translate_image(int width, int height, uint8 *data) { - XUngrabKeyboard(display, CurrentTime); + int size = width * height * bpp/8; + uint8 *out = xmalloc(size); + uint8 *end = out + size; + + switch (bpp) + { + case 8: + translate8(data, out, end); + break; + + case 16: + translate16(data, (uint16 *)out, (uint16 *)end); + break; + + case 24: + translate24(data, out, end); + break; + + case 32: + translate32(data, (uint32 *)out, (uint32 *)end); + break; + } + + return out; +} + +#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 (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; } BOOL @@ -97,26 +188,33 @@ XSizeHints *sizehints; unsigned long input_mask; XPixmapFormatValues *pfm; - int count; + Screen *screen; + uint16 test; + int i; display = XOpenDisplay(NULL); if (display == NULL) { - ERROR("Failed to open display\n"); + error("Failed to open display\n"); 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,30 +222,41 @@ 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 (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); - attribs.background_pixel = BlackPixel(display, DefaultScreen(display)); - attribs.backing_store = Always; + if (attribs.backing_store == NotUseful) + ownbackstore = True; 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 { attribs.override_redirect = False; } - wnd = XCreateWindow(display, DefaultRootWindow(display), + width = (width + 3) & ~3; /* make width a multiple of 32 bits */ + + wnd = XCreateWindow(display, RootWindowOfScreen(screen), 0, 0, width, height, 0, CopyFromParent, InputOutput, CopyFromParent, CWBackingStore | CWBackPixel | CWOverrideRedirect, @@ -157,10 +266,8 @@ 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,28 +275,31 @@ 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) + xkeymap_init(display); + + input_mask = KeyPressMask | KeyReleaseMask + | ButtonPressMask | ButtonReleaseMask + | EnterWindowMask | LeaveWindowMask; + + if (sendmotion) input_mask |= PointerMotionMask; - if (grab_keyboard) - input_mask |= EnterWindowMask | LeaveWindowMask; + + if (ownbackstore) + input_mask |= ExposureMask; XSelectInput(display, wnd, input_mask); gc = XCreateGC(display, wnd, 0, NULL); + if (ownbackstore) + backstore = XCreatePixmap(display, wnd, width, height, depth); + XMapWindow(display, wnd); return True; } @@ -197,85 +307,20 @@ void ui_destroy_window() { + if (ownbackstore) + XFreePixmap(display, backstore); + XFreeGC(display, gc); XDestroyWindow(display, wnd); XCloseDisplay(display); display = NULL; } -static uint8 -xwin_translate_key(unsigned long key) -{ - DEBUG("KEY(code=0x%lx)\n", key); - - if ((key > 8) && (key <= 0x60)) - return (key - 8); - - 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() +static void +xwin_process_events() { XEvent event; + KeySym keysym; uint8 scancode; uint16 button; uint32 ev_time; @@ -283,14 +328,15 @@ if (display == NULL) return; - while (XCheckWindowEvent(display, wnd, ~0, &event)) + while (XCheckMaskEvent(display, ~0, &event)) { ev_time = time(NULL); switch (event.type) { case KeyPress: - scancode = xwin_translate_key(event.xkey.keycode); + keysym = XKeycodeToKeysym(display, event.xkey.keycode, 0); + scancode = xkeymap_translate_key(keysym, event.xkey.keycode); if (scancode == 0) break; @@ -299,7 +345,8 @@ break; case KeyRelease: - scancode = xwin_translate_key(event.xkey.keycode); + keysym = XKeycodeToKeysym(display, event.xkey.keycode, 0); + scancode = xkeymap_translate_key(keysym, event.xkey.keycode); if (scancode == 0) break; @@ -309,7 +356,7 @@ break; case ButtonPress: - button = xwin_translate_mouse(event.xbutton.button); + button = xkeymap_translate_button(event.xbutton.button); if (button == 0) break; @@ -320,7 +367,7 @@ break; case ButtonRelease: - button = xwin_translate_mouse(event.xbutton.button); + button = xkeymap_translate_button(event.xbutton.button); if (button == 0) break; @@ -338,19 +385,58 @@ break; case EnterNotify: - if (grab_keyboard) - xwin_grab_keyboard(); + XGrabKeyboard(display, wnd, True, GrabModeAsync, + GrabModeAsync, CurrentTime); break; case LeaveNotify: - if (grab_keyboard) - xwin_ungrab_keyboard(); + XUngrabKeyboard(display, CurrentTime); + break; + + case Expose: + XCopyArea(display, backstore, wnd, gc, + event.xexpose.x, event.xexpose.y, + event.xexpose.width, event.xexpose.height, + event.xexpose.x, event.xexpose.y); break; } } } void +ui_select(int rdp_socket) +{ + int n = (rdp_socket > x_socket) ? rdp_socket+1 : x_socket+1; + fd_set rfds; + + XFlush(display); + + FD_ZERO(&rfds); + + while (True) + { + 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(x_socket, &rfds)) + xwin_process_events(); + + if (FD_ISSET(rdp_socket, &rfds)) + return; + } +} + +void ui_move_pointer(int x, int y) { XWarpPointer(display, wnd, wnd, 0, 0, 0, 0, x, y); @@ -362,18 +448,16 @@ 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, tdata, width, height, 8, 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; } @@ -383,146 +467,31 @@ 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); -} + uint8 *tdata; -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; + tdata = (owncolmap ? data : translate_image(width, height, data)); + image = XCreateImage(display, visual, depth, ZPixmap, + 0, tdata, width, height, 8, 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 @@ -544,91 +513,173 @@ 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; + return (HGLYPH)bitmap; } void ui_destroy_glyph(HGLYPH glyph) { - XFreePixmap(display, (Pixmap) glyph); + 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 = xmalloc(offset); + memset(cursor, 0, offset); + + mask = 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); - for (i = 0; i < ncolours; i++) + offset -= scanline; + pcursor = &cursor[offset]; + pmask = &mask[offset]; + + for (j = 0; j < scanline; j++) { - 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; + 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++; } - return nc; } - else + + 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) +{ + XDefineCursor(display, wnd, (Cursor)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) { - COLOURENTRY *entry; XColor *xcolours, *xentry; Colormap map; - int i, ncolours = colours->ncolours; + xcolours = 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); XStoreColors(display, map, xcolours, ncolours); xfree(xcolours); - return (HCOLOURMAP) map; + 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) { - XFreeColormap(display, (Colormap) map); + if (owncolmap) + XFreeColormap(display, (Colormap)map); + else + xfree(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) + XSetWindowColormap(display, wnd, (Colormap)map); else - { - XSetWindowColormap(display, wnd, (Colormap) map); - if (fullscreen) - XInstallColormap(display, (Colormap) map); - } + colmap = map; } void @@ -665,9 +716,9 @@ 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); } void @@ -675,38 +726,37 @@ /* dest */ int x, int y, int cx, int cy, /* 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 3: /* Pattern */ - for (i = 0; i != 8; i++) - ipattern[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); + fill = (Pixmap)ui_create_glyph(8, 8, brush->pattern); - XFillRectangle(dpy, wnd, gc, x, y, cx, cy); + SET_FOREGROUND(bgcolour); + SET_BACKGROUND(fgcolour); + XSetFillStyle(display, gc, FillOpaqueStippled); + XSetStipple(display, gc, fill); + XSetTSOrigin(display, gc, brush->xorigin, brush->yorigin); - XSetFillStyle(dpy, gc, FillSolid); - ui_destroy_glyph((HGLYPH) fill); + FILL_RECTANGLE(x, y, cx, cy); + + XSetFillStyle(display, gc, FillSolid); + 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 +764,12 @@ /* 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,9 +777,12 @@ /* dest */ int x, int y, int cx, int cy, /* src */ HBITMAP src, int srcx, int srcy) { - xwin_set_function(opcode); - - XCopyArea(display, (Pixmap) src, wnd, gc, srcx, srcy, cx, cy, x, y); + 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 @@ -754,14 +810,14 @@ 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); 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); } } @@ -771,10 +827,12 @@ /* dest */ int startx, int starty, int endx, int endy, /* 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,10 +840,8 @@ /* 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); } void @@ -794,35 +850,17 @@ /* src */ HGLYPH glyph, int srcx, int srcy, int bgcolour, int fgcolour) { - Pixmap pixmap = (Pixmap) glyph; + SET_FOREGROUND(fgcolour); + SET_BACKGROUND(bgcolour); - xwin_set_function(ROP2_COPY); + XSetFillStyle(display, gc, (mixmode == MIX_TRANSPARENT) + ? FillStippled : FillOpaqueStippled); + XSetStipple(display, gc, (Pixmap)glyph); + XSetTSOrigin(display, gc, x, y); + FILL_RECTANGLE(x, y, cx, cy); - 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; - - default: - NOTIMP("mix %d\n", mixmode); - } + XSetFillStyle(display, gc, FillSolid); } void @@ -832,15 +870,19 @@ int bgcolour, int fgcolour, uint8 *text, uint8 length) { FONTGLYPH *glyph; - int i, xyoffset; + short offset; + int i; - 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(boxx, boxy, boxcx, boxcy); + } else if (mixmode == MIX_OPAQUE) - XFillRectangle(display, wnd, gc, clipx, clipy, clipcx, clipcy); + { + FILL_RECTANGLE(clipx, clipy, clipcx, clipcy); + } /* Paint text, character by character */ for (i = 0; i < length; i++) @@ -848,25 +890,29 @@ glyph = cache_get_font(font, text[i]); if (!(flags & TEXT2_IMPLICIT_X)) - { - xyoffset = text[++i]; - if ((xyoffset & 0x80)) + offset = text[++i]; + if (offset & 0x80) { - if (flags & 0x04) /* vertical text */ - y += text[++i] | (text[++i] << 8); - else - x += text[++i] | (text[++i] << 8); - } - else - { - if (flags & 0x04) /* vertical text */ - y += xyoffset; + if (offset == 0x80) + { + /* next two bytes, little-endian */ + offset = text[++i]; + offset |= text[++i] << 8; + } else - x += xyoffset; + { + offset = (offset & 0x7f) << 8; + offset |= text[++i]; + } } + if (flags & TEXT2_VERTICAL) + y += offset; + else + x += offset; } + if (glyph != NULL) { ui_draw_glyph(mixmode, x + (short) glyph->offset, @@ -887,18 +933,25 @@ 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); + bpp/8, (uint8 *)image->data); XDestroyImage(image); - XFreePixmap(display, pix); } void @@ -911,403 +964,20 @@ data = cache_get_desktop(offset, cx, cy, bpp/8); if (data == NULL) return; - image = - XCreateImage(display, visual, - depth, ZPixmap, + + 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 - -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) - { - 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; - } - } - 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) + if (ownbackstore) { - /* 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, 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(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;)} - } + XPutImage(display, wnd, gc, image, 0, 0, x, y, cx, cy); } -#endif - return d2; + XFree(image); }