Skip to content

L
libvncserver
Commit c5992936 authored by runge's avatar runge
Browse files
Options

x11vnc: -gui tray mode, httpd.c: check httpListenSock >= 0.

parent 462ffd3f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1727 additions and 173 deletions
ChangeLog
View file @ c5992936
2005-07-01 Karl Runge <runge@karlrunge.com>
* libvncserver/httpd.c: make sure httpListenSock >=0 in rfbHttpCheckFds
* x11vnc: add simple "-gui tray" mode for small icon like x0rfbserver
had (someday/somehow to auto embed in a tray/dock)
2005-06-28 Johannes E. Schindelin <Johannes.Schindelin@gmx.de>
* libvncclient/zrle.c: fix handling of raw and fill subtypes
(off-by-one and off-by-many bug)
......
libvncserver/httpd.c
View file @ c5992936
......@@ -136,6 +136,9 @@ rfbHttpCheckFds(rfbScreenInfoPtr rfbScreen)
if (!rfbScreen->httpDir)
return;
if (rfbScreen->httpListenSock < 0)
return;
FD_ZERO(&fds);
FD_SET(rfbScreen->httpListenSock, &fds);
if (rfbScreen->httpSock >= 0) {
......
x11vnc/ChangeLog
View file @ c5992936
2005-07-01 Karl Runge <runge@karlrunge.com>
* support for simple "-gui tray" mode (small icon like the original
x0rfbserver had). Can't figure how to get a tray to swallow it..
* passwd, viewpasswd changing in tray mode.
* allow typos like: x11vnc -R -scale 3/4
2005-06-26 Karl Runge <runge@karlrunge.com>
* track keycode state for heuristics, -sloppy_keys, -wmdt
* add -nodbg as option
......
x11vnc/README
View file @ c5992936
x11vnc README file Date: Sun Jun 26 22:02:44 EDT 2005
x11vnc README file Date: Fri Jul 1 21:48:07 EDT 2005
The following information is taken from these URLs:
......@@ -347,10 +347,12 @@ exec /usr/bin/ssh -t -L 5900:localhost:5900 $gateway \
The x11vnc package is the subset of the libvncserver package needed to
build the x11vnc program. Also, you can get a copy of my latest,
bleeding edge [38]x11vnc-0.7.2.tar.gz tarball.
bleeding edge [38]x11vnc-0.7.2.tar.gz tarball to build the most up to
date one.
See the [39]FAQ below for information about where you might obtain a
precompiled x11vnc binary from 3rd parties.
Precompiled Binaries/Packages: See the [39]FAQ below for information
about where you might obtain a precompiled x11vnc binary from 3rd
parties and some ones I create.
To obtain VNC viewers for the viewing side (Windows, Mac OS, or Unix)
try these links:
......@@ -575,10 +577,10 @@ make
I don't have any formal beta-testers for the releases of x11vnc, so
I'd appreciate any additional testing very much!
I'd like to release version 0.7.2 in Jun/2005 sometime, here is the
current tarball:
I'd like to release version 0.7.2 in Jun/Jul/2005 sometime, here is
the current tarball:
RC-3 lastmod: 2005-06-22 [51]x11vnc-0.7.2beta.tar.gz
RC-4 lastmod: 2005-06-25 [51]x11vnc-0.7.2beta.tar.gz
There are also some Linux, Solaris, and other OS test binaries
[52]here. Please kick the tires and report bugs, performance
......@@ -1353,9 +1355,8 @@ typedef unsigned int in_addr_t;
http://www.sunfreeware.com/ packages are built with libz and libjpeg.
If the above binaries don't work and building x11vnc on your OS fails
(and all else fails!) you can try one of my motley collection of
[172]test binaries. Some may be old, some may have extra debugging
output, etc. One of them may work on your OS...
(and all else fails!) you can try one of [172]my collection of
binaries for various OS's and x11vnc releases.
As a general note, the x11vnc program is simple enough you don't
really need to install a package: the binary will in most cases work
......@@ -2658,7 +2659,7 @@ xmodmap -e "add Control = Control_L Control_R"
The framebuffer is kept in main memory like Xvfb except that the
server code is closely correlated with the real XFree86/Xorg Xserver
unlike Xvfb. The main drawback to this method (besides requiring extra
configuration and possibly root permission) is that is also does the
configuration and possibly root permission) is that it also does the
Linux Virtual Console/Terminal (VC/VT) [278]switching even though it
does not need to (since it doesn't use a real framebuffer). There are
some "dual headed" (actually multi-headed/multi-user) patches to the X
......@@ -4541,7 +4542,7 @@ x11vnc: a VNC server for real X displays
Here are all of x11vnc command line options:
% x11vnc -opts (see below for -help long descriptions)
x11vnc: allow VNC connections to real X11 displays. 0.7.2 lastmod: 2005-06-25
x11vnc: allow VNC connections to real X11 displays. 0.7.2 lastmod: 2005-07-01
x11vnc options:
-display disp -auth file
......@@ -4641,7 +4642,7 @@ libvncserver options:
% x11vnc -help
x11vnc: allow VNC connections to real X11 displays. 0.7.2 lastmod: 2005-06-25
x11vnc: allow VNC connections to real X11 displays. 0.7.2 lastmod: 2005-07-01
Typical usage is:
......@@ -5971,8 +5972,8 @@ Options:
"gui-opts" can be a comma separated list of items.
Currently there are these types of items: 1) a gui mode,
a 2) gui "simplicity", and 3) the X display the gui
should display on.
a 2) gui "simplicity", 3) the X display the gui
should display on, and 4) a "tray" (or icon) mode.
1) The gui mode can be "start", "conn", or "wait"
"start" is the default mode above and is not required.
......@@ -5996,9 +5997,6 @@ Options:
the gui to come back to you via your ssh redirected X
display (e.g. localhost:10).
Examples: "x11vnc -gui", "x11vnc -gui ez"
"x11vnc -gui localhost:10", "x11vnc -gui conn,host:0"
If you do not specify a gui X display in "gui-opts"
then the DISPLAY environment variable and -display
option are tried (in that order). Regarding the x11vnc
......@@ -6006,6 +6004,24 @@ Options:
tries -display and then DISPLAY. For example, "x11vnc
-display :0 -gui otherhost:0", will remote control an
x11vnc polling :0 and display the gui on otherhost:0
The "tray" mode below reverses this preference.
4) When "tray" is specified, the gui presents itself
as a small icon with behavior similar to a "system
tray" or "dock" applet. The color of the icon
indicates status (connected clients) and there is also a
balloon status. Clicking on the icon gives a menu from
which properties, etc, can be set and the full gui is
available under "Advanced". To be fully functional,
the gui mode should be "start" (the default). At some
point it is hoped the icon can be automatically embedded
in common destkop trays/docks. Currently one can only
embed it in a window via, e.g., "tray=0x3600028".
Otherwise the icon is just a normal standalone window.
Examples: "x11vnc -gui", "x11vnc -gui ez"
"x11vnc -gui localhost:10", "x11vnc -gui conn,host:0"
"x11vnc -gui tray,ez"
If you do not intend to start x11vnc from the gui
(i.e. just remote control an existing one), then the
......
x11vnc/tkx11vnc
View file @ c5992936
This diff is collapsed.
x11vnc/tkx11vnc.h
View file @ c5992936
This diff is collapsed.
x11vnc/x11vnc.1
View file @ c5992936
.\" This file was automatically generated from x11vnc -help output.
.TH X11VNC "1" "June 2005" "x11vnc " "User Commands"
.TH X11VNC "1" "July 2005" "x11vnc " "User Commands"
.SH NAME
x11vnc - allow VNC connections to real X11 displays
version: 0.7.2, lastmod: 2005-06-25
version: 0.7.2, lastmod: 2005-07-01
.SH SYNOPSIS
.B x11vnc
[OPTION]...
......@@ -1709,8 +1709,8 @@ up on the X display in the environment variable DISPLAY.
.IP
"gui-opts" can be a comma separated list of items.
Currently there are these types of items: 1) a gui mode,
a 2) gui "simplicity", and 3) the X display the gui
should display on.
a 2) gui "simplicity", 3) the X display the gui
should display on, and 4) a "tray" (or icon) mode.
.IP
1) The gui mode can be "start", "conn", or "wait"
"start" is the default mode above and is not required.
......@@ -1734,9 +1734,6 @@ you ssh in and x11vnc is not running yet you may want
the gui to come back to you via your ssh redirected X
display (e.g. localhost:10).
.IP
Examples: "x11vnc \fB-gui",\fR "x11vnc \fB-gui\fR ez"
"x11vnc \fB-gui\fR localhost:10", "x11vnc \fB-gui\fR conn,host:0"
.IP
If you do not specify a gui X display in "gui-opts"
then the DISPLAY environment variable and \fB-display\fR
option are tried (in that order). Regarding the x11vnc
......@@ -1744,6 +1741,24 @@ X display the gui will try to connect to, it first
tries \fB-display\fR and then DISPLAY. For example, "x11vnc
\fB-display\fR :0 \fB-gui\fR otherhost:0", will remote control an
x11vnc polling :0 and display the gui on otherhost:0
The "tray" mode below reverses this preference.
.IP
4) When "tray" is specified, the gui presents itself
as a small icon with behavior similar to a "system
tray" or "dock" applet. The color of the icon
indicates status (connected clients) and there is also a
balloon status. Clicking on the icon gives a menu from
which properties, etc, can be set and the full gui is
available under "Advanced". To be fully functional,
the gui mode should be "start" (the default). At some
point it is hoped the icon can be automatically embedded
in common destkop trays/docks. Currently one can only
embed it in a window via, e.g., "tray=0x3600028".
Otherwise the icon is just a normal standalone window.
.IP
Examples: "x11vnc \fB-gui",\fR "x11vnc \fB-gui\fR ez"
"x11vnc \fB-gui\fR localhost:10", "x11vnc \fB-gui\fR conn,host:0"
"x11vnc \fB-gui\fR tray,ez"
.IP
If you do not intend to start x11vnc from the gui
(i.e. just remote control an existing one), then the
......
x11vnc/x11vnc.c
View file @ c5992936
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment