diff options
author | Omar Vega Ramos <ovruni@gnu.org.pe> | 2016-02-10 12:47:01 -0500 |
---|---|---|
committer | Omar Vega Ramos <ovruni@gnu.org.pe> | 2016-02-10 12:47:01 -0500 |
commit | cfba75b9832f74234d527132c1def6ae5d20646e (patch) | |
tree | 69942852fe1a38e52c783fe68646eec4d4dd03e4 /pcr/openjdk6/nonreparenting-wm.diff | |
parent | c750430e7c0ccca38bacef5cacb0fe015d228527 (diff) | |
download | abslibre-cfba75b9832f74234d527132c1def6ae5d20646e.tar.gz abslibre-cfba75b9832f74234d527132c1def6ae5d20646e.tar.bz2 abslibre-cfba75b9832f74234d527132c1def6ae5d20646e.zip |
openjdk6: remove package from [pcr]
Diffstat (limited to 'pcr/openjdk6/nonreparenting-wm.diff')
-rw-r--r-- | pcr/openjdk6/nonreparenting-wm.diff | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/pcr/openjdk6/nonreparenting-wm.diff b/pcr/openjdk6/nonreparenting-wm.diff deleted file mode 100644 index 65fa66e89..000000000 --- a/pcr/openjdk6/nonreparenting-wm.diff +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/jdk/src/solaris/classes/sun/awt/X11/XWM.java b/jdk/src/solaris/classes/sun/awt/X11/XWM.java -index 68d1ff7..878327e 100644 ---- openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java -+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java -@@ -99,7 +99,8 @@ - METACITY_WM = 11, - COMPIZ_WM = 12, - LG3D_WM = 13, -- MUTTER_WM = 14; -+ MUTTER_WM = 14, -+ OTHER_NONREPARENTING_WM = 15; - public String toString() { - switch (WMID) { - case NO_WM: -@@ -564,7 +567,7 @@ class XWM implements MWMConstants, XUtilConstants { - } - - static boolean isNonReparentingWM() { -- return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM); -+ return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.OTHER_NONREPARENTING_WM); - } - - /* -@@ -764,9 +767,17 @@ class XWM implements MWMConstants, XUtilConstants { - * 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. -@@ -777,6 +788,8 @@ class XWM implements MWMConstants, XUtilConstants { - 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 +1311,7 @@ class XWM implements MWMConstants, XUtilConstants { - res = new Insets(28, 6, 6, 6); - break; - case NO_WM: -+ case OTHER_NONREPARENTING_WM: - case LG3D_WM: - res = zeroInsets; - break; |