diff options
| author | Britney Fransen <brfransen@gmail.com> | 2014-12-18 22:10:03 (GMT) |
|---|---|---|
| committer | Britney Fransen <brfransen@gmail.com> | 2014-12-18 22:10:03 (GMT) |
| commit | cc2b78d94e871828520e3d291d95c1ebe61431e5 (patch) | |
| tree | 2608b4dbce10931079e12133355593e1c3f9091b /abs/extra/java7-openjdk/openjdk7_nonreparenting-wm.diff | |
| parent | 78ed666d75c7b9b0523d9b0a67ceba935e82cef3 (diff) | |
| download | linhes_pkgbuild-cc2b78d94e871828520e3d291d95c1ebe61431e5.zip linhes_pkgbuild-cc2b78d94e871828520e3d291d95c1ebe61431e5.tar.gz linhes_pkgbuild-cc2b78d94e871828520e3d291d95c1ebe61431e5.tar.bz2 | |
java7-openjdk: update to 7.u71_2.5.3
Diffstat (limited to 'abs/extra/java7-openjdk/openjdk7_nonreparenting-wm.diff')
| -rw-r--r-- | abs/extra/java7-openjdk/openjdk7_nonreparenting-wm.diff | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/abs/extra/java7-openjdk/openjdk7_nonreparenting-wm.diff b/abs/extra/java7-openjdk/openjdk7_nonreparenting-wm.diff index 22d54fc..fb4710c 100644 --- a/abs/extra/java7-openjdk/openjdk7_nonreparenting-wm.diff +++ b/abs/extra/java7-openjdk/openjdk7_nonreparenting-wm.diff @@ -1,16 +1,16 @@ ---- 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, +--- 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; -+ MUTTER_WM = 15, -+ OTHER_NONREPARENTING_WM = 16; + MUTTER_WM = 15, +- MARCO_WM = 16; ++ MARCO_WM = 16, ++ OTHER_NONREPARENTING_WM = 17; public String toString() { switch (WMID) { case NO_WM: -@@ -583,7 +584,7 @@ +@@ -591,7 +592,7 @@ // TODO: according to wikipedia, compiz is now reparenting. This should // probably be updated. static boolean isNonReparentingWM() { @@ -19,7 +19,7 @@ } /* -@@ -771,9 +772,17 @@ +@@ -781,9 +782,17 @@ * supports WIN or _NET wm spec. */ else if (l_net_protocol.active()) { @@ -28,18 +28,18 @@ + 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 @@ +@@ -794,6 +803,8 @@ awt_wmgr = XWM.MOTIF_WM; } else if (isOpenLook()) { awt_wmgr = XWM.OPENLOOK_WM; @@ -48,7 +48,7 @@ } else { awt_wmgr = XWM.OTHER_WM; } -@@ -1298,6 +1309,7 @@ +@@ -1309,6 +1320,7 @@ res = new Insets(28, 6, 6, 6); break; case NO_WM: |