FvwmIconMan.patch

   1 # FvwmIconMan.patch
   2 # This patch adds one option to FvwmIconMan:
   3 # FvwmIconMan [id]: ShowOnlyIcons Never
   4 # If this option is set, FvwmIconMan doesn't display iconified windows
   5 # This patch was created by Grzegorz Niewêg³owski (\hoppke)
   6 # for FVWM - Crystal project
   7
   8 # If you want to apply this patch, copy it to your FVWM source directory
   9 # and execute command below:
  10 # $ patch -p1 < FvwmIconMan.patch
  11 # Then recompile and reinstall your FVWM package
  12
  13 diff -pruN fvwm/modules/FvwmIconMan/FvwmIconMan.1 fvwm-m/modules/FvwmIconMan/FvwmIconMan.1
  14 --- fvwm/modules/FvwmIconMan/FvwmIconMan.1      2002-10-16 15:15:20.000000000 +0200
  15 +++ fvwm-m/modules/FvwmIconMan/FvwmIconMan.1    2003-03-13 15:57:55.000000000 +0100
  16 @@ -361,8 +361,10 @@ handled by this manager.
  17  .IP "*FvwmIconMan: [id] ShowTransient \fIboolean\fP"
  18  Show transient windows in the list (default false).
  19
  20 -.IP "*FvwmIconMan: [id] ShowOnlyIcons \fIboolean\fP"
  21 -Only iconified windows are shown if \fIboolean\fP is true.
  22 +.IP "*FvwmIconMan: [id] ShowOnlyIcons \fIvalue\fP"
  23 +If set to "false" both normal and iconified windows are shown. If "true" then
  24 +only iconified windows will get displayed, and "never" means that no iconified
  25 +windows will be shown.
  26
  27  .SH ACTIONS
  28  Actions are commands which may be bound to an event of the type: a key press, a
  29 diff -pruN fvwm/modules/FvwmIconMan/FvwmIconMan.h fvwm-m/modules/FvwmIconMan/FvwmIconMan.h
  30 --- fvwm/modules/FvwmIconMan/FvwmIconMan.h      2003-03-03 09:42:42.000000000 +0100
  31 +++ fvwm-m/modules/FvwmIconMan/FvwmIconMan.h    2003-03-13 15:52:53.000000000 +0100
  32 @@ -315,7 +315,7 @@ typedef struct win_manager {
  33    WeightedSort *weighted_sorts;
  34    int weighted_sorts_len, weighted_sorts_size;
  35    char *AnimCommand;
  36 -  Uchar showonlyiconic;
  37 +  int showonlyiconic;
  38    Uchar showtransient;
  39    rectangle managed_g;    /* dimensions of managed screen portion */
  40
  41 diff -pruN fvwm/modules/FvwmIconMan/readconfig.c fvwm-m/modules/FvwmIconMan/readconfig.c
  42 --- fvwm/modules/FvwmIconMan/readconfig.c       2003-01-24 15:30:17.000000000 +0100
  43 +++ fvwm-m/modules/FvwmIconMan/readconfig.c     2003-03-13 15:52:54.000000000 +0100
  44 @@ -1466,11 +1466,14 @@ void read_in_resources (char *file)
  45          ConsoleMessage ("Need argument to showonlyicons\n");
  46          continue;
  47         }
  48 -       if (!strcasecmp (p, "true")) {
  49 +       if (!strcasecmp (p, "false")) {
  50 +        i = 0;
  51 +       }
  52 +          else if (!strcasecmp (p, "true")) {
  53          i = 1;
  54         }
  55 -       else if (!strcasecmp (p, "false")) {
  56 -        i = 0;
  57 +       else if (!strcasecmp (p, "never")) {
  58 +        i = 2;
  59         }
  60         else {
  61          ConsoleMessage ("Bad line: %s\n", current_line);
  62 diff -pruN fvwm/modules/FvwmIconMan/xmanager.c fvwm-m/modules/FvwmIconMan/xmanager.c
  63 --- fvwm/modules/FvwmIconMan/xmanager.c 2003-03-03 09:42:42.000000000 +0100
  64 +++ fvwm-m/modules/FvwmIconMan/xmanager.c       2003-03-13 15:52:54.000000000 +0100
  65 @@ -1415,8 +1415,11 @@ void check_in_window (WinData *win)
  66
  67    if (win->manager && win->complete) {
  68      is_state_selected =
  69 -           ((!win->manager->showonlyiconic || win->iconified) &&
  70 -            (win->manager->showtransient || !IS_TRANSIENT(win)));
  71 +           (((!win->iconified&&(win->manager->showonlyiconic==2))||
  72 +           (win->manager->showonlyiconic==0)||
  73 +           ((win->iconified&&(win->manager->showonlyiconic==1))
  74 +               ))&&
  75 +                (win->manager->showtransient || !IS_TRANSIENT(win)));
  76      in_viewport = win_in_viewport (win);
  77      if (win->manager->usewinlist && DO_SKIP_WINDOW_LIST(win))
  78        in_viewport = 0;