I was unable to get the java applet to load from the Xvnc built in
httpd until I rebuilt it with the attached patch.
Since I had to adjust the javac/jar steps to include all the subdirectories
into the jar, I moved the Makefile, so before this patch will apply cleanly
you will need to do:
cd java/src/
svn move com/tigervnc/vncviewer/Makefile .
While I was adjusting the applet parameters in the html file, I also cleaned
them up a bit, to at least old HTML standards (nothing fancy like xhtml).
The second patch is just a little extra bit of branding flair to show the
TigerVNC logo on the http served applet pages.
--
-Alan Coopersmith- alan.coopersm...@sun.com
Sun Microsystems, Inc. - X Window System Engineering
Index: java/src/Makefile
===================================================================
--- java/src/Makefile (revision 3916)
+++ java/src/Makefile (working copy)
@@ -4,41 +4,55 @@
CP = cp
JC = javac
-JCFLAGS = -target 1.5 -classpath ../../../
+JCFLAGS = -target 1.5 -classpath .
JAR = jar
ARCHIVE = VncViewer.jar
-MANIFEST = MANIFEST.MF
-PAGES = index.vnc
+MANIFEST = com/tigervnc/vncviewer/MANIFEST.MF
+PAGES = com/tigervnc/vncviewer/index.vnc com/tigervnc/vncviewer/index.html
INSTALL_DIR = /usr/local/vnc/classes
-CLASSES = VncViewer.class RfbProto.class AuthPanel.class VncCanvas.class \
- VncCanvas2.class \
- OptionsFrame.class ClipboardFrame.class ButtonPanel.class \
- DesCipher.class CapabilityInfo.class CapsContainer.class \
- RecordingFrame.class SessionRecorder.class \
- SocketFactory.class HTTPConnectSocketFactory.class \
- HTTPConnectSocket.class ReloginPanel.class \
- InStream.class MemInStream.class ZlibInStream.class
+SOURCES = \
+ com/tigervnc/decoder/CopyRectDecoder.java \
+ com/tigervnc/decoder/CoRREDecoder.java \
+ com/tigervnc/decoder/HextileDecoder.java \
+ com/tigervnc/decoder/RawDecoder.java \
+ com/tigervnc/decoder/RREDecoder.java \
+ com/tigervnc/decoder/TightDecoder.java \
+ com/tigervnc/decoder/ZlibDecoder.java \
+ com/tigervnc/decoder/ZRLEDecoder.java \
+ com/tigervnc/vncviewer/AuthPanel.java \
+ com/tigervnc/vncviewer/ButtonPanel.java \
+ com/tigervnc/vncviewer/CapabilityInfo.java \
+ com/tigervnc/vncviewer/CapsContainer.java \
+ com/tigervnc/vncviewer/ClipboardFrame.java \
+ com/tigervnc/vncviewer/DesCipher.java \
+ com/tigervnc/vncviewer/HTTPConnectSocket.java \
+ com/tigervnc/vncviewer/HTTPConnectSocketFactory.java \
+ com/tigervnc/vncviewer/InStream.java \
+ com/tigervnc/vncviewer/MemInStream.java \
+ com/tigervnc/vncviewer/OptionsFrame.java \
+ com/tigervnc/vncviewer/RecordingFrame.java \
+ com/tigervnc/vncviewer/RecordOutputStream.java \
+ com/tigervnc/vncviewer/ReloginPanel.java \
+ com/tigervnc/vncviewer/RfbInputStream.java \
+ com/tigervnc/vncviewer/RfbProto.java \
+ com/tigervnc/vncviewer/SessionRecorder.java \
+ com/tigervnc/vncviewer/SocketFactory.java \
+ com/tigervnc/vncviewer/VncCanvas.java \
+ com/tigervnc/vncviewer/VncCanvas2.java \
+ com/tigervnc/vncviewer/VncViewer.java \
+ com/tigervnc/vncviewer/ZlibInStream.java
-SOURCES = VncViewer.java RfbProto.java AuthPanel.java VncCanvas.java \
- VncCanvas2.java \
- OptionsFrame.java ClipboardFrame.java ButtonPanel.java \
- DesCipher.java CapabilityInfo.java CapsContainer.java \
- RecordingFrame.java SessionRecorder.java \
- SocketFactory.java HTTPConnectSocketFactory.java \
- HTTPConnectSocket.java ReloginPanel.java \
- InStream.java MemInStream.java ZlibInStream.java
+CLASSES = $(SOURCES:.java=.class)
-all: $(CLASSES) $(ARCHIVE)
+all: $(ARCHIVE)
-$(CLASSES): $(SOURCES)
+$(ARCHIVE): $(SOURCES) $(MANIFEST)
$(JC) $(JCFLAGS) -O $(SOURCES)
-
-$(ARCHIVE): $(CLASSES) $(MANIFEST)
$(JAR) cfm $(ARCHIVE) $(MANIFEST) $(CLASSES)
-install: $(CLASSES) $(ARCHIVE)
- $(CP) $(CLASSES) $(ARCHIVE) $(PAGES) $(INSTALL_DIR)
+install: $(ARCHIVE)
+ $(CP) $(ARCHIVE) $(PAGES) $(INSTALL_DIR)
export:: $(CLASSES) $(ARCHIVE) $(PAGES)
@$(ExportJavaClasses)
Index: java/src/com/tigervnc/vncviewer/index.vnc
===================================================================
--- java/src/com/tigervnc/vncviewer/index.vnc (revision 3916)
+++ java/src/com/tigervnc/vncviewer/index.vnc (working copy)
@@ -1,3 +1,4 @@
+<HTML><HEAD>
<!--
index.vnc - default HTML page for TigerVNC Java viewer applet, to be
used with Xvnc. On any file ending in .vnc, the HTTP server embedded in
@@ -6,20 +7,20 @@
PARAMS. Use two dollar signs ($$) to get a dollar sign in the generated
HTML page.
- NOTE: the $PARAMS variable is not supported by the standard VNC, so
+ NOTE: the PARAMS variable is not supported by the standard VNC, so
make sure you have TigerVNC on the server side, if you're using this
variable.
-->
-
-<HTML>
<TITLE>
$USER's $DESKTOP desktop ($DISPLAY)
</TITLE>
-<APPLET CODE=VncViewer.class ARCHIVE=VncViewer.jar
- WIDTH=$APPLETWIDTH HEIGHT=$APPLETHEIGHT>
-<param name=PORT value=$PORT>
+</HEAD><BODY>
+<APPLET CODE="com.tigervnc.vncviewer.VncViewer.class" ARCHIVE="VncViewer.jar"
+ WIDTH="$APPLETWIDTH" HEIGHT="$APPLETHEIGHT">
+<param name="PORT" value="$PORT">
$PARAMS
</APPLET>
<BR>
<A href="http://www.tigervnc.org/";>TigerVNC site</A>
+</BODY>
</HTML>
Index: java/src/com/tigervnc/vncviewer/MANIFEST.MF
===================================================================
--- java/src/com/tigervnc/vncviewer/MANIFEST.MF (revision 3916)
+++ java/src/com/tigervnc/vncviewer/MANIFEST.MF (working copy)
@@ -1,2 +1,2 @@
Manifest-Version: 1.0
-Main-Class: VncViewer
+Main-Class: com.tigervnc.vncviewer.VncViewer
Index: java/src/com/tigervnc/vncviewer/index.html
===================================================================
--- java/src/com/tigervnc/vncviewer/index.html (revision 3916)
+++ java/src/com/tigervnc/vncviewer/index.html (working copy)
@@ -1,3 +1,4 @@
+<HTML><HEAD>
<!--
index.html - an example HTML page for TigerVNC Java viewer applet, to be
used with a standalone Web server running on the same machine where the
@@ -15,15 +16,15 @@
actual desktop size on the server (height should be increased to leave
enough space for the button panel).
-->
-
-<HTML>
<TITLE>
TigerVNC desktop
</TITLE>
-<APPLET CODE="VncViewer.class" ARCHIVE="VncViewer.jar"
+</HEAD><BODY>
+<APPLET CODE="com.tigervnc.vncviewer.VncViewer.class" ARCHIVE="VncViewer.jar"
WIDTH="800" HEIGHT="632">
<PARAM NAME="PORT" VALUE="5901">
</APPLET>
<BR>
<A href="http://www.tigervnc.org/";>TigerVNC site</A>
+</BODY>
</HTML>
--- java/src/Makefile 2009-10-30 00:10:31.496797111 -0700
+++ java/src/Makefile.icon 2009-10-30 00:10:14.375398782 -0700
@@ -45,14 +45,19 @@
CLASSES = $(SOURCES:.java=.class)
+ICON = tigervnc_16.gif
+
all: $(ARCHIVE)
$(ARCHIVE): $(SOURCES) $(MANIFEST)
$(JC) $(JCFLAGS) -O $(SOURCES)
$(JAR) cfm $(ARCHIVE) $(MANIFEST) $(CLASSES)
-install: $(ARCHIVE)
- $(CP) $(ARCHIVE) $(PAGES) $(INSTALL_DIR)
+$(ICON):
+ convert -background transparent ../../media/tigervnc_16.svg $@
+
+install: $(ARCHIVE) $(ICON)
+ $(CP) $(ARCHIVE) $(ICON) $(PAGES) $(INSTALL_DIR)
export:: $(CLASSES) $(ARCHIVE) $(PAGES)
@$(ExportJavaClasses)
--- java/src/com/tigervnc/vncviewer/index.html 2009-10-30 00:12:27.490801957 -0700
+++ java/src/com/tigervnc/vncviewer/index.html.icon 2009-10-30 00:26:29.413918281 -0700
@@ -19,12 +19,13 @@
<TITLE>
TigerVNC desktop
</TITLE>
+<link rel="icon" type="image/gif" href="tigervnc_16.gif">
</HEAD><BODY>
<APPLET CODE="com.tigervnc.vncviewer.VncViewer.class" ARCHIVE="VncViewer.jar"
WIDTH="800" HEIGHT="632">
<PARAM NAME="PORT" VALUE="5901">
</APPLET>
<BR>
-<A href="http://www.tigervnc.org/";>TigerVNC site</A>
+<A href="http://www.tigervnc.org/";><IMG border="0" hspace="4" src="tigervnc_16.gif">TigerVNC site</A>
</BODY>
</HTML>
--- java/src/com/tigervnc/vncviewer/index.vnc 2009-10-30 00:12:40.622099898 -0700
+++ java/src/com/tigervnc/vncviewer/index.vnc.icon 2009-10-30 00:28:45.392640755 -0700
@@ -14,6 +14,7 @@
<TITLE>
$USER's $DESKTOP desktop ($DISPLAY)
</TITLE>
+<link rel="icon" type="image/gif" href="tigervnc_16.gif">
</HEAD><BODY>
<APPLET CODE="com.tigervnc.vncviewer.VncViewer.class" ARCHIVE="VncViewer.jar"
WIDTH="$APPLETWIDTH" HEIGHT="$APPLETHEIGHT">
@@ -21,6 +22,6 @@
$PARAMS
</APPLET>
<BR>
-<A href="http://www.tigervnc.org/";>TigerVNC site</A>
+<A href="http://www.tigervnc.org/";><IMG border="0" hspace="4" src="tigervnc_16.gif">TigerVNC site</A>
</BODY>
</HTML>
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Tigervnc-devel mailing list
Tigervnc-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tigervnc-devel
