From 698539d9b9012bb6c282725e775e358c1bd4a281 Mon Sep 17 00:00:00 2001 From: markt Date: Sat, 1 Jul 2006 02:56:46 +0000 Subject: more dead functions --- src/ArrowButton.hh | 2 -- src/ClientPattern.hh | 1 - src/Container.cc | 4 ++-- src/Container.hh | 2 ++ src/FbTk/EventHandler.hh | 2 ++ src/FbTk/EventManager.cc | 2 ++ src/FbTk/FbDrawable.cc | 2 ++ src/FbTk/FbDrawable.hh | 2 ++ src/FbTk/FbWindow.cc | 2 ++ src/FbTk/FbWindow.hh | 2 ++ src/FbTk/GContext.hh | 7 ++++--- src/FbTk/ImageControl.cc | 8 ++++---- src/FbTk/ImageControl.hh | 4 ++++ src/FbTk/Menu.hh | 4 ++++ src/FbTk/SignalHandler.cc | 2 ++ src/FbTk/SignalHandler.hh | 2 ++ src/FbTk/TextButton.cc | 2 ++ src/FbTk/TextButton.hh | 2 ++ src/FbTk/TextureRender.hh | 1 - src/FbWinFrame.hh | 2 -- src/FocusControl.cc | 18 ------------------ src/FocusControl.hh | 1 - src/IconbarTool.cc | 14 -------------- src/IconbarTool.hh | 2 -- src/Screen.cc | 12 ------------ src/Screen.hh | 3 --- src/Slit.cc | 11 ----------- src/Slit.hh | 1 - src/Toolbar.hh | 1 - src/Window.hh | 2 -- src/fluxbox.hh | 3 --- 31 files changed, 40 insertions(+), 83 deletions(-) diff --git a/src/ArrowButton.hh b/src/ArrowButton.hh index 59f81fa..a05f915 100644 --- a/src/ArrowButton.hh +++ b/src/ArrowButton.hh @@ -44,8 +44,6 @@ public: void enterNotifyEvent(XCrossingEvent &ce); void leaveNotifyEvent(XCrossingEvent &ce); - void setMouseMotionHandler(FbTk::EventHandler *eh) { m_mouse_handler = eh; } - void updateTheme(const FbTk::Theme &theme); private: void drawArrow(); diff --git a/src/ClientPattern.hh b/src/ClientPattern.hh index 6db9c83..7610e77 100644 --- a/src/ClientPattern.hh +++ b/src/ClientPattern.hh @@ -67,7 +67,6 @@ public: bool addTerm(const std::string &str, WinProperty prop); inline void addMatch() { ++m_nummatches; } - inline void delMatch() { --m_nummatches; } inline bool operator == (const WinClient &win) const { return match(win); diff --git a/src/Container.cc b/src/Container.cc index aec5aba..d6ffcf3 100644 --- a/src/Container.cc +++ b/src/Container.cc @@ -61,12 +61,11 @@ void Container::moveResize(int x, int y, repositionItems(); } -/* +#ifdef NOT_USED void Container::move(int x, int y) { FbTk::FbWindow::move(x, y); // no need to reposition } -*/ void Container::insertItems(ItemList &item_list, int pos) { @@ -96,6 +95,7 @@ void Container::insertItems(ItemList &item_list, int pos) { // update position repositionItems(); } +#endif void Container::insertItem(Item item, int pos) { if (find(item) != -1) diff --git a/src/Container.hh b/src/Container.hh index a13ddcd..fc770fc 100644 --- a/src/Container.hh +++ b/src/Container.hh @@ -55,7 +55,9 @@ public: void moveResize(int x, int y, unsigned int width, unsigned int height); +#ifdef NOT_USED void insertItems(ItemList &list, int position=-1); +#endif void insertItem(Item item, int pos = -1); bool removeItem(int item); // return true if something was removed bool removeItem(Item item); // return true if something was removed diff --git a/src/FbTk/EventHandler.hh b/src/FbTk/EventHandler.hh index 62e2cb9..3d2e545 100644 --- a/src/FbTk/EventHandler.hh +++ b/src/FbTk/EventHandler.hh @@ -54,7 +54,9 @@ public: virtual void exposeEvent(XExposeEvent &) { } virtual void motionNotifyEvent(XMotionEvent &) { } virtual void keyPressEvent(XKeyEvent &) { } +#ifdef NOT_USED virtual void keyReleaseEvent(XKeyEvent &) { } +#endif virtual void leaveNotifyEvent(XCrossingEvent &) { } virtual void enterNotifyEvent(XCrossingEvent &) { } }; diff --git a/src/FbTk/EventManager.cc b/src/FbTk/EventManager.cc index 759c114..3370fb5 100644 --- a/src/FbTk/EventManager.cc +++ b/src/FbTk/EventManager.cc @@ -153,7 +153,9 @@ void EventManager::dispatch(Window win, XEvent &ev, bool parent) { evhand->keyPressEvent(ev.xkey); break; case KeyRelease: +#ifdef NOT_USED evhand->keyReleaseEvent(ev.xkey); +#endif break; case ButtonPress: evhand->buttonPressEvent(ev.xbutton); diff --git a/src/FbTk/FbDrawable.cc b/src/FbTk/FbDrawable.cc index 15ebb7f..061da0b 100644 --- a/src/FbTk/FbDrawable.cc +++ b/src/FbTk/FbDrawable.cc @@ -89,11 +89,13 @@ void FbDrawable::fillPolygon(GC gc, XPoint *points, int npoints, shape, mode); } +#ifdef NOT_USED void FbDrawable::drawPoint(GC gc, int x, int y) { if (drawable() == 0 || gc == 0) return; XDrawPoint(s_display, drawable(), gc, x, y); } +#endif XImage *FbDrawable::image(int x, int y, unsigned int width, unsigned int height) const { return XGetImage(s_display, drawable(), diff --git a/src/FbTk/FbDrawable.hh b/src/FbTk/FbDrawable.hh index 347b207..7590f54 100644 --- a/src/FbTk/FbDrawable.hh +++ b/src/FbTk/FbDrawable.hh @@ -48,7 +48,9 @@ public: virtual void fillPolygon(GC gc, XPoint *points, int npoints, int shape, int mode); +#ifdef NOT_USED virtual void drawPoint(GC gc, int x, int y); +#endif virtual XImage *image(int x, int y, unsigned int width, unsigned int height) const; diff --git a/src/FbTk/FbWindow.cc b/src/FbTk/FbWindow.cc index 090b788..2bf96f6 100644 --- a/src/FbTk/FbWindow.cc +++ b/src/FbTk/FbWindow.cc @@ -449,9 +449,11 @@ void FbWindow::setCursor(Cursor cur) { XDefineCursor(display(), window(), cur); } +#ifdef NOT_USED void FbWindow::unsetCursor() { XUndefineCursor(display(), window()); } +#endif void FbWindow::reparent(const FbWindow &parent, int x, int y, bool continuing) { XReparentWindow(display(), window(), parent.window(), x, y); diff --git a/src/FbTk/FbWindow.hh b/src/FbTk/FbWindow.hh index 1f0c4bd..c5494b0 100644 --- a/src/FbTk/FbWindow.hh +++ b/src/FbTk/FbWindow.hh @@ -140,8 +140,10 @@ public: void setInputFocus(int revert_to, int time); /// defines a cursor for this window void setCursor(Cursor cur); +#ifdef NOT_USED /// uses the parents cursor instead void unsetCursor(); +#endif void reparent(const FbWindow &parent, int x, int y, bool continuing = true); bool property(Atom property, diff --git a/src/FbTk/GContext.hh b/src/FbTk/GContext.hh index a5e41c2..047de6f 100644 --- a/src/FbTk/GContext.hh +++ b/src/FbTk/GContext.hh @@ -93,7 +93,7 @@ public: inline void setFont(int fid) { XSetFont(m_display, m_gc, fid); } - +#ifdef NOT_USED inline void setClipMask(const FbTk::FbPixmap &mask) { XSetClipMask(m_display, m_gc, mask.drawable()); } @@ -101,7 +101,7 @@ public: inline void setClipOrigin(int x, int y) { XSetClipOrigin(m_display, m_gc, x, y); } - +#endif inline void setGraphicsExposure(bool value) { XSetGraphicsExposures(m_display, m_gc, value); } @@ -116,10 +116,11 @@ public: inline void setFillStyle(int style) { XSetFillStyle(m_display, m_gc, style); } +#ifdef NOT_USED inline void setFillRule(int rule) { XSetFillRule(m_display, m_gc, rule); } - +#endif inline void setLineAttributes(unsigned int width, int line_style, int cap_style, diff --git a/src/FbTk/ImageControl.cc b/src/FbTk/ImageControl.cc index 64e3db5..f209958 100644 --- a/src/FbTk/ImageControl.cc +++ b/src/FbTk/ImageControl.cc @@ -311,12 +311,12 @@ void ImageControl::colorTables(const unsigned char **rmt, const unsigned char ** if (bbit) *bbit = blue_bits; } - +#ifdef NOT_USED void ImageControl::getXColorTable(XColor **c, int *n) { if (c) *c = m_colors; if (n) *n = m_num_colors; } - +#endif void ImageControl::getGradientBuffers(unsigned int w, unsigned int h, @@ -373,14 +373,14 @@ void ImageControl::installRootColormap() { XUngrabServer(disp); } - +#ifdef NOT_USED void ImageControl::setColorsPerChannel(int cpc) { if (cpc < 2) cpc = 2; if (cpc > 6) cpc = 6; m_colors_per_channel = cpc; } - +#endif unsigned long ImageControl::getSqrt(unsigned int x) const { if (! sqrt_table) { diff --git a/src/FbTk/ImageControl.hh b/src/FbTk/ImageControl.hh index 18ad8db..a0f1cc7 100644 --- a/src/FbTk/ImageControl.hh +++ b/src/FbTk/ImageControl.hh @@ -70,11 +70,15 @@ public: void removeImage(Pixmap thepix); void colorTables(const unsigned char **, const unsigned char **, const unsigned char **, int *, int *, int *, int *, int *, int *) const; +#ifdef NOT_USED void getXColorTable(XColor **, int *); +#endif void getGradientBuffers(unsigned int, unsigned int, unsigned int **, unsigned int **); void setDither(bool d) { m_dither = d; } +#ifdef NOT_USED void setColorsPerChannel(int cpc); +#endif void cleanCache(); private: diff --git a/src/FbTk/Menu.hh b/src/FbTk/Menu.hh index 26262f2..4490eb8 100644 --- a/src/FbTk/Menu.hh +++ b/src/FbTk/Menu.hh @@ -79,8 +79,10 @@ public: void removeAll(); inline void setInternalMenu(bool val = true) { m_internal_menu = val; } inline void setAlignment(Alignment a) { m_alignment = a; } +#ifdef NOT_USED inline void setTorn() { m_torn = true; } inline void removeParent() { if (m_internal_menu) m_parent = 0; } +#endif /// raise this window virtual void raise(); /// lower this window @@ -127,7 +129,9 @@ public: /// hide menu virtual void hide(); virtual void clearWindow(); +#ifdef NOT_USED void setActiveIndex(int index) { m_active_index = index; } +#endif /*@}*/ /** diff --git a/src/FbTk/SignalHandler.cc b/src/FbTk/SignalHandler.cc index 26f1c6e..a8b4192 100644 --- a/src/FbTk/SignalHandler.cc +++ b/src/FbTk/SignalHandler.cc @@ -62,10 +62,12 @@ bool SignalHandler::registerHandler(int signum, SignalEventHandler *eh, return true; } +#ifdef NOT_USED void SignalHandler::removeHandler(int signum) { if (signum < NSIG) s_signal_handler[signum] = 0; // clear handler pointer } +#endif void SignalHandler::handleSignal(int signum) { if (signum >= NSIG) diff --git a/src/FbTk/SignalHandler.hh b/src/FbTk/SignalHandler.hh index 7b013cf..1f3af4a 100644 --- a/src/FbTk/SignalHandler.hh +++ b/src/FbTk/SignalHandler.hh @@ -54,11 +54,13 @@ public: @param oldhandler_ret return handler to old sighandler */ bool registerHandler(int signum, SignalEventHandler *eh, SignalEventHandler **oldhandler_ret = 0); +#ifdef NOT_USED /** removes the signum handler @param signum signal number */ void removeHandler(int signum); +#endif private: SignalHandler(); diff --git a/src/FbTk/TextButton.cc b/src/FbTk/TextButton.cc index 474c094..948f847 100644 --- a/src/FbTk/TextButton.cc +++ b/src/FbTk/TextButton.cc @@ -98,12 +98,14 @@ void TextButton::setFont(FbTk::Font &font) { font.validOrientation(m_orientation); // load the orientation! } +#ifdef NOT_USED /// set bevel and redraw text void TextButton::setBevel(int bevel) { if (m_bevel == bevel) return; m_bevel = bevel; } +#endif void TextButton::setTextPaddingLeft(unsigned int leftpadding) { m_left_padding = leftpadding; diff --git a/src/FbTk/TextButton.hh b/src/FbTk/TextButton.hh index c9f3fbf..26a2469 100644 --- a/src/FbTk/TextButton.hh +++ b/src/FbTk/TextButton.hh @@ -44,7 +44,9 @@ public: bool setOrientation(FbTk::Orientation orient); void setText(const std::string &text); void setFont(FbTk::Font &font); +#ifdef NOT_USED void setBevel(int bevel); +#endif void setTextPadding(unsigned int padding); void setTextPaddingLeft(unsigned int leftpadding); void setTextPaddingRight(unsigned int rightpadding); diff --git a/src/FbTk/TextureRender.hh b/src/FbTk/TextureRender.hh index 14b5547..7f796b7 100644 --- a/src/FbTk/TextureRender.hh +++ b/src/FbTk/TextureRender.hh @@ -84,7 +84,6 @@ private: void cdgradient(); void pcgradient(); //@} - void makeGradientBuffers(); ImageControl &control; bool interlaced; diff --git a/src/FbWinFrame.hh b/src/FbWinFrame.hh index fc64900..241b435 100644 --- a/src/FbWinFrame.hh +++ b/src/FbWinFrame.hh @@ -279,8 +279,6 @@ private: void applyActiveLabel(FbTk::TextButton &button); void applyButtons(); // only called within applyTitlebar - void getActiveLabelPixmap(Pixmap &label_pm, Pixmap &title_pm, - FbTk::Color &label_color, FbTk::Color &title_color); void getCurrentFocusPixmap(Pixmap &label_pm, Pixmap &title_pm, FbTk::Color &label_color, FbTk::Color &title_color); diff --git a/src/FocusControl.cc b/src/FocusControl.cc index 664d41d..f0d1387 100644 --- a/src/FocusControl.cc +++ b/src/FocusControl.cc @@ -223,24 +223,6 @@ WinClient *FocusControl::lastFocusedWindow(FluxboxWindow &group, WinClient *igno return 0; } -void FocusControl::raiseFocus() { - bool have_focused = false; - - // set have_focused if the currently focused window - // is on this screen - if (focusedWindow()) { - if (focusedWindow()->screen().screenNumber() == m_screen.screenNumber()) { - have_focused = true; - } - } - - // if we have a focused window on this screen and - // number of windows is greater than one raise the focused window - if (m_screen.currentWorkspace()->numberOfWindows() > 1 && have_focused) - focusedWindow()->raise(); - -} - void FocusControl::setScreenFocusedWindow(WinClient &win_client) { // raise newly focused window to the top of the focused list diff --git a/src/FocusControl.hh b/src/FocusControl.hh index 7fcfb2d..d76b51d 100644 --- a/src/FocusControl.hh +++ b/src/FocusControl.hh @@ -72,7 +72,6 @@ public: void prevFocus(int options) { cycleFocus(options, true); } void nextFocus(int options) { cycleFocus(options, false); } void cycleFocus(int options, bool cycle_reverse); - void raiseFocus(); void setScreenFocusedWindow(WinClient &win_client); void setFocusModel(FocusModel model); diff --git a/src/IconbarTool.cc b/src/IconbarTool.cc index 73817f1..7784327 100644 --- a/src/IconbarTool.cc +++ b/src/IconbarTool.cc @@ -511,20 +511,6 @@ void IconbarTool::setMode(Mode mode) { renderTheme(); } -void IconbarTool::setDeiconifyMode(DeiconifyMode mode) { - if (mode == *m_deiconify_mode) - return; - - *m_deiconify_mode = mode; -} - -void IconbarTool::setWheelMode(WheelMode mode) { - if (mode == *m_wheel_mode) - return; - *m_wheel_mode = mode; -} - - unsigned int IconbarTool::width() const { return m_icon_container.width(); } diff --git a/src/IconbarTool.hh b/src/IconbarTool.hh index b40eb41..e39a39b 100644 --- a/src/IconbarTool.hh +++ b/src/IconbarTool.hh @@ -84,8 +84,6 @@ public: void hide(); void setAlignment(Container::Alignment a); void setMode(Mode mode); - void setDeiconifyMode(DeiconifyMode mode); - void setWheelMode(WheelMode mode); void parentMoved() { m_icon_container.parentMoved(); } unsigned int width() const; diff --git a/src/Screen.cc b/src/Screen.cc index 71e4c54..7523f8a 100644 --- a/src/Screen.cc +++ b/src/Screen.cc @@ -744,18 +744,6 @@ void BScreen::addExtraWindowMenu(const FbTk::FbString &label, FbTk::Menu *menu) m_windowmenu->setInternalMenu(); } -void BScreen::removeExtraWindowMenu(FbTk::Menu *menu) { - ExtraMenus::iterator it = find_if(m_extramenus.begin(), - m_extramenus.end(), - FbTk::Compose(bind2nd(equal_to(), menu), - FbTk::Select2nd())); - if (it != m_extramenus.end()) - m_extramenus.erase(it); - // recreate window menu - m_windowmenu.reset(MenuCreator::createMenuType("windowmenu", screenNumber())); - m_windowmenu->setInternalMenu(); -} - void BScreen::hideMenus() { // hide extra menus Fluxbox::instance()->hideExtraMenus(*this); diff --git a/src/Screen.hh b/src/Screen.hh index 29bf26d..430ba96 100644 --- a/src/Screen.hh +++ b/src/Screen.hh @@ -214,7 +214,6 @@ public: // These menus will be marked internal, // and deleted when the window dies (as opposed to Screen void addExtraWindowMenu(const FbTk::FbString &label, FbTk::Menu *menu); - void removeExtraWindowMenu(FbTk::Menu *menu); /// hide all windowmenus except the given one (if given) void hideWindowMenus(const FluxboxWindow* except= 0); @@ -222,7 +221,6 @@ public: inline int getEdgeSnapThreshold() const { return *resource.edge_snap_threshold; } void setRootColormapInstalled(bool r) { root_colormap_installed = r; } - void saveRootCommand(std::string rootcmd) { *resource.rootcommand = rootcmd; } void saveTabPlacement(FbWinFrame::TabPlacement place) { *resource.tab_placement = place; } @@ -347,7 +345,6 @@ public: /// create window frame for client window and attach it FluxboxWindow *createWindow(Window clientwin); FluxboxWindow *createWindow(WinClient &client); - void setupWindowActions(FluxboxWindow &win); /// request workspace space, i.e "don't maximize over this area" Strut *requestStrut(int head, int left, int right, int top, int bottom); /// remove requested space and destroy strut diff --git a/src/Slit.cc b/src/Slit.cc index e1a4b0f..265bf8b 100644 --- a/src/Slit.cc +++ b/src/Slit.cc @@ -1205,17 +1205,6 @@ void Slit::saveClientList() { } } -void Slit::setAutoHide(bool val) { - *m_rc_auto_hide = val; - if (doAutoHide()) { - if (! m_timer.isTiming()) { - if (m_slitmenu.isVisible()) - m_timer.fireOnce(false); - m_timer.start(); - } - } -} - void Slit::setupMenu() { _FB_USES_NLS; using namespace FbTk; diff --git a/src/Slit.hh b/src/Slit.hh index a30933a..35919c6 100644 --- a/src/Slit.hh +++ b/src/Slit.hh @@ -73,7 +73,6 @@ public: void hide() { frame.window.hide(); } void setDirection(Direction dir); void setPlacement(Placement place); - void setAutoHide(bool val); void addClient(Window clientwin); void removeClient(Window clientwin, bool remap = true); void reconfigure(); diff --git a/src/Toolbar.hh b/src/Toolbar.hh index c310748..70e32d8 100644 --- a/src/Toolbar.hh +++ b/src/Toolbar.hh @@ -136,7 +136,6 @@ private: void rearrangeItems(); void deleteItems(); - void updateIconbarGraphics(); void setupMenus(); void clearStrut(); void updateStrut(); diff --git a/src/Window.hh b/src/Window.hh index 5358e54..8ac3918 100644 --- a/src/Window.hh +++ b/src/Window.hh @@ -452,8 +452,6 @@ private: void saveBlackboxAttribs(); void associateClientWindow(bool use_attrs = false, int x = 0, int y = 0, unsigned int width = 1, unsigned int height = 1); - void restoreGravity(); - void setGravityOffsets(); void setState(unsigned long stateval, bool setting_up); // modifies left and top if snap is necessary diff --git a/src/fluxbox.hh b/src/fluxbox.hh index 2a113e5..0eacc8d 100644 --- a/src/fluxbox.hh +++ b/src/fluxbox.hh @@ -152,11 +152,8 @@ public: void shutdown(); void load_rc(BScreen &scr); void saveStyleFilename(const char *val) { m_rc_stylefile = (val == 0 ? "" : val); } - void saveStyleOverlayFilename(const char *val) { m_rc_styleoverlayfile = (val == 0 ? "" : val); } void saveMenuFilename(const char *); void clearMenuFilenames(); - void saveTitlebarFilename(const char *); - void saveSlitlistFilename(const char *val) { m_rc_slitlistfile = (val == 0 ? "" : val); } void saveWindowSearch(Window win, WinClient *winclient); // some windows relate to the group, not the client, so we record separately // searchWindow on these windows will give the active client in the group -- cgit v0.11.2