| [981dbbc] | 1 | --- openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java 2016-04-01 07:04:05.000000000 +0200 |
|---|
| 2 | +++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java 2016-04-10 13:49:06.513358648 +0200 |
|---|
| 3 | @@ -104,7 +104,8 @@ |
|---|
| 4 | COMPIZ_WM = 12, |
|---|
| 5 | LG3D_WM = 13, |
|---|
| 6 | CWM_WM = 14, |
|---|
| 7 | - MUTTER_WM = 15; |
|---|
| 8 | + MUTTER_WM = 15, |
|---|
| 9 | + OTHER_NONREPARENTING_WM = 16; |
|---|
| 10 | public String toString() { |
|---|
| 11 | switch (WMID) { |
|---|
| 12 | case NO_WM: |
|---|
| 13 | @@ -601,7 +602,8 @@ |
|---|
| 14 | awtWMNonReparenting = (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) ? 1 : 0; |
|---|
| 15 | } |
|---|
| 16 | return (awtWMNonReparenting == 1 || XWM.getWMID() == XWM.COMPIZ_WM |
|---|
| 17 | - || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.CWM_WM); |
|---|
| 18 | + || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.CWM_WM |
|---|
| 19 | + || XWM.getWMID() == XWM.OTHER_NONREPARENTING_WM); |
|---|
| 20 | } |
|---|
| 21 | |
|---|
| 22 | /* |
|---|
| 23 | @@ -796,9 +798,17 @@ |
|---|
| 24 | * supports WIN or _NET wm spec. |
|---|
| 25 | */ |
|---|
| 26 | else if (l_net_protocol.active()) { |
|---|
| 27 | - awt_wmgr = XWM.OTHER_WM; |
|---|
| 28 | + if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) { |
|---|
| 29 | + awt_wmgr = XWM.OTHER_NONREPARENTING_WM; |
|---|
| 30 | + } else { |
|---|
| 31 | + awt_wmgr = XWM.OTHER_WM; |
|---|
| 32 | + } |
|---|
| 33 | } else if (win.active()) { |
|---|
| 34 | - awt_wmgr = XWM.OTHER_WM; |
|---|
| 35 | + if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) { |
|---|
| 36 | + awt_wmgr = XWM.OTHER_NONREPARENTING_WM; |
|---|
| 37 | + } else { |
|---|
| 38 | + awt_wmgr = XWM.OTHER_WM; |
|---|
| 39 | + } |
|---|
| 40 | } |
|---|
| 41 | /* |
|---|
| 42 | * Check for legacy WMs. |
|---|
| 43 | @@ -809,6 +819,8 @@ |
|---|
| 44 | awt_wmgr = XWM.MOTIF_WM; |
|---|
| 45 | } else if (isOpenLook()) { |
|---|
| 46 | awt_wmgr = XWM.OPENLOOK_WM; |
|---|
| 47 | + } else if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) { |
|---|
| 48 | + awt_wmgr = XWM.OTHER_NONREPARENTING_WM; |
|---|
| 49 | } else { |
|---|
| 50 | awt_wmgr = XWM.OTHER_WM; |
|---|
| 51 | } |
|---|
| 52 | @@ -1337,6 +1349,7 @@ |
|---|
| 53 | res = new Insets(28, 6, 6, 6); |
|---|
| 54 | break; |
|---|
| 55 | case NO_WM: |
|---|
| 56 | + case OTHER_NONREPARENTING_WM: |
|---|
| 57 | case LG3D_WM: |
|---|
| 58 | res = zeroInsets; |
|---|
| 59 | break; |
|---|
