--- sourceforge.net/trunk/rdesktop/xwin.c 2000/08/15 12:01:01 12 +++ sourceforge.net/trunk/rdesktop/xwin.c 2001/01/06 03:47:04 25 @@ -32,7 +32,8 @@ static Visual *visual; static XIM IM; -BOOL ui_create_window(char *title) +BOOL +ui_create_window(char *title) { Screen *screen; XSetWindowAttributes attribs; @@ -41,7 +42,10 @@ display = XOpenDisplay(NULL); if (display == NULL) + { + ERROR("Failed to open display\n"); return False; + } /* Check the screen supports 8-bit depth. */ screen = DefaultScreenOfDisplay(display); @@ -58,16 +62,17 @@ visual = DefaultVisual(display, DefaultScreen(display)); - attribs.background_pixel = BlackPixel(display, DefaultScreen(display)); + attribs.background_pixel = + BlackPixel(display, DefaultScreen(display)); attribs.backing_store = Always; wnd = XCreateWindow(display, DefaultRootWindow(display), - 0, 0, width, height, 0, 8, InputOutput, visual, - CWBackingStore | CWBackPixel, &attribs); + 0, 0, width, height, 0, 8, InputOutput, visual, + CWBackingStore | CWBackPixel, &attribs); XStoreName(display, wnd, title); XMapWindow(display, wnd); - input_mask = KeyPressMask | KeyReleaseMask; + input_mask = KeyPressMask | KeyReleaseMask; input_mask |= ButtonPressMask | ButtonReleaseMask; if (motion) input_mask |= PointerMotionMask; @@ -79,7 +84,8 @@ return True; } -void ui_destroy_window() +void +ui_destroy_window() { XCloseIM(IM); XFreeGC(display, gc); @@ -87,7 +93,8 @@ XCloseDisplay(display); } -static uint8 xwin_translate_key(unsigned long key) +static uint8 +xwin_translate_key(unsigned long key) { DEBUG("KEY(code=0x%lx)\n", key); @@ -96,37 +103,39 @@ switch (key) { - case 0x62: /* left arrow */ + case 0x62: /* left arrow */ return 0x48; - case 0x64: /* up arrow */ + case 0x64: /* up arrow */ return 0x4b; - case 0x66: /* down arrow */ + case 0x66: /* down arrow */ return 0x4d; - case 0x68: /* right arrow */ + case 0x68: /* right arrow */ return 0x50; - case 0x73: /* Windows key */ + case 0x73: /* Windows key */ DEBUG("CHECKPOINT\n"); } return 0; } -static uint16 xwin_translate_mouse(unsigned long button) +static uint16 +xwin_translate_mouse(unsigned long button) { switch (button) { - case Button1: /* left */ + case Button1: /* left */ return MOUSE_FLAG_BUTTON1; - case Button2: /* middle */ + case Button2: /* middle */ return MOUSE_FLAG_BUTTON3; - case Button3: /* right */ + case Button3: /* right */ return MOUSE_FLAG_BUTTON2; } return 0; } -void ui_process_events() +void +ui_process_events() { XEvent event; uint8 scancode; @@ -143,62 +152,72 @@ switch (event.type) { case KeyPress: - scancode = xwin_translate_key(event.xkey.keycode); + scancode = + xwin_translate_key(event. + xkey.keycode); if (scancode == 0) break; rdp_send_input(ev_time, RDP_INPUT_SCANCODE, 0, - scancode, 0); + scancode, 0); break; case KeyRelease: - scancode = xwin_translate_key(event.xkey.keycode); + scancode = + xwin_translate_key(event. + xkey.keycode); if (scancode == 0) break; rdp_send_input(ev_time, RDP_INPUT_SCANCODE, - KBD_FLAG_DOWN | KBD_FLAG_UP, - scancode, 0); + KBD_FLAG_DOWN | KBD_FLAG_UP, + scancode, 0); break; case ButtonPress: - button = xwin_translate_mouse(event.xbutton.button); + button = + xwin_translate_mouse(event. + xbutton.button); if (button == 0) break; rdp_send_input(ev_time, RDP_INPUT_MOUSE, - button | MOUSE_FLAG_DOWN, - event.xbutton.x, - event.xbutton.y); + button | MOUSE_FLAG_DOWN, + event.xbutton.x, + event.xbutton.y); break; case ButtonRelease: - button = xwin_translate_mouse(event.xbutton.button); + button = + xwin_translate_mouse(event. + xbutton.button); if (button == 0) break; rdp_send_input(ev_time, RDP_INPUT_MOUSE, - button, - event.xbutton.x, - event.xbutton.y); + button, + event.xbutton.x, + event.xbutton.y); break; case MotionNotify: rdp_send_input(ev_time, RDP_INPUT_MOUSE, - MOUSE_FLAG_MOVE, - event.xmotion.x, - event.xmotion.y); + MOUSE_FLAG_MOVE, + event.xmotion.x, + event.xmotion.y); } } } -void ui_move_pointer(int x, int y) +void +ui_move_pointer(int x, int y) { XWarpPointer(display, wnd, wnd, 0, 0, 0, 0, x, y); } -HBITMAP ui_create_bitmap(int width, int height, uint8 *data) +HBITMAP +ui_create_bitmap(int width, int height, uint8 *data) { XImage *image; Pixmap bitmap; @@ -206,32 +225,35 @@ bitmap = XCreatePixmap(display, wnd, width, height, 8); image = XCreateImage(display, visual, 8, ZPixmap, 0, - data, width, height, 8, width); + data, width, height, 8, width); XSetFunction(display, gc, GXcopy); XPutImage(display, bitmap, gc, image, 0, 0, 0, 0, width, height); XFree(image); - - return (HBITMAP)bitmap; + + return (HBITMAP) bitmap; } -void ui_paint_bitmap(int x, int y, int cx, int cy, - int width, int height, uint8 *data) +void +ui_paint_bitmap(int x, int y, int cx, int cy, + int width, int height, uint8 *data) { XImage *image; image = XCreateImage(display, visual, 8, ZPixmap, 0, - data, width, height, 8, width); + data, width, height, 8, width); XSetFunction(display, gc, GXcopy); XPutImage(display, wnd, gc, image, 0, 0, x, y, cx, cy); - XFree(image); + XFree(image); } -void ui_destroy_bitmap(HBITMAP bmp) +void +ui_destroy_bitmap(HBITMAP bmp) { - XFreePixmap(display, (Pixmap)bmp); + XFreePixmap(display, (Pixmap) bmp); } -HGLYPH ui_create_glyph(int width, int height, uint8 *data) +HGLYPH +ui_create_glyph(int width, int height, uint8 *data) { XImage *image; Pixmap bitmap; @@ -244,21 +266,27 @@ gc = XCreateGC(display, bitmap, 0, NULL); image = XCreateImage(display, visual, 1, ZPixmap, 0, - data, width, height, 8, scanline); + 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; + + return (HGLYPH) bitmap; } -void ui_destroy_glyph(HGLYPH glyph) +void +ui_destroy_glyph(HGLYPH glyph) { - XFreePixmap(display, (Pixmap)glyph); + XFreePixmap(display, (Pixmap) glyph); } -HCOLOURMAP ui_create_colourmap(COLOURMAP *colours) +HCOLOURMAP +ui_create_colourmap(COLOURMAP *colours) { COLOURENTRY *entry; XColor *xcolours, *xentry; @@ -282,20 +310,23 @@ XStoreColors(display, map, xcolours, ncolours); xfree(xcolours); - return (HCOLOURMAP)map; + return (HCOLOURMAP) map; } -void ui_destroy_colourmap(HCOLOURMAP map) +void +ui_destroy_colourmap(HCOLOURMAP map) { - XFreeColormap(display, (Colormap)map); + XFreeColormap(display, (Colormap) map); } -void ui_set_colourmap(HCOLOURMAP map) +void +ui_set_colourmap(HCOLOURMAP map) { - XSetWindowColormap(display, wnd, (Colormap)map); + XSetWindowColormap(display, wnd, (Colormap) map); } -void ui_set_clip(int x, int y, int cx, int cy) +void +ui_set_clip(int x, int y, int cx, int cy) { XRectangle rect; @@ -306,7 +337,8 @@ XSetClipRectangles(display, gc, 0, 0, &rect, 1, YXBanded); } -void ui_reset_clip() +void +ui_reset_clip() { XRectangle rect; @@ -317,46 +349,50 @@ XSetClipRectangles(display, gc, 0, 0, &rect, 1, YXBanded); } -void ui_bell() +void +ui_bell() { XBell(display, 0); } static int rop2_map[] = { - GXclear, /* 0 */ - GXnor, /* DPon */ - GXandInverted, /* DPna */ - GXcopyInverted, /* Pn */ - GXandReverse, /* PDna */ - GXinvert, /* Dn */ - GXxor, /* DPx */ - GXnand, /* DPan */ - GXand, /* DPa */ - GXequiv, /* DPxn */ - GXnoop, /* D */ - GXorInverted, /* DPno */ - GXcopy, /* P */ - GXorReverse, /* PDno */ - GXor, /* DPo */ - GXset /* 1 */ + GXclear, /* 0 */ + GXnor, /* DPon */ + GXandInverted, /* DPna */ + GXcopyInverted, /* Pn */ + GXandReverse, /* PDna */ + GXinvert, /* Dn */ + GXxor, /* DPx */ + GXnand, /* DPan */ + GXand, /* DPa */ + GXequiv, /* DPxn */ + GXnoop, /* D */ + GXorInverted, /* DPno */ + GXcopy, /* P */ + GXorReverse, /* PDno */ + GXor, /* DPo */ + GXset /* 1 */ }; -static void xwin_set_function(uint8 rop2) +static void +xwin_set_function(uint8 rop2) { XSetFunction(display, gc, rop2_map[rop2]); } -void ui_destblt(uint8 opcode, - /* dest */ int x, int y, int cx, int cy) +void +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); } -void ui_patblt(uint8 opcode, - /* dest */ int x, int y, int cx, int cy, - /* brush */ BRUSH *brush, int bgcolour, int fgcolour) +void +ui_patblt(uint8 opcode, + /* dest */ int x, int y, int cx, int cy, + /* brush */ BRUSH *brush, int bgcolour, int fgcolour) { Display *dpy = display; Pixmap fill; @@ -365,13 +401,13 @@ switch (brush->style) { - case 0: /* Solid */ + case 0: /* Solid */ XSetForeground(dpy, gc, fgcolour); XFillRectangle(dpy, wnd, gc, x, y, cx, cy); break; - case 3: /* Pattern */ - fill = (Pixmap)ui_create_glyph(8, 8, brush->pattern); + case 3: /* Pattern */ + fill = (Pixmap) ui_create_glyph(8, 8, brush->pattern); XSetForeground(dpy, gc, fgcolour); XSetBackground(dpy, gc, bgcolour); @@ -381,7 +417,7 @@ XFillRectangle(dpy, wnd, gc, x, y, cx, cy); XSetFillStyle(dpy, gc, FillSolid); - ui_destroy_glyph((HGLYPH)fill); + ui_destroy_glyph((HGLYPH) fill); break; default: @@ -389,55 +425,61 @@ } } -void ui_screenblt(uint8 opcode, - /* dest */ int x, int y, int cx, int cy, - /* src */ int srcx, int srcy) +void +ui_screenblt(uint8 opcode, + /* dest */ int x, int y, int cx, int cy, + /* src */ int srcx, int srcy) { xwin_set_function(opcode); - XCopyArea(display, wnd, wnd, gc, srcx, srcy, - cx, cy, x, y); + XCopyArea(display, wnd, wnd, gc, srcx, srcy, cx, cy, x, y); } -void ui_memblt(uint8 opcode, - /* dest */ int x, int y, int cx, int cy, - /* src */ HBITMAP src, int srcx, int srcy) +void +ui_memblt(uint8 opcode, + /* 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); + XCopyArea(display, (Pixmap) src, wnd, gc, srcx, srcy, cx, cy, x, y); } -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) +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) { /* This is potentially difficult to do in general. Until someone comes up with a more efficient way of doing it I am using cases. */ switch (opcode) { - case 0xb8: /* PSDPxax */ + 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); + break; + + case 0xb8: /* PSDPxax */ ui_patblt(ROP2_XOR, x, y, cx, cy, - brush, bgcolour, fgcolour); - ui_memblt(ROP2_AND, x, y, cx, cy, - src, srcx, srcy); + 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); + brush, bgcolour, fgcolour); break; default: NOTIMP("triblt 0x%x\n", opcode); - ui_memblt(ROP2_COPY, x, y, cx, cy, - brush, bgcolour, fgcolour); + ui_memblt(ROP2_COPY, x, y, cx, cy, src, srcx, srcy); } } -void ui_line(uint8 opcode, - /* dest */ int startx, int starty, int endx, int endy, - /* pen */ PEN *pen) +void +ui_line(uint8 opcode, + /* dest */ int startx, int starty, int endx, int endy, + /* pen */ PEN *pen) { xwin_set_function(opcode); @@ -445,9 +487,10 @@ XDrawLine(display, wnd, gc, startx, starty, endx, endy); } -void ui_rect( - /* dest */ int x, int y, int cx, int cy, - /* brush */ int colour) +void +ui_rect( + /* dest */ int x, int y, int cx, int cy, + /* brush */ int colour) { xwin_set_function(ROP2_COPY); @@ -455,11 +498,13 @@ XFillRectangle(display, wnd, gc, x, y, cx, cy); } -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) +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) { - Pixmap pixmap = (Pixmap)glyph; + Pixmap pixmap = (Pixmap) glyph; xwin_set_function(ROP2_COPY); @@ -471,15 +516,14 @@ XSetStipple(display, gc, pixmap); XSetFillStyle(display, gc, FillStippled); XSetTSOrigin(display, gc, x, y); - XFillRectangle(display, wnd, gc, - x, y, cx, cy); + XFillRectangle(display, wnd, gc, x, y, cx, cy); XSetFillStyle(display, gc, FillSolid); break; case MIX_OPAQUE: XSetBackground(display, gc, bgcolour); XCopyPlane(display, pixmap, wnd, gc, - srcx, srcy, cx, cy, x, y, 1); + srcx, srcy, cx, cy, x, y, 1); break; default: @@ -487,9 +531,11 @@ } } -void ui_draw_text(uint8 font, uint8 flags, int mixmode, int x, - int y, int boxx, int boxy, int boxcx, int boxcy, - int bgcolour, int fgcolour, uint8 *text, uint8 length) +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) { FONTGLYPH *glyph; int i; @@ -498,55 +544,56 @@ { ui_rect(boxx, boxy, boxcx, boxcy, bgcolour); } + else if (mixmode == MIX_OPAQUE) + { + ui_rect(clipx, clipy, clipcx, clipcy, bgcolour); + } /* Paint text, character by character */ for (i = 0; i < length; i++) { glyph = cache_get_font(font, text[i]); + if (!(flags & TEXT2_IMPLICIT_X)) + x += text[++i]; + if (glyph != NULL) { - ui_draw_glyph(mixmode, x, - y + (short)glyph->baseline, - glyph->width, glyph->height, - glyph->pixmap, 0, 0, - bgcolour, fgcolour); + ui_draw_glyph(mixmode, x + (short) glyph->offset, + y + (short) glyph->baseline, + glyph->width, glyph->height, + glyph->pixmap, 0, 0, + bgcolour, fgcolour); if (flags & TEXT2_IMPLICIT_X) x += glyph->width; - else - x += text[++i]; } } } -void ui_desktop_save(uint32 offset, int x, int y, int cx, int cy) +void +ui_desktop_save(uint32 offset, int x, int y, int cx, int cy) { XImage *image; - int scanline; - scanline = (cx + 3) & ~3; - DEBUG("XGetImage(%p,%x,%d,%d,%d,%d,%x,%d)\n", display, wnd, x, y, - cx, cy, 0xffffffff, ZPixmap); image = XGetImage(display, wnd, x, y, cx, cy, 0xffffffff, ZPixmap); - cache_put_desktop(offset, scanline*cy, image->data); + cache_put_desktop(offset, cx, cy, image->bytes_per_line, image->data); XFree(image->data); XFree(image); } -void ui_desktop_restore(uint32 offset, int x, int y, int cx, int cy) +void +ui_desktop_restore(uint32 offset, int x, int y, int cx, int cy) { XImage *image; - int scanline; uint8 *data; - scanline = (cx + 3) & ~3; - data = cache_get_desktop(offset, scanline*cy); + data = cache_get_desktop(offset, cx, cy); if (data == NULL) return; image = XCreateImage(display, visual, 8, ZPixmap, 0, - data, cx, cy, 32, scanline); + data, cx, cy, 32, cx); XSetFunction(display, gc, GXcopy); XPutImage(display, wnd, gc, image, 0, 0, x, y, cx, cy); XFree(image);