The following shows the diffstat and patchsets between
eb2e30a..c4d4ed4^
----------------------------------------------------------------
commit c4d4ed4392fd38bb385439d69983e0261355cfa0
Author: Thomas Adam <tho...@fvwm.org>
Date: Sat Nov 1 19:36:58 2014 +0000
Officially deprecate Xinerama / XineramaPrimaryScreen
These no longer make sense with XRandR; may well be resurrected in some
other
guise later on.
For now the commands exist as stubs only, with a deprecation warning present
until such time that we deal with configuration migration properly.
---
mvwm/module_interface.c | 12 ------------
mvwm/virtual.c | 33 ++++++++++++---------------------
2 files changed, 12 insertions(+), 33 deletions(-)
diff --git a/mvwm/module_interface.c b/mvwm/module_interface.c
index 11cac2c..a5c0f6f 100644
--- a/mvwm/module_interface.c
+++ b/mvwm/module_interface.c
@@ -628,18 +628,6 @@ void BroadcastConfigInfoString(char *string)
return;
}
-
-/*
- * Broadcasts the state of Xinerama support to all modules as M_CONFIG_INFO.
- */
-void broadcast_xinerama_state(void)
-{
- BroadcastConfigInfoString((char *)FScreenGetConfiguration());
-
- return;
-}
-
-
/*
* Broadcasts the ignored modifiers to all modules as M_CONFIG_INFO.
*/
diff --git a/mvwm/virtual.c b/mvwm/virtual.c
index 1d3a767..350de4c 100644
--- a/mvwm/virtual.c
+++ b/mvwm/virtual.c
@@ -2061,34 +2061,25 @@ void CMD_EdgeResistance(F_CMD_ARGS)
return;
}
+/* TA: Removed; left as stubs so as not to need to worry about config file
+ * migtation just yet.
+ */
void CMD_Xinerama(F_CMD_ARGS)
{
- int toggle;
-
- toggle = ParseToggleArgument(action, NULL, -1, 0);
- if (toggle == -1)
- {
- toggle = !FScreenIsEnabled();
- }
- if (!toggle != !FScreenIsEnabled())
- {
- scr_flags.do_need_window_update = True;
- scr_flags.has_xinerama_state_changed = True;
- broadcast_xinerama_state();
- }
-
+ mvwm_msg(OLD, "CMD_Xinerama",
+ "The Xinerama command is obsolete and no longer "
+ "does anything.");
return;
}
+/* TA: Removed; left as stubs so as not to need to worry about config file
+ * migtation just yet.
+ */
void CMD_XineramaPrimaryScreen(F_CMD_ARGS)
{
- if (FScreenIsEnabled())
- {
- scr_flags.do_need_window_update = True;
- scr_flags.has_xinerama_state_changed = True;
- }
- broadcast_xinerama_state();
-
+ mvwm_msg(OLD, "CMD_XineramaPrimaryScreen",
+ "The XineramaPrimaryScreen command is obsolete and no longer "
+ "does anything.");
return;
}
commit 8425c3aac012705960c528462a9c6bd21bc0c16d
Author: Thomas Adam <tho...@fvwm.org>
Date: Sat Nov 1 19:35:10 2014 +0000
Remove FScreenConfigureModule / FScreenGetConfiguration
Modules relying on monitor-specific information will be configured locally,
and
module packets sent to modules will instead receive the monitor such events
occurred on.
---
libs/FScreen.c | 48 ---------------------------------------
libs/FScreen.h | 4 ----
modules/MvwmButtons/MvwmButtons.c | 4 ----
modules/MvwmButtons/parse.c | 5 ----
modules/MvwmIconMan/mvwm.c | 4 ----
modules/MvwmIconMan/readconfig.c | 7 ------
modules/MvwmIdent/MvwmIdent.c | 11 ---------
modules/MvwmPager/MvwmPager.c | 8 -------
mvwm/modconf.c | 8 -------
9 files changed, 99 deletions(-)
diff --git a/libs/FScreen.c b/libs/FScreen.c
index c251dc7..8ede234 100644
--- a/libs/FScreen.c
+++ b/libs/FScreen.c
@@ -249,54 +249,6 @@ init_monitor_contents(struct monitor *m)
m->virtual_scr.EdgeScrollY = DEFAULT_EDGE_SCROLL * m->coord.h / 100;
}
-/* Intended to be called by modules. Simply pass in the parameter from the
- * config string sent by mvwm. */
-void FScreenConfigureModule(char *args)
-{
-#if 0
- int n;
- char *next;
-
- n = GetIntegerArguments(args, &next, val, 4);
- if (n != 4)
- {
- /* ignore broken line */
- return;
- }
- FScreenSetPrimaryScreen(val[1]);
-
- if (val[3])
- {
- /* SLS screen coordinates follow */
- n = GetIntegerArguments(next, &next, val + 4, 1);
- if (n != 1)
- {
- /* ignore broken line */
- return;
- }
- }
-#endif
- return;
-}
-
-/* Here's the function used by mvwm to generate the string which
- * FScreenConfigureModule expects to receive back as its argument.
- */
-const char *FScreenGetConfiguration(void)
-{
- int l;
- static char msg[MAX_MODULE_INPUT_TEXT_LEN];
-
- sprintf(
- msg, XINERAMA_CONFIG_STRING" %d %d %d %d",
- FScreenIsEnabled(), 0,
- 0, 0);
- l = strlen(msg);
- sprintf(msg + l, " %d %d", 0, 0);
-
- return msg;
-}
-
/* Sets the default screen for ...ParseGeometry if no screen spec is given.
* Usually this is FSCREEN_SPEC_PRIMARY, but this won't allow modules to appear
* under the pointer. */
diff --git a/libs/FScreen.h b/libs/FScreen.h
index 8f70167..1902554 100644
--- a/libs/FScreen.h
+++ b/libs/FScreen.h
@@ -76,10 +76,6 @@ struct monitor *monitor_by_xy(int, int);
/* Control */
Bool FScreenIsEnabled(void);
void FScreenInit(Display *dpy);
-/* Intended to be called by modules. Simply pass in the parameter from the
- * config string sent by mvwm. */
-void FScreenConfigureModule(char *args);
-const char* FScreenGetConfiguration(void); /* For use by mvwm */
void FScreenSetDefaultModuleScreen(char *scr_spec);
void FScreenSetPrimaryScreen(int scr);
diff --git a/modules/MvwmButtons/MvwmButtons.c
b/modules/MvwmButtons/MvwmButtons.c
index d18dd01..6f0b29a 100644
--- a/modules/MvwmButtons/MvwmButtons.c
+++ b/modules/MvwmButtons/MvwmButtons.c
@@ -2682,10 +2682,6 @@ static void handle_config_info_packet(unsigned long
*body)
colorset = LoadColorset(tline);
change_colorset(colorset, NULL);
}
- else if (StrEquals(token, XINERAMA_CONFIG_STRING))
- {
- FScreenConfigureModule(tline);
- }
return;
}
diff --git a/modules/MvwmButtons/parse.c b/modules/MvwmButtons/parse.c
index 539b71b..7ae7749 100644
--- a/modules/MvwmButtons/parse.c
+++ b/modules/MvwmButtons/parse.c
@@ -2057,7 +2057,6 @@ void ParseConfiguration(button_info *ub)
NULL, /* filled out below */
"imagepath",
"colorset",
- XINERAMA_CONFIG_STRING,
NULL
};
@@ -2091,10 +2090,6 @@ void ParseConfiguration(button_info *ub)
/* store colorset sent by mvwm */
LoadColorset(rest);
break;
- case 3:
- /* Xinerama state */
- FScreenConfigureModule(rest);
- break;
}
GetConfigLine(fd,&s);
}
diff --git a/modules/MvwmIconMan/mvwm.c b/modules/MvwmIconMan/mvwm.c
index acc03ad..fd05042 100644
--- a/modules/MvwmIconMan/mvwm.c
+++ b/modules/MvwmIconMan/mvwm.c
@@ -247,10 +247,6 @@ static void handle_config_info(unsigned long *body)
color = LoadColorset(rest);
change_colorset(color);
}
- else if (StrEquals(token, XINERAMA_CONFIG_STRING))
- {
- FScreenConfigureModule(rest);
- }
else if (StrEquals(token, "IgnoreModifiers"))
{
sscanf(rest, "%d", &mods_unused);
diff --git a/modules/MvwmIconMan/readconfig.c b/modules/MvwmIconMan/readconfig.c
index 0d07cb1..03be250 100644
--- a/modules/MvwmIconMan/readconfig.c
+++ b/modules/MvwmIconMan/readconfig.c
@@ -842,13 +842,6 @@ static int GetConfigLineWrapper(int *fd, char **tline)
{
LoadColorset(&(*tline)[8]);
}
- else if (strncasecmp(
- *tline, XINERAMA_CONFIG_STRING,
- sizeof(XINERAMA_CONFIG_STRING) - 1) == 0)
- {
- FScreenConfigureModule(
- (*tline) + sizeof(XINERAMA_CONFIG_STRING) - 1);
- }
else if (strncasecmp(*tline, "IgnoreModifiers", 15) == 0)
{
sscanf((*tline) + 16, "%d", &mods_unused);
diff --git a/modules/MvwmIdent/MvwmIdent.c b/modules/MvwmIdent/MvwmIdent.c
index 4ce389f..c234619 100644
--- a/modules/MvwmIdent/MvwmIdent.c
+++ b/modules/MvwmIdent/MvwmIdent.c
@@ -272,13 +272,6 @@ int main(int argc, char **argv)
{
LoadColorset(&tline[8]);
}
- else if (strncasecmp(
- tline, XINERAMA_CONFIG_STRING,
- sizeof(XINERAMA_CONFIG_STRING) - 1) == 0)
- {
- FScreenConfigureModule(
- tline + sizeof(XINERAMA_CONFIG_STRING) - 1);
- }
GetConfigLine(fd, &tline);
}
@@ -559,10 +552,6 @@ void list_config_info(unsigned long *body)
&Colorset[colorset], Pdepth, gc, True);
}
}
- else if (StrEquals(token, XINERAMA_CONFIG_STRING))
- {
- FScreenConfigureModule(tline);
- }
if (token)
free(token);
}
diff --git a/modules/MvwmPager/MvwmPager.c b/modules/MvwmPager/MvwmPager.c
index d23d6e4..aab2353 100644
--- a/modules/MvwmPager/MvwmPager.c
+++ b/modules/MvwmPager/MvwmPager.c
@@ -1370,10 +1370,6 @@ void list_config_info(unsigned long *body)
color = LoadColorset(tline);
change_colorset(color);
}
- else if (StrEquals(token, XINERAMA_CONFIG_STRING))
- {
- FScreenConfigureModule(tline);
- }
else if (StrEquals(token, "DesktopName"))
{
int val;
@@ -1623,10 +1619,6 @@ void ParseOptions(void)
LoadColorset(next);
continue;
}
- else if (StrEquals(token, XINERAMA_CONFIG_STRING))
- {
- FScreenConfigureModule(next);
- }
else if (StrEquals(token, "DesktopSize"))
{
token = PeekToken(next, &next);
diff --git a/mvwm/modconf.c b/mvwm/modconf.c
index 10e87e2..61208dc 100644
--- a/mvwm/modconf.c
+++ b/mvwm/modconf.c
@@ -241,13 +241,6 @@ void CMD_DestroyModuleConfig(F_CMD_ARGS)
return;
}
-static void send_xinerama_state(fmodule *module)
-{
- SendName(module, M_CONFIG_INFO, 0, 0, 0, FScreenGetConfiguration());
-
- return;
-}
-
static void send_desktop_names(fmodule *module)
{
struct monitor *m = monitor_get_current();
@@ -374,7 +367,6 @@ void CMD_Send_ConfigInfo(F_CMD_ARGS)
/* send ImagePath and ColorLimit first */
send_image_path(mod);
send_color_limit(mod);
- send_xinerama_state(mod);
send_colorsets(mod);
send_click_time(mod);
send_move_threshold(mod);
----------------------------------------------------------------
Diffstat:
----------------------------------------------------------------
libs/FScreen.c | 48 ---------------------------------------
libs/FScreen.h | 4 ----
modules/MvwmButtons/MvwmButtons.c | 4 ----
modules/MvwmButtons/parse.c | 5 ----
modules/MvwmIconMan/mvwm.c | 4 ----
modules/MvwmIconMan/readconfig.c | 7 ------
modules/MvwmIdent/MvwmIdent.c | 11 ---------
modules/MvwmPager/MvwmPager.c | 8 -------
mvwm/modconf.c | 8 -------
mvwm/module_interface.c | 12 ----------
mvwm/virtual.c | 33 ++++++++++-----------------
11 files changed, 12 insertions(+), 132 deletions(-)
----------------------------------------------------------------
