Minor changes.

[ir-tcl-moved-to-github.git] / client.tcl

diff --git a/client.tcl b/client.tcl
index 5f05d6a..bac1b70 100644 (file)
--- a/client.tcl
+++ b/client.tcl
@@ -4,7 +4,13 @@
 # Sebastian Hammer, Adam Dickmeiss
 #
 # $Log: client.tcl,v $
-# Revision 1.62  1995-08-04 11:32:37  adam
+# Revision 1.64  1995-08-24 15:33:02  adam
+# Minor changes.
+#
+# Revision 1.63  1995/08/04  13:20:48  adam
+# Buttons at the bottom are slightly smaller.
+#
+# Revision 1.62  1995/08/04  11:32:37  adam
 # More work on output queue. Memory related routines moved
 # to mem.c
 #
@@ -222,12 +228,16 @@
 #
 
 if {$tk_version == "3.6"} {
-    set tk4 0
+    proc tk4 {} {
+        return 0
+    }
 } else {
-    set tk4 1
+    proc tk4 {} {
+        return 1
+    }
 }
 
-if {$tk4} {
+if {[tk4]} {
     proc configure-enable-e {w n} {
         incr n
         $w entryconfigure $n -state normal
@@ -247,7 +257,7 @@ if {$tk4} {
     set noFocus {}
 }
 
-if {! $tk4} {
+if {![tk4]} {
     if {[tk colormodel .] == "color"} {
         set monoFlag 0
     } else {
@@ -432,8 +442,8 @@ proc top-down-window {w} {
 
 proc top-down-ok-cancel {w ok-action g} {
     frame $w.bot.left -relief sunken -border 1
-    pack $w.bot.left -side left -expand yes -ipadx 2 -ipady 2 -padx 5 -pady 5
-    button $w.bot.left.ok -width 6 -text {Ok} \
+    pack $w.bot.left -side left -expand yes -ipadx 2 -ipady 2 -padx 4 -pady 4
+    button $w.bot.left.ok -width 5 -text {Ok} \
             -command ${ok-action}
     pack $w.bot.left.ok -expand yes -ipadx 2 -ipady 2 -padx 3 -pady 3
     button $w.bot.cancel -width 6 -text {Cancel} \
@@ -451,16 +461,16 @@ proc bottom-buttons {w buttonList g} {
     set l [llength $buttonList]
 
     frame $w.bot.$i -relief sunken -border 1
-    pack $w.bot.$i -side left -expand yes -padx 5 -pady 5
+    pack $w.bot.$i -side left -expand yes -padx 4 -pady 4
     button $w.bot.$i.ok -text [lindex $buttonList $i] \
             -command [lindex $buttonList [expr $i+1]]
-    pack $w.bot.$i.ok -expand yes -ipadx 3 -ipady 2 -padx 3 -pady 3 -side left
+    pack $w.bot.$i.ok -expand yes -ipadx 2 -ipady 2 -padx 2 -pady 2 -side left
 
     incr i 2
     while {$i < $l} {
         button $w.bot.$i -text [lindex $buttonList $i] \
                 -command [lindex $buttonList [expr $i+1]]
-        pack $w.bot.$i -expand yes -ipadx 2 -ipady 2 -padx 3 -pady 3 -side left
+        pack $w.bot.$i -expand yes -ipadx 2 -ipady 2 -padx 2 -pady 2 -side left
         incr i 2
     }
     if {$g} {
@@ -819,10 +829,9 @@ proc delete-target-hotlist {target} {
 
 proc set-target-hotlist {olen} {
     global hotTargets
-    global tk4
    
     if {$olen > 0} {
-        if {$tk4} {
+        if {[tk4]} {
             .top.target.m delete 7 [expr 7+$olen]
         } else {
             .top.target.m delete 6 [expr 6+$olen]
@@ -901,7 +910,7 @@ proc open-target {target base} {
     dputs [z39 maximumRecordSize]
     dputs "preferredMessageSize="
     dputs [z39 preferredMessageSize]
-    show-status {Connecting} 1 0
+    show-status Connecting 1 0
     if {$base == ""} {
         z39 databaseNames [lindex [lindex $profile($target) 7] 0]
     } else {
@@ -929,7 +938,6 @@ proc close-target {} {
     global cancelFlag
     global setNo
     global setNoLast
-    global tk4
 
     set cancelFlag 0
     set setNo 0
@@ -943,7 +951,7 @@ proc close-target {} {
     show-message {}
     configure-disable-e .top.target.m 1
     configure-disable-e .top.target.m 2
-    if {$tk4} {
+    if {[tk4]} {
         .top.rset.m delete 2 last
     } else {
         .top.rset.m delete 1 last
@@ -961,7 +969,7 @@ proc load-set-action {} {
     set fname [.load-set.top.filename.entry get]
     destroy .load-set
     if {$fname != ""} {
-        show-status {Loading} 1 {}
+        show-status Loading 1 {}
         update
         z39.$setNoLast loadFile $fname
 
@@ -971,7 +979,7 @@ proc load-set-action {} {
     set l [format "%-4d %7d" $setNoLast $no]
     .top.rset.m add command -label $l \
             -command [list add-title-lines $setNoLast 10000 1]
-    show-status {Ready} 0 {}
+    show-status Ready 0 {}
 }
 
 proc load-set {} {
@@ -1000,7 +1008,7 @@ proc init-request {} {
         return
     }
     z39 callback {init-response}
-    show-status {Initializing} 1 {}
+    show-status Initializing 1 {}
     set err [catch {z39 init} errorMessage]
     if {$err} {
         tkerror $errorMessage
@@ -1017,7 +1025,7 @@ proc init-response {} {
         return
     }
     if {![z39 initResult]} {
-        show-status {Ready} 0 1
+        show-status Ready 0 1
         set u [z39 userInformationField]
         close-target
         tkerror "Connection rejected by target: $u"
@@ -1027,7 +1035,7 @@ proc init-response {} {
         } else {
             set scanEnable 0
         }
-        show-status {Ready} 0 1
+        show-status Ready 0 1
     }
 }
 
@@ -1051,7 +1059,7 @@ proc search-request {bflag} {
     }
     if {$cancelFlag} {
         dputs "cancelFlag"
-        show-status {Searching} 1 0
+        show-status Searching 1 0
         set delayRequest {search-request 1}
         return
     }
@@ -1087,7 +1095,7 @@ proc search-request {bflag} {
     }
     z39 callback {search-response}
     z39.$setNo search $query
-    show-status {Searching} 1 0
+    show-status Searching 1 0
 }
 
 proc scan-copy {y entry} {
@@ -1114,7 +1122,7 @@ proc scan-request {} {
     dputs "scan-request"
     if {$cancelFlag} {
         dputs "cancelFlag"
-        show-status {Scanning} 1 0
+        show-status Scanning 1 0
         set delayRequest scan-request
         return
     }
@@ -1164,7 +1172,7 @@ proc scan-request {} {
     z39.scan preferredPositionInResponse 1
     z39.scan scan "${attr} 0"
     
-    show-status {Scanning} 1 0
+    show-status Scanning 1 0
 }
 
 proc scan-term-h {attr} {
@@ -1189,7 +1197,7 @@ proc scan-term-h {attr} {
     } else {
         z39.scan scan "${attr} \{${scanTerm}\}"
     }
-    show-status {Scanning} 1 0
+    show-status Scanning 1 0
 }
 
 proc scan-response {attr start toget} {
@@ -1215,7 +1223,7 @@ proc scan-response {attr start toget} {
             }
             return
         }
-        show-status {Ready} 0 1
+        show-status Ready 0 1
         return
     }
     set nScanTerm [$w.top.entry get]
@@ -1230,13 +1238,13 @@ proc scan-response {attr start toget} {
         } else {
             z39.scan scan "${attr} \{${scanTerm}\}"
         }
-        show-status {Scanning} 1 0
+        show-status Scanning 1 0
         return
     }
     set status [z39.scan scanStatus]
     if {$status == 6} {
         tkerror "Scan fail"
-        show-status {Ready} 0 1
+        show-status Ready 0 1
         set cancelFlag 0
         return
     }
@@ -1298,7 +1306,7 @@ proc scan-response {attr start toget} {
         z39.scan scan "${attr} \{$q\}"
         return
     }
-    show-status {Ready} 0 1
+    show-status Ready 0 1
 }
 
 proc scan-down {attr} {
@@ -1324,7 +1332,7 @@ proc scan-down {attr} {
         dputs "down: $q"
         z39.scan numberOfTermsRequested 10
         z39.scan preferredPositionInResponse 1
-        show-status {Scanning} 1 0
+        show-status Scanning 1 0
         dputs "${attr} \{$q\}"
         z39.scan scan "${attr} \{$q\}"
         return
@@ -1340,7 +1348,7 @@ proc scan-up {attr} {
     dputs {scan-up}
     if {$cancelFlag} {
         dputs "cancelFlag"
-        show-status {Scanning up} 1 0
+        show-status Scanning 1 0
         set delayRequest [list scan-up $attr]
         return
     }
@@ -1354,7 +1362,7 @@ proc scan-up {attr} {
         dputs "up: $q"
         z39.scan numberOfTermsRequested 10
         z39.scan preferredPositionInResponse 11
-        show-status {Scanning} 1 0
+        show-status Scanning 1 0
         z39.scan scan "${attr} \{$q\}"
         return
     }
@@ -1382,7 +1390,7 @@ proc search-response {} {
     set delayRequest {}
     init-title-lines
     set setMax [z39.$setNo resultCount]
-    show-status {Ready} 0 1
+    show-status Ready 0 1
     set status [z39.$setNo responseStatus]
     if {[lindex $status 0] == "NSD"} {
         z39.$setNo nextResultSetPosition 0
@@ -1397,7 +1405,7 @@ proc search-response {} {
         return
     }
     set setOffset 1
-    show-status {Ready} 0 1
+    show-status Ready 0 1
     set l [format "%-4d %7d" $setNo $setMax]
     .top.rset.m add command -label $l \
             -command [list add-title-lines $setNo 10000 1]
@@ -1406,7 +1414,7 @@ proc search-response {} {
     }
     z39 callback {present-response}
     z39.$setNo present $setOffset 1
-    show-status {Retrieving} 1 0
+    show-status Retrieving 1 0
 }
 
 proc present-more {number} {
@@ -1419,7 +1427,7 @@ proc present-more {number} {
 
     dputs "present-more"
     if {$cancelFlag} {
-        show-status {Retrieving} 1 0
+        show-status Retrieving 1 0
         set delayRequest "present-more $number"
         return
     }
@@ -1457,7 +1465,7 @@ proc present-more {number} {
         set toGet 3
     } 
     z39.$setNo present $setOffset $toGet
-    show-status {Retrieving} 1 0
+    show-status Retrieving 1 0
 }
 
 proc init-title-lines {} {
@@ -1528,7 +1536,7 @@ proc present-response {} {
     }
     set status [z39.$setNo responseStatus]
     if {[lindex $status 0] == "NSD"} {
-        show-status {Ready} 0 1
+        show-status Ready 0 1
         set code [lindex $status 1]
         set msg [lindex $status 2]
         set addinfo [lindex $status 3]
@@ -1543,7 +1551,7 @@ proc present-response {} {
         }
         z39.$setNo present $setOffset $toGet
     } else {
-        show-status {Ready} 0 1
+        show-status Ready 0 1
     }
 }
 
@@ -1564,12 +1572,11 @@ proc right-cursor {w} {
 }
 
 proc bind-fields {list returnAction escapeAction} {
-    global tk4
     set max [expr [llength $list]-1]
     for {set i 0} {$i < $max} {incr i} {
         bind [lindex $list $i] <Return> $returnAction
         bind [lindex $list $i] <Escape> $escapeAction
-        if {!$tk4} {
+        if {![tk4]} {
             bind [lindex $list $i] <Tab> \
                     [list focus [lindex $list [expr $i+1]]]
             bind [lindex $list $i] <Left> \
@@ -1580,7 +1587,7 @@ proc bind-fields {list returnAction escapeAction} {
     }
     bind [lindex $list $i] <Return> $returnAction
     bind [lindex $list $i] <Escape> $escapeAction
-    if {!$tk4} {
+    if {![tk4]} {
         bind [lindex $list $i] <Tab>  [list focus [lindex $list 0]]
         bind [lindex $list $i] <Left> [list left-cursor [lindex $list $i]]
         bind [lindex $list $i] <Right> [list right-cursor [lindex $list $i]]
@@ -1813,8 +1820,7 @@ proc protocol-setup {target} {
             -command [list add-database $target]
     button $w.top.databases.delete -text "Delete" \
             -command [list delete-database $target]
-    global tk4
-    if {! $tk4} {
+    if {! [tk4]} {
         listbox $w.top.databases.list -geometry 20x6 \
                 -yscrollcommand "$w.top.databases.scroll set"
     } else {
@@ -1906,7 +1912,7 @@ proc database-select {} {
     pack $w.top.databases -side left -pady 6 -padx 6 -expand yes -fill x
 
     label $w.top.databases.label -text "List"
-    listbox $w.top.databases.list -geometry 20x6 \
+    listbox $w.top.databases.list -width 20 -height 6 \
             -yscrollcommand "$w.top.databases.scroll set"
     scrollbar $w.top.databases.scroll -orient vertical -border 1
     pack $w.top.databases.label -side top -fill x \
@@ -2455,7 +2461,6 @@ proc use-attr {init} {
         {Content type}                 1034 
         {Anywhere}                     1035 
     }
-    global tk4
     set w .index-setup
     global useTmpValue
     set l [llength $attr]
@@ -2471,7 +2476,7 @@ proc use-attr {init} {
             }
             incr lno
         }
-        if {$tk4} {
+        if {[tk4]} {
             $w.top.use.list selection clear 0 end
             $w.top.use.list selection set $s $s
         } else {
@@ -2539,7 +2544,6 @@ proc index-setup {attr queryNo indexNo} {
     global completenessTmpValue
     global positionTmpValue
     global useTmpValue
-    global tk4
     set relationTmpValue 0
     set truncationTmpValue 0
     set structureTmpValue 0
@@ -2594,7 +2598,7 @@ proc index-setup {attr queryNo indexNo} {
     pack $w.top.use -side left -pady 6 -padx 6 -fill y
 
     label $w.top.use.label -text "Use"
-    if {$tk4} {
+    if {[tk4]} {
         listbox $w.top.use.list -width 26 \
                 -yscrollcommand "$w.top.use.scroll set"
     } else {
@@ -2690,7 +2694,6 @@ proc query-setup {queryNo} {
     global queryButtonsTmp
     global queryInfoTmp
     global queryIndexTmp
-    global tk4
     
     set queryIndexTmp 0
     set queryName [lindex $queryTypes $queryNo]
@@ -2733,7 +2736,7 @@ proc query-setup {queryNo} {
     pack $w.top.index.list -side left -fill both -expand yes -padx 2 -pady 2
     pack $w.top.index.scroll -side right -fill y -padx 2 -pady 2
 
-    if {$tk4} {
+    if {[tk4]} {
         $w.top.index.list selection clear 0 end
         $w.top.index.list selection set 0 0
     } else {
@@ -2812,20 +2815,18 @@ proc index-query {} {
 
 proc index-focus-in {w i} {
     global curIndexEntry
-    global tk4
 
-    if {! $tk4} {
+    if {! [tk4]} {
         $w.$i configure -background red
     }
     set curIndexEntry $i
 }
 
 proc index-lines {w realOp buttonInfo queryInfo handle} {
-    global tk4
     set i 0
     foreach b $buttonInfo {
         if {! [winfo exists $w.$i]} {
-            if {$tk4} {
+            if {[tk4]} {
                 frame $w.$i -border 0
             } else {
                 frame $w.$i -background white -border 1
@@ -2842,7 +2843,7 @@ proc index-lines {w realOp buttonInfo queryInfo handle} {
                 pack $w.$i.l -side left
                 pack $w.$i.e -side left -fill x -expand yes
                 pack $w.$i -side top -fill x -padx 2 -pady 2
-                if {!$tk4} {
+                if {![tk4]} {
                     bind $w.$i.e <Left> [list left-cursor $w.$i.e]
                     bind $w.$i.e <Right> [list right-cursor $w.$i.e]
                 }
@@ -2862,7 +2863,7 @@ proc index-lines {w realOp buttonInfo queryInfo handle} {
     if {! $realOp} {
         return
     }
-    if {! $tk4} {
+    if {! [tk4]} {
         set j 0
         incr i -1
         while {$j < $i} {
@@ -2872,7 +2873,7 @@ proc index-lines {w realOp buttonInfo queryInfo handle} {
         }
     }
     if {$i >= 0} {
-        if {! $tk4} {
+        if {! [tk4]} {
             bind $w.$i.e <Tab> "focus $w.0.e"
         }
         focus $w.0.e
@@ -3054,12 +3055,12 @@ button .mid.present -width 7 -text {Present} -command [list present-more 10] \
 
 button .mid.clear -width 7 -text {Clear} -command index-clear
 pack .mid.search .mid.scan .mid.present .mid.clear -side left \
-        -fill y -padx 5 -pady 3
+        -fill y -padx 4 -pady 2
 
 text .data.record -height 2 -width 20 -wrap none \
         -yscrollcommand [list .data.scroll set] -wrap $textWrap
 scrollbar .data.scroll -command [list .data.record yview]
-if {$tk4} {
+if {[tk4]} {
     .data.record configure -takefocus 0
     .data.scroll configure -takefocus 0
 }
@@ -3077,7 +3078,7 @@ if {! $monoFlag} {
 .data.record tag configure marc-data -foreground black
 
 button .bot.logo  -bitmap @${libdir}/bitmaps/book1 -command cancel-operation
-if {$tk4} {
+if {[tk4]} {
     .bot.logo configure -takefocus 0
 }
 frame .bot.a
@@ -3095,7 +3096,7 @@ label .bot.a.message -text "" -width 15 -relief \
 
 pack .bot.a.target -side top -anchor nw -padx 2 -pady 2
 pack .bot.a.status .bot.a.set .bot.a.message \
-        -side left -padx 2 -pady 2
+        -side left -padx 2 -pady 2 -ipadx 1 -ipady 1
 
 ir z39
 z39 logLevel all