Hello community,
here is the log from the commit of package tightvnc
checked in at Fri Feb 2 16:16:19 CET 2007.
--------
--- tightvnc/tightvnc.changes 2007-01-26 22:23:42.000000000 +0100
+++ /mounts/work_src_done/STABLE/tightvnc/tightvnc.changes 2007-02-01 14:32:28.000000000 +0100
@@ -1,0 +2,14 @@
+Thu Feb 1 14:32:12 CET 2007 - max@suse.de
+
+- Added support for the NewFBSize protocol extension (#199702).
+
+- Prevent X clients inside an Xvnc session from getting killed by
+ the "outer" X session's session manager (#226051)
+
+- New version: 1.3.8:
+- File transfers between viewer and server machines.
+- Support for RFB protocol version 3.7, with TightVNC extensions.
+- Several other improvements and bug fixes to the Unix and Java
+ viewers.
+
+-------------------------------------------------------------------
Old:
----
tightvnc-1.2.9.tar.bz2
New:
----
tightvnc-1.3.8.tar.bz2
tightvnc-newfbsize.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tightvnc.spec ++++++
--- /var/tmp/diff_new_pack.p30733/_old 2007-02-02 16:15:52.000000000 +0100
+++ /var/tmp/diff_new_pack.p30733/_new 2007-02-02 16:15:52.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package tightvnc (Version 1.2.9)
+# spec file for package tightvnc (Version 1.3.8)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -21,8 +21,8 @@
Obsoletes: vnc
PreReq: sed
Summary: A virtual X-Window System server
-Version: 1.2.9
-Release: 235
+Version: 1.3.8
+Release: 1
Source0: %name-%version.tar.bz2
Source1: vnc_inetd_httpd
Source2: vnc.xinetd
@@ -35,6 +35,7 @@
Patch5: vncpasswd.patch
Patch6: tightvnc-byteorder.patch
Patch7: tightvnc-vncviewer-scrollbar.patch
+Patch8: tightvnc-newfbsize.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -63,6 +64,7 @@
%patch5
%patch6
%patch7
+%patch8
%build
xmkmf
@@ -100,15 +102,24 @@
%files
%defattr(-,root,root)
-%dir /etc/slp.reg.d/
+%doc README LICENCE.TXT ChangeLog WhatsNew
+%doc %_mandir/*/*
/usr/share/vnc
/usr/bin/*
%config(noreplace) /etc/xinetd.d/vnc
+%dir /etc/slp.reg.d/
%config(noreplace) /etc/slp.reg.d/*
-%doc %_mandir/*/*
-%doc README LICENCE.TXT
%changelog -n tightvnc
+* Thu Feb 01 2007 - max@suse.de
+- Added support for the NewFBSize protocol extension (#199702).
+- Prevent X clients inside an Xvnc session from getting killed by
+ the "outer" X session's session manager (#226051)
+- New version: 1.3.8:
+- File transfers between viewer and server machines.
+- Support for RFB protocol version 3.7, with TightVNC extensions.
+- Several other improvements and bug fixes to the Unix and Java
+ viewers.
* Fri Jan 26 2007 - sndirsch@suse.de
- reverted previous change due to switch back to RH VNC
* Mon Jan 15 2007 - sndirsch@suse.de
++++++ tightvnc-1.2.9.tar.bz2 -> tightvnc-1.3.8.tar.bz2 ++++++
++++ 5172 lines of diff (skipped)
++++++ tightvnc-byteorder.patch ++++++
--- /var/tmp/diff_new_pack.p30733/_old 2007-02-02 16:15:53.000000000 +0100
+++ /var/tmp/diff_new_pack.p30733/_new 2007-02-02 16:15:53.000000000 +0100
@@ -21,16 +21,16 @@
exit(1);
--- vncviewer/vncviewer.h
+++ vncviewer/vncviewer.h
-@@ -28,6 +28,8 @@
- #include
- #include
+@@ -30,6 +30,8 @@
+ #include
#include
+ #include
+#include
+#include
#include
#include
#include
-@@ -39,14 +41,13 @@
+@@ -42,14 +44,13 @@
extern int endianTest;
++++++ tightvnc-newfbsize.patch ++++++
--- vncviewer/desktop.c
+++ vncviewer/desktop.c
@@ -82,13 +82,23 @@
for (i = 0; i < 256; i++)
modifierPressed[i] = False;
- image = NULL;
+ CreateImage();
+}
+
+void
+CreateImage()
+{
+ if (image != NULL) {
+ XDestroyImage(image);
+ image = NULL;
+ }
#ifdef MITSHM
- if (appData.useShm) {
- image = CreateShmImage();
- if (!image)
- appData.useShm = False;
+ if (appData.useShm) {
+ ShmCleanup();
+ image = CreateShmImage();
+ if (!image)
+ appData.useShm = False;
}
#endif
--- vncviewer/misc.c
+++ vncviewer/misc.c
@@ -34,6 +34,7 @@
Dimension dpyWidth, dpyHeight;
Atom wmDeleteWindow, wmState;
+Bool userGeometry = True;
static Bool xloginIconified = False;
static XErrorHandler defaultXErrorHandler;
@@ -84,6 +85,7 @@
Dimension toplevelWidth = si.framebufferWidth;
Dimension toplevelHeight = si.framebufferHeight;
+ userGeometry = False;
if ((toplevelWidth + appData.wmDecorationWidth) >= dpyWidth)
toplevelWidth = dpyWidth - appData.wmDecorationWidth;
--- vncviewer/rfbproto.c
+++ vncviewer/rfbproto.c
@@ -66,7 +66,7 @@
static void JpegTermSource(j_decompress_ptr cinfo);
static void JpegSetSrcManager(j_decompress_ptr cinfo, CARD8 *compressedData,
int compressedLen);
-
+static void ReadNewFBSize(rfbFramebufferUpdateRectHeader *pfburh);
int rfbsock;
char *desktopName;
@@ -177,6 +177,8 @@
sig_rfbEncodingPointerPos, "Pointer position update");
CapsAdd(encodingCaps, rfbEncodingLastRect, rfbTightVncVendor,
sig_rfbEncodingLastRect, "LastRect protocol extension");
+ CapsAdd(encodingCaps, rfbEncodingNewFBSize, rfbTightVncVendor,
+ sig_rfbEncodingNewFBSize, "Framebuffer size change");
}
@@ -806,6 +808,8 @@
if (se->nEncodings < MAX_ENCODINGS && requestLastRectEncoding) {
encs[se->nEncodings++] = Swap32IfLE(rfbEncodingLastRect);
}
+ if (se->nEncodings < MAX_ENCODINGS)
+ encs[se->nEncodings++] = Swap32IfLE(rfbEncodingNewFBSize);
}
else {
if (SameMachine(rfbsock)) {
@@ -849,6 +853,7 @@
}
encs[se->nEncodings++] = Swap32IfLE(rfbEncodingLastRect);
+ encs[se->nEncodings++] = Swap32IfLE(rfbEncodingNewFBSize);
}
len = sz_rfbSetEncodingsMsg + se->nEncodings * 4;
@@ -1023,6 +1028,11 @@
rect.r.w = Swap16IfLE(rect.r.w);
rect.r.h = Swap16IfLE(rect.r.h);
+ if (rect.encoding == rfbEncodingNewFBSize) {
+ ReadNewFBSize(&rect);
+ break;
+ }
+
if (rect.encoding == rfbEncodingXCursor ||
rect.encoding == rfbEncodingRichCursor) {
if (!HandleCursorShape(rect.r.x, rect.r.y, rect.r.w, rect.r.h,
@@ -1463,3 +1473,35 @@
cinfo->src = &jpegSrcManager;
}
+//
+// Processing NewFBSize pseudo-rectangle. Create new framebuffer of
+// the size specified in pfburh->r.w and pfburh->r.h, and change the
+// window size correspondingly.
+//
+
+static void ReadNewFBSize(rfbFramebufferUpdateRectHeader *pfburh)
+{
+ si.framebufferWidth = pfburh->r.w;
+ si.framebufferHeight = pfburh->r.h;
+
+ fprintf(stderr, "NewFBSize: %dx%d\n",
+ si.framebufferWidth, si.framebufferHeight);
+ CreateImage();
+
+ XtUnmanageChild(viewport);
+ XtVaSetValues(desktop,
+ XtNwidth, si.framebufferWidth,
+ XtNheight, si.framebufferHeight,
+ NULL);
+ XtVaSetValues(viewport,
+ XtNwidth, si.framebufferWidth,
+ XtNheight, si.framebufferHeight,
+ NULL);
+ XtVaSetValues(toplevel,
+ XtNmaxWidth, si.framebufferWidth,
+ XtNmaxHeight, si.framebufferHeight,
+ NULL);
+ XtResizeWidget(toplevel,
+ si.framebufferWidth, si.framebufferHeight, 0);
+ XtManageChild(viewport);
+}
--- vncviewer/vncviewer.h
+++ vncviewer/vncviewer.h
@@ -158,6 +158,7 @@
extern void DesktopInitBeforeRealization();
extern void DesktopInitAfterRealization();
+extern void CreateImage();
extern void SendRFBEvent(Widget w, XEvent *event, String *params,
Cardinal *num_params);
extern void CopyDataToScreen(char *buf, int x, int y, int width, int height);
@@ -198,6 +199,7 @@
extern void Quit(Widget w, XEvent *event, String *params,
Cardinal *num_params);
extern void Cleanup();
+extern Bool userGeometry;
/* popup.c */
++++++ vncserver.patch ++++++
--- /var/tmp/diff_new_pack.p30733/_old 2007-02-02 16:15:53.000000000 +0100
+++ /var/tmp/diff_new_pack.p30733/_new 2007-02-02 16:15:54.000000000 +0100
@@ -9,10 +9,10 @@
$vncUserDir = "$ENV{HOME}/.vnc";
-$fontPath = "unix/:7100";
+$fontPath = "/usr/share/fonts/misc:unscaled,/usr/share/fonts/local,/usr/share/fonts/75dpi:unscaled,/usr/share/fonts/100dpi:unscaled,/usr/share/fonts/Type1,/usr/share/fonts/URW,/usr/share/fonts/Speedo,/usr/share/fonts/truetype,/usr/share/fonts/uni,/usr/share/fonts/CID";
+ $authType = "-rfbauth $vncUserDir/passwd";
# Here is another example of setting the font path:
- # $fontPath = "/usr/lib/X11/fonts/misc/,/usr/lib/X11/fonts/75dpi/";
-@@ -89,7 +89,7 @@
+@@ -90,7 +90,7 @@
# Uncomment this line if you want default geometry, depth and pixelformat
# to match the current X display:
@@ -21,7 +21,7 @@
if ($opt{'-geometry'}) {
$geometry = $opt{'-geometry'};
-@@ -157,11 +157,7 @@
+@@ -158,11 +158,7 @@
# PID and part of the encrypted form of the password. Ideally we'd use
# /dev/urandom, but that's only available on Linux.
@@ -34,7 +34,16 @@
system("xauth -f $xauthorityFile add $host:$displayNumber . $cookie");
system("xauth -f $xauthorityFile add $host/unix:$displayNumber . $cookie");
-@@ -283,7 +279,7 @@
+@@ -237,6 +233,8 @@
+ }
+ $ENV{VNCDESKTOP}= $desktopName;
+
++delete @ENV{qw(SESSION_MANAGER)}
++
+ system("$xstartup >> " . "edString($desktopLog) . " 2>&1 &");
+
+ exit;
+@@ -284,7 +282,7 @@
sub GetDisplayNumber
{
++++++ vnc.xinetd ++++++
--- tightvnc/vnc.xinetd 2007-01-26 21:18:03.000000000 +0100
+++ /mounts/work_src_done/STABLE/tightvnc/vnc.xinetd 2006-08-19 11:32:37.000000000 +0200
@@ -10,7 +10,7 @@
wait = no
user = nobody
server = /usr/bin/Xvnc
- server_args = -SecurityTypes None -inetd -once -query localhost -geometry 1024x768 -depth 16
+ server_args = :42 -inetd -once -query localhost -geometry 1024x768 -depth 16
disable = yes
}
# default: off
@@ -25,7 +25,7 @@
wait = no
user = nobody
server = /usr/bin/Xvnc
- server_args = -SecurityTypes None -inetd -once -query localhost -geometry 1280x1024 -depth 16
+ server_args = :42 -inetd -once -query localhost -geometry 1280x1024 -depth 16
disable = yes
}
# default: off
@@ -40,7 +40,7 @@
wait = no
user = nobody
server = /usr/bin/Xvnc
- server_args = -SecurityTypes None -inetd -once -query localhost -geometry 1600x1200 -depth 16
+ server_args = :42 -inetd -once -query localhost -geometry 1600x1200 -depth 16
disable = yes
}
# default: off
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
