aboutsummaryrefslogtreecommitdiffstats
path: root/x11-wm/fluxbox
diff options
context:
space:
mode:
authorpat <pat@FreeBSD.org>2002-01-31 00:48:59 +0800
committerpat <pat@FreeBSD.org>2002-01-31 00:48:59 +0800
commitfb083d0886b89885b709136eb01f617160ca462e (patch)
tree094d00a5b8f1b341bee15a72a4e104582311f96f /x11-wm/fluxbox
parenta9e8e482877bd615ec094cab23f44219f8152887 (diff)
downloadfreebsd-ports-gnome-fb083d0886b89885b709136eb01f617160ca462e.tar.gz
freebsd-ports-gnome-fb083d0886b89885b709136eb01f617160ca462e.tar.zst
freebsd-ports-gnome-fb083d0886b89885b709136eb01f617160ca462e.zip
Add 2 bugfix patches from author which fixes '~' in config files
and problems with some apps. PR: 34440 Submitted by: maintainer
Diffstat (limited to 'x11-wm/fluxbox')
-rw-r--r--x11-wm/fluxbox/files/patch-src::StringUtil.cc11
-rw-r--r--x11-wm/fluxbox/files/patch-src::Window.cc33
2 files changed, 44 insertions, 0 deletions
diff --git a/x11-wm/fluxbox/files/patch-src::StringUtil.cc b/x11-wm/fluxbox/files/patch-src::StringUtil.cc
new file mode 100644
index 000000000000..f95273ad9cc9
--- /dev/null
+++ b/x11-wm/fluxbox/files/patch-src::StringUtil.cc
@@ -0,0 +1,11 @@
+--- src/StringUtil.cc.orig Wed Jan 9 15:11:20 2002
++++ src/StringUtil.cc Wed Jan 30 06:54:54 2002
+@@ -67,7 +67,7 @@ char *StringUtil::expandFilename(const c
+
+ auto_ptr<char> retval( new char[strlen(filename)+strlen(getenv("HOME"))+2]);
+ if (filename[0]=='~') {
+- strcat(retval.get(), getenv("HOME"));
++ strcpy(retval.get(), getenv("HOME"));
+ strcat(retval.get(), &filename[1]);
+ } else
+ return StringUtil::strdup(filename); //return unmodified value
diff --git a/x11-wm/fluxbox/files/patch-src::Window.cc b/x11-wm/fluxbox/files/patch-src::Window.cc
new file mode 100644
index 000000000000..10ca1f863d8f
--- /dev/null
+++ b/x11-wm/fluxbox/files/patch-src::Window.cc
@@ -0,0 +1,33 @@
+--- src/Window.cc.orig Fri Jan 11 13:21:59 2002
++++ src/Window.cc Wed Jan 30 06:54:54 2002
+@@ -22,7 +22,7 @@
+ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ // DEALINGS IN THE SOFTWARE.
+
+-// $Id: Window.cc,v 1.18 2002/01/11 10:04:32 fluxgen Exp $
++// $Id: Window.cc,v 1.19.2.1 2002/01/12 16:36:18 fluxgen Exp $
+
+ // stupid macros needed to access some functions in version 2 of the GNU C
+ // library
+@@ -441,7 +441,9 @@ FluxboxWindow::FluxboxWindow(Window w, B
+
+ FluxboxWindow::~FluxboxWindow(void) {
+ Fluxbox *fluxbox = Fluxbox::instance();
+-
++ //TODO: Move this to Workspace::removeWindow
++ if (client.transient_for)
++ fluxbox->setFocusedWindow(client.transient_for);
+
+ if (moving || resizing) {
+ screen->hideGeometry();
+@@ -556,9 +558,7 @@ FluxboxWindow::~FluxboxWindow(void) {
+ fluxbox->removeWindowSearch(client.window);
+ screen->removeNetizen(client.window);
+ }
+- //TODO: Move this to Workspace::removeWindow
+- if (client.transient_for)
+- fluxbox->setFocusedWindow(client.transient_for);
++
+ #ifdef DEBUG
+ fprintf(stderr, "%s(%d): ~FluxboxWindow(this=%p) done\n", __FILE__, __LINE__, this);
+ #endif