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

move default window menu to ~/.fluxbox/windowmenu

Browse source
This commit is contained in:
Mark Tiefenbruck 2008-06-19 20:48:26 -07:00
parent e71892d99c
commit 1a54fbc67d
10 changed files with 53 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
(Format: Year/Month/Day)
Changes for 1.1
*08/06/20:
* Move default window menu to ~/.fluxbox/windowmenu (Mark)
configure.in data/Makefile.am data/windowmenu Screen.cc
*08/06/08:
* Add (urgent=yes|no) option to client patterns (Mark)
ClientPattern.cc/hh

8
configure.in
View file

@ -537,6 +537,14 @@ AC_ARG_WITH(
)
AC_SUBST(DEFAULT_MENU)
AC_ARG_WITH(
windowmenu,
[ --with-windowmenu=path location windowmenu file (PREFIX/share/fluxbox/windowmenu)],
DEFAULT_WINDOWMENU=$with_windowmenu,
DEFAULT_WINDOWMENU=\$\(prefix\)/share/fluxbox/windowmenu
)
AC_SUBST(DEFAULT_WINDOWMENU)
AC_ARG_WITH(
style,
[ --with-style=path style by default (PREFIX/share/fluxbox/styles/bloe)],

8
data/Makefile.am
View file

@ -9,6 +9,7 @@ DEFAULT_KEYS = @DEFAULT_KEYS@
DEFAULT_APPS = @DEFAULT_APPS@
DEFAULT_OVERLAY = @DEFAULT_OVERLAY@
DEFAULT_INIT = @DEFAULT_INIT@
DEFAULT_WINDOWMENU = @DEFAULT_WINDOWMENU@
SUBDIRS= styles
CLEANFILES= menu menu.in menu.pre menu.bak init apps
@ -19,7 +20,7 @@ all-local: menu init apps
install-pkgdataDATA:
@echo "Installing menu file in $(DESTDIR)$(DEFAULT_MENU)"
$(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_MENU))
$(INSTALL_DATA) menu $(DESTDIR)$(DEFAULT_MENU)
$(INSTALL_DATA) $(srcdir)/menu $(DESTDIR)$(DEFAULT_MENU)
@echo "Installing keys file in $(DESTDIR)$(DEFAULT_KEYS)"
$(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_KEYS))
$(INSTALL_DATA) $(srcdir)/keys $(DESTDIR)$(DEFAULT_KEYS)
@ -31,7 +32,10 @@ install-pkgdataDATA:
$(INSTALL_DATA) $(srcdir)/overlay $(DESTDIR)$(DEFAULT_OVERLAY)
@echo "Installing init file in $(DESTDIR)$(DEFAULT_INIT)"
$(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_INIT))
$(INSTALL_DATA) init $(DESTDIR)$(DEFAULT_INIT)
$(INSTALL_DATA) $(srcdir)/init $(DESTDIR)$(DEFAULT_INIT)
@echo "Installing windowmenu file in $(DESTDIR)$(DEFAULT_WINDOWMENU)"
$(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_WINDOWMENU))
$(INSTALL_DATA) $(srcdir)/windowmenu $(DESTDIR)$(DEFAULT_WINDOWMENU)
distclean-local:
rm -f *\~

2
src/Makefile.am
View file

@ -30,6 +30,7 @@ DEFAULT_KEYSFILE=@DEFAULT_KEYS@
DEFAULT_APPSFILE=@DEFAULT_APPS@
DEFAULT_OVERLAY=@DEFAULT_OVERLAY@
DEFAULT_INITFILE=@DEFAULT_INIT@
DEFAULT_WINDOWMENU=@DEFAULT_WINDOWMENU@
PROGRAM_PREFIX=@program_prefix@
PROGRAM_SUFFIX=@program_suffix@
@ -49,6 +50,7 @@ defaults.hh: Makefile
echo '#define DEFAULT_APPSFILE "$(DEFAULT_APPSFILE)"'; \
echo '#define DEFAULT_OVERLAY "$(DEFAULT_OVERLAY)"'; \
echo '#define DEFAULT_INITFILE "$(DEFAULT_INITFILE)"'; \
echo '#define DEFAULT_WINDOWMENU "$(DEFAULT_WINDOWMENU)"'; \
echo '#define PROGRAM_PREFIX "$(PROGRAM_PREFIX:NONE=)"'; \
echo '#define PROGRAM_SUFFIX "$(PROGRAM_SUFFIX:NONE=)"'; \
echo 'std::string realProgramName(std::string name);'; \

28
src/Screen.cc
View file

@ -278,7 +278,7 @@ BScreen::ScreenResource::ScreenResource(FbTk::ResourceManager &rm,
default_deco(rm, "NORMAL", scrname+".defaultDeco", altscrname+".DefaultDeco"),
rootcommand(rm, "", scrname+".rootCommand", altscrname+".RootCommand"),
tab_placement(rm, FbWinFrame::TOPLEFT, scrname+".tab.placement", altscrname+".Tab.Placement"),
windowmenufile(rm, "", scrname+".windowMenu", altscrname+".WindowMenu"),
windowmenufile(rm, Fluxbox::instance()->getDefaultDataFilename("windowmenu"), scrname+".windowMenu", altscrname+".WindowMenu"),
typing_delay(rm, 0, scrname+".noFocusWhileTypingDelay", altscrname+".NoFocusWhileTypingDelay"),
follow_model(rm, IGNORE_OTHER_WORKSPACES, scrname+".followModel", altscrname+".followModel"),
user_follow_model(rm, FOLLOW_ACTIVE_WINDOW, scrname+".userFollowModel", altscrname+".UserFollowModel"),
@ -1523,6 +1523,12 @@ void BScreen::rereadMenu() {
}
const std::string BScreen::windowMenuFilename() const {
if ((*resource.windowmenufile).empty())
return Fluxbox::instance()->getDefaultDataFilename("windowmenu");
return *resource.windowmenufile;
}
void BScreen::rereadWindowMenu() {
m_windowmenu->removeAll();
@ -1530,26 +1536,6 @@ void BScreen::rereadWindowMenu() {
MenuCreator::createFromFile(windowMenuFilename(), *m_windowmenu,
m_windowmenu->reloadHelper());
if (m_windowmenu->numberOfItems() == 0) {
const char *defaults[] = {
"shade",
"stick",
"maximize",
"iconify",
"raise",
"lower",
"sendto",
"layer",
"alpha",
"extramenus",
"separator",
"close",
0
};
for (unsigned int i=0; defaults[i]; ++i)
MenuCreator::createWindowMenuItem(defaults[i], "", *m_windowmenu);
}
}
void BScreen::addConfigMenu(const FbTk::FbString &label, FbTk::Menu &menu) {

2
src/Screen.hh
View file

@ -120,7 +120,7 @@ public:
bool doShowWindowPos() const { return *resource.show_window_pos; }
bool decorateTransient() const { return *resource.decorate_transient; }
const std::string &defaultDeco() const { return *resource.default_deco; }
const std::string &windowMenuFilename() const { return *resource.windowmenufile; }
const std::string windowMenuFilename() const;
FbTk::ImageControl &imageControl() { return *m_image_control.get(); }
// menus
const FbMenu &rootMenu() const { return *m_rootmenu.get(); }

8
src/Window.cc
View file

@ -2154,11 +2154,11 @@ void FluxboxWindow::restoreAttributes() {
Show the window menu at pos mx, my
*/
void FluxboxWindow::showMenu(int menu_x, int menu_y) {
// move menu directly under titlebar
menu().reloadHelper()->checkReload();
int head = screen().getHead(menu_x, menu_y);
// but not off the screen
// move menu directly under titlebar but not off the screen
if (menu_y < static_cast<signed>(screen().maxTop(head)))
menu_y = screen().maxTop(head);
else if (menu_y + menu().height() >= screen().maxBottom(head))
@ -3648,7 +3648,7 @@ const FbTk::FbWindow &FluxboxWindow::fbWindow() const {
return frame().window();
}
FbTk::Menu &FluxboxWindow::menu() {
FbMenu &FluxboxWindow::menu() {
return screen().windowMenu();
}
@ -3660,7 +3660,7 @@ const FbTk::PixmapWithMask &FluxboxWindow::icon() const {
return (m_client ? m_client->icon() : m_icon);
}
const FbTk::Menu &FluxboxWindow::menu() const {
const FbMenu &FluxboxWindow::menu() const {
return screen().windowMenu();
}

6
src/Window.hh
View file

@ -47,13 +47,13 @@ class FbWinFrameTheme;
class BScreen;
class FbWinFrame;
class FocusControl;
class FbMenu;
namespace FbTk {
class TextButton;
class MenuTheme;
class ImageControl;
class XLayer;
class Menu;
}
/// Creates the window frame and handles any window event for it
@ -439,8 +439,8 @@ public:
FbTk::FbWindow &fbWindow();
const FbTk::FbWindow &fbWindow() const;
FbTk::Menu &menu();
const FbTk::Menu &menu() const;
FbMenu &menu();
const FbMenu &menu() const;
const FbTk::FbWindow &parent() const { return m_parent; }
FbTk::FbWindow &parent() { return m_parent; }

37
src/fluxbox.cc
View file

@ -522,16 +522,15 @@ void Fluxbox::ungrab() {
void Fluxbox::setupConfigFiles() {
bool create_init = false, create_keys = false, create_menu = false,
create_apps = false, create_overlay = false;
create_apps = false, create_overlay = false, create_windowmenu = false;
string dirname = getenv("HOME") + string("/.") + m_RC_PATH + "/";
string init_file, keys_file, menu_file, slitlist_file, apps_file,
overlay_file;
init_file = dirname + m_RC_INIT_FILE;
keys_file = dirname + "keys";
menu_file = dirname + "menu";
apps_file = dirname + "apps";
overlay_file = dirname + "overlay";
string dirname = getDefaultDataFilename("");
string init_file = getDefaultDataFilename(m_RC_INIT_FILE);
string keys_file = getDefaultDataFilename("keys");
string menu_file = getDefaultDataFilename("menu");
string apps_file = getDefaultDataFilename("apps");
string overlay_file = getDefaultDataFilename("overlay");
string windowmenu_file = getDefaultDataFilename("windowmenu");
struct stat buf;
@ -549,6 +548,8 @@ void Fluxbox::setupConfigFiles() {
create_apps = true;
if (stat(overlay_file.c_str(), &buf))
create_overlay = true;
if (stat(windowmenu_file.c_str(), &buf))
create_windowmenu = true;
} else {
#ifdef DEBUG
@ -590,6 +591,9 @@ void Fluxbox::setupConfigFiles() {
if (create_init)
FbTk::FileUtil::copyFile(DEFAULT_INITFILE, init_file.c_str());
if (create_windowmenu)
FbTk::FileUtil::copyFile(DEFAULT_WINDOWMENU, windowmenu_file.c_str());
#define CONFIG_VERSION 8
FbTk::Resource<int> config_version(m_resourcemanager, 0,
"session.configVersion", "Session.ConfigVersion");
@ -1319,18 +1323,14 @@ void Fluxbox::save_rc() {
/// @return filename of resource file
string Fluxbox::getRcFilename() {
if (m_rc_file.empty()) { // set default filename
string defaultfile(getenv("HOME") + string("/.") + m_RC_PATH + string("/") + m_RC_INIT_FILE);
return defaultfile;
}
if (m_rc_file.empty())
return getDefaultDataFilename(m_RC_INIT_FILE);
return m_rc_file;
}
/// Provides default filename of data file
void Fluxbox::getDefaultDataFilename(const char *name, string &filename) const {
filename = string(getenv("HOME") + string("/.") + m_RC_PATH + string("/") + name);
string Fluxbox::getDefaultDataFilename(const char *name) const {
return (getenv("HOME") + string("/.") + m_RC_PATH + string("/") + name);
}
/// loads resources
@ -1359,8 +1359,7 @@ void Fluxbox::load_rc() {
if (!m_rc_slitlistfile->empty()) {
*m_rc_slitlistfile = StringUtil::expandFilename(*m_rc_slitlistfile);
} else {
string filename;
getDefaultDataFilename("slitlist", filename);
string filename = getDefaultDataFilename("slitlist");
m_rc_slitlistfile.setFromString(filename.c_str());
}

2
src/fluxbox.hh
View file

@ -175,7 +175,7 @@ public:
bool haveShape() const { return m_have_shape; }
int shapeEventbase() const { return m_shape_eventbase; }
void getDefaultDataFilename(const char *name, std::string &) const;
std::string getDefaultDataFilename(const char *name) const;
// screen mouse was in at last key event
BScreen *mouseScreen() { return m_mousescreen; }
// screen of window that last key event (i.e. focused window) went to