X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-tcl-applet.git;a=blobdiff_plain;f=applet.tcl;h=5d9a65dc1c4fe487b8191837889d063414456028;hp=04d5813bebc6042d481fb2b3941333a0e766119a;hb=80b7c5d7160f63b9f16fd62534352b15e4c9ec6f;hpb=3b3dad48b2bd8f43a76cf3633e0bf2ca6e6ef14d

diff --git a/applet.tcl b/applet.tcl
index 04d5813..5d9a65d 100644
--- a/applet.tcl
+++ b/applet.tcl
@@ -41,46 +41,63 @@ package require tktray
 #    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:
 #      applet::setimage IMAGE
 #  as necessary.
 #
-# Alternatively, instead of icon, it may make other arrangements
-# to use the provided subwindow
-#
-#  Caller that needs access to inner window should call
-#      applet::setup-subwindow WIDTH ON-DESTROYING ON-READY
+# Alternatively of icon, it may provide other arrangements for
+# using the provided subwindow.  Such a caller should call
+#      applet::setup-subwindow \
+#                WIDTH HEIGHT DEFAULT-ORIENTATION BORDER-COLOUR BORDER-WIDTH \
+#                ON-DESTROYING ON-READY
 #  Then the main code will call ON-DESTROYING just before
-#  destroying the inner window and recreating it, and ON-READY
-#  just after.  In ON-READY the inner window is called .i.i.
+#  destroying the inner window and recreating it, and
+#  [concat ON-READY [list ORIENTATION]]
+#  just after.  The inner window to use is called .i.i.b.
 #
 #  The user of the subwindow machinery may call
 #      applet::subwindow-need-recreate
 #  if for any reason the inner window should be destroyed and recreated.
 #
-# Alternatively, 
-# to run (repeatedly
-# if necessary) a subprocess.
-#     
-#     proc innerwindow {} { ... }
-#  and run
-#     innerwindow
-#  This will create
-#     .i.i.b      frame to contain container
-#     .i.i.b.c    actual container
+# Alternatively, it may request that a subprocess be spawned
+# repeatedly with the xid of a suitable window.
+#      applet::setup-subproc \
+#                WIDTH HEIGHT DEFAULT-ORIENTATION BORDER-COLOUR BORDER-WIDTH \
+#                GET-CMDLINE
+#  Then the main code will call [concat GET_CMDLINE [list XID ORIENTATION]]
+#  to get the command line to run.
 
 wm withdraw .
 
 tktray::icon .i -class example
 .i configure -docked 1
 
-fconfigure stdout -buffering line
+fconfigure stdout -buffering none
+fconfigure stderr -buffering none
 
 
 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
@@ -96,15 +113,15 @@ proc menubuttonpressed {b x y} {
     variable posted
     tooltip-cancel
     if {$posted == $b} {
-	puts "unpost $posted toggle"
+	debug "unpost $posted toggle"
      	.m$posted unpost
 	set posted 0
     } elseif {[winfo exists .m$b]} {
 	if {$posted} {
 	    .m$posted unpost
-	    puts "unpost $posted other"
+	    debug "unpost $posted other"
 	}
-	puts "post $b"
+	debug "post $b"
 	set posted $b
 	.m$b post $x $y
     }
@@ -197,7 +214,7 @@ variable subwindow_on_ready
 
 proc subwindow-need-recreate {} {
     variable innerwindow_after
-puts "IW-EVENT"
+    debug "IW-EVENT"
     if {[info exists innerwindow_after]} return
     set innerwindow_after [after idle applet::innerwindow-resetup]
 }
@@ -206,47 +223,44 @@ proc innerwindow-resetup {} {
     variable innerwindow_after
     variable subwindow_on_destroying
     variable subwindow_on_ready
+    variable subwindow_border_colour
+    variable subwindow_border_width
+    variable subwindow_default_orientation
     unset innerwindow_after
 
-puts RESETUP
-
+    debug RESETUP
 
     if {![winfo exists .i.i]} return
     destroy [frame .i.i.make-exist]
 
     uplevel #0 $subwindow_on_destroying
-    catch { destroy .i.i.b.c }
-
     catch { destroy .i.i.b }
 
-    frame .i.i.b
+    set orientation [.i orientation]
+    debug "orientation $orientation"
+    if {![string compare $orientation unknown]} {
+	set orientation $subwindow_default_orientation
+    }
+    .i configure -image applet::innerwindow-ph-$orientation
+
+    frame .i.i.b -background darkblue -bd 1
     pack .i.i.b -fill both -side left -expand 1
-#
-    global inner_lastw inner_lasth
-    #set w [winfo width .i.i]
-#    set w [winfo width .i.i]
-#    set h [winfo height .i.i]
-
-#    if {$w != $inner_lastw || $h != $inner_lasth} {
-#	set inner_lastw $w
-#	set inner_lasth $h
-#	innerwindow-ph-dummy configure -width $w -height 2
-
-    uplevel #0 $subwindow_on_ready
-#    }
+
+    uplevel #0 $subwindow_on_ready [list $orientation]
 }
 
-proc setup-subwindow {w on_destroying on_ready} {
-    foreach v {destroying ready} {
-	variable subwindow_on_$v [set on_$v]
+proc setup-subwindow {
+    w h default_orientation border_colour border_width on_destroying on_ready
+} {
+    foreach v {
+	default_orientation border_width border_colour on_destroying on_ready
+    } {
+	variable subwindow_$v [set $v]
     }
 
-    global inner_lastw inner_lasth
-    set inner_lastw -2
-    set inner_lasth -2
-
-    image create photo applet::innerwindow-ph-dummy -width $w -height 2
-    .i configure -image applet::innerwindow-ph-dummy
+    image create photo applet::innerwindow-ph-horizontal -width $w -height 2
+    image create photo applet::innerwindow-ph-vertical -width 2 -height $h
+    .i configure -image applet::innerwindow-ph-horizontal
 
     destroy [frame .i.make-exist]
     destroy [frame .i.i.make-exist]
@@ -260,14 +274,18 @@ proc setup-subwindow {w on_destroying on_ready} {
 variable subproc none
 variable ratelimit {}
 
-proc setup-subproc {w get_cmdline} {
+proc setup-subproc {w h deforient border_colour border_width get_cmdline} {
     variable subproc_get_cmdline $get_cmdline
-    setup-subwindow $w applet::subproc-destroying applet::subproc-ready
+    setup-subwindow $w $h $deforient $border_colour $border_width \
+	applet::subproc-destroying applet::subproc-ready
 }
 
 proc subproc-destroying {} {
     variable subproc
-    puts "DESTROYING $subproc"
+    debug "DESTROYING $subproc"
+
+    catch { destroy .i.i.b.c }
+
     switch -exact $subproc {
 	none { }
 	old { }
@@ -275,9 +293,10 @@ proc subproc-destroying {} {
     }
 }
 
-proc subproc-ready {} {
+proc subproc-ready {orientation} {
     variable subproc
-    puts "READY $subproc"
+    variable subproc_orientation $orientation
+    debug "READY $subproc"
 
     frame .i.i.b.c -container 1 -background orange
     pack .i.i.b.c -fill both -side left -expand 1
@@ -293,25 +312,26 @@ proc subproc-ready {} {
 	    error "unexpected state $subproc"
 	}
     }
-    puts "READY-done $subproc"
+    debug "READY-done $subproc"
 }
 
 proc run-child {} {
     variable subproc
     variable ratelimit
     variable subproc_get_cmdline
+    variable subproc_orientation
 
     set id [winfo id .i.i.b.c]
-    set cmd [uplevel #0 [concat [list $subproc_get_cmdline] $id]]
+    set cmd [uplevel #0 $subproc_get_cmdline [list $id $subproc_orientation]]
 
-    puts "RUN-CHILD $subproc"
+    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} {
-	puts stderr "crashing repeatedly, quitting $ratelimit"
+	debug stderr "crashing repeatedly, quitting $ratelimit"
 	exit 127
     }
 
@@ -319,11 +339,11 @@ proc run-child {} {
     set subproc [subproc::fork applet::child-died {
 	execl [lindex $cmd 0] [lrange $cmd 1 end]
     }]
-    puts "FORKED $subproc"
+    debug "FORKED $subproc"
 }
 
 proc child-died {how how2} {
-    puts "DIED $how $how2"
+    debug "DIED $how $how2"
     variable subproc
     switch -exact $subproc {
 	old {