CVS: rdesktop/uiports qtwin.cpp,1.13,1.14

Update of /cvsroot/rdesktop/rdesktop/uiports
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13804

Modified Files:
	qtwin.cpp 
Log Message:
RD_ prefix and copyright year update

Index: qtwin.cpp
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/uiports/qtwin.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** qtwin.cpp	23 Mar 2006 01:32:49 -0000	1.13
--- qtwin.cpp	10 Feb 2007 08:03:18 -0000	1.14
***************
*** 2,6 ****
     rdesktop: A Remote Desktop Protocol client.
     User interface services - QT Window System
!    Copyright (C) Jay Sorg 2004-2006
  
     This program is free software; you can redistribute it and/or modify
--- 2,6 ----
     rdesktop: A Remote Desktop Protocol client.
     User interface services - QT Window System
!    Copyright (C) Jay Sorg 2004-2007
  
     This program is free software; you can redistribute it and/or modify
***************
*** 45,49 ****
  /* rdesktop globals */
  extern int g_tcp_port_rdp;
! int g_use_rdp5 = 1;
  char g_hostname[16];
  char g_username[64];
--- 45,49 ----
  /* rdesktop globals */
  extern int g_tcp_port_rdp;
! RD_BOOL g_use_rdp5 = True;
  char g_hostname[16];
  char g_username[64];
***************
*** 64,67 ****
--- 64,68 ----
  int g_keyboard_subtype = 0x0; /* Defaults to US keyboard layout */
  int g_keyboard_functionkeys = 0xc; /* Defaults to US keyboard layout */
+ int g_numlock_sync = 0;
  
  /* hack globals */
***************
*** 122,126 ****
  
  /* Session Directory redirection */
! BOOL g_redirect = False;
  char g_redirect_server[64];
  char g_redirect_domain[16];
--- 123,127 ----
  
  /* Session Directory redirection */
! RD_BOOL g_redirect = False;
  char g_redirect_server[64];
  char g_redirect_domain[16];
***************
*** 617,621 ****
    if (g_rdpsnd)
    {
!     rdpsnd_init();
    }
  #endif
--- 618,622 ----
    if (g_rdpsnd)
    {
!     rdpsnd_init(0);
    }
  #endif
***************
*** 678,682 ****
    Bitmap = new QBitmap(width, height, data);
    Bitmap->setMask(*Bitmap);
!   return (HGLYPH)Bitmap;
  }
  
--- 679,683 ----
    Bitmap = new QBitmap(width, height, data);
    Bitmap->setMask(*Bitmap);
!   return (RD_HGLYPH)Bitmap;
  }
  
***************
*** 737,741 ****
  //*****************************************************************************
  // todo, does this leak at end of program
! void ui_destroy_colourmap(HCOLOURMAP map)
  {
    QColorMap * LCM;
--- 738,742 ----
  //*****************************************************************************
  // todo, does this leak at end of program
! void ui_destroy_colourmap(RD_HCOLOURMAP map)
  {
    QColorMap * LCM;
***************
*** 755,759 ****
  
  /*****************************************************************************/
! HBITMAP ui_create_bitmap(int width, int height, uint8 * data)
  {
    QImage * Image = NULL;
--- 756,760 ----
  
  /*****************************************************************************/
! RD_HBITMAP ui_create_bitmap(int width, int height, uint8 * data)
  {
    QImage * Image = NULL;
***************
*** 811,815 ****
      free(d);
    }
!   return (HBITMAP)Pixmap;
  }
  
--- 812,816 ----
      free(d);
    }
!   return (RD_HBITMAP)Pixmap;
  }
  
***************
*** 1021,1025 ****
  // not used
  void ui_triblt(uint8 opcode, int x, int y, int cx, int cy,
!                HBITMAP src, int srcx, int srcy,
                 BRUSH* brush, int bgcolour, int fgcolour)
  {
--- 1022,1026 ----
  // not used
  void ui_triblt(uint8 opcode, int x, int y, int cx, int cy,
!                RD_HBITMAP src, int srcx, int srcy,
                 BRUSH* brush, int bgcolour, int fgcolour)
  {
***************
*** 1028,1032 ****
  /*****************************************************************************/
  void ui_memblt(uint8 opcode, int x, int y, int cx, int cy,
!                HBITMAP src, int srcx, int srcy)
  {
    QPixmap* Pixmap;
--- 1029,1033 ----
  /*****************************************************************************/
  void ui_memblt(uint8 opcode, int x, int y, int cx, int cy,
!                RD_HBITMAP src, int srcx, int srcy)
  {
    QPixmap* Pixmap;
***************
*** 1288,1292 ****
  
  /*****************************************************************************/
! void ui_set_cursor(HCURSOR cursor)
  {
    QCursor* Cursor;
--- 1289,1293 ----
  
  /*****************************************************************************/
! void ui_set_cursor(RD_HCURSOR cursor)
  {
    QCursor* Cursor;
***************
*** 1297,1303 ****
  
  /*****************************************************************************/
! HCURSOR ui_create_cursor(unsigned int x, unsigned int y,
!                          int width, int height,
!                          uint8* andmask, uint8* xormask)
  {
    uint8 AData[128];
--- 1298,1304 ----
  
  /*****************************************************************************/
! RD_HCURSOR ui_create_cursor(unsigned int x, unsigned int y,
!                             int width, int height,
!                             uint8* andmask, uint8* xormask)
  {
    uint8 AData[128];
***************
*** 1362,1366 ****
  
  /*****************************************************************************/
! void ui_polygon(uint8 opcode, uint8 fillmode, POINT * point, int npoints,
                  BRUSH * brush, int bgcolour, int fgcolour)
  {
--- 1363,1367 ----
  
  /*****************************************************************************/
! void ui_polygon(uint8 opcode, uint8 fillmode, RD_POINT * point, int npoints,
                  BRUSH * brush, int bgcolour, int fgcolour)
  {
***************
*** 1369,1373 ****
  /*****************************************************************************/
  /* todo, use qt function for this (QPainter::drawPolyline) */
! void ui_polyline(uint8 opcode, POINT * points, int npoints, PEN * pen)
  {
    int i, x, y, dx, dy;
--- 1370,1374 ----
  /*****************************************************************************/
  /* todo, use qt function for this (QPainter::drawPolyline) */
! void ui_polyline(uint8 opcode, RD_POINT * points, int npoints, PEN * pen)
  {
    int i, x, y, dx, dy;
***************
*** 1555,1559 ****
  {
    fprintf(stderr, "rdesktop: A Remote Desktop Protocol client.\n");
!   fprintf(stderr, "Version " VERSION ". Copyright (C) 1999-2005 Matt Chapman.\n");
    fprintf(stderr, "QT uiport by Jay Sorg\n");
    fprintf(stderr, "See http://www.rdesktop.org/ for more information.\n\n");
--- 1556,1560 ----
  {
    fprintf(stderr, "rdesktop: A Remote Desktop Protocol client.\n");
!   fprintf(stderr, "Version " VERSION ". Copyright (C) 1999-2007 Matt Chapman.\n");
    fprintf(stderr, "QT uiport by Jay Sorg\n");
    fprintf(stderr, "See http://www.rdesktop.org/ for more information.\n\n");


-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642