From 2d8a93174a7045362856472bc95c568f5600d0ee Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Wed, 16 May 2007 14:24:40 +0000 Subject: [PATCH] merge r6573-6575 from trunk --- doc/openbox-gnome-session.1.in | 6 +++--- doc/openbox-gnome-session.1.sgml | 4 ++-- doc/openbox-kde-session.1.in | 6 +++--- doc/openbox-kde-session.1.sgml | 4 ++-- doc/openbox-session.1.in | 6 +++--- doc/openbox-session.1.sgml | 4 ++-- doc/openbox.1.in | 8 ++++---- doc/openbox.1.sgml | 6 +++--- openbox/action.c | 10 ++++++++-- openbox/mouse.c | 5 +++++ 10 files changed, 35 insertions(+), 24 deletions(-) diff --git a/doc/openbox-gnome-session.1.in b/doc/openbox-gnome-session.1.in index bff2570e..c123fe24 100644 --- a/doc/openbox-gnome-session.1.in +++ b/doc/openbox-gnome-session.1.in @@ -8,12 +8,12 @@ openbox-gnome-session \(em Run a GNOME session with Openbox as the window manage Openbox as the window manager. .SH "SEE ALSO" .PP -openbox(1), openbox-kde-session (1), openbox-session(1). +openbox(1), openbox-kde-session(1), openbox-session(1). .PP The program's full documentation is available on the website: -\fBhttp://openbox.org/\fP +\fBhttp://icculus.org/openbox/\fP .PP Please report bugs to: \fBhttp://bugzilla.icculus.org/ \fP -.\" created by instant / docbook-to-man, Tue 15 May 2007, 20:08 +.\" created by instant / docbook-to-man, Wed 16 May 2007, 01:19 diff --git a/doc/openbox-gnome-session.1.sgml b/doc/openbox-gnome-session.1.sgml index 01236aff..0cf804e1 100644 --- a/doc/openbox-gnome-session.1.sgml +++ b/doc/openbox-gnome-session.1.sgml @@ -42,11 +42,11 @@ manpage.1: manpage.sgml SEE ALSO - openbox(1), openbox-kde-session (1), openbox-session(1). + openbox(1), openbox-kde-session(1), openbox-session(1). The program's full documentation is available on the website: - http://openbox.org/ + http://icculus.org/openbox/ Please report bugs to: http://bugzilla.icculus.org/ diff --git a/doc/openbox-kde-session.1.in b/doc/openbox-kde-session.1.in index aa040cfc..f35c865c 100644 --- a/doc/openbox-kde-session.1.in +++ b/doc/openbox-kde-session.1.in @@ -8,12 +8,12 @@ openbox-kde-session \(em Run a KDE session with Openbox as the window manager Openbox as the window manager. .SH "SEE ALSO" .PP -openbox(1), openbox-gnome-session (1), openbox-session (1). +openbox(1), openbox-gnome-session(1), openbox-session(1). .PP The program's full documentation is available on the website: -\fBhttp://openbox.org/\fP +\fBhttp://icculus.org/openbox/\fP .PP Please report bugs to: \fBhttp://bugzilla.icculus.org/ \fP -.\" created by instant / docbook-to-man, Tue 15 May 2007, 20:08 +.\" created by instant / docbook-to-man, Wed 16 May 2007, 01:19 diff --git a/doc/openbox-kde-session.1.sgml b/doc/openbox-kde-session.1.sgml index aeb114a4..33cf5d52 100644 --- a/doc/openbox-kde-session.1.sgml +++ b/doc/openbox-kde-session.1.sgml @@ -42,11 +42,11 @@ manpage.1: manpage.sgml SEE ALSO - openbox(1), openbox-gnome-session (1), openbox-session (1). + openbox(1), openbox-gnome-session(1), openbox-session(1). The program's full documentation is available on the website: - http://openbox.org/ + http://icculus.org/openbox/ Please report bugs to: http://bugzilla.icculus.org/ diff --git a/doc/openbox-session.1.in b/doc/openbox-session.1.in index 58b4bafd..11fa2c18 100644 --- a/doc/openbox-session.1.in +++ b/doc/openbox-session.1.in @@ -28,12 +28,12 @@ stop there and further commands will not be executed. You can use the own. .SH "SEE ALSO" .PP -openbox(1), openbox-kde-session (1), openbox-gnome-session (1). +openbox(1), openbox-session(1), openbox-gnome-session(1). .PP The program's full documentation is available on the website: -\fBhttp://openbox.org/\fP +\fBhttp://icculus.org/openbox/\fP .PP Please report bugs to: \fBhttp://bugzilla.icculus.org/ \fP -.\" created by instant / docbook-to-man, Tue 15 May 2007, 20:08 +.\" created by instant / docbook-to-man, Wed 16 May 2007, 01:19 diff --git a/doc/openbox-session.1.sgml b/doc/openbox-session.1.sgml index e32c48e1..e4df8a1f 100644 --- a/doc/openbox-session.1.sgml +++ b/doc/openbox-session.1.sgml @@ -59,11 +59,11 @@ manpage.1: manpage.sgml SEE ALSO - openbox(1), openbox-kde-session (1), openbox-gnome-session (1). + openbox(1), openbox-session(1), openbox-gnome-session(1). The program's full documentation is available on the website: - http://openbox.org/ + http://icculus.org/openbox/ Please report bugs to: http://bugzilla.icculus.org/ diff --git a/doc/openbox.1.in b/doc/openbox.1.in index d7387ac5..3d3ba30e 100644 --- a/doc/openbox.1.in +++ b/doc/openbox.1.in @@ -83,12 +83,12 @@ xinerama is not already enabled. This is for debugging xinerama support. .SH "SEE ALSO" .PP -obconf (1), openbox-gnome-session (1), openbox-kde-session (1). - +obconf (1), openbox-session(1), openbox-gnome-session(1), +openbox-kde-session(1). .PP The program's full documentation is available on the website: -\fBhttp://openbox.org/\fP +\fBhttp://icculus.org/openbox/\fP .PP Please report bugs to: \fBhttp://bugzilla.icculus.org/ \fP -.\" created by instant / docbook-to-man, Tue 15 May 2007, 20:08 +.\" created by instant / docbook-to-man, Wed 16 May 2007, 01:19 diff --git a/doc/openbox.1.sgml b/doc/openbox.1.sgml index 70766ba4..8743e75b 100644 --- a/doc/openbox.1.sgml +++ b/doc/openbox.1.sgml @@ -167,11 +167,11 @@ manpage.1: manpage.sgml SEE ALSO - obconf (1), openbox-gnome-session (1), openbox-kde-session (1). - + obconf (1), openbox-session(1), openbox-gnome-session(1), + openbox-kde-session(1). The program's full documentation is available on the website: - http://openbox.org/ + http://icculus.org/openbox/ Please report bugs to: http://bugzilla.icculus.org/ diff --git a/openbox/action.c b/openbox/action.c index 5900de7c..60af74b5 100644 --- a/openbox/action.c +++ b/openbox/action.c @@ -1141,9 +1141,15 @@ void action_run_list(GSList *acts, ObClient *c, ObFrameContext context, /* XXX UGLY HACK race with motion event starting a move and the button release gettnig processed first. answer: don't queue - moveresize starts. UGLY HACK XXX */ + moveresize starts. UGLY HACK XXX + + XXX ALSO don't queue showmenu events, because on button press + events we need to know if a mouse grab is going to take place, + and set the button to 0, so that later motion events don't think + that a drag is going on. since showmenu grabs the pointer.. + */ if (a->data.any.interactive || a->func == action_move || - a->func == action_resize) + a->func == action_resize || a->func == action_showmenu) { /* interactive actions are not queued */ a->func(&a->data); diff --git a/openbox/mouse.c b/openbox/mouse.c index 8b0cfccb..78e25d89 100644 --- a/openbox/mouse.c +++ b/openbox/mouse.c @@ -205,6 +205,11 @@ void mouse_event(ObClient *client, XEvent *e) e->xbutton.x_root, e->xbutton.y_root, e->xbutton.time); + /* if the bindings grab the pointer, there won't be a ButtonRelease + event for us */ + if (grab_on_pointer()) + button = 0; + if (CLIENT_CONTEXT(context, client)) { /* Replay the event, so it goes to the client*/ XAllowEvents(ob_display, ReplayPointer, event_curtime); -- 2.34.1