From: Ben Hutchings Date: Thu, 27 Sep 2007 21:20:30 +0000 (+0000) Subject: [svn-upgrade] Tagging new upstream version, ion3 (20070927) X-Git-Tag: 20070927 X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=cd09055902de482a1be019bf4b4efdae64c98d35;p=ion3.git [svn-upgrade] Tagging new upstream version, ion3 (20070927) --- diff --git a/ChangeLog b/ChangeLog index 8f8c3a7..3d13196 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,31 @@ +2007-09-27 16:22 UTC Tuomo Valkonen + tagged ion-3rc-20070927 + +2007-09-27 16:22 UTC Tuomo Valkonen + * Release notes + +2007-09-26 20:16 UTC Tuomo Valkonen + * Do not goto frame on p_switch_tab, only switch. + +2007-09-26 20:14 UTC Tuomo Valkonen + * WMPlex focus code tuning. + (Goodbye to any plans of the next release being tagged "stable".) + +2007-09-24 21:48 UTC Tuomo Valkonen + * Small clarification + +2007-09-17 20:30 UTC Tuomo Valkonen + * Use default name for workspace in query if none given. + +2007-09-11 20:39 UTC Tuomo Valkonen + * Removed out-dated and redundant files under mod_dock/. + +2007-09-07 05:08 UTC Tuomo Valkonen + * Removed -g from compiler flags + +2007-09-02 21:04 UTC Tuomo Valkonen + * Completed/fixed dock size policy calculation + 2007-09-02 13:41 UTC Tuomo Valkonen tagged ion-3rc-20070902 diff --git a/LICENSE b/LICENSE index c4ba1e8..576a773 100644 --- a/LICENSE +++ b/LICENSE @@ -5,7 +5,8 @@ The code of this project is "essentially" licensed under the LGPL, version 2.1, unless otherwise indicated in components taken from elsewhere. It is reproduced below. Additionally, the following terms apply to the use of the name of the project, Ion(tm), names of particular "branches" such as -Ion3(tm), and other derived names: +Ion3(tm), and other derived names, in relation to this software, including +derived works: If the name Ion(tm) or other names that can be associated with the Ion project are used to distribute this software, then: diff --git a/RELNOTES b/RELNOTES index 34877fb..b9bcfca 100644 --- a/RELNOTES +++ b/RELNOTES @@ -1,4 +1,10 @@ +ion-3rc-20070927 +---------------- + +Another attempt at last "rc" release. + + ion-3rc-20070902 ---------------- diff --git a/doc/ChangeLog b/doc/ChangeLog index 02a6622..bf16748 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,9 @@ +2007-09-27 16:23 UTC Tuomo Valkonen + tagged ion-doc-3rc-20070927 + +2007-09-11 07:40 UTC Tuomo Valkonen + * Notes on config file modification + 2007-09-02 13:41 UTC Tuomo Valkonen tagged ion-doc-3rc-20070902 diff --git a/doc/conf.tex b/doc/conf.tex index ed19b51..6ec99ec 100644 --- a/doc/conf.tex +++ b/doc/conf.tex @@ -11,7 +11,7 @@ before continuing with this chapter. Section \ref{sec:conffiles} is an overview of the multiple configuration files Ion uses and as a perhaps more understandable introduction to the general layout of the configuration files, a walk-through of the main -configuration file \file{ion.lua} is provided in section +configuration file \file{cfg\_ion.lua} is provided in section \ref{sec:walkthrough}. How keys and mouse action are bound to functions is described in detail in \ref{sec:bindings} and in section \ref{sec:winprops} winprops are @@ -40,14 +40,20 @@ configuration file directory for files. Therefore, if you want to change some setting, it is advised against that you modify the stock configuration files in-place as subsequent installs of Ion will restore the stock configuration files. Instead you should always make a copy of the stock -file in \file{\~{}/.ion3/} and modify this file. When searching -for a file, if no extension or path component is given, compiled \file{.lc} -files are attempted before \file{.lua} files. +file in \file{\~{}/.ion3/} and modify this file. For sake of maintainability +of your customised configuration, it is recommended against copying all of +the files there. Only copy those files you actually need to modify. Most +simple customisations, such as changes in a few bindings, are best done +entirely within \file{cfg\_ion.lua}. All the configuration files are named \file{cfg\_*.lua} with the ``\file{*}'' part varying. The configuration file for each module \file{mod\_modname} is \file{cfg\_modname.lua}, with \file{modname} varying by the module in -question. The following table summarises these and other configuration +question. Configuration files can also be compiled into \file{.lc} files, +and these are attempted by the configuration file search routines before +\file{.lua} files. + +The following table summarises these and other configuration files: \begin{tabularx}{\linewidth}{ diff --git a/doc/exact-version b/doc/exact-version index 61e0024..b4bfe8c 100644 --- a/doc/exact-version +++ b/doc/exact-version @@ -1,5 +1,5 @@ Context: -[TAG ion-doc-3rc-20070902 -Tuomo Valkonen **20070902134120] +[TAG ion-doc-3rc-20070927 +Tuomo Valkonen **20070927162337] diff --git a/doc/ionconf.dvi.gz b/doc/ionconf.dvi.gz index 2691a1c..4c8973b 100644 Binary files a/doc/ionconf.dvi.gz and b/doc/ionconf.dvi.gz differ diff --git a/doc/ionconf.ps.gz b/doc/ionconf.ps.gz index 01966e8..ae751c6 100644 Binary files a/doc/ionconf.ps.gz and b/doc/ionconf.ps.gz differ diff --git a/doc/ionconf.tex b/doc/ionconf.tex index cd491eb..aa4aaa6 100644 --- a/doc/ionconf.tex +++ b/doc/ionconf.tex @@ -10,7 +10,7 @@ \title{Configuring and extending Ion3 with Lua} \author{Tuomo Valkonen \\ tuomov at iki.fi} -\date{2007-09-02} +\date{2007-09-27} \makeindex diff --git a/doc/ionconf/images.log b/doc/ionconf/images.log index 0ee24bc..7dcd34b 100644 --- a/doc/ionconf/images.log +++ b/doc/ionconf/images.log @@ -1,4 +1,4 @@ -This is pdfeTeX, Version 3.141592-1.21a-2.2 (Web2C 7.5.4) (format=latex 2007.4.8) 2 SEP 2007 16:45 +This is pdfeTeX, Version 3.141592-1.21a-2.2 (Web2C 7.5.4) (format=latex 2007.4.8) 27 SEP 2007 19:26 entering extended mode **./images.tex (./images.tex @@ -353,33 +353,33 @@ LaTeX Font Info: External font `cmex10' loaded for size (Font) <8> on input line 235. LaTeX Font Info: External font `cmex10' loaded for size (Font) <6> on input line 235. -l2hSize :tex2html_wrap_inline1055:7.0626pt::0.0pt::7.1201pt. +l2hSize :tex2html_wrap_inline1059:7.0626pt::0.0pt::7.1201pt. [1 ] -l2hSize :tex2html_wrap_inline1059:7.48248pt::0.0pt::48.86426pt. +l2hSize :tex2html_wrap_inline1063:7.48248pt::0.0pt::48.86426pt. [2 ] -l2hSize :tex2html_wrap_inline2259:8.7125pt::8.7125pt::23.6642pt. +l2hSize :tex2html_wrap_inline2263:8.7125pt::8.7125pt::23.6642pt. [3 ] -l2hSize :tex2html_wrap_inline5536:7.5626pt::7.5626pt::14.53923pt. +l2hSize :tex2html_wrap_inline5540:7.5626pt::7.5626pt::14.53923pt. [4 ] -l2hSize :tex2html_wrap_inline5538:7.5626pt::7.5626pt::14.53923pt. +l2hSize :tex2html_wrap_inline5542:7.5626pt::7.5626pt::14.53923pt. [5 ] -l2hSize :tex2html_wrap_inline7788:8.7125pt::8.7125pt::86.9574pt. +l2hSize :tex2html_wrap_inline7792:8.7125pt::8.7125pt::86.9574pt. [6 diff --git a/doc/ionconf/images.tex b/doc/ionconf/images.tex index 81b7053..ebd32e5 100644 --- a/doc/ionconf/images.tex +++ b/doc/ionconf/images.tex @@ -82,7 +82,7 @@ \title{Configuring and extending Ion3 with Lua} \author{Tuomo Valkonen \\tuomov at iki.fi} -\date{2007-09-02} +\date{2007-09-27} \makeindex @@ -231,7 +231,7 @@ \stepcounter{section} \stepcounter{section} {\newpage\clearpage -\lthtmlinlinemathA{tex2html_wrap_inline1055}% +\lthtmlinlinemathA{tex2html_wrap_inline1059}% $n$% \lthtmlinlinemathZ \lthtmlcheckvsize\clearpage} @@ -242,7 +242,7 @@ $n$% \stepcounter{subsection} \stepcounter{subsection} {\newpage\clearpage -\lthtmlinlinemathA{tex2html_wrap_inline1059}% +\lthtmlinlinemathA{tex2html_wrap_inline1063}% $N=1{\ldots} 5$% \lthtmlinlinemathZ \lthtmlcheckvsize\clearpage} @@ -301,7 +301,7 @@ $N=1{\ldots} 5$% \stepcounter{subsection} \stepcounter{subsection} {\newpage\clearpage -\lthtmlinlinemathA{tex2html_wrap_inline2259}% +\lthtmlinlinemathA{tex2html_wrap_inline2263}% $(0, 1]$% \lthtmlinlinemathZ \lthtmlcheckvsize\clearpage} @@ -325,13 +325,13 @@ $(0, 1]$% \stepcounter{subsection} \stepcounter{subsection} {\newpage\clearpage -\lthtmlinlinemathA{tex2html_wrap_inline5536}% +\lthtmlinlinemathA{tex2html_wrap_inline5540}% $-1$% \lthtmlinlinemathZ \lthtmlcheckvsize\clearpage} {\newpage\clearpage -\lthtmlinlinemathA{tex2html_wrap_inline5538}% +\lthtmlinlinemathA{tex2html_wrap_inline5542}% $-2$% \lthtmlinlinemathZ \lthtmlcheckvsize\clearpage} @@ -361,7 +361,7 @@ $-2$% \stepcounter{section} \stepcounter{subsection} {\newpage\clearpage -\lthtmlinlinemathA{tex2html_wrap_inline7788}% +\lthtmlinlinemathA{tex2html_wrap_inline7792}% $\{t,m,b\}\times\{t,c,b\}$% \lthtmlinlinemathZ \lthtmlcheckvsize\clearpage} diff --git a/doc/ionconf/index.html b/doc/ionconf/index.html index e1cb79b..0ea44a0 100644 --- a/doc/ionconf/index.html +++ b/doc/ionconf/index.html @@ -57,7 +57,7 @@ original version by: Nikos Drakos, CBLU, University of Leeds

Tuomo Valkonen

tuomov at iki.fi

-

2007-09-02

+

2007-09-27

diff --git a/doc/ionconf/ionconf.html b/doc/ionconf/ionconf.html index e1cb79b..0ea44a0 100644 --- a/doc/ionconf/ionconf.html +++ b/doc/ionconf/ionconf.html @@ -57,7 +57,7 @@ original version by: Nikos Drakos, CBLU, University of Leeds

Tuomo Valkonen

tuomov at iki.fi

-

2007-09-02

+

2007-09-27

diff --git a/doc/ionconf/node11.html b/doc/ionconf/node11.html index 0b36daf..edf9325 100644 --- a/doc/ionconf/node11.html +++ b/doc/ionconf/node11.html @@ -58,112 +58,112 @@ original version by: Nikos Drakos, CBLU, University of Leeds Index

acrobatic - : 3.5 + : 3.5
Alt - : 3.3.5 + : 3.3.5
AnyModifier - : 3.3.5 + : 3.3.5
resizeinc - : 3.5.1 - | 3.5.1 + : 3.5.1 + | 3.5.1
Button-n - : 3.3.6 + : 3.3.6
class
-
winprop : 3.5.2 +
winprop : 3.5.2
clientwin_do_manage_alt - : 6.9 + : 6.9
clientwin_mapped_hook - : 6.9 + : 6.9
clientwin_property_change_hook - : 6.9 + : 6.9
clientwin_unmapped_hook - : 6.9 + : 6.9
Control - : 3.3.5 + : 3.3.5
defmenu - : 3.4.1 + : 3.4.1
drawing engine - : 4.1 + : 4.1
ETCDIR - : 3.1 + : 3.1
float - : 3.5 + : 3.5
frame_managed_changed_hook - : 6.9 + : 6.9
fullscreen - : 3.5 + : 3.5
ignore_resizeinc - : 3.5.1 - | 3.5.1 + : 3.5.1 + | 3.5.1
ignore_cfgrq - : 3.5 + : 3.5
ignore_max_size - : 3.5.1 + : 3.5.1
ignore_min_size - : 3.5.1 + : 3.5.1
ignore_net_active_window - : 3.5 + : 3.5
instance
-
winprop : 3.5.2 +
winprop : 3.5.2
ioncore_deinit_hook - : 6.9 + : 6.9
ioncore_post_layout_setup_hook - : 6.9 + : 6.9
ioncore_sigchld_hook - : 6.9 + : 6.9
ioncore_snapshot_hook - : 6.9 + : 6.9
ioncore_submap_ungrab_hook - : 6.9 + : 6.9
is_dockapp
-
winprop : 3.5.2 +
winprop : 3.5.2
is_transient
-
winprop : 3.5.2 +
winprop : 3.5.2
jumpto - : 3.5 + : 3.5
keysymdef.h - : 3.3.5 + : 3.3.5
Lock - : 3.3.5 + : 3.3.5
manager : 2.2.2.1
max_size - : 3.5.1 + : 3.5.1
menuentry - : 3.4.1 + : 3.4.1
menus - : 3.4.1 + : 3.4.1
min_size - : 3.5.1 + : 3.5.1
ModN - : 3.3.5 + : 3.3.5
name
-
winprop : 3.5.2 +
winprop : 3.5.2
new_group - : 3.5 + : 3.5
NumLock - : 3.3.5 + : 3.3.5
Obj : 2.2.1
oneshot - : 3.5 + : 3.5
orientation - : 3.5 + : 3.5
parent : 2.2.2.1
PREFIX - : 3.1 + : 3.1
region_do_warp_alt - : 6.9 + : 6.9
region_notify_hook - : 6.9 + : 6.9
role
-
winprop : 3.5.2 +
winprop : 3.5.2
root window : 2.2.1 @@ -172,35 +172,35 @@ Index
X : 2.2.1
screen_managed_changed_hook - : 6.9 + : 6.9
ScrollLock - : 3.3.5 + : 3.3.5
Shift - : 3.3.5 + : 3.3.5
statusbar - : 3.5 + : 3.5
style - : 4.1 + : 4.1
submenu - : 3.4.1 + : 3.4.1
substyle - : 4.1 + : 4.1
switchto - : 3.5 + : 3.5
system.mk - : 3.1 + : 3.1
target - : 3.5 + : 3.5
tiling_placement_alt - : 6.9 + : 6.9
transient - : 3.5.3 + : 3.5.3
transient_mode - : 3.5 + : 3.5
transparent - : 3.5 + : 3.5
userpos - : 3.5.1 + : 3.5.1
WClientWin : 2.2.1
WEdln @@ -214,7 +214,7 @@ Index
WGroupWS : 2.2.1
Winprops - : 3.5 + : 3.5
WInput : 2.2.1
WMessage @@ -234,9 +234,9 @@ Index
Xinerama : 2.2.1
xmodmap - : 3.3.5 + : 3.3.5
xprop - : 3.5.3 + : 3.5.3 diff --git a/doc/ionconf/node13.html b/doc/ionconf/node13.html index f12c7f4..907b1b9 100644 --- a/doc/ionconf/node13.html +++ b/doc/ionconf/node13.html @@ -70,7 +70,7 @@ Mathematics Department, Macquarie University, Sydney. The command line arguments were:
latex2html -show_section_numbers -short_index -local_icons -noaddress -up_url http://iki.fi/tuomov/ion/ -up_title 'Ion homepage' -nofootnode -split 3 ionconf

-The translation was initiated by tuomov on 2007-09-02 +The translation was initiated by tuomov on 2007-09-27

diff --git a/doc/ionconf/node4.html b/doc/ionconf/node4.html index f041fdf..3980bc4 100644 --- a/doc/ionconf/node4.html +++ b/doc/ionconf/node4.html @@ -153,7 +153,7 @@ before continuing with this chapter. Section 3.1 is an overview of the multiple configuration files Ion uses and as a perhaps more understandable introduction to the general layout of the configuration files, a walk-through of the main -configuration file ion.lua is provided in section +configuration file cfg_ion.lua is provided in section 3.2. How keys and mouse action are bound to functions is described in detail in 3.3 and in section 3.5 winprops are @@ -172,9 +172,9 @@ For a reference on exported functions, see section /usr/local/etc/ion3/ unless you, the OS package maintainer or whoever installed the package on the system has modified the variables -PREFIX or -ETCDIR in -system.mk before compiling Ion. +PREFIX or +ETCDIR in +system.mk before compiling Ion. In the first case you probably know where to find the files and in the other case the system administrator or the OS package maintainer should have provided documentation to point to the correct location. @@ -189,15 +189,22 @@ configuration file directory for files. Therefore, if you want to change some setting, it is advised against that you modify the stock configuration files in-place as subsequent installs of Ion will restore the stock configuration files. Instead you should always make a copy of the stock -file in ~/.ion3/ and modify this file. When searching -for a file, if no extension or path component is given, compiled .lc -files are attempted before .lua files. +file in ~/.ion3/ and modify this file. For sake of maintainability +of your customised configuration, it is recommended against copying all of +the files there. Only copy those files you actually need to modify. Most +simple customisations, such as changes in a few bindings, are best done +entirely within cfg_ion.lua.

All the configuration files are named cfg_*.lua with the ``*'' part varying. The configuration file for each module mod_modname is cfg_modname.lua, with modname varying by the module in -question. The following table summarises these and other configuration +question. Configuration files can also be compiled into .lc files, +and these are attempted by the configuration file search routines before +.lua files. + +

+The following table summarises these and other configuration files:

@@ -612,8 +619,8 @@ defbindings("WFrame", { As seen above, the functions that create key binding specifications require a keyspec argument. This argument should be a string containing the name of a key as listed in the X header file keysymdef.h3.1 without the XK_ prefix. - + HREF="#foot880">3.1 without the XK_ prefix. + Most of the key names are quite intuitive while some are not. For example, the Enter key on the main part of the keyboard has the less common name Return while the one the numpad is called KP_Enter. @@ -626,21 +633,21 @@ modifiers:

Shift, Control, Mod1 to Mod5, AnyModifier and Lock. - - - - + + + +

X allows binding all of these modifiers to almost any key and while this list of modifiers does not explicitly list keys such as -Alt that are common on modern keyboards, such +Alt that are common on modern keyboards, such keys are bound to one of the ModN. On systems running XFree86 Alt is usually Mod1. On Suns Mod1 is the diamond key and Alt something else. One of the ``flying window'' keys on so called Windows-keyboards is probably mapped to Mod3 if you have -such a key. Use the program xmodmap +such a key. Use the program xmodmap to find out what exactly is bound where.

@@ -655,10 +662,10 @@ Ion ignores the Lock modifier and any ) -bound to NumLock or -ScrollLock +bound to NumLock or +ScrollLock by default because such3.2 locking keys may otherwise + HREF="#foot859">3.2 locking keys may otherwise cause confusion.

@@ -671,7 +678,7 @@ cause confusion. Button specifications are similar to key definitions but now instead of specifying modifiers and a key, you specify modifiers and one of the button names Button1 to -Button5. Additionally the +Button5. Additionally the specification may end with an optional area name following an @-sign. Only frames currently support areas, and the supported values in this case are @@ -722,10 +729,10 @@ to it is available virtually everywhere.

- - - - + + + + In the stock configuration file setup, menus are defined in the file cfg_menus.lua as previously mentioned. The mod_menu module must be loaded for one to be able to define menus, and this is done with @@ -887,7 +894,7 @@ defbindings("WFrame", {

-The so-called ``winprops'' can be used to change how +The so-called ``winprops'' can be used to change how specific windows are handled and to set up some kludges to deal with badly behaving applications. They are defined by calling the function defwinprop with a table containing the properties to set and the @@ -905,7 +912,7 @@ usual method of identifying windows, and how to obtain this information.

Description:
-
+
Set this to true for Acrobat Reader. It has an annoying habit of trying to manage its dialogs instead of setting them as transients and letting the window manager do its job, causing @@ -923,7 +930,7 @@ usual method of identifying windows, and how to obtain this information.
Description:
-
+
Set this to open the window in a floating frame, when in a group. @@ -938,7 +945,7 @@ usual method of identifying windows, and how to obtain this information.
Description:
-
+
Should the window be initially in full screen mode?
@@ -952,7 +959,7 @@ usual method of identifying windows, and how to obtain this information.
Description:
-
+
Should configure requests on the window be ignored? Only has effect on floating windows. @@ -967,7 +974,7 @@ usual method of identifying windows, and how to obtain this information.
Description:
-
+
Ignore extended WM hints _NET_ACTIVE_WINDOW request.
@@ -981,7 +988,7 @@ usual method of identifying windows, and how to obtain this information.
Description:
-
+
Should a newly created client window always be made active, even if the allocated frame isn't. @@ -996,7 +1003,7 @@ usual method of identifying windows, and how to obtain this information.
Description:
-
+
If the region specified by target winprop does not exist (or that winprop is not set), create a new workspace using the previously stored layout (see ioncore.deflayout) named by @@ -1015,7 +1022,7 @@ usual method of identifying windows, and how to obtain this information.
Description:
-
+
Discard this winprop after first use.
@@ -1029,7 +1036,7 @@ usual method of identifying windows, and how to obtain this information.
Description:
-
+
The orientation of the window: one of `vertical' or `horizontal'. This is only useful when using the window as a status display. @@ -1045,7 +1052,7 @@ usual method of identifying windows, and how to obtain this information.
Description:
-
+
Put the window in the statusbar, in the named tray component, (The default tray component is called simply `systray', and others you give names to in your custom template, always @@ -1062,7 +1069,7 @@ usual method of identifying windows, and how to obtain this information.
Description:
-
+
Should a newly mapped client window be switched to within its frame. @@ -1077,7 +1084,7 @@ usual method of identifying windows, and how to obtain this information.
Description:
-
+
The name of an object (workspace, frame) that should manage windows of this type. See also new_group. @@ -1092,7 +1099,7 @@ usual method of identifying windows, and how to obtain this information.
Description:
-
+
`normal': No change in behaviour. `current': The window should be thought of as a transient for the current active client window (if any) even if it is not marked as a @@ -1111,7 +1118,7 @@ usual method of identifying windows, and how to obtain this information.
Description:
-
+
Should frames be made transparent when this window is selected?
@@ -1126,15 +1133,15 @@ usual method of identifying windows, and how to obtain this information.

Additionally, the winprops -max_size, -min_size, -aspect, -resizeinc, +max_size, +min_size, +aspect, +resizeinc, and -ignore_max_size, -ignore_min_size, -ignore_aspect, -ignore_resizeinc, +ignore_max_size, +ignore_min_size, +ignore_aspect, +ignore_resizeinc, may be used to override application-supplied size hints. The four first ones are tables with the fields w and h, indicating the width and height size hints in pixels, and the latter ignore @@ -1142,7 +1149,7 @@ winprop is a boolean.

Finally, the boolean -userpos option may be used to +userpos option may be used to override the USPosition flag of the size hints. Normally, when this flag is set, Ion tries to respect the supplied window position more than when it is not set. Obviously, this makes sense @@ -1158,12 +1165,12 @@ only for floating windows.

The identification information supported are -class, -role, -instance, -name, -is_transient, and -is_dockapp. +class, +role, +instance, +name, +is_transient, and +is_dockapp. It is not necessary to specify all of these fields. The first three are strings, and must exactly match the corresponding information obtained from the window's properties. @@ -1251,7 +1258,7 @@ can be used to list the identification information required to set winprops for a window and all the transient windows managed within it.

- + Another way to get the identification information is to use xprop. Simply run To get class and instance, simply run xprop WM_CLASS and click on the particular window of interest. The class is the latter of @@ -1260,7 +1267,7 @@ windows have this property - use the command xprop WM_ROLE. This method, however, will not work on transients.

- + So-called ``transient windows'' are usually short-lived dialogs (although some programs abuse this property) that have a parent window that they are ``transient for''. On tiled workspaces Ion displays these windows @@ -1269,7 +1276,7 @@ Unfortunately xprop is stupid and can't cope with this situation, returning the parent window's properties when the transient is clicked on. For this reason you'll have to do a little extra work to get the properties for that window.3.3 + HREF="#foot1492">3.3

Finally, it should be mentioned that too many authors these days ``forget'' to set this vital identification to anything meaningful: @@ -1507,19 +1514,19 @@ for the additional mailboxes (`*' varying).


Footnotes

-
...keysymdef.h...keysymdef.h3.1
This file can usually be found in the directory /usr/X11R6/include/X11/.
-
... such... such3.2
Completely useless keys that should be gotten rid of in the author's opinion.
-
... window.... window.3.3
There's a patch to xprop to fix this, but nothing seems to be happening with respect to including it in diff --git a/doc/ionconf/node5.html b/doc/ionconf/node5.html index 7fe37d1..2db991c 100644 --- a/doc/ionconf/node5.html +++ b/doc/ionconf/node5.html @@ -128,7 +128,7 @@ user attributes are explained in Sections 4.3.

- +
4.1 Drawing engines, style specifications and sub-styles

@@ -180,7 +180,7 @@ specified, also in the form 
 attr1-attr2-...-attrn
-These extra attributes are called substyles +These extra attributes are called substyles and allow, for example, the state of the object to be indicated by different colour sets while keeping the interface at an abstract level and the drawing engine completely ignorant @@ -424,7 +424,7 @@ border elements and styles referred to there are explained in Figure

-

+
diff --git a/doc/ionconf/node7.html b/doc/ionconf/node7.html index 06d5f06..4a3e772 100644 --- a/doc/ionconf/node7.html +++ b/doc/ionconf/node7.html @@ -5849,7 +5849,7 @@ Any parameters not explicitly set in conftab will be left unchanged.

-
+
Hook name:
@@ -5921,7 +5921,7 @@ reg:attach(cwin)

-
+
Hook name:
@@ -5941,7 +5941,7 @@ reg:attach(cwin)

-
+
Hook name:
@@ -5962,7 +5962,7 @@ reg:attach(cwin)

-
+
Hook name:
@@ -5983,7 +5983,7 @@ reg:attach(cwin)

-
+
Hook name:
@@ -6029,7 +6029,7 @@ reg:attach(cwin)

-
+
Hook name:
@@ -6050,7 +6050,7 @@ reg:attach(cwin)

-
+
Hook name:
@@ -6070,7 +6070,7 @@ reg:attach(cwin)

-
+
Hook name:
@@ -6091,7 +6091,7 @@ reg:attach(cwin)

-
+
Hook name:
@@ -6111,7 +6111,7 @@ reg:attach(cwin)

-
+
Hook name:
@@ -6131,7 +6131,7 @@ reg:attach(cwin)

-
+
Hook name:
@@ -6183,7 +6183,7 @@ reg:attach(cwin)

-
+
Hook name:
@@ -6204,7 +6204,7 @@ reg:attach(cwin)

-
+
Hook name:
@@ -6226,7 +6226,7 @@ reg:attach(cwin)

-
+
Hook name:
diff --git a/doc/ionnotes.dvi.gz b/doc/ionnotes.dvi.gz index e60a0f1..d23f951 100644 Binary files a/doc/ionnotes.dvi.gz and b/doc/ionnotes.dvi.gz differ diff --git a/doc/ionnotes.ps.gz b/doc/ionnotes.ps.gz index cc68c9b..2fb8ef8 100644 Binary files a/doc/ionnotes.ps.gz and b/doc/ionnotes.ps.gz differ diff --git a/doc/ionnotes/node9.html b/doc/ionnotes/node9.html index 0397397..b3c05af 100644 --- a/doc/ionnotes/node9.html +++ b/doc/ionnotes/node9.html @@ -70,7 +70,7 @@ Mathematics Department, Macquarie University, Sydney. The command line arguments were:
latex2html -show_section_numbers -short_index -local_icons -noaddress -up_url http://iki.fi/tuomov/ion/ -up_title 'Ion homepage' -nofootnode -split 4 ionnotes

-The translation was initiated by tuomov on 2007-09-02 +The translation was initiated by tuomov on 2007-09-27

diff --git a/exact-version b/exact-version index 20beae1..6b0ce6a 100644 --- a/exact-version +++ b/exact-version @@ -1,5 +1,5 @@ Context: -[TAG ion-3rc-20070902 -Tuomo Valkonen **20070902134101] +[TAG ion-3rc-20070927 +Tuomo Valkonen **20070927162233] diff --git a/ioncore/frame-pointer.c b/ioncore/frame-pointer.c index a99d0c6..79f6865 100644 --- a/ioncore/frame-pointer.c +++ b/ioncore/frame-pointer.c @@ -364,19 +364,22 @@ void frame_p_tabdrag(WFrame *frame) EXTL_EXPORT_MEMBER void frame_p_switch_tab(WFrame *frame) { - WRegion *sub; + /*WRegion *sub;*/ if(ioncore_pointer_grab_region()!=(WRegion*)frame) return; + /* sub=sub_at_tab(frame); - if(sub!=NULL){ bool mcf=region_may_control_focus((WRegion*)frame); region_goto_flags(sub, (mcf ? REGION_GOTO_FOCUS|REGION_GOTO_NOWARP : 0)); } + */ + + mplex_switch_nth((WMPlex*)frame, p_tabnum); } diff --git a/ioncore/mplex.c b/ioncore/mplex.c index 1d5109f..a9ea894 100644 --- a/ioncore/mplex.c +++ b/ioncore/mplex.c @@ -651,7 +651,7 @@ static WStacking *mplex_do_to_focus(WMPlex *mplex, WStacking *to_try, static WStacking *mplex_do_to_focus_on(WMPlex *mplex, WStacking *node, WStacking *to_try, - PtrList **hidelist) + PtrList **hidelist, bool *within) { WGroup *grp=OBJ_CAST(node->reg, WGroup); WStacking *st; @@ -659,26 +659,21 @@ static WStacking *mplex_do_to_focus_on(WMPlex *mplex, WStacking *node, if(grp!=NULL){ if(to_try==NULL) to_try=grp->current_managed; + /* Only will return stuff within 'node' */ st=mplex_find_to_focus(mplex, to_try, node, hidelist); - if(st!=NULL || to_try!=NULL) + if(st!=NULL){ + if(within!=NULL) + *within=TRUE; return st; - if(hidelist!=NULL) - ptrlist_clear(hidelist); - /* We don't know whether something is blocking focus here, - * or if there was nothing to focus (as node->reg itself - * isn't on the stacking list). - */ + } } st=mplex_do_to_focus(mplex, node, hidelist); - if(st==node) - return st; + if(st==node && within!=NULL) + *within=TRUE; - if(hidelist!=NULL) - ptrlist_clear(hidelist); - - return NULL; + return st; } @@ -837,22 +832,18 @@ static void mplex_do_node_display(WMPlex *mplex, WStacking *node, static bool mplex_refocus(WMPlex *mplex, WStacking *node, bool warp) { WStacking *foc=NULL; - bool ret=TRUE; + bool within=FALSE; - if(node!=NULL){ - foc=mplex_do_to_focus_on(mplex, node, NULL, NULL); - ret=(foc!=NULL); - } + if(node!=NULL) + foc=mplex_do_to_focus_on(mplex, node, NULL, NULL, &within); - if(foc==NULL){ - ret=FALSE; + if(foc==NULL || !within) foc=mplex_to_focus(mplex); - } if(foc!=NULL) region_maybewarp(foc->reg, warp); - return ret; + return within; } @@ -864,6 +855,7 @@ bool mplex_do_prepare_focus(WMPlex *mplex, WStacking *node, PtrList *hidelist=NULL; PtrList **hidelistp=(ew ? NULL : &hidelist); WStacking *foc; + bool within=FALSE; if(sub==NULL && node==NULL) return FALSE; @@ -875,10 +867,7 @@ bool mplex_do_prepare_focus(WMPlex *mplex, WStacking *node, if(!region_prepare_focus((WRegion*)mplex, flags, res)) return FALSE; - if(node!=NULL) - foc=mplex_do_to_focus_on(mplex, node, sub, hidelistp); - else - foc=mplex_do_to_focus(mplex, sub, hidelistp); + foc=mplex_do_to_focus_on(mplex, node, sub, hidelistp, &within); if(foc!=NULL){ while(hidelist!=NULL){ @@ -897,10 +886,7 @@ bool mplex_do_prepare_focus(WMPlex *mplex, WStacking *node, res->reg=foc->reg; res->flags=flags; - if(sub==NULL) - return (foc==node); - else - return (foc==sub); + return within; }else{ return FALSE; } diff --git a/mod_dock/LICENSE b/mod_dock/LICENSE deleted file mode 100644 index b1e3f5a..0000000 --- a/mod_dock/LICENSE +++ /dev/null @@ -1,504 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - - diff --git a/mod_dock/Makefile b/mod_dock/Makefile index 2801471..9f49071 100644 --- a/mod_dock/Makefile +++ b/mod_dock/Makefile @@ -14,7 +14,7 @@ INCLUDES += $(X11_INCLUDES) $(LIBTU_INCLUDES) $(LIBEXTL_INCLUDES) -I.. CFLAGS += $(XOPEN_SOURCE) $(C99_SOURCE) SOURCES=dock.c -DOCS=LICENSE README.dock +DOCS=LICENSE MAKE_EXPORTS=mod_dock diff --git a/mod_dock/README.dock b/mod_dock/README.dock deleted file mode 100644 index c2d81ba..0000000 --- a/mod_dock/README.dock +++ /dev/null @@ -1,98 +0,0 @@ -Ion dock module -Copyright (c) Tom Payne 2003 -Copyright (c) Per Olofsson 2003 - -by Tom Payne -based on code by Per Olofsson - -INTRODUCTION - - This module provides a dock for the Ion window manager. - - Features: - - supports most dockapps - - configurable layout - - configurable dockapp order - - supports shaped dockapps - - uses ion's drawing engine - -DEPENDENCIES - - ion3 - -USAGE - - 1. Copy the configuration files cfg_dock.lua and dock-draw.lua to - your ~/.ion3 directory. Edit cfg_dock.lua and dock-draw.lua to - suit your preferences. - - 2. Add load_module("mod_dock") to ~/.ion3/cfg_ion.lua. - - 3. Add include("dock-draw.lua") near the end of ~/.ion3/draw.lua, - before gr_refresh(). - - 4. (Re)start ion3. - -CONFIGURATION - - See the comments in cfg_dock.lua and dock-draw.lua. - -KNOWN BUGS - - Not all dockapps dock. This is because dockapps use a variety of methods - to signal that they are dockapps and the dock doesn't yet - recognise all of them. If your favourite dockapp does not work then - please inform the author (email address at top of file). - - The following dockapps are known to have problems: - - - gkrellm2 can have the wrong shape if it is started after the dock - module is loaded. - - - wmxmms needs a winprop{...}. See the example cfg_dock.lua. Ion - complains: Client window "wmxmms" has broken transient_for hint. - ("Extended WM hints" multi-parent brain damage?). - -IMPLEMENTATION NOTES - - If you would like to help improve the dock then the following - notes might be useful. - - You should use folding in your editor when you edit/view the source - code. The code follows ion's coding standards, but there are many more - folds. VIM and Emacs both support folding. - - Dockapps use a variety of methods to signal to the window manager that - they are a dockapp. Ion automatically detects some (see - manage_clientwin() in ioncore/clientwin.c), and the dock detects - some others (see dock_clientwin_is_dockapp() in dock.c). Adding more - dockapp types will require editing these functions and possibly writing - type-specific management code. - - The dock should really implement region_save_to_file()/region_load() to - maintain state over a restart and session management. However, over - restart a new dock will also be created by cfg_dock.lua, meaning that there - will be multiple docks on the same screen. The solution is probably to - automatically create docks as they are required, with cfg_dock.lua - specifying the default configuration of new docks but not actually - creating any docks. - - As far as I can tell the gkrellm2 problem is a race condition and the - sequence of events is as follows: - 1. gkrellm2 starts and gets added to the dock with is initial geom. - 2. gkrellm2 grows as it loads plugins. - 3. The dock allocates more space to gkrellm2 and requests - gkrellm2's new shape, but gkrellm2 reports its old shape. - 4. Further requests to gkrellm2 return is new (actual) shape, but by - now it's too late... - Any assistance in fixing this bug would be much appreciated. - -AUTHORS - - Tom Payne - Per Olofsson - -LICENSE - - This program is licensed under the terms of the Lesser General Public - License (LGPL) version 2.1. See the file COPYING for details. diff --git a/mod_dock/dock.c b/mod_dock/dock.c index 63e9117..6da1a6f 100644 --- a/mod_dock/dock.c +++ b/mod_dock/dock.c @@ -983,7 +983,11 @@ static void mplexszplcy(int pos, WSizePolicy *szplcy) ? SIZEPOLICY_GRAVITY_SOUTHEAST : SIZEPOLICY_GRAVITY_SOUTHWEST) : SIZEPOLICY_GRAVITY_SOUTH)) - : SIZEPOLICY_GRAVITY_CENTER); + : (hp!=DOCK_HPOS_CENTER + ? (hp==DOCK_HPOS_RIGHT + ? SIZEPOLICY_GRAVITY_EAST + : SIZEPOLICY_GRAVITY_WEST) + : SIZEPOLICY_GRAVITY_CENTER)); *szplcy=p; } diff --git a/mod_query/mod_query.lua b/mod_query/mod_query.lua index b5bdd71..f6e9e1e 100644 --- a/mod_query/mod_query.lua +++ b/mod_query/mod_query.lua @@ -488,7 +488,10 @@ function mod_query.workspace_handler(mplex, name) local scr=mplex:screen_of() local function mkws() - local tmpl={name=name, switchto=true} + local tmpl={ + name=(name~="" and name), + switchto=true + } if not ioncore.create_ws(scr, tmpl, layout) then error(TR("Unknown error")) end diff --git a/system.mk b/system.mk index d9f2ec0..8a0d53c 100644 --- a/system.mk +++ b/system.mk @@ -131,8 +131,8 @@ WARN= -W -Wimplicit -Wreturn-type -Wswitch -Wcomment \ -Wtrigraphs -Wformat -Wchar-subscripts \ -Wparentheses -pedantic -Wuninitialized -CFLAGS=-g -Os $(WARN) $(DEFINES) $(EXTRA_INCLUDES) $(INCLUDES) -LDFLAGS=-g -Os $(EXTRA_LIBS) $(LIBS) +CFLAGS=-Os $(WARN) $(DEFINES) $(EXTRA_INCLUDES) $(INCLUDES) +LDFLAGS=-Os $(EXTRA_LIBS) $(LIBS) EXPORT_DYNAMIC=-Xlinker --export-dynamic # The following options are mainly for development use and can be used diff --git a/version.h b/version.h index 60fefd2..920ba19 100644 --- a/version.h +++ b/version.h @@ -1,2 +1,2 @@ -#define ION_VERSION "3rc-20070902" +#define ION_VERSION "3rc-20070927" #define ION_API_VERSION "3"
Figure 4.1: Sketch of different border styles and elements