--- sourceforge.net/trunk/rdesktop/xwin.c 2001/09/14 13:51:38 30 +++ sourceforge.net/trunk/rdesktop/xwin.c 2001/09/15 14:01:45 35 @@ -21,6 +21,7 @@ #include #include #include +#include #include "rdesktop.h" extern int width; @@ -29,19 +30,35 @@ extern BOOL fullscreen; static Display *display; +static int x_socket; static Window wnd; static GC gc; static Visual *visual; static int depth; static int bpp; -static BOOL backpixmap; +/* 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; -#define TRANSLATE(col) ( owncolmap ? col : colmap[col] ) +#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)); @@ -81,7 +98,7 @@ *(out++) = (uint16)colmap[*(data++)]; } -/* XXX endianness */ +/* little endian - conversion happens when colourmap is built */ static void translate24(uint8 *data, uint8 *out, uint8 *end) { @@ -104,7 +121,7 @@ } static uint8 * -translate(int width, int height, uint8 *data) +translate_image(int width, int height, uint8 *data) { int size = width * height * bpp/8; uint8 *out = xmalloc(size); @@ -132,9 +149,34 @@ return out; } -#define L_ENDIAN -int screen_msbfirst = 0; +#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 ui_create_window(char *title) @@ -145,9 +187,9 @@ unsigned long input_mask; XPixmapFormatValues *pfm; Screen *screen; + uint16 test; int i; - display = XOpenDisplay(NULL); if (display == NULL) { @@ -155,6 +197,7 @@ return False; } + x_socket = ConnectionNumber(display); screen = DefaultScreenOfDisplay(display); visual = DefaultVisualOfScreen(screen); depth = DefaultDepthOfScreen(screen); @@ -187,12 +230,16 @@ 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) - backpixmap = True; + ownbackstore = True; if (fullscreen) { @@ -240,9 +287,15 @@ if (sendmotion) input_mask |= PointerMotionMask; + 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; } @@ -250,6 +303,9 @@ void ui_destroy_window() { + if (ownbackstore) + XFreePixmap(display, backstore); + XFreeGC(display, gc); XDestroyWindow(display, wnd); XCloseDisplay(display); @@ -325,8 +381,8 @@ return 0; } -void -ui_process_events() +static void +xwin_process_events() { XEvent event; uint8 scancode; @@ -398,11 +454,51 @@ case LeaveNotify: 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); @@ -415,7 +511,7 @@ Pixmap bitmap; uint8 *tdata; - tdata = (owncolmap ? 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, 8, 0); @@ -435,11 +531,19 @@ XImage *image; uint8 *tdata; - tdata = (owncolmap ? data : translate(width, height, data)); + tdata = (owncolmap ? data : translate_image(width, height, data)); image = XCreateImage(display, visual, depth, ZPixmap, 0, tdata, width, height, 8, 0); - XPutImage(display, wnd, gc, image, 0, 0, x, y, cx, cy); + if (ownbackstore) + { + XPutImage(display, backstore, gc, image, 0, 0, x, y, cx, cy); + XCopyArea(display, backstore, wnd, gc, x, y, cx, cy, x, y); + } + else + { + XPutImage(display, wnd, gc, image, 0, 0, x, y, cx, cy); + } XFree(image); if (!owncolmap) @@ -602,6 +706,7 @@ { uint32 *map = xmalloc(sizeof(*colmap) * ncolours); XColor xentry; + uint32 colour; for (i = 0; i < ncolours; i++) { @@ -609,9 +714,12 @@ MAKE_XCOLOR(&xentry, entry); if (XAllocColor(display, xcolmap, &xentry) != 0) - map[i] = xentry.pixel; + colour = xentry.pixel; else - map[i] = white; + colour = white; + + /* byte swap here to make translate_image faster */ + map[i] = translate_colour(colour); } return map; @@ -671,7 +779,7 @@ /* dest */ int x, int y, int cx, int cy) { SET_FUNCTION(opcode); - XFillRectangle(display, wnd, gc, x, y, cx, cy); + FILL_RECTANGLE(x, y, cx, cy); RESET_FUNCTION(opcode); } @@ -688,7 +796,7 @@ { case 0: /* Solid */ SET_FOREGROUND(fgcolour); - XFillRectangle(display, wnd, gc, x, y, cx, cy); + FILL_RECTANGLE(x, y, cx, cy); break; case 3: /* Pattern */ @@ -700,7 +808,7 @@ XSetStipple(display, gc, fill); XSetTSOrigin(display, gc, brush->xorigin, brush->yorigin); - XFillRectangle(display, wnd, gc, x, y, cx, cy); + FILL_RECTANGLE(x, y, cx, cy); XSetFillStyle(display, gc, FillSolid); ui_destroy_glyph((HGLYPH)fill); @@ -720,6 +828,9 @@ { 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); } @@ -730,6 +841,9 @@ { 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); } @@ -778,6 +892,8 @@ 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); } @@ -787,7 +903,7 @@ /* brush */ int colour) { SET_FOREGROUND(colour); - XFillRectangle(display, wnd, gc, x, y, cx, cy); + FILL_RECTANGLE(x, y, cx, cy); } void @@ -804,7 +920,7 @@ XSetStipple(display, gc, (Pixmap)glyph); XSetTSOrigin(display, gc, x, y); - XFillRectangle(display, wnd, gc, x, y, cx, cy); + FILL_RECTANGLE(x, y, cx, cy); XSetFillStyle(display, gc, FillSolid); } @@ -821,9 +937,13 @@ 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++) @@ -862,17 +982,25 @@ Pixmap pix; XImage *image; - 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); + 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); XDestroyImage(image); - XFreePixmap(display, pix); } void @@ -890,7 +1018,15 @@ 0, data, cx, cy, BitmapPad(display), cx * bpp/8); - XPutImage(display, wnd, gc, image, 0, 0, x, y, cx, cy); + if (ownbackstore) + { + XPutImage(display, backstore, gc, image, 0, 0, x, y, cx, cy); + XCopyArea(display, backstore, wnd, gc, x, y, cx, cy, x, y); + } + else + { + XPutImage(display, wnd, gc, image, 0, 0, x, y, cx, cy); + } + XFree(image); } -