gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2026-04-24 09:31:27 +02:00
Code Issues Projects Releases Wiki Activity

Update to Window Maker 0.50.2

Browse Source
This commit is contained in:
dan
1999-01-11 12:28:12 +00:00
parent a37bb3aed5
commit cb320b2fc3
87 changed files with 4999 additions and 4465 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+27
View File
@@ -1,3 +1,30 @@
Changes since version 0.50.1:
.............................
- fixed wmsetbg
- fixed parsing of WorkspaceSpecificBack
- fixed initial workspace for new windows
- added the workspace button proxy thingy for GNOME
- added more GNOME compatibility fixes
- fixed bug in %a() macro in root menu
Changes since version 0.50.0:
.............................
- fixed bug that allowed docking of icons to outside the screen
- added extra code to handle kpager bug
- fixed crash when opening appicon menu
- fixed problem that caused Motif hints to be sometimes ignored
- fixed bug in layer treatment of GNOME hints
- fixed weirdness in initial window workspace
- fixed problem with Sun compilers
- fixed bug with () Workspace{Specific,}Back specs
- added --disable-rpath option (from KDE) by request
- maybe fixed bug with StarOffice
- fixed pipe fd inheritance mess
- fixed bug in kde workspace renaming
- fixed installation problems
Changes since version 0.20.3:
.............................
FAQ
+10 -4
View File
@@ -1171,10 +1171,7 @@ WM_NORMAL_HINTS(WM_SIZE_HINTS):
Now, when scilab opens it's window, Window Maker nicely does exactly what it
is told, that is, map the window at position 136679205, 1074468360 which
obviously falls outside the screen no matter how big is your monitor ;) The
bug has been reported by different users many times for more than a year now,
but apparently it never got fixed. If you keep mailing it's developers,
maybe it will get fixed some day :)
obviously falls outside the screen no matter how big is your monitor ;)
Meanwhile, the workaround for this is to open the window list menu
(click on the root window with the middle mouse button) and click
@@ -1183,6 +1180,15 @@ reach. Then, open the window commands menu (right click on window's
titlebar) and open the Attributes panel. Go to the "Advanced Options"
section, check the "Keep inside screen" option and save.
If you can recompile Scilab, this came from a Scilab developer:
replace
size_hints.flags = USPosition | USSize | PMinSize;
with
size_hints.flags = /** USPosition |**/ USSize | PMinSize;
in routines/xsci/jpc_SGraph.c
-=-=-=-=-=-=-
INSTALL
+16 -5
View File
@@ -58,13 +58,17 @@ The following is required to build Window Maker:
and the gcc suite. Otherwise you won't be able to build any X
program, including Window Maker.
- autoconf and automake
autoconf and automake are not required, but if you have them
installed, make sure you have autoconf 2.12 and automake 1.3 or
newer. If you have an older version, disable them by temporarily
- autoconf, automake and libtool
autoconf and automake are not required, but if you have one or
more of them installed, make sure you have ALL of the following
with exactly these versions:
autoconf 2.12
automake 1.3
libtool 1.2
If you have a different version, disable them by temporarily
renaming them to something else or uninstalling them from your
system.
- lex (or flex) and yacc (or bison)
These are used by libPropList. lex is actually not needed since
it's output file is included, but either me or automake is stupid,
@@ -198,6 +202,9 @@ PLATFORM SPECIFIC NOTES:
PATH environment variable, as for some mysterious reason the folks
at RedHat did not include it in the default configuration files
in RH 5.{0,1}.
Check the TROUBLESHOOTING section if you have problems with libtool.
Before trying to install, uninstall libtool-1.2b and install
libtool-1.2, which you can get from ftp.gnu.org or it's mirrors.
- PowerPC MkLinux
You will need to have the latest version of Xpmac. Older versions
@@ -246,6 +253,7 @@ smaller, you can instead type:
make install-strip
This will build and install Window Maker with default parameters.
If you run on a Linux system, also run ldconfig -v
If you want to customize some compile-time options, you can do the
following.
@@ -349,6 +357,9 @@ autoconf 2.12
automake 1.3
libtool 1.2
Note that it must not be libtool 1.2b, it must be libtool 1.2,
from the GNU sites.
== Error during build of libPropList
make: *** No rule to make target `libPropList.a.c', needed by
Install
+25 -5
View File
@@ -43,6 +43,20 @@ echo "Please read the INSTALL and FAQ files before e-mailing "
echo "questions. (we are lazy to reply questions already answered "
echo "there as much as you are lazy to read these ;) "
perai
echo "Did you read the INSTALL file?"
echo -n "<y/n> "
read rtfm
if [ "$rtfm" != y ]; then
echo "Please read the INSTALL file before installing"
exit
fi
echo "Are you sure?"
echo -n "<y/n> "
read rtfm
if [ "$rtfm" != y ]; then
echo "Please read the INSTALL file before installing"
exit
fi
if test "$USER" != "root"; then
echo
@@ -60,13 +74,13 @@ echo "================"
######################## KDE
echo
echo "Do you want KDE support?"
echo -n <y/n> [n] "
echo -n "<y/n> [n] "
read kde
if [ "$kde" = y -o "$kde" = Y ]; then
OPTIONS="$OPTIONS --enable-kde"
echo "Do you want to disable features that become duplicated with"
echo "KDE support (like root menus)?"
echo -n <y/n> [n] "
echo -n "<y/n> [n] "
read lite
if [ "$lite" = y -o "lite" = Y ]; then
OPTIONS="$OPTIONS --enable-lite"
@@ -76,7 +90,7 @@ fi
######################## GNOME
echo
echo "Do you want GNOME support?"
echo -n <y/n> [n] "
echo -n "<y/n> [n] "
read gnome
if [ "$gnome" = y -o "$gnome" = Y ]; then
OPTIONS="$OPTIONS --enable-gnome"
@@ -151,7 +165,7 @@ while [ $done = 0 ]; do
echo
echo "Where do you want to install Window Maker? [$PREFIX]"
echo "Don't change it if you don't know what you're doing."
if test $USER != root; then
if test "$USER" != "root"; then
echo "Make sure to specify a path where you have write permission."
fi
echo "(The default will put Window Maker in $PREFIX/bin, $PREFIX/lib etc.)"
@@ -170,7 +184,9 @@ while [ $done = 0 ]; do
done=1
fi
echo
echo "$PREFIX/bin must be in the PATH environment variable of all users who use Window Maker"
echo " $PREFIX/bin must be in the PATH environment variable of all users"
echo "will who use Window Maker"
echo " Make sure $PREFIX/lib is in the /etc/ld.so.conf file"
perai
done
@@ -210,6 +226,10 @@ echo "--------------------------"
perform make install
if [ `uname -s` = "Linux" ]; then
/sbin/ldconfig -v
fi
echo
echo "Installation Finished!"
echo
Makefile.am
+1 -2
View File
@@ -2,6 +2,5 @@
SUBDIRS = libPropList wrlib WINGs src util po WindowMaker wmlib test WPrefs.app doc
EXTRA_DIST = TODO BUGS BUGFORM FAQ FAQ.I18N MIRRORS Install acconfig.h\
mkpatch
mkpatch README.KDE README.GNOME
Makefile.in
+1 -1
View File
@@ -97,7 +97,7 @@ wprefsdir = @wprefsdir@
SUBDIRS = libPropList wrlib WINGs src util po WindowMaker wmlib test WPrefs.app doc
EXTRA_DIST = TODO BUGS BUGFORM FAQ FAQ.I18N MIRRORS Install acconfig.h\
mkpatch
mkpatch README.KDE README.GNOME
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ./src/config.h
NEWS
+34
View File
@@ -2,6 +2,18 @@
NEWS for veteran Window Maker users
-----------------------------------
--- 0.50.1
New option for WorkspaceBack. mpixmap is the same as spixmap, but
it will scale the pixmap by keeping the aspect ratio (maximize or maxpect).
The option only works for workspace backgrounds.
Also added IGNORE_NOPPOSITION compile time flag, which is equivalent
to NoPPosition from fvwm.
--- 0.50.0
@@ -130,6 +142,28 @@ big value, will make the Clip to practically do not auto raise unless clicked,
but to be automatically lowered after AUTO_LOWER_DELAY (ms) when leaved.
AutoRaiseLower option for the Clip. This allows automatic Raise/Lower of the
Clip icons when the mouse pointer enter/leave the Clip. To avoid unwanted
raising/lowering there is a time threshold before raising/lowering.
The thresholds can be changed in wconfig.h by changing one or both of
AUTO_LOWER_DELAY and AUTO_RAISE_DELAY (expressed in miliseconds).
For example if you set AUTO_RAISE_DELAY to 0, then the Clip will be raised as
soon as the mouse pointer enters it's area. Setting AUTO_RAISE_DELAY to a very
big value, will make the Clip to practically do not auto raise unless clicked,
but to be automatically lowered after AUTO_LOWER_DELAY (ms) when leaved.
AutoRaiseLower option for the Clip. This allows automatic Raise/Lower of the
Clip icons when the mouse pointer enter/leave the Clip. To avoid unwanted
raising/lowering there is a time threshold before raising/lowering.
The thresholds can be changed in wconfig.h by changing one or both of
AUTO_LOWER_DELAY and AUTO_RAISE_DELAY (expressed in miliseconds).
For example if you set AUTO_RAISE_DELAY to 0, then the Clip will be raised as
soon as the mouse pointer enters it's area. Setting AUTO_RAISE_DELAY to a very
big value, will make the Clip to practically do not auto raise unless clicked,
but to be automatically lowered after AUTO_LOWER_DELAY (ms) when leaved.
New ThemePack Format
--------------------
README
-1
View File
@@ -61,7 +61,6 @@ applications. I've known of many cases where people keep switching KDE
and Window Maker depending on their mood or needs of the day, but now
you don't need that anymore :)
As GNOME components become more available, the same can be said about it.
Window Maker can be considered a fully compliant GNOME window manager.
\end{marketing babble}
Window Maker was previously called WindowMaker.
WINGs/Makefile.am
+2
View File
@@ -18,6 +18,8 @@ lib_LIBRARIES = libWINGs.a
include_HEADERS = WINGs.h WUtil.h WINGsP.h
bin_SCRIPTS = WINGs-flags
noinst_PROGRAMS = wtest wmquery wmfile fontl testmywidget
testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h
WINGs/Makefile.in
+35 -9
View File
@@ -76,6 +76,7 @@ LN_S = @LN_S@
MAKEINFO = @MAKEINFO@
MOFILES = @MOFILES@
NLSDIR = @NLSDIR@
NM = @NM@
PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
REDUCE_APPICONS = @REDUCE_APPICONS@
@@ -109,6 +110,8 @@ lib_LIBRARIES = libWINGs.a
include_HEADERS = WINGs.h WUtil.h WINGsP.h
bin_SCRIPTS = WINGs-flags
noinst_PROGRAMS = wtest wmquery wmfile fontl testmywidget
testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h
@@ -219,6 +222,8 @@ testmywidget_DEPENDENCIES = libWINGs.a \
$(top_builddir)/wrlib/libwraster.la \
$(top_builddir)/libPropList/libPropList.la
testmywidget_LDFLAGS =
SCRIPTS = $(bin_SCRIPTS)
CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
@@ -351,6 +356,25 @@ testmywidget: $(testmywidget_OBJECTS) $(testmywidget_DEPENDENCIES)
@rm -f testmywidget
$(LINK) $(testmywidget_LDFLAGS) $(testmywidget_OBJECTS) $(testmywidget_LDADD) $(LIBS)
install-binSCRIPTS: $(bin_SCRIPTS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(bindir)
@list='$(bin_SCRIPTS)'; for p in $$list; do \
if test -f $$p; then \
echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
$(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
else if test -f $(srcdir)/$$p; then \
echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
$(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
else :; fi; fi; \
done
uninstall-binSCRIPTS:
@$(NORMAL_UNINSTALL)
list='$(bin_SCRIPTS)'; for p in $$list; do \
rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
done
install-includeHEADERS: $(include_HEADERS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(includedir)
@@ -455,13 +479,13 @@ dvi: dvi-recursive
check: all-am
$(MAKE) check-recursive
installcheck: installcheck-recursive
all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(HEADERS)
all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(SCRIPTS) $(HEADERS)
install-exec-am: install-libLIBRARIES
install-exec-am: install-libLIBRARIES install-binSCRIPTS
install-data-am: install-includeHEADERS
uninstall-am: uninstall-libLIBRARIES uninstall-includeHEADERS
uninstall-am: uninstall-libLIBRARIES uninstall-binSCRIPTS uninstall-includeHEADERS
install-exec: install-exec-recursive install-exec-am
@$(NORMAL_INSTALL)
@@ -477,7 +501,8 @@ uninstall: uninstall-recursive uninstall-am
install-strip:
$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
installdirs: installdirs-recursive
$(mkinstalldirs) $(DATADIR)$(libdir) $(DATADIR)$(includedir)
$(mkinstalldirs) $(DATADIR)$(libdir) $(DATADIR)$(bindir) \
$(DATADIR)$(includedir)
mostlyclean-generic:
@@ -530,11 +555,12 @@ clean-compile maintainer-clean-compile mostlyclean-libtool \
distclean-libtool clean-libtool maintainer-clean-libtool \
mostlyclean-noinstPROGRAMS distclean-noinstPROGRAMS \
clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS \
uninstall-includeHEADERS install-includeHEADERS install-data-recursive \
uninstall-data-recursive install-exec-recursive \
uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
all-recursive check-recursive installcheck-recursive info-recursive \
dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
uninstall-binSCRIPTS install-binSCRIPTS uninstall-includeHEADERS \
install-includeHEADERS install-data-recursive uninstall-data-recursive \
install-exec-recursive uninstall-exec-recursive installdirs-recursive \
uninstalldirs-recursive all-recursive check-recursive \
installcheck-recursive info-recursive dvi-recursive \
mostlyclean-recursive distclean-recursive clean-recursive \
maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
distclean-tags clean-tags maintainer-clean-tags distdir info dvi \
installcheck all-am install-exec-am install-data-am uninstall-am \
WINGs/Resources/Makefile.in
+1
View File
@@ -76,6 +76,7 @@ LN_S = @LN_S@
MAKEINFO = @MAKEINFO@
MOFILES = @MOFILES@
NLSDIR = @NLSDIR@
NM = @NM@
PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
REDUCE_APPICONS = @REDUCE_APPICONS@
WINGs/WUtil.h
+1 -1
View File
@@ -31,7 +31,7 @@
#if (!defined (__GNUC__) || __GNUC__ < 2 || \
__GNUC_MINOR__ < (defined (__cplusplus) ? 6 : 4))
#define __ASSERT_FUNCTION ((__const char *) 0)
#define __ASSERT_FUNCTION ((char *) 0)
#else
#define __ASSERT_FUNCTION __PRETTY_FUNCTION__
#endif
WINGs/wbrowser.c
+2 -1
View File
@@ -248,7 +248,8 @@ removeColumn(WMBrowser *bPtr, int column)
if (column < bPtr->maxVisibleColumns) {
int tmp;
#if 1
#if 0
/* this code causes bugs */
int limit;
if(bPtr->usedColumnCount < bPtr->maxVisibleColumns)
WINGs/wtextfield.c
+2 -1
View File
@@ -529,7 +529,8 @@ paintTextField(TextField *tPtr)
}
/* draw cursor */
if (tPtr->flags.focused && tPtr->flags.enabled && tPtr->flags.cursorOn) {
if (tPtr->flags.focused && tPtr->flags.enabled && tPtr->flags.cursorOn
&& !tPtr->flags.secure) {
paintCursor(tPtr);
}
WPrefs.app/Icons.c
+5 -4
View File
@@ -242,17 +242,18 @@ createPanel(Panel *p)
/***************** Options ****************/
panel->optF = WMCreateFrame(panel->frame);
WMResizeWidget(panel->optF, 260, 65);
WMMoveWidget(panel->optF, 25, 155);
WMResizeWidget(panel->optF, 260, 70);
WMMoveWidget(panel->optF, 25, 150);
WMSetFrameTitle(panel->optF, _("Icon Display"));
panel->arrB = WMCreateSwitchButton(panel->optF);
WMResizeWidget(panel->arrB, 235, 20);
WMMoveWidget(panel->arrB, 15, 10);
WMMoveWidget(panel->arrB, 15, 15);
WMSetButtonText(panel->arrB, _("Auto-arrange icons"));
panel->omnB = WMCreateSwitchButton(panel->optF);
WMResizeWidget(panel->omnB, 235, 20);
WMMoveWidget(panel->omnB, 15, 35);
WMMoveWidget(panel->omnB, 15, 40);
WMSetButtonText(panel->omnB, _("Omnipresent miniwindows"));
WMMapSubwidgets(panel->optF);
WPrefs.app/KeyboardShortcuts.c
+1 -1
View File
@@ -384,8 +384,8 @@ createPanel(Panel *p)
WMAddListItem(panel->actLs, _("Lower active window"));
WMAddListItem(panel->actLs, _("Raise/Lower window under mouse pointer"));
WMAddListItem(panel->actLs, _("Shade active window"));
WMAddListItem(panel->actLs, _("Select active window"));
WMAddListItem(panel->actLs, _("Move/Resize active window"));
WMAddListItem(panel->actLs, _("Select active window"));
WMAddListItem(panel->actLs, _("Focus next window"));
WMAddListItem(panel->actLs, _("Focus previous window"));
WMAddListItem(panel->actLs, _("Switch to next workspace"));
WPrefs.app/Makefile.in
+1
View File
@@ -76,6 +76,7 @@ LN_S = @LN_S@
MAKEINFO = @MAKEINFO@
MOFILES = @MOFILES@
NLSDIR = @NLSDIR@
NM = @NM@
PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
REDUCE_APPICONS = @REDUCE_APPICONS@
WPrefs.app/MouseSettings.c
+1 -1
View File
@@ -145,7 +145,7 @@ speedClick(WMWidget *w, void *data)
panel->lastClickedSpeed = panel->speedB[i];
panel->acceleration = 0.5+(i*0.5);
sprintf(buffer, "Accel.: %.2f", 0.5+(i*0.5));
sprintf(buffer, _("Accel.: %.2f"), 0.5+(i*0.5));
WMSetLabelText(panel->acceL, buffer);
tmp = WMGetTextFieldText(panel->threT);
WPrefs.app/WPrefs.c
+6 -5
View File
@@ -257,7 +257,7 @@ createMainWindow(WMScreen *scr)
WMResizeWidget(WPrefs.nameL, FRAME_WIDTH-20, 30);
WMMoveWidget(WPrefs.nameL, 10, 25);
WMSetLabelFont(WPrefs.nameL, font);
WMSetLabelText(WPrefs.nameL, "Window Maker Preferences Utility");
WMSetLabelText(WPrefs.nameL, _("Window Maker Preferences Utility"));
WMReleaseFont(font);
WPrefs.versionL = WMCreateLabel(WPrefs.banner);
@@ -471,7 +471,7 @@ Initialize(WMScreen *scr)
tmp = RLoadImage(WMScreenRContext(scr), path, 0);
if (!tmp) {
wwarning("could not load image file %s:%s", path,
wwarning(_("could not load image file %s:%s"), path,
RMessageForError(RErrorCode));
} else {
icon = WMCreatePixmapFromRImage(scr, tmp, 0);
@@ -522,9 +522,10 @@ Initialize(WMScreen *scr)
WMRealizeWidget(WPrefs.scrollV);
WMSetLabelText(WPrefs.statusL,
"WPrefs is free software and is distributed WITHOUT ANY "
"WARRANTY under the terms of the GNU General Public License."
"Redistribution of the icons in this program separately from the program itself is prohibited.");
_("WPrefs is free software and is distributed WITHOUT ANY "
"WARRANTY under the terms of the GNU General Public License. "
"Redistribution of the icons in this program separately "
"from the program is prohibited."));
}
WPrefs.app/WPrefs.h
+2 -2
View File
@@ -42,8 +42,8 @@
/****/
#define WVERSION "0.9"
#define WMVERSION "0.20.x"
#define WVERSION "0.10"
#define WMVERSION "0.50.x"
typedef struct _Panel Panel;
WPrefs.app/WindowHandling.c
+2 -2
View File
@@ -315,8 +315,8 @@ createPanel(Panel *p)
WMMoveWidget(panel->tranF, 20, 175);
panel->tranB = WMCreateSwitchButton(panel->tranF);
WMMoveWidget(panel->tranB, 10, 10);
WMResizeWidget(panel->tranB, 235, 20);
WMMoveWidget(panel->tranB, 10, 5);
WMResizeWidget(panel->tranB, 250, 30);
WMSetButtonText(panel->tranB, _("Keep transients above their owners"));
WMMapSubwidgets(panel->tranF);
WPrefs.app/po/Makefile.am
+24 -24
View File
@@ -7,26 +7,26 @@ CLEANFILES = $(CATALOGS)
EXTRA_DIST = pt.po hr.po fr.po ko.po cs.po ja.po
POTFILES = \
$(top_builddir)/WPrefs/Configurations.c \
$(top_builddir)/WPrefs/Expert.c \
$(top_builddir)/WPrefs/Focus.c \
$(top_builddir)/WPrefs/Icons.c \
$(top_builddir)/WPrefs/KeyboardSettings.c \
$(top_builddir)/WPrefs/KeyboardShortcuts.c \
$(top_builddir)/WPrefs/Menu.c \
$(top_builddir)/WPrefs/MenuGuru.c \
$(top_builddir)/WPrefs/MenuPreferences.c \
$(top_builddir)/WPrefs/MouseSettings.c \
$(top_builddir)/WPrefs/Paths.c \
$(top_builddir)/WPrefs/Preferences.c \
$(top_builddir)/WPrefs/Text.c \
$(top_builddir)/WPrefs/TextureAndColor.c \
$(top_builddir)/WPrefs/Themes.c \
$(top_builddir)/WPrefs/WPrefs.c \
$(top_builddir)/WPrefs/WindowHandling.c \
$(top_builddir)/WPrefs/Workspace.c \
$(top_builddir)/WPrefs/main.c \
$(top_builddir)/WPrefs/xmodifier.c
$(top_builddir)/WPrefs.app/Configurations.c \
$(top_builddir)/WPrefs.app/Expert.c \
$(top_builddir)/WPrefs.app/Focus.c \
$(top_builddir)/WPrefs.app/Icons.c \
$(top_builddir)/WPrefs.app/KeyboardSettings.c \
$(top_builddir)/WPrefs.app/KeyboardShortcuts.c \
$(top_builddir)/WPrefs.app/Menu.c \
$(top_builddir)/WPrefs.app/MenuGuru.c \
$(top_builddir)/WPrefs.app/MenuPreferences.c \
$(top_builddir)/WPrefs.app/MouseSettings.c \
$(top_builddir)/WPrefs.app/Paths.c \
$(top_builddir)/WPrefs.app/Preferences.c \
$(top_builddir)/WPrefs.app/Text.c \
$(top_builddir)/WPrefs.app/TextureAndColor.c \
$(top_builddir)/WPrefs.app/Themes.c \
$(top_builddir)/WPrefs.app/WPrefs.c \
$(top_builddir)/WPrefs.app/WindowHandling.c \
$(top_builddir)/WPrefs.app/Workspace.c \
$(top_builddir)/WPrefs.app/main.c \
$(top_builddir)/WPrefs.app/xmodifier.c
SUFFIXES = .po .mo
@@ -50,10 +50,10 @@ install-data-local: $(CATALOGS)
for n in $(CATALOGS) __DuMmY ; do \
if test "$$n" -a "$$n" != "__DuMmY" ; then \
l=`basename $$n .mo`; \
$(mkinstalldirs) $(nlsdir)/$$l/LC_MESSAGES; \
chmod 755 $(nlsdir)/$$l; \
chmod 755 $(nlsdir)/$$l/LC_MESSAGES; \
$(INSTALL) -m 644 $$n $(nlsdir)/$$l/LC_MESSAGES/WPrefs.mo; \
$(mkinstalldirs) $(DESTDIR)$(nlsdir)/$$l/LC_MESSAGES; \
chmod 755 $(DESTDIR)$(nlsdir)/$$l; \
chmod 755 $(DESTDIR)$(nlsdir)/$$l/LC_MESSAGES; \
$(INSTALL) -m 644 $$n $(DESTDIR)$(nlsdir)/$$l/LC_MESSAGES/WPrefs.mo; \
fi; \
done
WPrefs.app/po/Makefile.in
+25 -24
View File
@@ -76,6 +76,7 @@ LN_S = @LN_S@
MAKEINFO = @MAKEINFO@
MOFILES = @MOFILES@
NLSDIR = @NLSDIR@
NM = @NM@
PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
REDUCE_APPICONS = @REDUCE_APPICONS@
@@ -102,26 +103,26 @@ CLEANFILES = $(CATALOGS)
EXTRA_DIST = pt.po hr.po fr.po ko.po cs.po ja.po
POTFILES = \
$(top_builddir)/WPrefs/Configurations.c \
$(top_builddir)/WPrefs/Expert.c \
$(top_builddir)/WPrefs/Focus.c \
$(top_builddir)/WPrefs/Icons.c \
$(top_builddir)/WPrefs/KeyboardSettings.c \
$(top_builddir)/WPrefs/KeyboardShortcuts.c \
$(top_builddir)/WPrefs/Menu.c \
$(top_builddir)/WPrefs/MenuGuru.c \
$(top_builddir)/WPrefs/MenuPreferences.c \
$(top_builddir)/WPrefs/MouseSettings.c \
$(top_builddir)/WPrefs/Paths.c \
$(top_builddir)/WPrefs/Preferences.c \
$(top_builddir)/WPrefs/Text.c \
$(top_builddir)/WPrefs/TextureAndColor.c \
$(top_builddir)/WPrefs/Themes.c \
$(top_builddir)/WPrefs/WPrefs.c \
$(top_builddir)/WPrefs/WindowHandling.c \
$(top_builddir)/WPrefs/Workspace.c \
$(top_builddir)/WPrefs/main.c \
$(top_builddir)/WPrefs/xmodifier.c
$(top_builddir)/WPrefs.app/Configurations.c \
$(top_builddir)/WPrefs.app/Expert.c \
$(top_builddir)/WPrefs.app/Focus.c \
$(top_builddir)/WPrefs.app/Icons.c \
$(top_builddir)/WPrefs.app/KeyboardSettings.c \
$(top_builddir)/WPrefs.app/KeyboardShortcuts.c \
$(top_builddir)/WPrefs.app/Menu.c \
$(top_builddir)/WPrefs.app/MenuGuru.c \
$(top_builddir)/WPrefs.app/MenuPreferences.c \
$(top_builddir)/WPrefs.app/MouseSettings.c \
$(top_builddir)/WPrefs.app/Paths.c \
$(top_builddir)/WPrefs.app/Preferences.c \
$(top_builddir)/WPrefs.app/Text.c \
$(top_builddir)/WPrefs.app/TextureAndColor.c \
$(top_builddir)/WPrefs.app/Themes.c \
$(top_builddir)/WPrefs.app/WPrefs.c \
$(top_builddir)/WPrefs.app/WindowHandling.c \
$(top_builddir)/WPrefs.app/Workspace.c \
$(top_builddir)/WPrefs.app/main.c \
$(top_builddir)/WPrefs.app/xmodifier.c
SUFFIXES = .po .mo
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -231,10 +232,10 @@ install-data-local: $(CATALOGS)
for n in $(CATALOGS) __DuMmY ; do \
if test "$$n" -a "$$n" != "__DuMmY" ; then \
l=`basename $$n .mo`; \
$(mkinstalldirs) $(nlsdir)/$$l/LC_MESSAGES; \
chmod 755 $(nlsdir)/$$l; \
chmod 755 $(nlsdir)/$$l/LC_MESSAGES; \
$(INSTALL) -m 644 $$n $(nlsdir)/$$l/LC_MESSAGES/WPrefs.mo; \
$(mkinstalldirs) $(DESTDIR)$(nlsdir)/$$l/LC_MESSAGES; \
chmod 755 $(DESTDIR)$(nlsdir)/$$l; \
chmod 755 $(DESTDIR)$(nlsdir)/$$l/LC_MESSAGES; \
$(INSTALL) -m 644 $$n $(DESTDIR)$(nlsdir)/$$l/LC_MESSAGES/WPrefs.mo; \
fi; \
done
WPrefs.app/po/ja.po
+646 -352
View File
File diff suppressed because it is too large Load Diff
WPrefs.app/po/ko.po
+1168 -1370
View File
File diff suppressed because it is too large Load Diff
WPrefs.app/tiff/Makefile.in
+1
View File
@@ -76,6 +76,7 @@ LN_S = @LN_S@
MAKEINFO = @MAKEINFO@
MOFILES = @MOFILES@
NLSDIR = @NLSDIR@
NM = @NM@
PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
REDUCE_APPICONS = @REDUCE_APPICONS@
WPrefs.app/xpm/Makefile.in
+1
View File
@@ -76,6 +76,7 @@ LN_S = @LN_S@
MAKEINFO = @MAKEINFO@
MOFILES = @MOFILES@
NLSDIR = @NLSDIR@
NM = @NM@
PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
REDUCE_APPICONS = @REDUCE_APPICONS@
WindowMaker/Backgrounds/Makefile.in
+1
View File
@@ -76,6 +76,7 @@ LN_S = @LN_S@
MAKEINFO = @MAKEINFO@
MOFILES = @MOFILES@
NLSDIR = @NLSDIR@
NM = @NM@
PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
REDUCE_APPICONS = @REDUCE_APPICONS@
WindowMaker/Defaults/Makefile.in
+1
View File
@@ -76,6 +76,7 @@ LN_S = @LN_S@
MAKEINFO = @MAKEINFO@
MOFILES = @MOFILES@
NLSDIR = @NLSDIR@
NM = @NM@
PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
REDUCE_APPICONS = @REDUCE_APPICONS@
WindowMaker/IconSets/Makefile.in
+1
View File
@@ -76,6 +76,7 @@ LN_S = @LN_S@
MAKEINFO = @MAKEINFO@
MOFILES = @MOFILES@
NLSDIR = @NLSDIR@
NM = @NM@
PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
REDUCE_APPICONS = @REDUCE_APPICONS@
WindowMaker/Icons/Makefile.in
+1
View File
@@ -76,6 +76,7 @@ LN_S = @LN_S@
MAKEINFO = @MAKEINFO@
MOFILES = @MOFILES@
NLSDIR = @NLSDIR@
NM = @NM@
PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
REDUCE_APPICONS = @REDUCE_APPICONS@
WindowMaker/Makefile.am
+6 -18
View File
@@ -29,24 +29,12 @@ prefsdata_DATA =\
menu.ru\
menu.se\
menu.sl\
menu.tr
menu.tr\
plmenu\
plmenu.fr\
plmenu.hr\
wmmacros
EXTRA_DIST = $(prefsdata_DATA) mkMakefile wmmacros.in plmenu.in\
plmenu.fr.in plmenu.hr.in
EXTRA_DIST = $(prefsdata_DATA) mkMakefile
CLEANFILES = wmmacros plmenu
wmmacros: $(srcdir)/wmmacros.in ./Makefile
-rm -f wmmacros
sed -e "s:#pkgdatadir#:$(pkgdatadir):" -e "s://:/:" \
$(srcdir)/wmmacros.in > wmmacros; \
chmod 644 wmmacros
plmenu: $(srcdir)/plmenu.in ./Makefile
-rm -f plmenu
sed -e "s:#pkgdatadir#:$(pkgdatadir):" -e "s://:/:" \
$(srcdir)/plmenu.in > plmenu; \
chmod 644 plmenu
WindowMaker/Makefile.in
+6 -19
View File
@@ -125,12 +125,13 @@ prefsdata_DATA =\
menu.ru\
menu.se\
menu.sl\
menu.tr
menu.tr\
plmenu\
plmenu.fr\
plmenu.hr\
wmmacros
EXTRA_DIST = $(prefsdata_DATA) mkMakefile wmmacros.in plmenu.in\
plmenu.fr.in plmenu.hr.in
CLEANFILES = wmmacros plmenu
EXTRA_DIST = $(prefsdata_DATA) mkMakefile
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../src/config.h
CONFIG_CLEAN_FILES =
@@ -333,20 +334,6 @@ distclean-generic clean-generic maintainer-clean-generic clean \
mostlyclean distclean maintainer-clean
wmmacros: $(srcdir)/wmmacros.in ./Makefile
-rm -f wmmacros
sed -e "s:#pkgdatadir#:$(pkgdatadir):" -e "s://:/:" \
$(srcdir)/wmmacros.in > wmmacros; \
chmod 644 wmmacros
plmenu: $(srcdir)/plmenu.in ./Makefile
-rm -f plmenu
sed -e "s:#pkgdatadir#:$(pkgdatadir):" -e "s://:/:" \
$(srcdir)/plmenu.in > plmenu; \
chmod 644 plmenu
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
WindowMaker/Pixmaps/Makefile.in
+1
View File
@@ -76,6 +76,7 @@ LN_S = @LN_S@
MAKEINFO = @MAKEINFO@
MOFILES = @MOFILES@
NLSDIR = @NLSDIR@
NM = @NM@
PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
REDUCE_APPICONS = @REDUCE_APPICONS@
WindowMaker/Styles/Makefile.in
+1
View File
@@ -76,6 +76,7 @@ LN_S = @LN_S@
MAKEINFO = @MAKEINFO@
MOFILES = @MOFILES@
NLSDIR = @NLSDIR@
NM = @NM@
PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
REDUCE_APPICONS = @REDUCE_APPICONS@
WindowMaker/Themes/Checker.themed/Makefile.in
+1
View File
@@ -76,6 +76,7 @@ LN_S = @LN_S@
MAKEINFO = @MAKEINFO@
MOFILES = @MOFILES@
NLSDIR = @NLSDIR@
NM = @NM@
PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
REDUCE_APPICONS = @REDUCE_APPICONS@
WindowMaker/Themes/Makefile.in
+1
View File
@@ -76,6 +76,7 @@ LN_S = @LN_S@
MAKEINFO = @MAKEINFO@
MOFILES = @MOFILES@
NLSDIR = @NLSDIR@
NM = @NM@
PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
REDUCE_APPICONS = @REDUCE_APPICONS@
WindowMaker/Themes/Night.themed/Makefile.in
+1
View File
@@ -76,6 +76,7 @@ LN_S = @LN_S@
MAKEINFO = @MAKEINFO@
MOFILES = @MOFILES@
NLSDIR = @NLSDIR@
NM = @NM@
PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
REDUCE_APPICONS = @REDUCE_APPICONS@
WindowMaker/menu
+1
View File
@@ -111,6 +111,7 @@
"Process List" EXEC xterm -e top
"Manual Browser" EXEC xman
"Info" END
"Run..." EXEC %a(Run,Type command to run:)
"XTerm" EXEC xterm -sb
"Rxvt" EXEC rxvt -bg black -fg white -fn fixed
"Workspaces" WORKSPACE_MENU
WindowMaker/menu.fr
+12 -7
View File
@@ -195,7 +195,6 @@
"Loupe" EXEC xmag
"Carte des couleurs" EXEC xcmap
"XKill" EXEC xkill
"ASClock" EXEC asclock -shape
"Sélections" EXEC xclipboard
"Utilitaires" END
@@ -217,9 +216,9 @@
"Espace de travail" END
"Apparence" MENU
"Thèmes" OPEN_MENU -noext THEMES_DIR ~/GNUstep/Library/WindowMaker/Themes WITH setstyle
"Styles" OPEN_MENU -noext STYLES_DIR ~/GNUstep/Library/WindowMaker/Styles WITH setstyle
"Jeu d'icônes" OPEN_MENU -noext ICON_SETS_DIR ~/GNUstep/Library/WindowMaker/IconSets WITH seticons
"Thèmes" OPEN_MENU THEMES_DIR ~/GNUstep/Library/WindowMaker/Themes WITH setstyle
"Styles" OPEN_MENU STYLES_DIR ~/GNUstep/Library/WindowMaker/Styles WITH setstyle
"Jeu d'icônes" OPEN_MENU ICON_SETS_DIR ~/GNUstep/Library/WindowMaker/IconSets WITH seticons
"Fond d'écran" MENU
"Unifié" MENU
"Noir" WS_BACK '(solid, black)'
@@ -232,10 +231,16 @@
"Bordeaux" WS_BACK '(solid, "#400020")'
"Unifié" END
"Degradé" MENU
"Drapeau" WS_BACK '(mdgradient, green, red, white, green)'
"Coucher de Soleil" WS_BACK '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'
"Ciel" WS_BACK '(vgradient, blue4, white)'
"Dégradés de Bleu" WS_BACK '(vgradient, "#7080a5", "#101020")'
"Dégradés d'Indigo" WS_BACK '(vgradient, "#746ebc", "#242e4c")'
"Dégradés de Violet" WS_BACK '(vgradient, "#654c66", "#151426")'
"Dégradés de Beige" WS_BACK '(vgradient, "#a09060", "#302010")'
"Dégradés de Gris" WS_BACK '(vgradient, "#636380", "#131318")'
"Dégradés de Bordeau" WS_BACK '(vgradient, "#600040", "#180010")'
"Degradé" END
"Images" OPEN_MENU -noext BACKGROUNDS_DIR ~/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t
"Images" OPEN_MENU BACKGROUNDS_DIR ~/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t
"Fond d'écran" END
"Sauver le thème" EXEC getstyle -t ~/GNUstep/Library/WindowMaker/Themes/"%a(Nom du theme)"
"Sauver le jeu d'icônes" EXEC geticonset ~/GNUstep/Library/WindowMaker/IconSets/"%a(Nom du jeu d'icones)"
@@ -245,6 +250,6 @@
"Redémarrer" RESTART
"Démarrer AfterStep" RESTART afterstep
"Quitter..." EXIT
"Terminer la session" SHUTDOWN
"Tuer la session..." SHUTDOWN
"Quitter" END
"Applications" END
WindowMaker/menu.hu
BIN
View File
Binary file not shown.
WindowMaker/mkMakefile
+6 -23
View File
@@ -37,14 +37,17 @@ EXCEPT="Makefile.am Makefile.in Makefile mkMakefile $FILE"
spit prefsdata_DATA =
for f in `ls -1|grep -v .in|grep -v \~`; do
FILES=`ls -1|grep -v \~`
FILES=`echo $FILES`
for f in $FILES; do
ok=1
for i in $EXCEPT; do
if test "$i" = "$f"; then
ok=0
break
fi
done
done
if [ -f $f -a $ok = 1 ]; then
spitln \\
spit " $f"
@@ -55,26 +58,6 @@ done
spitln
spitln
spitln EXTRA_DIST = '$(prefsdata_DATA)' mkMakefile wmmacros.in plmenu.in\\
spitln " plmenu.fr.in plmenu.hr.in"
spitln EXTRA_DIST = '$(prefsdata_DATA)' mkMakefile
spitln
spitln CLEANFILES = wmmacros plmenu
spitln
cat << 'FIM' >> $FILE
wmmacros: $(srcdir)/wmmacros.in ./Makefile
-rm -f wmmacros
sed -e "s:#pkgdatadir#:$(pkgdatadir):" -e "s://:/:" \
$(srcdir)/wmmacros.in > wmmacros; \
chmod 644 wmmacros
plmenu: $(srcdir)/plmenu.in ./Makefile
-rm -f plmenu
sed -e "s:#pkgdatadir#:$(pkgdatadir):" -e "s://:/:" \
$(srcdir)/plmenu.in > plmenu; \
chmod 644 plmenu
FIM
WindowMaker/plmenu.fr.in
-95
View File
@@ -1,95 +0,0 @@
("Applications",
("Informations",
("Panneau d'informations", INFO_PANEL),
("Panneau d'informations légales", LEGAL_PANEL),
("Console système", EXEC, "xconsole"),
("Charge système", EXEC, "xosview || xload"),
("Liste des processus", EXEC, "xterm -e top"),
("Butineur d'aide", EXEC, "xman")
),
("Terminal X", EXEC, "xterm -sb"),
("Rxvt", EXEC, "rxvt -bg black -fg white -fn fixed"),
("Espaces de travail", WORKSPACE_MENU),
("Applications",
("Graphismes",
("Gimp", EXEC, "gimp >/dev/null"),
("XV", EXEC, "xv"),
("XPaint", EXEC, "xpaint"),
("XFig", EXEC, "xfig")
),
("Xfm", EXEC, "xfm"),
("OffiX Files", EXEC, "files"),
("LyX", EXEC , "lyx"),
("Netscape", EXEC, "netscape"),
("Ghostview", EXEC, "ghostview %a(Entrez un fichier)"),
("Acrobat", EXEC, "/usr/local/Acrobat3/bin/acroread %a(Entrez un fichier PDF)"),
("TkDesk", EXEC, "tkdesk")
),
("Editeurs",
("XFte", EXEC, "xfte"),
("XEmacs", EXEC, "xemacs || emacs"),
("XJed", EXEC, "xjed"),
("NEdit", EXEC, "nedit"),
("Xedit", EXEC, "xedit"),
("VI", EXEC, "xterm -e vi")
),
("Divers",
("Xmcd", EXEC, "xmcd 2> /dev/null"),
("Xplaycd", EXEC, "xplaycd"),
("Xmixer", EXEC, "xmixer")
),
("Utilitaires",
("Calculatrice", EXEC, "xcalc"),
("Propriétés de la fenêtre", EXEC, "xprop | xmessage -center -title 'xprop' -file -"),
("Sélecteur de polices", EXEC, "xfontsel"),
("Emulateur de terminal", EXEC, "xminicom"),
("Loupe", EXEC, "xmag"),
("Carte des couleurs", EXEC, "xcmap"),
("XKill", EXEC, "xkill"),
("ASClock", EXEC, "asclock -shape"),
("Sélections", EXEC, "xclipboard")
),
("Sélection",
("Copier", EXEC, "echo '%s' | wxcopy"),
("Envoyer à", EXEC, "xterm -name mail -T Pine -e pine %s"),
("Naviguer", EXEC, "netscape %s"),
("Rechercher dans le manuel", EXEC, "MANUAL_SEARCH(%s)")
),
("Espace de travail",
("Cacher les autres fenêtres", HIDE_OTHERS),
("Montrer toutes les fenêtres", SHOW_ALL),
("Arranger les icônes", ARRANGE_ICONS),
("Retracer l'écran", REFRESH),
("Vérrouiller", EXEC, "xlock -allowroot -usefirst"),
("Sauver la session", SAVE_SESSION),
("Effacer la session", CLEAR_SESSION)
),
("Apparence",
("Thèmes", OPEN_MENU, "-noext #pkgdatadir#/Themes ~/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
("Styles", OPEN_MENU, "-noext #pkgdatadir#/Styles ~/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
("Jeu d'icônes", OPEN_MENU, "-noext #pkgdatadir#/IconSets ~/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
("Fond d'écran",
("Unifié",
("Noir", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, black)'"),
("Bleu", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#505075\")'"),
("Violet", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#554466\")'"),
("Blanc crème", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, wheat4)'"),
("Gris foncé", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#333340\")'"),
("Bordeaux", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#400020\")'")
),
("Degradé",
("Drapeau", EXEC, "wdwrite WindowMaker WorkspaceBack '(mdgradient, green, red, white, green)'"),
("Ciel", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, blue4, white)'")
),
("Images", OPEN_MENU, "-noext #pkgdatadir#/Backgrounds ~/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
),
("Sauver le thème", EXEC, "getstyle -t ~/GNUstep/Library/WindowMaker/Themes /\"%a(Theme name)\""),
("Sauver le jeu d'icônes", EXEC, "geticonset ~/GNUstep/Library/WindowMaker/IconSets /\"%a(IconSet name)\"")
),
("Quitter",
("Redémarrer", RESTART),
("Démarrer AfterStep", RESTART, afterstep),
("Quitter...", EXIT),
("Terminer la session", SHUTDOWN)
)
)
WindowMaker/plmenu.hr.in
-213
View File
@@ -1,213 +0,0 @@
(
Programi,
(
Info,
("Info Panel...", INFO_PANEL),
(Legal..., LEGAL_PANEL),
("Sistemska konzola", EXEC, xconsole),
("Optere\346enje sistema", EXEC, "xosview || xload"),
("Lista procesa", EXEC, "xterm -e top"),
("Pretra\276iva\350 manuala", EXEC, xman)
),
(XTerm, EXEC, "xterm -sb"),
(Rxvt, EXEC, "rxvt -bg black -fg white -fn fixed"),
("Radni Prostori", WORKSPACE_MENU),
(
Programi,
(
Grafika,
(Gimp, EXEC, "gimp >/dev/null"),
(XV, EXEC, xv),
(XPaint, EXEC, xpaint),
(XFig, EXEC, xfig)
),
("X File Manager", EXEC, xfm),
("OffiX Files", EXEC, files),
(LyX, EXEC, lyx),
(Netscape, EXEC, netscape),
(Ghostview, EXEC, "ghostview %a(Enter file to view)"),
(
Acrobat,
EXEC,
"/usr/local/Acrobat3/bin/acroread %a(Enter PDF to view)"
),
(TkDesk, EXEC, tkdesk)
),
(
Editori,
(XFte, EXEC, xfte),
(XEmacs, EXEC, "xemacs || emacs"),
(XJed, EXEC, xjed),
(NEdit, EXEC, nedit),
(Xedit, EXEC, xedit),
(VI, EXEC, "xterm -e vi")
),
(
Razno,
(Xmcd, EXEC, "xmcd 2> /dev/null"),
(Xplaycd, EXEC, xplaycd),
(Xmixer, EXEC, xmixer)
),
(
"Pomo\346ni programi",
(Kalkulator, EXEC, xcalc),
(
"Postavke prozora",
EXEC,
"xprop | xmessage -center -title 'xprop' -file -"
),
("Bira\350 fontova", EXEC, xfontsel),
("Emulator terminala", EXEC, xminicom),
("Pove\346alo", EXEC, xmag),
(Colormap, EXEC, xcmap),
(XKill, EXEC, xkill),
(ASClock, EXEC, "asclock -shape"),
(Clipboard, EXEC, xclipboard)
),
(
Odabir,
(Kopiraj, EXEC, "echo '%s' | wxcopy"),
("Po\271alji e-mail", EXEC, "xterm -name mail -T Pine -e pine %s"),
("Otvori web", EXEC, "netscape %s"),
("Potra\276i u manualu", EXEC, "MANUAL_SEARCH(%s)")
),
(
"Radni prostor",
("Sakrij ostale", HIDE_OTHERS),
("Poka\276i sve", SHOW_ALL),
("Pospremi ikone", ARRANGE_ICONS),
("Osvje\276i", REFRESH),
("Zaklju\350aj", EXEC, "xlock -allowroot -usefirst"),
("Snimi session", SAVE_SESSION),
("O\350isti snimljeni Session", CLEAR_SESSION)
),
(
Izgled,
(
Teme,
OPEN_MENU,
"-noext /usr/local/share/WindowMaker/Themes ~/GNUstep/Library/WindowMaker/Themes WITH setstyle"
),
(
Stilovi,
OPEN_MENU,
"-noext /usr/local/share/WindowMaker/Styles ~/GNUstep/Library/WindowMaker/Styles WITH setstyle"
),
(
"Setovi ikona",
OPEN_MENU,
"-noext /usr/local/share/WindowMaker/IconSets ~/GNUstep/Library/WindowMaker/IconSets WITH seticons"
),
(
Pozadina,
(
Boja,
(
Crna,
EXEC,
"wdwrite WindowMaker WorkspaceBack '(solid, black)'"
),
(
Plava,
EXEC,
"wdwrite WindowMaker WorkspaceBack '(solid, \"#505075\")'"
),
(
Indigo,
EXEC,
"wdwrite WindowMaker WorkspaceBack '(solid, \"#243e6c\")'"
),
(
"Duboko Plava",
EXEC,
"wdwrite WindowMaker WorkspaceBack '(solid, \"#180090\")'"
),
(
Purpurna,
EXEC,
"wdwrite WindowMaker WorkspaceBack '(solid, \"#554466\")'"
),
(
Pustinjska,
EXEC,
"wdwrite WindowMaker WorkspaceBack '(solid, wheat4)'"
),
(
"Tamno siva",
EXEC,
"wdwrite WindowMaker WorkspaceBack '(solid, \"#333340\")'"
),
(
Vinska,
EXEC,
"wdwrite WindowMaker WorkspaceBack '(solid, \"#400020\")'"
)
),
(
Preljevi,
(
"Zalazak sunca",
EXEC,
"wdwrite WindowMaker WorkspaceBack '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'"
),
(
Nebo,
EXEC,
"wdwrite WindowMaker WorkspaceBack '(vgradient, blue4, white)'"
),
(
"Plave nijanse",
EXEC,
"wdwrite WindowMaker WorkspaceBack '(vgradient, \"#7080a5\", \"#101020\")'"
),
(
"Indigo nijanse",
EXEC,
"wdwrite WindowMaker WorkspaceBack '(vgradient, \"#746ebc\", \"#242e4c\")'"
),
(
"Purpurne nijanse",
EXEC,
"wdwrite WindowMaker WorkspaceBack '(vgradient, \"#654c66\", \"#151426\")'"
),
(
"Pustinjske nijanse",
EXEC,
"wdwrite WindowMaker WorkspaceBack '(vgradient, \"#a09060\", \"#302010\")'"
),
(
"Sive nijanse",
EXEC,
"wdwrite WindowMaker WorkspaceBack '(vgradient, \"#636380\", \"#131318\")'"
),
(
"Vinske nijanse",
EXEC,
"wdwrite WindowMaker WorkspaceBack '(vgradient, \"#600040\", \"#180010\")'"
)
),
(
Slike,
OPEN_MENU,
"-noext /usr/local/share/WindowMaker/Backgrounds ~/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t"
)
),
(
"Snimi temu",
EXEC,
"getstyle -t ~/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""
),
(
"Snimi set ikona",
EXEC,
"geticonset ~/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""
)
),
(
Izlaz,
("Ponovo startaj", RESTART),
("Startaj AfterStep", RESTART, afterstep),
(Izlaz..., EXIT),
("Izlaz iz sessiona...", SHORTCUT, "Mod1+e", SHUTDOWN, QUICK)
),
)
WindowMaker/plmenu.in
-103
View File
@@ -1,103 +0,0 @@
("Applications",
("Info",
("Info Panel...", INFO_PANEL),
("Legal...", LEGAL_PANEL),
("System Console", EXEC, "xconsole"),
("System Load", EXEC, "xosview || xload"),
("Process List", EXEC, "xterm -e top"),
("Manual Browser", EXEC, "xman")
),
("XTerm", EXEC, "xterm -sb"),
("Rxvt", EXEC, "rxvt -bg black -fg white -fn fixed"),
("Workspaces", WORKSPACE_MENU),
("Applications",
("Graphics",
("Gimp", EXEC, "gimp >/dev/null"),
("XV", EXEC, "xv"),
("XPaint", EXEC, "xpaint"),
("XFig", EXEC, "xfig")
),
("X File Manager", EXEC, "xfm"),
("OffiX Files", EXEC, "files"),
("LyX", EXEC, "lyx"),
("Netscape", EXEC, "netscape"),
("Ghostview", EXEC, "ghostview %a(Enter file to view)"),
("Acrobat", EXEC, "/usr/local/Acrobat3/bin/acroread %a(Enter PDF to view)"),
("TkDesk", EXEC, "tkdesk")
),
("Editors",
("XFte", EXEC, "xfte"),
("XEmacs", EXEC, "xemacs || emacs"),
("XJed", EXEC, "xjed"),
("NEdit", EXEC, "nedit"),
("Xedit", EXEC, "xedit"),
("VI", EXEC, "xterm -e vi")
),
("Miscellaneous",
("Xmcd", EXEC, "xmcd 2> /dev/null"),
("Xplaycd", EXEC, "xplaycd"),
("Xmixer", EXEC, "xmixer")
),
("Utils",
("Calculator", EXEC, "xcalc"),
("Window Properties", EXEC, "xprop | xmessage -center -title 'xprop' -file -"),
("Font Chooser", EXEC, "xfontsel"),
("Terminal Emulator", EXEC, "xminicom"),
("Magnify", EXEC, "xmag"),
("Colormap", EXEC, "xcmap"),
("XKill", EXEC, "xkill"),
("ASClock", EXEC, "asclock -shape"),
("Clipboard", EXEC, "xclipboard")
),
("Selection",
("Copy", EXEC, "echo '%s' | wxcopy"),
("Mail To", EXEC, "xterm -name mail -T Pine -e pine %s"),
("Navigate", EXEC, "netscape %s"),
("Search in Manual", EXEC, "MANUAL_SEARCH(%s)")
),
("Workspace",
("Hide Others", HIDE_OTHERS),
("Show All", SHOW_ALL),
("Arrange Icons", ARRANGE_ICONS),
("Refresh", REFRESH),
("Lock", EXEC, "xlock -allowroot -usefirst"),
("Save Session", SAVE_SESSION),
("Clear Saved Session", CLEAR_SESSION)
),
("Appearance",
("Themes", OPEN_MENU, "-noext #pkgdatadir#/Themes ~/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
("Styles", OPEN_MENU, "-noext #pkgdatadir#/Styles ~/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
("Icon Sets", OPEN_MENU, "-noext #pkgdatadir#/IconSets ~/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
("Background",
("Solid",
("Black", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, black)'"),
("Blue", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#505075\")'"),
("Indigo", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#243e6c\")'"),
("Deep Blue", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#180090\")'"),
("Purple", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#554466\")'"),
("Wheat", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, wheat4)'"),
("Dark Gray", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#333340\")'"),
("Wine", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#400020\")'")
),
("Gradient",
("Sunset", EXEC, "wdwrite WindowMaker WorkspaceBack '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'"),
("Sky", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, blue4, white)'"),
("Blue Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#7080a5\", \"#101020\")'"),
("Indigo Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#746ebc\", \"#242e4c\")'"),
("Purple Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#654c66\", \"#151426\")'"),
("Wheat Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#a09060\", \"#302010\")'"),
("Grey Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#636380\", \"#131318\")'"),
("Wine Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#600040\", \"#180010\")'")
),
("Images", OPEN_MENU, "-noext #pkgdatadir#/Backgrounds ~/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
),
("Save Theme", EXEC, "getstyle -t ~/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),
("Save IconSet", EXEC, "geticonset ~/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\"")
),
("Exit",
("Restart", RESTART),
("Start AfterStep", RESTART, afterstep),
("Exit...", EXIT),
("Kill session...", SHUTDOWN)
)
)
WindowMaker/wmmacros.in
-73
View File
@@ -1,73 +0,0 @@
/*
* Some generic macros for WindowMaker configuration files
*
*/
#ifndef WMMACROS_
#define WMMACROS_
#define HAVE_XLESS
/*
* WS_BACK - sets the root background texture to VAL
*/
#define WS_BACK EXEC wdwrite WindowMaker WorkspaceBack
/*
* CLEARROOT - set the root background to nothing
*/
#define CLEARROOT xsetroot
/*
* SETSTYLE FILE - loads a style file
*/
#define SETSTYLE EXEC cd $HOME/GNUstep/Library/WindowMaker/Styles; setstyle
/*
*
* MANUAL_SEARCH(ITEM) - search manual page for ITEM
*
* You might need to change this according to what's the exit status of your
* man(1). This is for the one that comes with Linux (RedHat)
*/
#ifdef HAVE_XLESS
#define MANUAL_SEARCH(ITEM) \
if ( man ITEM > /dev/null ); then \
man ITEM | xless;\
else \
xmessage -center -title "Manual Browser" \
Sorry, but there is no manual page \
entry for ITEM...;\
fi
#else
#define MANUAL_SEARCH(ITEM) \
if ( man ITEM > /dev/null ); then \
xterm -e man ITEM; \
else \
xmessage -center -title "Manual Browser" \
Sorry, but there is no manual page \
entry for ITEM...;\
fi
#endif
/*
* Paths to system configuration directories
*/
#define THEMES_DIR #pkgdatadir#/Themes
#define STYLES_DIR #pkgdatadir#/Styles
#define ICON_SETS_DIR #pkgdatadir#/IconSets
#define SOUND_SETS_DIR #pkgdatadir#/SoundSets
#define BACKGROUNDS_DIR #pkgdatadir#/Backgrounds
#define StaticGray 0
#define GrayScale 1
#define StaticColor 2
#define PseudoColor 3
#define TrueColor 4
#define DirectColor 5
#endif
configure
Vendored
+235 -270
View File
File diff suppressed because it is too large Load Diff
configure.in
+65 -8
View File
@@ -10,10 +10,24 @@ dnl
AC_INIT(src/WindowMaker.h)
AM_INIT_AUTOMAKE(WindowMaker, 0.50.0)
AM_INIT_AUTOMAKE(WindowMaker, 0.50.2)
AM_PROG_LIBTOOL
# by Marcelo Magallon <mmagallo@efis.ucr.ac.cr>
# Turn around -rpath problem with libtool 1.0c
# This define should be improbable enough to not conflict with anything
case ${host} in
*-pc-linux-gnu)
AC_MSG_RESULT([Fixing libtool for -rpath problems.])
sed < libtool > libtool-2 \
's/^hardcode_libdir_flag_spec.*$/hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "/'
mv libtool-2 libtool
chmod 755 libtool
;;
esac
dnl configure/build bundled libraries
dnl ===================================
@@ -32,9 +46,9 @@ dnl Checks for programs.
dnl ===================
AC_ISC_POSIX
AC_PROG_CC
AC_PROG_MAKE_SET
dnl AC_PROG_MAKE_SET -- already done by AM_INIT_AUTOMAKE
#AC_PROG_RANLIB
AC_PROG_INSTALL
dnl AC_PROG_INSTALL -- already done by AM_INIT_AUTOMAKE
AC_PROG_LN_S
AC_PROG_GCC_TRADITIONAL
@@ -56,7 +70,7 @@ fi
if test "x$CPP_PATH" = x; then
AC_PATH_PROG(CPP_PATH, cpp, notfound,
/lib:/usr/bin:/bin:/usr/lib:/usr/ccs/lib:$PATH)
[/lib /usr/bin /bin /usr/lib /usr/ccs/lib $PATH])
fi
dnl
@@ -135,7 +149,7 @@ dnl ==================
dnl List of supported locales
dnl -------------------------
supported_locales="cs de es fr gl it ja ko nl no pt ru se tr fi hr el pl ro"
supported_wprefs_locales="pt hr fr ko ja"
supported_wprefs_locales="pt hr fr ko ja cs"
for lang in $LINGUAS; do
ok=0
@@ -739,9 +753,52 @@ dnl Output some helpfull data for compiling WINGs apps
dnl ==================================================
dnl
echo "WFLAGS=\"$LIBPL_INC_PATH -I$prefix/include\"" > WINGs-flags
echo "WLIBS=\"-L$exec_prefix/lib -lWINGs -lwraster $LIBPL_LIBS $GFXLIBS -lm\""\
| sed -e 's|\$(prefix)|'"$prefix|" >> WINGs-flags
dnl echo "WFLAGS=\"$LIBPL_INC_PATH -I$prefix/include\"" > WINGs-flags
dnl echo "WLIBS=\"-L$exec_prefix/lib -lWINGs -lwraster $LIBPL_LIBS $GFXLIBS -lm\""\
dnl | sed -e 's|\$(prefix)|'"$prefix|" >> WINGs-flags
dnl The #lp# and #rp# stuff below is a hack because [ and ] get lost when
dnl parsed by m4
cat <<EOF >WINGs-flags
#!/bin/sh
prefix="$prefix"
exec_prefix=\$prefix
WFLAGS="$LIBPL_INC_PATH -I\$prefix/include"
WLIBS="-L\$exec_prefix/lib -lWINGs -lwraster $LIBPL_LIBS $GFXLIBS -lm"
usage="Usage: WINGs-flags #lp#--libs#rp# #lp#--incs#rp#"
if test \$# -eq 0; then
echo "\${usage}" 1>&2
exit 1
fi
while test \$# -gt 0; do
case \$1 in
--incs)
echo \$WFLAGS
;;
--libs)
echo \$WLIBS
;;
*)
echo "\${usage}" 1>&2
exit 1
;;
esac
shift
done
EOF
sed 's/#lp#/[/g' WINGs-flags | sed 's/#rp#/]/g' > WINGs/WINGs-flags
chmod 755 WINGs/WINGs-flags
rm -f WINGs-flags
dnl
doc/Makefile.in
+1
View File
@@ -76,6 +76,7 @@ LN_S = @LN_S@
MAKEINFO = @MAKEINFO@
MOFILES = @MOFILES@
NLSDIR = @NLSDIR@
NM = @NM@
PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
REDUCE_APPICONS = @REDUCE_APPICONS@
po/Makefile.am
+4 -4
View File
@@ -58,9 +58,9 @@ install-data-local: $(CATALOGS)
for n in $(CATALOGS) __DuMmY ; do \
if test "$$n" -a "$$n" != "__DuMmY" ; then \
l=`basename $$n .mo`; \
$(mkinstalldirs) $(nlsdir)/$$l/LC_MESSAGES; \
chmod 755 $(nlsdir)/$$l; \
chmod 755 $(nlsdir)/$$l/LC_MESSAGES; \
$(INSTALL) -m 644 $$n $(nlsdir)/$$l/LC_MESSAGES/WindowMaker.mo; \
$(mkinstalldirs) $(DESTDIR)$(nlsdir)/$$l/LC_MESSAGES; \
chmod 755 $(DESTDIR)$(nlsdir)/$$l; \
chmod 755 $(DESTDIR)$(nlsdir)/$$l/LC_MESSAGES; \
$(INSTALL) -m 644 $$n $(DESTDIR)$(nlsdir)/$$l/LC_MESSAGES/WindowMaker.mo; \
fi; \
done
po/Makefile.in
+5 -4
View File
@@ -76,6 +76,7 @@ LN_S = @LN_S@
MAKEINFO = @MAKEINFO@
MOFILES = @MOFILES@
NLSDIR = @NLSDIR@
NM = @NM@
PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
REDUCE_APPICONS = @REDUCE_APPICONS@
@@ -239,10 +240,10 @@ install-data-local: $(CATALOGS)
for n in $(CATALOGS) __DuMmY ; do \
if test "$$n" -a "$$n" != "__DuMmY" ; then \
l=`basename $$n .mo`; \
$(mkinstalldirs) $(nlsdir)/$$l/LC_MESSAGES; \
chmod 755 $(nlsdir)/$$l; \
chmod 755 $(nlsdir)/$$l/LC_MESSAGES; \
$(INSTALL) -m 644 $$n $(nlsdir)/$$l/LC_MESSAGES/WindowMaker.mo; \
$(mkinstalldirs) $(DESTDIR)$(nlsdir)/$$l/LC_MESSAGES; \
chmod 755 $(DESTDIR)$(nlsdir)/$$l; \
chmod 755 $(DESTDIR)$(nlsdir)/$$l/LC_MESSAGES; \
$(INSTALL) -m 644 $$n $(DESTDIR)$(nlsdir)/$$l/LC_MESSAGES/WindowMaker.mo; \
fi; \
done
po/ja.po
+1230 -366
View File
File diff suppressed because it is too large Load Diff
po/ko.po
+1114 -1320
View File
File diff suppressed because it is too large Load Diff
src/Makefile.in
+1
View File
@@ -76,6 +76,7 @@ LN_S = @LN_S@
MAKEINFO = @MAKEINFO@
MOFILES = @MOFILES@
NLSDIR = @NLSDIR@
NM = @NM@
PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
REDUCE_APPICONS = @REDUCE_APPICONS@
src/WindowMaker.h
+1
View File
@@ -286,6 +286,7 @@ typedef struct WPreferences {
char ws_cycle; /* Cycle existing workspaces */
unsigned int modifier_mask; /* mask to use as kbd modifier */
char save_session_on_exit; /* automatically save session on exit */
src/actions.c
+1 -1
View File
@@ -415,7 +415,7 @@ wUnshadeWindow(WWindow *wwin)
/* if the window is focused, set the focus again as it was disabled during
* shading */
if (wwin->flags.focused)
wSetFocusTo(wwin->screen_ptr, wwin);
wSetFocusTo(wwin->screen_ptr, wwin);
#ifdef GNOME_STUFF
wGNOMEUpdateClientStateHint(wwin, False);
src/appicon.c
+4 -1
View File
@@ -563,7 +563,7 @@ openApplicationMenu(WApplication *wapp, int x, int y)
if (!scr->icon_menu) {
scr->icon_menu = createApplicationMenu(scr);
free(scr->window_menu->entries[1]->text);
free(scr->icon_menu->entries[1]->text);
}
menu = scr->icon_menu;
@@ -678,6 +678,9 @@ appIconMouseDown(WObjDescriptor *desc, XEvent *event)
WObjDescriptor *desc;
WApplication *wapp = wApplicationOf(aicon->icon->owner->main_window);
if (!wapp)
return;
openApplicationMenu(wapp, event->xbutton.x_root,
event->xbutton.y_root);
src/client.c
+3
View File
@@ -719,6 +719,9 @@ wClientGetNormalHints(WWindow *wwin, XWindowAttributes *wattribs, Bool geometry,
#ifdef DEBUG
printf("PRE ICCCM\n");
#endif
#ifdef IGNORE_PPOSITION
wwin->normal_hints->flags &= ~PPosition;
#endif
if (wwin->normal_hints->flags & (USPosition|PPosition)) {
*x = wwin->normal_hints->x;
*y = wwin->normal_hints->y;
src/defaults.c
+45 -43
View File
@@ -30,6 +30,7 @@
#include <time.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <limits.h>
#include <signal.h>
@@ -1926,33 +1927,23 @@ again:
/* only do basic error checking and verify for None texture */
nelem = PLGetNumberOfElements(value);
if (nelem < 1) {
wwarning(_("Too few elements in array for key \"WorkspaceBack\"."));
if (changed==0) {
value = entry->plvalue;
changed = 1;
wwarning(_("using default \"%s\" instead"), entry->default_value);
goto again;
}
return False;
if (nelem > 0) {
elem = PLGetArrayElement(value, 0);
if (!elem || !PLIsString(elem)) {
wwarning(_("Wrong type for workspace background. Should be a texture type."));
if (changed==0) {
value = entry->plvalue;
changed = 1;
wwarning(_("using default \"%s\" instead"), entry->default_value);
goto again;
}
return False;
}
val = PLGetString(elem);
if (strcasecmp(val, "None")==0)
return True;
}
elem = PLGetArrayElement(value, 0);
if (!elem || !PLIsString(elem)) {
wwarning(_("Wrong type for workspace background. Should be a texture type."));
if (changed==0) {
value = entry->plvalue;
changed = 1;
wwarning(_("using default \"%s\" instead"), entry->default_value);
goto again;
}
return False;
}
val = PLGetString(elem);
if (strcasecmp(val, "None")==0)
return True;
*ret = PLRetain(value);
return True;
@@ -1983,17 +1974,13 @@ again:
/* only do basic error checking and verify for None texture */
nelem = PLGetNumberOfElements(value);
if (nelem < 0) {
*ret = PLRetain(value);
return True;
}
while (nelem--) {
elem = PLGetArrayElement(value, nelem);
if (!elem || !PLIsArray(elem)) {
wwarning(_("Wrong type for background of workspace %i. Should be a texture."),
nelem);
if (nelem > 0) {
while (nelem--) {
elem = PLGetArrayElement(value, nelem);
if (!elem || !PLIsArray(elem)) {
wwarning(_("Wrong type for background of workspace %i. Should be a texture."),
nelem);
}
}
}
@@ -2568,11 +2555,9 @@ setWorkspaceSpecificBack(WScreen *scr, WDefaultEntry *entry, proplist_t value,
if (scr->flags.backimage_helper_launched) {
if (PLGetNumberOfElements(value)==0) {
kill(scr->helper_pid, SIGTERM);
close(scr->helper_fd);
scr->helper_fd = 0;
scr->flags.backimage_helper_launched = 0;
SendHelperMessage(scr, 'C', 0, NULL);
SendHelperMessage(scr, 'K', 0, NULL);
PLRelease(value);
return 0;
}
@@ -2593,10 +2578,16 @@ setWorkspaceSpecificBack(WScreen *scr, WDefaultEntry *entry, proplist_t value,
pid = fork();
if (pid < 0) {
wsyserror("fork() failed:can't set workspace specific background image");
if (close(filedes[0]) < 0)
wsyserror("could not close pipe");
if (close(filedes[1]) < 0)
wsyserror("could not close pipe");
} else if (pid == 0) {
SetupEnvironment(scr);
close(0);
if (close(0) < 0)
wsyserror("could not close pipe");
if (dup(filedes[0]) < 0) {
wsyserror("dup() failed:can't set workspace specific background image");
}
@@ -2604,6 +2595,14 @@ setWorkspaceSpecificBack(WScreen *scr, WDefaultEntry *entry, proplist_t value,
wsyserror("could not execute wmsetbg");
exit(1);
} else {
if (fcntl(filedes[0], F_SETFD, FD_CLOEXEC) < 0) {
wsyserror("error setting close-on-exec flag");
}
if (fcntl(filedes[1], F_SETFD, FD_CLOEXEC) < 0) {
wsyserror("error setting close-on-exec flag");
}
scr->helper_fd = filedes[1];
scr->helper_pid = pid;
scr->flags.backimage_helper_launched = 1;
@@ -2645,7 +2644,10 @@ setWorkspaceBack(WScreen *scr, WDefaultEntry *entry, proplist_t value,
if (str) {
SendHelperMessage(scr, 'S', 0, str);
free(str);
} else {
SendHelperMessage(scr, 'U', 0, NULL);
}
SendHelperMessage(scr, 'C', scr->current_workspace+1, NULL);
} else {
char *command;
char *text;
src/dock.c
+10 -6
View File
@@ -2271,7 +2271,10 @@ wDockSnapIcon(WDock *dock, WAppIcon *icon, int req_x, int req_y,
int i, offset = ICON_SIZE/2;
WAppIcon *aicon = NULL;
WAppIcon *nicon = NULL;
int max_y_icons, max_x_icons;
max_x_icons = scr->scr_width/ICON_SIZE;
max_y_icons = scr->scr_height/ICON_SIZE-1;
if (wPreferences.flags.noupdates)
return False;
@@ -2284,7 +2287,7 @@ wDockSnapIcon(WDock *dock, WAppIcon *icon, int req_x, int req_y,
(dock->icon_count >= dock->max_icons)) {
return False;
}
/* exact position */
if (req_y < dy)
ex_y = (req_y - offset - dy)/ICON_SIZE;
@@ -2298,9 +2301,9 @@ wDockSnapIcon(WDock *dock, WAppIcon *icon, int req_x, int req_y,
/* check if the icon is outside the screen boundaries */
if (dx + ex_x*ICON_SIZE < -ICON_SIZE+2 ||
dx + ex_x*ICON_SIZE > scr->scr_width-1 ||
dx + ex_x*ICON_SIZE >= scr->scr_width-1 ||
dy + ex_y*ICON_SIZE < -ICON_SIZE+2 ||
dy + ex_y*ICON_SIZE > scr->scr_height-1)
dy + ex_y*ICON_SIZE >= scr->scr_height-1)
return False;
if (dock->type == WM_DOCK) {
@@ -2330,10 +2333,11 @@ wDockSnapIcon(WDock *dock, WAppIcon *icon, int req_x, int req_y,
if (abs(ex_x) > DOCK_DETTACH_THRESHOLD)
return False;
if (ex_y >=0 && (aicon == icon || !aicon)) {
if (ex_y >= 0 && ex_y < max_y_icons && (aicon == icon || !aicon)) {
*ret_y = ex_y;
return True;
}
@@ -2365,7 +2369,7 @@ wDockSnapIcon(WDock *dock, WAppIcon *icon, int req_x, int req_y,
}
sig = -sig;
}
if (done && closest >= 0 &&
if (done && closest >= 0 && closest < max_y_icons &&
((ex_y >= closest && ex_y - closest < DOCK_DETTACH_THRESHOLD+1)
||
(ex_y < closest && closest - ex_y <= DOCK_DETTACH_THRESHOLD+1))) {
@@ -2377,7 +2381,7 @@ wDockSnapIcon(WDock *dock, WAppIcon *icon, int req_x, int req_y,
} else { /* !redocking */
/* if slot is free and the icon is close enough, return it */
if (!aicon && ex_x==0 && ex_y>=0) {
if (!aicon && ex_x == 0 && ex_y >= 0 && ex_y < max_y_icons) {
*ret_y = ex_y;
return True;
}
src/event.c
+7
View File
@@ -618,8 +618,15 @@ handleButtonPress(XEvent *event)
wBalloonHide(scr);
#endif
#ifndef LITE
if (event->xbutton.window==scr->root_win) {
#ifdef GNOME_STUFF
if (wGNOMEProxyizeButtonEvent(scr, event))
return;
#endif
if (event->xbutton.button==wPreferences.menu_button) {
OpenRootMenu(scr, event->xbutton.x_root,
event->xbutton.y_root, False);
src/gnome.c
+54 -2
View File
@@ -52,6 +52,10 @@
#include "gnome.h"
#define WIN_HINTS_SKIP_FOCUS (1<<0) /*"alt-tab" skips this win*/
#define WIN_HINTS_SKIP_WINLIST (1<<1) /*do not show in window list*/
#define WIN_HINTS_SKIP_TASKBAR (1<<2) /*do not show on taskbar*/
@@ -94,6 +98,7 @@ static Atom _XA_WIN_WORKSPACE;
static Atom _XA_WIN_WORKSPACE_COUNT;
static Atom _XA_WIN_WORKSPACE_NAMES;
static Atom _XA_WIN_CLIENT_LIST;
static Atom _XA_WIN_DESKTOP_BUTTON_PROXY;
void
@@ -130,6 +135,9 @@ wGNOMEInitStuff(WScreen *scr)
XInternAtom(dpy, "_WIN_WORKSPACE_NAMES", False);
_XA_WIN_CLIENT_LIST = XInternAtom(dpy, "_WIN_CLIENT_LIST", False);
_XA_WIN_DESKTOP_BUTTON_PROXY =
XInternAtom(dpy, "_WIN_DESKTOP_BUTTON_PROXY", False);
}
/* I'd rather use the ICCCM 2.0 mechanisms, but
@@ -138,7 +146,7 @@ wGNOMEInitStuff(WScreen *scr)
/* setup the "We're compliant, you idiot!" hint */
/* why XA_CARDINAL instead of XA_WINDOW? Only God knows.... */
/* why XA_CARDINAL instead of XA_WINDOW? */
XChangeProperty(dpy, scr->root_win, _XA_WIN_SUPPORTING_WM_CHECK,
XA_CARDINAL, 32, PropModeReplace,
(unsigned char*)&scr->no_focus_win, 1);
@@ -147,6 +155,15 @@ wGNOMEInitStuff(WScreen *scr)
XA_CARDINAL, 32, PropModeReplace,
(unsigned char*)&scr->no_focus_win, 1);
/* setup the "desktop button proxy" thing */
XChangeProperty(dpy, scr->root_win, _XA_WIN_DESKTOP_BUTTON_PROXY,
XA_CARDINAL, 32, PropModeReplace,
(unsigned char*)&scr->no_focus_win, 1);
XChangeProperty(dpy, scr->no_focus_win, _XA_WIN_DESKTOP_BUTTON_PROXY,
XA_CARDINAL, 32, PropModeReplace,
(unsigned char*)&scr->no_focus_win, 1);
/* setup the list of supported protocols */
count = 0;
@@ -317,7 +334,8 @@ wGNOMECheckClientHints(WWindow *wwin, int *layer, int *workspace)
XFree(data);
*workspace = val;
if (val > 0)
*workspace = val;
}
/* reserved area */
@@ -434,9 +452,23 @@ wGNOMEUpdateClientStateHint(WWindow *wwin, Bool changedWorkspace)
Bool
wGNOMEProcessClientMessage(XClientMessageEvent *event)
{
WScreen *scr;
WWindow *wwin;
Bool done = True;
scr = wScreenForRootWindow(event->window);
if (scr) {
/* generic client messages */
if (event->message_type == _XA_WIN_WORKSPACE) {
wWorkspaceChange(scr, event->data.l[0]);
} else {
done = False;
}
return done;
}
/* window specific client messages */
wwin = wWindowFor(event->window);
if (!wwin)
return False;
@@ -518,6 +550,26 @@ wGNOMEProcessClientMessage(XClientMessageEvent *event)
}
Bool
wGNOMEProxyizeButtonEvent(WScreen *scr, XEvent *event)
{
#ifndef MOUSE_WS_SWITCH
if (event->xbutton.button <= Button3
&& (event->xbutton.state & ValidModMask) == 0)
return False;
#else
if ((event->xbutton.state & ValidModMask) == 0)
return False;
#endif
if (event->type == ButtonPress)
XUngrabPointer(dpy, CurrentTime);
XSendEvent(dpy, scr->no_focus_win, False, SubstructureNotifyMask, event);
return True;
}
void
wGNOMERemoveClient(WWindow *wwin)
{
src/gnome.h
+2
View File
@@ -45,5 +45,7 @@ void wGNOMERemoveClient(WWindow *wwin);
void wGNOMECheckInitialClientState(WWindow *wwin);
Bool wGNOMEProxyizeButtonEvent(WScreen *scr, XEvent *event);
#endif
src/icon.c
+5 -1
View File
@@ -406,9 +406,11 @@ getnameforicon(WWindow *wwin)
} else if (wwin->wm_class) {
suffix = wmalloc(strlen(wwin->wm_class)+1);
strcpy(suffix, wwin->wm_class);
} else {
} else if (wwin->wm_instance) {
suffix = wmalloc(strlen(wwin->wm_instance)+1);
strcpy(suffix, wwin->wm_instance);
} else {
return NULL;
}
prefix = getenv("GNUSTEP_USER_PATH");
@@ -471,6 +473,8 @@ wIconStore(WIcon *icon)
return NULL;
path = getnameforicon(wwin);
if (!path)
return NULL;
image = RCreateImageFromDrawable(icon->core->screen_ptr->rcontext,
wwin->wm_hints->icon_pixmap,
src/kwm.c
+12 -8
View File
@@ -27,7 +27,7 @@
* kwm.h function/method Notes
*----------------------------------------------------------------------------
* setUnsavedDataHint() currently, only gives visual clue that
* there is saved data (broken X close button)
* there is unsaved data (broken X close button)
* setSticky()
* setIcon() std X thing...
* setDecoration()
@@ -638,14 +638,16 @@ wKWMSetInitializedHint(WScreen *scr)
void
wKWMShutdown(WScreen *scr)
wKWMShutdown(WScreen *scr, Bool closeModules)
{
KWMModuleList *ptr;
XDeleteProperty(dpy, scr->root_win, _XA_KWM_RUNNING);
for (ptr = KWMModules; ptr != NULL; ptr = ptr->next) {
XKillClient(dpy, ptr->window);
if (closeModules) {
for (ptr = KWMModules; ptr != NULL; ptr = ptr->next) {
XKillClient(dpy, ptr->window);
}
}
}
@@ -678,7 +680,7 @@ wKWMCheckClientHints(WWindow *wwin, int *workspace)
}
}
if (getSimpleHint(wwin->client_win, _XA_KWM_WIN_DESKTOP, &val)) {
*workspace = val;
*workspace = val - 1;
}
}
@@ -1376,9 +1378,6 @@ wKWMUpdateWorkspaceNameHint(WScreen *scr, int workspace)
{
char buffer[64];
if (scr->flags.kwm_syncing_name)
return;
assert(workspace >= 0 && workspace < MAX_WORKSPACES);
if (_XA_KWM_DESKTOP_NAME_[workspace]==0) {
@@ -1486,6 +1485,11 @@ wKWMSendEventMessage(WWindow *wwin, WKWMEventMessage message)
{
Atom msg;
if (wwin && (wwin->flags.internal_window
|| wwin->flags.kwm_hidden_for_modules
|| WFLAGP(wwin, skip_window_list)))
return;
switch (message) {
case WKWMAddWindow:
msg = _XA_KWM_MODULE_WIN_ADD;
src/kwm.h
+1 -1
View File
@@ -73,7 +73,7 @@ void wKWMSetUsableAreaHint(WScreen *scr, int workspace);
void wKWMSetInitializedHint(WScreen *scr);
void wKWMShutdown(WScreen *scr);
void wKWMShutdown(WScreen *scr, Bool closeModules);
void wKWMCheckModule(WScreen *scr, Window window);
src/menu.c
+1
View File
@@ -1164,6 +1164,7 @@ editEntry(WMenu *menu, WMenuEntry *entry)
default:
WMHandleEvent(&event);
break;
}
}
}
src/misc.c
+20 -20
View File
@@ -782,7 +782,7 @@ getuserinput(WScreen *scr, char *line, int *ptr)
char *ret;
char *title;
char *prompt;
int i, j, k, state;
int j, k, state;
char tbuffer[256], pbuffer[256];
title = _("Program Arguments");
@@ -796,10 +796,10 @@ getuserinput(WScreen *scr, char *line, int *ptr)
state = _STARTING;
j = 0;
for (i = 0; line[i]==0 && state!=_DONE; i++) {
for (; line[*ptr]==0 && state!=_DONE; *ptr++) {
switch (state) {
case _STARTING:
if (line[i]=='(') {
if (line[*ptr]=='(') {
state = _TITLE;
} else {
state = _DONE;
@@ -807,45 +807,45 @@ getuserinput(WScreen *scr, char *line, int *ptr)
break;
case _TITLE:
if (j <= 0 && line[i]==',') {
if (j <= 0 && line[*ptr]==',') {
j = 0;
if (i > 1) {
strncpy(tbuffer, &line[1], WMIN(i, 255));
tbuffer[WMIN(i, 255)] = 0;
if (*ptr > 1) {
strncpy(tbuffer, &line[1], WMIN(*ptr, 255));
tbuffer[WMIN(*ptr, 255)] = 0;
title = (char*)tbuffer;
}
k = i+1;
k = *ptr+1;
state = _PROMPT;
} else if (j <= 0 && line[i]==')') {
} else if (j <= 0 && line[*ptr]==')') {
if (i > 1) {
strncpy(tbuffer, &line[1], WMIN(i, 255));
tbuffer[WMIN(i, 255)] = 0;
if (*ptr > 1) {
strncpy(tbuffer, &line[1], WMIN(*ptr, 255));
tbuffer[WMIN(*ptr, 255)] = 0;
title = (char*)tbuffer;
}
state = _DONE;
} else if (line[i]=='(')
} else if (line[*ptr]=='(')
j++;
else if (line[i]==')')
else if (line[*ptr]==')')
j--;
break;
case _PROMPT:
if (line[i]==')' && j==0) {
if (line[*ptr]==')' && j==0) {
if (i-k > 1) {
strncpy(pbuffer, &line[k], WMIN(i-k, 255));
pbuffer[WMIN(i-k, 255)] = 0;
if (*ptr-k > 1) {
strncpy(pbuffer, &line[k], WMIN(*ptr-k, 255));
pbuffer[WMIN(*ptr-k, 255)] = 0;
title = (char*)pbuffer;
}
state = _DONE;
} else if (line[i]=='(')
} else if (line[*ptr]=='(')
j++;
else if (line[i]==')')
else if (line[*ptr]==')')
j--;
break;
}
src/motif.c
+12 -7
View File
@@ -67,7 +67,7 @@
#define MWM_DECOR_MINIMIZE (1L << 5)
#define MWM_DECOR_MAXIMIZE (1L << 6)
#define PROP_MWM_HINTS_ELEMENTS 4
#define PROP_MWM_HINTS_ELEMENTS 5
/* Motif window hints */
typedef struct {
@@ -75,6 +75,7 @@ typedef struct {
long functions;
long decorations;
long inputMode;
long unknown;
} MWMHints;
static Atom _XA_MOTIF_WM_HINTS;
@@ -220,6 +221,7 @@ static int
getMWMHints(Window window, MWMHints *mwmhints)
{
unsigned long *data;
int count;
if (!_XA_MOTIF_WM_HINTS) {
_XA_MOTIF_WM_HINTS = XInternAtom(dpy, "_MOTIF_WM_HINTS", False);
@@ -227,16 +229,19 @@ getMWMHints(Window window, MWMHints *mwmhints)
data = (unsigned long*)PropGetCheckProperty(window, _XA_MOTIF_WM_HINTS,
_XA_MOTIF_WM_HINTS, 32,
PROP_MWM_HINTS_ELEMENTS, NULL);
0, &count);
if (!data)
return 0;
mwmhints->flags = data[0];
mwmhints->functions = data[1];
mwmhints->decorations = data[2];
mwmhints->inputMode = data[3];
if (count >= 4) {
mwmhints->flags = data[0];
mwmhints->functions = data[1];
mwmhints->decorations = data[2];
mwmhints->inputMode = data[3];
if (count > 5)
mwmhints->unknown = data[4];
}
XFree(data);
return 1;
src/moveres.c
+5 -2
View File
@@ -583,6 +583,7 @@ flushMotion()
{
XEvent ev;
XSync(dpy, False);
while (XCheckMaskEvent(dpy, ButtonMotionMask, &ev)) ;
}
@@ -657,7 +658,7 @@ _keyloop(_looper *lpr){
}
XUngrabServer(dpy);
XSync(dpy, False);
usleep(10000);
wusleep(10000);
XGrabServer(dpy);
printf("called\n");
if (!scr->selected_windows){
@@ -702,7 +703,7 @@ wKeyboardMoveResizeWindow(WWindow *wwin)
ctrlmode=done=off_x=off_y=0;
XSync(dpy, False);
usleep(10000);
wusleep(10000);
XGrabKeyboard(dpy, root, False, GrabModeAsync, GrabModeAsync, CurrentTime);
if (!wwin->flags.selected) {
@@ -829,6 +830,8 @@ wKeyboardMoveResizeWindow(WWindow *wwin)
done=1;
break;
default:
WMHandleEvent(&event);
break;
}
/*
XUngrabServer(dpy);
src/openlook.c
+1 -1
View File
@@ -3,7 +3,7 @@
*
* Window Maker window manager
*
* Copyright (c) 1998 Alfredo K. Kojima
* Copyright (c) 1998, 1999 Alfredo K. Kojima
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
src/placement.c
+4 -3
View File
@@ -38,6 +38,8 @@
#include "appicon.h"
#include "dock.h"
#include "list.h"
extern WPreferences wPreferences;
@@ -238,8 +240,6 @@ PlaceIcon(WScreen *scr, int *x_ret, int *y_ret)
}
static Bool
smartPlaceWindow(WWindow *wwin, int *x_ret, int *y_ret,
unsigned int width, unsigned int height, int tryCount)
@@ -251,7 +251,7 @@ smartPlaceWindow(WWindow *wwin, int *x_ret, int *y_ret,
WWindow *test_window;
int extra_height;
WArea usableArea = scr->totalUsableArea;
if (wwin->frame)
extra_height = wwin->frame->top_width + wwin->frame->bottom_width + 2;
else
@@ -337,6 +337,7 @@ smartPlaceWindow(WWindow *wwin, int *x_ret, int *y_ret,
}
test_y += PLACETEST_VSTEP;
}
return loc_ok;
}
src/session.c
+1 -1
View File
@@ -930,7 +930,7 @@ smDieProc(SmcConn smc_conn, SmPointer client_data)
wSessionDisconnectManager();
Shutdown(WSExitMode);
Shutdown(WSExitMode, True);
}
src/shutdown.c
+3 -3
View File
@@ -73,7 +73,7 @@ Shutdown(WShutdownMode mode)
kill(scr->helper_pid, SIGKILL);
#ifdef KWM_HINTS
wKWMShutdown(scr);
wKWMShutdown(scr, True);
#endif
wScreenSaveState(scr);
@@ -101,7 +101,7 @@ Shutdown(WShutdownMode mode)
if (scr->helper_pid)
kill(scr->helper_pid, SIGKILL);
#ifdef KWM_HINTS
wKWMShutdown(scr);
wKWMShutdown(scr, True);
#endif
wScreenSaveState(scr);
@@ -121,7 +121,7 @@ Shutdown(WShutdownMode mode)
if (scr->helper_pid)
kill(scr->helper_pid, SIGKILL);
#ifdef KWM_HINTS
wKWMShutdown(scr);
wKWMShutdown(scr, False);
#endif
wScreenSaveState(scr);
src/window.c
+9
View File
@@ -375,6 +375,8 @@ wWindowSetupInitialAttributes(WWindow *wwin, int *level, int *workspace)
*level = WMSunkenLevel;
else
*level = WMNormalLevel;
} else {
*level = tmp_level;
}
if (tmp_workspace >= 0) {
@@ -1188,6 +1190,13 @@ wUnmanageWindow(WWindow *wwin, int restore)
int wasNotFocused;
WScreen *scr = wwin->screen_ptr;
#ifdef KWM_HINTS
wwin->frame->workspace = -1;
wKWMUpdateClientWorkspace(wwin);
#endif
/* First close attribute editor window if open */
if (wwin->flags.inspector_open) {
WWindow *pwin = wwin->inspector->frame; /* the inspector window */
src/winmenu.c
+12 -6
View File
@@ -528,11 +528,13 @@ updateMenuForWindow(WMenu *menu, WWindow *wwin)
&& !WFLAGP(wwin, no_closable)));
if (wwin->flags.miniaturized) {
static char *text = _("Deminiaturize");
static char *text = NULL;
if (!text) text = _("Deminiaturize");
menu->entries[MC_MINIATURIZE]->text = text;
} else {
static char *text = _("Miniaturize");
static char *text = NULL;
if (!text) text = _("Miniaturize");
menu->entries[MC_MINIATURIZE]->text = text;
}
@@ -540,11 +542,13 @@ updateMenuForWindow(WMenu *menu, WWindow *wwin)
wMenuSetEnabled(menu, MC_MINIATURIZE, !WFLAGP(wwin, no_miniaturizable));
if (wwin->flags.maximized) {
static char *text = _("Unmaximize");
static char *text = NULL;
if (!text) text = _("Unmaximize");
menu->entries[MC_MAXIMIZE]->text = text;
} else {
static char *text = _("Maximize");
static char *text = NULL;
if (!text) text = _("Maximize");
menu->entries[MC_MAXIMIZE]->text = text;
}
@@ -552,11 +556,13 @@ updateMenuForWindow(WMenu *menu, WWindow *wwin)
wMenuSetEnabled(menu, MC_MOVERESIZE, !WFLAGP(wwin, no_resizable));
if (wwin->flags.shaded) {
static char *text = _("Unshade");
static char *text = NULL;
if (!text) text = _("Unshade");
menu->entries[MC_SHADE]->text = text;
} else {
static char *text = _("Shade");
static char *text = NULL;
if (!text) text = _("Shade");
menu->entries[MC_SHADE]->text = text;
}
test/Makefile.in
+1
View File
@@ -76,6 +76,7 @@ LN_S = @LN_S@
MAKEINFO = @MAKEINFO@
MOFILES = @MOFILES@
NLSDIR = @NLSDIR@
NM = @NM@
PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
REDUCE_APPICONS = @REDUCE_APPICONS@
util/Makefile.am
+2 -1
View File
@@ -30,9 +30,10 @@ seticons_LDADD= $(liblist)
geticonset_LDADD= $(liblist)
wmsetbg_LDADD = $(top_builddir)/libPropList/libPropList.la \
wmsetbg_LDADD = \
$(top_builddir)/wrlib/libwraster.la \
$(top_builddir)/WINGs/libWINGs.a \
$(top_builddir)/libPropList/libPropList.la \
@GFXLFLAGS@ @XLFLAGS@ @GFXLIBS@ @XLIBS@ -lm
getstyle_SOURCES = getstyle.c
util/Makefile.in
+6 -3
View File
@@ -74,6 +74,7 @@ LN_S = @LN_S@
MAKEINFO = @MAKEINFO@
MOFILES = @MOFILES@
NLSDIR = @NLSDIR@
NM = @NM@
PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
REDUCE_APPICONS = @REDUCE_APPICONS@
@@ -121,9 +122,10 @@ seticons_LDADD= $(liblist)
geticonset_LDADD= $(liblist)
wmsetbg_LDADD = $(top_builddir)/libPropList/libPropList.la \
wmsetbg_LDADD = \
$(top_builddir)/wrlib/libwraster.la \
$(top_builddir)/WINGs/libWINGs.a \
$(top_builddir)/libPropList/libPropList.la \
@GFXLFLAGS@ @XLFLAGS@ @GFXLIBS@ @XLIBS@ -lm
getstyle_SOURCES = getstyle.c
@@ -178,8 +180,9 @@ geticonset_OBJECTS = geticonset.o
geticonset_DEPENDENCIES = $(top_builddir)/libPropList/libPropList.la
geticonset_LDFLAGS =
wmsetbg_OBJECTS = wmsetbg.o
wmsetbg_DEPENDENCIES = $(top_builddir)/libPropList/libPropList.la \
$(top_builddir)/wrlib/libwraster.la $(top_builddir)/WINGs/libWINGs.a
wmsetbg_DEPENDENCIES = $(top_builddir)/wrlib/libwraster.la \
$(top_builddir)/WINGs/libWINGs.a \
$(top_builddir)/libPropList/libPropList.la
wmsetbg_LDFLAGS =
SCRIPTS = $(bin_SCRIPTS)
util/wmaker.inst.in
+15 -6
View File
@@ -52,9 +52,14 @@ copy() {
sed -e "s|~/GNUstep|$GSDIR|g" $source > $target
else
if test "x$GNUSTEP_USER_ROOT" = "x"; then
cp $source $target
sed -e "s:#wmdatadir#:$GLOBALDIR:g" \
-e "s://:/:g" \
$source > $target
else
sed -e "s|~/GNUstep|$GSDIR|g" $source > $target
sed -e "s|~/GNUstep|$GSDIR|g" \
-e "s:#wmdatadir#:$GLOBALDIR:g" \
-e "s://:/:g" \
$source > $target
fi
fi
}
@@ -66,7 +71,7 @@ echo "Installing WindowMaker $VERSION for current user..."
if [ ! -d $GLOBALDIR ]; then
echo "Could not find global configurations files"
echo "Make sure you've installed Window Maker correctly"
echo "Make sure you have installed Window Maker correctly"
exit 1
fi
@@ -195,7 +200,8 @@ else
fi
if test -z #LITE# ; then
if test -z "#LITE#" ; then
FILES=`(cd $GLOBALDIR; ls menu menu.* plmenu plmenu.?? wmmacros)`
for i in $FILES; do
if [ -f "$GSDIR/Library/WindowMaker/$i" ]; then
echo "The file \"$i\" already exists in $GSDIR/Library/WindowMaker"
@@ -215,9 +221,12 @@ for i in $FILES; do
done
fi
cp $GLOBALDIR/README.themes $GSDIR/Library/WindowMaker
cp $GLOBALDIR/README $GSDIR/Library/WindowMaker
cp -i $GLOBALDIR/autostart.sh $GSDIR/Library/WindowMaker/autostart
chmod +rx $GSDIR/Library/WindowMaker/autostart
cp -i $GLOBALDIR/exitscript.sh $GSDIR/Library/WindowMaker/exitscript
chmod +rx $GSDIR/Library/WindowMaker/exitscript
#
#######################
@@ -229,7 +238,7 @@ show_end_message() {
echo
echo "Installation Finished"
echo
if test -z #LITE# ; then
if test -z "#LITE#" ; then
echo "There are menus in 2 different file formats. The plain text format and"
echo "the property list format. The plain text format is more flexible, but"
echo "the menu in the property list format can be edited graphically. The"
@@ -241,7 +250,7 @@ else
fi
}
if test -z `grep wmaker ~/.xinitrc`; then
if test -z "`grep wmaker ~/.xinitrc`"; then
show_end_message
exit 0
fi
util/wmsetbg.c
+21 -7
View File
@@ -32,6 +32,7 @@
#include <pwd.h>
#include <signal.h>
#include <sys/types.h>
#include <ctype.h>
#include "../src/wconfig.h"
@@ -311,10 +312,12 @@ parseTexture(RContext *rc, char *text)
texture->pixmap = pixmap;
} else if (strcasecmp(type, "cpixmap")==0
|| strcasecmp(type, "spixmap")==0
|| strcasecmp(type, "mpixmap")==0
|| strcasecmp(type, "tpixmap")==0) {
XColor color;
Pixmap pixmap;
RImage *image;
int w, h;
GETSTR(val, tmp, 1);
@@ -338,8 +341,7 @@ parseTexture(RContext *rc, char *text)
rcolor.blue = color.blue >> 8;
RGetClosestXColor(rc, &rcolor, &color);
}
switch (type[0]) {
case 't':
switch (toupper(type[0])) {
case 'T':
texture->width = image->width;
texture->height = image->height;
@@ -350,12 +352,12 @@ parseTexture(RContext *rc, char *text)
goto error;
}
break;
case 's':
case 'S':
{
RImage *simage;
int w, h;
case 'M':
if (toupper(type[0])=='S') {
w = scrWidth;
h = scrHeight;
} else {
if (image->width*scrHeight > image->height*scrWidth) {
w = scrWidth;
h = (scrWidth*image->height)/image->width;
@@ -363,6 +365,9 @@ parseTexture(RContext *rc, char *text)
h = scrHeight;
w = (scrHeight*image->width)/image->height;
}
}
{
RImage *simage;
simage = RScaleImage(image, w, h);
if (!simage) {
@@ -835,6 +840,12 @@ helperLoop(RContext *rc)
setupTexture(rc, textures, &maxTextures, workspace, NULL);
break;
case 'K':
#ifdef DEBUG
printf("exit command\n");
#endif
exit(0);
default:
wwarning("unknown message received");
break;
@@ -949,6 +960,7 @@ print_help(char *ProgName)
puts(" -t tile image");
puts(" -e center image");
puts(" -s scale image (default)");
puts(" -a scale image and keep aspect ratio");
puts(" -u update WindowMaker domain database");
puts(" -D <domain> update <domain> database");
puts(" -c <cpc> colors per channel to use");
@@ -1041,6 +1053,8 @@ main(int argc, char **argv)
style = "tpixmap";
} else if (strcmp(argv[i], "-e")==0) {
style = "cpixmap";
} else if (strcmp(argv[i], "-a")==0) {
style = "mpixmap";
} else if (strcmp(argv[i], "-d")==0) {
render_mode = RM_DITHER;
obey_user++;
wmlib/Makefile.in
+1
View File
@@ -76,6 +76,7 @@ LN_S = @LN_S@
MAKEINFO = @MAKEINFO@
MOFILES = @MOFILES@
NLSDIR = @NLSDIR@
NM = @NM@
PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
REDUCE_APPICONS = @REDUCE_APPICONS@
wrlib/Makefile.in
+1
View File
@@ -76,6 +76,7 @@ LN_S = @LN_S@
MAKEINFO = @MAKEINFO@
MOFILES = @MOFILES@
NLSDIR = @NLSDIR@
NM = @NM@
PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
REDUCE_APPICONS = @REDUCE_APPICONS@
wrlib/test.c
+1 -1
View File
@@ -9,7 +9,7 @@ RContext *ctx;
RImage *img, *tile, *new, *mini, *tiled;
Pixmap pix;
void main(int argc, char **argv)
int main(int argc, char **argv)
{
RContextAttributes attr;
int a=0;
wrlib/testdraw.c
+1 -1
View File
@@ -507,7 +507,7 @@ benchmark()
}
void main(int argc, char **argv)
int main(int argc, char **argv)
{
RContextAttributes attr;
int visualID = -1;
wrlib/testgrad.c
+1 -1
View File
@@ -30,7 +30,7 @@ print_help()
}
void main(int argc, char **argv)
int main(int argc, char **argv)
{
RContextAttributes attr;
RColor **colors = NULL;
wrlib/view.c
+1 -1
View File
@@ -10,7 +10,7 @@ RContext *ctx;
RImage *img;
Pixmap pix;
void main(int argc, char **argv)
int main(int argc, char **argv)
{
RContextAttributes attr;