CVS: rdesktop/vnc vnc.c,1.2,1.3 x11stubs.h,1.2,1.3

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

Modified Files:
	vnc.c x11stubs.h 
Log Message:
rdp2vnc fixes from Johannes Schindelin <[email protected]>


Index: vnc.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/vnc/vnc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** vnc.c	21 Feb 2003 10:35:38 -0000	1.2
--- vnc.c	10 Apr 2004 09:34:52 -0000	1.3
***************
*** 60,65 ****
  #define TOBYTES(bits) ((bits)/BITSPERBYTES)
  
! extern int width;
! extern int height;
  extern int keylayout;
  extern BOOL sendmotion;
--- 60,65 ----
  #define TOBYTES(bits) ((bits)/BITSPERBYTES)
  
! extern int g_width;
! extern int g_height;
  extern int keylayout;
  extern BOOL sendmotion;
***************
*** 75,78 ****
--- 75,80 ----
  static vncBuffer *frameBuffer = NULL;
  static uint8_t reverseByte[0x100];
+ BOOL g_enable_compose = False;
+ int g_display=0;
  
  /* ignored */
***************
*** 150,154 ****
  
  void
! vncKey(Bool down, KeySym keysym, struct _rfbClientRec *cl)
  {
  	uint32 ev_time = time(NULL);
--- 152,156 ----
  
  void
! vncKey(rfbBool down, rfbKeySym keysym, struct _rfbClientRec *cl)
  {
  	uint32 ev_time = time(NULL);
***************
*** 273,277 ****
  
  
! extern char title[];
  BOOL
  ui_create_window()
--- 275,279 ----
  
  
! extern char g_title[];
  BOOL
  ui_create_window()
***************
*** 285,291 ****
  			(((i >> 1) & 1) << 6) | (((i >> 0) & 1) << 7);
  
! 	server = rfbGetScreen(0, NULL, width, height, 8, 1, 1);
! 	server->desktopName = title;
! 	server->frameBuffer = (char *) malloc(width * height);
  	server->ptrAddEvent = vncMouse;
  	server->kbdAddEvent = vncKey;
--- 287,293 ----
  			(((i >> 1) & 1) << 6) | (((i >> 0) & 1) << 7);
  
! 	server = rfbGetScreen(0, NULL, g_width, g_height, 8, 1, 1);
! 	server->desktopName = g_title;
! 	server->frameBuffer = (char *) malloc(g_width * g_height);
  	server->ptrAddEvent = vncMouse;
  	server->kbdAddEvent = vncKey;
***************
*** 306,317 ****
  
  	frameBuffer = (vncBuffer *) malloc(sizeof(vncBuffer));
! 	frameBuffer->w = width;
! 	frameBuffer->h = height;
! 	frameBuffer->linew = width;
  	frameBuffer->data = server->frameBuffer;
  	frameBuffer->owner = FALSE;
  	frameBuffer->format = &server->rfbServerFormat;
  
! 	ui_set_clip(0, 0, width, height);
  
  	rfbInitServer(server);
--- 308,319 ----
  
  	frameBuffer = (vncBuffer *) malloc(sizeof(vncBuffer));
! 	frameBuffer->w = g_width;
! 	frameBuffer->h = g_height;
! 	frameBuffer->linew = g_width;
  	frameBuffer->data = server->frameBuffer;
  	frameBuffer->owner = FALSE;
  	frameBuffer->format = &server->rfbServerFormat;
  
! 	ui_set_clip(0, 0, g_width, g_height);
  
  	rfbInitServer(server);
***************
*** 485,488 ****
--- 487,495 ----
  }
  
+ void ui_set_null_cursor(void)
+ {
+ 	rfbSetCursor(server, 0, FALSE);
+ }
+ 
  HGLYPH
  ui_create_glyph(int width, int height, uint8 * data)

Index: x11stubs.h
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/vnc/x11stubs.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** x11stubs.h	20 Feb 2003 12:17:04 -0000	1.2
--- x11stubs.h	10 Apr 2004 09:34:52 -0000	1.3
***************
*** 24,27 ****
--- 24,29 ----
  
  typedef int Display;
+ typedef int Window;
+ typedef rfbKeySym KeySym;
  
  KeySym XStringToKeysym(const char *str);



-------------------------------------------------------
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