MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

platform: WM patching fixes

Browse Source 
- mimic Awesome WM as sawfish (fixes IDEA-116527)
- use own constant for Marco if available
- cleanup
This commit is contained in:
Roman Shevchenko
2014-06-19 14:50:37 +02:00
parent 3b01ac5cf0
commit 2bc97d7fc3
1 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/wm/impl/X11UiUtil.java
+15 -23
View File
@@ -248,27 +248,13 @@ public class X11UiUtil {
try {
if (wmName.startsWith("Mutter") || "Muffin".equals(wmName) || "GNOME Shell".equals(wmName)) {
try {
setWM("MUTTER_WM");
}
catch (NoSuchFieldException e) {
setWM("METACITY_WM");
}
setWM("MUTTER_WM", "METACITY_WM");
}
else if ("Marco".equals(wmName)) {
setWM("METACITY_WM");
setWM("MARCO_WM", "METACITY_WM");
}
else if ("awesome".equals(wmName)) {
try {
Class<?> xwmClass = Class.forName("sun.awt.X11.XWM");
xwmClass.getDeclaredField("OTHER_NONREPARENTING_WM");
if (System.getenv("_JAVA_AWT_WM_NONREPARENTING") == null) {
setWM("OTHER_NONREPARENTING_WM"); // patch present but not activated
}
}
catch (NoSuchFieldException e) {
setWM("LG3D_WM"); // patch absent - mimic LG3D
}
setWM("SAWFISH_WM");
}
}
catch (Throwable e) {
@@ -276,15 +262,21 @@ public class X11UiUtil {
}
}
private static void setWM(String wmConstant) throws Exception {
private static void setWM(String... wmConstants) throws Exception {
Class<?> xwmClass = Class.forName("sun.awt.X11.XWM");
Object xwm = method(xwmClass, "getWM").invoke(null);
if (xwm != null) {
Field wm = field(xwmClass, wmConstant);
Object id = wm.get(null);
if (id != null) {
field(xwmClass, "awt_wmgr").set(null, id);
field(xwmClass, "WMID").set(xwm, id);
for (String wmConstant : wmConstants) {
try {
Field wm = field(xwmClass, wmConstant);
Object id = wm.get(null);
if (id != null) {
field(xwmClass, "awt_wmgr").set(null, id);
field(xwmClass, "WMID").set(xwm, id);
break;
}
}
catch (NoSuchFieldException ignore) { }
}
}
}