-// Configmenu.cc for Openbox
-// Copyright (c) 2001 Sean 'Shaleh' Perry <shaleh@debian.org>
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
+// Configmenu.cc for Blackbox - An X11 Window Manager
+// Copyright (c) 2001 - 2002 Sean 'Shaleh' Perry <shaleh@debian.org>
// Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
//
// Permission is hereby granted, free of charge, to any person obtaining a
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
-// stupid macros needed to access some functions in version 2 of the GNU C
-// library
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE
-#endif // _GNU_SOURCE
-
#ifdef HAVE_CONFIG_H
# include "../config.h"
#endif // HAVE_CONFIG_H
-#include "i18n.h"
-#include "Configmenu.h"
-#include "Toolbar.h"
-#include "Window.h"
-#include "Screen.h"
+#include "i18n.hh"
+#include "Configmenu.hh"
+#include "Image.hh"
+#include "Toolbar.hh"
+#include "Window.hh"
+#include "Screen.hh"
-Configmenu::Configmenu(BScreen &scr) : Basemenu(scr), screen(scr)
-{
- setLabel(i18n->getMessage(ConfigmenuSet, ConfigmenuConfigOptions,
- "Config options"));
+Configmenu::Configmenu(BScreen *scr) : Basemenu(scr) {
+ setLabel(i18n(ConfigmenuSet, ConfigmenuConfigOptions, "Config options"));
setInternalMenu();
focusmenu = new Focusmenu(this);
placementmenu = new Placementmenu(this);
- insert(i18n->getMessage(ConfigmenuSet, ConfigmenuFocusModel,
- "Focus Model"), focusmenu);
- insert(i18n->getMessage(ConfigmenuSet, ConfigmenuWindowPlacement,
- "Window Placement"), placementmenu);
- insert(i18n->getMessage(ConfigmenuSet, ConfigmenuImageDithering,
- "Image Dithering"), 1);
- insert(i18n->getMessage(ConfigmenuSet, ConfigmenuOpaqueMove,
- "Opaque Window Moving"), 2);
- insert(i18n->getMessage(ConfigmenuSet, ConfigmenuFullMax,
- "Full Maximization"), 3);
- insert(i18n->getMessage(ConfigmenuSet, ConfigmenuFocusNew,
- "Focus New Windows"), 4);
- insert(i18n->getMessage(ConfigmenuSet, ConfigmenuFocusLast,
- "Focus Last Window on Workspace"), 5);
- insert(i18n->getMessage(ConfigmenuSet, ConfigmenuHideToolbar,
- "Hide toolbar"), 6);
+ insert(i18n(ConfigmenuSet, ConfigmenuFocusModel,
+ "Focus Model"), focusmenu);
+ insert(i18n(ConfigmenuSet, ConfigmenuWindowPlacement,
+ "Window Placement"), placementmenu);
+ insert(i18n(ConfigmenuSet, ConfigmenuImageDithering,
+ "Image Dithering"), 1);
+ insert(i18n(ConfigmenuSet, ConfigmenuOpaqueMove,
+ "Opaque Window Moving"), 2);
+ insert(i18n(ConfigmenuSet, ConfigmenuFullMax,
+ "Full Maximization"), 3);
+ insert(i18n(ConfigmenuSet, ConfigmenuFocusNew,
+ "Focus New Windows"), 4);
+ insert(i18n(ConfigmenuSet, ConfigmenuFocusLast,
+ "Focus Last Window on Workspace"), 5);
update();
- setValues();
-}
-
-void Configmenu::setValues() {
- setItemSelected(2, screen.getImageControl()->doDither());
- setItemSelected(3, screen.opaqueMove());
- setItemSelected(4, screen.fullMax());
- setItemSelected(5, screen.focusNew());
- setItemSelected(6, screen.focusLast());
- setItemSelected(7, screen.hideToolbar());
+ setItemSelected(2, getScreen()->getImageControl()->doDither());
+ setItemSelected(3, getScreen()->doOpaqueMove());
+ setItemSelected(4, getScreen()->doFullMax());
+ setItemSelected(5, getScreen()->doFocusNew());
+ setItemSelected(6, getScreen()->doFocusLast());
}
-Configmenu::~Configmenu() {
+Configmenu::~Configmenu(void) {
delete focusmenu;
delete placementmenu;
}
-void Configmenu::itemSelected(int button, int index) {
+void Configmenu::itemSelected(int button, unsigned int index) {
if (button != 1)
return;
switch(item->function()) {
case 1: { // dither
- screen.setImageDither(!screen.getImageControl()->doDither());
+ getScreen()->getImageControl()->
+ setDither((! getScreen()->getImageControl()->doDither()));
- setItemSelected(index, screen.getImageControl()->doDither());
+ setItemSelected(index, getScreen()->getImageControl()->doDither());
break;
}
case 2: { // opaque move
- screen.setOpaqueMove(!screen.opaqueMove());
+ getScreen()->saveOpaqueMove((! getScreen()->doOpaqueMove()));
- setItemSelected(index, screen.opaqueMove());
+ setItemSelected(index, getScreen()->doOpaqueMove());
break;
}
case 3: { // full maximization
- screen.setFullMax(!screen.fullMax());
+ getScreen()->saveFullMax((! getScreen()->doFullMax()));
- setItemSelected(index, screen.fullMax());
+ setItemSelected(index, getScreen()->doFullMax());
break;
}
case 4: { // focus new windows
- screen.setFocusNew(!screen.focusNew());
+ getScreen()->saveFocusNew((! getScreen()->doFocusNew()));
- setItemSelected(index, screen.focusNew());
+ setItemSelected(index, getScreen()->doFocusNew());
break;
}
case 5: { // focus last window on workspace
- screen.setFocusLast(!screen.focusLast());
- setItemSelected(index, screen.focusLast());
- break;
- }
- case 6:{ //toggle toolbar hide
- screen.setHideToolbar(!screen.hideToolbar());
- setItemSelected(index, screen.hideToolbar());
+ getScreen()->saveFocusLast((! getScreen()->doFocusLast()));
+ setItemSelected(index, getScreen()->doFocusLast());
break;
}
} // switch
}
-void Configmenu::reconfigure() {
- setValues();
+
+void Configmenu::reconfigure(void) {
focusmenu->reconfigure();
placementmenu->reconfigure();
Basemenu::reconfigure();
}
-Configmenu::Focusmenu::Focusmenu(Configmenu *cm) : Basemenu(cm->screen) {
- configmenu = cm;
- setLabel(i18n->getMessage(ConfigmenuSet, ConfigmenuFocusModel,
- "Focus Model"));
+Configmenu::Focusmenu::Focusmenu(Configmenu *cm) : Basemenu(cm->getScreen()) {
+ setLabel(i18n(ConfigmenuSet, ConfigmenuFocusModel, "Focus Model"));
setInternalMenu();
- insert(i18n->getMessage(ConfigmenuSet, ConfigmenuClickToFocus,
- "Click To Focus"), 1);
- insert(i18n->getMessage(ConfigmenuSet, ConfigmenuSloppyFocus,
- "Sloppy Focus"), 2);
- insert(i18n->getMessage(ConfigmenuSet, ConfigmenuAutoRaise,
- "Auto Raise"), 3);
+ insert(i18n(ConfigmenuSet, ConfigmenuClickToFocus, "Click To Focus"), 1);
+ insert(i18n(ConfigmenuSet, ConfigmenuSloppyFocus, "Sloppy Focus"), 2);
+ insert(i18n(ConfigmenuSet, ConfigmenuAutoRaise, "Auto Raise"), 3);
+ insert(i18n(ConfigmenuSet, ConfigmenuClickRaise, "Click Raise"), 4);
update();
- setValues();
+ setItemSelected(0, (! getScreen()->isSloppyFocus()));
+ setItemSelected(1, getScreen()->isSloppyFocus());
+ setItemEnabled(2, getScreen()->isSloppyFocus());
+ setItemSelected(2, getScreen()->doAutoRaise());
+ setItemEnabled(3, getScreen()->isSloppyFocus());
+ setItemSelected(3, getScreen()->doClickRaise());
}
-void Configmenu::Focusmenu::setValues() {
- setItemSelected(0, !configmenu->screen.sloppyFocus());
- setItemSelected(1, configmenu->screen.sloppyFocus());
- setItemEnabled(2, configmenu->screen.sloppyFocus());
- setItemSelected(2, configmenu->screen.autoRaise());
-}
-
-void Configmenu::Focusmenu::reconfigure() {
- setValues();
- Basemenu::reconfigure();
-}
-void Configmenu::Focusmenu::itemSelected(int button, int index) {
+void Configmenu::Focusmenu::itemSelected(int button, unsigned int index) {
if (button != 1)
return;
switch (item->function()) {
case 1: // click to focus
- configmenu->screen.setSloppyFocus(false);
- configmenu->screen.setAutoRaise(false);
-
- if (! configmenu->screen.getOpenbox().focusedWindow())
- XSetInputFocus(configmenu->screen.getOpenbox().getXDisplay(),
- configmenu->screen.getToolbar()->getWindowID(),
- RevertToParent, CurrentTime);
- else
- XSetInputFocus(configmenu->screen.getOpenbox().getXDisplay(),
- configmenu->screen.getOpenbox().
- focusedWindow()->getClientWindow(),
- RevertToParent, CurrentTime);
-
- configmenu->screen.reconfigure();
-
+ getScreen()->toggleFocusModel(BScreen::ClickToFocus);
break;
case 2: // sloppy focus
- configmenu->screen.setSloppyFocus(true);
-
- configmenu->screen.reconfigure();
-
+ getScreen()->toggleFocusModel(BScreen::SloppyFocus);
break;
case 3: // auto raise with sloppy focus
- bool change = ((configmenu->screen.autoRaise()) ? false : true);
- configmenu->screen.setAutoRaise(change);
+ getScreen()->saveAutoRaise(! getScreen()->doAutoRaise());
+ break;
+ case 4: // click raise with sloppy focus
+ getScreen()->saveClickRaise(! getScreen()->doClickRaise());
+ getScreen()->updateFocusModel();
break;
}
- setItemSelected(0, !configmenu->screen.sloppyFocus());
- setItemSelected(1, configmenu->screen.sloppyFocus());
- setItemEnabled(2, configmenu->screen.sloppyFocus());
- setItemSelected(2, configmenu->screen.autoRaise());
+ setItemSelected(0, (! getScreen()->isSloppyFocus()));
+ setItemSelected(1, getScreen()->isSloppyFocus());
+ setItemEnabled(2, getScreen()->isSloppyFocus());
+ setItemSelected(2, getScreen()->doAutoRaise());
+ setItemEnabled(3, getScreen()->isSloppyFocus());
+ setItemSelected(3, getScreen()->doClickRaise());
}
-Configmenu::Placementmenu::Placementmenu(Configmenu *cm) :
- Basemenu(cm->screen) {
- configmenu = cm;
- setLabel(i18n->getMessage(ConfigmenuSet, ConfigmenuWindowPlacement,
- "Window Placement"));
+Configmenu::Placementmenu::Placementmenu(Configmenu *cm):
+ Basemenu(cm->getScreen()) {
+ setLabel(i18n(ConfigmenuSet, ConfigmenuWindowPlacement, "Window Placement"));
setInternalMenu();
-
- insert(i18n->getMessage(ConfigmenuSet, ConfigmenuSmartRows,
- "Smart Placement (Rows)"),
- BScreen::RowSmartPlacement);
- insert(i18n->getMessage(ConfigmenuSet, ConfigmenuSmartCols,
- "Smart Placement (Columns)"),
- BScreen::ColSmartPlacement);
- insert(i18n->getMessage(ConfigmenuSet, ConfigmenuCascade,
- "Cascade Placement"), BScreen::CascadePlacement);
- insert(i18n->getMessage(ConfigmenuSet, ConfigmenuBestFit,
- "Best Fit Placement"), BScreen::BestFitPlacement);
- insert(i18n->getMessage(ConfigmenuSet, ConfigmenuUnderMouse,
- "Under Mouse Placement"),
- BScreen::UnderMousePlacement);
- insert(i18n->getMessage(ConfigmenuSet, ConfigmenuClickMouse,
- "Click Mouse Placement"),
- BScreen::ClickMousePlacement);
- insert(i18n->getMessage(ConfigmenuSet, ConfigmenuLeftRight,
- "Left to Right"), BScreen::LeftRight);
- insert(i18n->getMessage(ConfigmenuSet, ConfigmenuRightLeft,
- "Right to Left"), BScreen::RightLeft);
- insert(i18n->getMessage(ConfigmenuSet, ConfigmenuTopBottom,
- "Top to Bottom"), BScreen::TopBottom);
- insert(i18n->getMessage(ConfigmenuSet, ConfigmenuBottomTop,
- "Bottom to Top"), BScreen::BottomTop);
+
+ insert(i18n(ConfigmenuSet, ConfigmenuSmartRows, "Smart Placement (Rows)"),
+ BScreen::RowSmartPlacement);
+ insert(i18n(ConfigmenuSet, ConfigmenuSmartCols, "Smart Placement (Columns)"),
+ BScreen::ColSmartPlacement);
+ insert(i18n(ConfigmenuSet, ConfigmenuCascade, "Cascade Placement"),
+ BScreen::CascadePlacement);
+ insert(i18n(ConfigmenuSet, ConfigmenuLeftRight, "Left to Right"),
+ BScreen::LeftRight);
+ insert(i18n(ConfigmenuSet, ConfigmenuRightLeft, "Right to Left"),
+ BScreen::RightLeft);
+ insert(i18n(ConfigmenuSet, ConfigmenuTopBottom, "Top to Bottom"),
+ BScreen::TopBottom);
+ insert(i18n(ConfigmenuSet, ConfigmenuBottomTop, "Bottom to Top"),
+ BScreen::BottomTop);
update();
- setValues();
-}
+ switch (getScreen()->getPlacementPolicy()) {
+ case BScreen::RowSmartPlacement:
+ setItemSelected(0, True);
+ break;
-void Configmenu::Placementmenu::setValues() {
- const int p = configmenu->screen.placementPolicy();
- setItemSelected(0, p == BScreen::RowSmartPlacement);
- setItemSelected(1, p == BScreen::ColSmartPlacement);
- setItemSelected(2, p == BScreen::CascadePlacement);
- setItemSelected(3, p == BScreen::BestFitPlacement);
- setItemSelected(4, p == BScreen::UnderMousePlacement);
- setItemSelected(5, p == BScreen::ClickMousePlacement);
-
- bool rl = (configmenu->screen.rowPlacementDirection() ==
- BScreen::LeftRight),
- tb = (configmenu->screen.colPlacementDirection() ==
- BScreen::TopBottom);
-
- setItemSelected(6, rl);
- setItemEnabled(6, (p != BScreen::UnderMousePlacement &&
- p != BScreen::ClickMousePlacement));
- setItemSelected(7, !rl);
- setItemEnabled(7, (p != BScreen::UnderMousePlacement &&
- p != BScreen::ClickMousePlacement));
-
- setItemSelected(8, tb);
- setItemEnabled(8, (p != BScreen::UnderMousePlacement &&
- p != BScreen::ClickMousePlacement));
- setItemSelected(9, !tb);
- setItemEnabled(9, (p != BScreen::UnderMousePlacement &&
- p != BScreen::ClickMousePlacement));
-}
+ case BScreen::ColSmartPlacement:
+ setItemSelected(1, True);
+ break;
-void Configmenu::Placementmenu::reconfigure() {
- setValues();
- Basemenu::reconfigure();
+ case BScreen::CascadePlacement:
+ setItemSelected(2, True);
+ break;
+ }
+
+ bool rl = (getScreen()->getRowPlacementDirection() ==
+ BScreen::LeftRight),
+ tb = (getScreen()->getColPlacementDirection() ==
+ BScreen::TopBottom);
+
+ setItemSelected(3, rl);
+ setItemSelected(4, ! rl);
+
+ setItemSelected(5, tb);
+ setItemSelected(6, ! tb);
}
-void Configmenu::Placementmenu::itemSelected(int button, int index) {
+
+void Configmenu::Placementmenu::itemSelected(int button, unsigned int index) {
if (button != 1)
return;
switch (item->function()) {
case BScreen::RowSmartPlacement:
- configmenu->screen.setPlacementPolicy(item->function());
+ getScreen()->savePlacementPolicy(item->function());
+
+ setItemSelected(0, True);
+ setItemSelected(1, False);
+ setItemSelected(2, False);
+
break;
case BScreen::ColSmartPlacement:
- configmenu->screen.setPlacementPolicy(item->function());
- break;
+ getScreen()->savePlacementPolicy(item->function());
- case BScreen::CascadePlacement:
- configmenu->screen.setPlacementPolicy(item->function());
- break;
+ setItemSelected(0, False);
+ setItemSelected(1, True);
+ setItemSelected(2, False);
- case BScreen::BestFitPlacement:
- configmenu->screen.setPlacementPolicy(item->function());
break;
- case BScreen::UnderMousePlacement:
- configmenu->screen.setPlacementPolicy(item->function());
- break;
+ case BScreen::CascadePlacement:
+ getScreen()->savePlacementPolicy(item->function());
+
+ setItemSelected(0, False);
+ setItemSelected(1, False);
+ setItemSelected(2, True);
- case BScreen::ClickMousePlacement:
- configmenu->screen.setPlacementPolicy(item->function());
break;
case BScreen::LeftRight:
- configmenu->screen.setRowPlacementDirection(BScreen::LeftRight);
+ getScreen()->saveRowPlacementDirection(BScreen::LeftRight);
+
+ setItemSelected(3, True);
+ setItemSelected(4, False);
+
break;
case BScreen::RightLeft:
- configmenu->screen.setRowPlacementDirection(BScreen::RightLeft);
+ getScreen()->saveRowPlacementDirection(BScreen::RightLeft);
+
+ setItemSelected(3, False);
+ setItemSelected(4, True);
+
break;
case BScreen::TopBottom:
- configmenu->screen.setColPlacementDirection(BScreen::TopBottom);
+ getScreen()->saveColPlacementDirection(BScreen::TopBottom);
+
+ setItemSelected(5, True);
+ setItemSelected(6, False);
+
break;
case BScreen::BottomTop:
- configmenu->screen.setColPlacementDirection(BScreen::BottomTop);
+ getScreen()->saveColPlacementDirection(BScreen::BottomTop);
+
+ setItemSelected(5, False);
+ setItemSelected(6, True);
+
break;
}
- setValues();
}
projects / chaz / openbox / blobdiff