0001: Remove trailing whitespace in a module file.
0002: Rename variables in __move_loop (part of a larger cleanup).
0003: Break some long lines in the move/resize code.
0004: Fix manpage glitch.
0005: Don't mention FvwmTheme in the man gape anymore.
0006: Rephrase the introductory paragraphs in the man page and remove the MWM
references. Remove "features" that are not noteworthy nowadays.
0007: Remove the "MWM COMPATIBILITY" section. Nobody cares anymore.
Ciao
Dominik ^_^ ^_^
--
Dominik Vogt
From e1ba8a6c1b3d77c501330acc53e98c8ffbbddf62 Mon Sep 17 00:00:00 2001
From: Dominik Vogt <dominik.v...@gmx.de>
Date: Mon, 15 Nov 2021 02:04:06 +0100
Subject: [PATCH 1/7] Remove trailing whitespace.
---
modules/FvwmIconMan/FvwmIconMan.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/FvwmIconMan/FvwmIconMan.h b/modules/FvwmIconMan/FvwmIconMan.h
index dd7be146..33476f47 100644
--- a/modules/FvwmIconMan/FvwmIconMan.h
+++ b/modules/FvwmIconMan/FvwmIconMan.h
@@ -65,7 +65,7 @@ typedef struct Resolution {
NO_SHOW_PAGE = 0x20,
NO_SHOW_SCREEN = 0x40,
} type;
-
+
} Resolution;
typedef enum {
--
2.30.2
From 0ba1427dd27539543579c3a6d88216e6e0549d0f Mon Sep 17 00:00:00 2001
From: Dominik Vogt <dominik.v...@gmx.de>
Date: Mon, 15 Nov 2021 10:31:04 +0100
Subject: [PATCH 2/7] __move_loop: Rename variables.
---
fvwm/move_resize.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/fvwm/move_resize.c b/fvwm/move_resize.c
index 8536673c..5fd41e8c 100644
--- a/fvwm/move_resize.c
+++ b/fvwm/move_resize.c
@@ -2725,8 +2725,8 @@ Bool __move_loop(
ButtonMotionMask | ExposureMask, &e)))
{
XEvent le;
- int x;
- int y;
+ int px;
+ int py;
int delay;
UPDATE_FVWM_SCREEN(fw);
@@ -2761,11 +2761,11 @@ Bool __move_loop(
e.type = MotionNotify;
e.xmotion.time = fev_get_evtime();
if (FQueryPointer(
- dpy, Scr.Root, &JunkRoot, &JunkChild, &x,
- &y, &JunkX, &JunkY, &JunkMask) == True)
+ dpy, Scr.Root, &JunkRoot, &JunkChild, &px,
+ &py, &JunkX, &JunkY, &JunkMask) == True)
{
- e.xmotion.x_root = x;
- e.xmotion.y_root = y;
+ e.xmotion.x_root = px;
+ e.xmotion.y_root = py;
}
else
{
--
2.30.2
From 0e2326257e6fd88c3d207df2b063307c7d7385f1 Mon Sep 17 00:00:00 2001
From: Dominik Vogt <dominik.v...@gmx.de>
Date: Mon, 15 Nov 2021 10:31:24 +0100
Subject: [PATCH 3/7] Break long lines.
---
fvwm/move_resize.c | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/fvwm/move_resize.c b/fvwm/move_resize.c
index 5fd41e8c..3e09666b 100644
--- a/fvwm/move_resize.c
+++ b/fvwm/move_resize.c
@@ -2620,8 +2620,10 @@ Bool __move_loop(
m = fw->m;
vx = m->virtual_scr.Vx;
vy = m->virtual_scr.Vy;
- dx = m->virtual_scr.EdgeScrollX ? m->virtual_scr.EdgeScrollX : monitor_get_all_widths();
- dy = m->virtual_scr.EdgeScrollY ? m->virtual_scr.EdgeScrollY : monitor_get_all_heights();
+ dx = m->virtual_scr.EdgeScrollX ?
+ m->virtual_scr.EdgeScrollX : monitor_get_all_widths();
+ dy = m->virtual_scr.EdgeScrollY ?
+ m->virtual_scr.EdgeScrollY : monitor_get_all_heights();
if (!GrabEm(cursor, GRAB_NORMAL))
{
@@ -2981,8 +2983,10 @@ Bool __move_loop(
xl = xl2;
yt = yt2;
}
- if (xl != xl_orig || yt != yt_orig || vx != m->virtual_scr.Vx ||
- vy != m->virtual_scr.Vy || was_snapped)
+ if (
+ xl != xl_orig || yt != yt_orig ||
+ vx != m->virtual_scr.Vx ||
+ vy != m->virtual_scr.Vy || was_snapped)
{
/* only snap if the window actually moved! */
if (!is_alt_mode_enabled)
@@ -4022,8 +4026,10 @@ static Bool __resize_window(F_CMD_ARGS)
Bool was_alt_key_not_pressed = False;
Bool is_alt_mode_enabled = False;
- dx = mon->virtual_scr.EdgeScrollX ? mon->virtual_scr.EdgeScrollX : monitor_get_all_widths();
- dy = mon->virtual_scr.EdgeScrollY ? mon->virtual_scr.EdgeScrollY : monitor_get_all_heights();
+ dx = mon->virtual_scr.EdgeScrollX ?
+ mon->virtual_scr.EdgeScrollX : monitor_get_all_widths();
+ dy = mon->virtual_scr.EdgeScrollY ?
+ mon->virtual_scr.EdgeScrollY : monitor_get_all_heights();
bad_window = False;
ResizeWindow = FW_W_FRAME(fw);
--
2.30.2
From bd008eb022d240c53c3fe92778bb13abddebbca0 Mon Sep 17 00:00:00 2001
From: Dominik Vogt <dominik.v...@gmx.de>
Date: Mon, 15 Nov 2021 11:44:29 +0100
Subject: [PATCH 4/7] Fix "&" in man page.
---
doc/fvwm3/fvwm3.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/fvwm3/fvwm3.adoc b/doc/fvwm3/fvwm3.adoc
index 3e325ef0..a71c0aed 100644
--- a/doc/fvwm3/fvwm3.adoc
+++ b/doc/fvwm3/fvwm3.adoc
@@ -1762,7 +1762,7 @@ $[...]::
Some examples can be found in the description of the *AddToFunc*
command.
-== SCRIPTING & COMPLEX FUNCTIONS
+== SCRIPTING AND COMPLEX FUNCTIONS
To achieve the more complex effects, fvwm has a number of commands that
improve its scripting abilities. Scripts can be read from a file with
--
2.30.2
From 328548e401de16064feebb81ea43b86325e8d9ee Mon Sep 17 00:00:00 2001
From: Dominik Vogt <dominik.v...@gmx.de>
Date: Mon, 15 Nov 2021 11:46:40 +0100
Subject: [PATCH 5/7] Remove reference to FvwmTheme from man page.
---
doc/fvwm3/fvwm3.adoc | 21 ---------------------
1 file changed, 21 deletions(-)
diff --git a/doc/fvwm3/fvwm3.adoc b/doc/fvwm3/fvwm3.adoc
index a71c0aed..4e558f9c 100644
--- a/doc/fvwm3/fvwm3.adoc
+++ b/doc/fvwm3/fvwm3.adoc
@@ -9189,27 +9189,6 @@ color (often based on the background color), background face (this
includes images and all kinds of gradients). There is a way to render
background face and specify other color operations.
-In the 2.4.x versions a special module *FvwmTheme* was introduced to
-manage colorsets. Starting with the 2.5.x beta version, the *FvwmTheme*
-functionality was moved to the core fvwm, so this module became
-obsolete. In 2.6.7 the *FvwmTheme* module was removed.
-
-The old syntax:
-
-....
-DestroyModuleConfig FvwmTheme: *
-*FvwmTheme: Colorset 0 fg black, bg rgb:b4/aa/94
-*FvwmTheme: Colorset 1 fg black, bg rgb:a1/b2/c8
-....
-
-corresponds to the new syntax:
-
-....
-CleanupColorsets
-Colorset 0 fg black, bg rgb:b4/aa/94
-Colorset 1 fg black, bg rgb:a1/b2/c8
-....
-
*Colorset* _num_ [_options_]::
Creates or modifies colorset _num_. Colorsets are identified by this
number. The number can start at zero and can be a very large number.
--
2.30.2
From 50051abf991ad635834e1321385e0d4a8ad51799 Mon Sep 17 00:00:00 2001
From: Dominik Vogt <dominik.v...@gmx.de>
Date: Mon, 15 Nov 2021 11:52:33 +0100
Subject: [PATCH 6/7] Remove MWM reference from manpage; reword first
paragraphs.
---
doc/fvwm3/fvwm3.adoc | 47 +++++++++++++++-----------------------------
1 file changed, 16 insertions(+), 31 deletions(-)
diff --git a/doc/fvwm3/fvwm3.adoc b/doc/fvwm3/fvwm3.adoc
index 4e558f9c..dfdfa2fa 100644
--- a/doc/fvwm3/fvwm3.adoc
+++ b/doc/fvwm3/fvwm3.adoc
@@ -14,45 +14,30 @@ _config-file_] [*-r*] [*-s* [_screen_num_]] [*-V*] [*-C* _visual-class_
== DESCRIPTION
-Fvwm is a window manager for X11. It is designed to minimize memory
-consumption, provide a 3D look to window frames, and a virtual desktop.
+Fvwm is a window manager for X11 optimised for speed.
Note that there are several window managers around that have "fvwm" in
their name. Fvwm3 is the successor to fvwm2, which preceded the 1.x
versions of fvwm. This version is simply called fvwm throughout this
document, while the main executable is named fvwm3.
-Fvwm is intended to have a small memory footprint but a rich feature
-set, be extremely customizable and extendible, and have a high degree of
-Motif mwm compatibility. Fvwm provides both a large _virtual desktop_
-and _multiple disjoint desktops_ which can be used separately or
-together. The virtual desktop allows you to pretend that your video
-screen is really quite large, and you can scroll around within the
-desktop. The multiple disjoint desktops allow you to pretend that you
-really have several screens to work at, but each screen is completely
-unrelated to the others.
-
-Fvwm provides _keyboard accelerators_ that allow you to perform most
-window manager functions, including moving and resizing windows and
+Fvwm is intended to have a small memory footprint and is extremely
+customizable and extendible. A large _virtual desktop_ and
+_multiple disjoint desktops_ can be used separately or together.
+The virtual desktop pretends that the video screen is really quite
+large, and you can scroll around within the desktop. The multiple
+disjoint desktops pretend there are really several screens to work
+at, but each screen is completely unrelated to the others.
+
+Fvwm provides _keyboard accelerators_ that allow to perform practically
+all window manager functions, including moving and resizing windows and
operating the menus, using keyboard shortcuts.
-Fvwm has also overcome the distinction between configuration commands
-and action commands that most window managers make. Configuration
-commands typically set fonts, colors, menu contents, and key and mouse
-function bindings, while action commands do things like raise and lower
-windows. Fvwm makes no such distinction and allows anything to be
-changed at any time.
-
-Other noteworthy differences between fvwm and other X11 window managers
-are the introduction of the _SloppyFocus_ and _NeverFocus_ focus
-methods. Focus policy can be separately specified for different window
-groups. Windows using _SloppyFocus_ acquire focus when the pointer moves
-into them and retain focus until some other window acquires it. Such
-windows do not lose focus when the pointer moves into the root window.
-The _NeverFocus_ policy is provided for use with windows into which one
-never types (e.g. xclock, oclock, xbiff, xeyes, tuxeyes) - for example,
-if a SloppyFocus terminal window has focus, moving the pointer over a
-NeverFocus decoration window does not deprive the terminal of focus.
+Fvwm does not distinguish between configuration and action commands.
+Configuration commands typically set fonts, colors, menu contents, and
+key and mouse function bindings, while action commands do things like
+raising and lowering windows. Fvwm makes no such distinction and allows
+anything to be changed at any time.
== OPTIONS
--
2.30.2
From 44b082d70f30c42821488db54a9d807050b9c0ca Mon Sep 17 00:00:00 2001
From: Dominik Vogt <dominik.v...@gmx.de>
Date: Mon, 15 Nov 2021 11:59:35 +0100
Subject: [PATCH 7/7] Remove section "MWM COMPATIBILITY" from man page.
---
doc/fvwm3/fvwm3.adoc | 6 ------
1 file changed, 6 deletions(-)
diff --git a/doc/fvwm3/fvwm3.adoc b/doc/fvwm3/fvwm3.adoc
index dfdfa2fa..deed1e7d 100644
--- a/doc/fvwm3/fvwm3.adoc
+++ b/doc/fvwm3/fvwm3.adoc
@@ -903,12 +903,6 @@ type "xprop | grep _NET_WM_STRUT" in a terminal and select the
application. If four numbers appear then these numbers define the
reserved space as explained in the *EwmhBaseStruts* command.
-== MWM COMPATIBILITY
-
-Fvwm provides options to emulate Motif Window Manager (Mwm) as well as
-possible. Please refer to the *Emulate* command as well as to the Mwm
-specific options of the *Style* and *MenuStyle* commands for details.
-
== OPEN LOOK AND XVIEW COMPATIBILITY
Fvwm supports all the Open Look decoration hints (except pushpins).
--
2.30.2
