Changeset 35929 in osm for applications/editors

Timestamp:

2022-03-14T19:12:37+01:00 (2 years ago)

Author:

taylor.smock

Message:

fix #21929: buildings_tools creating unnecessary file descriptors

This causes XWayland to crash (Java uses XWayland at this time, when run under
Wayland). buildings_tools causes this problem by constantly creating new
cursors in the EDT thread.

File:

• applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/DrawBuildingAction.java (modified) (2 diffs)

applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/DrawBuildingAction.java

@@ -49 +49 @@
 public class DrawBuildingAction extends MapMode implements MapViewPaintable, DataSelectionListener,
         KeyPressReleaseListener, ModifierExListener {
+    // We need to avoid opening many file descriptors on Linux under Wayland -- see JOSM #21929. This will probably also
+    // improve performance, since we aren't creating cursors all the time.
+    private static final Cursor CURSOR_SILO = ImageProvider.getCursor("crosshair", "silo");
+    private static final Cursor CURSOR_BUILDING = ImageProvider.getCursor("crosshair", "building");
+
     private enum Mode {
         None, Drawing, DrawingWidth, DrawingAngFix
@@ -87 +92 @@
         try {
             if (ToolSettings.Shape.CIRCLE == ToolSettings.getShape()) {
-                return ImageProvider.getCursor("crosshair", "silo");
+                return CURSOR_SILO;
             } else {
-                return ImageProvider.getCursor("crosshair", "building");
+                return CURSOR_BUILDING;
             }
         } catch (Exception e) {