gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2026-03-12 04:25:47 +01:00
Code Issues Projects Releases Wiki Activity

Compare commits

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

605 Commits
release-0. ... wmaker-0.9

Author SHA1 Message Date
Carlos R. Mafra
f55eef413f wmaker-0.94.0-crm 
I am calling it -crm so that people won't confuse its non-official status.
 2010-01-09 13:48:06 +01:00
Carlos R. Mafra
643e49f190 Remove [raise,lower]clip shortcut keys 
The raising and lowering of the clip is already taken care of
by the "ClipRaiseLowerKey" shortcut.

wmaker gets a bit smaller for free:
   text    data     bss     dec     hex filename
 449483   17384    8208  475075   73fc3 src/.libs/wmaker.old
 449307   17256    8192  474755   73e83 src/.libs/wmaker.new
 2010-01-09 13:47:57 +01:00
Carlos R. Mafra
8a2a0b6adc Remove ICON_KABOOM_EXTRA 
I don't want it in the sources, and the "normal" icon kaboom
is good enough. And it was #undef'ined by default.
 2010-01-07 15:38:41 +01:00
Carlos R. Mafra
0deb198b10 Remove a few unneeded includes 2010-01-07 15:33:41 +01:00
Brad Jorsch
b6689a0108 Keyboard shortcut to raise the dock 
This patch adds the DockRaiseLowerKey shortcut, which raises/lowers
the dock depending on whether the dock is lowered/raised.

[crmafra: Reformatted Brad's patch against git repo and removed the
 DockRaiseKey and DockLowerKey shortcuts ]
 2010-01-07 12:16:17 +01:00
Carlos R. Mafra
7ef8178d2a Undefine WINDOW_BIRTH_ZOOM 
I don't want the (small) overhead of the window birth zoom special effects
because I like apps popping up instantly when I open them (specially now
with the SSD).

Another way to not get the birth animation is to unset "animations" in
WPrefs, but that makes the other animations which I care (ie they don't have
the effect of making my computer seem slower than it really is) go away.
 2010-01-06 11:34:24 +01:00
Carlos R. Mafra
b3e817305d Do not compile extra stuff under wrlib/tests etc 
Let's avoid compiling these "tests" and extra stuff every time,
saving us some time.
 2010-01-06 11:34:24 +01:00
Carlos R. Mafra
a2133e8e2f Do not change workspace during deiconify animation 
Paul Harris reported that using the mouse wheel over a miniwindow
would deiconify it to a different workspace than the original one
where it was iconified.

This happens because after the window begins to be deiconified the
"residual" mouse wheel scrolling hits the workspace background, and
Window Maker changes workspace with wWorkspaceRelativeChange().

But if it all happens fast enough (so the deiconification animation
did not finish yet) the workspace will have changed before the
window reaches its final deiconified destination, leading to
the situation that Paul described in the link below.

So to avoid this, let's set a 'ignore_wks_change' variable
from wDeiconifyWindow() and make wWorkspaceRelativeChange() respect it.

Original report: http://lists.windowmaker.info/dev/msg00821.html
 2009-12-26 21:09:10 +01:00
Carlos R. Mafra
efa31f30b2 Remove unused function raiseMenus() 
GCC warns:

rootmenu.c:350: warning: 'raiseMenus' defined but not used
 2009-12-21 23:00:33 +01:00
Carlos R. Mafra
024e2f5299 Remove XSMP_ENABLED constructs 
The code was never used and the !XSMP_ENABLED code seems to
work well enough for all these years.
 2009-12-21 22:40:28 +01:00
Ralf Hoffmann
629b118767 fixed problem with default visual ID for multi-screen setups by using multiple IDs for each screen 
Since a single default visual ID cannot be used for multiple screens, thus
Window Maker refused to start. There is now a global function for getting the
default visual ID. The command line argument --visual-id can be a comma
separated list of visual IDs for each screen. A default value is only set for
the first screen.
 2009-12-11 16:36:25 +01:00
Nicolas Bonifas
d8ef209c9a Add menu path to Debian build system 
Part of the menu on Debian systems is stored in
/etc/X11/Windowmaker/menu.hook. This patch will add this path to
src/wconfig.h.in when building the Debian wmaker package. This is
what is done in the Debian version of wmaker 0.92.0.
 2009-12-10 13:51:26 +01:00
Carlos R. Mafra
2ba803ad98 Remove unused arguments from a few functions 
gcc 4.4.1 was warning (among others):

switchpanel.c: In Funktion »getTile«:
switchpanel.c:321: Warnung: unbenutzter Parameter »panel«
switchpanel.c: In Funktion »makeWindowListArray«:
switchpanel.c:377: Warnung: unbenutzter Parameter »scr«
switchpanel.c:377: Warnung: unbenutzter Parameter »workspace«
 2009-12-09 21:04:29 +01:00
Carlos R. Mafra
33c9e87692 Remove static function declaration from header file 2009-12-09 20:48:44 +01:00
Carlos R. Mafra
0a5febcada Remove unused function argument from randomPlaceWindow() 2009-12-09 20:35:13 +01:00
Nicolas Bonifas
41fdb79e28 Maximus: Take border into account 
This patch fixes a minor bug in Maximus: the new window size didn't take the
 border into account. This bug was particularly visible with the
 "do not cover dock" option turned on.
 2009-12-08 16:14:29 +01:00
Ralf Hoffmann
d74a90d1bf changed behavior when focusing new windows with autofocus enabled 
New windows will only get focused if the mouse is on the same screen.
The code doesn't handle multiple heads but since it's just one screen
the function works as usual. Checking the head and assign the focus only
if the window is on the same head might be a good idea. Making the whole
stuff optional might be even better.
 2009-12-08 16:14:29 +01:00
Ralf Hoffmann
fe8ab024af fixed wrong env setup when setting background 
This patch fixes a problem with restarting Window Maker in multi-screen
environments. The code for setting the background by calling wmsetbg
changes the environment. In multi-screen setups the DISPLAY variable
becomes :0.0 instead of :0 (for example). The restarted Window Maker
process therefore only manages one screen.
 2009-12-08 16:14:29 +01:00
Ralf Hoffmann
6c6e832c52 activate XGrabServer again 
This patch fixes a small problem which only rarely occurs. If a
window is opened only for a very short time and closed right away, in
some circumstances the frame around it stays opened. It looks like
Window Maker doesn't get the destroy message. The XGrabServer call was
commented in the code so I activated it again which seems to prevent this
from happening. I think it actually make sense since the ungrab calls are
used anyway in the following code.
 2009-12-08 16:14:29 +01:00
Carlos R. Mafra
13c2d523e2 Remove DRAWSTRING_PLUGIN reference from wconfig.h.in 
DRAWSTRING_PLUGIN never appears anywhere else in the sources.
 2009-12-08 16:14:29 +01:00
Carlos R. Mafra
e7cc15df71 Remove unused function getRImages() 
Pointed out by Nicolas Bonifas.
 2009-12-06 15:35:26 +01:00
Carlos R. Mafra
3db3f179d1 Remove unused src/menureader.c file 2009-12-06 15:35:26 +01:00
Carlos R. Mafra
5fa41941fe Remove unused wHackedUngrabButton() 
Pointed out by Nicolas Bonifas.
 2009-12-06 15:35:25 +01:00
Carlos R. Mafra
4c4d50c813 Remove unused function wIconSetHighlited() 
There is no point in carrying unused functions for so long.

Pointed out by Nicolas Bonifas.
 2009-12-06 15:35:25 +01:00
Carlos R. Mafra
8c5a7b287a Remove unused functions from src/pixmap.c 
In case someone needs them in the future for some reason,
they can be restored from the git logs.

Pointed out by Nicolas Bonifas.
 2009-12-06 15:35:25 +01:00
Carlos R. Mafra
347fbcc87a Remove unused function wWindowCheckAttributeSanity() 
As pointed out by Nicolas Bonifas, wWindowCheckAttributeSanity() is
currently unused. Removing it saves 200 bytes:

  text    data     bss     dec     hex filename
  23476       0       8   23484    5bbc src/window.o.new
  23676       0       8   23684    5c84 src/window.o.old
 2009-12-06 15:35:25 +01:00
Nicolas Bonifas
a2cb317f11 Remove useless NULL test 
If menu is NULL we would have a null pointer dereference when initializing scr.

> Ie, why not move the assignment of 'src' to after the test?

I thought about this, but I checked the 3 different calls to
updateWorkspaceMenu (all in winmenu.c). They must all call
updateWorkspaceMenu with non-NULL pointers, so if we have a NULL
'menu' pointer then we obviously have a major problem and it is
probably better to crash here than to silently return and fail a
little latter.

[crmafra: edit changelog]
 2009-12-06 15:32:30 +01:00
Nicolas Bonifas
391d5de79e 2 open() statements were not matched with close() statements in function fetchFile 2009-12-06 13:58:24 +01:00
Carlos R. Mafra
ad4358c605 Update German translation 
Based on a patch from OpenSUSE whose author is unknown.
 2009-12-01 14:17:50 +01:00
Nicolas Bonifas
2203b229b0 Fix the empty button in titlebar after going fullscreen bug (Debian bug #298873) 2009-11-17 01:42:15 +01:00
Carlos R. Mafra
4932433b95 Remove DEMATERIALIZE_ICON code 
This animation is not as cool as the NORMAL_ICON_KABOON, so I don't
think having a choice here is justified. Let's remove this option
(it was not defined in wconfig.h.in by default) and keep using
the nicer NORMAL_ICON_KABOON.
 2009-10-17 01:56:28 +02:00
Carlos R. Mafra
f9792a042a Remove SILLYNESS 
This code makes wmaker a little bit bigger for no gain at all. I could
undefine SILLYNESS and forget it, but I actually also want a clean
source code to read. And the less code the better.

So now I won't get a different Info dialog on Christmas, but
my wmaker will also not carry around that code in the other 364 days
of the year.

As a result, wmaker gets ~1.7 % smaller

   text	   data	    bss	    dec	    hex	filename
 448043	  17424	   8200	 473667	  73a43	wmaker.new
 455340	  18360	   8328	 482028	  75aec	wmaker.old
 2009-10-17 01:38:53 +02:00
Carlos R. Mafra
96b9b22cb2 Remove #ifdef SYS_SIGLIST_DECLARED constructs 
SYS_SIGLIST_DECLARED was defined nowhere and it was
clearly some dead code.
 2009-10-17 01:05:28 +02:00
Johann Haarhoff
1f1eb393f8 Mod+Wheel resize increment now respects size hints 
Thanks to Iains patch which showed me how to access the window hints, I
now propose the following: The resize increment is set to the closest
multiple of the size hints larger than wPreferences.resize_increment.

This should fix Carlos' complaint about fixed-increment windows resizing
too "slowly", and it also fixes my complaint about the blank space below
the last line of an xterm.

Thanks to:
    Iain Patterson <wm@iain.cx>
 2009-10-13 12:17:57 +02:00
Iain Patterson
bf88570a5f Respect size hints when resizing with wheel. 
Use height and width increment when wheel resizing if size hints are
set on a window and meaningful height and width increments are
specified.
Windows which don't care about their resize increments will have height
and width increments set to 1.  For these windows - and windows without
resize hints at all - use the setting configured with ResizeIncrement.
 2009-10-12 15:24:13 +02:00
Carlos R. Mafra
a3246cfe3b Remove remaining sound stuff from WPrefs etc 
Let's remove the configuration options about "sound" from
WPrefs (as it was never fully functionall anyway) and from
configuration files.

Remove also the xpm and tiff icons.
 2009-10-12 03:02:24 +02:00
Carlos R. Mafra
c5f027d811 WPrefs: trivial coding style fixes 2009-10-12 02:41:27 +02:00
Carlos R. Mafra
af8cec15e3 Remove repeated functions enclosed by #if 0 
There are already working versions of these functions,
so let's remove these copies.
 2009-10-12 01:02:19 +02:00
Carlos R. Mafra
15e37ff942 Remove #ifdef NETWM_HINTS constructs 
NETWM_HINT is always defined in src/wconfig.h.in, so
let's remove it from there too.
 2009-10-12 01:00:19 +02:00
Carlos R. Mafra
347e804bb6 A few trivial code style cleanups 2009-10-11 23:30:41 +02:00
Johann Haarhoff
a063338175 Mod+Wheel Window Resize 
This patch adds the ability to resize windows with the mouse wheel
while holding the Mod key. This currently ignores wWindowConstrainSize
until I can figure out a way to repeatably resize windows with
fixed size increments (like xterm) using this method.

This also adds a slider to WPrefs to choose the increment with which
the wheel will resize a window.
 2009-10-11 22:17:54 +02:00
Carlos R. Mafra
781b663341 HOWTO: The perfect Window Maker patch 
This document is a very brief description about how you can
create a patch "the git way", so that it can be applied
easily with 'git am'.
 2009-10-11 17:37:18 +02:00
Carlos R. Mafra
09140a82b9 Increase granularity of 'shrink/zoom' animation 
Now it is a bit easier to actually enjoy the animation :-)
 2009-10-10 19:55:57 +02:00
Carlos R. Mafra
87161c5e0c Remove MINIATURIZE_ANIMATION_DELAY_{Z,F,T} tests 
We know that they are non-zero because we set their
values explicitly in wconfig.h.in, so there is no
point in checking them.
 2009-10-10 19:30:04 +02:00
Carlos R. Mafra
cda27758bc Add function prototypes in action.h and include it in superfluous.c 2009-10-10 19:29:56 +02:00
Carlos R. Mafra
b014ef2770 Remove 'hiding' parameter from animateResize() 
It was a bit pointless.
 2009-10-10 19:03:12 +02:00
Carlos R. Mafra
e9309e1e39 Delete WINDOW_BIRTH_ZOOM and default to WINDOW_BIRTH_ZOOM2 
WINDOW_BIRTH_ZOOM was a bit lame and it makes sense to not have
it at all. So remove the trailing "2" of WINDOW_BIRTH_ZOOM2 and
make it the only choice (you can #define it in src/wconfig.h.in).

Note that it uses the same algorithm as the animation to resize,
ie zoom, twist or flip. You can choose them in WPrefs.
 2009-10-10 18:27:52 +02:00
Carlos R. Mafra
06d3360224 Remove 'ghost window move' code 
GHOST_WINDOW_MOVE was not defined anywhere. Let's remove that
code.
 2009-10-10 00:05:58 +02:00
Carlos R. Mafra
9d6728d3e7 Remove SPEAKER_SOUND dead code 
SPEAKER_SOUND is defined nowhere, so this code was not being used
and I don't want its functionality anyway.
 2009-10-09 23:59:37 +02:00
Carlos R. Mafra
2765bec3e4 Remove sound support 
Two reasons for removing it:

    1) I won't ever want to hear useless sounds

    2) The sound support is a bit of a joke. The code is there but you have
       to hunt it somewhere else (not in any repository that I know of).
       In my 10 years of using wmaker, I never used it for this reason.
       Now I consider having no sound in Window Maker a feature, and I like
       it that way. So there is no point in carrying useless code around.

PS: There is still the code in WPrefs to be removed.
 2009-10-09 20:04:47 +02:00
Carlos R. Mafra
7df49cce14 Clean up contrib/ folder 
Let's remove the "single click" patch from there.
 2009-09-24 23:53:03 +02:00
John H. Robinson, IV
21eb8456ba Updated documentation 
Updated URIs
Removed stale/outdated information
Reformatted for 80 columns
 2009-09-24 23:41:36 +02:00
Iain Patterson
bc3995bf6b Fix msgfmt error with Armenian translation. 
msgfmt said:

hy.po:685: `msgid' and `msgstr' entries do not both end with '\n'

Fixed by adding newline as in original text.
 2009-09-24 23:41:10 +02:00
Norayr Chilignaryan
7f457fa275 Window Maker armenian translation 2009-09-24 23:40:46 +02:00
Carlos R. Mafra
484bdbe7d4 Ansify function declarations 
I've just noticed them en passant.
 2009-09-24 23:40:39 +02:00
Martin Dietze
ef2f5a6f29 Fix automatic Debian builds 2009-09-24 10:13:44 +02:00
Carlos R. Mafra
12b6be768e swpanel: Fix focus issue when alt-tabbing 
The problem was the following. While alt-tabbing from one
window to a xterm, wait for the xterm to be raised but
keep the alt key pressed. Now move the mouse cursor
over the xterm and release the alt key.

The result is a xterm in a zoombie focused state; its titlebar
has the focused color but xterm itself is not focused and does
not accept any input.

Fix this by reinstating the check for a NULL pointer from
wSwitchPanelHandleEvent() before changing focus. That function
detects if the mouse cursor moved over to the same window which
is currently being pointed out by the switchpanel, and returns
NULL in this case (the check for panel->current != focus fails).

Thanks to Paul Harris for reporting it!
 2009-09-19 16:07:47 +02:00
Carlos R. Mafra
6a0120f014 Maximus: Some cleanups and bug fixes 
Let's ignore hidden windows and also adjust the coordinates
a bit, to avoid ~2 pixels of overlap.

I thank Paul Harris for pointing out these bugs.
 2009-09-19 16:07:03 +02:00
Carlos R. Mafra
0a0c2391de Maximus: Avoid a window list order issue 
If we compute the maximus geometry in only one pass through
the window list, the order in which the windows appear in
the list can affect the outcome.

That is because before computing the intersections in the
y-projections we update the y coordinates from whatever window
which happened to change the new_y coordinate during the
previous x-intersection computations, but that may not be _the_
blocking window which decides the final positions in the y axis.
Therefore we may find that this "intermediate window state"
has a non-vanishing y-intersection with another one -- and
be blocked by it -- even though that should not be the case for
the final outcome.

So to avoid that we first scan through all the windows to decide
the final maximumized coordinates in the y axis. Only after that we
compute the x-coordinates.
 2009-09-19 16:06:48 +02:00
Carlos R. Mafra
7a86f48f73 Fix --disable-verbose-compile 
Remove an extra $(QUIET), as that was causing a few annoying
messages during the compilation of libraries.
 2009-09-19 16:06:18 +02:00
Alexey Voinov
3953f53680 WINGs shared library generation 
This patch modifies the linking of the WINGs libraries
to create a shared library. wmaker used to do this, but
it was dropped around wmaker-0.90/0.91.
The shared .so library is needed when compiling and running
the wdm display manager and any other programs which link
to libWINGs.

Submitted by: Gilbert Ashley
Origin: ALT/Sisyphus Linux
 2009-09-19 16:06:05 +02:00
Carlos R. Mafra
92eff967a7 Maximus: Consider the full_maximize window attribute 
When maximumizing a window which has the full_maximize attribute
set we have to consider two possibilities:

    1. If the new y coordinate is zero it means that no other
       window blocked its maximumization up to the top of the
       screen, so we want to put the titlebar outside.

    2. If the new y coordinate is not zero it means that another
       window in the current workspace blocked its way to y = 0.
       In this case we do nothing with the titlebar.

Note that there is another possible fine tunning which is not
addressed in this patch, which is to consider the resize bar.
 2009-09-17 00:46:14 +02:00
Carlos R. Mafra
eaca92db50 Simplify wMaximizeWindow() a little bit 
Let's avoid checking the existence of a border every time
we want to adjust the widths. So we'll always subtract the correction
factor, which is zero in case the window has no border.
 2009-09-17 00:46:14 +02:00
Carlos R. Mafra
1a85719971 Increase the readability of SlideWindow() 
It is easier to read the computations if the variables
have shorter names. At the same time it avoids reading
the struct array elements repeatedly, so as a bonus
misc.o gets 64 bytes (0.5%) smaller

[mafra@Pilar:wmaker.git]$ size src/misc.o.*
   text    data     bss     dec     hex filename
  11125       0    4104   15229    3b7d src/misc.o.new
  11189       0    4104   15293    3bbd src/misc.o.old
 2009-09-17 00:44:36 +02:00
Alexey I. Froloff
5979162878 Fix race condition during workspace changes 
When changing workspaces, after focusing new window, wmaker handles all
pending events.  If it receives another change-workspace combination,
you may end up with a workspace without any focused window.

Ctrf-F1 and Ctrl-F2 used to switch to 1st and 2nd workspaces.
Hold Ctrl and press F1 and F2 almost at the same time.

This patch ignores all change-workspace commands while workspace
change is in progress.

See also https://bugzilla.altlinux.org/show_bug.cgi?id=7230

[crmafra: Thanks to Alexey I. Froloff for the above explanation]
 2009-09-15 20:14:55 +02:00
Carlos R. Mafra
306165775e Yet another trivial coding style cleanup 2009-09-15 20:06:04 +02:00
Carlos R. Mafra
c7f2a189c4 Fix the call to XChangeProperty() in 64-bit mode 
The man page of XChangeProperty() says:

  "If the specified format is 32, the property data must be a
   long array."

And as we call it with format 32, the type of 'data' must
be 'long'. It happens to work nowadays in 32-bit architectures
because sizeof(CARD32) = sizeof(long), but that is no longer
true in 64-bit mode.

This patch was downloaded from
www.openbsd.org/cgi-bin/cvsweb/ports/x11/windowmaker/patches/patch-WINGs_wwindow_c
and I thank Alexey I. Frolov and Vladimir Nadvornik for helping me
to understand it on a wmaker-dev thread.
 2009-09-15 12:52:14 +02:00
Carlos R. Mafra
ca2c1f900d Trivial coding style fix 2009-09-15 01:52:35 +02:00
Iain Patterson
18408fff93 Mac OS X-style window cycling. 
For those not familiar with the way Macs cycle windows, the Command-Tab
sequence (Alt-Tab elsewhere) switches between DIFFERENT application windows
and Command-Grave (key above tab) switches between windows owned by the
SAME application as is currently focused.  So if you had three Safari and
two Finder windows open, and Safari had focus, Command-Tab would switch to
Finder; Command-Tab would switch back to Safari; Command-Grave would switch
to a different Safari window etc.

This patch implements "something like" the above by only populating the
switchpanel with windows matching the currently-focused WWindow's wm_class
when the new cycling mode is activated.  In practice this means you can
switch to The Next XTerm or The Next Firefox Window using this method.

The configuration names for these new shortcuts are GroupNext and
GroupPrev.  The patch tells WPrefs.app about them.  Of course switching to
The Next Window is still possible with the (unchanged) FocusNext and
FocusPrev keys.
 2009-09-14 16:51:26 +02:00
Iain Patterson
5c46f48898 Support Xinerama in wmsetbg. 
Allow wmsetbg to revert to pre-0.90.0 behaviour when choosing a
background image that is large enough to span several heads in a
Xinerama setup.  If the -X flag is passed to wmsetbg, the background
image will be stretched to fill the logical screen (as it would be by
default in older versions of wmsetbg) instead of being tiled across
screens.
 2009-09-14 16:51:26 +02:00
Iain Patterson
567279b962 Pad workspace name display. 
Shift the workspace name, shown when switching workspaces, by 32
pixels.  This is purely for aesthetic reasons.  It just looks better
(IMO) than having the name flush against the screen edge.
 2009-09-14 16:51:26 +02:00
Iain Patterson
1a27b34160 Constrain switching workspace name to one head. 
When switching workspaces, force the name to be shown entirely within
one head of a Xinerama display. Previously the name would span heads if
set to TOP, CENTER or BOTTOM alignment, and was hence hard to read when
the display comprised an even number of heads.
 2009-09-14 16:51:26 +02:00
Carlos R. Mafra
9789cf3154 Add Maximus key back in WPrefs.app 
Somehow I had forgotten to include this change in version 2
of the patch.
 2009-09-14 16:51:26 +02:00
Carlos R. Mafra
513a509096 Fix the use of uinptr_t 
Remove the additional cast to (int), as that makes no sense.
 2009-09-14 16:51:26 +02:00
Alexey Voinov
f6645ac564 x86_64 mmx fixes 
This patch combines two small patches which fix issues with x86_64 and mmx in
the configure script.

Submitted by: Gilbert Ashley
Author: unknown?
Origin: ALT/Sisyphus Linux, Alexey Voinov <voins@altlinux.ru>
 2009-09-14 02:09:35 +02:00
Nicolas Bonifas
cf0f7d68d5 Un-maximize window inside current head 
If the old_geometry coordinates were saved while the window
was in another xinerama head, use current coordinates as
the old ones to avoid making the window jump heads when
un-maximizing it.
 2009-09-13 23:33:39 +02:00
Nicolas Bonifas
3106292f4b Maximus: Use unsigned int for width/height variables 
And move its prototype to actions.h (and also that of
save_old_geometry()).
 2009-09-13 23:32:15 +02:00
Nicolas Bonifas
e42586c712 Remove commented code in xinerama.c 2009-09-13 23:32:09 +02:00
Tamas TEVESZ
0a47a19b3e Remove bundled wrlib stuff 
This patch removes bits and pieces of xmu that for some reason
have been bundled with wmaker. I can very well imagine that at the time
they were bundled, xmu was not, was not available everywhere, or
whatever.

I couldn't come across a system that doesn't have these things in its
system-supplied x libs, though i've been carrying this since january,
and my memory is quite flakey at times.

certainly nothing xorg is at danger, nor xfree86 dating back to at
least 3.3. i believe this stuff should be everywhere that calls itself
to be on par with x11r6.3 at the very least.

it would be incredibly useful if people having access to commercial
unixes could check this on things released in the past, say, 15 years.
i believe back then i had solaris 8+and sco openserver 5+ covered.
 2009-09-13 21:40:47 +02:00
Nicolas Bonifas
e4fcd515fe Maximizing a resized window 
When a maximized window is resized (either using wmaker or because the
application changed the window size), and you want to maximize it again,
you first have to unmaximize it (because wmaker thinks the window is still
maximized), and only then you can maximize it. The following patch
corrects this behaviour.
 2009-09-13 19:17:59 +02:00
Carlos R. Mafra
4bce3e3805 Make left/right maximization work again 
The patch "Clean up maximization and un-maximization logic" introduced
a regression wrt to the left/half maximization feature, due to a C
operator order precedence issue.
 2009-09-13 18:32:43 +02:00
Carlos R. Mafra
cbd13dd95f Ansify function declaration 2009-09-13 16:07:54 +02:00
Carlos R. Mafra
18c7a20136 Delete stale .cvsignore files 2009-09-13 12:59:25 +02:00
BERTRAND Joel
816fee1b68 Fix miniwindows auto-arranging bug 
With this patch, minimized windows do not reshuffle anymore.

See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=361241
where Martin Hinsch reported:

"The behaviour of icons (minimized applications) is severely broken when
 automatic placement is switched on.
  * When switching the workspace icons often stick thereby covering (and
    hiding) icons on the workspace one is switching to.
  * After minimizing an application, clicking (singly or doubly) on one of
    the icons causes all of them to reshuffle, usually in a way that the
    icon in question changes its place (which is extremely annoying).
  * Icon placement ignores the dock so that icons disappear behind
    it/cover it.

 All of these suddenly appeared about a year ago (I think with 91.0). The
 problems are not architecture-specific since they occur in exactly the
 same way on my pentium machine. Wiping the complete configuration (rm -r
 ~/GNUstep) did not make a change either."
 2009-09-11 10:24:54 +02:00
Andreas Tscharner
5b93254d0f Fix compilation failure 
This fixes a compilation failure with gcc-4.3.4, where it complains

nxpm.c: In function RGetImageFromXPMData:
nxpm.c:99: error: expected expression before ] token
...
 2009-09-09 22:18:34 +02:00
Alexey Voinov
62bf6d17b5 Fix session saving for apps with shared appicons 
This patch comes from
http://git.altlinux.org/people/raorn/packages/WindowMaker.git
 2009-09-06 17:12:24 +02:00
Carlos R. Mafra
8efc490361 Reduce the number of simultaneous inotify events 
There is no point in having a buffer capable of 512 simultaneous events,
as it will typically be only 1. But increase the value for the length
of the path + filename to 64 (which is a reasonable size for a
typical /home/something/GNUstep/Defaults/WMRootmenu filename).
 2009-09-04 15:02:00 +02:00
Alexey Voinov
5f5b1df7d2 Christmas does not last forever 
From https://bugzilla.altlinux.org/show_bug.cgi?id=3480

  "If you open "Info Panel" on 25 dec (Christmas), the
   "Christmas tree" is shown. And after that on all days
    Christmas tree is shown. (Until you restart WM, i think)"

Taken from http://git.altlinux.org/people/raorn/packages/WindowMaker.git
 2009-09-03 23:56:33 +02:00
Carlos R. Mafra
88ab8b74b4 wmrlib: Avoid code duplication 
We can put common repeated code into a helper function, and
increase readability a bit.
 2009-09-03 23:56:33 +02:00
Alexey I. Froloff
2ccc8e4a79 Remove alloca(3) 
And use malloc() instead.

See "Dropped useless use of alloca(3)" from
http://git.altlinux.org/people/raorn/packages/WindowMaker.git
 2009-09-03 21:10:48 +02:00
Alexey I. Froloff
8490e31fde Atomic save for session 
This patch is part of "Atomic saves for history and session" from
http://git.altlinux.org/people/raorn/packages/WindowMaker.git
 2009-09-03 20:20:12 +02:00
Alexey Voinov
05720d9707 Add history to some dialog boxes 
This patch adds history to some dialog boxes. To use it replace %a with
%A in menu file (like in "Run..." menu item). You can specify third
parameter to %A to use different histories for differen dialogs.

All history files is kept in ~/GNUstep/.AppInfo/WindowMaker/ and the number of
history lines controlled by DialogHistoryLines parameter (one for
all dialogs) defaults to 500 lines.

It also adds Tab completion.

Origin: ALT/Sisyphus Linux, Alexey Voinov <voins@altlinux.ru>
 2009-09-03 15:44:11 +02:00
Sebastien Bauer
f8dd3dc49e Add option to allow starting DockApps with a single click 
This patch is from the contrib directory. It adds an option to allow starting
DockApps with a single click. It's a handy option that adds only a few lines to
the code.

It is a good feature patch example because it includes modifications
to the WPrefs application so that the feature can be easily enabled or
disabled. The one-click ability allows wmaker to integrate more seemlessly with
programs like ROX-Filer which can be configured to use single or double click
actions.

The README in the contrib/ directory says,

author:
Sebastien Bauer <seb_bauer@bigfoot.com>
John Morrissey <jwm@horde.net>

updated for Window Maker 0.65.0 by:
Daniel Richard G. <skunk@graphics.lcs.mit.edu>

updated for Window Maker 0.80.2 by:
Martial Daumas <martial@nasgaia.org>

update for 0.80.2+ by:
steve lion <steve.lion@verizon.net> and vlaad
 2009-09-03 15:19:10 +02:00
Carlos R. Mafra
c04a2caeab Clean up maximization and un-maximization logic 
We should not try to un-maximize the windows from inside
the function wMaximizeWindow(), as that makes no sense.

If the window is already maximized then we don't call
wMaximizeWindow() anymore and call wUnmaximizeWindow()
instead, which will use the old geometry regardless
of which maximization is active (horizontal, vertical,
maximus, etc). And the old geometry now is also saved
when we enter wMaximizeWindow().

So when we call wMaximizeWindow() or wUnmaximizeWindow()
we really mean "maximize to the specified state" or
"go back to whatever old geometry coordinates we had before".
 2009-09-02 04:42:19 +02:00
Carlos R. Mafra
cf62d1591f Maximus: Tiled Maximization 
This patch introduces the "tiled maximization" feature, a.k.a. Maximus.

By pressing the keyboard shortcut associated with Maximus, the focused
window will be maximized to the greatest area satisfying the constraint
of not overlapping existing windows.
 2009-09-02 04:42:05 +02:00
Daniel Déchelotte
7857f297ea Fix for omnipresent AppIcon bug at startup 
Bug overview: right after start up, omnipresent AppIcons (living in the Clip)
    are displayed but non-functionnal.

    How to reproduce it: place two AppIcons in the Clip, make the first one (A)
    omnipresent and leave the second one (B) as is. Make the Clip "autocollapse".
    Switch to the second workspace and restart wmaker. Wmaker starts in the first
    workspace; the Clip is closed (its text color corresponds to the closed state,
    AppIcon B is not shown). However, AppIcon A is displayed.  Moreover, A does
    not react when the Clip expands or collapses.  Finally, a click on A makes it
    disappear. Fortunately, changing to another workspace fixes the problem
    definitively.

    Explanation and correction: internally, wmaker maintains as many clips as
    workspaces. When the user switches to another workspace, the omnipresent
    AppIcons are moved to the new "current" clip. In the situation above (trying
    to reproduce the bug), when wmaker restarts, the omnipresent AppIcons are
    restored in the second workspace, whereas the first workspace is active. In
    the previous code, a "hack" (calling XMapWindow()) unconditionally displayed
    the omnipresent AppIcons. The proposed patch makes sure the omnipresent
    AppIcons are moved to the first workspace on wmaker startup.
 2009-09-02 00:17:27 +02:00
Tamas TEVESZ
b37e065252 Clean up #ifdef mess 
Use enum instead of #ifdef maze for enumerating keybindings
 2009-09-01 14:31:08 +02:00
Daniel Déchelotte
d7183d33b4 Gobble "spurious" EnterNotify events when moving an appIcon or a dock 
This is a bug fix. Bug overview: if an AppIcon is moved rapidly over a Clip
    set to auto-expand, the latter may erroneously auto-expand afterwards.

    How to reproduce it: set a Clip to auto-collapse, and make sure it contains a
    (random) AppIcon, so as to easily visualise its open/close state. Now move
    rapidly an AppIcon over the Clip. Try to move it so fast that the cursor
    sometimes is out of the AppIcon's tile. Then, replace the AppIcon out of the
    Clip.

    Explanation and correction: if, while the AppIcon was being moved, the mouse
    cursor entered at least once in the Clip's tile, the latter is going to
    receive an EnterNotify event (after the AppIcon is replaced) and thus expand
    automatically after the relevant delay. The solution is to simply "gobble"
    (i.e., ignore) all EnterNotify events when moving an AppIcon.
 2009-09-01 14:12:55 +02:00
klaasvakie
2ed9c12ee5 Fix half_scr_width calculation 
Moved the half_scr_width calculation to after the

usableArea = wGetUsableAreaForHead(scr, head, &totalArea, True);

call. This fixes the problem where windows that get "half screen
maximized" cover the dock or clip.
 2009-09-01 13:57:58 +02:00
Carlos R. Mafra
229b6984de Use half_scr_width instead of computing it each time 
Let's use

    half_scr_width = (usableArea.x2 - usableArea.x1)/2;

to shorten the expressions in the left/right half maximize
code.
 2009-08-30 16:28:23 +02:00
Carlos R. Mafra
a1f35d7f5b Increase the readability of wUnshadeWindow() and wShadeWindow() a little bit 
Instead of open coding the animation routines in the function bodies,
put them in a helper function called shade_animate(wwin, what), whose
second argument can be SHADE or UNSHADE.
 2009-08-30 00:58:18 +02:00
Carlos R. Mafra
34be9d7816 Trivial coding style changes 
Some trivial style changes I made while reading src/placement.c
 2009-08-30 00:51:27 +02:00
Tamas TEVESZ
9af6316d1d k&r->ansi some stuff 
ansify and "fix" function pointer declarations
 2009-08-29 21:49:22 +02:00
Johann Haarhoff
6924454836 Left Half / Right Half Maximize 
This adds Left Half / Right Half Maximize capability to WindowMaker.
It allows you to maximize a window to only the left or right half
of your screen.

It is useful on widescreen displays where one might to bring up
two different windows side-by-side.
 2009-08-29 21:49:16 +02:00
Carlos R. Mafra
328251c68a Define TITLEBAR_HEIGHT in default configuration file 
...and use it in src/placement.c

And while we are at it, clean up a bit the visual of wconfig.h.in
 2009-08-28 21:21:03 +02:00
Carlos R. Mafra
2f87d01a41 Make wmaker 0.11% smaller by avoiding code duplication 
This patch cleans up an obvious code duplication case in the
different "placement" algorithms.

Avoid this needless repetition by using a helper function,
which in turn lets those functions a bit easier to read and
also makes wmaker 0.11% smaller :-)

[mafra@Pilar:wmaker.git]$ size src/.libs/wmaker.*
   text    data     bss     dec     hex filename
 619824   19160    8544  647528   9e168 src/.libs/wmaker.new
 620552   19160    8544  648256   9e440 src/.libs/wmaker.old
 2009-08-28 20:18:18 +02:00
Martin Dietze
22730876e4 Nightly Build script can now deal with testing and unstable branches. 2009-08-28 19:04:29 +02:00
Gilbert Ashley
be08535ab4 Show app name in Kill Application dialog 
The "Kill Application" dialog window doesn't always show the
application name when killing DockApps. It shows its wm_class
instead, which is not always the same as the app name.

This patch allows the Kill Application dialog window to show
the application name in the window -- as expressed by using the
basename of the path to the application.

[crmafra: Added wtokensplit() to get only the app name]
 2009-08-27 16:35:42 +02:00
Vladimir Nadvornik
108127f0b5 Miscellaneous fixes from OpenSuse 
These are some of the fixes sent to the wmaker-dev list by
Vladimir Nadvornik, with minor modifications to address Dan
Pascu's concerns.

Original-post: http://lists.windowmaker.info/dev/msg00293.html
 2009-08-27 16:34:44 +02:00
Carlos R. Mafra
6d75291e1d Add config option to supress focus requests across workspaces 
In commit d6c134f420 ("Do not switch
workspace to follow new windows in others") the default behavior
was changed, and workspace switching to follow focus requests was
strictly forbidden.

Although that seems to be a sane thing to do by default, that raises
concerns about whether Window Maker could be more flexible in that
respect -- allowing the user to choose which applications are or
are not allowed to do that.

This patch adds such configuration, located in the "Advanced Options"
submenu of the top-level "Attributes" menu.
 2009-08-26 17:53:08 +02:00
Martin Dietze
ca60620f50 Adapted nightly build script to coexist with new 'next' branch. 2009-08-26 15:51:13 +02:00
Martin Dietze
a9aeefbe70 Fix NULL pointer dereference 
Some weird applications like Safari for Windows running on CXOffice
or some applications running on Wine were causing wmaker to crash.
So let's not rely on a window's `frame' property to be not NULL in
src/wmspec.c.

Original-post: http://lists.windowmaker.info/dev/msg00161.html
See-also: http://lists.windowmaker.info/dev/msg00222.html
 2009-08-25 01:10:00 +02:00
Martin Dietze
d6c134f420 Do not switch workspace to follow new windows in others 
New windows should only be focused if they are in the current workspace.
Not performing this check can lead to WM switching workspaces if a
window is opened which:

   (a) is configured to appear in a particular workspace

and

   (b) sends a _NET_ACTIVE_WINDOW message to give focus to
       something, e.g. a sub window.

This behaviour was observed with firefox if a session with more
than one tab open was restored at startup because:

 "If a Client wants to activate another window, it MUST send a
   _NET_ACTIVE_WINDOW client message to the root window:"

Original-post: http://lists.windowmaker.info/dev/msg00442.html

[crmafra: Added comment]
 2009-08-25 00:47:37 +02:00
Martin Dietze
442e3876c6 Add debianisation code and automatic build script 2009-08-24 11:55:20 +02:00
Martin Dietze
19f110d26e Add two menu files from the Debian package 2009-08-24 11:55:20 +02:00
Martin Dietze
3f6ae395ce Add GLOBAL_DEFAULTS_SUBDIR and fix a syntax error in wmlib/Makefile.am 2009-08-24 11:55:20 +02:00
Martin Dietze
ba027149bd Up the version number for the GIT version to 0.93.0-pre 2009-08-24 11:55:20 +02:00
Tamas TEVESZ
f893728d2d Fix format strings 2009-08-23 21:10:02 +02:00
Alexey Voinov
01dddf00c8 swpanel: Consider also the release of FOCUSPREV 
The switch panel was not being destroyed with the realease of
FOCUSPREV, only with FOCUSNEXT. Fix this.

One can reproduce this bug as follows.

In the "Keyboard Shortcut Preferences" of WPrefs set "Focus next window"
to e.g. "Alt+Tab" and "Focus previous window" to "Ctrl+Tab".
The switchpanel is not destroyed if we release "Ctrl+Tab" but it
is upon releasing of "Alt+Tab".

Retrieved-from: http://git.altlinux.org/people/voins/packages/?p=WindowMaker.git;a=commit;h=51c95a55c9310f499b1fdeca138106ca7bf74423

[crmafra: Commit log]
 2009-08-23 20:03:21 +02:00
Carlos R. Mafra
fe736e849c Remove LITE config option 
Why?

     1. The reason for its existence is to "Disable some stuff that are
        duplicated in kde", and I don't think I will ever need that.
        Furthermore, even the description in the configure script reads
        "disable some stuff (dont use it)".

     2. It makes the code uglier at some places, e.g.,

         #ifdef LITE
                {
         #if 0
                }
         #endif
         #else

                if (!wRootMenuPerformShortcut(event)) {
         #endif

        which by the way is the ugliness which motivated this patch.

     3. Does not even compile anymore. It fails with

          CC dockedapp.o
          CC event.o
       event.c: In function 'executeButtonAction:
       event.c:711: error: WScreen has no member named root_menu
       event.c:712: error: WScreen has no member named root_menu
       event.c:713: error: WScreen has no member named root_menu
       event.c:715: error: WScreen has no member named root_menu
       event.c:720: error: WScreen has no member named switch_menu
       event.c:721: error: WScreen has no member named switch_menu
       event.c:722: error: WScreen has no member named switch_menu
       event.c:724: error: WScreen has no member named switch_menu
       make[2]: *** [event.o] Error 1
       make[1]: *** [all] Error 2
       make: *** [all-recursive] Error 1

       But instead of fixing this (it would be trivial), let's get
       rid of the whole ugliness altogether.
 2009-08-23 18:45:30 +02:00
Carlos R. Mafra
874b0fadf5 Add spaces to gcc 'case' range extension 
According to the gcc manual, that is safer.
 2009-08-23 17:28:04 +02:00
Carlos R. Mafra
31f16389f6 Fix function prototype declaration 
It is safer if the functions are declared with proper
prototype specifications.

This patch addresses some of the warnings with -Wstrict-prototype,
like this:

event.c:105: warning: function declaration isn't a prototype
 2009-08-23 15:15:29 +02:00
Pedro Martelletto
2706f7217c WPrefs: Fix crash due to wtokenfree() memory leak fix 
After the fix to avoid a memory leak in wtokenfree(), WPrefs crashes
when opening the 'Applications Menu Definition' dialogue.

The problem is that WPrefs code relied on the fact that the first token
in the array would not be free'd by wtokenfree(), a misbehaviour which
is correctly addressed with this patch.

Retrieved-from: http://www.mail-archive.com/ports@openbsd.org/msg12731.html

[crmafra: small changes in the commit log from the webpage]
 2009-08-22 20:51:47 +02:00
Tobias Stoeckmann
e522ca734d WINGs: Fix memory leak in wtokenfree() 
wtokenfree() does not free the first entry of an array.
If count is 1 then

   while (--count)

will be

   while (0)

and the inner body of that while-loop will not be entered.
Therefore a memory leak happens every time wtokenfree() is called.

Retrieved-from: http://paldium.homeunix.org/tobias/wmaker/patches/

[crmafra: This patch, altough correct, breaks WPrefs.app, which will be
fixed by the next patch. ]
 2009-08-22 20:40:27 +02:00
Nicolas Bonifas
3a0eb643d9 swpanel: Start with the first window when all are minimized 
When all windows are minimized, the switch panel cursor is
initially on the second window in the list. With this patch
it will be on the first window.
 2009-08-22 13:03:56 +02:00
Carlos R. Mafra
f79379c090 swpanel: Fix stacking issue with swpanel escape handling 
Daniel Déchelotte reported one problem with the escape handling in
the switchpanel:

   "Start with two windows: a fullscreen one, and a smaller window
    that appears above the fullscreen one. With the mouse, focus the
    bigger window. Start alt-tabbing, then press Escape. The bigger
    window will then be focused (good) *and raised* (small problem)."

Fix this by adding a test for the escape key before calling
raiseWindow().
 2009-08-22 03:08:05 +02:00
Carlos R. Mafra
001bc28037 swpanel: Factor out if (swpanel) test 
We can remove redundand tests in each "case:" inside the
switch if we do it in the beginning.
 2009-08-22 03:08:05 +02:00
Carlos R. Mafra
203eba8937 swpanel: Clean up "case ButtonRelease" 
Get rid of 2 tabs indentation by removing a
not-strictly-necessary temporary variable.
 2009-08-22 03:08:05 +02:00
Carlos R. Mafra
d27e43e6b5 swpanel: Clean up StartWindozeCycle() a bit more 
We can put the test for 'newFocused' inside change_focus_and_raise()
to clean up the code a little bit.
 2009-08-22 03:07:34 +02:00
Tobias Stoeckmann
1db15a3543 Fix multiple errors in findfile.c 
Problems:

1.

  During expansion of path, the resulting path can overflow the supplied
  area of PATH_MAX+2 (buffer as well as buffer2). A tampered environment
  variable can be used to modify program flow.

Proof:
      [note: wmaker has been compiled with propolice]
      $ export A="[tested with 4096x A]"
      $ GNUSTEP_USER_ROOT="\$A\$A/\$A/\$A/" wmaker --for-real
      *** stack smashing detected ***: wmaker terminated
      Aborted

2.

  Way too many functions handle a return value of NULL for wexpandpath
  improperly, resulting in segfaults (and maybe other problems). To
  prove the existance of these issues:

Proof:
      $ GNUSTEP_USER_ROOT=~nouser wmaker --for-real
      wmaker error: could not get password entry for user nouser: Success
      Segmentation fault

Solution:

     hard exit with error message about what is going on.

3.

  The improper parsing of environment variables can lead to expansion
  of path names that were not intended to be expanded.

     (a) If a string like "$(var" is found, Window Maker tries to expand "var"
     	 (environment variable) although the syntax is wrong.

Proof:

      $ export PROOF=foo
      $ GNUSTEP_USER_ROOT=/\$\(PROOF wmaker --for-real
      wmaker warning: could not find user GNUstep directory (/foo/Defaults/WindowMaker).

      (b) If the variable out of a) cannot be resolved, a closing bracket will be
      	  added.

Proof:

      $ unset PROOF
      $ GNUSTEP_USER_ROOT=/\$\(PROOF wmaker --for-real
      ./wmaker warning: could not find user GNUstep directory ($(PROOF)/Defaults/WindowMaker).

Author: Tobias Stoeckmann
Retrieved-from: http://paldium.homeunix.org/tobias/wmaker/
Submitted-by: Gilbert Ashley <amigo@ibiblio.org>
 2009-08-21 12:13:12 +02:00
Daniel Déchelotte
c970c94f82 Remove useless tests 
There is no point in checking

      if (dock_state)

if the function would have already returned with
the check if(!dock_state) right above.

Retrived from http://yo.dan.free.fr/wmaker.phtml.en

[crmafra: wrote the commit message]
 2009-08-21 04:57:08 +02:00
Carlos R. Mafra
570df8316d Fix use of uninitialized variable 
Gcc-4.3.2 warns:

texture.c: In function 'wTextureMakeFunction':
texture.c:393: warning: 'fallbackColor.pixel' is used uninitialized in this function

Based on a patch by Vladimir Nadvornik.
 2009-08-21 02:20:27 +02:00
Vladimir Nadvornik
21b5df494b Less strict font requirements 
Fixes bug:

  https://bugzilla.novell.com/show_bug.cgi?id=154758
 2009-08-21 02:10:50 +02:00
Vladimir Nadvornik
e113ec10c9 Fix findBestIcon() 
This patch fixes the issue described here:

https://bugzilla.novell.com/show_bug.cgi?id=371974
 2009-08-21 01:54:26 +02:00
Daniel Déchelotte
95a576bd62 Fix "smart" placement bug when there are shaded windows in other workspaces 
Bug overview:
    New windows are sometimes mis-placed when the "smart" algorithm is used.

How to reproduce it:
    be sure (with WPrefs.app, for instance) to use the so-called "smart"
    window placement algorithm. In an empty workspace, open a first window
    (for instance, an xterm). The window should appear at the upper left corner.
    Shade it (hide its contents below its title bar by double-clicking on it)
    and select another empty workspace. Open another window. Instead of placing
    it at the exact same place as the first window, wmaker places the new
    window a little bit lower, or frankly to the right.

Explanation and correction:
    when placing a new window, wmaker avoided all shaded windows, instead of
    only avoiding the shaded windows on the active workspace.
 2009-08-20 23:59:41 +02:00
Daniel Déchelotte
3f7110b120 Fix focus issues with the switch panel and auto-focus 
1. Setup two windows in a workspace, one at the center and the
   other at a corner. Move the mouse to the center of the screen, so
   that the focus goes to the center window. Now, with the help of the
   keyboard (with Alt-tab, typically), try and switch the focus to the
   other window. In doing so, the switch panel shows up, gives the
   focus to the other window and then disappears. However, its
   disappearance make it seem to wmaker that the mouse has just
   entered the center window, so wmaker gives the focus to that
   window again.

   2. It is a lit bit more involved. "Raise window when switching
   focus with keyboard" needs to be set. In a given workspace, maximize
   a first window A, then setup "above" window A two windows B and C
   (one in the upper left corner and the other one in the lower right
   corner, for example). Move the mouse so as to give the focus to
   window B. Press the Alt key, hit the key tab once (window A moves
   up to the "top"), then another time (window C is then selected).
   Eventually relase the Alt key: window B is given the focus again.

Correction: it is a matter of ignoring some (EnterNotify) events
when the switch panel is active or has just been used.
 2009-08-20 22:07:10 +02:00
Carlos R. Mafra
f9bb2a428a Escape key handling in switchpanel 
Pressing the escape key (ESC) while the switchpanel is active
cancels it and gives the focus back to the window which had it
before the switchpanel was invoked.

If all windows are minimized before the switchpanel was called,
they will continue to be if ESC is pressed.

In other words, pressing ESC is like going to the parallel universe
where you never entered the switchpanel in the first place.

Based on a patch by Nicolas Bonifas from 17.08.2009.
 2009-08-20 16:00:26 +02:00
Carlos R. Mafra
333dbf5418 Use helper function in StartWindozeCycle() 
This way we avoid code duplication in 6 places.

This changes the previous behavior of the first
instance because the helper function has an extra

       CommitStacking(scr);

 compared to the original code. But it should not
 hurt to have it.
 2009-08-20 15:46:45 +02:00
Carlos R. Mafra
a9238c99b9 Clean up coding style in StartWindozeCycle() 
No functional changes were made apart from
setting the various KeyCode variables at the
same time as defining them.
 2009-08-20 15:09:07 +02:00
Carlos R. Mafra
4a041b6f0a Clean up StartWindozeCycle() 
We can get rid of one overall tab by moving the

   if(swpanel)

test -- which was done everytime in each individual case --
to the beginning, therefore encompassing all cases.
 2009-08-20 04:07:15 +02:00
Carlos R. Mafra
688a56e8ab Change to the linux kernel coding style 
for arq in `git ls-files *.c`; do
    echo $arq;
    indent -linux -l115 $arq;
    done

The different line break at 115 columns is because
I use a widescreen monitor :-)
 2009-08-20 00:59:40 +02:00
Carlos R. Mafra
59fc927dc9 Make drawIconProc() static 
It is used only inside src/dialog.c
 2009-08-20 00:57:03 +02:00
Carlos R. Mafra
066af13b5c Clean up case switching in handleKeyPress() 
GCC has an extension to deal with ranges within case statements.
Let's use it to make the code more readable and ~5% smaller,

[mafra@Pilar:wmaker.git]$ size src/event.o.*
   text    data     bss     dec     hex filename
  13087       0    1056   14143    373f src/event.o.new
  13711       0    1056   14767    39af src/event.o.old
 2009-08-19 22:11:15 +02:00
Carlos R. Mafra
e2d8cbe238 Remove unsigned type from 'mask' 
gcc-4.3.2 warns:

    defaults.c: In function 'getModMask':
    defaults.c:2586: warning: comparison of unsigned expression < 0 is always false

    The line in question is

        if (mask < 0)

    and 'mask' is the return of wXModifierFromKey() which is an 'int' and can
    indeed return a negative value (see src/xmodifier.c), so let 'mask' be
    an 'int' too.
 2009-08-18 16:28:43 +02:00
Carlos R. Mafra
cb31fd374c Sanitize calling sites of wDefaultsCheckDomains() 
There is no point in having parameter in wDefaultsCheckDomains() and
not using it, so let's simply remove the parameter altogether and
avoid silly-looking things like

    wDefaultsCheckDomains("bla");
 2009-08-18 16:20:18 +02:00
Carlos R. Mafra
f4fd88b8a9 Make loop variable be unsigned int 
gcc was complaining in a few places things like:

defaults.c:890: warning: comparison between signed and unsigned

so let's just make the loop counting variables be unsigned, as
the never get negative anyway.

I also spotted other two variables which can be unsigned too.
 2009-08-18 16:19:48 +02:00
Carlos R. Mafra
f36ab39680 Fix variable shadowing 
gcc-4.3.2 warns:
defaults.c:3136: warning: declaration of 'index' shadows a global declaration
/usr/include/string.h:309: warning: shadowed declaration is here

and in a few other places too. Fix this by renaming 'index' to 'widx'.
 2009-08-18 16:17:28 +02:00
Carlos R. Mafra
0a32ecf1fe WMCreateFont: Add missing wfree()'s 
I removed (forgot) them when in commit ee28b0257a ("Avoid returning
font=NULL in WMCreateFont()"). Add them back.
 2009-08-18 04:33:39 +02:00
Carlos R. Mafra
9baff1363c handleKeyPress: Fix shadowing of global 'index' variable 
GCC warns:

event.c: In function 'handleDestroyNotify':
event.c:676: warning: declaration of 'index' shadows a global declaration
/usr/include/string.h:309: warning: shadowed declaration is here
event.c: In function 'handleKeyPress':
event.c:1435: warning: declaration of 'index' shadows a global declaration
/usr/include/string.h:309: warning: shadowed declaration is here

So let's rename "index" to "widx".

Note that there is a more serious shadowing in this same function,

event.c:1686: warning: declaration of 'wwin' shadows a previous local

but this is more complicated to solve.
 2009-08-18 00:56:09 +02:00
Carlos R. Mafra
f18567db9a inotifyHandleEvents: Reduce buffer size to avoid huge memory consumption 
inotifyHandleEvents() was allocating a buffer of size

 (sizeof(struct inotify_event) + FILENAME_MAX)*1024

where FILENAME_MAX is #defined to be 4096 in stdio_lim.h, therefore
it was more than 4 MB!

Reduce it by using 16 instead of FILENAME_MAX and 512 instead of 1024.

Now valgrind does not complain about things like

Invalid write of size 8
 at 0x42002F: inotifyHandleEvents (event.c:323)
 by 0x7FF00020F: ???
 Address 0x7febfc148 is on thread 1's stack

I also made some small coding style changes.
 2009-08-18 00:39:45 +02:00
Carlos R. Mafra
be0d694dc2 real_main: Use setenv() instead of putenv() in remaining places 
It simplifies the code a bit.
 2009-08-17 22:42:38 +02:00
Carlos R. Mafra
6310e40d47 real_main: Use setenv() instead of putenv() 
When investigating possible memory leaks with 'valgrind' I noticed
this leak report:

 602 bytes in 13 blocks are definitely lost in loss record 77 of 128
    at 0x4C2362E: malloc (vg_replace_malloc.c:207)
    by 0x4576ED: wmalloc (memory.c:88)
    by 0x45B4F7: wstrconcat (string.c:214)
    by 0x426FC2: main (main.c:608)

which happens here,

    str = wstrconcat("WMAKER_BIN_NAME=", argv[0]);
    putenv(str);

There is a comment further below (in another context)

/* return of wstrconcat should not be free-ed! read putenv man page */

so this leak report is probably a false positive anyway. However,
https://www.securecoding.cert.org/confluence/display/seccode/POS34-C.+Do+not+call+putenv%28%29+with+a+pointer+to+an+automatic+variable+as+the+argument
has some nice discussion about putenv() and after reading it I decided to
use setenv() instead, making 'valgrind' happy along the way. It also
makes the code a bit simpler, avoiding a call to wstrconcat().

I also changed the name of another variable called 'str' to 'pos', just
in case.
 2009-08-17 22:19:58 +02:00
Carlos R. Mafra
7a84127a27 Fix improper use of function sentinel 
This patch addresses this warning of gcc:

wfontpanel.c: In function 'listFamilies':
wfontpanel.c:588: warning: missing sentinel in function call

Fix it by using the 'NULL' pointer instead of 0 (zero) as the
sentinel.

For more information, see
http://www.linuxonly.nl/docs/2/2_GCC_4_warnings_about_sentinels.html
in particular,

   "On most systems, there is no difference between 0 and (char *)0.
    On 64 bit systems, however, the integer 0 is 32 bits and the
    pointer 0 is 64 bits. The compiler does not know whether it is
    an integer or a pointer, and defaults for the integer. This will
    not clear the upper 32 bits and the function will not stop
    scanning its parameters."

Note that here in my 64-bit Mandriva I don't need to cast (char *)NULL.
 2009-08-17 18:13:58 +02:00
Carlos R. Mafra
288853e44f WPrefs: Remove unused function updateThemeList() 2009-08-17 17:44:00 +02:00
Carlos R. Mafra
09a8911b6f Remove unused variables 
GCC -Wall complains about them.
 2009-08-17 17:35:48 +02:00
Carlos R. Mafra
ceeca912cd Make compilation even less verbose 
Add "-s" flag to MAKEFLAGS if --disable-verbose-compile
is enabled.
 2009-08-17 16:49:22 +02:00
Carlos R. Mafra
7a3b139dcb Remove prototype of unused function StartLogShell 2009-08-16 11:14:40 +02:00
Tamas TEVESZ
e2b6a85e80 Fix buffer overflow in SendHelperMessage() 
The following fixes a buffer overflow in SendHelperMessage() which i
started seeing recently on x64.
 2009-08-16 01:05:23 +02:00
John H. Robinson, IV
38074e7bd5 Remove unused StartLogShell function. 
Based upon a patch by Tobias Stoeckmann

Small code size reduction,

   text    data     bss     dec     hex filename
 620412   19144    8544  648100   9e3a4 src/.libs/wmaker
 621347   19152    8544  649043   9e753 src/.libs/wmaker.old
 2009-08-16 00:35:54 +02:00
Tobias Stoeckmann
f516213bf3 Check for argc==0 when calling wtokensplit() 
The WINGs-function wtokensplit does not set argv to NULL if no string has been
split - instead argc is set to 0.

You can only observe this issue if you compile Window Maker without any
optimization:

compile Window Maker with CFLAGS=""
run Window Maker and save a session
change session-file and replace a 'command xyz' line with 'command " "'
restart Window Maker
watch "Fatal error"-message

Retrieved-from: http://paldium.homeunix.org/tobias/wmaker/
Submitted-by: Gilbert Ashley <amigo@ibiblio.org>
 2009-08-16 00:16:58 +02:00
Iain Patterson
bbc52564d0 xinerama switchpanel corruption fix 
This is a small patch to fix an issue with the switchpanel and a large number
of windows which happens only on a Xinerama setup.

When the number of open windows is so large that displaying all of them would
cause the switchpanel to be too wide for the screen, the panel is supposed to
shrink and scroll to accomodate them all.

In Window Maker 0.92.0 this works for single head displays but not for
Xinerama. The panel extends to the next head and gets garbled. This patch fixes
the issue by correctly constraining the panel to the head with the cursor.

Submitted-by: Gilbert Ashley <amigo@ibiblio.org>
 2009-08-16 00:06:31 +02:00
David Benbennick
3e9aae7a91 Fix mixing pixels when maximizing borderless windows 
A minor bug has been bothering me for a long time. When you maximize a
borderless window in Window Maker, the window ends up too narrow and too short
by two pixels.

Submitted-by: Gilbert Ashley  <amigo@ibiblio.org>
 2009-08-15 23:59:45 +02:00
Samir SAADA
9fa4fbef91 Fix workspace limit segfault 
wmaker keeps the names of all workspaces together in
the string 'buf' with fixed length of 1024, therefore
allowing buffer overflows if the number of workspaces
is big enough.

For the default names "Workspace X" (from 1 to 9)
and "Workspace XX" (from 10 to 99) etc, the approximate
number of workspaces necessary to make the buffer
overflow occur is 80, because

(11*9) + (71*12) + 80 = 1031

The fix is to set the size of 'buf' as
the maximum number of workspaces times their maximum
name length.

The problem was reported by John H. Robinson in the wmaker-dev
list ( http://lists.windowmaker.info/dev/msg00214.html ):

 "http://www.youtube.com/watch?v=fkNJZvKwmhE

  Michael reported a problem with Window Maker where it crashes with a
  SIGSGV when trying to create an 82nd workspace.

  /usr/local/WindowMaker-0.92.1pre/bin/wmaker warning: Window Maker exited
  due to a crash (signal 11) and will be restarted.

  I was able to reproduce it by making 81 workspaces, then creating an 82nd."

[ crmafra: Wrote the changelog ]
 2009-08-09 02:34:21 +02:00
Tamas TEVESZ
f21ce5768b avoid integer overflow 
Actually, the whole thing is so chock full of signed vs unsigned
mixups and the assumption of all the world is 32-bit that i'm not sure
anymore that correcting them one by one is a good idea.

what would probably work best is that if someone deeply familiar with
the code (*looks in dan's general direction*) cleaned the data types
up, then legions of grunts like myself could start cleaning the rest
with relative confidence...
 2009-08-09 01:53:12 +02:00
Tamas TEVESZ
b487d56452 Sync comment with reality 
Or rather, remove possibility for comment to diverge from reality
 2009-08-09 01:51:25 +02:00
Samir SAADA
d316260395 Fix menu positioning bug 
Here I tried to prevent the menu of windows to be displayed in the
other side of the screen if the window is half present in the screen
horizontally (ie x < 0)

a worse problem with menu is that it disappears when
the window is half present in the window vertically
ie y < 0, that makes it not usable.
 2009-08-09 00:32:32 +02:00
Carlos R. Mafra
6b08fc9e78 Trivial cleanup 2009-08-08 23:38:26 +02:00
Carlos R. Mafra
0c469de04f Fix gcc warnings 
This patch fixes the following warnings (with gcc 4.2.3)

    defaults.c:980: warning: unused variable 'replace'
    main.c:504: warning: 'watchPath' may be used uninitialized in this function
    main.c:504: note: 'watchPath' was declared here
    startup.c:616: warning: implicit declaration of function 'XrmUniqueQuark'
 2008-11-10 01:42:50 +01:00
Carlos R. Mafra
d680e6e580 Compilation: Add a few spaces in the output 
It is even better to have the messages displayed a few spaces
off from the left screen border.

The inspiration comes from the Git compilation output.
 2008-11-10 00:14:07 +01:00
Carlos R. Mafra
3c323e1e9a Fix buffer overflows in shortcut and workspace name handling 
The handling of user defined shortcuts was not checking the length
of the shortcut before copying it to a fixed-length temporary buffer,

char buf[128];

     strcpy(buf, shortcutDefinition);

and strcpy() is well known for not checking if overflows will occur.

In particular, wmaker was crashing here if a big 'shortcut' was defined
either through WPrefs or by directly editing the configuration files.

This is now avoided by using strncpy() instead.

And this patch also fixes a similar buffer overflow for big workspace
names too.

Furthermore, use MAX_SHORTCUT_LENGTH instead of raw number and define
it to be 32 instead of 128.
 2008-11-09 20:18:05 +01:00
Carlos R. Mafra
06f59b9928 wmaker: Fix compiler warnings about pointer <--> integer conversion 
There may be issues with running applications in 64-bit mode when
they were written with tacit assumptions about 32-bit platforms.
For example,

    * Assuming that a pointer can be cast back and forth to an integer

The reason is that the size of the integer and pointer may be different.
See the description of "[PATCH] Warn when casting a pointer (constant)
to an integer of different size." in the gcc mailing list

http://gcc.gnu.org/ml/gcc-patches/2005-12/msg01881.html

where it was also suggested the use of casts to uintptr_t. This is
what this patch does.

As a result the following warnings are fixed, leaving us with an
almost warning-free compilation in 64-bit platforms:

defaults.c:1446: warning: cast to pointer from integer of different size
defaults.c:1457: warning: cast to pointer from integer of different size
defaults.c:1471: warning: cast to pointer from integer of different size
defaults.c:1486: warning: cast to pointer from integer of different size
icon.c:67: warning: cast from pointer to integer of different size
menu.c:112: warning: cast from pointer to integer of different size
switchmenu.c:452: warning: cast from pointer to integer of different size
window.c:140: warning: cast from pointer to integer of different size
window.c:2217: warning: cast to pointer from integer of different size
workspace.c:135: warning: cast to pointer from integer of different size
workspace.c:214: warning: cast to pointer from integer of different size
workspace.c:634: warning: cast to pointer from integer of different size
workspace.c:1330: warning: cast to pointer from integer of different size
workspace.c:1514: warning: cast to pointer from integer of different size
wfilepanel.c:135: warning: cast from pointer to integer of different size
wfilepanel.c:171: warning: cast from pointer to integer of different size
wfontpanel.c:499: warning: cast to pointer from integer of different size
wfontpanel.c:500: warning: cast to pointer from integer of different size
wfontpanel.c:505: warning: cast to pointer from integer of different size
wfontpanel.c:506: warning: cast to pointer from integer of different size
wfontpanel.c:776: warning: cast from pointer to integer of different size
wfontpanel.c:777: warning: cast from pointer to integer of different size
wfontpanel.c:877: warning: cast from pointer to integer of different size
wfontpanel.c:878: warning: cast from pointer to integer of different size
wpanel.c:363: warning: cast from pointer to integer of different size
fontl.c:42: warning: cast from pointer to integer of different size
fontl.c:42: warning: cast from pointer to integer of different size
fontl.c:42: warning: cast from pointer to integer of different size
fontl.c:90: warning: cast to pointer from integer of different size
puzzle.c:138: warning: cast from pointer to integer of different size
puzzle.c:225: warning: cast to pointer from integer of different size
wtableview.c:1031: warning: cast to pointer from integer of different size
wtableview.c:1067: warning: cast to pointer from integer of different size
wtableview.c:1069: warning: cast to pointer from integer of different size
wtableview.c:1074: warning: cast to pointer from integer of different size
wtabledelegates.c:234: warning: cast from pointer to integer of different size
wtabledelegates.c:250: warning: cast from pointer to integer of different size
wtabledelegates.c:265: warning: cast from pointer to integer of different size
wtabledelegates.c:287: warning: cast to pointer from integer of different size
wtabledelegates.c:351: warning: cast from pointer to integer of different size
wtabledelegates.c:372: warning: cast from pointer to integer of different size
wtabledelegates.c:393: warning: cast from pointer to integer of different size
wtabledelegates.c:410: warning: cast to pointer from integer of different size
test.c:44: warning: cast from pointer to integer of different size
test.c:47: warning: cast to pointer from integer of different size
test.c:55: warning: cast from pointer to integer of different size
test.c:58: warning: cast from pointer to integer of different size
 2008-11-06 09:07:50 +01:00
Carlos R. Mafra
4339e446e4 automake: Fix warnings about underquoted calls to AC_DEFUN 
This patch fixes warnings from automake versions >=1.8 about
underquoted calls to AC_DEFUN.

I followed the recommended modifications of
http://sources.redhat.com/automake/automake.html#Extending-aclocal
 2008-11-05 18:17:55 +01:00
Carlos R. Mafra
72689513a3 Makefile: Beautify compilation messages 
This patch adds the --disable-verbose-compile switch to the
configure script.

When this option is used it reduces the verbosity of compilation
messages to the essential. However compiler warnings are not affected
and thus gain visibility by not standing in the middle of a storm
of other messages.

In summary, the compilation messages are reduced to a stream of

CC array.o
CC bagtree.o
CC configuration.o
CC connection.o
CC data.o
[...]

instead of a mind-boggling flux of

gcc -DHAVE_CONFIG_H -I. -I../src -I../WINGs/WINGs -I../wrlib -I../src
-I/usr/include/freetype2   -I/usr/local/include
-DLOCALEDIR=\"/usr/local/lib/loca\"/usr/local/share/WINGs\"
-DDEBUG  -fno-strict-aliasing -g -O2 -c array.c
gcc -DHAVE_CONFIG_H -I. -I../src -I../WINGs/WINGs
-I../wrlib -I../src -I/usr/include/freetype2   -I/usr/local/include
-DLOCALEDIR=\"/usr/local/lib/loca\"/usr/local/share/WINGs\"
-DDEBUG  -fno-strict-aliasing -g -O2 -c bagtree.c
[...]
 2008-11-05 18:03:07 +01:00
Rodney Padgett
56d8568787 Use inotify to check for changes to the defaults database. Workaround for 
event handler timer.

After upgrading my kernel recently I noticed that dnotify has been
depreciated, so I decided to try and implement the new inotify code in
Window Maker instead.

During testing, I also found that one of the timers which was removed
(the one causing the most wake-ups), calling delayedAction, was
responsible for handling signals. Basically with this timer removed,
signals were only handled after an X event occurs.

After looking at the delayedAction function, I couldn't see the purpose of it.
It certainly wouldn't cause any delay as it was called by the timer every
500ms, so there is no time correlation with when a signal was received.
Also, it appeared to count the signals and call DispatchEvent for each
one, but it appears DispatchEvent would just handle the most recent signal
and take action on that. The signals handled by delayedAction are the
various exit and reset signals, so only one need to be handled. I
therefore have commented out delayedAction (it wasn't called by any other
procedure) and added a call to DispatchEvent imediately after the signal
is registered, in handleExitSig.

I'm not sure what problems this may cause with dead children - these are
only cleaned up after an Xevent now that the timer is removed- but I
haven't observed any problems since a few months ago.
 2008-08-09 13:14:39 -05:00
Pedro Gimeno
c91bb1ba13 Fix periodic focus bug 
Pedro Gimeno explains:

"As you most likely already know, every X Window event comes with a
timestamp. You can see it using e.g. xev.

I don't know if this is Debian-specific and I'm no X Window expert, but
the fact is that in my machine this timestamp, according to my
/usr/include/X11/X.h, is a 32-bit unsigned integer and it holds the
event time in milliseconds according to my tests.

This timestamp appears to be in milliseconds from the start of the Unix
epoch, modulo 2^32. The problem is that 32 bits are too little for this
purpose: 2^32 milliseconds are exactly 49 days, 17 hours, 2 minutes and
47.296 seconds.

Now, the WindowMaker code rejects any focus event whose timestamp is
less than the last one seen, using code similar to this:

 if (timestamp < LastTimeStamp) return;
 LastTimeStamp = timestamp;

This is a disaster when timestamp wraps around because of the 32-bit
limit. Say LastTimeStamp equals 2^32-1 and a focus event comes two
milliseconds after. Its timestamp will equal 1 because of the
wraparound. Obviously, 1 < 2^32-1 so the event will be rejected even if
it comes from the future (relative to LastTimeStamp) and not from the
past. Focus events are no longer accepted because nothing can be greater
than 2^32-1 (unless you click on that exact millisecond, 49 days after).

If you look in http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=102314
you'll see two people confirming the periodicity and predictability of
the bug. Arnaud Giersch was who noted that the period was 2^32
milliseconds (and not 2^31 as I thought it could be because of a signed
int involved) and who noted the coincidence with the Unix epoch.

My fix works by subtracting one timestamp from the other (an operation
which is done modulo 2^32) and rejecting the focus event only if the new
timestamp is within 1 minute (60000 milliseconds) in the past. Given the
periodicity of the timestamp, actually after 49.7 days there will be
another minute in the future during which focus events will not be
accepted; again after 99.4 days, etc., but thanks to the subtraction,
they will now be relative to the *last* focus change and not to the Unix
epoch.

The patch could be simplified to get rid of the compareTimes function.
It's written like that because it comes from the previous patch (which
you can see in the same bug report).

So the date comparison line could end up looking like this:

   if (scr->flags.ignore_focus_events || LastFocusChange - timestamp <
60000)

so you can get rid of the compareTimes function. However please respect
the other change of 'int' to 'Time'.

As for why you aren't experiencing this problem, perhaps the event
timestamp does not come from the Unix epoch in your X Window system, but
rather starts counting when you start it or your computer, I don't know.
Or maybe your X Window server's timestamps are 64 bits wide instead of
32 bits, which I don't think because I doubt the X11 protocol specifies
a 64-bit record for the transmission of the timestamp. In either case,
the output of xev will probably help understanding the cause.

Or maybe even it's a click-to-focus only bug and you're not using that
mode. I haven't checked who calls wSetFocusTo.

Note that I can reproduce it just by manipulating the system clock,
which seems to be tied to the event timestamps."

For more information see:
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=102314

Reported-by: Joey Hess <joeyh@debian.org>
Signed-off-by: Pedro Gimeno <parigalo@formauri.es>
 2008-06-26 15:03:38 -03:00
Paulo Cesar Pereira de Andrade
e4800e84d0 Workaround for Composite problems when default depth is not 24. 
This is really a workaround patch, the proper fix would be to have
WindowMaker know about Composite, and take advantage of it's features.
 2008-05-03 20:02:31 -03:00
Carlos R. Mafra
ee28b0257a WINGs/wfont.c: Avoid returning font=NULL in WMCreateFont() 
WPrefs tries to use the fonts listed in the WMCreateFont() call (from WPrefs.c),

font = WMCreateFont(scr, "Lucida Sans,URW Gothic L,Times New Roman,serif"
                         ":bold:pixelsize=26:antialias=true");

and 'font' is later used without accounting the possibility of it being NULL in

WMSetLabelFont(WPrefs.nameL, font);
WMReleaseFont(font);

In particular, WMReleaseFont(font) will kill WPrefs ungracefully with the
following message if font=NULL

WPrefs: wfont.c:193: WMReleaseFont: Assertion `font!=((void *)0)' failed.
Aborted

That happens because the return value of WMCreateFont() can be NULL, so this
patch makes WMCreateFont() never return NULL. If the font creation fails for
some reason (see below), we try to use the emergency DEFAULT_FONT and print
debugging information telling what's going on. If the use of DEFAULT_FONT
also fails, then we terminate WPrefs with exit(1) and let the user know
why exactly if failed.

This bug happened because the font "Lucida Sans" (the first possibility
in the initial call to WMCreateFont()) "exists" in my system as a stale
symbolic link to a location which no longer exists after an upgrade from
java from 1.5.0.14 to 1.5.0.15

    /etc/alternatives/LucidaSansDemiBold.ttf ->
    /usr/lib/jvm/java-1.5.0-sun-1.5.0.14/jre/lib/fonts/LucidaSansDemiBold.ttf

So the call to XftFontOpenName(display, scrPtr->screen, fname) with
"Lucida Sans" being the first possibility for Xft to try out ended up in 'font'
being NULL because, as far as the Xft library was concerned, "Lucida Sans"
produced a positive match (due to it existing as a symbolic link) but in the end
a NULL result was produced due to the missing symbolic link destination. This later
exposed the bug of WMCreateFont() returning font=NULL and WPrefs.c not checking
whether font=NULL before using it. Bang!

If "Lucida Sans" was the _second_ entry to try and the first one had suceeded,
this bug would not have surfaced.

This solves https://qa.mandriva.com/show_bug.cgi?id=39677

Signed-off-by: Carlos R. Mafra <crmafra@ift.unesp.br>
 2008-05-02 20:23:00 -03:00
Carlos R. Mafra
722c82c8ab wmaker: Reduce wakeups to zero 
This patch removes wmaker from PowerTop's shame list, where
it appeared with ~3-4 wakeups/second.

It adds the linux kernel's dnotify mechanism (adapted from
the example in Documentation/dnotify.txt in the kernel source),
to detect when a configuration file in ~/GNUStep/Defaults has
changed to load it again on-the-fly. For me it usually means that
modifications to ~/GNUStep/Defaults/WMRootMenu via the 'genmenu'
script are automatically detected and loaded.

The use of dnotify makes the ancient behaviour of polling unecessary
and cuts down the wakeups count.

Other 'apparently' useless timers are also deleted and it's been almost
one year now that I use this patched exclusively without problems, so
I am pretty sure that it doesn't hurt to remove them.

The end result of all this is that wmaker generates 0 (zero) wakeups
when idle in a Linux system.

Signed-off-by: Carlos R. Mafra <crmafra@ift.unesp.br>
 2008-05-02 20:01:50 -03:00
Carlos R. Mafra
2061c30758 Add .gitignore to git repository 2008-05-02 01:01:24 -03:00
dan
4e8423d18a Fixed segfault when unhiding an application in certain conditions (seen 
with KDE applications with transient windows)
 2006-04-27 19:16:58 +00:00
dan
a5aa8573c9 updated todo with ideas for post 1.0 2006-04-27 02:57:57 +00:00
dan
ecd5217633 Enhanced the cursor positioning/selecting text using the mouse in a textfield. 
This also fixed an endless loop that could be entered by the previous code
in certain situations, after the patch to fix navigation/selection in a
textfiled with UTF8 chars was applied.
 2006-04-27 02:48:18 +00:00
dan
577b3ee949 Removed WINGs' dependency on rgb.txt (from X11). 
This fixes issues with locating the file which is being stored on different
locations depending on the X server release/version
 2006-04-26 20:28:24 +00:00
dan
bc4de88d8b Applied patches from Stanislav Maslovski <stanislav.maslovski@gmail.com> to 
fix the 2 problems mentioend below:

- Fixed buggy handling of UTF8 characters in textfields in WINGs.
- Fixed segfault in WPrefs when some font description is missing from the
  configuration file.
 2006-04-25 23:52:43 +00:00
dan
4688c9839b more fixes for missing linking flags in some cases 2006-04-25 20:01:51 +00:00
dan
90c0e656f1 replaced windowmaker.org with windowmaker.info everywhere 2006-04-25 19:35:14 +00:00
dan
42191340fd - Improved Info panel display. 
- Fixed missing library paths when linking some binaries on certain
  platforms with a recent pkg-config
 2006-04-25 18:59:24 +00:00
dan
d873d09fa5 yet another cvs commit notification test 2006-04-25 18:50:42 +00:00
dan
2e114bcc1e another cvs commit notification test 2006-04-25 18:46:14 +00:00
dan
1a73c71d56 cvs commit notification test 2006-04-25 18:23:19 +00:00
dan
240586edc5 cvs commit notification test 2006-04-25 17:58:33 +00:00
dan
eae4c45cf5 test cvs commit notifications 2006-03-28 19:50:04 +00:00
dan
c2c58734b8 test cvs commit notifications 2006-01-23 06:47:27 +00:00
dan
085e9d6254 - updated the XDND code in WINGs to work with GDK based applications. 
WINGs based applications should now work with both KDE and GNOME
  applications (Sylvain Reynal <sreynal@nerim.net>)
- better check for the XDND protocol version when interoperating with other
  applications. As it seems xdnd version 3 (which WINGs supports) and newer
  are not backward compatible with xdnd version 1 and 2. This is why WINGs
  applications cannot interoperate with GNUstep applications (which uses
  xdnd version 2). Xdnd version 4 and 5 are backwards compatible with
  version 3 though. (Sylvain Reynal <sreynal@nerim.net>)
 2006-01-22 20:33:19 +00:00
dan
f683b99405 updated estonian translation 2006-01-22 19:20:57 +00:00
dan
bacf8229b0 - release colors to avoid issues with the reference count overflowing a 
small integer and causing unexpected color releases that can crash
  Window Maker (Martin Frydl <martin.frydl@systinet.com>)
- fixed a small memory leak in WINGs/wview.c caused by not releasing the
  background color of a view (Martin Frydl <martin.frydl@systinet.com>)
 2006-01-22 18:19:09 +00:00
dan
fa7a5db4bd - fixed issue with invisible modal windows from Qt and Gtk applications 
on 64bit platforms (Max Loparyev <max@city.veganet.ru>)
- fixed issue with icon colors on big endian platforms
  (Max Loparyev <max@city.veganet.ru>)

patch based on a previous patch by Vladimir Nadvornik <nadvornik@suse.cz>
 2006-01-22 18:05:00 +00:00
dan
e534138417 test 2006-01-22 16:29:39 +00:00
dan
73d94f7bdc test 2006-01-22 16:03:31 +00:00
dan
054f954390 Applied some patches from Balaton Zoltan <balaton@eik.bme.hu> 
- small fix for compilation in a different directory than the source
- fixed some warnings on 64bit platforms
 2006-01-22 15:53:44 +00:00
dan
c0317ddae5 eliminated gcc-4 compilation warnings 2005-08-22 23:58:19 +00:00
dan
91f5abc955 - fixed gcc-4 compilation issues (Vladimir Nadvornik <nadvornik@suse.cz>) 
- fixed amd64 compilation issues (Vladimir Nadvornik <nadvornik@suse.cz>)
 2005-08-22 19:07:57 +00:00
dan
d26f18505a Fixed WPrefs.app to find its icons when not installed under GNUstep paths 2005-07-17 19:16:46 +00:00
dan
f3a960d9d8 updated german translations 2005-07-05 19:41:06 +00:00
dan
5f0a357b1f try to work around some user's IQ level 2005-07-05 08:44:00 +00:00
dan
20d5925d08 updated news file (part 2) 2005-07-03 18:08:46 +00:00
dan
b655a5fa5f updated news file 2005-07-03 18:01:46 +00:00
dan
ad0ae4887f - new algorithm for placing miniwindows after unhiding the application they 
belong to, that works without auto-arranging the icons, while still avoiding
  multiple icons in the same spot by moving the miniwindows to a new slot if
  their old slot was occupied in the meantime.
- double clicking an appicon will also raise the miniwindows that belong to
  that application to the front (along with the normal windows).
 2005-07-03 17:37:03 +00:00
dan
eca635cb5d - try fixed font for the technical drawing font if helvetica-12 is not 
available to avoid crashing (Timo Juhani Lindfors <timo.lindfors@iki.fi>)
- german WINgs po file fix
 2005-07-03 00:49:06 +00:00
dan
ad641c1992 Fixed issue with GNUstep applications losing focus when all their windows 
are closed and there remains only their menu (Matt Rice <ratmice@yahoo.com>)
 2005-07-02 19:23:41 +00:00
dan
69730273b1 - fixed bug with windows shrinking to very small sizes when Unmaximize was 
used on them, after they were closed in a maximized state.
- fixed bug with restoring maximized state from NetWM atoms.
 2005-05-15 16:45:02 +00:00
dan
f8b3a774be removed obsolete file 2005-05-09 00:27:33 +00:00
dan
2ea40ff2c5 Improved hide/unhide animation for applications with multiple windows 
(only animate the active window hiding/unhiding, which makes Window Maker
faster and more responsive for such applications).
 2005-05-08 00:51:56 +00:00
dan
33f7b63d11 - Fixed switch panel default value in defaults.c 
- Fixed WPrefs path in the installed WMState (changed after recent WPrefs
  installation path changes)
- Fixed wmaker.inst (apparently some very noisy individual was unable to get
  right his 10 line patch to rename a path)
 2005-04-08 11:51:06 +00:00
dan
880880162b Fixed bug that caused wmaker to crash when kplayer was switched back from 
fullscreen mode to windowed mode.
 2005-03-22 23:15:11 +00:00
dan
2f56373cc2 fixed issue with window being moved by 1 pixel up and left when the window 
move was initiated by the client
 2005-03-13 00:15:13 +00:00
dan
24519b6292 Added code to automatically convert Icon paths in WMWindowAttributes from 
the old .AppInfo/... to the new Library/WindowMaker/... on the fly when
Window Maker starts.
This should allow a transparent transition without any need for users to do
anything.
 2005-03-12 01:16:04 +00:00
dan
24e349afe7 Changes (especially the ones that may affect backward compatibility like 
this path change) should go at the top of the NEWS file. None digs 1200
lines in the NEWS to read about some path change.
 2005-03-11 23:05:43 +00:00
dan
5cfc565bbd Fixed paths, because mr Alex "Big Mouth" Perez was unable to get them right 
in the first place in his trivial 10 line patch which only attempted to
replace one path with another.
He must be a big time user of his own patch, to not have noticed where the
paths pointed after his change.
 2005-03-11 22:57:40 +00:00
dan
c8406b640c fixed cvs to compile again 2005-03-11 21:59:06 +00:00
kojima
53db5fc4a5 eq 2005-03-11 21:51:49 +00:00
dan
9bd4abb288 updated changelog 2005-03-11 21:40:51 +00:00
kojima
25c37b7637 applied patch to rename .AppInfo directory 2005-03-11 01:58:55 +00:00
kojima
3301b57d4b applied patch to use more gnustepish paths for some internal data files 2005-03-11 01:56:06 +00:00
dan
fe381eca77 - Fixed a few typos 
- Added new italian translation (Marco Colombo <m.colombo@ed.ac.uk>)
 2005-03-04 23:47:09 +00:00
dan
e3df52ca51 - Fixed compilation include path issue in wrlib/tests 
- Removed unnecessary included headers (we don't use Xt)
 2005-03-02 10:59:40 +00:00
dan
b2e87b76f9 Fixed crash when removing submenus in WPrefs' menu editor. 
The submenu widget was free'd twice (once by destroyEditMenuItem() and a
second time by destroyEditMenu())
 2005-02-20 04:36:57 +00:00
dan
5811c3d89c updated chinese translations 2005-01-21 04:05:48 +00:00
dan
140c48f1cc - better checks if the icon sizes are valid and there is enough data to 
build the image from _NET_WM_ICON
- properly read the icon's pixels from _NET_WM_ICON, so they won't depend
  on machine endianess.
 2005-01-08 22:53:39 +00:00
dan
b62e379299 fix for broken 'make install' introduced by previous commit 2005-01-06 15:55:46 +00:00
dan
71f1d7f101 fix to allow parallel builds on SMP systems using make -j 2005-01-06 15:48:42 +00:00
dan
bde572f673 fixed issue with path assignment 2004-11-14 00:11:20 +00:00
dan
684621ecd4 - fixed possible crash bug because a variable allocated on stack was 
returned by a function
- removed obsolete macro
 2004-11-11 14:14:52 +00:00
dan
9f89695c48 fixed bug with infinite loop in some circumstances in fitText() in WINGs 2004-11-06 20:20:05 +00:00
kojima
acc868d91d Removed --with-appsdir option and replaced it with --with-gnustepdir. Also, 
default installation path (for non GNUstep users) is now $(prefix)/bin
 2004-11-01 00:50:19 +00:00
dan
d7d3003e06 Detect if gcc is able to compile x86 asm and if it supports passing more 
than 10 parameters in inline asm, else disable asm code.
This should enable it to work on any x86 platform (not just linux as before)
given that a recent enough gcc is available (no more need to guess by looking
at $host)

This should also fix the issues of compiling wrlib with gcc-2.95
 2004-10-31 05:33:39 +00:00
dan
d292143af1 better text alignment 2004-10-31 01:47:43 +00:00
dan
3b46cf38cd fixed some compilation issues with gcc-2.9x 2004-10-31 00:57:25 +00:00
dan
e53ddd046f fixed another spot where compiling on solaris with openwin generated errors 2004-10-30 07:17:49 +00:00
dan
e9e1186f1d attempt to fix compilation on solaris with openwin 2004-10-30 06:39:27 +00:00
dan
558615a853 Changed the order some header files are loaded, as it seems to cause havoc 
on some platforms
 2004-10-30 05:46:37 +00:00
dan
ca61675597 added preliminary X Input Methods support 2004-10-28 04:17:18 +00:00
kojima
79864ba94c oops 2004-10-27 03:09:19 +00:00
kojima
d63a0b4859 added option to disable switchpanel 
fixed some bugs
 2004-10-27 02:54:32 +00:00
kojima
ac87ca5596 updated japanese translations (Takeo Hashimoto <HashimotoTakeo@mac.com>) 2004-10-26 20:03:06 +00:00
kojima
2ea68b8d2b changed alt-tab behaviour 2004-10-26 17:55:34 +00:00
dan
9234fb72b2 small fix for older fontconfig 2004-10-26 12:04:18 +00:00
kojima
92a84fe050 fixed crash bug with alt-tab + run-dialog (or internal windows in general) 2004-10-26 08:00:19 +00:00
kojima
c95b464680 increased libwraster version 2004-10-26 04:06:37 +00:00
kojima
59609280a2 0.91.0, disable unfinished vdesk 2004-10-26 03:56:04 +00:00
kojima
bb0c0dafae 0.90.1 2004-10-26 03:51:49 +00:00
kojima
5f3c54af13 fixed several po files 2004-10-26 03:44:08 +00:00
dan
d8862b0bdf fixed some bugs 2004-10-26 03:40:44 +00:00
kojima
bbd1e5dada fixed some bugs 2004-10-26 03:03:02 +00:00
kojima
087a16400f updated Makefiles files for po dirs 2004-10-26 01:11:15 +00:00
dan
b89f3e6df5 fixed animation speed issues with 2.6.x linux kernels 2004-10-25 22:15:57 +00:00
dan
4bc0bcfbc2 bad name choice... 2004-10-25 02:32:11 +00:00
dan
9ff9fcda48 icon with smoother corners 2004-10-25 02:27:52 +00:00
dan
ac6b5afd32 forgot this 2004-10-25 02:24:00 +00:00
dan
0d9b73cd74 - Fixed issues with crashing dialog not working 
- Keep menu and title text at 12px since there is not constrained by width
- Removed some obsoleted options from wconfig.h
- Added a lighter image for the switch panel
 2004-10-25 02:23:41 +00:00
kojima
12b8b8ba58 bug fix 2004-10-25 00:42:25 +00:00
kojima
f274afdd1d added themable, pixmap background switch panel 2004-10-25 00:07:51 +00:00
dan
e3c67d55de - replaced VirtualEdgeThickness option with EnableVirtualDesktop (boolean) 
- some code cleanups in the virtual desktop.
 2004-10-24 22:45:06 +00:00
dan
8bf6071c48 limit VirtualEdgeThickness values to the 0..10 range 2004-10-24 21:39:56 +00:00
dan
897e75d554 - Fix that enables that the virtual desktop code be disabled on the fly 
when VirtualEdgeThickness is set to 0
- Fixed virtual edge to resize the edge on the fly if thickness changes
 2004-10-24 20:24:23 +00:00
kojima
363b6032f5 added RCopyArea 2004-10-24 05:01:55 +00:00
dan
4638216209 missed this small update 2004-10-24 03:56:46 +00:00
dan
67a9ea74a3 - Fixed wrong call to XChangeProperty() when setting _NET_WM_ICON 
- Changed the WPrefs icons with Largo's version
- Replaced Apps with Application in the docs
 2004-10-24 03:20:29 +00:00
dan
f89cf06299 workaround for older fontconfig versions that do not define some constants 2004-10-23 21:59:28 +00:00
dan
cb7f34e237 Updated the single click patch to work with latest version. 
(thanks to "Daniel Richard G." <skunk@iskunk.org>)
 2004-10-23 21:40:59 +00:00
kojima
7401a1329f free 2004-10-23 21:09:56 +00:00
kojima
df1228f387 added some netwm support in WINGs 2004-10-23 21:07:13 +00:00
dan
9ead135f51 - Replaced Apps with Applications in WPrefs installation path 
- Added missing switchpanel.h to compile file list
 2004-10-23 03:53:25 +00:00
dan
193a63511d - Fixed all // comments 
- Final cleanups
 2004-10-23 03:30:03 +00:00
dan
b00076b32a updated TODO 2004-10-23 02:28:50 +00:00
dan
51c2edf868 Cleaned up some documentation 2004-10-23 02:26:13 +00:00
kojima
11b464a002 fix flicker 2004-10-23 01:56:24 +00:00
dan
c3cff33f99 - Sort font styles in this order: Normal, Normal Italic, Bold, Bold Italic 
in the font selection panel
- Added code to get the closest match font between the font in the WindowMaker
  domain and the one in the font list of the font panel in WPrefs.app.
  This fixes issues with not selecting the correct font because the weight
  or slant names are slightly different.
 2004-10-23 01:47:36 +00:00
kojima
663df7b4cb enhacnced mouse alt-tabbing 2004-10-23 01:02:16 +00:00
dan
b79524ce6f some more cleanup after removal 2004-10-23 00:25:52 +00:00
dan
65a113f9a3 some more removals 2004-10-23 00:09:41 +00:00
kojima
45c55a3e76 cleanup 2004-10-23 00:00:58 +00:00
dan
e93e16de06 removed some more obsoleted scripts and their manual pages 2004-10-23 00:00:02 +00:00
kojima
620a280d64 code review 2004-10-22 23:39:11 +00:00
dan
4bda625076 - Simplified font conversion a bit, as fontconfig does the job of getting 
the closest match for us
- Removed wsetfont. No longer needed.
 2004-10-22 23:19:37 +00:00
kojima
b034bb077f added mouse seelction of window to focus 2004-10-22 22:57:14 +00:00
dan
d08691d5a5 - Changed fallback font to 'sans serif:pixelsize=12' 
- Fixed convertfonts to account for $LANG
- Fixed convertfonts logic a bit and no longer output slant and weight if
  they are the default ones (medium and roman)
- Applied Pascal's fix for GNUstep menus (modified to also include submenus)
  Still this is not the proper fix, as it can't differentiate between
  submenus and other windows at the floating window level. Correct fix needs
  some extra hints to be set by GNUstep on menus.
 2004-10-22 22:27:11 +00:00
dan
08e811aae7 - If fonts are specified as xlfd, convert to fc names before creating them. 
This was we internally only deal with fc names and properties. It will
  incur a small performance hit as the font needs to be parsed/unparsed,
  but this is only for backward-compatibility to support old xlfd names.
  People are encouraged to swtich to fontconfig names.
- WINGs no longer adds sans as a fallback for internal fonts. It is
  automatically done by fontconfig (if it can't find the requested font
  it will use the closest match which is the default font: sans-serif)
- Added code to honor the AntialiasesText global option
- Fixed style names for WMCopyFontWithStyle()
- Added fonts in style files where they were missing. Also changed some
  fonts to better defaults.
 2004-10-22 00:21:51 +00:00
kojima
6de693a24d fixed flickering when switching windows 2004-10-21 00:59:52 +00:00
kojima
3a7749b0fc allow omnipresent iconized windows to be focused on empty workspaces 2004-10-20 06:11:30 +00:00
dan
f555ccb9b9 fixed font panel in wprefs to have the same height for all WMLists 2004-10-20 06:05:20 +00:00
kojima
f6682a9ade fixed bugs, re-enabled circulate raise 2004-10-20 03:31:14 +00:00
dan
1166a58ec7 Fixed the layout (WMLists to have the same height for all columns) 2004-10-19 04:28:26 +00:00
dan
59d2a5cbe5 - Use Applications instead of Apps for the application's path 2004-10-19 03:50:41 +00:00
kojima
85f72d6576 change layout 2004-10-19 03:29:52 +00:00
dan
435aee107e - Added framing to the font panel icon (to be consistent with the others) 
- Bigger title and a bigger spacing between WPrefs' title and version
 2004-10-19 03:24:07 +00:00
kojima
6cd91272a6 fixed a bug with workspace switching 2004-10-19 02:37:58 +00:00
kojima
7908c9a66b more bug fixes.. 2004-10-19 01:53:11 +00:00
kojima
f6fb9fbb3e include minimized windows in switch panel 2004-10-19 01:29:34 +00:00
dan
9de3560d9f removed some debugging print from the code 2004-10-18 14:45:59 +00:00
kojima
88e207f9e0 converted fonts 2004-10-18 03:09:42 +00:00
kojima
66ec682107 fixed a crash 2004-10-18 02:36:32 +00:00
kojima
1076645853 changed default fonts 
improved font selection in wprefs
 2004-10-18 02:30:22 +00:00
kojima
30247c5886 dont bring up root menu when fullscreen window is focused 2004-10-18 01:43:13 +00:00
kojima
1e3a40370d some documentation updates 2004-10-18 01:37:17 +00:00
dan
27b9e27ae0 - Moved fullscreen level back above menus 
- Small changes to the info panel messages
- Different geomview
- Fixed problem with waitpid returning <0 in monitor
 2004-10-18 01:30:02 +00:00
kojima
28050dab72 fixed a restart bug when child processes exit 2004-10-18 00:22:22 +00:00
kojima
bc6aeab722 fixed a bug with switch panel 
added updated de.po
 2004-10-18 00:09:54 +00:00
dan
737328566f Tell gettext that we want to have the messages in the UTF-8 encoding, to 
avoid the extra conversion that gettext would otherwise perform (from the
message encoding which is UTF-8 to the current locale encoding).
 2004-10-17 07:17:03 +00:00
dan
6cfad0b10f - Removed obsoleted options from WMGLOBAL and from the WINGs internal 
structures (no longer needed with xft)
- Fixed default system font names (converted from xlfd to fontconfig names)
- A bit of code cleanups related to xft
- Replaced harcoded xlfd font names in wmaker and WPrefs with fontconfig
  names.
 2004-10-17 06:27:51 +00:00
kojima
19c7a99197 only scale down icons (not up) 2004-10-17 05:22:24 +00:00
kojima
7929d55f3f set charset to utf-8 2004-10-17 05:05:57 +00:00
kojima
1f12617065 converted menu and po files to utf-8 2004-10-17 04:32:25 +00:00
kojima
944737dde7 converted po files to utf-8 2004-10-17 03:31:22 +00:00
dan
a91a34732c converted fr.po to UTF-8 2004-10-16 22:54:27 +00:00
dan
744c0726a1 fixed fullscreen level 2004-10-16 22:16:11 +00:00
kojima
7055530895 - Added support for NET_WM_NAME/NET_WM_ICON_NAME 
- moved out font name conversion code from getstyle/setstyle/convertfonts and made it support fontsets
 2004-10-16 22:05:04 +00:00
kojima
9402724e40 fixed crash in empty workspaces 2004-10-15 01:00:36 +00:00
kojima
cd36d73886 fix 2004-10-15 00:27:36 +00:00
dan
0c09179f01 - Removed support for legacy systems: OpenLook, KDE-2.x, Gnome-1.x 
- Removed #define and #ifdef XFT constructs, as XFT is on all the time
 2004-10-14 23:05:20 +00:00
kojima
884a3f1647 fixed cycling 2004-10-14 21:24:21 +00:00
dan
2e572717c5 fixed bug with zombies after wmaker crashed 2004-10-14 20:24:00 +00:00
kojima
8502709884 fixed cmdline option duplication bug 2004-10-14 19:53:31 +00:00
kojima
5f4a3f6777 enhanced icon highlighting in window switcher 2004-10-14 19:12:26 +00:00
dan
067fc41354 updated buglist with recent additions 2004-10-14 18:21:15 +00:00
dan
36b55dc1e6 - removed some obsoleted function definitions 
- made font name comparison case insensitive
 2004-10-14 18:04:18 +00:00
kojima
3a97c33072 bug.. 2004-10-14 15:54:35 +00:00
kojima
62590be0db fixed bug in window switching 2004-10-14 15:53:17 +00:00
kojima
440f2abe6f missing header 2004-10-14 14:41:05 +00:00
kojima
f54f0856c1 - MacOS X style window switching panel (navigate through windows with Alt-Tab or 
arrow keys)
 2004-10-14 05:02:24 +00:00
kojima
62994167c5 fixed layout 2004-10-14 02:25:28 +00:00
kojima
00e709cec4 fixed bug 2004-10-14 01:00:43 +00:00
kojima
2b51c21ee5 use macros for property names 2004-10-13 23:48:58 +00:00
kojima
3ed1d3e25c added Font Configuration 
updated some outdated default config files
 2004-10-13 23:39:29 +00:00
kojima
3088277b1e fixed unclosed file bug 2004-10-13 06:10:36 +00:00
kojima
879b00a57b - Removed legacy OFFIX_DND support code 
- Fixed the signal handler for crashes (ie, removed it) and made wmaker
  restarting be made automatically by a monitoring process.
- Made NetWM support be enabled by default
- Removed old code to store/restore workspace state (now relies on netwm)
 2004-10-13 05:09:08 +00:00
dan
6830b05716 changed indentation to use spaces only 2004-10-12 21:28:27 +00:00
dan
5912898b06 some other todo items I remembered 2004-10-12 12:46:16 +00:00
dan
f614cb8341 updated todo 2004-10-12 02:34:33 +00:00
dan
9ff85407b7 todo before next release 2004-10-12 02:25:24 +00:00
kojima
d211420261 moved -fno-strict-aliasing flag to configure, so it only adds that for gcc 
s/__asm__/asm/ (we don't care about being ansi for the asm code)
 2004-10-12 02:13:15 +00:00
dan
1ef52e0aec ignore some binary 2004-10-12 01:35:41 +00:00
dan
9aca0d5f6e - Check whether libXft is at least version 2.1.2 else refuse to compile. 
- Fixed bug in icon chooser dialog that could cause a segmentation fault
  in some cases (Pascal Hofstee <caelian@gmail.com>)
- Fixed crash in asm code in wrlib, with new versions of gcc.
- Fixed bug in the x86_PseudoColor_32_to_8() function which incorrectly
  used the r, g, b fields in the conversion.
- Fixed x86 ASM code in wrlib to work on 64 bit architectures.
- Fixed the focus flicker seen with some apps (notably gtk2)
  (Alexey Spiridonov <snarkmaster@gmail.com>)
- Fixed all crashing bugs that were generated by wmaker starting with the
  WMState file missing.
- Added NetWM support (a modified version of the patch originaly written
  by Peter Zijlstra <a.p.zijlstra@chello.nl>)
- Applied patch to enhance the Virtual Desktop behaviour, and to integrate
  it with the NetWM code (Peter Zijlstra <a.p.zijlstra@chello.nl>)
- Applied a few xinerama and placement fixes (Peter Zijlstra
    <a.p.zijlstra@chello.nl>)
- Fixed memory leak in dock code.
- Fixed and enhanced the text wrapping in WINGs.
- Fixed the layout of some elements in WPrefs.app
- Added workaround for aplications that don't set the required hints on the
  client leader window, but they set them on normal windows (observer with
  KDE 3.3.0 mainly). This will allow these apps to get an appicon again.
  (they should be fixed still)
- Added workaround for applications that do not set a command with
  XSetCommand(), but instead they set the _NET_WM_PID property. This works
  with operating systems that offer a /proc interface similar to what linux
  has. (This also is to fix problems with KDE 3.3.0 apps, but not only them).
- Fixed bug with autostart and exit scripts not being executed if user
  GNUstep path was different from ~/GNUstep (when setting GNUSTEP_USER_ROOT)
- Added utf8 support in WINGs (removed old X core font code)
- Added utility to convert old font names to new font names in style files
 2004-10-12 01:34:32 +00:00
dan
c7c68c6fe7 Added bosnian translations 2004-10-12 01:23:15 +00:00
kojima
95897acc30 added a quick&dirty standalone colorpicker utility 2004-08-24 19:27:45 +00:00
kojima
57869b667b minor dumb bug.. 2004-08-22 03:55:59 +00:00
kojima
2c8a70b743 updated default menus a little bit 2004-08-22 03:07:32 +00:00
kojima
0445dd5c18 changed encoding of (c) thing in about panel to utf-8 
changed techdraw style size display to use X core fonts
 2004-08-21 21:29:44 +00:00
dan
b6e06d4beb testing notifications 6 2004-08-06 16:49:17 +00:00
dan
b75b7cbc01 testing notifications 5 2004-08-06 16:39:31 +00:00
dan
eb646a6682 testing notifications 4 2004-08-06 16:30:52 +00:00
dan
7b88cd8afd testing notifications 3 2004-08-06 16:13:34 +00:00
dan
f5a6724142 testing notifications 2 2004-08-06 16:10:05 +00:00
dan
afbab71401 testing notifications 2004-08-06 16:05:41 +00:00
dan
20fe42df2b testing notifications 2004-08-06 15:05:08 +00:00
dan
d0c5bedab6 testing notifications 2004-08-06 14:49:49 +00:00
dan
ef31cd1323 test notifications 2004-08-06 14:41:42 +00:00
dan
427a42ab58 test notifications 2004-08-06 14:40:50 +00:00
dan
474c4caf94 reverted the last test commit (duh) 2004-07-16 18:50:58 +00:00
dan
109bb540ec another test for cvs notifications 2004-07-16 18:18:36 +00:00
dan
9b7b9f6815 testing cvs notifications 2004-07-14 21:10:40 +00:00
dan
32973f6e15 testing new commit email notification script 2004-07-12 03:16:34 +00:00
dan
5b26a68910 testing new commit email notification script2 2004-07-12 03:15:58 +00:00
dan
59014546aa testing new commit email notification script 2004-07-12 03:15:00 +00:00
dan
e4483de406 test log scripts 2004-07-11 19:59:39 +00:00
dan
90d830837a test cvs over ssh 2004-07-11 03:13:13 +00:00
dan
752163dfc6 test cvs over ssh 2004-07-11 02:45:17 +00:00
dan
6d02fe98f2 - rewrote the font conversion routines to avoid the need to allocate memory 
for font options while parsing the xlfd. now all processing is done using
  the original xlfd string only.
- removed memleaks introduced by previous commit.
 2004-04-13 03:49:38 +00:00
vlaad
500d569c79 style property is supposed to override weight and slant, unfortunately it doesn't do it cleanly, and you might end up with italic fonts. this fixes the issue by not making the assumption. 2004-04-10 19:27:54 +00:00
vlaad
f54b0de7b4 To ease transition from XLFD fontnames to fontconfig fontnames setstyle 
now converts all *Font keys in the style files before merging them with
G/D/WindowMaker and (vice-versa) getstyle converts the keys from G/D/WindowMaker
before it does anything else whether its stdout printing or themepacks.
enabling quick theme conversions to new font system.
 2004-04-10 14:55:55 +00:00
dan
b8193865f6 Added forgotten dragcommon.c to the cvs tree 2004-04-07 10:15:52 +00:00
dan
e7d0c5d9e9 - Added xdnd v3 support in WINGs (Sylvain Reynal <sreynal@nerim.net>) 
- CVS should compile again
 2004-04-07 02:50:52 +00:00
dan
791bb6a444 replaced CPPFLAGS with AM_CPPFLAGS in some Makefile.am's to avoid overwriting the user's CPPFLAGS environment variable 2004-02-25 21:26:49 +00:00
dan
a018eff89d updated slovak translation 2004-02-02 02:30:12 +00:00
dan
1096cfa991 - Updated INSTALL.fr (wwp <subscript@free.fr>) 
- WINGs python update
 2004-01-15 20:36:48 +00:00
dan
5d9354f362 better explanation of what changed 2004-01-13 04:55:12 +00:00
dan
0b42849a3e Workaround to avoid creating a second appicon when a KDE3 application opens 
a config panel.
 2003-12-13 14:08:32 +00:00
dan
df75c86ef0 Fixed a bug that made the crash panel to be shown again and again when the 
'Restart Window Maker' option was selected, under some circumstances.
(bug reported by Roberto Sanchez <rcsanchez97@yahoo.es>)
 2003-11-13 06:10:33 +00:00
dan
20975c4918 Fixed 2 focus switching related bugs (Allan Peramaki <aperamak@cc.hut.fi>) 2003-10-14 00:25:46 +00:00
dan
1dfaec332e Fixed synchronization problem between hair cursor and mouse cursor in 
wmagnify with mouse cursor at the screen edge.
 2003-09-29 23:44:51 +00:00
kojima
3d6d775f08 updated spanish translation of wprefs 2003-09-19 23:47:31 +00:00
kojima
1f393ac4f7 updated catalan translations (Ernest Adrogue <eadrogue@gmx.net>) 2003-09-16 23:31:24 +00:00
dan
847479b886 Fixed bug with incorrect un-escaping if there is a dot in wm_class. 2003-09-03 19:09:20 +00:00
dan
6aed0cd713 small 'remember todo' comment 2003-08-19 21:44:08 +00:00
dan
39b9edfdcd - Converted functions in wfont.c to use xft semantics in place of old X core 
fonts and X font sets.
- New code operates on new fontnames like Arial-8:bold:italic in place of xlfd
  (WMCreateFont can still read an xlfd for back compat)
 2003-08-15 02:58:04 +00:00
dan
090cc27f00 fixed a test condition 2003-08-14 01:43:07 +00:00
dan
08225948bc wide char support 2003-08-14 01:39:27 +00:00
dan
18d07e04a6 small fix 2003-08-07 00:53:48 +00:00
dan
74ba4f8eef Started to move towards using xft2 only, for a unified font/locale handling 
in WINGs
 2003-08-07 00:26:21 +00:00
dan
0852957ea1 update before moving to xft2 2003-08-06 23:58:54 +00:00
dan
7efcf57c18 fixed the 'focus flicker' problem, seen with GTK2 applications 2003-08-03 00:00:11 +00:00
dan
44f636e91e doc update; don't use clip's inactive collors for arrows when collapsed 2003-08-02 21:36:45 +00:00
dan
8457611316 fixes to comply to ANSI C 2003-07-16 20:58:49 +00:00
dan
bd7943d9a7 - Implemented a better logic to preserve the window's old geometry when 
maximizing to support succesive maximizations in different directions
  without the need to do an intermediary un-maximize step (eliminates flicker)
- Made keyboard/mouse maximization behavior consinstent relative to each other
 2003-07-05 02:39:37 +00:00
dan
b0d72a3db2 - Fixed aspect of window list menu (window name was too close to workspace 
indicator)
- Fixed menu panel in WPrefs.app. Explanatory text did not fit into the label
 2003-07-01 23:00:25 +00:00
dan
396b011610 Fixed bug with focusing a deminiaturized window with sloppy focus mode 2003-06-14 21:13:34 +00:00
dan
c131f14d3e - Fixed bug with wrong text wrapping (Alexey Voinov <voins@voins.program.ru>) 2003-06-12 23:19:00 +00:00
dan
a4c986fa1b _ fixed bug in resizing a scrollview 
- read both XLFDs and XFT style font names from config files (xft case only)
 2003-06-12 21:21:57 +00:00
dan
64468fcf63 support for compiling with xft2 2003-06-10 01:56:26 +00:00
kojima
8904783aee show whether aa text is enabled in info panel 2003-06-09 05:37:38 +00:00
kojima
40c89b3399 Fix by vlaad to the tableview click callback that was getting bad row info 2003-06-08 21:53:00 +00:00
dan
27a396d7ed - Fixed sloppy focus bug 
- Made maximizing behaves differently with keyboard/mouse for xinerama
  (Peter Zijlstra <a.p.zijlstra@chello.nl>)
- A few leftover xinerama fixes (Peter Zijlstra <a.p.zijlstra@chello.nl>)
- Extended the 'strut' to multiple heads
  (Peter Zijlstra <a.p.zijlstra@chello.nl>)
- Icon placement now takes into account the new xinerama extended 'strut'
  (Peter Zijlstra <a.p.zijlstra@chello.nl>)
- Icon arrangement that takes the new extended xinerama 'strut' into account
  (Peter Zijlstra <a.p.zijlstra@chello.nl>)
 2003-06-06 04:11:00 +00:00
kojima
2cf5931890 fixed silly typo in workspace.c 
added system wide menu configuration
 2003-06-06 02:51:47 +00:00
kojima
d159da8671 fixed little prob with header define 2003-06-06 02:47:46 +00:00
kojima
ed0d234d7f solaris xinerama fixes, wmsetbg updated for xinerama 2003-06-04 20:40:00 +00:00
kojima
4d701d8306 small fix in description 2003-06-04 19:02:10 +00:00
kojima
5dbb770aa4 xinerama stuff for solaris 2003-06-04 18:57:03 +00:00
kojima
479ccbda82 updated french translations 2003-05-23 21:47:48 +00:00
kojima
001cb65271 updated single click patch 2003-05-20 04:43:19 +00:00
kojima
bc3ab27364 patch from Vitaly Ovtchinnikov <ov@rbcmail.ru> for 
double/triple-click selection in textfield
 2003-05-06 03:36:21 +00:00
dan
669d542408 - added imporved wsetfonr from (Mike FABIAN <mfabian@suse.de>) 
- added small language fix from ("Marcelo E. Magallon" <mmagallo@debian.org>)
 2003-04-23 21:21:38 +00:00
dan
3dcab96180 - Support for multiline balloons (Vitaly Ovtchinnikov <ov@rbcmail.ru>) 2003-04-21 03:34:43 +00:00
dan
7f1d621f43 updated cvs-ignored-files list 2003-04-18 01:16:50 +00:00
dan
b0063c83c7 added support fo generating pkgconfig files for WINGs, wrlib and wmlib ("Marcelo E. Magallon" <mmagallo@debian.org>) 2003-04-18 01:15:07 +00:00
dan
f06c9a1953 - Fixed 2 syntax errors in plmenu.zh_TW.Big5 (Mike FABIAN <mfabian@suse.de>) 
- Some .po file fixes (Mike FABIAN <mfabian@suse.de>)
- Fixed the problem with the root menu code changing the locale setting as
  a side effect of loading a localized menu
- Fixed e memory leak in the code that reads a localized root menu
 2003-04-15 22:04:49 +00:00
dan
e1958b22c5 Fixed a bug in the hashtable code which free'd the whole item instead of 
just the item key in WMResetHashTable() (possible source of SIGSEGVs)
 2003-04-11 21:22:59 +00:00
dan
528243bb98 Added bulgarian translations 2003-04-06 23:18:07 +00:00
dan
f058fdf72c - Fixed small memory leak in the WINGs' font panel code. 
- Fixed call to qsort in WMSortArray.
- Fixed a memleak in the WINGs' file panel.
 2003-04-02 11:37:04 +00:00
dan
5f79f1bcde - Fixed bug that could cause SIGSEGV by accessing beyond the end of text in 
a WINGs textfield widget.
 2003-03-20 13:11:13 +00:00
kojima
18ed046356 - Added WMSetTableViewHasHorizontalScroller() 2003-03-13 21:36:34 +00:00
dan
277d0055fd Fixed bug with scrolling menus (introduced by xinerama patch) 2003-03-04 13:14:55 +00:00
dan
e727cbadb6 - Fixed Clip's workspace menu mapping to be consistent with the others 
- Fixed bug in wmsetbg that caused scale and maxscale to both do maxscale
  (Alexey Voinov <voins@voins.program.ru>)
 2003-02-28 12:42:16 +00:00
dan
fdeb749da7 Autoarrange icons after unhiding an application that has miniaturized 
windows, else they may cover other icons which are now in the positions
they have occupied before hiding
 2003-02-27 07:42:46 +00:00
dan
dee8c6e770 - Also fixed a bug with not showing shaded window frames when the application 
is hidden and another window belonging to the app is selected in the window
  list menu
 2003-02-24 04:08:21 +00:00
dan
fe4cd695af - Fixed a bug with deminiaturizing windows when the application is hidden and 
the miniaturized window is selected from the window list menu
 2003-02-24 04:06:20 +00:00
dan
1902325087 Reverted German translations 2003-02-24 01:44:59 +00:00
kojima
5b28616212 ops 2003-02-24 01:43:16 +00:00
kojima
ad05cc3b44 updated german translation 
added catalan translation
 2003-02-23 22:12:20 +00:00
dan
56f73aa4b9 - a few simplifications and cleanups in the WINGs python code 2003-02-20 23:02:28 +00:00
dan
40111188ec - Fixed bug with cursor locked in drag mode after Alt-dragging a window 2003-02-19 23:26:41 +00:00
dan
80c09f1075 - Fixed wrong display position for the move/resize widgets 
patch (Peter Zijlstra <a.p.zijlstra@chello.nl>)
 2003-02-18 00:35:54 +00:00
dan
b5ef388711 - Fixed edge resistance and move/resize frame drawing for borderless windows 2003-02-16 01:47:58 +00:00
kojima
7a8bde44fa fixed bug in tpixmap after xinerama patch 2003-02-13 16:27:45 +00:00
dan
b381674375 - Fixed incorrect focusing of application's windows after an unhide (sometimes 
the incorrect window got focus instead of the apps's last focused window)
- Unshade application's shaded windows when Dbl-MiddleClick-ing its appicon.
  (this is to be consistent with deminiaturizing application's miniwindows
  which also happens in this case, since shading is a form of miniaturization)
- misc fixes
 2003-02-11 00:32:17 +00:00
dan
e54a0954e6 added fixed german translations 2003-02-05 01:42:02 +00:00
dan
c0965cd48b - Fixed a problem in the stacking code which could lead to segmentation faults 
(Jeff Teunissen <deek@d2dc.net>)
 2003-01-17 01:10:51 +00:00
dan
4153e2fde4 - Fixed crashing bug in menu.c 
- Updated year from 2002 to 2003
 2003-01-16 23:30:45 +00:00
dan
f3487c1ea2 new german translations 2003-01-16 01:47:35 +00:00
dan
0898a3d475 added python wrapper files to dist tarball 2002-12-20 22:41:30 +00:00
dan
064f79ebae - Fixed focus handling for windows that set WM_HINTS.take_focus = False. 
- Misc fixes.
- Improved a bit the python wrapper.
- Build po files before 'make install'
 2002-12-20 17:47:31 +00:00
kojima
55d37178a0 added cback for set button in fontpanel 2002-12-04 15:40:32 +00:00
dan
90e8cfc5b8 - Properly fixed the color change in the Appearance panel preview box 
in WPrefs.app. Also uses less resources.
 2002-12-03 04:49:37 +00:00
dan
ab511aca5e small update to display if xinerama is supported in the configure summary. nicer display for the summary too. 2002-12-02 04:42:13 +00:00
dan
39d250888e - Fixed Window Maker to compile with xinerama disabled. 
- Replaced --disable-xinerama with --enable-xinerama in configure
  (xinerama needs to be enabled when Window Maker is build because
   it's no longer enabled by default)
 2002-12-02 03:44:10 +00:00
dan
00638fa5d3 - Fixed a problem with image artifacts in the Appearance preview box 
when color is changed and antialiased fonts are used.
 2002-12-02 01:22:14 +00:00
dan
ca43aba088 - Added wstrndup() and WMGetFontName() 2002-12-02 00:01:05 +00:00
dan
96c64e15ef - Added a python wrapper module for WINGs 2002-12-01 06:01:08 +00:00
dan
dd1ccd2fd6 - enabled the use of SHAPE extension in the color panel. without it the 
magnifying glass captured image was shifted and unusable
- removed some comments left in the code for later reviewal
 2002-12-01 05:49:13 +00:00
dan
c0442b1c59 - WMGetTextDefaultColor() won't retain the returned color anymore, and you 
shouldn't release it. It is just a reference to the internal WMText color.
  This should make all the functions returning colors from widgets behave
  consistently
 2002-11-30 03:00:34 +00:00
dan
bde9b8a21a forgot to add these in cvs 2002-11-30 02:19:46 +00:00
dan
83d3625e1a - Added switch to enable/disable antialiased fonts in WPrefs's Expert Settings 
panel. (Temporary until the Font Settings panel in WPrefs is finished).
- Added a check that only %d is used in a font specification in WMGLOBAL and at
  most once for each font in a fontset (eliminates a possible security exploit)
- Added README.antialiasing describing the steps needed to get antialiased
  fonts working with WINGs/Window Maker.
- Added Sample.XftConfig
 2002-11-30 02:13:36 +00:00
dan
5ad557c6c8 fixed a memleak in the font panel in WINGs 2002-11-29 02:47:33 +00:00
dan
1fa3937001 fixed wmaker failing to compile with gnome support enabled after the xinerama add 2002-11-29 02:37:40 +00:00
kojima
a10214a502 - Fixed sloppy focus bug (Pawel S. Veselov <pv76716@druid.SFBay.Sun.COM>) 
- Applied Xinerama patch (after fixes) from (Peter Zijlstra
  <a.p.zijlstra@chello.nl>)
 2002-11-28 22:04:07 +00:00
dan
0fe70d2b4e - Fixed a bug with empty frame titles (Alexey Voinov <voins@voins.program.ru>) 
- Added WMGetWidgetBackgroundColor()
- Code cleanup in wtext.c
- Renamed WFANonBold and WFANonEmphasized to WFANotBold and WFANotEmphasized
 2002-11-25 04:46:00 +00:00
dan
18b3753227 - added WMCopyFontWithChanges() a more generic and powerful function, meant 
to replace WMNormalizeFont(), WMEmphasizeFont(), WMStrenghtenFont(),
  WMUnemphasizeFont() and WMUnstrenghtenFont() which are now obsolete and
  were removed.
 2002-11-22 04:49:05 +00:00
kojima
0bfa12a1fc fixed crash caused by resizebars that appear after reloading configs 2002-11-22 00:11:17 +00:00
dan
4d6cd7f326 added .mo files to cvs ignore list 2002-11-21 05:26:53 +00:00
dan
2fe1b0e3f8 - Added support for antialiased text with multibyte languages too. 
(only tested on russian, since that's the only multibyte language
  I can test).
 2002-11-21 05:21:42 +00:00
dan
3929660f39 - downgraded zh_TW.Big5 po files to previous versions. Latest failed to 
compile
- fixed some charsets in a couple of po files
- remove libPropList question from Install script
 2002-11-20 12:04:42 +00:00
dan
c2ec1cfe8a - Fixed userdefaults in WINGs not to synchronize on exit a domain that is 
marked not to be synchronized.
- WMGLOBAL options can now be set in the WindowMaker configuration files
  to overwrite values in WMGLOBAL.
- You can now pass "SystemFont", "BoldSystemFont", "SystemFont-##" or
  "BoldSystemFont-##", with ## being the font size to any font creating
  function to create a font with the (bold) system font font specification.
- Replaced AA with Anitialiased in WINGs font creation function names
- Added WMCreateFontWithFlags(), WMHasAntialiasingSupport() and
  WMIsAntialiasingEnabled()
- Created a separate font cacahe for antialiased fonts
- Added test at startup if Xft supports rendering antialiased fonts (in case
  the application was compiled with Xft support, but is run on an X server
  without support for xft rendering (RENDER extension missing). If no Xft
  support antialiasing will be disabled even if it is enabled in the
  configuration file.
- Finished the Info Panel to work with antialiased fonts.
- Code cleanup in dialog.c. Remade part of Info Panel drawing the Window Maker
  logo.
- Fixed technical style drawing of window resizing.
 2002-11-13 15:13:48 +00:00
kojima
d597c61cb7 final fix 2002-11-09 14:56:33 +00:00
dan
5e18eadf22 - Fixed wrong colors for text and tile with selected menu items 2002-11-08 21:07:45 +00:00
kojima
19f7fbc949 bleh this one should work 2002-11-08 19:30:53 +00:00
kojima
55f3cb9577 argh! buffer overflow fix, try 3 :P 2002-11-08 18:00:56 +00:00
kojima
811e508c84 fix overflow bug, try2 2002-11-08 17:05:35 +00:00
kojima
60ee69979f fixed buffer overrun bug in wrlib when creating or loading images 2002-11-07 17:18:41 +00:00
dan
4f80ec9178 - removed unnecessary include of WINGsP.h in some places 
- smaller space between rows of text in WMText
 2002-11-04 20:29:47 +00:00
dan
5e37991b6c Added (forgotten) release for notifications when destroying a WMList. 2002-11-04 06:07:00 +00:00
dan
a4bc7f6a07 Better outline when drawing balloons 2002-11-01 13:28:59 +00:00
dan
6724ec5a6d - It seems some versions of automake carry broken missing scripts, so I 
put back the missing script to make sure we don't generate packages
  with bad missing scripts
 2002-10-28 22:52:18 +00:00
dan
879d13ef45 - Fixed an issue with drawing AA fonts in titlebars 
- Removed 'missing' from cvs, since it is copied from automake when autogen.sh
  is run. You need to run autogen.sh after this update to put it back.
 2002-10-28 21:56:13 +00:00
dan
a1d78d102a fixed broken loading gif images 2002-10-28 05:36:42 +00:00
dan
3af4aa7846 - fix for 0 sized gif images too 
- fixed wrong test for 0 size in nxpm.c
 2002-10-25 04:21:09 +00:00
kojima
0f0afc48ab fix for 0 sized images 2002-10-25 03:43:57 +00:00
dan
55efa1f268 - Eliminated the double no-position-display gap when switching position 
display types with the Shift key while moving windows
- Added be.po to configure.ac
- Changed the default resize window display type to 'Center'
 2002-10-25 03:37:51 +00:00
kojima
ffa1a610c0 - Fixed problem with long, preset workspace names (Wanderlei Antonio Cavassin 
<cavassin@conectiva.com.br>)
- Added kinput2 bug workaround to stock WMWindowAttributes (Seiichi SATO
  <sato@cvs-net.co.jp>)
- Added Belarusian translation (Ihar Viarheichyk <iverg@mail.ru>)
- Fixed wrlib to not try to load braindead images with 0x0 size
 2002-10-25 02:42:56 +00:00
dan
0bb76c0a76 made titlebars display titles with double buffering to avoid flickering. needed because aa fonts need clearing area before redrawing to avoid artefacts and clearing area before redraw gives flicker 2002-10-18 22:17:20 +00:00
dan
7be0a97998 - More cleanups for obsoleted xxx_gc's and xxx_pixel's in WScreen 2002-10-18 04:04:41 +00:00
dan
5230a57599 - Added WMCreateNonAAFont() to WINGs 2002-10-18 02:56:59 +00:00
dan
3bed15d673 - fixes for AA fonts 
- fixed the workspace name display problem.
- replaced most of scr->xxx_pixel with scr->xxx_color
- removed some obsoleted GC's in the WScreen structure
 2002-10-17 20:26:30 +00:00
dan
1e92274495 - Updated WINGs/NEWS with info about hw the API changed how how things 
are affected. Fixes for old code too.
- Double buffering in WMList. All widgets or apps using WMList and
  having user drawing porcedures in place will inherit this double
  buffering automatically too.
- New functions in WINGs: WMGetColorAlpha(), WMIsAAFont()
- Misc code cleanups in WINGs and src/dialog.c
 2002-10-16 04:05:45 +00:00
dan
2b2fecac12 - Added double buffering when drawing a WMFrame title with an AA font to avoid 
flickering.
- Added double buffering when drawing WMList items to avoid flickering
- Shared xft drawable
- Renamed AASystemFont and AABoldSystemFont to AntialiasedSystemFont
  respectively AntialiasedBoldSystemFont in WMGLOBAL
- WMCreateFont falls back to normal fonts if antialiased fonts cannot be
  created (even if enabled)
 2002-10-13 18:25:36 +00:00
dan
17f26077b0 Added Xft support in WINGs (for drawing antialiased fonts with transparency) 
Details in WINGs/ChangeLog and WINGs/NEWS
 2002-10-09 05:14:28 +00:00
dan
a2b404b5b3 - API change in WINGs for WMDraw*String(). 
WMDrawString() and WMDrawImageString() now take WMColor instead of GC as
  arguments. WMDrawImageString() receives 2 colors (text & background).
  This is to allow easy extension for Xft/Xrender and hide X low level details
- Added alpha channel to WMColor. 2 new functions also:
  WMCreateRGBAColor() and WMSetColorAlpha()
- Miscelaneous code cleanups in wtext.c
- Removed obsoleted acconfig.h and implemented its functionality using
  AC_DEFINE and AC_DEFINE_UNQUOTED as autoconf 2.5x recommends.
  This will definitely enforce the need to use autoconf 2.5x
 2002-10-08 08:26:06 +00:00
dan
e98da5a628 updated russian locales 2002-10-04 19:42:30 +00:00
dan
b9e7a1d3ca removed obsoleted header file 2002-09-30 12:42:22 +00:00
dan
1941aaf34a - removed hermeslib dependancy 
- added back old asm/mmx code
 2002-09-30 12:39:22 +00:00
dan
11c466ec26 small fix in wtest 2002-09-29 01:37:10 +00:00
dan
feaa80addc Updated French translations 2002-09-18 00:28:17 +00:00
dan
92b012e800 patch to add binary mode on opening files (for Windows+Cygwin compatibility). 2002-09-15 20:37:41 +00:00
dan
3fc803c0d8 - Fixed dock's menu mapping position when dock is on the right side. 
- Map clip's menu so that it never gets out of screen on the left or the right.
 2002-09-12 03:43:08 +00:00
dan
a07b262a87 small annoyance with new autoconf generated directories 2002-09-11 15:04:26 +00:00
dan
851835c7a5 - Fixed empty window list menu, if the window list menu was launched through 
the root menu ("Marc-Christian Petersen" <m.c.p@wolk-project.de>)
- A small fix for wmtableview when computing visible columns.
 2002-09-11 15:02:43 +00:00
dan
d4de3d0a45 - new function in WINGs: WMSetConnectionShutdownOnClose() 
- new callback in the ConnectionDelegate structure: canResumeSending
- replaced setpgid() with setsid() when starting kids, to allow them to
  survive if wmaker (the parent) dies.
- a few cleanups.
 2002-09-09 04:25:51 +00:00
dan
048b43aea4 - fixed a frame size in WPrefs menu editor 
- removed // comments
- commented out printfs in unfinished selection code
 2002-07-01 23:52:22 +00:00
kojima
579eb01c6c applied patch from Ryosuke Nanba <rna@cyber.email.ne.jp> 
WindowMaker 0.80 crashes (SIGSEGV) on deiconifying the miniwindow of
Mozilla 0.98, under following condition.   - running ATOK X for Linux *
  - create new Mozilla Window
  - using ATOK on Mozilla (make "mozilla-im-status" window visible)
 2002-05-25 03:01:32 +00:00
kojima
ca212985df fixed typo in menus... 2002-05-11 00:44:03 +00:00
dan
c32806ae14 updated some .cvsignore files 2002-04-11 20:41:00 +00:00
dan
ee5b28b0af fixed a buffer overflow 2002-04-11 20:38:05 +00:00
dan
750917986e - Added WMGetTextFieldDelegate() 
- Fixed a problem with drawing the return arrow on buttons when disabled
 2002-04-03 00:51:36 +00:00
dan
6e72c20248 - Added WMSetButtonImageDimsWhenDisabled() and WMGetButtonEnabled() 
- Cleaned-up the header files of functions/vars declared but not implemented
 2002-03-29 01:24:12 +00:00
dan
ad0ad5af22 Added 2 functions to retrieve the default system fonts: 
WMDefaultSystemFont(WMScreen *scr) and WMDefaultBoldSystemFont(WMScreen *scr)
 2002-03-28 16:22:53 +00:00
dan
e4a53ba71e fixed some Bool flags passed to WINgs functions to always set 1 or 0 values internally 2002-03-28 04:20:30 +00:00
kojima
208ee16849 updated spanish po 2002-03-24 22:00:24 +00:00
dan
f9acc9313e commented out some declared but never defined functions and global vars 2002-03-24 21:57:21 +00:00
kojima
92fb96eb69 - Fixed bug with windows that have WM_HINTS.take_focus = False. These windows 
will not receive focus at all.
 2002-03-24 03:18:09 +00:00
dan
18d347ecd5 removed update-autoconf. use autogen.sh 2002-03-20 01:29:17 +00:00
dan
97e20d94de fixed textfields regarding interpretation of special keys with modifiers 2002-03-14 22:20:25 +00:00
dan
65e65c4e9d added ability to enable/disable individual WMTabViewItems 2002-03-14 12:28:52 +00:00
dan
84fa789cd6 - Fixed WMGetViewScreenPosition() to consider the window decorations. 2002-03-04 08:52:49 +00:00
dan
efcf27f854 fixed autogen.sh to include deps in Makefile.in 2002-03-04 06:28:14 +00:00
dan
5fe90167a3 fixed autoconf warning 2002-03-03 20:33:44 +00:00
dan
f857012f7a gah! the putenv() stuff was not causing memleaks. Only 2 memleaks after all (1 serious, 1 minor). Both did sum up in time 2002-03-01 10:33:14 +00:00
dan
efb0090f8c fixed some memleaks (1 serious, 5 minor) 2002-03-01 10:03:35 +00:00
dan
1cd1f16c3c fixed bug in WMSetButtonEnabled and WMSetButtonSelected 2002-02-28 11:01:39 +00:00
kojima
0c1881e224 added french po 2002-02-26 14:57:24 +00:00
dan
5bb35d94a5 fixed a bug in wdread 2002-02-23 00:02:17 +00:00
kojima
321bb04586 little change on menus 2002-02-20 23:38:25 +00:00
dan
77b8fe05ac - removed configure.in. use only autoconf 2.5x fom now 
- fixed a bug and memleak in WMBox code.
- updated some translations
- fixed some bug in the menu code about drawing disabled entries.
- fixed Clip menu not to allow selecting of "Autoraise" if "Keep On Top"
  is active.
- Added a "Browse" button to the menu editor in WPrefs where a program to run
  is specified (not finished).
 2002-02-20 22:22:40 +00:00
kojima
9466c00f2b update danish translations 2002-02-20 21:35:46 +00:00
kojima
a8950af8ac fixed segfault with incomplete WM_CLASS 2002-02-20 15:01:44 +00:00
kojima
58e719654f added czech translations 2002-02-18 13:50:30 +00:00
dan
ad58481487 reverted latest german update. 2002-02-17 22:33:22 +00:00
kojima
5402fccd1e cleanup oops 2002-02-16 04:56:45 +00:00
kojima
cf7859d145 some incomplete xinerama stuff 2002-02-16 04:53:33 +00:00
kojima
5db8b5660f cleaning the house today 2002-02-15 21:34:46 +00:00
kojima
5873385d32 fix for soemthing wrong with piped menus 2002-02-15 21:30:42 +00:00
kojima
a26b723c5a something i dont remember 2002-02-15 21:27:41 +00:00
kojima
bc3d012e7c updated german pots 2002-02-15 21:24:41 +00:00
kojima
c08b3c5f32 fixed icon scaling 2002-02-15 21:22:46 +00:00
dan
f37b4cf5d0 - Fixed a bug that crashed wmaker when selecting the "Start alternate window 
manager" option in the crashing dialog panel.
- Window Maker will now use the WINDOWMAKER_ALT_WM environment variable (if
  it is defined) to overwrite the default hardcoded fallback window manager.
 2002-02-01 01:20:15 +00:00
id
06f1bf91a9 fix my mail, maliwan is dead 2002-01-31 10:30:06 +00:00
id
8b5f31ad8b fix an icon 2002-01-27 05:59:29 +00:00
id
2cc90e649a add an icon 2002-01-27 05:54:17 +00:00
id
9d41f432b9 add and fix icons 2002-01-26 15:52:22 +00:00
id
b4f540ddd6 add and fix icons 2002-01-26 15:52:22 +00:00
id
03f534c0bf add an icon 2002-01-26 04:24:12 +00:00
dan
9078b1a5a7 forgot this 2002-01-25 14:40:09 +00:00
dan
da02e76051 added better proplist warnings when reading non-digit proplist data and fixed screwed Changelog after last commit. 2002-01-25 14:39:37 +00:00
kojima
9c19d14d1a added greek flag pixmap 2002-01-25 14:10:30 +00:00
kojima
bc88390918 added contrib patch for resizing/moving windows with yubn keys 2002-01-25 13:51:54 +00:00
kojima
a1b9bf23a9 fixed non-transparent bug of xrender transparent windows 2002-01-23 19:36:43 +00:00
dan
511a06628b - fixed crash when saving window attributes 
- updated german translation
- small fix for the selection code in WINGs (possible memleak)
- added support for the ukrainian language in wsetfont
  (Bohdan Vlasyuk <bohdan@bodq.vstu.vinnica.ua>)
 2002-01-17 03:07:28 +00:00
dan
8a25fdc672 updated german wprefs translation 2002-01-11 21:57:20 +00:00
dan
a1a7ba7689 Fixed problem with not saving all windows in a session when the shared 
application icon is enabled (only one instance/shared application was
saved)
 2002-01-11 05:08:44 +00:00
dan
4f84c48ccb updated de.po and fixed a typo 2002-01-10 06:03:06 +00:00
dan
9b63a77d6a a few changes in the selection code 2002-01-07 06:11:34 +00:00
dan
89a32e3663 Fixed some focus related problems when switching workspaces, including the 
infamous problem with losing focus when switching to an empty workspace and
back
 2002-01-05 06:16:10 +00:00
dan
501c3f48b8 - Fixed labels not to display '\n' as a character if multiple '\n' are passed 
- Fixed Legal Panel not to display rectangles in place of new lines.
- Removed some obsoleted/unused files from cvs
- Fixed a bug with Sloppy focus when changing workspaces (from a debian user
  bug report/patch)
 2002-01-05 01:35:30 +00:00
dan
cab71ba6a1 - Fixed text in info panel for multibyte (Seiichi SATO <ssato@sh.rim.or.jp>) 
- Separated the font caches for normal fonts and fontsets in WINGs (they can
  have the same names and collide in the cache giving unwanted results)
- Updated the years in the copyright notices
 2002-01-04 07:32:37 +00:00
dan
96f8ab167f Added "Hide Others" to the window menu 2002-01-04 05:44:20 +00:00
dan
a8c7375623 Fixed problem with kcalc not having a miniaturize button 2002-01-04 00:30:11 +00:00
dan
365556b676 misc selection and textfield fixes 2002-01-02 17:45:40 +00:00
kojima
7b00d9ec12 added malay translation 2002-01-02 14:09:50 +00:00
dan
89cb6559cc - german po file for WINGs (Guido Scholz <guido.scholz@bayernline.de>) 
- misc fixes in selection code in WINGs
- fix for a crash if WMState is missing on startup
 2002-01-01 18:40:24 +00:00
id
372da5ca39 ok 2001-12-31 12:39:17 +00:00
id
514258fd35 fix again, perfect. 2001-12-31 12:34:51 +00:00
id
0b0002f75a fix an icon 2001-12-31 12:27:34 +00:00
dan
cf2322ee03 code cleanup 2001-12-30 05:07:12 +00:00
dan
c9dfd7f3a4 updated makefile for new icons. 2001-12-30 01:58:30 +00:00
dan
7eb705472f - Really fixed problem with keyboard shortcuts executed an every screen for 
multihead systems.
- Fixed a wrong test in the selection code.
 2001-12-30 01:50:46 +00:00
id
d35dd84ae5 change an icon 2001-12-29 21:31:29 +00:00
id
0613a758f4 add a jabber icon 2001-12-29 08:32:46 +00:00
dan
9e615bcff9 - Fixed a bug that crashed wmaker when closing a window if multiple screens 
were managed by wmaker (Valery Kotchiev <aggregator@nospam.dk>)
- Fixed a problem that crashed wmaker when trying to read an unexisting
  WMState.<number> file on multihead system.
- Fixed problem with keyboard shortcuts executed an every screen for
  multihead systems.
 2001-12-28 03:29:50 +00:00
kojima
9031641ba6 updated chinese translation 2001-12-26 11:32:41 +00:00
id
9bfa0b6efb Sorry, my heart was broken real bad. I am going to resign from my 
job and I don't think I can still be able to be a part of project.
Thank you guys for everything.
 2001-12-26 06:06:45 +00:00
dan
60409e290d small update 2001-12-22 21:18:15 +00:00
dan
03befcf729 - removed kbd shortcuts active during mouse window drag (enabled by a 
recent commit), because it causes nasty problems. It needs fixing
  before reenabling (if they are possible at all)
 2001-12-21 23:46:54 +00:00
dan
beb83f52fe updated NEWS 2001-12-21 23:30:39 +00:00
dan
99a5f0da0f few updates 2001-12-21 21:39:52 +00:00
dan
520a6cd0e4 a fix for the definable cursor code 2001-12-21 11:00:45 +00:00
dan
f968d88070 - Fixed problem with shared appicon on clients having an appmenu that 
is created after the application has mapped its window(s).

This means that if you use wterm without an appmenu it will be able to
use shared appicons, but as soon as you start one with an appmenu they
will get separated appicons.
 2001-12-21 00:48:41 +00:00
dan
e1ed96951b fixed bug with improper setting of root/titlebar cursor (definable cursors) 2001-12-20 22:31:13 +00:00
dan
41996df786 - Saving a domain file will first strip all entries that are also present in 
the global domain as well and are exactly the same. This fixes a bug where
  settings from the global domain file were merged in the user domain file
  and further changes in the global domain file for those merged values was
  ignored making a system admin unable to set global defaults for all users
  using the global domains.
- Fixed bug with not extracting the icon from the client when using
  shared appicons.
- Added WMSubtractPLDictionaries() to WINGs (opposite for merging, it will
  remove all entries from dest if they are present in source and are exactly
  the same. Unique entries in dest and entries with different values from
  those present in source will be preserved).
 2001-12-20 22:16:01 +00:00
kojima
932fcd1f37 kbd shortcuts active during mouse window drag 2001-12-20 19:12:19 +00:00
dan
cefdc204ba updated slovak locale files 2001-12-20 16:16:09 +00:00
dan
6f28d987a8 - Fixed problem with unhiding taht mapped windows from other workspaces 
on the current workspace.
- Made apps with an application menu not to use a shared appicon.
 2001-12-18 16:10:07 +00:00
dan
c8b3933c19 - Fixed xmms problem with shared appicons 
- Fixed a problem with saving user defaults for windows after the shared
  appicon changes.
- Fixed GNUstep apps not to show 2 appicons.
 2001-12-18 05:18:35 +00:00
dan
4140e6051f updated estonian translation 2001-12-17 22:28:47 +00:00
dan
f0664d1344 small update 2001-12-17 21:25:29 +00:00
dan
f4ef34b814 - Made dock/clip steal appicons of applications that were started from a 
shell/xterm or from the main menu, if there is a docked appicon of that
  class that is not running at the time the app is launched.
- Added animation to show that the appicon was stolen by the dock (the way
  NEXTSTEP did - map an appicon as it normally would have been, then slide it
  to the position the docked appicon is).
- Updated the animation constants for scrolling/sliding/shading to better
  adapt to newer/faster machines. Also used wusleep(10) when the delay was 0
  to get rid of the jerky animation when there was no delay.
 2001-12-17 21:21:59 +00:00
dan
90c77b1a45 - improved behaviour for the shared appicon thing. 
- added a 'Bool recursive' flag to WMMergePLDictionaries() in WINGs
 2001-12-17 14:46:31 +00:00
dan
672c42cc48 - removed the collapse appicons thing 
- added real appicon sharing (apps of the same kind will have a single
  shared appicon).
 2001-12-17 04:02:33 +00:00
kojima
739fd1a567 added || pipe menu for non-cached generated menus 2001-12-04 12:05:45 +00:00
dan
363290d919 updated po file list in configure.ac 2001-11-30 23:07:22 +00:00
kojima
235b4c6d25 added estonian translation 2001-11-30 13:25:46 +00:00
dan
bbc87bded6 fixed a bug introduced by the previous commit 2001-11-25 09:45:27 +00:00
dan
81a1f98ca5 - Mapping a new window that belongs to a running application that is hidden, 
will unhide the application.
- removed a wsyserror() message when reading a property list from file
  (the programmer should decide if to give that message or just ignore).
 2001-11-24 05:10:38 +00:00
dan
06b48596f5 - made the definable cursors feature available by default (removed the 
compile time option)
 2001-11-23 05:39:13 +00:00
dan
0c4dc1c24a - Deminiaturizing a window that is also shaded, will perform an unshade too. 
(Note that this only applies to deminiaturizing shaded windows.
   Unhiding an application will keep the shaded/unshaded state of windows.)
 2001-11-20 13:48:23 +00:00
dan
af287fb8eb - added strcasecmp() to WINGs (only on systems that don't have it) 
- removed some redundant includes of ../src/config.h where wconfig.h
  is also included
 2001-11-17 04:26:08 +00:00
dan
7688a9f626 - SIGTERM is now handled and saves the internal state before exiting (like 
SIGHUP and SIGINT already do). Now a "kill wmaker_pid" will exit cleanly
  saving dock/clip/session information on exit.
 2001-11-16 07:45:33 +00:00
dan
9f62c660d7 - Changelog update about latest fixes. 
- Applied patch to fix gnome problems.
 2001-11-15 02:52:51 +00:00
kojima
cc9abd6e7e fixed crash bug with empty menus 2001-11-14 13:18:26 +00:00
dan
72150b1da7 - Slovak .po file updates from (Jan Tomka <judas@linux.sk>) 
- "Save Workspace state" confirmation switch on the exit dialog panels
  (based on a patch from Jan Tomka <judas@linux.sk>)
 2001-11-05 23:19:46 +00:00
dan
b1565d01c4 misc fixes 2001-10-26 22:06:28 +00:00
dan
3b1961d40d New Czech locales from Jiri Hnidek <Jiri.Hnidek@vslib.cz> 2001-10-19 20:13:00 +00:00
dan
d7ffd46d89 updated Makefiles for locale generation to accomodate the latest changes in source structure that were introduced by adding property list handling code to WINGs 2001-10-11 08:19:58 +00:00
dan
8cb297a671 small cleanup 2001-10-10 18:52:14 +00:00
dan
4be9abcdbc - fixed compilation problem for systems that require -lintl for building WINGs 
- removed redundant include/lib paths from the get-*-flags scripts
 2001-10-10 01:02:34 +00:00
dan
75f790160b - Added ability to shade/unshade a window using the mouse wheel on the 
window titlebar.
- Disabled the window birth zoom effect by default.
 2001-10-09 03:35:45 +00:00
dan
4350cf540c Added french INSTALL file (wwp <subscript@free.fr>) 2001-10-08 19:21:14 +00:00
dan
dc9b99fe47 put back AM_PROG_LIBTOOL macro. some older automake/autoconf don't like the AC_PROG_LIBTOOL name, even they're aliases 2001-10-05 02:03:55 +00:00
dan
1dcb477fde replace old AM_PROG_LIBTOOL macro with AC_PROG_LIBTOOL 2001-10-05 01:55:51 +00:00
645 changed files with 174944 additions and 149053 deletions
Expand all files Collapse all files

7
.cvsignore
View File

@@ -1,7 +0,0 @@
Makefile Makefile.in
aclocal.m4
configure config.log config.cache config.guess config.status config.sub
libtool ltconfig ltmain.sh
.psrc .inslog2 tca.map tca.log
*.rpt
update update-autoconf

6
.cvsnotify
View File

@@ -1,6 +0,0 @@
#
# You can add here extra email addresses (one per line) where notifications
# should be sent on cvs commit.
# This is easier than to modify CVSROOT/loginfo to add extra addresses there.
# Lines that start with # or empty lines are ignored.
#

87
.gitignore vendored Normal file
View File

@@ -0,0 +1,87 @@
*Makefile
*Makefile.in
WINGs/get-wings-flags
WINGs/get-wutil-flags
WINGs/WINGs.pc
aclocal.m4
autom4te.cache*
config.guess
config.log
config.status
config.sub
configure
contrib/WindowMaker.spec
libtool
ltmain.sh
src/config.h
src/config.h.in
src/stamp-h1
src/wconfig.h
wmlib/wmlib.pc
wrlib/get-wraster-flags
wrlib/wrlib.pc
*.o
*.lo
WINGs/Examples/.libs/colorpick
WINGs/Examples/.libs/fontl
WINGs/Examples/.libs/puzzle
WINGs/Examples/colorpick
WINGs/Examples/connect
WINGs/Examples/fontl
WINGs/Examples/puzzle
WINGs/Examples/server
WINGs/Extras/.libs/test
WINGs/Extras/libExtraWINGs.a
WINGs/Extras/test
WINGs/Tests/.libs/testmywidget
WINGs/Tests/.libs/wmfile
WINGs/Tests/.libs/wmquery
WINGs/Tests/.libs/wtest
WINGs/Tests/testmywidget
WINGs/Tests/wmfile
WINGs/Tests/wmquery
WINGs/Tests/wtest
WINGs/libWINGs.a
WINGs/libWUtil.a
WPrefs.app/.libs/WPrefs
WPrefs.app/WPrefs
WindowMaker/Defaults/WMRootMenu
WindowMaker/Defaults/WMState
WindowMaker/Defaults/WMWindowAttributes
WindowMaker/Defaults/WindowMaker
WindowMaker/IconSets/Default.iconset
src/.libs/wmaker
src/wmaker
test/wtest
util/.libs/wmagnify
util/.libs/wmsetbg
util/.libs/wmsetup
util/convertfonts
util/geticonset
util/getstyle
util/seticons
util/setstyle
util/wdread
util/wdwrite
util/wmagnify
util/wmaker.inst
util/wmsetbg
util/wmsetup
util/wxcopy
util/wxpaste
wmlib/libWMaker.a
wrlib/.libs/libwraster.a
wrlib/.libs/libwraster.la
wrlib/.libs/libwraster.lai
wrlib/.libs/libwraster.so
wrlib/.libs/libwraster.so.3
wrlib/.libs/libwraster.so.3.1.0
wrlib/libwraster.la
wrlib/tests/.libs/testdraw
wrlib/tests/.libs/testgrad
wrlib/tests/.libs/testrot
wrlib/tests/.libs/view
wrlib/tests/testdraw
wrlib/tests/testgrad
wrlib/tests/testrot
wrlib/tests/view

8
AUTHORS
View File

@@ -107,10 +107,10 @@ made autoarrange icons a runtime option, SHADOW_RESIZEBAR c-time option,
no workspace switch to the same workspace, dashed icon selection, no workspace switch to the same workspace, dashed icon selection,
misclellaneous bug fixes, definable cursors, --no-polling command line option. misclellaneous bug fixes, definable cursors, --no-polling command line option.
The JED Text Editor <xjed@windowmaker.org> The JED Text Editor <xjed@windowmaker.info>
Project maintainer Project maintainer
Alfredo K. Kojima <kojima@windowmaker.org> Alfredo K. Kojima <kojima@windowmaker.info>
The guy who types random keys to feed JED with the necessary entropy The guy who types random keys to feed JED with the necessary entropy
Jay Kominek <jkominek@xtn.net> Jay Kominek <jkominek@xtn.net>
@@ -149,7 +149,7 @@ Fix for unassociated alpha tiff
Craig Nellist <crn@ozemail.com.au> Craig Nellist <crn@ozemail.com.au>
selection in textfield selection in textfield
Dan Pascu <dan@windowmaker.org> Dan Pascu <dan@windowmaker.info>
dock ghost (superfluous mode) fix, enhancement for scrollable menus, dock ghost (superfluous mode) fix, enhancement for scrollable menus,
clip, numerous other stuff, project maintainer clip, numerous other stuff, project maintainer
@@ -217,7 +217,7 @@ FRBall <frb@umr.edu>
dgradient fix dgradient fix
"]d" <id@maliwan.org> "]d" <id@windowmaker.info>
Window list menu miniaturized/hidden hints, XDE support, XKB lock Window list menu miniaturized/hidden hints, XDE support, XKB lock
language status, WINGs enhancements, bug fixes, window commands menu language status, WINGs enhancements, bug fixes, window commands menu
enhancement, window move/resize by keyboard. GNUstepGlow.tiff icon, enhancement, window move/resize by keyboard. GNUstepGlow.tiff icon,

9
BUGFORM
View File

@@ -4,11 +4,11 @@
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
developers@windowmaker.org Please, USE THIS FORM!!! wmaker-dev@lists.windowmaker.org Please, USE THIS FORM!!!
You can also report a bug in the WWW bug tracker at You can also report a bug in the WWW bug tracker at
http://windowmaker.org/cgi-bin/bugs or by sending this report http://bugs.windowmaker.org/projects/wmaker/issues or by sending this report to
to bugs@windowmaker.org bugs@windowmaker.org
0. Before reporting this bug I already: 0. Before reporting this bug I already:
@@ -35,9 +35,6 @@ to bugs@windowmaker.org
[ ] --enable-kanji [ ] --enable-kanji
[ ] --disable-shape [ ] --disable-shape
[ ] --enable-single-icon [ ] --enable-single-icon
[ ] --enable-kde
[ ] --enable-gnome
[ ] --enable-openlook
[ ] --enable-modelock [ ] --enable-modelock
[ ] Others: ....................... [ ] Others: .......................

8
BUGS
View File

@@ -1,8 +1,12 @@
Newly added
- after a crash, wmaker will forget the hidden state of the apps and just
show their windows minimized. normal restart is unaffected
- after a crash, wmaker will completely mess the window's saved geometries
and maximizing will have weird results. restart is unaffected
- wmaker will not stop managing a screen even if another window manager - wmaker will not stop managing a screen even if another window manager
requests that, through the ICCCM 2.0 manager selection stuff requests that, through the ICCCM 2.0 manager selection stuff
- stacking code is buggy (or XFree is buggy) - stacking code is buggy (or XFree is buggy)
- after restart focus is losed or switched to another window. May be related
to the one above.
- save session doesnt work on some platforms (Alpha and Sparc) - save session doesnt work on some platforms (Alpha and Sparc)
- texture pixmaps are being incorrectly freed somewhere. Either - texture pixmaps are being incorrectly freed somewhere. Either
fix bug (to support broken MetroX servers) or remove all useless references fix bug (to support broken MetroX servers) or remove all useless references

11
COPYING.WTFPL
View File

@@ -29,7 +29,16 @@ xpm/textr.xpm
xpm/tnew.xpm xpm/tnew.xpm
inside Resources/Images.tiff "the little house", "the trash can", inside Resources/Images.tiff "the little house", "the trash can",
"the folder", "the floppies" "the folder", "the floppies"
Ear.png
Ftp.png
ICQ.png
Jabber.png
Mozilla.png
Pen.png
Pencil.png
Shell.png
Speaker.png
XChat.png
do What The Fuck you want to Public License do What The Fuck you want to Public License

394
ChangeLog
View File

@@ -1,3 +1,380 @@
Changes since version 0.92.0:
.............................
- added check for --with-gnustepdir option to configure to verify that its
argument is an absolute path
- updated german translations (Torsten Marek <shlomme@gmx.net>)
- fixed WPrefs.app to find its icons when not installed under GNUstep paths
- fixed gcc-4 compilation issues (Vladimir Nadvornik <nadvornik@suse.cz>)
- fixed amd64 compilation issues (Vladimir Nadvornik <nadvornik@suse.cz>)
- eliminated gcc-4 compilation warnings
- small fix for compilation in a different directory than the source
(Balaton Zoltan <balaton@eik.bme.hu>)
- fixed some warnings on 64bit platforms (Balaton Zoltan <balaton@eik.bme.hu>)
- fixed issue with invisible modal windows from Qt and Gtk applications
on 64bit platforms (Max Loparyev <max@city.veganet.ru>)
- fixed issue with icon colors on big endian platforms
(Max Loparyev <max@city.veganet.ru>)
- release colors to avoid issues with the reference count overflowing a
small integer and causing unexpected color releases that can crash
Window Maker (Martin Frydl <martin.frydl@systinet.com>)
- fixed a small memory leak in WINGs/wview.c caused by not releasing the
background color of a view (Martin Frydl <martin.frydl@systinet.com>)
- updated estonian translation (Ivar Smolin <okul@linux.ee>)
- updated the XDND code in WINGs to work with GDK based applications.
WINGs based applications should now work with both KDE and GNOME
applications (Sylvain Reynal <sreynal@nerim.net>)
- better check for the XDND protocol version when interoperating with other
applications. As it seems xdnd version 3 (which WINGs supports) and newer
are not backward compatible with xdnd version 1 and 2. This is why WINGs
applications cannot interoperate with GNUstep applications (which uses
xdnd version 2). Xdnd version 4 and 5 are backwards compatible with
version 3 though. (Sylvain Reynal <sreynal@nerim.net>)
- Improved Info panel layout and fonts.
- Fixed missing library paths when linking some binaries on certain
platforms with a recent pkg-config (debian unstable/sid for one)
- Fixed buggy handling of UTF8 characters in textfields in WINGs.
(Stanislav Maslovski <stanislav.maslovski@gmail.com>)
- Fixed segfault in WPrefs when some font description is missing from the
configuration file (Stanislav Maslovski <stanislav.maslovski@gmail.com>)
- Removed WINGs' dependency on rgb.txt (from X11) and issues with locating it
on the filesystem for different systems/distributions.
- Fixed segfault when unhiding an application in certain conditions (seen
with KDE applications with transient windows)
Changes since version 0.91.0:
.............................
- fixed crash with info panel and alt-tabbing
- updated Japanese translations (Takeo Hashimoto <HashimotoTakeo@mac.com>)
- allow disable of switch panel when SwitchPanelImages=None
- added X Input Methods support in WINGs
- fixed issues with compiling on Solaris with openwin
- reduced minimum required version number for the Xft library to 2.1.0
- fixed some compilation issues with gcc-2.9x
- removed --with-appsdir option and replaced it with --with-gnustepdir. Also,
default installation path (for non GNUstep users) is now $(prefix)/bin
- fixed bug with infinite loop in some circumstances in fitText() in WINGs
- fixed to allow parallel builds on SMP systems using make -j
- updated Italian translation (Marco Colombo <m.colombo@ed.ac.uk>)
- applied .AppInfo --> Library path rename patch (Alex Perez <aperez@student.santarosa.edu>)
- added code to automatically update the icon paths from the old .AppInfo
style to the new Library/WindowMaker style in WMWindowAttributes when
Window Maker starts to make transition transparent for users.
- fixed issue with window being moved by 1 pixel up and left when the window
move was initiated by the client
- improved hide/unhide animation for applications with multiple windows
(only animate the active window hiding/unhiding, which makes Window Maker
faster and more responsive for such applications). This also makes the
restart operation much faster.
- fixed bug with windows shrinking to very small sizes when Unmaximize was
used on them, after they were closed in a maximized state.
- fixed bug with restoring maximized state from NetWM atoms.
- fixed issue with GNUstep applications losing focus when all their windows
are closed and there remains only their menu (Matt Rice <ratmice@yahoo.com>)
- try fixed font for the technical drawing font if helvetica-12 is not
available to avoid crashing (Timo Juhani Lindfors <timo.lindfors@iki.fi>)
- new algorithm for placing miniwindows after unhiding the application they
belong to, that works without auto-arranging the icons, while still avoiding
multiple icons in the same spot by moving the miniwindows to a new slot if
their old slot was occupied in the meantime.
- double clicking an appicon will also raise the miniwindows that belong to
that application to the front (along with the normal windows).
Changes since version 0.90.0:
.............................
- added _NET_WM_NAME, _NET_WM_ICON_NAME and _NET_WM_ICON to WINGs
- new WPrefs icon (thanks to Largo)
- replaced VirtualEdgeThickness option, with EnableVirtualDesktop (boolean)
- enhanced alt-tab panel, added theming ability
- fixed issues with broken crash dialog
- removed obsoleted options from wconfig.h
- changed animation delay constants to fix issues with 2.6.x linux kernels
(patch provided by Eric Piel <Eric.Piel@lifl.fr>)
- fixed several broken po files
- increased libwraster version number to 3.1.0 (added a RCopyArea function)
Changes since version 0.80.2:
.............................
- Some updates to WINGs WMConnection. See WINGs/ChangeLog for details.
- Fixed empty window list menu, if the window list menu was launched through
the root menu (sent by "Marc-Christian Petersen" <m.c.p@wolk-project.de>)
- Fixed dock's menu mapping position when dock is on the right side.
- Map clip's menu so that it never gets out of screen on the left or the right.
- Patch to add binary mode on opening files (needed for Windows with Cygwin)
(sent by luke <luke@posh.optushome.com.au>)
- Updated French translations (Antoine Hulin <antoine@origan.fdn.org>)
- Removed Hermes lib dependency in wrlib
- Put back asm/MMX code in wrlib
- Updated Russian locale files ("Andrew W. Nosenko" <awn@bcs.zp.ua>)
- API change in WINGs for WMDraw*String(). Details in WINGs/Changelog
- Removed obsoleted acconfig.h and implemented its functionality using
AC_DEFINE and AC_DEFINE_UNQUOTED as autoconf 2.5x recommends.
This will definitely enforce the need to use autoconf 2.5x
- Added Xft2 support to WINGs, for rendering antialiased fonts with
transparency. Details in WINGs/ChangeLog.
- Fixed problem with long, preset workspace names (Wanderlei Antonio Cavassin
<cavassin@conectiva.com.br>)
- Added kinput2 bug workaround to stock WMWindowAttributes (Seiichi SATO
<sato@cvs-net.co.jp>)
- Added Belarusian translation (Ihar Viarheichyk <iverg@mail.ru>)
- Fixed wrlib not to load braindead images with 0 sized width or height
- Removed double no-position-display when cycling position display types
with Shift key while moving windows.
- Changed the default position display while moving a window to 'Center'.
- Better outline when drawing balloons.
- Fixed wrlib to not accept too large images (fixes buffer overflow)
- Patched FAQ (David Coe <davidc@debian.org>)
- Fixed bug with resizebars appearing out of nothing when reloading configs
- Fixed sloppy focus bug (Pawel S. Veselov <Pawel.Veselov@Sun.COM>)
- Applied Xinerama patch (after fixes) from (Peter Zijlstra
<a.p.zijlstra@chello.nl>)
- Added switch to enable/disable antialiased fonts in WPrefs's Expert Settings
panel. (Temporary until the Font Settings panel in WPrefs is finished).
- Added a check that only %d is used in a font specification in WMGLOBAL and at
most once for each font in a fontset (eliminates a possible security exploit)
- Added fontpanel callback
- Fixed focus handling for windows that set WM_HINTS.take_focus = False.
- Fixed a problem in the stacking code which could lead to segmentation faults
(Jeff Teunissen <deek@d2dc.net>)
- Fixed a crashing bug in the menu code with modal panels involved.
- Fixed incorrect focusing of application's windows after an unhide (sometimes
the incorrect window got focus instead of the apps's last focused window)
- Unshade application's shaded windows when Dbl-MiddleClick-ing its appicon.
(this is to be consistent with deminiaturizing application's miniwindows
which also happens in this case, since shading is a form of miniaturization)
- Fixed bug with tpixmap from previous xinerama patch (reported by g0sh)
- Fixed edge resistance and move/resize frame drawing for borderless windows
- Fixed wrong display position for the move/resize widgets after xinerama
patch (Peter Zijlstra <a.p.zijlstra@chello.nl>)
- Fixed bug with cursor locked in drag mode after Alt-dragging a window
- Added Catalan translation (Ernest Adrogué <eadrogue@gmx.net>)
- Fixed a bug with deminiaturizing windows when the application is hidden and
the miniaturized window is selected from the window list menu
- Fixed a bug with not showing shaded window frames when the application is
hidden and another window belonging to the app is selected in the window
list menu
- Autoarrange icons after unhiding an application that has miniaturized
windows, else they may cover other icons which are now in the positions
they have occupied before hiding
- Fixed Clip's workspace menu mapping to be consistent with the others
- Fixed bug in wmsetbg that caused scale and maxscale to both do maxscale
(Alexey Voinov <voins@voins.program.ru>)
- Fixed bug with scrolling menus introduced by the xinerama patch.
- Fixed bug that could cause SIGSEGV by accessing beyond the end of text in
a WINGs textfield widget.
- Fixed small memory leak in WINGs' font panel code.
- Fixed memory leak in WINGs' file panel code.
- Updated Bulgarian translations (Anton Zinoviev <zinoviev@debian.org>)
- Fixed a bug in WINGs' hashtable which free'd the wrong memory in the
WMResetHashTable() function (possible source of SIGSEGVs)
- Fixed 2 syntax errors in plmenu.zh_TW.Big5 (Mike FABIAN <mfabian@suse.de>)
- Some .po file fixes (Mike FABIAN <mfabian@suse.de>)
- Fixed the problem with the root menu code changing the locale setting as
a side effect of loading a localized menu
- Fixed e memory leak in the code that reads a localized root menu
- Added support for generating pkgconfig files for WINGS, wmlib and wrlib.
("Marcelo E. Magallon" <mmagallo@debian.org>)
- Support for multiline balloons (Vitaly Ovtchinnikov <ov@rbcmail.ru>)
- Improved wsetfont (Mike FABIAN <mfabian@suse.de>)
- Updated single-click contrib patch (steve lion <steve.lion@verizon.net>
and vlaad)
- Updated French translations (Antoine Hulin <antoine@origan.fdn.org>)
- Xinerama support for Solaris
- Added global menu support (see NEWS)
- Fixed sloppy focus bug
- Made maximize behave differently with keyboard/mouse for xinerama
(Peter Zijlstra <a.p.zijlstra@chello.nl>)
- A few leftover xinerama fixes (Peter Zijlstra <a.p.zijlstra@chello.nl>)
- Extended the 'strut' to multiple heads
(Peter Zijlstra <a.p.zijlstra@chello.nl>)
- Icon placement now takes into account the new xinerama extended 'strut'
(Peter Zijlstra <a.p.zijlstra@chello.nl>)
- Icon arrangement that takes the new extended xinerama 'strut' into account
(Peter Zijlstra <a.p.zijlstra@chello.nl>)
- Fixed the 'KDE omnipresent' bug.
- Fixed bug with focusing a deminiaturized window with sloppy focus mode
- Fixed aspect of window list menu (window name was too close to workspace
indicator)
- Fixed menu panel in WPrefs.app. Explanatory text did not fit into the label
- Implemented a better logic to preserve the window's old geometry when
maximizing to support succesive maximizations in different directions
without the need to do an intermediary un-maximize step (eliminates flicker)
- Made keyboard/mouse maximization behavior consinstent relative to each other
- Enhanced wmsetbg's man page with description for -b | --back-color
(Marcelo E. Magallon <marcelo.magallon@bigfoot.com>)
- Do not use the disabled clip color for the clip's workspace navigation arrows
when the clip is collapsed (it made them look like disabled)
- Fixed bug with incorrect un-escaping if there is a dot in wm_class.
- Updated Catalan translations (Ernest Adrogue <eadrogue@gmx.net>)
- Updated Spanish translation of WPrefs (Alberto Gimenez <algibe@teleline.es>)
- Fixed synchronization problem between hair cursor and mouse cursor in
wmagnify with mouse cursor at the screen edge (Jon Diercks <jon@diercks.net>)
- Fixed 2 focus switching related bugs (Allan Peramaki <aperamak@cc.hut.fi>)
- Fixed a bug that made the crash panel to be shown again and again when the
'Restart Window Maker' option was selected, under some circumstances.
- Added workaround in global WMWindowAttributes, to avoid creating a second
appicon when a KDE3 application opens a config panel.
- Updated slovak translation (Jan Tomka <judas@linux.sk>)
- Added xdnd v3 support in WINGs (Sylvain Reynal <sreynal@nerim.net>)
- Check whether libXft is at least version 2.1.2 else refuse to compile.
- Fixed bug in icon chooser dialog that could cause a segmentation fault
in some cases (Pascal Hofstee <caelian@gmail.com>)
- Fixed crash in asm code in wrlib, with new versions of gcc.
- Fixed bug in the x86_PseudoColor_32_to_8() function which incorrectly
used the r, g, b fields in the conversion.
- Fixed x86 ASM code in wrlib to work on 64 bit architectures.
- Fixed the focus flicker seen with some apps (notably gtk2)
(Alexey Spiridonov <snarkmaster@gmail.com>)
- Fixed all crashing bugs that were generated by wmaker starting with the
WMState file missing.
- Added NetWM support (a modified version of the patch originaly written
by Peter Zijlstra <a.p.zijlstra@chello.nl>)
- Applied patch to enhance the Virtual Desktop behaviour, and to integrate
it with the NetWM code (Peter Zijlstra <a.p.zijlstra@chello.nl>)
- Applied a few xinerama and placement fixes (Peter Zijlstra
<a.p.zijlstra@chello.nl>)
- Fixed memory leak in dock code.
- Fixed and enhanced the text wrapping in WINGs.
- Fixed the layout of some elements in WPrefs.app
- Added workaround for aplications that don't set the required hints on the
client leader window, but they set them on normal windows (observer with
KDE 3.3.0 mainly). This will allow these apps to get an appicon again.
(they should be fixed still)
- Added workaround for applications that do not set a command with
XSetCommand(), but instead they set the _NET_WM_PID property. This works
with operating systems that offer a /proc interface similar to what linux
has. (This also is to fix problems with KDE 3.3.0 apps, but not only them).
- Fixed bug with autostart and exit scripts not being executed if user
GNUstep path was different from ~/GNUstep (when setting GNUSTEP_USER_ROOT)
- Removed legacy OFFIX_DND support code
- Fixed the signal handler for crashes (ie, removed it) and made wmaker
restarting be made automatically by a monitoring process.
- Made NetWM support be enabled by default
- Removed old code to store/restore workspace state (now relies on netwm)
- Added a (simple) Font Configuration for fontconfig fonts
- MacOS X style window switching panel (navigate through windows with Alt-Tab
or arrow keys)
- Added support for NET_WM_NAME/NET_WM_ICON_NAME
- Moved out font name conversion code from getstyle/setstyle/convertfonts and
made it support fontsets
- Converted all menu and po files to UTF-8
- Updated de.po (Thomas Otto <3.1415926535897932384626433832@gmx.net>)
- Fixed a crash bug when switching workspaces
- Removed obsoleted scripts from util: wsetfont, wmchlocale, wcopy, wpaste
Changes since version 0.80.1:
.............................
- Fixed a buffer overflow when allocating a RImage struct.
Changes since version 0.80.0:
.............................
- Fixed a bug that crashed wmaker when closing a window if multiple screens
were managed by wmaker (Valery Kotchiev <aggregator@nospam.dk>)
- Fixed a problem that crashed wmaker when trying to read an unexisting
WMState.<number> file on multihead system.
- Fixed problem with keyboard shortcuts executed an every screen for
multihead systems.
- Updated traditional chinese translations
- Fixed buglet in non-caching rootmenu option
("John H. Robinson, IV" <jhriv@ucsd.edu>)
- Added Malay translation
- Fixed problem with kcalc not having a miniaturize button.
- Added "Hide Others" to the window menu.
- Fixed text in info panel for multibyte (Seiichi SATO <ssato@sh.rim.or.jp>)
- Separated the font caches for normal fonts and fontsets in WINGs (they can
have the same names and collide in the cache giving unwanted results)
- Fixed Legal Panel not to display rectangles in place of new lines.
- Fixed problem with losing focus when changing to an empty workspace and back.
- Fixed another focus related problem when changing workspaces.
- Fixed problem with saving session when shared appicon is enabled (not
all instances were saved in the session, only one per shared appicon)
- Added support for the ukrainian language in wsetfont
(Bohdan Vlasyuk <bohdan@bodq.vstu.vinnica.ua>)
- Fixed a bug that crashed Window Maker when setting the "Emulate AppIcon"
option for a window using the window Inspector.
- Let XRender transparent window be see-through to desktop
- Added Greek (el) language pixmap (Michalis Kabrianis <Michalis@bigfoot.com>)
- Fixes icons being reduced twice when icon size != 64x64
Eduardo Pereira Habkost <ehabkost@conectiva.com.br>
- Fixed a bug that crashed wmaker when selecting the "Start alternate window
manager" option in the crashing dialog panel.
- Window Maker will now use the WINDOWMAKER_ALT_WM environment variable (if
it is defined) to overwrite the default hardcoded fallback window manager.
- Fixed marks for menu entries to be grayed as the text for disabled entries.
- Fixed Clip's "Autoraise" option to be marked as disabled when the
"Keep on Top" option is active.
- Added ability to browse for files/directories in the WPrefs menu editor.
- Added Czech translations of documentation (Jiri Hnidek <Jiri.Hnidek@vslib.cz>)
- Fixed segfault with incomplete WM_CLASS specifications.
- Fixed a bug about arranging subviews in a WMBox after removing a subview
and a memleak occuring in the same situation.
- Fixed a bug in wdread
- Fixed bug with windows that have WM_HINTS.take_focus = False. These windows
will not receive focus at all.
- Fixed a buffer overflow in winmenu.c
Changes since version 0.70.0:
.............................
- Disabled window birth animation by default (while it was ok with normal
windows, it was very annoying with menus editing in WPrefs.app)
- Added ability to shade/unshade a window using the mouse wheel.
- Fixed compilation for systems that required -lintl for WINGs
(Jim Knoble <jmknoble@pobox.com>)
- Removed redundant include/lib paths from the get-*-flags scripts
- Updated slovak .po files (Jan Tomka <judas@linux.sk>)
- Added "Save workspace state" switch button on the exit confirmation panel
(based on a patch sent by Jan Tomka <judas@linux.sk>)
- Fixed WPrefs crash when clicking on the menu editor to keep the current menu
(Alexey Voinov <voins@voins.program.ru>)
- Added patch to fix some gnome issues (Les Schaffer <schaffer@optonline.net>)
- SIGTERM is now handled and saves the internal state before exiting (like
SIGHUP and SIGINT already do). Now a "kill wmaker_pid" will exit cleanly
saving dock/clip/session information on exit.
- Added an internal strcasecmp() to WINGs (only on systems where's not present)
- Deminiaturizing a window that is also shaded, will perform an unshade too.
(Note that this only applies to deminiaturizing shaded windows. Unhiding
an application will keep the shaded/unshaded state of windows.)
- Removed compile time option for definable cursors and made them available by
default.
- Mapping a new window that belongs to a running application that is hidden,
will unhide the application.
- Added || pipe menu for generating non-cached menus
- Removed the collapse appicons thing.
- Added real appicon sharing (apps of the same kind will have a single shared
appicon).
- Fixed user and global defaults domain merging to preserve values present in
global but not in user, in sub-dictionaries.
- Made dock/clip steal appicons of applications that were started from a
shell/xterm or from the main menu, if there is a docked appicon of that
class that is not running at the time the app is launched.
- Added animation to show that the appicon was stolen by the dock (the way
NEXTSTEP did - map an appicon as it normally would have been, then slide it
to the position the docked appicon is).
- Updated the animation constants for scrolling/sliding/shading to better
adapt to newer/faster machines. Also used wusleep(10) when the delay was 0
to get rid of the jerky animation when there was no delay.
- Fixed bug with Unhide mapping windows from other workspaces.
- keyboard shortcuts are active during mouse window drag
- Saving a domain file will first strip all entries that are also present in
the global domain as well and are exactly the same. This fixes a bug where
settings from the global domain file were merged in the user domain file
and further changes in the global domain file for those merged values was
ignored making a system admin unable to set global defaults for all users
using the global domains.
- Fixed bug with improper setting of root/titlebar cursor (definable cursors).
Changes since version 0.65.1: Changes since version 0.65.1:
............................. .............................
@@ -16,10 +393,15 @@ Changes since version 0.65.1:
- added spanish INSTALL file (Efrain Maximiliano Palermo <max_drake2001@yahoo.com.ar>) - added spanish INSTALL file (Efrain Maximiliano Palermo <max_drake2001@yahoo.com.ar>)
- updated Finnish pots (Tomi Kajala <tomi@iki.fi>) - updated Finnish pots (Tomi Kajala <tomi@iki.fi>)
- copy/paste launching in Dock - copy/paste launching in Dock
- fixed switch to wrong workspace bug (Masashi Shimbo <shimbo@cis.ibaraki.ac.jp>)
- added snprintf and removed XConvertCase usage for portability
- added wcopy/wpaste scripts from (<luke@research.canon.com.au>)
- added Xinerama support: see details in NEWS
- fixed artifact pattern left in TrueColor dithering code (visible with
tiled gradients)
- fixed bug in positioning of window list menu when opened by kbd - fixed bug in positioning of window list menu when opened by kbd
- internal code clean-up with notifications for window state change and other - internal code clean-up with notifications for window state change and other
stuff stuff
- added snprintf implementation for systems that don't have this function
- removed the libPropList dependancy by adding property list handling - removed the libPropList dependancy by adding property list handling
code to WINGs. This code is not only better integrated with the other code to WINGs. This code is not only better integrated with the other
WINGs data structures, but it's also more robust. Also a backward WINGs data structures, but it's also more robust. Also a backward
@@ -448,9 +830,9 @@ Changes since version 0.51.2:
- fixed focus problem with unfocusable windows - fixed focus problem with unfocusable windows
- fixed bug in WPrefs that changed EXIT to SHUTDOWN - fixed bug in WPrefs that changed EXIT to SHUTDOWN
- fixed menu title messup bug in WPrefs - fixed menu title messup bug in WPrefs
- added a dot to mark hidden applications (compile time) (id@windowmaker.org) - added a dot to mark hidden applications (compile time) (id@windowmaker.info)
- enhancements to the modelock patch (id@windowmaker.org) - enhancements to the modelock patch (id@windowmaker.info)
- show kbd mode for modelock (id@windowmaker.org) - show kbd mode for modelock (id@windowmaker.info)
- enhanced positioning of transient windows - enhanced positioning of transient windows
- added dynamically loadable texture renderer code - added dynamically loadable texture renderer code
from Tobias Gloth <gloth@online.de> from Tobias Gloth <gloth@online.de>
@@ -1291,7 +1673,7 @@ Changes since version 0.14.1:
They are icons for dock, clip, defaultAppIcon, sound server and for xterm. They are icons for dock, clip, defaultAppIcon, sound server and for xterm.
All the rest needed for apps that can be started from menu, and have entries All the rest needed for apps that can be started from menu, and have entries
in WMWindowAttributes, are in WindowMaker-data.tar.gz which can be found on in WMWindowAttributes, are in WindowMaker-data.tar.gz which can be found on
http://windowmaker.org/ or ftp://ftp.windowmaker.org/pub/contrib/icons http://windowmaker.info/ or ftp://ftp.windowmaker.info/pub/contrib/icons
- Changed the SlideWindow() function to better adapt to slow machines. Also - Changed the SlideWindow() function to better adapt to slow machines. Also
the animation constants are now run time. They are IconSlideDelay = 0; the animation constants are now run time. They are IconSlideDelay = 0;
IconSlideStep = 5; and IconSlideSlowDown = 50; See NEWS for a more in depth IconSlideStep = 5; and IconSlideSlowDown = 50; See NEWS for a more in depth
@@ -1359,7 +1741,7 @@ Changes since version 0.14.0:
or exiting, while an Attribute Editor panel is open. or exiting, while an Attribute Editor panel is open.
- Put clip.tif, clip.png, clip.xpm, clip2.tif, clip2.xpm, Cone.xpm and - Put clip.tif, clip.png, clip.xpm, clip2.tif, clip2.xpm, Cone.xpm and
Penguin.xpm in WindowMaker-data_tar.gz. These are icons intended for fiend. Penguin.xpm in WindowMaker-data_tar.gz. These are icons intended for fiend.
It can be found on ftp://ftp.windowmaker.org/pub/wmaker/contrib/icons It can be found on ftp://ftp.windowmaker.info/pub/wmaker/contrib/icons

117
FAQ
View File

@@ -143,10 +143,9 @@ here for example screenshots.
1.2 Where can I get Window Maker? 1.2 Where can I get Window Maker?
---------------------------------- ----------------------------------
The official site to get new developmental versions from is The official site to get new developmental versions from is
ftp://ftp.windowmaker.org/pub/beta/srcs/. http://windowmaker.org/pub/source/beta/
NOTE: Also see http://wm.current.nu/downloads.html for the latest The mercurial repository is available at https://hg.windowmaker.org/wmaker
Stable and Development versions.
The development versions are usually very stable themselves, so if you The development versions are usually very stable themselves, so if you
want to have all the newest features, you can rather safetly go with the want to have all the newest features, you can rather safetly go with the
@@ -158,23 +157,15 @@ crash.
1.3 Where are the mailing list archives? 1.3 Where are the mailing list archives?
---------------------------------------- ----------------------------------------
Phillip Smith from Netplex, our wonderful provider of windowmaker.org, has set Please read the information on the web pages at http://lists.windowmaker.org/
up some new lists from the domain. Please read the information on the web for information on how to subscribe, the posting guidelines, and how to access
pages at http://www.windowmaker.org/lists.html for information on how to the web archives.
subscribe, the posting guidelines, and how to access the web archives.
Many thanks to Ed Orcutt who hosted the original lists from his own machine
for many years and Caldera who graciously allowed Ed to continue hosting
from them when he moved to his new position with them. Ed provided a very
valuable service for many years and we are sad to see him go.
1.4 Where is more documentation on configuring Window Maker? 1.4 Where is more documentation on configuring Window Maker?
---------------------------------- ----------------------------------
Besides the mailing list archives, there are nice documents in Besides the mailing list archives, there are nice documents in
ftp://ftp.windowmaker.org/pub/docs/, at http://windowmaker.org/documentation.php
http://wm.current.nu/downloads.html on my download page and at
http://wm.current.nu/user-guide/index.htm in the online user-guide.
1.5 What is an appicon? 1.5 What is an appicon?
@@ -182,51 +173,33 @@ http://wm.current.nu/user-guide/index.htm in the online user-guide.
An appicon is the icon (without the tiny titlebar a minimized application icon An appicon is the icon (without the tiny titlebar a minimized application icon
has) produced by most applications that initially is in the bottom left corner has) produced by most applications that initially is in the bottom left corner
of the screen while an application is running. For an example, run xterm and of the screen while an application is running. For an example, run xterm and
notice the icon in the corner. (Make sure that you use xterm and not a notice the icon in the corner.
default older rxvt because older versions of rxvt do not properly set their
window attributes.)
1.6. How can I get a question added to the FAQ? 1.6. How can I get a question added to the FAQ?
---------------------------------- ----------------------------------
Right now, the only method is to mail Chris Green <sprout@dok.org> or Ask on the mailing list, or send your request to faqs@windowmaker.org
myself <largo@current.nu> the question or post it on the Window Maker
Mailing list, and see if enough people have the same problem.
If you are a developer and would like to be able to edit the official FAQ on Other avenues are the Window Maker wiki
Chris's site, let him know at <sprout@dok.org> http://bugs.windowmaker.org/projects/wmaker/wiki
and the forums
He is currently pondering writing a front end that allows everyone to add http://bugs.windowmaker.org/projects/wmaker/boards
entries and only require a moderator approval before being posted.
1.7. How do I report bugs? 1.7. How do I report bugs?
---------------------------------- ----------------------------------
You can look at the BUGFORM file in your tarball of Window Maker. You can look at the BUGFORM file in your tarball of Window Maker.
Alternatively, you can use the Window Maker Bugtracker at Alternatively, you can use the Window Maker Bugtracker at
http://windowmaker.org/cgi-bin/bugs. http://bugs.windowmaker.org/projects/wmaker/issues
1.8. Is there an anomymous cvs server? 1.8. Is there a public source code repository?
---------------------------------- ----------------------------------
Yes there is. To check out from cvs, first Yes there is. To check out from mercurial use:
hg clone http://hg.windowmaker.org/wmaker wmaker
export CVSROOT=":pserver:anoncvs@cvs.net-community.com:/gnustep"
cvs login
'anoncvs' is the password.
Then issue the command. "wm" is the name of the module.
cvs -z3 checkout -d WindowMaker wm
To update your source tree, cd to the WindowMaker directory and type
cvs -z3 update
inside the WindowMaker directory.
To update your source tree, cd to the wmaker directory and type
hg pull
@@ -365,8 +338,8 @@ for your convenience.
2.8 Can I use WindowMaker with KDE or GNOME or CDE? 2.8 Can I use WindowMaker with KDE or GNOME or CDE?
---------------------------------- ---------------------------------------------------
Contrary to a lot of people thinks, KDE is NOT a window manager. KDE is Contrary to what a lot of people think, KDE is NOT a window manager. KDE is
a suite of various applications that includes a custom window manager (kwm). a suite of various applications that includes a custom window manager (kwm).
The same is true for CDE. The same is true for CDE.
@@ -386,7 +359,7 @@ mouse.
2.9 How do I get Window Maker working with xdm in Redhat 5.[01]? 2.9 How do I get Window Maker working with xdm in Redhat 5.[01]?
---------------------------------- ----------------------------------------------------------------
After running wmaker.inst and letting it write to .xinitrc, After running wmaker.inst and letting it write to .xinitrc,
cp .xinitrc .xsession cp .xinitrc .xsession
and make sure that /usr/local/bin is in your $PATH for the Xserver. You can and make sure that /usr/local/bin is in your $PATH for the Xserver. You can
@@ -1074,22 +1047,35 @@ to force the modification time into the future.
4.16 How can I set dock/clip to use single click to launch 4.16 How can I set dock/clip to use single click to launch
applications, instead of double click? applications, instead of double click?
---------------------------------- ----------------------------------
You cannot do this. This is because single click is used to select app-icons, This question was officially answered as follows:
or to raise/lower the app-icon or the dock/clip.
If this is impelmented then you will be unable to select or raise/lower
dock/clip or app-icons, without also launching the application it represents.
So don't ask for this to be implemented, because it will not be. Double You cannot do this. This is because single click is used to select
click is used for a reason, is not just some weird idea we got in a morning app-icons, or to raise/lower the app-icon or the dock/clip. If
when we wake up too early. this is impelmented then you will be unable to select or
raise/lower dock/clip or app-icons, without also launching the
application it represents.
So don't ask for this to be implemented, because it will not
be. Double click is used for a reason, is not just some weird idea
we got in a morning when we wake up too early.
Regardless of that, there is now an option in WPrefs, under "Expert
User Preferences," which allows you to set "Launch applications and
restore windows with a single click." (See the files contrib/README
and contrib/single_click.diff in the source package for details.)
If you set that option, a left button single click will launch or
restore, rather than select, the app-icon. You can use other methods
(or temporarily turn the option off again) to select app-icons or
raise/lower the dock/clip. You can toggle the selected state of any
app-icon via its right button menu, and there are auto-raise and
keep-on-top options for the dock and clip.
4.18 How do I restore the configuration app to the dock? 4.18 How do I restore the configuration app to the dock?
----------------------------------] ----------------------------------]
You should start it from a terminal using its full path name, which is You should start it from a terminal using its full path name, which is
/usr/local/GNUstep/Apps/WPrefs.app/WPrefs /usr/local/GNUstep/Applications/WPrefs.app/WPrefs
by default. by default.
@@ -1179,10 +1165,10 @@ Several Nice applications are available:
http://www.geocities.com/SiliconValley/Vista/2471/linux.htm#xapps http://www.geocities.com/SiliconValley/Vista/2471/linux.htm#xapps
ascd,WMRack,asmixer,asmodem, and others ascd,WMRack,asmixer,asmodem, and others
ftp://ftp.windowmaker.org/pub/wmaker/contrib/srcs/apps/ ftp://ftp.windowmaker.info/pub/wmaker/contrib/srcs/apps/
wmavgload, wmmount, and wmload wmavgload, wmmount, and wmload
ftp://ftp.windowmaker.org/pub/wmaker/contrib/srcs/utils/ ftp://ftp.windowmaker.info/pub/wmaker/contrib/srcs/utils/
wmppp-wmifs, wmtime, wmmon and other nifty apps wmppp-wmifs, wmtime, wmmon and other nifty apps
http://windowmaker.mezaway.org/ http://windowmaker.mezaway.org/
@@ -1298,14 +1284,8 @@ in routines/xsci/jpc_SGraph.c
5.12 Netscape shows black and white icons 5.12 Netscape shows black and white icons
---------------------------------- ----------------------------------
This is because Netscape uses monochrome icons when running under olwm I have seen this happen on some systems if you run Netscape in a high
and you are using the OPEN LOOK emulation option. If you do not use any XView colour depth (32bpp). That is a Netscape bug. Therefore, bug Netscape.
apps anyway, recompile Window Maker without the --enable-openlook option.
If you need OPEN LOOK emulation, you will have to get used to the monochrome
icons or change then manually in the Attributes panel for each window.
I have also seen this happen on some systems if you run Netscape in a high
colour depth (32bpp) regardless of whether you're using openlook or not.
That is a Netscape bug. Therefore, bug Netscape.
5.13 Snow flakes from xsnow don't acumulate on titlebars! 5.13 Snow flakes from xsnow don't acumulate on titlebars!
@@ -1457,11 +1437,14 @@ the files manually. Or download the whole distribution.
7.5 Will you add GNOME or KDE support? 7.5 Will you add GNOME or KDE support?
---------------------------------- --------------------------------------
Support for GNOME (and KDE) hints is included since 0.50.0. You have to Support for GNOME (and KDE) hints is included since 0.50.0. You have to
enable them at compile-time using the appropriate arguments to ./configure. enable them at compile-time using the appropriate arguments to ./configure.
Please read the INSTALL file for more details. Please read the INSTALL file for more details.
Note: starting with version 0.90.0, support for legacy Gnome-1.x and KDE-2.x
was dropped in favor of NETWM support (used by both Gnome-2.x and KDE-3.x)
-=-=-=-=- -=-=-=-=-
Themes: Themes:

33
FAQ.I18N
View File

@@ -32,24 +32,35 @@ If I18N support does not work for you, check these:
here: here:
ftp://ftp.linux.or.jp/pub/RPM/glibc ftp://ftp.linux.or.jp/pub/RPM/glibc
- if you'd like to display multibyte characters, set the
MultiByteText option to YES in ~/GNUstep/Defaults/WindowMaker
and ~/GNUstep/Defaults/WMGLOBAL
- the fonts you're using support your locale. if your font - the fonts you're using support your locale. if your font
setting on $HOME/GNUstep/Defaults/WindowMaker is like.. setting on $HOME/GNUstep/Defaults/WindowMaker is like..
WindowTitleFont = "-*-helvetica-bold-r-normal-*-12-*-*-*-*-*-*-*"; WindowTitleFont = "Trebuchet MS:bold:pixelsize=12";
MenuTitleFont = "-*-helvetica-bold-r-normal-*-12-*-*-*-*-*-*-*"; MenuTitleFont = "Trebuchet MS:bold:pixelsize=12";
...................................................... ......................................................
then you can't display non iso8859-x charcters by helvetica. then you can't display asian language (ja,ko,ch) characters using
so quick way to display various languages' font is to change Trebuchet MS. A font that is guaranteed to work for any language is
all the font settings into: sans (or sans-serif). sans is not a font itself, but an alias which
points to multiple fonts and will load the first in that list that
has the ability to show glyphs in your language. If you don't know
a font that is suited for you language you can always set all your
fonts to something like:
"-*-*-medium-r-normal-*-14-*-*-*-*-*-*-*" "sans:pixelsize=12"
and also you need to change font settings in style files in However, please note that if your font is something like:
"Trebuchet MS,Luxi Sans,sans:pixelsize=12"
this will not be able to display asian languages if any of the
previous fonts before sans are installed. This is because unlike
the proper font pickup that sans guarantees for your language,
this construct only allows a font fallback mechanism, which tries
all the fonts in the list in order, until it finds one that is
available, even if it doesn't support your language.
Also you need to change font settings in style files in
the "$HOME/Library/WindowMaker/Style" directory. the "$HOME/Library/WindowMaker/Style" directory.
- the LC_CTYPE environment variable is unset or it has the correct - the LC_CTYPE environment variable is unset or it has the correct

64
FAQ.I18N.cs Normal file
View File

@@ -0,0 +1,64 @@
Často kladené otázky na podporu místního nastavení
==================================================
Pokud vám nefunguje podpora I18N, tak zkontrolujte tato nastavení:
- systémová proměnná LANG musí být nastavená tak, aby odpovídala vašemu
místnímu nastavení (čeština = czech), vaše místní nastavení musí být
podporovatelné vaším operačním systémem nebo X emulací. Všechny
podporovatelné lokalizace zobrazíte příkazem "locale -a". Měli byste
také zkontrolovat, zda-li je vaše místní nastavení podporované
X emulací. Soubor: "/usr/X11R6/lib/X11/locale/locale.alias" by měl
obsahovat podobnou sekvenci (podpora pro češtinu):
cs cs_CZ.ISO8859-2
cs_CS cs_CZ.ISO8859-2
cs_CS.ISO8859-2 cs_CZ.ISO8859-2
cs_CZ cs_CZ.ISO8859-2
cs_CZ.iso88592 cs_CZ.ISO8859-2
cz cz_CZ.ISO8859-2
cz_CZ cz_CZ.ISO8859-2
- zkontrolujte použití správných fontů pro vaše místní nastavení.
Pokud nepoužíváte správné fonty s kódováním, které je nastaveno v
Xlib nebo libc, tak se můžou dít "dost divné věci". Zkuste explicitně
zadat kování do proměnné LANG: LANG=cs_CS.ISO8859-2 nebo
LANG=cs_CZ.iso88592 a znovu zkontrolujte:
"/usr/X11R6/lib/X11/locale/locale.alias"
- pokud váš operační systém nepodporuje místní nastavení (locales), nebo
pokud váš OS nepodporuje místní nastavení pro váš jazyk, můžete
použít emulaci místního nastavení X Window Systému. Zprovoznit tuto
emulaci je možné spuštěním ./configure s volbou "--witn-x-locale".
Pokud používáte nějaký komerční systém jako je například IRIX, AIX,
Solaris, ...,tak asi X emulaci nebudete potřebovat. Ovšem pokud je
vaším operačním systémem Linux, NetBSD nebo jiný užasný, volně
šiřitelný operační systém, tak je možné, že vaše místní nastavení
zatím není podporované. Potom použijte volbu "--witn-x-locale".
Pozn: Aby jste mohli používat X emulaci místních nastavení, tak vaše
Xlib musí být zkompilované s touto podporou. Xlib v RedHat 5.0
tak zkompilované nejsou (RH4.x jsou OK). Překompilované Xlib
s podporou pro emulací místních nastavení pro RH5.0 jsou
dostupné na adrese:
ftp://ftp.linux.or.jp/pub/RPM/glibc
- fonty, které používáte by měli být podporované vaším místním nastavením.
Jestliže vaše nastavení fontů v souboru ~/GNUstep/Defaults/WindowMaker
vypadá takto:
WindowTitleFont = "-*-helvetica-bold-r-normal-*-12-*-*-*-*-*-*-*";
MenuTitleFont = "-*-helvetica-bold-r-normal-*-12-*-*-*-*-*-*-*"; ,
nemůžete zobrazovat znaky jiné než iso8859-x ve fontu helvetica.
Jednoduchý způsob, jak zobrazovat znaky různých jazyků, je nastavit všechny
fonty takto:
"-*-*-medium-r-normal-*-14-*-*-*-*-*-*-*"
Také je nutné změnit nastavení fontů v souborech stylů v adresáři:
~/Library/WindowMaker/Style.
- pokud si nejste jisti, zda-li má systémová proměnná LC_TYPE správnou
hodnotu, tak ji nenastavujte.

6
FAQ.I18N.sk
View File

@@ -1,6 +1,6 @@
(Toto je len preklad dosť starého súboru! Ak by ste mali skutočne problémy (Toto je len preklad dosť starého súboru! Ak by ste mali skutočne problémy
s Window Makerom a slovenčinou a v tomto súbore by ste nenašli pomoc, s Window Makerom a slovenčinou a v tomto súbore by ste nenašli pomoc,
pošlite popis problému na adresu <tomka@oalevice.sk>.) pošlite popis problému na adresu <judas@linux.sk>.)
Ak vám nefunguje podpora miestnych nastavení, skontrolujte nasledujúce: Ak vám nefunguje podpora miestnych nastavení, skontrolujte nasledujúce:
@@ -35,10 +35,6 @@ Ak v
ftp://ftp.linux.or.jp/pub/RPM/glibc ftp://ftp.linux.or.jp/pub/RPM/glibc
- ak chcete zobrazovať multibyte znaky, nastavte možnosť
MultiByteText YES v ~/GNUstep/Defaults/WindowMaker a
~/GNUstep/Defaults/WMGLOBAL
- fonty, ktoré používate, podporujú vaše miesne nastavenia. - fonty, ktoré používate, podporujú vaše miesne nastavenia.
Ak vaše nastavenia fontov v ~/GNUstep/Defaults/WindowMaker Ak vaše nastavenia fontov v ~/GNUstep/Defaults/WindowMaker
vyzerajú takto: vyzerajú takto:

123
INSTALL
View File

@@ -40,6 +40,7 @@ SUPPORTED PLATFORMS
- IBM S/390 running Linux - IBM S/390 running Linux
- IBM S/390 running Conectiva Linux (experimental) - IBM S/390 running Conectiva Linux (experimental)
- iBook running Darwin - iBook running Darwin
- Darwin PPC / Macos X
- Windows NT with Cygwin/XFree86 - Windows NT with Cygwin/XFree86
- Sony PlayStation2 running Linux - Sony PlayStation2 running Linux
@@ -63,23 +64,18 @@ The following software is required to use Window Maker:
The following is required to build Window Maker: The following is required to build Window Maker:
- Basic obvious stuff - Basic obvious stuff
If you will build Window Maker, make sure you have gcc (or some gcc (or some other ANSI C compiler)
other ANSI C compiler) and the X header files installed. Specially glibc development files (usually glibc-devel in Linux distributions)
for newbie Linux users: you must install all X development packages X development files (XFree86-devel or something similar)
and the gcc suite. Otherwise you won't be able to build any X
program, including Window Maker.
- autoconf, automake and libtool - autoconf, automake and libtool
These tools are NOT needed, but IF you have one or autoconf 2.54
more of them installed, make sure you have ALL of the following
with exactly these versions:
autoconf 2.13
automake 1.4 automake 1.4
libtool 1.3 libtool 1.4.2
If you have a different version, disable them by temporarily
renaming them to something else or uninstalling them from your - Xft2
system. If you don't develop software you don't need them, and its dependencies (such as freetype2 and fontconfig)
so you can safely uninstall. You will also need the development files for it (xft2-devel)
OPTIONAL: OPTIONAL:
@@ -114,11 +110,6 @@ might work too.
For GIF image support For GIF image support
ftp://prtr-13.ucsc.edu/pub/libungif/ ftp://prtr-13.ucsc.edu/pub/libungif/
- libHermes 1.3.2 or newer
For faster pixel conversion in the wraster library
(its used only in some conversions - for TrueColor visuals)
http://www.clanlib.org/hermes/
- GNU xgettext - GNU xgettext
If you want to use translated messages, you will need GNU gettext. If you want to use translated messages, you will need GNU gettext.
Other versions of gettext are not compatible and will not work. Other versions of gettext are not compatible and will not work.
@@ -129,13 +120,19 @@ might work too.
CONFIGURE OPTIONS: CONFIGURE OPTIONS:
================== ==================
If you downloaded the cvs or git versions, type
./autogen.sh
to generate the config files.
These options can be passed to the configure script to enable/disable These options can be passed to the configure script to enable/disable
some Window Maker features. Example: some Window Maker features. Example:
./configure --enable-kde --enable-gnome ./configure --enable-modelock --disable-gif
will configure Window Maker with KDE and GNOME supported compiled in.
will configure Window Maker with modelock supported and disable gif support.
Normally, you won't need any of them.
To get a list of other options, run ./configure --help To get a list of other options, run ./configure --help
@@ -149,12 +146,6 @@ To get a list of other options, run ./configure --help
The -I flag must precede each paths, like: The -I flag must precede each paths, like:
--with-incs-from="-I/opt/headers -I/usr/local/include" --with-incs-from="-I/opt/headers -I/usr/local/include"
--enable-single-icon
enables the collapsing of all appicons of the WM_CLASS+WM_INSTANCE
into a single one. This feature is not supported at all by the
developers. If you have some trouble with it, contact it's author:
Christopher Seawood <cls@seawood.org>
--disable-shm --disable-shm
disable use of the MIT shared memory extension. This will slow down disable use of the MIT shared memory extension. This will slow down
texture generation a little bit, but in some cases it seems to be texture generation a little bit, but in some cases it seems to be
@@ -163,15 +154,6 @@ To get a list of other options, run ./configure --help
--disable-motif --disable-motif
disable support for mwm window manager hints disable support for mwm window manager hints
--enable-openlook
enable support for OPEN LOOK(tm) window manager hints
--enable-gnome
enable support for GNOME window manager hints
--enable-kde
enable support for kde/kwm window manager hints
--enable-lite --enable-lite
remove things that are already supported in desktop environments, remove things that are already supported in desktop environments,
like KDE and GNOME. Disabled things are: window list, root like KDE and GNOME. Disabled things are: window list, root
@@ -184,9 +166,6 @@ To get a list of other options, run ./configure --help
XKB language status lock support. If you don't know what it is you XKB language status lock support. If you don't know what it is you
probably don't need it. probably don't need it.
--enable-sound
enable support of sound effects module
--disable-xpm --disable-xpm
disables use of the XPM library even if it is available on your disables use of the XPM library even if it is available on your
system. system.
@@ -291,27 +270,6 @@ apply.
* make sure you have /usr/local/lib in /etc/ld.so.conf before running * make sure you have /usr/local/lib in /etc/ld.so.conf before running
ldconfig; ldconfig;
* if you have problems that mention an error message with --no-reexec
uninstall libtool-1.2b and install libtool-1.3 instead. libtool-1.3
can be found in ftp.gnu.org Also read the TROUBLESHOOTING section;
* if you installed the Window Maker package from RedHat and are
installing a new version of it by hand (compiling yourself), uninstall
the package from RedHat before.
* make sure you have a symbolic link from /usr/include/X11 to
/usr/X11R6/include/X11 (if not, type ln -s /usr/X11R6/include/X11
/usr/include/X11 )
* make sure you have /lib/cpp pointing to the cpp program
If you have any doubts in doing any of the stuff above, please
don't hesitate to contact the RedHat user support. They will
kindly answer to all your questions regarding their system.
They also know much more about their own system than us
(we don't use RedHat).
- PowerPC MkLinux - PowerPC MkLinux
You will need to have the latest version of Xpmac. Older versions You will need to have the latest version of Xpmac. Older versions
seem to have bugs that cause the system to hang. seem to have bugs that cause the system to hang.
@@ -365,9 +323,9 @@ following.
to get a complete listing of other options that are available. to get a complete listing of other options that are available.
2. Run configure with the options you want. For example, if you 2. Run configure with the options you want. For example, if you
want to use the --enable-kde option, type: want to use the --enable-modelock option, type:
./configure --enable-kde ./configure --enable-modelock
3. (optional) Edit src/wconfig.h with your favorite text editor 3. (optional) Edit src/wconfig.h with your favorite text editor
and browse through it for some options you might want to change. and browse through it for some options you might want to change.
@@ -414,11 +372,10 @@ Installing the extras package
Unpack WindowMaker-extra-<version-number>.tar.gz in /usr/local/share Unpack WindowMaker-extra-<version-number>.tar.gz in /usr/local/share
You can get the file at ftp://ftp.windowmaker.org. This file is optional You can get the file at http://windowmaker.org/pub/source/release/. This file
and only have a few icons, and themes. Look for the latest <version-number> is optional and only have a few icons, and themes. Look for the latest
available. <version-number> available. Also there is a WindowMaker-extra.readme to
Also there is a WindowMaker-extra.readme to instruct you where that package instruct you where that package should go.
should go.
@@ -431,7 +388,7 @@ when running configure in step 2 of building Window Maker. You will
also need to supply the --with-appspath option, to specify the path for also need to supply the --with-appspath option, to specify the path for
WPrefs.app Example: WPrefs.app Example:
./configure --prefix=/home/jshmoe --with-appspath=/home/jshmoe/GNUstep/Apps ./configure --prefix=/home/jshmoe --with-appspath=/home/jshmoe/GNUstep/Applications
Then make /home/jshmoe/bin be included in your search PATH, add Then make /home/jshmoe/bin be included in your search PATH, add
@@ -580,31 +537,3 @@ menu.pt
menu menu
5 - If you chose a language that uses multi-byte characters, you must
configure the fonts appropriately. Read the manual page for XCreateFontSet
to have more details about it. You must change the ~/G/D/WindowMaker file
for fonts used in titlebars, menus and other things. For fonts used in
dialog windows, change ~/G/D/WMGLOBAL. The %d in the font names must not be
removed. You can also use the supplied wsetfont script for the task.
Read the script itself for instructions.
For example, you can specify the following in ~/G/D/WindowMaker:
WindowTitleFont = "-*-helvetica-bold-r-normal-*-12-*,-*-*-medium-r-normal-*-14-*";
MenuTitleFont = "-*-helvetica-bold-r-normal-*-12-*,-*-*-medium-r-normal-*-14-*";
MenuTextFont = "-*-helvetica-medium-r-normal-*-12-*,-*-*-medium-r-normal-*-14-*";
IconTitleFont = "-*-helvetica-medium-r-normal-*-8-*,-*-*-medium-r-normal-*-12-*";
ClipTitleFont = "-*-helvetica-bold-r-normal-*-10-*,-*-*-medium-r-normal-*-12-*";
DisplayFont = "-*-helvetica-medium-r-normal-*-12-*,-*-*-medium-r-normal-*-12-*";
and in ~/G/D/WMGLOBAL:
SystemFont = "-*-*-medium-r-normal-*-%d-*-*-*-*-*-*-*";
BoldSystemFont = "-*-*-medium-r-normal-*-%d-*-*-*-*-*-*-*";
The above 2 fonts are only used by applications that use WINGs (WindowMaker
and WPrefs.app)
The wsetfont script that's supplied will allow you to change the font
settings in a easier way. Take a look in the script for details on usage.

604
INSTALL.cs Normal file
View File

@@ -0,0 +1,604 @@
Instrukce pro instalaci okenního manažera Window Maker
PODPOROVANÉ PLATFORMY
=====================
("Podporované" znamená, že už to na dané platformě někdo zprovoznil...)
- Intel GNU/Linux Conectiva 5.9 (beta)
- Intel GNU/Linux Slackware
- Intel GNU/Linux Debian
- Intel GNU/Linux ostatní distribuce
- Sparc GNU/Linux RedHat 5.1
- PowerPC GNU/MkLinux
- Alpha GNU/Linux RedHat 5.1
- FreeBSD
- NetBSD
- OpenBSD
- BSDI 4.0
- Solaris 2.5.1, 2.5.2
- Solaris 2.6.0
- Solaris 2.7beta
- SCO Unix
- SGI Irix 5.x, 6.5
- OSF/1
- HP-UX
- AIX 3.2.5
- AIX 4.1.4 / IBM PowerPC
- AIX 4.3.1 / IBM CC compiler
- AIX 4.3.2 / IBM PowerPC
- AIX 5.3
- DEC Alpha/Digital UNIX 4.x
- XFree86 / OS/2
- Corel NetWinder
- SunOS 4.x
- PowerMac / Power MachTen 4.1.1 over MacOS
- Amiga 3000 running RedHat Linux 5.1 (Rawhide)
- IBM S/390 s Linuxem
- iBook s OS Darwin
Patche pro rozběhání na jiných platformách jsou vítané.
POŽADAVKY
=========
Následující software je potřebný/nezbytný pro běh Window Makeru:
- X11R6.x
Window Maker může být zkompilován na starších verzích X, jako
je X11R5 (Solaris) nebo X11R4 (OpenWindows), ale nebude to pracovat
100% spolehlivě. Na těchto systémech nebudou fungovat ikony
aplikací a budete mít problémy s používáním doku. Upgrade
uživatelských knihoven (Xlib, Xt atd.) zlepší tyto problémy pokud
nemůžete aktualizovat váš X server.
Následující software je potřebný ke zkompilování Window Makeru:
- Zákládní běžné věci
Když budete komplivat Window Maker, tak se ujistěte, že máte gcc
(nebo jiný ANCI C kompilátor) a nainstalované hlavičkové soubory
pro X. Hlavně pro začátečníky v Linuxu: musíte nainstalovat všechny
X-devel balíky a gcc. Jinak nebudete schopni zkompilovat žádný
program s grafickým rozhraním, tedy ani Window Maker.
- autoconf, automake a libtool
Tyto nástroje NEJSOU POTŘEBA, ale když máte jeden nebo dva nebo
všechny tři nainstalované, tak se UJISTĚTE, že máte přesně
následující VERZE:
autoconf 2.54
automake 1.4
libtool 1.4.2
Máte-li odlišnou verzi, tak ji dočasně přejmenujte, nebo ji rovnou
odinstalujte z vašeho systému. Pokud nebudete programovat, tak ji
stejně nebudete potřebovat, takže ji můžete bezpečně odinstalovat.
Pozn. libProblist už není potřeba ke zkompilování Window Makeru, protože
libProblist byl přímo zabudován do WINGs. Z toho důvodu už není
potřeba ani lex (flex) a yacc (nebo bison).
NEPOVINNÉ
=========
Tyto knihovny nejsou nutné pro běh Windo Makeru, ale jsou podporované, když
je budete chtít použít. Tyto verze jsou používané vývojovým týmem, který
garantuje, že budou fungovat. Ostatní verze by měli fungovat také.
- libXPM 4.7 nebo novější
Starší verze nemusí fungovat!!!
Dostupné na ftp://sunsite.unc.edu/pub/Linux/libs/X/
Je zde zabudovaná podpora pro soubory XPM, ale nenačte obrázky s
nestandardním formátem kódování.
- libpng 0.96 nebo novější a zlib
Pro podporu PNG obrázků
http://www.cdrom.com/pub/png/
- libtiff 3.4 nebo novější
Pro podporu TIFF obrázků
Dostupné na ftp://ftp.sgi.com/graphics/tiff
- libjpeg 6.0.1 nebo novější
Pro podporu JPEG obrázků
http://www.ijg.org/
- libgif 2.2 nebo libungif
Pro podporu GIF obrázků
Dostupné na ftp://prtr-13.ucsc.edu/pub/libungif/
-GNU xgettxt
Když chcete používat češtinu nebo jiné jazyky kromě angličtiny,
tak potřebujete GNU xgettext.
Ostatní verze nejsou kompatibilní a nebudou fungovat
GNU verze je dostupná na ftp://ftp.gnu.org
KONFIGURAČNÍ NASTAVENÍ
======================
Tyto volby mohou být předané konfiguračnímu skriptu jako argumenty za
účelem povolení/zakázání určité vlastnosti Window Makera.
Příklad:
./configura --enable-kde --enable-gnome
nakonfiguruje Window Maker s podporou KDE a GNOME
Seznam ostatních možností dostanete spuštěním ./configure --help
--with-libs-from
specifikuje, které další adresáře s knihovnami se mají
prohledávat. Řetězec -L musí předcházet každému adresáři,
např:
--with-libs-from="-L/opt/libs -L/usr/local/lib"
--with-incs-from
určuje, které další adresáře s hlavičkovými soubory se mají
prohledat. Řetězec -I musí předcházet každému adresáři,
např:
--with-incs-from="-I/opt/headers -I/usr/local/include"
--enable-single-icon
umožňuje skrýt všechny ikony aplikací WM_CLASS+WM_INSTANCE
do jedné jediné. Tato vlastnost není podporovaná ze strany vývojářů.
Když budete mít s touto funkcí problémy, tak se obraťte na jejího
autora: Christopher Seawood <cls@seawood.org>
--disable-shm
zakáže používání zdílené paměti MIT. To trochu zpomalí generování
textur, ale v některých případech se to jeví jako nezbytnost z důvodu
chyby, která způsobuje špatné zobrazování ikon a textur.
--disable-motif
zakáže podporu pokynů pro okenní manažer mwm.
--enable-lite
odstraní nástroje a funkce, které jsou už dostupné v desktopových
prosředích KDE a GNOME. Odstraní se: seznam oken, menu aplikací,
výběr více oken. Uvědomte si, že takto už nebudete schopni ukončit
samotný Window Maker pomocí aplikačního menu. Budete muset zabít Window
Maker z textové konzole nebo ho ukončit z KDE nebo GNOME.
Nedoporučuje se povolit tuto vlastnost.
--enable-modelock
podpora pro XKB nastavení jazyka. Když nevíte, o co jde, tak to
pravděpodobně nebudete potřebovat.
--enable-sound
povolí podporu modulu zvukových efektů.
--disable-xpm
zakáže podporu knihovny XPM, pokud je dostupná na vašem systému.
--disable-png
zakáže podporu knihovny PNG.
--disable-tiff
zakáže podporu knihovny TIFF.
--disable-gif
zakáže podporu knihovny GIF.
--disable-jpeg
zakáže podporu knihovny JPEG.
--disable-shape
zakáže tvarovaná okna (pro oclock, xeyes, atd.).
POŽADAVKY PRO SPECIFICKÉ PLATFORMY
==================================
-DEC/Alpha
Následující mail není přeložen, ale hovoří se v něm, že pravděpodobně
není potřeba konfigurovat Window Maker na Alphě s volbou --disable-shm.
-------------------------------------------------------------------------------
From: Anton Ivanov <aivanov@eu.level3.net>
To: Marcelo E. Magallon <mmagallo@debian.org>
Subject: Re: Is the WindowMaker package working ok on Alpha?
> Hi,
>
> I was reading some docs on the WindowMaker tarball, and found this:
>
> | - DEC/Alpha machines
> | You might need to pass the --disable-shm flag to configure,
> | like ./configure --disable-shm
>
> is anyone having problems with WindowMaker on Alpha? Can someone
> please test this? Should the flag be passed when building on Alpha?
Disclaimer: alphas under my command have never run X and are least likely to
suddenly start running it anytime soon.
Alpha used to have some ridiculously low amount of shared memory
configured.
So quite a lot of apps used to barf. Namely - cdrecord, mysql server, etc.
Check where is yours at the moment and raise it to a more appropriate
value by either catting to the appropriate /proc entry or changing the
/usr/src/linux/include/asm/shmparam.h.
Otherwise the shared memory on alpha should be fully functional and I
see no reason to disable it. Mine are bumped up to 32 or more on most
machines.
And If I recall correctly the comments in that file are actually
wrong. Value is not bytes, but in machine size word. For alpha *8.
As I said - I do not run X on them so all #include "stdisclaimer.h"
apply.
-------------------------------------------------------------------------------
- SCO Unix - configure spusťte takto:
CFLAGS="-belf -DANSICPP" ./configure
- SunOS, Solaris
Když máte naistalovaný gcc, tak configure spusťte takto:
CPP_PATH="gcc -E -x c" ./configure
Preprocesoru cpp od Sunu chybějí některé vlastnosti, které Window Maker
potřebuje, a to může způsobit problémy během parsování konfiguračních
souborů. Je možné, že budete muset použít --with-libs-from a
--with-incs-from k nahrazení adresáře s libtiff.
Někdo doporučuje použít /usr/local/lib jako první cestu v LD_LIBRARY_PATH.
Když máte Ultra Creator 3D nebo jinou high-end grafickou kartu, tak se
ujistěte, že X server startuje s 24 bitovou barevnou hloubkou, jinak
můžete mít problémy s pomícháním barev. Toto je chyba Window Makeru,
která bude odstraněna.
- GNU/Linux obecně
Ujistěte se, že soubor /etc/ld.so.conf obsahuje řádek "/usr/local/lib".
Odinstalujte jakoukoliv starší verzi balíčku Window Makeru před instalací
novější verze.
Nezapomeňte spustit ldconfig po instalaci Window Makeru.
- RedHat GNU/Linux
RedHat má několik obtěžujících chyb. Pokud ho používáte dodržujte několik
následujících kroků, jinak vám Window Maker nebude fungovat.
* pokud máte nainstalovaný Window Maker z distribuce RedHat, tak ho před
upgradem odinstalujte
* ujistěte se, že nemáte systémové proměnné LANG a LINGUAS nastavené
na en_RN
* ujistěte se, že vaše systémová proměnná PATH obsahuje položku
/usr/local/bin
* ujistěte se, že soubor /etc/ld.so.conf obsahuje řádek "/usr/local/lib"
před tím, než spustíte ldconfig (na konci instalace)
* pokud máte problémy, které se projevují chybovou hláškou, která
obsahuje text --no-reexec, tak odinstalujte libtool-1.2b a nainstalujte
si novější verzi libtool-1.3. libtool-1.3 můžete nalézt na adrese:
ftp.gnu.org . Přečtěte si také odstavec ŘEŠENÍ PROBLÉMÚ.
* pokud máte nainstalovaný balíček Window Maker od RedHatu a nyní
instalujete novou verzi "ručně" (kompilováním zdrojových kódů), tak
nejprve odinstalujte stávající balíček.
* ujistěte se, že se na vašem systému nachází symbolický link z
/usr/include/X11 na /usr/X11R6/include/X11. Pokud tomu tak není, tak
na příkazovou řádku napište:
ln -s /usr/X11R6/include/X11 /usr/include/X11
* ujistěte se, že máte symbolický link /lib/cpp ukazující na cpp
program
Pokud pochybujete o nějakém z předcházejích kroků, tak neváhejte
kontaktovat uživatelskou podporu distribuce RedHat. Oni vám laskavě
zodpoví všechny vaše dotazy zohledňující váš systém. Oni vědí
mnohem více o vašem (jejich) systému než my (my nepoužíváme
RedHat).
- PowerPC MkLinux
Budete potřebovat poslední verzi Xpma. Starší verze pravděpodobně
obsahují chybu, která způsobuje zamrznutí systému.
- Debian GNU/Linux
Pokud chcete podporu JPEG a TIFF, tak se ujistěte, že máte nainstalovány
balíčky libtiff-dev a libjpeg-dev.
- SuSE GNU/Linux
Pokud máte již nainstalován baliček Window Maker od SuSE, tak ho
odstraňte než se pustíte do kompilace Window Makeru. když tak
neučiníte, budete mít problémy.
- MetroX (neznámá verze)
Metrox obsahuje chybu, která zapřičiňuje, že obrázky, které jsou
nastaveny jako pozadí, jsou poškozeny. Pokud používáte Metrox a
máte podivné problémy s texturami, tak nepoužívejte textury v
titulcích nebo používejte jiný X server.
INSTALACE
=========
Nejjednodušší způsob, jak nainstalovat Window Maker, je spustit skript
Install nebo Install.cs (ten s vámi komunikuje česky). Oba skripty
vás jednoduše provedou celou instalací.
su
Install.cs
Poznámka: tato metoda neposkytuje všechny možnosti konfigurace a pokud
se setkáte s nějakými problémy, tak stejně budete muset
použít následující způsob kompilace.
Kompilace Window Makeru
-----------------------
Pro osvědčený způsob zadejte následující příkazy v shellu:
./configure
make
pak se přihlašte jako root a zadejte:
make install
ldconfig
pokud nejste programátor a nebudete ladit Window Maker, tak se můžete zbavit
ladících symbolů v binárních souborech a zmenšit jejich velikost:
make install-strip
ldconfig
Takto zkompilujete a nainstalujete Window Maker se standartními parametry.
Pokud chcete upravit některé vlastnosti, tak musíte učinit následující:
1. (volitelné) Podívejte se na část MOŽNOSTI KONFIGURACE, kde jsou
uvedené možnosti konfigurace. Nebo spusťte:
./configure --help
tak dostanete kompletní seznam všech dostupných možností konfigurace.
2. Spusťte ./configure s možností, kterou jste si vybrali. Například,
pokud chcete použít možnost --enable-kde, tak zadejte:
./configure --enable-kde
3. (volitelné) Otevřete soubor ./src/wconfig.h vaším oblíbeným editorem
a upravte některé možnosti, které si přejete změnit.
4. Kompilace. Zadejte pouze:
make
5. Přihlaste se jako root (pokud tak nemůžetet učinit, tak si přečtěte
část "Nemám rootovské helso :-(") a nainstalujte Window Maker na váš
systém:
su root
make install
Nastavení specifické pro uživatele
----------------------------------
Tyto instrukce nejsou povinné, pokud upgradujete Window Maker ze starší
verze na novější a pokud není uvedeno jinak v souboru NEWS.
Každý uživatel na vašem systému, který si přeje používat Window Maker musí
udělat následující:
1. Nainsatlovat konfigurační soubory Window Makeru do jeho domovského
adresáře:
wmaker.inst
wmaker.inst nainstaluje konfigurační soubory a nastaví X server tak,
aby automaticky spouštěl Window Maker při jejich spuštění.
To je všechno, přátelé.
Informace o konfiguraci a spoustě ostatních věcí vám poskytne:
man wmaker
Pro hlubší úvod do Window Makeru si přečtěte Uživatelskou příručku (User Guide).
Měli byste se také podívat na FAQ (Frequently Asked Questions = často kladené
otázky), pokud budete mít nějaké problémy/potíže jak při samotné kompilaci,
tak s užíváním Window Makeru.
Instalování speciálního balíčku
-------------------------------
Rozbalte WindowMaker-extra-<číslo_verze>.tar.gz v adresáři /usr/local/share
Tento soubor si můžete sehnat na adrese: ftp://ftp.windowmaker.info. Instalace
tohoto souboru vůbec není nutná. tento balíček obsahuje několik ikon a témat.
Hledejte poslední dostupnou verzi. V balíčku také naleznete soubor
WindowMaker-extra.readme, který vám poradí, co máte udělat.
Nemám rootovské helso :-(
-------------------------
Pokud nemáte superuživatelská privilegia (nemůžete se přihlásit jako root),
tak nezoufejte, protože můžete nainstalovat Window Maker do vašeho vlastního
domovského adresáře. K tomu musíte použít volbu --prefix při spuštění
./configure. Také musíte použít volbu --with-appspath, která specifikuje
cestu pro WPrefs.app.
Příklad:
./configure --prefix=/home/karel --with-appspath=/home/karel/GNUstep/Applications
Potom přidejte adresář /home/karel/bin do systémové proměnné PATH a adresář
/home/karel/lib do sytémové proměnné LD_LIBRARY_PATH a nakonec spusťte
~/bin/wmaker.inst.
Samozřejmě, že adresář /home/karel bude ve vašem případě nahrazen vaším
vlastním domovským adresářem.
UPGRADE
=======
Pokud upgradujete ze starší verze Window Makeru:
1. Nakonfigurujte a zkompilujte Window Maker jako obvykle.
2. Nainstalujte Window Maker (ale nespouštějte wmaker.inst).
3. Přečtěte si soubor NEWS a aktualizujte vaše konfigurační soubory,
pokud je to nezbytné.
ŘEŠENÍ PROBLÉMÚ
===============
Pokud máte nějaké problémy během konfigurace (když běží configure), jako
například neschopnost použít knihovnu grafického formátu, o kterém víte, že
ho máte nainstalován, tak se podívejte do souboru config.log. Možná zde
najdete příčinu svých problémů.
== Error with loading fonts, even if they exist.
Zkuste kompilaci bez podpory NLS (národního prostředí).
== Error when configuring
ltconfig: unrecognized option `--no-reexec'
Try `ltconfig --help' for more information.
configure: error: libtool configure failed
odstraňte volbu --no-reexec ze souboru aclocal.mc a spusťte znovu configure.
Také zkontrolujte, zda verze autoconfu a automaku, které máte nainsatlované
odpovídají níže uvedeným hodnotám:
autoconf 2.13
automake 1.4
libtool 1.3
Poznámka: nemůže to být libtool 1.2b, ale musí to být libtool 1.3 ze stránek
GNU.
== configure doesn't detect libtiff, or other graphic libraries.
Smažte soubor config.cache, pak znovu spusťte configure s následujícími
volbami (a jinými, které používáte):
--with-libs-from="-L/usr/local/lib"
--with-incs-from="-I/usr/local/include -I/usr/local/include/tiff"
Na příslušná místa vložte cesty k vaším grafickým knihovnám a odpovídajícím
hlavičkovým souborům. Můžete zadat několik cest do těchto voleb, jako je to
ve výše uvedeném příkladě --with-incs-from. Jenom je nezapomeňte oddělit
mezerou.
== configure doesn't detect libXpm.
* Zkontrolujte, jestli máte symbolický link ze souboru libXpm.so.4.9 na
soubor libXpm.so
== Segmentation fault on startup
* Zkontrolujte, jestli verze knihovny libXPM je vyšší než 4.7
* Zkontrolujte, zda-li máte upravenou verzi ~/GNUstep/Defaults/WindowMaker
Pokud si nejste jisti, tak zkuste přejmenovat ~/GNUstep na ~/GNUtmp a
spusťte wmaker.inst
== "...: your machine is misconfigured. gethostname() returned (none)"
* Jméno vašeho počítače je nastaveno nesprávně, protože začíná uvozovkami.
Spusťte man hostname a zde se dozvíte, jak změnit jméno vašeho počítače.
== The root menu contains only 2 entries. ("XTerm" and "Exit...")
* Window Maker nemůže nalézt cpp (preprocesor jazyka C). Pokud se váš cpp
nenachází v /lib/cpp, tak otevřte soubor src/config.h a nastavte správně
cestu CPP_PATH.
== checking lex output file root... configure: error: cannot find output from true; giving up
* Přečtěte si odstavec POŽADAVKY na začátku tohoto souboru.
MÍSTNÍ NASTAVENÍ / INTERNACIONALIZACE
=====================================
Window Maker má podporu národních jazyků. Aby jste ji povolili, tak
musíte zkompilovat Window Maker s několika dalšími parametry.
Seznam podporovaných jazyků naleznete v souboru ./po/README.
0 - Musíte mít nainstalovaný balíček GNU gettextu. Tento balíček
můžete nalézt na ftp://prep.ai.mit.edu/pub/gnu/gettext-nnn.tar.gz
Kroky 1,2 a 3 můžete vynechat, pokud používáte skript Install.cs nebo
skript Install.
1 - Vyberte si jazyky, které budete chtít používat. Zadejte seznam
těchto jazyků do systémové proměnné LINGUAS. Angličtina je
podporována vždy. Příklady
C - shell:
setenv LINGUAS "pt ja de"
Bash(sh):
export LINGUAS
LINGUAS="pt ja de"
Přečtěte si soubor po/README pokud chcete přeložit Window Maker
pro nějaký další jazyk.
2 - Navíc, pokud váš jazyk používá multi-byte znaky, například Japonština
nebo Korejština, tak musíte nastavit volbu the MultiByteText na YES
v souboru ~/GNUstep/Defaults/WMGLOBAL
3 - Nakonfigurujte, zkompilujte a nainstalujte Window Maker jako obvykle.
4 - Národní prostředí si můžete změnit i za běhu Window Makeru. Systémovou
proměnnou LANG nastavíte na vámi zvolenou hodnotu. Například, pokud
chcete použít portugalské prostředí, musíte spustit:
C - shell:
setenv LANG pt
Bourne shell a podobné:
export LANG
LANG=pt
Nakonec musíte restartovat/spustit Window Maker.
Poznámka: Když máte nastavenou systémovou proměnnou LC_TYPE, tak jí
musíte zrušit před spuštěním Window Makeru.
Window Maker hledá soubory s definicí menu v tomto pořadí (pro
brazilskou portugalštinu):
menu.pt_BR
menu.pt
menu
5 - Pokud si vyberete jazyk, který používá multi-byte znaky, tak musíte
příslušným způsobem nastavit fonty. Přečtěte si manuálové stránky
o XCreateFontSet k získání většího množství informací o daném
problému. Musíte změnit v souboru ~/GNUstep/Default/WindowMaker
nastavení fontů pro titulky, menu, atd. Fonty pro dialogy nastavíte
v souboru ~/GNUstep/Default/WMGLOBAL. Řetězce %d ve jménech fontů
nemusí být odstraněné. Také můžete použít skript wsetfont, který
toto vše učiní za vás. Pokud se ho rozhodnote použít, tak si k němu
přečtěte instrukce tak, že spustíte wsetfont bez argumentů.
Příklad části souboru ~/GNUstep/Default/WindowMaker:
WindowTitleFont = "-*-helvetica-bold-r-normal-*-12-*,-*-*-medium-r-normal-*-14-*";
MenuTitleFont = "-*-helvetica-bold-r-normal-*-12-*,-*-*-medium-r-normal-*-14-*";
MenuTextFont = "-*-helvetica-medium-r-normal-*-12-*,-*-*-medium-r-normal-*-14-*";
IconTitleFont = "-*-helvetica-medium-r-normal-*-8-*,-*-*-medium-r-normal-*-12-*";
ClipTitleFont = "-*-helvetica-bold-r-normal-*-10-*,-*-*-medium-r-normal-*-12-*";
DisplayFont = "-*-helvetica-medium-r-normal-*-12-*,-*-*-medium-r-normal-*-12-*";
a souboru ~/GNUstep/Default/WMGLOBAL:
SystemFont = "-*-*-medium-r-normal-*-%d-*-*-*-*-*-*-*";
BoldSystemFont = "-*-*-medium-r-normal-*-%d-*-*-*-*-*-*-*";
Tyto dva fonty jsou používány v aplikacích, které používají WINGs (WindowMaker a
WPrefs.app).
Skript wsetfont vám umožní nastavit fonty mnohem jednoduším způsobem. Podívejte
se na jeho manuálové stránku k získání bližších informací.

26
INSTALL.es
View File

@@ -69,7 +69,7 @@ Lo siguiente se necesita para compilar Window Maker:
compilar ningún programa X, incluyendo Window Maker. compilar ningún programa X, incluyendo Window Maker.
- libPropList - libPropList
Esta biblioteca se puede encontrar en ftp://ftp.windowmaker.org/pub/libs Esta biblioteca se puede encontrar en ftp://ftp.windowmaker.info/pub/libs
o en ftp://ftp.gnome.org/pub/libPropList o en ftp://ftp.gnome.org/pub/libPropList
Instálela antes de compilar Window Maker. Instálela antes de compilar Window Maker.
@@ -78,9 +78,9 @@ Lo siguiente se necesita para compilar Window Maker:
instaladas, asegúrese de tener TODO lo siguiente con estas versiones instaladas, asegúrese de tener TODO lo siguiente con estas versiones
exactas: exactas:
autoconf 2.13 autoconf 2.54
automake 1.4 automake 1.4
libtool 1.3 libtool 1.4.2
Si tiene una versión distinta, desactívelas temporalemte renombrándolas Si tiene una versión distinta, desactívelas temporalemte renombrándolas
a otras cosa o desinstalándolas desde su sistema. Si no desarrolla a otras cosa o desinstalándolas desde su sistema. Si no desarrolla
@@ -122,11 +122,6 @@ Estas bibliotecas no son necesarias para hacer que Window Maker funcione,
Para soporte de imagen GIF. Para soporte de imagen GIF.
ftp://prtr-13.ucsc.edu/pub/libungif/ ftp://prtr-13.ucsc.edu/pub/libungif/
- libHermes 1.3.2 o más actual
Para conversión a pixel más rápida en la biblioteca wraster.
(se usa solo en algunas conversiones - para visuales Color Verdadero)
http://www.clanlib.org/hermes/
- GNU xgettext - GNU xgettext
Si quiere usar mensajes traducidos, necesitará GNU gettext. Si quiere usar mensajes traducidos, necesitará GNU gettext.
Otras versiones de gettext no son compatibles y no funcionarán. Otras versiones de gettext no son compatibles y no funcionarán.
@@ -170,15 +165,6 @@ Para obtener una lista de otras opciones, ejecute ./configure --help
--disable-motif --disable-motif
desactiva el soporte para el gestor de ventanas mwm. desactiva el soporte para el gestor de ventanas mwm.
--enable-openlook
activa el soporte para el gestor de ventanas OPEN LOOK(tm)
--enable-gnome
activa el soporte para el gestor de ventanas GNOME.
--enable-kde
activa el soporte para el gestor de ventanas kde/kwm.
--enable-lite --enable-lite
quita cosas que ya están soportadas en los entornos de escritorio, quita cosas que ya están soportadas en los entornos de escritorio,
tal como KDE y Gnome. Desactiva cosas como: lista de ventanas, tal como KDE y Gnome. Desactiva cosas como: lista de ventanas,
@@ -235,8 +221,8 @@ Subject: Re: El paquete WindowMaker funciona bien en Alpha?
> por favor probar esto? Debería el parámetro ser pasado al compilar > por favor probar esto? Debería el parámetro ser pasado al compilar
> en Alpha? > en Alpha?
Descargo de responsabilidad: alphas bajo mi mando nunca han ejecutado X y are Descargo de responsabilidad: alphas bajo mi mando nunca han ejecutado X
least likely to suddenly start running it anytime soon. y es poco probable de que las ejecute repentinamente en algún momento.
Alpha suele tener alguna ridícula poca cantidad de memoria compartida Alpha suele tener alguna ridícula poca cantidad de memoria compartida
configurada. configurada.
@@ -427,7 +413,7 @@ opci
También necesitará proporcionar la opción --with-appspath, para especificar la ruta También necesitará proporcionar la opción --with-appspath, para especificar la ruta
para WPrefs.app. Ejemplo: para WPrefs.app. Ejemplo:
./configure --prefix=/home/jshmoe --with-appspath=/home/jshmoe/GNUstep/Apps ./configure --prefix=/home/jshmoe --with-appspath=/home/jshmoe/GNUstep/Applications
Luego haga /home/jshmoe/bin para que se lo incluya en su ruta de búsqueda, agregue Luego haga /home/jshmoe/bin para que se lo incluya en su ruta de búsqueda, agregue
/home/jshmoe/lib a su variable de entorno LD_LIBRARY_PATH y ejecute bin/wmaker.inst /home/jshmoe/lib a su variable de entorno LD_LIBRARY_PATH y ejecute bin/wmaker.inst

631
INSTALL.fr Normal file
View File

@@ -0,0 +1,631 @@
Instructions pour l'installation de Window Maker
PLATEFORMES SUPPORTÉES
======================
(c.à.d. : j'ai entendu dire que la compilation a été réalisée avec succès sur..)
- Intel GNU/Linux Conectiva 5.9 (beta)
- Intel GNU/Linux Slackware
- Intel GNU/Linux Debian
- Intel GNU/Linux (autres)
- Sparc GNU/Linux RedHat 5.1
- PowerPC GNU/MkLinux
- Alpha GNU/Linux RedHat 5.1
- FreeBSD
- NetBSD
- OpenBSD
- BSDI 4.0
- Solaris 2.5.1, 2.5.2
- Solaris 2.6.0
- Solaris 2.7beta
- Solaris 2.8 sur Ultra Sparc 10 et E450
- SCO Unix
- SGI Irix 5.x, 6.5
- OSF/1
- HP-UX
- AIX 3.2.5
- AIX 4.1.4 / IBM PowerPC
- AIX 4.3.1 / IBM CC compiler
- AIX 4.3.2 / IBM PowerPC
- AIX 5.3
- DEC Alpha/Digital UNIX 4.x
- XFree86 / OS/2
- Corel NetWinder
- SunOS 4.x
- PowerMac / Power MachTen 4.1.1 sous MacOS
- Amiga 3000 sous RedHat Linux 5.1 (Rawhide)
- IBM S/390 sous Linux
- IBM S/390 sous Conectiva Linux (experimental)
- iBook sous Darwin
- Windows NT sous Cygwin/XFree86
- Sony PlayStation2 sous Linux
Toutes les marques déposées sont la propriété de leur propriétaire.
Tout patch qui pourrait faciliter l'adaptation à d'autres plateformes
est le bienvenu.
PRÉ-REQUIS
==========
Les logiciels suivants sont nécessaires à l'utilisation de Window Maker :
- X11R6.x
Window Maker peut être compilé avec des versions plus anciennes de X,
comme X11R5 (Solaris) ou X11R4 (OpenWindows), mais il ne fonctionnera
pas correctement à 100%.
Avec ces serveurs X, les icônes des applications n'apparaîtrons pas,
et vous aurez des problèmes à l'utilisation du dock. La mise à jour
des librairies côté client (Xlib, Xt, etc.) pourront améliorer les
choses si vous ne pouvez pas mettre à jour le serveur.
Les éléments suivants sont nécessaires à la compilation de Window Maker :
- pré-requis de base
Pour compiler Window Maker, assurez-vous que gcc (ou tout autre
compilateur de C ANSI) ainsi que les fichiers d'en-têtes de X sont
installés. Débutants sous Linux : vous devez installer les paquetages
de développement de X ainsi que ceux de la suite gcc. Le cas contraire,
vous ne pourrez jamais compiler aucun programme prévu pour X, y compris
Window Maker.
- autoconf, automake et libtool
Ces outils ne sont pas indispensables, mais si au moins l'un d'eux
est installé sur votre système, assurez-vous que TOUS le sont, et
que les versions de ces outils sont exactement :
autoconf 2.54
automake 1.4
libtool 1.4.2
Si les versions installées sur votre système différent, désactivez-les
provisoirement, par exemple en les renommant, ou en les désinstallant
de votre système. Si vous ne développez ni de compilez de logiciels,
vous n'en avez pas besoin et leur désinstallation n'est donc pas un
problème.
OPTIONNEL
=========
Ces librairies ne sont pas nécessaires pour utiliser Window Maker, mais
elles sont supportées, au cas où vous souhaiteriez les utiliser. Les
versions ci-dessous sont celles dont je dispose (et du coup, il est
garanti qu'elles fonctionnent), mais des versions différentes peuvent
fonctionner aussi bien.
- libXPM 4.7 ou plus récent
Les versions plus anciennes peuvent ne pas fonctionner !!!
Disponible sur ftp://sunsite.unc.edu/pub/Linux/libs/X/
Le support des fichiers XPM est intégré, mais il ne prendra
pas en compte les images dont le format est exotique.
- libpng 0.96 ou plus récent, et zlib
Pour pouvoir utiliser les images au format PNG.
http://www.cdrom.com/pub/png/
- libtiff 3.4 ou plus récent
Pour pouvoir utiliser les images au format TIFF.
Vous trouverez ça ici : ftp://ftp.sgi.com/graphics/tiff
- libjpeg 6.0.1 ou plus récent
Pour pouvoir utiliser les images au format JPEG.
http://www.ijg.org/
- libgif 2.2 ou libungif
Pour pouvoir utiliser les images au format GIF.
ftp://prtr-13.ucsc.edu/pub/libungif/
- GNU xgettext
Si vous voulez disposer des traductions en d'autres langues, GNU gettext
est nécessaire. Les autres versions de gettext sont incompatibles et ne
fonctionneront pas.
Vous trouverez la version GNU sur ftp://ftp.gnu.org
OPTIONS DE CONFIGURATION
========================
Ces options peuvent être passées au script de configuration afin d'activer
ou désactiver des fonctionnalités de Window Maker. Par exemple :
./configure --enable-kde --enable-gnome
configurera Window Maker avec le support intégré pour KDE et GNOME.
Afin d'obtenir la liste des autres options, exécutez ./configure --help
--with-libs-from
ajoute des chemins d'accès pour la recherche des librairies.
L'option -L doit précéder chaque chemin d'accès, comme suit :
--with-libs-from="-L/opt/libs -L/usr/local/lib"
--with-incs-from
ajoute des chemins d'accès pour la recherche des fichiers d'en-tête.
L'option -I doit précéder chaque chemin d'accès, comme suit :
--with-incs-from="-I/opt/headers -I/usr/local/include"
--enable-single-icon
active le regroupement des toutes les appicons des WM_CLASS et WM_INSTANCE
en une seule icône. Aucun support n'est offert par les développeurs pour
cette fonctionnalité. Si vous avez des problèmes avec celle-ci, contactez
son auteur :
Christopher Seawood <cls@seawood.org>
--disable-shm
désactive l'utilisation de l'extension "MIT shared memory". Cela ralentira
un petit peu la génération des textures, mais il semble que cela soit
nécessaire dans certains cas pour éviter un bogue se manifestant au niveau
des icônes et des textures.
--disable-motif
désactive le support pour les fonctionnalités en rapport avec le gestionnaire
de fenêtres mwm.
--enable-lite
désactive des fonctionnalités déjà prises en compte par les gestionnaires de
bureau tels que KDE et GNOME. Celà concerne : la liste de fenêtres, le menu
des applications, la sélection multiple de fenêtres. Attention : vous ne
pourrez plus sortir de Window Maker autrement qu'en utilisant kill avec le
signal SIGTERM ou en quittant à l'aide de KDE. Il n'est pas conseillé
d'utiliser cette option.
--enable-modelock
active le support pour le verrouillage du "XKB language status". Si vous ne
savez pas de quoi il retourne, c'est probablement que vous n'en avez pas
utilité.
--enable-sound
active le support pour le module de gestion des effets sonores.
--disable-xpm
désactive l'utilisation de la librairie XPM même si elle est présente
sur votre système.
--disable-png
désactive l'utilisation de la librairie PNG.
--disable-tiff
désactive l'utilisation de la librairie TIFF.
--disable-gif
désactive l'utilisation de la librairie GIF.
--disable-jpeg
désactive l'utilisation de la librairie JPEG.
--disable-shape
désactive l'utilisation de "shaped windows" (pour oclock, xeyes, etc.).
NOTES SPÉCIFIQUES AUX PLATEFORMES
=================================
- machines DEC/Alpha
#>>>>>>>>>>>
De : Anton Ivanov <aivanov@eu.level3.net>
A : Marcelo E. Magallon <mmagallo@debian.org>
Sujet : Re : Est-ce que le paquetage WindowMaker fonctionne correctement sur Alpha?
> Salut,
>
> Je lisais la doc contenue dans l'archive de WindowMaker, quand je suis
> tombé sur ça :
>
> | - machines DEC/Alpha
> | Il est possible que vous deviez utiliser l'option --disable-shm pour
> | configurer la compilation, comme suit :
> | ./configure --disable-shm
>
> est-ce que quelqu'un a eu des problèmes avec WindowMaker sur Alpha? Est-ce
> que quelqu'un peut tester cela? Doit-on vraiment utiliser cette option
> pour compiler sur Alpha?
Notez bien : les Alphas dont je me sers ne sont jamais sous X et ne sont pas près
de l'être.
Bien souvent, la configuration des Alphas n'inclut qu'un volume ridiculement
petit de mémoire partagée. Aussi il n'est pas étonnant qu'un grand nombre
d'applications comme cdrecord ou mysql server plantent carrément.
Vérifiez ces réglages sur votre système et modifiez-les en conséquent :
pour cela, manipulez l'entrée appropriée dans /proc ou modifiez le fichier
/usr/src/linux/include/asm/shmparam.h.
En dehors de ce cas, la mémoire partagée sous Alpha est sensée ne pas
poser de problème et je ne vois aucune raison de la désactiver.
Pour ma part, elle est à 32 ou plus sur la pluspart des machines.
De plus, si ma mémoire est exacte, les commentaires dans ce fichier
sont tout à fait inexacts. La valeur n'est pas exprimée en octets, mais en
mots, dépendant de la machine. Pour les Alphas, c'est donc *8.
Je rappelle que je n'utilise pas X sur ces machines, donc ce que j'indique
est soumis à toutes les réserves habituelles. (#include "standard_disclaimer.h")
#<<<<<<<<<<<<
- SCO Unix
Lancez configure comme suit :
CFLAGS="-belf -DANSICPP" ./configure
- SunOS, Solaris
Si gcc est installé, lancez configure comme suit :
CPP_PATH="gcc -E -x c" ./configure
Le cpp de Sun ne dispose pas de certaines fonctionnalités nécessaire pour
Window Maker et cela peut occasionner des problèmes avec l'utilisation des
fichiers de configuration.
Il peut être aussi nécessaire d'indiquer le chemin d'accès à la librairie
libtiff en utilisant les options --with-libs-from et --with-incs-from
avec configure.
Quelqu'un m'a rapporté qu'il est nécessaire de faire figurer /usr/local/lib
en premier dans la variable d'environnement LD_LIBRARY_PATH.
Si vous utilisez un Ultra Creator 3D ou une autre machine graphique
de haut niveau, faites en sorte de démarrer le serveur X avec le mode
graphique par défaut à 24bpp sinon vous pourriez constaer des problèmes
au niveau des couleurs.
C'est une bogue répertorié au niveau de Window Maker, il sera corrigé.
- GNU/Linux en général
Assurez-vous que /usr/local/lib figure dans /etc/ld.so.conf et que vous
avez lancé ldconfig après l'installation.
Désinstallez tout précédent paquetage de Window Maker avant d'installer
une nouvelle version.
- RedHat GNU/Linux
Il peut y avoir plusieurs problèmes ennuyeux sur les systèmes RedHat.
Voici la marche à suivre sous peine de ne pouvoir utiliser Window Maker
sur ces systèmes :
* si la version de Window Maker livrée avec RedHat est installée,
désinstallez-la avant de mettre à jour votre système;
* assurez-vous que ni la variable d'environnement LANG ni LINGUAS ne
contiennent "en_RN";
* vérifiez que /usr/local/bin est présent dans votre variable d'environnement
PATH;
* il faut que /usr/local/lib soit dans /etc/ld.so.conf avant de lancer
ldconfig;
* si vous rencontrez des messages d'erreur en rapport avec "--no-reexec",
désinstallez libtool-1.2b et installez libtool-1.3.
libtool-1.3 peut être trouvé sur ftp.gnu.org.
Consultez aussi la section PROBLÈMES;
* si vous aviez auparavant installé le paquetage de Window Maker livré
avec RedHat et que vous voulez installer maintenant manuellement une nouvelle
version, vous devez au préalable désinstaller le paquetage provenant de la
RedHat;
* assurez-vous qu'il existe un lien symbolique de from /usr/include/X11 vers
/usr/X11R6/include/X11 (le cas échéant, lancez cette commande :
ln -s /usr/X11R6/include/X11 /usr/include/X11);
* assurez-vous que /lib/cpp pointe bien vers le programme cpp
Si vous avez un doute concernant quoi que ce soit de relatif à l'installation
de Window Maker sur une RedHat, n'hésitez pas à contacter le support
utilisateur de RedHat. Ils vous renseigneront toujours et tenteront de vous
dépanner dans l'utilisation et la configuration de votre système RedHat.
D'un autre côté, ils sont plus au fait que nous pour tout ce qui est relatif
aux RedHat (nous n'en utilisons pas).
- PowerPC MkLinux
Installez la version la plus récente de Xpmac. Les versions plus
anciennes semblent contenir un bogue qui est susceptible de bloquer
le système.
- Debian GNU/Linux
Si vous voulez bénéficier du support des fichier JPEG et TIFF,
assurez-vous que les paquetages libtiff-dev et libjpeg-dev sont installés.
- SuSE GNU/Linux
Désinstallez tout précédent paquetage de Window Maker avant d'installer
une nouvelle version. Le cas échéant, vous pourriez rencontrer des
problèmes.
- MetroX (version indéterminée)
MetroX contient un bogue qui corrompt les pixmaps utilisées en fond
de fenêtres. Si vous utilisez MetroX et rencontrer des problèmes
avec les textures, n'utilisez pas les textures dans les barres de titre,
ou bien utilisez un autre serveur X.
INSTALLATION
============
Compiler Window Maker
---------------------
Pour aller vite, tapez ce qui suit dans un prompt shell :
./configure
make
puis, loguez-vous en tant que root and tapez :
make install
ldconfig
ou, si vous voulez ôter les infos de débogage des exécutables et ainsi les
rendre plus petits, tapez plutôt :
make install-strip
ldconfig
Tout ceci compile et installe Window Maker avec les réglages par défaut.
Maintenant, si vous voulez personnaliser des options de compilation, vous
pouvez faire :
1. (optionnel) Consulter la section OPTIONS DE CONFIGURATION
dans ce même fichier. Exécutez aussi :
./configure --help
pour avoir la liste des autres options disponibles.
2. Lancez configure avec les options choisies. Par exemple, si vous voulez
utiliser l'option --enable-kde, tapez :
./configure --enable-kde
3. (optionnel) Éditez src/wconfig.h avec votre éditeur de texte favori et
et modifiez sont contenu à votre guise.
4. Compilez. Il faut juste taper :
make
5. Loguez-vous en tant que root (si vous ne pouvez pas le faire, lisez le
paragraphe "Je n'ai pas le mot de passe de root :-(") et installez
Window Maker sur votre système :
su root
make install
Réglages pour un utilisateur
----------------------------
Ces instructions suivantes ne sont pas nécessaires si vous mettez à jour
Window Maker à partir d'une version plus ancienne, à moins que ce soit
précisé dans le fichier NEWS.
Chaque utilisateur qui veut utiliser Window Maker sur votre système doit
faire ce qui suit :
1. Installer les fichiers de configuration de Window Maker dans son
répertoire personnel.
Pour ceci, il doit taper :
wmaker.inst
wmaker.inst installera les fichiers de configuration de Window Maker
pour l'utilisateur et configurera ses paramètres de X de façon à ce que
Window Maker soit automatiquement lancé au démarrage de X.
C'est tout!
Vous pouvez aussi taper "man wmaker" afin d'obtenir plus de renseignements
sur la configuration et d'autres sujets.
Consultez le Guide de l'utilisateur afin d'obtenir des informationss plus
en détail sur Window Maker.
Pourquoi ne pas aussi jeter un oeil aux FAQs..
Installation du paquetage additionnel
-------------------------------------
Décompressez WindowMaker-extra-<version-number>.tar.gz dans /usr/local/share
Vous trouverez le fichier sur ftp://ftp.windowmaker.info. Ce paquetage est optionnel,
il contient des icônes et des thèmes supplémentaires. Vérifiez que vous avez
bien la derniere version de ce paquetage.
Il y a aussi un fichier WindowMaker-extra.readme qui indique comment procéder à
l'installation de ce paquetage.
Je n'ai pas le mot de passe de root :-(
---------------------------------------
Si vous n'avez pas acc-s aux privilèges du super-utilisateur (root), vous pouvez
installer Window Maker dans votre répertoire personnel. Pour ce faire, ajoutez
l'option --prefix correctement renseignée au moment de l'exécution de ./configure
(étape 2 de la compilation de Window Maker).
Il est aussi nécessaire d'utiliser l'option --with-appspath, afin de préciser
le chemin d'accès à WPrefs.app. Par exemple :
./configure --prefix=/home/jshmoe --with-appspath=/home/jshmoe/GNUstep/Applications
Puis, faites en sorte que /home/jshmoe/bin soit inclus dans votre PATH, ajoutez
/home/jshmoe/lib à votre variable d'environnement LD_LIBRARY_PATH puis lancez
bin/wmaker.inst
Bien sûr, /home/jshmoe est supposé être remplacé par votre répertoire personnel.
MISE À JOUR
===========
Si vous mettez à jour une version plus ancienne de Window Maker :
1. Configurez et compilez Window Maker comme d'habitude
2. Installez Window Maker (mais n'exécutez pas wmaker.inst)
3. Consultez le fichier NEWS et mettez à jour vos fichiers de configuration
si nécessaire.
PROBLÈMES
=========
Si vous rencontrez des problèmes pendant la phase de configuration, comme par
exemple l'impossibilité d'utiliser une librairie de manipulation de format
graphique alors que vous pensez qu'elle est installée, jetez un oeil au contenu
du fichier config.log, vous y trouverez peut-être des indices pour résoudre
ce problème.
== erreur de chargement de polices, alors qu'elles existent
Essayez de recompiler sans le support pour le NLS.
== erreur à la configuration
ltconfig: unrecognized option `--no-reexec'
Try `ltconfig --help' for more information.
configure: error: libtool configure failed
Otez l'option --no-reexec du fichier aclocal.m4 et relancer la configuration.
Assurez vous aussi que les versions d'autoconf et d'automake correspondent bien
aux pré-requis :
autoconf 2.13
automake 1.4
libtool 1.3
Notez bien que ce ne doit PAS être libtool 1.2b, mais libtool bien 1.3,
disponible sur les sites GNU.
== configure ne trouve pas libtiff ou une autre librairie graphique
Effacez le fichier config.cache, et exécutez à nouveau configure avec les options
suivantes (en plus des options que vous utilisiez déjà) :
--with-libs-from="-L/usr/local/lib"
--with-incs-from="-I/usr/local/include -I/usr/local/include/tiff"
Insérez les chemins d'accès aux librairies graphiques et à leurs fichiers d'en-tête.
Plusieurs chemins d'accès peuvent être ajoutés pour chacune de ces options,
comme montré pour --with-incs-from. Séparez-les juste par un espace.
== configure ne trouve pas libXpm
* Vérifiez que vous avez un lien sympbolique de libXpm.so.4.9 vers libXpm.so
== segmentation fault au démarrage
* Vérifiez que la version de libXPM qui est installée est au moins 4.7.
* Vérifiez que votre fichier ~/GNUstep/Defaults/WindowMaker est à jour.
Si vous n'en êtes pas sûr, renommez ~/GNUstep en ~/GNUtmp et lancez wmaker.inst.
== "...: your machine is misconfigured. gethostname() returned (none)"
* Le nom d'hôte de votre machine n'est pas indiqué ou est invalide (il commence
par une parenthèse par exemple). Consultez les pages du manuel (man hostname) pour
savoir comment le positionner correctement.
== Le menu des applications ne contient que 2 entrées ("XTerm" et "Exit...")
* Window Maker ne trouve pas cpp (le preprocesseur de C). Si votre cpp n'est pas situé
dans /lib/cpp, editez src/config.h et modifiez le chemin d'accès dans CPP_PATH en conséquent.
== checking lex output file root... configure: error: cannot find output from true; giving up
* Consultez la section PRE-REQUIS dans ce même fichier.
LOCALES/INTERNATIONALISATION
============================
Window Maker supporte les langues étrangères. Pour activer cette fonctionalité,
vous devez compiler Window Maker avec des paramètres supplémentaires.
0 - GNU gettext doit être installé. Il peut être trouvé ici :
ftp://prep.ai.mit.edu/pub/gnu/gettext-nnn.tar.gz
Vous pouvez passer à l'étape 4 si vous utilisez le script Install.
1 - Il vous faut choisir les langues que vous voulez rendre disponible. Modifiez
pour cela la liste des codes de nationalité dans LINGUAS. L'anglais est inclus
de façon implicite dans cette liste. Par exemple :
setenv LINGUAS "pt ja de"
sous csh
ou
export LINGUAS;LINGUAS="pt ja de"
sous sh
La liste de tous les codes de nationalité peut être trouvée dans po/README.
L'anglais est la langue par défault.
Lisez po/README si vous souhaitez traduire ou maintenir les fichiers propres
à d'autres adaptations nationales.
2 - De plus, si votre langue utilise des caractères multi-octets, comme
le japonais ou le coréen, vous devez vous assurer que l'option MultiByteText est à YES
dans ~/GNUstep/Defaults/WMGLOBAL.
3 - Configurez, compilez et installez Window Maker normalement.
4 - Pour choisir une langue particulière à l'exécution, vous devez positionner la variable
d'environnement LANG avec la valeur correspondant au code de nationalité adéquat.
Par exemple, si vous voulez utiliser le portugais, vous devez faire :
setenv LANG pt
sous csh ou
export LANG; LANG=pt
sous Bourne sh et apparentés
Note : si la variable d'environnement LC_CTYPE est positionnée, vous devez l'ôter de
l'environnement (unset LC_CTYPE), avant d'exécuter Window Maker.
En ce qui concerne les fichiers de configuration des menus, Window Maker procède
à une recherche suivant cet ordre (pour le portugais brésilien, dans ce cas) :
menu.pt_BR
menu.pt
menu
5 - Si vous choisissez une langue qui utilise les caractères multi-octets, vous
devez configurer les polices de façon adéquate. Consultez pour cela les pages
de manuel de XCreateFontSet. Vous devez modifier dans votre fichier ~/G/D/WindowMaker
les polices utilisées dans les titres, menus et autres. En ce qui concerne les polices
utilisées dans les boîte de dialogue, modifiez ~/G/D/WMGLOBAL.
Le %d dans la définition des polices ne doit PAS être enlevé. Vous pouvez aussi utiliser
le script wsetfont, fourni à ces fins.
Consultez le script lui-même pour en connaître les instructions.
Par exemple, vous pouvez mettre ceci dans ~/G/D/WindowMaker :
WindowTitleFont = "-*-helvetica-bold-r-normal-*-12-*,-*-*-medium-r-normal-*-14-*";
MenuTitleFont = "-*-helvetica-bold-r-normal-*-12-*,-*-*-medium-r-normal-*-14-*";
MenuTextFont = "-*-helvetica-medium-r-normal-*-12-*,-*-*-medium-r-normal-*-14-*";
IconTitleFont = "-*-helvetica-medium-r-normal-*-8-*,-*-*-medium-r-normal-*-12-*";
ClipTitleFont = "-*-helvetica-bold-r-normal-*-10-*,-*-*-medium-r-normal-*-12-*";
DisplayFont = "-*-helvetica-medium-r-normal-*-12-*,-*-*-medium-r-normal-*-12-*";
et dans ~/G/D/WMGLOBAL :
SystemFont = "-*-*-medium-r-normal-*-%d-*-*-*-*-*-*-*";
BoldSystemFont = "-*-*-medium-r-normal-*-%d-*-*-*-*-*-*-*";
Les 2 polices ci-dessus sont uniquement utilisées par les applications qui utilisent
WINGs (Window Maker et WPrefs.app).
Le script wsetfont inclus vous permettra de changer les réglages des polices de
façon plus aisée. Consultez-le afin d'obtenir plus d'informations.

19
INSTALL.pt
View File

@@ -61,16 +61,16 @@ Para compilar o Window Maker voc
programa X, incluindo o Window Maker. programa X, incluindo o Window Maker.
- libPropList - libPropList
Você pode achar esta biblioteca em ftp://ftp.windowmaker.org/pub/libs ou Você pode achar esta biblioteca em ftp://ftp.windowmaker.info/pub/libs ou
ftp://ftp.gnome.org/pub/libPropList. Você deve instalar corretamente ftp://ftp.gnome.org/pub/libPropList. Você deve instalar corretamente
esta biblioteca antes de instalar o Window Maker. esta biblioteca antes de instalar o Window Maker.
- autoconf, automake and libtool - autoconf, automake and libtool
Estes pacotes não são necessários, mas se você tiver um ou mais deles instalados, Estes pacotes não são necessários, mas se você tiver um ou mais deles instalados,
verifique se todos eles são das seguintes versões: verifique se todos eles são das seguintes versões:
autoconf 2.13 autoconf 2.54
automake 1.4 automake 1.4
libtool 1.3 libtool 1.4.2
Se você possui uma versão diferente, desative-os mudando os nomes dos arquivos Se você possui uma versão diferente, desative-os mudando os nomes dos arquivos
para outra coisa ou removendo-os do seu sistema. Se você não desenvolve para outra coisa ou removendo-os do seu sistema. Se você não desenvolve
software você não precisa deles, logo, você pode desinstalá-los com segurança. software você não precisa deles, logo, você pode desinstalá-los com segurança.
@@ -155,15 +155,6 @@ Para obter uma lista com outras opcoes, execute ./configure --help:
--disable-motif --disable-motif
Desativa compatibilidade com gerenciador de janelas mwm. Desativa compatibilidade com gerenciador de janelas mwm.
--enable-openlook
Ativa compatibilidade com gerenciador de janelas OPEN LOOK(tm).
--enable-gnome
Ativa compatibilidade com gerenciador de janelas GNOME.
--enable-kde
Ativa compatibilidade com gerenciador de janelas kde/kwm.
--enable-lite --enable-lite
Remove coisas que já são suportadas em ambientes desktops como o KDE Remove coisas que já são suportadas em ambientes desktops como o KDE
e o GNOME. As opções desativadas são: lista de janelas (window list), menu de e o GNOME. As opções desativadas são: lista de janelas (window list), menu de
@@ -291,7 +282,7 @@ INSTALA
Desempacote o WindowMaker-extra-<numero-da-versao>.tar.gz no /usr/local/share. Desempacote o WindowMaker-extra-<numero-da-versao>.tar.gz no /usr/local/share.
Você pode pegar o arquivo no site ftp://ftp.windowmaker.org. Este arquivo Você pode pegar o arquivo no site ftp://ftp.windowmaker.info. Este arquivo
é opcional e possui alguns ícones e temas. Procure pelo último <número-da-versão> é opcional e possui alguns ícones e temas. Procure pelo último <número-da-versão>
disponível. disponível.
Ainda há o WindowMaker-extra.readme para instruí-lo sobre onde o pacote deve ir. Ainda há o WindowMaker-extra.readme para instruí-lo sobre onde o pacote deve ir.
@@ -382,7 +373,7 @@ Compilando o Window Maker.
Você ainda precisará fornecer a opção --with-appspath, para especificar o Você ainda precisará fornecer a opção --with-appspath, para especificar o
caminho do WPrefs.app. Exemplo: caminho do WPrefs.app. Exemplo:
./configure --prefix=/home/jshmoe --with-appspath=/home/jshmoe/GNUstep/Apps ./configure --prefix=/home/jshmoe --with-appspath=/home/jshmoe/GNUstep/Applications
Depois faça com que /home/jshome/bin seja incluído na variável PATH, adicione Depois faça com que /home/jshome/bin seja incluído na variável PATH, adicione
/home/jshome/lib na variável de ambiente LD_LIBRARY_PATH e rode bin/wmaker.inst /home/jshome/lib na variável de ambiente LD_LIBRARY_PATH e rode bin/wmaker.inst

19
INSTALL.sk
View File

@@ -64,16 +64,16 @@ Nasledovn
Window Maker. Window Maker.
- libPropList - libPropList
Túto kni¾nicu mo¾no nájs» na ftp://ftp.windowmaker.org/pub/libs alebo Túto kni¾nicu mo¾no nájs» na ftp://ftp.windowmaker.info/pub/libs alebo
ftp://ftp.gnome.org/pub/libPropList. Nain¹talujte ju pred kompiláciou ftp://ftp.gnome.org/pub/libPropList. Nain¹talujte ju pred kompiláciou
Window Makera. Window Makera.
- autoconf, automake a libtool - autoconf, automake a libtool
Tieto nástroje NIE sú potrebné, ale ak máte niektoré z nich nain¹talo- Tieto nástroje NIE sú potrebné, ale ak máte niektoré z nich nain¹talo-
vané, uistite sa, ¾e V©ETKY sú presne nasledovné verzie: vané, uistite sa, ¾e V©ETKY sú presne nasledovné verzie:
autoconf 2.13 autoconf 2.54
automake 1.4 automake 1.4
libtool 1.3 libtool 1.4.2
Ak máte odli¹né verzie, odin¹talujte ich alebo ich doèasne premenujte. Ak máte odli¹né verzie, odin¹talujte ich alebo ich doèasne premenujte.
Ak neprogramujete, nebudete ich potrebova» a teda ich mô¾ete Ak neprogramujete, nebudete ich potrebova» a teda ich mô¾ete
odin¹talova». odin¹talova».
@@ -161,15 +161,6 @@ Zoznam v
--disable-motif --disable-motif
zaká¾e podporu pre pokyny mana¾éra okien wmw zaká¾e podporu pre pokyny mana¾éra okien wmw
--enable-openlook
povolí podporu pre pokyny mana¾éra okien OPEN LOOK(tm)
--enable-gnome
povolí podporu pre pokyny mana¾éra okien GNOME
--enable-kde
povolí podporu pre pokyny mana¾éra okien kde/kwm
--enable-lite --enable-lite
odstráni veci, ktoré sa u¾ nachádzajú v desktopových prostrediach odstráni veci, ktoré sa u¾ nachádzajú v desktopových prostrediach
ako KDE a GNOME. Odstránené veci sú: zoznam okien, menu aplikácií, ako KDE a GNOME. Odstránené veci sú: zoznam okien, menu aplikácií,
@@ -409,7 +400,7 @@ Installing the extras package
Unpack WindowMaker-extra-<version-number>.tar.gz in /usr/local/share Unpack WindowMaker-extra-<version-number>.tar.gz in /usr/local/share
You can get the file at ftp://ftp.windowmaker.org. This file is optional You can get the file at ftp://ftp.windowmaker.info. This file is optional
and only have a few icons, and themes. Look for the latest <version-number> and only have a few icons, and themes. Look for the latest <version-number>
available. available.
Also there is a WindowMaker-extra.readme to instruct you where that package Also there is a WindowMaker-extra.readme to instruct you where that package
@@ -426,7 +417,7 @@ v druhom kroku kompil
--with-appspath, pomocou ktorej ¹pecifikujete cestu pre WPrefs.app. --with-appspath, pomocou ktorej ¹pecifikujete cestu pre WPrefs.app.
Príklad: Príklad:
./configure --prefix=/home/jshome --with-appspath=/home/jshome/GNUstep/Apps ./configure --prefix=/home/jshome --with-appspath=/home/jshome/GNUstep/Applications
Poto pridajte adresár /home/jshome/bin do premennej PATH, /home/jshome/lib Poto pridajte adresár /home/jshome/bin do premennej PATH, /home/jshome/lib
do premennej LD_LIBRARY_PATH a spustite bin/wmaker.inst do premennej LD_LIBRARY_PATH a spustite bin/wmaker.inst

304
Install
View File

@@ -1,304 +0,0 @@
#!/bin/sh
#
# WindowMaker configuration and compilation script.
#
# Copyright (c) 1997, 1998, 1999 Alfredo K. Kojima
#
export LINGUAS;LINGUAS=""
if test "$NLSDIR" = ""; then
export NLSDIR;NLSDIR="/usr/lib/locale"
fi
OPTIONS=""
PREFIX="/usr/local"
perai() {
echo "Type <Return> to continue"
read nada
}
perform() {
if ! $* ; then
echo
echo "Window Maker installation failed or aborted by user."
exit 1
fi
}
help() {
echo "Usage: $(basename $0) <switch>"
echo "Where switches are:"
echo " -s --quiet make silent build"
echo " -h --help show this message"
echo ""
exit $1
}
OPTIONS=""
MAKE_OPTIONS=""
while [ -n "$1" ]
do
case "$1" in
"-s"|"--quiet") OPTIONS="--quiet"
MAKE_OPTIONS="-s";;
"-h"|"--help") help 0;;
*) echo "bad command-line parameter $1"
help 1;;
esac
shift
done
trap "echo Window Maker installation aborted. ; exit 1" 2 3
echo
echo "========================="
echo "Window Maker Installation"
echo "========================="
echo
echo "NOTE: If this script fails, read the INSTALL file and"
echo "install by hand."
echo
echo "Please read the README, INSTALL and FAQ files before e-mailing "
echo "questions. We will IGNORE any questions that are already"
echo "answered in the documentation."
echo
perai
echo
echo "Did you install libPropList? If not, please install it now."
echo
perai
echo "Did you read the INSTALL file?"
echo -n "<y/n> "
read rtfm
if [ "$rtfm" != y ]; then
echo "Please read the INSTALL file before installing"
exit
fi
echo "Are you sure?"
echo -n "<y/n> "
read rtfm
if [ "$rtfm" != y ]; then
echo "Please read the INSTALL file before installing"
exit
fi
echo "Are you lying?"
echo -n "<y/n> "
read rtfm
if [ "$rtfm" != n ]; then
echo "What a shame!"
echo "Please read the INSTALL file before installing"
exit
fi
echo "Do you *swear* that you really read the INSTALL file?"
echo -n "<y/n> "
read rtfm
if [ "$rtfm" != y ]; then
echo "Please read the INSTALL file before installing"
exit
fi
echo "Last chance. You will not get help if you have some problem"
echo "because you didn't read that file. Even if your computer explodes."
echo "Do you *really* read it?"
echo -n "<y/n> "
read rtfm
if [ "$rtfm" != y ]; then
echo "Please read the INSTALL file before installing"
exit
fi
echo
echo "Ok, you have been warned."
echo
perai
if test "$USER" != "root"; then
echo
echo "Warning: you must run this script as root to install"
echo "Window Maker. Hit <Control>-<C> to quit this script."
perai
echo
fi
echo
echo "Option Selection"
echo "================"
######################## KDE
echo
echo "Do you want KDE support?"
echo -n "<y/n> [n] "
read kde
if [ "$kde" = y -o "$kde" = Y ]; then
OPTIONS="$OPTIONS --enable-kde"
fi
######################## GNOME
echo
echo "Do you want GNOME support?"
echo -n "<y/n> [n] "
read gnome
if [ "$gnome" = y -o "$gnome" = Y ]; then
OPTIONS="$OPTIONS --enable-gnome"
fi
######################## OLWM
echo
echo "Do you want OPEN LOOK(tm)/olwm support?"
echo -n "<y/n> [n] "
read olwm
if [ "$olwm" = y -o "$olwm" = Y ]; then
OPTIONS="$OPTIONS --enable-openlook"
fi
######################## NLS
echo
echo "Do you want National Language Support?"
echo -n "<y/n> [n] "
read NLS
if [ "$NLS" = "y" -o "$NLS" = "Y" ]; then
NLS="Y"
echo "The supported locales are:"
ling=` (cd po; /bin/ls *.po) `
ALL_LINGUAS=""
for l in $ling; do
lname=`(cd po; grep Language-Team $l|cut -f2- -d:|cut -f1 -d\\\\|cut -f1 -d\<)`
lname=`echo $lname`
lcode=`basename $l .po`
ALL_LINGUAS="$ALL_LINGUAS $lcode"
echo "$lcode $lname"
done
echo "Type in the locales you want (all will install everything) [none]"
read foo
if test "$foo" = "all"; then
LINGUAS="$ALL_LINGUAS"
else
LINGUAS="$foo"
fi
echo "Selected locales are: $LINGUAS"
MB=""
for i in $LINGUAS; do
ok=0
for b in $ALL_LINGUAS; do
if test "$b" = "$i"; then
ok=1
break
fi
done
if test "$ok" = "0"; then
echo
echo "$i is not a supported locale"
perai
continue
fi
done
echo
echo "Where do you want to put the message files? [$NLSDIR]"
echo -n "? "
read foo
if test "x$foo" != "x"; then
NLSDIR=$foo
fi
fi
##################### Installation path
done=0
while [ $done = 0 ]; do
echo
echo "Where do you want to install Window Maker? [$PREFIX]"
echo "Don't change it if you don't know what you're doing."
if test "$USER" != "root"; then
echo "Make sure to specify a path where you have write permission."
fi
echo "(The default will put Window Maker in $PREFIX/bin, $PREFIX/lib etc.)"
echo -n "? "
read foo
if test "x$foo" != "x"; then
if [ "$foo" = "y" -o "$foo" = "n" ]; then
echo
echo "Hmm... I don't think you really want to install Window Maker into \"$foo\""
echo
else
done=1
PREFIX=$foo
fi
else
done=1
fi
echo
echo " $PREFIX/bin must be in the PATH environment variable"
echo "of all users who will use Window Maker"
perai
done
OPTIONS="$OPTIONS --prefix=$PREFIX"
##################### Install stripped binaries?
INSTALL="install"
echo "Do you want stripped binaries to be installed?"
echo "Installed binaries will be smaller (with debug info removed)."
echo -n "<y/n> [n] "
read foo
if [ "$foo" = y -o "$foo" = Y ]; then
INSTALL="install-strip"
fi
##################### Configure
echo "--------------------------"
echo "Configuring Window Maker..."
echo "--------------------------"
if [ `uname -s` = "SCO_SV" ]; then
echo "CFLAGS=\"$CFLAGS -belf -DANSICPP\" ./configure $OPTIONS"
CFLAGS="$CFLAGS -belf -DANSICPP"
perform ./configure $OPTIONS
else
echo "CFLAGS=\"$CFLAGS $GCCFLAGS\" ./configure $OPTIONS"
CFLAGS="$CFLAGS $GCCFLAGS"
perform ./configure $OPTIONS
fi
#################### Compile
echo "-------------------------"
echo "Compiling Window Maker..."
echo "-------------------------"
(cd src; perform make $MAKE_OPTIONS clean)
perform make $MAKE_OPTIONS
echo "--------------------------"
echo "Installing Window Maker..."
echo "--------------------------"
perform make $MAKE_OPTIONS $INSTALL
if [ `uname -s` = "Linux" ]; then
echo
echo " Make sure $PREFIX/lib is in the /etc/ld.so.conf file"
/sbin/ldconfig
fi
echo
echo "Installation Finished!"
echo
echo "Now, each user that wishes to use WindowMaker must run the wmaker.inst"
echo "script that was just installed."
if test "$NLS" = "Y"; then
echo "Don't forget to set the LANG environment variable to your locale"
fi

4
MIRRORS
View File

@@ -4,7 +4,7 @@ Window Maker FTP Mirror Sites
Official Site (USA): Official Site (USA):
-------------------- --------------------
ftp://ftp.windowmaker.org/ http://windowmaker.org/pub/source/release/
Australia: Australia:
@@ -61,7 +61,7 @@ For Intel:
Contact: Jim Knoble <jmknoble@pobox.com> Contact: Jim Knoble <jmknoble@pobox.com>
Sites: Sites:
ftp://ftp.windowmaker.org/pub/beta/compiled/linux/rpms/ ftp://ftp.windowmaker.info/pub/beta/compiled/linux/rpms/
ftp://ftp.redhat.com/pub/contrib/SRPMS/ ftp://ftp.redhat.com/pub/contrib/SRPMS/
ftp://ftp.redhat.com/pub/contrib/i386/ ftp://ftp.redhat.com/pub/contrib/i386/

26
Makefile.am
View File

@@ -1,27 +1,9 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
SUBDIRS = wrlib WINGs src util po WindowMaker wmlib test WPrefs.app doc\ SUBDIRS = wrlib WINGs src util po WindowMaker wmlib WPrefs.app doc
contrib
EXTRA_DIST = TODO BUGS BUGFORM FAQ FAQ.I18N MIRRORS COPYING.WTFPL \ EXTRA_DIST = TODO BUGS BUGFORM FAQ FAQ.I18N FAQ.I18N.cs FAQ.I18N.sk \
Install acconfig.h INSTALL.pt README.pt\ INSTALL.cs INSTALL.fr INSTALL.es INSTALL.pt INSTALL.sk \
mkpatch README.KDE README.GNOME WindowMaker.lsm.in\ README.definable-cursor README.pt MIRRORS COPYING.WTFPL mkpatch
README.definable-cursor \
FAQ.I18N.sk INSTALL.sk INSTALL.es
# libwmfun-0.0.3.tar.gz # libwmfun-0.0.3.tar.gz
WindowMaker.lsm: WindowMaker.lsm.in
size=`wc -c $(distdir).tar.gz|cut -d\ -f1`;\
size=`echo scale=2\;$$size/1048576|bc`;\
sed -e "s/VERSION/"$(VERSION)"/" \
-e "s/DATE/`date +%d%b%Y|tr a-z A-Z`/"\
-e "s/SIZE/$$size M/"\
WindowMaker.lsm.in > WindowMaker-$(VERSION).lsm
#dist-hook:
# touch `find -name configure.in -print`
# touch `find -name aclocal.m4 -print`
# touch `find -name Makefile.am -print`
# touch `find -name Makefile.in -print`
# touch `find -name configure -print`

289
NEWS
View File

@@ -2,15 +2,275 @@
NEWS for veteran Window Maker users NEWS for veteran Window Maker users
----------------------------------- -----------------------------------
--- 0.92.0
GNUstep Installation Directory
------------------------------
WPrefs is now installed in /usr/local/bin and /usr/local/share by default.
If you use GNUstep and want it to install in /usr/GNUstep/Applications,
you may specify --with-gnustepdir=/usr/GNUstep
If the GNUSTEP_LOCAL_ROOT environment variable is defined when configure is
executed, it will be used (and you don't need to use --with-gnustepdir)
Cached Pixmaps Directory
------------------------
The directory where Window Maker stores the cached application pixmaps for
its later use has changed from ~/GNUstep/.AppInfo/WindowMaker to
~/GNUstep/Library/WindowMaker/CachedPixmaps for better compatibility with
the GNUstep path structure.
Also WPrefs now stores internal data in ~/GNUstep/Library/WindowMaker/WPrefs
(it was ~/GNUstep/.AppInfo/WPrefs before)
X Input Methods support in WINGs
--------------------------------
Preliminary support for X Input Methods was added to textfield and text
widgets in WINGs. Input for text in other languages than English should
work now (except for kanji which will most likely not work, even though
it wasn't tested).
Disabling the switch panel
--------------------------
To disable the panel shown during Alt-tabbing, you may put the following in
~/GNUstep/Defaults/WindowMaker
SwitchPanelImages= None;
--- 0.91.0
Alt-Tab Window Switching
------------------------
You can change the appearance of the panel shown during Alt-Tab window switching
with the SwitchPanelImages option:
(selected_icon_tile_image, background_image, width, height)
selected_icon_tile_image is the image used to highlight the currently selected
window icon. It must be 64x64 pixels.
background_image is the image used in the background of the panel. It must
be at least 64x80.
width and height are the width and size of the central part of the image.
When drawing the panel, the image will be split as:
|W |
+--+--+--+
| | | |
+--+--+--+ -
| | | | H
+--+--+--+ -
| | | |
+--+--+--+
The 4 corner images will be copied in their original sizes and the rest will
be scaled to the final panel size.
background_image, width and height are optional. If you leave them out,
a gray panel will be used. If your machine is not very fast, you may want
to use it.
--- 0.90.0
NetWM / EWMH Support
--------------------
Support for the EWMH standard has been added. Applications from GNOME 2.x and
KDE 3.x should now interoperate better with Window Maker.
Support for the obsolete/legacy GNOME 1.x, KDE 1.x and OpenLook(!) hints was
wiped out for the sake of sanity.
Antialiased font support
------------------------
With the addition of Xft2 support in the WINGs library, now
Window Maker can display antialiased text with TrueType or any scalable fonts.
You can pick fonts for Window Maker in the Font configuration section of
WPrefs.
Antialiased text is enabled by default, but can be disabled by adding
AntialiasedText = NO; in ~/GNUstep/Defaults/WMGLOBAL
This will disable antialiased text for any WINGs based application. If you
only want to disable them for a specific application only, like WindowMaker
for example, then add the same option in the applications configuration file,
in this case ~/GNUstep/Defaults/WindowMaker
For WindowMaker, this can also be achieved from the Expert panel in WPrefs.
Note that bitmapped fonts look much better than TrueType when antialiasing is
disabled.
Global Submenus
---------------
Global menus allow for system wide menus that are added to every users
application menus. They are located in /usr/etc/WindowMaker/,
/usr/local/etc/WindowMaker or whatever is your sysconf directory
for WindowMaker. There are 2 files:
GlobalMenu.pre, which is added to the beginning of the menu and
GlobalMenu.post, which is added to the end of the menu.
These are to be proplist format menus, for example:
(("Foobar", EXEC, foobar),
("Blabla", EXEC, blabla))
or, in case you want a submenu:
(("Submenu",
("Foobar", EXEC, foobar),
("Blabla", EXEC, blabla)))
UTF-8 Support
-------------
Window Maker now uses UTF-8 internally (and thus can display UTF-8 text
in window titles and other places). Menus and po files must now be
encoded in UTF-8. If your menus contain non ASCII characters, you can convert
them to UTF-8 with the following command:
iconv -f <current-file-encoding> -t utf-8 <filename> > <filename>.utf8
For example:
iconv -f iso-8859-1 -t utf-8 menu > menu.utf
mv menu.utf menu
Icon Panel for Alt-Tabbing
--------------------------
A panel with icons for the windows that you can switch to will appear
when you press Alt-Tab. You can navigate through the windows with Alt-Tab
(Alt-Shift-Tab) or with the left/right keys once the panel is shown.
--- 0.80.0
Shading/Unshading windows using mouse wheel on their titlebar
-------------------------------------------------------------
In addition to the known methods of shading/unshading a window, one can now
do this by using the mouse wheel on the window's titlebar. The mouse events
are interpreted via a mapping in the global WINGs configuration file,
WMGLOBAL, by the MouseWheelUp and MouseWheelDown directives which will do
shading and unshading respectfully.
However, to avoid unwanted triggers of shading/unshading the window, two
consecutive mouse wheel events in the same direction are required. The
trigger won't occur if the events are separated by more than a double-click's
worth of time, which is technically speaking like making a double-click with
the button that corresponds to the mouse wheel direction.
Practically speaking, this means that you have to move the mouse wheel up
or down quickly, like when you want to quickly scroll over something big.
Shared application icons
------------------------
Real application icon sharing was implemented in place of the collapse
appicon thing. With this applications of the same instance.class will
have a single shared application icon and hiding will hide all windows
of the aplications attached to that appicon as if there is a single
application. This feature is enabled by default for all applications in
the global WMWindowAttributes defaults domain using:
"*" = {SharedAppIcon = Yes;};
If you're not satisfied with this or want the old behaviour back you
can revert this (either in the global domain for all users or in your
personal WMWindowAttibutes domain) using SharedAppIcon = No; for "*"
It can also be enabled/disabled for individual applications as needed.
Setting this option can be done using the window's inspector panel in the
"Application Specific" section. You can set/unset it for all applications by
using the "Defaults for all windows" in the "Window Specification" section
Basically using this can have 2 major scenarios:
1. Leave it on by default, but disable it for the few specific
applications that do not behave well with it. (default)
2. Leave it off by default, and enable it for all applications for
which you want it enabled.
At this point all applications we tested work ok, some of them even
work better with this feature turned on: for example xmms and Corel's
WorkPerfect8 now only have 1 appicon (they used to have 2 without this
feature).
This feature is turned off by default for the following applications
because it's incompatible with them:
1. all GNUstep applications
2. applications with an application menu (wterm, Aileron, etc)
3. all applications with withdrawn windows only (this means all dockapps)
As a side note: wterm can use the shared appicon feature as long as it
doesn't use the appmenu (will do this by default). If you start it
using the appmenu (wterm -wm) it will disable the shared appicon
feature because apps with appmenus are incompatible with this feature.
If an application is a GNUstep application or if it has an appmenu, it's
detected automatically and the shared appicon is disabled automatically
without any user intervention or need to configure anything.
Dock/Clip stealing appicons
---------------------------
This feature is different form the Clip's "Autoattract Icons" feature
as it won't attach any new icon to the dock/clip.
What it does, is when you start an application by other means than
dock/clip, like for example using the main menu or a terminal, it will
search the dock/clips for the presence of an appicon for that
application, that is not already running at that moment and will attach
the started application to that appicon in the dock/clip if available,
making it look like the dock/clip just stole the appicon for the started
application. There is an animation for this to offer visual feedback
that this happened.
--- 0.70.0 --- 0.70.0
New dock option New dock option
--------------- ---------------
Copy/paste launch in dock. For example, put Copy/paste launch in dock.
netscape %s in the Docked icon for Netscape, ==========================
select an url somewhere and then middle-click the icon.
The command will be launched with the "pasted" string. For example, put netscape %s in the Docked icon for Netscape, select an url
somewhere and then middle-click the icon. The command will be launched with
the "pasted" string.
Xinerama Support
================
Supported Xinerama features:
- Normal maximization of windows will maximize to only one of the screens,
the one where the cursor pointer is.
- Full Maximize command in window menu
- Place dialogs in the middle of the head where the pointer is
- Try to place windows inside one head in non-manual placement modes
Less dependancies Less dependancies
@@ -91,9 +351,10 @@ behavior regarding workspaces you can now (use WPrefs.app to do this).
Client supplied icons Client supplied icons
--------------------- ---------------------
Window Maker saves the client supplied icons in ~/GNUstep/.AppInfo/WindowMaker Window Maker saves the client supplied icons in
in XPM format for later use when the app is no longer running (to have the ~/GNUstep/Library/WindowMaker/CachedPixmaps in XPM format for later use
image to display for docked icons for example). when the app is no longer running (to have the image to display for docked
icons for example).
Until recently the XPM images saved by Window Maker were incorrect, but a Until recently the XPM images saved by Window Maker were incorrect, but a
recent fix in the code to save XPM's fixed them. But with this fix, all recent fix in the code to save XPM's fixed them. But with this fix, all
@@ -101,12 +362,12 @@ previously saved XPM's in that directory are no longer readable (they give
wrong images on screen or fail to load). wrong images on screen or fail to load).
To avoid the need for the user to fix this by hand editing WMWindowAttributes To avoid the need for the user to fix this by hand editing WMWindowAttributes
and removing all references to icons in ~/GNUstep/.AppInfo/WindowMaker which and removing all references to icons in ~/GNUstep/Library/WindowMaker/CachedPixmaps
can be annoying, new code was added to Window Maker to permit the regeneration which can be annoying, new code was added to Window Maker to permit the
of images in ~/GNUstep/.AppInfo/WindowMaker if they are missing. regeneration of images in ~/GNUstep/Library/WindowMaker/CachedPixmaps if they are missing.
With this addition, all you need to do to fix your old broken images, is to With this addition, all you need to do to fix your old broken images, is to
delete all *.xpm files from ~/GNUstep/.AppInfo/WindowMaker. Next time the delete all *.xpm files from ~/GNUstep/Library/WindowMaker/CachedPixmaps. Next time the
application that is supplying an icon image will start the icon will be application that is supplying an icon image will start the icon will be
recreated if missing, but this time it will be saved with the new XPM save recreated if missing, but this time it will be saved with the new XPM save
code which produces good XPM images. code which produces good XPM images.
@@ -516,7 +777,7 @@ Themes
Removed all themes from the source tree, and moved them in a separate package. Removed all themes from the source tree, and moved them in a separate package.
You can download the new package from the same place as this package: You can download the new package from the same place as this package:
ftp://ftp.windowmaker.org/pub/beta/srcs/ ftp://ftp.windowmaker.info/pub/beta/srcs/
Look after WindowMaker-extra-<version-number>.tar.gz Look after WindowMaker-extra-<version-number>.tar.gz
Also WindowMaker-extra pack include the old WindowMaker-data.tar.gz which only Also WindowMaker-extra pack include the old WindowMaker-data.tar.gz which only
contained icons. contained icons.
@@ -611,7 +872,7 @@ libPropList
WARNING!!! libPropList was removed from the Window Maker distribution WARNING!!! libPropList was removed from the Window Maker distribution
and is being distributed separately. If you dont have it installed yet, and is being distributed separately. If you dont have it installed yet,
get it from ftp.windowmaker.org/pub/libs and install before building get it from ftp.windowmaker.info/pub/libs and install before building
Window Maker. Window Maker.
@@ -972,7 +1233,7 @@ Persistent Program Suplied Icons
Application supplied icons are now stored, so that the dock will keep Application supplied icons are now stored, so that the dock will keep
showing them after the app is exited. The icons are stored at showing them after the app is exited. The icons are stored at
~/GNUstep/.AppInfo/WindowMaker/ ~/GNUstep/Library/WindowMaker/CachedPixmaps
Sound support Sound support

221
README
View File

@@ -5,7 +5,6 @@
X11 Window Manager X11 Window Manager
<http://windowmaker.org> <http://windowmaker.org>
<ftp://ftp.windowmaker.org>
by by
@@ -13,7 +12,6 @@
Dan Pascu Dan Pascu
]d
Web/FTP Master Web/FTP Master
@@ -42,25 +40,25 @@
Description Description
=========== ===========
Window Maker is the GNU window manager for the X Window System. It was Window Maker is the GNU window manager for the X Window System. It was designed
designed to emulate the look and feel of part of the NEXTSTEP(tm) GUI. It's to emulate the look and feel of part of the NEXTSTEP(tm) GUI. It's supposed to
supposed to be relatively fast and small, feature rich, easy to configure and be relatively fast and small, feature rich, easy to configure and easy to use,
easy to use, with a simple and elegant appearance borrowed from NEXTSTEP(tm). with a simple and elegant appearance borrowed from NEXTSTEP(tm).
Window Maker was designed keeping integration with GNUstep in mind and is the Window Maker was designed keeping integration with GNUstep in mind and is the
"official" window manager for it. It is also part of the GNU project "official" window manager for it. It is also part of the GNU project
(www.gnu.org) Read more about GNUstep further on this file. (www.gnu.org) Read more about GNUstep further on this file.
Hints (information given by applications to integrate well with the window Hints (information given by applications to integrate well with the window
manager) for Motif(tm), OPEN LOOK(tm), KDE and GNOME are also supported. manager) for Motif(tm) and NETWM are also supported (NETWM is used by KDE and
So you can replace any of the window managers for these environments GNOME, so they are automatically supported as a result). So you can replace any
with Window Maker while keeping most, if not all, of the native window manager of the window managers for these environments with Window Maker while keeping
functionality. most, if not all, of the native window manager functionality.
Window Maker was previously called WindowMaker. Window Maker was previously called WindowMaker.
Window Maker has no connection with Windowmaker, the software for Window Maker has no connection with Windowmaker, the software for making windows
making windows and doors. and doors.
Documentation Documentation
@@ -72,8 +70,8 @@ Read before asking.
in the directories. in the directories.
* INSTALL has installation instructions and some troubleshooting tips. * INSTALL has installation instructions and some troubleshooting tips.
You're meant to read it before installing. it was not written just to You're meant to read it before installing. it was not written just to fill up
fill up space in the package... space in the package.
* FAQ: Frequently Asked Questions. READ IT!!! FAQ.I18N is for * FAQ: Frequently Asked Questions. READ IT!!! FAQ.I18N is for
internationalization related questions. internationalization related questions.
@@ -88,7 +86,6 @@ including platform specific packages of Window Maker.
* ChangeLog: what changed from the previous version? * ChangeLog: what changed from the previous version?
* BUGS: list of known bugs * BUGS: list of known bugs
*** Tutorial *** Tutorial
@@ -102,8 +99,6 @@ http://www.linuxfocus.org/~georges.t/
The Window Maker User's Guide can be downloaded from the official ftp The Window Maker User's Guide can be downloaded from the official ftp
or web sites. or web sites.
It can also be viewed in HTML format in:
http://people.delphi.com/crc3419/WMUserGuide/index.htm
The User Guide explains how to use Window Maker, the configuration files The User Guide explains how to use Window Maker, the configuration files
and options. and options.
@@ -126,8 +121,8 @@ way (not that the normal way is difficult, but...).
* TODO: plans for the future * TODO: plans for the future
* contrib/ has some contributed patches that are not supported by Window Maker * contrib/ has some contributed patches that are not supported by Window Maker
because they conflict with design filosophies of the developers or some because they conflict with design philosophies of the developers or some other
other reason. reason.
* util/ has various utility programs. * util/ has various utility programs.
@@ -150,137 +145,107 @@ HELP ME!!!
========== ==========
There is a mailing list for discussing Window Maker at There is a mailing list for discussing Window Maker at
wm-user@windowmaker.org To subscribe to it, send a message containing: wmaker-user@ilists.windowmaker.org To subscribe to it, send a message to
subscribe wmaker-user-subscribe@lists.windowmaker.info
in the subject of the message to wm-user-request@windowmaker.org
If you got a problem, ask there (after reading the docs, of course). The If you got a problem, ask there (after reading the docs, of course). The people
people there is more likely to be able to answer your questions than we are. there is more likely to be able to answer your questions than we are. For bug
For bug reports use the BUGFORM. reports use the BUGFORM.
If you have a problem with a precompiled version of Window Maker If you have a problem with a precompiled version of Window Maker (rpm, deb etc),
(rpm, deb etc), first ask the person who made the package. first ask the person who made the package.
IMPORTANT NOTE: when asking for help (in the mailing list or to the IMPORTANT NOTE: when asking for help (in the mailing list or to the developerts,
developerts, directly) *always* send information about the system you are directly) *always* send information about the system you are using. You can use
using. You can use the system information section at the end of BUGFORM as a the system information section at the end of BUGFORM as a guideline. Another
guideline. Another thing: please don't send HTML mail. thing: please don't send HTML mail.
There is also a #windowmaker IRC channel at openprojects. To join there, There is also a #windowmaker IRC channel at freenode. To join there, connect
connect your irc client to irc.openprojects.net, irc.linux.com or some other your irc client to irc.freenode.net. irc.windowmaker.org will direct you to the
server of that network. correct IRC network.
GNUstep GNUstep
======= =======
GNUstep is a complete object-oriented development system, based on the GNUstep is a complete object-oriented development system, based on the OpenStep
OpenStep specification released by NeXT(tm) (now Apple(tm)) and Sun(tm). It specification released by NeXT(tm) (now Apple(tm)) and Sun(tm). It will provide
will provide everything one needs to produce cross-platform, object-oriented, everything one needs to produce cross-platform, object-oriented, graphical (and
graphical (and non-graphical) applications; providing among other things, non-graphical) applications; providing among other things, base system
base system libraries, a high-level GUI application framework that uses a libraries, a high-level GUI application framework that uses a Display
Display PostScript(tm)-like imaging model (DGS), objects for accessing PostScript(tm)-like imaging model (DGS), objects for accessing relational
relational databases, distributed objects and a graphical development databases, distributed objects and a graphical development environment, with
environment, with tools like interface modeller, a project management system tools like interface modeller, a project management system (project center) and
(project center) and other tools. other tools.
The GNUstep development system will be used to create a user environment, The GNUstep development system will be used to create a user environment, with
with everything needed for a complete graphical user interface, such as a everything needed for a complete graphical user interface, such as a file
file viewer, text editors and other applications. Note that the user viewer, text editors and other applications. Note that the user environment (or
environment (or "desktop environment") is only a small part of the whole "desktop environment") is only a small part of the whole GNUstep project and
GNUstep project and therefore it does not "compete" with other projects like therefore it does not "compete" with other projects like KDE or GNOME, simply
KDE or GNOME, simply because they are completely different things. because they are completely different things.
For more information on the GNUstep project, visit: http://www.gnustep.org For more information on the GNUstep project, visit: http://www.gnustep.org
and http://gnustep.current.nu
Running multiple instances of Window Maker 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 from the same user (so that wmaker will use the same configuration files) at the
files) at the same time. You might get unexpected behaviour when Window Maker same time. You might get unexpected behaviour when Window Maker updates it's
updates it's configuration files. configuration files.
If you really desire to do this, try running Window Maker with the If you really desire to do this, try running Window Maker with the command line
command line option --static so that it will not update or change option --static so that it will not update or change any of the configuration
any of the configuration files. files.
Sound support Sound support
============= =============
Sound is supported for Linux and FreeBSD systems with the use of a Sound is supported for Linux and FreeBSD systems with the use of a separately
separately distributed module called WSoundServer. There is also a graphical distributed module called WSoundServer. There is also a graphical configuration
configuration tool for setting up your sounds called WSoundPrefs. tool for setting up your sounds called WSoundPrefs. You can download these at:
You can download these at:
http://shadowmere.student.utwente.nl/ http://shadowmere.student.utwente.nl/
Note that you must compile Window Maker with the --enable-sound configure Note that you must compile Window Maker with the --enable-sound configure
flag and set the DisableSound option to NO. flag and set the DisableSound option to NO.
OpenL**k support
================
I guess many users, mainly from the academic world, have to use
applications written using the OpenL**k toolkits, so having support
for these apps must be of some use.
To enable, use --enable-openlook when doing the configure. Note that
not everything is implemented.
Implemented stuff include decoration hints and the push-pin. Not implemented
stuff include _SUN_WINDOW_STATE (the compose led state stuff), drag and drop
interest stuff, header (not sure what's it) and footer strings.
Please give me feedback if something doesn't work. If the feature is
already implemented, but is not working because of a bug, I'll try to
have that fixed. If it's a non-implemented feature and you mention that
it's important (ie: not just cosmetical), I'll consider implementing it.
The "out" state of the pushpin is emulated as a pushed-in close button.
Just click on the button to make it pushed-out, which corresponds
to the pinned-in state of the pushpin. If you push again in the pushed-out
close button, it will act as a normal close button: it will close the window.
Performance Tuning Performance Tuning
================== ==================
If you want to diminish Window Maker's memory usage and improve performance, If you want to diminish Window Maker's memory usage and improve performance,
while keeping a nice appearance and good functionality, follow the items while keeping a nice appearance and good functionality, follow the items bellow:
bellow:
- use solid textures for everything, mainly titlebars and menus. If you - use solid textures for everything, mainly titlebars and menus. If you want a
want a nice looking desktop, use the Traditional style. nice looking desktop, use the Traditional style.
- turn NewStyle and Superfluous off - turn NewStyle and Superfluous off
- do not bind many shortcuts in the menu and keep only the essential items - do not bind many shortcuts in the menu and keep only the essential items in
in the menu the menu
- turn on DisableClip - turn on DisableClip
- edit wconfig.h and disable the NUMLOCK_HACK and the features you - edit wconfig.h and disable the NUMLOCK_HACK and the features you don't use
don't use anyway (keep in mind that some of the #defines might not anyway (keep in mind that some of the #defines might not work, as they are not
work, as they are not fully supported). Make sure to always keep fully supported). Make sure to always keep NumLock and ScrollLock turned off.
NumLock and ScrollLock turned off.
- turn on DisableAnimations. You can also #undefine ANIMATIONS in wconfig.h - turn on DisableAnimations. You can also #undefine ANIMATIONS in wconfig.h
- strip down the default IconPath and PixmapPath entries to contain only - strip down the default IconPath and PixmapPath entries to contain only
the paths that you really have in your system. the paths that you really have in your system.
- do not use large images in the root background - do not use large images in the root background
- 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 environment variable to 0. If you want to increase performance at the cost of
of memory usage, set it's value to a value like the number of different memory usage, set it's value to a value like the number of different icons you
icons you use. use. Also, disable anti-aliased text support in ~/GNUstep/Defaults/WMGLOBAL.
Keyboard Mouse Control Keyboard Mouse Control
====================== ======================
Many people ask about adding keyboard control of mouse, like in fvwm, Many people ask about adding keyboard control of mouse, like in fvwm, but Window
but Window Maker will not have such feature. The XKB extension supports Maker will not have such feature. The XKB extension supports mouse simulation
mouse simulation from the keyboard, in a much more powerfull fashion than from the keyboard, in a much more powerfull fashion than any simulation done by
any simulation done by a window manager. a window manager.
To enable it, hit the Control+Shift+NumLock or Shift+NumLock key combination. To enable it, hit the Control+Shift+NumLock or Shift+NumLock key combination.
You should hear the speaker beeping. To disable it, do the same thing. You should hear the speaker beeping. To disable it, do the same thing.
@@ -308,28 +273,27 @@ milleage may vary.
How to make a gdb backtrace How to make a gdb backtrace
=========================== ===========================
Backtraces can help us fix bugs that make Window Maker crash. If you Backtraces can help us fix bugs that make Window Maker crash. If you find a bug
find a bug that crashes Window Maker, please send a backtrace with your that crashes Window Maker, please send a backtrace with your bug report.
bug report.
To make a usefull backtrace, you need a core file with debugging To make a usefull backtrace, you need a core file with debugging information
information produced by Window Maker when it crashes. It should produced by Window Maker when it crashes. It should have been installed without
have been installed without stripping too. stripping too.
To compile wmaker with debugging information: To compile wmaker with debugging information:
./configure ./configure
make CFLAGS=-g make CFLAGS=-g
If you get the dialog window telling you that wmaker crashed and If you get the dialog window telling you that wmaker crashed and asks you what
asks you what to do, tell it to "Abort and leave a core file". to do, tell it to "Abort and leave a core file".
script script
cd src cd src
gdb .libs/wmaker path_to_the_core_file gdb .libs/wmaker path_to_the_core_file
Then, in the gdb prompt type "bt". Quit from gdb by typing "quit" Then, in the gdb prompt type "bt". Quit from gdb by typing "quit" and then, in
and then, in the shell prompt, type "exit". the shell prompt, type "exit".
The file named typescript will contain the backtrace. The file named typescript will contain the backtrace.
@@ -338,20 +302,19 @@ The file named typescript will contain the backtrace.
Copyrights & Disclaimers Copyrights & Disclaimers
======================== ========================
Window Maker is copyrighted by Alfredo K. Kojima and is licensed through the Window Maker is copyrighted by Alfredo K. Kojima and is licensed through the GNU
GNU General Public License. Read the COPYING file for the complete license. General Public License. Read the COPYING file for the complete license.
The icons that are distributed with this program and were made by Marco van The icons that are distributed with this program and were made by Marco van
Hylckama Vlieg, are licensed through the GNU General Public License. Read the Hylckama Vlieg, are licensed through the GNU General Public License. Read the
COPYING file for the complete license. COPYING file for the complete license.
The icons listed in COPYING.WTFPL and are distributed in this The icons listed in COPYING.WTFPL and are distributed in this program and were
program and were made by Banlu Kemiyatorn (]d), are licensed through the made by Banlu Kemiyatorn (]d), are licensed through the "do What The Fuck you
"do What The Fuck you want to Public License". Read the COPYING.WTFPL want to Public License". Read the COPYING.WTFPL file for the complete license.
file for the complete license.
NeXT, OpenStep and NEXTSTEP are a trademarks of NeXT Computer, Inc. NeXT, OpenStep and NEXTSTEP are a trademarks of NeXT Computer, Inc. All other
All other trademarks are property of their respective owners. trademarks are property of their respective owners.
The authors reserve the right to make changes in the software without prior The authors reserve the right to make changes in the software without prior
notice. notice.
@@ -360,19 +323,19 @@ notice.
Authors Authors
======= =======
Alfredo K. Kojima <kojima@windowmaker.org> Alfredo K. Kojima <kojima@windowmaker.info>
Dan Pascu <dan@windowmaker.org> Dan Pascu <dan@windowmaker.info>
]d <id@windowmaker.org> ]d <id@windowmaker.info>
Please don't ask us questions before reading the documentation (esp. the Please don't ask us questions before reading the documentation (esp. the FAQ,
FAQ, this file and INSTALL files) and about "cool" things you see in this file and INSTALL files) and about "cool" things you see in people's desktop
people's desktop screenshots. screenshots.
The AUTHORS file contains a list of the people who have contributed to the The AUTHORS file contains a list of the people who have contributed to the
project. The name of people who have helped with localization (translation) project. The name of people who have helped with localization (translation) can
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 developers@windowmaker.org to wmaker-dev@lists.windowmaker.org

53
README.GNOME
View File

@@ -1,53 +0,0 @@
Information on Using Window Maker with GNOME
--------------------------------------------
Status of GNOME support
-----------------------
GNOME window manager protocols seem to be a work in progress.
Things still change fairly frequently, so, the stuff implemented
may not reflect the latest protocol. If something doesn't work,
that's probably because the protocols have changed again and I still
didn't have time to reimplement everything or noticed that it
changed. If that happens, please tell me exactly what doesn't work.
Other than that, the so called "GNOME Window Manager Compliance - How to
write a GNOME compliant Window Manager" document, says this:
"There are currently a set of other hints available that are, at the
current time, not essential and therefore not documented here. It is,
however envisaged that they will be finalized and added to this
document, but for now are not needed."
Since they are non-essential and undocumented they are not yet implemented.
Implemented stuff:
- GNOME window manager hints
- Motif window manager hints
On the works:
- R6 style session management
Compilation/Installation
------------------------
To compile Window Maker with GNOME support, just configure it as:
./configure --enable-gnome
before compiling.
Also, do not disable mwm hints support (they are enabled by default).
Configuration
-------------
In WPrefs, go to the last section and toggle the "Disable miniwindows" option.

125
README.KDE
View File

@@ -1,125 +0,0 @@
Information on Using Window Maker with KDE
------------------------------------------
Window Maker supports almost all KDE/KWM specific client
communication protocols, so you can simply replace kwm with
Window Maker, if you think these advantages are worthy:
Window Maker KWM
=============================================================================
Looks NEXTSTEP(tm)/NEXTSTEP(tm) Original, but reminds
enhanced Windows(tm)
Decoration solid, gradient, multi-color solid, vertical and
Textures gradient, pixmaps, textured horizontal gradient,
gradient - all gradients are pixmap
supported in horizontal,
vertical and diagonal
directions
Configurable No Yes, but not totally
Titlebar Buttons
Mini CLI Yes, but limited Yes
Window Specific Yes In KDE 1.1, yes.
Configuration In KDE 1.0, no.
Quick Keyboard Yes In KDE 1.1, yes
Navigation In KDE 1.0, no.
Pager KDE pagers will work as Yes
well as GNOME pagers
Session Not yet supported, but Yes, old (pre-X11R6) style
Management X11R6 style SM is being worked.
Dock kpanel, GNOME panel and Dock kpanel
Built-in Yes No
krootbgwm
GNOME support Yes No
Memory Usage(1) 1.85Mb In KDE 1.0, 3.13Mb
In KDE 1.1, probably more
(1) Memory usage was tested by running wmaker and kwm at the same machine
with the same windows, on the same screen and similar window texture
configurations (at different times, of course). I looked in the output of
ps -m, in the SIZE field, right after starting the window managers.
Enabling KDE Support
--------------------
To enable KDE support in Window Maker, you must compile it after
configuring it as follows:
./configure --enable-kde
Then, just replace kwm with wmaker in your startkde script.
If you are going to use Window Makers sound server, comment out
kwmsound in startkde. Also if wmaker sets your root window
background, comment out kbgndwm, kde's wallpaper setter.
Make sure to disable workspace background setting in KDE. If you
wont be using Window Maker themes anyway, you can set
WorkspaceBack = (none);
in ~/GNUstep/Defaults/WindowMaker
Enhancing Integration
---------------------
Window Maker adds some extensions to KDE's messaging stuff, so you can run
Window Maker specific commands from places like kpanel, krootwm or even
kwmcom. Recently KDE developers have kindly added support for these extensions
in the more recent KDE versions from CVS. The added stuff are the following
kwm like commands:
wm:wmaker - select Window Maker support mode
wmaker:info - show info panel
wmaker:legal - show legal panel
wmaker:arrangeIcons - arrange icons
wmaker:showAll - show all windows
wmaker:hideOthers - hide others
wmaker:restart - restart wmaker
wmaker:exit - exit wmaker
You can test them with kwmcom, like:
kwmcom wmaker:info
Problems
--------
* kpanel will not be kept always on top. That's because kpanel is an
OverrideRedirect window, so Window Maker can't do anything about that.
Before requesting for a hack to work around that in Window Maker, please
request the kpanel author to fix it.
* because the KDE protocol for letting the window manager know the usable
window region is broken, you might find some problems with the window
positioning/maximization code and kpanel's position.
* It seems kpanel (and maybe KDE in general) doesn't like dynamically
changing the number of workspaces. So, don't create or destroy workspaces
while running on KDE, unless you really need.
* If kpanel, kwmpager or kpager becomes confused about the number of
windows present, restart them.
* Wmaker opens windows by default under/over the panel, when the panel is
at top or left of screen. Use the GUI configuration tool WPrefs to change
this.
* Some commands, such as cascade windows and rearrange windows are not
yet implemented.

62
README.definable-cursor
View File

@@ -1,43 +1,16 @@
# README.definable-cursor: How to use definable-cursor patch for Window Maker
# created 1999-Apr-24 14:53 jmk
# autodate: 2001-Sep-05 22:40
+------------------------------------------+
| Definable Mouse Cursors for Window Maker |
+------------------------------------------+
The definable-cursor patch for Window Maker Definable Mouse Cursors for Window Maker
<http://www.windowmaker.org/> allows user-definable mouse cursors; the ----------------------------------------
The definable-cursor feature allows user-definable mouse cursors; the
cursors can either be the built-in ones from the X11 cursor font, or cursors can either be the built-in ones from the X11 cursor font, or
they can be bitmap (XBM) files. User-definable cursors can be useful they can be bitmap (XBM) files. User-definable cursors can be useful
for theme-builders, lefthanders, and the visually impaired. for theme-builders, lefthanders, and the visually impaired.
This README describes how to enable user-definable cursors in Window
Maker as well as how to use them.
+----------------------------+ Defining Your Own Cursors
| Enabling Definable Cursors | -------------------------
+----------------------------+
If you want to enable definable mouse cursors in Window Maker, you must
do so before you configure and build Window Maker. Here's how:
(1) Edit src/wconfig.h.in and change the following line:
#undef DEFINABLE_CURSOR
to:
#define DEFINABLE_CURSOR
(2) Configure and build Window Maker as you normally would:
./configure
make
+---------------------------+
| Defining Your Own Cursors |
+---------------------------+
A cursor specification takes one of the following forms in the A cursor specification takes one of the following forms in the
~/GNUstep/Defaults/WindowMaker file: ~/GNUstep/Defaults/WindowMaker file:
@@ -84,23 +57,22 @@ Maker used them in the past, but doesn't use them anymore):
ResizeCursor = (builtin, sizing); ResizeCursor = (builtin, sizing);
+----------------------------------------------+
| Using Cursors with 'getstyle' and 'setstyle' |
+----------------------------------------------+
The 'getstyle' and 'setstyle' style- and theme-management utilities Using Cursors with 'getstyle' and 'setstyle'
can handle user-definable cursors. By default, 'getstyle' ignores --------------------------------------------
cursor definitions; using 'getstyle -t' to get theme-related settings
will also include any cursors you've defined in the resulting
stylefile.
However, by default, 'setstyle' does *not* ignore cursor settings. If The 'getstyle' and 'setstyle' style/theme-management utilities can
handle user-definable cursors. By default, 'getstyle' ignores cursor
definitions; using 'getstyle -t' to get theme-related settings will
also include any cursors you've defined in the resulting stylefile.
However, by default, 'setstyle' does NOT ignore cursor settings. If
you wish to set a style or theme without installing cursor settings, you wish to set a style or theme without installing cursor settings,
you can use 'setstyle --no-cursors' to ignore the cursor definitions. you can use 'setstyle --no-cursors' to ignore the cursor definitions.
+--------------+
| Random Notes | Random Notes
+--------------+ ------------
Most X11 cursors are 16x16 bitmaps. Many X servers can actually handle Most X11 cursors are 16x16 bitmaps. Many X servers can actually handle
larger cursors, though. To check, use: larger cursors, though. To check, use:

345
README.es Normal file
View File

@@ -0,0 +1,345 @@
GNU Window Maker
X11 Window Manager
<http://windowmaker.info>
<ftp://ftp.windowmaker.info>
por
Alfredo K. Kojima
Dan Pascu
]d
Web/FTP Master
Phillip Smith
¡Felicitaciones! Ha adquirido un dispositivo
excelentísimo que le proporcionará miles de años de uso sin
problemas, si no fuera porque indudablemente lo destruirá a
través de alguna maniobra estúpida típica de consumidor. Por
eso le pedimos por EL AMOR DE DIOS LEA ESTE MANUAL DEL
PROPIETARIO CUIDADOSAMENTE ANTES DE DESEMPAQUETAR EL
DISPOSITIVO. ¿YA LO DESEMPAQUETÓ, NO? LO DESEMPAQUETÓ Y LO
ENCHUFÓ Y LO ENCENDIÓ Y TOQUETEÓ LAS PERILLAS, Y AHORA SU
CHICO, EL MISMO CHICO QUE UNA VEZ METIÓ UNA SALCHICHA EN SU
VIDEOCASETERA Y ACCIONÓ "AVANCE RÁPIDO", ESTE CHICO
TAMBIÉN ESTÁ TUOQUETEANDO LAS PERILLAS, ¿CIERTO? Y RECIÉN
AHORA ESTÁ COMENZANDO A LEER LAS INSTRUCCIONES, ¿¿¿CIERTO???
NOSOTROS PODRÍAMOS SIMPLEMENTE ROMPER ESTOS DISPOSITIVOS EN LA
FÁBRICA ANTES DE DESPACHARLOS, ¿SABE?
-- Dave Barry, "¡Lea Esto Primero!"
Descripción
===========
Window Maker es el gestor de ventanas GNU para el Sistema de Ventanas X. Fue
diseñado para emular la apariencia y funcionalidad de parte del GUI de NEXTSTEP(mr).
Procura ser relativamente rápido y pequeño, rico en características, fácil de configurar
y usar, con una simple y elegante apariencia sacada desde NEXTSTEP(mr).
Window Maker fue diseñado teniendo en mente la integración con GNUstep y por eso
es el gestor de ventanas "oficial". Es también parte del proyecto GNU (www.gnu.org)
. Lea mas sobre GNUstep más adelante en este archivo.
Pistas (información dada por las aplicaciones para integrarse bien con el gestor de
ventanas) para Motif(tm), OPEN LOOK(tm), KDE y GNOME también son soportados.
Entonces puede reemplazar cualquiera de los gestores de ventana para estos entornos
con Window Maker manteniendo la mayoría, si no todo, de la funcionalidad del
gestor de ventanas nativo.
Window Maker antes se llamaba WindowMaker.
Window Maker no tiene relación con Windowmaker, el software para
hacer ventanas y puertas.
Documentación
=============
Lea antes de preguntar.
* Los archivos README distribuidos por todas partes del árbol de fuentes
contienen información relacionada al contenido en los directorios.
* INSTALL tiene instrucciones de instalación y algunos consejos cuando tenga
algún problema. Significa que debería leerlo antes de la instalación.
No fue escrito solo para ocupar espacio en el paquete...
* FAQ: Preguntas Frecuentes. LEALO!!! FAQ.I18N es para
preguntas relacionadas con la internacionalización.
* NEWS: lista los cambios visibles por el usuario desde la versión anterior.
Léalo si está actualizando.
* MIRRORS: algunos lugares alternativos donde puede obtener Window Maker,
incluyendo paquetes de Window Maker específicos para ciertas plataformas.
* BUGFORM: uselo para enviar reportes de errores. Por favor uselo.
* ChangeLog: ¿que cambió desde la versión anterior?
* BUGS: lista de errores conocidos.
*** Tutorial
Hay un tutorial mantenido por Georges Tarbouriech en:
http://www.linuxfocus.org/~georges.t/
*** Guía del Usuario
La Guía del Usuario de Window Maker puede ser bajada desde el ftp oficial
o por sitios web.
Puede también ser vista en formato HTML en:
http://people.delphi.com/crc3419/WMUserGuide/index.htm
La Guía del Usuario explica como usar Window Maker, los archivos de configuración
y opciones.
*** man pages
Tipee "man wmaker" en el prompt del shell para obtener ayuda general sobre Window Maker.
Directorios y Archivos en el Árbol de Fuentes
=============================================
* Install es un script para configurar y compilar Window Maker de una forma
fácil (no es que la forma normal sea difícil, pero...).
* AUTORES: los créditos
* TODO: planes para el futuro.
* contrib/ tiene algunos parches aportados que no están soportados por Window Maker
porque entran en conflicto con la filosofía de diseño de los desarrolladores o por
alguna otra razón.
* util/ tiene varios programas utilitarios.
* WPrefs.app/ es el programa de configuración.
* src/wconfig.h posee opciones de compilación que puede cambiar para
seleccionar algunas opciones/caracteristicas y otras cosas.
* WINGs/ biblioteca widget para imitación de NEXTSTEP.
* wrlib/ biblioteca de procesamiento de imagen.
* po/ posee catálogos de mensajes que son las versiones traducidas de los mensajes
mostrados por Window Maker.
* docklib-x.x.tar.gz es una biblioteca para escribir dockapps.
SOCORRO!!!
==========
Hay una lista de correo para discutir sobre Window Maker en
wm-user@windowmaker.info. Para suscribirse, envie un mensaje que contenga:
subscribe
en el tema del mensaje a wm-user-request@windowmaker.info
Si tiene algun problema, pregunte aquí (después de leer los docs, por supuesto). Es
más probable que las personas de la lista sepan contestar sus preguntas
que nosotros. Para reportes de errores use el BUGFORM.
Si tiene un problema con una versión precompilada de Window Maker
(rpm, deb etc), primero pregunte a la persona que hizo el paquete.
NOTA IMPORTANTE: cuando pida ayuda (en la lista de correo o a los desarrolladores,
directamente) *siempre* envie información sobre el sistema que está usando. Puede
usar la sección de información del sistema al final del BUGFORM como una guía.
Otra cosa: por favor no envie correo HTML.
También hay un canal de IRC #windowmaker en openprojects. Únase aquí,
conecte su cliente de irc a irc.openprojects.net, irc.linux.com o algún otro
servidor de esa red.
GNUstep
=======
GNUStep es un completo sistema de desarrollo orientado a objetos, basado en la
especificación OpenStep liberada por NeXT(tm) (ahora Apple(tm) y Sun(tm)). Ello
proveerá todo lo que se necesita para producir aplicaciones multiplataforma,
orientadas a objetos, gráficas (y no gráficas); suministrando dentro de otras cosas,
bibliotecas base del sistema, una estructura de alto nivel para aplicaciones GUI que
usan un modelo de imagenes de tipo Display PostScript(tm) (DGS), objetos para acceso
a bases de datos relacionales, objetos distribuidos y un entorno de desarrollo gráfico,
con herramientas como un modelador de interfaces, un sistema para administración del
proyecto (central de proyecto) y otras herramientas.
El sistema de desarrollo de GNUStep será usado para crear un entorno de usuario,
con todo lo necesario para una completa interface gráfica de usuario, tal como
un visualizador de archivos, editores de texto y otras aplicaciones. Note que el
entorno de usuario (o "entorno de escritorio") es solo un pequeña parte de todo
el proyecto GNUStep y por lo tanto no "compite" con otros proyectos como KDE o GNOME,
simplemente porque son cosas completamente diferentes.
Para más información sobre el proyecto GNUStep, visite: http://www.gnustep.org y
http://gnustep.current.nu
Ejecutando multiples instancias de Window Maker
===============================================
No es una buena idea eejcutar más de una instancia de Window Maker desde
el mismo usuario (ya que wmaker usará los mismos archivos de configuración)
al mismo tiempo. Podría obtener un comportamiento inesperado cuando Window
Maker actualiza sus archivos de configuración.
Si de verdad desea hacer esto, intente ejecutar Window Maker con la opción
de linea de comando --static ya que así no actualizará o cambiará ninguno de los
archivos de configuración.
Soporte para Sonido
===================
El sonido es soportado por los sistemas Linux y FreeBSD con el uso de
un módulo distribuido separadamente llamado WSoundServer. Hay también
una herramienta de configuracion gráfica para definir sus sonidos llamada
WSoundPref.
Puede bajar esto en:
http://shadowmere.student.utwente.nl/
Note que debe compilar Window Maker con el parámetro --enable-sound
y definir la opción DisableSound a NO.
Ajuste de Rendimiento.
=====================
Si quiere disminuir el uso de memoria por parte de Window Maker y mejorar el
rendimiento, manteniendo una linda apariencia y buena funcionalidad, siga los
items de abajo:
- use texturas sólidas para todo, principalmente barras de título y menúes.
Si quiere un escritorio de aspecto lindo, use el estilo Tradicional.
- Apague NewStyle y Superfluous
- No una muchos atajos al menú y mantenga solo los items esenciales en el menú.
- Active DisableClip
- edite wconfig.h y desactive el NUMLOCK_HACK y lo mismo con las características
que no use (tenga en mente que algunos de los #defines podrían no funcionar,
ya que ellos no están completamente soportados). Asegúrese de mantener siempre
Numlock y ScrollLock apagados.
- Active DisableAnimations. Puede también #undefine ANIMATIONS en wconfig.h
- quite las entradas por defecto IconPath y PixmapPath para contener solo las
rutas que en verdad tiene en su sistema.
- no use imágenes grandes en el fondo raíz.
- quite el soporte para los formatos de imagen que no use.
- para reducir el uso de la memoria, desactive el caché de ícono, definiendo
la variable de entorno RIMAGE_CACHE a 0. Si quiere aumentar el rendimiento
a expensas del uso de la memoria, defina este valor a un valor igual al
número de íconos distintos que use.
Control del Mouse por Teclado
=============================
Muchas personas preguntan sobre agregar control por teclado al mouse, como
en fvwm, pero Window Maker no tendrá tal característica. La extensión XKB
soporta simulación de mouse desde el teclado, de una manera mucho más poderosa
que cualquier otra simulación hecha por un administrador de ventanas.
Para activarlo, presione la combinación de teclas Control+Shift+NumLock o
Shift+NumLock. Debiera escuchar el beep del parlante. Para desactivarlo,
haga lo mismo.
Para controlar el mouse el teclado numérico se usa así:
- 4 (flecha izquierda), 7 (Home), 8 (flecha arriba), 9 (PgUP), 6 (flecha derecha),
3 (PgDn), 2 (flecha abajo) y 1 (Fin) mueve el mouse a la correspondiente
dirección;
- sosteniendo una de las teclas de arriba y luego sosteniendo la tecla 5 moverá
el puntero más rápido;
- / seleccionará el primer botón del mouse (botón izquierdo);
- * seleccionará el segundo botón del mouse (botón del medio);
- - seleccionará el tercer botón del mouse (botón derecho);
- 5 hará un click con el botón actualmente seleccionado del mouse;
- + hará un doble click con el botón actualmente seleccionado;
- 0 (Ins) cliqueará y mantendrá el botón seleccionado actualmente;
- . (Del) liberará el botón seleccionado actualmente que fue anteriormente
cliqueado con la tecla 0 (Ins).
Los valores anteriores de las teclas funcionarán en un servidor X XFree86 3.2
(X11R6.1) pero su alcance puede variar.
Como hacer un gdb backtrace
===========================
Backtraces pueden ayudarnos a arreglar errores que hicieron que Window Maker falle.
Si encuentra un bug que hace fallar a Window Maker, por favor envie un backtrace con su
reporte de error.
Para hacer un backtrace útil, necesita un archivo core con información de depuración
producida por Window Maker cuando falló. Debería haber sido instalado sin stripping también.
Para compilar wmaker con información de depuración:
./configure
make CFLAGS=-g
Si obtiene el cuadro de diálogo que le dice que wmaker falló y le
pregunta que hacer, respóndale "Abortar y dejar un archivo core"
script
cd src
gdb .libs/wmaker path_to_the_core_file
Luego, en el prompt gdb escriba "bt". Salga de gdb escribiendo "quit"
y luego, en el prompt del shell, scriba "exit"
El archivo llamado typescript contendrá el backtrace.
Derechos de Autor y Descargo de Responsabilidad
===============================================
Window Maker está registrado por Alfredo K. Kojima y está licensiado por la
Licensia Pública General GNU. Lea el archivo COPYING para leer la licensia
completa.
Los íconos que son distribuidos con este programa y fueron hechos por Marco
van Hylckama Vlieg, están licenciados por la Licencia Pública General GNU.
Lea el archivo COPYING para leer la licencia completa.
Los íconos listados en COPYING.WTFPL y son distribuidos en este programa
fueron hechos por Banlu Kemiyatorn (]d), están licenciados por la
"do What The Fuck you want to Public License". Lea el archivo COPYING.WTFPL
para leer la licencia completa.
NeXT, OpenStep y NEXTSTEP son marcas registradas de NeXT Computer, Inc.
Todas las otras marcas registradas son propiedad de sus respectivos dueños.
Los autores se reservan el derecho de hacer cambios en el software sin previo
aviso.
Autores
=======
Alfredo K. Kojima <kojima@windowmaker.info>
Dan Pascu <dan@windowmaker.info>
]d <id@windowmaker.info>
Por favor no nos haga preguntas antes de leer la documentación (especialmente
la FAQ, este archivo y los archivos INSTALL) y sobre cosas "cool" que ve en
las capturas de pantalla del escritorio de las personas.
El archivo AUTHORS contiene una lista de las personas que han contribuido
con el proyecto. El nombre de las personas que han ayudado con localization
(traducción) se puede encontrar en po/README y Window Maker/README
Si tiene algún comentario, arreglos y reportes de errores (complete BUGFORMs)
y enviémelos a developers@windowmaker.info
traducido por Efraín Maximiliano Palermo <max_drake2001@yahoo.com.ar>

44
README.pt
View File

@@ -3,8 +3,8 @@
GNU Window Maker GNU Window Maker
Gerenciador de Janelas X11 Gerenciador de Janelas X11
<http://windowmaker.org> <http://windowmaker.info>
<ftp://ftp.windowmaker.org> <ftp://ftp.windowmaker.info>
por por
@@ -143,10 +143,10 @@ SOCORRO!!!
========== ==========
Há uma lista de discussão para debate de questões sobre o Window Maker Há uma lista de discussão para debate de questões sobre o Window Maker
no wm-user@windowmaker.org. Para inscrever-se, mande uma mensagem no wm-user@windowmaker.info. Para inscrever-se, mande uma mensagem
contendo: contendo:
subscribe subscribe
no campo de assunto da mensagem para wm-user-request@windowmaker.org no campo de assunto da mensagem para wm-user-request@windowmaker.info
Se você tiver algum problema, pergunte lá (somente depois de ter lido os Se você tiver algum problema, pergunte lá (somente depois de ter lido os
documentos, é claro). As pessoas da lista estão mais preparadas para documentos, é claro). As pessoas da lista estão mais preparadas para
@@ -210,34 +210,6 @@ Observe que voc
flag --enable-sound e definindo a opção DisableSound para NO. flag --enable-sound e definindo a opção DisableSound para NO.
Suporte ao OpenL**k
===================
Acredito que muitos usuários, principalmente os do mundo acadêmico,
tenham que usar aplicações escritas em toolkits OpenL**k, então o suporte
para estes aplicativos deve ser de algum uso.
Para ativar, use o --enable-openlook quando rodar o configure. Note
que nem tudo está implementado.
As opções implementadas incluem hints de decoração e o push-pin.
Coisas não implementadas incluem _SUN_WINDOW_STATE (the compose led
state stuff), coisas relacionadas ao "drag and drop", cabeçalho (não
tenho certeza do que é) e o string footer.
Por favor me dêem retorno se algo não funcionar. Se a opção já está
implementada, mas não está funcionando por causa de um bug, eu tentarei
corrigí-la. Se é uma característica ainda não implementada e você mencionar
que é importante (ie: não somente cosmética), eu considerarei a sua
implementação.
O estado "out" do pushpin é emulado como um botão de fechar pressionado.
Clique no botão para fazer com que ele fique despressionado, o que
corresponde ao estado "pinned-in" do pushpin. Se você pressionar de novo
o botão de fechar despressionado, ele vai agir como um botão de fechar
normal: vai fechar a janela.
Ajuste da Performance Ajuste da Performance
==================== ====================
@@ -360,9 +332,9 @@ qualquer aviso pr
Autores Autores
======= =======
Alfredo K. Kojima <kojima@windowmaker.org> Alfredo K. Kojima <kojima@windowmaker.info>
Dan Pascu <dan@windowmaker.org> Dan Pascu <dan@windowmaker.info>
]d <id@windowmaker.org> ]d <id@windowmaker.info>
Por favor não nos perguntem coisas antes de ler a documentação (o FAQ, Por favor não nos perguntem coisas antes de ler a documentação (o FAQ,
este arquivo e os arquivos INSTALL), ou sobre coisas "legais" que você este arquivo e os arquivos INSTALL), ou sobre coisas "legais" que você
@@ -373,7 +345,7 @@ O nome das pessoas que ajudaram com a tradu
Window Maker/README Window Maker/README
Se você tem algum comentário, correção ou deseja relatar bugs (junto com Se você tem algum comentário, correção ou deseja relatar bugs (junto com
o BUGFORM) mande-os para developers@windowmaker.org o BUGFORM) mande-os para developers@windowmaker.info
Traduzido por: Ricardo Sartori <sartori@inf.ufsc.br> Traduzido por: Ricardo Sartori <sartori@inf.ufsc.br>

21
TODO
View File

@@ -7,12 +7,16 @@ Do ASAP:
- fix RemakeStackList() to account for transient windows - fix RemakeStackList() to account for transient windows
- blink border of clients with UrgencyHint set between red and black - blink border of clients with UrgencyHint set between red and black
- finish session stuff - finish session stuff
- add multiline support for balloons
- remove colors_per_channel stuff from wmaker after? - remove colors_per_channel stuff from wmaker after?
+ finish the ability to browse for files/dirs in the WPrefs menu editor
- check whether window states are being saved/restored properly via netwm
on restart/crash-restart (grep for XXX/TODO)
Need to do: Need to do:
=========== ===========
- put a "Do not save workspace state" in the exit confirmation dialog - figure out a better gnustep path for wprefs.app installation
- impelment a generic pixmap type, which receives attributes
(scaled/maxscaled/centered/tiled, smoothed, size/position, ...)
- allow user to select/restore default root menu from wprefs - allow user to select/restore default root menu from wprefs
- support for X11R6.4 extension for getting extra visual info in wrlib's - support for X11R6.4 extension for getting extra visual info in wrlib's
automatic best context guessing automatic best context guessing
@@ -27,7 +31,11 @@ Need to do:
- add new file for stuff like default commands and dnd commands for - add new file for stuff like default commands and dnd commands for
docked apps, balloons for the dock etc docked apps, balloons for the dock etc
- check whether apps with name.class set to empty strings should be treated - check whether apps with name.class set to empty strings should be treated
like if name.class were NULL.NULL like if name.class is NULL.NULL
- review the defaults handling code (not to reread after we update a
domain if possible, check WINGs apps updating WMWindowAttributes after
start making screen to flash on update)
Maybe some day: Maybe some day:
=============== ===============
@@ -54,3 +62,10 @@ sample implementation (twm?) it might be supported. Maybe dtwm supports
it? I dont know... it? I dont know...
After 1.0.0 is released
=======================
- rework/redesign the appicon/dock/clip concept
- maybe rewrite the main code in obj-c or c++
- major clean up in theming/texturing stuff
- dynamically loadable everything

86
The-perfect-Window-Maker-patch.txt Normal file
View File

@@ -0,0 +1,86 @@
____________
Introduction
------------
This short tutorial is meant to help you help me in the task
of having a maintainable and bug-free Window Maker.
It assumes you have 'git' correctly installed and you have set
the most basic configuration options via 'git config' (or by
editing the $HOME/.gitconfig file yourself). See the end
of this file for an example .gitconfig (which is the one
I use).
You should probably by now have already cloned my repository,
but here is how you can do it just in case:
# this is the preferred method (ie faster, native implementation)
git clone git://repo.or.cz/wmaker-crm.git
# use the http method only if are behind a firewall which blocks git://
git clone http://repo.or.cz/r/wmaker-crm.git
__________________________________
How to submit patches the git way
----------------------------------
Suppose you have a working copy of the git repo and you found
a bug in Window Maker and you know how to fix it. This is
what you can do to submit your patch in a way which will allow
me to apply it quickly.
# Optional: Create a new branch (just to be safe in case you screw up)
git checkout -b my-new-branch
Now you edit and save the files to fix the bug...
# Optional: Check what you did, review etc
git diff
# if it looks good, commit your changes
git commit -a
# git will pop up the editor which you configured in .gitconfig so
# that you will be able to write a commit log. It will use the 'vi'
# editor otherwise.
(write a _good_ and succinct commit log, explaining what you fixed etc)
# Prepare the patch to submit to the mailing-list. This step will create
# a file named 0001-subject-of-your-patch.patch from the last commit
# (use HEAD~2 if you want patches for the last 2 commits etc)
git format-patch HEAD~1
After the above steps, you are ready to send the created .patch file
to the mailing-list! Just send it as-is, and I will be able to apply
it with
# this is how I am going to apply your patch
git am 0001-subject-of-your-patch.patch
and it will automatically append your commit to the repo, with the
proper authorship, date, subject, commit log etc.
___________________
Example .gitconfig
-------------------
[user]
name = Erwin Schrodinger
email = schrodinger@gmail.com
[core]
editor = xjed
[status]
showUntrackedFiles = no
[color]
branch = auto
status = auto
diff = auto
ui = auto
[apply]
whitespace = fix

5
WINGs/.cvsignore
View File

@@ -1,5 +0,0 @@
Makefile Makefile.in
get-wings-flags get-wutil-flags
.libs
.psrc .inslog2 tca.map tca.log
*.rpt

115
WINGs/ChangeLog
View File

@@ -1,3 +1,115 @@
Changes since wmaker 0.92.0:
............................
- updated the XDND code in to work with GDK based applications.
WINGs based applications should now work with both KDE and GNOME
applications (Sylvain Reynal <sreynal@nerim.net>)
- better check for the XDND protocol version when interoperating with other
applications. As it seems xdnd version 3 (which WINGs supports) and newer
are not backward compatible with xdnd version 1 and 2. This is why WINGs
applications cannot interoperate with GNUstep applications (which uses
xdnd version 2). Xdnd version 4 and 5 are backwards compatible with
version 3 though. (Sylvain Reynal <sreynal@nerim.net>)
- removed dependency on rgb.txt from X11 and issues with locating it on the
filesystem for different systems/distributions.
- Removed dependency on rgb.txt (from X11) and issues with locating it on the
filesystem for different systems/distributions.
Changes since wmaker 0.80.1:
............................
- Added WMSetConnectionShutdownOnClose()
- Added an extra member to the ConnectionDelegate: canResumeSending
see NEWS for details.
- WMDrawString() and WMDrawImageString() now take WMColor instead of GC as
arguments. WMDrawImageString() receives 2 colors (text & background).
This is to allow easy extension for Xft/Xrender and hide X low level details
Read NEWS for details since this will break backward compatibility.
- Added alpha channel to WMColor. 2 new functions also:
WMCreateRGBAColor() and WMSetColorAlpha()
- Miscelaneous code cleanups in wtext.c
- Added Xft2 support in WINGs (for drawing antialiased fonts with transparency).
- New options in WMGLOBAL: AntialiasedText. Check NEWS for details.
- Fixed some improper calls to snprintf in wfont.c
- Added double buffering when drawing a WMFrame title with an antialiased font
to avoid flickering.
- Added double buffering when drawing WMList items to avoid flickering.
Double buffering for list also works for user drawn lists. Read NEWS for
details and incompatibilities introduced by this change.
- Added WMGetColorAlpha(WMColor *color)
- Better outline when drawing balloons.
- Added WMCreateFontWithAttributes()
- You can now pass "SystemFont", "BoldSystemFont", "SystemFont-##" or
"BoldSystemFont-##", with ## being the font size to any font creating
function to create a font with the (bold) system font font specification.
- Added WMCopyFontWithChanges(). This is a more generic and powerful function
meant to replaces the obsoleted WMEmphasizeFont(), WMNormalizeFont(),
WMStrenghtenFont() and the other similar functions. To get the same effect
you pass some predefined structs to it: WFANormal, WFABold, WFAEmphasized,
etc which are declared in WINGs.h).
- Fixed a bug with empty frame titles (Alexey Voinov <voins@voins.program.ru>)
- Added WMGetWidgetBackgroundColor()
- Code cleanup in wtext.c
- Fixed a memory leak in wfontpanel.c
- Fixed WMGetTextDefaultColor() not to retain the returned color. It returns
only a reference to the internal color, which you shouldn't release
- Added wstrndup()
- Added WMGetFontName()
- Added fontpanel callback
- Added WMSetTableViewHasHorizontalScroller()
- Fixed bug that could cause SIGSEGV by accessing beyond the end of text in
a WINGs textfield widget.
- Fixed small memory leak in the font panel code.
- Fixed call to qsort in WMSortArray.
- Fixed a memleak in the file panel.
- Double/triple-click selection in text widgets
(Vitaly Ovtchinnikov <ov@rbcmail.ru>)
- Fixed bug in tableview (clicked row callback got incorrect row)
(Carlos Torres <vlaadbrain@operamail.com>)
- Fixed bug in resizing a scrollview
- Fixed bug with wrong text wrapping (Alexey Voinov <voins@voins.program.ru>)
- Added wmkrect()
- Added xdnd v3 support (Sylvain Reynal <sreynal@nerim.net>)
- Fixed and enhanced text wrapping.
Changes since wmaker 0.80.0:
............................
- fixed a bug in wfindfile() (rewrote wfindfile() with better logic).
- separated the font caches for normal fonts and fontsets in WINGs (they can
have the same names and collide in the cache giving unwanted results)
- fixed labels not to display '\n' as a character if multiple '\n' are passed
but just skip to the next line.
- better warning when importing non-digit characters in PropList Data.
- rewrote WMBox to use a WMArray for subviews. with this change fixed a bug
about arranging subviews after removing one and a memleak occuring in the
same case.
- Fixed WMGetViewScreenPosition() to consider the window decorations.
- Added ability to enable/disable individual WMTableViewItems.
- Fixed textfields regarding interpretation of special keys with modifiers.
- Fixed some functions that accept a boolean flag as a paramater, to set only
1 or 0 for the flag value, not the flag passed by the user.
- Added 2 functions to retrieve the default system fonts:
WMDefaultSystemFont(WMScreen *scr) and WMDefaultBoldSystemFont(WMScreen *scr)
- Added WMSetButtonImageDimsWhenDisabled() and WMGetButtonEnabled()
- Cleaned-up the header files of functions/vars declared but not implemented
- Added WMGetTextFieldDelegate()
Changes since wmaker 0.70.0:
............................
- added an internal strcasecmp() (only on systems where is not present)
- removed some redundant includes of ../src/config.h when wconfig.h is
included too
- removed a wsyserror() message when reading a property list from file
(the programmer should decide if to give that message or just ignore).
- added a 'Bool recursive' flag to WMMergePLDictionaries()
- added WMSubtractPLDictionaries()
Changes since wmaker 0.65.0: Changes since wmaker 0.65.0:
............................ ............................
@@ -168,7 +280,8 @@ changes since wmaker 0.62.1:
as a result the shaded windows didn't go away when closed. The non-shaded as a result the shaded windows didn't go away when closed. The non-shaded
windows were unmapped on close but not destroyed either so they only windows were unmapped on close but not destroyed either so they only
apparently went away, but continued to use memory). apparently went away, but continued to use memory).
- Fixed a bug in the hashtable code which free'd the whole item instead of
just the item key in WMResetHashTable() (possible source of SIGSEGVs)
changes since wmaker 0.62.0: changes since wmaker 0.62.0:

3
WINGs/Documentation/.cvsignore
View File

@@ -1,3 +0,0 @@
Makefile Makefile.in
.psrc .inslog2 tca.map tca.log
*.rpt

5
WINGs/Examples/.cvsignore
View File

@@ -1,5 +0,0 @@
Makefile Makefile.in
connect server fontl puzzle UserTime.plist
.libs
.psrc .inslog2 tca.map tca.log
*.rpt

31
WINGs/Examples/Makefile.am
View File

@@ -3,27 +3,40 @@
AUTOMAKE_OPTIONS = no-dependencies AUTOMAKE_OPTIONS = no-dependencies
noinst_PROGRAMS = connect server fontl puzzle noinst_PROGRAMS = connect server fontl puzzle colorpick
LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
$(top_builddir)/WINGs/libWUtil.la \
@XFTLIBS@ @INTLIBS@
colorpick_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
fontl_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a fontl_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
puzzle_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a puzzle_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
connect_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a connect_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.la
connect_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@ \ connect_LDADD = $(top_builddir)/WINGs/libWUtil.la @LIBRARY_SEARCH_PATH@ \
@NETLIBS@ @NETLIBS@ @INTLIBS@
server_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a server_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.la
server_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@ @NETLIBS@ server_LDADD = $(top_builddir)/WINGs/libWUtil.la @LIBRARY_SEARCH_PATH@ \
@NETLIBS@ @INTLIBS@
INCLUDES = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \ INCLUDES = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
-DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG -DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG
LIBTOOL = $(QUIET) $(SHELL) $(top_srcdir)/libtool $(LIBTOOL_ARG)
.c.o:
$(QUIET)$(COMPILE) -c $<
.c.obj:
$(QUIET)$(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
$(QUIET)$(LTCOMPILE) -c -o $@ $<

39
WINGs/Examples/colorpick.c Normal file
View File

@@ -0,0 +1,39 @@
#include <stdlib.h>
#include <stdio.h>
#include <WINGs/WINGs.h>
void showSelectedColor(void *self, void *cdata)
{
WMColorPanel *panel = (WMColorPanel *) self;
printf("Selected Color: %s\n", WMGetColorRGBDescription(WMGetColorPanelColor(panel)));
}
int main(int argc, char **argv)
{
Display *dpy;
WMScreen *scr;
WMInitializeApplication("wmcolorpick", &argc, argv);
dpy = XOpenDisplay("");
if (!dpy) {
printf("could not open display\n");
exit(1);
}
scr = WMCreateScreen(dpy, DefaultScreen(dpy));
{
WMColorPanel *panel = WMGetColorPanel(scr);
WMSetColorPanelAction(panel, showSelectedColor, NULL);
WMShowColorPanel(panel);
}
WMScreenMainLoop(scr);
return 0;
}

48
WINGs/Examples/connect.c
View File

@@ -1,33 +1,28 @@
/* /*
* WINGs connect.c: example how to create a network client using WMConnection * WINGs connect.c: example how to create a network client using WMConnection
* *
* Copyright (c) 1999-2001 Dan Pascu * Copyright (c) 1999-2003 Dan Pascu
* *
*/ */
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <string.h> #include <string.h>
#include <WINGs/WINGs.h> #include <WINGs/WINGs.h>
static int initialized = 0; static int initialized = 0;
static void didReceiveInput(ConnectionDelegate * self, WMConnection * cPtr); static void didReceiveInput(ConnectionDelegate * self, WMConnection * cPtr);
static void connectionDidDie(ConnectionDelegate * self, WMConnection * cPtr); static void connectionDidDie(ConnectionDelegate * self, WMConnection * cPtr);
static void didInitialize(ConnectionDelegate * self, WMConnection * cPtr); static void didInitialize(ConnectionDelegate * self, WMConnection * cPtr);
static ConnectionDelegate socketDelegate = { static ConnectionDelegate socketDelegate = {
NULL, /* data */ NULL, /* data */
NULL, /* canResumeSending */
NULL, /* didCatchException */ NULL, /* didCatchException */
connectionDidDie, /* didDie */ connectionDidDie, /* didDie */
didInitialize, /* didInitialize */ didInitialize, /* didInitialize */
@@ -35,17 +30,12 @@ static ConnectionDelegate socketDelegate = {
NULL /* didTimeout */ NULL /* didTimeout */
}; };
void wAbort(Bool foo)
void
wAbort(Bool foo) /*FOLD00*/
{ {
exit(1); exit(1);
} }
static char *getMessage(WMConnection * cPtr)
static char*
getMessage(WMConnection *cPtr)
{ {
char *buffer; char *buffer;
WMData *aData; WMData *aData;
@@ -67,9 +57,7 @@ getMessage(WMConnection *cPtr)
return buffer; return buffer;
} }
static void inputHandler(int fd, int mask, void *clientData)
static void
inputHandler(int fd, int mask, void *clientData)
{ {
WMConnection *cPtr = (WMConnection *) clientData; WMConnection *cPtr = (WMConnection *) clientData;
WMData *aData; WMData *aData;
@@ -87,9 +75,7 @@ inputHandler(int fd, int mask, void *clientData)
} }
} }
static void didReceiveInput(ConnectionDelegate * self, WMConnection * cPtr)
static void
didReceiveInput(ConnectionDelegate *self, WMConnection *cPtr) /*FOLD00*/
{ {
char *buffer; char *buffer;
@@ -104,9 +90,7 @@ didReceiveInput(ConnectionDelegate *self, WMConnection *cPtr) /*FOLD00*/
wfree(buffer); wfree(buffer);
} }
static void connectionDidDie(ConnectionDelegate * self, WMConnection * cPtr)
static void
connectionDidDie(ConnectionDelegate *self, WMConnection *cPtr) /*FOLD00*/
{ {
WMCloseConnection(cPtr); WMCloseConnection(cPtr);
@@ -114,9 +98,7 @@ connectionDidDie(ConnectionDelegate *self, WMConnection *cPtr) /*FOLD00*/
exit(0); exit(0);
} }
static void didInitialize(ConnectionDelegate * self, WMConnection * cPtr)
static void
didInitialize(ConnectionDelegate *self, WMConnection *cPtr)
{ {
int state = WMGetConnectionState(cPtr); int state = WMGetConnectionState(cPtr);
WMHost *host; WMHost *host;
@@ -124,8 +106,7 @@ didInitialize(ConnectionDelegate *self, WMConnection *cPtr)
if (state == WCConnected) { if (state == WCConnected) {
host = WMGetHostWithAddress(WMGetConnectionAddress(cPtr)); host = WMGetHostWithAddress(WMGetConnectionAddress(cPtr));
fprintf(stderr, "connected to '%s:%s'\n", fprintf(stderr, "connected to '%s:%s'\n",
host?WMGetHostName(host):WMGetConnectionAddress(cPtr), host ? WMGetHostName(host) : WMGetConnectionAddress(cPtr), WMGetConnectionService(cPtr));
WMGetConnectionService(cPtr));
initialized = 1; initialized = 1;
if (host) if (host)
WMReleaseHost(host); WMReleaseHost(host);
@@ -136,9 +117,7 @@ didInitialize(ConnectionDelegate *self, WMConnection *cPtr)
} }
} }
int main(int argc, char **argv)
int
main(int argc, char **argv) /*FOLD00*/
{ {
char *ProgName, *host, *port; char *ProgName, *host, *port;
int i; int i;
@@ -171,8 +150,7 @@ main(int argc, char **argv) /*FOLD00*/
} }
} }
printf("Trying to make connection to '%s:%s'\n", printf("Trying to make connection to '%s:%s'\n", host ? host : "localhost", port);
host?host:"localhost", port);
sPtr = WMCreateConnectionToAddressAndNotify(host, port, NULL); sPtr = WMCreateConnectionToAddressAndNotify(host, port, NULL);
if (!sPtr) { if (!sPtr) {
@@ -192,5 +170,3 @@ main(int argc, char **argv) /*FOLD00*/
return 0; return 0;
} }

16
WINGs/Examples/fontl.c
View File

@@ -1,7 +1,7 @@
/* /*
* WINGs demo: font lister * WINGs demo: font lister
* *
* Copyright (c) 1998 Alfredo K. Kojima * Copyright (c) 1998-2003 Alfredo K. Kojima
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -19,16 +19,13 @@
* USA. * USA.
*/ */
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <stdint.h>
#include <WINGs/WINGs.h> #include <WINGs/WINGs.h>
#include <WINGs/WUtil.h> #include <WINGs/WUtil.h>
void void wAbort()
wAbort()
{ {
exit(0); exit(0);
} }
@@ -48,9 +45,7 @@ void quit(WMWidget *self, void *data)
exit(0); exit(0);
} }
int main(int argc, char **argv)
int
main(int argc, char **argv)
{ {
Display *dpy; Display *dpy;
WMWindow *win; WMWindow *win;
@@ -87,7 +82,7 @@ main(int argc, char **argv)
sprintf(buf, "%c", c); sprintf(buf, "%c", c);
WMSetButtonText(lab, buf); WMSetButtonText(lab, buf);
WMSetButtonAction(lab, show, pos); WMSetButtonAction(lab, show, pos);
WMHangData(lab, (void*)c); WMHangData(lab, (void *)(uintptr_t) c);
if (c > 0) { if (c > 0) {
WMGroupButtons(l0, lab); WMGroupButtons(l0, lab);
} else { } else {
@@ -101,4 +96,3 @@ main(int argc, char **argv)
WMScreenMainLoop(scr); WMScreenMainLoop(scr);
return 0; return 0;
} }

58
WINGs/Examples/puzzle.c
View File

@@ -1,18 +1,14 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <WINGs/WINGs.h> #include <WINGs/WINGs.h>
#include <stdint.h>
#define MAX_SIZE 10*10 #define MAX_SIZE 10*10
WMWindow *win; WMWindow *win;
WMButton *Button[MAX_SIZE]; WMButton *Button[MAX_SIZE];
char Map[MAX_SIZE]; signed char Map[MAX_SIZE];
int Size = 4; int Size = 4;
int MoveCount; int MoveCount;
@@ -20,7 +16,6 @@ int MoveCount;
int WinSize = 120; int WinSize = 120;
Bool CheckWin(void) Bool CheckWin(void)
{ {
int i; int i;
@@ -33,16 +28,14 @@ Bool CheckWin(void)
return True; return True;
} }
void MoveButton(int button, int x, int y) void MoveButton(int button, int x, int y)
{ {
WMMoveWidget(Button[button], x * (WinSize / Size), y * (WinSize / Size)); WMMoveWidget(Button[button], x * (WinSize / Size), y * (WinSize / Size));
} }
Bool SlideButton(int button) Bool SlideButton(int button)
{ {
int x, y, done = 0; int x = 0, y = 0, done = 0;
/* locate the button */ /* locate the button */
for (y = 0; y < Size; y++) { for (y = 0; y < Size; y++) {
@@ -78,14 +71,12 @@ Bool SlideButton(int button)
return True; return True;
} }
#define SWAP(a,b) {int tmp; tmp=a; a=b; b=tmp;} #define SWAP(a,b) {int tmp; tmp=a; a=b; b=tmp;}
void ResetGame(void) void ResetGame(void)
{ {
int i, x, y, ox, oy; int i, x, y, ox, oy;
MoveCount = 0; MoveCount = 0;
for (i = 0; i < Size * Size - 1; i++) { for (i = 0; i < Size * Size - 1; i++) {
@@ -99,16 +90,28 @@ void ResetGame(void)
ok = 1; ok = 1;
switch (rand() % 4) { switch (rand() % 4) {
case 0: case 0:
if (x > 0) x--; else ok = 0; if (x > 0)
x--;
else
ok = 0;
break; break;
case 2: case 2:
if (x < Size-1) x++; else ok = 0; if (x < Size - 1)
x++;
else
ok = 0;
break; break;
case 1: case 1:
if (y > 0) y--; else ok = 0; if (y > 0)
y--;
else
ok = 0;
break; break;
case 3: case 3:
if (y < Size-1) y++; else ok = 0; if (y < Size - 1)
y++;
else
ok = 0;
break; break;
} }
if (ok) { if (ok) {
@@ -127,12 +130,11 @@ void ResetGame(void)
} }
} }
void buttonClick(WMWidget * w, void *ptr) void buttonClick(WMWidget * w, void *ptr)
{ {
char buffer[300]; char buffer[300];
if (SlideButton((int)ptr)) { if (SlideButton((uintptr_t)ptr)) {
MoveCount++; MoveCount++;
if (CheckWin()) { if (CheckWin()) {
@@ -148,7 +150,6 @@ void buttonClick(WMWidget *w, void *ptr)
} }
} }
static void resizeObserver(void *self, WMNotification * notif) static void resizeObserver(void *self, WMNotification * notif)
{ {
WMSize size = WMGetViewSize(WMWidgetView(win)); WMSize size = WMGetViewSize(WMWidgetView(win));
@@ -158,17 +159,14 @@ static void resizeObserver(void *self, WMNotification *notif)
for (y = 0; y < Size; y++) { for (y = 0; y < Size; y++) {
for (x = 0; x < Size; x++) { for (x = 0; x < Size; x++) {
if (MAP(x, y) >= 0) { if (MAP(x, y) >= 0) {
WMResizeWidget(Button[(int)MAP(x,y)], WMResizeWidget(Button[(int)MAP(x, y)], WinSize / Size, WinSize / Size);
WinSize/Size, WinSize/Size); WMMoveWidget(Button[(int)MAP(x, y)], x * (WinSize / Size), y * (WinSize / Size));
WMMoveWidget(Button[(int)MAP(x,y)],
x*(WinSize/Size), y*(WinSize/Size));
} }
} }
} }
} }
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
Display *dpy; Display *dpy;
@@ -177,7 +175,6 @@ int main(int argc, char **argv)
WMInitializeApplication("Puzzle", &argc, argv); WMInitializeApplication("Puzzle", &argc, argv);
dpy = XOpenDisplay(""); dpy = XOpenDisplay("");
if (!dpy) { if (!dpy) {
printf("could not open display\n"); printf("could not open display\n");
@@ -193,11 +190,7 @@ int main(int argc, char **argv)
WMSetWindowAspectRatio(win, 2, 2, 2, 2); WMSetWindowAspectRatio(win, 2, 2, 2, 2);
WMSetWindowResizeIncrements(win, Size, Size); WMSetWindowResizeIncrements(win, Size, Size);
WMSetViewNotifySizeChanges(WMWidgetView(win), True); WMSetViewNotifySizeChanges(WMWidgetView(win), True);
WMAddNotificationObserver(resizeObserver, NULL, WMAddNotificationObserver(resizeObserver, NULL, WMViewSizeDidChangeNotification, WMWidgetView(win));
WMViewSizeDidChangeNotification,
WMWidgetView(win));
for (i = y = 0; y < Size && i < Size * Size - 1; y++) { for (i = y = 0; y < Size && i < Size * Size - 1; y++) {
for (x = 0; x < Size && i < Size * Size - 1; x++) { for (x = 0; x < Size && i < Size * Size - 1; x++) {
@@ -212,14 +205,13 @@ int main(int argc, char **argv)
RHSVtoRGB(&hsv, &col); RHSVtoRGB(&hsv, &col);
color = WMCreateRGBColor(scr, col.red<<8, col.green<<8, color = WMCreateRGBColor(scr, col.red << 8, col.green << 8, col.blue << 8, False);
col.blue<<8, False);
MAP(x, y) = i; MAP(x, y) = i;
Button[i] = WMCreateButton(win, WBTMomentaryLight); Button[i] = WMCreateButton(win, WBTMomentaryLight);
WMSetWidgetBackgroundColor(Button[i], color); WMSetWidgetBackgroundColor(Button[i], color);
WMReleaseColor(color); WMReleaseColor(color);
WMSetButtonAction(Button[i], buttonClick, (void*)i); WMSetButtonAction(Button[i], buttonClick, (void *)(uintptr_t) i);
WMResizeWidget(Button[i], WinSize / Size, WinSize / Size); WMResizeWidget(Button[i], WinSize / Size, WinSize / Size);
WMMoveWidget(Button[i], x * (WinSize / Size), y * (WinSize / Size)); WMMoveWidget(Button[i], x * (WinSize / Size), y * (WinSize / Size));
sprintf(buf, "%i", i + 1); sprintf(buf, "%i", i + 1);

165
WINGs/Examples/server.c
View File

@@ -1,34 +1,28 @@
/* /*
* WINGs server.c: example how to create a network server using WMConnection * WINGs server.c: example how to create a network server using WMConnection
* *
* Copyright (c) 2001 Dan Pascu * Copyright (c) 2001-2003 Dan Pascu
* *
*/ */
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <string.h> #include <string.h>
#include <WINGs/WINGs.h> #include <WINGs/WINGs.h>
#define _(P) P #define _(P) P
#define MAXCMD_SIZE 512 #define MAXCMD_SIZE 512
char *SEConnectionShouldBeRemovedNotification = "SEConnectionShouldBeRemovedNotification"; char *SEConnectionShouldBeRemovedNotification = "SEConnectionShouldBeRemovedNotification";
static void didReceiveInput(ConnectionDelegate * self, WMConnection * cPtr); static void didReceiveInput(ConnectionDelegate * self, WMConnection * cPtr);
static void connectionDidDie(ConnectionDelegate * self, WMConnection * cPtr); static void connectionDidDie(ConnectionDelegate * self, WMConnection * cPtr);
static void connectionDidTimeout(ConnectionDelegate * self, WMConnection * cPtr); static void connectionDidTimeout(ConnectionDelegate * self, WMConnection * cPtr);
extern char *SEConnectionShouldBeRemovedNotification; extern char *SEConnectionShouldBeRemovedNotification;
static WMUserDefaults *timeDB = NULL; static WMUserDefaults *timeDB = NULL;
@@ -38,10 +32,9 @@ static WMArray *allowedHostList = NULL;
static WMArray *clientConnections = NULL; static WMArray *clientConnections = NULL;
static WMConnection *serverPtr = NULL; static WMConnection *serverPtr = NULL;
static ConnectionDelegate socketDelegate = { static ConnectionDelegate socketDelegate = {
NULL, /* client data */ NULL, /* client data */
NULL, /* canResumeSending */
NULL, /* didCatchException */ NULL, /* didCatchException */
connectionDidDie, /* didDie */ connectionDidDie, /* didDie */
NULL, /* didInitialize */ NULL, /* didInitialize */
@@ -49,17 +42,12 @@ static ConnectionDelegate socketDelegate = {
connectionDidTimeout /* didTimeout */ connectionDidTimeout /* didTimeout */
}; };
void wAbort(Bool foo)
void
wAbort(Bool foo) /*FOLD00*/
{ {
exit(1); exit(1);
} }
static void printHelp(char *progname)
static void
printHelp(char *progname) /*FOLD00*/
{ {
printf(_("usage: %s [options]\n\n"), progname); printf(_("usage: %s [options]\n\n"), progname);
puts(_(" --help print this message")); puts(_(" --help print this message"));
@@ -77,21 +65,16 @@ printHelp(char *progname) /*FOLD00*/
" separated and should NOT contain ANY spaces.")); " separated and should NOT contain ANY spaces."));
} }
static void enqueueConnectionForRemoval(WMConnection * cPtr)
static void
enqueueConnectionForRemoval(WMConnection *cPtr)
{ {
WMNotification *notif; WMNotification *notif;
/*don't release notif here. it will be released by queue after processing */ /*don't release notif here. it will be released by queue after processing */
notif = WMCreateNotification(SEConnectionShouldBeRemovedNotification, notif = WMCreateNotification(SEConnectionShouldBeRemovedNotification, cPtr, NULL);
cPtr, NULL);
WMEnqueueNotification(WMGetDefaultNotificationQueue(), notif, WMPostASAP); WMEnqueueNotification(WMGetDefaultNotificationQueue(), notif, WMPostASAP);
} }
static int sendMessage(WMConnection * cPtr, char *message)
static int
sendMessage(WMConnection *cPtr, char *message)
{ {
WMData *aData; WMData *aData;
int res; int res;
@@ -106,9 +89,7 @@ sendMessage(WMConnection *cPtr, char *message)
return res; return res;
} }
static Bool enqueueMessage(WMConnection * cPtr, char *message)
static Bool
enqueueMessage(WMConnection *cPtr, char *message)
{ {
WMData *aData; WMData *aData;
Bool res; Bool res;
@@ -123,9 +104,7 @@ enqueueMessage(WMConnection *cPtr, char *message)
return res; return res;
} }
static char *findDelimiter(char *data, const char *endPtr)
static unsigned char*
findDelimiter(unsigned char *data, unsigned const char *endPtr)
{ {
wassertrv(data < endPtr, NULL); wassertrv(data < endPtr, NULL);
@@ -138,9 +117,7 @@ findDelimiter(unsigned char *data, unsigned const char *endPtr)
return NULL; return NULL;
} }
static WMArray *getAvailableMessages(WMConnection * cPtr)
static WMArray*
getAvailableMessages(WMConnection *cPtr)
{ {
char *ptr, *crtPos, *buffer; char *ptr, *crtPos, *buffer;
const char *bytes, *endPtr; const char *bytes, *endPtr;
@@ -223,10 +200,7 @@ getAvailableMessages(WMConnection *cPtr)
return messages; return messages;
} }
static void complainAboutBadArgs(WMConnection * cPtr, char *cmdName, char *badArgs)
static void
complainAboutBadArgs(WMConnection *cPtr, char *cmdName, char *badArgs) /*FOLD00*/
{ {
char *buf = wmalloc(strlen(cmdName) + strlen(badArgs) + 100); char *buf = wmalloc(strlen(cmdName) + strlen(badArgs) + 100);
@@ -236,9 +210,7 @@ complainAboutBadArgs(WMConnection *cPtr, char *cmdName, char *badArgs) /*FOLD00*
wfree(buf); wfree(buf);
} }
static void sendUpdateMessage(WMConnection * cPtr, char *id, int time)
static void
sendUpdateMessage(WMConnection *cPtr, char *id, int time) /*FOLD00*/
{ {
char *buf = wmalloc(strlen(id) + 100); char *buf = wmalloc(strlen(id) + 100);
@@ -247,16 +219,12 @@ sendUpdateMessage(WMConnection *cPtr, char *id, int time) /*FOLD00*/
wfree(buf); wfree(buf);
} }
static void showId(WMConnection * cPtr)
static void
showId(WMConnection *cPtr)
{ {
sendMessage(cPtr, "Server example based on WMConnection\n"); sendMessage(cPtr, "Server example based on WMConnection\n");
} }
static void showHelp(WMConnection * cPtr)
static void
showHelp(WMConnection *cPtr) /*FOLD00*/
{ {
char *buf = wmalloc(strlen(WMGetApplicationName()) + 16); char *buf = wmalloc(strlen(WMGetApplicationName()) + 16);
@@ -264,20 +232,13 @@ showHelp(WMConnection *cPtr) /*FOLD00*/
enqueueMessage(cPtr, _("\n")); enqueueMessage(cPtr, _("\n"));
enqueueMessage(cPtr, buf); enqueueMessage(cPtr, buf);
enqueueMessage(cPtr, _("GET <id>\t- return time left (in minutes) " enqueueMessage(cPtr, _("GET <id>\t- return time left (in minutes) " "for user with id <id>\n"));
"for user with id <id>\n")); enqueueMessage(cPtr, _("SET <id> <time>\t- set time limit to <time> " "minutes for user with id <id>\n"));
enqueueMessage(cPtr, _("SET <id> <time>\t- set time limit to <time> " enqueueMessage(cPtr, _("ADD <id> <time>\t- add <time> minutes " "for user with id <id>\n"));
"minutes for user with id <id>\n")); enqueueMessage(cPtr, _("SUB <id> <time>\t- subtract <time> minutes " "for user with id <id>\n"));
enqueueMessage(cPtr, _("ADD <id> <time>\t- add <time> minutes " enqueueMessage(cPtr, _("REMOVE <id>\t- remove time limitations for " "user with id <id>\n"));
"for user with id <id>\n")); enqueueMessage(cPtr, _("LIST\t\t- list all users and their " "corresponding time limit\n"));
enqueueMessage(cPtr, _("SUB <id> <time>\t- subtract <time> minutes " enqueueMessage(cPtr, _("ID\t\t- returns the Time Manager " "identification string\n"));
"for user with id <id>\n"));
enqueueMessage(cPtr, _("REMOVE <id>\t- remove time limitations for "
"user with id <id>\n"));
enqueueMessage(cPtr, _("LIST\t\t- list all users and their "
"corresponding time limit\n"));
enqueueMessage(cPtr, _("ID\t\t- returns the Time Manager "
"identification string\n"));
enqueueMessage(cPtr, _("EXIT\t\t- exits session\n")); enqueueMessage(cPtr, _("EXIT\t\t- exits session\n"));
enqueueMessage(cPtr, _("QUIT\t\t- exits session\n")); enqueueMessage(cPtr, _("QUIT\t\t- exits session\n"));
enqueueMessage(cPtr, _("HELP\t\t- show this message\n\n")); enqueueMessage(cPtr, _("HELP\t\t- show this message\n\n"));
@@ -286,9 +247,7 @@ showHelp(WMConnection *cPtr) /*FOLD00*/
wfree(buf); wfree(buf);
} }
static void listUsers(WMConnection * cPtr)
static void
listUsers(WMConnection *cPtr)
{ {
WMPropList *userList; WMPropList *userList;
char *id; char *id;
@@ -305,9 +264,7 @@ listUsers(WMConnection *cPtr)
WMReleasePropList(userList); WMReleasePropList(userList);
} }
static void setTimeForUser(WMConnection * cPtr, char *cmdArgs)
static void
setTimeForUser(WMConnection *cPtr, char *cmdArgs) /*FOLD00*/
{ {
char *id; char *id;
int i, time; int i, time;
@@ -330,9 +287,7 @@ setTimeForUser(WMConnection *cPtr, char *cmdArgs) /*FOLD00*/
wfree(id); wfree(id);
} }
static void addTimeToUser(WMConnection * cPtr, char *cmdArgs)
static void
addTimeToUser(WMConnection *cPtr, char *cmdArgs) /*FOLD00*/
{ {
char *id; char *id;
int i, time, newTime; int i, time, newTime;
@@ -357,9 +312,7 @@ addTimeToUser(WMConnection *cPtr, char *cmdArgs) /*FOLD00*/
wfree(id); wfree(id);
} }
static void subTimeFromUser(WMConnection * cPtr, char *cmdArgs)
static void
subTimeFromUser(WMConnection *cPtr, char *cmdArgs) /*FOLD00*/
{ {
char *id; char *id;
int i, time, newTime; int i, time, newTime;
@@ -384,9 +337,7 @@ subTimeFromUser(WMConnection *cPtr, char *cmdArgs) /*FOLD00*/
wfree(id); wfree(id);
} }
static void removeTimeForUser(WMConnection * cPtr, char *cmdArgs)
static void
removeTimeForUser(WMConnection *cPtr, char *cmdArgs) /*FOLD00*/
{ {
char *ptr; char *ptr;
int i; int i;
@@ -410,16 +361,13 @@ removeTimeForUser(WMConnection *cPtr, char *cmdArgs) /*FOLD00*/
} }
} }
static void getTimeForUser(WMConnection * cPtr, char *cmdArgs)
static void
getTimeForUser(WMConnection *cPtr, char *cmdArgs) /*FOLD00*/
{ {
char *ptr; char *ptr;
int time; int time;
if (cmdArgs[0] == '\0') { if (cmdArgs[0] == '\0') {
sendMessage(cPtr, _("Missing parameter for command GET." sendMessage(cPtr, _("Missing parameter for command GET." " Use HELP for a list of commands.\n"));
" Use HELP for a list of commands.\n"));
return; return;
} }
@@ -436,9 +384,7 @@ getTimeForUser(WMConnection *cPtr, char *cmdArgs) /*FOLD00*/
sendUpdateMessage(cPtr, cmdArgs, time); sendUpdateMessage(cPtr, cmdArgs, time);
} }
static void handleConnection(WMConnection * cPtr)
static void
handleConnection(WMConnection *cPtr)
{ {
char *command, *ptr, *cmdArgs, *buffer; char *command, *ptr, *cmdArgs, *buffer;
WMArray *commands; WMArray *commands;
@@ -490,8 +436,7 @@ handleConnection(WMConnection *cPtr)
getTimeForUser(cPtr, cmdArgs); getTimeForUser(cPtr, cmdArgs);
} else { } else {
buffer = wmalloc(strlen(command) + 100); buffer = wmalloc(strlen(command) + 100);
sprintf(buffer, _("Unknown command '%s'. Try HELP for" sprintf(buffer, _("Unknown command '%s'. Try HELP for" " a list of commands.\n"), command);
" a list of commands.\n"), command);
sendMessage(cPtr, buffer); sendMessage(cPtr, buffer);
wfree(buffer); wfree(buffer);
} }
@@ -500,9 +445,7 @@ handleConnection(WMConnection *cPtr)
WMFreeArray(commands); WMFreeArray(commands);
} }
static Bool isAllowedToConnect(WMConnection * cPtr)
static Bool
isAllowedToConnect(WMConnection *cPtr)
{ {
WMHost *hPtr; WMHost *hPtr;
int i; int i;
@@ -523,9 +466,7 @@ isAllowedToConnect(WMConnection *cPtr)
return False; return False;
} }
static void didReceiveInput(ConnectionDelegate * self, WMConnection * cPtr)
static void
didReceiveInput(ConnectionDelegate *self, WMConnection *cPtr) /*FOLD00*/
{ {
if (cPtr == serverPtr) { if (cPtr == serverPtr) {
WMConnection *newPtr = WMAcceptConnection(cPtr); WMConnection *newPtr = WMAcceptConnection(cPtr);
@@ -546,9 +487,7 @@ didReceiveInput(ConnectionDelegate *self, WMConnection *cPtr) /*FOLD00*/
} }
} }
static void connectionDidTimeout(ConnectionDelegate * self, WMConnection * cPtr)
static void
connectionDidTimeout(ConnectionDelegate *self, WMConnection *cPtr) /*FOLD00*/
{ {
WMHost *hPtr; WMHost *hPtr;
@@ -558,16 +497,13 @@ connectionDidTimeout(ConnectionDelegate *self, WMConnection *cPtr) /*FOLD00*/
} }
hPtr = WMGetHostWithAddress(WMGetConnectionAddress(cPtr)); hPtr = WMGetHostWithAddress(WMGetConnectionAddress(cPtr));
wwarning(_("Connection with %s did timeout. Closing connection."), wwarning(_("Connection with %s did timeout. Closing connection."), WMGetHostName(hPtr));
WMGetHostName(hPtr));
WMReleaseHost(hPtr); WMReleaseHost(hPtr);
enqueueConnectionForRemoval(cPtr); enqueueConnectionForRemoval(cPtr);
} }
static void connectionDidDie(ConnectionDelegate * self, WMConnection * cPtr)
static void
connectionDidDie(ConnectionDelegate *self, WMConnection *cPtr)
{ {
if (cPtr == serverPtr) { if (cPtr == serverPtr) {
/* trouble. server listening port itself died!!! */ /* trouble. server listening port itself died!!! */
@@ -578,9 +514,7 @@ connectionDidDie(ConnectionDelegate *self, WMConnection *cPtr)
enqueueConnectionForRemoval(cPtr); enqueueConnectionForRemoval(cPtr);
} }
static void removeConnection(void *observer, WMNotification * notification)
static void
removeConnection(void *observer, WMNotification *notification)
{ {
WMConnection *cPtr = (WMConnection *) WMGetNotificationObject(notification); WMConnection *cPtr = (WMConnection *) WMGetNotificationObject(notification);
WMData *data; WMData *data;
@@ -591,16 +525,13 @@ removeConnection(void *observer, WMNotification *notification)
WMDestroyConnection(cPtr); WMDestroyConnection(cPtr);
} }
static void static void updatedDomain(void *observer, WMNotification * notification)
updatedDomain(void *observer, WMNotification *notification)
{ {
wmessage("defaults domain file changed on disk. synchronizing."); wmessage("defaults domain file changed on disk. synchronizing.");
} }
#if 0 #if 0
static Bool static Bool isDifferent(char *str1, char *str2)
isDifferent(char *str1, char *str2) /*FOLD00*/
{ {
if ((!str1 && !str2) || (str1 && str2 && strcmp(str1, str2) == 0)) if ((!str1 && !str2) || (str1 && str2 && strcmp(str1, str2) == 0))
return False; return False;
@@ -609,9 +540,7 @@ isDifferent(char *str1, char *str2) /*FOLD00*/
} }
#endif #endif
int main(int argc, char **argv)
int
main(int argc, char **argv) /*FOLD00*/
{ {
int i; int i;
@@ -681,8 +610,7 @@ main(int argc, char **argv) /*FOLD00*/
} }
timeDB = WMGetDefaultsFromPath("./UserTime.plist"); timeDB = WMGetDefaultsFromPath("./UserTime.plist");
WMAddNotificationObserver(updatedDomain, NULL, WMAddNotificationObserver(updatedDomain, NULL, WMUserDefaultsDidChangeNotification, NULL);
WMUserDefaultsDidChangeNotification, NULL);
clientConnections = WMCreateArray(4); clientConnections = WMCreateArray(4);
@@ -695,8 +623,7 @@ main(int argc, char **argv) /*FOLD00*/
if (ServerPort == NULL) if (ServerPort == NULL)
ServerPort = "34567"; ServerPort = "34567";
printf("Server will listen on '%s:%s'\n", ServerAddress?ServerAddress:"Any", printf("Server will listen on '%s:%s'\n", ServerAddress ? ServerAddress : "Any", ServerPort);
ServerPort);
printf("This server will allow connections from:"); printf("This server will allow connections from:");
if (allowedHostList) { if (allowedHostList) {
int i; int i;
@@ -711,8 +638,7 @@ main(int argc, char **argv) /*FOLD00*/
printf(" any host.\n"); printf(" any host.\n");
} }
serverPtr = WMCreateConnectionAsServerAtAddress(ServerAddress, ServerPort, serverPtr = WMCreateConnectionAsServerAtAddress(ServerAddress, ServerPort, NULL);
NULL);
if (!serverPtr) { if (!serverPtr) {
wfatal("could not create server on `%s:%s`. Exiting.", wfatal("could not create server on `%s:%s`. Exiting.",
@@ -722,8 +648,7 @@ main(int argc, char **argv) /*FOLD00*/
WMSetConnectionDelegate(serverPtr, &socketDelegate); WMSetConnectionDelegate(serverPtr, &socketDelegate);
WMAddNotificationObserver(removeConnection, NULL, WMAddNotificationObserver(removeConnection, NULL, SEConnectionShouldBeRemovedNotification, NULL);
SEConnectionShouldBeRemovedNotification, NULL);
while (1) { while (1) {
/* The ASAP notification queue is called at the end of WHandleEvents() /* The ASAP notification queue is called at the end of WHandleEvents()
@@ -734,5 +659,3 @@ main(int argc, char **argv) /*FOLD00*/
return 0; return 0;
} }

5
WINGs/Extras/.cvsignore
View File

@@ -1,5 +0,0 @@
Makefile Makefile.in
.libs
test
.psrc .inslog2 tca.map tca.log
*.rpt

21
WINGs/Extras/Makefile.am
View File

@@ -10,23 +10,38 @@ includedir = @includedir@/WINGs
include_HEADERS = wtableview.h wtabledelegates.h include_HEADERS = wtableview.h wtabledelegates.h
lib_LIBRARIES = libExtraWINGs.a lib_LTLIBRARIES = libExtraWINGs.la
noinst_PROGRAMS = test noinst_PROGRAMS = test
EXTRA_DIST = EXTRA_DIST =
libExtraWINGs_a_SOURCES = \ libExtraWINGs_a_AR = $(QUIET_AR) $(AR) $(ARFLAGS)
libExtraWINGs_la_SOURCES = \
wtableview.c \ wtableview.c \
wtabledelegates.c \ wtabledelegates.c \
wtableview.h \ wtableview.h \
wtabledelegates.h wtabledelegates.h
AM_CFLAGS = @NOSTRICTALIASING@
INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs \ INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs \
-DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG -DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG
LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
$(top_builddir)/WINGs/libWUtil.la \
@XFTLIBS@ @INTLIBS@
test_LDADD = wtableview.o wtabledelegates.o $(LDADD) test_LDADD = wtableview.o wtabledelegates.o $(LDADD)
LIBTOOL = $(SHELL) $(top_srcdir)/libtool $(LIBTOOL_ARG)
.c.o:
$(QUIET)$(COMPILE) -c $<
.c.obj:
$(QUIET)$(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
$(QUIET)$(LTCOMPILE) -c -o $@ $<

28
WINGs/Extras/test.c
View File

@@ -1,14 +1,13 @@
#include <WINGs/WINGs.h> #include <WINGs/WINGs.h>
#include <stdio.h> #include <stdio.h>
#include <stdint.h>
#include "wtableview.h" #include "wtableview.h"
#include "wtabledelegates.h" #include "wtabledelegates.h"
static char *col1[20] = { 0 }; static char *col1[20] = { 0 };
static int col2[20];
static int col2[20];
static char *options[] = { static char *options[] = {
"Option1", "Option1",
@@ -18,13 +17,11 @@ static char *options[] = {
"Option5" "Option5"
}; };
int numberOfRows(WMTableViewDelegate * self, WMTableView * table) int numberOfRows(WMTableViewDelegate * self, WMTableView * table)
{ {
return 20; return 20;
} }
void *valueForCell(WMTableViewDelegate * self, WMTableColumn * column, int row) void *valueForCell(WMTableViewDelegate * self, WMTableColumn * column, int row)
{ {
/*WMTableView *table = (WMTableView*)WMGetTableColumnTableView(column); */ /*WMTableView *table = (WMTableView*)WMGetTableColumnTableView(column); */
@@ -39,23 +36,20 @@ void *valueForCell(WMTableViewDelegate *self, WMTableColumn *column, int row)
col2[i] = 0; col2[i] = 0;
} }
} }
if ((int)WMGetTableColumnId(column) == 1) if ((uintptr_t)WMGetTableColumnId(column) == 1)
return col1[row]; return col1[row];
else else
return (void*)col2[row]; return (void *)(uintptr_t) col2[row];
} }
void setValueForCell(WMTableViewDelegate * self, WMTableColumn * column, int row, void *data)
void setValueForCell(WMTableViewDelegate *self, WMTableColumn *column, int row,
void *data)
{ {
if ((int)WMGetTableColumnId(column) == 1) if ((uintptr_t)WMGetTableColumnId(column) == 1)
col1[row] = data; col1[row] = data;
else else
col2[row] = (int)data; col2[row] = (uintptr_t) data;
} }
static WMTableViewDelegate delegate = { static WMTableViewDelegate delegate = {
NULL, NULL,
numberOfRows, numberOfRows,
@@ -63,8 +57,6 @@ static WMTableViewDelegate delegate = {
setValueForCell setValueForCell
}; };
void clickedTable(WMWidget * w, void *self) void clickedTable(WMWidget * w, void *self)
{ {
int row = WMGetTableViewClickedRow((WMTableView *) self); int row = WMGetTableViewClickedRow((WMTableView *) self);
@@ -72,10 +64,7 @@ void clickedTable(WMWidget *w, void *self)
WMEditTableViewRow(self, row); WMEditTableViewRow(self, row);
} }
int main(int argc, char **argv)
int
main(int argc, char **argv)
{ {
WMScreen *scr; WMScreen *scr;
WMWindow *win; WMWindow *win;
@@ -94,6 +83,7 @@ main(int argc, char **argv)
WMMapWidget(win); WMMapWidget(win);
table = WMCreateTableView(win); table = WMCreateTableView(win);
WMSetTableViewHasHorizontalScroller(table, 0);
WMSetViewExpandsToParent(WMWidgetView(table), 10, 10, 10, 10); WMSetViewExpandsToParent(WMWidgetView(table), 10, 10, 10, 10);
WMSetTableViewBackgroundColor(table, WMWhiteColor(scr)); WMSetTableViewBackgroundColor(table, WMWhiteColor(scr));
/*WMSetTableViewGridColor(table, WMGrayColor(scr)); */ /*WMSetTableViewGridColor(table, WMGrayColor(scr)); */

234
WINGs/Extras/wtabledelegates.c
View File

@@ -1,5 +1,5 @@
#include <stdint.h>
#include <WINGs/WINGsP.h> #include <WINGs/WINGsP.h>
#include "wtableview.h" #include "wtableview.h"
@@ -11,27 +11,23 @@ typedef struct {
WMFont *font; WMFont *font;
GC gc; GC gc;
GC selGC; GC selGC;
GC textGC; WMColor *textColor;
} StringData; } StringData;
typedef struct { typedef struct {
WMTableView *table; WMTableView *table;
GC selGc; GC selGc;
} PixmapData; } PixmapData;
typedef struct { typedef struct {
WMTextField *widget; WMTextField *widget;
WMTableView *table; WMTableView *table;
WMFont *font; WMFont *font;
GC gc; GC gc;
GC selGC; GC selGC;
GC textGC; WMColor *textColor;
} StringEditorData; } StringEditorData;
typedef struct { typedef struct {
WMPopUpButton *widget; WMPopUpButton *widget;
WMTableView *table; WMTableView *table;
@@ -40,10 +36,9 @@ typedef struct {
int count; int count;
GC gc; GC gc;
GC selGC; GC selGC;
GC textGC; WMColor *textColor;
} EnumSelectorData; } EnumSelectorData;
typedef struct { typedef struct {
WMButton *widget; WMButton *widget;
WMTableView *table; WMTableView *table;
@@ -52,14 +47,11 @@ typedef struct {
GC selGC; GC selGC;
} BooleanSwitchData; } BooleanSwitchData;
static char *SelectionColor = "#bbbbcc"; static char *SelectionColor = "#bbbbcc";
static void
stringDraw(WMScreen * scr, Drawable d, GC gc, GC sgc, WMColor * textColor,
static void stringDraw(WMScreen *scr, Drawable d, GC gc, WMFont * font, void *data, WMRect rect, Bool selected)
GC sgc, GC stgc, WMFont *font, void *data,
WMRect rect, Bool selected)
{ {
int x, y; int x, y;
XRectangle rects[1]; XRectangle rects[1];
@@ -77,22 +69,17 @@ static void stringDraw(WMScreen *scr, Drawable d, GC gc,
if (!selected) { if (!selected) {
XFillRectangles(dpy, d, gc, rects, 1); XFillRectangles(dpy, d, gc, rects, 1);
WMDrawString(scr, d, stgc, font, x, y, WMDrawString(scr, d, textColor, font, x, y, data, strlen(data));
data, strlen(data));
} else { } else {
XFillRectangles(dpy, d, sgc, rects, 1); XFillRectangles(dpy, d, sgc, rects, 1);
WMDrawString(scr, d, stgc, font, x, y, WMDrawString(scr, d, textColor, font, x, y, data, strlen(data));
data, strlen(data));
} }
XSetClipMask(dpy, gc, None); XSetClipMask(dpy, gc, None);
} }
static void pixmapDraw(WMScreen * scr, Drawable d, GC gc, GC sgc, WMPixmap * pixmap, WMRect rect, Bool selected)
static void pixmapDraw(WMScreen *scr, Drawable d, GC gc, GC sgc,
WMPixmap *pixmap, WMRect rect, Bool selected)
{ {
int x, y; int x, y;
XRectangle rects[1]; XRectangle rects[1];
@@ -130,41 +117,29 @@ static void pixmapDraw(WMScreen *scr, Drawable d, GC gc, GC sgc,
XSetClipMask(dpy, gc, None); XSetClipMask(dpy, gc, None);
} }
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
static void SECellPainter(WMTableColumnDelegate * self, WMTableColumn * column, int row, Drawable d)
static void SECellPainter(WMTableColumnDelegate *self,
WMTableColumn *column, int row, Drawable d)
{ {
StringEditorData *strdata = (StringEditorData *) self->data; StringEditorData *strdata = (StringEditorData *) self->data;
WMTableView *table = WMGetTableColumnTableView(column); WMTableView *table = WMGetTableColumnTableView(column);
stringDraw(WMWidgetScreen(table), d, stringDraw(WMWidgetScreen(table), d,
strdata->gc, strdata->selGC, strdata->textGC, strdata->font, strdata->gc, strdata->selGC, strdata->textColor, strdata->font,
WMTableViewDataForCell(table, column, row), WMTableViewDataForCell(table, column, row), WMTableViewRectForCell(table, column, row), False);
WMTableViewRectForCell(table, column, row),
False);
} }
static void selectedSECellPainter(WMTableColumnDelegate * self, WMTableColumn * column, int row, Drawable d)
static void selectedSECellPainter(WMTableColumnDelegate *self,
WMTableColumn *column, int row, Drawable d)
{ {
StringEditorData *strdata = (StringEditorData *) self->data; StringEditorData *strdata = (StringEditorData *) self->data;
WMTableView *table = WMGetTableColumnTableView(column); WMTableView *table = WMGetTableColumnTableView(column);
stringDraw(WMWidgetScreen(table), d, stringDraw(WMWidgetScreen(table), d,
strdata->gc, strdata->selGC, strdata->textGC, strdata->font, strdata->gc, strdata->selGC, strdata->textColor, strdata->font,
WMTableViewDataForCell(table, column, row), WMTableViewDataForCell(table, column, row), WMTableViewRectForCell(table, column, row), True);
WMTableViewRectForCell(table, column, row),
True);
} }
static void beginSECellEdit(WMTableColumnDelegate * self, WMTableColumn * column, int row)
static void beginSECellEdit(WMTableColumnDelegate *self,
WMTableColumn *column, int row)
{ {
StringEditorData *strdata = (StringEditorData *) self->data; StringEditorData *strdata = (StringEditorData *) self->data;
WMRect rect = WMTableViewRectForCell(strdata->table, column, row); WMRect rect = WMTableViewRectForCell(strdata->table, column, row);
@@ -177,9 +152,7 @@ static void beginSECellEdit(WMTableColumnDelegate *self,
WMMapWidget(strdata->widget); WMMapWidget(strdata->widget);
} }
static void endSECellEdit(WMTableColumnDelegate * self, WMTableColumn * column, int row)
static void endSECellEdit(WMTableColumnDelegate *self,
WMTableColumn *column, int row)
{ {
StringEditorData *strdata = (StringEditorData *) self->data; StringEditorData *strdata = (StringEditorData *) self->data;
char *text; char *text;
@@ -190,7 +163,6 @@ static void endSECellEdit(WMTableColumnDelegate *self,
WMSetTableViewDataForCell(strdata->table, column, row, (void *)text); WMSetTableViewDataForCell(strdata->table, column, row, (void *)text);
} }
WMTableColumnDelegate *WTCreateStringEditorDelegate(WMTableView * parent) WMTableColumnDelegate *WTCreateStringEditorDelegate(WMTableView * parent)
{ {
WMTableColumnDelegate *delegate = wmalloc(sizeof(WMTableColumnDelegate)); WMTableColumnDelegate *delegate = wmalloc(sizeof(WMTableColumnDelegate));
@@ -198,14 +170,12 @@ WMTableColumnDelegate *WTCreateStringEditorDelegate(WMTableView *parent)
StringEditorData *data = wmalloc(sizeof(StringEditorData)); StringEditorData *data = wmalloc(sizeof(StringEditorData));
data->widget = WMCreateTextField(parent); data->widget = WMCreateTextField(parent);
W_ReparentView(WMWidgetView(data->widget), W_ReparentView(WMWidgetView(data->widget), WMGetTableViewDocumentView(parent), 0, 0);
WMGetTableViewDocumentView(parent),
0, 0);
data->table = parent; data->table = parent;
data->font = WMSystemFontOfSize(scr, 12); data->font = WMSystemFontOfSize(scr, 12);
data->selGC = WMColorGC(WMCreateNamedColor(scr, SelectionColor, False));
data->textGC = WMColorGC(WMBlackColor(scr));
data->gc = WMColorGC(WMWhiteColor(scr)); data->gc = WMColorGC(WMWhiteColor(scr));
data->selGC = WMColorGC(WMCreateNamedColor(scr, SelectionColor, False));
data->textColor = WMBlackColor(scr);
delegate->data = data; delegate->data = data;
delegate->drawCell = SECellPainter; delegate->drawCell = SECellPainter;
@@ -216,47 +186,35 @@ WMTableColumnDelegate *WTCreateStringEditorDelegate(WMTableView *parent)
return delegate; return delegate;
} }
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
static void ESCellPainter(WMTableColumnDelegate * self, WMTableColumn * column, int row, Drawable d)
static void ESCellPainter(WMTableColumnDelegate *self,
WMTableColumn *column, int row, Drawable d)
{ {
EnumSelectorData *strdata = (EnumSelectorData *) self->data; EnumSelectorData *strdata = (EnumSelectorData *) self->data;
WMTableView *table = WMGetTableColumnTableView(column); WMTableView *table = WMGetTableColumnTableView(column);
int i = (int)WMTableViewDataForCell(table, column, row); uintptr_t i = (uintptr_t)WMTableViewDataForCell(table, column, row);
stringDraw(WMWidgetScreen(table), d, stringDraw(WMWidgetScreen(table), d,
strdata->gc, strdata->selGC, strdata->textGC, strdata->font, strdata->gc, strdata->selGC, strdata->textColor, strdata->font,
strdata->options[i], strdata->options[i], WMTableViewRectForCell(table, column, row), False);
WMTableViewRectForCell(table, column, row),
False);
} }
static void selectedESCellPainter(WMTableColumnDelegate * self, WMTableColumn * column, int row, Drawable d)
static void selectedESCellPainter(WMTableColumnDelegate *self,
WMTableColumn *column, int row, Drawable d)
{ {
EnumSelectorData *strdata = (EnumSelectorData *) self->data; EnumSelectorData *strdata = (EnumSelectorData *) self->data;
WMTableView *table = WMGetTableColumnTableView(column); WMTableView *table = WMGetTableColumnTableView(column);
int i = (int)WMTableViewDataForCell(table, column, row); uintptr_t i = (uintptr_t)WMTableViewDataForCell(table, column, row);
stringDraw(WMWidgetScreen(table), d, stringDraw(WMWidgetScreen(table), d,
strdata->gc, strdata->selGC, strdata->textGC, strdata->font, strdata->gc, strdata->selGC, strdata->textColor, strdata->font,
strdata->options[i], strdata->options[i], WMTableViewRectForCell(table, column, row), True);
WMTableViewRectForCell(table, column, row),
True);
} }
static void beginESCellEdit(WMTableColumnDelegate * self, WMTableColumn * column, int row)
static void beginESCellEdit(WMTableColumnDelegate *self,
WMTableColumn *column, int row)
{ {
EnumSelectorData *strdata = (EnumSelectorData *) self->data; EnumSelectorData *strdata = (EnumSelectorData *) self->data;
WMRect rect = WMTableViewRectForCell(strdata->table, column, row); WMRect rect = WMTableViewRectForCell(strdata->table, column, row);
int data = (int)WMTableViewDataForCell(strdata->table, column, row); uintptr_t data = (uintptr_t)WMTableViewDataForCell(strdata->table, column, row);
wassertr(data < strdata->count); wassertr(data < strdata->count);
@@ -268,9 +226,7 @@ static void beginESCellEdit(WMTableColumnDelegate *self,
WMMapWidget(strdata->widget); WMMapWidget(strdata->widget);
} }
static void endESCellEdit(WMTableColumnDelegate * self, WMTableColumn * column, int row)
static void endESCellEdit(WMTableColumnDelegate *self,
WMTableColumn *column, int row)
{ {
EnumSelectorData *strdata = (EnumSelectorData *) self->data; EnumSelectorData *strdata = (EnumSelectorData *) self->data;
int option; int option;
@@ -278,10 +234,9 @@ static void endESCellEdit(WMTableColumnDelegate *self,
WMUnmapWidget(strdata->widget); WMUnmapWidget(strdata->widget);
option = WMGetPopUpButtonSelectedItem(strdata->widget); option = WMGetPopUpButtonSelectedItem(strdata->widget);
WMSetTableViewDataForCell(strdata->table, column, row, (void*)option); WMSetTableViewDataForCell(strdata->table, column, row, (void *)(uintptr_t) option);
} }
WMTableColumnDelegate *WTCreateEnumSelectorDelegate(WMTableView * parent) WMTableColumnDelegate *WTCreateEnumSelectorDelegate(WMTableView * parent)
{ {
WMTableColumnDelegate *delegate = wmalloc(sizeof(WMTableColumnDelegate)); WMTableColumnDelegate *delegate = wmalloc(sizeof(WMTableColumnDelegate));
@@ -289,14 +244,12 @@ WMTableColumnDelegate *WTCreateEnumSelectorDelegate(WMTableView *parent)
EnumSelectorData *data = wmalloc(sizeof(EnumSelectorData)); EnumSelectorData *data = wmalloc(sizeof(EnumSelectorData));
data->widget = WMCreatePopUpButton(parent); data->widget = WMCreatePopUpButton(parent);
W_ReparentView(WMWidgetView(data->widget), W_ReparentView(WMWidgetView(data->widget), WMGetTableViewDocumentView(parent), 0, 0);
WMGetTableViewDocumentView(parent),
0, 0);
data->table = parent; data->table = parent;
data->font = WMSystemFontOfSize(scr, 12); data->font = WMSystemFontOfSize(scr, 12);
data->selGC = WMColorGC(WMCreateNamedColor(scr, SelectionColor, False));
data->textGC = WMColorGC(WMBlackColor(scr));
data->gc = WMColorGC(WMWhiteColor(scr)); data->gc = WMColorGC(WMWhiteColor(scr));
data->selGC = WMColorGC(WMCreateNamedColor(scr, SelectionColor, False));
data->textColor = WMBlackColor(scr);
data->count = 0; data->count = 0;
data->options = NULL; data->options = NULL;
@@ -309,16 +262,12 @@ WMTableColumnDelegate *WTCreateEnumSelectorDelegate(WMTableView *parent)
return delegate; return delegate;
} }
void WTSetEnumSelectorOptions(WMTableColumnDelegate * delegate, char **options, int count)
void WTSetEnumSelectorOptions(WMTableColumnDelegate *delegate,
char **options, int count)
{ {
EnumSelectorData *data = (EnumSelectorData *) delegate->data; EnumSelectorData *data = (EnumSelectorData *) delegate->data;
int i; int i;
for (i = 0; for (i = 0; i < WMGetPopUpButtonNumberOfItems(data->widget); i++) {
i < WMGetPopUpButtonNumberOfItems(data->widget);
i++) {
WMRemovePopUpButtonItem(data->widget, 0); WMRemovePopUpButtonItem(data->widget, 0);
} }
@@ -330,16 +279,13 @@ void WTSetEnumSelectorOptions(WMTableColumnDelegate *delegate,
} }
} }
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
static void BSCellPainter(WMTableColumnDelegate *self, static void BSCellPainter(WMTableColumnDelegate * self, WMTableColumn * column, int row, Drawable d)
WMTableColumn *column, int row, Drawable d)
{ {
BooleanSwitchData *strdata = (BooleanSwitchData *) self->data; BooleanSwitchData *strdata = (BooleanSwitchData *) self->data;
WMTableView *table = WMGetTableColumnTableView(column); WMTableView *table = WMGetTableColumnTableView(column);
int i = (int)WMTableViewDataForCell(table, column, row); uintptr_t i = (uintptr_t)WMTableViewDataForCell(table, column, row);
WMScreen *scr = WMWidgetScreen(table); WMScreen *scr = WMWidgetScreen(table);
if (i) { if (i) {
@@ -348,18 +294,15 @@ static void BSCellPainter(WMTableColumnDelegate *self,
WMTableViewRectForCell(table, column, row), False); WMTableViewRectForCell(table, column, row), False);
} else { } else {
pixmapDraw(scr, d, pixmapDraw(scr, d,
strdata->gc, strdata->selGC, NULL, strdata->gc, strdata->selGC, NULL, WMTableViewRectForCell(table, column, row), False);
WMTableViewRectForCell(table, column, row), False);
} }
} }
static void selectedBSCellPainter(WMTableColumnDelegate * self, WMTableColumn * column, int row, Drawable d)
static void selectedBSCellPainter(WMTableColumnDelegate *self,
WMTableColumn *column, int row, Drawable d)
{ {
BooleanSwitchData *strdata = (BooleanSwitchData *) self->data; BooleanSwitchData *strdata = (BooleanSwitchData *) self->data;
WMTableView *table = WMGetTableColumnTableView(column); WMTableView *table = WMGetTableColumnTableView(column);
int i = (int)WMTableViewDataForCell(table, column, row); uintptr_t i = (uintptr_t)WMTableViewDataForCell(table, column, row);
WMScreen *scr = WMWidgetScreen(table); WMScreen *scr = WMWidgetScreen(table);
if (i) { if (i) {
@@ -368,19 +311,15 @@ static void selectedBSCellPainter(WMTableColumnDelegate *self,
WMTableViewRectForCell(table, column, row), True); WMTableViewRectForCell(table, column, row), True);
} else { } else {
pixmapDraw(scr, d, pixmapDraw(scr, d,
strdata->gc, strdata->selGC, NULL, strdata->gc, strdata->selGC, NULL, WMTableViewRectForCell(table, column, row), True);
WMTableViewRectForCell(table, column, row), True);
} }
} }
static void beginBSCellEdit(WMTableColumnDelegate * self, WMTableColumn * column, int row)
static void beginBSCellEdit(WMTableColumnDelegate *self,
WMTableColumn *column, int row)
{ {
BooleanSwitchData *strdata = (BooleanSwitchData *) self->data; BooleanSwitchData *strdata = (BooleanSwitchData *) self->data;
WMRect rect = WMTableViewRectForCell(strdata->table, column, row); WMRect rect = WMTableViewRectForCell(strdata->table, column, row);
int data = (int)WMTableViewDataForCell(strdata->table, column, row); uintptr_t data = (uintptr_t)WMTableViewDataForCell(strdata->table, column, row);
WMSetButtonSelected(strdata->widget, data); WMSetButtonSelected(strdata->widget, data);
WMMoveWidget(strdata->widget, rect.pos.x + 1, rect.pos.y + 1); WMMoveWidget(strdata->widget, rect.pos.x + 1, rect.pos.y + 1);
@@ -389,19 +328,16 @@ static void beginBSCellEdit(WMTableColumnDelegate *self,
WMMapWidget(strdata->widget); WMMapWidget(strdata->widget);
} }
static void endBSCellEdit(WMTableColumnDelegate * self, WMTableColumn * column, int row)
static void endBSCellEdit(WMTableColumnDelegate *self,
WMTableColumn *column, int row)
{ {
BooleanSwitchData *strdata = (BooleanSwitchData *) self->data; BooleanSwitchData *strdata = (BooleanSwitchData *) self->data;
int value; int value;
value = WMGetButtonSelected(strdata->widget); value = WMGetButtonSelected(strdata->widget);
WMSetTableViewDataForCell(strdata->table, column, row, (void*)value); WMSetTableViewDataForCell(strdata->table, column, row, (void *)(uintptr_t) value);
WMUnmapWidget(strdata->widget); WMUnmapWidget(strdata->widget);
} }
WMTableColumnDelegate *WTCreateBooleanSwitchDelegate(WMTableView * parent) WMTableColumnDelegate *WTCreateBooleanSwitchDelegate(WMTableView * parent)
{ {
WMTableColumnDelegate *delegate = wmalloc(sizeof(WMTableColumnDelegate)); WMTableColumnDelegate *delegate = wmalloc(sizeof(WMTableColumnDelegate));
@@ -410,9 +346,7 @@ WMTableColumnDelegate *WTCreateBooleanSwitchDelegate(WMTableView *parent)
WMColor *color; WMColor *color;
data->widget = WMCreateSwitchButton(parent); data->widget = WMCreateSwitchButton(parent);
W_ReparentView(WMWidgetView(data->widget), W_ReparentView(WMWidgetView(data->widget), WMGetTableViewDocumentView(parent), 0, 0);
WMGetTableViewDocumentView(parent),
0, 0);
WMSetButtonText(data->widget, NULL); WMSetButtonText(data->widget, NULL);
WMSetButtonImagePosition(data->widget, WIPImageOnly); WMSetButtonImagePosition(data->widget, WIPImageOnly);
WMSetButtonImage(data->widget, NULL); WMSetButtonImage(data->widget, NULL);
@@ -433,38 +367,28 @@ WMTableColumnDelegate *WTCreateBooleanSwitchDelegate(WMTableView *parent)
return delegate; return delegate;
} }
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
static void SCellPainter(WMTableColumnDelegate * self, WMTableColumn * column, int row, Drawable d)
static void SCellPainter(WMTableColumnDelegate *self,
WMTableColumn *column, int row, Drawable d)
{ {
StringData *strdata = (StringData *) self->data; StringData *strdata = (StringData *) self->data;
WMTableView *table = WMGetTableColumnTableView(column); WMTableView *table = WMGetTableColumnTableView(column);
stringDraw(WMWidgetScreen(table), d, stringDraw(WMWidgetScreen(table), d,
strdata->gc, strdata->selGC, strdata->textGC, strdata->font, strdata->gc, strdata->selGC, strdata->textColor, strdata->font,
WMTableViewDataForCell(table, column, row), WMTableViewDataForCell(table, column, row), WMTableViewRectForCell(table, column, row), False);
WMTableViewRectForCell(table, column, row),
False);
} }
static void selectedSCellPainter(WMTableColumnDelegate * self, WMTableColumn * column, int row, Drawable d)
static void selectedSCellPainter(WMTableColumnDelegate *self,
WMTableColumn *column, int row, Drawable d)
{ {
StringData *strdata = (StringData *) self->data; StringData *strdata = (StringData *) self->data;
WMTableView *table = WMGetTableColumnTableView(column); WMTableView *table = WMGetTableColumnTableView(column);
stringDraw(WMWidgetScreen(table), d, stringDraw(WMWidgetScreen(table), d,
strdata->gc, strdata->selGC, strdata->textGC, strdata->font, strdata->gc, strdata->selGC, strdata->textColor, strdata->font,
WMTableViewDataForCell(table, column, row), WMTableViewDataForCell(table, column, row), WMTableViewRectForCell(table, column, row), True);
WMTableViewRectForCell(table, column, row),
True);
} }
WMTableColumnDelegate *WTCreateStringDelegate(WMTableView * parent) WMTableColumnDelegate *WTCreateStringDelegate(WMTableView * parent)
{ {
WMTableColumnDelegate *delegate = wmalloc(sizeof(WMTableColumnDelegate)); WMTableColumnDelegate *delegate = wmalloc(sizeof(WMTableColumnDelegate));
@@ -473,9 +397,9 @@ WMTableColumnDelegate *WTCreateStringDelegate(WMTableView *parent)
data->table = parent; data->table = parent;
data->font = WMSystemFontOfSize(scr, 12); data->font = WMSystemFontOfSize(scr, 12);
data->selGC = WMColorGC(WMCreateNamedColor(scr, SelectionColor, False));
data->textGC = WMColorGC(WMBlackColor(scr));
data->gc = WMColorGC(WMWhiteColor(scr)); data->gc = WMColorGC(WMWhiteColor(scr));
data->selGC = WMColorGC(WMCreateNamedColor(scr, SelectionColor, False));
data->textColor = WMBlackColor(scr);
delegate->data = data; delegate->data = data;
delegate->drawCell = SCellPainter; delegate->drawCell = SCellPainter;
@@ -486,12 +410,9 @@ WMTableColumnDelegate *WTCreateStringDelegate(WMTableView *parent)
return delegate; return delegate;
} }
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
static void PCellPainter(WMTableColumnDelegate * self, WMTableColumn * column, int row, Drawable d)
static void PCellPainter(WMTableColumnDelegate *self,
WMTableColumn *column, int row, Drawable d)
{ {
StringData *strdata = (StringData *) self->data; StringData *strdata = (StringData *) self->data;
WMTableView *table = WMGetTableColumnTableView(column); WMTableView *table = WMGetTableColumnTableView(column);
@@ -499,13 +420,10 @@ static void PCellPainter(WMTableColumnDelegate *self,
pixmapDraw(WMWidgetScreen(table), d, pixmapDraw(WMWidgetScreen(table), d,
strdata->gc, strdata->selGC, strdata->gc, strdata->selGC,
(WMPixmap *) WMTableViewDataForCell(table, column, row), (WMPixmap *) WMTableViewDataForCell(table, column, row),
WMTableViewRectForCell(table, column, row), WMTableViewRectForCell(table, column, row), False);
False);
} }
static void selectedPCellPainter(WMTableColumnDelegate * self, WMTableColumn * column, int row, Drawable d)
static void selectedPCellPainter(WMTableColumnDelegate *self,
WMTableColumn *column, int row, Drawable d)
{ {
StringData *strdata = (StringData *) self->data; StringData *strdata = (StringData *) self->data;
WMTableView *table = WMGetTableColumnTableView(column); WMTableView *table = WMGetTableColumnTableView(column);
@@ -513,11 +431,9 @@ static void selectedPCellPainter(WMTableColumnDelegate *self,
pixmapDraw(WMWidgetScreen(table), d, pixmapDraw(WMWidgetScreen(table), d,
strdata->gc, strdata->selGC, strdata->gc, strdata->selGC,
(WMPixmap *) WMTableViewDataForCell(table, column, row), (WMPixmap *) WMTableViewDataForCell(table, column, row),
WMTableViewRectForCell(table, column, row), WMTableViewRectForCell(table, column, row), True);
True);
} }
WMTableColumnDelegate *WTCreatePixmapDelegate(WMTableView * table) WMTableColumnDelegate *WTCreatePixmapDelegate(WMTableView * table)
{ {
WMTableColumnDelegate *delegate = wmalloc(sizeof(WMTableColumnDelegate)); WMTableColumnDelegate *delegate = wmalloc(sizeof(WMTableColumnDelegate));
@@ -525,8 +441,8 @@ WMTableColumnDelegate *WTCreatePixmapDelegate(WMTableView *table)
StringData *data = wmalloc(sizeof(StringData)); StringData *data = wmalloc(sizeof(StringData));
data->table = table; data->table = table;
data->selGC = WMColorGC(WMCreateNamedColor(scr, SelectionColor, False));
data->gc = WMColorGC(WMWhiteColor(scr)); data->gc = WMColorGC(WMWhiteColor(scr));
data->selGC = WMColorGC(WMCreateNamedColor(scr, SelectionColor, False));
delegate->data = data; delegate->data = data;
delegate->drawCell = PCellPainter; delegate->drawCell = PCellPainter;
@@ -537,12 +453,9 @@ WMTableColumnDelegate *WTCreatePixmapDelegate(WMTableView *table)
return delegate; return delegate;
} }
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
static void drawPSCell(WMTableColumnDelegate * self, Drawable d, WMTableColumn * column, int row, Bool selected)
static void drawPSCell(WMTableColumnDelegate *self, Drawable d,
WMTableColumn *column, int row, Bool selected)
{ {
StringData *strdata = (StringData *) self->data; StringData *strdata = (StringData *) self->data;
WMTableView *table = WMGetTableColumnTableView(column); WMTableView *table = WMGetTableColumnTableView(column);
@@ -567,33 +480,26 @@ static void drawPSCell(WMTableColumnDelegate *self, Drawable d,
pixmapDraw(WMWidgetScreen(table), pixmapDraw(WMWidgetScreen(table),
WMViewXID(WMGetTableViewDocumentView(table)), WMViewXID(WMGetTableViewDocumentView(table)),
strdata->gc, strdata->selGC, pix, rect, strdata->gc, strdata->selGC, pix, rect, selected);
selected);
rect.pos.x += size.width - 1; rect.pos.x += size.width - 1;
rect.size.width = owidth - size.width + 1; rect.size.width = owidth - size.width + 1;
} }
stringDraw(WMWidgetScreen(table), d, stringDraw(WMWidgetScreen(table), d, strdata->gc, strdata->selGC,
strdata->gc, strdata->selGC, strdata->textGC, strdata->font, strdata->textColor, strdata->font, str, rect, selected);
str, rect, selected);
} }
static void PSCellPainter(WMTableColumnDelegate * self, WMTableColumn * column, int row, Drawable d)
static void PSCellPainter(WMTableColumnDelegate *self,
WMTableColumn *column, int row, Drawable d)
{ {
drawPSCell(self, d, column, row, False); drawPSCell(self, d, column, row, False);
} }
static void selectedPSCellPainter(WMTableColumnDelegate * self, WMTableColumn * column, int row, Drawable d)
static void selectedPSCellPainter(WMTableColumnDelegate *self,
WMTableColumn *column, int row, Drawable d)
{ {
drawPSCell(self, d, column, row, True); drawPSCell(self, d, column, row, True);
} }
WMTableColumnDelegate *WTCreatePixmapStringDelegate(WMTableView * parent) WMTableColumnDelegate *WTCreatePixmapStringDelegate(WMTableView * parent)
{ {
WMTableColumnDelegate *delegate = wmalloc(sizeof(WMTableColumnDelegate)); WMTableColumnDelegate *delegate = wmalloc(sizeof(WMTableColumnDelegate));
@@ -602,9 +508,9 @@ WMTableColumnDelegate *WTCreatePixmapStringDelegate(WMTableView *parent)
data->table = parent; data->table = parent;
data->font = WMSystemFontOfSize(scr, 12); data->font = WMSystemFontOfSize(scr, 12);
data->selGC = WMColorGC(WMCreateNamedColor(scr, SelectionColor, False));
data->textGC = WMColorGC(WMBlackColor(scr));
data->gc = WMColorGC(WMWhiteColor(scr)); data->gc = WMColorGC(WMWhiteColor(scr));
data->selGC = WMColorGC(WMCreateNamedColor(scr, SelectionColor, False));
data->textColor = WMBlackColor(scr);
delegate->data = data; delegate->data = data;
delegate->drawCell = PSCellPainter; delegate->drawCell = PSCellPainter;

314
WINGs/Extras/wtableview.c
View File

@@ -1,14 +1,12 @@
#include <WINGs/WINGsP.h> #include <WINGs/WINGsP.h>
#include <X11/cursorfont.h> #include <X11/cursorfont.h>
#include <stdint.h>
#include "wtableview.h" #include "wtableview.h"
const char *WMTableViewSelectionDidChangeNotification = "WMTableViewSelectionDidChangeNotification"; const char *WMTableViewSelectionDidChangeNotification = "WMTableViewSelectionDidChangeNotification";
struct W_TableColumn { struct W_TableColumn {
WMTableView *table; WMTableView *table;
WMWidget *titleW; WMWidget *titleW;
@@ -25,15 +23,12 @@ struct W_TableColumn {
unsigned editable:1; unsigned editable:1;
}; };
static void handleResize(W_ViewDelegate * self, WMView * view); static void handleResize(W_ViewDelegate * self, WMView * view);
static void rearrangeHeader(WMTableView * table); static void rearrangeHeader(WMTableView * table);
static WMRange rowsInRect(WMTableView * table, WMRect rect); static WMRange rowsInRect(WMTableView * table, WMRect rect);
WMTableColumn *WMCreateTableColumn(char *title) WMTableColumn *WMCreateTableColumn(char *title)
{ {
WMTableColumn *col = wmalloc(sizeof(WMTableColumn)); WMTableColumn *col = wmalloc(sizeof(WMTableColumn));
@@ -56,19 +51,16 @@ WMTableColumn *WMCreateTableColumn(char *title)
return col; return col;
} }
void WMSetTableColumnId(WMTableColumn * column, void *id) void WMSetTableColumnId(WMTableColumn * column, void *id)
{ {
column->id = id; column->id = id;
} }
void *WMGetTableColumnId(WMTableColumn * column) void *WMGetTableColumnId(WMTableColumn * column)
{ {
return column->id; return column->id;
} }
void WMSetTableColumnWidth(WMTableColumn * column, unsigned width) void WMSetTableColumnWidth(WMTableColumn * column, unsigned width)
{ {
if (column->maxWidth == 0) if (column->maxWidth == 0)
@@ -81,16 +73,12 @@ void WMSetTableColumnWidth(WMTableColumn *column, unsigned width)
} }
} }
void WMSetTableColumnDelegate(WMTableColumn * column, WMTableColumnDelegate * delegate)
void WMSetTableColumnDelegate(WMTableColumn *column,
WMTableColumnDelegate *delegate)
{ {
column->delegate = delegate; column->delegate = delegate;
} }
void WMSetTableColumnConstraints(WMTableColumn * column, unsigned minWidth, unsigned maxWidth)
void WMSetTableColumnConstraints(WMTableColumn *column,
unsigned minWidth, unsigned maxWidth)
{ {
wassertr(maxWidth == 0 || minWidth <= maxWidth); wassertr(maxWidth == 0 || minWidth <= maxWidth);
@@ -103,20 +91,16 @@ void WMSetTableColumnConstraints(WMTableColumn *column,
WMSetTableColumnWidth(column, column->maxWidth); WMSetTableColumnWidth(column, column->maxWidth);
} }
void WMSetTableColumnEditable(WMTableColumn * column, Bool flag) void WMSetTableColumnEditable(WMTableColumn * column, Bool flag)
{ {
column->editable = flag; column->editable = ((flag == 0) ? 0 : 1);
} }
WMTableView *WMGetTableColumnTableView(WMTableColumn * column) WMTableView *WMGetTableColumnTableView(WMTableColumn * column)
{ {
return column->table; return column->table;
} }
struct W_TableView { struct W_TableView {
W_Class widgetClass; W_Class widgetClass;
WMView *view; WMView *view;
@@ -168,11 +152,13 @@ struct W_TableView {
unsigned canSelectRow:1; unsigned canSelectRow:1;
unsigned canSelectMultiRows:1; unsigned canSelectMultiRows:1;
unsigned canDeselectRow:1; unsigned canDeselectRow:1;
unsigned int hasVScroller:1;
unsigned int hasHScroller:1;
}; };
static W_Class tableClass = 0; static W_Class tableClass = 0;
static W_ViewDelegate viewDelegate = { static W_ViewDelegate viewDelegate = {
NULL, NULL,
NULL, NULL,
@@ -181,9 +167,7 @@ static W_ViewDelegate viewDelegate = {
NULL NULL
}; };
static void reorganizeInterior(WMTableView * table);
static void handleEvents(XEvent * event, void *data); static void handleEvents(XEvent * event, void *data);
static void handleTableEvents(XEvent * event, void *data); static void handleTableEvents(XEvent * event, void *data);
@@ -210,28 +194,37 @@ static WMSize getTotalSize(WMTableView *table)
return size; return size;
} }
static WMRect getVisibleRect(WMTableView * table) static WMRect getVisibleRect(WMTableView * table)
{ {
WMSize size = getTotalSize(table); WMSize size = getTotalSize(table);
WMRect rect; WMRect rect;
if (table->vscroll) {
rect.size.height = size.height * WMGetScrollerKnobProportion(table->vscroll); rect.size.height = size.height * WMGetScrollerKnobProportion(table->vscroll);
rect.size.width = size.width * WMGetScrollerKnobProportion(table->hscroll);
rect.pos.x = (size.width - rect.size.width) * WMGetScrollerValue(table->hscroll);
rect.pos.y = (size.height - rect.size.height) * WMGetScrollerValue(table->vscroll); rect.pos.y = (size.height - rect.size.height) * WMGetScrollerValue(table->vscroll);
} else {
rect.size.height = size.height;
rect.pos.y = 0;
}
if (table->hscroll) {
rect.size.width = size.width * WMGetScrollerKnobProportion(table->hscroll);
rect.pos.x = (size.width - rect.size.width) * WMGetScrollerValue(table->hscroll);
} else {
rect.size.width = size.width;
rect.pos.x = 0;
}
return rect; return rect;
} }
static void scrollToPoint(WMTableView * table, int x, int y) static void scrollToPoint(WMTableView * table, int x, int y)
{ {
WMSize size = getTotalSize(table); WMSize size = getTotalSize(table);
int i; int i;
float value, prop; float value, prop;
if (table->hscroll) {
if (size.width > W_VIEW_WIDTH(table->tableView)) { if (size.width > W_VIEW_WIDTH(table->tableView)) {
prop = (float)W_VIEW_WIDTH(table->tableView) / (float)size.width; prop = (float)W_VIEW_WIDTH(table->tableView) / (float)size.width;
value = (float)x / (float)(size.width - W_VIEW_WIDTH(table->tableView)); value = (float)x / (float)(size.width - W_VIEW_WIDTH(table->tableView));
@@ -240,8 +233,9 @@ static void scrollToPoint(WMTableView *table, int x, int y)
value = 0.0; value = 0.0;
} }
WMSetScrollerParameters(table->hscroll, value, prop); WMSetScrollerParameters(table->hscroll, value, prop);
}
if (table->vscroll) {
if (size.height > W_VIEW_HEIGHT(table->tableView)) { if (size.height > W_VIEW_HEIGHT(table->tableView)) {
prop = (float)W_VIEW_HEIGHT(table->tableView) / (float)size.height; prop = (float)W_VIEW_HEIGHT(table->tableView) / (float)size.height;
value = (float)y / (float)(size.height - W_VIEW_HEIGHT(table->tableView)); value = (float)y / (float)(size.height - W_VIEW_HEIGHT(table->tableView));
@@ -251,8 +245,7 @@ static void scrollToPoint(WMTableView *table, int x, int y)
} }
WMSetScrollerParameters(table->vscroll, value, prop); WMSetScrollerParameters(table->vscroll, value, prop);
}
if (table->editingRow >= 0) { if (table->editingRow >= 0) {
for (i = 0; i < WMGetArrayItemCount(table->columns); i++) { for (i = 0; i < WMGetArrayItemCount(table->columns); i++) {
@@ -261,15 +254,13 @@ static void scrollToPoint(WMTableView *table, int x, int y)
column = WMGetFromArray(table->columns, i); column = WMGetFromArray(table->columns, i);
if (column->delegate && column->delegate->beginCellEdit) if (column->delegate && column->delegate->beginCellEdit)
(*column->delegate->beginCellEdit)(column->delegate, column, (*column->delegate->beginCellEdit) (column->delegate, column, table->editingRow);
table->editingRow);
} }
} }
repaintTable(table); repaintTable(table);
} }
static void adjustScrollers(WMTableView * table) static void adjustScrollers(WMTableView * table)
{ {
WMSize size = getTotalSize(table); WMSize size = getTotalSize(table);
@@ -277,6 +268,7 @@ static void adjustScrollers(WMTableView *table)
float prop, value; float prop, value;
float oprop, ovalue; float oprop, ovalue;
if (table->hscroll) {
if (size.width <= vsize.width) { if (size.width <= vsize.width) {
value = 0.0; value = 0.0;
prop = 1.0; prop = 1.0;
@@ -290,13 +282,14 @@ static void adjustScrollers(WMTableView *table)
value = prop * ovalue / oprop; value = prop * ovalue / oprop;
} }
WMSetScrollerParameters(table->hscroll, value, prop); WMSetScrollerParameters(table->hscroll, value, prop);
}
if (table->vscroll) {
if (size.height <= vsize.height) { if (size.height <= vsize.height) {
value = 0.0; value = 0.0;
prop = 1.0; prop = 1.0;
} else { } else {
oprop = WMGetScrollerKnobProportion(table->vscroll); oprop = WMGetScrollerKnobProportion(table->vscroll);
oprop = WMGetScrollerKnobProportion(table->hscroll);
if (oprop == 0.0) if (oprop == 0.0)
oprop = 1.0; oprop = 1.0;
ovalue = WMGetScrollerValue(table->vscroll); ovalue = WMGetScrollerValue(table->vscroll);
@@ -306,7 +299,7 @@ static void adjustScrollers(WMTableView *table)
} }
WMSetScrollerParameters(table->vscroll, value, prop); WMSetScrollerParameters(table->vscroll, value, prop);
} }
}
static void doScroll(WMWidget * self, void *data) static void doScroll(WMWidget * self, void *data)
{ {
@@ -332,8 +325,7 @@ static void doScroll(WMWidget *self, void *data)
value -= (float)table->rowHeight / size; value -= (float)table->rowHeight / size;
if (value < 0) if (value < 0)
value = 0.0; value = 0.0;
WMSetScrollerParameters(self, value, WMSetScrollerParameters(self, value, WMGetScrollerKnobProportion(self));
WMGetScrollerKnobProportion(self));
repaintTable(table); repaintTable(table);
break; break;
@@ -342,8 +334,7 @@ static void doScroll(WMWidget *self, void *data)
value += (float)table->rowHeight / size; value += (float)table->rowHeight / size;
if (value > 1.0) if (value > 1.0)
value = 1.0; value = 1.0;
WMSetScrollerParameters(self, value, WMSetScrollerParameters(self, value, WMGetScrollerKnobProportion(self));
WMGetScrollerKnobProportion(self));
repaintTable(table); repaintTable(table);
break; break;
@@ -355,8 +346,7 @@ static void doScroll(WMWidget *self, void *data)
value -= vpsize / size; value -= vpsize / size;
if (value < 0.0) if (value < 0.0)
value = 0.0; value = 0.0;
WMSetScrollerParameters(self, value, WMSetScrollerParameters(self, value, WMGetScrollerKnobProportion(self));
WMGetScrollerKnobProportion(self));
repaintTable(table); repaintTable(table);
break; break;
@@ -364,12 +354,10 @@ static void doScroll(WMWidget *self, void *data)
value += vpsize / size; value += vpsize / size;
if (value > 1.0) if (value > 1.0)
value = 1.0; value = 1.0;
WMSetScrollerParameters(self, value, WMSetScrollerParameters(self, value, WMGetScrollerKnobProportion(self));
WMGetScrollerKnobProportion(self));
repaintTable(table); repaintTable(table);
break; break;
case WSNoPart: case WSNoPart:
case WSKnobSlot: case WSKnobSlot:
break; break;
@@ -383,12 +371,10 @@ static void doScroll(WMWidget *self, void *data)
column = WMGetFromArray(table->columns, i); column = WMGetFromArray(table->columns, i);
if (column->delegate && column->delegate->beginCellEdit) if (column->delegate && column->delegate->beginCellEdit)
(*column->delegate->beginCellEdit)(column->delegate, column, (*column->delegate->beginCellEdit) (column->delegate, column, table->editingRow);
table->editingRow);
} }
} }
if (table->hscroll == self) { if (table->hscroll == self) {
int x = 0; int x = 0;
int i; int i;
@@ -410,7 +396,6 @@ static void doScroll(WMWidget *self, void *data)
} }
} }
static void splitterHandler(XEvent * event, void *data) static void splitterHandler(XEvent * event, void *data)
{ {
WMTableColumn *column = (WMTableColumn *) data; WMTableColumn *column = (WMTableColumn *) data;
@@ -443,8 +428,7 @@ static void splitterHandler(XEvent *event, void *data)
if (column->width + ev.xmotion.x < column->minWidth) if (column->width + ev.xmotion.x < column->minWidth)
cx = pos.x + column->minWidth; cx = pos.x + column->minWidth;
else if (column->maxWidth > 0 else if (column->maxWidth > 0 && column->width + ev.xmotion.x > column->maxWidth)
&& column->width + ev.xmotion.x > column->maxWidth)
cx = pos.x + column->maxWidth; cx = pos.x + column->maxWidth;
else else
cx = offsX + ev.xmotion.x; cx = offsX + ev.xmotion.x;
@@ -465,13 +449,11 @@ static void splitterHandler(XEvent *event, void *data)
repaintTable(table); repaintTable(table);
} }
static void realizeTable(void *data, WMNotification * notif) static void realizeTable(void *data, WMNotification * notif)
{ {
repaintTable(data); repaintTable(data);
} }
WMTableView *WMCreateTableView(WMWidget * parent) WMTableView *WMCreateTableView(WMWidget * parent)
{ {
WMTableView *table = wmalloc(sizeof(WMTableView)); WMTableView *table = wmalloc(sizeof(WMTableView));
@@ -498,12 +480,15 @@ WMTableView *WMCreateTableView(WMWidget *parent)
WMMoveWidget(table->hscroll, 1, 2 + table->headerHeight); WMMoveWidget(table->hscroll, 1, 2 + table->headerHeight);
WMMapWidget(table->hscroll); WMMapWidget(table->hscroll);
table->hasHScroller = 1;
table->vscroll = WMCreateScroller(table); table->vscroll = WMCreateScroller(table);
WMSetScrollerArrowsPosition(table->vscroll, WSAMaxEnd); WMSetScrollerArrowsPosition(table->vscroll, WSAMaxEnd);
WMSetScrollerAction(table->vscroll, doScroll, table); WMSetScrollerAction(table->vscroll, doScroll, table);
WMMoveWidget(table->vscroll, 1, 2 + table->headerHeight); WMMoveWidget(table->vscroll, 1, 2 + table->headerHeight);
WMMapWidget(table->vscroll); WMMapWidget(table->vscroll);
table->hasVScroller = 1;
table->header = WMCreateFrame(table); table->header = WMCreateFrame(table);
WMMoveWidget(table->header, 22, 2); WMMoveWidget(table->header, 22, 2);
@@ -517,15 +502,13 @@ WMTableView *WMCreateTableView(WMWidget *parent)
WMSetLabelRelief(table->corner, WRRaised); WMSetLabelRelief(table->corner, WRRaised);
WMSetWidgetBackgroundColor(table->corner, scr->darkGray); WMSetWidgetBackgroundColor(table->corner, scr->darkGray);
table->tableView = W_CreateView(table->view); table->tableView = W_CreateView(table->view);
if (!table->tableView) if (!table->tableView)
goto error; goto error;
table->tableView->self = table; table->tableView->self = table;
W_MapView(table->tableView); W_MapView(table->tableView);
WMAddNotificationObserver(realizeTable, table, WMViewRealizedNotification, WMAddNotificationObserver(realizeTable, table, WMViewRealizedNotification, table->tableView);
table->tableView);
table->tableView->flags.dontCompressExpose = 1; table->tableView->flags.dontCompressExpose = 1;
@@ -540,8 +523,7 @@ WMTableView *WMCreateTableView(WMWidget *parent)
gcv.foreground = WMColorPixel(table->gridColor); gcv.foreground = WMColorPixel(table->gridColor);
gcv.dashes = 1; gcv.dashes = 1;
gcv.line_style = LineOnOffDash; gcv.line_style = LineOnOffDash;
table->gridGC = XCreateGC(WMScreenDisplay(scr), W_DRAWABLE(scr), table->gridGC = XCreateGC(WMScreenDisplay(scr), W_DRAWABLE(scr), GCForeground, &gcv);
GCForeground, &gcv);
} }
table->editingRow = -1; table->editingRow = -1;
@@ -557,17 +539,14 @@ WMTableView *WMCreateTableView(WMWidget *parent)
table->selectedRows = WMCreateArray(16); table->selectedRows = WMCreateArray(16);
table->splitterCursor = XCreateFontCursor(WMScreenDisplay(scr), table->splitterCursor = XCreateFontCursor(WMScreenDisplay(scr), XC_sb_h_double_arrow);
XC_sb_h_double_arrow);
table->canSelectRow = 1; table->canSelectRow = 1;
WMCreateEventHandler(table->view, ExposureMask|StructureNotifyMask, WMCreateEventHandler(table->view, ExposureMask | StructureNotifyMask, handleEvents, table);
handleEvents, table);
WMCreateEventHandler(table->tableView, ExposureMask | ButtonPressMask | WMCreateEventHandler(table->tableView, ExposureMask | ButtonPressMask |
ButtonReleaseMask|ButtonMotionMask, ButtonReleaseMask | ButtonMotionMask, handleTableEvents, table);
handleTableEvents, table);
WMResizeWidget(table, 50, 50); WMResizeWidget(table, 50, 50);
@@ -582,7 +561,6 @@ WMTableView *WMCreateTableView(WMWidget *parent)
return NULL; return NULL;
} }
void WMAddTableViewColumn(WMTableView * table, WMTableColumn * column) void WMAddTableViewColumn(WMTableView * table, WMTableColumn * column)
{ {
WMScreen *scr = WMWidgetScreen(table); WMScreen *scr = WMWidgetScreen(table);
@@ -598,8 +576,7 @@ void WMAddTableViewColumn(WMTableView *table, WMTableColumn *column)
WMSetLabelTextColor(column->titleW, scr->white); WMSetLabelTextColor(column->titleW, scr->white);
WMSetWidgetBackgroundColor(column->titleW, scr->darkGray); WMSetWidgetBackgroundColor(column->titleW, scr->darkGray);
WMSetLabelText(column->titleW, column->title); WMSetLabelText(column->titleW, column->title);
W_ReparentView(WMWidgetView(column->titleW), W_ReparentView(WMWidgetView(column->titleW), WMWidgetView(table->header), 0, 0);
WMWidgetView(table->header), 0, 0);
if (W_VIEW_REALIZED(table->view)) if (W_VIEW_REALIZED(table->view))
WMRealizeWidget(column->titleW); WMRealizeWidget(column->titleW);
WMMapWidget(column->titleW); WMMapWidget(column->titleW);
@@ -617,8 +594,7 @@ void WMAddTableViewColumn(WMTableView *table, WMTableColumn *column)
W_MapView(splitter); W_MapView(splitter);
W_SetViewCursor(splitter, table->splitterCursor); W_SetViewCursor(splitter, table->splitterCursor);
WMCreateEventHandler(splitter, ButtonPressMask|ButtonReleaseMask, WMCreateEventHandler(splitter, ButtonPressMask | ButtonReleaseMask, splitterHandler, column);
splitterHandler, column);
WMAddToArray(table->splitters, splitter); WMAddToArray(table->splitters, splitter);
} }
@@ -626,7 +602,6 @@ void WMAddTableViewColumn(WMTableView *table, WMTableColumn *column)
rearrangeHeader(table); rearrangeHeader(table);
} }
void WMSetTableViewHeaderHeight(WMTableView * table, unsigned height) void WMSetTableViewHeaderHeight(WMTableView * table, unsigned height)
{ {
table->headerHeight = height; table->headerHeight = height;
@@ -634,13 +609,11 @@ void WMSetTableViewHeaderHeight(WMTableView *table, unsigned height)
handleResize(NULL, table->view); handleResize(NULL, table->view);
} }
void WMSetTableViewDelegate(WMTableView * table, WMTableViewDelegate * delegate) void WMSetTableViewDelegate(WMTableView * table, WMTableViewDelegate * delegate)
{ {
table->delegate = delegate; table->delegate = delegate;
} }
void WMSetTableViewAction(WMTableView * table, WMAction * action, void *clientData) void WMSetTableViewAction(WMTableView * table, WMAction * action, void *clientData)
{ {
table->action = action; table->action = action;
@@ -648,47 +621,37 @@ void WMSetTableViewAction(WMTableView *table, WMAction *action, void *clientData
table->clientData = clientData; table->clientData = clientData;
} }
void *WMGetTableViewClickedColumn(WMTableView * table) void *WMGetTableViewClickedColumn(WMTableView * table)
{ {
return table->clickedColumn; return table->clickedColumn;
} }
int WMGetTableViewClickedRow(WMTableView * table) int WMGetTableViewClickedRow(WMTableView * table)
{ {
return table->clickedRow; return table->clickedRow;
} }
WMArray *WMGetTableViewSelectedRows(WMTableView * table) WMArray *WMGetTableViewSelectedRows(WMTableView * table)
{ {
return table->selectedRows; return table->selectedRows;
} }
WMView *WMGetTableViewDocumentView(WMTableView * table) WMView *WMGetTableViewDocumentView(WMTableView * table)
{ {
return table->tableView; return table->tableView;
} }
void *WMTableViewDataForCell(WMTableView * table, WMTableColumn * column, int row)
void *WMTableViewDataForCell(WMTableView *table, WMTableColumn *column,
int row)
{ {
return (*table->delegate->valueForCell) (table->delegate, column, row); return (*table->delegate->valueForCell) (table->delegate, column, row);
} }
void WMSetTableViewDataForCell(WMTableView * table, WMTableColumn * column, int row, void *data)
void WMSetTableViewDataForCell(WMTableView *table, WMTableColumn *column,
int row, void *data)
{ {
(*table->delegate->setValueForCell) (table->delegate, column, row, data); (*table->delegate->setValueForCell) (table->delegate, column, row, data);
} }
WMRect WMTableViewRectForCell(WMTableView * table, WMTableColumn * column, int row)
WMRect WMTableViewRectForCell(WMTableView *table, WMTableColumn *column,
int row)
{ {
WMRect rect; WMRect rect;
int i; int i;
@@ -719,18 +682,84 @@ WMRect WMTableViewRectForCell(WMTableView *table, WMTableColumn *column,
return rect; return rect;
} }
void WMSetTableViewDataSource(WMTableView * table, void *source) void WMSetTableViewDataSource(WMTableView * table, void *source)
{ {
table->dataSource = source; table->dataSource = source;
} }
void *WMGetTableViewDataSource(WMTableView * table) void *WMGetTableViewDataSource(WMTableView * table)
{ {
return table->dataSource; return table->dataSource;
} }
void WMSetTableViewHasHorizontalScroller(WMTableView * tPtr, Bool flag)
{
if (flag) {
if (tPtr->hasHScroller)
return;
tPtr->hasHScroller = 1;
tPtr->hscroll = WMCreateScroller(tPtr);
WMSetScrollerAction(tPtr->hscroll, doScroll, tPtr);
WMSetScrollerArrowsPosition(tPtr->hscroll, WSAMaxEnd);
/* make it a horiz. scroller */
WMResizeWidget(tPtr->hscroll, 1, 2);
if (W_VIEW_REALIZED(tPtr->view)) {
WMRealizeWidget(tPtr->hscroll);
}
reorganizeInterior(tPtr);
WMMapWidget(tPtr->hscroll);
} else {
if (!tPtr->hasHScroller)
return;
tPtr->hasHScroller = 0;
WMUnmapWidget(tPtr->hscroll);
WMDestroyWidget(tPtr->hscroll);
tPtr->hscroll = NULL;
reorganizeInterior(tPtr);
}
}
#if 0
/* not supported by now */
void WMSetTableViewHasVerticalScroller(WMTableView * tPtr, Bool flag)
{
if (flag) {
if (tPtr->hasVScroller)
return;
tPtr->hasVScroller = 1;
tPtr->vscroll = WMCreateScroller(tPtr);
WMSetScrollerAction(tPtr->vscroll, doScroll, tPtr);
WMSetScrollerArrowsPosition(tPtr->vscroll, WSAMaxEnd);
/* make it a vert. scroller */
WMResizeWidget(tPtr->vscroll, 1, 2);
if (W_VIEW_REALIZED(tPtr->view)) {
WMRealizeWidget(tPtr->vscroll);
}
reorganizeInterior(tPtr);
WMMapWidget(tPtr->vscroll);
} else {
if (!tPtr->hasVScroller)
return;
tPtr->hasVScroller = 0;
WMUnmapWidget(tPtr->vscroll);
WMDestroyWidget(tPtr->vscroll);
tPtr->vscroll = NULL;
reorganizeInterior(tPtr);
}
}
#endif
void WMSetTableViewBackgroundColor(WMTableView * table, WMColor * color) void WMSetTableViewBackgroundColor(WMTableView * table, WMColor * color)
{ {
@@ -744,18 +773,14 @@ void WMSetTableViewBackgroundColor(WMTableView *table, WMColor *color)
repaintTable(table); repaintTable(table);
} }
void WMSetTableViewGridColor(WMTableView * table, WMColor * color) void WMSetTableViewGridColor(WMTableView * table, WMColor * color)
{ {
WMReleaseColor(table->gridColor); WMReleaseColor(table->gridColor);
table->gridColor = WMRetainColor(color); table->gridColor = WMRetainColor(color);
XSetForeground(WMScreenDisplay(WMWidgetScreen(table)), table->gridGC, XSetForeground(WMScreenDisplay(WMWidgetScreen(table)), table->gridGC, WMColorPixel(color));
WMColorPixel(color));
repaintTable(table); repaintTable(table);
} }
void WMSetTableViewRowHeight(WMTableView * table, int height) void WMSetTableViewRowHeight(WMTableView * table, int height)
{ {
table->rowHeight = height; table->rowHeight = height;
@@ -763,7 +788,6 @@ void WMSetTableViewRowHeight(WMTableView *table, int height)
repaintTable(table); repaintTable(table);
} }
void WMScrollTableViewRowToVisible(WMTableView * table, int row) void WMScrollTableViewRowToVisible(WMTableView * table, int row)
{ {
WMScroller *scroller; WMScroller *scroller;
@@ -789,8 +813,6 @@ void WMScrollTableViewRowToVisible(WMTableView *table, int row)
scrollToPoint(table, rect.pos.x, newY); scrollToPoint(table, rect.pos.x, newY);
} }
static void drawGrid(WMTableView * table, WMRect rect) static void drawGrid(WMTableView * table, WMRect rect)
{ {
WMScreen *scr = WMWidgetScreen(table); WMScreen *scr = WMWidgetScreen(table);
@@ -841,37 +863,36 @@ static void drawGrid(WMTableView *table, WMRect rect)
} }
} }
static WMRange columnsInRect(WMTableView * table, WMRect rect) static WMRange columnsInRect(WMTableView * table, WMRect rect)
{ {
WMTableColumn *column; WMTableColumn *column;
int width; int pos;
int i , j; int i, found;
int totalColumns = WMGetArrayItemCount(table->columns); int totalColumns = WMGetArrayItemCount(table->columns);
WMRange range; WMRange range;
j = 0; pos = 0;
width = 0; found = 0;
for (i = 0; i < totalColumns; i++) { for (i = 0; i < totalColumns; i++) {
column = WMGetFromArray(table->columns, i); column = WMGetFromArray(table->columns, i);
if (j == 0) { if (!found) {
if (width <= rect.pos.x && width + column->width > rect.pos.x) { if (rect.pos.x >= pos && rect.pos.x < pos + column->width) {
range.position = i; range.position = i;
j = 1; range.count = 1;
found = 1;
} }
} else { } else {
range.count++; if (pos > rect.pos.x + rect.size.width) {
if (width > rect.pos.x + rect.size.width) {
break; break;
} }
range.count++;
} }
width += column->width; pos += column->width;
} }
range.count = WMAX(1, WMIN(range.count, totalColumns - range.position)); range.count = WMAX(1, WMIN(range.count, totalColumns - range.position));
return range; return range;
} }
static WMRange rowsInRect(WMTableView * table, WMRect rect) static WMRange rowsInRect(WMTableView * table, WMRect rect)
{ {
WMRange range; WMRange range;
@@ -886,7 +907,6 @@ static WMRange rowsInRect(WMTableView *table, WMRect rect)
return range; return range;
} }
static void drawRow(WMTableView * table, int row, WMRect clipRect) static void drawRow(WMTableView * table, int row, WMRect clipRect)
{ {
int i; int i;
@@ -900,14 +920,13 @@ static void drawRow(WMTableView *table, int row, WMRect clipRect)
if (!column->delegate || !column->delegate->drawCell) if (!column->delegate || !column->delegate->drawCell)
continue; continue;
if (WMFindInArray(table->selectedRows, NULL, (void*)row) != WANotFound) if (WMFindInArray(table->selectedRows, NULL, (void *)(uintptr_t) row) != WANotFound)
(*column->delegate->drawSelectedCell) (column->delegate, column, row, d); (*column->delegate->drawSelectedCell) (column->delegate, column, row, d);
else else
(*column->delegate->drawCell) (column->delegate, column, row, d); (*column->delegate->drawCell) (column->delegate, column, row, d);
} }
} }
#if 0 #if 0
static void drawFullRow(WMTableView * table, int row) static void drawFullRow(WMTableView * table, int row)
{ {
@@ -929,19 +948,18 @@ static void drawFullRow(WMTableView *table, int row)
} }
#endif #endif
static void setRowSelected(WMTableView * table, unsigned row, Bool flag) static void setRowSelected(WMTableView * table, unsigned row, Bool flag)
{ {
int repaint = 0; int repaint = 0;
if (WMFindInArray(table->selectedRows, NULL, (void*)row) != WANotFound) { if (WMFindInArray(table->selectedRows, NULL, (void *)(uintptr_t) row) != WANotFound) {
if (!flag) { if (!flag) {
WMRemoveFromArray(table->selectedRows, (void*)row); WMRemoveFromArray(table->selectedRows, (void *)(uintptr_t) row);
repaint = 1; repaint = 1;
} }
} else { } else {
if (flag) { if (flag) {
WMAddToArray(table->selectedRows, (void*)row); WMAddToArray(table->selectedRows, (void *)(uintptr_t) row);
repaint = 1; repaint = 1;
} }
} }
@@ -951,7 +969,6 @@ static void setRowSelected(WMTableView *table, unsigned row, Bool flag)
} }
} }
static void repaintTable(WMTableView * table) static void repaintTable(WMTableView * table)
{ {
WMRect rect; WMRect rect;
@@ -967,15 +984,13 @@ static void repaintTable(WMTableView *table)
if (!table->viewBuffer) { if (!table->viewBuffer) {
table->viewBuffer = WMCreatePixmap(scr, table->viewBuffer = WMCreatePixmap(scr,
W_VIEW_WIDTH(table->tableView), W_VIEW_WIDTH(table->tableView),
W_VIEW_HEIGHT(table->tableView), W_VIEW_HEIGHT(table->tableView), WMScreenDepth(scr), 0);
WMScreenDepth(scr), 0);
} }
XFillRectangle(scr->display, XFillRectangle(scr->display,
WMGetPixmapXID(table->viewBuffer), WMGetPixmapXID(table->viewBuffer),
WMColorGC(table->backColor), 0, 0, WMColorGC(table->backColor), 0, 0,
W_VIEW_WIDTH(table->tableView), W_VIEW_WIDTH(table->tableView), W_VIEW_HEIGHT(table->tableView));
W_VIEW_HEIGHT(table->tableView));
rect = getVisibleRect(table); rect = getVisibleRect(table);
@@ -984,18 +999,14 @@ static void repaintTable(WMTableView *table)
} }
rows = rowsInRect(table, rect); rows = rowsInRect(table, rect);
for (i = rows.position; for (i = rows.position; i < WMIN(rows.position + rows.count + 1, table->rows); i++) {
i < WMIN(rows.position+rows.count + 1, table->rows);
i++) {
drawRow(table, i, rect); drawRow(table, i, rect);
} }
XSetWindowBackgroundPixmap(scr->display, table->tableView->window, XSetWindowBackgroundPixmap(scr->display, table->tableView->window, WMGetPixmapXID(table->viewBuffer));
WMGetPixmapXID(table->viewBuffer));
XClearWindow(scr->display, table->tableView->window); XClearWindow(scr->display, table->tableView->window);
} }
static void stopRowEdit(WMTableView * table, int row) static void stopRowEdit(WMTableView * table, int row)
{ {
int i; int i;
@@ -1010,8 +1021,6 @@ static void stopRowEdit(WMTableView *table, int row)
} }
} }
void WMEditTableViewRow(WMTableView * table, int row) void WMEditTableViewRow(WMTableView * table, int row)
{ {
int i; int i;
@@ -1034,7 +1043,6 @@ void WMEditTableViewRow(WMTableView *table, int row)
} }
} }
void WMSelectTableViewRow(WMTableView * table, int row) void WMSelectTableViewRow(WMTableView * table, int row)
{ {
if (table->clickedRow >= 0) if (table->clickedRow >= 0)
@@ -1049,11 +1057,9 @@ void WMSelectTableViewRow(WMTableView *table, int row)
if (table->action) if (table->action)
(*table->action) (table, table->clientData); (*table->action) (table, table->clientData);
WMPostNotificationName(WMTableViewSelectionDidChangeNotification, WMPostNotificationName(WMTableViewSelectionDidChangeNotification, table, NULL);
table, NULL);
} }
void WMReloadTableView(WMTableView * table) void WMReloadTableView(WMTableView * table)
{ {
if (table->editingRow >= 0) if (table->editingRow >= 0)
@@ -1065,12 +1071,10 @@ void WMReloadTableView(WMTableView *table)
WMEmptyArray(table->selectedRows); WMEmptyArray(table->selectedRows);
if (table->clickedRow >= 0) { if (table->clickedRow >= 0) {
table->clickedRow = -1;
if (table->action) if (table->action)
(*table->action) (table, table->clientData); (*table->action) (table, table->clientData);
WMPostNotificationName(WMTableViewSelectionDidChangeNotification, WMPostNotificationName(WMTableViewSelectionDidChangeNotification, table, NULL);
table, NULL); table->clickedRow = -1;
} }
if (table->delegate && table->delegate->numberOfRows) { if (table->delegate && table->delegate->numberOfRows) {
@@ -1087,13 +1091,11 @@ void WMReloadTableView(WMTableView *table)
} }
} }
void WMNoteTableViewNumberOfRowsChanged(WMTableView * table) void WMNoteTableViewNumberOfRowsChanged(WMTableView * table)
{ {
WMReloadTableView(table); WMReloadTableView(table);
} }
static void handleTableEvents(XEvent * event, void *data) static void handleTableEvents(XEvent * event, void *data)
{ {
WMTableView *table = (WMTableView *) data; WMTableView *table = (WMTableView *) data;
@@ -1133,15 +1135,13 @@ static void handleTableEvents(XEvent *event, void *data)
if (event->xbutton.button == Button1) { if (event->xbutton.button == Button1) {
if (table->action) if (table->action)
(*table->action) (table, table->clientData); (*table->action) (table, table->clientData);
WMPostNotificationName(WMTableViewSelectionDidChangeNotification, WMPostNotificationName(WMTableViewSelectionDidChangeNotification, table, NULL);
table, NULL);
table->dragging = 0; table->dragging = 0;
} }
break; break;
} }
} }
static void handleEvents(XEvent * event, void *data) static void handleEvents(XEvent * event, void *data)
{ {
WMTableView *table = (WMTableView *) data; WMTableView *table = (WMTableView *) data;
@@ -1150,20 +1150,29 @@ static void handleEvents(XEvent *event, void *data)
switch (event->type) { switch (event->type) {
case Expose: case Expose:
W_DrawRelief(scr, W_VIEW_DRAWABLE(table->view), 0, 0, W_DrawRelief(scr, W_VIEW_DRAWABLE(table->view), 0, 0,
W_VIEW_WIDTH(table->view), W_VIEW_HEIGHT(table->view), W_VIEW_WIDTH(table->view), W_VIEW_HEIGHT(table->view), WRSunken);
WRSunken);
break; break;
} }
} }
static void handleResize(W_ViewDelegate * self, WMView * view) static void handleResize(W_ViewDelegate * self, WMView * view)
{
reorganizeInterior(view->self);
}
static void reorganizeInterior(WMTableView * table)
{ {
int width; int width;
int height; int height;
WMTableView *table = view->self;
WMSize size = getTotalSize(table); WMSize size = getTotalSize(table);
WMView *view = table->view;
int vw, vh; int vw, vh;
int hsThickness, vsThickness;
if (table->vscroll)
vsThickness = WMWidgetWidth(table->vscroll);
if (table->hscroll)
hsThickness = WMWidgetHeight(table->hscroll);
width = W_VIEW_WIDTH(view) - 2; width = W_VIEW_WIDTH(view) - 2;
height = W_VIEW_HEIGHT(view) - 3; height = W_VIEW_HEIGHT(view) - 3;
@@ -1176,24 +1185,26 @@ static void handleResize(W_ViewDelegate *self, WMView *view)
WMMoveWidget(table->vscroll, 1, table->headerHeight + 1); WMMoveWidget(table->vscroll, 1, table->headerHeight + 1);
WMResizeWidget(table->vscroll, 20, height + 1); WMResizeWidget(table->vscroll, 20, height + 1);
WMMoveWidget(table->hscroll, 20, W_VIEW_HEIGHT(view) - 20 - 1); if (table->hscroll) {
WMResizeWidget(table->hscroll, width-20+1, 20); WMMoveWidget(table->hscroll, vsThickness, W_VIEW_HEIGHT(view) - hsThickness - 1);
WMResizeWidget(table->hscroll, width - (vsThickness + 1), hsThickness);
}
if (table->header) if (table->header)
WMResizeWidget(table->header, width - 21, table->headerHeight); WMResizeWidget(table->header, width - (vsThickness + 1), table->headerHeight);
if (table->viewBuffer) { if (table->viewBuffer) {
WMReleasePixmap(table->viewBuffer); WMReleasePixmap(table->viewBuffer);
table->viewBuffer = NULL; table->viewBuffer = NULL;
} }
width -= 20; width -= vsThickness;
height -= 20; height -= hsThickness;
vw = WMIN(size.width, width); vw = WMIN(size.width, width);
vh = WMIN(size.height, height); vh = WMIN(size.height, height);
W_MoveView(table->tableView, 21, 1+table->headerHeight+1); W_MoveView(table->tableView, vsThickness + 1, 1 + table->headerHeight + 1);
W_ResizeView(table->tableView, WMAX(vw, 1), WMAX(vh, 1) + 1); W_ResizeView(table->tableView, WMAX(vw, 1), WMAX(vh, 1) + 1);
adjustScrollers(table); adjustScrollers(table);
@@ -1201,7 +1212,6 @@ static void handleResize(W_ViewDelegate *self, WMView *view)
repaintTable(table); repaintTable(table);
} }
static void rearrangeHeader(WMTableView * table) static void rearrangeHeader(WMTableView * table)
{ {
int width; int width;

4
WINGs/Extras/wtableview.h
View File

@@ -109,6 +109,10 @@ void WMReloadTableView(WMTableView *table);
void WMNoteTableViewNumberOfRowsChanged(WMTableView *table); void WMNoteTableViewNumberOfRowsChanged(WMTableView *table);
void WMScrollTableViewRowToVisible(WMTableView *table, int row); void WMScrollTableViewRowToVisible(WMTableView *table, int row);
void WMSetTableViewHasHorizontalScroller(WMTableView *tPtr, Bool flag);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

70
WINGs/Makefile.am
View File

@@ -2,48 +2,36 @@
AUTOMAKE_OPTIONS = no-dependencies AUTOMAKE_OPTIONS = no-dependencies
SUBDIRS = WINGs . po Documentation Resources Examples Extras Tests SUBDIRS = WINGs . po Documentation Resources
LIBTOOL = $(SHELL) $(top_srcdir)/libtool $(LIBTOOL_ARG)
libWINGs_a_AR = $(QUIET_AR) $(AR) $(ARFLAGS)
#libWINGs_la_LDFLAGS = -version-info 1:1:0 libWUtil_a_AR = $(QUIET_AR) $(AR) $(ARFLAGS)
libWINGs_la_LDFLAGS = -version-info 2:1:0
libWUtil_la_LDFLAGS = -version-info 1:2:0
bin_SCRIPTS = get-wings-flags get-wutil-flags bin_SCRIPTS = get-wings-flags get-wutil-flags
lib_LIBRARIES = libWINGs.a libWUtil.a lib_LTLIBRARIES = libWINGs.la libWUtil.la
LDADD= libWINGs.a $(top_builddir)/wrlib/libwraster.la @INTLIBS@ LDADD= libWUtil.la libWINGs.la $(top_builddir)/wrlib/libwraster.la @INTLIBS@
EXTRA_DIST = BUGS EXTRA_DIST = BUGS make-rgb python/Makefile python/README python/WINGs.i \
python/WINGs.py python/setup.py python/test.py
# wbutton.c # wbutton.c
libWINGs_a_SOURCES = \ libWINGs_la_SOURCES = \
array.c \
bagtree.c \
configuration.c \ configuration.c \
connection.c \ dragcommon.c \
data.c \
dragdestination.c \ dragdestination.c \
dragsource.c \ dragsource.c \
error.c \
findfile.c \
handlers.c \
hashtable.c \
host.c \
international.c \
memory.c \
misc.c \
notification.c \
proplist.c \
selection.c \ selection.c \
snprintf.c \
string.c \
tree.c \
userdefaults.c \
usleep.c \
wapplication.c \
wappresource.c \ wappresource.c \
wballoon.c \ wballoon.c \
wbox.c \ wbox.c \
@@ -79,8 +67,7 @@ libWINGs_a_SOURCES = \
wview.c \ wview.c \
wwindow.c wwindow.c
libWUtil_la_SOURCES = \
libWUtil_a_SOURCES = \
array.c \ array.c \
bagtree.c \ bagtree.c \
connection.c \ connection.c \
@@ -105,11 +92,30 @@ libWUtil_a_SOURCES = \
wutil.c wutil.c
CPPFLAGS = @CPPFLAGS@ -DLOCALEDIR=\"$(NLSDIR)\" AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\" -DRESOURCE_PATH=\"$(datadir)/WINGs\" -DDEBUG
AM_CFLAGS = @NOSTRICTALIASING@
INCLUDES = -I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \ INCLUDES = -I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
-DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG @XFTFLAGS@ @HEADER_SEARCH_PATH@
DISTCLEANFILES = WINGs.pc
wcolorpanel.o: wcolorpanel.c install-exec-local:
$(COMPILE) -c -DRGBTXT="\"@X_LIBRARY_PATH@/X11/rgb.txt\"" $< @$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(libdir)/pkgconfig
@list='WINGs.pc'; for p in $$list; do \
if test -f $$p; then \
echo "$(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/pkgconfig/"; \
$(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/pkgconfig/; \
else :; fi; \
done
.c.o:
$(QUIET)$(COMPILE) -c $<
.c.obj:
$(QUIET)$(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
$(QUIET)$(LTCOMPILE) -c -o $@ $<

164
WINGs/NEWS
View File

@@ -1,3 +1,167 @@
*** Mon Oct 14 19:42:42 EEST 2002 - Dan
Double buffering
----------------
To avoid flickering caused by redrawing the widgets on Expose events, a
double buffering tehnique was implemented for most of the widgets.
This flickering effect has gotten more vizible with the introduction
of antialiased fonts. If with normal text one can redraw the text over the
old one over and over again without any degradation of the text (new pixels
simply overwrite old pixels), with antialiased text the situation is
different and text gets quickly corrupted. To avoid this corruption, one
needs to first erase the area where the text will go, which can cause the
before mentioned flickering.
The double buffer is implemented to solve this issue.
This is a change that that will be automatically available for any WINGs
applications and will require no change in the existing code.
However there is an exception from this in case of WMList if you delegate
the drawing of items to userspace (read below for the compelte details).
*** Mon Oct 14 22:07:42 EEST 2002 - Dan
WMList change
-------------
In case of WMList there is the posibility to delegate the drawing of the
list items to the application that is linked with WINGs, and this code will
not be inside the WINGs library, but in userland. Since we use the double
buffering tehnique in this case too (to allow all widgets based on WMList
and the ones that draw their list items by themselves to benefit from the
double buffering advantage automatically), we no longer pass the window to
the user code doing item drawing, but instead pass this pixmap in which we
draw before copying to the real window.
Since one cannot use XClearWindow() or XClearArea() on pixmaps, but only on
windows, if the code drawing list items used to call these functions to clear
the item area before drawing it needs to change to using XFillRectangle()
instead.
With this change it also means that there is no longer any need to do any
double buffering in the user code, since it's already done by WINGs.
*** Mon Oct 14 19:28:35 EEST 2002 - Dan
API change
----------
WMDrawString() and WMDrawImageString() no longer take a GC as argument.
Instead WMDrawString() takes a WMColor* as the color for the string to be
drawn, while WMDrawImageString() takes 2 WMColor* arguments in place of the
old GC: first for text color and second for background color.
This change is required to support extending WMFont to allow it to handle
antialiased fonts through the XFree86 Xft2 extension.
This also has the advantage of hiding low level X11 details and use WINGs
internat objects instead.
To fix your old code to work with the new WINGs API you need to replace the
GC passed to WMDraw***String() in your code with a WMColor*.
Most of the old code used to be like this:
WMDrawString(screen, window, WMColorGC(color), font, x, y, txt, len);
for the new API it should be replaced by:
WMDrawString(screen, window, color, font, x, y, txt, len);
However if you used a particular GC created by yourself to suit your special
needs, you need to pass a color which is the same as the foreground color of
that gc.
For WMDrawImageString(), from:
WMDrawImageString(screen, window, gc, font, x, y, txt, len);
becomes
WMDrawImageString(screen, window, textColor, backColor, font, x, y, txt, len);
where textColor and backColor are declared like:
WMColor *textColor, *backColor;
and have the color of the foreground respective the background of the old gc.
*** Wed Oct 9 07:10:04 EEST 2002 - Dan
Antialiased font support
------------------------
With the addition of Xft2 support in the WINGs library, now WINGs can display
antialiased text with TrueType or any scalable fonts.
Antialiased text is enabled by default, but can be disabled by adding
AntialiasedText = NO; in ~/GNUstep/Defaults/WMGLOBAL
This will disable antialiased text for any WINGs based application. If you
only want to disable them for a specific application only, like WindowMaker
for example, then add the same option in the applications configuration file,
in this case ~/GNUstep/Defaults/WindowMaker
Note that bitmapped fonts look much better than TrueType when antialiasing is
disabled.
*** Mon Sep 09 06:58:30 EEST 2002 - Dan
New delegate for the WMConnection class
---------------------------------------
ConnectionDelegate structure has a new member: canResumeSending.
The purpose of this callback is to notify you that you can resume sending
data over a WMConnection.
It works in the following manner:
WMSendConnectionData() can return 3 values: -1, 0, 1
-1 - means that the connection has died. you should stop sending data and
close the connection ASAP.
1 - means that the data was succesfully sent
0 - means that the data (or part of it) was not sent. however, it was saved
in a queue and the library will try to send it later when possible.
if the return value is 1, you can continue to send the next message, and so
on, until the return value of such a send call will be 0.
After it returns 0 you can continue sending, however, the data will not be
sent over the connection because the operating system cannot accept any more
data for the moment. Instead it will be queued inside the library, making your
program's memory footprint increase. If the ammount of data you need to
send is limited and not too big, this shouldn't be a problem, because your
data will be queued and sent when the operating system will notify the
library that sending is possible again.
If this is the case you can just ignore the output of WMSendConnectionData()
and not set a callback for canResumeSending.
However, if the ammount of data you have to send is undetermined and you
also want to keep a small memory footprint for your program (so that it
won't grow until it uses all your available memory ;) ), you will have to
stop sending data over the connection as soon as WMSendConnectionData()
returns with 0. Then you should somehow mark this situation in your program
to avoid it trying to send anymore data until notified that it can resume.
(You should have also set a canResumeSending callback when you initialized
your WMConnection object because else you cannot be notified when to resume.)
Now, when you receive such a 0 from the send operation, your last sent data
is put in a queue inside the library. At a later time when the operating
system notifies the library that sending is possible again, the library will
resume to send the data that is saved in the queue. After it will be able to
send all the data in the queue, the canResumeSending callback will be
called, letting you know that not only you can resume sending because the
operating system is again able to send data, but also that the queue was
completely flushed.
From the canResumeSending callback, you should again update the status of
your program marking that it can send again, and then resume sending the
data from where you were left.
*** Thu Oct 04 06:00:09 EEST 2001 -Dan *** Thu Oct 04 06:00:09 EEST 2001 -Dan

6
WINGs/README
View File

@@ -5,7 +5,7 @@
Alfredo Kengi Kojima Alfredo Kengi Kojima
kojima@windowmaker.org 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. It's API
@@ -13,7 +13,7 @@ is inspired in OpenStep and it's 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 like 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 it's 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
@@ -26,7 +26,7 @@ workaround some of it's 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 it's functions are designed to support the Window Maker window
manager (see http://windowmaker.org) In fact, it's primary role is to manager (see http://windowmaker.info) In fact, it's 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

3
WINGs/Resources/.cvsignore
View File

@@ -1,3 +0,0 @@
Makefile Makefile.in
.psrc .inslog2 tca.map tca.log
*.rpt

3
WINGs/TODO
View File

@@ -4,6 +4,9 @@
Or a delegate to be called when the list selection change. Or a delegate to be called when the list selection change.
- add some way to modify speed when scrolling WMList, depending on how - add some way to modify speed when scrolling WMList, depending on how
far the mouse is moved outside of the list. far the mouse is moved outside of the list.
- clean up header files of declared but not implemented anywhere functions
- implement a generic WMChangeFontAttribute(WMFont *font, enum attributes)
function
- optimize color allocation for repeated colors - optimize color allocation for repeated colors

5
WINGs/Tests/.cvsignore
View File

@@ -1,5 +0,0 @@
Makefile Makefile.in
testtext testcolorpanel testmywidget wmfile wmquery wtest
.libs
.psrc .inslog2 tca.map tca.log
*.rpt

18
WINGs/Tests/Makefile.am
View File

@@ -4,17 +4,29 @@ AUTOMAKE_OPTIONS = no-dependencies
noinst_PROGRAMS = wtest wmquery wmfile testmywidget noinst_PROGRAMS = wtest wmquery wmfile testmywidget
LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
$(top_builddir)/WINGs/libWUtil.la \
@XFTLIBS@ @INTLIBS@
testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h
wtest_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a 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
INCLUDES = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \ INCLUDES = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
-DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG -DRESOURCE_PATH=\"$(datadir)/WINGs\" @XFTFLAGS@ @HEADER_SEARCH_PATH@ \
-DDEBUG
LIBTOOL = $(QUIET) $(SHELL) $(top_srcdir)/libtool $(LIBTOOL_ARG)
.c.o:
$(QUIET)$(COMPILE) -c $<
.c.obj:
$(QUIET)$(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
$(QUIET)$(LTCOMPILE) -c -o $@ $<

46
WINGs/Tests/mywidget.c
View File

@@ -7,7 +7,6 @@
* *
*/ */
/* /*
* *
* Include the WINGs private data header. * Include the WINGs private data header.
@@ -35,20 +34,14 @@ typedef struct W_MyWidget {
} _MyWidget; } _MyWidget;
/* some forward declarations */ /* some forward declarations */
static void destroyMyWidget(_MyWidget * mPtr); static void destroyMyWidget(_MyWidget * mPtr);
static void paintMyWidget(_MyWidget * mPtr); static void paintMyWidget(_MyWidget * mPtr);
static void handleEvents(XEvent * event, void *data); static void handleEvents(XEvent * event, void *data);
static void handleActionEvents(XEvent * event, void *data); static void handleActionEvents(XEvent * event, void *data);
/* /*
* Delegates * Delegates
* See the source for the other widgets to see how to use. * See the source for the other widgets to see how to use.
@@ -62,17 +55,14 @@ static W_ViewDelegate _MyWidgetDelegate = {
NULL NULL
}; };
/* our widget class ID */ /* our widget class ID */
static W_Class myWidgetClass = 0; static W_Class myWidgetClass = 0;
/* /*
* Initializer for our widget. Must be called before creating any * Initializer for our widget. Must be called before creating any
* instances of the widget. * instances of the widget.
*/ */
W_Class W_Class InitMyWidget(WMScreen * scr)
InitMyWidget(WMScreen *scr)
{ {
/* register our widget with WINGs and get our widget class ID */ /* register our widget with WINGs and get our widget class ID */
if (!myWidgetClass) { if (!myWidgetClass) {
@@ -82,12 +72,10 @@ InitMyWidget(WMScreen *scr)
return myWidgetClass; return myWidgetClass;
} }
/* /*
* Our widget fabrication plant. * Our widget fabrication plant.
*/ */
MyWidget* MyWidget *CreateMyWidget(WMWidget * parent)
CreateMyWidget(WMWidget *parent)
{ {
MyWidget *mPtr; MyWidget *mPtr;
@@ -133,38 +121,29 @@ CreateMyWidget(WMWidget *parent)
return mPtr; return mPtr;
} }
/* /*
* Paint our widget contents. * Paint our widget contents.
*/ */
static void static void paintMyWidget(_MyWidget * mPtr)
paintMyWidget(_MyWidget *mPtr)
{ {
W_Screen *scr = mPtr->view->screen; W_Screen *scr = mPtr->view->screen;
WMColor *color; WMColor *color;
if (mPtr->text) { if (mPtr->text) {
color = WMWhiteColor(scr); color = WMWhiteColor(scr);
W_PaintText(mPtr->view, mPtr->view->window, scr->normalFont, 0, 0, W_PaintText(mPtr->view, mPtr->view->window, scr->normalFont, 0, 0,
mPtr->view->size.width, WACenter, WMColorGC(color), mPtr->view->size.width, WACenter, color, False, mPtr->text, strlen(mPtr->text));
False, mPtr->text, strlen(mPtr->text));
WMReleaseColor(color); WMReleaseColor(color);
} }
} }
static void handleEvents(XEvent * event, void *data)
static void
handleEvents(XEvent *event, void *data)
{ {
_MyWidget *mPtr = (_MyWidget *) data; _MyWidget *mPtr = (_MyWidget *) data;
switch (event->type) { switch (event->type) {
case Expose: case Expose:
if (event->xexpose.count != 0) if (event->xexpose.count != 0)
@@ -179,9 +158,7 @@ handleEvents(XEvent *event, void *data)
} }
} }
static void handleActionEvents(XEvent * event, void *data)
static void
handleActionEvents(XEvent *event, void *data)
{ {
_MyWidget *mPtr = (_MyWidget *) data; _MyWidget *mPtr = (_MyWidget *) data;
@@ -193,9 +170,7 @@ handleActionEvents(XEvent *event, void *data)
} }
} }
void SetMyWidgetText(MyWidget * mPtr, char *text)
void
SetMyWidgetText(MyWidget *mPtr, char *text)
{ {
CHECK_CLASS(mPtr, myWidgetClass); CHECK_CLASS(mPtr, myWidgetClass);
@@ -209,10 +184,7 @@ SetMyWidgetText(MyWidget *mPtr, char *text)
} }
} }
static void destroyMyWidget(_MyWidget * mPtr)
static void
destroyMyWidget(_MyWidget *mPtr)
{ {
/* /*
* Free all data we allocated for our widget. * Free all data we allocated for our widget.
@@ -223,5 +195,3 @@ destroyMyWidget(_MyWidget *mPtr)
wfree(mPtr); wfree(mPtr);
} }

8
WINGs/Tests/testmywidget.c
View File

@@ -1,17 +1,14 @@
#include <WINGs/WINGs.h> #include <WINGs/WINGs.h>
#include <stdlib.h>
#include "mywidget.h" #include "mywidget.h"
void wAbort()
void
wAbort()
{ {
exit(1); exit(1);
} }
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
Display *dpy = XOpenDisplay(""); Display *dpy = XOpenDisplay("");
@@ -19,7 +16,6 @@ int main(int argc, char **argv)
WMWindow *win; WMWindow *win;
MyWidget *thing; MyWidget *thing;
WMInitializeApplication("Test", &argc, argv); WMInitializeApplication("Test", &argc, argv);
if (!dpy) { if (!dpy) {

4
WINGs/Tests/wm.html
View File

@@ -3,8 +3,8 @@
<Img src=wm.png></b><p> <Img src=wm.png></b><p>
<b>GNU Window Maker</B><br> <b>GNU Window Maker</B><br>
<i>X11 Window Manager</i><p> <i>X11 Window Manager</i><p>
<u>http://windowmaker.org<br> <u>http://windowmaker.info<br>
ftp.windowmaker.org</u></font><Br> ftp.windowmaker.info</u></font><Br>
</center> </center>
<b><i>Window Maker</b> <b><i>Window Maker</b>

29
WINGs/Tests/wmfile.c
View File

@@ -11,20 +11,15 @@
----------------------------------------------------------------------- -----------------------------------------------------------------------
*/ */
#include <WINGs/WINGs.h> #include <WINGs/WINGs.h>
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
#include "logo.xpm" #include "logo.xpm"
void wAbort()
void
wAbort()
{ {
exit(1); exit(1);
} }
@@ -44,11 +39,7 @@ void usage(void)
"\n" "\n"
"information:\n" "information:\n"
"\t%s pops up a WindowMaker style file selection panel.\n" "\t%s pops up a WindowMaker style file selection panel.\n"
"\n" "\n" "version:\n" "\t%s\n", ProgName, ProgName, __DATE__);
"version:\n"
"\t%s\n"
,ProgName,ProgName,__DATE__
);
exit(0); exit(0);
} }
@@ -70,17 +61,17 @@ int main(int argc, char **argv)
extern char *optarg; extern char *optarg;
extern int optind; extern int optind;
WMInitializeApplication("WMFile", &argc, argv);
ProgName = argv[0];
if (!dpy) { if (!dpy) {
puts("could not open display"); puts("could not open display");
exit(1); exit(1);
} }
WMInitializeApplication("WMFile", &argc, argv);
ProgName = argv[0];
while ((ch = getopt(argc, argv, "si:ht:")) != -1) while ((ch = getopt(argc, argv, "si:ht:")) != -1)
switch(ch) switch (ch) {
{
case 's': case 's':
panelType = SAVE_PANEL_TYPE; panelType = SAVE_PANEL_TYPE;
break; break;
@@ -99,8 +90,6 @@ int main(int argc, char **argv)
scr = WMCreateSimpleApplicationScreen(dpy); scr = WMCreateSimpleApplicationScreen(dpy);
pixmap = WMCreatePixmapFromXPMData(scr, GNUSTEP_XPM); pixmap = WMCreatePixmapFromXPMData(scr, GNUSTEP_XPM);
WMSetApplicationIconPixmap(scr, pixmap); WMSetApplicationIconPixmap(scr, pixmap);
WMReleasePixmap(pixmap); WMReleasePixmap(pixmap);

21
WINGs/Tests/wmquery.c
View File

@@ -3,19 +3,15 @@
* Author: Len Trigg <trigg@cs.waikato.ac.nz> * Author: Len Trigg <trigg@cs.waikato.ac.nz>
*/ */
#include <WINGs/WINGs.h> #include <WINGs/WINGs.h>
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
#include "logo.xpm" #include "logo.xpm"
void wAbort()
void
wAbort()
{ {
exit(1); exit(1);
} }
@@ -35,11 +31,7 @@ void usage(void)
"\n" "\n"
"information:\n" "information:\n"
"\t%s pops up a WindowMaker style input panel.\n" "\t%s pops up a WindowMaker style input panel.\n"
"\n" "\n" "version:\n" "\t%s\n", ProgName, ProgName, __DATE__);
"version:\n"
"\t%s\n"
,ProgName,ProgName,__DATE__
);
exit(0); exit(0);
} }
@@ -66,8 +58,7 @@ int main(int argc, char **argv)
} }
while ((ch = getopt(argc, argv, "i:hp:t:")) != -1) while ((ch = getopt(argc, argv, "i:hp:t:")) != -1)
switch(ch) switch (ch) {
{
case 'i': case 'i':
initial = optarg; initial = optarg;
break; break;
@@ -84,12 +75,12 @@ int main(int argc, char **argv)
for (; optind < argc; optind++) for (; optind < argc; optind++)
usage(); usage();
scr = WMCreateSimpleApplicationScreen(dpy); scr = WMCreateSimpleApplicationScreen(dpy);
pixmap = WMCreatePixmapFromXPMData(scr, GNUSTEP_XPM); pixmap = WMCreatePixmapFromXPMData(scr, GNUSTEP_XPM);
WMSetApplicationIconPixmap(scr, pixmap); WMReleasePixmap(pixmap); WMSetApplicationIconPixmap(scr, pixmap);
WMReleasePixmap(pixmap);
if ((result = WMRunInputPanel(scr, NULL, title, prompt, initial, "OK", "Cancel")) != NULL) if ((result = WMRunInputPanel(scr, NULL, title, prompt, initial, "OK", "Cancel")) != NULL)
printf("%s\n", result); printf("%s\n", result);

526
WINGs/Tests/wtest.c
View File

@@ -5,29 +5,25 @@
#include <WINGs/WINGs.h> #include <WINGs/WINGs.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
#include <string.h>
/* /*
* You need to define this function to link any program to WINGs. * You need to define this function to link any program to WINGs.
* (this is no longer required as there is a default abort handler in WINGs)
* This will be called when the application will be terminated because * This will be called when the application will be terminated because
* on a fatal error. * of a fatal error (only for memory allocation failures ATM).
*/ */
void void wAbort()
wAbort()
{ {
exit(1); exit(1);
} }
Display *dpy; Display *dpy;
int windowCount = 0; int windowCount = 0;
void void closeAction(WMWidget * self, void *data)
closeAction(WMWidget *self, void *data)
{ {
WMDestroyWidget(self); WMDestroyWidget(self);
windowCount--; windowCount--;
@@ -36,9 +32,7 @@ closeAction(WMWidget *self, void *data)
exit(0); exit(0);
} }
void testOpenFilePanel(WMScreen * scr)
void
testOpenFilePanel(WMScreen *scr)
{ {
WMOpenPanel *panel; WMOpenPanel *panel;
@@ -53,9 +47,7 @@ testOpenFilePanel(WMScreen *scr)
WMFreeFilePanel(WMGetOpenPanel(scr)); WMFreeFilePanel(WMGetOpenPanel(scr));
} }
void testFontPanel(WMScreen * scr)
void
testFontPanel(WMScreen *scr)
{ {
WMFontPanel *panel; WMFontPanel *panel;
@@ -68,10 +60,7 @@ testFontPanel(WMScreen *scr)
/*WMFreeFontPanel(panel); */ /*WMFreeFontPanel(panel); */
} }
void testFrame(WMScreen * scr)
void
testFrame(WMScreen *scr)
{ {
WMWindow *win; WMWindow *win;
WMFrame *frame; WMFrame *frame;
@@ -114,18 +103,16 @@ testFrame(WMScreen *scr)
} }
/*static void
static void
resizedWindow(void *self, WMNotification *notif) resizedWindow(void *self, WMNotification *notif)
{ {
WMView *view = (WMView*)WMGetNotificationObject(notif); WMView *view = (WMView*)WMGetNotificationObject(notif);
WMSize size = WMGetViewSize(view); WMSize size = WMGetViewSize(view);
WMResizeWidget((WMWidget*)self, size.width, size.height); WMResizeWidget((WMWidget*)self, size.width, size.height);
} }*/
void void testBox(WMScreen * scr)
testBox(WMScreen *scr)
{ {
WMWindow *win; WMWindow *win;
WMBox *box, *hbox; WMBox *box, *hbox;
@@ -138,17 +125,11 @@ testBox(WMScreen *scr)
win = WMCreateWindow(scr, "testBox"); win = WMCreateWindow(scr, "testBox");
WMSetWindowTitle(win, "Box"); WMSetWindowTitle(win, "Box");
WMSetWindowCloseAction(win, closeAction, NULL); WMSetWindowCloseAction(win, closeAction, NULL);
WMResizeWidget(win, 400, 300);
WMSetViewNotifySizeChanges(WMWidgetView(win), True);
box = WMCreateBox(win); box = WMCreateBox(win);
WMSetBoxBorderWidth(box, 5); WMSetBoxBorderWidth(box, 5);
WMSetViewExpandsToParent(WMWidgetView(box), 0, 0, 0, 0);
WMAddNotificationObserver(resizedWindow, box,
WMViewSizeDidChangeNotification,
WMWidgetView(win));
WMResizeWidget(win, 400, 300);
/*WMSetBoxHorizontal(box, True); */ /*WMSetBoxHorizontal(box, True); */
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
@@ -176,43 +157,32 @@ testBox(WMScreen *scr)
WMAddBoxSubview(hbox, WMWidgetView(btn), 1, True, 60, 0, i < 3 ? 5 : 0); WMAddBoxSubview(hbox, WMWidgetView(btn), 1, True, 60, 0, i < 3 ? 5 : 0);
} }
WMRealizeWidget(win); WMRealizeWidget(win);
WMMapSubwidgets(win); WMMapSubwidgets(win);
WMMapWidget(win); WMMapWidget(win);
} }
static void singleClick(WMWidget * self, void *data)
static void
singleClick(WMWidget *self, void *data)
{ {
} }
static void doubleClick(WMWidget * self, void *data)
static void
doubleClick(WMWidget *self, void *data)
{ {
WMSelectAllListItems((WMList *) self); WMSelectAllListItems((WMList *) self);
} }
static void listSelectionObserver(void *observer, WMNotification * notification)
static void
listSelectionObserver(void *observer, WMNotification *notification)
{ {
WMLabel *label = (WMLabel *) observer; WMLabel *label = (WMLabel *) observer;
WMList *lPtr = (WMList *) WMGetNotificationObject(notification); WMList *lPtr = (WMList *) WMGetNotificationObject(notification);
char buf[255]; char buf[255];
sprintf(buf, "Selected items: %d", sprintf(buf, "Selected items: %d", WMGetArrayItemCount(WMGetListSelectedItems(lPtr)));
WMGetArrayItemCount(WMGetListSelectedItems(lPtr)));
WMSetLabelText(label, buf); WMSetLabelText(label, buf);
} }
void testList(WMScreen * scr)
void
testList(WMScreen *scr)
{ {
WMWindow *win; WMWindow *win;
WMList *list; WMList *list;
@@ -246,7 +216,7 @@ testList(WMScreen *scr)
list = WMCreateList(win); list = WMCreateList(win);
/*WMSetListAllowEmptySelection(list, True); */ /*WMSetListAllowEmptySelection(list, True); */
WMMoveWidget(list, 10, 40); WMMoveWidget(list, 10, 40);
for (i=0; i<50; i++) { for (i = 0; i < 105; i++) {
sprintf(text, "Item %i", i); sprintf(text, "Item %i", i);
WMAddListItem(list, text); WMAddListItem(list, text);
} }
@@ -276,20 +246,15 @@ testList(WMScreen *scr)
WMSetListAction(mlist, singleClick, mlabel); WMSetListAction(mlist, singleClick, mlabel);
WMSetListDoubleAction(mlist, doubleClick, mlabel); WMSetListDoubleAction(mlist, doubleClick, mlabel);
WMAddNotificationObserver(listSelectionObserver, label, WMAddNotificationObserver(listSelectionObserver, label, WMListSelectionDidChangeNotification, list);
WMListSelectionDidChangeNotification, list); WMAddNotificationObserver(listSelectionObserver, mlabel, WMListSelectionDidChangeNotification, mlist);
WMAddNotificationObserver(listSelectionObserver, mlabel,
WMListSelectionDidChangeNotification, mlist);
WMRealizeWidget(win); WMRealizeWidget(win);
WMMapSubwidgets(win); WMMapSubwidgets(win);
WMMapWidget(win); WMMapWidget(win);
} }
void testButton(WMScreen * scr)
void
testButton(WMScreen *scr)
{ {
WMWindow *win; WMWindow *win;
int i; int i;
@@ -325,9 +290,7 @@ testButton(WMScreen *scr)
WMMapWidget(win); WMMapWidget(win);
} }
void testGradientButtons(WMScreen * scr)
void
testGradientButtons(WMScreen *scr)
{ {
WMWindow *win; WMWindow *win;
WMButton *btn; WMButton *btn;
@@ -343,6 +306,8 @@ testGradientButtons(WMScreen *scr)
WMSetWindowTitle(win, "Gradiented Button Demo"); WMSetWindowTitle(win, "Gradiented Button Demo");
WMResizeWidget(win, 300, 200); WMResizeWidget(win, 300, 200);
WMSetWindowCloseAction(win, closeAction, NULL);
light.red = 0x90; light.red = 0x90;
light.green = 0x85; light.green = 0x85;
light.blue = 0x90; light.blue = 0x90;
@@ -416,9 +381,7 @@ testGradientButtons(WMScreen *scr)
WMMapWidget(win); WMMapWidget(win);
} }
void testScrollView(WMScreen * scr)
void
testScrollView(WMScreen *scr)
{ {
WMWindow *win; WMWindow *win;
WMScrollView *sview; WMScrollView *sview;
@@ -477,9 +440,7 @@ testScrollView(WMScreen *scr)
WMMapWidget(win); WMMapWidget(win);
} }
void testColorWell(WMScreen * scr)
void
testColorWell(WMScreen *scr)
{ {
WMWindow *win; WMWindow *win;
WMColorWell *well1, *well2; WMColorWell *well1, *well2;
@@ -504,9 +465,7 @@ testColorWell(WMScreen *scr)
WMMapWidget(win); WMMapWidget(win);
} }
void testColorPanel(WMScreen * scr)
void
testColorPanel(WMScreen *scr)
{ {
WMColorPanel *panel = WMGetColorPanel(scr); WMColorPanel *panel = WMGetColorPanel(scr);
@@ -519,15 +478,12 @@ testColorPanel(WMScreen *scr)
WMShowColorPanel(panel); WMShowColorPanel(panel);
} }
void void sliderCallback(WMWidget * w, void *data)
sliderCallback(WMWidget *w, void *data)
{ {
printf("SLIDER == %i\n", WMGetSliderValue(w)); printf("SLIDER == %i\n", WMGetSliderValue(w));
} }
void testSlider(WMScreen * scr)
void
testSlider(WMScreen *scr)
{ {
WMWindow *win; WMWindow *win;
WMSlider *s; WMSlider *s;
@@ -557,9 +513,7 @@ testSlider(WMScreen *scr)
WMMapWidget(win); WMMapWidget(win);
} }
void testTextField(WMScreen * scr)
void
testTextField(WMScreen *scr)
{ {
WMWindow *win; WMWindow *win;
WMTextField *field, *field2; WMTextField *field, *field2;
@@ -574,6 +528,7 @@ testTextField(WMScreen *scr)
field = WMCreateTextField(win); field = WMCreateTextField(win);
WMResizeWidget(field, 200, 20); WMResizeWidget(field, 200, 20);
WMMoveWidget(field, 20, 20); WMMoveWidget(field, 20, 20);
WMSetTextFieldText(field, "the little \xc2\xa9 sign");
field2 = WMCreateTextField(win); field2 = WMCreateTextField(win);
WMResizeWidget(field2, 200, 20); WMResizeWidget(field2, 200, 20);
@@ -586,13 +541,13 @@ testTextField(WMScreen *scr)
} }
void testText(WMScreen * scr)
void
testText(WMScreen *scr)
{ {
WMWindow *win; WMWindow *win;
WMText *text; WMText *text;
FILE *file = fopen("wm.html", "r"); WMFont *font;
void *tb;
FILE *file = fopen("wm.html", "rb");
windowCount++; windowCount++;
@@ -606,8 +561,22 @@ testText(WMScreen *scr)
WMMoveWidget(text, 10, 10); WMMoveWidget(text, 10, 10);
WMSetTextHasVerticalScroller(text, True); WMSetTextHasVerticalScroller(text, True);
WMSetTextEditable(text, False); WMSetTextEditable(text, False);
WMSetTextIgnoresNewline(text, False);
if(file) { #define FNAME "Verdana,Luxi Sans:pixelsize=12"
#define MSG \
"Window Maker is the GNU window manager for the " \
"X Window System. It was designed to emulate the " \
"look and feel of part of the NEXTSTEP(tm) GUI. It's " \
"supposed to be relatively fast and small, feature " \
"rich, easy to configure and easy to use, with a simple " \
"and elegant appearance borrowed from NEXTSTEP(tm)."
font = WMCreateFont(scr, FNAME ":autohint=false");
WMSetTextDefaultFont(text, font);
WMReleaseFont(font);
if (0 && file) {
char buf[1024]; char buf[1024];
WMFreezeText(text); WMFreezeText(text);
@@ -617,13 +586,15 @@ testText(WMScreen *scr)
fclose(file); fclose(file);
WMThawText(text); WMThawText(text);
} else { } else {
WMAppendTextStream(text, WMAppendTextStream(text, "First paragraph has autohinting turned off, "
"Window Maker is the GNU window manager for the " "while the second has it turned on:");
"X Window System. It was designed to emulate the " WMAppendTextStream(text, "\n\n\n");
"look and feel of part of the NEXTSTEP(tm) GUI. Its " WMAppendTextStream(text, MSG);
"supposed to be relatively fast and small, feature " WMAppendTextStream(text, "\n\n\n");
"rich, easy to configure and easy to use, with a simple " font = WMCreateFont(scr, FNAME ":autohint=true");
"and elegant appearance borrowed from NEXTSTEP(tm)."); tb = WMCreateTextBlockWithText(text, MSG, font, WMBlackColor(scr), 0, strlen(MSG));
WMAppendTextBlock(text, tb);
WMReleaseFont(font);
} }
WMRealizeWidget(win); WMRealizeWidget(win);
@@ -631,9 +602,7 @@ testText(WMScreen *scr)
WMMapWidget(win); WMMapWidget(win);
} }
void testProgressIndicator(WMScreen * scr)
void
testProgressIndicator(WMScreen *scr)
{ {
WMWindow *win; WMWindow *win;
WMProgressIndicator *pPtr; WMProgressIndicator *pPtr;
@@ -655,9 +624,7 @@ testProgressIndicator(WMScreen *scr)
} }
void testPullDown(WMScreen * scr)
void
testPullDown(WMScreen *scr)
{ {
WMWindow *win; WMWindow *win;
WMPopUpButton *pop, *pop2; WMPopUpButton *pop, *pop2;
@@ -694,9 +661,7 @@ testPullDown(WMScreen *scr)
} }
void testTabView(WMScreen * scr)
void
testTabView(WMScreen *scr)
{ {
WMWindow *win; WMWindow *win;
WMTabView *tabv; WMTabView *tabv;
@@ -722,7 +687,6 @@ testTabView(WMScreen *scr)
WMSetLabelText(label, "Label 1"); WMSetLabelText(label, "Label 1");
WMMapWidget(label); WMMapWidget(label);
tab = WMCreateTabViewItemWithIdentifier(0); tab = WMCreateTabViewItemWithIdentifier(0);
WMSetTabViewItemView(tab, WMWidgetView(frame)); WMSetTabViewItemView(tab, WMWidgetView(frame));
WMAddItemInTabView(tabv, tab); WMAddItemInTabView(tabv, tab);
@@ -735,13 +699,11 @@ testTabView(WMScreen *scr)
WMSetLabelText(label, "Label 2"); WMSetLabelText(label, "Label 2");
WMMapWidget(label); WMMapWidget(label);
tab = WMCreateTabViewItemWithIdentifier(0); tab = WMCreateTabViewItemWithIdentifier(0);
WMSetTabViewItemView(tab, WMWidgetView(frame)); WMSetTabViewItemView(tab, WMWidgetView(frame));
WMAddItemInTabView(tabv, tab); WMAddItemInTabView(tabv, tab);
WMSetTabViewItemLabel(tab, "Classes"); WMSetTabViewItemLabel(tab, "Classes");
frame = WMCreateFrame(win); frame = WMCreateFrame(win);
WMSetFrameRelief(frame, WRFlat); WMSetFrameRelief(frame, WRFlat);
label = WMCreateLabel(frame); label = WMCreateLabel(frame);
@@ -755,7 +717,6 @@ testTabView(WMScreen *scr)
WMAddItemInTabView(tabv, tab); WMAddItemInTabView(tabv, tab);
WMSetTabViewItemLabel(tab, "Something"); WMSetTabViewItemLabel(tab, "Something");
frame = WMCreateFrame(win); frame = WMCreateFrame(win);
WMSetFrameRelief(frame, WRFlat); WMSetFrameRelief(frame, WRFlat);
label = WMCreateLabel(frame); label = WMCreateLabel(frame);
@@ -769,8 +730,6 @@ testTabView(WMScreen *scr)
WMAddItemInTabView(tabv, tab); WMAddItemInTabView(tabv, tab);
WMSetTabViewItemLabel(tab, "Bla!"); WMSetTabViewItemLabel(tab, "Bla!");
frame = WMCreateFrame(win); frame = WMCreateFrame(win);
WMSetFrameRelief(frame, WRFlat); WMSetFrameRelief(frame, WRFlat);
label = WMCreateLabel(frame); label = WMCreateLabel(frame);
@@ -783,16 +742,12 @@ testTabView(WMScreen *scr)
WMAddItemInTabView(tabv, tab); WMAddItemInTabView(tabv, tab);
WMSetTabViewItemLabel(tab, "Weee!"); WMSetTabViewItemLabel(tab, "Weee!");
WMRealizeWidget(win); WMRealizeWidget(win);
WMMapSubwidgets(win); WMMapSubwidgets(win);
WMMapWidget(win); WMMapWidget(win);
} }
void splitViewConstrainProc(WMSplitView * sPtr, int indView, int *minSize, int *maxSize)
void
splitViewConstrainProc(WMSplitView *sPtr, int indView,
int *minSize, int *maxSize)
{ {
switch (indView) { switch (indView) {
case 0: case 0:
@@ -810,9 +765,7 @@ splitViewConstrainProc(WMSplitView *sPtr, int indView,
} }
} }
static void resizeSplitView(XEvent * event, void *data)
static void
resizeSplitView(XEvent *event, void *data)
{ {
WMSplitView *sPtr = (WMSplitView *) data; WMSplitView *sPtr = (WMSplitView *) data;
@@ -822,14 +775,12 @@ resizeSplitView(XEvent *event, void *data)
if (width < WMGetSplitViewDividerThickness(sPtr)) if (width < WMGetSplitViewDividerThickness(sPtr))
width = WMGetSplitViewDividerThickness(sPtr); width = WMGetSplitViewDividerThickness(sPtr);
if (width != WMWidgetWidth(sPtr) || if (width != WMWidgetWidth(sPtr) || event->xconfigure.height != WMWidgetHeight(sPtr))
event->xconfigure.height != WMWidgetHeight(sPtr))
WMResizeWidget(sPtr, width, event->xconfigure.height - 55); WMResizeWidget(sPtr, width, event->xconfigure.height - 55);
} }
} }
void void appendSubviewButtonAction(WMWidget * self, void *data)
appendSubviewButtonAction(WMWidget *self, void *data)
{ {
WMSplitView *sPtr = (WMSplitView *) data; WMSplitView *sPtr = (WMSplitView *) data;
char buf[64]; char buf[64];
@@ -843,8 +794,7 @@ appendSubviewButtonAction(WMWidget *self, void *data)
WMMapWidget(label); WMMapWidget(label);
} }
void void removeSubviewButtonAction(WMWidget * self, void *data)
removeSubviewButtonAction(WMWidget *self, void *data)
{ {
WMSplitView *sPtr = (WMSplitView *) data; WMSplitView *sPtr = (WMSplitView *) data;
int count = WMGetSplitViewSubviewsCount(sPtr); int count = WMGetSplitViewSubviewsCount(sPtr);
@@ -856,21 +806,18 @@ removeSubviewButtonAction(WMWidget *self, void *data)
} }
} }
void void orientationButtonAction(WMWidget * self, void *data)
orientationButtonAction(WMWidget *self, void *data)
{ {
WMSplitView *sPtr = (WMSplitView *) data; WMSplitView *sPtr = (WMSplitView *) data;
WMSetSplitViewVertical(sPtr, !WMGetSplitViewVertical(sPtr)); WMSetSplitViewVertical(sPtr, !WMGetSplitViewVertical(sPtr));
} }
void void adjustSubviewsButtonAction(WMWidget * self, void *data)
adjustSubviewsButtonAction(WMWidget *self, void *data)
{ {
WMAdjustSplitViewSubviews((WMSplitView *) data); WMAdjustSplitViewSubviews((WMSplitView *) data);
} }
void void testSplitView(WMScreen * scr)
testSplitView(WMScreen *scr)
{ {
WMWindow *win; WMWindow *win;
WMSplitView *splitv1, *splitv2; WMSplitView *splitv1, *splitv2;
@@ -893,8 +840,7 @@ testSplitView(WMScreen *scr)
WMMoveWidget(splitv1, 5, 50); WMMoveWidget(splitv1, 5, 50);
WMResizeWidget(splitv1, 290, 345); WMResizeWidget(splitv1, 290, 345);
WMSetSplitViewConstrainProc(splitv1, splitViewConstrainProc); WMSetSplitViewConstrainProc(splitv1, splitViewConstrainProc);
WMCreateEventHandler(WMWidgetView(win), StructureNotifyMask, WMCreateEventHandler(WMWidgetView(win), StructureNotifyMask, resizeSplitView, splitv1);
resizeSplitView, splitv1);
button = WMCreateCommandButton(frame); button = WMCreateCommandButton(frame);
WMSetButtonText(button, "+"); WMSetButtonText(button, "+");
@@ -956,278 +902,7 @@ testSplitView(WMScreen *scr)
WMMapWidget(win); WMMapWidget(win);
} }
void testUD()
/*******************************************************************/
#include <sys/types.h>
#include <dirent.h>
#include <string.h>
typedef struct {
int x, y;
Bool mouseDown;
char *filename;
} DNDStuff;
WMPixmap*
getImage(WMScreen *scr, char *file)
{
char buffer[1000];
WMPixmap *pix;
sprintf(buffer, "../../WindowMaker/Icons/%s", file);
pix = WMCreatePixmapFromFile(scr, buffer);
return pix;
}
static void
iconMouseStuff(XEvent *event, void *cdata)
{
WMLabel *label = (WMLabel*)cdata;
DNDStuff *stuff = WMGetHangedData(label);
WMPoint where;
switch (event->type) {
case ButtonPress:
stuff->x = event->xbutton.x;
stuff->y = event->xbutton.y;
stuff->mouseDown = True;
break;
case ButtonRelease:
stuff->mouseDown = False;
break;
case MotionNotify:
if (!stuff->mouseDown)
break;
if (abs(stuff->x - event->xmotion.x)>4
|| abs(stuff->y - event->xmotion.y)>4) {
where = WMGetViewScreenPosition(WMWidgetView(label));
WMDragImageFromView(WMWidgetView(label),
WMGetLabelImage(label),
NULL, /* XXX */
where,
wmksize(stuff->x, stuff->y),
event, True);
}
break;
}
}
static void
endedDragImage(WMView *self, WMPixmap *image, WMPoint point, Bool deposited)
{
DNDStuff *stuff = WMGetHangedData(WMWidgetOfView(self));
if (deposited) {
WMDestroyWidget(WMWidgetOfView(self));
}
stuff->mouseDown = False;
}
static WMData*
fetchDragData(WMView *self, char *type)
{
DNDStuff *stuff = WMGetHangedData(WMWidgetOfView(self));
return WMCreateDataWithBytes(stuff->filename, strlen(stuff->filename)+1);
}
WMDragSourceProcs dragSourceProcs = {
NULL,
NULL,
endedDragImage,
fetchDragData
};
/************************/
unsigned
draggingEntered(WMView *self, WMDraggingInfo *info)
{
return WDOperationCopy;
}
unsigned
draggingUpdated(WMView *self, WMDraggingInfo *info)
{
return WDOperationCopy;
}
/*
void (*draggingExited)(WMView *self, WMDraggingInfo *info);
*/
char*
prepareForDragOperation(WMView *self, WMDraggingInfo *info)
{
return "application/X-WINGs-Bla";
}
WMLabel* makeDraggableLabel(WMWidget *w, char *file, int x, int y);
Bool
performDragOperation(WMView *self, WMDraggingInfo *info, WMData *data)
{
char *file = (char*)WMDataBytes(data);
WMPoint pos;
pos = WMGetDraggingInfoImageLocation(info);
if (file!=NULL) {
WMLabel *label;
WMPoint pos2 = WMGetViewScreenPosition(self);
label = makeDraggableLabel(WMWidgetOfView(self), file,
pos.x-pos2.x, pos.y-pos2.y);
WMRealizeWidget(label);
WMMapWidget(label);
}
return True;
}
void
concludeDragOperation(WMView *self, WMDraggingInfo *info)
{
}
WMDragDestinationProcs dragDestProcs = {
draggingEntered,
draggingUpdated,
NULL,
prepareForDragOperation,
performDragOperation,
concludeDragOperation
};
WMLabel*
makeDraggableLabel(WMWidget *w, char *file, int x, int y)
{
DNDStuff *stuff;
WMLabel *label;
WMPixmap *image = getImage(WMWidgetScreen(w), file);
stuff = wmalloc(sizeof(DNDStuff));
stuff->mouseDown = False;
stuff->filename = wstrdup(file);
label = WMCreateLabel(w);
WMResizeWidget(label, 48, 48);
WMMoveWidget(label, x, y);
WMSetViewDragSourceProcs(WMWidgetView(label), &dragSourceProcs);
WMHangData(label, stuff);
WMCreateEventHandler(WMWidgetView(label),
ButtonPressMask|ButtonReleaseMask|ButtonMotionMask,
iconMouseStuff, label);
if (image != NULL) {
WMSetLabelImagePosition(label, WIPImageOnly);
WMSetLabelImage(label, image);
WMReleasePixmap(image);
} else puts(file);
return label;
}
void
testDragAndDrop(WMScreen *scr)
{
WMWindow *win;
WMFrame *frame;
WMLabel *label;
int i, j;
DIR *dir;
struct dirent *ent;
char *types[] = {
"application/X-WINGs-Bla",
NULL
};
windowCount++;
win = WMCreateWindow(scr, "dragDrop");
WMResizeWidget(win, 300, 300);
WMSetWindowCloseAction(win, closeAction, NULL);
WMSetWindowTitle(win, "Drag and Drop");
frame = WMCreateFrame(win);
WMSetFrameRelief(frame, WRSunken);
WMResizeWidget(frame, 250, 250);
WMMoveWidget(frame, 25, 25);
WMRegisterViewForDraggedTypes(WMWidgetView(frame), types);
WMSetViewDragDestinationProcs(WMWidgetView(frame), &dragDestProcs);
dir = opendir("../../WindowMaker/Icons");
if (!dir) {
perror("../../WindowMaker/Icons");
return;
}
for (i = 0, j=0; j < 8; i++) {
ent = readdir(dir);
if (!ent)
break;
if (strstr(ent->d_name, ".xpm")==NULL) {
continue;
}
label = makeDraggableLabel(frame, ent->d_name,4+(j/4)*64, 4+(j%4)*64);
j++;
}
closedir(dir);
WMMapSubwidgets(frame);
WMMapSubwidgets(win);
WMRealizeWidget(win);
WMMapWidget(win);
}
/*******************************************************************/
void
testUD()
{ {
WMUserDefaults *defs; WMUserDefaults *defs;
char str[32]; char str[32];
@@ -1240,14 +915,11 @@ testUD()
puts(str); puts(str);
} }
int main(int argc, char **argv)
int
main(int argc, char **argv)
{ {
WMScreen *scr; WMScreen *scr;
WMPixmap *pixmap; WMPixmap *pixmap;
/* Initialize the application */ /* Initialize the application */
WMInitializeApplication("Test@eqweq_ewq$eqw", &argc, argv); WMInitializeApplication("Test@eqweq_ewq$eqw", &argc, argv);
@@ -1267,7 +939,7 @@ main(int argc, char **argv)
* Do NOT use it unless when debugging. It will cause a major * Do NOT use it unless when debugging. It will cause a major
* slowdown in your application * slowdown in your application
*/ */
#if 1 #if 0
XSynchronize(dpy, True); XSynchronize(dpy, True);
#endif #endif
/* /*
@@ -1283,7 +955,10 @@ main(int argc, char **argv)
/* /*
* Makes the logo be used in standard dialog panels. * Makes the logo be used in standard dialog panels.
*/ */
WMSetApplicationIconPixmap(scr, pixmap); WMReleasePixmap(pixmap); if (pixmap) {
WMSetApplicationIconPixmap(scr, pixmap);
WMReleasePixmap(pixmap);
}
/* /*
* Do some test stuff. * Do some test stuff.
@@ -1291,44 +966,31 @@ main(int argc, char **argv)
* Put the testSomething() function you want to test here. * Put the testSomething() function you want to test here.
*/ */
testDragAndDrop(scr);
testText(scr); testText(scr);
#if 0 testFontPanel(scr);
testColorPanel(scr); testColorPanel(scr);
testScrollView(scr);
testTabView(scr);
testBox(scr);
testText(scr);
testList(scr);
testProgressIndicator(scr);
testColorWell(scr);
testTextField(scr); testTextField(scr);
testDragAndDrop(scr); #if 0
testFontPanel(scr);
testBox(scr);
testButton(scr); testButton(scr);
testColorPanel(scr);
testColorWell(scr);
testDragAndDrop(scr);
testFrame(scr); testFrame(scr);
testSplitView(scr);
testGradientButtons(scr); testGradientButtons(scr);
testList(scr);
testOpenFilePanel(scr); testOpenFilePanel(scr);
testProgressIndicator(scr);
testSlider(scr);
testPullDown(scr); testPullDown(scr);
testScrollView(scr);
testSlider(scr);
testSplitView(scr);
testTabView(scr);
testTextField(scr);
#endif #endif
/* /*
* The main event loop. * The main event loop.

1
WINGs/WINGs/.cvsignore
View File

@@ -1 +0,0 @@
Makefile Makefile.in

8
WINGs/WINGs/Makefile.am
View File

@@ -7,3 +7,11 @@ includedir = @includedir@/WINGs
include_HEADERS = WINGs.h WUtil.h WINGsP.h proplist-compat.h include_HEADERS = WINGs.h WUtil.h WINGsP.h proplist-compat.h
.c.o:
$(QUIET)$(COMPILE) -c $<
.c.obj:
$(QUIET)$(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
$(QUIET)$(LTCOMPILE) -c -o $@ $<

174
WINGs/WINGs/WINGs.h
View File

@@ -7,7 +7,7 @@
#include <WINGs/WUtil.h> #include <WINGs/WUtil.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#define WINGS_H_VERSION 20010117 #define WINGS_H_VERSION 20041030
#ifdef __cplusplus #ifdef __cplusplus
@@ -223,7 +223,7 @@ enum {
/* drag operations */ /* drag operations */
typedef enum { typedef enum {
WDOperationNone, WDOperationNone = 0,
WDOperationCopy, WDOperationCopy,
WDOperationMove, WDOperationMove,
WDOperationLink, WDOperationLink,
@@ -385,6 +385,7 @@ typedef struct WMListItem {
typedef struct WMAlertPanel { typedef struct WMAlertPanel {
WMWindow *win; /* window */ WMWindow *win; /* window */
WMBox *vbox; WMBox *vbox;
WMBox *hbox;
WMButton *defBtn; /* default button */ WMButton *defBtn; /* default button */
WMButton *altBtn; /* alternative button */ WMButton *altBtn; /* alternative button */
WMButton *othBtn; /* other button */ WMButton *othBtn; /* other button */
@@ -415,8 +416,6 @@ typedef struct WMGenericPanel {
} WMGenericPanel; } WMGenericPanel;
typedef struct WMInputPanel { typedef struct WMInputPanel {
WMWindow *win; /* window */ WMWindow *win; /* window */
WMButton *defBtn; /* default button */ WMButton *defBtn; /* default button */
@@ -428,6 +427,15 @@ typedef struct WMInputPanel {
} WMInputPanel; } WMInputPanel;
/* Basic font styles. Used to easily get one style from another */
typedef enum WMFontStyle {
WFSNormal = 0,
WFSBold = 1,
WFSItalic = 2,
WFSBoldItalic = 3
} WMFontStyle;
/* WMRuler: */ /* WMRuler: */
typedef struct { typedef struct {
WMArray *tabs; /* a growable array of tabstops */ WMArray *tabs; /* a growable array of tabstops */
@@ -452,12 +460,11 @@ typedef void WMAction(WMWidget *self, void *clientData);
typedef void WMAction2(void *self, void *clientData); typedef void WMAction2(void *self, void *clientData);
typedef void WMDropDataCallback(WMView *view, WMData *data);
/* delegate method like stuff */ /* delegate method like stuff */
typedef void WMListDrawProc(WMList *lPtr, int index, Drawable d, char *text, typedef void WMListDrawProc(WMList *lPtr, int index, Drawable d, char *text,
int state, WMRect *rect); int state, WMRect *rect);
/* /*
typedef void WMSplitViewResizeSubviewsProc(WMSplitView *sPtr, typedef void WMSplitViewResizeSubviewsProc(WMSplitView *sPtr,
unsigned int oldWidth, unsigned int oldWidth,
@@ -552,11 +559,17 @@ typedef struct WMSelectionProcs {
typedef struct W_DraggingInfo WMDraggingInfo; typedef struct W_DraggingInfo WMDraggingInfo;
/* links a label to a dnd operation. */
typedef struct W_DragOperationtItem WMDragOperationItem;
typedef struct W_DragSourceProcs { typedef struct W_DragSourceProcs {
unsigned (*draggingSourceOperation)(WMView *self, Bool local); WMArray* (*dropDataTypes)(WMView *self);
void (*beganDragImage)(WMView *self, WMPixmap *image, WMPoint point); WMDragOperationType (*wantedDropOperation)(WMView *self);
void (*endedDragImage)(WMView *self, WMPixmap *image, WMPoint point, WMArray* (*askedOperations)(WMView *self);
Bool deposited); Bool (*acceptDropOperation)(WMView *self, WMDragOperationType operation);
void (*beganDrag)(WMView *self, WMPoint *point);
void (*endedDrag)(WMView *self, WMPoint *point, Bool deposited);
WMData* (*fetchDragData)(WMView *self, char *type); WMData* (*fetchDragData)(WMView *self, char *type);
/*Bool (*ignoreModifierKeysWhileDragging)(WMView *view);*/ /*Bool (*ignoreModifierKeysWhileDragging)(WMView *view);*/
} WMDragSourceProcs; } WMDragSourceProcs;
@@ -564,16 +577,19 @@ typedef struct W_DragSourceProcs {
typedef struct W_DragDestinationProcs { typedef struct W_DragDestinationProcs {
unsigned (*draggingEntered)(WMView *self, WMDraggingInfo *info); void (*prepareForDragOperation)(WMView *self);
unsigned (*draggingUpdated)(WMView *self, WMDraggingInfo *info); WMArray* (*requiredDataTypes)(WMView *self, WMDragOperationType request,
void (*draggingExited)(WMView *self, WMDraggingInfo *info); WMArray *sourceDataTypes);
Bool (*prepareForDragOperation)(WMView *self, WMDraggingInfo *info); WMDragOperationType (*allowedOperation)(WMView *self,
Bool (*performDragOperation)(WMView *self, WMDraggingInfo *info); WMDragOperationType request,
void (*concludeDragOperation)(WMView *self, WMDraggingInfo *info); WMArray *sourceDataTypes);
Bool (*inspectDropData)(WMView *self, WMArray *dropData);
void (*performDragOperation)(WMView *self, WMArray *dropData,
WMArray *operations, WMPoint *dropLocation);
void (*concludeDragOperation)(WMView *self);
} WMDragDestinationProcs; } WMDragDestinationProcs;
/* ...................................................................... */ /* ...................................................................... */
@@ -581,6 +597,8 @@ WMPoint wmkpoint(int x, int y);
WMSize wmksize(unsigned int width, unsigned int height); WMSize wmksize(unsigned int width, unsigned int height);
WMRect wmkrect(int x, int y, unsigned int width, unsigned int height);
#ifdef ANSI_C_DOESNT_LIKE_IT_THIS_WAY #ifdef ANSI_C_DOESNT_LIKE_IT_THIS_WAY
#define wmksize(width, height) (WMSize){(width), (height)} #define wmksize(width, height) (WMSize){(width), (height)}
#define wmkpoint(x, y) (WMPoint){(x), (y)} #define wmkpoint(x, y) (WMPoint){(x), (y)}
@@ -653,13 +671,16 @@ void WMDeleteEventHandler(WMView *view, unsigned long mask,
int WMIsDoubleClick(XEvent *event); int WMIsDoubleClick(XEvent *event);
int WMIsTripleClick(XEvent *event); /*int WMIsTripleClick(XEvent *event);*/
void WMNextEvent(Display *dpy, XEvent *event); void WMNextEvent(Display *dpy, XEvent *event);
void WMMaskEvent(Display *dpy, long mask, XEvent *event); void WMMaskEvent(Display *dpy, long mask, XEvent *event);
/* ....................................................................... */
Bool WMCreateSelectionHandler(WMView *view, Atom selection, Time timestamp, Bool WMCreateSelectionHandler(WMView *view, Atom selection, Time timestamp,
WMSelectionProcs *procs, void *cdata); WMSelectionProcs *procs, void *cdata);
@@ -670,66 +691,75 @@ Bool WMRequestSelection(WMView *view, Atom selection, Atom target,
void *cdata); void *cdata);
extern char *WMSelectionOwnerDidChangeNotification;
/* ....................................................................... */ /* ....................................................................... */
WMArray* WMCreateDragOperationArray(int initialSize);
WMDragOperationItem* WMCreateDragOperationItem(WMDragOperationType type,
char* text);
WMDragOperationType WMGetDragOperationItemType(WMDragOperationItem* item);
char* WMGetDragOperationItemText(WMDragOperationItem* item);
void WMSetViewDragImage(WMView* view, WMPixmap *dragImage);
void WMReleaseViewDragImage(WMView* view);
void WMSetViewDragSourceProcs(WMView *view, WMDragSourceProcs *procs); void WMSetViewDragSourceProcs(WMView *view, WMDragSourceProcs *procs);
void WMDragImageFromView(WMView *view, WMPixmap *image, char *dataTypes[], Bool WMIsDraggingFromView(WMView *view);
WMPoint atLocation, WMSize mouseOffset, XEvent *event,
Bool slideBack);
void WMRegisterViewForDraggedTypes(WMView *view, char *acceptedTypes[]); void WMDragImageFromView(WMView *view, XEvent *event);
/* Create a drag handler, associating drag event masks with dragEventProc */
void WMCreateDragHandler(WMView *view, WMEventProc *dragEventProc, void *clientData);
void WMDeleteDragHandler(WMView *view, WMEventProc *dragEventProc, void *clientData);
/* set default drag handler for view */
void WMSetViewDraggable(WMView *view, WMDragSourceProcs *procs, WMPixmap *dragImage);
void WMUnsetViewDraggable(WMView *view);
void WMRegisterViewForDraggedTypes(WMView *view, WMArray *acceptedTypes);
void WMUnregisterViewDraggedTypes(WMView *view); void WMUnregisterViewDraggedTypes(WMView *view);
void WMSetViewDragDestinationProcs(WMView *view, WMDragDestinationProcs *procs); void WMSetViewDragDestinationProcs(WMView *view, WMDragDestinationProcs *procs);
/* ....................................................................... */
WMPoint WMGetDraggingInfoImageLocation(WMDraggingInfo *info); Bool WMIsAntialiasingEnabled(WMScreen *scrPtr);
/* ....................................................................... */ /* ....................................................................... */
WMFont* WMCreateFontSet(WMScreen *scrPtr, char *fontName);
WMFont* WMCreateNormalFont(WMScreen *scrPtr, char *fontName);
WMFont* WMCreateFont(WMScreen *scrPtr, char *fontName); WMFont* WMCreateFont(WMScreen *scrPtr, char *fontName);
WMFont* WMCopyFontWithStyle(WMScreen *scrPtr, WMFont *font, WMFontStyle style);
WMFont* WMRetainFont(WMFont *font); WMFont* WMRetainFont(WMFont *font);
void WMReleaseFont(WMFont *font); void WMReleaseFont(WMFont *font);
char* WMGetFontName(WMFont *font);
unsigned int WMFontHeight(WMFont *font); unsigned int WMFontHeight(WMFont *font);
/*
WMFont* WMUserFontOfSize(WMScreen *scrPtr, int size);
WMFont* WMUserFixedPitchFontOfSize(WMScreen *scrPtr, int size);
*/
void WMSetWidgetDefaultFont(WMScreen *scr, WMFont *font); void WMSetWidgetDefaultFont(WMScreen *scr, WMFont *font);
void WMSetWidgetDefaultBoldFont(WMScreen *scr, WMFont *font); void WMSetWidgetDefaultBoldFont(WMScreen *scr, WMFont *font);
WMFont* WMDefaultSystemFont(WMScreen *scrPtr);
WMFont* WMDefaultBoldSystemFont(WMScreen *scrPtr);
WMFont* WMSystemFontOfSize(WMScreen *scrPtr, int size); WMFont* WMSystemFontOfSize(WMScreen *scrPtr, int size);
WMFont* WMBoldSystemFontOfSize(WMScreen *scrPtr, int size); WMFont* WMBoldSystemFontOfSize(WMScreen *scrPtr, int size);
XFontSet WMGetFontFontSet(WMFont *font);
WMFont* WMNormalizeFont(WMScreen *scr, WMFont *font);
WMFont* WMStrengthenFont(WMScreen *scr, WMFont *font);
WMFont* WMUnstrengthenFont(WMScreen *scr, WMFont *font);
WMFont* WMEmphasizeFont(WMScreen *scr, WMFont *font);
WMFont* WMUnemphasizeFont(WMScreen *scr, WMFont *font);
WMFont* WMGetFontOfSize(WMScreen *scr, WMFont *font, int size);
/* ....................................................................... */ /* ....................................................................... */
WMPixmap* WMRetainPixmap(WMPixmap *pixmap); WMPixmap* WMRetainPixmap(WMPixmap *pixmap);
@@ -794,24 +824,35 @@ WMColor* WMCreateRGBColor(WMScreen *scr, unsigned short red,
unsigned short green, unsigned short blue, unsigned short green, unsigned short blue,
Bool exact); Bool exact);
WMColor* WMCreateRGBAColor(WMScreen *scr, unsigned short red,
unsigned short green, unsigned short blue,
unsigned short alpha, Bool exact);
WMColor* WMCreateNamedColor(WMScreen *scr, char *name, Bool exact); WMColor* WMCreateNamedColor(WMScreen *scr, char *name, Bool exact);
RColor WMGetRColorFromColor(WMColor *color);
void WMSetColorAlpha(WMColor *color, unsigned short alpha);
unsigned short WMRedComponentOfColor(WMColor *color); unsigned short WMRedComponentOfColor(WMColor *color);
unsigned short WMGreenComponentOfColor(WMColor *color); unsigned short WMGreenComponentOfColor(WMColor *color);
unsigned short WMBlueComponentOfColor(WMColor *color); unsigned short WMBlueComponentOfColor(WMColor *color);
unsigned short WMGetColorAlpha(WMColor *color);
char* WMGetColorRGBDescription(WMColor *color); char* WMGetColorRGBDescription(WMColor *color);
/* ....................................................................... */ /* ....................................................................... */
void WMDrawString(WMScreen *scr, Drawable d, GC gc, WMFont *font, int x, void WMDrawString(WMScreen *scr, Drawable d, WMColor *color, WMFont *font,
int y, char *text, int length); int x, int y, char *text, int length);
void WMDrawImageString(WMScreen *scr, Drawable d, GC gc, WMFont *font, int x, void WMDrawImageString(WMScreen *scr, Drawable d, WMColor *color,
int y, char *text, int length); WMColor *background, WMFont *font, int x, int y,
char *text, int length);
int WMWidthOfString(WMFont *font, char *text, int length); int WMWidthOfString(WMFont *font, char *text, int length);
@@ -841,6 +882,8 @@ void WMResizeWidget(WMWidget *w, unsigned int width, unsigned int height);
void WMSetWidgetBackgroundColor(WMWidget *w, WMColor *color); void WMSetWidgetBackgroundColor(WMWidget *w, WMColor *color);
WMColor* WMGetWidgetBackgroundColor(WMWidget *w);
void WMMapSubwidgets(WMWidget *w); void WMMapSubwidgets(WMWidget *w);
void WMUnmapSubwidgets(WMWidget *w); void WMUnmapSubwidgets(WMWidget *w);
@@ -885,9 +928,9 @@ void WMRelayToNextResponder(WMView *view, XEvent *event);
/* notifications */ /* notifications */
extern char *WMViewSizeDidChangeNotification; extern char *WMViewSizeDidChangeNotification;
extern char *WMViewRealizedNotification; extern char *WMViewFocusDidChangeNotification;
extern char *WMFontPanelDidChangeNotification; extern char *WMViewRealizedNotification;
/* ....................................................................... */ /* ....................................................................... */
@@ -922,6 +965,8 @@ void WMSetWindowTitle(WMWindow *wPtr, char *title);
void WMSetWindowMiniwindowTitle(WMWindow *win, char *title); void WMSetWindowMiniwindowTitle(WMWindow *win, char *title);
void WMSetWindowMiniwindowImage(WMWindow *win, RImage *image);
void WMSetWindowMiniwindowPixmap(WMWindow *win, WMPixmap *pixmap); void WMSetWindowMiniwindowPixmap(WMWindow *win, WMPixmap *pixmap);
void WMSetWindowCloseAction(WMWindow *win, WMAction *action, void *clientData); void WMSetWindowCloseAction(WMWindow *win, WMAction *action, void *clientData);
@@ -997,6 +1042,8 @@ void WMSetButtonBordered(WMButton *bPtr, int isBordered);
void WMSetButtonEnabled(WMButton *bPtr, Bool flag); void WMSetButtonEnabled(WMButton *bPtr, Bool flag);
int WMGetButtonEnabled(WMButton *bPtr);
void WMSetButtonImageDimsWhenDisabled(WMButton *bPtr, Bool flag); void WMSetButtonImageDimsWhenDisabled(WMButton *bPtr, Bool flag);
void WMSetButtonTag(WMButton *bPtr, int tag); void WMSetButtonTag(WMButton *bPtr, int tag);
@@ -1078,12 +1125,15 @@ void WMSelectTextFieldRange(WMTextField *tPtr, WMRange range);
void WMSetTextFieldCursorPosition(WMTextField *tPtr, unsigned int position); void WMSetTextFieldCursorPosition(WMTextField *tPtr, unsigned int position);
unsigned WMGetTextFieldCursorPosition(WMTextField *tPtr);
void WMSetTextFieldNextTextField(WMTextField *tPtr, WMTextField *next); void WMSetTextFieldNextTextField(WMTextField *tPtr, WMTextField *next);
void WMSetTextFieldPrevTextField(WMTextField *tPtr, WMTextField *prev); void WMSetTextFieldPrevTextField(WMTextField *tPtr, WMTextField *prev);
void WMSetTextFieldDelegate(WMTextField *tPtr, WMTextFieldDelegate *delegate); void WMSetTextFieldDelegate(WMTextField *tPtr, WMTextFieldDelegate *delegate);
WMTextFieldDelegate* WMGetTextFieldDelegate(WMTextField *tPtr);
extern char *WMTextDidChangeNotification; extern char *WMTextDidChangeNotification;
extern char *WMTextDidBeginEditingNotification; extern char *WMTextDidBeginEditingNotification;
@@ -1351,7 +1401,6 @@ char* WMGetPopUpButtonItem(WMPopUpButton *bPtr, int index);
WMMenuItem* WMGetPopUpButtonMenuItem(WMPopUpButton *bPtr, int index); WMMenuItem* WMGetPopUpButtonMenuItem(WMPopUpButton *bPtr, int index);
int WMGetPopUpButtonNumberOfItems(WMPopUpButton *bPtr); int WMGetPopUpButtonNumberOfItems(WMPopUpButton *bPtr);
void WMSetPopUpButtonEnabled(WMPopUpButton *bPtr, Bool flag); void WMSetPopUpButtonEnabled(WMPopUpButton *bPtr, Bool flag);
@@ -1424,8 +1473,6 @@ void WMSetScrollViewContentView(WMScrollView *sPtr, WMView *view);
void WMSetScrollViewRelief(WMScrollView *sPtr, WMReliefType type); void WMSetScrollViewRelief(WMScrollView *sPtr, WMReliefType type);
void WMSetScrollViewContentView(WMScrollView *sPtr, WMView *view);
WMRect WMGetScrollViewVisibleRect(WMScrollView *sPtr); WMRect WMGetScrollViewVisibleRect(WMScrollView *sPtr);
WMScroller* WMGetScrollViewHorizontalScroller(WMScrollView *sPtr); WMScroller* WMGetScrollViewHorizontalScroller(WMScrollView *sPtr);
@@ -1640,11 +1687,11 @@ void WMGetTextBlockProperties(WMText *tPtr, void *vtb, unsigned int *first,
int WMGetTextInsertType(WMText *tPtr); int WMGetTextInsertType(WMText *tPtr);
int WMGetTextBlocks(WMText *tPtr); /*int WMGetTextBlocks(WMText *tPtr);
void WMSetCurrentTextBlock(WMText *tPtr, int current); void WMSetCurrentTextBlock(WMText *tPtr, int current);
int WMGetCurrentTextBlock(WMText *tPtr); int WMGetCurrentTextBlock(WMText *tPtr);*/
void WMPrependTextBlock(WMText *tPtr, void *vtb); void WMPrependTextBlock(WMText *tPtr, void *vtb);
@@ -1695,6 +1742,8 @@ void WMSetTabViewDelegate(WMTabView *tPtr, WMTabViewDelegate *delegate);
WMTabViewItem* WMCreateTabViewItemWithIdentifier(int identifier); WMTabViewItem* WMCreateTabViewItemWithIdentifier(int identifier);
void WMSetTabViewItemEnabled(WMTabViewItem *tPtr, Bool flag);
int WMGetTabViewItemIdentifier(WMTabViewItem *item); int WMGetTabViewItemIdentifier(WMTabViewItem *item);
void WMSetTabViewItemLabel(WMTabViewItem *item, char *label); void WMSetTabViewItemLabel(WMTabViewItem *item, char *label);
@@ -1790,10 +1839,11 @@ void WMShowFontPanel(WMFontPanel *panel);
void WMHideFontPanel(WMFontPanel *panel); void WMHideFontPanel(WMFontPanel *panel);
void WMSetFontPanelFont(WMFontPanel *panel, WMFont *font); void WMFreeFontPanel(WMFontPanel *panel);
/* you can free the returned string */ void WMSetFontPanelAction(WMFontPanel *panel, WMAction2 *action, void *data);
char* WMGetFontPanelFontName(WMFontPanel *panel);
void WMSetFontPanelFont(WMFontPanel *panel, char *fontName);
WMFont* WMGetFontPanelFont(WMFontPanel *panel); WMFont* WMGetFontPanelFont(WMFontPanel *panel);

164
WINGs/WINGs/WINGsP.h
View File

@@ -8,7 +8,7 @@
#include <WINGs/WINGs.h> #include <WINGs/WINGs.h>
#if WINGS_H_VERSION < 20010117 #if WINGS_H_VERSION < 20041030
#error There_is_an_old_WINGs.h_file_somewhere_in_your_system._Please_remove_it. #error There_is_an_old_WINGs.h_file_somewhere_in_your_system._Please_remove_it.
#endif #endif
@@ -22,19 +22,14 @@
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
#define DOUBLE_BUFFER
#define DOUBLE_BUFFER 1
#define WC_UserWidget 128 #define WC_UserWidget 128
#define SCROLLER_WIDTH 20 #define SCROLLER_WIDTH 20
#define XDND_VERSION 3
#define XDND_VERSION 4
typedef struct W_Application { typedef struct W_Application {
@@ -48,15 +43,12 @@ typedef struct W_Application {
typedef struct W_Font { typedef struct W_Font {
struct W_Screen *screen; struct W_Screen *screen;
union { struct _XftFont *font;
XFontSet set;
XFontStruct *normal;
} font;
short height; short height;
short y; short y;
short refCount; short refCount;
char *name; char *name;
unsigned int notFontSet:1;
} W_Font; } W_Font;
@@ -75,6 +67,7 @@ typedef struct W_Color {
struct W_Screen *screen; struct W_Screen *screen;
XColor color; XColor color;
unsigned short alpha;
short refCount; short refCount;
GC gc; GC gc;
struct { struct {
@@ -91,28 +84,53 @@ typedef struct W_FocusInfo {
struct W_DraggingInfo { typedef void* W_DndState(WMView *destView, XClientMessageEvent *event,
WMDraggingInfo *info);
typedef struct W_DragOperationItem {
WMDragOperationType type;
char* text;
} W_DragOperationItem;
typedef struct W_DragSourceInfo {
WMView *sourceView;
Window destinationWindow; Window destinationWindow;
Window sourceWindow; W_DndState *state;
WMSelectionProcs *selectionProcs;
WMPoint location; Window icon;
unsigned sourceOperation;
WMPixmap *image;
WMPoint imageLocation; WMPoint imageLocation;
WMPoint mouseOffset; /* mouse pos in icon */
Cursor dragCursor;
WMRect noPositionMessageZone;
Atom firstThreeTypes[3];
} W_DragSourceInfo;
char **types;
typedef struct W_DragDestinationInfo {
WMView *destView;
WMView *xdndAwareView;
Window sourceWindow;
W_DndState *state;
Bool sourceActionChanged;
WMArray *sourceTypes;
WMArray *requiredTypes;
Bool typeListAvailable;
WMArray *dropDatas;
} W_DragDestinationInfo;
struct W_DraggingInfo {
unsigned char protocolVersion; /* version supported on the other side */
Time timestamp; Time timestamp;
int protocolVersion; Atom sourceAction;
Atom destinationAction;
/* should be treated as internal data */ W_DragSourceInfo* sourceInfo; /* infos needed by source */
WMView *sourceView; W_DragDestinationInfo* destInfo; /* infos needed by destination */
WMView *destView; } W_DraggingInfo;
WMSize mouseOffset;
unsigned finished:1;
};
typedef struct W_Screen { typedef struct W_Screen {
@@ -134,6 +152,8 @@ typedef struct W_Screen {
struct W_IMContext *imctx; struct W_IMContext *imctx;
struct _XftDraw *xftdraw; /* shared XftDraw */
/* application related */ /* application related */
W_FocusInfo *focusInfo; W_FocusInfo *focusInfo;
@@ -183,7 +203,9 @@ typedef struct W_Screen {
GC ixorGC; /* IncludeInferiors XOR */ GC ixorGC; /* IncludeInferiors XOR */
GC textFieldGC; GC drawStringGC; /* for WMDrawString() */
GC drawImStringGC; /* for WMDrawImageString() */
W_Font *normalFont; W_Font *normalFont;
@@ -191,7 +213,7 @@ typedef struct W_Screen {
WMHashTable *fontCache; WMHashTable *fontCache;
Bool useMultiByte; Bool antialiasedText;
unsigned int ignoredModifierMask; /* modifiers to ignore when typing txt */ unsigned int ignoredModifierMask; /* modifiers to ignore when typing txt */
@@ -272,6 +294,8 @@ typedef struct W_Screen {
Atom xdndDropAtom; Atom xdndDropAtom;
Atom xdndFinishedAtom; Atom xdndFinishedAtom;
Atom xdndTypeListAtom; Atom xdndTypeListAtom;
Atom xdndActionListAtom;
Atom xdndActionDescriptionAtom;
Atom xdndStatusAtom; Atom xdndStatusAtom;
Atom xdndActionCopy; Atom xdndActionCopy;
@@ -284,6 +308,12 @@ typedef struct W_Screen {
Atom wmStateAtom; /* WM_STATE */ Atom wmStateAtom; /* WM_STATE */
Atom utf8String;
Atom netwmName;
Atom netwmIconName;
Atom netwmIcon;
/* stuff for detecting double-clicks */ /* stuff for detecting double-clicks */
Time lastClickTime; /* time of last mousedown event */ Time lastClickTime; /* time of last mousedown event */
Window lastClickWindow; /* window of the last mousedown */ Window lastClickWindow; /* window of the last mousedown */
@@ -313,8 +343,7 @@ typedef struct W_ViewDelegate {
typedef struct W_View { typedef struct W_View {
struct W_Screen *screen; struct W_Screen *screen;
WMWidget *self; /* must point to the widget the WMWidget *self; /* must point to the widget the view belongs to */
* view belongs to */
W_ViewDelegate *delegate; W_ViewDelegate *delegate;
@@ -354,8 +383,10 @@ typedef struct W_View {
Atom *droppableTypes; Atom *droppableTypes;
struct W_DragSourceProcs *dragSourceProcs; struct W_DragSourceProcs *dragSourceProcs;
struct W_DragDestinationProcs *dragDestinationProcs; struct W_DragDestinationProcs *dragDestinationProcs;
WMPixmap *dragImage;
int helpContext; int helpContext;
XIC xic;
struct { struct {
unsigned int realized:1; unsigned int realized:1;
@@ -369,8 +400,8 @@ typedef struct W_View {
unsigned int dontCompressMotion:1; /* motion notify event compress */ unsigned int dontCompressMotion:1; /* motion notify event compress */
unsigned int notifySizeChanged:1; unsigned int notifySizeChanged:1;
unsigned int dontCompressExpose:1; /* will compress all expose unsigned int dontCompressExpose:1; /* expose event compress */
events into one */
/* toplevel only */ /* toplevel only */
unsigned int worksWhenModal:1; unsigned int worksWhenModal:1;
unsigned int pendingRelease1:1; unsigned int pendingRelease1:1;
@@ -400,7 +431,7 @@ typedef struct _WINGsConfiguration {
char *systemFont; char *systemFont;
char *boldSystemFont; char *boldSystemFont;
int defaultFontSize; int defaultFontSize;
Bool useMultiByte; Bool antialiasedText;
char *floppyPath; char *floppyPath;
unsigned doubleClickDelay; unsigned doubleClickDelay;
unsigned mouseWheelUp; unsigned mouseWheelUp;
@@ -486,13 +517,13 @@ void W_DrawReliefWithGC(W_Screen *scr, Drawable d, int x, int y,
void W_CallDestroyHandlers(W_View *view); void W_CallDestroyHandlers(W_View *view);
void W_PaintTextAndImage(W_View *view, int wrap, GC textGC, W_Font *font, void W_PaintTextAndImage(W_View *view, int wrap, WMColor *textColor,
WMReliefType relief, char *text, W_Font *font, WMReliefType relief, char *text,
WMAlignment alignment, W_Pixmap *image, WMAlignment alignment, W_Pixmap *image,
WMImagePosition position, GC backGC, int ofs); WMImagePosition position, WMColor *backColor, int ofs);
void W_PaintText(W_View *view, Drawable d, WMFont *font, int x, int y, void W_PaintText(W_View *view, Drawable d, WMFont *font, int x, int y,
int width, WMAlignment alignment, GC gc, int width, WMAlignment alignment, WMColor *color,
int wrap, char *text, int length); int wrap, char *text, int length);
int W_GetTextHeight(WMFont *font, char *text, int width, int wrap); int W_GetTextHeight(WMFont *font, char *text, int width, int wrap);
@@ -545,8 +576,63 @@ void W_CheckTimerHandlers(void);
Bool W_HandleInputEvents(Bool waitForInput, int inputfd); Bool W_HandleInputEvents(Bool waitForInput, int inputfd);
/* XDnD */
Atom W_OperationToAction(WMScreen *scr, WMDragOperationType operation);
WMDragOperationType W_ActionToOperation(WMScreen *scr, Atom action);
void W_FreeDragOperationItem(void* item);
Bool W_SendDnDClientMessage(Display *dpy, Window win, Atom message,
unsigned long data1, unsigned long data2,
unsigned long data3, unsigned long data4,
unsigned long data5);
void W_DragSourceStartTimer(WMDraggingInfo *info);
void W_DragSourceStopTimer();
void W_DragSourceStateHandler(WMDraggingInfo *info, XClientMessageEvent *event);
void W_DragDestinationStartTimer(WMDraggingInfo *info);
void W_DragDestinationStopTimer();
void W_DragDestinationStoreEnterMsgInfo(WMDraggingInfo *info, WMView *toplevel,
XClientMessageEvent *event);
void W_DragDestinationStorePositionMsgInfo(WMDraggingInfo *info,
WMView *toplevel,
XClientMessageEvent *event);
void W_DragDestinationCancelDropOnEnter(WMView *toplevel, WMDraggingInfo *info);
void W_DragDestinationStateHandler(WMDraggingInfo *info,
XClientMessageEvent *event);
void W_DragDestinationInfoClear(WMDraggingInfo *info);
void W_FreeViewXdndPart(WMView *view);
/* XIM */
void W_InitIM(WMScreen *scr);
void W_CreateIC(WMView *view);
void W_DestroyIC(WMView *view);
void W_FocusIC(WMView *view);
void W_UnFocusIC(WMView *view);
void W_SetPreeditPositon(W_View *view, int x, int y);
int W_LookupString(W_View *view, XKeyPressedEvent *event, char *buffer,
int buflen, KeySym *keysym, Status *status);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
#endif /* _WINGSP_H_ */ #endif /* _WINGSP_H_ */

49
WINGs/WINGs/WUtil.h
View File

@@ -19,13 +19,18 @@
#endif #endif
#if (!defined (__GNUC__) || __GNUC__ < 2 || \ #ifndef __ASSERT_FUNCTION
__GNUC_MINOR__ < (defined (__cplusplus) ? 6 : 4)) # if (!defined (__GNUC__) || (__GNUC__ < 2 && \
__GNUC_MINOR__ < (defined (__cplusplus) ? 6 : 4)))
# define __ASSERT_FUNCTION ((char *) 0) # define __ASSERT_FUNCTION ((char *) 0)
# else # else
# define __ASSERT_FUNCTION __PRETTY_FUNCTION__ # define __ASSERT_FUNCTION __PRETTY_FUNCTION__
# endif # endif
#endif
#ifndef __GNUC__
#define __attribute__(x) /*NOTHING*/
#endif
#ifdef NDEBUG #ifdef NDEBUG
@@ -184,8 +189,9 @@ typedef struct {
typedef struct ConnectionDelegate { typedef struct ConnectionDelegate {
void *data; void *data;
void (*didCatchException)(struct ConnectionDelegate *self, void (*canResumeSending)(struct ConnectionDelegate *self, WMConnection *cPtr);
WMConnection *cPtr);
void (*didCatchException)(struct ConnectionDelegate *self, WMConnection *cPtr);
void (*didDie)(struct ConnectionDelegate *self, WMConnection *cPtr); void (*didDie)(struct ConnectionDelegate *self, WMConnection *cPtr);
@@ -205,19 +211,19 @@ typedef void WMNotificationObserverAction(void *observerData,
/*......................................................................*/ /*......................................................................*/
typedef void (waborthandler)(int); typedef void waborthandler(int);
waborthandler* wsetabort(waborthandler*); waborthandler* wsetabort(waborthandler* handler);
/* don't free the returned string */ /* don't free the returned string */
char* wstrerror(int errnum); char* wstrerror(int errnum);
void wmessage(const char *msg, ...); void wmessage(const char *msg, ...) __attribute__((__format__(printf,1,2)));
void wwarning(const char *msg, ...); void wwarning(const char *msg, ...) __attribute__((__format__(printf,1,2)));
void wfatal(const char *msg, ...); void wfatal(const char *msg, ...) __attribute__((__format__(printf,1,2)));
void wsyserror(const char *msg, ...); void wsyserror(const char *msg, ...) __attribute__((__format__(printf,1,2)));
void wsyserrorwithcode(int error, const char *msg, ...); void wsyserrorwithcode(int error, const char *msg, ...) __attribute__((__format__(printf,2,3)));
char* wfindfile(char *paths, char *file); char* wfindfile(char *paths, char *file);
@@ -231,14 +237,18 @@ char* wexpandpath(char *path);
char* wgethomedir(); char* wgethomedir();
void* wmalloc(size_t size); void* wmalloc(size_t size);
void* wmalloc0(size_t size);
void* wrealloc(void *ptr, size_t newsize); void* wrealloc(void *ptr, size_t newsize);
void wfree(void *ptr); void wfree(void *ptr);
#define wnew(type, count) wmalloc(sizeof(type)*count)
#define wnew0(type, count) wmalloc0(sizeof(type)*count)
void wrelease(void *ptr); void wrelease(void *ptr);
void* wretain(void *ptr); void* wretain(void *ptr);
char* wstrdup(char *str); char* wstrdup(char *str);
char* wstrndup(char *str, size_t len);
/* Concatenate str1 with str2 and return that in a newly malloc'ed string. /* Concatenate str1 with str2 and return that in a newly malloc'ed string.
* str1 and str2 can be any strings including static and constant strings. * str1 and str2 can be any strings including static and constant strings.
@@ -373,7 +383,7 @@ extern const WMHashTableCallbacks WMStringHashCallbacks;
* and freed with wfree() */ * and freed with wfree() */
extern const WMHashTableCallbacks WMStringPointerHashCallbacks; extern const WMHashTableCallbacks WMStringPointerHashCallbacks;
/* keys are strings, bug they are not copied */ /* keys are strings, but they are not copied */
/*......................................................................*/ /*......................................................................*/
@@ -680,7 +690,7 @@ void WMSortTree(WMTreeNode *aNode, WMCompareDataProc *comparer);
WMTreeNode* WMFindInTree(WMTreeNode *aTree, WMMatchDataProc *match, void *cdata); WMTreeNode* WMFindInTree(WMTreeNode *aTree, WMMatchDataProc *match, void *cdata);
/* Returns first tree node that has data == cdata */ /* Returns first tree node that has data == cdata */
#define WMGetFirstInTree(aTree, cdata) WMFindInTree(atree, NULL, cdata) #define WMGetFirstInTree(aTree, cdata) WMFindInTree(aTree, NULL, cdata)
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/
@@ -769,10 +779,17 @@ void WMPutInPLDictionary(WMPropList *plist, WMPropList *key, WMPropList *value);
void WMRemoveFromPLDictionary(WMPropList *plist, WMPropList *key); void WMRemoveFromPLDictionary(WMPropList *plist, WMPropList *key);
/* It inserts all key/value pairs from source into dest, overwriting /* It will insert all key/value pairs from source into dest, overwriting
* the values with the same keys from dest, keeping all values with keys * the values with the same keys from dest, keeping all values with keys
* only present in dest unchanged */ * only present in dest unchanged */
WMPropList* WMMergePLDictionaries(WMPropList *dest, WMPropList *source); WMPropList* WMMergePLDictionaries(WMPropList *dest, WMPropList *source,
Bool recursive);
/* It will remove all key/value pairs from dest for which there is an
* identical key/value present in source. Entires only present in dest, or
* which have different values in dest than in source will be preserved. */
WMPropList* WMSubtractPLDictionaries(WMPropList *dest, WMPropList *source,
Bool recursive);
int WMGetPropListItemCount(WMPropList *plist); int WMGetPropListItemCount(WMPropList *plist);
@@ -970,6 +987,8 @@ Bool WMSetConnectionNonBlocking(WMConnection *cPtr, Bool flag);
Bool WMSetConnectionCloseOnExec(WMConnection *cPtr, Bool flag); Bool WMSetConnectionCloseOnExec(WMConnection *cPtr, Bool flag);
void WMSetConnectionShutdownOnClose(WMConnection *cPtr, Bool flag);
void* WMGetConnectionClientData(WMConnection *cPtr); void* WMGetConnectionClientData(WMConnection *cPtr);
void WMSetConnectionClientData(WMConnection *cPtr, void *data); void WMSetConnectionClientData(WMConnection *cPtr, void *data);

4
WINGs/WINGs/proplist-compat.h
View File

@@ -74,7 +74,7 @@ typedef WMPropList* proplist_t;
#define PLSetCaseSensitive(c) WMPLSetCaseSensitive(c) #define PLSetCaseSensitive(c) WMPLSetCaseSensitive(c)
#define PLMakeString(bytes) WMCreatePLString(bytes) #define PLMakeString(bytes) WMCreatePLString(bytes)
#define PLMakeData(bytes, length) WMCreatePLDataFromBytes(bytes, length) #define PLMakeData(bytes, length) WMCreatePLDataWithBytes(bytes, length)
#define PLMakeArrayFromElements WMCreatePLArray #define PLMakeArrayFromElements WMCreatePLArray
#define PLMakeDictionaryFromEntries WMCreatePLDictionary #define PLMakeDictionaryFromEntries WMCreatePLDictionary
@@ -86,7 +86,7 @@ typedef WMPropList* proplist_t;
#define PLRemoveArrayElement(array, pos) WMDeleteFromPLArray(array, pos) #define PLRemoveArrayElement(array, pos) WMDeleteFromPLArray(array, pos)
#define PLInsertDictionaryEntry(dict, key, value) WMPutInPLDictionary(dict, key, value) #define PLInsertDictionaryEntry(dict, key, value) WMPutInPLDictionary(dict, key, value)
#define PLRemoveDictionaryEntry(dict, key) WMRemoveFromPLDictionary(dict, key) #define PLRemoveDictionaryEntry(dict, key) WMRemoveFromPLDictionary(dict, key)
#define PLMergeDictionaries(dest, source) WMMergePLDictionaries(dest, source) #define PLMergeDictionaries(dest, source) WMMergePLDictionaries(dest, source, False)
#define PLGetNumberOfElements(pl) WMGetPropListItemCount(pl) #define PLGetNumberOfElements(pl) WMGetPropListItemCount(pl)

110
WINGs/array.c
View File

@@ -1,24 +1,21 @@
/* /*
* Dynamically Resized Array * Dynamically Resized Array
* *
* Authors: Alfredo K. Kojima <kojima@windowmaker.org> * Authors: Alfredo K. Kojima <kojima@windowmaker.info>
* Dan Pascu <dan@windowmaker.org> * Dan Pascu <dan@windowmaker.info>
* *
* This code is released to the Public Domain, but * This code is released to the Public Domain, but
* proper credit is always appreciated :) * proper credit is always appreciated :)
*/ */
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "WUtil.h" #include "WUtil.h"
#define INITIAL_SIZE 8 #define INITIAL_SIZE 8
#define RESIZE_INCREMENT 8 #define RESIZE_INCREMENT 8
typedef struct W_Array { typedef struct W_Array {
void **items; /* the array data */ void **items; /* the array data */
int itemCount; /* # of items in array */ int itemCount; /* # of items in array */
@@ -26,16 +23,12 @@ typedef struct W_Array {
WMFreeDataProc *destructor; /* the destructor to free elements */ WMFreeDataProc *destructor; /* the destructor to free elements */
} W_Array; } W_Array;
WMArray *WMCreateArray(int initialSize)
WMArray*
WMCreateArray(int initialSize)
{ {
return WMCreateArrayWithDestructor(initialSize, NULL); return WMCreateArrayWithDestructor(initialSize, NULL);
} }
WMArray *WMCreateArrayWithDestructor(int initialSize, WMFreeDataProc * destructor)
WMArray*
WMCreateArrayWithDestructor(int initialSize, WMFreeDataProc *destructor)
{ {
WMArray *array; WMArray *array;
@@ -54,9 +47,7 @@ WMCreateArrayWithDestructor(int initialSize, WMFreeDataProc *destructor)
return array; return array;
} }
WMArray *WMCreateArrayWithArray(WMArray * array)
WMArray*
WMCreateArrayWithArray(WMArray *array)
{ {
WMArray *newArray; WMArray *newArray;
@@ -72,9 +63,7 @@ WMCreateArrayWithArray(WMArray *array)
return newArray; return newArray;
} }
void WMEmptyArray(WMArray * array)
void
WMEmptyArray(WMArray *array)
{ {
if (array->destructor) { if (array->destructor) {
while (array->itemCount > 0) { while (array->itemCount > 0) {
@@ -86,25 +75,19 @@ WMEmptyArray(WMArray *array)
array->itemCount = 0; array->itemCount = 0;
} }
void WMFreeArray(WMArray * array)
void
WMFreeArray(WMArray *array)
{ {
WMEmptyArray(array); WMEmptyArray(array);
wfree(array->items); wfree(array->items);
wfree(array); wfree(array);
} }
int WMGetArrayItemCount(WMArray * array)
int
WMGetArrayItemCount(WMArray *array)
{ {
return array->itemCount; return array->itemCount;
} }
void WMAppendArray(WMArray * array, WMArray * other)
void
WMAppendArray(WMArray *array, WMArray *other)
{ {
if (other->itemCount == 0) if (other->itemCount == 0)
return; return;
@@ -114,14 +97,11 @@ WMAppendArray(WMArray *array, WMArray *other)
array->items = wrealloc(array->items, sizeof(void *) * array->allocSize); array->items = wrealloc(array->items, sizeof(void *) * array->allocSize);
} }
memcpy(array->items+array->itemCount, other->items, memcpy(array->items + array->itemCount, other->items, sizeof(void *) * other->itemCount);
sizeof(void*)*other->itemCount);
array->itemCount += other->itemCount; array->itemCount += other->itemCount;
} }
void WMAddToArray(WMArray * array, void *item)
void
WMAddToArray(WMArray *array, void *item)
{ {
if (array->itemCount >= array->allocSize) { if (array->itemCount >= array->allocSize) {
array->allocSize += RESIZE_INCREMENT; array->allocSize += RESIZE_INCREMENT;
@@ -132,9 +112,7 @@ WMAddToArray(WMArray *array, void *item)
array->itemCount++; array->itemCount++;
} }
void WMInsertInArray(WMArray * array, int index, void *item)
void
WMInsertInArray(WMArray *array, int index, void *item)
{ {
wassertr(index >= 0 && index <= array->itemCount); wassertr(index >= 0 && index <= array->itemCount);
@@ -151,9 +129,7 @@ WMInsertInArray(WMArray *array, int index, void *item)
array->itemCount++; array->itemCount++;
} }
void *WMReplaceInArray(WMArray * array, int index, void *item)
void*
WMReplaceInArray(WMArray *array, int index, void *item)
{ {
void *old; void *old;
@@ -171,9 +147,7 @@ WMReplaceInArray(WMArray *array, int index, void *item)
return old; return old;
} }
int WMDeleteFromArray(WMArray * array, int index)
int
WMDeleteFromArray(WMArray *array, int index)
{ {
wassertrv(index >= 0 && index < array->itemCount, 0); wassertrv(index >= 0 && index < array->itemCount, 0);
@@ -191,9 +165,7 @@ WMDeleteFromArray(WMArray *array, int index)
return 1; return 1;
} }
int WMRemoveFromArrayMatching(WMArray * array, WMMatchDataProc * match, void *cdata)
int
WMRemoveFromArrayMatching(WMArray *array, WMMatchDataProc *match, void *cdata)
{ {
int i; int i;
@@ -216,9 +188,7 @@ WMRemoveFromArrayMatching(WMArray *array, WMMatchDataProc *match, void *cdata)
return 0; return 0;
} }
void *WMGetFromArray(WMArray * array, int index)
void*
WMGetFromArray(WMArray *array, int index)
{ {
if (index < 0 || index >= array->itemCount) if (index < 0 || index >= array->itemCount)
return NULL; return NULL;
@@ -226,18 +196,14 @@ WMGetFromArray(WMArray *array, int index)
return array->items[index]; return array->items[index];
} }
void *WMPopFromArray(WMArray * array)
void*
WMPopFromArray(WMArray *array)
{ {
array->itemCount--; array->itemCount--;
return array->items[array->itemCount]; return array->items[array->itemCount];
} }
int WMFindInArray(WMArray * array, WMMatchDataProc * match, void *cdata)
int
WMFindInArray(WMArray *array, WMMatchDataProc *match, void *cdata)
{ {
int i; int i;
@@ -256,9 +222,7 @@ WMFindInArray(WMArray *array, WMMatchDataProc *match, void *cdata)
return WANotFound; return WANotFound;
} }
int WMCountInArray(WMArray * array, void *item)
int
WMCountInArray(WMArray *array, void *item)
{ {
int i, count; int i, count;
@@ -270,16 +234,14 @@ WMCountInArray(WMArray *array, void *item)
return count; return count;
} }
void WMSortArray(WMArray * array, WMCompareDataProc * comparer)
void
WMSortArray(WMArray *array, WMCompareDataProc *comparer)
{ {
if (array->itemCount > 1) { /* Don't sort empty or single element arrays */
qsort(array->items, array->itemCount, sizeof(void *), comparer); qsort(array->items, array->itemCount, sizeof(void *), comparer);
} }
}
void WMMapArray(WMArray * array, void (*function) (void *, void *), void *data)
void
WMMapArray(WMArray *array, void (*function)(void*, void*), void *data)
{ {
int i; int i;
@@ -288,9 +250,7 @@ WMMapArray(WMArray *array, void (*function)(void*, void*), void *data)
} }
} }
WMArray *WMGetSubarrayWithRange(WMArray * array, WMRange aRange)
WMArray*
WMGetSubarrayWithRange(WMArray* array, WMRange aRange)
{ {
WMArray *newArray; WMArray *newArray;
@@ -305,16 +265,13 @@ WMGetSubarrayWithRange(WMArray* array, WMRange aRange)
aRange.count = array->itemCount - aRange.position; aRange.count = array->itemCount - aRange.position;
newArray = WMCreateArray(aRange.count); newArray = WMCreateArray(aRange.count);
memcpy(newArray->items, array->items+aRange.position, memcpy(newArray->items, array->items + aRange.position, sizeof(void *) * aRange.count);
sizeof(void*)*aRange.count);
newArray->itemCount = aRange.count; newArray->itemCount = aRange.count;
return newArray; return newArray;
} }
void *WMArrayFirst(WMArray * array, WMArrayIterator * iter)
void*
WMArrayFirst(WMArray *array, WMArrayIterator *iter)
{ {
if (array->itemCount == 0) { if (array->itemCount == 0) {
*iter = WANotFound; *iter = WANotFound;
@@ -325,9 +282,7 @@ WMArrayFirst(WMArray *array, WMArrayIterator *iter)
} }
} }
void *WMArrayLast(WMArray * array, WMArrayIterator * iter)
void*
WMArrayLast(WMArray *array, WMArrayIterator *iter)
{ {
if (array->itemCount == 0) { if (array->itemCount == 0) {
*iter = WANotFound; *iter = WANotFound;
@@ -338,9 +293,7 @@ WMArrayLast(WMArray *array, WMArrayIterator *iter)
} }
} }
void *WMArrayNext(WMArray * array, WMArrayIterator * iter)
void*
WMArrayNext(WMArray *array, WMArrayIterator *iter)
{ {
if (*iter >= 0 && *iter < array->itemCount - 1) { if (*iter >= 0 && *iter < array->itemCount - 1) {
return array->items[++(*iter)]; return array->items[++(*iter)];
@@ -350,9 +303,7 @@ WMArrayNext(WMArray *array, WMArrayIterator *iter)
} }
} }
void *WMArrayPrevious(WMArray * array, WMArrayIterator * iter)
void*
WMArrayPrevious(WMArray *array, WMArrayIterator *iter)
{ {
if (*iter > 0 && *iter < array->itemCount) { if (*iter > 0 && *iter < array->itemCount) {
return array->items[--(*iter)]; return array->items[--(*iter)];
@@ -361,6 +312,3 @@ WMArrayPrevious(WMArray *array, WMArrayIterator *iter)
return NULL; return NULL;
} }
} }

184
WINGs/bagtree.c
View File

@@ -1,13 +1,9 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "WUtil.h" #include "WUtil.h"
typedef struct W_Node { typedef struct W_Node {
struct W_Node *parent; struct W_Node *parent;
struct W_Node *left; struct W_Node *left;
@@ -18,7 +14,6 @@ typedef struct W_Node {
int index; int index;
} W_Node; } W_Node;
typedef struct W_Bag { typedef struct W_Bag {
W_Node *root; W_Node *root;
@@ -29,15 +24,10 @@ typedef struct W_Bag {
void (*destructor) (void *item); void (*destructor) (void *item);
} W_Bag; } W_Bag;
#define IS_LEFT(node) (node == node->parent->left) #define IS_LEFT(node) (node == node->parent->left)
#define IS_RIGHT(node) (node == node->parent->right) #define IS_RIGHT(node) (node == node->parent->right)
static void leftRotate(W_Bag * tree, W_Node * node)
static void
leftRotate(W_Bag *tree, W_Node *node)
{ {
W_Node *node2; W_Node *node2;
@@ -61,10 +51,7 @@ leftRotate(W_Bag *tree, W_Node *node)
node->parent = node2; node->parent = node2;
} }
static void rightRotate(W_Bag * tree, W_Node * node)
static void
rightRotate(W_Bag *tree, W_Node *node)
{ {
W_Node *node2; W_Node *node2;
@@ -88,9 +75,7 @@ rightRotate(W_Bag *tree, W_Node *node)
node->parent = node2; node->parent = node2;
} }
static void treeInsert(W_Bag * tree, W_Node * node)
static void
treeInsert(W_Bag *tree, W_Node *node)
{ {
W_Node *y = tree->nil; W_Node *y = tree->nil;
W_Node *x = tree->root; W_Node *x = tree->root;
@@ -111,9 +96,7 @@ treeInsert(W_Bag *tree, W_Node *node)
y->right = node; y->right = node;
} }
static void rbTreeInsert(W_Bag * tree, W_Node * node)
static void
rbTreeInsert(W_Bag *tree, W_Node *node)
{ {
W_Node *y; W_Node *y;
@@ -165,9 +148,7 @@ rbTreeInsert(W_Bag *tree, W_Node *node)
tree->root->color = 'B'; tree->root->color = 'B';
} }
static void rbDeleteFixup(W_Bag * tree, W_Node * node)
static void
rbDeleteFixup(W_Bag *tree, W_Node *node)
{ {
W_Node *w; W_Node *w;
@@ -226,27 +207,21 @@ rbDeleteFixup(W_Bag *tree, W_Node *node)
} }
static W_Node *treeMinimum(W_Node * node, W_Node * nil)
static W_Node*
treeMinimum(W_Node *node, W_Node *nil)
{ {
while (node->left != nil) while (node->left != nil)
node = node->left; node = node->left;
return node; return node;
} }
static W_Node *treeMaximum(W_Node * node, W_Node * nil)
static W_Node*
treeMaximum(W_Node *node, W_Node *nil)
{ {
while (node->right != nil) while (node->right != nil)
node = node->right; node = node->right;
return node; return node;
} }
static W_Node *treeSuccessor(W_Node * node, W_Node * nil)
static W_Node*
treeSuccessor(W_Node *node, W_Node *nil)
{ {
W_Node *y; W_Node *y;
@@ -261,9 +236,7 @@ treeSuccessor(W_Node *node, W_Node *nil)
return y; return y;
} }
static W_Node *treePredecessor(W_Node * node, W_Node * nil)
static W_Node*
treePredecessor(W_Node *node, W_Node *nil)
{ {
W_Node *y; W_Node *y;
@@ -278,9 +251,7 @@ treePredecessor(W_Node *node, W_Node *nil)
return y; return y;
} }
static W_Node *rbTreeDelete(W_Bag * tree, W_Node * node)
static W_Node*
rbTreeDelete(W_Bag *tree, W_Node *node)
{ {
W_Node *nil = tree->nil; W_Node *nil = tree->nil;
W_Node *x, *y; W_Node *x, *y;
@@ -319,9 +290,7 @@ rbTreeDelete(W_Bag *tree, W_Node *node)
return y; return y;
} }
static W_Node *treeSearch(W_Node * root, W_Node * nil, int index)
static W_Node*
treeSearch(W_Node *root, W_Node *nil, int index)
{ {
if (root == nil || root->index == index) { if (root == nil || root->index == index) {
return root; return root;
@@ -334,9 +303,7 @@ treeSearch(W_Node *root, W_Node *nil, int index)
} }
} }
static W_Node *treeFind(W_Node * root, W_Node * nil, void *data)
static W_Node*
treeFind(W_Node *root, W_Node *nil, void *data)
{ {
W_Node *tmp; W_Node *tmp;
@@ -352,13 +319,10 @@ treeFind(W_Node *root, W_Node *nil, void *data)
return tmp; return tmp;
} }
#if 0 #if 0
static char buf[512]; static char buf[512];
static void static void printNodes(W_Node * node, W_Node * nil, int depth)
printNodes(W_Node *node, W_Node *nil, int depth)
{ {
if (node == nil) { if (node == nil) {
return; return;
@@ -376,9 +340,7 @@ printNodes(W_Node *node, W_Node *nil, int depth)
printNodes(node->right, nil, depth + 1); printNodes(node->right, nil, depth + 1);
} }
void PrintTree(WMBag * bag)
void
PrintTree(WMBag *bag)
{ {
W_TreeBag *tree = (W_TreeBag *) bag->data; W_TreeBag *tree = (W_TreeBag *) bag->data;
@@ -386,16 +348,12 @@ PrintTree(WMBag *bag)
} }
#endif #endif
WMBag *WMCreateTreeBag(void)
WMBag*
WMCreateTreeBag(void)
{ {
return WMCreateTreeBagWithDestructor(NULL); return WMCreateTreeBagWithDestructor(NULL);
} }
WMBag *WMCreateTreeBagWithDestructor(WMFreeDataProc * destructor)
WMBag*
WMCreateTreeBagWithDestructor(WMFreeDataProc *destructor)
{ {
WMBag *bag; WMBag *bag;
@@ -415,16 +373,12 @@ WMCreateTreeBagWithDestructor(WMFreeDataProc *destructor)
return bag; return bag;
} }
int WMGetBagItemCount(WMBag * self)
int
WMGetBagItemCount(WMBag *self)
{ {
return self->count; return self->count;
} }
void WMAppendBag(WMBag * self, WMBag * bag)
void
WMAppendBag(WMBag *self, WMBag *bag)
{ {
WMBagIterator ptr; WMBagIterator ptr;
void *data; void *data;
@@ -434,9 +388,7 @@ WMAppendBag(WMBag *self, WMBag *bag)
} }
} }
void WMPutInBag(WMBag * self, void *item)
void
WMPutInBag(WMBag *self, void *item)
{ {
W_Node *ptr; W_Node *ptr;
@@ -453,9 +405,7 @@ WMPutInBag(WMBag *self, void *item)
self->count++; self->count++;
} }
void WMInsertInBag(WMBag * self, int index, void *item)
void
WMInsertInBag(WMBag *self, int index, void *item)
{ {
W_Node *ptr; W_Node *ptr;
@@ -473,13 +423,10 @@ WMInsertInBag(WMBag *self, int index, void *item)
ptr->index++; ptr->index++;
} }
self->count++; self->count++;
} }
int WMRemoveFromBag(WMBag * self, void *item)
int
WMRemoveFromBag(WMBag *self, void *item)
{ {
W_Node *ptr = treeFind(self->root, self->nil, item); W_Node *ptr = treeFind(self->root, self->nil, item);
@@ -505,9 +452,7 @@ WMRemoveFromBag(WMBag *self, void *item)
} }
} }
int WMEraseFromBag(WMBag * self, int index)
int
WMEraseFromBag(WMBag *self, int index)
{ {
W_Node *ptr = treeSearch(self->root, self->nil, index); W_Node *ptr = treeSearch(self->root, self->nil, index);
@@ -528,9 +473,7 @@ WMEraseFromBag(WMBag *self, int index)
} }
} }
int WMDeleteFromBag(WMBag * self, int index)
int
WMDeleteFromBag(WMBag *self, int index)
{ {
W_Node *ptr = treeSearch(self->root, self->nil, index); W_Node *ptr = treeSearch(self->root, self->nil, index);
@@ -558,9 +501,7 @@ WMDeleteFromBag(WMBag *self, int index)
} }
} }
void *WMGetFromBag(WMBag * self, int index)
void*
WMGetFromBag(WMBag *self, int index)
{ {
W_Node *node; W_Node *node;
@@ -571,9 +512,7 @@ WMGetFromBag(WMBag *self, int index)
return NULL; return NULL;
} }
int WMGetFirstInBag(WMBag * self, void *item)
int
WMGetFirstInBag(WMBag *self, void *item)
{ {
W_Node *node; W_Node *node;
@@ -584,10 +523,7 @@ WMGetFirstInBag(WMBag *self, void *item)
return WBNotFound; return WBNotFound;
} }
static int treeCount(W_Node * root, W_Node * nil, void *item)
static int
treeCount(W_Node *root, W_Node *nil, void *item)
{ {
int count = 0; int count = 0;
@@ -606,17 +542,12 @@ treeCount(W_Node *root, W_Node *nil, void *item)
return count; return count;
} }
int WMCountInBag(WMBag * self, void *item)
int
WMCountInBag(WMBag *self, void *item)
{ {
return treeCount(self->root, self->nil, item); return treeCount(self->root, self->nil, item);
} }
void *WMReplaceInBag(WMBag * self, int index, void *item)
void*
WMReplaceInBag(WMBag *self, int index, void *item)
{ {
W_Node *ptr = treeSearch(self->root, self->nil, index); W_Node *ptr = treeSearch(self->root, self->nil, index);
void *old = NULL; void *old = NULL;
@@ -649,9 +580,7 @@ WMReplaceInBag(WMBag *self, int index, void *item)
return old; return old;
} }
void WMSortBag(WMBag * self, WMCompareDataProc * comparer)
void
WMSortBag(WMBag *self, WMCompareDataProc *comparer)
{ {
void **items; void **items;
W_Node *tmp; W_Node *tmp;
@@ -682,9 +611,7 @@ WMSortBag(WMBag *self, WMCompareDataProc *comparer)
wfree(items); wfree(items);
} }
static void deleteTree(WMBag * self, W_Node * node)
static void
deleteTree(WMBag *self, W_Node *node)
{ {
if (node == self->nil) if (node == self->nil)
return; return;
@@ -699,27 +626,21 @@ deleteTree(WMBag *self, W_Node *node)
wfree(node); wfree(node);
} }
void WMEmptyBag(WMBag * self)
void
WMEmptyBag(WMBag *self)
{ {
deleteTree(self, self->root); deleteTree(self, self->root);
self->root = self->nil; self->root = self->nil;
self->count = 0; self->count = 0;
} }
void WMFreeBag(WMBag * self)
void
WMFreeBag(WMBag *self)
{ {
WMEmptyBag(self); WMEmptyBag(self);
wfree(self->nil); wfree(self->nil);
wfree(self); wfree(self);
} }
static void mapTree(W_Bag * tree, W_Node * node, void (*function) (void *, void *), void *data)
static void
mapTree(W_Bag *tree, W_Node *node, void (*function)(void*, void*), void *data)
{ {
if (node == tree->nil) if (node == tree->nil)
return; return;
@@ -731,17 +652,12 @@ mapTree(W_Bag *tree, W_Node *node, void (*function)(void*, void*), void *data)
mapTree(tree, node->right, function, data); mapTree(tree, node->right, function, data);
} }
void WMMapBag(WMBag * self, void (*function) (void *, void *), void *data)
void
WMMapBag(WMBag *self, void (*function)(void*, void*), void *data)
{ {
mapTree(self, self->root, function, data); mapTree(self, self->root, function, data);
} }
static int findInTree(W_Bag * tree, W_Node * node, WMMatchDataProc * function, void *cdata)
static int
findInTree(W_Bag *tree, W_Node *node, WMMatchDataProc *function, void *cdata)
{ {
int index; int index;
@@ -759,16 +675,12 @@ findInTree(W_Bag *tree, W_Node *node, WMMatchDataProc *function, void *cdata)
return findInTree(tree, node->right, function, cdata); return findInTree(tree, node->right, function, cdata);
} }
int WMFindInBag(WMBag * self, WMMatchDataProc * match, void *cdata)
int
WMFindInBag(WMBag *self, WMMatchDataProc *match, void *cdata)
{ {
return findInTree(self, self->root, match, cdata); return findInTree(self, self->root, match, cdata);
} }
void *WMBagFirst(WMBag * self, WMBagIterator * ptr)
void*
WMBagFirst(WMBag *self, WMBagIterator *ptr)
{ {
W_Node *node; W_Node *node;
@@ -783,9 +695,7 @@ WMBagFirst(WMBag *self, WMBagIterator *ptr)
} }
} }
void *WMBagLast(WMBag * self, WMBagIterator * ptr)
void*
WMBagLast(WMBag *self, WMBagIterator *ptr)
{ {
W_Node *node; W_Node *node;
@@ -801,9 +711,7 @@ WMBagLast(WMBag *self, WMBagIterator *ptr)
} }
} }
void *WMBagNext(WMBag * self, WMBagIterator * ptr)
void*
WMBagNext(WMBag *self, WMBagIterator *ptr)
{ {
W_Node *node; W_Node *node;
@@ -821,9 +729,7 @@ WMBagNext(WMBag *self, WMBagIterator *ptr)
} }
} }
void *WMBagPrevious(WMBag * self, WMBagIterator * ptr)
void*
WMBagPrevious(WMBag *self, WMBagIterator *ptr)
{ {
W_Node *node; W_Node *node;
@@ -841,9 +747,7 @@ WMBagPrevious(WMBag *self, WMBagIterator *ptr)
} }
} }
void *WMBagIteratorAtIndex(WMBag * self, int index, WMBagIterator * ptr)
void*
WMBagIteratorAtIndex(WMBag *self, int index, WMBagIterator *ptr)
{ {
W_Node *node; W_Node *node;
@@ -858,11 +762,7 @@ WMBagIteratorAtIndex(WMBag *self, int index, WMBagIterator *ptr)
} }
} }
int WMBagIndexForIterator(WMBag * bag, WMBagIterator ptr)
int
WMBagIndexForIterator(WMBag *bag, WMBagIterator ptr)
{ {
return ((W_Node *) ptr)->index; return ((W_Node *) ptr)->index;
} }

64
WINGs/configuration.c
View File

@@ -1,23 +1,18 @@
#include "WINGsP.h" #include "WINGsP.h"
#include "wconfig.h"
#include <X11/Xlocale.h> #include <X11/Xlocale.h>
_WINGsConfiguration WINGsConfiguration; _WINGsConfiguration WINGsConfiguration;
#define SYSTEM_FONT "Trebuchet MS,Luxi Sans"
#define BOLD_SYSTEM_FONT "Trebuchet MS,Luxi Sans:bold"
#define SYSTEM_FONT "-*-helvetica-medium-r-normal-*-%d-*-*-*-*-*-*-*,-*-*-medium-r-*-*-%d-*-*-*-*-*-*-*" #define DEFAULT_FONT_SIZE 12
#define BOLD_SYSTEM_FONT "-*-helvetica-bold-r-normal-*-%d-*-*-*-*-*-*-*,-*-*-bold-r-*-*-%d-*-*-*-*-*-*-*"
#define FLOPPY_PATH "/floppy" #define FLOPPY_PATH "/floppy"
static unsigned getButtonWithName(const char *name, unsigned defaultButton)
static unsigned
getButtonWithName(const char *name, unsigned defaultButton)
{ {
if (strncmp(name, "Button", 6) == 0 && strlen(name) == 7) { if (strncmp(name, "Button", 6) == 0 && strlen(name) == 7) {
switch (name[6]) { switch (name[6]) {
@@ -39,9 +34,7 @@ getButtonWithName(const char *name, unsigned defaultButton)
return defaultButton; return defaultButton;
} }
void W_ReadConfigurations(void)
void
W_ReadConfigurations(void)
{ {
WMUserDefaults *defaults; WMUserDefaults *defaults;
@@ -52,40 +45,16 @@ W_ReadConfigurations(void)
if (defaults) { if (defaults) {
char *buttonName; char *buttonName;
unsigned button; unsigned button;
char *str;
WINGsConfiguration.systemFont = WINGsConfiguration.systemFont = WMGetUDStringForKey(defaults, "SystemFont");
WMGetUDStringForKey(defaults, "SystemFont");
WINGsConfiguration.boldSystemFont = WINGsConfiguration.boldSystemFont = WMGetUDStringForKey(defaults, "BoldSystemFont");
WMGetUDStringForKey(defaults, "BoldSystemFont");
WINGsConfiguration.useMultiByte = False; WINGsConfiguration.antialiasedText = WMGetUDBoolForKey(defaults, "AntialiasedText");
str = WMGetUDStringForKey(defaults, "MultiByteText");
if (str) {
if (strcasecmp(str, "YES") == 0) {
WINGsConfiguration.useMultiByte = True;
} else if (strcasecmp(str, "AUTO") == 0) {
char *locale;
/* if it's a multibyte language (japanese, chinese or korean) WINGsConfiguration.doubleClickDelay = WMGetUDIntegerForKey(defaults, "DoubleClickTime");
* then set it to True */
locale = setlocale(LC_CTYPE, NULL);
if (locale != NULL
&& (strncmp(locale, "ja", 2) == 0
|| strncmp(locale, "zh", 2) == 0
|| strncmp(locale, "ko", 2) == 0)) {
WINGsConfiguration.useMultiByte = True; WINGsConfiguration.floppyPath = WMGetUDStringForKey(defaults, "FloppyPath");
}
}
}
WINGsConfiguration.doubleClickDelay =
WMGetUDIntegerForKey(defaults, "DoubleClickTime");
WINGsConfiguration.floppyPath =
WMGetUDStringForKey(defaults, "FloppyPath");
buttonName = WMGetUDStringForKey(defaults, "MouseWheelUp"); buttonName = WMGetUDStringForKey(defaults, "MouseWheelUp");
if (buttonName) { if (buttonName) {
@@ -110,17 +79,18 @@ W_ReadConfigurations(void)
WINGsConfiguration.mouseWheelDown = Button5; WINGsConfiguration.mouseWheelDown = Button5;
} }
WINGsConfiguration.defaultFontSize = WINGsConfiguration.defaultFontSize = WMGetUDIntegerForKey(defaults, "DefaultFontSize");
WMGetUDIntegerForKey(defaults, "DefaultFontSize");
} }
if (!WINGsConfiguration.systemFont) { if (!WINGsConfiguration.systemFont) {
WINGsConfiguration.systemFont = SYSTEM_FONT; WINGsConfiguration.systemFont = SYSTEM_FONT;
} }
if (!WINGsConfiguration.boldSystemFont) { if (!WINGsConfiguration.boldSystemFont) {
WINGsConfiguration.boldSystemFont = BOLD_SYSTEM_FONT; WINGsConfiguration.boldSystemFont = BOLD_SYSTEM_FONT;
} }
if (WINGsConfiguration.defaultFontSize == 0) {
WINGsConfiguration.defaultFontSize = DEFAULT_FONT_SIZE;
}
if (!WINGsConfiguration.floppyPath) { if (!WINGsConfiguration.floppyPath) {
WINGsConfiguration.floppyPath = FLOPPY_PATH; WINGsConfiguration.floppyPath = FLOPPY_PATH;
} }
@@ -133,9 +103,5 @@ W_ReadConfigurations(void)
if (WINGsConfiguration.mouseWheelDown == 0) { if (WINGsConfiguration.mouseWheelDown == 0) {
WINGsConfiguration.mouseWheelDown = Button5; WINGsConfiguration.mouseWheelDown = Button5;
} }
if (WINGsConfiguration.defaultFontSize == 0) {
WINGsConfiguration.defaultFontSize = 12;
}
} }

243
WINGs/connection.c
View File

@@ -1,7 +1,7 @@
/* /*
* WINGs WMConnection function library * WINGs WMConnection function library
* *
* Copyright (c) 1999-2000 Dan Pascu * Copyright (c) 1999-2003 Dan Pascu
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -18,7 +18,6 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* /*
* TODO: * TODO:
* - decide if we want to support connections with external sockets, else * - decide if we want to support connections with external sockets, else
@@ -27,8 +26,6 @@
* *
*/ */
#include "../src/config.h"
#include "wconfig.h" #include "wconfig.h"
#include <unistd.h> #include <unistd.h>
@@ -49,7 +46,6 @@
#include "WINGs.h" #include "WINGs.h"
/* Some older systems does not define this (linux libc5, maybe others too) */ /* Some older systems does not define this (linux libc5, maybe others too) */
#ifndef SHUT_RDWR #ifndef SHUT_RDWR
# define SHUT_RDWR 2 # define SHUT_RDWR 2
@@ -66,11 +62,13 @@
#endif #endif
/* Stuff for setting the sockets into non-blocking mode. */ /* Stuff for setting the sockets into non-blocking mode. */
/*#ifdef __POSIX_SOURCE /*
#ifdef __POSIX_SOURCE
# define NONBLOCK_OPT O_NONBLOCK # define NONBLOCK_OPT O_NONBLOCK
#else #else
# define NONBLOCK_OPT FNDELAY # define NONBLOCK_OPT FNDELAY
#endif*/ #endif
*/
#define NONBLOCK_OPT O_NONBLOCK #define NONBLOCK_OPT O_NONBLOCK
@@ -78,8 +76,6 @@
#define DEF_TIMEOUT 600 /* 600 seconds == 10 minutes */ #define DEF_TIMEOUT 600 /* 600 seconds == 10 minutes */
int WCErrorCode = 0; int WCErrorCode = 0;
static Bool SigInitialized = False; static Bool SigInitialized = False;
@@ -87,14 +83,11 @@ static Bool SigInitialized = False;
static unsigned int DefaultTimeout = DEF_TIMEOUT; static unsigned int DefaultTimeout = DEF_TIMEOUT;
static unsigned int OpenTimeout = DEF_TIMEOUT; static unsigned int OpenTimeout = DEF_TIMEOUT;
typedef struct TimeoutData { typedef struct TimeoutData {
unsigned timeout; unsigned timeout;
WMHandlerID *handler; WMHandlerID *handler;
} TimeoutData; } TimeoutData;
typedef struct W_Connection { typedef struct W_Connection {
int sock; /* the socket we speak through */ int sock; /* the socket we speak through */
@@ -122,23 +115,19 @@ typedef struct W_Connection {
char *protocol; char *protocol;
Bool closeOnRelease; Bool closeOnRelease;
Bool shutdownOnClose;
Bool wasNonBlocking; Bool wasNonBlocking;
Bool isNonBlocking; Bool isNonBlocking;
} W_Connection; } W_Connection;
static void clearOutputQueue(WMConnection * cPtr)
static void
clearOutputQueue(WMConnection *cPtr) /*FOLD00*/
{ {
cPtr->bufPos = 0; cPtr->bufPos = 0;
WMEmptyArray(cPtr->outputQueue); WMEmptyArray(cPtr->outputQueue);
} }
static void openTimeout(void *cdata)
static void
openTimeout(void *cdata) /*FOLD00*/
{ {
WMConnection *cPtr = (WMConnection *) cdata; WMConnection *cPtr = (WMConnection *) cdata;
@@ -159,9 +148,7 @@ openTimeout(void *cdata) /*FOLD00*/
} }
} }
static void sendTimeout(void *cdata)
static void
sendTimeout(void *cdata) /*FOLD00*/
{ {
WMConnection *cPtr = (WMConnection *) cdata; WMConnection *cPtr = (WMConnection *) cdata;
@@ -174,6 +161,8 @@ sendTimeout(void *cdata) /*FOLD00*/
clearOutputQueue(cPtr); clearOutputQueue(cPtr);
cPtr->state = WCTimedOut; cPtr->state = WCTimedOut;
cPtr->timeoutState = WCTWhileSending; cPtr->timeoutState = WCTWhileSending;
/* // should we close it no matter what (after calling the didTimeout
// delegate)? -Dan */
if (cPtr->delegate && cPtr->delegate->didTimeout) { if (cPtr->delegate && cPtr->delegate->didTimeout) {
(*cPtr->delegate->didTimeout) (cPtr->delegate, cPtr); (*cPtr->delegate->didTimeout) (cPtr->delegate, cPtr);
} else { } else {
@@ -183,9 +172,7 @@ sendTimeout(void *cdata) /*FOLD00*/
} }
} }
static void inputHandler(int fd, int mask, void *clientData)
static void
inputHandler(int fd, int mask, void *clientData) /*FOLD00*/
{ {
WMConnection *cPtr = (WMConnection *) clientData; WMConnection *cPtr = (WMConnection *) clientData;
@@ -193,10 +180,11 @@ inputHandler(int fd, int mask, void *clientData) /*FOLD00*/
return; return;
if ((mask & WIWriteMask)) { if ((mask & WIWriteMask)) {
int result;
if (cPtr->state == WCInProgress) { if (cPtr->state == WCInProgress) {
Bool failed; Bool failed;
int result; socklen_t len = sizeof(result);
int len = sizeof(result);
WCErrorCode = 0; WCErrorCode = 0;
if (getsockopt(cPtr->sock, SOL_SOCKET, SO_ERROR, if (getsockopt(cPtr->sock, SOL_SOCKET, SO_ERROR,
@@ -229,7 +217,10 @@ inputHandler(int fd, int mask, void *clientData) /*FOLD00*/
if (failed) if (failed)
return; return;
} else if (cPtr->state == WCConnected) { } else if (cPtr->state == WCConnected) {
WMFlushConnection(cPtr); result = WMFlushConnection(cPtr);
if (result > 0 && cPtr->delegate && cPtr->delegate->canResumeSending) {
(*cPtr->delegate->canResumeSending) (cPtr->delegate, cPtr);
}
} }
} }
@@ -248,9 +239,7 @@ inputHandler(int fd, int mask, void *clientData) /*FOLD00*/
wrelease(cPtr); wrelease(cPtr);
} }
static Bool setSocketNonBlocking(int sock, Bool flag)
static Bool
setSocketNonBlocking(int sock, Bool flag) /*FOLD00*/
{ {
int state; int state;
Bool isNonBlock; Bool isNonBlock;
@@ -282,9 +271,7 @@ setSocketNonBlocking(int sock, Bool flag) /*FOLD00*/
return True; return True;
} }
static void setConnectionAddress(WMConnection * cPtr, struct sockaddr_in *socketaddr)
static void
setConnectionAddress(WMConnection *cPtr, struct sockaddr_in *socketaddr) /*FOLD00*/
{ {
wassertr(cPtr->address == NULL); wassertr(cPtr->address == NULL);
@@ -294,9 +281,7 @@ setConnectionAddress(WMConnection *cPtr, struct sockaddr_in *socketaddr) /*FOLD0
cPtr->protocol = wstrdup("tcp"); cPtr->protocol = wstrdup("tcp");
} }
static struct sockaddr_in *getSocketAddress(char *name, char *service, char *protocol)
static struct sockaddr_in*
getSocketAddress(char* name, char* service, char* protocol) /*FOLD00*/
{ {
static struct sockaddr_in socketaddr; static struct sockaddr_in socketaddr;
struct servent *sp; struct servent *sp;
@@ -352,15 +337,11 @@ getSocketAddress(char* name, char* service, char* protocol) /*FOLD00*/
return &socketaddr; return &socketaddr;
} }
static void dummyHandler(int signum)
static void
dummyHandler(int signum)
{ {
} }
static WMConnection *createConnectionWithSocket(int sock, Bool closeOnRelease)
static WMConnection*
createConnectionWithSocket(int sock, Bool closeOnRelease) /*FOLD00*/
{ {
WMConnection *cPtr; WMConnection *cPtr;
struct sigaction sig_action; struct sigaction sig_action;
@@ -377,8 +358,8 @@ createConnectionWithSocket(int sock, Bool closeOnRelease) /*FOLD00*/
cPtr->sendTimeout.timeout = DefaultTimeout; cPtr->sendTimeout.timeout = DefaultTimeout;
cPtr->sendTimeout.handler = NULL; cPtr->sendTimeout.handler = NULL;
cPtr->closeOnRelease = closeOnRelease; cPtr->closeOnRelease = closeOnRelease;
cPtr->outputQueue = cPtr->shutdownOnClose = 1;
WMCreateArrayWithDestructor(16, (WMFreeDataProc*)WMReleaseData); cPtr->outputQueue = WMCreateArrayWithDestructor(16, (WMFreeDataProc *) WMReleaseData);
cPtr->state = WCNotConnected; cPtr->state = WCNotConnected;
cPtr->timeoutState = WCTNone; cPtr->timeoutState = WCTNone;
@@ -397,10 +378,8 @@ createConnectionWithSocket(int sock, Bool closeOnRelease) /*FOLD00*/
return cPtr; return cPtr;
} }
#if 0 #if 0
WMConnection* WMConnection *WMCreateConnectionWithSocket(int sock, Bool closeOnRelease)
WMCreateConnectionWithSocket(int sock, Bool closeOnRelease) /*FOLD00*/
{ {
WMConnection *cPtr; WMConnection *cPtr;
struct sockaddr_in clientname; struct sockaddr_in clientname;
@@ -437,7 +416,6 @@ WMCreateConnectionWithSocket(int sock, Bool closeOnRelease) /*FOLD00*/
} }
#endif #endif
/* /*
* host is the name on which we want to listen for incoming connections, * host is the name on which we want to listen for incoming connections,
* and it must be a name of this host, or NULL if we want to listen * and it must be a name of this host, or NULL if we want to listen
@@ -448,13 +426,12 @@ WMCreateConnectionWithSocket(int sock, Bool closeOnRelease) /*FOLD00*/
* protocol is one of "tcp" or "udp". If NULL, "tcp" will be used by default. * protocol is one of "tcp" or "udp". If NULL, "tcp" will be used by default.
* currently only "tcp" is supported. * currently only "tcp" is supported.
*/ */
WMConnection* WMConnection *WMCreateConnectionAsServerAtAddress(char *host, char *service, char *protocol)
WMCreateConnectionAsServerAtAddress(char *host, char *service, char *protocol) /*FOLD00*/
{ {
WMConnection *cPtr; WMConnection *cPtr;
struct sockaddr_in *socketaddr; struct sockaddr_in *socketaddr;
socklen_t size;
int sock, on; int sock, on;
int size;
WCErrorCode = 0; WCErrorCode = 0;
@@ -508,9 +485,7 @@ WMCreateConnectionAsServerAtAddress(char *host, char *service, char *protocol) /
return cPtr; return cPtr;
} }
WMConnection *WMCreateConnectionToAddress(char *host, char *service, char *protocol)
WMConnection*
WMCreateConnectionToAddress(char *host, char *service, char *protocol) /*FOLD00*/
{ {
WMConnection *cPtr; WMConnection *cPtr;
struct sockaddr_in *socketaddr; struct sockaddr_in *socketaddr;
@@ -550,9 +525,7 @@ WMCreateConnectionToAddress(char *host, char *service, char *protocol) /*FOLD00*
return cPtr; return cPtr;
} }
WMConnection *WMCreateConnectionToAddressAndNotify(char *host, char *service, char *protocol)
WMConnection*
WMCreateConnectionToAddressAndNotify(char *host, char *service, char *protocol) /*FOLD00*/
{ {
WMConnection *cPtr; WMConnection *cPtr;
struct sockaddr_in *socketaddr; struct sockaddr_in *socketaddr;
@@ -590,20 +563,16 @@ WMCreateConnectionToAddressAndNotify(char *host, char *service, char *protocol)
cPtr->state = WCInProgress; cPtr->state = WCInProgress;
cPtr->isNonBlocking = isNonBlocking; cPtr->isNonBlocking = isNonBlocking;
cPtr->handler.write = WMAddInputHandler(cPtr->sock, WIWriteMask, cPtr->handler.write = WMAddInputHandler(cPtr->sock, WIWriteMask, inputHandler, cPtr);
inputHandler, cPtr);
cPtr->openTimeout.handler = cPtr->openTimeout.handler = WMAddTimerHandler(cPtr->openTimeout.timeout * 1000, openTimeout, cPtr);
WMAddTimerHandler(cPtr->openTimeout.timeout*1000, openTimeout, cPtr);
setConnectionAddress(cPtr, socketaddr); setConnectionAddress(cPtr, socketaddr);
return cPtr; return cPtr;
} }
static void removeAllHandlers(WMConnection * cPtr)
static void
removeAllHandlers(WMConnection *cPtr) /*FOLD00*/
{ {
if (cPtr->handler.read) if (cPtr->handler.read)
WMDeleteInputHandler(cPtr->handler.read); WMDeleteInputHandler(cPtr->handler.read);
@@ -623,12 +592,12 @@ removeAllHandlers(WMConnection *cPtr) /*FOLD00*/
cPtr->sendTimeout.handler = NULL; cPtr->sendTimeout.handler = NULL;
} }
void WMDestroyConnection(WMConnection * cPtr)
void
WMDestroyConnection(WMConnection *cPtr) /*FOLD00*/
{ {
if (cPtr->closeOnRelease && cPtr->sock >= 0) { if (cPtr->closeOnRelease && cPtr->sock >= 0) {
if (cPtr->shutdownOnClose) {
shutdown(cPtr->sock, SHUT_RDWR); shutdown(cPtr->sock, SHUT_RDWR);
}
close(cPtr->sock); close(cPtr->sock);
} }
@@ -644,12 +613,12 @@ WMDestroyConnection(WMConnection *cPtr) /*FOLD00*/
wrelease(cPtr); wrelease(cPtr);
} }
void WMCloseConnection(WMConnection * cPtr)
void
WMCloseConnection(WMConnection *cPtr) /*FOLD00*/
{ {
if (cPtr->sock >= 0) { if (cPtr->sock >= 0) {
if (cPtr->shutdownOnClose) {
shutdown(cPtr->sock, SHUT_RDWR); shutdown(cPtr->sock, SHUT_RDWR);
}
close(cPtr->sock); close(cPtr->sock);
cPtr->sock = -1; cPtr->sock = -1;
} }
@@ -660,12 +629,10 @@ WMCloseConnection(WMConnection *cPtr) /*FOLD00*/
cPtr->state = WCClosed; cPtr->state = WCClosed;
} }
WMConnection *WMAcceptConnection(WMConnection * listener)
WMConnection*
WMAcceptConnection(WMConnection *listener) /*FOLD00*/
{ {
struct sockaddr_in clientname; struct sockaddr_in clientname;
int size; socklen_t size;
int newSock; int newSock;
WMConnection *newConnection; WMConnection *newConnection;
@@ -687,51 +654,37 @@ WMAcceptConnection(WMConnection *listener) /*FOLD00*/
return newConnection; return newConnection;
} }
char *WMGetConnectionAddress(WMConnection * cPtr)
char*
WMGetConnectionAddress(WMConnection *cPtr) /*FOLD00*/
{ {
return cPtr->address; return cPtr->address;
} }
char *WMGetConnectionService(WMConnection * cPtr)
char*
WMGetConnectionService(WMConnection *cPtr) /*FOLD00*/
{ {
return cPtr->service; return cPtr->service;
} }
char *WMGetConnectionProtocol(WMConnection * cPtr)
char*
WMGetConnectionProtocol(WMConnection *cPtr) /*FOLD00*/
{ {
return cPtr->protocol; return cPtr->protocol;
} }
int WMGetConnectionSocket(WMConnection * cPtr)
int
WMGetConnectionSocket(WMConnection *cPtr) /*FOLD00*/
{ {
return cPtr->sock; return cPtr->sock;
} }
WMConnectionState WMGetConnectionState(WMConnection * cPtr)
WMConnectionState
WMGetConnectionState(WMConnection *cPtr) /*FOLD00*/
{ {
return cPtr->state; return cPtr->state;
} }
WMConnectionTimeoutState WMGetConnectionTimeoutState(WMConnection * cPtr)
WMConnectionTimeoutState
WMGetConnectionTimeoutState(WMConnection *cPtr) /*FOLD00*/
{ {
return cPtr->timeoutState; return cPtr->timeoutState;
} }
Bool WMEnqueueConnectionData(WMConnection * cPtr, WMData * data)
Bool
WMEnqueueConnectionData(WMConnection *cPtr, WMData *data) /*FOLD00*/
{ {
wassertrv(cPtr->state != WCNotConnected && cPtr->state != WCListening, False); wassertrv(cPtr->state != WCNotConnected && cPtr->state != WCListening, False);
wassertrv(cPtr->state != WCInProgress && cPtr->state != WCFailed, False); wassertrv(cPtr->state != WCInProgress && cPtr->state != WCFailed, False);
@@ -743,11 +696,17 @@ WMEnqueueConnectionData(WMConnection *cPtr, WMData *data) /*FOLD00*/
return True; return True;
} }
/*
int * Return value:
WMSendConnectionData(WMConnection *cPtr, WMData *data) /*FOLD00*/ * -1 - not connected or connection died while sending
* 0 - couldn't send the data (or part of it). data is saved in a queue
* and will be sent when possible. after it is sent the canResumeSending
* callback will be called.
* 1 - data was succesfully sent
*/
int WMSendConnectionData(WMConnection * cPtr, WMData * data)
{ {
int bytes, pos, len, totalTransfer; int bytes, pos, len;
TimeoutData *tPtr = &cPtr->sendTimeout; TimeoutData *tPtr = &cPtr->sendTimeout;
const unsigned char *dataBytes; const unsigned char *dataBytes;
@@ -768,8 +727,6 @@ WMSendConnectionData(WMConnection *cPtr, WMData *data) /*FOLD00*/
return 0; return 0;
} }
totalTransfer = 0;
while (WMGetArrayItemCount(cPtr->outputQueue) > 0) { while (WMGetArrayItemCount(cPtr->outputQueue) > 0) {
data = WMGetFromArray(cPtr->outputQueue, 0); data = WMGetFromArray(cPtr->outputQueue, 0);
dataBytes = (const unsigned char *)WMDataBytes(data); dataBytes = (const unsigned char *)WMDataBytes(data);
@@ -791,10 +748,9 @@ WMSendConnectionData(WMConnection *cPtr, WMData *data) /*FOLD00*/
} }
if (!cPtr->handler.write) { if (!cPtr->handler.write) {
cPtr->handler.write = cPtr->handler.write =
WMAddInputHandler(cPtr->sock, WIWriteMask, WMAddInputHandler(cPtr->sock, WIWriteMask, inputHandler, cPtr);
inputHandler, cPtr);
} }
return totalTransfer; return 0;
default: default:
WCErrorCode = errno; WCErrorCode = errno;
cPtr->state = WCDied; cPtr->state = WCDied;
@@ -805,7 +761,6 @@ WMSendConnectionData(WMConnection *cPtr, WMData *data) /*FOLD00*/
} }
} }
pos += bytes; pos += bytes;
totalTransfer += bytes;
} }
WMDeleteFromArray(cPtr->outputQueue, 0); WMDeleteFromArray(cPtr->outputQueue, 0);
cPtr->bufPos = 0; cPtr->bufPos = 0;
@@ -813,16 +768,20 @@ WMSendConnectionData(WMConnection *cPtr, WMData *data) /*FOLD00*/
WMDeleteTimerHandler(tPtr->handler); WMDeleteTimerHandler(tPtr->handler);
tPtr->handler = NULL; tPtr->handler = NULL;
} }
/*if (cPtr->handler.write) {
WMDeleteInputHandler(cPtr->handler.write);
cPtr->handler.write = NULL;
} */
}
if (cPtr->handler.write) { if (cPtr->handler.write) {
WMDeleteInputHandler(cPtr->handler.write); WMDeleteInputHandler(cPtr->handler.write);
cPtr->handler.write = NULL; cPtr->handler.write = NULL;
} }
}
return totalTransfer; return 1;
} }
/* /*
* WMGetConnectionAvailableData(connection): * WMGetConnectionAvailableData(connection):
* *
@@ -835,8 +794,7 @@ WMSendConnectionData(WMConnection *cPtr, WMData *data) /*FOLD00*/
* Also trying to read from an already died or closed connection is * Also trying to read from an already died or closed connection is
* considered to be an error condition, and will return NULL. * considered to be an error condition, and will return NULL.
*/ */
WMData* WMData *WMGetConnectionAvailableData(WMConnection * cPtr)
WMGetConnectionAvailableData(WMConnection *cPtr) /*FOLD00*/
{ {
char buffer[NETBUF_SIZE]; char buffer[NETBUF_SIZE];
int nbytes; int nbytes;
@@ -879,9 +837,7 @@ again:
return aData; return aData;
} }
void WMSetConnectionDelegate(WMConnection * cPtr, ConnectionDelegate * delegate)
void
WMSetConnectionDelegate(WMConnection *cPtr, ConnectionDelegate *delegate) /*FOLD00*/
{ {
wassertr(cPtr->sock >= 0); wassertr(cPtr->sock >= 0);
/* Don't try to set the delegate multiple times */ /* Don't try to set the delegate multiple times */
@@ -889,17 +845,13 @@ WMSetConnectionDelegate(WMConnection *cPtr, ConnectionDelegate *delegate) /*FOLD
cPtr->delegate = delegate; cPtr->delegate = delegate;
if (delegate && delegate->didReceiveInput && !cPtr->handler.read) if (delegate && delegate->didReceiveInput && !cPtr->handler.read)
cPtr->handler.read = WMAddInputHandler(cPtr->sock, WIReadMask, cPtr->handler.read = WMAddInputHandler(cPtr->sock, WIReadMask, inputHandler, cPtr);
inputHandler, cPtr);
if (delegate && delegate->didCatchException && !cPtr->handler.exception) if (delegate && delegate->didCatchException && !cPtr->handler.exception)
cPtr->handler.exception = WMAddInputHandler(cPtr->sock, WIExceptMask, cPtr->handler.exception = WMAddInputHandler(cPtr->sock, WIExceptMask, inputHandler, cPtr);
inputHandler, cPtr);
} }
#if 0 #if 0
Bool Bool WMIsConnectionNonBlocking(WMConnection * cPtr)
WMIsConnectionNonBlocking(WMConnection *cPtr) /*FOLD00*/
{ {
#if 1 #if 1
int state; int state;
@@ -920,12 +872,12 @@ WMIsConnectionNonBlocking(WMConnection *cPtr) /*FOLD00*/
} }
#endif #endif
Bool WMSetConnectionNonBlocking(WMConnection * cPtr, Bool flag)
Bool
WMSetConnectionNonBlocking(WMConnection *cPtr, Bool flag) /*FOLD00*/
{ {
wassertrv(cPtr != NULL && cPtr->sock >= 0, False); wassertrv(cPtr != NULL && cPtr->sock >= 0, False);
flag = ((flag == 0) ? 0 : 1);
if (cPtr->isNonBlocking == flag) if (cPtr->isNonBlocking == flag)
return True; return True;
@@ -937,57 +889,48 @@ WMSetConnectionNonBlocking(WMConnection *cPtr, Bool flag) /*FOLD00*/
return False; return False;
} }
Bool WMSetConnectionCloseOnExec(WMConnection * cPtr, Bool flag)
Bool
WMSetConnectionCloseOnExec(WMConnection *cPtr, Bool flag)
{ {
wassertrv(cPtr != NULL && cPtr->sock >= 0, False); wassertrv(cPtr != NULL && cPtr->sock >= 0, False);
if (fcntl(cPtr->sock, F_SETFD, (flag ? FD_CLOEXEC : 0)) < 0) { if (fcntl(cPtr->sock, F_SETFD, ((flag == 0) ? 0 : FD_CLOEXEC)) < 0) {
return False; return False;
} }
return True; return True;
} }
void WMSetConnectionShutdownOnClose(WMConnection * cPtr, Bool flag)
{
cPtr->shutdownOnClose = ((flag == 0) ? 0 : 1);
}
void* void *WMGetConnectionClientData(WMConnection * cPtr)
WMGetConnectionClientData(WMConnection *cPtr) /*FOLD00*/
{ {
return cPtr->clientData; return cPtr->clientData;
} }
void WMSetConnectionClientData(WMConnection * cPtr, void *data)
void
WMSetConnectionClientData(WMConnection *cPtr, void *data) /*FOLD00*/
{ {
cPtr->clientData = data; cPtr->clientData = data;
} }
unsigned int WMGetConnectionFlags(WMConnection * cPtr)
unsigned int
WMGetConnectionFlags(WMConnection *cPtr) /*FOLD00*/
{ {
return cPtr->uflags; return cPtr->uflags;
} }
void WMSetConnectionFlags(WMConnection * cPtr, unsigned int flags)
void
WMSetConnectionFlags(WMConnection *cPtr, unsigned int flags) /*FOLD00*/
{ {
cPtr->uflags = flags; cPtr->uflags = flags;
} }
WMArray *WMGetConnectionUnsentData(WMConnection * cPtr)
WMArray*
WMGetConnectionUnsentData(WMConnection *cPtr)
{ {
return cPtr->outputQueue; return cPtr->outputQueue;
} }
void WMSetConnectionDefaultTimeout(unsigned int timeout)
void
WMSetConnectionDefaultTimeout(unsigned int timeout) /*FOLD00*/
{ {
if (timeout == 0) { if (timeout == 0) {
DefaultTimeout = DEF_TIMEOUT; DefaultTimeout = DEF_TIMEOUT;
@@ -996,9 +939,7 @@ WMSetConnectionDefaultTimeout(unsigned int timeout) /*FOLD00*/
} }
} }
void WMSetConnectionOpenTimeout(unsigned int timeout)
void
WMSetConnectionOpenTimeout(unsigned int timeout) /*FOLD00*/
{ {
if (timeout == 0) { if (timeout == 0) {
OpenTimeout = DefaultTimeout; OpenTimeout = DefaultTimeout;
@@ -1007,9 +948,7 @@ WMSetConnectionOpenTimeout(unsigned int timeout) /*FOLD00*/
} }
} }
void WMSetConnectionSendTimeout(WMConnection * cPtr, unsigned int timeout)
void
WMSetConnectionSendTimeout(WMConnection *cPtr, unsigned int timeout) /*FOLD00*/
{ {
if (timeout == 0) { if (timeout == 0) {
cPtr->sendTimeout.timeout = DefaultTimeout; cPtr->sendTimeout.timeout = DefaultTimeout;
@@ -1017,5 +956,3 @@ WMSetConnectionSendTimeout(WMConnection *cPtr, unsigned int timeout) /*FOLD00*/
cPtr->sendTimeout.timeout = timeout; cPtr->sendTimeout.timeout = timeout;
} }
} }

115
WINGs/data.c
View File

@@ -1,7 +1,7 @@
/* /*
* WINGs WMData function library * WINGs WMData function library
* *
* Copyright (c) 1999-2000 Dan Pascu * Copyright (c) 1999-2003 Dan Pascu
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -18,12 +18,9 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
#include <string.h> #include <string.h>
#include "WUtil.h" #include "WUtil.h"
typedef struct W_Data { typedef struct W_Data {
unsigned length; /* How many bytes we have */ unsigned length; /* How many bytes we have */
unsigned capacity; /* How many bytes it can hold */ unsigned capacity; /* How many bytes it can hold */
@@ -34,13 +31,9 @@ typedef struct W_Data {
int format; /* 0, 8, 16 or 32 */ int format; /* 0, 8, 16 or 32 */
} W_Data; } W_Data;
/* Creating and destroying data objects */ /* Creating and destroying data objects */
WMData* WMData *WMCreateDataWithCapacity(unsigned capacity)
WMCreateDataWithCapacity(unsigned capacity) /*FOLD00*/
{ {
WMData *aData; WMData *aData;
@@ -61,9 +54,7 @@ WMCreateDataWithCapacity(unsigned capacity) /*FOLD00*/
return aData; return aData;
} }
WMData *WMCreateDataWithLength(unsigned length)
WMData*
WMCreateDataWithLength(unsigned length) /*FOLD00*/
{ {
WMData *aData; WMData *aData;
@@ -76,9 +67,7 @@ WMCreateDataWithLength(unsigned length) /*FOLD00*/
return aData; return aData;
} }
WMData *WMCreateDataWithBytes(void *bytes, unsigned length)
WMData*
WMCreateDataWithBytes(void *bytes, unsigned length) /*FOLD00*/
{ {
WMData *aData; WMData *aData;
@@ -89,10 +78,7 @@ WMCreateDataWithBytes(void *bytes, unsigned length) /*FOLD00*/
return aData; return aData;
} }
WMData *WMCreateDataWithBytesNoCopy(void *bytes, unsigned length, WMFreeDataProc * destructor)
WMData*
WMCreateDataWithBytesNoCopy(void *bytes, unsigned length, /*FOLD00*/
WMFreeDataProc *destructor)
{ {
WMData *aData; WMData *aData;
@@ -108,9 +94,7 @@ WMCreateDataWithBytesNoCopy(void *bytes, unsigned length, /*FOLD00*/
return aData; return aData;
} }
WMData *WMCreateDataWithData(WMData * aData)
WMData*
WMCreateDataWithData(WMData *aData) /*FOLD00*/
{ {
WMData *newData; WMData *newData;
@@ -124,17 +108,13 @@ WMCreateDataWithData(WMData *aData) /*FOLD00*/
return newData; return newData;
} }
WMData *WMRetainData(WMData * aData)
WMData*
WMRetainData(WMData *aData) /*FOLD00*/
{ {
aData->retainCount++; aData->retainCount++;
return aData; return aData;
} }
void WMReleaseData(WMData * aData)
void
WMReleaseData(WMData *aData) /*FOLD00*/
{ {
aData->retainCount--; aData->retainCount--;
if (aData->retainCount > 0) if (aData->retainCount > 0)
@@ -145,12 +125,9 @@ WMReleaseData(WMData *aData) /*FOLD00*/
wfree(aData); wfree(aData);
} }
/* Adjusting capacity */ /* Adjusting capacity */
void void WMSetDataCapacity(WMData * aData, unsigned capacity)
WMSetDataCapacity(WMData *aData, unsigned capacity) /*FOLD00*/
{ {
if (aData->capacity != capacity) { if (aData->capacity != capacity) {
aData->bytes = wrealloc(aData->bytes, capacity); aData->bytes = wrealloc(aData->bytes, capacity);
@@ -162,62 +139,47 @@ WMSetDataCapacity(WMData *aData, unsigned capacity) /*FOLD00*/
} }
} }
void WMSetDataLength(WMData * aData, unsigned length)
void
WMSetDataLength(WMData *aData, unsigned length) /*FOLD00*/
{ {
if (length > aData->capacity) { if (length > aData->capacity) {
WMSetDataCapacity(aData, length); WMSetDataCapacity(aData, length);
} }
if (length > aData->length) { if (length > aData->length) {
memset((unsigned char*)aData->bytes + aData->length, 0, memset((unsigned char *)aData->bytes + aData->length, 0, length - aData->length);
length - aData->length);
} }
aData->length = length; aData->length = length;
} }
void WMSetDataFormat(WMData * aData, unsigned format)
void
WMSetDataFormat(WMData *aData, unsigned format)
{ {
aData->format = format; aData->format = format;
} }
void WMIncreaseDataLengthBy(WMData * aData, unsigned extraLength)
void
WMIncreaseDataLengthBy(WMData *aData, unsigned extraLength) /*FOLD00*/
{ {
WMSetDataLength(aData, aData->length + extraLength); WMSetDataLength(aData, aData->length + extraLength);
} }
/* Accessing data */ /* Accessing data */
const void* const void *WMDataBytes(WMData * aData)
WMDataBytes(WMData *aData) /*FOLD00*/
{ {
return aData->bytes; return aData->bytes;
} }
void WMGetDataBytes(WMData * aData, void *buffer)
void
WMGetDataBytes(WMData *aData, void *buffer) /*FOLD00*/
{ {
wassertr(aData->length > 0); wassertr(aData->length > 0);
memcpy(buffer, aData->bytes, aData->length); memcpy(buffer, aData->bytes, aData->length);
} }
unsigned WMGetDataFormat(WMData * aData)
unsigned
WMGetDataFormat(WMData *aData)
{ {
return aData->format; return aData->format;
} }
void WMGetDataBytesWithLength(WMData * aData, void *buffer, unsigned length)
void
WMGetDataBytesWithLength(WMData *aData, void *buffer, unsigned length) /*FOLD00*/
{ {
wassertr(aData->length > 0); wassertr(aData->length > 0);
wassertr(length <= aData->length); wassertr(length <= aData->length);
@@ -225,20 +187,15 @@ WMGetDataBytesWithLength(WMData *aData, void *buffer, unsigned length) /*FOLD00*
memcpy(buffer, aData->bytes, length); memcpy(buffer, aData->bytes, length);
} }
void WMGetDataBytesWithRange(WMData * aData, void *buffer, WMRange aRange)
void
WMGetDataBytesWithRange(WMData *aData, void *buffer, WMRange aRange) /*FOLD00*/
{ {
wassertr(aRange.position < aData->length); wassertr(aRange.position < aData->length);
wassertr(aRange.count <= aData->length - aRange.position); wassertr(aRange.count <= aData->length - aRange.position);
memcpy(buffer, (unsigned char*)aData->bytes + aRange.position, memcpy(buffer, (unsigned char *)aData->bytes + aRange.position, aRange.count);
aRange.count);
} }
WMData *WMGetSubdataWithRange(WMData * aData, WMRange aRange)
WMData*
WMGetSubdataWithRange(WMData *aData, WMRange aRange) /*FOLD00*/
{ {
void *buffer; void *buffer;
WMData *newData; WMData *newData;
@@ -254,11 +211,9 @@ WMGetSubdataWithRange(WMData *aData, WMRange aRange) /*FOLD00*/
return newData; return newData;
} }
/* Testing data */ /* Testing data */
Bool Bool WMIsDataEqualToData(WMData * aData, WMData * anotherData)
WMIsDataEqualToData(WMData *aData, WMData *anotherData) /*FOLD00*/
{ {
if (aData->length != anotherData->length) if (aData->length != anotherData->length)
return False; return False;
@@ -269,17 +224,13 @@ WMIsDataEqualToData(WMData *aData, WMData *anotherData) /*FOLD00*/
return (memcmp(aData->bytes, anotherData->bytes, aData->length) == 0); return (memcmp(aData->bytes, anotherData->bytes, aData->length) == 0);
} }
unsigned WMGetDataLength(WMData * aData)
unsigned
WMGetDataLength(WMData *aData) /*FOLD00*/
{ {
return aData->length; return aData->length;
} }
/* Adding data */ /* Adding data */
void void WMAppendDataBytes(WMData * aData, void *bytes, unsigned length)
WMAppendDataBytes(WMData *aData, void *bytes, unsigned length) /*FOLD00*/
{ {
unsigned oldLength = aData->length; unsigned oldLength = aData->length;
unsigned newLength = oldLength + length; unsigned newLength = oldLength + length;
@@ -301,20 +252,15 @@ WMAppendDataBytes(WMData *aData, void *bytes, unsigned length) /*FOLD00*/
aData->length = newLength; aData->length = newLength;
} }
void WMAppendData(WMData * aData, WMData * anotherData)
void
WMAppendData(WMData *aData, WMData *anotherData) /*FOLD00*/
{ {
if (anotherData->length > 0) if (anotherData->length > 0)
WMAppendDataBytes(aData, anotherData->bytes, anotherData->length); WMAppendDataBytes(aData, anotherData->bytes, anotherData->length);
} }
/* Modifying data */ /* Modifying data */
void void WMReplaceDataBytesInRange(WMData * aData, WMRange aRange, void *bytes)
WMReplaceDataBytesInRange(WMData *aData, WMRange aRange, void *bytes) /*FOLD00*/
{ {
wassertr(aRange.position < aData->length); wassertr(aRange.position < aData->length);
wassertr(aRange.count <= aData->length - aRange.position); wassertr(aRange.count <= aData->length - aRange.position);
@@ -322,9 +268,7 @@ WMReplaceDataBytesInRange(WMData *aData, WMRange aRange, void *bytes) /*FOLD00*/
memcpy((unsigned char *)aData->bytes + aRange.position, bytes, aRange.count); memcpy((unsigned char *)aData->bytes + aRange.position, bytes, aRange.count);
} }
void WMResetDataBytesInRange(WMData * aData, WMRange aRange)
void
WMResetDataBytesInRange(WMData *aData, WMRange aRange) /*FOLD00*/
{ {
wassertr(aRange.position < aData->length); wassertr(aRange.position < aData->length);
wassertr(aRange.count <= aData->length - aRange.position); wassertr(aRange.count <= aData->length - aRange.position);
@@ -332,9 +276,7 @@ WMResetDataBytesInRange(WMData *aData, WMRange aRange) /*FOLD00*/
memset((unsigned char *)aData->bytes + aRange.position, 0, aRange.count); memset((unsigned char *)aData->bytes + aRange.position, 0, aRange.count);
} }
void WMSetData(WMData * aData, WMData * anotherData)
void
WMSetData(WMData *aData, WMData *anotherData) /*FOLD00*/
{ {
unsigned length = anotherData->length; unsigned length = anotherData->length;
@@ -344,7 +286,4 @@ WMSetData(WMData *aData, WMData *anotherData) /*FOLD00*/
aData->length = length; aData->length = length;
} }
/* Storing data */ /* Storing data */

255
WINGs/dragcommon.c Normal file
View File

@@ -0,0 +1,255 @@
#include "WINGsP.h"
#define XDND_SOURCE_VERSION(dragInfo) dragInfo->protocolVersion
#define XDND_DEST_INFO(dragInfo) dragInfo->destInfo
#define XDND_DEST_VIEW(dragInfo) dragInfo->destInfo->destView
static Bool _WindowExists;
Atom W_OperationToAction(WMScreen * scr, WMDragOperationType operation)
{
switch (operation) {
case WDOperationNone:
return None;
case WDOperationCopy:
return scr->xdndActionCopy;
case WDOperationMove:
return scr->xdndActionMove;
case WDOperationLink:
return scr->xdndActionLink;
case WDOperationAsk:
return scr->xdndActionAsk;
case WDOperationPrivate:
return scr->xdndActionPrivate;
default:
return None;
}
}
WMDragOperationType W_ActionToOperation(WMScreen * scr, Atom action)
{
if (action == scr->xdndActionCopy) {
return WDOperationCopy;
} else if (action == scr->xdndActionMove) {
return WDOperationMove;
} else if (action == scr->xdndActionLink) {
return WDOperationLink;
} else if (action == scr->xdndActionAsk) {
return WDOperationAsk;
} else if (action == scr->xdndActionPrivate) {
return WDOperationPrivate;
} else if (action == None) {
return WDOperationNone;
} else {
char *tmp = XGetAtomName(scr->display, action);
wwarning("unknown XDND action %s ", tmp);
XFree(tmp);
return WDOperationCopy;
}
}
static void freeDragOperationItem(void *item)
{
wfree(item);
}
WMArray *WMCreateDragOperationArray(int initialSize)
{
return WMCreateArrayWithDestructor(initialSize, freeDragOperationItem);
}
WMDragOperationItem *WMCreateDragOperationItem(WMDragOperationType type, char *text)
{
W_DragOperationItem *result = wmalloc(sizeof(W_DragOperationItem));
result->type = type;
result->text = text;
return (WMDragOperationItem *) result;
}
WMDragOperationType WMGetDragOperationItemType(WMDragOperationItem * item)
{
return ((W_DragOperationItem *) item)->type;
}
char *WMGetDragOperationItemText(WMDragOperationItem * item)
{
return ((W_DragOperationItem *) item)->text;
}
static int handleNoWindowXError(Display * dpy, XErrorEvent * errEvt)
{
if (errEvt->error_code == BadWindow || errEvt->error_code == BadDrawable) {
_WindowExists = False;
return Success;
}
return errEvt->error_code;
}
static Bool windowExists(Display * dpy, Window win)
{
void *previousErrorHandler;
XWindowAttributes attr;
XSynchronize(dpy, True);
previousErrorHandler = XSetErrorHandler(handleNoWindowXError);
_WindowExists = True;
/* can generate BadDrawable or BadWindow */
XGetWindowAttributes(dpy, win, &attr);
XSetErrorHandler(previousErrorHandler);
XSynchronize(dpy, False);
return _WindowExists;
}
Bool
W_SendDnDClientMessage(Display * dpy, Window win, Atom message,
unsigned long data0,
unsigned long data1, unsigned long data2, unsigned long data3, unsigned long data4)
{
XEvent ev;
#ifdef XDND_DEBUG
char *msgName = XGetAtomName(dpy, message);
printf("sending message %s ... ", msgName);
XFree(msgName);
#endif
if (!windowExists(dpy, win)) {
wwarning("xdnd message target %d does no longer exist.", win);
return False; /* message not sent */
}
ev.type = ClientMessage;
ev.xclient.message_type = message;
ev.xclient.format = 32;
ev.xclient.window = win;
ev.xclient.data.l[0] = data0;
ev.xclient.data.l[1] = data1;
ev.xclient.data.l[2] = data2;
ev.xclient.data.l[3] = data3;
ev.xclient.data.l[4] = data4;
XSendEvent(dpy, win, False, 0, &ev);
XFlush(dpy);
#ifdef XDND_DEBUG
printf("sent\n");
#endif
return True; /* message sent */
}
static void handleLeaveMessage(WMDraggingInfo * info)
{
if (XDND_DEST_INFO(info) != NULL) {
/* XDND_DEST_VIEW is never NULL (it's the xdnd aware view) */
wassertr(XDND_DEST_VIEW(info) != NULL);
if (XDND_DEST_VIEW(info)->dragDestinationProcs != NULL) {
XDND_DEST_VIEW(info)->dragDestinationProcs->concludeDragOperation(XDND_DEST_VIEW(info));
}
W_DragDestinationInfoClear(info);
}
}
void W_HandleDNDClientMessage(WMView * toplevel, XClientMessageEvent * event)
{
WMScreen *scr = W_VIEW_SCREEN(toplevel);
WMDraggingInfo *info = &scr->dragInfo;
Atom messageType = event->message_type;
#ifdef XDND_DEBUG
{
char *msgTypeName = XGetAtomName(scr->display, messageType);
if (msgTypeName != NULL)
printf("event type = %s\n", msgTypeName);
else
printf("pb with event type !\n");
}
#endif
/* Messages from destination to source */
if (messageType == scr->xdndStatusAtom || messageType == scr->xdndFinishedAtom) {
W_DragSourceStopTimer();
W_DragSourceStateHandler(info, event);
return;
}
/* Messages from source to destination */
if (messageType == scr->xdndEnterAtom) {
Bool positionSent = (XDND_DEST_INFO(info) != NULL);
W_DragDestinationStopTimer();
W_DragDestinationStoreEnterMsgInfo(info, toplevel, event);
/* Xdnd version 3 and up are not compatible with version 1 or 2 */
if (XDND_SOURCE_VERSION(info) > 2) {
if (positionSent) {
/* xdndPosition previously received on xdnd aware view */
W_DragDestinationStateHandler(info, event);
return;
} else {
W_DragDestinationStartTimer(info);
return;
}
} else {
wwarning("received dnd enter msg with unsupported version %i", XDND_SOURCE_VERSION(info));
W_DragDestinationCancelDropOnEnter(toplevel, info);
return;
}
}
if (messageType == scr->xdndPositionAtom) {
W_DragDestinationStopTimer();
W_DragDestinationStorePositionMsgInfo(info, toplevel, event);
W_DragDestinationStateHandler(info, event);
return;
}
if (messageType == scr->xdndSelectionAtom || messageType == scr->xdndDropAtom) {
W_DragDestinationStopTimer();
W_DragDestinationStateHandler(info, event);
return;
}
if (messageType == scr->xdndLeaveAtom) {
/* conclude drop operation, and clear dragging info */
W_DragDestinationStopTimer();
handleLeaveMessage(info);
}
}
/* called in destroyView (wview.c) */
void W_FreeViewXdndPart(WMView * view)
{
WMUnregisterViewDraggedTypes(view);
if (view->dragSourceProcs)
wfree(view->dragSourceProcs);
if (view->dragDestinationProcs)
wfree(view->dragDestinationProcs);
if (view->dragImage)
WMReleasePixmap(view->dragImage);
}

1028
WINGs/dragdestination.c
View File

File diff suppressed because it is too large Load Diff

2042
WINGs/dragsource.c
View File

File diff suppressed because it is too large Load Diff

36
WINGs/error.c
View File

@@ -1,7 +1,7 @@
/* /*
* Window Maker miscelaneous function library * Window Maker miscelaneous function library
* *
* Copyright (c) 1997 Alfredo K. Kojima * Copyright (c) 1997-2003 Alfredo K. Kojima
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -18,9 +18,6 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
#include "../src/config.h"
#include "wconfig.h" #include "wconfig.h"
#include <stdio.h> #include <stdio.h>
@@ -31,15 +28,12 @@
extern char *_WINGS_progname; extern char *_WINGS_progname;
#define MAXLINE 1024 #define MAXLINE 1024
/********************************************************************* /*********************************************************************
* Returns the system error message associated with error code 'errnum' * Returns the system error message associated with error code 'errnum'
*********************************************************************/ *********************************************************************/
char* char *wstrerror(int errnum)
wstrerror(int errnum)
{ {
#if defined(HAVE_STRERROR) #if defined(HAVE_STRERROR)
return strerror(errnum); return strerror(errnum);
@@ -53,25 +47,23 @@ wstrerror(int errnum)
if (errno < sys_nerr) if (errno < sys_nerr)
return sys_errlist[errnum]; return sys_errlist[errnum];
sprintf (buf, _("Unknown error %d"), errnum); snprintf(buf, sizeof(buf), _("Unknown error %d"), errnum);
return buf; return buf;
#else /* no strerror() and no sys_errlist[] */ #else /* no strerror() and no sys_errlist[] */
static char buf[] = "Error 12345678901234567890"; static char buf[] = "Error 12345678901234567890";
sprintf(buf, _("Error %d"), errnum); snprintf(buf, sizeof(buf), _("Error %d"), errnum);
return buf; return buf;
#endif #endif
} }
/********************************************************************* /*********************************************************************
* Prints a message with variable arguments * Prints a message with variable arguments
* *
* msg - message to print with optional formatting * msg - message to print with optional formatting
* ... - arguments to use on formatting * ... - arguments to use on formatting
*********************************************************************/ *********************************************************************/
void void wmessage(const char *msg, ...)
wmessage(const char *msg, ...)
{ {
va_list args; va_list args;
char buf[MAXLINE]; char buf[MAXLINE];
@@ -90,15 +82,13 @@ wmessage(const char *msg, ...)
va_end(args); va_end(args);
} }
/********************************************************************* /*********************************************************************
* Prints a warning message with variable arguments * Prints a warning message with variable arguments
* *
* msg - message to print with optional formatting * msg - message to print with optional formatting
* ... - arguments to use on formatting * ... - arguments to use on formatting
*********************************************************************/ *********************************************************************/
void void wwarning(const char *msg, ...)
wwarning(const char *msg, ...)
{ {
va_list args; va_list args;
char buf[MAXLINE]; char buf[MAXLINE];
@@ -117,15 +107,13 @@ wwarning(const char *msg, ...)
va_end(args); va_end(args);
} }
/************************************************************************** /**************************************************************************
* Prints a fatal error message with variable arguments and terminates * Prints a fatal error message with variable arguments and terminates
* *
* msg - message to print with optional formatting * msg - message to print with optional formatting
* ... - arguments to use on formatting * ... - arguments to use on formatting
**************************************************************************/ **************************************************************************/
void void wfatal(const char *msg, ...)
wfatal(const char *msg, ...)
{ {
va_list args; va_list args;
char buf[MAXLINE]; char buf[MAXLINE];
@@ -144,15 +132,13 @@ wfatal(const char *msg, ...)
va_end(args); va_end(args);
} }
/********************************************************************* /*********************************************************************
* Prints a system error message with variable arguments * Prints a system error message with variable arguments
* *
* msg - message to print with optional formatting * msg - message to print with optional formatting
* ... - arguments to use on formatting * ... - arguments to use on formatting
*********************************************************************/ *********************************************************************/
void void wsyserror(const char *msg, ...)
wsyserror(const char *msg, ...)
{ {
va_list args; va_list args;
char buf[MAXLINE]; char buf[MAXLINE];
@@ -172,7 +158,6 @@ wsyserror(const char *msg, ...)
va_end(args); va_end(args);
} }
/********************************************************************* /*********************************************************************
* Prints a system error message with variable arguments, being given * Prints a system error message with variable arguments, being given
* the error code. * the error code.
@@ -181,8 +166,7 @@ wsyserror(const char *msg, ...)
* msg - message to print with optional formatting * msg - message to print with optional formatting
* ... - arguments to use on formatting * ... - arguments to use on formatting
*********************************************************************/ *********************************************************************/
void void wsyserrorwithcode(int error, const char *msg, ...)
wsyserrorwithcode(int error, const char *msg, ...)
{ {
va_list args; va_list args;
char buf[MAXLINE]; char buf[MAXLINE];
@@ -200,5 +184,3 @@ wsyserrorwithcode(int error, const char *msg, ...)
fflush(stdout); fflush(stdout);
va_end(args); va_end(args);
} }

117
WINGs/findfile.c
View File

@@ -1,7 +1,7 @@
/* /*
* Window Maker miscelaneous function library * Window Maker miscelaneous function library
* *
* Copyright (c) 1997 Alfredo K. Kojima * Copyright (c) 1997-2003 Alfredo K. Kojima
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -18,13 +18,11 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
#include "../src/config.h"
#include "wconfig.h" #include "wconfig.h"
#include "WUtil.h" #include "WUtil.h"
#include <errno.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <string.h> #include <string.h>
@@ -35,9 +33,7 @@
#define PATH_MAX 1024 #define PATH_MAX 1024
#endif #endif
char *wgethomedir()
char*
wgethomedir()
{ {
char *home = getenv("HOME"); char *home = getenv("HOME");
struct passwd *user; struct passwd *user;
@@ -57,9 +53,7 @@ wgethomedir()
} }
} }
static char *getuserhomedir(char *username)
static char*
getuserhomedir(char *username)
{ {
struct passwd *user; struct passwd *user;
@@ -75,12 +69,9 @@ getuserhomedir(char *username)
} }
} }
char *wexpandpath(char *path)
char*
wexpandpath(char *path)
{ {
char *origpath = path;
char buffer2[PATH_MAX + 2]; char buffer2[PATH_MAX + 2];
char buffer[PATH_MAX + 2]; char buffer[PATH_MAX + 2];
int i; int i;
@@ -93,25 +84,29 @@ wexpandpath(char *path)
path++; path++;
if (*path == '/' || *path == 0) { if (*path == '/' || *path == 0) {
home = wgethomedir(); home = wgethomedir();
if (strlen(home) > PATH_MAX)
goto error;
strcat(buffer, home); strcat(buffer, home);
} else { } else {
int j; int j;
j = 0; j = 0;
while (*path != 0 && *path != '/') { while (*path != 0 && *path != '/') {
if (j > PATH_MAX)
goto error;
buffer2[j++] = *path; buffer2[j++] = *path;
buffer2[j] = 0; buffer2[j] = 0;
path++; path++;
} }
home = getuserhomedir(buffer2); home = getuserhomedir(buffer2);
if (!home) if (!home || strlen(home) > PATH_MAX)
return NULL; goto error;
strcat(buffer, home); strcat(buffer, home);
} }
} }
i = strlen(buffer); i = strlen(buffer);
while (*path!=0) { while (*path != 0 && i <= PATH_MAX) {
char *tmp; char *tmp;
if (*path == '$') { if (*path == '$') {
@@ -121,35 +116,50 @@ wexpandpath(char *path)
if (*path == '(') { if (*path == '(') {
path++; path++;
while (*path != 0 && *path != ')') { while (*path != 0 && *path != ')') {
if (j > PATH_MAX)
goto error;
buffer2[j++] = *(path++); buffer2[j++] = *(path++);
buffer2[j] = 0; buffer2[j] = 0;
} }
if (*path==')') if (*path == ')') {
path++; path++;
tmp = getenv(buffer2); tmp = getenv(buffer2);
} else {
tmp = NULL;
}
if (!tmp) { if (!tmp) {
if ((i += strlen(buffer2) + 2) > PATH_MAX)
goto error;
buffer[i] = 0; buffer[i] = 0;
strcat(buffer, "$("); strcat(buffer, "$(");
strcat(buffer, buffer2); strcat(buffer, buffer2);
if (*(path-1)==')') {
if (++i > PATH_MAX)
goto error;
strcat(buffer, ")"); strcat(buffer, ")");
i += strlen(buffer2)+3; }
} else { } else {
if ((i += strlen(tmp)) > PATH_MAX)
goto error;
strcat(buffer, tmp); strcat(buffer, tmp);
i += strlen(tmp);
} }
} else { } else {
while (*path != 0 && *path != '/') { while (*path != 0 && *path != '/') {
if (j > PATH_MAX)
goto error;
buffer2[j++] = *(path++); buffer2[j++] = *(path++);
buffer2[j] = 0; buffer2[j] = 0;
} }
tmp = getenv(buffer2); tmp = getenv(buffer2);
if (!tmp) { if (!tmp) {
if ((i += strlen(buffer2) + 1) > PATH_MAX)
goto error;
strcat(buffer, "$"); strcat(buffer, "$");
strcat(buffer, buffer2); strcat(buffer, buffer2);
i += strlen(buffer2)+1;
} else { } else {
if ((i += strlen(tmp)) > PATH_MAX)
goto error;
strcat(buffer, tmp); strcat(buffer, tmp);
i += strlen(tmp);
} }
} }
} else { } else {
@@ -158,10 +168,35 @@ wexpandpath(char *path)
} }
} }
if (*path!=0)
goto error;
return wstrdup(buffer); return wstrdup(buffer);
error:
errno = ENAMETOOLONG;
wsyserror(_("could not expand %s"), origpath);
/* FIXME: too many functions handle a return value of NULL incorrectly */
exit(1);
} }
/* return address of next char != tok or end of string whichever comes first */
static char *skipchar(char *string, char tok)
{
while (*string != 0 && *string == tok)
string++;
return string;
}
/* return address of next char == tok or end of string whichever comes first */
static char *nextchar(char *string, char tok)
{
while (*string != 0 && *string != tok)
string++;
return string;
}
/* /*
*---------------------------------------------------------------------- *----------------------------------------------------------------------
@@ -178,19 +213,17 @@ wexpandpath(char *path)
* *
*---------------------------------------------------------------------- *----------------------------------------------------------------------
*/ */
char* char *wfindfile(char *paths, char *file)
wfindfile(char *paths, char *file)
{ {
char *path; char *path;
char *tmp; char *tmp, *tmp2;
int done;
int len, flen; int len, flen;
char *fullpath; char *fullpath;
if (!file) if (!file)
return NULL; return NULL;
if (*file=='/' || *file=='~' || *file=='$' || !paths) { if (*file == '/' || *file == '~' || *file == '$' || !paths || *paths == 0) {
if (access(file, F_OK) < 0) { if (access(file, F_OK) < 0) {
fullpath = wexpandpath(file); fullpath = wexpandpath(file);
if (!fullpath) if (!fullpath)
@@ -209,13 +242,16 @@ wfindfile(char *paths, char *file)
flen = strlen(file); flen = strlen(file);
tmp = paths; tmp = paths;
done = 0; while (*tmp) {
while (!done) { tmp = skipchar(tmp, ':');
len = strcspn(tmp, ":"); if (*tmp == 0)
if (len==0) done=1; break;
tmp2 = nextchar(tmp, ':');
len = tmp2 - tmp;
path = wmalloc(len + flen + 2); path = wmalloc(len + flen + 2);
path = memcpy(path, tmp, len); path = memcpy(path, tmp, len);
path[len] = 0; path[len] = 0;
if (path[len - 1] != '/')
strcat(path, "/"); strcat(path, "/");
strcat(path, file); strcat(path, file);
fullpath = wexpandpath(path); fullpath = wexpandpath(path);
@@ -226,15 +262,13 @@ wfindfile(char *paths, char *file)
} }
wfree(fullpath); wfree(fullpath);
} }
tmp=&(tmp[len+1]); tmp = tmp2;
if (*tmp==0) break;
} }
return NULL; return NULL;
} }
char *wfindfileinlist(char **path_list, char *file)
char*
wfindfileinlist(char **path_list, char *file)
{ {
int i; int i;
char *path; char *path;
@@ -283,10 +317,7 @@ wfindfileinlist(char **path_list, char *file)
return NULL; return NULL;
} }
char *wfindfileinarray(WMPropList * array, char *file)
char*
wfindfileinarray(WMPropList *array, char *file)
{ {
int i; int i;
char *path; char *path;
@@ -342,7 +373,3 @@ wfindfileinarray(WMPropList *array, char *file)
} }
return NULL; return NULL;
} }

96
WINGs/handlers.c
View File

@@ -3,10 +3,9 @@
* WINGs internal handlers: timer, idle and input handlers * WINGs internal handlers: timer, idle and input handlers
*/ */
#include "wconfig.h"
#include "WINGsP.h" #include "WINGsP.h"
#include "../src/config.h"
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>
@@ -22,9 +21,6 @@
#define X_GETTIMEOFDAY(t) gettimeofday(t, (struct timezone*)0) #define X_GETTIMEOFDAY(t) gettimeofday(t, (struct timezone*)0)
#endif #endif
typedef struct TimerHandler { typedef struct TimerHandler {
WMCallback *callback; /* procedure to call */ WMCallback *callback; /* procedure to call */
struct timeval when; /* when to call the callback */ struct timeval when; /* when to call the callback */
@@ -33,13 +29,11 @@ typedef struct TimerHandler {
int nextDelay; /* 0 if it's one-shot */ int nextDelay; /* 0 if it's one-shot */
} TimerHandler; } TimerHandler;
typedef struct IdleHandler { typedef struct IdleHandler {
WMCallback *callback; WMCallback *callback;
void *clientData; void *clientData;
} IdleHandler; } IdleHandler;
typedef struct InputHandler { typedef struct InputHandler {
WMInputProc *callback; WMInputProc *callback;
void *clientData; void *clientData;
@@ -47,7 +41,6 @@ typedef struct InputHandler {
int mask; int mask;
} InputHandler; } InputHandler;
/* queue of timer event handlers */ /* queue of timer event handlers */
static TimerHandler *timerHandler = NULL; static TimerHandler *timerHandler = NULL;
@@ -57,10 +50,8 @@ static WMArray *inputHandler=NULL;
#define timerPending() (timerHandler) #define timerPending() (timerHandler)
static void rightNow(struct timeval *tv)
{
static void
rightNow(struct timeval *tv) {
X_GETTIMEOFDAY(tv); X_GETTIMEOFDAY(tv);
} }
@@ -73,8 +64,7 @@ rightNow(struct timeval *tv) {
#define SET_ZERO(tv) tv.tv_sec = 0, tv.tv_usec = 0 #define SET_ZERO(tv) tv.tv_sec = 0, tv.tv_usec = 0
static void static void addmillisecs(struct timeval *tv, int milliseconds)
addmillisecs(struct timeval *tv, int milliseconds)
{ {
tv->tv_usec += milliseconds * 1000; tv->tv_usec += milliseconds * 1000;
@@ -82,9 +72,7 @@ addmillisecs(struct timeval *tv, int milliseconds)
tv->tv_usec = tv->tv_usec % 1000000; tv->tv_usec = tv->tv_usec % 1000000;
} }
static void enqueueTimerHandler(TimerHandler * handler)
static void
enqueueTimerHandler(TimerHandler *handler)
{ {
TimerHandler *tmp; TimerHandler *tmp;
@@ -103,15 +91,14 @@ enqueueTimerHandler(TimerHandler *handler)
} }
} }
static void delayUntilNextTimerEvent(struct timeval *delay)
static void
delayUntilNextTimerEvent(struct timeval *delay)
{ {
struct timeval now; struct timeval now;
TimerHandler *handler; TimerHandler *handler;
handler = timerHandler; handler = timerHandler;
while (handler && IS_ZERO(handler->when)) handler = handler->next; while (handler && IS_ZERO(handler->when))
handler = handler->next;
if (!handler) { if (!handler) {
/* The return value of this function is only valid if there _are_ /* The return value of this function is only valid if there _are_
@@ -135,9 +122,7 @@ delayUntilNextTimerEvent(struct timeval *delay)
} }
} }
WMHandlerID WMAddTimerHandler(int milliseconds, WMCallback * callback, void *cdata)
WMHandlerID
WMAddTimerHandler(int milliseconds, WMCallback *callback, void *cdata)
{ {
TimerHandler *handler; TimerHandler *handler;
@@ -156,9 +141,7 @@ WMAddTimerHandler(int milliseconds, WMCallback *callback, void *cdata)
return handler; return handler;
} }
WMHandlerID WMAddPersistentTimerHandler(int milliseconds, WMCallback * callback, void *cdata)
WMHandlerID
WMAddPersistentTimerHandler(int milliseconds, WMCallback *callback, void *cdata)
{ {
TimerHandler *handler = WMAddTimerHandler(milliseconds, callback, cdata); TimerHandler *handler = WMAddTimerHandler(milliseconds, callback, cdata);
@@ -168,10 +151,7 @@ WMAddPersistentTimerHandler(int milliseconds, WMCallback *callback, void *cdata)
return handler; return handler;
} }
void WMDeleteTimerWithClientData(void *cdata)
void
WMDeleteTimerWithClientData(void *cdata)
{ {
TimerHandler *handler, *tmp; TimerHandler *handler, *tmp;
@@ -201,10 +181,7 @@ WMDeleteTimerWithClientData(void *cdata)
} }
} }
void WMDeleteTimerHandler(WMHandlerID handlerID)
void
WMDeleteTimerHandler(WMHandlerID handlerID)
{ {
TimerHandler *tmp, *handler = (TimerHandler *) handlerID; TimerHandler *tmp, *handler = (TimerHandler *) handlerID;
@@ -233,10 +210,7 @@ WMDeleteTimerHandler(WMHandlerID handlerID)
} }
} }
WMHandlerID WMAddIdleHandler(WMCallback * callback, void *cdata)
WMHandlerID
WMAddIdleHandler(WMCallback *callback, void *cdata)
{ {
IdleHandler *handler; IdleHandler *handler;
@@ -255,9 +229,7 @@ WMAddIdleHandler(WMCallback *callback, void *cdata)
return handler; return handler;
} }
void WMDeleteIdleHandler(WMHandlerID handlerID)
void
WMDeleteIdleHandler(WMHandlerID handlerID)
{ {
IdleHandler *handler = (IdleHandler *) handlerID; IdleHandler *handler = (IdleHandler *) handlerID;
@@ -267,10 +239,7 @@ WMDeleteIdleHandler(WMHandlerID handlerID)
WMRemoveFromArray(idleHandler, handler); WMRemoveFromArray(idleHandler, handler);
} }
WMHandlerID WMAddInputHandler(int fd, int condition, WMInputProc * proc, void *clientData)
WMHandlerID
WMAddInputHandler(int fd, int condition, WMInputProc *proc, void *clientData)
{ {
InputHandler *handler; InputHandler *handler;
@@ -288,10 +257,7 @@ WMAddInputHandler(int fd, int condition, WMInputProc *proc, void *clientData)
return handler; return handler;
} }
void WMDeleteInputHandler(WMHandlerID handlerID)
void
WMDeleteInputHandler(WMHandlerID handlerID)
{ {
InputHandler *handler = (InputHandler *) handlerID; InputHandler *handler = (InputHandler *) handlerID;
@@ -301,9 +267,7 @@ WMDeleteInputHandler(WMHandlerID handlerID)
WMRemoveFromArray(inputHandler, handler); WMRemoveFromArray(inputHandler, handler);
} }
Bool W_CheckIdleHandlers(void)
Bool
W_CheckIdleHandlers(void)
{ {
IdleHandler *handler; IdleHandler *handler;
WMArray *handlerCopy; WMArray *handlerCopy;
@@ -334,10 +298,7 @@ W_CheckIdleHandlers(void)
return (WMGetArrayItemCount(idleHandler) > 0); return (WMGetArrayItemCount(idleHandler) > 0);
} }
void W_CheckTimerHandlers(void)
void
W_CheckTimerHandlers(void)
{ {
TimerHandler *handler; TimerHandler *handler;
struct timeval now; struct timeval now;
@@ -374,7 +335,6 @@ W_CheckTimerHandlers(void)
W_FlushASAPNotificationQueue(); W_FlushASAPNotificationQueue();
} }
/* /*
* This functions will handle input events on all registered file descriptors. * This functions will handle input events on all registered file descriptors.
* Input: * Input:
@@ -409,8 +369,7 @@ W_CheckTimerHandlers(void)
* inputfd = -1 * inputfd = -1
* *
*/ */
Bool Bool W_HandleInputEvents(Bool waitForInput, int inputfd)
W_HandleInputEvents(Bool waitForInput, int inputfd)
{ {
#if defined(HAVE_POLL) && defined(HAVE_POLL_H) && !defined(HAVE_SELECT) #if defined(HAVE_POLL) && defined(HAVE_POLL_H) && !defined(HAVE_SELECT)
struct poll fd *fds; struct poll fd *fds;
@@ -486,17 +445,14 @@ W_HandleInputEvents(Bool waitForInput, int inputfd)
(fds[i].revents & (POLLIN | POLLRDNORM | POLLRDBAND | POLLPRI))) (fds[i].revents & (POLLIN | POLLRDNORM | POLLRDBAND | POLLPRI)))
mask |= WIReadMask; mask |= WIReadMask;
if ((handler->mask & WIWriteMask) && if ((handler->mask & WIWriteMask) && (fds[i].revents & (POLLOUT | POLLWRBAND)))
(fds[i].revents & (POLLOUT | POLLWRBAND)))
mask |= WIWriteMask; mask |= WIWriteMask;
if ((handler->mask & WIExceptMask) && if ((handler->mask & WIExceptMask) && (fds[i].revents & (POLLHUP | POLLNVAL | POLLERR)))
(fds[i].revents & (POLLHUP | POLLNVAL | POLLERR)))
mask |= WIExceptMask; mask |= WIExceptMask;
if (mask != 0 && handler->callback) { if (mask != 0 && handler->callback) {
(*handler->callback)(handler->fd, mask, (*handler->callback) (handler->fd, mask, handler->clientData);
handler->clientData);
} }
} }
@@ -593,8 +549,7 @@ W_HandleInputEvents(Bool waitForInput, int inputfd)
mask |= WIExceptMask; mask |= WIExceptMask;
if (mask != 0 && handler->callback) { if (mask != 0 && handler->callback) {
(*handler->callback)(handler->fd, mask, (*handler->callback) (handler->fd, mask, handler->clientData);
handler->clientData);
} }
} }
@@ -603,12 +558,9 @@ W_HandleInputEvents(Bool waitForInput, int inputfd)
W_FlushASAPNotificationQueue(); W_FlushASAPNotificationQueue();
/* --oldway-- return ((inputfd < 0) ? (count > 0) : FD_ISSET(inputfd, &rset));*/
return (count > 0); return (count > 0);
#else /* not HAVE_SELECT, not HAVE_POLL */ #else /* not HAVE_SELECT, not HAVE_POLL */
Neither select nor poll. You lose. # error Neither select nor poll. You lose.
#endif /* HAVE_SELECT */ #endif /* HAVE_SELECT */
#endif /* HAVE_POLL */ #endif /* HAVE_POLL */
} }

102
WINGs/hashtable.c
View File

@@ -1,5 +1,4 @@
#include <sys/types.h> #include <sys/types.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
@@ -7,19 +6,14 @@
#include "WUtil.h" #include "WUtil.h"
#define INITIAL_CAPACITY 23 #define INITIAL_CAPACITY 23
#if defined(__GNUC__) && !defined(__STRICT_ANSI__) #if defined(__GNUC__) && !defined(__STRICT_ANSI__)
# define INLINE inline # define INLINE inline
#else #else
# define INLINE # define INLINE
#endif #endif
typedef struct HashItem { typedef struct HashItem {
const void *key; const void *key;
const void *data; const void *data;
@@ -27,7 +21,6 @@ typedef struct HashItem {
struct HashItem *next; /* collided item list */ struct HashItem *next; /* collided item list */
} HashItem; } HashItem;
typedef struct W_HashTable { typedef struct W_HashTable {
WMHashTableCallbacks callbacks; WMHashTableCallbacks callbacks;
@@ -37,9 +30,6 @@ typedef struct W_HashTable {
HashItem **table; HashItem **table;
} HashTable; } HashTable;
#define HASH(table, key) (((table)->callbacks.hash ? \ #define HASH(table, key) (((table)->callbacks.hash ? \
(*(table)->callbacks.hash)(key) : hashPtr(key)) % (table)->size) (*(table)->callbacks.hash)(key) : hashPtr(key)) % (table)->size)
@@ -49,11 +39,7 @@ typedef struct W_HashTable {
#define RELKEY(table, key) if ((table)->callbacks.releaseKey) \ #define RELKEY(table, key) if ((table)->callbacks.releaseKey) \
(*(table)->callbacks.releaseKey)(key) (*(table)->callbacks.releaseKey)(key)
static INLINE unsigned hashString(const char *key)
static INLINE unsigned
hashString(const char *key)
{ {
unsigned ret = 0; unsigned ret = 0;
unsigned ctr = 0; unsigned ctr = 0;
@@ -66,19 +52,12 @@ hashString(const char *key)
return ret; return ret;
} }
static INLINE unsigned hashPtr(const void *key)
static INLINE unsigned
hashPtr(const void *key)
{ {
return ((size_t) key / sizeof(char *)); return ((size_t) key / sizeof(char *));
} }
static void rellocateItem(WMHashTable * table, HashItem * item)
static void
rellocateItem(WMHashTable *table, HashItem *item)
{ {
unsigned h; unsigned h;
@@ -88,9 +67,7 @@ rellocateItem(WMHashTable *table, HashItem *item)
table->table[h] = item; table->table[h] = item;
} }
static void rebuildTable(WMHashTable * table)
static void
rebuildTable(WMHashTable *table)
{ {
HashItem *next; HashItem *next;
HashItem **oldArray; HashItem **oldArray;
@@ -117,10 +94,7 @@ rebuildTable(WMHashTable *table)
wfree(oldArray); wfree(oldArray);
} }
WMHashTable *WMCreateHashTable(WMHashTableCallbacks callbacks)
WMHashTable*
WMCreateHashTable(WMHashTableCallbacks callbacks)
{ {
HashTable *table; HashTable *table;
@@ -137,9 +111,7 @@ WMCreateHashTable(WMHashTableCallbacks callbacks)
return table; return table;
} }
void WMResetHashTable(WMHashTable * table)
void
WMResetHashTable(WMHashTable *table)
{ {
HashItem *item, *tmp; HashItem *item, *tmp;
int i; int i;
@@ -148,7 +120,7 @@ WMResetHashTable(WMHashTable *table)
item = table->table[i]; item = table->table[i];
while (item) { while (item) {
tmp = item->next; tmp = item->next;
RELKEY(table, item); RELKEY(table, item->key);
wfree(item); wfree(item);
item = tmp; item = tmp;
} }
@@ -164,9 +136,7 @@ WMResetHashTable(WMHashTable *table)
memset(table->table, 0, sizeof(HashItem *) * table->size); memset(table->table, 0, sizeof(HashItem *) * table->size);
} }
void WMFreeHashTable(WMHashTable * table)
void
WMFreeHashTable(WMHashTable *table)
{ {
HashItem *item, *tmp; HashItem *item, *tmp;
int i; int i;
@@ -184,16 +154,12 @@ WMFreeHashTable(WMHashTable *table)
wfree(table); wfree(table);
} }
unsigned WMCountHashTable(WMHashTable * table)
unsigned
WMCountHashTable(WMHashTable *table)
{ {
return table->itemCount; return table->itemCount;
} }
void *WMHashGet(WMHashTable * table, const void *key)
void*
WMHashGet(WMHashTable *table, const void *key)
{ {
unsigned h; unsigned h;
HashItem *item; HashItem *item;
@@ -222,10 +188,7 @@ WMHashGet(WMHashTable *table, const void *key)
return NULL; return NULL;
} }
Bool WMHashGetItemAndKey(WMHashTable * table, const void *key, void **retItem, void **retKey)
Bool
WMHashGetItemAndKey(WMHashTable *table, const void *key,
void **retItem, void **retKey)
{ {
unsigned h; unsigned h;
HashItem *item; HashItem *item;
@@ -259,10 +222,7 @@ WMHashGetItemAndKey(WMHashTable *table, const void *key,
} }
} }
void *WMHashInsert(WMHashTable * table, const void *key, const void *data)
void*
WMHashInsert(WMHashTable *table, const void *key, const void *data)
{ {
unsigned h; unsigned h;
HashItem *item; HashItem *item;
@@ -324,17 +284,14 @@ WMHashInsert(WMHashTable *table, const void *key, const void *data)
return NULL; return NULL;
} }
static HashItem *deleteFromList(HashTable * table, HashItem * item, const void *key)
static HashItem*
deleteFromList(HashTable *table, HashItem *item, const void *key)
{ {
HashItem *next; HashItem *next;
if (item == NULL) if (item == NULL)
return NULL; return NULL;
if ((table->callbacks.keyIsEqual if ((table->callbacks.keyIsEqual && (*table->callbacks.keyIsEqual) (key, item->key))
&& (*table->callbacks.keyIsEqual)(key, item->key))
|| (!table->callbacks.keyIsEqual && key == item->key)) { || (!table->callbacks.keyIsEqual && key == item->key)) {
next = item->next; next = item->next;
@@ -351,9 +308,7 @@ deleteFromList(HashTable *table, HashItem *item, const void *key)
return item; return item;
} }
void WMHashRemove(WMHashTable * table, const void *key)
void
WMHashRemove(WMHashTable *table, const void *key)
{ {
unsigned h; unsigned h;
@@ -362,9 +317,7 @@ WMHashRemove(WMHashTable *table, const void *key)
table->table[h] = deleteFromList(table, table->table[h], key); table->table[h] = deleteFromList(table, table->table[h], key);
} }
WMHashEnumerator WMEnumerateHashTable(WMHashTable * table)
WMHashEnumerator
WMEnumerateHashTable(WMHashTable *table)
{ {
WMHashEnumerator enumerator; WMHashEnumerator enumerator;
@@ -375,10 +328,7 @@ WMEnumerateHashTable(WMHashTable *table)
return enumerator; return enumerator;
} }
void *WMNextHashEnumeratorItem(WMHashEnumerator * enumerator)
void*
WMNextHashEnumeratorItem(WMHashEnumerator *enumerator)
{ {
const void *data = NULL; const void *data = NULL;
@@ -403,9 +353,7 @@ WMNextHashEnumeratorItem(WMHashEnumerator *enumerator)
return (void *)data; return (void *)data;
} }
void *WMNextHashEnumeratorKey(WMHashEnumerator * enumerator)
void*
WMNextHashEnumeratorKey(WMHashEnumerator *enumerator)
{ {
const void *key = NULL; const void *key = NULL;
@@ -430,10 +378,7 @@ WMNextHashEnumeratorKey(WMHashEnumerator *enumerator)
return (void *)key; return (void *)key;
} }
Bool WMNextHashEnumeratorItemAndKey(WMHashEnumerator * enumerator, void **item, void **key)
Bool
WMNextHashEnumeratorItemAndKey(WMHashEnumerator *enumerator,
void **item, void **key)
{ {
/* this assumes the table doesn't change between /* this assumes the table doesn't change between
* WMEnumerateHashTable() and WMNextHashEnumeratorItemAndKey() calls */ * WMEnumerateHashTable() and WMNextHashEnumeratorItemAndKey() calls */
@@ -461,20 +406,16 @@ WMNextHashEnumeratorItemAndKey(WMHashEnumerator *enumerator,
return False; return False;
} }
static Bool compareStrings(const char *key1, const char *key2)
static Bool
compareStrings(const char *key1, const char *key2)
{ {
return strcmp(key1, key2) == 0; return strcmp(key1, key2) == 0;
} }
typedef unsigned (*hashFunc) (const void *); typedef unsigned (*hashFunc) (const void *);
typedef Bool(*isEqualFunc) (const void *, const void *); typedef Bool(*isEqualFunc) (const void *, const void *);
typedef void *(*retainFunc) (const void *); typedef void *(*retainFunc) (const void *);
typedef void (*releaseFunc) (const void *); typedef void (*releaseFunc) (const void *);
const WMHashTableCallbacks WMIntHashCallbacks = { const WMHashTableCallbacks WMIntHashCallbacks = {
NULL, NULL,
NULL, NULL,
@@ -489,12 +430,9 @@ const WMHashTableCallbacks WMStringHashCallbacks = {
(releaseFunc) wfree (releaseFunc) wfree
}; };
const WMHashTableCallbacks WMStringPointerHashCallbacks = { const WMHashTableCallbacks WMStringPointerHashCallbacks = {
(hashFunc) hashString, (hashFunc) hashString,
(isEqualFunc) compareStrings, (isEqualFunc) compareStrings,
NULL, NULL,
NULL NULL
}; };

89
WINGs/host.c
View File

@@ -1,7 +1,7 @@
/* /*
* WINGs WMHost function library * WINGs WMHost function library
* *
* Copyright (c) 1999-2001 Dan Pascu * Copyright (c) 1999-2003 Dan Pascu
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -18,9 +18,6 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
#include "../src/config.h"
#include "wconfig.h" #include "wconfig.h"
#include <unistd.h> #include <unistd.h>
@@ -32,7 +29,6 @@
#include "WUtil.h" #include "WUtil.h"
/* For Solaris */ /* For Solaris */
#ifndef INADDR_NONE #ifndef INADDR_NONE
# define INADDR_NONE (-1) # define INADDR_NONE (-1)
@@ -41,7 +37,6 @@
/* Max hostname length (RFC 1123) */ /* Max hostname length (RFC 1123) */
#define W_MAXHOSTNAMELEN 255 #define W_MAXHOSTNAMELEN 255
typedef struct W_Host { typedef struct W_Host {
char *name; char *name;
@@ -51,15 +46,11 @@ typedef struct W_Host {
int refCount; int refCount;
} W_Host; } W_Host;
static WMHashTable *hostCache = NULL; static WMHashTable *hostCache = NULL;
static Bool hostCacheEnabled = True; static Bool hostCacheEnabled = True;
static WMHost *getHostFromCache(char *name)
static WMHost*
getHostFromCache(char *name)
{ {
if (!hostCache) if (!hostCache)
return NULL; return NULL;
@@ -67,9 +58,7 @@ getHostFromCache(char *name)
return WMHashGet(hostCache, name); return WMHashGet(hostCache, name);
} }
static WMHost *getHostWithHostEntry(struct hostent *host, char *name)
static WMHost*
getHostWithHostEntry(struct hostent *host, char *name)
{ {
WMHost *hPtr; WMHost *hPtr;
struct in_addr in; struct in_addr in;
@@ -88,8 +77,7 @@ getHostWithHostEntry(struct hostent *host, char *name)
} }
for (i = 0; host->h_addr_list[i] != NULL; i++) { for (i = 0; host->h_addr_list[i] != NULL; i++) {
memcpy((void*)&in.s_addr, (const void*)host->h_addr_list[i], memcpy((void *)&in.s_addr, (const void *)host->h_addr_list[i], host->h_length);
host->h_length);
WMAddToArray(hPtr->addresses, wstrdup(inet_ntoa(in))); WMAddToArray(hPtr->addresses, wstrdup(inet_ntoa(in)));
} }
@@ -106,9 +94,7 @@ getHostWithHostEntry(struct hostent *host, char *name)
return hPtr; return hPtr;
} }
WMHost *WMGetCurrentHost()
WMHost*
WMGetCurrentHost()
{ {
char name[W_MAXHOSTNAMELEN + 1]; char name[W_MAXHOSTNAMELEN + 1];
@@ -122,9 +108,7 @@ WMGetCurrentHost()
return WMGetHostWithName(name); return WMGetHostWithName(name);
} }
WMHost *WMGetHostWithName(char *name)
WMHost*
WMGetHostWithName(char *name)
{ {
struct hostent *host; struct hostent *host;
WMHost *hPtr; WMHost *hPtr;
@@ -148,9 +132,7 @@ WMGetHostWithName(char *name)
return hPtr; return hPtr;
} }
WMHost *WMGetHostWithAddress(char *address)
WMHost*
WMGetHostWithAddress(char *address)
{ {
struct hostent *host; struct hostent *host;
struct in_addr in; struct in_addr in;
@@ -164,7 +146,6 @@ WMGetHostWithAddress(char *address)
return hPtr; return hPtr;
} }
} }
#ifndef HAVE_INET_ATON #ifndef HAVE_INET_ATON
if ((in.s_addr = inet_addr(address)) == INADDR_NONE) if ((in.s_addr = inet_addr(address)) == INADDR_NONE)
return NULL; return NULL;
@@ -183,17 +164,13 @@ WMGetHostWithAddress(char *address)
return hPtr; return hPtr;
} }
WMHost *WMRetainHost(WMHost * hPtr)
WMHost*
WMRetainHost(WMHost *hPtr)
{ {
hPtr->refCount++; hPtr->refCount++;
return hPtr; return hPtr;
} }
void WMReleaseHost(WMHost * hPtr)
void
WMReleaseHost(WMHost *hPtr)
{ {
hPtr->refCount--; hPtr->refCount--;
@@ -211,23 +188,17 @@ WMReleaseHost(WMHost *hPtr)
wfree(hPtr); wfree(hPtr);
} }
void WMSetHostCacheEnabled(Bool flag)
void
WMSetHostCacheEnabled(Bool flag)
{ {
hostCacheEnabled = flag; hostCacheEnabled = ((flag == 0) ? 0 : 1);
} }
Bool WMIsHostCacheEnabled()
Bool
WMIsHostCacheEnabled()
{ {
return hostCacheEnabled; return hostCacheEnabled;
} }
void WMFlushHostCache()
void
WMFlushHostCache()
{ {
if (hostCache && WMCountHashTable(hostCache) > 0) { if (hostCache && WMCountHashTable(hostCache) > 0) {
WMArray *hostArray = WMCreateArray(WMCountHashTable(hostCache)); WMArray *hostArray = WMCreateArray(WMCountHashTable(hostCache));
@@ -247,16 +218,12 @@ WMFlushHostCache()
} }
} }
static int matchAddress(void *item, void *cdata)
static int
matchAddress(void *item, void *cdata)
{ {
return (strcmp((char *)item, (char *)cdata) == 0); return (strcmp((char *)item, (char *)cdata) == 0);
} }
Bool WMIsHostEqualToHost(WMHost * hPtr, WMHost * aPtr)
Bool
WMIsHostEqualToHost(WMHost* hPtr, WMHost* aPtr)
{ {
char *adr; char *adr;
int i; int i;
@@ -276,37 +243,23 @@ WMIsHostEqualToHost(WMHost* hPtr, WMHost* aPtr)
return False; return False;
} }
char *WMGetHostName(WMHost * hPtr)
char*
WMGetHostName(WMHost *hPtr)
{ {
return (WMGetArrayItemCount(hPtr->names) > 0 ? return (WMGetArrayItemCount(hPtr->names) > 0 ? WMGetFromArray(hPtr->names, 0) : NULL);
WMGetFromArray(hPtr->names, 0) : NULL);
/*return WMGetFromArray(hPtr->names, 0); */ /*return WMGetFromArray(hPtr->names, 0); */
} }
WMArray *WMGetHostNames(WMHost * hPtr)
WMArray*
WMGetHostNames(WMHost *hPtr)
{ {
return hPtr->names; return hPtr->names;
} }
char *WMGetHostAddress(WMHost * hPtr)
char*
WMGetHostAddress(WMHost *hPtr)
{ {
return (WMGetArrayItemCount(hPtr->addresses) > 0 ? return (WMGetArrayItemCount(hPtr->addresses) > 0 ? WMGetFromArray(hPtr->addresses, 0) : NULL);
WMGetFromArray(hPtr->addresses, 0) : NULL);
} }
WMArray *WMGetHostAddresses(WMHost * hPtr)
WMArray*
WMGetHostAddresses(WMHost *hPtr)
{ {
return hPtr->addresses; return hPtr->addresses;
} }

5
WINGs/international.c
View File

@@ -1,12 +1,9 @@
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include "WINGsP.h" #include "WINGsP.h"
void InitI18n(Display * dpy)
void
InitI18n(Display *dpy)
{ {
} }

53
WINGs/make-rgb Executable file
View File

@@ -0,0 +1,53 @@
#!/usr/bin/python
import sys
import re
from optparse import OptionParser
parser = OptionParser(version="%prog 1.0")
parser.add_option("-f", "--file", dest="rgbtxtFile", default='/etc/X11/rgb.txt',
help="rgb.txt file containing X11 colors (/etc/X11/rgb.txt)",
metavar="File")
(options, args) = parser.parse_args()
f = open(options.rgbtxtFile)
lines = f.readlines()
f.close()
colorLine = re.compile(r'''\s*
(?P<red>\d+) # red
\s+
(?P<green>\d+) # green
\s+
(?P<blue>\d+) # blue
\s+
(?P<name>[^\s]+) # name
''', re.VERBOSE)
print '''
/* Automatically generated file. Do NOT edit. Regenerate it using make-rgb */
#ifndef RGB_H_
#define RGB_H_
#include <wraster.h>
typedef struct RGBColor {
RColor color;
char *name;
} RGBColor;
RGBColor rgbColors[] = {'''
for line in lines:
m = colorLine.match(line)
if m:
print ''' {{%(red)3s, %(green)3s, %(blue)3s, 0}, "%(name)s"},''' % m.groupdict()
print ''' {{ 0, 0, 0, 0}, NULL}
};
#endif
'''

54
WINGs/memory.c
View File

@@ -1,7 +1,7 @@
/* /*
* Window Maker miscelaneous function library * Window Maker miscelaneous function library
* *
* Copyright (c) 1997 Alfredo K. Kojima * Copyright (c) 1997-2003 Alfredo K. Kojima
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -18,9 +18,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
#include "wconfig.h"
#include "../src/config.h"
#include "WUtil.h" #include "WUtil.h"
#include <stdlib.h> #include <stdlib.h>
@@ -42,9 +40,7 @@
# define True 1 # define True 1
#endif #endif
static void defaultHandler(int bla)
static void
defaultHandler(int bla)
{ {
if (bla) if (bla)
kill(getpid(), SIGABRT); kill(getpid(), SIGABRT);
@@ -52,14 +48,11 @@ defaultHandler(int bla)
exit(1); exit(1);
} }
static waborthandler *aborthandler = (waborthandler *) defaultHandler; static waborthandler *aborthandler = (waborthandler *) defaultHandler;
#define wAbort(a) (*aborthandler)(a) #define wAbort(a) (*aborthandler)(a)
waborthandler *wsetabort(waborthandler * handler)
waborthandler*
wsetabort(waborthandler *handler)
{ {
waborthandler *old = aborthandler; waborthandler *old = aborthandler;
@@ -68,16 +61,11 @@ wsetabort(waborthandler *handler)
return old; return old;
} }
static int Aborting = 0; /* if we're in the middle of an emergency exit */ static int Aborting = 0; /* if we're in the middle of an emergency exit */
static WMHashTable *table = NULL; static WMHashTable *table = NULL;
void *wmalloc(size_t size)
void*
wmalloc(size_t size)
{ {
void *tmp; void *tmp;
@@ -110,9 +98,18 @@ wmalloc(size_t size)
return tmp; return tmp;
} }
void *wmalloc0(size_t size)
{
void *ptr = wmalloc(size);
if (!ptr)
return NULL;
void* memset(ptr, 0, size);
wrealloc(void *ptr, size_t newsize)
return ptr;
}
void *wrealloc(void *ptr, size_t newsize)
{ {
void *nptr; void *nptr;
@@ -137,8 +134,7 @@ wrealloc(void *ptr, size_t newsize)
#endif #endif
if (nptr == NULL) { if (nptr == NULL) {
if (Aborting) { if (Aborting) {
fputs("Really Bad Error: recursive realloc() failure.", fputs("Really Bad Error: recursive realloc() failure.", stderr);
stderr);
exit(-1); exit(-1);
} else { } else {
wfatal("virtual memory exhausted"); wfatal("virtual memory exhausted");
@@ -151,9 +147,7 @@ wrealloc(void *ptr, size_t newsize)
return nptr; return nptr;
} }
void *wretain(void *ptr)
void*
wretain(void *ptr)
{ {
int *refcount; int *refcount;
@@ -179,10 +173,7 @@ wretain(void *ptr)
return ptr; return ptr;
} }
void wfree(void *ptr)
void
wfree(void *ptr)
{ {
#ifdef TEST_WITH_GC #ifdef TEST_WITH_GC
GC_free(ptr); GC_free(ptr);
@@ -191,10 +182,7 @@ wfree(void *ptr)
#endif #endif
} }
void wrelease(void *ptr)
void
wrelease(void *ptr)
{ {
int *refcount; int *refcount;
@@ -218,5 +206,3 @@ wrelease(void *ptr)
#endif #endif
} }
} }

6
WINGs/misc.c
View File

@@ -3,9 +3,7 @@
#include "WINGsP.h" #include "WINGsP.h"
WMRange wmkrange(int start, int count)
WMRange
wmkrange(int start, int count)
{ {
WMRange range; WMRange range;
@@ -14,5 +12,3 @@ wmkrange(int start, int count)
return range; return range;
} }

152
WINGs/notification.c
View File

@@ -6,7 +6,6 @@
#include "WUtil.h" #include "WUtil.h"
typedef struct W_Notification { typedef struct W_Notification {
const char *name; const char *name;
void *object; void *object;
@@ -14,33 +13,24 @@ typedef struct W_Notification {
int refCount; int refCount;
} Notification; } Notification;
extern void W_FlushASAPNotificationQueue(); extern void W_FlushASAPNotificationQueue();
const char *WMGetNotificationName(WMNotification * notification)
const char*
WMGetNotificationName(WMNotification *notification)
{ {
return notification->name; return notification->name;
} }
void *WMGetNotificationObject(WMNotification * notification)
void*
WMGetNotificationObject(WMNotification *notification)
{ {
return notification->object; return notification->object;
} }
void *WMGetNotificationClientData(WMNotification * notification)
void*
WMGetNotificationClientData(WMNotification *notification)
{ {
return notification->clientData; return notification->clientData;
} }
WMNotification *WMCreateNotification(const char *name, void *object, void *clientData)
WMNotification*
WMCreateNotification(const char *name, void *object, void *clientData)
{ {
Notification *nPtr; Notification *nPtr;
@@ -55,9 +45,7 @@ WMCreateNotification(const char *name, void *object, void *clientData)
return nPtr; return nPtr;
} }
void WMReleaseNotification(WMNotification * notification)
void
WMReleaseNotification(WMNotification *notification)
{ {
notification->refCount--; notification->refCount--;
@@ -66,16 +54,13 @@ WMReleaseNotification(WMNotification *notification)
} }
} }
WMNotification *WMRetainNotification(WMNotification * notification)
WMNotification*
WMRetainNotification(WMNotification *notification)
{ {
notification->refCount++; notification->refCount++;
return notification; return notification;
} }
/***************** Notification Center *****************/ /***************** Notification Center *****************/
typedef struct NotificationObserver { typedef struct NotificationObserver {
@@ -90,7 +75,6 @@ typedef struct NotificationObserver {
struct NotificationObserver *nextAction; /* for observerTable */ struct NotificationObserver *nextAction; /* for observerTable */
} NotificationObserver; } NotificationObserver;
typedef struct W_NotificationCenter { typedef struct W_NotificationCenter {
WMHashTable *nameTable; /* names -> observer lists */ WMHashTable *nameTable; /* names -> observer lists */
WMHashTable *objectTable; /* object -> observer lists */ WMHashTable *objectTable; /* object -> observer lists */
@@ -99,13 +83,10 @@ typedef struct W_NotificationCenter {
WMHashTable *observerTable; /* observer -> NotificationObserver */ WMHashTable *observerTable; /* observer -> NotificationObserver */
} NotificationCenter; } NotificationCenter;
/* default (and only) center */ /* default (and only) center */
static NotificationCenter *notificationCenter = NULL; static NotificationCenter *notificationCenter = NULL;
void W_InitNotificationCenter(void)
void
W_InitNotificationCenter(void)
{ {
notificationCenter = wmalloc(sizeof(NotificationCenter)); notificationCenter = wmalloc(sizeof(NotificationCenter));
@@ -116,7 +97,6 @@ W_InitNotificationCenter(void)
notificationCenter->observerTable = WMCreateHashTable(WMIntHashCallbacks); notificationCenter->observerTable = WMCreateHashTable(WMIntHashCallbacks);
} }
void void
WMAddNotificationObserver(WMNotificationObserverAction * observerAction, WMAddNotificationObserver(WMNotificationObserverAction * observerAction,
void *observer, const char *name, void *object) void *observer, const char *name, void *object)
@@ -131,10 +111,8 @@ WMAddNotificationObserver(WMNotificationObserverAction *observerAction,
oRec->next = NULL; oRec->next = NULL;
oRec->prev = NULL; oRec->prev = NULL;
/* put this action in the list of actions for this observer */ /* put this action in the list of actions for this observer */
rec = (NotificationObserver*)WMHashInsert(notificationCenter->observerTable, rec = (NotificationObserver *) WMHashInsert(notificationCenter->observerTable, observer, oRec);
observer, oRec);
if (rec) { if (rec) {
/* if this is not the first action for the observer */ /* if this is not the first action for the observer */
@@ -152,16 +130,14 @@ WMAddNotificationObserver(WMNotificationObserverAction *observerAction,
notificationCenter->nilList = oRec; notificationCenter->nilList = oRec;
} else if (!name) { } else if (!name) {
/* any message coming from object */ /* any message coming from object */
rec = (NotificationObserver*)WMHashInsert(notificationCenter->objectTable, rec = (NotificationObserver *) WMHashInsert(notificationCenter->objectTable, object, oRec);
object, oRec);
oRec->next = rec; oRec->next = rec;
if (rec) { if (rec) {
rec->prev = oRec; rec->prev = oRec;
} }
} else { } else {
/* name && (object || !object) */ /* name && (object || !object) */
rec = (NotificationObserver*)WMHashInsert(notificationCenter->nameTable, rec = (NotificationObserver *) WMHashInsert(notificationCenter->nameTable, name, oRec);
name, oRec);
oRec->next = rec; oRec->next = rec;
if (rec) { if (rec) {
rec->prev = oRec; rec->prev = oRec;
@@ -169,23 +145,19 @@ WMAddNotificationObserver(WMNotificationObserverAction *observerAction,
} }
} }
void WMPostNotification(WMNotification * notification)
void
WMPostNotification(WMNotification *notification)
{ {
NotificationObserver *orec, *tmp; NotificationObserver *orec, *tmp;
WMRetainNotification(notification); WMRetainNotification(notification);
/* tell the observers that want to know about a particular message */ /* tell the observers that want to know about a particular message */
orec = (NotificationObserver*)WMHashGet(notificationCenter->nameTable, orec = (NotificationObserver *) WMHashGet(notificationCenter->nameTable, notification->name);
notification->name);
while (orec) { while (orec) {
tmp = orec->next; tmp = orec->next;
if (!orec->object || !notification->object if (!orec->object || !notification->object || orec->object == notification->object) {
|| orec->object == notification->object) {
/* tell the observer */ /* tell the observer */
if (orec->observerAction) { if (orec->observerAction) {
(*orec->observerAction) (orec->observer, notification); (*orec->observerAction) (orec->observer, notification);
@@ -196,8 +168,7 @@ WMPostNotification(WMNotification *notification)
} }
/* tell the observers that want to know about an object */ /* tell the observers that want to know about an object */
orec = (NotificationObserver*)WMHashGet(notificationCenter->objectTable, orec = (NotificationObserver *) WMHashGet(notificationCenter->objectTable, notification->object);
notification->object);
while (orec) { while (orec) {
tmp = orec->next; tmp = orec->next;
@@ -224,15 +195,12 @@ WMPostNotification(WMNotification *notification)
WMReleaseNotification(notification); WMReleaseNotification(notification);
} }
void WMRemoveNotificationObserver(void *observer)
void
WMRemoveNotificationObserver(void *observer)
{ {
NotificationObserver *orec, *tmp, *rec; NotificationObserver *orec, *tmp, *rec;
/* get the list of actions the observer is doing */ /* get the list of actions the observer is doing */
orec = (NotificationObserver*)WMHashGet(notificationCenter->observerTable, orec = (NotificationObserver *) WMHashGet(notificationCenter->observerTable, observer);
observer);
/* /*
* FOREACH orec IN actionlist for observer * FOREACH orec IN actionlist for observer
@@ -250,26 +218,22 @@ WMRemoveNotificationObserver(void *observer)
notificationCenter->nilList = orec->next; notificationCenter->nilList = orec->next;
} else if (!orec->name) { } else if (!orec->name) {
/* any message coming from object */ /* any message coming from object */
rec = (NotificationObserver*)WMHashGet(notificationCenter->objectTable, rec = (NotificationObserver *) WMHashGet(notificationCenter->objectTable, orec->object);
orec->object);
if (rec == orec) { if (rec == orec) {
/* replace table entry */ /* replace table entry */
if (orec->next) { if (orec->next) {
WMHashInsert(notificationCenter->objectTable, orec->object, WMHashInsert(notificationCenter->objectTable, orec->object, orec->next);
orec->next);
} else { } else {
WMHashRemove(notificationCenter->objectTable, orec->object); WMHashRemove(notificationCenter->objectTable, orec->object);
} }
} }
} else { } else {
/* name && (object || !object) */ /* name && (object || !object) */
rec = (NotificationObserver*)WMHashGet(notificationCenter->nameTable, rec = (NotificationObserver *) WMHashGet(notificationCenter->nameTable, orec->name);
orec->name);
if (rec == orec) { if (rec == orec) {
/* replace table entry */ /* replace table entry */
if (orec->next) { if (orec->next) {
WMHashInsert(notificationCenter->nameTable, orec->name, WMHashInsert(notificationCenter->nameTable, orec->name, orec->next);
orec->next);
} else { } else {
WMHashRemove(notificationCenter->nameTable, orec->name); WMHashRemove(notificationCenter->nameTable, orec->name);
} }
@@ -288,9 +252,7 @@ WMRemoveNotificationObserver(void *observer)
WMHashRemove(notificationCenter->observerTable, observer); WMHashRemove(notificationCenter->observerTable, observer);
} }
void WMRemoveNotificationObserverWithName(void *observer, const char *name, void *object)
void
WMRemoveNotificationObserverWithName(void *observer, const char *name, void *object)
{ {
NotificationObserver *orec, *tmp, *rec; NotificationObserver *orec, *tmp, *rec;
NotificationObserver *newList = NULL; NotificationObserver *newList = NULL;
@@ -309,7 +271,9 @@ WMRemoveNotificationObserverWithName(void *observer, const char *name, void *obj
if (notificationCenter->nilList == orec) if (notificationCenter->nilList == orec)
notificationCenter->nilList = orec->next; notificationCenter->nilList = orec->next;
} else if (!name) { } else if (!name) {
rec = (NotificationObserver*)WMHashGet(notificationCenter->objectTable, orec->object); rec =
(NotificationObserver *) WMHashGet(notificationCenter->objectTable,
orec->object);
if (rec == orec) { if (rec == orec) {
assert(rec->prev == NULL); assert(rec->prev == NULL);
/* replace table entry */ /* replace table entry */
@@ -317,8 +281,7 @@ WMRemoveNotificationObserverWithName(void *observer, const char *name, void *obj
WMHashInsert(notificationCenter->objectTable, WMHashInsert(notificationCenter->objectTable,
orec->object, orec->next); orec->object, orec->next);
} else { } else {
WMHashRemove(notificationCenter->objectTable, WMHashRemove(notificationCenter->objectTable, orec->object);
orec->object);
} }
} }
} else { } else {
@@ -331,8 +294,7 @@ WMRemoveNotificationObserverWithName(void *observer, const char *name, void *obj
WMHashInsert(notificationCenter->nameTable, WMHashInsert(notificationCenter->nameTable,
orec->name, orec->next); orec->name, orec->next);
} else { } else {
WMHashRemove(notificationCenter->nameTable, WMHashRemove(notificationCenter->nameTable, orec->name);
orec->name);
} }
} }
} }
@@ -366,9 +328,7 @@ WMRemoveNotificationObserverWithName(void *observer, const char *name, void *obj
} }
} }
void WMPostNotificationName(const char *name, void *object, void *clientData)
void
WMPostNotificationName(const char *name, void *object, void *clientData)
{ {
WMNotification *notification; WMNotification *notification;
@@ -379,11 +339,8 @@ WMPostNotificationName(const char *name, void *object, void *clientData)
WMReleaseNotification(notification); WMReleaseNotification(notification);
} }
/**************** Notification Queues ****************/ /**************** Notification Queues ****************/
typedef struct W_NotificationQueue { typedef struct W_NotificationQueue {
WMArray *asapQueue; WMArray *asapQueue;
WMArray *idleQueue; WMArray *idleQueue;
@@ -391,15 +348,12 @@ typedef struct W_NotificationQueue {
struct W_NotificationQueue *next; struct W_NotificationQueue *next;
} NotificationQueue; } NotificationQueue;
static WMNotificationQueue *notificationQueueList = NULL; static WMNotificationQueue *notificationQueueList = NULL;
/* default queue */ /* default queue */
static WMNotificationQueue *notificationQueue = NULL; static WMNotificationQueue *notificationQueue = NULL;
WMNotificationQueue *WMGetDefaultNotificationQueue(void)
WMNotificationQueue*
WMGetDefaultNotificationQueue(void)
{ {
if (!notificationQueue) if (!notificationQueue)
notificationQueue = WMCreateNotificationQueue(); notificationQueue = WMCreateNotificationQueue();
@@ -407,18 +361,14 @@ WMGetDefaultNotificationQueue(void)
return notificationQueue; return notificationQueue;
} }
WMNotificationQueue *WMCreateNotificationQueue(void)
WMNotificationQueue*
WMCreateNotificationQueue(void)
{ {
NotificationQueue *queue; NotificationQueue *queue;
queue = wmalloc(sizeof(NotificationQueue)); queue = wmalloc(sizeof(NotificationQueue));
queue->asapQueue = queue->asapQueue = WMCreateArrayWithDestructor(8, (WMFreeDataProc *) WMReleaseNotification);
WMCreateArrayWithDestructor(8, (WMFreeDataProc*)WMReleaseNotification); queue->idleQueue = WMCreateArrayWithDestructor(8, (WMFreeDataProc *) WMReleaseNotification);
queue->idleQueue =
WMCreateArrayWithDestructor(8, (WMFreeDataProc*)WMReleaseNotification);
queue->next = notificationQueueList; queue->next = notificationQueueList;
notificationQueueList = queue; notificationQueueList = queue;
@@ -426,36 +376,25 @@ WMCreateNotificationQueue(void)
return queue; return queue;
} }
void WMEnqueueNotification(WMNotificationQueue * queue, WMNotification * notification, WMPostingStyle postingStyle)
void
WMEnqueueNotification(WMNotificationQueue *queue, WMNotification *notification,
WMPostingStyle postingStyle)
{ {
WMEnqueueCoalesceNotification(queue, notification, postingStyle, WMEnqueueCoalesceNotification(queue, notification, postingStyle, WNCOnName | WNCOnSender);
WNCOnName|WNCOnSender);
} }
#define NOTIF ((WMNotification*)cdata) #define NOTIF ((WMNotification*)cdata)
#define ITEM ((WMNotification*)item) #define ITEM ((WMNotification*)item)
static int static int matchSenderAndName(void *item, void *cdata)
matchSenderAndName(void *item, void *cdata)
{ {
return (NOTIF->object == ITEM->object && strcmp(NOTIF->name, ITEM->name) == 0); return (NOTIF->object == ITEM->object && strcmp(NOTIF->name, ITEM->name) == 0);
} }
static int matchSender(void *item, void *cdata)
static int
matchSender(void *item, void *cdata)
{ {
return (NOTIF->object == ITEM->object); return (NOTIF->object == ITEM->object);
} }
static int matchName(void *item, void *cdata)
static int
matchName(void *item, void *cdata)
{ {
return (strcmp(NOTIF->name, ITEM->name) == 0); return (strcmp(NOTIF->name, ITEM->name) == 0);
} }
@@ -463,10 +402,7 @@ matchName(void *item, void *cdata)
#undef NOTIF #undef NOTIF
#undef ITEM #undef ITEM
void WMDequeueNotificationMatching(WMNotificationQueue * queue, WMNotification * notification, unsigned mask)
void
WMDequeueNotificationMatching(WMNotificationQueue *queue,
WMNotification *notification, unsigned mask)
{ {
WMMatchDataProc *matchFunc; WMMatchDataProc *matchFunc;
@@ -483,12 +419,9 @@ WMDequeueNotificationMatching(WMNotificationQueue *queue,
WMRemoveFromArrayMatching(queue->idleQueue, matchFunc, notification); WMRemoveFromArrayMatching(queue->idleQueue, matchFunc, notification);
} }
void void
WMEnqueueCoalesceNotification(WMNotificationQueue * queue, WMEnqueueCoalesceNotification(WMNotificationQueue * queue,
WMNotification *notification, WMNotification * notification, WMPostingStyle postingStyle, unsigned coalesceMask)
WMPostingStyle postingStyle,
unsigned coalesceMask)
{ {
if (coalesceMask != WNCNone) if (coalesceMask != WNCNone)
WMDequeueNotificationMatching(queue, notification, coalesceMask); WMDequeueNotificationMatching(queue, notification, coalesceMask);
@@ -509,9 +442,7 @@ WMEnqueueCoalesceNotification(WMNotificationQueue *queue,
} }
} }
void W_FlushASAPNotificationQueue()
void
W_FlushASAPNotificationQueue()
{ {
WMNotificationQueue *queue = notificationQueueList; WMNotificationQueue *queue = notificationQueueList;
@@ -525,9 +456,7 @@ W_FlushASAPNotificationQueue()
} }
} }
void W_FlushIdleNotificationQueue()
void
W_FlushIdleNotificationQueue()
{ {
WMNotificationQueue *queue = notificationQueueList; WMNotificationQueue *queue = notificationQueueList;
@@ -540,4 +469,3 @@ W_FlushIdleNotificationQueue()
queue = queue->next; queue = queue->next;
} }
} }

3
WINGs/po/.cvsignore
View File

@@ -1,3 +0,0 @@
Makefile Makefile.in
.psrc .inslog2 tca.map tca.log
*.rpt

23
WINGs/po/Makefile.am
View File

@@ -4,41 +4,34 @@ CATALOGS = @WINGSMOFILES@
CLEANFILES = $(CATALOGS) WINGs.pot CLEANFILES = $(CATALOGS) WINGs.pot
EXTRA_DIST = sk.po EXTRA_DIST = bg.po ca.po cs.po de.po fr.po sk.po
POTFILES = \ POTFILES = \
$(top_builddir)/WINGs/configuration.c \
$(top_builddir)/WINGs/connection.c \ $(top_builddir)/WINGs/connection.c \
$(top_builddir)/WINGs/dragdestination.c \
$(top_builddir)/WINGs/dragsource.c \
$(top_builddir)/WINGs/error.c \ $(top_builddir)/WINGs/error.c \
$(top_builddir)/WINGs/findfile.c \ $(top_builddir)/WINGs/findfile.c \
$(top_builddir)/WINGs/hashtable.c \
$(top_builddir)/WINGs/host.c \ $(top_builddir)/WINGs/host.c \
$(top_builddir)/WINGs/international.c \ $(top_builddir)/WINGs/proplist.c \
$(top_builddir)/WINGs/memory.c \ $(top_builddir)/WINGs/userdefaults.c \
$(top_builddir)/WINGs/wcolor.c \ $(top_builddir)/WINGs/wcolor.c \
$(top_builddir)/WINGs/wcolorpanel.c \ $(top_builddir)/WINGs/wcolorpanel.c \
$(top_builddir)/WINGs/wfilepanel.c \ $(top_builddir)/WINGs/wfilepanel.c \
$(top_builddir)/WINGs/wfont.c \ $(top_builddir)/WINGs/wfont.c \
$(top_builddir)/WINGs/wfontpanel.c \ $(top_builddir)/WINGs/wfontpanel.c \
$(top_builddir)/WINGs/widgets.c \ $(top_builddir)/WINGs/widgets.c \
$(top_builddir)/WINGs/wruler.c \ $(top_builddir)/WINGs/wruler.c
$(top_builddir)/WINGs/wtext.c \
$(top_builddir)/WINGs/wview.c \
$(top_builddir)/WINGs/wtextfield.c \
$(top_builddir)/WINGs/wwindow.c
SUFFIXES = .po .mo SUFFIXES = .po .mo
.po.mo: .po.mo:
msgfmt -o $@ $< msgfmt -c -o $@ $<
all-local: $(CATALOGS)
WINGs.pot: $(POTFILES) WINGs.pot: $(POTFILES)
xgettext --default-domain=WINGs \ xgettext --default-domain=WINGs \
--add-comments --keyword=_ $(POTFILES) --add-comments --keyword=_ --keyword=N_ $(POTFILES)
if cmp -s WINGs.po WINGs.pot; then \ if cmp -s WINGs.po WINGs.pot; then \
rm -f WINGs.po; \ rm -f WINGs.po; \
else \ else \

17
WINGs/po/README
View File

@@ -2,7 +2,18 @@
Instructions for translating po files can be found in the po/README directory Instructions for translating po files can be found in the po/README directory
in the top of the WindowMaker source tree. in the top of the WindowMaker source tree.
File Language Current Maintainer All files are in UTF-8
------------------------------------------------------------------------------
sk.po Slovak Jan "judas" Tomka <tomka@oalevice.sk> File Language Note Current Maintainer
------------------------------------------------------------------------------
ca.po Catalan Ernest Adrogué <eadrogue@gmx.net>
cs.po Czech Jiri Hnidek <Jiri.Hnidek@vslib.cz
de.po German Guido Scholz <guido.scholz@bayernline.de>
fr.po French Emmanuel Benoit <tseeker@neptune.fr>
Antoine Hulin <antoine@origan.fdn.org>
sk.po Slovak Jan 'judas' Tomka <judas@linux.sk>
bg.po Bulgarian Anton Zinoviev <zinoviev@debian.org>
Notes
-----

660
WINGs/po/bg.po Normal file
View File

@@ -0,0 +1,660 @@
# Message catalog for WINGs
# Copyright (C) 2003 Free Software Foundation, Inc.
# Anton Zinoviev <zinoviev@debian.org>, 2003
#
msgid ""
msgstr ""
"Project-Id-Version: WINGs 0.80.0\n"
"POT-Creation-Date: 2003-02-08 21:42+0200\n"
"PO-Revision-Date: 2003-02-09 12:10+0200\n"
"Last-Translator: Anton Zinoviev <zinoviev@debian.org>\n"
"Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: ../../WINGs/connection.c:461 ../../WINGs/connection.c:526
#: ../../WINGs/connection.c:569
msgid "Bad address-service-protocol combination"
msgstr "Неправилна комбинация адрес-услуга-протокол"
#: ../../WINGs/error.c:54
#, c-format
msgid "Unknown error %d"
msgstr "Непозната грешка %d"
#: ../../WINGs/error.c:59
#, c-format
msgid "Error %d"
msgstr "Грешка %d"
#: ../../WINGs/error.c:110
msgid " warning: "
msgstr "внимание: "
#: ../../WINGs/error.c:137
msgid " fatal error: "
msgstr " критична грешка: "
#: ../../WINGs/error.c:163 ../../WINGs/error.c:192
msgid " error: "
msgstr " грешка: "
#: ../../WINGs/findfile.c:48
#, c-format
msgid "could not get password entry for UID %i"
msgstr "не може да се получи записът за парола на потребител с номер %i"
#: ../../WINGs/findfile.c:66
#, c-format
msgid "could not get password entry for user %s"
msgstr "не може да се получи записът за парола на потребител %s<"
#: ../../WINGs/host.c:114
msgid "Cannot get current host name"
msgstr "Не може да се получи името на хоста"
#: ../../WINGs/proplist.c:91
#, c-format
msgid "syntax error in %s %s, line %i: %s"
msgstr "синтактична грешка в %s %s, ред %i: %s"
#: ../../WINGs/proplist.c:150
msgid "Only string or data is supported for a proplist dictionary key"
msgstr "Като ключ за достъп до proplist се поддържат само низове или данни"
#: ../../WINGs/proplist.c:184 ../../WINGs/proplist.c:236
#: ../../WINGs/proplist.c:394 ../../WINGs/proplist.c:474
#: ../../WINGs/proplist.c:1075 ../../WINGs/proplist.c:1127
#: ../../WINGs/proplist.c:1293 ../../WINGs/proplist.c:1372
#: ../../WINGs/proplist.c:1493 ../../WINGs/proplist.c:1540
msgid "Used proplist functions on non-WMPropLists objects"
msgstr "Ползват се proplist-функции за обекти, които не са от тип WMPropLists"
#: ../../WINGs/proplist.c:630
msgid "unterminated PropList string"
msgstr "незавършен низ PropList"
#: ../../WINGs/proplist.c:670
msgid "unterminated PropList data"
msgstr "незавършени данни PropList"
#: ../../WINGs/proplist.c:678
msgid "unterminated PropList data (missing hexdigit)"
msgstr "незавършени данни PropList (липсва шестнадесетично число)"
#: ../../WINGs/proplist.c:690 ../../WINGs/proplist.c:695
msgid "non hexdigit character in PropList data"
msgstr "знак, който не е шестнадесетично число, в данни PropList"
#: ../../WINGs/proplist.c:729
msgid "unterminated PropList array"
msgstr "незавършен масив PropList"
#: ../../WINGs/proplist.c:737
msgid "missing or unterminated PropList array"
msgstr "липсващ или незавършен масив Proplist"
#: ../../WINGs/proplist.c:747
msgid "could not get PropList array element"
msgstr "не може да се получи елемент от масив PropList"
#: ../../WINGs/proplist.c:776
msgid "unterminated PropList dictionary"
msgstr "незавършен речник PropList"
#: ../../WINGs/proplist.c:793
msgid "missing PropList dictionary key"
msgstr "липсващ ключ за достъп до PropList"
#: ../../WINGs/proplist.c:795
msgid "missing PropList dictionary entry key or unterminated dictionary"
msgstr "липсващ ключ за достъп до PropList или незавършен речник"
#: ../../WINGs/proplist.c:803
msgid "error parsing PropList dictionary key"
msgstr "грешка при разбор на ключ в PropList"
#: ../../WINGs/proplist.c:811
msgid "missing = in PropList dictionary entry"
msgstr "липсва знак за равенство в елемент на PropList"
#: ../../WINGs/proplist.c:819
msgid "error parsing PropList dictionary entry value"
msgstr "грешка при разбор на стойност на елемент в PropList"
#: ../../WINGs/proplist.c:827
msgid "missing ; in PropList dictionary entry"
msgstr "липсва знак точка и запетая в елемент на PropList"
#: ../../WINGs/proplist.c:888
msgid ""
"was expecting a string, data, array or dictionary. If it's a string, try "
"enclosing it with \"."
msgstr "очакваха се низ, данни, масив или речник. Ако е речник, пробвайте да го оградите с \"."
#: ../../WINGs/proplist.c:892
msgid "Comments are not allowed inside WindowMaker owned domain files."
msgstr "Не се позволяват коментари във файлове с области, собственост на Уиндоу Мейкър"
#: ../../WINGs/proplist.c:1563 ../../WINGs/proplist.c:1628
msgid "extra data after end of property list"
msgstr "данни в повече след края на списък свойства"
#: ../../WINGs/proplist.c:1606
#, c-format
msgid "could not get size for file '%s'"
msgstr "не може да се получи размерът за файл \"%s\""
#: ../../WINGs/proplist.c:1618
#, c-format
msgid "error reading from file '%s'"
msgstr "грешка при четене от файл \"%s\""
#: ../../WINGs/proplist.c:1669
#, c-format
msgid "mkstemp (%s) failed"
msgstr "mkstemp (%s) не успя"
#: ../../WINGs/proplist.c:1680
#, c-format
msgid "mktemp (%s) failed"
msgstr "mktemp (%s) не успя"
#: ../../WINGs/proplist.c:1691
#, c-format
msgid "open (%s) failed"
msgstr "open (%s) не успя"
#: ../../WINGs/proplist.c:1698
#, c-format
msgid "writing to file: %s failed"
msgstr "записът във файл %s не успя"
#: ../../WINGs/proplist.c:1706
#, c-format
msgid "fclose (%s) failed"
msgstr "fclose (%s) не успя"
#: ../../WINGs/proplist.c:1715
#, c-format
msgid "rename ('%s' to '%s') failed"
msgstr "преименуването (от \"%s\" на \"%s\") не успя"
#. something happened with the file. just overwrite it
#: ../../WINGs/userdefaults.c:192 ../../WINGs/userdefaults.c:208
#, c-format
msgid "cannot read domain from file '%s' when syncing"
msgstr "не може да се прочете областта от файл \"%s\" при синхронизиране"
#: ../../WINGs/wcolor.c:198 ../../WINGs/wcolor.c:211 ../../WINGs/wcolor.c:250
#: ../../WINGs/wcolor.c:291
#, c-format
msgid "could not allocate %s color"
msgstr "не може да се задели цвят %s"
#: ../../WINGs/wcolor.c:198
msgid "white"
msgstr "бял"
#: ../../WINGs/wcolor.c:211
msgid "black"
msgstr "черен"
#: ../../WINGs/wcolor.c:250
msgid "gray"
msgstr "сив"
#: ../../WINGs/wcolor.c:291
msgid "dark gray"
msgstr "тъмносив"
#: ../../WINGs/wcolorpanel.c:415
msgid "Colors"
msgstr "Цветове"
#: ../../WINGs/wcolorpanel.c:605 ../../WINGs/wcolorpanel.c:2824
msgid "Brightness"
msgstr "Яркост"
#: ../../WINGs/wcolorpanel.c:607 ../../WINGs/wcolorpanel.c:683
#: ../../WINGs/wcolorpanel.c:716 ../../WINGs/wcolorpanel.c:750
#: ../../WINGs/wcolorpanel.c:810 ../../WINGs/wcolorpanel.c:844
#: ../../WINGs/wcolorpanel.c:878 ../../WINGs/wcolorpanel.c:913
#: ../../WINGs/wcolorpanel.c:2164 ../../WINGs/wcolorpanel.c:2826
#: ../../WINGs/wcolorpanel.c:2862 ../../WINGs/wcolorpanel.c:2898
#: ../../WINGs/wcolorpanel.c:3746
msgid "Color Panel: Could not allocate memory"
msgstr "Color Panel: не може да се задели памет"
#: ../../WINGs/wcolorpanel.c:680 ../../WINGs/wcolorpanel.c:681
msgid "Red"
msgstr "Червен"
#: ../../WINGs/wcolorpanel.c:713 ../../WINGs/wcolorpanel.c:714
msgid "Green"
msgstr "Зелен"
#: ../../WINGs/wcolorpanel.c:747 ../../WINGs/wcolorpanel.c:748
msgid "Blue"
msgstr "Син"
#: ../../WINGs/wcolorpanel.c:807 ../../WINGs/wcolorpanel.c:808
msgid "Cyan"
msgstr "Синьозелен"
#: ../../WINGs/wcolorpanel.c:841 ../../WINGs/wcolorpanel.c:842
msgid "Magenta"
msgstr "Пурпурен"
#: ../../WINGs/wcolorpanel.c:875 ../../WINGs/wcolorpanel.c:876
msgid "Yellow"
msgstr "Жълт"
#: ../../WINGs/wcolorpanel.c:910 ../../WINGs/wcolorpanel.c:911
msgid "Black"
msgstr "Черен"
#: ../../WINGs/wcolorpanel.c:991
msgid "Spectrum"
msgstr "Спектър"
#: ../../WINGs/wcolorpanel.c:1021
msgid "Palette"
msgstr "Палитра"
#: ../../WINGs/wcolorpanel.c:1027
msgid "New from File..."
msgstr "Нова от файл..."
#: ../../WINGs/wcolorpanel.c:1028 ../../WINGs/wcolorpanel.c:1076
#: ../../WINGs/wcolorpanel.c:1093
msgid "Rename..."
msgstr "Преименувай..."
#: ../../WINGs/wcolorpanel.c:1029 ../../WINGs/wcolorpanel.c:1077
#: ../../WINGs/wcolorpanel.c:1094 ../../WINGs/wcolorpanel.c:3321
msgid "Remove"
msgstr "Премахни"
#: ../../WINGs/wcolorpanel.c:1030
msgid "Copy"
msgstr "Копирай"
#: ../../WINGs/wcolorpanel.c:1031
#, fuzzy
msgid "New from Clipboard"
msgstr "Нова от Clipboard"
#: ../../WINGs/wcolorpanel.c:1052
msgid "X11-Colors"
msgstr "Цветове от X11"
#: ../../WINGs/wcolorpanel.c:1069
msgid "Color"
msgstr "Цвят"
#: ../../WINGs/wcolorpanel.c:1075
msgid "Add..."
msgstr "Добави..."
#: ../../WINGs/wcolorpanel.c:1085
msgid "List"
msgstr "Списък"
#: ../../WINGs/wcolorpanel.c:1092
msgid "New..."
msgstr "Нов..."
#: ../../WINGs/wcolorpanel.c:1231
#, c-format
msgid ""
"Color Panel: Could not create directory %s needed to store configurations"
msgstr "Color Panel: Не може да се създаде директория %s, необходима за да се запазят настройките"
#. Delete the file, it doesn't belong here
#: ../../WINGs/wcolorpanel.c:1237 ../../WINGs/wcolorpanel.c:3207
#: ../../WINGs/wcolorpanel.c:3211
msgid "File Error"
msgstr "Файлова грешка"
#: ../../WINGs/wcolorpanel.c:1238
msgid "Could not create ColorPanel configuration directory"
msgstr "Не може да се създаде конфигурационна директория за ColorPanel"
#: ../../WINGs/wcolorpanel.c:1239 ../../WINGs/wcolorpanel.c:3208
#: ../../WINGs/wcolorpanel.c:3213 ../../WINGs/wcolorpanel.c:3240
#: ../../WINGs/wfilepanel.c:250 ../../WINGs/wfilepanel.c:647
#: ../../WINGs/wfilepanel.c:659 ../../WINGs/wfilepanel.c:760
#: ../../WINGs/wfilepanel.c:971 ../../WINGs/wfontpanel.c:709
msgid "OK"
msgstr "Приемам"
#: ../../WINGs/wcolorpanel.c:1245 ../../WINGs/wcolorpanel.c:1281
#: ../../WINGs/wcolorpanel.c:1299
msgid "Color Panel: Could not find file"
msgstr "Color Panel: Не може да се открие файла"
#: ../../WINGs/wcolorpanel.c:1486 ../../WINGs/wcolorpanel.c:1551
#: ../../WINGs/wcolorpanel.c:1615
msgid "Color Panel: X failed request"
msgstr "Color Panel: не успя заявка към X"
#: ../../WINGs/wcolorpanel.c:2860
msgid "Saturation"
msgstr "Наситеност"
#: ../../WINGs/wcolorpanel.c:2896
msgid "Hue"
msgstr "Нюанс"
#: ../../WINGs/wcolorpanel.c:3146
msgid "Open Palette"
msgstr "Отваряне на палитра"
#: ../../WINGs/wcolorpanel.c:3208
msgid "Invalid file format !"
msgstr "Неправилен файлов формат!"
#: ../../WINGs/wcolorpanel.c:3210
#, c-format
msgid "can't remove file %s"
msgstr "не може да се изтрие файлът %s"
#: ../../WINGs/wcolorpanel.c:3212
msgid "Couldn't remove file from Configuration Directory !"
msgstr "Не може да се изтрие файл от директорията за настройки!"
#: ../../WINGs/wcolorpanel.c:3239
msgid "Rename"
msgstr "Преименуване"
#: ../../WINGs/wcolorpanel.c:3239
msgid "Rename palette to:"
msgstr "Преименувай палитрата на "
#: ../../WINGs/wcolorpanel.c:3240 ../../WINGs/wfilepanel.c:259
#: ../../WINGs/wfilepanel.c:659 ../../WINGs/wfilepanel.c:760
msgid "Cancel"
msgstr "Отменям"
#. Careful, this palette exists already
#: ../../WINGs/wcolorpanel.c:3256 ../../WINGs/wfilepanel.c:760
msgid "Warning"
msgstr "Внимание"
#: ../../WINGs/wcolorpanel.c:3257
msgid ""
"Palette already exists !\n"
"\n"
"Overwrite ?"
msgstr ""
"Такава палитра вече съществува!\n"
"\n"
"Да бъде ли заменена с новата?"
#: ../../WINGs/wcolorpanel.c:3257 ../../WINGs/wcolorpanel.c:3321
msgid "No"
msgstr "Не"
#: ../../WINGs/wcolorpanel.c:3257 ../../WINGs/wcolorpanel.c:3321
msgid "Yes"
msgstr "Да"
#: ../../WINGs/wcolorpanel.c:3289
#, c-format
msgid "Couldn't rename palette %s to %s\n"
msgstr "Палитрата %s не може да се преименува на %s\n"
#: ../../WINGs/wcolorpanel.c:3315
msgid "This will permanently remove the palette "
msgstr "Това ще отстрани палитрата необратимо "
#: ../../WINGs/wcolorpanel.c:3318
msgid ""
".\n"
"\n"
"Are you sure you want to remove this palette ?"
msgstr ""
".\n"
"\n"
"Убедени ли сте, че искате да отстраните тази палитра?"
#: ../../WINGs/wcolorpanel.c:3343
#, c-format
msgid "Couldn't remove palette %s\n"
msgstr "Палитрата %s не може да бъде отстранена\n"
#: ../../WINGs/wcolorpanel.c:3648
#, c-format
msgid "Could not open %s"
msgstr "Не може да бъде отворен %s"
#: ../../WINGs/wcolorpanel.c:3655
#, c-format
msgid "Could not create %s"
msgstr "Не може да бъде създаден %s"
#: ../../WINGs/wcolorpanel.c:3666
#, c-format
msgid "Write error on file %s"
msgstr "Грешка при запис във файл %s"
#: ../../WINGs/wcolorpanel.c:3711
msgid "Color Panel: Color unspecified"
msgstr "Color Panel: Не е посочен цвят"
#: ../../WINGs/wfilepanel.c:235
msgid "Name:"
msgstr "Име:"
#: ../../WINGs/wfilepanel.c:332 ../../WINGs/wfilepanel.c:396
msgid "Open"
msgstr "Отвори"
#: ../../WINGs/wfilepanel.c:350 ../../WINGs/wfilepanel.c:402
msgid "Save"
msgstr "Запази"
#: ../../WINGs/wfilepanel.c:562
#, c-format
msgid "WINGs: could not open directory %s\n"
msgstr "WINGs: директорията %s не може да се отвори\n"
#: ../../WINGs/wfilepanel.c:580
#, c-format
msgid "WINGs: could not stat %s\n"
msgstr "WINGs: не могат да се получат атрибутите (stat) за %s\n"
#: ../../WINGs/wfilepanel.c:647 ../../WINGs/wfilepanel.c:970
#: ../../WINGs/wfontpanel.c:708
msgid "Error"
msgstr "Грешка"
#: ../../WINGs/wfilepanel.c:658
msgid "Create Directory"
msgstr "Създаване на директория"
#: ../../WINGs/wfilepanel.c:659
msgid "Enter directory name"
msgstr "Въведете името на директорията"
#: ../../WINGs/wfilepanel.c:695 ../../WINGs/wfilepanel.c:734
#: ../../WINGs/wfilepanel.c:765 ../../WINGs/wfilepanel.c:793
msgid "Permission denied."
msgstr "Отказан достъп"
#: ../../WINGs/wfilepanel.c:698
#, c-format
msgid "'%s' already exists."
msgstr "вече съществува \"%s\"."
#: ../../WINGs/wfilepanel.c:701
msgid "Path does not exist."
msgstr "Пътят не съществува."
#: ../../WINGs/wfilepanel.c:731 ../../WINGs/wfilepanel.c:790
#, c-format
msgid "'%s' does not exist."
msgstr "Не съществува \"%s\"."
#: ../../WINGs/wfilepanel.c:738 ../../WINGs/wfilepanel.c:797
msgid "Insufficient memory available."
msgstr "Не е достъпна достатъчно памет."
#: ../../WINGs/wfilepanel.c:742 ../../WINGs/wfilepanel.c:801
#, c-format
msgid "'%s' is on a read-only filesystem."
msgstr "\"%s\" се намира във файлова система с достъп само за четене."
#: ../../WINGs/wfilepanel.c:745 ../../WINGs/wfilepanel.c:777
#: ../../WINGs/wfilepanel.c:804
#, c-format
msgid "Can not delete '%s'."
msgstr "\"%s\" не може да бъде изтрит."
#: ../../WINGs/wfilepanel.c:752
#, c-format
msgid "Delete directory %s ?"
msgstr "Да се изтрие ли директорията %s?"
#: ../../WINGs/wfilepanel.c:756
#, c-format
msgid "Delete file %s ?"
msgstr "Да се изтрие ли файлът %s?"
#: ../../WINGs/wfilepanel.c:768
#, c-format
msgid "Directory '%s' does not exist."
msgstr "Директорията \"%s\" не съществува."
#: ../../WINGs/wfilepanel.c:771
#, c-format
msgid "Directory '%s' is not empty."
msgstr "Директорията \"%s\" не е празна."
#: ../../WINGs/wfilepanel.c:774
#, c-format
msgid "Directory '%s' is busy."
msgstr "Директорията \"%s е заета."
#: ../../WINGs/wfilepanel.c:787
#, c-format
msgid "'%s' is a directory."
msgstr "\"%s\" е директория."
#: ../../WINGs/wfilepanel.c:829
#, c-format
msgid "An error occured browsing '%s'."
msgstr "Настъпи грешка при показване на \"%s\"."
#: ../../WINGs/wfilepanel.c:833
#, c-format
msgid "'%s' is not a directory."
msgstr "\"%s\" не е директория."
#: ../../WINGs/wfilepanel.c:970
msgid "File does not exist."
msgstr "Файлът не съществува."
#: ../../WINGs/wfont.c:129
#, c-format
msgid "the following character sets are missing in %s:"
msgstr "в %s липсват следните кодирания:"
#: ../../WINGs/wfont.c:136
#, c-format
msgid ""
"the string \"%s\" will be used in place of any characters from those sets."
msgstr "Вместо кой да е символ от тези кодирания ще се използва низът \"%s\"."
#: ../../WINGs/wfont.c:300 ../../WINGs/wfont.c:336
#, c-format
msgid "could not load font set %s. Trying fixed."
msgstr "не може да се зареди шрифтова комбинация %s. Опит за шрифт fixed."
#: ../../WINGs/wfont.c:306 ../../WINGs/wfont.c:342
#, c-format
msgid "could not load font %s. Trying fixed."
msgstr "не може да се зареди шрифт %s. Опит за шрифт fixed."
#: ../../WINGs/wfont.c:310 ../../WINGs/wfont.c:346
msgid "could not load fixed font!"
msgstr "не може да се зареди шрифтът fixed!"
#: ../../WINGs/wfont.c:441
#, c-format
msgid "font description %s is too large."
msgstr "шрифтовото описание %s е твърде дълго."
#: ../../WINGs/wfontpanel.c:205
msgid "Test!!!"
msgstr "Проба!!! Test!!!"
#: ../../WINGs/wfontpanel.c:211
msgid "Family"
msgstr "Гарнитура"
#: ../../WINGs/wfontpanel.c:222
msgid "Typeface"
msgstr "Стил"
#: ../../WINGs/wfontpanel.c:233
msgid "Size"
msgstr "Размер"
#: ../../WINGs/wfontpanel.c:252
msgid "Set"
msgstr "Установи"
#: ../../WINGs/wfontpanel.c:257
msgid "Revert"
msgstr "Предишното"
#: ../../WINGs/wfontpanel.c:709
msgid "Could not retrieve font list"
msgstr "Не може да се получи списъка от шрифтове"
#: ../../WINGs/wfontpanel.c:721
#, c-format
msgid "font name %s is longer than 256, which is invalid."
msgstr "името на шрифта %s е по-дълго от 256 символа, което е недопустимо."
#: ../../WINGs/wfontpanel.c:868
msgid "Roman"
msgstr "Изправен"
#: ../../WINGs/wfontpanel.c:871
msgid "Italic"
msgstr "Курсив"
#: ../../WINGs/wfontpanel.c:873
msgid "Oblique"
msgstr "Наклонен"
#: ../../WINGs/wfontpanel.c:875
msgid "Rev Italic"
msgstr "Обратен курсив"
#: ../../WINGs/wfontpanel.c:877
msgid "Rev Oblique"
msgstr "Обратно наклонен"
#: ../../WINGs/wfontpanel.c:883
msgid "Normal"
msgstr "Нормален"
#: ../../WINGs/widgets.c:415
#, c-format
msgid "WINGs: could not load widget images file: %s"
msgstr "WINGs: не може да се зареди изображението %s на библиотеката."
#: ../../WINGs/widgets.c:763
msgid ""
"could not load any fonts. Make sure your font installation and locale "
"settings are correct."
msgstr "не може да се зареди никакъв шрифт. Убедете се, че имате правилно инсталирани шрифтове и посочен езиков локал."
#: ../../WINGs/wruler.c:189
msgid "0 inches"
msgstr "0 цола"

736
WINGs/po/ca.po Normal file
View File

@@ -0,0 +1,736 @@
# Catalan messages for WINGs.
# Copyright (C) 2003 Ernest Adrogué <eadrogue@gmx.net>.
# This file is distributed under the terms of the GNU General Public License.
#
# Version history:
# WM-ver author email date
# 0.80.2 Ernest Adrogué eadrogue@gmx.net 23 Feb 2003
# CVS-20030914 Ernest Adrogué eadrogue@gmx.net 15 Set 2003
#
msgid ""
msgstr ""
"Project-Id-Version: WINGs 0.80.2\n"
"POT-Creation-Date: 2003-09-16 22:59+0200\n"
"PO-Revision-Date: 2003-09-16 23:16+0200\n"
"Last-Translator: Ernest Adrogué <eadrogue@gmx.net>\n"
"Language-Team: Catalan <ca@dodds.net>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: ../../WINGs/connection.c:467 ../../WINGs/connection.c:532
#: ../../WINGs/connection.c:575
msgid "Bad address-service-protocol combination"
msgstr "Combinació adreça-servei-protocol incorrecta"
#: ../../WINGs/error.c:54
#, c-format
msgid "Unknown error %d"
msgstr "Error no identificat %d"
#: ../../WINGs/error.c:59
#, c-format
msgid "Error %d"
msgstr "Error %d"
#: ../../WINGs/error.c:110
msgid " warning: "
msgstr ": atenció: "
#: ../../WINGs/error.c:137
msgid " fatal error: "
msgstr ": error fatal: "
#: ../../WINGs/error.c:163 ../../WINGs/error.c:192
msgid " error: "
msgstr ": error: "
#: ../../WINGs/findfile.c:48
#, c-format
msgid "could not get password entry for UID %i"
msgstr "no s'ha pogut obtenir l'informació de compte de l'UID %i"
#: ../../WINGs/findfile.c:66
#, c-format
msgid "could not get password entry for user %s"
msgstr "no s'ha pogut obtenir l'informació de compte de l'usuari %s"
#: ../../WINGs/host.c:114
msgid "Cannot get current host name"
msgstr "No s'ha pogut obtenir el nom de host actual"
# falten coses per traduïr en el codi font. eac
#: ../../WINGs/proplist.c:91
#, c-format
msgid "syntax error in %s %s, line %i: %s"
msgstr "error de sintaxi a %s %s, línia %i: %s"
#: ../../WINGs/proplist.c:150
msgid "Only string or data is supported for a proplist dictionary key"
msgstr ""
"Una entrada PropList de diccionari només pot contenir dades o una cadena"
#: ../../WINGs/proplist.c:184 ../../WINGs/proplist.c:236
#: ../../WINGs/proplist.c:394 ../../WINGs/proplist.c:474
#: ../../WINGs/proplist.c:1075 ../../WINGs/proplist.c:1127
#: ../../WINGs/proplist.c:1293 ../../WINGs/proplist.c:1372
#: ../../WINGs/proplist.c:1493 ../../WINGs/proplist.c:1540
msgid "Used proplist functions on non-WMPropLists objects"
msgstr "S'han usat funcions PropList en objectes no-WMPropLists"
#: ../../WINGs/proplist.c:630
msgid "unterminated PropList string"
msgstr "cadena PropList incompleta"
#: ../../WINGs/proplist.c:670
msgid "unterminated PropList data"
msgstr "dades PropList incompletes"
#: ../../WINGs/proplist.c:678
msgid "unterminated PropList data (missing hexdigit)"
msgstr "Dades PropList incompletes (falta un digit hexadecimal)"
#: ../../WINGs/proplist.c:690 ../../WINGs/proplist.c:695
msgid "non hexdigit character in PropList data"
msgstr "cap digit hexadecimal a les dades PropList"
#: ../../WINGs/proplist.c:729
msgid "unterminated PropList array"
msgstr "matriu PropList incompleta"
#: ../../WINGs/proplist.c:737
msgid "missing or unterminated PropList array"
msgstr "matriu PropList incompleta o inexistent"
#: ../../WINGs/proplist.c:747
msgid "could not get PropList array element"
msgstr "no s'ha pogut obtenir un element de la matriu PropList"
#: ../../WINGs/proplist.c:776
msgid "unterminated PropList dictionary"
msgstr "diccionari PropList incomplet"
#: ../../WINGs/proplist.c:793
msgid "missing PropList dictionary key"
msgstr "falta una entrada PropList de diccionari"
#: ../../WINGs/proplist.c:795
msgid "missing PropList dictionary entry key or unterminated dictionary"
msgstr "falta una entrada PropList de diccionari o bé està incompleta"
#: ../../WINGs/proplist.c:803
msgid "error parsing PropList dictionary key"
msgstr "error mentre s'analitzava l'entrada PropList de diccionari"
#: ../../WINGs/proplist.c:811
msgid "missing = in PropList dictionary entry"
msgstr "falta un \"=\" a l'entrada PropList de diccionari"
#: ../../WINGs/proplist.c:819
msgid "error parsing PropList dictionary entry value"
msgstr "error mentre s'analitzava el valor de l'entrada PropList de diccionari"
#: ../../WINGs/proplist.c:827
msgid "missing ; in PropList dictionary entry"
msgstr "falta un \";\" a l'entrada PropList de diccionari"
#: ../../WINGs/proplist.c:888
msgid ""
"was expecting a string, data, array or dictionary. If it's a string, try "
"enclosing it with \"."
msgstr ""
"s'esperava una cadena, dada, matriu o diccionari. Si es tractava d'una\n"
"cadena proveu d'escriure-la \"entre cometes\"."
#: ../../WINGs/proplist.c:892
msgid "Comments are not allowed inside WindowMaker owned domain files."
msgstr "No es permeten comentaris en els fitxers de domini de WindowMaker."
#: ../../WINGs/proplist.c:1563 ../../WINGs/proplist.c:1630
msgid "extra data after end of property list"
msgstr "sobren dades després de la llista de propietats"
#: ../../WINGs/proplist.c:1606
#, c-format
msgid "could not get size for file '%s'"
msgstr "no s'ha pogut obtenir la mida de \"%s\""
#: ../../WINGs/proplist.c:1619
#, c-format
msgid "error reading from file '%s'"
msgstr "error mentre es llegia el fitxer \"%s\""
#: ../../WINGs/proplist.c:1671
#, c-format
msgid "mkstemp (%s) failed"
msgstr "la rutina mkstemp (%s) ha fallat"
#: ../../WINGs/proplist.c:1682
#, c-format
msgid "mktemp (%s) failed"
msgstr "la rutina mktemp (%s) ha fallat"
#: ../../WINGs/proplist.c:1693
#, c-format
msgid "open (%s) failed"
msgstr "la rutina open (%s) ha fallat"
#: ../../WINGs/proplist.c:1700
#, c-format
msgid "writing to file: %s failed"
msgstr "l'escriptura del fitxer \"%s\" ha fallat"
#: ../../WINGs/proplist.c:1708
#, c-format
msgid "fclose (%s) failed"
msgstr "la rutina fclose (%s) ha fallat"
#: ../../WINGs/proplist.c:1717
#, c-format
msgid "rename ('%s' to '%s') failed"
msgstr "el canvi de nom (\"%s\" a \"%s\") ha fallat"
#. something happened with the file. just overwrite it
#: ../../WINGs/userdefaults.c:188 ../../WINGs/userdefaults.c:204
#, c-format
msgid "cannot read domain from file '%s' when syncing"
msgstr "no s'ha pogut llegir un domini del fitxer \"%s\" quan es sincronitzava"
#: ../../WINGs/wcolor.c:224 ../../WINGs/wcolor.c:236 ../../WINGs/wcolor.c:275
#: ../../WINGs/wcolor.c:316
#, c-format
msgid "could not allocate %s color"
msgstr "no s'ha pogut assignar espai pel color \"%s\""
#: ../../WINGs/wcolor.c:224
msgid "white"
msgstr "blanc"
#: ../../WINGs/wcolor.c:236
msgid "black"
msgstr "negre"
#: ../../WINGs/wcolor.c:275
msgid "gray"
msgstr "gris"
#: ../../WINGs/wcolor.c:316
msgid "dark gray"
msgstr "gris fosc"
#: ../../WINGs/wcolorpanel.c:420
msgid "Colors"
msgstr "Colors"
#: ../../WINGs/wcolorpanel.c:610 ../../WINGs/wcolorpanel.c:2829
msgid "Brightness"
msgstr "Claror"
#: ../../WINGs/wcolorpanel.c:612 ../../WINGs/wcolorpanel.c:688
#: ../../WINGs/wcolorpanel.c:721 ../../WINGs/wcolorpanel.c:755
#: ../../WINGs/wcolorpanel.c:815 ../../WINGs/wcolorpanel.c:849
#: ../../WINGs/wcolorpanel.c:883 ../../WINGs/wcolorpanel.c:918
#: ../../WINGs/wcolorpanel.c:2169 ../../WINGs/wcolorpanel.c:2831
#: ../../WINGs/wcolorpanel.c:2867 ../../WINGs/wcolorpanel.c:2903
#: ../../WINGs/wcolorpanel.c:3745
msgid "Color Panel: Could not allocate memory"
msgstr "Panell de color: No s'ha pogut assignar memòria"
#: ../../WINGs/wcolorpanel.c:685 ../../WINGs/wcolorpanel.c:686
msgid "Red"
msgstr "Roig"
#: ../../WINGs/wcolorpanel.c:718 ../../WINGs/wcolorpanel.c:719
msgid "Green"
msgstr "Verd"
#: ../../WINGs/wcolorpanel.c:752 ../../WINGs/wcolorpanel.c:753
msgid "Blue"
msgstr "Blau"
#: ../../WINGs/wcolorpanel.c:812 ../../WINGs/wcolorpanel.c:813
msgid "Cyan"
msgstr "Cian"
#: ../../WINGs/wcolorpanel.c:846 ../../WINGs/wcolorpanel.c:847
msgid "Magenta"
msgstr "Magenta"
#: ../../WINGs/wcolorpanel.c:880 ../../WINGs/wcolorpanel.c:881
msgid "Yellow"
msgstr "Groc"
#: ../../WINGs/wcolorpanel.c:915 ../../WINGs/wcolorpanel.c:916
msgid "Black"
msgstr "Negre"
#: ../../WINGs/wcolorpanel.c:996
msgid "Spectrum"
msgstr "Espectre"
#: ../../WINGs/wcolorpanel.c:1026
msgid "Palette"
msgstr "Paleta"
#: ../../WINGs/wcolorpanel.c:1032
msgid "New from File..."
msgstr "Obtenir d'un fitxer..."
#: ../../WINGs/wcolorpanel.c:1033 ../../WINGs/wcolorpanel.c:1081
#: ../../WINGs/wcolorpanel.c:1098
msgid "Rename..."
msgstr "Reanomenar..."
#: ../../WINGs/wcolorpanel.c:1034 ../../WINGs/wcolorpanel.c:1082
#: ../../WINGs/wcolorpanel.c:1099 ../../WINGs/wcolorpanel.c:3326
msgid "Remove"
msgstr "Eliminar"
#: ../../WINGs/wcolorpanel.c:1035
msgid "Copy"
msgstr "Copiar"
#: ../../WINGs/wcolorpanel.c:1036
msgid "New from Clipboard"
msgstr "Obtenir del porta-retalls..."
#: ../../WINGs/wcolorpanel.c:1057
msgid "X11-Colors"
msgstr "Colors-X11"
#: ../../WINGs/wcolorpanel.c:1074
msgid "Color"
msgstr "Color"
#: ../../WINGs/wcolorpanel.c:1080
msgid "Add..."
msgstr "Afegeix..."
#: ../../WINGs/wcolorpanel.c:1090
msgid "List"
msgstr "Llista"
#: ../../WINGs/wcolorpanel.c:1097
msgid "New..."
msgstr "Nou..."
#: ../../WINGs/wcolorpanel.c:1236
#, c-format
msgid ""
"Color Panel: Could not create directory %s needed to store configurations"
msgstr ""
"Panell de color: No s'ha pogut crear el directori \"%s\" necessari per desar "
"la configuració"
#. Delete the file, it doesn't belong here
#: ../../WINGs/wcolorpanel.c:1242 ../../WINGs/wcolorpanel.c:3212
#: ../../WINGs/wcolorpanel.c:3216
msgid "File Error"
msgstr "Error de fitxer"
#: ../../WINGs/wcolorpanel.c:1243
msgid "Could not create ColorPanel configuration directory"
msgstr "No s'ha pogut crear el directori de configuració del Panell de color"
#: ../../WINGs/wcolorpanel.c:1244 ../../WINGs/wcolorpanel.c:3213
#: ../../WINGs/wcolorpanel.c:3218 ../../WINGs/wcolorpanel.c:3245
#: ../../WINGs/wfilepanel.c:250 ../../WINGs/wfilepanel.c:650
#: ../../WINGs/wfilepanel.c:662 ../../WINGs/wfilepanel.c:763
#: ../../WINGs/wfilepanel.c:974 ../../WINGs/wfontpanel.c:751
msgid "OK"
msgstr "D'acord"
#: ../../WINGs/wcolorpanel.c:1250 ../../WINGs/wcolorpanel.c:1286
#: ../../WINGs/wcolorpanel.c:1304
msgid "Color Panel: Could not find file"
msgstr "Panell de color: No s'ha trobat el fitxer"
#: ../../WINGs/wcolorpanel.c:1491 ../../WINGs/wcolorpanel.c:1556
#: ../../WINGs/wcolorpanel.c:1620
msgid "Color Panel: X failed request"
msgstr "Panell de color: petició X fallida"
#: ../../WINGs/wcolorpanel.c:2865
msgid "Saturation"
msgstr "Saturació"
#: ../../WINGs/wcolorpanel.c:2901
msgid "Hue"
msgstr "Matís"
# és el títol d'un quadre de diàleg. eac
#: ../../WINGs/wcolorpanel.c:3151
msgid "Open Palette"
msgstr "Obrir paleta"
#: ../../WINGs/wcolorpanel.c:3213
msgid "Invalid file format !"
msgstr "El format del fitxer no és vàlid !"
#: ../../WINGs/wcolorpanel.c:3215
#, c-format
msgid "can't remove file %s"
msgstr "no s'ha pogut eliminar el fitxer \"%s\""
#: ../../WINGs/wcolorpanel.c:3217
msgid "Couldn't remove file from Configuration Directory !"
msgstr "No s'ha pogut eliminar el fitxer del directori de configuració !"
#: ../../WINGs/wcolorpanel.c:3244
msgid "Rename"
msgstr "Reanomena"
#: ../../WINGs/wcolorpanel.c:3244
msgid "Rename palette to:"
msgstr "Reanomena la paleta com a:"
#: ../../WINGs/wcolorpanel.c:3245 ../../WINGs/wfilepanel.c:259
#: ../../WINGs/wfilepanel.c:662 ../../WINGs/wfilepanel.c:763
msgid "Cancel"
msgstr "Cancel·la"
#. Careful, this palette exists already
#: ../../WINGs/wcolorpanel.c:3261 ../../WINGs/wfilepanel.c:763
msgid "Warning"
msgstr "Atenció"
#: ../../WINGs/wcolorpanel.c:3262
msgid ""
"Palette already exists !\n"
"\n"
"Overwrite ?"
msgstr ""
"Ja existia una paleta amb aquest nom!\n"
"\n"
"La voleu sobreescriure?"
#: ../../WINGs/wcolorpanel.c:3262 ../../WINGs/wcolorpanel.c:3326
msgid "No"
msgstr "No"
#: ../../WINGs/wcolorpanel.c:3262 ../../WINGs/wcolorpanel.c:3326
msgid "Yes"
msgstr "Sí"
#: ../../WINGs/wcolorpanel.c:3294
#, c-format
msgid "Couldn't rename palette %s to %s\n"
msgstr "No s'ha pogut reanomenar la paleta %s com a %s\n"
#: ../../WINGs/wcolorpanel.c:3320
msgid "This will permanently remove the palette "
msgstr "Això eliminarà la paleta per sempre "
#: ../../WINGs/wcolorpanel.c:3323
msgid ""
".\n"
"\n"
"Are you sure you want to remove this palette ?"
msgstr ""
".\n"
"\n"
"Esteu segurs que voleu eliminar aquesta paleta?"
#: ../../WINGs/wcolorpanel.c:3348
#, c-format
msgid "Couldn't remove palette %s\n"
msgstr "No s'ha pogut eliminar la paleta %s\n"
#: ../../WINGs/wcolorpanel.c:3647
#, c-format
msgid "Could not open %s"
msgstr "No s'ha pogut obrir %s"
#: ../../WINGs/wcolorpanel.c:3654
#, c-format
msgid "Could not create %s"
msgstr "No s'ha pogut crear %s"
#: ../../WINGs/wcolorpanel.c:3665
#, c-format
msgid "Write error on file %s"
msgstr "Error d'escriptura en el fitxer %s"
#: ../../WINGs/wcolorpanel.c:3710
msgid "Color Panel: Color unspecified"
msgstr "Panell de color: Color no especificat"
#: ../../WINGs/wfilepanel.c:235
msgid "Name:"
msgstr "Nom:"
#: ../../WINGs/wfilepanel.c:332 ../../WINGs/wfilepanel.c:396
msgid "Open"
msgstr "Obre"
#: ../../WINGs/wfilepanel.c:350 ../../WINGs/wfilepanel.c:402
msgid "Save"
msgstr "Desa"
#: ../../WINGs/wfilepanel.c:565
#, c-format
msgid "WINGs: could not open directory %s\n"
msgstr "WINGs: no s'ha pogut obrir el directori %s\n"
#: ../../WINGs/wfilepanel.c:583
#, c-format
msgid "WINGs: could not stat %s\n"
msgstr "WINGs: no s'ha pogut determinar l'estat de %s\n"
#: ../../WINGs/wfilepanel.c:650 ../../WINGs/wfilepanel.c:973
#: ../../WINGs/wfontpanel.c:750
msgid "Error"
msgstr "Error"
# és el nom d'un quadre de diàleg. eac
#: ../../WINGs/wfilepanel.c:661
msgid "Create Directory"
msgstr "Crear directori"
#: ../../WINGs/wfilepanel.c:662
msgid "Enter directory name"
msgstr "Entreu el nom del directori"
#: ../../WINGs/wfilepanel.c:698 ../../WINGs/wfilepanel.c:737
#: ../../WINGs/wfilepanel.c:768 ../../WINGs/wfilepanel.c:796
msgid "Permission denied."
msgstr "Permís denegat."
#: ../../WINGs/wfilepanel.c:701
#, c-format
msgid "'%s' already exists."
msgstr "\"%s\" existia prèviament."
#: ../../WINGs/wfilepanel.c:704
msgid "Path does not exist."
msgstr "L'ubicació no existeix."
#: ../../WINGs/wfilepanel.c:734 ../../WINGs/wfilepanel.c:793
#, c-format
msgid "'%s' does not exist."
msgstr "\"%s\" no existeix."
#: ../../WINGs/wfilepanel.c:741 ../../WINGs/wfilepanel.c:800
msgid "Insufficient memory available."
msgstr "No hi ha prou memòria disponible."
#: ../../WINGs/wfilepanel.c:745 ../../WINGs/wfilepanel.c:804
#, c-format
msgid "'%s' is on a read-only filesystem."
msgstr "\"%s\" es troba en un sistema de fitxers de només lectura."
#: ../../WINGs/wfilepanel.c:748 ../../WINGs/wfilepanel.c:780
#: ../../WINGs/wfilepanel.c:807
#, c-format
msgid "Can not delete '%s'."
msgstr "No s'ha pogut eliminar \"%s\"."
#: ../../WINGs/wfilepanel.c:755
#, c-format
msgid "Delete directory %s ?"
msgstr "Voleu eliminar el directori %s ?"
#: ../../WINGs/wfilepanel.c:759
#, c-format
msgid "Delete file %s ?"
msgstr "Voleu eliminar el fitxer %s ?"
#: ../../WINGs/wfilepanel.c:771
#, c-format
msgid "Directory '%s' does not exist."
msgstr "El directori \"%s\" no existeix."
#: ../../WINGs/wfilepanel.c:774
#, c-format
msgid "Directory '%s' is not empty."
msgstr "El directori \"%s\" no està buit."
#: ../../WINGs/wfilepanel.c:777
#, c-format
msgid "Directory '%s' is busy."
msgstr "El directori \"%s\" es troba ocupat."
#: ../../WINGs/wfilepanel.c:790
#, c-format
msgid "'%s' is a directory."
msgstr "\"%s\" és un directori."
#: ../../WINGs/wfilepanel.c:832
#, c-format
msgid "An error occured browsing '%s'."
msgstr "S'ha produït un error mentre s'explorava \"%s\"."
#: ../../WINGs/wfilepanel.c:836
#, c-format
msgid "'%s' is not a directory."
msgstr "\"%s\" no és un directori."
#: ../../WINGs/wfilepanel.c:973
msgid "File does not exist."
msgstr "El fitxer no existeix."
#: ../../WINGs/wfont.c:324 ../../WINGs/wfont.c:344
#, c-format
msgid "could not load font %s."
msgstr "no s'ha pogut carregar el tipus de lletra %s."
#: ../../WINGs/wfont.c:375 ../../WINGs/wfont.c:420 ../../WINGs/wfont.c:475
#: ../../WINGs/wfont.c:1337 ../../WINGs/wfont.c:1398 ../../WINGs/wfont.c:1469
#, c-format
msgid ""
"Conversion to widechar failed (possible invalid multibyte sequence): '%s':"
"(pos %d)\n"
msgstr ""
"Ha fallat la conversió a caràcter estès (possible seqüència no vàlida): '%"
"s': (pos %d)\n"
#. // remove warning later. or maybe not
#: ../../WINGs/wfont.c:591 ../../WINGs/wfont.c:1568
#, c-format
msgid "Invalid font specification: '%s'\n"
msgstr "Especificació de font no vàlida: \"%s\"\n"
#: ../../WINGs/wfont.c:770 ../../WINGs/wfont.c:780
#, c-format
msgid "Invalid size specification '%s' in %s. Using default %d\n"
msgstr ""
"La mida \"%s\" especificada a %s no és vàlida. S'usa el valor per omissió %"
"d\n"
#: ../../WINGs/wfont.c:824
#, c-format
msgid "the following character sets are missing in %s:"
msgstr "els següents conjunts de caràcters falten a %s:"
#: ../../WINGs/wfont.c:830
#, c-format
msgid ""
"the string \"%s\" will be used in place of any characters from those sets."
msgstr ""
"la cadena \"%s\" s'usarà en lloc dels caràcters d'aquests conjunts de "
"caràcters."
#. is arial a good fallback for multibyte?
#: ../../WINGs/wfont.c:1232 ../../WINGs/wfont.c:1247
#, c-format
msgid "could not load font %s. Trying arial."
msgstr "no s'ha pogut carregar el tipus de lletra %s. Provant amb \"arial\"."
#: ../../WINGs/wfont.c:1239
msgid "could not load antialiased font set. Reverting to standard font sets."
msgstr ""
"no s'ha pogut carregar el conjunt de fonts amb allisat. S'usarà l'estàndard."
#: ../../WINGs/wfont.c:1242
#, c-format
msgid "could not load FontSet %s. Trying fixed."
msgstr "no s'ha pogut carregar el tipus de lletra %s. Provant amb \"fixed\"."
#: ../../WINGs/wfont.c:1254
msgid "could not load antialiased fonts. Reverting to normal fonts."
msgstr "no s'han pogut carregar fonts allisades. S'usaran fonts normals."
#: ../../WINGs/wfont.c:1257 ../../WINGs/wfont.c:1268
#, c-format
msgid "could not load font %s. Trying fixed."
msgstr "no s'ha pogut carregar la font %s. Provant amb \"fixed\"."
#: ../../WINGs/wfont.c:1262
#, c-format
msgid "could not load font set %s. Trying fixed."
msgstr "no s'ha pogut carregar el conjunt de fonts %s. Provant amb \"fixed\"."
#: ../../WINGs/wfont.c:1272
msgid "could not load fixed font!"
msgstr "no s'ha pogut carregar el tipus de lletra \"fixed\" !"
#: ../../WINGs/wfont.c:1520
#, c-format
msgid "font description %s is too large."
msgstr "la descripció de tipus de lletra %s és massa gran."
#: ../../WINGs/wfontpanel.c:235
msgid "Test!!!"
msgstr "Prova!!!"
#: ../../WINGs/wfontpanel.c:241
msgid "Family"
msgstr "Familia"
#: ../../WINGs/wfontpanel.c:252
msgid "Typeface"
msgstr "Fosa"
#: ../../WINGs/wfontpanel.c:263
msgid "Size"
msgstr "Mida"
#: ../../WINGs/wfontpanel.c:282
msgid "Set"
msgstr "Conjunt"
#: ../../WINGs/wfontpanel.c:288
msgid "Revert"
msgstr "Torna"
#: ../../WINGs/wfontpanel.c:751
msgid "Could not retrieve font list"
msgstr "No s'ha pogut obtenir la llista de tipus de lletra"
#: ../../WINGs/wfontpanel.c:765
#, c-format
msgid "font name %s is longer than 256, which is invalid."
msgstr ""
"el nom de tipus de lletra %s ocupa més de 256 caràcters, per tant no és "
"vàlid."
#: ../../WINGs/wfontpanel.c:913
msgid "Roman"
msgstr "Romana"
#: ../../WINGs/wfontpanel.c:916
msgid "Italic"
msgstr "Itàlica"
#: ../../WINGs/wfontpanel.c:918
msgid "Oblique"
msgstr "Obliqua"
#: ../../WINGs/wfontpanel.c:920
msgid "Rev Italic"
msgstr "Itàlica inv"
#: ../../WINGs/wfontpanel.c:922
msgid "Rev Oblique"
msgstr "Obliqua inv"
#: ../../WINGs/wfontpanel.c:928
msgid "Normal"
msgstr "Normal"
#: ../../WINGs/widgets.c:419
#, c-format
msgid "WINGs: could not load widget images file: %s"
msgstr "WINGs: no s'ha pogut carregar el fitxer d'imatges: %s"
#: ../../WINGs/widgets.c:772
msgid ""
"could not load any fonts. Make sure your font installation and locale "
"settings are correct."
msgstr ""
"no s'ha pogut carregar cap font. Assegureu-vos que heu instal·lat i "
"configurat correctament les fonts i el local."
#: ../../WINGs/wruler.c:192
msgid "0 inches"
msgstr "0 polzades"
#~ msgid ""
#~ "Text antialiasing is enabled in the configuration but the X server "
#~ "doesn't have the required capabilities (missing RENDER extension). "
#~ "Disabling text antialiasing."
#~ msgstr ""
#~ "L'allisat de text està habilitat a la configuració però el servidor X no\n"
#~ "té la capacitat necessària (falta l'extensió RENDER) de manera que "
#~ "l'allisat\n"
#~ "de text es deshabilitarà."

663
WINGs/po/cs.po Normal file
View File

@@ -0,0 +1,663 @@
# Czech messages for WINGs
# (C) 2001 Jiří Hnídek
# Special thanks to Jan "judas" Tomka
#
# Original translation by Jiří Hnídek on Oct 11 2001
# Currently maintained by Jiří Hnídek <jiri.hnidek@vslib.cz>
#
msgid ""
msgstr ""
"Project-Id-Version: WINGs 0.70.0\n"
"POT-Creation-Date: 2001-10-11 19:10+0100\n"
"PO-Revision-Date: 2001-10-11 22:00+0100\n"
"Last-Translator: Jiří Hnídek <jiri.hnidek@vslib.cz>\n"
"Language-Team: Czech <cz@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: unknown\n"
#: ../../WINGs/connection.c:451 ../../WINGs/connection.c:516
#: ../../WINGs/connection.c:559
msgid "Bad address-service-protocol combination"
msgstr "Nesprávná kombinace adresa-služba-protokol"
#: ../../WINGs/dragsource.c:541
msgid "DND selection lost during drag operation..."
msgstr "DND výběr se ztratil během opere táhnutí..."
#: ../../WINGs/dragsource.c:610
#, c-format
msgid "drag & drop timed out while waiting for response from 0x%x\n"
msgstr "čas pro drag & drop vypršel během čekání na odpoveď z 0x%x\n"
#: ../../WINGs/dragsource.c:728
msgid "could not get ownership or DND selection"
msgstr "nemožné získat vlastnictví nebo DND výběr"
#: ../../WINGs/dragsource.c:898
#, c-format
msgid "drag source received unexpected XdndFinished message from %x"
msgstr "zdroj tahání přijal neočekávanou zprávu XdndFinished z %x"
#: ../../WINGs/dragsource.c:1040
#, c-format
msgid "unknown XDND action %s from 0x%x"
msgstr "neznámá XDND akce %s z 0x%x"
#: ../../WINGs/dragsource.c:1073
msgid "received invalid drag & drop type list"
msgstr "přijatý nesprávný seznam typů drag & drop"
#: ../../WINGs/dragsource.c:1161
msgid "received Enter event in bad order"
msgstr "přijatá událost Enter v nesprávném pořadí"
#: ../../WINGs/dragsource.c:1168
#, c-format
msgid "received drag & drop request with unsupported version %i"
msgstr "přijatý požadavek drag & drop s nepodporovanou verzí %i"
#: ../../WINGs/error.c:56
#, c-format
msgid "Unknown error %d"
msgstr "Neznámá chyba %d"
#: ../../WINGs/error.c:61
#, c-format
msgid "Error %d"
msgstr "Chyba %d"
#: ../../WINGs/error.c:112
msgid " warning: "
msgstr " varovíní: "
#: ../../WINGs/error.c:139
msgid " fatal error: "
msgstr " fatální chyba: "
#: ../../WINGs/error.c:165 ../../WINGs/error.c:194
msgid " error: "
msgstr " chyba: "
#: ../../WINGs/findfile.c:50
#, c-format
msgid "could not get password entry for UID %i"
msgstr "nemožné zjistit informaci o UID %i"
#: ../../WINGs/findfile.c:68
#, c-format
msgid "could not get password entry for user %s"
msgstr "nemožné zjistit informaci o uživatelovi %s"
#: ../../WINGs/hashtable.c:275
msgid "rebuilding hash table...\n"
msgstr "přepis tabulky hashovských funkcí...\n"
#: ../../WINGs/hashtable.c:279
msgid "finished rebuild.\n"
msgstr "konec přepisu.\n"
#: ../../WINGs/host.c:116
msgid "Cannot get current host name"
msgstr "Nemožné zjistit aktuální jméno počítače"
#: ../../WINGs/memory.c:94
msgid "malloc() failed. Retrying after 2s."
msgstr "chyba malloc(). Nový pokus o 2s."
#: ../../WINGs/memory.c:103
msgid "Really Bad Error: recursive malloc() failure."
msgstr "Skutečně ošklivá chyba: rekurzivní chyba malloc()."
#: ../../WINGs/memory.c:106 ../../WINGs/memory.c:146
msgid "virtual memory exhausted"
msgstr "virtuální paměť vyčerpaná"
#: ../../WINGs/memory.c:133
msgid "realloc() failed. Retrying after 2s."
msgstr "chyba realloc(). Nový pokus o 2s."
#: ../../WINGs/memory.c:142
msgid "Really Bad Error: recursive realloc() failure."
msgstr "Skutečně ošklivá chyba: rekurzivní chyba realloc()."
#: ../../WINGs/memory.c:205
#, c-format
msgid "trying to release unexisting data %p"
msgstr "pokus uvolnit neexistujícá data %p"
#: ../../WINGs/memory.c:210
#, c-format
msgid "RELEASING %p\n"
msgstr "UVOLNĚNÍ %p\n"
#: ../../WINGs/wcolor.c:198 ../../WINGs/wcolor.c:211 ../../WINGs/wcolor.c:250
#: ../../WINGs/wcolor.c:291
#, c-format
msgid "could not allocate %s color"
msgstr "nemožné alokovat %s barvu"
#: ../../WINGs/wcolor.c:198
msgid "white"
msgstr "bílou"
#: ../../WINGs/wcolor.c:211
msgid "black"
msgstr "černou"
#: ../../WINGs/wcolor.c:250
msgid "gray"
msgstr "šedou"
#: ../../WINGs/wcolor.c:291
msgid "dark gray"
msgstr "tmavě šedou"
#: ../../WINGs/wcolorpanel.c:410
msgid "Colors"
msgstr "Barvy"
#: ../../WINGs/wcolorpanel.c:600 ../../WINGs/wcolorpanel.c:2819
msgid "Brightness"
msgstr "Světlost"
#: ../../WINGs/wcolorpanel.c:602 ../../WINGs/wcolorpanel.c:678
#: ../../WINGs/wcolorpanel.c:711 ../../WINGs/wcolorpanel.c:745
#: ../../WINGs/wcolorpanel.c:805 ../../WINGs/wcolorpanel.c:839
#: ../../WINGs/wcolorpanel.c:873 ../../WINGs/wcolorpanel.c:908
#: ../../WINGs/wcolorpanel.c:2159 ../../WINGs/wcolorpanel.c:2821
#: ../../WINGs/wcolorpanel.c:2857 ../../WINGs/wcolorpanel.c:2893
#: ../../WINGs/wcolorpanel.c:3741
msgid "Color Panel: Could not allocate memory"
msgstr "Panel barev: Nemožné alokovat paměť"
#: ../../WINGs/wcolorpanel.c:675 ../../WINGs/wcolorpanel.c:676
msgid "Red"
msgstr "Červená"
#: ../../WINGs/wcolorpanel.c:708 ../../WINGs/wcolorpanel.c:709
msgid "Green"
msgstr "Zelená"
#: ../../WINGs/wcolorpanel.c:742 ../../WINGs/wcolorpanel.c:743
msgid "Blue"
msgstr "Modrá"
#: ../../WINGs/wcolorpanel.c:802 ../../WINGs/wcolorpanel.c:803
msgid "Cyan"
msgstr ""
#: ../../WINGs/wcolorpanel.c:836 ../../WINGs/wcolorpanel.c:837
msgid "Magenta"
msgstr ""
#: ../../WINGs/wcolorpanel.c:870 ../../WINGs/wcolorpanel.c:871
msgid "Yellow"
msgstr "Žlutá"
#: ../../WINGs/wcolorpanel.c:905 ../../WINGs/wcolorpanel.c:906
msgid "Black"
msgstr "Černá"
#: ../../WINGs/wcolorpanel.c:986
msgid "Spectrum"
msgstr "Spektrum"
#: ../../WINGs/wcolorpanel.c:1016
msgid "Palette"
msgstr "Paleta"
#: ../../WINGs/wcolorpanel.c:1022
msgid "New from File..."
msgstr "Nová ze souboru..."
#: ../../WINGs/wcolorpanel.c:1023 ../../WINGs/wcolorpanel.c:1071
#: ../../WINGs/wcolorpanel.c:1088
msgid "Rename..."
msgstr "Přejmenovat..."
#: ../../WINGs/wcolorpanel.c:1024 ../../WINGs/wcolorpanel.c:1072
#: ../../WINGs/wcolorpanel.c:1089 ../../WINGs/wcolorpanel.c:3316
msgid "Remove"
msgstr "Odstranit"
#: ../../WINGs/wcolorpanel.c:1025
msgid "Copy"
msgstr "Kopírovat"
#: ../../WINGs/wcolorpanel.c:1026
msgid "New from Clipboard"
msgstr "Nová ze schránky"
#: ../../WINGs/wcolorpanel.c:1047
msgid "X11-Colors"
msgstr "Barvy X11"
#: ../../WINGs/wcolorpanel.c:1064
msgid "Color"
msgstr "Barva"
#: ../../WINGs/wcolorpanel.c:1070
msgid "Add..."
msgstr "Přidat..."
#: ../../WINGs/wcolorpanel.c:1080
msgid "List"
msgstr "Seznam"
#: ../../WINGs/wcolorpanel.c:1087
msgid "New..."
msgstr "Nový..."
#: ../../WINGs/wcolorpanel.c:1226
#, c-format
msgid ""
"Color Panel: Could not create directory %s needed to store configurations"
msgstr ""
"Panel barev: Nemožné vytvořit adresář %s potřebný k uložení nastavení"
#. Delete the file, it doesn't belong here
#: ../../WINGs/wcolorpanel.c:1232 ../../WINGs/wcolorpanel.c:3202
#: ../../WINGs/wcolorpanel.c:3206
msgid "File Error"
msgstr "Chyba souboru"
#: ../../WINGs/wcolorpanel.c:1233
msgid "Could not create ColorPanel configuration directory"
msgstr "Nemožné vytvořit konfigurační adresář panelu barev"
#: ../../WINGs/wcolorpanel.c:1234 ../../WINGs/wcolorpanel.c:3203
#: ../../WINGs/wcolorpanel.c:3208 ../../WINGs/wcolorpanel.c:3235
#: ../../WINGs/wfilepanel.c:243 ../../WINGs/wfilepanel.c:641
#: ../../WINGs/wfilepanel.c:653 ../../WINGs/wfilepanel.c:752
#: ../../WINGs/wfilepanel.c:963 ../../WINGs/wfontpanel.c:717
msgid "OK"
msgstr "OK"
#: ../../WINGs/wcolorpanel.c:1240 ../../WINGs/wcolorpanel.c:1276
#: ../../WINGs/wcolorpanel.c:1294
msgid "Color Panel: Could not find file"
msgstr "Panel barev: Nemožné nalézt soubor"
#: ../../WINGs/wcolorpanel.c:1481 ../../WINGs/wcolorpanel.c:1546
#: ../../WINGs/wcolorpanel.c:1610
msgid "Color Panel: X failed request"
msgstr "Panel barev: chyba požadavku X"
#: ../../WINGs/wcolorpanel.c:2855
msgid "Saturation"
msgstr "Saturace"
#: ../../WINGs/wcolorpanel.c:2891
msgid "Hue"
msgstr "Odteď"
#: ../../WINGs/wcolorpanel.c:3141
msgid "Open Palette"
msgstr "Otevřít paletu"
#: ../../WINGs/wcolorpanel.c:3203
msgid "Invalid file format !"
msgstr "Nesprávný souborový formát!"
#: ../../WINGs/wcolorpanel.c:3205
#, c-format
msgid "can't remove file %s"
msgstr "nemožné odstranit soubor %s"
#: ../../WINGs/wcolorpanel.c:3207
msgid "Couldn't remove file from Configuration Directory !"
msgstr "Nemožné odstranit soubor z konfiguračního adresáře!"
#: ../../WINGs/wcolorpanel.c:3234
msgid "Rename"
msgstr "Přejmenovat"
#: ../../WINGs/wcolorpanel.c:3234
msgid "Rename palette to:"
msgstr "Přejmenovat paletu:"
#: ../../WINGs/wcolorpanel.c:3235 ../../WINGs/wfilepanel.c:252
#: ../../WINGs/wfilepanel.c:653 ../../WINGs/wfilepanel.c:752
msgid "Cancel"
msgstr "Zrušit"
#. Careful, this palette exists already
#: ../../WINGs/wcolorpanel.c:3251 ../../WINGs/wfilepanel.c:752
msgid "Warning"
msgstr "Varování"
#: ../../WINGs/wcolorpanel.c:3252
msgid ""
"Palette already exists !\n"
"\n"
"Overwrite ?"
msgstr ""
"Paleta už existuje!\n"
"\n"
"Přepsat?"
#: ../../WINGs/wcolorpanel.c:3252 ../../WINGs/wcolorpanel.c:3316
msgid "No"
msgstr "Ne"
#: ../../WINGs/wcolorpanel.c:3252 ../../WINGs/wcolorpanel.c:3316
msgid "Yes"
msgstr "Ano"
#: ../../WINGs/wcolorpanel.c:3284
#, c-format
msgid "Couldn't rename palette %s to %s\n"
msgstr "Nemožné přejmenovat paletu %s na %s\n"
#: ../../WINGs/wcolorpanel.c:3310
msgid "This will permanently remove the palette "
msgstr "Paleta bude natrvalo smazaná"
#: ../../WINGs/wcolorpanel.c:3313
msgid ""
".\n"
"\n"
"Are you sure you want to remove this palette ?"
msgstr ""
".\n"
"\n"
"Jste si jisti, že chcete odstranit tuto paletu?"
#: ../../WINGs/wcolorpanel.c:3338
#, c-format
msgid "Couldn't remove palette %s\n"
msgstr "Nemožné odstranit paletu %s\n"
#: ../../WINGs/wcolorpanel.c:3643
#, c-format
msgid "Could not open %s"
msgstr "Nemožné otevřít %s"
#: ../../WINGs/wcolorpanel.c:3650
#, c-format
msgid "Could not create %s"
msgstr "Nemožné vytvořit %s"
#: ../../WINGs/wcolorpanel.c:3661
#, c-format
msgid "Write error on file %s"
msgstr "Chyba při zápisu do souboru %s"
#: ../../WINGs/wcolorpanel.c:3706
msgid "Color Panel: Color unspecified"
msgstr "Panel barev: Nespecifikovaná barva"
#: ../../WINGs/wfilepanel.c:228
msgid "Name:"
msgstr "Jméno:"
#: ../../WINGs/wfilepanel.c:325 ../../WINGs/wfilepanel.c:390
msgid "Open"
msgstr "Otevřít"
#: ../../WINGs/wfilepanel.c:343 ../../WINGs/wfilepanel.c:396
msgid "Save"
msgstr "Uložit"
#: ../../WINGs/wfilepanel.c:556
#, c-format
msgid "WINGs: could not open directory %s\n"
msgstr "WINGs: nemožné otevřít adresář %s\n"
#: ../../WINGs/wfilepanel.c:574
#, c-format
msgid "WINGs: could not stat %s\n"
msgstr "WINGs: nemožné zjistit informace o %s\n"
#: ../../WINGs/wfilepanel.c:641 ../../WINGs/wfilepanel.c:962
#: ../../WINGs/wfontpanel.c:716
msgid "Error"
msgstr "Chyba"
#: ../../WINGs/wfilepanel.c:652
msgid "Create Directory"
msgstr "Vytvořit adresář"
#: ../../WINGs/wfilepanel.c:653
msgid "Enter directory name"
msgstr "Jméno adresáře"
#: ../../WINGs/wfilepanel.c:689 ../../WINGs/wfilepanel.c:728
#: ../../WINGs/wfilepanel.c:757 ../../WINGs/wfilepanel.c:785
msgid "Permission denied."
msgstr "Přístup odmítnut."
#: ../../WINGs/wfilepanel.c:692
#, c-format
msgid "'%s' already exists."
msgstr "'%s' už existuje"
#: ../../WINGs/wfilepanel.c:695
msgid "Path does not exist."
msgstr "Cesta neexistuje."
#: ../../WINGs/wfilepanel.c:725 ../../WINGs/wfilepanel.c:782
#, c-format
msgid "'%s' does not exist."
msgstr "'%s' neexistuje."
#: ../../WINGs/wfilepanel.c:732 ../../WINGs/wfilepanel.c:789
msgid "Insufficient memory available."
msgstr "Nedostatek paměti."
#: ../../WINGs/wfilepanel.c:736 ../../WINGs/wfilepanel.c:793
#, c-format
msgid "'%s' is on a read-only filesystem."
msgstr "'%s' je na souborovém systému jen pro čtení."
#: ../../WINGs/wfilepanel.c:739 ../../WINGs/wfilepanel.c:769
#: ../../WINGs/wfilepanel.c:796
#, c-format
msgid "Can not delete '%s'."
msgstr "Nemožné odstranit '%s'."
#: ../../WINGs/wfilepanel.c:745
#, c-format
msgid "Delete directory %s ?"
msgstr "Odstranit adresář %s?"
#: ../../WINGs/wfilepanel.c:748
#, c-format
msgid "Delete file %s ?"
msgstr "Odstranit soubor %s?"
#: ../../WINGs/wfilepanel.c:760
#, c-format
msgid "Directory '%s' does not exist."
msgstr "Adresář '%s' neexistuje."
#: ../../WINGs/wfilepanel.c:763
#, c-format
msgid "Directory '%s' is not empty."
msgstr "Adresář '%s' není prázdný."
#: ../../WINGs/wfilepanel.c:766
#, c-format
msgid "Directory '%s' is busy."
msgstr "Adresář '%s' je používaný."
#: ../../WINGs/wfilepanel.c:779
#, c-format
msgid "'%s' is a directory."
msgstr "'%s' je adresář."
#: ../../WINGs/wfilepanel.c:821
#, c-format
msgid "An error occured browsing '%s'."
msgstr "Při prohlížení '%s' nastala chyba."
#: ../../WINGs/wfilepanel.c:825
#, c-format
msgid "'%s' is not a directory."
msgstr "'%s' není adresář."
#: ../../WINGs/wfilepanel.c:962
msgid "File does not exist."
msgstr "Soubor neexistuje."
#: ../../WINGs/wfont.c:129
#, c-format
msgid "the following character sets are missing in %s:"
msgstr "nasledující sady znaků chybí v %s:"
#: ../../WINGs/wfont.c:136
#, c-format
msgid ""
"the string \"%s\" will be used in place of any characters from those sets."
msgstr ""
"řetězec \"%s\" bude použitý namísto znaků z těchto sad."
#: ../../WINGs/wfont.c:282 ../../WINGs/wfont.c:318
#, c-format
msgid "could not load font set %s. Trying fixed."
msgstr "nemožné načíst font %s. Zkouší se načíst fixed."
#: ../../WINGs/wfont.c:288 ../../WINGs/wfont.c:324
#, c-format
msgid "could not load font %s. Trying fixed."
msgstr "nemožno načíst font %s. Zkoší se načíst fixed."
#: ../../WINGs/wfont.c:292 ../../WINGs/wfont.c:328
msgid "could not load fixed font!"
msgstr "nemožné načíst font fixed!"
#: ../../WINGs/wfont.c:423
#, c-format
msgid "font description %s is too large."
msgstr "popis fontu %s je příliš velký."
#: ../../WINGs/wfontpanel.c:205
msgid "Test!!!"
msgstr "Zkouška!!!"
#: ../../WINGs/wfontpanel.c:211
msgid "Family"
msgstr ""
#: ../../WINGs/wfontpanel.c:222
msgid "Typeface"
msgstr ""
#: ../../WINGs/wfontpanel.c:233
msgid "Size"
msgstr "Velikost"
#: ../../WINGs/wfontpanel.c:252
msgid "Set"
msgstr "Sada"
#: ../../WINGs/wfontpanel.c:257
msgid "Revert"
msgstr "Zpět"
#: ../../WINGs/wfontpanel.c:717
msgid "Could not retrieve font list"
msgstr "Nemožné obdržet seznam fontů"
#: ../../WINGs/wfontpanel.c:729
#, c-format
msgid "font name %s is longer than 256, which is invalid."
msgstr "jméno fontu %s je delší než 256, což je špatně."
#: ../../WINGs/wfontpanel.c:880
msgid "Roman"
msgstr ""
#: ../../WINGs/wfontpanel.c:883
msgid "Italic"
msgstr ""
#: ../../WINGs/wfontpanel.c:885
msgid "Oblique"
msgstr ""
#: ../../WINGs/wfontpanel.c:887
msgid "Rev Italic"
msgstr ""
#: ../../WINGs/wfontpanel.c:889
msgid "Rev Oblique"
msgstr ""
#: ../../WINGs/wfontpanel.c:895
msgid "Normal"
msgstr "Normílní"
#: ../../WINGs/widgets.c:414
#, c-format
msgid "WINGs: could not load widget images file: %s"
msgstr "WINGs: nemožné načíst soubor s obrázky pro widgety: %s"
#: ../../WINGs/widgets.c:525
#, c-format
msgid "WINGs: could not open display %s"
msgstr "WINGs: nemožné otevřít display %s"
#: ../../WINGs/widgets.c:717
msgid ""
"could not load any fonts. Make sure your font installationand locale "
"settings are correct."
msgstr ""
"nemožné načíst žádný font. Ubezpečte se, že instalace fontů a místního "
"nastavení jsou v pořádku."
#: ../../WINGs/wruler.c:189
msgid "0 inches"
msgstr "0 palců"
#: ../../WINGs/wtext.c:1212
msgid "...for this app will surely crash :-)\n"
msgstr "...pro tuto aplikaci to určitě spadne :-)\n"
#: ../../WINGs/wtext.c:2084
msgid "didn't get it\n"
msgstr "nedosaženo\n"
#: ../../WINGs/wtext.c:2726
#, c-format
msgid "type is [%s]\n"
msgstr "typ je [%s]\n"
#: ../../WINGs/wtext.c:2797
msgid "could not request data for dropped data"
msgstr "nemohou být vyžádána data pro položená data"
#: ../../WINGs/wtext.c:2995
msgid "could not create text's view\n"
msgstr "nemožné zobrazit text\n"
#: ../../WINGs/wview.c:219
msgid "trying to realize widget of unrealized parent"
msgstr "snaha vytvořit widget neexistujícího rodiče objektu"
#: ../../WINGs/wview.c:267
msgid "trying to reparent realized view to unrealized parent"
msgstr ""
#: ../../WINGs/wtextfield.c:490
msgid "only left alignment is supported in textfields"
msgstr "pro textové pole je povolené jen levé zarovnání"
#pozor, co je STRING?
#: ../../WINGs/wwindow.c:222
msgid "window title conversion error... using STRING encoding"
msgstr "chyba konverze titulku okna... použije se kódovaní STRING"
#: ../../WINGs/wwindow.c:313
msgid "could not allocate memory for window size hints"
msgstr "nemožné alokovat paměť pro pokyny velikosti okna"
#: ../../WINGs/wwindow.c:586
msgid "could not allocate memory for WM hints"
msgstr "nemožné alokovat paměť pro pokyny WM"
#: ../../WINGs/wwindow.c:627
msgid "icon title conversion error..using STRING encoding"
msgstr "chyba konverze titulku ikony... použije se kódovaní STRING"

627
WINGs/po/de.po Normal file
View File

@@ -0,0 +1,627 @@
#
# German Message Catalog for WINGs
#
# Initial translation
# Gudio Scholz <guido.scholz@bayernline.de>
#
# Adapted to versions 0.80 ff.
# Torsten Marek <shlomme@gmx.net>
#
msgid ""
msgstr ""
"Project-Id-Version: WINGs\n"
"POT-Creation-Date: 2004-11-01 16:24+0100\n"
"PO-Revision-Date: 2004-11-05 23:48+0100\n"
"Last-Translator: shlomme@gmx.net\n"
"Language-Team: German\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: ../../WINGs/connection.c:471 ../../WINGs/connection.c:536
#: ../../WINGs/connection.c:579
msgid "Bad address-service-protocol combination"
msgstr "Ungültige Kombination von Adresse und Dienstprotokoll"
#: ../../WINGs/error.c:54
#, c-format
msgid "Unknown error %d"
msgstr "Unbekannter Fehler %d"
#: ../../WINGs/error.c:59
#, c-format
msgid "Error %d"
msgstr "Fehler %d"
#: ../../WINGs/error.c:110
msgid " warning: "
msgstr " Warnung: "
#: ../../WINGs/error.c:137
msgid " fatal error: "
msgstr " fataler Fehler: "
#: ../../WINGs/error.c:163 ../../WINGs/error.c:192
msgid " error: "
msgstr " Fehler: "
#: ../../WINGs/findfile.c:48
#, c-format
msgid "could not get password entry for UID %i"
msgstr "Passworteintrag für UID %i konnte nicht ermittelt werden"
#: ../../WINGs/findfile.c:66
#, c-format
msgid "could not get password entry for user %s"
msgstr "Passworteintrag für Benutzer %s konnte nicht ermittelt werden"
#: ../../WINGs/host.c:114
msgid "Cannot get current host name"
msgstr "Aktueller Hostname kann nicht ermittelt werden"
#: ../../WINGs/proplist.c:91
#, c-format
msgid "syntax error in %s %s, line %i: %s"
msgstr "Syntaxfehler in %s %s, Zeile %i: %s"
#: ../../WINGs/proplist.c:150
msgid "Only string or data is supported for a proplist dictionary key"
msgstr ""
"Nur Zeichenketten oder Binärdaten werden als Schlüssel für ein PropList-Dictionary "
"unterstützt"
#: ../../WINGs/proplist.c:184 ../../WINGs/proplist.c:236
#: ../../WINGs/proplist.c:394 ../../WINGs/proplist.c:474
#: ../../WINGs/proplist.c:1075 ../../WINGs/proplist.c:1127
#: ../../WINGs/proplist.c:1293 ../../WINGs/proplist.c:1372
#: ../../WINGs/proplist.c:1493 ../../WINGs/proplist.c:1540
msgid "Used proplist functions on non-WMPropLists objects"
msgstr "PropList-Funktionen werden auf nicht-WMPropList-Objekte angewendet"
#: ../../WINGs/proplist.c:630
msgid "unterminated PropList string"
msgstr "nicht terminierte PropList-Zeichenkette"
#: ../../WINGs/proplist.c:670
msgid "unterminated PropList data"
msgstr "nicht terminierte PropList-Binärdaten"
#: ../../WINGs/proplist.c:678
msgid "unterminated PropList data (missing hexdigit)"
msgstr "nicht terminierte PropList-Binärdaten (fehlendes Hex-Zeichen)"
#: ../../WINGs/proplist.c:690 ../../WINGs/proplist.c:695
msgid "non hexdigit character in PropList data"
msgstr "falsches Hex-Zeichen in PropList-Binärdaten"
#: ../../WINGs/proplist.c:729
msgid "unterminated PropList array"
msgstr "nicht terminiertes PropList-Array"
#: ../../WINGs/proplist.c:737
msgid "missing or unterminated PropList array"
msgstr "fehlendes oder nicht terminiertes PropList-Array"
#: ../../WINGs/proplist.c:747
msgid "could not get PropList array element"
msgstr "PropList-Array-Element konnte nicht gelesen werden"
#: ../../WINGs/proplist.c:776
msgid "unterminated PropList dictionary"
msgstr "nicht terminiertes PropList-Dictionary"
#: ../../WINGs/proplist.c:793
msgid "missing PropList dictionary key"
msgstr "fehlender Schlüssel in PropList-Dictionary"
#: ../../WINGs/proplist.c:795
msgid "missing PropList dictionary entry key or unterminated dictionary"
msgstr "fehlender Schlüssel in PropList-Dictionary oder fehlende Terminierung"
#: ../../WINGs/proplist.c:803
msgid "error parsing PropList dictionary key"
msgstr "Fehler beim Parsen eines PropList-Dictionary-Schlüssels"
#: ../../WINGs/proplist.c:811
msgid "missing = in PropList dictionary entry"
msgstr "fehlendes \"=\" in PropList-Dictionary-Schlüssel"
#: ../../WINGs/proplist.c:819
msgid "error parsing PropList dictionary entry value"
msgstr "Fehler beim Parsen eines PropList-Dictionary-Wertes"
#: ../../WINGs/proplist.c:827
msgid "missing ; in PropList dictionary entry"
msgstr "fehlendes \";\" in PropList-Dictionary-Eintrag"
#: ../../WINGs/proplist.c:888
msgid ""
"was expecting a string, data, array or dictionary. If it's a string, try "
"enclosing it with \"."
msgstr ""
"Zeichenkette, Binärdaten, Array oder Dictionary erwartet. Zeichenketten ggf. mit \" "
"einklammern."
#: ../../WINGs/proplist.c:892
msgid "Comments are not allowed inside WindowMaker owned domain files."
msgstr "Kommentare sind in Domänendaten von WindowMaker nicht erlaubt."
#: ../../WINGs/proplist.c:1563 ../../WINGs/proplist.c:1630
msgid "extra data after end of property list"
msgstr "zusätzliche Daten hinter dem Ende der Propertyliste"
#: ../../WINGs/proplist.c:1606
#, c-format
msgid "could not get size for file '%s'"
msgstr "Dateigröße von '%s' konnte nicht ermittelt werden"
#: ../../WINGs/proplist.c:1619
#, c-format
msgid "error reading from file '%s'"
msgstr "Fehler beim Lesen der Datei '%s'"
#: ../../WINGs/proplist.c:1671
#, c-format
msgid "mkstemp (%s) failed"
msgstr "mkstemp (%s) fehlgeschlagen"
#: ../../WINGs/proplist.c:1682
#, c-format
msgid "mktemp (%s) failed"
msgstr "mktemp (%s) fehlgeschlagen"
#: ../../WINGs/proplist.c:1693
#, c-format
msgid "open (%s) failed"
msgstr "open (%s) fehlgeschlagen"
#: ../../WINGs/proplist.c:1700
#, c-format
msgid "writing to file: %s failed"
msgstr "Schreiben in Datei: %s fehlgeschlagen"
#: ../../WINGs/proplist.c:1708
#, c-format
msgid "fclose (%s) failed"
msgstr "fclose (%s) fehlgeschlagen"
#: ../../WINGs/proplist.c:1717
#, c-format
msgid "rename ('%s' to '%s') failed"
msgstr "rename ('%s' nach '%s') fehlgeschlagen"
#. something happened with the file. just overwrite it
#: ../../WINGs/userdefaults.c:188 ../../WINGs/userdefaults.c:204
#, c-format
msgid "cannot read domain from file '%s' when syncing"
msgstr "Bei der Synchronisation konnte nicht aus der Datei '%s' gelesen werden"
#: ../../WINGs/wcolor.c:237 ../../WINGs/wcolor.c:249 ../../WINGs/wcolor.c:288
#: ../../WINGs/wcolor.c:329
#, c-format
msgid "could not allocate %s color"
msgstr "Farbe %s konnte nicht erzeugt werden"
#: ../../WINGs/wcolor.c:237
msgid "white"
msgstr "Weiß"
#: ../../WINGs/wcolor.c:249
msgid "black"
msgstr "Schwarz"
#: ../../WINGs/wcolor.c:288
msgid "gray"
msgstr "Grau"
#: ../../WINGs/wcolor.c:329
msgid "dark gray"
msgstr "Dunkelgrau"
#: ../../WINGs/wcolorpanel.c:420
msgid "Colors"
msgstr "Farben"
#: ../../WINGs/wcolorpanel.c:610 ../../WINGs/wcolorpanel.c:2829
msgid "Brightness"
msgstr "Helligkeit"
#: ../../WINGs/wcolorpanel.c:612 ../../WINGs/wcolorpanel.c:688
#: ../../WINGs/wcolorpanel.c:721 ../../WINGs/wcolorpanel.c:755
#: ../../WINGs/wcolorpanel.c:815 ../../WINGs/wcolorpanel.c:849
#: ../../WINGs/wcolorpanel.c:883 ../../WINGs/wcolorpanel.c:918
#: ../../WINGs/wcolorpanel.c:2169 ../../WINGs/wcolorpanel.c:2831
#: ../../WINGs/wcolorpanel.c:2867 ../../WINGs/wcolorpanel.c:2903
#: ../../WINGs/wcolorpanel.c:3745
msgid "Color Panel: Could not allocate memory"
msgstr "Farb-Panel: Speicher konnte nicht reserviert werden"
#: ../../WINGs/wcolorpanel.c:685 ../../WINGs/wcolorpanel.c:686
msgid "Red"
msgstr "Rot"
#: ../../WINGs/wcolorpanel.c:718 ../../WINGs/wcolorpanel.c:719
msgid "Green"
msgstr "Grün"
#: ../../WINGs/wcolorpanel.c:752 ../../WINGs/wcolorpanel.c:753
msgid "Blue"
msgstr "Blau"
#: ../../WINGs/wcolorpanel.c:812 ../../WINGs/wcolorpanel.c:813
msgid "Cyan"
msgstr ""
#: ../../WINGs/wcolorpanel.c:846 ../../WINGs/wcolorpanel.c:847
msgid "Magenta"
msgstr ""
#: ../../WINGs/wcolorpanel.c:880 ../../WINGs/wcolorpanel.c:881
msgid "Yellow"
msgstr "Gelb"
#: ../../WINGs/wcolorpanel.c:915 ../../WINGs/wcolorpanel.c:916
msgid "Black"
msgstr "Schwarz"
#: ../../WINGs/wcolorpanel.c:996
msgid "Spectrum"
msgstr "Spektrum"
#: ../../WINGs/wcolorpanel.c:1026
msgid "Palette"
msgstr ""
#: ../../WINGs/wcolorpanel.c:1032
msgid "New from File..."
msgstr "Neu aus Datei..."
#: ../../WINGs/wcolorpanel.c:1033 ../../WINGs/wcolorpanel.c:1081
#: ../../WINGs/wcolorpanel.c:1098
msgid "Rename..."
msgstr "Umbenennen..."
#: ../../WINGs/wcolorpanel.c:1034 ../../WINGs/wcolorpanel.c:1082
#: ../../WINGs/wcolorpanel.c:1099 ../../WINGs/wcolorpanel.c:3326
msgid "Remove"
msgstr "Entfernen"
#: ../../WINGs/wcolorpanel.c:1035
msgid "Copy"
msgstr "Kopieren"
#: ../../WINGs/wcolorpanel.c:1036
msgid "New from Clipboard"
msgstr "Neu aus Zwischenablage"
#: ../../WINGs/wcolorpanel.c:1057
msgid "X11-Colors"
msgstr "X11-Farben"
#: ../../WINGs/wcolorpanel.c:1074
msgid "Color"
msgstr "Farbe"
#: ../../WINGs/wcolorpanel.c:1080
msgid "Add..."
msgstr "Hinzufügen..."
#: ../../WINGs/wcolorpanel.c:1090
msgid "List"
msgstr "Liste"
#: ../../WINGs/wcolorpanel.c:1097
msgid "New..."
msgstr "Neu..."
#: ../../WINGs/wcolorpanel.c:1236
#, c-format
msgid "Color Panel: Could not create directory %s needed to store configurations"
msgstr "Farb-Panel: Verzeichnis %s konnte zum Speichern der Konfiguration nicht erzeugt werden"
#. Delete the file, it doesn't belong here
#: ../../WINGs/wcolorpanel.c:1242 ../../WINGs/wcolorpanel.c:3212
#: ../../WINGs/wcolorpanel.c:3216
msgid "File Error"
msgstr "Dateifehler"
#: ../../WINGs/wcolorpanel.c:1243
msgid "Could not create ColorPanel configuration directory"
msgstr "Konfigurationsverzeichnis für Farb-Panel konnte nicht erzeugt werden"
#: ../../WINGs/wcolorpanel.c:1244 ../../WINGs/wcolorpanel.c:3213
#: ../../WINGs/wcolorpanel.c:3218 ../../WINGs/wcolorpanel.c:3245
#: ../../WINGs/wfilepanel.c:250 ../../WINGs/wfilepanel.c:650
#: ../../WINGs/wfilepanel.c:662 ../../WINGs/wfilepanel.c:763
#: ../../WINGs/wfilepanel.c:974 ../../WINGs/wfontpanel.c:591
msgid "OK"
msgstr ""
#: ../../WINGs/wcolorpanel.c:1250 ../../WINGs/wcolorpanel.c:1286
#: ../../WINGs/wcolorpanel.c:1304
msgid "Color Panel: Could not find file"
msgstr "Farb-Panel: Datei konnte nicht gefunden werden"
#: ../../WINGs/wcolorpanel.c:1491 ../../WINGs/wcolorpanel.c:1556
#: ../../WINGs/wcolorpanel.c:1620
msgid "Color Panel: X failed request"
msgstr "Farb-Panel: X-Anfrage fehlgeschlagen"
#: ../../WINGs/wcolorpanel.c:2865
msgid "Saturation"
msgstr "Sättigung"
#: ../../WINGs/wcolorpanel.c:2901
msgid "Hue"
msgstr "Farbton"
#: ../../WINGs/wcolorpanel.c:3151
msgid "Open Palette"
msgstr "Palette öffnen"
#: ../../WINGs/wcolorpanel.c:3213
msgid "Invalid file format !"
msgstr "Ungültiges Dateiformat!"
#: ../../WINGs/wcolorpanel.c:3215
#, c-format
msgid "can't remove file %s"
msgstr "Datei %s konnte nicht entfert werden"
#: ../../WINGs/wcolorpanel.c:3217
msgid "Couldn't remove file from Configuration Directory !"
msgstr "Datei konnte nicht aus Konfigurationsverzeichnis entfernt werden!"
#: ../../WINGs/wcolorpanel.c:3244
msgid "Rename"
msgstr "Umbenennen"
#: ../../WINGs/wcolorpanel.c:3244
msgid "Rename palette to:"
msgstr "Palette umbenennen in:"
#: ../../WINGs/wcolorpanel.c:3245 ../../WINGs/wfilepanel.c:259
#: ../../WINGs/wfilepanel.c:662 ../../WINGs/wfilepanel.c:763
msgid "Cancel"
msgstr "Abbrechen"
#. Careful, this palette exists already
#: ../../WINGs/wcolorpanel.c:3261 ../../WINGs/wfilepanel.c:763
msgid "Warning"
msgstr "Warnung"
#: ../../WINGs/wcolorpanel.c:3262
msgid ""
"Palette already exists !\n"
"\n"
"Overwrite ?"
msgstr ""
"Palette existiert bereits!\n"
"\n"
"Überschreiben?"
#: ../../WINGs/wcolorpanel.c:3262 ../../WINGs/wcolorpanel.c:3326
msgid "No"
msgstr "Nein"
#: ../../WINGs/wcolorpanel.c:3262 ../../WINGs/wcolorpanel.c:3326
msgid "Yes"
msgstr "Ja"
#: ../../WINGs/wcolorpanel.c:3294
#, c-format
msgid "Couldn't rename palette %s to %s\n"
msgstr "Palette %s konnte nicht nach %s umbenannt werden\n"
#: ../../WINGs/wcolorpanel.c:3320
msgid "This will permanently remove the palette "
msgstr "Hiermit wird die Palette unwiderruflich gelöscht "
#: ../../WINGs/wcolorpanel.c:3323
msgid ""
".\n"
"\n"
"Are you sure you want to remove this palette ?"
msgstr ""
".\n"
"\n"
"Sind Sie sicher, dass Sie die Palette löschen wollen?"
#: ../../WINGs/wcolorpanel.c:3348
#, c-format
msgid "Couldn't remove palette %s\n"
msgstr "Palette %s konnte nicht gelöscht werden\n"
#: ../../WINGs/wcolorpanel.c:3647
#, c-format
msgid "Could not open %s"
msgstr "%s konnte nicht geöffnet werden"
#: ../../WINGs/wcolorpanel.c:3654
#, c-format
msgid "Could not create %s"
msgstr "%s konnte nicht erzeugt werden"
#: ../../WINGs/wcolorpanel.c:3665
#, c-format
msgid "Write error on file %s"
msgstr "Schreibfehler bei Datei %s"
#: ../../WINGs/wcolorpanel.c:3710
msgid "Color Panel: Color unspecified"
msgstr "Farb-Panel: Farbe nicht spezifiziert"
#: ../../WINGs/wfilepanel.c:235
msgid "Name:"
msgstr "Name:"
#: ../../WINGs/wfilepanel.c:332 ../../WINGs/wfilepanel.c:396
msgid "Open"
msgstr "Öffnen"
#: ../../WINGs/wfilepanel.c:350 ../../WINGs/wfilepanel.c:402
msgid "Save"
msgstr "Speichern"
#: ../../WINGs/wfilepanel.c:565
#, c-format
msgid "WINGs: could not open directory %s\n"
msgstr "WINGs: Verzeichnis %s konnte nicht geöffnet werden\n"
#: ../../WINGs/wfilepanel.c:583
#, c-format
msgid "WINGs: could not stat %s\n"
msgstr "WINGs: Dateistatus von %s unbestimmbar\n"
#: ../../WINGs/wfilepanel.c:650 ../../WINGs/wfilepanel.c:973
#: ../../WINGs/wfontpanel.c:590
msgid "Error"
msgstr "Fehler"
#: ../../WINGs/wfilepanel.c:661
msgid "Create Directory"
msgstr "Verzeichnis anlegen"
#: ../../WINGs/wfilepanel.c:662
msgid "Enter directory name"
msgstr "Verzeichnisname eingeben"
#: ../../WINGs/wfilepanel.c:698 ../../WINGs/wfilepanel.c:737
#: ../../WINGs/wfilepanel.c:768 ../../WINGs/wfilepanel.c:796
msgid "Permission denied."
msgstr "Zugriff verweigert."
#: ../../WINGs/wfilepanel.c:701
#, c-format
msgid "'%s' already exists."
msgstr "'%s' existiert bereits."
#: ../../WINGs/wfilepanel.c:704
msgid "Path does not exist."
msgstr "Pfad existiert nicht."
#: ../../WINGs/wfilepanel.c:734 ../../WINGs/wfilepanel.c:793
#, c-format
msgid "'%s' does not exist."
msgstr "'%s' existiert nicht."
#: ../../WINGs/wfilepanel.c:741 ../../WINGs/wfilepanel.c:800
msgid "Insufficient memory available."
msgstr "Nicht genügend Speicher verfügbar."
#: ../../WINGs/wfilepanel.c:745 ../../WINGs/wfilepanel.c:804
#, c-format
msgid "'%s' is on a read-only filesystem."
msgstr "'%s' liegt auf einem nur lesbaren Dateisystem."
#: ../../WINGs/wfilepanel.c:748 ../../WINGs/wfilepanel.c:780
#: ../../WINGs/wfilepanel.c:807
#, c-format
msgid "Can not delete '%s'."
msgstr "Kann %s nicht löschen."
#: ../../WINGs/wfilepanel.c:755
#, c-format
msgid "Delete directory %s ?"
msgstr "Verzeichnis %s löschen?"
#: ../../WINGs/wfilepanel.c:759
#, c-format
msgid "Delete file %s ?"
msgstr "Datei %s löschen?"
#: ../../WINGs/wfilepanel.c:771
#, c-format
msgid "Directory '%s' does not exist."
msgstr "Verzeichnis '%s' existiert nicht."
#: ../../WINGs/wfilepanel.c:774
#, c-format
msgid "Directory '%s' is not empty."
msgstr "Verzeichnis '%s' ist nicht leer."
#: ../../WINGs/wfilepanel.c:777
#, c-format
msgid "Directory '%s' is busy."
msgstr "Verzeichnis '%s' wird benutz."
#: ../../WINGs/wfilepanel.c:790
#, c-format
msgid "'%s' is a directory."
msgstr "'%s' ist ein Verzeichnis."
#: ../../WINGs/wfilepanel.c:832
#, c-format
msgid "An error occured browsing '%s'."
msgstr "Fehler beim Lesen von '%s'."
#: ../../WINGs/wfilepanel.c:836
#, c-format
msgid "'%s' is not a directory."
msgstr "'%s' ist kein Verzeichnis."
#: ../../WINGs/wfilepanel.c:973
msgid "File does not exist."
msgstr "Datei existiert nicht."
#: ../../WINGs/wfont.c:40
#, c-format
msgid "invalid font: %s. Trying '%s'"
msgstr "Ungültige Schriftart: %s. Wird ersetzt durch %s."
#: ../../WINGs/wfont.c:257 ../../WINGs/wfont.c:277
#, c-format
msgid "could not load font: %s."
msgstr "Schriftart konnte nicht geladen werden: %s"
#. WMSetWidgetBackgroundColor(panel->win, WMWhiteColor(scr));
#: ../../WINGs/wfontpanel.c:203
msgid "Font Panel"
msgstr "Schrift-Panel"
#: ../../WINGs/wfontpanel.c:239
msgid "The quick brown fox jumps over the lazy dog"
msgstr ""
#: ../../WINGs/wfontpanel.c:245
msgid "Family"
msgstr "Familie"
#: ../../WINGs/wfontpanel.c:256
msgid "Typeface"
msgstr "Schriftart"
#: ../../WINGs/wfontpanel.c:267
msgid "Size"
msgstr "Größe"
#: ../../WINGs/wfontpanel.c:286
msgid "Set"
msgstr "Setzen"
#: ../../WINGs/wfontpanel.c:292
msgid "Revert"
msgstr "Zurücksetzen"
#: ../../WINGs/wfontpanel.c:591
msgid "Could not init font config library\n"
msgstr "\"font-config\"-Bibliothek konnte nicht initialisiert werden\n"
#: ../../WINGs/widgets.c:419
#, c-format
msgid "WINGs: could not load widget images file: %s"
msgstr "WINGs: Widget-Bilderdatei konnte nicht geladen werden: %s"
#: ../../WINGs/widgets.c:767
msgid ""
"could not load any fonts. Make sure your font installation and locale "
"settings are correct."
msgstr ""
"Keine Schrifen konnten geladen werden. Überprüfen Sie, ob Ihre Schrifteninstallation und -"
"Lokalisierungseinstellungen korrekt sind."
#: ../../WINGs/wruler.c:192
msgid "0 inches"
msgstr "0 Inch"

739
WINGs/po/fr.po Normal file
View File

@@ -0,0 +1,739 @@
# KTranslator Generated File
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR Free Software Foundation, Inc.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
msgid ""
msgstr ""
"Project-Id-Version: WINGs 0.80.0\n"
"POT-Creation-Date: 2003-05-02 15:39+0200\n"
"PO-Revision-Date: 2002-01-09 21:20+0100\n"
"Last-Translator: Emmanuel Benoit <tseeker@neptune.fr>\n"
"Language-Team: Français <fr@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: unknown\n"
#: ../../WINGs/connection.c:467 ../../WINGs/connection.c:532
#: ../../WINGs/connection.c:575
msgid "Bad address-service-protocol combination"
msgstr "Mauvaise combinaison adresse-service-protocole"
#: ../../WINGs/error.c:54
#, c-format
msgid "Unknown error %d"
msgstr "Erreur inconnue %d"
#: ../../WINGs/error.c:59
#, c-format
msgid "Error %d"
msgstr "Erreur %d"
#: ../../WINGs/error.c:110
msgid " warning: "
msgstr " Avertissement : "
#: ../../WINGs/error.c:137
msgid " fatal error: "
msgstr " erreur fatale : "
#: ../../WINGs/error.c:163 ../../WINGs/error.c:192
msgid " error: "
msgstr " erreur : "
#: ../../WINGs/findfile.c:48
#, c-format
msgid "could not get password entry for UID %i"
msgstr "Impossible de lire le mot de passe de l'UID %i"
#: ../../WINGs/findfile.c:66
#, c-format
msgid "could not get password entry for user %s"
msgstr "Impossible de lire le mot de passe de l'utilisateur %s"
#: ../../WINGs/host.c:114
msgid "Cannot get current host name"
msgstr "Impossible de déterminer le nom de la machine"
# TODO pas de traduction correcte possible, cf source.
#: ../../WINGs/proplist.c:91
#, c-format
msgid "syntax error in %s %s, line %i: %s"
msgstr "Faute de syntaxe dans %s %s, ligne %i : %s"
#: ../../WINGs/proplist.c:150
msgid "Only string or data is supported for a proplist dictionary key"
msgstr ""
"Seuls les types string ou data sont supportés pour une clé de dictionnaire "
"Proplist"
#: ../../WINGs/proplist.c:184 ../../WINGs/proplist.c:236
#: ../../WINGs/proplist.c:394 ../../WINGs/proplist.c:474
#: ../../WINGs/proplist.c:1075 ../../WINGs/proplist.c:1127
#: ../../WINGs/proplist.c:1293 ../../WINGs/proplist.c:1372
#: ../../WINGs/proplist.c:1493 ../../WINGs/proplist.c:1540
msgid "Used proplist functions on non-WMPropLists objects"
msgstr "Une fonction Proplist a été utilisée sur des objets non-WMPropList"
#: ../../WINGs/proplist.c:630
msgid "unterminated PropList string"
msgstr "chaîne PropList sans fin"
#: ../../WINGs/proplist.c:670
msgid "unterminated PropList data"
msgstr "données PropList sans fin"
#: ../../WINGs/proplist.c:678
msgid "unterminated PropList data (missing hexdigit)"
msgstr "données PropList sans fin (il manque un chiffre hexadécimal)"
#: ../../WINGs/proplist.c:690 ../../WINGs/proplist.c:695
msgid "non hexdigit character in PropList data"
msgstr "caractère non-hexadécimal dans les données PropList"
#: ../../WINGs/proplist.c:729
msgid "unterminated PropList array"
msgstr "tableau PropList sans fin"
#: ../../WINGs/proplist.c:737
msgid "missing or unterminated PropList array"
msgstr "tableau PropList manquant ou sans fin"
#: ../../WINGs/proplist.c:747
msgid "could not get PropList array element"
msgstr "impossible de lire l'élément du tableau PropList"
#: ../../WINGs/proplist.c:776
msgid "unterminated PropList dictionary"
msgstr "dictionnaire PropList sans fin"
#: ../../WINGs/proplist.c:793
msgid "missing PropList dictionary key"
msgstr "clef du dictionnaire PropList manquante"
#: ../../WINGs/proplist.c:795
msgid "missing PropList dictionary entry key or unterminated dictionary"
msgstr "clef du dictionnaire PropList manquante ou dictionnaire sans fin"
#: ../../WINGs/proplist.c:803
msgid "error parsing PropList dictionary key"
msgstr "erreur lors de l'analyse de la clef de dictionnaire PropList"
#: ../../WINGs/proplist.c:811
msgid "missing = in PropList dictionary entry"
msgstr "signe '=' manquant dans l'entrée du dictionnaire PropList"
#: ../../WINGs/proplist.c:819
msgid "error parsing PropList dictionary entry value"
msgstr ""
"erreur lors de l'analyse de la valeur de l'entrée du dictionnaire PropList"
#: ../../WINGs/proplist.c:827
msgid "missing ; in PropList dictionary entry"
msgstr "signe ';' manquant dans l'entrée du dictionnaire PropList"
#: ../../WINGs/proplist.c:888
msgid ""
"was expecting a string, data, array or dictionary. If it's a string, try "
"enclosing it with \"."
msgstr ""
"une chaine, des données, un tableau ou un dictionnaire étaient attendus. "
"S'il s'agit d'une chaîne, essayez de la délimiter grâce à '\"'."
#: ../../WINGs/proplist.c:892
msgid "Comments are not allowed inside WindowMaker owned domain files."
msgstr ""
"Les commentaires ne sont pas autorisés dans les fichiers appartenant au "
"domaine de Window Maker."
#: ../../WINGs/proplist.c:1563 ../../WINGs/proplist.c:1628
msgid "extra data after end of property list"
msgstr "données excédentaires après la fin de la liste de propriétés"
#: ../../WINGs/proplist.c:1606
#, c-format
msgid "could not get size for file '%s'"
msgstr "impossible de déterminer la taille du fichier '%s'"
#: ../../WINGs/proplist.c:1618
#, c-format
msgid "error reading from file '%s'"
msgstr "erreur pendant la lecture du fichier '%s'"
#: ../../WINGs/proplist.c:1669
#, c-format
msgid "mkstemp (%s) failed"
msgstr "mkstemp (%s) a échoué"
#: ../../WINGs/proplist.c:1680
#, c-format
msgid "mktemp (%s) failed"
msgstr "mktemp (%s) a échoué"
#: ../../WINGs/proplist.c:1691
#, c-format
msgid "open (%s) failed"
msgstr "open (%s) a échoué"
#: ../../WINGs/proplist.c:1698
#, c-format
msgid "writing to file: %s failed"
msgstr "erreur pendant l'écriture dans le fichier '%s'"
#: ../../WINGs/proplist.c:1706
#, c-format
msgid "fclose (%s) failed"
msgstr "erreur lors de la fermeture du fichier '%s'"
#: ../../WINGs/proplist.c:1715
#, c-format
msgid "rename ('%s' to '%s') failed"
msgstr "impossible de renommer '%s' en '%s'"
#. something happened with the file. just overwrite it
#: ../../WINGs/userdefaults.c:188 ../../WINGs/userdefaults.c:204
#, c-format
msgid "cannot read domain from file '%s' when syncing"
msgstr ""
"impossible de lire le domaine depuis le fichier '%s' pendant la "
"synchronisation"
#: ../../WINGs/wcolor.c:224 ../../WINGs/wcolor.c:236 ../../WINGs/wcolor.c:275
#: ../../WINGs/wcolor.c:316
#, c-format
msgid "could not allocate %s color"
msgstr "impossible d'allouer la couleur %s"
#: ../../WINGs/wcolor.c:224
msgid "white"
msgstr "blanc"
#: ../../WINGs/wcolor.c:236
msgid "black"
msgstr "noir"
#: ../../WINGs/wcolor.c:275
msgid "gray"
msgstr "gris"
#: ../../WINGs/wcolor.c:316
msgid "dark gray"
msgstr "gris sombre"
#: ../../WINGs/wcolorpanel.c:420
msgid "Colors"
msgstr "Couleurs"
#: ../../WINGs/wcolorpanel.c:610 ../../WINGs/wcolorpanel.c:2829
msgid "Brightness"
msgstr "Luminosité"
#: ../../WINGs/wcolorpanel.c:612 ../../WINGs/wcolorpanel.c:688
#: ../../WINGs/wcolorpanel.c:721 ../../WINGs/wcolorpanel.c:755
#: ../../WINGs/wcolorpanel.c:815 ../../WINGs/wcolorpanel.c:849
#: ../../WINGs/wcolorpanel.c:883 ../../WINGs/wcolorpanel.c:918
#: ../../WINGs/wcolorpanel.c:2169 ../../WINGs/wcolorpanel.c:2831
#: ../../WINGs/wcolorpanel.c:2867 ../../WINGs/wcolorpanel.c:2903
#: ../../WINGs/wcolorpanel.c:3745
msgid "Color Panel: Could not allocate memory"
msgstr "Panneau de Sélection des Couleur: impossible d'allouer la mémoire"
#: ../../WINGs/wcolorpanel.c:685 ../../WINGs/wcolorpanel.c:686
msgid "Red"
msgstr "Rouge"
#: ../../WINGs/wcolorpanel.c:718 ../../WINGs/wcolorpanel.c:719
msgid "Green"
msgstr "Vert"
#: ../../WINGs/wcolorpanel.c:752 ../../WINGs/wcolorpanel.c:753
msgid "Blue"
msgstr "Bleu"
#: ../../WINGs/wcolorpanel.c:812 ../../WINGs/wcolorpanel.c:813
msgid "Cyan"
msgstr "Cyan"
#: ../../WINGs/wcolorpanel.c:846 ../../WINGs/wcolorpanel.c:847
msgid "Magenta"
msgstr "Magenta"
#: ../../WINGs/wcolorpanel.c:880 ../../WINGs/wcolorpanel.c:881
msgid "Yellow"
msgstr "Jaune"
#: ../../WINGs/wcolorpanel.c:915 ../../WINGs/wcolorpanel.c:916
msgid "Black"
msgstr "Noir"
#: ../../WINGs/wcolorpanel.c:996
msgid "Spectrum"
msgstr "Spectre"
#: ../../WINGs/wcolorpanel.c:1026
msgid "Palette"
msgstr "Palette"
#: ../../WINGs/wcolorpanel.c:1032
msgid "New from File..."
msgstr "Nouveau d'après le fichier..."
#: ../../WINGs/wcolorpanel.c:1033 ../../WINGs/wcolorpanel.c:1081
#: ../../WINGs/wcolorpanel.c:1098
msgid "Rename..."
msgstr "Renommer..."
#: ../../WINGs/wcolorpanel.c:1034 ../../WINGs/wcolorpanel.c:1082
#: ../../WINGs/wcolorpanel.c:1099 ../../WINGs/wcolorpanel.c:3326
msgid "Remove"
msgstr "Supprimer"
#: ../../WINGs/wcolorpanel.c:1035
msgid "Copy"
msgstr "Copier"
#: ../../WINGs/wcolorpanel.c:1036
msgid "New from Clipboard"
msgstr "Nouveau d'après le presse-papier"
#: ../../WINGs/wcolorpanel.c:1057
msgid "X11-Colors"
msgstr "Couleurs X11"
#: ../../WINGs/wcolorpanel.c:1074
msgid "Color"
msgstr "Couleur"
#: ../../WINGs/wcolorpanel.c:1080
msgid "Add..."
msgstr "Ajouter..."
#: ../../WINGs/wcolorpanel.c:1090
msgid "List"
msgstr "Liste"
#: ../../WINGs/wcolorpanel.c:1097
msgid "New..."
msgstr "Nouveau..."
#: ../../WINGs/wcolorpanel.c:1236
#, c-format
msgid ""
"Color Panel: Could not create directory %s needed to store configurations"
msgstr ""
"Panneau de sélection des couleurs : impossible de créer le répertoire %s "
"requis pour enregistrer les configurations."
#. Delete the file, it doesn't belong here
#: ../../WINGs/wcolorpanel.c:1242 ../../WINGs/wcolorpanel.c:3212
#: ../../WINGs/wcolorpanel.c:3216
msgid "File Error"
msgstr "Erreur de fichier"
#: ../../WINGs/wcolorpanel.c:1243
msgid "Could not create ColorPanel configuration directory"
msgstr ""
"Impossible de créer le répertoire pour la configuration du panneau de "
"sélection des couleurs."
#: ../../WINGs/wcolorpanel.c:1244 ../../WINGs/wcolorpanel.c:3213
#: ../../WINGs/wcolorpanel.c:3218 ../../WINGs/wcolorpanel.c:3245
#: ../../WINGs/wfilepanel.c:250 ../../WINGs/wfilepanel.c:650
#: ../../WINGs/wfilepanel.c:662 ../../WINGs/wfilepanel.c:763
#: ../../WINGs/wfilepanel.c:974 ../../WINGs/wfontpanel.c:751
msgid "OK"
msgstr "OK"
#: ../../WINGs/wcolorpanel.c:1250 ../../WINGs/wcolorpanel.c:1286
#: ../../WINGs/wcolorpanel.c:1304
msgid "Color Panel: Could not find file"
msgstr "Panneau de sélection des couleurs : Impossible de trouver le fichier."
#: ../../WINGs/wcolorpanel.c:1491 ../../WINGs/wcolorpanel.c:1556
#: ../../WINGs/wcolorpanel.c:1620
msgid "Color Panel: X failed request"
msgstr "Panneau de sélection des couleurs : échec d'une requête X"
#: ../../WINGs/wcolorpanel.c:2865
msgid "Saturation"
msgstr "Saturation"
#: ../../WINGs/wcolorpanel.c:2901
msgid "Hue"
msgstr "Teinte"
#: ../../WINGs/wcolorpanel.c:3151
msgid "Open Palette"
msgstr "Ouvrir une palette"
#: ../../WINGs/wcolorpanel.c:3213
msgid "Invalid file format !"
msgstr "Format de fichier invalide !"
#: ../../WINGs/wcolorpanel.c:3215
#, c-format
msgid "can't remove file %s"
msgstr "Impossible de supprimer le fichier %s."
#: ../../WINGs/wcolorpanel.c:3217
msgid "Couldn't remove file from Configuration Directory !"
msgstr "Impossible de supprimer le fichier du répertoire de configuration !"
#: ../../WINGs/wcolorpanel.c:3244
msgid "Rename"
msgstr "Renommer"
#: ../../WINGs/wcolorpanel.c:3244
msgid "Rename palette to:"
msgstr "Renommer la palette en :"
#: ../../WINGs/wcolorpanel.c:3245 ../../WINGs/wfilepanel.c:259
#: ../../WINGs/wfilepanel.c:662 ../../WINGs/wfilepanel.c:763
msgid "Cancel"
msgstr "Annuler"
#. Careful, this palette exists already
#: ../../WINGs/wcolorpanel.c:3261 ../../WINGs/wfilepanel.c:763
msgid "Warning"
msgstr "Avertissement"
#: ../../WINGs/wcolorpanel.c:3262
msgid ""
"Palette already exists !\n"
"\n"
"Overwrite ?"
msgstr ""
"La palette existe déjà !\n"
"\n"
"Écraser ?"
#: ../../WINGs/wcolorpanel.c:3262 ../../WINGs/wcolorpanel.c:3326
msgid "No"
msgstr "Non"
#: ../../WINGs/wcolorpanel.c:3262 ../../WINGs/wcolorpanel.c:3326
msgid "Yes"
msgstr "Oui"
#: ../../WINGs/wcolorpanel.c:3294
#, c-format
msgid "Couldn't rename palette %s to %s\n"
msgstr "Impossible de renommer la palette %s en %s.\n"
#: ../../WINGs/wcolorpanel.c:3320
msgid "This will permanently remove the palette "
msgstr "Ceci détruira définitivement la palette "
#: ../../WINGs/wcolorpanel.c:3323
msgid ""
".\n"
"\n"
"Are you sure you want to remove this palette ?"
msgstr ""
".\n"
"\n"
"Êtes-vous sûr de vouloir supprimer cette palette ?"
#: ../../WINGs/wcolorpanel.c:3348
#, c-format
msgid "Couldn't remove palette %s\n"
msgstr "Impossible de détruire la palette %s.\n"
#: ../../WINGs/wcolorpanel.c:3647
#, c-format
msgid "Could not open %s"
msgstr "Impossible d'ouvrir %s."
#: ../../WINGs/wcolorpanel.c:3654
#, c-format
msgid "Could not create %s"
msgstr "Impossible de créer %s."
#: ../../WINGs/wcolorpanel.c:3665
#, c-format
msgid "Write error on file %s"
msgstr "Erreur d'écriture dans le fichier %s."
#: ../../WINGs/wcolorpanel.c:3710
msgid "Color Panel: Color unspecified"
msgstr "Panneau de sélection des couleurs: couleur non spécifiée."
#: ../../WINGs/wfilepanel.c:235
msgid "Name:"
msgstr "Nom :"
#: ../../WINGs/wfilepanel.c:332 ../../WINGs/wfilepanel.c:396
msgid "Open"
msgstr "Ouvrir"
#: ../../WINGs/wfilepanel.c:350 ../../WINGs/wfilepanel.c:402
msgid "Save"
msgstr "Enregistrer"
#: ../../WINGs/wfilepanel.c:565
#, c-format
msgid "WINGs: could not open directory %s\n"
msgstr "WINGs : Impossible d'ouvrir le répertoire %s.\n"
#: ../../WINGs/wfilepanel.c:583
#, c-format
msgid "WINGs: could not stat %s\n"
msgstr "WINGs : impossible de lire l'état du fichier %s.\n"
#: ../../WINGs/wfilepanel.c:650 ../../WINGs/wfilepanel.c:973
#: ../../WINGs/wfontpanel.c:750
msgid "Error"
msgstr "Erreur"
#: ../../WINGs/wfilepanel.c:661
msgid "Create Directory"
msgstr "Créer un répertoire"
#: ../../WINGs/wfilepanel.c:662
msgid "Enter directory name"
msgstr "Saisissez le nom du répertoire"
#: ../../WINGs/wfilepanel.c:698 ../../WINGs/wfilepanel.c:737
#: ../../WINGs/wfilepanel.c:768 ../../WINGs/wfilepanel.c:796
msgid "Permission denied."
msgstr "Permission refusée."
#: ../../WINGs/wfilepanel.c:701
#, c-format
msgid "'%s' already exists."
msgstr "'%s' existe déjà."
#: ../../WINGs/wfilepanel.c:704
msgid "Path does not exist."
msgstr "Le chemin n'existe pas."
#: ../../WINGs/wfilepanel.c:734 ../../WINGs/wfilepanel.c:793
#, c-format
msgid "'%s' does not exist."
msgstr "'%s' n'existe pas."
#: ../../WINGs/wfilepanel.c:741 ../../WINGs/wfilepanel.c:800
msgid "Insufficient memory available."
msgstr "Mémoire disponible insuffisante."
#: ../../WINGs/wfilepanel.c:745 ../../WINGs/wfilepanel.c:804
#, c-format
msgid "'%s' is on a read-only filesystem."
msgstr "'%s' est sur un système de fichiers en lecture seule."
#: ../../WINGs/wfilepanel.c:748 ../../WINGs/wfilepanel.c:780
#: ../../WINGs/wfilepanel.c:807
#, c-format
msgid "Can not delete '%s'."
msgstr "Impossible de supprimer '%s'."
#: ../../WINGs/wfilepanel.c:755
#, c-format
msgid "Delete directory %s ?"
msgstr "Supprimer le répertoire %s ?"
#: ../../WINGs/wfilepanel.c:759
#, c-format
msgid "Delete file %s ?"
msgstr "Supprimer le fichier %s ?"
#: ../../WINGs/wfilepanel.c:771
#, c-format
msgid "Directory '%s' does not exist."
msgstr "Le répertoire '%s' n'existe pas."
#: ../../WINGs/wfilepanel.c:774
#, c-format
msgid "Directory '%s' is not empty."
msgstr "Le répertoire '%s' n'est pas vide."
#: ../../WINGs/wfilepanel.c:777
#, c-format
msgid "Directory '%s' is busy."
msgstr "Le répertoire '%s' est occupé."
#: ../../WINGs/wfilepanel.c:790
#, c-format
msgid "'%s' is a directory."
msgstr "'%s' est un répertoire."
#: ../../WINGs/wfilepanel.c:832
#, c-format
msgid "An error occured browsing '%s'."
msgstr "Une erreur s'est produite pendant le parcours de '%s'."
#: ../../WINGs/wfilepanel.c:836
#, c-format
msgid "'%s' is not a directory."
msgstr "'%s' n'est pas un répertoire."
#: ../../WINGs/wfilepanel.c:973
msgid "File does not exist."
msgstr "Le fichier n'existe pas."
#: ../../WINGs/wfont.c:133 ../../WINGs/wfont.c:143
#, c-format
msgid "Invalid size specification '%s' in %s. Using default %d\n"
msgstr ""
"Taille invalide dans %2$s : '%1$s'. Utilisation de la valeur par défaut %3"
"$d\n"
#: ../../WINGs/wfont.c:187
#, c-format
msgid "the following character sets are missing in %s:"
msgstr "Les jeux de caractères suivants manquent dans %s :"
#: ../../WINGs/wfont.c:193
#, c-format
msgid ""
"the string \"%s\" will be used in place of any characters from those sets."
msgstr ""
"La chaîne « %s » sera utilisée à la place de tous les caractères de ces jeux."
#. is arial a good fallback for multibyte?
#: ../../WINGs/wfont.c:599 ../../WINGs/wfont.c:614
#, c-format
msgid "could not load font %s. Trying arial."
msgstr ""
"Impossible de charger la police de caractères %s, essai de la police "
"« arial »."
#: ../../WINGs/wfont.c:606
msgid "could not load antialiased font set. Reverting to standard font sets."
msgstr ""
"Impossible de charger les polices lissées, utilisation des polices normales."
#: ../../WINGs/wfont.c:609
#, c-format
msgid "could not load FontSet %s. Trying fixed."
msgstr ""
"Impossible de charger la famille de polices %s, essai de la famille "
"« fixed »."
#: ../../WINGs/wfont.c:621
msgid "could not load antialiased fonts. Reverting to normal fonts."
msgstr ""
"Impossible de charger les polices lissées, utilisation des polices normales."
#: ../../WINGs/wfont.c:624 ../../WINGs/wfont.c:635
#, c-format
msgid "could not load font %s. Trying fixed."
msgstr ""
"Impossible de charger la police de caractères %s, essai de la police "
"« fixed »."
#: ../../WINGs/wfont.c:629
#, c-format
msgid "could not load font set %s. Trying fixed."
msgstr ""
"Impossible de charger la famille de polices %s, essai de la famille "
"« fixed »."
#: ../../WINGs/wfont.c:639
msgid "could not load fixed font!"
msgstr "Impossible de charger la police de caractères « fixed » !"
#: ../../WINGs/wfont.c:704 ../../WINGs/wfont.c:765 ../../WINGs/wfont.c:836
#, c-format
msgid ""
"Conversion to widechar failed (possible invalid multibyte sequence): '%s':"
"(pos %d)\n"
msgstr ""
"Échec de la conversion en widechar (probablement une séquence d'octets "
"erronée) : « %s » (pos %d)\n"
#: ../../WINGs/wfont.c:887
#, c-format
msgid "font description %s is too large."
msgstr "La description de la police de caractères %s est trop volumineuse."
#. // remove warning later. or maybe not
#: ../../WINGs/wfont.c:935
#, c-format
msgid "Invalid font specification: '%s'\n"
msgstr "Déclaration de police invalide : « %s »\n"
#: ../../WINGs/wfontpanel.c:235
msgid "Test!!!"
msgstr "Test !"
#: ../../WINGs/wfontpanel.c:241
msgid "Family"
msgstr "Famille"
#: ../../WINGs/wfontpanel.c:252
msgid "Typeface"
msgstr "Caractère"
#: ../../WINGs/wfontpanel.c:263
msgid "Size"
msgstr "Taille"
#: ../../WINGs/wfontpanel.c:282
msgid "Set"
msgstr "Famille"
#: ../../WINGs/wfontpanel.c:288
msgid "Revert"
msgstr "Revenir"
#: ../../WINGs/wfontpanel.c:751
msgid "Could not retrieve font list"
msgstr "Impossible de lire la liste des polices de caractères."
#: ../../WINGs/wfontpanel.c:765
#, c-format
msgid "font name %s is longer than 256, which is invalid."
msgstr ""
"Le nom de police %s a plus de 256 caractères et est par conséquent invalide."
#: ../../WINGs/wfontpanel.c:913
msgid "Roman"
msgstr "Roman"
#: ../../WINGs/wfontpanel.c:916
msgid "Italic"
msgstr "Italique"
#: ../../WINGs/wfontpanel.c:918
msgid "Oblique"
msgstr "Penché"
#: ../../WINGs/wfontpanel.c:920
msgid "Rev Italic"
msgstr "Italique inverse"
#: ../../WINGs/wfontpanel.c:922
msgid "Rev Oblique"
msgstr "Penché inverse"
#: ../../WINGs/wfontpanel.c:928
msgid "Normal"
msgstr "Normal"
#: ../../WINGs/widgets.c:419
#, c-format
msgid "WINGs: could not load widget images file: %s"
msgstr "WINGs : impossible de charger le fichier d'images de widget '%s'."
#: ../../WINGs/widgets.c:770
msgid ""
"Text antialiasing is enabled in the configuration but the X server doesn't "
"have the required capabilities (missing RENDER extension). Disabling text "
"antialiasing."
msgstr ""
"Le lissage du texte est activé dans la configuration mais le serveur X ne "
"dispose pas de l'extension adéquate (extension RENDER). Desactivation du "
"lissage."
#: ../../WINGs/widgets.c:787
msgid ""
"could not load any fonts. Make sure your font installation and locale "
"settings are correct."
msgstr ""
"Aucune police n'a pu être chargée. Veuillez vérifier que vos polices sont "
"correctement installées et que votre langue est bien configurée."
#: ../../WINGs/wruler.c:192
msgid "0 inches"
msgstr "0 pouces"

782
WINGs/po/sk.po
View File

File diff suppressed because it is too large Load Diff

369
WINGs/proplist.c
View File

@@ -1,5 +1,4 @@
#include <string.h> #include <string.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
@@ -12,8 +11,6 @@
#include "WUtil.h" #include "WUtil.h"
#include "wconfig.h" #include "wconfig.h"
typedef enum { typedef enum {
WPLString = 0x57504c01, WPLString = 0x57504c01,
WPLData = 0x57504c02, WPLData = 0x57504c02,
@@ -21,7 +18,6 @@ typedef enum {
WPLDictionary = 0x57504c04 WPLDictionary = 0x57504c04
} WPLType; } WPLType;
typedef struct W_PropList { typedef struct W_PropList {
WPLType type; WPLType type;
@@ -35,7 +31,6 @@ typedef struct W_PropList {
int retainCount; int retainCount;
} W_PropList; } W_PropList;
typedef struct PLData { typedef struct PLData {
char *ptr; char *ptr;
int pos; int pos;
@@ -43,13 +38,11 @@ typedef struct PLData {
int lineNumber; int lineNumber;
} PLData; } PLData;
typedef struct StringBuffer { typedef struct StringBuffer {
char *str; char *str;
int size; int size;
} StringBuffer; } StringBuffer;
static unsigned hashPropList(WMPropList * plist); static unsigned hashPropList(WMPropList * plist);
static WMPropList *getPLString(PLData * pldata); static WMPropList *getPLString(PLData * pldata);
static WMPropList *getPLQString(PLData * pldata); static WMPropList *getPLQString(PLData * pldata);
@@ -58,8 +51,6 @@ static WMPropList* getPLArray(PLData *pldata);
static WMPropList *getPLDictionary(PLData * pldata); static WMPropList *getPLDictionary(PLData * pldata);
static WMPropList *getPropList(PLData * pldata); static WMPropList *getPropList(PLData * pldata);
typedef unsigned (*hashFunc) (const void *); typedef unsigned (*hashFunc) (const void *);
typedef Bool(*isEqualFunc) (const void *, const void *); typedef Bool(*isEqualFunc) (const void *, const void *);
typedef void *(*retainFunc) (const void *); typedef void *(*retainFunc) (const void *);
@@ -72,16 +63,11 @@ static const WMHashTableCallbacks WMPropListHashCallbacks = {
(releaseFunc) NULL (releaseFunc) NULL
}; };
static Bool caseSensitive = True; static Bool caseSensitive = True;
#define BUFFERSIZE 8192 #define BUFFERSIZE 8192
#define BUFFERSIZE_INCREMENT 1024 #define BUFFERSIZE_INCREMENT 1024
#if 0 #if 0
# define DPUT(s) puts(s) # define DPUT(s) puts(s)
#else #else
@@ -102,7 +88,6 @@ static Bool caseSensitive = True;
(buf).str = wrealloc((buf).str, (buf).size);\ (buf).str = wrealloc((buf).str, (buf).size);\
} }
#define inrange(ch, min, max) ((ch)>=(min) && (ch)<=(max)) #define inrange(ch, min, max) ((ch)>=(min) && (ch)<=(max))
#define noquote(ch) (inrange(ch, 'a', 'z') || inrange(ch, 'A', 'Z') || inrange(ch, '0', '9') || ((ch)=='_') || ((ch)=='.') || ((ch)=='$')) #define noquote(ch) (inrange(ch, 'a', 'z') || inrange(ch, 'A', 'Z') || inrange(ch, '0', '9') || ((ch)=='_') || ((ch)=='.') || ((ch)=='$'))
#define charesc(ch) (inrange(ch, 0x07, 0x0c) || ((ch)=='"') || ((ch)=='\\')) #define charesc(ch) (inrange(ch, 0x07, 0x0c) || ((ch)=='"') || ((ch)=='\\'))
@@ -111,12 +96,9 @@ static Bool caseSensitive = True;
#define char2num(ch) (inrange(ch,'0','9') ? ((ch)-'0') : (inrange(ch,'a','f') ? ((ch)-0x57) : ((ch)-0x37))) #define char2num(ch) (inrange(ch,'0','9') ? ((ch)-'0') : (inrange(ch,'a','f') ? ((ch)-0x57) : ((ch)-0x37)))
#define num2char(num) ((num) < 0xa ? ((num)+'0') : ((num)+0x57)) #define num2char(num) ((num) < 0xa ? ((num)+'0') : ((num)+0x57))
#define MaxHashLength 64 #define MaxHashLength 64
static unsigned static unsigned hashPropList(WMPropList * plist)
hashPropList(WMPropList *plist)
{ {
unsigned ret = 0; unsigned ret = 0;
unsigned ctr = 0; unsigned ctr = 0;
@@ -155,8 +137,7 @@ hashPropList(WMPropList *plist)
return ret; return ret;
} }
static WMPropList* static WMPropList *retainPropListByCount(WMPropList * plist, int count)
retainPropListByCount(WMPropList *plist, int count)
{ {
WMPropList *key, *value; WMPropList *key, *value;
WMHashEnumerator e; WMHashEnumerator e;
@@ -189,9 +170,7 @@ retainPropListByCount(WMPropList *plist, int count)
return plist; return plist;
} }
static void releasePropListByCount(WMPropList * plist, int count)
static void
releasePropListByCount(WMPropList *plist, int count)
{ {
WMPropList *key, *value; WMPropList *key, *value;
WMHashEnumerator e; WMHashEnumerator e;
@@ -239,9 +218,7 @@ releasePropListByCount(WMPropList *plist, int count)
} }
} }
static char *dataDescription(WMPropList * plist)
static char*
dataDescription(WMPropList *plist)
{ {
const unsigned char *data; const unsigned char *data;
char *retVal; char *retVal;
@@ -267,9 +244,7 @@ dataDescription(WMPropList *plist)
return retVal; return retVal;
} }
static char *stringDescription(WMPropList * plist)
static char*
stringDescription(WMPropList *plist)
{ {
const char *str; const char *str;
char *retVal, *sPtr, *dPtr; char *retVal, *sPtr, *dPtr;
@@ -314,13 +289,26 @@ stringDescription(WMPropList *plist)
if (charesc(ch)) { if (charesc(ch)) {
*(dPtr++) = '\\'; *(dPtr++) = '\\';
switch (ch) { switch (ch) {
case '\a': *dPtr = 'a'; break; case '\a':
case '\b': *dPtr = 'b'; break; *dPtr = 'a';
case '\t': *dPtr = 't'; break; break;
case '\n': *dPtr = 'n'; break; case '\b':
case '\v': *dPtr = 'v'; break; *dPtr = 'b';
case '\f': *dPtr = 'f'; break; break;
default: *dPtr = ch; /* " or \ */ case '\t':
*dPtr = 't';
break;
case '\n':
*dPtr = 'n';
break;
case '\v':
*dPtr = 'v';
break;
case '\f':
*dPtr = 'f';
break;
default:
*dPtr = ch; /* " or \ */
} }
} else if (numesc(ch)) { } else if (numesc(ch)) {
*(dPtr++) = '\\'; *(dPtr++) = '\\';
@@ -342,9 +330,7 @@ stringDescription(WMPropList *plist)
return retVal; return retVal;
} }
static char *description(WMPropList * plist)
static char*
description(WMPropList *plist)
{ {
WMPropList *key, *val; WMPropList *key, *val;
char *retstr = NULL; char *retstr = NULL;
@@ -399,9 +385,7 @@ description(WMPropList *plist)
return retstr; return retstr;
} }
static char *indentedDescription(WMPropList * plist, int level)
static char*
indentedDescription(WMPropList *plist, int level)
{ {
WMPropList *key, *val; WMPropList *key, *val;
char *retstr = NULL; char *retstr = NULL;
@@ -409,7 +393,7 @@ indentedDescription(WMPropList *plist, int level)
WMHashEnumerator e; WMHashEnumerator e;
int i; int i;
if (plist->type==WPLArray || plist->type==WPLDictionary) { if (plist->type == WPLArray /* || plist->type==WPLDictionary */ ) {
retstr = description(plist); retstr = description(plist);
if (retstr && ((2 * (level + 1) + strlen(retstr)) <= 77)) { if (retstr && ((2 * (level + 1) + strlen(retstr)) <= 77)) {
@@ -430,8 +414,7 @@ indentedDescription(WMPropList *plist, int level)
case WPLArray: case WPLArray:
retstr = wstrdup("(\n"); retstr = wstrdup("(\n");
for (i = 0; i < WMGetArrayItemCount(plist->d.array); i++) { for (i = 0; i < WMGetArrayItemCount(plist->d.array); i++) {
str = indentedDescription(WMGetFromArray(plist->d.array, i), str = indentedDescription(WMGetFromArray(plist->d.array, i), level + 1);
level+1);
if (i == 0) { if (i == 0) {
tmp = (char *)wmalloc(2 * (level + 1) + strlen(retstr) + strlen(str) + 1); tmp = (char *)wmalloc(2 * (level + 1) + strlen(retstr) + strlen(str) + 1);
sprintf(tmp, "%s%*s%s", retstr, 2 * (level + 1), "", str); sprintf(tmp, "%s%*s%s", retstr, 2 * (level + 1), "", str);
@@ -458,8 +441,7 @@ indentedDescription(WMPropList *plist, int level)
sval = indentedDescription(val, level + 1); sval = indentedDescription(val, level + 1);
tmp = (char *)wmalloc(2 * (level + 1) + strlen(retstr) + strlen(skey) tmp = (char *)wmalloc(2 * (level + 1) + strlen(retstr) + strlen(skey)
+ strlen(sval) + 6); + strlen(sval) + 6);
sprintf(tmp, "%s%*s%s = %s;\n", retstr, 2*(level+1), "", sprintf(tmp, "%s%*s%s = %s;\n", retstr, 2 * (level + 1), "", skey, sval);
skey, sval);
wfree(skey); wfree(skey);
wfree(sval); wfree(sval);
wfree(retstr); wfree(retstr);
@@ -479,9 +461,7 @@ indentedDescription(WMPropList *plist, int level)
return retstr; return retstr;
} }
static INLINE int getChar(PLData * pldata)
static INLINE int
getChar(PLData *pldata)
{ {
int c; int c;
@@ -498,9 +478,7 @@ getChar(PLData *pldata)
return c; return c;
} }
static INLINE int getNonSpaceChar(PLData * pldata)
static INLINE int
getNonSpaceChar(PLData *pldata)
{ {
int c; int c;
@@ -520,15 +498,12 @@ getNonSpaceChar(PLData *pldata)
return c; return c;
} }
static char *unescapestr(char *src)
static char*
unescapestr(char *src)
{ {
char *dest = wmalloc(strlen(src) + 1); char *dest = wmalloc(strlen(src) + 1);
char *sPtr, *dPtr; char *sPtr, *dPtr;
char ch; char ch;
for (sPtr = src, dPtr = dest; *sPtr; sPtr++, dPtr++) { for (sPtr = src, dPtr = dest; *sPtr; sPtr++, dPtr++) {
if (*sPtr != '\\') { if (*sPtr != '\\') {
*dPtr = *sPtr; *dPtr = *sPtr;
@@ -541,14 +516,29 @@ unescapestr(char *src)
*dPtr |= *(++sPtr) & 07; *dPtr |= *(++sPtr) & 07;
} else { } else {
switch (ch) { switch (ch) {
case 'a' : *dPtr = '\a'; break; case 'a':
case 'b' : *dPtr = '\b'; break; *dPtr = '\a';
case 't' : *dPtr = '\t'; break; break;
case 'r' : *dPtr = '\r'; break; case 'b':
case 'n' : *dPtr = '\n'; break; *dPtr = '\b';
case 'v' : *dPtr = '\v'; break; break;
case 'f' : *dPtr = '\f'; break; case 't':
default : *dPtr = *sPtr; *dPtr = '\t';
break;
case 'r':
*dPtr = '\r';
break;
case 'n':
*dPtr = '\n';
break;
case 'v':
*dPtr = '\v';
break;
case 'f':
*dPtr = '\f';
break;
default:
*dPtr = *sPtr;
} }
} }
} }
@@ -559,9 +549,7 @@ unescapestr(char *src)
return dest; return dest;
} }
static WMPropList *getPLString(PLData * pldata)
static WMPropList*
getPLString(PLData *pldata)
{ {
WMPropList *plist; WMPropList *plist;
StringBuffer sBuf; StringBuffer sBuf;
@@ -599,9 +587,7 @@ getPLString(PLData *pldata)
return plist; return plist;
} }
static WMPropList *getPLQString(PLData * pldata)
static WMPropList*
getPLQString(PLData *pldata)
{ {
WMPropList *plist; WMPropList *plist;
int ptr = 0, escaping = 0, ok = 1; int ptr = 0, escaping = 0, ok = 1;
@@ -651,9 +637,7 @@ getPLQString(PLData *pldata)
return plist; return plist;
} }
static WMPropList *getPLData(PLData * pldata)
static WMPropList*
getPLData(PLData *pldata)
{ {
int ok = 1; int ok = 1;
int len = 0; int len = 0;
@@ -691,6 +675,10 @@ getPLData(PLData *pldata)
ok = 0; ok = 0;
break; break;
} }
} else {
COMPLAIN(pldata, _("non hexdigit character in PropList data"));
ok = 0;
break;
} }
} }
@@ -708,9 +696,7 @@ getPLData(PLData *pldata)
return plist; return plist;
} }
static WMPropList *getPLArray(PLData * pldata)
static WMPropList*
getPLArray(PLData *pldata)
{ {
Bool first = True; Bool first = True;
int ok = 1; int ok = 1;
@@ -730,7 +716,7 @@ getPLArray(PLData *pldata)
} else if (c == ',') { } else if (c == ',') {
/* continue normally */ /* continue normally */
} else if (!first) { } else if (!first) {
COMPLAIN(pldata, _("missing , or unterminated PropList array")); COMPLAIN(pldata, _("missing or unterminated PropList array"));
ok = 0; ok = 0;
break; break;
} else { } else {
@@ -756,9 +742,7 @@ getPLArray(PLData *pldata)
return array; return array;
} }
static WMPropList *getPLDictionary(PLData * pldata)
static WMPropList*
getPLDictionary(PLData *pldata)
{ {
int ok = 1; int ok = 1;
int c; int c;
@@ -840,9 +824,7 @@ getPLDictionary(PLData *pldata)
return dict; return dict;
} }
static WMPropList *getPropList(PLData * pldata)
static WMPropList*
getPropList(PLData *pldata)
{ {
WMPropList *plist; WMPropList *plist;
int c; int c;
@@ -861,7 +843,7 @@ getPropList(PLData *pldata)
break; break;
case '(': case '(':
DPUT("Getting PropList srrsy"); DPUT("Getting PropList array");
plist = getPLArray(pldata); plist = getPLArray(pldata);
break; break;
@@ -882,11 +864,9 @@ getPropList(PLData *pldata)
plist = getPLString(pldata); plist = getPLString(pldata);
} else { } else {
COMPLAIN(pldata, _("was expecting a string, data, array or " COMPLAIN(pldata, _("was expecting a string, data, array or "
"dictionary. If it's a string, try enclosing " "dictionary. If it's a string, try enclosing " "it with \"."));
"it with \"."));
if (c == '#' || c == '/') { if (c == '#' || c == '/') {
wwarning(_("Comments are not allowed inside WindowMaker owned" wwarning(_("Comments are not allowed inside WindowMaker owned" " domain files."));
" domain files."));
} }
plist = NULL; plist = NULL;
} }
@@ -896,16 +876,12 @@ getPropList(PLData *pldata)
return plist; return plist;
} }
void WMPLSetCaseSensitive(Bool caseSensitiveness)
void
WMPLSetCaseSensitive(Bool caseSensitiveness)
{ {
caseSensitive = caseSensitiveness; caseSensitive = caseSensitiveness;
} }
WMPropList *WMCreatePLString(char *str)
WMPropList*
WMCreatePLString(char *str)
{ {
WMPropList *plist; WMPropList *plist;
@@ -920,9 +896,7 @@ WMCreatePLString(char *str)
return plist; return plist;
} }
WMPropList *WMCreatePLData(WMData * data)
WMPropList*
WMCreatePLData(WMData *data)
{ {
WMPropList *plist; WMPropList *plist;
@@ -937,9 +911,7 @@ WMCreatePLData(WMData *data)
return plist; return plist;
} }
WMPropList *WMCreatePLDataWithBytes(unsigned char *bytes, unsigned int length)
WMPropList*
WMCreatePLDataWithBytes(unsigned char *bytes, unsigned int length)
{ {
WMPropList *plist; WMPropList *plist;
@@ -954,10 +926,7 @@ WMCreatePLDataWithBytes(unsigned char *bytes, unsigned int length)
return plist; return plist;
} }
WMPropList *WMCreatePLDataWithBytesNoCopy(unsigned char *bytes, unsigned int length, WMFreeDataProc * destructor)
WMPropList*
WMCreatePLDataWithBytesNoCopy(unsigned char *bytes, unsigned int length,
WMFreeDataProc *destructor)
{ {
WMPropList *plist; WMPropList *plist;
@@ -972,9 +941,7 @@ WMCreatePLDataWithBytesNoCopy(unsigned char *bytes, unsigned int length,
return plist; return plist;
} }
WMPropList *WMCreatePLArray(WMPropList * elem, ...)
WMPropList*
WMCreatePLArray(WMPropList *elem, ...)
{ {
WMPropList *plist, *nelem; WMPropList *plist, *nelem;
va_list ap; va_list ap;
@@ -1001,9 +968,7 @@ WMCreatePLArray(WMPropList *elem, ...)
} }
} }
WMPropList *WMCreatePLDictionary(WMPropList * key, WMPropList * value, ...)
WMPropList*
WMCreatePLDictionary(WMPropList *key, WMPropList *value, ...)
{ {
WMPropList *plist, *nkey, *nvalue, *k, *v; WMPropList *plist, *nkey, *nvalue, *k, *v;
va_list ap; va_list ap;
@@ -1036,14 +1001,11 @@ WMCreatePLDictionary(WMPropList *key, WMPropList *value, ...)
WMReleasePropList(k); WMReleasePropList(k);
WMReleasePropList(v); WMReleasePropList(v);
} }
WMHashInsert(plist->d.dict, WMRetainPropList(nkey), WMHashInsert(plist->d.dict, WMRetainPropList(nkey), WMRetainPropList(nvalue));
WMRetainPropList(nvalue));
} }
} }
WMPropList *WMRetainPropList(WMPropList * plist)
WMPropList*
WMRetainPropList(WMPropList *plist)
{ {
WMPropList *key, *value; WMPropList *key, *value;
WMHashEnumerator e; WMHashEnumerator e;
@@ -1076,9 +1038,7 @@ WMRetainPropList(WMPropList *plist)
return plist; return plist;
} }
void WMReleasePropList(WMPropList * plist)
void
WMReleasePropList(WMPropList *plist)
{ {
WMPropList *key, *value; WMPropList *key, *value;
WMHashEnumerator e; WMHashEnumerator e;
@@ -1126,9 +1086,7 @@ WMReleasePropList(WMPropList *plist)
} }
} }
void WMInsertInPLArray(WMPropList * plist, int index, WMPropList * item)
void
WMInsertInPLArray(WMPropList *plist, int index, WMPropList *item)
{ {
wassertr(plist->type == WPLArray); wassertr(plist->type == WPLArray);
@@ -1136,9 +1094,7 @@ WMInsertInPLArray(WMPropList *plist, int index, WMPropList *item)
WMInsertInArray(plist->d.array, index, item); WMInsertInArray(plist->d.array, index, item);
} }
void WMAddToPLArray(WMPropList * plist, WMPropList * item)
void
WMAddToPLArray(WMPropList *plist, WMPropList *item)
{ {
wassertr(plist->type == WPLArray); wassertr(plist->type == WPLArray);
@@ -1146,9 +1102,7 @@ WMAddToPLArray(WMPropList *plist, WMPropList *item)
WMAddToArray(plist->d.array, item); WMAddToArray(plist->d.array, item);
} }
void WMDeleteFromPLArray(WMPropList * plist, int index)
void
WMDeleteFromPLArray(WMPropList *plist, int index)
{ {
WMPropList *item; WMPropList *item;
@@ -1161,9 +1115,7 @@ WMDeleteFromPLArray(WMPropList *plist, int index)
} }
} }
void WMRemoveFromPLArray(WMPropList * plist, WMPropList * item)
void
WMRemoveFromPLArray(WMPropList *plist, WMPropList *item)
{ {
WMPropList *iPtr; WMPropList *iPtr;
int i; int i;
@@ -1180,9 +1132,7 @@ WMRemoveFromPLArray(WMPropList *plist, WMPropList *item)
} }
} }
void WMPutInPLDictionary(WMPropList * plist, WMPropList * key, WMPropList * value)
void
WMPutInPLDictionary(WMPropList *plist, WMPropList *key, WMPropList *value)
{ {
wassertr(plist->type == WPLDictionary); wassertr(plist->type == WPLDictionary);
@@ -1194,9 +1144,7 @@ WMPutInPLDictionary(WMPropList *plist, WMPropList *key, WMPropList *value)
/*WMReleasePropList(key); */ /*WMReleasePropList(key); */
} }
void WMRemoveFromPLDictionary(WMPropList * plist, WMPropList * key)
void
WMRemoveFromPLDictionary(WMPropList *plist, WMPropList *key)
{ {
WMPropList *k, *v; WMPropList *k, *v;
@@ -1209,26 +1157,66 @@ WMRemoveFromPLDictionary(WMPropList *plist, WMPropList *key)
} }
} }
WMPropList *WMMergePLDictionaries(WMPropList * dest, WMPropList * source, Bool recursive)
WMPropList*
WMMergePLDictionaries(WMPropList *dest, WMPropList *source)
{ {
WMPropList *key, *value; WMPropList *key, *value, *dvalue;
WMHashEnumerator e; WMHashEnumerator e;
wassertr(source->type == WPLDictionary && dest->type == WPLDictionary); wassertr(source->type == WPLDictionary && dest->type == WPLDictionary);
if (source == dest)
return dest;
e = WMEnumerateHashTable(source->d.dict); e = WMEnumerateHashTable(source->d.dict);
while (WMNextHashEnumeratorItemAndKey(&e, (void **)&value, (void **)&key)) { while (WMNextHashEnumeratorItemAndKey(&e, (void **)&value, (void **)&key)) {
if (recursive && value->type == WPLDictionary) {
dvalue = WMHashGet(dest->d.dict, key);
if (dvalue && dvalue->type == WPLDictionary) {
WMMergePLDictionaries(dvalue, value, True);
} else {
WMPutInPLDictionary(dest, key, value); WMPutInPLDictionary(dest, key, value);
} }
} else {
WMPutInPLDictionary(dest, key, value);
}
}
return dest; return dest;
} }
WMPropList *WMSubtractPLDictionaries(WMPropList * dest, WMPropList * source, Bool recursive)
{
WMPropList *key, *value, *dvalue;
WMHashEnumerator e;
int wassertr(source->type == WPLDictionary && dest->type == WPLDictionary);
WMGetPropListItemCount(WMPropList *plist)
if (source == dest) {
WMPropList *keys = WMGetPLDictionaryKeys(dest);
int i;
for (i = 0; i < WMGetArrayItemCount(keys->d.array); i++) {
WMRemoveFromPLDictionary(dest, WMGetFromArray(keys->d.array, i));
}
return dest;
}
e = WMEnumerateHashTable(source->d.dict);
while (WMNextHashEnumeratorItemAndKey(&e, (void **)&value, (void **)&key)) {
dvalue = WMHashGet(dest->d.dict, key);
if (!dvalue)
continue;
if (WMIsPropListEqualTo(value, dvalue)) {
WMRemoveFromPLDictionary(dest, key);
} else if (recursive && value->type == WPLDictionary && dvalue->type == WPLDictionary) {
WMSubtractPLDictionaries(dvalue, value, True);
}
}
return dest;
}
int WMGetPropListItemCount(WMPropList * plist)
{ {
switch (plist->type) { switch (plist->type) {
case WPLString: case WPLString:
@@ -1247,37 +1235,27 @@ WMGetPropListItemCount(WMPropList *plist)
return 0; return 0;
} }
Bool WMIsPLString(WMPropList * plist)
Bool
WMIsPLString(WMPropList *plist)
{ {
return (plist->type == WPLString); return (plist->type == WPLString);
} }
Bool WMIsPLData(WMPropList * plist)
Bool
WMIsPLData(WMPropList *plist)
{ {
return (plist->type == WPLData); return (plist->type == WPLData);
} }
Bool WMIsPLArray(WMPropList * plist)
Bool
WMIsPLArray(WMPropList *plist)
{ {
return (plist->type == WPLArray); return (plist->type == WPLArray);
} }
Bool WMIsPLDictionary(WMPropList * plist)
Bool
WMIsPLDictionary(WMPropList *plist)
{ {
return (plist->type == WPLDictionary); return (plist->type == WPLDictionary);
} }
Bool WMIsPropListEqualTo(WMPropList * plist, WMPropList * other)
Bool
WMIsPropListEqualTo(WMPropList *plist, WMPropList *other)
{ {
WMPropList *key1, *item1, *item2; WMPropList *key1, *item1, *item2;
WMHashEnumerator enumerator; WMHashEnumerator enumerator;
@@ -1310,8 +1288,7 @@ WMIsPropListEqualTo(WMPropList *plist, WMPropList *other)
if (WMCountHashTable(plist->d.dict) != WMCountHashTable(other->d.dict)) if (WMCountHashTable(plist->d.dict) != WMCountHashTable(other->d.dict))
return False; return False;
enumerator = WMEnumerateHashTable(plist->d.dict); enumerator = WMEnumerateHashTable(plist->d.dict);
while (WMNextHashEnumeratorItemAndKey(&enumerator, (void**)&item1, while (WMNextHashEnumeratorItemAndKey(&enumerator, (void **)&item1, (void **)&key1)) {
(void**)&key1)) {
item2 = WMHashGet(other->d.dict, key1); item2 = WMHashGet(other->d.dict, key1);
if (!item2 || !item1 || !WMIsPropListEqualTo(item1, item2)) if (!item2 || !item1 || !WMIsPropListEqualTo(item1, item2))
return False; return False;
@@ -1326,63 +1303,49 @@ WMIsPropListEqualTo(WMPropList *plist, WMPropList *other)
return False; return False;
} }
char *WMGetFromPLString(WMPropList * plist)
char*
WMGetFromPLString(WMPropList *plist)
{ {
wassertrv(plist->type == WPLString, NULL); wassertrv(plist->type == WPLString, NULL);
return plist->d.string; return plist->d.string;
} }
WMData *WMGetFromPLData(WMPropList * plist)
WMData*
WMGetFromPLData(WMPropList *plist)
{ {
wassertrv(plist->type == WPLData, NULL); wassertrv(plist->type == WPLData, NULL);
return plist->d.data; return plist->d.data;
} }
const unsigned char *WMGetPLDataBytes(WMPropList * plist)
const unsigned char*
WMGetPLDataBytes(WMPropList *plist)
{ {
wassertrv(plist->type == WPLData, NULL); wassertrv(plist->type == WPLData, NULL);
return WMDataBytes(plist->d.data); return WMDataBytes(plist->d.data);
} }
int WMGetPLDataLength(WMPropList * plist)
int
WMGetPLDataLength(WMPropList *plist)
{ {
wassertrv(plist->type == WPLData, 0); wassertrv(plist->type == WPLData, 0);
return WMGetDataLength(plist->d.data); return WMGetDataLength(plist->d.data);
} }
WMPropList *WMGetFromPLArray(WMPropList * plist, int index)
WMPropList*
WMGetFromPLArray(WMPropList *plist, int index)
{ {
wassertrv(plist->type == WPLArray, NULL); wassertrv(plist->type == WPLArray, NULL);
return WMGetFromArray(plist->d.array, index); return WMGetFromArray(plist->d.array, index);
} }
WMPropList *WMGetFromPLDictionary(WMPropList * plist, WMPropList * key)
WMPropList*
WMGetFromPLDictionary(WMPropList *plist, WMPropList *key)
{ {
wassertrv(plist->type == WPLDictionary, NULL); wassertrv(plist->type == WPLDictionary, NULL);
return WMHashGet(plist->d.dict, key); return WMHashGet(plist->d.dict, key);
} }
WMPropList *WMGetPLDictionaryKeys(WMPropList * plist)
WMPropList*
WMGetPLDictionaryKeys(WMPropList *plist)
{ {
WMPropList *array, *key; WMPropList *array, *key;
WMHashEnumerator enumerator; WMHashEnumerator enumerator;
@@ -1402,9 +1365,7 @@ WMGetPLDictionaryKeys(WMPropList *plist)
return array; return array;
} }
WMPropList *WMShallowCopyPropList(WMPropList * plist)
WMPropList*
WMShallowCopyPropList(WMPropList *plist)
{ {
WMPropList *ret = NULL; WMPropList *ret = NULL;
WMPropList *key, *item; WMPropList *key, *item;
@@ -1447,9 +1408,7 @@ WMShallowCopyPropList(WMPropList *plist)
return ret; return ret;
} }
WMPropList *WMDeepCopyPropList(WMPropList * plist)
WMPropList*
WMDeepCopyPropList(WMPropList *plist)
{ {
WMPropList *ret = NULL; WMPropList *ret = NULL;
WMPropList *key, *item; WMPropList *key, *item;
@@ -1481,8 +1440,7 @@ WMDeepCopyPropList(WMPropList *plist)
* pair before inserting the new key/value. * pair before inserting the new key/value.
*/ */
while (WMNextHashEnumeratorItemAndKey(&e, (void **)&item, (void **)&key)) { while (WMNextHashEnumeratorItemAndKey(&e, (void **)&item, (void **)&key)) {
WMHashInsert(ret->d.dict, WMDeepCopyPropList(key), WMHashInsert(ret->d.dict, WMDeepCopyPropList(key), WMDeepCopyPropList(item));
WMDeepCopyPropList(item));
} }
break; break;
default: default:
@@ -1494,9 +1452,7 @@ WMDeepCopyPropList(WMPropList *plist)
return ret; return ret;
} }
WMPropList *WMCreatePropListFromDescription(char *desc)
WMPropList*
WMCreatePropListFromDescription(char *desc)
{ {
WMPropList *plist = NULL; WMPropList *plist = NULL;
PLData *pldata; PLData *pldata;
@@ -1525,16 +1481,12 @@ WMCreatePropListFromDescription(char *desc)
return plist; return plist;
} }
char *WMGetPropListDescription(WMPropList * plist, Bool indented)
char*
WMGetPropListDescription(WMPropList *plist, Bool indented)
{ {
return (indented ? indentedDescription(plist, 0) : description(plist)); return (indented ? indentedDescription(plist, 0) : description(plist));
} }
WMPropList *WMReadPropListFromFile(char *file)
WMPropList*
WMReadPropListFromFile(char *file)
{ {
WMPropList *plist = NULL; WMPropList *plist = NULL;
PLData *pldata; PLData *pldata;
@@ -1542,16 +1494,17 @@ WMReadPropListFromFile(char *file)
struct stat stbuf; struct stat stbuf;
size_t length; size_t length;
f = fopen(file, "r"); f = fopen(file, "rb");
if (!f) { if (!f) {
wsyserror(_("could not open domain file %s for reading"), file); /* let the user print the error message if he really needs to */
/*wsyserror(_("could not open domain file '%s' for reading"), file); */
return NULL; return NULL;
} }
if (stat(file, &stbuf) == 0) { if (stat(file, &stbuf) == 0) {
length = (size_t) stbuf.st_size; length = (size_t) stbuf.st_size;
} else { } else {
wsyserror(_("could not get size for domain file %s"), file); wsyserror(_("could not get size for file '%s'"), file);
fclose(f); fclose(f);
return NULL; return NULL;
} }
@@ -1563,7 +1516,9 @@ WMReadPropListFromFile(char *file)
pldata->lineNumber = 1; pldata->lineNumber = 1;
if (fread(pldata->ptr, length, 1, f) != 1) { if (fread(pldata->ptr, length, 1, f) != 1) {
wsyserror(_("error reading from file %s"), file); if (ferror(f)) {
wsyserror(_("error reading from file '%s'"), file);
}
plist = NULL; plist = NULL;
goto cleanup; goto cleanup;
} }
@@ -1592,11 +1547,9 @@ cleanup:
return plist; return plist;
} }
/* TODO: review this function's code */ /* TODO: review this function's code */
Bool Bool WMWritePropListToFile(WMPropList * plist, char *path, Bool atomically)
WMWritePropListToFile(WMPropList *plist, char *path, Bool atomically)
{ {
char *thePath = NULL; char *thePath = NULL;
char *desc; char *desc;
@@ -1620,7 +1573,7 @@ WMWritePropListToFile(WMPropList *plist, char *path, Bool atomically)
mask = umask(0); mask = umask(0);
umask(mask); umask(mask);
fchmod(fd, 0644 & ~mask); fchmod(fd, 0644 & ~mask);
if ((theFile = fdopen(fd, "w")) == NULL) { if ((theFile = fdopen(fd, "wb")) == NULL) {
close(fd); close(fd);
} }
#else #else
@@ -1676,5 +1629,3 @@ failure:
return False; return False;
} }

49
WINGs/puzzle.c
View File

@@ -1,15 +1,10 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <WINGs.h> #include <WINGs.h>
#define MAX_SIZE 10*10 #define MAX_SIZE 10*10
WMWindow *win; WMWindow *win;
WMButton *Button[MAX_SIZE]; WMButton *Button[MAX_SIZE];
char Map[MAX_SIZE]; char Map[MAX_SIZE];
@@ -20,7 +15,6 @@ int MoveCount;
int WinSize = 120; int WinSize = 120;
Bool CheckWin(void) Bool CheckWin(void)
{ {
int i; int i;
@@ -33,13 +27,11 @@ Bool CheckWin(void)
return True; return True;
} }
void MoveButton(int button, int x, int y) void MoveButton(int button, int x, int y)
{ {
WMMoveWidget(Button[button], x * (WinSize / Size), y * (WinSize / Size)); WMMoveWidget(Button[button], x * (WinSize / Size), y * (WinSize / Size));
} }
Bool SlideButton(int button) Bool SlideButton(int button)
{ {
int x, y, done = 0; int x, y, done = 0;
@@ -78,14 +70,12 @@ Bool SlideButton(int button)
return True; return True;
} }
#define SWAP(a,b) {int tmp; tmp=a; a=b; b=tmp;} #define SWAP(a,b) {int tmp; tmp=a; a=b; b=tmp;}
void ResetGame(void) void ResetGame(void)
{ {
int i, x, y, ox, oy; int i, x, y, ox, oy;
MoveCount = 0; MoveCount = 0;
for (i = 0; i < Size * Size - 1; i++) { for (i = 0; i < Size * Size - 1; i++) {
@@ -99,16 +89,28 @@ void ResetGame(void)
ok = 1; ok = 1;
switch (rand() % 4) { switch (rand() % 4) {
case 0: case 0:
if (x > 0) x--; else ok = 0; if (x > 0)
x--;
else
ok = 0;
break; break;
case 2: case 2:
if (x < Size-1) x++; else ok = 0; if (x < Size - 1)
x++;
else
ok = 0;
break; break;
case 1: case 1:
if (y > 0) y--; else ok = 0; if (y > 0)
y--;
else
ok = 0;
break; break;
case 3: case 3:
if (y < Size-1) y++; else ok = 0; if (y < Size - 1)
y++;
else
ok = 0;
break; break;
} }
if (ok) { if (ok) {
@@ -127,7 +129,6 @@ void ResetGame(void)
} }
} }
void buttonClick(WMWidget * w, void *ptr) void buttonClick(WMWidget * w, void *ptr)
{ {
char buffer[300]; char buffer[300];
@@ -148,7 +149,6 @@ void buttonClick(WMWidget *w, void *ptr)
} }
} }
static void resizeObserver(void *self, WMNotification * notif) static void resizeObserver(void *self, WMNotification * notif)
{ {
WMSize size = WMGetViewSize(WMWidgetView(win)); WMSize size = WMGetViewSize(WMWidgetView(win));
@@ -158,17 +158,14 @@ static void resizeObserver(void *self, WMNotification *notif)
for (y = 0; y < Size; y++) { for (y = 0; y < Size; y++) {
for (x = 0; x < Size; x++) { for (x = 0; x < Size; x++) {
if (MAP(x, y) >= 0) { if (MAP(x, y) >= 0) {
WMResizeWidget(Button[(int)MAP(x,y)], WMResizeWidget(Button[(int)MAP(x, y)], WinSize / Size, WinSize / Size);
WinSize/Size, WinSize/Size); WMMoveWidget(Button[(int)MAP(x, y)], x * (WinSize / Size), y * (WinSize / Size));
WMMoveWidget(Button[(int)MAP(x,y)],
x*(WinSize/Size), y*(WinSize/Size));
} }
} }
} }
} }
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
Display *dpy; Display *dpy;
@@ -177,7 +174,6 @@ int main(int argc, char **argv)
WMInitializeApplication("Puzzle", &argc, argv); WMInitializeApplication("Puzzle", &argc, argv);
dpy = XOpenDisplay(""); dpy = XOpenDisplay("");
if (!dpy) { if (!dpy) {
printf("could not open display\n"); printf("could not open display\n");
@@ -193,11 +189,7 @@ int main(int argc, char **argv)
WMSetWindowAspectRatio(win, 2, 2, 2, 2); WMSetWindowAspectRatio(win, 2, 2, 2, 2);
WMSetWindowResizeIncrements(win, Size, Size); WMSetWindowResizeIncrements(win, Size, Size);
WMSetViewNotifySizeChanges(WMWidgetView(win), True); WMSetViewNotifySizeChanges(WMWidgetView(win), True);
WMAddNotificationObserver(resizeObserver, NULL, WMAddNotificationObserver(resizeObserver, NULL, WMViewSizeDidChangeNotification, WMWidgetView(win));
WMViewSizeDidChangeNotification,
WMWidgetView(win));
for (i = y = 0; y < Size && i < Size * Size - 1; y++) { for (i = y = 0; y < Size && i < Size * Size - 1; y++) {
for (x = 0; x < Size && i < Size * Size - 1; x++) { for (x = 0; x < Size && i < Size * Size - 1; x++) {
@@ -212,8 +204,7 @@ int main(int argc, char **argv)
RHSVtoRGB(&hsv, &col); RHSVtoRGB(&hsv, &col);
color = WMCreateRGBColor(scr, col.red<<8, col.green<<8, color = WMCreateRGBColor(scr, col.red << 8, col.green << 8, col.blue << 8, False);
col.blue<<8, False);
MAP(x, y) = i; MAP(x, y) = i;
Button[i] = WMCreateButton(win, WBTMomentaryLight); Button[i] = WMCreateButton(win, WBTMomentaryLight);

17
WINGs/python/Makefile Normal file
View File

@@ -0,0 +1,17 @@
all: WINGs.c
python setup.py build
ln -sf `find build/ -name wings.so` .
install: WINGs.c
python setup.py install
clean:
rm -rf build dist WINGs.c *.o *~ *.so MANIFEST wings.py *.pyc *.pyo core
dist:
python setup.py sdist
WINGs.c: WINGs.i
swig -python -noproxy `get-wings-flags --cflags` -I.. -o WINGs.c WINGs.i

20
WINGs/python/README Normal file
View File

@@ -0,0 +1,20 @@
This is a python wrapper for the WINGs library, that can be used to write python
based programs with WINGs-based graphic interfaces.
This module in not built by default. To build it you need python2.1 or later
and swig-1.3.14 or later.
To build it, first compile and install WINGs. after that run 'make' in this
directory. 'make install' will install the python module into the python tree.
run test.py or WINGs.py for an example.
the code is not finished yet and may fail to work as expected in some cases.
Note: currently the module expects WINGs installed to build. it won't take
the WINGs libraries and header files from the source tree. You need to
install WINGs first. Even if an old version of WINGs is already installed,
you still need to install the newly built WINGs, else the python module will
be built against the old version.

699
WINGs/python/WINGs.i Normal file
View File

@@ -0,0 +1,699 @@
%module wings
%{
#include "WINGs/WINGsP.h"
%}
%include typemaps.i
// This tells SWIG to treat char ** as a special case
%typemap(python, in) char ** {
/* Check if is a list */
if (PyList_Check($input)) {
int size = PyList_Size($input);
int i = 0;
$1 = (char **) wmalloc((size+1)*sizeof(char *));
for (i = 0; i < size; i++) {
PyObject *o = PyList_GetItem($input, i);
if (PyString_Check(o))
$1[i] = PyString_AsString(PyList_GetItem($input, i));
else {
PyErr_SetString(PyExc_TypeError, "list must contain strings");
wfree($1);
return NULL;
}
}
$1[i] = 0;
} else {
PyErr_SetString(PyExc_TypeError, "not a list");
return NULL;
}
}
// This cleans up the char ** array we malloc-ed before the function call
%typemap(python, freearg) char ** {
wfree($1);
}
// This allows a C function to return a char ** as a Python list
%typemap(python, out) char ** {
int len,i;
len = 0;
while ($1[len]) len++;
$result = PyList_New(len);
for (i = 0; i < len; i++) {
PyList_SetItem($result, i, PyString_FromString($1[i]));
}
}
// Now for some callbacks
%typemap(python, in) PyObject *pyacArgs {
if (PyTuple_Check($input)) {
if (PyTuple_Size($input) != 3) {
PyErr_SetString(PyExc_ValueError,
"wrong number of parameters in tuple. should be 3.");
return NULL;
} else {
PyObject *func = PyTuple_GetItem($input, 1);
if (func!=Py_None && !PyCallable_Check(func)) {
PyErr_SetString(PyExc_TypeError,
"'action' needs to be a callable object!");
return NULL;
}
}
} else {
PyErr_SetString(PyExc_TypeError, "2nd argument not a tuple!");
return NULL;
}
$1 = $input;
}
%typemap(python, in) PyObject *pycArgs {
if (PyTuple_Check($input)) {
if (PyTuple_Size($input) != 2) {
PyErr_SetString(PyExc_ValueError,
"wrong number of parameters in tuple. should be 2.");
return NULL;
} else {
PyObject *func = PyTuple_GetItem($input, 0);
if (func!=Py_None && !PyCallable_Check(func)) {
PyErr_SetString(PyExc_TypeError,
"'action' needs to be a callable object!");
return NULL;
}
}
} else {
PyErr_SetString(PyExc_TypeError, "2nd argument not a tuple!");
return NULL;
}
$1 = $input;
}
// Type mapping for grabbing a FILE * from Python
%typemap(python, in) FILE * {
if (!PyFile_Check($input)) {
PyErr_SetString(PyExc_TypeError, "Need a file!");
return NULL;
}
$1 = PyFile_AsFile($input);
}
/* These are for free-ing the return of functions that need to be freed
* before returning control to python. */
%typemap(python, ret) char* WMGetTextFieldText { wfree($1); };
%include exception.i
%exception pyWMScreenMainLoop {
$function
if (PyErr_Occurred())
return NULL;
}
%exception pyWMRunModalLoop {
$function
if (PyErr_Occurred())
return NULL;
}
%{
static int mainLoopDone = 0;
%}
%inline %{
WMScreen *pyWMOpenScreen(const char *display, int simpleapp)
{
Display *dpy = XOpenDisplay(display);
if (!dpy) {
wwarning("WINGs: could not open display %s", XDisplayName(display));
return NULL;
}
if (simpleapp) {
return WMCreateSimpleApplicationScreen(dpy);
} else {
return WMCreateScreen(dpy, DefaultScreen(dpy));
}
}
void pyWMScreenMainLoop(WMScreen *scr)
{
XEvent event;
while (!PyErr_Occurred() && !mainLoopDone) {
WMNextEvent(((W_Screen*)scr)->display, &event);
WMHandleEvent(&event);
}
}
void pyWMBreakScreenMainLoop(WMScreen *scr)
{
mainLoopDone = 1;
}
void pyWMRunModalLoop(WMScreen *scr, WMView *view)
{
int oldModalLoop = scr->modalLoop;
WMView *oldModalView = scr->modalView;
scr->modalView = view;
scr->modalLoop = 1;
while (!PyErr_Occurred() && scr->modalLoop) {
XEvent event;
WMNextEvent(scr->display, &event);
WMHandleEvent(&event);
}
scr->modalView = oldModalView;
scr->modalLoop = oldModalLoop;
}
%}
//%rename WMScreenMainLoop _WMScreenMainLoop;
//%rename(_WMScreenMainLoop) WMScreenMainLoop;
//%rename WMRunModalLoop _WMRunModalLoop;
%{
/* These functions match the prototypes of the normal C callback
* functions. However, we use the clientdata pointer for holding a
* reference to a Python tuple containing (object, funct, clientData).
*/
static void PythonWMActionCallback(WMWidget *widget, void *cdata)
{
PyObject *pyobj, *func, *pydata, *arglist, *tuple, *result;
tuple = (PyObject*) cdata;
pyobj = PyTuple_GetItem(tuple, 0);
func = PyTuple_GetItem(tuple, 1);
if (func && func!=Py_None) {
pydata = PyTuple_GetItem(tuple, 2);
arglist = Py_BuildValue("(OO)", pyobj, pydata);
result = PyEval_CallObject(func, arglist);
Py_DECREF(arglist);
Py_XDECREF(result);
}
}
static void PythonWMCallback(void *data)
{
PyObject *func, *pydata, *arglist, *tuple, *result;
tuple = (PyObject*) data;
func = PyTuple_GetItem(tuple, 0);
if (func && func!=Py_None) {
pydata = PyTuple_GetItem(tuple, 1);
arglist = Py_BuildValue("(O)", pydata);
result = PyEval_CallObject(func, arglist);
Py_DECREF(arglist);
Py_XDECREF(result);
}
}
static void
pyTextFieldDidBeginEditing(WMTextFieldDelegate *self, WMNotification *notif)
{
PyObject *pyobj, *delegate, *func, *pydata, *arglist, *tuple, *result;
int action;
tuple = (PyObject*) self->data;
pyobj = PyTuple_GetItem(tuple, 0);
delegate = PyTuple_GetItem(tuple, 1);
if (delegate != Py_None) {
// should we call PyObject_HasAttrString()?? rather not and let
// python raise an exception because the object doesn't has the
// attribute
func = PyObject_GetAttrString(delegate, "didBeginEditing");
if (func!=NULL && func!=Py_None) {
pydata = PyObject_GetAttrString(delegate, "data");
if (!pydata) {
Py_INCREF(Py_None);
pydata = Py_None;
}
action = (int)WMGetNotificationClientData(notif);
arglist = Py_BuildValue("(OOi)", pyobj, pydata, action);
result = PyEval_CallObject(func, arglist);
Py_DECREF(pydata);
Py_DECREF(arglist);
Py_XDECREF(result);
}
Py_XDECREF(func);
}
}
static void
pyTextFieldDidChange(WMTextFieldDelegate *self, WMNotification *notif)
{
PyObject *pyobj, *delegate, *func, *pydata, *arglist, *tuple, *result;
int action;
tuple = (PyObject*) self->data;
pyobj = PyTuple_GetItem(tuple, 0);
delegate = PyTuple_GetItem(tuple, 1);
if (delegate != Py_None) {
func = PyObject_GetAttrString(delegate, "didChange");
if (func!=NULL && func!=Py_None) {
pydata = PyObject_GetAttrString(delegate, "data");
if (!pydata) {
Py_INCREF(Py_None);
pydata = Py_None;
}
action = (int)WMGetNotificationClientData(notif);
arglist = Py_BuildValue("(OOi)", pyobj, pydata, action);
result = PyEval_CallObject(func, arglist);
Py_DECREF(pydata);
Py_DECREF(arglist);
Py_XDECREF(result);
}
Py_XDECREF(func);
}
}
static void
pyTextFieldDidEndEditing(WMTextFieldDelegate *self, WMNotification *notif)
{
PyObject *pyobj, *delegate, *func, *pydata, *arglist, *tuple, *result;
int action;
tuple = (PyObject*) self->data;
pyobj = PyTuple_GetItem(tuple, 0);
delegate = PyTuple_GetItem(tuple, 1);
if (delegate != Py_None) {
func = PyObject_GetAttrString(delegate, "didEndEditing");
if (func!=NULL && func!=Py_None) {
pydata = PyObject_GetAttrString(delegate, "data");
if (!pydata) {
Py_INCREF(Py_None);
pydata = Py_None;
}
action = (int)WMGetNotificationClientData(notif);
arglist = Py_BuildValue("(OOi)", pyobj, pydata, action);
result = PyEval_CallObject(func, arglist);
Py_DECREF(pydata);
Py_DECREF(arglist);
Py_XDECREF(result);
}
Py_XDECREF(func);
}
}
static Bool
pyTextFieldShouldBeginEditing(WMTextFieldDelegate *self, WMTextField *tPtr)
{
PyObject *pyobj, *delegate, *func, *pydata, *arglist, *tuple, *result;
Bool retval = False;
tuple = (PyObject*) self->data;
pyobj = PyTuple_GetItem(tuple, 0);
delegate = PyTuple_GetItem(tuple, 1);
if (delegate != Py_None) {
func = PyObject_GetAttrString(delegate, "shouldBeginEditing");
if (func!=NULL && func!=Py_None) {
pydata = PyObject_GetAttrString(delegate, "data");
if (!pydata) {
Py_INCREF(Py_None);
pydata = Py_None;
}
arglist = Py_BuildValue("(OO)", pyobj, pydata);
result = PyEval_CallObject(func, arglist);
if (result!=Py_None && PyInt_AsLong(result)!=0) {
retval = True;
}
Py_DECREF(pydata);
Py_DECREF(arglist);
Py_XDECREF(result);
}
Py_XDECREF(func);
}
return retval;
}
static Bool
pyTextFieldShouldEndEditing(WMTextFieldDelegate *self, WMTextField *tPtr)
{
PyObject *pyobj, *delegate, *func, *pydata, *arglist, *tuple, *result;
Bool retval = False;
tuple = (PyObject*) self->data;
pyobj = PyTuple_GetItem(tuple, 0);
delegate = PyTuple_GetItem(tuple, 1);
if (delegate != Py_None) {
func = PyObject_GetAttrString(delegate, "shouldEndEditing");
if (func!=NULL && func!=Py_None) {
pydata = PyObject_GetAttrString(delegate, "data");
if (!pydata) {
Py_INCREF(Py_None);
pydata = Py_None;
}
arglist = Py_BuildValue("(OO)", pyobj, pydata);
result = PyEval_CallObject(func, arglist);
if (result!=Py_None && PyInt_AsLong(result)!=0) {
retval = True;
}
Py_DECREF(pydata);
Py_DECREF(arglist);
Py_XDECREF(result);
}
Py_XDECREF(func);
}
return retval;
}
%}
%inline %{
void pyWMSetWindowCloseAction(WMWindow *win, PyObject *pyacArgs) {
WMSetWindowCloseAction(win, PythonWMActionCallback, (void*)pyacArgs);
Py_INCREF(pyacArgs);
}
void pyWMSetButtonAction(WMButton *bPtr, PyObject *pyacArgs) {
WMSetButtonAction(bPtr, PythonWMActionCallback, (void*)pyacArgs);
Py_INCREF(pyacArgs);
}
void pyWMSetScrollerAction(WMScroller *sPtr, PyObject *pyacArgs) {
WMSetScrollerAction(sPtr, PythonWMActionCallback, (void*)pyacArgs);
Py_INCREF(pyacArgs);
}
void pyWMSetListAction(WMList *lPtr, PyObject *pyacArgs) {
WMSetListAction(lPtr, PythonWMActionCallback, (void*)pyacArgs);
Py_INCREF(pyacArgs);
}
void pyWMSetListDoubleAction(WMList *lPtr, PyObject *pyacArgs) {
WMSetListDoubleAction(lPtr, PythonWMActionCallback, (void*)pyacArgs);
Py_INCREF(pyacArgs);
}
void pyWMSetBrowserAction(WMBrowser *bPtr, PyObject *pyacArgs) {
WMSetBrowserAction(bPtr, PythonWMActionCallback, (void*)pyacArgs);
Py_INCREF(pyacArgs);
}
void pyWMSetBrowserDoubleAction(WMBrowser *bPtr, PyObject *pyacArgs) {
WMSetBrowserDoubleAction(bPtr, PythonWMActionCallback, (void*)pyacArgs);
Py_INCREF(pyacArgs);
}
void pyWMSetMenuItemAction(WMMenuItem *miPtr, PyObject *pyacArgs) {
WMSetMenuItemAction(miPtr, PythonWMActionCallback, (void*)pyacArgs);
Py_INCREF(pyacArgs);
}
void pyWMSetPopUpButtonAction(WMPopUpButton *pPtr, PyObject *pyacArgs) {
WMSetPopUpButtonAction(pPtr, PythonWMActionCallback, (void*)pyacArgs);
Py_INCREF(pyacArgs);
}
void pyWMSetSliderAction(WMSlider *sPtr, PyObject *pyacArgs) {
WMSetSliderAction(sPtr, PythonWMActionCallback, (void*)pyacArgs);
Py_INCREF(pyacArgs);
}
void pyWMSetRulerMoveAction(WMRuler *rPtr, PyObject *pyacArgs) {
WMSetRulerMoveAction(rPtr, PythonWMActionCallback, (void*)pyacArgs);
Py_INCREF(pyacArgs);
}
void pyWMSetRulerReleaseAction(WMRuler *rPtr, PyObject *pyacArgs) {
WMSetRulerReleaseAction(rPtr, PythonWMActionCallback, (void*)pyacArgs);
Py_INCREF(pyacArgs);
}
void pyWMSetColorPanelAction(WMColorPanel *panel, PyObject *pyacArgs) {
WMSetColorPanelAction(panel, (WMAction2*)PythonWMActionCallback, (void*)pyacArgs);
Py_INCREF(pyacArgs);
}
void* pyWMAddTimerHandler(int miliseconds, PyObject *pycArgs) {
Py_INCREF(pycArgs);
return (void*)WMAddTimerHandler(miliseconds, PythonWMCallback,
(void*)pycArgs);
}
void* pyWMAddPersistentTimerHandler(int miliseconds, PyObject *pycArgs) {
Py_INCREF(pycArgs);
return (void*)WMAddPersistentTimerHandler(miliseconds, PythonWMCallback,
(void*)pycArgs);
}
/* this doesn't work. we pass (func, data) as cdata at creation time, but
* only data at destruction, so it won't find it unless we change
* WMDeleteTimerWithClientData() to extract data from the tuple, and this
* requires access to the internals of WINGs
void pyWMDeleteTimerWithClientData(PyObject *pycData) {
WMDeleteTimerWithClientData((void*)pycData);
}*/
void pyWMDeleteTimerHandler(void *handlerID) {
WMDeleteTimerHandler((WMHandlerID)handlerID);
}
void* pyWMAddIdleHandler(PyObject *pycArgs) {
Py_INCREF(pycArgs);
return (void*)WMAddIdleHandler(PythonWMCallback, (void*)pycArgs);
}
void pyWMDeleteIdleHandler(void *handlerID) {
WMDeleteIdleHandler((WMHandlerID)handlerID);
}
%}
%exception pyWMSetTextFieldDelegate {
$function
if (PyErr_Occurred()) {
return NULL;
}
}
%inline %{
void pyWMSetTextFieldDelegate(WMTextField *tPtr, PyObject *txtArgs) {
WMTextFieldDelegate *td;
if (!txtArgs || !PyTuple_Check(txtArgs) || PyTuple_Size(txtArgs)!=2) {
PyErr_SetString(PyExc_TypeError, "invalid setting of WMTextField "
"delegate. Should be '(self, delegate)'");
return;
}
// how do I check if txtArgs[1] is an instance of WMTextFieldDelegate?
td = WMGetTextFieldDelegate(tPtr);
if (!td) {
td = (WMTextFieldDelegate*)wmalloc(sizeof(WMTextFieldDelegate));
td->didBeginEditing = pyTextFieldDidBeginEditing;
td->didChange = pyTextFieldDidChange;
td->didEndEditing = pyTextFieldDidEndEditing;
td->shouldBeginEditing = pyTextFieldShouldBeginEditing;
td->shouldEndEditing = pyTextFieldShouldEndEditing;
} else {
Py_XDECREF((PyObject*)td->data);
}
Py_INCREF(txtArgs);
td->data = txtArgs;
WMSetTextFieldDelegate(tPtr, td);
}
%}
%inline %{
PyObject* pyWMGetTextFieldDelegate(WMTextField *tPtr) {
WMTextFieldDelegate *td;
PyObject *result, *tuple;
td = WMGetTextFieldDelegate(tPtr);
if (!td) {
Py_INCREF(Py_None);
return Py_None;
}
tuple = (PyObject*)td->data;
if (!tuple || !PyTuple_Check(tuple) || PyTuple_Size(tuple)!=2) {
PyErr_SetString(PyExc_TypeError, "invalid TextField delegate");
return NULL;
}
result = PyTuple_GetItem(tuple, 1);
if (!result)
result = Py_None;
Py_INCREF(result);
return result;
}
%}
/* ignore structures we will not use */
%ignore ConnectionDelegate;
/* ignore functions we don't need */
// should we ignore vararg functions, or just convert them to functions with
// a fixed number of parameters?
%varargs(char*) wmessage;
//%ignore wmessage;
%ignore wwarning;
%ignore wfatal;
%ignore wsyserror;
%ignore wsyserrorwithcode;
%ignore WMCreatePLArray;
%ignore WMCreatePLDictionary;
%apply int *INPUT { int *argc };
#define Bool int
%include "WINGs/WUtil.h"
/* ignore structures we will not use */
/* ignore functions we don't need */
%include "WINGs/WINGs.h"
%{
void
WHandleEvents()
{
/* Check any expired timers */
W_CheckTimerHandlers();
/* Do idle and timer stuff while there are no input events */
/* Do not wait for input here. just peek to se if input is available */
while (!W_HandleInputEvents(False, -1) && W_CheckIdleHandlers()) {
/* dispatch timer events */
W_CheckTimerHandlers();
}
W_HandleInputEvents(True, -1);
/* Check any expired timers */
W_CheckTimerHandlers();
}
%}
/* rewrite functions originally defined as macros */
%inline %{
#undef WMDuplicateArray
WMArray* WMDuplicateArray(WMArray* array) {
return WMCreateArrayWithArray(array);
}
#undef WMPushInArray
void WMPushInArray(WMArray *array, void *item) {
WMAddToArray(array, item);
}
#undef WMSetInArray
void* WMSetInArray(WMArray *array, int index, void *item) {
return WMReplaceInArray(array, index, item);
}
#undef WMRemoveFromArray
int WMRemoveFromArray(WMArray *array, void *item) {
return WMRemoveFromArrayMatching(array, NULL, item);
}
#undef WMGetFirstInArray
int WMGetFirstInArray(WMArray *array, void *item) {
return WMFindInArray(array, NULL, item);
}
#undef WMCreateBag
WMBag* WMCreateBag(int size) {
return WMCreateTreeBag();
}
#undef WMCreateBagWithDestructor
WMBag* WMCreateBagWithDestructor(int size, WMFreeDataProc *destructor) {
return WMCreateTreeBagWithDestructor(destructor);
}
#undef WMSetInBag
void* WMSetInBag(WMBag *bag, int index, void *item) {
return WMReplaceInBag(bag, index, item);
}
#undef WMAddItemToTree
WMTreeNode* WMAddItemToTree(WMTreeNode *parent, void *item) {
return WMInsertItemInTree(parent, -1, item);
}
#undef WMAddNodeToTree
WMTreeNode* WMAddNodeToTree(WMTreeNode *parent, WMTreeNode *aNode) {
return WMInsertNodeInTree(parent, -1, aNode);
}
#undef WMGetFirstInTree
/* Returns first tree node that has data == cdata */
WMTreeNode* WMGetFirstInTree(WMTreeNode *aTree, void *cdata) {
return WMFindInTree(aTree, NULL, cdata);
}
#undef WMFlushConnection
int WMFlushConnection(WMConnection *cPtr) {
return WMSendConnectionData(cPtr, NULL);
}
#undef WMGetConnectionQueuedData
WMArray* WMGetConnectionQueuedData(WMConnection *cPtr) {
return WMGetConnectionUnsentData(cPtr);
}
#undef WMWidgetClass
W_Class WMWidgetClass(WMWidget *widget) {
return (((W_WidgetType*)(widget))->widgetClass);
}
#undef WMWidgetView
WMView* WMWidgetView(WMWidget *widget) {
return (((W_WidgetType*)(widget))->view);
}
#undef WMCreateCommandButton
WMButton* WMCreateCommandButton(WMWidget *parent) {
return WMCreateCustomButton(parent, WBBSpringLoadedMask|WBBPushInMask
|WBBPushLightMask|WBBPushChangeMask);
}
#undef WMCreateRadioButton
WMButton* WMCreateRadioButton(WMWidget *parent) {
return WMCreateButton(parent, WBTRadio);
}
#undef WMCreateSwitchButton
WMButton* WMCreateSwitchButton(WMWidget *parent) {
return WMCreateButton(parent, WBTSwitch);
}
#undef WMAddListItem
WMListItem* WMAddListItem(WMList *lPtr, char *text)
{
return WMInsertListItem(lPtr, -1, text);
}
#undef WMCreateText
WMText* WMCreateText(WMWidget *parent) {
return WMCreateTextForDocumentType(parent, NULL, NULL);
}
#undef WMRefreshText
void WMRefreshText(WMText *tPtr) {
return WMThawText(tPtr);
}
#undef WMClearText
void WMClearText(WMText *tPtr) {
return WMAppendTextStream(tPtr, NULL);
}
%}

643
WINGs/python/WINGs.py Normal file
View File

@@ -0,0 +1,643 @@
#!/usr/bin/env python
import sys
import wings
# Some useful constants
False = 0
True = 1
# check about None as action for buttonAction/windowCloseAction ...
################################################################################
# Exceptions
################################################################################
from exceptions import Exception, StandardError
class Error(StandardError):
pass
del Exception, StandardError
class WMTimer:
def __init__(self, milliseconds, callback, cdata=None, persistent=False):
if persistent:
self._o = wings.pyWMAddPersistentTimerHandler(milliseconds, (callback, cdata))
else:
self._o = wings.pyWMAddTimerHandler(milliseconds, (callback, cdata))
self.__WMDeleteTimerHandler = wings.pyWMDeleteTimerHandler
def __del__(self):
self.__WMDeleteTimerHandler(self._o)
class WMPersistentTimer(WMTimer):
def __init__(self, milliseconds, callback, cdata=None):
WMTimer.__init__(self, milliseconds, callback, cdata, persistent=True)
class WMScreen:
__readonly = ('display', 'width', 'height', 'depth')
def __init__(self, appname, display="", simpleapp=False):
wings.WMInitializeApplication(appname, len(sys.argv), sys.argv)
self._o = wings.pyWMOpenScreen(display, simpleapp)
if not self._o:
raise Error, "Cannot open display %s" % display
self.__dict__['display'] = wings.WMScreenDisplay(self._o)
self.__dict__['width'] = wings.WMScreenWidth(self._o)
self.__dict__['height'] = wings.WMScreenHeight(self._o)
self.__dict__['depth'] = wings.WMScreenDepth(self._o)
def __setattr__(self, name ,value):
if name in self.__readonly:
#raise AttributeError, "'%s' is a read-only WMScreen attribute" % name
raise Error, "'%s' is a read-only WMScreen attribute" % name
self.__dict__[name] = value
def __delattr__(self, name):
if name in self.__readonly:
#raise AttributeError, "'%s' attribute cannot be deleted from WMScreen instance" % name
raise Error, "'%s' attribute cannot be deleted from WMScreen instance" % name
try:
del(self.__dict__[name])
except KeyError:
raise AttributeError, "%s instance has no attribute '%s'" % \
(self.__class__.__name__, name)
def mainLoop(self):
wings.pyWMScreenMainLoop(self._o)
def breakMainLoop(self):
wings.pyWMBreakScreenMainLoop(self._o)
def runModalLoop(self, view):
wings.pyWMRunModalLoop(self._o, view)
def breakModalLoop(self):
wings.WMBreakModalLoop(self._o)
def size(self):
return (self.width, self.height)
class WMView:
pass
class WMWidget(WMView):
def __init__(self):
if self.__class__ == WMWidget:
raise Error, "a WMWidget can't be instantiated directly"
self._o = None
self.__WMDestroyWidget = wings.WMDestroyWidget
def __del__(self):
if self._o is not None:
self.__WMDestroyWidget(self._o)
def resize(self, width, height):
wings.WMResizeWidget(self._o, width, height)
def move(self, x, y):
wings.WMMoveWidget(self._o, x, y)
def realize(self):
wings.WMRealizeWidget(self._o)
def show(self):
wings.WMMapWidget(self._o)
def hide(self):
wings.WMUnmapWidget(self._o)
def redisplay(self):
wings.WMRedisplayWidget(self._o)
def width(self):
return wings.WMWidgetWidth(self._o)
def height(self):
return wings.WMWidgetHeight(self._o)
def screen(self):
return wings.WMWidgetScreen(self._o)
def view(self):
return wings.WMWidgetView(self._o)
def setFocusTo(self, other):
wings.WMSetFocusToWidget(other._o)
class WMWindow(WMWidget):
def __init__(self, screen, name, style=wings.WMTitledWindowMask
|wings.WMClosableWindowMask|wings.WMMiniaturizableWindowMask
|wings.WMResizableWindowMask):
WMWidget.__init__(self)
self._o = wings.WMCreateWindowWithStyle(screen._o, name, style)
def setMinSize(self, minWidth, minHeight):
wings.WMSetWindowMinSize(self._o, minWidth, minHeight)
def setMaxSize(self, maxWidth, maxHeight):
wings.WMSetWindowMaxSize(self._o, maxWidth, maxHeight)
def setInitialPosition(self, x, y):
wings.WMSetWindowInitialPosition(self._o, x, y)
def setTitle(self, title):
wings.WMSetWindowTitle(self._o, title)
def setCloseAction(self, action, data=None):
if action!=None and (not callable(action)):
raise Error, "action needs to be a callable object or None"
wings.pyWMSetWindowCloseAction(self._o, (self, action, data))
class WMPanel(WMWindow):
def __init__(self, owner, name, style=wings.WMTitledWindowMask
|wings.WMClosableWindowMask|wings.WMResizableWindowMask):
WMWidget.__init__(self)
self._o = wings.WMCreatePanelWithStyleForWindow(owner._o, name, style)
class WMFrame(WMWidget):
def __init__(self, parent, title=None):
WMWidget.__init__(self)
self._o = wings.WMCreateFrame(parent._o)
self.setTitle(title)
def setRelief(self, relief):
wings.WMSetFrameRelief(self._o, relief)
def setTitle(self, title=""):
wings.WMSetFrameTitle(self._o, title)
def setTitlePosition(self, position):
wings.WMSetFrameTitlePosition(self._o, position)
class WMLabel(WMWidget):
def __init__(self, parent, text=None):
WMWidget.__init__(self)
self._o = wings.WMCreateLabel(parent._o)
self.setText(text)
def setWraps(self, flag):
# bool(flag) for python2.2
wings.WMSetLabelWraps(self._o, flag)
def setRelief(self, relief):
wings.WMSetLabelRelief(self._o, relief)
def setText(self, text=""):
wings.WMSetLabelText(self._o, text)
def setTextColor(self, color):
wings.WMSetLabelTextColor(self._o, color)
def setFont(self, font):
wings.WMSetLabelFont(self._o, font)
def setTextAlignment(self, alignment):
wings.WMSetLabelTextAlignment(self._o, alignment)
def setImage(self, image):
wings.WMSetLabelImage(self._o, image)
def setImagePosition(self, position):
wings.WMSetLabelImagePosition(self._o, position)
def text(self):
return wings.WMGetLabelText(self._o)
def font(self):
return wings.WMGetLabelFont(self._o)
def image(self):
return wings.WMGetLabelImage(self._o)
class WMBox(WMWidget):
def __init__(self, parent):
WMWidget.__init__(self)
self._o = wings.WMCreateBox(parent._o)
def setHorizontal(self, flag):
# bool(flag) for python2.2
wings.WMSetBoxHorizontal(self._o, flag)
def setBorderWidth(self, width):
wings.WMSetBoxBorderWidth(self._o, width)
def addSubview(self, view, expand, fill, minSize, maxSize, space):
wings.WMAddBoxSubview(self._o, view, expand, fill, minSize, maxSixe, space)
def addSubviewAtEnd(self, view, expand, fill, minSize, maxSize, space):
wings.WMAddBoxSubviewAtEnd(self._o, view, expand, fill, minSize, maxSixe, space)
def removeSubview(self, view):
wings.WMRemoveBoxSubview(self._o, view)
class WMButton(WMWidget): # not for user instantiation
def __init__(self, parent):
WMWidget.__init__(self)
if self.__class__ == WMButton:
raise Error, "a WMButton can't be instantiated directly"
def setText(self, text=""):
wings.WMSetButtonText(self._o, text)
def setAction(self, action, data=None):
if action!=None and (not callable(action)):
raise Error, "action needs to be a callable object or None"
wings.pyWMSetButtonAction(self._o, (self, action, data))
def performClick(self):
wings.WMPerformButtonClick(self._o)
def setEnabled(self, flag):
# bool(flag) for python2.2
wings.WMSetButtonEnabled(self._o, flag)
def isEnabled(self):
return wings.WMGetButtonEnabled(self._o)
def setImageDimsWhenDisabled(self, flag):
# bool(flag)
wings.WMSetButtonImageDimsWhenDisabled(self._o, flag)
def setImage(self, image):
wings.WMSetButtonImage(self_.o, image)
def setAlternateImage(self, image):
wings.WMSetButtonAltImage(self._o, image)
def setImagePosition(self, position):
wings.WMSetButtonImagePosition(self._o, position)
def setImageDefault(self):
wings.WMSetButtonImageDefault(self._o)
class WMCommandButton(WMButton):
def __init__(self, parent):
WMButton.__init__(self, parent)
self._o = wings.WMCreateCommandButton(parent._o)
class WMSwitchButton(WMButton):
def __init__(self, parent):
WMButton.__init__(self, parent)
self._o = wings.WMCreateSwitchButton(parent._o)
class WMRadioButton(WMButton):
def __init__(self, parent, group=None):
WMButton.__init__(self, parent)
self._o = wings.WMCreateRadioButton(parent._o)
if group:
wings.WMGroupButtons(group._o, self._o)
class WMListItem:
pass
class WMList(WMWidget):
def __init__(self, parent):
WMWidget.__init__(self)
self._o = wings.WMCreateList(parent._o)
def allowEmptySelection(self, flag):
# bool(flag)
wings.WMSetListAllowEmptySelection(self._o, flag)
def allowMultipleSelection(self, flag):
# bool(flag)
wings.WMSetListAllowMultipleSelection(self._o, flag)
def addItem(self, item):
wings.WMAddListItem(self._o, item)
def insertItem(self, row, item):
wings.WMInsertListItem(self._o, row, item)
def sortItems(self):
wings.WMSortListItems(self._o)
def rowWithTitle(self, title):
return wings.WMFindRowOfListItemWithTitle(self._o, title)
def selectedItemRow(self):
return wings.WMGetListSelectedItemRow(self._o)
def selectedItem(self):
return wings.WMGetListSelectedItem(self._o)
def removeItem(self, index):
wings.WMRemoveListItem(self._o, index)
def selectItem(self, index):
wings.WMSelectListItem(self._o, index)
def unselectItem(self, index):
wings.WMUnselectListItem(self._o, index)
class WMTextFieldDelegate:
__callbacks = ('didBeginEditing', 'didChange', 'didEndEditing',
'shouldBeginEditing', 'shouldEndEditing')
def __init__(self):
self.__dict__['data'] = None
self.__dict__['didBeginEditing'] = None
self.__dict__['didChange'] = None
self.__dict__['didEndEditing'] = None
self.__dict__['shouldBeginEditing'] = None
self.__dict__['shouldEndEditing'] = None
def __setattr__(self, name ,value):
if name in self.__callbacks and value!=None and (not callable(value)):
#raise AttributeError, "%s.%s needs to be a callable object or None" % (self.__class__.__name__, name)
raise Error, "%s.%s needs to be a callable object or None" % (self.__class__.__name__, name)
else:
self.__dict__[name] = value
class WMTextField(WMWidget):
def __init__(self, parent, text=""):
WMWidget.__init__(self)
self._o = wings.WMCreateTextField(parent._o)
wings.WMSetTextFieldText(self._o, text)
def setDelegate(self, delegate):
if delegate.__class__ != WMTextFieldDelegate:
raise Error, "textfield delegate must be of type 'WMTextFieldDelegate'"
wings.pyWMSetTextFieldDelegate(self._o, (self, delegate))
def delegate(self):
return wings.pyWMGetTextFieldDelegate(self._o)
def text(self):
return wings.WMGetTextFieldText(self._o)
def setEditable(self, flag):
# bool(flag)
wings.WMSetTextFieldEditable(self._o, flag)
def setBordered(self, flag):
# bool(flag)
wings.WMSetTextFieldBordered(self._o, flag)
def setBeveled(self, flag):
# bool(flag)
wings.WMSetTextFieldBeveled(self._o, flag)
def setSecure(self, flag):
# bool(flag)
wings.WMSetTextFieldSecure(self._o, flag)
def setCursorPosition(self, position):
wings.WMSetTextFieldCursorPosition(self._o, position)
def setNextText(self, next):
wings.WMSetTextFieldNextTextField(self._o, next._o)
def setPreviousText(self, previous):
wings.WMSetTextFieldPrevTextField(self._o, previous._o)
def setTextAlignment(self, alignment):
wings.WMSetTextFieldAlignment(self._o, alignment)
def isEditable(self):
return wings.WMGetTextFieldEditable(self._o)
def insertText(self, text, position):
wings.WMInsertTextFieldText(self._o, text, position)
def deleteText(self, start, count):
wings.WMDeleteTextFieldRange(self._o, wings.wmkrange(start, count))
def selectText(self, start, count):
wings.WMSelectTextFieldRange(self._o, wings.wmkrange(start, count))
def setFont(self, font):
wings.WMSetTextFieldFont(self._o, font)
def font(self):
return wings.WMGetTextFieldFont(self._o)
################################################################################
# wrap the WINGs constants so we don't need wings.constant_name
################################################################################
# WMWindow title style
WMTitledWindowMask = wings.WMTitledWindowMask
WMClosableWindowMask = wings.WMClosableWindowMask
WMMiniaturizableWindowMask = wings.WMMiniaturizableWindowMask
WMResizableWindowMask = wings.WMResizableWindowMask
# WMFrame title positions
WTPNoTitle = wings.WTPNoTitle
WTPAboveTop = wings.WTPAboveTop
WTPAtTop = wings.WTPAtTop
WTPBelowTop = wings.WTPBelowTop
WTPAboveBottom = wings.WTPAboveBottom
WTPAtBottom = wings.WTPAtBottom
WTPBelowBottom = wings.WTPBelowBottom
# Alingments
WALeft = wings.WALeft
WACenter = wings.WACenter
WARight = wings.WARight
WAJustified = wings.WAJustified # not valid for textfields
# Image positions
WIPNoImage = wings.WIPNoImage
WIPImageOnly = wings.WIPImageOnly
WIPLeft = wings.WIPLeft
WIPRight = wings.WIPRight
WIPBelow = wings.WIPBelow
WIPAbove = wings.WIPAbove
WIPOverlaps = wings.WIPOverlaps
# Relief types
WRFlat = wings.WRFlat
WRSimple = wings.WRSimple
WRRaised = wings.WRRaised
WRSunken = wings.WRSunken
WRGroove = wings.WRGroove
WRRidge = wings.WRRidge
WRPushed = wings.WRPushed
# TextField events
WMReturnTextMovement = wings.WMReturnTextMovement
WMEscapeTextMovement = wings.WMEscapeTextMovement
WMIllegalTextMovement = wings.WMIllegalTextMovement
WMTabTextMovement = wings.WMTabTextMovement
WMBacktabTextMovement = wings.WMBacktabTextMovement
WMLeftTextMovement = wings.WMLeftTextMovement
WMRightTextMovement = wings.WMRightTextMovement
WMUpTextMovement = wings.WMUpTextMovement
WMDownTextMovement = wings.WMDownTextMovement
if __name__ == "__main__":
def quit(obj, data):
#sys.exit()
scr.breakMainLoop()
def click(btn, list):
print win.width(), win.height()
print list.selectedItemRow()
win2.show()
scr.runModalLoop(win2.view())
print txt2.text()
def sayhi(btn, data):
print "hi"
def breakLoop(btn, data):
#sys.exit()
scr.breakModalLoop()
win2.hide()
def dc(object, data, action):
print "didChange:", object, data, action
def dbe(object, data, action):
print "didBeginEditing:", object, data, action
def dee(object, data, action):
if action == wings.WMReturnTextMovement:
if object == txt:
object.setFocusTo(txt2)
else:
object.setFocusTo(txt)
print "didEndEditing:", object, data, action, object.text()
def tcb(one):
old = list.selectedItemRow()
list.selectItem(list.index)
list.unselectItem(old)
list.index = (list.index+1) % 3
#print one
scr = WMScreen("foobar")
win = WMWindow(scr, "aWindow")
win.setCloseAction(quit)
win.setTitle("test window")
win.resize(400, 180)
win.setInitialPosition((scr.width-win.width())/2, (scr.height-win.height())/2)
btn = WMCommandButton(win)
btn.setText("Click Me")
btn.resize(100, 25)
btn.move(20, 20)
btn.show()
sw = WMSwitchButton(win)
sw.setText("Some option")
sw.resize(100, 25)
sw.move(20, 50)
sw.show()
radios = []
r = None
j = 0
for i in ["One", "Two", "Four"]:
r = WMRadioButton(win, r)
radios.append(r)
r.show()
r.setText(i)
r.move(20, 70+j*25)
r.resize(100, 25)
j=j+1
sw.setAction(sayhi)
list = WMList(win)
list.resize(100,100)
list.move(130, 20)
list.addItem("one")
list.addItem("two")
list.addItem("three")
list.allowMultipleSelection(1)
list.show()
list.index = 0
txtdel = WMTextFieldDelegate()
txtdel.data = 'mydata'
txtdel.didBeginEditing = dbe
txtdel.didEndEditing = dee
txtdel.didChange = dc
txt = WMTextField(win, "abc")
txt.resize(95, 20)
txt.move(295, 20)
txt.setDelegate(txtdel)
txt.show()
txt2 = WMTextField(win, "01234567890")
txt2.resize(95, 20)
txt2.move(295, 45)
txt2.setDelegate(txtdel)
txt2.show()
txt.setNextText(txt2)
txt2.setNextText(txt)
label = WMLabel(win, "Text1:")
label.setTextAlignment(WARight)
label.move(240, 20)
label.resize(55, 20)
label.show()
label2 = WMLabel(win, "mytext2:")
label2.setTextAlignment(WARight)
label2.move(240, 45)
label2.resize(55, 20)
label2.show()
btn.setAction(click, list)
frame = WMFrame(win, "My Frame")
frame.resize(150, 50)
frame.move(240, 70)
#frame.setRelief(WRPushed)
frame.show()
ebtn = WMCommandButton(win)
ebtn.setText("Exit")
ebtn.resize(100, 25)
ebtn.move(290, 147)
ebtn.setAction(quit)
ebtn.show()
win.realize()
win.show()
timer = WMPersistentTimer(1000, tcb, win)
#del(timer)
#timer.delete()
win2 = WMPanel(win, "anotherWindow", WMTitledWindowMask)
win2.setTitle("transient test window")
win2.resize(150, 50)
win2.setInitialPosition((scr.width-win2.width())/2, (scr.height-win2.height())/2)
btn7 = WMCommandButton(win2)
btn7.setText("Dismiss")
btn7.resize(100, 25)
btn7.move(27, 10)
btn7.show()
btn7.setAction(breakLoop)
win2.realize()
scr.mainLoop()

71
WINGs/python/setup.py Executable file
View File

@@ -0,0 +1,71 @@
#!/usr/bin/env python
"""Setup script for the WINGs module distribution."""
import os, sys
from distutils.core import setup
from distutils.extension import Extension
## Get the include dirs
wings = os.popen("get-wings-flags --cflags", "r")
flags = wings.read().split()
include_dirs = [x[2:] for x in flags]
#include_dirs += [".."]
wings.close()
## Get the library dirs
wings = os.popen("get-wings-flags --ldflags", "r")
flags = wings.read().split()
library_dirs = [x[2:] for x in flags]
#library_dirs += [".."]
wings.close()
## Get the libraries
wings = os.popen("get-wings-flags --libs", "r")
flags = wings.read().split()
libraries = [x[2:] for x in flags]
wings.close()
runtime_library_dirs = []
extra_objects = []
extra_compile_args = ['-Wno-strict-prototypes', '-Wno-unused']
long_description = \
"""Python interface to the WINGs library
Python WINGs is an interface to WINGs, a small widget set with the
N*XTSTEP look and feel. It's API is inspired in OpenStep and it's
implementation borrows some ideas from Tk. It has a reasonable set of
widgets, sufficient for building small applications (like a CDPlayer
or hacking something like rxvt). It also has other functions that are
usefull for applications, like a User Defaults alike configuration
manager and a notification system.
"""
setup (# Distribution meta-data
name = "Python-WINGs",
version = "0.81.0",
description = "A python interface to WINGs",
long_description=long_description,
author = "Dan Pascu",
author_email = "dan@windowmaker.info",
license = "GPL",
platforms = "ALL",
url = "http://windowmaker.info/",
# Description of the modules and packages in the distribution
py_modules = ["WINGs"],
ext_modules = [Extension(
name='wings',
sources=['WINGs.c'],
include_dirs=include_dirs,
library_dirs=library_dirs,
runtime_library_dirs=runtime_library_dirs,
libraries=libraries,
extra_objects=extra_objects,
extra_compile_args=extra_compile_args,
)],
)

159
WINGs/python/test.py Executable file
View File

@@ -0,0 +1,159 @@
#!/usr/bin/env python
import sys
from WINGs import *
if __name__ == "__main__":
def quit(obj, data):
#sys.exit()
scr.breakMainLoop()
def click(btn, list):
print win.width(), win.height()
print list.selectedItemRow()
win2.show()
scr.runModalLoop(win2.view())
print txt2.text()
def sayhi(btn, data):
print "hi"
def breakLoop(btn, data):
#sys.exit()
scr.breakModalLoop()
win2.hide()
def dc(object, data, action):
print "didChange:", object, data, action
def dbe(object, data, action):
print "didBeginEditing:", object, data, action
def dee(object, data, action):
if action == wings.WMReturnTextMovement:
if object == txt:
object.setFocusTo(txt2)
else:
object.setFocusTo(txt)
print "didEndEditing:", object, data, action, object.text()
def tcb(one):
old = list.selectedItemRow()
list.selectItem(list.index)
list.unselectItem(old)
list.index = (list.index+1) % 3
#print one
scr = WMScreen("foobar")
win = WMWindow(scr, "aWindow")
win.setCloseAction(quit)
win.setTitle("test window")
win.resize(400, 180)
win.setInitialPosition((scr.width-win.width())/2, (scr.height-win.height())/2)
btn = WMCommandButton(win)
btn.setText("Click Me")
btn.resize(100, 25)
btn.move(20, 20)
btn.show()
sw = WMSwitchButton(win)
sw.setText("Some option")
sw.resize(100, 25)
sw.move(20, 50)
sw.show()
radios = []
r = None
j = 0
for i in ["One", "Two", "Four"]:
r = WMRadioButton(win, r)
radios.append(r)
r.show()
r.setText(i)
r.move(20, 70+j*25)
r.resize(100, 25)
j=j+1
sw.setAction(sayhi)
list = WMList(win)
list.resize(100,100)
list.move(130, 20)
list.addItem("one")
list.addItem("two")
list.addItem("three")
list.allowMultipleSelection(1)
list.show()
list.index = 0
txtdel = WMTextFieldDelegate()
txtdel.data = 'mydata'
txtdel.didBeginEditing = dbe
txtdel.didEndEditing = dee
txtdel.didChange = dc
txt = WMTextField(win)
txt.resize(95, 20)
txt.move(295, 20)
txt.setDelegate(txtdel)
txt.show()
txt2 = WMTextField(win, "01234567890")
txt2.resize(95, 20)
txt2.move(295, 45)
txt2.setDelegate(txtdel)
txt2.show()
txt.setNextText(txt2)
txt2.setNextText(txt)
label = WMLabel(win, "Text1:")
label.setTextAlignment(WARight)
label.move(240, 20)
label.resize(55, 20)
label.show()
label2 = WMLabel(win, "mytext2:")
label2.setTextAlignment(WARight)
label2.move(240, 45)
label2.resize(55, 20)
label2.show()
btn.setAction(click, list)
frame = WMFrame(win, "My Frame")
frame.resize(150, 50)
frame.move(240, 70)
#frame.setRelief(WRPushed)
frame.show()
ebtn = WMCommandButton(win)
ebtn.setText("Exit")
ebtn.resize(100, 25)
ebtn.move(290, 147)
ebtn.setAction(quit)
ebtn.show()
win.realize()
win.show()
timer = WMPersistentTimer(1000, tcb, win)
#del(timer)
#timer.delete()
win2 = WMPanel(win, "anotherWindow", WMTitledWindowMask)
win2.setTitle("transient test window")
win2.resize(150, 50)
win2.setInitialPosition((scr.width-win2.width())/2, (scr.height-win2.height())/2)
btn7 = WMCommandButton(win2)
btn7.setText("Dismiss")
btn7.resize(100, 25)
btn7.move(27, 10)
btn7.show()
btn7.setAction(breakLoop)
win2.realize()
scr.mainLoop()

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