+2008-01-03 18:23 UTC Tuomo Valkonen <tuomov@iki.fi>
+ tagged ion-3rc-20080103
+
+2008-01-03 18:23 UTC Tuomo Valkonen <tuomov@iki.fi>
+ * Oops
+
+2008-01-03 18:11 UTC Tuomo Valkonen <tuomov@iki.fi>
+ * Release notes
+
+2008-01-03 18:07 UTC Tuomo Valkonen <tuomov@iki.fi>
+ * Hack for better modality handling on detach
+
+2008-01-03 16:56 UTC Tuomo Valkonen <tuomov@iki.fi>
+ * system.mk doc. refinement
+
+2008-01-02 15:15 UTC Tuomo Valkonen <tuomov@iki.fi>
+ * Changes in version.h defs. to accomodate flags
+
+2008-01-01 16:51 UTC Tuomo Valkonen <tuomov@iki.fi>
+ * New year
+
+2007-12-30 18:04 UTC Tuomo Valkonen <tuomov@iki.fi>
+ * system.mk documentation improvements
+
+2007-12-30 17:51 UTC Tuomo Valkonen <tuomov@iki.fi>
+ * Makefile tuning
+
+2007-12-30 17:51 UTC Tuomo Valkonen <tuomov@iki.fi>
+ * Replaced order of LIBS and EXTRA_LIBS in system.mk defaults
+
+2007-12-30 00:04 UTC Tuomo Valkonen <tuomov@iki.fi>
+ * Fixed FS mode return regression after recent pholder code changes.
+
+2007-12-28 18:02 UTC Tuomo Valkonen <tuomov@iki.fi>
+ * Added -s(trip) flags to binary install
+
+2007-12-28 17:28 UTC Tuomo Valkonen <tuomov@iki.fi>
+ * Improvements to relocatable builds
+
+2007-12-22 09:55 UTC Tuomo Valkonen <tuomov@iki.fi>
+ * README updates
+
+2007-12-22 00:02 UTC Tuomo Valkonen <tuomov@iki.fi>
+ * Improved system.mk documentation
+
+2007-12-20 19:33 UTC Tuomo Valkonen <tuomov@iki.fi>
+ * Oops, copy-paste mistake in commented-out cfg_query example
+
2007-12-20 18:45 UTC Tuomo Valkonen <tuomov@iki.fi>
tagged ion-3rc-20071220
-Copyright (c) Tuomo Valkonen 1999-2007.
+Copyright (c) Tuomo Valkonen 1999-2008.
Unless otherwise indicated in components taken from elsewhere, this software
is licensed under the GNU Lesser General Public License, version 2.1 ("LGPL",
Ion
===
-Copyright (c) Tuomo Valkonen 1999-2007.
+Copyright (c) Tuomo Valkonen 1999-2008.
tuomov at iki.fi
15 05 * * * $SHAREDIR/ion-completeman -mksyscache
- Replace `$SHAREDIR` with the setting from `system.mk` (or `system-ac.mk`
- if you used autoconf). This example runs daily at 05:15, but you may
- modify the run times to your needs; see the crontab manual.
+ Replace `$SHAREDIR` with the setting from `system.mk`. This example
+ runs daily at 05:15, but you may modify the run times to your needs;
+ see the crontab manual.
If you can't or do not want to build a system-wide man page cache, run
`crontab -e` as your normal user and replace `-mksyscache` with
`-mk*cache` argument once manually to build the initial cache.
If the `MANPATH` environment variable is not set on your system and it
- does not have the `manpath` command (or it does not print anything
+ does not have the `manpath` command (or it does not print anything
sensible), you may also want to set the `ION_MANPATH` environment
variable to the list of paths where the system stores manual pages.
+ion-3rc-20080103
+----------------
+
+This release features a few minor fixes to behavioural regressions
+in the previous release, as well as some build configuration file
+self-documentation improvements.
+
+
ion-3rc-20071220
----------------
## Some make rules
##
-ifdef RELOCATABLE
-DEFINES += -DCF_RELOCATABLE
-endif
-
ifdef MODULE
ifeq ($(PRELOAD_MODULES),1)
MODULE_TARGETS := $(MODULE).a $(MODULE).lc
module_install: module_stub_install
$(INSTALLDIR) $(MODULEDIR)
- $(INSTALL) -m $(BIN_MODE) $(MODULE).so $(MODULEDIR)
+ $(INSTALLBIN) $(MODULE).so $(MODULEDIR)
else # PRELOAD_MODULES
_potfiles:
echo "$(SOURCES)"|tr ' ' '\n' > potfiles_c
echo "$(LUA_SOURCES) $(ETC)"|tr ' ' '\n' > potfiles_lua
+
+# Defaults
+######################################
+
+INSTALL_STRIP ?= -s
+INSTALLBIN ?= $(INSTALL) $(INSTALL_STRIP) -m $(BIN_MODE)
/*
* config.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
- * FOOBARBAZQUK
+ * See the included file LICENSE for details.
*/
#ifndef ION_CONFIG_H
/*
* ion/de/brush.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/de/brush.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/de/colour.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/de/colour.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/de/draw.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/de/font.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/de/font.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/de/fontset.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/de/init.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/de/init.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/de/private.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/de/style.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/de/style.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
caseicompl=true,
-- Sub-string completion? (Some queries only.)
- caseicompl=true,
+ substrcompl=true,
}
--]]
Context:
-[TAG ion-3rc-20071220
-Tuomo Valkonen <tuomov@iki.fi>**20071220184549]
+[TAG ion-3rc-20080103
+Tuomo Valkonen <tuomov@iki.fi>**20080103182346]
TO_CLEAN += preload.c
LIBS += -lSM -lICE
else
-LINKOPTS = $(EXPORT_DYNAMIC)
+LDFLAGS += $(EXPORT_DYNAMIC)
WHOLEA = -Wl,-whole-archive
NO_WHOLEA = -Wl,-no-whole-archive
endif
+ifeq ($(RELOCATABLE),1)
+DEFINES += -DCF_RELOCATABLE_ION3_LOCATION=\"$(BINDIR)/ion3\"
+endif
+
EXT_OBJS += ../ioncore/ioncore.a
DEFINES += -DETCDIR=\"$(ETCDIR)\" -DSHAREDIR=\"$(SHAREDIR)\" \
-DEXTRABINDIR=\"$(EXTRABINDIR)\" -DMODULEDIR=\"$(MODULEDIR)\" \
- -DLCDIR=\"$(LCDIR)\" -DLOCALEDIR=\"$(LOCALEDIR)\" \
- -DION3_LOCATION=\"$(BINDIR)/ion3\"
+ -DLCDIR=\"$(LCDIR)\" -DLOCALEDIR=\"$(LOCALEDIR)\"
CFLAGS += $(XOPEN_SOURCE) $(C99_SOURCE)
######################################
ion3: $(OBJS) $(EXT_OBJS)
- $(CC) $(LINKOPTS) $(OBJS) $(WHOLEA) $(EXT_OBJS) $(NO_WHOLEA) $(LDFLAGS) -o $@
+ $(CC) $(OBJS) $(WHOLEA) $(EXT_OBJS) $(NO_WHOLEA) $(LDFLAGS) -o $@
preload.c:
$(LUA) ../build/mkpreload.lua $(MODULE_LIST) > preload.c
_install:
$(INSTALLDIR) $(BINDIR)
- $(INSTALL) -m $(BIN_MODE) ion3 $(BINDIR)
+ $(INSTALLBIN) ion3 $(BINDIR)
/*
* ion/ion/ion.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
libtu_init(argv[0]);
-#ifdef CF_RELOCATABLE
- prefix_set(argv[0], ION3_LOCATION);
+#ifdef CF_RELOCATABLE_ION3_LOCATION
+ prefix_set(argv[0], CF_RELOCATABLE_ION3_LOCATION);
#endif
localedir=prefix_add(LOCALEDIR);
/*
* ion/ioncore/activity.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/activity.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/attach.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/attach.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/basicpholder.c
*
- * Copyright (c) Tuomo Valkonen 2005-2007.
+ * Copyright (c) Tuomo Valkonen 2005-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/basicpholder.h
*
- * Copyright (c) Tuomo Valkonen 2005-2007.
+ * Copyright (c) Tuomo Valkonen 2005-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/binding.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/binding.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/bindmaps.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/bindmaps.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/classes.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/clientwin.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/clientwin.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/colormap.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/colormap.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/common.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/conf-bindings.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/conf-bindings.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/conf.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/conf.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/cursor.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/cursor.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/detach.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
}
if(framemode!=FRAME_MODE_UNKNOWN){
+ /* TODO: remove/obsolete this special case */
WFramedParam fpa=FRAMEDPARAM_INIT;
fpa.mode=framemode;
}else{
WStacking *st=ioncore_find_stacking(reg);
+ ap.level_set=TRUE;
+ ap.level=framelevel+1;
+
if(st!=NULL){
ap.szplcy=st->szplcy;
ap.szplcy_set=TRUE;
- /*ap.level_set=TRUE;
- ap.level=maxof(st->level, STACKING_LEVEL_NORMAL);*/
+ /* Hack for modal detached queries, while transients become
+ * non-modal detached.
+ */
+ if(st->level>STACKING_LEVEL_MODAL1)
+ ap.level=st->level;
}
- ap.level_set=TRUE;
- ap.level=framelevel+1;
-
ap.geom_set=TRUE;
get_relative_geom(&ap.geom, reg, (WRegion*)grp);
/*
* ion/ioncore/detach.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/dummywc.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/event.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/event.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/eventh.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/eventh.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/exec.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/exec.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/extlconv.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/extlconv.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/extlrx.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/float-placement.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/float-placement.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/focus.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/focus.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/frame-draw.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/frame-draw.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/frame-pointer.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/frame-pointer.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/frame.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/frame.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/framedpholder.c
*
- * Copyright (c) Tuomo Valkonen 2005-2007.
+ * Copyright (c) Tuomo Valkonen 2005-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/framedpholder.h
*
- * Copyright (c) Tuomo Valkonen 2005-2007.
+ * Copyright (c) Tuomo Valkonen 2005-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/framep.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/fullscreen.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/fullscreen.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/global.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/gr-util.h
*
- * Copyright (c) Tuomo Valkonen 2007.
+ * Copyright (c) Tuomo Valkonen 2007-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/gr.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/gr.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
* ion/ioncore/grab.c
*
* Copyright (c) Lukas Schroeder 2002,
- * Tuomo Valkonen 2003-2007.
+ * Tuomo Valkonen 2003-2008.
*
* See the included file LICENSE for details.
*
* ion/ioncore/grab.h
*
* Copyright (c) Lukas Schroeder 2002,
- * Tuomo Valkonen 2003-2007.
+ * Tuomo Valkonen 2003-2008.
*
* See the included file LICENSE for details.
*
/*
* ion/ioncore/group-cw.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/group-cw.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/group-ws.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/groupws.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/group.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/group.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/grouppholder.c
*
- * Copyright (c) Tuomo Valkonen 2005-2007.
+ * Copyright (c) Tuomo Valkonen 2005-2008.
*
* See the included file LICENSE for details.
*/
bool grouppholder_do_goto(WGroupPHolder *ph)
{
- WGroup *ws=ph->group;
-
- if(ws!=NULL)
- return region_goto((WRegion*)ws);
-
- return FALSE;
+ return (ph->group!=NULL
+ ? region_goto((WRegion*)ph->group)
+ : (ph->recreate_pholder!=NULL
+ ? pholder_do_goto(ph->recreate_pholder)
+ : FALSE));
}
WRegion *grouppholder_do_target(WGroupPHolder *ph)
{
- return (WRegion*)ph->group;
+ return (ph->group!=NULL
+ ? (WRegion*)ph->group
+ : (ph->recreate_pholder!=NULL
+ ? pholder_do_target(ph->recreate_pholder)
+ : NULL));
}
/*
* ion/ioncore/grouppholder.h
*
- * Copyright (c) Tuomo Valkonen 2005-2007.
+ * Copyright (c) Tuomo Valkonen 2005-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/infowin.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/infowin.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/ioncore.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
static const char *progname="ion";
static const char ioncore_copy[]=
- "Ion " ION_VERSION ", copyright (c) Tuomo Valkonen 1999-2007.";
+ "Ion " ION_VERSION ", copyright (c) Tuomo Valkonen 1999-2008.";
static const char ioncore_license[]=DUMMY_TR(
"This software is licensed under the GNU Lesser General Public License\n"
/*
* ion/ioncore/focus.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
--
-- ion/share/ioncore-bindings.lua
--
--- Copyright (c) Tuomo Valkonen 2004-2007.
+-- Copyright (c) Tuomo Valkonen 2004-2008.
--
-- See the included file LICENSE for details.
--
--
-- ion/share/ioncore_efbb.lua -- Minimal emergency fallback bindings.
--
--- Copyright (c) Tuomo Valkonen 2004-2007.
+-- Copyright (c) Tuomo Valkonen 2004-2008.
--
-- See the included file LICENSE for details.
--
--
-- ion/share/ioncore_ext.lua -- Ioncore Lua library
--
--- Copyright (c) Tuomo Valkonen 2004-2007.
+-- Copyright (c) Tuomo Valkonen 2004-2008.
--
-- See the included file LICENSE for details.
--
--
-- ion/share/ioncore_luaext.lua
--
--- Copyright (c) Tuomo Valkonen 2004-2007.
+-- Copyright (c) Tuomo Valkonen 2004-2008.
--
-- See the included file LICENSE for details.
--
--
-- ion/ioncore/ioncore_menudb.lua -- Routines for defining menus.
--
--- Copyright (c) Tuomo Valkonen 2004-2007.
+-- Copyright (c) Tuomo Valkonen 2004-2008.
--
-- See the included file LICENSE for details.
--
--
-- ion/share/ioncore_misc.lua
--
--- Copyright (c) Tuomo Valkonen 2004-2007.
+-- Copyright (c) Tuomo Valkonen 2004-2008.
--
-- See the included file LICENSE for details.
--
--
-- ion/share/ioncore_quasiact.lua -- Frame quasiactivation support
--
--- Copyright (c) Tuomo Valkonen 2007.
+-- Copyright (c) Tuomo Valkonen 2007-2008.
--
-- See the included file LICENSE for details.
--
--
-- ion/share/ioncore_tabnum.lua -- Ioncore tab numbering support
--
--- Copyright (c) Tuomo Valkonen 2007.
+-- Copyright (c) Tuomo Valkonen 2007-2008.
--
-- See the included file LICENSE for details.
--
--
-- ion/share/ioncore_wd.lua
--
--- Copyright (c) Tuomo Valkonen 2004-2007.
+-- Copyright (c) Tuomo Valkonen 2004-2008.
--
-- See the included file LICENSE for details.
--
--
-- ion/share/ioncore_winprops.lua
--
--- Copyright (c) Tuomo Valkonen 2004-2007.
+-- Copyright (c) Tuomo Valkonen 2004-2008.
--
-- See the included file LICENSE for details.
--
/*
* ion/ioncore/kbresize.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/kbresize.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/key.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/key.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/llist.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/llist.h
*
- * Copyright (c) Tuomo Valkonen 2005-2007.
+ * Copyright (c) Tuomo Valkonen 2005-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/manage.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/manage.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/modules.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/modules.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/mplex.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/mplex.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/mplexpholder.c
*
- * Copyright (c) Tuomo Valkonen 2005-2007.
+ * Copyright (c) Tuomo Valkonen 2005-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/mplexpholder.h
*
- * Copyright (c) Tuomo Valkonen 2005-2007.
+ * Copyright (c) Tuomo Valkonen 2005-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/mwmhints.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/mwmhints.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/names.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/names.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/navi.c
*
- * Copyright (c) Tuomo Valkonen 2006-2007.
+ * Copyright (c) Tuomo Valkonen 2006-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/navi.h
*
- * Copyright (c) Tuomo Valkonen 2006-2007.
+ * Copyright (c) Tuomo Valkonen 2006-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/netwm.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/netwm.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/pholder.c
*
- * Copyright (c) Tuomo Valkonen 2005-2007.
+ * Copyright (c) Tuomo Valkonen 2005-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/pholder.h
*
- * Copyright (c) Tuomo Valkonen 2005-2007.
+ * Copyright (c) Tuomo Valkonen 2005-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/pointer.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/pointer.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/presize.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/presize.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/property.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/property.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/rectangle.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/rectangle.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/regbind.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/regbind.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/reginfo.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/reginfo.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/region-iter.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/region.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/region.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/resize.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/resize.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/return.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/return.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/rootwin.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/rootwin.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/saveload.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/saveload.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/screen-notify.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/screen-notify.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/screen.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/screen.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/selection.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/selection.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/sizehint.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/sizehint.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/sizepolicy.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/sizepolicy.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/stacking.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/stacking.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/strings.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/strings.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/tags.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/tags.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/window.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/window.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/xic.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/xic.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/xwindow.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/ioncore/xwindow.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/libmainloop/defer.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/libmainloop/defer.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/mainloop/exec.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/libmainloop/exec.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/mainloop/hooks.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/mainloop/hooks.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/libmainloop/signal.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/mainloop/signal.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
* Ion dock module
* Copyright (C) 2003 Tom Payne
* Copyright (C) 2003 Per Olofsson
- * Copyright (C) 2004-2007 Tuomo Valkonen
+ * Copyright (C) 2004-2008 Tuomo Valkonen
*
* by Tom Payne <ion@tompayne.org>
* based on code by Per Olofsson <pelle@dsv.su.se>
/*
* ion/mod_menu/grabmenu.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/mod_menu/main.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/mod_menu/main.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/mod_menu/menu.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/mod_menu/menu.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/mod_menu/mkmenu.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/mod_menu/mkmenu.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
--
-- ion/mod_menu/mod_menu.lua -- Menu opening helper routines.
--
--- Copyright (c) Tuomo Valkonen 2004-2007.
+-- Copyright (c) Tuomo Valkonen 2004-2008.
--
-- See the included file LICENSE for details.
--
/*
* ion/mod_query/complete.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/mod_query/complete.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/mod_query/edln.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/mod_query/edln.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/mod_query/query.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/mod_query/fwarn.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/mod_query/history.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/mod_query/history.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/mod_query/input.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/mod_query/input.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/mod_query/inputp.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/mod_query/listing.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/mod_query/listing.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/mod_query/main.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/mod_query/main.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
--
-- ion/query/mod_query.lua -- Some common queries for Ion
--
--- Copyright (c) Tuomo Valkonen 2004-2007.
+-- Copyright (c) Tuomo Valkonen 2004-2008.
--
-- See the included file LICENSE for details.
--
--
-- ion/query/mod_query_chdir.lua
--
--- Copyright (c) Tuomo Valkonen 2004-2007.
+-- Copyright (c) Tuomo Valkonen 2004-2008.
--
-- See the included file LICENSE for details.
--
/*
* ion/mod_query/query.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/mod_query/query.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/mod_query/wedln-wrappers.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/mod_query/wedln.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/mod_query/wedln.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/mod_query/wmessage.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/mod_query/wmessage.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/mod_sm/sm.c
*
- * Copyright (c) Tuomo Valkonen 2004-2007.
+ * Copyright (c) Tuomo Valkonen 2004-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/mod_sm/sm_mathcwin.c
*
- * Copyright (c) Tuomo Valkonen 2004-2007.
+ * Copyright (c) Tuomo Valkonen 2004-2008.
*
* Based on the code of the 'sm' module for Ion1 by an unknown contributor.
*
/*
* ion/mod_sm/sm_mathcwin.c
*
- * Copyright (c) Tuomo Valkonen 2004-2007.
+ * Copyright (c) Tuomo Valkonen 2004-2008.
*
* Based on the code of the 'sm' module for Ion1 by an unknown contributor.
*
/*
* ion/mod_sm/sm_session.c
*
- * Copyright (c) Tuomo Valkonen 2004-2007.
+ * Copyright (c) Tuomo Valkonen 2004-2008.
*
* Based on the code of the 'sm' module for Ion1 by an unknown contributor.
*
/*
* ion/mod_sm/sm_session.h
*
- * Copyright (c) Tuomo Valkonen 2004-2007.
+ * Copyright (c) Tuomo Valkonen 2004-2008.
*
* Based on the code of the 'sm' module for Ion1 by an unknown contributor.
*
/*
* ion/mod_sp/main.c
*
- * Copyright (c) Tuomo Valkonen 2004-2007.
+ * Copyright (c) Tuomo Valkonen 2004-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/mod_sp/main.h
*
- * Copyright (c) Tuomo Valkonen 2004-2007.
+ * Copyright (c) Tuomo Valkonen 2004-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/mod_statusbar/draw.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/mod_statusbar/draw.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/mod_statusbar/main.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/mod_statusbar/main.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
--
-- ion/mod_statusbar/mod_statusbar.lua
--
--- Copyright (c) Tuomo Valkonen 2004-2007.
+-- Copyright (c) Tuomo Valkonen 2004-2008.
--
-- See the included file LICENSE for details.
--
/*
* ion/mod_statusbar/statusbar.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/mod_statusbar/statusbar.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/mod_statusbar/statusd-launch.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/mod_tiling/main.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/mod_tiling/main.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
--
-- ion/mod_menu/mod_tiling.lua -- Tiling module stub loader
--
--- Copyright (c) Tuomo Valkonen 2004-2007.
+-- Copyright (c) Tuomo Valkonen 2004-2008.
--
-- 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
/*
* ion/mod_tiling/ops.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/mod_tiling/panehandle.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/mod_tiling/panehandle.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/mod_tiling/placement.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/mod_tiling/placement.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/mod_tiling/split-stdisp.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/mod_tiling/split-stdisp.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/mod_tiling/split.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/mod_tiling/split.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/mod_tiling/splitext.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/mod_tiling/splitfloat.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/mod_tiling/tiling.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
/*
* ion/mod_tiling/tiling.h
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
TO_CLEAN += preload.c
LIBS += -lSM -lICE
else
-LINKOPTS = $(EXPORT_DYNAMIC)
+LDFLAGS += $(EXPORT_DYNAMIC)
WHOLEA = -Wl,-whole-archive
NO_WHOLEA = -Wl,-no-whole-archive
endif
+ifeq ($(RELOCATABLE),1)
+DEFINES += -DCF_RELOCATABLE_PWM3_LOCATION=\"$(BINDIR)/pwm3\"
+endif
+
EXT_OBJS += ../ioncore/ioncore.a
DEFINES += -DETCDIR=\"$(ETCDIR)\" -DSHAREDIR=\"$(SHAREDIR)\" \
-DEXTRABINDIR=\"$(EXTRABINDIR)\" -DMODULEDIR=\"$(MODULEDIR)\" \
- -DLCDIR=\"$(LCDIR)\" -DLOCALEDIR=\"$(LOCALEDIR)\" \
- -DPWM3_LOCATION=\"$(BINDIR)/pwm3\"
+ -DLCDIR=\"$(LCDIR)\" -DLOCALEDIR=\"$(LOCALEDIR)\"
ifndef PWM_ETCDIR
PWM_ETCDIR = $(ETCDIR)
######################################
pwm3: $(OBJS) $(EXT_OBJS)
- $(CC) $(LINKOPTS) $(OBJS) $(WHOLEA) $(EXT_OBJS) $(NO_WHOLEA) $(LDFLAGS) -o $@
+ $(CC) $(OBJS) $(WHOLEA) $(EXT_OBJS) $(NO_WHOLEA) $(LDFLAGS) -o $@
preload.c:
$(LUA) ../build/mkpreload.lua $(PWM_MODULE_LIST) > preload.c
_install:
$(INSTALLDIR) $(BINDIR)
- $(INSTALL) -m $(BIN_MODE) pwm3 $(BINDIR)
+ $(INSTALLBIN) pwm3 $(BINDIR)
$(INSTALLDIR) $(PWM_ETCDIR)
for i in $(ETC); do \
$(INSTALL) -m $(DATA_MODE) $$i $(PWM_ETCDIR); \
/*
* ion/pwm/pwm.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
* See the included file LICENSE for details.
*/
libtu_init(argv[0]);
-#ifdef CF_RELOCATABLE
- prefix_set(argv[0], PWM3_LOCATION);
+#ifdef CF_RELOCATABLE_PWM3_LOCATION
+ prefix_set(argv[0], CF_RELOCATABLE_PWM3_LOCATION);
#endif
localedir=prefix_add(LOCALEDIR);
## Installation paths
##
+# Installation path prefix. Unless you know what you're doing, the default
+# of /usr/local is likely the correct choice.
PREFIX=/usr/local
-# For relocatable build, use the following, and start with absolute path.
-# RELOCATABLE=1
-# PREFIX=
-
# Unless you are creating a package conforming to some OS's standards, you
# probably do not want to modify the following directories:
# Set PRELOAD_MODULES=1 if your system does not support dynamically loaded
# modules through 'libdl' or has non-standard naming conventions.
+# You will likely need this option on e.g. Cygwin and Mac OS X.
#PRELOAD_MODULES=1
-# Flags to link with libdl.
+# Flags to link with libdl. Even if PRELOAD_MODULES=1, you may need this
+# setting (for e.g. Lua, when not instructed by pkg-config).
DL_LIBS=-ldl
## X libraries, includes and options
##
+# Paths
X11_PREFIX=/usr/X11R6
# SunOS/Solaris
#X11_PREFIX=/usr/openwin
##
-## libc
+## Localisation
##
-# You may uncomment this if you know your system has
-# asprintf and vasprintf in the c library. (gnu libc has.)
-# If HAS_SYSTEM_ASPRINTF is not defined, an implementation
-# in sprintf_2.2/ is used.
-#HAS_SYSTEM_ASPRINTF=1
-
# If you're on an archaic system (such as relatively recent *BSD releases)
# without even dummy multibyte/widechar and localisation support, you may
# have to uncomment the following line:
#DEFINES += -DCF_NO_LOCALE -DCF_NO_GETTEXT
-# On some other systems you may something like this:
+# On some other systems you may need to explicitly link against libintl.
#EXTRA_LIBS += -lintl
-#EXTRA_INCLUDES +=
+# You may also need to give the location of its headers. The following
+# should work on Mac OS X (which needs the above option as well) with
+# macports.
+#EXTRA_INCLUDES += -I/opt/local/include
+
+
+##
+## libc
+##
+
+# You may uncomment this if you know that your system C libary provides
+# asprintf and vasprintf. (GNU libc does.) If HAS_SYSTEM_ASPRINTF is not
+# defined, an implementation provided in libtu/sprintf_2.2/ is used.
+#HAS_SYSTEM_ASPRINTF=1
-# clock_gettime for monotonic time
+# The following setting is needed with GNU libc for clock_gettime and the
+# monotonic clock. Other systems may not need it, or may not provide a
+# monotonic clock at all (which Ion can live with, and usually detect).
EXTRA_LIBS += -lrt
+#
+# If you're using/have gcc, it is unlikely that you need to modify
+# any of the settings below this line.
+#
+#####################################################################
+
+
##
-## C compiler
+## C compiler.
##
CC=gcc
-Wtrigraphs -Wformat -Wchar-subscripts \
-Wparentheses -pedantic -Wuninitialized
-CFLAGS=-Os $(WARN) $(DEFINES) $(EXTRA_INCLUDES) $(INCLUDES)
-LDFLAGS=-Os $(EXTRA_LIBS) $(LIBS)
+CFLAGS=-Os $(WARN) $(DEFINES) $(INCLUDES) $(EXTRA_INCLUDES)
+LDFLAGS=$(LIBS) $(EXTRA_LIBS)
EXPORT_DYNAMIC=-Xlinker --export-dynamic
# The following options are mainly for development use and can be used
##
DEPEND_FILE=.depend
-DO_MAKE_DEPEND=$(CC) -MM $(DEFINES) $(EXTRA_INCLUDES) $(INCLUDES)
+DO_MAKE_DEPEND=$(CC) -MM $(DEFINES) $(INCLUDES) $(EXTRA_INCLUDES)
MAKE_DEPEND=$(DO_MAKE_DEPEND) $(SOURCES) > $(DEPEND_FILE)
+
##
## AR
##
##
INSTALL=sh $(TOPDIR)/install-sh -c
+INSTALL_STRIP=-s
INSTALLDIR=mkdir -p
BIN_MODE=755
DATA_MODE=644
-STRIP=strip
-
RM=rm
+
+
+##
+## Debugging
+##
+
+#INSTALL_STRIP =
+#CFLAGS += -g
+
_install:
$(INSTALLDIR) $(EXTRABINDIR)
- $(INSTALL) -s -m $(BIN_MODE) ion-completefile $(EXTRABINDIR)
+ $(INSTALLBIN) ion-completefile $(EXTRABINDIR)
######################################
ion-statusd: $(OBJS) $(EXT_OBJS)
- $(CC) $(LINKOPTS) $(OBJS) $(EXT_OBJS) $(LDFLAGS) -o $@
+ $(CC) $(OBJS) $(EXT_OBJS) $(LDFLAGS) -o $@
_install: lc_install
$(INSTALLDIR) $(EXTRABINDIR)
- $(INSTALL) -s -m $(BIN_MODE) ion-statusd $(EXTRABINDIR)
+ $(INSTALLBIN) ion-statusd $(EXTRABINDIR)
/*
* ion/utils/ion-statusd/exec.c
*
- * Copyright (c) Tuomo Valkonen 2005-2006.
+ * Copyright (c) Tuomo Valkonen 2005-2008.
*
* 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
/*
* ion/utils/ion-statusd/extlrx.c
*
- * Copyright (c) Tuomo Valkonen 2004-2006.
+ * Copyright (c) Tuomo Valkonen 2004-2008.
*
* 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
/*
* ion/utils/ion-statusd/ion-statusd.c
*
- * Copyright (c) Tuomo Valkonen 2004-2006.
+ * Copyright (c) Tuomo Valkonen 2004-2008.
*
* 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
static const char statusd_copy[]=
- "Ion-statusd " ION_VERSION ", copyright (c) Tuomo Valkonen 2004-2005.";
+ "Ion-statusd " ION_VERSION ", copyright (c) Tuomo Valkonen 2004-2008.";
static const char statusd_license[]=DUMMY_TR(
libtu_init(argv[0]);
-#ifdef CF_RELOCATABLE
+#ifdef STATUSD_LOCATION
prefix_set(argv[0], STATUSD_LOCATION);
#endif
--
-- ion/mod_statusbar/ion-statusd/statusd_date.lua
--
--- Copyright (c) Tuomo Valkonen 2004-2006.
+-- Copyright (c) Tuomo Valkonen 2004-2008.
--
-- 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
--
-- ion/mod_statusbar/ion-statusd/statusd_load.lua
--
--- Copyright (c) Tuomo Valkonen 2004-2006.
+-- Copyright (c) Tuomo Valkonen 2004-2008.
--
-- 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
--
-- ion/mod_statusbar/ion-statusd/statusd_mail.lua
--
--- Copyright (c) Tuomo Valkonen 2004-2006.
+-- Copyright (c) Tuomo Valkonen 2004-2008.
--
-- 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
-#define ION_VERSION "3rc-20071220"
+#define ION_RELEASE "3rc-20080103"
+#define ION_VERSION ION_RELEASE
#define ION_API_VERSION "3"
projects / ion3.git / commitdiff