From c1fd5a7ab2495d4508998b936913e15c3f5c79ca Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Mon, 14 May 2007 02:07:42 +0000 Subject: [PATCH] merge r6520-6522 from trunk --- doc/openbox.1.in | 8 ++++---- doc/openbox.1.sgml | 8 ++++---- openbox/dock.c | 2 +- openbox/event.c | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/doc/openbox.1.in b/doc/openbox.1.in index 42a8090c..7962235e 100644 --- a/doc/openbox.1.in +++ b/doc/openbox.1.in @@ -19,10 +19,10 @@ in the login session type menu for Openbox: within GNOME or KDE, you can choose the appropriate entry, and it will launch GNOME or KDE with Openbox as the window manager. .PP -If you don't want to run Openbox withing a desktop environment, then +If you don't want to run Openbox within a desktop environment, then it is recommended that you instead set up a ~/.xsession file and use the \fBDefault\fR session type. The ~/.xsession file -should any applications you want to run at startup, and then run +should start any applications you want to run at startup, and then run \fBopenbox\fR at the end, such as: .PP .RS @@ -45,7 +45,7 @@ is possible by editing the configuration files by hand. Please note that for you. .PP The default configuration files are installed in -configdir@/openbox/, and the user configuration is placed in +@configdir@/openbox/, and the user configuration is placed in ~/.config/openbox/. You can copy the default configuration to ~/.config/openbox and edit it to your liking. .PP @@ -66,7 +66,7 @@ Show the version of the program. Replace the currently running window manager. .IP "\fB\-\-reconfigure\fP" 10 If Openbox is already running on the display, tell it to -reload it's configuration. +reload its configuration. .IP "\fB\-\-sm-disable\fP" 10 Do not connect to the session manager. .IP "\fB\-\-sync\fP" 10 diff --git a/doc/openbox.1.sgml b/doc/openbox.1.sgml index 31f726f6..b1736554 100644 --- a/doc/openbox.1.sgml +++ b/doc/openbox.1.sgml @@ -63,10 +63,10 @@ manpage.1: manpage.sgml within GNOME or KDE, you can choose the appropriate entry, and it will launch GNOME or KDE with Openbox as the window manager. - If you don't want to run Openbox withing a desktop environment, then + If you don't want to run Openbox within a desktop environment, then it is recommended that you instead set up a ~/.xsession file and use the Default session type. The ~/.xsession file - should any applications you want to run at startup, and then run + should start any applications you want to run at startup, and then run &dhpackage; at the end, such as:
@@ -85,7 +85,7 @@ manpage.1: manpage.sgml for you. The default configuration files are installed in - configdir@/openbox/, and the user configuration is placed in + @configdir@/openbox/, and the user configuration is placed in ~/.config/openbox/. You can copy the default configuration to ~/.config/openbox and edit it to your liking. @@ -124,7 +124,7 @@ manpage.1: manpage.sgml If Openbox is already running on the display, tell it to - reload it's configuration. + reload its configuration. diff --git a/openbox/dock.c b/openbox/dock.c index ae42ab9d..9a03d75c 100644 --- a/openbox/dock.c +++ b/openbox/dock.c @@ -28,7 +28,7 @@ #include "render/theme.h" #define DOCK_EVENT_MASK (ButtonPressMask | ButtonReleaseMask | \ - EnterWindowMask | LeaveWindowMask | FocusChangeMask) + EnterWindowMask | LeaveWindowMask) #define DOCKAPP_EVENT_MASK (StructureNotifyMask) static ObDock *dock; diff --git a/openbox/event.c b/openbox/event.c index 99fa1bf9..0e731b08 100644 --- a/openbox/event.c +++ b/openbox/event.c @@ -313,7 +313,7 @@ static gboolean wanted_focusevent(XEvent *e, gboolean in_client_only) /* It was on a client, was it a valid one? It's possible to get a FocusIn event for a client that was managed - but has disappeared. Don't even parse those FocusIn events. + but has disappeared. */ if (in_client_only) { ObWindow *w = g_hash_table_lookup(window_map, &e->xfocus.window); -- 2.34.1