all repos — openbox @ aa2ec5f217d2f390edc32e7bcf211d88f2290f8b

openbox fork - make it a bit more like ryudo

don't make Decor_Close depend on MWM hints. Thats not part of them.
Dana Jansens danakj@orodu.net
commit

aa2ec5f217d2f390edc32e7bcf211d88f2290f8b

parent

6838ab254ff9e1b5af20b8a0b8c7604945b10169

1 files changed, 4 insertions(+), 5 deletions(-)

jump to
M src/Window.ccsrc/Window.cc

@@ -142,7 +142,7 @@ frame.pbutton = frame.ugrip = frame.fgrip = None;

functions = Func_Resize | Func_Move | Func_Iconify | Func_Maximize; mwm_decorations = Decor_Titlebar | Decor_Handle | Decor_Border | - Decor_Iconify | Decor_Maximize | Decor_Close; + Decor_Iconify | Decor_Maximize; client.normal_hint_flags = 0; client.window_group = None;

@@ -422,13 +422,12 @@

void BlackboxWindow::setupDecor() { if (blackbox_attrib.decoration != DecorNone) { // start with everything on - decorations = + decorations = Decor_Close | (mwm_decorations & Decor_Titlebar ? Decor_Titlebar : 0) | (mwm_decorations & Decor_Border ? Decor_Border : 0) | (mwm_decorations & Decor_Handle ? Decor_Handle : 0) | (mwm_decorations & Decor_Iconify ? Decor_Iconify : 0) | - (mwm_decorations & Decor_Maximize ? Decor_Maximize : 0) | - (mwm_decorations & Decor_Close ? Decor_Close : 0); + (mwm_decorations & Decor_Maximize ? Decor_Maximize : 0); if (! (functions & Func_Close)) decorations &= ~Decor_Close; if (! (functions & Func_Maximize)) decorations &= ~Decor_Maximize;

@@ -1311,7 +1310,7 @@

if (mwm_hint->flags & MwmHintsDecorations) { if (mwm_hint->decorations & MwmDecorAll) { mwm_decorations = Decor_Titlebar | Decor_Handle | Decor_Border | - Decor_Iconify | Decor_Maximize | Decor_Close; + Decor_Iconify | Decor_Maximize; } else { mwm_decorations = 0;