git://git.nikiroo.be
/
nikiroo-utils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
immutable TMouseEvent
[nikiroo-utils.git]
/
src
/
jexer
/
io
/
ECMA48Terminal.java
diff --git
a/src/jexer/io/ECMA48Terminal.java
b/src/jexer/io/ECMA48Terminal.java
index b8fabda389b5253d10bf5ed0a1b91199eee37bff..064c4ec99f98b7d85963adc1429316751bcb4601 100644
(file)
--- a/
src/jexer/io/ECMA48Terminal.java
+++ b/
src/jexer/io/ECMA48Terminal.java
@@
-474,7
+474,7
@@
public class ECMA48Terminal implements Runnable {
// Unknown modifier, bail out
return null;
}
// Unknown modifier, bail out
return null;
}
-
+
switch (key) {
case 1:
return new TKeypressEvent(kbHome, alt, ctrl, shift);
switch (key) {
case 1:
return new TKeypressEvent(kbHome, alt, ctrl, shift);
@@
-530,97
+530,100
@@
public class ECMA48Terminal implements Runnable {
y = windowResize.getHeight() - 1;
}
y = windowResize.getHeight() - 1;
}
- TMouseEvent event = new TMouseEvent(TMouseEvent.Type.MOUSE_DOWN);
- event.x = x;
- event.y = y;
- event.absoluteX = x;
- event.absoluteY = y;
+ TMouseEvent.Type eventType = TMouseEvent.Type.MOUSE_DOWN;
+ boolean eventMouse1 = false;
+ boolean eventMouse2 = false;
+ boolean eventMouse3 = false;
+ boolean eventMouseWheelUp = false;
+ boolean eventMouseWheelDown = false;
// System.err.printf("buttons: %04x\r\n", buttons);
switch (buttons) {
case 0:
// System.err.printf("buttons: %04x\r\n", buttons);
switch (buttons) {
case 0:
- event
.m
ouse1 = true;
+ event
M
ouse1 = true;
mouse1 = true;
break;
case 1:
mouse1 = true;
break;
case 1:
- event
.m
ouse2 = true;
+ event
M
ouse2 = true;
mouse2 = true;
break;
case 2:
mouse2 = true;
break;
case 2:
- event
.m
ouse3 = true;
+ event
M
ouse3 = true;
mouse3 = true;
break;
case 3:
// Release or Move
if (!mouse1 && !mouse2 && !mouse3) {
mouse3 = true;
break;
case 3:
// Release or Move
if (!mouse1 && !mouse2 && !mouse3) {
- event
.t
ype = TMouseEvent.Type.MOUSE_MOTION;
+ event
T
ype = TMouseEvent.Type.MOUSE_MOTION;
} else {
} else {
- event
.t
ype = TMouseEvent.Type.MOUSE_UP;
+ event
T
ype = TMouseEvent.Type.MOUSE_UP;
}
if (mouse1) {
mouse1 = false;
}
if (mouse1) {
mouse1 = false;
- event
.m
ouse1 = true;
+ event
M
ouse1 = true;
}
if (mouse2) {
mouse2 = false;
}
if (mouse2) {
mouse2 = false;
- event
.m
ouse2 = true;
+ event
M
ouse2 = true;
}
if (mouse3) {
mouse3 = false;
}
if (mouse3) {
mouse3 = false;
- event
.m
ouse3 = true;
+ event
M
ouse3 = true;
}
break;
case 32:
// Dragging with mouse1 down
}
break;
case 32:
// Dragging with mouse1 down
- event
.m
ouse1 = true;
+ event
M
ouse1 = true;
mouse1 = true;
mouse1 = true;
- event
.t
ype = TMouseEvent.Type.MOUSE_MOTION;
+ event
T
ype = TMouseEvent.Type.MOUSE_MOTION;
break;
case 33:
// Dragging with mouse2 down
break;
case 33:
// Dragging with mouse2 down
- event
.m
ouse2 = true;
+ event
M
ouse2 = true;
mouse2 = true;
mouse2 = true;
- event
.t
ype = TMouseEvent.Type.MOUSE_MOTION;
+ event
T
ype = TMouseEvent.Type.MOUSE_MOTION;
break;
case 34:
// Dragging with mouse3 down
break;
case 34:
// Dragging with mouse3 down
- event
.m
ouse3 = true;
+ event
M
ouse3 = true;
mouse3 = true;
mouse3 = true;
- event
.t
ype = TMouseEvent.Type.MOUSE_MOTION;
+ event
T
ype = TMouseEvent.Type.MOUSE_MOTION;
break;
case 96:
// Dragging with mouse2 down after wheelUp
break;
case 96:
// Dragging with mouse2 down after wheelUp
- event
.m
ouse2 = true;
+ event
M
ouse2 = true;
mouse2 = true;
mouse2 = true;
- event
.t
ype = TMouseEvent.Type.MOUSE_MOTION;
+ event
T
ype = TMouseEvent.Type.MOUSE_MOTION;
break;
case 97:
// Dragging with mouse2 down after wheelDown
break;
case 97:
// Dragging with mouse2 down after wheelDown
- event
.m
ouse2 = true;
+ event
M
ouse2 = true;
mouse2 = true;
mouse2 = true;
- event
.t
ype = TMouseEvent.Type.MOUSE_MOTION;
+ event
T
ype = TMouseEvent.Type.MOUSE_MOTION;
break;
case 64:
break;
case 64:
- event
.m
ouseWheelUp = true;
+ event
M
ouseWheelUp = true;
break;
case 65:
break;
case 65:
- event
.m
ouseWheelDown = true;
+ event
M
ouseWheelDown = true;
break;
default:
// Unknown, just make it motion
break;
default:
// Unknown, just make it motion
- event
.t
ype = TMouseEvent.Type.MOUSE_MOTION;
+ event
T
ype = TMouseEvent.Type.MOUSE_MOTION;
break;
}
break;
}
- return event;
+ return new TMouseEvent(eventType, x, y, x, y,
+ eventMouse1, eventMouse2, eventMouse3,
+ eventMouseWheelUp, eventMouseWheelDown);
}
/**
}
/**