# This patch file was generated by NetBeans IDE # Following Index: paths are relative to: D:\JavaFX\repos\openjdk-openjfx-8u-dev\rt # This patch can be applied using context Tools: Patch action on respective folder. # It uses platform neutral UTF-8 encoding and \n newlines. # Above lines and this line are ignored by the patching process. Index: modules/graphics/src/main/java/com/sun/glass/ui/monocle/LinuxStatefulMultiTouchProcessor.java --- modules/graphics/src/main/java/com/sun/glass/ui/monocle/LinuxStatefulMultiTouchProcessor.java +++ modules/graphics/src/main/java/com/sun/glass/ui/monocle/LinuxStatefulMultiTouchProcessor.java @@ -55,9 +55,15 @@ // touch points are released. boolean allPointsReleased = false; while (buffer.hasNextEvent()) { + if (MonocleSettings.settings.traceEventsVerbose) { + System.out.println("currentID = " + currentID + ", currentSlot = " + currentSlot + ", slotToIDMap = " + slotToIDMap + ", x = " + x + ", y = " + y); + } switch (buffer.getEventType()) { case LinuxInput.EV_ABS: { int value = transform.getValue(buffer); + if (MonocleSettings.settings.traceEventsVerbose) { + System.out.println("value = " + value); + } switch (transform.getAxis(buffer)) { case LinuxInput.ABS_MT_SLOT: // If we received coordinates already, assign them @@ -76,7 +82,10 @@ case LinuxInput.ABS_MT_TRACKING_ID: if (value == ID_UNASSIGNED && currentID != ID_UNASSIGNED) { state.removePointForID(currentID); + if (MonocleSettings.settings.traceEventsVerbose) { + System.out.println("removePointForID currentID = " + currentID + ", x = " + x + ", y = " + y); } + } currentID = value; if (currentID == ID_UNASSIGNED) { slotToIDMap.remove(currentSlot); @@ -84,13 +93,13 @@ slotToIDMap.put(currentSlot, currentID); } break; - case LinuxInput.ABS_X: +// case LinuxInput.ABS_X: case LinuxInput.ABS_MT_POSITION_X: if (x == COORD_UNDEFINED) { x = value; } break; - case LinuxInput.ABS_Y: +// case LinuxInput.ABS_Y: case LinuxInput.ABS_MT_POSITION_Y: if (y == COORD_UNDEFINED) { y = value; @@ -119,6 +128,9 @@ if (x == COORD_UNDEFINED && y == COORD_UNDEFINED) { state.removePointForID(currentID); + if (MonocleSettings.settings.traceEventsVerbose) { + System.out.println("removePointForID currentID = " + currentID + ", x = " + x + ", y = " + y); + } currentID = ID_UNASSIGNED; } else { updatePoint(x, y); @@ -136,7 +148,10 @@ updatePoint(x, y); } else if (allPointsReleased) { state.clear(); + if (MonocleSettings.settings.traceEventsVerbose) { + System.out.println("clearAllPoints currentID = " + currentID + ", x = " + x + ", y = " + y); } + } pipeline.pushState(state); x = y = COORD_UNDEFINED; allPointsReleased = false; @@ -157,7 +172,14 @@ p = new TouchState.Point(); p.id = currentID; p = state.addPoint(p); + if (MonocleSettings.settings.traceEventsVerbose) { + System.out.println("addPoint p = " + p + ", currentID = " + currentID + ", x = " + x + ", y = " + y); } + } else { + if (MonocleSettings.settings.traceEventsVerbose) { + System.out.println("updatePoint p = " + p + ", currentID = " + currentID + ", x = " + x + ", y = " + y); + } + } if (x != COORD_UNDEFINED) { p.x = x; }