aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-10-22 14:45:01 (GMT)
committerfluxgen <fluxgen>2002-10-22 14:45:01 (GMT)
commitfc14d38de2d6db3c90d9fc34cc6677702de27790 (patch)
treed7e4da8474eec72b41dbe39de2a8a9d3dce78c20 /src
parent20de37981c944d20057dfc70ccc446464e64d64f (diff)
downloadfluxbox_paul-fc14d38de2d6db3c90d9fc34cc6677702de27790.zip
fluxbox_paul-fc14d38de2d6db3c90d9fc34cc6677702de27790.tar.bz2
no need to have antialias if it isn't compiled with use_xft
Diffstat (limited to 'src')
-rw-r--r--src/Configmenu.cc17
1 files changed, 14 insertions, 3 deletions
diff --git a/src/Configmenu.cc b/src/Configmenu.cc
index 2fed074..f39ee04 100644
--- a/src/Configmenu.cc
+++ b/src/Configmenu.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Configmenu.cc,v 1.18 2002/10/15 10:57:28 fluxgen Exp $ 25// $Id: Configmenu.cc,v 1.19 2002/10/22 14:45:01 fluxgen Exp $
26 26
27#include "Configmenu.hh" 27#include "Configmenu.hh"
28 28
@@ -32,6 +32,10 @@
32#include "Screen.hh" 32#include "Screen.hh"
33#include "Tab.hh" 33#include "Tab.hh"
34 34
35#ifdef HAVE_CONFIG_H
36#include "config.h"
37#endif // HAVE_CONFIG_H
38
35enum {CMENU_USE_TABS=9, CMENU_USE_ICONS, CMENU_SLOPPY_WIN_GROUP, 39enum {CMENU_USE_TABS=9, CMENU_USE_ICONS, CMENU_SLOPPY_WIN_GROUP,
36 CMENU_DESKTOP_WHEELING, CMENU_WORKSPACE_WARPING, CMENU_ANTIALIAS, CMENU_TAB_ROTATE=21}; 40 CMENU_DESKTOP_WHEELING, CMENU_WORKSPACE_WARPING, CMENU_ANTIALIAS, CMENU_TAB_ROTATE=21};
37 41
@@ -92,8 +96,11 @@ m_tabmenu(scr) {
92 insert(i18n->getMessage( 96 insert(i18n->getMessage(
93 ConfigmenuSet, ConfigmenuDesktopWheeling, 97 ConfigmenuSet, ConfigmenuDesktopWheeling,
94 "Desktop MouseWheel Switching"), CMENU_DESKTOP_WHEELING); 98 "Desktop MouseWheel Switching"), CMENU_DESKTOP_WHEELING);
95 //TODO: really need i18n for this? 99
100 //TODO: do we really need i18n support for this?
101#ifdef USE_XFT
96 insert("Antialias", CMENU_ANTIALIAS); 102 insert("Antialias", CMENU_ANTIALIAS);
103#endif // USE_XFT
97 104
98 update(); 105 update();
99 setItemSelected(8, screen()->doMaxOverSlit()); 106 setItemSelected(8, screen()->doMaxOverSlit());
@@ -108,7 +115,9 @@ m_tabmenu(scr) {
108 setItemSelected(CMENU_SLOPPY_WIN_GROUP, screen()->isSloppyWindowGrouping()); 115 setItemSelected(CMENU_SLOPPY_WIN_GROUP, screen()->isSloppyWindowGrouping());
109 setItemSelected(CMENU_WORKSPACE_WARPING, screen()->isWorkspaceWarping()); 116 setItemSelected(CMENU_WORKSPACE_WARPING, screen()->isWorkspaceWarping());
110 setItemSelected(CMENU_DESKTOP_WHEELING, screen()->isDesktopWheeling()); 117 setItemSelected(CMENU_DESKTOP_WHEELING, screen()->isDesktopWheeling());
118#ifdef USE_XFT
111 setItemSelected(CMENU_ANTIALIAS, screen()->antialias()); 119 setItemSelected(CMENU_ANTIALIAS, screen()->antialias());
120#endif // USE_XFT
112} 121}
113 122
114 123
@@ -197,11 +206,13 @@ void Configmenu::itemSelected(int button, unsigned int index) {
197 screen()->reconfigure(); 206 screen()->reconfigure();
198 } 207 }
199 break; 208 break;
209#ifdef USE_XFT
200 case CMENU_ANTIALIAS: 210 case CMENU_ANTIALIAS:
201 // Note: no need to reconfigure here, screen reconfigures if antialias changes 211 // Note: no need to reconfigure here, screen reconfigures if antialias changes
202 screen()->setAntialias(!screen()->antialias()); 212 screen()->setAntialias(!screen()->antialias());
203 setItemSelected(index, screen()->antialias()); 213 setItemSelected(index, screen()->antialias());
204 break; 214 break;
215#endif // USE_XFT
205 } 216 }
206 //save resources 217 //save resources
207 Fluxbox::instance()->save_rc(); 218 Fluxbox::instance()->save_rc();