X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FConfigmenu.cc;h=6d1bbed274aa9c39c36ce0229ba885629516a9ff;hb=b48e215ca642d1973e0b1b71e632657c2679443a;hp=97faf779ecdcc77d457c625f385eb7843740686c;hpb=dfc5f034581f5a26cba5c4811500438f89f0634a;p=chaz%2Fopenbox diff --git a/src/Configmenu.cc b/src/Configmenu.cc index 97faf779..6d1bbed2 100644 --- a/src/Configmenu.cc +++ b/src/Configmenu.cc @@ -1,5 +1,6 @@ -// Configmenu.cc for Openbox -// Copyright (c) 2001 Sean 'Shaleh' Perry +// -*- 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 // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net) // // Permission is hereby granted, free of charge, to any person obtaining a @@ -20,212 +21,203 @@ // 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; - openbox = screen->getOpenbox(); - setLabel(i18n->getMessage(ConfigmenuSet, ConfigmenuConfigOptions, - "Config options")); + 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(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); + insert(i18n(ConfigmenuSet, ConfigmenuHideToolbar, + "Hide Toolbar"), 6); update(); + setValues(); +} + - setItemSelected(2, screen->getImageControl()->doDither()); - setItemSelected(3, screen->doOpaqueMove()); - setItemSelected(4, screen->doFullMax()); - setItemSelected(5, screen->doFocusNew()); - setItemSelected(6, screen->doFocusLast()); +void Configmenu::setValues(void) { + setItemSelected(2, getScreen()->doImageDither()); + setItemSelected(3, getScreen()->doOpaqueMove()); + setItemSelected(4, getScreen()->doFullMax()); + setItemSelected(5, getScreen()->doFocusNew()); + setItemSelected(6, getScreen()->doFocusLast()); + setItemSelected(7, getScreen()->doHideToolbar()); } + 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; BasemenuItem *item = find(index); - if (!item->function()) + if (! item->function()) return; switch(item->function()) { case 1: { // dither - screen->getImageControl()-> - setDither((! screen->getImageControl()->doDither())); - - setItemSelected(index, screen->getImageControl()->doDither()); - + getScreen()->saveImageDither(! getScreen()->doImageDither()); + setItemSelected(index, getScreen()->doImageDither()); break; } case 2: { // opaque move - screen->saveOpaqueMove((! screen->doOpaqueMove())); - - setItemSelected(index, screen->doOpaqueMove()); - + getScreen()->saveOpaqueMove((! getScreen()->doOpaqueMove())); + setItemSelected(index, getScreen()->doOpaqueMove()); break; } case 3: { // full maximization - screen->saveFullMax((! screen->doFullMax())); - - setItemSelected(index, screen->doFullMax()); - + getScreen()->saveFullMax((! getScreen()->doFullMax())); + setItemSelected(index, getScreen()->doFullMax()); break; } case 4: { // focus new windows - screen->saveFocusNew((! screen->doFocusNew())); - - setItemSelected(index, screen->doFocusNew()); + getScreen()->saveFocusNew((! getScreen()->doFocusNew())); + setItemSelected(index, getScreen()->doFocusNew()); break; } case 5: { // focus last window on workspace - screen->saveFocusLast((! screen->doFocusLast())); - setItemSelected(index, screen->doFocusLast()); + getScreen()->saveFocusLast((! getScreen()->doFocusLast())); + setItemSelected(index, getScreen()->doFocusLast()); + break; + } + + case 6: { // hide toolbar + getScreen()->saveHideToolbar((! getScreen()->doHideToolbar())); + setItemSelected(index, getScreen()->doHideToolbar()); break; } } // switch } + void Configmenu::reconfigure(void) { + setValues(); 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(); +} + + +void Configmenu::Focusmenu::setValues(void) { + setItemSelected(0, ! getScreen()->isSloppyFocus()); + setItemSelected(1, getScreen()->isSloppyFocus()); + setItemEnabled(2, getScreen()->isSloppyFocus()); + setItemSelected(2, getScreen()->doAutoRaise()); + setItemEnabled(3, getScreen()->isSloppyFocus()); + setItemSelected(3, getScreen()->doClickRaise()); +} + - setItemSelected(0, (! configmenu->screen->isSloppyFocus())); - setItemSelected(1, configmenu->screen->isSloppyFocus()); - setItemEnabled(2, configmenu->screen->isSloppyFocus()); - setItemSelected(2, configmenu->screen->doAutoRaise()); +void Configmenu::Focusmenu::reconfigure(void) { + setValues(); + Basemenu::reconfigure(); } -void Configmenu::Focusmenu::itemSelected(int button, int index) { + +void Configmenu::Focusmenu::itemSelected(int button, unsigned int index) { if (button != 1) return; BasemenuItem *item = find(index); - if (!item->function()) + if (! item->function()) return; switch (item->function()) { case 1: // click to focus - configmenu->screen->saveSloppyFocus(False); - configmenu->screen->saveAutoRaise(False); - - if (! configmenu->screen->getOpenbox()->getFocusedWindow()) - XSetInputFocus(configmenu->screen->getOpenbox()->getXDisplay(), - configmenu->screen->getToolbar()->getWindowID(), - RevertToParent, CurrentTime); - else - XSetInputFocus(configmenu->screen->getOpenbox()->getXDisplay(), - configmenu->screen->getOpenbox()-> - getFocusedWindow()->getClientWindow(), - RevertToParent, CurrentTime); - - configmenu->screen->reconfigure(); - + getScreen()->toggleFocusModel(BScreen::ClickToFocus); break; case 2: // sloppy focus - configmenu->screen->saveSloppyFocus(True); - - configmenu->screen->reconfigure(); - + getScreen()->toggleFocusModel(BScreen::SloppyFocus); break; case 3: // auto raise with sloppy focus - Bool change = ((configmenu->screen->doAutoRaise()) ? False : True); - configmenu->screen->saveAutoRaise(change); + getScreen()->saveAutoRaise(! getScreen()->doAutoRaise()); + break; + case 4: // click raise with sloppy focus + getScreen()->saveClickRaise(! getScreen()->doClickRaise()); + getScreen()->updateFocusModel(); break; } - - setItemSelected(0, (! configmenu->screen->isSloppyFocus())); - setItemSelected(1, configmenu->screen->isSloppyFocus()); - setItemEnabled(2, configmenu->screen->isSloppyFocus()); - setItemSelected(2, configmenu->screen->doAutoRaise()); + setValues(); } -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, 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 (configmenu->screen->getPlacementPolicy()) { + +void Configmenu::Placementmenu::setValues(void) { + switch (getScreen()->getPlacementPolicy()) { case BScreen::RowSmartPlacement: setItemSelected(0, True); break; @@ -239,10 +231,8 @@ Configmenu::Placementmenu::Placementmenu(Configmenu *cm) : break; } - Bool rl = (configmenu->screen->getRowPlacementDirection() == - BScreen::LeftRight), - tb = (configmenu->screen->getColPlacementDirection() == - BScreen::TopBottom); + bool rl = (getScreen()->getRowPlacementDirection() == BScreen::LeftRight), + tb = (getScreen()->getColPlacementDirection() == BScreen::TopBottom); setItemSelected(3, rl); setItemSelected(4, ! rl); @@ -251,18 +241,25 @@ Configmenu::Placementmenu::Placementmenu(Configmenu *cm) : setItemSelected(6, ! tb); } -void Configmenu::Placementmenu::itemSelected(int button, int index) { + +void Configmenu::Placementmenu::reconfigure(void) { + setValues(); + Basemenu::reconfigure(); +} + + +void Configmenu::Placementmenu::itemSelected(int button, unsigned int index) { if (button != 1) return; BasemenuItem *item = find(index); - if (!item->function()) + if (! item->function()) return; switch (item->function()) { case BScreen::RowSmartPlacement: - configmenu->screen->savePlacementPolicy(item->function()); + getScreen()->savePlacementPolicy(item->function()); setItemSelected(0, True); setItemSelected(1, False); @@ -271,7 +268,7 @@ void Configmenu::Placementmenu::itemSelected(int button, int index) { break; case BScreen::ColSmartPlacement: - configmenu->screen->savePlacementPolicy(item->function()); + getScreen()->savePlacementPolicy(item->function()); setItemSelected(0, False); setItemSelected(1, True); @@ -280,7 +277,7 @@ void Configmenu::Placementmenu::itemSelected(int button, int index) { break; case BScreen::CascadePlacement: - configmenu->screen->savePlacementPolicy(item->function()); + getScreen()->savePlacementPolicy(item->function()); setItemSelected(0, False); setItemSelected(1, False); @@ -289,7 +286,7 @@ void Configmenu::Placementmenu::itemSelected(int button, int index) { break; case BScreen::LeftRight: - configmenu->screen->saveRowPlacementDirection(BScreen::LeftRight); + getScreen()->saveRowPlacementDirection(BScreen::LeftRight); setItemSelected(3, True); setItemSelected(4, False); @@ -297,7 +294,7 @@ void Configmenu::Placementmenu::itemSelected(int button, int index) { break; case BScreen::RightLeft: - configmenu->screen->saveRowPlacementDirection(BScreen::RightLeft); + getScreen()->saveRowPlacementDirection(BScreen::RightLeft); setItemSelected(3, False); setItemSelected(4, True); @@ -305,7 +302,7 @@ void Configmenu::Placementmenu::itemSelected(int button, int index) { break; case BScreen::TopBottom: - configmenu->screen->saveColPlacementDirection(BScreen::TopBottom); + getScreen()->saveColPlacementDirection(BScreen::TopBottom); setItemSelected(5, True); setItemSelected(6, False); @@ -313,7 +310,7 @@ void Configmenu::Placementmenu::itemSelected(int button, int index) { break; case BScreen::BottomTop: - configmenu->screen->saveColPlacementDirection(BScreen::BottomTop); + getScreen()->saveColPlacementDirection(BScreen::BottomTop); setItemSelected(5, False); setItemSelected(6, True);