bugfix: consistent use of 'int' for alpha values (#3187373)

WindowMenuAccessor returned strange alpha values if compiled
with 'g++ -Os'; unholy black magic happens if template<int> faces
functions returning only 'usigned char'.

7 files changed, 20 insertions, 20 deletions

diff --git a/src/FbTk/Container.cc b/src/FbTk/Container.cc
index e1d2e07..b944c98 100644
--- a/src/FbTk/Container.cc
+++ b/src/FbTk/Container.cc
@@ -440,7 +440,7 @@ void Container::for_each(std::mem_fun_t<void, FbWindow> function) {
     std::for_each(begin(), end(), function);
 }
 
-void Container::setAlpha(unsigned char alpha) {
+void Container::setAlpha(int alpha) {
     FbWindow::setAlpha(alpha);
     STLUtil::forAll(m_item_list, std::bind2nd(std::mem_fun(&Button::setAlpha), alpha));
 }
diff --git a/src/FbTk/Container.hh b/src/FbTk/Container.hh
index bd5e3aa..f3d9bac 100644
--- a/src/FbTk/Container.hh
+++ b/src/FbTk/Container.hh
@@ -91,7 +91,7 @@ public:
     bool updateLock() const { return m_update_lock; }
 
     void for_each(std::mem_fun_t<void, FbWindow> function);
-    void setAlpha(unsigned char alpha); // set alpha on all windows
+    void setAlpha(int alpha); // set alpha on all windows
 
     ItemList::iterator begin() { return m_item_list.begin(); }
     ItemList::iterator end() { return m_item_list.end(); }
diff --git a/src/FbTk/FbWindow.cc b/src/FbTk/FbWindow.cc
index 5b52a03..00dde66 100644
--- a/src/FbTk/FbWindow.cc
+++ b/src/FbTk/FbWindow.cc
@@ -171,7 +171,7 @@ void FbWindow::invalidateBackground() {
 
 void FbWindow::updateBackground(bool only_if_alpha) {
     Pixmap newbg = m_lastbg_pm;
-    unsigned char alpha = 255;
+    int alpha = 255;
     bool free_newbg = false;
 
     if (m_lastbg_pm == None && !m_lastbg_color_set)
@@ -344,7 +344,7 @@ void FbWindow::updateTransparent(int the_x, int the_y, unsigned int the_width, u
 #endif // HAVE_XRENDER
 }
 
-void FbWindow::setAlpha(unsigned char alpha) {
+void FbWindow::setAlpha(int alpha) {
 #ifdef HAVE_XRENDER
     if (FbTk::Transparent::haveComposite()) {
         if (m_transparent.get() != 0) {
@@ -371,7 +371,7 @@ void FbWindow::setAlpha(unsigned char alpha) {
 #endif // HAVE_XRENDER
 }
 
-unsigned char FbWindow::alpha() const {
+int FbWindow::alpha() const {
 #ifdef HAVE_XRENDER
     if (m_transparent.get())
         return m_transparent->alpha();
@@ -588,7 +588,7 @@ long FbWindow::eventMask() const {
 
 }
 
-void FbWindow::setOpaque(unsigned char alpha) {
+void FbWindow::setOpaque(int alpha) {
 #ifdef HAVE_XRENDER
     static Atom m_alphaatom = XInternAtom(display(), "_NET_WM_WINDOW_OPACITY", False);
     unsigned long opacity = alpha * 0x1010101;
diff --git a/src/FbTk/FbWindow.hh b/src/FbTk/FbWindow.hh
index edeffe1..9e92923 100644
--- a/src/FbTk/FbWindow.hh
+++ b/src/FbTk/FbWindow.hh
@@ -88,7 +88,7 @@ public:
                            unsigned int height = 0, Pixmap dest_override = None,
                            bool override_is_offset = false);
 
-    void setAlpha(unsigned char alpha);
+    void setAlpha(int alpha);
 
     virtual FbWindow &operator = (const FbWindow &win);
     /// assign a new X window to this
@@ -176,7 +176,7 @@ public:
     unsigned int borderWidth() const { return m_border_width; }
     unsigned long borderColor() const { return m_border_color; }
     unsigned int depth() const { return m_depth; }
-    unsigned char alpha() const;
+    int alpha() const;
     int screenNumber() const;
     long eventMask() const;
 
@@ -188,7 +188,7 @@ public:
     bool operator != (const FbWindow &win) const { return m_window != win.m_window; }
 
     // used for composite
-    void setOpaque(unsigned char alpha);
+    void setOpaque(int alpha);
 
     void setRenderer(FbWindowRenderer &renderer) { m_renderer = &renderer; }
     void sendConfigureNotify(int x, int y, unsigned int width,
diff --git a/src/FbTk/MenuTheme.hh b/src/FbTk/MenuTheme.hh
index c10615b..eb19798 100644
--- a/src/FbTk/MenuTheme.hh
+++ b/src/FbTk/MenuTheme.hh
@@ -107,7 +107,7 @@ public:
     unsigned int bevelWidth() const { return *m_bevel_width; }
 
     unsigned char alpha() const { return m_alpha; }
-    void setAlpha(unsigned char alpha) { m_alpha = alpha; }
+    void setAlpha(int alpha) { m_alpha = alpha; }
     // this isn't actually a theme item
     // but we'll let it be here for now, until there's a better way to
     // get resources into menu
@@ -154,7 +154,7 @@ private:
     Display *m_display;
     GContext t_text_gc, f_text_gc, u_text_gc, h_text_gc, d_text_gc, hilite_gc;
 
-    unsigned char m_alpha;
+    int m_alpha;
     unsigned int m_delay; ///< in msec
     unsigned int m_real_title_height; ///< the calculated item height (from font and menu.titleHeight)
     unsigned int m_real_item_height; ///< the calculated item height (from font and menu.itemHeight)
diff --git a/src/FbTk/Transparent.cc b/src/FbTk/Transparent.cc
index bf8a110..04fee67 100644
--- a/src/FbTk/Transparent.cc
+++ b/src/FbTk/Transparent.cc
@@ -43,7 +43,7 @@ using std::endl;
 
 namespace {
 #ifdef HAVE_XRENDER
-Picture createAlphaPic(Window drawable, unsigned char alpha) {
+Picture createAlphaPic(Window drawable, int alpha) {
     Display *disp = FbTk::App::instance()->display();
     _FB_USES_NLS;
 
@@ -149,7 +149,7 @@ bool Transparent::haveComposite(bool for_real) {
         return s_use_composite;
 }
 
-Transparent::Transparent(Drawable src, Drawable dest, unsigned char alpha, int screen_num):
+Transparent::Transparent(Drawable src, Drawable dest, int alpha, int screen_num):
     m_alpha_pic(0), m_src_pic(0), m_dest_pic(0),
     m_source(src), m_dest(dest), m_alpha(alpha) {
 
@@ -196,7 +196,7 @@ Transparent::~Transparent() {
 #endif // HAVE_XRENDER
 }
 
-void Transparent::setAlpha(unsigned char alpha) {
+void Transparent::setAlpha(int alpha) {
     if (m_source == 0 || !s_render)
         return;
 
@@ -254,7 +254,7 @@ void Transparent::setSource(Drawable source, int screen_num) {
         return;
     // save old alpha value so we can recreate new later
     // with the same value
-    unsigned char old_alpha = m_alpha;
+    int old_alpha = m_alpha;
     if (m_alpha_pic != 0)
         freeAlpha();
 
@@ -314,7 +314,7 @@ void Transparent::render(int src_x, int src_y,
 #endif // HAVE_XRENDER
 }
 
-void Transparent::allocAlpha(unsigned char alpha) {
+void Transparent::allocAlpha(int alpha) {
 #ifdef HAVE_XRENDER
     if (m_source == 0 || !s_render)
         return;
diff --git a/src/FbTk/Transparent.hh b/src/FbTk/Transparent.hh
index 154c223..8e9d9b9 100644
--- a/src/FbTk/Transparent.hh
+++ b/src/FbTk/Transparent.hh
@@ -29,10 +29,10 @@ namespace FbTk {
 /// renders to drawable together with an alpha mask
 class Transparent {
 public:
-    Transparent(Drawable source, Drawable dest, unsigned char alpha, int screen_num);
+    Transparent(Drawable source, Drawable dest, int alpha, int screen_num);
     ~Transparent();
     /// sets alpha value
-    void setAlpha(unsigned char alpha);
+    void setAlpha(int alpha);
     /// sets source drawable
     void setSource(Drawable src, int screen_num);
     /// sets destination drawable
@@ -45,7 +45,7 @@ public:
                 int dest_x, int dest_y,
                 unsigned int width, unsigned int height) const;
 
-    unsigned char alpha() const { return m_alpha; }
+    int alpha() const { return m_alpha; }
     Drawable dest() const { return m_dest; }
     Drawable source() const { return m_source; }
 
@@ -55,7 +55,7 @@ public:
 
 private:
     void freeAlpha();
-    void allocAlpha(unsigned char newval);
+    void allocAlpha(int newval);
     unsigned long m_alpha_pic;
     unsigned long m_src_pic;
     unsigned long m_dest_pic;