Hello community,
here is the log from the commit of package fvwm2 for openSUSE:Factory checked in at 2013-07-24 17:28:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/fvwm2 (Old)
and /work/SRC/openSUSE:Factory/.fvwm2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fvwm2"
Changes:
--------
--- /work/SRC/openSUSE:Factory/fvwm2/fvwm2.changes 2013-04-05 07:35:30.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.fvwm2.new/fvwm2.changes 2013-07-24 17:29:00.000000000 +0200
@@ -1,0 +2,40 @@
+Thu Jul 18 11:58:36 UTC 2013 - werner@suse.de
+
+- Update to 2.6.5 + snpashot 2012/10/11
+ - NEWS: Added FvwmForm Separators,
+ fvwm-desktop-menu fixes.
+ - libs/Bindings.c (AddBinding):
+ - fvwm/builtins.c (FkeysymToKeycode):
+ - fvwm/events.c (__handle_key):
+ Add detection of XKeycodeToKeysym as deprecated, and provide a wrapper
+ for it by way of fvwm_KeycodeToKeysym() to call the newer
+ XkbKeycodeToKeysum() where needed.
+ - libs/PictureImageLoader.c (PImageLoadSvg, PimageLoadXpm,
+ PImageLoadPng):
+ Fix compilation errors.
+ - fvwm/menu.c ( __scan_for_pixmap):
+ - libs/PictureImageLoader.c (PImageLoadSvg, PimageLoadXpm,
+ PImageLoadPng):
+ Add fvwm_msg() for hints about failed image load.
+ - fvwm/events.c (HandlePropertyNotify):
+ Fix XSizeHints problem with FVWM not correctly allowing resizing of
+ windows when the hints are toggled with respect to FVWM processing
+ XA_WM_NORMAL_HINTS.
+ - fvwm/placement.c ( __pl_position_get_pos_simple):
+ When using "UnderMouse" for PositionPlacement, ensure we honor the EWMH
+ working area by default if it's in use.
+ - fvwm/fvwm.c (InstallSignals):
+ Unblock signals when installing them.
+ When signals are registered, ensure they're unblocked so as not to queue
+ them up.
+ - fvwm/infostore.c (get_metainfo_length):
+ + fvwm/infostore.c (new_metainfo):
+ + fvwm/infostore.c (insert_metainfo):
+ + fvwm/style.c (style_parse_one_style_option):
+ Make C90 compliant.
+- Add patch fvwm-snapshot.patch for snpashot 2012/10/11
+- Add patch fvwm-rsvg.patch to avoid internal rsvg-cairo.h included twice
+- Add source bin/fvwm-menu-desktop-config.fpl as missed in 2012/10/11
+- Modify patch fvwm-2.5.26-gcc-warnings.patch as fixed upstream
+
+-------------------------------------------------------------------
Old:
----
fvwm-2.6.4.tar.bz2
New:
----
fvwm-2.6.5.tar.bz2
fvwm-menu-desktop-config.fpl
fvwm-rsvg.patch
fvwm-snapshot.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ fvwm2.spec ++++++
--- /var/tmp/diff_new_pack.EpdBLD/_old 2013-07-24 17:29:01.000000000 +0200
+++ /var/tmp/diff_new_pack.EpdBLD/_new 2013-07-24 17:29:01.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package fvwm2
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,7 +16,6 @@
#
-
Name: fvwm2
BuildRequires: automake
BuildRequires: freetype2-devel
@@ -30,9 +29,13 @@
BuildRequires: readline-devel
BuildRequires: update-desktop-files
BuildRequires: xorg-x11-devel
-Provides: fvwm fvwmicns windowmanager xpmroot
-Obsoletes: fvwm xpmroot
-Version: 2.6.4
+Provides: fvwm
+Provides: fvwmicns
+Provides: windowmanager
+Provides: xpmroot
+Obsoletes: fvwm
+Obsoletes: xpmroot
+Version: 2.6.5
Release: 0
Summary: Improved Version of FVWM Window Manager
License: GPL-2.0+
@@ -44,14 +47,23 @@
Source4: system.fvwm2rc
Source5: _system.fvwm2rc
Source6: openSuSE.xpm
+#SOURCE-FIX-OPENSUSE for snapshot 2012/10/11
+Source7: fvwm-menu-desktop-config.fpl
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Requires: xdg-menu, desktop-data, mktemp, xli
+Requires: desktop-data
+Requires: mktemp
+Requires: xdg-menu
+Requires: xli
Patch0: fvwm-configure.patch
Patch1: fvwm-2.5.26-gcc-warnings.patch
Patch2: fvwm-2.5.26-ia64.patch
Patch3: fvwm-2.5.26-sv_SE.patch
Patch5: fvwm-2.5.26-charset_in_title.patch
Patch7: fvwm-2.5.26-no-copy-dt-needed-entries.patch
+#PATCH-FIX-OPENSUSE Avoid including internal rsvg-cairo.h
+Patch8: fvwm-rsvg.patch
+#PATCH-FIX-OPENSUSE Update to snapshot 2012/10/11
+Patch42: fvwm-snapshot.patch
%description
FVWM is a virtual desktop window manager for the X Window System.
@@ -69,16 +81,19 @@
%prep
%setup -q -n fvwm-%{version}
+%patch42
%patch0
%patch1
%patch2
%patch3
%patch5
%patch7 -p1
+%patch8
find . -name *sv_SE* |xargs rename sv_SE sv
mkdir icons
tar -C icons -j -x -v -f $RPM_SOURCE_DIR/fvwm_icons.tar.bz2
cp %{S:6} icons
+cp %{S:7} bin/
#
# build
++++++ fvwm-2.5.26-gcc-warnings.patch ++++++
--- /var/tmp/diff_new_pack.EpdBLD/_old 2013-07-24 17:29:01.000000000 +0200
+++ /var/tmp/diff_new_pack.EpdBLD/_new 2013-07-24 17:29:01.000000000 +0200
@@ -9,14 +9,3 @@
int i;
Bool do_iconv = True;
const char *bidi_charset;
---- fvwm/infostore.c
-+++ fvwm/infostore.c 2012-02-07 09:40:19.454433548 +0000
-@@ -58,7 +58,7 @@ MetaInfo *new_metainfo(void)
- {
- /* Initialise the main store. */
- mi_store = (MetaInfo *)safemalloc(sizeof(MetaInfo));
-- memset(&mi_store, '\0', sizeof(MetaInfo));
-+ memset(mi_store, '\0', sizeof(MetaInfo));
- }
-
- mi = (MetaInfo *)safemalloc(sizeof(MetaInfo));
++++++ fvwm-2.6.4.tar.bz2 -> fvwm-2.6.5.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/ChangeLog new/fvwm-2.6.5/ChangeLog
--- old/fvwm-2.6.4/ChangeLog 2012-02-01 22:30:18.000000000 +0100
+++ new/fvwm-2.6.5/ChangeLog 2012-04-20 13:02:54.000000000 +0200
@@ -1,3 +1,26 @@
+2012-04-20 Thomas Adam
+ * configure.ac:
+ * docs/ANNOUNCE:
+ Prep for 2.6.5
+
+2012-03-17 Thomas Adam
+ * fvwm/events.c (HandlePropertyNotify):
+ Fix XSizeHints problem with FVWM not correctly allowing resizing of
+ windows when the hints are toggled with respect to FVWM processing
+ XA_WM_NORMAL_HINTS.
+
+2012-03-16 Thomas Adam
+ * fvwm/placement.c ( __pl_position_get_pos_simple):
+ When using "UnderMouse" for PositionPlacement, ensure we honor the EWMH
+ working area by default if it's in use.
+
+2012-02-20 Thomas Adam
+ * fvwm/fvwm.c (InstallSignals):
+ Unblock signals when installing them.
+
+ When signals are registered, ensure they're unblocked so as not to queue
+ them up.
+
2012-02-01 Thomas Adam
* fvwm/infostore.c (get_metainfo_length):
* fvwm/infostore.c (new_metainfo):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/NEWS new/fvwm-2.6.5/NEWS
--- old/fvwm-2.6.4/NEWS 2012-01-26 23:24:09.000000000 +0100
+++ new/fvwm-2.6.5/NEWS 2012-04-20 13:00:27.000000000 +0200
@@ -2,7 +2,19 @@
2.6.0.
-------------------------------------------------------------------
-Changes in CVS HEAD (not yet released)
+Changes in CVS HEAD (20-Apr-2012)
+
+* New features:
+ - FvwmPager now wraps window names if SmallFont is set.
+
+* Bug fixes:
+ - Made signals registered with FVWM unblocking.
+ - The "UnderMouse" option to PositionPlacement now honors the EWMH
+ working area by default, if it's in use.
+ - FvwmButtons handles the deleted window correctly for sub-windows.
+
+-------------------------------------------------------------------
+Changes in stable release 2.6.4 (01-Feb-2012)
* New features:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/bin/fvwm-bug.1 new/fvwm-2.6.5/bin/fvwm-bug.1
--- old/fvwm-2.6.4/bin/fvwm-bug.1 2012-02-01 22:15:56.000000000 +0100
+++ new/fvwm-2.6.5/bin/fvwm-bug.1 2012-04-20 13:04:36.000000000 +0200
@@ -1,5 +1,5 @@
-.\" @(#)fvwm-2.6.4 01 February 2012
-.TH fvwm-bug 1 "01 February 2012 (2.6.4)" Fvwm "Fvwm Modules"
+.\" @(#)fvwm-2.6.5 20 April 2012
+.TH fvwm-bug 1 "20 April 2012 (2.6.5)" Fvwm "Fvwm Modules"
.SH NAME
fvwm-bug \- report a bug in fvwm
.SH SYNOPSIS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/bin/fvwm-config.1 new/fvwm-2.6.5/bin/fvwm-config.1
--- old/fvwm-2.6.4/bin/fvwm-config.1 2012-02-01 22:15:56.000000000 +0100
+++ new/fvwm-2.6.5/bin/fvwm-config.1 2012-04-20 13:04:36.000000000 +0200
@@ -1,4 +1,4 @@
-.\" @(#)fvwm-2.6.4 01 February 2012
+.\" @(#)fvwm-2.6.5 20 April 2012
.de EX \"Begin example
.ne 5
.if n .sp 1
@@ -13,7 +13,7 @@
.if t .sp .5
..
.ta .3i .6i .9i 1.2i 1.5i 1.8i
-.TH fvwm-config 1 "01 February 2012 (2.6.4)" Fvwm "Fvwm Modules"
+.TH fvwm-config 1 "20 April 2012 (2.6.5)" Fvwm "Fvwm Modules"
.UC
.SH NAME
fvwm-config \- query an existing fvwm installation
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/bin/fvwm-convert-2.2.1 new/fvwm-2.6.5/bin/fvwm-convert-2.2.1
--- old/fvwm-2.6.4/bin/fvwm-convert-2.2.1 2012-02-01 22:15:56.000000000 +0100
+++ new/fvwm-2.6.5/bin/fvwm-convert-2.2.1 2012-04-20 13:04:36.000000000 +0200
@@ -1,5 +1,5 @@
-.\" @(#)fvwm-2.6.4 01 February 2012
-.TH fvwm-convert-2.2 1 "01 February 2012 (2.6.4)" Fvwm "Fvwm Modules"
+.\" @(#)fvwm-2.6.5 20 April 2012
+.TH fvwm-convert-2.2 1 "20 April 2012 (2.6.5)" Fvwm "Fvwm Modules"
.SH NAME
fvwm-convert-2.2 \- convert fvwm 1.xx configuration file to fvwm 2.xx style
.SH SYNOPSIS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/bin/fvwm-convert-2.4.1 new/fvwm-2.6.5/bin/fvwm-convert-2.4.1
--- old/fvwm-2.6.4/bin/fvwm-convert-2.4.1 2012-02-01 22:15:56.000000000 +0100
+++ new/fvwm-2.6.5/bin/fvwm-convert-2.4.1 2012-04-20 13:04:36.000000000 +0200
@@ -1,5 +1,5 @@
-.\" @(#)fvwm-2.6.4 01 February 2012
-.TH fvwm-convert-2.4 1 "01 February 2012 (2.6.4)" Fvwm "Fvwm Modules"
+.\" @(#)fvwm-2.6.5 20 April 2012
+.TH fvwm-convert-2.4 1 "20 April 2012 (2.6.5)" Fvwm "Fvwm Modules"
.SH NAME
fvwm-convert-2.4 \- convert fvwm 2.2.x configuration file to fvwm 2.4 syntax
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/bin/fvwm-convert-2.6.1 new/fvwm-2.6.5/bin/fvwm-convert-2.6.1
--- old/fvwm-2.6.4/bin/fvwm-convert-2.6.1 2012-02-01 22:15:56.000000000 +0100
+++ new/fvwm-2.6.5/bin/fvwm-convert-2.6.1 2012-04-20 13:04:36.000000000 +0200
@@ -1,5 +1,5 @@
-.\" @(#)fvwm-2.6.4 01 February 2012
-.TH fvwm-convert-2.6 1 "01 February 2012 (2.6.4)" Fvwm "Fvwm Modules"
+.\" @(#)fvwm-2.6.5 20 April 2012
+.TH fvwm-convert-2.6 1 "20 April 2012 (2.6.5)" Fvwm "Fvwm Modules"
.SH NAME
fvwm-convert-2.6 \- convert fvwm 2.4.x configuration file to fvwm 2.6 style
.SH SYNOPSIS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/bin/fvwm-menu-desktop.1 new/fvwm-2.6.5/bin/fvwm-menu-desktop.1
--- old/fvwm-2.6.4/bin/fvwm-menu-desktop.1 2012-02-01 22:15:56.000000000 +0100
+++ new/fvwm-2.6.5/bin/fvwm-menu-desktop.1 2012-04-20 13:04:36.000000000 +0200
@@ -1,5 +1,5 @@
.\" t
-.\" @(#)fvwm-2.6.4 01 February 2012
+.\" @(#)fvwm-2.6.5 20 April 2012
.de EX \"Begin example
.ne 5
.if n .sp 1
@@ -14,7 +14,7 @@
.if t .sp .5
..
.ta .3i .6i .9i 1.2i 1.5i 1.8i
-.TH fvwm-menu-desktop 1 "01 February 2012 (2.6.4)" Fvwm "Fvwm Modules"
+.TH fvwm-menu-desktop 1 "20 April 2012 (2.6.5)" Fvwm "Fvwm Modules"
.UC
.SH NAME
fvwm-menu-desktop \- builds GNOME and KDE menus and style commands for fvwm
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/bin/fvwm-root.1 new/fvwm-2.6.5/bin/fvwm-root.1
--- old/fvwm-2.6.4/bin/fvwm-root.1 2012-02-01 22:15:56.000000000 +0100
+++ new/fvwm-2.6.5/bin/fvwm-root.1 2012-04-20 13:04:36.000000000 +0200
@@ -1,6 +1,6 @@
'\" t
-.\" @(#)fvwm-2.6.4 01 February 2012
-.TH fvwm-root 1 "01 February 2012 (2.6.4)" Fvwm "Fvwm Modules"
+.\" @(#)fvwm-2.6.5 20 April 2012
+.TH fvwm-root 1 "20 April 2012 (2.6.5)" Fvwm "Fvwm Modules"
.UC
.SH NAME
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/configure new/fvwm-2.6.5/configure
--- old/fvwm-2.6.4/configure 2012-02-01 22:15:06.000000000 +0100
+++ new/fvwm-2.6.5/configure 2012-04-20 13:03:57.000000000 +0200
@@ -2650,12 +2650,12 @@
ISRELEASED=yes
-version=2.6.4
+version=2.6.5
VERSIONINFO=""
-RELDATELONG="01 February 2012"
-RELDATESHORT="01-Feb-2012"
-RELDATENUM="2012-02-01"
+RELDATELONG="20 April 2012"
+RELDATESHORT="02-Apr-2012"
+RELDATENUM="2012-04-20"
# constant variable settings
FVWMNAMELONG="F? Virtual Window Manager"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/configure.ac new/fvwm-2.6.5/configure.ac
--- old/fvwm-2.6.4/configure.ac 2012-02-01 22:13:40.000000000 +0100
+++ new/fvwm-2.6.5/configure.ac 2012-04-20 12:58:29.000000000 +0200
@@ -5,15 +5,15 @@
dnl should be "yes" only within the released distribution
ISRELEASED=yes
-version=2.6.4
+version=2.6.5
VERSIONINFO=""
dnl date of the released version (please zero pad the day in the last 2 dates)
dnl for example: "4 February 2003", "04 Feb 2003", "2003-02-04"
dnl date format strings: "%e %B %Y", "%d-%b-%Y", "%Y-%m-%d"
-RELDATELONG="01 February 2012"
-RELDATESHORT="01-Feb-2012"
-RELDATENUM="2012-02-01"
+RELDATELONG="20 April 2012"
+RELDATESHORT="02-Apr-2012"
+RELDATENUM="2012-04-20"
# constant variable settings
FVWMNAMELONG="F? Virtual Window Manager"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/doc/fvwm/fvwm.1 new/fvwm-2.6.5/doc/fvwm/fvwm.1
--- old/fvwm-2.6.4/doc/fvwm/fvwm.1 2012-02-01 22:25:29.000000000 +0100
+++ new/fvwm-2.6.5/doc/fvwm/fvwm.1 2012-04-20 13:06:21.000000000 +0200
@@ -1,11 +1,11 @@
.\" Title: fvwm
.\" Author:
.\" Generator: DocBook XSL Stylesheets vsnapshot_6661 http://docbook.sf.net/
-.\" Date: 01-Feb-2012
-.\" Manual: Fvwm 2.6.4
+.\" Date: 02-Apr-2012
+.\" Manual: Fvwm 2.6.5
.\" Source:
.\"
-.TH "FVWM" "1" "01-Feb-2012" "" "Fvwm 2.6.4"
+.TH "FVWM" "1" "02-Apr-2012" "" "Fvwm 2.6.5"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/docs/ANNOUNCE new/fvwm-2.6.5/docs/ANNOUNCE
--- old/fvwm-2.6.4/docs/ANNOUNCE 2012-02-01 22:12:37.000000000 +0100
+++ new/fvwm-2.6.5/docs/ANNOUNCE 2012-04-20 13:00:27.000000000 +0200
@@ -1,37 +1,11 @@
-FVWM 2.6.4
+FVWM 2.6.5
==========
* New features:
-
- - FvwmIconMan no longer allows for itself to be transient by using:
-
- Module FvwmIconMan Transient
-
- This is too ambiguous with valid module alias names, hence a
- transient FvwmIconMan must be created with "-Transient" as in:
-
- Module FvwmIconMan -Transient
- - New command InfoStore -- to store key/value pairs of information
- to relieve the burden of the SetEnv command.
- - Speed-up improvements for fvwm-menu-desktop when generating XDG
- menus by removing unnecessary stat(2) calls.
- - BusyCursor and CursorStyle have been set to make the cursor look
- like a dot during Read/PipeRead commands, by default.
+ - FvwmPager now wraps window names if SmallFont is set.
* Bug fixes:
-
- - FvwmRearrange now understands the "ewmhiwa" option when placing
- windows.
- - Client gravity for subwindows is honoured for reparenting
- windows, such as with XEmbed, when changing the parent's
- geometry.
- - Conditional command processing of !Layer n, as in:
-
- Next (Xteddy, !Layer 4) Echo cuddles
-
- has now been fixed.
- - Fixed handling of swallowed windows for transient FvwmButtons'.
- - fvwm-menu-desktop now looks in /usr/share/applications for KDE
- legacy mode.
- - fvwm-config no longer accepts "--is-stable", "--is-released",
- "--is-final".
+ - Made signals registered with FVWM unblocking.
+ - The "UnderMouse" option to PositionPlacement now honors the EWMH
+ working area by default, if it's in use.
+ - FvwmButtons handles the deleted window correctly for sub-windows.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/docs/fvwm.lsm new/fvwm-2.6.5/docs/fvwm.lsm
--- old/fvwm-2.6.4/docs/fvwm.lsm 2012-02-01 22:15:58.000000000 +0100
+++ new/fvwm-2.6.5/docs/fvwm.lsm 2012-04-20 13:04:38.000000000 +0200
@@ -1,7 +1,7 @@
Begin4
Title: fvwm (F? Virtual Window Manager)
-Version: 2.6.4
-Entered-date: 2012-02-01
+Version: 2.6.5
+Entered-date: 2012-04-20
Description: fvwm is an ICCCM-compliant X window manager providing a 3D
look for window decorations, multiple discontiguous virtual
desktops, a high degree of configurability, and an external
@@ -10,10 +10,10 @@
Author: Rob Nation, fvwm workers
Maintained-by: fvwm workers list
Primary-site: ftp.fvwm.org /pub/ftp
- 2M fvwm-2.6.4.tar.gz
+ 2M fvwm-2.6.5.tar.gz
Alternate-site: metalab.unc.edu /pub/Linux/X11/window-managers/
1k fvwm.lsm
- 2M fvwm-2.6.4.tar.gz
+ 2M fvwm-2.6.5.tar.gz
Original-site:
Platforms: Unix, X
Copying-policy: GNU General Public License
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/fvwm/events.c new/fvwm-2.6.5/fvwm/events.c
--- old/fvwm-2.6.4/fvwm/events.c 2012-01-26 23:24:14.000000000 +0100
+++ new/fvwm-2.6.5/fvwm/events.c 2012-04-20 12:41:05.000000000 +0200
@@ -3592,6 +3592,17 @@
* the next ConfigureRequest w/ x, y, width or height set
* arrives. */
SET_HAS_NEW_WM_NORMAL_HINTS(fw, 1);
+
+ /* TA: 20120317: Always set the size hints here, regardless
+ * of them possibly being modified by a ConfigureNotify
+ * request, due to XSizeHints disallowing resize -- FVWM would
+ * always use old values if the application decided to toggle
+ * such things, and FVWM would then never resize the window.
+ *
+ * Note that SET_HAS_NEW_WM_NORMAL_HINTS being set here to
+ * true is still valid.
+ */
+ GetWindowSizeHints(fw);
break;
default:
if (te->xproperty.atom == _XA_WM_PROTOCOLS)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/fvwm/fvwm.c new/fvwm-2.6.5/fvwm/fvwm.c
--- old/fvwm-2.6.4/fvwm/fvwm.c 2011-08-07 00:03:31.000000000 +0200
+++ new/fvwm-2.6.5/fvwm/fvwm.c 2012-02-20 13:27:34.000000000 +0100
@@ -764,6 +764,9 @@
sigaction(SIGQUIT, &sigact, NULL);
sigaction(SIGTERM, &sigact, NULL);
+ /* Unblock these signals so that we can process them again. */
+ sigprocmask(SIG_UNBLOCK, &sigact.sa_mask, NULL);
+
/* Reap all zombies automatically! This signal handler will only be
* called if a child process dies, not if someone sends a child a STOP
* signal. Note that none of our "terminate" signals can be delivered
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/fvwm/infostore.c new/fvwm-2.6.5/fvwm/infostore.c
--- old/fvwm-2.6.4/fvwm/infostore.c 2012-02-01 22:23:31.000000000 +0100
+++ new/fvwm-2.6.5/fvwm/infostore.c 2012-04-20 12:41:05.000000000 +0200
@@ -54,17 +54,8 @@
{
MetaInfo *mi;
- if (mi_store == NULL)
- {
- /* Initialise the main store. */
- mi_store = (MetaInfo *)safemalloc(sizeof(MetaInfo));
- memset(&mi_store, '\0', sizeof(MetaInfo));
- }
-
mi = (MetaInfo *)safemalloc(sizeof(MetaInfo));
- mi->key = NULL;
- mi->value = NULL;
- mi->next = NULL;
+ memset(mi, '\0', sizeof(MetaInfo));
return mi;
}
@@ -73,7 +64,6 @@
{
MetaInfo *mi;
MetaInfo *mi_new;
- mi_new = new_metainfo();
for (mi = mi_store; mi; mi = mi->next)
{
@@ -82,16 +72,17 @@
/* We already have an entry in the list with that key, so
* update the value of it only.
*/
+ free (mi->value);
CopyString(&mi->value, value);
- free (mi_new);
return;
}
}
/* It's a new item, add it to the list. */
+ mi_new = new_metainfo();
mi_new->key = key;
- mi_new->value = value;
+ CopyString(&mi_new->value, value);
mi_new->next = mi_store;
mi_store = mi_new;
@@ -198,6 +189,7 @@
}
insert_metainfo(key, value);
+ free(value);
return;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/fvwm/placement.c new/fvwm-2.6.5/fvwm/placement.c
--- old/fvwm-2.6.4/fvwm/placement.c 2011-08-30 02:31:34.000000000 +0200
+++ new/fvwm-2.6.5/fvwm/placement.c 2012-03-16 09:34:10.000000000 +0100
@@ -378,6 +378,18 @@
/* TA: 20090218: Try and keep the window on-screen if we
* can.
*/
+
+ /* TA: 20120316: Imply the working-area when under the mouse -- this
+ * brings it in-line with making the EWMH working area the default.
+ * Note that "UnderMouse" is a special case, deliberately. All other
+ * PositionPlacement commands are deliberately NOT subject to ewmhiwa
+ * options.
+ */
+ EWMH_GetWorkAreaIntersection(
+ arg->place_fw, (int *)&arg->screen_g.x, (int *)&arg->screen_g.y,
+ (int *)&arg->screen_g.width,
+ (int *)&arg->screen_g.height, EWMH_USE_WORKING_AREA);
+
if (ret_p->x + arg->place_fw->g.frame.width > arg->screen_g.x
+ arg->screen_g.width)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/modules/ChangeLog new/fvwm-2.6.5/modules/ChangeLog
--- old/fvwm-2.6.4/modules/ChangeLog 2012-02-01 22:28:20.000000000 +0100
+++ new/fvwm-2.6.5/modules/ChangeLog 2012-04-20 12:41:05.000000000 +0200
@@ -1,3 +1,19 @@
+2012-04-14 Thomas Adam
+ * modules/FvwmPager/x_pager.c (label_window_wrap):
+ New static function for wrapping window lables.
+
+ * modules/FvwmPager/x_pager.c (do_label_window):
+ Use wrapped window names in pager by default.
+
+2012-03-26 Thomas Adam
+ * modules/FvwmButtons/FvwmButtons.c (Loop):
+ Use xwindowdestroy.window when tracking windows.
+
+2012-02-07 Thomas Adam
+ * modules/FvwmPager/FvwmPager.1.in:
+ * modules/FvwmIconMan/FvwmIconMan.1.in:
+ Mention %i is the icon title explicitly.
+
2012-02-01 Thomas Adam
* modules/FvwmProxy/FvwmProxy.c (parse_options):
Make C90 compliant.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/modules/FvwmAnimate/FvwmAnimate.1 new/fvwm-2.6.5/modules/FvwmAnimate/FvwmAnimate.1
--- old/fvwm-2.6.4/modules/FvwmAnimate/FvwmAnimate.1 2012-02-01 22:15:56.000000000 +0100
+++ new/fvwm-2.6.5/modules/FvwmAnimate/FvwmAnimate.1 2012-04-20 13:04:36.000000000 +0200
@@ -1,5 +1,5 @@
-.\" @(#)fvwm-2.6.4 01 February 2012
-.TH FvwmAnimate 1 "01 February 2012 (2.6.4)" Fvwm "Fvwm Modules"
+.\" @(#)fvwm-2.6.5 20 April 2012
+.TH FvwmAnimate 1 "20 April 2012 (2.6.5)" Fvwm "Fvwm Modules"
.UC
.SH NAME
\fBFvwmAnimate\fP \- the fvwm animate module
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/modules/FvwmAuto/FvwmAuto.1 new/fvwm-2.6.5/modules/FvwmAuto/FvwmAuto.1
--- old/fvwm-2.6.4/modules/FvwmAuto/FvwmAuto.1 2012-02-01 22:15:56.000000000 +0100
+++ new/fvwm-2.6.5/modules/FvwmAuto/FvwmAuto.1 2012-04-20 13:04:36.000000000 +0200
@@ -1,6 +1,6 @@
.\" t
-.\" @(#)fvwm-2.6.4 01 February 2012
+.\" @(#)fvwm-2.6.5 20 April 2012
.de EX \"Begin example
.ne 5
.if n .sp 1
@@ -15,7 +15,7 @@
.if t .sp .5
..
.ta .3i .6i .9i 1.2i 1.5i 1.8i
-.TH FvwmAuto 1 "01 February 2012 (2.6.4)" Fvwm "Fvwm Modules"
+.TH FvwmAuto 1 "20 April 2012 (2.6.5)" Fvwm "Fvwm Modules"
.UC
.SH NAME
\fIFvwmAuto\fP \- the fvwm auto-raise module
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/modules/FvwmBacker/FvwmBacker.1 new/fvwm-2.6.5/modules/FvwmBacker/FvwmBacker.1
--- old/fvwm-2.6.4/modules/FvwmBacker/FvwmBacker.1 2012-02-01 22:15:56.000000000 +0100
+++ new/fvwm-2.6.5/modules/FvwmBacker/FvwmBacker.1 2012-04-20 13:04:36.000000000 +0200
@@ -1,6 +1,6 @@
.\" t
-.\" @(#)fvwm-2.6.4 01 February 2012
-.TH FvwmBacker 1 "01 February 2012 (2.6.4)" Fvwm "Fvwm Modules"
+.\" @(#)fvwm-2.6.5 20 April 2012
+.TH FvwmBacker 1 "20 April 2012 (2.6.5)" Fvwm "Fvwm Modules"
.UC
.SH NAME
FvwmBacker \- the fvwm background changer module
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/modules/FvwmBanner/FvwmBanner.1 new/fvwm-2.6.5/modules/FvwmBanner/FvwmBanner.1
--- old/fvwm-2.6.4/modules/FvwmBanner/FvwmBanner.1 2012-02-01 22:15:56.000000000 +0100
+++ new/fvwm-2.6.5/modules/FvwmBanner/FvwmBanner.1 2012-04-20 13:04:36.000000000 +0200
@@ -1,6 +1,6 @@
.\" t
-.\" @(#)fvwm-2.6.4 01 February 2012
+.\" @(#)fvwm-2.6.5 20 April 2012
.de EX \"Begin example
.ne 5
.if n .sp 1
@@ -14,7 +14,7 @@
.if n .sp 1
.if t .sp .5
..
-.TH FvwmBanner 1 "01 February 2012 (2.6.4)" Fvwm "Fvwm Modules"
+.TH FvwmBanner 1 "20 April 2012 (2.6.5)" Fvwm "Fvwm Modules"
.UC
.SH NAME
FvwmBanner \- the Fvwm Banner module
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/modules/FvwmButtons/FvwmButtons.1 new/fvwm-2.6.5/modules/FvwmButtons/FvwmButtons.1
--- old/fvwm-2.6.4/modules/FvwmButtons/FvwmButtons.1 2012-02-01 22:15:56.000000000 +0100
+++ new/fvwm-2.6.5/modules/FvwmButtons/FvwmButtons.1 2012-04-20 13:04:36.000000000 +0200
@@ -1,5 +1,5 @@
-.\" @(#)fvwm-2.6.4 01 February 2012
-.TH FvwmButtons 1 "01 February 2012 (2.6.4)" Fvwm "Fvwm Modules"
+.\" @(#)fvwm-2.6.5 20 April 2012
+.TH FvwmButtons 1 "20 April 2012 (2.6.5)" Fvwm "Fvwm Modules"
.UC
.SH NAME
FvwmButtons \- the fvwm buttonbox module
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/modules/FvwmButtons/FvwmButtons.c new/fvwm-2.6.5/modules/FvwmButtons/FvwmButtons.c
--- old/fvwm-2.6.4/modules/FvwmButtons/FvwmButtons.c 2011-11-26 13:03:41.000000000 +0100
+++ new/fvwm-2.6.5/modules/FvwmButtons/FvwmButtons.c 2012-03-26 12:12:27.000000000 +0200
@@ -1442,7 +1442,7 @@
button = -1;
while (NextButton(&ub, &b, &button, 0))
{
- if (b->flags.b_Panel && Event.xany.window == b->PanelWin)
+ if (b->flags.b_Panel && Event.xdestroywindow.window == b->PanelWin)
{
/* A panel has been unmapped, update the button */
b->newflags.panel_mapped = (Event.type == MapNotify);
@@ -1458,7 +1458,7 @@
{
Window swin = SwallowedWindow(b);
- if ((buttonSwallowCount(b) == 3) && Event.xany.window == swin)
+ if ((buttonSwallowCount(b) == 3) && Event.xdestroywindow.window == swin)
{
#ifdef DEBUG_HANGON
fprintf(stderr,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/modules/FvwmCommand/FvwmCommand.1 new/fvwm-2.6.5/modules/FvwmCommand/FvwmCommand.1
--- old/fvwm-2.6.4/modules/FvwmCommand/FvwmCommand.1 2012-02-01 22:15:56.000000000 +0100
+++ new/fvwm-2.6.5/modules/FvwmCommand/FvwmCommand.1 2012-04-20 13:04:36.000000000 +0200
@@ -1,5 +1,5 @@
.\" t
-.\" @(#)fvwm-2.6.4 01 February 2012
+.\" @(#)fvwm-2.6.5 20 April 2012
.de EX \"Begin example
.ne 5
.if n .sp 1
@@ -14,7 +14,7 @@
.if t .sp .5
..
.ta .2i .4i .6i .8i
-.TH FvwmCommand 1 "01 February 2012 (2.6.4)" Fvwm "Fvwm Modules"
+.TH FvwmCommand 1 "20 April 2012 (2.6.5)" Fvwm "Fvwm Modules"
.UC
.SH NAME
FvwmCommand \- fvwm command external interface
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/modules/FvwmConsole/FvwmConsole.1 new/fvwm-2.6.5/modules/FvwmConsole/FvwmConsole.1
--- old/fvwm-2.6.4/modules/FvwmConsole/FvwmConsole.1 2012-02-01 22:15:56.000000000 +0100
+++ new/fvwm-2.6.5/modules/FvwmConsole/FvwmConsole.1 2012-04-20 13:04:36.000000000 +0200
@@ -1,6 +1,6 @@
.\" t
-.\" @(#)fvwm-2.6.4 01 February 2012
-.TH FvwmConsole 1 "01 February 2012 (2.6.4)" Fvwm "Fvwm Modules"
+.\" @(#)fvwm-2.6.5 20 April 2012
+.TH FvwmConsole 1 "20 April 2012 (2.6.5)" Fvwm "Fvwm Modules"
.UC
.SH NAME
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/modules/FvwmConsole/FvwmConsoleC.pl.1 new/fvwm-2.6.5/modules/FvwmConsole/FvwmConsoleC.pl.1
--- old/fvwm-2.6.4/modules/FvwmConsole/FvwmConsoleC.pl.1 2012-02-01 22:15:56.000000000 +0100
+++ new/fvwm-2.6.5/modules/FvwmConsole/FvwmConsoleC.pl.1 2012-04-20 13:04:36.000000000 +0200
@@ -1,6 +1,6 @@
.\" t
-.\" @(#)fvwm-2.6.4 01 February 2012
-.TH FvwmConsoleC.pl 1 "01 February 2012 (2.6.4)" Fvwm "Fvwm Modules"
+.\" @(#)fvwm-2.6.5 20 April 2012
+.TH FvwmConsoleC.pl 1 "20 April 2012 (2.6.5)" Fvwm "Fvwm Modules"
.UC
.SH NAME
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/modules/FvwmCpp/FvwmCpp.1 new/fvwm-2.6.5/modules/FvwmCpp/FvwmCpp.1
--- old/fvwm-2.6.4/modules/FvwmCpp/FvwmCpp.1 2012-02-01 22:15:56.000000000 +0100
+++ new/fvwm-2.6.5/modules/FvwmCpp/FvwmCpp.1 2012-04-20 13:04:36.000000000 +0200
@@ -1,5 +1,5 @@
.\" t
-.\" @(#)fvwm-2.6.4 01 February 2012
+.\" @(#)fvwm-2.6.5 20 April 2012
.de EX \"Begin example
.ne 5
.if n .sp 1
@@ -13,7 +13,7 @@
.if n .sp 1
.if t .sp .5
..
-.TH FvwmCpp 1 "01 February 2012 (2.6.4)" Fvwm "Fvwm Modules"
+.TH FvwmCpp 1 "20 April 2012 (2.6.5)" Fvwm "Fvwm Modules"
.UC
.SH NAME
FvwmCpp \- the Fvwm Cpp pre-processor
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/modules/FvwmDragWell/FvwmDragWell.1 new/fvwm-2.6.5/modules/FvwmDragWell/FvwmDragWell.1
--- old/fvwm-2.6.4/modules/FvwmDragWell/FvwmDragWell.1 2012-02-01 22:15:56.000000000 +0100
+++ new/fvwm-2.6.5/modules/FvwmDragWell/FvwmDragWell.1 2012-04-20 13:04:36.000000000 +0200
@@ -1,6 +1,6 @@
.\" t
-.\" @(#)fvwm-2.6.4 01 February 2012
-.TH FvwmDragWell 1 "01 February 2012 (2.6.4)" Fvwm "Fvwm Modules"
+.\" @(#)fvwm-2.6.5 20 April 2012
+.TH FvwmDragWell 1 "20 April 2012 (2.6.5)" Fvwm "Fvwm Modules"
.UC
.SH NAME
FvwmDragWell \- A XDND drag well
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/modules/FvwmEvent/FvwmEvent.1 new/fvwm-2.6.5/modules/FvwmEvent/FvwmEvent.1
--- old/fvwm-2.6.4/modules/FvwmEvent/FvwmEvent.1 2012-02-01 22:15:56.000000000 +0100
+++ new/fvwm-2.6.5/modules/FvwmEvent/FvwmEvent.1 2012-04-20 13:04:36.000000000 +0200
@@ -1,6 +1,6 @@
.\" t
-.\" @(#)fvwm-2.6.4 01 February 2012
-.TH FvwmEvent 1 "01 February 2012 (2.6.4)" Fvwm "Fvwm Modules"
+.\" @(#)fvwm-2.6.5 20 April 2012
+.TH FvwmEvent 1 "20 April 2012 (2.6.5)" Fvwm "Fvwm Modules"
.UC
.SH NAME
\fIFvwmEvent\fP \- the fvwm event module
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/modules/FvwmForm/FvwmForm.1 new/fvwm-2.6.5/modules/FvwmForm/FvwmForm.1
--- old/fvwm-2.6.4/modules/FvwmForm/FvwmForm.1 2012-02-01 22:15:56.000000000 +0100
+++ new/fvwm-2.6.5/modules/FvwmForm/FvwmForm.1 2012-04-20 13:04:36.000000000 +0200
@@ -1,5 +1,5 @@
.\" Same macro as used in fvwm.1
-.\" @(#)fvwm-2.6.4 01 February 2012
+.\" @(#)fvwm-2.6.5 20 April 2012
.de EX \"Begin example
.ne 5
.if n .sp 1
@@ -13,7 +13,7 @@
.if n .sp 1
.if t .sp .5
..
-.TH FvwmForm 1 "01 February 2012 (2.6.4)" Fvwm "Fvwm Modules"
+.TH FvwmForm 1 "20 April 2012 (2.6.5)" Fvwm "Fvwm Modules"
.SH NAME
FvwmForm - input form module for Fvwm
.SH SYNOPSIS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/modules/FvwmGtk/FvwmGtk.1 new/fvwm-2.6.5/modules/FvwmGtk/FvwmGtk.1
--- old/fvwm-2.6.4/modules/FvwmGtk/FvwmGtk.1 2012-02-01 22:15:56.000000000 +0100
+++ new/fvwm-2.6.5/modules/FvwmGtk/FvwmGtk.1 2012-04-20 13:04:36.000000000 +0200
@@ -1,4 +1,4 @@
-.\" @(#)fvwm-2.6.4 01 February 2012
+.\" @(#)fvwm-2.6.5 20 April 2012
.de EX \"Begin example
.ne 5
.if n .sp 1
@@ -12,7 +12,7 @@
.if n .sp 1
.if t .sp .5
..
-.TH FvwmGtk 1 "01 February 2012 (2.6.4)" Fvwm "Fvwm Modules"
+.TH FvwmGtk 1 "20 April 2012 (2.6.5)" Fvwm "Fvwm Modules"
.UC
.SH NAME
\fBFvwmGtk\fP \- the fvwm GTK module
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/modules/FvwmIconBox/FvwmIconBox.1 new/fvwm-2.6.5/modules/FvwmIconBox/FvwmIconBox.1
--- old/fvwm-2.6.4/modules/FvwmIconBox/FvwmIconBox.1 2012-02-01 22:15:56.000000000 +0100
+++ new/fvwm-2.6.5/modules/FvwmIconBox/FvwmIconBox.1 2012-04-20 13:04:37.000000000 +0200
@@ -1,6 +1,6 @@
.\" t
-.\" @(#)fvwm-2.6.4 01 February 2012
-.TH FvwmIconBox 1 "01 February 2012 (2.6.4)" Fvwm "Fvwm Modules"
+.\" @(#)fvwm-2.6.5 20 April 2012
+.TH FvwmIconBox 1 "20 April 2012 (2.6.5)" Fvwm "Fvwm Modules"
.UC
.SH NAME
FvwmIconBox \- the fvwm icon box module
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/modules/FvwmIconMan/FvwmIconMan.1 new/fvwm-2.6.5/modules/FvwmIconMan/FvwmIconMan.1
--- old/fvwm-2.6.4/modules/FvwmIconMan/FvwmIconMan.1 2012-02-01 22:15:56.000000000 +0100
+++ new/fvwm-2.6.5/modules/FvwmIconMan/FvwmIconMan.1 2012-04-20 13:04:37.000000000 +0200
@@ -1,5 +1,5 @@
.\" t
-.\" @(#)fvwm-2.6.4 01 February 2012
+.\" @(#)fvwm-2.6.5 20 April 2012
.de EX \"Begin example
.ne 5
.if n .sp 1
@@ -13,7 +13,7 @@
.if n .sp 1
.if t .sp .5
..
-.TH FvwmIconMan 1 "01 February 2012 (2.6.4)" Fvwm "Fvwm Modules"
+.TH FvwmIconMan 1 "20 April 2012 (2.6.5)" Fvwm "Fvwm Modules"
.UC
.SH NAME
FvwmIconMan \- an fvwm icon manager
@@ -219,7 +219,7 @@
.IP "*FvwmIconMan: [id] Format \fIformatstring\fP"
A printf like format string which describes the string to be printed in the
manager window for each managed window. Possible flags are: %t, %i, %c, and
-%r for the window's title, icon, class, or resource name, respectively.
+%r for the window's title, icon title, class, or resource name, respectively.
The default is "%c: %i". \fBWarning\fP: m4 reserves the word \fIformat\fP,
so if you use m4, take appropriate action.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/modules/FvwmIconMan/FvwmIconMan.1.in new/fvwm-2.6.5/modules/FvwmIconMan/FvwmIconMan.1.in
--- old/fvwm-2.6.4/modules/FvwmIconMan/FvwmIconMan.1.in 2011-12-12 01:36:48.000000000 +0100
+++ new/fvwm-2.6.5/modules/FvwmIconMan/FvwmIconMan.1.in 2012-02-20 13:27:34.000000000 +0100
@@ -219,7 +219,7 @@
.IP "*FvwmIconMan: [id] Format \fIformatstring\fP"
A printf like format string which describes the string to be printed in the
manager window for each managed window. Possible flags are: %t, %i, %c, and
-%r for the window's title, icon, class, or resource name, respectively.
+%r for the window's title, icon title, class, or resource name, respectively.
The default is "%c: %i". \fBWarning\fP: m4 reserves the word \fIformat\fP,
so if you use m4, take appropriate action.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/modules/FvwmIdent/FvwmIdent.1 new/fvwm-2.6.5/modules/FvwmIdent/FvwmIdent.1
--- old/fvwm-2.6.4/modules/FvwmIdent/FvwmIdent.1 2012-02-01 22:15:56.000000000 +0100
+++ new/fvwm-2.6.5/modules/FvwmIdent/FvwmIdent.1 2012-04-20 13:04:37.000000000 +0200
@@ -1,6 +1,6 @@
.\" t
-.\" @(#)fvwm-2.6.4 01 February 2012
-.TH FvwmIdent 1 "01 February 2012 (2.6.4)" Fvwm "Fvwm Modules"
+.\" @(#)fvwm-2.6.5 20 April 2012
+.TH FvwmIdent 1 "20 April 2012 (2.6.5)" Fvwm "Fvwm Modules"
.UC
.SH NAME
FvwmIdent \- the Fvwm identify-window module
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/modules/FvwmM4/FvwmM4.1 new/fvwm-2.6.5/modules/FvwmM4/FvwmM4.1
--- old/fvwm-2.6.4/modules/FvwmM4/FvwmM4.1 2012-02-01 22:15:56.000000000 +0100
+++ new/fvwm-2.6.5/modules/FvwmM4/FvwmM4.1 2012-04-20 13:04:37.000000000 +0200
@@ -1,5 +1,5 @@
.\" t
-.\" @(#)fvwm-2.6.4 01 February 2012
+.\" @(#)fvwm-2.6.5 20 April 2012
.de EX \"Begin example
.ne 5
.if n .sp 1
@@ -13,7 +13,7 @@
.if n .sp 1
.if t .sp .5
..
-.TH FvwmM4 1 "01 February 2012 (2.6.4)" Fvwm "Fvwm Modules"
+.TH FvwmM4 1 "20 April 2012 (2.6.5)" Fvwm "Fvwm Modules"
.UC
.SH NAME
FvwmM4 \- the fvwm M4 pre-processor
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/modules/FvwmPager/FvwmPager.1 new/fvwm-2.6.5/modules/FvwmPager/FvwmPager.1
--- old/fvwm-2.6.4/modules/FvwmPager/FvwmPager.1 2012-02-01 22:15:56.000000000 +0100
+++ new/fvwm-2.6.5/modules/FvwmPager/FvwmPager.1 2012-04-20 13:04:37.000000000 +0200
@@ -1,6 +1,6 @@
.\" t
-.\" @(#)fvwm-2.6.4 01 February 2012
-.TH FvwmPager 1 "01 February 2012 (2.6.4)" Fvwm "Fvwm Modules"
+.\" @(#)fvwm-2.6.5 20 April 2012
+.TH FvwmPager 1 "20 April 2012 (2.6.5)" Fvwm "Fvwm Modules"
.UC
.SH NAME
FvwmPager \- the Fvwm Pager module
@@ -248,7 +248,7 @@
.IP "*FvwmPager: WindowLabelFormat \fIformat\fP"
This specifies a printf() like format for the labels in the mini
window. Possible flags are: %t, %i, %c, and %r for the window's
-title, icon, class, or resource name, respectively. The default
+title, icon title, class, or resource name, respectively. The default
is "%i".
.IP "*FvwmPager: Label \fIdesk label\fP"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/modules/FvwmPager/FvwmPager.1.in new/fvwm-2.6.5/modules/FvwmPager/FvwmPager.1.in
--- old/fvwm-2.6.4/modules/FvwmPager/FvwmPager.1.in 2007-08-07 22:17:43.000000000 +0200
+++ new/fvwm-2.6.5/modules/FvwmPager/FvwmPager.1.in 2012-02-20 13:27:34.000000000 +0100
@@ -248,7 +248,7 @@
.IP "*FvwmPager: WindowLabelFormat \fIformat\fP"
This specifies a printf() like format for the labels in the mini
window. Possible flags are: %t, %i, %c, and %r for the window's
-title, icon, class, or resource name, respectively. The default
+title, icon title, class, or resource name, respectively. The default
is "%i".
.IP "*FvwmPager: Label \fIdesk label\fP"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/modules/FvwmPager/x_pager.c new/fvwm-2.6.5/modules/FvwmPager/x_pager.c
--- old/fvwm-2.6.4/modules/FvwmPager/x_pager.c 2011-08-07 00:03:32.000000000 +0200
+++ new/fvwm-2.6.5/modules/FvwmPager/x_pager.c 2012-04-20 12:41:05.000000000 +0200
@@ -119,6 +119,7 @@
#define s_g_height 4
static char s_g_bits[] = {0x01, 0x02, 0x04, 0x08};
+#define label_border g_width
Window icon_win; /* icon window */
@@ -2739,6 +2740,64 @@
t, t->IconView, t->icon_view_width, t->icon_view_height);
}
+/* draw the window label with simple greedy wrapping */
+static void label_window_wrap(PagerWindow *t)
+{
+ char *cur, *next, *end;
+ int space_width, cur_width;
+
+ space_width = FlocaleTextWidth(FwindowFont, " ", 1);
+ cur_width = 0;
+
+ cur = next = t->window_label;
+ end = cur + strlen(cur);
+
+ while (*cur) {
+ while (*next) {
+ int width;
+ char *p;
+
+ if (!(p = strchr(next, ' ')))
+ p = end;
+
+ width = FlocaleTextWidth(FwindowFont, next, p - next );
+ if (width > t->pager_view_width - cur_width - space_width - 2*label_border)
+ break;
+ cur_width += width + space_width;
+ next = *p ? p + 1 : p;
+ }
+
+ if (cur == next) {
+ /* word too large for window */
+ while (*next) {
+ int len, width;
+
+ len = FlocaleStringNumberOfBytes(FwindowFont, next);
+ width = FlocaleTextWidth(FwindowFont, next, len);
+
+ if (width > t->pager_view_width - cur_width - 2*label_border && cur != next)
+ break;
+
+ next += len;
+ cur_width += width;
+ }
+ }
+
+ FwinString->str = safemalloc(next - cur + 1);
+ strncpy(FwinString->str, cur, next - cur);
+ FwinString->str[next - cur] = 0;
+
+ FlocaleDrawString(dpy, FwindowFont, FwinString, 0);
+
+ free(FwinString->str);
+ FwinString->str = NULL;
+
+ FwinString->y += FwindowFont->height;
+ cur = next;
+ cur_width = 0;
+ }
+}
+
static void do_label_window(PagerWindow *t, Window w)
{
int cs;
@@ -2776,7 +2835,6 @@
{
if (FftSupport && FwindowFont != NULL && FwindowFont->fftf.fftfont != NULL)
XClearWindow(dpy, w);
- FwinString->str = t->window_label;
FwinString->win = w;
FwinString->gc = Scr.NormalGC;
FwinString->flags.has_colorset = False;
@@ -2785,9 +2843,10 @@
FwinString->colorset = &Colorset[cs];
FwinString->flags.has_colorset = True;
}
- FwinString->x = 2;
+ FwinString->x = label_border;
FwinString->y = FwindowFont->ascent+2;
- FlocaleDrawString(dpy, FwindowFont, FwinString, 0);
+
+ label_window_wrap(t);
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/modules/FvwmProxy/FvwmProxy.1 new/fvwm-2.6.5/modules/FvwmProxy/FvwmProxy.1
--- old/fvwm-2.6.4/modules/FvwmProxy/FvwmProxy.1 2012-02-01 22:15:56.000000000 +0100
+++ new/fvwm-2.6.5/modules/FvwmProxy/FvwmProxy.1 2012-04-20 13:04:37.000000000 +0200
@@ -1,6 +1,6 @@
.\" t
-.\" @(#)fvwm-2.6.4 01 February 2012
-.TH FvwmProxy 1 "01 February 2012 (2.6.4)" Fvwm "Fvwm Modules"
+.\" @(#)fvwm-2.6.5 20 April 2012
+.TH FvwmProxy 1 "20 April 2012 (2.6.5)" Fvwm "Fvwm Modules"
.UC
.SH NAME
FvwmProxy \- the fvwm proxy module
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/modules/FvwmRearrange/FvwmRearrange.1 new/fvwm-2.6.5/modules/FvwmRearrange/FvwmRearrange.1
--- old/fvwm-2.6.4/modules/FvwmRearrange/FvwmRearrange.1 2012-02-01 22:15:56.000000000 +0100
+++ new/fvwm-2.6.5/modules/FvwmRearrange/FvwmRearrange.1 2012-04-20 13:04:37.000000000 +0200
@@ -1,5 +1,5 @@
.\" t
-.\" @(#)fvwm-2.6.4 01 February 2012
+.\" @(#)fvwm-2.6.5 20 April 2012
.de EX \"Begin example
.ne 5
.if n .sp 1
@@ -13,7 +13,7 @@
.if n .sp 1
.if t .sp .5
..
-.TH FvwmRearrange 1 "01 February 2012 (2.6.4)" Fvwm "Fvwm Modules"
+.TH FvwmRearrange 1 "20 April 2012 (2.6.5)" Fvwm "Fvwm Modules"
.UC
.SH NAME
FvwmRearrange \- rearrange fvwm windows
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/modules/FvwmSave/FvwmSave.1 new/fvwm-2.6.5/modules/FvwmSave/FvwmSave.1
--- old/fvwm-2.6.4/modules/FvwmSave/FvwmSave.1 2012-02-01 22:15:56.000000000 +0100
+++ new/fvwm-2.6.5/modules/FvwmSave/FvwmSave.1 2012-04-20 13:04:37.000000000 +0200
@@ -1,6 +1,6 @@
.\" t
-.\" @(#)fvwm-2.6.4 01 February 2012
-.TH FvwmSave 1 "01 February 2012 (2.6.4)" Fvwm "Fvwm Modules"
+.\" @(#)fvwm-2.6.5 20 April 2012
+.TH FvwmSave 1 "20 April 2012 (2.6.5)" Fvwm "Fvwm Modules"
.UC
.SH NAME
FvwmSave \- the Fvwm desktop-layout saving module
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/modules/FvwmSaveDesk/FvwmSaveDesk.1 new/fvwm-2.6.5/modules/FvwmSaveDesk/FvwmSaveDesk.1
--- old/fvwm-2.6.4/modules/FvwmSaveDesk/FvwmSaveDesk.1 2012-02-01 22:15:56.000000000 +0100
+++ new/fvwm-2.6.5/modules/FvwmSaveDesk/FvwmSaveDesk.1 2012-04-20 13:04:37.000000000 +0200
@@ -1,6 +1,6 @@
.\" t
-.\" @(#)fvwm-2.6.4 01 February 2012
-.TH FvwmSaveDesk 1 "01 February 2012 (2.6.4)" Fvwm "Fvwm Modules"
+.\" @(#)fvwm-2.6.5 20 April 2012
+.TH FvwmSaveDesk 1 "20 April 2012 (2.6.5)" Fvwm "Fvwm Modules"
.UC
.SH NAME
FvwmSaveDesk \- another fvwm desktop-layout saving module
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/modules/FvwmScript/FvwmScript.1 new/fvwm-2.6.5/modules/FvwmScript/FvwmScript.1
--- old/fvwm-2.6.4/modules/FvwmScript/FvwmScript.1 2012-02-01 22:15:56.000000000 +0100
+++ new/fvwm-2.6.5/modules/FvwmScript/FvwmScript.1 2012-04-20 13:04:37.000000000 +0200
@@ -1,5 +1,5 @@
.\" t
-.\" @(#)fvwm-2.6.4 01 February 2012
+.\" @(#)fvwm-2.6.5 20 April 2012
.de EX \"Begin example
.ne 5
.if n .sp 1
@@ -14,7 +14,7 @@
.if t .sp .5
..
.ta .3i .6i .9i 1.2i 1.5i 1.8i
-.TH FvwmScript 1 "01 February 2012 (2.6.4)" Fvwm "Fvwm Modules"
+.TH FvwmScript 1 "20 April 2012 (2.6.5)" Fvwm "Fvwm Modules"
.UC
.SH NAME
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/modules/FvwmScroll/FvwmScroll.1 new/fvwm-2.6.5/modules/FvwmScroll/FvwmScroll.1
--- old/fvwm-2.6.4/modules/FvwmScroll/FvwmScroll.1 2012-02-01 22:15:56.000000000 +0100
+++ new/fvwm-2.6.5/modules/FvwmScroll/FvwmScroll.1 2012-04-20 13:04:37.000000000 +0200
@@ -1,6 +1,6 @@
.\" t
-.\" @(#)fvwm-2.6.4 01 February 2012
-.TH FvwmScroll 1 "01 February 2012 (2.6.4)" Fvwm "Fvwm Modules"
+.\" @(#)fvwm-2.6.5 20 April 2012
+.TH FvwmScroll 1 "20 April 2012 (2.6.5)" Fvwm "Fvwm Modules"
.UC
.SH NAME
FvwmScroll \- the fvwm scroll-bar module
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/modules/FvwmTaskBar/FvwmTaskBar.1 new/fvwm-2.6.5/modules/FvwmTaskBar/FvwmTaskBar.1
--- old/fvwm-2.6.4/modules/FvwmTaskBar/FvwmTaskBar.1 2012-02-01 22:15:56.000000000 +0100
+++ new/fvwm-2.6.5/modules/FvwmTaskBar/FvwmTaskBar.1 2012-04-20 13:04:37.000000000 +0200
@@ -1,6 +1,6 @@
.\" t
-.\" @(#)fvwm-2.6.4 01 February 2012
-.TH FvwmTaskBar 1 "01 February 2012 (2.6.4)" Fvwm "Fvwm Modules"
+.\" @(#)fvwm-2.6.5 20 April 2012
+.TH FvwmTaskBar 1 "20 April 2012 (2.6.5)" Fvwm "Fvwm Modules"
.UC
.SH NAME
FvwmTaskBar \- the fvwm taskbar module
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/modules/FvwmTheme/FvwmTheme.1 new/fvwm-2.6.5/modules/FvwmTheme/FvwmTheme.1
--- old/fvwm-2.6.4/modules/FvwmTheme/FvwmTheme.1 2012-02-01 22:15:56.000000000 +0100
+++ new/fvwm-2.6.5/modules/FvwmTheme/FvwmTheme.1 2012-04-20 13:04:37.000000000 +0200
@@ -1,5 +1,5 @@
.\" t
-.\" @(#)fvwm-2.6.4 01 February 2012
+.\" @(#)fvwm-2.6.5 20 April 2012
.de EX \"Begin example
.ne 5
.if n .sp 1
@@ -14,7 +14,7 @@
.if t .sp .5
..
.ta .3i .6i .9i 1.2i 1.5i 1.8i
-.TH FvwmTheme 1 "01 February 2012 (2.6.4)" Fvwm "Fvwm Modules"
+.TH FvwmTheme 1 "20 April 2012 (2.6.5)" Fvwm "Fvwm Modules"
.UC
.SH NAME
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/modules/FvwmWharf/FvwmWharf.1 new/fvwm-2.6.5/modules/FvwmWharf/FvwmWharf.1
--- old/fvwm-2.6.4/modules/FvwmWharf/FvwmWharf.1 2012-02-01 22:15:57.000000000 +0100
+++ new/fvwm-2.6.5/modules/FvwmWharf/FvwmWharf.1 2012-04-20 13:04:37.000000000 +0200
@@ -1,5 +1,5 @@
-.\" @(#)fvwm-2.6.4 01 February 2012
-.TH FvwmWharf 1 "01 February 2012 (2.6.4)" Fvwm "Fvwm Modules"
+.\" @(#)fvwm-2.6.5 20 April 2012
+.TH FvwmWharf 1 "20 April 2012 (2.6.5)" Fvwm "Fvwm Modules"
.UC
.SH NAME
FvwmWharf \- the AfterStep application "dock" module ported to
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/modules/FvwmWinList/FvwmWinList.1 new/fvwm-2.6.5/modules/FvwmWinList/FvwmWinList.1
--- old/fvwm-2.6.4/modules/FvwmWinList/FvwmWinList.1 2012-02-01 22:15:57.000000000 +0100
+++ new/fvwm-2.6.5/modules/FvwmWinList/FvwmWinList.1 2012-04-20 13:04:37.000000000 +0200
@@ -1,6 +1,6 @@
.\" t
-.\" @(#)fvwm-2.6.4 01 February 2012
-.TH FvwmWinList 1 "01 February 2012 (2.6.4)" Fvwm "Fvwm Modules"
+.\" @(#)fvwm-2.6.5 20 April 2012
+.TH FvwmWinList 1 "20 April 2012 (2.6.5)" Fvwm "Fvwm Modules"
.UC
.SH NAME
FvwmWinList \- the fvwm window list module
Files old/fvwm-2.6.4/po/FvwmScript.ar.gmo and new/fvwm-2.6.5/po/FvwmScript.ar.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/po/FvwmScript.ar.po new/fvwm-2.6.5/po/FvwmScript.ar.po
--- old/fvwm-2.6.4/po/FvwmScript.ar.po 2011-08-06 19:09:14.000000000 +0200
+++ new/fvwm-2.6.5/po/FvwmScript.ar.po 2012-04-20 13:06:43.000000000 +0200
@@ -10,6 +10,7 @@
"PO-Revision-Date: 2003-04-13 11:35+0200\n"
"Last-Translator: NEEDS TRANSLATION \n"
"Language-Team: Should be Arabic \n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ascii\n"
"Content-Transfer-Encoding: 8bit\n"
Files old/fvwm-2.6.4/po/FvwmScript.de.gmo and new/fvwm-2.6.5/po/FvwmScript.de.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/po/FvwmScript.de.po new/fvwm-2.6.5/po/FvwmScript.de.po
--- old/fvwm-2.6.4/po/FvwmScript.de.po 2011-08-06 19:09:14.000000000 +0200
+++ new/fvwm-2.6.5/po/FvwmScript.de.po 2012-04-20 13:06:43.000000000 +0200
@@ -10,6 +10,7 @@
"PO-Revision-Date: 2003-04-13 11:35+0200\n"
"Last-Translator: Andrei Mitrofanow \n"
"Language-Team: German\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-15\n"
"Content-Transfer-Encoding: 8bit\n"
Files old/fvwm-2.6.4/po/FvwmScript.fr.gmo and new/fvwm-2.6.5/po/FvwmScript.fr.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/po/FvwmScript.fr.po new/fvwm-2.6.5/po/FvwmScript.fr.po
--- old/fvwm-2.6.4/po/FvwmScript.fr.po 2011-08-06 19:09:14.000000000 +0200
+++ new/fvwm-2.6.5/po/FvwmScript.fr.po 2012-04-20 13:06:43.000000000 +0200
@@ -11,6 +11,7 @@
"PO-Revision-Date: 2003-04-13 11:35+0200\n"
"Last-Translator: Olivier Chapuis \n"
"Language-Team: French\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-15\n"
"Content-Transfer-Encoding: 8bit\n"
Files old/fvwm-2.6.4/po/FvwmScript.sv_SE.gmo and new/fvwm-2.6.5/po/FvwmScript.sv_SE.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/po/FvwmScript.sv_SE.po new/fvwm-2.6.5/po/FvwmScript.sv_SE.po
--- old/fvwm-2.6.4/po/FvwmScript.sv_SE.po 2011-08-06 19:09:14.000000000 +0200
+++ new/fvwm-2.6.5/po/FvwmScript.sv_SE.po 2012-04-20 13:06:43.000000000 +0200
@@ -11,6 +11,7 @@
"PO-Revision-Date: 2003-10-19 13:33+0200\n"
"Last-Translator: Johan Svedberg \n"
"Language-Team: Swedish\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
Files old/fvwm-2.6.4/po/FvwmScript.zh_CN.gmo and new/fvwm-2.6.5/po/FvwmScript.zh_CN.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/po/FvwmScript.zh_CN.po new/fvwm-2.6.5/po/FvwmScript.zh_CN.po
--- old/fvwm-2.6.4/po/FvwmScript.zh_CN.po 2011-08-06 19:09:14.000000000 +0200
+++ new/fvwm-2.6.5/po/FvwmScript.zh_CN.po 2012-04-20 13:06:43.000000000 +0200
@@ -10,6 +10,7 @@
"PO-Revision-Date: 2004-05-22 16:16+0800\n"
"Last-Translator: Funda Wang \n"
"Language-Team: zh_CN \n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
Files old/fvwm-2.6.4/po/FvwmTaskBar.ar.gmo and new/fvwm-2.6.5/po/FvwmTaskBar.ar.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/po/FvwmTaskBar.ar.po new/fvwm-2.6.5/po/FvwmTaskBar.ar.po
--- old/fvwm-2.6.4/po/FvwmTaskBar.ar.po 2011-08-06 19:09:14.000000000 +0200
+++ new/fvwm-2.6.5/po/FvwmTaskBar.ar.po 2012-04-20 13:06:43.000000000 +0200
@@ -10,6 +10,7 @@
"PO-Revision-Date: 2002-12-06 08:25+0100\n"
"Last-Translator: Nadim Shaikli \n"
"Language-Team: Arabic\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
Files old/fvwm-2.6.4/po/FvwmTaskBar.de.gmo and new/fvwm-2.6.5/po/FvwmTaskBar.de.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/po/FvwmTaskBar.de.po new/fvwm-2.6.5/po/FvwmTaskBar.de.po
--- old/fvwm-2.6.4/po/FvwmTaskBar.de.po 2011-08-06 19:09:14.000000000 +0200
+++ new/fvwm-2.6.5/po/FvwmTaskBar.de.po 2012-04-20 13:06:43.000000000 +0200
@@ -10,6 +10,7 @@
"PO-Revision-Date: 2002-11-27 21:29+0100\n"
"Last-Translator: Andrei Mitrofanow \n"
"Language-Team: German\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-15\n"
"Content-Transfer-Encoding: 8bit\n"
Files old/fvwm-2.6.4/po/FvwmTaskBar.fr.gmo and new/fvwm-2.6.5/po/FvwmTaskBar.fr.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/po/FvwmTaskBar.fr.po new/fvwm-2.6.5/po/FvwmTaskBar.fr.po
--- old/fvwm-2.6.4/po/FvwmTaskBar.fr.po 2011-08-06 19:09:14.000000000 +0200
+++ new/fvwm-2.6.5/po/FvwmTaskBar.fr.po 2012-04-20 13:06:43.000000000 +0200
@@ -11,6 +11,7 @@
"PO-Revision-Date: 2002-11-27 21:29+0100\n"
"Last-Translator: Olivier Chapuis \n"
"Language-Team: French\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-15\n"
"Content-Transfer-Encoding: 8bit\n"
Files old/fvwm-2.6.4/po/FvwmTaskBar.sv_SE.gmo and new/fvwm-2.6.5/po/FvwmTaskBar.sv_SE.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/po/FvwmTaskBar.sv_SE.po new/fvwm-2.6.5/po/FvwmTaskBar.sv_SE.po
--- old/fvwm-2.6.4/po/FvwmTaskBar.sv_SE.po 2011-08-06 19:09:14.000000000 +0200
+++ new/fvwm-2.6.5/po/FvwmTaskBar.sv_SE.po 2012-04-20 13:06:43.000000000 +0200
@@ -11,6 +11,7 @@
"PO-Revision-Date: 2003-10-19 13:34+0200\n"
"Last-Translator: Johan Svedberg \n"
"Language-Team: Swedish\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
Files old/fvwm-2.6.4/po/FvwmTaskBar.zh_CN.gmo and new/fvwm-2.6.5/po/FvwmTaskBar.zh_CN.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/po/FvwmTaskBar.zh_CN.po new/fvwm-2.6.5/po/FvwmTaskBar.zh_CN.po
--- old/fvwm-2.6.4/po/FvwmTaskBar.zh_CN.po 2011-08-06 19:09:14.000000000 +0200
+++ new/fvwm-2.6.5/po/FvwmTaskBar.zh_CN.po 2012-04-20 13:06:43.000000000 +0200
@@ -10,6 +10,7 @@
"PO-Revision-Date: 2004-05-22 16:17+0800\n"
"Last-Translator: Funda Wang \n"
"Language-Team: zh_CN \n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fvwm-2.6.4/rpm/fvwm.spec new/fvwm-2.6.5/rpm/fvwm.spec
--- old/fvwm-2.6.4/rpm/fvwm.spec 2012-02-01 22:15:57.000000000 +0100
+++ new/fvwm-2.6.5/rpm/fvwm.spec 2012-04-20 13:04:37.000000000 +0200
@@ -1,7 +1,7 @@
#%define prefix %{_prefix}
%define prefix /usr
-%define ver 2.6.4
+%define ver 2.6.5
%define rel 1
%define c_p --without-gnome --without-rplay-library --sysconfdir=/etc
%define m_p CFLAGS="-O2"
++++++ fvwm-menu-desktop-config.fpl ++++++
# Uage: Module FvwmPerl -l fvwm-menu-desktop-config.fpl
# This script generates an FvwmForm similar to the FvwmForm-Desktop by
# Dan Espen but inserts the found xdg menus dynamically into the Form
# before processed.
# Author: Thomas Funk
# Version: 1.3
package MenuConfig;
use File::Basename;
use strict;
use warnings;
#open(MSG ,">>/tmp/log.txt") || die "Error $!";
my $modname = 'FvwmForm-Desktop-Config';
my $all = `fvwm-menu-desktop --get-menus all`;
my $selected = `fvwm-menu-desktop --get-menus desktop`;
my @all_filelist = split(/ /,$all);
my @selected_filelist = split(/ /,$selected);
my %all_menus = ();
my %selected__menus = ();
my $max_length = 0;
foreach my $path (@selected_filelist) {
my ($filename, $directories, $suffix) = fileparse($path, qr/\.[^.]*/);
push (@{$selected__menus{$directories}}, $filename);
}
my $i = 1;
foreach my $path (@all_filelist) {
my $name = "MEN" . $i;
# qr matched against the end of the $filename.
# The matching portion is removed and becomes the $suffix.
my ($filename, $directories, $suffix) = fileparse($path, qr/\.[^.]*/);
push (@{$all_menus{$directories}{$i}}, ($filename, $name, "off"));
next if !defined $selected__menus{$directories};
foreach my $hit (@{$selected__menus{$directories}}) {
if ($filename eq $hit) {
pop (@{$all_menus{$directories}{$i}});
push (@{$all_menus{$directories}{$i}}, "on");
}
}
$max_length = length($filename) if ($max_length < length($filename));
$i++;
}
my $fvwmform_commands = "
DestroyModuleConfig ${modname}: *
*${modname}: Title \"\$[gt.Fvwm Menu Desktop Config]\"
*${modname}: WarpPointer
*${modname}: Line center
*${modname}: Text \"\$[gt.Fvwm Menu Desktop Config]\"
*${modname}: Line
*${modname}: Separator
*${modname}: Line center
*${modname}: Text \"\$[gt.Multiple Menu]\"
*${modname}: Line
";
if (scalar keys %all_menus != 0) {
foreach my $key (sort( keys %all_menus)) {
$fvwmform_commands .= "
*${modname}: Line left
*${modname}: Text \"\$[gt.Menus in]\"
*${modname}: Text \" $key\"
*${modname}: Line left
*${modname}: Selection meth multiple
";
my $m_count = 0;
foreach my $count (sort(keys %{$all_menus{$key}})) {
my @menu = @{$all_menus{$key}{$count}};
my $newstring = $menu[0] . ' ' x eval($max_length-length($menu[0]));
$fvwmform_commands .= "*${modname}: Choice $menu[1] $menu[1] $menu[2] \"$newstring\"
";
$m_count++;
if ($m_count == 3) {
$fvwmform_commands .= "
*${modname}: Line left
*${modname}: Selection meth multiple
";
$m_count = 0;
}
}
$fvwmform_commands .= "
*${modname}: Line left
*${modname}: Text \" \"
";
}
}
else {
$fvwmform_commands .= "
*${modname}: Line center
*${modname}: Text \"\$[gt.No menus found! Check why from within a terminal with]\"
*${modname}: Line center
*${modname}: Text \"'fvwm-menu-desktop -v'\"
*${modname}: Line left
*${modname}: Text \" \"
";
}
$fvwmform_commands .= "
*${modname}: Line
*${modname}: Separator
*${modname}: Line center
*${modname}: Text \"\$[gt.General Options]\"
*${modname}: Line
*${modname}: Line Left
*${modname}: Text \"\$[gt.Use Icons in Menus? ]\"
*${modname}: Selection SelItype single
*${modname}: Choice IconsOn IconsOn on \"\$[gt.Yes]\"
*${modname}: Choice IconsOff IconsOff off \"\$[gt.No]\"
*${modname}: Line left
*${modname}: Text \"\$[gt.Icon size: ]\"
*${modname}: Input Size 2 \"\"
*${modname}: Text \"\$[gt. (in pixels. Default is 24)]\"
*${modname}: Line left
*${modname}: Text \"\$[gt.Converted Icon directory: ]\"
*${modname}: Input IconDir 25 \"~/.fvwm/icons\"
*${modname}: Text \"\$[gt. (Directory for converted icons)]\"
*${modname}: Line Left
*${modname}: Text \"\$[gt.Use Titles in Menus? ]\"
*${modname}: Selection SelItype single
*${modname}: Choice TitlesOn TitlesOn on \"\$[gt.Yes]\"
*${modname}: Choice TitlesOff TitlesOff off \"\$[gt.No]\"
*${modname}: Line Left
*${modname}: Text \"\$[gt.Insert Menu(s) in a Menu? ]\"
*${modname}: Selection SelItype single
*${modname}: Choice InsertOn InsertOn off \"\$[gt.Yes]\"
*${modname}: Choice InsertOff InsertOff on \"\$[gt.No]\"
*${modname}: Text \"\$[gt.Top title name: ]\"
*${modname}: Input InMenu 20 \"\"
*${modname}: Line left
*${modname}: Text \"\$[gt.Used Icon theme: ]\"
*${modname}: Input Theme 20 \"\"
*${modname}: Text \"\$[gt. (Theme name for icon selection)]\"
*${modname}: Line left
*${modname}: Line
*${modname}: Line
*${modname}: Separator
*${modname}: Line center
*${modname}: Text \"\$[gt.Single Menu]\"
*${modname}: Line
*${modname}: Line Left
*${modname}: Text \"\$[gt.If you want a single menu only deselect all menus above and fill out]\"
*${modname}: Line Left
*${modname}: Text \"\$[gt.the fields below. But remember, if the menu doesn't exist, nothing happens.]\"
*${modname}: Line
*${modname}: Line left
*${modname}: Text \"\$[gt.Menu Top Title:]\"
*${modname}: Input Title 20 \"\"
*${modname}: Text \"\$[gt. (Eg. FvwmTestMenu)]\"
*${modname}: Line left
*${modname}: Text \"\$[gt.Install-Prefix:]\"
*${modname}: Input Installprefix 20 \"\"
*${modname}: Text \"\$[gt. (Eg. /etc/xdg/menus/)]\"
*${modname}: Line left
*${modname}: Text \"\$[gt.Desktop: ]\"
*${modname}: Input Desktop 20 \"\"
*${modname}: Text \"\$[gt. (Eg. gnome, kde, xfce, lxde)]\"
*${modname}: Line left
*${modname}: Text \"\$[gt.Menutype: ]\"
*${modname}: Input Menutype 20 \"\"
*${modname}: Text \"\$[gt. (Eg. applications, settings)]\"
*${modname}: Line left
*${modname}: Text \"\$[gt.Output path: ]\"
*${modname}: Input Path 25 \"\$FVWM_USERDIR/.menu\"
*${modname}: Text \"\$[gt. (Full path to store output)]\"
*${modname}: Line left
*${modname}: Line
*${modname}: Line
*${modname}: Separator
*${modname}: Line center
*${modname}: Text \"\$[gt.Actions]\"
*${modname}: Line left
*${modname}: Line
*${modname}: Line center
*${modname}: Selection SelItype single
*${modname}: Choice MultiOn MultiOn on \"\$[gt.Multiple]\"
*${modname}: Choice MultiOff MultiOff off \"\$[gt.Single]\"
*${modname}: Line
*${modname}: Separator
*${modname}: Line expand
*${modname}: Button continue \"\$[gt.Generate Menu(s)]\"
*${modname}: Command PipeRead 'fvwm-menu-desktop \\
\$(IconsOn\?--enable-mini-icons )\\
\$(Size\?-s \$(Size) )\\
\$(TitlesOn\?--with-titles )\\
\$(InsertOn\?--insert-in-menu \$(InMenu) )\\
\$(IconDir\?--mini-icon-dir \$(IconDir) )\\
\$(Title\?--title \$(Title) )\\
\$(Installprefix\?--install-prefix \$(Installprefix) )\\
\$(Desktop\?--desktop \$(Desktop) )\\
\$(Menutype\?--menutype \$(Menutype) )\\
\$(Theme\?--theme \$(Theme) )\\
\$(MultiOn\?--set-menus \"\\
";
foreach my $key (keys %all_menus) {
foreach my $file (keys %{$all_menus{$key}}) {
my @menu = @{$all_menus{$key}{$file}};
$fvwmform_commands .= "\$($menu[1]\?$key$menu[0].menu )\\\n";
}
}
$fvwmform_commands .= "\") \$(Path\? > \$(Path)) 2> ~/.xsession-errors && echo \"Read \$(Path\? \$(Path))\"'
*${modname}: Button continue \"\$[gt.Save Settings]\"
# Before saving the data, remove any previously saved data:
*${modname}: Command DestroyModuleConfig ${modname}Default: *
*${modname}: Command !( /bin/echo \\
\"# This file last created by ${modname} on: `/bin/date`.\"; /bin/echo \\
";
foreach my $key (keys %all_menus) {
foreach my $count (keys %{$all_menus{$key}}) {
my @menu = @{$all_menus{$key}{$count}};
$fvwmform_commands .= " '*${modname}Default: $menu[1] \$($menu[1]\?on) ' ; /bin/echo \\
";
}
}
$fvwmform_commands .= ") > \$FVWM_USERDIR/.${modname}
*${modname}: Command !( /bin/echo \\
'*${modname}Default: IconsOn \$(IconsOn\?on) ' ; /bin/echo \\
'*${modname}Default: IconsOff \$(IconsOff\?on) ' ; /bin/echo \\
'*${modname}Default: Size \$(Size) ' ; /bin/echo \\
'*${modname}Default: TitlesOn \$(TitlesOn\?on) ' ; /bin/echo \\
'*${modname}Default: TitlesOff \$(TitlesOff\?on) ' ; /bin/echo \\
'*${modname}Default: InsertOn \$(InsertOn\?on) ' ; /bin/echo \\
'*${modname}Default: InsertOff \$(InsertOff\?on) ' ; /bin/echo \\
'*${modname}Default: InMenu \$(InMenu) ' ; /bin/echo \\
'*${modname}Default: Theme \$(Theme) ' \\
) >> \$FVWM_USERDIR/.${modname}
*${modname}: Command !( /bin/echo \\
'*${modname}Default: Title \$(Title) ' ; /bin/echo \\
'*${modname}Default: Installprefix \$(Installprefix) ' ; /bin/echo \\
'*${modname}Default: Desktop \$(Desktop) ' ; /bin/echo \\
'*${modname}Default: Menutype \$(Menutype) ' ; /bin/echo \\
'*${modname}Default: Path \$(Path) ' ; /bin/echo \\
'*${modname}Default: IconDir \$(IconDir) ' ; /bin/echo \\
'*${modname}Default: MultiOn \$(MultiOn\?on) ' ; /bin/echo \\
'*${modname}Default: MultiOff \$(MultiOff\?on) ' \\
) >> \$FVWM_USERDIR/.${modname}
*${modname}: Button restart \"\$[gt.Reset]\"
*${modname}: Command Nop
*${modname}: Button continue \"\$[gt.Help]\"
*${modname}: Command Exec exec xterm -g 100x50 -n \"Help fvwm-menu-desktop\" -T \"Help fvwm-menu-desktop\" -e \"man fvwm-menu-desktop\" &
*${modname}: Button quit \"\$[gt.Quit]\"
*${modname}: Command Nop
# Tell ${modname} to read vars from .${modname}Default file:
*${modname}: UseData .${modname} *${modname}Default
";
# We are just asked to open a window, give fvwm a chance to do it
::unlock();
$fvwmform_commands =~ s/^\s+//; # trim leading whitespace
::command(qq[
$fvwmform_commands
FvwmForm ${modname}
]);
#print MSG "$fvwmform_commands\n\n";
#close(MSG);
# Local Variables:
# mode: perl
# End:
++++++ fvwm-rsvg.patch ++++++
--- configure
+++ configure 2013-07-18 11:31:57.449439339 +0000
@@ -9461,7 +9461,6 @@ else
/* end confdefs.h. */
#include
- #include
int main() {
RsvgHandle *rsvg;
g_type_init();
--- configure.ac
+++ configure.ac 2013-07-18 11:32:12.985439431 +0000
@@ -941,7 +941,6 @@ if test x"$with_rsvg" = xyes ; then
LIBS="$LIBS $rsvg_LIBS"
AC_TRY_RUN([
#include
- #include
int main() {
RsvgHandle *rsvg;
g_type_init();
--- libs/Fsvg.h
+++ libs/Fsvg.h 2013-07-18 11:31:31.785438953 +0000
@@ -15,7 +15,6 @@
#if USE_SVG
# include
-# include
typedef RsvgDimensionData FRsvgDimensionData;
typedef RsvgHandle FRsvgHandle;
++++++ fvwm-snapshot.patch ++++++
++++ 14476 lines (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org