PKGBUILDs/extra/java7-openjdk/openjdk7_nonreparenting-wm.diff

59 lines
2.3 KiB
Diff
Raw Normal View History

2013-10-21 22:42:19 +00:00
--- 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 @@
2013-03-22 00:52:43 +00:00
LG3D_WM = 13,
CWM_WM = 14,
2013-10-21 22:42:19 +00:00
MUTTER_WM = 15,
- MARCO_WM = 16;
+ MARCO_WM = 16,
+ OTHER_NONREPARENTING_WM = 17;
2013-03-22 00:52:43 +00:00
public String toString() {
switch (WMID) {
case NO_WM:
2013-10-21 22:42:19 +00:00
@@ -591,7 +592,7 @@
2013-03-22 00:52:43 +00:00
// 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);
}
/*
2013-10-21 22:42:19 +00:00
@@ -781,9 +782,17 @@
2013-03-22 00:52:43 +00:00
* 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;
2013-10-21 22:42:19 +00:00
+ }
2013-03-22 00:52:43 +00:00
} 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;
2013-10-21 22:42:19 +00:00
+ }
2013-03-22 00:52:43 +00:00
}
/*
* Check for legacy WMs.
2013-10-21 22:42:19 +00:00
@@ -794,6 +803,8 @@
2013-03-22 00:52:43 +00:00
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;
}
2013-10-21 22:42:19 +00:00
@@ -1309,6 +1320,7 @@
2013-03-22 00:52:43 +00:00
res = new Insets(28, 6, 6, 6);
break;
case NO_WM:
+ case OTHER_NONREPARENTING_WM:
case LG3D_WM:
res = zeroInsets;
break;