more dead functions

This commit is contained in:
markt 2006-07-01 02:56:46 +00:00
parent a14c322dcb
commit 698539d9b9
31 changed files with 40 additions and 83 deletions

View file

@ -44,8 +44,6 @@ public:
void enterNotifyEvent(XCrossingEvent &ce); void enterNotifyEvent(XCrossingEvent &ce);
void leaveNotifyEvent(XCrossingEvent &ce); void leaveNotifyEvent(XCrossingEvent &ce);
void setMouseMotionHandler(FbTk::EventHandler *eh) { m_mouse_handler = eh; }
void updateTheme(const FbTk::Theme &theme); void updateTheme(const FbTk::Theme &theme);
private: private:
void drawArrow(); void drawArrow();

View file

@ -67,7 +67,6 @@ public:
bool addTerm(const std::string &str, WinProperty prop); bool addTerm(const std::string &str, WinProperty prop);
inline void addMatch() { ++m_nummatches; } inline void addMatch() { ++m_nummatches; }
inline void delMatch() { --m_nummatches; }
inline bool operator == (const WinClient &win) const { inline bool operator == (const WinClient &win) const {
return match(win); return match(win);

View file

@ -61,12 +61,11 @@ void Container::moveResize(int x, int y,
repositionItems(); repositionItems();
} }
/* #ifdef NOT_USED
void Container::move(int x, int y) { void Container::move(int x, int y) {
FbTk::FbWindow::move(x, y); FbTk::FbWindow::move(x, y);
// no need to reposition // no need to reposition
} }
*/
void Container::insertItems(ItemList &item_list, int pos) { void Container::insertItems(ItemList &item_list, int pos) {
@ -96,6 +95,7 @@ void Container::insertItems(ItemList &item_list, int pos) {
// update position // update position
repositionItems(); repositionItems();
} }
#endif
void Container::insertItem(Item item, int pos) { void Container::insertItem(Item item, int pos) {
if (find(item) != -1) if (find(item) != -1)

View file

@ -55,7 +55,9 @@ public:
void moveResize(int x, int y, void moveResize(int x, int y,
unsigned int width, unsigned int height); unsigned int width, unsigned int height);
#ifdef NOT_USED
void insertItems(ItemList &list, int position=-1); void insertItems(ItemList &list, int position=-1);
#endif
void insertItem(Item item, int pos = -1); void insertItem(Item item, int pos = -1);
bool removeItem(int item); // return true if something was removed bool removeItem(int item); // return true if something was removed
bool removeItem(Item item); // return true if something was removed bool removeItem(Item item); // return true if something was removed

View file

@ -54,7 +54,9 @@ public:
virtual void exposeEvent(XExposeEvent &) { } virtual void exposeEvent(XExposeEvent &) { }
virtual void motionNotifyEvent(XMotionEvent &) { } virtual void motionNotifyEvent(XMotionEvent &) { }
virtual void keyPressEvent(XKeyEvent &) { } virtual void keyPressEvent(XKeyEvent &) { }
#ifdef NOT_USED
virtual void keyReleaseEvent(XKeyEvent &) { } virtual void keyReleaseEvent(XKeyEvent &) { }
#endif
virtual void leaveNotifyEvent(XCrossingEvent &) { } virtual void leaveNotifyEvent(XCrossingEvent &) { }
virtual void enterNotifyEvent(XCrossingEvent &) { } virtual void enterNotifyEvent(XCrossingEvent &) { }
}; };

View file

@ -153,7 +153,9 @@ void EventManager::dispatch(Window win, XEvent &ev, bool parent) {
evhand->keyPressEvent(ev.xkey); evhand->keyPressEvent(ev.xkey);
break; break;
case KeyRelease: case KeyRelease:
#ifdef NOT_USED
evhand->keyReleaseEvent(ev.xkey); evhand->keyReleaseEvent(ev.xkey);
#endif
break; break;
case ButtonPress: case ButtonPress:
evhand->buttonPressEvent(ev.xbutton); evhand->buttonPressEvent(ev.xbutton);

View file

@ -89,11 +89,13 @@ void FbDrawable::fillPolygon(GC gc, XPoint *points, int npoints,
shape, mode); shape, mode);
} }
#ifdef NOT_USED
void FbDrawable::drawPoint(GC gc, int x, int y) { void FbDrawable::drawPoint(GC gc, int x, int y) {
if (drawable() == 0 || gc == 0) if (drawable() == 0 || gc == 0)
return; return;
XDrawPoint(s_display, drawable(), gc, x, y); XDrawPoint(s_display, drawable(), gc, x, y);
} }
#endif
XImage *FbDrawable::image(int x, int y, unsigned int width, unsigned int height) const { XImage *FbDrawable::image(int x, int y, unsigned int width, unsigned int height) const {
return XGetImage(s_display, drawable(), return XGetImage(s_display, drawable(),

View file

@ -48,7 +48,9 @@ public:
virtual void fillPolygon(GC gc, XPoint *points, int npoints, virtual void fillPolygon(GC gc, XPoint *points, int npoints,
int shape, int mode); int shape, int mode);
#ifdef NOT_USED
virtual void drawPoint(GC gc, int x, int y); virtual void drawPoint(GC gc, int x, int y);
#endif
virtual XImage *image(int x, int y, unsigned int width, unsigned int height) const; virtual XImage *image(int x, int y, unsigned int width, unsigned int height) const;

View file

@ -449,9 +449,11 @@ void FbWindow::setCursor(Cursor cur) {
XDefineCursor(display(), window(), cur); XDefineCursor(display(), window(), cur);
} }
#ifdef NOT_USED
void FbWindow::unsetCursor() { void FbWindow::unsetCursor() {
XUndefineCursor(display(), window()); XUndefineCursor(display(), window());
} }
#endif
void FbWindow::reparent(const FbWindow &parent, int x, int y, bool continuing) { void FbWindow::reparent(const FbWindow &parent, int x, int y, bool continuing) {
XReparentWindow(display(), window(), parent.window(), x, y); XReparentWindow(display(), window(), parent.window(), x, y);

View file

@ -140,8 +140,10 @@ public:
void setInputFocus(int revert_to, int time); void setInputFocus(int revert_to, int time);
/// defines a cursor for this window /// defines a cursor for this window
void setCursor(Cursor cur); void setCursor(Cursor cur);
#ifdef NOT_USED
/// uses the parents cursor instead /// uses the parents cursor instead
void unsetCursor(); void unsetCursor();
#endif
void reparent(const FbWindow &parent, int x, int y, bool continuing = true); void reparent(const FbWindow &parent, int x, int y, bool continuing = true);
bool property(Atom property, bool property(Atom property,

View file

@ -93,7 +93,7 @@ public:
inline void setFont(int fid) { inline void setFont(int fid) {
XSetFont(m_display, m_gc, fid); XSetFont(m_display, m_gc, fid);
} }
#ifdef NOT_USED
inline void setClipMask(const FbTk::FbPixmap &mask) { inline void setClipMask(const FbTk::FbPixmap &mask) {
XSetClipMask(m_display, m_gc, mask.drawable()); XSetClipMask(m_display, m_gc, mask.drawable());
} }
@ -101,7 +101,7 @@ public:
inline void setClipOrigin(int x, int y) { inline void setClipOrigin(int x, int y) {
XSetClipOrigin(m_display, m_gc, x, y); XSetClipOrigin(m_display, m_gc, x, y);
} }
#endif
inline void setGraphicsExposure(bool value) { inline void setGraphicsExposure(bool value) {
XSetGraphicsExposures(m_display, m_gc, value); XSetGraphicsExposures(m_display, m_gc, value);
} }
@ -116,10 +116,11 @@ public:
inline void setFillStyle(int style) { inline void setFillStyle(int style) {
XSetFillStyle(m_display, m_gc, style); XSetFillStyle(m_display, m_gc, style);
} }
#ifdef NOT_USED
inline void setFillRule(int rule) { inline void setFillRule(int rule) {
XSetFillRule(m_display, m_gc, rule); XSetFillRule(m_display, m_gc, rule);
} }
#endif
inline void setLineAttributes(unsigned int width, inline void setLineAttributes(unsigned int width,
int line_style, int line_style,
int cap_style, int cap_style,

View file

@ -311,12 +311,12 @@ void ImageControl::colorTables(const unsigned char **rmt, const unsigned char **
if (bbit) *bbit = blue_bits; if (bbit) *bbit = blue_bits;
} }
#ifdef NOT_USED
void ImageControl::getXColorTable(XColor **c, int *n) { void ImageControl::getXColorTable(XColor **c, int *n) {
if (c) *c = m_colors; if (c) *c = m_colors;
if (n) *n = m_num_colors; if (n) *n = m_num_colors;
} }
#endif
void ImageControl::getGradientBuffers(unsigned int w, void ImageControl::getGradientBuffers(unsigned int w,
unsigned int h, unsigned int h,
@ -373,14 +373,14 @@ void ImageControl::installRootColormap() {
XUngrabServer(disp); XUngrabServer(disp);
} }
#ifdef NOT_USED
void ImageControl::setColorsPerChannel(int cpc) { void ImageControl::setColorsPerChannel(int cpc) {
if (cpc < 2) cpc = 2; if (cpc < 2) cpc = 2;
if (cpc > 6) cpc = 6; if (cpc > 6) cpc = 6;
m_colors_per_channel = cpc; m_colors_per_channel = cpc;
} }
#endif
unsigned long ImageControl::getSqrt(unsigned int x) const { unsigned long ImageControl::getSqrt(unsigned int x) const {
if (! sqrt_table) { if (! sqrt_table) {

View file

@ -70,11 +70,15 @@ public:
void removeImage(Pixmap thepix); void removeImage(Pixmap thepix);
void colorTables(const unsigned char **, const unsigned char **, const unsigned char **, void colorTables(const unsigned char **, const unsigned char **, const unsigned char **,
int *, int *, int *, int *, int *, int *) const; int *, int *, int *, int *, int *, int *) const;
#ifdef NOT_USED
void getXColorTable(XColor **, int *); void getXColorTable(XColor **, int *);
#endif
void getGradientBuffers(unsigned int, unsigned int, void getGradientBuffers(unsigned int, unsigned int,
unsigned int **, unsigned int **); unsigned int **, unsigned int **);
void setDither(bool d) { m_dither = d; } void setDither(bool d) { m_dither = d; }
#ifdef NOT_USED
void setColorsPerChannel(int cpc); void setColorsPerChannel(int cpc);
#endif
void cleanCache(); void cleanCache();
private: private:

View file

@ -79,8 +79,10 @@ public:
void removeAll(); void removeAll();
inline void setInternalMenu(bool val = true) { m_internal_menu = val; } inline void setInternalMenu(bool val = true) { m_internal_menu = val; }
inline void setAlignment(Alignment a) { m_alignment = a; } inline void setAlignment(Alignment a) { m_alignment = a; }
#ifdef NOT_USED
inline void setTorn() { m_torn = true; } inline void setTorn() { m_torn = true; }
inline void removeParent() { if (m_internal_menu) m_parent = 0; } inline void removeParent() { if (m_internal_menu) m_parent = 0; }
#endif
/// raise this window /// raise this window
virtual void raise(); virtual void raise();
/// lower this window /// lower this window
@ -127,7 +129,9 @@ public:
/// hide menu /// hide menu
virtual void hide(); virtual void hide();
virtual void clearWindow(); virtual void clearWindow();
#ifdef NOT_USED
void setActiveIndex(int index) { m_active_index = index; } void setActiveIndex(int index) { m_active_index = index; }
#endif
/*@}*/ /*@}*/
/** /**

View file

@ -62,10 +62,12 @@ bool SignalHandler::registerHandler(int signum, SignalEventHandler *eh,
return true; return true;
} }
#ifdef NOT_USED
void SignalHandler::removeHandler(int signum) { void SignalHandler::removeHandler(int signum) {
if (signum < NSIG) if (signum < NSIG)
s_signal_handler[signum] = 0; // clear handler pointer s_signal_handler[signum] = 0; // clear handler pointer
} }
#endif
void SignalHandler::handleSignal(int signum) { void SignalHandler::handleSignal(int signum) {
if (signum >= NSIG) if (signum >= NSIG)

View file

@ -54,11 +54,13 @@ public:
@param oldhandler_ret return handler to old sighandler @param oldhandler_ret return handler to old sighandler
*/ */
bool registerHandler(int signum, SignalEventHandler *eh, SignalEventHandler **oldhandler_ret = 0); bool registerHandler(int signum, SignalEventHandler *eh, SignalEventHandler **oldhandler_ret = 0);
#ifdef NOT_USED
/** /**
removes the signum handler removes the signum handler
@param signum signal number @param signum signal number
*/ */
void removeHandler(int signum); void removeHandler(int signum);
#endif
private: private:
SignalHandler(); SignalHandler();

View file

@ -98,12 +98,14 @@ void TextButton::setFont(FbTk::Font &font) {
font.validOrientation(m_orientation); // load the orientation! font.validOrientation(m_orientation); // load the orientation!
} }
#ifdef NOT_USED
/// set bevel and redraw text /// set bevel and redraw text
void TextButton::setBevel(int bevel) { void TextButton::setBevel(int bevel) {
if (m_bevel == bevel) if (m_bevel == bevel)
return; return;
m_bevel = bevel; m_bevel = bevel;
} }
#endif
void TextButton::setTextPaddingLeft(unsigned int leftpadding) { void TextButton::setTextPaddingLeft(unsigned int leftpadding) {
m_left_padding = leftpadding; m_left_padding = leftpadding;

View file

@ -44,7 +44,9 @@ public:
bool setOrientation(FbTk::Orientation orient); bool setOrientation(FbTk::Orientation orient);
void setText(const std::string &text); void setText(const std::string &text);
void setFont(FbTk::Font &font); void setFont(FbTk::Font &font);
#ifdef NOT_USED
void setBevel(int bevel); void setBevel(int bevel);
#endif
void setTextPadding(unsigned int padding); void setTextPadding(unsigned int padding);
void setTextPaddingLeft(unsigned int leftpadding); void setTextPaddingLeft(unsigned int leftpadding);
void setTextPaddingRight(unsigned int rightpadding); void setTextPaddingRight(unsigned int rightpadding);

View file

@ -84,7 +84,6 @@ private:
void cdgradient(); void cdgradient();
void pcgradient(); void pcgradient();
//@} //@}
void makeGradientBuffers();
ImageControl &control; ImageControl &control;
bool interlaced; bool interlaced;

View file

@ -279,8 +279,6 @@ private:
void applyActiveLabel(FbTk::TextButton &button); void applyActiveLabel(FbTk::TextButton &button);
void applyButtons(); // only called within applyTitlebar 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, void getCurrentFocusPixmap(Pixmap &label_pm, Pixmap &title_pm,
FbTk::Color &label_color, FbTk::Color &title_color); FbTk::Color &label_color, FbTk::Color &title_color);

View file

@ -223,24 +223,6 @@ WinClient *FocusControl::lastFocusedWindow(FluxboxWindow &group, WinClient *igno
return 0; 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) { void FocusControl::setScreenFocusedWindow(WinClient &win_client) {
// raise newly focused window to the top of the focused list // raise newly focused window to the top of the focused list

View file

@ -72,7 +72,6 @@ public:
void prevFocus(int options) { cycleFocus(options, true); } void prevFocus(int options) { cycleFocus(options, true); }
void nextFocus(int options) { cycleFocus(options, false); } void nextFocus(int options) { cycleFocus(options, false); }
void cycleFocus(int options, bool cycle_reverse); void cycleFocus(int options, bool cycle_reverse);
void raiseFocus();
void setScreenFocusedWindow(WinClient &win_client); void setScreenFocusedWindow(WinClient &win_client);
void setFocusModel(FocusModel model); void setFocusModel(FocusModel model);

View file

@ -511,20 +511,6 @@ void IconbarTool::setMode(Mode mode) {
renderTheme(); 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 { unsigned int IconbarTool::width() const {
return m_icon_container.width(); return m_icon_container.width();
} }

View file

@ -84,8 +84,6 @@ public:
void hide(); void hide();
void setAlignment(Container::Alignment a); void setAlignment(Container::Alignment a);
void setMode(Mode mode); void setMode(Mode mode);
void setDeiconifyMode(DeiconifyMode mode);
void setWheelMode(WheelMode mode);
void parentMoved() { m_icon_container.parentMoved(); } void parentMoved() { m_icon_container.parentMoved(); }
unsigned int width() const; unsigned int width() const;

View file

@ -744,18 +744,6 @@ void BScreen::addExtraWindowMenu(const FbTk::FbString &label, FbTk::Menu *menu)
m_windowmenu->setInternalMenu(); 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<FbTk::Menu *>(), menu),
FbTk::Select2nd<ExtraMenus::value_type>()));
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() { void BScreen::hideMenus() {
// hide extra menus // hide extra menus
Fluxbox::instance()->hideExtraMenus(*this); Fluxbox::instance()->hideExtraMenus(*this);

View file

@ -214,7 +214,6 @@ public:
// These menus will be marked internal, // These menus will be marked internal,
// and deleted when the window dies (as opposed to Screen // and deleted when the window dies (as opposed to Screen
void addExtraWindowMenu(const FbTk::FbString &label, FbTk::Menu *menu); void addExtraWindowMenu(const FbTk::FbString &label, FbTk::Menu *menu);
void removeExtraWindowMenu(FbTk::Menu *menu);
/// hide all windowmenus except the given one (if given) /// hide all windowmenus except the given one (if given)
void hideWindowMenus(const FluxboxWindow* except= 0); void hideWindowMenus(const FluxboxWindow* except= 0);
@ -222,7 +221,6 @@ public:
inline int getEdgeSnapThreshold() const { return *resource.edge_snap_threshold; } inline int getEdgeSnapThreshold() const { return *resource.edge_snap_threshold; }
void setRootColormapInstalled(bool r) { root_colormap_installed = r; } 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; } void saveTabPlacement(FbWinFrame::TabPlacement place) { *resource.tab_placement = place; }
@ -347,7 +345,6 @@ public:
/// create window frame for client window and attach it /// create window frame for client window and attach it
FluxboxWindow *createWindow(Window clientwin); FluxboxWindow *createWindow(Window clientwin);
FluxboxWindow *createWindow(WinClient &client); FluxboxWindow *createWindow(WinClient &client);
void setupWindowActions(FluxboxWindow &win);
/// request workspace space, i.e "don't maximize over this area" /// request workspace space, i.e "don't maximize over this area"
Strut *requestStrut(int head, int left, int right, int top, int bottom); Strut *requestStrut(int head, int left, int right, int top, int bottom);
/// remove requested space and destroy strut /// remove requested space and destroy strut

View file

@ -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() { void Slit::setupMenu() {
_FB_USES_NLS; _FB_USES_NLS;
using namespace FbTk; using namespace FbTk;

View file

@ -73,7 +73,6 @@ public:
void hide() { frame.window.hide(); } void hide() { frame.window.hide(); }
void setDirection(Direction dir); void setDirection(Direction dir);
void setPlacement(Placement place); void setPlacement(Placement place);
void setAutoHide(bool val);
void addClient(Window clientwin); void addClient(Window clientwin);
void removeClient(Window clientwin, bool remap = true); void removeClient(Window clientwin, bool remap = true);
void reconfigure(); void reconfigure();

View file

@ -136,7 +136,6 @@ private:
void rearrangeItems(); void rearrangeItems();
void deleteItems(); void deleteItems();
void updateIconbarGraphics();
void setupMenus(); void setupMenus();
void clearStrut(); void clearStrut();
void updateStrut(); void updateStrut();

View file

@ -452,8 +452,6 @@ private:
void saveBlackboxAttribs(); void saveBlackboxAttribs();
void associateClientWindow(bool use_attrs = false, int x = 0, int y = 0, unsigned int width = 1, unsigned int height = 1); 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); void setState(unsigned long stateval, bool setting_up);
// modifies left and top if snap is necessary // modifies left and top if snap is necessary

View file

@ -152,11 +152,8 @@ public:
void shutdown(); void shutdown();
void load_rc(BScreen &scr); void load_rc(BScreen &scr);
void saveStyleFilename(const char *val) { m_rc_stylefile = (val == 0 ? "" : val); } 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 saveMenuFilename(const char *);
void clearMenuFilenames(); void clearMenuFilenames();
void saveTitlebarFilename(const char *);
void saveSlitlistFilename(const char *val) { m_rc_slitlistfile = (val == 0 ? "" : val); }
void saveWindowSearch(Window win, WinClient *winclient); void saveWindowSearch(Window win, WinClient *winclient);
// some windows relate to the group, not the client, so we record separately // 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 // searchWindow on these windows will give the active client in the group