Subversion Repositories x2vnc

Compare Revisions

Ignore whitespace Rev 24 → Rev 3

/trunk/debian/source/format
File deleted
/trunk/debian/patches/series
File deleted
/trunk/debian/patches/format-security.patch
File deleted
/trunk/debian/patches/multiscreen-cursor-stick.patch
File deleted
/trunk/debian/patches/man-listen.patch
File deleted
/trunk/debian/control
1,10 → 1,9
Source: x2vnc
Section: x11
Priority: optional
Maintainer: Magnus Holmgren <holmgren@debian.org>
Standards-Version: 3.9.3
Build-Depends: dpkg-dev (>= 1.15.7), debhelper (>= 6), libxaw7-dev,
xutils-dev, libx11-dev, libxinerama-dev, libxss-dev
Maintainer: Ola Lundqvist <opal@debian.org>
Standards-Version: 3.6.2
Build-Depends: debhelper (>= 4.0.0), libxaw7-dev, xutils-dev, libx11-dev, libxinerama-dev, libxss-dev
Homepage: http://fredrik.hubbe.net/x2vnc.html
 
Package: x2vnc
11,7 → 10,7
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Suggests: vnc4server, xvnc4viewer, tightvncserver, xtightvncviewer
Description: Link a VNC and and an X display together, simulating a multiheaded display
Description: A dual-screen hack - link an MS-Windows and X display
This program merges the capabilities of x2x and vncviewer. It will allow a
machine with an X display and a machine with a VNC server running on its main
screen to act as if they were two displays connected to one machine. When you
/trunk/debian/dirs
0,0 → 1,0
usr/X11R6/bin
/trunk/debian/watch
1,2 → 1,2
version=3
http://fredrik.hubbe.net/x2vnc.html x2vnc/x2vnc-(.*?)\.tar\.gz
http://fredrik.hubbe.net/x2vnc/x2vnc-\(.*\)\.tar\.gz debian uupdate
/trunk/debian/changelog
1,44 → 1,3
x2vnc (1.7.2-4) unstable; urgency=low
 
* man-listen.patch: Create proper patch of "Added listen option to
manpage" from 1.6-4.
* format-security.patch (new): Fix incorrect use of fprintf() (it
probably wasn't too dangerous as it was only argv[0] that was used as
a format string).
* debian/rules: Use dpkg-architecture and dpkg-buildflags.
* debian/rules: Add build-arch and build-indep targets.
* Bump Standards-Version to 3.9.3.
 
-- Magnus Holmgren <holmgren@debian.org> Sat, 23 Jun 2012 17:07:10 +0200
 
x2vnc (1.7.2-3) unstable; urgency=low
 
* Switch to source format 3.0 (quilt).
* Switch from Imake to configure (enabling Xinerama).
* Add patch via Ubuntu that fixes a problem with the cursor not moving
to the remote screen when Xinerama support is enabled (Closes:
#616396; LP: #726783). Thanks to Will Shackleton.
 
-- Magnus Holmgren <holmgren@debian.org> Sun, 06 Mar 2011 20:51:00 +0100
 
x2vnc (1.7.2-2) unstable; urgency=low
 
* New maintainer (Closes: #586422).
* Acknowledge NMU.
* debian/watch: Fix URL and regexp.
* Remove stale and commented-out references to /usr/X11R6 in
debian/rules. Delete debian/dirs altogether and drop the call to
dh_installdirs. Also clean out irrelevant, commented-out Debhelper
commands.
* Make the version in the debhelper build dependency match
debian/compat.
* Bump Standards-Version to 3.9.1 (from 3.6.2).
* A few minor style changes in debian/rules.
* debian/copyright: Remove outdated info on changes made to the upstream
source as well as current version, and update URL to upstream webpage.
 
-- Magnus Holmgren <holmgren@debian.org> Thu, 05 Aug 2010 10:34:21 +0200
 
x2vnc (1.7.2-1.1) unstable; urgency=low
 
* Non-maintainer upload.
/trunk/debian/copyright
10,11 → 10,17
 
The latest version of this program should be available from
 
http://fredrik.hubbe.net/x2vnc.html
http://www.hubbe.net/~hubbe/x2vnc.html
 
The current version is http://www.hubbe.net/~hubbe/x2vnc-1.1.tar.gz
 
For more info about VNC: http://www.uk.research.att.com/vnc/
For more info about x2x: http://ftp.digital.com/pub/Digital/SRC/x2x/
 
The main changes to the package are the addition of Debian packaging
and changing x2vnc so it links dynamically rather than statically
with libvncauth.
 
The code is:
Copyright (C) 1997, 1998 Olivetti & Oracle Research Laboratory
 
/trunk/debian/rules
8,29 → 8,15
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
 
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
# This has to be exported to make some magic below work.
export DH_OPTIONS
 
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
buildflags = --build=$(DEB_BUILD_GNU_TYPE)
else
buildflags = --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
endif
 
config-stamp: configure
build: build-stamp
build-stamp:
dh_testdir
./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr \
--mandir=\$${prefix}/share/man \
$(shell dpkg-buildflags --export=configure)
touch config-stamp
 
build: build-arch
build-indep:
build-arch: build-stamp
build-stamp: config-stamp
dh_testdir
 
xmkmf
#$(MAKE) x2vnc
$(MAKE)
 
touch build-stamp
42,18 → 28,29
 
[ ! -f Makefile ] || $(MAKE) clean
 
dh_clean config-stamp Makefile config.status config.log config.cache
dh_clean Makefile
 
install: build
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
 
install -m 755 -d $(CURDIR)/debian/x2vnc/usr/share
$(MAKE) DESTDIR=$(CURDIR)/debian/x2vnc install
#install -o root -g root -m 755 x2vnc \
# `pwd`/debian/x2vnc/usr/X11R6/bin
$(MAKE) DESTDIR=`pwd`/debian/x2vnc install
#mkdir -p debian/x2vnc/usr/X11R6/bin
#-mv debian/x2vnc/usr/X11R6/bin/* debian/x2vnc/usr/bin
#mkdir -p debian/x2vnc/usr/share/man
#-mv debian/x2vnc/usr/X11R6/man/* debian/x2vnc/usr/share/man
-rmdir debian/x2vnc/usr/X11R6/bin
#-rmdir debian/x2vnc/usr/X11R6/man
-rmdir debian/x2vnc/usr/X11R6
mv debian/x2vnc/usr/share/man/man1/x2vnc.1x \
debian/x2vnc/usr/share/man/man1/x2vnc.1
 
# Build architecture-independent files here.
binary-indep:
binary-indep: build install
# We have nothing to do by default.
 
# Build architecture-dependent files here.
60,16 → 57,26
binary-arch: build install
dh_testdir
dh_testroot
# dh_installdebconf
dh_installdocs
dh_installexamples
dh_installmenu
# dh_installemacsen
# dh_installpam
# dh_installmime
# dh_installinit
# dh_installcron
# dh_installmanpages
# dh_installinfo
# dh_undocumented
dh_installchangelogs
dh_link
dh_strip
dh_compress
dh_fixperms
# dh_makeshlibs
dh_installdeb
# dh_perl
dh_shlibdeps
dh_gencontrol
dh_md5sums
76,4 → 83,4
dh_builddeb
 
binary: binary-indep binary-arch
.PHONY: build-arch build-indep build clean binary-indep binary-arch binary install
.PHONY: build clean binary-indep binary-arch binary install
/trunk/x2vnc.man
0,0 → 1,285
.TH x2vnc 1
.SH NAME
x2vnc \- a dual-screen hack
 
.SH SYNOPSIS
.B x2vnc
.I <options>
.I <host>:<display#>
.br
.B x2vnc
.I <options>
.I -listen
.I [<display#>]
.br
[
.B \-display
.I display
]
.br
[
.B -version
]
.br
[
.B -shared
]
.br
[
.B -north
] [
.B -south
] [
.B -east
] [
.B -west
]
.br
[
.B -hotkey
.I key
]
.br
[
.B -passwdfile
.I passwd-file
]
.br
[
.B -resurface
]
.br
[
.B -edgewidth
.I width
]
.br
[
.B -desktop
.I desktop-number
]
.br
[
.B -timeout
.I seconds
]
.br
[
.B -wheelhack
]
.br
[
.B -nowheel
]
.br
[
.B -reversewheel
]
.br
[
.B -scrolllines
.I lines
]
.br
[
.B -navhack
]
.br
[
.B -mac
]
.br
[
.B -trimsel
]
.br
[
.B -noblank
]
.br
[
.B -lockdelay
.I seconds
]
.br
[
.B -debug
]
.br
[
.B -accel
.I multiplier
]
.br
[
.B -noreconnect
]
.br
[
.B -tunnel
]
.br
[
.B -via
.I host
]
.SH DESCRIPTION
.I x2vnc
will let you use two screens on two different computers as if they were
connected to the same computer. The computer with the 'main' keyboard must
be running X-window, and the second computer should have a VNC server
running which will update the contents on the actual screen. This means
\fIXvnc\fR is not suitable, but \fIWinVNC\fR is.
 
In listen mode (
.B -listen
option specified )
.I x2vnc
will wait for a connection from a VNC server on ports 5400 and 5500 (plus
the optional
.I display#
value) instead of connecting to a specified VNC server.
 
For up-to-date information on x2vnc, see the x2vnc home page:
.B http://fredrik.hubbe.net/x2vnc.html
 
.TP
\fB\-display\fR \fIdisplay\fR
The X windows display to connect from.
.TP
\fB\-shared\fR
Allow multiple connections to the same VNC server.
.TP
\fB\-north\fR, \fB\-south\fR, \fB\-east\fR, \fB\-west\fR,
Determine which edge leads to the other screen.
.TP
\fB\-passwdfile\fR \fIpassword-file\fR
With this option you can start x2vnc without entering a password. The file is
created by \fBvncpasswd\fR which comes with the X-windows VNC software.
If the file does not exist, \fIx2vnc\fR will ask for a password and
create the file.
.TP
\fB\-resurface\fR
This option will cause the trigger window to re-surface automatically if it is
covered up by another window.
.TP
\fB\-hotkey\fR \fIkey\fR
This option allows you to select which key to use to warp the pointer
to and from second computer. The default is "Control-F12", any
combination of modifiers can be used, such as "shift-alt-meta-ctrl-F1"
(or s-a-m-c-F1).
.TP
\fB\-edgewidth\fR \fIpixels\fR
This is a workaround for some X servers which do not allow the mouse to
go all the way to the edge of the screen. By setting this to 2 or greater, the
mouse will be able to reach the x2vnc window and thus warp to the
windows machine. The default value is 1. If you set this value to 0,
no border will be generated, which means you will have to use hotkeys
to switch to the oher screen.
.TP
\fB\-desktop\fR \fIdesktop-number\fR
With this option, you can make x2vnc non-sticky. This may not work
with all window-managers. Note that the first desktop is usually
0 (zero). If you want x2vnc to appear on the last (rightmost) desktop,
use -1. This option was especially created with the sawfish edgeflipping
in mind, normally you would use "-west -desktop 0" or "-east -destkop -1"
with Sawfish to allow edgeflipping to work normally.
.TP
\fB\-timeout\fR \fIseconds\fR
This options tells x2vnc how long to wait before warping the cursor back
to the X screen if there is no activity. The reason for this is that
some screen savers, such as xscreensaver, cannot activate while x2vnc is
in control of the cursor. The default value is 590 seconds, which is
equivalent to 9 minutes and 50 seconds. Using a value of 0 will disable
timeouts completely.
.TP
\fB\-nowheel\fR
This option does nothing and is left for backwards compatibility only.
.TP
\fB\-wheelhack\fR
This will make x2vnc tranlate all mouse wheel events into arrow up/down
events. Only use this if your VNC server doesn't understand mouse wheel
events.
.TP
\fB\-reversewheel\fR
Invert the up/down direction of the mouse wheel emulation.
This option only works if -wheelhack is used.
.TP
\fB\-scrolllines\fR \fIlines\fR
When using mouse wheel emulation, this selects how many up/down
events will be sent for each tick of the mouse wheel.
.TP
\fB\-navhack\fR
This will map button 6 & 7 to Alt+Left/Right, which will allow the
navigation buttons on some mice to behave more like they do in windows.
.TP
\fB\-mac\fR
Macintosh specific mode, maps second mouse button to control-mouseclick.
.TP
\fB\-trimsel\fR
If the X selection looks like a URL, trim leading and trailing spaces.
This can be useful for pasting URLs into a browser.
.TP
\fB\-noblank\fR
Prevent screen blanking on the remote desktop while you are working
on the local desktop. Requires the MIT-SCREEN-SAVER or XIDLE extension
to work properly. If neither of these extensions are present, the
remote desktop will always be kept from blanking.
.TP
\fB\-lockdelay\fR \fIseconds\fR
This is only meaningful when using the -noblank option. When this
option is present. With this option, x2vnc will not attempt to
wake up the remote screen if you have been idle for more than
the specified amount of time. This is useful if you need a password
to unlock the remote screen and would rather leave it blanked until
you need it.
.TP
\fB\-debug\fR
This option will make x2vnc print out information about events it
sends and receives to stderr for debugging purposes.
.TP
\fB\-accel\fR \fImultiplier\fR
This option allows you to control the speed of the mouse on the
remote screen. 2.0 means twice as fast, 0.5 means half as fast.
Default is 1.0. Note that this is multiplied with a number which
x2vnc calculates based on screen sizes and other factors.
.TP
\fB\-noreconnect\fR
This option prevents x2vnc from automatically reconnecting if the
connection is closed.
.TP
\fB\-tunnel\fR
This option makes x2vnc start an SSH tunnel to the machine being
controlled by x2vnc. The SSH command used can be changed by setting
the X2VNC_SSH_CMD environment variable. The default is:
.br
\fBssh -A -X -f -L "$LOCALPORT:$REMOTEHOST:$REMOTEPORT" \\
.br
"$GATEWAYHOST" 'ssh-add;sleep 60'\fR
.TP
\fB\-via\fR \fIhost\fR
This is similar to -tunnel, but tunnels through a host different than
the machine being controlled by x2vnc.
 
 
.SH EXAMPLES
Most common usage:
.br
\fBx2vnc -passwdfile $HOME/.vncpasswd -resurface host:0\fR
 
To make x2vnc start (and re-start) automatically, add the following to
your your X startup file (usually .xinitrc):
.br
\fB
while :;
.br
do
x2vnc -passwd $HOME/.vncpasswd -resurface host:0
.br
sleep 2
.br
done
\fR
 
.SH AUTHOR
Fredrik Hübinette, hubbe@hubbe.net