[Sumover-dev] [svn commit] r4060 - vic/branches/mpeg4/tcl

[sumover-dev at cs.ucl.ac.uk]

Author: piers
Date: Thu Jun  7 10:34:12 2007
New Revision: 4060

Modified:
   vic/branches/mpeg4/tcl/ui-ctrlmenu.tcl
   vic/branches/mpeg4/tcl/ui-windows.tcl

Log:
Patches for tcl/tk-80 compatibility
- One bug report/patch from Christoph Willing <willing at vislab.uq.edu.au> but I modified it to use a catch statement as it's nice to have the zero padding for video windows. It seems that there's xero padding on tcl/tck-80 anyway.
- Patch from Doug Kosovic (6june07) for his updates to V4L controls


Modified: vic/branches/mpeg4/tcl/ui-ctrlmenu.tcl
==============================================================================
--- vic/branches/mpeg4/tcl/ui-ctrlmenu.tcl	(original)
+++ vic/branches/mpeg4/tcl/ui-ctrlmenu.tcl	Thu Jun  7 10:34:12 2007
@@ -176,13 +176,12 @@
 			return
 		}
 	}
-	if { [string equal -nocase -length 5 $d "V4L2:"] } {
+	if { [string toupper [string range $d 0 4]] == "V4L2:" } {
         	set d [string range $d 5 end]
-        	set k [string length $d]
-        	incr k -1
 		foreach v $inputDeviceList {
-	   		if { [string equal -length 5 [$v nickname] "V4L2-"] && \
-				[string range [$v nickname] end-$k end] == "$d" && \
+	   		set k [expr [string length [$v nickname]] - [string length $d]]
+	   		if { [string range [$v nickname] 0 4] == "V4L2-" && \
+				[string range [$v nickname] $k end] == "$d" && \
 				[$v attributes] != "disabled" } {
 				set videoDevice $v
 				select_device $v
@@ -190,13 +189,12 @@
 			}
 		}
 	}
-	if { [string equal -nocase -length 4 $d "V4L:"] } {
+	if { [string toupper [string range $d 0 3]] == "V4L:" } {
         	set d [string range $d 4 end]
-        	set k [string length $d]
-        	incr k -1
 		foreach v $inputDeviceList {
-	   		if { [string equal -length 4 [$v nickname] "V4L-"] && \
-				[string range [$v nickname] end-$k end] == "$d" && \
+	   		set k [expr [string length [$v nickname]] - [string length $d]]
+	   		if { [string range [$v nickname] 0 3] == "V4L-" && \
+				[string range [$v nickname] $k end] == "$d" && \
 				[$v attributes] != "disabled" } {
 				set videoDevice $v
 				select_device $v

Modified: vic/branches/mpeg4/tcl/ui-windows.tcl
==============================================================================
--- vic/branches/mpeg4/tcl/ui-windows.tcl	(original)
+++ vic/branches/mpeg4/tcl/ui-windows.tcl	Thu Jun  7 10:34:12 2007
@@ -189,14 +189,15 @@
 	}
 	set w .vw$uid
 	toplevel $w -class Vic \
-		-visual "[winfo visual .top] [winfo depth .top]" -padx 0 -pady 0
+		-visual "[winfo visual .top] [winfo depth .top]"
 	catch "wm resizable $w false false"
+	catch "$w configure -padx 0 -pady 0"
 	#
 	# make windows become x-y resizeable
 	#
 	#catch "wm resizable $w true false"
-	frame $w.frame -padx 0 -pady 0 
-
+	frame $w.frame 
+	catch "$w.frame configure -padx 0 -pady 0"
 
 	global size$w userwin_x userwin_y userwin_size
 	if [info exists userwin_x($src)] {