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
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
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, )))
{
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, , , ,
-, , , ) == True)
+dpy, Scr.Root, , , ,
+, , , ) == 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
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
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
Date: Mon, 15 Nov 2021 11:46:40 +0100
Subject: [PATCH 5/7] Remove reference to FvwmTheme from man page.
---
doc/fvwm3/fvwm3.adoc
