gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2026-07-10 12:46:36 +02:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: gryf/wmaker:maximize-0.95.7
Branches Tags
gryf/wmaker:next gryf/wmaker:master gryf/wmaker:mynext gryf/wmaker:maximize-0.95.7
gryf/wmaker:wmaker-0.96.0 gryf/wmaker:wmaker-0.95.9 gryf/wmaker:wmaker-0.95.8 gryf/wmaker:wmaker-0.95.7 gryf/wmaker:wmaker-0.95.6 gryf/wmaker:wmaker-0.95.5 gryf/wmaker:wmaker-0.95.4 gryf/wmaker:wmaker-0.95.3 gryf/wmaker:wmaker-0.95.2 gryf/wmaker:wmaker-0.95.1 gryf/wmaker:wmaker-0.95.0-crm gryf/wmaker:wmaker-0.94.0-crm gryf/wmaker:wmaker-0.93.0-crm gryf/wmaker:wmaker-0.92.0+ gryf/wmaker:wmaker-0.92.0 gryf/wmaker:wmaker-0.91.0 gryf/wmaker:wmaker-0.90.0 gryf/wmaker:before.removing.legacy.support gryf/wmaker:before-xft2 gryf/wmaker:release-0.80.1 gryf/wmaker:release-0.80.0 gryf/wmaker:release-0.70.0 gryf/wmaker:release-0.65.0 gryf/wmaker:release-0.63.1 gryf/wmaker:release-0.63.0 gryf/wmaker:before.wrlib.deps gryf/wmaker:release-0.62.0 gryf/wmaker:wm-0.20.1
...
compare: gryf/wmaker:6afa419b01b932800222e18b88eb12210eadc935
Branches Tags
gryf/wmaker:master gryf/wmaker:mynext gryf/wmaker:next gryf/wmaker:maximize-0.95.7
gryf/wmaker:wmaker-0.96.0 gryf/wmaker:wmaker-0.95.9 gryf/wmaker:wmaker-0.95.8 gryf/wmaker:wmaker-0.95.7 gryf/wmaker:wmaker-0.95.6 gryf/wmaker:wmaker-0.95.5 gryf/wmaker:wmaker-0.95.4 gryf/wmaker:wmaker-0.95.3 gryf/wmaker:wmaker-0.95.2 gryf/wmaker:wmaker-0.95.1 gryf/wmaker:wmaker-0.95.0-crm gryf/wmaker:wmaker-0.94.0-crm gryf/wmaker:wmaker-0.93.0-crm gryf/wmaker:wmaker-0.92.0+ gryf/wmaker:wmaker-0.92.0 gryf/wmaker:wmaker-0.91.0 gryf/wmaker:wmaker-0.90.0 gryf/wmaker:before.removing.legacy.support gryf/wmaker:before-xft2 gryf/wmaker:release-0.80.1 gryf/wmaker:release-0.80.0 gryf/wmaker:release-0.70.0 gryf/wmaker:release-0.65.0 gryf/wmaker:release-0.63.1 gryf/wmaker:release-0.63.0 gryf/wmaker:before.wrlib.deps gryf/wmaker:release-0.62.0 gryf/wmaker:wm-0.20.1

268 Commits
maximize-0.95.7 ... 6afa419b01

Author SHA1 Message Date
Christophe CURIS 6afa419b01 Website: Create script to update the list of man pages in the index 
It is a good idea to have an Index web page with the list of the man pages
available, but there is a risk to have it outdated, so there is a script to
take care of this for us.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
 2021-06-20 22:28:19 +01:00
Christophe CURIS a2bf67f54c Website: Create script to generate the HTML version of the man pages 
When running the 'make website' command, it will call groff to convert the
man pages into HTML and post-process them to get them in the style of the
site, then place them in the Website Git Repository.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
 2021-06-20 22:28:19 +01:00
Christophe CURIS 351e05dca9 Configure: Add a maintainer option to prepare generation of HTML for the website 
When the new configure option '--with-web-repo' is used, the new target
'make website' becomes available and will generate HTML pages to be placed
in the Homepage Repository.

This patch does not generate any content yet but it prepares the skeleton
to handle everything.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
 2021-06-05 23:54:15 +01:00
Christophe CURIS ae78e88eef Repair compilation when Pango support is enabled 
It seems there have been changes in the way Pango's header files are
installed in recent versions, probably to allow having multiple versions
together on a system.

Because one public header from WINGs has to include Pango's header, we must
include the search path provided by Pango into our WINGs search path that
are returned by pkg-config (the .pc file).

They are then also added to WindowMaker and WPrefs which use the header but
can't rely on the path from the .pc file which has not been installed yet.

Reported-by: Carlos R. Mafra <crmafra@gmail.com>
Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
 2021-05-29 23:55:10 +01:00
Christophe CURIS f049635fa5 Configure: Rewrite the detection for Pango library 
Make use of the standard macro for PKG_CONFIG; the default behaviour is now
to use Pango if present, instead of requiring explicit user request, yet
still not making it mandatory.

The detection code was moved to a macro to keep the configure.ac script
(relatively) small, and consistent with what is done for most other libs.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
 2021-05-29 20:15:09 +01:00
Doug Torrance 4221e30bd2 Convert WPrefs.app/po/README from iso-8859-1 to utf-8 2021-05-25 22:12:23 -04:00
Doug Torrance 71558f4ce3 Convert WindowMaker/README from iso-8859-1 to utf-8 2021-05-25 22:10:15 -04:00
Doug Torrance 4b61081353 Convert po/README from iso-8859-1 to utf-8 2021-05-25 22:05:30 -04:00
Christophe CURIS 4138c57631 Configure: Rewrite the macro for checking Xft2 version 
The original macro used over-complicated things, like:
 - useless uses of 'eval',
 - split AC_CACHE_CHECK construct (AC_MSG_CHECKING + AC_CACHE_VAL +
AC_MSG_RESULT)
 - dubious variable name (CPPFLAGS_old, which is not the "old" value but
the "saved" value for a temporary change)
 - variable CPPFLAGS was changed at wrong hierarchy level
 - calculate the integer value for XFT_VERSION in m4 instead generating
shell commands that had to do it on user side
 - indentation was missing

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
 2021-05-22 20:00:41 +01:00
Christophe CURIS 0bbb122b94 Configure: Rewrite detection for Xft2 to properly use PKG_CONFIG macro 
The goal is to use standard macros, which make code easier to maintain
(smaller, more consistent). We still keep the legacy "xfg-config" method
because we don't want to drop support for old hardware/software.

A side effect is the change in the name of the variables for the makefile,
but this goes in favour of consistency.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
 2021-05-22 20:00:41 +01:00
Christophe CURIS 0e274dc979 WRaster: Fix incorrect use of macro USE_XSHM in installed header 
The header "wraster.h" needs different behaviour depending on whether the
support for X Shared Memory extension was enabled or not; but the related
macro USE_XSHM is defined by WindowMaker's configure. After this header
have been installed, the macro is no more useable.

This patch makes the "wraster.h" a generated file, so it will be different
depending on USE_XSHM, but will not make use of the macro itself.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
 2021-05-18 17:50:43 +01:00
Christophe CURIS 4dfb0dd059 WRaster: Create french translation to have at least one 
The translation check would complain because it does not find any '.po'
files, so I am providing one translation.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
 2021-05-18 17:49:17 +01:00
Christophe CURIS bcb53700d6 WRaster: Improve error messages to provide useful information to user 
The original error messages tended to be a bit sparse, now they try to be
a little bit more helpful, and translatable in user's language.

In xutil.c:122, took opportunity fix a problem because calling 'perror'
after other function which are likely to have changed the errno is likely
to provide a wrong error string.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
 2021-05-18 17:49:17 +01:00
Christophe CURIS e5f7ef23a6 WRaster: Made a few messages translatable 
Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
 2021-05-18 17:49:17 +01:00
Christophe CURIS 70f89fd9c5 WRaster: Add initialisation for locale support 
Because the library does not have an initialisation function, we need to
rely on an automatic called-on-load mechanism, which is provided through
a compiler attribute 'constructor'.

However, as the project aims to still compile on old hard/software, we
include a check in 'configure' to ensure it works, and if not use the
legacy solution.

Note: Because we introduce a new DEFINE, the 'config.h.in' needs to be
regenerated, otherwise you may get a compilation error in wrlib. This is
done by re-running './autogen.sh'

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
 2021-05-18 17:49:17 +01:00
Christophe CURIS 19202fd2db WRaster: Create header for i18n helper functions 
This patch is just adding a single header, but because it also modifies
all the C files to add the #include, it was made as a patch on its own to
ease review.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
 2021-05-18 17:49:17 +01:00
Christophe CURIS aadd694a6b WRaster: Create structure to make the library translatable 
The library did not propose the mechanisms to be translated, this patch is
creating the structure in autoconf/automake and the translation directory
so its messages can be also translated.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
 2021-05-18 17:49:17 +01:00
Christophe CURIS fbec3a728f wmaker: Do not allocate memory for a temporary string for the Window Shortcut menu 
When creating the list of possible shortcut for windows to populate the
window menu, a temporary buffer was allocated to hold that string.

As this allocation participates to memory fragmentation, this patch makes
use of storage on the stack instead which is also faster.

Took opportunity to include the shortcut number (%i) in the string to be
translated, because it is unlikely that adding that number at the end of
the string is right in all languages. Updated french translation because
it is the only one I am confident with.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
 2021-05-18 17:49:17 +01:00
Christophe CURIS 944bb49997 wrlib: Add compiler attributes to the API functions 
With proper attributes, the compiler is able to do some extra checks on
user side to make code safer and/or better optimised.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
 2021-05-18 17:49:17 +01:00
Christophe CURIS 0ac6827a9b wmmenugen: Fix memory leaks when parsing menu in wmconfig format 
As reported by Coverity (CID #50181, #50182 and #50183) the strings allocated by parse_wmconfig_line were not freed after use.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
 2021-05-18 17:49:17 +01:00
Christophe CURIS f030ab7664 wmmenugen: Fix memory leaks in XDG menu generation when getting locale-dependant name 
As reported by Coverity as CID #50142, #50143, #50144 and #50145, all the
strings allocated by 'parse_locale' were never freed.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
 2021-05-18 17:49:17 +01:00
Christophe CURIS 2a8fc1df9a wmmenugen: Fix memory leak when parsing names for menus in XDG format 
As reported by Coverity (CID #50146), if the function getLocalizedStringValue
returns without matching the entry, the storage for the entry's locale was
leaked.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
 2021-05-18 17:49:17 +01:00
Christophe CURIS 296456f361 wmmenugen: Fix memory leak when parsing categories in an XDG menu 
Reported by Coverity (CID #50147)

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
 2021-05-18 17:49:17 +01:00
Christophe CURIS f2cd2c9f03 WRaster: Properly set file's mtime in the cache when loading an image 
The library maintains a cache to not reload a file that was previously
loaded. In order to still reload an image in case its file would have
changed in the meantime, the cache saves the file's modification time.

As reported by Coverity (CID #331576) the 'stat' function was not on the
execution path the first time an image is loaded, which means the cache
information is populated with junk data. This could lead to an image not
being reloaded for example.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
 2021-05-18 17:49:17 +01:00
Christophe CURIS d125f80dee WRaster: Stop parsing number in PPM file if invalid syntax is found 
When the function 'pm_getuint' is reading a number, it prints an error
message if it encounters a non-digit number, yet it still enters the
processing loop which will cause an invalid number to be calculated.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
 2021-05-18 17:49:17 +01:00
Christophe CURIS 8e47ca8e62 WPrefs: Add check for invalid OPEN_MENU/EXEC in PL-Menu to avoid potential crash 
As reported by Coverity (CID #50047, #50048), if the proplist is incorrect
and has an OPEN_MENU or (SH)EXEC command without its arguments, we did
dereference a NULL pointer.
Now we simply return the NULL value, appropriate to have the caller of the
function issue a message.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
 2021-05-18 17:49:17 +01:00
Christophe CURIS 29cf48b934 WPrefs: Provide fall-back colour in the case of colour name not found 
As reported by Coverity (CID #331571), we did not check the return value of
the call to XParseColor. If the function is given a colour name that it
does not know, we would return an uninitialised colour.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
 2021-05-18 17:49:17 +01:00
Christophe CURIS 816fa00625 WUtil: Make sure wmalloc/wrealloc won't fail because of the abort handler 
As pointed by Coverity (#50074), despite the expected behaviour that
'wmalloc' should never return NULL, it may still happen if an abort handler
set by user (with wsetabort) does not call exit() as expected. In such
case we make sure the NULL pointer dereference does not happen inside
WINGs code because we assume it is a known user choice.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
 2021-05-18 17:49:17 +01:00
Christophe CURIS 6ebec0bb9f WUtil: Fix non-closed file handle in WMWritePropListToFile 
As reported by Coverity (CID #50129), in case of error during the write
operation, the failure path does include close of the file handle. In
addition to the resource leak, this may be a problem if the application
were to make a second try on the same file.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
 2021-05-18 17:49:17 +01:00
Christophe CURIS 7c50721747 WPrefs: Fix memory leak in Expert tab 
As reported by Coverity (CID #331553), we leak the allocated string
returned by 'WMGetTextFieldText'

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
 2021-05-18 17:49:17 +01:00
Christophe CURIS 4559cbbccc WPrefs: Fix memory leak in the Menu tab 
As reported by Coverity (CID #331559), the call to 'wfindfile' replaces
the value for variable 'path' but we did not free its previous content.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
 2021-05-18 17:49:17 +01:00
Christophe CURIS e828e1c074 Fix use-after-free error in wIconStore reported by Coverity 
The function always returns the filename where the icon have been saved,
but in the case where the save operation failed we would free the memory
for that file name, yet still return this pointer like if it were valid.

Took opportunity to remove redundant free(path) which is done a couple
lines later, because redundancy is a source of problem for code
maintenance.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
 2021-05-18 17:49:17 +01:00
Christophe CURIS 97a9300aa4 Fix memory leak reported by Coverity 
As reported in CID #331577, we re-use the variable 'tmp' without freeing
the previously allocated pointer.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
 2021-05-18 17:49:17 +01:00
Christophe CURIS fd56152202 WPrefs: fix memory leak and potential buffer overflow 
Coverity pointed that the "text" returned by WMGetTextFieldText was never
freed (CID #331578, because WMSetTextFieldText does its own copy, it does
not take the pointer as-is).

By looking at the code, there is also a potential buffer overflow because
the buffer alloc'd for "value" is sized for the exact number of digits
before increase, but the +delta can make the number use more digits so we
may write past the end of original buffer.
We write to a stack-allocated one, so it does not cost anything and does
not participates to memory fragmentation.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
 2021-05-18 17:49:17 +01:00
Christophe CURIS 58862300f9 WINGs: Fix invalid handling of Blue in the HSV conversion in ColorPanel widget 
Because of a minor bug, when pure blue was chosen in RGB in the ColorPanel,
the conversion to HSV would mistreat it as white and resets its hue,
leading to possible user annoyance.
 2021-05-18 17:49:17 +01:00
Christophe CURIS 1612d2f345 WINGs: increase temporary buffer to silence a gcc warning 
The code limits the integer number to 0..359 so we need 4 bytes to store
that, but that require too complex flow processing for compilers to deduce
it.

It does not cost to increase the temporary buffer to the minimum size
requested by GCC, so let's do this, because spurious warnings can
potentially divert us from more important ones.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
 2021-05-18 17:49:17 +01:00
Christophe CURIS 920c6d16b1 wraster: Remove duplicate code 
Duplicating things makes maintenance error-prone, which is not a good idea.
In case the abort procedure would need an update, it would be easy then
to forget some place, leading to leaks, if not worse.

Beside, goto is not as bad as academics would like people to believe, when
it is used correctly (and this case is one of them).
The name for the label was given an explicit meaning to make code easy to
understand.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
 2021-05-18 17:49:17 +01:00
Christophe CURIS 8aecba27d1 Fix usage of float constant reported by gcc 
Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
 2021-05-18 17:49:17 +01:00
Christophe CURIS fc63d72032 WINGs: Fix incorrect use of macro USE_PANGO in installed header 
The header "WINGsP.h" needs different behaviour depending on whether the
support for Pango was enabled or not. But the related macro USE_PANGO is
defined by WindowMaker's configure, and after this header have been
installed the macro is no more valid.

This patch makes the "WINGsP.h" a generated file, so it will be different
depending on USE_PANGO, but will not make use of the macro itself.

As a side effect of being now generated, the include paths in the makefile
have been updated to include build-dir too, because for users doing an
out-of-tree build the generated file (that is used during compilation) is
placed in the build-dir.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
 2021-05-18 17:49:17 +01:00
Xander eb2a9d97a2 Make dock dots scalable 
This patch makes the three dots in the dock change their size when bigger icon size is used.
The logic here is such that the dots are scaled only when a certain icon size is reached;
for instance, the dots will remain unchanged if icon size is less than 128x128 px, and will
be twice as big if it's set to a value from 128x128 to 184x184 px. The get_dot_mult() func
calculates and returns the scale multiplier. In the draw_dot() func, XDrawLine() and
XDrawPoint() were replaced with XFillRectangle() because those funcs do not allow their
result to be scalable. This patch does not require additional icon size values (those bigger
than 96x96 px) to exist, but makes no use without them.
 2021-05-07 18:03:19 +01:00
Xander 9abe4165d1 Add icon sizes 
The classic WindowMaker allows tile icon size up to 96x96 px. This patch rises this value
to 256x256 px. It also sets the max number of visible items in the corresponding pref list
to 29 (instead of 9), so the new values show up in the list. This patch makes it possible
to use dockapps that allow changing their size to bigger than 64x64 px, see
https://gitlab.com/xander1988/dockapps for more info.
 2021-05-07 18:02:03 +01:00
gryf 82ab2d2d06 Correct calculation of usable space for reserved area. 
Previous patch has correct the way, how reserved area found in
_NET_WM_STRUT was calculated. Unfortunately, the calculation was not
precise, as for not reserved areas (i.e. values of 0 for one of the
cardinals is set) must be calculated anyway for given head, otherwise
usable area might be too broad.
 2021-03-18 16:08:40 +00:00
gryf bbf24d1d39 Correct way for reserved space on multihead environment. 
Applications such a panels or docks have ability for reserving space so
that no windows should cover or overlap them. There is (partially)
support for it by checking the _NET_WM_STRUT property, although
calculation for the reserved space was wrong in case of several heads
enabled.

In this patch calculation for reserved area has been corrected.
 2021-03-16 20:39:54 +00:00
Helge Kreutzmann 224cb403a7 Tippfehler in de.po von WPrefs (WindowMaker) 
per Zufall habe ich einen Tippfehler gefunden
 2020-12-07 16:53:16 +00:00
Nick Berendsen 1cd8fea423 Add support for _NET_WM_STATE_FOCUSED 
Thanks to Jeremy Sowden for sending the patch to the mailing list.

Signed-off-by: Carlos R. Mafra <crmafra@gmail.com>
 2020-10-27 15:35:08 +00:00
Diedrich Vorberg a98680cd14 Patch for GetCommandForPid() in osdep_darwin.c 
the function mentioned above caused segfaults on MacOS. The attached patch
seems to solve that.

Details: The functions provides an array of string pointers (the argument
vector) pointing to a buffer allocated and referred to by a static local
variable `args`. This buffer was used on each subsequent call. For one
thing this would overwrite old values and for another this caused segfaults.

My new implementation allocates a buffer for the argument vector plus the
actual string data on each call. The caller will wfree() the buffer, but
until then has available an independent copy of the strings.
 2020-10-19 20:38:29 +01:00
Alexander Komarov 7d423a3a0f Added Expert option: "Close rootmenu when mouse (left or right) is clicked outside focus. 
Common WindowMaker's rootmenu behavior if press right mouse button open menu and close only with same button.
It's uncomfortably, it patch  allows close menu by left or right is clicked outside focus.
Changed func "static WMenu*configureMenu(WScreen *scr, WMPropList *definition)" to non-static forglobal use.
Added new  OPTION_WMAKER for this Expert-option. Changed event.c: for correct work should use initialization
func configureMenu afterwMenuDestroy (this is a feature of the event implementation XEvent).
 2020-09-13 16:56:09 +01:00
Alexander Komarov 033d2d9a6f Changed Russian translation 2020-08-11 10:49:13 +01:00
Alexander Komarov 6e2075f3df Double click on titlebar maximize a window to fullscreen 2020-08-10 12:15:01 +01:00
XOR 5d2fd7bf7e WPrefs: Create Turkish translation 2020-06-28 17:54:15 +01:00
Christophe CURIS f6742662ec Tell git to ignore files created during i18n preparation 
The 'pot' files are templates generated when we want to update the 'po'
files against latest source code;

the 'mo' files are compiled 'po' files to be installed
 2020-06-28 11:33:31 +01:00
Doug Torrance 583f66ec4e Turn off automake's warning messages about using GNU make extensions 
We've been using addsuffix in WindowMaker/Makefile.am and may use others
in the future.
 2020-06-22 18:07:09 +01:00
gryf cd23e77fd1 Remove Debian related build files. 
Keeping Debian related build files should not be the duty of wmaker
development team, but Debian package maintainers.
 2020-05-31 17:34:28 +01:00
gryf 230a501d36 Fix typo on defining imagemagick version. 
In this patch we will fix an issue during compilation on systems, which
have ImageMagick version 7, and slightly more recent version of
compiler. If we define USE_MAGICK with null value, compilation will fail
on preprocessor check on such defined variable.
 2020-04-20 09:03:56 +01:00
Doug Torrance 3022edd060 wrlib: Fix typo in macro containing ImageMagick version 
It's USE_MAGICK, not USE_MAGIC.  Also, we wrap the if/else statement
in an ifdef.  This doesn't really affect anything since load_magick.c
won't be compiled if USE_MAGICK is undefined because of an if statement
in the Makefile.  But in the off chance that it is somehow, then we will
try to load a nonexistent version 6 header file since USE_MAGICK will
be interprested as 0 and 0 < 7 is true.
 2020-04-19 07:58:28 +01:00
Doug Torrance 1713a88656 debian: Remove ImageMagick patch; an equivalent patch now exists in next 
If a user wanted to build a Debian package from the next branch, then
it would fail immediately when quilt tried to apply the patches.
 2020-04-19 07:58:28 +01:00
Doug Torrance 00a25db9ea checkpatch.pl: Escape curly braces in regexes 
Unescaped curly braces  have been deprecated since Perl 5.26 and are
illegal in Perl 5.30. I copied the relevant lines from the latest kernel
source, so we'll inherit a couple other improvements as well.
 2020-04-18 22:27:29 +01:00
Doug Torrance c678580621 debian: Update with version 0.95.9-2 packaging. 2020-04-18 19:49:26 +01:00
Doug Torrance 44bc9cc264 Fix various abs() issues. 
The abs() function should take an int as argument, but there were
several instances in the code where it was taking an unsigned int or a
double.  In these case, we took one of the following approaches:

* If the argument was a double, use fabs() instead.
* If the argument was unsigned and was certainly going to be positive
  (i.e,. no subtraction), then drop abs() altogether.
* If the argument was unsigned as result of adding or subtracting signed
  and unsigned ints, then we cast all the unsigned ints to signed ints.
 2020-04-18 19:49:26 +01:00
Doug Torrance dfa92906c0 wrlib: Compile with either ImageMagick 6 and 7 
We dropped ImageMagick 6 support in 0.95.9.  However, ImageMagick 6 is
still widespread (e.g., ImageMagick 7 has not been packaged in Debian
yet), and upstream plans on maintaining it until at least 2028 [1].

In this patch, we detect the version of the MagickWand library installed
on the user's system and include the appropriate header file when
building wrlib.

Note: I've only tested this with ImageMagick 6, so I'd appreciate
confirmation that it works with ImageMagick 7.

[1] https://github.com/ImageMagick/ImageMagick6/blob/master/NEWS.txt
 2020-04-18 19:49:25 +01:00
Doug Torrance 27dc5efd2e debian: Update with version 0.95.9-1 packaging. 2020-04-17 08:20:50 +01:00
Doug Torrance 86659be668 wmlib: Use X flags from configure 
We use the AC_PATH_XTRA macro to find all the X library paths during
build, but we weren't actually using the variables it generated for
building wmlib.  Instead, we just hardcoded the linker flag "-lX11",
which may or may not actually work.
 2020-04-09 14:54:06 +01:00
Doug Torrance e314f10909 configure: Fix typo in libXmu check. 
As the literal string "wm_cv_xext_xmu" will never be equal to "xno",
we always ran the code that was supposed to run when the variable
$wm_cv_xext_xmu was not equal to "no".  In particular, if libXmu
was not found, then we proceeded as if it had been found.
 2020-04-09 14:54:06 +01:00
Doug Torrance 54a24ab6f7 Remove trailing whitespace. 
Also, the script is a one-liner, stolen from [1]:

ack --print0 -l '[ \t]+$' | xargs -0 -n1 perl -pi -e 's/[ \t]+$//'

[1]
https://stackoverflow.com/questions/149057/how-to-remove-trailing-whitespace-of-all-files-recursively
 2020-04-09 14:28:09 +01:00
Doug Torrance a17d131da3 Remove apostrophes from instances of possessive "its". 
I noticed one instance of this while looking at the code the other day,
and after a quick grep, realized it happened a *lot*!  One of the many
frustrating things about the English language is that we use apostrophes
to make pretty much everything possessive *except* the pronoun "it".
In that case, we use "its".  "It's" is reserved for the contraction
meaning "it is" or "it has".
 2020-04-09 09:05:50 +01:00
David Michael 6320bb6219 configure: Allow changing default search paths 
This changes the behavior of the --with-{inc,lib}s-from arguments
to replace the default paths instead of adding to them.  This is
required when cross-compiling in a sysroot, since the default paths
will include files from the host system which can have an
incompatible architecture.
 2020-04-06 16:35:53 +01:00
Carlos R. Mafra f9bc310fa6 Window Maker 0.95.9 2020-04-04 11:02:28 +01:00
Carlos R. Mafra 58249c2b9b Update .gitignore file 2020-04-04 10:55:42 +01:00
David Maciejak bb716a4ca1 util: renamed wmiv DEBUG constant name 
To prevent compilation warning message saying DEBUG name is already defined
 2020-03-28 10:13:11 +00:00
David Maciejak 91f8e21668 WPrefs: fixed malformed TIFF file generating libtiff warnings 
The original ergonomic.tiff file samples/pixel property was wrong which was generating the warning message from libtiff
"TIFFReadDirectory: Warning, Sum of Photometric type-related color channels and ExtraSamples doesn't match SamplesPerPixel. Defining non-color channels as ExtraSamples.."
 2020-03-28 01:02:56 +00:00
David Maciejak 5f18f60fd2 WPrefs: increased open submenu label size 
Give more space for the open submenu label to be displayed properly
 2020-03-28 01:02:41 +00:00
David Maciejak a215869067 wrlib: Fixed warning msg using libpng 
Call png_set_interlace_handling() to get rid of the warning message "libpng warning: Interlace handling should be turned on when using png_read_image"
 2020-03-27 09:00:37 +00:00
David Maciejak 909deea70c bump copyright year in Info Panel 
bump copyright year in Info Panel
 2020-03-25 10:08:17 +00:00
David Maciejak 984a992d0e Fix typo 
Renamed isPointNearBoder() function
 2020-03-25 10:05:02 +00:00
nchilingaryan@aua.am e82d86813e Update Armenian translation 
I did some part of translatin back in 2008, now I fixed bugs and updated it
so that all the messages are translated.
 2020-03-05 10:19:49 +00:00
Jeremy Sowden d9bc96e497 strncpy's third argument should be the length of the dest buffer, not the source. 2019-08-06 11:04:05 +01:00
Jeremy Sowden a7baed6cf7 Fixed expression checking whether flag is set. 2019-08-06 11:04:05 +01:00
Jeremy Sowden a12f0d453a Fixed buffer size. 2019-08-06 11:04:05 +01:00
Jeremy Sowden 41193bdacd Fixed function-pointer compatibility. 2019-08-06 11:04:05 +01:00
Jeremy Sowden a7f8e990db Added explicit fall-through comments to pacify GCC. 2019-08-06 11:04:05 +01:00
Jeremy Sowden b59273f199 Added missing function declaration. 2019-08-06 11:04:05 +01:00
Haroldo be922384ac slight increase in default switch panel icon size to improve border view 2019-07-28 23:05:28 +01:00
Haroldo 31f16b65a3 higher resolution images for switch panel 2019-07-28 20:21:14 +01:00
Haroldo 3665410377 make switchpanel configurable 2019-07-14 17:43:28 +01:00
Jeremy Sowden 4477ae4da4 Prefer TryExec to Exec when generating menu entries from XDG desktop files. 
From the comments at the top of wmmenugen_parse_xdg.c:

  Since there is no passing of file name arguments or anything of the
  sort to applications from the menu, execname is determined as follows:

   - If `TryExec' is present, use that;
   - else use `Exec' with any switches stripped

However, Exec used to be preferred.  Changed code to prefer TryExec.

Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
 2019-06-20 22:06:36 +01:00
Jeremy Sowden 9330a021e5 Omit field-code in Exec fields when generating menu-entries from XDG desktop-files. 
Exec fields in desktop-files may include field-codes which act as
place-holders for command-line arguments.  Previously the Exec arguments
were being passed through intact.  However, since Window Maker has no
support for expanding the field-codes, we now remove them and preserve
the remaining arguments.

Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
 2019-06-20 22:06:36 +01:00
Jeremy Sowden 41ab926090 Parse Exec fields when generating menu-entries from XDG desktop-files. 
Exec fields in desktop-files are subject to escaping.  Unescape them.

Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
 2019-06-20 22:06:36 +01:00
Jeremy Sowden b32ccee5cb Undo XDG string-escaping when generating menu-entries. 
In XDG desktop files, string values are subject to escaping.  Undo this
when parsing them.

Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
 2019-06-20 22:06:36 +01:00
Jeremy Sowden 6734646265 Use pointers as parameters instead of pointer-to-pointers. 
Some functions expected pointers-to-pointers where pointers would do.
Changed them to use pointers.

Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
 2019-06-20 22:06:36 +01:00
Rodolfo García Peñas (kix) 6a044fe5ae load_jpeg.c Return NULL 
The image is NULL, we can return NULL here.

Signed-off-by: Rodolfo García Peñas (kix) <kix@kix.es>
 2019-06-20 22:04:31 +01:00
Rodolfo García Peñas (kix) 6dd1498f7c load_jpeg.c Style 
This patch is just coding style. Removes some empty lines,...

Signed-off-by: Rodolfo García Peñas (kix) <kix@kix.es>
 2019-06-20 22:04:31 +01:00
Rodolfo García Peñas (kix) 090b761fde load_jpeg.c Removed dead code 
This patch removes the code not used. Because the if block
check that buffer[0] is NULL, then, we don't need check it
again inside.

Image is not used yet, so is NULL. We can return NULL.

Signed-off-by: Rodolfo García Peñas (kix) <kix@kix.es>
 2019-06-20 22:04:31 +01:00
Rodolfo García Peñas (kix) 49db946aa2 load_jpeg.c Clean code 
This patch returns NULL, because the variable image is not used yet.

The patch also removes three lines:

- buffer[0] = NULL;       /* Initialize pointer to avoid spurious free in cleanup code */
  RErrorCode = RERR_BADIMAGEFILE;
  jpeg_destroy_decompress(&cinfo);
  fclose(file);
- if (buffer[0])
-    free(buffer[0]);

buffer is a local variable. The malloc is not used yet. So:

- We set the value to NULL, then check if is null to call free(). So the free()
  call is never used. We can remove the last too lines.
- We don't need set now to NULL, because the variable is empty (the
  initializated (or not) value is not used, and is destroyed as local variable
  when we returns, just one line later.

Signed-off-by: Rodolfo García Peñas (kix) <kix@kix.es>
 2019-06-20 22:04:31 +01:00
Rodolfo García Peñas (kix) a2cc89dd3d load_jpeg.c Removed goto 
This patch removes the goto call. I copied the code after the bye: label and
I paste it in the goto-calls.

Signed-off-by: Rodolfo García Peñas (kix) <kix@kix.es>
 2019-06-20 22:04:31 +01:00
Rodolfo García Peñas (kix) de09ac5dad WPrefs.c Removed format-overflow warning 
This patch adds some characters to the mbuf buffer, to allow the buffer size and some extra characters.

WPrefs.c: In function ‘loadConfigurations’:
../src/wconfig.h:400:17: warning: ‘%s’ directive writing up to 1023 bytes into a region of size 1018 [-Wformat-overflow=]

Signed-off-by: Rodolfo García Peñas (kix) <kix@kix.es>
 2019-06-20 22:04:31 +01:00
Rodolfo García Peñas (kix) 3dce639aae Appearance.c Removed fallthrough warning 
This patch adds some comments to remove the falthrough warning.

Appearance.c: In function ‘renderTexture’:
../WINGs/WINGs/WUtil.h:230:32: warning: this statement may fall through [-Wimplicit-fallthrough=]
 #define wwarning(fmt, args...) __wmessage( __func__, __FILE__, __LINE__, WMESSAGE_TYPE_WARNING, fmt, ## args)
                                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Appearance.c:675:4: note: in expansion of macro ‘wwarning’
    wwarning(_("unknown direction in '%s', falling back to diagonal"), type);
    ^~~~~~~~
Appearance.c:676:3: note: here
   case 'D':
   ^~~~

Signed-off-by: Rodolfo García Peñas (kix) <kix@kix.es>
 2019-06-20 22:04:31 +01:00
Rodolfo García Peñas (kix) 00dffbe317 wmiv.c Removed indentation warning 
This patch removes the indentation problem. The patch includes a long comment about the change.

wmiv.c: In function ‘main’:
wmiv.c:843:4: warning: this ‘if’ clause does not guard... [-Wmisleading-indentation]
    if (e.xclient.data.l[0] == delWindow)
    ^~
wmiv.c:845:5: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the ‘if’
     break;
     ^~~~~

Signed-off-by: Rodolfo García Peñas (kix) <kix@kix.es>
 2019-06-20 22:04:31 +01:00
Rodolfo García Peñas (kix) 7759d06851 wmgenmenu.c Removed format-truncation 
This patch removes the format-truncation warning. The problem is because buf and comm are arrays with the same size (PATH_MAX). In the snprintf, comm is copied to buf, more some extra characters. The patch reduces the size for the array comm in the extra characters. Without the patch, the comm array is truncated. With the patch, the same characters are copied, without the warning.

wmgenmenu.c: In function ‘find_and_write’:
wmgenmenu.c:436:41: warning: ‘snprintf’ output may be truncated before the last format character [-Wformat-truncation=]
     snprintf(buf, sizeof(buf), "%s -e %s", terminal ? terminal : "xterm" , comm);
                                         ^
wmgenmenu.c:436:5: note: ‘snprintf’ output 5 or more bytes (assuming 4105) into a destination of size 4104
     snprintf(buf, sizeof(buf), "%s -e %s", terminal ? terminal : "xterm" , comm);
     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Signed-off-by: Rodolfo García Peñas (kix) <kix@kix.es>
 2019-06-20 22:04:31 +01:00
Rodolfo García Peñas (kix) bf644338e4 gradient.c Removed implicit-fallthrough warnings 
This patch adds the comments to remove the warnings.

gradient.c: In function ‘renderGradientWidth’:
gradient.c:162:10: warning: this statement may fall through [-Wimplicit-fallthrough=]
   *ptr++ = b;
   ~~~~~~~^~~
gradient.c:163:2: note: here
  case 2:
  ^~~~
gradient.c:166:10: warning: this statement may fall through [-Wimplicit-fallthrough=]
   *ptr++ = b;
   ~~~~~~~^~~
gradient.c:167:2: note: here
  case 1:
  ^~~~

Signed-off-by: Rodolfo García Peñas (kix) <kix@kix.es>
 2019-06-20 22:04:31 +01:00
Rodolfo García Peñas (kix) 95561fba08 wtextfield.c: Removed multiple warnings 
This patch removes the implicit-fallthrough warnings for GCC7. Just add the FALLTHRU comment.
 2019-06-20 22:04:31 +01:00
Rodolfo García Peñas (kix) a0b223263e wtext.c Remove warnings 
This patch removes the FALLTHRU warnings in wtext.c. Only includes the comments for GCC7.

wtext.c: In function ‘handleActionEvents’:
wtext.c:2508:6: warning: this statement may fall through [-Wimplicit-fallthrough=]
   if (event->xbutton.button == Button2) {
      ^
wtext.c:2547:2: note: here
  case ButtonRelease:
  ^~~~
wtext.c: In function ‘handleTextKeyPress’:
wtext.c:2307:11: warning: this statement may fall through [-Wimplicit-fallthrough=]
   *buffer = '\n';
   ~~~~~~~~^~~~~~
wtext.c:2308:2: note: here
  default:
  ^~~~~~~

Signed-off-by: Rodolfo García Peñas (kix) <kix@kix.es>
 2019-06-20 22:04:31 +01:00
Rodolfo García Peñas (kix) 2555413838 wruler.c Remove format-truncation warning 
This patch removes the format-truncation error. The warning is because c has size of 3, but using "%d" is not possible to store the value.

wruler.c: In function ‘paintRuler.part.0’:
wruler.c:184:28: warning: ‘%d’ directive output may be truncated writing between 1 and 10 bytes into a region of size 3 [-Wformat-truncation=]
    snprintf(c, sizeof(c), "%d", ++j);
                            ^~
wruler.c:184:27: note: directive argument in the range [1, 2147483647]
    snprintf(c, sizeof(c), "%d", ++j);
                           ^~~~
wruler.c:184:4: note: ‘snprintf’ output between 2 and 11 bytes into a destination of size 3
    snprintf(c, sizeof(c), "%d", ++j);
    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

The value "j" is the result of "m < w". w is the result of rPtr->view->size.width - rPtr->margins.left;, and both variables are unsigned int. So the value for w is an unsigned int and m is related to i. m cannot be greater of unsigned int.

	i = j = m = 0;
	w = rPtr->view->size.width - rPtr->margins.left;
	while (m < w) {
		XDrawLine(rPtr->view->screen->display, rPtr->drawBuffer,
			  rPtr->fgGC, rPtr->margins.left + m, 23, rPtr->margins.left + m, marks[i % 8] + 23);
		if (i != 0 && i % 8 == 0) {
			snprintf(c, sizeof(c), "%hu", ++j);
			WMDrawString(rPtr->view->screen, rPtr->drawBuffer, rPtr->fg,
				     rPtr->font, rPtr->margins.left + 2 + m, 26, c, 2);
		}
		m = (++i) * 10;
	}

The printf modifier should be unsigned int.

Signed-off-by: Rodolfo García Peñas (kix) <kix@kix.es>
 2019-06-20 22:04:31 +01:00
Rodolfo García Peñas (kix) 3e3f06a7be widgets.c Removes implicit-fallthrough warning 
This patch removes this warning:

widgets.c: In function `renderPixmap':
widgets.c:385:8: warning: this statement may fall through [-Wimplicit-fallthrough=]
     if (mask)
        ^
widgets.c:388:4: note: here
    case '.':
    ^~~~

Signed-off-by: Rodolfo García Peñas (kix) <kix@kix.es>
 2019-06-20 22:04:31 +01:00
Rodolfo García Peñas (kix) 1f80c82091 wcolorpanel.c Removed hsbInit warnings 
This patch removes these warnings in the hsbInit function.

wcolorpanel.c: In function ‘hsbInit’:
wcolorpanel.c:3456:16: warning: ‘%u’ directive writing between 1 and 5 bytes into a region of size 4 [-Wformat-overflow=]
  sprintf(tmp, "%d", value[0]);
                ^~
wcolorpanel.c:3456:15: note: directive argument in the range [0, 65535]
  sprintf(tmp, "%d", value[0]);
               ^~~~
wcolorpanel.c:3456:2: note: ‘sprintf’ output between 2 and 6 bytes into a destination of size 4
  sprintf(tmp, "%d", value[0]);
  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~

The problem is that the hue variable in the RHSVColor struct. This variable is not an integer, is a shor variable, so using the printf using the "%d" modifier spects an integer. Using a "%hu" prints a unsigned short value.

typedef struct RHSVColor {
    unsigned short hue;	       /* 0-359 */
    unsigned char saturation;      /* 0-255 */
    unsigned char value;	       /* 0-255 */
} RHSVColor;
 2019-06-20 22:04:31 +01:00
Rodolfo García Peñas (kix) fb5f6c30c0 wcolorpanel.c: Remove warning in rgbIntToChar 
This patch removes this warning. The default case should not be used.

wcolorpanel.c: In function ‘rgbIntToChar’:
wcolorpanel.c:2392:2: warning: ‘format’ may be used uninitialized in this function [-Wmaybe-uninitialized]
  sprintf(tmp, format, value[1]);
  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Signed-off-by: Rodolfo García Peñas (kix) <kix@kix.es>
 2019-06-20 22:04:31 +01:00
Rodolfo García Peñas (kix) 972d85610a wcolorpanel.c Avoid compiler warning 
This patch removes this warning. The patch adds a switch case that never should happend.

wcolorpanel.c: In function ‘rgbInit’:
wcolorpanel.c:3403:2: warning: ‘format’ may be used uninitialized in this function [-Wmaybe-uninitialized]
  sprintf(tmp, format, panel->color.rgb.green);
  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Signed-off-by: Rodolfo García Peñas (kix) <kix@kix.es>
 2019-06-20 22:04:31 +01:00
Rodolfo García Peñas (kix) f0f95165e4 WINGs/selection.c Removed compiler warning 
This patch removes this warning:

selection.c:265:64: warning: cast between incompatible function types from ‘int (*)(void *)’ to ‘void (*)(void *)’ [-Wcast-function-type]
  wdata = WMCreateDataWithBytesNoCopy((void *) data, len * bpi, (WMFreeDataProc *) XFree);

Signed-off-by: Rodolfo García Peñas (kix) <kix@kix.es>
 2019-06-20 22:04:31 +01:00
Tim Taenny f895b906a4 Adjusted size of the Legal Information panel 
With the changes to the layout, which were introduced in the
previous patch series, and the correction of the default font
size, the Legal Information panel was too small to display the
complete text.
It has been set to a sufficient size.
 2019-06-19 18:06:53 +01:00
Tim Taenny 5ab9b7c6be Renamed the ScaleX/Y macros and their local variables 
The names of the macros and the local variables that they use
have been changed to make them less "user-space" like.

    ScaleX -> WMScaleX
    ScaleY -> WMScaleY
    fw     -> wmScaleWidth
    fh     -> wmScaleHeight
 2019-06-19 18:06:53 +01:00
Tim Taenny 1e490f8233 Adjusted scale factors in ScaleX and ScaleY macros 
The scale factors in the macros were based on the assumption that
the default font size was 11. But the actual default font size is
12. This value is specified as DEFAULT_FONT_SIZE in
WINGS/configuration.c.
 2019-06-19 18:06:53 +01:00
Tim Taenny ba3df2599d Use fixed font size in original WMCreate*Panel functions 
Instead of just assuming that the size of the system font has not
been changed by the user, the WMCreateAlertPanel,
WMCreateInputPanel and WMCreateGenericPanel functions now use a
fixed default font size of 12, so that changing the system font's
size in WPrefs.app does not break the fixed layouts of these panels.
("12" is specified as DEFAULT_FONT_SIZE in WINGS/configuration.c)
 2019-06-19 18:06:53 +01:00
Tim Taenny c803218ed1 New functions for the creation of scaled panels (WMCreateScaled*Panel) 
To prevent breaking applications depending on the static layout
behavior of the WMCreateAlertPanel and WMCreateInputPanel functions
in WINGs, the scaling functionality has been moved to the new
functions WMCreateScaledAlertPanel and WMCreateScaledInputPanel.

The system dialogs (wMessageDialog, wExitDialog, etc.) now use the
new functions, thus keeping the improved layout introduced in the
previous patches.
 2019-06-19 18:06:53 +01:00
Carlos R. Mafra 6c6853ea30 util: add wmiv entry to README 2019-06-15 16:49:34 +01:00
Tim Taenny b48b503eb1 Improved layout of the Info Panel 
Instead of relying on static pixel values for position and size of
the widgets, the info panel now scales its widgets based on the
selected system font size.
 2019-06-12 23:42:27 +01:00
Tim Taenny 1c8b680e3d Improved layout of the Legal Panel 
Instead of relying on static pixel values for position and size of
the widgets, the legal panel now scales its widgets based on the
selected system font size.
 2019-06-12 23:42:27 +01:00
Tim Taenny 5eeaf6b890 Improved layout of the Icon Chooser Panel 
Instead of relying on static pixel values for position and size of
the widgets, the icon chooser panel now scales its widgets based
on the selected system font size.
 2019-06-12 23:42:27 +01:00
Tim Taenny f9236c8d20 Improved layout of the Input Panels 
Instead of relying on static pixel values for position and size of
the widgets, the input panels now scale their widgets based on the
selected system font size.
 2019-06-12 23:42:27 +01:00
Tim Taenny 26bb94a8e7 Improved layout of the Alert Panels 
Instead of relying on static pixel values for position and size of
the widgets, the alert panels now scale their widgets based on the
selected system font size.
 2019-06-12 23:42:27 +01:00
Tim Taenny b185d46286 Added ScaleX and ScaleY macros to WINGs 
To reduce code duplication the ScaleX and ScaleY macros have been
moved to WUtil.h. Along with the function WMGetScaleBaseFromSystemFont
these macros can be used in all panels to scale the widgets based on
the current system font size instead of giving fixed pixel sizes which
messes up the panels if a larger system font is selected in WPrefs.

Use the macros in the following way:

    instead of   WMResizeWidget(widget, 128, 64);
                 WMMoveWidget(widget, 32, 32);

    use          int fw, fh;
                 WMGetScaleBaseFromSystemFont(scr->wmscreen, &fw, &fh);
                 WMResizeWidget(widget, ScaleX(128), ScaleY(64));
                 WMMoveWidget(widget, ScaleX(32), ScaleY(32));
 2019-06-12 23:42:27 +01:00
Tim Taenny 8f29bdc690 Improved layout of the widgets in the DockAppSettingsPanel 
Instead of relying on static pixel values for position and size of
the widgets, the DockAppSettingsPanel now scales its widgets based
on the selected system font size.
 2019-06-12 23:42:27 +01:00
Christophe CURIS e2cfed3377 Do not stop compilation if library Xmu is not found 
We use only 1 function from this library, and it is in a case that should
be rare nowadays: displays with indexed color.
This commit makes it acceptable to compile if the library is missing.
 2019-05-04 14:50:48 +01:00
Christophe CURIS 4665972175 Change the way the ChangeLog date is extracted for Texi2txt generated docs 
When building into another directory than in the source, the hard-coded
relative path to the changelog will fail finding the file, causing an empty
date in the generated file when '@today' is used.

This patch is making sure the ChangeLog is taken in the source directory to
avoid any problem.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
 2019-02-22 16:21:00 +00:00
Christophe CURIS 8606ae9a83 WINGs: simplify code 
It looks like the original code was expecting the side effect of specifying
a length in the %d to smartly truncate the number, which it does not.
The new code has the same behaviour without extra complexity.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
 2019-02-22 16:08:36 +00:00
Christophe CURIS 070f0ad8f4 WPrefs: Dead code removal 
Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
 2019-02-22 16:08:36 +00:00
Christophe CURIS 2913ac0f09 Do not allocate memory for a temporary buffer 
This kind of things participates in memory fragmentation, so it is
generally a bad practice when an on-stack allocation is enough.
Took opportunity to reduce the buffer size, there's no point in
overallocating memory (the new size being still way too much).

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
 2019-02-22 16:08:36 +00:00
Christophe CURIS dae63b5e96 WPrefs: Prefer use of 'sizeof' instead of hard-coded values 
Hard-coding a value is prone to errors when maintaining the code; using the
builtin C macro 'sizeof' is a much safer choice.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
 2019-02-22 16:08:36 +00:00
Doug Torrance 738a78b3e2 Replace GNUSTEP_USER_ROOT environment variable with WMAKER_USER_ROOT 
As reported in Debian bug #922284 [1]:

    As evident from the prefix, GNUSTEP_USER_ROOT is a GNUstep variable and
    Window Maker should not set it.  Furthemore, it has been deprecated for
    12 years already.  As of gnustep-make/2.7.0-4 the GNUstep build system
    is configured in strict v2 mode which makes it impossible to compile
    GNUstep software.  In a terminal started from a Window Maker session:

    yavor@aneto:/tmp/gorm.app-1.2.24$ make
    This is gnustep-make 2.7.0. Type 'make print-gnustep-make-help' for help.
    Running in gnustep-make version 2 strict mode.
    rm -f InterfaceBuilder; \
    ln -s GormLib InterfaceBuilder
    /usr/share/GNUstep/Makefiles/config-noarch.make:121: *** GNUSTEP_USER_ROOT
    is obsolete.  Stop.

    It is also impossible to build gnustep-make from pristine upstream
    source:

    yavor@aneto:/tmp$ wget -q
      ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-2.7.0.tar.gz
    yavor@aneto:/tmp$ tar xzf gnustep-make-2.7.0.tar.gz
    yavor@aneto:/tmp$ cd gnustep-make-2.7.0/
    yavor@aneto:/tmp/gnustep-make-2.7.0$ ./configure
    ...
    yavor@aneto:/tmp/gnustep-make-2.7.0$ make
    config-noarch.make:121: *** GNUSTEP_USER_ROOT is obsolete.  Stop.

    Note that the majority of GNUstep users use Window Maker as their window
    manager and many of them build GNUstep software from source, mostly
    because of the GNUstep Objective-C runtime which depends on Clang
    (Debian packages use GCC and the GCC/GNU runtime).

Our solution is to replace the GNUSTEP_USER_ROOT environment variable with our
own environment variable, WMAKER_USER_ROOT.  This is documented in NEWS.

[1] https://bugs.debian.org/922284
 2019-02-17 18:44:33 +00:00
Stig-Ørjan Smelror 1dace5699f Drop support for Imagemagick version < 7 
Had to do a few modifications to get WM to build with Imagemagick 7.

Attached is the diff from the latest git checkout.

Cheers,
Stig
 2019-02-12 19:14:01 +00:00
Tim Taenny 5a95631091 Added expert option for WrapAppiconsInDock property to WPrefs 
In 2013 Daniel added the functionality to wrap icons, which are
attached to the dock, around the screen edges when the dock is
being moved vertically.
This patch adds an expert option to WPrefs.app for setting the
property which enables/disables this feature.

Remark: In my opinion, the default value for that property should
        be changed to NO, as this is also the default behavior in
        NeXTSTEP. It is handy to be able to move all these icons
        out of sight when working with maximized application
        windows.
 2019-02-05 21:32:04 +00:00
Tim Taenny 2427200c3e Added feature: automatic scaling of application icons 
If the option "Enforce icon margin" is selected, application window
icons will be selected or scaled so that they only use 75% of the
available icon_size.
Even if the feature is not enabled, this change will scale down
large application icons to icon_size, so that icons can be used
that were rejected by the previous implementation of findBestIcon.
(Example: The Qt Creator icon never showed before, because it is
only provided in 128x128 resolution. Now it's visible.)
 2019-01-31 17:22:49 +00:00
Tim Taenny d6c1ac3ecf Added icon feature option to WPrefs: Enforce icon margin 
The current findBestIcon function usually selects an icon image
that almost completely fills up the (default) 64x64 pixels of an
icon. As Dan noted in the function, the icon images should use only
75% of the available space, which would result in room for the
miniwindow title and better overall aesthetics.

This feature option provides for enabling such an automatic "icon
shrinking" functionality.

Note: This commit only introduces the new option, not the actual
      image shrinking.
 2019-01-31 17:22:49 +00:00
Tim Taenny 9b5eaa3d3e Use popup button for animation style instead of option group in WPrefs 
To make some room for an additional icon option (yet to be committed)
the options group for selecting the iconification animation is
replaced by a popup button. This allows for adding at least two more
checkboxes in the options and makes adding new animation styles less
painful.
 2019-01-31 17:22:49 +00:00
Tim Taenny 2beb5f2c52 Fixed icon loading during Attribute Inspector startup 
When opening the "Icon and Initial Workspace" panel of the Attribute
Inspector, the Miniwindow Image and the corresponding text field were
always empty, even if an icon had been selected, applied and saved
before. The file name was not loaded from the database on startup
of the inspector window.

With this change, the icon and the text field are properly set on
startup of the inspector window.
 2019-01-30 23:43:23 +00:00
Carlos R. Mafra f1809a7786 wmgenmenu: add a few programs 2019-01-22 22:25:06 +00:00
Gaspar Chilingarov 8b919b0d33 support moving window between heads using keyboard 
Window Maker allows to perform practically all operations with windows
using only keyboard. One of the actions so far which required using
mouse was dragging window from one head (monitor) to another.

This patch introduces support for keyboard shortcuts. These shortcuts
move windows in circular fashion (if you have 3 and more monitors).

In case of 2 or 3 monitors arranged horizontally - window will just move
right/left.

In case of 3x3 setup - it is impossible to move window to central
monitor with keyboard.

- preserves window position and size (if display sizes are same)
- otherwise tries to fit window to smaller display
 2018-12-16 10:13:50 +00:00
Doug Torrance d13b78bdde configure: Fix pkg-config variable typo. 
The variable set by PKG_PROG_PKG_CONFIG which points to the pkg-config
utility is PKG_CONFIG, not PKGCONFIG.  The latter was previously used
when trying to detect the presence of the MagickWand library when Window
Maker was built using --enable-magick.
 2018-08-08 08:51:45 +01:00
Gaspar Chilingarov 6668715402 Detect and override illegal window size hints 
The problem - when VirtualBox starts virtual machine, window has very
small height (couple of pixels) and it requires some manual fiddling
to resize it to something usable.

See related bugs here:

https://www.virtualbox.org/ticket/14718#comment:19 - small horizontal
line in the middle of the screen is newly opened virtual machine's
window.

https://www.virtualbox.org/ticket/15863

Inspecting with xdebug and xprop reveals that VirtualBox sends wrong hints:

Request(12): ConfigureWindow window=0x0660000a values={x=27 y=559
width=720 height=65512}

Which is interpreted by X server wrongly and shown with xprop as

WM_NORMAL_HINTS(WM_SIZE_HINTS)
:
                user specified location: 27, 559
                user specified size: 720 by -24
                program specified minimum size: 254 by 109
                window gravity: Static

Some part of X11 interprets such large value as signed int and wraps
it to negative value.

The solution will be if program requests such big window - detect it,
ignore requested size and resize it to some reasonable defaults.

Disclaimer - I tested it only on Ubuntu 16.04, but should apply to
another systems as well - see bug reports.
 2018-05-21 13:02:22 +01:00
Doug Torrance 100745d356 setstyle: Add support for fpixmap ("fillscale") textures 2018-05-15 19:55:28 +01:00
Doug Torrance 7c89ca2551 menu: Fix broken "Save Theme" option. 
This option had been broken for several reasons:
* The getstyle utility does not replace the #usergnusteppath# macro which
  was passed to it by the menu.
* When processing the USER_THEMES_DIR macro, the menu inserts a space
  afterwards, and so the directory and filename were passed to getstyle
  as two separate arguments.
* It used the old, pre-0.50.0 theme format.

By using the -p option to getstyle, we can avoid these issues, as we don't
need to specify the directory *and* it uses the 'new' (since 1999) themepack
format.
 2018-05-15 19:43:25 +01:00
Doug Torrance 0c737bc834 Add new Adwaita style to Makefile. 2018-05-15 14:26:51 +01:00
Doug Torrance b3f8d0997b New Adwaita style which approximates the look of the default GTK theme. 2018-05-15 10:13:48 +01:00
Doug Torrance 673ea18020 Update mailing list links to new Google Groups. 2018-05-14 16:51:23 +01:00
Bad Sector c89ec25c80 Fixes missing appicons after restarting Window Maker 
Fixes the bug where if the icon image is accidentally set to
nothing or the image file is deleted, the appicon keeps losing
its icon (it resets to the default cube icon) when Window Maker
exits/restarts (depending on how the user cleared the icon this
may persist even after redocking the application if information
about the application window is still in the WM).  One way to
easily see this bug is to open the main window's attributes and
press the Save button (no need to do anything else) as this
clears the icon file (this is a separate bug that needs to be
fixed but it is more of a minor UI bug since clearing the image
should simply reset the icon to the application provided one if
the Ignore client supplied icon is not set).  Another way to
see it is to open the properties box in a docked application
that is not running and clear the image field.  After either of
these two actions are performed, restart Window Maker and see
that the icons are missing.

This patch fixes the above bug by calling save_appicon when the
appicon object is created and the application provided icon is
already available (window maker actually tries to save the icon
at an earlier stage but this is done as a side effect of
"painting" the dock icon - which also saves the icon - but this
is done too early, before ownership information is available).

Note that this bug seems to be a regression introduced from
commit 9c4b19d8aa (or one of the
related commits around the same time, they seem to be a bit too
aggressive in not saving icons).  This patch addresses the
concern in that commit about only saving the icon for docked
applications.
 2018-04-18 10:09:38 +01:00
Bad Sector 569fbff07c wmaker: Add new advanced option to ignore decoration changes from clients. 
This adds an option (IgnoreDecorationChanges in plist) for windows to
ignore any requests from the clients for changing decorations. Since the
default state for any window pre-request is to have all decorations visible
this basically means that applications cannot hide any of the titlebar,
sizing bar, titlebar buttons, etc and any hint that causes these elements
to be hidden will be followed by a restoration if this option is set.

 This is useful for broken clients (e.g. Steam) and clients that force
subpar client side decorations. It is basically a per-window setting of the
global advanced option to ignore Gtk hints, except that it also applies to
non-Gtk applications.
 2018-02-14 08:16:55 +00:00
Bernhard M. Wiedemann 36879de261 texi2txt: Use ChangeLog date instead of build date 
in order to make builds reproducible. See
https://reproducible-builds.org/
for why this is good.

This date call works with GNU date and BSD date. Without this patch,
/usr/share/doc/packages/WindowMaker/README.i18n will differ in the
line An alternative solution could use the $SOURCE_DATE_EPOCH
variable defined in
https://reproducible-builds.org/specs/source-date-epoch/

Signed-off-by: Carlos R. Mafra <crmafra@gmail.com>
 2017-12-24 11:58:20 -02:00
Alwin bfd88e07e6 wmaker: Adding copyright year 2017 
The Info Panel didn't show the current year.
 2017-09-14 21:08:26 +02:00
Alwin 81b89f6a4c wmaker: Fixing a menu typo 
There was a typo in background.menu. Although the menu worked fine, it
caused these errors in the logs:

  wmaker(WMReadPropListFromFile(proplist.c:1543)): error: error reading
    from file '/usr/share/WindowMaker/Backgrounds'
 2017-09-14 21:08:26 +02:00
Alwin 6cfc71d40a Translations: Frisian language files for WPrefs and menus updated 
Compacting two translations to fit the available space; two new strings.
The menus are now split like the English ones, using appearance.menu.fy
and background.menu.fy. A new comment was added to menu.fy.in.
 2017-09-14 21:08:26 +02:00
Alwin ccc676a2bf Translations: Dutch language files for WPrefs and menus updated 
Compacting a translation to fit the available space; two new strings.
The menus are now split like the English ones, using appearance.menu.nl
and background.menu.nl. A new comment was added to menu.nl.in.
 2017-09-14 21:08:26 +02:00
Doug Torrance 2dbd778ed4 WPrefs: Inform user which menu file is being edited. 2017-08-19 15:59:13 +01:00
Doug Torrance f63635dd17 WPrefs: Save menu back to the file we read it from. 
Previously, we saved any modifications back to WMRootMenu, regardless of
the file we read the menu from.
 2017-08-19 15:59:13 +01:00
Doug Torrance 97702618de WPrefs: Display warning when attempting to modify a read-only menu file. 2017-08-19 15:59:13 +01:00
Doug Torrance b68a1994c2 debian: Remove patch 54_Debian_wmmacros.diff. 
This patch is now unnecessary, as we have removed the SETSTYLE and
LOCAL_*_DIR macros and have added the USER_*_DIR upstream.
 2017-08-19 11:14:38 +01:00
Doug Torrance fe459fbab3 menu: Add USER_*_DIR macros. 
Inspired by the Debian patch 54_Debian_wmmacros.diff.  These macros are
actually already referenced in appearance.menu and background.menu, but
only Debian installations have taken advantage of them.

We use the new #usergnusteppath# macro to reference the user GNUstep path.
 2017-08-19 11:14:38 +01:00
Doug Torrance 5f2dac318c menu: New macro #usergnusteppath# for user GNUstep directory 
This macro is used when handling directories with OPEN_MENU, e.g., to list
available image files for setting the workspace background.

When parsing a menu file, we replace any instances of #usergnusteppath#
with either GNUSTEP_USER_ROOT or ~/GNUstep if the former is not set.  In
this way, authors of menu files do not have to worry about whether users
will have this variable set or not.

We also document this feature in WindowMaker/menu.in, which generates the
default English language old-style menu and currently contains the existing
documentation for the Window Maker menu system.
 2017-08-19 11:14:38 +01:00
Doug Torrance bfda22ef1a menu: Remove unused LOCAL_*_DIR macros. 
We remove the macros LOCAL_THEMES_DIR, LOCAL_STYLES_DIR,
LOCAL_ICON_SETS_DIR, and LOCAL_BACKGROUNDS_DIR.

They were only referenced in the Debian patch 54_Debian_wmmacros.diff, which
set them to /usr/local/share/WindowMaker/{Themes,Styles,etc.}.

In a default installation, THEMES_DIR, STYLES_DIR, etc. coincide exactly
with these paths.  In a Debian installation (which defaults to /usr/share
instead of /usr/local/share), it seems unlikely that a user would have these
files in both locations.
 2017-08-19 11:14:38 +01:00
Doug Torrance 46daa76f77 menu: Remove unused SETSTYLE macro. 2017-08-19 11:14:38 +01:00
Doug Torrance 02cc702029 WPrefs: Edit proplist menus referenced by WMRootMenu. 
Previously, WPrefs could only be used to edit the menu specified in
WMRootMenu.

In a recent commit, the ability to specify a menu in proplist format defined
in another file which is referenced by WMRootMenu was added.  However, if a
user attempted to edit such a menu in WPrefs, an error dialog appeared.

We add the ability for WPrefs to read such a menu.  After the user makes any
changes, the result is stored in WMRootMenu, and *not* the original file.
 2017-08-19 11:14:38 +01:00
Doug Torrance 6f195b18fc WINGs: WMIsPL* functions return False if proplist is null. 
Previously, calls to WMIsPLString, WMIsPLData, WMIsPLArray, and
WMIsPLDictionary would result in a segfault if the argument was null.
This could happen, e.g., if we are checking which type of proplist
was just parsed from a file, but the parsing failed.

These functions now return False in this case.
 2017-08-19 11:14:38 +01:00
Doug Torrance 101ef6f28e menu: For consistency, use appearance.menu for English-language menus. 2017-08-18 02:14:11 +01:00
Doug Torrance 5a5595f76c menu: Add WPrefs to appearance.menu. 
WPrefs appears under the 'Appearances' submenu of both menu and plmenu.
 2017-08-18 02:14:11 +01:00
Doug Torrance 1a5abe9d84 menu: Add Bluemarine to solid background color options. 
This color was present in menu and plmenu, but not background.menu.
 2017-08-18 02:14:11 +01:00
Doug Torrance d364afff02 menu: Write data directory during build instead of with wmaker.inst. 
Many of the menu files contain the macro #wmdatadir# as a placeholder for
the data directory containing Window Maker themes, styles, background
pixmaps, etc.  This macro is replaced by the the actual path to the data
directory (by default /usr/local/share/WindowMaker) by the wmaker.inst
script, but only when copying WMRootMenu to the user's home directory.

Instead, we replace the macro during the build.  This way, *every* menu
file has the correct path.

Note that several of the files in question were not previously generated
during build.  These have been renamed with a .in extension.
 2017-08-18 02:14:11 +01:00
Doug Torrance 273d17a0be menu: Include all aspect ratio options for background pixmap. 
The background menu was missing "centered", "maximized", and "filled".

This closes Debian bug #85591 [1]:
  The current default for the scaled backgrounds menu is to use
  scaling without keeping the aspect ratio.

  This very rarely yields to a usable background.

  Could the default be changed to scaling with keeping the aspect
  ratio ?

[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=85591
 2017-08-18 02:14:11 +01:00
Doug Torrance d6f754e747 debian: Update with version 0.95.8-2 packaging. 2017-08-15 10:34:03 +01:00
Doug Torrance b07075aed3 wmaker: Allow WMRootMenu to reference menu files in proplist format. 
Previously, WMRootMenu could either be a menu file in proplist format
itself, or it could reference another menu file in the old style format.

If WMRootMenu referenced another menu file in proplist format, this file
was parsed assuming it was in the old style format and thus failed, as
observed by Andreas Metzler [1].

In this patch, we first attempt to parse a referenced menu file as if
it were in proplist format.  If this fails, then we fall back on the old
style format.  This has the disadvantage of spamming the terminal with
various parsing errors if the menu file is in the old style format.

[1] https://www.mail-archive.com/wmaker-dev@lists.windowmaker.org/msg07097.html
 2017-08-13 10:34:46 +01:00
Doug Torrance ad4545b1d8 debian: Update with version 0.95.8-1 packaging. 2017-07-09 22:26:51 +01:00
Doug Torrance ee36395ddf debian: Update with version 0.95.8-1~exp2 packaging. 2017-07-08 23:18:22 +01:00
Doug Torrance ff865c31f0 wmmenugen: Sort menu entries with no category into 'Other'. 2017-07-07 09:59:29 +01:00
Doug Torrance adc1687f98 wmmenugen: Use 'Other' instead of 'Applications' for unknown categories. 
From https://standards.freedesktop.org/menu-spec/latest/apa.html:

 Category-based menus based on the Main Categories listed in this
 specification do not provide a complete ontology for all available
 applications. Category-based menu implementations SHOULD therefore provide
 a "catch-all" submenu for applications that cannot be appropriately placed
 elsewhere.

Emphasis on *submenu*.  By using 'Applications', these menu entries were
sorted into the top level.
 2017-07-07 09:59:29 +01:00
Doug Torrance ac0690b324 wmmenugen: Add reserved categories. 
From https://standards.freedesktop.org/menu-spec/latest/apas03.html:

Reserved Categories have a desktop-specific meaning that has not been
standardized (yet). Desktop entry files that use a reserved category MUST
also include an appropriate OnlyShowIn= entry to restrict themselves to
those environments that properly support the reserved category as used.
 2017-07-07 09:59:29 +01:00
Doug Torrance c261f8ec35 wmmenugen: Add missing 'Science' menu category. 
See https://standards.freedesktop.org/menu-spec/latest/apa.html
 2017-07-07 09:59:29 +01:00
Christophe CURIS e037ae3684 util: fix parsing of XDG menus with multiple groups 
The specification for XDG menu files allows having more than one group and
assumes no constraint on their order. The original code assumed that once
the proper group marker was found, everything after was part of it, causing
misinterpretation of some data, like taking the wrong launch command.

This patch stops the parsing of the menu XDG file when a new group is
found, hence implementing the expected behaviour.

Reported-by: Andreas Metzler <ametzler@bebt.de>
 2017-07-03 14:45:26 +01:00
Doug Torrance 83f0b764e6 WINGs: Set widget background pixmaps before realization. 
Previously, when WMSetWidgetBackgroundPixmap() was called prior to
WMRealizeWidget(), no background pixmap was actually set.

This is because while the CWBackPixmap bit is correctly set to 1, the
CWBackPixel bit remains set to 1.  When XCreateWindow() is finally
called during realization, the background pixel takes precendence over the
background pixmap.

We fix this by setting CWBackPixel to 0 when setting CWBackPixmap to 1 and
vice versa.
 2017-03-22 09:26:24 +00:00
Doug Torrance 3140c09240 wmaker: Consistent configuration options. 
The default configuration options are given in two places in the source
code:
  - src/default.c
  - WindowMaker/Defaults/WindowMaker.in

The defaults are initially set in the former, but are then overwritten by
the latter.

Ideally, the default options in these two locations should coincide.
However, there are currently several issues.
- Many of the options are missing from WindowMaker/Defaults/WindowMaker.in
- Many of the options have conflicting defaults between the two locations.
- A number of options given in WindowMaker/Defaults/WindowMaker.in no longer
  exist.

In this patch, we bring the defaults in the two locations in line with one
another.  We have given preference to the defaults in W/D/WindowMaker, as
these are the one users have been used to.

Some of the paths in IconPath and PixmapPath have been removed.  In
particular, the various system pixmap paths (/usr/include/X11/pixmaps,
/usr/share/pixmaps, and /usr/local/share/pixmaps) have been removed in
favor of PIXMAPDIR, which is specified by the user at build.  Also,
/usr/share/icons has been removed from IconPath.  The root of this
directory will contain very few icons, as the icons themselves are located
in subdirectories corresponding to XDG icon themes.

We add a comment to src/defaults.c to remind future developers who
add or remove options to change the default values in both locations.

We also take the opportunity to remove the unused DEF_INFO_TEXT_FONT
macro.
 2017-03-22 09:26:24 +00:00
Doug Torrance 8fba9945e0 WPrefs: Properly read system fonts in font configuration panel. 
Previously, only the user's WMGLOBAL file would be read to determine the
current WINGs fonts (System Font and Bold System Font) in the Font
Configuration panel.  It is quite possible that this information would
not be in the user's WMGLOBAL file, but instead in the system WMGLOBAL
file.

We instead use the WMDefaultSystemFont and WMBoldDefaultSystemFont
functions to get this information.
 2017-03-20 18:06:12 +00:00
Carlos R. Mafra 30cd22859a Merge branch 'master' into next 
I forgot to add the wmaker 0.95.8 commit back into the next
branch. Doing it now.
 2017-03-20 18:03:24 +00:00
Doug Torrance e13cfcd093 debian: Don't try to install scripts/manpages which have been removed. 2017-03-16 15:26:39 +00:00
Doug Torrance c2a03a3de5 debian: Update with version 0.95.8-1~exp1 packaging. 2017-03-15 16:50:42 +00:00
Doug Torrance db6b50e6c1 doc: Remove manpage for upgrade-windowmaker-defaults script. 
This script is only available in the Debian package, is very out of date,
and will be soon be removed.
 2017-03-12 00:12:18 +00:00
Doug Torrance fa8121ee61 wmaker/WPrefs: Remove legacy support for deprecated apercus. 
Replaced by minipreviews in December 2014.  Over two years have passed.
 2017-03-12 00:12:18 +00:00
Doug Torrance f6320d4fa5 configure: Remove deprecated --with-nlsdir option. 
Deprecated in December 2014, and over two years have passed.
 2017-03-12 00:12:18 +00:00
Doug Torrance cea5f6107c WINGs/wrlib: Remove deprecated get-*-flags scripts. 
These have been replaced by pkg-config.  Christophe left a note in January
2015 to remove them, and this time has now passed.
 2017-03-12 00:12:18 +00:00
Carlos R. Mafra 5d643a67dd Window Maker 0.95.8 2017-03-11 11:10:26 +00:00
Doug Torrance 9087222d1e doc: Add new --with-defsdatadir option to INSTALL-WMAKER. 2017-03-10 20:31:26 +00:00
Doug Torrance dede386b3d debian: Remove patch 51_wmaker_man.diff; applied upstream. 2017-03-10 17:25:32 +00:00
Doug Torrance b2b2ebad4c NEWS: Add note about new global defaults directory configuration. 2017-03-10 17:25:32 +00:00
Alwin d4a0b2f115 Translations: Frisian language file for WPrefs updated 
A few new entries were translated.
 2017-03-10 14:53:38 +00:00
Alwin 2411298ff6 Translations: Dutch language file for WPrefs updated 
A few new entries were translated.
 2017-03-10 14:53:38 +00:00
Doug Torrance cdaa7a4520 doc: Add info about user icons directory to manpage. 
Based on patch in Debian package.  See:
debian/patches/51_wmaker_man.diff
 2017-03-10 10:20:58 +00:00
Doug Torrance 7df224440b doc: Update global autostart/exitscript path in manpage. 2017-03-10 10:20:58 +00:00
Doug Torrance 01ad3ead5d doc: Use new defsdatadir variable to specify defaults directory in manpage. 2017-03-10 10:20:58 +00:00
Doug Torrance 6fa1c0c009 configure: Add option to specify global defaults directory. 
Previously, this was only (partially) possible by redefining the macro
GLOBAL_DEFAULTS_SUBDIR.  This told Window Maker to look for the global
config files in a particular subdirectory of SYSCONFDIR.

However:
* This is undocumented.
* GLOBAL_DEFAULTS_SUBDIR is ignored when installing the config files.  They
  are always installed to SYSCONFDIR/WindowMaker.

To solve these issues, we add a "--with-defsdatadir" option to configure
which allows a user to specify the global defaults directory.
 2017-03-10 10:20:58 +00:00
Doug Torrance ac92f1a844 wrlib: Bump soname version to 6. 
Usually, a soname bump is reserved for when an interface is added, changed,
or removed.  This has not happened to wrlib.  However, I think there is a
special circumstance that warrants the bump.

In particular, there are two versions of wrlib version 5 in the wild:
* The one that shipped with wmaker 0.95.6, which uses symbol version
  LIBWRASTER3.
* The one that shipped with wmaker 0.95.7, which uses symbol version
  LIBWRASTER5.
This was reported in Debian bug #811304 [1].  Binaries which were built
against the older wrlib won't run after upgrading to the newer one, even
though they are supposedly using the same soname version.

(We get around this currently in Debian by patching the old LIBWRASTER3
symbol version back in.)

I propose we bump to version 6 and put this mess behind us.

[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=811304
 2017-03-10 10:20:58 +00:00
Doug Torrance 21d3fadebb ChangeLog: Update with commits since v0.95.7. 2017-03-10 10:20:58 +00:00
Doug Torrance 3986629590 debian: Update with version 0.95.7-8 packaging. 2017-03-10 01:21:32 +00:00
Cyrus Rahman c052addd1d wmaker: Do not place icons under the dock 
While I love the new maximizing functions, in the process of
developing them the code to keep icons from under the dock was lost.

I have created a patch to prevent this problem.
 2017-03-06 15:19:55 +00:00
gryf 6e4698fe11 Fixed couple of compilator warning and removed unused macros. 2017-02-25 10:19:52 +00:00
gryf 3617e4c20c Removed trailing whitespaces from readme files. 2017-02-25 10:19:51 +00:00
gryf f3fdf0b8dd Refactoring handleMaximize() function 
Simplify handleMaximize function for "not effective" case, where there
was couple of duplicate code, now there is one indentation level less
and readability increased.
 2017-02-21 19:24:36 +00:00
gryf 9328ba5b3c Implementation for moving mouse pointer within the maximized window. 
Mouse pointer can be now moved together with window if keyboard was used
for arrange maximized windows on screen. This feature can be turned on
in WPrefs.app in Expert tab by selecting "Move mouse pointer with half
MAXIMIZED windows.", or setting "PointerWithHalfMaxWindows" to "Yes" on
~/GNUstep/Defaults/WindowMaker file.
 2017-02-21 19:24:36 +00:00
gryf c9fbcda0b0 New option for moving mouse pointer along with half-maximized windows. 
This option might be usable for using keyboard for moving windows
around. This option will enable moving mouse pointer for such windows.
 2017-02-21 19:24:36 +00:00
gryf eadb7f3ab2 Alternative way for traversing half-maximized windows. 
Now it is possible for change a bit pattern for changing state between
half-maximized windows. Half maximized windows will become maximized if
there is issued half-maximizing shortcut in opposite direction. Issue
half-maximizing command on same direction on already maximized window,
will have no effect.
 2017-02-21 19:24:35 +00:00
gryf 9e7987713f New option for enabling alternative half-maximized window movement. 
Added new option to Window Maker for enabling alternative way for
half-maximized windows movement. Option can be found on Expert section
in WPrefs app.
 2017-02-21 19:24:35 +00:00
gryf 62d62eebf1 Bugfix for moving windows between heads. 
Previous bugfix introduced another regression. It fixed the issue with
size of the unmaximized window, but break new functionality. Revert back
code for maximizing using mouse, leaving out head detection for keyboard
actions, since it is already calculated.

Mouse actions for maximize also has to be fixed due to different
behaviour in original implementation - movement of the window which is
called in handleMaximize filter out MAX_KEYBOARD from argument passed to
the wMaximizeWindow, so that it will always assume that all the actions
have to be done on the head where mouse pointer resides. For moving
windows between heads feature, calculated head is always passed and
used, regardless of how maximizing was invoked (keyboard or mouse) and
mouse pointer position.
 2017-02-21 19:24:35 +00:00
gryf 160f879cce Fixed wrong (re)stored dimensions for unmaximized window. 2017-02-13 20:01:53 +00:00
gryf 28da4c98e3 Added possibility for half-maximized windows to move across the screens. 
Using MoveHalfMaximizedWindowsBetweenScreens option user can enable
ability for moving half-maximized windows not only within current
screen/head/display, but also to other heads, if they exists. Note, that
only vertically or horizontally maximized windows can be transfered to
another display. Quarter-maximized windows are not supported, since it
is ambiguous to predict in which direction such window should be moved.
 2017-02-08 07:26:35 +00:00
gryf 17a47af160 Added option for ability to move half-maximized between heads. 
Added new option to Window Maker preferences to enable half-maximized
windows movement on all available heads. Option can be found in WPrefs
app on Expert section.
 2017-02-08 07:26:35 +00:00
gryf 014a315f3a Added wGetHeadRelativeToCurrentHead function 
A new function for obtaining possible heads (displays) was added. It
allow to query for a head in four directions relative to the current
one.
 2017-02-08 07:26:35 +00:00
gryf e2f8525728 Added 'head' parameter to wMaximizeWindow 
Additional 'head' parameter will help to select head (display) where
window should be maximized.
 2017-02-08 07:26:35 +00:00
gryf 002d415d02 Trivial cleanup: Removed unused defines. 2017-02-04 13:06:13 +00:00
Doug Torrance 92bc458fac configure: Use PKG_PROG_PKG_CONFIG macro to allow cross building. 
Patch by Helmut Grohne <helmut@subdivi.de> to fix Debian bug #853236 [1]:

> wmaker fails to cross build from source, because it forces the use of
> pkg-config without $ac_tool_prefix. Discovering pkg-config with the
> PKG_PROG_PKG_CONFIG macro considers $ac_tool_prefix and thus makes cross
> compilation succeed. Please consider applying the attached patch after
> stretch is released.
>
> Helmut

[1] https://bugs.debian.org/853236
 2017-01-31 01:44:56 +00:00
Doug Torrance 6f3dbfeaba debian: Update with version 0.95.7-7 packaging. 2017-01-29 10:07:59 -05:00
Doug Torrance 3426f8110b Look for plmenu in build directory when creating WMRootMenu. 
Previously, plmenu already existed in the source directory, and that's where
make looked for it.  Now, however, it is generated to include the proper
path to WPrefs and therefore is in the build directory.

See
https://www.gnu.org/software/make/manual/html_node/Makefile-Basics.html
for more about this distinction.
 2017-01-29 10:07:59 -05:00
Doug Torrance f9b2cf9747 Don't try and add removed file mkMakefile to distribution tarball. 2017-01-20 21:01:42 -05:00
Doug Torrance ad590811f6 Remove WindowMaker/mkMakefile script. 
It was used to generate WindowMaker/Makefile.am, but hasn't been touched
since 1999.  Meanwhile, WindowMaker/Makefile.am has been changed manually
a number of times.
 2017-01-20 19:51:12 -05:00
Doug Torrance d48a37060c Use wprefs_bindir output variable to set WPrefs path in menus. 
The path to WPrefs has been hardcoded in many of the menu files to
/usr/local/GNUstep/Applications/WPrefs.app/WPrefs, which would only actually
work if the user ran something like:
     ./configure --with-gnustepdir=/usr/local/GNUstep
during build.

Instead, we add a .in extension to all menu files with this issue and use sed
to use the actual WPrefs path (given by the wprefs_bindir output variable) and
generate a new menu file.

A very similar idea is already used to generate the WMState file, which sets
WPrefs as the command for the Window Maker logo tile in the dock.

This patch fixes Debian bug #851737:
https://bugs.debian.org/851737
 2017-01-19 18:40:13 -05:00
Doug Torrance 23417d9934 WPrefs: Update path for Debian menu 2016-11-13 15:52:06 +00:00
Bjørn Mork 5561199c87 wmaker: allow alt+tabbed windows over fullscreen 
Fullscreen windows should only be on top when they are in focus. Change
the stacking level temporarily back to WMNormalLevel if the fullscreen
window loses focus due to an alt+tab operation.

Change the stacking level back to WMFullscreenLevel if the fullscreen
window receives the focus again.

Cc: Amadeusz Sławiński <amade@asmblr.net>
Signed-off-by: Bjørn Mork <bjorn@mork.no>
 2016-07-12 23:21:00 +01:00
Bjørn Mork 6429847494 wmaker: fix stacking order of dock and fullscreen 
This reverts the commits:
 311ab6b08c ("Raise fullscreened window")
 a504370f3b ("Remove WMFullscreenLevel")

Removing WMFullscreenLevel had the side effect that a dock or panel
having the _NET_WM_WINDOW_TYPE_DOCK type would stack on top of
fullscreen windows, obscuring part of them.  This is unwanted. No
other window should cover a focused fullscreen window:.
https://specifications.freedesktop.org/wm-spec/latest/ar01s09.html#STACKINGORDER

Simply raising the fullscreen window to the top of the stack of normal
windows is not sufficient if there are windows with higher stacking
levels present.  The separate WMFullscreenLevel is needed.

Cc: Amadeusz Sławiński <amade@asmblr.net>
Signed-off-by: Bjørn Mork <bjorn@mork.no>
 2016-07-12 23:21:00 +01:00
Alexandru Lazar b7a1528833 getstyle: fix wcopy_file paths 
Some (presumably stale) calls to wcopy_file used what appears to
be an incorrect destination which did not always exist. This patch
forces assets to be copied under <themedir>/<asset>, rather than
<themedir><absolute path of asset>. It works by first getting the
"new" path (i.e. the one that will be inserted in the property
list), which is relative to <themedir> (and appears to be always
in the root directory, too); it then copies the file to that path.

This *may* have been the original intended behaviour, as the one
it replaces clutters the path and leaks configuration data. In
addition, the style file seems to store only the file's name, not
the path relative to <themedir>, even when the file is copied with
its full hierarchy.

Signed-off-by: Alexandru Lazar <alazar@startmail.com>
 2016-04-24 19:11:08 -04:00
Doug Torrance 2ea6162629 wmmenugen: Fix segfault; argv[argc] doesn't exist. 2016-04-24 19:05:34 -04:00
Doug Torrance 5a730d63b2 debian: Update with version 0.95.7-6 packaging. 2016-03-24 16:17:44 -04:00
Doug Torrance fd31b29d0d debian: Update with version 0.95.7-5 packaging. 2016-03-09 15:27:04 -05:00
Doug Torrance ebf2801f4a debian: Update with version 0.95.7-4 packaging. 
Note that the patch 57_ignore_with-aix-soname.diff, mentioned in
debian/changelog, is not included as it has already been applied to the next
branch.
 2016-02-15 13:37:34 -05:00
Doug Torrance 8b46f16205 debian: Update with version 0.95.7-3 packaging. 2016-02-10 07:52:54 +05:30
Doug Torrance 2da2045efa debian: Remove 56_ignore_runstatedir.diff. 
This patch has now been applied in next, so its presence among the Debian
patches would cause quilt to fail for those trying to build packages from
next.
 2016-02-10 07:52:54 +05:30
Doug Torrance 67e9e7e554 check-doc: Ignore with-aix-soname in check-cmdline-options-doc.sh 
Control: tags -1 forwarded wmaker-dev@lists.windowmaker.org

libtool 2.4.4 will add a --with-aix-soname option.  Ignore it when checking
whether INSTALL-WMAKER is up to date.

Fixes Debian bug #814213 [1].  Proposed fix to Debian package at [2].

   From: Chris Lamb <lamby@debian.org>
   Subject: wmaker: FTBFS: Error: program option '--with-aix-soname' is not in
     the documentation './INSTALL-WMAKER'
   Date: Tue, 09 Feb 2016 09:59:14 +0100

   Dear Maintainer,

   wmaker fails to build from source in unstable/amd64:

     [..]

     make  check-local
     make[4]: Entering directory '/home/lamby/temp/
       cdt.20160209093619.fGSQWYa4PE/wmaker-0.95.7'
     ./script/check-cmdline-options-doc.sh \
     	--program "./configure" --text-doc "./INSTALL-WMAKER" \
     	--ignore-prg 'with-PACKAGE,without-PACKAGE # only template names from
	  Autoconf' \
     	--ignore-prg 'program-prefix,program-suffix,program-transform-name
	  # in INSTALL' \
     	--ignore-prg 'version,quiet,srcdir,build,host,cache-file,no-create
	  # in INSTALL' \
     	--ignore-prg 'enable-silent-rules,disable-silent-rules # should be in
	  INSTALL' \
     	--ignore-prg 'enable-dependency-tracking,disable-dependency-tracking
	  # in INSTALL' \
     	--ignore-prg 'enable-shared,enable-static # should be in INSTALL' \
     	--ignore-prg 'disable-option-checking,enable-fast-install # should be
	  in INSTALL' \
     	--ignore-prg 'disable-libtool-lock,with-pic,with-gnu-ld,with-sysroot
	  # for libtool' \
     	--ignore-prg 'runstatedir #new in autoconf 2.70, backported in Debian' \
     	--ignore-prg 'with-x # no use, it would not work without X'
     Error: program option '--with-aix-soname' is not in the documentation
       './INSTALL-WMAKER'
     Makefile:951: recipe for target 'configure-documentation' failed
     make[4]: *** [configure-documentation] Error 1

     [..]

[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=814213
[2] http://anonscm.debian.org/cgit/pkg-wmaker/wmaker.git/commit/?id=dd955a7
 2016-02-09 23:21:42 +05:30
Doug Torrance 4f18b3e1f4 check-doc: Ignore runstatedir in check-cmdline-options-doc.sh 
autoconf 2.70 will add a --runstatedir option, Debian has backported it.
Ignore it when checking whether INSTALL-WMAKER is up to date.

Patch by Andreas Metzler from Debian package [1].

[1] https://sources.debian.net/src/wmaker/0.95.7-3/debian/patches/
    56_ignore_runstatedir.diff/
 2016-02-09 23:21:42 +05:30
Doug Torrance cb1760dc0b WPrefs: Add support for fpixmap ("fillscale") texture. 2016-01-24 08:53:21 -05:00
Doug Torrance 9f7e51e66d WPrefs: Code formatting in TexturePanel.c; minimizes checkpatch.pl warnings. 2016-01-24 08:53:21 -05:00
Doug Torrance bf6f81434b wmlib: Remove install-exec-local target. 
This was made redundant by defining pkgconfigdir and pkgconfig_DATA.  On
some systems (with automake < 1.15), this caused a build failure, e.g., [1]:

/usr/bin/install -c -m 644 wmlib.pc /«BUILDDIR»/wmaker-0.95.7+201601230517/
 debian/tmp/usr/lib/x86_64-linux-gnu/pkgconfig/
/usr/bin/install -c -m 644 wmlib.pc '/«BUILDDIR»/wmaker-0.95.7+201601230517/
 debian/tmp/usr/lib/x86_64-linux-gnu/pkgconfig'
/usr/bin/install: cannot create regular file '/«BUILDDIR»/
 wmaker-0.95.7+201601230517/debian/tmp/usr/lib/x86_64-linux-gnu/pkgconfig/
 wmlib.pc': File exists

Also change the definition of DISTCLEANFILES to pkgconfig_DATA to match
the Makefiles for WINGs and wrlib.

[1] https://launchpadlibrarian.net/234989800/
 buildlog_ubuntu-precise-amd64.wmaker_0.95.7+201601230517-0ppa201601211606~
 ubuntu12.04.1_BUILDING.txt.gz
 2016-01-23 09:36:53 -05:00
Doug Torrance af892d7dd6 wmlib: Add pkg-config file. 2016-01-23 00:17:05 -05:00
Alwin 7fa14a0137 Translations: Frisian language files updated 
New entries were translated, and a lot improved.
 2016-01-21 13:10:43 -05:00
Alwin 51d36afc8f Translations: Dutch language files updated 
New entries were translated, a few improved.
 2016-01-21 13:10:43 -05:00
Doug Torrance 84727563f9 wmaker: Implement basic menu shading. 
Menus may now be shaded like other windows by double clicking on their title
bars.  Note that, even if animations are enabled, the shade animation seen
with other windows does not work for menus.

This fixes Debian bug #72038 [1]:

  From: Chris Pimlott <pimlottc@null.net>
  Subject: wmaker: Persistant menus should be shade-able
  Date: Tue, 19 Sep 2000 14:04:41 -0400

  One of the many little things that makes me appreciate Window
  Maker is that by clicking on the title bar of a menu, it can be made
  "persistant" so it stays on screen and doesn't dissappear after click or
  mouseout like normal.  I find it useful if I need to run a number of
  commands in a submenu, or for keeping a list of open windows on
  screen.

  The usefulness of this feature could be extended by allowing menus
  to be shaded (by double-clicking the title) like normal windows, thus
  collapsing them to take up less space when not needed but still be
  persistant.  Perhaps other commands of windows (like maximizing/
  minimizing, resizing) might be considered as well, although
  personally only shading stands out as particularly useful for menus.

[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=72038
 2016-01-21 08:52:36 -05:00
Doug Torrance c7c0b43629 wmaker: Fix whitespace in menu.h; passes checkpatch.pl inspection. 2016-01-21 08:52:36 -05:00
Doug Torrance ac33bb9d1b wmaker: Display keyboard shortcuts for remaining options in window menu. 
In particular, Keep on top, Keep at bottom, and Omnipresent.
 2016-01-20 08:27:07 -05:00
Doug Torrance 563cda28d3 wmaker: Add keyboard shortcuts for keeping window on top or at bottom. 
This closes Debian bug #306808 [1].

[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=306808
 2016-01-20 08:27:07 -05:00
Doug Torrance 65802d3402 wmaker: Use window placement settings on other workspaces. 
Previously, if a window was placed on a workspace other than the current one,
the window placement settings (given by WindowPlacement) were ignored and
the window was drawn in the upper left hand corner.  This is Debian
bug #181735, https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=181735

Part of the bug report by Andrew Gorcester from the link above
is reproduced here:

"When placing a window in a non-active workspace (which usually happens
if the user asks for a program to be started when wmaker is launched,
and defines an initial workspace in the window's attributes dialog),
Windowmaker doesn't follow specified rules on window placement.

All windows of programs that don't manage their own window placement
(Gaim manages placement itself, for instance) are placed in the far
upper-left corner.  Usually windows originate from 64, 64, because the
clip occupies the upper-left corner by default."
 2016-01-20 08:14:48 -05:00
Doug Torrance 9de5a27dbc wmaker: Add option for window snap to top edge to maximize to full screen. 
This is a common behavior in a number of other environments, e.g., Unity
and Windows.
 2016-01-17 22:54:49 -05:00
Doug Torrance 42e4069541 wmaker: Fix typos (used codespell). 2016-01-17 22:54:49 -05:00
Doug Torrance e5632a9120 wmaker: Remove prototype for unused get_right_position_on_screen function. 2016-01-17 22:54:49 -05:00
Doug Torrance c3ad2513a9 wmaker: Update copyright years in info panel. 2016-01-17 22:54:49 -05:00
Doug Torrance 7277787110 debian: Update with version 0.95.7-2 packaging. 2016-01-16 15:16:46 -05:00
Doug Torrance 2f33b3c2bc wmaker: Maintain sorting of windows by workspace in switch menu. 
Previously, this sorting failed when one window was moved to another
workspace.

This fixes Debian bug #280851 [1].

[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=280851
 2016-01-16 01:13:20 -05:00
Doug Torrance fd19456d66 debian: Update with final version of 0.95.7-1 packaging. 
For those interested, the official Debian packaging repository is at:
https://anonscm.debian.org/git/pkg-wmaker/wmaker.git
 2016-01-10 14:23:25 -05:00
Doug Torrance 688c2277d7 debian: Add version 0.95.6-1.2 entry to changelog. 2016-01-06 07:51:06 -05:00
Doug Torrance 755ce07d76 debian: Add wmiv to wmaker package. 2016-01-06 07:51:06 -05:00
Andreas Metzler fc6ed78654 debian: wmaker manpage moved from 1x to 1. 
wmaker manpage was also moved from section 1x to 1. Fix pointer in
README.Debian and update-alternatives slave link.
 2016-01-04 13:47:36 -05:00
Andreas Metzler c11b08d42b debian: Fix typo occured. (Thanks, lintian.) 2016-01-04 13:47:25 -05:00
Andreas Metzler f7e1f5d5f4 debian: Simplify debian/rules. 
Use dh_auto_configure, especially for handling dpkg-buildflags.
 2016-01-04 13:47:16 -05:00
Andreas Metzler 4660e5b1eb debian: Use dh_autoreconf. 
Use dh_autoreconf instead of invoking autogen.sh in the configure
target.
 2016-01-04 13:47:05 -05:00
Andreas Metzler f58cf6a8cd debian: Ignore missing documentation for --runstatedir. 
Ignore runstatedir in check-cmdline-options-doc.sh
autoconf 2.70 will add a --runstatedir option, Debian has backported
it. Ignore it when checking whether INSTALL is up to date.
 2016-01-04 13:46:48 -05:00
Doug Torrance 15ae70b159 wmaker: Print error dialog when attempting to delete an in-use workspace. 2015-10-02 07:14:53 -04:00
Satya Mishra 88393f4a6c wmaker: fixed infinite loop in switching within group 2015-10-01 17:06:40 -04:00
Doug Torrance 1f74d4698c ChangeLog: Bring up to date through 0.95.7 release. 2015-08-30 09:34:23 +01:00
Rodolfo García Peñas (kix) 97189ce2cc Enable usermenu 
This patch enables the usermenu when the application is launched
and the usermenu file exists.

Signed-off-by: Rodolfo García Peñas (kix) <kix@kix.es>
 2015-08-25 15:42:06 +01:00
Rodolfo García Peñas (kix) 2fec5f9f28 usermenu.c Avoid compiler warnings 
This patch includes some changes to avoid compiler warnings and
some code style.

Compiler warnings are:

- notifyClient, do not uses the menu argument. Including (void) menu.
- WUserMenuData, keyover: label is not used.
- configureUserMenu, params is not initialized.
- configureUserMenu, mentry is not initialized.

Signed-off-by: Rodolfo García Peñas (kix) <kix@kix.es>
 2015-08-25 15:42:06 +01:00
Rodolfo García Peñas (kix) 7a2eb68aa4 Remove cache icon when detached 
This pach removes the icon from the icon cache when the icon is
detached from the dock/clip.

That helps to hold tidy the icon cache folder.

-------8<-------
Also app icon caching was broken around the same time. The app icon cache
in CachedPixmaps was meant to store icons retrieved from X clients so the
dock or clip can display those when the client is not running like after
startup. The cache should contain only such icons and the path should never
appear in WMWindowAttributes because the cache is an internal thing used to
look up icons not otherwise available. If you look at your WMWindowAttributes
now it is full of entries referring to the cache that should not be there and
if you look at the cache dir you'll find a lot of icons from all apps you've
ever started while there should be only the few docked ones that use client
side icons. Also the cache is never cleaned up only new icons are added to it.
-------8<-------

Signed-off-by: Rodolfo García Peñas (kix) <kix@kix.es>
 2015-08-23 22:08:30 +01:00
Rodolfo García Peñas (kix) 8a822004ee save the icon filename instead the full path 
This patch saves the icon filename in the database and in the disk. wmaker
can find the icon in the different folders, including the cache folder.

This patch is based in the comments of Zoltan:

-------8<-------
Also app icon caching was broken around the same time. The app icon cache
in CachedPixmaps was meant to store icons retrieved from X clients so the
dock or clip can display those when the client is not running like after
startup. The cache should contain only such icons and the path should never
appear in WMWindowAttributes because the cache is an internal thing used to
look up icons not otherwise available. If you look at your WMWindowAttributes
now it is full of entries referring to the cache that should not be there and
if you look at the cache dir you'll find a lot of icons from all apps you've
ever started while there should be only the few docked ones that use client
side icons. Also the cache is never cleaned up only new icons are added to it.
-------8<-------

Signed-off-by: Rodolfo García Peñas (kix) <kix@kix.es>
 2015-08-23 22:08:30 +01:00
Rodolfo García Peñas (kix) 54db8d6c43 Avoid create again a docked application cache icon 
This patch avoids to create again the cache icon for a docked application.
If the application is docked, then the icon was previosly created.

Signed-off-by: Rodolfo García Peñas (kix) <kix@kix.es>
 2015-08-23 22:08:30 +01:00
Rodolfo García Peñas (kix) e11800652e Avoid recreate Cached icon moving between docks 
This patch avoids to create again the icon in the Cache if the icon
was in other Dock/Clip/Drawer, becasue the icon was previously created
and exits.

Signed-off-by: Rodolfo García Peñas (kix) <kix@kix.es>
 2015-08-23 22:08:30 +01:00
Rodolfo García Peñas (kix) b2c5078987 Remove unused argument in save_appicon 
The argument dock is always True, so can be removed.

Signed-off-by: Rodolfo García Peñas (kix) <kix@kix.es>
 2015-08-23 22:08:30 +01:00
Rodolfo García Peñas (kix) 9c4b19d8aa New applications do not create Cached Icon 
This patch avoids to create Cached Icons for all applications. Only
the applications docked should create it, as Zoltan said:

-------8<-------
Also app icon caching was broken around the same time. The app icon cache
in CachedPixmaps was meant to store icons retrieved from X clients so the
dock or clip can display those when the client is not running like after
startup. The cache should contain only such icons and the path should never
appear in WMWindowAttributes because the cache is an internal thing used to
look up icons not otherwise available. If you look at your WMWindowAttributes
now it is full of entries referring to the cache that should not be there and
if you look at the cache dir you'll find a lot of icons from all apps you've
ever started while there should be only the few docked ones that use client
side icons. Also the cache is never cleaned up only new icons are added to it.
-------8<-------

Signed-off-by: Rodolfo García Peñas (kix) <kix@kix.es>
 2015-08-23 22:08:30 +01:00
Rodolfo García Peñas (kix) b281587397 create_appicon_from_dock checks if no_appicon flag is set 
As Josip Deanovic reported:

-------8<-------
In previous versions e.g. 0.80.2 up until 0.95.3 when an application
attributes are set with "NoAppIcon = Yes;" ("No application icon" option
in attributes window), it was possible to launch multiple instances of
the application from wmdock using double-click.

After doing a git bisect per your suggestion I have found and reported
this:

bc0700e016 is the first bad commit
commit bc0700e016
Author: Rodolfo García Peñas (kix) <kix@kix.es>
Date:   Mon Jun 18 11:15:19 2012 +0200

    Create WAppIcon always

    When the application is created, the WAppIcon now is created always,
    but it is only painted if the flag is not set.

    The icon initialization to NULL can be done now at
app_icon_create_from_docks
    because it is always called.

:040000 040000 7c58877ad5
33d52affb3 M      src
-------8<-------

This patch reverts this change (not the patch). Now the function
create_appicon_from_dock checks if the flag no_appicon is set,
and then, do not execute the code related to the appicon.

Because the connection between the icon and the window is broken
(icon->owner is null) we need check if the icon->owner exists
when we try to re-create the icon in the Window Attributes window.

Signed-off-by: Rodolfo García Peñas (kix) <kix@kix.es>
 2015-08-23 22:08:30 +01:00
Rodolfo García Peñas (kix) 7e42fedcbb Window Maker 0.95.7 Debian files 
Signed-off-by: Rodolfo García Peñas (kix) <kix@kix.es>
 2015-08-15 15:40:53 +01:00
Johann Haarhoff c84e787a24 Build on Ubuntu 14.04 2015-08-13 19:30:43 +01:00
390 changed files with 10536 additions and 10305 deletions
Expand all files Collapse all files
.gitignore
+39
View File
@@ -87,11 +87,50 @@ WINGs/WUtil.pc
wrlib/libwraster.map wrlib/libwraster.map
WindowMaker/appearance.menu
WindowMaker/menu
WindowMaker/menu.bg
WindowMaker/menu.fi
WindowMaker/menu.fy
WindowMaker/menu.hu
WindowMaker/menu.ko
WindowMaker/menu.nl
WindowMaker/menu.ro
WindowMaker/menu.sk
WindowMaker/menu.zh_TW
WindowMaker/plmenu
WindowMaker/plmenu.bg
WindowMaker/plmenu.es
WindowMaker/plmenu.fi
WindowMaker/plmenu.fy
WindowMaker/plmenu.ja
WindowMaker/plmenu.ko
WindowMaker/plmenu.nl
WindowMaker/plmenu.pl
WindowMaker/plmenu.ro
WindowMaker/plmenu.sk
WindowMaker/plmenu.zh_CN
WindowMaker/plmenu.zh_TW
WindowMaker/wmmacros
WindowMaker/Defaults/WMRootMenu WindowMaker/Defaults/WMRootMenu
WindowMaker/Defaults/WMState WindowMaker/Defaults/WMState
WindowMaker/Defaults/WMWindowAttributes WindowMaker/Defaults/WMWindowAttributes
WindowMaker/Defaults/WindowMaker WindowMaker/Defaults/WindowMaker
WindowMaker/IconSets/Default.iconset WindowMaker/IconSets/Default.iconset
# These files are generated by the i18n process
/po/WindowMaker.pot
/po/*.mo
/WINGs/po/WINGs.pot
/WINGs/po/*.mo
/WPrefs.app/po/WPrefs.pot
/WPrefs.app/po/*.mo
/util/po/*.pot
/util/po/*.mo
# Some text editors generate backup files # Some text editors generate backup files
*~ *~
.pc
BUGFORM
+1 -1
View File
@@ -4,7 +4,7 @@
If you find a bug please fill this form and send it to If you find a bug please fill this form and send it to
wmaker-dev@lists.windowmaker.org Please, USE THIS FORM!!! wmaker-dev@googlegroups.com Please, USE THIS FORM!!!
0. Before reporting this bug I already: 0. Before reporting this bug I already:
[ ] read the NEWS, README and INSTALL files [ ] read the NEWS, README and INSTALL files
ChangeLog
+140 -3
View File
@@ -1,3 +1,95 @@
Changes since version 0.95.7:
.............................
- Build on Ubuntu 14.04
(Johann Haarhoff <johann@haarhoff.org.za>)
- Window Maker 0.95.7 Debian files
- create_appicon_from_dock checks if no_appicon flag is set
- New applications do not create Cached Icon
- Remove unused argument in save_appicon
- Avoid recreate Cached icon moving between docks
- Avoid create again a docked application cache icon
- save the icon filename instead the full path
- Remove cache icon when detached
- usermenu.c Avoid compiler warnings
- Enable usermenu
(Rodolfo García Peñas (kix) <kix@kix.es>)
- wmaker: fixed infinite loop in switching within group
(Satya Mishra <qufgmx@gmail.com>)
- wmaker: Print error dialog when attempting to delete an in-use workspace.
(Doug Torrance <dtorrance@piedmont.edu>)
- debian: Ignore missing documentation for --runstatedir.
- debian: Use dh_autoreconf.
- debian: Simplify debian/rules.
- debian: Fix typo occured. (Thanks, lintian.)
- debian: wmaker manpage moved from 1x to 1.
(Andreas Metzler <ametzler@bebt.de>)
- debian: Add wmiv to wmaker package.
- debian: Add version 0.95.6-1.2 entry to changelog.
- debian: Update with final version of 0.95.7-1 packaging.
- wmaker: Maintain sorting of windows by workspace in switch menu.
- debian: Update with version 0.95.7-2 packaging.
- wmaker: Update copyright years in info panel.
- wmaker: Remove prototype for unused get_right_position_on_screen function.
- wmaker: Fix typos (used codespell).
- wmaker: Add option for window snap to top edge to maximize to full screen.
- wmaker: Use window placement settings on other workspaces.
- wmaker: Add keyboard shortcuts for keeping window on top or at bottom.
- wmaker: Display keyboard shortcuts for remaining options in window menu.
- wmaker: Fix whitespace in menu.h; passes checkpatch.pl inspection.
- wmaker: Implement basic menu shading.
(Doug Torrance <dtorrance@piedmont.edu>)
- Translations: Dutch language files updated
- Translations: Frisian language files updated
(Alwin <translations@ziggo.nl>)
- wmlib: Add pkg-config file.
- wmlib: Remove install-exec-local target.
- WPrefs: Code formatting in TexturePanel.c; minimizes checkpatch.pl warnings.
- WPrefs: Add support for fpixmap ("fillscale") texture.
- check-doc: Ignore runstatedir in check-cmdline-options-doc.sh
- check-doc: Ignore with-aix-soname in check-cmdline-options-doc.sh
- debian: Remove 56_ignore_runstatedir.diff.
- debian: Update with version 0.95.7-3 packaging.
- debian: Update with version 0.95.7-4 packaging.
- debian: Update with version 0.95.7-5 packaging.
- debian: Update with version 0.95.7-6 packaging.
- wmmenugen: Fix segfault; argv[argc] doesn't exist.
(Doug Torrance <dtorrance@piedmont.edu>)
- getstyle: fix wcopy_file paths
(Alexandru Lazar <alazar@startmail.com>)
- wmaker: fix stacking order of dock and fullscreen
- wmaker: allow alt+tabbed windows over fullscreen
(Bjørn Mork <bjorn@mork.no>)
- WPrefs: Update path for Debian menu
- Use wprefs_bindir output variable to set WPrefs path in menus.
- Remove WindowMaker/mkMakefile script.
- Don't try and add removed file mkMakefile to distribution tarball.
- Look for plmenu in build directory when creating WMRootMenu.
- debian: Update with version 0.95.7-7 packaging.
- configure: Use PKG_PROG_PKG_CONFIG macro to allow cross building.
(Doug Torrance <dtorrance@piedmont.edu>)
- Trivial cleanup: Removed unused defines.
(Roman Dobosz <gryf73@gmail.com>)
- Added 'head' parameter to wMaximizeWindow
- Added wGetHeadRelativeToCurrentHead function
- Added option for ability to move half-maximized between heads.
- Added possibility for half-maximized windows to move across the screens.
- Fixed wrong (re)stored dimensions for unmaximized window.
(gryf <gryf73@gmail.com>)
- Bugfix for moving windows between heads.
- New option for enabling alternative half-maximized window movement.
- Alternative way for traversing half-maximized windows.
- New option for moving mouse pointer along with half-maximized windows.
- Implementation for moving mouse pointer within the maximized window.
- Refactoring handleMaximize() function
- Removed trailing whitespaces from readme files.
- Fixed couple of compilator warning and removed unused macros.
(Roman Dobosz <gryf73@gmail.com>)
- wmaker: Do not place icons under the dock
(Cyrus Rahman <crahman@gmail.com>)
- debian: Update with version 0.95.7-8 packaging.
(Doug Torrance <dtorrance@piedmont.edu>)
Changes since version 0.95.6: Changes since version 0.95.6:
............................. .............................
@@ -396,6 +488,51 @@ Changes since version 0.95.6:
- debian: Import version 0.95.6-1. - debian: Import version 0.95.6-1.
- debian: Import version 0.95.6-1.1. - debian: Import version 0.95.6-1.1.
(Doug Torrance <dtorrance@monmouthcollege.edu>) (Doug Torrance <dtorrance@monmouthcollege.edu>)
- Import of (partly outdated) Ukrainian translations.
(Martin Dietze <mdietze@gmail.com>)
- Add folder with fedora .spec file
(Alexey I. Froloff <raorn@raorn.name>)
- make: Add Ukrainian translation files to EXTRA_DIST.
- wmiv: Add long command line options --help and --version.
- wmiv: Improve help text.
- doc: Add manpage for wmiv.
(Doug Torrance <dtorrance@monmouthcollege.edu>)
- wmaker: replaced old email address with the official one
- WINGs: Updated news with the API changes that occured between 0.95.6 and
0.95.7
- WINGs: ran spell checker on the NEWS file
- WINGs: fix non-portable int conversion for printf in font panel size handling
- WRaster: fix unused variable warning when XShm extention is not enabled
(Christophe CURIS <christophe.curis@free.fr>)
- New translation into Frisian for Window Maker
(Alwin <translations@ziggo.nl>)
- wrlib: fixed gcc version needed for deprecated attribute support
- Configure: increased the version of Automake requested
(Christophe CURIS <christophe.curis@free.fr>)
- configure: Fix output of libdir directory in summary
(Josip Deanovic <djosip+news@linuxpages.net>)
- wmaker: fix detection of legacy Apercu configuration keywords
- WPrefs: fix conversion of old "Apercu" setting to the new keywords
(Christophe CURIS <christophe.curis@free.fr>)
- wmaker: Allow window snapping and linked workspaces simultaneously.
- wmaker: Allow configuration of window snapping detect distances.
- WPrefs: Add ability to set integer values in Expert panel
- WPrefs: Add snap edge and corner detect to Expert panel.
(Doug Torrance <dtorrance@monmouthcollege.edu>)
- Translations: Dutch updates for WPrefs
- Translations: Frisian updates for WPrefs
(Alwin <translations@ziggo.nl>)
- configure: fixed incorrect variable name that prevented --disable-xdnd to
work
(Rodolfo García Peñas (kix) <kix@kix.es>)
- Revert "wmaker: fix clearing of window attribute that was not saved properly"
- Disable pager by default
(Carlos R. Mafra <crmafra@gmail.com>)
- Allow using keypad Enter to commit move/resize
- Allow using numpad Enter key in dialogs for confirmation
(Amadeusz Sławiński <amade@asmblr.net>)
- Window Maker 0.95.7
(Carlos R. Mafra <crmafra@gmail.com>)
Changes since version 0.95.5: Changes since version 0.95.5:
@@ -3926,7 +4063,7 @@ Changes since version 0.17.5:
icons icons
- fixed bug in focusfollowmouse that made windows under the currently - fixed bug in focusfollowmouse that made windows under the currently
focused window that close, to not get the focus focused window that close, to not get the focus
- if the app is a .app, it will try to find it's icon in the .app - if the app is a .app, it will try to find its icon in the .app
directory and save it in the WMWindowAttributes, so that the dock can use it. directory and save it in the WMWindowAttributes, so that the dock can use it.
- drag docklets that select for mouse events to with Alt+drag - drag docklets that select for mouse events to with Alt+drag
@@ -4797,7 +4934,7 @@ Changes since version 0.3.2:
- application icons (not mini-windows) like I think how it is on NEXTSTEP(tm) - application icons (not mini-windows) like I think how it is on NEXTSTEP(tm)
- fixed "slippery" icon movement - fixed "slippery" icon movement
- added a Dock (not for GNUstep, as it will have it's own) - added a Dock (not for GNUstep, as it will have its own)
Changes since version 0.3.1: Changes since version 0.3.1:
............................ ............................
@@ -4827,7 +4964,7 @@ it's opened to select items, just drag the pointer
- transient owners get a different titlebar color when the focus - transient owners get a different titlebar color when the focus
is in the transient (e.g, in NeXTese: mainWindow is highlighted correctly when is in the transient (e.g, in NeXTese: mainWindow is highlighted correctly when
the keyWindow is a panel) the keyWindow is a panel)
- when transient is closed, it's owner always get the focus - when transient is closed, its owner always get the focus
- fixed XGrabButton/BadAccess bug - fixed XGrabButton/BadAccess bug
- fixed window_count error (this time I'm 90% sure) - fixed window_count error (this time I'm 90% sure)
- fixed focusNextWindow through Alt-Tab bug with non-focusable windows - fixed focusNextWindow through Alt-Tab bug with non-focusable windows
FAQ
+3 -3
View File
@@ -333,7 +333,7 @@ Window Maker distribution.
The author Anthony Quinn <southgat@frontiernet.net> has released a The author Anthony Quinn <southgat@frontiernet.net> has released a
version that works with Window Maker >= 0.15.x. It is available from version that works with Window Maker >= 0.15.x. It is available from
it's home page at http://www.frontiernet.net/~southgat/wmsound/ its home page at http://www.frontiernet.net/~southgat/wmsound/
or on Largo's site at http://wm.current.nu/files.html#wmsound or on Largo's site at http://wm.current.nu/files.html#wmsound
for your convenience. for your convenience.
@@ -352,7 +352,7 @@ GNOME application they have no title bar" below.
To use it with CDE, read the answer for "How do I switch To use it with CDE, read the answer for "How do I switch
CDE's window manager to use Window Maker?" CDE's window manager to use Window Maker?"
To use it with KDE, read it's documentation to get rid of kwm (and possibly To use it with KDE, read its documentation to get rid of kwm (and possibly
kpanel) and replace it with wmaker. Then, start WPrefs.app, go to "Mouse kpanel) and replace it with wmaker. Then, start WPrefs.app, go to "Mouse
Preferences" and set the "Disable mouse actions" check box. You will Preferences" and set the "Disable mouse actions" check box. You will
need to restart Window Maker to make this change take effect. The need to restart Window Maker to make this change take effect. The
@@ -1283,7 +1283,7 @@ WM_NORMAL_HINTS(WM_SIZE_HINTS):
user specified size: 400 by 300 user specified size: 400 by 300
program specified minimum size: 400 by 300 program specified minimum size: 400 by 300
Now, when scilab opens it's window, Window Maker nicely does exactly what it Now, when scilab opens its window, Window Maker nicely does exactly what it
is told, that is, map the window at position 136679205, 1074468360 which is told, that is, map the window at position 136679205, 1074468360 which
obviously falls outside the screen no matter how big is your monitor ;) obviously falls outside the screen no matter how big is your monitor ;)
Makefile.am
+33 -4
View File
@@ -21,8 +21,8 @@ config-paths.h: Makefile
@echo '/* where shared data is stored */' >> $@ @echo '/* where shared data is stored */' >> $@
@echo '#define PKGDATADIR "$(datadir)/WindowMaker"' >> $@ @echo '#define PKGDATADIR "$(datadir)/WindowMaker"' >> $@
@echo '' >> $@ @echo '' >> $@
@echo '/* where the configuration is stored */' >> $@ @echo '/* where the global defaults are stored */' >> $@
@echo '#define SYSCONFDIR "$(sysconfdir)"' >> $@ @echo '#define DEFSDATADIR "$(defsdatadir)"' >> $@
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
@@ -41,11 +41,13 @@ EXTRA_DIST = TODO BUGS BUGFORM FAQ INSTALL \
script/check-cmdline-options-doc.sh \ script/check-cmdline-options-doc.sh \
script/check-translation-sources.sh \ script/check-translation-sources.sh \
script/check-wmaker-loaddef-callbacks.sh \ script/check-wmaker-loaddef-callbacks.sh \
script/generate-html-from-man.sh \
script/generate-mapfile-from-header.sh \ script/generate-mapfile-from-header.sh \
script/generate-po-from-template.sh \ script/generate-po-from-template.sh \
script/generate-txt-from-texi.sh \ script/generate-txt-from-texi.sh \
script/nested-func-to-macro.sh \ script/nested-func-to-macro.sh \
script/replace-ac-keywords.sh script/replace-ac-keywords.sh \
script/replace-generated-content.sh
.PHONY: coverage-reset coverage .PHONY: coverage-reset coverage
@@ -62,6 +64,10 @@ coverage:
genhtml --output-directory @lcov_output_directory@ coverage/coverage.info genhtml --output-directory @lcov_output_directory@ coverage/coverage.info
endif endif
################################################################################
# Section for the I18N processing
################################################################################
# make update-lang PO=<lang> # make update-lang PO=<lang>
# ========================== # ==========================
# Update the PO files against the POT file in all the translation sub-directories # Update the PO files against the POT file in all the translation sub-directories
@@ -80,13 +86,34 @@ if HAVE_XGETTEXT
($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) update-lang || exit $$?); \ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) update-lang || exit $$?); \
done done
SUBDIRS_PO = WINGs/po po util/po WPrefs.app/po SUBDIRS_PO = wrlib/po WINGs/po po util/po WPrefs.app/po
else else
@echo "Error: the program 'xgettext' was not found by configure, it is mandatory for this operation" >&2 ; exit 1 @echo "Error: the program 'xgettext' was not found by configure, it is mandatory for this operation" >&2 ; exit 1
endif endif
.PHONY: update-lang .PHONY: update-lang
################################################################################
# Section related to generating HTML content for the website
################################################################################
if WITH_WEB_REPO
SUBDIRS_WEB = doc
website:
@for subdir in $(SUBDIRS_WEB); do \
($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) website || exit $$?); \
done
endif
.PHONY: website
################################################################################
# Section for the automated checks
################################################################################
# Create a 'silent-rule' for our make check the same way automake does # Create a 'silent-rule' for our make check the same way automake does
AM_V_CHKOPTS = $(am__v_CHKOPTS_$(V)) AM_V_CHKOPTS = $(am__v_CHKOPTS_$(V))
am__v_CHKOPTS_ = $(am__v_CHKOPTS_$(AM_DEFAULT_VERBOSITY)) am__v_CHKOPTS_ = $(am__v_CHKOPTS_$(AM_DEFAULT_VERBOSITY))
@@ -106,6 +133,8 @@ configure-documentation:
--ignore-prg 'enable-shared,enable-static # should be in INSTALL' \ --ignore-prg 'enable-shared,enable-static # should be in INSTALL' \
--ignore-prg 'disable-option-checking,enable-fast-install # should be in INSTALL' \ --ignore-prg 'disable-option-checking,enable-fast-install # should be in INSTALL' \
--ignore-prg 'disable-libtool-lock,with-pic,with-gnu-ld,with-sysroot # for libtool' \ --ignore-prg 'disable-libtool-lock,with-pic,with-gnu-ld,with-sysroot # for libtool' \
--ignore-prg 'runstatedir #new in autoconf 2.70, backported in Debian' \
--ignore-prg 'with-aix-soname #new in libtool 2.4.4' \
--ignore-prg 'with-x # no use, it would not work without X' --ignore-prg 'with-x # no use, it would not work without X'
.PHONY: configure-documentation .PHONY: configure-documentation
NEWS
+258 -4
View File
@@ -1,7 +1,261 @@
NEWS for veteran Window Maker users NEWS for veteran Window Maker users
----------------------------------- -----------------------------------
-- 0.95.9
Configurable SwitchPanel
------------------------
SwitchPanel is now more configurable: you can configure the switch panel icon
size by setting the "SwitchPanelIconSize" option to your preferred value in
~/GNUstep/Defaults/WindowMaker. The font size used in this panel now is also
sensible to changes in the system font.
New user configuration directory environment variable
-----------------------------------------------------
In previous versions, the GNUstep directory used to store a user's Window Maker
configuration files was specified by the GNUSTEP_USER_ROOT environment variable,
which defaulted to ~/GNUstep. However, this environment variable was deprecated
in gnustep-make v2. Therefore, it has been replaced by the WMAKER_USER_ROOT
environment variable.
libXmu is now an optional dependency
------------------------------------
If the library is not found, compilation work, the only limitation will arise
when trying to install the standard colormap on displays which are not TrueColor.
Please note that if you have the library but not the headers, configure will
still stop; there is no user option to explicitly disable the library use.
-- 0.95.8
Move pointer with maximized windows
-----------------------------------
Implementation for moving mouse pointer within the maximized window.
Mouse pointer can be now moved together with window if keyboard was used for
arrange maximized windows on screen. This feature can be turned on in WPrefs.app
in Expert tab by selecting "Move mouse pointer with half maximized windows.", or
setting "PointerWithHalfMaxWindows" to "Yes" on ~/GNUstep/Defaults/WindowMaker
file.
Alternative way for traverse half-maximized windows
---------------------------------------------------
For now, there could be three possible state of the window while using
half-maximized feature. Unmaximized window have its state saved during that
process, which was use to unmaximize it. For example, if there is a window,
which is maximized on the half left side of the screen, and while requesting
left-half-maximized, it become unmaximized with size and dimension restored to
original state.
By setting "AlternativeHalfMaximized" option to "Yes"
~/GNUstep/Defaults/WindowMaker config file (or by using WPrefs.app and option
"Alternative transitions between states for half maximized windows."), there
would be slightly different change in window "traverse". Given layout depicted
below:
┌┬────────────────────┬┐
├┘ ┌───────┐ ├┤
│ ├───────┤ ├┤
│ │ │ ├┤
│ │ │ ├┤
│ └───────┘ └┤
├┬┐ │
└┴┴────────────────────┘
Window can be moved using keyboard shortcut right-half-maximize:
┌┬─────────┬──────────┬┐
├┘ ├──────────┼┤
│ │ ├┤
│ │ ├┤
│ │ ├┤
│ │ ├┤
├┬┐ └──────────┘│
└┴┴────────────────────┘
Further invoking right-half-maximize will do nothing. Note, that window always
can be unmaximzied using appropriate keyboard shortcut or by selecting
"Unmaximize" from window menu.
Going to opposite direction by invoking left-half-maximize, will make the window
maximized in both, vertical and horizontal directions:
┌─────────────────────┬┐
├─────────────────────┼┤
│ ├┤
│ ├┤
│ ├┤
│ ├┤
├┬┬───────────────────┘│
└┴┴────────────────────┘
Further invoking left-half-maximize, will make the window maximized in half left
side od the screen:
┌──────────┬──────────┬┐
├──────────┤ ├┤
│ │ ├┤
│ │ ├┤
│ │ ├┤
│ │ └┤
├┬┬────────┘ │
└┴┴────────────────────┘
And again, further invoking left-half-maximize, will do nothing in this mode.
This change affects all possible half-maximized window state also quarters.
Issuing bottom-left-corner will take lower left quarter of the screen (nothing
is new so far):
┌┬────────────────────┬┐
├┘ ├┤
│ ├┤
├──────────┐ ├┤
├──────────┤ ├┤
│ │ └┤
├┬┬────────┘ │
└┴┴────────────────────┘
Issuing bottom-right-corner again will change window state to bottom half
maximized:
┌┬────────────────────┬┐
├┘ ├┤
│ ├┤
├─────────────────────┼┤
├─────────────────────┼┤
│ ├┤
├┬┬───────────────────┘│
└┴┴────────────────────┘
Invoking bottom-right-corner again:
┌┬────────────────────┬┐
├┘ ├┤
│ ├┤
│ ┌──────────┼┤
│ ├──────────┼┤
│ │ ├┤
├┬┐ └──────────┘│
└┴┴────────────────────┘
Issuing bottom-right-corner again will have no effect.
Move half-maximized windows between the screens
-----------------------------------------------
New option was introduced to allow change of behaviour of half-maximize windows
in multiple displays environment. In such environment it is more natural that
half maximized windows would travel from one screen to another. Now it is
possible to make that happen by setting an option
"MoveHalfMaximizedWindowsBetweenScreens" to "Yes" in
~/GNUstep/Defaults/WindowMaker config file, or by checking "Allow move
half-maximized windows between multiple screens." in 'Expert User Preferences"
tab in WPrefs.app.
For example, given there are two screens in layout where one display is on the
left and second display is on the right with window on first screen:
┌┬────────────────┬─────────────────┬┐
├┘ ┌───────┐ │ ├┤
│ ├───────┤ │ ├┤
│ │ │ │ ├┤
│ │ │ │ ├┤
│ └───────┘ │ └┤
├┬┐ ├┬┬┐ │
└┴┴───────────────┴┴┴┴───────────────┘
It can be right-half-maximized (using previously defined key combination), so it
become:
┌┬───────┬────────┬─────────────────┬┐
├┘ ├────────┤ ├┤
│ │ │ ├┤
│ │ │ ├┤
│ │ │ ├┤
│ │ │ └┤
├┬┐ └────────┼┬┬┐ │
└┴┴───────────────┴┴┴┴───────────────┘
In this example there is an assumption that WindowMaker is configured, that
maximized windows wont cover mini icons nor dock.
Without setting new option to true, issuing another right-half-maximize will
restore window dimensions and position to the original state (like on the first
figure). With new option set to true it will move window to second screen like:
┌┬────────────────┬────────┬────────┬┐
├┘ ├────────┤ ├┤
│ │ │ ├┤
│ │ │ ├┤
│ │ │ ├┤
│ │ │ └┤
├┬┐ ├┬┬┬─────┘ │
└┴┴───────────────┴┴┴┴───────────────┘
Another activation of right-half-maxmimize:
┌┬────────────────┬────────┬────────┬┐
├┘ │ ├────────┼┤
│ │ │ ├┤
│ │ │ ├┤
│ │ │ ├┤
│ │ │ ├┤
├┬┐ ├┬┬┐ └────────┘│
└┴┴───────────────┴┴┴┴───────────────┘
And final activation of right-half-maxmimize:
┌┬────────────────┬───────┬─────────┬┐
├┘ ├───────┤ ├┤
│ │ │ ├┤
│ │ │ ├┤
│ ├───────┘ ├┤
│ │ └┤
├┬┐ ├┬┬┐ │
└┴┴───────────────┴┴┴┴───────────────┘
Where window is restored its size (but not position, since it it on different
head now). Moving window in directions like left-half-maximize,
top-half-maximize and bottom-half-maximize will behave in similar way depending
on the layout of displays.
Note, that only windows that are half-maximized vertically or horizontally can
be moved to another screen due to the fact, that direction of movement of
quarter-maximized windows is ambiguous. As for vertical/horizontal-maximize,
since doesn't move the window but only stretch it vertically/horizontally this
feature also doesn't apply.
Snapping a window to the top
----------------------------
You can now choose whether snapping a window to the top edge of the screen
maximizes it to the top half (the previous and default behavior) or to the
full screen by setting "SnapToTopMaximizesFullscreen" to "NO" or "YES",
respectively. This setting can also be changed by unchecking or checking
"Snapping a window to the top maximizes it to the full screen" in the
"Expert User Preferences" tab in WPrefs.app.
Global defaults directory configuration
---------------------------------------
You can now configure the global defaults directory, where the system
WindowMaker, WMRootMenu, etc. files are stored, by running
./configure --with-defsdatadir=/path/to/defaults
at build time. The previous method, which only partially worked, involved
defining the GLOBAL_DEFAULTS_SUBDIR macro. This is no longer available.
Note that the default location is ${sysconfdir}/WindowMaker.
-- 0.95.7 -- 0.95.7
Window snapping Window snapping
@@ -1389,7 +1643,7 @@ raising/lowering there is a time threshold before raising/lowering.
The thresholds can be changed in wconfig.h by changing one or both of The thresholds can be changed in wconfig.h by changing one or both of
AUTO_LOWER_DELAY and AUTO_RAISE_DELAY (expressed in milliseconds). AUTO_LOWER_DELAY and AUTO_RAISE_DELAY (expressed in milliseconds).
For example if you set AUTO_RAISE_DELAY to 0, then the Clip will be raised as 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 soon as the mouse pointer enters its area. Setting AUTO_RAISE_DELAY to a very
big value, will make the Clip to practically do not auto raise unless clicked, 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. but to be automatically lowered after AUTO_LOWER_DELAY (ms) when leaved.
@@ -2318,7 +2572,7 @@ The OPEN_MENU command now supports the following syntax:
// it in current position // it in current position
OPEN_MENU file.menu OPEN_MENU file.menu
2. Pipe menu handling. 2. Pipe menu handling.
// opens command and uses it's stdout to construct menu. // opens command and uses its stdout to construct menu.
// Command's output must be a valid menu description. // Command's output must be a valid menu description.
OPEN_MENU | command OPEN_MENU | command
3. Directory handling. 3. Directory handling.
@@ -2921,7 +3175,7 @@ when they are first mapped
titlebar gradients are in a single piece now titlebar gradients are in a single piece now
the WMDock file was merged into the WMState file. You can insert this the WMDock file was merged into the WMState file. You can insert this
file in WMState and set it's key to Dock. For example, if your WMDock file in WMState and set its key to Dock. For example, if your WMDock
contains: contains:
{ {
README
+5 -5
View File
@@ -129,8 +129,8 @@ HELP ME!!!
========== ==========
There is a mailing list for discussing Window Maker at There is a mailing list for discussing Window Maker at
wmaker-user@lists.windowmaker.org To subscribe to it, send a message to wmaker-user@googlegroups.com. To subscribe to it, visit
wmaker-user-subscribe@lists.windowmaker.org https://groups.google.com/forum/#!forum/wmaker-user
If you got a problem, ask there (after reading the docs, of course). The people If you got a problem, ask there (after reading the docs, of course). The people
there is more likely to be able to answer your questions than we are. For bug there is more likely to be able to answer your questions than we are. For bug
@@ -178,7 +178,7 @@ Running multiple instances of Window Maker
It is not a good idea to run more than one instance of Window Maker It is not a good idea to run more than one instance of Window Maker
from the same user (so that wmaker will use the same configuration files) at the from the same user (so that wmaker will use the same configuration files) at the
same time. You might get unexpected behavior when Window Maker updates it's same time. You might get unexpected behavior when Window Maker updates its
configuration files. configuration files.
If you really desire to do this, try running Window Maker with the command line If you really desire to do this, try running Window Maker with the command line
@@ -209,7 +209,7 @@ while keeping a nice appearance and good functionality, follow the items bellow:
- remove support for image formats you don't use - remove support for image formats you don't use
- to reduce memory usage, disable the icon cache, by setting the RIMAGE_CACHE - to reduce memory usage, disable the icon cache, by setting the RIMAGE_CACHE
environment variable to 0. If you want to increase performance at the cost of environment variable to 0. If you want to increase performance at the cost of
memory usage, set it's value to a value like the number of different icons you memory usage, set its value to a value like the number of different icons you
use. Also, disable anti-aliased text support in ~/GNUstep/Defaults/WMGLOBAL. use. Also, disable anti-aliased text support in ~/GNUstep/Defaults/WMGLOBAL.
@@ -311,5 +311,5 @@ project. The name of people who have helped with localization (translation) can
be found in po/README and Window Maker/README be found in po/README and Window Maker/README
If you have any comments, fixes and bug reports (filled BUGFORMs) send them If you have any comments, fixes and bug reports (filled BUGFORMs) send them
to wmaker-dev@lists.windowmaker.org to wmaker-dev@googlegroups.com
The-perfect-Window-Maker-patch.txt
+2 -2
View File
@@ -134,7 +134,7 @@ Sending the patch to the mailing list
Send your patches to: Send your patches to:
wmaker-dev@lists.windowmaker.org wmaker-dev@googlegroups.com
Please do not send patches to any individual developer unless you have a very Please do not send patches to any individual developer unless you have a very
good reason to avoid more people being able to comment (and improve) on your good reason to avoid more people being able to comment (and improve) on your
@@ -147,7 +147,7 @@ you, otherwise you may face the problems below. Doing this is really easy:
# (of course, replace smtp.example.com with your ISP's) # (of course, replace smtp.example.com with your ISP's)
git config --global sendemail.smtpserver "smtp.example.com" git config --global sendemail.smtpserver "smtp.example.com"
git config --global sendemail.validate true git config --global sendemail.validate true
git config sendemail.to "Window Maker Devel <wmaker-dev@lists.windowmaker.org>" git config sendemail.to "Window Maker Devel <wmaker-dev@googlegroups.com>"
# If you're sending more than 1 patch, you may be interested in having an # If you're sending more than 1 patch, you may be interested in having an
# introduction mail for the batch: # introduction mail for the batch:
WINGs/Examples/Makefile.am
+1 -1
View File
@@ -8,7 +8,7 @@ noinst_PROGRAMS = fontl puzzle colorpick
LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \ LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
$(top_builddir)/WINGs/libWUtil.la \ $(top_builddir)/WINGs/libWUtil.la \
@XFTLIBS@ @INTLIBS@ @XLIBS@ @XFT_LIBS@ @INTLIBS@ @XLIBS@
colorpick_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la colorpick_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
WINGs/Extras/Makefile.am
+1 -1
View File
@@ -25,6 +25,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs \
LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \ LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
$(top_builddir)/WINGs/libWUtil.la \ $(top_builddir)/WINGs/libWUtil.la \
@XFTLIBS@ @INTLIBS@ @XFT_LIBS@ @INTLIBS@
test_LDADD = wtableview.o wtabledelegates.o $(LDADD) test_LDADD = wtableview.o wtabledelegates.o $(LDADD)
WINGs/Makefile.am
+7 -8
View File
@@ -8,13 +8,11 @@ DIST_SUBDIRS = $(SUBDIRS) Tests Examples Extras
libWINGs_la_LDFLAGS = -version-info @WINGS_VERSION@ libWINGs_la_LDFLAGS = -version-info @WINGS_VERSION@
libWUtil_la_LDFLAGS = -version-info @WUTIL_VERSION@ libWUtil_la_LDFLAGS = -version-info @WUTIL_VERSION@
dist_bin_SCRIPTS = get-wings-flags get-wutil-flags
lib_LTLIBRARIES = libWUtil.la libWINGs.la lib_LTLIBRARIES = libWUtil.la libWINGs.la
LDADD= libWUtil.la libWINGs.la $(top_builddir)/wrlib/libwraster.la @INTLIBS@ LDADD= libWUtil.la libWINGs.la $(top_builddir)/wrlib/libwraster.la @INTLIBS@
libWINGs_la_LIBADD = libWUtil.la $(top_builddir)/wrlib/libwraster.la @XLIBS@ @XFTLIBS@ @FCLIBS@ @LIBM@ @PANGOLIBS@ libWINGs_la_LIBADD = libWUtil.la $(top_builddir)/wrlib/libwraster.la @XLIBS@ @XFT_LIBS@ @FCLIBS@ @LIBM@ @PANGO_LIBS@
libWUtil_la_LIBADD = @LIBBSD@ libWUtil_la_LIBADD = @LIBBSD@
EXTRA_DIST = BUGS make-rgb Examples Extras Tests EXTRA_DIST = BUGS make-rgb Examples Extras Tests
@@ -89,11 +87,12 @@ libWUtil_la_SOURCES = \
wutil.c wutil.c
AM_CFLAGS = AM_CFLAGS = @PANGO_CFLAGS@
AM_CPPFLAGS = -DRESOURCE_PATH=\"$(datadir)/WINGs\" \ AM_CPPFLAGS = -DRESOURCE_PATH=\"$(datadir)/WINGs\" \
-I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \ -I$(top_srcdir)/WINGs/WINGs -I$(top_builddir)/WINGs/WINGs \
@XFTFLAGS@ @HEADER_SEARCH_PATH@ -I$(top_builddir)/wrlib -I$(top_srcdir)/src \
@XFT_CFLAGS@ @HEADER_SEARCH_PATH@
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = WINGs.pc WUtil.pc pkgconfig_DATA = WINGs.pc WUtil.pc
@@ -107,8 +106,8 @@ WINGs.pc: Makefile
@echo 'Version: $(VERSION)' >> $@ @echo 'Version: $(VERSION)' >> $@
@echo 'Requires: wrlib WUtil' >> $@ @echo 'Requires: wrlib WUtil' >> $@
@echo 'Libs: $(lib_search_path) -lWINGs' >> $@ @echo 'Libs: $(lib_search_path) -lWINGs' >> $@
@echo 'Libs.private: $(XFTLIBS) $(PANGOLIBS) $(XLIBS) -lm $(INTLIBS)' >> $@ @echo 'Libs.private: $(XFT_LIBS) $(PANGOLIBS) $(XLIBS) -lm $(INTLIBS)' >> $@
@echo 'Cflags: $(inc_search_path)' >> $@ @echo 'Cflags: $(inc_search_path) @PANGO_CFLAGS@' >> $@
WUtil.pc: Makefile WUtil.pc: Makefile
@echo "Generating $@" @echo "Generating $@"
WINGs/README
+6 -6
View File
@@ -8,25 +8,25 @@
kojima@windowmaker.info kojima@windowmaker.info
WINGs is a small widget set with the N*XTSTEP look and feel. It's API WINGs is a small widget set with the N*XTSTEP look and feel. Its API
is inspired in OpenStep and it's implementation borrows some ideas is inspired in OpenStep and its implementation borrows some ideas
from Tk. It has a reasonable set of widgets, sufficient for building from Tk. It has a reasonable set of widgets, sufficient for building
small applications (like a CDPlayer or hacking something like rxvt). It small applications (like a CDPlayer or hacking something like rxvt). It
also has other functions that are usefull for applications, like a also has other functions that are usefull for applications, like a
User Defaults alike configuration manager and a notification system. User Defaults alike configuration manager and a notification system.
The library is limited and it's design is a little sloppy, The library is limited and its design is a little sloppy,
so it's not intended to build large or complex applications, like so it's not intended to build large or complex applications, like
anything more complex than a CDPlayer. GNUstep should be used for such anything more complex than a CDPlayer. GNUstep should be used for such
applications. applications.
Since WINGs is written in C and is sort of low-level it is small Since WINGs is written in C and is sort of low-level it is small
and faster than say, Motif or even Athena. Knowing Xlib will help you to and faster than say, Motif or even Athena. Knowing Xlib will help you to
workaround some of it's limitations, although you'll probably be able to workaround some of its limitations, although you'll probably be able to
write something like a trivial tic-tac-toe game without knowing much Xlib. write something like a trivial tic-tac-toe game without knowing much Xlib.
Some of it's functions are designed to support the Window Maker window Some of its functions are designed to support the Window Maker window
manager (see http://windowmaker.info) In fact, it's primary role is to manager (see http://windowmaker.info) In fact, its primary role is to
support Window Maker. All other uses of it are just an added bonus. support Window Maker. All other uses of it are just an added bonus.
It will help you to understand the API if you read the ApplicationKit It will help you to understand the API if you read the ApplicationKit
WINGs/Tests/Makefile.am
+2 -2
View File
@@ -6,7 +6,7 @@ noinst_PROGRAMS = wtest wmquery wmfile testmywidget
LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \ LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
$(top_builddir)/WINGs/libWUtil.la \ $(top_builddir)/WINGs/libWUtil.la \
@XFTLIBS@ @INTLIBS@ @XLIBS@ @XFT_LIBS@ @INTLIBS@ @XLIBS@
testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h
@@ -17,4 +17,4 @@ wtest_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
EXTRA_DIST = logo.xpm upbtn.xpm wm.html wm.png EXTRA_DIST = logo.xpm upbtn.xpm wm.html wm.png
AM_CPPFLAGS = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \ AM_CPPFLAGS = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
-DRESOURCE_PATH=\"$(datadir)/WINGs\" @XFTFLAGS@ @HEADER_SEARCH_PATH@ -DRESOURCE_PATH=\"$(datadir)/WINGs\" @XFT_CFLAGS@ @HEADER_SEARCH_PATH@
WINGs/WINGs/Makefile.am
+11 -1
View File
@@ -5,4 +5,14 @@ AUTOMAKE_OPTIONS =
# is this a kluge? if so, how should i do it? # is this a kluge? if so, how should i do it?
includedir = @includedir@/WINGs includedir = @includedir@/WINGs
include_HEADERS = WINGs.h WUtil.h WINGsP.h BUILT_SOURCES = WINGsP.h
CLEANFILES = WINGsP.h
include_HEADERS = WINGs.h WUtil.h
nodist_include_HEADERS = WINGsP.h
EXTRA_DIST = WINGsP.h.in
WINGsP.h: WINGsP.h.in $(top_builddir)/config.h
$(AM_V_GEN)$(top_srcdir)/script/replace-ac-keywords.sh \
--header "$(top_builddir)/config.h" \
--filter "USE_PANGO" \
-o $@ $<
WINGs/WINGs/WINGs.h
+9
View File
@@ -795,6 +795,8 @@ char* WMGetFontName(WMFont *font);
unsigned int WMFontHeight(WMFont *font); unsigned int WMFontHeight(WMFont *font);
void WMGetScaleBaseFromSystemFont(WMScreen *scrPtr, int *alphabetWidth, int *fontHeight);
void WMSetWidgetDefaultFont(WMScreen *scr, WMFont *font); void WMSetWidgetDefaultFont(WMScreen *scr, WMFont *font);
void WMSetWidgetDefaultBoldFont(WMScreen *scr, WMFont *font); void WMSetWidgetDefaultBoldFont(WMScreen *scr, WMFont *font);
@@ -1839,10 +1841,17 @@ WMAlertPanel* WMCreateAlertPanel(WMScreen *app, WMWindow *owner, const char *tit
const char *msg, const char *defaultButton, const char *msg, const char *defaultButton,
const char *alternateButton, const char *otherButton); const char *alternateButton, const char *otherButton);
WMAlertPanel* WMCreateScaledAlertPanel(WMScreen *app, WMWindow *owner, const char *title,
const char *msg, const char *defaultButton,
const char *alternateButton, const char *otherButton);
WMInputPanel* WMCreateInputPanel(WMScreen *app, WMWindow *owner, const char *title, WMInputPanel* WMCreateInputPanel(WMScreen *app, WMWindow *owner, const char *title,
const char *msg, const char *defaultText, const char *okButton, const char *msg, const char *defaultText, const char *okButton,
const char *cancelButton); const char *cancelButton);
WMInputPanel* WMCreateScaledInputPanel(WMScreen *app, WMWindow *owner, const char *title,
const char *msg, const char *defaultText, const char *okButton,
const char *cancelButton);
WMGenericPanel* WMCreateGenericPanel(WMScreen *scrPtr, WMWindow *owner, WMGenericPanel* WMCreateGenericPanel(WMScreen *scrPtr, WMWindow *owner,
const char *title, const char *defaultButton, const char *title, const char *defaultButton,
WINGs/WINGs/WINGsP.h → WINGs/WINGs/WINGsP.h.in
+2 -6
View File
@@ -5,9 +5,7 @@
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
#ifdef USE_PANGO @USE_PANGO@#include <pango/pango.h>
#include <pango/pango.h>
#endif
#include <WINGs/WINGs.h> #include <WINGs/WINGs.h>
@@ -459,9 +457,7 @@ typedef struct W_Font {
short refCount; short refCount;
char *name; char *name;
#ifdef USE_PANGO @USE_PANGO@ PangoLayout *layout;
PangoLayout *layout;
#endif
} W_Font; } W_Font;
#define W_FONTID(f) (f)->font->fid #define W_FONTID(f) (f)->font->fid
WINGs/WINGs/WUtil.h
+10
View File
@@ -193,6 +193,16 @@ typedef void WMNotificationObserverAction(void *observerData,
sizeof(array) / sizeof(array[0]); \ sizeof(array) / sizeof(array[0]); \
}) })
/* These macros can be used to adjust the location and size pixel values in
* the panel layouts so that they match the configured size of the system
* font (useful with high DPI screens, where you have to increase this size).
* The macros require two local variables to be set:
* wmScaleWidth: the width of the alphabet in the current system font
* wmScaleHeight: the height of the current system font
* Use the WMGetScaleBaseFromSystemFont function to set these values.
*/
#define WMScaleX(value) ((int)((double)value / 177.0 * (double)wmScaleWidth + 0.5))
#define WMScaleY(value) ((int)((double)value / 15.0 * (double)wmScaleHeight + 0.5))
/* ---[ WINGs/memory.c ]-------------------------------------------------- */ /* ---[ WINGs/memory.c ]-------------------------------------------------- */
WINGs/get-wings-flags
-33
View File
@@ -1,33 +0,0 @@
#!/bin/sh
# [Christophe CURIS, 2015/01/31]
# This script is now reporting itself as deprecated (this should have been done
# a long time ago), so it should be kept for at least 2 years from now in order
# to allow users to update their scripts, and then removed.
if test $# -eq 0; then
echo "Error: $0 is deprecated, please use 'pkg-config WINGs ...'" >&2
exit 1
fi
while test $# -gt 0; do
case $1 in
--cflags)
echo "Warning: $0 is deprecated, please use 'pkg-config WINGs --cflags'" >&2
pkg-config WINGs --cflags
;;
--ldflags|--lflags)
echo "Warning: $0 is deprecated, please use 'pkg-config WINGs --libs'" >&2
pkg-config WINGs --libs-only-L
;;
--libs)
echo "Warning: $0 is deprecated, please use 'pkg-config WINGs --libs'" >&2
pkg-config WINGs --libs
;;
*)
echo "Error: $0 is deprecated, please use 'pkg-config WINGs ...'" >&2
exit 1
;;
esac
shift
done
WINGs/get-wutil-flags
-33
View File
@@ -1,33 +0,0 @@
#!/bin/sh
# [Christophe CURIS, 2015/01/31]
# This script is now reporting itself as deprecated (this should have been done
# a long time ago), so it should be kept for at least 2 years from now in order
# to allow users to update their scripts, and then removed.
if test $# -eq 0; then
echo "Error: $0 is deprecated, please use 'pkg-config WUtil ...'" >&2
exit 1
fi
while test $# -gt 0; do
case $1 in
--cflags)
echo "Warning: $0 is deprecated, please use 'pkg-config WUtil --cflags'" >&2
pkg-config WUtil --cflags
;;
--ldflags|--lflags)
echo "Warning: $0 is deprecated, please use 'pkg-config WUtil --libs'" >&2
pkg-config WUtil --libs-only-L
;;
--libs)
echo "Warning: $0 is deprecated, please use 'pkg-config WUtil --libs'" >&2
pkg-config WUtil --libs
;;
*)
echo "Error: $0 is deprecated, please use 'pkg-config WUtil ...'" >&2
exit 1
;;
esac
shift
done
WINGs/memory.c
+2 -1
View File
@@ -107,7 +107,8 @@ void *wmalloc(size_t size)
} }
} }
} }
memset(tmp, 0, size); if (tmp != NULL)
memset(tmp, 0, size);
return tmp; return tmp;
} }
WINGs/po/fy.po
+33 -72
View File
@@ -1,14 +1,14 @@
# Translation into Western Frisian for Window Maker # Translation into Western Frisian for Window Maker
# Copyright (C) 2015 Window Maker Developers Team # Copyright (C) 2015-2016 Window Maker Developers Team
# This file is distributed under the same license as the windowmaker package. # This file is distributed under the same license as the windowmaker package.
# Original by Alwin <translations@ziggo.nl>, 2015. # Original by Alwin <translations@ziggo.nl>, 2015.
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: wmaker-0.95.6+\n" "Project-Id-Version: wmaker-0.95.7+\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-06-14 16:10+0200\n" "POT-Creation-Date: 2016-01-21 16:19+0100\n"
"PO-Revision-Date: 2015-06-14 00:00+0000\n" "PO-Revision-Date: 2016-01-21 00:00+0000\n"
"Last-Translator: Alwin <translations@ziggo.nl>\n" "Last-Translator: Alwin <translations@ziggo.nl>\n"
"Language-Team: Western Frisian\n" "Language-Team: Western Frisian\n"
"Language: fy\n" "Language: fy\n"
@@ -99,7 +99,7 @@ msgstr "foartidich bestânsein, ferwachte in nije rigel nei '\\'"
#, c-format #, c-format
msgid "reached end of file while searching '*/' for comment started at line %d" msgid "reached end of file while searching '*/' for comment started at line %d"
msgstr "" msgstr ""
"bestânsein berikt by sykje nei '*/' foar kommentaar begûnen op rigel %d" "bestânsein berikt by sykjen nei '*/' foar kommentaar begûnen op rigel %d"
#: ../../WINGs/menuparser.c:344 #: ../../WINGs/menuparser.c:344
msgid "missing closing double-quote before end-of-line" msgid "missing closing double-quote before end-of-line"
@@ -111,7 +111,7 @@ msgstr "ûntbrekkend slutend inkeld oanhelteken foar rigelein"
#: ../../WINGs/menuparser.c:380 #: ../../WINGs/menuparser.c:380
msgid "too many nested macro expansions, breaking loop" msgid "too many nested macro expansions, breaking loop"
msgstr "te folle neste makro-útwurkingen, syklus ôfbrutsen" msgstr "te folle neske makro-útwurkingen, syklus ôfbrutsen"
#: ../../WINGs/menuparser.c:439 #: ../../WINGs/menuparser.c:439
#, c-format #, c-format
@@ -140,7 +140,7 @@ msgstr "ûntbrekkende slutende '%c' yn bestânsnammeopjefte"
#: ../../WINGs/menuparser.c:503 #: ../../WINGs/menuparser.c:503
msgid "too many nested #include's" msgid "too many nested #include's"
msgstr "te folle neste #include's" msgstr "te folle neske #include's"
#: ../../WINGs/menuparser.c:568 #: ../../WINGs/menuparser.c:568
#, c-format #, c-format
@@ -150,11 +150,11 @@ msgstr "koe bestân \"%s\" net fine foar #include"
#: ../../WINGs/menuparser.c:589 #: ../../WINGs/menuparser.c:589
#, c-format #, c-format
msgid "missing macro name argument to #%s" msgid "missing macro name argument to #%s"
msgstr "ûntbrekkend makronammeargumint by #%s" msgstr "ûntbrekkend makronamme-argumint by #%s"
#: ../../WINGs/menuparser.c:600 #: ../../WINGs/menuparser.c:600
msgid "too many nested #if sequences" msgid "too many nested #if sequences"
msgstr "te folle neste #if-rigen" msgstr "te folle neske #if-rigen"
#: ../../WINGs/menuparser.c:626 ../../WINGs/menuparser.c:643 #: ../../WINGs/menuparser.c:626 ../../WINGs/menuparser.c:643
#, c-format #, c-format
@@ -168,7 +168,7 @@ msgstr "gjin makronamme fûn foar #define"
#: ../../WINGs/menuparser_macros.c:187 #: ../../WINGs/menuparser_macros.c:187
#, c-format #, c-format
msgid "premature end of file while reading arg-list for macro \"%s\"" msgid "premature end of file while reading arg-list for macro \"%s\""
msgstr "foartidich bestânsein by ynlêze arg.-list foar makro \"%s\"" msgstr "foartidich bestânsein by ynlêzen arg.-list foar makro \"%s\""
#: ../../WINGs/menuparser_macros.c:194 #: ../../WINGs/menuparser_macros.c:194
#, c-format #, c-format
@@ -196,7 +196,7 @@ msgstr ""
#: ../../WINGs/menuparser_macros.c:253 #: ../../WINGs/menuparser_macros.c:253
#, c-format #, c-format
msgid "macro \"%s\" already defined, ignoring redefinition" msgid "macro \"%s\" already defined, ignoring redefinition"
msgstr "makro \"%s\" al definiearre, negearret werdefiniearje" msgstr "makro \"%s\" al definiearre, negearret werdefiniearjen"
#: ../../WINGs/menuparser_macros.c:346 #: ../../WINGs/menuparser_macros.c:346
#, c-format #, c-format
@@ -225,7 +225,7 @@ msgstr "te folle arguminten foar makro \"%s\", ferwachte allinnich %d"
#: ../../WINGs/menuparser_macros.c:530 #: ../../WINGs/menuparser_macros.c:530
#, c-format #, c-format
msgid "premature end of line while searching for arguments to macro \"%s\"" msgid "premature end of line while searching for arguments to macro \"%s\""
msgstr "foartidich rigelein by sykje nei arguminten by makro \"%s\"" msgstr "foartidich rigelein by sykjen nei arguminten by makro \"%s\""
#: ../../WINGs/menuparser_macros.c:536 #: ../../WINGs/menuparser_macros.c:536
#, c-format #, c-format
@@ -345,7 +345,7 @@ msgstr "koe grutte foar bestân '%s' net krije"
#: ../../WINGs/proplist.c:1531 #: ../../WINGs/proplist.c:1531
#, c-format #, c-format
msgid "error reading from file '%s'" msgid "error reading from file '%s'"
msgstr "flater by ynlêze bestân '%s'" msgstr "flater by ynlêzen bestân '%s'"
#: ../../WINGs/proplist.c:1578 #: ../../WINGs/proplist.c:1578
#, c-format #, c-format
@@ -355,32 +355,32 @@ msgstr "%s:koe menubestân net iepenje"
#: ../../WINGs/proplist.c:1660 #: ../../WINGs/proplist.c:1660
#, c-format #, c-format
msgid "mkstemp (%s) failed" msgid "mkstemp (%s) failed"
msgstr "oanmeitsje unyk tydlik bestân (%s) mislearre" msgstr "oanmeitsjen unyk tydlik bestân (%s) mislearre"
#: ../../WINGs/proplist.c:1670 #: ../../WINGs/proplist.c:1670
#, c-format #, c-format
msgid "mktemp (%s) failed" msgid "mktemp (%s) failed"
msgstr "oanmeitsje tydlik bestân (%s) mislearre" msgstr "oanmeitsjen tydlik bestân (%s) mislearre"
#: ../../WINGs/proplist.c:1677 #: ../../WINGs/proplist.c:1677
#, c-format #, c-format
msgid "open (%s) failed" msgid "open (%s) failed"
msgstr "iepenje (%s) mislearre" msgstr "iepenjen (%s) mislearre"
#: ../../WINGs/proplist.c:1684 #: ../../WINGs/proplist.c:1684
#, c-format #, c-format
msgid "writing to file: %s failed" msgid "writing to file: %s failed"
msgstr "skriuwe nei bestân: %s mislearre" msgstr "skriuwen nei bestân: %s mislearre"
#: ../../WINGs/proplist.c:1693 #: ../../WINGs/proplist.c:1693
#, c-format #, c-format
msgid "fclose (%s) failed" msgid "fclose (%s) failed"
msgstr "ôfslute stream (%s) mislearre" msgstr "ôfsluten stream (%s) mislearre"
#: ../../WINGs/proplist.c:1701 #: ../../WINGs/proplist.c:1701
#, c-format #, c-format
msgid "rename ('%s' to '%s') failed" msgid "rename ('%s' to '%s') failed"
msgstr "omneame ('%s' nei '%s') mislearre" msgstr "omneamen ('%s' nei '%s') mislearre"
#: ../../WINGs/proplist.c:1772 #: ../../WINGs/proplist.c:1772
#, c-format #, c-format
@@ -388,14 +388,14 @@ msgid "Could not create component %s"
msgstr "Koe komponint %s net oanmeitsje" msgstr "Koe komponint %s net oanmeitsje"
#: ../../WINGs/userdefaults.c:72 #: ../../WINGs/userdefaults.c:72
msgid "variable GNUSTEP_USER_ROOT defined with invalid path, not used" msgid "variable WMAKER_USER_ROOT defined with invalid path, not used"
msgstr "fariabele GNUSTEP_USER_ROOT, definiearre mei ûnjildich paad, net brûkt" msgstr "fariabele WMAKER_USER_ROOT, definiearre mei ûnjildich paad, net brûkt"
#. something happened with the file. just overwrite it #. something happened with the file. just overwrite it
#: ../../WINGs/userdefaults.c:210 ../../WINGs/userdefaults.c:225 #: ../../WINGs/userdefaults.c:210 ../../WINGs/userdefaults.c:225
#, c-format #, c-format
msgid "cannot read domain from file '%s' when syncing" msgid "cannot read domain from file '%s' when syncing"
msgstr "kin domeinbestân '%s' net ynlêze by syngronisearje" msgstr "kin domeinbestân '%s' net ynlêze by syngronisearjen"
#: ../../WINGs/dragcommon.c:60 #: ../../WINGs/dragcommon.c:60
#, c-format #, c-format
@@ -414,11 +414,11 @@ msgstr "net-stipe ferzje %i foar XDND-berjocht by binnen gean"
#: ../../WINGs/dragsource.c:163 #: ../../WINGs/dragsource.c:163
msgid "XDND selection lost during drag operation..." msgid "XDND selection lost during drag operation..."
msgstr "XDND-seleksje ferlern by fersleephanneling..." msgstr "XDND-seleksje ferlern ûnder fersleephanneling..."
#: ../../WINGs/dragsource.c:758 #: ../../WINGs/dragsource.c:758
msgid "could not get XDND version for target of drop" msgid "could not get XDND version for target of drop"
msgstr "koe XDND-ferzje net krije foar doel fan ferslepe" msgstr "koe XDND-ferzje net krije foar doel fan ferslepen"
#: ../../WINGs/dragsource.c:774 #: ../../WINGs/dragsource.c:774
msgid "could not get ownership of XDND selection" msgid "could not get ownership of XDND selection"
@@ -456,7 +456,7 @@ msgstr "Kleuren"
#: ../../WINGs/wcolorpanel.c:568 ../../WINGs/wcolorpanel.c:2720 #: ../../WINGs/wcolorpanel.c:568 ../../WINGs/wcolorpanel.c:2720
msgid "Brightness" msgid "Brightness"
msgstr "Helderheid" msgstr "Helderens"
#: ../../WINGs/wcolorpanel.c:570 ../../WINGs/wcolorpanel.c:644 #: ../../WINGs/wcolorpanel.c:570 ../../WINGs/wcolorpanel.c:644
#: ../../WINGs/wcolorpanel.c:675 ../../WINGs/wcolorpanel.c:706 #: ../../WINGs/wcolorpanel.c:675 ../../WINGs/wcolorpanel.c:706
@@ -558,7 +558,7 @@ msgstr "Nij..."
msgid "" msgid ""
"Color Panel: Could not create directory %s needed to store configurations" "Color Panel: Could not create directory %s needed to store configurations"
msgstr "" msgstr ""
"Kleurepaniel: Koe map %s, nedich om ynstellingen te bewarje, net oanmeitsje" "Kleurepaniel: Koe map %s, nedich om ynstellingen te bewarjen, net oanmeitsje"
#. Delete the file, it doesn't belong here #. Delete the file, it doesn't belong here
#: ../../WINGs/wcolorpanel.c:1176 ../../WINGs/wcolorpanel.c:3073 #: ../../WINGs/wcolorpanel.c:1176 ../../WINGs/wcolorpanel.c:3073
@@ -568,7 +568,7 @@ msgstr "Bestânsflater"
#: ../../WINGs/wcolorpanel.c:1177 #: ../../WINGs/wcolorpanel.c:1177
msgid "Could not create ColorPanel configuration directory" msgid "Could not create ColorPanel configuration directory"
msgstr "Koe ynstellingenmap Kleurepaniel net oanmeitsje" msgstr "Koe ynstellingemap Kleurepaniel net oanmeitsje"
#: ../../WINGs/wcolorpanel.c:1178 ../../WINGs/wcolorpanel.c:3074 #: ../../WINGs/wcolorpanel.c:1178 ../../WINGs/wcolorpanel.c:3074
#: ../../WINGs/wcolorpanel.c:3079 ../../WINGs/wcolorpanel.c:3104 #: ../../WINGs/wcolorpanel.c:3079 ../../WINGs/wcolorpanel.c:3104
@@ -593,7 +593,7 @@ msgstr "Fersêding"
#: ../../WINGs/wcolorpanel.c:2788 #: ../../WINGs/wcolorpanel.c:2788
msgid "Hue" msgid "Hue"
msgstr "Tinte" msgstr "Tint"
#: ../../WINGs/wcolorpanel.c:3012 #: ../../WINGs/wcolorpanel.c:3012
msgid "Open Palette" msgid "Open Palette"
@@ -610,7 +610,7 @@ msgstr "kin bestân %s net ferwiderje"
#: ../../WINGs/wcolorpanel.c:3078 #: ../../WINGs/wcolorpanel.c:3078
msgid "Couldn't remove file from Configuration Directory !" msgid "Couldn't remove file from Configuration Directory !"
msgstr "Koe bestân net ferwiderje út ynstellingenmap!" msgstr "Koe bestân net ferwiderje út ynstellingemap!"
#: ../../WINGs/wcolorpanel.c:3103 #: ../../WINGs/wcolorpanel.c:3103
msgid "Rename" msgid "Rename"
@@ -737,12 +737,12 @@ msgstr "Bestân"
#: ../../WINGs/wfilepanel.c:719 #: ../../WINGs/wfilepanel.c:719
#, c-format #, c-format
msgid "Removing %s failed: %s" msgid "Removing %s failed: %s"
msgstr "Ferwiderje %s mislearre: %s" msgstr "Ferwiderjen %s mislearre: %s"
#: ../../WINGs/wfilepanel.c:751 #: ../../WINGs/wfilepanel.c:751
#, c-format #, c-format
msgid "An error occurred browsing '%s'." msgid "An error occurred browsing '%s'."
msgstr "Der trede in flater op by blêdzje troch '%s'." msgstr "Der trede in flater op by blêdzjen troch '%s'."
#: ../../WINGs/wfilepanel.c:754 #: ../../WINGs/wfilepanel.c:754
#, c-format #, c-format
@@ -799,7 +799,7 @@ msgstr "Koe biblioteek 'lettertype ynstelle' net inisjalisearje\n"
#: ../../WINGs/widgets.c:446 #: ../../WINGs/widgets.c:446
#, c-format #, c-format
msgid "WINGs: could not load widget images file: %s" msgid "WINGs: could not load widget images file: %s"
msgstr "WINGs: Koe ôfbyldingenbestân bestjoeringseleminten net lade: %s" msgstr "WINGs: Koe ôfbyldingebestân bestjoeringseleminten net lade: %s"
#: ../../WINGs/widgets.c:542 #: ../../WINGs/widgets.c:542
#, c-format #, c-format
@@ -824,7 +824,7 @@ msgstr "0 inch"
#: ../../WINGs/wtextfield.c:494 #: ../../WINGs/wtextfield.c:494
msgid "only left alignment is supported in textfields" msgid "only left alignment is supported in textfields"
msgstr "allinnich lofts rjochtsje wurdt stipe yn tekstfjilden" msgstr "allinnich lofts rjochtsjen wurdt stipe yn tekstfjilden"
#: ../../WINGs/wwindow.c:160 #: ../../WINGs/wwindow.c:160
msgid "window title conversion error... using STRING encoding" msgid "window title conversion error... using STRING encoding"
@@ -833,42 +833,3 @@ msgstr "finstertitelomsettingsflater... brûkt STRING-kodearring"
#: ../../WINGs/wwindow.c:181 #: ../../WINGs/wwindow.c:181
msgid "icon title conversion error... using STRING encoding" msgid "icon title conversion error... using STRING encoding"
msgstr "ikoantitelomsettingsflater... brûkt STRING-kodearring" msgstr "ikoantitelomsettingsflater... brûkt STRING-kodearring"
# Keep next entries for wmaker-0.95.6
msgid "Could not open input file \"%s\""
msgstr "Koe ynfierbestân \"%s\" net iepenje"
msgid "Could not create target file \"%s\""
msgstr "Koe doelbestân \"%s\" net oanmeitsje"
msgid "An error occured browsing '%s'."
msgstr "Der trede in flater op by blêdzje troch '%s'."
msgid ""
"invalid characted '%c' in arg-list for macro \"%s\" while expecting "
"parameter name"
msgstr ""
"ûnjildich letterteken '%c' yn arg.-list foar makro \"%s\", ferwachte "
"parameternamme"
msgid ""
"invalid characted '%c' in arg-list for macro \"%s\" while expecting ',' "
"or ')'"
msgstr ""
"ûnjildich letterteken '%c' yn arg.-list foar makro \"%s\", ferwachte ',' "
"of ')'"
msgid "unknow directive '#%s'"
msgstr "ûnbekende oanwizing '#%s'"
msgid "found #%s but have no matching #if"
msgstr "#%s fûn, mar hat gjin bybehearrende #if"
msgid "too many nested includes"
msgstr "te folle neste #include's"
msgid "could not find file \"%s\" for include"
msgstr "koe bestân \"%s\" net fine foar #include"
msgid "too many nested macro expansion, breaking loop"
msgstr "te folle neste makro-útwurkingen, syklus ôfbrutsen"
WINGs/po/hu.po
+2 -2
View File
@@ -197,8 +197,8 @@ msgid "Could not create component %s"
msgstr "Nem sikerült létrehozni a %s elemet" msgstr "Nem sikerült létrehozni a %s elemet"
#: ../../../wmaker-crm/WINGs/userdefaults.c:65 #: ../../../wmaker-crm/WINGs/userdefaults.c:65
msgid "variable GNUSTEP_USER_ROOT defined with invalid path, not used" msgid "variable WMAKER_USER_ROOT defined with invalid path, not used"
msgstr "A GNUSTEP_USER_ROOT változó be van állítva, de rossz értékre. Nem használom" msgstr "A WMAKER_USER_ROOT változó be van állítva, de rossz értékre. Nem használom"
#. something happened with the file. just overwrite it #. something happened with the file. just overwrite it
#: ../../../wmaker-crm/WINGs/userdefaults.c:196 #: ../../../wmaker-crm/WINGs/userdefaults.c:196
WINGs/po/nl.po
+2 -2
View File
@@ -389,9 +389,9 @@ msgid "Could not create component %s"
msgstr "Kon component %s niet aanmaken" msgstr "Kon component %s niet aanmaken"
#: ../../WINGs/userdefaults.c:72 #: ../../WINGs/userdefaults.c:72
msgid "variable GNUSTEP_USER_ROOT defined with invalid path, not used" msgid "variable WMAKER_USER_ROOT defined with invalid path, not used"
msgstr "" msgstr ""
"variabele GNUSTEP_USER_ROOT, gedefinieerd met ongeldig pad, niet gebruikt" "variabele WMAKER_USER_ROOT, gedefinieerd met ongeldig pad, niet gebruikt"
#. something happened with the file. just overwrite it #. something happened with the file. just overwrite it
#: ../../WINGs/userdefaults.c:210 ../../WINGs/userdefaults.c:225 #: ../../WINGs/userdefaults.c:210 ../../WINGs/userdefaults.c:225
WINGs/proplist.c
+21 -8
View File
@@ -1253,22 +1253,34 @@ int WMGetPropListItemCount(WMPropList * plist)
Bool WMIsPLString(WMPropList * plist) Bool WMIsPLString(WMPropList * plist)
{ {
return (plist->type == WPLString); if (plist)
return (plist->type == WPLString);
else
return False;
} }
Bool WMIsPLData(WMPropList * plist) Bool WMIsPLData(WMPropList * plist)
{ {
return (plist->type == WPLData); if (plist)
return (plist->type == WPLData);
else
return False;
} }
Bool WMIsPLArray(WMPropList * plist) Bool WMIsPLArray(WMPropList * plist)
{ {
return (plist->type == WPLArray); if (plist)
return (plist->type == WPLArray);
else
return False;
} }
Bool WMIsPLDictionary(WMPropList * plist) Bool WMIsPLDictionary(WMPropList * plist)
{ {
return (plist->type == WPLDictionary); if (plist)
return (plist->type == WPLDictionary);
else
return False;
} }
Bool WMIsPropListEqualTo(WMPropList * plist, WMPropList * other) Bool WMIsPropListEqualTo(WMPropList * plist, WMPropList * other)
@@ -1683,6 +1695,7 @@ Bool WMWritePropListToFile(WMPropList * plist, const char *path)
if (fprintf(theFile, "%s\n", desc) != strlen(desc) + 1) { if (fprintf(theFile, "%s\n", desc) != strlen(desc) + 1) {
werror(_("writing to file: %s failed"), thePath); werror(_("writing to file: %s failed"), thePath);
wfree(desc); wfree(desc);
fclose(theFile);
goto failure; goto failure;
} }
@@ -1719,7 +1732,7 @@ Bool WMWritePropListToFile(WMPropList * plist, const char *path)
* file, and the last component is stripped off. the rest is the * file, and the last component is stripped off. the rest is the
* the hierarchy to be created. * the hierarchy to be created.
* *
* refuses to create anything outside $GNUSTEP_USER_ROOT * refuses to create anything outside $WMAKER_USER_ROOT
* *
* returns 1 on success, 0 on failure * returns 1 on success, 0 on failure
*/ */
@@ -1730,7 +1743,7 @@ int wmkdirhier(const char *path)
size_t p, plen; size_t p, plen;
struct stat st; struct stat st;
/* Only create directories under $GNUSTEP_USER_ROOT */ /* Only create directories under $WMAKER_USER_ROOT */
if ((t = wusergnusteppath()) == NULL) if ((t = wusergnusteppath()) == NULL)
return 0; return 0;
if (strncmp(path, t, strlen(t)) != 0) if (strncmp(path, t, strlen(t)) != 0)
@@ -1811,7 +1824,7 @@ static int wrmdirhier_fn(const char *path, const struct stat *st,
/* /*
* remove a directory hierarchy * remove a directory hierarchy
* *
* refuses to remove anything outside $GNUSTEP_USER_ROOT * refuses to remove anything outside $WMAKER_USER_ROOT
* *
* returns 1 on success, 0 on failure * returns 1 on success, 0 on failure
* *
@@ -1825,7 +1838,7 @@ int wrmdirhier(const char *path)
int error; int error;
const char *t; const char *t;
/* Only remove directories under $GNUSTEP_USER_ROOT */ /* Only remove directories under $WMAKER_USER_ROOT */
if ((t = wusergnusteppath()) == NULL) if ((t = wusergnusteppath()) == NULL)
return EPERM; return EPERM;
if (strncmp(path, t, strlen(t)) != 0) if (strncmp(path, t, strlen(t)) != 0)
WINGs/selection.c
+1 -1
View File
@@ -261,7 +261,7 @@ static WMData *getSelectionData(Display * dpy, Window win, Atom where)
bpi = bits / 8; bpi = bits / 8;
wdata = WMCreateDataWithBytesNoCopy(data, len * bpi, (WMFreeDataProc *) XFree); wdata = WMCreateDataWithBytesNoCopy(data, len * bpi, (void *) XFree);
WMSetDataFormat(wdata, bits); WMSetDataFormat(wdata, bits);
return wdata; return wdata;
WINGs/userdefaults.c
+5 -8
View File
@@ -59,9 +59,9 @@ const char *wusergnusteppath()
return path; return path;
#ifdef HAVE_SECURE_GETENV #ifdef HAVE_SECURE_GETENV
gspath = secure_getenv("GNUSTEP_USER_ROOT"); gspath = secure_getenv("WMAKER_USER_ROOT");
#else #else
gspath = getenv("GNUSTEP_USER_ROOT"); gspath = getenv("WMAKER_USER_ROOT");
#endif #endif
if (gspath) { if (gspath) {
gspath = wexpandpath(gspath); gspath = wexpandpath(gspath);
@@ -69,7 +69,7 @@ const char *wusergnusteppath()
path = gspath; path = gspath;
return path; return path;
} }
wwarning(_("variable GNUSTEP_USER_ROOT defined with invalid path, not used")); wwarning(_("variable WMAKER_USER_ROOT defined with invalid path, not used"));
} }
h = wgethomedir(); h = wgethomedir();
@@ -103,17 +103,14 @@ char *wdefaultspathfordomain(const char *domain)
} }
/* XXX: doesn't quite belong to *user*defaults.c */ /* XXX: doesn't quite belong to *user*defaults.c */
#ifndef GLOBAL_DEFAULTS_SUBDIR
#define GLOBAL_DEFAULTS_SUBDIR "WindowMaker"
#endif
char *wglobaldefaultspathfordomain(const char *domain) char *wglobaldefaultspathfordomain(const char *domain)
{ {
char *t = NULL; char *t = NULL;
size_t len; size_t len;
len = strlen( SYSCONFDIR ) + strlen( GLOBAL_DEFAULTS_SUBDIR ) + strlen(domain) + 3; len = strlen(DEFSDATADIR) + strlen(domain) + 2;
t = wmalloc(len); t = wmalloc(len);
snprintf(t, len, "%s/%s/%s", SYSCONFDIR, GLOBAL_DEFAULTS_SUBDIR, domain); snprintf(t, len, "%s/%s", DEFSDATADIR, domain);
return t; return t;
} }
WINGs/wapplication.c
+2 -2
View File
@@ -140,7 +140,7 @@ char *WMPathForResourceOfType(const char *resource, const char *ext)
* Paths are searched in this order: * Paths are searched in this order:
* - resourcePath/ext * - resourcePath/ext
* - dirname(argv[0])/ext * - dirname(argv[0])/ext
* - GNUSTEP_USER_ROOT/Applications/ApplicationName.app/ext * - WMAKER_USER_ROOT/Applications/ApplicationName.app/ext
* - ~/GNUstep/Applications/ApplicationName.app/ext * - ~/GNUstep/Applications/ApplicationName.app/ext
* - GNUSTEP_LOCAL_ROOT/Applications/ApplicationName.app/ext * - GNUSTEP_LOCAL_ROOT/Applications/ApplicationName.app/ext
* - /usr/local/GNUstep/Applications/ApplicationName.app/ext * - /usr/local/GNUstep/Applications/ApplicationName.app/ext
@@ -175,7 +175,7 @@ char *WMPathForResourceOfType(const char *resource, const char *ext)
if (snprintf(appdir, slen, "Applications/%s.app", WMApplication.applicationName) >= slen) if (snprintf(appdir, slen, "Applications/%s.app", WMApplication.applicationName) >= slen)
goto out; goto out;
path = checkFile(getenv("GNUSTEP_USER_ROOT"), appdir, ext, resource); path = checkFile(getenv("WMAKER_USER_ROOT"), appdir, ext, resource);
if (path) if (path)
goto out; goto out;
WINGs/wcolorpanel.c
+18 -12
View File
@@ -67,9 +67,6 @@ static unsigned char Cursor_bits[] = {
0x00, 0x00, 0x00, 0xb8, 0x00, 0x00, 0x00, 0x70 0x00, 0x00, 0x00, 0xb8, 0x00, 0x00, 0x00, 0x70
}; };
/* Cursor shape-mask */
#define Cursor_shape_width 32
#define Cursor_shape_height 32
static unsigned char Cursor_shape_bits[] = { static unsigned char Cursor_shape_bits[] = {
0x00, 0x7e, 0x00, 0x00, 0xc0, 0x81, 0x03, 0x00, 0x20, 0x00, 0x04, 0x00, 0x10, 0x00, 0x08, 0x00, 0x7e, 0x00, 0x00, 0xc0, 0x81, 0x03, 0x00, 0x20, 0x00, 0x04, 0x00, 0x10, 0x00, 0x08,
0x00, 0x08, 0x00, 0x10, 0x00, 0x04, 0x00, 0x20, 0x00, 0x02, 0x00, 0x40, 0x00, 0x02, 0x00, 0x00, 0x08, 0x00, 0x10, 0x00, 0x04, 0x00, 0x20, 0x00, 0x02, 0x00, 0x40, 0x00, 0x02, 0x00,
@@ -2388,6 +2385,8 @@ void rgbIntToChar(W_ColorPanel *panel, int *value)
case RGBhex: case RGBhex:
format = "%0X"; format = "%0X";
break; break;
default:
format = "";
} }
sprintf(tmp, format, value[0]); sprintf(tmp, format, value[0]);
@@ -2646,7 +2645,7 @@ static void hsbTextFieldCallback(void *observerData, WMNotification * notificati
{ {
CPColor cpColor; CPColor cpColor;
int value[3]; int value[3];
char tmp[4]; char tmp[12]; /* We only 4 bytes needed, but compilers cannot know that */
int n; int n;
W_ColorPanel *panel = (W_ColorPanel *) observerData; W_ColorPanel *panel = (W_ColorPanel *) observerData;
@@ -3399,6 +3398,9 @@ static void rgbInit(W_ColorPanel * panel)
case RGBhex: case RGBhex:
format = "%0X"; format = "%0X";
break; break;
default:
/* Avoid compiler warning */
format = "";
} }
sprintf(tmp, format, panel->color.rgb.red); sprintf(tmp, format, panel->color.rgb.red);
@@ -3451,7 +3453,7 @@ static void hsbInit(W_ColorPanel * panel)
WMSetSliderValue(panel->hsbSaturationS, value[1]); WMSetSliderValue(panel->hsbSaturationS, value[1]);
WMSetSliderValue(panel->hsbBrightnessS, value[2]); WMSetSliderValue(panel->hsbBrightnessS, value[2]);
sprintf(tmp, "%d", value[0]); sprintf(tmp, "%hu", value[0]);
WMSetTextFieldText(panel->hsbHueT, tmp); WMSetTextFieldText(panel->hsbHueT, tmp);
sprintf(tmp, "%d", value[1]); sprintf(tmp, "%d", value[1]);
WMSetTextFieldText(panel->hsbSaturationT, tmp); WMSetTextFieldText(panel->hsbSaturationT, tmp);
@@ -3502,13 +3504,17 @@ static void convertCPColor(CPColor * color)
old_hue = color->hsv.hue; old_hue = color->hsv.hue;
RRGBtoHSV(&(color->rgb), &(color->hsv)); RRGBtoHSV(&(color->rgb), &(color->hsv));
/* In black the hue is undefined, and may change by conversion /*
* Same for white. */ * For pure grey colors, the Hue is generally calculated
if (((color->rgb.red == 0) && * as 0, but in reality the Hue does not matter.
(color->rgb.green == 0) && *
(color->rgb.blue == 0)) || * But in an interactive GUI it is interresting to remember
((color->rgb.red == 0) && (color->rgb.green == 0) && (color->rgb.blue == 255)) * the previous Hue because if user moves away from perfect
) * grey then he could be interrested in finding back his
* previous tint
*/
if ((color->rgb.red == color->rgb.green) &&
(color->rgb.red == color->rgb.blue) )
color->hsv.hue = old_hue; color->hsv.hue = old_hue;
break; break;
case cpHSV: case cpHSV:
WINGs/wfont.c
+10
View File
@@ -237,6 +237,16 @@ char *WMGetFontName(WMFont * font)
return font->name; return font->name;
} }
void WMGetScaleBaseFromSystemFont(WMScreen *scrPtr, int *alphabetWidth, int *fontHeight)
{
WMFont *font;
font = WMDefaultSystemFont(scrPtr);
*alphabetWidth = WMWidthOfString(font, "abcdefghijklmnopqrstuvwxyz", 26);
*fontHeight = WMFontHeight(font);
WMReleaseFont(font);
}
WMFont *WMDefaultSystemFont(WMScreen * scrPtr) WMFont *WMDefaultSystemFont(WMScreen * scrPtr)
{ {
return WMRetainFont(scrPtr->normalFont); return WMRetainFont(scrPtr->normalFont);
WINGs/wfontpanel.c
+2 -2
View File
@@ -700,7 +700,7 @@ static void typefaceClick(WMWidget * w, void *data)
WM_ITERATE_ARRAY(face->sizes, size, i) { WM_ITERATE_ARRAY(face->sizes, size, i) {
if (size != NULL) { if (size != NULL) {
int size_int = (int) size; int size_int = (intptr_t) size;
sprintf(buffer, "%i", size_int); sprintf(buffer, "%i", size_int);
@@ -802,7 +802,7 @@ static void setFontPanelFontName(FontPanel * panel, const char *family, const ch
char buffer[32]; char buffer[32];
if (vsize != NULL) { if (vsize != NULL) {
int size_int = (int) vsize; int size_int = (intptr_t) vsize;
sprintf(buffer, "%i", size_int); sprintf(buffer, "%i", size_int);
WINGs/widgets.c
+2 -1
View File
@@ -385,6 +385,7 @@ static void renderPixmap(W_Screen * screen, Pixmap d, Pixmap mask, char **data,
if (mask) if (mask)
XDrawPoint(screen->display, mask, screen->monoGC, x, y); XDrawPoint(screen->display, mask, screen->monoGC, x, y);
/* FALLTHRU */
case '.': case '.':
case 'l': case 'l':
XDrawPoint(screen->display, d, lightGC, x, y); XDrawPoint(screen->display, d, lightGC, x, y);
@@ -944,7 +945,7 @@ void WMSetFocusToWidget(WMWidget * widget)
/* /*
* WMRealizeWidget- * WMRealizeWidget-
* Realizes the widget and all it's children. * Realizes the widget and all its children.
* *
*/ */
void WMRealizeWidget(WMWidget * w) void WMRealizeWidget(WMWidget * w)
WINGs/wpanel.c
+287 -7
View File
@@ -89,10 +89,12 @@ WMAlertPanel *WMCreateAlertPanel(WMScreen * scrPtr, WMWindow * owner,
const char *alternateButton, const char *otherButton) const char *alternateButton, const char *otherButton)
{ {
WMAlertPanel *panel; WMAlertPanel *panel;
WMFont *defaultFont;
int dw = 0, aw = 0, ow = 0, w; int dw = 0, aw = 0, ow = 0, w;
WMBox *hbox; WMBox *hbox;
WMPixmap *icon; WMPixmap *icon;
defaultFont = WMSystemFontOfSize(scrPtr, 12);
panel = wmalloc(sizeof(WMAlertPanel)); panel = wmalloc(sizeof(WMAlertPanel));
if (owner) { if (owner) {
@@ -160,6 +162,7 @@ WMAlertPanel *WMCreateAlertPanel(WMScreen * scrPtr, WMWindow * owner,
WMFontHeight(scrPtr->normalFont) * 4, 0, 5); WMFontHeight(scrPtr->normalFont) * 4, 0, 5);
WMSetLabelText(panel->mLbl, msg); WMSetLabelText(panel->mLbl, msg);
WMSetLabelTextAlignment(panel->mLbl, WACenter); WMSetLabelTextAlignment(panel->mLbl, WACenter);
WMSetLabelFont(panel->mLbl, defaultFont);
} }
panel->hbox = WMCreateBox(panel->vbox); panel->hbox = WMCreateBox(panel->vbox);
@@ -170,13 +173,13 @@ WMAlertPanel *WMCreateAlertPanel(WMScreen * scrPtr, WMWindow * owner,
/* create buttons */ /* create buttons */
if (otherButton) if (otherButton)
ow = WMWidthOfString(scrPtr->normalFont, otherButton, strlen(otherButton)); ow = WMWidthOfString(defaultFont, otherButton, strlen(otherButton));
if (alternateButton) if (alternateButton)
aw = WMWidthOfString(scrPtr->normalFont, alternateButton, strlen(alternateButton)); aw = WMWidthOfString(defaultFont, alternateButton, strlen(alternateButton));
if (defaultButton) if (defaultButton)
dw = WMWidthOfString(scrPtr->normalFont, defaultButton, strlen(defaultButton)); dw = WMWidthOfString(defaultFont, defaultButton, strlen(defaultButton));
dw = dw + (scrPtr->buttonArrow ? scrPtr->buttonArrow->width : 0); dw = dw + (scrPtr->buttonArrow ? scrPtr->buttonArrow->width : 0);
@@ -206,18 +209,187 @@ WMAlertPanel *WMCreateAlertPanel(WMScreen * scrPtr, WMWindow * owner,
WMSetButtonImage(panel->defBtn, scrPtr->buttonArrow); WMSetButtonImage(panel->defBtn, scrPtr->buttonArrow);
WMSetButtonAltImage(panel->defBtn, scrPtr->pushedButtonArrow); WMSetButtonAltImage(panel->defBtn, scrPtr->pushedButtonArrow);
WMSetButtonImagePosition(panel->defBtn, WIPRight); WMSetButtonImagePosition(panel->defBtn, WIPRight);
WMSetButtonFont(panel->defBtn, defaultFont);
} }
if (alternateButton) { if (alternateButton) {
panel->altBtn = WMCreateCommandButton(panel->hbox); panel->altBtn = WMCreateCommandButton(panel->hbox);
WMAddBoxSubviewAtEnd(panel->hbox, WMWidgetView(panel->altBtn), False, True, aw, 0, 5); WMAddBoxSubviewAtEnd(panel->hbox, WMWidgetView(panel->altBtn), False, True, aw, 0, 5);
WMSetButtonAction(panel->altBtn, alertPanelOnClick, panel); WMSetButtonAction(panel->altBtn, alertPanelOnClick, panel);
WMSetButtonText(panel->altBtn, alternateButton); WMSetButtonText(panel->altBtn, alternateButton);
WMSetButtonFont(panel->altBtn, defaultFont);
} }
if (otherButton) { if (otherButton) {
panel->othBtn = WMCreateCommandButton(panel->hbox); panel->othBtn = WMCreateCommandButton(panel->hbox);
WMSetButtonAction(panel->othBtn, alertPanelOnClick, panel); WMSetButtonAction(panel->othBtn, alertPanelOnClick, panel);
WMAddBoxSubviewAtEnd(panel->hbox, WMWidgetView(panel->othBtn), False, True, ow, 0, 5); WMAddBoxSubviewAtEnd(panel->hbox, WMWidgetView(panel->othBtn), False, True, ow, 0, 5);
WMSetButtonText(panel->othBtn, otherButton); WMSetButtonText(panel->othBtn, otherButton);
WMSetButtonFont(panel->othBtn, defaultFont);
}
WMMapSubwidgets(panel->hbox);
WMCreateEventHandler(W_VIEW(panel->win), KeyPressMask, handleKeyPress, panel);
WMRealizeWidget(panel->win);
WMMapSubwidgets(panel->win);
WMReleaseFont(defaultFont);
return panel;
}
WMAlertPanel *WMCreateScaledAlertPanel(WMScreen * scrPtr, WMWindow * owner,
const char *title, const char *msg, const char *defaultButton,
const char *alternateButton, const char *otherButton)
{
WMAlertPanel *panel;
int dw = 0, aw = 0, ow = 0, w;
WMBox *hbox;
WMPixmap *icon;
int wmScaleWidth, wmScaleHeight;
int pwidth, pheight;
panel = wmalloc(sizeof(WMAlertPanel));
if (owner) {
panel->win = WMCreatePanelWithStyleForWindow(owner, "alertPanel", WMTitledWindowMask);
} else {
panel->win = WMCreateWindowWithStyle(scrPtr, "alertPanel", WMTitledWindowMask);
}
/* calculate and set the panel's size */
WMGetScaleBaseFromSystemFont(scrPtr, &wmScaleWidth, &wmScaleHeight);
pwidth = WMScaleX(400);
pheight = WMScaleY(5) /* upper margin */
+ 64 /* icon size */
+ WMScaleY(5) /* space between icon and divider line */
+ 2 /* divider line */
+ WMScaleY(5); /* space between divider line and message */
if (msg)
pheight += WMFontHeight(scrPtr->normalFont) * 4 + WMScaleY(5);
pheight += WMScaleY(44);
WMResizeWidget(panel->win, pwidth, pheight);
WMSetWindowInitialPosition(panel->win,
(scrPtr->rootView->size.width - pwidth) / 2,
(scrPtr->rootView->size.height - pheight) / 2);
WMSetWindowTitle(panel->win, "");
panel->vbox = WMCreateBox(panel->win);
WMSetViewExpandsToParent(WMWidgetView(panel->vbox), 0, 0, 0, 0);
WMSetBoxHorizontal(panel->vbox, False);
WMMapWidget(panel->vbox);
hbox = WMCreateBox(panel->vbox);
WMSetBoxBorderWidth(hbox, WMScaleX(5));
WMSetBoxHorizontal(hbox, True);
WMMapWidget(hbox);
WMAddBoxSubview(panel->vbox, WMWidgetView(hbox), False, True, 64 + 2 * WMScaleY(5), 0, WMScaleY(5));
panel->iLbl = WMCreateLabel(hbox);
WMSetLabelImagePosition(panel->iLbl, WIPImageOnly);
WMMapWidget(panel->iLbl);
WMAddBoxSubview(hbox, WMWidgetView(panel->iLbl), False, True, 64, 0, 10);
icon = WMCreateApplicationIconBlendedPixmap(scrPtr, (RColor *) NULL);
if (icon) {
WMSetLabelImage(panel->iLbl, icon);
WMReleasePixmap(icon);
} else {
WMSetLabelImage(panel->iLbl, scrPtr->applicationIconPixmap);
}
if (title) {
WMFont *largeFont;
largeFont = WMBoldSystemFontOfSize(scrPtr, 24);
panel->tLbl = WMCreateLabel(hbox);
WMMapWidget(panel->tLbl);
WMAddBoxSubview(hbox, WMWidgetView(panel->tLbl), True, True, 64, 0, 0);
WMSetLabelText(panel->tLbl, title);
WMSetLabelTextAlignment(panel->tLbl, WALeft);
WMSetLabelFont(panel->tLbl, largeFont);
WMReleaseFont(largeFont);
}
/* create divider line */
panel->line = WMCreateFrame(panel->win);
WMMapWidget(panel->line);
WMAddBoxSubview(panel->vbox, WMWidgetView(panel->line), False, True, 2, 2, WMScaleY(5));
WMSetFrameRelief(panel->line, WRGroove);
if (msg) {
panel->mLbl = WMCreateLabel(panel->vbox);
WMSetLabelWraps(panel->mLbl, True);
WMMapWidget(panel->mLbl);
WMAddBoxSubview(panel->vbox, WMWidgetView(panel->mLbl), True, True,
WMFontHeight(scrPtr->normalFont) * 4, 0, WMScaleY(5));
WMSetLabelText(panel->mLbl, msg);
WMSetLabelTextAlignment(panel->mLbl, WACenter);
}
panel->hbox = WMCreateBox(panel->vbox);
WMSetBoxBorderWidth(panel->hbox, WMScaleX(10));
WMSetBoxHorizontal(panel->hbox, True);
WMMapWidget(panel->hbox);
WMAddBoxSubview(panel->vbox, WMWidgetView(panel->hbox), False, True, WMScaleY(44), 0, 0);
/* create buttons */
if (otherButton)
ow = WMWidthOfString(scrPtr->normalFont, otherButton, strlen(otherButton));
if (alternateButton)
aw = WMWidthOfString(scrPtr->normalFont, alternateButton, strlen(alternateButton));
if (defaultButton)
dw = WMWidthOfString(scrPtr->normalFont, defaultButton, strlen(defaultButton));
dw = dw + (scrPtr->buttonArrow ? scrPtr->buttonArrow->width : 0);
aw += WMScaleX(30);
ow += WMScaleX(30);
dw += WMScaleX(30);
w = WMAX(dw, WMAX(aw, ow));
if ((w + WMScaleX(10)) * 3 < pwidth) {
aw = w;
ow = w;
dw = w;
} else {
int t;
t = pwidth - 4 * WMScaleX(10) - aw - ow - dw;
aw += t / 3;
ow += t / 3;
dw += t / 3;
}
if (defaultButton) {
panel->defBtn = WMCreateCommandButton(panel->hbox);
WMResizeWidget(panel->defBtn, dw, WMScaleY(24));
WMSetButtonAction(panel->defBtn, alertPanelOnClick, panel);
WMAddBoxSubviewAtEnd(panel->hbox, WMWidgetView(panel->defBtn), False, True, dw, 0, 0);
WMSetButtonText(panel->defBtn, defaultButton);
WMSetButtonImage(panel->defBtn, scrPtr->buttonArrow);
WMSetButtonAltImage(panel->defBtn, scrPtr->pushedButtonArrow);
WMSetButtonImagePosition(panel->defBtn, WIPRight);
}
if (alternateButton) {
panel->altBtn = WMCreateCommandButton(panel->hbox);
WMResizeWidget(panel->altBtn, aw, WMScaleY(24));
WMAddBoxSubviewAtEnd(panel->hbox, WMWidgetView(panel->altBtn), False, True, aw, 0, WMScaleX(5));
WMSetButtonAction(panel->altBtn, alertPanelOnClick, panel);
WMSetButtonText(panel->altBtn, alternateButton);
}
if (otherButton) {
panel->othBtn = WMCreateCommandButton(panel->hbox);
WMResizeWidget(panel->othBtn, ow, WMScaleY(24));
WMSetButtonAction(panel->othBtn, alertPanelOnClick, panel);
WMAddBoxSubviewAtEnd(panel->hbox, WMWidgetView(panel->othBtn), False, True, ow, 0, WMScaleX(5));
WMSetButtonText(panel->othBtn, otherButton);
} }
WMMapSubwidgets(panel->hbox); WMMapSubwidgets(panel->hbox);
@@ -338,8 +510,10 @@ WMInputPanel *WMCreateInputPanel(WMScreen * scrPtr, WMWindow * owner, const char
const char *defaultText, const char *okButton, const char *cancelButton) const char *defaultText, const char *okButton, const char *cancelButton)
{ {
WMInputPanel *panel; WMInputPanel *panel;
WMFont *defaultFont;
int x, dw = 0, aw = 0, w; int x, dw = 0, aw = 0, w;
defaultFont = WMSystemFontOfSize(scrPtr, 12);
panel = wmalloc(sizeof(WMInputPanel)); panel = wmalloc(sizeof(WMInputPanel));
if (owner) if (owner)
@@ -371,21 +545,23 @@ WMInputPanel *WMCreateInputPanel(WMScreen * scrPtr, WMWindow * owner, const char
WMResizeWidget(panel->mLbl, 320 - 40, WMFontHeight(scrPtr->normalFont) * 2); WMResizeWidget(panel->mLbl, 320 - 40, WMFontHeight(scrPtr->normalFont) * 2);
WMSetLabelText(panel->mLbl, msg); WMSetLabelText(panel->mLbl, msg);
WMSetLabelTextAlignment(panel->mLbl, WALeft); WMSetLabelTextAlignment(panel->mLbl, WALeft);
WMSetLabelFont(panel->mLbl, defaultFont);
} }
panel->text = WMCreateTextField(panel->win); panel->text = WMCreateTextField(panel->win);
WMMoveWidget(panel->text, 20, 85); WMMoveWidget(panel->text, 20, 85);
WMResizeWidget(panel->text, 320 - 40, WMWidgetHeight(panel->text)); WMResizeWidget(panel->text, 320 - 40, WMWidgetHeight(panel->text));
WMSetTextFieldText(panel->text, defaultText); WMSetTextFieldText(panel->text, defaultText);
WMSetTextFieldFont(panel->text, defaultFont);
WMAddNotificationObserver(endedEditingObserver, panel, WMTextDidEndEditingNotification, panel->text); WMAddNotificationObserver(endedEditingObserver, panel, WMTextDidEndEditingNotification, panel->text);
/* create buttons */ /* create buttons */
if (cancelButton) if (cancelButton)
aw = WMWidthOfString(scrPtr->normalFont, cancelButton, strlen(cancelButton)); aw = WMWidthOfString(defaultFont, cancelButton, strlen(cancelButton));
if (okButton) if (okButton)
dw = WMWidthOfString(scrPtr->normalFont, okButton, strlen(okButton)); dw = WMWidthOfString(defaultFont, okButton, strlen(okButton));
w = dw + (scrPtr->buttonArrow ? scrPtr->buttonArrow->width : 0); w = dw + (scrPtr->buttonArrow ? scrPtr->buttonArrow->width : 0);
if (aw > w) if (aw > w)
@@ -406,6 +582,7 @@ WMInputPanel *WMCreateInputPanel(WMScreen * scrPtr, WMWindow * owner, const char
WMSetButtonImage(panel->defBtn, scrPtr->buttonArrow); WMSetButtonImage(panel->defBtn, scrPtr->buttonArrow);
WMSetButtonAltImage(panel->defBtn, scrPtr->pushedButtonArrow); WMSetButtonAltImage(panel->defBtn, scrPtr->pushedButtonArrow);
WMSetButtonImagePosition(panel->defBtn, WIPRight); WMSetButtonImagePosition(panel->defBtn, WIPRight);
WMSetButtonFont(panel->defBtn, defaultFont);
} }
if (cancelButton) { if (cancelButton) {
x -= w + 10; x -= w + 10;
@@ -415,6 +592,104 @@ WMInputPanel *WMCreateInputPanel(WMScreen * scrPtr, WMWindow * owner, const char
WMMoveWidget(panel->altBtn, x, 124); WMMoveWidget(panel->altBtn, x, 124);
WMResizeWidget(panel->altBtn, w, 24); WMResizeWidget(panel->altBtn, w, 24);
WMSetButtonText(panel->altBtn, cancelButton); WMSetButtonText(panel->altBtn, cancelButton);
WMSetButtonFont(panel->altBtn, defaultFont);
}
WMCreateEventHandler(W_VIEW(panel->win), KeyPressMask, handleKeyPress2, panel);
WMRealizeWidget(panel->win);
WMMapSubwidgets(panel->win);
WMSetFocusToWidget(panel->text);
WMReleaseFont(defaultFont);
return panel;
}
WMInputPanel *WMCreateScaledInputPanel(WMScreen * scrPtr, WMWindow * owner, const char *title, const char *msg,
const char *defaultText, const char *okButton, const char *cancelButton)
{
WMInputPanel *panel;
int x, dw = 0, aw = 0, w;
int wmScaleWidth, wmScaleHeight;
panel = wmalloc(sizeof(WMInputPanel));
if (owner)
panel->win = WMCreatePanelWithStyleForWindow(owner, "inputPanel", WMTitledWindowMask);
else
panel->win = WMCreateWindowWithStyle(scrPtr, "inputPanel", WMTitledWindowMask);
WMSetWindowTitle(panel->win, "");
WMGetScaleBaseFromSystemFont(scrPtr, &wmScaleWidth, &wmScaleHeight);
WMResizeWidget(panel->win, WMScaleX(320), WMScaleY(160));
if (title) {
WMFont *largeFont;
largeFont = WMBoldSystemFontOfSize(scrPtr, WMScaleY(24));
panel->tLbl = WMCreateLabel(panel->win);
WMMoveWidget(panel->tLbl, WMScaleX(20), WMScaleY(16));
WMResizeWidget(panel->tLbl, WMScaleX(320) - 2 * WMScaleX(20), WMFontHeight(largeFont) + WMScaleY(4));
WMSetLabelText(panel->tLbl, title);
WMSetLabelTextAlignment(panel->tLbl, WALeft);
WMSetLabelFont(panel->tLbl, largeFont);
WMReleaseFont(largeFont);
}
if (msg) {
panel->mLbl = WMCreateLabel(panel->win);
WMMoveWidget(panel->mLbl, WMScaleX(20), WMScaleY(50));
WMResizeWidget(panel->mLbl, WMScaleX(320) - 2 * WMScaleX(20), WMFontHeight(scrPtr->normalFont) * 2);
WMSetLabelText(panel->mLbl, msg);
WMSetLabelTextAlignment(panel->mLbl, WALeft);
}
panel->text = WMCreateTextField(panel->win);
WMMoveWidget(panel->text, WMScaleX(20), WMScaleY(85));
WMResizeWidget(panel->text, WMScaleX(320) - 2 * WMScaleX(20), WMScaleY(20));
WMSetTextFieldText(panel->text, defaultText);
WMAddNotificationObserver(endedEditingObserver, panel, WMTextDidEndEditingNotification, panel->text);
/* create buttons */
if (cancelButton)
aw = WMWidthOfString(scrPtr->normalFont, cancelButton, strlen(cancelButton));
if (okButton)
dw = WMWidthOfString(scrPtr->normalFont, okButton, strlen(okButton));
w = dw + (scrPtr->buttonArrow ? scrPtr->buttonArrow->width : 0);
if (aw > w)
w = aw;
w += WMScaleX(30);
x = WMScaleX(310);
if (okButton) {
x -= w + WMScaleX(10);
panel->defBtn = WMCreateCustomButton(panel->win, WBBPushInMask
| WBBPushChangeMask | WBBPushLightMask);
WMSetButtonAction(panel->defBtn, inputBoxOnClick, panel);
WMMoveWidget(panel->defBtn, x, WMScaleY(124));
WMResizeWidget(panel->defBtn, w, WMScaleY(24));
WMSetButtonText(panel->defBtn, okButton);
WMSetButtonImage(panel->defBtn, scrPtr->buttonArrow);
WMSetButtonAltImage(panel->defBtn, scrPtr->pushedButtonArrow);
WMSetButtonImagePosition(panel->defBtn, WIPRight);
}
if (cancelButton) {
x -= w + WMScaleX(10);
panel->altBtn = WMCreateCommandButton(panel->win);
WMSetButtonAction(panel->altBtn, inputBoxOnClick, panel);
WMMoveWidget(panel->altBtn, x, WMScaleY(124));
WMResizeWidget(panel->altBtn, w, WMScaleY(24));
WMSetButtonText(panel->altBtn, cancelButton);
} }
WMCreateEventHandler(W_VIEW(panel->win), KeyPressMask, handleKeyPress2, panel); WMCreateEventHandler(W_VIEW(panel->win), KeyPressMask, handleKeyPress2, panel);
@@ -457,10 +732,12 @@ WMGenericPanel *WMCreateGenericPanel(WMScreen * scrPtr, WMWindow * owner,
const char *title, const char *defaultButton, const char *alternateButton) const char *title, const char *defaultButton, const char *alternateButton)
{ {
WMGenericPanel *panel; WMGenericPanel *panel;
WMFont *defaultFont;
int dw = 0, aw = 0, w; int dw = 0, aw = 0, w;
WMBox *hbox; WMBox *hbox;
WMPixmap *icon; WMPixmap *icon;
defaultFont = WMSystemFontOfSize(scrPtr, 12);
panel = wmalloc(sizeof(WMGenericPanel)); panel = wmalloc(sizeof(WMGenericPanel));
if (owner) { if (owner) {
@@ -533,10 +810,10 @@ WMGenericPanel *WMCreateGenericPanel(WMScreen * scrPtr, WMWindow * owner,
/* create buttons */ /* create buttons */
if (defaultButton) if (defaultButton)
dw = WMWidthOfString(scrPtr->normalFont, defaultButton, strlen(defaultButton)); dw = WMWidthOfString(defaultFont, defaultButton, strlen(defaultButton));
if (alternateButton) if (alternateButton)
aw = WMWidthOfString(scrPtr->normalFont, alternateButton, strlen(alternateButton)); aw = WMWidthOfString(defaultFont, alternateButton, strlen(alternateButton));
dw = dw + (scrPtr->buttonArrow ? scrPtr->buttonArrow->width : 0); dw = dw + (scrPtr->buttonArrow ? scrPtr->buttonArrow->width : 0);
@@ -561,6 +838,7 @@ WMGenericPanel *WMCreateGenericPanel(WMScreen * scrPtr, WMWindow * owner,
WMSetButtonImage(panel->defBtn, scrPtr->buttonArrow); WMSetButtonImage(panel->defBtn, scrPtr->buttonArrow);
WMSetButtonAltImage(panel->defBtn, scrPtr->pushedButtonArrow); WMSetButtonAltImage(panel->defBtn, scrPtr->pushedButtonArrow);
WMSetButtonImagePosition(panel->defBtn, WIPRight); WMSetButtonImagePosition(panel->defBtn, WIPRight);
WMSetButtonFont(panel->defBtn, defaultFont);
} }
WMMapSubwidgets(hbox); WMMapSubwidgets(hbox);
@@ -570,5 +848,7 @@ WMGenericPanel *WMCreateGenericPanel(WMScreen * scrPtr, WMWindow * owner,
WMRealizeWidget(panel->win); WMRealizeWidget(panel->win);
WMMapSubwidgets(panel->win); WMMapSubwidgets(panel->win);
WMReleaseFont(defaultFont);
return panel; return panel;
} }
WINGs/wruler.c
+1 -4
View File
@@ -181,10 +181,7 @@ static void drawRulerOnPixmap(Ruler * rPtr)
XDrawLine(rPtr->view->screen->display, rPtr->drawBuffer, XDrawLine(rPtr->view->screen->display, rPtr->drawBuffer,
rPtr->fgGC, rPtr->margins.left + m, 23, rPtr->margins.left + m, marks[i % 8] + 23); rPtr->fgGC, rPtr->margins.left + m, 23, rPtr->margins.left + m, marks[i % 8] + 23);
if (i != 0 && i % 8 == 0) { if (i != 0 && i % 8 == 0) {
if (j < 10) snprintf(c, sizeof(c), "%hu", ++j);
snprintf(c, 3, "%d", ++j);
else
snprintf(c, 3, "%2d", ++j);
WMDrawString(rPtr->view->screen, rPtr->drawBuffer, rPtr->fg, WMDrawString(rPtr->view->screen, rPtr->drawBuffer, rPtr->fg,
rPtr->font, rPtr->margins.left + 2 + m, 26, c, 2); rPtr->font, rPtr->margins.left + 2 + m, 26, c, 2);
} }
WINGs/wsplitview.c
-3
View File
@@ -41,9 +41,6 @@ typedef struct W_SplitView {
/* TODO: rewrite --Dan */ /* TODO: rewrite --Dan */
#define _GetSubviewsCount() WMGetArrayItemCount(sPtr->subviews) #define _GetSubviewsCount() WMGetArrayItemCount(sPtr->subviews)
#define _AddPSubviewStruct(P) \
(WMAddToArray(sPtr->subviews,((void*)P)))
#define _GetPSubviewStructAt(i) \ #define _GetPSubviewStructAt(i) \
((W_SplitViewSubview*)WMGetFromArray(sPtr->subviews,(i))) ((W_SplitViewSubview*)WMGetFromArray(sPtr->subviews,(i)))
WINGs/wtext.c
+2
View File
@@ -2305,6 +2305,7 @@ static void handleTextKeyPress(Text * tPtr, XEvent * event)
case XK_Return: case XK_Return:
*buffer = '\n'; *buffer = '\n';
/* FALLTHRU */
default: default:
if (*buffer != 0 && !control_pressed) { if (*buffer != 0 && !control_pressed) {
insertTextInteractively(tPtr, buffer, strlen(buffer)); insertTextInteractively(tPtr, buffer, strlen(buffer));
@@ -2544,6 +2545,7 @@ static void handleActionEvents(XEvent * event, void *data)
break; break;
} }
/* FALLTHRU */
case ButtonRelease: case ButtonRelease:
if (tPtr->flags.pointerGrabbed) { if (tPtr->flags.pointerGrabbed) {
tPtr->flags.pointerGrabbed = False; tPtr->flags.pointerGrabbed = False;
WINGs/wtextfield.c
+14
View File
@@ -965,6 +965,7 @@ static void handleTextFieldKeyPress(TextField * tPtr, XEvent * event)
switch (ksym) { switch (ksym) {
case XK_Tab: case XK_Tab:
#ifdef XK_ISO_Left_Tab #ifdef XK_ISO_Left_Tab
/* FALLTHRU */
case XK_ISO_Left_Tab: case XK_ISO_Left_Tab:
#endif #endif
if (!controled) { if (!controled) {
@@ -1001,8 +1002,10 @@ static void handleTextFieldKeyPress(TextField * tPtr, XEvent * event)
break; break;
#ifdef XK_KP_Enter #ifdef XK_KP_Enter
/* FALLTHRU */
case XK_KP_Enter: case XK_KP_Enter:
#endif #endif
/* FALLTHRU */
case XK_Return: case XK_Return:
if (!modified) { if (!modified) {
data = (void *)WMReturnTextMovement; data = (void *)WMReturnTextMovement;
@@ -1019,8 +1022,10 @@ static void handleTextFieldKeyPress(TextField * tPtr, XEvent * event)
controled = False; controled = False;
#ifdef XK_KP_Left #ifdef XK_KP_Left
/* FALLTHRU */
case XK_KP_Left: case XK_KP_Left:
#endif #endif
/* FALLTHRU */
case XK_Left: case XK_Left:
if (tPtr->cursorPosition > 0) { if (tPtr->cursorPosition > 0) {
int i; int i;
@@ -1058,8 +1063,10 @@ static void handleTextFieldKeyPress(TextField * tPtr, XEvent * event)
controled = False; controled = False;
#ifdef XK_KP_Right #ifdef XK_KP_Right
/* FALLTHRU */
case XK_KP_Right: case XK_KP_Right:
#endif #endif
/* FALLTHRU */
case XK_Right: case XK_Right:
if (tPtr->cursorPosition < tPtr->textLen) { if (tPtr->cursorPosition < tPtr->textLen) {
int i; int i;
@@ -1095,8 +1102,10 @@ static void handleTextFieldKeyPress(TextField * tPtr, XEvent * event)
controled = False; controled = False;
#ifdef XK_KP_Home #ifdef XK_KP_Home
/* FALLTHRU */
case XK_KP_Home: case XK_KP_Home:
#endif #endif
/* FALLTHRU */
case XK_Home: case XK_Home:
if (!controled) { if (!controled) {
if (tPtr->cursorPosition > 0) { if (tPtr->cursorPosition > 0) {
@@ -1122,8 +1131,10 @@ static void handleTextFieldKeyPress(TextField * tPtr, XEvent * event)
controled = False; controled = False;
#ifdef XK_KP_End #ifdef XK_KP_End
/* FALLTHRU */
case XK_KP_End: case XK_KP_End:
#endif #endif
/* FALLTHRU */
case XK_End: case XK_End:
if (!controled) { if (!controled) {
if (tPtr->cursorPosition < tPtr->textLen) { if (tPtr->cursorPosition < tPtr->textLen) {
@@ -1149,6 +1160,7 @@ static void handleTextFieldKeyPress(TextField * tPtr, XEvent * event)
else else
modified = False; modified = False;
/* FALLTHRU */
case XK_BackSpace: case XK_BackSpace:
if (!modified) { if (!modified) {
if (tPtr->selection.count) { if (tPtr->selection.count) {
@@ -1177,8 +1189,10 @@ static void handleTextFieldKeyPress(TextField * tPtr, XEvent * event)
modified = False; modified = False;
#ifdef XK_KP_Delete #ifdef XK_KP_Delete
/* FALLTHRU */
case XK_KP_Delete: case XK_KP_Delete:
#endif #endif
/* FALLTHRU */
case XK_Delete: case XK_Delete:
if (!modified) { if (!modified) {
if (tPtr->selection.count) { if (tPtr->selection.count) {
WINGs/wview.c
+2
View File
@@ -490,6 +490,7 @@ void W_SetViewBackgroundColor(W_View * view, WMColor * color)
view->backColor = WMRetainColor(color); view->backColor = WMRetainColor(color);
view->attribFlags |= CWBackPixel; view->attribFlags |= CWBackPixel;
view->attribFlags &= ~CWBackPixmap;
view->attribs.background_pixel = W_PIXEL(color); view->attribs.background_pixel = W_PIXEL(color);
if (view->flags.realized) { if (view->flags.realized) {
XSetWindowBackground(view->screen->display, view->window, W_PIXEL(color)); XSetWindowBackground(view->screen->display, view->window, W_PIXEL(color));
@@ -504,6 +505,7 @@ void W_SetViewBackgroundPixmap(W_View *view, WMPixmap *pix)
view->backImage = WMRetainPixmap(pix); view->backImage = WMRetainPixmap(pix);
view->attribFlags |= CWBackPixmap; view->attribFlags |= CWBackPixmap;
view->attribFlags &= ~CWBackPixel;
view->attribs.background_pixmap = pix->pixmap; view->attribs.background_pixmap = pix->pixmap;
if (view->flags.realized) { if (view->flags.realized) {
XSetWindowBackgroundPixmap(view->screen->display, view->window, pix->pixmap); XSetWindowBackgroundPixmap(view->screen->display, view->window, pix->pixmap);
WPrefs.app/Appearance.c
+15 -6
View File
@@ -446,12 +446,18 @@ static void str2rcolor(RContext * rc, const char *name, RColor * color)
{ {
XColor xcolor; XColor xcolor;
XParseColor(rc->dpy, rc->cmap, name, &xcolor); if (XParseColor(rc->dpy, rc->cmap, name, &xcolor) != 0) {
color->alpha = 255;
color->alpha = 255; color->red = xcolor.red >> 8;
color->red = xcolor.red >> 8; color->green = xcolor.green >> 8;
color->green = xcolor.green >> 8; color->blue = xcolor.blue >> 8;
color->blue = xcolor.blue >> 8; } else {
/* Color Name was not found - Return white instead */
color->alpha = 255;
color->red = 255;
color->green = 255;
color->blue = 255;
}
} }
static void dumpRImage(const char *path, RImage * image) static void dumpRImage(const char *path, RImage * image)
@@ -611,6 +617,7 @@ static Pixmap renderTexture(WMScreen * scr, WMPropList * texture, int width, int
break; break;
default: default:
wwarning(_("unknown direction in '%s', falling back to diagonal"), type); wwarning(_("unknown direction in '%s', falling back to diagonal"), type);
/* FALLTHRU */
case 'D': case 'D':
style = RDiagonalGradient; style = RDiagonalGradient;
break; break;
@@ -637,6 +644,7 @@ static Pixmap renderTexture(WMScreen * scr, WMPropList * texture, int width, int
break; break;
default: default:
wwarning(_("unknown direction in '%s', falling back to diagonal"), type); wwarning(_("unknown direction in '%s', falling back to diagonal"), type);
/* FALLTHRU */
case 'D': case 'D':
style = RDiagonalGradient; style = RDiagonalGradient;
break; break;
@@ -671,6 +679,7 @@ static Pixmap renderTexture(WMScreen * scr, WMPropList * texture, int width, int
break; break;
default: default:
wwarning(_("unknown direction in '%s', falling back to diagonal"), type); wwarning(_("unknown direction in '%s', falling back to diagonal"), type);
/* FALLTHRU */
case 'D': case 'D':
style = RDiagonalGradient; style = RDiagonalGradient;
break; break;
WPrefs.app/Expert.c
+27 -4
View File
@@ -97,8 +97,29 @@ static const struct {
{ N_("Distance from corner to begin window snap."), { N_("Distance from corner to begin window snap."),
/* default: */ 10, OPTION_WMAKER_INT, "SnapCornerDetect" }, /* default: */ 10, OPTION_WMAKER_INT, "SnapCornerDetect" },
{ N_("Snapping a window to the top maximizes it to the full screen."),
/* default: */ False, OPTION_WMAKER, "SnapToTopMaximizesFullscreen" },
{ N_("Allow move half-maximized windows between multiple screens."),
/* default: */ False, OPTION_WMAKER, "MoveHalfMaximizedWindowsBetweenScreens" },
{ N_("Alternative transitions between states for half maximized windows."),
/* default: */ False, OPTION_WMAKER, "AlternativeHalfMaximized" },
{ N_("Move mouse pointer with half maximized windows."),
/* default: */ False, OPTION_WMAKER, "PointerWithHalfMaxWindows" },
{ N_("Open dialogs in the same workspace as their owners."), { N_("Open dialogs in the same workspace as their owners."),
/* default: */ False, OPTION_WMAKER, "OpenTransientOnOwnerWorkspace" } /* default: */ False, OPTION_WMAKER, "OpenTransientOnOwnerWorkspace" },
{ N_("Wrap dock-attached icons around the screen edges."),
/* default: */ True, OPTION_WMAKER, "WrapAppiconsInDock" },
{ N_("Double click on titlebar maximize a window to full screen."),
/* default: */ False, OPTION_WMAKER, "DbClickFullScreen" },
{ N_("Close rootmenu when mouse (left or right) is clicked outside focus."),
/* default: */ False, OPTION_WMAKER, "CloseRootMenuByLeftOrRightMouseClick" }
}; };
@@ -125,15 +146,16 @@ typedef struct _Panel {
static void changeIntTextfield(void *data, int delta) static void changeIntTextfield(void *data, int delta)
{ {
WMTextField *textfield; WMTextField *textfield;
char *text; char *text, buffer[12];
int value; int value;
textfield = (WMTextField *)data; textfield = (WMTextField *)data;
text = WMGetTextFieldText(textfield); text = WMGetTextFieldText(textfield);
value = atoi(text); value = atoi(text);
wfree(text);
value += delta; value += delta;
sprintf(text, "%d", value); sprintf(buffer, "%d", value);
WMSetTextFieldText(textfield, text); WMSetTextFieldText(textfield, buffer);
} }
static void downButtonCallback(WMWidget *self, void *data) static void downButtonCallback(WMWidget *self, void *data)
@@ -293,6 +315,7 @@ static void storeDefaults(_Panel *panel)
text = WMGetTextFieldText(panel->textfield[i]); text = WMGetTextFieldText(panel->textfield[i]);
value = atoi(text); value = atoi(text);
wfree(text);
SetIntegerForKey(value, expert_options[i].op_name); SetIntegerForKey(value, expert_options[i].op_name);
break; break;
WPrefs.app/FontSimple.c
+10 -13
View File
@@ -22,6 +22,7 @@
#include "WPrefs.h" #include "WPrefs.h"
#include <unistd.h> #include <unistd.h>
#include <fontconfig/fontconfig.h> #include <fontconfig/fontconfig.h>
#include <math.h>
/* workaround for older fontconfig, that doesn't define these constants */ /* workaround for older fontconfig, that doesn't define these constants */
#ifndef FC_WEIGHT_NORMAL #ifndef FC_WEIGHT_NORMAL
@@ -521,7 +522,7 @@ static void selectedOption(WMWidget * w, void *data)
WMListItem *item = WMGetListItem(panel->sizeL, i); WMListItem *item = WMGetListItem(panel->sizeL, i);
int distance; int distance;
distance = abs(size - atoi(item->text)); distance = fabs(size - atoi(item->text));
if (i == 0 || distance < closest) { if (i == 0 || distance < closest) {
closest = distance; closest = distance;
@@ -569,6 +570,9 @@ static void showData(_Panel * panel)
{ {
int i; int i;
WMMenuItem *item; WMMenuItem *item;
WMScreen *scr;
scr = WMWidgetScreen(panel->parent);
for (i = 0; i < WMGetPopUpButtonNumberOfItems(panel->optionP); i++) { for (i = 0; i < WMGetPopUpButtonNumberOfItems(panel->optionP); i++) {
char *ofont, *font; char *ofont, *font;
@@ -579,19 +583,12 @@ static void showData(_Panel * panel)
if (ofont) if (ofont)
wfree(ofont); wfree(ofont);
if (strcmp(fontOptions[i].option, "SystemFont") == 0 || if (strcmp(fontOptions[i].option, "SystemFont") == 0)
strcmp(fontOptions[i].option, "BoldSystemFont") == 0) { font = WMGetFontName(WMDefaultSystemFont(scr));
char *path; else if (strcmp(fontOptions[i].option, "BoldSystemFont") == 0)
WMUserDefaults *defaults; font = WMGetFontName(WMDefaultBoldSystemFont(scr));
else
path = wdefaultspathfordomain("WMGLOBAL");
defaults = WMGetDefaultsFromPath(path);
wfree(path);
font = WMGetUDStringForKey(defaults,
fontOptions[i].option);
} else {
font = GetStringForKey(fontOptions[i].option); font = GetStringForKey(fontOptions[i].option);
}
if (font) if (font)
font = wstrdup(font); font = wstrdup(font);
WMSetMenuItemRepresentedObject(item, font); WMSetMenuItemRepresentedObject(item, font);
WPrefs.app/Icons.c
+33 -61
View File
@@ -60,8 +60,6 @@ typedef struct _Panel {
CallbackRec callbacks; CallbackRec callbacks;
Bool have_legacy_apercu;
WMWidget *parent; WMWidget *parent;
WMFrame *posF; WMFrame *posF;
@@ -75,12 +73,13 @@ typedef struct _Panel {
WMButton *posB[wlengthof_nocheck(icon_position_dbvalue)]; WMButton *posB[wlengthof_nocheck(icon_position_dbvalue)];
WMFrame *animF; WMFrame *animF;
WMButton *animB[wlengthof_nocheck(icon_animation)]; WMPopUpButton *animP;
WMFrame *optF; WMFrame *optF;
WMButton *arrB; WMButton *arrB;
WMButton *omnB; WMButton *omnB;
WMButton *sclB; WMButton *sclB;
WMButton *marginB;
struct { struct {
WMFrame *frame; WMFrame *frame;
@@ -175,6 +174,7 @@ static void showData(_Panel * panel)
WMSetButtonSelected(panel->arrB, GetBoolForKey("AutoArrangeIcons")); WMSetButtonSelected(panel->arrB, GetBoolForKey("AutoArrangeIcons"));
WMSetButtonSelected(panel->omnB, GetBoolForKey("StickyIcons")); WMSetButtonSelected(panel->omnB, GetBoolForKey("StickyIcons"));
WMSetButtonSelected(panel->sclB, GetBoolForKey("SingleClickLaunch")); WMSetButtonSelected(panel->sclB, GetBoolForKey("SingleClickLaunch"));
WMSetButtonSelected(panel->marginB, GetBoolForKey("EnforceIconMargin"));
str = GetStringForKey("IconPosition"); str = GetStringForKey("IconPosition");
if (str != NULL) { if (str != NULL) {
@@ -195,20 +195,12 @@ static void showData(_Panel * panel)
if (i < 0) if (i < 0)
i = 0; i = 0;
else if (i > 9) else if (i > 29)
i = 9; i = 29;
WMSetPopUpButtonSelectedItem(panel->sizeP, i); WMSetPopUpButtonSelectedItem(panel->sizeP, i);
/* Mini-Previews for Icons */ /* Mini-Previews for Icons */
/*
* Backward Compatibility:
* These settings changed names after 0.95.6, so to avoid breaking user's
* config we still support the old names, and silently convert them to the
* new settings
* This hack should be kept for at least 2 years, that means >= 2017.
*/
panel->have_legacy_apercu = False;
str = GetStringForKey("MiniwindowPreviewBalloons"); str = GetStringForKey("MiniwindowPreviewBalloons");
if (str != NULL) { if (str != NULL) {
/* New names found, use them in priority */ /* New names found, use them in priority */
@@ -220,25 +212,6 @@ static void showData(_Panel * panel)
} else { } else {
i = minipreview_minimum_size; i = minipreview_minimum_size;
} }
} else {
/* No new names, try the legacy names */
b = GetBoolForKey("MiniwindowApercuBalloons");
if (b) {
panel->have_legacy_apercu = True;
i = GetIntegerForKey("ApercuSize");
/*
* In the beginning, the option was coded as a multiple of the icon
* size; then it was converted to pixel size
*/
if (i < 24)
i *= GetIntegerForKey("IconSize");
if (i <= minipreview_minimum_size)
i = minipreview_minimum_size + 1; /* +1 to not display as "off" */
} else {
i = minipreview_minimum_size;
}
} }
WMSetSliderValue(panel->minipreview.slider, i); WMSetSliderValue(panel->minipreview.slider, i);
minipreview_slider_changed(panel->minipreview.slider, panel); minipreview_slider_changed(panel->minipreview.slider, panel);
@@ -248,7 +221,7 @@ static void showData(_Panel * panel)
if (str != NULL) { if (str != NULL) {
for (i = 0; i < wlengthof(icon_animation); i++) { for (i = 0; i < wlengthof(icon_animation); i++) {
if (strcasecmp(str, icon_animation[i].db_value) == 0) { if (strcasecmp(str, icon_animation[i].db_value) == 0) {
WMPerformButtonClick(panel->animB[i]); WMSetPopUpButtonSelectedItem(panel->animP, i);
goto found_animation_value; goto found_animation_value;
} }
} }
@@ -256,7 +229,7 @@ static void showData(_Panel * panel)
str, icon_animation[0].db_value); str, icon_animation[0].db_value);
} }
/* If we're here, no valid value have been found so we fall-back to the default */ /* If we're here, no valid value have been found so we fall-back to the default */
WMPerformButtonClick(panel->animB[0]); WMSetPopUpButtonSelectedItem(panel->animP, 0);
found_animation_value: found_animation_value:
; ;
} }
@@ -366,7 +339,7 @@ static void createPanel(Panel * p)
panel->sizeP = WMCreatePopUpButton(panel->sizeF); panel->sizeP = WMCreatePopUpButton(panel->sizeF);
WMResizeWidget(panel->sizeP, 80, 20); WMResizeWidget(panel->sizeP, 80, 20);
WMMoveWidget(panel->sizeP, 10, 19); WMMoveWidget(panel->sizeP, 10, 19);
for (i = 24; i <= 96; i += 8) { for (i = 24; i <= 256; i += 8) {
sprintf(buf, "%ix%i", i, i); sprintf(buf, "%ix%i", i, i);
WMAddPopUpButtonItem(panel->sizeP, buf); WMAddPopUpButtonItem(panel->sizeP, buf);
} }
@@ -399,50 +372,57 @@ static void createPanel(Panel * p)
/***************** Animation ****************/ /***************** Animation ****************/
panel->animF = WMCreateFrame(panel->box); panel->animF = WMCreateFrame(panel->box);
WMResizeWidget(panel->animF, 215, 110); WMResizeWidget(panel->animF, 215, 52);
WMMoveWidget(panel->animF, 292, 6); WMMoveWidget(panel->animF, 292, 6);
WMSetFrameTitle(panel->animF, _("Iconification Animation")); WMSetFrameTitle(panel->animF, _("Iconification Animation"));
for (i = 0; i < wlengthof(icon_animation); i++) { panel->animP = WMCreatePopUpButton(panel->animF);
panel->animB[i] = WMCreateRadioButton(panel->animF); WMResizeWidget(panel->animP, 195, 20);
WMResizeWidget(panel->animB[i], 192, 20); WMMoveWidget(panel->animP, 10, 19);
WMMoveWidget(panel->animB[i], 12, 16 + i * 22); for (i = 0; i < wlengthof(icon_animation); i++)
WMAddPopUpButtonItem(panel->animP, _(icon_animation[i].label));
if (i > 0)
WMGroupButtons(panel->animB[0], panel->animB[i]);
WMSetButtonText(panel->animB[i], _(icon_animation[i].label));
}
WMMapSubwidgets(panel->animF); WMMapSubwidgets(panel->animF);
/***************** Options ****************/ /***************** Options ****************/
panel->optF = WMCreateFrame(panel->box); panel->optF = WMCreateFrame(panel->box);
WMResizeWidget(panel->optF, 215, 90); WMResizeWidget(panel->optF, 215, 148);
WMMoveWidget(panel->optF, 292, 130); WMMoveWidget(panel->optF, 292, 72);
/* WMSetFrameTitle(panel->optF, _("Icon Display")); */ /* WMSetFrameTitle(panel->optF, _("Icon Display")); */
starty = 8 + 14; /* the last term centers the checkboxes within the panel; subtract 13 for a new option */
panel->arrB = WMCreateSwitchButton(panel->optF); panel->arrB = WMCreateSwitchButton(panel->optF);
WMResizeWidget(panel->arrB, 198, 26); WMResizeWidget(panel->arrB, 198, 26);
WMMoveWidget(panel->arrB, 12, 8); WMMoveWidget(panel->arrB, 12, starty);
starty += 26;
WMSetButtonText(panel->arrB, _("Auto-arrange icons")); WMSetButtonText(panel->arrB, _("Auto-arrange icons"));
WMSetBalloonTextForView(_("Keep icons and miniwindows arranged all the time."), WMWidgetView(panel->arrB)); WMSetBalloonTextForView(_("Keep icons and miniwindows arranged all the time."), WMWidgetView(panel->arrB));
panel->omnB = WMCreateSwitchButton(panel->optF); panel->omnB = WMCreateSwitchButton(panel->optF);
WMResizeWidget(panel->omnB, 198, 26); WMResizeWidget(panel->omnB, 198, 26);
WMMoveWidget(panel->omnB, 12, 34); WMMoveWidget(panel->omnB, 12, starty);
starty += 26;
WMSetButtonText(panel->omnB, _("Omnipresent miniwindows")); WMSetButtonText(panel->omnB, _("Omnipresent miniwindows"));
WMSetBalloonTextForView(_("Make miniwindows be present in all workspaces."), WMWidgetView(panel->omnB)); WMSetBalloonTextForView(_("Make miniwindows be present in all workspaces."), WMWidgetView(panel->omnB));
panel->sclB = WMCreateSwitchButton(panel->optF); panel->sclB = WMCreateSwitchButton(panel->optF);
WMResizeWidget(panel->sclB, 198, 26); WMResizeWidget(panel->sclB, 198, 26);
WMMoveWidget(panel->sclB, 12, 60); WMMoveWidget(panel->sclB, 12, starty);
starty += 26;
WMSetButtonText(panel->sclB, _("Single click activation")); WMSetButtonText(panel->sclB, _("Single click activation"));
WMSetBalloonTextForView(_("Launch applications and restore windows with a single click."), WMWidgetView(panel->sclB)); WMSetBalloonTextForView(_("Launch applications and restore windows with a single click."), WMWidgetView(panel->sclB));
panel->marginB = WMCreateSwitchButton(panel->optF);
WMResizeWidget(panel->marginB, 198, 26);
WMMoveWidget(panel->marginB, 12, starty);
starty += 26;
WMSetButtonText(panel->marginB, _("Enforce icon margin"));
WMSetBalloonTextForView(_("Make sure that the icon image does not protrude into the icon frame."), WMWidgetView(panel->marginB));
WMMapSubwidgets(panel->optF); WMMapSubwidgets(panel->optF);
WMRealizeWidget(panel->box); WMRealizeWidget(panel->box);
@@ -458,6 +438,7 @@ static void storeData(_Panel * panel)
SetBoolForKey(WMGetButtonSelected(panel->arrB), "AutoArrangeIcons"); SetBoolForKey(WMGetButtonSelected(panel->arrB), "AutoArrangeIcons");
SetBoolForKey(WMGetButtonSelected(panel->omnB), "StickyIcons"); SetBoolForKey(WMGetButtonSelected(panel->omnB), "StickyIcons");
SetBoolForKey(WMGetButtonSelected(panel->sclB), "SingleClickLaunch"); SetBoolForKey(WMGetButtonSelected(panel->sclB), "SingleClickLaunch");
SetBoolForKey(WMGetButtonSelected(panel->marginB), "EnforceIconMargin");
SetIntegerForKey(WMGetPopUpButtonSelectedItem(panel->sizeP) * 8 + 24, "IconSize"); SetIntegerForKey(WMGetPopUpButtonSelectedItem(panel->sizeP) * 8 + 24, "IconSize");
@@ -478,17 +459,8 @@ static void storeData(_Panel * panel)
} }
SetIntegerForKey(i, "MiniPreviewSize"); SetIntegerForKey(i, "MiniPreviewSize");
} }
if (panel->have_legacy_apercu) {
RemoveObjectForKey("MiniwindowApercuBalloons");
RemoveObjectForKey("ApercuSize");
}
for (i = 0; i < wlengthof(icon_animation); i++) { SetStringForKey(icon_animation[WMGetPopUpButtonSelectedItem(panel->animP)].db_value, "IconificationStyle");
if (WMGetButtonSelected(panel->animB[i])) {
SetStringForKey(icon_animation[i].db_value, "IconificationStyle");
break;
}
}
} }
Panel *InitIcons(WMWidget *parent) Panel *InitIcons(WMWidget *parent)
WPrefs.app/KeyboardShortcuts.c
+6
View File
@@ -89,6 +89,8 @@ static const struct {
{ "LBCMaximizeKey", N_("Maximize active window left bottom corner") }, { "LBCMaximizeKey", N_("Maximize active window left bottom corner") },
{ "RBCMaximizeKey", N_("Maximize active window right bottom corner") }, { "RBCMaximizeKey", N_("Maximize active window right bottom corner") },
{ "MaximusKey", N_("Maximus: Tiled maximization ") }, { "MaximusKey", N_("Maximus: Tiled maximization ") },
{ "KeepOnTopKey", N_("Toggle window on top status") },
{ "KeepAtBottomKey",N_("Toggle window at bottom status") },
{ "OmnipresentKey", N_("Toggle window omnipresent status") }, { "OmnipresentKey", N_("Toggle window omnipresent status") },
{ "RaiseKey", N_("Raise active window") }, { "RaiseKey", N_("Raise active window") },
{ "LowerKey", N_("Lower active window") }, { "LowerKey", N_("Lower active window") },
@@ -146,6 +148,10 @@ static const struct {
{ "WindowShortcut9Key", N_("Shortcut for window 9") }, { "WindowShortcut9Key", N_("Shortcut for window 9") },
{ "WindowShortcut10Key", N_("Shortcut for window 10") }, { "WindowShortcut10Key", N_("Shortcut for window 10") },
/* Head Selection */
{ "MoveTo12to6Head", N_("Move to right/bottom/left/top head") },
{ "MoveTo6to12Head", N_("Move to left/top/right/bottom head") },
/* Misc. */ /* Misc. */
{ "WindowRelaunchKey", N_("Launch new instance of application") }, { "WindowRelaunchKey", N_("Launch new instance of application") },
{ "ScreenSwitchKey", N_("Switch to Next Screen/Monitor") }, { "ScreenSwitchKey", N_("Switch to Next Screen/Monitor") },
WPrefs.app/Makefile.am
+3 -2
View File
@@ -45,10 +45,11 @@ WPrefs_SOURCES = \
# KeyboardSettings.c \ # KeyboardSettings.c \
# Themes.c # Themes.c
AM_CFLAGS = AM_CFLAGS = @PANGO_CFLAGS@
AM_CPPFLAGS = -DRESOURCE_PATH=\"$(wpdatadir)\" -DWMAKER_RESOURCE_PATH=\"$(pkgdatadir)\" \ AM_CPPFLAGS = -DRESOURCE_PATH=\"$(wpdatadir)\" -DWMAKER_RESOURCE_PATH=\"$(pkgdatadir)\" \
-I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@ -I$(top_builddir)/wrlib -I$(top_srcdir)/WINGs -I$(top_builddir)/WINGs \
@HEADER_SEARCH_PATH@
WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
WPrefs.app/Menu.c
+67 -10
View File
@@ -22,6 +22,7 @@
#include "WPrefs.h" #include "WPrefs.h"
#include <assert.h> #include <assert.h>
#include <ctype.h> #include <ctype.h>
#include <unistd.h>
#include <X11/keysym.h> #include <X11/keysym.h>
#include <X11/cursorfont.h> #include <X11/cursorfont.h>
@@ -506,7 +507,7 @@ static void createPanel(_Panel * p)
WMSetScrollViewContentView(sview, WMWidgetView(pad)); WMSetScrollViewContentView(sview, WMWidgetView(pad));
data = putNewItem(panel, pad, ExternalInfo, _("Debian Menu")); data = putNewItem(panel, pad, ExternalInfo, _("Debian Menu"));
data->param.pipe.command = "/etc/X11/WindowMaker/menu.hook"; data->param.pipe.command = "/etc/GNUstep/Defaults/menu.hook";
data = putNewItem(panel, pad, PipeInfo, _("RedHat Menu")); data = putNewItem(panel, pad, PipeInfo, _("RedHat Menu"));
data->param.pipe.command = "wmconfig --output wmaker"; data->param.pipe.command = "wmconfig --output wmaker";
@@ -613,7 +614,7 @@ static void createPanel(_Panel * p)
WMAddNotificationObserver(dataChanged, panel, WMTextDidChangeNotification, panel->pathT); WMAddNotificationObserver(dataChanged, panel, WMTextDidChangeNotification, panel->pathT);
label = WMCreateLabel(panel->pathF); label = WMCreateLabel(panel->pathF);
WMResizeWidget(label, width - 20, 80); WMResizeWidget(label, width - 20, 90);
WMMoveWidget(label, 10, 50); WMMoveWidget(label, 10, 50);
WMSetLabelText(label, _("Enter the path for a file containing a menu\n" WMSetLabelText(label, _("Enter the path for a file containing a menu\n"
"or a list of directories with the programs you\n" "or a list of directories with the programs you\n"
@@ -913,6 +914,11 @@ static ItemData *parseCommand(WMPropList * item)
data->type = ExecInfo; data->type = ExecInfo;
if (parameter == NULL) {
wfree(data);
return NULL;
}
data->param.exec.command = wstrdup(parameter); data->param.exec.command = wstrdup(parameter);
if (shortcut) if (shortcut)
data->param.exec.shortcut = wstrdup(shortcut); data->param.exec.shortcut = wstrdup(shortcut);
@@ -925,6 +931,12 @@ static ItemData *parseCommand(WMPropList * item)
* |pipe * |pipe
*/ */
p = parameter; p = parameter;
if (p == NULL) {
wfree(data);
return NULL;
}
while (isspace(*p) && *p) while (isspace(*p) && *p)
p++; p++;
if (*p == '|') { if (*p == '|') {
@@ -1435,12 +1447,12 @@ static WEditMenu *buildSubmenu(_Panel * panel, WMPropList * pl)
WSetEditMenuItemImage(item, panel->markerPix[data->type]); WSetEditMenuItemImage(item, panel->markerPix[data->type]);
WSetEditMenuItemData(item, data, (WMCallback *) freeItemData); WSetEditMenuItemData(item, data, (WMCallback *) freeItemData);
} else { } else {
char *buf = wmalloc(1024); char buf[256];
snprintf(buf, 1024, _("Invalid menu command \"%s\" with label \"%s\" cleared"),
snprintf(buf, sizeof(buf), _("Invalid menu command \"%s\" with label \"%s\" cleared"),
WMGetFromPLString(WMGetFromPLArray(pi, 1)), WMGetFromPLString(WMGetFromPLArray(pi, 1)),
WMGetFromPLString(WMGetFromPLArray(pi, 0))); WMGetFromPLString(WMGetFromPLArray(pi, 0)));
WMRunAlertPanel(scr, panel->parent, _("Warning"), buf, _("OK"), NULL, NULL); WMRunAlertPanel(scr, panel->parent, _("Warning"), buf, _("OK"), NULL, NULL);
wfree(buf);
} }
} }
@@ -1482,7 +1494,8 @@ static WMPropList *getDefaultMenu(_Panel * panel)
static void showData(_Panel * panel) static void showData(_Panel * panel)
{ {
const char *gspath; const char *gspath;
char *menuPath; char *menuPath, *labelText;
char buf[1024];
WMPropList *pmenu; WMPropList *pmenu;
gspath = wusergnusteppath(); gspath = wusergnusteppath();
@@ -1493,6 +1506,45 @@ static void showData(_Panel * panel)
pmenu = WMReadPropListFromFile(menuPath); pmenu = WMReadPropListFromFile(menuPath);
/* check if WMRootMenu references another file, and if so,
if that file is in proplist format */
while (WMIsPLString(pmenu)) {
char *path = NULL;
path = wexpandpath(WMGetFromPLString(pmenu));
if (access(path, F_OK) < 0) {
char *old_path = path;
path = wfindfile(DEF_CONFIG_PATHS, path);
wfree(old_path);
}
/* TODO: if needed, concatenate locale suffix to path.
See getLocalizedMenuFile() in src/rootmenu.c. */
if (!path)
break;
if (access(path, W_OK) < 0) {
snprintf(buf, sizeof(buf),
_("The menu file \"%s\" referenced by "
"WMRootMenu is read-only.\n"
"You cannot use WPrefs to modify it."),
path);
WMRunAlertPanel(WMWidgetScreen(panel->parent),
panel->parent,
_("Warning"), buf,
_("OK"), NULL, NULL);
panel->dontSave = True;
wfree(path);
return;
}
pmenu = WMReadPropListFromFile(path);
menuPath = path;
}
if (!pmenu || !WMIsPLArray(pmenu)) { if (!pmenu || !WMIsPLArray(pmenu)) {
int res; int res;
@@ -1517,6 +1569,14 @@ static void showData(_Panel * panel)
panel->menuPath = menuPath; panel->menuPath = menuPath;
snprintf(buf, sizeof(buf),
_("\n\nWhen saved, the menu will be written to the file\n\"%s\"."),
menuPath);
labelText = WMGetLabelText(panel->sections[NoInfo][0]);
labelText = wstrconcat(labelText, buf);
WMSetLabelText(panel->sections[NoInfo][0], labelText);
wfree(labelText);
buildMenuFromPL(panel, pmenu); buildMenuFromPL(panel, pmenu);
WMReleasePropList(pmenu); WMReleasePropList(pmenu);
@@ -1557,15 +1617,12 @@ static WMPropList *processData(const char *title, ItemData * data)
case ExecInfo: case ExecInfo:
if (data->param.exec.command == NULL) if (data->param.exec.command == NULL)
goto return_null; goto return_null;
#if 1
if (strpbrk(data->param.exec.command, "&$*|><?`=;")) { if (strpbrk(data->param.exec.command, "&$*|><?`=;")) {
s1 = "SHEXEC"; s1 = "SHEXEC";
} else { } else {
s1 = "EXEC"; s1 = "EXEC";
} }
#else
s1 = "SHEXEC";
#endif
if (notblank(data->param.exec.shortcut)) { if (notblank(data->param.exec.shortcut)) {
WMAddToPLArray(item, pscut); WMAddToPLArray(item, pscut);
WPrefs.app/README
+3 -3
View File
@@ -7,7 +7,7 @@
WPrefs.app is the preferences "editor" for the WindowMaker window WPrefs.app is the preferences "editor" for the WindowMaker window
manager. It can be used to set most of the preference options of WindowMaker manager. It can be used to set most of the preference options of WindowMaker
and define it's applications menu. It also can change some settings and define its applications menu. It also can change some settings
that do not belong to WindowMaker. that do not belong to WindowMaker.
Although WPrefs.app is designed to be easy to use, you should read the Although WPrefs.app is designed to be easy to use, you should read the
@@ -16,7 +16,7 @@ of WindowMaker that are not related to configuration.
To run WPrefs, do not put it in your search path. Instead, run it To run WPrefs, do not put it in your search path. Instead, run it
with the full path, like /usr/local/GNUstep/Applications/WPrefs.app/WPrefs with the full path, like /usr/local/GNUstep/Applications/WPrefs.app/WPrefs
Then, dock it's application icon. The dock will automatically detect it's Then, dock its application icon. The dock will automatically detect its
icon and use it. icon and use it.
If you change configuration often, you might want to leave WPrefs If you change configuration often, you might want to leave WPrefs
@@ -46,7 +46,7 @@ The mouse speed configuration is saved as a call for xset in
~/G/D/L/W/autostart. WindowMaker calls this file when it is started. ~/G/D/L/W/autostart. WindowMaker calls this file when it is started.
If you don't want or can't use the menu definition section, do not If you don't want or can't use the menu definition section, do not
open it's section (or if you do open it, do not Save), or WPrefs will open its section (or if you do open it, do not Save), or WPrefs will
overwrite your ~/G/D/WMRootMenu file. overwrite your ~/G/D/WMRootMenu file.
Only options that have different values than what is found in the Only options that have different values than what is found in the
WPrefs.app/TexturePanel.c
+80 -80
View File
@@ -117,16 +117,21 @@ typedef struct _TexturePanel {
} _TexturePanel; } _TexturePanel;
#define TYPE_SOLID 0 enum {
#define TYPE_GRADIENT 1 TYPE_SOLID,
#define TYPE_SGRADIENT 2 TYPE_GRADIENT,
#define TYPE_TGRADIENT 3 TYPE_SGRADIENT,
#define TYPE_PIXMAP 4 TYPE_TGRADIENT,
TYPE_PIXMAP
};
#define PTYPE_TILE 0 enum {
#define PTYPE_SCALE 1 PTYPE_TILE,
#define PTYPE_CENTER 2 PTYPE_SCALE,
#define PTYPE_MAXIMIZE 3 PTYPE_CENTER,
PTYPE_MAXIMIZE,
PTYPE_FILL
};
/* /*
*-------------------------------------------------------------------------- *--------------------------------------------------------------------------
@@ -136,7 +141,7 @@ typedef struct _TexturePanel {
/************/ /************/
static void updateGradButtons(TexturePanel * panel) static void updateGradButtons(TexturePanel *panel)
{ {
RImage *image; RImage *image;
WMPixmap *pixmap; WMPixmap *pixmap;
@@ -180,7 +185,7 @@ static void updateGradButtons(TexturePanel * panel)
} }
} }
static void updateTGradImage(TexturePanel * panel) static void updateTGradImage(TexturePanel *panel)
{ {
RImage *image, *gradient; RImage *image, *gradient;
WMPixmap *pixmap; WMPixmap *pixmap;
@@ -201,19 +206,17 @@ static void updateTGradImage(TexturePanel * panel)
to.green = WMGreenComponentOfColor(color) >> 8; to.green = WMGreenComponentOfColor(color) >> 8;
to.blue = WMBlueComponentOfColor(color) >> 8; to.blue = WMBlueComponentOfColor(color) >> 8;
if (panel->image->width < 141 || panel->image->height < 91) { if (panel->image->width < 141 || panel->image->height < 91)
image = RMakeTiledImage(panel->image, 141, 91); image = RMakeTiledImage(panel->image, 141, 91);
} else { else
image = RCloneImage(panel->image); image = RCloneImage(panel->image);
}
if (WMGetButtonSelected(panel->dirhB)) { if (WMGetButtonSelected(panel->dirhB))
gradient = RRenderGradient(image->width, image->height, &from, &to, RHorizontalGradient); gradient = RRenderGradient(image->width, image->height, &from, &to, RHorizontalGradient);
} else if (WMGetButtonSelected(panel->dirvB)) { else if (WMGetButtonSelected(panel->dirvB))
gradient = RRenderGradient(image->width, image->height, &from, &to, RVerticalGradient); gradient = RRenderGradient(image->width, image->height, &from, &to, RVerticalGradient);
} else { else
gradient = RRenderGradient(image->width, image->height, &from, &to, RDiagonalGradient); gradient = RRenderGradient(image->width, image->height, &from, &to, RDiagonalGradient);
}
RCombineImagesWithOpaqueness(image, gradient, WMGetSliderValue(panel->topaS)); RCombineImagesWithOpaqueness(image, gradient, WMGetSliderValue(panel->topaS));
RReleaseImage(gradient); RReleaseImage(gradient);
@@ -225,7 +228,7 @@ static void updateTGradImage(TexturePanel * panel)
RReleaseImage(image); RReleaseImage(image);
} }
static void updateSGradButtons(TexturePanel * panel) static void updateSGradButtons(TexturePanel *panel)
{ {
RImage *image; RImage *image;
WMPixmap *pixmap; WMPixmap *pixmap;
@@ -264,7 +267,7 @@ static void updateSGradButtons(TexturePanel * panel)
/*********** Gradient ************/ /*********** Gradient ************/
static void updateSVSlider(WMSlider * sPtr, Bool saturation, WMFont * font, RHSVColor * hsv) static void updateSVSlider(WMSlider *sPtr, Bool saturation, WMFont *font, RHSVColor *hsv)
{ {
RImage *image; RImage *image;
WMPixmap *pixmap; WMPixmap *pixmap;
@@ -312,7 +315,7 @@ static void updateSVSlider(WMSlider * sPtr, Bool saturation, WMFont * font, RHSV
WMReleasePixmap(pixmap); WMReleasePixmap(pixmap);
} }
static void updateHueSlider(WMSlider * sPtr, WMFont * font, RHSVColor * hsv) static void updateHueSlider(WMSlider *sPtr, WMFont *font, RHSVColor *hsv)
{ {
RColor *colors[8]; RColor *colors[8];
RImage *image; RImage *image;
@@ -353,7 +356,7 @@ static void updateHueSlider(WMSlider * sPtr, WMFont * font, RHSVColor * hsv)
wfree(colors[i]); wfree(colors[i]);
} }
static void sliderChangeCallback(WMWidget * w, void *data) static void sliderChangeCallback(WMWidget *w, void *data)
{ {
TexturePanel *panel = (TexturePanel *) data; TexturePanel *panel = (TexturePanel *) data;
RHSVColor hsv; RHSVColor hsv;
@@ -417,9 +420,8 @@ static void sliderChangeCallback(WMWidget * w, void *data)
} }
colors[i] = NULL; colors[i] = NULL;
if (panel->gimage != None) { if (panel->gimage != None)
XFreePixmap(WMScreenDisplay(scr), panel->gimage); XFreePixmap(WMScreenDisplay(scr), panel->gimage);
}
image = RRenderMultiGradient(30, i * WMGetListItemHeight(panel->gcolL), colors, RVerticalGradient); image = RRenderMultiGradient(30, i * WMGetListItemHeight(panel->gcolL), colors, RVerticalGradient);
RConvertImage(WMScreenRContext(scr), image, &panel->gimage); RConvertImage(WMScreenRContext(scr), image, &panel->gimage);
@@ -432,7 +434,7 @@ static void sliderChangeCallback(WMWidget * w, void *data)
updateGradButtons(panel); updateGradButtons(panel);
} }
static void paintGradListItem(WMList * lPtr, int index, Drawable d, char *text, int state, WMRect * rect) static void paintGradListItem(WMList *lPtr, int index, Drawable d, char *text, int state, WMRect *rect)
{ {
TexturePanel *panel = (TexturePanel *) WMGetHangedData(lPtr); TexturePanel *panel = (TexturePanel *) WMGetHangedData(lPtr);
WMScreen *scr = WMWidgetScreen(lPtr); WMScreen *scr = WMWidgetScreen(lPtr);
@@ -465,7 +467,7 @@ static void paintGradListItem(WMList * lPtr, int index, Drawable d, char *text,
WMReleaseColor(gray); WMReleaseColor(gray);
} }
static void gradAddCallback(WMWidget * w, void *data) static void gradAddCallback(WMWidget *w, void *data)
{ {
TexturePanel *panel = (TexturePanel *) data; TexturePanel *panel = (TexturePanel *) data;
WMListItem *item; WMListItem *item;
@@ -489,7 +491,7 @@ static void gradAddCallback(WMWidget * w, void *data)
WMSetButtonEnabled(panel->okB, WMGetListNumberOfRows(panel->gcolL) > 1); WMSetButtonEnabled(panel->okB, WMGetListNumberOfRows(panel->gcolL) > 1);
} }
static void gradClickCallback(WMWidget * w, void *data) static void gradClickCallback(WMWidget *w, void *data)
{ {
TexturePanel *panel = (TexturePanel *) data; TexturePanel *panel = (TexturePanel *) data;
WMListItem *item; WMListItem *item;
@@ -511,7 +513,7 @@ static void gradClickCallback(WMWidget * w, void *data)
sliderChangeCallback(panel->gsatS, panel); sliderChangeCallback(panel->gsatS, panel);
} }
static void gradDeleteCallback(WMWidget * w, void *data) static void gradDeleteCallback(WMWidget *w, void *data)
{ {
TexturePanel *panel = (TexturePanel *) data; TexturePanel *panel = (TexturePanel *) data;
WMListItem *item; WMListItem *item;
@@ -545,7 +547,7 @@ static void gradDeleteCallback(WMWidget * w, void *data)
/*************** Simple Gradient ***************/ /*************** Simple Gradient ***************/
static void colorWellObserver(void *self, WMNotification * n) static void colorWellObserver(void *self, WMNotification *n)
{ {
/* Parameter not used, but tell the compiler that it is ok */ /* Parameter not used, but tell the compiler that it is ok */
(void) n; (void) n;
@@ -553,7 +555,7 @@ static void colorWellObserver(void *self, WMNotification * n)
updateSGradButtons(self); updateSGradButtons(self);
} }
static void opaqChangeCallback(WMWidget * w, void *data) static void opaqChangeCallback(WMWidget *w, void *data)
{ {
TexturePanel *panel = (TexturePanel *) data; TexturePanel *panel = (TexturePanel *) data;
@@ -565,7 +567,7 @@ static void opaqChangeCallback(WMWidget * w, void *data)
/****************** Image ******************/ /****************** Image ******************/
static void updateImage(TexturePanel * panel, const char *path) static void updateImage(TexturePanel *panel, const char *path)
{ {
WMScreen *scr = WMWidgetScreen(panel->win); WMScreen *scr = WMWidgetScreen(panel->win);
RImage *image; RImage *image;
@@ -613,12 +615,12 @@ static void updateImage(TexturePanel * panel, const char *path)
} }
} }
static void browseImageCallback(WMWidget * w, void *data) static void browseImageCallback(WMWidget *w, void *data)
{ {
TexturePanel *panel = (TexturePanel *) data; TexturePanel *panel = (TexturePanel *) data;
WMOpenPanel *opanel; WMOpenPanel *opanel;
WMScreen *scr = WMWidgetScreen(w); WMScreen *scr = WMWidgetScreen(w);
static char *ipath = NULL; static char *ipath;
opanel = WMGetOpenPanel(scr); opanel = WMGetOpenPanel(scr);
WMSetFilePanelCanChooseDirectories(opanel, False); WMSetFilePanelCanChooseDirectories(opanel, False);
@@ -670,18 +672,17 @@ static void browseImageCallback(WMWidget * w, void *data)
} }
} }
static void buttonCallback(WMWidget * w, void *data) static void buttonCallback(WMWidget *w, void *data)
{ {
TexturePanel *panel = (TexturePanel *) data; TexturePanel *panel = (TexturePanel *) data;
if (w == panel->okB) { if (w == panel->okB)
(*panel->okAction) (panel->okData); (*panel->okAction) (panel->okData);
} else { else
(*panel->cancelAction) (panel->cancelData); (*panel->cancelAction) (panel->cancelData);
}
} }
static void changeTypeCallback(WMWidget * w, void *data) static void changeTypeCallback(WMWidget *w, void *data)
{ {
TexturePanel *panel = (TexturePanel *) data; TexturePanel *panel = (TexturePanel *) data;
int newType; int newType;
@@ -731,7 +732,7 @@ static void changeTypeCallback(WMWidget * w, void *data)
* Public functions * Public functions
*-------------------------------------------------------------------------- *--------------------------------------------------------------------------
*/ */
void ShowTexturePanel(TexturePanel * panel) void ShowTexturePanel(TexturePanel *panel)
{ {
Display *dpy = WMScreenDisplay(WMWidgetScreen(panel->win)); Display *dpy = WMScreenDisplay(WMWidgetScreen(panel->win));
Screen *scr = DefaultScreenOfDisplay(dpy); Screen *scr = DefaultScreenOfDisplay(dpy);
@@ -742,24 +743,24 @@ void ShowTexturePanel(TexturePanel * panel)
WMMapWidget(panel->win); WMMapWidget(panel->win);
} }
void HideTexturePanel(TexturePanel * panel) void HideTexturePanel(TexturePanel *panel)
{ {
WMUnmapWidget(panel->win); WMUnmapWidget(panel->win);
} }
void SetTexturePanelOkAction(TexturePanel * panel, WMCallback * action, void *clientData) void SetTexturePanelOkAction(TexturePanel *panel, WMCallback *action, void *clientData)
{ {
panel->okAction = action; panel->okAction = action;
panel->okData = clientData; panel->okData = clientData;
} }
void SetTexturePanelCancelAction(TexturePanel * panel, WMCallback * action, void *clientData) void SetTexturePanelCancelAction(TexturePanel *panel, WMCallback *action, void *clientData)
{ {
panel->cancelAction = action; panel->cancelAction = action;
panel->cancelData = clientData; panel->cancelData = clientData;
} }
void SetTexturePanelTexture(TexturePanel * panel, const char *name, WMPropList * texture) void SetTexturePanelTexture(TexturePanel *panel, const char *name, WMPropList *texture)
{ {
WMScreen *scr = WMWidgetScreen(panel->win); WMScreen *scr = WMWidgetScreen(panel->win);
char *str, *type; char *str, *type;
@@ -775,9 +776,8 @@ void SetTexturePanelTexture(TexturePanel * panel, const char *name, WMPropList *
return; return;
p = WMGetFromPLArray(texture, 0); p = WMGetFromPLArray(texture, 0);
if (!p) { if (!p)
goto bad_texture; goto bad_texture;
}
type = WMGetFromPLString(p); type = WMGetFromPLString(p);
/*............................................... */ /*............................................... */
@@ -786,11 +786,10 @@ void SetTexturePanelTexture(TexturePanel * panel, const char *name, WMPropList *
WMSetPopUpButtonSelectedItem(panel->typeP, TYPE_SOLID); WMSetPopUpButtonSelectedItem(panel->typeP, TYPE_SOLID);
p = WMGetFromPLArray(texture, 1); p = WMGetFromPLArray(texture, 1);
if (!p) { if (!p)
str = "black"; str = "black";
} else { else
str = WMGetFromPLString(p); str = WMGetFromPLString(p);
}
color = WMCreateNamedColor(scr, str, False); color = WMCreateNamedColor(scr, str, False);
WMSetColorWellColor(panel->defcW, color); WMSetColorWellColor(panel->defcW, color);
@@ -803,11 +802,10 @@ void SetTexturePanelTexture(TexturePanel * panel, const char *name, WMPropList *
WMSetPopUpButtonSelectedItem(panel->typeP, TYPE_SGRADIENT); WMSetPopUpButtonSelectedItem(panel->typeP, TYPE_SGRADIENT);
p = WMGetFromPLArray(texture, 1); p = WMGetFromPLArray(texture, 1);
if (!p) { if (!p)
str = "black"; str = "black";
} else { else
str = WMGetFromPLString(p); str = WMGetFromPLString(p);
}
color = WMCreateNamedColor(scr, str, False); color = WMCreateNamedColor(scr, str, False);
WMSetColorWellColor(panel->tcol1W, color); WMSetColorWellColor(panel->tcol1W, color);
@@ -815,11 +813,10 @@ void SetTexturePanelTexture(TexturePanel * panel, const char *name, WMPropList *
WMReleaseColor(color); WMReleaseColor(color);
p = WMGetFromPLArray(texture, 2); p = WMGetFromPLArray(texture, 2);
if (!p) { if (!p)
str = "black"; str = "black";
} else { else
str = WMGetFromPLString(p); str = WMGetFromPLString(p);
}
color = WMCreateNamedColor(scr, str, False); color = WMCreateNamedColor(scr, str, False);
WMSetColorWellColor(panel->tcol2W, color); WMSetColorWellColor(panel->tcol2W, color);
@@ -846,11 +843,10 @@ void SetTexturePanelTexture(TexturePanel * panel, const char *name, WMPropList *
WMSetSliderValue(panel->topaS, i); WMSetSliderValue(panel->topaS, i);
p = WMGetFromPLArray(texture, 3); p = WMGetFromPLArray(texture, 3);
if (!p) { if (!p)
str = "black"; str = "black";
} else { else
str = WMGetFromPLString(p); str = WMGetFromPLString(p);
}
color = WMCreateNamedColor(scr, str, False); color = WMCreateNamedColor(scr, str, False);
WMSetColorWellColor(panel->tcol1W, color); WMSetColorWellColor(panel->tcol1W, color);
@@ -858,11 +854,10 @@ void SetTexturePanelTexture(TexturePanel * panel, const char *name, WMPropList *
WMReleaseColor(color); WMReleaseColor(color);
p = WMGetFromPLArray(texture, 4); p = WMGetFromPLArray(texture, 4);
if (!p) { if (!p)
str = "black"; str = "black";
} else { else
str = WMGetFromPLString(p); str = WMGetFromPLString(p);
}
color = WMCreateNamedColor(scr, str, False); color = WMCreateNamedColor(scr, str, False);
WMSetColorWellColor(panel->tcol2W, color); WMSetColorWellColor(panel->tcol2W, color);
@@ -873,9 +868,9 @@ void SetTexturePanelTexture(TexturePanel * panel, const char *name, WMPropList *
if (panel->imageFile) if (panel->imageFile)
wfree(panel->imageFile); wfree(panel->imageFile);
if ((panel->imageFile = wfindfileinarray(panel->pathList, panel->imageFile = wfindfileinarray(panel->pathList,
WMGetFromPLString(WMGetFromPLArray(texture, 1)))) != WMGetFromPLString(WMGetFromPLArray(texture, 1)));
NULL) { if (panel->imageFile != NULL) {
panel->image = RLoadImage(WMScreenRContext(scr), panel->imageFile, 0); panel->image = RLoadImage(WMScreenRContext(scr), panel->imageFile, 0);
updateTGradImage(panel); updateTGradImage(panel);
@@ -899,11 +894,10 @@ void SetTexturePanelTexture(TexturePanel * panel, const char *name, WMPropList *
WMSetPopUpButtonSelectedItem(panel->typeP, TYPE_GRADIENT); WMSetPopUpButtonSelectedItem(panel->typeP, TYPE_GRADIENT);
p = WMGetFromPLArray(texture, 1); p = WMGetFromPLArray(texture, 1);
if (!p) { if (!p)
str = "black"; str = "black";
} else { else
str = WMGetFromPLString(p); str = WMGetFromPLString(p);
}
color = WMCreateNamedColor(scr, str, False); color = WMCreateNamedColor(scr, str, False);
WMSetColorWellColor(panel->defcW, color); WMSetColorWellColor(panel->defcW, color);
@@ -915,11 +909,10 @@ void SetTexturePanelTexture(TexturePanel * panel, const char *name, WMPropList *
XColor xcolor; XColor xcolor;
p = WMGetFromPLArray(texture, i); p = WMGetFromPLArray(texture, i);
if (!p) { if (!p)
str = "black"; str = "black";
} else { else
str = WMGetFromPLString(p); str = WMGetFromPLString(p);
}
XParseColor(WMScreenDisplay(scr), WMScreenRContext(scr)->cmap, str, &xcolor); XParseColor(WMScreenDisplay(scr), WMScreenRContext(scr)->cmap, str, &xcolor);
@@ -953,6 +946,9 @@ void SetTexturePanelTexture(TexturePanel * panel, const char *name, WMPropList *
case 'M': case 'M':
WMSetPopUpButtonSelectedItem(panel->arrP, PTYPE_MAXIMIZE); WMSetPopUpButtonSelectedItem(panel->arrP, PTYPE_MAXIMIZE);
break; break;
case 'F':
WMSetPopUpButtonSelectedItem(panel->arrP, PTYPE_FILL);
break;
default: default:
case 'T': case 'T':
WMSetPopUpButtonSelectedItem(panel->arrP, PTYPE_TILE); WMSetPopUpButtonSelectedItem(panel->arrP, PTYPE_TILE);
@@ -1001,13 +997,13 @@ void SetTexturePanelTexture(TexturePanel * panel, const char *name, WMPropList *
} }
char *GetTexturePanelTextureName(TexturePanel * panel) char *GetTexturePanelTextureName(TexturePanel *panel)
{ {
return WMGetTextFieldText(panel->nameT); return WMGetTextFieldText(panel->nameT);
} }
WMPropList *GetTexturePanelTexture(TexturePanel * panel) WMPropList *GetTexturePanelTexture(TexturePanel *panel)
{ {
WMPropList *prop = NULL; WMPropList *prop = NULL;
WMColor *color; WMColor *color;
@@ -1038,6 +1034,10 @@ WMPropList *GetTexturePanelTexture(TexturePanel * panel)
prop = WMCreatePLArray(WMCreatePLString("mpixmap"), prop = WMCreatePLArray(WMCreatePLString("mpixmap"),
WMCreatePLString(panel->imageFile), WMCreatePLString(str), NULL); WMCreatePLString(panel->imageFile), WMCreatePLString(str), NULL);
break; break;
case PTYPE_FILL:
prop = WMCreatePLArray(WMCreatePLString("fpixmap"),
WMCreatePLString(panel->imageFile), WMCreatePLString(str), NULL);
break;
case PTYPE_CENTER: case PTYPE_CENTER:
prop = WMCreatePLArray(WMCreatePLString("cpixmap"), prop = WMCreatePLArray(WMCreatePLString("cpixmap"),
WMCreatePLString(panel->imageFile), WMCreatePLString(str), NULL); WMCreatePLString(panel->imageFile), WMCreatePLString(str), NULL);
@@ -1104,13 +1104,12 @@ WMPropList *GetTexturePanelTexture(TexturePanel * panel)
color = WMGetColorWellColor(panel->defcW); color = WMGetColorWellColor(panel->defcW);
str = WMGetColorRGBDescription(color); str = WMGetColorRGBDescription(color);
if (WMGetButtonSelected(panel->dirdB)) { if (WMGetButtonSelected(panel->dirdB))
prop = WMCreatePLArray(WMCreatePLString("mdgradient"), WMCreatePLString(str), NULL); prop = WMCreatePLArray(WMCreatePLString("mdgradient"), WMCreatePLString(str), NULL);
} else if (WMGetButtonSelected(panel->dirvB)) { else if (WMGetButtonSelected(panel->dirvB))
prop = WMCreatePLArray(WMCreatePLString("mvgradient"), WMCreatePLString(str), NULL); prop = WMCreatePLArray(WMCreatePLString("mvgradient"), WMCreatePLString(str), NULL);
} else { else
prop = WMCreatePLArray(WMCreatePLString("mhgradient"), WMCreatePLString(str), NULL); prop = WMCreatePLArray(WMCreatePLString("mhgradient"), WMCreatePLString(str), NULL);
}
wfree(str); wfree(str);
for (i = 0; i < WMGetListNumberOfRows(panel->gcolL); i++) { for (i = 0; i < WMGetListNumberOfRows(panel->gcolL); i++) {
@@ -1131,12 +1130,12 @@ WMPropList *GetTexturePanelTexture(TexturePanel * panel)
return prop; return prop;
} }
void SetTexturePanelPixmapPath(TexturePanel * panel, WMPropList * array) void SetTexturePanelPixmapPath(TexturePanel *panel, WMPropList *array)
{ {
panel->pathList = array; panel->pathList = array;
} }
TexturePanel *CreateTexturePanel(WMWindow * keyWindow) TexturePanel *CreateTexturePanel(WMWindow *keyWindow)
/*CreateTexturePanel(WMScreen *scr)*/ /*CreateTexturePanel(WMScreen *scr)*/
{ {
TexturePanel *panel; TexturePanel *panel;
@@ -1407,6 +1406,7 @@ TexturePanel *CreateTexturePanel(WMWindow * keyWindow)
WMAddPopUpButtonItem(panel->arrP, _("Scale")); WMAddPopUpButtonItem(panel->arrP, _("Scale"));
WMAddPopUpButtonItem(panel->arrP, _("Center")); WMAddPopUpButtonItem(panel->arrP, _("Center"));
WMAddPopUpButtonItem(panel->arrP, _("Maximize")); WMAddPopUpButtonItem(panel->arrP, _("Maximize"));
WMAddPopUpButtonItem(panel->arrP, _("Fill"));
WMSetPopUpButtonSelectedItem(panel->arrP, 0); WMSetPopUpButtonSelectedItem(panel->arrP, 0);
WMMapSubwidgets(panel->imageF); WMMapSubwidgets(panel->imageF);
@@ -1475,7 +1475,7 @@ TexturePanel *CreateTexturePanel(WMWindow * keyWindow)
char *ProgName = "test"; char *ProgName = "test";
void testOKButton(WMWidget * self, void *data) void testOKButton(WMWidget *self, void *data)
{ {
char *test; char *test;
Display *dpy; Display *dpy;
@@ -1504,13 +1504,13 @@ void testOKButton(WMWidget * self, void *data)
} }
void testCancelButton(WMWidget * self, void *data) void testCancelButton(WMWidget *self, void *data)
{ {
wwarning("Exiting test...."); wwarning("Exiting test....");
exit(0); exit(0);
} }
void wAbort() void wAbort(void)
{ {
exit(1); exit(1);
} }
WPrefs.app/WPrefs.c
+1 -1
View File
@@ -602,7 +602,7 @@ static void loadConfigurations(WMScreen * scr, WMWindow * mainw)
char *path; char *path;
FILE *file; FILE *file;
char buffer[1024]; char buffer[1024];
char mbuf[1024]; char mbuf[1069]; /* Size of buffer and extra characters for the sprintfs */
int v1, v2, v3; int v1, v2, v3;
path = wdefaultspathfordomain("WindowMaker"); path = wdefaultspathfordomain("WindowMaker");
WPrefs.app/main.c
-16
View File
@@ -66,19 +66,6 @@ static void print_help(const char *progname)
puts(_(" --help print this message and exit")); puts(_(" --help print this message and exit"));
} }
#if 0
static RETSIGTYPE handleDeadChild(int sig)
{
pid_t pid;
int status;
pid = waitpid(-1, &status, WNOHANG);
if (pid > 0) {
DeadChildren[DeadChildrenCount++] = pid;
}
}
#endif
void AddDeadChildHandler(pid_t pid, void (*handler) (void *), void *data) void AddDeadChildHandler(pid_t pid, void (*handler) (void *), void *data)
{ {
int i; int i;
@@ -164,9 +151,6 @@ int main(int argc, char **argv)
wfatal(_("could not open display %s"), XDisplayName(display_name)); wfatal(_("could not open display %s"), XDisplayName(display_name));
exit(0); exit(0);
} }
#if 0
XSynchronize(dpy, 1);
#endif
scr = WMCreateScreen(dpy, DefaultScreen(dpy)); scr = WMCreateScreen(dpy, DefaultScreen(dpy));
if (!scr) { if (!scr) {
wfatal(_("could not initialize application")); wfatal(_("could not initialize application"));
WPrefs.app/po/Makefile.am
+1 -1
View File
@@ -5,7 +5,7 @@ CATALOGS = @WPREFSMOFILES@
CLEANFILES = $(DOMAIN).pot $(CATALOGS) CLEANFILES = $(DOMAIN).pot $(CATALOGS)
EXTRA_DIST = bg.po ca.po cs.po de.po es.po et.po fi.po fr.po fy.po hr.po hu.po \ EXTRA_DIST = bg.po ca.po cs.po de.po es.po et.po fi.po fr.po fy.po hr.po hu.po \
it.po ja.po ko.po nl.po pt.po ru.po sk.po uk.po zh_CN.po zh_TW.po it.po ja.po ko.po nl.po pt.po ru.po sk.po tr.po uk.po zh_CN.po zh_TW.po
POTFILES = \ POTFILES = \
$(top_srcdir)/WPrefs.app/Appearance.c \ $(top_srcdir)/WPrefs.app/Appearance.c \
WPrefs.app/po/README
+2 -2
View File
@@ -1,7 +1,7 @@
File Language Current Maintainer File Language Current Maintainer
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
pt.po Portuguese Eliphas Levy Theodoro <eliphas@conectiva.com.br> pt.po Portuguese Eliphas Levy Theodoro <eliphas@conectiva.com.br>
hr.po Croatian Toni Biliæ <tbilic@oliver.efos.hr> hr.po Croatian Toni Biliæ <tbilic@oliver.efos.hr>
fr.po French Bastien NOCERA <hadess@writeme.com> fr.po French Bastien NOCERA <hadess@writeme.com>
Hadess <hadess@infonie.fr> Hadess <hadess@infonie.fr>
Antoine Hulin <antoine@origan.fdn.org> Antoine Hulin <antoine@origan.fdn.org>
@@ -23,6 +23,6 @@ bg.po Bulgarian Slavei Karadjov <slaff@exco.net>
Anton Zinoviev <zinoviev@debian.org> Anton Zinoviev <zinoviev@debian.org>
sk.po Slovak Jan 'judas' Tomka <judas@linux.sk> sk.po Slovak Jan 'judas' Tomka <judas@linux.sk>
et.po Estonian Ivar Smolin <okul@linux.ee> et.po Estonian Ivar Smolin <okul@linux.ee>
ca.po Catalan Ernest Adrogué <eadrogue@gmx.net> ca.po Catalan Ernest Adrogué <eadrogue@gmx.net>
nl.po Dutch Alwin <translations@ziggo.nl> nl.po Dutch Alwin <translations@ziggo.nl>
fy.po Frisian Alwin <translations@ziggo.nl> fy.po Frisian Alwin <translations@ziggo.nl>
WPrefs.app/po/de.po
+1 -1
View File
@@ -819,7 +819,7 @@ msgstr "Clip in den Vor-/Hintergrund"
#: ../../WPrefs.app/KeyboardShortcuts.c:518 #: ../../WPrefs.app/KeyboardShortcuts.c:518
msgid "Toggle keyboard language" msgid "Toggle keyboard language"
msgstr "Tastatursbelegung ändern" msgstr "Tastaturbelegung ändern"
#: ../../WPrefs.app/KeyboardShortcuts.c:532 #: ../../WPrefs.app/KeyboardShortcuts.c:532
msgid "Shortcut" msgid "Shortcut"
WPrefs.app/po/et.po
+1 -1
View File
@@ -1671,7 +1671,7 @@ msgstr "Keela tiitliriba"
msgid "" msgid ""
"Remove the titlebar of this window.\n" "Remove the titlebar of this window.\n"
"To access the window commands menu of a window\n" "To access the window commands menu of a window\n"
"without it's titlebar, press Control+Esc (or the\n" "without its titlebar, press Control+Esc (or the\n"
"equivalent shortcut, if you changed the default\n" "equivalent shortcut, if you changed the default\n"
"settings)." "settings)."
msgstr "" msgstr ""
WPrefs.app/po/fy.po
+411 -443
View File
File diff suppressed because it is too large Load Diff
WPrefs.app/po/nl.po
+296 -330
View File
File diff suppressed because it is too large Load Diff
WPrefs.app/po/ru.po
+69 -18
View File
@@ -380,45 +380,71 @@ msgstr ""
"параметров и количества цветов для резервирования за\n" "параметров и количества цветов для резервирования за\n"
"Window Maker'ом при работе с 8bit'ным цветом (8bpp)." "Window Maker'ом при работе с 8bit'ным цветом (8bpp)."
#: ../../WPrefs.app/Expert.c:75 #: ../../WPrefs.app/Expert.c:44
msgid "" msgid "Disable miniwindows (icons for minimized windows). For use with KDE/GNOME."
"Disable miniwindows (icons for miniaturized windows). For use with KDE/GNOME." msgstr "Запретить миниокна иконки для минимизированных окон. Для использования с KDE/GNOME."
msgstr ""
"Запретить миниокна (иконки для минимизированных окон). Для использования с "
"KDE/GNOME."
#: ../../WPrefs.app/Expert.c:76 #: ../../WPrefs.app/Expert.c:47
msgid "Ignore decoration hints for GTK applications."
msgstr "Игнорировать декорацию окон для GTK приложений."
#: ../../WPrefs.app/Expert.c:53
msgid "Do not set non-WindowMaker specific parameters (do not use xset)." msgid "Do not set non-WindowMaker specific parameters (do not use xset)."
msgstr "" msgstr ""
"Не устанавливать параметры, не относящиеся непосредственно к\n" "Не устанавливать параметры, не относящиеся непосредственно к\n"
"Window Maker'у (не использовать xset)." "Window Maker'у (не использовать xset)."
#: ../../WPrefs.app/Expert.c:77 #: ../../WPrefs.app/Expert.c:56
msgid "Automatically save session when exiting Window Maker." msgid "Automatically save session when exiting Window Maker."
msgstr "Автоматически сохранять сессию при выходе из Window Maker'а." msgstr "Автоматически сохранять сессию при выходе из Window Maker'а."
#: ../../WPrefs.app/Expert.c:78 #: ../../WPrefs.app/Expert.c:59
msgid "Use SaveUnder in window frames, icons, menus and other objects." msgid "Use SaveUnder in window frames, icons, menus and other objects."
msgstr "Использовать SaveUnder для окон, иконок, меню и других объектов." msgstr "Использовать SaveUnder для окон, иконок, меню и других объектов."
#: ../../WPrefs.app/Expert.c:79 #: ../../WPrefs.app/Expert.c:62
msgid "Use Windoze style cycling."
msgstr "Переключение окон в стиле Windows"
#: ../../WPrefs.app/Expert.c:80
msgid "Disable confirmation panel for the Kill command." msgid "Disable confirmation panel for the Kill command."
msgstr "Запретить диалог подтверждения для команды `Убить'." msgstr "Запретить диалог подтверждения для команды `Убить'."
# awn: FIXME: что это вообще значит?
#: ../../WPrefs.app/Expert.c:81
msgid "Disable selection animation for selected icons." msgid "Disable selection animation for selected icons."
msgstr "Запретить анимацию выбора для выбранных иконок." msgstr "Запретить анимацию выбора для выбранных иконок."
#: ../../WPrefs.app/Expert.c:115 msgid "Show switch panel when cycling windows."
msgstr "Показывать панель переключения окон."
#: ../../WPrefs.app/Expert.c:68
msgid "Smooth font edges (needs restart)."
msgstr "Cглаживание шрифтов (требуется перезагрузка)."
#: ../../WPrefs.app/Expert.c:80
msgid "Show workspace title on Clip."
msgstr "Показывать имя рабочего места на скрепке."
#: ../../WPrefs.app/Expert.c:83
msgid "Highlight the icon of the application when it has the focus."
msgstr "Подсвечивание иконок при нажатии (в фокусе)."
#: ../../WPrefs.app/Expert.c:91
msgid "Maximize (snap) a window to edge or corner by dragging."
msgstr "Прилипания окон по краям и углам."
#: ../../WPrefs.app/Expert.c:100
msgid "Snapping a window to the top maximizes it to the full screen."
msgstr "Распахнуть окно при перетаскивании к верхнему краю."
#: ../../WPrefs.app/Expert.c:118
msgid "Double click on titlebar maximize a window to full screen."
msgstr "Распахнуть окно двойным щелчком."
#: ../../WPrefs.app/Expert.c:121
msgid "Close rootmenu when mouse (left or right) is clicked outside focus."
msgstr "Закрывать меню приложений правым или левым щелчком мыши вне фокуса."
#: ../../WPrefs.app/Expert.c:328
msgid "Expert User Preferences" msgid "Expert User Preferences"
msgstr "Установки для опытного пользователя" msgstr "Установки для опытного пользователя"
#: ../../WPrefs.app/Expert.c:117 #: ../../WPrefs.app/Expert.c:330
msgid "" msgid ""
"Options for people who know what they're doing...\n" "Options for people who know what they're doing...\n"
"Also have some other misc. options." "Also have some other misc. options."
@@ -623,6 +649,11 @@ msgstr ""
"Параметры обработки иконок и миниокон. Размещение иконок,\n" "Параметры обработки иконок и миниокон. Размещение иконок,\n"
"размер иконок, в каком стиле анимировать сворачивание." "размер иконок, в каком стиле анимировать сворачивание."
#: ../../WPrefs.app/Icons.c:414
msgid "Single click activation"
msgstr "Одинарный щелчок мыши"
#: ../../WPrefs.app/imagebrowser.c:95 #: ../../WPrefs.app/imagebrowser.c:95
msgid "View" msgid "View"
msgstr "" msgstr ""
@@ -1901,6 +1932,10 @@ msgstr ""
msgid "Resist" msgid "Resist"
msgstr "Упираться" msgstr "Упираться"
#: ../../WPrefs.app/WindowHandling.c:406
msgid "Opaque Move/Resize"
msgstr "Перемещ/Измен.разм."
#: ../../WPrefs.app/WindowHandling.c:407 #: ../../WPrefs.app/WindowHandling.c:407
msgid "Attract" msgid "Attract"
msgstr "Притягиваться" msgstr "Притягиваться"
@@ -1923,6 +1958,22 @@ msgstr ""
"Как обращаться с окнами. Начальное расположение окон.\n" "Как обращаться с окнами. Начальное расположение окон.\n"
"Сопротивляемость границ. Сплошное/каркасное перемещение, и т.п." "Сопротивляемость границ. Сплошное/каркасное перемещение, и т.п."
#: ../../WPrefs.app/WindowHandling.c:474
msgid "by keyboard"
msgstr "c помощ.клав."
#: ../../WPrefs.app/WindowHandling.c:490
msgid "...do not cover:"
msgstr "не перекрывать:"
#: ../../WPrefs.app/WindowHandling.c:497
msgid "Icons"
msgstr "Иконок"
#: ../../WPrefs.app/WindowHandling.c:502
msgid "The dock"
msgstr "Дока"
#: ../../WPrefs.app/Workspace.c:176 #: ../../WPrefs.app/Workspace.c:176
msgid "Workspace Navigation" msgid "Workspace Navigation"
msgstr "Навигация по рабочим пространствам" msgstr "Навигация по рабочим пространствам"
WPrefs.app/po/tr.po
+2627
View File
File diff suppressed because it is too large Load Diff
WPrefs.app/tiff/ergonomic.tiff
BIN
View File
Binary file not shown.
WindowMaker/Defaults/Makefile.am
+4 -6
View File
@@ -1,6 +1,3 @@
defsdatadir = $(sysconfdir)/WindowMaker
defsdata_DATA = WMRootMenu WMWindowAttributes WindowMaker WMState WMGLOBAL defsdata_DATA = WMRootMenu WMWindowAttributes WindowMaker WMState WMGLOBAL
wpexecbindir = @wprefs_bindir@ wpexecbindir = @wprefs_bindir@
@@ -15,7 +12,8 @@ WMWindowAttributes: $(srcdir)/WMWindowAttributes.in
chmod 644 WMWindowAttributes chmod 644 WMWindowAttributes
WindowMaker: $(srcdir)/WindowMaker.in WindowMaker: $(srcdir)/WindowMaker.in
$(AM_V_GEN)sed -e "s:#pkgdatadir#:$(pkgdatadir):" $(srcdir)/WindowMaker.in \ $(AM_V_GEN)sed -e "s:#pkgdatadir#:$(pkgdatadir):" \
-e "s:#pixmapdir#:$(pixmapdir):" $(srcdir)/WindowMaker.in \
> WindowMaker ; \ > WindowMaker ; \
chmod 644 WindowMaker chmod 644 WindowMaker
@@ -23,5 +21,5 @@ WMState: $(srcdir)/WMState.in
$(AM_V_GEN)sed -e "s:#wprefs#:$(wpexecbindir)/WPrefs:" $(srcdir)/WMState.in > WMState ; \ $(AM_V_GEN)sed -e "s:#wprefs#:$(wpexecbindir)/WPrefs:" $(srcdir)/WMState.in > WMState ; \
chmod 644 WMState chmod 644 WMState
WMRootMenu: $(srcdir)/../plmenu WMRootMenu: ./../plmenu
$(AM_V_GEN)cp -f $(srcdir)/../plmenu WMRootMenu $(AM_V_GEN)cp -f ./../plmenu WMRootMenu
WindowMaker/Defaults/WindowMaker.in
+249 -137
View File
@@ -1,139 +1,251 @@
{ {
SmoothWorkspaceBack = NO; ColormapSize = 4;
PopupSwitchMenu = NO; DisableDithering = NO;
MenuStyle = normal; IconSize = 64;
DisableMiniwindows = NO; ModifierKey = Mod1;
DisableWorkspacePager = NO; FocusMode = manual;
OpenTransientOnOwnerWorkspace = NO; NewStyle = new;
EdgeResistance = 30; DisableDock = NO;
WorkspaceBorderSize = 0; DisableClip = NO;
WorkspaceBorder = None; DisableDrawers = NO;
IconificationStyle = Zoom; ClipMergedInDock = NO;
IconPath = ( DisableMiniwindows = NO;
"~/GNUstep/Library/Icons", EnableWorkspacePager = NO;
"#pkgdatadir#/Icons", IconPosition = blh;
"#pkgdatadir#/Pixmaps", IconificationStyle = Zoom;
"/usr/include/X11/pixmaps", DisableWSMouseActions = NO;
"~/GNUstep/Library/WindowMaker/Pixmaps", MouseLeftButtonAction = SelectWindows;
"~/GNUstep/Library/WindowMaker/CachedPixmaps", MouseMiddleButtonAction = OpenWindowListMenu;
"/usr/share/icons", MouseRightButtonAction = OpenApplicationsMenu;
"/usr/local/share/pixmaps", MouseBackwardButtonAction = None;
"/usr/share/pixmaps" MouseForwardButtonAction = None;
); MouseWheelAction = None;
PixmapPath = ( MouseWheelTiltAction = None;
"~/GNUstep/Library/WindowMaker/Pixmaps", PixmapPath = (
"~/GNUstep/Library/WindowMaker/Backgrounds", "~/GNUstep/Library/WindowMaker/Pixmaps",
"~/GNUstep/Library/WindowMaker/CachedPixmaps", "~/GNUstep/Library/WindowMaker/Backgrounds",
"#pkgdatadir#/Pixmaps", "~/GNUstep/Library/WindowMaker/CachedPixmaps",
"#pkgdatadir#/Backgrounds", "~/pixmaps",
"/usr/include/X11/pixmaps", "#pkgdatadir#/Pixmaps",
"/usr/local/share/pixmaps", "#pkgdatadir#/Backgrounds",
"/usr/share/pixmaps" "#pixmapdir#"
); );
WindowTitleBalloons = YES; IconPath = (
IconSize = 64; "~/GNUstep/Library/Icons",
FocusMode = manual; "~/GNUstep/Library/WindowMaker/Pixmaps",
DisableWSMouseActions = NO; "~/GNUstep/Library/WindowMaker/CachedPixmaps",
MouseLeftButtonAction = SelectWindows; "~/pixmaps",
MouseMiddleButtonAction = OpenWindowListMenu; "#pkgdatadir#/Icons",
MouseRightButtonAction = OpenApplicationsMenu; "#pkgdatadir#/Pixmaps",
MouseWheelAction = None; "#pixmapdir#"
ColormapSize = 4; );
DisableDithering = NO; ColormapMode = auto;
ModifierKey = Mod1; AutoFocus = YES;
NewStyle = "new"; RaiseDelay = 0;
DisableDock = NO; CirculateRaise = NO;
DisableClip = NO; Superfluous = YES;
DisableDrawers = NO; AdvanceToNewWorkspace = NO;
Superfluous = YES; CycleWorkspaces = NO;
StickyIcons = NO; WorkspaceNameDisplayPosition = center;
SaveSessionOnExit = NO; WorkspaceBorder = None;
ColormapMode = auto; WorkspaceBorderSize = 0;
RaiseDelay = 0; StickyIcons = NO;
AutoFocus = YES; SaveSessionOnExit = NO;
WindowPlacement = auto; WrapMenus = NO;
WindowPlaceOrigin = (64, 0); ScrollableMenus = YES;
UseSaveUnders = NO; MenuScrollSpeed = fast;
DisableSound = NO; IconSlideSpeed = fast;
DisableAnimations = NO; ShadeSpeed = fast;
DontLinkWorkspaces = YES; BounceAppIconsWhenUrgent = YES;
AutoArrangeIcons = NO; RaiseAppIconsWhenBouncing = NO;
AdvanceToNewWorkspace = NO; DoNotMakeAppIconsBounce = NO;
CycleWorkspaces = NO; DoubleClickTime = 250;
ResizeDisplay = center; ClipAutoraiseDelay = 600;
MoveDisplay = floating; ClipAutolowerDelay = 1000;
OpaqueMove = YES; ClipAutoexpandDelay = 600;
IconPosition = "blh"; ClipAutocollapseDelay = 1000;
WrapMenus = NO; WrapAppiconsInDock = YES;
ScrollableMenus = YES; AlignSubmenus = NO;
MenuScrollSpeed = fast; ViKeyMenus = NO;
IconSlideSpeed = fast; OpenTransientOnOwnerWorkspace = NO;
ShadeSpeed = fast; WindowPlacement = auto;
DoubleClickTime = 250; IgnoreFocusClick = NO;
AlignSubmenus = NO; UseSaveUnders = NO;
NoWindowOverIcons = NO; OpaqueMove = YES;
IgnoreFocusClick = NO; OpaqueResize = NO;
CloseKey = None; OpaqueMoveResizeKeyboard = NO;
MaximizeKey = None; DisableAnimations = NO;
VMaximizeKey = None; DontLinkWorkspaces = YES;
RaiseLowerKey = None; WindowSnapping = NO;
DontConfirmKill = NO; SnapEdgeDetect = 1;
ShadeKey = None; SnapCornerDetect = 10;
NextWorkspaceKey = "Mod1+Control+Right"; SnapToTopMaximizesFullscreen = NO;
PrevWorkspaceKey = "Mod1+Control+Left"; DragMaximizedWindow = Move;
RootMenuKey = F12; MoveHalfMaximizedWindowsBetweenScreens = NO;
WindowListKey = F11; AlternativeHalfMaximized = NO;
WindowMenuKey = "Control+Escape"; PointerWithHalfMaxWindows = NO;
RaiseKey = "Mod1+Up"; HighlightActiveApp = YES;
LowerKey = "Mod1+Down"; AutoArrangeIcons = NO;
FocusNextKey = "Mod1+Tab"; NoWindowOverDock = NO;
FocusPrevKey = "Mod1+Shift+Tab"; NoWindowOverIcons = NO;
Workspace1Key = "Mod1+1"; WindowPlaceOrigin = (64, 0);
Workspace2Key = "Mod1+2"; ResizeDisplay = center;
Workspace3Key = "Mod1+3"; MoveDisplay = floating;
Workspace4Key = "Mod1+4"; DontConfirmKill = NO;
Workspace5Key = "Mod1+5"; WindowTitleBalloons = YES;
Workspace6Key = "Mod1+6"; MiniwindowTitleBalloons = NO;
Workspace7Key = "Mod1+7"; MiniwindowPreviewBalloons = NO;
Workspace8Key = "Mod1+8"; AppIconBalloons = NO;
Workspace9Key = "Mod1+9"; HelpBalloons = NO;
Workspace10Key = "Mod1+0"; EdgeResistance = 30;
HideKey = "Mod1+H"; ResizeIncrement = 0;
SelectKey = None; Attraction = NO;
MiniaturizeKey = "Mod1+M"; DisableBlinking = NO;
NextWorkspaceLayerKey = None; SingleClickLaunch = NO;
PrevWorkspaceLayerKey = None; StrictWindozeCycle = YES;
ConstrainWindowSize = NO; SwitchPanelOnlyOpen = NO;
DockRaiseLowerKey = None; MiniPreviewSize = 128;
ClipRaiseLowerKey = None; IgnoreGtkHints = NO;
TitleJustify = center; MenuStyle = normal;
WindowTitleFont = "Sans:bold:pixelsize=12"; WidgetColor = (solid, gray);
MenuTitleFont = "Sans:bold:pixelsize=12"; WorkspaceSpecificBack = ();
MenuTextFont = "Sans:pixelsize=12"; WorkspaceBack = (solid, "rgb:50/50/75");
IconTitleFont = "Sans:pixelsize=9"; SmoothWorkspaceBack = NO;
ClipTitleFont = "Sans:bold:pixelsize=10"; IconBack = (dgradient, "rgb:a6/a6/b6", "rgb:51/55/61");
LargeDisplayFont = "Sans:pixelsize=24"; TitleJustify = center;
HighlightColor = white; WindowTitleFont = "Sans:bold:pixelsize=12";
HighlightTextColor = black; WindowTitleExtendSpace = 0;
ClipTitleColor = black; WindowTitleMinHeight = 0;
CClipTitleColor = "rgb:61/61/61"; WindowTitleMaxHeight = 0x7fffffff;
FTitleColor = white; MenuTitleExtendSpace = 0;
PTitleColor = white; MenuTitleMinHeight = 0;
UTitleColor = black; MenuTitleMaxHeight = 0x7fffffff;
MenuTitleColor = white; MenuTextExtendSpace = 0;
MenuTextColor = black; MenuTitleFont = "Sans:bold:pixelsize=12";
MenuDisabledColor = gray50; MenuTextFont = "Sans:pixelsize=12";
WorkspaceBack = (solid, "rgb:50/50/75"); IconTitleFont = "Sans:pixelsize=9";
MenuTextColor = black; ClipTitleFont = "Sans:bold:pixelsize=10";
FTitleBack = (solid, black); ShowClipTitle = YES;
UTitleBack = (solid, "rgb:aa/aa/aa"); LargeDisplayFont = "Sans:pixelsize=24";
ResizebarBack = (solid, "rgb:aa/aa/aa"); HighlightColor = white;
PTitleBack = (solid, gray40); HighlightTextColor = black;
MenuTitleBack = (solid, black); ClipTitleColor = black;
MenuTextBack = (solid, "rgb:aa/aa/aa"); CClipTitleColor = "rgb:61/61/61";
IconBack = (dgradient, "rgb:a6/a6/b6", "rgb:51/55/61"); FTitleColor = white;
ClipAutocollapseDelay = 1000; PTitleColor = white;
ClipAutolowerDelay = 1000; UTitleColor = black;
ClipAutoexpandDelay = 600; FTitleBack = (solid, black);
ClipAutoraiseDelay = 600; PTitleBack = (solid, gray40);
UTitleBack = (solid, "rgb:aa/aa/aa");
ResizebarBack = (solid, "rgb:aa/aa/aa");
MenuTitleColor = white;
MenuTextColor = black;
MenuDisabledColor = gray50;
MenuTitleBack = (solid, black);
MenuTextBack = (solid, "rgb:aa/aa/aa");
IconTitleColor = white;
IconTitleBack = black;
SwitchPanelImages = (swtile.png, swback.png, 30, 40);
ModifierKeyLabels = ("Shift+", "Control+", "Mod1+", "Mod2+", "Mod3+", "Mod4+", "Mod5+");
FrameBorderWidth = 1;
FrameBorderColor = black;
FrameFocusedBorderColor = black;
FrameSelectedBorderColor = white;
WorkspaceMapBack = (solid, black);
RootMenuKey = F12;
WindowListKey = F11;
WindowMenuKey = "Control+Escape";
DockRaiseLowerKey = None;
ClipRaiseLowerKey = None;
MiniaturizeKey = "Mod1+M";
MinimizeAllKey = None;
HideKey = "Mod1+H";
HideOthersKey = None;
MoveResizeKey = None;
CloseKey = None;
MaximizeKey = None;
VMaximizeKey = None;
HMaximizeKey = None;
LHMaximizeKey = None;
RHMaximizeKey = None;
THMaximizeKey = None;
BHMaximizeKey = None;
LTCMaximizeKey = None;
RTCMaximizeKey = None;
LBCMaximizeKey = None;
RBCMaximizeKey = None;
MaximusKey = None;
KeepOnTopKey = None;
KeepAtBottomKey = None;
OmnipresentKey = None;
RaiseKey = "Mod1+Up";
LowerKey = "Mod1+Down";
RaiseLowerKey = None;
ShadeKey = None;
SelectKey = None;
WorkspaceMapKey = None;
FocusNextKey = "Mod1+Tab";
FocusPrevKey = "Mod1+Shift+Tab";
GroupNextKey = None;
GroupPrevKey = None;
NextWorkspaceKey = "Mod1+Control+Right";
PrevWorkspaceKey = "Mod1+Control+Left";
LastWorkspaceKey = None;
NextWorkspaceLayerKey = None;
PrevWorkspaceLayerKey = None;
Workspace1Key = "Mod1+1";
Workspace2Key = "Mod1+2";
Workspace3Key = "Mod1+3";
Workspace4Key = "Mod1+4";
Workspace5Key = "Mod1+5";
Workspace6Key = "Mod1+6";
Workspace7Key = "Mod1+7";
Workspace8Key = "Mod1+8";
Workspace9Key = "Mod1+9";
Workspace10Key = "Mod1+0";
MoveToWorkspace1Key = None;
MoveToWorkspace2Key = None;
MoveToWorkspace3Key = None;
MoveToWorkspace4Key = None;
MoveToWorkspace5Key = None;
MoveToWorkspace6Key = None;
MoveToWorkspace7Key = None;
MoveToWorkspace8Key = None;
MoveToWorkspace9Key = None;
MoveToWorkspace10Key = None;
MoveToNextWorkspaceKey = None;
MoveToPrevWorkspaceKey = None;
MoveToLastWorkspaceKey = None;
MoveToNextWorkspaceLayerKey = None;
MoveToPrevWorkspaceLayerKey = None;
WindowShortcut1Key = None;
WindowShortcut2Key = None;
WindowShortcut3Key = None;
WindowShortcut4Key = None;
WindowShortcut5Key = None;
WindowShortcut6Key = None;
WindowShortcut7Key = None;
WindowShortcut8Key = None;
WindowShortcut9Key = None;
WindowShortcut10Key = None;
WindowRelaunchKey = None;
ScreenSwitchKey = None;
RunKey = None;
NormalCursor = (builtin, left_ptr);
ArrowCursor = (builtin, top_left_arrow);
MoveCursor = (builtin, fleur);
ResizeCursor = (builtin, sizing);
TopLeftResizeCursor = (builtin, top_left_corner);
TopRightResizeCursor = (builtin, top_right_corner);
BottomLeftResizeCursor = (builtin, bottom_left_corner);
BottomRightResizeCursor = (builtin, bottom_right_corner);
VerticalResizeCursor = (builtin, sb_v_double_arrow);
HorizontalResizeCursor = (builtin, sb_h_double_arrow);
WaitCursor = (builtin, watch);
QuestionCursor = (builtin, question_arrow);
TextCursor = (builtin, xterm);
SelectCursor = (builtin, cross);
DialogHistoryLines = 500;
CycleActiveHeadOnly = NO;
CycleIgnoreMinimized = NO;
} }
WindowMaker/Makefile.am
+52 -33
View File
@@ -1,52 +1,29 @@
SUBDIRS = Backgrounds Defaults IconSets Icons Pixmaps Styles Themes SUBDIRS = Backgrounds . Defaults IconSets Icons Pixmaps Styles Themes
prefsdatadir = $(pkgdatadir) prefsdatadir = $(pkgdatadir)
prefsdata_DATA =\ wpexecbindir = @wprefs_bindir@
# menus which need generated to have correct path to WPrefs or data directory
GENERATED_MENUS =\
appearance.menu\ appearance.menu\
autostart.sh\ appearance.menu.fy\
background.menu\ appearance.menu.nl\
exitscript.sh\
menu\ menu\
menu.bg\ menu.bg\
menu.ca\
menu.cz\
menu.da\
menu.de\
menu.el\
menu.es\
menu.fi\ menu.fi\
menu.fr\
menu.fy\ menu.fy\
menu.gl\
menu.he\
menu.hr\
menu.hu\ menu.hu\
menu.it\
menu.ja\
menu.ko\ menu.ko\
menu.nl\ menu.nl\
menu.no\
menu.pl\
menu.pt\
menu.ro\ menu.ro\
menu.ru\
menu.se\
menu.sk\ menu.sk\
menu.sl\
menu.tr\
menu.zh_CN\
menu.zh_TW\ menu.zh_TW\
plmenu\ plmenu\
plmenu.bg\ plmenu.bg\
plmenu.da\
plmenu.de\
plmenu.es\ plmenu.es\
plmenu.fi\ plmenu.fi\
plmenu.fr\
plmenu.fy\ plmenu.fy\
plmenu.hr\
plmenu.it\
plmenu.ja\ plmenu.ja\
plmenu.ko\ plmenu.ko\
plmenu.nl\ plmenu.nl\
@@ -55,10 +32,52 @@ prefsdata_DATA =\
plmenu.sk\ plmenu.sk\
plmenu.zh_CN\ plmenu.zh_CN\
plmenu.zh_TW\ plmenu.zh_TW\
README\
README.themes\
wmmacros wmmacros
EXTRA_DIST = $(prefsdata_DATA) mkMakefile # menus which do not mention WPrefs or data directory
NONGENERATED_MENUS =\
menu.ca\
menu.cz\
menu.da\
menu.de\
menu.el\
menu.es\
menu.fr\
menu.gl\
menu.he\
menu.hr\
menu.it\
menu.ja\
menu.no\
menu.pl\
menu.pt\
menu.ru\
menu.se\
menu.sl\
menu.tr\
menu.zh_CN\
plmenu.da\
plmenu.de\
plmenu.fr\
plmenu.hr\
plmenu.it
dist_prefsdata_DATA =\
autostart.sh\
background.menu\
background.menu.fy\
background.menu.nl\
exitscript.sh\
README\
README.themes\
$(NONGENERATED_MENUS)
nodist_prefsdata_DATA = $(GENERATED_MENUS)
EXTRA_DIST = $(addsuffix .in, $(GENERATED_MENUS))
CLEANFILES = $(GENERATED_MENUS)
$(GENERATED_MENUS):
$(AM_V_GEN)sed -e "s:#wprefs#:$(wpexecbindir)/WPrefs:" \
-e "s:#wmdatadir#:$(pkgdatadir):" $(srcdir)/$@.in > $@
WindowMaker/Pixmaps/swback.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.4 KiB

After

Width:  |  Height:  |  Size: 8.8 KiB

WindowMaker/Pixmaps/swback2.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 8.5 KiB

WindowMaker/Pixmaps/swtile.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 8.4 KiB

WindowMaker/README
+3 -3
View File
@@ -36,7 +36,7 @@ menu.ja Japanese MANOME Tomonori <manome@itlb.te.noda.sut.ac.jp>
ABE Shige <sabe@ibm.net> ABE Shige <sabe@ibm.net>
menu.pt Portuguese Alfredo K. Kojima <kojima@inf.ufrgs.br> menu.pt Portuguese Alfredo K. Kojima <kojima@inf.ufrgs.br>
menu.de German Carsten Schaar <nhadcasc@fs-maphy.uni-hannover.de> menu.de German Carsten Schaar <nhadcasc@fs-maphy.uni-hannover.de>
menu.cz Czech David ©auer <xsauer@hwlab.felk.cvut.cz> menu.cz Czech David ©auer <xsauer@hwlab.felk.cvut.cz>
menu.ko Korean Chae-Yong Chong <cychong@metro.telecom.samsung.co.kr> menu.ko Korean Chae-Yong Chong <cychong@metro.telecom.samsung.co.kr>
Byeong-Chan Kim <redhands@linux.sarang.net> Byeong-Chan Kim <redhands@linux.sarang.net>
menu.gl Galician Xose Vazquez <xose@arrakis.es> menu.gl Galician Xose Vazquez <xose@arrakis.es>
@@ -44,7 +44,7 @@ menu.fr French ObiTuarY <obituary@freshmeat.net>
menu.it Italian Roberto Checozzo <croberto@aerre.it> menu.it Italian Roberto Checozzo <croberto@aerre.it>
menu.ru Russian August S.Sigov <freedomain@actor.ru> menu.ru Russian August S.Sigov <freedomain@actor.ru>
menu.es Spanish Rodrigo Hornos Prados <tnetrhp@ctv.es> menu.es Spanish Rodrigo Hornos Prados <tnetrhp@ctv.es>
José Luis Rivas López <jrivas@ares.ipf.uvigo.es> José Luis Rivas López <jrivas@ares.ipf.uvigo.es>
menu.he Hebrew Please send me your name/email if you wrote this menu.he Hebrew Please send me your name/email if you wrote this
We unfortunately lost that info :( We unfortunately lost that info :(
menu.tr Turkish F. Kagan Gurkaynak <kgf@wpi.edu> menu.tr Turkish F. Kagan Gurkaynak <kgf@wpi.edu>
@@ -56,7 +56,7 @@ menu.dk Danish John M. Lockard <jlockard@math.lsa.umich.edu>
Jacob Sparre Andersen <sparre@cats.nbi.dk> Jacob Sparre Andersen <sparre@cats.nbi.dk>
menu.sl Slovene Alen Salamun <snowman@hal9000.medinet.si> menu.sl Slovene Alen Salamun <snowman@hal9000.medinet.si>
menu.hu Hungarian Csanaki Csaba <prew@mail.matav.hu> menu.hu Hungarian Csanaki Csaba <prew@mail.matav.hu>
menu.ca Català Carles Amig<F3> dj_fr3nd@hotmail.com menu.ca Català Carles Amig<F3> dj_fr3nd@hotmail.com
menu.zh_TW.Big5 Chinese Li Wei Jih <lwj83@cs.ccu.edu.tw> menu.zh_TW.Big5 Chinese Li Wei Jih <lwj83@cs.ccu.edu.tw>
menu.zh_CN Chinese Wang Jian <wangjian2@asiainfo.com> menu.zh_CN Chinese Wang Jian <wangjian2@asiainfo.com>
menu.pl Polish Maciej Friedel <tytus@tytus.itma.pwr.wroc.pl> menu.pl Polish Maciej Friedel <tytus@tytus.itma.pwr.wroc.pl>
WindowMaker/Styles/Adwaita.style
+35
View File
@@ -0,0 +1,35 @@
{
CClipTitleColor = "#8b8e8e";
ClipTitleColor = "#2e3436";
ClipTitleFont = "Cantarell:slant=0:weight=200:width=100:pixelsize=13";
FrameBorderColor = "#b6b6b3";
FrameFocusedBorderColor = "#b6b6b3";
FrameSelectedBorderColor = "#ffffff";
FTitleBack = (solid, "#e8e8e7");
FTitleColor = "#2e3436";
HighlightColor = "#4a90d9";
HighlightTextColor = "#ffffff";
IconBack = (solid, "#e8e8e7");
IconTitleBack = "#e8e8e7";
IconTitleColor = "#2e3436";
IconTitleFont = "Cantarell:slant=0:weight=80:width=100:pixelsize=9";
LargeDisplayFont = "Cantarell:slant=0:weight=200:width=100:pixelsize=24";
MenuDisabledColor = "#8b8e8e";
MenuStyle = flat;
MenuTextBack = (solid, "#ffffff");
MenuTextColor = "#2e3436";
MenuTextExtendSpace = 0;
MenuTextFont = "Cantarell:slant=0:weight=80:width=100:pixelsize=13";
MenuTitleBack = (solid, "#e8e8e7");
MenuTitleColor = "#2e3436";
MenuTitleExtendSpace = 0;
MenuTitleFont = "Cantarell:slant=0:weight=200:width=100:pixelsize=13";
PTitleBack = (solid, "#e8e8e7");
PTitleColor = "#8b8e8e";
ResizebarBack = (solid, "#e8e8e7");
TitleJustify = center;
UTitleBack = (solid, "#e8e8e7");
UTitleColor = "#8b8e8e";
WindowTitleExtendSpace = 0;
WindowTitleFont = "Cantarell:slant=0:weight=200:width=100:pixelsize=13";
}
WindowMaker/Styles/Makefile.am
+1
View File
@@ -2,6 +2,7 @@
prefsdatadir = $(pkgdatadir)/Styles prefsdatadir = $(pkgdatadir)/Styles
prefsdata_DATA =\ prefsdata_DATA =\
Adwaita.style\
Autumn.style\ Autumn.style\
Black.style\ Black.style\
BlackTexture.style\ BlackTexture.style\
WindowMaker/appearance.menu
-11
View File
@@ -1,11 +0,0 @@
#include "wmmacros"
Appearance MENU
"Background" OPEN_MENU background.menu
"Styles" OPEN_MENU -noext LOCAL_STYLES_DIR STYLES_DIR USER_STYLES_DIR WITH setstyle
"Themes" OPEN_MENU -noext LOCAL_THEMES_DIR THEMES_DIR USER_THEMES_DIR WITH setstyle
"Icon Sets" OPEN_MENU -noext LOCAL_ICON_SETS_DIR ICON_SETS_DIR USER_ICON_SETS_DIR WITH seticons
"Save IconSet" EXEC geticonset USER_ICON_SETS_DIR/"%a(IconSet name)"
"Save Theme" EXEC getstyle -t USER_THEMES_DIR/"%a(Theme name)"
Appearance END
WindowMaker/appearance.menu.fy.in
+12
View File
@@ -0,0 +1,12 @@
#include "wmmacros"
Uterlik MENU
"Eftergrûn" OPEN_MENU background.menu.fy
"Stilen" OPEN_MENU -noext STYLES_DIR USER_STYLES_DIR WITH setstyle
"Tema's" OPEN_MENU -noext THEMES_DIR USER_THEMES_DIR WITH setstyle
"Ikoanesets" OPEN_MENU -noext ICON_SETS_DIR USER_ICON_SETS_DIR WITH seticons
"Ikoaneset bewarje" EXEC geticonset USER_ICON_SETS_DIR/"%a(Ikoanesetnamme)"
"Tema bewarje" EXEC getstyle -p "%a(Temanamme)"
"Foarkarrehelpmiddel" EXEC #wprefs#
Uterlik END
WindowMaker/appearance.menu.in
+12
View File
@@ -0,0 +1,12 @@
#include "wmmacros"
Appearance MENU
"Background" OPEN_MENU background.menu
"Styles" OPEN_MENU -noext STYLES_DIR USER_STYLES_DIR WITH setstyle
"Themes" OPEN_MENU -noext THEMES_DIR USER_THEMES_DIR WITH setstyle
"Icon Sets" OPEN_MENU -noext ICON_SETS_DIR USER_ICON_SETS_DIR WITH seticons
"Save IconSet" EXEC geticonset USER_ICON_SETS_DIR/"%a(IconSet name)"
"Save Theme" EXEC getstyle -p "%a(Theme name)"
"Preferences Utility" EXEC #wprefs#
Appearance END
WindowMaker/appearance.menu.nl.in
+12
View File
@@ -0,0 +1,12 @@
#include "wmmacros"
Uiterlijk MENU
"Achtergrond" OPEN_MENU background.menu.nl
"Stijlen" OPEN_MENU -noext STYLES_DIR USER_STYLES_DIR WITH setstyle
"Thema's" OPEN_MENU -noext THEMES_DIR USER_THEMES_DIR WITH setstyle
"Iconensets" OPEN_MENU -noext ICON_SETS_DIR USER_ICON_SETS_DIR WITH seticons
"Iconenset opslaan" EXEC geticonset USER_ICON_SETS_DIR/"%a(Iconensetnaam)"
"Thema opslaan" EXEC getstyle -p "%a(Themanaam)"
"Voorkeurenhulpmiddel" EXEC #wprefs#
Uiterlijk END
WindowMaker/background.menu
+7 -3
View File
@@ -5,6 +5,7 @@
"Black" WS_BACK '(solid, black)' "Black" WS_BACK '(solid, black)'
"Blue" WS_BACK '(solid, "#505075")' "Blue" WS_BACK '(solid, "#505075")'
"Indigo" WS_BACK '(solid, "#243e6c")' "Indigo" WS_BACK '(solid, "#243e6c")'
"Bluemarine" WS_BACK '(solid, "#224477")'
"Deep Blue" WS_BACK '(solid, "#180090")' "Deep Blue" WS_BACK '(solid, "#180090")'
"Purple" WS_BACK '(solid, "#554466")' "Purple" WS_BACK '(solid, "#554466")'
"Wheat" WS_BACK '(solid, "wheat4")' "Wheat" WS_BACK '(solid, "wheat4")'
@@ -22,7 +23,10 @@
"Wine Shades" WS_BACK '(vgradient, "#600040", "#180010")' "Wine Shades" WS_BACK '(vgradient, "#600040", "#180010")'
"Gradient" END "Gradient" END
"Images" MENU "Images" MENU
"Tiled" OPEN_MENU LOCAL_BACKGROUNDS_DIR BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH wmsetbg -u -t "Tiled" OPEN_MENU BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH wmsetbg -u -t
"Scaled" OPEN_MENU LOCAL_BACKGROUNDS_DIR BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH wmsetbg -u -s "Scaled" OPEN_MENU BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH wmsetbg -u -s
"Image" END "Centered" OPEN_MENU BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH wmsetbg -u -e
"Maximized" OPEN_MENU BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH wmsetbg -u -a
"Filled" OPEN_MENU BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH wmsetbg -u -f
"Images" END
"Background" END "Background" END
WindowMaker/background.menu.fy
+32
View File
@@ -0,0 +1,32 @@
#include "wmmacros"
"Eftergrûn" MENU
"Effen" MENU
"Swart" WS_BACK '(solid, black)'
"Blau" WS_BACK '(solid, "#505075")'
"Indigo" WS_BACK '(solid, "#243e6c")'
"Marineblau" WS_BACK '(solid, "#224477")'
"Djipblau" WS_BACK '(solid, "#180090")'
"Poarper" WS_BACK '(solid, "#554466")'
"Weet" WS_BACK '(solid, "wheat4")'
"Donkergriis" WS_BACK '(solid, "#333340")'
"Wynread" WS_BACK '(solid, "#400020")'
"Effen" END
"Kleurferrin" MENU
"Sinneûndergong" WS_BACK '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'
"Loft" WS_BACK '(vgradient, blue4, white)'
"Blautinten" WS_BACK '(vgradient, "#7080a5", "#101020")'
"Indigotinten" WS_BACK '(vgradient, "#746ebc", "#242e4c")'
"Poarpertinten" WS_BACK '(vgradient, "#654c66", "#151426")'
"Weettinten" WS_BACK '(vgradient, "#a09060", "#302010")'
"Griistinten" WS_BACK '(vgradient, "#636380", "#131318")'
"Wynreadtinten" WS_BACK '(vgradient, "#600040", "#180010")'
"Kleurferrin" END
"Ofbyldingen" MENU
"Tegele" OPEN_MENU BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH wmsetbg -u -t
"Skaald" OPEN_MENU BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH wmsetbg -u -s
"Sintrearre" OPEN_MENU BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH wmsetbg -u -e
"Maksimalisearre" OPEN_MENU BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH wmsetbg -u -a
"Opfolle" OPEN_MENU BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH wmsetbg -u -f
"Ofbyldingen" END
"Eftergrûn" END
WindowMaker/background.menu.nl
+32
View File
@@ -0,0 +1,32 @@
#include "wmmacros"
"Achtergrond" MENU
"Effen" MENU
"Zwart" WS_BACK '(solid, black)'
"Blauw" WS_BACK '(solid, "#505075")'
"Indigo" WS_BACK '(solid, "#243e6c")'
"Marineblauw" WS_BACK '(solid, "#224477")'
"Diepblauw" WS_BACK '(solid, "#180090")'
"Purper" WS_BACK '(solid, "#554466")'
"Tarwe" WS_BACK '(solid, "wheat4")'
"Donkergrijs" WS_BACK '(solid, "#333340")'
"Wijnrood" WS_BACK '(solid, "#400020")'
"Effen" END
"Kleurverloop" MENU
"Zonsondergang" WS_BACK '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'
"Lucht" WS_BACK '(vgradient, blue4, white)'
"Blauwtinten" WS_BACK '(vgradient, "#7080a5", "#101020")'
"Indigotinten" WS_BACK '(vgradient, "#746ebc", "#242e4c")'
"Purpertinten" WS_BACK '(vgradient, "#654c66", "#151426")'
"Tarwetinten" WS_BACK '(vgradient, "#a09060", "#302010")'
"Grijstinten" WS_BACK '(vgradient, "#636380", "#131318")'
"Wijnroodtinten" WS_BACK '(vgradient, "#600040", "#180010")'
"Kleurverloop" END
"Afbeeldingen" MENU
"Getegeld" OPEN_MENU BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH wmsetbg -u -t
"Geschaald" OPEN_MENU BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH wmsetbg -u -s
"Gecentreerd" OPEN_MENU BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH wmsetbg -u -e
"Gemaximaliseerd" OPEN_MENU BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH wmsetbg -u -a
"Opgevuld" OPEN_MENU BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH wmsetbg -u -f
"Afbeeldingen" END
"Achtergrond" END
WindowMaker/menu.bg → WindowMaker/menu.bg.in
+1 -1
View File
@@ -209,7 +209,7 @@
"Фон" END "Фон" END
"Запази темата" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Theme name,Enter file name:)" "Запази темата" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Theme name,Enter file name:)"
"Запази колекцията иконки" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(IconSet name,Enter file name:)" "Запази колекцията иконки" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(IconSet name,Enter file name:)"
"Пособие за настройки" EXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs "Пособие за настройки" EXEC #wprefs#
"Изглед" END "Изглед" END
"Изход" MENU "Изход" MENU
WindowMaker/menu.fi → WindowMaker/menu.fi.in
+2 -2
View File
@@ -53,7 +53,7 @@
* // it in current position * // it in current position
* OPEN_MENU file.menu * OPEN_MENU file.menu
* 2. Pipe menu handling. * 2. Pipe menu handling.
* // opens command and uses it's stdout to construct menu. * // opens command and uses its stdout to construct menu.
* // Command's output must be a valid menu description. * // Command's output must be a valid menu description.
* // The space between '|' and command itself is optional. * // The space between '|' and command itself is optional.
* OPEN_MENU | command * OPEN_MENU | command
@@ -202,7 +202,7 @@
"Taustat" END "Taustat" END
"Tallenna teema" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Teeman nimi,Kirjoita teematiedoston nimi:)" "Tallenna teema" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Teeman nimi,Kirjoita teematiedoston nimi:)"
"Tallenna kuvakkeet" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(Kuvakesetin nimi,Kirjoita tiedostonnimi:)" "Tallenna kuvakkeet" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(Kuvakesetin nimi,Kirjoita tiedostonnimi:)"
"Asetukset" EXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs "Asetukset" EXEC #wprefs#
"Ulkonäkö" END "Ulkonäkö" END
"Lopeta" MENU "Lopeta" MENU
WindowMaker/menu.fy
-224
View File
@@ -1,224 +0,0 @@
/*
* Hoofdmenu-uitwerking voor WindowMaker
*
* Opmaak is:
*
* <Titel> [SHORTCUT <Sneltoets>] <Commando> <Parameters>
*
* <Titel> is elke tekenreeks te gebruiken als titel. Moet tussen " staan als het
* spaties heeft.
*
* SHORTCUT geeft een sneltoets op voor die ingang. <Sneltoets> heeft
* dezelfde opmaak als de sneltoetsopties in het
* $HOME/GNUstep/Defaults/WindowMaker bestand, zoals RootMenuKey of MiniaturizeKey.
*
* U kunt geen sneltoets opgeven voor een MENU- of OPEN_MENU-onderdeel.
*
* <Commando> een van de geldige commando's:
* MENU - begint (sub)menubepaling
* END - beëindigt (sub)menubepaling
* OPEN_MENU - opent een menu uit een bestand, 'pipe' of map(pen)inhoud,
* en gaat eventueel elk vooraf met een commando.
* WORKSPACE_MENU - voegt een submenu voor werkruimtehandelingen toe. Slechts één
* workspace_menu is toegestaan.
* EXEC <programma> - voert een extern programma uit
* SHEXEC <commando> - voert een 'shell'-commando uit (zoals gimp > /dev/null)
* EXIT - sluit de vensterbeheerder af
* RESTART [<vensterbeheerder>] - herstart WindowMaker, of start een andere
* vensterbeheerder
* REFRESH - vernieuwt het bureaublad
* ARRANGE_ICONS - herschikt de iconen in de werkruimte
* SHUTDOWN - doodt alle cliënten (en sluit de X Window-sessie af)
* SHOW_ALL - plaatst alle vensters in de werkruimte terug
* HIDE_OTHERS - verbergt alle vensters in de werkruimte, behalve die
* focus heeft (of de laatste die focus had)
* SAVE_SESSION - slaat de huidige staat van het bureaublad op, inbegrepen
* alle lopende programma's, al hun 'hints' (afmetingen,
* positie op het scherm, werkruimte waarin ze leven, Dok
* of Clip van waaruit ze werden opgestart, en indien
* geminiaturiseerd, opgerold of verborgen). Slaat tevens de actuele
* werkruimte van de gebruiker op. Alles zal worden hersteld bij elke
* start van windowmaker, tot een andere SAVE_SESSION of
* CLEAR_SESSION wordt gebruikt. Als SaveSessionOnExit = Yes; in
* het WindowMaker-domeinbestand, dan wordt opslaan automatisch
* gedaan bij elke windowmaker-afsluiting, en wordt een
* SAVE_SESSION of CLEAR_SESSION overschreven (zie hierna).
* CLEAR_SESSION - wist een eerder opgeslagen sessie. Dit zal geen
* effect hebben als SaveSessionOnExit is True.
* INFO - toont het Infopaneel
*
* OPEN_MENU-opmaak:
* 1. Menuafhandeling uit bestand.
* // opent bestand.menu, dat een geldig menubestand moet bevatten, en voegt
* // het in op de huidige plaats
* OPEN_MENU bestand.menu
* 2. Menuafhandeling uit pipe.
* // opent commando en gebruikt zeen 'stdout' om een menu aan te maken.
* // Commando-output moet een geldige menubeschrijving zijn.
* // De ruimte tussen '|' en het commando zelf is optioneel.
* // Gebruik '||' in plaats van '|' als u het menu altijd wilt bijwerken
* // bij openen. Dat zou traag kunnen werken.
* OPEN_MENU | commando
* OPEN_MENU || commando
* 3. Mapafhandeling.
* // Opent een of meer mappen en maakt een menu aan, met daarin alle
* // submappen en uitvoerbare bestanden alfabetisch
* // gesorteerd.
* OPEN_MENU /een/map [/een/andere/map ...]
* 4. Mapafhandeling met commando.
* // Opent een of meer mappen en maakt een menu aan, met daarin alle
* // submappen en leesbare bestanden alfabetisch gesorteerd,
* // elk van hen voorafgegaan met commando.
* OPEN_MENU [opties] /een/map [/een/andere/map ...] WITH commando -opties
* Opties:
* -noext haal alles vanaf de laatste punt in de
* bestandsnaam eraf
*
* <Parameters> is het uit te voeren programma.
*
* ** Commandoregelopties in EXEC:
* %s - wordt vervangen door de actuele selectie
* %a(titel[,aanwijzing]) - opent een invoerveld met de opgegeven titel en de
* optionele aanwijzing, en wordt vervangen door wat u intypt
* %w - wordt vervangen door XID voor het actuele gefocust venster
* %W - wordt vervangen door het nummer van de actuele werkruimte
*
* U kunt speciale karakters (zoals % en ") uitschakelen met het \-teken:
* vb.: xterm -T "\"Hallo Wereld\""
*
* U kunt ook ontsnappingstekens gebruiken, zoals \n
*
* Elke MENU-declaratie moet één gekoppelde END-declaratie op het eind hebben.
*
* Voorbeeld:
*
* "Test" MENU
* "XTerm" EXEC xterm
* // maakt een submenu met de inhoud van /usr/openwin/bin aan
* "XView-progr" OPEN_MENU "/usr/openwin/bin"
* // enige X11-programma's in verschillende mappen
* "X11-progr" OPEN_MENU /usr/X11/bin $HOME/bin/X11
* // enige achtergrondafbeeldingen instellen
* "Achtergrond" OPEN_MENU -noext $HOME/afbeeldingen /usr/share/images WITH wmsetbg -u -t
* // voegt het style.menu in met dit onderdeel
* "Stijl" OPEN_MENU style.menu
* "Test" END
*/
#include "wmmacros"
"Programma's" MENU
"Ynfo" MENU
"Ynfopaniel" INFO_PANEL
"Juridyske ynfo" LEGAL_PANEL
"Systeemconsole" EXEC xconsole
"Systeembelêsting" SHEXEC xosview || xload
"Proseslist" EXEC xterm -e top
"Hantliedingbrowser" EXEC xman
"Ynfo" END
"Utfiere..." SHEXEC %a(Utfiere,Typ út te fiere kommando:)
"XTerm" EXEC xterm -sb
"Mozilla Firefox" EXEC firefox
"Wurkromten" WORKSPACE_MENU
"Programma's" MENU
"Gimp" SHEXEC gimp >/dev/null
"Ghostview" EXEC ghostview %a(GhostView,Fier te besjen bestân yn)
"Xpdf" EXEC xpdf %a(Xpdf,Fier te besjen PDF yn)
"Abiword" EXEC abiword
"Dia" EXEC dia
"OpenOffice.org" MENU
"OpenOffice.org" EXEC ooffice
"Writer" EXEC oowriter
"Rekkenblêd" EXEC oocalc
"Draw" EXEC oodraw
"Impress" EXEC ooimpress
"OpenOffice.org" END
"Tekstbewurkers" MENU
"XEmacs" EXEC xemacs
"Emacs" EXEC emacs
"XJed" EXEC xjed
"VI" EXEC xterm -e vi
"GVIM" EXEC gvim
"NEdit" EXEC nedit
"Xedit" EXEC xedit
"Tekstbewurkers" END
"Multymedia" MENU
"XMMS" MENU
"XMMS" EXEC xmms
"XMMS ôfspylje/poazje" EXEC xmms -t
"XMMS stopje" EXEC xmms -s
"XMMS" END
"Xine fideospeler" EXEC xine
"MPlayer" EXEC mplayer
"Multymedia" END
"Programma's" END
"Helpmiddels" MENU
"Rekkenmasine" EXEC xcalc
"Finstereigenskippen" SHEXEC xprop | xmessage -center -title 'xprop' -file -
"Lettertypekiezer" EXEC xfontsel
"Fergrutsje" EXEC wmagnify
"Kleurekaart" EXEC xcmap
"X-programma deadzje" EXEC xkill
"Helpmiddels" END
"Seleksje" MENU
"Kopiearje" SHEXEC echo '%s' | wxcopy
"E-maile nei" EXEC xterm -name mail -T "Pine" -e pine %s
"Navigearje" EXEC netscape %s
"Sykje yn hantlieding" SHEXEC MANUAL_SEARCH(%s)
"Seleksje" END
"Kommando's" MENU
"Oare ferbergje" HIDE_OTHERS
"Alles toane" SHOW_ALL
"Ikoanen skikke" ARRANGE_ICONS
"Fernije" REFRESH
"Ofskoattelje" EXEC xlock -allowroot -usefirst
"Kommando's" END
"Uterlik" MENU
"Tema's" OPEN_MENU -noext THEMES_DIR $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle
"Stilen" OPEN_MENU -noext STYLES_DIR $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle
"Ikoanensets" OPEN_MENU -noext ICON_SETS_DIR $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons
"Eftergrûn" MENU
"Effen" MENU
"Swart" WS_BACK '(solid, black)'
"Blau" WS_BACK '(solid, "#505075")'
"Indigo" WS_BACK '(solid, "#243e6c")'
"Marineblau" WS_BACK '(solid, "#224477")'
"Poarper" WS_BACK '(solid, "#554466")'
"Weet" WS_BACK '(solid, "wheat4")'
"Donkergriis" WS_BACK '(solid, "#333340")'
"Wynread" WS_BACK '(solid, "#400020")'
"Effen" END
"Kleurferrin" MENU
"Sinneûndergong" WS_BACK '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'
"Loft" WS_BACK '(vgradient, blue4, white)'
"Blautinten" WS_BACK '(vgradient, "#7080a5", "#101020")'
"Indigotinten" WS_BACK '(vgradient, "#746ebc", "#242e4c")'
"Poarpertinten" WS_BACK '(vgradient, "#654c66", "#151426")'
"Weettinten" WS_BACK '(vgradient, "#a09060", "#302010")'
"Griistinten" WS_BACK '(vgradient, "#636380", "#131318")'
"Wynreadtinten" WS_BACK '(vgradient, "#600040", "#180010")'
"Kleurferrin" END
"Ofbyldingen" OPEN_MENU -noext BACKGROUNDS_DIR $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t
"Eftergrûn" END
"Tema bewarje" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Temanamme,Fier bestânsnamme yn:)"
"Iconenset bewarje" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(Ikoanensetnamme,Fier bestânsnamme yn:)"
"Foarkarrenhelpmiddel" EXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs
"Uterlik" END
"Sesje" MENU
"Sesje bewarje" SAVE_SESSION
"Sesje wiskje" CLEAR_SESSION
"Window Maker werstarte" RESTART
"BlackBox starte" RESTART blackbox
"IceWM starte" RESTART icewm
"Ofslute" EXIT
"Sesje" END
"Programma's" END
WindowMaker/menu.fy.in
+199
View File
@@ -0,0 +1,199 @@
/*
* Haadmenu-útwurking foar WindowMaker
*
* Opmaak is:
*
* <Titel> [SHORTCUT <Fluchtoets>] <Kommando> <Parameters>
*
* <Titel> is elke tekenrige te brûken as titel. Moat tusken " stean at it
* spaasjes hat.
*
* SHORTCUT jout in fluchtoets op foar dy yngong. <Fluchtoets> hat
* deselde opmaak as de fluchtoetsopsjes yn it
* $HOME/GNUstep/Defaults/WindowMaker bestân, sa as RootMenuKey of MiniaturizeKey.
*
* Jo kinne gjin fluchtoets opjaan foar in MENU- of OPEN_MENU-ûnderdiel.
*
* <Kommando> ien fan 'e jildige kommando's:
* MENU - begjint (sub)menubepaling
* END - beëiniget (sub)menubepaling
* OPEN_MENU - iepenet in menu út in bestân, 'pipe' of map(pen)ynhâld,
* en giet eventueel elk foarôf mei in kommando.
* WORKSPACE_MENU - foeget in submenu foar wurkromtehannelingen ta. Mar ien
* workspace_menu is tastien.
* EXEC <programma> - fiert in ekstern programma út
* SHEXEC <kommando> - fiert in 'shell'-kommando út (sa as gimp > /dev/null)
* EXIT - slút de finsterbehearder ôf
* RESTART [<finsterbehearder>] - werstart WindowMaker, of start in oare
* finsterbehearder
* REFRESH - fernijt it buroblêd
* ARRANGE_ICONS - werskikt de ikoanen yn 'e wurkromte
* SHUTDOWN - deadet alle kliïnten (en slút de X Window-sesje ôf)
* SHOW_ALL - pleatst alle finsters yn 'e wurkromte werom
* HIDE_OTHERS - ferberget alle finsters yn 'e wurkromte, útsein dy't
* fokus hat (of de lêste dy't fokus hie)
* SAVE_SESSION - bewaret de hjoeddeiske steat fan it buroblêd, ynsletten
* alle rinnende programma's, al har 'hints' (ôfmjittingen,
* posysje op it skerm, wurkromte dêr't se yn libje, Dok
* of Klip fan wêrút se opstart waarden, en wannear
* miniaturisearre, oprôle of ferburgen). Bewaret teffens de aktuele
* wurkromte fan 'e brûker. Alles sil wersteld wurde by elke
* start fan windowmaker, oant in oare SAVE_SESSION of
* CLEAR_SESSION brûkt wurdt. At SaveSessionOnExit = Yes; yn
* it WindowMaker-domeinbestân, dan wurdt bewarjen automatysk
* dien by elke windowmaker-ôfsluting, en wurdt in
* SAVE_SESSION of CLEAR_SESSION oerskreaun (sjoch hjirnei).
* CLEAR_SESSION - wisket in earder bewarre sesje. Dit sil gjin
* effekt hawwe at SaveSessionOnExit is True.
* INFO - toant it Ynfopaniel
*
* OPEN_MENU-opmaak:
* 1. Menu-ôfhanneling út bestân.
* // iepenet bestân.menu, dat in jildich menubestân befetsje moat, en foeget
* // it yn op 'e hjoeddeiske plak
* OPEN_MENU bestân.menu
* 2. Menu-ôfhanneling út pipe.
* // iepenet kommando en brûkt syn 'stdout' om in menu oan te meitsjen.
* // Kommando-output moat in jildige menubeskriuwing wêze.
* // De romte tusken '|' en it kommando sels is opsjoneel.
* // Brûk '||' yn plak fan '|' at jo it menu altiten bywurkje wolle
* // by iepenjen. Dat soe traach wurkje kinne.
* OPEN_MENU | kommando
* OPEN_MENU || kommando
* 3. Mapôfhanneling.
* // Iepenet ien of mear mappen en makket in menu oan, mei dêryn alle
* // submappen en útfierbere bestannen alfabetysk
* // sortearre.
* OPEN_MENU /in/map [/in/oare/map ...]
* 4. Mapôfhanneling mei kommando.
* // Iepenet ien of mear mappen en makket in menu oan, mei dêryn alle
* // submappen en lêsbere bestannen alfabetysk sortearre,
* // elk fan har foarôfgien mei kommando.
* OPEN_MENU [opsjes] /in/map [/in/oare/map ...] WITH kommando -opsjes
* Opsjes:
* -noext lit alles fan 'e lêste punt yn 'e
* bestânsnamme ôf wei
*
* // Brûk #usergnusteppath# as tydlike oantsjutting foar it paad nei de
* // brûkers-GNUstep-map. Window Maker sil dy ferfange mei de wearde
* // fan WMAKER_USER_ROOT, at dizze omjouwingsfariabele ynsteld is, of
* // oars "~/GNUstep"
*
* <Parameters> is it út te fieren programma.
*
* ** Kommandorigelopsjes yn EXEC:
* %s - wurdt ferfongen troch de aktuele seleksje
* %a(titel[,oanwizing]) - iepenet in ynfierfjild mei de opjûne titel en de
* opsjonele oanwizing, en wurdt ferfongen troch wat jo yntype
* %w - wurdt ferfongen troch XID foar it aktuele fokust finster
* %W - wurdt ferfongen troch it nûmer fan 'e aktuele wurkromte
*
* Jo kinne spesjale karakters (sa as % en ") útskeakelje mei it \-teken:
* fb.: xterm -T "\"Hallo Wrâld\""
*
* Jo kinne ek ûntsnappingstekens brûke, sa as \n
*
* Elke MENU-deklaraasje moat ien keppele END-deklaraasje op it ein hawwe.
*
* Foarbyld:
*
* "Test" MENU
* "XTerm" EXEC xterm
* // makket in submenu mei de ynhâld fan /usr/openwin/bin oan
* "XView-progr" OPEN_MENU "/usr/openwin/bin"
* // wat X11-programma's yn ferskate mappen
* "X11-progr" OPEN_MENU /usr/X11/bin $HOME/bin/X11
* // wat eftergrûnôfbyldingen ynstelle
* "Eftergrûn" OPEN_MENU -noext $HOME/ôfbyldingen /usr/share/images WITH wmsetbg -u -t
* // foeget it style.menu yn mei dit ûnderdiel
* "Styl" OPEN_MENU style.menu
* "Test" END
*/
#include "wmmacros"
"Programma's" MENU
"Ynfo" MENU
"Ynfopaniel" INFO_PANEL
"Juridyske ynfo" LEGAL_PANEL
"Systeemconsole" EXEC xconsole
"Systeembelêsting" SHEXEC xosview || xload
"Proseslist" EXEC xterm -e top
"Hantliedingblêder" EXEC xman
"Ynfo" END
"Utfiere..." SHEXEC %a(Utfiere,Typ út te fieren kommando:)
"XTerm" EXEC xterm -sb
"Mozilla Firefox" EXEC firefox
"Wurkromten" WORKSPACE_MENU
"Programma's" MENU
"Gimp" SHEXEC gimp >/dev/null
"Ghostview" EXEC ghostview %a(GhostView,Fier te besjen bestân yn)
"Xpdf" EXEC xpdf %a(Xpdf,Fier te besjen PDF yn)
"Abiword" EXEC abiword
"Dia" EXEC dia
"OpenOffice.org" MENU
"OpenOffice.org" EXEC ooffice
"Writer" EXEC oowriter
"Rekkenblêd" EXEC oocalc
"Draw" EXEC oodraw
"Impress" EXEC ooimpress
"OpenOffice.org" END
"Tekstbewurkers" MENU
"XEmacs" EXEC xemacs
"Emacs" EXEC emacs
"XJed" EXEC xjed
"VI" EXEC xterm -e vi
"GVIM" EXEC gvim
"NEdit" EXEC nedit
"Xedit" EXEC xedit
"Tekstbewurkers" END
"Multymedia" MENU
"XMMS" MENU
"XMMS" EXEC xmms
"XMMS ôfspylje/skoftsje" EXEC xmms -t
"XMMS stopje" EXEC xmms -s
"XMMS" END
"Xine fideospiler" EXEC xine
"MPlayer" EXEC mplayer
"Multymedia" END
"Programma's" END
"Helpmiddels" MENU
"Rekkenmasine" EXEC xcalc
"Finstereigenskippen" SHEXEC xprop | xmessage -center -title 'xprop' -file -
"Lettertypekiezer" EXEC xfontsel
"Fergrutsje" EXEC wmagnify
"Kleurekaart" EXEC xcmap
"X-programma deadzje" EXEC xkill
"Helpmiddels" END
"Seleksje" MENU
"Kopiearje" SHEXEC echo '%s' | wxcopy
"E-maile nei" EXEC xterm -name mail -T "Pine" -e pine %s
"Navigearje" EXEC netscape %s
"Sykje yn hantlieding" SHEXEC MANUAL_SEARCH(%s)
"Seleksje" END
"Kommando's" MENU
"Oare ferbergje" HIDE_OTHERS
"Alles toane" SHOW_ALL
"Ikoanen skikke" ARRANGE_ICONS
"Fernije" REFRESH
"Beskoattelje" EXEC xlock -allowroot -usefirst
"Kommando's" END
"Uterlik" OPEN_MENU "appearance.menu.fy"
"Sesje" MENU
"Sesje bewarje" SAVE_SESSION
"Sesje wiskje" CLEAR_SESSION
"Window Maker werstarte" RESTART
"BlackBox starte" RESTART blackbox
"IceWM starte" RESTART icewm
"Ofslute" EXIT
"Sesje" END
"Programma's" END
WindowMaker/menu.he
+1 -1
View File
@@ -45,7 +45,7 @@
* // it in current position * // it in current position
* OPEN_MENU file.menu * OPEN_MENU file.menu
* 2. Pipe menu handling. * 2. Pipe menu handling.
* // opens command and uses it's stdout to construct menu. * // opens command and uses its stdout to construct menu.
* // Command's output must be a valid menu description. * // Command's output must be a valid menu description.
* // The space between '|' and command itself is optional. * // The space between '|' and command itself is optional.
* OPEN_MENU | command * OPEN_MENU | command
WindowMaker/menu.hr
+1 -1
View File
@@ -45,7 +45,7 @@
* // it in current position * // it in current position
* OPEN_MENU file.menu * OPEN_MENU file.menu
* 2. Pipe menu handling. * 2. Pipe menu handling.
* // opens command and uses it's stdout to construct menu. * // opens command and uses its stdout to construct menu.
* // Command's output must be a valid menu description. * // Command's output must be a valid menu description.
* // The space between '|' and command itself is optional. * // The space between '|' and command itself is optional.
* OPEN_MENU | command * OPEN_MENU | command
WindowMaker/menu.hu → WindowMaker/menu.hu.in
+1 -1
View File
@@ -204,7 +204,7 @@
"Háttér" END "Háttér" END
"Téma mentése" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Téma neve,Add meg a téma fájl nevét:)" "Téma mentése" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Téma neve,Add meg a téma fájl nevét:)"
"Ikonbeállítások mentése" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(Ikonbeállítások mentése,Add meg a fájl nevét:)" "Ikonbeállítások mentése" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(Ikonbeállítások mentése,Add meg a fájl nevét:)"
"Konfiguráló program" EXEC /usr/bin/WPrefs "Konfiguráló program" EXEC #wprefs#
"Megjelenés" END "Megjelenés" END
"Kilépés" MENU "Kilépés" MENU
WindowMaker/menu → WindowMaker/menu.in
+6 -31
View File
@@ -74,6 +74,11 @@
* -noext strip whatever is after the last dot in the * -noext strip whatever is after the last dot in the
* file name * file name
* *
* // Use #usergnusteppath# as a placeholder for the path to the user
* // GNUstep directory. Window Maker will replace this with the value
* // of WMAKER_USER_ROOT, if this environment variable is set, or
* // "~/GNUstep" otherwise
*
* <Parameters> is the program to execute. * <Parameters> is the program to execute.
* *
* ** Options for command line in EXEC: * ** Options for command line in EXEC:
@@ -179,37 +184,7 @@
"Lock" EXEC xlock -allowroot -usefirst "Lock" EXEC xlock -allowroot -usefirst
"Commands" END "Commands" END
"Appearance" MENU "Appearance" OPEN_MENU "appearance.menu"
"Themes" OPEN_MENU -noext THEMES_DIR $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle
"Styles" OPEN_MENU -noext STYLES_DIR $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle
"Icon Sets" OPEN_MENU -noext ICON_SETS_DIR $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons
"Background" MENU
"Solid" MENU
"Black" WS_BACK '(solid, black)'
"Blue" WS_BACK '(solid, "#505075")'
"Indigo" WS_BACK '(solid, "#243e6c")'
"Bluemarine" WS_BACK '(solid, "#224477")'
"Purple" WS_BACK '(solid, "#554466")'
"Wheat" WS_BACK '(solid, "wheat4")'
"Dark Gray" WS_BACK '(solid, "#333340")'
"Wine" WS_BACK '(solid, "#400020")'
"Solid" END
"Gradient" MENU
"Sunset" WS_BACK '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'
"Sky" WS_BACK '(vgradient, blue4, white)'
"Blue Shades" WS_BACK '(vgradient, "#7080a5", "#101020")'
"Indigo Shades" WS_BACK '(vgradient, "#746ebc", "#242e4c")'
"Purple Shades" WS_BACK '(vgradient, "#654c66", "#151426")'
"Wheat Shades" WS_BACK '(vgradient, "#a09060", "#302010")'
"Grey Shades" WS_BACK '(vgradient, "#636380", "#131318")'
"Wine Shades" WS_BACK '(vgradient, "#600040", "#180010")'
"Gradient" END
"Images" OPEN_MENU -noext BACKGROUNDS_DIR $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t
"Background" END
"Save Theme" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Theme name,Enter file name:)"
"Save IconSet" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(IconSet name,Enter file name:)"
"Preferences Utility" EXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs
"Appearance" END
"Session" MENU "Session" MENU
"Save Session" SAVE_SESSION "Save Session" SAVE_SESSION
WindowMaker/menu.ko → WindowMaker/menu.ko.in
+1 -1
View File
@@ -163,7 +163,7 @@
"세션 지움" CLEAR_SESSION "세션 지움" CLEAR_SESSION
"창 관 리" END "창 관 리" END
"작업환경" MENU "작업환경" MENU
"설 정" SHEXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs || wmakerconf "설 정" SHEXEC #wprefs# || wmakerconf
"테 마" OPEN_MENU -noext THEMES_DIR ~/GNUstep/Library/WindowMaker/Themes WITH setstyle "테 마" OPEN_MENU -noext THEMES_DIR ~/GNUstep/Library/WindowMaker/Themes WITH setstyle
"테마저장" EXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(테마 이름,파일 이름을 입력하세요:)" "테마저장" EXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(테마 이름,파일 이름을 입력하세요:)"
"아이콘셋" OPEN_MENU -noext ICON_SETS_DIR ~/GNUstep/Library/WindowMaker/IconSets WITH seticons "아이콘셋" OPEN_MENU -noext ICON_SETS_DIR ~/GNUstep/Library/WindowMaker/IconSets WITH seticons
WindowMaker/menu.nl → WindowMaker/menu.nl.in
+9 -34
View File
@@ -53,7 +53,7 @@
* // het in op de huidige plaats * // het in op de huidige plaats
* OPEN_MENU bestand.menu * OPEN_MENU bestand.menu
* 2. Menuafhandeling uit pipe. * 2. Menuafhandeling uit pipe.
* // opent commando en gebruikt zeen 'stdout' om een menu aan te maken. * // opent commando en gebruikt zijn 'stdout' om een menu aan te maken.
* // Commando-output moet een geldige menubeschrijving zijn. * // Commando-output moet een geldige menubeschrijving zijn.
* // De ruimte tussen '|' en het commando zelf is optioneel. * // De ruimte tussen '|' en het commando zelf is optioneel.
* // Gebruik '||' in plaats van '|' als u het menu altijd wilt bijwerken * // Gebruik '||' in plaats van '|' als u het menu altijd wilt bijwerken
@@ -71,8 +71,13 @@
* // elk van hen voorafgegaan met commando. * // elk van hen voorafgegaan met commando.
* OPEN_MENU [opties] /een/map [/een/andere/map ...] WITH commando -opties * OPEN_MENU [opties] /een/map [/een/andere/map ...] WITH commando -opties
* Opties: * Opties:
* -noext haal alles vanaf de laatste punt in de * -noext laat alles vanaf de laatste punt in de
* bestandsnaam eraf * bestandsnaam weg
*
* // Gebruik #usergnusteppath# als tijdelijke aanduiding voor het pad naar de
* // gebruikers-GNUstep-map. Window Maker zal die vervangen met de waarde
* // van WMAKER_USER_ROOT, als deze omgevingsvariabele is ingesteld, of
* // anders "~/GNUstep"
* *
* <Parameters> is het uit te voeren programma. * <Parameters> is het uit te voeren programma.
* *
@@ -179,37 +184,7 @@
"Vergrendelen" EXEC xlock -allowroot -usefirst "Vergrendelen" EXEC xlock -allowroot -usefirst
"Commando's" END "Commando's" END
"Uiterlijk" MENU "Uiterlijk" OPEN_MENU "appearance.menu.nl"
"Thema's" OPEN_MENU -noext THEMES_DIR $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle
"Stijlen" OPEN_MENU -noext STYLES_DIR $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle
"Iconensets" OPEN_MENU -noext ICON_SETS_DIR $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons
"Achtergrond" MENU
"Effen" MENU
"Zwart" WS_BACK '(solid, black)'
"Blauw" WS_BACK '(solid, "#505075")'
"Indigo" WS_BACK '(solid, "#243e6c")'
"Marineblauw" WS_BACK '(solid, "#224477")'
"Purper" WS_BACK '(solid, "#554466")'
"Tarwe" WS_BACK '(solid, "wheat4")'
"Donkergrijs" WS_BACK '(solid, "#333340")'
"Wijnrood" WS_BACK '(solid, "#400020")'
"Effen" END
"Kleurverloop" MENU
"Zonsondergang" WS_BACK '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'
"Lucht" WS_BACK '(vgradient, blue4, white)'
"Blauwtinten" WS_BACK '(vgradient, "#7080a5", "#101020")'
"Indigotinten" WS_BACK '(vgradient, "#746ebc", "#242e4c")'
"Purpertinten" WS_BACK '(vgradient, "#654c66", "#151426")'
"Tarwetinten" WS_BACK '(vgradient, "#a09060", "#302010")'
"Grijstinten" WS_BACK '(vgradient, "#636380", "#131318")'
"Wijnroodtinten" WS_BACK '(vgradient, "#600040", "#180010")'
"Kleurverloop" END
"Afbeeldingen" OPEN_MENU -noext BACKGROUNDS_DIR $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t
"Achtergrond" END
"Thema opslaan" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Themanaam,Voer bestandsnaam in:)"
"Iconenset opslaan" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(Iconensetnaam,Voer bestandsnaam in:)"
"Voorkeurenhulpmiddel" EXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs
"Uiterlijk" END
"Sessie" MENU "Sessie" MENU
"Sessie opslaan" SAVE_SESSION "Sessie opslaan" SAVE_SESSION
WindowMaker/menu.ro → WindowMaker/menu.ro.in
+2 -2
View File
@@ -53,7 +53,7 @@
* // it in current position * // it in current position
* OPEN_MENU file.menu * OPEN_MENU file.menu
* 2. Pipe menu handling. * 2. Pipe menu handling.
* // opens command and uses it's stdout to construct menu. * // opens command and uses its stdout to construct menu.
* // Command's output must be a valid menu description. * // Command's output must be a valid menu description.
* // The space between '|' and command itself is optional. * // The space between '|' and command itself is optional.
* OPEN_MENU | command * OPEN_MENU | command
@@ -202,7 +202,7 @@
"Fundal" END "Fundal" END
"Salvează Tema" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Theme name,Enter file name:)" "Salvează Tema" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Theme name,Enter file name:)"
"Salvează Setul de Iconiţe" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(IconSet name,Enter file name:)" "Salvează Setul de Iconiţe" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(IconSet name,Enter file name:)"
"Utilitar de Configurare" EXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs "Utilitar de Configurare" EXEC #wprefs#
"Configurare" END "Configurare" END
"Ieşire" MENU "Ieşire" MENU
WindowMaker/menu.sk → WindowMaker/menu.sk.in
+1 -1
View File
@@ -216,7 +216,7 @@
"Pozadie" END "Pozadie" END
"Uložiť tému" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Meno témy,Zadajte názov súboru:)" "Uložiť tému" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Meno témy,Zadajte názov súboru:)"
"Uložiť sadu ikon" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(Meno sady ikon,Zadajte názov súboru:)" "Uložiť sadu ikon" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(Meno sady ikon,Zadajte názov súboru:)"
"Konfiguračný nástroj" EXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs "Konfiguračný nástroj" EXEC #wprefs#
"Vzhľad" END "Vzhľad" END
"Koniec" MENU "Koniec" MENU
WindowMaker/menu.sl
+1 -1
View File
@@ -53,7 +53,7 @@
* // it in current position * // it in current position
* OPEN_MENU file.menu * OPEN_MENU file.menu
* 2. Pipe menu handling. * 2. Pipe menu handling.
* // opens command and uses it's stdout to construct menu. * // opens command and uses its stdout to construct menu.
* // Command's output must be a valid menu description. * // Command's output must be a valid menu description.
* // The space between '|' and command itself is optional. * // The space between '|' and command itself is optional.
* OPEN_MENU | command * OPEN_MENU | command
WindowMaker/menu.zh_CN
+1 -1
View File
@@ -53,7 +53,7 @@
* // it in current position * // it in current position
* OPEN_MENU file.menu * OPEN_MENU file.menu
* 2. Pipe menu handling. * 2. Pipe menu handling.
* // opens command and uses it's stdout to construct menu. * // opens command and uses its stdout to construct menu.
* // Command's output must be a valid menu description. * // Command's output must be a valid menu description.
* // The space between '|' and command itself is optional. * // The space between '|' and command itself is optional.
* OPEN_MENU | command * OPEN_MENU | command
WindowMaker/menu.zh_TW → WindowMaker/menu.zh_TW.in
+2 -2
View File
@@ -52,7 +52,7 @@
* // it in current position * // it in current position
* OPEN_MENU file.menu * OPEN_MENU file.menu
* 2. Pipe menu handling. * 2. Pipe menu handling.
* // opens command and uses it's stdout to construct menu. * // opens command and uses its stdout to construct menu.
* // Command's output must be a valid menu description. * // Command's output must be a valid menu description.
* // The space between '|' and command itself is optional. * // The space between '|' and command itself is optional.
* OPEN_MENU | command * OPEN_MENU | command
@@ -199,7 +199,7 @@
"背景" END "背景" END
"儲存主題" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(主題名稱)" "儲存主題" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(主題名稱)"
"儲存圖示集" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(圖示集名稱)" "儲存圖示集" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(圖示集名稱)"
"偏好設定公用程式" EXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs "偏好設定公用程式" EXEC #wprefs#
"外觀" END "外觀" END
"離開" MENU "離開" MENU
WindowMaker/mkMakefile
-63
View File
@@ -1,63 +0,0 @@
#!/bin/sh
#
# Creates a Makefile.am file containing all the stuff to install
# wmaker data
#
DIRS="Backgrounds Defaults IconSets Icons Pixmaps Styles Themes"
FILE=Makefile.am
spit() {
echo -n "$*" >> $FILE
}
spitln() {
echo "$*" >> $FILE
}
rm -f $FILE
spitln SUBDIRS = $DIRS
spitln
spitln prefsdatadir = '$(pkgdatadir)'
spitln
EXCEPT="Makefile.am Makefile.in Makefile mkMakefile $FILE"
spit prefsdata_DATA =
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
if [ -f $f -a $ok = 1 ]; then
spitln \\
spit " $f"
fi
done
spitln
spitln
spitln EXTRA_DIST = '$(prefsdata_DATA)' mkMakefile
spitln
spitln
WindowMaker/plmenu
-106
View File
@@ -1,106 +0,0 @@
("Applications",
("Info",
("Info Panel", INFO_PANEL),
("Legal", LEGAL_PANEL),
("System Console", EXEC, "xconsole"),
("System Load", SHEXEC, "xosview || xload"),
("Process List", EXEC, "xterm -e top"),
("Manual Browser", EXEC, "xman")
),
("Run...", SHEXEC, "%a(Run,Type command to run:)"),
("XTerm", EXEC, "xterm -sb"),
("Mozilla Firefox", EXEC, "firefox"),
("Workspaces", WORKSPACE_MENU),
("Applications",
("Gimp", SHEXEC, "gimp >/dev/null"),
("Ghostview", EXEC, "ghostview %a(Enter file to view)"),
("Xpdf", EXEC, "xpdf %a(Enter PDF to view)"),
("Abiword", EXEC, "abiword"),
("Dia", EXEC, "dia"),
("OpenOffice.org",
("OpenOffice.org", EXEC, "ooffice"),
("Writer", EXEC, "oowriter"),
("Spreadsheet", EXEC, "oocalc"),
("Draw", EXEC, "oodraw"),
("Impress", EXEC, "ooimpress")
),
("Editors",
("XEmacs", EXEC, "xemacs"),
("Emacs", EXEC, "emacs"),
("XJed", EXEC, "xjed"),
("VI", EXEC, "xterm -e vi"),
("GVIM", EXEC, "gvim"),
("NEdit", EXEC, "nedit"),
("Xedit", EXEC, "xedit")
),
("Multimedia",
("XMMS",
("XMMS", EXEC, "xmms"),
("XMMS play/pause", EXEC, "xmms -t"),
("XMMS stop", EXEC, "xmms -s")
),
("Xine video player", EXEC, "xine"),
("MPlayer", EXEC, "mplayer")
)
),
("Utils",
("Calculator", EXEC, "xcalc"),
("Window Properties", SHEXEC, "xprop | xmessage -center -title 'xprop' -file -"),
("Font Chooser", EXEC, "xfontsel"),
("Magnify", EXEC, "wmagnify"),
("Colormap", EXEC, "xcmap"),
("Kill X Application", EXEC, "xkill")
),
("Selection",
("Copy", SHEXEC, "echo '%s' | wxcopy"),
("Mail To", EXEC, "xterm -name mail -T Pine -e pine %s"),
("Navigate", EXEC, "mozilla %s"),
("Search in Manual", EXEC, "MANUAL_SEARCH(%s)")
),
("Commands",
("Hide Others", HIDE_OTHERS),
("Show All", SHOW_ALL),
("Arrange Icons", ARRANGE_ICONS),
("Refresh", REFRESH),
("Lock", EXEC, "xlock -allowroot -usefirst")
),
("Appearance",
("Themes", OPEN_MENU, "-noext #wmdatadir#/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
("Styles", OPEN_MENU, "-noext #wmdatadir#/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
("Icon Sets", OPEN_MENU, "-noext #wmdatadir#/IconSets $HOME/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\")'"),
("Bluemarine", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#224477\")'"),
("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 #wmdatadir#/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
),
("Save Theme", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),
("Save IconSet", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""),
("Preferences Utility", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")
),
("Session",
("Save Session", SAVE_SESSION),
("Clear Session", CLEAR_SESSION),
("Restart Window Maker", RESTART),
("Start BlackBox", RESTART, blackbox),
("Start IceWM", RESTART, icewm),
("Exit", EXIT)
)
)
WindowMaker/plmenu.bg → WindowMaker/plmenu.bg.in
+1 -1
View File
@@ -94,7 +94,7 @@
), ),
("Запази темата", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""), ("Запази темата", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),
("Запази колекцията иконки", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""), ("Запази колекцията иконки", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""),
("Пособие за настройки", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs") ("Пособие за настройки", EXEC, "#wprefs#")
), ),
("Изход", ("Изход",
("Рестартиране", RESTART), ("Рестартиране", RESTART),
WindowMaker/plmenu.es → WindowMaker/plmenu.es.in
+1 -1
View File
@@ -94,7 +94,7 @@
), ),
("Guardar tema", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""), ("Guardar tema", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),
("Guardar iconos", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""), ("Guardar iconos", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""),
("Preferencias", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs") ("Preferencias", EXEC, "#wprefs#")
), ),
("Salir", ("Salir",
("Reiniciar", RESTART), ("Reiniciar", RESTART),
WindowMaker/plmenu.fi → WindowMaker/plmenu.fi.in
+1 -1
View File
@@ -357,7 +357,7 @@
( (
"Asetukset", "Asetukset",
EXEC, EXEC,
"/usr/local/GNUstep/Applications/WPrefs.app/WPrefs" "#wprefs#"
) )
), ),
( (
WindowMaker/plmenu.fy
-106
View File
@@ -1,106 +0,0 @@
("Programma's",
("Ynfo",
("Ynfopaniel", INFO_PANEL),
("Juridyske ynfo", LEGAL_PANEL),
("Systeemconsole", EXEC, "xconsole"),
("Systeembelêsting", SHEXEC, "xosview || xload"),
("Proseslist", EXEC, "xterm -e top"),
("Hantliedingbrowser", EXEC, "xman")
),
("Utfiere...", SHEXEC, "%a(Utfiere,Typ út te fiere kommando:)"),
("XTerm", EXEC, "xterm -sb"),
("Mozilla Firefox", EXEC, "firefox"),
("Wurkromten", WORKSPACE_MENU),
("Programma's",
("Gimp", SHEXEC, "gimp >/dev/null"),
("Ghostview", EXEC, "ghostview %a(Fier te besjen bestân yn)"),
("Xpdf", EXEC, "xpdf %a(Fier te besjen PDF yn)"),
("Abiword", EXEC, "abiword"),
("Dia", EXEC, "dia"),
("OpenOffice.org",
("OpenOffice.org", EXEC, "ooffice"),
("Writer", EXEC, "oowriter"),
("Rekkenblêd", EXEC, "oocalc"),
("Draw", EXEC, "oodraw"),
("Impress", EXEC, "ooimpress")
),
("Tekstbewurkers",
("XEmacs", EXEC, "xemacs"),
("Emacs", EXEC, "emacs"),
("XJed", EXEC, "xjed"),
("VI", EXEC, "xterm -e vi"),
("GVIM", EXEC, "gvim"),
("NEdit", EXEC, "nedit"),
("Xedit", EXEC, "xedit")
),
("Multymedia",
("XMMS",
("XMMS", EXEC, "xmms"),
("XMMS ôfspylje/poazje", EXEC, "xmms -t"),
("XMMS stopje", EXEC, "xmms -s")
),
("Xine fideospeler", EXEC, "xine"),
("MPlayer", EXEC, "mplayer")
)
),
("Helpmiddels",
("Rekkenmasine", EXEC, "xcalc"),
("Finstereigenskippen", SHEXEC, "xprop | xmessage -center -title 'xprop' -file -"),
("Lettertypekiezer", EXEC, "xfontsel"),
("Fergrutsje", EXEC, "wmagnify"),
("Kleurekaart", EXEC, "xcmap"),
("X-programma deadzje", EXEC, "xkill")
),
("Seleksje",
("Kopiearje", SHEXEC, "echo '%s' | wxcopy"),
("E-maile nei", EXEC, "xterm -name mail -T Pine -e pine %s"),
("Navigearje", EXEC, "mozilla %s"),
("Sykje yn hantlieding", EXEC, "MANUAL_SEARCH(%s)")
),
("Kommando's",
("Oare ferbergje", HIDE_OTHERS),
("Alles toane", SHOW_ALL),
("Ikoanen skikke", ARRANGE_ICONS),
("Fernije", REFRESH),
("Ofskoattelje", EXEC, "xlock -allowroot -usefirst")
),
("Uterlik",
("Tema's", OPEN_MENU, "-noext #wmdatadir#/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
("Stilen", OPEN_MENU, "-noext #wmdatadir#/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
("Ikoanensets", OPEN_MENU, "-noext #wmdatadir#/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
("Eftergrûn",
("Effen",
("Swart", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, black)'"),
("Blau", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#505075\")'"),
("Indigo", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#243e6c\")'"),
("Marineblau", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#224477\")'"),
("Poarper", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#554466\")'"),
("Weet", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, wheat4)'"),
("Donkergriis", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#333340\")'"),
("Wynread", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#400020\")'")
),
("Kleurferrin",
("Sinneûndergong", EXEC, "wdwrite WindowMaker WorkspaceBack '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'"),
("Loft", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, blue4, white)'"),
("Blautinten", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#7080a5\", \"#101020\")'"),
("Indigotinten", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#746ebc\", \"#242e4c\")'"),
("Poarpertinten", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#654c66\", \"#151426\")'"),
("Weettinten", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#a09060\", \"#302010\")'"),
("Griistinten", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#636380\", \"#131318\")'"),
("Wynreadtinten", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#600040\", \"#180010\")'")
),
("Ofbyldingen", OPEN_MENU, "-noext #wmdatadir#/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
),
("Tema bewarje", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Temanamme)\""),
("Ikoanenset bewarje", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(Ikoanensetnamme)\""),
("Foarkarrenhelpmiddel", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")
),
("Sesje",
("Sesje bewarje", SAVE_SESSION),
("Sesje wiskje", CLEAR_SESSION),
("Window Maker werstarte", RESTART),
("BlackBox starte", RESTART, blackbox),
("IceWM starte", RESTART, icewm),
("Ofslute", EXIT)
)
)
WindowMaker/plmenu.fy.in
+76
View File
@@ -0,0 +1,76 @@
("Programma's",
("Ynfo",
("Ynfopaniel", INFO_PANEL),
("Juridyske ynfo", LEGAL_PANEL),
("Systeemconsole", EXEC, "xconsole"),
("Systeembelêsting", SHEXEC, "xosview || xload"),
("Proseslist", EXEC, "xterm -e top"),
("Hantliedingblêder", EXEC, "xman")
),
("Utfiere...", SHEXEC, "%a(Utfiere,Typ út te fieren kommando:)"),
("XTerm", EXEC, "xterm -sb"),
("Mozilla Firefox", EXEC, "firefox"),
("Wurkromten", WORKSPACE_MENU),
("Programma's",
("Gimp", SHEXEC, "gimp >/dev/null"),
("Ghostview", EXEC, "ghostview %a(Fier te besjen bestân yn)"),
("Xpdf", EXEC, "xpdf %a(Fier te besjen PDF yn)"),
("Abiword", EXEC, "abiword"),
("Dia", EXEC, "dia"),
("OpenOffice.org",
("OpenOffice.org", EXEC, "ooffice"),
("Writer", EXEC, "oowriter"),
("Rekkenblêd", EXEC, "oocalc"),
("Draw", EXEC, "oodraw"),
("Impress", EXEC, "ooimpress")
),
("Tekstbewurkers",
("XEmacs", EXEC, "xemacs"),
("Emacs", EXEC, "emacs"),
("XJed", EXEC, "xjed"),
("VI", EXEC, "xterm -e vi"),
("GVIM", EXEC, "gvim"),
("NEdit", EXEC, "nedit"),
("Xedit", EXEC, "xedit")
),
("Multymedia",
("XMMS",
("XMMS", EXEC, "xmms"),
("XMMS ôfspylje/skoftsje", EXEC, "xmms -t"),
("XMMS stopje", EXEC, "xmms -s")
),
("Xine fideospiler", EXEC, "xine"),
("MPlayer", EXEC, "mplayer")
)
),
("Helpmiddels",
("Rekkenmasine", EXEC, "xcalc"),
("Finstereigenskippen", SHEXEC, "xprop | xmessage -center -title 'xprop' -file -"),
("Lettertypekiezer", EXEC, "xfontsel"),
("Fergrutsje", EXEC, "wmagnify"),
("Kleurekaart", EXEC, "xcmap"),
("X-programma deadzje", EXEC, "xkill")
),
("Seleksje",
("Kopiearje", SHEXEC, "echo '%s' | wxcopy"),
("E-maile nei", EXEC, "xterm -name mail -T Pine -e pine %s"),
("Navigearje", EXEC, "mozilla %s"),
("Sykje yn hantlieding", EXEC, "MANUAL_SEARCH(%s)")
),
("Kommando's",
("Oare ferbergje", HIDE_OTHERS),
("Alles toane", SHOW_ALL),
("Ikoanen skikke", ARRANGE_ICONS),
("Fernije", REFRESH),
("Beskoattelje", EXEC, "xlock -allowroot -usefirst")
),
("Uterlik", OPEN_MENU, "appearance.menu.fy"),
("Sesje",
("Sesje bewarje", SAVE_SESSION),
("Sesje wiskje", CLEAR_SESSION),
("Window Maker werstarte", RESTART),
("BlackBox starte", RESTART, blackbox),
("IceWM starte", RESTART, icewm),
("Ofslute", EXIT)
)
)
WindowMaker/plmenu.in
+76
View File
@@ -0,0 +1,76 @@
("Applications",
("Info",
("Info Panel", INFO_PANEL),
("Legal", LEGAL_PANEL),
("System Console", EXEC, "xconsole"),
("System Load", SHEXEC, "xosview || xload"),
("Process List", EXEC, "xterm -e top"),
("Manual Browser", EXEC, "xman")
),
("Run...", SHEXEC, "%a(Run,Type command to run:)"),
("XTerm", EXEC, "xterm -sb"),
("Mozilla Firefox", EXEC, "firefox"),
("Workspaces", WORKSPACE_MENU),
("Applications",
("Gimp", SHEXEC, "gimp >/dev/null"),
("Ghostview", EXEC, "ghostview %a(Enter file to view)"),
("Xpdf", EXEC, "xpdf %a(Enter PDF to view)"),
("Abiword", EXEC, "abiword"),
("Dia", EXEC, "dia"),
("OpenOffice.org",
("OpenOffice.org", EXEC, "ooffice"),
("Writer", EXEC, "oowriter"),
("Spreadsheet", EXEC, "oocalc"),
("Draw", EXEC, "oodraw"),
("Impress", EXEC, "ooimpress")
),
("Editors",
("XEmacs", EXEC, "xemacs"),
("Emacs", EXEC, "emacs"),
("XJed", EXEC, "xjed"),
("VI", EXEC, "xterm -e vi"),
("GVIM", EXEC, "gvim"),
("NEdit", EXEC, "nedit"),
("Xedit", EXEC, "xedit")
),
("Multimedia",
("XMMS",
("XMMS", EXEC, "xmms"),
("XMMS play/pause", EXEC, "xmms -t"),
("XMMS stop", EXEC, "xmms -s")
),
("Xine video player", EXEC, "xine"),
("MPlayer", EXEC, "mplayer")
)
),
("Utils",
("Calculator", EXEC, "xcalc"),
("Window Properties", SHEXEC, "xprop | xmessage -center -title 'xprop' -file -"),
("Font Chooser", EXEC, "xfontsel"),
("Magnify", EXEC, "wmagnify"),
("Colormap", EXEC, "xcmap"),
("Kill X Application", EXEC, "xkill")
),
("Selection",
("Copy", SHEXEC, "echo '%s' | wxcopy"),
("Mail To", EXEC, "xterm -name mail -T Pine -e pine %s"),
("Navigate", EXEC, "mozilla %s"),
("Search in Manual", EXEC, "MANUAL_SEARCH(%s)")
),
("Commands",
("Hide Others", HIDE_OTHERS),
("Show All", SHOW_ALL),
("Arrange Icons", ARRANGE_ICONS),
("Refresh", REFRESH),
("Lock", EXEC, "xlock -allowroot -usefirst")
),
("Appearance", OPEN_MENU, "appearance.menu"),
("Session",
("Save Session", SAVE_SESSION),
("Clear Session", CLEAR_SESSION),
("Restart Window Maker", RESTART),
("Start BlackBox", RESTART, blackbox),
("Start IceWM", RESTART, icewm),
("Exit", EXIT)
)
)
WindowMaker/plmenu.ja → WindowMaker/plmenu.ja.in
+1 -1
View File
@@ -94,7 +94,7 @@
), ),
("設定をテーマとしてセーブ", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""), ("設定をテーマとしてセーブ", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),
("現在のアイコンセットをセーブ", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""), ("現在のアイコンセットをセーブ", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""),
("設定ユーティリティ", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs") ("設定ユーティリティ", EXEC, "#wprefs#")
), ),
("終了", ("終了",
("再起動", RESTART), ("再起動", RESTART),
WindowMaker/plmenu.ko → WindowMaker/plmenu.ko.in
+1 -1
View File
@@ -63,7 +63,7 @@
), ),
("작업공간", WORKSPACE_MENU), ("작업공간", WORKSPACE_MENU),
("작업환경", ("작업환경",
("설 정", SHEXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs || wmakerconf"), ("설 정", SHEXEC, "#wprefs# || wmakerconf"),
("테 마", OPEN_MENU, "-noext /usr/share/WindowMaker/Themes ~/GNUstep/Library/WindowMaker/Themes WITH setstyle"), ("테 마", OPEN_MENU, "-noext /usr/share/WindowMaker/Themes ~/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
("테마저장", EXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(테마 이름,파일 이름을 입력하세요:)\""), ("테마저장", EXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(테마 이름,파일 이름을 입력하세요:)\""),
("스 타 일", OPEN_MENU, "-noext /usr/share/WindowMaker/Styles ~/GNUstep/Library/WindowMaker/Styles WITH setstyle"), ("스 타 일", OPEN_MENU, "-noext /usr/share/WindowMaker/Styles ~/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
WindowMaker/plmenu.nl
-106
View File
@@ -1,106 +0,0 @@
("Programma's",
("Info",
("Infopaneel", INFO_PANEL),
("Juridische info", LEGAL_PANEL),
("Systeemconsole", EXEC, "xconsole"),
("Systeembelasting", SHEXEC, "xosview || xload"),
("Proceslijst", EXEC, "xterm -e top"),
("Handleidingbrowser", EXEC, "xman")
),
("Uitvoeren...", SHEXEC, "%a(Uitvoeren,Typ uit te voeren commando:)"),
("XTerm", EXEC, "xterm -sb"),
("Mozilla Firefox", EXEC, "firefox"),
("Werkruimten", WORKSPACE_MENU),
("Programma's",
("Gimp", SHEXEC, "gimp >/dev/null"),
("Ghostview", EXEC, "ghostview %a(Voer te bekijken bestand in)"),
("Xpdf", EXEC, "xpdf %a(Voer te bekijken PDF in)"),
("Abiword", EXEC, "abiword"),
("Dia", EXEC, "dia"),
("OpenOffice.org",
("OpenOffice.org", EXEC, "ooffice"),
("Writer", EXEC, "oowriter"),
("Rekenblad", EXEC, "oocalc"),
("Draw", EXEC, "oodraw"),
("Impress", EXEC, "ooimpress")
),
("Tekstbewerkers",
("XEmacs", EXEC, "xemacs"),
("Emacs", EXEC, "emacs"),
("XJed", EXEC, "xjed"),
("VI", EXEC, "xterm -e vi"),
("GVIM", EXEC, "gvim"),
("NEdit", EXEC, "nedit"),
("Xedit", EXEC, "xedit")
),
("Multimedia",
("XMMS",
("XMMS", EXEC, "xmms"),
("XMMS afspelen/pauzeren", EXEC, "xmms -t"),
("XMMS stoppen", EXEC, "xmms -s")
),
("Xine videospeler", EXEC, "xine"),
("MPlayer", EXEC, "mplayer")
)
),
("Hulpmiddelen",
("Rekenmachine", EXEC, "xcalc"),
("Venstereigenschappen", SHEXEC, "xprop | xmessage -center -title 'xprop' -file -"),
("Lettertypekiezer", EXEC, "xfontsel"),
("Vergroten", EXEC, "wmagnify"),
("Kleurenkaart", EXEC, "xcmap"),
("X-programma doden", EXEC, "xkill")
),
("Selectie",
("Kopiëren", SHEXEC, "echo '%s' | wxcopy"),
("E-mailen naar", EXEC, "xterm -name mail -T Pine -e pine %s"),
("Navigeren", EXEC, "mozilla %s"),
("Zoeken in handleiding", EXEC, "MANUAL_SEARCH(%s)")
),
("Commando's",
("Andere verbergen", HIDE_OTHERS),
("Alles tonen", SHOW_ALL),
("Iconen schikken", ARRANGE_ICONS),
("Vernieuwen", REFRESH),
("Vergrendelen", EXEC, "xlock -allowroot -usefirst")
),
("Uiterlijk",
("Thema's", OPEN_MENU, "-noext #wmdatadir#/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
("Stijlen", OPEN_MENU, "-noext #wmdatadir#/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
("Iconensets", OPEN_MENU, "-noext #wmdatadir#/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
("Achtergrond",
("Effen",
("Zwart", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, black)'"),
("Blauw", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#505075\")'"),
("Indigo", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#243e6c\")'"),
("Marineblauw", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#224477\")'"),
("Purper", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#554466\")'"),
("Tarwe", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, wheat4)'"),
("Donkergrijs", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#333340\")'"),
("Wijnrood", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#400020\")'")
),
("Kleurverloop",
("Zonsondergang", EXEC, "wdwrite WindowMaker WorkspaceBack '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'"),
("Lucht", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, blue4, white)'"),
("Blauwtinten", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#7080a5\", \"#101020\")'"),
("Indigotinten", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#746ebc\", \"#242e4c\")'"),
("Purpertinten", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#654c66\", \"#151426\")'"),
("Tarwetinten", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#a09060\", \"#302010\")'"),
("Grijstinten", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#636380\", \"#131318\")'"),
("Wijnroodtinten", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#600040\", \"#180010\")'")
),
("Afbeeldingen", OPEN_MENU, "-noext #wmdatadir#/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
),
("Thema opslaan", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Themanaam)\""),
("Iconenset opslaan", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(Iconensetnaam)\""),
("Voorkeurenhulpmiddel", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")
),
("Sessie",
("Sessie opslaan", SAVE_SESSION),
("Sessie wissen", CLEAR_SESSION),
("Window Maker herstarten", RESTART),
("BlackBox starten", RESTART, blackbox),
("IceWM starten", RESTART, icewm),
("Afsluiten", EXIT)
)
)
WindowMaker/plmenu.nl.in
+76
View File
@@ -0,0 +1,76 @@
("Programma's",
("Info",
("Infopaneel", INFO_PANEL),
("Juridische info", LEGAL_PANEL),
("Systeemconsole", EXEC, "xconsole"),
("Systeembelasting", SHEXEC, "xosview || xload"),
("Proceslijst", EXEC, "xterm -e top"),
("Handleidingbrowser", EXEC, "xman")
),
("Uitvoeren...", SHEXEC, "%a(Uitvoeren,Typ uit te voeren commando:)"),
("XTerm", EXEC, "xterm -sb"),
("Mozilla Firefox", EXEC, "firefox"),
("Werkruimten", WORKSPACE_MENU),
("Programma's",
("Gimp", SHEXEC, "gimp >/dev/null"),
("Ghostview", EXEC, "ghostview %a(Voer te bekijken bestand in)"),
("Xpdf", EXEC, "xpdf %a(Voer te bekijken PDF in)"),
("Abiword", EXEC, "abiword"),
("Dia", EXEC, "dia"),
("OpenOffice.org",
("OpenOffice.org", EXEC, "ooffice"),
("Writer", EXEC, "oowriter"),
("Rekenblad", EXEC, "oocalc"),
("Draw", EXEC, "oodraw"),
("Impress", EXEC, "ooimpress")
),
("Tekstbewerkers",
("XEmacs", EXEC, "xemacs"),
("Emacs", EXEC, "emacs"),
("XJed", EXEC, "xjed"),
("VI", EXEC, "xterm -e vi"),
("GVIM", EXEC, "gvim"),
("NEdit", EXEC, "nedit"),
("Xedit", EXEC, "xedit")
),
("Multimedia",
("XMMS",
("XMMS", EXEC, "xmms"),
("XMMS afspelen/pauzeren", EXEC, "xmms -t"),
("XMMS stoppen", EXEC, "xmms -s")
),
("Xine videospeler", EXEC, "xine"),
("MPlayer", EXEC, "mplayer")
)
),
("Hulpmiddelen",
("Rekenmachine", EXEC, "xcalc"),
("Venstereigenschappen", SHEXEC, "xprop | xmessage -center -title 'xprop' -file -"),
("Lettertypekiezer", EXEC, "xfontsel"),
("Vergroten", EXEC, "wmagnify"),
("Kleurenkaart", EXEC, "xcmap"),
("X-programma doden", EXEC, "xkill")
),
("Selectie",
("Kopiëren", SHEXEC, "echo '%s' | wxcopy"),
("E-mailen naar", EXEC, "xterm -name mail -T Pine -e pine %s"),
("Navigeren", EXEC, "mozilla %s"),
("Zoeken in handleiding", EXEC, "MANUAL_SEARCH(%s)")
),
("Commando's",
("Andere verbergen", HIDE_OTHERS),
("Alles tonen", SHOW_ALL),
("Iconen schikken", ARRANGE_ICONS),
("Vernieuwen", REFRESH),
("Vergrendelen", EXEC, "xlock -allowroot -usefirst")
),
("Uiterlijk", OPEN_MENU, "appearance.menu.nl"),
("Sessie",
("Sessie opslaan", SAVE_SESSION),
("Sessie wissen", CLEAR_SESSION),
("Window Maker herstarten", RESTART),
("BlackBox starten", RESTART, blackbox),
("IceWM starten", RESTART, icewm),
("Afsluiten", EXIT)
)
)

Some files were not shown because too many files have changed in this diff Show More