From 9c5c78cf0b2d3e1cd8d9e96df5ed69a7083bf0a2 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Sun, 13 May 2007 20:08:32 +0000 Subject: [PATCH] merge r6460-6461 from trunk --- Makefile.am | 14 +++++- doc/openbox-gnome-session.1.sgml | 73 ++++++++++++++++++++++++++++++++ doc/openbox-kde-session.1.sgml | 73 ++++++++++++++++++++++++++++++++ doc/openbox.1.sgml | 6 +-- openbox/popup.c | 6 +++ 5 files changed, 168 insertions(+), 4 deletions(-) create mode 100644 doc/openbox-gnome-session.1.sgml create mode 100644 doc/openbox-kde-session.1.sgml diff --git a/Makefile.am b/Makefile.am index 6061bf8f..b35a453b 100644 --- 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 index 00000000..b86e1b87 --- /dev/null +++ b/doc/openbox-gnome-session.1.sgml @@ -0,0 +1,73 @@ + 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. + + --> + + 1"> + OPENBOX"> + +]> + + + + &dhucpackage; + + &dhsection; + + + &dhpackage; + + Run a GNOME session with Openbox as the window manager + + + + DESCRIPTION + + &dhpackage; runs a GNOME session with + Openbox as the window manager. + + + SEE ALSO + + openbox(1), openbox-kde-session (1). + + + The program's full documentation is available on the website: + http://openbox.org/ + + Please report bugs to: http://bugzilla.icculus.org/ + + + + + + + diff --git a/doc/openbox-kde-session.1.sgml b/doc/openbox-kde-session.1.sgml new file mode 100644 index 00000000..4de8c024 --- /dev/null +++ b/doc/openbox-kde-session.1.sgml @@ -0,0 +1,73 @@ + 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. + + --> + + 1"> + OPENBOX"> + +]> + + + + &dhucpackage; + + &dhsection; + + + &dhpackage; + + Run a KDE session with Openbox as the window manager + + + + DESCRIPTION + + &dhpackage; runs a KDE session with + Openbox as the window manager. + + + SEE ALSO + + openbox(1), openbox-gnome-session (1). + + + The program's full documentation is available on the website: + http://openbox.org/ + + Please report bugs to: http://bugzilla.icculus.org/ + + + + + + + diff --git a/doc/openbox.1.sgml b/doc/openbox.1.sgml index 04ce7082..a8f2fe74 100644 --- a/doc/openbox.1.sgml +++ b/doc/openbox.1.sgml @@ -156,10 +156,10 @@ manpage.1: manpage.sgml The program's full documentation is available on the website: - http://openbox.org/ + http://openbox.org/ - Please report bugs to: http://bugzilla.icculus.org/ - + Please report bugs to: http://bugzilla.icculus.org/ + diff --git a/openbox/popup.c b/openbox/popup.c index 156ce860..91c1849c 100644 --- 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); -- 2.34.1