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

remove some more useless code

Browse source
This commit is contained in:
Mark Tiefenbruck 2008-05-11 08:54:18 -07:00
parent 518af23488
commit a9fd0f5b26
3 changed files with 8 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/FbCommands.cc
View file

@ -80,7 +80,7 @@ void showMenu(const BScreen &screen, FbTk::Menu &menu) {
// we dont show the menu here because fluxbox // we dont show the menu here because fluxbox
// will bring up the rootmenu after the timed // will bring up the rootmenu after the timed
// reread of the menu // reread of the menu
fb->rereadMenu(true); fb->rereadMenu();
return; return;
} }
} }

26
src/fluxbox.cc
View file

@ -399,7 +399,7 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
//XSynchronize(disp, False); //XSynchronize(disp, False);
sync(false); sync(false);
m_reconfigure_wait = m_reread_menu_wait = false; m_reconfigure_wait = false;
m_resourcemanager.unlock(); m_resourcemanager.unlock();
ungrab(); ungrab();
@ -1484,28 +1484,15 @@ bool Fluxbox::menuTimestampsChanged() const {
return false; return false;
} }
void Fluxbox::rereadMenu(bool show_after_reread) { void Fluxbox::rereadMenu() {
m_reread_menu_wait = true;
m_show_menu_after_reread = show_after_reread;
m_reconfig_timer.start();
}
void Fluxbox::real_rereadMenu() {
clearMenuFilenames(); clearMenuFilenames();
for_each(m_screen_list.begin(), for_each(m_screen_list.begin(),
m_screen_list.end(), m_screen_list.end(),
mem_fun(&BScreen::rereadMenu)); mem_fun(&BScreen::rereadMenu));
if(m_show_menu_after_reread) { FbCommands::ShowRootMenuCmd showcmd;
showcmd.execute();
FbCommands::ShowRootMenuCmd showcmd;
showcmd.execute();
m_show_menu_after_reread = false;
}
} }
void Fluxbox::saveMenuFilename(const char *filename) { void Fluxbox::saveMenuFilename(const char *filename) {
@ -1546,10 +1533,7 @@ void Fluxbox::timed_reconfigure() {
if (m_reconfigure_wait) if (m_reconfigure_wait)
real_reconfigure(); real_reconfigure();
if (m_reread_menu_wait) m_reconfigure_wait = false;
real_rereadMenu();
m_reconfigure_wait = m_reread_menu_wait = false;
} }
void Fluxbox::revertFocus() { void Fluxbox::revertFocus() {

6
src/fluxbox.hh
View file

@ -149,7 +149,7 @@ public:
void removeGroupSearch(Window win); void removeGroupSearch(Window win);
void restart(const char *command = 0); void restart(const char *command = 0);
void reconfigure(); void reconfigure();
void rereadMenu(bool show_after_reread = false); void rereadMenu();
/// reloads the menus if the timestamps changed /// reloads the menus if the timestamps changed
/// handle any system signal sent to the application /// handle any system signal sent to the application
@ -201,7 +201,6 @@ private:
std::string getRcFilename(); std::string getRcFilename();
void load_rc(); void load_rc();
void real_rereadMenu();
void real_reconfigure(); void real_reconfigure();
void handleEvent(XEvent *xe); void handleEvent(XEvent *xe);
@ -251,7 +250,7 @@ private:
Atom m_fluxbox_pid; Atom m_fluxbox_pid;
bool m_reconfigure_wait, m_reread_menu_wait; bool m_reconfigure_wait;
Time m_last_time; Time m_last_time;
Window m_masked; Window m_masked;
std::string m_rc_file; ///< resource filename std::string m_rc_file; ///< resource filename
@ -279,7 +278,6 @@ private:
bool m_starting; bool m_starting;
bool m_restarting; bool m_restarting;
bool m_shutdown; bool m_shutdown;
bool m_show_menu_after_reread;
int m_server_grabs; int m_server_grabs;
int m_randr_event_type; ///< the type number of randr event int m_randr_event_type; ///< the type number of randr event
int m_shape_eventbase; ///< event base for shape events int m_shape_eventbase; ///< event base for shape events