CVS commit: pkgsrc/wm/fluxbox

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Fri Jan  7 17:32:12 UTC 2022

Modified Files:
        pkgsrc/wm/fluxbox: Makefile distinfo
        pkgsrc/wm/fluxbox/patches: patch-bj

Log Message:
fluxbox: add an upstream patch to fix window sizing edge cases


To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 pkgsrc/wm/fluxbox/Makefile
cvs rdiff -u -r1.38 -r1.39 pkgsrc/wm/fluxbox/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/wm/fluxbox/patches/patch-bj

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/wm/fluxbox/Makefile
diff -u pkgsrc/wm/fluxbox/Makefile:1.72 pkgsrc/wm/fluxbox/Makefile:1.73
--- pkgsrc/wm/fluxbox/Makefile:1.72     Fri Sep 25 12:25:10 2020
+++ pkgsrc/wm/fluxbox/Makefile  Fri Jan  7 17:32:12 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.72 2020/09/25 12:25:10 nia Exp $
+# $NetBSD: Makefile,v 1.73 2022/01/07 17:32:12 gutteridge Exp $
 
 DISTNAME=      fluxbox-1.3.7
-PKGREVISION=   5
+PKGREVISION=   6
 CATEGORIES=    wm x11
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=fluxbox/}
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/wm/fluxbox/distinfo
diff -u pkgsrc/wm/fluxbox/distinfo:1.38 pkgsrc/wm/fluxbox/distinfo:1.39
--- pkgsrc/wm/fluxbox/distinfo:1.38     Tue Oct 26 11:25:12 2021
+++ pkgsrc/wm/fluxbox/distinfo  Fri Jan  7 17:32:12 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.38 2021/10/26 11:25:12 nia Exp $
+$NetBSD: distinfo,v 1.39 2022/01/07 17:32:12 gutteridge Exp $
 
 BLAKE2s (fluxbox-1.3.7.tar.bz2) = c3dfa1e8b204c4874ba372af05402b7a277bb1ebac2e7cc15c92c608ea26bdf7
 SHA512 (fluxbox-1.3.7.tar.bz2) = c40cc765f5d542210e18dca21b98b97a048c6685b605a68e2c64f4e886329f4e6d3a3a7e76b3ca0ce488242f38d0ee2a4d6dfebc9ce97d37c68f84c3948aac8c
@@ -9,7 +9,7 @@ SHA1 (patch-bd) = 75532deb83a0f7e8c91f43
 SHA1 (patch-be) = 0c8c0cfa12bbfeca28d76b12b488777b589bb43a
 SHA1 (patch-bf) = 7da25f4e9a0e738da7c24264a91e6ab036d5acf2
 SHA1 (patch-bg) = 8f4decdb2ff611dcc1af64145801fac35f83e25a
-SHA1 (patch-bj) = 9b0ac35028644b142073a498bc3d59324c51d349
+SHA1 (patch-bj) = baf714907cce1f71e69f85c80d8f98efeeeaf86f
 SHA1 (patch-bk) = ae0c9857dd0cd203c8ae3f4bf5a0c7126cf48c92
 SHA1 (patch-data_keys) = 79820ca4fd89227e24ae71bb1278f49b3930af85
 SHA1 (patch-src_fluxbox.cc) = a652d685cd80896b45bfa7b2dfd5e98b2561e326

Index: pkgsrc/wm/fluxbox/patches/patch-bj
diff -u pkgsrc/wm/fluxbox/patches/patch-bj:1.2 pkgsrc/wm/fluxbox/patches/patch-bj:1.3
--- pkgsrc/wm/fluxbox/patches/patch-bj:1.2      Tue Apr 17 20:08:06 2012
+++ pkgsrc/wm/fluxbox/patches/patch-bj  Fri Jan  7 17:32:12 2022
@@ -1,8 +1,13 @@
-$NetBSD: patch-bj,v 1.2 2012/04/17 20:08:06 bsiegert Exp $
+$NetBSD: patch-bj,v 1.3 2022/01/07 17:32:12 gutteridge Exp $
 
---- src/Window.cc.orig Sat Oct 29 13:45:51 2011
+Fix builds with the SunPro compiler.
+
+Handle oversized windows: prevent both opposing edges from being offscreen.
+https://github.com/fluxbox/fluxbox/commit/299e098f5f6fc6d33684b3d4e80185c8a7899664
+
+--- src/Window.cc.orig 2015-02-08 10:44:45.373187009 +0000
 +++ src/Window.cc
-@@ -185,9 +185,10 @@ void lowerFluxboxWindow(FluxboxWindow &w
+@@ -166,9 +166,10 @@ void lowerFluxboxWindow(FluxboxWindow &w
          win.screen().layerManager().lock();
  
      // lower the windows from the top down, so they don't change stacking order
@@ -16,3 +21,29 @@ $NetBSD: patch-bj,v 1.2 2012/04/17 20:08
      for (; it != it_end; ++it) {
          if ((*it)->fbwindow() && !(*it)->fbwindow()->isIconic())
              // TODO: should we also check if it is the active client?
+@@ -478,6 +479,25 @@ void FluxboxWindow::init() {
+ 
+     fluxbox.attachSignals(*this);
+ 
++    if (!m_state.fullscreen) {
++        unsigned int new_width = 0, new_height = 0;
++        if (m_client->width() >= screen().width()) {
++            m_state.maximized |= WindowState::MAX_HORZ;
++            new_width = 2 * screen().width() / 3;
++        }
++        if (m_client->height() >= screen().height()) {
++            m_state.maximized |= WindowState::MAX_VERT;
++            new_height = 2 * screen().height() / 3;
++        }
++        if (new_width || new_height) {
++            const int maximized = m_state.maximized;
++            m_state.maximized = WindowState::MAX_NONE;
++            resize(new_width ? new_width : width(), new_height ? new_height : height());
++            m_placed = false;
++            m_state.maximized = maximized;
++        }
++    }
++
+     // this window is managed, we are now allowed to modify actual state
+     m_initialized = true;
+