--- sourceforge.net/trunk/rdesktop/xwin.c 2003/08/27 08:21:53 448 +++ sourceforge.net/trunk/rdesktop/xwin.c 2005/05/20 22:09:32 905 @@ -1,7 +1,7 @@ /* -*- c-basic-offset: 8 -*- rdesktop: A Remote Desktop Protocol client. User interface services - X Window System - Copyright (C) Matthew Chapman 1999-2002 + Copyright (C) Matthew Chapman 1999-2005 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 @@ -20,51 +20,71 @@ #include #include +#include +#include #include #include +#include #include "rdesktop.h" #include "xproto.h" extern int g_width; extern int g_height; +extern int g_xpos; +extern int g_ypos; +extern int g_pos; extern BOOL g_sendmotion; extern BOOL g_fullscreen; -extern BOOL grab_keyboard; -extern BOOL hide_decorations; -extern char title[]; +extern BOOL g_grab_keyboard; +extern BOOL g_hide_decorations; +extern char g_title[]; extern int g_server_bpp; -extern int win_button_size; -BOOL g_enable_compose = False; -BOOL g_focused; -BOOL g_mouse_in_wnd; +extern int g_win_button_size; -Display *display; -Time last_gesturetime; -static int x_socket; -static Screen *screen; -Window wnd; -static GC gc; -static Visual *visual; -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; +Display *g_display; +Time g_last_gesturetime; +static int g_x_socket; +static Screen *g_screen; +Window g_wnd; +extern uint32 g_embed_wnd; +BOOL g_enable_compose = False; +BOOL g_Unobscured; /* used for screenblt */ +static GC g_gc = NULL; +static GC g_create_bitmap_gc = NULL; +static GC g_create_glyph_gc = NULL; +static Visual *g_visual; +static int g_depth; +static int g_bpp; +static XIM g_IM; +static XIC g_IC; +static XModifierKeymap *g_mod_map; +static Cursor g_current_cursor; +static HCURSOR g_null_cursor = NULL; +static Atom g_protocol_atom, g_kill_atom; +static BOOL g_focused; +static BOOL g_mouse_in_wnd; +static BOOL g_arch_match = False; /* set to True if RGB XServer and little endian */ /* endianness */ -static BOOL host_be; -static BOOL xserver_be; +static BOOL g_host_be; +static BOOL g_xserver_be; +static int g_red_shift_r, g_blue_shift_r, g_green_shift_r; +static int g_red_shift_l, g_blue_shift_l, g_green_shift_l; /* software backing store */ -static BOOL ownbackstore; -static Pixmap backstore; +extern BOOL g_ownbackstore; +static Pixmap g_backstore = 0; /* Moving in single app mode */ -static BOOL moving_wnd; -static int move_x_offset = 0; -static int move_y_offset = 0; +static BOOL g_moving_wnd; +static int g_move_x_offset = 0; +static int g_move_y_offset = 0; + +#ifdef WITH_RDPSND +extern int g_dsp_fd; +extern BOOL g_dsp_busy; +extern BOOL g_rdpsnd; +#endif /* MWM decorations */ #define MWM_HINTS_DECORATIONS (1L << 1) @@ -90,24 +110,49 @@ #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); \ + XFillRectangle(g_display, g_wnd, g_gc, x, y, cx, cy); \ + if (g_ownbackstore) \ + XFillRectangle(g_display, g_backstore, g_gc, x, y, cx, cy); \ } #define FILL_RECTANGLE_BACKSTORE(x,y,cx,cy)\ { \ - XFillRectangle(display, ownbackstore ? backstore : wnd, gc, x, y, cx, cy); \ + XFillRectangle(g_display, g_ownbackstore ? g_backstore : g_wnd, g_gc, x, y, cx, cy); \ +} + +#define FILL_POLYGON(p,np)\ +{ \ + XFillPolygon(g_display, g_wnd, g_gc, p, np, Complex, CoordModePrevious); \ + if (g_ownbackstore) \ + XFillPolygon(g_display, g_backstore, g_gc, p, np, Complex, CoordModePrevious); \ +} + +#define DRAW_ELLIPSE(x,y,cx,cy,m)\ +{ \ + switch (m) \ + { \ + case 0: /* Outline */ \ + XDrawArc(g_display, g_wnd, g_gc, x, y, cx, cy, 0, 360*64); \ + if (g_ownbackstore) \ + XDrawArc(g_display, g_backstore, g_gc, x, y, cx, cy, 0, 360*64); \ + break; \ + case 1: /* Filled */ \ + XFillArc(g_display, g_ownbackstore ? g_backstore : g_wnd, g_gc, x, y, \ + cx, cy, 0, 360*64); \ + if (g_ownbackstore) \ + XCopyArea(g_display, g_backstore, g_wnd, g_gc, x, y, cx, cy, x, y); \ + break; \ + } \ } /* colour maps */ -BOOL owncolmap = False; -static Colormap xcolmap; -static uint32 *colmap = NULL; - -#define TRANSLATE(col) ( g_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)); +extern BOOL g_owncolmap; +static Colormap g_xcolmap; +static uint32 *g_colmap = NULL; + +#define TRANSLATE(col) ( g_server_bpp != 8 ? translate_colour(col) : g_owncolmap ? col : g_colmap[col] ) +#define SET_FOREGROUND(col) XSetForeground(g_display, g_gc, TRANSLATE(col)); +#define SET_BACKGROUND(col) XSetBackground(g_display, g_gc, TRANSLATE(col)); static int rop2_map[] = { GXclear, /* 0 */ @@ -128,8 +173,8 @@ 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); } +#define SET_FUNCTION(rop2) { if (rop2 != ROP2_COPY) XSetFunction(g_display, g_gc, rop2_map[rop2]); } +#define RESET_FUNCTION(rop2) { if (rop2 != ROP2_COPY) XSetFunction(g_display, g_gc, GXcopy); } static void mwm_hide_decorations(void) @@ -142,345 +187,736 @@ motif_hints.decorations = 0; /* get the atom for the property */ - hintsatom = XInternAtom(display, "_MOTIF_WM_HINTS", False); + hintsatom = XInternAtom(g_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, + XChangeProperty(g_display, g_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; +#define SPLITCOLOUR15(colour, rv) \ +{ \ + rv.red = ((colour >> 7) & 0xf8) | ((colour >> 12) & 0x7); \ + rv.green = ((colour >> 2) & 0xf8) | ((colour >> 8) & 0x7); \ + rv.blue = ((colour << 3) & 0xf8) | ((colour >> 2) & 0x7); \ } -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; -} +#define SPLITCOLOUR16(colour, rv) \ +{ \ + rv.red = ((colour >> 8) & 0xf8) | ((colour >> 13) & 0x7); \ + rv.green = ((colour >> 3) & 0xfc) | ((colour >> 9) & 0x3); \ + rv.blue = ((colour << 3) & 0xf8) | ((colour >> 2) & 0x7); \ +} \ -static uint32 -make_colour24(PixelColour pc) -{ - return (pc.red << 16) | (pc.green << 8) | pc.blue; +#define SPLITCOLOUR24(colour, rv) \ +{ \ + rv.blue = (colour & 0xff0000) >> 16; \ + rv.green = (colour & 0x00ff00) >> 8; \ + rv.red = (colour & 0x0000ff); \ } -static uint32 -make_colour32(PixelColour pc) -{ - return (pc.red << 16) | (pc.green << 8) | pc.blue; -} +#define MAKECOLOUR(pc) \ + ((pc.red >> g_red_shift_r) << g_red_shift_l) \ + | ((pc.green >> g_green_shift_r) << g_green_shift_l) \ + | ((pc.blue >> g_blue_shift_r) << g_blue_shift_l) \ #define BSWAP16(x) { x = (((x & 0xff) << 8) | (x >> 8)); } -#define BSWAP24(x) { x = (((x & 0xff) << 16) | (x >> 16) | ((x >> 8) & 0xff00)); } +#define BSWAP24(x) { x = (((x & 0xff) << 16) | (x >> 16) | (x & 0xff00)); } #define BSWAP32(x) { x = (((x & 0xff00ff) << 8) | ((x >> 8) & 0xff00ff)); \ x = (x << 16) | (x >> 16); } +#define BOUT16(o, x) { *(o++) = x >> 8; *(o++) = x; } +#define BOUT24(o, x) { *(o++) = x >> 16; *(o++) = x >> 8; *(o++) = x; } +#define BOUT32(o, x) { *(o++) = x >> 24; *(o++) = x >> 16; *(o++) = x >> 8; *(o++) = x; } +#define LOUT16(o, x) { *(o++) = x; *(o++) = x >> 8; } +#define LOUT24(o, x) { *(o++) = x; *(o++) = x >> 8; *(o++) = x >> 16; } +#define LOUT32(o, x) { *(o++) = x; *(o++) = x >> 8; *(o++) = x >> 16; *(o++) = x >> 24; } + static uint32 translate_colour(uint32 colour) { + PixelColour pc; switch (g_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; - } + SPLITCOLOUR15(colour, pc); 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; - } + SPLITCOLOUR16(colour, pc); 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; - } + SPLITCOLOUR24(colour, pc); break; } - switch (bpp) - { - case 16: - if (host_be != xserver_be) - BSWAP16(colour); - break; + return MAKECOLOUR(pc); +} - case 24: - if (xserver_be) - BSWAP24(colour); - break; +/* indent is confused by UNROLL8 */ +/* *INDENT-OFF* */ - case 32: - if (host_be != xserver_be) - BSWAP32(colour); - break; - } +/* repeat and unroll, similar to bitmap.c */ +/* potentialy any of the following translate */ +/* functions can use repeat but just doing */ +/* the most common ones */ - return colour; +#define UNROLL8(stm) { stm stm stm stm stm stm stm stm } +/* 2 byte output repeat */ +#define REPEAT2(stm) \ +{ \ + while (out <= end - 8 * 2) \ + UNROLL8(stm) \ + while (out < end) \ + { stm } \ } +/* 3 byte output repeat */ +#define REPEAT3(stm) \ +{ \ + while (out <= end - 8 * 3) \ + UNROLL8(stm) \ + while (out < end) \ + { stm } \ +} +/* 4 byte output repeat */ +#define REPEAT4(stm) \ +{ \ + while (out <= end - 8 * 4) \ + UNROLL8(stm) \ + while (out < end) \ + { stm } \ +} +/* *INDENT-ON* */ static void -translate8to8(uint8 * data, uint8 * out, uint8 * end) +translate8to8(const uint8 * data, uint8 * out, uint8 * end) { while (out < end) - *(out++) = (uint8) colmap[*(data++)]; + *(out++) = (uint8) g_colmap[*(data++)]; } static void -translate8to16(uint8 * data, uint16 * out, uint16 * end) +translate8to16(const uint8 * data, uint8 * out, uint8 * end) { - while (out < end) - *(out++) = (uint16) colmap[*(data++)]; + uint16 value; + + if (g_arch_match) + { + /* *INDENT-OFF* */ + REPEAT2 + ( + *((uint16 *) out) = g_colmap[*(data++)]; + out += 2; + ) + /* *INDENT-ON* */ + } + else if (g_xserver_be) + { + while (out < end) + { + value = (uint16) g_colmap[*(data++)]; + BOUT16(out, value); + } + } + else + { + while (out < end) + { + value = (uint16) g_colmap[*(data++)]; + LOUT16(out, value); + } + } } /* little endian - conversion happens when colourmap is built */ static void -translate8to24(uint8 * data, uint8 * out, uint8 * end) +translate8to24(const uint8 * data, uint8 * out, uint8 * end) { uint32 value; - while (out < end) + if (g_xserver_be) + { + while (out < end) + { + value = g_colmap[*(data++)]; + BOUT24(out, value); + } + } + else { - value = colmap[*(data++)]; - *(out++) = value; - *(out++) = value >> 8; - *(out++) = value >> 16; + while (out < end) + { + value = g_colmap[*(data++)]; + LOUT24(out, value); + } } } static void -translate8to32(uint8 * data, uint32 * out, uint32 * end) +translate8to32(const uint8 * data, uint8 * out, uint8 * end) { - while (out < end) - *(out++) = colmap[*(data++)]; -} + uint32 value; -/* todo the remaining translate function might need some big endian check ?? */ + if (g_arch_match) + { + /* *INDENT-OFF* */ + REPEAT4 + ( + *((uint32 *) out) = g_colmap[*(data++)]; + out += 4; + ) + /* *INDENT-ON* */ + } + else if (g_xserver_be) + { + while (out < end) + { + value = g_colmap[*(data++)]; + BOUT32(out, value); + } + } + else + { + while (out < end) + { + value = g_colmap[*(data++)]; + LOUT32(out, value); + } + } +} static void -translate15to16(uint16 * data, uint16 * out, uint16 * end) +translate15to16(const uint16 * data, uint8 * out, uint8 * end) { - while (out < end) - *(out++) = (uint16) make_colour16(split_colour15(*(data++))); + uint16 pixel; + uint16 value; + PixelColour pc; + + if (g_xserver_be) + { + while (out < end) + { + pixel = *(data++); + if (g_host_be) + { + BSWAP16(pixel); + } + SPLITCOLOUR15(pixel, pc); + value = MAKECOLOUR(pc); + BOUT16(out, value); + } + } + else + { + while (out < end) + { + pixel = *(data++); + if (g_host_be) + { + BSWAP16(pixel); + } + SPLITCOLOUR15(pixel, pc); + value = MAKECOLOUR(pc); + LOUT16(out, value); + } + } } static void -translate15to24(uint16 * data, uint8 * out, uint8 * end) +translate15to24(const uint16 * data, uint8 * out, uint8 * end) { uint32 value; + uint16 pixel; + PixelColour pc; - while (out < end) + if (g_arch_match) { - value = make_colour24(split_colour15(*(data++))); - *(out++) = value; - *(out++) = value >> 8; - *(out++) = value >> 16; + /* *INDENT-OFF* */ + REPEAT3 + ( + pixel = *(data++); + SPLITCOLOUR15(pixel, pc); + *(out++) = pc.blue; + *(out++) = pc.green; + *(out++) = pc.red; + ) + /* *INDENT-ON* */ + } + else if (g_xserver_be) + { + while (out < end) + { + pixel = *(data++); + if (g_host_be) + { + BSWAP16(pixel); + } + SPLITCOLOUR15(pixel, pc); + value = MAKECOLOUR(pc); + BOUT24(out, value); + } + } + else + { + while (out < end) + { + pixel = *(data++); + if (g_host_be) + { + BSWAP16(pixel); + } + SPLITCOLOUR15(pixel, pc); + value = MAKECOLOUR(pc); + LOUT24(out, value); + } } } static void -translate15to32(uint16 * data, uint32 * out, uint32 * end) +translate15to32(const uint16 * data, uint8 * out, uint8 * end) { - while (out < end) - *(out++) = make_colour32(split_colour15(*(data++))); + uint16 pixel; + uint32 value; + PixelColour pc; + + if (g_arch_match) + { + /* *INDENT-OFF* */ + REPEAT4 + ( + pixel = *(data++); + SPLITCOLOUR15(pixel, pc); + *(out++) = pc.blue; + *(out++) = pc.green; + *(out++) = pc.red; + *(out++) = 0; + ) + /* *INDENT-ON* */ + } + else if (g_xserver_be) + { + while (out < end) + { + pixel = *(data++); + if (g_host_be) + { + BSWAP16(pixel); + } + SPLITCOLOUR15(pixel, pc); + value = MAKECOLOUR(pc); + BOUT32(out, value); + } + } + else + { + while (out < end) + { + pixel = *(data++); + if (g_host_be) + { + BSWAP16(pixel); + } + SPLITCOLOUR15(pixel, pc); + value = MAKECOLOUR(pc); + LOUT32(out, value); + } + } } static void -translate16to16(uint16 * data, uint16 * out, uint16 * end) +translate16to16(const uint16 * data, uint8 * out, uint8 * end) { - while (out < end) - *(out++) = (uint16) (*(data++)); -} + uint16 pixel; + uint16 value; + PixelColour pc; + if (g_xserver_be) + { + if (g_host_be) + { + while (out < end) + { + pixel = *(data++); + BSWAP16(pixel); + SPLITCOLOUR16(pixel, pc); + value = MAKECOLOUR(pc); + BOUT16(out, value); + } + } + else + { + while (out < end) + { + pixel = *(data++); + SPLITCOLOUR16(pixel, pc); + value = MAKECOLOUR(pc); + BOUT16(out, value); + } + } + } + else + { + if (g_host_be) + { + while (out < end) + { + pixel = *(data++); + BSWAP16(pixel); + SPLITCOLOUR16(pixel, pc); + value = MAKECOLOUR(pc); + LOUT16(out, value); + } + } + else + { + while (out < end) + { + pixel = *(data++); + SPLITCOLOUR16(pixel, pc); + value = MAKECOLOUR(pc); + LOUT16(out, value); + } + } + } +} static void -translate16to24(uint16 * data, uint8 * out, uint8 * end) +translate16to24(const uint16 * data, uint8 * out, uint8 * end) { uint32 value; + uint16 pixel; + PixelColour pc; - while (out < end) + if (g_arch_match) { - value = make_colour24(split_colour16(*(data++))); - *(out++) = value; - *(out++) = value >> 8; - *(out++) = value >> 16; + /* *INDENT-OFF* */ + REPEAT3 + ( + pixel = *(data++); + SPLITCOLOUR16(pixel, pc); + *(out++) = pc.blue; + *(out++) = pc.green; + *(out++) = pc.red; + ) + /* *INDENT-ON* */ + } + else if (g_xserver_be) + { + if (g_host_be) + { + while (out < end) + { + pixel = *(data++); + BSWAP16(pixel); + SPLITCOLOUR16(pixel, pc); + value = MAKECOLOUR(pc); + BOUT24(out, value); + } + } + else + { + while (out < end) + { + pixel = *(data++); + SPLITCOLOUR16(pixel, pc); + value = MAKECOLOUR(pc); + BOUT24(out, value); + } + } + } + else + { + if (g_host_be) + { + while (out < end) + { + pixel = *(data++); + BSWAP16(pixel); + SPLITCOLOUR16(pixel, pc); + value = MAKECOLOUR(pc); + LOUT24(out, value); + } + } + else + { + while (out < end) + { + pixel = *(data++); + SPLITCOLOUR16(pixel, pc); + value = MAKECOLOUR(pc); + LOUT24(out, value); + } + } } } static void -translate16to32(uint16 * data, uint32 * out, uint32 * end) +translate16to32(const uint16 * data, uint8 * out, uint8 * end) { - while (out < end) - *(out++) = make_colour32(split_colour16(*(data++))); + uint16 pixel; + uint32 value; + PixelColour pc; + + if (g_arch_match) + { + /* *INDENT-OFF* */ + REPEAT4 + ( + pixel = *(data++); + SPLITCOLOUR16(pixel, pc); + *(out++) = pc.blue; + *(out++) = pc.green; + *(out++) = pc.red; + *(out++) = 0; + ) + /* *INDENT-ON* */ + } + else if (g_xserver_be) + { + if (g_host_be) + { + while (out < end) + { + pixel = *(data++); + BSWAP16(pixel); + SPLITCOLOUR16(pixel, pc); + value = MAKECOLOUR(pc); + BOUT32(out, value); + } + } + else + { + while (out < end) + { + pixel = *(data++); + SPLITCOLOUR16(pixel, pc); + value = MAKECOLOUR(pc); + BOUT32(out, value); + } + } + } + else + { + if (g_host_be) + { + while (out < end) + { + pixel = *(data++); + BSWAP16(pixel); + SPLITCOLOUR16(pixel, pc); + value = MAKECOLOUR(pc); + LOUT32(out, value); + } + } + else + { + while (out < end) + { + pixel = *(data++); + SPLITCOLOUR16(pixel, pc); + value = MAKECOLOUR(pc); + LOUT32(out, value); + } + } + } } static void -translate24to16(uint8 * data, uint16 * out, uint16 * end) +translate24to16(const uint8 * data, uint8 * out, uint8 * end) { uint32 pixel = 0; + uint16 value; + PixelColour pc; + while (out < end) { pixel = *(data++) << 16; pixel |= *(data++) << 8; pixel |= *(data++); - *(out++) = (uint16) make_colour16(split_colour24(pixel)); + SPLITCOLOUR24(pixel, pc); + value = MAKECOLOUR(pc); + if (g_xserver_be) + { + BOUT16(out, value); + } + else + { + LOUT16(out, value); + } } } static void -translate24to24(uint8 * data, uint8 * out, uint8 * end) +translate24to24(const uint8 * data, uint8 * out, uint8 * end) { - while (out < end) + uint32 pixel; + uint32 value; + PixelColour pc; + + if (g_xserver_be) + { + while (out < end) + { + pixel = *(data++) << 16; + pixel |= *(data++) << 8; + pixel |= *(data++); + SPLITCOLOUR24(pixel, pc); + value = MAKECOLOUR(pc); + BOUT24(out, value); + } + } + else { - *(out++) = (*(data++)); + while (out < end) + { + pixel = *(data++) << 16; + pixel |= *(data++) << 8; + pixel |= *(data++); + SPLITCOLOUR24(pixel, pc); + value = MAKECOLOUR(pc); + LOUT24(out, value); + } } } static void -translate24to32(uint8 * data, uint32 * out, uint32 * end) +translate24to32(const uint8 * data, uint8 * out, uint8 * end) { - uint32 pixel = 0; - while (out < end) + uint32 pixel; + uint32 value; + PixelColour pc; + + if (g_arch_match) { - pixel = *(data++); - pixel |= *(data++) << 8; - pixel |= *(data++) << 16; - *(out++) = pixel; + /* *INDENT-OFF* */ +#ifdef NEED_ALIGN + REPEAT4 + ( + *(out++) = *(data++); + *(out++) = *(data++); + *(out++) = *(data++); + *(out++) = 0; + ) +#else + REPEAT4 + ( + *((uint32 *) out) = *((uint32 *) data); + out += 4; + data += 3; + ) +#endif + /* *INDENT-ON* */ + } + else if (g_xserver_be) + { + while (out < end) + { + pixel = *(data++) << 16; + pixel |= *(data++) << 8; + pixel |= *(data++); + SPLITCOLOUR24(pixel, pc); + value = MAKECOLOUR(pc); + BOUT32(out, value); + } + } + else + { + while (out < end) + { + pixel = *(data++) << 16; + pixel |= *(data++) << 8; + pixel |= *(data++); + SPLITCOLOUR24(pixel, pc); + value = MAKECOLOUR(pc); + LOUT32(out, value); + } } } 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; + int size; + uint8 *out; + uint8 *end; + + /* if server and xserver bpp match, */ + /* and arch(endian) matches, no need to translate */ + /* just return data */ + if (g_arch_match) + { + if (g_depth == 15 && g_server_bpp == 15) + return data; + if (g_depth == 16 && g_server_bpp == 16) + return data; + if (g_depth == 24 && g_bpp == 24 && g_server_bpp == 24) + return data; + } + + size = width * height * (g_bpp / 8); + out = (uint8 *) xmalloc(size); + end = out + size; switch (g_server_bpp) { case 24: - switch (bpp) + switch (g_bpp) { case 32: - translate24to32(data, (uint32 *) out, (uint32 *) end); + translate24to32(data, out, end); break; case 24: translate24to24(data, out, end); break; case 16: - translate24to16(data, (uint16 *) out, (uint16 *) end); + translate24to16(data, out, end); break; } break; case 16: - switch (bpp) + switch (g_bpp) { case 32: - translate16to32((uint16 *) data, (uint32 *) out, - (uint32 *) end); + translate16to32((uint16 *) data, out, end); break; case 24: translate16to24((uint16 *) data, out, end); break; case 16: - translate16to16((uint16 *) data, (uint16 *) out, - (uint16 *) end); + translate16to16((uint16 *) data, out, end); break; } break; case 15: - switch (bpp) + switch (g_bpp) { case 32: - translate15to32((uint16 *) data, (uint32 *) out, - (uint32 *) end); + translate15to32((uint16 *) data, out, end); break; case 24: translate15to24((uint16 *) data, out, end); break; case 16: - translate15to16((uint16 *) data, (uint16 *) out, - (uint16 *) end); + translate15to16((uint16 *) data, out, end); break; } break; case 8: - switch (bpp) + switch (g_bpp) { case 8: translate8to8(data, out, end); break; case 16: - translate8to16(data, (uint16 *) out, (uint16 *) end); + translate8to16(data, out, end); break; case 24: translate8to24(data, out, end); break; case 32: - translate8to32(data, (uint32 *) out, (uint32 *) end); + translate8to32(data, out, end); break; } break; @@ -494,18 +930,18 @@ int modifierpos, key, keysymMask = 0; int offset; - KeyCode keycode = XKeysymToKeycode(display, keysym); + KeyCode keycode = XKeysymToKeycode(g_display, keysym); if (keycode == NoSymbol) return False; for (modifierpos = 0; modifierpos < 8; modifierpos++) { - offset = mod_map->max_keypermod * modifierpos; + offset = g_mod_map->max_keypermod * modifierpos; - for (key = 0; key < mod_map->max_keypermod; key++) + for (key = 0; key < g_mod_map->max_keypermod; key++) { - if (mod_map->modifiermap[offset + key] == keycode) + if (g_mod_map->modifiermap[offset + key] == keycode) keysymMask |= 1 << modifierpos; } } @@ -513,64 +949,152 @@ return (state & keysymMask) ? True : False; } +static void +calculate_shifts(uint32 mask, int *shift_r, int *shift_l) +{ + *shift_l = ffs(mask) - 1; + mask >>= *shift_l; + *shift_r = 8 - ffs(mask & ~(mask >> 1)); +} + BOOL ui_init(void) { + XVisualInfo vi; XPixmapFormatValues *pfm; uint16 test; - int i; + int i, screen_num, nvisuals; + XVisualInfo *vmatches = NULL; + XVisualInfo template; + Bool TrueColorVisual = False; - display = XOpenDisplay(NULL); - if (display == NULL) + g_display = XOpenDisplay(NULL); + if (g_display == NULL) { error("Failed to open display: %s\n", XDisplayName(NULL)); return False; } - x_socket = ConnectionNumber(display); - screen = DefaultScreenOfDisplay(display); - visual = DefaultVisualOfScreen(screen); - depth = DefaultDepthOfScreen(screen); + screen_num = DefaultScreen(g_display); + g_x_socket = ConnectionNumber(g_display); + g_screen = ScreenOfDisplay(g_display, screen_num); + g_depth = DefaultDepthOfScreen(g_screen); + + /* Search for best TrueColor depth */ + template.class = TrueColor; + vmatches = XGetVisualInfo(g_display, VisualClassMask, &template, &nvisuals); + + nvisuals--; + while (nvisuals >= 0) + { + if ((vmatches + nvisuals)->depth > g_depth) + { + g_depth = (vmatches + nvisuals)->depth; + } + nvisuals--; + TrueColorVisual = True; + } - pfm = XListPixmapFormats(display, &i); + test = 1; + g_host_be = !(BOOL) (*(uint8 *) (&test)); + g_xserver_be = (ImageByteOrder(g_display) == MSBFirst); + + if ((g_server_bpp == 8) && ((!TrueColorVisual) || (g_depth <= 8))) + { + /* we use a colourmap, so the default visual should do */ + g_visual = DefaultVisualOfScreen(g_screen); + g_depth = DefaultDepthOfScreen(g_screen); + + /* Do not allocate colours on a TrueColor visual */ + if (g_visual->class == TrueColor) + { + g_owncolmap = False; + } + } + else + { + /* need a truecolour visual */ + if (!XMatchVisualInfo(g_display, screen_num, g_depth, TrueColor, &vi)) + { + error("The display does not support true colour - high colour support unavailable.\n"); + return False; + } + + g_visual = vi.visual; + g_owncolmap = False; + calculate_shifts(vi.red_mask, &g_red_shift_r, &g_red_shift_l); + calculate_shifts(vi.blue_mask, &g_blue_shift_r, &g_blue_shift_l); + calculate_shifts(vi.green_mask, &g_green_shift_r, &g_green_shift_l); + + /* if RGB video and everything is little endian */ + if ((vi.red_mask > vi.green_mask && vi.green_mask > vi.blue_mask) && + !g_xserver_be && !g_host_be) + { + if (g_depth <= 16 || (g_red_shift_l == 16 && g_green_shift_l == 8 && + g_blue_shift_l == 0)) + { + g_arch_match = True; + } + } + + if (g_arch_match) + { + DEBUG(("Architectures match, enabling little endian optimisations.\n")); + } + } + + pfm = XListPixmapFormats(g_display, &i); if (pfm != NULL) { /* Use maximum bpp for this depth - this is generally desirable, e.g. 24 bits->32 bits. */ while (i--) { - if ((pfm[i].depth == depth) && (pfm[i].bits_per_pixel > bpp)) + if ((pfm[i].depth == g_depth) && (pfm[i].bits_per_pixel > g_bpp)) { - bpp = pfm[i].bits_per_pixel; + g_bpp = pfm[i].bits_per_pixel; } } XFree(pfm); } - if (bpp < 8) + if (g_bpp < 8) { error("Less than 8 bpp not currently supported.\n"); - XCloseDisplay(display); + XCloseDisplay(g_display); return False; } - if (owncolmap != True) + if (!g_owncolmap) { - xcolmap = DefaultColormapOfScreen(screen); - if (depth <= 8) + g_xcolmap = + XCreateColormap(g_display, RootWindowOfScreen(g_screen), g_visual, + AllocNone); + if (g_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); + if ((!g_ownbackstore) && (DoesBackingStore(g_screen) != Always)) + { + warning("External BackingStore not available, using internal\n"); + g_ownbackstore = True; + } - if ((g_width == 0) || (g_height == 0)) + /* + * Determine desktop size + */ + if (g_fullscreen) + { + g_width = WidthOfScreen(g_screen); + g_height = HeightOfScreen(g_screen); + } + else if (g_width < 0) + { + /* Percent of screen */ + g_height = HeightOfScreen(g_screen) * (-g_width) / 100; + g_width = WidthOfScreen(g_screen) * (-g_width) / 100; + } + else if (g_width == 0) { /* Fetch geometry from _NET_WORKAREA */ uint32 x, y, cx, cy; @@ -588,36 +1112,19 @@ } } - if (g_fullscreen) - { - g_width = WidthOfScreen(screen); - g_height = HeightOfScreen(screen); - } - /* make sure width is a multiple of 4 */ g_width = (g_width + 3) & ~3; - if (ownbackstore) - { - backstore = - XCreatePixmap(display, RootWindowOfScreen(screen), g_width, g_height, - depth); + g_mod_map = XGetModifierMapping(g_display); - /* clear to prevent rubbish being exposed at startup */ - XSetForeground(display, gc, BlackPixelOfScreen(screen)); - XFillRectangle(display, backstore, gc, 0, 0, g_width, g_height); - } - - mod_map = XGetModifierMapping(display); + xkeymap_init(); if (g_enable_compose) - IM = XOpenIM(display, NULL, NULL, NULL); + g_IM = XOpenIM(g_display, NULL, NULL, NULL); - xkeymap_init(); xclip_init(); - /* todo take this out when high colour is done */ - printf("server bpp %d client bpp %d depth %d\n", g_server_bpp, bpp, depth); + DEBUG_RDP5(("server bpp %d client bpp %d depth %d\n", g_server_bpp, g_bpp, g_depth)); return True; } @@ -625,22 +1132,28 @@ void ui_deinit(void) { - if (IM != NULL) - XCloseIM(IM); + if (g_IM != NULL) + XCloseIM(g_IM); + + if (g_null_cursor != NULL) + ui_destroy_cursor(g_null_cursor); - XFreeModifiermap(mod_map); + XFreeModifiermap(g_mod_map); - if (ownbackstore) - XFreePixmap(display, backstore); + if (g_ownbackstore) + XFreePixmap(g_display, g_backstore); - XFreeGC(display, gc); - XCloseDisplay(display); - display = NULL; + XFreeGC(g_display, g_gc); + XCloseDisplay(g_display); + g_display = NULL; } BOOL ui_create_window(void) { + uint8 null_pointer_mask[1] = { 0x80 }; + uint8 null_pointer_data[24] = { 0x00 }; + XSetWindowAttributes attribs; XClassHint *classhints; XSizeHints *sizehints; @@ -648,27 +1161,51 @@ long input_mask, ic_input_mask; XEvent xevent; - wndwidth = g_fullscreen ? WidthOfScreen(screen) : g_width; - wndheight = g_fullscreen ? HeightOfScreen(screen) : g_height; + wndwidth = g_fullscreen ? WidthOfScreen(g_screen) : g_width; + wndheight = g_fullscreen ? HeightOfScreen(g_screen) : g_height; - attribs.background_pixel = BlackPixelOfScreen(screen); - attribs.backing_store = ownbackstore ? NotUseful : Always; + /* Handle -x-y portion of geometry string */ + if (g_xpos < 0 || (g_xpos == 0 && (g_pos & 2))) + g_xpos = WidthOfScreen(g_screen) + g_xpos - g_width; + if (g_ypos < 0 || (g_ypos == 0 && (g_pos & 4))) + g_ypos = HeightOfScreen(g_screen) + g_ypos - g_height; + + attribs.background_pixel = BlackPixelOfScreen(g_screen); + attribs.border_pixel = WhitePixelOfScreen(g_screen); + attribs.backing_store = g_ownbackstore ? NotUseful : Always; attribs.override_redirect = g_fullscreen; + attribs.colormap = g_xcolmap; + + g_wnd = XCreateWindow(g_display, RootWindowOfScreen(g_screen), g_xpos, g_ypos, wndwidth, + wndheight, 0, g_depth, InputOutput, g_visual, + CWBackPixel | CWBackingStore | CWOverrideRedirect | CWColormap | + CWBorderPixel, &attribs); - wnd = XCreateWindow(display, RootWindowOfScreen(screen), 0, 0, wndwidth, wndheight, - 0, CopyFromParent, InputOutput, CopyFromParent, - CWBackPixel | CWBackingStore | CWOverrideRedirect, &attribs); + if (g_gc == NULL) + g_gc = XCreateGC(g_display, g_wnd, 0, NULL); - XStoreName(display, wnd, title); + if (g_create_bitmap_gc == NULL) + g_create_bitmap_gc = XCreateGC(g_display, g_wnd, 0, NULL); - if (hide_decorations) + if ((g_ownbackstore) && (g_backstore == 0)) + { + g_backstore = XCreatePixmap(g_display, g_wnd, g_width, g_height, g_depth); + + /* clear to prevent rubbish being exposed at startup */ + XSetForeground(g_display, g_gc, BlackPixelOfScreen(g_screen)); + XFillRectangle(g_display, g_backstore, g_gc, 0, 0, g_width, g_height); + } + + XStoreName(g_display, g_wnd, g_title); + + if (g_hide_decorations) mwm_hide_decorations(); classhints = XAllocClassHint(); if (classhints != NULL) { classhints->res_name = classhints->res_class = "rdesktop"; - XSetClassHint(display, wnd, classhints); + XSetClassHint(g_display, g_wnd, classhints); XFree(classhints); } @@ -676,62 +1213,107 @@ if (sizehints) { sizehints->flags = PMinSize | PMaxSize; + if (g_pos) + sizehints->flags |= PPosition; sizehints->min_width = sizehints->max_width = g_width; sizehints->min_height = sizehints->max_height = g_height; - XSetWMNormalHints(display, wnd, sizehints); + XSetWMNormalHints(g_display, g_wnd, sizehints); XFree(sizehints); } + if (g_embed_wnd) + { + XReparentWindow(g_display, g_wnd, (Window) g_embed_wnd, 0, 0); + } + input_mask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | - VisibilityChangeMask | FocusChangeMask; + VisibilityChangeMask | FocusChangeMask | StructureNotifyMask; if (g_sendmotion) input_mask |= PointerMotionMask; - if (ownbackstore) + if (g_ownbackstore) input_mask |= ExposureMask; - if (g_fullscreen || grab_keyboard) + if (g_fullscreen || g_grab_keyboard) input_mask |= EnterWindowMask; - if (grab_keyboard) + if (g_grab_keyboard) input_mask |= LeaveWindowMask; - if (IM != NULL) + if (g_IM != NULL) { - IC = XCreateIC(IM, XNInputStyle, (XIMPreeditNothing | XIMStatusNothing), - XNClientWindow, wnd, XNFocusWindow, wnd, NULL); + g_IC = XCreateIC(g_IM, XNInputStyle, (XIMPreeditNothing | XIMStatusNothing), + XNClientWindow, g_wnd, XNFocusWindow, g_wnd, NULL); - if ((IC != NULL) - && (XGetICValues(IC, XNFilterEvents, &ic_input_mask, NULL) == NULL)) + if ((g_IC != NULL) + && (XGetICValues(g_IC, XNFilterEvents, &ic_input_mask, NULL) == NULL)) input_mask |= ic_input_mask; } - XSelectInput(display, wnd, input_mask); - XMapWindow(display, wnd); + XSelectInput(g_display, g_wnd, input_mask); + XMapWindow(g_display, g_wnd); /* wait for VisibilityNotify */ do { - XMaskEvent(display, VisibilityChangeMask, &xevent); + XMaskEvent(g_display, VisibilityChangeMask, &xevent); } while (xevent.type != VisibilityNotify); + g_Unobscured = xevent.xvisibility.state == VisibilityUnobscured; g_focused = False; g_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); + g_protocol_atom = XInternAtom(g_display, "WM_PROTOCOLS", True); + g_kill_atom = XInternAtom(g_display, "WM_DELETE_WINDOW", True); + XSetWMProtocols(g_display, g_wnd, &g_kill_atom, 1); + + /* create invisible 1x1 cursor to be used as null cursor */ + if (g_null_cursor == NULL) + g_null_cursor = ui_create_cursor(0, 0, 1, 1, null_pointer_mask, null_pointer_data); return True; } void +ui_resize_window() +{ + XSizeHints *sizehints; + Pixmap bs; + + sizehints = XAllocSizeHints(); + if (sizehints) + { + sizehints->flags = PMinSize | PMaxSize; + sizehints->min_width = sizehints->max_width = g_width; + sizehints->min_height = sizehints->max_height = g_height; + XSetWMNormalHints(g_display, g_wnd, sizehints); + XFree(sizehints); + } + + if (!(g_fullscreen || g_embed_wnd)) + { + XResizeWindow(g_display, g_wnd, g_width, g_height); + } + + /* create new backstore pixmap */ + if (g_backstore != 0) + { + bs = XCreatePixmap(g_display, g_wnd, g_width, g_height, g_depth); + XSetForeground(g_display, g_gc, BlackPixelOfScreen(g_screen)); + XFillRectangle(g_display, bs, g_gc, 0, 0, g_width, g_height); + XCopyArea(g_display, g_backstore, bs, g_gc, 0, 0, g_width, g_height, 0, 0); + XFreePixmap(g_display, g_backstore); + g_backstore = bs; + } +} + +void ui_destroy_window(void) { - if (IC != NULL) - XDestroyIC(IC); + if (g_IC != NULL) + XDestroyIC(g_IC); - XDestroyWindow(display, wnd); + XDestroyWindow(g_display, g_wnd); } void @@ -739,27 +1321,27 @@ { Pixmap contents = 0; - if (!ownbackstore) + if (!g_ownbackstore) { /* need to save contents of window */ - contents = XCreatePixmap(display, wnd, g_width, g_height, depth); - XCopyArea(display, wnd, contents, gc, 0, 0, g_width, g_height, 0, 0); + contents = XCreatePixmap(g_display, g_wnd, g_width, g_height, g_depth); + XCopyArea(g_display, g_wnd, contents, g_gc, 0, 0, g_width, g_height, 0, 0); } ui_destroy_window(); g_fullscreen = !g_fullscreen; ui_create_window(); - XDefineCursor(display, wnd, current_cursor); + XDefineCursor(g_display, g_wnd, g_current_cursor); - if (!ownbackstore) + if (!g_ownbackstore) { - XCopyArea(display, contents, wnd, gc, 0, 0, g_width, g_height, 0, 0); - XFreePixmap(display, contents); + XCopyArea(g_display, contents, g_wnd, g_gc, 0, 0, g_width, g_height, 0, 0); + XFreePixmap(g_display, contents); } } -/* Process all events in Xlib queue +/* Process events in Xlib queue Returns 0 after user quit, 1 otherwise */ static int xwin_process_events(void) @@ -771,15 +1353,13 @@ key_translation tr; char str[256]; Status status; - unsigned int state; - Window wdummy; - int dummy; + int events = 0; - while (XPending(display) > 0) + while ((XPending(g_display) > 0) && events++ < 20) { - XNextEvent(display, &xevent); + XNextEvent(g_display, &xevent); - if ((IC != NULL) && (XFilterEvent(&xevent, None) == True)) + if ((g_IC != NULL) && (XFilterEvent(&xevent, None) == True)) { DEBUG_KBD(("Filtering event\n")); continue; @@ -789,20 +1369,23 @@ switch (xevent.type) { + case VisibilityNotify: + g_Unobscured = xevent.xvisibility.state == VisibilityUnobscured; + break; case ClientMessage: /* the window manager told us to quit */ - if ((xevent.xclient.message_type == protocol_atom) - && ((Atom) xevent.xclient.data.l[0] == kill_atom)) + if ((xevent.xclient.message_type == g_protocol_atom) + && ((Atom) xevent.xclient.data.l[0] == g_kill_atom)) /* Quit */ return 0; break; case KeyPress: - last_gesturetime = xevent.xkey.time; - if (IC != NULL) + g_last_gesturetime = xevent.xkey.time; + if (g_IC != NULL) /* Multi_key compatible version */ { - XmbLookupString(IC, + XmbLookupString(g_IC, &xevent.xkey, str, sizeof(str), &keysym, &status); if (!((status == XLookupKeySym) || (status == XLookupBoth))) @@ -833,13 +1416,15 @@ if (tr.scancode == 0) break; + save_remote_modifiers(tr.scancode); ensure_remote_modifiers(ev_time, tr); - rdp_send_scancode(ev_time, RDP_KEYPRESS, tr.scancode); + restore_remote_modifiers(ev_time, tr.scancode); + break; case KeyRelease: - last_gesturetime = xevent.xkey.time; + g_last_gesturetime = xevent.xkey.time; XLookupString((XKeyEvent *) & xevent, str, sizeof(str), &keysym, NULL); @@ -864,26 +1449,27 @@ /* fall through */ case ButtonRelease: - last_gesturetime = xevent.xbutton.time; + g_last_gesturetime = xevent.xbutton.time; button = xkeymap_translate_button(xevent.xbutton.button); if (button == 0) break; /* If win_button_size is nonzero, enable single app mode */ - if (xevent.xbutton.y < win_button_size) + if (xevent.xbutton.y < g_win_button_size) { /* Stop moving window when button is released, regardless of cursor position */ - if (moving_wnd && (xevent.type == ButtonRelease)) - moving_wnd = False; + if (g_moving_wnd && (xevent.type == ButtonRelease)) + g_moving_wnd = False; /* Check from right to left: */ - if (xevent.xbutton.x >= g_width - win_button_size) + if (xevent.xbutton.x >= g_width - g_win_button_size) { /* The close button, continue */ ; } - else if (xevent.xbutton.x >= g_width - win_button_size * 2) + else if (xevent.xbutton.x >= + g_width - g_win_button_size * 2) { /* The maximize/restore button. Do not send to server. It might be a good idea to change the @@ -891,14 +1477,15 @@ that rdesktop inhibited this click */ break; } - else if (xevent.xbutton.x >= g_width - win_button_size * 3) + else if (xevent.xbutton.x >= + g_width - g_win_button_size * 3) { /* The minimize button. Iconify window. */ - XIconifyWindow(display, wnd, - DefaultScreen(display)); + XIconifyWindow(g_display, g_wnd, + DefaultScreen(g_display)); break; } - else if (xevent.xbutton.x <= win_button_size) + else if (xevent.xbutton.x <= g_win_button_size) { /* The system menu. Ignore. */ break; @@ -907,11 +1494,11 @@ { /* The title bar. */ if ((xevent.type == ButtonPress) && !g_fullscreen - && hide_decorations) + && g_hide_decorations) { - moving_wnd = True; - move_x_offset = xevent.xbutton.x; - move_y_offset = xevent.xbutton.y; + g_moving_wnd = True; + g_move_x_offset = xevent.xbutton.x; + g_move_y_offset = xevent.xbutton.y; } break; @@ -923,16 +1510,16 @@ break; case MotionNotify: - if (moving_wnd) + if (g_moving_wnd) { - XMoveWindow(display, wnd, - xevent.xmotion.x_root - move_x_offset, - xevent.xmotion.y_root - move_y_offset); + XMoveWindow(g_display, g_wnd, + xevent.xmotion.x_root - g_move_x_offset, + xevent.xmotion.y_root - g_move_y_offset); break; } if (g_fullscreen && !g_focused) - XSetInputFocus(display, wnd, RevertToPointerRoot, + XSetInputFocus(g_display, g_wnd, RevertToPointerRoot, CurrentTime); rdp_send_input(time(NULL), RDP_INPUT_MOUSE, MOUSE_FLAG_MOVE, xevent.xmotion.x, xevent.xmotion.y); @@ -942,11 +1529,9 @@ if (xevent.xfocus.mode == NotifyGrab) break; g_focused = True; - XQueryPointer(display, wnd, &wdummy, &wdummy, &dummy, &dummy, - &dummy, &dummy, &state); - reset_modifier_keys(state); - if (grab_keyboard && g_mouse_in_wnd) - XGrabKeyboard(display, wnd, True, + reset_modifier_keys(); + if (g_grab_keyboard && g_mouse_in_wnd) + XGrabKeyboard(g_display, g_wnd, True, GrabModeAsync, GrabModeAsync, CurrentTime); break; @@ -955,7 +1540,7 @@ break; g_focused = False; if (xevent.xfocus.mode == NotifyWhileGrabbed) - XUngrabKeyboard(display, CurrentTime); + XUngrabKeyboard(g_display, CurrentTime); break; case EnterNotify: @@ -964,23 +1549,23 @@ g_mouse_in_wnd = True; if (g_fullscreen) { - XSetInputFocus(display, wnd, RevertToPointerRoot, + XSetInputFocus(g_display, g_wnd, RevertToPointerRoot, CurrentTime); break; } if (g_focused) - XGrabKeyboard(display, wnd, True, + XGrabKeyboard(g_display, g_wnd, True, GrabModeAsync, GrabModeAsync, CurrentTime); break; case LeaveNotify: /* we only register for this event when grab_keyboard */ g_mouse_in_wnd = False; - XUngrabKeyboard(display, CurrentTime); + XUngrabKeyboard(g_display, CurrentTime); break; case Expose: - XCopyArea(display, backstore, wnd, gc, + XCopyArea(g_display, g_backstore, g_wnd, g_gc, xevent.xexpose.x, xevent.xexpose.y, xevent.xexpose.width, xevent.xexpose.height, @@ -996,8 +1581,8 @@ if (xevent.xmapping.request == MappingModifier) { - XFreeModifiermap(mod_map); - mod_map = XGetModifierMapping(display); + XFreeModifiermap(g_mod_map); + g_mod_map = XGetModifierMapping(g_display); } break; @@ -1014,6 +1599,12 @@ case PropertyNotify: xclip_handle_PropertyNotify(&xevent.xproperty); break; + case MapNotify: + rdp_send_client_window_status(1); + break; + case UnmapNotify: + rdp_send_client_window_status(0); + break; } } /* Keep going */ @@ -1024,40 +1615,69 @@ int ui_select(int rdp_socket) { - int n = (rdp_socket > x_socket) ? rdp_socket + 1 : x_socket + 1; - fd_set rfds; - - FD_ZERO(&rfds); + int n; + fd_set rfds, wfds; + struct timeval tv; + BOOL s_timeout = False; while (True) { + n = (rdp_socket > g_x_socket) ? rdp_socket : g_x_socket; /* Process any events already waiting */ if (!xwin_process_events()) /* User quit */ return 0; FD_ZERO(&rfds); + FD_ZERO(&wfds); FD_SET(rdp_socket, &rfds); - FD_SET(x_socket, &rfds); + FD_SET(g_x_socket, &rfds); - switch (select(n, &rfds, NULL, NULL, NULL)) +#ifdef WITH_RDPSND + /* FIXME: there should be an API for registering fds */ + if (g_dsp_busy) + { + FD_SET(g_dsp_fd, &wfds); + n = (g_dsp_fd > n) ? g_dsp_fd : n; + } +#endif + /* default timeout */ + tv.tv_sec = 60; + tv.tv_usec = 0; + + /* add redirection handles */ + rdpdr_add_fds(&n, &rfds, &wfds, &tv, &s_timeout); + + n++; + + switch (select(n, &rfds, &wfds, NULL, &tv)) { case -1: error("select: %s\n", strerror(errno)); case 0: + /* Abort serial read calls */ + if (s_timeout) + rdpdr_check_fds(&rfds, &wfds, (BOOL) True); continue; } + rdpdr_check_fds(&rfds, &wfds, (BOOL) False); + if (FD_ISSET(rdp_socket, &rfds)) return 1; + +#ifdef WITH_RDPSND + if (g_dsp_busy && FD_ISSET(g_dsp_fd, &wfds)) + wave_out_play(); +#endif } } void ui_move_pointer(int x, int y) { - XWarpPointer(display, wnd, wnd, 0, 0, 0, 0, x, y); + XWarpPointer(g_display, g_wnd, g_wnd, 0, 0, 0, 0, x, y); } HBITMAP @@ -1066,16 +1686,29 @@ XImage *image; Pixmap bitmap; uint8 *tdata; + int bitmap_pad; + + if (g_server_bpp == 8) + { + bitmap_pad = 8; + } + else + { + bitmap_pad = g_bpp; + + if (g_bpp == 24) + bitmap_pad = 32; + } - tdata = (owncolmap ? data : translate_image(width, height, data)); - bitmap = XCreatePixmap(display, wnd, width, height, depth); - image = XCreateImage(display, visual, depth, ZPixmap, 0, - (char *) tdata, width, height, g_server_bpp == 8 ? 8 : bpp, 0); + tdata = (g_owncolmap ? data : translate_image(width, height, data)); + bitmap = XCreatePixmap(g_display, g_wnd, width, height, g_depth); + image = XCreateImage(g_display, g_visual, g_depth, ZPixmap, 0, + (char *) tdata, width, height, bitmap_pad, 0); - XPutImage(display, bitmap, gc, image, 0, 0, 0, 0, width, height); + XPutImage(g_display, bitmap, g_create_bitmap_gc, image, 0, 0, 0, 0, width, height); XFree(image); - if (!owncolmap) + if (tdata != data) xfree(tdata); return (HBITMAP) bitmap; } @@ -1085,29 +1718,43 @@ { XImage *image; uint8 *tdata; - tdata = (owncolmap ? data : translate_image(width, height, data)); - image = XCreateImage(display, visual, depth, ZPixmap, 0, - (char *) tdata, width, height, g_server_bpp == 8 ? 8 : bpp, 0); + int bitmap_pad; - if (ownbackstore) + if (g_server_bpp == 8) { - XPutImage(display, backstore, gc, image, 0, 0, x, y, cx, cy); - XCopyArea(display, backstore, wnd, gc, x, y, cx, cy, x, y); + bitmap_pad = 8; } else { - XPutImage(display, wnd, gc, image, 0, 0, x, y, cx, cy); + bitmap_pad = g_bpp; + + if (g_bpp == 24) + bitmap_pad = 32; + } + + tdata = (g_owncolmap ? data : translate_image(width, height, data)); + image = XCreateImage(g_display, g_visual, g_depth, ZPixmap, 0, + (char *) tdata, width, height, bitmap_pad, 0); + + if (g_ownbackstore) + { + XPutImage(g_display, g_backstore, g_gc, image, 0, 0, x, y, cx, cy); + XCopyArea(g_display, g_backstore, g_wnd, g_gc, x, y, cx, cy, x, y); + } + else + { + XPutImage(g_display, g_wnd, g_gc, image, 0, 0, x, y, cx, cy); } XFree(image); - if (!owncolmap) + if (tdata != data) xfree(tdata); } void ui_destroy_bitmap(HBITMAP bmp) { - XFreePixmap(display, (Pixmap) bmp); + XFreePixmap(g_display, (Pixmap) bmp); } HGLYPH @@ -1116,30 +1763,29 @@ XImage *image; Pixmap bitmap; int scanline; - GC gc; scanline = (width + 7) / 8; - bitmap = XCreatePixmap(display, wnd, width, height, 1); - gc = XCreateGC(display, bitmap, 0, NULL); + bitmap = XCreatePixmap(g_display, g_wnd, width, height, 1); + if (g_create_glyph_gc == 0) + g_create_glyph_gc = XCreateGC(g_display, bitmap, 0, NULL); - image = XCreateImage(display, visual, 1, ZPixmap, 0, (char *) data, + image = XCreateImage(g_display, g_visual, 1, ZPixmap, 0, (char *) data, width, height, 8, scanline); image->byte_order = MSBFirst; image->bitmap_bit_order = MSBFirst; XInitImage(image); - XPutImage(display, bitmap, gc, image, 0, 0, 0, 0, width, height); + XPutImage(g_display, bitmap, g_create_glyph_gc, image, 0, 0, 0, 0, width, height); XFree(image); - XFreeGC(display, gc); return (HGLYPH) bitmap; } void ui_destroy_glyph(HGLYPH glyph) { - XFreePixmap(display, (Pixmap) glyph); + XFreePixmap(g_display, (Pixmap) glyph); } HCURSOR @@ -1203,7 +1849,7 @@ maskglyph = ui_create_glyph(width, height, mask); xcursor = - XCreatePixmapCursor(display, (Pixmap) cursorglyph, + XCreatePixmapCursor(g_display, (Pixmap) cursorglyph, (Pixmap) maskglyph, &fg, &bg, x, y); ui_destroy_glyph(maskglyph); @@ -1216,14 +1862,20 @@ void ui_set_cursor(HCURSOR cursor) { - current_cursor = (Cursor) cursor; - XDefineCursor(display, wnd, current_cursor); + g_current_cursor = (Cursor) cursor; + XDefineCursor(g_display, g_wnd, g_current_cursor); } void ui_destroy_cursor(HCURSOR cursor) { - XFreeCursor(display, (Cursor) cursor); + XFreeCursor(g_display, (Cursor) cursor); +} + +void +ui_set_null_cursor(void) +{ + ui_set_cursor(g_null_cursor); } #define MAKE_XCOLOR(xc,c) \ @@ -1238,9 +1890,9 @@ { COLOURENTRY *entry; int i, ncolours = colours->ncolours; - if (!owncolmap) + if (!g_owncolmap) { - uint32 *map = (uint32 *) xmalloc(sizeof(*colmap) * ncolours); + uint32 *map = (uint32 *) xmalloc(sizeof(*g_colmap) * ncolours); XColor xentry; XColor xc_cache[256]; uint32 colour; @@ -1250,7 +1902,7 @@ entry = &colours->colours[i]; MAKE_XCOLOR(&xentry, entry); - if (XAllocColor(display, xcolmap, &xentry) == 0) + if (XAllocColor(g_display, g_xcolmap, &xentry) == 0) { /* Allocation failed, find closest match. */ int j = 256; @@ -1264,9 +1916,9 @@ xc_cache[colLookup].red = xc_cache[colLookup].green = xc_cache[colLookup].blue = 0; xc_cache[colLookup].flags = 0; - XQueryColor(display, - DefaultColormap(display, - DefaultScreen(display)), + XQueryColor(g_display, + DefaultColormap(g_display, + DefaultScreen(g_display)), &xc_cache[colLookup]); } colLookup = 0; @@ -1307,9 +1959,7 @@ } - - /* byte swap here to make translate_image faster */ - map[i] = translate_colour(colour); + map[i] = colour; } return map; } @@ -1327,8 +1977,8 @@ MAKE_XCOLOR(xentry, entry); } - map = XCreateColormap(display, wnd, visual, AllocAll); - XStoreColors(display, map, xcolours, ncolours); + map = XCreateColormap(g_display, g_wnd, g_visual, AllocAll); + XStoreColors(g_display, map, xcolours, ncolours); xfree(xcolours); return (HCOLOURMAP) map; @@ -1338,24 +1988,24 @@ void ui_destroy_colourmap(HCOLOURMAP map) { - if (!owncolmap) + if (!g_owncolmap) xfree(map); else - XFreeColormap(display, (Colormap) map); + XFreeColormap(g_display, (Colormap) map); } void ui_set_colourmap(HCOLOURMAP map) { - if (!owncolmap) + if (!g_owncolmap) { - if (colmap) - xfree(colmap); + if (g_colmap) + xfree(g_colmap); - colmap = (uint32 *) map; + g_colmap = (uint32 *) map; } else - XSetWindowColormap(display, wnd, (Colormap) map); + XSetWindowColormap(g_display, g_wnd, (Colormap) map); } void @@ -1367,7 +2017,7 @@ rect.y = y; rect.width = cx; rect.height = cy; - XSetClipRectangles(display, gc, 0, 0, &rect, 1, YXBanded); + XSetClipRectangles(g_display, g_gc, 0, 0, &rect, 1, YXBanded); } void @@ -1379,13 +2029,13 @@ rect.y = 0; rect.width = g_width; rect.height = g_height; - XSetClipRectangles(display, gc, 0, 0, &rect, 1, YXBanded); + XSetClipRectangles(g_display, g_gc, 0, 0, &rect, 1, YXBanded); } void ui_bell(void) { - XBell(display, 0); + XBell(g_display, 0); } void @@ -1420,20 +2070,20 @@ { case 0: /* Solid */ SET_FOREGROUND(fgcolour); - FILL_RECTANGLE(x, y, cx, cy); + FILL_RECTANGLE_BACKSTORE(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); + SET_FOREGROUND(fgcolour); + SET_BACKGROUND(bgcolour); + XSetFillStyle(g_display, g_gc, FillOpaqueStippled); + XSetStipple(g_display, g_gc, fill); + XSetTSOrigin(g_display, g_gc, brush->xorigin, brush->yorigin); + FILL_RECTANGLE_BACKSTORE(x, y, cx, cy); + XSetFillStyle(g_display, g_gc, FillSolid); + XSetTSOrigin(g_display, g_gc, 0, 0); ui_destroy_glyph((HGLYPH) fill); break; @@ -1441,17 +2091,14 @@ for (i = 0; i != 8; i++) ipattern[7 - i] = brush->pattern[i]; fill = (Pixmap) ui_create_glyph(8, 8, ipattern); - 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); + XSetFillStyle(g_display, g_gc, FillOpaqueStippled); + XSetStipple(g_display, g_gc, fill); + XSetTSOrigin(g_display, g_gc, brush->xorigin, brush->yorigin); + FILL_RECTANGLE_BACKSTORE(x, y, cx, cy); + XSetFillStyle(g_display, g_gc, FillSolid); + XSetTSOrigin(g_display, g_gc, 0, 0); ui_destroy_glyph((HGLYPH) fill); break; @@ -1460,6 +2107,9 @@ } RESET_FUNCTION(opcode); + + if (g_ownbackstore) + XCopyArea(g_display, g_backstore, g_wnd, g_gc, x, y, cx, cy, x, y); } void @@ -1468,9 +2118,25 @@ /* src */ int srcx, int srcy) { 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); + if (g_ownbackstore) + { + if (g_Unobscured) + { + XCopyArea(g_display, g_wnd, g_wnd, g_gc, srcx, srcy, cx, cy, x, y); + XCopyArea(g_display, g_backstore, g_backstore, g_gc, srcx, srcy, cx, cy, x, + y); + } + else + { + XCopyArea(g_display, g_backstore, g_wnd, g_gc, srcx, srcy, cx, cy, x, y); + XCopyArea(g_display, g_backstore, g_backstore, g_gc, srcx, srcy, cx, cy, x, + y); + } + } + else + { + XCopyArea(g_display, g_wnd, g_wnd, g_gc, srcx, srcy, cx, cy, x, y); + } RESET_FUNCTION(opcode); } @@ -1480,9 +2146,9 @@ /* src */ HBITMAP src, int srcx, int srcy) { 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); + XCopyArea(g_display, (Pixmap) src, g_wnd, g_gc, srcx, srcy, cx, cy, x, y); + if (g_ownbackstore) + XCopyArea(g_display, (Pixmap) src, g_backstore, g_gc, srcx, srcy, cx, cy, x, y); RESET_FUNCTION(opcode); } @@ -1526,9 +2192,9 @@ { 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); + XDrawLine(g_display, g_wnd, g_gc, startx, starty, endx, endy); + if (g_ownbackstore) + XDrawLine(g_display, g_backstore, g_gc, startx, starty, endx, endy); RESET_FUNCTION(opcode); } @@ -1541,6 +2207,151 @@ FILL_RECTANGLE(x, y, cx, cy); } +void +ui_polygon(uint8 opcode, + /* mode */ uint8 fillmode, + /* dest */ POINT * point, int npoints, + /* brush */ BRUSH * brush, int bgcolour, int fgcolour) +{ + uint8 style, i, ipattern[8]; + Pixmap fill; + + SET_FUNCTION(opcode); + + switch (fillmode) + { + case ALTERNATE: + XSetFillRule(g_display, g_gc, EvenOddRule); + break; + case WINDING: + XSetFillRule(g_display, g_gc, WindingRule); + break; + default: + unimpl("fill mode %d\n", fillmode); + } + + if (brush) + style = brush->style; + else + style = 0; + + switch (style) + { + case 0: /* Solid */ + SET_FOREGROUND(fgcolour); + FILL_POLYGON((XPoint *) point, npoints); + break; + + case 2: /* Hatch */ + fill = (Pixmap) ui_create_glyph(8, 8, + hatch_patterns + brush->pattern[0] * 8); + SET_FOREGROUND(fgcolour); + SET_BACKGROUND(bgcolour); + XSetFillStyle(g_display, g_gc, FillOpaqueStippled); + XSetStipple(g_display, g_gc, fill); + XSetTSOrigin(g_display, g_gc, brush->xorigin, brush->yorigin); + FILL_POLYGON((XPoint *) point, npoints); + XSetFillStyle(g_display, g_gc, FillSolid); + XSetTSOrigin(g_display, g_gc, 0, 0); + ui_destroy_glyph((HGLYPH) fill); + break; + + case 3: /* Pattern */ + for (i = 0; i != 8; i++) + ipattern[7 - i] = brush->pattern[i]; + fill = (Pixmap) ui_create_glyph(8, 8, ipattern); + SET_FOREGROUND(bgcolour); + SET_BACKGROUND(fgcolour); + XSetFillStyle(g_display, g_gc, FillOpaqueStippled); + XSetStipple(g_display, g_gc, fill); + XSetTSOrigin(g_display, g_gc, brush->xorigin, brush->yorigin); + FILL_POLYGON((XPoint *) point, npoints); + XSetFillStyle(g_display, g_gc, FillSolid); + XSetTSOrigin(g_display, g_gc, 0, 0); + ui_destroy_glyph((HGLYPH) fill); + break; + + default: + unimpl("brush %d\n", brush->style); + } + + RESET_FUNCTION(opcode); +} + +void +ui_polyline(uint8 opcode, + /* dest */ POINT * points, int npoints, + /* pen */ PEN * pen) +{ + /* TODO: set join style */ + SET_FUNCTION(opcode); + SET_FOREGROUND(pen->colour); + XDrawLines(g_display, g_wnd, g_gc, (XPoint *) points, npoints, CoordModePrevious); + if (g_ownbackstore) + XDrawLines(g_display, g_backstore, g_gc, (XPoint *) points, npoints, + CoordModePrevious); + RESET_FUNCTION(opcode); +} + +void +ui_ellipse(uint8 opcode, + /* mode */ uint8 fillmode, + /* dest */ int x, int y, int cx, int cy, + /* brush */ BRUSH * brush, int bgcolour, int fgcolour) +{ + uint8 style, i, ipattern[8]; + Pixmap fill; + + SET_FUNCTION(opcode); + + if (brush) + style = brush->style; + else + style = 0; + + switch (style) + { + case 0: /* Solid */ + SET_FOREGROUND(fgcolour); + DRAW_ELLIPSE(x, y, cx, cy, fillmode); + break; + + case 2: /* Hatch */ + fill = (Pixmap) ui_create_glyph(8, 8, + hatch_patterns + brush->pattern[0] * 8); + SET_FOREGROUND(fgcolour); + SET_BACKGROUND(bgcolour); + XSetFillStyle(g_display, g_gc, FillOpaqueStippled); + XSetStipple(g_display, g_gc, fill); + XSetTSOrigin(g_display, g_gc, brush->xorigin, brush->yorigin); + DRAW_ELLIPSE(x, y, cx, cy, fillmode); + XSetFillStyle(g_display, g_gc, FillSolid); + XSetTSOrigin(g_display, g_gc, 0, 0); + ui_destroy_glyph((HGLYPH) fill); + break; + + case 3: /* Pattern */ + for (i = 0; i != 8; i++) + ipattern[7 - i] = brush->pattern[i]; + fill = (Pixmap) ui_create_glyph(8, 8, ipattern); + SET_FOREGROUND(bgcolour); + SET_BACKGROUND(fgcolour); + XSetFillStyle(g_display, g_gc, FillOpaqueStippled); + XSetStipple(g_display, g_gc, fill); + XSetTSOrigin(g_display, g_gc, brush->xorigin, brush->yorigin); + DRAW_ELLIPSE(x, y, cx, cy, fillmode); + XSetFillStyle(g_display, g_gc, FillSolid); + XSetTSOrigin(g_display, g_gc, 0, 0); + ui_destroy_glyph((HGLYPH) fill); + break; + + default: + unimpl("brush %d\n", brush->style); + } + + RESET_FUNCTION(opcode); +} + /* warning, this function only draws on wnd or backstore, not both */ void ui_draw_glyph(int mixmode, @@ -1551,61 +2362,70 @@ SET_FOREGROUND(fgcolour); SET_BACKGROUND(bgcolour); - XSetFillStyle(display, gc, + XSetFillStyle(g_display, g_gc, (mixmode == MIX_TRANSPARENT) ? FillStippled : FillOpaqueStippled); - XSetStipple(display, gc, (Pixmap) glyph); - XSetTSOrigin(display, gc, x, y); + XSetStipple(g_display, g_gc, (Pixmap) glyph); + XSetTSOrigin(g_display, g_gc, x, y); FILL_RECTANGLE_BACKSTORE(x, y, cx, cy); - XSetFillStyle(display, gc, FillSolid); + XSetFillStyle(g_display, g_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))\ {\ - 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;\ - }\ + if (flags & TEXT2_VERTICAL)\ + y += ttext[idx+1] | (ttext[idx+2] << 8);\ else\ - {\ - if (flags & TEXT2_VERTICAL) \ - y += xyoffset;\ - else\ - x += xyoffset;\ - }\ + x += ttext[idx+1] | (ttext[idx+2] << 8);\ + idx += 2;\ }\ - if (glyph != NULL)\ + else\ {\ - 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;\ + if (flags & TEXT2_VERTICAL)\ + y += xyoffset;\ + else\ + x += xyoffset;\ }\ + }\ + if (glyph != NULL)\ + {\ + x1 = x + glyph->offset;\ + y1 = y + glyph->baseline;\ + XSetStipple(g_display, g_gc, (Pixmap) glyph->pixmap);\ + XSetTSOrigin(g_display, g_gc, x1, y1);\ + FILL_RECTANGLE_BACKSTORE(x1, y1, glyph->width, glyph->height);\ + if (flags & TEXT2_IMPLICIT_X)\ + x += glyph->width;\ + }\ } void -ui_draw_text(uint8 font, uint8 flags, int mixmode, int x, int y, +ui_draw_text(uint8 font, uint8 flags, uint8 opcode, 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, BRUSH * brush, + int bgcolour, int fgcolour, uint8 * text, uint8 length) { + /* TODO: use brush appropriately */ + FONTGLYPH *glyph; - int i, j, xyoffset; + int i, j, xyoffset, x1, y1; DATABLOB *entry; SET_FOREGROUND(bgcolour); + /* Sometimes, the boxcx value is something really large, like + 32691. This makes XCopyArea fail with Xvnc. The code below + is a quick fix. */ + if (boxx + boxcx > g_width) + boxcx = g_width - boxx; + if (boxcx > 1) { FILL_RECTANGLE_BACKSTORE(boxx, boxy, boxcx, boxcy); @@ -1615,6 +2435,10 @@ FILL_RECTANGLE_BACKSTORE(clipx, clipy, clipcx, clipcy); } + SET_FOREGROUND(fgcolour); + SET_BACKGROUND(bgcolour); + XSetFillStyle(g_display, g_gc, FillStippled); + /* Paint text, character by character */ for (i = 0; i < length;) { @@ -1665,13 +2489,16 @@ break; } } - if (ownbackstore) + + XSetFillStyle(g_display, g_gc, FillSolid); + + if (g_ownbackstore) { if (boxcx > 1) - XCopyArea(display, backstore, wnd, gc, boxx, + XCopyArea(g_display, g_backstore, g_wnd, g_gc, boxx, boxy, boxcx, boxcy, boxx, boxy); else - XCopyArea(display, backstore, wnd, gc, clipx, + XCopyArea(g_display, g_backstore, g_wnd, g_gc, clipx, clipy, clipcx, clipcy, clipx, clipy); } } @@ -1682,20 +2509,20 @@ Pixmap pix; XImage *image; - if (ownbackstore) + if (g_ownbackstore) { - image = XGetImage(display, backstore, x, y, cx, cy, AllPlanes, ZPixmap); + image = XGetImage(g_display, g_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); + pix = XCreatePixmap(g_display, g_wnd, cx, cy, g_depth); + XCopyArea(g_display, g_wnd, pix, g_gc, x, y, cx, cy, 0, 0); + image = XGetImage(g_display, pix, 0, 0, cx, cy, AllPlanes, ZPixmap); + XFreePixmap(g_display, pix); } - offset *= bpp / 8; - cache_put_desktop(offset, cx, cy, image->bytes_per_line, bpp / 8, (uint8 *) image->data); + offset *= g_bpp / 8; + cache_put_desktop(offset, cx, cy, image->bytes_per_line, g_bpp / 8, (uint8 *) image->data); XDestroyImage(image); } @@ -1706,23 +2533,34 @@ XImage *image; uint8 *data; - offset *= bpp / 8; - data = cache_get_desktop(offset, cx, cy, bpp / 8); + offset *= g_bpp / 8; + data = cache_get_desktop(offset, cx, cy, g_bpp / 8); if (data == NULL) return; - image = XCreateImage(display, visual, depth, ZPixmap, 0, - (char *) data, cx, cy, BitmapPad(display), cx * bpp / 8); + image = XCreateImage(g_display, g_visual, g_depth, ZPixmap, 0, + (char *) data, cx, cy, BitmapPad(g_display), cx * g_bpp / 8); - if (ownbackstore) + if (g_ownbackstore) { - XPutImage(display, backstore, gc, image, 0, 0, x, y, cx, cy); - XCopyArea(display, backstore, wnd, gc, x, y, cx, cy, x, y); + XPutImage(g_display, g_backstore, g_gc, image, 0, 0, x, y, cx, cy); + XCopyArea(g_display, g_backstore, g_wnd, g_gc, x, y, cx, cy, x, y); } else { - XPutImage(display, wnd, gc, image, 0, 0, x, y, cx, cy); + XPutImage(g_display, g_wnd, g_gc, image, 0, 0, x, y, cx, cy); } XFree(image); } + +/* these do nothing here but are used in uiports */ +void +ui_begin_update(void) +{ +} + +void +ui_end_update(void) +{ +}