openbox/trunk/debian-887908.patch

   1 Description: Fix toggled hover and pressed images masks not loaded
   2 Author: "E. Serradilla" <eserradi@gmx.com>
   3 Debian-Bugs: https://bugs.debian.org/887908
   4
   5 --- a/obrender/theme.c
   6 +++ b/obrender/theme.c
   7 @@ -1494,8 +1494,10 @@ static void read_button_styles(XrmDataba
   8      READ_BUTTON_MASK_COPY(disabled, btn->unpressed_mask);
   9      READ_BUTTON_MASK_COPY(hover, btn->unpressed_mask);
  10      if (toggled_mask) {
  11 -        READ_BUTTON_MASK_COPY(pressed_toggled, btn->unpressed_toggled_mask);
  12 -        READ_BUTTON_MASK_COPY(hover_toggled, btn->unpressed_toggled_mask);
  13 +        g_snprintf(name, 128, "%s_toggled_pressed.xbm", btnname);
  14 +        READ_MASK_COPY(name, btn->pressed_toggled_mask, btn->unpressed_toggled_mask);
  15 +        g_snprintf(name, 128, "%s_toggled_hover.xbm", btnname);
  16 +        READ_MASK_COPY(name, btn->hover_toggled_mask, btn->unpressed_toggled_mask);
  17      }
  18
  19  #define READ_BUTTON_APPEARANCE(typedots, type, fallback) \
  20 @@ -1532,8 +1534,8 @@ static void read_button_styles(XrmDataba
  21      READ_BUTTON_APPEARANCE("disabled", disabled, 0);
  22      READ_BUTTON_APPEARANCE("hover", hover, 0);
  23      if (toggled_mask) {
  24 -        READ_BUTTON_APPEARANCE("unpressed.toggled", unpressed_toggled, 1);
  25 -        READ_BUTTON_APPEARANCE("pressed.toggled", pressed_toggled, 0);
  26 -        READ_BUTTON_APPEARANCE("hover.toggled", hover_toggled, 0);
  27 +        READ_BUTTON_APPEARANCE("toggled.unpressed", unpressed_toggled, 1);
  28 +        READ_BUTTON_APPEARANCE("toggled.pressed", pressed_toggled, 0);
  29 +        READ_BUTTON_APPEARANCE("toggled.hover", hover_toggled, 0);
  30      }
  31  }