xfwm4-hover-inactive/hover-inactive.patch

   1 diff -r 6ae1e81f12d7 src/client.c
   2 --- a/src/client.c      Tue Dec 20 20:30:57 2011 +0100
   3 +++ b/src/client.c      Tue Dec 20 20:41:38 2011 +0100
   4 @@ -3795,6 +3795,12 @@
   5  int
   6  clientGetButtonState (Client *c, int button, int state)
   7  {
   8 +    if ((c->button_status[button] == BUTTON_STATE_PRELIGHT) &&
   9 +         clientGetButtonPixmap (c, button, PRELIGHT))
  10 +    {
  11 +        return (PRELIGHT);
  12 +    }
  13 +
  14      if (state == INACTIVE)
  15      {
  16          return (state);
  17 @@ -3806,12 +3812,6 @@
  18          return (PRESSED);
  19      }
  20
  21 -    if ((c->button_status[button] == BUTTON_STATE_PRELIGHT) &&
  22 -        clientGetButtonPixmap (c, button, PRELIGHT))
  23 -    {
  24 -        return (PRELIGHT);
  25 -    }
  26 -
  27      return (ACTIVE);
  28  }
  29
  30 diff -r 6ae1e81f12d7 src/events.c
  31 --- a/src/events.c      Tue Dec 20 20:30:57 2011 +0100
  32 +++ b/src/events.c      Tue Dec 20 20:41:38 2011 +0100
  33 @@ -1380,23 +1380,20 @@
  34                  clientClearDelayedFocus ();
  35              }
  36          }
  37 -        if (c == clientGetFocus ())
  38 +        for (b = 0; b < BUTTON_COUNT; b++)
  39          {
  40 -            for (b = 0; b < BUTTON_COUNT; b++)
  41 +            if (MYWINDOW_XWINDOW(c->buttons[b]) == ev->window)
  42              {
  43 -                if (MYWINDOW_XWINDOW(c->buttons[b]) == ev->window)
  44 +                if (!xfwmPixmapNone(clientGetButtonPixmap(c, b, PRELIGHT)))
  45                  {
  46 -                    if (!xfwmPixmapNone(clientGetButtonPixmap(c, b, PRELIGHT)))
  47 -                    {
  48 -                        c->button_status[b] = BUTTON_STATE_PRELIGHT;
  49 -                        need_redraw = TRUE;
  50 -                    }
  51 +                    c->button_status[b] = BUTTON_STATE_PRELIGHT;
  52 +                    need_redraw = TRUE;
  53                  }
  54              }
  55 -            if (need_redraw)
  56 -            {
  57 -                frameQueueDraw (c, FALSE);
  58 -            }
  59 +        }
  60 +        if (need_redraw)
  61 +        {
  62 +            frameQueueDraw (c, FALSE);
  63          }
  64
  65          /* No need to process the event any further */