[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[1053] fvwm/components

[<dom...@us...>]

Revision: 1053
          http://sourceforge.net/p/fvwm-crystal/code/1053
Author:   dominique_libre
Date:     2020-12-07 09:02:16 +0000 (Mon, 07 Dec 2020)
Log Message:
-----------
Add support for FvwmPrompt in FvwmMiniConsole

Modified Paths:
--------------
    ChangeLog
    INSTALL
    fvwm/components/apps/FvwmMiniConsole
    fvwm/components/functions/Exec-Accelerator

Modified: ChangeLog
===================================================================
--- ChangeLog	2020-12-03 00:38:27 UTC (rev 1052)
+++ ChangeLog	2020-12-07 09:02:16 UTC (rev 1053)
@@ -1,5 +1,11 @@
 ChangeLog for FVWM-Crystal
 
+lundi 7 décembre 2020
+  INSTALL: add fvwm3 dependency.
+  fvwm/components/apps/FvwmMiniConsole: add support for FvwmPrompt
+  fvwm/components/functions/Exec-Accelerator: add AGT, as AT but with geometry;
+  needed by FvwmPrompt.
+
 Version 3.7.0
 -------------
 

Modified: INSTALL
===================================================================
--- INSTALL	2020-12-03 00:38:27 UTC (rev 1052)
+++ INSTALL	2020-12-07 09:02:16 UTC (rev 1053)
@@ -145,7 +145,7 @@
 
 Needed:
 -------
-- fvwm>=2.6.9
+- fvwm>=2.6.9 or fvwm3 with FvwmPrompt (with --enable-golang).
 - python3 - tested with 3.6, should work with any python3 version.
     python2 is not supported anymore because upstream will end
     its support at the end of that year (2019).

Modified: fvwm/components/apps/FvwmMiniConsole
===================================================================
--- fvwm/components/apps/FvwmMiniConsole	2020-12-03 00:38:27 UTC (rev 1052)
+++ fvwm/components/apps/FvwmMiniConsole	2020-12-07 09:02:16 UTC (rev 1053)
@@ -24,7 +24,9 @@
 + I Style FvwmMiniConsoleNeedsUniqueName WindowShadeSteps 16
 + I Style FvwmMiniConsoleNeedsUniqueName WindowShadeShrinks
 + I Style FvwmMiniConsoleNeedsUniqueName TitleAtBottom
-+ I Module FvwmConsole -terminal $[infostore.FvwmConsoleTerminal] -geometry 80x5+0-0 -title FvwmMiniConsoleNeedsUniqueName
+# fvwm3 version start with 1.0.0
++ I Test (Version >= 2.6.9) Module FvwmConsole -terminal $[infostore.FvwmConsoleTerminal] -geometry 80x5+0-0 -title FvwmMiniConsoleNeedsUniqueName
++ I TestRc (NoMatch) AGT FvwmMiniConsoleNeedsUniqueName 80x5+0-0 FvwmPrompt
 + I Wait FvwmMiniConsoleNeedsUniqueName
 + I Style FvwmMiniConsoleNeedsUniqueName FixedPosition
 + I All (FvwmMiniConsoleNeedsUniqueName) MoveToDesk 0 666

Modified: fvwm/components/functions/Exec-Accelerator
===================================================================
--- fvwm/components/functions/Exec-Accelerator	2020-12-03 00:38:27 UTC (rev 1052)
+++ fvwm/components/functions/Exec-Accelerator	2020-12-07 09:02:16 UTC (rev 1053)
@@ -22,6 +22,9 @@
 # AT
 # As 'A' function, but give a Title to the window terminal.
 
+# ATG
+# As 'AT' function, but give a geometry to the window terminal.
+
 # C
 # Launches a the fvwm console terminal with optional program as an argument.
 # Terminal settings should be set using ~/.Xresources file or (in Eterm) theme file.
@@ -67,6 +70,11 @@
 + I Test (!EnvMatch infostore.DefaultTerminal gnome-terminal, !EnvMatch DefaultTerminal multi-gnome-terminal, !EnvMatch DefaultTerminal terminator, !EnvMatch DefaultTerminal x-terminal-emulator, !EnvMatch DefaultTerminal xfce4-terminal) Exec exec $[infostore.DefaultTerminal] --title "$0" -e $[1-]  $[infostore.SILENT]
 + I TestRc (NoMatch) Exec exec $[infostore.DefaultTerminal] --title "$0" -e "$[1-]" $[infostore.SILENT]
 
+DestroyFunc StartGTitledTerminal
+AddToFunc StartGTitledTerminal
++ I Test (!EnvMatch infostore.DefaultTerminal gnome-terminal, !EnvMatch DefaultTerminal multi-gnome-terminal, !EnvMatch DefaultTerminal terminator, !EnvMatch DefaultTerminal x-terminal-emulator, !EnvMatch DefaultTerminal xfce4-terminal) Exec exec $[infostore.DefaultTerminal] --title "$0" --geometry "$1" -e $[2-]  $[infostore.SILENT]
++ I TestRc (NoMatch) Exec exec $[infostore.DefaultTerminal] --title "$0" --geometry "$1" -e "$[2-]" $[infostore.SILENT]
+
 # Usage: A [command] [command options]
 DestroyFunc A
 AddToFunc A
@@ -89,6 +97,13 @@
 + I Test (EnvMatch infostore.DefaultTerminal urxvtc) StartUrxvtc --title "$0" -name "$0" -e $[1-]
 + I TestRc (NoMatch) StartTitledTerminal "$0" $[1-]
 
+# Usage: AGT [title] [geometry] [command] (Use quotes if you want command options or title with spaces)
+DestroyFunc AGT
+AddToFunc AGT
++ I Window-SetPlacementPolicy
++ I Test (EnvMatch infostore.DefaultTerminal urxvtc) StartUrxvtc --title "$0" -name "$0" --geometry "$1" -e $[2-]
++ I TestRc (NoMatch) StartGTitledTerminal "$0" "$1" "$[2-]"
+
 # Usage: C [command] [command options]
 DestroyFunc C
 AddToFunc C

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.