*** src/embedded/qgfxvnc_qws.h.orig	Fri May 27 21:47:41 2005
--- src/embedded/qgfxvnc_qws.h	Fri May 27 20:13:26 2005
***************
*** 1,11 ****
  /*****************************************************************************
! ** $Id: qt/qgfxvfb_qws.h   3.3.4   edited Oct 13 2003 $
  **
! ** Implementation of QGfxvfb (virtual frame buffer driver)
  **
! ** Created : 940721
! **
! ** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
  **
  ** This file is part of the kernel module of the Qt GUI Toolkit.
  **
--- 1,12 ----
  /*****************************************************************************
! ** $Id: qt/qgfxvnc_qws.h   3.3.4   edited Oct 13 2003 $
  **
! ** Implementation of QGfxvnc (remote frame buffer driver)
! ** Proof of concept driver only.
! ** 
! ** Created : 20000703
  **
! ** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
  **
  ** This file is part of the kernel module of the Qt GUI Toolkit.
  **
***************
*** 30,55 ****
  **
  **********************************************************************/
  
! #ifndef QGFXVFB_QWS_H
! #define QGFXVFB_QWS_H
  
  #ifndef QT_H
! #include "qgfx_qws.h"
  #endif // QT_H
  
! #ifndef QT_NO_QWS_VFB
! 
! #include "qvfbhdr.h"
! 
  
! class QVFbMouseHandler;
! class QVFbKeyboardHandler;
  
! class QVFbScreen : public QScreen
! {
  public:
!     QVFbScreen( int display_id );
!     virtual ~QVFbScreen();
      virtual bool initDevice();
      virtual bool connect( const QString &displaySpec );
      virtual void disconnect();
--- 31,63 ----
  **
  **********************************************************************/
  
! #ifndef QGFXVNC_QWS_H
! #define QGFXVNC_QWS_H
  
+ #if defined(Q_OS_QNX6)
+ #define VNCSCREEN_BASE QQnxScreen
  #ifndef QT_H
! #include "qwsgfx_qnx.h"
  #endif // QT_H
+ #else
+ #if defined(__FreeBSD__)
+ #define VNCSCREEN_BASE QScreen
+ #else
+ #define VNCSCREEN_BASE QLinuxFbScreen
+ #include "qgfxlinuxfb_qws.h"
+ #endif /* FreeBSD */
+ #endif
  
! #ifndef QT_NO_QWS_VNC
  
! class QVNCServer;
! class QVNCHeader;
! class QSharedMemory;
  
! class QVNCScreen : public VNCSCREEN_BASE {
  public:
!     QVNCScreen( int display_id );
!     virtual ~QVNCScreen();
      virtual bool initDevice();
      virtual bool connect( const QString &displaySpec );
      virtual void disconnect();
***************
*** 60,75 ****
      virtual void restore();
      virtual void setMode(int nw,int nh,int nd);
  
!     virtual void setDirty( const QRect& r )
! 	{ hdr->dirty = TRUE; hdr->update = hdr->update.unite( r ); }
  
      bool success;
      unsigned char *shmrgn;
!     QVFbHeader *hdr;
!     QVFbMouseHandler *mouseHandler;
!     QVFbKeyboardHandler *keyboardHandler;
  };
  
! #endif
  
- #endif // QGFXVFB_QWS_H
--- 68,84 ----
      virtual void restore();
      virtual void setMode(int nw,int nh,int nd);
  
!     virtual void setDirty( const QRect& r );
  
      bool success;
+     QVNCServer *vncServer;
      unsigned char *shmrgn;
!     QSharedMemory *shm;
!     QVNCHeader *hdr;
!     bool virtualBuffer;
  };
  
! #endif // QT_NO_QWS_VNC
! 
! #endif // QGFXVNC_QWS_H