Skip to content

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

x11vnc: more improvements to -scrollcopyrect and -xkb modes.

parent 34f714bc
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 5405 additions and 1844 deletions
ChangeLog
View file @ 3a7e70de
2005-05-14 Karl Runge <runge@karlrunge.com>
* x11vnc: more work on -scrollcopyrect and -xkb modes.
2005-05-07 Johannes E. Schindelin <Johannes.Schindelin@gmx.de>
* libvncserver/rfbserver.c: fix memory leak pointed out by Tim Jansen
* libvncserver/{httpd,main,rfbserver,sockets}.c, rfb/rfb.h:
......
x11vnc/ChangeLog
View file @ 3a7e70de
2005-05-14 Karl Runge <runge@karlrunge.com>
* much more work on "-scrollcopyrect" mode... getting usable.
* remove -pointer_mode 3, shift everyone back down
* -dbg "crash shell" for debugging
* -add_keysyms now the default, periodically clears if needed.
* try to autodetect if -xkb would be a good idea.
* improve keycode guessing for -xkb mode (force ISO_Level3_Shift)
* -remap DEAD, etc. for dead/mute keys remappings.
2005-05-02 Karl Runge <runge@karlrunge.com>
* initial support for using RECORD to detect some types of window
scrolls. This is "-scrollcopyrect" mode, use -noscrollcopyrect
......
x11vnc/README
View file @ 3a7e70de
This source diff could not be displayed because it is too large. You can view the blob instead.
x11vnc/tkx11vnc
View file @ 3a7e70de
......@@ -132,6 +132,7 @@ Keyboard
=D norepeat
=D add_keysyms
skip_keycodes:
skip_dups
modtweak
xkb
--
......@@ -180,6 +181,15 @@ Misc
--
=RA remote-cmd:
=GA all-settings
--
=GAL Misc-Tuning::
fs:
gaps:
grow:
fuzz:
readtimeout:
snapfb
threads
Debugging
debug_pointer
......@@ -191,8 +201,10 @@ Debugging
--
debug_xevents
debug_xdamage
debug_wireframe
=-C:0,1,2,3 debug_wireframe:
debug_scroll
debug_tiles
dbg
--
=GA show-start-cmd
=DG debug_gui
......@@ -234,15 +246,24 @@ Tuning
input_skip:
=D nodragging
--
noshm
flipbyteorder
onetile
--
xdamage
xd_area:
xd_mem:
--
wireframe
wireframe_mode:
=-C:never,top,always wirecopyrect:
--
=-C:never,keys,mouse,always scrollcopyrect:
scr_area:
--
noshm
flipbyteorder
onetile
scr_skip:
scr_inc:
scr_keys:
scr_parms:
-- D
speeds:
=D wait:
......@@ -250,18 +271,6 @@ Tuning
=D nap
screen_blank:
--
fs:
gaps:
grow:
fuzz:
snapfb
--
xdamage
xd_area:
xd_mem:
--
threads
--
progressive:
"
}
......@@ -395,6 +404,11 @@ and one for power users.
set helptext(all) $helpall
set helptext(Misc-Tuning:) "
These contain some miscellaneous tuning parameters that are not
often used. Placed here to avoid overcrowding in the Tuning menu.
"
set helptext(gui) "
tkx11vnc is a simple frontend to x11vnc. Nothing fancy, it merely
provides an interface to each of the many x11vnc command line options and
......@@ -701,7 +715,7 @@ proc help_win {item} {
set text "Help on $item:\n\n"
if {[is_gui_internal $item]} {
if {$item != "gui" && $item != "all"} {
if {$item != "gui" && $item != "all" && $item != "Misc-Tuning:"} {
append text " + Is a gui internal Action (cannot be set).\n";
}
} elseif {[is_action $item]} {
......@@ -1157,6 +1171,9 @@ proc push_new_value {item name new {query 1}} {
if {$do_query_all} {
set all [all_query_vars]
set qargs [list "-Q" $all]
global last_query_all_time
set last_query_all_time [clock seconds]
}
set rqargs [concat $rargs $qargs]
......@@ -1646,6 +1663,7 @@ proc all_query_vars {} {
proc query_all {{quiet 0}} {
global query_ans_list query_aro_list all_settings
global last_query_all_time
set qry [all_query_vars]
......@@ -1663,6 +1681,7 @@ proc query_all {{quiet 0}} {
append_text "Failed to retrieve settings.\n"
}
}
set last_query_all_time [clock seconds]
return $all
}
......@@ -1816,6 +1835,9 @@ proc do_action {item} {
} elseif {$item == "tail-logfile"} {
tail_logfile
return
} elseif {$item == "Misc-Tuning:"} {
menu_help "$item"
return
} elseif {$item == "stop+quit"} {
push_new_value "stop" "stop" 1 0
set_connected no
......@@ -2481,6 +2503,29 @@ proc make_menu_items {} {
}
}
proc menu_posted {} {
global last_query_all_time query_all_freq
global connected_to_x11vnc
set now [clock seconds]
if {$connected_to_x11vnc} {
set quiet 0
set refresh [expr "$last_query_all_time + $query_all_freq"]
# puts "menu_posted $now $last_query_all_time"
# puts "menu_posted $refresh"
if {$now > $refresh} {
append_text "Refreshing settings... "
query_all $quiet
if {$quiet} {
append_text "done\n"
}
}
}
}
proc make_widgets {} {
global template
global menu_b menu_m menu_count
......@@ -2557,7 +2602,7 @@ proc make_widgets {} {
-anchor w -menu $menu -background $fbg \
-font $bfont
pack $menub -side top -fill x
menu $menu -tearoff 0
menu $menu -tearoff 0 -postcommand menu_posted
}
}
pack $f -side top -fill x
......@@ -3032,6 +3077,7 @@ global bfont ffont old_labels
global connected_to_x11vnc
global delay_sleep extra_sleep extra_sleep_split
global cache_all_query_vars
global last_query_all_time query_all_freq
set unset_str "(unset)"
set connected_to_x11vnc 0
......@@ -3045,6 +3091,8 @@ set reply_xdisplay ""
set all_settings "None so far."
set always_update 1
set cache_all_query_vars ""
set query_all_freq 120
set last_query_all_time [clock seconds]
# these are no longer used under x11vnc -sync:
set delay_sleep 350
......
x11vnc/tkx11vnc.h
View file @ 3a7e70de
......@@ -138,6 +138,7 @@
" =D norepeat\n"
" =D add_keysyms\n"
" skip_keycodes:\n"
" skip_dups\n"
" modtweak\n"
" xkb\n"
" --\n"
......@@ -186,6 +187,15 @@
" --\n"
" =RA remote-cmd:\n"
" =GA all-settings\n"
" --\n"
" =GAL Misc-Tuning::\n"
" fs:\n"
" gaps:\n"
" grow:\n"
" fuzz:\n"
" readtimeout:\n"
" snapfb\n"
" threads\n"
"\n"
"Debugging\n"
" debug_pointer\n"
......@@ -197,8 +207,10 @@
" --\n"
" debug_xevents\n"
" debug_xdamage\n"
" debug_wireframe\n"
" =-C:0,1,2,3 debug_wireframe:\n"
" debug_scroll\n"
" debug_tiles\n"
" dbg\n"
" --\n"
" =GA show-start-cmd\n"
" =DG debug_gui\n"
......@@ -240,15 +252,24 @@
" input_skip:\n"
" =D nodragging\n"
" --\n"
" noshm\n"
" flipbyteorder\n"
" onetile\n"
" --\n"
" xdamage\n"
" xd_area:\n"
" xd_mem:\n"
" --\n"
" wireframe\n"
" wireframe_mode:\n"
" =-C:never,top,always wirecopyrect:\n"
" --\n"
" =-C:never,keys,mouse,always scrollcopyrect:\n"
" scr_area:\n"
" --\n"
" noshm\n"
" flipbyteorder\n"
" onetile\n"
" scr_skip:\n"
" scr_inc:\n"
" scr_keys:\n"
" scr_parms:\n"
" -- D\n"
" speeds:\n"
" =D wait:\n"
......@@ -256,18 +277,6 @@
" =D nap\n"
" screen_blank:\n"
" --\n"
" fs:\n"
" gaps:\n"
" grow:\n"
" fuzz:\n"
" snapfb\n"
" --\n"
" xdamage\n"
" xd_area:\n"
" xd_mem:\n"
" --\n"
" threads\n"
" --\n"
" progressive:\n"
"\"\n"
"}\n"
......@@ -401,6 +410,11 @@
"\n"
" set helptext(all) $helpall\n"
"\n"
" set helptext(Misc-Tuning:) \"\n"
"These contain some miscellaneous tuning parameters that are not\n"
"often used. Placed here to avoid overcrowding in the Tuning menu.\n"
"\"\n"
"\n"
" set helptext(gui) \"\n"
"tkx11vnc is a simple frontend to x11vnc. Nothing fancy, it merely\n"
"provides an interface to each of the many x11vnc command line options and\n"
......@@ -707,7 +721,7 @@
" set text \"Help on $item:\\n\\n\"\n"
"\n"
" if {[is_gui_internal $item]} {\n"
" if {$item != \"gui\" && $item != \"all\"} {\n"
" if {$item != \"gui\" && $item != \"all\" && $item != \"Misc-Tuning:\"} {\n"
" append text \" + Is a gui internal Action (cannot be set).\\n\";\n"
" }\n"
" } elseif {[is_action $item]} {\n"
......@@ -1163,6 +1177,9 @@
" if {$do_query_all} {\n"
" set all [all_query_vars]\n"
" set qargs [list \"-Q\" $all]\n"
"\n"
" global last_query_all_time\n"
" set last_query_all_time [clock seconds]\n"
" }\n"
"\n"
" set rqargs [concat $rargs $qargs]\n"
......@@ -1652,6 +1669,7 @@
"\n"
"proc query_all {{quiet 0}} {\n"
" global query_ans_list query_aro_list all_settings\n"
" global last_query_all_time\n"
"\n"
" set qry [all_query_vars]\n"
"\n"
......@@ -1669,6 +1687,7 @@
" append_text \"Failed to retrieve settings.\\n\"\n"
" }\n"
" }\n"
" set last_query_all_time [clock seconds]\n"
" return $all\n"
"}\n"
"\n"
......@@ -1822,6 +1841,9 @@
" } elseif {$item == \"tail-logfile\"} {\n"
" tail_logfile\n"
" return\n"
" } elseif {$item == \"Misc-Tuning:\"} {\n"
" menu_help \"$item\"\n"
" return\n"
" } elseif {$item == \"stop+quit\"} {\n"
" push_new_value \"stop\" \"stop\" 1 0\n"
" set_connected no\n"
......@@ -2487,6 +2509,29 @@
" }\n"
"}\n"
"\n"
"proc menu_posted {} {\n"
" global last_query_all_time query_all_freq\n"
" global connected_to_x11vnc\n"
" set now [clock seconds]\n"
"\n"
"\n"
" if {$connected_to_x11vnc} {\n"
" set quiet 0\n"
" set refresh [expr \"$last_query_all_time + $query_all_freq\"]\n"
"\n"
" # puts \"menu_posted $now $last_query_all_time\"\n"
" # puts \"menu_posted $refresh\"\n"
"\n"
" if {$now > $refresh} {\n"
" append_text \"Refreshing settings... \"\n"
" query_all $quiet\n"
" if {$quiet} {\n"
" append_text \"done\\n\"\n"
" }\n"
" }\n"
" }\n"
"}\n"
"\n"
"proc make_widgets {} {\n"
" global template \n"
" global menu_b menu_m menu_count\n"
......@@ -2563,7 +2608,7 @@
" -anchor w -menu $menu -background $fbg \\\n"
" -font $bfont\n"
" pack $menub -side top -fill x\n"
" menu $menu -tearoff 0\n"
" menu $menu -tearoff 0 -postcommand menu_posted\n"
" }\n"
" }\n"
" pack $f -side top -fill x\n"
......@@ -3038,6 +3083,7 @@
"global connected_to_x11vnc\n"
"global delay_sleep extra_sleep extra_sleep_split\n"
"global cache_all_query_vars\n"
"global last_query_all_time query_all_freq\n"
"\n"
"set unset_str \"(unset)\"\n"
"set connected_to_x11vnc 0\n"
......@@ -3051,6 +3097,8 @@
"set all_settings \"None so far.\"\n"
"set always_update 1\n"
"set cache_all_query_vars \"\"\n"
"set query_all_freq 120\n"
"set last_query_all_time [clock seconds]\n"
"\n"
"# these are no longer used under x11vnc -sync:\n"
"set delay_sleep 350\n"
......
x11vnc/x11vnc.1
View file @ 3a7e70de
This diff is collapsed.
x11vnc/x11vnc.c
View file @ 3a7e70de
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