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

re-added UnderMouse Placement

Browse source 
added NLS support in the new configure system.
This commit is contained in:
Dana Jansens 2002-05-28 12:39:23 +00:00
parent b48e215ca6
commit 12fcb33bfa
23 changed files with 172 additions and 115 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nls/C/Makefile.am
View file

@ -8,7 +8,7 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdi
all-local: Translation.m openbox.cat all-local: Translation.m openbox.cat
install-data-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 $(DESTDIR)$(pkgdatadir)/nls/C"; \ echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/C"; \
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/C; \ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/C; \
$(INSTALL_DATA) openbox.cat $(DESTDIR)$(pkgdatadir)/nls/C; \ $(INSTALL_DATA) openbox.cat $(DESTDIR)$(pkgdatadir)/nls/C; \
@ -24,7 +24,7 @@ install-data-local: openbox.cat
ln -f -s C $(DESTDIR)$(pkgdatadir)/nls/en; \ ln -f -s C $(DESTDIR)$(pkgdatadir)/nls/en; \
fi fi
uninstall-local: 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/C/openbox.cat; \
rm -f $(DESTDIR)$(pkgdatadir)/nls/US_ASCII; \ rm -f $(DESTDIR)$(pkgdatadir)/nls/US_ASCII; \
rm -f $(DESTDIR)$(pkgdatadir)/nls/POSIX; \ rm -f $(DESTDIR)$(pkgdatadir)/nls/POSIX; \
@ -42,7 +42,7 @@ Translation.m: $(MFILES)
output=Translation.m $(MFILES) output=Translation.m $(MFILES)
openbox.cat: Translation.m openbox.cat: Translation.m
@if test x$(NLSTEST) = "x-DNLS"; then \ @if test x$(NLSTEST) = "xyes"; then \
$(gencat_cmd) openbox.cat Translation.m; \ $(gencat_cmd) openbox.cat Translation.m; \
fi fi

2
nls/Makefile.am
View file

@ -7,7 +7,7 @@ MAINTAINERCLEANFILES = Makefile.in blackbox-nls.hh
DISTCLEANFILES = blackbox-nls.hh DISTCLEANFILES = blackbox-nls.hh
uninstall-local: uninstall-local:
@if test x$(NLSTEST) = "x-DNLS"; then \ @if test x$(NLSTEST) = "xyes"; then \
rmdir $(DESTDIR)$(pkgdatadir)/nls; \ rmdir $(DESTDIR)$(pkgdatadir)/nls; \
fi fi
distclean-local: distclean-local:

8
nls/da_DK/Makefile.am
View file

@ -10,24 +10,24 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdi
all-local: openbox.cat all-local: openbox.cat
install-data-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)"; \ echo "Installing catalog in $(THE_NLS_PATH)"; \
$(mkinstalldirs) $(THE_NLS_PATH); \ $(mkinstalldirs) $(THE_NLS_PATH); \
$(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \ $(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \
fi fi
uninstall-local: uninstall-local:
@if test x$(NLSTEST) = "x-DNLS"; then \ @if test x$(NLSTEST) = "xyes"; then \
rm -f $(THE_NLS_PATH)/openbox.cat; \ rm -f $(THE_NLS_PATH)/openbox.cat; \
rmdir $(THE_NLS_PATH); \ rmdir $(THE_NLS_PATH); \
fi fi
Translation.m: $(MFILES) 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); \ awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
fi fi
openbox.cat: Translation.m openbox.cat: Translation.m
@if test x$(NLSTEST) = "x-DNLS"; then \ @if test x$(NLSTEST) = "xyes"; then \
$(gencat_cmd) openbox.cat Translation.m; \ $(gencat_cmd) openbox.cat Translation.m; \
fi fi

8
nls/de_DE/Makefile.am
View file

@ -10,7 +10,7 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdi
all-local: openbox.cat all-local: openbox.cat
install-data-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)"; \ echo "Installing catalog in $(THE_NLS_PATH)"; \
$(mkinstalldirs) $(THE_NLS_PATH); \ $(mkinstalldirs) $(THE_NLS_PATH); \
$(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \ $(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \
@ -18,19 +18,19 @@ install-data-local: openbox.cat
ln -f -s de_DE $(DESTDIR)$(pkgdatadir)/nls/de; \ ln -f -s de_DE $(DESTDIR)$(pkgdatadir)/nls/de; \
fi fi
uninstall-local: uninstall-local:
@if test x$(NLSTEST) = "x-DNLS"; then \ @if test x$(NLSTEST) = "xyes"; then \
rm -f $(THE_NLS_PATH)/openbox.cat; \ rm -f $(THE_NLS_PATH)/openbox.cat; \
rm -f $(DESTDIR)$(pkgdatadir)/nls/de; \ rm -f $(DESTDIR)$(pkgdatadir)/nls/de; \
rmdir $(THE_NLS_PATH); \ rmdir $(THE_NLS_PATH); \
fi fi
Translation.m: $(MFILES) 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); \ awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
fi fi
openbox.cat: Translation.m openbox.cat: Translation.m
@if test x$(NLSTEST) = "x-DNLS"; then \ @if test x$(NLSTEST) = "xyes"; then \
$(gencat_cmd) openbox.cat Translation.m; \ $(gencat_cmd) openbox.cat Translation.m; \
fi fi

8
nls/es_ES/Makefile.am
View file

@ -10,7 +10,7 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdi
all-local: openbox.cat all-local: openbox.cat
install-data-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)"; \ echo "Installing catalog in $(THE_NLS_PATH)"; \
$(mkinstalldirs) $(THE_NLS_PATH); \ $(mkinstalldirs) $(THE_NLS_PATH); \
$(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \ $(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \
@ -18,19 +18,19 @@ install-data-local: openbox.cat
ln -f -s es_ES $(DESTDIR)$(pkgdatadir)/nls/es; \ ln -f -s es_ES $(DESTDIR)$(pkgdatadir)/nls/es; \
fi fi
uninstall-local: uninstall-local:
@if test x$(NLSTEST) = "x-DNLS"; then \ @if test x$(NLSTEST) = "xyes"; then \
rm -f $(THE_NLS_PATH)/openbox.cat; \ rm -f $(THE_NLS_PATH)/openbox.cat; \
rm -f $(DESTDIR)$(pkgdatadir)/nls/es; \ rm -f $(DESTDIR)$(pkgdatadir)/nls/es; \
rmdir $(THE_NLS_PATH); \ rmdir $(THE_NLS_PATH); \
fi fi
Translation.m: $(MFILES) 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); \ awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
fi fi
openbox.cat: Translation.m openbox.cat: Translation.m
@if test x$(NLSTEST) = "x-DNLS"; then \ @if test x$(NLSTEST) = "xyes"; then \
$(gencat_cmd) openbox.cat Translation.m; \ $(gencat_cmd) openbox.cat Translation.m; \
fi fi

8
nls/et_EE/Makefile.am
View file

@ -10,24 +10,24 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdi
all-local: openbox.cat all-local: openbox.cat
install-data-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)"; \ echo "Installing catalog in $(THE_NLS_PATH)"; \
$(mkinstalldirs) $(THE_NLS_PATH); \ $(mkinstalldirs) $(THE_NLS_PATH); \
$(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \ $(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \
fi fi
uninstall-local: uninstall-local:
@if test x$(NLSTEST) = "x-DNLS"; then \ @if test x$(NLSTEST) = "xyes"; then \
rm -f $(THE_NLS_PATH)/openbox.cat; \ rm -f $(THE_NLS_PATH)/openbox.cat; \
rmdir $(THE_NLS_PATH); \ rmdir $(THE_NLS_PATH); \
fi fi
Translation.m: $(MFILES) 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); \ awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
fi fi
openbox.cat: Translation.m openbox.cat: Translation.m
@if test x$(NLSTEST) = "x-DNLS"; then \ @if test x$(NLSTEST) = "xyes"; then \
$(gencat_cmd) openbox.cat Translation.m; \ $(gencat_cmd) openbox.cat Translation.m; \
fi fi

8
nls/fr_FR/Makefile.am
View file

@ -10,7 +10,7 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdi
all-local: openbox.cat all-local: openbox.cat
install-data-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)"; \ echo "Installing catalog in $(THE_NLS_PATH)"; \
$(mkinstalldirs) $(THE_NLS_PATH); \ $(mkinstalldirs) $(THE_NLS_PATH); \
$(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \ $(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \
@ -18,19 +18,19 @@ install-data-local: openbox.cat
ln -f -s fr_FR $(DESTDIR)$(pkgdatadir)/nls/fr; \ ln -f -s fr_FR $(DESTDIR)$(pkgdatadir)/nls/fr; \
fi fi
uninstall-local: uninstall-local:
@if test x$(NLSTEST) = "x-DNLS"; then \ @if test x$(NLSTEST) = "xyes"; then \
rm -f $(THE_NLS_PATH)/openbox.cat; \ rm -f $(THE_NLS_PATH)/openbox.cat; \
rm -f $(DESTDIR)$(pkgdatadir)/nls/fr; \ rm -f $(DESTDIR)$(pkgdatadir)/nls/fr; \
rmdir $(THE_NLS_PATH); \ rmdir $(THE_NLS_PATH); \
fi fi
Translation.m: $(MFILES) 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); \ awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
fi fi
openbox.cat: Translation.m openbox.cat: Translation.m
@if test x$(NLSTEST) = "x-DNLS"; then \ @if test x$(NLSTEST) = "xyes"; then \
$(gencat_cmd) openbox.cat Translation.m; \ $(gencat_cmd) openbox.cat Translation.m; \
fi fi

8
nls/hu_HU/Makefile.am
View file

@ -10,24 +10,24 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdi
all-local: openbox.cat all-local: openbox.cat
install-data-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)"; \ echo "Installing catalog in $(THE_NLS_PATH)"; \
$(mkinstalldirs) $(THE_NLS_PATH); \ $(mkinstalldirs) $(THE_NLS_PATH); \
$(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \ $(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \
fi fi
uninstall-local: uninstall-local:
@if test x$(NLSTEST) = "x-DNLS"; then \ @if test x$(NLSTEST) = "xyes"; then \
rm -f $(THE_NLS_PATH)/openbox.cat; \ rm -f $(THE_NLS_PATH)/openbox.cat; \
rmdir $(THE_NLS_PATH); \ rmdir $(THE_NLS_PATH); \
fi fi
Translation.m: $(MFILES) 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); \ awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
fi fi
openbox.cat: Translation.m openbox.cat: Translation.m
@if test x$(NLSTEST) = "x-DNLS"; then \ @if test x$(NLSTEST) = "xyes"; then \
$(gencat_cmd) openbox.cat Translation.m; \ $(gencat_cmd) openbox.cat Translation.m; \
fi fi

8
nls/it_IT/Makefile.am
View file

@ -10,7 +10,7 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdi
all-local: openbox.cat all-local: openbox.cat
install-data-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)"; \ echo "Installing catalog in $(THE_NLS_PATH)"; \
$(mkinstalldirs) $(THE_NLS_PATH); \ $(mkinstalldirs) $(THE_NLS_PATH); \
$(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \ $(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \
@ -18,19 +18,19 @@ install-data-local: openbox.cat
ln -f -s it_IT $(DESTDIR)$(pkgdatadir)/nls/it; \ ln -f -s it_IT $(DESTDIR)$(pkgdatadir)/nls/it; \
fi fi
uninstall-local: uninstall-local:
@if test x$(NLSTEST) = "x-DNLS"; then \ @if test x$(NLSTEST) = "xyes"; then \
rm -f $(THE_NLS_PATH)/openbox.cat; \ rm -f $(THE_NLS_PATH)/openbox.cat; \
rm -f $(DESTDIR)$(pkgdatadir)/nls/it; \ rm -f $(DESTDIR)$(pkgdatadir)/nls/it; \
rmdir $(THE_NLS_PATH); \ rmdir $(THE_NLS_PATH); \
fi fi
Translation.m: $(MFILES) 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); \ awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
fi fi
openbox.cat: Translation.m openbox.cat: Translation.m
@if test x$(NLSTEST) = "x-DNLS"; then \ @if test x$(NLSTEST) = "xyes"; then \
$(gencat_cmd) openbox.cat Translation.m; \ $(gencat_cmd) openbox.cat Translation.m; \
fi fi

8
nls/ja_JP/Makefile.am
View file

@ -10,24 +10,24 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdi
all-local: openbox.cat all-local: openbox.cat
install-data-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)"; \ echo "Installing catalog in $(THE_NLS_PATH)"; \
$(mkinstalldirs) $(THE_NLS_PATH); \ $(mkinstalldirs) $(THE_NLS_PATH); \
$(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \ $(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \
fi fi
uninstall-local: uninstall-local:
@if test x$(NLSTEST) = "x-DNLS"; then \ @if test x$(NLSTEST) = "xyes"; then \
rm -f $(THE_NLS_PATH)/openbox.cat; \ rm -f $(THE_NLS_PATH)/openbox.cat; \
rmdir $(THE_NLS_PATH); \ rmdir $(THE_NLS_PATH); \
fi fi
Translation.m: $(MFILES) 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); \ awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
fi fi
openbox.cat: Translation.m openbox.cat: Translation.m
@if test x$(NLSTEST) = "x-DNLS"; then \ @if test x$(NLSTEST) = "xyes"; then \
$(gencat_cmd) openbox.cat Translation.m; \ $(gencat_cmd) openbox.cat Translation.m; \
fi fi

8
nls/nl_NL/Makefile.am
View file

@ -10,7 +10,7 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdi
all-local: openbox.cat all-local: openbox.cat
install-data-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)"; \ echo "Installing catalog in $(THE_NLS_PATH)"; \
$(mkinstalldirs) $(THE_NLS_PATH); \ $(mkinstalldirs) $(THE_NLS_PATH); \
$(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \ $(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \
@ -18,19 +18,19 @@ install-data-local: openbox.cat
ln -f -s nl_NL $(DESTDIR)$(pkgdatadir)/nls/nl; \ ln -f -s nl_NL $(DESTDIR)$(pkgdatadir)/nls/nl; \
fi fi
uninstall-local: uninstall-local:
@if test x$(NLSTEST) = "x-DNLS"; then \ @if test x$(NLSTEST) = "xyes"; then \
rm -f $(THE_NLS_PATH)/openbox.cat; \ rm -f $(THE_NLS_PATH)/openbox.cat; \
rm -f $(DESTDIR)$(pkgdatadir)/nls/nl; \ rm -f $(DESTDIR)$(pkgdatadir)/nls/nl; \
rmdir $(THE_NLS_PATH); \ rmdir $(THE_NLS_PATH); \
fi fi
Translation.m: $(MFILES) 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); \ awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
fi fi
openbox.cat: Translation.m openbox.cat: Translation.m
@if test x$(NLSTEST) = "x-DNLS"; then \ @if test x$(NLSTEST) = "xyes"; then \
$(gencat_cmd) openbox.cat Translation.m; \ $(gencat_cmd) openbox.cat Translation.m; \
fi fi

8
nls/pt_BR/Makefile.am
View file

@ -10,24 +10,24 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdi
all-local: openbox.cat all-local: openbox.cat
install-data-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)"; \ echo "Installing catalog in $(THE_NLS_PATH)"; \
$(mkinstalldirs) $(THE_NLS_PATH); \ $(mkinstalldirs) $(THE_NLS_PATH); \
$(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \ $(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \
fi fi
uninstall-local: uninstall-local:
@if test x$(NLSTEST) = "x-DNLS"; then \ @if test x$(NLSTEST) = "xyes"; then \
rm -f $(THE_NLS_PATH)/openbox.cat; \ rm -f $(THE_NLS_PATH)/openbox.cat; \
rmdir $(THE_NLS_PATH); \ rmdir $(THE_NLS_PATH); \
fi fi
Translation.m: $(MFILES) 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); \ awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
fi fi
openbox.cat: Translation.m openbox.cat: Translation.m
@if test x$(NLSTEST) = "x-DNLS"; then \ @if test x$(NLSTEST) = "xyes"; then \
$(gencat_cmd) openbox.cat Translation.m; \ $(gencat_cmd) openbox.cat Translation.m; \
fi fi

8
nls/ru_RU/Makefile.am
View file

@ -10,24 +10,24 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdi
all-local: openbox.cat all-local: openbox.cat
install-data-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)"; \ echo "Installing catalog in $(THE_NLS_PATH)"; \
$(mkinstalldirs) $(THE_NLS_PATH); \ $(mkinstalldirs) $(THE_NLS_PATH); \
$(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \ $(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \
fi fi
uninstall-local: uninstall-local:
@if test x$(NLSTEST) = "x-DNLS"; then \ @if test x$(NLSTEST) = "xyes"; then \
rm -f $(THE_NLS_PATH)/openbox.cat; \ rm -f $(THE_NLS_PATH)/openbox.cat; \
rmdir $(THE_NLS_PATH); \ rmdir $(THE_NLS_PATH); \
fi fi
Translation.m: $(MFILES) 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); \ awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
fi fi
openbox.cat: Translation.m openbox.cat: Translation.m
@if test x$(NLSTEST) = "x-DNLS"; then \ @if test x$(NLSTEST) = "xyes"; then \
$(gencat_cmd) openbox.cat Translation.m; \ $(gencat_cmd) openbox.cat Translation.m; \
fi fi

8
nls/sl_SI/Makefile.am
View file

@ -10,24 +10,24 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdi
all-local: openbox.cat all-local: openbox.cat
install-data-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)"; \ echo "Installing catalog in $(THE_NLS_PATH)"; \
$(mkinstalldirs) $(THE_NLS_PATH); \ $(mkinstalldirs) $(THE_NLS_PATH); \
$(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \ $(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \
fi fi
uninstall-local: uninstall-local:
@if test x$(NLSTEST) = "x-DNLS"; then \ @if test x$(NLSTEST) = "xyes"; then \
rm -f $(THE_NLS_PATH)/openbox.cat; \ rm -f $(THE_NLS_PATH)/openbox.cat; \
rmdir $(THE_NLS_PATH); \ rmdir $(THE_NLS_PATH); \
fi fi
Translation.m: $(MFILES) 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); \ awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
fi fi
openbox.cat: Translation.m openbox.cat: Translation.m
@if test x$(NLSTEST) = "x-DNLS"; then \ @if test x$(NLSTEST) = "xyes"; then \
$(gencat_cmd) openbox.cat Translation.m; \ $(gencat_cmd) openbox.cat Translation.m; \
fi fi

8
nls/sv_SE/Makefile.am
View file

@ -10,24 +10,24 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdi
all-local: openbox.cat all-local: openbox.cat
install-data-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)"; \ echo "Installing catalog in $(THE_NLS_PATH)"; \
$(mkinstalldirs) $(THE_NLS_PATH); \ $(mkinstalldirs) $(THE_NLS_PATH); \
$(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \ $(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \
fi fi
uninstall-local: uninstall-local:
@if test x$(NLSTEST) = "x-DNLS"; then \ @if test x$(NLSTEST) = "xyes"; then \
rm -f $(THE_NLS_PATH)/openbox.cat; \ rm -f $(THE_NLS_PATH)/openbox.cat; \
rmdir $(THE_NLS_PATH); \ rmdir $(THE_NLS_PATH); \
fi fi
Translation.m: $(MFILES) 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); \ awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
fi fi
openbox.cat: Translation.m openbox.cat: Translation.m
@if test x$(NLSTEST) = "x-DNLS"; then \ @if test x$(NLSTEST) = "xyes"; then \
$(gencat_cmd) openbox.cat Translation.m; \ $(gencat_cmd) openbox.cat Translation.m; \
fi fi

8
nls/tr_TR/Makefile.am
View file

@ -10,24 +10,24 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdi
all-local: openbox.cat all-local: openbox.cat
install-data-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)"; \ echo "Installing catalog in $(THE_NLS_PATH)"; \
$(mkinstalldirs) $(THE_NLS_PATH); \ $(mkinstalldirs) $(THE_NLS_PATH); \
$(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \ $(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \
fi fi
uninstall-local: uninstall-local:
@if test x$(NLSTEST) = "x-DNLS"; then \ @if test x$(NLSTEST) = "xyes"; then \
rm -f $(THE_NLS_PATH)/openbox.cat; \ rm -f $(THE_NLS_PATH)/openbox.cat; \
rmdir $(THE_NLS_PATH); \ rmdir $(THE_NLS_PATH); \
fi fi
Translation.m: $(MFILES) 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); \ awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
fi fi
openbox.cat: Translation.m openbox.cat: Translation.m
@if test x$(NLSTEST) = "x-DNLS"; then \ @if test x$(NLSTEST) = "xyes"; then \
$(gencat_cmd) openbox.cat Translation.m; \ $(gencat_cmd) openbox.cat Translation.m; \
fi fi

8
nls/uk_UA/Makefile.am
View file

@ -10,24 +10,24 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdi
all-local: openbox.cat all-local: openbox.cat
install-data-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)"; \ echo "Installing catalog in $(THE_NLS_PATH)"; \
$(mkinstalldirs) $(THE_NLS_PATH); \ $(mkinstalldirs) $(THE_NLS_PATH); \
$(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \ $(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \
fi fi
uninstall-local: uninstall-local:
@if test x$(NLSTEST) = "x-DNLS"; then \ @if test x$(NLSTEST) = "xyes"; then \
rm -f $(THE_NLS_PATH)/openbox.cat; \ rm -f $(THE_NLS_PATH)/openbox.cat; \
rmdir $(THE_NLS_PATH); \ rmdir $(THE_NLS_PATH); \
fi fi
Translation.m: $(MFILES) 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); \ awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
fi fi
openbox.cat: Translation.m openbox.cat: Translation.m
@if test x$(NLSTEST) = "x-DNLS"; then \ @if test x$(NLSTEST) = "xyes"; then \
$(gencat_cmd) openbox.cat Translation.m; \ $(gencat_cmd) openbox.cat Translation.m; \
fi fi

8
nls/zh_CN/Makefile.am
View file

@ -10,24 +10,24 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdi
all-local: openbox.cat all-local: openbox.cat
install-data-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)"; \ echo "Installing catalog in $(THE_NLS_PATH)"; \
$(mkinstalldirs) $(THE_NLS_PATH); \ $(mkinstalldirs) $(THE_NLS_PATH); \
$(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \ $(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \
fi fi
uninstall-local: uninstall-local:
@if test x$(NLSTEST) = "x-DNLS"; then \ @if test x$(NLSTEST) = "xyes"; then \
rm -f $(THE_NLS_PATH)/openbox.cat; \ rm -f $(THE_NLS_PATH)/openbox.cat; \
rmdir $(THE_NLS_PATH); \ rmdir $(THE_NLS_PATH); \
fi fi
Translation.m: $(MFILES) 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); \ awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
fi fi
openbox.cat: Translation.m openbox.cat: Translation.m
@if test x$(NLSTEST) = "x-DNLS"; then \ @if test x$(NLSTEST) = "xyes"; then \
$(gencat_cmd) openbox.cat Translation.m; \ $(gencat_cmd) openbox.cat Translation.m; \
fi fi

8
nls/zh_TW/Makefile.am
View file

@ -10,24 +10,24 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdi
all-local: openbox.cat all-local: openbox.cat
install-data-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)"; \ echo "Installing catalog in $(THE_NLS_PATH)"; \
$(mkinstalldirs) $(THE_NLS_PATH); \ $(mkinstalldirs) $(THE_NLS_PATH); \
$(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \ $(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \
fi fi
uninstall-local: uninstall-local:
@if test x$(NLSTEST) = "x-DNLS"; then \ @if test x$(NLSTEST) = "xyes"; then \
rm -f $(THE_NLS_PATH)/openbox.cat; \ rm -f $(THE_NLS_PATH)/openbox.cat; \
rmdir $(THE_NLS_PATH); \ rmdir $(THE_NLS_PATH); \
fi fi
Translation.m: $(MFILES) 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); \ awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
fi fi
openbox.cat: Translation.m openbox.cat: Translation.m
@if test x$(NLSTEST) = "x-DNLS"; then \ @if test x$(NLSTEST) = "xyes"; then \
$(gencat_cmd) openbox.cat Translation.m; \ $(gencat_cmd) openbox.cat Translation.m; \
fi fi

97
src/Configmenu.cc
View file

@ -203,6 +203,8 @@ Configmenu::Placementmenu::Placementmenu(Configmenu *cm):
BScreen::ColSmartPlacement); BScreen::ColSmartPlacement);
insert(i18n(ConfigmenuSet, ConfigmenuCascade, "Cascade Placement"), insert(i18n(ConfigmenuSet, ConfigmenuCascade, "Cascade Placement"),
BScreen::CascadePlacement); BScreen::CascadePlacement);
insert(i18n(ConfigmenuSet, ConfigmenuUnderMouse, "Under Mouse Placement"),
BScreen::UnderMousePlacement);
insert(i18n(ConfigmenuSet, ConfigmenuLeftRight, "Left to Right"), insert(i18n(ConfigmenuSet, ConfigmenuLeftRight, "Left to Right"),
BScreen::LeftRight); BScreen::LeftRight);
insert(i18n(ConfigmenuSet, ConfigmenuRightLeft, "Right to Left"), insert(i18n(ConfigmenuSet, ConfigmenuRightLeft, "Right to Left"),
@ -217,28 +219,26 @@ Configmenu::Placementmenu::Placementmenu(Configmenu *cm):
void Configmenu::Placementmenu::setValues(void) { void Configmenu::Placementmenu::setValues(void) {
switch (getScreen()->getPlacementPolicy()) { int placement = getScreen()->getPlacementPolicy();
case BScreen::RowSmartPlacement:
setItemSelected(0, True);
break;
case BScreen::ColSmartPlacement: setItemSelected(0, placement == BScreen::RowSmartPlacement);
setItemSelected(1, True); setItemSelected(1, placement == BScreen::ColSmartPlacement);
break; setItemSelected(2, placement == BScreen::CascadePlacement);
setItemSelected(3, placement == BScreen::UnderMousePlacement);
case BScreen::CascadePlacement:
setItemSelected(2, True);
break;
}
bool rl = (getScreen()->getRowPlacementDirection() == BScreen::LeftRight), bool rl = (getScreen()->getRowPlacementDirection() == BScreen::LeftRight),
tb = (getScreen()->getColPlacementDirection() == BScreen::TopBottom); tb = (getScreen()->getColPlacementDirection() == BScreen::TopBottom),
e = placement != BScreen::UnderMousePlacement;
setItemSelected(3, rl); setItemSelected(4, rl);
setItemSelected(4, ! rl); setItemSelected(5, ! rl);
setItemEnabled(4, e);
setItemEnabled(5, e);
setItemSelected(5, tb); setItemSelected(6, tb);
setItemSelected(6, ! tb); setItemSelected(7, ! tb);
setItemEnabled(6, e);
setItemEnabled(7, e);
} }
@ -261,59 +261,88 @@ void Configmenu::Placementmenu::itemSelected(int button, unsigned int index) {
case BScreen::RowSmartPlacement: case BScreen::RowSmartPlacement:
getScreen()->savePlacementPolicy(item->function()); getScreen()->savePlacementPolicy(item->function());
setItemSelected(0, True); setItemSelected(0, true);
setItemSelected(1, False); setItemSelected(1, false);
setItemSelected(2, False); setItemSelected(2, false);
setItemSelected(3, false);
setItemEnabled(4, true);
setItemEnabled(5, true);
setItemEnabled(6, true);
setItemEnabled(7, true);
break; break;
case BScreen::ColSmartPlacement: case BScreen::ColSmartPlacement:
getScreen()->savePlacementPolicy(item->function()); getScreen()->savePlacementPolicy(item->function());
setItemSelected(0, False); setItemSelected(0, false);
setItemSelected(1, True); setItemSelected(1, true);
setItemSelected(2, False); setItemSelected(2, false);
setItemSelected(3, false);
setItemEnabled(4, true);
setItemEnabled(5, true);
setItemEnabled(6, true);
setItemEnabled(7, true);
break; break;
case BScreen::CascadePlacement: case BScreen::CascadePlacement:
getScreen()->savePlacementPolicy(item->function()); getScreen()->savePlacementPolicy(item->function());
setItemSelected(0, False); setItemSelected(0, false);
setItemSelected(1, False); setItemSelected(1, false);
setItemSelected(2, True); setItemSelected(2, true);
setItemSelected(3, false);
setItemEnabled(4, true);
setItemEnabled(5, true);
setItemEnabled(6, true);
setItemEnabled(7, true);
break;
case BScreen::UnderMousePlacement:
getScreen()->savePlacementPolicy(item->function());
setItemSelected(0, false);
setItemSelected(1, false);
setItemSelected(2, false);
setItemSelected(3, true);
setItemEnabled(4, false);
setItemEnabled(5, false);
setItemEnabled(6, false);
setItemEnabled(7, false);
break; break;
case BScreen::LeftRight: case BScreen::LeftRight:
getScreen()->saveRowPlacementDirection(BScreen::LeftRight); getScreen()->saveRowPlacementDirection(BScreen::LeftRight);
setItemSelected(3, True); setItemSelected(4, true);
setItemSelected(4, False); setItemSelected(5, false);
break; break;
case BScreen::RightLeft: case BScreen::RightLeft:
getScreen()->saveRowPlacementDirection(BScreen::RightLeft); getScreen()->saveRowPlacementDirection(BScreen::RightLeft);
setItemSelected(3, False); setItemSelected(4, false);
setItemSelected(4, True); setItemSelected(5, true);
break; break;
case BScreen::TopBottom: case BScreen::TopBottom:
getScreen()->saveColPlacementDirection(BScreen::TopBottom); getScreen()->saveColPlacementDirection(BScreen::TopBottom);
setItemSelected(5, True); setItemSelected(6, true);
setItemSelected(6, False); setItemSelected(7, false);
break; break;
case BScreen::BottomTop: case BScreen::BottomTop:
getScreen()->saveColPlacementDirection(BScreen::BottomTop); getScreen()->saveColPlacementDirection(BScreen::BottomTop);
setItemSelected(5, False); setItemSelected(6, false);
setItemSelected(6, True); setItemSelected(7, true);
break; break;
} }

4
src/Screen.hh
View file

@ -190,8 +190,8 @@ private:
public: public:
enum { RowSmartPlacement = 1, ColSmartPlacement, CascadePlacement, LeftRight, enum { RowSmartPlacement = 1, ColSmartPlacement, CascadePlacement,
RightLeft, TopBottom, BottomTop }; UnderMousePlacement, LeftRight, RightLeft, TopBottom, BottomTop };
enum { RoundBullet = 1, TriangleBullet, SquareBullet, NoBullet }; enum { RoundBullet = 1, TriangleBullet, SquareBullet, NoBullet };
enum { Restart = 1, RestartOther, Exit, Shutdown, Execute, Reconfigure, enum { Restart = 1, RestartOther, Exit, Shutdown, Execute, Reconfigure,
WindowShade, WindowIconify, WindowMaximize, WindowClose, WindowRaise, WindowShade, WindowIconify, WindowMaximize, WindowClose, WindowRaise,

27
src/Workspace.cc
View file

@ -556,6 +556,31 @@ bool Workspace::smartPlacement(Rect& win, const Rect& availableArea) {
} }
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) { bool Workspace::cascadePlacement(Rect &win, const Rect &availableArea) {
if ((cascade_x > static_cast<signed>(availableArea.width() / 2)) || if ((cascade_x > static_cast<signed>(availableArea.width() / 2)) ||
(cascade_y > static_cast<signed>(availableArea.height() / 2))) (cascade_y > static_cast<signed>(availableArea.height() / 2)))
@ -583,6 +608,8 @@ void Workspace::placeWindow(BlackboxWindow *win) {
case BScreen::ColSmartPlacement: case BScreen::ColSmartPlacement:
placed = smartPlacement(new_win, availableArea); placed = smartPlacement(new_win, availableArea);
break; break;
case BScreen::UnderMousePlacement:
placed = underMousePlacement(new_win, availableArea);
default: default:
break; // handled below break; // handled below
} // switch } // switch

1
src/Workspace.hh
View file

@ -64,6 +64,7 @@ private:
void placeWindow(BlackboxWindow *win); void placeWindow(BlackboxWindow *win);
bool cascadePlacement(Rect& win, const Rect& availableArea); bool cascadePlacement(Rect& win, const Rect& availableArea);
bool smartPlacement(Rect& win, const Rect& availableArea); bool smartPlacement(Rect& win, const Rect& availableArea);
bool underMousePlacement(Rect& win, const Rect& availableArea);
public: public:
Workspace(BScreen *scrn, unsigned int i = 0); Workspace(BScreen *scrn, unsigned int i = 0);