summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'x11-wm/fvwm/files/fvwm-iconman.diff')
-rw-r--r--x11-wm/fvwm/files/fvwm-iconman.diff55
1 files changed, 55 insertions, 0 deletions
diff --git a/x11-wm/fvwm/files/fvwm-iconman.diff b/x11-wm/fvwm/files/fvwm-iconman.diff
new file mode 100644
index 000000000000..150176222c25
--- /dev/null
+++ b/x11-wm/fvwm/files/fvwm-iconman.diff
@@ -0,0 +1,55 @@
+diff -pru fvwm/modules/FvwmIconMan/FvwmIconMan.h fvwm.new/modules/FvwmIconMan/FvwmIconMan.h
+--- fvwm/modules/FvwmIconMan/FvwmIconMan.h 2003-04-26 19:37:06.000000000 +0200
++++ fvwm.new/modules/FvwmIconMan/FvwmIconMan.h 2003-05-20 11:46:26.000000000 +0200
+@@ -313,7 +313,7 @@ typedef struct win_manager {
+ WeightedSort *weighted_sorts;
+ int weighted_sorts_len, weighted_sorts_size;
+ char *AnimCommand;
+- Uchar showonlyiconic;
++ int showonlyiconic;
+ Uchar showtransient;
+ rectangle managed_g; /* dimensions of managed screen portion */
+
+Tylko w fvwm.new/modules/FvwmIconMan: FvwmIconMan.h~
+diff -pru fvwm/modules/FvwmIconMan/readconfig.c fvwm.new/modules/FvwmIconMan/readconfig.c
+--- fvwm/modules/FvwmIconMan/readconfig.c 2003-04-26 19:37:18.000000000 +0200
++++ fvwm.new/modules/FvwmIconMan/readconfig.c 2003-05-20 11:48:41.000000000 +0200
+@@ -1572,11 +1572,14 @@ void read_in_resources()
+ ConsoleMessage("Need argument to showonlyicons\n");
+ continue;
+ }
+- if (!strcasecmp(p, "true")) {
++ if (!strcasecmp (p, "false")) {
++ i = 0;
++ }
++ else if (!strcasecmp (p, "true")) {
+ i = 1;
+ }
+- else if (!strcasecmp(p, "false")) {
+- i = 0;
++ else if (!strcasecmp (p, "never")) {
++ i = 2;
+ }
+ else {
+ ConsoleMessage("Bad line: %s\n", current_line);
+Tylko w fvwm.new/modules/FvwmIconMan: readconfig.c~
+diff -pru fvwm/modules/FvwmIconMan/xmanager.c fvwm.new/modules/FvwmIconMan/xmanager.c
+--- fvwm/modules/FvwmIconMan/xmanager.c 2003-04-26 19:37:23.000000000 +0200
++++ fvwm.new/modules/FvwmIconMan/xmanager.c 2003-05-20 11:49:39.000000000 +0200
+@@ -1415,9 +1415,12 @@ void check_in_window(WinData *win)
+
+ if (win->manager && win->complete) {
+ is_state_selected =
+- ((!win->manager->showonlyiconic || win->iconified) &&
+- (win->manager->showtransient || !IS_TRANSIENT(win)));
+- in_viewport = win_in_viewport(win);
++ (((!win->iconified&&(win->manager->showonlyiconic==2))||
++ (win->manager->showonlyiconic==0)||
++ ((win->iconified&&(win->manager->showonlyiconic==1))
++ ))&&
++ (win->manager->showtransient || !IS_TRANSIENT(win)));
++ in_viewport = win_in_viewport(win);
+ if (win->manager->usewinlist && DO_SKIP_WINDOW_LIST(win))
+ in_viewport = 0;
+ if (win->button == NULL && in_viewport && is_state_selected) {
+Tylko w fvwm.new/modules/FvwmIconMan: xmanager.c~