Home / Browse / TigerVNC / Mail / Archive

TigerVNC

Email Archive: tigervnc-commits (read-only)

[Tigervnc-commits] SF.net SVN: tigervnc:[4371] trunk/vncviewer

From: <ossman_@us...> - 2011-04-15 07:47

Revision: 4371
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4371&view=rev
Author:   ossman_
Date:     2011-04-15 07:46:56 +0000 (Fri, 15 Apr 2011)

Log Message:
-----------
Split out the graphics and input handling to a separate widget in preparation
for things like scroll bars.

Modified Paths:
--------------
    trunk/vncviewer/CMakeLists.txt
    trunk/vncviewer/DesktopWindow.cxx
    trunk/vncviewer/DesktopWindow.h

Added Paths:
-----------
    trunk/vncviewer/Viewport.cxx
    trunk/vncviewer/Viewport.h

Modified: trunk/vncviewer/CMakeLists.txt
===================================================================
--- trunk/vncviewer/CMakeLists.txt	2011-04-14 15:16:18 UTC (rev 4370)
+++ trunk/vncviewer/CMakeLists.txt	2011-04-15 07:46:56 UTC (rev 4371)
@@ -5,6 +5,7 @@
   CConn.cxx
   DesktopWindow.cxx
   UserDialog.cxx
+  Viewport.cxx
   parameters.cxx
   keysym2ucs.c
   vncviewer.cxx)

Modified: trunk/vncviewer/DesktopWindow.cxx
===================================================================
--- trunk/vncviewer/DesktopWindow.cxx	2011-04-14 15:16:18 UTC (rev 4370)
+++ trunk/vncviewer/DesktopWindow.cxx	2011-04-15 07:46:56 UTC (rev 4371)
@@ -21,35 +21,13 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <FL/fl_draw.H>
-
-#include <rfb/CMsgWriter.h>
 #include <rfb/LogWriter.h>
 
-// FLTK can pull in the X11 headers on some systems
-#ifndef XK_VoidSymbol
-#define XK_MISCELLANY
-#define XK_XKB_KEYS
-#include <rfb/keysymdef.h>
-#endif
-
 #include "DesktopWindow.h"
-#include "CConn.h"
 #include "i18n.h"
-#include "parameters.h"
-#include "keysym2ucs.h"
 
-// FLTK STR #2599 must be fixed for proper dead keys support
-#ifndef HAVE_FLTK_DEAD_KEYS
-#define event_compose_symbol event_text
-#endif
-
 using namespace rfb;
 
-#ifdef __APPLE__
-extern "C" const char *osx_event_string(void);
-#endif
-
 extern void exit_vncviewer();
 
 static rfb::LogWriter vlog("DesktopWindow");
@@ -57,56 +35,34 @@
 DesktopWindow::DesktopWindow(int w, int h, const char *name,
                              const rfb::PixelFormat& serverPF,
                              CConn* cc_)
-  : Fl_Window(w, h), cc(cc_), frameBuffer(NULL), pixelTrans(NULL),
-    lastPointerPos(0, 0), lastButtonMask(0)
+  : Fl_Window(w, h)
 {
+  viewport = new Viewport(w, h, serverPF, cc_);
+
   callback(handleClose, this);
 
   setName(name);
 
-  frameBuffer = new ManagedPixelBuffer(getPreferredPF(), w, h);
-  assert(frameBuffer);
-
-  setServerPF(serverPF);
-
   show();
 }
 
 
 DesktopWindow::~DesktopWindow()
 {
-  // Unregister all timeouts in case they get a change tro trigger
-  // again later when this object is already gone.
-  Fl::remove_timeout(handleUpdateTimeout, this);
-  Fl::remove_timeout(handleColourMap, this);
-  Fl::remove_timeout(handlePointerTimeout, this);
-
-  delete frameBuffer;
-
-  if (pixelTrans)
-    delete pixelTrans;
+  // FLTK automatically deletes all child widgets, so we shouldn't touch
+  // them ourselves here
 }
 
 
 void DesktopWindow::setServerPF(const rfb::PixelFormat& pf)
 {
-  if (pixelTrans)
-    delete pixelTrans;
-  pixelTrans = NULL;
-
-  if (pf.equal(getPreferredPF()))
-    return;
-
-  pixelTrans = new PixelTransformer();
-  pixelTrans->init(pf, &colourMap, getPreferredPF());
+  viewport->setServerPF(pf);
 }
 
 
 const rfb::PixelFormat &DesktopWindow::getPreferredPF()
 {
-  static PixelFormat prefPF(32, 24, false, true, 255, 255, 255, 0, 8, 16);
-
-  return prefPF;
+  return viewport->getPreferredPF();
 }
 
 
@@ -128,18 +84,11 @@
   copy_label(windowNameStr.buf);
 }
 
-// setColourMapEntries() changes some of the entries in the colourmap.
-// Unfortunately these messages are often sent one at a time, so we delay the
-// settings taking effect by 100ms.  This is because recalculating the internal
-// translation table can be expensive.
+
 void DesktopWindow::setColourMapEntries(int firstColour, int nColours,
                                         rdr::U16* rgbs)
 {
-  for (int i = 0; i < nColours; i++)
-    colourMap.set(firstColour+i, rgbs[i*3], rgbs[i*3+1], rgbs[i*3+2]);
-
-  if (!Fl::has_timeout(handleColourMap, this))
-    Fl::add_timeout(0.100, handleColourMap, this);
+  viewport->setColourMapEntries(firstColour, nColours, rgbs);
 }
 
 
@@ -148,370 +97,11 @@
 
 void DesktopWindow::updateWindow()
 {
-  Rect r;
-
-  Fl::remove_timeout(handleUpdateTimeout, this);
-
-  r = damage.get_bounding_rect();
-  Fl_Window::damage(FL_DAMAGE_USER1, r.tl.x, r.tl.y, r.width(), r.height());
-
-  damage.clear();
+  viewport->updateWindow();
 }
 
 
-void DesktopWindow::draw()
-{
-  int X, Y, W, H;
-
-  int pixel_bytes, stride_bytes;
-  const uchar *buf_start;
-
-  // Check what actually needs updating
-  fl_clip_box(0, 0, w(), h(), X, Y, W, H);
-  if ((W == 0) || (H == 0))
-    return;
-
-  pixel_bytes = frameBuffer->getPF().bpp/8;
-  stride_bytes = pixel_bytes * frameBuffer->getStride();
-  buf_start = frameBuffer->data +
-              pixel_bytes * X +
-              stride_bytes * Y;
-
-  // FIXME: Check how efficient this thing really is
-  fl_draw_image(buf_start, X, Y, W, H, pixel_bytes, stride_bytes);
-}
-
-
-int DesktopWindow::handle(int event)
-{
-  int buttonMask, wheelMask;
-  DownMap::const_iterator iter;
-
-  switch (event) {
-  case FL_PUSH:
-  case FL_RELEASE:
-  case FL_DRAG:
-  case FL_MOVE:
-  case FL_MOUSEWHEEL:
-    buttonMask = 0;
-    if (Fl::event_button1())
-      buttonMask |= 1;
-    if (Fl::event_button2())
-      buttonMask |= 2;
-    if (Fl::event_button3())
-      buttonMask |= 4;
-
-    if (event == FL_MOUSEWHEEL) {
-      if (Fl::event_dy() < 0)
-        wheelMask = 8;
-      else
-        wheelMask = 16;
-
-      // A quick press of the wheel "button", followed by a immediate
-      // release below
-      handlePointerEvent(Point(Fl::event_x(), Fl::event_y()),
-                         buttonMask | wheelMask);
-    } 
-
-    handlePointerEvent(Point(Fl::event_x(), Fl::event_y()), buttonMask);
-    return 1;
-
-  case FL_FOCUS:
-    // Yes, we would like some focus please!
-    return 1;
-
-  case FL_UNFOCUS:
-    // Release all keys that were pressed as that generally makes most
-    // sense (e.g. Alt+Tab where we only see the Alt press)
-    for (iter = downKeySym.begin();iter != downKeySym.end();++iter)
-      cc->writer()->keyEvent(iter->second, false);
-    downKeySym.clear();
-    return 1;
-
-  case FL_KEYDOWN:
-    handleKeyEvent(Fl::event_key(), Fl::event_compose_symbol(), true);
-    return 1;
-
-  case FL_KEYUP:
-    handleKeyEvent(Fl::event_key(), Fl::event_compose_symbol(), false);
-    return 1;
-  }
-
-  return Fl_Window::handle(event);
-}
-
-
-void DesktopWindow::handleUpdateTimeout(void *data)
-{
-  DesktopWindow *self = (DesktopWindow *)data;
-
-  assert(self);
-
-  self->updateWindow();
-}
-
-
-void DesktopWindow::handleColourMap(void *data)
-{
-  DesktopWindow *self = (DesktopWindow *)data;
-
-  assert(self);
-
-  if (self->pixelTrans != NULL)
-    self->pixelTrans->setColourMapEntries(0, 0);
-
-  self->Fl_Window::damage(FL_DAMAGE_ALL);
-}
-
 void DesktopWindow::handleClose(Fl_Widget *wnd, void *data)
 {
   exit_vncviewer();
 }
-
-
-void DesktopWindow::handlePointerEvent(const rfb::Point& pos, int buttonMask)
-{
-  if (!viewOnly) {
-    if (pointerEventInterval == 0 || buttonMask != lastButtonMask) {
-      cc->writer()->pointerEvent(pos, buttonMask);
-    } else {
-      if (!Fl::has_timeout(handlePointerTimeout, this))
-        Fl::add_timeout((double)pointerEventInterval/1000.0,
-                        handlePointerTimeout, this);
-    }
-    lastPointerPos = pos;
-    lastButtonMask = buttonMask;
-  }
-}
-
-
-void DesktopWindow::handlePointerTimeout(void *data)
-{
-  DesktopWindow *self = (DesktopWindow *)data;
-
-  assert(self);
-
-  self->cc->writer()->pointerEvent(self->lastPointerPos, self->lastButtonMask);
-}
-
-
-rdr::U32 DesktopWindow::translateKeyEvent(int keyCode, const char *keyText)
-{
-  unsigned ucs;
-
-  // First check for function keys
-  if ((keyCode > FL_F) && (keyCode <= FL_F_Last))
-    return XK_F1 + (keyCode - FL_F - 1);
-
-  // Numpad numbers
-  if ((keyCode >= (FL_KP + '0')) && (keyCode <= (FL_KP + '9')))
-    return XK_KP_0 + (keyCode - (FL_KP + '0'));
-
-  // Then other special keys
-  switch (keyCode) {
-  case FL_BackSpace:
-    return XK_BackSpace;
-  case FL_Tab:
-    return XK_Tab;
-  case FL_Enter:
-    return XK_Return;
-  case FL_Pause:
-    return XK_Pause;
-  case FL_Scroll_Lock:
-    return XK_Scroll_Lock;
-  case FL_Escape:
-    return XK_Escape;
-  case FL_Home:
-    return XK_Home;
-  case FL_Left:
-    return XK_Left;
-  case FL_Up:
-    return XK_Up;
-  case FL_Right:
-    return XK_Right;
-  case FL_Down:
-    return XK_Down;
-  case FL_Page_Up:
-    return XK_Page_Up;
-  case FL_Page_Down:
-    return XK_Page_Down;
-  case FL_End:
-    return XK_End;
-  case FL_Print:
-    return XK_Print;
-  case FL_Insert:
-    return XK_Insert;
-  case FL_Menu:
-    return XK_Menu;
-  case FL_Help:
-    return XK_Help;
-  case FL_Num_Lock:
-    return XK_Num_Lock;
-  case FL_Shift_L:
-    return XK_Shift_L;
-  case FL_Shift_R:
-    return XK_Shift_R;
-  case FL_Control_L:
-    return XK_Control_L;
-  case FL_Control_R:
-    return XK_Control_R;
-  case FL_Caps_Lock:
-    return XK_Caps_Lock;
-  case FL_Meta_L:
-    return XK_Super_L;
-  case FL_Meta_R:
-    return XK_Super_R;
-  case FL_Alt_L:
-    return XK_Alt_L;
-  case FL_Alt_R:
-    return XK_Alt_R;
-  case FL_Delete:
-    return XK_Delete;
-  case FL_KP_Enter:
-    return XK_KP_Enter;
-  case FL_KP + '=':
-    return XK_KP_Equal;
-  case FL_KP + '*':
-    return XK_KP_Multiply;
-  case FL_KP + '+':
-    return XK_KP_Add;
-  case FL_KP + ',':
-    return XK_KP_Separator;
-  case FL_KP + '-':
-    return XK_KP_Subtract;
-  case FL_KP + '.':
-    return XK_KP_Decimal;
-  case FL_KP + '/':
-    return XK_KP_Divide;
-  case XK_ISO_Level3_Shift:
-    // FLTK tends to let this one leak through on X11...
-    return XK_ISO_Level3_Shift;
-  }
-
-  // Ctrl and Cmd tend to fudge input handling, so we need to cheat here
-  if (Fl::event_state() & (FL_COMMAND | FL_CTRL)) {
-#ifdef WIN32
-    BYTE keystate[256];
-    WCHAR wbuf[8];
-    int ret;
-
-    static char buf[32];
-
-    switch (fl_msg.message) {
-    case WM_KEYDOWN:
-    case WM_SYSKEYDOWN:
-      // Most buttons end up here when Ctrl is pressed. Here we can pretend
-      // that Ctrl isn't pressed, and do a character lookup.
-      GetKeyboardState(keystate);
-      keystate[VK_CONTROL] = keystate[VK_LCONTROL] = keystate[VK_RCONTROL] = 0;
-
-      ret = ToUnicode(fl_msg.wParam, 0, keystate, wbuf, sizeof(wbuf)/sizeof(wbuf[0]), 0);
-      if (ret != 0) {
-        // -1 means one dead character
-        ret = abs(ret);
-        wbuf[ret] = 0x0000;
-
-        if (fl_utf8fromwc(buf, sizeof(buf), wbuf, ret) >= sizeof(buf)) {
-          vlog.error(_("Out of buffer space whilst converting key event"));
-          return XK_VoidSymbol;
-        }
-
-        keyText = buf;
-      }
-      break;
-    case WM_CHAR:
-    case WM_SYSCHAR:
-      // Windows doesn't seem to have any sanity when it comes to control
-      // characters. We assume that Ctrl-A through Ctrl-Z range maps to
-      // the VK_A through VK_Z keys, and just let the rest fall through.
-      if ((fl_msg.wParam < 0x01) || (fl_msg.wParam > 0x1a))
-        break;
-
-      // Pretend that Ctrl isn't pressed, and do a character lookup.
-      GetKeyboardState(keystate);
-      keystate[VK_CONTROL] = keystate[VK_LCONTROL] = keystate[VK_RCONTROL] = 0;
-
-      // Ctrl-A is 0x01 and VK_A is 0x41, so add 0x40 for the conversion
-      ret = ToUnicode(fl_msg.wParam + 0x40, 0, keystate, wbuf, sizeof(wbuf)/sizeof(wbuf[0]), 0);
-      if (ret != 0) {
-        // -1 means one dead character
-        ret = abs(ret);
-        wbuf[ret] = 0x0000;
-
-        if (fl_utf8fromwc(buf, sizeof(buf), wbuf, ret) >= sizeof(buf)) {
-          vlog.error(_("Out of buffer space whilst converting key event"));
-          return XK_VoidSymbol;
-        }
-
-        keyText = buf;
-      }
-      break;
-    default:
-      // Not sure how we ended up here. Do nothing...
-      break;
-    }
-#elif defined(__APPLE__)
-    keyText = osx_event_string();
-#else
-    char buf[16];
-    KeySym sym;
-
-    XLookupString((XKeyEvent*)fl_xevent, buf, sizeof(buf), &sym, NULL);
-
-    return sym;
-#endif
-  }
-
-  // Unknown special key?
-  if (keyText[0] == '\0') {
-    vlog.error(_("Unknown FLTK key code %d (0x%04x)"), keyCode, keyCode);
-    return XK_VoidSymbol;
-  }
-
-  // Look up the symbol the key produces and translate that from Unicode
-  // to a X11 keysym.
-  if (fl_utf_nb_char((const unsigned char*)keyText, strlen(keyText)) != 1) {
-    vlog.error(_("Multiple characters given for key code %d (0x%04x): '%s'"),
-               keyCode, keyCode, keyText);
-    return XK_VoidSymbol;
-  }
-
-  ucs = fl_utf8decode(keyText, NULL, NULL);
-  return ucs2keysym(ucs);
-}
-
-
-void DesktopWindow::handleKeyEvent(int keyCode, const char *keyText, bool down)
-{
-  rdr::U32 keySym;
-
-  if (viewOnly)
-    return;
-
-  // Because of the way keyboards work, we cannot expect to have the same
-  // symbol on release as when pressed. This breaks the VNC protocol however,
-  // so we need to keep track of what keysym a key _code_ generated on press
-  // and send the same on release.
-  if (!down) {
-    DownMap::iterator iter;
-
-    iter = downKeySym.find(keyCode);
-    if (iter == downKeySym.end()) {
-      vlog.error(_("Unexpected release of FLTK key code %d (0x%04x)"), keyCode, keyCode);
-      return;
-    }
-
-    cc->writer()->keyEvent(iter->second, false);
-
-    downKeySym.erase(iter);
-
-    return;
-  }
-
-  keySym = translateKeyEvent(keyCode, keyText);
-  if (keySym == XK_VoidSymbol)
-    return;
-
-  downKeySym[keyCode] = keySym;
-  cc->writer()->keyEvent(keySym, down);
-}

Modified: trunk/vncviewer/DesktopWindow.h
===================================================================
--- trunk/vncviewer/DesktopWindow.h	2011-04-14 15:16:18 UTC (rev 4370)
+++ trunk/vncviewer/DesktopWindow.h	2011-04-15 07:46:56 UTC (rev 4371)
@@ -26,11 +26,9 @@
 #include <FL/Fl_Window.H>
 
 #include <rfb/Rect.h>
-#include <rfb/Region.h>
-#include <rfb/Timer.h>
-#include <rfb/PixelBuffer.h>
-#include <rfb/PixelTransformer.h>
 
+#include "Viewport.h"
+
 class CConn;
 
 class DesktopWindow : public Fl_Window {
@@ -58,68 +56,20 @@
   void setColourMapEntries(int firstColour, int nColours, rdr::U16* rgbs);
 
   void fillRect(const rfb::Rect& r, rfb::Pixel pix) {
-    if (pixelTrans) {
-      rfb::Pixel pix2;
-      pixelTrans->translatePixels(&pix, &pix2, 1);
-      pix = pix2;
-    }
-
-    frameBuffer->fillRect(r, pix);
-    damageRect(r);
+    viewport->fillRect(r, pix);
   }
   void imageRect(const rfb::Rect& r, void* pixels) {
-    if (pixelTrans)
-      pixelTrans->translateRect(pixels, r.width(),
-                                rfb::Rect(0, 0, r.width(), r.height()),
-                                frameBuffer->data, frameBuffer->getStride(),
-                                r.tl);
-    else
-      frameBuffer->imageRect(r, pixels);
-    damageRect(r);
+    viewport->imageRect(r, pixels);
   }
   void copyRect(const rfb::Rect& r, int srcX, int srcY) {
-    frameBuffer->copyRect(r, rfb::Point(r.tl.x-srcX, r.tl.y-srcY));
-    damageRect(r);
+    viewport->copyRect(r, srcX, srcY);
   }
 
-  // Fl_Window callback methods
-  void draw();
-  int handle(int event);
-
 private:
-
-  void damageRect(const rfb::Rect& r) {
-    damage.assign_union(rfb::Region(r));
-    if (!Fl::has_timeout(handleUpdateTimeout, this))
-      Fl::add_timeout(0.100, handleUpdateTimeout, this);
-  };
-
-  static void handleUpdateTimeout(void *data);
-  static void handleColourMap(void *data);
-
   static void handleClose(Fl_Widget *wnd, void *data);
 
-  void handlePointerEvent(const rfb::Point& pos, int buttonMask);
-  static void handlePointerTimeout(void *data);
-
-  rdr::U32 translateKeyEvent(int keyCode, const char *keyText);
-  void handleKeyEvent(int keyCode, const char *keyText, bool down);
-
 private:
-  CConn* cc;
-
-  rfb::ManagedPixelBuffer* frameBuffer;
-
-  rfb::PixelTransformer *pixelTrans;
-  rfb::SimpleColourMap colourMap;
-
-  rfb::Region damage;
-
-  rfb::Point lastPointerPos;
-  int lastButtonMask;
-
-  typedef std::map<int, rdr::U32> DownMap;
-  DownMap downKeySym;
+  Viewport *viewport;
 };
 
 #endif

Copied: trunk/vncviewer/Viewport.cxx (from rev 4369, trunk/vncviewer/DesktopWindow.cxx)
===================================================================
--- trunk/vncviewer/Viewport.cxx	                        (rev 0)
+++ trunk/vncviewer/Viewport.cxx	2011-04-15 07:46:56 UTC (rev 4371)
@@ -0,0 +1,489 @@
+/* Copyright (C) 2002-2005 RealVNC Ltd.  All Rights Reserved.
+ * Copyright 2011 Pierre Ossman <ossman@...> for Cendio AB
+ * 
+ * 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 <assert.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <FL/fl_draw.H>
+
+#include <rfb/CMsgWriter.h>
+#include <rfb/LogWriter.h>
+
+// FLTK can pull in the X11 headers on some systems
+#ifndef XK_VoidSymbol
+#define XK_MISCELLANY
+#define XK_XKB_KEYS
+#include <rfb/keysymdef.h>
+#endif
+
+#include "Viewport.h"
+#include "CConn.h"
+#include "i18n.h"
+#include "parameters.h"
+#include "keysym2ucs.h"
+
+// FLTK STR #2599 must be fixed for proper dead keys support
+#ifndef HAVE_FLTK_DEAD_KEYS
+#define event_compose_symbol event_text
+#endif
+
+using namespace rfb;
+
+#ifdef __APPLE__
+extern "C" const char *osx_event_string(void);
+#endif
+
+extern void exit_vncviewer();
+
+static rfb::LogWriter vlog("Viewport");
+
+Viewport::Viewport(int w, int h, const rfb::PixelFormat& serverPF, CConn* cc_)
+  : Fl_Widget(0, 0, w, h), cc(cc_), frameBuffer(NULL), pixelTrans(NULL),
+    lastPointerPos(0, 0), lastButtonMask(0)
+{
+  frameBuffer = new ManagedPixelBuffer(getPreferredPF(), w, h);
+  assert(frameBuffer);
+
+  setServerPF(serverPF);
+}
+
+
+Viewport::~Viewport()
+{
+  // Unregister all timeouts in case they get a change tro trigger
+  // again later when this object is already gone.
+  Fl::remove_timeout(handleUpdateTimeout, this);
+  Fl::remove_timeout(handleColourMap, this);
+  Fl::remove_timeout(handlePointerTimeout, this);
+
+  delete frameBuffer;
+
+  if (pixelTrans)
+    delete pixelTrans;
+}
+
+
+void Viewport::setServerPF(const rfb::PixelFormat& pf)
+{
+  if (pixelTrans)
+    delete pixelTrans;
+  pixelTrans = NULL;
+
+  if (pf.equal(getPreferredPF()))
+    return;
+
+  pixelTrans = new PixelTransformer();
+  pixelTrans->init(pf, &colourMap, getPreferredPF());
+}
+
+
+const rfb::PixelFormat &Viewport::getPreferredPF()
+{
+  static PixelFormat prefPF(32, 24, false, true, 255, 255, 255, 0, 8, 16);
+
+  return prefPF;
+}
+
+
+// setColourMapEntries() changes some of the entries in the colourmap.
+// Unfortunately these messages are often sent one at a time, so we delay the
+// settings taking effect by 100ms.  This is because recalculating the internal
+// translation table can be expensive.
+void Viewport::setColourMapEntries(int firstColour, int nColours,
+                                   rdr::U16* rgbs)
+{
+  for (int i = 0; i < nColours; i++)
+    colourMap.set(firstColour+i, rgbs[i*3], rgbs[i*3+1], rgbs[i*3+2]);
+
+  if (!Fl::has_timeout(handleColourMap, this))
+    Fl::add_timeout(0.100, handleColourMap, this);
+}
+
+
+// Copy the areas of the framebuffer that have been changed (damaged)
+// to the displayed window.
+
+void Viewport::updateWindow()
+{
+  Rect r;
+
+  Fl::remove_timeout(handleUpdateTimeout, this);
+
+  r = damage.get_bounding_rect();
+  Fl_Widget::damage(FL_DAMAGE_USER1, r.tl.x, r.tl.y, r.width(), r.height());
+
+  damage.clear();
+}
+
+
+void Viewport::draw()
+{
+  int X, Y, W, H;
+
+  int pixel_bytes, stride_bytes;
+  const uchar *buf_start;
+
+  // Check what actually needs updating
+  fl_clip_box(0, 0, w(), h(), X, Y, W, H);
+  if ((W == 0) || (H == 0))
+    return;
+
+  pixel_bytes = frameBuffer->getPF().bpp/8;
+  stride_bytes = pixel_bytes * frameBuffer->getStride();
+  buf_start = frameBuffer->data +
+              pixel_bytes * X +
+              stride_bytes * Y;
+
+  // FIXME: Check how efficient this thing really is
+  fl_draw_image(buf_start, X, Y, W, H, pixel_bytes, stride_bytes);
+}
+
+
+int Viewport::handle(int event)
+{
+  int buttonMask, wheelMask;
+  DownMap::const_iterator iter;
+
+  switch (event) {
+  case FL_ENTER:
+    // Yes, we would like some pointer events please!
+    return 1;
+  case FL_PUSH:
+  case FL_RELEASE:
+  case FL_DRAG:
+  case FL_MOVE:
+  case FL_MOUSEWHEEL:
+    buttonMask = 0;
+    if (Fl::event_button1())
+      buttonMask |= 1;
+    if (Fl::event_button2())
+      buttonMask |= 2;
+    if (Fl::event_button3())
+      buttonMask |= 4;
+
+    if (event == FL_MOUSEWHEEL) {
+      if (Fl::event_dy() < 0)
+        wheelMask = 8;
+      else
+        wheelMask = 16;
+
+      // A quick press of the wheel "button", followed by a immediate
+      // release below
+      handlePointerEvent(Point(Fl::event_x(), Fl::event_y()),
+                         buttonMask | wheelMask);
+    } 
+
+    handlePointerEvent(Point(Fl::event_x(), Fl::event_y()), buttonMask);
+    return 1;
+
+  case FL_FOCUS:
+    // Yes, we would like some focus please!
+    return 1;
+
+  case FL_UNFOCUS:
+    // Release all keys that were pressed as that generally makes most
+    // sense (e.g. Alt+Tab where we only see the Alt press)
+    for (iter = downKeySym.begin();iter != downKeySym.end();++iter)
+      cc->writer()->keyEvent(iter->second, false);
+    downKeySym.clear();
+    return 1;
+
+  case FL_KEYDOWN:
+    handleKeyEvent(Fl::event_key(), Fl::event_compose_symbol(), true);
+    return 1;
+
+  case FL_KEYUP:
+    handleKeyEvent(Fl::event_key(), Fl::event_compose_symbol(), false);
+    return 1;
+  }
+
+  return Fl_Widget::handle(event);
+}
+
+
+void Viewport::handleUpdateTimeout(void *data)
+{
+  Viewport *self = (Viewport *)data;
+
+  assert(self);
+
+  self->updateWindow();
+}
+
+
+void Viewport::handleColourMap(void *data)
+{
+  Viewport *self = (Viewport *)data;
+
+  assert(self);
+
+  if (self->pixelTrans != NULL)
+    self->pixelTrans->setColourMapEntries(0, 0);
+
+  self->Fl_Widget::damage(FL_DAMAGE_ALL);
+}
+
+
+void Viewport::handlePointerEvent(const rfb::Point& pos, int buttonMask)
+{
+  if (!viewOnly) {
+    if (pointerEventInterval == 0 || buttonMask != lastButtonMask) {
+      cc->writer()->pointerEvent(pos, buttonMask);
+    } else {
+      if (!Fl::has_timeout(handlePointerTimeout, this))
+        Fl::add_timeout((double)pointerEventInterval/1000.0,
+                        handlePointerTimeout, this);
+    }
+    lastPointerPos = pos;
+    lastButtonMask = buttonMask;
+  }
+}
+
+
+void Viewport::handlePointerTimeout(void *data)
+{
+  Viewport *self = (Viewport *)data;
+
+  assert(self);
+
+  self->cc->writer()->pointerEvent(self->lastPointerPos, self->lastButtonMask);
+}
+
+
+rdr::U32 Viewport::translateKeyEvent(int keyCode, const char *keyText)
+{
+  unsigned ucs;
+
+  // First check for function keys
+  if ((keyCode > FL_F) && (keyCode <= FL_F_Last))
+    return XK_F1 + (keyCode - FL_F - 1);
+
+  // Numpad numbers
+  if ((keyCode >= (FL_KP + '0')) && (keyCode <= (FL_KP + '9')))
+    return XK_KP_0 + (keyCode - (FL_KP + '0'));
+
+  // Then other special keys
+  switch (keyCode) {
+  case FL_BackSpace:
+    return XK_BackSpace;
+  case FL_Tab:
+    return XK_Tab;
+  case FL_Enter:
+    return XK_Return;
+  case FL_Pause:
+    return XK_Pause;
+  case FL_Scroll_Lock:
+    return XK_Scroll_Lock;
+  case FL_Escape:
+    return XK_Escape;
+  case FL_Home:
+    return XK_Home;
+  case FL_Left:
+    return XK_Left;
+  case FL_Up:
+    return XK_Up;
+  case FL_Right:
+    return XK_Right;
+  case FL_Down:
+    return XK_Down;
+  case FL_Page_Up:
+    return XK_Page_Up;
+  case FL_Page_Down:
+    return XK_Page_Down;
+  case FL_End:
+    return XK_End;
+  case FL_Print:
+    return XK_Print;
+  case FL_Insert:
+    return XK_Insert;
+  case FL_Menu:
+    return XK_Menu;
+  case FL_Help:
+    return XK_Help;
+  case FL_Num_Lock:
+    return XK_Num_Lock;
+  case FL_Shift_L:
+    return XK_Shift_L;
+  case FL_Shift_R:
+    return XK_Shift_R;
+  case FL_Control_L:
+    return XK_Control_L;
+  case FL_Control_R:
+    return XK_Control_R;
+  case FL_Caps_Lock:
+    return XK_Caps_Lock;
+  case FL_Meta_L:
+    return XK_Super_L;
+  case FL_Meta_R:
+    return XK_Super_R;
+  case FL_Alt_L:
+    return XK_Alt_L;
+  case FL_Alt_R:
+    return XK_Alt_R;
+  case FL_Delete:
+    return XK_Delete;
+  case FL_KP_Enter:
+    return XK_KP_Enter;
+  case FL_KP + '=':
+    return XK_KP_Equal;
+  case FL_KP + '*':
+    return XK_KP_Multiply;
+  case FL_KP + '+':
+    return XK_KP_Add;
+  case FL_KP + ',':
+    return XK_KP_Separator;
+  case FL_KP + '-':
+    return XK_KP_Subtract;
+  case FL_KP + '.':
+    return XK_KP_Decimal;
+  case FL_KP + '/':
+    return XK_KP_Divide;
+  case XK_ISO_Level3_Shift:
+    // FLTK tends to let this one leak through on X11...
+    return XK_ISO_Level3_Shift;
+  }
+
+  // Ctrl and Cmd tend to fudge input handling, so we need to cheat here
+  if (Fl::event_state() & (FL_COMMAND | FL_CTRL)) {
+#ifdef WIN32
+    BYTE keystate[256];
+    WCHAR wbuf[8];
+    int ret;
+
+    static char buf[32];
+
+    switch (fl_msg.message) {
+    case WM_KEYDOWN:
+    case WM_SYSKEYDOWN:
+      // Most buttons end up here when Ctrl is pressed. Here we can pretend
+      // that Ctrl isn't pressed, and do a character lookup.
+      GetKeyboardState(keystate);
+      keystate[VK_CONTROL] = keystate[VK_LCONTROL] = keystate[VK_RCONTROL] = 0;
+
+      ret = ToUnicode(fl_msg.wParam, 0, keystate, wbuf, sizeof(wbuf)/sizeof(wbuf[0]), 0);
+      if (ret != 0) {
+        // -1 means one dead character
+        ret = abs(ret);
+        wbuf[ret] = 0x0000;
+
+        if (fl_utf8fromwc(buf, sizeof(buf), wbuf, ret) >= sizeof(buf)) {
+          vlog.error(_("Out of buffer space whilst converting key event"));
+          return XK_VoidSymbol;
+        }
+
+        keyText = buf;
+      }
+      break;
+    case WM_CHAR:
+    case WM_SYSCHAR:
+      // Windows doesn't seem to have any sanity when it comes to control
+      // characters. We assume that Ctrl-A through Ctrl-Z range maps to
+      // the VK_A through VK_Z keys, and just let the rest fall through.
+      if ((fl_msg.wParam < 0x01) || (fl_msg.wParam > 0x1a))
+        break;
+
+      // Pretend that Ctrl isn't pressed, and do a character lookup.
+      GetKeyboardState(keystate);
+      keystate[VK_CONTROL] = keystate[VK_LCONTROL] = keystate[VK_RCONTROL] = 0;
+
+      // Ctrl-A is 0x01 and VK_A is 0x41, so add 0x40 for the conversion
+      ret = ToUnicode(fl_msg.wParam + 0x40, 0, keystate, wbuf, sizeof(wbuf)/sizeof(wbuf[0]), 0);
+      if (ret != 0) {
+        // -1 means one dead character
+        ret = abs(ret);
+        wbuf[ret] = 0x0000;
+
+        if (fl_utf8fromwc(buf, sizeof(buf), wbuf, ret) >= sizeof(buf)) {
+          vlog.error(_("Out of buffer space whilst converting key event"));
+          return XK_VoidSymbol;
+        }
+
+        keyText = buf;
+      }
+      break;
+    default:
+      // Not sure how we ended up here. Do nothing...
+      break;
+    }
+#elif defined(__APPLE__)
+    keyText = osx_event_string();
+#else
+    char buf[16];
+    KeySym sym;
+
+    XLookupString((XKeyEvent*)fl_xevent, buf, sizeof(buf), &sym, NULL);
+
+    return sym;
+#endif
+  }
+
+  // Unknown special key?
+  if (keyText[0] == '\0') {
+    vlog.error(_("Unknown FLTK key code %d (0x%04x)"), keyCode, keyCode);
+    return XK_VoidSymbol;
+  }
+
+  // Look up the symbol the key produces and translate that from Unicode
+  // to a X11 keysym.
+  if (fl_utf_nb_char((const unsigned char*)keyText, strlen(keyText)) != 1) {
+    vlog.error(_("Multiple characters given for key code %d (0x%04x): '%s'"),
+               keyCode, keyCode, keyText);
+    return XK_VoidSymbol;
+  }
+
+  ucs = fl_utf8decode(keyText, NULL, NULL);
+  return ucs2keysym(ucs);
+}
+
+
+void Viewport::handleKeyEvent(int keyCode, const char *keyText, bool down)
+{
+  rdr::U32 keySym;
+
+  if (viewOnly)
+    return;
+
+  // Because of the way keyboards work, we cannot expect to have the same
+  // symbol on release as when pressed. This breaks the VNC protocol however,
+  // so we need to keep track of what keysym a key _code_ generated on press
+  // and send the same on release.
+  if (!down) {
+    DownMap::iterator iter;
+
+    iter = downKeySym.find(keyCode);
+    if (iter == downKeySym.end()) {
+      vlog.error(_("Unexpected release of FLTK key code %d (0x%04x)"), keyCode, keyCode);
+      return;
+    }
+
+    cc->writer()->keyEvent(iter->second, false);
+
+    downKeySym.erase(iter);
+
+    return;
+  }
+
+  keySym = translateKeyEvent(keyCode, keyText);
+  if (keySym == XK_VoidSymbol)
+    return;
+
+  downKeySym[keyCode] = keySym;
+  cc->writer()->keyEvent(keySym, down);
+}

Copied: trunk/vncviewer/Viewport.h (from rev 4368, trunk/vncviewer/DesktopWindow.h)
===================================================================
--- trunk/vncviewer/Viewport.h	                        (rev 0)
+++ trunk/vncviewer/Viewport.h	2011-04-15 07:46:56 UTC (rev 4371)
@@ -0,0 +1,118 @@
+/* Copyright (C) 2002-2005 RealVNC Ltd.  All Rights Reserved.
+ * Copyright 2011 Pierre Ossman <ossman@...> for Cendio AB
+ * 
+ * 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 __VIEWPORT_H__
+#define __VIEWPORT_H__
+
+#include <map>
+
+#include <FL/Fl.H>
+#include <FL/Fl_Widget.H>
+
+#include <rfb/Rect.h>
+#include <rfb/Region.h>
+#include <rfb/Timer.h>
+#include <rfb/PixelBuffer.h>
+#include <rfb/PixelTransformer.h>
+
+class CConn;
+
+class Viewport : public Fl_Widget {
+public:
+
+  Viewport(int w, int h, const rfb::PixelFormat& serverPF, CConn* cc_);
+  ~Viewport();
+
+  // PixelFormat of incoming write operations
+  void setServerPF(const rfb::PixelFormat& pf);
+  // Most efficient format (from Viewport's point of view)
+  const rfb::PixelFormat &getPreferredPF();
+
+  // Flush updates to screen
+  void updateWindow();
+
+  // Methods forwarded from CConn
+  void setName(const char *name);
+
+  void setColourMapEntries(int firstColour, int nColours, rdr::U16* rgbs);
+
+  void fillRect(const rfb::Rect& r, rfb::Pixel pix) {
+    if (pixelTrans) {
+      rfb::Pixel pix2;
+      pixelTrans->translatePixels(&pix, &pix2, 1);
+      pix = pix2;
+    }
+
+    frameBuffer->fillRect(r, pix);
+    damageRect(r);
+  }
+  void imageRect(const rfb::Rect& r, void* pixels) {
+    if (pixelTrans)
+      pixelTrans->translateRect(pixels, r.width(),
+                                rfb::Rect(0, 0, r.width(), r.height()),
+                                frameBuffer->data, frameBuffer->getStride(),
+                                r.tl);
+    else
+      frameBuffer->imageRect(r, pixels);
+    damageRect(r);
+  }
+  void copyRect(const rfb::Rect& r, int srcX, int srcY) {
+    frameBuffer->copyRect(r, rfb::Point(r.tl.x-srcX, r.tl.y-srcY));
+    damageRect(r);
+  }
+
+  // Fl_Widget callback methods
+  void draw();
+  int handle(int event);
+
+private:
+
+  void damageRect(const rfb::Rect& r) {
+    damage.assign_union(rfb::Region(r));
+    if (!Fl::has_timeout(handleUpdateTimeout, this))
+      Fl::add_timeout(0.100, handleUpdateTimeout, this);
+  };
+
+  static void handleUpdateTimeout(void *data);
+  static void handleColourMap(void *data);
+
+  void handlePointerEvent(const rfb::Point& pos, int buttonMask);
+  static void handlePointerTimeout(void *data);
+
+  rdr::U32 translateKeyEvent(int keyCode, const char *keyText);
+  void handleKeyEvent(int keyCode, const char *keyText, bool down);
+
+private:
+  CConn* cc;
+
+  rfb::ManagedPixelBuffer* frameBuffer;
+
+  rfb::PixelTransformer *pixelTrans;
+  rfb::SimpleColourMap colourMap;
+
+  rfb::Region damage;
+
+  rfb::Point lastPointerPos;
+  int lastButtonMask;
+
+  typedef std::map<int, rdr::U32> DownMap;
+  DownMap downKeySym;
+};
+
+#endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Thread View

Thread	Author	Date
[Tigervnc-commits] SF.net SVN: tigervnc:[4346] trunk/vncviewer	<ossman_@us...>

-->[Tigervnc-commits] SF.net SVN: tigervnc:[4349] trunk/vncviewer

From: <ossman_@us...> - 2011-03-09 13:28

Revision: 4349 /tigervnc.svn.sourceforge.net/tigervnc/?rev=4349&view=rev" target="_new">http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4349&view=rev 13:28:12 +0000 (Wed, 09 Mar 2011) keyboard support. Lots of corner case to work out though... /CMakeLists.txt ========================================== Lists.txt	2011-03-09 11:53:08 UTC (rev 4348) Lists.txt	2011-03-09 13:28:12 UTC (rev 4349) rfb network rdr os Xregion ${FLTK_LIBRARIES}) /DesktopWindow.cxx ========================================== opWindow.cxx	2011-03-09 11:53:08 UTC (rev 4348) opWindow.cxx	2011-03-09 13:28:12 UTC (rev 4349) in the X11 headers on some systems oint(Fl::event_x(), Fl::event_y()), buttonMask); would like some focus please! Fl::event_text(), true); Fl::event_text(), false); ()->pointerEvent(self->lastPointerPos, self->lastButtonMask); leKeyEvent(int keyCode, const char *keyText, bool down) large FLTK key code %d (0x%08x)"), keyCode, keyCode); the way keyboards work, we cannot expect to have the same release as when pressed. This breaks the VNC protocol however, to keep track of what keysym a key _code_ generated on press keyEvent(downKeySym[keyCode], false); >= FL_F) && (keyCode <= FL_F_Last)) XK_F1 + (keyCode - FL_F); One of the keypad numbers; use FL_KP + n for number n. The enter key on the keypad, same as Fl_KP+'\\r'. The last keypad key; use to range-check keypad. FLTK key code %d (0x%04x)"), keyCode, keyCode); unsigned char*)keyText, strlen(keyText)) != 1) { characters given for key code %d (0x%04x): '%s'"), keyCode, keyCode, keyText); NULL, NULL); yEvent(keySym, down); /DesktopWindow.h ========================================== opWindow.h	2011-03-09 11:53:08 UTC (rev 4348) opWindow.h	2011-03-09 13:28:12 UTC (rev 4349) rfb::Point& pos, int buttonMask); terTimeout(void *data); keyCode, const char *keyText, bool down); ========================================== (rev 0) m2ucs.c	2011-03-09 13:28:12 UTC (rev 4349) converts keysym values into the corresponding ISO 10646 contains pairs of X11 keysym values for graphical the corresponding Unicode value. The function maps a keysym onto a Unicode value using a binary search, must remain SORTED by keysym value. UTF-8 conversion will hopefully one day be provided XmbLookupString() and should ideally not have to be But we are not there yet. represent any UCS character in the range U-00000000 to a keysym value in the range 0x01000000 to 0x01ffffff. does not cover the entire 31-bit space of UCS, but all of the characters up to U-10FFFF, which can be by UTF-16, and more, and it is very unlikely that higher ever be assigned by ISO. So to get Unicode character directly use keysym 0x0100abcd. in the table below contain the actual character so for viewing and editing best use an editor in G. Kuhn <http://www.cl.cam.ac.uk/~mgk25/>, of Cambridge, April 2001 to Richard Verhoeven <river@...> for preparing of the mapping table. is in the public domain. Share and enjoy! Aogonek Ą LATIN CAPITAL LETTER A WITH OGONEK */ breve ˘ BREVE */ Lstroke Ł LATIN CAPITAL LETTER L WITH STROKE */ Lcaron Ľ LATIN CAPITAL LETTER L WITH CARON */ Sacute Ś LATIN CAPITAL LETTER S WITH ACUTE */ Scaron Š LATIN CAPITAL LETTER S WITH CARON */ Scedilla Ş LATIN CAPITAL LETTER S WITH CEDILLA */ Tcaron Ť LATIN CAPITAL LETTER T WITH CARON */ Zacute Ź LATIN CAPITAL LETTER Z WITH ACUTE */ Zcaron Ž LATIN CAPITAL LETTER Z WITH CARON */ Zabovedot Ż LATIN CAPITAL LETTER Z WITH DOT ABOVE */ aogonek ą LATIN SMALL LETTER A WITH OGONEK */ ogonek ˛ OGONEK */ lstroke ł LATIN SMALL LETTER L WITH STROKE */ lcaron ľ LATIN SMALL LETTER L WITH CARON */ sacute ś LATIN SMALL LETTER S WITH ACUTE */ caron ˇ CARON */ scaron š LATIN SMALL LETTER S WITH CARON */ scedilla ş LATIN SMALL LETTER S WITH CEDILLA */ tcaron ť LATIN SMALL LETTER T WITH CARON */ zacute ź LATIN SMALL LETTER Z WITH ACUTE */ doubleacute ˝ DOUBLE ACUTE ACCENT */ zcaron ž LATIN SMALL LETTER Z WITH CARON */ zabovedot ż LATIN SMALL LETTER Z WITH DOT ABOVE */ Racute Ŕ LATIN CAPITAL LETTER R WITH ACUTE */ Abreve Ă LATIN CAPITAL LETTER A WITH BREVE */ Lacute Ĺ LATIN CAPITAL LETTER L WITH ACUTE */ Cacute Ć LATIN CAPITAL LETTER C WITH ACUTE */ Ccaron Č LATIN CAPITAL LETTER C WITH CARON */ Eogonek Ę LATIN CAPITAL LETTER E WITH OGONEK */ Ecaron Ě LATIN CAPITAL LETTER E WITH CARON */ Dcaron Ď LATIN CAPITAL LETTER D WITH CARON */ Dstroke Đ LATIN CAPITAL LETTER D WITH STROKE */ Nacute Ń LATIN CAPITAL LETTER N WITH ACUTE */ Ncaron Ň LATIN CAPITAL LETTER N WITH CARON */ Odoubleacute Ő LATIN CAPITAL LETTER O WITH DOUBLE ACUTE */ Rcaron Ř LATIN CAPITAL LETTER R WITH CARON */ Uring Ů LATIN CAPITAL LETTER U WITH RING ABOVE */ Udoubleacute Ű LATIN CAPITAL LETTER U WITH DOUBLE ACUTE */ Tcedilla Ţ LATIN CAPITAL LETTER T WITH CEDILLA */ racute ŕ LATIN SMALL LETTER R WITH ACUTE */ abreve ă LATIN SMALL LETTER A WITH BREVE */ lacute ĺ LATIN SMALL LETTER L WITH ACUTE */ cacute ć LATIN SMALL LETTER C WITH ACUTE */ ccaron č LATIN SMALL LETTER C WITH CARON */ eogonek ę LATIN SMALL LETTER E WITH OGONEK */ ecaron ě LATIN SMALL LETTER E WITH CARON */ dcaron ď LATIN SMALL LETTER D WITH CARON */ dstroke đ LATIN SMALL LETTER D WITH STROKE */ nacute ń LATIN SMALL LETTER N WITH ACUTE */ ncaron ň LATIN SMALL LETTER N WITH CARON */ odoubleacute ő LATIN SMALL LETTER O WITH DOUBLE ACUTE */ rcaron ř LATIN SMALL LETTER R WITH CARON */ uring ů LATIN SMALL LETTER U WITH RING ABOVE */ udoubleacute ű LATIN SMALL LETTER U WITH DOUBLE ACUTE */ tcedilla ţ LATIN SMALL LETTER T WITH CEDILLA */ abovedot ˙ DOT ABOVE */ Hstroke Ħ LATIN CAPITAL LETTER H WITH STROKE */ Hcircumflex Ĥ LATIN CAPITAL LETTER H WITH CIRCUMFLEX */ Iabovedot İ LATIN CAPITAL LETTER I WITH DOT ABOVE */ Gbreve Ğ LATIN CAPITAL LETTER G WITH BREVE */ Jcircumflex Ĵ LATIN CAPITAL LETTER J WITH CIRCUMFLEX */ hstroke ħ LATIN SMALL LETTER H WITH STROKE */ hcircumflex ĥ LATIN SMALL LETTER H WITH CIRCUMFLEX */ idotless ı LATIN SMALL LETTER DOTLESS I */ gbreve ğ LATIN SMALL LETTER G WITH BREVE */ jcircumflex ĵ LATIN SMALL LETTER J WITH CIRCUMFLEX */ Cabovedot Ċ LATIN CAPITAL LETTER C WITH DOT ABOVE */ Ccircumflex Ĉ LATIN CAPITAL LETTER C WITH CIRCUMFLEX */ Gabovedot Ġ LATIN CAPITAL LETTER G WITH DOT ABOVE */ Gcircumflex Ĝ LATIN CAPITAL LETTER G WITH CIRCUMFLEX */ Ubreve Ŭ LATIN CAPITAL LETTER U WITH BREVE */ Scircumflex Ŝ LATIN CAPITAL LETTER S WITH CIRCUMFLEX */ cabovedot ċ LATIN SMALL LETTER C WITH DOT ABOVE */ ccircumflex ĉ LATIN SMALL LETTER C WITH CIRCUMFLEX */ gabovedot ġ LATIN SMALL LETTER G WITH DOT ABOVE */ gcircumflex ĝ LATIN SMALL LETTER G WITH CIRCUMFLEX */ ubreve ŭ LATIN SMALL LETTER U WITH BREVE */ scircumflex ŝ LATIN SMALL LETTER S WITH CIRCUMFLEX */ kra ĸ LATIN SMALL LETTER KRA */ Rcedilla Ŗ LATIN CAPITAL LETTER R WITH CEDILLA */ Itilde Ĩ LATIN CAPITAL LETTER I WITH TILDE */ Lcedilla Ļ LATIN CAPITAL LETTER L WITH CEDILLA */ Emacron Ē LATIN CAPITAL LETTER E WITH MACRON */ Gcedilla Ģ LATIN CAPITAL LETTER G WITH CEDILLA */ Tslash Ŧ LATIN CAPITAL LETTER T WITH STROKE */ rcedilla ŗ LATIN SMALL LETTER R WITH CEDILLA */ itilde ĩ LATIN SMALL LETTER I WITH TILDE */ lcedilla ļ LATIN SMALL LETTER L WITH CEDILLA */ emacron ē LATIN SMALL LETTER E WITH MACRON */ gcedilla ģ LATIN SMALL LETTER G WITH CEDILLA */ tslash ŧ LATIN SMALL LETTER T WITH STROKE */ ENG Ŋ LATIN CAPITAL LETTER ENG */ eng ŋ LATIN SMALL LETTER ENG */ Amacron Ā LATIN CAPITAL LETTER A WITH MACRON */ Iogonek Į LATIN CAPITAL LETTER I WITH OGONEK */ Eabovedot Ė LATIN CAPITAL LETTER E WITH DOT ABOVE */ Imacron Ī LATIN CAPITAL LETTER I WITH MACRON */ Ncedilla Ņ LATIN CAPITAL LETTER N WITH CEDILLA */ Omacron Ō LATIN CAPITAL LETTER O WITH MACRON */ Kcedilla Ķ LATIN CAPITAL LETTER K WITH CEDILLA */ Uogonek Ų LATIN CAPITAL LETTER U WITH OGONEK */ Utilde Ũ LATIN CAPITAL LETTER U WITH TILDE */ Umacron Ū LATIN CAPITAL LETTER U WITH MACRON */ amacron ā LATIN SMALL LETTER A WITH MACRON */ iogonek į LATIN SMALL LETTER I WITH OGONEK */ eabovedot ė LATIN SMALL LETTER E WITH DOT ABOVE */ imacron ī LATIN SMALL LETTER I WITH MACRON */ ncedilla ņ LATIN SMALL LETTER N WITH CEDILLA */ omacron ō LATIN SMALL LETTER O WITH MACRON */ kcedilla ķ LATIN SMALL LETTER K WITH CEDILLA */ uogonek ų LATIN SMALL LETTER U WITH OGONEK */ utilde ũ LATIN SMALL LETTER U WITH TILDE */ umacron ū LATIN SMALL LETTER U WITH MACRON */ overline ‾ OVERLINE */ kana_fullstop 。 IDEOGRAPHIC FULL STOP */ kana_openingbracket 「 LEFT CORNER BRACKET */ kana_closingbracket 」 RIGHT CORNER BRACKET */ kana_comma 、 IDEOGRAPHIC COMMA */ kana_conjunctive ・ KATAKANA MIDDLE DOT */ kana_WO ヲ KATAKANA LETTER WO */ kana_a ァ KATAKANA LETTER SMALL A */ kana_i ィ KATAKANA LETTER SMALL I */ kana_u ゥ KATAKANA LETTER SMALL U */ kana_e ェ KATAKANA LETTER SMALL E */ kana_o ォ KATAKANA LETTER SMALL O */ kana_ya ャ KATAKANA LETTER SMALL YA */ kana_yu ュ KATAKANA LETTER SMALL YU */ kana_yo ョ KATAKANA LETTER SMALL YO */ kana_tsu ッ KATAKANA LETTER SMALL TU */ prolongedsound ー KATAKANA-HIRAGANA PROLONGED SOUND MARK */ kana_A ア KATAKANA LETTER A */ kana_I イ KATAKANA LETTER I */ kana_U ウ KATAKANA LETTER U */ kana_E エ KATAKANA LETTER E */ kana_O オ KATAKANA LETTER O */ kana_KA カ KATAKANA LETTER KA */ kana_KI キ KATAKANA LETTER KI */ kana_KU ク KATAKANA LETTER KU */ kana_KE ケ KATAKANA LETTER KE */ kana_KO コ KATAKANA LETTER KO */ kana_SA サ KATAKANA LETTER SA */ kana_SHI シ KATAKANA LETTER SI */ kana_SU ス KATAKANA LETTER SU */ kana_SE セ KATAKANA LETTER SE */ kana_SO ソ KATAKANA LETTER SO */ kana_TA タ KATAKANA LETTER TA */ kana_CHI チ KATAKANA LETTER TI */ kana_TSU ツ KATAKANA LETTER TU */ kana_TE テ KATAKANA LETTER TE */ kana_TO ト KATAKANA LETTER TO */ kana_NA ナ KATAKANA LETTER NA */ kana_NI ニ KATAKANA LETTER NI */ kana_NU ヌ KATAKANA LETTER NU */ kana_NE ネ KATAKANA LETTER NE */ kana_NO ノ KATAKANA LETTER NO */ kana_HA ハ KATAKANA LETTER HA */ kana_HI ヒ KATAKANA LETTER HI */ kana_FU フ KATAKANA LETTER HU */ kana_HE ヘ KATAKANA LETTER HE */ kana_HO ホ KATAKANA LETTER HO */ kana_MA マ KATAKANA LETTER MA */ kana_MI ミ KATAKANA LETTER MI */ kana_MU ム KATAKANA LETTER MU */ kana_ME メ KATAKANA LETTER ME */ kana_MO モ KATAKANA LETTER MO */ kana_YA ヤ KATAKANA LETTER YA */ kana_YU ユ KATAKANA LETTER YU */ kana_YO ヨ KATAKANA LETTER YO */ kana_RA ラ KATAKANA LETTER RA */ kana_RI リ KATAKANA LETTER RI */ kana_RU ル KATAKANA LETTER RU */ kana_RE レ KATAKANA LETTER RE */ kana_RO ロ KATAKANA LETTER RO */ kana_WA ワ KATAKANA LETTER WA */ kana_N ン KATAKANA LETTER N */ voicedsound ゛ KATAKANA-HIRAGANA VOICED SOUND MARK */ semivoicedsound ゜ KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK */ Arabic_comma ، ARABIC COMMA */ Arabic_semicolon ؛ ARABIC SEMICOLON */ Arabic_question_mark ؟ ARABIC QUESTION MARK */ Arabic_hamza ء ARABIC LETTER HAMZA */ Arabic_maddaonalef آ ARABIC LETTER ALEF WITH MADDA ABOVE */ Arabic_hamzaonalef أ ARABIC LETTER ALEF WITH HAMZA ABOVE */ Arabic_hamzaonwaw ؤ ARABIC LETTER WAW WITH HAMZA ABOVE */ Arabic_hamzaunderalef إ ARABIC LETTER ALEF WITH HAMZA BELOW */ Arabic_hamzaonyeh ئ ARABIC LETTER YEH WITH HAMZA ABOVE */ Arabic_alef ا ARABIC LETTER ALEF */ Arabic_beh ب ARABIC LETTER BEH */ Arabic_tehmarbuta ة ARABIC LETTER TEH MARBUTA */ Arabic_teh ت ARABIC LETTER TEH */ Arabic_theh ث ARABIC LETTER THEH */ Arabic_jeem ج ARABIC LETTER JEEM */ Arabic_hah ح ARABIC LETTER HAH */ Arabic_khah خ ARABIC LETTER KHAH */ Arabic_dal د ARABIC LETTER DAL */ Arabic_thal ذ ARABIC LETTER THAL */ Arabic_ra ر ARABIC LETTER REH */ Arabic_zain ز ARABIC LETTER ZAIN */ Arabic_seen س ARABIC LETTER SEEN */ Arabic_sheen ش ARABIC LETTER SHEEN */ Arabic_sad ص ARABIC LETTER SAD */ Arabic_dad ض ARABIC LETTER DAD */ Arabic_tah ط ARABIC LETTER TAH */ Arabic_zah ظ ARABIC LETTER ZAH */ Arabic_ain ع ARABIC LETTER AIN */ Arabic_ghain غ ARABIC LETTER GHAIN */ Arabic_tatweel ـ ARABIC TATWEEL */ Arabic_feh ف ARABIC LETTER FEH */ Arabic_qaf ق ARABIC LETTER QAF */ Arabic_kaf ك ARABIC LETTER KAF */ Arabic_lam ل ARABIC LETTER LAM */ Arabic_meem م ARABIC LETTER MEEM */ Arabic_noon ن ARABIC LETTER NOON */ Arabic_ha ه ARABIC LETTER HEH */ Arabic_waw و ARABIC LETTER WAW */ Arabic_alefmaksura ى ARABIC LETTER ALEF MAKSURA */ Arabic_yeh ي ARABIC LETTER YEH */ Arabic_fathatan ً ARABIC FATHATAN */ Arabic_dammatan ٌ ARABIC DAMMATAN */ Arabic_kasratan ٍ ARABIC KASRATAN */ Arabic_fatha َ ARABIC FATHA */ Arabic_damma ُ ARABIC DAMMA */ Arabic_kasra ِ ARABIC KASRA */ Arabic_shadda ّ ARABIC SHADDA */ Arabic_sukun ْ ARABIC SUKUN */ Serbian_dje ђ CYRILLIC SMALL LETTER DJE */ Macedonia_gje ѓ CYRILLIC SMALL LETTER GJE */ Cyrillic_io ё CYRILLIC SMALL LETTER IO */ Ukrainian_ie є CYRILLIC SMALL LETTER UKRAINIAN IE */ Macedonia_dse ѕ CYRILLIC SMALL LETTER DZE */ Ukrainian_i і CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I */ Ukrainian_yi ї CYRILLIC SMALL LETTER YI */ Cyrillic_je ј CYRILLIC SMALL LETTER JE */ Cyrillic_lje љ CYRILLIC SMALL LETTER LJE */ Cyrillic_nje њ CYRILLIC SMALL LETTER NJE */ Serbian_tshe ћ CYRILLIC SMALL LETTER TSHE */ Macedonia_kje ќ CYRILLIC SMALL LETTER KJE */ Byelorussian_shortu ў CYRILLIC SMALL LETTER SHORT U */ Cyrillic_dzhe џ CYRILLIC SMALL LETTER DZHE */ numerosign № NUMERO SIGN */ Serbian_DJE Ђ CYRILLIC CAPITAL LETTER DJE */ Macedonia_GJE Ѓ CYRILLIC CAPITAL LETTER GJE */ Cyrillic_IO Ё CYRILLIC CAPITAL LETTER IO */ Ukrainian_IE Є CYRILLIC CAPITAL LETTER UKRAINIAN IE */ Macedonia_DSE Ѕ CYRILLIC CAPITAL LETTER DZE */ Ukrainian_I І CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I */ Ukrainian_YI Ї CYRILLIC CAPITAL LETTER YI */ Cyrillic_JE Ј CYRILLIC CAPITAL LETTER JE */ Cyrillic_LJE Љ CYRILLIC CAPITAL LETTER LJE */ Cyrillic_NJE Њ CYRILLIC CAPITAL LETTER NJE */ Serbian_TSHE Ћ CYRILLIC CAPITAL LETTER TSHE */ Macedonia_KJE Ќ CYRILLIC CAPITAL LETTER KJE */ Byelorussian_SHORTU Ў CYRILLIC CAPITAL LETTER SHORT U */ Cyrillic_DZHE Џ CYRILLIC CAPITAL LETTER DZHE */ Cyrillic_yu ю CYRILLIC SMALL LETTER YU */ Cyrillic_a а CYRILLIC SMALL LETTER A */ Cyrillic_be б CYRILLIC SMALL LETTER BE */ Cyrillic_tse ц CYRILLIC SMALL LETTER TSE */ Cyrillic_de д CYRILLIC SMALL LETTER DE */ Cyrillic_ie е CYRILLIC SMALL LETTER IE */ Cyrillic_ef ф CYRILLIC SMALL LETTER EF */ Cyrillic_ghe г CYRILLIC SMALL LETTER GHE */ Cyrillic_ha х CYRILLIC SMALL LETTER HA */ Cyrillic_i и CYRILLIC SMALL LETTER I */ Cyrillic_shorti й CYRILLIC SMALL LETTER SHORT I */ Cyrillic_ka к CYRILLIC SMALL LETTER KA */ Cyrillic_el л CYRILLIC SMALL LETTER EL */ Cyrillic_em м CYRILLIC SMALL LETTER EM */ Cyrillic_en н CYRILLIC SMALL LETTER EN */ Cyrillic_o о CYRILLIC SMALL LETTER O */ Cyrillic_pe п CYRILLIC SMALL LETTER PE */ Cyrillic_ya я CYRILLIC SMALL LETTER YA */ Cyrillic_er р CYRILLIC SMALL LETTER ER */ Cyrillic_es с CYRILLIC SMALL LETTER ES */ Cyrillic_te т CYRILLIC SMALL LETTER TE */ Cyrillic_u у CYRILLIC SMALL LETTER U */ Cyrillic_zhe ж CYRILLIC SMALL LETTER ZHE */ Cyrillic_ve в CYRILLIC SMALL LETTER VE */ Cyrillic_softsign ь CYRILLIC SMALL LETTER SOFT SIGN */ Cyrillic_yeru ы CYRILLIC SMALL LETTER YERU */ Cyrillic_ze з CYRILLIC SMALL LETTER ZE */ Cyrillic_sha ш CYRILLIC SMALL LETTER SHA */ Cyrillic_e э CYRILLIC SMALL LETTER E */ Cyrillic_shcha щ CYRILLIC SMALL LETTER SHCHA */ Cyrillic_che ч CYRILLIC SMALL LETTER CHE */ Cyrillic_hardsign ъ CYRILLIC SMALL LETTER HARD SIGN */ Cyrillic_YU Ю CYRILLIC CAPITAL LETTER YU */ Cyrillic_A А CYRILLIC CAPITAL LETTER A */ Cyrillic_BE Б CYRILLIC CAPITAL LETTER BE */ Cyrillic_TSE Ц CYRILLIC CAPITAL LETTER TSE */ Cyrillic_DE Д CYRILLIC CAPITAL LETTER DE */ Cyrillic_IE Е CYRILLIC CAPITAL LETTER IE */ Cyrillic_EF Ф CYRILLIC CAPITAL LETTER EF */ Cyrillic_GHE Г CYRILLIC CAPITAL LETTER GHE */ Cyrillic_HA Х CYRILLIC CAPITAL LETTER HA */ Cyrillic_I И CYRILLIC CAPITAL LETTER I */ Cyrillic_SHORTI Й CYRILLIC CAPITAL LETTER SHORT I */ Cyrillic_KA К CYRILLIC CAPITAL LETTER KA */ Cyrillic_EL Л CYRILLIC CAPITAL LETTER EL */ Cyrillic_EM М CYRILLIC CAPITAL LETTER EM */ Cyrillic_EN Н CYRILLIC CAPITAL LETTER EN */ Cyrillic_O О CYRILLIC CAPITAL LETTER O */ Cyrillic_PE П CYRILLIC CAPITAL LETTER PE */ Cyrillic_YA Я CYRILLIC CAPITAL LETTER YA */ Cyrillic_ER Р CYRILLIC CAPITAL LETTER ER */ Cyrillic_ES С CYRILLIC CAPITAL LETTER ES */ Cyrillic_TE Т CYRILLIC CAPITAL LETTER TE */ Cyrillic_U У CYRILLIC CAPITAL LETTER U */ Cyrillic_ZHE Ж CYRILLIC CAPITAL LETTER ZHE */ Cyrillic_VE В CYRILLIC CAPITAL LETTER VE */ Cyrillic_SOFTSIGN Ь CYRILLIC CAPITAL LETTER SOFT SIGN */ Cyrillic_YERU Ы CYRILLIC CAPITAL LETTER YERU */ Cyrillic_ZE З CYRILLIC CAPITAL LETTER ZE */ Cyrillic_SHA Ш CYRILLIC CAPITAL LETTER SHA */ Cyrillic_E Э CYRILLIC CAPITAL LETTER E */ Cyrillic_SHCHA Щ CYRILLIC CAPITAL LETTER SHCHA */ Cyrillic_CHE Ч CYRILLIC CAPITAL LETTER CHE */ Cyrillic_HARDSIGN Ъ CYRILLIC CAPITAL LETTER HARD SIGN */ Greek_ALPHAaccent Ά GREEK CAPITAL LETTER ALPHA WITH TONOS */ Greek_EPSILONaccent Έ GREEK CAPITAL LETTER EPSILON WITH TONOS */ Greek_ETAaccent Ή GREEK CAPITAL LETTER ETA WITH TONOS */ Greek_IOTAaccent Ί GREEK CAPITAL LETTER IOTA WITH TONOS */ Greek_IOTAdiaeresis Ϊ GREEK CAPITAL LETTER IOTA WITH DIALYTIKA */ Greek_OMICRONaccent Ό GREEK CAPITAL LETTER OMICRON WITH TONOS */ Greek_UPSILONaccent Ύ GREEK CAPITAL LETTER UPSILON WITH TONOS */ Greek_UPSILONdieresis Ϋ GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA */ Greek_OMEGAaccent Ώ GREEK CAPITAL LETTER OMEGA WITH TONOS */ Greek_accentdieresis ΅ GREEK DIALYTIKA TONOS */ Greek_horizbar ― HORIZONTAL BAR */ Greek_alphaaccent ά GREEK SMALL LETTER ALPHA WITH TONOS */ Greek_epsilonaccent έ GREEK SMALL LETTER EPSILON WITH TONOS */ Greek_etaaccent ή GREEK SMALL LETTER ETA WITH TONOS */ Greek_iotaaccent ί GREEK SMALL LETTER IOTA WITH TONOS */ Greek_iotadieresis ϊ GREEK SMALL LETTER IOTA WITH DIALYTIKA */ Greek_iotaaccentdieresis ΐ GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS */ Greek_omicronaccent ό GREEK SMALL LETTER OMICRON WITH TONOS */ Greek_upsilonaccent ύ GREEK SMALL LETTER UPSILON WITH TONOS */ Greek_upsilondieresis ϋ GREEK SMALL LETTER UPSILON WITH DIALYTIKA */ }, /* Greek_upsilonaccentdieresis ΰ GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS */ Greek_omegaaccent ώ GREEK SMALL LETTER OMEGA WITH TONOS */ Greek_ALPHA Α GREEK CAPITAL LETTER ALPHA */ Greek_BETA Β GREEK CAPITAL LETTER BETA */ Greek_GAMMA Γ GREEK CAPITAL LETTER GAMMA */ Greek_DELTA Δ GREEK CAPITAL LETTER DELTA */ Greek_EPSILON Ε GREEK CAPITAL LETTER EPSILON */ Greek_ZETA Ζ GREEK CAPITAL LETTER ZETA */ Greek_ETA Η GREEK CAPITAL LETTER ETA */ Greek_THETA Θ GREEK CAPITAL LETTER THETA */ Greek_IOTA Ι GREEK CAPITAL LETTER IOTA */ Greek_KAPPA Κ GREEK CAPITAL LETTER KAPPA */ Greek_LAMBDA Λ GREEK CAPITAL LETTER LAMDA */ Greek_MU Μ GREEK CAPITAL LETTER MU */ Greek_NU Ν GREEK CAPITAL LETTER NU */ Greek_XI Ξ GREEK CAPITAL LETTER XI */ Greek_OMICRON Ο GREEK CAPITAL LETTER OMICRON */ Greek_PI Π GREEK CAPITAL LETTER PI */ Greek_RHO Ρ GREEK CAPITAL LETTER RHO */ Greek_SIGMA Σ GREEK CAPITAL LETTER SIGMA */ Greek_TAU Τ GREEK CAPITAL LETTER TAU */ Greek_UPSILON Υ GREEK CAPITAL LETTER UPSILON */ Greek_PHI Φ GREEK CAPITAL LETTER PHI */ Greek_CHI Χ GREEK CAPITAL LETTER CHI */ Greek_PSI Ψ GREEK CAPITAL LETTER PSI */ Greek_OMEGA Ω GREEK CAPITAL LETTER OMEGA */ Greek_alpha α GREEK SMALL LETTER ALPHA */ Greek_beta β GREEK SMALL LETTER BETA */ Greek_gamma γ GREEK SMALL LETTER GAMMA */ Greek_delta δ GREEK SMALL LETTER DELTA */ Greek_epsilon ε GREEK SMALL LETTER EPSILON */ Greek_zeta ζ GREEK SMALL LETTER ZETA */ Greek_eta η GREEK SMALL LETTER ETA */ Greek_theta θ GREEK SMALL LETTER THETA */ Greek_iota ι GREEK SMALL LETTER IOTA */ Greek_kappa κ GREEK SMALL LETTER KAPPA */ Greek_lambda λ GREEK SMALL LETTER LAMDA */ Greek_mu μ GREEK SMALL LETTER MU */ Greek_nu ν GREEK SMALL LETTER NU */ Greek_xi ξ GREEK SMALL LETTER XI */ Greek_omicron ο GREEK SMALL LETTER OMICRON */ Greek_pi π GREEK SMALL LETTER PI */ Greek_rho ρ GREEK SMALL LETTER RHO */ Greek_sigma σ GREEK SMALL LETTER SIGMA */ Greek_finalsmallsigma ς GREEK SMALL LETTER FINAL SIGMA */ Greek_tau τ GREEK SMALL LETTER TAU */ Greek_upsilon υ GREEK SMALL LETTER UPSILON */ Greek_phi φ GREEK SMALL LETTER PHI */ Greek_chi χ GREEK SMALL LETTER CHI */ Greek_psi ψ GREEK SMALL LETTER PSI */ Greek_omega ω GREEK SMALL LETTER OMEGA */ leftradical ⎷ ??? */ topleftradical ┌ BOX DRAWINGS LIGHT DOWN AND RIGHT */ horizconnector ─ BOX DRAWINGS LIGHT HORIZONTAL */ topintegral ⌠ TOP HALF INTEGRAL */ botintegral ⌡ BOTTOM HALF INTEGRAL */ vertconnector │ BOX DRAWINGS LIGHT VERTICAL */ topleftsqbracket ⎡ ??? */ botleftsqbracket ⎣ ??? */ toprightsqbracket ⎤ ??? */ botrightsqbracket ⎦ ??? */ topleftparens ⎛ ??? */ botleftparens ⎝ ??? */ toprightparens ⎞ ??? */ botrightparens ⎠ ??? */ leftmiddlecurlybrace ⎨ ??? */ rightmiddlecurlybrace ⎬ ??? */ topleftsummation ? ??? */ botleftsummation ? ??? */ topvertsummationconnector ? ??? */ botvertsummationconnector ? ??? */ toprightsummation ? ??? */ botrightsummation ? ??? */ rightmiddlesummation ? ??? */ lessthanequal ≤ LESS-THAN OR EQUAL TO */ notequal ≠ NOT EQUAL TO */ greaterthanequal ≥ GREATER-THAN OR EQUAL TO */ integral ∫ INTEGRAL */ therefore ∴ THEREFORE */ variation ∝ PROPORTIONAL TO */ infinity ∞ INFINITY */ nabla ∇ NABLA */ approximate ∼ TILDE OPERATOR */ similarequal ≃ ASYMPTOTICALLY EQUAL TO */ ifonlyif ⇔ LEFT RIGHT DOUBLE ARROW */ implies ⇒ RIGHTWARDS DOUBLE ARROW */ identical ≡ IDENTICAL TO */ radical √ SQUARE ROOT */ includedin ⊂ SUBSET OF */ includes ⊃ SUPERSET OF */ intersection ∩ INTERSECTION */ union ∪ UNION */ logicaland ∧ LOGICAL AND */ logicalor ∨ LOGICAL OR */ partialderivative ∂ PARTIAL DIFFERENTIAL */ function ƒ LATIN SMALL LETTER F WITH HOOK */ leftarrow ← LEFTWARDS ARROW */ uparrow ↑ UPWARDS ARROW */ rightarrow → RIGHTWARDS ARROW */ downarrow ↓ DOWNWARDS ARROW */ blank ? ??? */ soliddiamond ◆ BLACK DIAMOND */ checkerboard ▒ MEDIUM SHADE */ ht ␉ SYMBOL FOR HORIZONTAL TABULATION */ ff ␌ SYMBOL FOR FORM FEED */ cr ␍ SYMBOL FOR CARRIAGE RETURN */ lf ␊ SYMBOL FOR LINE FEED */ nl ␤ SYMBOL FOR NEWLINE */ vt ␋ SYMBOL FOR VERTICAL TABULATION */ lowrightcorner ┘ BOX DRAWINGS LIGHT UP AND LEFT */ uprightcorner ┐ BOX DRAWINGS LIGHT DOWN AND LEFT */ upleftcorner ┌ BOX DRAWINGS LIGHT DOWN AND RIGHT */ lowleftcorner └ BOX DRAWINGS LIGHT UP AND RIGHT */ crossinglines ┼ BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL */ horizlinescan1 ⎺ HORIZONTAL SCAN LINE-1 (Unicode 3.2 draft) */ horizlinescan3 ⎻ HORIZONTAL SCAN LINE-3 (Unicode 3.2 draft) */ horizlinescan5 ─ BOX DRAWINGS LIGHT HORIZONTAL */ horizlinescan7 ⎼ HORIZONTAL SCAN LINE-7 (Unicode 3.2 draft) */ horizlinescan9 ⎽ HORIZONTAL SCAN LINE-9 (Unicode 3.2 draft) */ leftt ├ BOX DRAWINGS LIGHT VERTICAL AND RIGHT */ rightt ┤ BOX DRAWINGS LIGHT VERTICAL AND LEFT */ bott ┴ BOX DRAWINGS LIGHT UP AND HORIZONTAL */ topt ┬ BOX DRAWINGS LIGHT DOWN AND HORIZONTAL */ vertbar │ BOX DRAWINGS LIGHT VERTICAL */ emspace   EM SPACE */ enspace   EN SPACE */ em3space   THREE-PER-EM SPACE */ em4space   FOUR-PER-EM SPACE */ digitspace   FIGURE SPACE */ punctspace   PUNCTUATION SPACE */ thinspace   THIN SPACE */ hairspace   HAIR SPACE */ emdash — EM DASH */ endash – EN DASH */ signifblank ? ??? */ ellipsis … HORIZONTAL ELLIPSIS */ doubbaselinedot ‥ TWO DOT LEADER */ onethird ⅓ VULGAR FRACTION ONE THIRD */ twothirds ⅔ VULGAR FRACTION TWO THIRDS */ onefifth ⅕ VULGAR FRACTION ONE FIFTH */ twofifths ⅖ VULGAR FRACTION TWO FIFTHS */ threefifths ⅗ VULGAR FRACTION THREE FIFTHS */ fourfifths ⅘ VULGAR FRACTION FOUR FIFTHS */ onesixth ⅙ VULGAR FRACTION ONE SIXTH */ fivesixths ⅚ VULGAR FRACTION FIVE SIXTHS */ careof ℅ CARE OF */ figdash ‒ FIGURE DASH */ leftanglebracket 〈 LEFT-POINTING ANGLE BRACKET */ decimalpoint ? ??? */ rightanglebracket 〉 RIGHT-POINTING ANGLE BRACKET */ marker ? ??? */ oneeighth ⅛ VULGAR FRACTION ONE EIGHTH */ threeeighths ⅜ VULGAR FRACTION THREE EIGHTHS */ fiveeighths ⅝ VULGAR FRACTION FIVE EIGHTHS */ seveneighths ⅞ VULGAR FRACTION SEVEN EIGHTHS */ trademark ™ TRADE MARK SIGN */ signaturemark ☓ SALTIRE */ trademarkincircle ? ??? */ leftopentriangle ◁ WHITE LEFT-POINTING TRIANGLE */ rightopentriangle ▷ WHITE RIGHT-POINTING TRIANGLE */ emopencircle ○ WHITE CIRCLE */ emopenrectangle ▯ WHITE VERTICAL RECTANGLE */ leftsinglequotemark ‘ LEFT SINGLE QUOTATION MARK */ rightsinglequotemark ’ RIGHT SINGLE QUOTATION MARK */ leftdoublequotemark “ LEFT DOUBLE QUOTATION MARK */ rightdoublequotemark ” RIGHT DOUBLE QUOTATION MARK */ prescription ℞ PRESCRIPTION TAKE */ minutes ′ PRIME */ seconds ″ DOUBLE PRIME */ latincross ✝ LATIN CROSS */ hexagram ? ??? */ filledrectbullet ▬ BLACK RECTANGLE */ filledlefttribullet ◀ BLACK LEFT-POINTING TRIANGLE */ filledrighttribullet ▶ BLACK RIGHT-POINTING TRIANGLE */ emfilledcircle ● BLACK CIRCLE */ emfilledrect ▮ BLACK VERTICAL RECTANGLE */ enopencircbullet ◦ WHITE BULLET */ enopensquarebullet ▫ WHITE SMALL SQUARE */ openrectbullet ▭ WHITE RECTANGLE */ opentribulletup △ WHITE UP-POINTING TRIANGLE */ opentribulletdown ▽ WHITE DOWN-POINTING TRIANGLE */ openstar ☆ WHITE STAR */ enfilledcircbullet • BULLET */ enfilledsqbullet ▪ BLACK SMALL SQUARE */ filledtribulletup ▲ BLACK UP-POINTING TRIANGLE */ filledtribulletdown ▼ BLACK DOWN-POINTING TRIANGLE */ leftpointer ☜ WHITE LEFT POINTING INDEX */ rightpointer ☞ WHITE RIGHT POINTING INDEX */ club ♣ BLACK CLUB SUIT */ diamond ♦ BLACK DIAMOND SUIT */ heart ♥ BLACK HEART SUIT */ maltesecross ✠ MALTESE CROSS */ dagger † DAGGER */ doubledagger ‡ DOUBLE DAGGER */ checkmark ✓ CHECK MARK */ ballotcross ✗ BALLOT X */ musicalsharp ♯ MUSIC SHARP SIGN */ musicalflat ♭ MUSIC FLAT SIGN */ malesymbol ♂ MALE SIGN */ femalesymbol ♀ FEMALE SIGN */ telephone ☎ BLACK TELEPHONE */ telephonerecorder ⌕ TELEPHONE RECORDER */ phonographcopyright ℗ SOUND RECORDING COPYRIGHT */ caret ‸ CARET */ singlelowquotemark ‚ SINGLE LOW-9 QUOTATION MARK */ doublelowquotemark „ DOUBLE LOW-9 QUOTATION MARK */ cursor ? ??? */ leftcaret < LESS-THAN SIGN */ rightcaret > GREATER-THAN SIGN */ downcaret ∨ LOGICAL OR */ upcaret ∧ LOGICAL AND */ overbar ¯ MACRON */ downtack ⊥ UP TACK */ upshoe ∩ INTERSECTION */ downstile ⌊ LEFT FLOOR */ underbar _ LOW LINE */ jot ∘ RING OPERATOR */ quad ⎕ APL FUNCTIONAL SYMBOL QUAD */ uptack ⊤ DOWN TACK */ circle ○ WHITE CIRCLE */ upstile ⌈ LEFT CEILING */ downshoe ∪ UNION */ rightshoe ⊃ SUPERSET OF */ leftshoe ⊂ SUBSET OF */ lefttack ⊢ RIGHT TACK */ righttack ⊣ LEFT TACK */ hebrew_doublelowline ‗ DOUBLE LOW LINE */ hebrew_aleph א HEBREW LETTER ALEF */ hebrew_bet ב HEBREW LETTER BET */ hebrew_gimel ג HEBREW LETTER GIMEL */ hebrew_dalet ד HEBREW LETTER DALET */ hebrew_he ה HEBREW LETTER HE */ hebrew_waw ו HEBREW LETTER VAV */ hebrew_zain ז HEBREW LETTER ZAYIN */ hebrew_chet ח HEBREW LETTER HET */ hebrew_tet ט HEBREW LETTER TET */ hebrew_yod י HEBREW LETTER YOD */ hebrew_finalkaph ך HEBREW LETTER FINAL KAF */ hebrew_kaph כ HEBREW LETTER KAF */ hebrew_lamed ל HEBREW LETTER LAMED */ hebrew_finalmem ם HEBREW LETTER FINAL MEM */ hebrew_mem מ HEBREW LETTER MEM */ hebrew_finalnun ן HEBREW LETTER FINAL NUN */ hebrew_nun נ HEBREW LETTER NUN */ hebrew_samech ס HEBREW LETTER SAMEKH */ hebrew_ayin ע HEBREW LETTER AYIN */ hebrew_finalpe ף HEBREW LETTER FINAL PE */ hebrew_pe פ HEBREW LETTER PE */ hebrew_finalzade ץ HEBREW LETTER FINAL TSADI */ hebrew_zade צ HEBREW LETTER TSADI */ hebrew_qoph ק HEBREW LETTER QOF */ hebrew_resh ר HEBREW LETTER RESH */ hebrew_shin ש HEBREW LETTER SHIN */ hebrew_taw ת HEBREW LETTER TAV */ Thai_kokai ก THAI CHARACTER KO KAI */ Thai_khokhai ข THAI CHARACTER KHO KHAI */ Thai_khokhuat ฃ THAI CHARACTER KHO KHUAT */ Thai_khokhwai ค THAI CHARACTER KHO KHWAI */ Thai_khokhon ฅ THAI CHARACTER KHO KHON */ Thai_khorakhang ฆ THAI CHARACTER KHO RAKHANG */ Thai_ngongu ง THAI CHARACTER NGO NGU */ Thai_chochan จ THAI CHARACTER CHO CHAN */ Thai_choching ฉ THAI CHARACTER CHO CHING */ Thai_chochang ช THAI CHARACTER CHO CHANG */ Thai_soso ซ THAI CHARACTER SO SO */ Thai_chochoe ฌ THAI CHARACTER CHO CHOE */ Thai_yoying ญ THAI CHARACTER YO YING */ Thai_dochada ฎ THAI CHARACTER DO CHADA */ Thai_topatak ฏ THAI CHARACTER TO PATAK */ Thai_thothan ฐ THAI CHARACTER THO THAN */ Thai_thonangmontho ฑ THAI CHARACTER THO NANGMONTHO */ Thai_thophuthao ฒ THAI CHARACTER THO PHUTHAO */ Thai_nonen ณ THAI CHARACTER NO NEN */ Thai_dodek ด THAI CHARACTER DO DEK */ Thai_totao ต THAI CHARACTER TO TAO */ Thai_thothung ถ THAI CHARACTER THO THUNG */ Thai_thothahan ท THAI CHARACTER THO THAHAN */ Thai_thothong ธ THAI CHARACTER THO THONG */ Thai_nonu น THAI CHARACTER NO NU */ Thai_bobaimai บ THAI CHARACTER BO BAIMAI */ Thai_popla ป THAI CHARACTER PO PLA */ Thai_phophung ผ THAI CHARACTER PHO PHUNG */ Thai_fofa ฝ THAI CHARACTER FO FA */ Thai_phophan พ THAI CHARACTER PHO PHAN */ Thai_fofan ฟ THAI CHARACTER FO FAN */ Thai_phosamphao ภ THAI CHARACTER PHO SAMPHAO */ Thai_moma ม THAI CHARACTER MO MA */ Thai_yoyak ย THAI CHARACTER YO YAK */ Thai_rorua ร THAI CHARACTER RO RUA */ Thai_ru ฤ THAI CHARACTER RU */ Thai_loling ล THAI CHARACTER LO LING */ Thai_lu ฦ THAI CHARACTER LU */ Thai_wowaen ว THAI CHARACTER WO WAEN */ Thai_sosala ศ THAI CHARACTER SO SALA */ Thai_sorusi ษ THAI CHARACTER SO RUSI */ Thai_sosua ส THAI CHARACTER SO SUA */ Thai_hohip ห THAI CHARACTER HO HIP */ Thai_lochula ฬ THAI CHARACTER LO CHULA */ Thai_oang อ THAI CHARACTER O ANG */ Thai_honokhuk ฮ THAI CHARACTER HO NOKHUK */ Thai_paiyannoi ฯ THAI CHARACTER PAIYANNOI */ Thai_saraa ะ THAI CHARACTER SARA A */ Thai_maihanakat ั THAI CHARACTER MAI HAN-AKAT */ Thai_saraaa า THAI CHARACTER SARA AA */ Thai_saraam ำ THAI CHARACTER SARA AM */ Thai_sarai ิ THAI CHARACTER SARA I */ Thai_saraii ี THAI CHARACTER SARA II */ Thai_saraue ึ THAI CHARACTER SARA UE */ Thai_sarauee ื THAI CHARACTER SARA UEE */ Thai_sarau ุ THAI CHARACTER SARA U */ Thai_sarauu ู THAI CHARACTER SARA UU */ Thai_phinthu ฺ THAI CHARACTER PHINTHU */ Thai_maihanakat_maitho ? ??? */ Thai_baht ฿ THAI CURRENCY SYMBOL BAHT */ Thai_sarae เ THAI CHARACTER SARA E */ Thai_saraae แ THAI CHARACTER SARA AE */ Thai_sarao โ THAI CHARACTER SARA O */ Thai_saraaimaimuan ใ THAI CHARACTER SARA AI MAIMUAN */ Thai_saraaimaimalai ไ THAI CHARACTER SARA AI MAIMALAI */ Thai_lakkhangyao ๅ THAI CHARACTER LAKKHANGYAO */ Thai_maiyamok ๆ THAI CHARACTER MAIYAMOK */ Thai_maitaikhu ็ THAI CHARACTER MAITAIKHU */ Thai_maiek ่ THAI CHARACTER MAI EK */ Thai_maitho ้ THAI CHARACTER MAI THO */ Thai_maitri ๊ THAI CHARACTER MAI TRI */ Thai_maichattawa ๋ THAI CHARACTER MAI CHATTAWA */ Thai_thanthakhat ์ THAI CHARACTER THANTHAKHAT */ Thai_nikhahit ํ THAI CHARACTER NIKHAHIT */ Thai_leksun ๐ THAI DIGIT ZERO */ Thai_leknung ๑ THAI DIGIT ONE */ Thai_leksong ๒ THAI DIGIT TWO */ Thai_leksam ๓ THAI DIGIT THREE */ Thai_leksi ๔ THAI DIGIT FOUR */ Thai_lekha ๕ THAI DIGIT FIVE */ Thai_lekhok ๖ THAI DIGIT SIX */ Thai_lekchet ๗ THAI DIGIT SEVEN */ Thai_lekpaet ๘ THAI DIGIT EIGHT */ Thai_lekkao ๙ THAI DIGIT NINE */ Hangul_Kiyeog ㄱ HANGUL LETTER KIYEOK */ Hangul_SsangKiyeog ㄲ HANGUL LETTER SSANGKIYEOK */ Hangul_KiyeogSios ㄳ HANGUL LETTER KIYEOK-SIOS */ Hangul_Nieun ㄴ HANGUL LETTER NIEUN */ Hangul_NieunJieuj ㄵ HANGUL LETTER NIEUN-CIEUC */ Hangul_NieunHieuh ㄶ HANGUL LETTER NIEUN-HIEUH */ Hangul_Dikeud ㄷ HANGUL LETTER TIKEUT */ Hangul_SsangDikeud ㄸ HANGUL LETTER SSANGTIKEUT */ Hangul_Rieul ㄹ HANGUL LETTER RIEUL */ Hangul_RieulKiyeog ㄺ HANGUL LETTER RIEUL-KIYEOK */ Hangul_RieulMieum ㄻ HANGUL LETTER RIEUL-MIEUM */ Hangul_RieulPieub ㄼ HANGUL LETTER RIEUL-PIEUP */ Hangul_RieulSios ㄽ HANGUL LETTER RIEUL-SIOS */ Hangul_RieulTieut ㄾ HANGUL LETTER RIEUL-THIEUTH */ Hangul_RieulPhieuf ㄿ HANGUL LETTER RIEUL-PHIEUPH */ Hangul_RieulHieuh ㅀ HANGUL LETTER RIEUL-HIEUH */ Hangul_Mieum ㅁ HANGUL LETTER MIEUM */ Hangul_Pieub ㅂ HANGUL LETTER PIEUP */ Hangul_SsangPieub ㅃ HANGUL LETTER SSANGPIEUP */ Hangul_PieubSios ㅄ HANGUL LETTER PIEUP-SIOS */ Hangul_Sios ㅅ HANGUL LETTER SIOS */ Hangul_SsangSios ㅆ HANGUL LETTER SSANGSIOS */ Hangul_Ieung ㅇ HANGUL LETTER IEUNG */ Hangul_Jieuj ㅈ HANGUL LETTER CIEUC */ Hangul_SsangJieuj ㅉ HANGUL LETTER SSANGCIEUC */ Hangul_Cieuc ㅊ HANGUL LETTER CHIEUCH */ Hangul_Khieuq ㅋ HANGUL LETTER KHIEUKH */ Hangul_Tieut ㅌ HANGUL LETTER THIEUTH */ Hangul_Phieuf ㅍ HANGUL LETTER PHIEUPH */ Hangul_Hieuh ㅎ HANGUL LETTER HIEUH */ Hangul_A ㅏ HANGUL LETTER A */ Hangul_AE ㅐ HANGUL LETTER AE */ Hangul_YA ㅑ HANGUL LETTER YA */ Hangul_YAE ㅒ HANGUL LETTER YAE */ Hangul_EO ㅓ HANGUL LETTER EO */ Hangul_E ㅔ HANGUL LETTER E */ Hangul_YEO ㅕ HANGUL LETTER YEO */ Hangul_YE ㅖ HANGUL LETTER YE */ Hangul_O ㅗ HANGUL LETTER O */ Hangul_WA ㅘ HANGUL LETTER WA */ Hangul_WAE ㅙ HANGUL LETTER WAE */ Hangul_OE ㅚ HANGUL LETTER OE */ Hangul_YO ㅛ HANGUL LETTER YO */ Hangul_U ㅜ HANGUL LETTER U */ Hangul_WEO ㅝ HANGUL LETTER WEO */ Hangul_WE ㅞ HANGUL LETTER WE */ Hangul_WI ㅟ HANGUL LETTER WI */ Hangul_YU ㅠ HANGUL LETTER YU */ Hangul_EU ㅡ HANGUL LETTER EU */ Hangul_YI ㅢ HANGUL LETTER YI */ Hangul_I ㅣ HANGUL LETTER I */ Hangul_J_Kiyeog ᆨ HANGUL JONGSEONG KIYEOK */ Hangul_J_SsangKiyeog ᆩ HANGUL JONGSEONG SSANGKIYEOK */ Hangul_J_KiyeogSios ᆪ HANGUL JONGSEONG KIYEOK-SIOS */ Hangul_J_Nieun ᆫ HANGUL JONGSEONG NIEUN */ Hangul_J_NieunJieuj ᆬ HANGUL JONGSEONG NIEUN-CIEUC */ Hangul_J_NieunHieuh ᆭ HANGUL JONGSEONG NIEUN-HIEUH */ Hangul_J_Dikeud ᆮ HANGUL JONGSEONG TIKEUT */ Hangul_J_Rieul ᆯ HANGUL JONGSEONG RIEUL */ Hangul_J_RieulKiyeog ᆰ HANGUL JONGSEONG RIEUL-KIYEOK */ Hangul_J_RieulMieum ᆱ HANGUL JONGSEONG RIEUL-MIEUM */ Hangul_J_RieulPieub ᆲ HANGUL JONGSEONG RIEUL-PIEUP */ Hangul_J_RieulSios ᆳ HANGUL JONGSEONG RIEUL-SIOS */ Hangul_J_RieulTieut ᆴ HANGUL JONGSEONG RIEUL-THIEUTH */ Hangul_J_RieulPhieuf ᆵ HANGUL JONGSEONG RIEUL-PHIEUPH */ Hangul_J_RieulHieuh ᆶ HANGUL JONGSEONG RIEUL-HIEUH */ Hangul_J_Mieum ᆷ HANGUL JONGSEONG MIEUM */ Hangul_J_Pieub ᆸ HANGUL JONGSEONG PIEUP */ Hangul_J_PieubSios ᆹ HANGUL JONGSEONG PIEUP-SIOS */ Hangul_J_Sios ᆺ HANGUL JONGSEONG SIOS */ Hangul_J_SsangSios ᆻ HANGUL JONGSEONG SSANGSIOS */ Hangul_J_Ieung ᆼ HANGUL JONGSEONG IEUNG */ Hangul_J_Jieuj ᆽ HANGUL JONGSEONG CIEUC */ Hangul_J_Cieuc ᆾ HANGUL JONGSEONG CHIEUCH */ Hangul_J_Khieuq ᆿ HANGUL JONGSEONG KHIEUKH */ Hangul_J_Tieut ᇀ HANGUL JONGSEONG THIEUTH */ Hangul_J_Phieuf ᇁ HANGUL JONGSEONG PHIEUPH */ Hangul_J_Hieuh ᇂ HANGUL JONGSEONG HIEUH */ Hangul_RieulYeorinHieuh ㅭ HANGUL LETTER RIEUL-YEORINHIEUH */ Hangul_SunkyeongeumMieum ㅱ HANGUL LETTER KAPYEOUNMIEUM */ Hangul_SunkyeongeumPieub ㅸ HANGUL LETTER KAPYEOUNPIEUP */ Hangul_PanSios ㅿ HANGUL LETTER PANSIOS */ Hangul_KkogjiDalrinIeung ㆁ HANGUL LETTER YESIEUNG */ Hangul_SunkyeongeumPhieuf ㆄ HANGUL LETTER KAPYEOUNPHIEUPH */ Hangul_YeorinHieuh ㆆ HANGUL LETTER YEORINHIEUH */ Hangul_AraeA ㆍ HANGUL LETTER ARAEA */ Hangul_AraeAE ㆎ HANGUL LETTER ARAEAE */ Hangul_J_PanSios ᇫ HANGUL JONGSEONG PANSIOS */ Hangul_J_KkogjiDalrinIeung ᇰ HANGUL JONGSEONG YESIEUNG */ Hangul_J_YeorinHieuh ᇹ HANGUL JONGSEONG YEORINHIEUH */ Korean_Won ₩ WON SIGN */ Euro € EURO SIGN */ OE Œ LATIN CAPITAL LIGATURE OE */ oe œ LATIN SMALL LIGATURE OE */ Ydiaeresis Ÿ LATIN CAPITAL LETTER Y WITH DIAERESIS */ EuroSign € EURO SIGN */ / sizeof(struct codepair) - 1; for Latin-1 characters (1:1 mapping) */ 0x0020 && keysym <= 0x007e) || 0x00a0 && keysym <= 0x00ff)) for directly encoded 24-bit UCS characters */ 0xff000000) == 0x01000000) < keysym) > keysym) Unicode value found */ / sizeof(struct codepair) - 1; for Latin-1 characters (1:1 mapping) */ 0x0020 && ucs <= 0x007e) || 0x00a0 && ucs <= 0x00ff)) encoded 24-bit UCS character */ ========================================== (rev 0) m2ucs.h	2011-03-09 13:28:12 UTC (rev 4349) converts keysym values into the corresponding ISO 10646-1 the SourceForge.net collaborative development platform, the world's largest Open Source development site.




    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[4355] trunk/vncviewer
		From: <ossman_@us...> -	2011-03-10 11:39

			



                
                    
                        Revision: 4355
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4355&view=rev
Author:   ossman_
Date:     2011-03-10 11:39:42 +0000 (Thu, 10 Mar 2011)

Log Message:
-----------
Reorganise the translation to keysyms to make the code simpler. At the same
time give special keys priority as some of them generate symbols as well.

Modified Paths:
--------------
    trunk/vncviewer/DesktopWindow.cxx
    trunk/vncviewer/DesktopWindow.h

Modified: trunk/vncviewer/DesktopWindow.cxx
===================================================================
--- trunk/vncviewer/DesktopWindow.cxx	2011-03-10 10:33:02 UTC (rev 4354)
+++ trunk/vncviewer/DesktopWindow.cxx	2011-03-10 11:39:42 UTC (rev 4355)
@@ -275,6 +275,96 @@
   self->cc->writer()->pointerEvent(self->lastPointerPos, self->lastButtonMask);
 }
 
+
+rdr::U32 DesktopWindow::translateKeyEvent(int keyCode, const char *keyText)
+{
+  unsigned ucs;
+
+  // First check for function keys
+  if ((keyCode >= FL_F) && (keyCode <= FL_F_Last))
+    return XK_F1 + (keyCode - FL_F);
+
+  // Then other special keys
+  switch (keyCode) {
+  case FL_BackSpace:
+    return XK_BackSpace;
+  case FL_Tab:
+    return XK_Tab;
+  case FL_Enter:
+    return XK_Return;
+  case FL_Pause:
+    return XK_Pause;
+  case FL_Scroll_Lock:
+    return XK_Scroll_Lock;
+  case FL_Escape:
+    return XK_Escape;
+  case FL_Home:
+    return XK_Home;
+  case FL_Left:
+    return XK_Left;
+  case FL_Up:
+    return XK_Up;
+  case FL_Right:
+    return XK_Right;
+  case FL_Down:
+    return XK_Down;
+  case FL_Page_Up:
+    return XK_Page_Up;
+  case FL_Page_Down:
+    return XK_Page_Down;
+  case FL_End:
+    return XK_End;
+  case FL_Print:
+    return XK_Print;
+  case FL_Insert:
+    return XK_Insert;
+  case FL_Menu:
+    return XK_Menu;
+  case FL_Help:
+    return XK_Help;
+  case FL_Num_Lock:
+    return XK_Num_Lock;
+  case FL_Shift_L:
+    return XK_Shift_L;
+  case FL_Shift_R:
+    return XK_Shift_R;
+  case FL_Control_L:
+    return XK_Control_L;
+  case FL_Control_R:
+    return XK_Control_R;
+  case FL_Caps_Lock:
+    return XK_Caps_Lock;
+  case FL_Meta_L:
+    return XK_Super_L;
+  case FL_Meta_R:
+    return XK_Super_R;
+  case FL_Alt_L:
+    return XK_Alt_L;
+  case FL_Alt_R:
+    return XK_Alt_R;
+  case FL_Delete:
+    return XK_Delete;
+  }
+
+  // Unknown special key?
+  if (keyText[0] == '\0') {
+    vlog.error(_("Unknown FLTK key code %d (0x%04x)"), keyCode, keyCode);
+    return XK_VoidSymbol;
+  }
+
+  // Look up the symbol the key produces and translate that from Unicode
+  // to a X11 keysym.
+  if (fl_utf_nb_char((const unsigned char*)keyText, strlen(keyText)) != 1) {
+    vlog.error(_("Multiple characters given for key code %d (0x%04x): '%s'"),
+               keyCode, keyCode, keyText);
+    return XK_VoidSymbol;
+  }
+
+  ucs = fl_utf8decode(keyText, NULL, NULL);
+  return ucs2keysym(ucs);
+}
+
+
 void DesktopWindow::handleKeyEvent(int keyCode, const char *keyText, bool down)
 {
   rdr::U32 keySym;
@@ -296,122 +386,10 @@
     return;
   }
 
-  // Special key
-  if (keyText[0] == '\0') {
-    if ((keyCode >= FL_F) && (keyCode <= FL_F_Last))
-      keySym = XK_F1 + (keyCode - FL_F);
-#if 0
-      case FL_KP		0xff80	///< One of the keypad numbers; use FL_KP + n for number n.
-      case FL_KP_Enter	0xff8d	///< The enter key on the keypad, same as Fl_KP+'\\r'.
-      case FL_KP_Last	0xffbd	///< The last keypad key; use to range-check keypad.
-#endif
-    else {
-      switch (keyCode) {
-      case FL_BackSpace:
-        keySym = XK_BackSpace;
-        break;
-      case FL_Tab:
-        keySym = XK_Tab;
-        break;
-      case FL_Enter:
-        keySym = XK_Return;
-        break;
-      case FL_Pause:
-        keySym = XK_Pause;
-        break;
-      case FL_Scroll_Lock:
-        keySym = XK_Scroll_Lock;
-        break;
-      case FL_Escape:
-        keySym = XK_Escape;
-        break;
-      case FL_Home:
-        keySym = XK_Home;
-        break;
-      case FL_Left:
-        keySym = XK_Left;
-        break;
-      case FL_Up:
-        keySym = XK_Up;
-        break;
-      case FL_Right:
-        keySym = XK_Right;
-        break;
-      case FL_Down:
-        keySym = XK_Down;
-        break;
-      case FL_Page_Up:
-        keySym = XK_Page_Up;
-        break;
-      case FL_Page_Down:
-        keySym = XK_Page_Down;
-        break;
-      case FL_End:
-        keySym = XK_End;
-        break;
-      case FL_Print:
-        keySym = XK_Print;
-        break;
-      case FL_Insert:
-        keySym = XK_Insert;
-        break;
-      case FL_Menu:
-        keySym = XK_Menu;
-        break;
-      case FL_Help:
-        keySym = XK_Help;
-        break;
-      case FL_Num_Lock:
-        keySym = XK_Num_Lock;
-        break;
-      case FL_Shift_L:
-        keySym = XK_Shift_L;
-        break;
-      case FL_Shift_R:
-        keySym = XK_Shift_R;
-        break;
-      case FL_Control_L:
-        keySym = XK_Control_L;
-        break;
-      case FL_Control_R:
-        keySym = XK_Control_R;
-        break;
-      case FL_Caps_Lock:
-        keySym = XK_Caps_Lock;
-        break;
-      case FL_Meta_L:
-        keySym = XK_Super_L;
-        break;
-      case FL_Meta_R:
-        keySym = XK_Super_R;
-        break;
-      case FL_Alt_L:
-        keySym = XK_Alt_L;
-        break;
-      case FL_Alt_R:
-        keySym = XK_Alt_R;
-        break;
-      case FL_Delete:
-        keySym = XK_Delete;
-        break;
-      default:
-        vlog.error(_("Unknown FLTK key code %d (0x%04x)"), keyCode, keyCode);
-        return;
-      }
-    }
-  } else {
-    unsigned ucs;
+  keySym = translateKeyEvent(keyCode, keyText);
+  if (keySym == XK_VoidSymbol)
+    return;
 
-    if (fl_utf_nb_char((const unsigned char*)keyText, strlen(keyText)) != 1) {
-      vlog.error(_("Multiple characters given for key code %d (0x%04x): '%s'"),
-                 keyCode, keyCode, keyText);
-      return;
-    }
-
-    ucs = fl_utf8decode(keyText, NULL, NULL);
-    keySym = ucs2keysym(ucs);
-  }
-
   downKeySym[keyCode] = keySym;
   cc->writer()->keyEvent(keySym, down);
 }

Modified: trunk/vncviewer/DesktopWindow.h
===================================================================
--- trunk/vncviewer/DesktopWindow.h	2011-03-10 10:33:02 UTC (rev 4354)
+++ trunk/vncviewer/DesktopWindow.h	2011-03-10 11:39:42 UTC (rev 4355)
@@ -100,6 +100,7 @@
   void handlePointerEvent(const rfb::Point& pos, int buttonMask);
   static void handlePointerTimeout(void *data);
 
+  rdr::U32 translateKeyEvent(int keyCode, const char *keyText);
   void handleKeyEvent(int keyCode, const char *keyText, bool down);
 
 private:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[4366] trunk/vncviewer
		From: <ossman_@us...> -	2011-04-14 12:49

			



                
                    
                        Revision: 4366
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4366&view=rev
Author:   ossman_
Date:     2011-04-14 12:49:03 +0000 (Thu, 14 Apr 2011)

Log Message:
-----------
Since Ctrl and Cmd tends to mess with the symbol generation, we need to do some
extra voodoo to get a good behaviour when any of those are pressed.

Modified Paths:
--------------
    trunk/vncviewer/CMakeLists.txt
    trunk/vncviewer/DesktopWindow.cxx

Added Paths:
-----------
    trunk/vncviewer/osx_utils.m

Modified: trunk/vncviewer/CMakeLists.txt
===================================================================
--- trunk/vncviewer/CMakeLists.txt	2011-04-11 11:59:31 UTC (rev 4365)
+++ trunk/vncviewer/CMakeLists.txt	2011-04-14 12:49:03 UTC (rev 4366)
@@ -1,8 +1,7 @@
 include_directories(${FLTK_INCLUDE_DIR})
 
 include_directories(${CMAKE_SOURCE_DIR}/common)
-
-add_executable(vncviewer 
+set(VNCVIEWER_SOURCES
   CConn.cxx
   DesktopWindow.cxx
   UserDialog.cxx
@@ -10,4 +9,10 @@
   keysym2ucs.c
   vncviewer.cxx)
 
+if(APPLE)
+  set(VNCVIEWER_SOURCES ${VNCVIEWER_SOURCES} osx_utils.m)
+endif()
+
+add_executable(vncviewer ${VNCVIEWER_SOURCES})
+
 target_link_libraries(vncviewer rfb network rdr os Xregion ${FLTK_LIBRARIES})

Modified: trunk/vncviewer/DesktopWindow.cxx
===================================================================
--- trunk/vncviewer/DesktopWindow.cxx	2011-04-11 11:59:31 UTC (rev 4365)
+++ trunk/vncviewer/DesktopWindow.cxx	2011-04-14 12:49:03 UTC (rev 4366)
@@ -45,6 +45,10 @@
 
 using namespace rfb;
 
+#ifdef __APPLE__
+extern "C" const char *osx_event_string(void);
+#endif
+
 extern void exit_vncviewer();
 
 static rfb::LogWriter vlog("DesktopWindow");
@@ -371,6 +375,80 @@
     return XK_KP_Divide;
   }
 
+  // Ctrl and Cmd tend to fudge input handling, so we need to cheat here
+  if (Fl::event_state() & (FL_COMMAND | FL_CTRL)) {
+#ifdef WIN32
+    BYTE keystate[256];
+    WCHAR wbuf[8];
+    int ret;
+
+    static char buf[32];
+
+    switch (fl_msg.message) {
+    case WM_KEYDOWN:
+    case WM_SYSKEYDOWN:
+      // Most buttons end up here when Ctrl is pressed. Here we can pretend
+      // that Ctrl isn't pressed, and do a character lookup.
+      GetKeyboardState(keystate);
+      keystate[VK_CONTROL] = keystate[VK_LCONTROL] = keystate[VK_RCONTROL] = 0;
+
+      ret = ToUnicode(fl_msg.wParam, 0, keystate, wbuf, sizeof(wbuf)/sizeof(wbuf[0]), 0);
+      if (ret != 0) {
+        // -1 means one dead character
+        ret = abs(ret);
+        wbuf[ret] = 0x0000;
+
+        if (fl_utf8fromwc(buf, sizeof(buf), wbuf, ret) >= sizeof(buf)) {
+          vlog.error(_("Out of buffer space whilst converting key event"));
+          return XK_VoidSymbol;
+        }
+
+        keyText = buf;
+      }
+      break;
+    case WM_CHAR:
+    case WM_SYSCHAR:
+      // Windows doesn't seem to have any sanity when it comes to control
+      // characters. We assume that Ctrl-A through Ctrl-Z range maps to
+      // the VK_A through VK_Z keys, and just let the rest fall through.
+      if ((fl_msg.wParam < 0x01) || (fl_msg.wParam > 0x1a))
+        break;
+
+      // Pretend that Ctrl isn't pressed, and do a character lookup.
+      GetKeyboardState(keystate);
+      keystate[VK_CONTROL] = keystate[VK_LCONTROL] = keystate[VK_RCONTROL] = 0;
+
+      // Ctrl-A is 0x01 and VK_A is 0x41, so add 0x40 for the conversion
+      ret = ToUnicode(fl_msg.wParam + 0x40, 0, keystate, wbuf, sizeof(wbuf)/sizeof(wbuf[0]), 0);
+      if (ret != 0) {
+        // -1 means one dead character
+        ret = abs(ret);
+        wbuf[ret] = 0x0000;
+
+        if (fl_utf8fromwc(buf, sizeof(buf), wbuf, ret) >= sizeof(buf)) {
+          vlog.error(_("Out of buffer space whilst converting key event"));
+          return XK_VoidSymbol;
+        }
+
+        keyText = buf;
+      }
+      break;
+    default:
+      // Not sure how we ended up here. Do nothing...
+      break;
+    }
+#elif defined(__APPLE__)
+    keyText = osx_event_string();
+#else
+    char buf[16];
+    KeySym sym;
+
+    XLookupString((XKeyEvent*)fl_xevent, buf, sizeof(buf), &sym, NULL);
+
+    return sym;
+#endif
+  }
+
   // Unknown special key?
   if (keyText[0] == '\0') {
     vlog.error(_("Unknown FLTK key code %d (0x%04x)"), keyCode, keyCode);

Added: trunk/vncviewer/osx_utils.m
===================================================================
--- trunk/vncviewer/osx_utils.m	                        (rev 0)
+++ trunk/vncviewer/osx_utils.m	2011-04-14 12:49:03 UTC (rev 4366)
@@ -0,0 +1,25 @@
+/* Copyright 2011 Pierre Ossman <ossman@...> for Cendio AB
+ * 
+ * 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.
+ */
+
+#import <Cocoa/Cocoa.h>
+
+const char *osx_event_string(void)
+{
+    return [[[NSApp currentEvent] charactersIgnoringModifiers] UTF8String];
+}
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[4368] trunk/vncviewer
		From: <ossman_@us...> -	2011-04-14 14:05

			



                
                    
                        Revision: 4368
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4368&view=rev
Author:   ossman_
Date:     2011-04-14 14:05:13 +0000 (Thu, 14 Apr 2011)

Log Message:
-----------
Use a STL map to track keys so we don't have to care what range FLTK key codes
can have.

Modified Paths:
--------------
    trunk/vncviewer/DesktopWindow.cxx
    trunk/vncviewer/DesktopWindow.h

Modified: trunk/vncviewer/DesktopWindow.cxx
===================================================================
--- trunk/vncviewer/DesktopWindow.cxx	2011-04-14 13:07:37 UTC (rev 4367)
+++ trunk/vncviewer/DesktopWindow.cxx	2011-04-14 14:05:13 UTC (rev 4368)
@@ -479,17 +479,23 @@
   if (viewOnly)
     return;
 
-  if (keyCode > 0xFFFF) {
-      vlog.error(_("Too large FLTK key code %d (0x%08x)"), keyCode, keyCode);
-      return;
-  }
-
   // Because of the way keyboards work, we cannot expect to have the same
   // symbol on release as when pressed. This breaks the VNC protocol however,
   // so we need to keep track of what keysym a key _code_ generated on press
   // and send the same on release.
   if (!down) {
-    cc->writer()->keyEvent(downKeySym[keyCode], false);
+    DownMap::iterator iter;
+
+    iter = downKeySym.find(keyCode);
+    if (iter == downKeySym.end()) {
+      vlog.error(_("Unexpected release of FLTK key code %d (0x%04x)"), keyCode, keyCode);
+      return;
+    }
+
+    cc->writer()->keyEvent(iter->second, false);
+
+    downKeySym.erase(iter);
+
     return;
   }
 

Modified: trunk/vncviewer/DesktopWindow.h
===================================================================
--- trunk/vncviewer/DesktopWindow.h	2011-04-14 13:07:37 UTC (rev 4367)
+++ trunk/vncviewer/DesktopWindow.h	2011-04-14 14:05:13 UTC (rev 4368)
@@ -20,6 +20,8 @@
 #ifndef __DESKTOPWINDOW_H__
 #define __DESKTOPWINDOW_H__
 
+#include <map>
+
 #include <FL/Fl.H>
 #include <FL/Fl_Window.H>
 
@@ -116,7 +118,8 @@
   rfb::Point lastPointerPos;
   int lastButtonMask;
 
-  rdr::U32 downKeySym[65536];
+  typedef std::map<int, rdr::U32> DownMap;
+  DownMap downKeySym;
 };
 
 #endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[4371] trunk/vncviewer
		From: <ossman_@us...> -	2011-04-15 07:47

			



                
                    
                        Revision: 4371
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4371&view=rev
Author:   ossman_
Date:     2011-04-15 07:46:56 +0000 (Fri, 15 Apr 2011)

Log Message:
-----------
Split out the graphics and input handling to a separate widget in preparation
for things like scroll bars.

Modified Paths:
--------------
    trunk/vncviewer/CMakeLists.txt
    trunk/vncviewer/DesktopWindow.cxx
    trunk/vncviewer/DesktopWindow.h

Added Paths:
-----------
    trunk/vncviewer/Viewport.cxx
    trunk/vncviewer/Viewport.h

Modified: trunk/vncviewer/CMakeLists.txt
===================================================================
--- trunk/vncviewer/CMakeLists.txt	2011-04-14 15:16:18 UTC (rev 4370)
+++ trunk/vncviewer/CMakeLists.txt	2011-04-15 07:46:56 UTC (rev 4371)
@@ -5,6 +5,7 @@
   CConn.cxx
   DesktopWindow.cxx
   UserDialog.cxx
+  Viewport.cxx
   parameters.cxx
   keysym2ucs.c
   vncviewer.cxx)

Modified: trunk/vncviewer/DesktopWindow.cxx
===================================================================
--- trunk/vncviewer/DesktopWindow.cxx	2011-04-14 15:16:18 UTC (rev 4370)
+++ trunk/vncviewer/DesktopWindow.cxx	2011-04-15 07:46:56 UTC (rev 4371)
@@ -21,35 +21,13 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <FL/fl_draw.H>
-
-#include <rfb/CMsgWriter.h>
 #include <rfb/LogWriter.h>
 
-// FLTK can pull in the X11 headers on some systems
-#ifndef XK_VoidSymbol
-#define XK_MISCELLANY
-#define XK_XKB_KEYS
-#include <rfb/keysymdef.h>
-#endif
-
 #include "DesktopWindow.h"
-#include "CConn.h"
 #include "i18n.h"
-#include "parameters.h"
-#include "keysym2ucs.h"
 
-// FLTK STR #2599 must be fixed for proper dead keys support
-#ifndef HAVE_FLTK_DEAD_KEYS
-#define event_compose_symbol event_text
-#endif
-
 using namespace rfb;
 
-#ifdef __APPLE__
-extern "C" const char *osx_event_string(void);
-#endif
-
 extern void exit_vncviewer();
 
 static rfb::LogWriter vlog("DesktopWindow");
@@ -57,56 +35,34 @@
 DesktopWindow::DesktopWindow(int w, int h, const char *name,
                              const rfb::PixelFormat& serverPF,
                              CConn* cc_)
-  : Fl_Window(w, h), cc(cc_), frameBuffer(NULL), pixelTrans(NULL),
-    lastPointerPos(0, 0), lastButtonMask(0)
+  : Fl_Window(w, h)
 {
+  viewport = new Viewport(w, h, serverPF, cc_);
+
   callback(handleClose, this);
 
   setName(name);
 
-  frameBuffer = new ManagedPixelBuffer(getPreferredPF(), w, h);
-  assert(frameBuffer);
-
-  setServerPF(serverPF);
-
   show();
 }
 
 
 DesktopWindow::~DesktopWindow()
 {
-  // Unregister all timeouts in case they get a change tro trigger
-  // again later when this object is already gone.
-  Fl::remove_timeout(handleUpdateTimeout, this);
-  Fl::remove_timeout(handleColourMap, this);
-  Fl::remove_timeout(handlePointerTimeout, this);
-
-  delete frameBuffer;
-
-  if (pixelTrans)
-    delete pixelTrans;
+  // FLTK automatically deletes all child widgets, so we shouldn't touch
+  // them ourselves here
 }
 
 
 void DesktopWindow::setServerPF(const rfb::PixelFormat& pf)
 {
-  if (pixelTrans)
-    delete pixelTrans;
-  pixelTrans = NULL;
-
-  if (pf.equal(getPreferredPF()))
-    return;
-
-  pixelTrans = new PixelTransformer();
-  pixelTrans->init(pf, &colourMap, getPreferredPF());
+  viewport->setServerPF(pf);
 }
 
 
 const rfb::PixelFormat &DesktopWindow::getPreferredPF()
 {
-  static PixelFormat prefPF(32, 24, false, true, 255, 255, 255, 0, 8, 16);
-
-  return prefPF;
+  return viewport->getPreferredPF();
 }
 
 
@@ -128,18 +84,11 @@
   copy_label(windowNameStr.buf);
 }
 
-// setColourMapEntries() changes some of the entries in the colourmap.
-// Unfortunately these messages are often sent one at a time, so we delay the
-// settings taking effect by 100ms.  This is because recalculating the internal
-// translation table can be expensive.
+
 void DesktopWindow::setColourMapEntries(int firstColour, int nColours,
                                         rdr::U16* rgbs)
 {
-  for (int i = 0; i < nColours; i++)
-    colourMap.set(firstColour+i, rgbs[i*3], rgbs[i*3+1], rgbs[i*3+2]);
-
-  if (!Fl::has_timeout(handleColourMap, this))
-    Fl::add_timeout(0.100, handleColourMap, this);
+  viewport->setColourMapEntries(firstColour, nColours, rgbs);
 }
 
 
@@ -148,370 +97,11 @@
 
 void DesktopWindow::updateWindow()
 {
-  Rect r;
-
-  Fl::remove_timeout(handleUpdateTimeout, this);
-
-  r = damage.get_bounding_rect();
-  Fl_Window::damage(FL_DAMAGE_USER1, r.tl.x, r.tl.y, r.width(), r.height());
-
-  damage.clear();
+  viewport->updateWindow();
 }
 
 
-void DesktopWindow::draw()
-{
-  int X, Y, W, H;
-
-  int pixel_bytes, stride_bytes;
-  const uchar *buf_start;
-
-  // Check what actually needs updating
-  fl_clip_box(0, 0, w(), h(), X, Y, W, H);
-  if ((W == 0) || (H == 0))
-    return;
-
-  pixel_bytes = frameBuffer->getPF().bpp/8;
-  stride_bytes = pixel_bytes * frameBuffer->getStride();
-  buf_start = frameBuffer->data +
-              pixel_bytes * X +
-              stride_bytes * Y;
-
-  // FIXME: Check how efficient this thing really is
-  fl_draw_image(buf_start, X, Y, W, H, pixel_bytes, stride_bytes);
-}
-
-
-int DesktopWindow::handle(int event)
-{
-  int buttonMask, wheelMask;
-  DownMap::const_iterator iter;
-
-  switch (event) {
-  case FL_PUSH:
-  case FL_RELEASE:
-  case FL_DRAG:
-  case FL_MOVE:
-  case FL_MOUSEWHEEL:
-    buttonMask = 0;
-    if (Fl::event_button1())
-      buttonMask |= 1;
-    if (Fl::event_button2())
-      buttonMask |= 2;
-    if (Fl::event_button3())
-      buttonMask |= 4;
-
-    if (event == FL_MOUSEWHEEL) {
-      if (Fl::event_dy() < 0)
-        wheelMask = 8;
-      else
-        wheelMask = 16;
-
-      // A quick press of the wheel "button", followed by a immediate
-      // release below
-      handlePointerEvent(Point(Fl::event_x(), Fl::event_y()),
-                         buttonMask | wheelMask);
-    } 
-
-    handlePointerEvent(Point(Fl::event_x(), Fl::event_y()), buttonMask);
-    return 1;
-
-  case FL_FOCUS:
-    // Yes, we would like some focus please!
-    return 1;
-
-  case FL_UNFOCUS:
-    // Release all keys that were pressed as that generally makes most
-    // sense (e.g. Alt+Tab where we only see the Alt press)
-    for (iter = downKeySym.begin();iter != downKeySym.end();++iter)
-      cc->writer()->keyEvent(iter->second, false);
-    downKeySym.clear();
-    return 1;
-
-  case FL_KEYDOWN:
-    handleKeyEvent(Fl::event_key(), Fl::event_compose_symbol(), true);
-    return 1;
-
-  case FL_KEYUP:
-    handleKeyEvent(Fl::event_key(), Fl::event_compose_symbol(), false);
-    return 1;
-  }
-
-  return Fl_Window::handle(event);
-}
-
-
-void DesktopWindow::handleUpdateTimeout(void *data)
-{
-  DesktopWindow *self = (DesktopWindow *)data;
-
-  assert(self);
-
-  self->updateWindow();
-}
-
-
-void DesktopWindow::handleColourMap(void *data)
-{
-  DesktopWindow *self = (DesktopWindow *)data;
-
-  assert(self);
-
-  if (self->pixelTrans != NULL)
-    self->pixelTrans->setColourMapEntries(0, 0);
-
-  self->Fl_Window::damage(FL_DAMAGE_ALL);
-}
-
 void DesktopWindow::handleClose(Fl_Widget *wnd, void *data)
 {
   exit_vncviewer();
 }
-
-
-void DesktopWindow::handlePointerEvent(const rfb::Point& pos, int buttonMask)
-{
-  if (!viewOnly) {
-    if (pointerEventInterval == 0 || buttonMask != lastButtonMask) {
-      cc->writer()->pointerEvent(pos, buttonMask);
-    } else {
-      if (!Fl::has_timeout(handlePointerTimeout, this))
-        Fl::add_timeout((double)pointerEventInterval/1000.0,
-                        handlePointerTimeout, this);
-    }
-    lastPointerPos = pos;
-    lastButtonMask = buttonMask;
-  }
-}
-
-
-void DesktopWindow::handlePointerTimeout(void *data)
-{
-  DesktopWindow *self = (DesktopWindow *)data;
-
-  assert(self);
-
-  self->cc->writer()->pointerEvent(self->lastPointerPos, self->lastButtonMask);
-}
-
-
-rdr::U32 DesktopWindow::translateKeyEvent(int keyCode, const char *keyText)
-{
-  unsigned ucs;
-
-  // First check for function keys
-  if ((keyCode > FL_F) && (keyCode <= FL_F_Last))
-    return XK_F1 + (keyCode - FL_F - 1);
-
-  // Numpad numbers
-  if ((keyCode >= (FL_KP + '0')) && (keyCode <= (FL_KP + '9')))
-    return XK_KP_0 + (keyCode - (FL_KP + '0'));
-
-  // Then other special keys
-  switch (keyCode) {
-  case FL_BackSpace:
-    return XK_BackSpace;
-  case FL_Tab:
-    return XK_Tab;
-  case FL_Enter:
-    return XK_Return;
-  case FL_Pause:
-    return XK_Pause;
-  case FL_Scroll_Lock:
-    return XK_Scroll_Lock;
-  case FL_Escape:
-    return XK_Escape;
-  case FL_Home:
-    return XK_Home;
-  case FL_Left:
-    return XK_Left;
-  case FL_Up:
-    return XK_Up;
-  case FL_Right:
-    return XK_Right;
-  case FL_Down:
-    return XK_Down;
-  case FL_Page_Up:
-    return XK_Page_Up;
-  case FL_Page_Down:
-    return XK_Page_Down;
-  case FL_End:
-    return XK_End;
-  case FL_Print:
-    return XK_Print;
-  case FL_Insert:
-    return XK_Insert;
-  case FL_Menu:
-    return XK_Menu;
-  case FL_Help:
-    return XK_Help;
-  case FL_Num_Lock:
-    return XK_Num_Lock;
-  case FL_Shift_L:
-    return XK_Shift_L;
-  case FL_Shift_R:
-    return XK_Shift_R;
-  case FL_Control_L:
-    return XK_Control_L;
-  case FL_Control_R:
-    return XK_Control_R;
-  case FL_Caps_Lock:
-    return XK_Caps_Lock;
-  case FL_Meta_L:
-    return XK_Super_L;
-  case FL_Meta_R:
-    return XK_Super_R;
-  case FL_Alt_L:
-    return XK_Alt_L;
-  case FL_Alt_R:
-    return XK_Alt_R;
-  case FL_Delete:
-    return XK_Delete;
-  case FL_KP_Enter:
-    return XK_KP_Enter;
-  case FL_KP + '=':
-    return XK_KP_Equal;
-  case FL_KP + '*':
-    return XK_KP_Multiply;
-  case FL_KP + '+':
-    return XK_KP_Add;
-  case FL_KP + ',':
-    return XK_KP_Separator;
-  case FL_KP + '-':
-    return XK_KP_Subtract;
-  case FL_KP + '.':
-    return XK_KP_Decimal;
-  case FL_KP + '/':
-    return XK_KP_Divide;
-  case XK_ISO_Level3_Shift:
-    // FLTK tends to let this one leak through on X11...
-    return XK_ISO_Level3_Shift;
-  }
-
-  // Ctrl and Cmd tend to fudge input handling, so we need to cheat here
-  if (Fl::event_state() & (FL_COMMAND | FL_CTRL)) {
-#ifdef WIN32
-    BYTE keystate[256];
-    WCHAR wbuf[8];
-    int ret;
-
-    static char buf[32];
-
-    switch (fl_msg.message) {
-    case WM_KEYDOWN:
-    case WM_SYSKEYDOWN:
-      // Most buttons end up here when Ctrl is pressed. Here we can pretend
-      // that Ctrl isn't pressed, and do a character lookup.
-      GetKeyboardState(keystate);
-      keystate[VK_CONTROL] = keystate[VK_LCONTROL] = keystate[VK_RCONTROL] = 0;
-
-      ret = ToUnicode(fl_msg.wParam, 0, keystate, wbuf, sizeof(wbuf)/sizeof(wbuf[0]), 0);
-      if (ret != 0) {
-        // -1 means one dead character
-        ret = abs(ret);
-        wbuf[ret] = 0x0000;
-
-        if (fl_utf8fromwc(buf, sizeof(buf), wbuf, ret) >= sizeof(buf)) {
-          vlog.error(_("Out of buffer space whilst converting key event"));
-          return XK_VoidSymbol;
-        }
-
-        keyText = buf;
-      }
-      break;
-    case WM_CHAR:
-    case WM_SYSCHAR:
-      // Windows doesn't seem to have any sanity when it comes to control
-      // characters. We assume that Ctrl-A through Ctrl-Z range maps to
-      // the VK_A through VK_Z keys, and just let the rest fall through.
-      if ((fl_msg.wParam < 0x01) || (fl_msg.wParam > 0x1a))
-        break;
-
-      // Pretend that Ctrl isn't pressed, and do a character lookup.
-      GetKeyboardState(keystate);
-      keystate[VK_CONTROL] = keystate[VK_LCONTROL] = keystate[VK_RCONTROL] = 0;
-
-      // Ctrl-A is 0x01 and VK_A is 0x41, so add 0x40 for the conversion
-      ret = ToUnicode(fl_msg.wParam + 0x40, 0, keystate, wbuf, sizeof(wbuf)/sizeof(wbuf[0]), 0);
-      if (ret != 0) {
-        // -1 means one dead character
-        ret = abs(ret);
-        wbuf[ret] = 0x0000;
-
-        if (fl_utf8fromwc(buf, sizeof(buf), wbuf, ret) >= sizeof(buf)) {
-          vlog.error(_("Out of buffer space whilst converting key event"));
-          return XK_VoidSymbol;
-        }
-
-        keyText = buf;
-      }
-      break;
-    default:
-      // Not sure how we ended up here. Do nothing...
-      break;
-    }
-#elif defined(__APPLE__)
-    keyText = osx_event_string();
-#else
-    char buf[16];
-    KeySym sym;
-
-    XLookupString((XKeyEvent*)fl_xevent, buf, sizeof(buf), &sym, NULL);
-
-    return sym;
-#endif
-  }
-
-  // Unknown special key?
-  if (keyText[0] == '\0') {
-    vlog.error(_("Unknown FLTK key code %d (0x%04x)"), keyCode, keyCode);
-    return XK_VoidSymbol;
-  }
-
-  // Look up the symbol the key produces and translate that from Unicode
-  // to a X11 keysym.
-  if (fl_utf_nb_char((const unsigned char*)keyText, strlen(keyText)) != 1) {
-    vlog.error(_("Multiple characters given for key code %d (0x%04x): '%s'"),
-               keyCode, keyCode, keyText);
-    return XK_VoidSymbol;
-  }
-
-  ucs = fl_utf8decode(keyText, NULL, NULL);
-  return ucs2keysym(ucs);
-}
-
-
-void DesktopWindow::handleKeyEvent(int keyCode, const char *keyText, bool down)
-{
-  rdr::U32 keySym;
-
-  if (viewOnly)
-    return;
-
-  // Because of the way keyboards work, we cannot expect to have the same
-  // symbol on release as when pressed. This breaks the VNC protocol however,
-  // so we need to keep track of what keysym a key _code_ generated on press
-  // and send the same on release.
-  if (!down) {
-    DownMap::iterator iter;
-
-    iter = downKeySym.find(keyCode);
-    if (iter == downKeySym.end()) {
-      vlog.error(_("Unexpected release of FLTK key code %d (0x%04x)"), keyCode, keyCode);
-      return;
-    }
-
-    cc->writer()->keyEvent(iter->second, false);
-
-    downKeySym.erase(iter);
-
-    return;
-  }
-
-  keySym = translateKeyEvent(keyCode, keyText);
-  if (keySym == XK_VoidSymbol)
-    return;
-
-  downKeySym[keyCode] = keySym;
-  cc->writer()->keyEvent(keySym, down);
-}

Modified: trunk/vncviewer/DesktopWindow.h
===================================================================
--- trunk/vncviewer/DesktopWindow.h	2011-04-14 15:16:18 UTC (rev 4370)
+++ trunk/vncviewer/DesktopWindow.h	2011-04-15 07:46:56 UTC (rev 4371)
@@ -26,11 +26,9 @@
 #include <FL/Fl_Window.H>
 
 #include <rfb/Rect.h>
-#include <rfb/Region.h>
-#include <rfb/Timer.h>
-#include <rfb/PixelBuffer.h>
-#include <rfb/PixelTransformer.h>
 
+#include "Viewport.h"
+
 class CConn;
 
 class DesktopWindow : public Fl_Window {
@@ -58,68 +56,20 @@
   void setColourMapEntries(int firstColour, int nColours, rdr::U16* rgbs);
 
   void fillRect(const rfb::Rect& r, rfb::Pixel pix) {
-    if (pixelTrans) {
-      rfb::Pixel pix2;
-      pixelTrans->translatePixels(&pix, &pix2, 1);
-      pix = pix2;
-    }
-
-    frameBuffer->fillRect(r, pix);
-    damageRect(r);
+    viewport->fillRect(r, pix);
   }
   void imageRect(const rfb::Rect& r, void* pixels) {
-    if (pixelTrans)
-      pixelTrans->translateRect(pixels, r.width(),
-                                rfb::Rect(0, 0, r.width(), r.height()),
-                                frameBuffer->data, frameBuffer->getStride(),
-                                r.tl);
-    else
-      frameBuffer->imageRect(r, pixels);
-    damageRect(r);
+    viewport->imageRect(r, pixels);
   }
   void copyRect(const rfb::Rect& r, int srcX, int srcY) {
-    frameBuffer->copyRect(r, rfb::Point(r.tl.x-srcX, r.tl.y-srcY));
-    damageRect(r);
+    viewport->copyRect(r, srcX, srcY);
   }
 
-  // Fl_Window callback methods
-  void draw();
-  int handle(int event);
-
 private:
-
-  void damageRect(const rfb::Rect& r) {
-    damage.assign_union(rfb::Region(r));
-    if (!Fl::has_timeout(handleUpdateTimeout, this))
-      Fl::add_timeout(0.100, handleUpdateTimeout, this);
-  };
-
-  static void handleUpdateTimeout(void *data);
-  static void handleColourMap(void *data);
-
   static void handleClose(Fl_Widget *wnd, void *data);
 
-  void handlePointerEvent(const rfb::Point& pos, int buttonMask);
-  static void handlePointerTimeout(void *data);
-
-  rdr::U32 translateKeyEvent(int keyCode, const char *keyText);
-  void handleKeyEvent(int keyCode, const char *keyText, bool down);
-
 private:
-  CConn* cc;
-
-  rfb::ManagedPixelBuffer* frameBuffer;
-
-  rfb::PixelTransformer *pixelTrans;
-  rfb::SimpleColourMap colourMap;
-
-  rfb::Region damage;
-
-  rfb::Point lastPointerPos;
-  int lastButtonMask;
-
-  typedef std::map<int, rdr::U32> DownMap;
-  DownMap downKeySym;
+  Viewport *viewport;
 };
 
 #endif

Copied: trunk/vncviewer/Viewport.cxx (from rev 4369, trunk/vncviewer/DesktopWindow.cxx)
===================================================================
--- trunk/vncviewer/Viewport.cxx	                        (rev 0)
+++ trunk/vncviewer/Viewport.cxx	2011-04-15 07:46:56 UTC (rev 4371)
@@ -0,0 +1,489 @@
+/* Copyright (C) 2002-2005 RealVNC Ltd.  All Rights Reserved.
+ * Copyright 2011 Pierre Ossman <ossman@...> for Cendio AB
+ * 
+ * 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 <assert.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <FL/fl_draw.H>
+
+#include <rfb/CMsgWriter.h>
+#include <rfb/LogWriter.h>
+
+// FLTK can pull in the X11 headers on some systems
+#ifndef XK_VoidSymbol
+#define XK_MISCELLANY
+#define XK_XKB_KEYS
+#include <rfb/keysymdef.h>
+#endif
+
+#include "Viewport.h"
+#include "CConn.h"
+#include "i18n.h"
+#include "parameters.h"
+#include "keysym2ucs.h"
+
+// FLTK STR #2599 must be fixed for proper dead keys support
+#ifndef HAVE_FLTK_DEAD_KEYS
+#define event_compose_symbol event_text
+#endif
+
+using namespace rfb;
+
+#ifdef __APPLE__
+extern "C" const char *osx_event_string(void);
+#endif
+
+extern void exit_vncviewer();
+
+static rfb::LogWriter vlog("Viewport");
+
+Viewport::Viewport(int w, int h, const rfb::PixelFormat& serverPF, CConn* cc_)
+  : Fl_Widget(0, 0, w, h), cc(cc_), frameBuffer(NULL), pixelTrans(NULL),
+    lastPointerPos(0, 0), lastButtonMask(0)
+{
+  frameBuffer = new ManagedPixelBuffer(getPreferredPF(), w, h);
+  assert(frameBuffer);
+
+  setServerPF(serverPF);
+}
+
+
+Viewport::~Viewport()
+{
+  // Unregister all timeouts in case they get a change tro trigger
+  // again later when this object is already gone.
+  Fl::remove_timeout(handleUpdateTimeout, this);
+  Fl::remove_timeout(handleColourMap, this);
+  Fl::remove_timeout(handlePointerTimeout, this);
+
+  delete frameBuffer;
+
+  if (pixelTrans)
+    delete pixelTrans;
+}
+
+
+void Viewport::setServerPF(const rfb::PixelFormat& pf)
+{
+  if (pixelTrans)
+    delete pixelTrans;
+  pixelTrans = NULL;
+
+  if (pf.equal(getPreferredPF()))
+    return;
+
+  pixelTrans = new PixelTransformer();
+  pixelTrans->init(pf, &colourMap, getPreferredPF());
+}
+
+
+const rfb::PixelFormat &Viewport::getPreferredPF()
+{
+  static PixelFormat prefPF(32, 24, false, true, 255, 255, 255, 0, 8, 16);
+
+  return prefPF;
+}
+
+
+// setColourMapEntries() changes some of the entries in the colourmap.
+// Unfortunately these messages are often sent one at a time, so we delay the
+// settings taking effect by 100ms.  This is because recalculating the internal
+// translation table can be expensive.
+void Viewport::setColourMapEntries(int firstColour, int nColours,
+                                   rdr::U16* rgbs)
+{
+  for (int i = 0; i < nColours; i++)
+    colourMap.set(firstColour+i, rgbs[i*3], rgbs[i*3+1], rgbs[i*3+2]);
+
+  if (!Fl::has_timeout(handleColourMap, this))
+    Fl::add_timeout(0.100, handleColourMap, this);
+}
+
+
+// Copy the areas of the framebuffer that have been changed (damaged)
+// to the displayed window.
+
+void Viewport::updateWindow()
+{
+  Rect r;
+
+  Fl::remove_timeout(handleUpdateTimeout, this);
+
+  r = damage.get_bounding_rect();
+  Fl_Widget::damage(FL_DAMAGE_USER1, r.tl.x, r.tl.y, r.width(), r.height());
+
+  damage.clear();
+}
+
+
+void Viewport::draw()
+{
+  int X, Y, W, H;
+
+  int pixel_bytes, stride_bytes;
+  const uchar *buf_start;
+
+  // Check what actually needs updating
+  fl_clip_box(0, 0, w(), h(), X, Y, W, H);
+  if ((W == 0) || (H == 0))
+    return;
+
+  pixel_bytes = frameBuffer->getPF().bpp/8;
+  stride_bytes = pixel_bytes * frameBuffer->getStride();
+  buf_start = frameBuffer->data +
+              pixel_bytes * X +
+              stride_bytes * Y;
+
+  // FIXME: Check how efficient this thing really is
+  fl_draw_image(buf_start, X, Y, W, H, pixel_bytes, stride_bytes);
+}
+
+
+int Viewport::handle(int event)
+{
+  int buttonMask, wheelMask;
+  DownMap::const_iterator iter;
+
+  switch (event) {
+  case FL_ENTER:
+    // Yes, we would like some pointer events please!
+    return 1;
+  case FL_PUSH:
+  case FL_RELEASE:
+  case FL_DRAG:
+  case FL_MOVE:
+  case FL_MOUSEWHEEL:
+    buttonMask = 0;
+    if (Fl::event_button1())
+      buttonMask |= 1;
+    if (Fl::event_button2())
+      buttonMask |= 2;
+    if (Fl::event_button3())
+      buttonMask |= 4;
+
+    if (event == FL_MOUSEWHEEL) {
+      if (Fl::event_dy() < 0)
+        wheelMask = 8;
+      else
+        wheelMask = 16;
+
+      // A quick press of the wheel "button", followed by a immediate
+      // release below
+      handlePointerEvent(Point(Fl::event_x(), Fl::event_y()),
+                         buttonMask | wheelMask);
+    } 
+
+    handlePointerEvent(Point(Fl::event_x(), Fl::event_y()), buttonMask);
+    return 1;
+
+  case FL_FOCUS:
+    // Yes, we would like some focus please!
+    return 1;
+
+  case FL_UNFOCUS:
+    // Release all keys that were pressed as that generally makes most
+    // sense (e.g. Alt+Tab where we only see the Alt press)
+    for (iter = downKeySym.begin();iter != downKeySym.end();++iter)
+      cc->writer()->keyEvent(iter->second, false);
+    downKeySym.clear();
+    return 1;
+
+  case FL_KEYDOWN:
+    handleKeyEvent(Fl::event_key(), Fl::event_compose_symbol(), true);
+    return 1;
+
+  case FL_KEYUP:
+    handleKeyEvent(Fl::event_key(), Fl::event_compose_symbol(), false);
+    return 1;
+  }
+
+  return Fl_Widget::handle(event);
+}
+
+
+void Viewport::handleUpdateTimeout(void *data)
+{
+  Viewport *self = (Viewport *)data;
+
+  assert(self);
+
+  self->updateWindow();
+}
+
+
+void Viewport::handleColourMap(void *data)
+{
+  Viewport *self = (Viewport *)data;
+
+  assert(self);
+
+  if (self->pixelTrans != NULL)
+    self->pixelTrans->setColourMapEntries(0, 0);
+
+  self->Fl_Widget::damage(FL_DAMAGE_ALL);
+}
+
+
+void Viewport::handlePointerEvent(const rfb::Point& pos, int buttonMask)
+{
+  if (!viewOnly) {
+    if (pointerEventInterval == 0 || buttonMask != lastButtonMask) {
+      cc->writer()->pointerEvent(pos, buttonMask);
+    } else {
+      if (!Fl::has_timeout(handlePointerTimeout, this))
+        Fl::add_timeout((double)pointerEventInterval/1000.0,
+                        handlePointerTimeout, this);
+    }
+    lastPointerPos = pos;
+    lastButtonMask = buttonMask;
+  }
+}
+
+
+void Viewport::handlePointerTimeout(void *data)
+{
+  Viewport *self = (Viewport *)data;
+
+  assert(self);
+
+  self->cc->writer()->pointerEvent(self->lastPointerPos, self->lastButtonMask);
+}
+
+
+rdr::U32 Viewport::translateKeyEvent(int keyCode, const char *keyText)
+{
+  unsigned ucs;
+
+  // First check for function keys
+  if ((keyCode > FL_F) && (keyCode <= FL_F_Last))
+    return XK_F1 + (keyCode - FL_F - 1);
+
+  // Numpad numbers
+  if ((keyCode >= (FL_KP + '0')) && (keyCode <= (FL_KP + '9')))
+    return XK_KP_0 + (keyCode - (FL_KP + '0'));
+
+  // Then other special keys
+  switch (keyCode) {
+  case FL_BackSpace:
+    return XK_BackSpace;
+  case FL_Tab:
+    return XK_Tab;
+  case FL_Enter:
+    return XK_Return;
+  case FL_Pause:
+    return XK_Pause;
+  case FL_Scroll_Lock:
+    return XK_Scroll_Lock;
+  case FL_Escape:
+    return XK_Escape;
+  case FL_Home:
+    return XK_Home;
+  case FL_Left:
+    return XK_Left;
+  case FL_Up:
+    return XK_Up;
+  case FL_Right:
+    return XK_Right;
+  case FL_Down:
+    return XK_Down;
+  case FL_Page_Up:
+    return XK_Page_Up;
+  case FL_Page_Down:
+    return XK_Page_Down;
+  case FL_End:
+    return XK_End;
+  case FL_Print:
+    return XK_Print;
+  case FL_Insert:
+    return XK_Insert;
+  case FL_Menu:
+    return XK_Menu;
+  case FL_Help:
+    return XK_Help;
+  case FL_Num_Lock:
+    return XK_Num_Lock;
+  case FL_Shift_L:
+    return XK_Shift_L;
+  case FL_Shift_R:
+    return XK_Shift_R;
+  case FL_Control_L:
+    return XK_Control_L;
+  case FL_Control_R:
+    return XK_Control_R;
+  case FL_Caps_Lock:
+    return XK_Caps_Lock;
+  case FL_Meta_L:
+    return XK_Super_L;
+  case FL_Meta_R:
+    return XK_Super_R;
+  case FL_Alt_L:
+    return XK_Alt_L;
+  case FL_Alt_R:
+    return XK_Alt_R;
+  case FL_Delete:
+    return XK_Delete;
+  case FL_KP_Enter:
+    return XK_KP_Enter;
+  case FL_KP + '=':
+    return XK_KP_Equal;
+  case FL_KP + '*':
+    return XK_KP_Multiply;
+  case FL_KP + '+':
+    return XK_KP_Add;
+  case FL_KP + ',':
+    return XK_KP_Separator;
+  case FL_KP + '-':
+    return XK_KP_Subtract;
+  case FL_KP + '.':
+    return XK_KP_Decimal;
+  case FL_KP + '/':
+    return XK_KP_Divide;
+  case XK_ISO_Level3_Shift:
+    // FLTK tends to let this one leak through on X11...
+    return XK_ISO_Level3_Shift;
+  }
+
+  // Ctrl and Cmd tend to fudge input handling, so we need to cheat here
+  if (Fl::event_state() & (FL_COMMAND | FL_CTRL)) {
+#ifdef WIN32
+    BYTE keystate[256];
+    WCHAR wbuf[8];
+    int ret;
+
+    static char buf[32];
+
+    switch (fl_msg.message) {
+    case WM_KEYDOWN:
+    case WM_SYSKEYDOWN:
+      // Most buttons end up here when Ctrl is pressed. Here we can pretend
+      // that Ctrl isn't pressed, and do a character lookup.
+      GetKeyboardState(keystate);
+      keystate[VK_CONTROL] = keystate[VK_LCONTROL] = keystate[VK_RCONTROL] = 0;
+
+      ret = ToUnicode(fl_msg.wParam, 0, keystate, wbuf, sizeof(wbuf)/sizeof(wbuf[0]), 0);
+      if (ret != 0) {
+        // -1 means one dead character
+        ret = abs(ret);
+        wbuf[ret] = 0x0000;
+
+        if (fl_utf8fromwc(buf, sizeof(buf), wbuf, ret) >= sizeof(buf)) {
+          vlog.error(_("Out of buffer space whilst converting key event"));
+          return XK_VoidSymbol;
+        }
+
+        keyText = buf;
+      }
+      break;
+    case WM_CHAR:
+    case WM_SYSCHAR:
+      // Windows doesn't seem to have any sanity when it comes to control
+      // characters. We assume that Ctrl-A through Ctrl-Z range maps to
+      // the VK_A through VK_Z keys, and just let the rest fall through.
+      if ((fl_msg.wParam < 0x01) || (fl_msg.wParam > 0x1a))
+        break;
+
+      // Pretend that Ctrl isn't pressed, and do a character lookup.
+      GetKeyboardState(keystate);
+      keystate[VK_CONTROL] = keystate[VK_LCONTROL] = keystate[VK_RCONTROL] = 0;
+
+      // Ctrl-A is 0x01 and VK_A is 0x41, so add 0x40 for the conversion
+      ret = ToUnicode(fl_msg.wParam + 0x40, 0, keystate, wbuf, sizeof(wbuf)/sizeof(wbuf[0]), 0);
+      if (ret != 0) {
+        // -1 means one dead character
+        ret = abs(ret);
+        wbuf[ret] = 0x0000;
+
+        if (fl_utf8fromwc(buf, sizeof(buf), wbuf, ret) >= sizeof(buf)) {
+          vlog.error(_("Out of buffer space whilst converting key event"));
+          return XK_VoidSymbol;
+        }
+
+        keyText = buf;
+      }
+      break;
+    default:
+      // Not sure how we ended up here. Do nothing...
+      break;
+    }
+#elif defined(__APPLE__)
+    keyText = osx_event_string();
+#else
+    char buf[16];
+    KeySym sym;
+
+    XLookupString((XKeyEvent*)fl_xevent, buf, sizeof(buf), &sym, NULL);
+
+    return sym;
+#endif
+  }
+
+  // Unknown special key?
+  if (keyText[0] == '\0') {
+    vlog.error(_("Unknown FLTK key code %d (0x%04x)"), keyCode, keyCode);
+    return XK_VoidSymbol;
+  }
+
+  // Look up the symbol the key produces and translate that from Unicode
+  // to a X11 keysym.
+  if (fl_utf_nb_char((const unsigned char*)keyText, strlen(keyText)) != 1) {
+    vlog.error(_("Multiple characters given for key code %d (0x%04x): '%s'"),
+               keyCode, keyCode, keyText);
+    return XK_VoidSymbol;
+  }
+
+  ucs = fl_utf8decode(keyText, NULL, NULL);
+  return ucs2keysym(ucs);
+}
+
+
+void Viewport::handleKeyEvent(int keyCode, const char *keyText, bool down)
+{
+  rdr::U32 keySym;
+
+  if (viewOnly)
+    return;
+
+  // Because of the way keyboards work, we cannot expect to have the same
+  // symbol on release as when pressed. This breaks the VNC protocol however,
+  // so we need to keep track of what keysym a key _code_ generated on press
+  // and send the same on release.
+  if (!down) {
+    DownMap::iterator iter;
+
+    iter = downKeySym.find(keyCode);
+    if (iter == downKeySym.end()) {
+      vlog.error(_("Unexpected release of FLTK key code %d (0x%04x)"), keyCode, keyCode);
+      return;
+    }
+
+    cc->writer()->keyEvent(iter->second, false);
+
+    downKeySym.erase(iter);
+
+    return;
+  }
+
+  keySym = translateKeyEvent(keyCode, keyText);
+  if (keySym == XK_VoidSymbol)
+    return;
+
+  downKeySym[keyCode] = keySym;
+  cc->writer()->keyEvent(keySym, down);
+}

Copied: trunk/vncviewer/Viewport.h (from rev 4368, trunk/vncviewer/DesktopWindow.h)
===================================================================
--- trunk/vncviewer/Viewport.h	                        (rev 0)
+++ trunk/vncviewer/Viewport.h	2011-04-15 07:46:56 UTC (rev 4371)
@@ -0,0 +1,118 @@
+/* Copyright (C) 2002-2005 RealVNC Ltd.  All Rights Reserved.
+ * Copyright 2011 Pierre Ossman <ossman@...> for Cendio AB
+ * 
+ * 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 __VIEWPORT_H__
+#define __VIEWPORT_H__
+
+#include <map>
+
+#include <FL/Fl.H>
+#include <FL/Fl_Widget.H>
+
+#include <rfb/Rect.h>
+#include <rfb/Region.h>
+#include <rfb/Timer.h>
+#include <rfb/PixelBuffer.h>
+#include <rfb/PixelTransformer.h>
+
+class CConn;
+
+class Viewport : public Fl_Widget {
+public:
+
+  Viewport(int w, int h, const rfb::PixelFormat& serverPF, CConn* cc_);
+  ~Viewport();
+
+  // PixelFormat of incoming write operations
+  void setServerPF(const rfb::PixelFormat& pf);
+  // Most efficient format (from Viewport's point of view)
+  const rfb::PixelFormat &getPreferredPF();
+
+  // Flush updates to screen
+  void updateWindow();
+
+  // Methods forwarded from CConn
+  void setName(const char *name);
+
+  void setColourMapEntries(int firstColour, int nColours, rdr::U16* rgbs);
+
+  void fillRect(const rfb::Rect& r, rfb::Pixel pix) {
+    if (pixelTrans) {
+      rfb::Pixel pix2;
+      pixelTrans->translatePixels(&pix, &pix2, 1);
+      pix = pix2;
+    }
+
+    frameBuffer->fillRect(r, pix);
+    damageRect(r);
+  }
+  void imageRect(const rfb::Rect& r, void* pixels) {
+    if (pixelTrans)
+      pixelTrans->translateRect(pixels, r.width(),
+                                rfb::Rect(0, 0, r.width(), r.height()),
+                                frameBuffer->data, frameBuffer->getStride(),
+                                r.tl);
+    else
+      frameBuffer->imageRect(r, pixels);
+    damageRect(r);
+  }
+  void copyRect(const rfb::Rect& r, int srcX, int srcY) {
+    frameBuffer->copyRect(r, rfb::Point(r.tl.x-srcX, r.tl.y-srcY));
+    damageRect(r);
+  }
+
+  // Fl_Widget callback methods
+  void draw();
+  int handle(int event);
+
+private:
+
+  void damageRect(const rfb::Rect& r) {
+    damage.assign_union(rfb::Region(r));
+    if (!Fl::has_timeout(handleUpdateTimeout, this))
+      Fl::add_timeout(0.100, handleUpdateTimeout, this);
+  };
+
+  static void handleUpdateTimeout(void *data);
+  static void handleColourMap(void *data);
+
+  void handlePointerEvent(const rfb::Point& pos, int buttonMask);
+  static void handlePointerTimeout(void *data);
+
+  rdr::U32 translateKeyEvent(int keyCode, const char *keyText);
+  void handleKeyEvent(int keyCode, const char *keyText, bool down);
+
+private:
+  CConn* cc;
+
+  rfb::ManagedPixelBuffer* frameBuffer;
+
+  rfb::PixelTransformer *pixelTrans;
+  rfb::SimpleColourMap colourMap;
+
+  rfb::Region damage;
+
+  rfb::Point lastPointerPos;
+  int lastButtonMask;
+
+  typedef std::map<int, rdr::U32> DownMap;
+  DownMap downKeySym;
+};
+
+#endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[4374] trunk/vncviewer
		From: <ossman_@us...> -	2011-04-15 12:58

			



                
                    
                        Revision: 4374
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4374&view=rev
Author:   ossman_
Date:     2011-04-15 12:58:31 +0000 (Fri, 15 Apr 2011)

Log Message:
-----------
Add a scroll widget so that we can allow resizing of the main window.

Modified Paths:
--------------
    trunk/vncviewer/DesktopWindow.cxx
    trunk/vncviewer/DesktopWindow.h

Modified: trunk/vncviewer/DesktopWindow.cxx
===================================================================
--- trunk/vncviewer/DesktopWindow.cxx	2011-04-15 12:57:31 UTC (rev 4373)
+++ trunk/vncviewer/DesktopWindow.cxx	2011-04-15 12:58:31 UTC (rev 4374)
@@ -21,6 +21,8 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <FL/Fl_Scroll.H>
+
 #include <rfb/LogWriter.h>
 
 #include "DesktopWindow.h"
@@ -37,8 +39,19 @@
                              CConn* cc_)
   : Fl_Window(w, h)
 {
+  // Allow resize
+  size_range(100, 100);
+
+  Fl_Scroll *scroll = new Fl_Scroll(0, 0, w, h);
+  scroll->color(FL_BLACK);
+
+  // Automatically adjust the scroll box to the window
+  resizable(scroll);
+
   viewport = new Viewport(w, h, serverPF, cc_);
 
+  scroll->end();
+
   callback(handleClose, this);
 
   setName(name);
@@ -101,6 +114,38 @@
 }
 
 
+void DesktopWindow::resize(int x, int y, int w, int h)
+{
+  // Deal with some scrolling corner cases:
+  //
+  // a) If the window is larger then the viewport, center the viewport.
+  // b) If the window is smaller than the viewport, make sure there is
+  //    no wasted space on the sides.
+  //
+  // FIXME: Doesn't compensate for scroll widget size properly.
+  if (w > viewport->w())
+    viewport->position((w - viewport->w()) / 2, viewport->y());
+  else {
+    if (viewport->x() > 0)
+      viewport->position(0, viewport->y());
+    else if (w > (viewport->x() + viewport->w()))
+      viewport->position(w - viewport->w(), viewport->y());
+  }
+
+  // Same thing for y axis
+  if (h > viewport->h())
+    viewport->position(viewport->x(), (h - viewport->h()) / 2);
+  else {
+    if (viewport->y() > 0)
+      viewport->position(viewport->x(), 0);
+    else if (h > (viewport->y() + viewport->h()))
+      viewport->position(viewport->x(), h - viewport->h());
+  }
+
+  Fl_Window::resize(x, y, w, h);
+}
+
+
 void DesktopWindow::handleClose(Fl_Widget *wnd, void *data)
 {
   exit_vncviewer();

Modified: trunk/vncviewer/DesktopWindow.h
===================================================================
--- trunk/vncviewer/DesktopWindow.h	2011-04-15 12:57:31 UTC (rev 4373)
+++ trunk/vncviewer/DesktopWindow.h	2011-04-15 12:58:31 UTC (rev 4374)
@@ -65,6 +65,9 @@
     viewport->copyRect(r, srcX, srcY);
   }
 
+  // Fl_Window callback methods
+  void resize(int x, int y, int w, int h);
+
 private:
   static void handleClose(Fl_Widget *wnd, void *data);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[4390] trunk/vncviewer
		From: <ossman_@us...> -	2011-04-29 11:08

			



                
                    
                        Revision: 4390
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4390&view=rev
Author:   ossman_
Date:     2011-04-29 11:08:11 +0000 (Fri, 29 Apr 2011)

Log Message:
-----------
Initial support for context menu, based on Unix vncviewer code.

Modified Paths:
--------------
    trunk/vncviewer/Viewport.cxx
    trunk/vncviewer/Viewport.h

Modified: trunk/vncviewer/Viewport.cxx
===================================================================
--- trunk/vncviewer/Viewport.cxx	2011-04-28 14:38:04 UTC (rev 4389)
+++ trunk/vncviewer/Viewport.cxx	2011-04-29 11:08:11 UTC (rev 4390)
@@ -54,6 +54,10 @@
 
 static rfb::LogWriter vlog("Viewport");
 
+// Menu constants
+
+enum { ID_EXIT, ID_CTRL, ID_ALT, ID_MENUKEY, ID_CTRLALTDEL, ID_DISMISS };
+
 Viewport::Viewport(int w, int h, const rfb::PixelFormat& serverPF, CConn* cc_)
   : Fl_Widget(0, 0, w, h), cc(cc_), frameBuffer(NULL), pixelTrans(NULL),
     lastPointerPos(0, 0), lastButtonMask(0)
@@ -62,6 +66,9 @@
   assert(frameBuffer);
 
   setServerPF(serverPF);
+
+  contextMenu = new Fl_Menu_Button(0, 0, 0, 0);
+  initContextMenu();
 }
 
 
@@ -77,6 +84,9 @@
 
   if (pixelTrans)
     delete pixelTrans;
+
+  // FLTK automatically deletes all child widgets, so we shouldn't touch
+  // them ourselves here
 }
 
 
@@ -206,6 +216,11 @@
     return 1;
 
   case FL_KEYDOWN:
+    if (Fl::event_key() == (FL_F + 8)) {
+      popupContextMenu();
+      return 1;
+    }
+
     handleKeyEvent(Fl::event_key(), Fl::event_compose_symbol(), true);
     return 1;
 
@@ -487,3 +502,66 @@
   downKeySym[keyCode] = keySym;
   cc->writer()->keyEvent(keySym, down);
 }
+
+
+void Viewport::initContextMenu()
+{
+  contextMenu->add(_("Exit viewer"), 0, NULL, (void*)ID_EXIT, FL_MENU_DIVIDER);
+
+  contextMenu->add(_("Ctrl"), 0, NULL, (void*)ID_CTRL, FL_MENU_TOGGLE);
+  contextMenu->add(_("Alt"), 0, NULL, (void*)ID_ALT, FL_MENU_TOGGLE);
+  CharArray menuKeyStr(menuKey.getData());
+  CharArray sendMenuKey(64);
+  snprintf(sendMenuKey.buf, 64, _("Send %s"), "F8"); // FIXME
+  contextMenu->add(sendMenuKey.buf, 0, NULL, (void*)ID_MENUKEY, 0);
+  contextMenu->add("Secret shortcut menu key", FL_F + 8, NULL, (void*)ID_MENUKEY, FL_MENU_INVISIBLE); // Broken, see STR2613
+  contextMenu->add(_("Send Ctrl-Alt-Del"), 0, NULL, (void*)ID_CTRLALTDEL, FL_MENU_DIVIDER);
+
+  contextMenu->add(_("Dismiss menu"), 0, NULL, (void*)ID_DISMISS, 0);
+}
+
+
+void Viewport::popupContextMenu()
+{
+  const Fl_Menu_Item *m;
+
+  contextMenu->position(Fl::event_x(), Fl::event_y());
+
+  m = contextMenu->popup();
+  if (m == NULL)
+    return;
+
+  switch (m->argument()) {
+  case ID_EXIT:
+    exit_vncviewer();
+    break;
+  case ID_CTRL:
+    if (!viewOnly)
+      cc->writer()->keyEvent(XK_Control_L, m->value());
+    break;
+  case ID_ALT:
+    if (!viewOnly)
+      cc->writer()->keyEvent(XK_Alt_L, m->value());
+    break;
+  case ID_MENUKEY:
+    if (!viewOnly) {
+      // FIXME
+      cc->writer()->keyEvent(XK_F8, true);
+      cc->writer()->keyEvent(XK_F8, false);
+    }
+    break;
+  case ID_CTRLALTDEL:
+    if (!viewOnly) {
+      cc->writer()->keyEvent(XK_Control_L, true);
+      cc->writer()->keyEvent(XK_Alt_L, true);
+      cc->writer()->keyEvent(XK_Delete, true);
+      cc->writer()->keyEvent(XK_Delete, false);
+      cc->writer()->keyEvent(XK_Alt_L, false);
+      cc->writer()->keyEvent(XK_Control_L, false);
+    }
+    break;
+  case ID_DISMISS:
+    // Don't need to do anything
+    break;
+  }
+}

Modified: trunk/vncviewer/Viewport.h
===================================================================
--- trunk/vncviewer/Viewport.h	2011-04-28 14:38:04 UTC (rev 4389)
+++ trunk/vncviewer/Viewport.h	2011-04-29 11:08:11 UTC (rev 4390)
@@ -24,6 +24,7 @@
 
 #include <FL/Fl.H>
 #include <FL/Fl_Widget.H>
+#include <FL/Fl_Menu_Button.H>
 
 #include <rfb/Rect.h>
 #include <rfb/Region.h>
@@ -98,6 +99,9 @@
   rdr::U32 translateKeyEvent(int keyCode, const char *keyText);
   void handleKeyEvent(int keyCode, const char *keyText, bool down);
 
+  void initContextMenu();
+  void popupContextMenu();
+
 private:
   CConn* cc;
 
@@ -113,6 +117,8 @@
 
   typedef std::map<int, rdr::U32> DownMap;
   DownMap downKeySym;
+
+  Fl_Menu_Button *contextMenu;
 };
 
 #endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[4392] trunk/vncviewer
		From: <ossman_@us...> -	2011-04-29 11:18

			



                
                    
                        Revision: 4392
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4392&view=rev
Author:   ossman_
Date:     2011-04-29 11:18:12 +0000 (Fri, 29 Apr 2011)

Log Message:
-----------
Implement menu entry for forced refresh of screen.

Modified Paths:
--------------
    trunk/vncviewer/CConn.cxx
    trunk/vncviewer/CConn.h
    trunk/vncviewer/Viewport.cxx

Modified: trunk/vncviewer/CConn.cxx
===================================================================
--- trunk/vncviewer/CConn.cxx	2011-04-29 11:12:02 UTC (rev 4391)
+++ trunk/vncviewer/CConn.cxx	2011-04-29 11:18:12 UTC (rev 4392)
@@ -48,7 +48,8 @@
   : serverHost(0), serverPort(0), sock(NULL), desktop(NULL),
     currentEncoding(encodingTight), lastServerEncoding((unsigned int)-1),
     formatChange(false), encodingChange(false),
-    firstUpdate(true), pendingUpdate(false)
+    firstUpdate(true), pendingUpdate(false),
+    forceNonincremental(false)
 {
   setShared(::shared);
 
@@ -98,6 +99,14 @@
   delete sock;
 }
 
+void CConn::refreshFramebuffer()
+{
+  // FIXME: We cannot safely trigger an update request directly but must
+  //        wait for the next update to arrive.
+  if (!formatChange)
+    forceNonincremental = true;
+}
+
 // The RFB core is not properly asynchronous, so it calls this callback
 // whenever it needs to block to wait for more data. Since FLTK is
 // monitoring the socket, we just make sure FLTK gets to run.
@@ -442,9 +451,16 @@
     desktop->setServerPF(pf);
     cp.setPF(pf);
     writer()->writeSetPixelFormat(pf);
+
+    forceNonincremental = true;
+
+    formatChange = false;
   }
+
   checkEncodings();
+
   writer()->writeFramebufferUpdateRequest(Rect(0, 0, cp.width, cp.height),
-                                          !formatChange);
-  formatChange = false;
+                                          !forceNonincremental);
+ 
+  forceNonincremental = false;
 }

Modified: trunk/vncviewer/CConn.h
===================================================================
--- trunk/vncviewer/CConn.h	2011-04-29 11:12:02 UTC (rev 4391)
+++ trunk/vncviewer/CConn.h	2011-04-29 11:18:12 UTC (rev 4392)
@@ -32,6 +32,8 @@
   CConn(const char* vncServerName);
   ~CConn();
 
+  void refreshFramebuffer();
+
   // FdInStreamBlockCallback methods
   void blockCallback();
 
@@ -91,6 +93,8 @@
 
   bool firstUpdate;
   bool pendingUpdate;
+
+  bool forceNonincremental;
 };
 
 #endif

Modified: trunk/vncviewer/Viewport.cxx
===================================================================
--- trunk/vncviewer/Viewport.cxx	2011-04-29 11:12:02 UTC (rev 4391)
+++ trunk/vncviewer/Viewport.cxx	2011-04-29 11:18:12 UTC (rev 4392)
@@ -56,7 +56,8 @@
 
 // Menu constants
 
-enum { ID_EXIT, ID_CTRL, ID_ALT, ID_MENUKEY, ID_CTRLALTDEL, ID_DISMISS };
+enum { ID_EXIT, ID_CTRL, ID_ALT, ID_MENUKEY, ID_CTRLALTDEL,
+       ID_REFRESH, ID_DISMISS };
 
 Viewport::Viewport(int w, int h, const rfb::PixelFormat& serverPF, CConn* cc_)
   : Fl_Widget(0, 0, w, h), cc(cc_), frameBuffer(NULL), pixelTrans(NULL),
@@ -520,6 +521,8 @@
   contextMenu->add("Secret shortcut menu key", FL_F + 8, NULL, (void*)ID_MENUKEY, FL_MENU_INVISIBLE); // Broken, see STR2613
   contextMenu->add(_("Send Ctrl-Alt-Del"), 0, NULL, (void*)ID_CTRLALTDEL, FL_MENU_DIVIDER);
 
+  contextMenu->add(_("Refresh screen"), 0, NULL, (void*)ID_REFRESH, FL_MENU_DIVIDER);
+
   contextMenu->add(_("Dismiss menu"), 0, NULL, (void*)ID_DISMISS, 0);
 }
 
@@ -563,6 +566,9 @@
       cc->writer()->keyEvent(XK_Control_L, false);
     }
     break;
+  case ID_REFRESH:
+    cc->refreshFramebuffer();
+    break;
   case ID_DISMISS:
     // Don't need to do anything
     break;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[4395] trunk/vncviewer
		From: <ossman_@us...> -	2011-04-29 11:51

			



                
                    
                        Revision: 4395
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4395&view=rev
Author:   ossman_
Date:     2011-04-29 11:51:38 +0000 (Fri, 29 Apr 2011)

Log Message:
-----------
Implement about dialog.

Modified Paths:
--------------
    trunk/vncviewer/Viewport.cxx
    trunk/vncviewer/vncviewer.cxx

Modified: trunk/vncviewer/Viewport.cxx
===================================================================
--- trunk/vncviewer/Viewport.cxx	2011-04-29 11:20:08 UTC (rev 4394)
+++ trunk/vncviewer/Viewport.cxx	2011-04-29 11:51:38 UTC (rev 4395)
@@ -51,13 +51,14 @@
 #endif
 
 extern void exit_vncviewer();
+extern void about_vncviewer();
 
 static rfb::LogWriter vlog("Viewport");
 
 // Menu constants
 
 enum { ID_EXIT, ID_CTRL, ID_ALT, ID_MENUKEY, ID_CTRLALTDEL,
-       ID_REFRESH, ID_DISMISS };
+       ID_REFRESH, ID_ABOUT, ID_DISMISS };
 
 Viewport::Viewport(int w, int h, const rfb::PixelFormat& serverPF, CConn* cc_)
   : Fl_Widget(0, 0, w, h), cc(cc_), frameBuffer(NULL), pixelTrans(NULL),
@@ -523,6 +524,8 @@
 
   contextMenu->add(_("Refresh screen"), 0, NULL, (void*)ID_REFRESH, FL_MENU_DIVIDER);
 
+  contextMenu->add(_("About TigerVNC viewer..."), 0, NULL, (void*)ID_ABOUT, FL_MENU_DIVIDER);
+
   contextMenu->add(_("Dismiss menu"), 0, NULL, (void*)ID_DISMISS, 0);
 }
 
@@ -569,6 +572,9 @@
   case ID_REFRESH:
     cc->refreshFramebuffer();
     break;
+  case ID_ABOUT:
+    about_vncviewer();
+    break;
   case ID_DISMISS:
     // Don't need to do anything
     break;

Modified: trunk/vncviewer/vncviewer.cxx
===================================================================
--- trunk/vncviewer/vncviewer.cxx	2011-04-29 11:20:08 UTC (rev 4394)
+++ trunk/vncviewer/vncviewer.cxx	2011-04-29 11:51:38 UTC (rev 4395)
@@ -44,6 +44,7 @@
 #include <FL/Fl.H>
 #include <FL/Fl_Widget.H>
 #include <FL/fl_ask.H>
+#include <FL/x.H>
 
 #include "i18n.h"
 #include "parameters.h"
@@ -56,7 +57,7 @@
 using namespace rfb;
 using namespace std;
 
-char aboutText[1024];
+static char aboutText[1024];
 
 static bool exitMainloop = false;
 
@@ -65,6 +66,17 @@
   exitMainloop = true;
 }
 
+void about_vncviewer()
+{
+  fl_message_title(_("About TigerVNC Viewer"));
+  fl_message(aboutText);
+}
+
+static void about_callback(Fl_Widget *widget, void *data)
+{
+  about_vncviewer();
+}
+
 static void CleanupSignalHandler(int sig)
 {
   // CleanupSignalHandler allows C++ object cleanup to happen because it calls
@@ -109,6 +121,10 @@
   fl_ok     = _("OK");
   fl_cancel = _("Cancel");
   fl_close  = _("Close");
+
+#ifdef __APPLE__
+  fl_mac_set_about(about_callback, NULL);
+#endif
 }
 
 static void mkvnchomedir()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[4412] trunk/vncviewer
		From: <ossman_@us...> -	2011-05-13 14:05

			



                
                    
                        Revision: 4412
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4412&view=rev
Author:   ossman_
Date:     2011-05-13 14:04:59 +0000 (Fri, 13 May 2011)

Log Message:
-----------
Implement connection dialog based on unix vncviewer.

Modified Paths:
--------------
    trunk/vncviewer/CMakeLists.txt
    trunk/vncviewer/vncviewer.cxx

Added Paths:
-----------
    trunk/vncviewer/ServerDialog.cxx
    trunk/vncviewer/ServerDialog.h

Modified: trunk/vncviewer/CMakeLists.txt
===================================================================
--- trunk/vncviewer/CMakeLists.txt	2011-05-13 12:47:54 UTC (rev 4411)
+++ trunk/vncviewer/CMakeLists.txt	2011-05-13 14:04:59 UTC (rev 4412)
@@ -6,6 +6,7 @@
   CConn.cxx
   DesktopWindow.cxx
   UserDialog.cxx
+  ServerDialog.cxx
   Viewport.cxx
   parameters.cxx
   keysym2ucs.c

Added: trunk/vncviewer/ServerDialog.cxx
===================================================================
--- trunk/vncviewer/ServerDialog.cxx	                        (rev 0)
+++ trunk/vncviewer/ServerDialog.cxx	2011-05-13 14:04:59 UTC (rev 4412)
@@ -0,0 +1,100 @@
+/* Copyright 2011 Pierre Ossman <ossman@...> for Cendio AB
+ * 
+ * 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 <FL/Fl.H>
+#include <FL/Fl_Input.H>
+#include <FL/Fl_Button.H>
+#include <FL/Fl_Return_Button.H>
+#include <FL/fl_draw.H>
+
+#include "ServerDialog.h"
+#include "i18n.h"
+
+extern void about_vncviewer();
+
+ServerDialog::ServerDialog()
+  : Fl_Window(400, 112, _("VNC Viewer: Connection Details"))
+{
+  int width;
+  Fl_Button *button;
+
+  fl_font(FL_HELVETICA, FL_NORMAL_SIZE);
+  width = fl_width(_("VNC server:"));
+  serverName = new Fl_Input(20 + width, 20, w() - 20*2 - width, 25, _("VNC server:"));
+
+  width = (w() - 20) / 4;
+
+  button = new Fl_Button(20 + width*0, 20+25+20, width - 20, 27, _("About..."));
+  button->callback(this->handleAbout, this);
+
+  button = new Fl_Button(20 + width*2, 20+25+20, width - 20, 27, _("Cancel"));
+  button->callback(this->handleCancel, this);
+
+  button = new Fl_Return_Button(20 + width*3, 20+25+20, width - 20, 27, _("OK"));
+  button->callback(this->handleOK, this);
+
+  callback(this->handleCancel, this);
+
+  set_modal();
+}
+
+
+ServerDialog::~ServerDialog()
+{
+}
+
+
+const char *ServerDialog::run()
+{
+  ServerDialog dialog;
+  static char buffer[256];
+
+  dialog.show();
+  while (dialog.shown()) Fl::wait();
+
+  if (dialog.serverName->value() == NULL)
+    return NULL;
+
+  strncpy(buffer, dialog.serverName->value(), sizeof(buffer));
+  buffer[sizeof(buffer)-1] = '\0';
+
+  return buffer;
+}
+
+
+void ServerDialog::handleAbout(Fl_Widget *widget, void *data)
+{
+  about_vncviewer();
+}
+
+
+void ServerDialog::handleCancel(Fl_Widget *widget, void *data)
+{
+  ServerDialog *dialog = (ServerDialog*)data;
+
+  dialog->serverName->value(NULL);
+  dialog->hide();
+}
+
+
+void ServerDialog::handleOK(Fl_Widget *widget, void *data)
+{
+  ServerDialog *dialog = (ServerDialog*)data;
+
+  dialog->hide();
+}

Added: trunk/vncviewer/ServerDialog.h
===================================================================
--- trunk/vncviewer/ServerDialog.h	                        (rev 0)
+++ trunk/vncviewer/ServerDialog.h	2011-05-13 14:04:59 UTC (rev 4412)
@@ -0,0 +1,42 @@
+/* Copyright 2011 Pierre Ossman <ossman@...> for Cendio AB
+ * 
+ * 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 __SERVERDIALOG_H__
+#define __SERVERDIALOG_H__
+
+#include <FL/Fl_Window.H>
+#include <FL/Fl_Input.H>
+
+class ServerDialog : public Fl_Window {
+protected:
+  ServerDialog();
+  ~ServerDialog();
+
+public:
+  static const char *run();
+
+protected:
+  static void handleAbout(Fl_Widget *widget, void *data);
+  static void handleCancel(Fl_Widget *widget, void *data);
+  static void handleOK(Fl_Widget *widget, void *data);
+
+protected:
+  Fl_Input *serverName;
+};
+
+#endif

Modified: trunk/vncviewer/vncviewer.cxx
===================================================================
--- trunk/vncviewer/vncviewer.cxx	2011-05-13 12:47:54 UTC (rev 4411)
+++ trunk/vncviewer/vncviewer.cxx	2011-05-13 14:04:59 UTC (rev 4412)
@@ -49,6 +49,7 @@
 #include "i18n.h"
 #include "parameters.h"
 #include "CConn.h"
+#include "ServerDialog.h"
 #include "UserDialog.h"
 
 rfb::LogWriter vlog("main");
@@ -162,7 +163,7 @@
 
 int main(int argc, char** argv)
 {
-  char* vncServerName = 0;
+  const char* vncServerName = NULL;
   UserDialog dlg;
 
   const char englishAbout[] = N_("TigerVNC Viewer version %s\n"
@@ -247,6 +248,12 @@
   CSecurityTLS::msg = &dlg;
 #endif
 
+  if (vncServerName == NULL) {
+    vncServerName = ServerDialog::run();
+    if ((vncServerName == NULL) || (vncServerName[0] == '\0'))
+      return 1;
+  }
+
   CConn cc(vncServerName);
 
   while (!exitMainloop) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[4416] trunk/vncviewer
		From: <ossman_@us...> -	2011-05-16 12:04

			



                
                    
                        Revision: 4416
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4416&view=rev
Author:   ossman_
Date:     2011-05-16 12:04:43 +0000 (Mon, 16 May 2011)

Log Message:
-----------
Initial options dialog (read-only) loosly based on the Unix vncviewer.

Modified Paths:
--------------
    trunk/vncviewer/CMakeLists.txt
    trunk/vncviewer/ServerDialog.cxx
    trunk/vncviewer/ServerDialog.h
    trunk/vncviewer/Viewport.cxx

Added Paths:
-----------
    trunk/vncviewer/OptionsDialog.cxx
    trunk/vncviewer/OptionsDialog.h
    trunk/vncviewer/fltk_layout.h

Modified: trunk/vncviewer/CMakeLists.txt
===================================================================
--- trunk/vncviewer/CMakeLists.txt	2011-05-16 12:00:20 UTC (rev 4415)
+++ trunk/vncviewer/CMakeLists.txt	2011-05-16 12:04:43 UTC (rev 4416)
@@ -7,6 +7,7 @@
   DesktopWindow.cxx
   UserDialog.cxx
   ServerDialog.cxx
+  OptionsDialog.cxx
   Viewport.cxx
   parameters.cxx
   keysym2ucs.c

Added: trunk/vncviewer/OptionsDialog.cxx
===================================================================
--- trunk/vncviewer/OptionsDialog.cxx	                        (rev 0)
+++ trunk/vncviewer/OptionsDialog.cxx	2011-05-16 12:04:43 UTC (rev 4416)
@@ -0,0 +1,689 @@
+/* Copyright 2011 Pierre Ossman <ossman@...> for Cendio AB
+ * 
+ * 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 <list>
+
+#include <FL/Fl_Tabs.H>
+#include <FL/Fl_Button.H>
+#include <FL/Fl_Return_Button.H>
+
+#include <rdr/types.h>
+#include <rfb/encodings.h>
+
+#ifdef HAVE_GNUTLS
+#include <rfb/Security.h>
+#include <rfb/SecurityClient.h>
+#include <rfb/CSecurityTLS.h>
+#endif
+
+#include "OptionsDialog.h"
+#include "fltk_layout.h"
+#include "i18n.h"
+#include "parameters.h"
+
+using namespace std;
+using namespace rdr;
+using namespace rfb;
+
+OptionsDialog::OptionsDialog()
+  : Fl_Window(450, 450, _("VNC Viewer: Connection Options"))
+{
+  int x, y;
+  Fl_Button *button;
+
+  Fl_Tabs *tabs = new Fl_Tabs(OUTER_MARGIN, OUTER_MARGIN,
+                             w() - OUTER_MARGIN*2,
+                             h() - OUTER_MARGIN*2 - INNER_MARGIN - BUTTON_HEIGHT);
+
+  {
+    int tx, ty, tw, th;
+
+    tabs->client_area(tx, ty, tw, th, TABS_HEIGHT);
+
+    createCompressionPage(tx, ty, tw, th);
+    createSecurityPage(tx, ty, tw, th);
+    createInputPage(tx, ty, tw, th);
+    createMiscPage(tx, ty, tw, th);
+  }
+
+  tabs->end();
+
+  x = w() - BUTTON_WIDTH * 2 - INNER_MARGIN - OUTER_MARGIN;
+  y = h() - BUTTON_HEIGHT - OUTER_MARGIN;
+
+  button = new Fl_Button(x, y, BUTTON_WIDTH, BUTTON_HEIGHT, _("Cancel"));
+  button->callback(this->handleCancel, this);
+
+  x += BUTTON_WIDTH + INNER_MARGIN;
+
+  button = new Fl_Return_Button(x, y, BUTTON_WIDTH, BUTTON_HEIGHT, _("OK"));
+  button->callback(this->handleOK, this);
+
+  callback(this->handleCancel, this);
+
+  set_modal();
+}
+
+
+OptionsDialog::~OptionsDialog()
+{
+}
+
+
+void OptionsDialog::showDialog(void)
+{
+  static OptionsDialog *dialog = NULL;
+
+  if (!dialog)
+    dialog = new OptionsDialog();
+
+  if (dialog->shown())
+    return;
+
+  dialog->show();
+}
+
+
+void OptionsDialog::show(void)
+{
+  loadOptions();
+
+  Fl_Window::show();
+}
+
+
+void OptionsDialog::loadOptions(void)
+{
+  /* Compression */
+  autoselectCheckbox->value(autoSelect);
+
+  int encNum = encodingNum(preferredEncoding);
+
+  switch (encNum) {
+  case encodingTight:
+    tightButton->setonly();
+    break;
+  case encodingZRLE:
+    zrleButton->setonly();
+    break;
+  case encodingHextile:
+    hextileButton->setonly();
+    break;
+  case encodingRaw:
+    rawButton->setonly();
+    break;
+  }
+
+  if (fullColour)
+    fullcolorCheckbox->setonly();
+  else {
+    switch (lowColourLevel) {
+    case 0:
+      mediumcolorCheckbox->setonly();
+      break;
+    case 1:
+      lowcolorCheckbox->setonly();
+      break;
+    case 2:
+      verylowcolorCheckbox->setonly();
+      break;
+    }
+  }
+
+  char digit[2] = "0";
+
+  compressionCheckbox->value(customCompressLevel);
+  jpegCheckbox->value(!noJpeg);
+  digit[0] = '0' + compressLevel;
+  compressionInput->value(digit);
+  digit[0] = '0' + qualityLevel;
+  jpegInput->value(digit);
+
+  handleAutoselect(autoselectCheckbox, this);
+  handleCompression(compressionCheckbox, this);
+  handleJpeg(jpegCheckbox, this);
+
+#ifdef HAVE_GNUTLS
+  /* Security */
+  Security security(SecurityClient::secTypes);
+
+  list<U8> secTypes;
+  list<U8>::iterator iter;
+
+   list<U32> secTypesExt;
+   list<U32>::iterator iterExt;
+
+  vencryptCheckbox->value(false);
+
+  encNoneCheckbox->value(false);
+  encTLSCheckbox->value(false);
+  encX509Checkbox->value(false);
+
+  authNoneCheckbox->value(false);
+  authVncCheckbox->value(false);
+  authPlainCheckbox->value(false);
+
+  secTypes = security.GetEnabledSecTypes();
+  for (iter = secTypes.begin(); iter != secTypes.end(); ++iter) {
+    switch (*iter) {
+    case secTypeVeNCrypt:
+      vencryptCheckbox->value(true);
+      break;
+    case secTypeNone:
+      encNoneCheckbox->value(true);
+      authNoneCheckbox->value(true);
+      break;
+    case secTypeVncAuth:
+      encNoneCheckbox->value(true);
+      authVncCheckbox->value(true);
+      break;
+    }
+  }
+
+  secTypesExt = security.GetEnabledExtSecTypes();
+  for (iterExt = secTypesExt.begin(); iterExt != secTypesExt.end(); ++iterExt) {
+    switch (*iterExt) {
+    case secTypePlain:
+      encNoneCheckbox->value(true);
+      authPlainCheckbox->value(true);
+      break;
+    case secTypeTLSNone:
+      encTLSCheckbox->value(true);
+      authNoneCheckbox->value(true);
+      break;
+    case secTypeTLSVnc:
+      encTLSCheckbox->value(true);
+      authVncCheckbox->value(true);
+      break;
+    case secTypeTLSPlain:
+      encTLSCheckbox->value(true);
+      authPlainCheckbox->value(true);
+      break;
+    case secTypeX509None:
+      encX509Checkbox->value(true);
+      authNoneCheckbox->value(true);
+      break;
+    case secTypeX509Vnc:
+      encX509Checkbox->value(true);
+      authVncCheckbox->value(true);
+      break;
+    case secTypeX509Plain:
+      encX509Checkbox->value(true);
+      authPlainCheckbox->value(true);
+      break;
+    }
+  }
+
+  caInput->value(CSecurityTLS::x509ca);
+  crlInput->value(CSecurityTLS::x509crl);
+
+  handleVencrypt(vencryptCheckbox, this);
+  handleX509(encX509Checkbox, this);
+#endif
+
+  /* Input */
+  viewOnlyCheckbox->value(viewOnly);
+  acceptClipboardCheckbox->value(acceptClipboard);
+  sendClipboardCheckbox->value(sendClipboard);
+  sendPrimaryCheckbox->value(sendPrimary);
+
+  /* Misc. */
+  sharedCheckbox->value(shared);
+  fullScreenCheckbox->value(fullScreen);
+  localCursorCheckbox->value(useLocalCursor);
+  dotCursorCheckbox->value(dotWhenNoCursor);
+}
+
+
+void OptionsDialog::storeOptions(void)
+{
+}
+
+
+void OptionsDialog::createCompressionPage(int tx, int ty, int tw, int th)
+{
+  Fl_Group *group = new Fl_Group(tx, ty, tw, th, _("Compression"));
+
+  int orig_tx, orig_ty;
+  int half_width, full_width;
+  int width, height;
+
+  tx += OUTER_MARGIN;
+  ty += OUTER_MARGIN;
+
+  full_width = tw - OUTER_MARGIN * 2;
+  half_width = (full_width - INNER_MARGIN) / 2;
+
+  /* AutoSelect checkbox */
+  autoselectCheckbox = new Fl_Check_Button(LBLRIGHT(tx, ty,
+                                                     CHECK_MIN_WIDTH,
+                                                     CHECK_HEIGHT,
+                                                     _("Auto select")));
+  autoselectCheckbox->callback(handleAutoselect, this);
+  ty += CHECK_HEIGHT + INNER_MARGIN;
+
+  /* Two columns */
+  orig_tx = tx;
+  orig_ty = ty;
+
+  /* VNC encoding box */
+  ty += GROUP_LABEL_OFFSET;
+  height = GROUP_MARGIN * 2 + TIGHT_MARGIN * 3 + RADIO_HEIGHT * 4;
+  encodingGroup = new Fl_Group(tx, ty, half_width, height,
+                                _("Preferred encoding"));
+  encodingGroup->box(FL_ENGRAVED_BOX);
+  encodingGroup->align(FL_ALIGN_LEFT | FL_ALIGN_TOP);
+
+  {
+    tx += GROUP_MARGIN;
+    ty += GROUP_MARGIN;
+
+    width = encodingGroup->w() - GROUP_MARGIN * 2;
+
+    tightButton = new Fl_Round_Button(LBLRIGHT(tx, ty,
+                                               RADIO_MIN_WIDTH,
+                                               RADIO_HEIGHT,
+                                               _("Tight")));
+    tightButton->type(FL_RADIO_BUTTON);
+    ty += RADIO_HEIGHT + TIGHT_MARGIN;
+
+    zrleButton = new Fl_Round_Button(LBLRIGHT(tx, ty,
+                                              RADIO_MIN_WIDTH,
+                                              RADIO_HEIGHT,
+                                              _("ZRLE")));
+    zrleButton->type(FL_RADIO_BUTTON);
+    ty += RADIO_HEIGHT + TIGHT_MARGIN;
+
+    hextileButton = new Fl_Round_Button(LBLRIGHT(tx, ty,
+                                                 RADIO_MIN_WIDTH,
+                                                 RADIO_HEIGHT,
+                                                 _("Hextile")));
+    hextileButton->type(FL_RADIO_BUTTON);
+    ty += RADIO_HEIGHT + TIGHT_MARGIN;
+
+    rawButton = new Fl_Round_Button(LBLRIGHT(tx, ty,
+                                             RADIO_MIN_WIDTH,
+                                             RADIO_HEIGHT,
+                                             _("Raw")));
+    rawButton->type(FL_RADIO_BUTTON);
+    ty += RADIO_HEIGHT + TIGHT_MARGIN;
+  }
+
+  ty += GROUP_MARGIN - TIGHT_MARGIN;
+
+  encodingGroup->end();
+
+  /* Second column */
+  tx = orig_tx + half_width + INNER_MARGIN;
+  ty = orig_ty;
+
+  /* Color box */
+  ty += GROUP_LABEL_OFFSET;
+  height = GROUP_MARGIN * 2 + TIGHT_MARGIN * 3 + RADIO_HEIGHT * 4;
+  colorlevelGroup = new Fl_Group(tx, ty, half_width, height, _("Color level"));
+  colorlevelGroup->box(FL_ENGRAVED_BOX);
+  colorlevelGroup->align(FL_ALIGN_LEFT | FL_ALIGN_TOP);
+
+  {
+    tx += GROUP_MARGIN;
+    ty += GROUP_MARGIN;
+
+    width = colorlevelGroup->w() - GROUP_MARGIN * 2;
+
+    fullcolorCheckbox = new Fl_Round_Button(LBLRIGHT(tx, ty,
+                                                     RADIO_MIN_WIDTH,
+                                                     RADIO_HEIGHT,
+                                                     _("Full (all available colors)")));
+    fullcolorCheckbox->type(FL_RADIO_BUTTON);
+    ty += RADIO_HEIGHT + TIGHT_MARGIN;
+
+    mediumcolorCheckbox = new Fl_Round_Button(LBLRIGHT(tx, ty,
+                                                       RADIO_MIN_WIDTH,
+                                                       RADIO_HEIGHT,
+                                                       _("Medium (256 colors)")));
+    mediumcolorCheckbox->type(FL_RADIO_BUTTON);
+    ty += RADIO_HEIGHT + TIGHT_MARGIN;
+
+    lowcolorCheckbox = new Fl_Round_Button(LBLRIGHT(tx, ty,
+                                                    RADIO_MIN_WIDTH,
+                                                    RADIO_HEIGHT,
+                                                    _("Low (64 colors)")));
+    lowcolorCheckbox->type(FL_RADIO_BUTTON);
+    ty += RADIO_HEIGHT + TIGHT_MARGIN;
+
+    verylowcolorCheckbox = new Fl_Round_Button(LBLRIGHT(tx, ty,
+                                                        RADIO_MIN_WIDTH,
+                                                        RADIO_HEIGHT,
+                                                        _("Very low (8 colors)")));
+    verylowcolorCheckbox->type(FL_RADIO_BUTTON);
+    ty += RADIO_HEIGHT + TIGHT_MARGIN;
+  }
+
+  ty += GROUP_MARGIN - TIGHT_MARGIN;
+
+  colorlevelGroup->end();
+
+  /* Back to normal */
+  tx = orig_tx;
+  ty += INNER_MARGIN;
+
+  /* Checkboxes */
+  compressionCheckbox = new Fl_Check_Button(LBLRIGHT(tx, ty,
+                                                     CHECK_MIN_WIDTH,
+                                                     CHECK_HEIGHT,
+                                                     _("Custom compression level:")));
+  compressionCheckbox->callback(handleCompression, this);
+  ty += CHECK_HEIGHT + TIGHT_MARGIN;
+
+  compressionInput = new Fl_Int_Input(tx + INDENT, ty,
+                                      INPUT_HEIGHT, INPUT_HEIGHT,
+                                      _("level (1=fast, 9=best)"));
+  compressionInput->align(FL_ALIGN_RIGHT);
+  ty += INPUT_HEIGHT + INNER_MARGIN;
+
+  jpegCheckbox = new Fl_Check_Button(LBLRIGHT(tx, ty,
+                                              CHECK_MIN_WIDTH,
+                                              CHECK_HEIGHT,
+                                              _("Allow JPEG compression:")));
+  jpegCheckbox->callback(handleJpeg, this);
+  ty += CHECK_HEIGHT + TIGHT_MARGIN;
+
+  jpegInput = new Fl_Int_Input(tx + INDENT, ty,
+                               INPUT_HEIGHT, INPUT_HEIGHT,
+                               _("quality (1=poor, 9=best)"));
+  jpegInput->align(FL_ALIGN_RIGHT);
+  ty += INPUT_HEIGHT + INNER_MARGIN;
+
+  group->end();
+}
+
+
+void OptionsDialog::createSecurityPage(int tx, int ty, int tw, int th)
+{
+#ifdef HAVE_GNUTLS
+  Fl_Group *group = new Fl_Group(tx, ty, tw, th, _("Security"));
+
+  int orig_tx;
+  int width, height;
+
+  tx += OUTER_MARGIN;
+  ty += OUTER_MARGIN;
+
+  width = tw - OUTER_MARGIN * 2;
+
+  orig_tx = tx;
+
+  /* Security */
+  vencryptCheckbox = new Fl_Check_Button(LBLRIGHT(tx, ty,
+                                                  CHECK_MIN_WIDTH,
+                                                  CHECK_HEIGHT,
+                                                  _("Extended encryption and authentication methods (VeNCrypt)")));
+  vencryptCheckbox->callback(handleVencrypt, this);
+  ty += CHECK_HEIGHT + INNER_MARGIN;
+
+  /* Encryption */
+  ty += GROUP_LABEL_OFFSET;
+  height = GROUP_MARGIN * 2 + TIGHT_MARGIN * 4 + CHECK_HEIGHT * 3 + (INPUT_LABEL_OFFSET + INPUT_HEIGHT) * 2;
+  encryptionGroup = new Fl_Group(tx, ty, width, height, _("Encryption"));
+  encryptionGroup->box(FL_ENGRAVED_BOX);
+  encryptionGroup->align(FL_ALIGN_LEFT | FL_ALIGN_TOP);
+
+  {
+    tx += GROUP_MARGIN;
+    ty += GROUP_MARGIN;
+
+    encNoneCheckbox = new Fl_Check_Button(LBLRIGHT(tx, ty,
+                                                   CHECK_MIN_WIDTH,
+                                                   CHECK_HEIGHT,
+                                                   _("None")));
+    ty += CHECK_HEIGHT + TIGHT_MARGIN;
+
+    encTLSCheckbox = new Fl_Check_Button(LBLRIGHT(tx, ty,
+                                                  CHECK_MIN_WIDTH,
+                                                  CHECK_HEIGHT,
+                                                  _("TLS with anonymous certificates")));
+    ty += CHECK_HEIGHT + TIGHT_MARGIN;
+
+    encX509Checkbox = new Fl_Check_Button(LBLRIGHT(tx, ty,
+                                                   CHECK_MIN_WIDTH,
+                                                   CHECK_HEIGHT,
+                                                   _("TLS with X509 certificates")));
+    encX509Checkbox->callback(handleX509, this);
+    ty += CHECK_HEIGHT + TIGHT_MARGIN;
+
+    ty += INPUT_LABEL_OFFSET;
+    caInput = new Fl_Input(tx + INDENT, ty, 
+                           width - GROUP_MARGIN*2 - INDENT, INPUT_HEIGHT,
+                           _("Path to X509 CA certificate"));
+    caInput->align(FL_ALIGN_LEFT | FL_ALIGN_TOP);
+    ty += INPUT_HEIGHT + TIGHT_MARGIN;
+
+    ty += INPUT_LABEL_OFFSET;
+    crlInput = new Fl_Input(tx + INDENT, ty,
+                            width - GROUP_MARGIN*2 - INDENT, INPUT_HEIGHT,
+                            _("Path to X509 CRL file"));
+    crlInput->align(FL_ALIGN_LEFT | FL_ALIGN_TOP);
+    ty += INPUT_HEIGHT + TIGHT_MARGIN;
+  }
+
+  ty += GROUP_MARGIN - TIGHT_MARGIN;
+
+  encryptionGroup->end();
+
+  /* Back to normal */
+  tx = orig_tx;
+  ty += INNER_MARGIN;
+
+  /* Authentication */
+  /* Encryption */
+  ty += GROUP_LABEL_OFFSET;
+  height = GROUP_MARGIN * 2 + TIGHT_MARGIN * 2 + CHECK_HEIGHT * 3;
+  authenticationGroup = new Fl_Group(tx, ty, width, height, _("Authentication"));
+  authenticationGroup->box(FL_ENGRAVED_BOX);
+  authenticationGroup->align(FL_ALIGN_LEFT | FL_ALIGN_TOP);
+
+  {
+    tx += GROUP_MARGIN;
+    ty += GROUP_MARGIN;
+
+    authNoneCheckbox = new Fl_Check_Button(LBLRIGHT(tx, ty,
+                                                    CHECK_MIN_WIDTH,
+                                                    CHECK_HEIGHT,
+                                                    _("None")));
+    ty += CHECK_HEIGHT + TIGHT_MARGIN;
+
+    authVncCheckbox = new Fl_Check_Button(LBLRIGHT(tx, ty,
+                                                   CHECK_MIN_WIDTH,
+                                                   CHECK_HEIGHT,
+                                                   _("Standard VNC (insecure without encryption)")));
+    ty += CHECK_HEIGHT + TIGHT_MARGIN;
+
+    authPlainCheckbox = new Fl_Check_Button(LBLRIGHT(tx, ty,
+                                                     CHECK_MIN_WIDTH,
+                                                     CHECK_HEIGHT,
+                                                     _("Username and password (insecure without encryption)")));
+    ty += CHECK_HEIGHT + TIGHT_MARGIN;
+  }
+
+  ty += GROUP_MARGIN - TIGHT_MARGIN;
+
+  authenticationGroup->end();
+
+  /* Back to normal */
+  tx = orig_tx;
+  ty += INNER_MARGIN;
+
+  group->end();
+#endif
+}
+
+
+void OptionsDialog::createInputPage(int tx, int ty, int tw, int th)
+{
+  Fl_Group *group = new Fl_Group(tx, ty, tw, th, _("Input"));
+
+  tx += OUTER_MARGIN;
+  ty += OUTER_MARGIN;
+
+  viewOnlyCheckbox = new Fl_Check_Button(LBLRIGHT(tx, ty,
+                                                  CHECK_MIN_WIDTH,
+                                                  CHECK_HEIGHT,
+                                                  _("View only (ignore mouse and keyboard)")));
+  ty += CHECK_HEIGHT + TIGHT_MARGIN;
+
+  acceptClipboardCheckbox = new Fl_Check_Button(LBLRIGHT(tx, ty,
+                                                         CHECK_MIN_WIDTH,
+                                                         CHECK_HEIGHT,
+                                                         _("Accept clipboard from server")));
+  ty += CHECK_HEIGHT + TIGHT_MARGIN;
+
+  sendClipboardCheckbox = new Fl_Check_Button(LBLRIGHT(tx, ty,
+                                                       CHECK_MIN_WIDTH,
+                                                       CHECK_HEIGHT,
+                                                       _("Send clipboard to server")));
+  ty += CHECK_HEIGHT + TIGHT_MARGIN;
+
+  sendPrimaryCheckbox = new Fl_Check_Button(LBLRIGHT(tx, ty,
+                                                     CHECK_MIN_WIDTH,
+                                                     CHECK_HEIGHT,
+                                                     _("Send primary selection and cut buffer as clipboard")));
+  ty += CHECK_HEIGHT + TIGHT_MARGIN;
+
+  group->end();
+}
+
+
+void OptionsDialog::createMiscPage(int tx, int ty, int tw, int th)
+{
+  Fl_Group *group = new Fl_Group(tx, ty, tw, th, _("Misc."));
+
+  tx += OUTER_MARGIN;
+  ty += OUTER_MARGIN;
+
+  sharedCheckbox = new Fl_Check_Button(LBLRIGHT(tx, ty,
+                                                  CHECK_MIN_WIDTH,
+                                                  CHECK_HEIGHT,
+                                                  _("Shared (don't disconnect other viewers)")));
+  ty += CHECK_HEIGHT + TIGHT_MARGIN;
+
+  fullScreenCheckbox = new Fl_Check_Button(LBLRIGHT(tx, ty,
+                                                  CHECK_MIN_WIDTH,
+                                                  CHECK_HEIGHT,
+                                                  _("Full-screen mode")));
+  ty += CHECK_HEIGHT + TIGHT_MARGIN;
+
+  localCursorCheckbox = new Fl_Check_Button(LBLRIGHT(tx, ty,
+                                                  CHECK_MIN_WIDTH,
+                                                  CHECK_HEIGHT,
+                                                  _("Render cursor locally")));
+  ty += CHECK_HEIGHT + TIGHT_MARGIN;
+
+  dotCursorCheckbox = new Fl_Check_Button(LBLRIGHT(tx, ty,
+                                                  CHECK_MIN_WIDTH,
+                                                  CHECK_HEIGHT,
+                                                  _("Show dot when no cursor")));
+  ty += CHECK_HEIGHT + TIGHT_MARGIN;
+
+  group->end();
+}
+
+
+void OptionsDialog::handleAutoselect(Fl_Widget *widget, void *data)
+{
+  OptionsDialog *dialog = (OptionsDialog*)data;
+
+  if (dialog->autoselectCheckbox->value()) {
+    dialog->encodingGroup->deactivate();
+    dialog->colorlevelGroup->deactivate();
+  } else {
+    dialog->encodingGroup->activate();
+    dialog->colorlevelGroup->activate();
+  }
+
+  // JPEG setting is also affected by autoselection
+  dialog->handleJpeg(dialog->jpegCheckbox, dialog);
+}
+
+
+void OptionsDialog::handleCompression(Fl_Widget *widget, void *data)
+{
+  OptionsDialog *dialog = (OptionsDialog*)data;
+
+  if (dialog->compressionCheckbox->value())
+    dialog->compressionInput->activate();
+  else
+    dialog->compressionInput->deactivate();
+}
+
+
+void OptionsDialog::handleJpeg(Fl_Widget *widget, void *data)
+{
+  OptionsDialog *dialog = (OptionsDialog*)data;
+
+  if (dialog->jpegCheckbox->value() &&
+      !dialog->autoselectCheckbox->value())
+    dialog->jpegInput->activate();
+  else
+    dialog->jpegInput->deactivate();
+}
+
+
+void OptionsDialog::handleVencrypt(Fl_Widget *widget, void *data)
+{
+  OptionsDialog *dialog = (OptionsDialog*)data;
+
+  if (dialog->vencryptCheckbox->value()) {
+    dialog->encryptionGroup->activate();
+    dialog->authPlainCheckbox->activate();
+  } else {
+    dialog->encryptionGroup->deactivate();
+    dialog->authPlainCheckbox->deactivate();
+  }
+}
+
+
+void OptionsDialog::handleX509(Fl_Widget *widget, void *data)
+{
+  OptionsDialog *dialog = (OptionsDialog*)data;
+
+  if (dialog->encX509Checkbox->value()) {
+    dialog->caInput->activate();
+    dialog->crlInput->activate();
+  } else {
+    dialog->caInput->deactivate();
+    dialog->crlInput->deactivate();
+  }
+}
+
+
+void OptionsDialog::handleCancel(Fl_Widget *widget, void *data)
+{
+  OptionsDialog *dialog = (OptionsDialog*)data;
+
+  dialog->hide();
+}
+
+
+void OptionsDialog::handleOK(Fl_Widget *widget, void *data)
+{
+  OptionsDialog *dialog = (OptionsDialog*)data;
+
+  dialog->hide();
+
+  dialog->storeOptions();
+}

Added: trunk/vncviewer/OptionsDialog.h
===================================================================
--- trunk/vncviewer/OptionsDialog.h	                        (rev 0)
+++ trunk/vncviewer/OptionsDialog.h	2011-05-16 12:04:43 UTC (rev 4416)
@@ -0,0 +1,106 @@
+/* Copyright 2011 Pierre Ossman <ossman@...> for Cendio AB
+ * 
+ * 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 __OPTIONSDIALOG_H__
+#define __OPTIONSDIALOG_H__
+
+#include <FL/Fl_Window.H>
+#include <FL/Fl_Group.H>
+#include <FL/Fl_Check_Button.H>
+#include <FL/Fl_Round_Button.H>
+#include <FL/Fl_Int_Input.H>
+
+class OptionsDialog : public Fl_Window {
+protected:
+  OptionsDialog();
+  ~OptionsDialog();
+
+public:
+  static void showDialog(void);
+
+  void show(void);
+
+protected:
+  void loadOptions(void);
+  void storeOptions(void);
+
+  void createCompressionPage(int tx, int ty, int tw, int th);
+  void createSecurityPage(int tx, int ty, int tw, int th);
+  void createInputPage(int tx, int ty, int tw, int th);
+  void createMiscPage(int tx, int ty, int tw, int th);
+
+  static void handleAutoselect(Fl_Widget *widget, void *data);
+  static void handleCompression(Fl_Widget *widget, void *data);
+  static void handleJpeg(Fl_Widget *widget, void *data);
+
+  static void handleVencrypt(Fl_Widget *widget, void *data);
+  static void handleX509(Fl_Widget *widget, void *data);
+
+  static void handleCancel(Fl_Widget *widget, void *data);
+  static void handleOK(Fl_Widget *widget, void *data);
+
+protected:
+  /* Compression */
+  Fl_Check_Button *autoselectCheckbox;
+
+  Fl_Group *encodingGroup;
+  Fl_Round_Button *tightButton;
+  Fl_Round_Button *zrleButton;
+  Fl_Round_Button *hextileButton;
+  Fl_Round_Button *rawButton;
+
+  Fl_Group *colorlevelGroup;
+  Fl_Round_Button *fullcolorCheckbox;
+  Fl_Round_Button *mediumcolorCheckbox;
+  Fl_Round_Button *lowcolorCheckbox;
+  Fl_Round_Button *verylowcolorCheckbox;
+
+  Fl_Check_Button *compressionCheckbox;
+  Fl_Check_Button *jpegCheckbox;
+  Fl_Int_Input *compressionInput;
+  Fl_Int_Input *jpegInput;
+
+  /* Security */
+  Fl_Check_Button *vencryptCheckbox;
+
+  Fl_Group *encryptionGroup;
+  Fl_Check_Button *encNoneCheckbox;
+  Fl_Check_Button *encTLSCheckbox;
+  Fl_Check_Button *encX509Checkbox;
+  Fl_Input *caInput;
+  Fl_Input *crlInput;
+
+  Fl_Group *authenticationGroup;
+  Fl_Check_Button *authNoneCheckbox;
+  Fl_Check_Button *authVncCheckbox;
+  Fl_Check_Button *authPlainCheckbox;
+
+  /* Input */
+  Fl_Check_Button *viewOnlyCheckbox;
+  Fl_Check_Button *acceptClipboardCheckbox;
+  Fl_Check_Button *sendClipboardCheckbox;
+  Fl_Check_Button *sendPrimaryCheckbox;
+
+  /* Misc. */
+  Fl_Check_Button *sharedCheckbox;
+  Fl_Check_Button *fullScreenCheckbox;
+  Fl_Check_Button *localCursorCheckbox;
+  Fl_Check_Button *dotCursorCheckbox;
+};
+
+#endif

Modified: trunk/vncviewer/ServerDialog.cxx
===================================================================
--- trunk/vncviewer/ServerDialog.cxx	2011-05-16 12:00:20 UTC (rev 4415)
+++ trunk/vncviewer/ServerDialog.cxx	2011-05-16 12:04:43 UTC (rev 4416)
@@ -23,6 +23,8 @@
 #include <FL/fl_draw.H>
 
 #include "ServerDialog.h"
+#include "OptionsDialog.h"
+#include "fltk_layout.h"
 #include "i18n.h"
 
 extern void about_vncviewer();
@@ -33,8 +35,7 @@
   int width;
   Fl_Button *button;
 
-  fl_font(FL_HELVETICA, FL_NORMAL_SIZE);
-  width = fl_width(_("VNC server:"));
+  width = gui_str_len(_("VNC server:"));
   serverName = new Fl_Input(20 + width, 20, w() - 20*2 - width, 25, _("VNC server:"));
 
   width = (w() - 20) / 4;
@@ -42,6 +43,9 @@
   button = new Fl_Button(20 + width*0, 20+25+20, width - 20, 27, _("About..."));
   button->callback(this->handleAbout, this);
 
+  button = new Fl_Button(20 + width*1, 20+25+20, width - 20, 27, _("Options..."));
+  button->callback(this->handleOptions, this);
+
   button = new Fl_Button(20 + width*2, 20+25+20, width - 20, 27, _("Cancel"));
   button->callback(this->handleCancel, this);
 
@@ -83,6 +87,12 @@
 }
 
 
+void ServerDialog::handleOptions(Fl_Widget *widget, void *data)
+{
+  OptionsDialog::showDialog();
+}
+
+
 void ServerDialog::handleCancel(Fl_Widget *widget, void *data)
 {
   ServerDialog *dialog = (ServerDialog*)data;

Modified: trunk/vncviewer/ServerDialog.h
===================================================================
--- trunk/vncviewer/ServerDialog.h	2011-05-16 12:00:20 UTC (rev 4415)
+++ trunk/vncviewer/ServerDialog.h	2011-05-16 12:04:43 UTC (rev 4416)
@@ -32,6 +32,7 @@
 
 protected:
   static void handleAbout(Fl_Widget *widget, void *data);
+  static void handleOptions(Fl_Widget *widget, void *data);
   static void handleCancel(Fl_Widget *widget, void *data);
   static void handleOK(Fl_Widget *widget, void *data);
 

Modified: trunk/vncviewer/Viewport.cxx
===================================================================
--- trunk/vncviewer/Viewport.cxx	2011-05-16 12:00:20 UTC (rev 4415)
+++ trunk/vncviewer/Viewport.cxx	2011-05-16 12:04:43 UTC (rev 4416)
@@ -35,6 +35,7 @@
 
 #include "Viewport.h"
 #include "CConn.h"
+#include "OptionsDialog.h"
 #include "i18n.h"
 #include "parameters.h"
 #include "keysym2ucs.h"
@@ -53,7 +54,7 @@
 // Menu constants
 
 enum { ID_EXIT, ID_CTRL, ID_ALT, ID_MENUKEY, ID_CTRLALTDEL,
-       ID_REFRESH, ID_ABOUT, ID_DISMISS };
+       ID_REFRESH, ID_OPTIONS, ID_ABOUT, ID_DISMISS };
 
 Viewport::Viewport(int w, int h, const rfb::PixelFormat& serverPF, CConn* cc_)
   : Fl_Widget(0, 0, w, h), cc(cc_), frameBuffer(NULL), pixelTrans(NULL),
@@ -450,6 +451,7 @@
 
   contextMenu->add(_("Refresh screen"), 0, NULL, (void*)ID_REFRESH, FL_MENU_DIVIDER);
 
+  contextMenu->add(_("Options..."), 0, NULL, (void*)ID_OPTIONS, 0);
   contextMenu->add(_("About TigerVNC viewer..."), 0, NULL, (void*)ID_ABOUT, FL_MENU_DIVIDER);
 
   contextMenu->add(_("Dismiss menu"), 0, NULL, (void*)ID_DISMISS, 0);
@@ -498,6 +500,9 @@
   case ID_REFRESH:
     cc->refreshFramebuffer();
     break;
+  case ID_OPTIONS:
+    OptionsDialog::showDialog();
+    break;
   case ID_ABOUT:
     about_vncviewer();
     break;

Added: trunk/vncviewer/fltk_layout.h
===================================================================
--- trunk/vncviewer/fltk_layout.h	                        (rev 0)
+++ trunk/vncviewer/fltk_layout.h	2011-05-16 12:04:43 UTC (rev 4416)
@@ -0,0 +1,86 @@
+/* Copyright 2011 Pierre Ossman <ossman@...> for Cendio AB
+ * 
+ * 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 __FLTK_LAYOUT_H__
+#define __FLTK_LAYOUT_H__
+
+#include <FL/fl_draw.H>
+
+/* Calculates the width of a string as printed by FLTK (pixels) */
+static inline int gui_str_len(const char *str)
+{
+    float len;
+
+    fl_font(FL_HELVETICA, FL_NORMAL_SIZE);
+
+    len = fl_width(str);
+
+    return (int)(len + 0.5f);
+}
+
+/**** MARGINS ****/
+
+#define OUTER_MARGIN            10
+#define INNER_MARGIN            10
+
+/* Tighter grouping of related fields */
+#define TIGHT_MARGIN            5
+
+/**** ADJUSTMENTS ****/
+#define INDENT                  20
+
+/**** FLTK WIDGETS ****/
+
+/* Fl_Tabs */
+#define TABS_HEIGHT             30
+
+/* Fl_Input */
+#define INPUT_LABEL_OFFSET      FL_NORMAL_SIZE
+#define INPUT_HEIGHT            25
+
+/* Fl_Button */
+#define BUTTON_WIDTH            115
+#define BUTTON_HEIGHT           27
+
+/* Fl_Round_Button */
+#define RADIO_MIN_WIDTH         (FL_NORMAL_SIZE + 5)
+#define RADIO_HEIGHT            (FL_NORMAL_SIZE + 7)
+
+/* Fl_Check_Button */
+#define CHECK_MIN_WIDTH         RADIO_MIN_WIDTH
+#define CHECK_HEIGHT            RADIO_HEIGHT
+
+/* Fl_Group */
+#define GROUP_LABEL_OFFSET      FL_NORMAL_SIZE
+#define GROUP_MARGIN            12
+
+/**** HELPERS FOR DYNAMIC TEXT ****/
+
+/* Extra space to add after any text line */
+#define TEXT_PADDING            2
+
+/* Use this when the text extends to the right (e.g. checkboxes) */
+#define LBLRIGHT(x, y, w, h, str) \
+    (x), (y), (w) + gui_str_len(str) + TEXT_PADDING, (h), (str)
+
+/* Use this when the space for the label is taken from the left (e.g. input) */
+#define LBLLEFT(x, y, w, h, str) \
+    (x) + (gui_str_len(str) + TEXT_PADDING), (y), \
+    (w) - (gui_str_len(str) + TEXT_PADDING), (h), (str)
+
+#endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[4417] trunk/vncviewer
		From: <ossman_@us...> -	2011-05-16 12:18

			



                
                    
                        Revision: 4417
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4417&view=rev
Author:   ossman_
Date:     2011-05-16 12:18:08 +0000 (Mon, 16 May 2011)

Log Message:
-----------
Add connection information dialog based on the one in the unix viewer.

Modified Paths:
--------------
    trunk/vncviewer/CConn.cxx
    trunk/vncviewer/CConn.h
    trunk/vncviewer/Viewport.cxx

Modified: trunk/vncviewer/CConn.cxx
===================================================================
--- trunk/vncviewer/CConn.cxx	2011-05-16 12:04:43 UTC (rev 4416)
+++ trunk/vncviewer/CConn.cxx	2011-05-16 12:18:08 UTC (rev 4417)
@@ -107,6 +107,39 @@
     forceNonincremental = true;
 }
 
+const char *CConn::connectionInfo()
+{
+  static char infoText[1024] = "";
+
+  char pfStr[100];
+  char spfStr[100];
+
+  cp.pf().print(pfStr, 100);
+  serverPF.print(spfStr, 100);
+
+  int secType = csecurity->getType();
+
+  snprintf(infoText, sizeof(infoText),
+           _("Desktop name: %.80s\n"
+             "Host: %.80s port: %d\n"
+             "Size: %d x %d\n"
+             "Pixel format: %s\n"
+             "(server default %s)\n"
+             "Requested encoding: %s\n"
+             "Last used encoding: %s\n"
+             "Line speed estimate: %d kbit/s\n"
+             "Protocol version: %d.%d\n"
+             "Security method: %s\n"),
+           cp.name(), serverHost, serverPort, cp.width, cp.height,
+           pfStr, spfStr, encodingName(currentEncoding),
+           encodingName(lastServerEncoding),
+           sock->inStream().kbitsPerSecond(),
+           cp.majorVersion, cp.minorVersion,
+           secTypeName(secType));
+
+  return infoText;
+}
+
 // The RFB core is not properly asynchronous, so it calls this callback
 // whenever it needs to block to wait for more data. Since FLTK is
 // monitoring the socket, we just make sure FLTK gets to run.

Modified: trunk/vncviewer/CConn.h
===================================================================
--- trunk/vncviewer/CConn.h	2011-05-16 12:04:43 UTC (rev 4416)
+++ trunk/vncviewer/CConn.h	2011-05-16 12:18:08 UTC (rev 4417)
@@ -34,6 +34,8 @@
 
   void refreshFramebuffer();
 
+  const char *connectionInfo();
+
   // FdInStreamBlockCallback methods
   void blockCallback();
 

Modified: trunk/vncviewer/Viewport.cxx
===================================================================
--- trunk/vncviewer/Viewport.cxx	2011-05-16 12:04:43 UTC (rev 4416)
+++ trunk/vncviewer/Viewport.cxx	2011-05-16 12:18:08 UTC (rev 4417)
@@ -22,6 +22,7 @@
 #include <string.h>
 
 #include <FL/fl_draw.H>
+#include <FL/fl_ask.H>
 
 #include <rfb/CMsgWriter.h>
 #include <rfb/LogWriter.h>
@@ -54,7 +55,7 @@
 // Menu constants
 
 enum { ID_EXIT, ID_CTRL, ID_ALT, ID_MENUKEY, ID_CTRLALTDEL,
-       ID_REFRESH, ID_OPTIONS, ID_ABOUT, ID_DISMISS };
+       ID_REFRESH, ID_OPTIONS, ID_INFO, ID_ABOUT, ID_DISMISS };
 
 Viewport::Viewport(int w, int h, const rfb::PixelFormat& serverPF, CConn* cc_)
   : Fl_Widget(0, 0, w, h), cc(cc_), frameBuffer(NULL), pixelTrans(NULL),
@@ -452,6 +453,7 @@
   contextMenu->add(_("Refresh screen"), 0, NULL, (void*)ID_REFRESH, FL_MENU_DIVIDER);
 
   contextMenu->add(_("Options..."), 0, NULL, (void*)ID_OPTIONS, 0);
+  contextMenu->add(_("Connection info..."), 0, NULL, (void*)ID_INFO, 0);
   contextMenu->add(_("About TigerVNC viewer..."), 0, NULL, (void*)ID_ABOUT, FL_MENU_DIVIDER);
 
   contextMenu->add(_("Dismiss menu"), 0, NULL, (void*)ID_DISMISS, 0);
@@ -503,6 +505,10 @@
   case ID_OPTIONS:
     OptionsDialog::showDialog();
     break;
+  case ID_INFO:
+    fl_message_title(_("VNC connection info"));
+    fl_message(cc->connectionInfo());
+    break;
   case ID_ABOUT:
     about_vncviewer();
     break;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[4421] trunk/vncviewer
		From: <ossman_@us...> -	2011-05-17 09:36

			



                
                    
                        Revision: 4421
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4421&view=rev
Author:   ossman_
Date:     2011-05-17 09:36:04 +0000 (Tue, 17 May 2011)

Log Message:
-----------
Add a callback mechanism to the options dialog so that other parts of vncviewer
can pick up on changes.

Modified Paths:
--------------
    trunk/vncviewer/OptionsDialog.cxx
    trunk/vncviewer/OptionsDialog.h

Modified: trunk/vncviewer/OptionsDialog.cxx
===================================================================
--- trunk/vncviewer/OptionsDialog.cxx	2011-05-17 03:06:24 UTC (rev 4420)
+++ trunk/vncviewer/OptionsDialog.cxx	2011-05-17 09:36:04 UTC (rev 4421)
@@ -42,6 +42,8 @@
 using namespace rdr;
 using namespace rfb;
 
+std::map<OptionsCallback*, void*> OptionsDialog::callbacks;
+
 OptionsDialog::OptionsDialog()
   : Fl_Window(450, 450, _("VNC Viewer: Connection Options"))
 {
@@ -101,6 +103,18 @@
 }
 
 
+void OptionsDialog::addCallback(OptionsCallback *cb, void *data)
+{
+  callbacks[cb] = data;
+}
+
+
+void OptionsDialog::removeCallback(OptionsCallback *cb)
+{
+  callbacks.erase(cb);
+}
+
+
 void OptionsDialog::show(void)
 {
   loadOptions();
@@ -333,6 +347,11 @@
   fullScreen.setParam(fullScreenCheckbox->value());
   useLocalCursor.setParam(localCursorCheckbox->value());
   dotWhenNoCursor.setParam(dotCursorCheckbox->value());
+
+  std::map<OptionsCallback*, void*>::const_iterator iter;
+
+  for (iter = callbacks.begin();iter != callbacks.end();++iter)
+    iter->first(iter->second);
 }
 
 

Modified: trunk/vncviewer/OptionsDialog.h
===================================================================
--- trunk/vncviewer/OptionsDialog.h	2011-05-17 03:06:24 UTC (rev 4420)
+++ trunk/vncviewer/OptionsDialog.h	2011-05-17 09:36:04 UTC (rev 4421)
@@ -19,12 +19,16 @@
 #ifndef __OPTIONSDIALOG_H__
 #define __OPTIONSDIALOG_H__
 
+#include <map>
+
 #include <FL/Fl_Window.H>
 #include <FL/Fl_Group.H>
 #include <FL/Fl_Check_Button.H>
 #include <FL/Fl_Round_Button.H>
 #include <FL/Fl_Int_Input.H>
 
+typedef void (OptionsCallback)(void*);
+
 class OptionsDialog : public Fl_Window {
 protected:
   OptionsDialog();
@@ -33,6 +37,9 @@
 public:
   static void showDialog(void);
 
+  static void addCallback(OptionsCallback *cb, void *data = NULL);
+  static void removeCallback(OptionsCallback *cb);
+
   void show(void);
 
 protected:
@@ -55,6 +62,8 @@
   static void handleOK(Fl_Widget *widget, void *data);
 
 protected:
+  static std::map<OptionsCallback*, void*> callbacks;
+
   /* Compression */
   Fl_Check_Button *autoselectCheckbox;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[4422] trunk/vncviewer
		From: <ossman_@us...> -	2011-05-17 09:39

			



                
                    
                        Revision: 4422
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4422&view=rev
Author:   ossman_
Date:     2011-05-17 09:39:07 +0000 (Tue, 17 May 2011)

Log Message:
-----------
Update connection parameters when the user has changed things in the options
dialog.

Modified Paths:
--------------
    trunk/vncviewer/CConn.cxx
    trunk/vncviewer/CConn.h

Modified: trunk/vncviewer/CConn.cxx
===================================================================
--- trunk/vncviewer/CConn.cxx	2011-05-17 09:36:04 UTC (rev 4421)
+++ trunk/vncviewer/CConn.cxx	2011-05-17 09:39:07 UTC (rev 4422)
@@ -33,6 +33,7 @@
 #include <FL/fl_ask.H>
 
 #include "CConn.h"
+#include "OptionsDialog.h"
 #include "i18n.h"
 #include "parameters.h"
 
@@ -44,6 +45,10 @@
 
 static rfb::LogWriter vlog("CConn");
 
+static const PixelFormat mediumColourPF(8,3,0,1,1,1,1,2,1,0);
+static const PixelFormat lowColourPF(8,6,0,1,3,3,3,4,2,0);
+static const PixelFormat verylowColourPF(8,8,0,0);
+
 CConn::CConn(const char* vncServerName)
   : serverHost(0), serverPort(0), sock(NULL), desktop(NULL),
     currentEncoding(encodingTight), lastServerEncoding((unsigned int)-1),
@@ -89,10 +94,14 @@
   setStreams(&sock->inStream(), &sock->outStream());
 
   initialiseProtocol();
+
+  OptionsDialog::addCallback(handleOptions, this);
 }
 
 CConn::~CConn()
 {
+  OptionsDialog::removeCallback(handleOptions);
+
   free(serverHost);
   if (sock)
     Fl::remove_fd(sock->getFd());
@@ -472,11 +481,11 @@
       pf = fullColourPF;
     } else {
       if (lowColourLevel == 0)
-        pf = PixelFormat(8,3,0,1,1,1,1,2,1,0);
+        pf = mediumColourPF;
       else if (lowColourLevel == 1)
-        pf = PixelFormat(8,6,0,1,3,3,3,4,2,0);
+        pf = lowColourPF;
       else
-        pf = PixelFormat(8,8,0,0);
+        pf = verylowColourPF;
     }
     char str[256];
     pf.print(str, 256);
@@ -497,3 +506,49 @@
  
   forceNonincremental = false;
 }
+
+void CConn::handleOptions(void *data)
+{
+  CConn *self = (CConn*)data;
+
+  // Checking all the details of the current set of encodings is just
+  // a pain. Assume something has changed, as resending the encoding
+  // list is cheap. Avoid overriding what the auto logic has selected
+  // though.
+  if (!autoSelect) {
+    int encNum = encodingNum(preferredEncoding);
+
+    if (encNum != -1)
+      self->currentEncoding = encNum;
+
+    self->cp.qualityLevel = qualityLevel;
+  }
+
+  self->cp.supportsLocalCursor = useLocalCursor;
+
+  self->cp.customCompressLevel = customCompressLevel;
+  self->cp.compressLevel = compressLevel;
+
+  self->cp.noJpeg = noJpeg;
+
+  self->encodingChange = true;
+
+  // Format changes refreshes the entire screen though and are therefore
+  // very costly. It's probably worth the effort to see if it is necessary
+  // here.
+  PixelFormat pf;
+
+  if (fullColour) {
+    pf = self->fullColourPF;
+  } else {
+    if (lowColourLevel == 0)
+      pf = mediumColourPF;
+    else if (lowColourLevel == 1)
+      pf = lowColourPF;
+    else
+      pf = verylowColourPF;
+  }
+
+  if (!pf.equal(self->cp.pf()))
+    self->formatChange = true;
+}

Modified: trunk/vncviewer/CConn.h
===================================================================
--- trunk/vncviewer/CConn.h	2011-05-17 09:36:04 UTC (rev 4421)
+++ trunk/vncviewer/CConn.h	2011-05-17 09:39:07 UTC (rev 4422)
@@ -78,6 +78,8 @@
   void checkEncodings();
   void requestNewUpdate();
 
+  static void handleOptions(void *data);
+
 private:
   char* serverHost;
   int serverPort;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[4434] trunk/vncviewer
		From: <ossman_@us...> -	2011-05-20 12:05

			



                
                    
                        Revision: 4434
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4434&view=rev
Author:   ossman_
Date:     2011-05-20 12:05:20 +0000 (Fri, 20 May 2011)

Log Message:
-----------
Better handling of the numpad by looking at FLTK's "original key code".

Modified Paths:
--------------
    trunk/vncviewer/Viewport.cxx
    trunk/vncviewer/Viewport.h

Modified: trunk/vncviewer/Viewport.cxx
===================================================================
--- trunk/vncviewer/Viewport.cxx	2011-05-19 14:55:12 UTC (rev 4433)
+++ trunk/vncviewer/Viewport.cxx	2011-05-20 12:05:20 UTC (rev 4434)
@@ -248,11 +248,13 @@
       return 1;
     }
 
-    handleKeyEvent(Fl::event_key(), Fl::event_text(), true);
+    handleKeyEvent(Fl::event_key(), Fl::event_original_key(),
+                   Fl::event_text(), true);
     return 1;
 
   case FL_KEYUP:
-    handleKeyEvent(Fl::event_key(), Fl::event_text(), false);
+    handleKeyEvent(Fl::event_key(), Fl::event_original_key(),
+                   Fl::event_text(), false);
     return 1;
   }
 
@@ -322,7 +324,7 @@
 }
 
 
-rdr::U32 Viewport::translateKeyEvent(int keyCode, const char *keyText)
+rdr::U32 Viewport::translateKeyEvent(int keyCode, int origKeyCode, const char *keyText)
 {
   unsigned ucs;
 
@@ -334,6 +336,40 @@
   if ((keyCode >= (FL_KP + '0')) && (keyCode <= (FL_KP + '9')))
     return XK_KP_0 + (keyCode - (FL_KP + '0'));
 
+  // FLTK does some special remapping of numpad keys when numlock is off
+  if ((origKeyCode >= FL_KP) && (origKeyCode <= FL_KP_Last)) {
+    switch (keyCode) {
+    case FL_F+1:
+      return XK_KP_F1;
+    case FL_F+2:
+      return XK_KP_F2;
+    case FL_F+3:
+      return XK_KP_F3;
+    case FL_F+4:
+      return XK_KP_F4;
+    case FL_Home:
+      return XK_KP_Home;
+    case FL_Left:
+      return XK_KP_Left;
+    case FL_Up:
+      return XK_KP_Up;
+    case FL_Right:
+      return XK_KP_Right;
+    case FL_Down:
+      return XK_KP_Down;
+    case FL_Page_Up:
+      return XK_KP_Page_Up;
+    case FL_Page_Down:
+      return XK_KP_Page_Down;
+    case FL_End:
+      return XK_KP_End;
+    case FL_Insert:
+      return XK_KP_Insert;
+    case FL_Delete:
+      return XK_KP_Delete;
+    }
+  }
+
   // Then other special keys
   switch (keyCode) {
   case FL_BackSpace:
@@ -437,7 +473,7 @@
 }
 
 
-void Viewport::handleKeyEvent(int keyCode, const char *keyText, bool down)
+void Viewport::handleKeyEvent(int keyCode, int origKeyCode, const char *keyText, bool down)
 {
   rdr::U32 keySym;
 
@@ -451,13 +487,14 @@
   if (!down) {
     DownMap::iterator iter;
 
-    iter = downKeySym.find(keyCode);
+    iter = downKeySym.find(origKeyCode);
     if (iter == downKeySym.end()) {
-      vlog.error(_("Unexpected release of FLTK key code %d (0x%04x)"), keyCode, keyCode);
+      vlog.error(_("Unexpected release of FLTK key code %d (0x%04x)"),
+                 origKeyCode, origKeyCode);
       return;
     }
 
-    vlog.debug("Key released: 0x%04x => 0x%04x", keyCode, iter->second);
+    vlog.debug("Key released: 0x%04x => 0x%04x", origKeyCode, iter->second);
 
     cc->writer()->keyEvent(iter->second, false);
 
@@ -466,13 +503,14 @@
     return;
   }
 
-  keySym = translateKeyEvent(keyCode, keyText);
+  keySym = translateKeyEvent(keyCode, origKeyCode, keyText);
   if (keySym == XK_VoidSymbol)
     return;
 
-  vlog.debug("Key pressed: 0x%04x '%s' => 0x%04x", keyCode, keyText, keySym);
+  vlog.debug("Key pressed: 0x%04x (0x%04x) '%s' => 0x%04x",
+             origKeyCode, keyCode, keyText, keySym);
 
-  downKeySym[keyCode] = keySym;
+  downKeySym[origKeyCode] = keySym;
   cc->writer()->keyEvent(keySym, down);
 }
 
@@ -481,6 +519,8 @@
 {
   contextMenu->add(_("Exit viewer"), 0, NULL, (void*)ID_EXIT, FL_MENU_DIVIDER);
 
+  contextMenu->add(_("Full screen"), 0, NULL, (void*)ID_FULLSCREEN, FL_MENU_TOGGLE | FL_MENU_DIVIDER);
+
   contextMenu->add(_("Ctrl"), 0, NULL, (void*)ID_CTRL, FL_MENU_TOGGLE);
   contextMenu->add(_("Alt"), 0, NULL, (void*)ID_ALT, FL_MENU_TOGGLE);
   CharArray menuKeyStr(menuKey.getData());

Modified: trunk/vncviewer/Viewport.h
===================================================================
--- trunk/vncviewer/Viewport.h	2011-05-19 14:55:12 UTC (rev 4433)
+++ trunk/vncviewer/Viewport.h	2011-05-20 12:05:20 UTC (rev 4434)
@@ -98,8 +98,8 @@
   void handlePointerEvent(const rfb::Point& pos, int buttonMask);
   static void handlePointerTimeout(void *data);
 
-  rdr::U32 translateKeyEvent(int keyCode, const char *keyText);
-  void handleKeyEvent(int keyCode, const char *keyText, bool down);
+  rdr::U32 translateKeyEvent(int keyCode, int origKeyCode, const char *keyText);
+  void handleKeyEvent(int keyCode, int origKeyCode, const char *keyText, bool down);
 
   void initContextMenu();
   void popupContextMenu();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[4435] trunk/vncviewer
		From: <ossman_@us...> -	2011-05-20 12:13

			



                
                    
                        Revision: 4435
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4435&view=rev
Author:   ossman_
Date:     2011-05-20 12:12:59 +0000 (Fri, 20 May 2011)

Log Message:
-----------
Remove no longer used code.

Modified Paths:
--------------
    trunk/vncviewer/CMakeLists.txt
    trunk/vncviewer/Viewport.cxx

Removed Paths:
-------------
    trunk/vncviewer/osx_utils.m

Modified: trunk/vncviewer/CMakeLists.txt
===================================================================
--- trunk/vncviewer/CMakeLists.txt	2011-05-20 12:05:20 UTC (rev 4434)
+++ trunk/vncviewer/CMakeLists.txt	2011-05-20 12:12:59 UTC (rev 4435)
@@ -13,10 +13,6 @@
   keysym2ucs.c
   vncviewer.cxx)
 
-if(APPLE)
-  set(VNCVIEWER_SOURCES ${VNCVIEWER_SOURCES} osx_utils.m)
-endif()
-
 add_executable(vncviewer ${VNCVIEWER_SOURCES})
 
 target_link_libraries(vncviewer rfb network rdr os Xregion ${FLTK_LIBRARIES} ${GETTEXT_LIBRARIES})

Modified: trunk/vncviewer/Viewport.cxx
===================================================================
--- trunk/vncviewer/Viewport.cxx	2011-05-20 12:05:20 UTC (rev 4434)
+++ trunk/vncviewer/Viewport.cxx	2011-05-20 12:12:59 UTC (rev 4435)
@@ -43,10 +43,6 @@
 
 using namespace rfb;
 
-#ifdef __APPLE__
-extern "C" const char *osx_event_string(void);
-#endif
-
 extern void exit_vncviewer();
 extern void about_vncviewer();
 

Deleted: trunk/vncviewer/osx_utils.m
===================================================================
--- trunk/vncviewer/osx_utils.m	2011-05-20 12:05:20 UTC (rev 4434)
+++ trunk/vncviewer/osx_utils.m	2011-05-20 12:12:59 UTC (rev 4435)
@@ -1,25 +0,0 @@
-/* Copyright 2011 Pierre Ossman <ossman@...> for Cendio AB
- * 
- * 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.
- */
-
-#import <Cocoa/Cocoa.h>
-
-const char *osx_event_string(void)
-{
-    return [[[NSApp currentEvent] charactersIgnoringModifiers] UTF8String];
-}
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[4440] trunk/vncviewer
		From: <ossman_@us...> -	2011-05-23 12:21

			



                
                    
                        Revision: 4440
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4440&view=rev
Author:   ossman_
Date:     2011-05-23 12:21:21 +0000 (Mon, 23 May 2011)

Log Message:
-----------
We need to be careful about feeding FLTK @:s when they will be used in a
label as that is a formatting character.

Modified Paths:
--------------
    trunk/vncviewer/UserDialog.cxx
    trunk/vncviewer/Viewport.cxx
    trunk/vncviewer/fltk_layout.h

Modified: trunk/vncviewer/UserDialog.cxx
===================================================================
--- trunk/vncviewer/UserDialog.cxx	2011-05-23 11:21:22 UTC (rev 4439)
+++ trunk/vncviewer/UserDialog.cxx	2011-05-23 12:21:21 UTC (rev 4440)
@@ -34,6 +34,7 @@
 #include <rfb/Exception.h>
 
 #include "i18n.h"
+#include "fltk_layout.h"
 #include "parameters.h"
 #include "UserDialog.h"
 
@@ -137,6 +138,11 @@
 
 bool UserDialog::showMsgBox(int flags, const char* title, const char* text)
 {
+  char buffer[1024];
+
+  if (fltk_escape(text, buffer, sizeof(buffer)) >= sizeof(buffer))
+    return 0;
+
   // FLTK doesn't give us a flexible choice of the icon, so we ignore those
   // bits for now.
 
@@ -146,16 +152,16 @@
 
   switch (flags & 0xf) {
   case M_OKCANCEL:
-    return fl_choice(text, NULL, fl_ok, fl_cancel) == 1;
+    return fl_choice(buffer, NULL, fl_ok, fl_cancel) == 1;
   case M_YESNO:
-    return fl_choice(text, NULL, fl_yes, fl_no) == 1;
+    return fl_choice(buffer, NULL, fl_yes, fl_no) == 1;
   case M_OK:
   default:
     if (((flags & 0xf0) == M_ICONERROR) ||
         ((flags & 0xf0) == M_ICONWARNING))
-      fl_alert(text);
+      fl_alert(buffer);
     else
-      fl_message(text);
+      fl_message(buffer);
     return true;
   }
 

Modified: trunk/vncviewer/Viewport.cxx
===================================================================
--- trunk/vncviewer/Viewport.cxx	2011-05-23 11:21:22 UTC (rev 4439)
+++ trunk/vncviewer/Viewport.cxx	2011-05-23 12:21:21 UTC (rev 4440)
@@ -42,6 +42,7 @@
 #include "CConn.h"
 #include "OptionsDialog.h"
 #include "i18n.h"
+#include "fltk_layout.h"
 #include "parameters.h"
 #include "keysym2ucs.h"
 
@@ -575,6 +576,7 @@
 void Viewport::popupContextMenu()
 {
   const Fl_Menu_Item *m;
+  char buffer[1024];
 
   contextMenu->position(Fl::event_x(), Fl::event_y());
 
@@ -618,8 +620,10 @@
     OptionsDialog::showDialog();
     break;
   case ID_INFO:
-    fl_message_title(_("VNC connection info"));
-    fl_message(cc->connectionInfo());
+    if (fltk_escape(cc->connectionInfo(), buffer, sizeof(buffer)) < sizeof(buffer)) {
+      fl_message_title(_("VNC connection info"));
+      fl_message(buffer);
+    }
     break;
   case ID_ABOUT:
     about_vncviewer();

Modified: trunk/vncviewer/fltk_layout.h
===================================================================
--- trunk/vncviewer/fltk_layout.h	2011-05-23 11:21:22 UTC (rev 4439)
+++ trunk/vncviewer/fltk_layout.h	2011-05-23 12:21:21 UTC (rev 4440)
@@ -33,6 +33,40 @@
     return (int)(len + 0.5f);
 }
 
+/* Escapes all @ in text as those have special meaning in labels */
+static inline int fltk_escape(const char *in, char *out, size_t maxlen)
+{
+    int len;
+
+    len = 0;
+
+    while (*in != '\0') {
+        if (*in == '@') {
+            if (maxlen >= 3) {
+                *out++ = '@';
+                *out++ = '@';
+                maxlen -= 2;
+            }
+
+            len += 2;
+        } else {
+            if (maxlen >= 2) {
+                *out++ = *in;
+                maxlen--;
+            }
+
+            len += 1;
+        }
+
+        in++;
+    }
+
+    if (maxlen)
+        *out = '\0';
+
+    return len;
+}
+
 /**** MARGINS ****/
 
 #define OUTER_MARGIN            10


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[4444] trunk/vncviewer
		From: <ossman_@us...> -	2011-05-24 12:47

			



                
                    
                        Revision: 4444
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4444&view=rev
Author:   ossman_
Date:     2011-05-24 12:47:12 +0000 (Tue, 24 May 2011)

Log Message:
-----------
Handling a full range of keys for the menu key is not as trivial in FLTK as
with raw X11, so do what the Windows client did and restrict the available
keys to just the function keys.

Modified Paths:
--------------
    trunk/vncviewer/OptionsDialog.cxx
    trunk/vncviewer/OptionsDialog.h
    trunk/vncviewer/Viewport.cxx
    trunk/vncviewer/Viewport.h
    trunk/vncviewer/fltk_layout.h

Modified: trunk/vncviewer/OptionsDialog.cxx
===================================================================
--- trunk/vncviewer/OptionsDialog.cxx	2011-05-24 11:33:43 UTC (rev 4443)
+++ trunk/vncviewer/OptionsDialog.cxx	2011-05-24 12:47:12 UTC (rev 4444)
@@ -253,11 +253,22 @@
 #endif
 
   /* Input */
+  const char *menuKeyBuf;
+
   viewOnlyCheckbox->value(viewOnly);
   acceptClipboardCheckbox->value(acceptClipboard);
   sendClipboardCheckbox->value(sendClipboard);
   sendPrimaryCheckbox->value(sendPrimary);
 
+  menuKeyChoice->value(0);
+
+  menuKeyBuf = menuKey;
+  if (menuKeyBuf[0] == 'F') {
+    int num = atoi(menuKeyBuf+1);
+    if ((num >= 1) && (num <= 12))
+      menuKeyChoice->value(num);
+  }
+
   /* Misc. */
   sharedCheckbox->value(shared);
   fullScreenCheckbox->value(fullScreen);
@@ -342,6 +353,14 @@
   sendClipboard.setParam(sendClipboardCheckbox->value());
   sendPrimary.setParam(sendPrimaryCheckbox->value());
 
+  if (menuKeyChoice->value() == 0)
+    menuKey.setParam("");
+  else {
+    char buf[16];
+    sprintf(buf, "F%d", menuKeyChoice->value());
+    menuKey.setParam(buf);
+  }
+
   /* Misc. */
   shared.setParam(sharedCheckbox->value());
   fullScreen.setParam(fullScreenCheckbox->value());
@@ -664,6 +683,17 @@
                                                      _("Send primary selection and cut buffer as clipboard")));
   ty += CHECK_HEIGHT + TIGHT_MARGIN;
 
+  menuKeyChoice = new Fl_Choice(LBLLEFT(tx, ty, 150, CHOICE_HEIGHT, _("Menu key")));
+
+  menuKeyChoice->add(_("None"), 0, NULL, (void*)0, FL_MENU_DIVIDER);
+  for (int i = 1;i <= 12;i++) {
+    char buf[16];
+    sprintf(buf, "F%d", i);
+    menuKeyChoice->add(buf, 0, NULL, (void*)i, 0);
+  }
+
+  ty += CHOICE_HEIGHT + TIGHT_MARGIN;
+
   group->end();
 }
 

Modified: trunk/vncviewer/OptionsDialog.h
===================================================================
--- trunk/vncviewer/OptionsDialog.h	2011-05-24 11:33:43 UTC (rev 4443)
+++ trunk/vncviewer/OptionsDialog.h	2011-05-24 12:47:12 UTC (rev 4444)
@@ -26,6 +26,7 @@
 #include <FL/Fl_Check_Button.H>
 #include <FL/Fl_Round_Button.H>
 #include <FL/Fl_Int_Input.H>
+#include <FL/Fl_Choice.H>
 
 typedef void (OptionsCallback)(void*);
 
@@ -104,6 +105,7 @@
   Fl_Check_Button *acceptClipboardCheckbox;
   Fl_Check_Button *sendClipboardCheckbox;
   Fl_Check_Button *sendPrimaryCheckbox;
+  Fl_Choice *menuKeyChoice;
 
   /* Misc. */
   Fl_Check_Button *sharedCheckbox;

Modified: trunk/vncviewer/Viewport.cxx
===================================================================
--- trunk/vncviewer/Viewport.cxx	2011-05-24 11:33:43 UTC (rev 4443)
+++ trunk/vncviewer/Viewport.cxx	2011-05-24 12:47:12 UTC (rev 4444)
@@ -79,6 +79,10 @@
 
   contextMenu = new Fl_Menu_Button(0, 0, 0, 0);
   initContextMenu();
+
+  setMenuKey();
+
+  OptionsDialog::addCallback(handleOptions, this);
 }
 
 
@@ -94,6 +98,8 @@
   Fl::remove_clipboard_notify(handleClipboardChange);
 #endif
 
+  OptionsDialog::removeCallback(handleOptions);
+
   delete frameBuffer;
 
   if (pixelTrans)
@@ -249,7 +255,7 @@
     return 1;
 
   case FL_KEYDOWN:
-    if (Fl::event_key() == (FL_F + 8)) {
+    if (menuKeyCode && (Fl::event_key() == menuKeyCode)) {
       popupContextMenu();
       return 1;
     }
@@ -259,6 +265,9 @@
     return 1;
 
   case FL_KEYUP:
+    if (menuKeyCode && (Fl::event_key() == menuKeyCode))
+      return 1;
+
     handleKeyEvent(Fl::event_key(), Fl::event_original_key(),
                    Fl::event_text(), false);
     return 1;
@@ -557,15 +566,20 @@
 
 void Viewport::initContextMenu()
 {
+  contextMenu->clear();
+
   contextMenu->add(_("Exit viewer"), 0, NULL, (void*)ID_EXIT, FL_MENU_DIVIDER);
 
   contextMenu->add(_("Ctrl"), 0, NULL, (void*)ID_CTRL, FL_MENU_TOGGLE);
   contextMenu->add(_("Alt"), 0, NULL, (void*)ID_ALT, FL_MENU_TOGGLE);
-  CharArray menuKeyStr(menuKey.getData());
-  CharArray sendMenuKey(64);
-  snprintf(sendMenuKey.buf, 64, _("Send %s"), "F8"); // FIXME
-  contextMenu->add(sendMenuKey.buf, 0, NULL, (void*)ID_MENUKEY, 0);
-  contextMenu->add("Secret shortcut menu key", FL_F + 8, NULL, (void*)ID_MENUKEY, FL_MENU_INVISIBLE);
+
+  if (menuKeyCode) {
+    char sendMenuKey[64];
+    snprintf(sendMenuKey, 64, _("Send %s"), (const char *)menuKey);
+    contextMenu->add(sendMenuKey, 0, NULL, (void*)ID_MENUKEY, 0);
+    contextMenu->add("Secret shortcut menu key", menuKeyCode, NULL, (void*)ID_MENUKEY, FL_MENU_INVISIBLE);
+  }
+
   contextMenu->add(_("Send Ctrl-Alt-Del"), 0, NULL, (void*)ID_CTRLALTDEL, FL_MENU_DIVIDER);
 
   contextMenu->add(_("Refresh screen"), 0, NULL, (void*)ID_REFRESH, FL_MENU_DIVIDER);
@@ -603,9 +617,8 @@
     break;
   case ID_MENUKEY:
     if (!viewOnly) {
-      // FIXME
-      cc->writer()->keyEvent(XK_F8, true);
-      cc->writer()->keyEvent(XK_F8, false);
+      handleKeyEvent(menuKeyCode, menuKeyCode, "", true);
+      handleKeyEvent(menuKeyCode, menuKeyCode, "", false);
     }
     break;
   case ID_CTRLALTDEL:
@@ -638,3 +651,30 @@
     break;
   }
 }
+
+
+void Viewport::setMenuKey()
+{
+  const char *menuKeyStr;
+
+  menuKeyCode = 0;
+
+  menuKeyStr = menuKey;
+  if (menuKeyStr[0] == 'F') {
+    int num = atoi(menuKeyStr + 1);
+    if ((num >= 1) && (num <= 12))
+      menuKeyCode = FL_F + num;
+  }
+
+  // Need to repopulate the context menu as it contains references to
+  // the menu key
+  initContextMenu();
+}
+
+
+void Viewport::handleOptions(void *data)
+{
+  Viewport *self = (Viewport*)data;
+
+  self->setMenuKey();
+}

Modified: trunk/vncviewer/Viewport.h
===================================================================
--- trunk/vncviewer/Viewport.h	2011-05-24 11:33:43 UTC (rev 4443)
+++ trunk/vncviewer/Viewport.h	2011-05-24 12:47:12 UTC (rev 4444)
@@ -104,6 +104,10 @@
   void initContextMenu();
   void popupContextMenu();
 
+  void setMenuKey();
+
+  static void handleOptions(void *data);
+
 private:
   CConn* cc;
 
@@ -120,6 +124,7 @@
   typedef std::map<int, rdr::U32> DownMap;
   DownMap downKeySym;
 
+  int menuKeyCode;
   Fl_Menu_Button *contextMenu;
 };
 

Modified: trunk/vncviewer/fltk_layout.h
===================================================================
--- trunk/vncviewer/fltk_layout.h	2011-05-24 11:33:43 UTC (rev 4443)
+++ trunk/vncviewer/fltk_layout.h	2011-05-24 12:47:12 UTC (rev 4444)
@@ -99,6 +99,10 @@
 #define CHECK_MIN_WIDTH         RADIO_MIN_WIDTH
 #define CHECK_HEIGHT            RADIO_HEIGHT
 
+/* Fl_Choice */
+
+#define CHOICE_HEIGHT           INPUT_HEIGHT
+
 /* Fl_Group */
 #define GROUP_LABEL_OFFSET      FL_NORMAL_SIZE
 #define GROUP_MARGIN            12


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[4449] trunk/vncviewer
		From: <ossman_@us...> -	2011-05-26 14:48

			



                
                    
                        Revision: 4449
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4449&view=rev
Author:   ossman_
Date:     2011-05-26 14:48:29 +0000 (Thu, 26 May 2011)

Log Message:
-----------
Implement support for grabbing the keyboard when in full screen mode.

Modified Paths:
--------------
    trunk/vncviewer/CMakeLists.txt
    trunk/vncviewer/DesktopWindow.cxx
    trunk/vncviewer/DesktopWindow.h
    trunk/vncviewer/OptionsDialog.cxx
    trunk/vncviewer/OptionsDialog.h
    trunk/vncviewer/Viewport.cxx
    trunk/vncviewer/parameters.cxx
    trunk/vncviewer/parameters.h

Added Paths:
-----------
    trunk/vncviewer/cocoa.h
    trunk/vncviewer/cocoa.mm
    trunk/vncviewer/win32.c
    trunk/vncviewer/win32.h

Modified: trunk/vncviewer/CMakeLists.txt
===================================================================
--- trunk/vncviewer/CMakeLists.txt	2011-05-26 14:16:02 UTC (rev 4448)
+++ trunk/vncviewer/CMakeLists.txt	2011-05-26 14:48:29 UTC (rev 4449)
@@ -13,6 +13,14 @@
   keysym2ucs.c
   vncviewer.cxx)
 
+if(WIN32)
+  set(VNCVIEWER_SOURCES ${VNCVIEWER_SOURCES} win32.c)
+endif()
+
+if(APPLE)
+  set(VNCVIEWER_SOURCES ${VNCVIEWER_SOURCES} cocoa.mm)
+endif()
+
 add_executable(vncviewer ${VNCVIEWER_SOURCES})
 
 target_link_libraries(vncviewer rfb network rdr os Xregion ${FLTK_LIBRARIES} ${GETTEXT_LIBRARIES})

Modified: trunk/vncviewer/DesktopWindow.cxx
===================================================================
--- trunk/vncviewer/DesktopWindow.cxx	2011-05-26 14:16:02 UTC (rev 4448)
+++ trunk/vncviewer/DesktopWindow.cxx	2011-05-26 14:48:29 UTC (rev 4449)
@@ -22,12 +22,23 @@
 #include <string.h>
 
 #include <FL/Fl_Scroll.H>
+#include <FL/x.H>
 
 #include <rfb/LogWriter.h>
 
 #include "DesktopWindow.h"
+#include "OptionsDialog.h"
 #include "i18n.h"
+#include "parameters.h"
 
+#ifdef WIN32
+#include "win32.h"
+#endif
+
+#ifdef __APPLE__
+#include "cocoa.h"
+#endif
+
 using namespace rfb;
 
 extern void exit_vncviewer();
@@ -56,6 +67,8 @@
 
   setName(name);
 
+  OptionsDialog::addCallback(handleOptions, this);
+
   show();
 
   // The window manager might give us an initial window size that is different
@@ -68,6 +81,12 @@
 
 DesktopWindow::~DesktopWindow()
 {
+  // Unregister all timeouts in case they get a change tro trigger
+  // again later when this object is already gone.
+  Fl::remove_timeout(handleGrab, this);
+
+  OptionsDialog::removeCallback(handleOptions);
+
   // FLTK automatically deletes all child widgets, so we shouldn't touch
   // them ourselves here
 }
@@ -152,7 +171,132 @@
 }
 
 
+int DesktopWindow::handle(int event)
+{
+  switch (event) {
+#ifdef HAVE_FLTK_FULLSCREEN
+  case FL_FOCUS:
+    // FIXME: We reassert the keyboard grabbing on focus/unfocus as FLTK
+    //        releases the grab when someone calls Fl::grab(0)
+  case FL_FULLSCREEN:
+    if (!fullscreenSystemKeys)
+      break;
+
+    if (fullscreen_active())
+      grabKeyboard();
+    else
+      ungrabKeyboard();
+
+    break;
+  case FL_UNFOCUS:
+    // FIXME: We need to relinquish control when the entire window loses
+    //        focus as it seems to interfere with the WM:s ability to handle
+    //        interactions with popups' window decorations.
+    ungrabKeyboard();
+    break;
+#endif
+  case FL_SHORTCUT:
+    // Sometimes the focus gets out of whack and we fall through to the
+    // shortcut dispatching. Try to make things sane again...
+    if (Fl::focus() == NULL) {
+      take_focus();
+      Fl::handle(FL_KEYDOWN, this);
+    }
+    return 1;
+  }
+
+  return Fl_Window::handle(event);
+}
+
+
+void DesktopWindow::grabKeyboard()
+{
+  // Grabbing the keyboard is fairly safe as FLTK reroutes events to the
+  // correct widget regardless of which low level window got the system
+  // event.
+
+  // FIXME: Push this stuff into FLTK.
+
+#if defined(WIN32)
+  int ret;
+  
+  ret = win32_enable_lowlevel_keyboard(fl_xid(this));
+  if (ret != 0)
+    vlog.error(_("Failure grabbing keyboard"));
+#elif defined(__APPLE__)
+  int ret;
+  
+  ret = cocoa_capture_display(this);
+  if (ret != 0)
+    vlog.error(_("Failure grabbing keyboard"));
+#else
+  int ret;
+
+  ret = XGrabKeyboard(fl_display, fl_xid(this), True,
+                      GrabModeAsync, GrabModeAsync, fl_event_time);
+  if (ret) {
+    if (ret == AlreadyGrabbed) {
+      // It seems like we can race with the WM in some cases.
+      // Try again in a bit.
+      if (!Fl::has_timeout(handleGrab, this))
+        Fl::add_timeout(0.500, handleGrab, this);
+    } else {
+      vlog.error(_("Failure grabbing keyboard"));
+    }
+  }
+#endif
+}
+
+
+void DesktopWindow::ungrabKeyboard()
+{
+  Fl::remove_timeout(handleGrab, this);
+
+#if defined(WIN32)
+  win32_disable_lowlevel_keyboard(fl_xid(this));
+#elif defined(__APPLE__)
+  cocoa_release_display(this);
+#else
+  // FLTK has a grab so lets not mess with it
+  if (Fl::grab())
+    return;
+
+  XUngrabKeyboard(fl_display, fl_event_time);
+#endif
+}
+
+
+void DesktopWindow::handleGrab(void *data)
+{
+  DesktopWindow *self = (DesktopWindow*)data;
+
+  assert(self);
+
+#ifdef HAVE_FLTK_FULLSCREEN
+  if (!fullscreenSystemKeys)
+    return;
+  if (!self->fullscreen_active())
+    return;
+
+  self->grabKeyboard();
+#endif
+}
+
+
 void DesktopWindow::handleClose(Fl_Widget *wnd, void *data)
 {
   exit_vncviewer();
 }
+
+
+void DesktopWindow::handleOptions(void *data)
+{
+  DesktopWindow *self = (DesktopWindow*)data;
+
+#ifdef HAVE_FLTK_FULLSCREEN
+  if (self->fullscreen_active() && fullscreenSystemKeys)
+    self->grabKeyboard();
+  else
+    self->ungrabKeyboard();
+#endif
+}

Modified: trunk/vncviewer/DesktopWindow.h
===================================================================
--- trunk/vncviewer/DesktopWindow.h	2011-05-26 14:16:02 UTC (rev 4448)
+++ trunk/vncviewer/DesktopWindow.h	2011-05-26 14:48:29 UTC (rev 4449)
@@ -68,9 +68,18 @@
   // Fl_Window callback methods
   void resize(int x, int y, int w, int h);
 
+  int handle(int event);
+
 private:
+  void grabKeyboard();
+  void ungrabKeyboard();
+
+  static void handleGrab(void *data);
+
   static void handleClose(Fl_Widget *wnd, void *data);
 
+  static void handleOptions(void *data);
+
 private:
   Viewport *viewport;
 };

Modified: trunk/vncviewer/OptionsDialog.cxx
===================================================================
--- trunk/vncviewer/OptionsDialog.cxx	2011-05-26 14:16:02 UTC (rev 4448)
+++ trunk/vncviewer/OptionsDialog.cxx	2011-05-26 14:48:29 UTC (rev 4449)
@@ -259,6 +259,7 @@
   acceptClipboardCheckbox->value(acceptClipboard);
   sendClipboardCheckbox->value(sendClipboard);
   sendPrimaryCheckbox->value(sendPrimary);
+  systemKeysCheckbox->value(fullscreenSystemKeys);
 
   menuKeyChoice->value(0);
 
@@ -352,6 +353,7 @@
   acceptClipboard.setParam(acceptClipboardCheckbox->value());
   sendClipboard.setParam(sendClipboardCheckbox->value());
   sendPrimary.setParam(sendPrimaryCheckbox->value());
+  fullscreenSystemKeys.setParam(systemKeysCheckbox->value());
 
   if (menuKeyChoice->value() == 0)
     menuKey.setParam("");
@@ -683,6 +685,12 @@
                                                      _("Send primary selection and cut buffer as clipboard")));
   ty += CHECK_HEIGHT + TIGHT_MARGIN;
 
+  systemKeysCheckbox = new Fl_Check_Button(LBLRIGHT(tx, ty,
+                                                    CHECK_MIN_WIDTH,
+                                                    CHECK_HEIGHT,
+                                                    _("Pass system keys directly to server (full screen)")));
+  ty += CHECK_HEIGHT + TIGHT_MARGIN;
+
   menuKeyChoice = new Fl_Choice(LBLLEFT(tx, ty, 150, CHOICE_HEIGHT, _("Menu key")));
 
   menuKeyChoice->add(_("None"), 0, NULL, (void*)0, FL_MENU_DIVIDER);

Modified: trunk/vncviewer/OptionsDialog.h
===================================================================
--- trunk/vncviewer/OptionsDialog.h	2011-05-26 14:16:02 UTC (rev 4448)
+++ trunk/vncviewer/OptionsDialog.h	2011-05-26 14:48:29 UTC (rev 4449)
@@ -105,6 +105,7 @@
   Fl_Check_Button *acceptClipboardCheckbox;
   Fl_Check_Button *sendClipboardCheckbox;
   Fl_Check_Button *sendPrimaryCheckbox;
+  Fl_Check_Button *systemKeysCheckbox;
   Fl_Choice *menuKeyChoice;
 
   /* Misc. */

Modified: trunk/vncviewer/Viewport.cxx
===================================================================
--- trunk/vncviewer/Viewport.cxx	2011-05-26 14:16:02 UTC (rev 4448)
+++ trunk/vncviewer/Viewport.cxx	2011-05-26 14:48:29 UTC (rev 4449)
@@ -605,6 +605,13 @@
   const Fl_Menu_Item *m;
   char buffer[1024];
 
+  // FIXME: Hacky workaround for the fact that menus grab and ungrab the
+  //        keyboard. Releasing focus here triggers some events on ungrab
+  //        that DesktopWindow can catch and trigger some voodoo.
+  //        See DesktopWindow::handle().
+  if (window()->contains(Fl::focus()))
+    Fl::focus(NULL);
+
   contextMenu->position(Fl::event_x(), Fl::event_y());
 
   m = contextMenu->popup();

Added: trunk/vncviewer/cocoa.h
===================================================================
--- trunk/vncviewer/cocoa.h	                        (rev 0)
+++ trunk/vncviewer/cocoa.h	2011-05-26 14:48:29 UTC (rev 4449)
@@ -0,0 +1,25 @@
+/* Copyright 2011 Pierre Ossman <ossman@...> for Cendio AB
+ * 
+ * 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 __VNCVIEWER_COCOA_H__
+#define __VNCVIEWER_COCOA_H__
+
+int cocoa_capture_display(Fl_Window *win);
+void cocoa_release_display(Fl_Window *win);
+
+#endif

Added: trunk/vncviewer/cocoa.mm
===================================================================
--- trunk/vncviewer/cocoa.mm	                        (rev 0)
+++ trunk/vncviewer/cocoa.mm	2011-05-26 14:48:29 UTC (rev 4449)
@@ -0,0 +1,69 @@
+/* Copyright 2011 Pierre Ossman <ossman@...> for Cendio AB
+ * 
+ * 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 <FL/Fl.H>
+#include <FL/Fl_Window.H>
+#include <FL/x.H>
+
+#import <Cocoa/Cocoa.h>
+
+int cocoa_capture_display(Fl_Window *win)
+{
+  NSWindow *nsw;
+
+  nsw = (NSWindow*)fl_xid(win);
+
+  // Already captured?
+  if ([nsw level] == CGShieldingWindowLevel())
+    return 0;
+
+  if (CGDisplayCapture(kCGDirectMainDisplay) != kCGErrorSuccess)
+    return 1;
+
+  [nsw setLevel:CGShieldingWindowLevel()];
+
+  return 0;
+}
+
+void cocoa_release_display(Fl_Window *win)
+{
+  NSWindow *nsw;
+  int newlevel;
+
+  CGDisplayRelease(kCGDirectMainDisplay);
+
+  nsw = (NSWindow*)fl_xid(win);
+
+  // Someone else has already changed the level of this window
+  if ([nsw level] != CGShieldingWindowLevel())
+    return;
+
+  // FIXME: Store the previous level somewhere so we don't have to hard
+  //        code a level here.
+#ifdef HAVE_FLTK_FULLSCREEN
+  if (win->fullscreen_active() && win->contains(Fl::focus()))
+    newlevel = NSStatusWindowLevel;
+  else
+#endif
+    newlevel = NSNormalWindowLevel;
+
+  // Only change if different as the level change also moves the window
+  // to the top of that level.
+  if ([nsw level] != newlevel)
+    [nsw setLevel:newlevel];
+}

Modified: trunk/vncviewer/parameters.cxx
===================================================================
--- trunk/vncviewer/parameters.cxx	2011-05-26 14:16:02 UTC (rev 4448)
+++ trunk/vncviewer/parameters.cxx	2011-05-26 14:48:29 UTC (rev 4449)
@@ -88,3 +88,8 @@
 StringParameter menuKey("MenuKey", "The key which brings up the popup menu",
                         "F8");
 
+BoolParameter fullscreenSystemKeys("FullscreenSystemKeys",
+                                   "Pass special keys (like Alt+Tab) directly "
+                                   "to the server when in full screen mode.",
+                                   true);
+

Modified: trunk/vncviewer/parameters.h
===================================================================
--- trunk/vncviewer/parameters.h	2011-05-26 14:16:02 UTC (rev 4448)
+++ trunk/vncviewer/parameters.h	2011-05-26 14:48:29 UTC (rev 4449)
@@ -50,4 +50,6 @@
 
 extern rfb::StringParameter menuKey;
 
+extern rfb::BoolParameter fullscreenSystemKeys;
+
 #endif

Copied: trunk/vncviewer/win32.c (from rev 4444, trunk/win/rfb_win32/LowLevelKeyEvents.cxx)
===================================================================
--- trunk/vncviewer/win32.c	                        (rev 0)
+++ trunk/vncviewer/win32.c	2011-05-26 14:48:29 UTC (rev 4449)
@@ -0,0 +1,115 @@
+/* Copyright (C) 2002-2005 RealVNC Ltd.  All Rights Reserved.
+ * Copyright 2011 Pierre Ossman <ossman@...> for Cendio AB
+ * 
+ * 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>
+
+static HANDLE thread;
+static DWORD thread_id;
+
+static HHOOK hook = 0;
+static HWND target_wnd = 0;
+
+static int is_system_hotkey(int vkCode) {
+  switch (vkCode) {
+  case VK_LWIN:
+  case VK_RWIN:
+  case VK_SNAPSHOT:
+    return 1;
+  case VK_TAB:
+    if (GetAsyncKeyState(VK_MENU) & 0x8000)
+      return 1;
+  case VK_ESCAPE:
+    if (GetAsyncKeyState(VK_MENU) & 0x8000)
+      return 1;
+    if (GetAsyncKeyState(VK_CONTROL) & 0x8000)
+      return 1;
+  }
+  return 0;
+}
+
+static LRESULT CALLBACK keyboard_hook(int nCode, WPARAM wParam, LPARAM lParam)
+{
+  if (nCode >= 0) {
+    KBDLLHOOKSTRUCT* msgInfo = (KBDLLHOOKSTRUCT*)lParam;
+
+    // Grabbing everything seems to mess up some keyboard state that
+    // FLTK relies on, so just grab the keys that we normally cannot.
+    if (is_system_hotkey(msgInfo->vkCode)) {
+      PostMessage(target_wnd, wParam, msgInfo->vkCode,
+                  (msgInfo->scanCode & 0xff) << 16 |
+                  (msgInfo->flags & 0xff) << 24);
+      return 1;
+    }
+  }
+
+  return CallNextHookEx(hook, nCode, wParam, lParam);
+}
+
+static DWORD WINAPI keyboard_thread(LPVOID data)
+{
+  MSG msg;
+
+  target_wnd = (HWND)data;
+
+  // Make sure a message queue is created
+  PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE | PM_NOYIELD);
+
+  hook = SetWindowsHookEx(WH_KEYBOARD_LL, keyboard_hook, GetModuleHandle(0), 0);
+  // If something goes wrong then there is not much we can do.
+  // Just sit around and wait for WM_QUIT...
+
+  while (GetMessage(&msg, NULL, 0, 0));
+
+  if (hook)
+    UnhookWindowsHookEx(hook);
+
+  target_wnd = 0;
+
+  return 0;
+}
+
+int win32_enable_lowlevel_keyboard(HWND hwnd)
+{
+  // Only one target at a time for now
+  if (thread != NULL) {
+    if (hwnd == target_wnd)
+      return 0;
+
+    return 1;
+  }
+
+  // We create a separate thread as it is crucial that hooks are processed
+  // in a timely manner.
+  thread = CreateThread(NULL, 0, keyboard_thread, hwnd, 0, &thread_id);
+  if (thread == NULL)
+    return 1;
+
+  return 0;
+}
+
+void win32_disable_lowlevel_keyboard(HWND hwnd)
+{
+  if (hwnd != target_wnd)
+    return;
+
+  PostThreadMessage(thread_id, WM_QUIT, 0, 0);
+
+  CloseHandle(thread);
+  thread = NULL;
+}

Copied: trunk/vncviewer/win32.h (from rev 4444, trunk/win/rfb_win32/LowLevelKeyEvents.h)
===================================================================
--- trunk/vncviewer/win32.h	                        (rev 0)
+++ trunk/vncviewer/win32.h	2011-05-26 14:48:29 UTC (rev 4449)
@@ -0,0 +1,30 @@
+/* Copyright (C) 2002-2005 RealVNC Ltd.  All Rights Reserved.
+ * Copyright 2011 Pierre Ossman <ossman@...> for Cendio AB
+ * 
+ * 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 __VNCVIEWER_WIN32_H__
+#define __VNCVIEWER_WIN32_H__
+
+extern "C" {
+
+int win32_enable_lowlevel_keyboard(HWND hwnd);
+void win32_disable_lowlevel_keyboard(HWND hwnd);
+
+};
+
+#endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[4454] trunk/vncviewer
		From: <ossman_@us...> -	2011-05-26 15:39

			



                
                    
                        Revision: 4454
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4454&view=rev
Author:   ossman_
Date:     2011-05-26 15:39:41 +0000 (Thu, 26 May 2011)

Log Message:
-----------
Make sure we can handle clipboard data of any size.

Modified Paths:
--------------
    trunk/vncviewer/CConn.cxx
    trunk/vncviewer/Viewport.cxx

Modified: trunk/vncviewer/CConn.cxx
===================================================================
--- trunk/vncviewer/CConn.cxx	2011-05-26 14:59:32 UTC (rev 4453)
+++ trunk/vncviewer/CConn.cxx	2011-05-26 15:39:41 UTC (rev 4454)
@@ -339,18 +339,25 @@
 
 void CConn::serverCutText(const char* str, rdr::U32 len)
 {
-  char buffer[1024];
-  int ret;
+  char *buffer;
+  int size, ret;
 
-  ret = fl_utf8froma(buffer, sizeof(buffer), str, len);
-  if (ret >= sizeof(buffer)) {
-    vlog.error(_("Clipboard buffer overflow!"));
+  size = fl_utf8froma(NULL, 0, str, len);
+  if (size <= 0)
     return;
-  }
 
+  size++;
+
+  buffer = new char[size];
+
+  ret = fl_utf8froma(buffer, size, str, len);
+  assert(ret < size);
+
   vlog.debug("Got clipboard data: '%s'", buffer);
 
   Fl::copy(buffer, ret, 1);
+
+  delete [] buffer;
 }
 
 // We start timing on beginRect and stop timing on endRect, to

Modified: trunk/vncviewer/Viewport.cxx
===================================================================
--- trunk/vncviewer/Viewport.cxx	2011-05-26 14:59:32 UTC (rev 4453)
+++ trunk/vncviewer/Viewport.cxx	2011-05-26 15:39:41 UTC (rev 4454)
@@ -192,22 +192,27 @@
 
 int Viewport::handle(int event)
 {
-  char buffer[1024];
+  char *buffer;
   int ret;
   int buttonMask, wheelMask;
   DownMap::const_iterator iter;
 
   switch (event) {
   case FL_PASTE:
+    buffer = new char[Fl::event_length() + 1];
+
     // This is documented as to ASCII, but actually does to 8859-1
-    ret = fl_utf8toa(Fl::event_text(), Fl::event_length(), buffer, sizeof(buffer));
-    if (ret >= sizeof(buffer)) {
-      vlog.error(_("Clipboard buffer overflow!"));
-      return 1;
-    }
+    ret = fl_utf8toa(Fl::event_text(), Fl::event_length(), buffer,
+                     Fl::event_length() + 1);
+    assert(ret < (Fl::event_length() + 1));
+
     vlog.debug("Sending clipboard data: '%s'", buffer);
     cc->writer()->clientCutText(buffer, ret);
+
+    delete [] buffer;
+
     return 1;
+
   case FL_ENTER:
     // Yes, we would like some pointer events please!
     return 1;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[4459] trunk/vncviewer
		From: <ossman_@us...> -	2011-06-01 09:32

			



                
                    
                        Revision: 4459
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4459&view=rev
Author:   ossman_
Date:     2011-06-01 09:31:53 +0000 (Wed, 01 Jun 2011)

Log Message:
-----------
Allow resize of the viewport widget.

Modified Paths:
--------------
    trunk/vncviewer/Viewport.cxx
    trunk/vncviewer/Viewport.h

Modified: trunk/vncviewer/Viewport.cxx
===================================================================
--- trunk/vncviewer/Viewport.cxx	2011-06-01 09:26:57 UTC (rev 4458)
+++ trunk/vncviewer/Viewport.cxx	2011-06-01 09:31:53 UTC (rev 4459)
@@ -196,6 +196,48 @@
 }
 
 
+void Viewport::resize(int x, int y, int w, int h)
+{
+  rfb::ManagedPixelBuffer* newBuffer;
+  rfb::Rect rect;
+
+  // FIXME: Resize should probably be a feature of ManagedPixelBuffer
+
+  if ((w == frameBuffer->width()) && (h == frameBuffer->height()))
+    goto end;
+
+  newBuffer = new ManagedPixelBuffer(frameBuffer->getPF(), w, h);
+  assert(newBuffer);
+
+  rect.setXYWH(0, 0,
+               __rfbmin(newBuffer->width(), frameBuffer->width()),
+               __rfbmin(newBuffer->height(), frameBuffer->height()));
+  newBuffer->imageRect(rect, frameBuffer->data, frameBuffer->getStride());
+
+  // Black out any new areas
+
+  if (newBuffer->width() > frameBuffer->width()) {
+    rect.setXYWH(frameBuffer->width(), 0,
+                 newBuffer->width() - frameBuffer->width(),
+                 newBuffer->height());
+    newBuffer->fillRect(rect, 0);
+  }
+
+  if (newBuffer->height() > frameBuffer->height()) {
+    rect.setXYWH(0, frameBuffer->height(),
+                 newBuffer->width(),
+                 newBuffer->height() - frameBuffer->height());
+    newBuffer->fillRect(rect, 0);
+  }
+
+  delete frameBuffer;
+  frameBuffer = newBuffer;
+
+end:
+  Fl_Widget::resize(x, y, w, h);
+}
+
+
 int Viewport::handle(int event)
 {
   char *buffer;

Modified: trunk/vncviewer/Viewport.h
===================================================================
--- trunk/vncviewer/Viewport.h	2011-06-01 09:26:57 UTC (rev 4458)
+++ trunk/vncviewer/Viewport.h	2011-06-01 09:31:53 UTC (rev 4459)
@@ -79,7 +79,11 @@
   }
 
   // Fl_Widget callback methods
+
   void draw();
+
+  void resize(int x, int y, int w, int h);
+
   int handle(int event);
 
 private:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[4460] trunk/vncviewer
		From: <ossman_@us...> -	2011-06-01 09:33

			



                
                    
                        Revision: 4460
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4460&view=rev
Author:   ossman_
Date:     2011-06-01 09:33:00 +0000 (Wed, 01 Jun 2011)

Log Message:
-----------
Handle framebuffer resize requests.

Modified Paths:
--------------
    trunk/vncviewer/CConn.cxx
    trunk/vncviewer/DesktopWindow.cxx
    trunk/vncviewer/DesktopWindow.h

Modified: trunk/vncviewer/CConn.cxx
===================================================================
--- trunk/vncviewer/CConn.cxx	2011-06-01 09:31:53 UTC (rev 4459)
+++ trunk/vncviewer/CConn.cxx	2011-06-01 09:33:00 UTC (rev 4460)
@@ -398,14 +398,10 @@
 
 void CConn::resizeFramebuffer()
 {
-/*
   if (!desktop)
     return;
-  if ((desktop->width() == cp.width) && (desktop->height() == cp.height))
-    return;
 
-  desktop->resize(cp.width, cp.height);
-*/
+  desktop->resizeFramebuffer(cp.width, cp.height);
 }
 
 // autoSelectFormatAndEncoding() chooses the format and encoding appropriate

Modified: trunk/vncviewer/DesktopWindow.cxx
===================================================================
--- trunk/vncviewer/DesktopWindow.cxx	2011-06-01 09:31:53 UTC (rev 4459)
+++ trunk/vncviewer/DesktopWindow.cxx	2011-06-01 09:33:00 UTC (rev 4460)
@@ -144,35 +144,53 @@
 }
 
 
-void DesktopWindow::resize(int x, int y, int w, int h)
+void DesktopWindow::resizeFramebuffer(int new_w, int new_h)
 {
-  // Deal with some scrolling corner cases:
-  //
-  // a) If the window is larger then the viewport, center the viewport.
-  // b) If the window is smaller than the viewport, make sure there is
-  //    no wasted space on the sides.
-  //
-  // FIXME: Doesn't compensate for scroll widget size properly.
-  if (w > viewport->w())
-    viewport->position((w - viewport->w()) / 2, viewport->y());
-  else {
-    if (viewport->x() > 0)
-      viewport->position(0, viewport->y());
-    else if (w > (viewport->x() + viewport->w()))
-      viewport->position(w - viewport->w(), viewport->y());
-  }
+  if ((new_w == viewport->w()) && (new_h == viewport->h()))
+    return;
 
-  // Same thing for y axis
-  if (h > viewport->h())
-    viewport->position(viewport->x(), (h - viewport->h()) / 2);
+  // Turn off size limitations for a bit while we juggle things around
+  size_range(100, 100, 0, 0);
+
+  // If we're letting the viewport match the window perfectly, then
+  // keep things that way for the new size, otherwise just keep things
+  // like they are.
+  if ((w() == viewport->w()) && (h() == viewport->h()))
+    size(new_w, new_h);
   else {
-    if (viewport->y() > 0)
-      viewport->position(viewport->x(), 0);
-    else if (h > (viewport->y() + viewport->h()))
-      viewport->position(viewport->x(), h - viewport->h());
+#ifdef HAVE_FLTK_FULLSCREEN
+    if (!fullscreen_active()) {
+#endif
+      // Make sure the window isn't too big
+      if ((w() > new_w) || (h() > new_h))
+        size(__rfbmin(w(), new_w), __rfbmin(h(), new_h));
+#ifdef HAVE_FLTK_FULLSCREEN
+    }
+#endif
   }
 
+  viewport->size(new_w, new_h);
+
+  // We might not resize the main window, so we need to manually call this
+  // to make sure the viewport is centered.
+  repositionViewport();
+
+  // Update allowed resize range
+  size_range(100, 100, new_w, new_h);
+
+  // repositionViewport() makes sure the scroll widget notices any changes
+  // in position, but it might be just the size that changes so we also
+  // need a poke here as well.
+  redraw();
+}
+
+
+void DesktopWindow::resize(int x, int y, int w, int h)
+{
   Fl_Window::resize(x, y, w, h);
+
+  // Deal with some scrolling corner cases
+  repositionViewport();
 }
 
 
@@ -291,6 +309,49 @@
 }
 
 
+void DesktopWindow::repositionViewport()
+{
+  int new_x, new_y;
+
+  // Deal with some scrolling corner cases:
+  //
+  // a) If the window is larger then the viewport, center the viewport.
+  // b) If the window is smaller than the viewport, make sure there is
+  //    no wasted space on the sides.
+  //
+  // FIXME: Doesn't compensate for scroll widget size properly.
+
+  new_x = viewport->x();
+  new_y = viewport->y();
+
+  if (w() > viewport->w())
+    new_x = (w() - viewport->w()) / 2;
+  else {
+    if (viewport->x() > 0)
+      new_x = 0;
+    else if (w() > (viewport->x() + viewport->w()))
+      new_x = w() - viewport->w();
+  }
+
+  // Same thing for y axis
+  if (h() > viewport->h())
+    new_y = (h() - viewport->h()) / 2;
+  else {
+    if (viewport->y() > 0)
+      new_y = 0;
+    else if (h() > (viewport->y() + viewport->h()))
+      new_y = h() - viewport->h();
+  }
+
+  if ((new_x != viewport->x()) || (new_y != viewport->y())) {
+    viewport->position(new_x, new_y);
+
+    // The scroll widget does not notice when you move around child widgets,
+    // so redraw everything to make sure things update.
+    redraw();
+  }
+}
+
 void DesktopWindow::handleClose(Fl_Widget *wnd, void *data)
 {
   exit_vncviewer();

Modified: trunk/vncviewer/DesktopWindow.h
===================================================================
--- trunk/vncviewer/DesktopWindow.h	2011-06-01 09:31:53 UTC (rev 4459)
+++ trunk/vncviewer/DesktopWindow.h	2011-06-01 09:33:00 UTC (rev 4460)
@@ -65,6 +65,8 @@
     viewport->copyRect(r, srcX, srcY);
   }
 
+  void resizeFramebuffer(int new_w, int new_h);
+
   // Fl_Window callback methods
   void resize(int x, int y, int w, int h);
 
@@ -76,6 +78,8 @@
 
   static void handleGrab(void *data);
 
+  void repositionViewport();
+
   static void handleClose(Fl_Widget *wnd, void *data);
 
   static void handleOptions(void *data);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[4474] trunk/vncviewer
		From: <ossman_@us...> -	2011-06-08 17:07

			



                
                    
                        Revision: 4474
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4474&view=rev
Author:   ossman_
Date:     2011-06-08 17:07:46 +0000 (Wed, 08 Jun 2011)

Log Message:
-----------
Local cursors are a pain to deal with and I doubt it's worth the effort to
keep around in the new viewer. Remove that option and the pointer rate
limiting (for similar reasons).

Modified Paths:
--------------
    trunk/vncviewer/parameters.cxx
    trunk/vncviewer/parameters.h

Modified: trunk/vncviewer/parameters.cxx
===================================================================
--- trunk/vncviewer/parameters.cxx	2011-06-08 17:04:13 UTC (rev 4473)
+++ trunk/vncviewer/parameters.cxx	2011-06-08 17:07:46 UTC (rev 4474)
@@ -21,11 +21,6 @@
 
 using namespace rfb;
 
-IntParameter pointerEventInterval("PointerEventInterval",
-                                  "Time in milliseconds to rate-limit"
-                                  " successive pointer events", 0);
-BoolParameter useLocalCursor("UseLocalCursor",
-                             "Render the mouse cursor locally", true);
 BoolParameter dotWhenNoCursor("DotWhenNoCursor",
                               "Show the dot cursor when the server sends an "
                               "invisible cursor", true);

Modified: trunk/vncviewer/parameters.h
===================================================================
--- trunk/vncviewer/parameters.h	2011-06-08 17:04:13 UTC (rev 4473)
+++ trunk/vncviewer/parameters.h	2011-06-08 17:07:46 UTC (rev 4474)
@@ -21,8 +21,6 @@
 
 #include <rfb/Configuration.h>
 
-extern rfb::IntParameter pointerEventInterval;
-extern rfb::BoolParameter useLocalCursor;
 extern rfb::BoolParameter dotWhenNoCursor;
 
 extern rfb::StringParameter passwordFile;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[4475] trunk/vncviewer
		From: <ossman_@us...> -	2011-06-08 17:21

			



                
                    
                        Revision: 4475
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4475&view=rev
Author:   ossman_
Date:     2011-06-08 17:21:48 +0000 (Wed, 08 Jun 2011)

Log Message:
-----------
Bah, not enough coffee today. I had already implemented the pointer rate
control, so it can be allowed to stay for now. And there were a bunch of
references to the local cursor option.

Modified Paths:
--------------
    trunk/vncviewer/CConn.cxx
    trunk/vncviewer/OptionsDialog.cxx
    trunk/vncviewer/OptionsDialog.h
    trunk/vncviewer/parameters.cxx
    trunk/vncviewer/parameters.h

Modified: trunk/vncviewer/CConn.cxx
===================================================================
--- trunk/vncviewer/CConn.cxx	2011-06-08 17:07:46 UTC (rev 4474)
+++ trunk/vncviewer/CConn.cxx	2011-06-08 17:21:48 UTC (rev 4475)
@@ -65,7 +65,6 @@
   cp.supportsDesktopResize = true;
   cp.supportsExtendedDesktopSize = true;
   cp.supportsDesktopRename = true;
-  cp.supportsLocalCursor = useLocalCursor;
 
   cp.customCompressLevel = customCompressLevel;
   cp.compressLevel = compressLevel;
@@ -541,8 +540,6 @@
     self->cp.qualityLevel = qualityLevel;
   }
 
-  self->cp.supportsLocalCursor = useLocalCursor;
-
   self->cp.customCompressLevel = customCompressLevel;
   self->cp.compressLevel = compressLevel;
 

Modified: trunk/vncviewer/OptionsDialog.cxx
===================================================================
--- trunk/vncviewer/OptionsDialog.cxx	2011-06-08 17:07:46 UTC (rev 4474)
+++ trunk/vncviewer/OptionsDialog.cxx	2011-06-08 17:21:48 UTC (rev 4475)
@@ -273,7 +273,6 @@
   /* Misc. */
   sharedCheckbox->value(shared);
   fullScreenCheckbox->value(fullScreen);
-  localCursorCheckbox->value(useLocalCursor);
   dotCursorCheckbox->value(dotWhenNoCursor);
 }
 
@@ -366,7 +365,6 @@
   /* Misc. */
   shared.setParam(sharedCheckbox->value());
   fullScreen.setParam(fullScreenCheckbox->value());
-  useLocalCursor.setParam(localCursorCheckbox->value());
   dotWhenNoCursor.setParam(dotCursorCheckbox->value());
 
   std::map<OptionsCallback*, void*>::const_iterator iter;
@@ -725,12 +723,6 @@
                                                   _("Full-screen mode")));
   ty += CHECK_HEIGHT + TIGHT_MARGIN;
 
-  localCursorCheckbox = new Fl_Check_Button(LBLRIGHT(tx, ty,
-                                                  CHECK_MIN_WIDTH,
-                                                  CHECK_HEIGHT,
-                                                  _("Render cursor locally")));
-  ty += CHECK_HEIGHT + TIGHT_MARGIN;
-
   dotCursorCheckbox = new Fl_Check_Button(LBLRIGHT(tx, ty,
                                                   CHECK_MIN_WIDTH,
                                                   CHECK_HEIGHT,

Modified: trunk/vncviewer/OptionsDialog.h
===================================================================
--- trunk/vncviewer/OptionsDialog.h	2011-06-08 17:07:46 UTC (rev 4474)
+++ trunk/vncviewer/OptionsDialog.h	2011-06-08 17:21:48 UTC (rev 4475)
@@ -111,7 +111,6 @@
   /* Misc. */
   Fl_Check_Button *sharedCheckbox;
   Fl_Check_Button *fullScreenCheckbox;
-  Fl_Check_Button *localCursorCheckbox;
   Fl_Check_Button *dotCursorCheckbox;
 };
 

Modified: trunk/vncviewer/parameters.cxx
===================================================================
--- trunk/vncviewer/parameters.cxx	2011-06-08 17:07:46 UTC (rev 4474)
+++ trunk/vncviewer/parameters.cxx	2011-06-08 17:21:48 UTC (rev 4475)
@@ -21,6 +21,9 @@
 
 using namespace rfb;
 
+IntParameter pointerEventInterval("PointerEventInterval",
+                                  "Time in milliseconds to rate-limit"
+                                  " successive pointer events", 0);
 BoolParameter dotWhenNoCursor("DotWhenNoCursor",
                               "Show the dot cursor when the server sends an "
                               "invisible cursor", true);

Modified: trunk/vncviewer/parameters.h
===================================================================
--- trunk/vncviewer/parameters.h	2011-06-08 17:07:46 UTC (rev 4474)
+++ trunk/vncviewer/parameters.h	2011-06-08 17:21:48 UTC (rev 4475)
@@ -21,6 +21,7 @@
 
 #include <rfb/Configuration.h>
 
+extern rfb::IntParameter pointerEventInterval;
 extern rfb::BoolParameter dotWhenNoCursor;
 
 extern rfb::StringParameter passwordFile;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[4492] trunk/vncviewer
		From: <ossman_@us...> -	2011-06-13 11:19

			



                
                    
                        Revision: 4492
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4492&view=rev
Author:   ossman_
Date:     2011-06-13 11:19:32 +0000 (Mon, 13 Jun 2011)

Log Message:
-----------
Basic framework for more optimised, platform specific, drawing routines.

Modified Paths:
--------------
    trunk/vncviewer/Viewport.cxx
    trunk/vncviewer/Viewport.h

Added Paths:
-----------
    trunk/vncviewer/PlatformPixelBuffer.h

Added: trunk/vncviewer/PlatformPixelBuffer.h
===================================================================
--- trunk/vncviewer/PlatformPixelBuffer.h	                        (rev 0)
+++ trunk/vncviewer/PlatformPixelBuffer.h	2011-06-13 11:19:32 UTC (rev 4492)
@@ -0,0 +1,51 @@
+/* Copyright 2011 Pierre Ossman <ossman@...> for Cendio AB
+ * 
+ * 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 __PLATFORMPIXELBUFFER_H__
+#define __PLATFORMPIXELBUFFER_H__
+
+#include <rfb/PixelBuffer.h>
+
+#include <FL/fl_draw.H>
+
+class PlatformPixelBuffer: public rfb::ManagedPixelBuffer {
+public:
+  PlatformPixelBuffer(int width, int height) :
+    rfb::ManagedPixelBuffer(rfb::PixelFormat(32, 24, false, true,
+                                             255, 255, 255, 0, 8, 16),
+                            width, height)
+    {};
+
+  inline void draw(int src_x, int src_y, int x, int y, int w, int h);
+};
+
+inline void PlatformPixelBuffer::draw(int src_x, int src_y, int x, int y, int w, int h)
+{
+  int pixel_bytes, stride_bytes;
+  const uchar *buf_start;
+
+  pixel_bytes = getPF().bpp/8;
+  stride_bytes = pixel_bytes * getStride();
+  buf_start = data +
+              pixel_bytes * src_x +
+              stride_bytes * src_y;
+
+  fl_draw_image(buf_start, x, y, w, h, pixel_bytes, stride_bytes);
+}
+
+#endif

Modified: trunk/vncviewer/Viewport.cxx
===================================================================
--- trunk/vncviewer/Viewport.cxx	2011-06-10 17:29:35 UTC (rev 4491)
+++ trunk/vncviewer/Viewport.cxx	2011-06-13 11:19:32 UTC (rev 4492)
@@ -73,7 +73,7 @@
   Fl::add_clipboard_notify(handleClipboardChange, this);
 #endif
 
-  frameBuffer = new ManagedPixelBuffer(getPreferredPF(), w, h);
+  frameBuffer = new PlatformPixelBuffer(w, h);
   assert(frameBuffer);
 
   setServerPF(serverPF);
@@ -143,9 +143,7 @@
 
 const rfb::PixelFormat &Viewport::getPreferredPF()
 {
-  static PixelFormat prefPF(32, 24, false, true, 255, 255, 255, 0, 8, 16);
-
-  return prefPF;
+  return frameBuffer->getPF();
 }
 
 
@@ -260,36 +258,26 @@
 {
   int X, Y, W, H;
 
-  int pixel_bytes, stride_bytes;
-  const uchar *buf_start;
-
   // Check what actually needs updating
   fl_clip_box(x(), y(), w(), h(), X, Y, W, H);
   if ((W == 0) || (H == 0))
     return;
 
-  pixel_bytes = frameBuffer->getPF().bpp/8;
-  stride_bytes = pixel_bytes * frameBuffer->getStride();
-  buf_start = frameBuffer->data +
-              pixel_bytes * (X - x()) +
-              stride_bytes * (Y - y());
-
-  // FIXME: Check how efficient this thing really is
-  fl_draw_image(buf_start, X, Y, W, H, pixel_bytes, stride_bytes);
+  frameBuffer->draw(X - x(), Y - y(), X, Y, W, H);
 }
 
 
 void Viewport::resize(int x, int y, int w, int h)
 {
-  rfb::ManagedPixelBuffer* newBuffer;
+  PlatformPixelBuffer* newBuffer;
   rfb::Rect rect;
 
-  // FIXME: Resize should probably be a feature of ManagedPixelBuffer
+  // FIXME: Resize should probably be a feature of the pixel buffer itself
 
   if ((w == frameBuffer->width()) && (h == frameBuffer->height()))
     goto end;
 
-  newBuffer = new ManagedPixelBuffer(frameBuffer->getPF(), w, h);
+  newBuffer = new PlatformPixelBuffer(w, h);
   assert(newBuffer);
 
   rect.setXYWH(0, 0,

Modified: trunk/vncviewer/Viewport.h
===================================================================
--- trunk/vncviewer/Viewport.h	2011-06-10 17:29:35 UTC (rev 4491)
+++ trunk/vncviewer/Viewport.h	2011-06-13 11:19:32 UTC (rev 4492)
@@ -33,6 +33,14 @@
 #include <rfb/PixelBuffer.h>
 #include <rfb/PixelTransformer.h>
 
+#if defined(WIN32)
+#include "PlatformPixelBuffer.h"
+#elif defined(__APPLE__)
+#include "PlatformPixelBuffer.h"
+#else
+#include "PlatformPixelBuffer.h"
+#endif
+
 class CConn;
 
 class Viewport : public Fl_Widget {
@@ -119,7 +127,7 @@
 private:
   CConn* cc;
 
-  rfb::ManagedPixelBuffer* frameBuffer;
+  PlatformPixelBuffer* frameBuffer;
 
   rfb::PixelTransformer *pixelTrans;
   rfb::SimpleColourMap colourMap;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[4493] trunk/vncviewer
		From: <ossman_@us...> -	2011-06-13 11:23

			



                
                    
                        Revision: 4493
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4493&view=rev
Author:   ossman_
Date:     2011-06-13 11:23:08 +0000 (Mon, 13 Jun 2011)

Log Message:
-----------
Optimised drawing routines for X11, roughly based on how the old Unix viewer
did things.

Modified Paths:
--------------
    trunk/vncviewer/CMakeLists.txt
    trunk/vncviewer/Viewport.h

Added Paths:
-----------
    trunk/vncviewer/X11PixelBuffer.cxx
    trunk/vncviewer/X11PixelBuffer.h

Modified: trunk/vncviewer/CMakeLists.txt
===================================================================
--- trunk/vncviewer/CMakeLists.txt	2011-06-13 11:19:32 UTC (rev 4492)
+++ trunk/vncviewer/CMakeLists.txt	2011-06-13 11:23:08 UTC (rev 4493)
@@ -21,6 +21,10 @@
   set(VNCVIEWER_SOURCES ${VNCVIEWER_SOURCES} cocoa.mm)
 endif()
 
+if((NOT APPLE) AND (NOT WIN32))
+  set(VNCVIEWER_SOURCES ${VNCVIEWER_SOURCES} X11PixelBuffer.cxx)
+endif()
+
 add_executable(vncviewer ${VNCVIEWER_SOURCES})
 
 target_link_libraries(vncviewer rfb network rdr os Xregion ${FLTK_LIBRARIES} ${GETTEXT_LIBRARIES})

Modified: trunk/vncviewer/Viewport.h
===================================================================
--- trunk/vncviewer/Viewport.h	2011-06-13 11:19:32 UTC (rev 4492)
+++ trunk/vncviewer/Viewport.h	2011-06-13 11:23:08 UTC (rev 4493)
@@ -38,7 +38,7 @@
 #elif defined(__APPLE__)
 #include "PlatformPixelBuffer.h"
 #else
-#include "PlatformPixelBuffer.h"
+#include "X11PixelBuffer.h"
 #endif
 
 class CConn;

Added: trunk/vncviewer/X11PixelBuffer.cxx
===================================================================
--- trunk/vncviewer/X11PixelBuffer.cxx	                        (rev 0)
+++ trunk/vncviewer/X11PixelBuffer.cxx	2011-06-13 11:23:08 UTC (rev 4493)
@@ -0,0 +1,188 @@
+/* Copyright (C) 2002-2005 RealVNC Ltd.  All Rights Reserved.
+ * Copyright 2011 Pierre Ossman <ossman@...> for Cendio AB
+ * 
+ * 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 <assert.h>
+#include <stdlib.h>
+
+#include <FL/x.H>
+
+#include <rfb/LogWriter.h>
+#include <rfb/Exception.h>
+
+#include "X11PixelBuffer.h"
+
+using namespace rfb;
+
+static rfb::LogWriter vlog("PlatformPixelBuffer");
+
+static PixelFormat display_pf()
+{
+  int i;
+
+  int bpp;
+  int trueColour, bigEndian;
+  int redShift, greenShift, blueShift;
+  int redMax, greenMax, blueMax;
+
+  int nformats;
+  XPixmapFormatValues* format;
+
+  // Might not be open at this point
+  fl_open_display();
+
+  format = XListPixmapFormats(fl_display, &nformats);
+
+  for (i = 0; i < nformats; i++)
+    if (format[i].depth == fl_visual->depth) break;
+
+  if (i == nformats)
+    throw rfb::Exception("Error: display lacks pixmap format for default depth");
+
+  switch (format[i].bits_per_pixel) {
+  case 8:
+  case 16:
+  case 32:
+    bpp = format[i].bits_per_pixel;
+    break;
+  default:
+    throw rfb::Exception("Error: couldn't find suitable pixmap format");
+  }
+
+  XFree(format);
+
+  bigEndian = (ImageByteOrder(fl_display) == MSBFirst);
+  trueColour = (fl_visual->c_class == TrueColor);
+
+  if (!trueColour)
+    throw rfb::Exception("Error: only true colour displays supported");
+
+  vlog.info("Using default colormap and visual, %sdepth %d.",
+            (fl_visual->c_class == TrueColor) ? "TrueColor, " :
+            ((fl_visual->c_class == PseudoColor) ? "PseudoColor, " : ""),
+            fl_visual->depth);
+
+  redShift   = ffs(fl_visual->red_mask)   - 1;
+  greenShift = ffs(fl_visual->green_mask) - 1;
+  blueShift  = ffs(fl_visual->blue_mask)  - 1;
+  redMax     = fl_visual->red_mask   >> redShift;
+  greenMax   = fl_visual->green_mask >> greenShift;
+  blueMax    = fl_visual->blue_mask  >> blueShift;
+
+  return PixelFormat(bpp, fl_visual->depth, bigEndian, trueColour,
+                     redMax, greenMax, blueMax,
+                     redShift, greenShift, blueShift);
+}
+
+PlatformPixelBuffer::PlatformPixelBuffer(int width, int height) :
+  FullFramePixelBuffer(display_pf(), width, height, NULL, NULL),
+  shminfo(NULL), xim(NULL)
+{
+  // Might not be open at this point
+  fl_open_display();
+
+  if (!setupShm()) {
+    xim = XCreateImage(fl_display, fl_visual->visual, fl_visual->depth,
+                       ZPixmap, 0, 0, width, height, BitmapPad(fl_display), 0);
+    assert(xim);
+
+    xim->data = (char*)malloc(xim->bytes_per_line * xim->height);
+    assert(xim->data);
+  }
+
+  data = (rdr::U8*)xim->data;
+}
+
+
+PlatformPixelBuffer::~PlatformPixelBuffer()
+{
+  if (shminfo) {
+    vlog.debug("Freeing shared memory XImage");
+    shmdt(shminfo->shmaddr);
+    shmctl(shminfo->shmid, IPC_RMID, 0);
+    delete shminfo;
+    shminfo = NULL;
+  }
+
+  // XDestroyImage() will free(xim->data) if appropriate
+  if (xim)
+    XDestroyImage(xim);
+  xim = NULL;
+}
+
+
+void PlatformPixelBuffer::draw(int src_x, int src_y, int x, int y, int w, int h)
+{
+  if (shminfo)
+    XShmPutImage(fl_display, fl_window, fl_gc, xim, src_x, src_y, x, y, w, h, False);
+  else
+    XPutImage(fl_display, fl_window, fl_gc, xim, src_x, src_y, x, y, w, h);
+}
+
+
+int PlatformPixelBuffer::getStride() const
+{
+  return xim->bytes_per_line / (getPF().bpp/8);
+}
+
+
+int PlatformPixelBuffer::setupShm()
+{
+  int major, minor;
+  Bool pixmaps;
+
+  if (!XShmQueryVersion(fl_display, &major, &minor, &pixmaps))
+    return 0;
+
+  shminfo = new XShmSegmentInfo;
+
+  xim = XShmCreateImage(fl_display, fl_visual->visual, fl_visual->depth,
+                        ZPixmap, 0, shminfo, width(), height());
+  if (!xim)
+    goto free_shminfo;
+
+  shminfo->shmid = shmget(IPC_PRIVATE,
+                          xim->bytes_per_line * xim->height,
+                          IPC_CREAT|0777);
+  if (shminfo->shmid == -1)
+    goto free_xim;
+
+  shminfo->shmaddr = xim->data = (char*)shmat(shminfo->shmid, 0, 0);
+  if (shminfo->shmaddr == (char *)-1)
+    goto free_shm;
+
+  shminfo->readOnly = True;
+  XShmAttach(fl_display, shminfo);
+
+  vlog.debug("Using shared memory XImage");
+
+  return 1;
+
+free_shm:
+  shmctl(shminfo->shmid, IPC_RMID, 0);
+
+free_xim:
+  XDestroyImage(xim);
+  xim = NULL;
+
+free_shminfo:
+  delete shminfo;
+  shminfo = NULL;
+
+  return 0;
+}

Added: trunk/vncviewer/X11PixelBuffer.h
===================================================================
--- trunk/vncviewer/X11PixelBuffer.h	                        (rev 0)
+++ trunk/vncviewer/X11PixelBuffer.h	2011-06-13 11:23:08 UTC (rev 4493)
@@ -0,0 +1,47 @@
+/* Copyright 2011 Pierre Ossman <ossman@...> for Cendio AB
+ * 
+ * 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 __X11PIXELBUFFER_H__
+#define __X11PIXELBUFFER_H__
+
+#include <X11/Xlib.h>
+#include <sys/ipc.h>
+#include <sys/shm.h>
+#include <X11/extensions/XShm.h>
+
+#include <rfb/PixelBuffer.h>
+
+class PlatformPixelBuffer: public rfb::FullFramePixelBuffer {
+public:
+  PlatformPixelBuffer(int width, int height);
+  ~PlatformPixelBuffer();
+
+  void draw(int src_x, int src_y, int x, int y, int w, int h);
+
+  int getStride() const;
+
+protected:
+  int setupShm();
+
+protected:
+  XShmSegmentInfo *shminfo;
+  XImage *xim;
+};
+
+
+#endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[4494] trunk/vncviewer
		From: <ossman_@us...> -	2011-06-13 13:24

			



                
                    
                        Revision: 4494
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4494&view=rev
Author:   ossman_
Date:     2011-06-13 13:24:29 +0000 (Mon, 13 Jun 2011)

Log Message:
-----------
Optimised drawing routines for Win32, based on the old Windows viewer.

Modified Paths:
--------------
    trunk/vncviewer/CMakeLists.txt
    trunk/vncviewer/Viewport.h

Added Paths:
-----------
    trunk/vncviewer/Win32PixelBuffer.cxx
    trunk/vncviewer/Win32PixelBuffer.h

Modified: trunk/vncviewer/CMakeLists.txt
===================================================================
--- trunk/vncviewer/CMakeLists.txt	2011-06-13 11:23:08 UTC (rev 4493)
+++ trunk/vncviewer/CMakeLists.txt	2011-06-13 13:24:29 UTC (rev 4494)
@@ -21,7 +21,9 @@
   set(VNCVIEWER_SOURCES ${VNCVIEWER_SOURCES} cocoa.mm)
 endif()
 
-if((NOT APPLE) AND (NOT WIN32))
+if(WIN32)
+  set(VNCVIEWER_SOURCES ${VNCVIEWER_SOURCES} Win32PixelBuffer.cxx)
+elseif(NOT APPLE)
   set(VNCVIEWER_SOURCES ${VNCVIEWER_SOURCES} X11PixelBuffer.cxx)
 endif()
 

Modified: trunk/vncviewer/Viewport.h
===================================================================
--- trunk/vncviewer/Viewport.h	2011-06-13 11:23:08 UTC (rev 4493)
+++ trunk/vncviewer/Viewport.h	2011-06-13 13:24:29 UTC (rev 4494)
@@ -34,7 +34,7 @@
 #include <rfb/PixelTransformer.h>
 
 #if defined(WIN32)
-#include "PlatformPixelBuffer.h"
+#include "Win32PixelBuffer.h"
 #elif defined(__APPLE__)
 #include "PlatformPixelBuffer.h"
 #else

Added: trunk/vncviewer/Win32PixelBuffer.cxx
===================================================================
--- trunk/vncviewer/Win32PixelBuffer.cxx	                        (rev 0)
+++ trunk/vncviewer/Win32PixelBuffer.cxx	2011-06-13 13:24:29 UTC (rev 4494)
@@ -0,0 +1,96 @@
+/* Copyright (C) 2002-2005 RealVNC Ltd.  All Rights Reserved.
+ * Copyright 2011 Pierre Ossman <ossman@...> for Cendio AB
+ * 
+ * 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 <assert.h>
+#include <stdlib.h>
+
+#include <windows.h>
+
+#include <FL/x.H>
+
+#include <rfb/LogWriter.h>
+#include <rfb/Exception.h>
+
+#include "Win32PixelBuffer.h"
+
+using namespace rfb;
+
+static rfb::LogWriter vlog("PlatformPixelBuffer");
+
+struct BitmapInfo {
+  BITMAPINFOHEADER bmiHeader;
+  union {
+    struct {
+      DWORD red;
+      DWORD green;
+      DWORD blue;
+    } mask;
+    RGBQUAD color[256];
+  };
+};
+
+PlatformPixelBuffer::PlatformPixelBuffer(int width, int height) :
+  FullFramePixelBuffer(rfb::PixelFormat(32, 24, false, true,
+                                        255, 255, 255, 16, 8, 0),
+                       width, height, NULL, NULL),
+  bitmap(NULL)
+{
+  BITMAPINFOHEADER bih;
+
+  memset(&bih, 0, sizeof(bih));
+
+  bih.biSize         = sizeof(BITMAPINFOHEADER);
+  bih.biBitCount     = getPF().bpp;
+  bih.biSizeImage    = (getPF().bpp / 8) * width * height;
+  bih.biPlanes       = 1;
+  bih.biWidth        = width;
+  bih.biHeight       = -height; // Negative to get top-down
+  bih.biCompression  = BI_RGB;
+
+  bitmap = CreateDIBSection(NULL, (BITMAPINFO*)&bih,
+                            DIB_RGB_COLORS, (void**)&data, NULL, 0);
+  if (!bitmap) {
+    int err = GetLastError();
+    throw rdr::SystemException("unable to create DIB section", err);
+  }
+}
+
+
+PlatformPixelBuffer::~PlatformPixelBuffer()
+{
+  DeleteObject(bitmap);
+}
+
+
+void PlatformPixelBuffer::draw(int src_x, int src_y, int x, int y, int w, int h)
+{
+  HDC dc;
+
+  dc = CreateCompatibleDC(fl_gc);
+  if (!dc)
+    throw rdr::SystemException("CreateCompatibleDC failed", GetLastError());
+
+  if (!SelectObject(dc, bitmap))
+    throw rdr::SystemException("SelectObject failed", GetLastError());
+
+  if (!BitBlt(fl_gc, x, y, w, h, dc, src_x, src_y, SRCCOPY))
+    throw rdr::SystemException("BitBlt failed", GetLastError());
+
+  DeleteDC(dc);
+}

Added: trunk/vncviewer/Win32PixelBuffer.h
===================================================================
--- trunk/vncviewer/Win32PixelBuffer.h	                        (rev 0)
+++ trunk/vncviewer/Win32PixelBuffer.h	2011-06-13 13:24:29 UTC (rev 4494)
@@ -0,0 +1,36 @@
+/* Copyright 2011 Pierre Ossman <ossman@...> for Cendio AB
+ * 
+ * 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 __WIN32PIXELBUFFER_H__
+#define __WIN32PIXELBUFFER_H__
+
+#include <rfb/PixelBuffer.h>
+
+class PlatformPixelBuffer: public rfb::FullFramePixelBuffer {
+public:
+  PlatformPixelBuffer(int width, int height);
+  ~PlatformPixelBuffer();
+
+  void draw(int src_x, int src_y, int x, int y, int w, int h);
+
+protected:
+  HBITMAP bitmap;
+};
+
+
+#endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[4496] trunk/vncviewer
		From: <ossman_@us...> -	2011-06-14 13:37

			



                
                    
                        Revision: 4496
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4496&view=rev
Author:   ossman_
Date:     2011-06-14 13:36:57 +0000 (Tue, 14 Jun 2011)

Log Message:
-----------
Implement a more robust method to handle the keyboard grab/focus voodoo as
it didn't catch some cases on OS X.

Modified Paths:
--------------
    trunk/vncviewer/DesktopWindow.cxx
    trunk/vncviewer/DesktopWindow.h
    trunk/vncviewer/Viewport.cxx
    trunk/vncviewer/cocoa.mm

Modified: trunk/vncviewer/DesktopWindow.cxx
===================================================================
--- trunk/vncviewer/DesktopWindow.cxx	2011-06-13 15:08:35 UTC (rev 4495)
+++ trunk/vncviewer/DesktopWindow.cxx	2011-06-14 13:36:57 UTC (rev 4496)
@@ -69,6 +69,9 @@
 
   OptionsDialog::addCallback(handleOptions, this);
 
+  // Hack. See below...
+  Fl::event_dispatch(&fltkHandle);
+
 #ifdef HAVE_FLTK_FULLSCREEN
   if (fullScreen)
     fullscreen();
@@ -197,9 +200,6 @@
 {
   switch (event) {
 #ifdef HAVE_FLTK_FULLSCREEN
-  case FL_FOCUS:
-    // FIXME: We reassert the keyboard grabbing on focus/unfocus as FLTK
-    //        releases the grab when someone calls Fl::grab(0)
   case FL_FULLSCREEN:
     if (event == FL_FULLSCREEN)
       fullScreen.setParam(fullscreen_active());
@@ -213,12 +213,6 @@
       ungrabKeyboard();
 
     break;
-  case FL_UNFOCUS:
-    // FIXME: We need to relinquish control when the entire window loses
-    //        focus as it seems to interfere with the WM:s ability to handle
-    //        interactions with popups' window decorations.
-    ungrabKeyboard();
-    break;
 #endif
   case FL_SHORTCUT:
     // Sometimes the focus gets out of whack and we fall through to the
@@ -234,6 +228,46 @@
 }
 
 
+int DesktopWindow::fltkHandle(int event, Fl_Window *win)
+{
+  int ret;
+
+  ret = Fl::handle_(event, win);
+
+#ifdef HAVE_FLTK_FULLSCREEN
+  // This is hackish and the result of the dodgy focus handling in FLTK.
+  // The basic problem is that FLTK's view of focus and the system's tend
+  // to differ, and as a result we do not see all the FL_FOCUS events we
+  // need. Fortunately we can grab them here...
+
+  DesktopWindow *dw = dynamic_cast<DesktopWindow*>(win);
+
+  if (dw && fullscreenSystemKeys) {
+    switch (event) {
+    case FL_FOCUS:
+      // FIXME: We reassert the keyboard grabbing on focus as FLTK there are
+      //        some issues we need to work around:
+      //        a) Fl::grab(0) on X11 will release the keyboard grab for us.
+      //        b) Gaining focus on the system level causes FLTK to switch
+      //           window level on OS X.
+      if (dw->fullscreen_active())
+        dw->grabKeyboard();
+      break;
+
+      case FL_UNFOCUS:
+      // FIXME: We need to relinquish control when the entire window loses
+      //        focus as it is very tied to this specific window on some
+      //        platforms and we want to be able to open subwindows.
+      dw->ungrabKeyboard();
+      break;
+    }
+  }
+#endif
+
+  return ret;
+}
+
+
 void DesktopWindow::grabKeyboard()
 {
   // Grabbing the keyboard is fairly safe as FLTK reroutes events to the

Modified: trunk/vncviewer/DesktopWindow.h
===================================================================
--- trunk/vncviewer/DesktopWindow.h	2011-06-13 15:08:35 UTC (rev 4495)
+++ trunk/vncviewer/DesktopWindow.h	2011-06-14 13:36:57 UTC (rev 4496)
@@ -72,6 +72,8 @@
   int handle(int event);
 
 private:
+  static int fltkHandle(int event, Fl_Window *win);
+
   void grabKeyboard();
   void ungrabKeyboard();
 

Modified: trunk/vncviewer/Viewport.cxx
===================================================================
--- trunk/vncviewer/Viewport.cxx	2011-06-13 15:08:35 UTC (rev 4495)
+++ trunk/vncviewer/Viewport.cxx	2011-06-14 13:36:57 UTC (rev 4496)
@@ -740,13 +740,6 @@
   const Fl_Menu_Item *m;
   char buffer[1024];
 
-  // FIXME: Hacky workaround for the fact that menus grab and ungrab the
-  //        keyboard. Releasing focus here triggers some events on ungrab
-  //        that DesktopWindow can catch and trigger some voodoo.
-  //        See DesktopWindow::handle().
-  if (window()->contains(Fl::focus()))
-    Fl::focus(NULL);
-
   // Make sure the menu is reset to its initial state between goes or
   // it will start up highlighting the previously selected entry.
   contextMenu->value(-1);

Modified: trunk/vncviewer/cocoa.mm
===================================================================
--- trunk/vncviewer/cocoa.mm	2011-06-13 15:08:35 UTC (rev 4495)
+++ trunk/vncviewer/cocoa.mm	2011-06-14 13:36:57 UTC (rev 4496)
@@ -22,19 +22,24 @@
 
 #import <Cocoa/Cocoa.h>
 
+static bool captured = false;
+
 int cocoa_capture_display(Fl_Window *win)
 {
   NSWindow *nsw;
 
   nsw = (NSWindow*)fl_xid(win);
 
-  // Already captured?
+  if (!captured) {
+    if (CGDisplayCapture(kCGDirectMainDisplay) != kCGErrorSuccess)
+      return 1;
+
+    captured = true;
+  }
+
   if ([nsw level] == CGShieldingWindowLevel())
     return 0;
 
-  if (CGDisplayCapture(kCGDirectMainDisplay) != kCGErrorSuccess)
-    return 1;
-
   [nsw setLevel:CGShieldingWindowLevel()];
 
   return 0;
@@ -45,8 +50,11 @@
   NSWindow *nsw;
   int newlevel;
 
-  CGDisplayRelease(kCGDirectMainDisplay);
+  if (captured)
+    CGDisplayRelease(kCGDirectMainDisplay);
 
+  captured = false;
+
   nsw = (NSWindow*)fl_xid(win);
 
   // Someone else has already changed the level of this window


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[4504] trunk/vncviewer
		From: <ossman_@us...> -	2011-06-17 07:36

			



                
                    
                        Revision: 4504
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4504&view=rev
Author:   ossman_
Date:     2011-06-17 07:35:56 +0000 (Fri, 17 Jun 2011)

Log Message:
-----------
Implement optimised drawing operations for OS X. Didn't see any reduction in
CPU usage unfortunately, but at least we're now using the native pixel format
of our server which avoids a conversion on the server side.

Modified Paths:
--------------
    trunk/vncviewer/CMakeLists.txt
    trunk/vncviewer/Viewport.h

Added Paths:
-----------
    trunk/vncviewer/OSXPixelBuffer.cxx
    trunk/vncviewer/OSXPixelBuffer.h

Modified: trunk/vncviewer/CMakeLists.txt
===================================================================
--- trunk/vncviewer/CMakeLists.txt	2011-06-17 07:33:28 UTC (rev 4503)
+++ trunk/vncviewer/CMakeLists.txt	2011-06-17 07:35:56 UTC (rev 4504)
@@ -23,7 +23,9 @@
 
 if(WIN32)
   set(VNCVIEWER_SOURCES ${VNCVIEWER_SOURCES} Win32PixelBuffer.cxx)
-elseif(NOT APPLE)
+elseif(APPLE)
+  set(VNCVIEWER_SOURCES ${VNCVIEWER_SOURCES} OSXPixelBuffer.cxx)
+else()
   set(VNCVIEWER_SOURCES ${VNCVIEWER_SOURCES} X11PixelBuffer.cxx)
 endif()
 

Added: trunk/vncviewer/OSXPixelBuffer.cxx
===================================================================
--- trunk/vncviewer/OSXPixelBuffer.cxx	                        (rev 0)
+++ trunk/vncviewer/OSXPixelBuffer.cxx	2011-06-17 07:35:56 UTC (rev 4504)
@@ -0,0 +1,104 @@
+/* Copyright 2011 Pierre Ossman <ossman@...> for Cendio AB
+ * 
+ * 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 <assert.h>
+
+#include <ApplicationServices/ApplicationServices.h>
+
+#include <FL/Fl_Window.H>
+#include <FL/x.H>
+
+#include <rfb/LogWriter.h>
+#include <rfb/Exception.h>
+
+#include "OSXPixelBuffer.h"
+
+using namespace rfb;
+
+static rfb::LogWriter vlog("PlatformPixelBuffer");
+
+PlatformPixelBuffer::PlatformPixelBuffer(int width, int height) :
+  ManagedPixelBuffer(rfb::PixelFormat(32, 24, false, true,
+                                      255, 255, 255, 16, 8, 0),
+                     width, height),
+  image(NULL)
+{
+  CGColorSpaceRef lut;
+  CGDataProviderRef provider;
+
+  lut = CGColorSpaceCreateDeviceRGB();
+  assert(lut);
+  provider = CGDataProviderCreateWithData(NULL, data, datasize, NULL);
+  assert(provider);
+
+  image = CGImageCreate(width, height, 8, 32, width*4, lut,
+                        kCGImageAlphaNoneSkipFirst | kCGBitmapByteOrder32Little,
+                        provider, NULL, false, kCGRenderingIntentDefault);
+  assert(image);
+
+  CGDataProviderRelease(provider);
+  CGColorSpaceRelease(lut);
+}
+
+
+PlatformPixelBuffer::~PlatformPixelBuffer()
+{
+  CGImageRelease((CGImageRef)image);
+}
+
+
+void PlatformPixelBuffer::draw(int src_x, int src_y, int x, int y, int w, int h)
+{
+  CGRect rect;
+  CGContextRef gc;
+  CGAffineTransform at;
+
+  gc = (CGContextRef)fl_gc;
+
+  CGContextSaveGState(gc);
+
+  // We have to use clipping to partially display an image
+
+  rect.origin.x = x - 0.5;
+  rect.origin.y = y - 0.5;
+  rect.size.width = w;
+  rect.size.height = h;
+
+  CGContextClipToRect(gc, rect);
+ 
+  // Oh the hackiness that is OS X image handling...
+  // The CGContextDrawImage() routine magically flips the images and offsets
+  // them by 0.5,0.5 in order to compensate for OS X unfamiliar coordinate
+  // system. But this breaks horribly when you set up the CTM to get the
+  // more familiar top-down system (which FLTK does), meaning we have to
+  // reset the CTM back to the identity matrix and calculate new origin
+  // coordinates.
+
+  at = CGContextGetCTM(gc);
+  CGContextScaleCTM(gc, 1, -1);
+  CGContextTranslateCTM(gc, -at.tx, -at.ty);
+
+  rect.origin.x = x - src_x;
+  rect.origin.y = Fl_Window::current()->h() - (y - src_y);
+  rect.size.width = width();
+  rect.size.height = -height(); // Negative height does _not_ flip the image
+
+  CGContextDrawImage(gc, rect, (CGImageRef)image);
+
+  CGContextRestoreGState(gc);
+}

Added: trunk/vncviewer/OSXPixelBuffer.h
===================================================================
--- trunk/vncviewer/OSXPixelBuffer.h	                        (rev 0)
+++ trunk/vncviewer/OSXPixelBuffer.h	2011-06-17 07:35:56 UTC (rev 4504)
@@ -0,0 +1,37 @@
+/* Copyright 2011 Pierre Ossman <ossman@...> for Cendio AB
+ * 
+ * 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 __OSXPIXELBUFFER_H__
+#define __OSXPIXELBUFFER_H__
+
+#include <rfb/PixelBuffer.h>
+
+class PlatformPixelBuffer: public rfb::ManagedPixelBuffer {
+public:
+  PlatformPixelBuffer(int width, int height);
+  ~PlatformPixelBuffer();
+
+  void draw(int src_x, int src_y, int x, int y, int w, int h);
+
+protected:
+  // This is really a CGImageRerf, but Apple headers conflict with FLTK
+  void *image;
+};
+
+
+#endif

Modified: trunk/vncviewer/Viewport.h
===================================================================
--- trunk/vncviewer/Viewport.h	2011-06-17 07:33:28 UTC (rev 4503)
+++ trunk/vncviewer/Viewport.h	2011-06-17 07:35:56 UTC (rev 4504)
@@ -36,11 +36,16 @@
 #if defined(WIN32)
 #include "Win32PixelBuffer.h"
 #elif defined(__APPLE__)
-#include "PlatformPixelBuffer.h"
+#include "OSXPixelBuffer.h"
 #else
 #include "X11PixelBuffer.h"
 #endif
 
+// We also have a generic version of the above, using pure FLTK:
+//
+// #include "PlatformPixelBuffer.h"
+//
+
 class CConn;
 
 class Viewport : public Fl_Widget {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[4527] trunk/vncviewer
		From: <dcommander@us...> -	2011-06-24 03:17

			



                
                    
                        Revision: 4527
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4527&view=rev
Author:   dcommander
Date:     2011-06-24 03:17:00 +0000 (Fri, 24 Jun 2011)

Log Message:
-----------
Fix build issues with Visual C++ (implemented macro version of snprintf + re-ordered headers to ensure that winsock is included ahead of windows.h)

Modified Paths:
--------------
    trunk/vncviewer/CConn.cxx
    trunk/vncviewer/DesktopWindow.cxx
    trunk/vncviewer/DesktopWindow.h
    trunk/vncviewer/OptionsDialog.cxx
    trunk/vncviewer/Viewport.cxx
    trunk/vncviewer/vncviewer.cxx
    trunk/vncviewer/win32.h

Modified: trunk/vncviewer/CConn.cxx
===================================================================
--- trunk/vncviewer/CConn.cxx	2011-06-23 22:29:24 UTC (rev 4526)
+++ trunk/vncviewer/CConn.cxx	2011-06-24 03:17:00 UTC (rev 4527)
@@ -18,7 +18,9 @@
  */
 
 #include <assert.h>
+#ifndef _WIN32
 #include <unistd.h>
+#endif
 
 #include <rfb/CMsgWriter.h>
 #include <rfb/encodings.h>
@@ -37,6 +39,10 @@
 #include "i18n.h"
 #include "parameters.h"
 
+#ifdef WIN32
+#include "win32.h"
+#endif
+
 using namespace rdr;
 using namespace rfb;
 using namespace std;

Modified: trunk/vncviewer/DesktopWindow.cxx
===================================================================
--- trunk/vncviewer/DesktopWindow.cxx	2011-06-23 22:29:24 UTC (rev 4526)
+++ trunk/vncviewer/DesktopWindow.cxx	2011-06-24 03:17:00 UTC (rev 4527)
@@ -21,9 +21,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <FL/Fl_Scroll.H>
-#include <FL/x.H>
-
 #include <rfb/LogWriter.h>
 
 #include "DesktopWindow.h"
@@ -31,6 +28,9 @@
 #include "i18n.h"
 #include "parameters.h"
 
+#include <FL/Fl_Scroll.H>
+#include <FL/x.H>
+
 #ifdef WIN32
 #include "win32.h"
 #endif

Modified: trunk/vncviewer/DesktopWindow.h
===================================================================
--- trunk/vncviewer/DesktopWindow.h	2011-06-23 22:29:24 UTC (rev 4526)
+++ trunk/vncviewer/DesktopWindow.h	2011-06-24 03:17:00 UTC (rev 4527)
@@ -22,13 +22,13 @@
 
 #include <map>
 
-#include <FL/Fl.H>
-#include <FL/Fl_Window.H>
-
 #include <rfb/Rect.h>
 
 #include "Viewport.h"
 
+#include <FL/Fl.H>
+#include <FL/Fl_Window.H>
+
 class CConn;
 
 class DesktopWindow : public Fl_Window {

Modified: trunk/vncviewer/OptionsDialog.cxx
===================================================================
--- trunk/vncviewer/OptionsDialog.cxx	2011-06-23 22:29:24 UTC (rev 4526)
+++ trunk/vncviewer/OptionsDialog.cxx	2011-06-24 03:17:00 UTC (rev 4527)
@@ -20,10 +20,6 @@
 
 #include <list>
 
-#include <FL/Fl_Tabs.H>
-#include <FL/Fl_Button.H>
-#include <FL/Fl_Return_Button.H>
-
 #include <rdr/types.h>
 #include <rfb/encodings.h>
 
@@ -38,6 +34,10 @@
 #include "i18n.h"
 #include "parameters.h"
 
+#include <FL/Fl_Tabs.H>
+#include <FL/Fl_Button.H>
+#include <FL/Fl_Return_Button.H>
+
 using namespace std;
 using namespace rdr;
 using namespace rfb;

Modified: trunk/vncviewer/Viewport.cxx
===================================================================
--- trunk/vncviewer/Viewport.cxx	2011-06-23 22:29:24 UTC (rev 4526)
+++ trunk/vncviewer/Viewport.cxx	2011-06-24 03:17:00 UTC (rev 4527)
@@ -21,9 +21,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <FL/fl_draw.H>
-#include <FL/fl_ask.H>
-
 #include <rfb/CMsgWriter.h>
 #include <rfb/LogWriter.h>
 
@@ -46,6 +43,13 @@
 #include "parameters.h"
 #include "keysym2ucs.h"
 
+#include <FL/fl_draw.H>
+#include <FL/fl_ask.H>
+
+#ifdef WIN32
+#include "win32.h"
+#endif
+
 using namespace rfb;
 using namespace rdr;
 

Modified: trunk/vncviewer/vncviewer.cxx
===================================================================
--- trunk/vncviewer/vncviewer.cxx	2011-06-23 22:29:24 UTC (rev 4526)
+++ trunk/vncviewer/vncviewer.cxx	2011-06-24 03:17:00 UTC (rev 4527)
@@ -1,6 +1,6 @@
 /* Copyright (C) 2002-2005 RealVNC Ltd.  All Rights Reserved.
  * Copyright 2011 Pierre Ossman <ossman@...> for Cendio AB
- * Copyright (C) 2011 D. R. Commander
+ * Copyright (C) 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
@@ -53,6 +53,10 @@
 #include "ServerDialog.h"
 #include "UserDialog.h"
 
+#ifdef WIN32
+#include "win32.h"
+#endif
+
 rfb::LogWriter vlog("main");
 
 using namespace network;

Modified: trunk/vncviewer/win32.h
===================================================================
--- trunk/vncviewer/win32.h	2011-06-23 22:29:24 UTC (rev 4526)
+++ trunk/vncviewer/win32.h	2011-06-24 03:17:00 UTC (rev 4527)
@@ -1,5 +1,6 @@
 /* Copyright (C) 2002-2005 RealVNC Ltd.  All Rights Reserved.
  * Copyright 2011 Pierre Ossman <ossman@...> for Cendio AB
+ * Copyright (C) 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
@@ -20,6 +21,10 @@
 #ifndef __VNCVIEWER_WIN32_H__
 #define __VNCVIEWER_WIN32_H__
 
+#ifdef _MSC_VER
+#define snprintf(str, n, format, ...) _snprintf_s(str, n, _TRUNCATE, format, __VA_ARGS__)
+#endif
+
 extern "C" {
 
 int win32_enable_lowlevel_keyboard(HWND hwnd);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[4579] trunk/vncviewer
		From: <ossman_@us...> -	2011-07-12 15:54

			



                
                    
                        Revision: 4579
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4579&view=rev
Author:   ossman_
Date:     2011-07-12 15:54:25 +0000 (Tue, 12 Jul 2011)

Log Message:
-----------
Create a proper header file for the exported functions from vncviewer.cxx.

Modified Paths:
--------------
    trunk/vncviewer/CConn.cxx
    trunk/vncviewer/DesktopWindow.cxx
    trunk/vncviewer/ServerDialog.cxx
    trunk/vncviewer/Viewport.cxx

Added Paths:
-----------
    trunk/vncviewer/vncviewer.h

Modified: trunk/vncviewer/CConn.cxx
===================================================================
--- trunk/vncviewer/CConn.cxx	2011-07-06 07:28:30 UTC (rev 4578)
+++ trunk/vncviewer/CConn.cxx	2011-07-12 15:54:25 UTC (rev 4579)
@@ -38,6 +38,7 @@
 #include "OptionsDialog.h"
 #include "i18n.h"
 #include "parameters.h"
+#include "vncviewer.h"
 
 #ifdef WIN32
 #include "win32.h"
@@ -47,8 +48,6 @@
 using namespace rfb;
 using namespace std;
 
-extern void exit_vncviewer();
-
 static rfb::LogWriter vlog("CConn");
 
 static const PixelFormat mediumColourPF(8,3,0,1,1,1,1,2,1,0);

Modified: trunk/vncviewer/DesktopWindow.cxx
===================================================================
--- trunk/vncviewer/DesktopWindow.cxx	2011-07-06 07:28:30 UTC (rev 4578)
+++ trunk/vncviewer/DesktopWindow.cxx	2011-07-12 15:54:25 UTC (rev 4579)
@@ -27,6 +27,7 @@
 #include "OptionsDialog.h"
 #include "i18n.h"
 #include "parameters.h"
+#include "vncviewer.h"
 
 #include <FL/Fl_Scroll.H>
 #include <FL/x.H>
@@ -41,8 +42,6 @@
 
 using namespace rfb;
 
-extern void exit_vncviewer();
-
 static rfb::LogWriter vlog("DesktopWindow");
 
 DesktopWindow::DesktopWindow(int w, int h, const char *name,

Modified: trunk/vncviewer/ServerDialog.cxx
===================================================================
--- trunk/vncviewer/ServerDialog.cxx	2011-07-06 07:28:30 UTC (rev 4578)
+++ trunk/vncviewer/ServerDialog.cxx	2011-07-12 15:54:25 UTC (rev 4579)
@@ -26,9 +26,8 @@
 #include "OptionsDialog.h"
 #include "fltk_layout.h"
 #include "i18n.h"
+#include "vncviewer.h"
 
-extern void about_vncviewer();
-
 ServerDialog::ServerDialog()
   : Fl_Window(400, 112, _("VNC Viewer: Connection Details"))
 {

Modified: trunk/vncviewer/Viewport.cxx
===================================================================
--- trunk/vncviewer/Viewport.cxx	2011-07-06 07:28:30 UTC (rev 4578)
+++ trunk/vncviewer/Viewport.cxx	2011-07-12 15:54:25 UTC (rev 4579)
@@ -42,6 +42,7 @@
 #include "fltk_layout.h"
 #include "parameters.h"
 #include "keysym2ucs.h"
+#include "vncviewer.h"
 
 #include <FL/fl_draw.H>
 #include <FL/fl_ask.H>
@@ -53,9 +54,6 @@
 using namespace rfb;
 using namespace rdr;
 
-extern void exit_vncviewer();
-extern void about_vncviewer();
-
 static rfb::LogWriter vlog("Viewport");
 
 // Menu constants

Added: trunk/vncviewer/vncviewer.h
===================================================================
--- trunk/vncviewer/vncviewer.h	                        (rev 0)
+++ trunk/vncviewer/vncviewer.h	2011-07-12 15:54:25 UTC (rev 4579)
@@ -0,0 +1,25 @@
+/* Copyright 2011 Pierre Ossman <ossman@...> for Cendio AB
+ * 
+ * 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 __VNCVIEWER_H__
+#define __VNCVIEWER_H__
+
+void exit_vncviewer();
+void about_vncviewer();
+
+#endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[4582] trunk/vncviewer
		From: <ossman_@us...> -	2011-07-12 16:56

			



                
                    
                        Revision: 4582
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4582&view=rev
Author:   ossman_
Date:     2011-07-12 16:56:34 +0000 (Tue, 12 Jul 2011)

Log Message:
-----------
Destroy the main UI and connection objects before popping up the fatal error
message. This avoids a lot of problems with recursion and trying to send
events over a dead socket.

Modified Paths:
--------------
    trunk/vncviewer/CConn.cxx
    trunk/vncviewer/vncviewer.cxx
    trunk/vncviewer/vncviewer.h

Modified: trunk/vncviewer/CConn.cxx
===================================================================
--- trunk/vncviewer/CConn.cxx	2011-07-12 16:10:16 UTC (rev 4581)
+++ trunk/vncviewer/CConn.cxx	2011-07-12 16:56:34 UTC (rev 4582)
@@ -198,8 +198,7 @@
     exit_vncviewer();
   } catch (rdr::Exception& e) {
     vlog.error(e.str());
-    fl_alert(e.str());
-    exit_vncviewer();
+    exit_vncviewer(e.str());
   }
 
   recursing = false;

Modified: trunk/vncviewer/vncviewer.cxx
===================================================================
--- trunk/vncviewer/vncviewer.cxx	2011-07-12 16:10:16 UTC (rev 4581)
+++ trunk/vncviewer/vncviewer.cxx	2011-07-12 16:56:34 UTC (rev 4582)
@@ -66,9 +66,15 @@
 static char aboutText[1024];
 
 static bool exitMainloop = false;
+static const char *exitError = NULL;
 
-void exit_vncviewer()
+void exit_vncviewer(const char *error)
 {
+  // Prioritise the first error we get as that is probably the most
+  // relevant one.
+  if ((error != NULL) && (exitError == NULL))
+    exitError = strdup(error);
+
   exitMainloop = true;
 }
 
@@ -267,7 +273,7 @@
       return 1;
   }
 
-  CConn cc(vncServerName);
+  CConn *cc = new CConn(vncServerName);
 
   while (!exitMainloop) {
     int next_timer;
@@ -282,5 +288,10 @@
     }
   }
 
+  delete cc;
+
+  if (exitError != NULL)
+    fl_alert(exitError);
+
   return 0;
 }

Modified: trunk/vncviewer/vncviewer.h
===================================================================
--- trunk/vncviewer/vncviewer.h	2011-07-12 16:10:16 UTC (rev 4581)
+++ trunk/vncviewer/vncviewer.h	2011-07-12 16:56:34 UTC (rev 4582)
@@ -19,7 +19,7 @@
 #ifndef __VNCVIEWER_H__
 #define __VNCVIEWER_H__
 
-void exit_vncviewer();
+void exit_vncviewer(const char *error = NULL);
 void about_vncviewer();
 
 #endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[4588] trunk/vncviewer
		From: <ossman_@us...> -	2011-07-14 14:34

			



                
                    
                        Revision: 4588
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4588&view=rev
Author:   ossman_
Date:     2011-07-14 14:34:09 +0000 (Thu, 14 Jul 2011)

Log Message:
-----------
Managed to consistently get the colour levels reversed. Fix up everything so
that it behaves like documented.

Modified Paths:
--------------
    trunk/vncviewer/CConn.cxx
    trunk/vncviewer/OptionsDialog.cxx

Modified: trunk/vncviewer/CConn.cxx
===================================================================
--- trunk/vncviewer/CConn.cxx	2011-07-14 13:35:48 UTC (rev 4587)
+++ trunk/vncviewer/CConn.cxx	2011-07-14 14:34:09 UTC (rev 4588)
@@ -50,9 +50,14 @@
 
 static rfb::LogWriter vlog("CConn");
 
-static const PixelFormat mediumColourPF(8,3,0,1,1,1,1,2,1,0);
-static const PixelFormat lowColourPF(8,6,0,1,3,3,3,4,2,0);
-static const PixelFormat verylowColourPF(8,8,0,0);
+// 8 colours (1 bit per component)
+static const PixelFormat verylowColourPF(8, 3,false, true,
+                                         1, 1, 1, 2, 1, 0);
+// 64 colours (2 bits per component)
+static const PixelFormat lowColourPF(8, 6, false, true,
+                                     3, 3, 3, 4, 2, 0);
+// 256 colours (palette)
+static const PixelFormat mediumColourPF(8, 8, false, false);
 
 CConn::CConn(const char* vncServerName)
   : serverHost(0), serverPort(0), sock(NULL), desktop(NULL),
@@ -503,11 +508,11 @@
       pf = fullColourPF;
     } else {
       if (lowColourLevel == 0)
-        pf = mediumColourPF;
+        pf = verylowColourPF;
       else if (lowColourLevel == 1)
         pf = lowColourPF;
       else
-        pf = verylowColourPF;
+        pf = mediumColourPF;
     }
     char str[256];
     pf.print(str, 256);
@@ -564,11 +569,11 @@
     pf = self->fullColourPF;
   } else {
     if (lowColourLevel == 0)
-      pf = mediumColourPF;
+      pf = verylowColourPF;
     else if (lowColourLevel == 1)
       pf = lowColourPF;
     else
-      pf = verylowColourPF;
+      pf = mediumColourPF;
   }
 
   if (!pf.equal(self->cp.pf()))

Modified: trunk/vncviewer/OptionsDialog.cxx
===================================================================
--- trunk/vncviewer/OptionsDialog.cxx	2011-07-14 13:35:48 UTC (rev 4587)
+++ trunk/vncviewer/OptionsDialog.cxx	2011-07-14 14:34:09 UTC (rev 4588)
@@ -150,13 +150,13 @@
   else {
     switch (lowColourLevel) {
     case 0:
-      mediumcolorCheckbox->setonly();
+      verylowcolorCheckbox->setonly();
       break;
     case 1:
       lowcolorCheckbox->setonly();
       break;
     case 2:
-      verylowcolorCheckbox->setonly();
+      mediumcolorCheckbox->setonly();
       break;
     }
   }
@@ -292,11 +292,11 @@
     preferredEncoding.setParam(encodingName(encodingRaw));
 
   fullColour.setParam(fullcolorCheckbox->value());
-  if (mediumcolorCheckbox->value())
+  if (verylowcolorCheckbox->value())
     lowColourLevel.setParam(0);
   else if (lowcolorCheckbox->value())
     lowColourLevel.setParam(1);
-  else if (verylowcolorCheckbox->value())
+  else if (mediumcolorCheckbox->value())
     lowColourLevel.setParam(2);
 
   customCompressLevel.setParam(compressionCheckbox->value());


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[4589] trunk/vncviewer
		From: <ossman_@us...> -	2011-07-15 08:12

			



                
                    
                        Revision: 4589
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4589&view=rev
Author:   ossman_
Date:     2011-07-15 08:11:55 +0000 (Fri, 15 Jul 2011)

Log Message:
-----------
The new viewer stores the framebuffer in a native format, instead of
converting it on each render like the old one. That means we have to change
how we deal with colour maps and make sure it is updated before any changes
to the framebuffer.

Modified Paths:
--------------
    trunk/vncviewer/Viewport.cxx
    trunk/vncviewer/Viewport.h

Modified: trunk/vncviewer/Viewport.cxx
===================================================================
--- trunk/vncviewer/Viewport.cxx	2011-07-14 14:34:09 UTC (rev 4588)
+++ trunk/vncviewer/Viewport.cxx	2011-07-15 08:11:55 UTC (rev 4589)
@@ -63,7 +63,8 @@
 
 Viewport::Viewport(int w, int h, const rfb::PixelFormat& serverPF, CConn* cc_)
   : Fl_Widget(0, 0, w, h), cc(cc_), frameBuffer(NULL), pixelTrans(NULL),
-    lastPointerPos(0, 0), lastButtonMask(0), cursor(NULL)
+    colourMapChange(false), lastPointerPos(0, 0), lastButtonMask(0),
+    cursor(NULL)
 {
 // FLTK STR #2599 must be fixed for proper dead keys support
 #ifdef HAVE_FLTK_DEAD_KEYS
@@ -103,7 +104,6 @@
   // Unregister all timeouts in case they get a change tro trigger
   // again later when this object is already gone.
   Fl::remove_timeout(handleUpdateTimeout, this);
-  Fl::remove_timeout(handleColourMap, this);
   Fl::remove_timeout(handlePointerTimeout, this);
 
 #ifdef HAVE_FLTK_CLIPBOARD
@@ -149,17 +149,17 @@
 
 
 // setColourMapEntries() changes some of the entries in the colourmap.
-// Unfortunately these messages are often sent one at a time, so we delay the
-// settings taking effect by 100ms.  This is because recalculating the internal
-// translation table can be expensive.
+// We don't actually act on these changes until we need to. This is
+// because recalculating the internal translation table can be expensive.
+// This also solves the issue of silly servers sending colour maps in
+// multiple pieces.
 void Viewport::setColourMapEntries(int firstColour, int nColours,
                                    rdr::U16* rgbs)
 {
   for (int i = 0; i < nColours; i++)
     colourMap.set(firstColour+i, rgbs[i*3], rgbs[i*3+1], rgbs[i*3+2]);
 
-  if (!Fl::has_timeout(handleColourMap, this))
-    Fl::add_timeout(0.100, handleColourMap, this);
+  colourMapChange = true;
 }
 
 
@@ -431,16 +431,16 @@
 }
 
 
-void Viewport::handleColourMap(void *data)
+void Viewport::commitColourMap()
 {
-  Viewport *self = (Viewport *)data;
+  if (pixelTrans == NULL)
+    return;
+  if (!colourMapChange)
+    return;
 
-  assert(self);
+  colourMapChange = false;
 
-  if (self->pixelTrans != NULL)
-    self->pixelTrans->setColourMapEntries(0, 0);
-
-  self->Fl_Widget::damage(FL_DAMAGE_ALL);
+  pixelTrans->setColourMapEntries(0, 0);
 }
 
 

Modified: trunk/vncviewer/Viewport.h
===================================================================
--- trunk/vncviewer/Viewport.h	2011-07-14 14:34:09 UTC (rev 4588)
+++ trunk/vncviewer/Viewport.h	2011-07-15 08:11:55 UTC (rev 4589)
@@ -70,6 +70,8 @@
   void fillRect(const rfb::Rect& r, rfb::Pixel pix) {
     if (pixelTrans) {
       rfb::Pixel pix2;
+      if (colourMapChange)
+        commitColourMap();
       pixelTrans->translatePixels(&pix, &pix2, 1);
       pix = pix2;
     }
@@ -78,13 +80,16 @@
     damageRect(r);
   }
   void imageRect(const rfb::Rect& r, void* pixels) {
-    if (pixelTrans)
+    if (pixelTrans) {
+      if (colourMapChange)
+        commitColourMap();
       pixelTrans->translateRect(pixels, r.width(),
                                 rfb::Rect(0, 0, r.width(), r.height()),
                                 frameBuffer->data, frameBuffer->getStride(),
                                 r.tl);
-    else
+    } else {
       frameBuffer->imageRect(r, pixels);
+    }
     damageRect(r);
   }
   void copyRect(const rfb::Rect& r, int srcX, int srcY) {
@@ -112,8 +117,9 @@
   };
 
   static void handleUpdateTimeout(void *data);
-  static void handleColourMap(void *data);
 
+  void commitColourMap();
+
   static void handleClipboardChange(int source, void *data);
 
   void handlePointerEvent(const rfb::Point& pos, int buttonMask);
@@ -136,6 +142,7 @@
 
   rfb::PixelTransformer *pixelTrans;
   rfb::SimpleColourMap colourMap;
+  bool colourMapChange;
 
   rfb::Region damage;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[4599] trunk/vncviewer
		From: <astrand@us...> -	2011-07-18 07:45

			



                
                    
                        Revision: 4599
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4599&view=rev
Author:   astrand
Date:     2011-07-18 07:45:14 +0000 (Mon, 18 Jul 2011)

Log Message:
-----------
Make fullscreen mode work better with some X11 WMs such as Fedora 14
Metacity by removing the size limits before attempting fullscreen. 

Modified Paths:
--------------
    trunk/vncviewer/DesktopWindow.cxx
    trunk/vncviewer/Viewport.cxx

Modified: trunk/vncviewer/DesktopWindow.cxx
===================================================================
--- trunk/vncviewer/DesktopWindow.cxx	2011-07-18 07:42:16 UTC (rev 4598)
+++ trunk/vncviewer/DesktopWindow.cxx	2011-07-18 07:45:14 UTC (rev 4599)
@@ -72,8 +72,11 @@
   Fl::event_dispatch(&fltkHandle);
 
 #ifdef HAVE_FLTK_FULLSCREEN
-  if (fullScreen)
+  if (fullScreen) {
+    // See comment in DesktopWindow::handleOptions
+    size_range(100, 100, 0, 0);
     fullscreen();
+  }
 #endif
 
   show();
@@ -200,8 +203,19 @@
   switch (event) {
 #ifdef HAVE_FLTK_FULLSCREEN
   case FL_FULLSCREEN:
-    if (event == FL_FULLSCREEN)
+    if (event == FL_FULLSCREEN) {
       fullScreen.setParam(fullscreen_active());
+      if (!fullscreen_active()) {      
+	size_range(100, 100, viewport->w(), viewport->h());
+      } else {
+	// We need to turn off the size limitations for proper
+	// fullscreen support, but in case fullscreen is activated via
+	// the WM, this is a bit of a problem. In practice, it seems to
+	// work to change the size limits after we have recieved the
+	// FL_FULLSCREEN event, at least with my Metacity. 
+	size_range(100, 100, 0, 0);
+      }
+    }
 
     if (!fullscreenSystemKeys)
       break;
@@ -400,9 +414,12 @@
   else
     self->ungrabKeyboard();
 
-  if (fullScreen && !self->fullscreen_active())
+  if (fullScreen && !self->fullscreen_active()) {
+    // Some WMs (Metacity) apparently requires that the size limits
+    // are removed before fullscreen
+    self->size_range(100, 100, 0, 0);
     self->fullscreen();
-  else if (!fullScreen && self->fullscreen_active())
+  } else if (!fullScreen && self->fullscreen_active())
     self->fullscreen_off();
 #endif
 }

Modified: trunk/vncviewer/Viewport.cxx
===================================================================
--- trunk/vncviewer/Viewport.cxx	2011-07-18 07:42:16 UTC (rev 4598)
+++ trunk/vncviewer/Viewport.cxx	2011-07-18 07:45:14 UTC (rev 4599)
@@ -884,8 +884,11 @@
   case ID_FULLSCREEN:
     if (window()->fullscreen_active())
       window()->fullscreen_off();
-    else
+    else {
+      // See comment in DesktopWindow::handleOptions
+      window()->size_range(100, 100, 0, 0);
       window()->fullscreen();
+    }
     break;
 #endif
   case ID_CTRL:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[4632] trunk/vncviewer
		From: <dcommander@us...> -	2011-08-17 02:30

			



                
                    
                        Revision: 4632
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4632&view=rev
Author:   dcommander
Date:     2011-08-17 02:30:34 +0000 (Wed, 17 Aug 2011)

Log Message:
-----------
Implement recommendations from low-level performance study (undocument compress levels 7-9 in the GUI, since they do nothing but increase CPU usage, set the default compress level to 1, and include a note that levels higher than 3 are rarely useful)

Modified Paths:
--------------
    trunk/vncviewer/OptionsDialog.cxx
    trunk/vncviewer/parameters.cxx

Modified: trunk/vncviewer/OptionsDialog.cxx
===================================================================
--- trunk/vncviewer/OptionsDialog.cxx	2011-08-17 02:27:59 UTC (rev 4631)
+++ trunk/vncviewer/OptionsDialog.cxx	2011-08-17 02:30:34 UTC (rev 4632)
@@ -511,7 +511,7 @@
 
   compressionInput = new Fl_Int_Input(tx + INDENT, ty,
                                       INPUT_HEIGHT, INPUT_HEIGHT,
-                                      _("level (1=fast, 9=best)"));
+                                      _("level (1=fast, 6=best [4-6 are rarely useful])"));
   compressionInput->align(FL_ALIGN_RIGHT);
   ty += INPUT_HEIGHT + INNER_MARGIN;
 

Modified: trunk/vncviewer/parameters.cxx
===================================================================
--- trunk/vncviewer/parameters.cxx	2011-08-17 02:27:59 UTC (rev 4631)
+++ trunk/vncviewer/parameters.cxx	2011-08-17 02:30:34 UTC (rev 4632)
@@ -51,8 +51,8 @@
                                   "Use custom compression level. "
                                   "Default if CompressLevel is specified.", false);
 IntParameter compressLevel("CompressLevel",
-                           "Use specified compression level 0 = Low, 9 = High",
-                           6);
+                           "Use specified compression level 0 = Low, 6 = High",
+                           1);
 BoolParameter noJpeg("NoJPEG",
                      "Disable lossy JPEG compression in Tight encoding.",
                      false);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[4646] trunk/vncviewer
		From: <astrand@us...> -	2011-08-23 12:04

			



                
                    
                        Revision: 4646
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4646&view=rev
Author:   astrand
Date:     2011-08-23 12:04:46 +0000 (Tue, 23 Aug 2011)
Log Message:
-----------
Make sure to include config.h in every compilation unit. Otherwise,
the necessary defines will only be visible as a side effect of
including other headers, leading to problems with things like
translations, which will fail in various places. 

Modified Paths:
--------------
    trunk/vncviewer/CConn.cxx
    trunk/vncviewer/DesktopWindow.cxx
    trunk/vncviewer/OSXPixelBuffer.cxx
    trunk/vncviewer/OptionsDialog.cxx
    trunk/vncviewer/ServerDialog.cxx
    trunk/vncviewer/UserDialog.cxx
    trunk/vncviewer/Viewport.cxx
    trunk/vncviewer/Win32PixelBuffer.cxx
    trunk/vncviewer/X11PixelBuffer.cxx
    trunk/vncviewer/parameters.cxx
    trunk/vncviewer/vncviewer.cxx

Modified: trunk/vncviewer/CConn.cxx
===================================================================
--- trunk/vncviewer/CConn.cxx	2011-08-22 11:38:35 UTC (rev 4645)
+++ trunk/vncviewer/CConn.cxx	2011-08-23 12:04:46 UTC (rev 4646)
@@ -17,6 +17,10 @@
  * USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <assert.h>
 #ifndef _WIN32
 #include <unistd.h>

Modified: trunk/vncviewer/DesktopWindow.cxx
===================================================================
--- trunk/vncviewer/DesktopWindow.cxx	2011-08-22 11:38:35 UTC (rev 4645)
+++ trunk/vncviewer/DesktopWindow.cxx	2011-08-23 12:04:46 UTC (rev 4646)
@@ -17,6 +17,10 @@
  * USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>

Modified: trunk/vncviewer/OSXPixelBuffer.cxx
===================================================================
--- trunk/vncviewer/OSXPixelBuffer.cxx	2011-08-22 11:38:35 UTC (rev 4645)
+++ trunk/vncviewer/OSXPixelBuffer.cxx	2011-08-23 12:04:46 UTC (rev 4646)
@@ -16,6 +16,10 @@
  * USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <assert.h>
 
 #include <ApplicationServices/ApplicationServices.h>

Modified: trunk/vncviewer/OptionsDialog.cxx
===================================================================
--- trunk/vncviewer/OptionsDialog.cxx	2011-08-22 11:38:35 UTC (rev 4645)
+++ trunk/vncviewer/OptionsDialog.cxx	2011-08-23 12:04:46 UTC (rev 4646)
@@ -16,6 +16,10 @@
  * USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdlib.h>
 
 #include <list>

Modified: trunk/vncviewer/ServerDialog.cxx
===================================================================
--- trunk/vncviewer/ServerDialog.cxx	2011-08-22 11:38:35 UTC (rev 4645)
+++ trunk/vncviewer/ServerDialog.cxx	2011-08-23 12:04:46 UTC (rev 4646)
@@ -16,6 +16,10 @@
  * USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <FL/Fl.H>
 #include <FL/Fl_Input.H>
 #include <FL/Fl_Button.H>

Modified: trunk/vncviewer/UserDialog.cxx
===================================================================
--- trunk/vncviewer/UserDialog.cxx	2011-08-22 11:38:35 UTC (rev 4645)
+++ trunk/vncviewer/UserDialog.cxx	2011-08-23 12:04:46 UTC (rev 4646)
@@ -16,6 +16,10 @@
  * USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>

Modified: trunk/vncviewer/Viewport.cxx
===================================================================
--- trunk/vncviewer/Viewport.cxx	2011-08-22 11:38:35 UTC (rev 4645)
+++ trunk/vncviewer/Viewport.cxx	2011-08-23 12:04:46 UTC (rev 4646)
@@ -17,6 +17,10 @@
  * USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>

Modified: trunk/vncviewer/Win32PixelBuffer.cxx
===================================================================
--- trunk/vncviewer/Win32PixelBuffer.cxx	2011-08-22 11:38:35 UTC (rev 4645)
+++ trunk/vncviewer/Win32PixelBuffer.cxx	2011-08-23 12:04:46 UTC (rev 4646)
@@ -17,6 +17,10 @@
  * USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <assert.h>
 #include <stdlib.h>
 

Modified: trunk/vncviewer/X11PixelBuffer.cxx
===================================================================
--- trunk/vncviewer/X11PixelBuffer.cxx	2011-08-22 11:38:35 UTC (rev 4645)
+++ trunk/vncviewer/X11PixelBuffer.cxx	2011-08-23 12:04:46 UTC (rev 4646)
@@ -17,6 +17,10 @@
  * USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <assert.h>
 #include <stdlib.h>
 

Modified: trunk/vncviewer/parameters.cxx
===================================================================
--- trunk/vncviewer/parameters.cxx	2011-08-22 11:38:35 UTC (rev 4645)
+++ trunk/vncviewer/parameters.cxx	2011-08-23 12:04:46 UTC (rev 4646)
@@ -17,6 +17,10 @@
  * USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "parameters.h"
 
 using namespace rfb;

Modified: trunk/vncviewer/vncviewer.cxx
===================================================================
--- trunk/vncviewer/vncviewer.cxx	2011-08-22 11:38:35 UTC (rev 4645)
+++ trunk/vncviewer/vncviewer.cxx	2011-08-23 12:04:46 UTC (rev 4646)
@@ -18,6 +18,10 @@
  * USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[4665] trunk/vncviewer
		From: <e9925248@us...> -	2011-09-04 07:04

			



                
                    
                        Revision: 4665
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4665&view=rev
Author:   e9925248
Date:     2011-09-04 07:04:43 +0000 (Sun, 04 Sep 2011)
Log Message:
-----------
Support other keys than F8 as menu key

Modified Paths:
--------------
    trunk/vncviewer/CMakeLists.txt
    trunk/vncviewer/OptionsDialog.cxx
    trunk/vncviewer/Viewport.cxx

Added Paths:
-----------
    trunk/vncviewer/menukey.cxx
    trunk/vncviewer/menukey.h

Modified: trunk/vncviewer/CMakeLists.txt
===================================================================
--- trunk/vncviewer/CMakeLists.txt	2011-09-01 12:43:40 UTC (rev 4664)
+++ trunk/vncviewer/CMakeLists.txt	2011-09-04 07:04:43 UTC (rev 4665)
@@ -4,6 +4,7 @@
 include_directories(${CMAKE_SOURCE_DIR}/common)
 set(VNCVIEWER_SOURCES
   buildTime.cxx
+  menukey.cxx
   CConn.cxx
   DesktopWindow.cxx
   UserDialog.cxx

Modified: trunk/vncviewer/OptionsDialog.cxx
===================================================================
--- trunk/vncviewer/OptionsDialog.cxx	2011-09-01 12:43:40 UTC (rev 4664)
+++ trunk/vncviewer/OptionsDialog.cxx	2011-09-04 07:04:43 UTC (rev 4665)
@@ -36,6 +36,7 @@
 #include "OptionsDialog.h"
 #include "fltk_layout.h"
 #include "i18n.h"
+#include "menukey.h"
 #include "parameters.h"
 
 #include <FL/Fl_Tabs.H>
@@ -268,11 +269,9 @@
   menuKeyChoice->value(0);
 
   menuKeyBuf = menuKey;
-  if (menuKeyBuf[0] == 'F') {
-    int num = atoi(menuKeyBuf+1);
-    if ((num >= 1) && (num <= 12))
-      menuKeyChoice->value(num);
-  }
+  for (int i = 0; i < getMenuKeySymbolCount(); i++)
+    if (!strcmp(getMenuKeySymbols()[i].name, menuKeyBuf))
+      menuKeyChoice->value(i + 1);
 
   /* Misc. */
   sharedCheckbox->value(shared);
@@ -361,9 +360,7 @@
   if (menuKeyChoice->value() == 0)
     menuKey.setParam("");
   else {
-    char buf[16];
-    sprintf(buf, "F%d", menuKeyChoice->value());
-    menuKey.setParam(buf);
+    menuKey.setParam(menuKeyChoice->text());
   }
 
   /* Misc. */
@@ -696,11 +693,8 @@
   menuKeyChoice = new Fl_Choice(LBLLEFT(tx, ty, 150, CHOICE_HEIGHT, _("Menu key")));
 
   menuKeyChoice->add(_("None"), 0, NULL, (void*)0, FL_MENU_DIVIDER);
-  for (int i = 1;i <= 12;i++) {
-    char buf[16];
-    sprintf(buf, "F%d", i);
-    menuKeyChoice->add(buf, 0, NULL, (void*)i, 0);
-  }
+  for (int i = 0; i < getMenuKeySymbolCount(); i++)
+    menuKeyChoice->add(getMenuKeySymbols()[i].name, 0, NULL, 0, 0);
 
   ty += CHOICE_HEIGHT + TIGHT_MARGIN;
 

Modified: trunk/vncviewer/Viewport.cxx
===================================================================
--- trunk/vncviewer/Viewport.cxx	2011-09-01 12:43:40 UTC (rev 4664)
+++ trunk/vncviewer/Viewport.cxx	2011-09-04 07:04:43 UTC (rev 4665)
@@ -46,6 +46,7 @@
 #include "fltk_layout.h"
 #include "parameters.h"
 #include "keysym2ucs.h"
+#include "menukey.h"
 #include "vncviewer.h"
 
 #include <FL/fl_draw.H>
@@ -938,17 +939,8 @@
 
 void Viewport::setMenuKey()
 {
-  const char *menuKeyStr;
+  menuKeyCode = getMenuKeyCode();
 
-  menuKeyCode = 0;
-
-  menuKeyStr = menuKey;
-  if (menuKeyStr[0] == 'F') {
-    int num = atoi(menuKeyStr + 1);
-    if ((num >= 1) && (num <= 12))
-      menuKeyCode = FL_F + num;
-  }
-
   // Need to repopulate the context menu as it contains references to
   // the menu key
   initContextMenu();

Added: trunk/vncviewer/menukey.cxx
===================================================================
--- trunk/vncviewer/menukey.cxx	                        (rev 0)
+++ trunk/vncviewer/menukey.cxx	2011-09-04 07:04:43 UTC (rev 4665)
@@ -0,0 +1,71 @@
+/* Copyright 2011 Martin Koegler <mkoegler@...>
+ * Copyright 2011 Pierre Ossman <ossman@...> for Cendio AB
+ * 
+ * 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 <string.h>
+#include <FL/Fl.H>
+
+#include "menukey.h"
+#include "parameters.h"
+
+static const MenuKeySymbol menuSymbols[] = {
+  {"F1", FL_F + 1},
+  {"F2", FL_F + 2},
+  {"F3", FL_F + 3},
+  {"F4", FL_F + 4},
+  {"F5", FL_F + 5},
+  {"F6", FL_F + 6},
+  {"F7", FL_F + 7},
+  {"F8", FL_F + 8},
+  {"F9", FL_F + 9},
+  {"F10", FL_F + 10},
+  {"F11", FL_F + 11},
+  {"F12", FL_F + 12},
+  {"Pause", FL_Pause},
+  {"Print", FL_Print},
+  {"Scroll_Lock", FL_Scroll_Lock},
+  {"Escape", FL_Escape},
+  {"Insert", FL_Insert},
+  {"Delete", FL_Delete},
+  {"Home", FL_Home},
+  {"Page_Up", FL_Page_Up},
+  {"Page_Down", FL_Page_Down},
+};
+
+int getMenuKeySymbolCount()
+{
+  return sizeof(menuSymbols)/sizeof(menuSymbols[0]);
+}
+
+const MenuKeySymbol* getMenuKeySymbols()
+{
+  return menuSymbols;
+}
+
+int getMenuKeyCode()
+{
+    const char *menuKeyStr;
+    int menuKeyCode = 0;
+
+    menuKeyStr = menuKey;
+    for(int i = 0; i < getMenuKeySymbolCount(); i++)
+      if (!strcmp(menuSymbols[i].name, menuKeyStr))
+        menuKeyCode = menuSymbols[i].keycode;
+
+    return menuKeyCode;
+}

Added: trunk/vncviewer/menukey.h
===================================================================
--- trunk/vncviewer/menukey.h	                        (rev 0)
+++ trunk/vncviewer/menukey.h	2011-09-04 07:04:43 UTC (rev 4665)
@@ -0,0 +1,30 @@
+/* Copyright 2011 Martin Koegler <mkoegler@...>
+ * 
+ * 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 __KEYSYM_H__
+#define __KEYSYM_H__
+
+typedef struct {
+  const char* name;
+  int keycode;
+} MenuKeySymbol;
+
+int getMenuKeyCode();
+int getMenuKeySymbolCount();
+const MenuKeySymbol* getMenuKeySymbols();
+
+#endif

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[4670] trunk/vncviewer
		From: <hean01@us...> -	2011-09-14 06:31

			



                
                    
                        Revision: 4670
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4670&view=rev
Author:   hean01
Date:     2011-09-14 06:31:06 +0000 (Wed, 14 Sep 2011)
Log Message:
-----------
- Changes behaviour of context menu to be reinitialize
  before display with intial states.

- Fixes for fullscreen contextmenu item to show the
  current fullscreen state as it was done in the 
  old viewer.

Modified Paths:
--------------
    trunk/vncviewer/Viewport.cxx
    trunk/vncviewer/Viewport.h

Modified: trunk/vncviewer/Viewport.cxx
===================================================================
--- trunk/vncviewer/Viewport.cxx	2011-09-07 11:35:04 UTC (rev 4669)
+++ trunk/vncviewer/Viewport.cxx	2011-09-14 06:31:06 UTC (rev 4670)
@@ -98,7 +98,6 @@
   window()->add(contextMenu);
 
   setMenuKey();
-  initContextMenu();
 
   OptionsDialog::addCallback(handleOptions, this);
 }
@@ -843,11 +842,14 @@
   contextMenu->add(_("Exit viewer"), 0, NULL, (void*)ID_EXIT, FL_MENU_DIVIDER);
 
 #ifdef HAVE_FLTK_FULLSCREEN
-  contextMenu->add(_("Full screen"), 0, NULL, (void*)ID_FULLSCREEN, FL_MENU_DIVIDER);
+  contextMenu->add(_("Full screen"), 0, NULL, (void*)ID_FULLSCREEN, 
+		   FL_MENU_TOGGLE | (window()->fullscreen_active()?FL_MENU_VALUE:0));
 #endif
 
-  contextMenu->add(_("Ctrl"), 0, NULL, (void*)ID_CTRL, FL_MENU_TOGGLE);
-  contextMenu->add(_("Alt"), 0, NULL, (void*)ID_ALT, FL_MENU_TOGGLE);
+  contextMenu->add(_("Ctrl"), 0, NULL, (void*)ID_CTRL, 
+		   FL_MENU_TOGGLE | (menuCtrlKey?FL_MENU_VALUE:0));
+  contextMenu->add(_("Alt"), 0, NULL, (void*)ID_ALT,
+		   FL_MENU_TOGGLE | (menuAltKey?FL_MENU_VALUE:0));
 
   if (menuKeyCode) {
     char sendMenuKey[64];
@@ -877,6 +879,9 @@
   // it will start up highlighting the previously selected entry.
   contextMenu->value(-1);
 
+  // initialize context menu before display
+  initContextMenu();
+
   m = contextMenu->popup();
   if (m == NULL)
     return;
@@ -898,9 +903,11 @@
 #endif
   case ID_CTRL:
     handleKeyEvent(FL_Control_L, FL_Control_L, "", m->value());
+    menuCtrlKey = !menuCtrlKey;
     break;
   case ID_ALT:
     handleKeyEvent(FL_Alt_L, FL_Alt_L, "", m->value());
+    menuAltKey = !menuAltKey;
     break;
   case ID_MENUKEY:
     handleKeyEvent(menuKeyCode, menuKeyCode, "", true);
@@ -940,10 +947,6 @@
 void Viewport::setMenuKey()
 {
   menuKeyCode = getMenuKeyCode();
-
-  // Need to repopulate the context menu as it contains references to
-  // the menu key
-  initContextMenu();
 }
 
 

Modified: trunk/vncviewer/Viewport.h
===================================================================
--- trunk/vncviewer/Viewport.h	2011-09-07 11:35:04 UTC (rev 4669)
+++ trunk/vncviewer/Viewport.h	2011-09-14 06:31:06 UTC (rev 4670)
@@ -155,6 +155,9 @@
   int menuKeyCode;
   Fl_Menu_Button *contextMenu;
 
+  bool menuCtrlKey;
+  bool menuAltKey;
+
   Fl_RGB_Image *cursor;
   rfb::Point cursorHotspot;
 };

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[4681] trunk/vncviewer
		From: <ossman_@us...> -	2011-09-30 12:26

			



                
                    
                        Revision: 4681
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4681&view=rev
Author:   ossman_
Date:     2011-09-30 12:26:25 +0000 (Fri, 30 Sep 2011)
Log Message:
-----------
Remove VeNCrypt settings from the GUI as lower layers will always be forcing
it on anyway.

Modified Paths:
--------------
    trunk/vncviewer/OptionsDialog.cxx
    trunk/vncviewer/OptionsDialog.h

Modified: trunk/vncviewer/OptionsDialog.cxx
===================================================================
--- trunk/vncviewer/OptionsDialog.cxx	2011-09-30 12:21:58 UTC (rev 4680)
+++ trunk/vncviewer/OptionsDialog.cxx	2011-09-30 12:26:25 UTC (rev 4681)
@@ -191,8 +191,6 @@
    list<U32> secTypesExt;
    list<U32>::iterator iterExt;
 
-  vencryptCheckbox->value(false);
-
   encNoneCheckbox->value(false);
   encTLSCheckbox->value(false);
   encX509Checkbox->value(false);
@@ -204,9 +202,6 @@
   secTypes = security.GetEnabledSecTypes();
   for (iter = secTypes.begin(); iter != secTypes.end(); ++iter) {
     switch (*iter) {
-    case secTypeVeNCrypt:
-      vencryptCheckbox->value(true);
-      break;
     case secTypeNone:
       encNoneCheckbox->value(true);
       authNoneCheckbox->value(true);
@@ -255,7 +250,6 @@
   caInput->value(CSecurityTLS::x509ca);
   crlInput->value(CSecurityTLS::x509crl);
 
-  handleVencrypt(vencryptCheckbox, this);
   handleX509(encX509Checkbox, this);
 #endif
 
@@ -319,33 +313,28 @@
       security.EnableSecType(secTypeNone);
     if (authVncCheckbox->value())
       security.EnableSecType(secTypeVncAuth);
+    if (authPlainCheckbox->value())
+      security.EnableSecType(secTypePlain);
+  }
 
-    if (vencryptCheckbox->value()) {
-      if (authPlainCheckbox->value())
-        security.EnableSecType(secTypePlain);
-    }
+  /* Process security types which use TLS encryption */
+  if (encTLSCheckbox->value()) {
+    if (authNoneCheckbox->value())
+      security.EnableSecType(secTypeTLSNone);
+    if (authVncCheckbox->value())
+      security.EnableSecType(secTypeTLSVnc);
+    if (authPlainCheckbox->value())
+      security.EnableSecType(secTypeTLSPlain);
   }
 
-  if (vencryptCheckbox->value()) {
-    /* Process security types which use TLS encryption */
-    if (encTLSCheckbox->value()) {
-      if (authNoneCheckbox->value())
-        security.EnableSecType(secTypeTLSNone);
-      if (authVncCheckbox->value())
-        security.EnableSecType(secTypeTLSVnc);
-      if (authPlainCheckbox->value())
-        security.EnableSecType(secTypeTLSPlain);
-    }
-
-    /* Process security types which use X509 encryption */
-    if (encX509Checkbox->value()) {
-      if (authNoneCheckbox->value())
-        security.EnableSecType(secTypeX509None);
-      if (authVncCheckbox->value())
-        security.EnableSecType(secTypeX509Vnc);
-      if (authPlainCheckbox->value())
-        security.EnableSecType(secTypeX509Plain);
-    }
+  /* Process security types which use X509 encryption */
+  if (encX509Checkbox->value()) {
+    if (authNoneCheckbox->value())
+      security.EnableSecType(secTypeX509None);
+    if (authVncCheckbox->value())
+      security.EnableSecType(secTypeX509Vnc);
+    if (authPlainCheckbox->value())
+      security.EnableSecType(secTypeX509Plain);
   }
 
   SecurityClient::secTypes.setParam(security.ToString());
@@ -552,14 +541,6 @@
 
   orig_tx = tx;
 
-  /* Security */
-  vencryptCheckbox = new Fl_Check_Button(LBLRIGHT(tx, ty,
-                                                  CHECK_MIN_WIDTH,
-                                                  CHECK_HEIGHT,
-                                                  _("Extended encryption and authentication methods (VeNCrypt)")));
-  vencryptCheckbox->callback(handleVencrypt, this);
-  ty += CHECK_HEIGHT + INNER_MARGIN;
-
   /* Encryption */
   ty += GROUP_LABEL_OFFSET;
   height = GROUP_MARGIN * 2 + TIGHT_MARGIN * 4 + CHECK_HEIGHT * 3 + (INPUT_LABEL_OFFSET + INPUT_HEIGHT) * 2;
@@ -614,7 +595,6 @@
   ty += INNER_MARGIN;
 
   /* Authentication */
-  /* Encryption */
   ty += GROUP_LABEL_OFFSET;
   height = GROUP_MARGIN * 2 + TIGHT_MARGIN * 2 + CHECK_HEIGHT * 3;
   authenticationGroup = new Fl_Group(tx, ty, width, height, _("Authentication"));
@@ -775,20 +755,6 @@
 }
 
 
-void OptionsDialog::handleVencrypt(Fl_Widget *widget, void *data)
-{
-  OptionsDialog *dialog = (OptionsDialog*)data;
-
-  if (dialog->vencryptCheckbox->value()) {
-    dialog->encryptionGroup->activate();
-    dialog->authPlainCheckbox->activate();
-  } else {
-    dialog->encryptionGroup->deactivate();
-    dialog->authPlainCheckbox->deactivate();
-  }
-}
-
-
 void OptionsDialog::handleX509(Fl_Widget *widget, void *data)
 {
   OptionsDialog *dialog = (OptionsDialog*)data;

Modified: trunk/vncviewer/OptionsDialog.h
===================================================================
--- trunk/vncviewer/OptionsDialog.h	2011-09-30 12:21:58 UTC (rev 4680)
+++ trunk/vncviewer/OptionsDialog.h	2011-09-30 12:26:25 UTC (rev 4681)
@@ -56,7 +56,6 @@
   static void handleCompression(Fl_Widget *widget, void *data);
   static void handleJpeg(Fl_Widget *widget, void *data);
 
-  static void handleVencrypt(Fl_Widget *widget, void *data);
   static void handleX509(Fl_Widget *widget, void *data);
 
   static void handleCancel(Fl_Widget *widget, void *data);
@@ -86,8 +85,6 @@
   Fl_Int_Input *jpegInput;
 
   /* Security */
-  Fl_Check_Button *vencryptCheckbox;
-
   Fl_Group *encryptionGroup;
   Fl_Check_Button *encNoneCheckbox;
   Fl_Check_Button *encTLSCheckbox;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[4766] trunk/vncviewer
		From: <ossman_@us...> -	2011-11-04 11:42

			



                
                    
                        Revision: 4766
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4766&view=rev
Author:   ossman_
Date:     2011-11-04 11:42:16 +0000 (Fri, 04 Nov 2011)
Log Message:
-----------
Redesign the format switching logic so that we don't have to adjust the way
we send out update requests.

Modified Paths:
--------------
    trunk/vncviewer/CConn.cxx
    trunk/vncviewer/CConn.h

Modified: trunk/vncviewer/CConn.cxx
===================================================================
--- trunk/vncviewer/CConn.cxx	2011-11-04 08:29:52 UTC (rev 4765)
+++ trunk/vncviewer/CConn.cxx	2011-11-04 11:42:16 UTC (rev 4766)
@@ -66,6 +66,7 @@
 
 CConn::CConn(const char* vncServerName)
   : serverHost(0), serverPort(0), sock(NULL), desktop(NULL),
+    pendingPFChange(false),
     currentEncoding(encodingTight), lastServerEncoding((unsigned int)-1),
     formatChange(false), encodingChange(false),
     firstUpdate(true), pendingUpdate(false),
@@ -233,8 +234,18 @@
   desktop = new DesktopWindow(cp.width, cp.height, cp.name(), serverPF, this);
   fullColourPF = desktop->getPreferredPF();
 
+  // Force a switch to the format and encoding we'd like
   formatChange = encodingChange = true;
+
+  // And kick off the update cycle
   requestNewUpdate();
+
+  // This initial update request is a bit of a corner case, so we need
+  // to help out setting the correct format here.
+  assert(pendingPFChange);
+  desktop->setServerPF(pendingPF);
+  cp.setPF(pendingPF);
+  pendingPFChange = false;
 }
 
 // setDesktopSize() is called when the desktop size changes (including when
@@ -270,15 +281,12 @@
 // framebufferUpdateStart() is called at the beginning of an update.
 // Here we try to send out a new framebuffer update request so that the
 // next update can be sent out in parallel with us decoding the current
-// one. We cannot do this if we're in the middle of a format change
-// though.
+// one.
 void CConn::framebufferUpdateStart()
 {
-  if (!formatChange) {
-    pendingUpdate = true;
-    requestNewUpdate();
-  } else
-    pendingUpdate = false;
+  pendingUpdate = false;
+
+  requestNewUpdate();
 }
 
 // framebufferUpdateEnd() is called at the end of an update.
@@ -325,10 +333,13 @@
     firstUpdate = false;
   }
 
-  // A format change prevented us from sending this before the update,
-  // so make sure to send it now.
-  if (formatChange && !pendingUpdate)
-    requestNewUpdate();
+  // A format change has been scheduled and we are now past the update
+  // with the old format. Time to active the new one.
+  if (pendingPFChange) {
+    desktop->setServerPF(pendingPF);
+    cp.setPF(pendingPF);
+    pendingPFChange = false;
+  }
 
   // Compute new settings based on updated bandwidth values
   if (autoSelect)
@@ -530,11 +541,16 @@
       else
         pf = mediumColourPF;
     }
+
+    // New requests are sent out at the start of processing the last
+    // one, so we cannot switch our internal format right now (doing so
+    // would mean misdecoding the current update).
+    pendingPFChange = true;
+    pendingPF = pf;
+
     char str[256];
     pf.print(str, 256);
     vlog.info(_("Using pixel format %s"),str);
-    desktop->setServerPF(pf);
-    cp.setPF(pf);
     writer()->writeSetPixelFormat(pf);
 
     formatChange = false;
@@ -542,6 +558,7 @@
 
   checkEncodings();
 
+  pendingUpdate = true;
   writer()->writeFramebufferUpdateRequest(Rect(0, 0, cp.width, cp.height),
                                           !forceNonincremental);
  

Modified: trunk/vncviewer/CConn.h
===================================================================
--- trunk/vncviewer/CConn.h	2011-11-04 08:29:52 UTC (rev 4765)
+++ trunk/vncviewer/CConn.h	2011-11-04 11:42:16 UTC (rev 4766)
@@ -95,6 +95,9 @@
   rfb::PixelFormat serverPF;
   rfb::PixelFormat fullColourPF;
 
+  bool pendingPFChange;
+  rfb::PixelFormat pendingPF;
+
   int currentEncoding, lastServerEncoding;
 
   bool formatChange;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[4800] trunk/vncviewer
		From: <ossman_@us...> -	2011-11-14 16:02

			



                
                    
                        Revision: 4800
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4800&view=rev
Author:   ossman_
Date:     2011-11-14 16:02:06 +0000 (Mon, 14 Nov 2011)
Log Message:
-----------
Support and use fences in the client. This allows more aggressive use of
update requests as we can now synchronise format changes.

Modified Paths:
--------------
    trunk/vncviewer/CConn.cxx
    trunk/vncviewer/CConn.h

Modified: trunk/vncviewer/CConn.cxx
===================================================================
--- trunk/vncviewer/CConn.cxx	2011-11-14 15:54:30 UTC (rev 4799)
+++ trunk/vncviewer/CConn.cxx	2011-11-14 16:02:06 UTC (rev 4800)
@@ -33,7 +33,10 @@
 #include <rfb/LogWriter.h>
 #include <rfb/util.h>
 #include <rfb/screenTypes.h>
+#include <rfb/fenceTypes.h>
 #include <rfb/Timer.h>
+#include <rdr/MemInStream.h>
+#include <rdr/MemOutStream.h>
 #include <network/TcpSocket.h>
 
 #include <FL/Fl.H>
@@ -70,7 +73,7 @@
     currentEncoding(encodingTight), lastServerEncoding((unsigned int)-1),
     formatChange(false), encodingChange(false),
     firstUpdate(true), pendingUpdate(false),
-    forceNonincremental(true)
+    forceNonincremental(true), supportsSyncFence(false)
 {
   setShared(::shared);
 
@@ -130,10 +133,12 @@
 
 void CConn::refreshFramebuffer()
 {
-  // FIXME: We cannot safely trigger an update request directly but must
-  //        wait for the next update to arrive.
-  if (!formatChange)
-    forceNonincremental = true;
+  forceNonincremental = true;
+
+  // Without fences, we cannot safely trigger an update request directly
+  // but must wait for the next update to arrive.
+  if (supportsSyncFence)
+    requestNewUpdate();
 }
 
 const char *CConn::connectionInfo()
@@ -284,6 +289,7 @@
 // one.
 void CConn::framebufferUpdateStart()
 {
+  // Note: This might not be true if sync fences are supported
   pendingUpdate = false;
 
   requestNewUpdate();
@@ -300,6 +306,11 @@
   if (firstUpdate) {
     int width, height;
 
+    // We need fences to make extra update requests "safe".
+    // See fence() for the next step.
+    if (cp.supportsFence)
+      writer()->writeFence(fenceFlagRequest | fenceFlagSyncNext, 0, NULL);
+
     if (cp.supportsSetDesktopSize &&
         sscanf(desktopSize.getValueStr(), "%dx%d", &width, &height) == 2) {
       ScreenSet layout;
@@ -423,6 +434,34 @@
   desktop->setCursor(width, height, hotspot, data, mask);
 }
 
+void CConn::fence(rdr::U32 flags, unsigned len, const char data[])
+{
+  CMsgHandler::fence(flags, len, data);
+
+  if (flags & fenceFlagRequest) {
+    // We handle everything synchronously so we trivially honor these modes
+    flags = flags & (fenceFlagBlockBefore | fenceFlagBlockAfter);
+
+    writer()->writeFence(flags, len, data);
+    return;
+  }
+
+  if (len == 0) {
+    // Initial probe
+    if (flags & fenceFlagSyncNext)
+      supportsSyncFence = true;
+  } else {
+    // Pixel format change
+    rdr::MemInStream memStream(data, len);
+    PixelFormat pf;
+
+    pf.read(&memStream);
+
+    desktop->setServerPF(pf);
+    cp.setPF(pf);
+  }
+}
+
 rdr::U8* CConn::getRawPixelsRW(const rfb::Rect& r, int* stride) {
   return desktop->getPixelsRW(r, stride);
 }
@@ -529,7 +568,7 @@
     PixelFormat pf;
 
     /* Catch incorrect requestNewUpdate calls */
-    assert(pendingUpdate == false);
+    assert(!pendingUpdate || supportsSyncFence);
 
     if (fullColour) {
       pf = fullColourPF;
@@ -542,12 +581,24 @@
         pf = mediumColourPF;
     }
 
-    // New requests are sent out at the start of processing the last
-    // one, so we cannot switch our internal format right now (doing so
-    // would mean misdecoding the current update).
-    pendingPFChange = true;
-    pendingPF = pf;
+    if (supportsSyncFence) {
+      // We let the fence carry the pixel format and switch once we
+      // get the response back. That way we will be synchronised with
+      // when the server switches.
+      rdr::MemOutStream memStream;
 
+      pf.write(&memStream);
+
+      writer()->writeFence(fenceFlagRequest | fenceFlagSyncNext,
+                           memStream.length(), (const char*)memStream.data());
+    } else {
+      // New requests are sent out at the start of processing the last
+      // one, so we cannot switch our internal format right now (doing so
+      // would mean misdecoding the current update).
+      pendingPFChange = true;
+      pendingPF = pf;
+    }
+
     char str[256];
     pf.print(str, 256);
     vlog.info(_("Using pixel format %s"),str);
@@ -607,6 +658,12 @@
       pf = mediumColourPF;
   }
 
-  if (!pf.equal(self->cp.pf()))
+  if (!pf.equal(self->cp.pf())) {
     self->formatChange = true;
+
+    // Without fences, we cannot safely trigger an update request directly
+    // but must wait for the next update to arrive.
+    if (self->supportsSyncFence)
+      self->requestNewUpdate();
+  }
 }

Modified: trunk/vncviewer/CConn.h
===================================================================
--- trunk/vncviewer/CConn.h	2011-11-14 15:54:30 UTC (rev 4799)
+++ trunk/vncviewer/CConn.h	2011-11-14 16:02:06 UTC (rev 4800)
@@ -75,6 +75,8 @@
   void setCursor(int width, int height, const rfb::Point& hotspot,
                  void* data, void* mask);
 
+  void fence(rdr::U32 flags, unsigned len, const char data[]);
+
 private:
 
   void resizeFramebuffer();
@@ -107,6 +109,8 @@
   bool pendingUpdate;
 
   bool forceNonincremental;
+
+  bool supportsSyncFence;
 };
 
 #endif

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[4805] trunk/vncviewer
		From: <ossman_@us...> -	2011-11-15 12:13

			



                
                    
                        Revision: 4805
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4805&view=rev
Author:   ossman_
Date:     2011-11-15 12:13:37 +0000 (Tue, 15 Nov 2011)
Log Message:
-----------
Client side support for continuous updates.

Modified Paths:
--------------
    trunk/vncviewer/CConn.cxx
    trunk/vncviewer/CConn.h

Modified: trunk/vncviewer/CConn.cxx
===================================================================
--- trunk/vncviewer/CConn.cxx	2011-11-15 12:11:32 UTC (rev 4804)
+++ trunk/vncviewer/CConn.cxx	2011-11-15 12:13:37 UTC (rev 4805)
@@ -72,7 +72,7 @@
     pendingPFChange(false),
     currentEncoding(encodingTight), lastServerEncoding((unsigned int)-1),
     formatChange(false), encodingChange(false),
-    firstUpdate(true), pendingUpdate(false),
+    firstUpdate(true), pendingUpdate(false), continuousUpdates(false),
     forceNonincremental(true), supportsSyncFence(false)
 {
   setShared(::shared);
@@ -306,8 +306,8 @@
   if (firstUpdate) {
     int width, height;
 
-    // We need fences to make extra update requests "safe".
-    // See fence() for the next step.
+    // We need fences to make extra update requests and continuous
+    // updates "safe". See fence() for the next step.
     if (cp.supportsFence)
       writer()->writeFence(fenceFlagRequest | fenceFlagSyncNext, 0, NULL);
 
@@ -448,8 +448,15 @@
 
   if (len == 0) {
     // Initial probe
-    if (flags & fenceFlagSyncNext)
+    if (flags & fenceFlagSyncNext) {
       supportsSyncFence = true;
+
+      if (cp.supportsContinuousUpdates) {
+        vlog.info(_("Enabling continuous updates"));
+        continuousUpdates = true;
+        writer()->writeEnableContinuousUpdates(true, 0, 0, cp.width, cp.height);
+      }
+    }
   } else {
     // Pixel format change
     rdr::MemInStream memStream(data, len);
@@ -477,6 +484,9 @@
   if (!desktop)
     return;
 
+  if (continuousUpdates)
+    writer()->writeEnableContinuousUpdates(true, 0, 0, cp.width, cp.height);
+
   desktop->resizeFramebuffer(cp.width, cp.height);
 }
 
@@ -609,9 +619,11 @@
 
   checkEncodings();
 
-  pendingUpdate = true;
-  writer()->writeFramebufferUpdateRequest(Rect(0, 0, cp.width, cp.height),
-                                          !forceNonincremental);
+  if (forceNonincremental || !continuousUpdates) {
+    pendingUpdate = true;
+    writer()->writeFramebufferUpdateRequest(Rect(0, 0, cp.width, cp.height),
+                                            !forceNonincremental);
+  }
  
   forceNonincremental = false;
 }

Modified: trunk/vncviewer/CConn.h
===================================================================
--- trunk/vncviewer/CConn.h	2011-11-15 12:11:32 UTC (rev 4804)
+++ trunk/vncviewer/CConn.h	2011-11-15 12:13:37 UTC (rev 4805)
@@ -107,6 +107,7 @@
 
   bool firstUpdate;
   bool pendingUpdate;
+  bool continuousUpdates;
 
   bool forceNonincremental;
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[4876] trunk/vncviewer
		From: <ossman_@us...> -	2012-03-27 12:30

			



                
                    
                        Revision: 4876
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4876&view=rev
Author:   ossman_
Date:     2012-03-27 12:30:19 +0000 (Tue, 27 Mar 2012)
Log Message:
-----------
Add a resource file to vncviewer.exe so we can get an icon.

Modified Paths:
--------------
    trunk/vncviewer/CMakeLists.txt

Added Paths:
-----------
    trunk/vncviewer/resource.h
    trunk/vncviewer/vncviewer.rc.in

Modified: trunk/vncviewer/CMakeLists.txt
===================================================================
--- trunk/vncviewer/CMakeLists.txt	2012-03-27 10:29:50 UTC (rev 4875)
+++ trunk/vncviewer/CMakeLists.txt	2012-03-27 12:30:19 UTC (rev 4876)
@@ -16,10 +16,18 @@
   vncviewer.cxx)
 
 if(WIN32)
-  set(VNCVIEWER_SOURCES ${VNCVIEWER_SOURCES} win32.c)
+  # Since vncviewer.rc is generated, local includes will be looking
+  # in the wrong directory. We need to help it out.
+  include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+  configure_file(vncviewer.rc.in vncviewer.rc)
+  set(VNCVIEWER_SOURCES
+    ${VNCVIEWER_SOURCES}
+    ${CMAKE_CURRENT_BINARY_DIR}/vncviewer.rc)
 endif()
 
-if(APPLE)
+if(WIN32)
+  set(VNCVIEWER_SOURCES ${VNCVIEWER_SOURCES} win32.c)
+elseif(APPLE)
   set(VNCVIEWER_SOURCES ${VNCVIEWER_SOURCES} cocoa.mm)
 endif()
 

Added: trunk/vncviewer/resource.h
===================================================================
--- trunk/vncviewer/resource.h	                        (rev 0)
+++ trunk/vncviewer/resource.h	2012-03-27 12:30:19 UTC (rev 4876)
@@ -0,0 +1,7 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Developer Studio generated include file.
+// Used by vncviewer.rc
+//
+#define IDR_MANIFEST                    1
+#define IDI_ICON                        101
+

Added: trunk/vncviewer/vncviewer.rc.in
===================================================================
--- trunk/vncviewer/vncviewer.rc.in	                        (rev 0)
+++ trunk/vncviewer/vncviewer.rc.in	2012-03-27 12:30:19 UTC (rev 4876)
@@ -0,0 +1,82 @@
+//Microsoft Developer Studio generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "windows.h"
+
+/////////////////////////////////////////////////////////////////////////////
+// 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
+
+#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 Client for Win64\0"
+            VALUE "ProductName", "TigerVNC Client for Win64\0"
+            #else
+            VALUE "FileDescription", "TigerVNC Client for Win32\0"
+            VALUE "ProductName", "TigerVNC Client for Win32\0"
+            #endif
+            VALUE "FileVersion", "@RCVERSION@..."
+            VALUE "InternalName", "vncviewer\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", "@VERSION@..."
+            VALUE "SpecialBuild", "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x809, 1200
+    END
+END
+
+#endif    // !_MAC
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_ICON                ICON    DISCARDABLE     "@CMAKE_SOURCE_DIR@..."
+
+#endif    // English (U.K.) resources
+/////////////////////////////////////////////////////////////////////////////
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[4900] trunk/vncviewer
		From: <ossman_@us...> -	2012-04-25 15:44

			



                
                    
                        Revision: 4900
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4900&view=rev
Author:   ossman_
Date:     2012-04-25 15:43:56 +0000 (Wed, 25 Apr 2012)
Log Message:
-----------
Make sure we're paranoid about accidentally feeding a format string.
Basic patch by Joachim Falk. Slightly improved before commit.

Modified Paths:
--------------
    trunk/vncviewer/CConn.cxx
    trunk/vncviewer/UserDialog.cxx
    trunk/vncviewer/Viewport.cxx
    trunk/vncviewer/vncviewer.cxx

Modified: trunk/vncviewer/CConn.cxx
===================================================================
--- trunk/vncviewer/CConn.cxx	2012-04-25 15:10:38 UTC (rev 4899)
+++ trunk/vncviewer/CConn.cxx	2012-04-25 15:43:56 UTC (rev 4900)
@@ -100,7 +100,7 @@
     vlog.info(_("connected to host %s port %d"), serverHost, serverPort);
   } catch (rdr::Exception& e) {
     vlog.error(e.str());
-    fl_alert(e.str());
+    fl_alert("%s", e.str());
     exit_vncviewer();
     return;
   }

Modified: trunk/vncviewer/UserDialog.cxx
===================================================================
--- trunk/vncviewer/UserDialog.cxx	2012-04-25 15:10:38 UTC (rev 4899)
+++ trunk/vncviewer/UserDialog.cxx	2012-04-25 15:43:56 UTC (rev 4900)
@@ -150,22 +150,20 @@
   // FLTK doesn't give us a flexible choice of the icon, so we ignore those
   // bits for now.
 
-  // FIXME: Filter out % from input text
-
   fl_message_title(title);
 
   switch (flags & 0xf) {
   case M_OKCANCEL:
-    return fl_choice(buffer, NULL, fl_ok, fl_cancel) == 1;
+    return fl_choice("%s", NULL, fl_ok, fl_cancel, buffer) == 1;
   case M_YESNO:
-    return fl_choice(buffer, NULL, fl_yes, fl_no) == 1;
+    return fl_choice("%s", NULL, fl_yes, fl_no, buffer) == 1;
   case M_OK:
   default:
     if (((flags & 0xf0) == M_ICONERROR) ||
         ((flags & 0xf0) == M_ICONWARNING))
-      fl_alert(buffer);
+      fl_alert("%s", buffer);
     else
-      fl_message(buffer);
+      fl_message("%s", buffer);
     return true;
   }
 

Modified: trunk/vncviewer/Viewport.cxx
===================================================================
--- trunk/vncviewer/Viewport.cxx	2012-04-25 15:10:38 UTC (rev 4899)
+++ trunk/vncviewer/Viewport.cxx	2012-04-25 15:43:56 UTC (rev 4900)
@@ -950,7 +950,7 @@
   case ID_INFO:
     if (fltk_escape(cc->connectionInfo(), buffer, sizeof(buffer)) < sizeof(buffer)) {
       fl_message_title(_("VNC connection info"));
-      fl_message(buffer);
+      fl_message("%s", buffer);
     }
     break;
   case ID_ABOUT:

Modified: trunk/vncviewer/vncviewer.cxx
===================================================================
--- trunk/vncviewer/vncviewer.cxx	2012-04-25 15:10:38 UTC (rev 4899)
+++ trunk/vncviewer/vncviewer.cxx	2012-04-25 15:43:56 UTC (rev 4900)
@@ -69,7 +69,10 @@
 using namespace rfb;
 using namespace std;
 
-static char aboutText[1024];
+static const char aboutText[] = N_("TigerVNC Viewer %d-bit v%s (%s)\n"
+                                   "%s\n"
+                                   "Copyright (C) 1999-2011 TigerVNC Team and many others (see README.txt)\n"
+                                   "See http://www.tigervnc.org for information on TigerVNC.");
 extern const char* buildTime;
 
 static bool exitMainloop = false;
@@ -88,7 +91,8 @@
 void about_vncviewer()
 {
   fl_message_title(_("About TigerVNC Viewer"));
-  fl_message(aboutText);
+  fl_message(gettext(aboutText), (int)sizeof(size_t)*8,
+             PACKAGE_VERSION, __BUILD__, buildTime);
 }
 
 static void about_callback(Fl_Widget *widget, void *data)
@@ -267,11 +271,6 @@
   const char* vncServerName = NULL;
   UserDialog dlg;
 
-  const char englishAbout[] = N_("TigerVNC Viewer %d-bit v%s (%s)\n"
-                                 "%s\n"
-                                 "Copyright (C) 1999-2011 TigerVNC Team and many others (see README.txt)\n"
-                                 "See http://www.tigervnc.org for information on TigerVNC.");
-
   setlocale(LC_ALL, "");
   bindtextdomain(PACKAGE_NAME, LOCALE_DIR);
   textdomain(PACKAGE_NAME);
@@ -279,10 +278,10 @@
   rfb::SecurityClient::setDefaults();
 
   // Write about text to console, still using normal locale codeset
-  snprintf(aboutText, sizeof(aboutText),
-           gettext(englishAbout), (int)sizeof(size_t)*8, PACKAGE_VERSION,
-           __BUILD__, buildTime);
-  fprintf(stderr,"\n%s\n", aboutText);
+  fprintf(stderr,"\n");
+  fprintf(stderr, gettext(aboutText), (int)sizeof(size_t)*8,
+          PACKAGE_VERSION, __BUILD__, buildTime);
+  fprintf(stderr,"\n");
 
   // Set gettext codeset to what our GUI toolkit uses. Since we are
   // passing strings from strerror/gai_strerror to the GUI, these must
@@ -290,11 +289,6 @@
   bind_textdomain_codeset(PACKAGE_NAME, "UTF-8");
   bind_textdomain_codeset("libc", "UTF-8");
 
-  // Re-create the aboutText for the GUI, now using GUI codeset
-  snprintf(aboutText, sizeof(aboutText),
-           gettext(englishAbout), (int)sizeof(size_t)*8, PACKAGE_VERSION,
-           __BUILD__, buildTime);
-
   rfb::initStdIOLoggers();
   rfb::LogWriter::setLogParams("*:stderr:30");
 
@@ -376,7 +370,7 @@
   delete cc;
 
   if (exitError != NULL)
-    fl_alert(exitError);
+    fl_alert("%s", exitError);
 
   return 0;
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[4924] trunk/vncviewer
		From: <ossman_@us...> -	2012-07-04 11:27

			



                
                    
                        Revision: 4924
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4924&view=rev
Author:   ossman_
Date:     2012-07-04 11:27:47 +0000 (Wed, 04 Jul 2012)
Log Message:
-----------
Make it possible to dynamically resize the size of the session, when resizing
the viewer window, or when entering or leaving fullscreen mode. Initial
work done by Arthur Huillet and clohr.

Modified Paths:
--------------
    trunk/vncviewer/CConn.cxx
    trunk/vncviewer/DesktopWindow.cxx
    trunk/vncviewer/DesktopWindow.h
    trunk/vncviewer/parameters.cxx
    trunk/vncviewer/parameters.h

Modified: trunk/vncviewer/CConn.cxx
===================================================================
--- trunk/vncviewer/CConn.cxx	2012-07-04 11:10:46 UTC (rev 4923)
+++ trunk/vncviewer/CConn.cxx	2012-07-04 11:27:47 UTC (rev 4924)
@@ -304,43 +304,11 @@
   desktop->updateWindow();
 
   if (firstUpdate) {
-    int width, height;
-
     // We need fences to make extra update requests and continuous
     // updates "safe". See fence() for the next step.
     if (cp.supportsFence)
       writer()->writeFence(fenceFlagRequest | fenceFlagSyncNext, 0, NULL);
 
-    if (cp.supportsSetDesktopSize &&
-        sscanf(desktopSize.getValueStr(), "%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;
   }
 

Modified: trunk/vncviewer/DesktopWindow.cxx
===================================================================
--- trunk/vncviewer/DesktopWindow.cxx	2012-07-04 11:10:46 UTC (rev 4923)
+++ trunk/vncviewer/DesktopWindow.cxx	2012-07-04 11:27:47 UTC (rev 4924)
@@ -26,12 +26,14 @@
 #include <string.h>
 
 #include <rfb/LogWriter.h>
+#include <rfb/CMsgWriter.h>
 
 #include "DesktopWindow.h"
 #include "OptionsDialog.h"
 #include "i18n.h"
 #include "parameters.h"
 #include "vncviewer.h"
+#include "CConn.h"
 
 #include <FL/Fl_Scroll.H>
 #include <FL/x.H>
@@ -51,18 +53,15 @@
 DesktopWindow::DesktopWindow(int w, int h, const char *name,
                              const rfb::PixelFormat& serverPF,
                              CConn* cc_)
-  : Fl_Window(w, h)
+  : Fl_Window(w, h), cc(cc_), firstUpdate(true)
 {
-  // Allow resize
-  size_range(100, 100, w, h);
-
   Fl_Scroll *scroll = new Fl_Scroll(0, 0, w, h);
   scroll->color(FL_BLACK);
 
   // Automatically adjust the scroll box to the window
   resizable(scroll);
 
-  viewport = new Viewport(w, h, serverPF, cc_);
+  viewport = new Viewport(w, h, serverPF, cc);
 
   scroll->end();
 
@@ -76,11 +75,9 @@
   Fl::event_dispatch(&fltkHandle);
 
 #ifdef HAVE_FLTK_FULLSCREEN
-  if (fullScreen) {
-    // See comment in DesktopWindow::handleOptions
-    size_range(100, 100, 0, 0);
+  if (fullScreen)
     fullscreen();
-  } else
+  else
 #endif
   {
     // If we are creating a window which is equal to the size on the
@@ -106,6 +103,7 @@
   // Unregister all timeouts in case they get a change tro trigger
   // again later when this object is already gone.
   Fl::remove_timeout(handleGrab, this);
+  Fl::remove_timeout(handleResizeTimeout, this);
 
   OptionsDialog::removeCallback(handleOptions);
 
@@ -149,6 +147,12 @@
 
 void DesktopWindow::updateWindow()
 {
+  if (firstUpdate) {
+    if (cc->cp.supportsSetDesktopSize)
+      remoteResize();
+    firstUpdate = false;
+  }
+
   viewport->updateWindow();
 }
 
@@ -158,9 +162,6 @@
   if ((new_w == viewport->w()) && (new_h == viewport->h()))
     return;
 
-  // Turn off size limitations for a bit while we juggle things around
-  size_range(100, 100, 0, 0);
-
   // If we're letting the viewport match the window perfectly, then
   // keep things that way for the new size, otherwise just keep things
   // like they are.
@@ -186,12 +187,6 @@
   // to make sure the viewport is centered.
   repositionViewport();
 
-  // Update allowed resize range
-#ifdef HAVE_FLTK_FULLSCREEN
-  if (!fullscreen_active())
-#endif
-  size_range(100, 100, new_w, new_h);
-
   // repositionViewport() makes sure the scroll widget notices any changes
   // in position, but it might be just the size that changes so we also
   // need a poke here as well.
@@ -210,6 +205,20 @@
 {
   Fl_Window::resize(x, y, w, h);
 
+  // Try to get the remote size to match our window size, provided
+  // the following conditions are true:
+  //
+  // a) The user has this feature turned on
+  // b) The server supports it
+  // c) We're not still waiting for a chance to handle DesktopSize
+  //
+  if (not firstUpdate and ::remoteResize and cc->cp.supportsSetDesktopSize) {
+    // We delay updating the remote desktop as we tend to get a flood
+    // of resize events as the user is dragging the window.
+    Fl::remove_timeout(handleResizeTimeout, this);
+    Fl::add_timeout(0.5, handleResizeTimeout, this);
+  }
+
   // Deal with some scrolling corner cases
   repositionViewport();
 }
@@ -222,18 +231,6 @@
   case FL_FULLSCREEN:
     fullScreen.setParam(fullscreen_active());
 
-    if (!fullscreen_active()) {      
-      size_range(100, 100, viewport->w(), viewport->h());
-      size(viewport->w(), viewport->h());
-    } else {
-      // We need to turn off the size limitations for proper
-      // fullscreen support, but in case fullscreen is activated via
-      // the WM, this is a bit of a problem. In practice, it seems to
-      // work to change the size limits after we have recieved the
-      // FL_FULLSCREEN event, at least with my Metacity. 
-      size_range(100, 100, 0, 0);
-    }
-
     if (!fullscreenSystemKeys)
       break;
 
@@ -383,6 +380,65 @@
 }
 
 
+void DesktopWindow::handleResizeTimeout(void *data)
+{
+  DesktopWindow *self = (DesktopWindow *)data;
+
+  assert(self);
+
+  self->remoteResize();
+}
+
+
+void DesktopWindow::remoteResize()
+{
+  int width, height;
+  ScreenSet layout;
+
+  if (firstUpdate) {
+    if (sscanf(desktopSize.getValueStr(), "%dx%d", &width, &height) != 2)
+      return;
+  } else {
+    width = w();
+    height = h();
+  }
+
+  layout = cc->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;
+
+  // Do we actually change anything?
+  if ((width == cc->cp.width) &&
+      (height == cc->cp.height) &&
+      (layout == cc->cp.screenLayout))
+    return;
+
+  vlog.debug("Requesting framebuffer resize from %dx%d to %dx%d",
+             cc->cp.width, cc->cp.height, width, height);
+
+  cc->writer()->writeSetDesktopSize(width, height, layout);
+}
+
+
 void DesktopWindow::repositionViewport()
 {
   int new_x, new_y;
@@ -442,12 +498,9 @@
   else
     self->ungrabKeyboard();
 
-  if (fullScreen && !self->fullscreen_active()) {
-    // Some WMs (Metacity) apparently requires that the size limits
-    // are removed before fullscreen
-    self->size_range(100, 100, 0, 0);
+  if (fullScreen && !self->fullscreen_active())
     self->fullscreen();
-  } else if (!fullScreen && self->fullscreen_active())
+  else if (!fullScreen && self->fullscreen_active())
     self->fullscreen_off();
 #endif
 }

Modified: trunk/vncviewer/DesktopWindow.h
===================================================================
--- trunk/vncviewer/DesktopWindow.h	2012-07-04 11:10:46 UTC (rev 4923)
+++ trunk/vncviewer/DesktopWindow.h	2012-07-04 11:27:47 UTC (rev 4924)
@@ -86,6 +86,9 @@
 
   static void handleGrab(void *data);
 
+  static void handleResizeTimeout(void *data);
+  void remoteResize();
+
   void repositionViewport();
 
   static void handleClose(Fl_Widget *wnd, void *data);
@@ -93,7 +96,10 @@
   static void handleOptions(void *data);
 
 private:
+  CConn* cc;
   Viewport *viewport;
+
+  bool firstUpdate;
 };
 
 #endif

Modified: trunk/vncviewer/parameters.cxx
===================================================================
--- trunk/vncviewer/parameters.cxx	2012-07-04 11:10:46 UTC (rev 4923)
+++ trunk/vncviewer/parameters.cxx	2012-07-04 11:27:47 UTC (rev 4924)
@@ -68,6 +68,10 @@
 StringParameter desktopSize("DesktopSize",
                             "Reconfigure desktop size on the server on "
                             "connect (if possible)", "");
+BoolParameter remoteResize("RemoteResize",
+                           "Dynamically resize the remote desktop size as "
+                           "the size of the local client window changes. "
+                           "(Does not work with all servers)", true);
 
 BoolParameter viewOnly("ViewOnly",
                        "Don't send any mouse or keyboard events to the server",

Modified: trunk/vncviewer/parameters.h
===================================================================
--- trunk/vncviewer/parameters.h	2012-07-04 11:10:46 UTC (rev 4923)
+++ trunk/vncviewer/parameters.h	2012-07-04 11:27:47 UTC (rev 4924)
@@ -39,6 +39,7 @@
 
 extern rfb::BoolParameter fullScreen;
 extern rfb::StringParameter desktopSize;
+extern rfb::BoolParameter remoteResize;
 
 extern rfb::BoolParameter viewOnly;
 extern rfb::BoolParameter shared;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[4927] trunk/vncviewer
		From: <ossman_@us...> -	2012-07-05 09:23

			



                
                    
                        Revision: 4927
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4927&view=rev
Author:   ossman_
Date:     2012-07-05 09:23:03 +0000 (Thu, 05 Jul 2012)
Log Message:
-----------
Move the fullscreen option to a separate tab, in preparation for more
screen related options.

Modified Paths:
--------------
    trunk/vncviewer/OptionsDialog.cxx
    trunk/vncviewer/OptionsDialog.h

Modified: trunk/vncviewer/OptionsDialog.cxx
===================================================================
--- trunk/vncviewer/OptionsDialog.cxx	2012-07-04 11:37:48 UTC (rev 4926)
+++ trunk/vncviewer/OptionsDialog.cxx	2012-07-05 09:23:03 UTC (rev 4927)
@@ -67,6 +67,7 @@
     createCompressionPage(tx, ty, tw, th);
     createSecurityPage(tx, ty, tw, th);
     createInputPage(tx, ty, tw, th);
+    createScreenPage(tx, ty, tw, th);
     createMiscPage(tx, ty, tw, th);
   }
 
@@ -269,9 +270,11 @@
     if (!strcmp(getMenuKeySymbols()[i].name, menuKeyBuf))
       menuKeyChoice->value(i + 1);
 
+  /* Screen */
+  fullScreenCheckbox->value(fullScreen);
+
   /* Misc. */
   sharedCheckbox->value(shared);
-  fullScreenCheckbox->value(fullScreen);
   dotCursorCheckbox->value(dotWhenNoCursor);
 }
 
@@ -356,9 +359,11 @@
     menuKey.setParam(menuKeyChoice->text());
   }
 
+  /* Screen */
+  fullScreen.setParam(fullScreenCheckbox->value());
+
   /* Misc. */
   shared.setParam(sharedCheckbox->value());
-  fullScreen.setParam(fullScreenCheckbox->value());
   dotWhenNoCursor.setParam(dotCursorCheckbox->value());
 
   std::map<OptionsCallback*, void*>::const_iterator iter;
@@ -686,6 +691,23 @@
 }
 
 
+void OptionsDialog::createScreenPage(int tx, int ty, int tw, int th)
+{
+  Fl_Group *group = new Fl_Group(tx, ty, tw, th, _("Screen"));
+
+  tx += OUTER_MARGIN;
+  ty += OUTER_MARGIN;
+
+  fullScreenCheckbox = new Fl_Check_Button(LBLRIGHT(tx, ty,
+                                                  CHECK_MIN_WIDTH,
+                                                  CHECK_HEIGHT,
+                                                  _("Full-screen mode")));
+  ty += CHECK_HEIGHT + TIGHT_MARGIN;
+
+  group->end();
+}
+
+
 void OptionsDialog::createMiscPage(int tx, int ty, int tw, int th)
 {
   Fl_Group *group = new Fl_Group(tx, ty, tw, th, _("Misc."));
@@ -699,12 +721,6 @@
                                                   _("Shared (don't disconnect other viewers)")));
   ty += CHECK_HEIGHT + TIGHT_MARGIN;
 
-  fullScreenCheckbox = new Fl_Check_Button(LBLRIGHT(tx, ty,
-                                                  CHECK_MIN_WIDTH,
-                                                  CHECK_HEIGHT,
-                                                  _("Full-screen mode")));
-  ty += CHECK_HEIGHT + TIGHT_MARGIN;
-
   dotCursorCheckbox = new Fl_Check_Button(LBLRIGHT(tx, ty,
                                                   CHECK_MIN_WIDTH,
                                                   CHECK_HEIGHT,

Modified: trunk/vncviewer/OptionsDialog.h
===================================================================
--- trunk/vncviewer/OptionsDialog.h	2012-07-04 11:37:48 UTC (rev 4926)
+++ trunk/vncviewer/OptionsDialog.h	2012-07-05 09:23:03 UTC (rev 4927)
@@ -50,6 +50,7 @@
   void createCompressionPage(int tx, int ty, int tw, int th);
   void createSecurityPage(int tx, int ty, int tw, int th);
   void createInputPage(int tx, int ty, int tw, int th);
+  void createScreenPage(int tx, int ty, int tw, int th);
   void createMiscPage(int tx, int ty, int tw, int th);
 
   static void handleAutoselect(Fl_Widget *widget, void *data);
@@ -105,9 +106,11 @@
   Fl_Check_Button *systemKeysCheckbox;
   Fl_Choice *menuKeyChoice;
 
+  /* Screen */
+  Fl_Check_Button *fullScreenCheckbox;
+
   /* Misc. */
   Fl_Check_Button *sharedCheckbox;
-  Fl_Check_Button *fullScreenCheckbox;
   Fl_Check_Button *dotCursorCheckbox;
 };
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[4928] trunk/vncviewer
		From: <ossman_@us...> -	2012-07-05 11:01

			



                
                    
                        Revision: 4928
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4928&view=rev
Author:   ossman_
Date:     2012-07-05 11:01:23 +0000 (Thu, 05 Jul 2012)
Log Message:
-----------
Make DesktopSize configurable from the options dialog.

Modified Paths:
--------------
    trunk/vncviewer/OptionsDialog.cxx
    trunk/vncviewer/OptionsDialog.h

Modified: trunk/vncviewer/OptionsDialog.cxx
===================================================================
--- trunk/vncviewer/OptionsDialog.cxx	2012-07-05 09:23:03 UTC (rev 4927)
+++ trunk/vncviewer/OptionsDialog.cxx	2012-07-05 11:01:23 UTC (rev 4928)
@@ -271,8 +271,24 @@
       menuKeyChoice->value(i + 1);
 
   /* Screen */
+  int width, height;
+
+  if (sscanf(desktopSize.getValueStr(), "%dx%d", &width, &height) != 2) {
+    desktopSizeCheckbox->value(false);
+    desktopWidthInput->value("1024");
+    desktopHeightInput->value("768");
+  } else {
+    char buf[32];
+    desktopSizeCheckbox->value(true);
+    snprintf(buf, sizeof(buf), "%d", width);
+    desktopWidthInput->value(buf);
+    snprintf(buf, sizeof(buf), "%d", height);
+    desktopHeightInput->value(buf);
+  }
   fullScreenCheckbox->value(fullScreen);
 
+  handleDesktopSize(desktopSizeCheckbox, this);
+
   /* Misc. */
   sharedCheckbox->value(shared);
   dotCursorCheckbox->value(dotWhenNoCursor);
@@ -360,6 +376,17 @@
   }
 
   /* Screen */
+  int width, height;
+
+  if (desktopSizeCheckbox->value() &&
+      (sscanf(desktopWidthInput->value(), "%d", &width) == 1) &&
+      (sscanf(desktopHeightInput->value(), "%d", &height) == 1)) {
+    char buf[64];
+    snprintf(buf, sizeof(buf), "%dx%d", width, height);
+    desktopSize.setParam(buf);
+  } else {
+    desktopSize.setParam("");
+  }
   fullScreen.setParam(fullScreenCheckbox->value());
 
   /* Misc. */
@@ -693,11 +720,26 @@
 
 void OptionsDialog::createScreenPage(int tx, int ty, int tw, int th)
 {
+  int x;
+
   Fl_Group *group = new Fl_Group(tx, ty, tw, th, _("Screen"));
 
   tx += OUTER_MARGIN;
   ty += OUTER_MARGIN;
 
+  desktopSizeCheckbox = new Fl_Check_Button(LBLRIGHT(tx, ty,
+                                                     CHECK_MIN_WIDTH,
+                                                     CHECK_HEIGHT,
+                                                     _("Resize remote session on connect")));
+  desktopSizeCheckbox->callback(handleDesktopSize, this);
+  ty += CHECK_HEIGHT + TIGHT_MARGIN;
+
+  desktopWidthInput = new Fl_Int_Input(tx + INDENT, ty, 50, INPUT_HEIGHT);
+  x = desktopWidthInput->x() + desktopWidthInput->w() + \
+      gui_str_len("x") + 3 * 2;
+  desktopHeightInput = new Fl_Int_Input(x, ty, 50, INPUT_HEIGHT, "x");
+  ty += INPUT_HEIGHT + TIGHT_MARGIN;
+
   fullScreenCheckbox = new Fl_Check_Button(LBLRIGHT(tx, ty,
                                                   CHECK_MIN_WIDTH,
                                                   CHECK_HEIGHT,
@@ -785,6 +827,19 @@
 }
 
 
+void OptionsDialog::handleDesktopSize(Fl_Widget *widget, void *data)
+{
+  OptionsDialog *dialog = (OptionsDialog*)data;
+
+  if (dialog->desktopSizeCheckbox->value()) {
+    dialog->desktopWidthInput->activate();
+    dialog->desktopHeightInput->activate();
+  } else {
+    dialog->desktopWidthInput->deactivate();
+    dialog->desktopHeightInput->deactivate();
+  }
+}
+
 void OptionsDialog::handleCancel(Fl_Widget *widget, void *data)
 {
   OptionsDialog *dialog = (OptionsDialog*)data;

Modified: trunk/vncviewer/OptionsDialog.h
===================================================================
--- trunk/vncviewer/OptionsDialog.h	2012-07-05 09:23:03 UTC (rev 4927)
+++ trunk/vncviewer/OptionsDialog.h	2012-07-05 11:01:23 UTC (rev 4928)
@@ -59,6 +59,8 @@
 
   static void handleX509(Fl_Widget *widget, void *data);
 
+  static void handleDesktopSize(Fl_Widget *widget, void *data);
+
   static void handleCancel(Fl_Widget *widget, void *data);
   static void handleOK(Fl_Widget *widget, void *data);
 
@@ -107,6 +109,9 @@
   Fl_Choice *menuKeyChoice;
 
   /* Screen */
+  Fl_Check_Button *desktopSizeCheckbox;
+  Fl_Int_Input *desktopWidthInput;
+  Fl_Int_Input *desktopHeightInput;
   Fl_Check_Button *fullScreenCheckbox;
 
   /* Misc. */

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[4929] trunk/vncviewer
		From: <ossman_@us...> -	2012-07-05 11:06

			



                
                    
                        Revision: 4929
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4929&view=rev
Author:   ossman_
Date:     2012-07-05 11:06:18 +0000 (Thu, 05 Jul 2012)
Log Message:
-----------
Make RemoteResize configurable from the options dialog.

Modified Paths:
--------------
    trunk/vncviewer/OptionsDialog.cxx
    trunk/vncviewer/OptionsDialog.h

Modified: trunk/vncviewer/OptionsDialog.cxx
===================================================================
--- trunk/vncviewer/OptionsDialog.cxx	2012-07-05 11:01:23 UTC (rev 4928)
+++ trunk/vncviewer/OptionsDialog.cxx	2012-07-05 11:06:18 UTC (rev 4929)
@@ -285,6 +285,7 @@
     snprintf(buf, sizeof(buf), "%d", height);
     desktopHeightInput->value(buf);
   }
+  remoteResizeCheckbox->value(remoteResize);
   fullScreenCheckbox->value(fullScreen);
 
   handleDesktopSize(desktopSizeCheckbox, this);
@@ -387,6 +388,7 @@
   } else {
     desktopSize.setParam("");
   }
+  remoteResize.setParam(remoteResizeCheckbox->value());
   fullScreen.setParam(fullScreenCheckbox->value());
 
   /* Misc. */
@@ -740,6 +742,12 @@
   desktopHeightInput = new Fl_Int_Input(x, ty, 50, INPUT_HEIGHT, "x");
   ty += INPUT_HEIGHT + TIGHT_MARGIN;
 
+  remoteResizeCheckbox = new Fl_Check_Button(LBLRIGHT(tx, ty,
+                                                      CHECK_MIN_WIDTH,
+                                                      CHECK_HEIGHT,
+                                                      _("Resize remote session to the local window")));
+  ty += CHECK_HEIGHT + TIGHT_MARGIN;
+
   fullScreenCheckbox = new Fl_Check_Button(LBLRIGHT(tx, ty,
                                                   CHECK_MIN_WIDTH,
                                                   CHECK_HEIGHT,

Modified: trunk/vncviewer/OptionsDialog.h
===================================================================
--- trunk/vncviewer/OptionsDialog.h	2012-07-05 11:01:23 UTC (rev 4928)
+++ trunk/vncviewer/OptionsDialog.h	2012-07-05 11:06:18 UTC (rev 4929)
@@ -112,6 +112,7 @@
   Fl_Check_Button *desktopSizeCheckbox;
   Fl_Int_Input *desktopWidthInput;
   Fl_Int_Input *desktopHeightInput;
+  Fl_Check_Button *remoteResizeCheckbox;
   Fl_Check_Button *fullScreenCheckbox;
 
   /* Misc. */

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[4930] trunk/vncviewer
		From: <ossman_@us...> -	2012-07-10 11:11

			



                
                    
                        Revision: 4930
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4930&view=rev
Author:   ossman_
Date:     2012-07-10 11:11:23 +0000 (Tue, 10 Jul 2012)
Log Message:
-----------
Hide the full screen setting when support isn't present.

Modified Paths:
--------------
    trunk/vncviewer/OptionsDialog.cxx
    trunk/vncviewer/parameters.cxx
    trunk/vncviewer/parameters.h

Modified: trunk/vncviewer/OptionsDialog.cxx
===================================================================
--- trunk/vncviewer/OptionsDialog.cxx	2012-07-05 11:06:18 UTC (rev 4929)
+++ trunk/vncviewer/OptionsDialog.cxx	2012-07-10 11:11:23 UTC (rev 4930)
@@ -286,7 +286,9 @@
     desktopHeightInput->value(buf);
   }
   remoteResizeCheckbox->value(remoteResize);
+#ifdef HAVE_FLTK_FULLSCREEN
   fullScreenCheckbox->value(fullScreen);
+#endif // HAVE_FLTK_FULLSCREEN
 
   handleDesktopSize(desktopSizeCheckbox, this);
 
@@ -389,7 +391,9 @@
     desktopSize.setParam("");
   }
   remoteResize.setParam(remoteResizeCheckbox->value());
+#ifdef HAVE_FLTK_FULLSCREEN
   fullScreen.setParam(fullScreenCheckbox->value());
+#endif // HAVE_FLTK_FULLSCREEN
 
   /* Misc. */
   shared.setParam(sharedCheckbox->value());
@@ -748,12 +752,16 @@
                                                       _("Resize remote session to the local window")));
   ty += CHECK_HEIGHT + TIGHT_MARGIN;
 
+#ifdef HAVE_FLTK_FULLSCREEN
+
   fullScreenCheckbox = new Fl_Check_Button(LBLRIGHT(tx, ty,
                                                   CHECK_MIN_WIDTH,
                                                   CHECK_HEIGHT,
                                                   _("Full-screen mode")));
   ty += CHECK_HEIGHT + TIGHT_MARGIN;
 
+#endif // HAVE_FLTK_FULLSCREEN
+
   group->end();
 }
 

Modified: trunk/vncviewer/parameters.cxx
===================================================================
--- trunk/vncviewer/parameters.cxx	2012-07-05 11:06:18 UTC (rev 4929)
+++ trunk/vncviewer/parameters.cxx	2012-07-10 11:11:23 UTC (rev 4930)
@@ -64,7 +64,9 @@
                           "JPEG quality level. 0 = Low, 9 = High",
                           8);
 
+#ifdef HAVE_FLTK_FULLSCREEN
 BoolParameter fullScreen("FullScreen", "Full screen mode", false);
+#endif // HAVE_FLTK_FULLSCREEN
 StringParameter desktopSize("DesktopSize",
                             "Reconfigure desktop size on the server on "
                             "connect (if possible)", "");

Modified: trunk/vncviewer/parameters.h
===================================================================
--- trunk/vncviewer/parameters.h	2012-07-05 11:06:18 UTC (rev 4929)
+++ trunk/vncviewer/parameters.h	2012-07-10 11:11:23 UTC (rev 4930)
@@ -37,7 +37,9 @@
 extern rfb::BoolParameter noJpeg;
 extern rfb::IntParameter qualityLevel;
 
+#ifdef HAVE_FLTK_FULLSCREEN
 extern rfb::BoolParameter fullScreen;
+#endif // HAVE_FLTK_FULLSCREEN
 extern rfb::StringParameter desktopSize;
 extern rfb::BoolParameter remoteResize;
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[4949] trunk/vncviewer
		From: <astrand@us...> -	2012-08-01 08:09

			



                
                    
                        Revision: 4949
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4949&view=rev
Author:   astrand
Date:     2012-08-01 08:09:09 +0000 (Wed, 01 Aug 2012)
Log Message:
-----------
Added new option "-Maximize", for maximizing the window at startup.

Modified Paths:
--------------
    trunk/vncviewer/DesktopWindow.cxx
    trunk/vncviewer/DesktopWindow.h
    trunk/vncviewer/parameters.cxx
    trunk/vncviewer/parameters.h
    trunk/vncviewer/vncviewer.man

Modified: trunk/vncviewer/DesktopWindow.cxx
===================================================================
--- trunk/vncviewer/DesktopWindow.cxx	2012-07-22 20:25:57 UTC (rev 4948)
+++ trunk/vncviewer/DesktopWindow.cxx	2012-08-01 08:09:09 UTC (rev 4949)
@@ -90,6 +90,13 @@
 
   show();
 
+  // Unfortunately, current FLTK does not allow us to set the
+  // maximized property before showing the window. See STR #2083 and
+  // STR #2178
+  if (maximize) {
+    maximizeWindow();
+  }
+
   // The window manager might give us an initial window size that is different
   // than the one we requested, and in those cases we need to manually adjust
   // the scroll widget for things to behave sanely.
@@ -428,6 +435,43 @@
 }
 
 
+#define _NET_WM_STATE_ADD           1  /* add/set property */
+void DesktopWindow::maximizeWindow()
+{
+#if defined(WIN32)
+  WINDOWPLACEMENT wp;
+  wp.length = sizeof(WINDOWPLACEMENT);
+  GetWindowPlacement(fl_xid(this), &wp);
+  wp.showCmd = SW_MAXIMIZE;
+  SetWindowPlacement(fl_xid(this), &wp);
+#elif defined(__APPLE__)
+  /* OS X is somewhat strange and does not really have a concept of a
+     maximized window, so we can simply resize the window to the workarea */
+  int X, Y, W, H;
+  Fl::screen_work_area(X, Y, W, H, this->x(), this->y());
+  size(W, H);
+#else
+  // X11
+  fl_open_display();
+  Atom net_wm_state = XInternAtom (fl_display, "_NET_WM_STATE", 0);
+  Atom net_wm_state_maximized_vert = XInternAtom (fl_display, "_NET_WM_STATE_MAXIMIZED_VERT", 0);
+  Atom net_wm_state_maximized_horz = XInternAtom (fl_display, "_NET_WM_STATE_MAXIMIZED_HORZ", 0);
+
+  XEvent e;
+  e.xany.type = ClientMessage;
+  e.xany.window = fl_xid(this);
+  e.xclient.message_type = net_wm_state;
+  e.xclient.format = 32;
+  e.xclient.data.l[0] = _NET_WM_STATE_ADD;
+  e.xclient.data.l[1] = net_wm_state_maximized_vert;
+  e.xclient.data.l[2] = net_wm_state_maximized_horz;
+  e.xclient.data.l[3] = 0;
+  e.xclient.data.l[4] = 0;
+  XSendEvent(fl_display, RootWindow(fl_display, fl_screen), 0, SubstructureNotifyMask | SubstructureRedirectMask, &e);
+#endif
+}
+
+
 void DesktopWindow::handleResizeTimeout(void *data)
 {
   DesktopWindow *self = (DesktopWindow *)data;

Modified: trunk/vncviewer/DesktopWindow.h
===================================================================
--- trunk/vncviewer/DesktopWindow.h	2012-07-22 20:25:57 UTC (rev 4948)
+++ trunk/vncviewer/DesktopWindow.h	2012-08-01 08:09:09 UTC (rev 4949)
@@ -88,6 +88,8 @@
 
   static void handleGrab(void *data);
 
+  void maximizeWindow();
+
   static void handleResizeTimeout(void *data);
   void remoteResize();
 

Modified: trunk/vncviewer/parameters.cxx
===================================================================
--- trunk/vncviewer/parameters.cxx	2012-07-22 20:25:57 UTC (rev 4948)
+++ trunk/vncviewer/parameters.cxx	2012-08-01 08:09:09 UTC (rev 4949)
@@ -64,6 +64,7 @@
                           "JPEG quality level. 0 = Low, 9 = High",
                           8);
 
+BoolParameter maximize("Maximize", "Maximize viewer window", false);
 #ifdef HAVE_FLTK_FULLSCREEN
 BoolParameter fullScreen("FullScreen", "Full screen mode", false);
 #ifdef HAVE_FLTK_FULLSCREEN_SCREENS

Modified: trunk/vncviewer/parameters.h
===================================================================
--- trunk/vncviewer/parameters.h	2012-07-22 20:25:57 UTC (rev 4948)
+++ trunk/vncviewer/parameters.h	2012-08-01 08:09:09 UTC (rev 4949)
@@ -39,6 +39,7 @@
 
 #ifdef HAVE_FLTK_FULLSCREEN
 extern rfb::BoolParameter fullScreen;
+extern rfb::BoolParameter maximize;
 #ifdef HAVE_FLTK_FULLSCREEN_SCREENS
 extern rfb::BoolParameter fullScreenAllMonitors;
 #endif // HAVE_FLTK_FULLSCREEN_SCREENS

Modified: trunk/vncviewer/vncviewer.man
===================================================================
--- trunk/vncviewer/vncviewer.man	2012-07-22 20:25:57 UTC (rev 4948)
+++ trunk/vncviewer/vncviewer.man	2012-08-01 08:09:09 UTC (rev 4949)
@@ -132,6 +132,10 @@
 .B \-Shared.
 
 .TP
+.B \-Maximize
+Maximize viewer window. 
+
+.TP
 .B \-FullScreen
 Start in full-screen mode.
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[4950] trunk/vncviewer
		From: <astrand@us...> -	2012-08-08 11:49

			



                
                    
                        Revision: 4950
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4950&view=rev
Author:   astrand
Date:     2012-08-08 11:49:01 +0000 (Wed, 08 Aug 2012)
Log Message:
-----------
Make it possible to load and save configuration files. Also, when
connecting, the options are saved as default settings. This patch
fixes SF bugs 3481470 and 3499216. 

Modified Paths:
--------------
    trunk/vncviewer/ServerDialog.cxx
    trunk/vncviewer/ServerDialog.h
    trunk/vncviewer/parameters.cxx
    trunk/vncviewer/parameters.h
    trunk/vncviewer/vncviewer.cxx

Modified: trunk/vncviewer/ServerDialog.cxx
===================================================================
--- trunk/vncviewer/ServerDialog.cxx	2012-08-01 08:09:09 UTC (rev 4949)
+++ trunk/vncviewer/ServerDialog.cxx	2012-08-08 11:49:01 UTC (rev 4950)
@@ -1,4 +1,5 @@
 /* Copyright 2011 Pierre Ossman <ossman@...> for Cendio AB
+ * Copyright 2012 Samuel Mannehed <samuel@...> for Cendio AB
  * 
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,36 +26,76 @@
 #include <FL/Fl_Button.H>
 #include <FL/Fl_Return_Button.H>
 #include <FL/fl_draw.H>
+#include <FL/fl_ask.H>
+#include <FL/Fl_Box.H>
+#include <FL/Fl_File_Chooser.H>
 
 #include "ServerDialog.h"
 #include "OptionsDialog.h"
 #include "fltk_layout.h"
 #include "i18n.h"
 #include "vncviewer.h"
+#include "parameters.h"
+#include "rfb/Exception.h"
 
 ServerDialog::ServerDialog()
-  : Fl_Window(400, 112, _("VNC Viewer: Connection Details"))
+  : Fl_Window(450, 160, _("VNC Viewer: Connection Details"))
 {
-  int width;
+  int x, y;
   Fl_Button *button;
+  Fl_Box *divider;
 
-  width = gui_str_len(_("VNC server:"));
-  serverName = new Fl_Input(20 + width, 20, w() - 20*2 - width, 25, _("VNC server:"));
+  int margin = 20;
+  int server_label_width = gui_str_len(_("VNC server:"));
 
-  width = (w() - 20) / 4;
+  x = margin + server_label_width;
+  y = margin;
+  
+  serverName = new Fl_Input(x, y, w() - margin*2 - server_label_width, INPUT_HEIGHT, _("VNC server:"));
 
-  button = new Fl_Button(20 + width*0, 20+25+20, width - 20, 27, _("About..."));
-  button->callback(this->handleAbout, this);
+  int adjust = (w() - 20) / 4;
+  int button_width = adjust - margin/2;
 
-  button = new Fl_Button(20 + width*1, 20+25+20, width - 20, 27, _("Options..."));
+  x = margin;
+  y = margin + margin/2 + INPUT_HEIGHT;
+
+  y += margin/2;
+
+  button = new Fl_Button(x, y, button_width, BUTTON_HEIGHT, _("Options..."));
   button->callback(this->handleOptions, this);
+  
+  x += adjust;
+  
+  button = new Fl_Button(x, y, button_width, BUTTON_HEIGHT, _("Load..."));
+  button->callback(this->handleLoad, this);
 
-  button = new Fl_Button(20 + width*2, 20+25+20, width - 20, 27, _("Cancel"));
+  x += adjust;
+
+  button = new Fl_Button(x, y, button_width, BUTTON_HEIGHT, _("Save As..."));
+  button->callback(this->handleSaveAs, this);
+  
+  x = 0;
+  y += margin/2 + BUTTON_HEIGHT;
+
+  divider = new Fl_Box(x, y, w(), 2);
+  divider->box(FL_THIN_DOWN_FRAME);
+  
+  x += margin;
+  y += margin/2;
+
+  button = new Fl_Button(x, y, button_width, BUTTON_HEIGHT, _("About..."));
+  button->callback(this->handleAbout, this);
+
+  x = w() - margin - adjust - button_width - 20;
+
+  button = new Fl_Button(x, y, button_width, BUTTON_HEIGHT, _("Cancel"));
   button->callback(this->handleCancel, this);
 
-  button = new Fl_Return_Button(20 + width*3, 20+25+20, width - 20, 27, _("OK"));
-  button->callback(this->handleOK, this);
+  x += adjust;
 
+  button = new Fl_Return_Button(x, y, button_width+20, BUTTON_HEIGHT, _("Connect"));
+  button->callback(this->handleConnect, this);
+
   callback(this->handleCancel, this);
 
   set_modal();
@@ -66,11 +107,13 @@
 }
 
 
-const char *ServerDialog::run()
+const char *ServerDialog::run(const char* servername)
 {
   ServerDialog dialog;
   static char buffer[256];
 
+  dialog.serverName->value(servername);
+  
   dialog.show();
   while (dialog.shown()) Fl::wait();
 
@@ -83,16 +126,101 @@
   return buffer;
 }
 
+void ServerDialog::handleOptions(Fl_Widget *widget, void *data)
+{
+  OptionsDialog::showDialog();
+}
 
-void ServerDialog::handleAbout(Fl_Widget *widget, void *data)
+
+void ServerDialog::handleLoad(Fl_Widget *widget, void *data)
 {
-  about_vncviewer();
+  ServerDialog *dialog = (ServerDialog*)data;
+  Fl_File_Chooser* file_chooser = new Fl_File_Chooser("", "TigerVNC configuration (*.tigervnc)", 
+						      0, "Select a TigerVNC configuration file");
+  file_chooser->preview(0);
+  file_chooser->previewButton->hide();
+  file_chooser->show();
+  
+  // Block until user picks something.
+  while(file_chooser->shown())
+    Fl::wait();
+  
+  // Did the user hit cancel?
+  if (file_chooser->value() == NULL) {
+    delete(file_chooser);
+    return;
+  }
+  
+  const char* filename = strdup(file_chooser->value());
+
+  try {
+    dialog->serverName->value(loadViewerParameters(filename));
+  } catch (rfb::Exception& e) {
+    fl_alert("%s", e.str());
+  }
+
+  delete(file_chooser);
 }
 
 
-void ServerDialog::handleOptions(Fl_Widget *widget, void *data)
+void ServerDialog::handleSaveAs(Fl_Widget *widget, void *data)
+{ 
+  ServerDialog *dialog = (ServerDialog*)data;
+  const char* servername = strdup(dialog->serverName->value());
+  char* filename;
+
+  Fl_File_Chooser* file_chooser = new Fl_File_Chooser("", "TigerVNC configuration (*.tigervnc)", 
+						      2, "Save the TigerVNC configuration to file");
+  
+  file_chooser->preview(0);
+  file_chooser->previewButton->hide();
+  file_chooser->show();
+  
+  while(1) {
+    
+    // Block until user picks something.
+    while(file_chooser->shown())
+      Fl::wait();
+    
+    // Did the user hit cancel?
+    if (file_chooser->value() == NULL) {
+      delete(file_chooser);
+      return;
+    }
+    
+    filename = strdup(file_chooser->value());
+    
+    FILE* f = fopen(filename, "r");
+    if (f) {
+
+      // The file already exists.
+      fclose(f);
+      int overwrite_choice = fl_choice("%s already exists. Do you want to overwrite?", 
+				       "Overwrite", "No", NULL, filename);
+      if (overwrite_choice == 1) {
+
+	// If the user doesn't want to overwrite:
+	file_chooser->show();
+	continue;
+      }
+    }
+
+    break;
+  }
+  
+  try {
+    saveViewerParameters(filename, servername);
+  } catch (rfb::Exception& e) {
+    fl_alert("%s", e.str());
+  }
+  
+  delete(file_chooser);
+}
+
+
+void ServerDialog::handleAbout(Fl_Widget *widget, void *data)
 {
-  OptionsDialog::showDialog();
+  about_vncviewer();
 }
 
 
@@ -105,9 +233,16 @@
 }
 
 
-void ServerDialog::handleOK(Fl_Widget *widget, void *data)
+void ServerDialog::handleConnect(Fl_Widget *widget, void *data)
 {
   ServerDialog *dialog = (ServerDialog*)data;
+  const char* servername = strdup(dialog->serverName->value());
 
   dialog->hide();
+  
+  try {
+    saveViewerParameters(NULL, servername);
+  } catch (rfb::Exception& e) {
+    fl_alert("%s", e.str());
+  }
 }

Modified: trunk/vncviewer/ServerDialog.h
===================================================================
--- trunk/vncviewer/ServerDialog.h	2012-08-01 08:09:09 UTC (rev 4949)
+++ trunk/vncviewer/ServerDialog.h	2012-08-08 11:49:01 UTC (rev 4950)
@@ -21,6 +21,7 @@
 
 #include <FL/Fl_Window.H>
 #include <FL/Fl_Input.H>
+#include <FL/Fl_File_Chooser.H>
 
 class ServerDialog : public Fl_Window {
 protected:
@@ -28,13 +29,15 @@
   ~ServerDialog();
 
 public:
-  static const char *run();
+  static const char *run(const char* servername);
 
 protected:
+  static void handleOptions(Fl_Widget *widget, void *data);
+  static void handleLoad(Fl_Widget *widget, void *data);
+  static void handleSaveAs(Fl_Widget *widget, void *data);
   static void handleAbout(Fl_Widget *widget, void *data);
-  static void handleOptions(Fl_Widget *widget, void *data);
   static void handleCancel(Fl_Widget *widget, void *data);
-  static void handleOK(Fl_Widget *widget, void *data);
+  static void handleConnect(Fl_Widget *widget, void *data);
 
 protected:
   Fl_Input *serverName;

Modified: trunk/vncviewer/parameters.cxx
===================================================================
--- trunk/vncviewer/parameters.cxx	2012-08-01 08:09:09 UTC (rev 4949)
+++ trunk/vncviewer/parameters.cxx	2012-08-08 11:49:01 UTC (rev 4950)
@@ -1,5 +1,6 @@
 /* Copyright (C) 2002-2005 RealVNC Ltd.  All Rights Reserved.
  * Copyright 2011 Pierre Ossman <ossman@...> for Cendio AB
+ * Copyright 2012 Samuel Mannehed <samuel@...> for Cendio AB
  * 
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,10 +22,33 @@
 #include <config.h>
 #endif
 
+#ifdef HAVE_GNUTLS
+#include <rfb/CSecurityTLS.h>
+#endif
+
+#ifdef _WIN32
+#include <windows.h>
+#include <tchar.h>
+#endif
+
 #include "parameters.h"
 
+#include <os/os.h>
+#include <rfb/Exception.h>
+#include <rfb/LogWriter.h>
+#include <rfb/SecurityClient.h>
+
+#include <FL/fl_utf8.h>
+
+#include <stdio.h>
+#include <string.h>
+#include <limits.h>
+
 using namespace rfb;
 
+static LogWriter vlog("Parameters");
+
+
 IntParameter pointerEventInterval("PointerEventInterval",
                                   "Time in milliseconds to rate-limit"
                                   " successive pointer events", 0);
@@ -107,3 +131,556 @@
                                    "to the server when in full screen mode.",
                                    true);
 
+const char* IDENTIFIER_STRING = "TigerVNC Configuration file Version 1.0";
+
+VoidParameter* parameterArray[] = {
+#ifdef HAVE_GNUTLS
+  &CSecurityTLS::x509ca,
+  &CSecurityTLS::x509crl,
+#endif // HAVE_GNUTLS
+  &SecurityClient::secTypes,
+  &dotWhenNoCursor,
+  &autoSelect,
+  &fullColour,
+  &lowColourLevel,
+  &preferredEncoding,
+  &customCompressLevel,
+  &compressLevel,
+  &noJpeg,
+  &qualityLevel,
+#ifdef HAVE_FLTK_FULLSCREEN
+  &fullScreen,
+#ifdef HAVE_FLTK_FULLSCREEN_SCREENS
+  &fullScreenAllMonitors,
+#endif // HAVE_FLTK_FULLSCREEN_SCREENS
+#endif // HAVE_FLTK_FULLSCREEN
+  &desktopSize,
+  &remoteResize,
+  &viewOnly,
+  &shared,
+  &acceptClipboard,
+  &sendClipboard,
+  &sendPrimary,
+  &menuKey,
+  &fullscreenSystemKeys
+};
+
+// Encoding Table
+static struct {
+  const char first;
+  const char second;
+} replaceMap[] = {'\n', 'n',
+                  '\r', 'r'};
+
+bool encodeValue(const char* val, char* dest, size_t destSize) {
+
+  bool normalCharacter = true;
+  size_t pos = 0;
+
+  for (int i = 0; (val[i] != '\0') && (i < (destSize - 1)); i++) {
+    
+    // Check for sequences which will need encoding
+    if (val[i] == '\\') {
+
+      strncpy(dest+pos, "\\\\", 2);
+      pos++;
+      if (pos >= destSize) {
+	vlog.error("Encoding backslash: The size of the buffer dest is to small, "
+		   "it needs to be more than %d bytes bigger.", (destSize - 1 - i));
+	return false;
+      }
+
+    } else {
+
+      for (int j = 0; j < sizeof(replaceMap)/sizeof(replaceMap[0]); j++)
+
+	if (val[i] == replaceMap[j].first) {
+	  dest[pos] = '\\';
+	  pos++;
+	  if (pos >= destSize) {
+	    vlog.error("Encoding escape sequence: The size of the buffer dest is to small, "
+		       "it needs to be more than %d bytes bigger.", (destSize - 1 - i));
+	    return false;
+	  }
+
+	  dest[pos] = replaceMap[j].second;
+	  normalCharacter = false;
+	  break;
+	}
+
+      if (normalCharacter) {
+	dest[pos] = val[i];
+      }
+    }
+    normalCharacter = true; // Reset for next loop
+
+    pos++;
+    if (pos >= destSize) {
+      vlog.error("Encoding normal character: The size of the buffer dest is to small, "
+		 "it needs to be more than %d bytes bigger.", (destSize - 1 - i));
+      return false;
+    }
+
+  }
+
+  dest[pos] = '\0';
+  return true;
+}
+
+
+bool decodeValue(const char* val, char* dest, size_t destSize) {
+
+  size_t pos = 0;
+  bool escapedCharacter = false;
+  
+  for (int i = 0; (val[i] != '\0') && (i < (destSize - 1)); i++) {
+    
+    // Check for escape sequences
+    if (val[i] == '\\') {
+      
+      for (int j = 0; j < sizeof(replaceMap)/sizeof(replaceMap[0]); j++) {
+	if (val[i+1] == replaceMap[j].second) {
+	  dest[pos] = replaceMap[j].first;
+	  escapedCharacter = true;
+	  pos--;
+	  break;
+	}
+      }
+
+      if (!escapedCharacter) {
+	if (val[i+1] == '\\') {
+	  dest[pos] = val[i];
+	  i++;
+	} else {
+	  vlog.error("Unknown escape sequence at character %d", i);
+	  return false;
+	}
+      }
+
+    } else {
+      dest[pos] = val[i];
+    }
+
+    escapedCharacter = false; // Reset for next loop
+    pos++;
+    if (pos >= destSize) {
+      vlog.error("Decoding: The size of the buffer dest is to small, "
+		 "it needs to be 1 byte bigger.");
+      return false;
+    }
+  }
+  
+  dest[pos] = '\0';
+  return true;
+}
+
+
+#ifdef _WIN32
+void setKeyString(const char *_name, const char *_value, HKEY* hKey) {
+  
+  const DWORD buffersize = 256;
+
+  wchar_t name[buffersize];
+  unsigned size = fl_utf8towc(_name, strlen(_name)+1, name, buffersize);
+  if (size >= buffersize) {
+    vlog.error("Could not convert the parameter-name %s to wchar_t* when "
+	       "writing to the Registry, the buffersize is to small.", _name);
+    return;
+  }
+
+  char encodingBuffer[buffersize];
+  if (!encodeValue(_value, encodingBuffer, buffersize)) {
+    vlog.error("Could not encode the parameter-value %s when "
+	       "writing to the Registry.", _value);
+    return;
+  }
+
+  wchar_t value[buffersize];
+  size = fl_utf8towc(encodingBuffer, strlen(encodingBuffer)+1, value, buffersize);
+  if (size >= buffersize) {
+    vlog.error("Could not convert the parameter-value %s to wchar_t* when "
+	       "writing to the Registry, the buffersize is to small.", _value);
+    return;
+  }
+
+  LONG res = RegSetValueExW(*hKey, name, 0, REG_SZ, (BYTE*)&value, (wcslen(value)+1)*2);
+  if (res != ERROR_SUCCESS) {
+    vlog.error("Error(%d) writing %s(REG_SZ) to Registry.", res, _value);
+    return;
+  }
+}
+
+
+void setKeyInt(const char *_name, const int _value, HKEY* hKey) {
+
+  const DWORD buffersize = 256;
+  wchar_t name[buffersize];
+  DWORD value = _value;
+
+  unsigned size = fl_utf8towc(_name, strlen(_name)+1, name, buffersize);
+  if (size >= buffersize) {
+    vlog.error("Could not convert the parameter-name %s to wchar_t* when "
+	       "writing to the Registry, the buffersize is to small.", _name);
+    return;
+  }
+  
+  LONG res = RegSetValueExW(*hKey, name, 0, REG_DWORD, (BYTE*)&value, sizeof(DWORD));
+  if (res != ERROR_SUCCESS) {
+    vlog.error("Error(%d) writing %d(REG_DWORD) to Registry.", res, _value);
+    return;
+  }
+}
+
+
+bool getKeyString(const char* _name, char* dest, size_t destSize, HKEY* hKey) {
+  
+  DWORD buffersize = 256;
+  WCHAR value[destSize];
+  wchar_t name[buffersize];
+
+  unsigned size = fl_utf8towc(_name, strlen(_name)+1, name, buffersize);
+  if (size >= buffersize) {
+    vlog.error("Could not convert the parameter-name %s to wchar_t* when "
+	       "reading from the Registry, the buffersize is to small.", _name);
+    return false;
+  }
+
+  LONG res = RegQueryValueExW(*hKey, name, 0, NULL, (LPBYTE)value, &buffersize);
+  if (res != ERROR_SUCCESS){
+    if (res == ERROR_FILE_NOT_FOUND) {
+      // The value does not exist, defaults will be used.
+    } else {
+      vlog.error("Error(%d) reading %s from Registry.", res, _name);
+    }
+    return false;
+  }
+  
+  char utf8val[destSize];
+  size = fl_utf8fromwc(utf8val, sizeof(utf8val), value, wcslen(value)+1);
+  if (size >= sizeof(utf8val)) {
+    vlog.error("Could not convert the parameter-value for %s to utf8 char* "
+	       "when reading from the Registry, the buffer dest is to small.",
+	       _name);
+    return false;
+  }
+  const char *ret = utf8val;
+  
+  if(decodeValue(ret, dest, destSize))
+    return true;
+  else 
+    return false;
+}
+
+
+bool getKeyInt(const char* _name, int* dest, HKEY* hKey) {
+  
+  const DWORD buffersize = 256;
+  DWORD dwordsize = sizeof(DWORD);
+  DWORD value = 0;
+  wchar_t name[buffersize];
+
+  unsigned size = fl_utf8towc(_name, strlen(_name)+1, name, buffersize);
+  if (size >= buffersize) {
+    vlog.error("Could not convert the parameter-name %s to wchar_t* when "
+	       "reading from the Registry, the buffersize is to small.", _name);
+    return false;
+  }
+
+  LONG res = RegQueryValueExW(*hKey, name, 0, NULL, (LPBYTE)&value, &dwordsize);
+  if (res != ERROR_SUCCESS){
+    if (res == ERROR_FILE_NOT_FOUND) {
+      // The value does not exist, defaults will be used.
+    } else {
+      vlog.error("Error(%d) reading %s from Registry.", res, _name);
+    }
+    return false;
+  }
+
+  *dest = (int)value;
+  return true;
+}
+
+
+void saveToReg(const char* servername) {
+  
+  HKEY hKey;
+    
+  LONG res = RegCreateKeyExW(HKEY_CURRENT_USER, L"Software\\TigerVNC\\vncviewer", 0, NULL, 
+			     REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hKey, NULL);
+  if (res != ERROR_SUCCESS) {
+    vlog.error("Error(%d) creating key: Software\\TigerVNC\\vncviewer", res);
+    return;
+  }
+
+  setKeyString("ServerName", servername, &hKey);
+
+  for (int i = 0; i < sizeof(parameterArray)/sizeof(VoidParameter*); i++) {
+    if (dynamic_cast<StringParameter*>(parameterArray[i]) != NULL) {
+      setKeyString(parameterArray[i]->getName(), *(StringParameter*)parameterArray[i], &hKey);
+    } else if (dynamic_cast<IntParameter*>(parameterArray[i]) != NULL) {
+      setKeyInt(parameterArray[i]->getName(), (int)*(IntParameter*)parameterArray[i], &hKey);
+    } else if (dynamic_cast<BoolParameter*>(parameterArray[i]) != NULL) {
+      setKeyInt(parameterArray[i]->getName(), (int)*(BoolParameter*)parameterArray[i], &hKey);
+    } else {      
+      vlog.info("The parameterArray contains a object of a invalid type at line %d.", i);
+    }
+  }
+
+  res = RegCloseKey(hKey);
+  if (res != ERROR_SUCCESS) {
+    vlog.error("Error(%d) closing key: Software\\TigerVNC\\vncviewer", res);
+  }
+}
+
+
+char* loadFromReg() {
+
+  HKEY hKey;
+
+  LONG res = RegOpenKeyExW(HKEY_CURRENT_USER, L"Software\\TigerVNC\\vncviewer"
+			   , 0, KEY_READ, &hKey);
+  if (res != ERROR_SUCCESS) {
+    if (res == ERROR_FILE_NOT_FOUND) {
+      // The key does not exist, defaults will be used.
+    } else {
+      vlog.error("Error(%d) opening key: Software\\TigerVNC\\vncviewer", res);
+    }
+    return NULL;
+  }
+
+  const size_t buffersize = 256;
+  static char servername[buffersize];
+
+  char servernameBuffer[buffersize];
+  if (getKeyString("ServerName", servernameBuffer, buffersize, &hKey))
+    snprintf(servername, buffersize, "%s", servernameBuffer);
+  
+  int intValue = 0;
+  char stringValue[buffersize];
+  
+  for (int i = 0; i < sizeof(parameterArray)/sizeof(VoidParameter*); i++) {
+    if (dynamic_cast<StringParameter*>(parameterArray[i]) != NULL) {
+      if (getKeyString(parameterArray[i]->getName(), stringValue, buffersize, &hKey))
+	parameterArray[i]->setParam(stringValue);
+    } else if (dynamic_cast<IntParameter*>(parameterArray[i]) != NULL) {
+      if (getKeyInt(parameterArray[i]->getName(), &intValue, &hKey))
+	((IntParameter*)parameterArray[i])->setParam(intValue);
+    } else if (dynamic_cast<BoolParameter*>(parameterArray[i]) != NULL) {
+      if (getKeyInt(parameterArray[i]->getName(), &intValue, &hKey))
+	((BoolParameter*)parameterArray[i])->setParam(intValue);
+    } else {      
+      vlog.info("The parameterArray contains a object of a invalid type at line %d.", i);
+    }
+  }
+
+  res = RegCloseKey(hKey);
+  if (res != ERROR_SUCCESS){
+    vlog.error("Error(%d) closing key:  Software\\TigerVNC\\vncviewer", res);
+  }
+  
+  return servername;
+}
+#endif // _WIN32
+
+
+void saveViewerParameters(const char *filename, const char *servername) {
+
+  const size_t buffersize = 256;
+  char filepath[PATH_MAX];
+  char write_error[buffersize*2];
+  char encodingBuffer[buffersize];
+
+  // Write to the registry or a predefined file if no filename was specified.
+  if(filename == NULL) {
+
+#ifdef _WIN32
+    saveToReg(servername);
+    return;
+#endif
+    
+    char* homeDir = NULL;
+    if (getvnchomedir(&homeDir) == -1) {
+      vlog.error("Failed to write configuration file, "
+		 "can't obtain home directory path.");
+      return;
+    }
+
+    snprintf(filepath, sizeof(filepath), "%sdefault.tigervnc", homeDir);
+  } else {
+    snprintf(filepath, sizeof(filepath), "%s", filename);
+  }
+
+  /* Write parameters to file */
+  FILE* f = fopen(filepath, "w+");
+  if (!f) {
+    snprintf(write_error, sizeof(filepath), "Failed to write configuration file, "
+	     "can't open %s", filepath);
+    throw Exception(write_error);
+  }
+  
+  fprintf(f, "%s\r\n", IDENTIFIER_STRING);
+  fprintf(f, "\r\n");
+
+  if (encodeValue(servername, encodingBuffer, buffersize))  
+    fprintf(f, "ServerName=%s\n", encodingBuffer);
+  
+  for (int i = 0; i < sizeof(parameterArray)/sizeof(VoidParameter*); i++) {
+    if (dynamic_cast<StringParameter*>(parameterArray[i]) != NULL) {
+      if (encodeValue(*(StringParameter*)parameterArray[i], encodingBuffer, buffersize))
+	fprintf(f, "%s=%s\n", ((StringParameter*)parameterArray[i])->getName(), encodingBuffer);
+    } else if (dynamic_cast<IntParameter*>(parameterArray[i]) != NULL) {
+      fprintf(f, "%s=%d\n", ((IntParameter*)parameterArray[i])->getName(), (int)*(IntParameter*)parameterArray[i]);
+    } else if (dynamic_cast<BoolParameter*>(parameterArray[i]) != NULL) {
+      fprintf(f, "%s=%d\n", ((BoolParameter*)parameterArray[i])->getName(), (int)*(BoolParameter*)parameterArray[i]);
+    } else {      
+      vlog.info("The parameterArray contains a object of a invalid type at line %d.", i);
+    }
+  }
+  fclose(f);
+}
+
+
+char* loadViewerParameters(const char *filename) {
+
+  const size_t buffersize = 256;
+  char filepath[PATH_MAX];
+  char readError[buffersize*2];
+  char line[buffersize];
+  char decodingBuffer[buffersize];
+  char decodedValue[buffersize];
+  static char servername[sizeof(line)];
+
+  // Load from the registry or a predefined file if no filename was specified.
+  if(filename == NULL) {
+
+#ifdef _WIN32
+    return loadFromReg();
+#endif
+
+    char* homeDir = NULL;
+    if (getvnchomedir(&homeDir) == -1)
+      throw Exception("Failed to read configuration file, " 
+			   "can't obtain home directory path.");
+
+    snprintf(filepath, sizeof(filepath), "%sdefault.tigervnc", homeDir);
+  } else {
+    snprintf(filepath, sizeof(filepath), "%s", filename);
+  }
+
+  /* Read parameters from file */
+  FILE* f = fopen(filepath, "r");
+  if (!f) {
+    if (!filename)
+      return NULL; // Use defaults.
+    snprintf(readError, sizeof(readError), "Failed to read configuration file, "
+	     "can't open %s", filepath);
+    throw Exception(readError);
+  }
+  
+  int lineNr = 0;
+  while (!feof(f)) {
+
+    // Read the next line
+    lineNr++;
+    if (!fgets(line, sizeof(line), f)) {
+      if (line[sizeof(line) -1] != '\0') {
+	vlog.error("Could not read the line(%d) in the configuration file,"
+		   "the buffersize is to small.", lineNr);
+	return NULL;
+      }
+      if (feof(f))
+	break;
+
+      snprintf(readError, sizeof(readError), "Failed to read line %d in file %s", 
+	       lineNr, filepath);
+      throw Exception(readError);
+    }
+    
+    // Make sure that the first line of the file has the file identifier string
+    if(lineNr == 1) {
+      if(strncmp(line, IDENTIFIER_STRING, strlen(IDENTIFIER_STRING)) == 0) {
+	continue;
+      } else {
+	snprintf(readError, sizeof(readError), "Line 1 in file %s\n"
+		 "must contain the TigerVNC configurationfile identifier string:\n"
+		 "\"%s\"", filepath, IDENTIFIER_STRING);
+	throw Exception(readError);
+      }
+    }
+    
+    // Skip empty lines and comments
+    if ((line[0] == '\n') || (line[0] == '#') || (line[0] == '\r'))
+      continue;
+
+    int len = strlen(line);
+    if (line[len-1] == '\n') {
+      line[len-1] = '\0';
+      len--;
+    }
+
+    // Find the parameter value
+    char *value = strchr(line, '=');
+    if (value == NULL) {
+      vlog.info("Bad Name/Value pair on line: %d in file: %s", 
+		lineNr, filepath);
+      continue;
+    }
+    *value = '\0'; // line only contains the parameter name below.
+    value++;
+    
+    bool invalidParameterName = true; // Will be set to false below if 
+                                      // the line contains a valid name.
+
+    if (strcasecmp(line, "ServerName") == 0) {
+
+      if(!decodeValue(value, decodingBuffer, sizeof(decodingBuffer))) {
+	vlog.info("The value of the parameter %s on line %d in file %s is invalid.",
+		  line, lineNr, filepath);
+	continue;
+      }
+      snprintf(servername, sizeof(decodingBuffer), "%s", decodingBuffer);
+      invalidParameterName = false;
+
+    } else {
+    
+      // Find and set the correct parameter
+      for (int i = 0; i < sizeof(parameterArray)/sizeof(VoidParameter*); i++) {
+
+	if (dynamic_cast<StringParameter*>(parameterArray[i]) != NULL) {
+	  if (strcasecmp(line, ((StringParameter*)parameterArray[i])->getName()) == 0) {
+
+	    if(!decodeValue(value, decodingBuffer, sizeof(decodingBuffer))) {
+	      vlog.info("The value of the parameter %s on line %d in file %s is invalid.",
+			line, lineNr, filepath);
+	      continue;
+	    }
+	    ((StringParameter*)parameterArray[i])->setParam(decodingBuffer);
+	    invalidParameterName = false;
+	  }
+
+	} else if (dynamic_cast<IntParameter*>(parameterArray[i]) != NULL) {
+	  if (strcasecmp(line, ((IntParameter*)parameterArray[i])->getName()) == 0) {
+	    ((IntParameter*)parameterArray[i])->setParam(atoi(value));
+	    invalidParameterName = false;
+	  }
+	
+	} else if (dynamic_cast<BoolParameter*>(parameterArray[i]) != NULL) {
+	  if (strcasecmp(line, ((BoolParameter*)parameterArray[i])->getName()) == 0) {
+	    ((BoolParameter*)parameterArray[i])->setParam(atoi(value));
+	    invalidParameterName = false;
+	  }
+
+	} else {      
+	  vlog.info("The parameterArray contains a object of a invalid type at line %d.", lineNr);
+	}
+      }
+    }
+
+    if (invalidParameterName)
+      vlog.info("Invalid parameter name on line: %d in file: %s", 
+		lineNr, filepath);
+  }
+  fclose(f); f=0;
+  
+  return servername;
+}

Modified: trunk/vncviewer/parameters.h
===================================================================
--- trunk/vncviewer/parameters.h	2012-08-01 08:09:09 UTC (rev 4949)
+++ trunk/vncviewer/parameters.h	2012-08-08 11:49:01 UTC (rev 4950)
@@ -1,5 +1,6 @@
 /* Copyright (C) 2002-2005 RealVNC Ltd.  All Rights Reserved.
  * Copyright 2011 Pierre Ossman <ossman@...> for Cendio AB
+ * Copyright 2012 Samuel Mannehed <samuel@...> for Cendio AB
  * 
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -58,4 +59,7 @@
 
 extern rfb::BoolParameter fullscreenSystemKeys;
 
+void saveViewerParameters(const char *filename, const char *servername=NULL);
+char* loadViewerParameters(const char *filename);
+
 #endif

Modified: trunk/vncviewer/vncviewer.cxx
===================================================================
--- trunk/vncviewer/vncviewer.cxx	2012-08-01 08:09:09 UTC (rev 4949)
+++ trunk/vncviewer/vncviewer.cxx	2012-08-08 11:49:01 UTC (rev 4950)
@@ -43,6 +43,7 @@
 #endif
 #include <rfb/LogWriter.h>
 #include <rfb/Timer.h>
+#include <rfb/Exception.h>
 #include <network/TcpSocket.h>
 #include <os/os.h>
 
@@ -307,6 +308,14 @@
 
   Configuration::enableViewerParams();
 
+  /* Load the default parameter settings */
+  const char* defaultServerName;
+  try {
+    defaultServerName = loadViewerParameters(NULL);
+  } catch (rfb::Exception& e) {
+    fl_alert("%s", e.str());
+  }
+  
   int i = 1;
   if (!Fl::args(argc, argv, i) || i < argc)
     for (; i < argc; i++) {
@@ -328,9 +337,10 @@
 
   if (!::autoSelect.hasBeenSet()) {
     // Default to AutoSelect=0 if -PreferredEncoding or -FullColor is used
-    ::autoSelect.setParam(!::preferredEncoding.hasBeenSet() &&
-                          !::fullColour.hasBeenSet() &&
-                          !::fullColourAlias.hasBeenSet());
+    if (::preferredEncoding.hasBeenSet() || ::fullColour.hasBeenSet() ||
+	::fullColourAlias.hasBeenSet()) {
+      ::autoSelect.setParam(false);
+    }
   }
   if (!::fullColour.hasBeenSet() && !::fullColourAlias.hasBeenSet()) {
     // Default to FullColor=0 if AutoSelect=0 && LowColorLevel is set
@@ -341,7 +351,9 @@
   }
   if (!::customCompressLevel.hasBeenSet()) {
     // Default to CustomCompressLevel=1 if CompressLevel is used.
-    ::customCompressLevel.setParam(::compressLevel.hasBeenSet());
+    if(::compressLevel.hasBeenSet()) {
+      ::customCompressLevel.setParam(true);
+    }
   }
 
   mkvnchomedir();
@@ -352,7 +364,7 @@
 #endif
 
   if (vncServerName == NULL) {
-    vncServerName = ServerDialog::run();
+    vncServerName = ServerDialog::run(defaultServerName);
     if ((vncServerName == NULL) || (vncServerName[0] == '\0'))
       return 1;
   }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[4956] trunk/vncviewer
		From: <ossman_@us...> -	2012-08-17 13:37

			



                
                    
                        Revision: 4956
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4956&view=rev
Author:   ossman_
Date:     2012-08-17 13:37:42 +0000 (Fri, 17 Aug 2012)
Log Message:
-----------
A CGImage is read-only, but it just happened to work anyway. Until 10.8
that is. Do it the documented way by having a CGBitmapContext instead.

Modified Paths:
--------------
    trunk/vncviewer/OSXPixelBuffer.cxx
    trunk/vncviewer/OSXPixelBuffer.h

Modified: trunk/vncviewer/OSXPixelBuffer.cxx
===================================================================
--- trunk/vncviewer/OSXPixelBuffer.cxx	2012-08-17 09:04:28 UTC (rev 4955)
+++ trunk/vncviewer/OSXPixelBuffer.cxx	2012-08-17 13:37:42 UTC (rev 4956)
@@ -40,29 +40,24 @@
   ManagedPixelBuffer(rfb::PixelFormat(32, 24, false, true,
                                       255, 255, 255, 16, 8, 0),
                      width, height),
-  image(NULL)
+  bitmap(NULL)
 {
   CGColorSpaceRef lut;
-  CGDataProviderRef provider;
 
   lut = CGColorSpaceCreateDeviceRGB();
   assert(lut);
-  provider = CGDataProviderCreateWithData(NULL, data, datasize, NULL);
-  assert(provider);
 
-  image = CGImageCreate(width, height, 8, 32, width*4, lut,
-                        kCGImageAlphaNoneSkipFirst | kCGBitmapByteOrder32Little,
-                        provider, NULL, false, kCGRenderingIntentDefault);
-  assert(image);
+  bitmap = CGBitmapContextCreate(data, width, height, 8, width*4, lut,
+                                 kCGImageAlphaNoneSkipFirst | kCGBitmapByteOrder32Little);
+  assert(bitmap);
 
-  CGDataProviderRelease(provider);
   CGColorSpaceRelease(lut);
 }
 
 
 PlatformPixelBuffer::~PlatformPixelBuffer()
 {
-  CGImageRelease((CGImageRef)image);
+  CFRelease((CGContextRef)bitmap);
 }
 
 
@@ -71,6 +66,7 @@
   CGRect rect;
   CGContextRef gc;
   CGAffineTransform at;
+  CGImageRef image;
 
   gc = (CGContextRef)fl_gc;
 
@@ -102,7 +98,9 @@
   rect.size.width = width();
   rect.size.height = -height(); // Negative height does _not_ flip the image
 
-  CGContextDrawImage(gc, rect, (CGImageRef)image);
+  image = CGBitmapContextCreateImage((CGContextRef)bitmap);
+  CGContextDrawImage(gc, rect, image);
+  CGImageRelease(image);
 
   CGContextRestoreGState(gc);
 }

Modified: trunk/vncviewer/OSXPixelBuffer.h
===================================================================
--- trunk/vncviewer/OSXPixelBuffer.h	2012-08-17 09:04:28 UTC (rev 4955)
+++ trunk/vncviewer/OSXPixelBuffer.h	2012-08-17 13:37:42 UTC (rev 4956)
@@ -29,8 +29,8 @@
   void draw(int src_x, int src_y, int x, int y, int w, int h);
 
 protected:
-  // This is really a CGImageRerf, but Apple headers conflict with FLTK
-  void *image;
+  // This is really a CGContextRef, but Apple headers conflict with FLTK
+  void *bitmap;
 };
 
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[4958] trunk/vncviewer
		From: <ossman_@us...> -	2012-08-23 14:53

			



                
                    
                        Revision: 4958
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4958&view=rev
Author:   ossman_
Date:     2012-08-23 14:53:36 +0000 (Thu, 23 Aug 2012)
Log Message:
-----------
X11 window managers are very buggy when it comes to having a window start
in full screen mode. So we'll resort to creating a normal window, and then
switching to full screen once it is mapped. Unfortunately it means we need
to handle delaying some resize handling.

Modified Paths:
--------------
    trunk/vncviewer/DesktopWindow.cxx
    trunk/vncviewer/DesktopWindow.h

Modified: trunk/vncviewer/DesktopWindow.cxx
===================================================================
--- trunk/vncviewer/DesktopWindow.cxx	2012-08-23 14:40:52 UTC (rev 4957)
+++ trunk/vncviewer/DesktopWindow.cxx	2012-08-23 14:53:36 UTC (rev 4958)
@@ -53,7 +53,8 @@
 DesktopWindow::DesktopWindow(int w, int h, const char *name,
                              const rfb::PixelFormat& serverPF,
                              CConn* cc_)
-  : Fl_Window(w, h), cc(cc_), firstUpdate(true)
+  : Fl_Window(w, h), cc(cc_), firstUpdate(true),
+    delayedFullscreen(false), delayedDesktopSize(false)
 {
   Fl_Scroll *scroll = new Fl_Scroll(0, 0, w, h);
   scroll->color(FL_BLACK);
@@ -75,10 +76,17 @@
   Fl::event_dispatch(&fltkHandle);
 
 #ifdef HAVE_FLTK_FULLSCREEN
-  if (fullScreen)
+  if (fullScreen) {
+    // Hack: Window managers seem to be rather crappy at respecting
+    // fullscreen hints on initial windows. So on X11 we'll have to
+    // wait until after we've been mapped.
+#if defined(WIN32) || defined(__APPLE__)
     fullscreen_on();
-  else
+#else
+    delayedFullscreen = true;
 #endif
+  } else
+#endif
   {
     // If we are creating a window which is equal to the size on the
     // screen on X11, many WMs will treat this as a legacy fullscreen
@@ -102,6 +110,16 @@
   // the scroll widget for things to behave sanely.
   if ((w != this->w()) || (h != this->h()))
     scroll->size(this->w(), this->h());
+
+#ifdef HAVE_FLTK_FULLSCREEN
+  if (delayedFullscreen) {
+    // Hack: Fullscreen requests may be ignored, so we need a timeout for
+    // when we should stop waiting. We also really need to wait for the
+    // resize, which can come after the fullscreen event.
+    Fl::add_timeout(0.5, handleFullscreenTimeout, this);
+    fullscreen_on();
+  }
+#endif
 }
 
 
@@ -111,6 +129,7 @@
   // again later when this object is already gone.
   Fl::remove_timeout(handleGrab, this);
   Fl::remove_timeout(handleResizeTimeout, this);
+  Fl::remove_timeout(handleFullscreenTimeout, this);
 
   OptionsDialog::removeCallback(handleOptions);
 
@@ -155,8 +174,14 @@
 void DesktopWindow::updateWindow()
 {
   if (firstUpdate) {
-    if (cc->cp.supportsSetDesktopSize)
-      remoteResize();
+    if (cc->cp.supportsSetDesktopSize) {
+      // Hack: Wait until we're in the proper mode and position until
+      // resizing things, otherwise we might send the wrong thing.
+      if (delayedFullscreen)
+        delayedDesktopSize = true;
+      else
+        handleDesktopSize();
+    }
     firstUpdate = false;
   }
 
@@ -226,8 +251,10 @@
     // a) The user has this feature turned on
     // b) The server supports it
     // c) We're not still waiting for a chance to handle DesktopSize
+    // d) We're not still waiting for startup fullscreen to kick in
     //
-    if (not firstUpdate and ::remoteResize and cc->cp.supportsSetDesktopSize) {
+    if (not firstUpdate and not delayedFullscreen and
+        ::remoteResize and cc->cp.supportsSetDesktopSize) {
       // We delay updating the remote desktop as we tend to get a flood
       // of resize events as the user is dragging the window.
       Fl::remove_timeout(handleResizeTimeout, this);
@@ -481,30 +508,32 @@
 }
 
 
+void DesktopWindow::handleDesktopSize()
+{
+  int width, height;
+
+  if (sscanf(desktopSize.getValueStr(), "%dx%d", &width, &height) != 2)
+    return;
+
+  remoteResize(width, height);
+}
+
+
 void DesktopWindow::handleResizeTimeout(void *data)
 {
   DesktopWindow *self = (DesktopWindow *)data;
 
   assert(self);
 
-  self->remoteResize();
+  self->remoteResize(self->w(), self->h());
 }
 
 
-void DesktopWindow::remoteResize()
+void DesktopWindow::remoteResize(int width, int height)
 {
-  int width, height;
   ScreenSet layout;
   ScreenSet::iterator iter;
 
-  if (firstUpdate) {
-    if (sscanf(desktopSize.getValueStr(), "%dx%d", &width, &height) != 2)
-      return;
-  } else {
-    width = w();
-    height = h();
-  }
-
 #ifdef HAVE_FLTK_FULLSCREEN
   if (!fullscreen_active() || (width > w()) || (height > h())) {
 #endif
@@ -690,3 +719,17 @@
     self->fullscreen_off();
 #endif
 }
+
+void DesktopWindow::handleFullscreenTimeout(void *data)
+{
+  DesktopWindow *self = (DesktopWindow *)data;
+
+  assert(self);
+
+  self->delayedFullscreen = false;
+
+  if (self->delayedDesktopSize) {
+    self->handleDesktopSize();
+    self->delayedDesktopSize = false;
+  }
+}

Modified: trunk/vncviewer/DesktopWindow.h
===================================================================
--- trunk/vncviewer/DesktopWindow.h	2012-08-23 14:40:52 UTC (rev 4957)
+++ trunk/vncviewer/DesktopWindow.h	2012-08-23 14:53:36 UTC (rev 4958)
@@ -90,8 +90,9 @@
 
   void maximizeWindow();
 
+  void handleDesktopSize();
   static void handleResizeTimeout(void *data);
-  void remoteResize();
+  void remoteResize(int width, int height);
 
   void repositionViewport();
 
@@ -99,11 +100,15 @@
 
   static void handleOptions(void *data);
 
+  static void handleFullscreenTimeout(void *data);
+
 private:
   CConn* cc;
   Viewport *viewport;
 
   bool firstUpdate;
+  bool delayedFullscreen;
+  bool delayedDesktopSize;
 };
 
 #endif

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[4972] trunk/vncviewer
		From: <astrand@us...> -	2012-08-27 07:28

			



                
                    
                        Revision: 4972
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4972&view=rev
Author:   astrand
Date:     2012-08-27 07:28:08 +0000 (Mon, 27 Aug 2012)
Log Message:
-----------
Added a standard -geometry command line option. Such an option is
actually already documented on the man page. 

Modified Paths:
--------------
    trunk/vncviewer/CMakeLists.txt
    trunk/vncviewer/DesktopWindow.cxx
    trunk/vncviewer/parameters.cxx
    trunk/vncviewer/parameters.h

Modified: trunk/vncviewer/CMakeLists.txt
===================================================================
--- trunk/vncviewer/CMakeLists.txt	2012-08-26 21:19:19 UTC (rev 4971)
+++ trunk/vncviewer/CMakeLists.txt	2012-08-27 07:28:08 UTC (rev 4972)
@@ -45,15 +45,55 @@
   add_executable(vncviewer ${VNCVIEWER_SOURCES})
 endif()
 
-target_link_libraries(vncviewer rfb network rdr os Xregion ${FLTK_LIBRARIES} ${GETTEXT_LIBRARIES})
 
-# 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 AND WIN32)
-  target_link_libraries(vncviewer ws2_32)
+# XXX: Cendio hack
+#target_link_libraries(vncviewer rfb network rdr os Xregion ${FLTK_LIBRARIES} ${GETTEXT_LIBRARIES})
+#
+## 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 AND WIN32)
+#  target_link_libraries(vncviewer ws2_32)
+#endif()
+
+target_link_libraries(vncviewer -nodefaultlibs rfb network rdr os Xregion)
+
+if(APPLE)
+  target_link_libraries(vncviewer "-framework Carbon" "-framework Cocoa" "-framework ApplicationServices")
 endif()
 
+if(UNIX AND NOT APPLE)
+  # Needed to load icon files
+  target_link_libraries(vncviewer -Wl,-Bstatic ${FLTK_IMAGES_LIBRARY} png -Wl,-Bdynamic)
+endif()
+
+target_link_libraries(vncviewer -Wl,-Bstatic ${FLTK_BASE_LIBRARY} -Wl,-Bdynamic)
+
+if(WIN32)
+  target_link_libraries(vncviewer -Wl,-Bstatic ${GETTEXT_LIBRARIES} ${ICONV_LIBRARIES} -Wl,-Bdynamic)
+elseif(APPLE)
+  target_link_libraries(vncviewer -Wl,-Bstatic ${GETTEXT_LIBRARIES} -Wl,-Bdynamic ${ICONV_LIBRARIES})
+else()
+  if(${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
+    # XXX: Cendio hack: Add rpath to find libXfixes on Solaris without LD_LIBRARY_PATH.
+    # XXX: Cendio hack: libXft is broken on at least our servers
+    # XXX: Cendio hack: In theory, we must add freetype. However, in practice this does not work, since it is not found,
+    # since it's in /usr/sparc-sun-solaris2.10/sys-root/usr/sfw/lib/. It works if we DONT specify it, though. 
+    target_link_libraries(vncviewer ${X11_Xcursor_LIB} ${X11_Xfixes_LIB} /usr/sparc-sun-solaris2.10/sys-root/usr/X11/lib/libXinerama.so -Wl,-Bstatic Xft -Wl,-Bdynamic fontconfig Xext -R/usr/sfw/lib)
+  else()
+    target_link_libraries(vncviewer -Wl,-Bstatic ${X11_Xcursor_LIB} ${X11_Xfixes_LIB} Xft fontconfig expat freetype Xrender Xext Xinerama -Wl,-Bdynamic)
+  endif()
+  target_link_libraries(vncviewer X11 m )
+endif()
+
+target_link_libraries(vncviewer libstdc++.a gcc gcc_eh)
+
+if(WIN32)
+  target_link_libraries(vncviewer ws2_32 comctl32 mingw32 moldname mingwex msvcrt kernel32 gcc)
+else()
+  target_link_libraries(vncviewer c)
+endif()
+
 install(TARGETS vncviewer DESTINATION ${BIN_DIR})
 if(UNIX)
   install(FILES vncviewer.man DESTINATION ${MAN_DIR}/man1 RENAME vncviewer.1)

Modified: trunk/vncviewer/DesktopWindow.cxx
===================================================================
--- trunk/vncviewer/DesktopWindow.cxx	2012-08-26 21:19:19 UTC (rev 4971)
+++ trunk/vncviewer/DesktopWindow.cxx	2012-08-27 07:28:08 UTC (rev 4972)
@@ -88,12 +88,42 @@
   } else
 #endif
   {
+
+    int geom_x = 0, geom_y = 0;
+    if (geometry.hasBeenSet()) {
+      int matched;
+      matched = sscanf(geometry.getValueStr(), "+%d+%d", &geom_x, &geom_y);
+      if (matched == 2) {
+	force_position(1);
+      } else {
+	int geom_w, geom_h;
+	matched = sscanf(geometry.getValueStr(), "%dx%d+%d+%d", &geom_w, &geom_h, &geom_x, &geom_y);
+	switch (matched) {
+	case 4:
+	  force_position(1);
+	  /* fall through */
+	case 2:
+	  w = geom_w;
+	  h = geom_h;
+	default:
+	  vlog.error("Invalid geometry specified!");	
+	}
+      }
+    }
+    
     // If we are creating a window which is equal to the size on the
     // screen on X11, many WMs will treat this as a legacy fullscreen
     // request. This is not what we want. Besides, it doesn't really
     // make sense to try to create a window which is larger than the
     // available work space. 
-    size(__rfbmin(w, Fl::w()), __rfbmin(h, Fl::h()));
+    w = __rfbmin(w, Fl::w());
+    h = __rfbmin(h, Fl::h());
+
+    if (force_position()) {
+      resize(geom_x, geom_y, w, h);
+    } else {
+      size(w, h);
+    }
   }
 
   show();

Modified: trunk/vncviewer/parameters.cxx
===================================================================
--- trunk/vncviewer/parameters.cxx	2012-08-26 21:19:19 UTC (rev 4971)
+++ trunk/vncviewer/parameters.cxx	2012-08-27 07:28:08 UTC (rev 4972)
@@ -100,6 +100,8 @@
 StringParameter desktopSize("DesktopSize",
                             "Reconfigure desktop size on the server on "
                             "connect (if possible)", "");
+StringParameter geometry("geometry",
+			 "Specify size and position of viewer window", "");
 BoolParameter remoteResize("RemoteResize",
                            "Dynamically resize the remote desktop size as "
                            "the size of the local client window changes. "
@@ -155,6 +157,7 @@
 #endif // HAVE_FLTK_FULLSCREEN_SCREENS
 #endif // HAVE_FLTK_FULLSCREEN
   &desktopSize,
+  &geometry,
   &remoteResize,
   &viewOnly,
   &shared,

Modified: trunk/vncviewer/parameters.h
===================================================================
--- trunk/vncviewer/parameters.h	2012-08-26 21:19:19 UTC (rev 4971)
+++ trunk/vncviewer/parameters.h	2012-08-27 07:28:08 UTC (rev 4972)
@@ -46,6 +46,7 @@
 #endif // HAVE_FLTK_FULLSCREEN_SCREENS
 #endif // HAVE_FLTK_FULLSCREEN
 extern rfb::StringParameter desktopSize;
+extern rfb::StringParameter geometry;
 extern rfb::BoolParameter remoteResize;
 
 extern rfb::BoolParameter viewOnly;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[4977] trunk/vncviewer
		From: <ossman_@us...> -	2012-08-27 14:41

			



                
                    
                        Revision: 4977
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4977&view=rev
Author:   ossman_
Date:     2012-08-27 14:40:51 +0000 (Mon, 27 Aug 2012)
Log Message:
-----------
The OS X keyboard grabbing code needs to be multi-head aware to function
properly.

Modified Paths:
--------------
    trunk/vncviewer/DesktopWindow.cxx
    trunk/vncviewer/cocoa.h
    trunk/vncviewer/cocoa.mm

Modified: trunk/vncviewer/DesktopWindow.cxx
===================================================================
--- trunk/vncviewer/DesktopWindow.cxx	2012-08-27 13:02:47 UTC (rev 4976)
+++ trunk/vncviewer/DesktopWindow.cxx	2012-08-27 14:40:51 UTC (rev 4977)
@@ -439,7 +439,13 @@
 #elif defined(__APPLE__)
   int ret;
   
-  ret = cocoa_capture_display(this);
+  ret = cocoa_capture_display(this,
+#ifdef HAVE_FLTK_FULLSCREEN_SCREENS
+                              fullScreenAllMonitors
+#else
+                              false
+#endif
+                              );
   if (ret != 0)
     vlog.error(_("Failure grabbing keyboard"));
 #else

Modified: trunk/vncviewer/cocoa.h
===================================================================
--- trunk/vncviewer/cocoa.h	2012-08-27 13:02:47 UTC (rev 4976)
+++ trunk/vncviewer/cocoa.h	2012-08-27 14:40:51 UTC (rev 4977)
@@ -19,7 +19,7 @@
 #ifndef __VNCVIEWER_COCOA_H__
 #define __VNCVIEWER_COCOA_H__
 
-int cocoa_capture_display(Fl_Window *win);
+int cocoa_capture_display(Fl_Window *win, bool all_displays);
 void cocoa_release_display(Fl_Window *win);
 
 #endif

Modified: trunk/vncviewer/cocoa.mm
===================================================================
--- trunk/vncviewer/cocoa.mm	2012-08-27 13:02:47 UTC (rev 4976)
+++ trunk/vncviewer/cocoa.mm	2012-08-27 14:40:51 UTC (rev 4977)
@@ -24,16 +24,37 @@
 
 static bool captured = false;
 
-int cocoa_capture_display(Fl_Window *win)
+int cocoa_capture_display(Fl_Window *win, bool all_displays)
 {
   NSWindow *nsw;
 
   nsw = (NSWindow*)fl_xid(win);
 
   if (!captured) {
-    if (CGDisplayCapture(kCGDirectMainDisplay) != kCGErrorSuccess)
-      return 1;
+    if (all_displays) {
+      if (CGCaptureAllDisplays() != kCGErrorSuccess)
+        return 1;
+    } else {
+      CGDirectDisplayID displays[16];
+      CGDisplayCount count;
+      int index;
 
+      if (CGGetActiveDisplayList(16, displays, &count) != kCGErrorSuccess)
+        return 1;
+
+      if (count != Fl::screen_count())
+        return 1;
+
+#ifdef HAVE_FLTK_FULLSCREEN_SCREENS
+      index = Fl::screen_num(win->x(), win->y(), win->w(), win->h());
+#else
+      index = 0;
+#endif
+
+      if (CGDisplayCapture(displays[index]) != kCGErrorSuccess)
+        return 1;
+    }
+
     captured = true;
   }
 
@@ -51,7 +72,7 @@
   int newlevel;
 
   if (captured)
-    CGDisplayRelease(kCGDirectMainDisplay);
+    CGReleaseAllDisplays();
 
   captured = false;
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[4991] trunk/vncviewer
		From: <ossman_@us...> -	2012-09-03 09:25

			



                
                    
                        Revision: 4991
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4991&view=rev
Author:   ossman_
Date:     2012-09-03 09:25:07 +0000 (Mon, 03 Sep 2012)
Log Message:
-----------
Restore edge/bump scrolling when we are in full screen mode as it is easier
to use.

Modified Paths:
--------------
    trunk/vncviewer/DesktopWindow.cxx
    trunk/vncviewer/DesktopWindow.h

Modified: trunk/vncviewer/DesktopWindow.cxx
===================================================================
--- trunk/vncviewer/DesktopWindow.cxx	2012-09-01 21:15:26 UTC (rev 4990)
+++ trunk/vncviewer/DesktopWindow.cxx	2012-09-03 09:25:07 UTC (rev 4991)
@@ -46,6 +46,9 @@
 #include "cocoa.h"
 #endif
 
+#define EDGE_SCROLL_SIZE 32
+#define EDGE_SCROLL_SPEED 20
+
 using namespace rfb;
 
 static rfb::LogWriter vlog("DesktopWindow");
@@ -56,7 +59,7 @@
   : Fl_Window(w, h), cc(cc_), firstUpdate(true),
     delayedFullscreen(false), delayedDesktopSize(false)
 {
-  Fl_Scroll *scroll = new Fl_Scroll(0, 0, w, h);
+  scroll = new Fl_Scroll(0, 0, w, h);
   scroll->color(FL_BLACK);
 
   // Automatically adjust the scroll box to the window
@@ -164,6 +167,7 @@
   Fl::remove_timeout(handleGrab, this);
   Fl::remove_timeout(handleResizeTimeout, this);
   Fl::remove_timeout(handleFullscreenTimeout, this);
+  Fl::remove_timeout(handleEdgeScroll, this);
 
   OptionsDialog::removeCallback(handleOptions);
 
@@ -308,6 +312,11 @@
   case FL_FULLSCREEN:
     fullScreen.setParam(fullscreen_active());
 
+    if (fullscreen_active())
+      scroll->type(0);
+    else
+      scroll->type(Fl_Scroll::BOTH);
+
     if (!fullscreenSystemKeys)
       break;
 
@@ -317,7 +326,23 @@
       ungrabKeyboard();
 
     break;
+
+  case FL_ENTER:
+  case FL_LEAVE:
+  case FL_DRAG:
+  case FL_MOVE:
+    if (fullscreen_active()) {
+      if (((viewport->x() < 0) && (Fl::event_x() < EDGE_SCROLL_SIZE)) ||
+          ((viewport->x() + viewport->w() > w()) && (Fl::event_x() > w() - EDGE_SCROLL_SIZE)) ||
+          ((viewport->y() < 0) && (Fl::event_y() < EDGE_SCROLL_SIZE)) ||
+          ((viewport->y() + viewport->h() > h()) && (Fl::event_y() > h() - EDGE_SCROLL_SIZE))) {
+        if (!Fl::has_timeout(handleEdgeScroll, this))
+          Fl::add_timeout(0.1, handleEdgeScroll, this);
+      }
+    }
+    return 1;
 #endif
+
   case FL_SHORTCUT:
     // Sometimes the focus gets out of whack and we fall through to the
     // shortcut dispatching. Try to make things sane again...
@@ -773,3 +798,59 @@
     self->delayedDesktopSize = false;
   }
 }
+
+void DesktopWindow::handleEdgeScroll(void *data)
+{
+#ifdef HAVE_FLTK_FULLSCREEN
+  DesktopWindow *self = (DesktopWindow *)data;
+
+  int mx, my;
+  int dx, dy;
+
+  assert(self);
+
+  if (!self->fullscreen_active())
+    return;
+
+  mx = Fl::event_x();
+  my = Fl::event_y();
+
+  dx = dy = 0;
+
+  // Clamp mouse position in case it is outside the window
+  if (mx < 0)
+    mx = 0;
+  if (mx > self->w())
+    mx = self->w();
+  if (my < 0)
+    my = 0;
+  if (my > self->h())
+    my = self->h();
+
+  if ((self->viewport->x() < 0) && (mx < EDGE_SCROLL_SIZE))
+    dx = EDGE_SCROLL_SPEED - EDGE_SCROLL_SPEED * mx / EDGE_SCROLL_SIZE;
+  if ((self->viewport->x() + self->viewport->w() > self->w()) && (mx > self->w() - EDGE_SCROLL_SIZE))
+    dx = EDGE_SCROLL_SPEED * (self->w() - mx) / EDGE_SCROLL_SIZE - EDGE_SCROLL_SPEED;
+  if ((self->viewport->y() < 0) && (my < EDGE_SCROLL_SIZE))
+    dy = EDGE_SCROLL_SPEED - EDGE_SCROLL_SPEED * my / EDGE_SCROLL_SIZE;
+  if ((self->viewport->y() + self->viewport->h() > self->h()) && (my > self->h() - EDGE_SCROLL_SIZE))
+    dy = EDGE_SCROLL_SPEED * (self->h() - my) / EDGE_SCROLL_SIZE - EDGE_SCROLL_SPEED;
+
+  if ((dx == 0) && (dy == 0))
+    return;
+
+  // Make sure we don't move the viewport too much
+  if (self->viewport->x() + dx > 0)
+    dx = -self->viewport->x();
+  if (self->viewport->x() + dx + self->viewport->w() < self->w())
+    dx = self->w() - (self->viewport->x() + self->viewport->w());
+  if (self->viewport->y() + dy > 0)
+    dy = -self->viewport->y();
+  if (self->viewport->y() + dy + self->viewport->h() < self->h())
+    dy = self->h() - (self->viewport->y() + self->viewport->h());
+
+  self->scroll->scroll_to(self->scroll->xposition() - dx, self->scroll->yposition() - dy);
+
+  Fl::repeat_timeout(0.1, handleEdgeScroll, data);
+#endif
+}

Modified: trunk/vncviewer/DesktopWindow.h
===================================================================
--- trunk/vncviewer/DesktopWindow.h	2012-09-01 21:15:26 UTC (rev 4990)
+++ trunk/vncviewer/DesktopWindow.h	2012-09-03 09:25:07 UTC (rev 4991)
@@ -30,6 +30,7 @@
 #include <FL/Fl_Window.H>
 
 class CConn;
+class Fl_Scroll;
 
 class DesktopWindow : public Fl_Window {
 public:
@@ -102,8 +103,11 @@
 
   static void handleFullscreenTimeout(void *data);
 
+  static void handleEdgeScroll(void *data);
+
 private:
   CConn* cc;
+  Fl_Scroll *scroll;
   Viewport *viewport;
 
   bool firstUpdate;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[5032] trunk/vncviewer
		From: <atkac@us...> -	2013-01-23 13:55

			



                
                    
                        Revision: 5032
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=5032&view=rev
Author:   atkac
Date:     2013-01-23 13:55:46 +0000 (Wed, 23 Jan 2013)
Log Message:
-----------
Re-add the "-via" parameter support on UNIX platforms.

Modified Paths:
--------------
    trunk/vncviewer/ServerDialog.cxx
    trunk/vncviewer/ServerDialog.h
    trunk/vncviewer/parameters.cxx
    trunk/vncviewer/parameters.h
    trunk/vncviewer/vncviewer.cxx
    trunk/vncviewer/vncviewer.h

Modified: trunk/vncviewer/ServerDialog.cxx
===================================================================
--- trunk/vncviewer/ServerDialog.cxx	2013-01-22 08:11:05 UTC (rev 5031)
+++ trunk/vncviewer/ServerDialog.cxx	2013-01-23 13:55:46 UTC (rev 5032)
@@ -107,23 +107,22 @@
 }
 
 
-const char *ServerDialog::run(const char* servername)
+void ServerDialog::run(const char* servername, char *newservername)
 {
   ServerDialog dialog;
-  static char buffer[256];
 
   dialog.serverName->value(servername);
   
   dialog.show();
   while (dialog.shown()) Fl::wait();
 
-  if (dialog.serverName->value() == NULL)
-    return NULL;
+  if (dialog.serverName->value() == NULL) {
+    newservername[0] = '\0';
+    return;
+  }
 
-  strncpy(buffer, dialog.serverName->value(), sizeof(buffer));
-  buffer[sizeof(buffer)-1] = '\0';
-
-  return buffer;
+  strncpy(newservername, dialog.serverName->value(), VNCSERVERNAMELEN);
+  newservername[VNCSERVERNAMELEN - 1] = '\0';
 }
 
 void ServerDialog::handleOptions(Fl_Widget *widget, void *data)

Modified: trunk/vncviewer/ServerDialog.h
===================================================================
--- trunk/vncviewer/ServerDialog.h	2013-01-22 08:11:05 UTC (rev 5031)
+++ trunk/vncviewer/ServerDialog.h	2013-01-23 13:55:46 UTC (rev 5032)
@@ -29,7 +29,7 @@
   ~ServerDialog();
 
 public:
-  static const char *run(const char* servername);
+  static void run(const char* servername, char *newservername);
 
 protected:
   static void handleOptions(Fl_Widget *widget, void *data);

Modified: trunk/vncviewer/parameters.cxx
===================================================================
--- trunk/vncviewer/parameters.cxx	2013-01-22 08:11:05 UTC (rev 5031)
+++ trunk/vncviewer/parameters.cxx	2013-01-23 13:55:46 UTC (rev 5032)
@@ -133,6 +133,10 @@
                                    "to the server when in full screen mode.",
                                    true);
 
+#ifndef WIN32
+StringParameter via("via", "Gateway to tunnel via", "");
+#endif
+
 const char* IDENTIFIER_STRING = "TigerVNC Configuration file Version 1.0";
 
 VoidParameter* parameterArray[] = {

Modified: trunk/vncviewer/parameters.h
===================================================================
--- trunk/vncviewer/parameters.h	2013-01-22 08:11:05 UTC (rev 5031)
+++ trunk/vncviewer/parameters.h	2013-01-23 13:55:46 UTC (rev 5032)
@@ -60,6 +60,10 @@
 
 extern rfb::BoolParameter fullscreenSystemKeys;
 
+#ifndef WIN32
+extern rfb::StringParameter via;
+#endif
+
 void saveViewerParameters(const char *filename, const char *servername=NULL);
 char* loadViewerParameters(const char *filename);
 

Modified: trunk/vncviewer/vncviewer.cxx
===================================================================
--- trunk/vncviewer/vncviewer.cxx	2013-01-22 08:11:05 UTC (rev 5031)
+++ trunk/vncviewer/vncviewer.cxx	2013-01-23 13:55:46 UTC (rev 5032)
@@ -58,6 +58,7 @@
 #include "CConn.h"
 #include "ServerDialog.h"
 #include "UserDialog.h"
+#include "vncviewer.h"
 
 #ifdef WIN32
 #include "resource.h"
@@ -76,6 +77,8 @@
                                    "See http://www.tigervnc.org for information on TigerVNC.");
 extern const char* buildTime;
 
+char vncServerName[VNCSERVERNAMELEN] = { '\0' };
+
 static bool exitMainloop = false;
 static const char *exitError = NULL;
 
@@ -267,9 +270,84 @@
   exit(1);
 }
 
+#ifndef WIN32
+static int
+interpretViaParam(char *remoteHost, int *remotePort, int localPort)
+{
+  const int SERVER_PORT_OFFSET = 5900;
+  char *pos = strchr(vncServerName, ':');
+  if (pos == NULL)
+    *remotePort = SERVER_PORT_OFFSET;
+  else {
+    int portOffset = SERVER_PORT_OFFSET;
+    size_t len;
+    *pos++ = '\0';
+    len = strlen(pos);
+    if (*pos == ':') {
+      /* Two colons is an absolute port number, not an offset. */
+      pos++;
+      len--;
+      portOffset = 0;
+    }
+    if (!len || strspn (pos, "-0123456789") != len )
+      return 1;
+    *remotePort = atoi(pos) + portOffset;
+  }
+
+  if (*vncServerName != '\0')
+    strncpy(remoteHost, vncServerName, VNCSERVERNAMELEN);
+  else
+    strncpy(remoteHost, "localhost", VNCSERVERNAMELEN);
+
+  remoteHost[VNCSERVERNAMELEN - 1] = '\0';
+
+  snprintf(vncServerName, VNCSERVERNAMELEN, "localhost::%d", localPort);
+  vncServerName[VNCSERVERNAMELEN - 1] = '\0';
+  vlog.error(vncServerName);
+
+  return 0;
+}
+
+static void
+createTunnel(const char *gatewayHost, const char *remoteHost,
+             int remotePort, int localPort)
+{
+  char *cmd = getenv("VNC_VIA_CMD");
+  char *percent;
+  char lport[10], rport[10];
+  sprintf(lport, "%d", localPort);
+  sprintf(rport, "%d", remotePort);
+  setenv("G", gatewayHost, 1);
+  setenv("H", remoteHost, 1);
+  setenv("R", rport, 1);
+  setenv("L", lport, 1);
+  vlog.error("%s, %s, %d, %d", gatewayHost, remoteHost, rport, lport);
+  if (!cmd)
+    cmd = "/usr/bin/ssh -f -L \"$L\":\"$H\":\"$R\" \"$G\" sleep 20";
+  /* Compatibility with TigerVNC's method. */
+  while ((percent = strchr(cmd, '%')) != NULL)
+    *percent = '$';
+  system(cmd);
+}
+
+static int mktunnel()
+{
+  const char *gatewayHost;
+  char remoteHost[VNCSERVERNAMELEN];
+  int localPort = findFreeTcpPort();
+  int remotePort;
+
+  gatewayHost = strDup(via.getValueStr());
+  if (interpretViaParam(remoteHost, &remotePort, localPort) != 0)
+    return 1;
+  createTunnel(gatewayHost, remoteHost, remotePort, localPort);
+
+  return 0;
+}
+#endif /* !WIN32 */
+
 int main(int argc, char** argv)
 {
-  const char* vncServerName = NULL;
   UserDialog dlg;
 
   setlocale(LC_ALL, "");
@@ -332,7 +410,8 @@
         usage(argv[0]);
       }
 
-      vncServerName = argv[i];
+      strncpy(vncServerName, argv[i], VNCSERVERNAMELEN);
+      vncServerName[VNCSERVERNAMELEN - 1] = '\0';
     }
 
   if (!::autoSelect.hasBeenSet()) {
@@ -363,12 +442,17 @@
   CSecurityTLS::msg = &dlg;
 #endif
 
-  if (vncServerName == NULL) {
-    vncServerName = ServerDialog::run(defaultServerName);
-    if ((vncServerName == NULL) || (vncServerName[0] == '\0'))
+  if (vncServerName[0] == '\0') {
+    ServerDialog::run(defaultServerName, vncServerName);
+    if (vncServerName[0] == '\0')
       return 1;
   }
 
+#ifndef WIN32
+  if (strlen (via.getValueStr()) > 0 && mktunnel() != 0)
+    usage(argv[0]);
+#endif
+
   CConn *cc = new CConn(vncServerName);
 
   while (!exitMainloop) {

Modified: trunk/vncviewer/vncviewer.h
===================================================================
--- trunk/vncviewer/vncviewer.h	2013-01-22 08:11:05 UTC (rev 5031)
+++ trunk/vncviewer/vncviewer.h	2013-01-23 13:55:46 UTC (rev 5032)
@@ -19,6 +19,8 @@
 #ifndef __VNCVIEWER_H__
 #define __VNCVIEWER_H__
 
+#define VNCSERVERNAMELEN 64
+
 void exit_vncviewer(const char *error = NULL);
 void about_vncviewer();
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[5041] trunk/vncviewer
		From: <ossman_@us...> -	2013-02-15 08:33

			



                
                    
                        Revision: 5041
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=5041&view=rev
Author:   ossman_
Date:     2013-02-15 08:33:39 +0000 (Fri, 15 Feb 2013)
Log Message:
-----------
Reimplement -listen in the new FLTK vncviewer. Work done by
Justina Mickonyte for Cendio.

Modified Paths:
--------------
    trunk/vncviewer/CConn.cxx
    trunk/vncviewer/CConn.h
    trunk/vncviewer/parameters.cxx
    trunk/vncviewer/parameters.h
    trunk/vncviewer/vncviewer.cxx

Modified: trunk/vncviewer/CConn.cxx
===================================================================
--- trunk/vncviewer/CConn.cxx	2013-02-09 02:42:14 UTC (rev 5040)
+++ trunk/vncviewer/CConn.cxx	2013-02-15 08:33:39 UTC (rev 5041)
@@ -67,8 +67,8 @@
 // 256 colours (palette)
 static const PixelFormat mediumColourPF(8, 8, false, false);
 
-CConn::CConn(const char* vncServerName)
-  : serverHost(0), serverPort(0), sock(NULL), desktop(NULL),
+CConn::CConn(const char* vncServerName, network::Socket* socket=NULL)
+  : serverHost(0), serverPort(0), desktop(NULL),
     pendingPFChange(false),
     currentEncoding(encodingTight), lastServerEncoding((unsigned int)-1),
     formatChange(false), encodingChange(false),
@@ -76,6 +76,7 @@
     forceNonincremental(true), supportsSyncFence(false)
 {
   setShared(::shared);
+  sock = socket;
 
   int encNum = encodingNum(preferredEncoding);
   if (encNum != -1)
@@ -93,16 +94,18 @@
   cp.noJpeg = noJpeg;
   cp.qualityLevel = qualityLevel;
 
-  try {
-    getHostAndPort(vncServerName, &serverHost, &serverPort);
+  if(sock == NULL) {
+    try {
+      getHostAndPort(vncServerName, &serverHost, &serverPort);
 
-    sock = new network::TcpSocket(serverHost, serverPort);
-    vlog.info(_("connected to host %s port %d"), serverHost, serverPort);
-  } catch (rdr::Exception& e) {
-    vlog.error("%s", e.str());
-    fl_alert("%s", e.str());
-    exit_vncviewer();
-    return;
+      sock = new network::TcpSocket(serverHost, serverPort);
+      vlog.info(_("connected to host %s port %d"), serverHost, serverPort);
+    } catch (rdr::Exception& e) {
+      vlog.error("%s", e.str());
+      fl_alert("%s", e.str());
+      exit_vncviewer();
+      return;
+    }
   }
 
   Fl::add_fd(sock->getFd(), FL_READ | FL_EXCEPT, socketEvent, this);

Modified: trunk/vncviewer/CConn.h
===================================================================
--- trunk/vncviewer/CConn.h	2013-02-09 02:42:14 UTC (rev 5040)
+++ trunk/vncviewer/CConn.h	2013-02-15 08:33:39 UTC (rev 5041)
@@ -29,7 +29,7 @@
               public rdr::FdInStreamBlockCallback
 {
 public:
-  CConn(const char* vncServerName);
+  CConn(const char* vncServerName, network::Socket* sock);
   ~CConn();
 
   void refreshFramebuffer();

Modified: trunk/vncviewer/parameters.cxx
===================================================================
--- trunk/vncviewer/parameters.cxx	2013-02-09 02:42:14 UTC (rev 5040)
+++ trunk/vncviewer/parameters.cxx	2013-02-15 08:33:39 UTC (rev 5041)
@@ -102,6 +102,9 @@
                             "connect (if possible)", "");
 StringParameter geometry("geometry",
 			 "Specify size and position of viewer window", "");
+
+BoolParameter listenMode("listen", "Listen for connections from VNC servers", false);
+
 BoolParameter remoteResize("RemoteResize",
                            "Dynamically resize the remote desktop size as "
                            "the size of the local client window changes. "

Modified: trunk/vncviewer/parameters.h
===================================================================
--- trunk/vncviewer/parameters.h	2013-02-09 02:42:14 UTC (rev 5040)
+++ trunk/vncviewer/parameters.h	2013-02-15 08:33:39 UTC (rev 5041)
@@ -49,6 +49,8 @@
 extern rfb::StringParameter geometry;
 extern rfb::BoolParameter remoteResize;
 
+extern rfb::BoolParameter listenMode;
+
 extern rfb::BoolParameter viewOnly;
 extern rfb::BoolParameter shared;
 

Modified: trunk/vncviewer/vncviewer.cxx
===================================================================
--- trunk/vncviewer/vncviewer.cxx	2013-02-09 02:42:14 UTC (rev 5040)
+++ trunk/vncviewer/vncviewer.cxx	2013-02-15 08:33:39 UTC (rev 5041)
@@ -24,6 +24,7 @@
 
 #include <string.h>
 #include <stdio.h>
+#include <ctype.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <signal.h>
@@ -441,18 +442,39 @@
   CSecurityTLS::msg = &dlg;
 #endif
 
-  if (vncServerName[0] == '\0') {
-    ServerDialog::run(defaultServerName, vncServerName);
-    if (vncServerName[0] == '\0')
-      return 1;
-  }
+  Socket *sock = NULL;
 
+  if(listenMode) {
+    try {
+      int port = 5500;
+      if (isdigit(vncServerName[0]))
+        port = atoi(vncServerName);
+
+      TcpListener listener(NULL, port);
+
+      vlog.info("Listening on port %d\n", port);
+      sock = listener.accept();   
+    } catch (rdr::Exception& e) {
+      vlog.error("%s", e.str());
+      fl_alert("%s", e.str());
+      exit_vncviewer();
+      return 1; 
+    }
+
+  } else {
+    if (vncServerName[0] == '\0') {
+      ServerDialog::run(defaultServerName, vncServerName);
+      if (vncServerName[0] == '\0')
+        return 1;
+    }
+
 #ifndef WIN32
-  if (strlen (via.getValueStr()) > 0 && mktunnel() != 0)
-    usage(argv[0]);
+    if (strlen (via.getValueStr()) > 0 && mktunnel() != 0)
+      usage(argv[0]);
 #endif
+  }
 
-  CConn *cc = new CConn(vncServerName);
+  CConn *cc = new CConn(vncServerName, sock);
 
   while (!exitMainloop) {
     int next_timer;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


                        

                        

                    
                
            
        
    






    
         
        
            
                
	
		[Tigervnc-commits] SF.net SVN: tigervnc:[5051] trunk/vncviewer
		From: <dcommander@us...> -	2013-02-26 10:34

			



                
                    
                        Revision: 5051
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=5051&view=rev
Author:   dcommander
Date:     2013-02-26 10:34:22 +0000 (Tue, 26 Feb 2013)
Log Message:
-----------
Fix build on 32-bit and 64-bit Windows

Modified Paths:
--------------
    trunk/vncviewer/CConn.cxx
    trunk/vncviewer/CConn.h
    trunk/vncviewer/vncviewer.cxx

Modified: trunk/vncviewer/CConn.cxx
===================================================================
--- trunk/vncviewer/CConn.cxx	2013-02-22 19:47:13 UTC (rev 5050)
+++ trunk/vncviewer/CConn.cxx	2013-02-26 10:34:22 UTC (rev 5051)
@@ -192,7 +192,7 @@
   Fl::wait((double)next_timer / 1000.0);
 }
 
-void CConn::socketEvent(int fd, void *data)
+void CConn::socketEvent(FL_SOCKET fd, void *data)
 {
   CConn *cc;
   static bool recursing = false;

Modified: trunk/vncviewer/CConn.h
===================================================================
--- trunk/vncviewer/CConn.h	2013-02-22 19:47:13 UTC (rev 5050)
+++ trunk/vncviewer/CConn.h	2013-02-26 10:34:22 UTC (rev 5051)
@@ -40,7 +40,7 @@
   void blockCallback();
 
   // Callback when socket is ready (or broken)
-  static void socketEvent(int fd, void *data);
+  static void socketEvent(FL_SOCKET fd, void *data);
 
   // CConnection callback methods
   void serverInit();

Modified: trunk/vncviewer/vncviewer.cxx
===================================================================
--- trunk/vncviewer/vncviewer.cxx	2013-02-22 19:47:13 UTC (rev 5050)
+++ trunk/vncviewer/vncviewer.cxx	2013-02-26 10:34:22 UTC (rev 5051)
@@ -444,6 +444,7 @@
 
   Socket *sock = NULL;
 
+#ifndef WIN32
   /* Specifying -via and -listen together is nonsense */
   if (listenMode && strlen(via.getValueStr()) > 0) {
     vlog.error("Parameters -listen and -via are incompatible");
@@ -451,6 +452,7 @@
     exit_vncviewer();
     return 1;
   }
+#endif
 
   if (listenMode) {
     try {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.