FvwmIconMan.patch

   1 diff -uNr fvwm-snap-20031025-org/modules/FvwmIconMan/FvwmIconMan.1 fvwm-snap-20031025/modules/FvwmIconMan/FvwmIconMan.1
   2 --- fvwm-snap-20031025-org/modules/FvwmIconMan/FvwmIconMan.1    Sat Apr 19 13:30:03 2003
   3 +++ fvwm-snap-20031025/modules/FvwmIconMan/FvwmIconMan.1        Sat Oct 25 17:00:44 2003
   4 @@ -361,9 +361,11 @@
   5  .IP "*FvwmIconMan: [id] ShowTransient \fIboolean\fP"
   6  Show transient windows in the list (default false).
   7
   8 -.IP "*FvwmIconMan: [id] ShowOnlyIcons \fIboolean\fP"
   9 -Only iconified windows are shown if \fIboolean\fP is true.
  10 -
  11 +.IP "*FvwmIconMan: [id] ShowOnlyIcons \fIvalue\fP"
  12 +If set to "false" both normal and iconified windows are shown. If "true" then
  13 +only iconified windows will get displayed, and "never" means that no iconified
  14 +windows will be shown.
  15 +
  16  .SH ACTIONS
  17  Actions are commands which may be bound to an event of the type: a key press, a
  18  mouse click, or the mouse entering a window manager button - denoted by the
  19 diff -uNr fvwm-snap-20031025-org/modules/FvwmIconMan/FvwmIconMan.h fvwm-snap-20031025/modules/FvwmIconMan/FvwmIconMan.h
  20 --- fvwm-snap-20031025-org/modules/FvwmIconMan/FvwmIconMan.h    Tue Oct 21 07:52:36 2003
  21 +++ fvwm-snap-20031025/modules/FvwmIconMan/FvwmIconMan.h        Sat Oct 25 17:01:33 2003
  22 @@ -300,7 +300,7 @@
  23         WeightedSort *weighted_sorts;
  24         int weighted_sorts_len, weighted_sorts_size;
  25         char *AnimCommand;
  26 -       Uchar showonlyiconic;
  27 +       int showonlyiconic;
  28         Uchar showtransient;
  29         rectangle managed_g;    /* dimensions of managed screen portion */
  30
  31 diff -uNr fvwm-snap-20031025-org/modules/FvwmIconMan/readconfig.c fvwm-snap-20031025/modules/FvwmIconMan/readconfig.c
  32 --- fvwm-snap-20031025-org/modules/FvwmIconMan/readconfig.c     Sat Jul  5 13:30:03 2003
  33 +++ fvwm-snap-20031025/modules/FvwmIconMan/readconfig.c Sat Oct 25 17:16:56 2003
  34 @@ -1497,11 +1497,14 @@
  35          ConsoleMessage("Need argument to showonlyicons\n");
  36          continue;
  37         }
  38 -       if (!strcasecmp(p, "true")) {
  39 +       if (!strcasecmp (p, "false")) {
  40 +        i = 0;
  41 +       }
  42 +       else if (!strcasecmp (p, "true")) {
  43          i = 1;
  44         }
  45 -       else if (!strcasecmp(p, "false")) {
  46 -        i = 0;
  47 +       else if (!strcasecmp (p, "never")) {
  48 +        i = 2;
  49         }
  50         else {
  51          ConsoleMessage("Bad line: %s\n", current_line);
  52 diff -uNr fvwm-snap-20031025-org/modules/FvwmIconMan/xmanager.c fvwm-snap-20031025/modules/FvwmIconMan/xmanager.c
  53 --- fvwm-snap-20031025-org/modules/FvwmIconMan/xmanager.c       Tue Oct 21 07:52:36 2003
  54 +++ fvwm-snap-20031025/modules/FvwmIconMan/xmanager.c   Sat Oct 25 17:30:57 2003
  55 @@ -1476,11 +1476,15 @@
  56
  57    if (win->manager && win->complete) {
  58      is_state_selected =
  59 -           ((!win->manager->showonlyiconic || win->iconified) &&
  60 -            (win->manager->showtransient || !IS_TRANSIENT(win)));
  61 +           (((!win->iconified&&(win->manager->showonlyiconic==2))||
  62 +           (win->manager->showonlyiconic==0)||
  63 +           ((win->iconified&&(win->manager->showonlyiconic==1))
  64 +               ))&&
  65 +                (win->manager->showtransient || !IS_TRANSIENT(win)));
  66      in_viewport = win_in_viewport(win);
  67      if (win->manager->usewinlist && DO_SKIP_WINDOW_LIST(win))
  68        in_viewport = 0;
  69 +      in_viewport = win_in_viewport(win);
  70      if (win->button == NULL && in_viewport && is_state_selected) {
  71        insert_windows_button(win);
  72        if (win->manager->window_up == 0 && globals.got_window_list)