From 715dc907ae6a4ca65c492f94ce6379f59eff5157 Mon Sep 17 00:00:00 2001 From: Mark Tiefenbruck Date: Tue, 9 Sep 2008 17:42:30 -0400 Subject: remove a bunch of stuff that isn't used anymore --- src/FbAtoms.cc | 94 --------- src/FbAtoms.hh | 102 --------- src/FbPager.cc | 23 +- src/FbPager.hh | 2 - src/FluxboxHandler.cc | 200 ------------------ src/FluxboxHandler.hh | 58 ----- src/Makefile.am | 6 +- src/Makefile.in | 572 -------------------------------------------------- src/main.cc | 4 - 9 files changed, 5 insertions(+), 1056 deletions(-) delete mode 100644 src/FbAtoms.cc delete mode 100644 src/FbAtoms.hh delete mode 100644 src/FluxboxHandler.cc delete mode 100644 src/FluxboxHandler.hh delete mode 100644 src/Makefile.in diff --git a/src/FbAtoms.cc b/src/FbAtoms.cc deleted file mode 100644 index 7c8a971..0000000 --- a/src/FbAtoms.cc +++ /dev/null @@ -1,94 +0,0 @@ -// FbAtom.cc -// Copyright (c) 2002 Henrik Kinnunen (fluxgen@linuxmail.org) -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the "Software"), -// to deal in the Software without restriction, including without limitation -// the rights to use, copy, modify, merge, publish, distribute, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. - -// $Id: FbAtoms.cc,v 1.5 2002/12/01 13:41:56 rathnor Exp $ - -#include "FbAtoms.hh" - -#include -#include -using namespace std; - -FbAtoms *FbAtoms::s_singleton = 0; - -FbAtoms::FbAtoms(Display *display):m_init(false) { - if (s_singleton != 0) - throw string("You can only create one instance of FbAtoms"); - - if (display == 0) - throw string("Must supply FbAtoms with an valid display connection"); - - s_singleton = this; - initAtoms(display); -} - -FbAtoms::~FbAtoms() { - -} - -FbAtoms *FbAtoms::instance() { - assert(s_singleton); - return s_singleton; -} - -void FbAtoms::initAtoms(Display *display) { - - xa_wm_colormap_windows = - XInternAtom(display, "WM_COLORMAP_WINDOWS", False); - xa_wm_protocols = XInternAtom(display, "WM_PROTOCOLS", False); - xa_wm_state = XInternAtom(display, "WM_STATE", False); - xa_wm_change_state = XInternAtom(display, "WM_CHANGE_STATE", False); - xa_wm_delete_window = XInternAtom(display, "WM_DELETE_WINDOW", False); - xa_wm_take_focus = XInternAtom(display, "WM_TAKE_FOCUS", False); - motif_wm_hints = XInternAtom(display, "_MOTIF_WM_HINTS", False); - - blackbox_hints = XInternAtom(display, "_BLACKBOX_HINTS", False); - blackbox_attributes = XInternAtom(display, "_BLACKBOX_ATTRIBUTES", False); - blackbox_change_attributes = - XInternAtom(display, "_BLACKBOX_CHANGE_ATTRIBUTES", False); - - blackbox_structure_messages = - XInternAtom(display, "_BLACKBOX_STRUCTURE_MESSAGES", False); - blackbox_notify_startup = - XInternAtom(display, "_BLACKBOX_NOTIFY_STARTUP", False); - blackbox_notify_window_add = - XInternAtom(display, "_BLACKBOX_NOTIFY_WINDOW_ADD", False); - blackbox_notify_window_del = - XInternAtom(display, "_BLACKBOX_NOTIFY_WINDOW_DEL", False); - blackbox_notify_current_workspace = - XInternAtom(display, "_BLACKBOX_NOTIFY_CURRENT_WORKSPACE", False); - blackbox_notify_workspace_count = - XInternAtom(display, "_BLACKBOX_NOTIFY_WORKSPACE_COUNT", False); - blackbox_notify_window_focus = - XInternAtom(display, "_BLACKBOX_NOTIFY_WINDOW_FOCUS", False); - blackbox_notify_window_raise = - XInternAtom(display, "_BLACKBOX_NOTIFY_WINDOW_RAISE", False); - blackbox_notify_window_lower = - XInternAtom(display, "_BLACKBOX_NOTIFY_WINDOW_LOWER", False); - - blackbox_change_workspace = - XInternAtom(display, "_BLACKBOX_CHANGE_WORKSPACE", False); - blackbox_change_window_focus = - XInternAtom(display, "_BLACKBOX_CHANGE_WINDOW_FOCUS", False); - blackbox_cycle_window_focus = - XInternAtom(display, "_BLACKBOX_CYCLE_WINDOW_FOCUS", False); - -} diff --git a/src/FbAtoms.hh b/src/FbAtoms.hh deleted file mode 100644 index 13b943b..0000000 --- a/src/FbAtoms.hh +++ /dev/null @@ -1,102 +0,0 @@ -// FbAtom.hh -// Copyright (c) 2002 Henrik Kinnunen (fluxgen@linuxmail.org) -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the "Software"), -// to deal in the Software without restriction, including without limitation -// the rights to use, copy, modify, merge, publish, distribute, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. - -// $Id: FbAtoms.hh,v 1.8 2002/12/01 13:41:56 rathnor Exp $ -#ifndef FBATOMS_HH -#define FBATOMS_HH - -#include -#include - -/** - atom handler for base atoms -*/ -class FbAtoms { -public: - explicit FbAtoms(Display *display); - virtual ~FbAtoms(); - static FbAtoms *instance(); - - - inline Atom getWMChangeStateAtom() const { return xa_wm_change_state; } - inline Atom getWMStateAtom() const { return xa_wm_state; } - inline Atom getWMDeleteAtom() const { return xa_wm_delete_window; } - inline Atom getWMProtocolsAtom() const { return xa_wm_protocols; } - inline Atom getWMTakeFocusAtom() const { return xa_wm_take_focus; } - inline Atom getWMColormapAtom() const { return xa_wm_colormap_windows; } - inline Atom getMotifWMHintsAtom() const { return motif_wm_hints; } - - // this atom is for normal app->WM hints about decorations, stacking, - // starting workspace etc... - inline Atom getFluxboxHintsAtom() const { return blackbox_hints;} - - // these atoms are for normal app->WM interaction beyond the scope of the - // ICCCM... - inline Atom getFluxboxAttributesAtom() const { return blackbox_attributes; } - inline Atom getFluxboxChangeAttributesAtom() const { return blackbox_change_attributes; } - - // these atoms are for window->WM interaction, with more control and - // information on window "structure"... common examples are - // notifying apps when windows are raised/lowered... when the user changes - // workspaces... i.e. "pager talk" - inline Atom getFluxboxStructureMessagesAtom() const{ return blackbox_structure_messages; } - - // *Notify* portions of the NETStructureMessages protocol - inline Atom getFluxboxNotifyStartupAtom() const { return blackbox_notify_startup; } - inline Atom getFluxboxNotifyWindowAddAtom() const { return blackbox_notify_window_add; } - inline Atom getFluxboxNotifyWindowDelAtom() const { return blackbox_notify_window_del; } - inline Atom getFluxboxNotifyWindowFocusAtom() const { return blackbox_notify_window_focus; } - inline Atom getFluxboxNotifyCurrentWorkspaceAtom() const { return blackbox_notify_current_workspace; } - inline Atom getFluxboxNotifyWorkspaceCountAtom() const { return blackbox_notify_workspace_count; } - inline Atom getFluxboxNotifyWindowRaiseAtom() const { return blackbox_notify_window_raise; } - inline Atom getFluxboxNotifyWindowLowerAtom() const { return blackbox_notify_window_lower; } - - // atoms to change that request changes to the desktop environment during - // runtime... these messages can be sent by any client... as the sending - // client window id is not included in the ClientMessage event... - inline Atom getFluxboxChangeWorkspaceAtom() const { return blackbox_change_workspace; } - inline Atom getFluxboxChangeWindowFocusAtom() const { return blackbox_change_window_focus; } - inline Atom getFluxboxCycleWindowFocusAtom() const { return blackbox_cycle_window_focus; } - -private: - void initAtoms(Display *disp); -// NETAttributes - Atom blackbox_attributes, blackbox_change_attributes, blackbox_hints; - - // NETStructureMessages - Atom blackbox_structure_messages, blackbox_notify_startup, - blackbox_notify_window_add, blackbox_notify_window_del, - blackbox_notify_window_focus, blackbox_notify_current_workspace, - blackbox_notify_workspace_count, blackbox_notify_window_raise, - blackbox_notify_window_lower; - - // message_types for client -> wm messages - Atom blackbox_change_workspace, blackbox_change_window_focus, - blackbox_cycle_window_focus; - - Atom xa_wm_colormap_windows, xa_wm_protocols, xa_wm_state, - xa_wm_delete_window, xa_wm_take_focus, xa_wm_change_state, - motif_wm_hints; - bool m_init; - static FbAtoms *s_singleton; -}; - -#endif //FBATOMS_HH diff --git a/src/FbPager.cc b/src/FbPager.cc index bf55eb4..3955200 100644 --- a/src/FbPager.cc +++ b/src/FbPager.cc @@ -31,11 +31,9 @@ // client handlers #include "Ewmh.hh" -#include "FluxboxHandler.hh" #include "Workspace.hh" #include "WindowHint.hh" -#include "FbAtoms.hh" #include "ScaleWindowToWindow.hh" #include "Resources.hh" #include "RefBinder.hh" @@ -119,8 +117,6 @@ namespace FbPager { FbPager::FbPager(int screen_num, bool withdraw, - bool use_fbhandler, - bool use_ewmhhandler, bool show_resources, int layer_flag, const char *resource_filename): @@ -236,12 +232,7 @@ FbPager::FbPager(int screen_num, bool withdraw, "FbPager.Border.Inactive.Color"), m_last_workspace_num(-1) { - - if (use_fbhandler) - m_clienthandlers.push_back(new FluxboxHandler()); - - if (use_ewmhhandler) - m_clienthandlers.push_back(new Ewmh()); + m_clienthandlers.push_back(new Ewmh()); XSetErrorHandler(handleXErrors); @@ -253,17 +244,6 @@ FbPager::FbPager(int screen_num, bool withdraw, m_window.setAlpha(*m_alpha); - Display *disp = FbTk::App::instance()->display(); - Atom wmproto[2]; - int wmprot_size = 1; - wmproto[0] = XInternAtom(disp, "WM_DELETE_WINDOW", False); - if (FluxboxHandler::handler() != 0) { - wmprot_size = 2; - wmproto[1] = FbAtoms::instance()->getFluxboxStructureMessagesAtom(); - } - XSetWMProtocols(disp, m_window.window(), wmproto, wmprot_size); - - XWMHints wmhints; if (!withdraw) { @@ -286,6 +266,7 @@ FbPager::FbPager(int screen_num, bool withdraw, XStringListToTextProperty(&name_prop, 1, &windowname); // setup class hints + Display *disp = FbTk::App::instance()->display(); XClassHint classhints; string res_name = "fbpager"; string res_class = "FbPager"; diff --git a/src/FbPager.hh b/src/FbPager.hh index c6b71c5..02fe1b6 100644 --- a/src/FbPager.hh +++ b/src/FbPager.hh @@ -47,8 +47,6 @@ class FbPager:public FbTk::EventHandler, public Pager, private FbTk::NotCopyable public: enum Alignment { LEFT_TO_RIGHT, TOP_TO_BOTTOM}; FbPager(int screen_num, bool withdraw, - bool use_fbhandler, - bool use_ewhmhandler, bool show_resources, int layer_flags, const char *resource_filename=0); diff --git a/src/FluxboxHandler.cc b/src/FluxboxHandler.cc deleted file mode 100644 index 23fa1c6..0000000 --- a/src/FluxboxHandler.cc +++ /dev/null @@ -1,200 +0,0 @@ -// FluxboxHandler.cc for FbPager -// Copyright (c) 2004 Henrik Kinnunen (fluxgen at users.sourceforge.net) -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the "Software"), -// to deal in the Software without restriction, including without limitation -// the rights to use, copy, modify, merge, publish, distribute, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. - -#include "FluxboxHandler.hh" - -#include "Pager.hh" -#include "WindowHint.hh" -#include "FbRootWindow.hh" -#include "ClientWindow.hh" - -#include "FbTk/App.hh" - -#include - -#include -using namespace std; - -namespace { - -void sendClientMessage(FbTk::FbWindow &src, - FbTk::FbWindow &dest, - Atom the_atom, - unsigned long data1, unsigned long data2 = 0, - unsigned long data3 = 0, unsigned long data4 = 0) { - // fill in client structure - XEvent clientevent; - clientevent.xclient.display = FbTk::App::instance()->display(); - clientevent.xclient.type = ClientMessage; - clientevent.xclient.window = dest.window(); - clientevent.xclient.message_type = the_atom; - clientevent.xclient.format = 32; - clientevent.xclient.data.l[0] = data1; - clientevent.xclient.data.l[1] = data2; - clientevent.xclient.data.l[2] = data3; - clientevent.xclient.data.l[3] = data4; - // send event to root window - src.sendEvent(false, SubstructureRedirectMask, clientevent); -} - -} // end anonymous namespace - -struct FluxboxHints { - unsigned long flags, attrib, workspace, stack, decoration; - enum Attrib { - ATTRIB_SHADED = 0x01, - ATTRIB_STICK = 0x08, - ATTRIB_WORKSPACE = 0x10, - ATTRIB_DECOR = 0x40 - }; - enum Decor { NO_DECOR = 0 }; -}; - -namespace FbPager { - -FluxboxHandler *FluxboxHandler::s_handler = 0; - -FluxboxHandler::FluxboxHandler(): - m_fbatoms(FbTk::App::instance()->display()) { - s_handler = this; -} - -void FluxboxHandler::setFocus(FbTk::FbWindow &client) { - FbRootWindow root(client.screenNumber()); - sendClientMessage(root, client, - m_fbatoms.getFluxboxChangeWindowFocusAtom(), 0); -} - -void FluxboxHandler::sendToWorkspace(FbTk::FbWindow &client, int workspace) { - FbRootWindow root(client.screenNumber()); - sendClientMessage(root, client, - m_fbatoms.getFluxboxChangeAttributesAtom(), - FluxboxHints::ATTRIB_WORKSPACE, - 0, - workspace); -} - -bool FluxboxHandler::clientMessage(Pager &pager, XClientMessageEvent &event) { - const FbAtoms &fbatoms = *FbAtoms::instance(); - if (event.data.l[0] == fbatoms.getFluxboxNotifyWorkspaceCountAtom()) { - pager.updateWorkspaceCount(event.data.l[1]); - return true; - } else if (event.data.l[0] == fbatoms.getFluxboxNotifyCurrentWorkspaceAtom()) { - pager.setCurrentWorkspace(event.data.l[1]); - return true; - } else if (event.data.l[0] == fbatoms.getFluxboxNotifyWindowAddAtom()) { - pager.addWindow(event.data.l[1], event.data.l[2]); - return true; - } else if (event.data.l[0] == fbatoms.getFluxboxNotifyWindowDelAtom()) { - pager.removeWindow(event.data.l[1]); - return true; - } else if (event.data.l[0] == fbatoms.getFluxboxNotifyWindowRaiseAtom()) { - pager.raiseWindow(event.data.l[1]); - return true; - } else if (event.data.l[0] == fbatoms.getFluxboxNotifyWindowLowerAtom()) { - pager.lowerWindow(event.data.l[1]); - return true; - } else if (event.data.l[0] == fbatoms.getFluxboxNotifyWindowFocusAtom()) { - pager.setFocusedWindow(event.data.l[1]); - return true; - } - - return false; -} - -void FluxboxHandler::changeWorkspace(int screen_num, int workspace) { - FbRootWindow root(screen_num); - sendClientMessage(root, root, FbAtoms::instance()->getFluxboxChangeWorkspaceAtom(), workspace); -} - -void FluxboxHandler::setHints(FbTk::FbWindow &win, WindowHint &hints) { - FluxboxHints net_hints; - net_hints.decoration = (hints.flags() & WindowHint::WHINT_NO_DECOR) ? FluxboxHints::NO_DECOR : 1; - net_hints.attrib = (hints.flags() & WindowHint::WHINT_STICKY) ? FluxboxHints::ATTRIB_STICK : 0; - // use Decoration and sticky flag - net_hints.flags = FluxboxHints::ATTRIB_DECOR | FluxboxHints::ATTRIB_STICK; - Atom hint_atom = m_fbatoms.getFluxboxHintsAtom(); - win.changeProperty(hint_atom, hint_atom, - 32, PropModeReplace, - (unsigned char *)(&net_hints), - 5); // number of fluxbox hints in the structure -} - -void FluxboxHandler::getHints(const FbTk::FbWindow &win, WindowHint &hint) const { - Atom real_type; - int format; - unsigned long num_elements, not_used; - FluxboxHints *win_hints; - - if (!win.property(m_fbatoms.getFluxboxAttributesAtom(), 0L, - 5, // five elements in our structure - false, - m_fbatoms.getFluxboxAttributesAtom(), - &real_type, &format, &num_elements, ¬_used, - (unsigned char**)&win_hints) || - num_elements != 5) // must have five elements - return; // failure - - hint.setWorkspace(win_hints->workspace); - - // get shaded state - bool shaded = false; - if (win_hints->flags & FluxboxHints::ATTRIB_SHADED) - hint.add(WindowHint::WHINT_SHADED); - - // get sticky state - bool sticky = false; - if (win_hints->flags & FluxboxHints::ATTRIB_STICK) - hint.add(WindowHint::WHINT_STICKY); - - // get icon state - long *state; - bool iconified = false; - if (!win.property(m_fbatoms.getWMStateAtom(), 0, 1, - False, m_fbatoms.getWMStateAtom(), - &real_type, &format, &num_elements, ¬_used, - (unsigned char**)&state) || state == 0) - cerr<<"Warning: Couldn't get WM_STATE property"<display(); - if (XGetWindowProperty(disp, RootWindow(disp, screen_num), - m_fbatoms.getFluxboxNotifyWorkspaceCountAtom(), 0, 1, - False, 0, - &real_type, &format, &num_elements, ¬_used, - (unsigned char**)&data) == Success) { - if (data != 0) - return static_cast(*data); - } - - return 0; -} - -} // end namespace FbPager diff --git a/src/FluxboxHandler.hh b/src/FluxboxHandler.hh deleted file mode 100644 index 7d63e70..0000000 --- a/src/FluxboxHandler.hh +++ /dev/null @@ -1,58 +0,0 @@ -// FluxboxHandler.hh for FbPager -// Copyright (c) 2004 Henrik Kinnunen (fluxgen at users.sourceforge.net) -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the "Software"), -// to deal in the Software without restriction, including without limitation -// the rights to use, copy, modify, merge, publish, distribute, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. - -#ifndef FLUXBOXHANDLER_HH -#define FLUXBOXHANDLER_HH - -#include "ClientHandler.hh" -#include "FbAtoms.hh" - -namespace FbPager { - -/// @brief client handler implementation for fluxbox -class FluxboxHandler: public ClientHandler { -public: - FluxboxHandler(); - - void setFocus(FbTk::FbWindow &win); - void moveResize(FbTk::FbWindow &win) { } - void sendToWorkspace(FbTk::FbWindow &win, int workspace); - void closeWindow(FbTk::FbWindow &win) { } - bool clientMessage(Pager &pager, XClientMessageEvent &event); - void changeWorkspace(int screen_num, int workspace); - void setHints(FbTk::FbWindow &win, WindowHint &hints); - void getHints(const FbTk::FbWindow &win, WindowHint &hints) const; - int numberOfWorkspaces(int screen_num) const; - void setDesktopLayout(FbTk::FbWindow &root, - Orientation orientation, - Corner starting_corner, - unsigned int columns, unsigned int rows) { - } - - static FluxboxHandler *handler() { return s_handler; } -private: - FbAtoms m_fbatoms; - static FluxboxHandler *s_handler; -}; - -} // end namespace FbPager - -#endif // FLUXBOXHANDLER_HH diff --git a/src/Makefile.am b/src/Makefile.am index 18b328f..1cb3131 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,9 +4,9 @@ bin_PROGRAMS=fbpager fbpager_SOURCES= main.cc FbPager.hh FbPager.cc \ - Workspace.cc Workspace.hh FbAtoms.hh FbAtoms.cc \ - Ewmh.hh Ewmh.cc FluxboxHandler.hh FluxboxHandler.cc \ - ClientHandler.hh ClientWindow.hh Pager.hh WindowHint.hh FbRootWindow.hh \ + Workspace.cc Workspace.hh \ + Ewmh.hh Ewmh.cc ClientHandler.hh \ + ClientWindow.hh Pager.hh WindowHint.hh FbRootWindow.hh \ ScaleWindowToWindow.hh Resources.hh RefBinder.hh fbpager_CXXFLAGS=-IFbTk fbpager_LDADD=FbTk/libFbTk.a diff --git a/src/Makefile.in b/src/Makefile.in deleted file mode 100644 index 390327b..0000000 --- a/src/Makefile.in +++ /dev/null @@ -1,572 +0,0 @@ -# Makefile.in generated automatically by automake 1.5 from Makefile.am. - -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -# Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -SHELL = @SHELL@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. - -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_HEADER = $(INSTALL_DATA) -transform = @program_transform_name@ -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -host_alias = @host_alias@ -host_triplet = @host@ -AMTAR = @AMTAR@ -AR = @AR@ -AS = @AS@ -AWK = @AWK@ -CC = @CC@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -DEBUG = @DEBUG@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -ECHO = @ECHO@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -GCJ = @GCJ@ -GCJFLAGS = @GCJFLAGS@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -RANLIB = @RANLIB@ -RC = @RC@ -STRIP = @STRIP@ -VERSION = @VERSION@ -X_CFLAGS = @X_CFLAGS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ -am__include = @am__include@ -am__quote = @am__quote@ -install_sh = @install_sh@ - -SUBDIRS = FbTk - -bin_PROGRAMS = fbpager - -fbpager_SOURCES = main.cc FbPager.hh FbPager.cc \ - Workspace.cc Workspace.hh FbAtoms.hh FbAtoms.cc \ - Ewmh.hh Ewmh.cc FluxboxHandler.hh FluxboxHandler.cc \ - ClientHandler.hh ClientWindow.hh Pager.hh WindowHint.hh FbRootWindow.hh \ - ScaleWindowToWindow.hh Resources.hh RefBinder.hh - -fbpager_CXXFLAGS = -IFbTk -fbpager_LDADD = FbTk/libFbTk.a -subdir = src -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -bin_PROGRAMS = fbpager$(EXEEXT) -PROGRAMS = $(bin_PROGRAMS) - -am_fbpager_OBJECTS = fbpager-main.$(OBJEXT) fbpager-FbPager.$(OBJEXT) \ - fbpager-Workspace.$(OBJEXT) fbpager-FbAtoms.$(OBJEXT) \ - fbpager-Ewmh.$(OBJEXT) fbpager-FluxboxHandler.$(OBJEXT) -fbpager_OBJECTS = $(am_fbpager_OBJECTS) -fbpager_DEPENDENCIES = FbTk/libFbTk.a -fbpager_LDFLAGS = - -DEFS = @DEFS@ -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -CPPFLAGS = @CPPFLAGS@ -LDFLAGS = @LDFLAGS@ -LIBS = @LIBS@ -depcomp = $(SHELL) $(top_srcdir)/depcomp -@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/fbpager-Ewmh.Po \ -@AMDEP_TRUE@ $(DEPDIR)/fbpager-FbAtoms.Po \ -@AMDEP_TRUE@ $(DEPDIR)/fbpager-FbPager.Po \ -@AMDEP_TRUE@ $(DEPDIR)/fbpager-FluxboxHandler.Po \ -@AMDEP_TRUE@ $(DEPDIR)/fbpager-Workspace.Po \ -@AMDEP_TRUE@ $(DEPDIR)/fbpager-main.Po -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -CXXFLAGS = @CXXFLAGS@ -CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ - $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DIST_SOURCES = $(fbpager_SOURCES) - -RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ - uninstall-info-recursive all-recursive install-data-recursive \ - install-exec-recursive installdirs-recursive install-recursive \ - uninstall-recursive check-recursive installcheck-recursive -DIST_COMMON = Makefile.am Makefile.in -DIST_SUBDIRS = $(SUBDIRS) -SOURCES = $(fbpager_SOURCES) - -all: all-recursive - -.SUFFIXES: -.SUFFIXES: .cc .lo .o .obj - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && \ - CONFIG_HEADERS= CONFIG_LINKS= \ - CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status -install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(bindir) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - if test -f $$p \ - || test -f $$p1 \ - ; then \ - f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f; \ - else :; fi; \ - done - -uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ - rm -f $(DESTDIR)$(bindir)/$$f; \ - done - -clean-binPROGRAMS: - -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) -fbpager-main.$(OBJEXT): main.cc -fbpager-FbPager.$(OBJEXT): FbPager.cc -fbpager-Workspace.$(OBJEXT): Workspace.cc -fbpager-FbAtoms.$(OBJEXT): FbAtoms.cc -fbpager-Ewmh.$(OBJEXT): Ewmh.cc -fbpager-FluxboxHandler.$(OBJEXT): FluxboxHandler.cc -fbpager$(EXEEXT): $(fbpager_OBJECTS) $(fbpager_DEPENDENCIES) - @rm -f fbpager$(EXEEXT) - $(CXXLINK) $(fbpager_LDFLAGS) $(fbpager_OBJECTS) $(fbpager_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) core *.core - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/fbpager-Ewmh.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/fbpager-FbAtoms.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/fbpager-FbPager.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/fbpager-FluxboxHandler.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/fbpager-Workspace.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/fbpager-main.Po@am__quote@ - -distclean-depend: - -rm -rf $(DEPDIR) - -.cc.o: -@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(CXXCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< - -.cc.obj: -@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(CXXCOMPILE) -c -o $@ `cygpath -w $<` - -.cc.lo: -@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(LTCXXCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< - -fbpager-main.o: main.cc -@AMDEP_TRUE@ source='main.cc' object='fbpager-main.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@ depfile='$(DEPDIR)/fbpager-main.Po' tmpdepfile='$(DEPDIR)/fbpager-main.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fbpager_CXXFLAGS) $(CXXFLAGS) -c -o fbpager-main.o `test -f main.cc || echo '$(srcdir)/'`main.cc - -fbpager-main.obj: main.cc -@AMDEP_TRUE@ source='main.cc' object='fbpager-main.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@ depfile='$(DEPDIR)/fbpager-main.Po' tmpdepfile='$(DEPDIR)/fbpager-main.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fbpager_CXXFLAGS) $(CXXFLAGS) -c -o fbpager-main.obj `cygpath -w main.cc` - -fbpager-main.lo: main.cc -@AMDEP_TRUE@ source='main.cc' object='fbpager-main.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@ depfile='$(DEPDIR)/fbpager-main.Plo' tmpdepfile='$(DEPDIR)/fbpager-main.TPlo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fbpager_CXXFLAGS) $(CXXFLAGS) -c -o fbpager-main.lo `test -f main.cc || echo '$(srcdir)/'`main.cc - -fbpager-FbPager.o: FbPager.cc -@AMDEP_TRUE@ source='FbPager.cc' object='fbpager-FbPager.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@ depfile='$(DEPDIR)/fbpager-FbPager.Po' tmpdepfile='$(DEPDIR)/fbpager-FbPager.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fbpager_CXXFLAGS) $(CXXFLAGS) -c -o fbpager-FbPager.o `test -f FbPager.cc || echo '$(srcdir)/'`FbPager.cc - -fbpager-FbPager.obj: FbPager.cc -@AMDEP_TRUE@ source='FbPager.cc' object='fbpager-FbPager.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@ depfile='$(DEPDIR)/fbpager-FbPager.Po' tmpdepfile='$(DEPDIR)/fbpager-FbPager.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fbpager_CXXFLAGS) $(CXXFLAGS) -c -o fbpager-FbPager.obj `cygpath -w FbPager.cc` - -fbpager-FbPager.lo: FbPager.cc -@AMDEP_TRUE@ source='FbPager.cc' object='fbpager-FbPager.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@ depfile='$(DEPDIR)/fbpager-FbPager.Plo' tmpdepfile='$(DEPDIR)/fbpager-FbPager.TPlo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fbpager_CXXFLAGS) $(CXXFLAGS) -c -o fbpager-FbPager.lo `test -f FbPager.cc || echo '$(srcdir)/'`FbPager.cc - -fbpager-Workspace.o: Workspace.cc -@AMDEP_TRUE@ source='Workspace.cc' object='fbpager-Workspace.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@ depfile='$(DEPDIR)/fbpager-Workspace.Po' tmpdepfile='$(DEPDIR)/fbpager-Workspace.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fbpager_CXXFLAGS) $(CXXFLAGS) -c -o fbpager-Workspace.o `test -f Workspace.cc || echo '$(srcdir)/'`Workspace.cc - -fbpager-Workspace.obj: Workspace.cc -@AMDEP_TRUE@ source='Workspace.cc' object='fbpager-Workspace.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@ depfile='$(DEPDIR)/fbpager-Workspace.Po' tmpdepfile='$(DEPDIR)/fbpager-Workspace.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fbpager_CXXFLAGS) $(CXXFLAGS) -c -o fbpager-Workspace.obj `cygpath -w Workspace.cc` - -fbpager-Workspace.lo: Workspace.cc -@AMDEP_TRUE@ source='Workspace.cc' object='fbpager-Workspace.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@ depfile='$(DEPDIR)/fbpager-Workspace.Plo' tmpdepfile='$(DEPDIR)/fbpager-Workspace.TPlo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fbpager_CXXFLAGS) $(CXXFLAGS) -c -o fbpager-Workspace.lo `test -f Workspace.cc || echo '$(srcdir)/'`Workspace.cc - -fbpager-FbAtoms.o: FbAtoms.cc -@AMDEP_TRUE@ source='FbAtoms.cc' object='fbpager-FbAtoms.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@ depfile='$(DEPDIR)/fbpager-FbAtoms.Po' tmpdepfile='$(DEPDIR)/fbpager-FbAtoms.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fbpager_CXXFLAGS) $(CXXFLAGS) -c -o fbpager-FbAtoms.o `test -f FbAtoms.cc || echo '$(srcdir)/'`FbAtoms.cc - -fbpager-FbAtoms.obj: FbAtoms.cc -@AMDEP_TRUE@ source='FbAtoms.cc' object='fbpager-FbAtoms.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@ depfile='$(DEPDIR)/fbpager-FbAtoms.Po' tmpdepfile='$(DEPDIR)/fbpager-FbAtoms.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fbpager_CXXFLAGS) $(CXXFLAGS) -c -o fbpager-FbAtoms.obj `cygpath -w FbAtoms.cc` - -fbpager-FbAtoms.lo: FbAtoms.cc -@AMDEP_TRUE@ source='FbAtoms.cc' object='fbpager-FbAtoms.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@ depfile='$(DEPDIR)/fbpager-FbAtoms.Plo' tmpdepfile='$(DEPDIR)/fbpager-FbAtoms.TPlo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fbpager_CXXFLAGS) $(CXXFLAGS) -c -o fbpager-FbAtoms.lo `test -f FbAtoms.cc || echo '$(srcdir)/'`FbAtoms.cc - -fbpager-Ewmh.o: Ewmh.cc -@AMDEP_TRUE@ source='Ewmh.cc' object='fbpager-Ewmh.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@ depfile='$(DEPDIR)/fbpager-Ewmh.Po' tmpdepfile='$(DEPDIR)/fbpager-Ewmh.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fbpager_CXXFLAGS) $(CXXFLAGS) -c -o fbpager-Ewmh.o `test -f Ewmh.cc || echo '$(srcdir)/'`Ewmh.cc - -fbpager-Ewmh.obj: Ewmh.cc -@AMDEP_TRUE@ source='Ewmh.cc' object='fbpager-Ewmh.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@ depfile='$(DEPDIR)/fbpager-Ewmh.Po' tmpdepfile='$(DEPDIR)/fbpager-Ewmh.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fbpager_CXXFLAGS) $(CXXFLAGS) -c -o fbpager-Ewmh.obj `cygpath -w Ewmh.cc` - -fbpager-Ewmh.lo: Ewmh.cc -@AMDEP_TRUE@ source='Ewmh.cc' object='fbpager-Ewmh.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@ depfile='$(DEPDIR)/fbpager-Ewmh.Plo' tmpdepfile='$(DEPDIR)/fbpager-Ewmh.TPlo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fbpager_CXXFLAGS) $(CXXFLAGS) -c -o fbpager-Ewmh.lo `test -f Ewmh.cc || echo '$(srcdir)/'`Ewmh.cc - -fbpager-FluxboxHandler.o: FluxboxHandler.cc -@AMDEP_TRUE@ source='FluxboxHandler.cc' object='fbpager-FluxboxHandler.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@ depfile='$(DEPDIR)/fbpager-FluxboxHandler.Po' tmpdepfile='$(DEPDIR)/fbpager-FluxboxHandler.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fbpager_CXXFLAGS) $(CXXFLAGS) -c -o fbpager-FluxboxHandler.o `test -f FluxboxHandler.cc || echo '$(srcdir)/'`FluxboxHandler.cc - -fbpager-FluxboxHandler.obj: FluxboxHandler.cc -@AMDEP_TRUE@ source='FluxboxHandler.cc' object='fbpager-FluxboxHandler.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@ depfile='$(DEPDIR)/fbpager-FluxboxHandler.Po' tmpdepfile='$(DEPDIR)/fbpager-FluxboxHandler.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fbpager_CXXFLAGS) $(CXXFLAGS) -c -o fbpager-FluxboxHandler.obj `cygpath -w FluxboxHandler.cc` - -fbpager-FluxboxHandler.lo: FluxboxHandler.cc -@AMDEP_TRUE@ source='FluxboxHandler.cc' object='fbpager-FluxboxHandler.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@ depfile='$(DEPDIR)/fbpager-FluxboxHandler.Plo' tmpdepfile='$(DEPDIR)/fbpager-FluxboxHandler.TPlo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fbpager_CXXFLAGS) $(CXXFLAGS) -c -o fbpager-FluxboxHandler.lo `test -f FluxboxHandler.cc || echo '$(srcdir)/'`FluxboxHandler.cc -CXXDEPMODE = @CXXDEPMODE@ -uninstall-info-am: - -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @set fnord $(MAKEFLAGS); amf=$$2; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: - @set fnord $(MAKEFLAGS); amf=$$2; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done - -tags: TAGS - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique $(LISP) - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) - -GTAGS: - here=`CDPATH=: && cd $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH - -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = .. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - -distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - if test -f $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - $(mkinstalldirs) "$(distdir)/$$dir"; \ - fi; \ - if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir) \ - || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done - for subdir in $(SUBDIRS); do \ - if test "$$subdir" = .; then :; else \ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ - || exit 1; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$(top_distdir)" \ - distdir=../$(distdir)/$$subdir \ - distdir) \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-recursive -all-am: Makefile $(PROGRAMS) -installdirs: installdirs-recursive -installdirs-am: - $(mkinstalldirs) $(DESTDIR)$(bindir) - -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am - -distclean: distclean-recursive - -distclean-am: clean-am distclean-compile distclean-depend \ - distclean-generic distclean-libtool distclean-tags - -dvi: dvi-recursive - -dvi-am: - -info: info-recursive - -info-am: - -install-data-am: - -install-exec-am: install-binPROGRAMS - -install-info: install-info-recursive - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -uninstall-am: uninstall-binPROGRAMS uninstall-info-am - -uninstall-info: uninstall-info-recursive - -.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ - clean-binPROGRAMS clean-generic clean-libtool clean-recursive \ - distclean distclean-compile distclean-depend distclean-generic \ - distclean-libtool distclean-recursive distclean-tags distdir \ - dvi dvi-am dvi-recursive info info-am info-recursive install \ - install-am install-binPROGRAMS install-data install-data-am \ - install-data-recursive install-exec install-exec-am \ - install-exec-recursive install-info install-info-am \ - install-info-recursive install-man install-recursive \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am installdirs-recursive maintainer-clean \ - maintainer-clean-generic maintainer-clean-recursive mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - mostlyclean-recursive tags tags-recursive uninstall \ - uninstall-am uninstall-binPROGRAMS uninstall-info-am \ - uninstall-info-recursive uninstall-recursive - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/src/main.cc b/src/main.cc index 481b5f3..362c775 100644 --- a/src/main.cc +++ b/src/main.cc @@ -56,8 +56,6 @@ int main(int argc, char **argv) { std::string displayname; bool withdraw = false; std::string resourcefile("~/.fluxbox/fbpager"); - bool ewmh = true; - bool fbhints = true; bool show_resources = false; int layer = -1; for (int arg = 1; arg < argc; ++arg) { @@ -101,8 +99,6 @@ int main(int argc, char **argv) { } FbPager::FbPager fbpager(screen_num, withdraw, - fbhints, - ewmh, show_resources, layer, resourcefile.c_str()); -- cgit v0.11.2