gmane.network.vnc.tigervnc.scm

SF.net SVN: tigervnc:[4918] trunk/java/com/tigervnc/vncviewer/VncViewer. java

2012-05-23T04:21:10

Revision: 4918
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4918&view=rev
Author:   bphinz
Date:     2012-05-23 04:21:09 +0000 (Wed, 23 May 2012)
Log Message:
-----------
removed ANSI character escapes, not supported on Windows cmd line

Modified Paths:
--------------
    trunk/java/com/tigervnc/vncviewer/VncViewer.java

Modified: trunk/java/com/tigervnc/vncviewer/VncViewer.java
===================================================================
--- trunk/java/com/tigervnc/vncviewer/VncViewer.java2012-05-23 03:43:10 UTC (rev 4917)
+++ trunk/java/com/tigervnc/vncviewer/VncViewer.java2012-05-23 04:21:09 UTC (rev 4918)
< at >< at > -202,13 +202,12 < at >< at >
 
     Configuration.listParams(79, 14);
     String propertiesString = ("\n"+
-"\u001B[1mSystem Properties\u001B[0m (adapted from the TurboVNC vncviewer man page)\n"+
-"  When started with the -via option, vncviewer reads the\n"+
-"  \u001B[1mVNC_VIA_CMD\u001B[0m System property, expands\n"+
-"  patterns beginning with the \"%\" character, and uses the resu

SF.net SVN: tigervnc:[4917] trunk/java/com/tigervnc/vncviewer/BIPixelBuffer .java

2012-05-23T03:43:10

Revision: 4917
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4917&view=rev
Author:   bphinz
Date:     2012-05-23 03:43:10 +0000 (Wed, 23 May 2012)
Log Message:
-----------
Significantly improves the peak frame rate on platforms that support using BIPixelBuffer

Modified Paths:
--------------
    trunk/java/com/tigervnc/vncviewer/BIPixelBuffer.java

Modified: trunk/java/com/tigervnc/vncviewer/BIPixelBuffer.java
===================================================================
--- trunk/java/com/tigervnc/vncviewer/BIPixelBuffer.java2012-05-23 03:40:07 UTC (rev 4916)
+++ trunk/java/com/tigervnc/vncviewer/BIPixelBuffer.java2012-05-23 03:43:10 UTC (rev 4917)
< at >< at > -24,12 +24,25 < at >< at >
 import com.tigervnc.rfb.*;
 import com.tigervnc.rfb.Exception;
 
-public class BIPixelBuffer extends PlatformPixelBuffer
+public class BIPixelBuffer extends PlatformPixelBuffer implements ImageObserver
 {
   public BIPixelBuffer(int w, int h, CConn cc_, DesktopWindow desktop_) {
     super(w, h, cc_, desktop_);
+    clip

SF.net SVN: tigervnc:[4916]trunk/java/com/tigervnc/vncviewer

2012-05-23T03:40:07

Revision: 4916
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4916&view=rev
Author:   bphinz
Date:     2012-05-23 03:40:07 +0000 (Wed, 23 May 2012)
Log Message:
-----------
Shortened SSH tunneling System property names, fixed problem with parsing of '-via' cmd line option, fixed intermittent problem with SSH password dialog.

Modified Paths:
--------------
    trunk/java/com/tigervnc/vncviewer/VncViewer.java
    trunk/java/com/tigervnc/vncviewer/tunnel.java

Modified: trunk/java/com/tigervnc/vncviewer/VncViewer.java
===================================================================
--- trunk/java/com/tigervnc/vncviewer/VncViewer.java2012-05-19 13:28:43 UTC (rev 4915)
+++ trunk/java/com/tigervnc/vncviewer/VncViewer.java2012-05-23 03:40:07 UTC (rev 4916)
< at >< at > -139,6 +139,7 < at >< at >
       if (argv[i].equalsIgnoreCase("-tunnel") || argv[i].equalsIgnoreCase("-via")) {
         if (!tunnel.createTunnel(argv.length, argv, i))
           System.exit(1);
+        if (argv[i].equalsIgnoreCase("-via")) i++;

SF.net SVN: tigervnc:[4915] trunk/java/com/tigervnc/vncviewer/BIPixelBuffer .java

2012-05-19T13:28:43

Revision: 4915
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4915&view=rev
Author:   bphinz
Date:     2012-05-19 13:28:43 +0000 (Sat, 19 May 2012)
Log Message:
-----------
Fixes what appears to be a Java bug on Linux. Graphics2D.copyArea corrupts the screen image when areas are shifted to the left.  Benchmarking show no measurable performance impact from this change, and it seems to mitigate the problem.

Modified Paths:
--------------
    trunk/java/com/tigervnc/vncviewer/BIPixelBuffer.java

Modified: trunk/java/com/tigervnc/vncviewer/BIPixelBuffer.java
===================================================================
--- trunk/java/com/tigervnc/vncviewer/BIPixelBuffer.java2012-05-16 03:51:42 UTC (rev 4914)
+++ trunk/java/com/tigervnc/vncviewer/BIPixelBuffer.java2012-05-19 13:28:43 UTC (rev 4915)
< at >< at > -40,7 +40,7 < at >< at >
       GraphicsEnvironment.getLocalGraphicsEnvironment();
     GraphicsDevice gd = ge.getDefaultScreenDevice();
     GraphicsConfiguration gc = gd.getDefaultConfiguration();
-

SF.net SVN: tigervnc:[4914]trunk/java/com/tigervnc/vncviewer

2012-05-16T03:51:43

Revision: 4914
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4914&view=rev
Author:   bphinz
Date:     2012-05-16 03:51:42 +0000 (Wed, 16 May 2012)
Log Message:
-----------
Adds support for setting the menu key via cmd line arg.  Adds all menu keys supported by native viewer to the combo box in the OptionsDialog.

Modified Paths:
--------------
    trunk/java/com/tigervnc/vncviewer/CConn.java
    trunk/java/com/tigervnc/vncviewer/DesktopWindow.java
    trunk/java/com/tigervnc/vncviewer/F8Menu.java
    trunk/java/com/tigervnc/vncviewer/OptionsDialog.java
    trunk/java/com/tigervnc/vncviewer/VncViewer.java

Added Paths:
-----------
    trunk/java/com/tigervnc/vncviewer/menukey.java

Modified: trunk/java/com/tigervnc/vncviewer/CConn.java
===================================================================
--- trunk/java/com/tigervnc/vncviewer/CConn.java2012-05-14 02:19:41 UTC (rev 4913)
+++ trunk/java/com/tigervnc/vncviewer/CConn.java2012-05-16 03:51:42 UTC (rev 4914)
< at >< at > -165,7 +165,7 < at >< at >
     aut

SF.net SVN: tigervnc:[4913]trunk/java/com/tigervnc

2012-05-14T02:19:42

Revision: 4913
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4913&view=rev
Author:   bphinz
Date:     2012-05-14 02:19:41 +0000 (Mon, 14 May 2012)
Log Message:
-----------
Implemented rfb/Configuration similar to the native client methods. Added equivalent cmd line options for all native client options except "-menuKey", which needs a little more work on the GUI side before it can be added.

Modified Paths:
--------------
    trunk/java/com/tigervnc/rfb/AliasParameter.java
    trunk/java/com/tigervnc/rfb/BoolParameter.java
    trunk/java/com/tigervnc/rfb/CSecurityTLS.java
    trunk/java/com/tigervnc/rfb/Configuration.java
    trunk/java/com/tigervnc/rfb/IntParameter.java
    trunk/java/com/tigervnc/rfb/SecurityClient.java
    trunk/java/com/tigervnc/rfb/StringParameter.java
    trunk/java/com/tigervnc/rfb/VoidParameter.java
    trunk/java/com/tigervnc/vncviewer/CConn.java
    trunk/java/com/tigervnc/vncviewer/VncViewer.java

Modified: trunk/java/com/tigervnc/rfb/AliasParameter.java
============

SF.net SVN: tigervnc:[4912] trunk/java/com/tigervnc/vncviewer/VncViewer. java

2012-05-07T01:02:24

Revision: 4912
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4912&view=rev
Author:   bphinz
Date:     2012-05-07 01:02:24 +0000 (Mon, 07 May 2012)
Log Message:
-----------
Reverted change introduced in r4910, r4911 didn't fix the problem that was created.

Revision Links:
--------------
    http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4910&view=rev
    http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4911&view=rev

Modified Paths:
--------------
    trunk/java/com/tigervnc/vncviewer/VncViewer.java

Modified: trunk/java/com/tigervnc/vncviewer/VncViewer.java
===================================================================
--- trunk/java/com/tigervnc/vncviewer/VncViewer.java2012-05-07 00:30:08 UTC (rev 4911)
+++ trunk/java/com/tigervnc/vncviewer/VncViewer.java2012-05-07 01:02:24 UTC (rev 4912)
< at >< at > -143,8 +143,9 < at >< at >
         usage();
       }
 
-      if (vncServerName.getValue() == "")
-        vncServerName.setParam(argv[i]);
+      if (vncServerName.getValue() != null)
+        usage();

SF.net SVN: tigervnc:[4911] trunk/java/com/tigervnc/vncviewer/VncViewer. java

2012-05-07T00:30:09

Revision: 4911
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4911&view=rev
Author:   bphinz
Date:     2012-05-07 00:30:08 +0000 (Mon, 07 May 2012)
Log Message:
-----------
Fixed a null pointer exception introduced by r4909

Revision Links:
--------------
    http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4909&view=rev

Modified Paths:
--------------
    trunk/java/com/tigervnc/vncviewer/VncViewer.java

Modified: trunk/java/com/tigervnc/vncviewer/VncViewer.java
===================================================================
--- trunk/java/com/tigervnc/vncviewer/VncViewer.java2012-05-06 19:18:05 UTC (rev 4910)
+++ trunk/java/com/tigervnc/vncviewer/VncViewer.java2012-05-07 00:30:08 UTC (rev 4911)
< at >< at > -143,7 +143,7 < at >< at >
         usage();
       }
 
-      if (vncServerName.getValue() == null)
+      if (vncServerName.getValue() == "")
         vncServerName.setParam(argv[i]);
     }
 
< at >< at > -366,7 +366,7 < at >< at >
   StringParameter passwordFile
   = new StringParameter("PasswordFile",

SF.net SVN: tigervnc:[4910]trunk/java/com/tigervnc/vncviewer

2012-05-06T19:18:05

Revision: 4910
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4910&view=rev
Author:   bphinz
Date:     2012-05-06 19:18:05 +0000 (Sun, 06 May 2012)
Log Message:
-----------
Re-implemented SSH tunneling features in Java viewer based on TurboVNC native client method.  Adds support for string substitutions of via command, as well as a '-tunnel' option for tunneling directly to VNC server host (also support string substitutions). This implementation requires the vncServerName to be the last argument specified to the viewer, however this is consistent with the behavior of the native client and does not appear to cause any problems when using the viewer in standalone, applet, or jnlp modes.

Modified Paths:
--------------
    trunk/java/com/tigervnc/vncviewer/VncViewer.java

Added Paths:
-----------
    trunk/java/com/tigervnc/vncviewer/tunnel.java

Modified: trunk/java/com/tigervnc/vncviewer/VncViewer.java
===================================================================
--- trunk/java/com/tigervnc

SF.net SVN: tigervnc:[4909]trunk/java/com/tigervnc

2012-05-06T17:51:27

Revision: 4909
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4909&view=rev
Author:   bphinz
Date:     2012-05-06 17:51:27 +0000 (Sun, 06 May 2012)
Log Message:
-----------
improve readability of usage message displayed by Java viewer.

Modified Paths:
--------------
    trunk/java/com/tigervnc/rfb/VoidParameter.java
    trunk/java/com/tigervnc/vncviewer/VncViewer.java

Modified: trunk/java/com/tigervnc/rfb/VoidParameter.java
===================================================================
--- trunk/java/com/tigervnc/rfb/VoidParameter.java2012-04-27 18:23:31 UTC (rev 4908)
+++ trunk/java/com/tigervnc/rfb/VoidParameter.java2012-05-06 17:51:27 UTC (rev 4909)
< at >< at > -35,7 +35,7 < at >< at >
   abstract public String getValueStr();
   public boolean isBool() { return false; }
 
-  VoidParameter next;
+  public VoidParameter next;
   protected String name;
   protected String description;
 }

Modified: trunk/java/com/tigervnc/vncviewer/VncViewer.java
===========================================================

SF.net SVN: tigervnc:[4908] trunk/java/com/tigervnc/network/TcpListener. java

2012-04-27T18:23:31

Revision: 4908
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4908&view=rev
Author:   bphinz
Date:     2012-04-27 18:23:31 +0000 (Fri, 27 Apr 2012)
Log Message:
-----------
Fixed an issue with -listen mode where java client wasn't listening on the wildcard address

Modified Paths:
--------------
    trunk/java/com/tigervnc/network/TcpListener.java

Modified: trunk/java/com/tigervnc/network/TcpListener.java
===================================================================
--- trunk/java/com/tigervnc/network/TcpListener.java2012-04-26 14:27:52 UTC (rev 4907)
+++ trunk/java/com/tigervnc/network/TcpListener.java2012-04-27 18:23:31 UTC (rev 4908)
< at >< at > -59,9 +59,7 < at >< at >
       } else if (listenaddr != null) {
           addr = java.net.InetAddress.getByName(listenaddr);
       } else {
-        // FIXME: need to be sure we get the wildcard address?
-        addr = InetAddress.getByName(null);
-        //addr = InetAddress.getLocalHost();
+        addr = InetAddress.getByName("0.0.0.0");
       }
     }

SF.net SVN: tigervnc:[4907]trunk/vncviewer/vncviewer.cxx

2012-04-26T14:27:53

Revision: 4907
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4907&view=rev
Author:   ossman_
Date:     2012-04-26 14:27:52 +0000 (Thu, 26 Apr 2012)
Log Message:
-----------
The old Windows viewer was capable of logging to file. This is essential
on Windows as stdout/stderr don't work well there. Make sure the new
viewer also has this functionality.

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

Modified: trunk/vncviewer/vncviewer.cxx
===================================================================
--- trunk/vncviewer/vncviewer.cxx2012-04-26 09:18:19 UTC (rev 4906)
+++ trunk/vncviewer/vncviewer.cxx2012-04-26 14:27:52 UTC (rev 4907)
< at >< at > -290,6 +290,11 < at >< at >
   bind_textdomain_codeset("libc", "UTF-8");
 
   rfb::initStdIOLoggers();
+#ifdef WIN32
+  rfb::initFileLogger("C:\\temp\\vncviewer.log");
+#else
+  rfb::initFileLogger("/tmp/vncviewer.log");
+#endif
   rfb::LogWriter::setLogParams("*:stderr:30");
 
 #ifdef SIGHUP

This was sent by the SourceForge.net collaborative develo

SF.net SVN: tigervnc:[4906]trunk/win/winvnc/JavaViewer.cxx

2012-04-26T09:18:19

Revision: 4906
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4906&view=rev
Author:   ossman_
Date:     2012-04-26 09:18:19 +0000 (Thu, 26 Apr 2012)
Log Message:
-----------
Windows has a bit of a peculiarity in that winsock2.h must be included
before windows.h for correct winsock behaviour. mingw-w64 also enforces
this order, so to avoid compile errors we must include windows.h late in
all files.

Modified Paths:
--------------
    trunk/win/winvnc/JavaViewer.cxx

Modified: trunk/win/winvnc/JavaViewer.cxx
===================================================================
--- trunk/win/winvnc/JavaViewer.cxx2012-04-26 09:04:14 UTC (rev 4905)
+++ trunk/win/winvnc/JavaViewer.cxx2012-04-26 09:18:19 UTC (rev 4906)
< at >< at > -16,7 +16,6 < at >< at >
  * USA.
  */
 
-#include <windows.h>
 #include <winvnc/JavaViewer.h>
 #include <winvnc/resource.h>
 #include <rdr/MemInStream.h>
< at >< at > -24,6 +23,8 < at >< at >
 #include <rfb/VNCServerST.h>
 #include <rfb_win32/TCharArray.h>
 
+#include <windows.h>
+
 #define strcasecmp _stricmp

SF.net SVN: tigervnc:[4905] trunk

2012-04-26T09:04:14

Revision: 4905
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4905&view=rev
Author:   ossman_
Date:     2012-04-26 09:04:14 +0000 (Thu, 26 Apr 2012)
Log Message:
-----------
Fix unsafe usage of the logging functions.

Modified Paths:
--------------
    trunk/common/rfb/CConnection.cxx
    trunk/common/rfb/CSecurityTLS.cxx
    trunk/common/rfb/SConnection.cxx
    trunk/common/rfb/SSecurityTLS.cxx
    trunk/unix/vncconfig/vncconfig.cxx
    trunk/unix/x0vncserver/x0vncserver.cxx
    trunk/vncviewer/CConn.cxx
    trunk/vncviewer/Viewport.cxx
    trunk/win/rfb_win32/CleanDesktop.cxx
    trunk/win/rfb_win32/Clipboard.cxx
    trunk/win/rfb_win32/DeviceFrameBuffer.cxx
    trunk/win/rfb_win32/MonitorInfo.cxx
    trunk/win/rfb_win32/RegConfig.cxx
    trunk/win/rfb_win32/SDisplay.cxx
    trunk/win/rfb_win32/SocketManager.cxx

Modified: trunk/common/rfb/CConnection.cxx
===================================================================
--- trunk/common/rfb/CConnection.cxx2012-04-26 08:51:19 UTC (rev 4904)

SF.net SVN: tigervnc:[4904]trunk/common/rfb/LogWriter.h

2012-04-26T08:51:20

Revision: 4904
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4904&view=rev
Author:   ossman_
Date:     2012-04-26 08:51:19 +0000 (Thu, 26 Apr 2012)
Log Message:
-----------
Allow gcc to check for correct usage of the formatting string for the
logging class.

Modified Paths:
--------------
    trunk/common/rfb/LogWriter.h

Modified: trunk/common/rfb/LogWriter.h
===================================================================
--- trunk/common/rfb/LogWriter.h2012-04-26 04:33:11 UTC (rev 4903)
+++ trunk/common/rfb/LogWriter.h2012-04-26 08:51:19 UTC (rev 4904)
< at >< at > -25,12 +25,18 < at >< at >
 #include <rfb/Logger.h>
 #include <rfb/Configuration.h>
 
+#ifdef __GNUC__
+#  define __printf_attr(a, b) __attribute__((__format__ (__printf__, a, b)))
+#else
+#  define __printf_attr(a, b)
+#endif // __GNUC__
+
 // Each log writer instance has a unique textual name,
 // and is attached to a particular Log instance and
 // is assigned a particular log level.
 
 #define DEF_LOGFUNCTION(name, level) \
-  inline void na

SF.net SVN: tigervnc:[4903] trunk/java/com/tigervnc/vncviewer/OptionsDialog .java

2012-04-26T04:33:11

Revision: 4903
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4903&view=rev
Author:   bphinz
Date:     2012-04-26 04:33:11 +0000 (Thu, 26 Apr 2012)
Log Message:
-----------
Fixed cut & paste error

Modified Paths:
--------------
    trunk/java/com/tigervnc/vncviewer/OptionsDialog.java

Modified: trunk/java/com/tigervnc/vncviewer/OptionsDialog.java
===================================================================
--- trunk/java/com/tigervnc/vncviewer/OptionsDialog.java2012-04-26 00:03:16 UTC (rev 4902)
+++ trunk/java/com/tigervnc/vncviewer/OptionsDialog.java2012-04-26 04:33:11 UTC (rev 4903)
< at >< at > -160,7 +160,7 < at >< at >
     scalingFactor = new JComboBox(scalingFactors);
     // Hack to set the left inset on editable JComboBox
     if (UIManager.getLookAndFeel().getID() == "Windows") {
-      scalingFactor.setBorder(BorderFactory.createCompoundBorder(compressLevel.getBorder(),
+      scalingFactor.setBorder(BorderFactory.createCompoundBorder(scalingFactor.getBorder(),
         BorderFactory.createEmpt

SF.net SVN: tigervnc:[4902]trunk/java/com/tigervnc

2012-04-26T00:03:17

Revision: 4902
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4902&view=rev
Author:   bphinz
Date:     2012-04-26 00:03:16 +0000 (Thu, 26 Apr 2012)
Log Message:
-----------
Fix Socket methods for querying the socket endpoints. Fix the address displayed in the info dialog for redirected connections.

Modified Paths:
--------------
    trunk/java/com/tigervnc/network/Socket.java
    trunk/java/com/tigervnc/network/TcpSocket.java
    trunk/java/com/tigervnc/vncviewer/CConn.java

Modified: trunk/java/com/tigervnc/network/Socket.java
===================================================================
--- trunk/java/com/tigervnc/network/Socket.java2012-04-25 21:20:24 UTC (rev 4901)
+++ trunk/java/com/tigervnc/network/Socket.java2012-04-26 00:03:16 UTC (rev 4902)
< at >< at > -51,6 +51,7 < at >< at >
 
   // information about the remote end of the socket
   abstract public String getPeerAddress(); // a string e.g. "192.168.0.1"
+  abstract public String getPeerName(); 
   abstract public int getPeerPort();
   abstract p

SF.net SVN: tigervnc:[4901]trunk/java/com/tigervnc/vncviewer

2012-04-25T21:20:24

Revision: 4901
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4901&view=rev
Author:   bphinz
Date:     2012-04-25 21:20:24 +0000 (Wed, 25 Apr 2012)
Log Message:
-----------
Remove hard-coded font names from UI settings.

Modified Paths:
--------------
    trunk/java/com/tigervnc/vncviewer/OptionsDialog.java
    trunk/java/com/tigervnc/vncviewer/VncViewer.java

Modified: trunk/java/com/tigervnc/vncviewer/OptionsDialog.java
===================================================================
--- trunk/java/com/tigervnc/vncviewer/OptionsDialog.java2012-04-25 15:43:56 UTC (rev 4900)
+++ trunk/java/com/tigervnc/vncviewer/OptionsDialog.java2012-04-25 21:20:24 UTC (rev 4901)
< at >< at > -105,7 +105,7 < at >< at >
     addGBComponent(customCompressLevel, tightPanel, 0, 0, 2, 1, 2, 2, 1, 0, GridBagConstraints.HORIZONTAL, GridBagConstraints.FIRST_LINE_START, new Insets(0,0,0,0));
     addGBComponent(compressLevel, tightPanel,       0, 1, 1, 1, 2, 2, 0, 0, GridBagConstraints.NONE, GridBagConstraints.FIRST_LINE_START, new In

SF.net SVN: tigervnc:[4900] trunk/vncviewer

2012-04-25T15:43:56

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.cxx2012-04-25 15:10:38 UTC (rev 4899)
+++ trunk/vncviewer/CConn.cxx2012-04-25 15:43:56 UTC (rev 4900)
< at >< at > -100,7 +100,7 < at >< at >
     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
===============

SF.net SVN: tigervnc:[4899]trunk/unix/xserver/hw/vnc/Makefile.am

2012-04-25T15:10:38

Revision: 4899
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4899&view=rev
Author:   ossman_
Date:     2012-04-25 15:10:38 +0000 (Wed, 25 Apr 2012)
Log Message:
-----------
The reformatting of all the Xserver sources in the 1.12.1 release changed
the headers so now some of them have multiple instances of the C++ "and"
and "xor" keywords on the same line, so the hack to sanitize them needs
to use the sed "g" flag to replace all instances, not just the first.

Otherwise, the build fails with strange errors such as:

"fb.h", line 817: Error: Unexpected type name "FbBits" encountered.
"fb.h", line 817: Error: dst is not defined.
"fb.h", line 818: Error: Unexpected type name "FbStride" encountered.
"fb.h", line 818: Error: dstStride is not defined.
"fb.h", line 819: Error: Badly formed expression.

Signed-off-by: Alan Coopersmith <alan.coopersmith-QHcLZuEGTsvQT0dZR+AlfA< at >public.gmane.org>

Modified Paths:
--------------
    trunk/unix/xserver/hw/vnc/Makefile.am

Modified: trunk/unix/xserver/hw/vnc/Ma

SF.net SVN: tigervnc:[4898] trunk/common/fltk

2012-04-25T14:57:23

Revision: 4898
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4898&view=rev
Author:   ossman_
Date:     2012-04-25 14:57:22 +0000 (Wed, 25 Apr 2012)
Log Message:
-----------
Proper support for icons in FLTK (upstream STR 2816).

Modified Paths:
--------------
    trunk/common/fltk/FL/Fl_Window.H
    trunk/common/fltk/FL/mac.H
    trunk/common/fltk/FL/win32.H
    trunk/common/fltk/FL/x.H
    trunk/common/fltk/src/Fl.cxx
    trunk/common/fltk/src/Fl_Window.cxx
    trunk/common/fltk/src/Fl_win32.cxx
    trunk/common/fltk/src/Fl_x.cxx

Modified: trunk/common/fltk/FL/Fl_Window.H
===================================================================
--- trunk/common/fltk/FL/Fl_Window.H2012-04-25 14:54:04 UTC (rev 4897)
+++ trunk/common/fltk/FL/Fl_Window.H2012-04-25 14:57:22 UTC (rev 4898)
< at >< at > -31,6 +31,10 < at >< at >
 #ifndef Fl_Window_H
 #define Fl_Window_H
 
+#ifdef WIN32
+#include <windows.h>
+#endif
+
 #include "Fl_Group.H"
 
 #define FL_WINDOW 0xF0///< window type id all subclasses have type() >= this
< at >< at >