mirror of
https://gitdl.cn/https://github.com/chakralinux/core.git
synced 2025-02-03 20:07:14 +08:00
918fcfd325
Now the package is named just "openjdk". This should hopefully make for easier replacements with newer major releases of OpenJDK.
59 lines
2.2 KiB
Diff
59 lines
2.2 KiB
Diff
--- openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java.orig 2011-08-07 18:45:05.000000000 +0200
|
|
+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java 2011-08-07 18:45:54.000000000 +0200
|
|
@@ -103,7 +103,8 @@
|
|
COMPIZ_WM = 12,
|
|
LG3D_WM = 13,
|
|
CWM_WM = 14,
|
|
- MUTTER_WM = 15;
|
|
+ MUTTER_WM = 15,
|
|
+ OTHER_NONREPARENTING_WM = 16;
|
|
public String toString() {
|
|
switch (WMID) {
|
|
case NO_WM:
|
|
@@ -583,7 +584,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);
|
|
}
|
|
|
|
/*
|
|
@@ -771,9 +772,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.
|
|
@@ -784,6 +793,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;
|
|
}
|
|
@@ -1298,6 +1309,7 @@
|
|
res = new Insets(28, 6, 6, 6);
|
|
break;
|
|
case NO_WM:
|
|
+ case OTHER_NONREPARENTING_WM:
|
|
case LG3D_WM:
|
|
res = zeroInsets;
|
|
break;
|