Changeset 5222 for branches/uq

Timestamp:

Apr 14, 2015, 9:02:37 PM (9 years ago)

Author:

mmh

Message:

add ScreenSize? command and use it instead of broken tk screenwidth

Location:

branches/uq

Files:

• gui/scripts/balloon.tcl (modified) (3 diffs)
• gui/scripts/dropdown.tcl (modified) (2 diffs)
• gui/scripts/editor.tcl (modified) (3 diffs)
• gui/scripts/main.tcl (modified) (1 diff)
• gui/scripts/mainwin.tcl (modified) (4 diffs)
• gui/scripts/pager.tcl (modified) (5 diffs)
• gui/scripts/tooltip.tcl (modified) (3 diffs)
• lang/tcl/src/Makefile.in (modified) (3 diffs)
• lang/tcl/src/Rappture_Init.c (modified) (2 diffs)
• lang/tcl/src/RpScreenSize.c (added)

branches/uq/gui/scripts/balloon.tcl

@@ -1 @@
-# -*- mode: tcl; indent-tabs-mode: nil -*- 
+# -*- mode: tcl; indent-tabs-mode: nil -*-
 # ----------------------------------------------------------------------
 #  COMPONENT: Balloon - toplevel popup window, like a cartoon balloon
@@ -139 +139 @@
     set sh [image height $_fills($placement)]
     set p $itk_component(hull)
-    set screenw [winfo screenwidth $p]
-    set screenh [winfo screenheight $p]
+
+    # set screenw [winfo screenwidth $p]
+    # set screenh [winfo screenheight $p]
+    foreach {screenw screenh} [Rappture::ScreenSize [winfo screen $p]] break
 
     if {[winfo exists $where]} {
@@ -308 +310 @@
             #
             #     --------  ---       LEFT STEM
-            #    |..##    |  ^  
+            #    |..##    |  ^
             #    |  ..##  |  |        . = light color
             #    |    ..##|  | s      @ = dark color

branches/uq/gui/scripts/dropdown.tcl

@@ -1 @@
-# -*- mode: tcl; indent-tabs-mode: nil -*- 
+# -*- mode: tcl; indent-tabs-mode: nil -*-
 # ----------------------------------------------------------------------
 #  COMPONENT: dropdown - base class for drop-down panels
@@ -84 +84 @@
     set w [winfo width $itk_component(hull)]
     set h [winfo height $itk_component(hull)]
-    set sw [winfo screenwidth $itk_component(hull)]
-    set sh [winfo screenheight $itk_component(hull)]
+    # set sw [winfo screenwidth $itk_component(hull)]
+    # set sh [winfo screenheight $itk_component(hull)]
+    foreach {sw sh} [Rappture::ScreenSize [winfo screen $itk_component(hull)]] break
 
     if {[regexp {^@([0-9]+),([0-9]+)$} $where match x y]} {

branches/uq/gui/scripts/editor.tcl

@@ -1 @@
-# -*- mode: tcl; indent-tabs-mode: nil -*- 
+# -*- mode: tcl; indent-tabs-mode: nil -*-
 # ----------------------------------------------------------------------
 #  COMPONENT: editor - pop-up editor for little bits of text
@@ -59 +59 @@
     protected variable _loc   ;# array of editor location parameters
 }
-                                                                                
+
 itk::usual Editor {
     keep -cursor -font
@@ -276 +276 @@
     set fnt [$e cget -font]
 
+    foreach {screenw screenh} [Rappture::ScreenSize [winfo screen $e]] break
     set w [expr {[font measure $fnt $str]+20}]
     set w [expr {($w < $_loc(w)) ? $_loc(w) : $w}]
-    if {$w+$_loc(x) >= [winfo screenwidth $e]} {
-        set w [expr {[winfo screenwidth $e]-$_loc(x)}]
+    if {$w+$_loc(x) >= $screenw} {
+        set w [expr {$screenw-$_loc(x)}]
     }
 
     set h [expr {[font metrics $fnt -linespace]+4}]
     set h [expr {($h < $_loc(h)) ? $_loc(h) : $h}]
-    if {$h+$_loc(y) >= [winfo screenheight $e]} {
-        set h [expr {[winfo screenheight $e]-$_loc(y)}]
-    }                                        
+    if {$h+$_loc(y) >= $screenh} {
+        set h [expr {$screenh-$_loc(y)}]
+    }
     # Temporary fix to prevent Opps. Don't deal with negative dimensions.
     if { $w <= 0 || $h <= 0 } {

branches/uq/gui/scripts/main.tcl

@@ -354 +354 @@
 } elseif {[llength [$win.pager page]] == 2} {
     set style [string trim [$xmlobj get tool.layout]]
-    set screenw [winfo screenwidth .]
+
+    # set screenw [winfo screenwidth .]
+    foreach {screenw screenh} [Rappture::ScreenSize [winfo screen .]] break
 
     update idletasks

branches/uq/gui/scripts/mainwin.tcl

@@ -1 @@
-# -*- mode: tcl; indent-tabs-mode: nil -*- 
+# -*- mode: tcl; indent-tabs-mode: nil -*-
 # ----------------------------------------------------------------------
 #  COMPONENT: mainwin - main application window for Rappture
@@ -89 +89 @@
     private variable _bgparser ""  ;# parser for bgscript
 }
-                                                                                
+
 itk::usual MainWin {
     keep -background -cursor foreground -font
@@ -260 +260 @@
 itcl::body Rappture::MainWin::draw {option args} {
     set w $itk_component(hull)
-    regsub -all {<w>} $args [winfo screenwidth $w] args
-    regsub -all {<h>} $args [winfo screenheight $w] args
+    foreach {screenw screenh} [Rappture::ScreenSize [winfo screen $w]] break
+    regsub -all {<w>} $args $screenw args
+    regsub -all {<h>} $args $screenh args
     eval $itk_component(area) create $option $args
 }
@@ -364 +365 @@
             component hull configure -menu ""
             pack forget $itk_component(app)
-            set wx [winfo screenwidth $itk_component(hull)]
-            set wy [winfo screenheight $itk_component(hull)]
+            foreach {wx wy} [Rappture::ScreenSize [winfo screen $itk_component(hull)]] break
             wm geometry $itk_component(hull) ${wx}x${wy}+0+0
             _redraw

branches/uq/gui/scripts/pager.tcl

@@ -1 @@
-# -*- mode: tcl; indent-tabs-mode: nil -*- 
+# -*- mode: tcl; indent-tabs-mode: nil -*-
 # ----------------------------------------------------------------------
 #  COMPONENT: pager - notebook for displaying pages of widgets
@@ -56 +56 @@
     public method current {args}
 
-    public method busy { bool } 
+    public method busy { bool }
 
     protected method _layout {}
@@ -68 +68 @@
     private variable _current ""     ;# page currently shown
 }
-                                                                                
+
 itk::usual Pager {
 }
@@ -412 +412 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::Pager::_fixSize {} {
-    set sw [expr {[winfo screenwidth $itk_component(hull)]-200}]
-    set sh [expr {[winfo screenheight $itk_component(hull)]-200}]
+    foreach {screenw screenh} [Rappture::ScreenSize [winfo screen $itk_component(hull)]] break
+    set sw [expr {$screenw-200}]
+    set sh [expr {$screenh-200}]
 
     update  ;# force layout changes so sizes are correct
@@ -642 +643 @@
 #
 #       If true (this indicates a simulation is occurring), the widget
-#       should prevent the user from 
-#               1) clicking an item previous in the breadcrumbs, and 
+#       should prevent the user from
+#               1) clicking an item previous in the breadcrumbs, and
 #               2) using the "back" button.
 #
 itcl::body Rappture::Pager::busy { bool } {
     if { $bool } {
-        blt::busy hold $itk_component(breadcrumbs) 
+        blt::busy hold $itk_component(breadcrumbs)
         $itk_component(back) configure -state disabled
-    } else { 
-        blt::busy release $itk_component(breadcrumbs) 
+    } else {
+        blt::busy release $itk_component(breadcrumbs)
         $itk_component(back) configure -state normal
     }

branches/uq/gui/scripts/tooltip.tcl

@@ -1 @@
-# -*- mode: tcl; indent-tabs-mode: nil -*- 
+# -*- mode: tcl; indent-tabs-mode: nil -*-
 # ----------------------------------------------------------------------
 #  COMPONENT: tooltip - help information that pops up beneath a widget
@@ -160 +160 @@
     #
     update idletasks
+    foreach {screenw screenh} [Rappture::ScreenSize [winfo screen $hull]] break
     if {$signx == "+"} {
-        if {$xpos+[winfo reqwidth $hull] > [winfo screenwidth $hull]} {
-            set xpos [expr {[winfo screenwidth $hull]-[winfo reqwidth $hull]}]
+        if {$xpos+[winfo reqwidth $hull] > $screenw} {
+            set xpos [expr {$screenw-[winfo reqwidth $hull]}]
         }
         if {$xpos < 0} { set xpos 0 }
     } else {
         if {$xpos-[winfo reqwidth $hull] < 0} {
-            set xpos [expr {[winfo screenwidth $hull]-[winfo reqwidth $hull]}]
-        }
-        set xpos [expr {[winfo screenwidth $hull]-$xpos}]
+            set xpos [expr {$screenw-[winfo reqwidth $hull]}]
+        }
+        set xpos [expr {$screenw-$xpos}]
     }
 
     if {$signy == "+"} {
-        if {$ypos+[winfo reqheight $hull] > [winfo screenheight $hull]} {
-            set ypos [expr {[winfo screenheight $hull]-[winfo reqheight $hull]}]
+        if {$ypos+[winfo reqheight $hull] > $screenh} {
+            set ypos [expr {$screenh-[winfo reqheight $hull]}]
         }
         if {$ypos < 0} { set ypos 0 }
     } else {
         if {$ypos-[winfo reqheight $hull] < 0} {
-            set ypos [expr {[winfo screenheight $hull]-[winfo reqheight $hull]}]
-        }
-        set ypos [expr {[winfo screenheight $hull]-$ypos}]
+            set ypos [expr {$screenh-[winfo reqheight $hull]}]
+        }
+        set ypos [expr {$screenh-$ypos}]
     }
 
@@ -194 +195 @@
           && $py >= $ypos && $py <= $ypos+[winfo reqheight $hull]} {
 
-        if {$px > [winfo screenwidth $hull]/2} {
+        if {$px > $screenw/2} {
             set signx "-"
-            set xpos [expr {[winfo screenwidth $hull]-$px+4}]
+            set xpos [expr {$screenw-$px+4}]
         } else {
             set signx "+"
             set xpos [expr {$px+4}]
         }
-        if {$py > [winfo screenheight $hull]/2} {
+        if {$py > $screenh/2} {
             set signy "-"
-            set ypos [expr {[winfo screenheight $hull]-$py+4}]
+            set ypos [expr {$screenh-$py+4}]
         } else {
             set signy "+"

branches/uq/lang/tcl/src/Makefile.in

@@ -53 +53 @@
 LIBS = \
         -L../../../src/core -lrappture \
-        $(TCL_LIB_SPEC) -lncurses -lexpat -lz -lm -lstdc++
+        $(TCL_LIB_SPEC) -lncurses -lexpat -lz -lm -lstdc++ -lXrandr -lX11
 
 OBJS = \
@@ -65 +65 @@
         RpSignal.o  \
         RpSlice.o  \
+        RpScreenSize.o \
         RpSysinfo.o  \
         Switch.o \
@@ -76 +77 @@
 ifeq ($(HAVE_LIBCURSES),yes)
    OBJS += RpCurses.o
-   LIBS += -lncurses 
+   LIBS += -lncurses
 endif
 

branches/uq/lang/tcl/src/Rappture_Init.c

@@ -30 +30 @@
 extern Tcl_AppInitProc RpDaemon_Init;
 extern Tcl_AppInitProc RpCurses_Init;
-
+extern Tcl_AppInitProc RpScreenSize_Init;
 #ifdef notdef
 extern Tcl_AppInitProc RpLibrary_Init;
@@ -79 +79 @@
         return TCL_ERROR;
     }
+    if (RpScreenSize_Init(interp) != TCL_OK) {
+        return TCL_ERROR;
+    }
     if (RpSysinfo_Init(interp) != TCL_OK) {
         return TCL_ERROR;