The Tight decoding optimizations broke the build of the legacy viewers, so this seems like a good time to get rid of them like we discussed.

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4759 3789f03b-4d11-0410-bbf8-ca57d06f2519

35 files changed, 0 insertions, 6162 deletions

diff --git a/win/CMakeLists.txt b/win/CMakeLists.txt
index f8b5d5d6..24f3fc4c 100644
--- a/win/CMakeLists.txt
+++ b/win/CMakeLists.txt
@@ -4,10 +4,6 @@ configure_file(resdefs.h.in ${CMAKE_CURRENT_BINARY_DIR}/resdefs.h)
 
 add_subdirectory(rfb_win32)
 
-if(NOT BUILD_NEW_VNCVIEWER)
-add_subdirectory(vncviewer)
-endif()
-
 if(BUILD_WINVNC)
 add_subdirectory(vncconfig)
 add_subdirectory(winvnc)
diff --git a/win/vncviewer/CConn.cxx b/win/vncviewer/CConn.cxx
deleted file mode 100644
index b067134a..00000000
--- a/win/vncviewer/CConn.cxx
+++ /dev/null
@@ -1,863 +0,0 @@
-/* Copyright (C) 2002-2005 RealVNC Ltd.  All Rights Reserved.
- * 
- * This is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
- * USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <winsock2.h>
-#include <vncviewer/UserPasswdDialog.h>
-#include <vncviewer/CConn.h>
-#include <vncviewer/CConnThread.h>
-#include <vncviewer/resource.h>
-#include <rfb/encodings.h>
-#include <rfb/Security.h>
-#include <rfb/CMsgWriter.h>
-#include <rfb/Configuration.h>
-#ifdef HAVE_GNUTLS
-#include <rfb/CSecurityTLS.h>
-#endif
-#include <rfb/LogWriter.h>
-#include <rfb_win32/AboutDialog.h>
-
-using namespace rfb;
-using namespace rfb::win32;
-using namespace rdr;
-
-// - Statics & consts
-
-static LogWriter vlog("CConn");
-
-
-const int IDM_FULLSCREEN = ID_FULLSCREEN;
-const int IDM_SEND_MENU_KEY = ID_SEND_MENU_KEY;
-const int IDM_SEND_CAD = ID_SEND_CAD;
-const int IDM_SEND_CTLESC = ID_SEND_CTLESC;
-const int IDM_ABOUT = ID_ABOUT;
-const int IDM_OPTIONS = ID_OPTIONS;
-const int IDM_INFO = ID_INFO;
-const int IDM_NEWCONN = ID_NEW_CONNECTION;
-const int IDM_REQUEST_REFRESH = ID_REQUEST_REFRESH;
-const int IDM_CTRL_KEY = ID_CTRL_KEY;
-const int IDM_ALT_KEY = ID_ALT_KEY;
-const int IDM_CONN_SAVE_AS = ID_CONN_SAVE_AS;
-const int IDM_ZOOM_IN = ID_ZOOM_IN;
-const int IDM_ZOOM_OUT = ID_ZOOM_OUT;
-const int IDM_ACTUAL_SIZE = ID_ACTUAL_SIZE;
-const int IDM_AUTO_SIZE = ID_AUTO_SIZE;
-
-
-static IntParameter debugDelay("DebugDelay","Milliseconds to display inverted "
-                               "pixel data - a debugging feature", 0);
-
-const int scaleValues[9] = {10, 25, 50, 75, 90, 100, 125, 150, 200};
-const int scaleCount = 9;
-
-
-//
-// -=- CConn implementation
-//
-
-RegKey            CConn::userConfigKey;
-
-
-CConn::CConn() 
-  : window(0), sameMachine(false), encodingChange(false), formatChange(false), 
-    lastUsedEncoding_(encodingRaw), sock(0), sockEvent(CreateEvent(0, TRUE, FALSE, 0)), 
-    reverseConnection(false), requestUpdate(false), firstUpdate(true),
-    pendingUpdate(false), isClosed_(false) {
-}
-
-CConn::~CConn() {
-  delete window;
-}
-
-bool CConn::initialise(network::Socket* s, bool reverse) {
-  // Set the server's name for MRU purposes
-  CharArray endpoint(s->getPeerEndpoint());
-
-  if (!options.host.buf)
-    options.setHost(endpoint.buf);
-  setServerName(options.host.buf);
-
-  // Initialise the underlying CConnection
-  setStreams(&s->inStream(), &s->outStream());
-
-  // Enable processing of window messages while blocked on I/O
-  s->inStream().setBlockCallback(this);
-
-  // Initialise the viewer options
-  applyOptions(options);
-
-  CSecurity::upg = this;
-#ifdef HAVE_GNUTLS
-  CSecurityTLS::msg = this;
-#endif
-
-  // Start the RFB protocol
-  sock = s;
-  reverseConnection = reverse;
-  initialiseProtocol();
-
-  return true;
-}
-
-
-void
-CConn::applyOptions(CConnOptions& opt) {
-  // - If any encoding-related settings have changed then we must
-  //   notify the server of the new settings
-  encodingChange |= ((options.useLocalCursor != opt.useLocalCursor) ||
-                     (options.useDesktopResize != opt.useDesktopResize) ||
-                     (options.customCompressLevel != opt.customCompressLevel) ||
-                     (options.compressLevel != opt.compressLevel) ||
-                     (options.noJpeg != opt.noJpeg) ||
-                     (options.qualityLevel != opt.qualityLevel) ||
-                     (options.preferredEncoding != opt.preferredEncoding));
-
-  // - If the preferred pixel format has changed then notify the server
-  formatChange |= (options.fullColour != opt.fullColour);
-  if (!opt.fullColour)
-    formatChange |= (options.lowColourLevel != opt.lowColourLevel);
-
-  // - Save the new set of options
-  options = opt;
-
-  // - Set optional features in ConnParams
-  cp.supportsLocalCursor = options.useLocalCursor;
-  cp.supportsDesktopResize = options.useDesktopResize;
-  cp.supportsExtendedDesktopSize = options.useDesktopResize;
-  cp.supportsDesktopRename = true;
-  cp.customCompressLevel = options.customCompressLevel;
-  cp.compressLevel = options.compressLevel;
-  cp.noJpeg = options.noJpeg;
-  cp.qualityLevel = options.qualityLevel;
-
-  // - Configure connection sharing on/off
-  setShared(options.shared);
-
-  // - Whether to use protocol 3.3 for legacy compatibility
-  setProtocol3_3(options.protocol3_3);
-
-  // - Apply settings that affect the window, if it is visible
-  if (window) {
-    window->setMonitor(options.monitor.buf);
-    window->setFullscreen(options.fullScreen);
-    window->setEmulate3(options.emulate3);
-    window->setPointerEventInterval(options.pointerEventInterval);
-    window->setMenuKey(options.menuKey);
-    window->setDisableWinKeys(options.disableWinKeys);
-    window->setShowToolbar(options.showToolbar);
-    window->printScale();
-    if (options.autoScaling) {
-      window->setAutoScaling(true);
-    } else {
-      window->setAutoScaling(false);
-      window->setDesktopScale(options.scale);
-    }
-    if (!options.useLocalCursor)
-      window->setCursor(0, 0, Point(), 0, 0);
-  }
-
-  security->SetSecTypes(options.secTypes);
-}
-
-
-void
-CConn::displayChanged() {
-  // Display format has changed - recalculate the full-colour pixel format
-  calculateFullColourPF();
-}
-
-
-bool
-CConn::sysCommand(WPARAM wParam, LPARAM lParam) {
-  // - If it's one of our (F8 Menu) messages
-  switch (wParam) {
-  case IDM_FULLSCREEN:
-    options.fullScreen = !window->isFullscreen();
-    window->setFullscreen(options.fullScreen);
-    return true;
-  case IDM_ZOOM_IN:
-  case IDM_ZOOM_OUT:
-    {
-      if (options.autoScaling) {
-        options.scale = window->getDesktopScale();
-        options.autoScaling = false;
-        window->setAutoScaling(false);
-      }
-      if (wParam == (unsigned)IDM_ZOOM_IN) {
-        for (int i = 0; i < scaleCount; i++)
-          if (options.scale < scaleValues[i]) { 
-            options.scale = scaleValues[i];
-            break;
-          }
-      } else {
-        for (int i = scaleCount-1; i >= 0; i--)
-          if (options.scale > scaleValues[i]) { 
-            options.scale = scaleValues[i];
-            break;
-          }
-      }
-      if (options.scale != window->getDesktopScale()) 
-        window->setDesktopScale(options.scale);
-    }
-    return true;
-  case IDM_ACTUAL_SIZE:
-    if (options.autoScaling) {
-      options.autoScaling = false;
-      window->setAutoScaling(false);
-    }
-    options.scale = 100;
-    window->setDesktopScale(100);
-    return true;
-  case IDM_AUTO_SIZE:
-    options.autoScaling = !options.autoScaling;
-    window->setAutoScaling(options.autoScaling);
-    if (!options.autoScaling) options.scale = window->getDesktopScale();
-    return true;
-  case IDM_SHOW_TOOLBAR:
-    options.showToolbar = !window->isToolbarEnabled();
-    window->setShowToolbar(options.showToolbar);
-    return true;
-  case IDM_CTRL_KEY:
-    window->kbd.keyEvent(this, VK_CONTROL, 0, !window->kbd.keyPressed(VK_CONTROL));
-    return true;
-  case IDM_ALT_KEY:
-    window->kbd.keyEvent(this, VK_MENU, 0, !window->kbd.keyPressed(VK_MENU));
-    return true;
-  case IDM_SEND_MENU_KEY:
-    window->kbd.keyEvent(this, options.menuKey, 0, true);
-    window->kbd.keyEvent(this, options.menuKey, 0, false);
-    return true;
-  case IDM_SEND_CAD:
-    window->kbd.keyEvent(this, VK_CONTROL, 0, true);
-    window->kbd.keyEvent(this, VK_MENU, 0, true);
-    window->kbd.keyEvent(this, VK_DELETE, 0x1000000, true);
-    window->kbd.keyEvent(this, VK_DELETE, 0x1000000, false);
-    window->kbd.keyEvent(this, VK_MENU, 0, false);
-    window->kbd.keyEvent(this, VK_CONTROL, 0, false);
-    return true;
-  case IDM_SEND_CTLESC:
-    window->kbd.keyEvent(this, VK_CONTROL, 0, true);
-    window->kbd.keyEvent(this, VK_ESCAPE, 0, true);
-    window->kbd.keyEvent(this, VK_ESCAPE, 0, false);
-    window->kbd.keyEvent(this, VK_CONTROL, 0, false);
-    return true;
-  case IDM_REQUEST_REFRESH:
-    try {
-      writer()->writeFramebufferUpdateRequest(Rect(0,0,cp.width,cp.height), false);
-      requestUpdate = false;
-    } catch (rdr::Exception& e) {
-      close(e.str());
-    }
-    return true;
-  case IDM_NEWCONN:
-    {
-      new CConnThread;
-    }
-    return true;
-  case IDM_OPTIONS:
-    // Update the monitor device name in the CConnOptions instance
-    options.monitor.replaceBuf(window->getMonitor());
-    showOptionsDialog();
-    return true;
-  case IDM_INFO:
-    infoDialog.showDialog(this);
-    return true;
-  case IDM_ABOUT:
-    AboutDialog::instance.showDialog();
-    return true;
-  case IDM_CONN_SAVE_AS:
-    return true;
-  };
-  return false;
-}
-
-
-void
-CConn::closeWindow() {
-  vlog.info("window closed");
-  close();
-}
-
-
-void
-CConn::refreshMenu(bool enableSysItems) {
-  HMENU menu = GetSystemMenu(window->getHandle(), FALSE);
-
-  if (!enableSysItems) {
-    // Gray out menu items that might cause a World Of Pain
-    EnableMenuItem(menu, SC_SIZE, MF_BYCOMMAND | MF_GRAYED);
-    EnableMenuItem(menu, SC_MOVE, MF_BYCOMMAND | MF_GRAYED);
-    EnableMenuItem(menu, SC_RESTORE, MF_BYCOMMAND | MF_ENABLED);
-    EnableMenuItem(menu, SC_MINIMIZE, MF_BYCOMMAND | MF_ENABLED);
-    EnableMenuItem(menu, SC_MAXIMIZE, MF_BYCOMMAND | MF_ENABLED);
-  }
-
-  // Update the modifier key menu items
-  UINT ctrlCheckFlags = window->kbd.keyPressed(VK_CONTROL) ? MF_CHECKED : MF_UNCHECKED;
-  UINT altCheckFlags = window->kbd.keyPressed(VK_MENU) ? MF_CHECKED : MF_UNCHECKED;
-  CheckMenuItem(menu, IDM_CTRL_KEY, MF_BYCOMMAND | ctrlCheckFlags);
-  CheckMenuItem(menu, IDM_ALT_KEY, MF_BYCOMMAND | altCheckFlags);
-
-  // Ensure that the Send <MenuKey> menu item has the correct text
-  if (options.menuKey) {
-    TCharArray menuKeyStr(options.menuKeyName());
-    TCharArray tmp(_tcslen(menuKeyStr.buf) + 6);
-    _stprintf(tmp.buf, _T("Send %s"), menuKeyStr.buf);
-    if (!ModifyMenu(menu, IDM_SEND_MENU_KEY, MF_BYCOMMAND | MF_STRING, IDM_SEND_MENU_KEY, tmp.buf))
-      InsertMenu(menu, IDM_SEND_CAD, MF_BYCOMMAND | MF_STRING, IDM_SEND_MENU_KEY, tmp.buf);
-  } else {
-    RemoveMenu(menu, IDM_SEND_MENU_KEY, MF_BYCOMMAND);
-  }
-
-  // Set the menu fullscreen option tick
-  CheckMenuItem(menu, IDM_FULLSCREEN, (window->isFullscreen() ? MF_CHECKED : 0) | MF_BYCOMMAND);
-
-  // Set the menu toolbar option tick
-  int toolbarFlags = window->isToolbarEnabled() ? MF_CHECKED : 0;
-  CheckMenuItem(menu, IDM_SHOW_TOOLBAR, MF_BYCOMMAND | toolbarFlags);
-
-  // In the full-screen mode, "Show toolbar" should be grayed.
-  toolbarFlags = window->isFullscreen() ? MF_GRAYED : MF_ENABLED;
-  EnableMenuItem(menu, IDM_SHOW_TOOLBAR, MF_BYCOMMAND | toolbarFlags);
-}
-
-
-void
-CConn::blockCallback() {
-  // - An InStream has blocked on I/O while processing an RFB message
-  //   We re-enable socket event notifications, so we'll know when more
-  //   data is available, then we sit and dispatch window events until
-  //   the notification arrives.
-  if (!isClosed()) {
-    if (WSAEventSelect(sock->getFd(), sockEvent, FD_READ | FD_CLOSE) == SOCKET_ERROR)
-      throw rdr::SystemException("Unable to wait for sokcet data", WSAGetLastError());
-  }
-  while (true) {
-    // If we have closed then we can't block waiting for data
-    if (isClosed())
-      throw rdr::EndOfStream();
-
-    // Wait for socket data, or a message to process
-    DWORD result = MsgWaitForMultipleObjects(1, &sockEvent.h, FALSE, INFINITE, QS_ALLINPUT);
-    if (result == WAIT_FAILED) {
-      // - The wait operation failed - raise an exception
-      throw rdr::SystemException("blockCallback wait error", GetLastError());
-    }
-
-    // - There should be a message in the message queue
-    MSG msg;
-    while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) {
-      // IMPORTANT: We mustn't call TranslateMessage() here, because instead we
-      // call ToAscii() in CKeyboard::keyEvent().  ToAscii() stores dead key
-      // state from one call to the next, which would be messed up by calls to
-      // TranslateMessage() (actually it looks like TranslateMessage() calls
-      // ToAscii() internally).
-      DispatchMessage(&msg);
-    }
-
-    if (result == WAIT_OBJECT_0)
-      // - Network event notification.  Return control to I/O routine.
-      break;
-  }
-
-  // Before we return control to the InStream, reset the network event
-  WSAEventSelect(sock->getFd(), sockEvent, 0);
-  ResetEvent(sockEvent);
-}
-
-
-void CConn::keyEvent(rdr::U32 key, bool down) {
-  if (!options.sendKeyEvents) return;
-  try {
-    writer()->keyEvent(key, down);
-  } catch (rdr::Exception& e) {
-    close(e.str());
-  }
-}
-void CConn::pointerEvent(const Point& pos, int buttonMask) {
-  if (!options.sendPtrEvents) return;
-  try {
-    writer()->pointerEvent(pos, buttonMask);
-  } catch (rdr::Exception& e) {
-    close(e.str());
-  }
-}
-void CConn::clientCutText(const char* str, int len) {
-  if (!options.clientCutText) return;
-  if (state() != RFBSTATE_NORMAL) return;
-  try {
-    writer()->clientCutText(str, len);
-  } catch (rdr::Exception& e) {
-    close(e.str());
-  }
-}
-
-void
-CConn::setColourMapEntries(int first, int count, U16* rgbs) {
-  vlog.debug("setColourMapEntries: first=%d, count=%d", first, count);
-  int i;
-  for (i=0;i<count;i++)
-    window->setColour(i+first, rgbs[i*3], rgbs[i*3+1], rgbs[i*3+2]);
-  // *** change to 0, 256?
-  window->refreshWindowPalette(first, count);
-}
-
-void
-CConn::bell() {
-  if (options.acceptBell)
-    MessageBeep((UINT)-1);
-}
-
-
-void
-CConn::setDesktopSize(int w, int h) {
-  vlog.debug("setDesktopSize %dx%d", w, h);
-
-  // Resize the window's buffer
-  if (window)
-    window->setSize(w, h);
-
-  // Tell the underlying CConnection
-  CConnection::setDesktopSize(w, h);
-}
-
-
-void
-CConn::setExtendedDesktopSize(int reason, int result, int w, int h,
-                              const rfb::ScreenSet& layout) {
-  if ((reason == (signed)reasonClient) && (result != (signed)resultSuccess)) {
-    vlog.error("SetDesktopSize failed: %d", result);
-    return;
-  }
-
-  // Resize the window's buffer
-  if (window)
-    window->setSize(w, h);
-
-  // Tell the underlying CConnection
-  CConnection::setExtendedDesktopSize(reason, result, w, h, layout);
-}
-
-
-void
-CConn::setCursor(int w, int h, const Point& hotspot, void* data, void* mask) {
-  if (!options.useLocalCursor) return;
-
-  // Set the window to use the new cursor
-  window->setCursor(w, h, hotspot, data, mask);
-}
-
-
-void
-CConn::close(const char* reason) {
-  // If already closed then ignore this
-  if (isClosed())
-    return;
-
-  // Hide the window, if it exists
-  if (window)
-    ShowWindow(window->getHandle(), SW_HIDE);
-
-  // Save the reason & flag that we're closed & shutdown the socket
-  isClosed_ = true;
-  closeReason_.replaceBuf(strDup(reason));
-  sock->shutdown();
-}
-
-bool CConn::showMsgBox(int flags, const char* title, const char* text)
-{
-  UINT winflags = 0;
-  int ret;
-
-  /* Translate flags */
-  if ((flags & M_OK) != 0)
-    winflags |= MB_OK;
-  if ((flags & M_OKCANCEL) != 0)
-    winflags |= MB_OKCANCEL;
-  if ((flags & M_YESNO) != 0)
-    winflags |= MB_YESNO;
-  if ((flags & M_ICONERROR) != 0)
-    winflags |= MB_ICONERROR;
-  if ((flags & M_ICONQUESTION) != 0)
-    winflags |= MB_ICONQUESTION;
-  if ((flags & M_ICONWARNING) != 0)
-    winflags |= MB_ICONWARNING;
-  if ((flags & M_ICONINFORMATION) != 0)
-    winflags |= MB_ICONINFORMATION;
-  if ((flags & M_DEFBUTTON1) != 0)
-    winflags |= MB_DEFBUTTON1;
-  if ((flags & M_DEFBUTTON2) != 0)
-    winflags |= MB_DEFBUTTON2;
-
-  ret = MessageBox(NULL, text, title, flags);
-  return (ret == IDOK || ret == IDYES) ? true : false;
-}
-
-void
-CConn::showOptionsDialog() {
-  optionsDialog.showDialog(this);
-}
-
-
-void
-CConn::framebufferUpdateStart() {
-  if (!formatChange) {
-    requestUpdate = pendingUpdate = true;
-    requestNewUpdate();
-  } else
-    pendingUpdate = false;
-}
-
-
-void
-CConn::framebufferUpdateEnd() {
-  if (debugDelay != 0) {
-    vlog.debug("debug delay %d",(int)debugDelay);
-    UpdateWindow(window->getHandle());
-    Sleep(debugDelay);
-    std::list<rfb::Rect>::iterator i;
-    for (i = debugRects.begin(); i != debugRects.end(); i++) {
-      window->invertRect(*i);
-    }
-    debugRects.clear();
-  }
-  window->framebufferUpdateEnd();
-
-  if (firstUpdate) {
-    int width, height;
-
-    if (cp.supportsSetDesktopSize &&
-        sscanf(options.desktopSize.buf, "%dx%d", &width, &height) == 2) {
-      ScreenSet layout;
-
-      layout = cp.screenLayout;
-
-      if (layout.num_screens() == 0)
-        layout.add_screen(rfb::Screen());
-      else if (layout.num_screens() != 1) {
-        ScreenSet::iterator iter;
-
-        while (true) {
-          iter = layout.begin();
-          ++iter;
-
-          if (iter == layout.end())
-            break;
-
-          layout.remove_screen(iter->id);
-        }
-      }
-
-      layout.begin()->dimensions.tl.x = 0;
-      layout.begin()->dimensions.tl.y = 0;
-      layout.begin()->dimensions.br.x = width;
-      layout.begin()->dimensions.br.y = height;
-
-      writer()->writeSetDesktopSize(width, height, layout);
-    }
-
-    firstUpdate = false;
-  }
-
-  // Always request the next update
-  requestUpdate = true;
-
-  // A format change prevented us from sending this before the update,
-  // so make sure to send it now.
-  if (formatChange && !pendingUpdate)
-    requestNewUpdate();
-
-  if (options.autoSelect)
-    autoSelectFormatAndEncoding();
-
-  // Check that at least part of the window has changed
-  if (!GetUpdateRect(window->getHandle(), 0, FALSE)) {
-    if (!(GetWindowLong(window->getHandle(), GWL_STYLE) & WS_MINIMIZE))
-      requestNewUpdate();
-  }
-
-  // Make sure the local cursor is shown
-  window->showCursor();
-}
-
-
-// Note: The method below is duplicated in win/vncviewer/CConn.cxx!
-
-// autoSelectFormatAndEncoding() chooses the format and encoding appropriate
-// to the connection speed:
-//
-//   First we wait for at least one second of bandwidth measurement.
-//
-//   Above 16Mbps (i.e. LAN), we choose the second highest JPEG quality,
-//   which should be perceptually lossless.
-//
-//   If the bandwidth is below that, we choose a more lossy JPEG quality.
-//
-//   If the bandwidth drops below 256 Kbps, we switch to palette mode.
-//
-//   Note: The system here is fairly arbitrary and should be replaced
-//         with something more intelligent at the server end.
-//
-void CConn::autoSelectFormatAndEncoding()
-{
-  int kbitsPerSecond = sock->inStream().kbitsPerSecond();
-  unsigned int timeWaited = sock->inStream().timeWaited();
-  bool newFullColour = options.fullColour;
-  int newQualityLevel = options.qualityLevel;
-
-  // Always use Tight
-  options.preferredEncoding = encodingTight;
-
-  // Check that we have a decent bandwidth measurement
-  if ((kbitsPerSecond == 0) || (timeWaited < 10000))
-    return;
-
-  // Select appropriate quality level
-  if (!options.noJpeg) {
-    if (kbitsPerSecond > 16000)
-      newQualityLevel = 8;
-    else
-      newQualityLevel = 6;
-
-    if (newQualityLevel != options.qualityLevel) {
-      vlog.info("Throughput %d kbit/s - changing to quality %d ",
-                kbitsPerSecond, newQualityLevel);
-      cp.qualityLevel = newQualityLevel;
-      options.qualityLevel = newQualityLevel;
-      encodingChange = true;
-    }
-  }
-
-  if (cp.beforeVersion(3, 8)) {
-    // Xvnc from TightVNC 1.2.9 sends out FramebufferUpdates with
-    // cursors "asynchronously". If this happens in the middle of a
-    // pixel format change, the server will encode the cursor with
-    // the old format, but the client will try to decode it
-    // according to the new format. This will lead to a
-    // crash. Therefore, we do not allow automatic format change for
-    // old servers.
-    return;
-  }
-  
-  // Select best color level
-  newFullColour = (kbitsPerSecond > 256);
-  if (newFullColour != options.fullColour) {
-    vlog.info("Throughput %d kbit/s - full color is now %s", 
-	      kbitsPerSecond,
-	      newFullColour ? "enabled" : "disabled");
-    options.fullColour = newFullColour;
-    formatChange = true;
-  } 
-}
-
-void
-CConn::requestNewUpdate() {
-  if (!requestUpdate) return;
-
-  if (formatChange) {
-
-    /* Catch incorrect requestNewUpdate calls */
-    assert(pendingUpdate == false);
-
-    // Select the required pixel format
-    if (options.fullColour) {
-      window->setPF(fullColourPF);
-    } else {
-      switch (options.lowColourLevel) {
-      case 0:
-        window->setPF(PixelFormat(8,3,0,1,1,1,1,2,1,0));
-        break;
-      case 1:
-        window->setPF(PixelFormat(8,6,0,1,3,3,3,4,2,0));
-        break;
-      case 2:
-        window->setPF(PixelFormat(8,8,0,0,0,0,0,0,0,0));
-        break;
-      }
-    }
-
-    // Print the current pixel format
-    char str[256];
-    window->getPF().print(str, 256);
-    vlog.info("Using pixel format %s",str);
-
-    // Save the connection pixel format and tell server to use it
-    cp.setPF(window->getPF());
-    writer()->writeSetPixelFormat(cp.pf());
-
-    // Correct the local window's palette
-    if (!window->getNativePF().trueColour)
-      window->refreshWindowPalette(0, 1 << cp.pf().depth);
-  }
-
-  if (encodingChange) {
-    vlog.info("Using %s encoding",encodingName(options.preferredEncoding));
-    writer()->writeSetEncodings(options.preferredEncoding, true);
-  }
-
-  writer()->writeFramebufferUpdateRequest(Rect(0, 0, cp.width, cp.height),
-                                          !formatChange);
-
-  encodingChange = formatChange = requestUpdate = false;
-}
-
-
-void
-CConn::calculateFullColourPF() {
-  // If the server is palette based then use palette locally
-  // Also, don't bother doing bgr222
-  if (!serverDefaultPF.trueColour || (serverDefaultPF.depth < 6)) {
-    fullColourPF = serverDefaultPF;
-    options.fullColour = true;
-  } else {
-    // If server is trueColour, use lowest depth PF
-    PixelFormat native = window->getNativePF();
-    if ((serverDefaultPF.bpp < native.bpp) ||
-        ((serverDefaultPF.bpp == native.bpp) &&
-        (serverDefaultPF.depth < native.depth)))
-      fullColourPF = serverDefaultPF;
-    else
-      fullColourPF = window->getNativePF();
-  }
-  formatChange = true;
-}
-
-
-void
-CConn::setName(const char* name) {
-  if (window)
-    window->setName(name);
-  CConnection::setName(name);
-}
-
-
-void CConn::serverInit() {
-  CConnection::serverInit();
-
-  // If using AutoSelect with old servers, start in FullColor
-  // mode. See comment in autoSelectFormatAndEncoding. 
-  if (cp.beforeVersion(3, 8) && options.autoSelect) {
-    options.fullColour = true;
-  }
-
-  // Show the window
-  window = new DesktopWindow(this);
-
-  // Update the window menu
-  HMENU wndmenu = GetSystemMenu(window->getHandle(), FALSE);
-  int toolbarChecked = options.showToolbar ? MF_CHECKED : 0;
-
-  AppendMenu(wndmenu, MF_SEPARATOR, 0, 0);
-  AppendMenu(wndmenu, MF_STRING, IDM_FULLSCREEN, _T("&Full screen"));
-  AppendMenu(wndmenu, MF_STRING | toolbarChecked, IDM_SHOW_TOOLBAR,
-             _T("Show tool&bar"));
-  AppendMenu(wndmenu, MF_SEPARATOR, 0, 0);
-  AppendMenu(wndmenu, MF_STRING, IDM_CTRL_KEY, _T("Ctr&l"));
-  AppendMenu(wndmenu, MF_STRING, IDM_ALT_KEY, _T("Al&t"));
-  AppendMenu(wndmenu, MF_STRING, IDM_SEND_CAD, _T("Send Ctrl-Alt-&Del"));
-  AppendMenu(wndmenu, MF_STRING, IDM_SEND_CTLESC, _T("Send Ctrl-&Esc"));
-  AppendMenu(wndmenu, MF_STRING, IDM_REQUEST_REFRESH, _T("Refres&h Screen"));
-  AppendMenu(wndmenu, MF_SEPARATOR, 0, 0);
-  AppendMenu(wndmenu, MF_STRING, IDM_NEWCONN, _T("Ne&w Connection..."));
-  AppendMenu(wndmenu, MF_STRING, IDM_OPTIONS, _T("&Options..."));
-  AppendMenu(wndmenu, MF_STRING, IDM_INFO, _T("Connection &Info..."));
-  AppendMenu(wndmenu, MF_STRING, IDM_ABOUT, _T("&About..."));
-
-  // Set window attributes
-  window->setName(cp.name());
-  window->setShowToolbar(options.showToolbar);
-  window->setSize(cp.width, cp.height);
-  applyOptions(options);
-
-  // Save the server's current format
-  serverDefaultPF = cp.pf();
-
-  // Calculate the full-colour format to use
-  calculateFullColourPF();
-
-  // Request the initial update
-  vlog.info("requesting initial update");
-  formatChange = encodingChange = requestUpdate = true;
-  requestNewUpdate();
-}
-
-void
-CConn::serverCutText(const char* str, rdr::U32 len) {
-  if (!options.serverCutText) return;
-  window->serverCutText(str, len);
-}
-
-
-void CConn::beginRect(const Rect& r, int encoding) {
-  sock->inStream().startTiming();
-}
-
-void CConn::endRect(const Rect& r, int encoding) {
-  sock->inStream().stopTiming();
-  lastUsedEncoding_ = encoding;
-  if (debugDelay != 0) {
-    window->invertRect(r);
-    debugRects.push_back(r);
-  }
-}
-
-void CConn::fillRect(const Rect& r, Pixel pix) {
-  window->fillRect(r, pix);
-}
-void CConn::imageRect(const Rect& r, void* pixels) {
-  window->imageRect(r, pixels);
-}
-void CConn::copyRect(const Rect& r, int srcX, int srcY) {
-  window->copyRect(r, srcX, srcY);
-}
-
-void CConn::getUserPasswd(char** user, char** password) {
-  if (!user && options.passwordFile.buf[0]) {
-    FILE* fp = fopen(options.passwordFile.buf, "rb");
-    if (fp) {
-      char data[256];
-      int datalen = fread(data, 1, 256, fp);
-      fclose(fp);
-      if (datalen == 8) {
-	ObfuscatedPasswd obfPwd;
-	obfPwd.buf = data;
-	obfPwd.length  = datalen; 
-	PlainPasswd passwd(obfPwd);
-	obfPwd.takeBuf();
-	*password = strDup(passwd.buf);
-	memset(data, 0, sizeof(data));
-      }
-    }
-  }
-  if (user && options.userName.buf)
-    *user = strDup(options.userName.buf);
-  if (password && options.password.buf)
-    *password = strDup(options.password.buf);
-  if ((user && !*user) || (password && !*password)) {
-    // Missing username or password - prompt the user
-    UserPasswdDialog userPasswdDialog;
-    userPasswdDialog.setCSecurity(csecurity);
-    userPasswdDialog.getUserPasswd(user, password);
-  }
-  if (user) options.setUserName(*user);
-  if (password) options.setPassword(*password);
-}
-
diff --git a/win/vncviewer/CConn.h b/win/vncviewer/CConn.h
deleted file mode 100644
index d3b3b206..00000000
--- a/win/vncviewer/CConn.h
+++ /dev/null
@@ -1,169 +0,0 @@
-/* Copyright (C) 2002-2005 RealVNC Ltd.  All Rights Reserved.
- * 
- * This is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
- * USA.
- */
-
-// -=- CConn.h
-
-// Windows-specific implementation of CConnection
-
-#ifndef __RFB_WIN32_CCONN_H__
-#define __RFB_WIN32_CCONN_H__
-
-#include <network/Socket.h>
-#include <rfb/CConnection.h>
-#include <rfb/Cursor.h>
-#include <rfb/UserMsgBox.h>
-#include <rfb/UserPasswdGetter.h>
-#include <rfb_win32/Registry.h>
-#include <rfb_win32/Handle.h>
-#include <vncviewer/InfoDialog.h>
-#include <vncviewer/OptionsDialog.h>
-#include <vncviewer/CConnOptions.h>
-#include <vncviewer/DesktopWindow.h>
-#include <list>
-
-
-namespace rfb {
-
-  namespace win32 {
-
-    class CConn : public CConnection,
-                  UserPasswdGetter,
-                  DesktopWindow::Callback,
-                  rdr::FdInStreamBlockCallback,
-                  UserMsgBox
-    {
-    public:
-      CConn();
-      ~CConn();
-
-      // - Start the VNC session on the supplied socket
-      //   The socket must already be connected to a host
-      bool initialise(network::Socket* s, bool reverse=false);
-
-      // - Set/get the session options
-      void applyOptions(CConnOptions& opt);
-      const CConnOptions& getOptions() const { return options; };
-
-      // - Show the options dialog for the connection
-      void showOptionsDialog();
-
-      // - Close the socket & set the reason for closure
-      void close(const char* reason=0);
-      bool isClosed() const { return isClosed_; }
-      const char* closeReason() const { return closeReason_.buf; }
-
-      // - Last received encoding, for the Info dialog
-      int lastUsedEncoding() const { return lastUsedEncoding_; }
-
-      // - Get at the DesktopWindow, if any
-      DesktopWindow* getWindow() { return window; }
-
-      // - Get at the underlying Socket
-      network::Socket* getSocket() { return sock; }
-
-      // - Get the server's preferred format
-      const PixelFormat& getServerDefaultPF() const { return serverDefaultPF; }
-
-      // - Display message box
-      virtual bool showMsgBox(int flags, const char* title, const char* text);
-
-      // Global user-config registry key
-      static RegKey userConfigKey;
-
-    protected:
-      // InputHandler interface (via DesktopWindow::Callback)
-      void keyEvent(rdr::U32 key, bool down);
-      void pointerEvent(const Point& pos, int buttonMask);
-      void clientCutText(const char* str, int len);
-
-      // DesktopWindow::Callback interface
-      void displayChanged();
-      void paintCompleted() {}
-      bool sysCommand(WPARAM wParam, LPARAM lParam);
-      void closeWindow();
-      void refreshMenu(bool enableSysCommands);
-
-      // CConnection interface
-      void setColourMapEntries(int firstColour, int nColours, rdr::U16* rgbs);
-      void bell();
-      void framebufferUpdateStart();
-      void framebufferUpdateEnd();
-      void setDesktopSize(int w, int h);
-      void setExtendedDesktopSize(int reason, int result, int w, int h,
-                                  const rfb::ScreenSet& layout);
-      void setCursor(int w, int h, const Point& hotspot, void* data, void* mask);
-      void setName(const char* name);
-      void serverInit();
-      void serverCutText(const char* str, rdr::U32 len);
-      void beginRect(const Rect& r, int encoding);
-      void endRect(const Rect& r, int encoding);
-      void fillRect(const Rect& r, Pixel pix);
-      void imageRect(const Rect& r, void* pixels);
-      void copyRect(const Rect& r, int srcX, int srcY);
-
-      // rdr::FdInStreamBlockCallback interface
-      void blockCallback();
-
-      // UserPasswdGetter interface
-      // (overridden to allow a pre-supplied username & password)
-      void getUserPasswd(char** user, char** password);
-
-      // CConn-specific internal interface
-      void autoSelectFormatAndEncoding();
-      void requestNewUpdate();
-      void calculateFullColourPF();
-
-      // The desktop window
-      DesktopWindow* window;
-
-      // Info and Options dialogs
-      OptionsDialog optionsDialog;
-      InfoDialog infoDialog;
-
-      // VNC Viewer options
-      CConnOptions options;
-
-      // Pixel format and encoding
-      PixelFormat serverDefaultPF;
-      PixelFormat fullColourPF;
-      bool sameMachine;
-      bool encodingChange;
-      bool formatChange;
-      int lastUsedEncoding_;
-
-      // Networking and RFB protocol
-      network::Socket* sock;
-      Handle sockEvent;
-      bool reverseConnection;
-      bool requestUpdate;
-      bool firstUpdate;
-      bool pendingUpdate;
-
-      // Debugging/logging
-      std::list<Rect> debugRects;
-      CharArray closeReason_;
-      bool isClosed_;
-    };
-
-  };
-
-};
-
-#endif
-
-
diff --git a/win/vncviewer/CConnOptions.cxx b/win/vncviewer/CConnOptions.cxx
deleted file mode 100644
index 3152db9e..00000000
--- a/win/vncviewer/CConnOptions.cxx
+++ /dev/null
@@ -1,507 +0,0 @@
-/* Copyright (C) 2002-2005 RealVNC Ltd.  All Rights Reserved.
- * 
- * This is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
- * USA.
- */
-
-#include <vncviewer/CConnOptions.h>
-#include <rfb/Configuration.h>
-#include <rfb/encodings.h>
-#include <rfb/LogWriter.h>
-#include <rfb/ScaleFilters.h>
-#include <rfb_win32/MsgBox.h>
-#include <rfb_win32/Registry.h>
-#include <rfb/SecurityClient.h>
-#include <rdr/HexInStream.h>
-#include <rdr/HexOutStream.h>
-#include <stdlib.h>
-
-using namespace rfb;
-using namespace rfb::win32;
-
-static StringParameter passwordFile("PasswordFile",
-				    "Password file for VNC authentication", "");
-
-// - Settings stored in the registry & in .vnc files, by Save Defaults and
-//   Save Configuration respectively.
-
-static BoolParameter useLocalCursor("UseLocalCursor", "Render the mouse cursor locally", true);
-static BoolParameter useDesktopResize("UseDesktopResize", "Support dynamic desktop resizing", true);
-
-static BoolParameter fullColour("FullColor",
-				"Use full color", true);
-static AliasParameter fullColourAlias("FullColour", "Alias for FullColor", &fullColour);
-
-static IntParameter lowColourLevel("LowColorLevel",
-                         "Color level to use on slow connections. "
-                         "0 = Very Low (8 colors), 1 = Low (64 colors), 2 = Medium (256 colors)",
-                         2);
-static AliasParameter lowColourLevelAlias("LowColourLevel", "Alias for LowColorLevel", &lowColourLevel);
-
-static BoolParameter fullScreen("FullScreen",
-                         "Use the whole display to show the remote desktop."
-                         "(Press F8 to access the viewer menu)",
-                         false);
-static StringParameter preferredEncoding("PreferredEncoding",
-					 "Preferred encoding to use (Tight, ZRLE, Hextile or"
-					 " Raw)", "Tight");
-static BoolParameter autoSelect("AutoSelect", 
-				"Auto select pixel format and encoding. "
-				"Default if PreferredEncoding and FullColor are not specified.", 
-				true);
-static BoolParameter sharedConnection("Shared",
-                         "Allow existing connections to the server to continue."
-                         "(Default is to disconnect all other clients)",
-                         false);
-
-StringParameter desktopSize("DesktopSize",
-                            "Reconfigure desktop size on the server on "
-                            "connect (if possible)", "");
-
-static BoolParameter sendPtrEvents("SendPointerEvents",
-                         "Send pointer (mouse) events to the server.", true);
-static BoolParameter sendKeyEvents("SendKeyEvents",
-                         "Send key presses (and releases) to the server.", true);
-
-static BoolParameter clientCutText("ClientCutText",
-                         "Send clipboard changes to the server.", true);
-static BoolParameter serverCutText("ServerCutText",
-                         "Accept clipboard changes from the server.", true);
-
-static BoolParameter disableWinKeys("DisableWinKeys",
-                         "Pass special Windows keys directly to the server.", true);
-
-static BoolParameter protocol3_3("Protocol3.3",
-                         "Only use protocol version 3.3", false);
-
-static IntParameter ptrEventInterval("PointerEventInterval",
-                         "The interval to delay between sending one pointer event "
-                         "and the next.", 0);
-static BoolParameter emulate3("Emulate3",
-                         "Emulate middle mouse button when left and right buttons "
-                         "are used simulatenously.", false);
-
-static BoolParameter acceptBell("AcceptBell",
-                         "Produce a system beep when requested to by the server.",
-                         true);
-
-static BoolParameter showToolbar("ShowToolbar", "Show toolbar by default.", true);
-
-static StringParameter monitor("Monitor", "The monitor to open the VNC Viewer window on, if available.", "");
-static StringParameter menuKey("MenuKey", "The key which brings up the popup menu", "F8");
-static BoolParameter autoReconnect("AutoReconnect", "Offer to reconnect to the remote server if the connection"
-                                   "is dropped because an error occurs.", true);
-
-static BoolParameter customCompressLevel("CustomCompressLevel",
-					 "Use custom compression level. "
-					 "Default if CompressLevel is specified.", false);
-
-static IntParameter compressLevel("CompressLevel",
-				  "Use specified compression level"
-				  "0 = Low, 9 = High",
-				  6);
-
-static BoolParameter noJpeg("NoJPEG",
-			    "Disable lossy JPEG compression in Tight encoding.",
-			    false);
-
-static IntParameter qualityLevel("QualityLevel",
-				 "JPEG quality level. "
-				 "0 = Low, 9 = High",
-				 8);
-
-static BoolParameter autoScaling("AutoScaling",
-                          "Auto rescale local copy of the remote desktop to the client window.",
-                          false);
-static IntParameter scale("Scale", 
-                          "Scale local copy of the remote desktop, in percent",
-                          100);
-
-CConnOptions::CConnOptions()
-: useLocalCursor (::useLocalCursor), 
-useDesktopResize(::useDesktopResize),
-fullScreen(::fullScreen), 
-fullColour(::fullColour), 
-lowColourLevel(::lowColourLevel), 
-preferredEncoding(encodingTight), 
-autoSelect(::autoSelect), 
-shared(::sharedConnection), 
-desktopSize(::desktopSize.getData()), 
-sendPtrEvents(::sendPtrEvents), 
-sendKeyEvents(::sendKeyEvents),
-showToolbar(::showToolbar), 
-clientCutText(::clientCutText), 
-serverCutText(::serverCutText),
-disableWinKeys(::disableWinKeys), 
-emulate3(::emulate3), 
-pointerEventInterval(ptrEventInterval),
-protocol3_3(::protocol3_3), 
-acceptBell(::acceptBell),
-autoScaling(::autoScaling), 
-scale(::scale), 
-monitor(::monitor.getData()),
-autoReconnect(::autoReconnect), 
-customCompressLevel(::customCompressLevel), 
-compressLevel(::compressLevel), 
-noJpeg(::noJpeg), 
-qualityLevel(::qualityLevel),
-passwordFile(::passwordFile.getData())
-{
-  char *sectypes;
-
-  if (autoSelect) {
-    preferredEncoding = encodingTight;
-  } else {
-    CharArray encodingName(::preferredEncoding.getData());
-    preferredEncoding = encodingNum(encodingName.buf);
-  }
-  setMenuKey(CharArray(::menuKey.getData()).buf);
-
-  if (!::autoSelect.hasBeenSet()) {
-      // Default to AutoSelect=0 if -PreferredEncoding or -FullColor is used
-    autoSelect = (!::preferredEncoding.hasBeenSet() 
-		  && !::fullColour.hasBeenSet()
-		  && !::fullColourAlias.hasBeenSet());
-  }
-  if (!::customCompressLevel.hasBeenSet()) {
-    // Default to CustomCompressLevel=1 if CompressLevel is used.
-    customCompressLevel = ::compressLevel.hasBeenSet();
-  }
-
-  sectypes = SecurityClient::secTypes.getDefaultStr();
-  secTypes = parseSecTypes(sectypes);
-  delete [] sectypes;
-}
-
-
-void CConnOptions::readFromFile(const char* filename) {
-  FILE* f = fopen(filename, "r");
-  if (!f)
-    throw rdr::Exception("Failed to read configuration file");
-
-  try { 
-    char line[4096];
-    CharArray section;
-
-    CharArray hostTmp;
-    int portTmp = 0;
-
-    while (!feof(f)) {
-      // Read the next line
-      if (!fgets(line, sizeof(line), f)) {
-        if (feof(f))
-          break;
-        throw rdr::SystemException("fgets", ferror(f));
-      }
-      int len=strlen(line);
-      if (line[len-1] == '\n') {
-        line[len-1] = 0;
-        len--;
-      }
-
-      // Process the line
-      if (line[0] == ';') {
-        // Comment
-      } else if (line[0] == '[') {
-        // Entering a new section
-        if (!strSplit(&line[1], ']', &section.buf, 0))
-          throw rdr::Exception("bad Section");
-      } else {
-        // Reading an option
-        CharArray name;
-        CharArray value;
-        if (!strSplit(line, '=', &name.buf, &value.buf))
-          throw rdr::Exception("bad Name/Value pair");
-
-        if (stricmp(section.buf, "Connection") == 0) {
-          if (stricmp(name.buf, "Host") == 0) {
-            hostTmp.replaceBuf(value.takeBuf());
-          } else if (stricmp(name.buf, "Port") == 0) {
-            portTmp = atoi(value.buf);
-          } else if (stricmp(name.buf, "UserName") == 0) {
-            userName.replaceBuf(value.takeBuf());
-          } else if (stricmp(name.buf, "Password") == 0) {
-            ObfuscatedPasswd obfPwd;
-            rdr::HexInStream::hexStrToBin(value.buf, (char**)&obfPwd.buf, &obfPwd.length);
-            PlainPasswd passwd(obfPwd);
-            password.replaceBuf(passwd.takeBuf());
-          }
-        } else if (stricmp(section.buf, "Options") == 0) {
-            // V4 options
-          if (stricmp(name.buf, "UseLocalCursor") == 0) {
-            useLocalCursor = atoi(value.buf);
-          } else if (stricmp(name.buf, "UseDesktopResize") == 0) {
-            useDesktopResize = atoi(value.buf);
-          } else if (stricmp(name.buf, "FullScreen") == 0) {
-            fullScreen = atoi(value.buf);
-          } else if (stricmp(name.buf, "FullColour") == 0) {
-            fullColour = atoi(value.buf);
-          } else if (stricmp(name.buf, "LowColourLevel") == 0) {
-            lowColourLevel = atoi(value.buf);
-          } else if (stricmp(name.buf, "PreferredEncoding") == 0) {
-            preferredEncoding = encodingNum(value.buf);
-          } else if ((stricmp(name.buf, "AutoDetect") == 0) ||
-                     (stricmp(name.buf, "AutoSelect") == 0)) {
-            autoSelect = atoi(value.buf);
-          } else if (stricmp(name.buf, "Shared") == 0) {
-            shared = atoi(value.buf);
-          } else if (stricmp(name.buf, "SendPtrEvents") == 0) {
-            sendPtrEvents = atoi(value.buf);
-          } else if (stricmp(name.buf, "SendKeyEvents") == 0) {
-            sendKeyEvents = atoi(value.buf);
-          } else if (stricmp(name.buf, "SendCutText") == 0) {
-            clientCutText = atoi(value.buf);
-          } else if (stricmp(name.buf, "AcceptCutText") == 0) {
-            serverCutText = atoi(value.buf);
-          } else if (stricmp(name.buf, "DisableWinKeys") == 0) {
-            disableWinKeys = atoi(value.buf);
-          } else if (stricmp(name.buf, "AcceptBell") == 0) {
-            acceptBell = atoi(value.buf);
-          } else if (stricmp(name.buf, "Emulate3") == 0) {
-            emulate3 = atoi(value.buf);
-          } else if (stricmp(name.buf, "ShowToolbar") == 0) {
-            showToolbar = atoi(value.buf);
-          } else if (stricmp(name.buf, "PointerEventInterval") == 0) {
-            pointerEventInterval = atoi(value.buf);
-          } else if (stricmp(name.buf, "Monitor") == 0) {
-            monitor.replaceBuf(value.takeBuf());
-          } else if (stricmp(name.buf, "MenuKey") == 0) {
-            setMenuKey(value.buf);
-          } else if (stricmp(name.buf, "AutoReconnect") == 0) {
-            autoReconnect = atoi(value.buf);
-
-          } else if (stricmp(name.buf, "CustomCompressLevel") == 0) {
-	    customCompressLevel = atoi(value.buf);
-          } else if (stricmp(name.buf, "CompressLevel") == 0) {
-	    compressLevel = atoi(value.buf);
-          } else if (stricmp(name.buf, "NoJPEG") == 0) {
-	    noJpeg = atoi(value.buf);
-          } else if (stricmp(name.buf, "QualityLevel") == 0) {
-	    qualityLevel = atoi(value.buf);
-            // Legacy options
-          } else if (stricmp(name.buf, "Preferred_Encoding") == 0) {
-            preferredEncoding = atoi(value.buf);
-          } else if (stricmp(name.buf, "8bit") == 0) {
-            fullColour = !atoi(value.buf);
-          } else if (stricmp(name.buf, "FullScreen") == 0) {
-            fullScreen = atoi(value.buf);
-          } else if (stricmp(name.buf, "ViewOnly") == 0) {
-            sendPtrEvents = sendKeyEvents = !atoi(value.buf);
-          } else if (stricmp(name.buf, "DisableClipboard") == 0) {
-            clientCutText = serverCutText = !atoi(value.buf);
-          } else if (stricmp(name.buf, "AutoScaling") == 0) {
-            autoScaling = atoi(value.buf);
-          } else if (stricmp(name.buf, "Scale") == 0) {
-            scale = atoi(value.buf);
-          } else if (stricmp(name.buf, "SecurityTypes") == 0) {
-            secTypes = parseSecTypes(value.buf);
-          }
-        }
-      }
-    }
-    fclose(f); f=0;
-
-    // Process the Host and Port
-    if (hostTmp.buf) {
-      int hostLen = strlen(hostTmp.buf) + 2 + 17;
-      host.replaceBuf(new char[hostLen]);
-      strCopy(host.buf, hostTmp.buf, hostLen);
-      if (portTmp) {
-        strncat(host.buf, "::", hostLen-1);
-        char tmp[16];
-        sprintf(tmp, "%d", portTmp);
-        strncat(host.buf, tmp, hostLen-1);
-      }
-    }
-
-    // If AutoSelect is enabled then override the preferred encoding
-    if (autoSelect)
-      preferredEncoding = encodingZRLE;
-
-    setConfigFileName(filename);
-  } catch (rdr::Exception&) {
-    if (f) fclose(f);
-    throw;
-  }
-}
-
-void CConnOptions::writeToFile(const char* filename) {
-  FILE* f = fopen(filename, "w");
-  if (!f)
-    throw rdr::Exception("Failed to write configuration file");
-
-  try {
-    // - Split server into host and port and save
-    fprintf(f, "[Connection]\n");
-
-    fprintf(f, "Host=%s\n", host.buf);
-    if (userName.buf)
-      fprintf(f, "UserName=%s\n", userName.buf);
-    if (password.buf) {
-      // - Warn the user before saving the password
-      if (MsgBox(0, _T("Do you want to include the VNC Password in this configuration file?\n")
-                    _T("Storing the password is more convenient but poses a security risk."),
-                    MB_YESNO | MB_DEFBUTTON2 | MB_ICONWARNING) == IDYES) {
-        ObfuscatedPasswd obfPwd(password);
-        CharArray obfuscatedHex(rdr::HexOutStream::binToHexStr(obfPwd.buf, obfPwd.length));
-        fprintf(f, "Password=%s\n", obfuscatedHex.buf);
-      }
-    }
-
-    // - Save the other options
-    fprintf(f, "[Options]\n");
-
-    fprintf(f, "UseLocalCursor=%d\n", (int)useLocalCursor);
-    fprintf(f, "UseDesktopResize=%d\n", (int)useDesktopResize);
-    fprintf(f, "FullScreen=%d\n", (int)fullScreen);
-    fprintf(f, "FullColour=%d\n", (int)fullColour);
-    fprintf(f, "LowColourLevel=%d\n", lowColourLevel);
-    fprintf(f, "PreferredEncoding=%s\n", encodingName(preferredEncoding));
-    fprintf(f, "AutoSelect=%d\n", (int)autoSelect);
-    fprintf(f, "Shared=%d\n", (int)shared);
-    fprintf(f, "SendPtrEvents=%d\n", (int)sendPtrEvents);
-    fprintf(f, "SendKeyEvents=%d\n", (int)sendKeyEvents);
-    fprintf(f, "SendCutText=%d\n", (int)clientCutText);
-    fprintf(f, "AcceptCutText=%d\n", (int)serverCutText);
-    fprintf(f, "DisableWinKeys=%d\n", (int)disableWinKeys);
-    fprintf(f, "AcceptBell=%d\n", (int)acceptBell);
-    fprintf(f, "Emulate3=%d\n", (int)emulate3);
-    fprintf(f, "ShowToolbar=%d\n", (int)showToolbar);
-    fprintf(f, "PointerEventInterval=%d\n", pointerEventInterval);
-    if (monitor.buf)
-      fprintf(f, "Monitor=%s\n", monitor.buf);
-    fprintf(f, "MenuKey=%s\n", CharArray(menuKeyName()).buf);
-    fprintf(f, "AutoReconnect=%d\n", (int)autoReconnect);
-    fprintf(f, "CustomCompressLevel=%d\n", customCompressLevel);
-    fprintf(f, "CompressLevel=%d\n", compressLevel);
-    fprintf(f, "NoJPEG=%d\n", noJpeg);
-    fprintf(f, "QualityLevel=%d\n", qualityLevel);
-    fprintf(f, "AutoScaling=%d\n", (int)autoScaling);
-    fprintf(f, "Scale=%d\n", scale);
-
-    fprintf(f, "SecurityTypes=");
-    std::list<rdr::U32>::iterator i;
-    for (i = secTypes.begin(); i != secTypes.end(); i++)
-      fprintf(f, "%s,", secTypeName(*i));
-    fprintf(f, "\n");
-
-    fclose(f); f=0;
-
-    setConfigFileName(filename);
-  } catch (rdr::Exception&) {
-    if (f) fclose(f);
-    throw;
-  }
-}
-
-
-void CConnOptions::writeDefaults() {
-  RegKey key;
-  key.createKey(HKEY_CURRENT_USER, _T("Software\\TigerVNC\\VNCviewer4"));
-  key.setBool(_T("UseLocalCursor"), useLocalCursor);
-  key.setBool(_T("UseDesktopResize"), useDesktopResize);
-  key.setBool(_T("FullScreen"), fullScreen);
-  key.setBool(_T("FullColour"), fullColour);
-  key.setInt(_T("LowColourLevel"), lowColourLevel);
-  key.setString(_T("PreferredEncoding"), TStr(encodingName(preferredEncoding)));
-  key.setBool(_T("AutoSelect"), autoSelect);
-  key.setBool(_T("Shared"), shared);
-  key.setBool(_T("SendPointerEvents"), sendPtrEvents);
-  key.setBool(_T("SendKeyEvents"), sendKeyEvents);
-  key.setBool(_T("ClientCutText"), clientCutText);
-  key.setBool(_T("ServerCutText"), serverCutText);
-  key.setBool(_T("DisableWinKeys"), disableWinKeys);
-  key.setBool(_T("Protocol3.3"), protocol3_3);
-  key.setBool(_T("AcceptBell"), acceptBell);
-  key.setBool(_T("ShowToolbar"), showToolbar);
-  key.setBool(_T("Emulate3"), emulate3);
-  key.setInt(_T("PointerEventInterval"), pointerEventInterval);
-  if (monitor.buf)
-    key.setString(_T("Monitor"), TStr(monitor.buf));
-  key.setString(_T("MenuKey"), TCharArray(menuKeyName()).buf);
-  key.setBool(_T("AutoReconnect"), autoReconnect);
-  key.setInt(_T("CustomCompressLevel"), customCompressLevel);
-  key.setInt(_T("CompressLevel"), compressLevel);
-  key.setInt(_T("NoJPEG"), noJpeg);
-  key.setInt(_T("QualityLevel"), qualityLevel);
-  key.setBool(_T("AutoScaling"), autoScaling);
-  key.setInt(_T("Scale"), scale);
-}
-
-
-void CConnOptions::setUserName(const char* user) {userName.replaceBuf(strDup(user));}
-void CConnOptions::setPassword(const char* pwd) {password.replaceBuf(strDup(pwd));}
-void CConnOptions::setConfigFileName(const char* cfn) {configFileName.replaceBuf(strDup(cfn));}
-void CConnOptions::setHost(const char* h) {host.replaceBuf(strDup(h));}
-void CConnOptions::setMonitor(const char* m) {monitor.replaceBuf(strDup(m));}
-
-void CConnOptions::setMenuKey(const char* keyName) {
-  if (!keyName[0]) {
-    menuKey = 0;
-  } else {
-    menuKey = VK_F8;
-    if (keyName[0] == 'F') {
-      UINT fKey = atoi(&keyName[1]);
-      if (fKey >= 1 && fKey <= 12)
-        menuKey = fKey-1 + VK_F1;
-    }
-  }
-}
-char* CConnOptions::menuKeyName() {
-  int fNum = (menuKey-VK_F1)+1;
-  if (fNum<1 || fNum>12)
-    return strDup("");
-  CharArray menuKeyStr(4);
-  sprintf(menuKeyStr.buf, "F%d", fNum);
-  return menuKeyStr.takeBuf();
-}
-
-
-CConnOptions& CConnOptions::operator=(const CConnOptions& o) {
-  useLocalCursor = o.useLocalCursor;
-  useDesktopResize = o.useDesktopResize;
-  fullScreen = o.fullScreen;
-  fullColour = o.fullColour;
-  lowColourLevel = o.lowColourLevel;
-  preferredEncoding = o.preferredEncoding;
-  autoSelect = o.autoSelect;
-  shared = o.shared;
-  sendPtrEvents = o.sendPtrEvents;
-  sendKeyEvents = o.sendKeyEvents;
-  clientCutText = o.clientCutText;
-  serverCutText = o.serverCutText;
-  disableWinKeys = o.disableWinKeys;
-  emulate3 = o.emulate3;
-  pointerEventInterval = o.pointerEventInterval;
-  protocol3_3 = o.protocol3_3;
-  acceptBell = o.acceptBell;
-  showToolbar = o.showToolbar;
-  setUserName(o.userName.buf);
-  setPassword(o.password.buf);
-  setConfigFileName(o.configFileName.buf);
-  setHost(o.host.buf);
-  setMonitor(o.monitor.buf);
-  menuKey = o.menuKey;
-  autoReconnect = o.autoReconnect;
-  customCompressLevel = o.customCompressLevel;
-  compressLevel = o.compressLevel;
-  noJpeg = o.noJpeg;
-  qualityLevel = o.qualityLevel;
-  autoScaling = o.autoScaling;
-  scale = o.scale;
-  secTypes = o.secTypes;
-
-  return *this;
-}
diff --git a/win/vncviewer/CConnOptions.h b/win/vncviewer/CConnOptions.h
deleted file mode 100644
index 76f0d68e..00000000
--- a/win/vncviewer/CConnOptions.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/* Copyright (C) 2002-2005 RealVNC Ltd.  All Rights Reserved.
- * 
- * This is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
- * USA.
- */
-
-// -=- CConnOptions.h
-
-// Definition of the CConnOptions class, responsible for storing the
-// current & requested VNC Viewer options.
-
-#ifndef __RFB_WIN32_CCONN_OPTIONS_H__
-#define __RFB_WIN32_CCONN_OPTIONS_H__
-
-#include <rdr/types.h>
-#include <rfb/Password.h>
-
-#include <list>
-
-namespace rfb {
-
-  namespace win32 {
-
-    //
-    // -=- Options structure.  Each viewer option has a corresponding
-    //     entry in CConnOptions.  The viewer options are set by calling
-    //     CConn::applyOptions(...)
-    //     The CConnOptions structure automatically picks up the default
-    //     value of each option from the Configuration system
-    //     The readFromFile and writeFromFile methods can be used to load
-    //     and save VNC configuration files.  readFromFile is backwards
-    //     compatible with 3.3 releases, while writeToFile is not.
-
-    class CConnOptions {
-    public:
-      CConnOptions();
-      CConnOptions(const CConnOptions& o) {operator=(o);}
-      CConnOptions& operator=(const CConnOptions& o);
-      void readFromFile(const char* filename_);
-      void writeToFile(const char* filename_);
-      void writeDefaults();
-      bool useLocalCursor;
-      bool useDesktopResize;
-      bool fullScreen;
-      bool fullColour;
-      int lowColourLevel;
-      int preferredEncoding;
-      bool autoSelect;
-      bool shared;
-      CharArray desktopSize;
-      bool sendPtrEvents;
-      bool sendKeyEvents;
-      bool showToolbar;
-      bool clientCutText;
-      bool serverCutText;
-      bool disableWinKeys;
-      bool emulate3;
-      int pointerEventInterval;
-      bool protocol3_3;
-      bool acceptBell;
-      bool autoScaling;
-      int scale;
-      std::list<rdr::U32> secTypes;
-      CharArray userName;
-      void setUserName(const char* user);
-      PlainPasswd password;
-      void setPassword(const char* pwd);
-      CharArray configFileName;
-      void setConfigFileName(const char* cfn);
-      CharArray host;
-      void setHost(const char* h);
-      CharArray monitor;
-      void setMonitor(const char* m);
-      unsigned int menuKey;
-      void setMenuKey(const char* keyName);
-      char* menuKeyName();
-      bool autoReconnect;
-
-      bool customCompressLevel;
-      int compressLevel;
-      bool noJpeg;
-      int qualityLevel;
-
-      CharArray passwordFile;
-    };
-
-
-  };
-
-};
-
-#endif
diff --git a/win/vncviewer/CConnThread.cxx b/win/vncviewer/CConnThread.cxx
deleted file mode 100644
index ea3a20a4..00000000
--- a/win/vncviewer/CConnThread.cxx
+++ /dev/null
@@ -1,197 +0,0 @@
-/* Copyright (C) 2002-2005 RealVNC Ltd.  All Rights Reserved.
- * 
- * This is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
- * USA.
- */
-
-// -=- CConnThread.cxx
-
-// A CConnThread instance is created for each new connection.
-// The CConnThread creates the corresponding CConn instance
-// and manages it.
-
-#include <stdlib.h>
-#include <rfb/LogWriter.h>
-#include <rfb_win32/MsgBox.h>
-#include <network/TcpSocket.h>
-#include <vncviewer/CConnThread.h>
-#include <vncviewer/CConn.h>
-#include <vncviewer/ConnectionDialog.h>
-#include <vncviewer/ConnectingDialog.h>
-#include <vncviewer/UserPasswdDialog.h>
-#include <set>
-
-using namespace rfb;
-using namespace win32;
-
-static LogWriter vlog("CConnThread");
-
-static std::set<CConnThread*> threads;
-static Mutex threadsLock;
-static Handle noMoreThreads(CreateEvent(0, TRUE, FALSE, 0));
-
-
-CConnThread::CConnThread() : Thread("CConnThread"), isConfig(false),
-                             sock(0), reverse(false) {
-  vlog.info("CConnThread (dialog)");
-  setDeleteAfterRun();
-  Lock l(threadsLock);
-  threads.insert(this);
-  start();
-}
-
-CConnThread::CConnThread(const char* hostOrConfig_, bool isConfig_)
- : Thread("CConnThread"), hostOrConfig(strDup(hostOrConfig_)),
-   isConfig(isConfig_), sock(0), reverse(false) {
-  vlog.info("CConnThread (host/port)");
-  setDeleteAfterRun();
-  Lock l(threadsLock);
-  threads.insert(this);
-  start();
-}
-
-CConnThread::CConnThread(network::Socket* sock_, bool reverse_)
- : Thread("CConnThread"), isConfig(false), sock(sock_), reverse(reverse_) {
-  vlog.info("CConnThread (reverse connection)");
-  setDeleteAfterRun();
-  Lock l(threadsLock);
-  threads.insert(this);
-  start();
-}
-
-CConnThread::~CConnThread() {
-  Lock l(threadsLock);
-  threads.erase(this);
-  if (threads.empty())
-    SetEvent(noMoreThreads);
-  delete sock;
-}
-
-
-void CConnThread::run() {
-  CConnOptions options;
-  bool reconnect;
-
-  do {
-    {
-      CConn conn;
-      reconnect = false;
-
-      // If there is no socket object then set the host & port info
-      if (!sock && !options.host.buf) {
-        try {
-          if (isConfig) {
-            // A configuration file name was specified - load it
-	    CharArray filename(hostOrConfig.takeBuf());
-            options.readFromFile(filename.buf);
-          } else {
-            // An actual hostname (and possibly port) was specified
-            options.host.replaceBuf(hostOrConfig.takeBuf());
-          }
-
-          if (!options.host.buf) {
-            // No host was specified - prompt for one
-            ConnectionDialog connDlg(&conn);
-            if (!connDlg.showDialog())
-              return;
-            options = conn.getOptions();
-            options.setHost(CStr(connDlg.hostname.buf));
-          }
-        } catch (rdr::Exception& e) {
-          MsgBox(0, TStr(e.str()), MB_ICONERROR | MB_OK);
-          return;
-        }
-      }
-
-      // Apply the connection options to the CConn
-      conn.applyOptions(options);
-
-      if (!sock) {
-        // There is no existing connection - better make one
-        const char* hostAndPort = conn.getOptions().host.buf;
-
-        try {
-          ConnectingDialog dlg;
-          sock = dlg.connect(hostAndPort);
-
-          // If the connection was cancelled by the user, just quit
-          if (!sock)
-            return;
-        } catch(rdr::Exception& e) {
-          MsgBox(NULL, TStr(e.str()), MB_ICONERROR | MB_OK);
-          return;
-        }
-
-        // Try to add the caller to the MRU
-        MRU::addToMRU(hostAndPort);
-      }
-
-      // Run the RFB protocol over the connected socket
-      conn.initialise(sock, reverse);
-      while (!conn.isClosed()) {
-        try {
-          conn.getInStream()->check(1,1);
-          conn.processMsg();
-        } catch (rdr::EndOfStream) {
-          if (conn.state() == CConnection::RFBSTATE_NORMAL)
-            conn.close();
-          else
-            conn.close("The connection closed unexpectedly");
-        } catch (rfb::AuthCancelledException) {
-          conn.close();
-        } catch (rfb::AuthFailureException& e) {
-          // Clear the password, in case we auto-reconnect
-          options = conn.getOptions();
-          options.password.replaceBuf(0);
-          conn.applyOptions(options);
-          conn.close(e.str());
-        } catch (rdr::Exception& e) {
-          conn.close(e.str());
-        }
-      }
-
-      // If there is a cause for closing the connection logged then display it
-      if (conn.closeReason()) {
-        reconnect = !reverse && conn.getOptions().autoReconnect;
-        if (!reconnect) {
-          MsgBox(0, TStr(conn.closeReason()), MB_ICONINFORMATION | MB_OK);
-        } else {
-          options = conn.getOptions();
-          const char* format = "%s\nDo you wish to attempt to reconnect to %s?";
-          CharArray message(strlen(conn.closeReason()) + strlen(format) +
-                            strlen(conn.getOptions().host.buf));
-          sprintf(message.buf, format, conn.closeReason(), conn.getOptions().host.buf);
-          if (MsgBox(0, TStr(message.buf), MB_ICONQUESTION | MB_YESNO | MB_DEFBUTTON2) != IDYES)
-            reconnect = false;
-        }
-      }
-    } // Exit the CConn's scope, implicitly destroying it & making it safe to delete the TcpSocket
-
-    // Clean up the old socket, if any
-    delete sock; sock = 0;
-  } while (reconnect);
-}
-
-
-BOOL CConnThread::getMessage(MSG* msg, HWND hwnd, UINT minMsg, UINT maxMsg) {
-  while (!PeekMessage(msg, hwnd, minMsg, maxMsg, PM_REMOVE)) {
-    DWORD result = MsgWaitForMultipleObjects(1, &noMoreThreads.h, FALSE, INFINITE, QS_ALLINPUT);
-    if (result == WAIT_OBJECT_0)
-      return FALSE;
-    else if (result == WAIT_FAILED)
-      throw rdr::SystemException("CConnThread::getMessage wait failed", GetLastError());
-  }
-  return msg->message != WM_QUIT;
-}
diff --git a/win/vncviewer/CConnThread.h b/win/vncviewer/CConnThread.h
deleted file mode 100644
index 7a8451c1..00000000
--- a/win/vncviewer/CConnThread.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Copyright (C) 2002-2005 RealVNC Ltd.  All Rights Reserved.
- * 
- * This is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
- * USA.
- */
-
-// -=- CConnThread.h
-
-// CConn-managing Thread implementation.
-
-#ifndef __RFB_WIN32_CCONN_THREAD_H__
-#define __RFB_WIN32_CCONN_THREAD_H__
-
-#include <network/Socket.h>
-#include <rfb/Threading.h>
-#include <rfb/util.h>
-
-namespace rfb {
-
-  namespace win32 {
-
-    class CConnThread : public Thread {
-    public:
-      CConnThread();
-      CConnThread(const char* hostOrConfig, bool isConfig=false);
-      CConnThread(network::Socket* sock, bool reverse=false);
-      ~CConnThread();
-
-      void run();
-
-      // Special getMessage call that returns FALSE if message is WM_QUIT,
-      // OR if there are no more CConnThreads running.
-      static BOOL getMessage(MSG* msg, HWND hwnd, UINT minMsg, UINT maxMsg);
-    protected:
-      CharArray hostOrConfig;
-      bool isConfig;
-      network::Socket* sock;
-      bool reverse;
-    };
-
-  };
-
-};
-
-#endif // __RFB_WIN32_CCONN_THREAD_H__
diff --git a/win/vncviewer/CMakeLists.txt b/win/vncviewer/CMakeLists.txt
deleted file mode 100644
index 7870a01e..00000000
--- a/win/vncviewer/CMakeLists.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-include_directories(${CMAKE_BINARY_DIR}/win)
-
-# Disable auto-generated manifests, since we have our own
-if(MSVC)
-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO")
-endif()
-
-add_executable(vncviewer WIN32
-  buildTime.cxx
-  CConn.cxx
-  CConnOptions.cxx
-  CConnThread.cxx
-  ConnectingDialog.cxx
-  ConnectionDialog.cxx
-  DesktopWindow.cxx
-  InfoDialog.cxx
-  OptionsDialog.cxx
-  UserPasswdDialog.cxx
-  ViewerToolBar.cxx
-  vncviewer.cxx
-  vncviewer.rc)
-
-set(VNCVIEWER_LIBRARIES rfb rfb_win32 Xregion network rdr)
-
-# When building with GnuTLS, librdr depends on ws2_32, so in order to make
-# MinGW happy, we need to put ws2_32 in librdr's target_link_libraries string,
-# not here.
-if(NOT GNUTLS_FOUND)
-  set(VNCVIEWER_LIBRARIES ${VNCVIEWER_LIBRARIES} ws2_32)
-endif()
-
-target_link_libraries(vncviewer ${VNCVIEWER_LIBRARIES})
-
-install(TARGETS vncviewer
-  RUNTIME DESTINATION .
-)
diff --git a/win/vncviewer/ConnectingDialog.cxx b/win/vncviewer/ConnectingDialog.cxx
deleted file mode 100644
index 7f52e991..00000000
--- a/win/vncviewer/ConnectingDialog.cxx
+++ /dev/null
@@ -1,161 +0,0 @@
-/* Copyright (C) 2002-2005 RealVNC Ltd.  All Rights Reserved.
- * Copyright (C) 2010 D. R. Commander.  All Rights Reserved.
- * 
- * This is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
- * USA.
- */
-
-// -=- ConnectingDialog.cxx
-
-#include <stdlib.h>
-#include <vncviewer/ConnectingDialog.h>
-#include <vncviewer/resource.h>
-#include <network/TcpSocket.h>
-#include <rfb/Threading.h>
-#include <rfb/Hostname.h>
-#include <map>
-
-using namespace rfb;
-using namespace rfb::win32;
-
-
-// ConnectingDialog callback
-static INT_PTR CALLBACK ConnectingDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam ) {
-  bool* activePtr = (bool*)GetWindowLongPtr(hwnd, GWLP_USERDATA);
-  switch (uMsg) {
-  case WM_INITDIALOG:
-    SetWindowLongPtr(hwnd, GWLP_USERDATA, lParam);
-    return TRUE;
-	case WM_COMMAND:
-	  switch (LOWORD(wParam)) {
-	  case IDCANCEL:
-      if (activePtr)
-        *activePtr = false;
-		  return TRUE;
-		}
-		break;
-	case WM_DESTROY:
-    if (activePtr)
-      *activePtr = false;
-	  return TRUE;
-	}
-	return 0;
-}
-
-
-// Global map, used by ConnectingDialog::Threads to call back to their owning
-// ConnectingDialogs, while coping with the fact that the owner may already have quit.
-static std::map<int, ConnectingDialog*> dialogs;
-static int nextDialogId = 0;
-static Mutex dialogsLock;
-
-
-// ConnectingDialog::Thread
-//   Attempts to connect to the specified host.  If the connection succeeds, the
-//   socket is saved in the owning ConnectingDialog, if still available, and the
-//   event is signalled.  If the connection fails, the Exception text is returned
-//   to the dialog.  If the dialog is already gone, the Exception/socket are discarded.
-//   NB: This thread class cleans itself up on exit - DO NOT join()!
-class ConnectingDialog::Thread : public rfb::Thread {
-public:
-  Thread(int dialogId_, const char* hostAndPort) : dialogId(dialogId_) {
-    setDeleteAfterRun();
-    getHostAndPort(hostAndPort, &host.buf, &port);
-  }
-  virtual void run() {
-    try {
-      returnSock(new network::TcpSocket(host.buf, port));
-    } catch (rdr::Exception& e) {
-      returnException(e);
-    }
-  }
-  void returnSock(network::Socket* s) {
-    Lock l(dialogsLock);
-    if (dialogs.count(dialogId)) {
-      dialogs[dialogId]->newSocket = s;
-      SetEvent(dialogs[dialogId]->readyEvent);
-    } else {
-      delete s;
-    }
-  }
-  void returnException(const rdr::Exception& e) {
-    Lock l(dialogsLock);
-    if (dialogs.count(dialogId)) {
-      dialogs[dialogId]->errMsg.replaceBuf(strDup(e.str()));
-      SetEvent(dialogs[dialogId]->readyEvent);
-    }
-  };
-  CharArray host;
-  int port;
-  int dialogId;
-};
-
-
-ConnectingDialog::ConnectingDialog() : dialog(0), newSocket(0), 
-                                       readyEvent(CreateEvent(0, TRUE, FALSE, 0)), dialogId(0) {
-}
-
-network::Socket* ConnectingDialog::connect(const char* hostAndPort) {
-  Thread* connectThread = 0;
-  bool active = true;
-  errMsg.replaceBuf(0);
-  newSocket = 0;
-
-  // Get a unique dialog identifier and create the dialog window
-  {
-    Lock l(dialogsLock);
-    dialogId = ++nextDialogId;
-    dialogs[dialogId] = this;
-    dialog = CreateDialogParam(GetModuleHandle(0),
-      MAKEINTRESOURCE(IDD_CONNECTING_DLG), 0, &ConnectingDlgProc, (LONG_PTR)&active);
-    ShowWindow(dialog, SW_SHOW);
-    ResetEvent(readyEvent);
-  }
-
-  // Create and start the connection thread
-  try {
-    connectThread = new Thread(dialogId, hostAndPort);
-    connectThread->start();
-  } catch (rdr::Exception& e) {
-    errMsg.replaceBuf(strDup(e.str()));
-    active = false;
-  }
-
-  // Process window messages until the connection thread signals readyEvent, or the dialog is cancelled
-  while (active && (MsgWaitForMultipleObjects(1, &readyEvent.h, FALSE, INFINITE, QS_ALLINPUT) == WAIT_OBJECT_0 + 1)) {
-    MSG msg;
-    while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE))
-      DispatchMessage(&msg);
-  }
-
-  // Remove this dialog from the table
-  //   NB: If the dialog was cancelled then the thread is still running, and will only
-  //       discover that we're gone when it looks up our unique Id in the dialog table.
-  {
-    Lock l(dialogsLock);
-    dialogs.erase(dialogId);
-  }
-
-  // Close the dialog window
-  DestroyWindow(dialog); dialog=0;
-
-  // Throw the exception, if there was one
-  if (errMsg.buf)
-    throw rdr::Exception(errMsg.buf);
-
-  // Otherwise, return the socket
-  //   NB: The socket will be null if the dialog was cancelled
-  return newSocket;
-}
diff --git a/win/vncviewer/ConnectingDialog.h b/win/vncviewer/ConnectingDialog.h
deleted file mode 100644
index c38b3a1b..00000000
--- a/win/vncviewer/ConnectingDialog.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Copyright (C) 2002-2005 RealVNC Ltd.  All Rights Reserved.
- * 
- * This is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
- * USA.
- */
-
-// -=- ConnectingDialog.h
-
-// ConnectingDialog instances are used to display a status dialog while a
-// connection attempt is in progress.  The connection attempt is performed
-// in a background thread by the ConnectingDialog, to allow the status dialog
-// to remain interactive.  If the dialog is cancelled then it will close and
-// the connection dialog will eventually tidy itself up.
-
-#ifndef __RFB_WIN32_CONNECTING_DLG_H__
-#define __RFB_WIN32_CONNECTING_DLG_H__
-
-#include <windows.h>
-#include <network/Socket.h>
-#include <rfb/util.h>
-#include <rfb_win32/Handle.h>
-
-namespace rfb {
-
-  namespace win32 {
-
-    class ConnectingDialog {
-    public:
-      ConnectingDialog();
-
-      // connect
-      //   Show a Connecting dialog and attempt to connect to the specified host
-      //   in the background.
-      //   If the connection succeeds then the Socket is returned.
-      //   If an error occurs, an Exception is thrown.
-      //   If the dialog is cancelled then null is returned.
-      network::Socket* connect(const char* hostAndPort);
-    protected:
-      HWND dialog;
-      network::Socket* newSocket;
-      CharArray errMsg;
-      Handle readyEvent;
-      int dialogId;
-
-      class Thread;
-      friend class Thread;
-    };
-
-  };
-
-};
-
-#endif
diff --git a/win/vncviewer/ConnectionDialog.cxx b/win/vncviewer/ConnectionDialog.cxx
deleted file mode 100644
index e73e8ec1..00000000
--- a/win/vncviewer/ConnectionDialog.cxx
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Copyright (C) 2002-2005 RealVNC Ltd.  All Rights Reserved.
- * 
- * This is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
- * USA.
- */
-
-#include <vncviewer/ConnectionDialog.h>
-#include <vncviewer/CConn.h>
-#include <vncviewer/resource.h>
-#include <rfb_win32/AboutDialog.h>
-
-#include <tchar.h>
-
-using namespace rfb;
-using namespace rfb::win32;
-
-
-ConnectionDialog::ConnectionDialog(CConn* conn_) : Dialog(GetModuleHandle(0)), conn(conn_) {
-}
-
-
-bool ConnectionDialog::showDialog() {
-  return Dialog::showDialog(MAKEINTRESOURCE(IDD_CONNECTION_DLG));
-}
-
-void ConnectionDialog::initDialog() {
-  HWND box = GetDlgItem(handle, IDC_SERVER_EDIT);
-
-  std::list<char*> mru = MRU::getEntries();
-  std::list<char*>::iterator i;
-
-  // Locate the combo-box
-  // NB: TCharArray converts the supplied char* and assumes ownership!
-  for (i=mru.begin(); i!=mru.end(); i++) {
-    SendMessage(box, CB_ADDSTRING, 0, (LPARAM)TCharArray(*i).buf);
-  }
-
-  // Select the first item in the list
-  SendMessage(box, CB_SETCURSEL, 0, 0);
-}
-
-
-bool ConnectionDialog::onOk() {
-  delete [] hostname.buf;
-  hostname.buf = 0;
-  hostname.buf = getItemString(IDC_SERVER_EDIT);
-  return hostname.buf[0] != 0;
-}
-
-bool ConnectionDialog::onCommand(int id, int cmd) {
-  switch (id) {
-  case IDC_ABOUT:
-    AboutDialog::instance.showDialog();
-    return true;
-  case IDC_OPTIONS:
-    conn->showOptionsDialog();
-    return true;
-  };
-  return false;
-}
diff --git a/win/vncviewer/ConnectionDialog.h b/win/vncviewer/ConnectionDialog.h
deleted file mode 100644
index f739280c..00000000
--- a/win/vncviewer/ConnectionDialog.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Copyright (C) 2002-2005 RealVNC Ltd.  All Rights Reserved.
- * 
- * This is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
- * USA.
- */
-
-// -=- ConnectionDialog.h
-
-// Connection dialog for VNC Viewer 4.0
-
-#ifndef __RFB_WIN32_CONN_DIALOG_H__
-#define __RFB_WIN32_CONN_DIALOG_H__
-
-#include <rfb_win32/Dialog.h>
-#include <vncviewer/MRU.h>
-#include <rfb/util.h>
-
-namespace rfb {
-
-  namespace win32 {
-
-    class CConn;
-
-    class ConnectionDialog : Dialog {
-    public:
-      ConnectionDialog(CConn* view);
-      virtual bool showDialog();
-      virtual void initDialog();
-      virtual bool onOk();
-      virtual bool onCommand(int id, int cmd);
-      TCharArray hostname;
-    protected:
-      CConn* conn;
-    };
-
-  };
-
-};
-
-#endif
diff --git a/win/vncviewer/DesktopWindow.cxx b/win/vncviewer/DesktopWindow.cxx
deleted file mode 100644
index fee0a1b0..00000000
--- a/win/vncviewer/DesktopWindow.cxx
+++ /dev/null
@@ -1,1350 +0,0 @@
-/* Copyright (C) 2002-2005 RealVNC Ltd.  All Rights Reserved.
- * Copyright (C) 2010-2011 D. R. Commander.  All Rights Reserved.
- * 
- * This is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
- * USA.
- */
-
-#include <windows.h>
-#include <commctrl.h>
-#include <math.h>
-#include <rfb/Configuration.h>
-#include <rfb/LogWriter.h>
-#include <rfb_win32/WMShatter.h>
-#include <rfb_win32/LowLevelKeyEvents.h>
-#include <rfb_win32/MonitorInfo.h>
-#include <rfb_win32/DeviceContext.h>
-#include <rfb_win32/Win32Util.h>
-#include <rfb_win32/MsgBox.h>
-#include <rfb/util.h>
-#include <vncviewer/DesktopWindow.h>
-#include <vncviewer/resource.h>
-
-using namespace rfb;
-using namespace rfb::win32;
-
-
-// - Statics & consts
-
-static LogWriter vlog("DesktopWindow");
-
-const int TIMER_BUMPSCROLL = 1;
-const int TIMER_POINTER_INTERVAL = 2;
-const int TIMER_POINTER_3BUTTON = 3;
-const int TIMER_UPDATE = 4;
-
-
-//
-// -=- DesktopWindowClass
-
-//
-// Window class used as the basis for all DesktopWindow instances
-//
-
-class DesktopWindowClass {
-public:
-  DesktopWindowClass();
-  ~DesktopWindowClass();
-  ATOM classAtom;
-  HINSTANCE instance;
-};
-
-LRESULT CALLBACK DesktopWindowProc(HWND wnd, UINT msg, WPARAM wParam, LPARAM lParam) {
-  LRESULT result = 0;
-  if (msg == WM_CREATE)
-    SetWindowLongPtr(wnd, GWLP_USERDATA, (LONG_PTR)((CREATESTRUCT*)lParam)->lpCreateParams);
-  else if (msg == WM_DESTROY)
-    SetWindowLongPtr(wnd, GWLP_USERDATA, 0);
-  DesktopWindow* _this = (DesktopWindow*) GetWindowLongPtr(wnd, GWLP_USERDATA);
-  if (!_this) {
-    vlog.info("null _this in %x, message %u", wnd, msg);
-    return rfb::win32::SafeDefWindowProc(wnd, msg, wParam, lParam);
-  }
-
-  try {
-    result = _this->processMessage(msg, wParam, lParam);
-  } catch (rfb::UnsupportedPixelFormatException &e) {
-    MsgBox(0, (TCHAR *) e.str(), MB_OK | MB_ICONINFORMATION);
-    _this->getCallback()->closeWindow();
-  } catch (rdr::Exception& e) {
-    vlog.error("untrapped: %s", e.str());
-  }
-
-  return result;
-};
-
-static HCURSOR dotCursor = (HCURSOR)LoadImage(GetModuleHandle(0), MAKEINTRESOURCE(IDC_DOT_CURSOR), IMAGE_CURSOR, 0, 0, LR_SHARED);
-static HCURSOR arrowCursor = (HCURSOR)LoadImage(NULL, IDC_ARROW, IMAGE_CURSOR, 0, 0, LR_SHARED); 
-
-DesktopWindowClass::DesktopWindowClass() : classAtom(0) {
-  WNDCLASS wndClass;
-  wndClass.style = 0;
-  wndClass.lpfnWndProc = DesktopWindowProc;
-  wndClass.cbClsExtra = 0;
-  wndClass.cbWndExtra = 0;
-  wndClass.hInstance = instance = GetModuleHandle(0);
-  wndClass.hIcon = (HICON)LoadImage(GetModuleHandle(0), MAKEINTRESOURCE(IDI_ICON), IMAGE_ICON, 0, 0, LR_SHARED);
-  if (!wndClass.hIcon)
-    printf("unable to load icon:%ld", GetLastError());
-  wndClass.hCursor = LoadCursor(NULL, IDC_ARROW);
-  wndClass.hbrBackground = NULL;
-  wndClass.lpszMenuName = 0;
-  wndClass.lpszClassName = _T("rfb::win32::DesktopWindowClass");
-  classAtom = RegisterClass(&wndClass);
-  if (!classAtom) {
-    throw rdr::SystemException("unable to register DesktopWindow window class", GetLastError());
-  }
-}
-
-DesktopWindowClass::~DesktopWindowClass() {
-  if (classAtom) {
-    UnregisterClass((const TCHAR*)classAtom, instance);
-  }
-}
-
-static DesktopWindowClass baseClass;
-
-//
-// -=- FrameClass
-
-//
-// Window class used for child windows that display pixel data
-//
-
-class FrameClass {
-public:
-  FrameClass();
-  ~FrameClass();
-  ATOM classAtom;
-  HINSTANCE instance;
-};
-
-LRESULT CALLBACK FrameProc(HWND wnd, UINT msg, WPARAM wParam, LPARAM lParam) {
-  LRESULT result = 0;
-  if (msg == WM_CREATE)
-    SetWindowLongPtr(wnd, GWLP_USERDATA, (LONG_PTR)((CREATESTRUCT*)lParam)->lpCreateParams);
-  else if (msg == WM_DESTROY)
-    SetWindowLongPtr(wnd, GWLP_USERDATA, 0);
-  DesktopWindow* _this = (DesktopWindow*) GetWindowLongPtr(wnd, GWLP_USERDATA);
-  if (!_this) {
-    vlog.info("null _this in %x, message %u", wnd, msg);
-    return rfb::win32::SafeDefWindowProc(wnd, msg, wParam, lParam);
-  }
-
-  try {
-    result = _this->processFrameMessage(msg, wParam, lParam);
-  } catch (rdr::Exception& e) {
-    vlog.error("untrapped: %s", e.str());
-  }
-
-  return result;
-}
-
-FrameClass::FrameClass() : classAtom(0) {
-  WNDCLASS wndClass;
-  wndClass.style = 0;
-  wndClass.lpfnWndProc = FrameProc;
-  wndClass.cbClsExtra = 0;
-  wndClass.cbWndExtra = 0;
-  wndClass.hInstance = instance = GetModuleHandle(0);
-  wndClass.hIcon = 0;
-  wndClass.hCursor = NULL;
-  wndClass.hbrBackground = NULL;
-  wndClass.lpszMenuName = 0;
-  wndClass.lpszClassName = _T("rfb::win32::FrameClass");
-  classAtom = RegisterClass(&wndClass);
-  if (!classAtom) {
-    throw rdr::SystemException("unable to register Frame window class", GetLastError());
-  }
-}
-
-FrameClass::~FrameClass() {
-  if (classAtom) {
-    UnregisterClass((const TCHAR*)classAtom, instance);
-  }
-}
-
-FrameClass frameClass;
-
-
-//
-// -=- DesktopWindow instance implementation
-//
-
-DesktopWindow::DesktopWindow(Callback* cb) 
-  : bumpScroll(false), palette_changed(false), fullscreenActive(false), 
-    fullscreenRestore(false), systemCursorVisible(true), trackingMouseLeave(false), 
-    cursorInBuffer(false), cursorVisible(false), cursorAvailable(false), 
-    internalSetCursor(false), cursorImage(0), cursorMask(0), 
-    cursorWidth(0), cursorHeight(0), showToolbar(false), 
-    buffer(0), has_focus(false), autoScaling(false), 
-    window_size(0, 0, 32, 32),  client_size(0, 0, 16, 16), handle(0), 
-    frameHandle(0), callback(cb) {
-
-  // Create the window
-  const char* name = "DesktopWindow";
-  handle = CreateWindow((const TCHAR*)baseClass.classAtom, TStr(name),
-    WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN,
-    0, 0, 10, 10, 0, 0, baseClass.instance, this);
-  if (!handle)
-    throw rdr::SystemException("unable to create WMNotifier window instance", GetLastError());
-  vlog.debug("created window \"%s\" (%x)", name, handle);
-
-  // Create the toolbar
-  tb.create(handle);
-  vlog.debug("created toolbar window \"%s\" (%x)", "ViewerToolBar", tb.getHandle());
-
-  // Create the frame window
-  frameHandle = CreateWindowEx(WS_EX_CLIENTEDGE, (const TCHAR*)frameClass.classAtom,
-    0, WS_CHILD | WS_CLIPSIBLINGS | WS_VISIBLE, CW_USEDEFAULT, CW_USEDEFAULT,
-    CW_USEDEFAULT, CW_USEDEFAULT, handle, 0, frameClass.instance, this);
-  if (!frameHandle) {
-    throw rdr::SystemException("unable to create rfb frame window instance", GetLastError());
-  }
-  vlog.debug("created window \"%s\" (%x)", "Frame Window", frameHandle);
-
-  // Initialise the CPointer pointer handler
-  ptr.setHWND(frameHandle);
-  ptr.setIntervalTimerId(TIMER_POINTER_INTERVAL);
-  ptr.set3ButtonTimerId(TIMER_POINTER_3BUTTON);
-
-  // Initialise the bumpscroll timer
-  bumpScrollTimer.setHWND(handle);
-  bumpScrollTimer.setId(TIMER_BUMPSCROLL);
-
-  // Initialise the update timer
-  updateTimer.setHWND(handle);
-  updateTimer.setId(TIMER_UPDATE);
-
-  // Hook the clipboard
-  clipboard.setNotifier(this);
-
-  // Create the backing buffer
-  buffer = new win32::ScaledDIBSectionBuffer(frameHandle);
-
-  // Show the window
-  centerWindow(handle, 0);
-  ShowWindow(handle, SW_SHOW);
-}
-
-DesktopWindow::~DesktopWindow() {
-  vlog.debug("~DesktopWindow");
-  showSystemCursor();
-  if (handle) {
-    disableLowLevelKeyEvents(handle);
-    DestroyWindow(handle);
-    handle = 0;
-  }
-  delete buffer;
-  if (cursorImage) delete [] cursorImage;
-  if (cursorMask) delete [] cursorMask;
-  vlog.debug("~DesktopWindow done");
-}
-
-
-void DesktopWindow::setFullscreen(bool fs) {
-  if (fs && !fullscreenActive) {
-    fullscreenActive = bumpScroll = true;
-
-    // Un-minimize the window if required
-    if (GetWindowLong(handle, GWL_STYLE) & WS_MINIMIZE)
-      ShowWindow(handle, SW_RESTORE);
-
-    // Save the current window position
-    GetWindowRect(handle, &fullscreenOldRect);
-
-    // Find the size of the virtual display
-    int cx = GetSystemMetrics(SM_CXVIRTUALSCREEN);
-    int cy = GetSystemMetrics(SM_CYVIRTUALSCREEN);
-    int x = GetSystemMetrics(SM_XVIRTUALSCREEN);
-    int y = GetSystemMetrics(SM_YVIRTUALSCREEN);
-
-    // Hide the toolbar
-    if (tb.isVisible())
-      tb.hide();
-    SetWindowLong(frameHandle, GWL_EXSTYLE, 0);
-
-    // Set the window full-screen
-    DWORD flags = GetWindowLong(handle, GWL_STYLE);
-    fullscreenOldFlags = flags;
-    flags = flags & ~(WS_CAPTION | WS_THICKFRAME | WS_MAXIMIZE | WS_MINIMIZE);
-    vlog.debug("flags=%x", flags);
-
-    SetWindowLong(handle, GWL_STYLE, flags);
-    SetWindowPos(handle, HWND_TOP, x, y, cx, cy, SWP_FRAMECHANGED);
-  } else if (!fs && fullscreenActive) {
-    fullscreenActive = bumpScroll = false;
-
-    // Show the toolbar
-    if (showToolbar)
-      tb.show();
-    SetWindowLong(frameHandle, GWL_EXSTYLE, WS_EX_CLIENTEDGE);
-
-    // Set the window non-fullscreen
-    SetWindowLong(handle, GWL_STYLE, fullscreenOldFlags);
-
-    // Set the window position
-    SetWindowPos(handle, HWND_NOTOPMOST,
-      fullscreenOldRect.left, fullscreenOldRect.top,
-      fullscreenOldRect.right - fullscreenOldRect.left, 
-      fullscreenOldRect.bottom - fullscreenOldRect.top,
-      SWP_FRAMECHANGED);
-  }
-
-  // Adjust the viewport offset to cope with change in size between FS
-  // and previous window state.
-  setViewportOffset(scrolloffset);
-}
-
-void DesktopWindow::setShowToolbar(bool st)
-{
-  showToolbar = st;
-  if (fullscreenActive) return;
-
-  RECT r;
-  GetWindowRect(handle, &r);
-  bool maximized = GetWindowLong(handle, GWL_STYLE) & WS_MAXIMIZE;
-
-  if (showToolbar && !tb.isVisible()) {
-    refreshToolbarButtons();
-    tb.show();
-    if (!maximized) r.bottom += tb.getHeight();
-  } else if (!showToolbar && tb.isVisible()) {
-    tb.hide();
-    if (!maximized) r.bottom -= tb.getHeight();
-  }
-  // Resize the chiled windows even if the parent window size 
-  // has not been changed (the main window is maximized)
-  if (maximized) SendMessage(handle, WM_SIZE, 0, 0);
-  else SetWindowPos(handle, NULL, 0, 0, r.right-r.left, r.bottom-r.top, SWP_NOMOVE | SWP_NOZORDER);
-}
-
-void DesktopWindow::refreshToolbarButtons() {
-  int scale = getDesktopScale();
-  if (scale <= 10) {
-    tb.enableButton(ID_ZOOM_IN, true);
-    tb.enableButton(ID_ZOOM_OUT, false);
-  } else if (scale >= 200) {
-    tb.enableButton(ID_ZOOM_IN, false);
-    tb.enableButton(ID_ZOOM_OUT, true);
-  } else {
-    tb.enableButton(ID_ZOOM_IN, true);
-    tb.enableButton(ID_ZOOM_OUT, true);
-  }
-  if (buffer->isScaling() || isAutoScaling()) tb.enableButton(ID_ACTUAL_SIZE, true);
-  else tb.enableButton(ID_ACTUAL_SIZE, false);
-  if (isAutoScaling()) tb.pressButton(ID_AUTO_SIZE, true);
-  else tb.pressButton(ID_AUTO_SIZE, false);
-}
-
-void DesktopWindow::setDisableWinKeys(bool dwk) {
-  // Enable low-level event hooking, so we get special keys directly
-  if (dwk)
-    enableLowLevelKeyEvents(handle);
-  else
-    disableLowLevelKeyEvents(handle);
-}
-
-
-void DesktopWindow::setMonitor(const char* monitor) {
-  MonitorInfo mi(monitor);
-  mi.moveTo(handle);
-}
-
-char* DesktopWindow::getMonitor() const {
-  MonitorInfo mi(handle);
-  return strDup(mi.szDevice);
-}
-
-
-bool DesktopWindow::setViewportOffset(const Point& tl) {
-  Point np = Point(__rfbmax(0, __rfbmin(tl.x, buffer->width()-client_size.width())),
-    __rfbmax(0, __rfbmin(tl.y, buffer->height()-client_size.height())));
-  Point delta = np.translate(scrolloffset.negate());
-  if (!np.equals(scrolloffset)) {
-    scrolloffset = np;
-    ScrollWindowEx(frameHandle, -delta.x, -delta.y, 0, 0, 0, 0, SW_INVALIDATE);
-    UpdateWindow(frameHandle);
-    return true;
-  }
-  return false;
-}
-
-
-bool DesktopWindow::processBumpScroll(const Point& pos)
-{
-  if (!bumpScroll) return false;
-  int bumpScrollPixels = 20;
-  bumpScrollDelta = Point();
-
-  if (pos.x == client_size.width()-1)
-    bumpScrollDelta.x = bumpScrollPixels;
-  else if (pos.x == 0)
-    bumpScrollDelta.x = -bumpScrollPixels;
-  if (pos.y == client_size.height()-1)
-    bumpScrollDelta.y = bumpScrollPixels;
-  else if (pos.y == 0)
-    bumpScrollDelta.y = -bumpScrollPixels;
-
-  if (bumpScrollDelta.x || bumpScrollDelta.y) {
-    if (bumpScrollTimer.isActive()) return true;
-    if (setViewportOffset(scrolloffset.translate(bumpScrollDelta))) {
-      bumpScrollTimer.start(25);
-      return true;
-    }
-  }
-
-  bumpScrollTimer.stop();
-  return false;
-}
-
-
-LRESULT
-DesktopWindow::processMessage(UINT msg, WPARAM wParam, LPARAM lParam) {
-  switch (msg) {
-
-    // -=- Process standard window messages
-
-  case WM_NOTIFY:
-    if (wParam == ID_TOOLBAR)
-      tb.processWM_NOTIFY(wParam, lParam);
-    break;
-
-  case WM_DISPLAYCHANGE:
-    // Display format has changed - notify callback
-    callback->displayChanged();
-    break;
-
-    // -=- Window position
-
-    // Prevent the window from being resized to be too large if in normal mode.
-    // If maximized or fullscreen the allow oversized windows.
-
-  case WM_WINDOWPOSCHANGING:
-    {
-      WINDOWPOS* wpos = (WINDOWPOS*)lParam;
-      if ((wpos->flags & SWP_NOSIZE) || isAutoScaling())
-        break;
-
-      // Calculate the minimum size of main window
-      RECT r;
-      Rect min_size;
-      int tbMinWidth = 0, tbMinHeight = 0;
-      if (isToolbarEnabled()) {
-        tbMinWidth = tb.getTotalWidth();
-        tbMinHeight = tb.getHeight();
-        SetRect(&r, 0, 0, tbMinWidth, tbMinHeight);
-        AdjustWindowRect(&r, GetWindowLong(handle, GWL_STYLE), FALSE);
-        min_size = Rect(r.left, r.top, r.right, r.bottom);
-      }
-
-      // Work out how big the window should ideally be
-      DWORD current_style = GetWindowLong(frameHandle, GWL_STYLE);
-      DWORD style = current_style & ~(WS_VSCROLL | WS_HSCROLL);
-      DWORD style_ex = GetWindowLong(frameHandle, GWL_EXSTYLE);
-
-      SetRect(&r, 0, 0, buffer->width(), buffer->height());
-      AdjustWindowRectEx(&r, style, FALSE, style_ex);
-      Rect reqd_size = Rect(r.left, r.top, r.right, r.bottom);
-      if (current_style & WS_VSCROLL)
-        reqd_size.br.x += GetSystemMetrics(SM_CXVSCROLL);
-      if (current_style & WS_HSCROLL)
-        reqd_size.br.y += GetSystemMetrics(SM_CXHSCROLL);
-
-      SetRect(&r, reqd_size.tl.x, reqd_size.tl.y, reqd_size.br.x, reqd_size.br.y);
-      if (isToolbarEnabled())
-        r.bottom += tb.getHeight();
-      AdjustWindowRect(&r, GetWindowLong(handle, GWL_STYLE), FALSE);
-      reqd_size = Rect(r.left, r.top, r.right, r.bottom);
-
-      RECT current;
-      GetWindowRect(handle, &current);
-
-      if (min_size.width() > reqd_size.width()) {
-        reqd_size.tl.x = min_size.tl.x;
-        reqd_size.br.x = min_size.br.x;
-      }
-      if (min_size.height() > reqd_size.height()) {
-        reqd_size.tl.y = min_size.tl.y;
-        reqd_size.br.y = min_size.br.y;
-      }
-
-      if (!(GetWindowLong(handle, GWL_STYLE) & WS_MAXIMIZE) && !fullscreenActive) {
-        // Ensure that the window isn't resized too large or too small
-        if ((wpos->cx < min_size.width()) && isToolbarEnabled()) {
-          wpos->cx = min_size.width();
-          wpos->x = current.left;
-        } else if ((wpos->cx > reqd_size.width())) {
-          wpos->cx = reqd_size.width();
-          wpos->x = current.left;
-        }
-        if ((wpos->cy < min_size.height()) && isToolbarEnabled()) {
-          wpos->cy = min_size.height();
-          wpos->y = current.top;
-        } else if (wpos->cy > reqd_size.height()) {
-          wpos->cy = reqd_size.height();
-          wpos->y = current.top;
-        }
-      }
-    }
-    break;
-
-    // Resize child windows and update window size info we have cached.
-
-  case WM_SIZE:
-    {
-      Point old_offset = desktopToClient(Point(0, 0));
-      RECT r;
-
-      // Resize child windows
-      GetClientRect(handle, &r);
-      if (tb.isVisible()) {
-        MoveWindow(frameHandle, 0, tb.getHeight(), r.right, r.bottom - tb.getHeight(), TRUE);
-      } else {
-        MoveWindow(frameHandle, 0, 0, r.right, r.bottom, TRUE);
-      }
-      tb.autoSize();
- 
-      // Update the cached sizing information
-      GetWindowRect(frameHandle, &r);
-      window_size = Rect(r.left, r.top, r.right, r.bottom);
-      GetClientRect(frameHandle, &r);
-      client_size = Rect(r.left, r.top, r.right, r.bottom);
-
-      // Perform the AutoScaling operation
-      if (isAutoScaling()) {
-        fitBufferToWindow(false);
-      } else {
-        // Determine whether scrollbars are required
-        calculateScrollBars();
-      }
-
-      // Redraw if required
-      if ((!old_offset.equals(desktopToClient(Point(0, 0)))) || isAutoScaling())
-        InvalidateRect(frameHandle, 0, TRUE);
-    }
-    break;
-
-    // -=- Bump-scrolling
-
-  case WM_TIMER:
-    switch (wParam) {
-    case TIMER_BUMPSCROLL:
-      if (!setViewportOffset(scrolloffset.translate(bumpScrollDelta)))
-        bumpScrollTimer.stop();
-      break;
-    case TIMER_POINTER_INTERVAL:
-    case TIMER_POINTER_3BUTTON:
-      ptr.handleTimer(callback, wParam);
-      break;
-    case TIMER_UPDATE:
-      updateWindow();
-      break;
-    }
-    break;
-
-    // -=- Track whether or not the window has focus
-
-  case WM_SETFOCUS:
-    has_focus = true;
-    break;
-  case WM_KILLFOCUS:
-    has_focus = false;
-    cursorOutsideBuffer();
-    // Restore the keyboard to a consistent state
-    kbd.releaseAllKeys(callback);
-    break;
-
-    // -=- If the menu is about to be shown, make sure it's up to date
-
-  case WM_INITMENU:
-    callback->refreshMenu(true);
-    break;
-
-    // -=- Handle the extra window menu items
-
-    // Pass system menu messages to the callback and only attempt
-    // to process them ourselves if the callback returns false.
-  case WM_SYSCOMMAND:
-    // Call the supplied callback
-    if (callback->sysCommand(wParam, lParam))
-      break;
-
-    // - Not processed by the callback, so process it as a system message
-    switch (wParam & 0xfff0) {
-
-      // When restored, ensure that full-screen mode is re-enabled if required.
-    case SC_RESTORE:
-      {
-      if (GetWindowLong(handle, GWL_STYLE) & WS_MINIMIZE) {
-        rfb::win32::SafeDefWindowProc(handle, msg, wParam, lParam);
-        setFullscreen(fullscreenRestore);
-      }
-      else if (fullscreenActive)
-        setFullscreen(false);
-      else
-        rfb::win32::SafeDefWindowProc(handle, msg, wParam, lParam);
-
-      return 0;
-      }
-
-      // If we are maximized or minimized then that cancels full-screen mode.
-    case SC_MINIMIZE:
-    case SC_MAXIMIZE:
-      fullscreenRestore = fullscreenActive;
-      setFullscreen(false);
-      break;
-
-    }
-    break;
-
-    // Treat all menu commands as system menu commands
-  case WM_COMMAND:
-    SendMessage(handle, WM_SYSCOMMAND, wParam, lParam);
-    return 0;
-
-    // -=- Handle keyboard input
-
-  case WM_KEYUP:
-  case WM_KEYDOWN:
-    // Hook the MenuKey to pop-up the window menu
-    if (menuKey && (wParam == menuKey)) {
-
-      bool ctrlDown = (GetAsyncKeyState(VK_CONTROL) & 0x8000) != 0;
-      bool altDown = (GetAsyncKeyState(VK_MENU) & 0x8000) != 0;
-      bool shiftDown = (GetAsyncKeyState(VK_SHIFT) & 0x8000) != 0;
-      if (!(ctrlDown || altDown || shiftDown)) {
-
-        // If MenuKey is being released then pop-up the menu
-        if ((msg == WM_KEYDOWN)) {
-          // Make sure it's up to date
-          //
-          // NOTE: Here we call refreshMenu only to grey out Move and Size
-          //       menu items. Other things will be refreshed once again
-          //       while processing the WM_INITMENU message.
-          //
-          callback->refreshMenu(false);
-
-          // Show it under the pointer
-          POINT pt;
-          GetCursorPos(&pt);
-          cursorInBuffer = false;
-          TrackPopupMenu(GetSystemMenu(handle, FALSE),
-            TPM_CENTERALIGN | TPM_VCENTERALIGN, pt.x, pt.y, 0, handle, 0);
-        }
-
-        // Ignore the MenuKey keypress for both press & release events
-        return 0;
-      }
-    }
-	case WM_SYSKEYDOWN:
-	case WM_SYSKEYUP:
-    kbd.keyEvent(callback, wParam, lParam, (msg == WM_KEYDOWN) || (msg == WM_SYSKEYDOWN));
-    return 0;
-
-    // -=- Handle mouse wheel scroll events
-
-#ifdef WM_MOUSEWHEEL
-  case WM_MOUSEWHEEL:
-    processMouseMessage(msg, wParam, lParam);
-    break;
-#endif
-
-    // -=- Handle the window closing
-
-  case WM_CLOSE:
-    vlog.debug("WM_CLOSE %x", handle);
-    callback->closeWindow();
-    break;
-
-  }
-
-  return rfb::win32::SafeDefWindowProc(handle, msg, wParam, lParam);
-}
-
-LRESULT
-DesktopWindow::processFrameMessage(UINT msg, WPARAM wParam, LPARAM lParam) {
-  switch (msg) {
-
-    // -=- Paint the remote frame buffer
-
-  case WM_PAINT:
-    {
-      PAINTSTRUCT ps;
-      HDC paintDC = BeginPaint(frameHandle, &ps);
-      if (!paintDC)
-        throw rdr::SystemException("unable to BeginPaint", GetLastError());
-      Rect pr = Rect(ps.rcPaint.left, ps.rcPaint.top, ps.rcPaint.right, ps.rcPaint.bottom);
-
-      if (!pr.is_empty()) {
-
-        // Draw using the correct palette
-        PaletteSelector pSel(paintDC, windowPalette.getHandle());
-
-        if (buffer->bitmap) {
-          // Update the bitmap's palette
-          if (palette_changed) {
-            palette_changed = false;
-            buffer->refreshPalette();
-          }
-
-          // Get device context
-          BitmapDC bitmapDC(paintDC, buffer->bitmap);
-
-          // Blit the border if required
-          Rect bufpos = desktopToClient(buffer->getRect());
-          if (!pr.enclosed_by(bufpos)) {
-            vlog.debug("draw border");
-            HBRUSH black = (HBRUSH) GetStockObject(BLACK_BRUSH);
-            RECT r;
-            SetRect(&r, 0, 0, bufpos.tl.x, client_size.height()); FillRect(paintDC, &r, black);
-            SetRect(&r, bufpos.tl.x, 0, bufpos.br.x, bufpos.tl.y); FillRect(paintDC, &r, black);
-            SetRect(&r, bufpos.br.x, 0, client_size.width(), client_size.height()); FillRect(paintDC, &r, black);
-            SetRect(&r, bufpos.tl.x, bufpos.br.y, bufpos.br.x, client_size.height()); FillRect(paintDC, &r, black);
-          }
-
-          // Do the blit
-          Point buf_pos = clientToDesktop(pr.tl);
-
-          if (!BitBlt(paintDC, pr.tl.x, pr.tl.y, pr.width(), pr.height(),
-                      bitmapDC, buf_pos.x, buf_pos.y, SRCCOPY))
-            throw rdr::SystemException("unable to BitBlt to window", GetLastError());
-        }
-      }
-
-      EndPaint(frameHandle, &ps);
-    }
-    return 0;
-
-    // -=- Palette management
-
-  case WM_PALETTECHANGED:
-    vlog.debug("WM_PALETTECHANGED");
-    if ((HWND)wParam == frameHandle) {
-      vlog.debug("ignoring");
-      break;
-    }
-  case WM_QUERYNEWPALETTE:
-    vlog.debug("re-selecting palette");
-    {
-      WindowDC wdc(frameHandle);
-      PaletteSelector pSel(wdc, windowPalette.getHandle());
-      if (pSel.isRedrawRequired()) {
-        InvalidateRect(frameHandle, 0, FALSE);
-        UpdateWindow(frameHandle);
-      }
-    }
-    return TRUE;
-
-  case WM_VSCROLL:
-  case WM_HSCROLL: 
-    {
-      Point delta;
-      int newpos = (msg == WM_VSCROLL) ? scrolloffset.y : scrolloffset.x;
-
-      switch (LOWORD(wParam)) {
-      case SB_PAGEUP: newpos -= 50; break;
-      case SB_PAGEDOWN: newpos += 50; break;
-      case SB_LINEUP: newpos -= 5; break;
-      case SB_LINEDOWN: newpos += 5; break;
-      case SB_THUMBTRACK:
-      case SB_THUMBPOSITION: newpos = HIWORD(wParam); break;
-      default: vlog.info("received unknown scroll message");
-      };
-
-      if (msg == WM_HSCROLL)
-        setViewportOffset(Point(newpos, scrolloffset.y));
-      else
-        setViewportOffset(Point(scrolloffset.x, newpos));
-  
-      SCROLLINFO si;
-      si.cbSize = sizeof(si); 
-      si.fMask  = SIF_POS; 
-      si.nPos   = newpos; 
-      SetScrollInfo(frameHandle, (msg == WM_VSCROLL) ? SB_VERT : SB_HORZ, &si, TRUE); 
-    }
-    break;
-
-    // -=- Cursor shape/visibility handling
-
-  case WM_SETCURSOR:
-    if (LOWORD(lParam) != HTCLIENT)
-      break;
-    SetCursor(cursorInBuffer ? dotCursor : arrowCursor);
-    return TRUE;
-
-  case WM_MOUSELEAVE:
-    trackingMouseLeave = false;
-    cursorOutsideBuffer();
-    return 0;
-
-    // -=- Mouse input handling
-
-  case WM_MOUSEMOVE:
-  case WM_LBUTTONUP:
-  case WM_MBUTTONUP:
-  case WM_RBUTTONUP:
-  case WM_LBUTTONDOWN:
-  case WM_MBUTTONDOWN:
-  case WM_RBUTTONDOWN:
-    processMouseMessage(msg, wParam, lParam);
-    break;
-  }
-
-  return rfb::win32::SafeDefWindowProc(frameHandle, msg, wParam, lParam);
-}
-
-void
-DesktopWindow::processMouseMessage(UINT msg, WPARAM wParam, LPARAM lParam)
-{
-  if (!has_focus) {
-    cursorOutsideBuffer();
-    return;
-  }
-
-  if (!trackingMouseLeave) {
-    TRACKMOUSEEVENT tme;
-    tme.cbSize = sizeof(TRACKMOUSEEVENT);
-    tme.dwFlags = TME_LEAVE;
-    tme.hwndTrack = frameHandle;
-    _TrackMouseEvent(&tme);
-    trackingMouseLeave = true;
-  }
-  int mask = 0;
-  if (LOWORD(wParam) & MK_LBUTTON) mask |= 1;
-  if (LOWORD(wParam) & MK_MBUTTON) mask |= 2;
-  if (LOWORD(wParam) & MK_RBUTTON) mask |= 4;
-
-#ifdef WM_MOUSEWHEEL
-  if (msg == WM_MOUSEWHEEL) {
-    int delta = (short)HIWORD(wParam);
-    int repeats = (abs(delta)+119) / 120;
-    int wheelMask = (delta > 0) ? 8 : 16;
-    vlog.debug("repeats %d, mask %d\n",repeats,wheelMask);
-    for (int i=0; i<repeats; i++) {
-      ptr.pointerEvent(callback, oldpos, mask | wheelMask);
-      ptr.pointerEvent(callback, oldpos, mask);
-    }
-  } else {
-#endif
-    Point clientPos = Point(LOWORD(lParam), HIWORD(lParam));
-    Point p = clientToDesktop(clientPos);
-
-    // If the mouse is not within the server buffer area, do nothing
-    cursorInBuffer = buffer->getRect().contains(p);
-    if (!cursorInBuffer) {
-      cursorOutsideBuffer();
-      return;
-    }
-
-    // If we're locally rendering the cursor then redraw it
-    if (cursorAvailable) {
-      // - Render the cursor!
-      if (!p.equals(cursorPos)) {
-        hideLocalCursor();
-        cursorPos = p;
-        showLocalCursor();
-        if (cursorVisible)
-          hideSystemCursor();
-      }
-    }
-
-    // If we are doing bump-scrolling then try that first...
-    if (processBumpScroll(clientPos))
-      return;
-
-    // Send a pointer event to the server
-    oldpos = p;
-    if (buffer->isScaling()) {
-      p.x /= buffer->getScaleRatioX();
-      p.y /= buffer->getScaleRatioY();
-    }
-    ptr.pointerEvent(callback, p, mask);
-#ifdef WM_MOUSEWHEEL
-  }
-#endif
-}
-
-void DesktopWindow::updateWindow()
-{
-  Rect rect;
-
-  updateTimer.stop();
-
-  rect = damage.get_bounding_rect();
-  damage.clear();
-
-  RECT invalid = {rect.tl.x, rect.tl.y, rect.br.x, rect.br.y};
-  InvalidateRect(frameHandle, &invalid, FALSE);
-}
-
-void
-DesktopWindow::hideLocalCursor() {
-  // - Blit the cursor backing store over the cursor
-  // *** ALWAYS call this BEFORE changing buffer PF!!!
-  if (cursorVisible) {
-    cursorVisible = false;
-    buffer->DIBSectionBuffer::imageRect(cursorBackingRect, cursorBacking.data);
-    invalidateDesktopRect(cursorBackingRect, false);
-  }
-}
-
-void
-DesktopWindow::showLocalCursor() {
-  if (cursorAvailable && !cursorVisible && cursorInBuffer) {
-    if (!buffer->getScaledPixelFormat().equal(cursor.getPF()) ||
-      cursor.getRect().is_empty()) {
-      vlog.info("attempting to render invalid local cursor");
-      cursorAvailable = false;
-      showSystemCursor();
-      return;
-    }
-    cursorVisible = true;
-    
-    cursorBackingRect = cursor.getRect().translate(cursorPos).translate(cursor.hotspot.negate());
-    cursorBackingRect = cursorBackingRect.intersect(buffer->getRect());
-    buffer->getImage(cursorBacking.data, cursorBackingRect);
-
-    renderLocalCursor();
-
-    invalidateDesktopRect(cursorBackingRect, false);
-    // Since we render the cursor onto the framebuffer, we need to update
-    // right away to get a responsive cursor.
-    updateWindow();
-  }
-}
-
-void DesktopWindow::cursorOutsideBuffer()
-{
-  cursorInBuffer = false;
-  hideLocalCursor();
-  showSystemCursor();
-}
-
-void
-DesktopWindow::renderLocalCursor()
-{
-  Rect r = cursor.getRect();
-  r = r.translate(cursorPos).translate(cursor.hotspot.negate());
-  buffer->DIBSectionBuffer::maskRect(r, cursor.data, cursor.mask.buf);
-}
-
-void
-DesktopWindow::hideSystemCursor() {
-  if (systemCursorVisible) {
-    vlog.debug("hide system cursor");
-    systemCursorVisible = false;
-    ShowCursor(FALSE);
-  }
-}
-
-void
-DesktopWindow::showSystemCursor() {
-  if (!systemCursorVisible) {
-    vlog.debug("show system cursor");
-    systemCursorVisible = true;
-    ShowCursor(TRUE);
-  }
-}
-
-
-bool
-DesktopWindow::invalidateDesktopRect(const Rect& crect, bool scaling) {
-  Rect rect;
-  if (buffer->isScaling() && scaling) {
-    rect = desktopToClient(buffer->calculateScaleBoundary(crect));
-  } else rect = desktopToClient(crect);
-  if (rect.intersect(client_size).is_empty()) return false;
-  damage.assign_union(rfb::Region(rect));
-  if (!updateTimer.isActive())
-    updateTimer.start(100);
-  return true;
-}
-
-
-void
-DesktopWindow::notifyClipboardChanged(const char* text, int len) {
-  callback->clientCutText(text, len);
-}
-
-
-void
-DesktopWindow::setPF(const PixelFormat& pf) {
-  // If the cursor is the wrong format then clear it
-  if (!pf.equal(buffer->getScaledPixelFormat()))
-    setCursor(0, 0, Point(), 0, 0);
-
-  // Update the desktop buffer
-  buffer->setPF(pf);
-  
-  // Redraw the window
-  InvalidateRect(frameHandle, 0, FALSE);
-}
-
-void
-DesktopWindow::setSize(int w, int h) {
-  vlog.debug("setSize %dx%d", w, h);
-
-  // If the locally-rendered cursor is visible then remove it
-  hideLocalCursor();
-
-  // Resize the backing buffer
-  buffer->setSize(w, h);
-
-  // Calculate the pixel buffer aspect correlation. It's used
-  // for the autoScaling operation.
-  aspect_corr = (double)w / h;
-
-  // If the window is not maximised or full-screen then resize it
-  if (!(GetWindowLong(handle, GWL_STYLE) & WS_MAXIMIZE) && !fullscreenActive) {
-    // Resize the window to the required size
-    RECT r = {0, 0, w, h};
-    AdjustWindowRectEx(&r, GetWindowLong(frameHandle, GWL_STYLE), FALSE,
-                       GetWindowLong(frameHandle, GWL_EXSTYLE));
-    if (isToolbarEnabled())
-      r.bottom += tb.getHeight();
-    AdjustWindowRect(&r, GetWindowLong(handle, GWL_STYLE), FALSE);
-
-    // Resize about the center of the window, and clip to current monitor
-    MonitorInfo mi(handle);
-    resizeWindow(handle, r.right-r.left, r.bottom-r.top);
-    mi.clipTo(handle);
-  } else {
-    // Ensure the screen contents are consistent
-    InvalidateRect(frameHandle, 0, FALSE);
-  }
-
-  // Enable/disable scrollbars as appropriate
-  calculateScrollBars();
-}
-
-void DesktopWindow::setAutoScaling(bool as) { 
-  autoScaling = as;
-  if (isToolbarEnabled()) refreshToolbarButtons();
-  if (as) fitBufferToWindow();
-}
-
-void DesktopWindow::setDesktopScale(int scale_) {
-  if (buffer->getScale() == scale_ || scale_ <= 0) return;
-  bool state = buffer->isScaling();
-  buffer->setScale(scale_);
-  state ^= buffer->isScaling();
-  if (state) convertCursorToBuffer();
-  if (isToolbarEnabled()) refreshToolbarButtons();
-  if (!(isAutoScaling() || isFullscreen() || (GetWindowLong(handle, GWL_STYLE) & WS_MAXIMIZE))) resizeDesktopWindowToBuffer();
-  printScale();
-  InvalidateRect(frameHandle, 0, FALSE);
-}
-
-void DesktopWindow::setDesktopScaleFilter(unsigned int scaleFilterID) { 
-  if (scaleFilterID == getDesktopScaleFilterID() || scaleFilterID > scaleFilterMaxNumber) return;
-  buffer->setScaleFilter(scaleFilterID);
-  InvalidateRect(frameHandle, 0, FALSE);
-}
-
-void DesktopWindow::convertCursorToBuffer() {
-  if (memcmp(&(cursor.getPF()), &(buffer->getPF()), sizeof(PixelBuffer)) == 0) return;
-  internalSetCursor = true;
-  setCursor(cursorWidth, cursorHeight, cursorHotspot, cursorImage, cursorMask);
-  internalSetCursor = false;
-}
-
-void DesktopWindow::fitBufferToWindow(bool repaint) {
-  double scale_ratio;
-  double resized_aspect_corr = double(client_size.width()) / client_size.height();
-  DWORD style = GetWindowLong(frameHandle, GWL_STYLE);
-  if (style & (WS_VSCROLL | WS_HSCROLL)) {
-    style &= ~(WS_VSCROLL | WS_HSCROLL);
-    SetWindowLong(frameHandle, GWL_STYLE, style);
-    SetWindowPos(frameHandle, NULL, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_FRAMECHANGED);
-    // Update the cached client size
-    RECT r;
-    GetClientRect(frameHandle, &r);
-    client_size = Rect(r.left, r.top, r.right, r.bottom);
-  }
-  bool state = buffer->isScaling();
-  if (resized_aspect_corr > aspect_corr) {
-    scale_ratio = (double)client_size.height() / buffer->getSrcHeight();
-    buffer->setScaleWindowSize(ceil(buffer->getSrcWidth()*scale_ratio), client_size.height());
-  } else { 
-    scale_ratio = (double)client_size.width() / buffer->getSrcWidth();
-    buffer->setScaleWindowSize(client_size.width(), ceil(buffer->getSrcHeight()*scale_ratio));
-  }
-  state ^= buffer->isScaling();
-  if (state) convertCursorToBuffer();
-  printScale();
-  InvalidateRect(frameHandle, 0, FALSE);
-}
-
-void DesktopWindow::printScale() {
-  setName(desktopName);
-}
-
-void
-DesktopWindow::setCursor(int w, int h, const Point& hotspot, void* data, void* mask) {
-  hideLocalCursor();
-
-  cursor.hotspot = hotspot;
-
-  cursor.setSize(w, h);
-  cursor.setPF(buffer->getScaledPixelFormat());
-
-  // Convert the current cursor pixel format to bpp32 if scaling mode is on.
-  // It need because ScaledDIBSection buffer always works with bpp32 pixel data
-  // in scaling mode.
-  if (buffer->isScaling()) {
-    U8 *ptr = (U8*)cursor.data;
-    U8 *dataPtr = (U8*)data;
-    U32 pixel = 0;
-    int bytesPerPixel = buffer->getPixelFormat().bpp / 8;
-    int pixelCount = w * h;
-    PixelFormat pf = buffer->getPixelFormat();
-
-    while (pixelCount--) {
-      if (bytesPerPixel == 1) {
-        pixel = *dataPtr++;
-      } else if (bytesPerPixel == 2) {
-        int b0 = *dataPtr++; int b1 = *dataPtr++;
-        pixel =  b1 << 8 | b0;
-      } else if (bytesPerPixel == 4) {
-        int b0 = *dataPtr++; int b1 = *dataPtr++;
-        int b2 = *dataPtr++; int b3 = *dataPtr++;
-        pixel = b3 << 24 | b2 << 16 | b1 << 8 | b0;
-      } else {
-        pixel = 0;
-      }
-      *ptr++ = (U8)((((pixel >> pf.blueShift ) & pf.blueMax ) * 255 + pf.blueMax /2) / pf.blueMax);
-      *ptr++ = (U8)((((pixel >> pf.greenShift) & pf.greenMax) * 255 + pf.greenMax/2) / pf.greenMax);
-      *ptr++ = (U8)((((pixel >> pf.redShift  ) & pf.redMax  ) * 255 + pf.redMax  /2) / pf.redMax);
-      *ptr++ = (U8)0;
-    }
-  } else {
-    cursor.imageRect(cursor.getRect(), data);
-  }
-  memcpy(cursor.mask.buf, mask, cursor.maskLen());
-  cursor.crop();
-
-  cursorBacking.setSize(w, h);
-  cursorBacking.setPF(buffer->getScaledPixelFormat());
-
-  cursorAvailable = true;
-
-  showLocalCursor();
-
-  // Save the cursor parameters
-  if (!internalSetCursor) {
-    if (cursorImage) delete [] cursorImage;
-    if (cursorMask) delete [] cursorMask;
-    int cursorImageSize = (buffer->getPixelFormat().bpp/8) * w * h; 
-    cursorImage = new U8[cursorImageSize];
-    cursorMask = new U8[cursor.maskLen()];
-    memcpy(cursorImage, data, cursorImageSize);
-    memcpy(cursorMask, mask, cursor.maskLen());
-    cursorWidth = w;
-    cursorHeight = h;
-    cursorHotspot = hotspot;
-  }
-}
-
-PixelFormat
-DesktopWindow::getNativePF() const {
-  vlog.debug("getNativePF()");
-  return WindowDC(handle).getPF();
-}
-
-
-void
-DesktopWindow::refreshWindowPalette(int start, int count) {
-  vlog.debug("refreshWindowPalette(%d, %d)", start, count);
-
-  Colour colours[256];
-  if (count > 256) {
-    vlog.debug("%d palette entries", count);
-    throw rdr::Exception("too many palette entries");
-  }
-
-  // Copy the palette from the DIBSectionBuffer
-  ColourMap* cm = buffer->getColourMap();
-  if (!cm) return;
-  for (int i=0; i<count; i++) {
-    int r, g, b;
-    cm->lookup(i, &r, &g, &b);
-    colours[i].r = r;
-    colours[i].g = g;
-    colours[i].b = b;
-  }
-
-  // Set the window palette
-  windowPalette.setEntries(start, count, colours);
-
-  // Cause the window to be redrawn
-  palette_changed = true;
-  InvalidateRect(handle, 0, FALSE);
-}
-
-
-void DesktopWindow::calculateScrollBars() {
-  // Calculate the required size of window
-  DWORD current_style = GetWindowLong(frameHandle, GWL_STYLE);
-  DWORD style = current_style & ~(WS_VSCROLL | WS_HSCROLL);
-  DWORD style_ex = GetWindowLong(frameHandle, GWL_EXSTYLE);
-  DWORD old_style;
-  RECT r;
-  SetRect(&r, 0, 0, buffer->width(), buffer->height());
-  AdjustWindowRectEx(&r, style, FALSE, style_ex);
-  Rect reqd_size = Rect(r.left, r.top, r.right, r.bottom);
-
-  if (!bumpScroll) {
-    // We only enable scrollbars if bump-scrolling is not active.
-    // Effectively, this means if full-screen is not active,
-    // but I think it's better to make these things explicit.
-    
-    // Work out whether scroll bars are required
-    do {
-      old_style = style;
-
-      if (!(style & WS_HSCROLL) && (reqd_size.width() > window_size.width())) {
-        style |= WS_HSCROLL;
-        reqd_size.br.y += GetSystemMetrics(SM_CXHSCROLL);
-      }
-      if (!(style & WS_VSCROLL) && (reqd_size.height() > window_size.height())) {
-        style |= WS_VSCROLL;
-        reqd_size.br.x += GetSystemMetrics(SM_CXVSCROLL);
-      }
-    } while (style != old_style);
-  }
-
-  // Tell Windows to update the window style & cached settings
-  if (style != current_style) {
-    SetWindowLong(frameHandle, GWL_STYLE, style);
-    SetWindowPos(frameHandle, NULL, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_FRAMECHANGED);
-  }
-
-  // Update the scroll settings
-  SCROLLINFO si;
-  if (style & WS_VSCROLL) {
-    si.cbSize = sizeof(si); 
-    si.fMask  = SIF_RANGE | SIF_PAGE | SIF_POS; 
-    si.nMin   = 0; 
-    si.nMax   = buffer->height(); 
-    si.nPage  = buffer->height() - (reqd_size.height() - window_size.height()); 
-    maxscrolloffset.y = __rfbmax(0, si.nMax-si.nPage);
-    scrolloffset.y = __rfbmin(maxscrolloffset.y, scrolloffset.y);
-    si.nPos   = scrolloffset.y;
-    SetScrollInfo(frameHandle, SB_VERT, &si, TRUE);
-  }
-  if (style & WS_HSCROLL) {
-    si.cbSize = sizeof(si); 
-    si.fMask  = SIF_RANGE | SIF_PAGE | SIF_POS; 
-    si.nMin   = 0;
-    si.nMax   = buffer->width(); 
-    si.nPage  = buffer->width() - (reqd_size.width() - window_size.width()); 
-    maxscrolloffset.x = __rfbmax(0, si.nMax-si.nPage);
-    scrolloffset.x = __rfbmin(maxscrolloffset.x, scrolloffset.x);
-    si.nPos   = scrolloffset.x;
-    SetScrollInfo(frameHandle, SB_HORZ, &si, TRUE);
-  }
-
-  // Update the cached client size
-  GetClientRect(frameHandle, &r);
-  client_size = Rect(r.left, r.top, r.right, r.bottom);
-}
-
-void DesktopWindow::resizeDesktopWindowToBuffer() {
-  RECT r;
-  DWORD style = GetWindowLong(frameHandle, GWL_STYLE) & ~(WS_VSCROLL | WS_HSCROLL);
-  DWORD style_ex = GetWindowLong(frameHandle, GWL_EXSTYLE);
-
-  // Calculate the required size of the desktop window
-  SetRect(&r, 0, 0, buffer->width(), buffer->height());
-  AdjustWindowRectEx(&r, style, FALSE, style_ex);
-  if (isToolbarEnabled())
-    r.bottom += tb.getHeight();
-  AdjustWindowRect(&r, GetWindowLong(handle, GWL_STYLE), FALSE);
-
-  // Set the required size, center the main window and clip to the current monitor
-  SetWindowPos(handle, 0, 0, 0, r.right-r.left, r.bottom-r.top, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOZORDER | SWP_NOMOVE);
-  centerWindow(handle, NULL);
-  MonitorInfo mi(getMonitor());
-  mi.clipTo(handle);
-
-  // Enable/disable scrollbars as appropriate
-  calculateScrollBars();      
-}
-
-
-void DesktopWindow::framebufferUpdateEnd()
-{
-  updateWindow();
-}
-
-
-void
-DesktopWindow::setName(const char* name) {
-  if (name != desktopName) {
-    strCopy(desktopName, name, sizeof(desktopName));
-  }
-  char *newTitle = new char[strlen(desktopName)+20];
-  sprintf(newTitle, "TigerVNC: %.240s @ %i%%", desktopName, getDesktopScale());
-  SetWindowText(handle, TStr(newTitle));
-  delete [] newTitle;
-}
-
-
-void
-DesktopWindow::serverCutText(const char* str, rdr::U32 len) {
-  CharArray t(len+1);
-  memcpy(t.buf, str, len);
-  t.buf[len] = 0;
-  clipboard.setClipText(t.buf);
-}
-
-
-void DesktopWindow::fillRect(const Rect& r, Pixel pix) {
-  Rect img_rect = buffer->isScaling() ? buffer->calculateScaleBoundary(r) : r;
-  if (cursorBackingRect.overlaps(img_rect)) hideLocalCursor();
-  buffer->fillRect(r, pix);
-  invalidateDesktopRect(r);
-}
-void DesktopWindow::imageRect(const Rect& r, void* pixels) {
-  Rect img_rect = buffer->isScaling() ? buffer->calculateScaleBoundary(r) : r;
-  if (cursorBackingRect.overlaps(img_rect)) hideLocalCursor();
-  buffer->imageRect(r, pixels);
-  invalidateDesktopRect(r);
-}
-void DesktopWindow::copyRect(const Rect& r, int srcX, int srcY) {
-  Rect img_rect = buffer->isScaling() ? buffer->calculateScaleBoundary(r) : r;
-  if (cursorBackingRect.overlaps(img_rect) ||
-      cursorBackingRect.overlaps(Rect(srcX, srcY, srcX+img_rect.width(), srcY+img_rect.height())))
-    hideLocalCursor();
-  buffer->copyRect(r, Point(r.tl.x-srcX, r.tl.y-srcY));
-  invalidateDesktopRect(r);
-}
-
-void DesktopWindow::invertRect(const Rect& r) {
-  int stride;
-  rdr::U8* p = buffer->isScaling() ? buffer->getPixelsRW(buffer->calculateScaleBoundary(r), &stride) 
-   : buffer->getPixelsRW(r, &stride);
-  for (int y = 0; y < r.height(); y++) {
-    for (int x = 0; x < r.width(); x++) {
-      switch (buffer->getPF().bpp) {
-      case 8:  ((rdr::U8* )p)[x+y*stride] ^= 0xff;       break;
-      case 16: ((rdr::U16*)p)[x+y*stride] ^= 0xffff;     break;
-      case 32: ((rdr::U32*)p)[x+y*stride] ^= 0xffffffff; break;
-      }
-    }
-  }
-  invalidateDesktopRect(r);
-}
diff --git a/win/vncviewer/DesktopWindow.h b/win/vncviewer/DesktopWindow.h
deleted file mode 100644
index 4bc7b7a7..00000000
--- a/win/vncviewer/DesktopWindow.h
+++ /dev/null
@@ -1,294 +0,0 @@
-/* Copyright (C) 2002-2005 RealVNC Ltd.  All Rights Reserved.
- * 
- * This is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
- * USA.
- */
-
-// -=- DesktopWindow.h
-
-// Each VNC connection instance (CConn) creates a DesktopWindow the
-// server initialisation message has been received.  The CConn is
-// responsible for all RFB-specific and network issues.  The
-// DesktopWindow is responsible for all GUI management issues.
-//
-// DesktopWindow provides a FullFramePixelBuffer interface for the
-// CConn to render updates into.  It also requires a callback object
-// to be supplied, which will be notified when various events occur.
-
-#ifndef __RFB_WIN32_DESKTOP_WINDOW_H__
-#define __RFB_WIN32_DESKTOP_WINDOW_H__
-
-#include <rfb/Cursor.h>
-#include <rfb_win32/CKeyboard.h>
-#include <rfb_win32/CPointer.h>
-#include <rfb_win32/Clipboard.h>
-#include <rfb_win32/ScaledDIBSectionBuffer.h>
-#include <rfb_win32/LogicalPalette.h>
-#include <vncviewer/ViewerToolBar.h>
-
-
-namespace rfb {
-
-  namespace win32 {
-
-    class DesktopWindow : rfb::win32::Clipboard::Notifier {
-    public:
-      class Callback;
-
-      DesktopWindow(Callback* cb_);
-      ~DesktopWindow();
-
-      // - Window message handling procedure
-      LRESULT processMessage(UINT msg, WPARAM wParam, LPARAM lParam);
-
-      // - Window message handling procedure for the framebuffer window
-      LRESULT processFrameMessage(UINT msg, WPARAM wParam, LPARAM lParam);
-
-      // - Separate message handling procedure for mouse events
-      //   It's called from both processMessage() and processFrameMessage()
-      void processMouseMessage(UINT msg, WPARAM wParam, LPARAM lParam);
-
-      // - Determine the native pixel format of the window
-      //   This can (and often will) differ from the PixelBuffer format
-      PixelFormat getNativePF() const;
-
-      // - Get the underlying window handle
-      //   This is used by F8Menu to modify the window's menu
-      HWND getHandle() const {return handle;}
-
-      // - Get the framebuffer window handle
-      HWND getFrameHandle() const {return frameHandle;}
-
-      // - Set the window title
-      void setName(const char* name);
-
-      // - Set the key that causes the system/F8 menu to be displayed
-      void setMenuKey(rdr::U8 key) { menuKey = key; }
-
-      // - Pointer event handling
-      void setEmulate3(bool em3) { ptr.enableEmulate3(em3); }
-      void setPointerEventInterval(int interval) { ptr.enableInterval(interval); }
-
-      // - Set the pixel format, size etc of the underlying PixelBuffer
-      void setPF(const PixelFormat& pf);
-      PixelFormat getPF() const { return buffer->getPixelFormat(); }
-      void setSize(int w, int h);
-      void setColour(int i, int r, int g, int b) {buffer->setColour(i, r, g, b);}
-      void setAutoScaling(bool as);
-      bool isAutoScaling() const { return autoScaling; }
-      void setDesktopScale(int scale);
-      int  getDesktopScale() const { return buffer->getScale(); }
-      void setDesktopScaleFilter(unsigned int scaleFilterID);
-      unsigned int getDesktopScaleFilterID() const { return buffer->getScaleFilterID(); }
-      void fitBufferToWindow(bool repaint = true);
-      void printScale();
-
-      // - Set the cursor to render when the pointer is within the desktop buffer
-      void setCursor(int w, int h, const Point& hotspot, void* data, void* mask);
-      void showCursor() { showLocalCursor(); }
-      void convertCursorToBuffer();
-
-      // - Set the window fullscreen / determine whether it is fullscreen
-      void setFullscreen(bool fs);
-      bool isFullscreen() { return fullscreenActive; }
-
-      // - Set/get the toolbar's state
-      void setShowToolbar(bool st);
-      bool isToolbarEnabled() { return showToolbar; }
-      void refreshToolbarButtons();
-
-      // - Set whether to disable special Windows keys & pass them straight to server
-      void setDisableWinKeys(bool dwk);
-
-      // - Set/get which monitor the window should be displayed on
-      void setMonitor(const char* monitor);
-      char* getMonitor() const;
-
-      // - Set the local clipboard
-      void serverCutText(const char* str, rdr::U32 len);
-
-      // - Completion of one FramebufferUpdate
-      void framebufferUpdateEnd();
-
-      // - Draw into the desktop buffer & update the window
-      void fillRect(const Rect& r, Pixel pix);
-      void imageRect(const Rect& r, void* pixels);
-      void copyRect(const Rect& r, int srcX, int srcY);
-
-      void invertRect(const Rect& r);
-
-      // - Update the window palette if the display is palette-based.
-      //   Colours are pulled from the desktop buffer's ColourMap.
-      //   Only the specified range of indexes is dealt with.
-      //   After the update, the entire window is redrawn.
-      void refreshWindowPalette(int start, int count);
-
-      // Clipboard::Notifier interface
-      void notifyClipboardChanged(const char* text, int len);
-
-      // DesktopWindow Callback interface
-      class Callback : public InputHandler {
-      public:
-        virtual ~Callback() {}
-        virtual void displayChanged() = 0;
-        virtual void paintCompleted() = 0;
-        virtual bool sysCommand(WPARAM wParam, LPARAM lParam) = 0;
-        virtual void closeWindow() = 0;
-        virtual void refreshMenu(bool enableSysItems) = 0;
-      };
-
-      Callback *getCallback() const { return callback; }
-
-      // Currently accessible so that the CConn can releaseAllKeys & check
-      // whether Ctrl and Alt are down...
-      rfb::win32::CKeyboard kbd;
-
-    protected:
-      // Routines to convert between Desktop and client (window) coordinates
-      Point desktopToClient(const Point& p) {
-        Point pos = p;
-        if (client_size.width() > buffer->width())
-          pos.x += (client_size.width() - buffer->width()) / 2;
-        else if (client_size.width() < buffer->width())
-          pos.x -= scrolloffset.x;
-        if (client_size.height() > buffer->height())
-          pos.y += (client_size.height() - buffer->height()) / 2;
-        else if (client_size.height() < buffer->height())
-          pos.y -= scrolloffset.y;
-        return pos;
-      }
-      Rect desktopToClient(const Rect& r) {
-        return Rect(desktopToClient(r.tl), desktopToClient(r.br));
-      }
-      Point clientToDesktop(const Point& p) {
-        Point pos = p;
-        if (client_size.width() > buffer->width())
-          pos.x -= (client_size.width() - buffer->width()) / 2;
-        else if (client_size.width() < buffer->width())
-          pos.x += scrolloffset.x;
-        if (client_size.height() > buffer->height())
-          pos.y -= (client_size.height() - buffer->height()) / 2;
-        else if (client_size.height() < buffer->height())
-          pos.y += scrolloffset.y;
-        return pos;
-      }
-      Rect clientToDesktop(const Rect& r) {
-        return Rect(clientToDesktop(r.tl), clientToDesktop(r.br));
-      }
-
-      // Internal routine used by the scrollbars & bump scroller to select
-      // the portion of the Desktop to display
-      bool setViewportOffset(const Point& tl);
-    
-      // Bump scroll handling.  Bump scrolling is used if the window is
-      // in fullscreen mode and the Desktop is larger than the window
-      bool processBumpScroll(const Point& cursorPos);
-      void setBumpScroll(bool on);
-      bool bumpScroll;
-      Point bumpScrollDelta;
-      IntervalTimer bumpScrollTimer;
-
-      // Track modified areas of the framebuffer
-      void updateWindow();
-
-      // Locally-rendered VNC cursor
-      void hideLocalCursor();
-      void showLocalCursor();
-      void renderLocalCursor();
-
-      // The system-rendered cursor
-      void hideSystemCursor();
-      void showSystemCursor();
-
-      // cursorOutsideBuffer() is called whenever we detect that the mouse has
-      // moved outside the desktop.  It restores the system arrow cursor.
-      void cursorOutsideBuffer();
-
-      // Returns true if part of the supplied rect is visible, false otherwise
-      bool invalidateDesktopRect(const Rect& crect, bool scaling=true);
-
-      // Determine whether or not we need to enable/disable scrollbars and set the
-      // window style accordingly
-      void calculateScrollBars();
-
-      // Resizes the main window against the pixel buffer size
-      void resizeDesktopWindowToBuffer();
-
-      // Win32-specific input handling
-      rfb::win32::CPointer ptr;
-      Point oldpos;
-      rfb::win32::Clipboard clipboard;
-
-      // Palette handling
-      LogicalPalette windowPalette;
-      bool palette_changed;
-
-      // - Full-screen mode
-      RECT fullscreenOldRect;
-      DWORD fullscreenOldFlags;
-      bool fullscreenActive;
-      bool fullscreenRestore;
-
-      // Damage tracking
-      rfb::Region damage;
-      IntervalTimer updateTimer;
-
-      // Cursor handling
-      Cursor cursor;
-      bool systemCursorVisible;  // Should system-cursor be drawn?
-      bool trackingMouseLeave;
-      bool cursorInBuffer;    // Is cursor position within server buffer? (ONLY for LocalCursor)
-      bool cursorVisible;     // Is cursor currently rendered?
-      bool cursorAvailable;   // Is cursor available for rendering?
-      bool internalSetCursor;
-      Point cursorPos;
-      ManagedPixelBuffer cursorBacking;
-      Rect cursorBackingRect;
-      U8 *cursorImage;
-      U8 *cursorMask;
-      int cursorWidth;
-      int cursorHeight;
-      Point cursorHotspot;
-
-      // ToolBar handling
-      ViewerToolBar tb;
-      bool showToolbar;
-
-      // Remote desktop name
-      char desktopName[255];
-
-      // Local window state
-      win32::ScaledDIBSectionBuffer* buffer;
-      double aspect_corr;
-      bool has_focus;
-      bool autoScaling;
-      Rect window_size;
-      Rect client_size;
-      Point scrolloffset;
-      Point maxscrolloffset;
-      HWND handle;
-      HWND frameHandle;
-      rdr::U8 menuKey;
-
-      Callback* callback;
-    };
-
-  };
-
-};
-
-#endif // __RFB_WIN32_DESKTOP_WINDOW_H__
-
-
diff --git a/win/vncviewer/InfoDialog.cxx b/win/vncviewer/InfoDialog.cxx
deleted file mode 100644
index 551ccf23..00000000
--- a/win/vncviewer/InfoDialog.cxx
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Copyright (C) 2002-2005 RealVNC Ltd.  All Rights Reserved.
- * 
- * This is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
- * USA.
- */
-#include <vncviewer/InfoDialog.h>
-#include <vncviewer/resource.h>
-#include <vncviewer/CConn.h>
-#include <rfb/Security.h>
-#include <rfb/encodings.h>
-#include <rfb/CSecurity.h>
-#include <rfb/LogWriter.h>
-
-using namespace rfb;
-using namespace rfb::win32;
-
-static LogWriter vlog("Info");
-
-
-bool InfoDialog::showDialog(CConn* cc) {
-  conn = cc;
-  return Dialog::showDialog(MAKEINTRESOURCE(IDD_CONNECTION_INFO));
-}
-
-void InfoDialog::initDialog() {
-  char buf[256];
-
-  setItemString(IDC_INFO_NAME, TStr(conn->cp.name()));
-
-  setItemString(IDC_INFO_HOST, TCharArray(conn->getSocket()->getPeerAddress()).buf);
-
-  sprintf(buf, "%dx%d", conn->cp.width, conn->cp.height);
-  setItemString(IDC_INFO_SIZE, TStr(buf));
-
-  conn->cp.pf().print(buf, 256);
-  setItemString(IDC_INFO_PF, TStr(buf));
-
-  conn->getServerDefaultPF().print(buf, 256);
-  setItemString(IDC_INFO_DEF_PF, TStr(buf));
-
-  setItemString(IDC_REQUESTED_ENCODING, TStr(encodingName(conn->getOptions().preferredEncoding)));
-  setItemString(IDC_LAST_ENCODING, TStr(encodingName(conn->lastUsedEncoding())));
-
-  sprintf(buf, "%d kbits/s", conn->getSocket()->inStream().kbitsPerSecond());
-  setItemString(IDC_INFO_LINESPEED, TStr(buf));
-
-  sprintf(buf, "%d.%d", conn->cp.majorVersion, conn->cp.minorVersion);
-  setItemString(IDC_INFO_VERSION, TStr(buf));
-
-  const CSecurity* cSec = conn->csecurity;
-  setItemString(IDC_INFO_SECURITY, TStr(secTypeName(cSec->getType())));
-  setItemString(IDC_INFO_ENCRYPTION, TStr(cSec->description()));
-}
diff --git a/win/vncviewer/InfoDialog.h b/win/vncviewer/InfoDialog.h
deleted file mode 100644
index 752d53c5..00000000
--- a/win/vncviewer/InfoDialog.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright (C) 2002-2005 RealVNC Ltd.  All Rights Reserved.
- * 
- * This is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
- * USA.
- */
-
-// -=- InfoDialog.h
-
-// Info dialog for VNC Viewer 4.0
-
-#ifndef __RFB_WIN32_INFO_DIALOG_H__
-#define __RFB_WIN32_INFO_DIALOG_H__
-
-#include <rfb_win32/Dialog.h>
-#include <rfb/util.h>
-
-namespace rfb {
-
-  namespace win32 {
-
-    class CConn;
-
-    class InfoDialog : Dialog {
-    public:
-      InfoDialog() : Dialog(GetModuleHandle(0)), conn(0) {}
-      virtual bool showDialog(CConn* vw);
-      virtual void initDialog();
-    protected:
-      CConn* conn;
-    };
-
-  };
-
-};
-
-#endif
diff --git a/win/vncviewer/ListenServer.h b/win/vncviewer/ListenServer.h
deleted file mode 100644
index d94b58b9..00000000
--- a/win/vncviewer/ListenServer.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* Copyright (C) 2002-2005 RealVNC Ltd.  All Rights Reserved.
- * 
- * This is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
- * USA.
- */
-
-// -=- ListenServer.h
-
-#ifndef __RFB_WIN32_LISTEN_SERVER_H__
-#define __RFB_WIN32_LISTEN_SERVER_H__
-
-#include <winsock2.h>
-#include <network/Socket.h>
-#include <rfb_win32/MsgWindow.h>
-#include <vncviewer/CConnThread.h>
-
-
-namespace rfb {
-  namespace win32 {
-
-    class ListenServer : MsgWindow {
-    public:
-      ListenServer(network::SocketListener* l) : MsgWindow(_T("rfb::win32::ListenServer")), sock(l) {
-        if (WSAAsyncSelect(l->getFd(), getHandle(), WM_USER, FD_ACCEPT) == SOCKET_ERROR)
-          throw rdr::SystemException("unable to monitor listen socket", WSAGetLastError());
-      }
-
-      LRESULT processMessage(UINT msg, WPARAM wParam, LPARAM lParam) {
-        if (msg == WM_USER) {
-          network::Socket* newConn = sock->accept();
-          new CConnThread(newConn, true);
-          return 0;
-        }
-        return MsgWindow::processMessage(msg, wParam, lParam);
-      }
-    protected:
-      network::SocketListener* sock;
-    };
-
-  };
-};
-
-#endif
diff --git a/win/vncviewer/ListenTrayIcon.h b/win/vncviewer/ListenTrayIcon.h
deleted file mode 100644
index 047a1049..00000000
--- a/win/vncviewer/ListenTrayIcon.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* Copyright (C) 2002-2005 RealVNC Ltd.  All Rights Reserved.
- * 
- * This is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
- * USA.
- */
-
-// -=- ListenTrayIcon.h
-
-#ifndef __RFB_WIN32_LISTEN_TRAY_ICON_H__
-#define __RFB_WIN32_LISTEN_TRAY_ICON_H__
-
-#include <rfb_win32/TrayIcon.h>
-#include <rfb_win32/AboutDialog.h>
-
-namespace rfb {
-  namespace win32 {
-
-    class ListenTrayIcon : public TrayIcon {
-    public:
-      ListenTrayIcon() {
-        setIcon(IDI_ICON);
-        setToolTip(_T("VNC Viewer"));
-      }
-      virtual LRESULT processMessage(UINT msg, WPARAM wParam, LPARAM lParam) {
-        switch(msg) {
-
-        case WM_USER:
-          switch (lParam) {
-          case WM_LBUTTONDBLCLK:
-            SendMessage(getHandle(), WM_COMMAND, ID_NEW_CONNECTION, 0);
-            break;
-          case WM_RBUTTONUP:
-            HMENU menu = LoadMenu(GetModuleHandle(0), MAKEINTRESOURCE(IDR_TRAY));
-            HMENU trayMenu = GetSubMenu(menu, 0);
-
-            // First item is New Connection, the default
-            SetMenuDefaultItem(trayMenu, ID_NEW_CONNECTION, FALSE);
-
-            // SetForegroundWindow is required, otherwise Windows ignores the
-            // TrackPopupMenu because the window isn't the foreground one, on
-            // some older Windows versions...
-            SetForegroundWindow(getHandle());
-
-            // Display the menu
-            POINT pos;
-            GetCursorPos(&pos);
-            TrackPopupMenu(trayMenu, 0, pos.x, pos.y, 0, getHandle(), 0);
-            break;
-			    } 
-			    return 0;
-
-        case WM_COMMAND:
-          switch (LOWORD(wParam)) {
-          case ID_NEW_CONNECTION:
-            {
-              new CConnThread();
-              break;
-            }
-          case ID_OPTIONS:
-            OptionsDialog::global.showDialog(0);
-            break;
-          case ID_ABOUT:
-            AboutDialog::instance.showDialog();
-            break;
-          case ID_CLOSE:
-            SendMessage(getHandle(), WM_CLOSE, 0, 0);
-            break;
-          }
-          return 0;
-
-        case WM_CLOSE:
-          PostQuitMessage(0);
-          return 0;
-        }
-
-        return TrayIcon::processMessage(msg, wParam, lParam);
-      }
-    };
-
-  };
-};
-
-#endif // __RFB_WIN32_LISTEN_TRAY_ICON_H__
diff --git a/win/vncviewer/MRU.h b/win/vncviewer/MRU.h
deleted file mode 100644
index a0aef814..00000000
--- a/win/vncviewer/MRU.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/* Copyright (C) 2002-2005 RealVNC Ltd.  All Rights Reserved.
- * 
- * This is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
- * USA.
- */
-#ifndef __VIEWER_MRU_H__
-#define __VIEWER_MRU_H__
-
-#include <windows.h>
-#include <list>
-#include <set>
-#include <rfb_win32/Registry.h>
-#include <rfb/util.h>
-#include <rdr/HexOutStream.h>
-
-namespace rfb {
-
-  namespace win32 {
-
-    namespace MRU {
-
-      static const RegKey RegRoot = HKEY_CURRENT_USER;
-      static const TCHAR* RegPath = _T("Software\\TigerVNC\\VNCViewer4\\MRU");
-      static const int MaxMRUEntries = 256;
-      static const int MRUEntries = 10;
-
-      static std::list<char*> getEntries() {
-        std::list<char*> mru;
-
-        try {
-          RegKey key;
-          key.openKey(RegRoot, RegPath);
-
-          CharArray order;
-          int length;
-          key.getBinary(_T("Order"), (void**)&order.buf, &length);
-
-          for (int i=0; i<length; i++) {
-	    TCharArray keyname(rdr::HexOutStream::binToHexStr(&order.buf[i], 1));
-            try {
-              TCharArray entry(key.getString(keyname.buf));
-              mru.push_back(strDup(entry.buf));
-            } catch (rdr::Exception) {
-            }
-          }
-        } catch (rdr::Exception) {
-        }
-
-        return mru;
-      }
-
-      static void addToMRU(const char* name) {
-        RegKey key;
-        key.createKey(RegRoot, RegPath);
-
-        BYTE keycode;
-        CharArray old_order;
-        char order[MaxMRUEntries];
-        int orderlen;
-        
-        try {
-          key.getBinary(_T("Order"), (void**)&old_order.buf, &orderlen);
-          if (orderlen)
-            memcpy(order, old_order.buf, orderlen);
-
-          std::set<int> ordercodes;
-          keycode = 0;
-          bool found = false;
-          for (int i=0; i<orderlen; i++) {
-            TCharArray keyname(rdr::HexOutStream::binToHexStr(&order[i], 1));
-            try {
-              TCharArray hostname(key.getString(keyname.buf));
-              if (stricmp(name, CStr(hostname.buf)) == 0) {
-                keycode = order[i];
-                found = true;
-                break;
-              }
-            } catch (rdr::Exception) {
-            }
-            ordercodes.insert(order[i]);
-          }
-
-          if (!found) {
-            if (orderlen <= MRUEntries) {
-              while (ordercodes.find(keycode) != ordercodes.end()) keycode++;
-            } else {
-              keycode = order[orderlen-1];
-              orderlen--;
-            }
-          }
-
-        } catch (rdr::Exception) {
-          keycode = 0;
-          orderlen = 0;
-        }
-
-        orderlen++;
-        int i, j=orderlen-1;
-        for (i=0; i<orderlen-1; i++) {
-          if (order[i] == keycode) {
-            j = i;
-            orderlen--;
-            break;
-          }
-        }
-        for (i=j; i>0; i--)
-          order[i] = order[i-1];
-        order[0] = keycode;
-
-        TCharArray keyname(rdr::HexOutStream::binToHexStr((char*)&keycode, 1));
-        key.setString(keyname.buf, TStr(name));
-        key.setBinary(_T("Order"), order, orderlen);
-      }
-
-    };
-
-  };
-
-};
-
-#endif
diff --git a/win/vncviewer/OptionsDialog.cxx b/win/vncviewer/OptionsDialog.cxx
deleted file mode 100644
index 721b9b4f..00000000
--- a/win/vncviewer/OptionsDialog.cxx
+++ /dev/null
@@ -1,420 +0,0 @@
-/* Copyright (C) 2002-2005 RealVNC Ltd.  All Rights Reserved.
- * 
- * This is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
- * USA.
- */
-
-#include <vncviewer/OptionsDialog.h>
-#include <vncviewer/CConn.h>
-#include <vncviewer/resource.h>
-#include <rfb_win32/Registry.h>
-#include <rfb_win32/MsgBox.h>
-#include <rfb_win32/OSVersion.h>
-#include <rfb_win32/SecurityPage.h>
-#include <rfb/encodings.h>
-#include <rfb/CConnection.h>
-#include <commdlg.h>
-#include <rfb/LogWriter.h>
-#include <rfb/Security.h>
-
-#include <list>
-
-using namespace rdr;
-using namespace rfb;
-using namespace rfb::win32;
-using namespace std;
-
-static LogWriter vlog("Options");
-
-
-struct OptionsInfo {
-  CConn* view;
-  CConnOptions options;
-};
-
-
-OptionsDialog rfb::win32::OptionsDialog::global;
-
-
-class ViewerOptions : public PropSheet {
-public:
-  ViewerOptions(OptionsInfo& info_, std::list<PropSheetPage*> pages)
-    : PropSheet(GetModuleHandle(0), 
-    info_.view ? _T("VNC Viewer Options") : _T("VNC Viewer Defaults"), pages),
-    changed(false), info(info_) {
-  }
-  ~ViewerOptions() {
-    if (changed) {
-      if (info.view)
-        // Apply the settings to the supplied session object
-        info.view->applyOptions(info.options);
-      else {
-        // Commit the settings to the user's registry area
-        info.options.writeDefaults();
-      }
-    }
-  }
-
-  void setChanged() {changed = true;}
-
-  bool changed;
-  OptionsInfo& info;
-};
-      
-
-class FormatPage : public PropSheetPage {
-public:
-  FormatPage(OptionsInfo* dlg_)
-    : PropSheetPage(GetModuleHandle(0), MAKEINTRESOURCE(IDD_FORMAT)), dlg(dlg_) {
-  }
-  virtual void initDialog() {
-    setItemChecked(IDC_ENCODING_AUTO, dlg->options.autoSelect);
-    setItemChecked(IDC_FORMAT_FULLCOLOUR, dlg->options.fullColour);
-    if (!dlg->options.fullColour) {
-      switch (dlg->options.lowColourLevel) {
-      case 0: setItemChecked(IDC_FORMAT_VERYLOWCOLOUR, true); break;
-      case 1: setItemChecked(IDC_FORMAT_LOWCOLOUR, true); break;
-      case 2: setItemChecked(IDC_FORMAT_MEDIUMCOLOUR, true); break;
-      }
-    }
-    switch (dlg->options.preferredEncoding) {
-    case encodingTight: setItemChecked(IDC_ENCODING_TIGHT, true); break;
-    case encodingZRLE: setItemChecked(IDC_ENCODING_ZRLE, true); break;
-    case encodingHextile: setItemChecked(IDC_ENCODING_HEXTILE, true); break;
-    case encodingRaw: setItemChecked(IDC_ENCODING_RAW, true); break;
-    }
-    setItemChecked(IDC_CUSTOM_COMPRESSLEVEL, dlg->options.customCompressLevel);
-    setItemInt(IDC_COMPRESSLEVEL, dlg->options.compressLevel);
-    setItemChecked(IDC_ALLOW_JPEG, !dlg->options.noJpeg);
-    setItemInt(IDC_QUALITYLEVEL, dlg->options.qualityLevel);
-    onCommand(IDC_ENCODING_AUTO, 0 /* ? */); // Force enableItem status to refresh
-    onCommand(IDC_CUSTOM_COMPRESSLEVEL, 0 /* ? */); // Force enableItem status to refresh
-    onCommand(IDC_ALLOW_JPEG, 0 /* ? */); // Force enableItem status to refresh
-  }
-  virtual bool onOk() {
-    dlg->options.autoSelect = isItemChecked(IDC_ENCODING_AUTO);
-    dlg->options.fullColour = isItemChecked(IDC_FORMAT_FULLCOLOUR);
-    dlg->options.customCompressLevel = isItemChecked(IDC_CUSTOM_COMPRESSLEVEL);
-    dlg->options.compressLevel = getItemInt(IDC_COMPRESSLEVEL);
-    dlg->options.noJpeg = !isItemChecked(IDC_ALLOW_JPEG);
-    dlg->options.qualityLevel = getItemInt(IDC_QUALITYLEVEL);
-    if (isItemChecked(IDC_FORMAT_VERYLOWCOLOUR))
-      dlg->options.lowColourLevel = 0;
-    if (isItemChecked(IDC_FORMAT_LOWCOLOUR))
-      dlg->options.lowColourLevel = 1;
-    if (isItemChecked(IDC_FORMAT_MEDIUMCOLOUR))
-      dlg->options.lowColourLevel = 2;
-    dlg->options.preferredEncoding = encodingTight;
-    if (isItemChecked(IDC_ENCODING_ZRLE))
-      dlg->options.preferredEncoding = encodingZRLE;
-    if (isItemChecked(IDC_ENCODING_HEXTILE))
-      dlg->options.preferredEncoding = encodingHextile;
-    if (isItemChecked(IDC_ENCODING_RAW))
-      dlg->options.preferredEncoding = encodingRaw;
-    ((ViewerOptions*)propSheet)->setChanged();
-    return true;
-  }
-  virtual bool onCommand(int id, int cmd) {
-    bool aut = isItemChecked(IDC_ENCODING_AUTO);
-    bool jpeg = isItemChecked(IDC_ALLOW_JPEG);
-    bool custom_comp = isItemChecked(IDC_CUSTOM_COMPRESSLEVEL);
-    if (id == IDC_ENCODING_AUTO) {
-      enableItem(IDC_ENCODING_TIGHT, !aut);
-      enableItem(IDC_ENCODING_ZRLE, !aut);
-      enableItem(IDC_ENCODING_HEXTILE, !aut);
-      enableItem(IDC_ENCODING_RAW, !aut);
-      enableItem(IDC_FORMAT_FULLCOLOUR, !aut);
-      enableItem(IDC_FORMAT_MEDIUMCOLOUR, !aut);
-      enableItem(IDC_FORMAT_LOWCOLOUR, !aut);
-      enableItem(IDC_FORMAT_VERYLOWCOLOUR, !aut);
-      enableItem(IDC_QUALITYLEVEL, !aut && jpeg);
-      return true;
-    }
-    if (id == IDC_CUSTOM_COMPRESSLEVEL) {
-      enableItem(IDC_COMPRESSLEVEL, custom_comp);
-      return true;
-    }
-    if (id == IDC_ALLOW_JPEG) {
-      enableItem(IDC_QUALITYLEVEL, !aut && jpeg);
-      return true;
-    }
-    return false;
-  }
-protected:
-  OptionsInfo* dlg;
-};
-
-class MiscPage : public PropSheetPage {
-public:
-  MiscPage(OptionsInfo* dlg_)
-    : PropSheetPage(GetModuleHandle(0), MAKEINTRESOURCE(IDD_MISC)), dlg(dlg_) {
-  }
-  virtual void initDialog() {
-    setItemChecked(IDC_CONN_SHARED, dlg->options.shared);
-    enableItem(IDC_CONN_SHARED, (!dlg->view) || (dlg->view->state() != CConnection::RFBSTATE_NORMAL));
-    setItemChecked(IDC_FULL_SCREEN, dlg->options.fullScreen);
-    setItemChecked(IDC_LOCAL_CURSOR, dlg->options.useLocalCursor);
-    setItemChecked(IDC_DESKTOP_RESIZE, dlg->options.useDesktopResize);
-    enableItem(IDC_PROTOCOL_3_3, (!dlg->view) || (dlg->view->state() != CConnection::RFBSTATE_NORMAL));
-    setItemChecked(IDC_PROTOCOL_3_3, dlg->options.protocol3_3);
-    setItemChecked(IDC_ACCEPT_BELL, dlg->options.acceptBell);
-    setItemChecked(IDC_AUTO_RECONNECT, dlg->options.autoReconnect);
-    setItemChecked(IDC_SHOW_TOOLBAR, dlg->options.showToolbar);
-    char scale_values[10][20] = {
-      "10","25","50","75","90","100","125","150","200","Auto"
-    };
-    HWND hScaleCombo = GetDlgItem(handle, IDC_COMBO_SCALE);
-    for (int i = 0; i <= 9; i++) {
-      SendMessage(hScaleCombo, CB_INSERTSTRING, 
-        (WPARAM)i, (LPARAM)(int FAR*)scale_values[i]);
-    }
-    if (dlg->options.autoScaling) {
-      SetDlgItemText(handle, IDC_COMBO_SCALE, (LPCTSTR) "Auto");
-    } else {
-      SetDlgItemInt(handle, IDC_COMBO_SCALE, dlg->options.scale, FALSE);
-    }
-  }
-  virtual bool onOk() {
-    dlg->options.shared = isItemChecked(IDC_CONN_SHARED);
-    dlg->options.fullScreen = isItemChecked(IDC_FULL_SCREEN);
-    dlg->options.useLocalCursor = isItemChecked(IDC_LOCAL_CURSOR);
-    dlg->options.useDesktopResize = isItemChecked(IDC_DESKTOP_RESIZE);
-    dlg->options.protocol3_3 = isItemChecked(IDC_PROTOCOL_3_3);
-    dlg->options.acceptBell = isItemChecked(IDC_ACCEPT_BELL);
-    dlg->options.autoReconnect = isItemChecked(IDC_AUTO_RECONNECT);
-    dlg->options.showToolbar = isItemChecked(IDC_SHOW_TOOLBAR);
-    int s = GetDlgItemInt(handle, IDC_COMBO_SCALE, NULL, FALSE);
-    if (s > 0) {
-      dlg->options.scale = s;
-      dlg->options.autoScaling = false;
-    } else {
-      char scaleStr[20];
-      GetDlgItemText(handle, IDC_COMBO_SCALE, (LPTSTR) scaleStr, 20);
-      if (strcmp(scaleStr, (const char *) "Auto") == 0) {
-        dlg->options.autoScaling = true;
-      }
-    }
-    ((ViewerOptions*)propSheet)->setChanged();
-    return true;
-  }
-  virtual bool onCommand(int id, int cmd) {
-    if (id == IDC_COMBO_SCALE) {
-      if (cmd == CBN_SELENDOK || cmd == CBN_EDITCHANGE) {
-        char scaleStr[20];
-        if (cmd == CBN_SELENDOK) {
-          HWND handleComboScale = GetDlgItem(handle, IDC_COMBO_SCALE);
-          int index = SendMessage(handleComboScale, CB_GETCURSEL, 0, 0);
-          SendMessage(handleComboScale, CB_GETLBTEXT, (WPARAM)index, (LPARAM)scaleStr);
-        } else {
-          GetDlgItemText(handle, IDC_COMBO_SCALE, (LPTSTR) scaleStr, 20);
-        }
-        return true;
-      }
-    }
-    return false;
-  }
-protected:
-  OptionsInfo* dlg;
-};
-
-class InputsPage : public PropSheetPage {
-public:
-  InputsPage(OptionsInfo* dlg_)
-    : PropSheetPage(GetModuleHandle(0), MAKEINTRESOURCE(IDD_INPUTS)), dlg(dlg_) {
-  }
-  virtual void initDialog() {
-    setItemChecked(IDC_SEND_POINTER, dlg->options.sendPtrEvents);
-    setItemChecked(IDC_SEND_KEYS, dlg->options.sendKeyEvents);
-    setItemChecked(IDC_CLIENT_CUTTEXT, dlg->options.clientCutText);
-    setItemChecked(IDC_SERVER_CUTTEXT, dlg->options.serverCutText);
-    setItemChecked(IDC_DISABLE_WINKEYS, dlg->options.disableWinKeys && !osVersion.isPlatformWindows);
-    enableItem(IDC_DISABLE_WINKEYS, !osVersion.isPlatformWindows);
-    setItemChecked(IDC_EMULATE3, dlg->options.emulate3);
-    setItemChecked(IDC_POINTER_INTERVAL, dlg->options.pointerEventInterval != 0);
-
-    // Populate the Menu Key tab
-    HWND menuKey = GetDlgItem(handle, IDC_MENU_KEY);
-    SendMessage(menuKey, CB_RESETCONTENT, 0, 0);
-    SendMessage(menuKey, CB_ADDSTRING, 0, (LPARAM)_T("none"));
-    if (!dlg->options.menuKey)
-      SendMessage(menuKey, CB_SETCURSEL, 0, 0);
-    for (unsigned int i=0; i<12; i++) {
-      TCHAR buf[4];
-      _stprintf(buf, _T("F%d"), i+1);
-      int index = SendMessage(menuKey, CB_ADDSTRING, 0, (LPARAM)buf);
-      if (i == (dlg->options.menuKey - VK_F1))
-        SendMessage(menuKey, CB_SETCURSEL, index, 0);
-    }
-  }
-  virtual bool onOk() {
-    dlg->options.sendPtrEvents = isItemChecked(IDC_SEND_POINTER);
-    dlg->options.sendKeyEvents = isItemChecked(IDC_SEND_KEYS);
-    dlg->options.clientCutText = isItemChecked(IDC_CLIENT_CUTTEXT);
-    dlg->options.serverCutText = isItemChecked(IDC_SERVER_CUTTEXT);
-    dlg->options.disableWinKeys = isItemChecked(IDC_DISABLE_WINKEYS);
-    dlg->options.emulate3 = isItemChecked(IDC_EMULATE3);
-    dlg->options.pointerEventInterval = 
-      isItemChecked(IDC_POINTER_INTERVAL) ? 200 : 0;
-
-    HWND mkHwnd = GetDlgItem(handle, IDC_MENU_KEY);
-    int index = SendMessage(mkHwnd, CB_GETCURSEL, 0, 0);
-    TCharArray keyName(SendMessage(mkHwnd, CB_GETLBTEXTLEN, index, 0)+1);
-    SendMessage(mkHwnd, CB_GETLBTEXT, index, (LPARAM)keyName.buf);
-    if (_tcscmp(keyName.buf, _T("none")) == 0)
-      dlg->options.setMenuKey("");
-    else
-      dlg->options.setMenuKey(CStr(keyName.buf));
-
-    ((ViewerOptions*)propSheet)->setChanged();
-    return true;
-  }
-protected:
-  OptionsInfo* dlg;
-};
-
-class DefaultsPage : public PropSheetPage {
-public:
-  DefaultsPage(OptionsInfo* dlg_)
-    : PropSheetPage(GetModuleHandle(0), MAKEINTRESOURCE(IDD_DEFAULTS)), dlg(dlg_) {
-  }
-  virtual void initDialog() {
-    enableItem(IDC_LOAD_CONFIG, dlg->options.configFileName.buf);
-    enableItem(IDC_SAVE_CONFIG, dlg->options.configFileName.buf);
-  }
-  virtual bool onCommand(int id, int cmd) {
-    switch (id) {
-    case IDC_LOAD_DEFAULTS:
-      dlg->options = CConnOptions();
-      break;
-    case IDC_SAVE_DEFAULTS:
-      propSheet->commitPages();
-      dlg->options.writeDefaults();
-      break;
-    case IDC_LOAD_CONFIG:
-      dlg->options.readFromFile(dlg->options.configFileName.buf);
-      break;
-    case IDC_SAVE_CONFIG:
-      propSheet->commitPages();
-      dlg->options.writeToFile(dlg->options.configFileName.buf);
-      MsgBox(handle, _T("Options saved successfully"),
-             MB_OK | MB_ICONINFORMATION);
-      return 0;
-    case IDC_SAVE_CONFIG_AS:
-      propSheet->commitPages();
-      // Get a filename to save to
-      TCHAR newFilename[4096];
-      TCHAR currentDir[4096];
-      if (dlg->options.configFileName.buf)
-        _tcscpy(newFilename, TStr(dlg->options.configFileName.buf));
-      else
-        newFilename[0] = 0;
-      OPENFILENAME ofn;
-      memset(&ofn, 0, sizeof(ofn));
-#ifdef OPENFILENAME_SIZE_VERSION_400
-      ofn.lStructSize = OPENFILENAME_SIZE_VERSION_400;
-#else
-      ofn.lStructSize = sizeof(ofn);
-#endif
-      ofn.hwndOwner = handle;
-      ofn.lpstrFilter = _T("VNC Connection Options\000*.vnc\000");
-      ofn.lpstrFile = newFilename;
-      currentDir[0] = 0;
-      GetCurrentDirectory(4096, currentDir);
-      ofn.lpstrInitialDir = currentDir;
-      ofn.nMaxFile = 4096;
-      ofn.lpstrDefExt = _T(".vnc");
-      ofn.Flags = OFN_NOREADONLYRETURN | OFN_OVERWRITEPROMPT | OFN_PATHMUSTEXIST;
-      if (!GetSaveFileName(&ofn)) {
-        if (CommDlgExtendedError())
-          throw rdr::Exception("GetSaveFileName failed");
-        return 0;
-      }
-
-      // Save the Options
-      dlg->options.writeToFile(CStr(newFilename));
-      MsgBox(handle, _T("Options saved successfully"),
-             MB_OK | MB_ICONINFORMATION);
-      return 0;
-    };
-    propSheet->reInitPages();
-    return true;
-  }
-protected:
-  OptionsInfo* dlg;
-};
-
-class SecPage : public SecurityPage {
-public:
-  SecPage(Security *security_, OptionsInfo *dlg_)
-    : SecurityPage(security_), dlg(dlg_) {
-  }
-
-  virtual void enableX509Dialogs() {
-    enableItem(IDC_LOAD_CACERT, true);
-    enableItem(IDC_LOAD_CRLCERT, true);
-  }
-
-  virtual void disableX509Dialogs() {
-    enableItem(IDC_LOAD_CACERT, false);
-    enableItem(IDC_LOAD_CRLCERT, false);
-  }
-
-  virtual bool onOk() {
-    SecurityPage::onOk();
-
-    dlg->options.secTypes = security->GetEnabledExtSecTypes();
-
-    if (isItemChecked(IDC_VENCRYPT))
-      dlg->options.secTypes.push_front(secTypeVeNCrypt);
-      
-    return true;
-  }
-
-  virtual void loadX509Certs() {}
-  virtual void loadVncPasswd() {}
-
-protected:
-  OptionsInfo* dlg;
-};
-
-OptionsDialog::OptionsDialog() : visible(false) {
-}
-
-bool OptionsDialog::showDialog(CConn* view, bool capture) {
-  if (visible) return false;
-  visible = true;
-
-  // Grab the current properties
-  OptionsInfo info;
-  if (view)
-    info.options = view->getOptions();
-  info.view = view;
-
-  // Build a list of pages to display
-  std::list<PropSheetPage*> pages;
-  FormatPage formatPage(&info); pages.push_back(&formatPage);
-  InputsPage inputsPage(&info); pages.push_back(&inputsPage);
-  MiscPage miscPage(&info); pages.push_back(&miscPage);
-  DefaultsPage defPage(&info); if (view) pages.push_back(&defPage);
-  SecPage secPage(view->security, &info); pages.push_back(&secPage);
-
-  // Show the property sheet
-  ViewerOptions dialog(info, pages);
-  dialog.showPropSheet(view && view->getWindow() ? view->getWindow()->getHandle() : 0,
-                       false, false, capture);
-
-  visible = false;
-  return dialog.changed;
-}
diff --git a/win/vncviewer/OptionsDialog.h b/win/vncviewer/OptionsDialog.h
deleted file mode 100644
index fcddc71c..00000000
--- a/win/vncviewer/OptionsDialog.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright (C) 2002-2005 RealVNC Ltd.  All Rights Reserved.
- * 
- * This is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
- * USA.
- */
-
-// -=- OptionsDialog.h
-
-// Options dialog for VNC Viewer 4.0
-
-#ifndef __RFB_WIN32_OPTIONS_DIALOG_H__
-#define __RFB_WIN32_OPTIONS_DIALOG_H__
-
-#include <rfb_win32/Dialog.h>
-
-namespace rfb {
-
-  namespace win32 {
-
-    class CConn;
-
-    class OptionsDialog {
-    public:
-      OptionsDialog();
-      virtual bool showDialog(CConn* cfg, bool capture=false);
-
-      static OptionsDialog global;
-    protected:
-      bool visible;
-    };
-
-  };
-
-};
-
-#endif
diff --git a/win/vncviewer/UserPasswdDialog.cxx b/win/vncviewer/UserPasswdDialog.cxx
deleted file mode 100644
index 2eea0ea0..00000000
--- a/win/vncviewer/UserPasswdDialog.cxx
+++ /dev/null
@@ -1,85 +0,0 @@
-/* Copyright (C) 2002-2005 RealVNC Ltd.  All Rights Reserved.
- * 
- * This is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
- * USA.
- */
-
-#include <vncviewer/UserPasswdDialog.h>
-#include <vncviewer/resource.h>
-#include <rfb/Exception.h>
-
-using namespace rfb;
-using namespace rfb::win32;
-
-
-UserPasswdDialog::UserPasswdDialog() : Dialog(GetModuleHandle(0)),
-  showUsername(false), showPassword(false) {
-}
-
-
-void UserPasswdDialog::setCSecurity(const CSecurity* cs) {
-  description.replaceBuf(tstrDup(cs->description()));
-}
-
-bool UserPasswdDialog::showDialog() {
-  return Dialog::showDialog(MAKEINTRESOURCE(IDD_VNC_AUTH_DLG));
-}
-
-void UserPasswdDialog::initDialog() {
-  if (username.buf)
-    setItemString(IDC_USERNAME, username.buf);
-  if (password.buf)
-    setItemString(IDC_PASSWORD, password.buf);
-  if (!showUsername) {
-    setItemString(IDC_USERNAME, _T(""));
-    enableItem(IDC_USERNAME, false);
-  }
-  if (!showPassword) {
-    setItemString(IDC_PASSWORD, _T(""));
-    enableItem(IDC_PASSWORD, false);
-  }
-  if (description.buf) {
-    TCharArray title(128);
-    GetWindowText(handle, title.buf, 128);
-    _tcsncat(title.buf, _T(" ["), 128);
-    _tcsncat(title.buf, description.buf, 128);
-    _tcsncat(title.buf, _T("]"), 128);
-    SetWindowText(handle, title.buf);
-  }
-}
-
-bool UserPasswdDialog::onOk() {
-	username.replaceBuf(getItemString(IDC_USERNAME));
-	password.replaceBuf(getItemString(IDC_PASSWORD));
-  return true;
-}
-
-
-void UserPasswdDialog::getUserPasswd(char** user, char** passwd) {
-  showUsername = user != 0;
-  showPassword = passwd != 0;
-  if (user && *user)
-    username.replaceBuf(tstrDup(*user));
-  if (passwd && *passwd)
-    password.replaceBuf(tstrDup(*passwd));
-
-  if (!showDialog())
-    throw rfb::AuthCancelledException();
-
-  if (user)
-    *user = strDup(username.buf);
-  if (passwd)
-    *passwd = strDup(password.buf);
-}
diff --git a/win/vncviewer/UserPasswdDialog.h b/win/vncviewer/UserPasswdDialog.h
deleted file mode 100644
index bf006f4d..00000000
--- a/win/vncviewer/UserPasswdDialog.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Copyright (C) 2002-2005 RealVNC Ltd.  All Rights Reserved.
- * 
- * This is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
- * USA.
- */
-
-// -=- UserPasswdDialog.h
-
-// Username and password dialog for VNC Viewer 4.0
-// Note that the password and username fields are only freed
-// when the dialog instance is deleted - it is important to
-// ensure that the instance is deleted as early as possible, to
-// avoid the password being retained in memory for too long.
-
-#ifndef __RFB_WIN32_USERPASSWD_DIALOG_H__
-#define __RFB_WIN32_USERPASSWD_DIALOG_H__
-
-#include <rfb_win32/Dialog.h>
-#include <rfb_win32/TCharArray.h>
-#include <rfb/CSecurity.h>
-#include <rfb/UserPasswdGetter.h>
-
-namespace rfb {
-
-  namespace win32 {
-
-    class UserPasswdDialog : Dialog, public UserPasswdGetter {
-    public:
-      UserPasswdDialog();
-      virtual bool showDialog();
-      virtual void initDialog();
-      virtual bool onOk();
-      virtual void getUserPasswd(char** user, char** passwd);
-      void setCSecurity(const CSecurity* cs);
-    protected:
-      TCharArray username;
-      TPlainPasswd password;
-      bool showUsername, showPassword;
-      TCharArray description;
-    };
-
-  };
-
-};
-
-#endif
diff --git a/win/vncviewer/ViewerToolBar.cxx b/win/vncviewer/ViewerToolBar.cxx
deleted file mode 100644
index 13a64111..00000000
--- a/win/vncviewer/ViewerToolBar.cxx
+++ /dev/null
@@ -1,104 +0,0 @@
-/* Copyright (C) 2005 TightVNC Team.  All Rights Reserved.
- *    
- * This is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
- * USA.
- */
-
-// -=- ViewerToolBar.cxx
-
-#include <vncviewer/ViewerToolBar.h>
-#include <vncviewer/resource.h>
-
-void ViewerToolBar::create(HWND parentHwnd) {
-  // Create the toolbar panel
-  ToolBar::create(ID_TOOLBAR, parentHwnd, WS_CHILD | 
-    TBSTYLE_FLAT | TBSTYLE_TOOLTIPS | CCS_NORESIZE);
-  addBitmap(4, IDB_TOOLBAR);
-
-  // Create the control buttons
-  addButton(0, ID_OPTIONS);
-  addButton(1, ID_INFO);
-  addButton(0, 0, TBSTATE_ENABLED, TBSTYLE_SEP);
-  addButton(2, ID_FULLSCREEN);
-  addButton(3, ID_REQUEST_REFRESH);
-  addButton(0, 0, TBSTATE_ENABLED, TBSTYLE_SEP);
-  addButton(4, ID_ZOOM_IN);
-  addButton(5, ID_ZOOM_OUT);
-  addButton(6, ID_ACTUAL_SIZE);
-  addButton(7, ID_AUTO_SIZE);
-  addButton(0, 0, TBSTATE_ENABLED, TBSTYLE_SEP);
-  addButton(8, ID_SEND_CAD);
-  addButton(9, ID_SEND_CTLESC);
-  addButton(10, ID_CTRL_KEY);
-  addButton(11, ID_ALT_KEY);
-  addButton(0, 0, TBSTATE_ENABLED, TBSTYLE_SEP);
-  addButton(0, 0, TBSTATE_ENABLED, TBSTYLE_SEP);
-  addButton(13, ID_NEW_CONNECTION);
-  addButton(14, ID_CONN_SAVE_AS);
-
-  // Resize the toolbar window
-  autoSize();
-}
-
-LRESULT ViewerToolBar::processWM_NOTIFY(WPARAM wParam, LPARAM lParam) {
-  switch (((LPNMHDR)lParam)->code) { 
-    // Process tooltips text
-  case TTN_NEEDTEXT:
-    {
-      LPTOOLTIPTEXT TTStr = (LPTOOLTIPTEXT)lParam;
-      if (TTStr->hdr.code != TTN_NEEDTEXT)
-        return 0;
-
-      switch (TTStr->hdr.idFrom) {
-      case ID_OPTIONS:
-        TTStr->lpszText = (LPTSTR) "Connection options...";
-        break;
-      case ID_INFO:
-        TTStr->lpszText = (LPTSTR) "Connection info";
-        break;
-      case ID_FULLSCREEN:
-        TTStr->lpszText = (LPTSTR) "Full screen";
-        break;
-      case ID_REQUEST_REFRESH:
-        TTStr->lpszText = (LPTSTR) "Request screen refresh";
-        break;
-      case ID_SEND_CAD:
-        TTStr->lpszText = (LPTSTR) "Send Ctrl-Alt-Del";
-        break;
-      case ID_SEND_CTLESC:
-        TTStr->lpszText = (LPTSTR) "Send Ctrl-Esc";
-        break;
-      case ID_CTRL_KEY:
-        TTStr->lpszText = (LPTSTR) "Send Ctrl key press/release";
-        break;
-      case ID_ALT_KEY:
-        TTStr->lpszText = (LPTSTR) "Send Alt key press/release";
-        break;
-      case ID_NEW_CONNECTION:
-        TTStr->lpszText = (LPTSTR) "New connection...";
-        break;
-      case ID_CONN_SAVE_AS:
-        TTStr->lpszText = (LPTSTR) "Save connection info as...";
-        break;
-      default:
-        break;
-      }
-    }
-
-  default:
-    break;
-  }
-  return 0;
-}
diff --git a/win/vncviewer/ViewerToolBar.h b/win/vncviewer/ViewerToolBar.h
deleted file mode 100644
index 85c1de51..00000000
--- a/win/vncviewer/ViewerToolBar.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright (C) 2005 TightVNC Team.  All Rights Reserved.
- *    
- * This is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
- * USA.
- */
-
-// -=- ViewerToolBar.h
-
-// ToolBar for the Vnc Viewer
-
-#include <rfb_win32/ToolBar.h>
-
-using namespace rfb::win32;
-
-class ViewerToolBar : public ToolBar {
-public:
-  ViewerToolBar() {}
-  ~ViewerToolBar() {}
-
-  void create(HWND parentHwnd);
-
-  LRESULT processWM_NOTIFY(WPARAM wParam, LPARAM lParam);
-};
diff --git a/win/vncviewer/buildTime.cxx b/win/vncviewer/buildTime.cxx
deleted file mode 100644
index 9f37b387..00000000
--- a/win/vncviewer/buildTime.cxx
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright (C) 2005 RealVNC Ltd.  All Rights Reserved.
- * 
- * This is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
- * USA.
- */
-const char* buildTime = "Built on " __DATE__ " at " __TIME__;
diff --git a/win/vncviewer/cursor1.cur b/win/vncviewer/cursor1.cur
deleted file mode 100644
index 20a713f7..00000000
--- a/win/vncviewer/cursor1.cur
+++ /dev/null
diff --git a/win/vncviewer/resource.h b/win/vncviewer/resource.h
deleted file mode 100644
index efb977c1..00000000
--- a/win/vncviewer/resource.h
+++ /dev/null
@@ -1,119 +0,0 @@
-// Used by vncviewer.rc
-
-#include <rfb_win32/resource.h>
-
-#define IDR_MANIFEST                    1
-#define IDI_ICON                        101
-#define IDD_VNC_AUTH_DLG                102
-#define IDD_CONNECTING_DLG              103
-#define IDD_CONNECTION_DLG              104
-#define IDC_DOT_CURSOR                  105
-#define IDD_ABOUT                       107
-#define IDD_FORMAT                      108
-#define IDD_MISC                        109
-#define IDD_INPUTS                      110
-#define IDD_SERVER_KEYS                 111
-#define IDR_TRAY                        112
-#define IDD_CONNECTION_INFO             113
-#define IDD_DEFAULTS                    116
-#define IDB_BITMAP                      120
-#define IDB_TOOLBAR                     122
-#define IDC_PASSWORD                    1000
-#define IDC_CONNECTING_TEXT             1001
-#define IDC_SERVER_EDIT                 1002
-#define IDC_USERNAME                    1005
-#define IDC_VERSION                     1008
-#define IDC_BUILDTIME                   1009
-#define IDC_ENCODING_AUTO               1010
-#define IDC_FORMAT_FULLCOLOUR           1011
-#define IDC_ENCODING_ZRLE               1012
-#define IDC_ENCODING_HEXTILE            1013
-#define IDC_CONN_SHARED                 1013
-#define IDC_ENCODING_RAW                1014
-#define IDC_FULL_SCREEN                 1014
-#define IDC_SEND_POINTER                1015
-#define IDC_SEND_KEYS                   1016
-#define IDC_CLIENT_CUTTEXT              1017
-#define IDC_SERVER_CUTTEXT              1018
-#define IDC_LOCAL_CURSOR                1019
-#define IDC_DESKTOP_RESIZE              1020
-#define IDC_COPYRIGHT                   1021
-#define IDC_DESCRIPTION                 1022
-#define IDC_OPTIONS                     1023
-#define IDC_ABOUT                       1024
-#define IDC_LIST1                       1025
-#define IDC_FTLOCALLIST                 1025
-#define IDC_INFO_NAME                   1026
-#define IDC_INFO_HOST                   1027
-#define IDC_INFO_SIZE                   1028
-#define IDC_INFO_PF                     1029
-#define IDC_INFO_DEF_PF                 1030
-#define IDC_INFO_LINESPEED              1031
-#define IDC_INFO_VERSION                1032
-#define IDC_PROTOCOL_3_3                1034
-#define IDC_ACCEPT_BELL                 1035
-#define IDC_FORMAT_VERYLOWCOLOUR        1036
-#define IDC_SHOW_TOOLBAR                1036
-#define IDC_FORMAT_LOWCOLOUR            1037
-#define IDC_FORMAT_MEDIUMCOLOUR         1038
-#define IDC_LOAD_DEFAULTS               1040
-#define IDC_SAVE_DEFAULTS               1041
-#define IDC_LOAD_CONFIG                 1042
-#define IDC_EMULATE3                    1043
-#define IDC_POINTER_INTERVAL            1044
-#define IDC_SAVE_CONFIG                 1045
-#define IDC_INFO_SECURITY               1046
-#define IDC_SAVE_CONFIG_AS              1048
-#define IDC_MENU_KEY                    1051
-#define IDC_REQUESTED_ENCODING          1052
-#define IDC_LAST_ENCODING               1053
-#define IDC_INFO_ENCRYPTION             1055
-#define IDC_AUTO_RECONNECT              1056
-#define IDC_DISABLE_WINKEYS             1057
-#define IDC_QUALITYLEVEL                1058
-#define IDC_SEND_SYSKEYS                1059
-#define IDC_PROGRESS                    1064
-#define IDC_CONFIRM_YESTOALL            1079
-#define IDC_CONFIRM_TEXT                1080
-#define IDC_EDIT2                       1082
-#define IDC_TYPE                        1088
-#define IDC_ENCODING_TIGHT              1089
-#define IDC_CUSTOM_COMPRESSLEVEL        1091
-#define IDC_COMPRESSLEVEL               1093
-#define IDC_ALLOW_JPEG                  1095
-#define IDC_FTLOCALRELOAD               1096
-#define IDC_STATIC_SCALE                1097
-#define IDC_COMBO_SCALE                 1098
-#define IDC_STATIC_PERCENT              1099
-#define IDC_LOAD_CACERT                 1100
-#define IDC_LOAD_CRLCERT                1101
-#define ID_TOOLBAR                      4002
-#define ID_CLOSE                        4003
-#define ID_OPTIONS                      4004
-#define ID_NEW_CONNECTION               4005
-#define ID_ABOUT                        4006
-#define ID_FULLSCREEN                   4007
-#define ID_SEND_CAD                     4008
-#define ID_INFO                         4009
-#define ID_REQUEST_REFRESH              4010
-#define ID_CTRL_KEY                     4011
-#define ID_ALT_KEY                      4012
-#define ID_SEND_MENU_KEY                4013
-#define ID_SEND_CTLESC                  4014
-#define ID_CONN_SAVE_AS                 4015
-#define ID_ZOOM_IN                      4017
-#define ID_ZOOM_OUT                     4018
-#define ID_ACTUAL_SIZE                  4019
-#define ID_AUTO_SIZE                    4020
-#define IDM_SHOW_TOOLBAR                4027
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        134
-#define _APS_NEXT_COMMAND_VALUE         40028
-#define _APS_NEXT_CONTROL_VALUE         1102
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
diff --git a/win/vncviewer/toolbar.bmp b/win/vncviewer/toolbar.bmp
deleted file mode 100644
index 1473fa37..00000000
--- a/win/vncviewer/toolbar.bmp
+++ /dev/null
diff --git a/win/vncviewer/vncviewer.bmp b/win/vncviewer/vncviewer.bmp
deleted file mode 100644
index f02897a1..00000000
--- a/win/vncviewer/vncviewer.bmp
+++ /dev/null
diff --git a/win/vncviewer/vncviewer.cxx b/win/vncviewer/vncviewer.cxx
deleted file mode 100644
index 1c68808a..00000000
--- a/win/vncviewer/vncviewer.cxx
+++ /dev/null
@@ -1,310 +0,0 @@
-/* Copyright (C) 2002-2005 RealVNC Ltd.  All Rights Reserved.
- * 
- * This is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
- * USA.
- */
-
-// -=- VNC Viewer for Win32
-
-#include <string.h>
-#ifdef WIN32
-#define strcasecmp _stricmp
-#endif
-#include <list>
-
-#include <vncviewer/ListenServer.h>
-#include <vncviewer/resource.h>
-#include <vncviewer/CConn.h>
-#include <vncviewer/CConnThread.h>
-#include <vncviewer/OptionsDialog.h>
-#include <vncviewer/ListenTrayIcon.h>
-#include <network/TcpSocket.h>
-#include <os/os.h>
-#include <rfb/Logger_stdio.h>
-#include <rfb/Logger_file.h>
-#include <rfb/LogWriter.h>
-#include <rfb/Exception.h>
-#include <rfb_win32/RegConfig.h>
-#include <rfb_win32/MsgBox.h>
-
-#ifdef _DIALOG_CAPTURE
-#include <extra/LoadBMP.h>
-#endif
-
-using namespace rfb;
-using namespace rfb::win32;
-using namespace rdr;
-using namespace network;
-
-static LogWriter vlog("main");
-
-TStr rfb::win32::AppName("VNC Viewer");
-
-
-#ifdef _DIALOG_CAPTURE
-BoolParameter captureDialogs("CaptureDialogs", "", false);
-#endif
-
-//
-// -=- Listener
-//     Class to handle listening on a particular port for incoming connections
-//     from servers, and spawning of clients
-//
-
-static BoolParameter acceptIncoming("Listen", "Accept incoming connections from VNC servers.", false);
-
-
-//
-// -=- AboutDialog global values
-//
-
-const WORD rfb::win32::AboutDialog::DialogId = IDD_ABOUT;
-const WORD rfb::win32::AboutDialog::Copyright = IDC_COPYRIGHT;
-const WORD rfb::win32::AboutDialog::Version = IDC_VERSION;
-const WORD rfb::win32::AboutDialog::BuildTime = IDC_BUILDTIME;
-const WORD rfb::win32::AboutDialog::Description = IDC_DESCRIPTION;
-
-
-//
-// -=- processParams
-//     Read in the command-line parameters and interpret them.
-//
-
-void
-programInfo() {
-  win32::FileVersionInfo inf;
-  _tprintf(_T("%s - %s, Version %s\n"),
-    inf.getVerString(_T("ProductName")),
-    inf.getVerString(_T("FileDescription")),
-    inf.getVerString(_T("FileVersion")));
-  printf("%s\n", buildTime);
-  _tprintf(_T("%s\n\n"), inf.getVerString(_T("LegalCopyright")));
-}
-
-void
-programUsage() {
-  printf("usage: vncviewer <options> <hostname>[:<display>]\n");
-  printf("Command-line options:\n");
-  printf("  -help                                - Provide usage information.\n");
-  printf("  -config <file>                       - Load connection settings from VNC Viewer 3.3 settings file\n");
-  printf("  -console                             - Run with a console window visible.\n");
-  printf("  <setting>=<value>                    - Set the named configuration parameter.\n");
-  printf("    (Parameter values specified on the command-line override those specified by other configuration methods.)\n");
-  printf("\nLog names:\n");
-  LogWriter::listLogWriters();
-  printf("\nLog destinations:\n");
-  Logger::listLoggers();
-  printf("\nParameters:\n");
-  Configuration::listParams(ConfViewer);
-  printf("Press Enter/Return key to continue\n");
-  getchar();
-  exit(1);
-}
-
-
-bool print_usage = false;
-bool close_console = true;
-std::list<char*> hosts;
-std::list<char*> configFiles;
-
-void
-processParams(int argc, char* argv[]) {
-
-  Configuration::enableViewerParams();
-
-  for (int i=1; i<argc; i++) {
-    try {
-
-      if (strcasecmp(argv[i], "-console") == 0) {
-        close_console = false;
-
-      } else if (((strcasecmp(argv[i], "-config") == 0) ||
-                  (strcasecmp(argv[i], "/config") == 0)) && (i < argc-1)) {
-        configFiles.push_back(strDup(argv[i+1]));
-        i++;
-
-      } else if ((strcasecmp(argv[i], "-help") == 0) ||
-                 (strcasecmp(argv[i], "--help") == 0) ||
-                 (strcasecmp(argv[i], "-h") == 0) ||
-                 (strcasecmp(argv[i], "/?") == 0)) {
-        print_usage = true;
-        close_console = false;
-        break;
-
-      } else {
-        // Try to process <option>=<value>, or -<bool>
-        if (Configuration::setParam(argv[i], true))
-          continue;
-        // Try to process -<option> <value>
-        if ((argv[i][0] == '-') && (i+1 < argc)) {
-          if (Configuration::setParam(&argv[i][1], argv[i+1], true)) {
-            i++;
-            continue;
-          }
-        }
-        // If it's -<option> then it's not recognised - error
-        // If it's <host> then add it to the list to connect to.
-        if ((argv[i][0] == '-') || (argv[i][0] == '/')) {
-          const char* fmt = "The option %s was not recognized.  Use -help to see VNC Viewer usage";
-          CharArray tmp(strlen(argv[i])+strlen(fmt)+1);
-          sprintf(tmp.buf, fmt, argv[i]);
-          MsgBox(0, TStr(tmp.buf), MB_ICONSTOP | MB_OK);
-          exit(1);
-        } else if (strContains(argv[i], '\\')) {
-          configFiles.push_back(strDup(argv[i]));
-        } else {
-          hosts.push_back(strDup(argv[i]));
-        }
-      }
-
-    } catch (rdr::Exception& e) {
-      vlog.error(e.str());
-    }
-  }
-}
-
-
-//
-// -=- main
-//
-
-int WINAPI WinMain(HINSTANCE inst, HINSTANCE prevInst, char* cmdLine, int cmdShow) {
-  try {
-
-    // - Initialise the available loggers
-    initStdIOLoggers();
-    initFileLogger("C:\\temp\\vncviewer4.log");
-
-    // - By default, just log errors to stderr
-    logParams.setDefault("*:stderr:0");
-
-    // - Process the command-line
-    int argc = __argc;
-    char** argv = __argv;
-    processParams(argc, argv);
-
-    // - By default the console will be closed
-    if (close_console) {
-      if (!FreeConsole())
-        vlog.info("unable to close console:%u", GetLastError());
-    } else {
-      AllocConsole();
-      freopen("CONIN$","rb",stdin);
-      freopen("CONOUT$","wb",stdout);
-      freopen("CONOUT$","wb",stderr);
-      setbuf(stderr, 0);
-    }
-
-#ifdef _DIALOG_CAPTURE
-    if (captureDialogs) {
-      CConn::userConfigKey.openKey(HKEY_CURRENT_USER, _T("Software\\TigerVNC\\VNCViewer4"));
-      OptionsDialog::global.showDialog(0, true);
-      return 0;
-    }
-#endif
-
-    // - If no clients are specified, bring up a connection dialog
-    if (configFiles.empty() && hosts.empty() && !acceptIncoming && !print_usage)
-      hosts.push_back(0);
-
-    programInfo();
-
-    // Create vnc in the user's home directory if it doesn't already exist
-    char* homeDir = NULL;
-    if (getvnchomedir(&homeDir) == -1)
-      vlog.error("Could not create vnc directory: can't obtain home directory path");
-    else {
-      int result = CreateDirectory(homeDir, NULL);
-      if (result <= 0 && GetLastError() != ERROR_ALREADY_EXISTS)
-        vlog.error("Could not create vnc directory: %u", GetLastError());
-      delete [] homeDir;
-    }
-
-    // - Connect to the clients
-    if (!configFiles.empty() || !hosts.empty() || acceptIncoming) {
-      // - Configure the registry configuration reader
-      win32::RegConfigThread config;
-      config.start(HKEY_CURRENT_USER, _T("Software\\TigerVNC\\VNCViewer4"));
-
-      // - Tell the rest of VNC Viewer where to write config data to
-      CConn::userConfigKey.createKey(HKEY_CURRENT_USER, _T("Software\\TigerVNC\\VNCViewer4"));
-
-      if (acceptIncoming) {
-        int port = 5500;
-
-        // Listening viewer
-        if (hosts.size() > 1)
-          programUsage();
-        if (!hosts.empty())
-          port = atoi(hosts.front());  
-
-        // Show the tray icon & menu
-        ListenTrayIcon tray;
-
-        // Listen for reverse connections
-        network::TcpListener sock(NULL, port);
-        ListenServer listener(&sock);
-
-        // Run the view manager
-        // Also processes the tray icon if necessary
-        MSG msg;
-        while (GetMessage(&msg, NULL, 0, 0) > 0) {
-          TranslateMessage(&msg);
-          DispatchMessage(&msg);
-        }
-      } else {
-        // Read each config file in turn
-        while (!configFiles.empty()) {
-          char* filename = configFiles.front();
-          new CConnThread(filename, true);
-          strFree(filename);
-          configFiles.pop_front();
-        }
-
-        // Connect to each client in turn
-        while (!hosts.empty()) {
-          char* hostinfo = hosts.front();
-          new CConnThread(hostinfo);
-          strFree(hostinfo);
-          hosts.pop_front();
-        }
-
-        // Run the view manager
-        MSG msg;
-        while (CConnThread::getMessage(&msg, NULL, 0, 0) > 0) {
-          TranslateMessage(&msg);
-          DispatchMessage(&msg);
-        }
-
-        vlog.debug("quitting viewer");
-      }
-
-    }
-
-    // - If necessary, print the program's usage info
-    if (print_usage)
-      programUsage();
-
-    if (!close_console) {
-      printf("Press Enter/Return key to continue\n");
-      getchar();
-    }
-
-  } catch (rdr::Exception& e) {
-    MsgBox(0, TStr(e.str()), MB_ICONSTOP | MB_OK);
-  }
-
-  return 0;
-}
diff --git a/win/vncviewer/vncviewer.exe.manifest b/win/vncviewer/vncviewer.exe.manifest
deleted file mode 100644
index daab6db7..00000000
--- a/win/vncviewer/vncviewer.exe.manifest
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<assemblyIdentity
-   version="4.0.0.26"
-   processorArchitecture="X86"
-   name="TigerVNC.vncviewer.exe"
-   type="win32"
-/>
-<description>.NET control deployment tool</description>
-<dependency>
-   <dependentAssembly>
-     <assemblyIdentity
-       type="win32"
-       name="Microsoft.Windows.Common-Controls"
-       version="6.0.0.0"
-       processorArchitecture="X86"
-       publicKeyToken="6595b64144ccf1df"
-       language="*"
-     />
-   </dependentAssembly>
-</dependency>
-</assembly>
diff --git a/win/vncviewer/vncviewer.exe.manifest64 b/win/vncviewer/vncviewer.exe.manifest64
deleted file mode 100644
index 287a991d..00000000
--- a/win/vncviewer/vncviewer.exe.manifest64
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<assemblyIdentity
-   version="4.0.0.26"
-   processorArchitecture="AMD64"
-   name="TigerVNC.vncviewer.exe"
-   type="win32"
-/>
-<description>.NET control deployment tool</description>
-<dependency>
-   <dependentAssembly>
-     <assemblyIdentity
-       type="win32"
-       name="Microsoft.Windows.Common-Controls"
-       version="6.0.0.0"
-       processorArchitecture="AMD64"
-       publicKeyToken="6595b64144ccf1df"
-       language="*"
-     />
-   </dependentAssembly>
-</dependency>
-</assembly>
diff --git a/win/vncviewer/vncviewer.ico b/win/vncviewer/vncviewer.ico
deleted file mode 100644
index b86033b7..00000000
--- a/win/vncviewer/vncviewer.ico
+++ /dev/null
diff --git a/win/vncviewer/vncviewer.rc b/win/vncviewer/vncviewer.rc
deleted file mode 100644
index 1d467584..00000000
--- a/win/vncviewer/vncviewer.rc
+++ /dev/null
@@ -1,594 +0,0 @@
-//Microsoft Developer Studio generated resource script.
-//
-#include "resource.h"
-#include "resdefs.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "windows.h"
-
-#ifndef IDC_STATIC
-#define IDC_STATIC -1
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.K.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#include ""windows.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_ICON                ICON    DISCARDABLE     "vncviewer.ico"
-
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION __RCVERSION
- PRODUCTVERSION __RCVERSION
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "080904b0"
-        BEGIN
-            VALUE "Comments", "\0"
-            VALUE "CompanyName", "TigerVNC Project\0"
-            #ifdef WIN64
-            VALUE "FileDescription", "TigerVNC Viewer for Win64\0"
-            VALUE "ProductName", "TigerVNC Viewer for Win64\0"
-            #else
-            VALUE "FileDescription", "TigerVNC Viewer for Win32\0"
-            VALUE "ProductName", "TigerVNC Viewer for Win32\0"
-            #endif
-            VALUE "FileVersion", __RCVERSIONSTR
-            VALUE "InternalName", "free4/vncviewer/win\0"
-            VALUE "LegalCopyright", "Copyright (C) 1999-2011 TigerVNC Team and many others (see README.txt)\0"
-            VALUE "LegalTrademarks", "TigerVNC\0"
-            VALUE "OriginalFilename", "vncviewer.exe\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductVersion", __VERSIONSTR
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x809, 1200
-    END
-END
-
-#endif    // !_MAC
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_VNC_AUTH_DLG DIALOG DISCARDABLE  0, 0, 241, 46
-STYLE DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_CAPTION
-CAPTION "VNC Viewer : Authentication"
-FONT 8, "MS Sans Serif"
-BEGIN
-    EDITTEXT        IDC_USERNAME,85,6,100,14,ES_AUTOHSCROLL
-    EDITTEXT        IDC_PASSWORD,85,25,100,15,ES_PASSWORD | ES_AUTOHSCROLL | 
-                    ES_WANTRETURN
-    DEFPUSHBUTTON   "OK",IDOK,190,6,45,14
-    PUSHBUTTON      "Cancel",IDCANCEL,190,25,45,15
-    CONTROL         120,IDI_ICON,"Static",SS_BITMAP,7,6,21,20
-    LTEXT           "Username:",IDC_STATIC,45,6,35,14
-    LTEXT           "Password:",IDC_STATIC,45,25,35,15
-END
-
-IDD_CONNECTING_DLG DIALOG DISCARDABLE  0, 0, 185, 47
-STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_CAPTION
-CAPTION "VNC Viewer : Connecting"
-FONT 8, "MS Sans Serif"
-BEGIN
-    PUSHBUTTON      "Cancel",IDCANCEL,128,26,50,14
-    CTEXT           "Attempting to connect to host...",IDC_CONNECTING_TEXT,7,
-                    7,171,14,SS_CENTERIMAGE
-END
-
-IDD_CONNECTION_DLG DIALOG DISCARDABLE  0, 0, 224, 66
-STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_CAPTION | 
-    WS_SYSMENU
-CAPTION "VNC Viewer : Connection Details"
-FONT 8, "MS Sans Serif"
-BEGIN
-    COMBOBOX        IDC_SERVER_EDIT,85,15,105,234,CBS_DROPDOWN | 
-                    CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "&About...",IDC_ABOUT,5,45,50,14
-    PUSHBUTTON      "&Options...",IDC_OPTIONS,60,45,50,14
-    DEFPUSHBUTTON   "OK",IDOK,115,45,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,170,45,48,14
-    CONTROL         120,IDI_ICON,"Static",SS_BITMAP | SS_REALSIZEIMAGE,5,6,
-                    20,20
-    RTEXT           "Server:",IDC_STATIC,43,15,37,13,SS_CENTERIMAGE
-END
-
-IDD_ABOUT DIALOG DISCARDABLE  0, 0, 300, 92
-STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_CAPTION | 
-    WS_SYSMENU
-CAPTION "About TigerVNC Viewer for Windows"
-FONT 8, "MS Sans Serif"
-BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,245,70,47,15
-    CONTROL         120,IDC_STATIC,"Static",SS_BITMAP | SS_REALSIZEIMAGE,7,
-                    10,33,31
-    LTEXT           ">appname<",IDC_DESCRIPTION,46,10,119,15
-    LTEXT           ">version<",IDC_VERSION,165,10,77,15
-    LTEXT           ">buildtime<",IDC_BUILDTIME,46,25,196,15
-    LTEXT           ">copyright<",IDC_COPYRIGHT,46,40,250,15
-    LTEXT           "Visit www.tigervnc.org for more information on TigerVNC.",
-                    IDC_STATIC,46,55,196,15
-END
-
-IDD_FORMAT DIALOG DISCARDABLE  0, 0, 201, 161
-STYLE DS_MODALFRAME | DS_CONTROL | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Colour && Encoding"
-FONT 8, "MS Sans Serif"
-BEGIN
-    CONTROL         "&Auto select",IDC_ENCODING_AUTO,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,7,88,13
-    GROUPBOX        "Preferred encoding",IDC_STATIC,7,20,83,75
-    CONTROL         "Tight",IDC_ENCODING_TIGHT,"Button",BS_AUTORADIOBUTTON | 
-                    WS_GROUP,10,30,75,14
-    CONTROL         "ZRLE",IDC_ENCODING_ZRLE,"Button",BS_AUTORADIOBUTTON,10,
-                    45,75,14
-    CONTROL         "Hextile",IDC_ENCODING_HEXTILE,"Button",
-                    BS_AUTORADIOBUTTON,10,60,75,16
-    CONTROL         "Raw",IDC_ENCODING_RAW,"Button",BS_AUTORADIOBUTTON,10,75,
-                    75,15
-    GROUPBOX        "Color level",IDC_STATIC,95,20,99,75
-    CONTROL         "&Full (all available colors)",IDC_FORMAT_FULLCOLOUR,
-                    "Button",BS_AUTORADIOBUTTON | WS_GROUP,100,30,90,15
-    CONTROL         "&Medium (256 colors)",IDC_FORMAT_MEDIUMCOLOUR,"Button",
-                    BS_AUTORADIOBUTTON,100,45,90,14
-    CONTROL         "&Low (64 colors)",IDC_FORMAT_LOWCOLOUR,"Button",
-                    BS_AUTORADIOBUTTON,100,60,90,16
-    CONTROL         "&Very low (8 colors)",IDC_FORMAT_VERYLOWCOLOUR,"Button",
-                    BS_AUTORADIOBUTTON,100,75,90,15
-    CONTROL         "Custom compression level:",IDC_CUSTOM_COMPRESSLEVEL,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,100,99,10
-    EDITTEXT        IDC_COMPRESSLEVEL,25,111,15,12,ES_AUTOHSCROLL | 
-                    ES_NUMBER
-    LTEXT           "level (1=fast, 9=best)",IDC_STATIC,44,114,81,9,NOT 
-                    WS_GROUP
-    CONTROL         "Allow JPEG compression:",IDC_ALLOW_JPEG,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,10,126,96,10
-    EDITTEXT        IDC_QUALITYLEVEL,25,137,15,12,ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "quality (1=poor, 9=best)",IDC_STATIC,44,140,81,9
-END
-
-IDD_MISC DIALOG DISCARDABLE  0, 0, 216, 138
-STYLE DS_MODALFRAME | DS_CONTROL | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Misc"
-FONT 8, "MS Sans Serif"
-BEGIN
-    CONTROL         "Shared connection (do not disconnect other viewers)",
-                    IDC_CONN_SHARED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,
-                    10,202,15
-    CONTROL         "Full-screen mode",IDC_FULL_SCREEN,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,25,99,15
-    CONTROL         "Render cursor locally",IDC_LOCAL_CURSOR,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,40,99,15
-    CONTROL         "Allow dynamic desktop resizing",IDC_DESKTOP_RESIZE,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,55,112,15
-    CONTROL         "Only use protocol version 3.3",IDC_PROTOCOL_3_3,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,70,111,15
-    CONTROL         "Beep when requested to by the server",IDC_ACCEPT_BELL,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,85,202,15
-    CONTROL         "Offer to automatically reconnect",IDC_AUTO_RECONNECT,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,100,202,15
-    CONTROL         "Show toolbar",IDC_SHOW_TOOLBAR,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,106,25,103,15
-    COMBOBOX        IDC_COMBO_SCALE,138,40,42,134,CBS_DROPDOWN | CBS_SORT | 
-                    WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Scale by:",IDC_STATIC_SCALE,106,40,32,15,SS_CENTERIMAGE
-    LTEXT           "%",IDC_STATIC_PERCENT,185,40,24,15,SS_CENTERIMAGE
-END
-
-IDD_INPUTS DIALOG DISCARDABLE  0, 0, 186, 162
-STYLE DS_MODALFRAME | DS_CONTROL | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Inputs"
-FONT 8, "MS Sans Serif"
-BEGIN
-    CONTROL         "Send pointer events to server",IDC_SEND_POINTER,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,10,172,15
-    CONTROL         "Send keyboard events to server",IDC_SEND_KEYS,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,25,172,15
-    CONTROL         "Send clipboard changes to server",IDC_CLIENT_CUTTEXT,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,40,172,15
-    CONTROL         "Accept clipboard changes from server",
-                    IDC_SERVER_CUTTEXT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
-                    7,55,172,15
-    CONTROL         "Enable 3-button mouse emulation",IDC_EMULATE3,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,70,172,15
-    CONTROL         "Rate-limit mouse move events",IDC_POINTER_INTERVAL,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,86,172,14
-    LTEXT           "Menu key",IDC_STATIC,7,100,98,15,SS_CENTERIMAGE
-    COMBOBOX        IDC_MENU_KEY,105,100,74,105,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Pass special keys directly to server",
-                    IDC_DISABLE_WINKEYS,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,7,115,172,15
-END
-
-IDD_CONNECTION_INFO DIALOG DISCARDABLE  0, 0, 239, 199
-STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_CAPTION | 
-    WS_SYSMENU
-CAPTION "VNC Connection Info"
-FONT 8, "MS Sans Serif"
-BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,182,178,50,14
-    LTEXT           "Desktop Name:",IDC_STATIC,7,10,73,15
-    LTEXT           "Host:",IDC_STATIC,7,25,73,15
-    LTEXT           "Size:",IDC_STATIC,7,40,73,15
-    LTEXT           "Pixel Format:",IDC_STATIC,7,55,73,15
-    LTEXT           "Server Default:",IDC_STATIC,7,70,73,15
-    LTEXT           "Line Speed Estimate:",IDC_STATIC,7,115,73,15
-    LTEXT           "Protocol Version:",IDC_STATIC,7,130,73,15
-    LTEXT           "",IDC_INFO_NAME,80,10,152,15
-    LTEXT           "",IDC_INFO_HOST,80,25,152,15
-    LTEXT           "",IDC_INFO_SIZE,80,40,152,15
-    LTEXT           "",IDC_INFO_PF,80,55,152,15
-    LTEXT           "",IDC_INFO_DEF_PF,80,70,152,15
-    LTEXT           "",IDC_INFO_LINESPEED,80,115,152,15
-    LTEXT           "",IDC_INFO_VERSION,80,130,152,15
-    LTEXT           "Security Method:",IDC_STATIC,7,145,73,15
-    LTEXT           "",IDC_INFO_SECURITY,80,145,152,15
-    LTEXT           "Requested Encoding:",IDC_STATIC,7,85,73,15
-    LTEXT           "Last Used Encoding:",IDC_STATIC,7,100,73,15
-    LTEXT           "",IDC_REQUESTED_ENCODING,80,86,152,15
-    LTEXT           "",IDC_LAST_ENCODING,80,100,152,15
-    LTEXT           "Static",IDC_INFO_ENCRYPTION,80,160,152,15
-    LTEXT           "Encryption:",IDC_STATIC,7,160,73,15
-END
-
-IDD_DEFAULTS DIALOG DISCARDABLE  0, 0, 217, 87
-STYLE DS_MODALFRAME | DS_CONTROL | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Load / Save"
-FONT 8, "MS Sans Serif"
-BEGIN
-    PUSHBUTTON      "&Reload",IDC_LOAD_CONFIG,15,20,85,15
-    PUSHBUTTON      "&Save",IDC_SAVE_CONFIG,15,40,85,15
-    PUSHBUTTON      "Save &As ...",IDC_SAVE_CONFIG_AS,15,60,85,15
-    PUSHBUTTON      "R&eload",IDC_LOAD_DEFAULTS,120,20,85,15
-    PUSHBUTTON      "S&ave",IDC_SAVE_DEFAULTS,120,40,85,15
-    GROUPBOX        "Configuration File",IDC_STATIC,7,7,100,74
-    GROUPBOX        "Defaults",IDC_STATIC,113,7,97,53
-END
-
-
-IDD_SECURITY DIALOG DISCARDABLE  0, 0, 200, 200
-STYLE DS_MODALFRAME | DS_CONTROL | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Security"
-FONT 8, "MS Sans Serif"
-BEGIN
-    CONTROL         "Extended encryption and authentication methods (VeNCrypt)",
-                    IDC_VENCRYPT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
-                    7,10,200,15
-    GROUPBOX        "Session encryption", IDC_STATIC, 7,25,120,60
-    CONTROL         "None", IDC_ENC_NONE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
-                    10,35,50,15
-    CONTROL         "Anonymous TLS", IDC_ENC_TLS, "Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP, 10,50,80,15
-    CONTROL         "TLS with X.509 certificates", IDC_ENC_X509, "Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP, 10,65,110,15
-    GROUPBOX        "X.509 certificates", IDC_STATIC, 7,90,170,30
-    PUSHBUTTON      "Load CA certificate", IDC_LOAD_CACERT, 10,100,80,15
-    PUSHBUTTON      "Load CRL certificate", IDC_LOAD_CRLCERT, 90,100,80,15
-    GROUPBOX        "Authentication", IDC_STATIC, 7,125,100,60
-    CONTROL         "None", IDC_AUTH_NONE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
-                    10,135,50,15
-    CONTROL         "Standard VNC", IDC_AUTH_VNC, "Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP, 10,150,80,15
-    CONTROL         "Plaintext", IDC_AUTH_PLAIN, "Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP, 10,165,70,15
-END
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE 
-BEGIN
-    IDD_VNC_AUTH_DLG, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 235
-        VERTGUIDE, 45
-        VERTGUIDE, 80
-        VERTGUIDE, 85
-        VERTGUIDE, 185
-        VERTGUIDE, 190
-        TOPMARGIN, 6
-        BOTTOMMARGIN, 40
-        HORZGUIDE, 20
-        HORZGUIDE, 25
-        HORZGUIDE, 40
-    END
-
-    IDD_CONNECTING_DLG, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 178
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 40
-        HORZGUIDE, 21
-        HORZGUIDE, 26
-    END
-
-    IDD_CONNECTION_DLG, DIALOG
-    BEGIN
-        LEFTMARGIN, 5
-        RIGHTMARGIN, 218
-        VERTGUIDE, 30
-        VERTGUIDE, 43
-        VERTGUIDE, 55
-        VERTGUIDE, 60
-        VERTGUIDE, 80
-        VERTGUIDE, 85
-        VERTGUIDE, 110
-        VERTGUIDE, 115
-        VERTGUIDE, 165
-        VERTGUIDE, 170
-        VERTGUIDE, 190
-        TOPMARGIN, 6
-        BOTTOMMARGIN, 59
-        HORZGUIDE, 19
-        HORZGUIDE, 24
-        HORZGUIDE, 36
-        HORZGUIDE, 45
-    END
-
-    IDD_ABOUT, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 242
-        VERTGUIDE, 46
-        VERTGUIDE, 165
-        VERTGUIDE, 195
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 85
-        HORZGUIDE, 10
-        HORZGUIDE, 25
-        HORZGUIDE, 40
-        HORZGUIDE, 55
-        HORZGUIDE, 70
-    END
-
-    IDD_FORMAT, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 194
-        VERTGUIDE, 10
-        VERTGUIDE, 85
-        VERTGUIDE, 90
-        VERTGUIDE, 95
-        VERTGUIDE, 100
-        VERTGUIDE, 105
-        VERTGUIDE, 190
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 154
-        HORZGUIDE, 10
-        HORZGUIDE, 20
-        HORZGUIDE, 25
-        HORZGUIDE, 35
-        HORZGUIDE, 49
-        HORZGUIDE, 65
-        HORZGUIDE, 80
-        HORZGUIDE, 85
-    END
-
-    IDD_MISC, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 209
-        VERTGUIDE, 106
-        VERTGUIDE, 138
-        VERTGUIDE, 180
-        VERTGUIDE, 185
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 131
-        HORZGUIDE, 10
-        HORZGUIDE, 25
-        HORZGUIDE, 40
-        HORZGUIDE, 55
-        HORZGUIDE, 70
-        HORZGUIDE, 85
-        HORZGUIDE, 100
-        HORZGUIDE, 115
-        HORZGUIDE, 130
-    END
-
-    IDD_INPUTS, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 179
-        VERTGUIDE, 105
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 155
-        HORZGUIDE, 10
-        HORZGUIDE, 25
-        HORZGUIDE, 40
-        HORZGUIDE, 55
-        HORZGUIDE, 70
-        HORZGUIDE, 85
-        HORZGUIDE, 100
-        HORZGUIDE, 115
-        HORZGUIDE, 130
-        HORZGUIDE, 145
-    END
-
-    IDD_CONNECTION_INFO, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 232
-        VERTGUIDE, 80
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 192
-        HORZGUIDE, 10
-        HORZGUIDE, 25
-        HORZGUIDE, 40
-        HORZGUIDE, 55
-        HORZGUIDE, 70
-        HORZGUIDE, 85
-        HORZGUIDE, 100
-        HORZGUIDE, 115
-        HORZGUIDE, 130
-        HORZGUIDE, 145
-        HORZGUIDE, 160
-        HORZGUIDE, 175
-    END
-
-    IDD_DEFAULTS, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 210
-        VERTGUIDE, 15
-        VERTGUIDE, 100
-        VERTGUIDE, 107
-        VERTGUIDE, 113
-        VERTGUIDE, 120
-        VERTGUIDE, 205
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 80
-        HORZGUIDE, 20
-        HORZGUIDE, 35
-        HORZGUIDE, 40
-        HORZGUIDE, 55
-        HORZGUIDE, 60
-        HORZGUIDE, 75
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Cursor
-//
-
-IDC_DOT_CURSOR          CURSOR  DISCARDABLE     "cursor1.cur"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog Info
-//
-
-IDD_CONNECTION_DLG DLGINIT
-BEGIN
-    IDC_SERVER_EDIT, 0x403, 16, 0,
-0x796d, 0x616d, 0x6863, 0x6e69, 0x2e65, 0x726f, 0x3a67, 0x0031, 
-    0
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-IDR_TRAY MENU DISCARDABLE 
-BEGIN
-    POPUP "Tray Menu"
-    BEGIN
-        MENUITEM "&New Connection...",          ID_NEW_CONNECTION
-        MENUITEM SEPARATOR
-        MENUITEM "Default &Options...",         ID_OPTIONS
-        MENUITEM SEPARATOR
-        MENUITEM "&Close Daemon",               ID_CLOSE
-        MENUITEM "&About...",                   ID_ABOUT
-    END
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// 24
-//
-
-#ifdef WIN64
-IDR_MANIFEST            24      DISCARDABLE     "vncviewer.exe.manifest64"
-#else
-IDR_MANIFEST            24      DISCARDABLE     "vncviewer.exe.manifest"
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Bitmap
-//
-
-IDB_BITMAP              BITMAP  DISCARDABLE     "vncviewer.bmp"
-IDB_TOOLBAR             BITMAP  DISCARDABLE     "toolbar.bmp"
-#endif    // English (U.K.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-