From: Ben Hutchings Date: Sun, 15 Feb 2009 18:37:20 +0000 (+0000) Subject: Imported Upstream version 20090110 X-Git-Tag: 20090110-1~1^2 X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Ftuomov;p=ion3.git Imported Upstream version 20090110 --- diff --git a/ChangeLog b/ChangeLog index 1825d3d..006a04a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,49 @@ +2009-01-09 22:19 UTC Tuomo Valkonen + tagged ion-3-20090110 + +2009-01-09 22:19 UTC Tuomo Valkonen + * Release notes + +2009-01-09 22:17 UTC Tuomo Valkonen + * Year changed + +2008-12-30 17:11 UTC Tuomo Valkonen + * Apply FRAME_SHADED_TOGGLE hack in WFrame.maximize_vert + for correct unshaded size hints to rqgeom handlers. + +2008-11-16 10:56 UTC Tuomo Valkonen + * A few strings were missing translation wrapper + +2008-11-15 16:02 UTC Tuomo Valkonen + * Shouldn't open queries in frame if message box is open. + +2008-11-15 16:01 UTC Tuomo Valkonen + * WMPlex focus code fixes/improvements. + (Once again, maybe... this being focus code we're talking about.) + +2008-11-10 16:49 UTC Tuomo Valkonen + * Oops + +2008-11-06 22:54 UTC Tuomo Valkonen + * PHOLDER_ATTACH_RETURN_CREATEROOT flag to pholder_do_attach. + It's a non-API breaking hack that allows the unsqueeze code + to find out the root of the created hierarchy, instead of + just the attached client window being returned. This way + windows are unsqueezed in their newly created frames. + +2008-11-03 22:07 UTC Tuomo Valkonen + * Unsqueeze fixes + +2008-10-16 14:20 UTC Tuomo Valkonen + * Oops + +2008-10-16 13:55 UTC Tuomo Valkonen + * WInfoWin.set_text didn't check for null string + (that user scripts can pass to it). + +2008-10-09 17:50 UTC Tuomo Valkonen + * ioncore_warn_nolog uses usual warn if not in OPMODE_INIT. + 2008-10-02 15:29 UTC Tuomo Valkonen tagged ion-3-20081002 diff --git a/LICENSE b/LICENSE index 52a117d..fdfa652 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ -Copyright (c) Tuomo Valkonen 1999-2008. +Copyright (c) Tuomo Valkonen 1999-2009. Unless otherwise indicated in components taken from elsewhere, this software is licensed under the GNU Lesser General Public License, version 2.1 ("LGPL", diff --git a/README b/README index 3e8fd63..8a61477 100644 --- a/README +++ b/README @@ -2,7 +2,7 @@ Ion === -Copyright (c) Tuomo Valkonen 1999-2008. +Copyright (c) Tuomo Valkonen 1999-2009. tuomov at iki.fi diff --git a/RELNOTES b/RELNOTES index 631e3c4..cfda72e 100644 --- a/RELNOTES +++ b/RELNOTES @@ -1,4 +1,10 @@ +ion-3-20090110 +-------------- + +This is yet another maintenance release. + + ion-3-20081002 -------------- diff --git a/config.h b/config.h index bac7b43..e54aba7 100644 --- a/config.h +++ b/config.h @@ -1,7 +1,7 @@ /* * config.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/de/brush.c b/de/brush.c index 90a57a9..c2b5a4f 100644 --- a/de/brush.c +++ b/de/brush.c @@ -1,7 +1,7 @@ /* * ion/de/brush.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/de/brush.h b/de/brush.h index f3dc35c..523fcc7 100644 --- a/de/brush.h +++ b/de/brush.h @@ -1,7 +1,7 @@ /* * ion/de/brush.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/de/colour.c b/de/colour.c index 4fb3b1d..5bd2d60 100644 --- a/de/colour.c +++ b/de/colour.c @@ -1,7 +1,7 @@ /* * ion/de/colour.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/de/colour.h b/de/colour.h index 9864779..2c2b166 100644 --- a/de/colour.h +++ b/de/colour.h @@ -1,7 +1,7 @@ /* * ion/de/colour.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/de/draw.c b/de/draw.c index c9750ba..bcacfec 100644 --- a/de/draw.c +++ b/de/draw.c @@ -1,7 +1,7 @@ /* * ion/de/draw.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/de/font.c b/de/font.c index 0f6fab7..e70870f 100644 --- a/de/font.c +++ b/de/font.c @@ -1,7 +1,7 @@ /* * ion/de/font.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/de/font.h b/de/font.h index 1b3774c..6ba3fe8 100644 --- a/de/font.h +++ b/de/font.h @@ -1,7 +1,7 @@ /* * ion/de/font.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/de/fontset.h b/de/fontset.h index badee30..f35394c 100644 --- a/de/fontset.h +++ b/de/fontset.h @@ -1,7 +1,7 @@ /* * ion/de/fontset.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/de/init.c b/de/init.c index a473592..221515a 100644 --- a/de/init.c +++ b/de/init.c @@ -1,7 +1,7 @@ /* * ion/de/init.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/de/init.h b/de/init.h index caefc9c..2bdd520 100644 --- a/de/init.h +++ b/de/init.h @@ -1,7 +1,7 @@ /* * ion/de/init.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/de/private.h b/de/private.h index b0f4013..2d73d5b 100644 --- a/de/private.h +++ b/de/private.h @@ -1,7 +1,7 @@ /* * ion/de/private.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/de/style.c b/de/style.c index 06a1531..d5debb9 100644 --- a/de/style.c +++ b/de/style.c @@ -1,7 +1,7 @@ /* * ion/de/style.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/de/style.h b/de/style.h index 6f4063f..073f145 100644 --- a/de/style.h +++ b/de/style.h @@ -1,7 +1,7 @@ /* * ion/de/style.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/exact-version b/exact-version index dd17c91..5195e0f 100644 --- a/exact-version +++ b/exact-version @@ -1,5 +1,5 @@ Context: -[TAG ion-3-20081002 -Tuomo Valkonen **20081002152911] +[TAG ion-3-20090110 +Tuomo Valkonen **20090109221932] diff --git a/ion/ion.c b/ion/ion.c index ac07f3f..9e0c253 100644 --- a/ion/ion.c +++ b/ion/ion.c @@ -1,7 +1,7 @@ /* * ion/ion/ion.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/activity.c b/ioncore/activity.c index 30ff4d1..1beddba 100644 --- a/ioncore/activity.c +++ b/ioncore/activity.c @@ -1,7 +1,7 @@ /* * ion/ioncore/activity.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/activity.h b/ioncore/activity.h index 8728a2f..aa2ed88 100644 --- a/ioncore/activity.h +++ b/ioncore/activity.h @@ -1,7 +1,7 @@ /* * ion/ioncore/activity.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/attach.c b/ioncore/attach.c index 2ac8d18..0ee74ab 100644 --- a/ioncore/attach.c +++ b/ioncore/attach.c @@ -1,7 +1,7 @@ /* * ion/ioncore/attach.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/attach.h b/ioncore/attach.h index 6fffd37..fe89217 100644 --- a/ioncore/attach.h +++ b/ioncore/attach.h @@ -1,7 +1,7 @@ /* * ion/ioncore/attach.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/basicpholder.c b/ioncore/basicpholder.c index 7272908..9689ec4 100644 --- a/ioncore/basicpholder.c +++ b/ioncore/basicpholder.c @@ -1,7 +1,7 @@ /* * ion/ioncore/basicpholder.c * - * Copyright (c) Tuomo Valkonen 2005-2008. + * Copyright (c) Tuomo Valkonen 2005-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/basicpholder.h b/ioncore/basicpholder.h index 156b4a4..8953ca5 100644 --- a/ioncore/basicpholder.h +++ b/ioncore/basicpholder.h @@ -1,7 +1,7 @@ /* * ion/ioncore/basicpholder.h * - * Copyright (c) Tuomo Valkonen 2005-2008. + * Copyright (c) Tuomo Valkonen 2005-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/binding.c b/ioncore/binding.c index f4fb0e6..8f3a69e 100644 --- a/ioncore/binding.c +++ b/ioncore/binding.c @@ -1,7 +1,7 @@ /* * ion/ioncore/binding.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/binding.h b/ioncore/binding.h index 98d0667..3354b23 100644 --- a/ioncore/binding.h +++ b/ioncore/binding.h @@ -1,7 +1,7 @@ /* * ion/ioncore/binding.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/bindmaps.c b/ioncore/bindmaps.c index e7318a8..f22a5ea 100644 --- a/ioncore/bindmaps.c +++ b/ioncore/bindmaps.c @@ -1,7 +1,7 @@ /* * ion/ioncore/bindmaps.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/bindmaps.h b/ioncore/bindmaps.h index 48631c1..19dbed1 100644 --- a/ioncore/bindmaps.h +++ b/ioncore/bindmaps.h @@ -1,7 +1,7 @@ /* * ion/ioncore/bindmaps.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/classes.h b/ioncore/classes.h index d7076e4..2db3ecc 100644 --- a/ioncore/classes.h +++ b/ioncore/classes.h @@ -1,7 +1,7 @@ /* * ion/ioncore/classes.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/clientwin.c b/ioncore/clientwin.c index 0d81b2f..11ce290 100644 --- a/ioncore/clientwin.c +++ b/ioncore/clientwin.c @@ -1,7 +1,7 @@ /* * ion/ioncore/clientwin.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/clientwin.h b/ioncore/clientwin.h index cd0134a..69f676f 100644 --- a/ioncore/clientwin.h +++ b/ioncore/clientwin.h @@ -1,7 +1,7 @@ /* * ion/ioncore/clientwin.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/colormap.c b/ioncore/colormap.c index 303e319..9f80f49 100644 --- a/ioncore/colormap.c +++ b/ioncore/colormap.c @@ -1,7 +1,7 @@ /* * ion/ioncore/colormap.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/colormap.h b/ioncore/colormap.h index 8a6c201..b3d8e60 100644 --- a/ioncore/colormap.h +++ b/ioncore/colormap.h @@ -1,7 +1,7 @@ /* * ion/ioncore/colormap.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/common.h b/ioncore/common.h index 616e7d9..6318f4f 100644 --- a/ioncore/common.h +++ b/ioncore/common.h @@ -1,7 +1,7 @@ /* * ion/ioncore/common.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/conf-bindings.c b/ioncore/conf-bindings.c index 69d8996..154d94b 100644 --- a/ioncore/conf-bindings.c +++ b/ioncore/conf-bindings.c @@ -1,7 +1,7 @@ /* * ion/ioncore/conf-bindings.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/conf-bindings.h b/ioncore/conf-bindings.h index af0ebf1..31b50da 100644 --- a/ioncore/conf-bindings.h +++ b/ioncore/conf-bindings.h @@ -1,7 +1,7 @@ /* * ion/ioncore/conf-bindings.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/conf.c b/ioncore/conf.c index 258f563..35844c4 100644 --- a/ioncore/conf.c +++ b/ioncore/conf.c @@ -1,7 +1,7 @@ /* * ion/ioncore/conf.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/conf.h b/ioncore/conf.h index 5435546..c7c9a8d 100644 --- a/ioncore/conf.h +++ b/ioncore/conf.h @@ -1,7 +1,7 @@ /* * ion/ioncore/conf.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/cursor.c b/ioncore/cursor.c index ba045c4..5c8954f 100644 --- a/ioncore/cursor.c +++ b/ioncore/cursor.c @@ -1,7 +1,7 @@ /* * ion/ioncore/cursor.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/cursor.h b/ioncore/cursor.h index ab41d85..6f03a0a 100644 --- a/ioncore/cursor.h +++ b/ioncore/cursor.h @@ -1,7 +1,7 @@ /* * ion/ioncore/cursor.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/detach.c b/ioncore/detach.c index 89187a4..e175759 100644 --- a/ioncore/detach.c +++ b/ioncore/detach.c @@ -1,7 +1,7 @@ /* * ion/ioncore/detach.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ @@ -222,7 +222,6 @@ bool ioncore_detach_extl(WRegion *reg, const char *how) void do_unsqueeze(WRegion *reg) { WSizeHints h; - WRegion *mgr=REGION_MANAGER(reg); if(OBJ_IS(reg, WScreen)) return; @@ -238,11 +237,6 @@ void do_unsqueeze(WRegion *reg) } ioncore_detach(reg, SETPARAM_SET); - - if(REGION_MANAGER(reg)==mgr) - return; - - do_unsqueeze(reg); } @@ -256,7 +250,7 @@ EXTL_EXPORT void ioncore_unsqueeze(WRegion *reg, bool override) { if(ioncore_g.unsqueeze_enabled || override) - do_unsqueeze(region_groupleader_of(reg)); + do_unsqueeze(reg); } diff --git a/ioncore/detach.h b/ioncore/detach.h index 0a2da1e..6a5c721 100644 --- a/ioncore/detach.h +++ b/ioncore/detach.h @@ -1,7 +1,7 @@ /* * ion/ioncore/detach.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/dummywc.h b/ioncore/dummywc.h index 87bafe2..588f164 100644 --- a/ioncore/dummywc.h +++ b/ioncore/dummywc.h @@ -1,7 +1,7 @@ /* * ion/ioncore/dummywc.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/event.c b/ioncore/event.c index 02bc5fe..75384a1 100644 --- a/ioncore/event.c +++ b/ioncore/event.c @@ -1,7 +1,7 @@ /* * ion/ioncore/event.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/event.h b/ioncore/event.h index 3a810c4..9b2d0f9 100644 --- a/ioncore/event.h +++ b/ioncore/event.h @@ -1,7 +1,7 @@ /* * ion/ioncore/event.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/eventh.c b/ioncore/eventh.c index 572ab91..861007f 100644 --- a/ioncore/eventh.c +++ b/ioncore/eventh.c @@ -1,7 +1,7 @@ /* * ion/ioncore/eventh.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/eventh.h b/ioncore/eventh.h index af10eb2..fd3f1c3 100644 --- a/ioncore/eventh.h +++ b/ioncore/eventh.h @@ -1,7 +1,7 @@ /* * ion/ioncore/eventh.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/exec.c b/ioncore/exec.c index bd43fe8..9da7003 100644 --- a/ioncore/exec.c +++ b/ioncore/exec.c @@ -1,7 +1,7 @@ /* * ion/ioncore/exec.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/exec.h b/ioncore/exec.h index 39e0c68..8275053 100644 --- a/ioncore/exec.h +++ b/ioncore/exec.h @@ -1,7 +1,7 @@ /* * ion/ioncore/exec.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/extlconv.c b/ioncore/extlconv.c index 8f36173..f363ec3 100644 --- a/ioncore/extlconv.c +++ b/ioncore/extlconv.c @@ -1,7 +1,7 @@ /* * ion/ioncore/extlconv.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/extlconv.h b/ioncore/extlconv.h index d56f9dc..2582a42 100644 --- a/ioncore/extlconv.h +++ b/ioncore/extlconv.h @@ -1,7 +1,7 @@ /* * ion/ioncore/extlconv.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/extlrx.c b/ioncore/extlrx.c index 155a325..190100a 100644 --- a/ioncore/extlrx.c +++ b/ioncore/extlrx.c @@ -1,7 +1,7 @@ /* * ion/ioncore/extlrx.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/float-placement.c b/ioncore/float-placement.c index f36b30f..fe02708 100644 --- a/ioncore/float-placement.c +++ b/ioncore/float-placement.c @@ -1,7 +1,7 @@ /* * ion/ioncore/float-placement.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/float-placement.h b/ioncore/float-placement.h index ebde2cf..cbe2ed8 100644 --- a/ioncore/float-placement.h +++ b/ioncore/float-placement.h @@ -1,7 +1,7 @@ /* * ion/ioncore/float-placement.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/focus.c b/ioncore/focus.c index f80a5f2..ee3fd86 100644 --- a/ioncore/focus.c +++ b/ioncore/focus.c @@ -1,7 +1,7 @@ /* * ion/ioncore/focus.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/focus.h b/ioncore/focus.h index 12340cd..bf7cc06 100644 --- a/ioncore/focus.h +++ b/ioncore/focus.h @@ -1,7 +1,7 @@ /* * ion/ioncore/focus.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/frame-draw.c b/ioncore/frame-draw.c index 0037584..fbe5806 100644 --- a/ioncore/frame-draw.c +++ b/ioncore/frame-draw.c @@ -1,7 +1,7 @@ /* * ion/ioncore/frame-draw.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/frame-draw.h b/ioncore/frame-draw.h index 6b8d7d3..03b4177 100644 --- a/ioncore/frame-draw.h +++ b/ioncore/frame-draw.h @@ -1,7 +1,7 @@ /* * ion/ioncore/frame-draw.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/frame-pointer.c b/ioncore/frame-pointer.c index 7b4d8fa..6340dd0 100644 --- a/ioncore/frame-pointer.c +++ b/ioncore/frame-pointer.c @@ -1,7 +1,7 @@ /* * ion/ioncore/frame-pointer.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/frame-pointer.h b/ioncore/frame-pointer.h index df31c63..5340f01 100644 --- a/ioncore/frame-pointer.h +++ b/ioncore/frame-pointer.h @@ -1,7 +1,7 @@ /* * ion/ioncore/frame-pointer.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/frame.c b/ioncore/frame.c index 019cd8b..4f82aa4 100644 --- a/ioncore/frame.c +++ b/ioncore/frame.c @@ -1,7 +1,7 @@ /* * ion/ioncore/frame.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/frame.h b/ioncore/frame.h index 33d846e..d69c279 100644 --- a/ioncore/frame.h +++ b/ioncore/frame.h @@ -1,7 +1,7 @@ /* * ion/ioncore/frame.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/framedpholder.c b/ioncore/framedpholder.c index 0a19808..60c6291 100644 --- a/ioncore/framedpholder.c +++ b/ioncore/framedpholder.c @@ -1,7 +1,7 @@ /* * ion/ioncore/framedpholder.c * - * Copyright (c) Tuomo Valkonen 2005-2008. + * Copyright (c) Tuomo Valkonen 2005-2009. * * See the included file LICENSE for details. */ @@ -202,7 +202,9 @@ WRegion *framedpholder_do_attach(WFramedPHolder *ph, int flags, watch_setup(&ph->frame_watch, (Obj*)frame, NULL); } - return ap.reg_ret; + return (flags&PHOLDER_ATTACH_RETURN_CREATEROOT + ? (WRegion*)frame + : ap.reg_ret); } diff --git a/ioncore/framedpholder.h b/ioncore/framedpholder.h index fc25ee3..754731d 100644 --- a/ioncore/framedpholder.h +++ b/ioncore/framedpholder.h @@ -1,7 +1,7 @@ /* * ion/ioncore/framedpholder.h * - * Copyright (c) Tuomo Valkonen 2005-2008. + * Copyright (c) Tuomo Valkonen 2005-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/framep.h b/ioncore/framep.h index 41c1efd..6b49f2e 100644 --- a/ioncore/framep.h +++ b/ioncore/framep.h @@ -1,7 +1,7 @@ /* * ion/ioncore/framep.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/fullscreen.c b/ioncore/fullscreen.c index 2ddf985..04fc7ea 100644 --- a/ioncore/fullscreen.c +++ b/ioncore/fullscreen.c @@ -1,7 +1,7 @@ /* * ion/ioncore/fullscreen.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/fullscreen.h b/ioncore/fullscreen.h index 4d70aff..45a0a08 100644 --- a/ioncore/fullscreen.h +++ b/ioncore/fullscreen.h @@ -1,7 +1,7 @@ /* * ion/ioncore/fullscreen.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/global.h b/ioncore/global.h index 8039f5f..fb00d99 100644 --- a/ioncore/global.h +++ b/ioncore/global.h @@ -1,7 +1,7 @@ /* * ion/ioncore/global.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/gr-util.h b/ioncore/gr-util.h index f30f33a..d9ede08 100644 --- a/ioncore/gr-util.h +++ b/ioncore/gr-util.h @@ -1,7 +1,7 @@ /* * ion/ioncore/gr-util.h * - * Copyright (c) Tuomo Valkonen 2007-2008. + * Copyright (c) Tuomo Valkonen 2007-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/gr.c b/ioncore/gr.c index 794f1f7..b1712a1 100644 --- a/ioncore/gr.c +++ b/ioncore/gr.c @@ -1,7 +1,7 @@ /* * ion/ioncore/gr.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/gr.h b/ioncore/gr.h index 516b6e3..96098c6 100644 --- a/ioncore/gr.h +++ b/ioncore/gr.h @@ -1,7 +1,7 @@ /* * ion/ioncore/gr.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/grab.c b/ioncore/grab.c index c65f288..4963e8a 100644 --- a/ioncore/grab.c +++ b/ioncore/grab.c @@ -2,7 +2,7 @@ * ion/ioncore/grab.c * * Copyright (c) Lukas Schroeder 2002, - * Tuomo Valkonen 2003-2008. + * Tuomo Valkonen 2003-2009. * * See the included file LICENSE for details. * diff --git a/ioncore/grab.h b/ioncore/grab.h index 98f4586..dcc0675 100644 --- a/ioncore/grab.h +++ b/ioncore/grab.h @@ -2,7 +2,7 @@ * ion/ioncore/grab.h * * Copyright (c) Lukas Schroeder 2002, - * Tuomo Valkonen 2003-2008. + * Tuomo Valkonen 2003-2009. * * See the included file LICENSE for details. * diff --git a/ioncore/group-cw.c b/ioncore/group-cw.c index 48f234a..f117cf6 100644 --- a/ioncore/group-cw.c +++ b/ioncore/group-cw.c @@ -1,7 +1,7 @@ /* * ion/ioncore/group-cw.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/group-cw.h b/ioncore/group-cw.h index d5f5afe..16b6360 100644 --- a/ioncore/group-cw.h +++ b/ioncore/group-cw.h @@ -1,7 +1,7 @@ /* * ion/ioncore/group-cw.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/group-ws.c b/ioncore/group-ws.c index 4445c55..d7b7447 100644 --- a/ioncore/group-ws.c +++ b/ioncore/group-ws.c @@ -1,7 +1,7 @@ /* * ion/ioncore/group-ws.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/group-ws.h b/ioncore/group-ws.h index e385e28..786df60 100644 --- a/ioncore/group-ws.h +++ b/ioncore/group-ws.h @@ -1,7 +1,7 @@ /* * ion/ioncore/groupws.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/group.c b/ioncore/group.c index 750c955..3db0795 100644 --- a/ioncore/group.c +++ b/ioncore/group.c @@ -1,7 +1,7 @@ /* * ion/ioncore/group.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/group.h b/ioncore/group.h index 85af349..1b3fd3c 100644 --- a/ioncore/group.h +++ b/ioncore/group.h @@ -1,7 +1,7 @@ /* * ion/ioncore/group.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/grouppholder.c b/ioncore/grouppholder.c index 2d941e4..052f677 100644 --- a/ioncore/grouppholder.c +++ b/ioncore/grouppholder.c @@ -1,7 +1,7 @@ /* * ion/ioncore/grouppholder.c * - * Copyright (c) Tuomo Valkonen 2005-2008. + * Copyright (c) Tuomo Valkonen 2005-2009. * * See the included file LICENSE for details. */ @@ -227,7 +227,7 @@ static WRegion *grouppholder_attach_recreate(WGroupPHolder *ph, int flags, { WRegionAttachData data2; WPHolder *root, *rph; - WGroup *grp; + WRegion *res; RP rp; rp.ph_head=get_head(ph); @@ -247,16 +247,17 @@ static WRegion *grouppholder_attach_recreate(WGroupPHolder *ph, int flags, data2.u.n.fn=recreate_handler; data2.u.n.param=&rp; - grp=(WGroup*)pholder_do_attach(rph, flags, &data2); + res=pholder_do_attach(rph, flags, &data2); - if(grp!=NULL){ - assert(OBJ_IS(grp, WGroup)); + if(res!=NULL){ rp.ph_head->recreate_pholder=NULL; /* It might be in use in attach chain! So defer. */ mainloop_defer_destroy((Obj*)rph); } - return rp.reg_ret; + return (flags&PHOLDER_ATTACH_RETURN_CREATEROOT + ? (WRegion*)res + : rp.reg_ret); } diff --git a/ioncore/grouppholder.h b/ioncore/grouppholder.h index 5c8ca19..f627089 100644 --- a/ioncore/grouppholder.h +++ b/ioncore/grouppholder.h @@ -1,7 +1,7 @@ /* * ion/ioncore/grouppholder.h * - * Copyright (c) Tuomo Valkonen 2005-2008. + * Copyright (c) Tuomo Valkonen 2005-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/infowin.c b/ioncore/infowin.c index 5dd0b28..66029b2 100644 --- a/ioncore/infowin.c +++ b/ioncore/infowin.c @@ -1,7 +1,7 @@ /* * ion/ioncore/infowin.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ @@ -198,18 +198,22 @@ void infowin_set_text(WInfoWin *p, const char *str, int maxw) { bool set=FALSE; - if(maxw>0 && p->brush!=NULL){ - char *tmp=grbrush_make_label(p->brush, str, maxw); - if(tmp!=NULL){ - infowin_do_set_text(p, tmp); - free(tmp); - set=TRUE; + if(str==NULL){ + INFOWIN_BUFFER(p)[0]='\0'; + }else{ + if(maxw>0 && p->brush!=NULL){ + char *tmp=grbrush_make_label(p->brush, str, maxw); + if(tmp!=NULL){ + infowin_do_set_text(p, tmp); + free(tmp); + set=TRUE; + } } + + if(!set) + infowin_do_set_text(p, str); } - if(!set) - infowin_do_set_text(p, str); - infowin_resize(p); /* sometimes unnecessary */ diff --git a/ioncore/infowin.h b/ioncore/infowin.h index 5019d78..e7a450e 100644 --- a/ioncore/infowin.h +++ b/ioncore/infowin.h @@ -1,7 +1,7 @@ /* * ion/ioncore/infowin.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/ioncore.c b/ioncore/ioncore.c index 33eb3e3..0675d0a 100644 --- a/ioncore/ioncore.c +++ b/ioncore/ioncore.c @@ -1,7 +1,7 @@ /* * ion/ioncore/ioncore.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ @@ -74,7 +74,7 @@ WGlobal ioncore_g; static const char *progname="ion"; static const char ioncore_copy[]= - "Ion " ION_VERSION ", copyright (c) Tuomo Valkonen 1999-2008."; + "Ion " ION_VERSION ", copyright (c) Tuomo Valkonen 1999-2009."; static const char ioncore_license[]=DUMMY_TR( "This software is licensed under the GNU Lesser General Public License\n" @@ -105,9 +105,15 @@ void ioncore_warn_nolog(const char *str, ...) va_list args; va_start(args, str); - fprintf(stderr, "%s: ", libtu_progname()); - vfprintf(stderr, str, args); - fprintf(stderr, "\n"); + + if(ioncore_g.opmode==IONCORE_OPMODE_INIT){ + fprintf(stderr, "%s: ", libtu_progname()); + vfprintf(stderr, str, args); + fprintf(stderr, "\n"); + }else{ + warn_v(str, args); + } + va_end(args); } @@ -189,7 +195,7 @@ static bool check_encoding() } if(mbtowc(NULL, NULL, 0)!=0){ - warn("Statefull encodings are unsupported."); + warn(TR("Statefull encodings are unsupported.")); return FALSE; } @@ -199,11 +205,11 @@ static bool check_encoding() return TRUE; integr_err: - warn("Cannot verify locale encoding setting integrity " - "(LC_CTYPE=%s, nl_langinfo(CODESET)=%s). " - "The LC_CTYPE environment variable should be of the form " - "language_REGION.encoding (e.g. en_GB.UTF-8), and encoding " - "should match the nl_langinfo value above.", ctype, langi); + warn(TR("Cannot verify locale encoding setting integrity " + "(LC_CTYPE=%s, nl_langinfo(CODESET)=%s). " + "The LC_CTYPE environment variable should be of the form " + "language_REGION.encoding (e.g. en_GB.UTF-8), and encoding " + "should match the nl_langinfo value above."), ctype, langi); return FALSE; } diff --git a/ioncore/ioncore.h b/ioncore/ioncore.h index 5756aab..19e53ee 100644 --- a/ioncore/ioncore.h +++ b/ioncore/ioncore.h @@ -1,7 +1,7 @@ /* * ion/ioncore/focus.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/ioncore_bindings.lua b/ioncore/ioncore_bindings.lua index a3da00c..01588eb 100644 --- a/ioncore/ioncore_bindings.lua +++ b/ioncore/ioncore_bindings.lua @@ -1,7 +1,7 @@ -- -- ion/share/ioncore-bindings.lua -- --- Copyright (c) Tuomo Valkonen 2004-2008. +-- Copyright (c) Tuomo Valkonen 2004-2009. -- -- See the included file LICENSE for details. -- diff --git a/ioncore/ioncore_efbb.lua b/ioncore/ioncore_efbb.lua index f26cdc3..e5049ba 100644 --- a/ioncore/ioncore_efbb.lua +++ b/ioncore/ioncore_efbb.lua @@ -1,7 +1,7 @@ -- -- ion/share/ioncore_efbb.lua -- Minimal emergency fallback bindings. -- --- Copyright (c) Tuomo Valkonen 2004-2008. +-- Copyright (c) Tuomo Valkonen 2004-2009. -- -- See the included file LICENSE for details. -- diff --git a/ioncore/ioncore_ext.lua b/ioncore/ioncore_ext.lua index 88828d1..56f0503 100644 --- a/ioncore/ioncore_ext.lua +++ b/ioncore/ioncore_ext.lua @@ -1,7 +1,7 @@ -- -- ion/share/ioncore_ext.lua -- Ioncore Lua library -- --- Copyright (c) Tuomo Valkonen 2004-2008. +-- Copyright (c) Tuomo Valkonen 2004-2009. -- -- See the included file LICENSE for details. -- diff --git a/ioncore/ioncore_luaext.lua b/ioncore/ioncore_luaext.lua index a98d2ce..a8ab8b8 100644 --- a/ioncore/ioncore_luaext.lua +++ b/ioncore/ioncore_luaext.lua @@ -1,7 +1,7 @@ -- -- ion/share/ioncore_luaext.lua -- --- Copyright (c) Tuomo Valkonen 2004-2008. +-- Copyright (c) Tuomo Valkonen 2004-2009. -- -- See the included file LICENSE for details. -- diff --git a/ioncore/ioncore_menudb.lua b/ioncore/ioncore_menudb.lua index 62cf04a..1d8100b 100644 --- a/ioncore/ioncore_menudb.lua +++ b/ioncore/ioncore_menudb.lua @@ -1,7 +1,7 @@ -- -- ion/ioncore/ioncore_menudb.lua -- Routines for defining menus. -- --- Copyright (c) Tuomo Valkonen 2004-2008. +-- Copyright (c) Tuomo Valkonen 2004-2009. -- -- See the included file LICENSE for details. -- diff --git a/ioncore/ioncore_misc.lua b/ioncore/ioncore_misc.lua index 3451d7b..7dc6353 100644 --- a/ioncore/ioncore_misc.lua +++ b/ioncore/ioncore_misc.lua @@ -1,7 +1,7 @@ -- -- ion/share/ioncore_misc.lua -- --- Copyright (c) Tuomo Valkonen 2004-2008. +-- Copyright (c) Tuomo Valkonen 2004-2009. -- -- See the included file LICENSE for details. -- diff --git a/ioncore/ioncore_quasiact.lua b/ioncore/ioncore_quasiact.lua index 1374996..68f004d 100644 --- a/ioncore/ioncore_quasiact.lua +++ b/ioncore/ioncore_quasiact.lua @@ -1,7 +1,7 @@ -- -- ion/share/ioncore_quasiact.lua -- Frame quasiactivation support -- --- Copyright (c) Tuomo Valkonen 2007-2008. +-- Copyright (c) Tuomo Valkonen 2007-2009. -- -- See the included file LICENSE for details. -- diff --git a/ioncore/ioncore_tabnum.lua b/ioncore/ioncore_tabnum.lua index 2a3cbad..24f8a18 100644 --- a/ioncore/ioncore_tabnum.lua +++ b/ioncore/ioncore_tabnum.lua @@ -1,7 +1,7 @@ -- -- ion/share/ioncore_tabnum.lua -- Ioncore tab numbering support -- --- Copyright (c) Tuomo Valkonen 2007-2008. +-- Copyright (c) Tuomo Valkonen 2007-2009. -- -- See the included file LICENSE for details. -- diff --git a/ioncore/ioncore_wd.lua b/ioncore/ioncore_wd.lua index 48bc7fc..b00b18d 100644 --- a/ioncore/ioncore_wd.lua +++ b/ioncore/ioncore_wd.lua @@ -1,7 +1,7 @@ -- -- ion/share/ioncore_wd.lua -- --- Copyright (c) Tuomo Valkonen 2004-2008. +-- Copyright (c) Tuomo Valkonen 2004-2009. -- -- See the included file LICENSE for details. -- diff --git a/ioncore/ioncore_winprops.lua b/ioncore/ioncore_winprops.lua index b74ed63..3294486 100644 --- a/ioncore/ioncore_winprops.lua +++ b/ioncore/ioncore_winprops.lua @@ -1,7 +1,7 @@ -- -- ion/share/ioncore_winprops.lua -- --- Copyright (c) Tuomo Valkonen 2004-2008. +-- Copyright (c) Tuomo Valkonen 2004-2009. -- -- See the included file LICENSE for details. -- diff --git a/ioncore/kbresize.c b/ioncore/kbresize.c index 7fe00c3..99f908d 100644 --- a/ioncore/kbresize.c +++ b/ioncore/kbresize.c @@ -1,7 +1,7 @@ /* * ion/ioncore/kbresize.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/kbresize.h b/ioncore/kbresize.h index f05857f..ca9e1b4 100644 --- a/ioncore/kbresize.h +++ b/ioncore/kbresize.h @@ -1,7 +1,7 @@ /* * ion/ioncore/kbresize.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/key.c b/ioncore/key.c index 5238383..8675b8c 100644 --- a/ioncore/key.c +++ b/ioncore/key.c @@ -1,7 +1,7 @@ /* * ion/ioncore/key.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/key.h b/ioncore/key.h index 614186e..cb5831d 100644 --- a/ioncore/key.h +++ b/ioncore/key.h @@ -1,7 +1,7 @@ /* * ion/ioncore/key.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/llist.c b/ioncore/llist.c index f9cc92d..b47eef2 100644 --- a/ioncore/llist.c +++ b/ioncore/llist.c @@ -1,7 +1,7 @@ /* * ion/ioncore/llist.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/llist.h b/ioncore/llist.h index d3807a9..5e1c7a9 100644 --- a/ioncore/llist.h +++ b/ioncore/llist.h @@ -1,7 +1,7 @@ /* * ion/ioncore/llist.h * - * Copyright (c) Tuomo Valkonen 2005-2008. + * Copyright (c) Tuomo Valkonen 2005-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/manage.c b/ioncore/manage.c index 5b03605..9215804 100644 --- a/ioncore/manage.c +++ b/ioncore/manage.c @@ -1,7 +1,7 @@ /* * ion/ioncore/manage.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ @@ -186,6 +186,7 @@ bool clientwin_do_manage_default(WClientWin *cwin, WPHolder *ph=NULL; int swf=(param->switchto ? PHOLDER_ATTACH_SWITCHTO : 0); bool ok, uq=FALSE; + WRegion *createroot=NULL; /* Find a suitable screen */ scr=clientwin_find_suitable_screen(cwin, param); @@ -226,15 +227,22 @@ bool clientwin_do_manage_default(WClientWin *cwin, return FALSE; /* Not in full-screen mode; use the placeholder to attach. */ - - ok=pholder_attach(ph, swf, (WRegion*)cwin); - + { + WRegionAttachData data; + data.type=REGION_ATTACH_REPARENT; + data.u.reg=(WRegion*)cwin; + + createroot=pholder_do_attach(ph, + swf|PHOLDER_ATTACH_RETURN_CREATEROOT, + &data); + } + destroy_obj((Obj*)ph); - if(uq && ok) - ioncore_unsqueeze((WRegion*)cwin, FALSE); + if(uq && createroot!=NULL) + ioncore_unsqueeze(createroot, FALSE); - return ok; + return (createroot!=NULL); } diff --git a/ioncore/manage.h b/ioncore/manage.h index 3db5a1f..ba54737 100644 --- a/ioncore/manage.h +++ b/ioncore/manage.h @@ -1,7 +1,7 @@ /* * ion/ioncore/manage.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/modules.c b/ioncore/modules.c index 10e1c29..0f0f8f3 100644 --- a/ioncore/modules.c +++ b/ioncore/modules.c @@ -1,7 +1,7 @@ /* * ion/ioncore/modules.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/modules.h b/ioncore/modules.h index ac9edfd..6118ab8 100644 --- a/ioncore/modules.h +++ b/ioncore/modules.h @@ -1,7 +1,7 @@ /* * ion/ioncore/modules.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/mplex.c b/ioncore/mplex.c index 7c511e7..5f0a87d 100644 --- a/ioncore/mplex.c +++ b/ioncore/mplex.c @@ -1,7 +1,7 @@ /* * ion/ioncore/mplex.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ @@ -699,20 +699,16 @@ static WStacking *has_stacking_within(WMPlex *mplex, WRegion *reg) /* 1. Try keep focus in REGION_ACTIVE_SUB. - * 2. Try given `node`. - * 3. Choose something else, attempting previous in focus history - * (unless `node` was set). + * 2. Choose something else, attempting previous in focus history. */ -static WStacking *mplex_to_focus(WMPlex *mplex, WStacking *node) +static WStacking *mplex_to_focus(WMPlex *mplex) { WStacking *foc=NULL, *fallback=NULL; WRegion *reg=NULL; - bool within=FALSE; - WStacking *st; foc=maybe_focusable(REGION_ACTIVE_SUB(mplex)); - if(foc==NULL && node==NULL){ + if(foc==NULL){ /* Search focus history if no specific attempt set.*/ for(reg=ioncore_g.focus_current; reg!=NULL; reg=reg->active_next){ foc=has_stacking_within(mplex, reg); @@ -722,29 +718,20 @@ static WStacking *mplex_to_focus(WMPlex *mplex, WStacking *node) } if(foc!=NULL){ - /*fallback=mplex_find_to_focus(mplex, foc, NULL, NULL);*/ /* In the history search case, 'foc' might point to a group, * since we don't properly try to find a stacking within it... */ - fallback=mplex_do_to_focus_on(mplex, foc, NULL, NULL, NULL); - if(fallback!=foc) - foc=NULL; + return mplex_do_to_focus_on(mplex, foc, NULL, NULL, NULL); + }else{ + return mplex_find_to_focus(mplex, NULL, NULL, NULL); } - - if(foc==NULL && node!=NULL) - foc=mplex_do_to_focus_on(mplex, node, NULL, NULL, &within); - - if(foc==NULL || !within) - foc=fallback; - - return foc; } void mplex_do_set_focus(WMPlex *mplex, bool warp) { if(!MPLEX_MGD_UNVIEWABLE(mplex)){ - WStacking *st=mplex_to_focus(mplex, NULL); + WStacking *st=mplex_to_focus(mplex); if(st==NULL){ st=(mplex->mx_current!=NULL @@ -764,7 +751,14 @@ void mplex_do_set_focus(WMPlex *mplex, bool warp) static void mplex_refocus(WMPlex *mplex, WStacking *node, bool warp) { - WStacking *foc=mplex_to_focus(mplex, node); + bool within=FALSE; + WStacking *foc=NULL; + + if(node!=NULL) + foc=mplex_do_to_focus_on(mplex, node, NULL, NULL, &within); + + if(foc==NULL || !within) + foc=mplex_to_focus(mplex); if(foc!=NULL) region_maybewarp(foc->reg, warp); diff --git a/ioncore/mplex.h b/ioncore/mplex.h index 7b72b31..bf9d61b 100644 --- a/ioncore/mplex.h +++ b/ioncore/mplex.h @@ -1,7 +1,7 @@ /* * ion/ioncore/mplex.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/mplexpholder.c b/ioncore/mplexpholder.c index 7a75486..2c8461e 100644 --- a/ioncore/mplexpholder.c +++ b/ioncore/mplexpholder.c @@ -1,7 +1,7 @@ /* * ion/ioncore/mplexpholder.c * - * Copyright (c) Tuomo Valkonen 2005-2008. + * Copyright (c) Tuomo Valkonen 2005-2009. * * See the included file LICENSE for details. */ @@ -264,7 +264,7 @@ static WRegion *mplexpholder_attach_recreate(WMPlexPHolder *ph, int flags, WRegionAttachData data2; WFramedPHolder *fph; WPHolder *root; - WRegion *frame; + WRegion *res; RP rp; rp.ph_head=get_head(ph); @@ -285,15 +285,17 @@ static WRegion *mplexpholder_attach_recreate(WMPlexPHolder *ph, int flags, data2.u.n.fn=recreate_handler; data2.u.n.param=&rp; - frame=pholder_do_attach(fph->cont, flags, &data2); + res=pholder_do_attach(fph->cont, flags, &data2); - if(frame!=NULL){ + if(res!=NULL){ rp.ph_head->recreate_pholder=NULL; /* It might be in use in attach chain! So defer. */ mainloop_defer_destroy((Obj*)fph); } - return rp.reg_ret; + return (flags&PHOLDER_ATTACH_RETURN_CREATEROOT + ? (WRegion*)res + : rp.reg_ret); } diff --git a/ioncore/mplexpholder.h b/ioncore/mplexpholder.h index 6806408..007d5e6 100644 --- a/ioncore/mplexpholder.h +++ b/ioncore/mplexpholder.h @@ -1,7 +1,7 @@ /* * ion/ioncore/mplexpholder.h * - * Copyright (c) Tuomo Valkonen 2005-2008. + * Copyright (c) Tuomo Valkonen 2005-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/mwmhints.c b/ioncore/mwmhints.c index 445a1f0..b3caec3 100644 --- a/ioncore/mwmhints.c +++ b/ioncore/mwmhints.c @@ -1,7 +1,7 @@ /* * ion/ioncore/mwmhints.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/mwmhints.h b/ioncore/mwmhints.h index 35e7355..213277a 100644 --- a/ioncore/mwmhints.h +++ b/ioncore/mwmhints.h @@ -1,7 +1,7 @@ /* * ion/ioncore/mwmhints.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/names.c b/ioncore/names.c index b114e10..14bde2c 100644 --- a/ioncore/names.c +++ b/ioncore/names.c @@ -1,7 +1,7 @@ /* * ion/ioncore/names.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/names.h b/ioncore/names.h index d579ac9..8e4d607 100644 --- a/ioncore/names.h +++ b/ioncore/names.h @@ -1,7 +1,7 @@ /* * ion/ioncore/names.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/navi.c b/ioncore/navi.c index 527d894..7dfd19b 100644 --- a/ioncore/navi.c +++ b/ioncore/navi.c @@ -1,7 +1,7 @@ /* * ion/ioncore/navi.c * - * Copyright (c) Tuomo Valkonen 2006-2008. + * Copyright (c) Tuomo Valkonen 2006-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/navi.h b/ioncore/navi.h index 6f88e60..edb7f62 100644 --- a/ioncore/navi.h +++ b/ioncore/navi.h @@ -1,7 +1,7 @@ /* * ion/ioncore/navi.h * - * Copyright (c) Tuomo Valkonen 2006-2008. + * Copyright (c) Tuomo Valkonen 2006-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/netwm.c b/ioncore/netwm.c index 202af7b..f85193e 100644 --- a/ioncore/netwm.c +++ b/ioncore/netwm.c @@ -1,7 +1,7 @@ /* * ion/ioncore/netwm.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/netwm.h b/ioncore/netwm.h index db0e6f8..24e6665 100644 --- a/ioncore/netwm.h +++ b/ioncore/netwm.h @@ -1,7 +1,7 @@ /* * ion/ioncore/netwm.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/pholder.c b/ioncore/pholder.c index d702b16..d62da21 100644 --- a/ioncore/pholder.c +++ b/ioncore/pholder.c @@ -1,7 +1,7 @@ /* * ion/ioncore/pholder.c * - * Copyright (c) Tuomo Valkonen 2005-2008. + * Copyright (c) Tuomo Valkonen 2005-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/pholder.h b/ioncore/pholder.h index 8b8df7e..12e90fa 100644 --- a/ioncore/pholder.h +++ b/ioncore/pholder.h @@ -1,7 +1,7 @@ /* * ion/ioncore/pholder.h * - * Copyright (c) Tuomo Valkonen 2005-2008. + * Copyright (c) Tuomo Valkonen 2005-2009. * * See the included file LICENSE for details. */ @@ -15,6 +15,7 @@ #define PHOLDER_ATTACH_SWITCHTO 0x0001 +#define PHOLDER_ATTACH_RETURN_CREATEROOT 0x0002 /* Note: PHolders should be destroyed by their acquirer. */ diff --git a/ioncore/pointer.c b/ioncore/pointer.c index 51bcf9f..8b57bcb 100644 --- a/ioncore/pointer.c +++ b/ioncore/pointer.c @@ -1,7 +1,7 @@ /* * ion/ioncore/pointer.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/pointer.h b/ioncore/pointer.h index 7a5b147..4a88f03 100644 --- a/ioncore/pointer.h +++ b/ioncore/pointer.h @@ -1,7 +1,7 @@ /* * ion/ioncore/pointer.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/presize.c b/ioncore/presize.c index 07dd5c2..494cc5a 100644 --- a/ioncore/presize.c +++ b/ioncore/presize.c @@ -1,7 +1,7 @@ /* * ion/ioncore/presize.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/presize.h b/ioncore/presize.h index 5a52e9d..5788823 100644 --- a/ioncore/presize.h +++ b/ioncore/presize.h @@ -1,7 +1,7 @@ /* * ion/ioncore/presize.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/property.c b/ioncore/property.c index a8029d2..5a36627 100644 --- a/ioncore/property.c +++ b/ioncore/property.c @@ -1,7 +1,7 @@ /* * ion/ioncore/property.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/property.h b/ioncore/property.h index 19f180c..bf3eb0e 100644 --- a/ioncore/property.h +++ b/ioncore/property.h @@ -1,7 +1,7 @@ /* * ion/ioncore/property.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/rectangle.c b/ioncore/rectangle.c index 8e84512..3c9b90c 100644 --- a/ioncore/rectangle.c +++ b/ioncore/rectangle.c @@ -1,7 +1,7 @@ /* * ion/ioncore/rectangle.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/rectangle.h b/ioncore/rectangle.h index 19e8c11..dd7cca0 100644 --- a/ioncore/rectangle.h +++ b/ioncore/rectangle.h @@ -1,7 +1,7 @@ /* * ion/ioncore/rectangle.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/regbind.c b/ioncore/regbind.c index 765d1a8..a50da9d 100644 --- a/ioncore/regbind.c +++ b/ioncore/regbind.c @@ -1,7 +1,7 @@ /* * ion/regbind.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/regbind.h b/ioncore/regbind.h index 8ec8b8c..b4752a0 100644 --- a/ioncore/regbind.h +++ b/ioncore/regbind.h @@ -1,7 +1,7 @@ /* * ion/ioncore/regbind.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/reginfo.c b/ioncore/reginfo.c index 0a69f78..24e75d0 100644 --- a/ioncore/reginfo.c +++ b/ioncore/reginfo.c @@ -1,7 +1,7 @@ /* * ion/ioncore/reginfo.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/reginfo.h b/ioncore/reginfo.h index 29d2d51..c7d7e30 100644 --- a/ioncore/reginfo.h +++ b/ioncore/reginfo.h @@ -1,7 +1,7 @@ /* * ion/ioncore/reginfo.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/region-iter.h b/ioncore/region-iter.h index ce25e81..1c28d6f 100644 --- a/ioncore/region-iter.h +++ b/ioncore/region-iter.h @@ -1,7 +1,7 @@ /* * ion/ioncore/region-iter.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/region.c b/ioncore/region.c index 261d654..47f8f5c 100644 --- a/ioncore/region.c +++ b/ioncore/region.c @@ -1,7 +1,7 @@ /* * ion/ioncore/region.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/region.h b/ioncore/region.h index 950de9d..ea4e5d5 100644 --- a/ioncore/region.h +++ b/ioncore/region.h @@ -1,7 +1,7 @@ /* * ion/ioncore/region.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/resize.c b/ioncore/resize.c index 0da668d..3608ecb 100644 --- a/ioncore/resize.c +++ b/ioncore/resize.c @@ -1,7 +1,7 @@ /* * ion/ioncore/resize.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ @@ -756,9 +756,11 @@ void frame_maximize_vert(WFrame *frame) int oy, oh; if(frame->flags&FRAME_SHADED || frame->flags&FRAME_MAXED_VERT){ + if(frame->flags&FRAME_SHADED) + frame->flags|=FRAME_SHADED_TOGGLE; if(frame->flags&FRAME_SAVED_VERT) rqh(frame, frame->saved_y, frame->saved_h); - frame->flags&=~(FRAME_MAXED_VERT|FRAME_SAVED_VERT); + frame->flags&=~(FRAME_MAXED_VERT|FRAME_SAVED_VERT|FRAME_SHADED_TOGGLE); return; } diff --git a/ioncore/resize.h b/ioncore/resize.h index 7b71bd5..00ae222 100644 --- a/ioncore/resize.h +++ b/ioncore/resize.h @@ -1,7 +1,7 @@ /* * ion/ioncore/resize.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/return.c b/ioncore/return.c index be2d367..ffc1083 100644 --- a/ioncore/return.c +++ b/ioncore/return.c @@ -1,7 +1,7 @@ /* * ion/ioncore/return.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/return.h b/ioncore/return.h index a88bac5..0f37a80 100644 --- a/ioncore/return.h +++ b/ioncore/return.h @@ -1,7 +1,7 @@ /* * ion/ioncore/return.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/rootwin.c b/ioncore/rootwin.c index fd2d258..c206e3d 100644 --- a/ioncore/rootwin.c +++ b/ioncore/rootwin.c @@ -1,7 +1,7 @@ /* * ion/ioncore/rootwin.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/rootwin.h b/ioncore/rootwin.h index 41aab4e..0cdde3d 100644 --- a/ioncore/rootwin.h +++ b/ioncore/rootwin.h @@ -1,7 +1,7 @@ /* * ion/ioncore/rootwin.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/saveload.c b/ioncore/saveload.c index 71ddb9d..81dd1db 100644 --- a/ioncore/saveload.c +++ b/ioncore/saveload.c @@ -1,7 +1,7 @@ /* * ion/ioncore/saveload.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/saveload.h b/ioncore/saveload.h index 049b2c0..82b3df1 100644 --- a/ioncore/saveload.h +++ b/ioncore/saveload.h @@ -1,7 +1,7 @@ /* * ion/ioncore/saveload.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/screen-notify.c b/ioncore/screen-notify.c index ecb2807..769b5a3 100644 --- a/ioncore/screen-notify.c +++ b/ioncore/screen-notify.c @@ -1,7 +1,7 @@ /* * ion/ioncore/screen-notify.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/screen-notify.h b/ioncore/screen-notify.h index bbaac26..4ac2529 100644 --- a/ioncore/screen-notify.h +++ b/ioncore/screen-notify.h @@ -1,7 +1,7 @@ /* * ion/ioncore/screen-notify.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/screen.c b/ioncore/screen.c index 8aafadb..c16bfc2 100644 --- a/ioncore/screen.c +++ b/ioncore/screen.c @@ -1,7 +1,7 @@ /* * ion/ioncore/screen.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/screen.h b/ioncore/screen.h index 52752cc..36c3c54 100644 --- a/ioncore/screen.h +++ b/ioncore/screen.h @@ -1,7 +1,7 @@ /* * ion/ioncore/screen.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/selection.c b/ioncore/selection.c index 1e99ed9..896a415 100644 --- a/ioncore/selection.c +++ b/ioncore/selection.c @@ -1,7 +1,7 @@ /* * ion/ioncore/selection.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/selection.h b/ioncore/selection.h index 4ae022a..41e855a 100644 --- a/ioncore/selection.h +++ b/ioncore/selection.h @@ -1,7 +1,7 @@ /* * ion/ioncore/selection.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/sizehint.c b/ioncore/sizehint.c index d346946..0d5d51d 100644 --- a/ioncore/sizehint.c +++ b/ioncore/sizehint.c @@ -1,7 +1,7 @@ /* * ion/ioncore/sizehint.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/sizehint.h b/ioncore/sizehint.h index 078b873..71ad3a1 100644 --- a/ioncore/sizehint.h +++ b/ioncore/sizehint.h @@ -1,7 +1,7 @@ /* * ion/ioncore/sizehint.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/sizepolicy.c b/ioncore/sizepolicy.c index e1ee0c0..8c42327 100644 --- a/ioncore/sizepolicy.c +++ b/ioncore/sizepolicy.c @@ -1,7 +1,7 @@ /* * ion/ioncore/sizepolicy.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/sizepolicy.h b/ioncore/sizepolicy.h index 49e89ea..60076e7 100644 --- a/ioncore/sizepolicy.h +++ b/ioncore/sizepolicy.h @@ -1,7 +1,7 @@ /* * ion/ioncore/sizepolicy.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/stacking.c b/ioncore/stacking.c index 3749115..0c6480d 100644 --- a/ioncore/stacking.c +++ b/ioncore/stacking.c @@ -1,7 +1,7 @@ /* * ion/ioncore/stacking.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/stacking.h b/ioncore/stacking.h index e8c9638..c1754ae 100644 --- a/ioncore/stacking.h +++ b/ioncore/stacking.h @@ -1,7 +1,7 @@ /* * ion/ioncore/stacking.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/strings.c b/ioncore/strings.c index 15ebde1..c003321 100644 --- a/ioncore/strings.c +++ b/ioncore/strings.c @@ -1,7 +1,7 @@ /* * ion/ioncore/strings.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/strings.h b/ioncore/strings.h index 915c88b..8453bca 100644 --- a/ioncore/strings.h +++ b/ioncore/strings.h @@ -1,7 +1,7 @@ /* * ion/ioncore/strings.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/tags.c b/ioncore/tags.c index b905483..aeaadd6 100644 --- a/ioncore/tags.c +++ b/ioncore/tags.c @@ -1,7 +1,7 @@ /* * ion/ioncore/tags.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/tags.h b/ioncore/tags.h index 1f7da32..a4a83d4 100644 --- a/ioncore/tags.h +++ b/ioncore/tags.h @@ -1,7 +1,7 @@ /* * ion/ioncore/tags.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/window.c b/ioncore/window.c index 3018467..42ca028 100644 --- a/ioncore/window.c +++ b/ioncore/window.c @@ -1,7 +1,7 @@ /* * ion/ioncore/window.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/window.h b/ioncore/window.h index 48fc192..53e1180 100644 --- a/ioncore/window.h +++ b/ioncore/window.h @@ -1,7 +1,7 @@ /* * ion/ioncore/window.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/xic.c b/ioncore/xic.c index df659ab..50142bf 100644 --- a/ioncore/xic.c +++ b/ioncore/xic.c @@ -1,7 +1,7 @@ /* * ion/ioncore/xic.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/xic.h b/ioncore/xic.h index fe3bd7e..b6acd26 100644 --- a/ioncore/xic.h +++ b/ioncore/xic.h @@ -1,7 +1,7 @@ /* * ion/ioncore/xic.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/xwindow.c b/ioncore/xwindow.c index fec8e4c..2842be4 100644 --- a/ioncore/xwindow.c +++ b/ioncore/xwindow.c @@ -1,7 +1,7 @@ /* * ion/ioncore/xwindow.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/ioncore/xwindow.h b/ioncore/xwindow.h index cb37695..3c6a7e6 100644 --- a/ioncore/xwindow.h +++ b/ioncore/xwindow.h @@ -1,7 +1,7 @@ /* * ion/ioncore/xwindow.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/libextl/exact-version b/libextl/exact-version index 6b7fcda..2ea85eb 100644 --- a/libextl/exact-version +++ b/libextl/exact-version @@ -1,9 +1,6 @@ Context: -[lua 5.1 updates to mkexports -Tuomo Valkonen **20080318210900] - [Do not remove proxy from cache in object destroy watch handler. Tuomo Valkonen **20071215143858 The GC can remove it. Just have the pointer to the actual object be diff --git a/libextl/libextl-mkexports.in b/libextl/libextl-mkexports.in index 14674ba..a23ab1f 100644 --- a/libextl/libextl-mkexports.in +++ b/libextl/libextl-mkexports.in @@ -18,16 +18,16 @@ -- Helper functions {{{ -function errorf(...) - error(string.format(...), 2) +function errorf(fmt, ...) + error(string.format(fmt, unpack(arg)), 2) end function matcherr(s) error(string.format("Parse error in \"%s...\"", string.sub(s, 1, 50)), 2) end -function fprintf(h, ...) - h:write(string.format(...)) +function fprintf(h, fmt, ...) + h:write(string.format(fmt, unpack(arg))) end function trim(str) @@ -208,7 +208,7 @@ function parse(d) end param=trim(param) if string.len(param)>0 then - for p in string.gmatch(param .. ",", "([^,]*),") do + for p in string.gfind(param .. ",", "([^,]*),") do local spec, objtype, varname=parse_type(p) idesc=idesc .. spec table.insert(itypes, objtype) diff --git a/libmainloop/defer.c b/libmainloop/defer.c index 304a37c..2358a27 100644 --- a/libmainloop/defer.c +++ b/libmainloop/defer.c @@ -1,7 +1,7 @@ /* * ion/libmainloop/defer.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/libmainloop/defer.h b/libmainloop/defer.h index 9e93e40..ce3e1d7 100644 --- a/libmainloop/defer.h +++ b/libmainloop/defer.h @@ -1,7 +1,7 @@ /* * ion/libmainloop/defer.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/libmainloop/exec.c b/libmainloop/exec.c index a2d853b..f4847a8 100644 --- a/libmainloop/exec.c +++ b/libmainloop/exec.c @@ -1,7 +1,7 @@ /* * ion/mainloop/exec.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/libmainloop/exec.h b/libmainloop/exec.h index 5947b9a..6dbfd7e 100644 --- a/libmainloop/exec.h +++ b/libmainloop/exec.h @@ -1,7 +1,7 @@ /* * ion/libmainloop/exec.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/libmainloop/hooks.c b/libmainloop/hooks.c index 4a3a9f7..3d8a8fe 100644 --- a/libmainloop/hooks.c +++ b/libmainloop/hooks.c @@ -1,7 +1,7 @@ /* * ion/mainloop/hooks.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/libmainloop/hooks.h b/libmainloop/hooks.h index ecf5c8c..bb9c540 100644 --- a/libmainloop/hooks.h +++ b/libmainloop/hooks.h @@ -1,7 +1,7 @@ /* * ion/mainloop/hooks.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/libmainloop/signal.c b/libmainloop/signal.c index 356fd6d..c536553 100644 --- a/libmainloop/signal.c +++ b/libmainloop/signal.c @@ -1,7 +1,7 @@ /* * ion/libmainloop/signal.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/libmainloop/signal.h b/libmainloop/signal.h index bd93fb2..d501f71 100644 --- a/libmainloop/signal.h +++ b/libmainloop/signal.h @@ -1,7 +1,7 @@ /* * ion/mainloop/signal.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/mod_dock/dock.c b/mod_dock/dock.c index 6c0f421..174942c 100644 --- a/mod_dock/dock.c +++ b/mod_dock/dock.c @@ -2,7 +2,7 @@ * Ion dock module * Copyright (C) 2003 Tom Payne * Copyright (C) 2003 Per Olofsson - * Copyright (C) 2004-2008 Tuomo Valkonen + * Copyright (C) 2004-2009 Tuomo Valkonen * * by Tom Payne * based on code by Per Olofsson diff --git a/mod_menu/grabmenu.c b/mod_menu/grabmenu.c index 0274683..d490b39 100644 --- a/mod_menu/grabmenu.c +++ b/mod_menu/grabmenu.c @@ -1,7 +1,7 @@ /* * ion/mod_menu/grabmenu.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/mod_menu/main.c b/mod_menu/main.c index 19d8c3e..e66c7c9 100644 --- a/mod_menu/main.c +++ b/mod_menu/main.c @@ -1,7 +1,7 @@ /* * ion/mod_menu/main.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/mod_menu/main.h b/mod_menu/main.h index b0befd7..ad5e0d6 100644 --- a/mod_menu/main.h +++ b/mod_menu/main.h @@ -1,7 +1,7 @@ /* * ion/mod_menu/main.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/mod_menu/menu.c b/mod_menu/menu.c index 9a93bac..6c1287f 100644 --- a/mod_menu/menu.c +++ b/mod_menu/menu.c @@ -1,7 +1,7 @@ /* * ion/mod_menu/menu.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/mod_menu/menu.h b/mod_menu/menu.h index d596e33..fe6470f 100644 --- a/mod_menu/menu.h +++ b/mod_menu/menu.h @@ -1,7 +1,7 @@ /* * ion/mod_menu/menu.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/mod_menu/mkmenu.c b/mod_menu/mkmenu.c index d20882f..d9775b6 100644 --- a/mod_menu/mkmenu.c +++ b/mod_menu/mkmenu.c @@ -1,7 +1,7 @@ /* * ion/mod_menu/mkmenu.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/mod_menu/mkmenu.h b/mod_menu/mkmenu.h index 7c96839..562915b 100644 --- a/mod_menu/mkmenu.h +++ b/mod_menu/mkmenu.h @@ -1,7 +1,7 @@ /* * ion/mod_menu/mkmenu.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/mod_menu/mod_menu.lua b/mod_menu/mod_menu.lua index d5078f7..b999c5a 100644 --- a/mod_menu/mod_menu.lua +++ b/mod_menu/mod_menu.lua @@ -1,7 +1,7 @@ -- -- ion/mod_menu/mod_menu.lua -- Menu opening helper routines. -- --- Copyright (c) Tuomo Valkonen 2004-2008. +-- Copyright (c) Tuomo Valkonen 2004-2009. -- -- See the included file LICENSE for details. -- diff --git a/mod_query/complete.c b/mod_query/complete.c index 90f2b5b..db7426b 100644 --- a/mod_query/complete.c +++ b/mod_query/complete.c @@ -1,7 +1,7 @@ /* * ion/mod_query/complete.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/mod_query/complete.h b/mod_query/complete.h index 95e8c70..97bfaa2 100644 --- a/mod_query/complete.h +++ b/mod_query/complete.h @@ -1,7 +1,7 @@ /* * ion/mod_query/complete.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/mod_query/edln.c b/mod_query/edln.c index ade34c1..6951014 100644 --- a/mod_query/edln.c +++ b/mod_query/edln.c @@ -1,7 +1,7 @@ /* * ion/mod_query/edln.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/mod_query/edln.h b/mod_query/edln.h index 6febfee..de66f6c 100644 --- a/mod_query/edln.h +++ b/mod_query/edln.h @@ -1,7 +1,7 @@ /* * ion/mod_query/edln.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/mod_query/fwarn.c b/mod_query/fwarn.c index 6abf6c3..54ad1ab 100644 --- a/mod_query/fwarn.c +++ b/mod_query/fwarn.c @@ -1,7 +1,7 @@ /* * ion/mod_query/query.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/mod_query/fwarn.h b/mod_query/fwarn.h index 25e17db..5a8ee86 100644 --- a/mod_query/fwarn.h +++ b/mod_query/fwarn.h @@ -1,7 +1,7 @@ /* * ion/mod_query/fwarn.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/mod_query/history.c b/mod_query/history.c index dc32d72..eae5b87 100644 --- a/mod_query/history.c +++ b/mod_query/history.c @@ -1,7 +1,7 @@ /* * ion/mod_query/history.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/mod_query/history.h b/mod_query/history.h index 541bb48..2271242 100644 --- a/mod_query/history.h +++ b/mod_query/history.h @@ -1,7 +1,7 @@ /* * ion/mod_query/history.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/mod_query/input.c b/mod_query/input.c index 9061002..de81c77 100644 --- a/mod_query/input.c +++ b/mod_query/input.c @@ -1,7 +1,7 @@ /* * ion/mod_query/input.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/mod_query/input.h b/mod_query/input.h index 8e9eef2..9e4ef04 100644 --- a/mod_query/input.h +++ b/mod_query/input.h @@ -1,7 +1,7 @@ /* * ion/mod_query/input.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/mod_query/inputp.h b/mod_query/inputp.h index d2a3a4e..f925904 100644 --- a/mod_query/inputp.h +++ b/mod_query/inputp.h @@ -1,7 +1,7 @@ /* * ion/mod_query/inputp.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/mod_query/listing.c b/mod_query/listing.c index 21ffd4f..f4b31f6 100644 --- a/mod_query/listing.c +++ b/mod_query/listing.c @@ -1,7 +1,7 @@ /* * ion/mod_query/listing.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/mod_query/listing.h b/mod_query/listing.h index 831f804..2b2a215 100644 --- a/mod_query/listing.h +++ b/mod_query/listing.h @@ -1,7 +1,7 @@ /* * ion/mod_query/listing.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/mod_query/main.c b/mod_query/main.c index da04441..d67c539 100644 --- a/mod_query/main.c +++ b/mod_query/main.c @@ -1,7 +1,7 @@ /* * ion/mod_query/main.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/mod_query/main.h b/mod_query/main.h index 92b81fe..2c19f41 100644 --- a/mod_query/main.h +++ b/mod_query/main.h @@ -1,7 +1,7 @@ /* * ion/mod_query/main.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/mod_query/mod_query.lua b/mod_query/mod_query.lua index a952480..bd3414b 100644 --- a/mod_query/mod_query.lua +++ b/mod_query/mod_query.lua @@ -1,7 +1,7 @@ -- -- ion/query/mod_query.lua -- Some common queries for Ion -- --- Copyright (c) Tuomo Valkonen 2004-2008. +-- Copyright (c) Tuomo Valkonen 2004-2009. -- -- See the included file LICENSE for details. -- @@ -65,9 +65,10 @@ function mod_query.query(mplex, prompt, initvalue, handler, completor, wedln:complete('prev', 'normal') end - -- Check that no other queries are open in the mplex. - local ok=mplex:managed_i(function(r) - return not obj_is(r, "WEdln") + -- Check that no other queries or message boxes are open in the mplex. + local ok=mplex:managed_i(function(r) + return not (obj_is(r, "WEdln") or + obj_is(r, "WMessage")) end) if not ok then return diff --git a/mod_query/mod_query_chdir.lua b/mod_query/mod_query_chdir.lua index c3eeb6a..1207aa7 100644 --- a/mod_query/mod_query_chdir.lua +++ b/mod_query/mod_query_chdir.lua @@ -1,7 +1,7 @@ -- -- ion/query/mod_query_chdir.lua -- --- Copyright (c) Tuomo Valkonen 2004-2008. +-- Copyright (c) Tuomo Valkonen 2004-2009. -- -- See the included file LICENSE for details. -- diff --git a/mod_query/query.c b/mod_query/query.c index 2749f1d..fbb3fa6 100644 --- a/mod_query/query.c +++ b/mod_query/query.c @@ -1,7 +1,7 @@ /* * ion/mod_query/query.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/mod_query/query.h b/mod_query/query.h index 56237ae..bc21d11 100644 --- a/mod_query/query.h +++ b/mod_query/query.h @@ -1,7 +1,7 @@ /* * ion/mod_query/query.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/mod_query/wedln-wrappers.c b/mod_query/wedln-wrappers.c index 82ef6de..2d379f1 100644 --- a/mod_query/wedln-wrappers.c +++ b/mod_query/wedln-wrappers.c @@ -1,7 +1,7 @@ /* * ion/mod_query/wedln-wrappers.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/mod_query/wedln.c b/mod_query/wedln.c index 5a6aecc..1c43db2 100644 --- a/mod_query/wedln.c +++ b/mod_query/wedln.c @@ -1,7 +1,7 @@ /* * ion/mod_query/wedln.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/mod_query/wedln.h b/mod_query/wedln.h index e20a7c9..bf6f015 100644 --- a/mod_query/wedln.h +++ b/mod_query/wedln.h @@ -1,7 +1,7 @@ /* * ion/mod_query/wedln.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/mod_query/wmessage.c b/mod_query/wmessage.c index 9c3d468..096fdcf 100644 --- a/mod_query/wmessage.c +++ b/mod_query/wmessage.c @@ -1,7 +1,7 @@ /* * ion/mod_query/wmessage.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/mod_query/wmessage.h b/mod_query/wmessage.h index 089b482..97d93dd 100644 --- a/mod_query/wmessage.h +++ b/mod_query/wmessage.h @@ -1,7 +1,7 @@ /* * ion/mod_query/wmessage.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/mod_sm/sm.c b/mod_sm/sm.c index 9451489..84b30c3 100644 --- a/mod_sm/sm.c +++ b/mod_sm/sm.c @@ -1,7 +1,7 @@ /* * ion/mod_sm/sm.c * - * Copyright (c) Tuomo Valkonen 2004-2008. + * Copyright (c) Tuomo Valkonen 2004-2009. * * See the included file LICENSE for details. */ diff --git a/mod_sm/sm_matchwin.c b/mod_sm/sm_matchwin.c index e3705a8..811b1b5 100644 --- a/mod_sm/sm_matchwin.c +++ b/mod_sm/sm_matchwin.c @@ -1,7 +1,7 @@ /* * ion/mod_sm/sm_mathcwin.c * - * Copyright (c) Tuomo Valkonen 2004-2008. + * Copyright (c) Tuomo Valkonen 2004-2009. * * Based on the code of the 'sm' module for Ion1 by an unknown contributor. * diff --git a/mod_sm/sm_matchwin.h b/mod_sm/sm_matchwin.h index 5c90fb4..6c5dcd6 100644 --- a/mod_sm/sm_matchwin.h +++ b/mod_sm/sm_matchwin.h @@ -1,7 +1,7 @@ /* * ion/mod_sm/sm_mathcwin.c * - * Copyright (c) Tuomo Valkonen 2004-2008. + * Copyright (c) Tuomo Valkonen 2004-2009. * * Based on the code of the 'sm' module for Ion1 by an unknown contributor. * diff --git a/mod_sm/sm_session.c b/mod_sm/sm_session.c index 0874311..9f141d4 100644 --- a/mod_sm/sm_session.c +++ b/mod_sm/sm_session.c @@ -1,7 +1,7 @@ /* * ion/mod_sm/sm_session.c * - * Copyright (c) Tuomo Valkonen 2004-2008. + * Copyright (c) Tuomo Valkonen 2004-2009. * * Based on the code of the 'sm' module for Ion1 by an unknown contributor. * diff --git a/mod_sm/sm_session.h b/mod_sm/sm_session.h index 05deb34..332c1d3 100644 --- a/mod_sm/sm_session.h +++ b/mod_sm/sm_session.h @@ -1,7 +1,7 @@ /* * ion/mod_sm/sm_session.h * - * Copyright (c) Tuomo Valkonen 2004-2008. + * Copyright (c) Tuomo Valkonen 2004-2009. * * Based on the code of the 'sm' module for Ion1 by an unknown contributor. * diff --git a/mod_sp/main.c b/mod_sp/main.c index 512f38a..637912c 100644 --- a/mod_sp/main.c +++ b/mod_sp/main.c @@ -1,7 +1,7 @@ /* * ion/mod_sp/main.c * - * Copyright (c) Tuomo Valkonen 2004-2008. + * Copyright (c) Tuomo Valkonen 2004-2009. * * See the included file LICENSE for details. */ diff --git a/mod_sp/main.h b/mod_sp/main.h index 6ed8d60..d27c1be 100644 --- a/mod_sp/main.h +++ b/mod_sp/main.h @@ -1,7 +1,7 @@ /* * ion/mod_sp/main.h * - * Copyright (c) Tuomo Valkonen 2004-2008. + * Copyright (c) Tuomo Valkonen 2004-2009. * * See the included file LICENSE for details. */ diff --git a/mod_statusbar/draw.c b/mod_statusbar/draw.c index b466306..6a9750e 100644 --- a/mod_statusbar/draw.c +++ b/mod_statusbar/draw.c @@ -1,7 +1,7 @@ /* * ion/mod_statusbar/draw.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/mod_statusbar/draw.h b/mod_statusbar/draw.h index 19386b3..ff71816 100644 --- a/mod_statusbar/draw.h +++ b/mod_statusbar/draw.h @@ -1,7 +1,7 @@ /* * ion/mod_statusbar/draw.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/mod_statusbar/main.c b/mod_statusbar/main.c index c54e17e..777e0b3 100644 --- a/mod_statusbar/main.c +++ b/mod_statusbar/main.c @@ -1,7 +1,7 @@ /* * ion/mod_statusbar/main.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/mod_statusbar/main.h b/mod_statusbar/main.h index 90c3c3a..5881e2a 100644 --- a/mod_statusbar/main.h +++ b/mod_statusbar/main.h @@ -1,7 +1,7 @@ /* * ion/mod_statusbar/main.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/mod_statusbar/mod_statusbar.lua b/mod_statusbar/mod_statusbar.lua index c370082..9bae08c 100644 --- a/mod_statusbar/mod_statusbar.lua +++ b/mod_statusbar/mod_statusbar.lua @@ -1,7 +1,7 @@ -- -- ion/mod_statusbar/mod_statusbar.lua -- --- Copyright (c) Tuomo Valkonen 2004-2008. +-- Copyright (c) Tuomo Valkonen 2004-2009. -- -- See the included file LICENSE for details. -- diff --git a/mod_statusbar/statusbar.c b/mod_statusbar/statusbar.c index 3f74100..06fa697 100644 --- a/mod_statusbar/statusbar.c +++ b/mod_statusbar/statusbar.c @@ -1,7 +1,7 @@ /* * ion/mod_statusbar/statusbar.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/mod_statusbar/statusbar.h b/mod_statusbar/statusbar.h index 9d33588..73458b6 100644 --- a/mod_statusbar/statusbar.h +++ b/mod_statusbar/statusbar.h @@ -1,7 +1,7 @@ /* * ion/mod_statusbar/statusbar.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/mod_statusbar/statusd-launch.c b/mod_statusbar/statusd-launch.c index 1f597b2..b298f9d 100644 --- a/mod_statusbar/statusd-launch.c +++ b/mod_statusbar/statusd-launch.c @@ -1,7 +1,7 @@ /* * ion/mod_statusbar/statusd-launch.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/mod_tiling/main.c b/mod_tiling/main.c index 7a482dc..e8864aa 100644 --- a/mod_tiling/main.c +++ b/mod_tiling/main.c @@ -1,7 +1,7 @@ /* * ion/mod_tiling/main.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/mod_tiling/main.h b/mod_tiling/main.h index 5405ef0..2907c55 100644 --- a/mod_tiling/main.h +++ b/mod_tiling/main.h @@ -1,7 +1,7 @@ /* * ion/mod_tiling/main.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/mod_tiling/mod_tiling.lua b/mod_tiling/mod_tiling.lua index f8913b2..b899e2c 100644 --- a/mod_tiling/mod_tiling.lua +++ b/mod_tiling/mod_tiling.lua @@ -1,7 +1,7 @@ -- -- ion/mod_menu/mod_tiling.lua -- Tiling module stub loader -- --- Copyright (c) Tuomo Valkonen 2004-2008. +-- Copyright (c) Tuomo Valkonen 2004-2009. -- -- Ion is free software; you can redistribute it and/or modify it under -- the terms of the GNU Lesser General Public License as published by diff --git a/mod_tiling/ops.c b/mod_tiling/ops.c index 4c57fbf..f09d502 100644 --- a/mod_tiling/ops.c +++ b/mod_tiling/ops.c @@ -1,7 +1,7 @@ /* * ion/mod_tiling/ops.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/mod_tiling/panehandle.c b/mod_tiling/panehandle.c index 0420d96..482307c 100644 --- a/mod_tiling/panehandle.c +++ b/mod_tiling/panehandle.c @@ -1,7 +1,7 @@ /* * ion/mod_tiling/panehandle.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/mod_tiling/panehandle.h b/mod_tiling/panehandle.h index 5556c91..b8c91ba 100644 --- a/mod_tiling/panehandle.h +++ b/mod_tiling/panehandle.h @@ -1,7 +1,7 @@ /* * ion/mod_tiling/panehandle.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/mod_tiling/placement.c b/mod_tiling/placement.c index 3fda75d..45cb5d6 100644 --- a/mod_tiling/placement.c +++ b/mod_tiling/placement.c @@ -1,7 +1,7 @@ /* * ion/mod_tiling/placement.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/mod_tiling/placement.h b/mod_tiling/placement.h index 18724a9..2490603 100644 --- a/mod_tiling/placement.h +++ b/mod_tiling/placement.h @@ -1,7 +1,7 @@ /* * ion/mod_tiling/placement.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/mod_tiling/split-stdisp.c b/mod_tiling/split-stdisp.c index 9d2aabd..8c34579 100644 --- a/mod_tiling/split-stdisp.c +++ b/mod_tiling/split-stdisp.c @@ -1,7 +1,7 @@ /* * ion/mod_tiling/split-stdisp.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/mod_tiling/split-stdisp.h b/mod_tiling/split-stdisp.h index d3bb00b..b86b899 100644 --- a/mod_tiling/split-stdisp.h +++ b/mod_tiling/split-stdisp.h @@ -1,7 +1,7 @@ /* * ion/mod_tiling/split-stdisp.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/mod_tiling/split.c b/mod_tiling/split.c index a179005..5e1abb4 100644 --- a/mod_tiling/split.c +++ b/mod_tiling/split.c @@ -1,7 +1,7 @@ /* * ion/mod_tiling/split.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/mod_tiling/split.h b/mod_tiling/split.h index fedd179..9d80dd6 100644 --- a/mod_tiling/split.h +++ b/mod_tiling/split.h @@ -1,7 +1,7 @@ /* * ion/mod_tiling/split.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/mod_tiling/splitfloat.c b/mod_tiling/splitfloat.c index 8c6683f..479045e 100644 --- a/mod_tiling/splitfloat.c +++ b/mod_tiling/splitfloat.c @@ -1,7 +1,7 @@ /* * ion/mod_tiling/splitext.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/mod_tiling/splitfloat.h b/mod_tiling/splitfloat.h index 53544a6..381a802 100644 --- a/mod_tiling/splitfloat.h +++ b/mod_tiling/splitfloat.h @@ -1,7 +1,7 @@ /* * ion/mod_tiling/splitfloat.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/mod_tiling/tiling.c b/mod_tiling/tiling.c index 4040d82..48bbb86 100644 --- a/mod_tiling/tiling.c +++ b/mod_tiling/tiling.c @@ -1,7 +1,7 @@ /* * ion/mod_tiling/tiling.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/mod_tiling/tiling.h b/mod_tiling/tiling.h index 129f267..d780f7e 100644 --- a/mod_tiling/tiling.h +++ b/mod_tiling/tiling.h @@ -1,7 +1,7 @@ /* * ion/mod_tiling/tiling.h * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/pwm/pwm.c b/pwm/pwm.c index 0f38cbb..0159cce 100644 --- a/pwm/pwm.c +++ b/pwm/pwm.c @@ -1,7 +1,7 @@ /* * ion/pwm/pwm.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ diff --git a/utils/ion-statusd/exec.c b/utils/ion-statusd/exec.c index d15f0ab..a33d914 100644 --- a/utils/ion-statusd/exec.c +++ b/utils/ion-statusd/exec.c @@ -1,7 +1,7 @@ /* * ion/utils/ion-statusd/exec.c * - * Copyright (c) Tuomo Valkonen 2005-2008. + * Copyright (c) Tuomo Valkonen 2005-2009. * * See the included file LICENSE for details. */ diff --git a/utils/ion-statusd/extlrx.c b/utils/ion-statusd/extlrx.c index ce67bf0..5ea5262 100644 --- a/utils/ion-statusd/extlrx.c +++ b/utils/ion-statusd/extlrx.c @@ -1,7 +1,7 @@ /* * ion/utils/ion-statusd/extlrx.c * - * Copyright (c) Tuomo Valkonen 2004-2008. + * Copyright (c) Tuomo Valkonen 2004-2009. * * See the included file LICENSE for details. */ diff --git a/utils/ion-statusd/ion-statusd.c b/utils/ion-statusd/ion-statusd.c index 5aa02c0..cdf80a5 100644 --- a/utils/ion-statusd/ion-statusd.c +++ b/utils/ion-statusd/ion-statusd.c @@ -1,7 +1,7 @@ /* * ion/utils/ion-statusd/ion-statusd.c * - * Copyright (c) Tuomo Valkonen 2004-2008. + * Copyright (c) Tuomo Valkonen 2004-2009. * * See the included file LICENSE for details. */ @@ -62,7 +62,7 @@ static OptParserOpt ion_opts[]={ static const char statusd_copy[]= - "Ion-statusd " ION_VERSION ", copyright (c) Tuomo Valkonen 2004-2008."; + "Ion-statusd " ION_VERSION ", copyright (c) Tuomo Valkonen 2004-2009."; static const char statusd_license[]=DUMMY_TR( diff --git a/utils/ion-statusd/statusd_date.lua b/utils/ion-statusd/statusd_date.lua index 8672088..7331114 100644 --- a/utils/ion-statusd/statusd_date.lua +++ b/utils/ion-statusd/statusd_date.lua @@ -1,7 +1,7 @@ -- -- ion/mod_statusbar/ion-statusd/statusd_date.lua -- --- Copyright (c) Tuomo Valkonen 2004-2008. +-- Copyright (c) Tuomo Valkonen 2004-2009. -- -- See the included file LICENSE for details. -- diff --git a/utils/ion-statusd/statusd_load.lua b/utils/ion-statusd/statusd_load.lua index b9d6fea..98525ef 100644 --- a/utils/ion-statusd/statusd_load.lua +++ b/utils/ion-statusd/statusd_load.lua @@ -1,7 +1,7 @@ -- -- ion/mod_statusbar/ion-statusd/statusd_load.lua -- --- Copyright (c) Tuomo Valkonen 2004-2008. +-- Copyright (c) Tuomo Valkonen 2004-2009. -- -- See the included file LICENSE for details. -- diff --git a/utils/ion-statusd/statusd_mail.lua b/utils/ion-statusd/statusd_mail.lua index e332dbc..dd15794 100644 --- a/utils/ion-statusd/statusd_mail.lua +++ b/utils/ion-statusd/statusd_mail.lua @@ -1,7 +1,7 @@ -- -- ion/mod_statusbar/ion-statusd/statusd_mail.lua -- --- Copyright (c) Tuomo Valkonen 2004-2008. +-- Copyright (c) Tuomo Valkonen 2004-2009. -- -- See the included file LICENSE for details. -- diff --git a/version.h b/version.h index 7ed2db6..65e0504 100644 --- a/version.h +++ b/version.h @@ -1,3 +1,3 @@ -#define ION_RELEASE "3-20081002" +#define ION_RELEASE "3-20090110" #define ION_VERSION ION_RELEASE #define ION_API_VERSION "3"