chiark
/
gitweb
/
~ian
/
chiark-tcl-applet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
better output in tooltip
[chiark-tcl-applet.git]
/
applet.tcl
diff --git
a/applet.tcl
b/applet.tcl
index c3c4c4e463a437f6fc4edc1ec64f1c569bcd5057..0aa2b9495a8c56c278663e3fd755830e7de54cdb 100644
(file)
--- a/
applet.tcl
+++ b/
applet.tcl
@@
-1,13
+1,5
@@
# General purpose code for being a tray applet
# General purpose code for being a tray applet
-proc manyset {list args} {
- foreach val $list var $args {
- upvar 1 $var my
- set my $val
- }
-}
-
-
package require Tclx
package require tktray
package require Tclx
package require tktray
@@
-41,13
+33,6
@@
package require tktray
# menus, when an item is selected, call
# applet::msel
#
# menus, when an item is selected, call
# applet::msel
#
-# Debug:
-#
-# Caller may call
-# applet::setup-debug ON-DEBUG
-# which will result in calls to [concat ON-DEBUG [list MESSAGE]]
-# (or ON-DEBUG may be "" in which case messages are discarded)
-#
# Icon:
#
# Caller should call:
# Icon:
#
# Caller should call:
@@
-90,18
+75,6
@@
fconfigure stderr -buffering none
namespace eval applet {
namespace eval applet {
-variable debug {}
-
-proc debug {m} {
- variable debug
- if {![llength $debug]} return
- uplevel #0 $debug [list $m]
-}
-
-proc setup-debug {d} {
- variable debug $d
-}
-
# used by both menus and tooltips
variable posted 0
# used by both menus and tooltips
variable posted 0
@@
-116,15
+89,15
@@
proc menubuttonpressed {b x y} {
variable posted
tooltip-cancel
if {$posted == $b} {
variable posted
tooltip-cancel
if {$posted == $b} {
- debug "unpost $posted toggle"
+ debug
::debug
"unpost $posted toggle"
.m$posted unpost
set posted 0
} elseif {[winfo exists .m$b]} {
if {$posted} {
.m$posted unpost
.m$posted unpost
set posted 0
} elseif {[winfo exists .m$b]} {
if {$posted} {
.m$posted unpost
- debug "unpost $posted other"
+ debug
::debug
"unpost $posted other"
}
}
- debug "post $b"
+ debug
::debug
"post $b"
set posted $b
.m$b post $x $y
}
set posted $b
.m$b post $x $y
}
@@
-223,7
+196,7
@@
variable border_width 1
proc subwindow-need-recreate {} {
variable innerwindow_after
proc subwindow-need-recreate {} {
variable innerwindow_after
- debug "IW-EVENT"
+ debug
::debug
"IW-EVENT"
if {[info exists innerwindow_after]} return
set innerwindow_after [after idle applet::innerwindow-resetup]
}
if {[info exists innerwindow_after]} return
set innerwindow_after [after idle applet::innerwindow-resetup]
}
@@
-237,7
+210,7
@@
proc innerwindow-resetup {} {
variable deforient
unset innerwindow_after
variable deforient
unset innerwindow_after
- debug RESETUP
+ debug
::debug
RESETUP
if {![winfo exists .i.i]} return
destroy [frame .i.i.make-exist]
if {![winfo exists .i.i]} return
destroy [frame .i.i.make-exist]
@@
-246,7
+219,7
@@
proc innerwindow-resetup {} {
catch { destroy .i.i.b }
set orientation [.i orientation]
catch { destroy .i.i.b }
set orientation [.i orientation]
- debug "orientation $orientation"
+ debug
::debug
"orientation $orientation"
if {![string compare $orientation unknown]} {
set orientation $deforient
}
if {![string compare $orientation unknown]} {
set orientation $deforient
}
@@
-289,7
+262,7
@@
proc setup-subproc {get_cmdline} {
proc subproc-destroying {} {
variable subproc
proc subproc-destroying {} {
variable subproc
- debug "DESTROYING $subproc"
+ debug
::debug
"DESTROYING $subproc"
catch { destroy .i.i.b.c }
catch { destroy .i.i.b.c }
@@
-303,7
+276,7
@@
proc subproc-destroying {} {
proc subproc-ready {orientation} {
variable subproc
variable subproc_orientation $orientation
proc subproc-ready {orientation} {
variable subproc
variable subproc_orientation $orientation
- debug "READY $subproc"
+ debug
::debug
"READY $subproc"
frame .i.i.b.c -container 1 -background orange
pack .i.i.b.c -fill both -side left -expand 1
frame .i.i.b.c -container 1 -background orange
pack .i.i.b.c -fill both -side left -expand 1
@@
-319,7
+292,7
@@
proc subproc-ready {orientation} {
error "unexpected state $subproc"
}
}
error "unexpected state $subproc"
}
}
- debug "READY-done $subproc"
+ debug
::debug
"READY-done $subproc"
}
proc run-child {} {
}
proc run-child {} {
@@
-331,14
+304,14
@@
proc run-child {} {
set id [winfo id .i.i.b.c]
set cmd [uplevel #0 $subproc_get_cmdline [list $id $subproc_orientation]]
set id [winfo id .i.i.b.c]
set cmd [uplevel #0 $subproc_get_cmdline [list $id $subproc_orientation]]
- debug "RUN-CHILD $subproc"
+ debug
::debug
"RUN-CHILD $subproc"
set now [clock seconds]
lappend ratelimit $now
while {[lindex $ratelimit 0] < {$now - 10}} {
set ratelimit [lrange $ratelimit 1 end]
}
if {[llength $ratelimit] > 10} {
set now [clock seconds]
lappend ratelimit $now
while {[lindex $ratelimit 0] < {$now - 10}} {
set ratelimit [lrange $ratelimit 1 end]
}
if {[llength $ratelimit] > 10} {
-
debug
stderr "crashing repeatedly, quitting $ratelimit"
+
puts
stderr "crashing repeatedly, quitting $ratelimit"
exit 127
}
exit 127
}
@@
-346,11
+319,11
@@
proc run-child {} {
set subproc [subproc::fork applet::child-died {
execl [lindex $cmd 0] [lrange $cmd 1 end]
}]
set subproc [subproc::fork applet::child-died {
execl [lindex $cmd 0] [lrange $cmd 1 end]
}]
- debug "FORKED $subproc"
+ debug
::debug
"FORKED $subproc"
}
proc child-died {how how2} {
}
proc child-died {how how2} {
- debug "DIED $how $how2"
+ debug
::debug
"DIED $how $how2"
variable subproc
switch -exact $subproc {
old {
variable subproc
switch -exact $subproc {
old {