CVS: rdesktop rdesktop.c,1.101,1.102 xkeymap.c,1.61,1.62 xwin.c,1.159,1.160

Update of /cvsroot/rdesktop/rdesktop
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31784

Modified Files:
	rdesktop.c xkeymap.c xwin.c 
Log Message:
rdp2vnc fixes from Johannes Schindelin <[email protected]>


Index: rdesktop.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdesktop.c,v
retrieving revision 1.101
retrieving revision 1.102
diff -C2 -d -r1.101 -r1.102
*** rdesktop.c	2 Apr 2004 15:34:38 -0000	1.101
--- rdesktop.c	10 Apr 2004 09:34:52 -0000	1.102
***************
*** 69,75 ****
  BOOL g_console_session = False;
  BOOL g_numlock_sync = False;
! extern BOOL g_owncolmap;
! extern BOOL g_ownbackstore;
! extern uint32 g_embed_wnd;
  uint32 g_rdp5_performanceflags = RDP5_NO_WALLPAPER | RDP5_NO_FULLWINDOWDRAG | RDP5_NO_MENUANIMATIONS;
  
--- 69,75 ----
  BOOL g_console_session = False;
  BOOL g_numlock_sync = False;
! BOOL g_owncolmap = False;
! BOOL g_ownbackstore  = True;	/* We can't rely on external BackingStore */
! uint32 g_embed_wnd;
  uint32 g_rdp5_performanceflags = RDP5_NO_WALLPAPER | RDP5_NO_FULLWINDOWDRAG | RDP5_NO_MENUANIMATIONS;
  

Index: xkeymap.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/xkeymap.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** xkeymap.c	8 Dec 2003 15:28:24 -0000	1.61
--- xkeymap.c	10 Apr 2004 09:34:52 -0000	1.62
***************
*** 603,606 ****
--- 603,609 ----
  read_keyboard_state()
  {
+ #ifdef RDP2VNC
+ 	return 0;
+ #else
  	unsigned int state;
  	Window wdummy;
***************
*** 609,612 ****
--- 612,616 ----
  	XQueryPointer(g_display, g_wnd, &wdummy, &wdummy, &dummy, &dummy, &dummy, &dummy, &state);
  	return state;
+ #endif
  }
  

Index: xwin.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/xwin.c,v
retrieving revision 1.159
retrieving revision 1.160
diff -C2 -d -r1.159 -r1.160
*** xwin.c	29 Mar 2004 13:59:03 -0000	1.159
--- xwin.c	10 Apr 2004 09:34:52 -0000	1.160
***************
*** 44,48 ****
  static Screen *g_screen;
  Window g_wnd;
! uint32 g_embed_wnd;
  BOOL g_enable_compose = False;
  static GC g_gc = NULL;
--- 44,48 ----
  static Screen *g_screen;
  Window g_wnd;
! extern uint32 g_embed_wnd;
  BOOL g_enable_compose = False;
  static GC g_gc = NULL;
***************
*** 67,71 ****
  
  /* software backing store */
! BOOL g_ownbackstore = True;	/* We can't rely on external BackingStore */
  static Pixmap g_backstore = 0;
  
--- 67,71 ----
  
  /* software backing store */
! extern BOOL g_ownbackstore;
  static Pixmap g_backstore = 0;
  
***************
*** 116,120 ****
  
  /* colour maps */
! BOOL g_owncolmap = False;
  static Colormap g_xcolmap;
  static uint32 *g_colmap = NULL;
--- 116,120 ----
  
  /* colour maps */
! extern BOOL g_owncolmap;
  static Colormap g_xcolmap;
  static uint32 *g_colmap = NULL;



-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click