The following shows the diffstat and patchsets between
ed2067b..419d387^
----------------------------------------------------------------
commit 419d3879cc9b1b7c8eacf03943c5838de4dd0ac3
Author: Thomas Adam <tho...@fvwm.org>
Date: Sun Sep 28 18:25:23 2014 +0100
Ident: Print monitor name selected window is on
When using Ident to show information about a window, also print out the name
of the monitor.
---
modules/MvwmIdent/MvwmIdent.c | 3 +++
modules/MvwmIdent/MvwmIdent.h | 1 +
2 files changed, 4 insertions(+)
diff --git a/modules/MvwmIdent/MvwmIdent.c b/modules/MvwmIdent/MvwmIdent.c
index 1b125fc..b35a26d 100644
--- a/modules/MvwmIdent/MvwmIdent.c
+++ b/modules/MvwmIdent/MvwmIdent.c
@@ -394,6 +394,8 @@ void list_configure(unsigned long *body)
{
module->window = cfgpacket->frame;
target.id = cfgpacket->w;
+ free(target.monitor);
+ target.monitor = mvwm_strdup((char *)&cfgpacket->monitor);
target.frame = cfgpacket->frame;
target.frame_x = cfgpacket->frame_x;
target.frame_y = cfgpacket->frame_y;
@@ -1142,6 +1144,7 @@ void MakeList(void)
AddToList("Class:", target.class);
AddToList("Resource:", target.res);
AddToList("Window ID:", id);
+ AddToList("Monitor:", target.monitor);
AddToList("Desk:", desktop);
AddToList("Layer:", layer);
AddToList("Width:", swidth);
diff --git a/modules/MvwmIdent/MvwmIdent.h b/modules/MvwmIdent/MvwmIdent.h
index e8cdf0c..a14fb1d 100644
--- a/modules/MvwmIdent/MvwmIdent.h
+++ b/modules/MvwmIdent/MvwmIdent.h
@@ -9,6 +9,7 @@ struct target_struct
char class[256];
char name[256];
char icon_name[256];
+ char *monitor;
unsigned long id;
unsigned long frame;
long frame_x;
commit ef87e8383778d99f8f9218a4a0beebd1596fb747
Author: Thomas Adam <tho...@fvwm.org>
Date: Sun Sep 28 18:20:58 2014 +0100
CONFIGARGS: Include the monitor name
Augment the CONFIGARGS macro to also include the monitor name of the
configured window.
---
libs/vpacket.h | 1 +
mvwm/module_interface.c | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/libs/vpacket.h b/libs/vpacket.h
index 0af7fa7..55d20d7 100644
--- a/libs/vpacket.h
+++ b/libs/vpacket.h
@@ -30,6 +30,7 @@ typedef struct ConfigWinPacket
unsigned long frame_width;
unsigned long frame_height;
unsigned long desk;
+ unsigned long *monitor;
/*
Temp word for alignment - old flags used to be here.
- remove before next release.
diff --git a/mvwm/module_interface.c b/mvwm/module_interface.c
index c98adfc..11cac2c 100644
--- a/mvwm/module_interface.c
+++ b/mvwm/module_interface.c
@@ -300,7 +300,7 @@ action_flags *__get_allowed_actions(const MvwmWindow *fw)
as a dummy to preserve alignment of the other fields in the
old packet: we should drop this before the next release.
*/
-#define CONFIGARGS(_fw) 33, \
+#define CONFIGARGS(_fw) 34, \
(unsigned long)(-sizeof(Window)), \
&FW_W(*(_fw)), \
(unsigned long)(-sizeof(Window)), \
@@ -317,6 +317,8 @@ action_flags *__get_allowed_actions(const MvwmWindow *fw)
&(*(_fw))->g.frame.height, \
(unsigned long)(0), \
&(*(_fw))->Desk, \
+ (unsigned long)(sizeof((*(_fw))->m->name)), \
+ (*(_fw))->m->name, \
(unsigned long)(0), \
&(*(_fw))->layer, \
(unsigned long)(0), \
----------------------------------------------------------------
Diffstat:
----------------------------------------------------------------
libs/vpacket.h | 1 +
modules/MvwmIdent/MvwmIdent.c | 3 +++
modules/MvwmIdent/MvwmIdent.h | 1 +
mvwm/module_interface.c | 4 +++-
4 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------
