merge r6573-6575 from trunk

diff --git a/doc/openbox-gnome-session.1.in b/doc/openbox-gnome-session.1.in
index bff2570ee7f15679938d69a99e7c176fba318811..c123fe24849933ab64e5a6b5f24692793a05632c 100644 (file)
--- 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 01236aff7bab9e34fde2446935f99d2a85855426..0cf804e1c694c4ac889e2da4769932fa4064729f 100644 (file)
--- a/doc/openbox-gnome-session.1.sgml
+++ b/doc/openbox-gnome-session.1.sgml
@@ -42,11 +42,11 @@ manpage.1: manpage.sgml
   <refsect1>
     <title>SEE ALSO</title>
 
-    <para>openbox(1), openbox-kde-session (1), openbox-session(1).
+    <para>openbox(1), openbox-kde-session(1), openbox-session(1).
       </para>
 
     <para>The program's full documentation is available on the website:
-      <literal>http://openbox.org/</literal></para>
+      <literal>http://icculus.org/openbox/</literal></para>
 
     <para>Please report bugs to: <literal>http://bugzilla.icculus.org/
       </literal></para>

diff --git a/doc/openbox-kde-session.1.in b/doc/openbox-kde-session.1.in
index aa040cfcf78dd8c9d710c6efac5089a778549db4..f35c865c148bc64e09fe81ac21b30dc85ede6607 100644 (file)
--- 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 aeb114a4fc8eb1a5756808a75eb34742b786e548..33cf5d529c5b80598f670f7ebedb0f09180d1c1a 100644 (file)
--- a/doc/openbox-kde-session.1.sgml
+++ b/doc/openbox-kde-session.1.sgml
@@ -42,11 +42,11 @@ manpage.1: manpage.sgml
   <refsect1>
     <title>SEE ALSO</title>
 
-    <para>openbox(1), openbox-gnome-session (1), openbox-session (1).
+    <para>openbox(1), openbox-gnome-session(1), openbox-session(1).
       </para>
 
     <para>The program's full documentation is available on the website:
-      <literal>http://openbox.org/</literal></para>
+      <literal>http://icculus.org/openbox/</literal></para>
 
     <para>Please report bugs to: <literal>http://bugzilla.icculus.org/
       </literal></para>

diff --git a/doc/openbox-session.1.in b/doc/openbox-session.1.in
index 58b4bafdf62c0e3922af62414f90cfd90fe97f6e..11fa2c1882ab98e84d551a10b0723c29db676a38 100644 (file)
--- 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 e32c48e1bbe8636df27f224b589c38848e737bde..e4df8a1f360a13958d2ab1d7f88168da18fb8e8a 100644 (file)
--- a/doc/openbox-session.1.sgml
+++ b/doc/openbox-session.1.sgml
@@ -59,11 +59,11 @@ manpage.1: manpage.sgml
   <refsect1>
     <title>SEE ALSO</title>
 
-    <para>openbox(1), openbox-kde-session (1), openbox-gnome-session (1).
+    <para>openbox(1), openbox-session(1), openbox-gnome-session(1).
       </para>
 
     <para>The program's full documentation is available on the website:
-      <literal>http://openbox.org/</literal></para>
+      <literal>http://icculus.org/openbox/</literal></para>
 
     <para>Please report bugs to: <literal>http://bugzilla.icculus.org/
       </literal></para>

diff --git a/doc/openbox.1.in b/doc/openbox.1.in
index d7387ac5402b1372b8650a5fd81168ae783ff201..3d3ba30e7a62389aff2c875d41708186017353c1 100644 (file)
--- 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 70766ba468f9f3b4ba7e3c1bdf70f544fabb0c9f..8743e75be4223f093dc6495945ac0f5153dc0c27 100644 (file)
--- a/doc/openbox.1.sgml
+++ b/doc/openbox.1.sgml
@@ -167,11 +167,11 @@ manpage.1: manpage.sgml
   <refsect1>
     <title>SEE ALSO</title>
 
-    <para>obconf (1), openbox-gnome-session (1), openbox-kde-session (1).
-      </para>
+    <para>obconf (1), openbox-session(1), openbox-gnome-session(1),
+      openbox-kde-session(1).</para>
 
     <para>The program's full documentation is available on the website:
-      <literal>http://openbox.org/</literal></para>
+      <literal>http://icculus.org/openbox/</literal></para>
 
     <para>Please report bugs to: <literal>http://bugzilla.icculus.org/
       </literal></para>

diff --git a/openbox/action.c b/openbox/action.c
index 5900de7cd0c3ae05772317208457a25579afc20c..60af74b5e4723a879b3c97e5038cd149f1ca4925 100644 (file)
--- 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 8b0cfccbd0a0b887e2de95ff2a7d4e449958f92c..78e25d8966275c23d9d8f1b384fa86328ce798ca 100644 (file)
--- 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);