rpms/xfwm4/devel xfwm4-4.4.1-hang.patch, NONE, 1.1 xfwm4.spec, 1.19, 1.20
Kevin Fenzi (kevin)
fedora-extras-commits at redhat.com
Mon Jul 9 20:27:46 UTC 2007
Author: kevin
Update of /cvs/extras/rpms/xfwm4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8670
Modified Files:
xfwm4.spec
Added Files:
xfwm4-4.4.1-hang.patch
Log Message:
Add patch for gtk2 hang issue (fixes #243735)
xfwm4-4.4.1-hang.patch:
--- NEW FILE xfwm4-4.4.1-hang.patch ---
Index: xfwm4/src/display.c
===================================================================
--- xfwm4/src/display.c (revision 25830)
+++ xfwm4/src/display.c (revision 25831)
@@ -178,6 +178,19 @@
FALSE, display_info->atoms) != 0);
}
+static void
+myDisplayCreateTimestampWin (DisplayInfo *display_info)
+{
+ XSetWindowAttributes attributes;
+
+ attributes.event_mask = PropertyChangeMask;
+ attributes.override_redirect = TRUE;
+ display_info->timestamp_win =
+ XCreateWindow (display_info->dpy, DefaultRootWindow (display_info->dpy),
+ -100, -100, 10, 10, 0, 0, CopyFromParent, CopyFromParent,
+ CWEventMask | CWOverrideRedirect, &attributes);
+}
+
DisplayInfo *
myDisplayInit (GdkDisplay *gdisplay)
{
@@ -309,6 +322,8 @@
display->resize_cursor[CORNER_COUNT + SIDE_BOTTOM] =
XCreateFontCursor (display->dpy, XC_bottom_side);
+ myDisplayCreateTimestampWin (display);
+
display->xfilter = NULL;
display->screens = NULL;
display->clients = NULL;
@@ -340,6 +355,8 @@
display->move_cursor = None;
XFreeCursor (display->dpy, display->root_cursor);
display->root_cursor = None;
+ XDestroyWindow (display->dpy, display->timestamp_win);
+ display->timestamp_win = None;
if (display->hostname)
{
Index: xfwm4/src/display.h
===================================================================
--- xfwm4/src/display.h (revision 25830)
+++ xfwm4/src/display.h (revision 25831)
@@ -226,6 +226,7 @@
gboolean quit;
gboolean reload;
+ Window timestamp_win;
Cursor busy_cursor;
Cursor move_cursor;
Cursor root_cursor;
Index: xfwm4/src/client.c
===================================================================
--- xfwm4/src/client.c (revision 25830)
+++ xfwm4/src/client.c (revision 25831)
@@ -4868,21 +4868,19 @@
if (passdata.c)
{
- GdkPixbuf *icon;
-
TRACE ("entering cycle loop");
passdata.wireframe = wireframeCreate (passdata.c);
- icon = getAppIcon (display_info, passdata.c->window, 32, 32);
passdata.tabwin = tabwinCreate (passdata.c->screen_info->gscr, c,
passdata.c, passdata.cycle_range,
screen_info->params->cycle_workspaces);
eventFilterPush (display_info->xfilter, clientCycleEventFilter, &passdata);
gtk_main ();
eventFilterPop (display_info->xfilter);
- wireframeDelete (screen_info, passdata.wireframe);
TRACE ("leaving cycle loop");
tabwinDestroy (passdata.tabwin);
g_free (passdata.tabwin);
+ wireframeDelete (screen_info, passdata.wireframe);
+ updateXserverTime (display_info);
}
if (passdata.c)
Index: xfwm4/src/hints.c
===================================================================
--- xfwm4/src/hints.c (revision 25830)
+++ xfwm4/src/hints.c (revision 25831)
@@ -1167,27 +1167,18 @@
return setXAtomManagerOwner(display_info, display_info->atoms[atom_id], root, w);
}
-
-static Bool
-checkPropEvent (Display *display, XEvent *xevent, XPointer arg)
+void
+updateXserverTime (DisplayInfo *display_info)
{
- DisplayInfo *display_info;
ScreenInfo *screen_info;
+ char c = '\0';
- display_info = (DisplayInfo *) arg;
- g_return_val_if_fail (display_info, FALSE);
+ g_return_if_fail (display_info);
- screen_info = myDisplayGetDefaultScreen (display_info);
- g_return_val_if_fail (screen_info, FALSE);
-
- if ((xevent->type == PropertyNotify) &&
- (xevent->xproperty.window == screen_info->xfwm4_win) &&
- (xevent->xproperty.atom == display_info->atoms[XFWM4_TIMESTAMP_PROP]))
- {
- return TRUE;
- }
-
- return FALSE;
+ XChangeProperty (display_info->dpy, display_info->timestamp_win,
+ display_info->atoms[XFWM4_TIMESTAMP_PROP],
+ display_info->atoms[XFWM4_TIMESTAMP_PROP],
+ 8, PropModeReplace, (unsigned char *) &c, 1);
}
Time
@@ -1196,7 +1187,6 @@
ScreenInfo *screen_info;
XEvent xevent;
Time timestamp;
- char c = '\0';
g_return_val_if_fail (display_info, (Time) CurrentTime);
timestamp = myDisplayGetCurrentTime (display_info);
@@ -1206,12 +1196,8 @@
g_return_val_if_fail (screen_info, (Time) CurrentTime);
TRACE ("getXServerTime: Using X server roundtrip");
- XChangeProperty (display_info->dpy, screen_info->xfwm4_win,
- display_info->atoms[XFWM4_TIMESTAMP_PROP],
- display_info->atoms[XFWM4_TIMESTAMP_PROP],
- 8, PropModeReplace, (unsigned char *) &c, 1);
- XIfEvent (display_info->dpy, &xevent, checkPropEvent, (XPointer) display_info);
-
+ updateXserverTime (display_info);
+ XWindowEvent (display_info->dpy, display_info->timestamp_win, PropertyChangeMask, &xevent);
timestamp = (Time) myDisplayUpdateCurrentTime (display_info, &xevent);
}
Index: xfwm4/src/hints.h
===================================================================
--- xfwm4/src/hints.h (revision 25830)
+++ xfwm4/src/hints.h (revision 25831)
@@ -269,6 +269,7 @@
int,
Window ,
Window);
+void updateXserverTime (DisplayInfo *);
Time getXServerTime (DisplayInfo *);
#ifdef ENABLE_KDE_SYSTRAY_PROXY
Index: xfwm4.spec
===================================================================
RCS file: /cvs/extras/rpms/xfwm4/devel/xfwm4.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- xfwm4.spec 19 Apr 2007 02:44:03 -0000 1.19
+++ xfwm4.spec 9 Jul 2007 20:27:10 -0000 1.20
@@ -1,11 +1,12 @@
Summary: Next generation window manager for Xfce
Name: xfwm4
Version: 4.4.1
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPL
URL: http://www.xfce.org/
Source0: http://www.xfce.org/archive/xfce-4.4.1/src/xfwm4-4.4.1.tar.bz2
Patch0: xfwm4-4.4.1-fix-typo.patch
+Patch1: xfwm4-4.4.1-hang.patch
Group: User Interface/Desktops
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -31,6 +32,7 @@
%prep
%setup -q
%patch0 -p1 -b .fix-typo
+%patch1 -p1 -b .hang
%build
%configure
@@ -71,6 +73,9 @@
%{_datadir}/themes
%changelog
+* Mon Jul 9 2007 Kevin Fenzi <kevin at tummy.com> - 4.4.1-2
+- Add patch for gtk2 hang issue (fixes #243735)
+
* Wed Apr 11 2007 Kevin Fenzi <kevin at tummy.com> - 4.4.1-1
- Update to 4.4.1
More information about the scm-commits
mailing list