Changeset 39350

Timestamp:

Sep 30, 2009, 3:57:05 AM (15 years ago)

Author:

marisn

Message:

Close gis.m on exit; Provide exit from GRASS in gis.m

Location:

grass/branches/develbranch_6

Files:

• gui/tcltk/gis.m/gm.tcl (modified) (3 diffs)
• gui/tcltk/gis.m/gmmenu.tcl (modified) (1 diff)
• lib/init/grass.src (modified) (1 diff)
• lib/init/init.sh (modified) (3 diffs)

grass/branches/develbranch_6/gui/tcltk/gis.m/gm.tcl

@@ -514 +514 @@
 };
 
+# Provides remote exit call. Used by GRASS exit to close all session's gis.m instances.
+# Argument session_id is exit caller's GIS_LOCK variable.
+proc Gm::remoteExit { session_id } {
+        global env
+        if {$env(GIS_LOCK) == $session_id} Gm::quit
+}
+
+# Provides exit from gis.m. May also do some clean-up, save-settings et.al.
+proc Gm::quit { {full_exit false} } {
+        global env
+        
+        if { $full_exit } {
+                if { [catch {set spid $env(GRASS_SHELL_PID)}] == 0 } {
+                        set leave [tk_dialog .leave [G_msg "End current GRASS session"] \
+                        [G_msg "Do You really want to terminate current\
+GRASS session?\n\nThis action will colse all sessions gis.m instances.\n\nIf You have running some \
+GRASS module from comandline, GRASS will terminate after it\
+finishes to run."] warning 1 [G_msg "Terminate current GRASS sesion"] [G_msg "Cancel"]]
+                        if { $leave == 0 } { 
+                                exec kill -SIGINT $env(GRASS_SHELL_PID)
+                        } else { 
+                                return
+                        }
+                } else {
+                        tk_messageBox -type ok -title [G_msg "Not supported"] -message \
+                        [G_msg "We sorry. Your shell does not support this feature. \n\
+You have to type 'exit' in terminal manualy."]
+                }
+        }
+
+        exit
+}
+
 ###############################################################################
 
@@ -539 +572 @@
     }
     bind . <$keycontrol-Key-q> {
-                exit
+                Gm::quit
         }
     bind . <$keycontrol-Key-w> {
@@ -563 +596 @@
 }
 
+wm protocol . WM_DELETE_WINDOW {
+        Gm::quit
+}
 
 main $argc $argv

grass/branches/develbranch_6/gui/tcltk/gis.m/gmmenu.tcl

@@ -202 +202 @@
         {command {[G_msg "PostScript plot"]} {} "ps.map: Create cartographic PostScript plot" {} -command { execute ps.map }}
         {separator}
-        {command {[G_msg "E&xit"]} {} "Exit GIS Manager" {} -accelerator $keyctrl-Q -command { exit } }
+        {command {[G_msg "Exit &GRASS"]} {} "End current GRASS session" {} -command { Gm::quit true } }
+        {command {[G_msg "&Quit GIS Manager"]} {} "Exit GIS Manager" {} -accelerator $keyctrl-Q -command { Gm::quit } }
  }
  {[G_msg "&Config"]} all options $tmenu {

grass/branches/develbranch_6/lib/init/grass.src

@@ -41 +41 @@
         else
                 # Returning user may have preffered GRASS terminal application
-                GRASS_XTERM=`awk '/GRASS_XTERM/ {print $2}' "$GISRCRC"  2>/dev/null`
+                if [ -z "$GRASS_XTERM" ]; then
+                        GRASS_XTERM=`awk '/GRASS_XTERM/ {print $2}' "$GISRCRC"  2>/dev/null`
+                fi;
                 if [ -n "$GRASS_XTERM" ]; then
                         # User has preffered GRASS terminal app

grass/branches/develbranch_6/lib/init/init.sh

@@ -818 +818 @@
     # Check for tcltk interface
     tcltk | gis.m)
-        "$GISBASE/scripts/gis.m"
+        if [ $sh -ne bash ] || [ $sh -ne msh ] || [ $sh -ne cygwin ]; then
+                # trap is not supported by csh/tcsh and rc
+                "$GISBASE/scripts/gis.m"
+        fi;
         ;;
     oldtcltk | d.m)
@@ -967 +970 @@
     echo "export PATH=\"$PATH\"" >> "$bashrc"
     echo "export HOME=\"$USERHOME\"" >> "$bashrc" # restore user home path
+    echo 'export GRASS_SHELL_PID=$$' >> "$bashrc" # can be used to terminate GRASS session from GUI
+    if [ "$GRASS_GUI" == tcltk ] || [ "$GRASS_GUI" == gis.m ]; then
+        echo '$GISBASE/scripts/gis.m' >> "$bashrc" # Start gis.m
+    fi;
+    echo 'trap "echo \"GUI issued an exit\"; exit" SIGINT' >> "$bashrc"
 
     "$ETC/run" "$SHELL"
@@ -1013 +1021 @@
 done
 
+# Attempt to close any open gis.m instances. 
+# Will work only on some systems, still has no harm to others
+if [ $TCLTKGRASSBASE ] ; then
+        echo "Closing open gis.m sessions....."
+        echo 'foreach gwin [lsearch -all -inline [winfo interps] gm_tcl*] {
+                catch {send -async $gwin Gm::remoteExit $env(GIS_LOCK)}
+        }
+        exit' | $GRASS_WISH >/dev/null 2>&1
+fi
+
 echo "Cleaning up temporary files ..."