[arch-commits] Commit in xfwm4/repos (10 files)
Evangelos Foutras
foutrelis at archlinux.org
Thu Jul 19 16:30:24 UTC 2012
Date: Thursday, July 19, 2012 @ 12:30:24
Author: foutrelis
Revision: 163772
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
xfwm4/repos/extra-i686/PKGBUILD
(from rev 163771, xfwm4/trunk/PKGBUILD)
xfwm4/repos/extra-i686/xfwm4-4.10.0-implement-NET_WM_MOVERESIZE_CANCEL.patch
(from rev 163771, xfwm4/trunk/xfwm4-4.10.0-implement-NET_WM_MOVERESIZE_CANCEL.patch)
xfwm4/repos/extra-i686/xfwm4.install
(from rev 163771, xfwm4/trunk/xfwm4.install)
xfwm4/repos/extra-x86_64/PKGBUILD
(from rev 163771, xfwm4/trunk/PKGBUILD)
xfwm4/repos/extra-x86_64/xfwm4-4.10.0-implement-NET_WM_MOVERESIZE_CANCEL.patch
(from rev 163771, xfwm4/trunk/xfwm4-4.10.0-implement-NET_WM_MOVERESIZE_CANCEL.patch)
xfwm4/repos/extra-x86_64/xfwm4.install
(from rev 163771, xfwm4/trunk/xfwm4.install)
Deleted:
xfwm4/repos/extra-i686/PKGBUILD
xfwm4/repos/extra-i686/xfwm4.install
xfwm4/repos/extra-x86_64/PKGBUILD
xfwm4/repos/extra-x86_64/xfwm4.install
--------------------------------------------------------------------+
extra-i686/PKGBUILD | 89 +++++-----
extra-i686/xfwm4-4.10.0-implement-NET_WM_MOVERESIZE_CANCEL.patch | 84 +++++++++
extra-i686/xfwm4.install | 26 +-
extra-x86_64/PKGBUILD | 89 +++++-----
extra-x86_64/xfwm4-4.10.0-implement-NET_WM_MOVERESIZE_CANCEL.patch | 84 +++++++++
extra-x86_64/xfwm4.install | 26 +-
6 files changed, 288 insertions(+), 110 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-07-19 16:29:57 UTC (rev 163771)
+++ extra-i686/PKGBUILD 2012-07-19 16:30:24 UTC (rev 163772)
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
-# Contributor: tobias <tobias funnychar archlinux.org>
-
-pkgname=xfwm4
-pkgver=4.10.0
-pkgrel=1
-pkgdesc="Xfce window manager"
-arch=('i686' 'x86_64')
-url="http://www.xfce.org/"
-license=('GPL2')
-groups=('xfce4')
-depends=('libxfce4ui' 'libwnck' 'hicolor-icon-theme')
-makedepends=('intltool')
-options=('!libtool')
-install=$pkgname.install
-source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2)
-sha256sums=('492357bf48121ebffabf2bf0d3b84213d19bf81087321175d687c8a68efe1f9c')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --libexecdir=/usr/lib \
- --localstatedir=/var \
- --disable-static \
- --enable-startup-notification \
- --enable-randr \
- --enable-compositor \
- --enable-xsync \
- --disable-debug
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: xfwm4/repos/extra-i686/PKGBUILD (from rev 163771, xfwm4/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-07-19 16:30:24 UTC (rev 163772)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: tobias <tobias funnychar archlinux.org>
+
+pkgname=xfwm4
+pkgver=4.10.0
+pkgrel=2
+pkgdesc="Xfce window manager"
+arch=('i686' 'x86_64')
+url="http://www.xfce.org/"
+license=('GPL2')
+groups=('xfce4')
+depends=('libxfce4ui' 'libwnck' 'hicolor-icon-theme')
+makedepends=('intltool')
+options=('!libtool')
+install=$pkgname.install
+source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2
+ xfwm4-4.10.0-implement-NET_WM_MOVERESIZE_CANCEL.patch)
+sha256sums=('492357bf48121ebffabf2bf0d3b84213d19bf81087321175d687c8a68efe1f9c'
+ 'f088a56cc05d1856af8d68dae9e40bc53b724d9dde4d8c2b78a88922c0ee6d1d')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # Fix https://bugzilla.xfce.org/show_bug.cgi?id=8949 (FS#29970)
+ patch -Np1 -i "$srcdir/xfwm4-4.10.0-implement-NET_WM_MOVERESIZE_CANCEL.patch"
+
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --libexecdir=/usr/lib \
+ --localstatedir=/var \
+ --disable-static \
+ --enable-startup-notification \
+ --enable-randr \
+ --enable-compositor \
+ --enable-xsync \
+ --disable-debug
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
Copied: xfwm4/repos/extra-i686/xfwm4-4.10.0-implement-NET_WM_MOVERESIZE_CANCEL.patch (from rev 163771, xfwm4/trunk/xfwm4-4.10.0-implement-NET_WM_MOVERESIZE_CANCEL.patch)
===================================================================
--- extra-i686/xfwm4-4.10.0-implement-NET_WM_MOVERESIZE_CANCEL.patch (rev 0)
+++ extra-i686/xfwm4-4.10.0-implement-NET_WM_MOVERESIZE_CANCEL.patch 2012-07-19 16:30:24 UTC (rev 163772)
@@ -0,0 +1,84 @@
+From 099614e3f045e06db7ab509e174510ea74857adb Mon Sep 17 00:00:00 2001
+From: Olivier Fourdan <fourdan at xfce.org>
+Date: Wed, 18 Jul 2012 20:12:07 +0000
+Subject: Implement NET_WM_MOVERESIZE_CANCEL message (bug #8949)
+
+as gtk+-3.4 now uses it.
+---
+diff --git a/src/display.h b/src/display.h
+index 1ad2ef8..8797237 100644
+--- a/src/display.h
++++ b/src/display.h
+@@ -163,7 +163,8 @@ enum
+ NET_WM_MOVERESIZE_SIZE_LEFT,
+ NET_WM_MOVERESIZE_MOVE,
+ NET_WM_MOVERESIZE_SIZE_KEYBOARD,
+- NET_WM_MOVERESIZE_MOVE_KEYBOARD
++ NET_WM_MOVERESIZE_MOVE_KEYBOARD,
++ NET_WM_MOVERESIZE_CANCEL
+ };
+
+ enum
+diff --git a/src/moveresize.c b/src/moveresize.c
+index 9893c30..a98bdf7 100644
+--- a/src/moveresize.c
++++ b/src/moveresize.c
+@@ -827,7 +827,7 @@ clientMoveEventFilter (XEvent * xevent, gpointer data)
+ eventFilterStatus status = EVENT_FILTER_STOP;
+ MoveResizeData *passdata = (MoveResizeData *) data;
+ Client *c = NULL;
+- gboolean moving = TRUE;
++ gboolean moving;
+ XWindowChanges wc;
+ int prev_x, prev_y;
+
+@@ -840,6 +840,12 @@ clientMoveEventFilter (XEvent * xevent, gpointer data)
+ display_info = screen_info->display_info;
+ configure_flags = NO_CFG_FLAG;
+
++ /*
++ * Clients may choose to end the move operation,
++ * we use XFWM_FLAG_MOVING_RESIZING for that.
++ */
++ moving = FLAG_TEST (c->xfwm_flags, XFWM_FLAG_MOVING_RESIZING);
++
+ /* Update the display time */
+ myDisplayUpdateCurrentTime (display_info, xevent);
+
+@@ -1294,7 +1300,12 @@ clientResizeEventFilter (XEvent * xevent, gpointer data)
+ screen_info = c->screen_info;
+ display_info = screen_info->display_info;
+ status = EVENT_FILTER_STOP;
+- resizing = TRUE;
++
++ /*
++ * Clients may choose to end the resize operation,
++ * we use XFWM_FLAG_MOVING_RESIZING for that.
++ */
++ resizing = FLAG_TEST (c->xfwm_flags, XFWM_FLAG_MOVING_RESIZING);
+
+ frame_x = frameX (c);
+ frame_y = frameY (c);
+diff --git a/src/netwm.c b/src/netwm.c
+index 545e64a..1352f08 100644
+--- a/src/netwm.c
++++ b/src/netwm.c
+@@ -695,10 +695,15 @@ clientNetMoveResize (Client * c, XClientMessageEvent * ev)
+ resize = TRUE; /* Resize */
+ break;
+ case NET_WM_MOVERESIZE_MOVE:
+- default:
+ event->type = ButtonPress;
+ resize = FALSE; /* Move */
+ break;
++ case NET_WM_MOVERESIZE_CANCEL:
++ FLAG_UNSET (c->xfwm_flags, XFWM_FLAG_MOVING_RESIZING);
++ /* Walk through */
++ default: /* Do nothing */
++ return;
++ break;
+ }
+
+ if (!FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN))
+--
+cgit v0.9.0.3
Deleted: extra-i686/xfwm4.install
===================================================================
--- extra-i686/xfwm4.install 2012-07-19 16:29:57 UTC (rev 163771)
+++ extra-i686/xfwm4.install 2012-07-19 16:30:24 UTC (rev 163772)
@@ -1,13 +0,0 @@
-post_install() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: xfwm4/repos/extra-i686/xfwm4.install (from rev 163771, xfwm4/trunk/xfwm4.install)
===================================================================
--- extra-i686/xfwm4.install (rev 0)
+++ extra-i686/xfwm4.install 2012-07-19 16:30:24 UTC (rev 163772)
@@ -0,0 +1,13 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-07-19 16:29:57 UTC (rev 163771)
+++ extra-x86_64/PKGBUILD 2012-07-19 16:30:24 UTC (rev 163772)
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
-# Contributor: tobias <tobias funnychar archlinux.org>
-
-pkgname=xfwm4
-pkgver=4.10.0
-pkgrel=1
-pkgdesc="Xfce window manager"
-arch=('i686' 'x86_64')
-url="http://www.xfce.org/"
-license=('GPL2')
-groups=('xfce4')
-depends=('libxfce4ui' 'libwnck' 'hicolor-icon-theme')
-makedepends=('intltool')
-options=('!libtool')
-install=$pkgname.install
-source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2)
-sha256sums=('492357bf48121ebffabf2bf0d3b84213d19bf81087321175d687c8a68efe1f9c')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --libexecdir=/usr/lib \
- --localstatedir=/var \
- --disable-static \
- --enable-startup-notification \
- --enable-randr \
- --enable-compositor \
- --enable-xsync \
- --disable-debug
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: xfwm4/repos/extra-x86_64/PKGBUILD (from rev 163771, xfwm4/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-07-19 16:30:24 UTC (rev 163772)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: tobias <tobias funnychar archlinux.org>
+
+pkgname=xfwm4
+pkgver=4.10.0
+pkgrel=2
+pkgdesc="Xfce window manager"
+arch=('i686' 'x86_64')
+url="http://www.xfce.org/"
+license=('GPL2')
+groups=('xfce4')
+depends=('libxfce4ui' 'libwnck' 'hicolor-icon-theme')
+makedepends=('intltool')
+options=('!libtool')
+install=$pkgname.install
+source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2
+ xfwm4-4.10.0-implement-NET_WM_MOVERESIZE_CANCEL.patch)
+sha256sums=('492357bf48121ebffabf2bf0d3b84213d19bf81087321175d687c8a68efe1f9c'
+ 'f088a56cc05d1856af8d68dae9e40bc53b724d9dde4d8c2b78a88922c0ee6d1d')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # Fix https://bugzilla.xfce.org/show_bug.cgi?id=8949 (FS#29970)
+ patch -Np1 -i "$srcdir/xfwm4-4.10.0-implement-NET_WM_MOVERESIZE_CANCEL.patch"
+
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --libexecdir=/usr/lib \
+ --localstatedir=/var \
+ --disable-static \
+ --enable-startup-notification \
+ --enable-randr \
+ --enable-compositor \
+ --enable-xsync \
+ --disable-debug
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
Copied: xfwm4/repos/extra-x86_64/xfwm4-4.10.0-implement-NET_WM_MOVERESIZE_CANCEL.patch (from rev 163771, xfwm4/trunk/xfwm4-4.10.0-implement-NET_WM_MOVERESIZE_CANCEL.patch)
===================================================================
--- extra-x86_64/xfwm4-4.10.0-implement-NET_WM_MOVERESIZE_CANCEL.patch (rev 0)
+++ extra-x86_64/xfwm4-4.10.0-implement-NET_WM_MOVERESIZE_CANCEL.patch 2012-07-19 16:30:24 UTC (rev 163772)
@@ -0,0 +1,84 @@
+From 099614e3f045e06db7ab509e174510ea74857adb Mon Sep 17 00:00:00 2001
+From: Olivier Fourdan <fourdan at xfce.org>
+Date: Wed, 18 Jul 2012 20:12:07 +0000
+Subject: Implement NET_WM_MOVERESIZE_CANCEL message (bug #8949)
+
+as gtk+-3.4 now uses it.
+---
+diff --git a/src/display.h b/src/display.h
+index 1ad2ef8..8797237 100644
+--- a/src/display.h
++++ b/src/display.h
+@@ -163,7 +163,8 @@ enum
+ NET_WM_MOVERESIZE_SIZE_LEFT,
+ NET_WM_MOVERESIZE_MOVE,
+ NET_WM_MOVERESIZE_SIZE_KEYBOARD,
+- NET_WM_MOVERESIZE_MOVE_KEYBOARD
++ NET_WM_MOVERESIZE_MOVE_KEYBOARD,
++ NET_WM_MOVERESIZE_CANCEL
+ };
+
+ enum
+diff --git a/src/moveresize.c b/src/moveresize.c
+index 9893c30..a98bdf7 100644
+--- a/src/moveresize.c
++++ b/src/moveresize.c
+@@ -827,7 +827,7 @@ clientMoveEventFilter (XEvent * xevent, gpointer data)
+ eventFilterStatus status = EVENT_FILTER_STOP;
+ MoveResizeData *passdata = (MoveResizeData *) data;
+ Client *c = NULL;
+- gboolean moving = TRUE;
++ gboolean moving;
+ XWindowChanges wc;
+ int prev_x, prev_y;
+
+@@ -840,6 +840,12 @@ clientMoveEventFilter (XEvent * xevent, gpointer data)
+ display_info = screen_info->display_info;
+ configure_flags = NO_CFG_FLAG;
+
++ /*
++ * Clients may choose to end the move operation,
++ * we use XFWM_FLAG_MOVING_RESIZING for that.
++ */
++ moving = FLAG_TEST (c->xfwm_flags, XFWM_FLAG_MOVING_RESIZING);
++
+ /* Update the display time */
+ myDisplayUpdateCurrentTime (display_info, xevent);
+
+@@ -1294,7 +1300,12 @@ clientResizeEventFilter (XEvent * xevent, gpointer data)
+ screen_info = c->screen_info;
+ display_info = screen_info->display_info;
+ status = EVENT_FILTER_STOP;
+- resizing = TRUE;
++
++ /*
++ * Clients may choose to end the resize operation,
++ * we use XFWM_FLAG_MOVING_RESIZING for that.
++ */
++ resizing = FLAG_TEST (c->xfwm_flags, XFWM_FLAG_MOVING_RESIZING);
+
+ frame_x = frameX (c);
+ frame_y = frameY (c);
+diff --git a/src/netwm.c b/src/netwm.c
+index 545e64a..1352f08 100644
+--- a/src/netwm.c
++++ b/src/netwm.c
+@@ -695,10 +695,15 @@ clientNetMoveResize (Client * c, XClientMessageEvent * ev)
+ resize = TRUE; /* Resize */
+ break;
+ case NET_WM_MOVERESIZE_MOVE:
+- default:
+ event->type = ButtonPress;
+ resize = FALSE; /* Move */
+ break;
++ case NET_WM_MOVERESIZE_CANCEL:
++ FLAG_UNSET (c->xfwm_flags, XFWM_FLAG_MOVING_RESIZING);
++ /* Walk through */
++ default: /* Do nothing */
++ return;
++ break;
+ }
+
+ if (!FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN))
+--
+cgit v0.9.0.3
Deleted: extra-x86_64/xfwm4.install
===================================================================
--- extra-x86_64/xfwm4.install 2012-07-19 16:29:57 UTC (rev 163771)
+++ extra-x86_64/xfwm4.install 2012-07-19 16:30:24 UTC (rev 163772)
@@ -1,13 +0,0 @@
-post_install() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: xfwm4/repos/extra-x86_64/xfwm4.install (from rev 163771, xfwm4/trunk/xfwm4.install)
===================================================================
--- extra-x86_64/xfwm4.install (rev 0)
+++ extra-x86_64/xfwm4.install 2012-07-19 16:30:24 UTC (rev 163772)
@@ -0,0 +1,13 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
+
+# vim:set ts=2 sw=2 et:
More information about the arch-commits
mailing list