From 7dea24910a5fe18a25c4effe512e379d8a1b12f8 Mon Sep 17 00:00:00 2001
From: Michael Jennings <mej@kainx.org>
Date: Sun, 25 Oct 2009 21:03:18 +0000
Subject: [PATCH] Sun Oct 25 14:02:14 2009                        Michael
 Jennings (mej)

Revert bad change to borderless code.  We're now doing best effort
borderless with no override_redirect (which may come back some day as
a separate option if there's a need) based on advice from raster and
kwo.
----------------------------------------------------------------------


SVN revision: 43284
---
 ChangeLog     |  7 +++++++
 src/windows.c | 52 ++-------------------------------------------------
 2 files changed, 9 insertions(+), 50 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 14c16c4..7e59f53 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5622,3 +5622,10 @@ Sun Oct 25 13:52:40 2009                        Michael Jennings (mej)
 Support font effects in 8 directions.  Patch supplied by Joern
 Bernhardt <Joern.Bernhardt@gmx.net>.
 ----------------------------------------------------------------------
+Sun Oct 25 14:02:14 2009                        Michael Jennings (mej)
+
+Revert bad change to borderless code.  We're now doing best effort
+borderless with no override_redirect (which may come back some day as
+a separate option if there's a need) based on advice from raster and
+kwo.
+----------------------------------------------------------------------
diff --git a/src/windows.c b/src/windows.c
index 3601ebb..a9cff63 100644
--- a/src/windows.c
+++ b/src/windows.c
@@ -363,48 +363,6 @@ set_pointer_colors(const char *fg_name, const char *bg_name)
     XRecolorCursor(Xdisplay, TermWin_cursor, &fg, &bg);
 }
 
-int
-check_mwm_supported(void)
-{
-    Atom prop, mwm_prop, type_ret;
-    unsigned char *prop_ret;
-    unsigned long bytes_after, num_ret;
-    int format_ret, num, i, supported = 0;
-
-    /* check whether wm support mwm hint */
-    prop = XInternAtom(Xdisplay, "_NET_SUPPORTED", True);
-    mwm_prop = XInternAtom(Xdisplay, "_MOTIF_WM_HINTS", True);
-    
-    if ((prop != None) && (mwm_prop != None)) {
-        prop_ret = NULL;
-        if (XGetWindowProperty(Xdisplay, Xroot, prop, 0, 0x7fffffff, False,
-                               XA_ATOM, &type_ret, &format_ret, &num_ret,
-                               &bytes_after, &prop_ret) == Success) {
-
-            if ((type_ret == XA_ATOM) &&
-                (format_ret == 32) &&
-                (num_ret && prop_ret)) {
-                for (i = 0; i < num_ret; i++) {
-                    if (mwm_prop == ((unsigned long*)prop_ret)[i]) {
-                        supported = 1;
-                        break;
-                    }
-                }
-            }
-            if (prop_ret)
-                XFree(prop_ret);
-        }
-    }
-    /* check whether wm is mwm */
-    if (!supported) {
-        prop = XInternAtom(Xdisplay, "_MOTIF_WM_INFO", True);
-        if (prop != None) {
-            supported = 1;
-        }
-    }    
-    return supported;
-}
-
 /* Create_Windows() - Open and map the window */
 void
 Create_Windows(int argc, char *argv[])
@@ -420,14 +378,8 @@ Create_Windows(int argc, char *argv[])
     MWMHints mwmhints;
 
     if (BITFIELD_IS_SET(eterm_options, ETERM_OPTIONS_BORDERLESS)) {
-        if (check_mwm_supported()) {
-            mwmhints.flags = MWM_HINTS_DECORATIONS;
-            mwmhints.decorations = 0;
-        } else {
-            libast_print_warning("Window Manager does not support MWM hints.  Bypassing window manager control for borderless window.\n");
-            Attributes.override_redirect = TRUE;
-            mwmhints.flags = 0;
-        }
+        mwmhints.flags = MWM_HINTS_DECORATIONS;
+        mwmhints.decorations = 0;
     } else {
         mwmhints.flags = 0;
     }