Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/build-support/java7-openjdk/openjdk7_nonreparenting-wm.diff
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2021-05-20 10:09:02 +0200
committerAndreas Baumann <mail@andreasbaumann.cc>2021-05-20 10:09:02 +0200
commit6e9e3c5b3b08c44f72413fd5abbd06b35cb2e7ed (patch)
treee255277b27da1b7998ada513fc51ea7b3d409b74 /build-support/java7-openjdk/openjdk7_nonreparenting-wm.diff
parent86b73247503aa2cb7b0dd80f20ae550db32c506d (diff)
added java7-openjdk to build-support
Diffstat (limited to 'build-support/java7-openjdk/openjdk7_nonreparenting-wm.diff')
-rw-r--r--build-support/java7-openjdk/openjdk7_nonreparenting-wm.diff58
1 files changed, 58 insertions, 0 deletions
diff --git a/build-support/java7-openjdk/openjdk7_nonreparenting-wm.diff b/build-support/java7-openjdk/openjdk7_nonreparenting-wm.diff
new file mode 100644
index 00000000..fb4710c1
--- /dev/null
+++ b/build-support/java7-openjdk/openjdk7_nonreparenting-wm.diff
@@ -0,0 +1,58 @@
+--- openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java.orig 2013-10-16 16:17:14.000000000 +0200
++++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java 2013-10-21 20:57:34.768580842 +0200
+@@ -105,7 +105,8 @@
+ LG3D_WM = 13,
+ CWM_WM = 14,
+ MUTTER_WM = 15,
+- MARCO_WM = 16;
++ MARCO_WM = 16,
++ OTHER_NONREPARENTING_WM = 17;
+ public String toString() {
+ switch (WMID) {
+ case NO_WM:
+@@ -591,7 +592,7 @@
+ // TODO: according to wikipedia, compiz is now reparenting. This should
+ // probably be updated.
+ static boolean isNonReparentingWM() {
+- return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.CWM_WM);
++ return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.CWM_WM || XWM.getWMID() == XWM.OTHER_NONREPARENTING_WM);
+ }
+
+ /*
+@@ -781,9 +782,17 @@
+ * supports WIN or _NET wm spec.
+ */
+ else if (l_net_protocol.active()) {
+- awt_wmgr = XWM.OTHER_WM;
++ if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) {
++ awt_wmgr = XWM.OTHER_NONREPARENTING_WM;
++ } else {
++ awt_wmgr = XWM.OTHER_WM;
++ }
+ } else if (win.active()) {
+- awt_wmgr = XWM.OTHER_WM;
++ if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) {
++ awt_wmgr = XWM.OTHER_NONREPARENTING_WM;
++ } else {
++ awt_wmgr = XWM.OTHER_WM;
++ }
+ }
+ /*
+ * Check for legacy WMs.
+@@ -794,6 +803,8 @@
+ awt_wmgr = XWM.MOTIF_WM;
+ } else if (isOpenLook()) {
+ awt_wmgr = XWM.OPENLOOK_WM;
++ } else if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) {
++ awt_wmgr = XWM.OTHER_NONREPARENTING_WM;
+ } else {
+ awt_wmgr = XWM.OTHER_WM;
+ }
+@@ -1309,6 +1320,7 @@
+ res = new Insets(28, 6, 6, 6);
+ break;
+ case NO_WM:
++ case OTHER_NONREPARENTING_WM:
+ case LG3D_WM:
+ res = zeroInsets;
+ break;