Menu
▾
▴
[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[1049]
|
From: <dom...@us...> - 2020-12-02 22:46:45
|
Revision: 1049
http://sourceforge.net/p/fvwm-crystal/code/1049
Author: dominique_libre
Date: 2020-12-02 22:46:38 +0000 (Wed, 02 Dec 2020)
Log Message:
-----------
Add initial fvwm3 support; bump version to 3.7.0.
Modified Paths:
--------------
ChangeLog
asciidoc/fvwm-crystal
bin/fvwm-crystal
doc/html/fvwm-crystal.html
fvwm/components/functions/About
fvwm/scripts/launchwm
man/fvwm-crystal.1
Modified: ChangeLog
===================================================================
--- ChangeLog 2020-11-29 22:39:25 UTC (rev 1048)
+++ ChangeLog 2020-12-02 22:46:38 UTC (rev 1049)
@@ -1,5 +1,19 @@
ChangeLog for FVWM-Crystal
+Version 3.7.0
+-------------
+
+mercredi 2 décembre 2020
+ bin/fvwm-crystal: add initial support for fvwm3;
+ fvwm3 debug mode is supported if $FVWM_DEBUG is set to a non empty value
+ at startup; if $FVWM_LOGFILE is not set, the log file will be ~/.fvwm-crystal.log.
+ fvwm/scripts/launchwm: add fvwm3 and fvwm2 support. Each fvwm variant will
+ use its own FVWM_USERDIR path:
+ fvwm in ~.fvwm, fvwm2 in ~/.fvwm2, fvwm3 in ~/.fvwm3 and fvwm-themes
+ in ~/fvwm-themes.
+ asciidoc/fvwm-crystal: add fvwm3 and related variables; create the man and html doc.
+ fvwm/components/functions/About: bump to 3.7.0
+
dimanche 29 novembre 2020
fvwm/components/scripts/FvwmScript-CpuTemp: fix temperature reading path.
Modified: asciidoc/fvwm-crystal
===================================================================
--- asciidoc/fvwm-crystal 2020-11-29 22:39:25 UTC (rev 1048)
+++ asciidoc/fvwm-crystal 2020-12-02 22:46:38 UTC (rev 1049)
@@ -2,7 +2,7 @@
===============
:doctype: manpage
:man source: fvwm-crystal
-:man version: 3.5.1
+:man version: 3.7.0
:man manual: FVWM-Crystal
NAME
@@ -70,6 +70,13 @@
startx
----
+When fvwm3 is in use, the following variables can be used:
+
+*FVWM-CRYSTAL_DEBUG* set fvwm3 in debug mode when set to a non empty value (default: not set). You don't need to redirect the errors into a file, fvwm3 will do it for you.
+
+*FVWM_LOGFILE* set fvwm3 log file when in debug mode (default: ~/.fvwm-crystal.log).
+
+
First Start
~~~~~~~~~~~
*FVWM-Crystal* checks while your first login if +~/.fvwm-crystal+ exist and if old preferences must be converted to the new Fvwm InfoStore variables. In all cases, it should just start.
Modified: bin/fvwm-crystal
===================================================================
--- bin/fvwm-crystal 2020-11-29 22:39:25 UTC (rev 1048)
+++ bin/fvwm-crystal 2020-12-02 22:46:38 UTC (rev 1049)
@@ -12,29 +12,55 @@
# Name of the configuration file
configname=config
+# We now have both fvwm and fvwm3. fvwm-crystal work with both of them.
+# Use $FVWM_EXEC if set, fvwm3 if present, fvvwm otherwise:
+if [ "x${FVWM_EXEC}" == "x" ]; then
+ for name in fvwm3 fvwm fvwm2; do
+ FVWM_EXEC=`which "${name}" 2>/dev/null`
+ if (($? == 0)); then
+ break
+ fi
+ done
+fi
+if [ "x${FVWM_EXEC}" == "x" ]; then
+ echo 'No fvwm, fvwm2 or fvwm3 executable found in $PATH.'
+ echo "Please adjust your PATH accordingly or install fvwm."
+ echo "If fvwm is installed in another location, you can provide it as:"
+ echo ' export FVWM_EXEC="/my/location/fvwm"'
+ echo "before starting fvwm-crystal."
+ exit 1
+fi
+
# Other fvwm-crystal variables. They was previously in the configuration file, but
# due how fvwm honor the -F option, it is better to define them before
# fvwm statup. If they are already defined, skip this setup.
# Where is the user-wide configuration
-if [ -z "${FVWM_USERDIR}" ]
-then FVWM_USERDIR="${HOME}/.fvwm-crystal"
+if [ -z "${FVWM_USERDIR}" ]; then
+ FVWM_USERDIR="${HOME}/.fvwm-crystal"
fi
# Where is the system-wide configuration
-if [ -z "${FVWM_CONFIGDIR}" ]
-then FVWM_CONFIGDIR="/etc/X11/fvwm/fvwm-crystal"
+if [ -z "${FVWM_CONFIGDIR}" ]; then
+ FVWM_CONFIGDIR="/etc/X11/fvwm/fvwm-crystal"
fi
# Where are the system-wide files
-if [ -z "${FVWM_SYSTEMDIR}" ]
-then FVWM_SYSTEMDIR="/usr/share/fvwm-crystal/fvwm"
+if [ -z "${FVWM_SYSTEMDIR}" ]; then
+ FVWM_SYSTEMDIR="/usr/share/fvwm-crystal/fvwm"
fi
# Where the distribution specific menu is located
-if [ -z "${FVWM_DISTROMENUDIR}" ]
-then FVWM_DISTROMENUDIR="/var/lib/fvwm-crystal"
+if [ -z "${FVWM_DISTROMENUDIR}" ]; then
+ FVWM_DISTROMENUDIR="/var/lib/fvwm-crystal"
fi
# Nema of the distribution menu
-if [ -z "${FVWM_DISTROMENUNAME}" ]
-then FVWM_DISTROMENUNAME="debian"
+if [ -z "${FVWM_DISTROMENUNAME}" ]; then
+ FVWM_DISTROMENUNAME="debian"
fi
+# Where to write the log when fvwm3 is in debug mode
+if [ "${FVWM_EXEC}" == "fvwm3" ]; then
+ if [ "x${FVWM_LOGFILE}" == "x" ]; then
+ FVWM_LOGFILE="${HOME}/.fvwm-crystal.log"
+ export FVWM_LOGFILE
+ fi
+fi
#
export FVWM_USERDIR FVWM_CONFIGDIR FVWM_SYSTEMDIR FVWM_DISTROMENUDIR FVWM_DISTROMENUNAME
@@ -42,18 +68,15 @@
# if a variable 'configfile' is defined in the environment, its value is
# preserved; otherwise, the scripts look for configuration in common places.
configfile="$HOME/fvwm-crystal/$configname"
-if [ -n "$FVWMCRYSTAL_BASECONFIG" ]
- then
- configfile="$FVWMCRYSTAL_BASECONFIG"
- elif [ -f "$HOME/fvwm-crystal/$configname" ]
- then
- configfile=$HOME/fvwm-crystal/$configname;
- elif [ -f "`dirname ${0}`/../share/fvwm-crystal/fvwm/$configname" ]
- then
- configfile="`dirname ${0}`/../share/fvwm-crystal/fvwm/$configname";
+if [ -n "$FVWMCRYSTAL_BASECONFIG" ]; then
+ configfile="$FVWMCRYSTAL_BASECONFIG"
+elif [ -f "$HOME/fvwm-crystal/$configname" ]; then
+ configfile=$HOME/fvwm-crystal/$configname;
+elif [ -f "`dirname ${0}`/../share/fvwm-crystal/fvwm/$configname" ]; then
+ configfile="`dirname ${0}`/../share/fvwm-crystal/fvwm/$configname";
fi
-# This scripts will also kill the helper scripts when needed
+# This script will also kill the helper scripts when needed
cleanup() {
exitcode="0"
# remove orfaned fullscreen files
@@ -95,4 +118,19 @@
#echo "paramètres: $@"
#echo "exec fvwm -f $configfile $@"
-exec fvwm -f $configfile $@
+#exec fvwm -f $configfile $@
+if [ "x${FVWM-CRYSTAL_DEBUG}" == "x" ]; then
+ echo "Fvwm-Crystal starting using ${FVWM_EXEC}."
+ exec ${FVWM_EXEC} -f $configfile $@
+else
+ if [ "${FVWM_EXEC}" == "fvwm3" ]; then
+ echo "Fvwm-Crystal starting using ${FVWM_EXEC} in debug mode, the log file is ${FVWM_LOGFILE}."
+ exec ${FVWM_EXEC} -v -f $configfile $@
+ else
+ echo "Debug mode is not supported by ${FVWM_EXEC}. It print all errors to stderr."
+ echo "You can redirect these errors into a file whith the following line in ~/.xinitrc:"
+ echo ' exec /usr/bin/fvwm-crystal 2>./.errors.fvwm-crystal'
+ echo "Fvwm-Crystal starting using ${FVWM_EXEC}."
+ exec ${FVWM_EXEC} -f $configfile $@
+ fi
+fi
Modified: doc/html/fvwm-crystal.html
===================================================================
--- doc/html/fvwm-crystal.html 2020-11-29 22:39:25 UTC (rev 1048)
+++ doc/html/fvwm-crystal.html 2020-12-02 22:46:38 UTC (rev 1049)
@@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.6.10" />
+<meta name="generator" content="AsciiDoc 9.0.2" />
<title>fvwm-crystal(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
@@ -801,6 +801,9 @@
<div class="content">
<pre><code>startx</code></pre>
</div></div>
+<div class="paragraph"><p>When fvwm3 is in use, the following variables can be used:</p></div>
+<div class="paragraph"><p><strong>FVWM-CRYSTAL_DEBUG</strong> set fvwm3 in debug mode when set to a non empty value (default: not set). You don’t need to redirect the errors into a file, fvwm3 will do it for you.</p></div>
+<div class="paragraph"><p><strong>FVWM_LOGFILE</strong> set fvwm3 log file when in debug mode (default: ~/.fvwm-crystal.log).</p></div>
<div class="sect2">
<h3 id="_first_start">First Start</h3>
<div class="paragraph"><p><strong>FVWM-Crystal</strong> checks while your first login if <code>~/.fvwm-crystal</code> exist and if old preferences must be converted to the new Fvwm InfoStore variables. In all cases, it should just start.</p></div>
@@ -1441,7 +1444,7 @@
<div id="footer">
<div id="footer-text">
Last updated
- 2019-09-06 21:17:44 CEST
+ 2020-12-02 23:31:08 CET
</div>
</div>
</body>
Modified: fvwm/components/functions/About
===================================================================
--- fvwm/components/functions/About 2020-11-29 22:39:25 UTC (rev 1048)
+++ fvwm/components/functions/About 2020-12-02 22:46:38 UTC (rev 1049)
@@ -5,7 +5,7 @@
*About: Line center
*About: Text "FVWM-Crystal"
*About: Line center
-*About: Text "$[gt.Version]: 3.6.7"
+*About: Text "$[gt.Version]: 3.7.0"
*About: Line center
*About: Text "Magic Star"
*About: Line center
Modified: fvwm/scripts/launchwm
===================================================================
--- fvwm/scripts/launchwm 2020-11-29 22:39:25 UTC (rev 1048)
+++ fvwm/scripts/launchwm 2020-12-02 22:46:38 UTC (rev 1049)
@@ -17,17 +17,25 @@
XEPHYR_PID=`echo $!`
# launch the wm
-# We dont want the fvwm and fvwm-themes files to be mixed with fvwm-crystal
+# We dont want the fvwm* and fvwm-themes files to be mixed with fvwm-crystal
ENVWM=`basename $EXECWM`
-if [ "$ENVWM" = "fvwm-themes-start" ] ; then
- FVWM_USERDIR="${HOME}/.fvwm" DISPLAY=:$XephyrDisplay $EXECWM 2>/dev/null
-else
- if [ "$ENVWM" = "fvwm" ] ; then
- FVWM_USERDIR="/${HOME}/.fvwm" DISPLAY=:$XephyrDisplay $EXECWM 2>/dev/null
- else
- DISPLAY=:$XephyrDisplay $EXECWM 2>/dev/null
- fi
-fi
+case "${ENVWM}" in
+ fvwm-themes-start)
+ FVWM_USERDIR="${HOME}/.fvwm-themes" DISPLAY=:$XephyrDisplay $EXECWM 2>/dev/null
+ ;;
+ fvwm)
+ FVWM_USERDIR="/${HOME}/.fvwm" DISPLAY=:$XephyrDisplay $EXECWM 2>/dev/null
+ ;;
+ fvwm2)
+ FVWM_USERDIR="/${HOME}/.fvwm2" DISPLAY=:$XephyrDisplay $EXECWM 2>/dev/null
+ ;;
+ fvwm3)
+ FVWM_USERDIR="/${HOME}/.fvwm3" DISPLAY=:$XephyrDisplay $EXECWM 2>/dev/null
+ ;;
+ *)
+ DISPLAY=:$XephyrDisplay $EXECWM 2>/dev/null
+ ;;
+esac
# stop Xephyr
kill $!
Modified: man/fvwm-crystal.1
===================================================================
--- man/fvwm-crystal.1 2020-11-29 22:39:25 UTC (rev 1048)
+++ man/fvwm-crystal.1 2020-12-02 22:46:38 UTC (rev 1049)
@@ -2,12 +2,12 @@
.\" Title: fvwm-crystal
.\" Author: [see the "AUTHORS" section]
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\" Date: 04/12/2020
+.\" Date: 12/02/2020
.\" Manual: FVWM-Crystal
-.\" Source: fvwm-crystal 3.5.1
+.\" Source: fvwm-crystal 3.7.0
.\" Language: English
.\"
-.TH "FVWM\-CRYSTAL" "1" "04/12/2020" "fvwm\-crystal 3\&.5\&.1" "FVWM\-Crystal"
+.TH "FVWM\-CRYSTAL" "1" "12/02/2020" "fvwm\-crystal 3\&.7\&.0" "FVWM\-Crystal"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -124,6 +124,12 @@
.if n \{\
.RE
.\}
+.sp
+When fvwm3 is in use, the following variables can be used:
+.sp
+\fBFVWM\-CRYSTAL_DEBUG\fR set fvwm3 in debug mode when set to a non empty value (default: not set)\&. You don\(cqt need to redirect the errors into a file, fvwm3 will do it for you\&.
+.sp
+\fBFVWM_LOGFILE\fR set fvwm3 log file when in debug mode (default: ~/\&.fvwm\-crystal\&.log)\&.
.SS "First Start"
.sp
\fBFVWM\-Crystal\fR checks while your first login if ~/\&.fvwm\-crystal exist and if old preferences must be converted to the new Fvwm InfoStore variables\&. In all cases, it should just start\&.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
