nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

removed unused variables + cosmetic issue for some compilers (mipspro)

Browse source
This commit is contained in:
akir 2004-10-21 10:18:40 +00:00
parent 1d9a172a79
commit 70acd21472
1 changed files with 131 additions and 135 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

266
src/fluxbox.cc
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: fluxbox.cc,v 1.261 2004/10/19 17:23:08 akir Exp $ // $Id: fluxbox.cc,v 1.262 2004/10/21 10:18:40 akir Exp $
#include "fluxbox.hh" #include "fluxbox.hh"
@ -158,12 +158,12 @@ void copyFile(const std::string &from, const std::string &to) {
ofstream to_file(to.c_str()); ofstream to_file(to.c_str());
if (! to_file.good()) { if (! to_file.good()) {
cerr<<"Can't write file: "<<to<<endl; cerr<<"Can't write file: "<<to<<endl;
} else if (from_file.good()) { } else if (from_file.good()) {
to_file<<from_file.rdbuf(); //copy file to_file<<from_file.rdbuf(); //copy file
} else { } else {
cerr<<"Can't copy from "<<from<<" to "<<to<<endl; cerr<<"Can't copy from "<<from<<" to "<<to<<endl;
} }
} }
} // end anonymous } // end anonymous
@ -173,7 +173,7 @@ static int handleXErrors(Display *d, XErrorEvent *e) {
last_bad_window = e->resourceid; last_bad_window = e->resourceid;
#ifdef DEBUG #ifdef DEBUG
else { else {
// ignore bad window ones, they happen a lot // ignore bad window ones, they happen a lot
// when windows close themselves // when windows close themselves
char errtxt[128]; char errtxt[128];
@ -199,7 +199,7 @@ Fluxbox::Titlebar Fluxbox::s_titlebar_right[] = {MINIMIZE, MAXIMIZE, CLOSE};
Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfilename) Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfilename)
: FbTk::App(dpy_name), : FbTk::App(dpy_name),
m_fbatoms(new FbAtoms()), m_fbatoms(new FbAtoms()),
m_resourcemanager(rcfilename, true), m_resourcemanager(rcfilename, true),
// TODO: shouldn't need a separate one for screen // TODO: shouldn't need a separate one for screen
m_screen_rm(m_resourcemanager), m_screen_rm(m_resourcemanager),
m_rc_tabs(m_resourcemanager, true, "session.tabs", "Session.Tabs"), m_rc_tabs(m_resourcemanager, true, "session.tabs", "Session.Tabs"),
@ -208,7 +208,7 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
"Session.FocusTabMinWidth"), "Session.FocusTabMinWidth"),
m_rc_ignoreborder(m_resourcemanager, false, "session.ignoreBorder", "Session.IgnoreBorder"), m_rc_ignoreborder(m_resourcemanager, false, "session.ignoreBorder", "Session.IgnoreBorder"),
m_rc_pseudotrans(m_resourcemanager, false, "session.forcePseudoTransparency", "Session.forcePseudoTransparency"), m_rc_pseudotrans(m_resourcemanager, false, "session.forcePseudoTransparency", "Session.forcePseudoTransparency"),
m_rc_colors_per_channel(m_resourcemanager, 4, m_rc_colors_per_channel(m_resourcemanager, 4,
"session.colorsPerChannel", "Session.ColorsPerChannel"), "session.colorsPerChannel", "Session.ColorsPerChannel"),
m_rc_numlayers(m_resourcemanager, 13, "session.numLayers", "Session.NumLayers"), m_rc_numlayers(m_resourcemanager, 13, "session.numLayers", "Session.NumLayers"),
m_rc_double_click_interval(m_resourcemanager, 250, "session.doubleClickInterval", "Session.DoubleClickInterval"), m_rc_double_click_interval(m_resourcemanager, 250, "session.doubleClickInterval", "Session.DoubleClickInterval"),
@ -222,8 +222,8 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
m_rc_titlebar_left(m_resourcemanager, m_rc_titlebar_left(m_resourcemanager,
TitlebarList(&s_titlebar_left[0], &s_titlebar_left[1]), TitlebarList(&s_titlebar_left[0], &s_titlebar_left[1]),
"session.titlebar.left", "Session.Titlebar.Left"), "session.titlebar.left", "Session.Titlebar.Left"),
m_rc_titlebar_right(m_resourcemanager, m_rc_titlebar_right(m_resourcemanager,
TitlebarList(&s_titlebar_right[0], &s_titlebar_right[3]), TitlebarList(&s_titlebar_right[0], &s_titlebar_right[3]),
"session.titlebar.right", "Session.Titlebar.Right"), "session.titlebar.right", "Session.Titlebar.Right"),
m_rc_tabs_attach_area(m_resourcemanager, ATTACH_AREA_WINDOW, "session.tabsAttachArea", "Session.TabsAttachArea"), m_rc_tabs_attach_area(m_resourcemanager, ATTACH_AREA_WINDOW, "session.tabsAttachArea", "Session.TabsAttachArea"),
m_rc_cache_life(m_resourcemanager, 5, "session.cacheLife", "Session.CacheLife"), m_rc_cache_life(m_resourcemanager, 5, "session.cacheLife", "Session.CacheLife"),
@ -245,13 +245,13 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
m_randr_event_type(0), m_randr_event_type(0),
m_RC_PATH("fluxbox"), m_RC_PATH("fluxbox"),
m_RC_INIT_FILE("init") { m_RC_INIT_FILE("init") {
_FB_USES_NLS; _FB_USES_NLS;
if (s_singleton != 0) if (s_singleton != 0)
throw string(_FBTEXT(Fluxbox, FatalSingleton, "Fatal! There can only one instance of fluxbox class.", "Error displayed on weird error where an instance of the Fluxbox class already exists!")); throw string(_FBTEXT(Fluxbox, FatalSingleton, "Fatal! There can only one instance of fluxbox class.", "Error displayed on weird error where an instance of the Fluxbox class already exists!"));
if (display() == 0) { if (display() == 0) {
throw string(_FBTEXT(Fluxbox, NoDisplay, throw string(_FBTEXT(Fluxbox, NoDisplay,
"Can not connect to X server.\nMake sure you started X before you start Fluxbox.", "Can not connect to X server.\nMake sure you started X before you start Fluxbox.",
"Error message when no X display appears to exist")); "Error message when no X display appears to exist"));
} }
@ -270,14 +270,14 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
XSetErrorHandler((XErrorHandler) handleXErrors); XSetErrorHandler((XErrorHandler) handleXErrors);
//catch system signals //catch system signals
SignalHandler &sigh = SignalHandler::instance(); SignalHandler &sigh = SignalHandler::instance();
sigh.registerHandler(SIGSEGV, this); sigh.registerHandler(SIGSEGV, this);
sigh.registerHandler(SIGFPE, this); sigh.registerHandler(SIGFPE, this);
sigh.registerHandler(SIGTERM, this); sigh.registerHandler(SIGTERM, this);
sigh.registerHandler(SIGINT, this); sigh.registerHandler(SIGINT, this);
sigh.registerHandler(SIGCHLD, this); sigh.registerHandler(SIGCHLD, this);
sigh.registerHandler(SIGHUP, this); sigh.registerHandler(SIGHUP, this);
sigh.registerHandler(SIGUSR1, this); sigh.registerHandler(SIGUSR1, this);
sigh.registerHandler(SIGUSR2, this); sigh.registerHandler(SIGUSR2, this);
// //
// setup timer // setup timer
@ -298,7 +298,7 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
m_have_shape = false; m_have_shape = false;
m_shape_eventbase = 0; m_shape_eventbase = 0;
#ifdef SHAPE #ifdef SHAPE
int shape_err; int shape_err;
m_have_shape = XShapeQueryExtension(disp, &m_shape_eventbase, &shape_err); m_have_shape = XShapeQueryExtension(disp, &m_shape_eventbase, &shape_err);
#endif // SHAPE #endif // SHAPE
@ -326,9 +326,9 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
#endif // REMEMBER #endif // REMEMBER
grab(); grab();
setupConfigFiles(); setupConfigFiles();
if (! XSupportsLocale()) if (! XSupportsLocale())
cerr<<_FBTEXT(Fluxbox, WarningLocale, "Warning: X server does not support locale", "XSupportsLocale returned false")<<endl; cerr<<_FBTEXT(Fluxbox, WarningLocale, "Warning: X server does not support locale", "XSupportsLocale returned false")<<endl;
@ -349,7 +349,7 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
scrname, altscrname, scrname, altscrname,
i, getNumberOfLayers()); i, getNumberOfLayers());
if (! screen->isScreenManaged()) { if (! screen->isScreenManaged()) {
delete screen; delete screen;
continue; continue;
} }
// add to our list // add to our list
@ -375,13 +375,13 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
#else #else
XRRSelectInput(disp, screen->rootWindow().window(), XRRSelectInput(disp, screen->rootWindow().window(),
RRScreenChangeNotifyMask); RRScreenChangeNotifyMask);
#endif // X_RRScreenChangeSelectInput #endif // X_RRScreenChangeSelectInput
#endif // HAVE_RANDR #endif // HAVE_RANDR
#ifdef USE_TOOLBAR #ifdef USE_TOOLBAR
m_toolbars.push_back(new Toolbar(*screen, m_toolbars.push_back(new Toolbar(*screen,
*screen->layerManager(). *screen->layerManager().
getLayer(Fluxbox::instance()->getNormalLayer()))); getLayer(Fluxbox::instance()->getNormalLayer())));
#endif // USE_TOOLBAR #endif // USE_TOOLBAR
@ -398,7 +398,7 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
// initiate atomhandler for screen specific stuff // initiate atomhandler for screen specific stuff
for (AtomHandlerContainerIt it= m_atomhandler.begin(); for (AtomHandlerContainerIt it= m_atomhandler.begin();
it != m_atomhandler.end(); it != m_atomhandler.end();
it++) { it++) {
(*it).first->initForScreen(*screen); (*it).first->initForScreen(*screen);
} }
@ -407,7 +407,7 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
#ifdef SLIT #ifdef SLIT
if (screen->slit()) if (screen->slit())
screen->slit()->show(); screen->slit()->show();
#endif // SLIT #endif // SLIT
} // end init screens } // end init screens
@ -417,7 +417,7 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
m_keyscreen = m_mousescreen = m_screen_list.front(); m_keyscreen = m_mousescreen = m_screen_list.front();
if (m_screen_list.empty()) { if (m_screen_list.empty()) {
throw string(_FBTEXT(Fluxbox, ErrorNoScreens, throw string(_FBTEXT(Fluxbox, ErrorNoScreens,
"Couldn't find screens to manage.\nMake sure you don't have another window manager running.", "Error message when no unmanaged screens found - usually means another window manager is running")); "Couldn't find screens to manage.\nMake sure you don't have another window manager running.", "Error message when no unmanaged screens found - usually means another window manager is running"));
} }
@ -430,18 +430,18 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
m_reconfigure_wait = m_reread_menu_wait = false; m_reconfigure_wait = m_reread_menu_wait = false;
// Create keybindings handler and load keys file // Create keybindings handler and load keys file
m_key.reset(new Keys(StringUtil::expandFilename(*m_rc_keyfile).c_str())); m_key.reset(new Keys(StringUtil::expandFilename(*m_rc_keyfile).c_str()));
m_resourcemanager.unlock(); m_resourcemanager.unlock();
ungrab(); ungrab();
#ifdef DEBUG #ifdef DEBUG
if (m_resourcemanager.lockDepth() != 0) if (m_resourcemanager.lockDepth() != 0)
cerr<<"--- resource manager lockdepth = "<<m_resourcemanager.lockDepth()<<endl; cerr<<"--- resource manager lockdepth = "<<m_resourcemanager.lockDepth()<<endl;
#endif //DEBUG #endif //DEBUG
m_starting = false; m_starting = false;
// //
// For dumping theme items // For dumping theme items
// FbTk::ThemeManager::instance().listItems(); // FbTk::ThemeManager::instance().listItems();
// //
@ -478,7 +478,7 @@ Fluxbox::~Fluxbox() {
m_screen_list.pop_back(); m_screen_list.pop_back();
} }
clearMenuFilenames(); clearMenuFilenames();
} }
void Fluxbox::eventLoop() { void Fluxbox::eventLoop() {
@ -488,7 +488,7 @@ void Fluxbox::eventLoop() {
XEvent e; XEvent e;
XNextEvent(disp, &e); XNextEvent(disp, &e);
if (last_bad_window != None && e.xany.window == last_bad_window && if (last_bad_window != None && e.xany.window == last_bad_window &&
e.type != DestroyNotify) { // we must let the actual destroys through e.type != DestroyNotify) { // we must let the actual destroys through
#ifdef DEBUG #ifdef DEBUG
cerr<<"Fluxbox::eventLoop(): removing bad window from event queue"<<endl; cerr<<"Fluxbox::eventLoop(): removing bad window from event queue"<<endl;
@ -527,7 +527,7 @@ void Fluxbox::ungrab() {
} }
/** /**
setup the configutation files in setup the configutation files in
home directory home directory
*/ */
void Fluxbox::setupConfigFiles() { void Fluxbox::setupConfigFiles() {
@ -544,7 +544,7 @@ void Fluxbox::setupConfigFiles() {
// is file/dir already there? // is file/dir already there?
if (! stat(dirname.c_str(), &buf)) { if (! stat(dirname.c_str(), &buf)) {
// check if anything with those name exists, if not create new // check if anything with those name exists, if not create new
if (stat(init_file.c_str(), &buf)) if (stat(init_file.c_str(), &buf))
create_init = true; create_init = true;
@ -560,12 +560,12 @@ void Fluxbox::setupConfigFiles() {
_FB_USES_NLS; _FB_USES_NLS;
// create directory with perm 700 // create directory with perm 700
if (mkdir(dirname.c_str(), 0700)) { if (mkdir(dirname.c_str(), 0700)) {
fprintf(stderr, _FBTEXT(Fluxbox, ErrorCreatingDirectory, fprintf(stderr, _FBTEXT(Fluxbox, ErrorCreatingDirectory,
"Can't create %s directory", "Can't create a directory, one %s for directory name"), dirname.c_str()); "Can't create %s directory", "Can't create a directory, one %s for directory name"), dirname.c_str());
cerr<<endl; cerr<<endl;
return; return;
} }
//mark creation of files //mark creation of files
create_init = create_keys = create_menu = true; create_init = create_keys = create_menu = true;
} }
@ -590,7 +590,7 @@ void Fluxbox::handleEvent(XEvent * const e) {
m_last_event = *e; m_last_event = *e;
// it is possible (e.g. during moving) for a window // it is possible (e.g. during moving) for a window
// to mask all events to go to it // to mask all events to go to it
if ((m_masked == e->xany.window) && m_masked_window) { if ((m_masked == e->xany.window) && m_masked_window) {
if (e->type == MotionNotify) { if (e->type == MotionNotify) {
m_last_time = e->xmotion.time; m_last_time = e->xmotion.time;
@ -599,7 +599,7 @@ void Fluxbox::handleEvent(XEvent * const e) {
} else if (e->type == ButtonRelease) { } else if (e->type == ButtonRelease) {
e->xbutton.window = m_masked_window->fbWindow().window(); e->xbutton.window = m_masked_window->fbWindow().window();
} }
} }
// update key/mouse screen and last time before we enter other eventhandlers // update key/mouse screen and last time before we enter other eventhandlers
@ -626,7 +626,7 @@ void Fluxbox::handleEvent(XEvent * const e) {
// we call FbTk eventhandler // we call FbTk eventhandler
// so we can get FbTk::Menu::focused() before it sets to 0 // so we can get FbTk::Menu::focused() before it sets to 0
if (e->type == FocusOut && if (e->type == FocusOut &&
e->xfocus.mode != NotifyGrab && e->xfocus.mode != NotifyGrab &&
e->xfocus.detail != NotifyPointer && e->xfocus.detail != NotifyPointer &&
e->xfocus.detail != NotifyInferior && e->xfocus.detail != NotifyInferior &&
@ -638,7 +638,7 @@ void Fluxbox::handleEvent(XEvent * const e) {
ScreenList::iterator it = m_screen_list.begin(); ScreenList::iterator it = m_screen_list.begin();
ScreenList::iterator it_end = m_screen_list.end(); ScreenList::iterator it_end = m_screen_list.end();
for (; it != it_end; ++it) { for (; it != it_end; ++it) {
if ( (*it)->screenNumber() == if ( (*it)->screenNumber() ==
FbTk::Menu::focused()->fbwindow().screenNumber()) { FbTk::Menu::focused()->fbwindow().screenNumber()) {
screen = (*it); screen = (*it);
break; // found the screen, no more search break; // found the screen, no more search
@ -646,7 +646,7 @@ void Fluxbox::handleEvent(XEvent * const e) {
} }
if (screen != 0) if (screen != 0)
revertFocus(*screen); revertFocus(*screen);
} }
// try FbTk::EventHandler first // try FbTk::EventHandler first
@ -656,13 +656,11 @@ void Fluxbox::handleEvent(XEvent * const e) {
case ButtonRelease: case ButtonRelease:
case ButtonPress: case ButtonPress:
handleButtonEvent(e->xbutton); handleButtonEvent(e->xbutton);
break; break;
case ConfigureRequest: { case ConfigureRequest: {
WinClient *winclient = (WinClient *) 0;
if ((winclient = searchWindow(e->xconfigurerequest.window))) { if (!searchWindow(e->xconfigurerequest.window)) {
// already handled in FluxboxWindow::handleEvent
} else {
grab(); grab();
if (validateWindow(e->xconfigurerequest.window)) { if (validateWindow(e->xconfigurerequest.window)) {
@ -682,7 +680,7 @@ void Fluxbox::handleEvent(XEvent * const e) {
} }
ungrab(); ungrab();
} } // else already handled in FluxboxWindow::handleEvent
} }
break; break;
@ -690,7 +688,7 @@ void Fluxbox::handleEvent(XEvent * const e) {
#ifdef DEBUG #ifdef DEBUG
cerr<<"MapRequest for 0x"<<hex<<e->xmaprequest.window<<dec<<endl; cerr<<"MapRequest for 0x"<<hex<<e->xmaprequest.window<<dec<<endl;
#endif // DEBUG #endif // DEBUG
WinClient *winclient = searchWindow(e->xmaprequest.window); WinClient *winclient = searchWindow(e->xmaprequest.window);
@ -705,7 +703,7 @@ void Fluxbox::handleEvent(XEvent * const e) {
e->xmaprequest.window, e->xmaprequest.window,
&attr) && attr.screen != 0) { &attr) && attr.screen != 0) {
screen_num = XScreenNumberOfScreen(attr.screen); screen_num = XScreenNumberOfScreen(attr.screen);
// find screen // find screen
ScreenList::iterator screen_it = find_if(m_screen_list.begin(), ScreenList::iterator screen_it = find_if(m_screen_list.begin(),
m_screen_list.end(), m_screen_list.end(),
@ -716,7 +714,7 @@ void Fluxbox::handleEvent(XEvent * const e) {
// try with parent if we failed to find screen num // try with parent if we failed to find screen num
if (screen == 0) if (screen == 0)
screen = searchScreen(e->xmaprequest.parent); screen = searchScreen(e->xmaprequest.parent);
if (screen == 0) { if (screen == 0) {
cerr<<"Fluxbox "<<_FBTEXT(Fluxbox, CantMapWindow, "Warning! Could not find screen to map window on!", "")<<endl; cerr<<"Fluxbox "<<_FBTEXT(Fluxbox, CantMapWindow, "Warning! Could not find screen to map window on!", "")<<endl;
} else } else
@ -736,12 +734,12 @@ void Fluxbox::handleEvent(XEvent * const e) {
break; break;
case UnmapNotify: case UnmapNotify:
handleUnmapNotify(e->xunmap); handleUnmapNotify(e->xunmap);
break; break;
case MappingNotify: case MappingNotify:
// Update stored modifier mapping // Update stored modifier mapping
#ifdef DEBUG #ifdef DEBUG
cerr<<__FILE__<<"("<<__FUNCTION__<<"): MappingNotify"<<endl; cerr<<__FILE__<<"("<<__FUNCTION__<<"): MappingNotify"<<endl;
#endif // DEBUG #endif // DEBUG
FbTk::KeyUtil::instance().init(); // reinitialise the key utils FbTk::KeyUtil::instance().init(); // reinitialise the key utils
// reconfigure keys (if the mapping changes, they don't otherwise update // reconfigure keys (if the mapping changes, they don't otherwise update
@ -751,21 +749,21 @@ void Fluxbox::handleEvent(XEvent * const e) {
case CreateNotify: case CreateNotify:
break; break;
case DestroyNotify: { case DestroyNotify: {
WinClient *winclient = searchWindow(e->xdestroywindow.window); WinClient *winclient = searchWindow(e->xdestroywindow.window);
if (winclient != 0) { if (winclient != 0) {
FluxboxWindow *win = winclient->fbwindow(); FluxboxWindow *win = winclient->fbwindow();
if (win) if (win)
win->destroyNotifyEvent(e->xdestroywindow); win->destroyNotifyEvent(e->xdestroywindow);
delete winclient; delete winclient;
if (win && win->numClients() == 0) if (win && win->numClients() == 0)
delete win; delete win;
} }
} }
break; break;
case MotionNotify: case MotionNotify:
m_last_time = e->xmotion.time; m_last_time = e->xmotion.time;
break; break;
case PropertyNotify: { case PropertyNotify: {
@ -774,8 +772,8 @@ void Fluxbox::handleEvent(XEvent * const e) {
if (winclient == 0) if (winclient == 0)
break; break;
// most of them are handled in FluxboxWindow::handleEvent // most of them are handled in FluxboxWindow::handleEvent
// but some special cases like ewmh propertys needs to be checked // but some special cases like ewmh propertys needs to be checked
for (AtomHandlerContainerIt it= m_atomhandler.begin(); for (AtomHandlerContainerIt it= m_atomhandler.begin();
it != m_atomhandler.end(); it++) { it != m_atomhandler.end(); it++) {
if ( (*it).first->propertyNotify(*winclient, e->xproperty.atom)) if ( (*it).first->propertyNotify(*winclient, e->xproperty.atom))
break; break;
@ -794,7 +792,7 @@ void Fluxbox::handleEvent(XEvent * const e) {
screen->imageControl().installRootColormap(); screen->imageControl().installRootColormap();
} }
} break; } break;
case LeaveNotify: case LeaveNotify:
@ -839,8 +837,8 @@ void Fluxbox::handleEvent(XEvent * const e) {
#ifdef DEBUG #ifdef DEBUG
cerr<<__FILE__<<"("<<__FUNCTION__<<") Focus out is not a FluxboxWindow !!"<<endl; cerr<<__FILE__<<"("<<__FUNCTION__<<") Focus out is not a FluxboxWindow !!"<<endl;
#endif // DEBUG #endif // DEBUG
} else if (winclient && winclient == m_focused_window && } else if (winclient && winclient == m_focused_window &&
(winclient->fbwindow() == 0 (winclient->fbwindow() == 0
|| !winclient->fbwindow()->isMoving())) || !winclient->fbwindow()->isMoving()))
// we don't unfocus a moving window // we don't unfocus a moving window
setFocusedWindow(0); setFocusedWindow(0);
@ -850,13 +848,13 @@ void Fluxbox::handleEvent(XEvent * const e) {
handleClientMessage(e->xclient); handleClientMessage(e->xclient);
break; break;
default: { default: {
#ifdef HAVE_RANDR #ifdef HAVE_RANDR
if (e->type == m_randr_event_type) { if (e->type == m_randr_event_type) {
// update root window size in screen // update root window size in screen
BScreen *scr = searchScreen(e->xany.window); BScreen *scr = searchScreen(e->xany.window);
if (scr != 0) if (scr != 0)
scr->updateSize(); scr->updateSize();
} }
#endif // HAVE_RANDR #endif // HAVE_RANDR
@ -877,7 +875,7 @@ void Fluxbox::handleButtonEvent(XButtonEvent &be) {
screen->hideMenus(); screen->hideMenus();
// strip num/caps/scroll-lock and // strip num/caps/scroll-lock and
// see if we're using any other modifier, // see if we're using any other modifier,
// if we're we shouldn't show the root menu // if we're we shouldn't show the root menu
// this could happen if we're resizing aterm for instance // this could happen if we're resizing aterm for instance
@ -896,7 +894,7 @@ void Fluxbox::handleButtonEvent(XButtonEvent &be) {
} else if (be.button == 2) { } else if (be.button == 2) {
FbCommands::ShowWorkspaceMenuCmd cmd; FbCommands::ShowWorkspaceMenuCmd cmd;
cmd.execute(); cmd.execute();
} else if (be.button == 3) { } else if (be.button == 3) {
FbCommands::ShowRootMenuCmd cmd; FbCommands::ShowRootMenuCmd cmd;
cmd.execute(); cmd.execute();
} else if (screen->isDesktopWheeling() && be.button == 4) { } else if (screen->isDesktopWheeling() && be.button == 4) {
@ -904,11 +902,11 @@ void Fluxbox::handleButtonEvent(XButtonEvent &be) {
} else if (screen->isDesktopWheeling() && be.button == 5) { } else if (screen->isDesktopWheeling() && be.button == 5) {
screen->prevWorkspace(1); screen->prevWorkspace(1);
} }
} break; } break;
case ButtonRelease: case ButtonRelease:
m_last_time = be.time; m_last_time = be.time;
break; break;
default: default:
break; break;
} }
@ -916,11 +914,11 @@ void Fluxbox::handleButtonEvent(XButtonEvent &be) {
void Fluxbox::handleUnmapNotify(XUnmapEvent &ue) { void Fluxbox::handleUnmapNotify(XUnmapEvent &ue) {
WinClient *winclient = 0; WinClient *winclient = 0;
BScreen *screen = searchScreen(ue.event); BScreen *screen = searchScreen(ue.event);
if ( ue.event != ue.window && (screen != 0 || !ue.send_event)) if ( ue.event != ue.window && (screen != 0 || !ue.send_event))
return; return;
@ -935,7 +933,7 @@ void Fluxbox::handleUnmapNotify(XUnmapEvent &ue) {
} }
// this should delete client and adjust m_focused_window if necessary // this should delete client and adjust m_focused_window if necessary
win->unmapNotifyEvent(ue); win->unmapNotifyEvent(ue);
winclient = 0; // it's invalid now when win destroyed the client winclient = 0; // it's invalid now when win destroyed the client
@ -944,7 +942,7 @@ void Fluxbox::handleUnmapNotify(XUnmapEvent &ue) {
delete win; delete win;
win = 0; win = 0;
} }
} }
} }
} }
@ -968,7 +966,7 @@ void Fluxbox::handleClientMessage(XClientMessageEvent &ce) {
if (ce.format != 32) if (ce.format != 32)
return; return;
if (ce.message_type == m_fbatoms->getWMChangeStateAtom()) { if (ce.message_type == m_fbatoms->getWMChangeStateAtom()) {
WinClient *winclient = searchWindow(ce.window); WinClient *winclient = searchWindow(ce.window);
if (! winclient || !winclient->fbwindow() || ! winclient->validateClient()) if (! winclient || !winclient->fbwindow() || ! winclient->validateClient())
@ -984,7 +982,7 @@ void Fluxbox::handleClientMessage(XClientMessageEvent &ce) {
if (screen && ce.data.l[0] >= 0 && if (screen && ce.data.l[0] >= 0 &&
ce.data.l[0] < (signed)screen->getCount()) ce.data.l[0] < (signed)screen->getCount())
screen->changeWorkspaceID(ce.data.l[0]); screen->changeWorkspaceID(ce.data.l[0]);
} else if (ce.message_type == m_fbatoms->getFluxboxChangeWindowFocusAtom()) { } else if (ce.message_type == m_fbatoms->getFluxboxChangeWindowFocusAtom()) {
WinClient *winclient = searchWindow(ce.window); WinClient *winclient = searchWindow(ce.window);
if (winclient) { if (winclient) {
@ -1016,9 +1014,9 @@ void Fluxbox::handleClientMessage(XClientMessageEvent &ce) {
} else { } else {
WinClient *winclient = searchWindow(ce.window); WinClient *winclient = searchWindow(ce.window);
BScreen *screen = searchScreen(ce.window); BScreen *screen = searchScreen(ce.window);
// note: we dont need screen nor winclient to be non-null, // note: we dont need screen nor winclient to be non-null,
// it's up to the atomhandler to check that // it's up to the atomhandler to check that
for (AtomHandlerContainerIt it= m_atomhandler.begin(); for (AtomHandlerContainerIt it= m_atomhandler.begin();
it != m_atomhandler.end(); it++) { it != m_atomhandler.end(); it++) {
(*it).first->checkClientMessage(ce, screen, winclient); (*it).first->checkClientMessage(ce, screen, winclient);
} }
@ -1030,11 +1028,11 @@ void Fluxbox::handleClientMessage(XClientMessageEvent &ce) {
Handles KeyRelease and KeyPress events Handles KeyRelease and KeyPress events
*/ */
void Fluxbox::handleKeyEvent(XKeyEvent &ke) { void Fluxbox::handleKeyEvent(XKeyEvent &ke) {
if (keyScreen() == 0 || mouseScreen() == 0) if (keyScreen() == 0 || mouseScreen() == 0)
return; return;
switch (ke.type) { switch (ke.type) {
case KeyPress: case KeyPress:
m_key->doAction(ke); m_key->doAction(ke);
@ -1048,12 +1046,12 @@ void Fluxbox::handleKeyEvent(XKeyEvent &ke) {
// mask the mod of the released key out // mask the mod of the released key out
// won't mask anything if it isn't a mod // won't mask anything if it isn't a mod
ke.state &= ~FbTk::KeyUtil::instance().keycodeToModmask(ke.keycode); ke.state &= ~FbTk::KeyUtil::instance().keycodeToModmask(ke.keycode);
if ((m_watch_keyrelease & ke.state) == 0) { if ((m_watch_keyrelease & ke.state) == 0) {
m_watching_screen->notifyReleasedKeys(ke); m_watching_screen->notifyReleasedKeys(ke);
XUngrabKeyboard(FbTk::App::instance()->display(), CurrentTime); XUngrabKeyboard(FbTk::App::instance()->display(), CurrentTime);
// once they are released, we drop the watch // once they are released, we drop the watch
m_watching_screen = 0; m_watching_screen = 0;
m_watch_keyrelease = 0; m_watch_keyrelease = 0;
@ -1061,12 +1059,12 @@ void Fluxbox::handleKeyEvent(XKeyEvent &ke) {
} }
break; break;
} }
default: default:
break; break;
} }
} }
/// handle system signals /// handle system signals
@ -1108,7 +1106,7 @@ void Fluxbox::handleSignal(int signum) {
shutdown(); shutdown();
} }
fprintf(stderr, fprintf(stderr,
_FBTEXT(BaseDisplay, Aborting, "Aborting... dumping core\n", "Aboring and dumping core, end with newline")); _FBTEXT(BaseDisplay, Aborting, "Aborting... dumping core\n", "Aboring and dumping core, end with newline"));
abort(); abort();
@ -1123,13 +1121,13 @@ void Fluxbox::update(FbTk::Subject *changedsub) {
FluxboxWindow::WinSubject *winsub = dynamic_cast<FluxboxWindow::WinSubject *>(changedsub); FluxboxWindow::WinSubject *winsub = dynamic_cast<FluxboxWindow::WinSubject *>(changedsub);
FluxboxWindow &win = winsub->win(); FluxboxWindow &win = winsub->win();
if ((&(win.hintSig())) == changedsub) { // hint signal if ((&(win.hintSig())) == changedsub) { // hint signal
for (AtomHandlerContainerIt it= m_atomhandler.begin(); for (AtomHandlerContainerIt it= m_atomhandler.begin();
it != m_atomhandler.end(); ++it) { it != m_atomhandler.end(); ++it) {
if ( (*it).first->update()) if ( (*it).first->update())
(*it).first->updateHints(win); (*it).first->updateHints(win);
} }
} else if ((&(win.stateSig())) == changedsub) { // state signal } else if ((&(win.stateSig())) == changedsub) { // state signal
for (AtomHandlerContainerIt it= m_atomhandler.begin(); for (AtomHandlerContainerIt it= m_atomhandler.begin();
it != m_atomhandler.end(); ++it) { it != m_atomhandler.end(); ++it) {
if ((*it).first->update()) if ((*it).first->update())
(*it).first->updateState(win); (*it).first->updateState(win);
@ -1148,25 +1146,25 @@ void Fluxbox::update(FbTk::Subject *changedsub) {
// to all workspaces // to all workspaces
BScreen &scr = win.screen(); BScreen &scr = win.screen();
if (scr.currentWorkspaceID() != win.workspaceNumber()) { if (scr.currentWorkspaceID() != win.workspaceNumber()) {
scr.reassociateWindow(&win, scr.reassociateWindow(&win,
scr.currentWorkspaceID(), scr.currentWorkspaceID(),
true); true);
} }
} }
} else if ((&(win.layerSig())) == changedsub) { // layer signal } else if ((&(win.layerSig())) == changedsub) { // layer signal
for (AtomHandlerContainerIt it= m_atomhandler.begin(); for (AtomHandlerContainerIt it= m_atomhandler.begin();
it != m_atomhandler.end(); ++it) { it != m_atomhandler.end(); ++it) {
if ((*it).first->update()) if ((*it).first->update())
(*it).first->updateLayer(win); (*it).first->updateLayer(win);
} }
} else if ((&(win.dieSig())) == changedsub) { // window death signal } else if ((&(win.dieSig())) == changedsub) { // window death signal
for (AtomHandlerContainerIt it= m_atomhandler.begin(); for (AtomHandlerContainerIt it= m_atomhandler.begin();
it != m_atomhandler.end(); ++it) { it != m_atomhandler.end(); ++it) {
if ((*it).first->update()) if ((*it).first->update())
(*it).first->updateFrameClose(win); (*it).first->updateFrameClose(win);
} }
// make sure each workspace get this // make sure each workspace get this
BScreen &scr = win.screen(); BScreen &scr = win.screen();
scr.removeWindow(&win); scr.removeWindow(&win);
if (m_focused_window == &win.winClient()) if (m_focused_window == &win.winClient())
@ -1177,13 +1175,13 @@ void Fluxbox::update(FbTk::Subject *changedsub) {
it != m_atomhandler.end(); ++it) { it != m_atomhandler.end(); ++it) {
if ((*it).first->update()) if ((*it).first->update())
(*it).first->updateWorkspace(win); (*it).first->updateWorkspace(win);
} }
} else { } else {
#ifdef DEBUG #ifdef DEBUG
cerr<<__FILE__<<"("<<__LINE__<<"): WINDOW uncought signal from "<<&win<<endl; cerr<<__FILE__<<"("<<__LINE__<<"): WINDOW uncought signal from "<<&win<<endl;
#endif // DEBUG #endif // DEBUG
} }
} else if (typeid(*changedsub) == typeid(BScreen::ScreenSubject)) { } else if (typeid(*changedsub) == typeid(BScreen::ScreenSubject)) {
BScreen::ScreenSubject *subj = dynamic_cast<BScreen::ScreenSubject *>(changedsub); BScreen::ScreenSubject *subj = dynamic_cast<BScreen::ScreenSubject *>(changedsub);
BScreen &screen = subj->screen(); BScreen &screen = subj->screen();
@ -1224,14 +1222,14 @@ void Fluxbox::update(FbTk::Subject *changedsub) {
WinClient &client = subj->winClient(); WinClient &client = subj->winClient();
// TODO: don't assume it is diesig (need to fix as soon as another signal appears) // TODO: don't assume it is diesig (need to fix as soon as another signal appears)
for (AtomHandlerContainerIt it= m_atomhandler.begin(); for (AtomHandlerContainerIt it= m_atomhandler.begin();
it != m_atomhandler.end(); ++it) { it != m_atomhandler.end(); ++it) {
if ((*it).first->update()) if ((*it).first->update())
(*it).first->updateClientClose(client); (*it).first->updateClientClose(client);
} }
BScreen &screen = client.screen(); BScreen &screen = client.screen();
screen.removeClient(client); screen.removeClient(client);
// finaly send notify signal // finaly send notify signal
screen.updateNetizenWindowDel(client.window()); screen.updateNetizenWindowDel(client.window());
@ -1257,7 +1255,7 @@ void Fluxbox::attachSignals(FluxboxWindow &win) {
win.workspaceSig().attach(this); win.workspaceSig().attach(this);
win.layerSig().attach(this); win.layerSig().attach(this);
win.dieSig().attach(this); win.dieSig().attach(this);
for (AtomHandlerContainerIt it= m_atomhandler.begin(); for (AtomHandlerContainerIt it= m_atomhandler.begin();
it != m_atomhandler.end(); ++it) { it != m_atomhandler.end(); ++it) {
(*it).first->setupFrame(win); (*it).first->setupFrame(win);
} }
@ -1266,7 +1264,7 @@ void Fluxbox::attachSignals(FluxboxWindow &win) {
void Fluxbox::attachSignals(WinClient &winclient) { void Fluxbox::attachSignals(WinClient &winclient) {
winclient.dieSig().attach(this); winclient.dieSig().attach(this);
for (AtomHandlerContainerIt it= m_atomhandler.begin(); for (AtomHandlerContainerIt it= m_atomhandler.begin();
it != m_atomhandler.end(); ++it) { it != m_atomhandler.end(); ++it) {
(*it).first->setupClient(winclient); (*it).first->setupClient(winclient);
} }
@ -1274,7 +1272,7 @@ void Fluxbox::attachSignals(WinClient &winclient) {
BScreen *Fluxbox::searchScreen(Window window) { BScreen *Fluxbox::searchScreen(Window window) {
ScreenList::iterator it = m_screen_list.begin(); ScreenList::iterator it = m_screen_list.begin();
ScreenList::iterator it_end = m_screen_list.end(); ScreenList::iterator it_end = m_screen_list.end();
for (; it != it_end; ++it) { for (; it != it_end; ++it) {
if (*it && (*it)->rootWindow() == window) if (*it && (*it)->rootWindow() == window)
@ -1287,7 +1285,7 @@ BScreen *Fluxbox::searchScreen(Window window) {
AtomHandler* Fluxbox::getAtomHandler(const std::string &name) { AtomHandler* Fluxbox::getAtomHandler(const std::string &name) {
if ( name != "" ) { if ( name != "" ) {
for (AtomHandlerContainerIt it= m_atomhandler.begin(); for (AtomHandlerContainerIt it= m_atomhandler.begin();
it != m_atomhandler.end(); it++ ) { it != m_atomhandler.end(); it++ ) {
if ( name == (*it).second ) if ( name == (*it).second )
return (*it).first; return (*it).first;
@ -1302,7 +1300,7 @@ void Fluxbox::addAtomHandler(AtomHandler *atomh, const std::string &name) {
void Fluxbox::removeAtomHandler(AtomHandler *atomh) { void Fluxbox::removeAtomHandler(AtomHandler *atomh) {
for (AtomHandlerContainerIt it= m_atomhandler.begin(); for (AtomHandlerContainerIt it= m_atomhandler.begin();
it != m_atomhandler.end(); it != m_atomhandler.end();
++it) { ++it) {
if ((*it).first == atomh) { if ((*it).first == atomh) {
m_atomhandler.erase(it); m_atomhandler.erase(it);
@ -1377,7 +1375,7 @@ void Fluxbox::shutdown() {
XSetInputFocus(FbTk::App::instance()->display(), PointerRoot, None, CurrentTime); XSetInputFocus(FbTk::App::instance()->display(), PointerRoot, None, CurrentTime);
//send shutdown to all screens //send shutdown to all screens
for_each(m_screen_list.begin(), for_each(m_screen_list.begin(),
m_screen_list.end(), mem_fun(&BScreen::shutdown)); m_screen_list.end(), mem_fun(&BScreen::shutdown));
sync(false); sync(false);
@ -1388,17 +1386,17 @@ void Fluxbox::shutdown() {
void Fluxbox::save_rc() { void Fluxbox::save_rc() {
_FB_USES_NLS; _FB_USES_NLS;
XrmDatabase new_blackboxrc = 0; XrmDatabase new_blackboxrc = 0;
char rc_string[1024]; char rc_string[1024];
string dbfile(getRcFilename()); string dbfile(getRcFilename());
if (!dbfile.empty()) { if (!dbfile.empty()) {
m_resourcemanager.save(dbfile.c_str(), dbfile.c_str()); m_resourcemanager.save(dbfile.c_str(), dbfile.c_str());
m_screen_rm.save(dbfile.c_str(), dbfile.c_str()); m_screen_rm.save(dbfile.c_str(), dbfile.c_str());
} else } else
cerr<<_FBTEXT(Fluxbox, BadRCFile, "rc filename is invalid!", "Bad settings file")<<endl; cerr<<_FBTEXT(Fluxbox, BadRCFile, "rc filename is invalid!", "Bad settings file")<<endl;
ScreenList::iterator it = m_screen_list.begin(); ScreenList::iterator it = m_screen_list.begin();
ScreenList::iterator it_end = m_screen_list.end(); ScreenList::iterator it_end = m_screen_list.end();
@ -1426,7 +1424,7 @@ void Fluxbox::save_rc() {
} }
XrmPutLineResource(&new_blackboxrc, workspaces_string.c_str()); XrmPutLineResource(&new_blackboxrc, workspaces_string.c_str());
} }
XrmDatabase old_blackboxrc = XrmGetFileDatabase(dbfile.c_str()); XrmDatabase old_blackboxrc = XrmGetFileDatabase(dbfile.c_str());
@ -1435,13 +1433,13 @@ void Fluxbox::save_rc() {
XrmPutFileDatabase(old_blackboxrc, dbfile.c_str()); XrmPutFileDatabase(old_blackboxrc, dbfile.c_str());
XrmDestroyDatabase(old_blackboxrc); XrmDestroyDatabase(old_blackboxrc);
#ifdef DEBUG #ifdef DEBUG
cerr<<__FILE__<<"("<<__LINE__<<"): ------------ SAVING DONE"<<endl; cerr<<__FILE__<<"("<<__LINE__<<"): ------------ SAVING DONE"<<endl;
#endif // DEBUG #endif // DEBUG
} }
/// @return filename of resource file /// @return filename of resource file
string Fluxbox::getRcFilename() { string Fluxbox::getRcFilename() {
if (m_rc_file.empty()) { // set default filename if (m_rc_file.empty()) { // set default filename
string defaultfile(getenv("HOME") + string("/.") + m_RC_PATH + string("/") + m_RC_INIT_FILE); string defaultfile(getenv("HOME") + string("/.") + m_RC_PATH + string("/") + m_RC_INIT_FILE);
return defaultfile; return defaultfile;
@ -1472,13 +1470,13 @@ void Fluxbox::load_rc() {
if (!m_resourcemanager.load(DEFAULT_INITFILE)) if (!m_resourcemanager.load(DEFAULT_INITFILE))
cerr<<_FBTEXT(Fluxbox, CantLoadRCFile, "Failed to load database", "")<<": "<<DEFAULT_INITFILE<<endl; cerr<<_FBTEXT(Fluxbox, CantLoadRCFile, "Failed to load database", "")<<": "<<DEFAULT_INITFILE<<endl;
} }
if (m_rc_menufile->empty()) if (m_rc_menufile->empty())
m_rc_menufile.setDefaultValue(); m_rc_menufile.setDefaultValue();
if (FbTk::Transparent::haveComposite()) if (FbTk::Transparent::haveComposite())
FbTk::Transparent::usePseudoTransparent(*m_rc_pseudotrans); FbTk::Transparent::usePseudoTransparent(*m_rc_pseudotrans);
if (!m_rc_slitlistfile->empty()) { if (!m_rc_slitlistfile->empty()) {
*m_rc_slitlistfile = StringUtil::expandFilename(*m_rc_slitlistfile); *m_rc_slitlistfile = StringUtil::expandFilename(*m_rc_slitlistfile);
} else { } else {
@ -1492,7 +1490,7 @@ void Fluxbox::load_rc() {
else if (*m_rc_colors_per_channel > 6) else if (*m_rc_colors_per_channel > 6)
*m_rc_colors_per_channel = 6; *m_rc_colors_per_channel = 6;
if (m_rc_stylefile->empty()) if (m_rc_stylefile->empty())
*m_rc_stylefile = DEFAULTSTYLE; *m_rc_stylefile = DEFAULTSTYLE;
if (!Workspace::loadGroups(*m_rc_groupfile)) { if (!Workspace::loadGroups(*m_rc_groupfile)) {
@ -1504,20 +1502,20 @@ void Fluxbox::load_rc(BScreen &screen) {
//get resource filename //get resource filename
_FB_USES_NLS; _FB_USES_NLS;
string dbfile(getRcFilename()); string dbfile(getRcFilename());
XrmDatabaseHelper database; XrmDatabaseHelper database;
database = XrmGetFileDatabase(dbfile.c_str()); database = XrmGetFileDatabase(dbfile.c_str());
if (database==0) if (database==0)
database = XrmGetFileDatabase(DEFAULT_INITFILE); database = XrmGetFileDatabase(DEFAULT_INITFILE);
XrmValue value; XrmValue value;
char *value_type, name_lookup[1024], class_lookup[1024]; char *value_type, name_lookup[1024], class_lookup[1024];
int screen_number = screen.screenNumber(); int screen_number = screen.screenNumber();
screen.removeWorkspaceNames(); screen.removeWorkspaceNames();
sprintf(name_lookup, "session.screen%d.workspaceNames", screen_number); sprintf(name_lookup, "session.screen%d.workspaceNames", screen_number);
sprintf(class_lookup, "Session.Screen%d.WorkspaceNames", screen_number); sprintf(class_lookup, "Session.Screen%d.WorkspaceNames", screen_number);
if (XrmGetResource(*database, name_lookup, class_lookup, &value_type, if (XrmGetResource(*database, name_lookup, class_lookup, &value_type,
@ -1536,9 +1534,9 @@ void Fluxbox::load_rc(BScreen &screen) {
else nn = strtok(0, ","); else nn = strtok(0, ",");
if (nn) if (nn)
screen.addWorkspaceName(nn); screen.addWorkspaceName(nn);
else break; else break;
} }
delete [] search; delete [] search;
@ -1549,7 +1547,7 @@ void Fluxbox::load_rc(BScreen &screen) {
sprintf(class_lookup, "Session.Screen%d.imageSearchPath", screen_number); sprintf(class_lookup, "Session.Screen%d.imageSearchPath", screen_number);
if (XrmGetResource(*database, name_lookup, class_lookup, &value_type, if (XrmGetResource(*database, name_lookup, class_lookup, &value_type,
&value) && value.addr) { &value) && value.addr) {
std::vector<std::string> paths; std::vector<std::string> paths;
StringUtil::stringtok(paths, value.addr, ", "); StringUtil::stringtok(paths, value.addr, ", ");
for (unsigned int i=0; i<paths.size(); ++i) for (unsigned int i=0; i<paths.size(); ++i)
FbTk::Image::addSearchPath(paths[i]); FbTk::Image::addSearchPath(paths[i]);
@ -1569,11 +1567,11 @@ void Fluxbox::load_rc(BScreen &screen) {
} }
void Fluxbox::loadRootCommand(BScreen &screen) { void Fluxbox::loadRootCommand(BScreen &screen) {
string dbfile(getRcFilename()); string dbfile(getRcFilename());
XrmDatabaseHelper database(dbfile.c_str()); XrmDatabaseHelper database(dbfile.c_str());
if (!*database) if (!*database)
database = XrmGetFileDatabase(DEFAULT_INITFILE); database = XrmGetFileDatabase(DEFAULT_INITFILE);
XrmValue value; XrmValue value;
@ -1581,11 +1579,11 @@ void Fluxbox::loadRootCommand(BScreen &screen) {
sprintf(name_lookup, "session.screen%d.rootCommand", screen.screenNumber()); sprintf(name_lookup, "session.screen%d.rootCommand", screen.screenNumber());
sprintf(class_lookup, "Session.Screen%d.RootCommand", screen.screenNumber()); sprintf(class_lookup, "Session.Screen%d.RootCommand", screen.screenNumber());
if (XrmGetResource(*database, name_lookup, class_lookup, &value_type, if (XrmGetResource(*database, name_lookup, class_lookup, &value_type,
&value)) { &value)) {
screen.saveRootCommand(value.addr==0 ? "": value.addr); screen.saveRootCommand(value.addr==0 ? "": value.addr);
} else } else
screen.saveRootCommand(""); screen.saveRootCommand("");
} }
void Fluxbox::reload_rc() { void Fluxbox::reload_rc() {
@ -1609,7 +1607,7 @@ void Fluxbox::real_reconfigure() {
XrmMergeDatabases(new_blackboxrc, &old_blackboxrc); XrmMergeDatabases(new_blackboxrc, &old_blackboxrc);
XrmPutFileDatabase(old_blackboxrc, dbfile.c_str()); XrmPutFileDatabase(old_blackboxrc, dbfile.c_str());
if (old_blackboxrc) if (old_blackboxrc)
XrmDestroyDatabase(old_blackboxrc); XrmDestroyDatabase(old_blackboxrc);
@ -1702,8 +1700,8 @@ void Fluxbox::saveMenuFilename(const char *filename) {
std::list<MenuTimestamp *>::iterator it_end = m_menu_timestamps.end(); std::list<MenuTimestamp *>::iterator it_end = m_menu_timestamps.end();
for (; it != it_end; ++it) { for (; it != it_end; ++it) {
if ((*it)->filename == filename) { if ((*it)->filename == filename) {
found = true; found = true;
break; break;
} }
} }
@ -1755,11 +1753,10 @@ void Fluxbox::setFocusedWindow(WinClient *client) {
cerr<<"title: "<<client->fbwindow()->title()<<endl; cerr<<"title: "<<client->fbwindow()->title()<<endl;
cerr<<"Current Focused window = "<<m_focused_window<<endl; cerr<<"Current Focused window = "<<m_focused_window<<endl;
cerr<<"------------------"<<endl; cerr<<"------------------"<<endl;
#endif // DEBUG #endif // DEBUG
BScreen *old_screen = 0, *screen = 0; BScreen *old_screen = 0, *screen = 0;
WinClient *old_client = 0; WinClient *old_client = 0;
Workspace *old_wkspc = 0;
if (m_focused_window != 0) { if (m_focused_window != 0) {
// check if m_focused_window is valid // check if m_focused_window is valid
bool found = false; bool found = false;
@ -1781,7 +1778,6 @@ void Fluxbox::setFocusedWindow(WinClient *client) {
if (old_client->fbwindow()) { if (old_client->fbwindow()) {
FluxboxWindow *old_win = old_client->fbwindow(); FluxboxWindow *old_win = old_client->fbwindow();
old_wkspc = old_screen->getWorkspace(old_win->workspaceNumber());
if (!client || client->fbwindow() != old_win) if (!client || client->fbwindow() != old_win)
old_win->setFocusFlag(false); old_win->setFocusFlag(false);
@ -1792,7 +1788,7 @@ void Fluxbox::setFocusedWindow(WinClient *client) {
if (client && client->fbwindow() && !client->fbwindow()->isIconic()) { if (client && client->fbwindow() && !client->fbwindow()->isIconic()) {
FluxboxWindow *win = client->fbwindow(); FluxboxWindow *win = client->fbwindow();
// make sure we have a valid win pointer with a valid screen // make sure we have a valid win pointer with a valid screen
ScreenList::iterator winscreen = ScreenList::iterator winscreen =
std::find(m_screen_list.begin(), m_screen_list.end(), std::find(m_screen_list.begin(), m_screen_list.end(),
&client->screen()); &client->screen());
if (winscreen == m_screen_list.end()) { if (winscreen == m_screen_list.end()) {
@ -1811,9 +1807,9 @@ void Fluxbox::setFocusedWindow(WinClient *client) {
if (screen != 0) { if (screen != 0) {
screen->updateNetizenWindowFocus(); screen->updateNetizenWindowFocus();
for (AtomHandlerContainerIt it= m_atomhandler.begin(); for (AtomHandlerContainerIt it= m_atomhandler.begin();
it != m_atomhandler.end(); it++) { it != m_atomhandler.end(); it++) {
(*it).first->updateFocusedWindow(*screen, (m_focused_window ? (*it).first->updateFocusedWindow(*screen, (m_focused_window ?
m_focused_window->window() : m_focused_window->window() :
0)); 0));
} }
@ -1821,7 +1817,7 @@ void Fluxbox::setFocusedWindow(WinClient *client) {
if (old_screen && old_screen != screen) { if (old_screen && old_screen != screen) {
old_screen->updateNetizenWindowFocus(); old_screen->updateNetizenWindowFocus();
for (AtomHandlerContainerIt it= m_atomhandler.begin(); for (AtomHandlerContainerIt it= m_atomhandler.begin();
it != m_atomhandler.end(); it++) it != m_atomhandler.end(); it++)
(*it).first->updateFocusedWindow(*old_screen, 0); (*it).first->updateFocusedWindow(*old_screen, 0);
} }
@ -1832,7 +1828,7 @@ void Fluxbox::setFocusedWindow(WinClient *client) {
* This function is called whenever we aren't quite sure what * This function is called whenever we aren't quite sure what
* focus is meant to be, it'll make things right ;-) * focus is meant to be, it'll make things right ;-)
* last_focused is set to something if we want to make use of the * last_focused is set to something if we want to make use of the
* previously focused window (it must NOT be set focused now, it * previously focused window (it must NOT be set focused now, it
* is probably dying). * is probably dying).
* *
* ignore_event means that it ignores the given event until * ignore_event means that it ignores the given event until
@ -1851,7 +1847,7 @@ void Fluxbox::revertFocus(BScreen &screen) {
switch (screen.getFocusModel()) { switch (screen.getFocusModel()) {
case BScreen::SLOPPYFOCUS: case BScreen::SLOPPYFOCUS:
case BScreen::SEMISLOPPYFOCUS: case BScreen::SEMISLOPPYFOCUS:
XSetInputFocus(FbTk::App::instance()->display(), XSetInputFocus(FbTk::App::instance()->display(),
PointerRoot, None, CurrentTime); PointerRoot, None, CurrentTime);
break; break;
case BScreen::CLICKTOFOCUS: case BScreen::CLICKTOFOCUS:
@ -1866,10 +1862,10 @@ void Fluxbox::revertFocus(BScreen &screen) {
* if full_revert, we fallback to a full revertFocus if we can't find anything * if full_revert, we fallback to a full revertFocus if we can't find anything
* local to the client. * local to the client.
* If unfocus_frame is true, we won't focus anything in the same frame * If unfocus_frame is true, we won't focus anything in the same frame
* as the client. * as the client.
* *
* So, we first prefer to choose a transient parent, then the last * So, we first prefer to choose a transient parent, then the last
* client in this window, and if no luck (or unfocus_frame), then * client in this window, and if no luck (or unfocus_frame), then
* we just use the normal revertFocus on the screen. * we just use the normal revertFocus on the screen.
* *
* assumption: client has focus * assumption: client has focus
@ -1878,7 +1874,7 @@ void Fluxbox::unfocusWindow(WinClient &client, bool full_revert, bool unfocus_fr
// go up the transient tree looking for a focusable window // go up the transient tree looking for a focusable window
FluxboxWindow *fbwin = client.fbwindow(); FluxboxWindow *fbwin = client.fbwindow();
if (fbwin == 0) if (fbwin == 0)
unfocus_frame = false; unfocus_frame = false;
WinClient *trans_parent = client.transientFor(); WinClient *trans_parent = client.transientFor();
@ -1899,7 +1895,7 @@ void Fluxbox::unfocusWindow(WinClient &client, bool full_revert, bool unfocus_fr
if (!unfocus_frame) { if (!unfocus_frame) {
WinClient *last_focus = screen.getLastFocusedWindow(*fbwin, &client); WinClient *last_focus = screen.getLastFocusedWindow(*fbwin, &client);
if (last_focus != 0 && if (last_focus != 0 &&
fbwin->setCurrentClient(*last_focus, m_focused_window == &client)) { fbwin->setCurrentClient(*last_focus, m_focused_window == &client)) {
return; return;
} }
@ -1919,6 +1915,6 @@ void Fluxbox::watchKeyRelease(BScreen &screen, unsigned int mods) {
m_watching_screen = &screen; m_watching_screen = &screen;
m_watch_keyrelease = mods; m_watch_keyrelease = mods;
XGrabKeyboard(FbTk::App::instance()->display(), XGrabKeyboard(FbTk::App::instance()->display(),
screen.rootWindow().window(), True, screen.rootWindow().window(), True,
GrabModeAsync, GrabModeAsync, CurrentTime); GrabModeAsync, GrabModeAsync, CurrentTime);
} }