--- sourceforge.net/trunk/rdesktop/xwin.c 2002/05/28 11:48:55 53 +++ sourceforge.net/trunk/rdesktop/xwin.c 2002/09/15 11:39:16 157 @@ -20,21 +20,23 @@ #include #include -#include #include #include +#define XK_MISCELLANY +#include #include "rdesktop.h" +#include "scancodes.h" -extern char keymapname[16]; -extern int keylayout; extern int width; extern int height; extern BOOL sendmotion; extern BOOL fullscreen; +extern BOOL grab_keyboard; +extern char title[]; Display *display; -XkbDescPtr xkb; static int x_socket; +static Screen *screen; static Window wnd; static GC gc; static Visual *visual; @@ -49,17 +51,6 @@ static BOOL ownbackstore; static Pixmap backstore; -/* needed to keep track of the modifiers */ -static unsigned int key_modifier_state = 0; -static unsigned int key_down_state = 0; - -#define DShift1Mask (1<<0) -#define DShift2Mask (1<<1) -#define DControl1Mask (1<<2) -#define DControl2Mask (1<<3) -#define DMod1Mask (1<<4) -#define DMod2Mask (1<<5) - #define FILL_RECTANGLE(x,y,cx,cy)\ { \ XFillRectangle(display, wnd, gc, x, y, cx, cy); \ @@ -70,9 +61,16 @@ /* colour maps */ static BOOL owncolmap; static Colormap xcolmap; -static uint32 white; static uint32 *colmap; +/* Compose support */ +BOOL enable_compose = False; +static XIM IM = NULL; +static XIC IC = NULL; + +/* toggle fullscreen globals */ +static unsigned long input_mask; + #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)); @@ -99,26 +97,23 @@ #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); } -void xwin_release_modifiers(XKeyEvent* ev, uint32 ev_time, uint32 scancode); -void xwin_press_modifiers(XKeyEvent* ev, uint32 ev_time, uint32 scancode); - static void -translate8(uint8 *data, uint8 *out, uint8 *end) +translate8(uint8 * data, uint8 * out, uint8 * end) { while (out < end) - *(out++) = (uint8)colmap[*(data++)]; + *(out++) = (uint8) colmap[*(data++)]; } static void -translate16(uint8 *data, uint16 *out, uint16 *end) +translate16(uint8 * data, uint16 * out, uint16 * end) { while (out < end) - *(out++) = (uint16)colmap[*(data++)]; + *(out++) = (uint16) colmap[*(data++)]; } /* little endian - conversion happens when colourmap is built */ static void -translate24(uint8 *data, uint8 *out, uint8 *end) +translate24(uint8 * data, uint8 * out, uint8 * end) { uint32 value; @@ -132,16 +127,16 @@ } static void -translate32(uint8 *data, uint32 *out, uint32 *end) +translate32(uint8 * data, uint32 * out, uint32 * end) { while (out < end) *(out++) = colmap[*(data++)]; } static uint8 * -translate_image(int width, int height, uint8 *data) +translate_image(int width, int height, uint8 * data) { - int size = width * height * bpp/8; + int size = width * height * bpp / 8; uint8 *out = xmalloc(size); uint8 *end = out + size; @@ -152,7 +147,7 @@ break; case 16: - translate16(data, (uint16 *)out, (uint16 *)end); + translate16(data, (uint16 *) out, (uint16 *) end); break; case 24: @@ -160,7 +155,7 @@ break; case 32: - translate32(data, (uint32 *)out, (uint32 *)end); + translate32(data, (uint32 *) out, (uint32 *) end); break; } @@ -196,55 +191,115 @@ return colour; } -BOOL -ui_create_window(char *title) +static unsigned long +init_inputmethod(void) { - XSetWindowAttributes attribs; - XClassHint *classhints; - XSizeHints *sizehints; - unsigned long input_mask; - XPixmapFormatValues *pfm; - Screen *screen; - uint16 test; - int i; - - int xkb_minor, xkb_major; - int xkb_event, xkb_error, xkb_reason; - - /* compare compiletime libs with runtime libs. */ - xkb_major = XkbMajorVersion; - xkb_minor = XkbMinorVersion; - if( XkbLibraryVersion( &xkb_major, &xkb_minor ) == False ) + unsigned long filtered_events = 0; + + IM = XOpenIM(display, NULL, NULL, NULL); + if (IM == NULL) { - error("please re-compile rdesktop\ncompile time version of xkb is not compatible with\nyour runtime version of the library\n"); - return False; + error("Failed to open input method\n"); } + if (IM != NULL) + { + /* Must be done after XCreateWindow */ + IC = XCreateIC(IM, XNInputStyle, + (XIMPreeditNothing | XIMStatusNothing), + XNClientWindow, wnd, XNFocusWindow, wnd, NULL); - /* XKB is the 'new' keyboard handler in x.. ( the xkb code in Xfree86 originates from SGI, years 1993 and 1995 from what I could tell. ) - * it makes it possible for people with disabilities to use rdesktop, stickykeys, bouncekeys etc. VERY MUCH useful. - * XFree86 has had support for it since it's earliest incarnation. I believe it is a reasonable dependency. - */ - display = XkbOpenDisplay( NULL, &xkb_event, &xkb_error, &xkb_major, &xkb_minor, &xkb_reason ); - switch(xkb_reason) + if (IC == NULL) + { + error("Failed to create input context\n"); + XCloseIM(IM); + IM = NULL; + } + } + + /* For correct Multi_key/Compose processing, I guess. + It seems to work alright anyway, though. */ + if (IC != NULL) { - case XkbOD_BadLibraryVersion: - error("XkbOD_BadLibraryVersion: XKB extensions in server and the library rdesktop is linked against aren't compatible with each other.\n"); - break; - case XkbOD_ConnectionRefused: - error("XkbOD_ConnectionRefused\n"); - break; - case XkbOD_BadServerVersion: - error("XkbOD_BadServerVersion\n"); - break; - case XkbOD_NonXkbServer: - error("XkbOD_NonXkbServer: XKB extension not present in server\nupdate your X server.\n"); - break; - case XkbOD_Success: - DEBUG("XkbOD_Success: Connection established with display\n"); - break; + if (XGetICValues(IC, XNFilterEvents, &filtered_events, NULL) != NULL) + { + error("Failed to obtain XNFilterEvents value from IC\n"); + filtered_events = 0; + } + } + return filtered_events; +} + +static void +close_inputmethod(void) +{ + if (IC != NULL) + { + XDestroyIC(IC); + if (IM != NULL) + { + XCloseIM(IM); + IM = NULL; + } + } +} + +BOOL +get_key_state(int keysym) +{ + int keysymMask = 0, modifierpos, key; + Window wDummy1, wDummy2; + int iDummy3, iDummy4, iDummy5, iDummy6; + unsigned int current_state; + int offset; + + XModifierKeymap *map = XGetModifierMapping(display); + KeyCode keycode = XKeysymToKeycode(display, keysym); + + if (keycode == NoSymbol) + return False; + + for (modifierpos = 0; modifierpos < 8; modifierpos++) + { + offset = map->max_keypermod * modifierpos; + + for (key = 0; key < map->max_keypermod; key++) + { + if (map->modifiermap[offset + key] == keycode) + keysymMask = 1 << modifierpos; + } } + XQueryPointer(display, DefaultRootWindow(display), &wDummy1, + &wDummy2, &iDummy3, &iDummy4, &iDummy5, &iDummy6, ¤t_state); + + XFreeModifiermap(map); + + return (current_state & keysymMask) ? True : False; +} + +static void +xwin_map_window() +{ + XEvent xevent; + + XMapWindow(display, wnd); + + /* wait for VisibilityChange */ + XMaskEvent(display, VisibilityChangeMask, &xevent); + + if (fullscreen) + XSetInputFocus(display, wnd, RevertToPointerRoot, CurrentTime); +} + +BOOL +ui_init() +{ + XPixmapFormatValues *pfm; + uint16 test; + int i; + + display = XOpenDisplay(NULL); if (display == NULL) { error("Failed to open display\n"); @@ -255,7 +310,7 @@ screen = DefaultScreenOfDisplay(display); visual = DefaultVisualOfScreen(screen); depth = DefaultDepthOfScreen(screen); - + pfm = XListPixmapFormats(display, &i); if (pfm != NULL) { @@ -263,8 +318,7 @@ desirable, e.g. 24 bits->32 bits. */ while (i--) { - if ((pfm[i].depth == depth) - && (pfm[i].bits_per_pixel > bpp)) + if ((pfm[i].depth == depth) && (pfm[i].bits_per_pixel > bpp)) { bpp = pfm[i].bits_per_pixel; } @@ -284,35 +338,40 @@ else xcolmap = DefaultColormapOfScreen(screen); + if (DoesBackingStore(screen) == NotUseful) + ownbackstore = True; + test = 1; - host_be = !(BOOL)(*(uint8 *)(&test)); + 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) - ownbackstore = True; - if (fullscreen) { - attribs.override_redirect = True; width = WidthOfScreen(screen); height = HeightOfScreen(screen); } - else - { - attribs.override_redirect = False; - } - width = (width + 3) & ~3; /* make width a multiple of 32 bits */ + xkeymap_init(); + return True; +} - wnd = XCreateWindow(display, RootWindowOfScreen(screen), - 0, 0, width, height, 0, CopyFromParent, - InputOutput, CopyFromParent, - CWBackingStore | CWBackPixel | CWOverrideRedirect, - &attribs); +BOOL +ui_create_window() +{ + XSetWindowAttributes attribs; + XClassHint *classhints; + XSizeHints *sizehints; + XEvent xevent; + + attribs.background_pixel = BlackPixelOfScreen(screen); + attribs.backing_store = ownbackstore ? NotUseful : Always; + attribs.override_redirect = fullscreen; + wnd = XCreateWindow(display, RootWindowOfScreen(screen), 0, 0, width, height, + 0, CopyFromParent, InputOutput, CopyFromParent, + CWBackPixel | CWBackingStore | CWOverrideRedirect, &attribs); + + if (ownbackstore) + backstore = XCreatePixmap(display, wnd, width, height, depth); XStoreName(display, wnd, title); @@ -334,39 +393,26 @@ XFree(sizehints); } - xkeymap_init(); + input_mask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | + VisibilityChangeMask | FocusChangeMask; - input_mask = KeyPressMask | KeyReleaseMask | - ButtonPressMask | ButtonReleaseMask | - EnterWindowMask | LeaveWindowMask | KeymapStateMask; + if (grab_keyboard) + input_mask |= EnterWindowMask | LeaveWindowMask; if (sendmotion) input_mask |= PointerMotionMask; - if (ownbackstore) input_mask |= ExposureMask; + if (enable_compose) + input_mask |= init_inputmethod(); XSelectInput(display, wnd, input_mask); - gc = XCreateGC(display, wnd, 0, NULL); - if (ownbackstore) - backstore = XCreatePixmap(display, wnd, width, height, depth); - - XMapWindow(display, wnd); - - /* TODO: error texts... make them friendly. */ - xkb = XkbGetKeyboard(display, XkbAllComponentsMask, XkbUseCoreKbd); - if ((int)xkb == BadAlloc || xkb == NULL) - { - error( "XkbGetKeyboard failed.\n"); - exit(0); - } + xwin_map_window(); - /* TODO: error texts... make them friendly. */ - if( XkbSelectEvents(display, xkb->device_spec, XkbAllEventsMask, XkbAllEventsMask) == False ) - { - error( "XkbSelectEvents failed.\n"); - exit(0); - } + /* clear the window so that cached data is not seen */ + gc = XCreateGC(display, wnd, 0, NULL); + XSetForeground(display, gc, 0); + FILL_RECTANGLE(0, 0, width, height); return True; } @@ -374,66 +420,134 @@ void ui_destroy_window() { - if( xkb != NULL ) - XkbFreeKeyboard(xkb, XkbAllControlsMask, True); - if (ownbackstore) XFreePixmap(display, backstore); XFreeGC(display, gc); + + close_inputmethod(); + XDestroyWindow(display, wnd); XCloseDisplay(display); display = NULL; } static void +xwin_reset_keys() +{ + /* reset keys */ + uint32 ev_time; + ev_time = time(NULL); + rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_LCTRL); + rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_LALT); + rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_LSHIFT); + rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_RCTRL); + rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_RALT); + rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_RSHIFT); +} + +void +xwin_toggle_fullscreen() +{ + XEvent xevent; + XSetWindowAttributes attribs; + int newwidth, newheight; + + fullscreen = !fullscreen; + newwidth = fullscreen ? WidthOfScreen(screen) : width; + newheight = fullscreen ? HeightOfScreen(screen) : height; + + XUnmapWindow(display, wnd); + attribs.override_redirect = fullscreen; + XMoveResizeWindow(display, wnd, 0, 0, newwidth, newheight); + XChangeWindowAttributes(display, wnd, CWOverrideRedirect, &attribs); + xwin_map_window(); +} + +/* Process all events in Xlib queue */ +static void xwin_process_events() { - XkbEvent xkbevent; - + XEvent xevent; KeySym keysym; - uint8 scancode; uint16 button, flags; uint32 ev_time; - uint32 tmpmods; + key_translation tr; + char *ksname = NULL; + char str[256]; + Status status; - while (XCheckMaskEvent(display, ~0, &xkbevent.core)) + while (XPending(display) > 0) { + XNextEvent(display, &xevent); + + if (enable_compose && (XFilterEvent(&xevent, None) == True)) + { + DEBUG_KBD(("Filtering event\n")); + continue; + } + ev_time = time(NULL); flags = 0; - switch (xkbevent.type) + switch (xevent.type) { - case KeymapNotify: - /* TODO: - * read modifier status at focus in, and update the local masks, and the other end as well.. - * if not, we may get out of sync. - * xkbevent.core.xkeymap.key_vector - * char key_vector[32]; - */ - break; + case KeyPress: + if (IC != NULL) + /* Multi_key compatible version */ + { + XmbLookupString(IC, + (XKeyPressedEvent *) & + xevent, str, sizeof(str), &keysym, &status); + if (!((status == XLookupKeySym) || (status == XLookupBoth))) + { + error("XmbLookupString failed with status 0x%x\n", + status); + break; + } + } + else + { + /* Plain old XLookupString */ + DEBUG_KBD(("No input context, using XLookupString\n")); + XLookupString((XKeyEvent *) & xevent, + str, sizeof(str), &keysym, NULL); + } - case KeyRelease: - flags = KBD_FLAG_DOWN | KBD_FLAG_UP; - /* fall through */ + ksname = get_ksname(keysym); + DEBUG_KBD(("\nKeyPress for (keysym 0x%lx, %s)\n", keysym, ksname)); - case KeyPress: - if( XkbTranslateKeyCode(xkb, xkbevent.core.xkey.keycode, xkbevent.core.xkey.state, &tmpmods, &keysym) == False ) + if (handle_special_keys(keysym, ev_time, True)) break; - scancode = xkeymap_translate_key(keysym, xkbevent.core.xkey.keycode, &flags); - if (scancode == 0 ) + tr = xkeymap_translate_key(keysym, + xevent.xkey.keycode, xevent.xkey.state); + + if (tr.scancode == 0) break; - /* keep track of the modifiers -- needed for stickykeys... */ - if( xkbevent.type == KeyPress ) - xwin_press_modifiers( &xkbevent.core.xkey, ev_time, scancode ); + ensure_remote_modifiers(ev_time, tr); - rdp_send_input(ev_time, RDP_INPUT_SCANCODE, flags, scancode, 0); + rdp_send_scancode(ev_time, RDP_KEYPRESS, tr.scancode); + break; + case KeyRelease: + XLookupString((XKeyEvent *) & xevent, str, + sizeof(str), &keysym, NULL); - if( xkbevent.type == KeyRelease ) - xwin_release_modifiers( &xkbevent.core.xkey, ev_time, scancode ); + ksname = get_ksname(keysym); + DEBUG_KBD(("\nKeyRelease for (keysym 0x%lx, %s)\n", keysym, + ksname)); + + if (handle_special_keys(keysym, ev_time, False)) + break; + + tr = xkeymap_translate_key(keysym, + xevent.xkey.keycode, xevent.xkey.state); + + if (tr.scancode == 0) + break; + rdp_send_scancode(ev_time, RDP_KEYRELEASE, tr.scancode); break; case ButtonPress: @@ -441,167 +555,71 @@ /* fall through */ case ButtonRelease: - button = xkeymap_translate_button(xkbevent.core.xbutton.button); + button = xkeymap_translate_button(xevent.xbutton.button); if (button == 0) break; rdp_send_input(ev_time, RDP_INPUT_MOUSE, - flags | button, - xkbevent.core.xbutton.x, - xkbevent.core.xbutton.y); + flags | button, xevent.xbutton.x, xevent.xbutton.y); break; case MotionNotify: rdp_send_input(ev_time, RDP_INPUT_MOUSE, - MOUSE_FLAG_MOVE, - xkbevent.core.xmotion.x, - xkbevent.core.xmotion.y); + MOUSE_FLAG_MOVE, xevent.xmotion.x, xevent.xmotion.y); break; + case FocusIn: + /* fall through */ case EnterNotify: - XGrabKeyboard(display, wnd, True, GrabModeAsync, - GrabModeAsync, CurrentTime); + if (grab_keyboard) + XGrabKeyboard(display, wnd, True, + GrabModeAsync, GrabModeAsync, CurrentTime); break; + case FocusOut: + xwin_reset_keys(); + /* fall through */ case LeaveNotify: - XUngrabKeyboard(display, CurrentTime); + if (grab_keyboard) + XUngrabKeyboard(display, CurrentTime); break; case Expose: XCopyArea(display, backstore, wnd, gc, - xkbevent.core.xexpose.x, xkbevent.core.xexpose.y, - xkbevent.core.xexpose.width, xkbevent.core.xexpose.height, - xkbevent.core.xexpose.x, xkbevent.core.xexpose.y); + xevent.xexpose.x, xevent.xexpose.y, + xevent.xexpose.width, + xevent.xexpose.height, + xevent.xexpose.x, xevent.xexpose.y); break; - } - } -} - -void -xwin_release_modifiers(XKeyEvent* ev, uint32 ev_time, uint32 scancode) -{ - switch (scancode) { - case 0x2a: - key_down_state &= ~DShift1Mask; - break; - case 0x36: - key_down_state &= ~DShift2Mask; - break; - case 0x1d: - key_down_state &= ~DControl1Mask; - break; - case 0x9d: - key_down_state &= ~DControl2Mask; - break; - case 0x38: - key_down_state &= ~DMod1Mask; - break; - case 0xb8: - key_down_state &= ~DMod2Mask; - break; - } - - if( !(ShiftMask & ev->state) && (key_down_state & DShift1Mask)) - { - rdp_send_input(ev_time, RDP_INPUT_SCANCODE, KBD_FLAG_UP, 0x2a, 0); - key_down_state &= ~DShift1Mask; - - } - - if( !(ControlMask & ev->state) && (key_down_state & DControl1Mask)) - { - rdp_send_input(ev_time, RDP_INPUT_SCANCODE, KBD_FLAG_UP, 0x1d, 0); - key_down_state &= ~DControl1Mask; - - } - - if( !(Mod1Mask & ev->state) && (key_down_state & DMod1Mask)) - { - rdp_send_input(ev_time, RDP_INPUT_SCANCODE, KBD_FLAG_UP, 0x38, 0); - key_down_state &= ~DMod1Mask; - } - - if( !(Mod2Mask & ev->state) && (key_down_state & DMod2Mask)) - { - rdp_send_input(ev_time, RDP_INPUT_SCANCODE, KBD_FLAG_UP, 0xb8, 0); - key_down_state &= ~DMod2Mask; - } -} - - -void -xwin_press_modifiers(XKeyEvent* ev, uint32 ev_time, uint32 scancode) -{ - key_modifier_state = ev->state; - - switch (scancode) { - case 0x2a: - key_down_state |= DShift1Mask; - break; - case 0x36: - key_down_state |= DShift2Mask; - break; - case 0x1d: - key_down_state |= DControl1Mask; - break; - case 0x9d: - key_down_state |= DControl2Mask; - break; - case 0x38: - key_down_state |= DMod1Mask; - break; - case 0xb8: - key_down_state |= DMod2Mask; - break; - } - - if( (ShiftMask & ev->state) && !((key_down_state & DShift1Mask) || (key_down_state & DShift2Mask))) - { - rdp_send_input(ev_time, RDP_INPUT_SCANCODE, KBD_FLAG_DOWN, 0x2a, 0); - key_down_state |= DShift1Mask; - - } - - if( (ControlMask & ev->state) && !((key_down_state & DControl1Mask) || (key_down_state & DControl2Mask))) - { - rdp_send_input(ev_time, RDP_INPUT_SCANCODE, KBD_FLAG_DOWN, 0x1d, 0); - key_down_state |= DControl1Mask; - - } - - if( (Mod1Mask & ev->state) && !(key_down_state & DMod1Mask)) - { - rdp_send_input(ev_time, RDP_INPUT_SCANCODE, KBD_FLAG_DOWN, 0x38, 0); - key_down_state |= DMod1Mask; - - } - - if( (Mod2Mask & ev->state) && !(key_down_state & DMod2Mask)) - { - rdp_send_input(ev_time, RDP_INPUT_SCANCODE, KBD_FLAG_DOWN, 0xb8, 0); - key_down_state |= DMod2Mask; + case MappingNotify: + /* Refresh keyboard mapping if it has changed. This is important for + Xvnc, since it allocates keycodes dynamically */ + if (xevent.xmapping.request == MappingKeyboard + || xevent.xmapping.request == MappingModifier) + XRefreshKeyboardMapping(&xevent.xmapping); + break; + } } } void ui_select(int rdp_socket) { - int n = (rdp_socket > x_socket) ? rdp_socket+1 : x_socket+1; + int n = (rdp_socket > x_socket) ? rdp_socket + 1 : x_socket + 1; fd_set rfds; FD_ZERO(&rfds); while (True) { + /* Process any events already waiting */ + xwin_process_events(); + FD_ZERO(&rfds); FD_SET(rdp_socket, &rfds); - if (display != NULL) - { - FD_SET(x_socket, &rfds); - XFlush(display); - } + FD_SET(x_socket, &rfds); switch (select(n, &rfds, NULL, NULL, NULL)) { @@ -612,9 +630,6 @@ continue; } - if (FD_ISSET(x_socket, &rfds)) - xwin_process_events(); - if (FD_ISSET(rdp_socket, &rfds)) return; } @@ -627,7 +642,7 @@ } HBITMAP -ui_create_bitmap(int width, int height, uint8 *data) +ui_create_bitmap(int width, int height, uint8 * data) { XImage *image; Pixmap bitmap; @@ -635,8 +650,8 @@ 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); + image = XCreateImage(display, visual, depth, ZPixmap, 0, + (char *) tdata, width, height, 8, 0); XPutImage(display, bitmap, gc, image, 0, 0, 0, 0, width, height); @@ -647,15 +662,14 @@ } void -ui_paint_bitmap(int x, int y, int cx, int cy, - int width, int height, uint8 *data) +ui_paint_bitmap(int x, int y, int cx, int cy, int width, int height, uint8 * data) { XImage *image; uint8 *tdata; tdata = (owncolmap ? data : translate_image(width, height, data)); - image = XCreateImage(display, visual, depth, ZPixmap, - 0, tdata, width, height, 8, 0); + image = XCreateImage(display, visual, depth, ZPixmap, 0, + (char *) tdata, width, height, 8, 0); if (ownbackstore) { @@ -675,11 +689,11 @@ void ui_destroy_bitmap(HBITMAP bmp) { - XFreePixmap(display, (Pixmap)bmp); + XFreePixmap(display, (Pixmap) bmp); } HGLYPH -ui_create_glyph(int width, int height, uint8 *data) +ui_create_glyph(int width, int height, uint8 * data) { XImage *image; Pixmap bitmap; @@ -691,8 +705,8 @@ bitmap = XCreatePixmap(display, wnd, width, height, 1); gc = XCreateGC(display, bitmap, 0, NULL); - image = XCreateImage(display, visual, 1, ZPixmap, 0, - data, width, height, 8, scanline); + image = XCreateImage(display, visual, 1, ZPixmap, 0, (char *) data, + width, height, 8, scanline); image->byte_order = MSBFirst; image->bitmap_bit_order = MSBFirst; XInitImage(image); @@ -701,18 +715,18 @@ 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); } HCURSOR -ui_create_cursor(unsigned int x, unsigned int y, int width, - int height, uint8 *andmask, uint8 *xormask) +ui_create_cursor(unsigned int x, unsigned int y, int width, int height, + uint8 * andmask, uint8 * xormask) { HGLYPH maskglyph, cursorglyph; XColor bg, fg; @@ -769,27 +783,28 @@ 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); + + 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; + return (HCURSOR) xcursor; } void ui_set_cursor(HCURSOR cursor) { - XDefineCursor(display, wnd, (Cursor)cursor); + XDefineCursor(display, wnd, (Cursor) cursor); } void ui_destroy_cursor(HCURSOR cursor) { - XFreeCursor(display, (Cursor)cursor); + XFreeCursor(display, (Cursor) cursor); } #define MAKE_XCOLOR(xc,c) \ @@ -799,7 +814,7 @@ (xc)->flags = DoRed | DoGreen | DoBlue; HCOLOURMAP -ui_create_colourmap(COLOURMAP *colours) +ui_create_colourmap(COLOURMAP * colours) { COLOURENTRY *entry; int i, ncolours = colours->ncolours; @@ -822,7 +837,7 @@ XStoreColors(display, map, xcolours, ncolours); xfree(xcolours); - return (HCOLOURMAP)map; + return (HCOLOURMAP) map; } else { @@ -838,7 +853,7 @@ if (XAllocColor(display, xcolmap, &xentry) != 0) colour = xentry.pixel; else - colour = white; + colour = WhitePixelOfScreen(screen); /* byte swap here to make translate_image faster */ map[i] = translate_colour(colour); @@ -852,7 +867,7 @@ ui_destroy_colourmap(HCOLOURMAP map) { if (owncolmap) - XFreeColormap(display, (Colormap)map); + XFreeColormap(display, (Colormap) map); else xfree(map); } @@ -861,7 +876,7 @@ ui_set_colourmap(HCOLOURMAP map) { if (owncolmap) - XSetWindowColormap(display, wnd, (Colormap)map); + XSetWindowColormap(display, wnd, (Colormap) map); else colmap = map; } @@ -908,9 +923,10 @@ void ui_patblt(uint8 opcode, /* dest */ int x, int y, int cx, int cy, - /* brush */ BRUSH *brush, int bgcolour, int fgcolour) + /* brush */ BRUSH * brush, int bgcolour, int fgcolour) { Pixmap fill; + uint8 i, ipattern[8]; SET_FUNCTION(opcode); @@ -922,7 +938,9 @@ break; case 3: /* Pattern */ - fill = (Pixmap)ui_create_glyph(8, 8, brush->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); @@ -933,7 +951,8 @@ FILL_RECTANGLE(x, y, cx, cy); XSetFillStyle(display, gc, FillSolid); - ui_destroy_glyph((HGLYPH)fill); + XSetTSOrigin(display, gc, 0, 0); + ui_destroy_glyph((HGLYPH) fill); break; default: @@ -951,8 +970,7 @@ 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); + XCopyArea(display, backstore, backstore, gc, srcx, srcy, cx, cy, x, y); RESET_FUNCTION(opcode); } @@ -962,10 +980,9 @@ /* src */ HBITMAP src, int srcx, int srcy) { 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); if (ownbackstore) - XCopyArea(display, (Pixmap)src, backstore, gc, srcx, srcy, - cx, cy, x, y); + XCopyArea(display, (Pixmap) src, backstore, gc, srcx, srcy, cx, cy, x, y); RESET_FUNCTION(opcode); } @@ -973,7 +990,7 @@ ui_triblt(uint8 opcode, /* dest */ int x, int y, int cx, int cy, /* src */ HBITMAP src, int srcx, int srcy, - /* brush */ BRUSH *brush, int bgcolour, int fgcolour) + /* brush */ BRUSH * brush, int bgcolour, int fgcolour) { /* This is potentially difficult to do in general. Until someone comes up with a more efficient way of doing it I am using cases. */ @@ -982,22 +999,18 @@ { case 0x69: /* PDSxxn */ ui_memblt(ROP2_XOR, x, y, cx, cy, src, srcx, srcy); - ui_patblt(ROP2_NXOR, x, y, cx, cy, - brush, bgcolour, fgcolour); + ui_patblt(ROP2_NXOR, x, y, cx, cy, brush, bgcolour, fgcolour); break; case 0xb8: /* PSDPxax */ - ui_patblt(ROP2_XOR, x, y, cx, cy, - brush, bgcolour, fgcolour); + ui_patblt(ROP2_XOR, x, y, cx, cy, brush, bgcolour, fgcolour); ui_memblt(ROP2_AND, x, y, cx, cy, src, srcx, srcy); - ui_patblt(ROP2_XOR, x, y, cx, cy, - brush, bgcolour, fgcolour); + ui_patblt(ROP2_XOR, x, y, cx, cy, brush, bgcolour, fgcolour); break; case 0xc0: /* PSa */ ui_memblt(ROP2_COPY, x, y, cx, cy, src, srcx, srcy); - ui_patblt(ROP2_AND, x, y, cx, cy, brush, bgcolour, - fgcolour); + ui_patblt(ROP2_AND, x, y, cx, cy, brush, bgcolour, fgcolour); break; default: @@ -1009,7 +1022,7 @@ void ui_line(uint8 opcode, /* dest */ int startx, int starty, int endx, int endy, - /* pen */ PEN *pen) + /* pen */ PEN * pen) { SET_FUNCTION(opcode); SET_FOREGROUND(pen->colour); @@ -1031,15 +1044,15 @@ void ui_draw_glyph(int mixmode, /* dest */ int x, int y, int cx, int cy, - /* src */ HGLYPH glyph, int srcx, int srcy, int bgcolour, - int fgcolour) + /* src */ HGLYPH glyph, int srcx, int srcy, + int bgcolour, int fgcolour) { SET_FOREGROUND(fgcolour); SET_BACKGROUND(bgcolour); - XSetFillStyle(display, gc, (mixmode == MIX_TRANSPARENT) - ? FillStippled : FillOpaqueStippled); - XSetStipple(display, gc, (Pixmap)glyph); + XSetFillStyle(display, gc, + (mixmode == MIX_TRANSPARENT) ? FillStippled : FillOpaqueStippled); + XSetStipple(display, gc, (Pixmap) glyph); XSetTSOrigin(display, gc, x, y); FILL_RECTANGLE(x, y, cx, cy); @@ -1056,9 +1069,10 @@ if ((xyoffset & 0x80))\ {\ if (flags & TEXT2_VERTICAL) \ - y += ttext[++idx] | (ttext[++idx] << 8);\ + y += ttext[idx+1] | (ttext[idx+2] << 8);\ else\ - x += ttext[++idx] | (ttext[++idx] << 8);\ + x += ttext[idx+1] | (ttext[idx+2] << 8);\ + idx += 2;\ }\ else\ {\ @@ -1081,8 +1095,8 @@ 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 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; @@ -1101,48 +1115,53 @@ } /* Paint text, character by character */ - for (i = 0; i < length;) { - switch (text[i]) { - case 0xff: - if (i + 2 < length) - cache_put_text(text[i + 1], text, text[i + 2]); - else { - error("this shouldn't be happening\n"); + for (i = 0; i < length;) + { + switch (text[i]) + { + case 0xff: + if (i + 2 < length) + cache_put_text(text[i + 1], text, text[i + 2]); + else + { + error("this shouldn't be happening\n"); + break; + } + /* this will move pointer from start to first character after FF command */ + length -= i + 3; + text = &(text[i + 3]); + i = 0; break; - } - /* this will move pointer from start to first character after FF command */ - length -= i + 3; - text = &(text[i + 3]); - i = 0; - break; - case 0xfe: - entry = cache_get_text(text[i + 1]); - if (entry != NULL) { - if ((((uint8 *) (entry->data))[1] == 0) - && (!(flags & TEXT2_IMPLICIT_X))) { - if (flags & TEXT2_VERTICAL) - y += text[i + 2]; + case 0xfe: + entry = cache_get_text(text[i + 1]); + if (entry != NULL) + { + if ((((uint8 *) (entry->data))[1] == + 0) && (!(flags & TEXT2_IMPLICIT_X))) + { + if (flags & TEXT2_VERTICAL) + y += text[i + 2]; + else + x += text[i + 2]; + } + if (i + 2 < length) + i += 3; else - x += text[i + 2]; + i += 2; + length -= i; + /* this will move pointer from start to first character after FE command */ + text = &(text[i]); + i = 0; + for (j = 0; j < entry->size; j++) + DO_GLYPH(((uint8 *) (entry->data)), j); } - if (i + 2 < length) - i += 3; - else - i += 2; - length -= i; - /* this will move pointer from start to first character after FE command */ - text = &(text[i]); - i = 0; - for (j = 0; j < entry->size; j++) - DO_GLYPH(((uint8 *) (entry->data)), j); - } - break; + break; - default: - DO_GLYPH(text, i); - i++; - break; + default: + DO_GLYPH(text, i); + i++; + break; } } @@ -1157,21 +1176,18 @@ if (ownbackstore) { - image = XGetImage(display, backstore, x, y, cx, cy, AllPlanes, - ZPixmap); + 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); + 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, (uint8 *)image->data); + offset *= bpp / 8; + cache_put_desktop(offset, cx, cy, image->bytes_per_line, bpp / 8, (uint8 *) image->data); XDestroyImage(image); } @@ -1182,14 +1198,13 @@ XImage *image; uint8 *data; - offset *= bpp/8; - data = cache_get_desktop(offset, cx, cy, bpp/8); + offset *= bpp / 8; + data = cache_get_desktop(offset, cx, cy, bpp / 8); if (data == NULL) return; - image = XCreateImage(display, visual, depth, ZPixmap, - 0, data, cx, cy, BitmapPad(display), - cx * bpp/8); + image = XCreateImage(display, visual, depth, ZPixmap, 0, + (char *) data, cx, cy, BitmapPad(display), cx * bpp / 8); if (ownbackstore) {