# git-gui console support
# Copyright (C) 2006, 2007 Shawn Pearce
-namespace eval console {
-
-variable next_console_id 0
-variable console_data
-variable console_cr
-
-proc new {short_title long_title} {
- variable next_console_id
- variable console_data
+class console {
+
+field t_short
+field t_long
+field w
+field console_cr
+field is_toplevel 1; # are we our own window?
+
+constructor new {short_title long_title} {
+ set t_short $short_title
+ set t_long $long_title
+ _init $this
+ return $this
+}
- set w .console[incr next_console_id]
- set console_data($w) [list $short_title $long_title]
- return [_init $w]
+constructor embed {path title} {
+ set t_short {}
+ set t_long $title
+ set w $path
+ set is_toplevel 0
+ _init $this
+ return $this
}
-proc _init {w} {
+method _init {} {
global M1B
- variable console_cr
- variable console_data
- set console_cr($w) 1.0
- toplevel $w
+ if {$is_toplevel} {
+ make_toplevel top w -autodelete 0
+ wm title $top "[appname] ([reponame]): $t_short"
+ } else {
+ frame $w
+ }
+
+ set console_cr 1.0
+
frame $w.m
- label $w.m.l1 -text "[lindex $console_data($w) 1]:" \
+ label $w.m.l1 \
+ -textvariable @t_long \
-anchor w \
-justify left \
-font font_uibold
-background white -borderwidth 1 \
-relief sunken \
-width 80 -height 10 \
+ -wrap none \
-font font_diff \
-state disabled \
+ -xscrollcommand [list $w.m.sbx set] \
-yscrollcommand [list $w.m.sby set]
label $w.m.s -text {Working... please wait...} \
-anchor w \
-justify left \
-font font_uibold
+ scrollbar $w.m.sbx -command [list $w.m.t xview] -orient h
scrollbar $w.m.sby -command [list $w.m.t yview]
pack $w.m.l1 -side top -fill x
pack $w.m.s -side bottom -fill x
+ pack $w.m.sbx -side bottom -fill x
pack $w.m.sby -side right -fill y
pack $w.m.t -side left -fill both -expand 1
pack $w.m -side top -fill both -expand 1 -padx 5 -pady 10
$w.m.t tag remove sel 0.0 end
"
- button $w.ok -text {Close} \
- -state disabled \
- -command "destroy $w"
- pack $w.ok -side bottom -anchor e -pady 10 -padx 10
+ if {$is_toplevel} {
+ button $w.ok -text {Close} \
+ -state disabled \
+ -command [list destroy $w]
+ pack $w.ok -side bottom -anchor e -pady 10 -padx 10
+ bind $w <Visibility> [list focus $w]
+ }
bind_button3 $w.m.t "tk_popup $w.ctxm %X %Y"
bind $w.m.t <$M1B-Key-a> "$w.m.t tag add sel 0.0 end;break"
bind $w.m.t <$M1B-Key-A> "$w.m.t tag add sel 0.0 end;break"
- bind $w <Visibility> "focus $w"
- wm title $w "[appname] ([reponame]): [lindex $console_data($w) 0]"
- return $w
}
-proc exec {w cmd {after {}}} {
- # -- Cygwin's Tcl tosses the enviroment when we exec our child.
- # But most users need that so we have to relogin. :-(
- #
- if {[is_Cygwin]} {
- set cmd [list sh --login -c "cd \"[pwd]\" && [join $cmd { }]"]
+method exec {cmd {after {}}} {
+ if {[lindex $cmd 0] eq {git}} {
+ set fd_f [eval git_read --stderr [lrange $cmd 1 end]]
+ } else {
+ lappend cmd 2>@1
+ set fd_f [_open_stdout_stderr $cmd]
}
-
- # -- Tcl won't let us redirect both stdout and stderr to
- # the same pipe. So pass it through cat...
- #
- set cmd [concat | $cmd |& cat]
-
- set fd_f [open $cmd r]
fconfigure $fd_f -blocking 0 -translation binary
- fileevent $fd_f readable \
- [namespace code [list _read $w $fd_f $after]]
+ fileevent $fd_f readable [cb _read $fd_f $after]
}
-proc _read {w fd after} {
- variable console_cr
-
+method _read {fd after} {
set buf [read $fd]
if {$buf ne {}} {
- if {![winfo exists $w]} {_init $w}
+ if {![winfo exists $w.m.t]} {_init $this}
$w.m.t conf -state normal
set c 0
set n [string length $buf]
if {$lf < $cr} {
$w.m.t insert end [string range $buf $c $lf]
- set console_cr($w) [$w.m.t index {end -1c}]
+ set console_cr [$w.m.t index {end -1c}]
set c $lf
incr c
} else {
- $w.m.t delete $console_cr($w) end
+ $w.m.t delete $console_cr end
$w.m.t insert end "\n"
$w.m.t insert end [string range $buf $c $cr]
set c $cr
set ok 1
}
if {$after ne {}} {
- uplevel #0 $after $w $ok
+ uplevel #0 $after $ok
} else {
- done $w $ok
+ done $this $ok
}
return
}
fconfigure $fd -blocking 0
}
-proc chain {cmdlist w {ok 1}} {
+method chain {cmdlist {ok 1}} {
if {$ok} {
if {[llength $cmdlist] == 0} {
- done $w $ok
+ done $this $ok
return
}
set cmdlist [lrange $cmdlist 1 end]
if {[lindex $cmd 0] eq {exec}} {
- exec $w \
- [lindex $cmd 1] \
- [namespace code [list chain $cmdlist]]
+ exec $this \
+ [lrange $cmd 1 end] \
+ [cb chain $cmdlist]
} else {
- uplevel #0 $cmd $cmdlist $w $ok
+ uplevel #0 $cmd [cb chain $cmdlist]
}
} else {
- done $w $ok
+ done $this $ok
}
}
-proc done {args} {
- variable console_cr
- variable console_data
-
- switch -- [llength $args] {
- 2 {
- set w [lindex $args 0]
- set ok [lindex $args 1]
- }
- 3 {
- set w [lindex $args 1]
- set ok [lindex $args 2]
- }
- default {
- error "wrong number of args: done ?ignored? w ok"
- }
- }
+method insert {txt} {
+ if {![winfo exists $w.m.t]} {_init $this}
+ $w.m.t conf -state normal
+ $w.m.t insert end "$txt\n"
+ set console_cr [$w.m.t index {end -1c}]
+ $w.m.t conf -state disabled
+}
+method done {ok} {
if {$ok} {
- if {[winfo exists $w]} {
+ if {[winfo exists $w.m.s]} {
$w.m.s conf -background green -text {Success}
- $w.ok conf -state normal
- focus $w.ok
+ if {$is_toplevel} {
+ $w.ok conf -state normal
+ focus $w.ok
+ }
}
} else {
- if {![winfo exists $w]} {
- _init $w
+ if {![winfo exists $w.m.s]} {
+ _init $this
}
$w.m.s conf -background red -text {Error: Command Failed}
- $w.ok conf -state normal
- focus $w.ok
+ if {$is_toplevel} {
+ $w.ok conf -state normal
+ focus $w.ok
+ }
}
-
- array unset console_cr $w
- array unset console_data $w
+ delete_this
}
}