View | Details | Raw Unified | Return to bug 227792
Collapse All | Expand All

(-)x11-wm/fluxbox/Makefile (-1 / +1 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	fluxbox
4
PORTNAME=	fluxbox
5
PORTVERSION=	1.3.7
5
PORTVERSION=	1.3.7
6
PORTREVISION=	1
6
PORTREVISION=	2
7
CATEGORIES=	x11-wm
7
CATEGORIES=	x11-wm
8
MASTER_SITES=	SF
8
MASTER_SITES=	SF
9
DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
9
DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
(-)x11-wm/fluxbox/files/patch-src_FbRootWindow.cc (+24 lines)
Line 0 Link Here
1
--- src/FbRootWindow.cc.orig	2015-02-08 10:44:45 UTC
2
+++ src/FbRootWindow.cc
3
@@ -30,7 +30,8 @@ FbRootWindow::FbRootWindow(int screen_num):
4
     m_colormap(0),
5
     m_decorationDepth(0),
6
     m_decorationVisual(0),
7
-    m_decorationColormap(0) {
8
+    m_decorationColormap(0),
9
+    m_maxDepth(depth()) {
10
 
11
     Display *disp = FbTk::App::instance()->display();
12
 
13
@@ -55,9 +56,9 @@ FbRootWindow::FbRootWindow(int screen_num):
14
 
15
         for (int i = 0; i < vinfo_nitems; i++) {
16
             if ((DefaultDepth(disp, screen_num) < vinfo_return[i].depth)
17
-                    && (static_cast<int>(depth()) < vinfo_return[i].depth)){
18
+                    && (m_maxDepth < vinfo_return[i].depth)){
19
                 m_visual = vinfo_return[i].visual;
20
-                setDepth(vinfo_return[i].depth);
21
+                m_maxDepth = vinfo_return[i].depth;
22
             }
23
 
24
             if((m_decorationDepth < vinfo_return[i].depth)
(-)x11-wm/fluxbox/files/patch-src_FbRootWindow.hh (+18 lines)
Line 0 Link Here
1
--- src/FbRootWindow.hh.orig	2015-02-08 10:44:45 UTC
2
+++ src/FbRootWindow.hh
3
@@ -41,6 +41,7 @@ class FbRootWindow: public FbTk::FbWindow { (public)
4
     int decorationDepth() const { return m_decorationDepth; }
5
     Visual *decorationVisual() const { return m_decorationVisual; }
6
     Colormap decorationColormap() const { return m_decorationColormap; }
7
+    int maxDepth() const { return m_maxDepth; }
8
 
9
 private:
10
     Visual *m_visual;
11
@@ -49,6 +50,7 @@ class FbRootWindow: public FbTk::FbWindow { (public)
12
     int m_decorationDepth;
13
     Visual *m_decorationVisual;
14
     Colormap m_decorationColormap;
15
+    int m_maxDepth;
16
 };
17
 
18
 #endif // FBROOTWINDOW_HH
(-)x11-wm/fluxbox/files/patch-src_FbWinFrame.cc (+13 lines)
Line 0 Link Here
1
--- src/FbWinFrame.cc.orig	2015-02-08 10:44:45 UTC
2
+++ src/FbWinFrame.cc
3
@@ -115,8 +115,8 @@ FbWinFrame::FbWinFrame(BScreen &screen, unsigned int c
4
     m_state(state),
5
     m_window(theme->screenNum(), state.x, state.y, state.width, state.height, s_mask, true, false,
6
         client_depth, InputOutput,
7
-        ((client_depth == 32) && (screen.rootWindow().depth() == 32) ? screen.rootWindow().visual() : CopyFromParent),
8
-        ((client_depth == 32) && (screen.rootWindow().depth() == 32) ? screen.rootWindow().colormap() : CopyFromParent)),
9
+        (client_depth == screen.rootWindow().maxDepth() ? screen.rootWindow().visual() : CopyFromParent),
10
+        (client_depth == screen.rootWindow().maxDepth() ? screen.rootWindow().colormap() : CopyFromParent)),
11
     m_layeritem(window(), *screen.layerManager().getLayer(ResourceLayer::NORMAL)),
12
     m_titlebar(m_window, 0, 0, 100, 16, s_mask, false, false, 
13
         screen.rootWindow().decorationDepth(), InputOutput,
(-)x11-wm/fluxbox/files/patch-src_Screen.cc (+11 lines)
Line 0 Link Here
1
--- src/Screen.cc.orig	2015-02-08 10:44:45 UTC
2
+++ src/Screen.cc
3
@@ -297,7 +297,7 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
4
                             "using visual 0x%lx, depth %d\n",
5
                             "informational message saying screen number (%d), visual (%lx), and colour depth (%d)").c_str(),
6
             screenNumber(), XVisualIDFromVisual(rootWindow().visual()),
7
-            rootWindow().depth());
8
+            rootWindow().maxDepth());
9
 #endif // DEBUG
10
 
11
     FbTk::EventManager *evm = FbTk::EventManager::instance();

Return to bug 227792