re-added UnderMouse Placement added NLS support in the new configure system.
jump to
@@ -8,7 +8,7 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m @srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m @srcdir@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m
all-local: Translation.m openbox.cat install-data-local: openbox.cat - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/C"; \ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/C; \ $(INSTALL_DATA) openbox.cat $(DESTDIR)$(pkgdatadir)/nls/C; \@@ -24,7 +24,7 @@ rm -f $(DESTDIR)$(pkgdatadir)/nls/en; \
ln -f -s C $(DESTDIR)$(pkgdatadir)/nls/en; \ fi uninstall-local: - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ rm -f $(DESTDIR)$(pkgdatadir)/nls/C/openbox.cat; \ rm -f $(DESTDIR)$(pkgdatadir)/nls/US_ASCII; \ rm -f $(DESTDIR)$(pkgdatadir)/nls/POSIX; \@@ -42,7 +42,7 @@ awk -f @srcdir@/../convert.awk header=../blackbox-nls.hh \
output=Translation.m $(MFILES) openbox.cat: Translation.m - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ $(gencat_cmd) openbox.cat Translation.m; \ fi
@@ -7,7 +7,7 @@ MAINTAINERCLEANFILES = Makefile.in blackbox-nls.hh
DISTCLEANFILES = blackbox-nls.hh uninstall-local: - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ rmdir $(DESTDIR)$(pkgdatadir)/nls; \ fi distclean-local:
@@ -10,24 +10,24 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m @srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m @srcdir@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m
all-local: openbox.cat install-data-local: openbox.cat - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ echo "Installing catalog in $(THE_NLS_PATH)"; \ $(mkinstalldirs) $(THE_NLS_PATH); \ $(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \ fi uninstall-local: - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ rm -f $(THE_NLS_PATH)/openbox.cat; \ rmdir $(THE_NLS_PATH); \ fi Translation.m: $(MFILES) - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \ fi openbox.cat: Translation.m - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ $(gencat_cmd) openbox.cat Translation.m; \ fi
@@ -10,7 +10,7 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m @srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m @srcdir@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m
all-local: openbox.cat install-data-local: openbox.cat - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ echo "Installing catalog in $(THE_NLS_PATH)"; \ $(mkinstalldirs) $(THE_NLS_PATH); \ $(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \@@ -18,19 +18,19 @@ rm -f $(DESTDIR)$(pkgdatadir)/nls/de; \
ln -f -s de_DE $(DESTDIR)$(pkgdatadir)/nls/de; \ fi uninstall-local: - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ rm -f $(THE_NLS_PATH)/openbox.cat; \ rm -f $(DESTDIR)$(pkgdatadir)/nls/de; \ rmdir $(THE_NLS_PATH); \ fi Translation.m: $(MFILES) - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \ fi openbox.cat: Translation.m - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ $(gencat_cmd) openbox.cat Translation.m; \ fi
@@ -10,7 +10,7 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m @srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m @srcdir@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m
all-local: openbox.cat install-data-local: openbox.cat - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ echo "Installing catalog in $(THE_NLS_PATH)"; \ $(mkinstalldirs) $(THE_NLS_PATH); \ $(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \@@ -18,19 +18,19 @@ rm -f $(DESTDIR)$(pkgdatadir)/nls/es; \
ln -f -s es_ES $(DESTDIR)$(pkgdatadir)/nls/es; \ fi uninstall-local: - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ rm -f $(THE_NLS_PATH)/openbox.cat; \ rm -f $(DESTDIR)$(pkgdatadir)/nls/es; \ rmdir $(THE_NLS_PATH); \ fi Translation.m: $(MFILES) - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \ fi openbox.cat: Translation.m - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ $(gencat_cmd) openbox.cat Translation.m; \ fi
@@ -10,24 +10,24 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m @srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m @srcdir@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m
all-local: openbox.cat install-data-local: openbox.cat - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ echo "Installing catalog in $(THE_NLS_PATH)"; \ $(mkinstalldirs) $(THE_NLS_PATH); \ $(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \ fi uninstall-local: - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ rm -f $(THE_NLS_PATH)/openbox.cat; \ rmdir $(THE_NLS_PATH); \ fi Translation.m: $(MFILES) - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \ fi openbox.cat: Translation.m - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ $(gencat_cmd) openbox.cat Translation.m; \ fi
@@ -10,7 +10,7 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m @srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m @srcdir@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m
all-local: openbox.cat install-data-local: openbox.cat - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ echo "Installing catalog in $(THE_NLS_PATH)"; \ $(mkinstalldirs) $(THE_NLS_PATH); \ $(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \@@ -18,19 +18,19 @@ rm -f $(DESTDIR)$(pkgdatadir)/nls/fr; \
ln -f -s fr_FR $(DESTDIR)$(pkgdatadir)/nls/fr; \ fi uninstall-local: - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ rm -f $(THE_NLS_PATH)/openbox.cat; \ rm -f $(DESTDIR)$(pkgdatadir)/nls/fr; \ rmdir $(THE_NLS_PATH); \ fi Translation.m: $(MFILES) - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \ fi openbox.cat: Translation.m - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ $(gencat_cmd) openbox.cat Translation.m; \ fi
@@ -10,24 +10,24 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m @srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m @srcdir@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m
all-local: openbox.cat install-data-local: openbox.cat - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ echo "Installing catalog in $(THE_NLS_PATH)"; \ $(mkinstalldirs) $(THE_NLS_PATH); \ $(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \ fi uninstall-local: - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ rm -f $(THE_NLS_PATH)/openbox.cat; \ rmdir $(THE_NLS_PATH); \ fi Translation.m: $(MFILES) - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \ fi openbox.cat: Translation.m - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ $(gencat_cmd) openbox.cat Translation.m; \ fi
@@ -10,27 +10,27 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m @srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m @srcdir@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m
all-local: openbox.cat install-data-local: openbox.cat - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ echo "Installing catalog in $(THE_NLS_PATH)"; \ $(mkinstalldirs) $(THE_NLS_PATH); \ $(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \ - rm -f $(DESTDIR)$(pkgdatadir)/nls/it; \ - ln -f -s it_IT $(DESTDIR)$(pkgdatadir)/nls/it; \ - fi + rm -f $(DESTDIR)$(pkgdatadir)/nls/it; \ + ln -f -s it_IT $(DESTDIR)$(pkgdatadir)/nls/it; \ +fi uninstall-local: - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ rm -f $(THE_NLS_PATH)/openbox.cat; \ rm -f $(DESTDIR)$(pkgdatadir)/nls/it; \ rmdir $(THE_NLS_PATH); \ fi Translation.m: $(MFILES) - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \ fi openbox.cat: Translation.m - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ $(gencat_cmd) openbox.cat Translation.m; \ fi
@@ -10,24 +10,24 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m @srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m @srcdir@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m
all-local: openbox.cat install-data-local: openbox.cat - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ echo "Installing catalog in $(THE_NLS_PATH)"; \ $(mkinstalldirs) $(THE_NLS_PATH); \ $(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \ fi uninstall-local: - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ rm -f $(THE_NLS_PATH)/openbox.cat; \ rmdir $(THE_NLS_PATH); \ fi Translation.m: $(MFILES) - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \ fi openbox.cat: Translation.m - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ $(gencat_cmd) openbox.cat Translation.m; \ fi
@@ -10,27 +10,27 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m @srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m @srcdir@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m
all-local: openbox.cat install-data-local: openbox.cat - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ echo "Installing catalog in $(THE_NLS_PATH)"; \ $(mkinstalldirs) $(THE_NLS_PATH); \ $(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \ - rm -f $(DESTDIR)$(pkgdatadir)/nls/nl; \ - ln -f -s nl_NL $(DESTDIR)$(pkgdatadir)/nls/nl; \ - fi + rm -f $(DESTDIR)$(pkgdatadir)/nls/nl; \ + ln -f -s nl_NL $(DESTDIR)$(pkgdatadir)/nls/nl; \ +fi uninstall-local: - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ rm -f $(THE_NLS_PATH)/openbox.cat; \ rm -f $(DESTDIR)$(pkgdatadir)/nls/nl; \ rmdir $(THE_NLS_PATH); \ fi Translation.m: $(MFILES) - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \ fi openbox.cat: Translation.m - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ $(gencat_cmd) openbox.cat Translation.m; \ fi
@@ -10,24 +10,24 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m @srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m @srcdir@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m
all-local: openbox.cat install-data-local: openbox.cat - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ echo "Installing catalog in $(THE_NLS_PATH)"; \ $(mkinstalldirs) $(THE_NLS_PATH); \ $(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \ fi uninstall-local: - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ rm -f $(THE_NLS_PATH)/openbox.cat; \ rmdir $(THE_NLS_PATH); \ fi Translation.m: $(MFILES) - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \ fi openbox.cat: Translation.m - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ $(gencat_cmd) openbox.cat Translation.m; \ fi
@@ -10,24 +10,24 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m @srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m @srcdir@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m
all-local: openbox.cat install-data-local: openbox.cat - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ echo "Installing catalog in $(THE_NLS_PATH)"; \ $(mkinstalldirs) $(THE_NLS_PATH); \ $(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \ fi uninstall-local: - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ rm -f $(THE_NLS_PATH)/openbox.cat; \ rmdir $(THE_NLS_PATH); \ fi Translation.m: $(MFILES) - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \ fi openbox.cat: Translation.m - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ $(gencat_cmd) openbox.cat Translation.m; \ fi
@@ -10,24 +10,24 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m @srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m @srcdir@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m
all-local: openbox.cat install-data-local: openbox.cat - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ echo "Installing catalog in $(THE_NLS_PATH)"; \ $(mkinstalldirs) $(THE_NLS_PATH); \ $(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \ fi uninstall-local: - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ rm -f $(THE_NLS_PATH)/openbox.cat; \ rmdir $(THE_NLS_PATH); \ fi Translation.m: $(MFILES) - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \ fi openbox.cat: Translation.m - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ $(gencat_cmd) openbox.cat Translation.m; \ fi
@@ -10,24 +10,24 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m @srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m @srcdir@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m
all-local: openbox.cat install-data-local: openbox.cat - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ echo "Installing catalog in $(THE_NLS_PATH)"; \ $(mkinstalldirs) $(THE_NLS_PATH); \ $(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \ fi uninstall-local: - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ rm -f $(THE_NLS_PATH)/openbox.cat; \ rmdir $(THE_NLS_PATH); \ fi Translation.m: $(MFILES) - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \ fi openbox.cat: Translation.m - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ $(gencat_cmd) openbox.cat Translation.m; \ fi
@@ -10,24 +10,24 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m @srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m @srcdir@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m
all-local: openbox.cat install-data-local: openbox.cat - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ echo "Installing catalog in $(THE_NLS_PATH)"; \ $(mkinstalldirs) $(THE_NLS_PATH); \ $(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \ fi uninstall-local: - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ rm -f $(THE_NLS_PATH)/openbox.cat; \ rmdir $(THE_NLS_PATH); \ fi Translation.m: $(MFILES) - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \ fi openbox.cat: Translation.m - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ $(gencat_cmd) openbox.cat Translation.m; \ fi
@@ -10,24 +10,24 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m @srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m @srcdir@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m
all-local: openbox.cat install-data-local: openbox.cat - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ echo "Installing catalog in $(THE_NLS_PATH)"; \ $(mkinstalldirs) $(THE_NLS_PATH); \ $(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \ fi uninstall-local: - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ rm -f $(THE_NLS_PATH)/openbox.cat; \ rmdir $(THE_NLS_PATH); \ fi Translation.m: $(MFILES) - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \ fi openbox.cat: Translation.m - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ $(gencat_cmd) openbox.cat Translation.m; \ fi
@@ -10,24 +10,24 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m @srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m @srcdir@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m
all-local: openbox.cat install-data-local: openbox.cat - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ echo "Installing catalog in $(THE_NLS_PATH)"; \ $(mkinstalldirs) $(THE_NLS_PATH); \ $(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \ fi uninstall-local: - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ rm -f $(THE_NLS_PATH)/openbox.cat; \ rmdir $(THE_NLS_PATH); \ fi Translation.m: $(MFILES) - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \ fi openbox.cat: Translation.m - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ $(gencat_cmd) openbox.cat Translation.m; \ fi
@@ -10,24 +10,24 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m @srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m @srcdir@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m
all-local: openbox.cat install-data-local: openbox.cat - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ echo "Installing catalog in $(THE_NLS_PATH)"; \ $(mkinstalldirs) $(THE_NLS_PATH); \ $(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \ fi uninstall-local: - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ rm -f $(THE_NLS_PATH)/openbox.cat; \ rmdir $(THE_NLS_PATH); \ fi Translation.m: $(MFILES) - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \ fi openbox.cat: Translation.m - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ $(gencat_cmd) openbox.cat Translation.m; \ fi
@@ -190,8 +190,8 @@ void LoadStyle(void);
public: - enum { RowSmartPlacement = 1, ColSmartPlacement, CascadePlacement, LeftRight, - RightLeft, TopBottom, BottomTop }; + enum { RowSmartPlacement = 1, ColSmartPlacement, CascadePlacement, + UnderMousePlacement, LeftRight, RightLeft, TopBottom, BottomTop }; enum { RoundBullet = 1, TriangleBullet, SquareBullet, NoBullet }; enum { Restart = 1, RestartOther, Exit, Shutdown, Execute, Reconfigure, WindowShade, WindowIconify, WindowMaximize, WindowClose, WindowRaise,
@@ -556,6 +556,31 @@ return True;
} +bool Workspace::underMousePlacement(Rect &win, const Rect &availableArea) { + int x, y, rx, ry; + Window c, r; + unsigned int m; + XQueryPointer(screen->getBlackbox()->getXDisplay(), screen->getRootWindow(), + &r, &c, &rx, &ry, &x, &y, &m); + x = rx - win.width() / 2; + y = ry - win.height() / 2; + + if (x < availableArea.x()) + x = availableArea.x(); + if (y < availableArea.y()) + y = availableArea.y(); + if (x + win.width() > availableArea.x() + availableArea.width()) + x = availableArea.x() + availableArea.width() - win.width(); + if (y + win.height() > availableArea.y() + availableArea.height()) + y = availableArea.y() + availableArea.height() - win.height(); + + win.setX(x); + win.setY(y); + + return True; +} + + bool Workspace::cascadePlacement(Rect &win, const Rect &availableArea) { if ((cascade_x > static_cast<signed>(availableArea.width() / 2)) || (cascade_y > static_cast<signed>(availableArea.height() / 2)))@@ -583,6 +608,8 @@ case BScreen::RowSmartPlacement:
case BScreen::ColSmartPlacement: placed = smartPlacement(new_win, availableArea); break; + case BScreen::UnderMousePlacement: + placed = underMousePlacement(new_win, availableArea); default: break; // handled below } // switch
@@ -64,6 +64,7 @@
void placeWindow(BlackboxWindow *win); bool cascadePlacement(Rect& win, const Rect& availableArea); bool smartPlacement(Rect& win, const Rect& availableArea); + bool underMousePlacement(Rect& win, const Rect& availableArea); public: Workspace(BScreen *scrn, unsigned int i = 0);