From 7253d3a1904809d59a824c04f3e98d2a6f82f11c Mon Sep 17 00:00:00 2001
From: Thomas Adam <thomas@fvwm.org>
Date: Thu, 15 Oct 2020 11:07:58 +0100
Subject: [PATCH] Expansion: add $[w.pagex] $[w.pagey]

This adds expansion parameters to determine which page a window is on.

Fixes #255
---
 doc/fvwm/expansion.xml |  4 ++++
 fvwm/expand.c          | 38 ++++++++++++++++++++++++++++++++++++++
 fvwm/move_resize.c     |  1 +
 3 files changed, 43 insertions(+)

diff --git a/doc/fvwm/expansion.xml b/doc/fvwm/expansion.xml
index ab72a0f37..43da0f33e 100644
--- a/doc/fvwm/expansion.xml
+++ b/doc/fvwm/expansion.xml
@@ -299,6 +299,10 @@ command can be used:</para>
       </para>
     </listitem>
   </varlistentry>
+  <varlistentry>
+    <term>$[w.pagex] $[w.pagey]</term>
+    <listitem><para>The X or Y page the window is on.</para></listitem>
+  </varlistentry>
   <varlistentry>
     <term>$[w.desk]</term>
     <listitem>
diff --git a/fvwm/expand.c b/fvwm/expand.c
index c4bbdbc4b..de4d842ff 100644
--- a/fvwm/expand.c
+++ b/fvwm/expand.c
@@ -136,6 +136,8 @@ static char *function_vars[] =
 	"w.desk",
 	"w.layer",
 	"w.screen",
+	"w.pagex",
+	"w.pagey",
 	/* ewmh working area */
 	"wa.height",
 	"wa.width",
@@ -225,6 +227,8 @@ enum
 	VAR_W_DESK,
 	VAR_W_LAYER,
 	VAR_W_SCREEN,
+	VAR_W_PAGEX,
+	VAR_W_PAGEY,
 	/* ewmh working area */
 	VAR_WA_HEIGHT,
 	VAR_WA_WIDTH,
@@ -955,6 +959,40 @@ static signed int expand_vars_extended(
 			should_quote = False;
 		}
 		break;
+	case VAR_W_PAGEX:
+	case VAR_W_PAGEY: {
+		int wx, wy, wh, ww, page_x, page_y;
+		rectangle r, t;
+		Window win;
+
+		if (!fw || IS_EWMH_DESKTOP(FW_W(fw))) {
+			return -1;
+		}
+
+		win = FW_W_FRAME(fw);
+		if (!XGetGeometry(dpy, win, &JunkRoot, &wx, &wy,
+			(unsigned int*)&ww,
+			(unsigned int*)&wh,
+			(unsigned int*)&JunkBW,
+			(unsigned int*)&JunkDepth)) {
+			return -1;
+		}
+		r.x = wx;
+		r.y = wy;
+		r.width = ww;
+		r.height = wh;
+
+		get_absolute_geometry(fw, &t, &r);
+		get_page_offset_rectangle(fw, &page_x, &page_y, &t);
+
+		if (i == VAR_W_PAGEX)
+			val = page_x / monitor_get_all_widths();
+		else
+			val = page_y / monitor_get_all_heights();
+		is_numeric = True;
+		should_quote = False;
+		break;
+	}
 	case VAR_SCREEN:
 		is_numeric = False;
 		val = Scr.screen;
diff --git a/fvwm/move_resize.c b/fvwm/move_resize.c
index d1840d2b1..a67f38c45 100644
--- a/fvwm/move_resize.c
+++ b/fvwm/move_resize.c
@@ -57,6 +57,7 @@
 #include "move_resize.h"
 #include "functions.h"
 #include "style.h"
+#include "externs.h"
 
 /* ----- move globals ----- */