diff options
| author | Elijah Newren <newren gmail com> | 2006-01-20 22:08:52 +0000 |
|---|---|---|
| committer | Elijah Newren <newren@src.gnome.org> | 2006-01-20 22:08:52 +0000 |
| commit | af14d9d2a1e7817c92725a981deef4d8d4119e6f (patch) | |
| tree | 32340df8be646d350f7f6f50786340ca319b3c53 | |
| parent | 32d4bd6b63a9a5fe044248740e2dfa9050c1fbb6 (diff) | |
| download | metacity-af14d9d2a1e7817c92725a981deef4d8d4119e6f.tar.gz | |
Prevent rapidly repeated visual bells from hanging metacity. Fixes
2006-01-20 Elijah Newren <newren gmail com>
Prevent rapidly repeated visual bells from hanging metacity.
Fixes #322032.
* src/display.h (struct MetaDisplay): add a last_bell_time field,
(XSERVER_TIME_IS_BEFORE_ASSUMING_REAL_TIMESTAMPS macro,
XERVER_TIME_IS_BEFORE macro): add parentheses around usage of
macro parameter
* src/display.c (meta_display_open): initialize last_bell_time,
(event_callback): don't allow more than one bell per second
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | src/display.c | 9 | ||||
| -rw-r--r-- | src/display.h | 9 |
3 files changed, 26 insertions, 5 deletions
@@ -1,5 +1,18 @@ 2006-01-20 Elijah Newren <newren gmail com> + Prevent rapidly repeated visual bells from hanging metacity. + Fixes #322032. + + * src/display.h (struct MetaDisplay): add a last_bell_time field, + (XSERVER_TIME_IS_BEFORE_ASSUMING_REAL_TIMESTAMPS macro, + XERVER_TIME_IS_BEFORE macro): add parentheses around usage of + macro parameter + + * src/display.c (meta_display_open): initialize last_bell_time, + (event_callback): don't allow more than one bell per second + +2006-01-20 Elijah Newren <newren gmail com> + * src/async-getprop.c: * src/common.h: * src/display.c: diff --git a/src/display.c b/src/display.c index fbf6d4b6..aa602f2a 100644 --- a/src/display.c +++ b/src/display.c @@ -514,6 +514,8 @@ meta_display_open (const char *name) display->grab_resize_timeout_id = 0; display->grab_have_keyboard = FALSE; + display->last_bell_time = 0; + display->grab_op = META_GRAB_OP_NONE; display->grab_wireframe_active = FALSE; display->grab_window = NULL; @@ -2366,7 +2368,12 @@ event_callback (XEvent *event, switch (xkb_ev->xkb_type) { case XkbBellNotify: - meta_bell_notify (display, xkb_ev); + if (XSERVER_TIME_IS_BEFORE(display->last_bell_time, + xkb_ev->time - 1000)) + { + display->last_bell_time = xkb_ev->time; + meta_bell_notify (display, xkb_ev); + } break; } } diff --git a/src/display.h b/src/display.h index 0afc5242..54e5c901 100644 --- a/src/display.h +++ b/src/display.h @@ -286,6 +286,7 @@ struct _MetaDisplay #ifdef HAVE_XKB int xkb_base_event_type; + Time last_bell_time; #endif #ifdef HAVE_XSYNC /* alarm monitoring client's _NET_WM_SYNC_REQUEST_COUNTER */ @@ -381,13 +382,13 @@ struct _MetaDisplay * the result. */ #define XSERVER_TIME_IS_BEFORE_ASSUMING_REAL_TIMESTAMPS(time1, time2) \ - ( (( time1 < time2 ) && ( time2 - time1 < ((guint32)-1)/2 )) || \ - (( time1 > time2 ) && ( time1 - time2 > ((guint32)-1)/2 )) \ + ( (( (time1) < (time2) ) && ( (time2) - (time1) < ((guint32)-1)/2 )) || \ + (( (time1) > (time2) ) && ( (time1) - (time2) > ((guint32)-1)/2 )) \ ) #define XSERVER_TIME_IS_BEFORE(time1, time2) \ - ( time1 == 0 || \ + ( (time1) == 0 || \ (XSERVER_TIME_IS_BEFORE_ASSUMING_REAL_TIMESTAMPS(time1, time2) && \ - time2 != 0) \ + (time2) != 0) \ ) gboolean meta_display_open (const char *name); |