/[rdesktop]/sourceforge.net/trunk/rdesktop/xwin.c
This is repository of my old source code which isn't updated any more. Go to git.rot13.org for current projects!
ViewVC logotype

Diff of /sourceforge.net/trunk/rdesktop/xwin.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1346 by ossman_, Thu Dec 7 15:23:45 2006 UTC revision 1403 by stargo, Thu Apr 12 16:04:25 2007 UTC
# Line 1  Line 1 
1  /* -*- c-basic-offset: 8 -*-  /* -*- c-basic-offset: 8 -*-
2     rdesktop: A Remote Desktop Protocol client.     rdesktop: A Remote Desktop Protocol client.
3     User interface services - X Window System     User interface services - X Window System
4     Copyright (C) Matthew Chapman 1999-2005     Copyright (C) Matthew Chapman 1999-2007
5    
6     This program is free software; you can redistribute it and/or modify     This program is free software; you can redistribute it and/or modify
7     it under the terms of the GNU General Public License as published by     it under the terms of the GNU General Public License as published by
# Line 20  Line 20 
20    
21  #include <X11/Xlib.h>  #include <X11/Xlib.h>
22  #include <X11/Xutil.h>  #include <X11/Xutil.h>
23    #include <X11/Xproto.h>
24  #include <unistd.h>  #include <unistd.h>
25  #include <sys/time.h>  #include <sys/time.h>
26  #include <time.h>  #include <time.h>
# Line 28  Line 29 
29  #include "rdesktop.h"  #include "rdesktop.h"
30  #include "xproto.h"  #include "xproto.h"
31    
 /* We can't include Xproto.h because of conflicting defines for BOOL */  
 #define X_ConfigureWindow              12  
   
32  extern int g_width;  extern int g_width;
33  extern int g_height;  extern int g_height;
34  extern int g_xpos;  extern int g_xpos;
35  extern int g_ypos;  extern int g_ypos;
36  extern int g_pos;  extern int g_pos;
37  extern BOOL g_sendmotion;  extern RD_BOOL g_sendmotion;
38  extern BOOL g_fullscreen;  extern RD_BOOL g_fullscreen;
39  extern BOOL g_grab_keyboard;  extern RD_BOOL g_grab_keyboard;
40  extern BOOL g_hide_decorations;  extern RD_BOOL g_hide_decorations;
41  extern char g_title[];  extern char g_title[];
42  /* Color depth of the RDP session.  /* Color depth of the RDP session.
43     As of RDP 5.1, it may be 8, 15, 16 or 24. */     As of RDP 5.1, it may be 8, 15, 16 or 24. */
# Line 71  typedef struct _seamless_window Line 69  typedef struct _seamless_window
69          unsigned int desktop;          unsigned int desktop;
70          struct timeval *position_timer;          struct timeval *position_timer;
71    
72          BOOL outstanding_position;          RD_BOOL outstanding_position;
73          unsigned int outpos_serial;          unsigned int outpos_serial;
74          int outpos_xoffset, outpos_yoffset;          int outpos_xoffset, outpos_yoffset;
75          int outpos_width, outpos_height;          int outpos_width, outpos_height;
# Line 80  typedef struct _seamless_window Line 78  typedef struct _seamless_window
78  } seamless_window;  } seamless_window;
79  static seamless_window *g_seamless_windows = NULL;  static seamless_window *g_seamless_windows = NULL;
80  static unsigned long g_seamless_focused = 0;  static unsigned long g_seamless_focused = 0;
81  static BOOL g_seamless_started = False; /* Server end is up and running */  static RD_BOOL g_seamless_started = False;      /* Server end is up and running */
82  static BOOL g_seamless_active = False;  /* We are currently in seamless mode */  static RD_BOOL g_seamless_active = False;       /* We are currently in seamless mode */
83  static BOOL g_seamless_hidden = False;  /* Desktop is hidden on server */  static RD_BOOL g_seamless_hidden = False;       /* Desktop is hidden on server */
84  extern BOOL g_seamless_rdp;  extern RD_BOOL g_seamless_rdp;
85    
86  extern uint32 g_embed_wnd;  extern uint32 g_embed_wnd;
87  BOOL g_enable_compose = False;  RD_BOOL g_enable_compose = False;
88  BOOL g_Unobscured;              /* used for screenblt */  RD_BOOL g_Unobscured;           /* used for screenblt */
89  static GC g_gc = NULL;  static GC g_gc = NULL;
90  static GC g_create_bitmap_gc = NULL;  static GC g_create_bitmap_gc = NULL;
91  static GC g_create_glyph_gc = NULL;  static GC g_create_glyph_gc = NULL;
# Line 105  static XIM g_IM; Line 103  static XIM g_IM;
103  static XIC g_IC;  static XIC g_IC;
104  static XModifierKeymap *g_mod_map;  static XModifierKeymap *g_mod_map;
105  static Cursor g_current_cursor;  static Cursor g_current_cursor;
106  static HCURSOR g_null_cursor = NULL;  static RD_HCURSOR g_null_cursor = NULL;
107  static Atom g_protocol_atom, g_kill_atom;  static Atom g_protocol_atom, g_kill_atom;
108  extern Atom g_net_wm_state_atom;  extern Atom g_net_wm_state_atom;
109  extern Atom g_net_wm_desktop_atom;  extern Atom g_net_wm_desktop_atom;
110  static BOOL g_focused;  static RD_BOOL g_focused;
111  static BOOL g_mouse_in_wnd;  static RD_BOOL g_mouse_in_wnd;
112  /* Indicates that:  /* Indicates that:
113     1) visual has 15, 16 or 24 depth and the same color channel masks     1) visual has 15, 16 or 24 depth and the same color channel masks
114        as its RDP equivalent (implies X server is LE),        as its RDP equivalent (implies X server is LE),
115     2) host is LE     2) host is LE
116     This will trigger an optimization whose real value is questionable.     This will trigger an optimization whose real value is questionable.
117  */  */
118  static BOOL g_compatible_arch;  static RD_BOOL g_compatible_arch;
119  /* Indicates whether RDP's bitmaps and our XImages have the same  /* Indicates whether RDP's bitmaps and our XImages have the same
120     binary format. If so, we can avoid an expensive translation.     binary format. If so, we can avoid an expensive translation.
121     Note that this can be true when g_compatible_arch is false,     Note that this can be true when g_compatible_arch is false,
# Line 128  static BOOL g_compatible_arch; Line 126  static BOOL g_compatible_arch;
126     ('host' is the machine running rdesktop; the host simply memcpy's     ('host' is the machine running rdesktop; the host simply memcpy's
127      so its endianess doesn't matter)      so its endianess doesn't matter)
128   */   */
129  static BOOL g_no_translate_image = False;  static RD_BOOL g_no_translate_image = False;
130    
131  /* endianness */  /* endianness */
132  static BOOL g_host_be;  static RD_BOOL g_host_be;
133  static BOOL g_xserver_be;  static RD_BOOL g_xserver_be;
134  static int g_red_shift_r, g_blue_shift_r, g_green_shift_r;  static int g_red_shift_r, g_blue_shift_r, g_green_shift_r;
135  static int g_red_shift_l, g_blue_shift_l, g_green_shift_l;  static int g_red_shift_l, g_blue_shift_l, g_green_shift_l;
136    
137  /* software backing store */  /* software backing store */
138  extern BOOL g_ownbackstore;  extern RD_BOOL g_ownbackstore;
139  static Pixmap g_backstore = 0;  static Pixmap g_backstore = 0;
140    
141  /* Moving in single app mode */  /* Moving in single app mode */
142  static BOOL g_moving_wnd;  static RD_BOOL g_moving_wnd;
143  static int g_move_x_offset = 0;  static int g_move_x_offset = 0;
144  static int g_move_y_offset = 0;  static int g_move_y_offset = 0;
145  static BOOL g_using_full_workarea = False;  static RD_BOOL g_using_full_workarea = False;
146    
147  #ifdef WITH_RDPSND  #ifdef WITH_RDPSND
148  extern BOOL g_rdpsnd;  extern RD_BOOL g_rdpsnd;
149  #endif  #endif
150    
151  /* MWM decorations */  /* MWM decorations */
# Line 248  seamless_XDrawLines(Drawable d, XPoint * Line 246  seamless_XDrawLines(Drawable d, XPoint *
246  }  }
247    
248  /* colour maps */  /* colour maps */
249  extern BOOL g_owncolmap;  extern RD_BOOL g_owncolmap;
250  static Colormap g_xcolmap;  static Colormap g_xcolmap;
251  static uint32 *g_colmap = NULL;  static uint32 *g_colmap = NULL;
252    
# Line 472  sw_handle_restack(seamless_window * sw) Line 470  sw_handle_restack(seamless_window * sw)
470    
471    
472  static seamless_group *  static seamless_group *
473  sw_find_group(unsigned long id, BOOL dont_create)  sw_find_group(unsigned long id, RD_BOOL dont_create)
474  {  {
475          seamless_window *sw;          seamless_window *sw;
476          seamless_group *sg;          seamless_group *sg;
# Line 1262  translate_image(int width, int height, u Line 1260  translate_image(int width, int height, u
1260          return out;          return out;
1261  }  }
1262    
1263  BOOL  RD_BOOL
1264  get_key_state(unsigned int state, uint32 keysym)  get_key_state(unsigned int state, uint32 keysym)
1265  {  {
1266          int modifierpos, key, keysymMask = 0;          int modifierpos, key, keysymMask = 0;
# Line 1310  calculate_mask_weight(uint32 mask) Line 1308  calculate_mask_weight(uint32 mask)
1308          return weight;          return weight;
1309  }  }
1310    
1311  static BOOL  static RD_BOOL
1312  select_visual(int screen_num)  select_visual(int screen_num)
1313  {  {
1314          XPixmapFormatValues *pfm;          XPixmapFormatValues *pfm;
# Line 1349  select_visual(int screen_num) Line 1347  select_visual(int screen_num)
1347                  for (i = 0; i < visuals_count; ++i)                  for (i = 0; i < visuals_count; ++i)
1348                  {                  {
1349                          XVisualInfo *visual_info = &vmatches[i];                          XVisualInfo *visual_info = &vmatches[i];
1350                          BOOL can_translate_to_bpp = False;                          RD_BOOL can_translate_to_bpp = False;
1351                          int j;                          int j;
1352    
1353                          /* Try to find a no-translation visual that'll                          /* Try to find a no-translation visual that'll
# Line 1521  error_handler(Display * dpy, XErrorEvent Line 1519  error_handler(Display * dpy, XErrorEvent
1519          return g_old_error_handler(dpy, eev);          return g_old_error_handler(dpy, eev);
1520  }  }
1521    
1522  BOOL  RD_BOOL
1523  ui_init(void)  ui_init(void)
1524  {  {
1525          int screen_num;          int screen_num;
# Line 1535  ui_init(void) Line 1533  ui_init(void)
1533    
1534          {          {
1535                  uint16 endianess_test = 1;                  uint16 endianess_test = 1;
1536                  g_host_be = !(BOOL) (*(uint8 *) (&endianess_test));                  g_host_be = !(RD_BOOL) (*(uint8 *) (&endianess_test));
1537          }          }
1538    
1539          g_old_error_handler = XSetErrorHandler(error_handler);          g_old_error_handler = XSetErrorHandler(error_handler);
# Line 1687  get_input_mask(long *input_mask) Line 1685  get_input_mask(long *input_mask)
1685                  *input_mask |= LeaveWindowMask;                  *input_mask |= LeaveWindowMask;
1686  }  }
1687    
1688  BOOL  RD_BOOL
1689  ui_create_window(void)  ui_create_window(void)
1690  {  {
1691          uint8 null_pointer_mask[1] = { 0x80 };          uint8 null_pointer_mask[1] = { 0x80 };
# Line 1735  ui_create_window(void) Line 1733  ui_create_window(void)
1733          }          }
1734    
1735          XStoreName(g_display, g_wnd, g_title);          XStoreName(g_display, g_wnd, g_title);
1736            ewmh_set_wm_name(g_wnd, g_title);
1737    
1738          if (g_hide_decorations)          if (g_hide_decorations)
1739                  mwm_hide_decorations(g_wnd);                  mwm_hide_decorations(g_wnd);
# Line 1874  xwin_toggle_fullscreen(void) Line 1873  xwin_toggle_fullscreen(void)
1873  }  }
1874    
1875  static void  static void
1876  handle_button_event(XEvent xevent, BOOL down)  handle_button_event(XEvent xevent, RD_BOOL down)
1877  {  {
1878          uint16 button, flags = 0;          uint16 button, flags = 0;
1879          g_last_gesturetime = xevent.xbutton.time;          g_last_gesturetime = xevent.xbutton.time;
# Line 2248  ui_select(int rdp_socket) Line 2247  ui_select(int rdp_socket)
2247          int n;          int n;
2248          fd_set rfds, wfds;          fd_set rfds, wfds;
2249          struct timeval tv;          struct timeval tv;
2250          BOOL s_timeout = False;          RD_BOOL s_timeout = False;
2251    
2252          while (True)          while (True)
2253          {          {
# Line 2292  ui_select(int rdp_socket) Line 2291  ui_select(int rdp_socket)
2291    
2292                                  /* Abort serial read calls */                                  /* Abort serial read calls */
2293                                  if (s_timeout)                                  if (s_timeout)
2294                                          rdpdr_check_fds(&rfds, &wfds, (BOOL) True);                                          rdpdr_check_fds(&rfds, &wfds, (RD_BOOL) True);
2295                                  continue;                                  continue;
2296                  }                  }
2297    
# Line 2300  ui_select(int rdp_socket) Line 2299  ui_select(int rdp_socket)
2299                  rdpsnd_check_fds(&rfds, &wfds);                  rdpsnd_check_fds(&rfds, &wfds);
2300  #endif  #endif
2301    
2302                  rdpdr_check_fds(&rfds, &wfds, (BOOL) False);                  rdpdr_check_fds(&rfds, &wfds, (RD_BOOL) False);
2303    
2304                  if (FD_ISSET(rdp_socket, &rfds))                  if (FD_ISSET(rdp_socket, &rfds))
2305                          return 1;                          return 1;
# Line 2314  ui_move_pointer(int x, int y) Line 2313  ui_move_pointer(int x, int y)
2313          XWarpPointer(g_display, g_wnd, g_wnd, 0, 0, 0, 0, x, y);          XWarpPointer(g_display, g_wnd, g_wnd, 0, 0, 0, 0, x, y);
2314  }  }
2315    
2316  HBITMAP  RD_HBITMAP
2317  ui_create_bitmap(int width, int height, uint8 * data)  ui_create_bitmap(int width, int height, uint8 * data)
2318  {  {
2319          XImage *image;          XImage *image;
# Line 2344  ui_create_bitmap(int width, int height, Line 2343  ui_create_bitmap(int width, int height,
2343          XFree(image);          XFree(image);
2344          if (tdata != data)          if (tdata != data)
2345                  xfree(tdata);                  xfree(tdata);
2346          return (HBITMAP) bitmap;          return (RD_HBITMAP) bitmap;
2347  }  }
2348    
2349  void  void
# Line 2392  ui_paint_bitmap(int x, int y, int cx, in Line 2391  ui_paint_bitmap(int x, int y, int cx, in
2391  }  }
2392    
2393  void  void
2394  ui_destroy_bitmap(HBITMAP bmp)  ui_destroy_bitmap(RD_HBITMAP bmp)
2395  {  {
2396          XFreePixmap(g_display, (Pixmap) bmp);          XFreePixmap(g_display, (Pixmap) bmp);
2397  }  }
2398    
2399  HGLYPH  RD_HGLYPH
2400  ui_create_glyph(int width, int height, uint8 * data)  ui_create_glyph(int width, int height, uint8 * data)
2401  {  {
2402          XImage *image;          XImage *image;
# Line 2419  ui_create_glyph(int width, int height, u Line 2418  ui_create_glyph(int width, int height, u
2418          XPutImage(g_display, bitmap, g_create_glyph_gc, image, 0, 0, 0, 0, width, height);          XPutImage(g_display, bitmap, g_create_glyph_gc, image, 0, 0, 0, 0, width, height);
2419    
2420          XFree(image);          XFree(image);
2421          return (HGLYPH) bitmap;          return (RD_HGLYPH) bitmap;
2422  }  }
2423    
2424  void  void
2425  ui_destroy_glyph(HGLYPH glyph)  ui_destroy_glyph(RD_HGLYPH glyph)
2426  {  {
2427          XFreePixmap(g_display, (Pixmap) glyph);          XFreePixmap(g_display, (Pixmap) glyph);
2428  }  }
2429    
2430  HCURSOR  RD_HCURSOR
2431  ui_create_cursor(unsigned int x, unsigned int y, int width, int height,  ui_create_cursor(unsigned int x, unsigned int y, int width, int height,
2432                   uint8 * andmask, uint8 * xormask)                   uint8 * andmask, uint8 * xormask)
2433  {  {
2434          HGLYPH maskglyph, cursorglyph;          RD_HGLYPH maskglyph, cursorglyph;
2435          XColor bg, fg;          XColor bg, fg;
2436          Cursor xcursor;          Cursor xcursor;
2437          uint8 *cursor, *pcursor;          uint8 *cursor, *pcursor;
# Line 2496  ui_create_cursor(unsigned int x, unsigne Line 2495  ui_create_cursor(unsigned int x, unsigne
2495          ui_destroy_glyph(cursorglyph);          ui_destroy_glyph(cursorglyph);
2496          xfree(mask);          xfree(mask);
2497          xfree(cursor);          xfree(cursor);
2498          return (HCURSOR) xcursor;          return (RD_HCURSOR) xcursor;
2499  }  }
2500    
2501  void  void
2502  ui_set_cursor(HCURSOR cursor)  ui_set_cursor(RD_HCURSOR cursor)
2503  {  {
2504          g_current_cursor = (Cursor) cursor;          g_current_cursor = (Cursor) cursor;
2505          XDefineCursor(g_display, g_wnd, g_current_cursor);          XDefineCursor(g_display, g_wnd, g_current_cursor);
# Line 2508  ui_set_cursor(HCURSOR cursor) Line 2507  ui_set_cursor(HCURSOR cursor)
2507  }  }
2508    
2509  void  void
2510  ui_destroy_cursor(HCURSOR cursor)  ui_destroy_cursor(RD_HCURSOR cursor)
2511  {  {
2512          XFreeCursor(g_display, (Cursor) cursor);          XFreeCursor(g_display, (Cursor) cursor);
2513  }  }
# Line 2526  ui_set_null_cursor(void) Line 2525  ui_set_null_cursor(void)
2525                  (xc)->flags = DoRed | DoGreen | DoBlue;                  (xc)->flags = DoRed | DoGreen | DoBlue;
2526    
2527    
2528  HCOLOURMAP  RD_HCOLOURMAP
2529  ui_create_colourmap(COLOURMAP * colours)  ui_create_colourmap(COLOURMAP * colours)
2530  {  {
2531          COLOURENTRY *entry;          COLOURENTRY *entry;
# Line 2622  ui_create_colourmap(COLOURMAP * colours) Line 2621  ui_create_colourmap(COLOURMAP * colours)
2621                  XStoreColors(g_display, map, xcolours, ncolours);                  XStoreColors(g_display, map, xcolours, ncolours);
2622    
2623                  xfree(xcolours);                  xfree(xcolours);
2624                  return (HCOLOURMAP) map;                  return (RD_HCOLOURMAP) map;
2625          }          }
2626  }  }
2627    
2628  void  void
2629  ui_destroy_colourmap(HCOLOURMAP map)  ui_destroy_colourmap(RD_HCOLOURMAP map)
2630  {  {
2631          if (!g_owncolmap)          if (!g_owncolmap)
2632                  xfree(map);                  xfree(map);
# Line 2636  ui_destroy_colourmap(HCOLOURMAP map) Line 2635  ui_destroy_colourmap(HCOLOURMAP map)
2635  }  }
2636    
2637  void  void
2638  ui_set_colourmap(HCOLOURMAP map)  ui_set_colourmap(RD_HCOLOURMAP map)
2639  {  {
2640          if (!g_owncolmap)          if (!g_owncolmap)
2641          {          {
# Line 2724  ui_patblt(uint8 opcode, Line 2723  ui_patblt(uint8 opcode,
2723                          FILL_RECTANGLE_BACKSTORE(x, y, cx, cy);                          FILL_RECTANGLE_BACKSTORE(x, y, cx, cy);
2724                          XSetFillStyle(g_display, g_gc, FillSolid);                          XSetFillStyle(g_display, g_gc, FillSolid);
2725                          XSetTSOrigin(g_display, g_gc, 0, 0);                          XSetTSOrigin(g_display, g_gc, 0, 0);
2726                          ui_destroy_glyph((HGLYPH) fill);                          ui_destroy_glyph((RD_HGLYPH) fill);
2727                          break;                          break;
2728    
2729                  case 3: /* Pattern */                  case 3: /* Pattern */
# Line 2739  ui_patblt(uint8 opcode, Line 2738  ui_patblt(uint8 opcode,
2738                          FILL_RECTANGLE_BACKSTORE(x, y, cx, cy);                          FILL_RECTANGLE_BACKSTORE(x, y, cx, cy);
2739                          XSetFillStyle(g_display, g_gc, FillSolid);                          XSetFillStyle(g_display, g_gc, FillSolid);
2740                          XSetTSOrigin(g_display, g_gc, 0, 0);                          XSetTSOrigin(g_display, g_gc, 0, 0);
2741                          ui_destroy_glyph((HGLYPH) fill);                          ui_destroy_glyph((RD_HGLYPH) fill);
2742                          break;                          break;
2743    
2744                  default:                  default:
# Line 2782  ui_screenblt(uint8 opcode, Line 2781  ui_screenblt(uint8 opcode,
2781  void  void
2782  ui_memblt(uint8 opcode,  ui_memblt(uint8 opcode,
2783            /* dest */ int x, int y, int cx, int cy,            /* dest */ int x, int y, int cx, int cy,
2784            /* src */ HBITMAP src, int srcx, int srcy)            /* src */ RD_HBITMAP src, int srcx, int srcy)
2785  {  {
2786          SET_FUNCTION(opcode);          SET_FUNCTION(opcode);
2787          XCopyArea(g_display, (Pixmap) src, g_wnd, g_gc, srcx, srcy, cx, cy, x, y);          XCopyArea(g_display, (Pixmap) src, g_wnd, g_gc, srcx, srcy, cx, cy, x, y);
# Line 2797  ui_memblt(uint8 opcode, Line 2796  ui_memblt(uint8 opcode,
2796  void  void
2797  ui_triblt(uint8 opcode,  ui_triblt(uint8 opcode,
2798            /* dest */ int x, int y, int cx, int cy,            /* dest */ int x, int y, int cx, int cy,
2799            /* src */ HBITMAP src, int srcx, int srcy,            /* src */ RD_HBITMAP src, int srcx, int srcy,
2800            /* brush */ BRUSH * brush, int bgcolour, int fgcolour)            /* brush */ BRUSH * brush, int bgcolour, int fgcolour)
2801  {  {
2802          /* This is potentially difficult to do in general. Until someone          /* This is potentially difficult to do in general. Until someone
# Line 2855  ui_rect( Line 2854  ui_rect(
2854  void  void
2855  ui_polygon(uint8 opcode,  ui_polygon(uint8 opcode,
2856             /* mode */ uint8 fillmode,             /* mode */ uint8 fillmode,
2857             /* dest */ POINT * point, int npoints,             /* dest */ RD_POINT * point, int npoints,
2858             /* brush */ BRUSH * brush, int bgcolour, int fgcolour)             /* brush */ BRUSH * brush, int bgcolour, int fgcolour)
2859  {  {
2860          uint8 style, i, ipattern[8];          uint8 style, i, ipattern[8];
# Line 2898  ui_polygon(uint8 opcode, Line 2897  ui_polygon(uint8 opcode,
2897                          FILL_POLYGON((XPoint *) point, npoints);                          FILL_POLYGON((XPoint *) point, npoints);
2898                          XSetFillStyle(g_display, g_gc, FillSolid);                          XSetFillStyle(g_display, g_gc, FillSolid);
2899                          XSetTSOrigin(g_display, g_gc, 0, 0);                          XSetTSOrigin(g_display, g_gc, 0, 0);
2900                          ui_destroy_glyph((HGLYPH) fill);                          ui_destroy_glyph((RD_HGLYPH) fill);
2901                          break;                          break;
2902    
2903                  case 3: /* Pattern */                  case 3: /* Pattern */
# Line 2913  ui_polygon(uint8 opcode, Line 2912  ui_polygon(uint8 opcode,
2912                          FILL_POLYGON((XPoint *) point, npoints);                          FILL_POLYGON((XPoint *) point, npoints);
2913                          XSetFillStyle(g_display, g_gc, FillSolid);                          XSetFillStyle(g_display, g_gc, FillSolid);
2914                          XSetTSOrigin(g_display, g_gc, 0, 0);                          XSetTSOrigin(g_display, g_gc, 0, 0);
2915                          ui_destroy_glyph((HGLYPH) fill);                          ui_destroy_glyph((RD_HGLYPH) fill);
2916                          break;                          break;
2917    
2918                  default:                  default:
# Line 2925  ui_polygon(uint8 opcode, Line 2924  ui_polygon(uint8 opcode,
2924    
2925  void  void
2926  ui_polyline(uint8 opcode,  ui_polyline(uint8 opcode,
2927              /* dest */ POINT * points, int npoints,              /* dest */ RD_POINT * points, int npoints,
2928              /* pen */ PEN * pen)              /* pen */ PEN * pen)
2929  {  {
2930          /* TODO: set join style */          /* TODO: set join style */
# Line 2976  ui_ellipse(uint8 opcode, Line 2975  ui_ellipse(uint8 opcode,
2975                          DRAW_ELLIPSE(x, y, cx, cy, fillmode);                          DRAW_ELLIPSE(x, y, cx, cy, fillmode);
2976                          XSetFillStyle(g_display, g_gc, FillSolid);                          XSetFillStyle(g_display, g_gc, FillSolid);
2977                          XSetTSOrigin(g_display, g_gc, 0, 0);                          XSetTSOrigin(g_display, g_gc, 0, 0);
2978                          ui_destroy_glyph((HGLYPH) fill);                          ui_destroy_glyph((RD_HGLYPH) fill);
2979                          break;                          break;
2980    
2981                  case 3: /* Pattern */                  case 3: /* Pattern */
# Line 2991  ui_ellipse(uint8 opcode, Line 2990  ui_ellipse(uint8 opcode,
2990                          DRAW_ELLIPSE(x, y, cx, cy, fillmode);                          DRAW_ELLIPSE(x, y, cx, cy, fillmode);
2991                          XSetFillStyle(g_display, g_gc, FillSolid);                          XSetFillStyle(g_display, g_gc, FillSolid);
2992                          XSetTSOrigin(g_display, g_gc, 0, 0);                          XSetTSOrigin(g_display, g_gc, 0, 0);
2993                          ui_destroy_glyph((HGLYPH) fill);                          ui_destroy_glyph((RD_HGLYPH) fill);
2994                          break;                          break;
2995    
2996                  default:                  default:
# Line 3005  ui_ellipse(uint8 opcode, Line 3004  ui_ellipse(uint8 opcode,
3004  void  void
3005  ui_draw_glyph(int mixmode,  ui_draw_glyph(int mixmode,
3006                /* dest */ int x, int y, int cx, int cy,                /* dest */ int x, int y, int cx, int cy,
3007                /* src */ HGLYPH glyph, int srcx, int srcy,                /* src */ RD_HGLYPH glyph, int srcx, int srcy,
3008                int bgcolour, int fgcolour)                int bgcolour, int fgcolour)
3009  {  {
3010          SET_FOREGROUND(fgcolour);          SET_FOREGROUND(fgcolour);
# Line 3219  ui_desktop_restore(uint32 offset, int x, Line 3218  ui_desktop_restore(uint32 offset, int x,
3218                  return;                  return;
3219    
3220          image = XCreateImage(g_display, g_visual, g_depth, ZPixmap, 0,          image = XCreateImage(g_display, g_visual, g_depth, ZPixmap, 0,
3221                               (char *) data, cx, cy, BitmapPad(g_display), cx * g_bpp / 8);                               (char *) data, cx, cy, g_bpp, 0);
3222    
3223          if (g_ownbackstore)          if (g_ownbackstore)
3224          {          {
# Line 3253  ui_end_update(void) Line 3252  ui_end_update(void)
3252    
3253    
3254  void  void
3255  ui_seamless_begin(BOOL hidden)  ui_seamless_begin(RD_BOOL hidden)
3256  {  {
3257          if (!g_seamless_rdp)          if (!g_seamless_rdp)
3258                  return;                  return;
Legend:
Removed from v.1346  
changed lines
  Added in v.1403
  ViewVC Help
Powered by ViewVC 1.1.26