merge r6460-6461 from trunk

diff --git a/Makefile.am b/Makefile.am
index 6061bf8f673b3d4650b6821b034c5b407e1fcf36..b35a453b29163068a65a602f6f686ba80b0fda00 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -375,6 +375,16 @@ doc/openbox.1: Makefile doc doc/openbox.1.in
        @mkdir doc 2>/dev/null || true
        @$(edit) $(srcdir)/doc/openbox.1.in >$@
 
+doc/openbox-gnome-session.1: Makefile doc doc/openbox-gnome-session.1.sgml
+       @echo make: creating $@
+       @mkdir doc 2>/dev/null || true
+       docbook-to-man $(srcdir)/doc/openbox-gnome-session.1.sgml > $@
+
+doc/openbox-kde-session.1: Makefile doc doc/openbox-kde-session.1.sgml
+       @echo make: creating $@
+       @mkdir doc 2>/dev/null || true
+       docbook-to-man $(srcdir)/doc/openbox-kde-session.1.sgml > $@
+
 dist_gnomewmfiles_DATA = \
        data/gnome-wm-properties/openbox.desktop
 
@@ -426,7 +436,9 @@ dist_doc_DATA = \
        data/menu.xsd
 
 man_MANS = \
-       doc/openbox.1
+       doc/openbox.1 \
+       doc/openbox-gnome-session.1 \
+       doc/openbox-kde-session.1
 
 EXTRA_DIST = \
        config.rpath \

diff --git a/doc/openbox-gnome-session.1.sgml b/doc/openbox-gnome-session.1.sgml
new file mode 100644 (file)
index 0000000..b86e1b8
--- /dev/null
+++ b/doc/openbox-gnome-session.1.sgml
@@ -0,0 +1,73 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
+     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+     less'.  A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+       docbook-to-man $< > $@
+
+    
+       The docbook-to-man binary is found in the docbook-to-man package.
+       Please remember that if you create the nroff version in one of the
+       debian/rules file targets (such as build), you will need to include
+       docbook-to-man in your Build-Depends control field.
+
+  -->
+
+  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
+  <!ENTITY dhucpackage "<refentrytitle>OPENBOX</refentrytitle>">
+  <!ENTITY dhpackage   "openbox-gnome-session">
+]>
+
+<refentry>
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+  </refmeta>
+  <refnamediv>
+    <refname>&dhpackage;</refname>
+
+    <refpurpose>Run a GNOME session with Openbox as the window manager
+      </refpurpose>
+  </refnamediv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para><command>&dhpackage;</command> runs a GNOME session with
+      Openbox as the window manager.</para>
+  </refsect1>
+  <refsect1>
+    <title>SEE ALSO</title>
+
+    <para>openbox(1), openbox-kde-session (1).
+      </para>
+
+    <para>The program's full documentation is available on the website:
+      <literal>http://openbox.org/</literal></para>
+
+    <para>Please report bugs to: <literal>http://bugzilla.icculus.org/
+      </literal></para>
+  </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->
+
+

diff --git a/doc/openbox-kde-session.1.sgml b/doc/openbox-kde-session.1.sgml
new file mode 100644 (file)
index 0000000..4de8c02
--- /dev/null
+++ b/doc/openbox-kde-session.1.sgml
@@ -0,0 +1,73 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
+     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+     less'.  A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+       docbook-to-man $< > $@
+
+    
+       The docbook-to-man binary is found in the docbook-to-man package.
+       Please remember that if you create the nroff version in one of the
+       debian/rules file targets (such as build), you will need to include
+       docbook-to-man in your Build-Depends control field.
+
+  -->
+
+  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
+  <!ENTITY dhucpackage "<refentrytitle>OPENBOX</refentrytitle>">
+  <!ENTITY dhpackage   "openbox-kde-session">
+]>
+
+<refentry>
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+  </refmeta>
+  <refnamediv>
+    <refname>&dhpackage;</refname>
+
+    <refpurpose>Run a KDE session with Openbox as the window manager
+      </refpurpose>
+  </refnamediv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para><command>&dhpackage;</command> runs a KDE session with
+      Openbox as the window manager.</para>
+  </refsect1>
+  <refsect1>
+    <title>SEE ALSO</title>
+
+    <para>openbox(1), openbox-gnome-session (1).
+      </para>
+
+    <para>The program's full documentation is available on the website:
+      <literal>http://openbox.org/</literal></para>
+
+    <para>Please report bugs to: <literal>http://bugzilla.icculus.org/
+      </literal></para>
+  </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->
+
+

diff --git a/doc/openbox.1.sgml b/doc/openbox.1.sgml
index 04ce70829b3703163eaac96daccfb45e09f2cd32..a8f2fe74554e16cf761775b1faf1e4ecd745db17 100644 (file)
--- a/doc/openbox.1.sgml
+++ b/doc/openbox.1.sgml
@@ -156,10 +156,10 @@ manpage.1: manpage.sgml
       </para>
 
     <para>The program's full documentation is available on the website:
-      <olink>http://openbox.org/</olink></para>
+      <literal>http://openbox.org/</literal></para>
 
-    <para>Please report bugs to: <olink>http://bugzilla.icculus.org/</olink>
-      </para>
+    <para>Please report bugs to: <literal>http://bugzilla.icculus.org/
+      </literal></para>
   </refsect1>
 </refentry>
 

diff --git a/openbox/popup.c b/openbox/popup.c
index 156ce8605b9751ee6205aff9bc7bcc892586291e..91c1849c659315e26bfe148d5405cb079d8e628a 100644 (file)
--- a/openbox/popup.c
+++ b/openbox/popup.c
@@ -154,6 +154,9 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text)
     gint emptyx, emptyy; /* empty space between elements */
     gint textx, texty, textw, texth;
     gint iconx, icony, iconw, iconh;
+    Rect *area;
+
+    area = screen_physical_area();
 
     RrMargins(self->a_bg, &l, &t, &r, &b);
 
@@ -225,6 +228,9 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text)
         break;
     }
 
+    x=MAX(MIN(x, area->width-w),0);
+    y=MAX(MIN(y, area->height-h),0);
+    
     /* set the windows/appearances up */
     XMoveResizeWindow(ob_display, self->bg, x, y, w, h);
     RrPaint(self->a_bg, self->bg, w, h);