Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Keys holding thread #99

Merged
merged 16 commits into from
Sep 4, 2023
Merged

Keys holding thread #99

Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
6916197
Keys holding thread
shinovon Jun 13, 2023
9d4f0d1
fix
shinovon Jun 13, 2023
17fb3b4
Add start delay
shinovon Jun 13, 2023
28e0126
Move repeater code out of repaint loop
Feodor0090 Sep 4, 2023
9be9b13
Use bitmasks instead of bool[]
Feodor0090 Sep 4, 2023
dbecd36
Helper methods for thread start/stop
Feodor0090 Sep 4, 2023
17d24fe
Start thread when needed and stop when not
Feodor0090 Sep 4, 2023
04bf153
Cancel repeats when toggling panels
Feodor0090 Sep 4, 2023
9cd1783
Cancel repeats when selecting a point
Feodor0090 Sep 4, 2023
148615e
Move focus check inside loop
Feodor0090 Sep 4, 2023
f1af613
Move whole handling code inside loop
Feodor0090 Sep 4, 2023
ec9c520
Replace for-switch with ifs
Feodor0090 Sep 4, 2023
25dfda8
Merge branch 'main' into key-holding-thread
Feodor0090 Sep 4, 2023
706a526
Fix some oversights
Feodor0090 Sep 4, 2023
83947c2
Give repeat thread max prio
Feodor0090 Sep 4, 2023
f84e650
Do not start repeater automatically
Feodor0090 Sep 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
125 changes: 88 additions & 37 deletions src/mahomaps/screens/MapCanvas.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,40 @@ public class MapCanvas extends MultitouchCanvas implements CommandListener {
private int lastOverlaysW;
public final FpsLimiter repaintGate = new FpsLimiter();
private Graphics cachedGraphics;
/*
* up down left right (1<< 0 1 2 3)
*/
private int keysState = 0;
private Thread repeatThread;
private final Runnable repeatAction = new Runnable() {
public void run() {
try {
Thread.sleep(200); // wait a little before repeats
while (true) {
Thread.sleep(16); // interruption will throw here stopping the thread
if (!mapFocused) {
synchronized (repeatAction) {
repeatThread = null;
return;
}
}
int val = Math.min(20, repeatCount / 3);
if ((keysState & 1) != 0)
state.yOffset += val;
if ((keysState & 2) != 0)
state.yOffset -= val;
if ((keysState & 4) != 0)
state.xOffset += val;
if ((keysState & 8) != 0)
state.xOffset -= val;
state.ClampOffset();
repeatCount++;
requestRepaint();
}
} catch (InterruptedException e) {
}
}
};

public MapCanvas(TilesProvider tiles) {
this.tiles = tiles;
Expand Down Expand Up @@ -383,6 +417,7 @@ protected void keyPressed(int k) {
return;
}
if (k == -7 || k == -22) {
tryStopRepeatThread(true);
if (mapFocused) {
if (!UIElement.IsQueueEmpty()) {
mapFocused = false;
Expand All @@ -404,6 +439,7 @@ protected void keyPressed(int k) {
if (mapFocused) {
switch (ga) {
case FIRE:
tryStopRepeatThread(true);
Geopoint s = Geopoint.GetAtCoords(state, 0, 0);
if (s.IsValid() && MahoMapsApp.lastSearch == null) {
// немного костылей:
Expand All @@ -422,20 +458,28 @@ protected void keyPressed(int k) {
}
break handling;
case UP:
keysState |= 1 << 0;
state.yOffset += 10;
state.ClampOffset();
tryStartRepeatThread();
break handling;
case DOWN:
keysState |= 1 << 1;
state.yOffset -= 10;
state.ClampOffset();
tryStartRepeatThread();
break handling;
case LEFT:
keysState |= 1 << 2;
state.xOffset += 10;
state.ClampOffset();
tryStartRepeatThread();
break handling;
case RIGHT:
keysState |= 1 << 3;
state.xOffset -= 10;
state.ClampOffset();
tryStartRepeatThread();
break handling;
}
switch (k) {
Expand Down Expand Up @@ -484,48 +528,30 @@ protected void keyPressed(int k) {
requestRepaint();
}

protected void keyRepeated(int k) {
// "home" button
if (k == -12)
return;

UIElement.touchInput = false;
protected void keyReleased(int k) {
int ga = 0;
try {
ga = getGameAction(k);
} catch (IllegalArgumentException e) { // j2l moment
} catch (IllegalArgumentException e) {
}
if (mapFocused) {
int val;
if (repeatCount < 25) {
val = 2 * repeatCount;
} else {
val = 50;
}
switch (ga) {
case UP:
state.yOffset += val;
break;
case DOWN:
state.yOffset -= val;
break;
case LEFT:
state.xOffset += val;
break;
case RIGHT:
state.xOffset -= val;
break;
default:
return;
}
state.ClampOffset();
repeatCount++;
requestRepaint();
switch (ga) {
case UP:
keysState &= ~(1 << 0);
tryStopRepeatThread(false);
break;
case DOWN:
keysState &= ~(1 << 1);
tryStopRepeatThread(false);
break;
case LEFT:
keysState &= ~(1 << 2);
tryStopRepeatThread(false);
break;
case RIGHT:
keysState &= ~(1 << 3);
tryStopRepeatThread(false);
break;
}
}

protected void keyReleased(int k) {
repeatCount = 0;
requestRepaint();
}

Expand Down Expand Up @@ -635,6 +661,7 @@ protected void sizeChanged(int w, int h) {

protected void hideNotify() {
hidden = true;
tryStopRepeatThread(true);
}

protected void showNotify() {
Expand All @@ -643,4 +670,28 @@ protected void showNotify() {
super.showNotify();
requestRepaint();
}

private final void tryStartRepeatThread() {
synchronized (repeatAction) {
if (keysState != 0 && repeatThread == null) {
Thread t = new Thread(repeatAction, "Key repeat");
t.setPriority(Thread.MAX_PRIORITY);
repeatCount = 0;
t.start();
repeatThread = t;
}
}
}

private final void tryStopRepeatThread(boolean force) {
synchronized (repeatAction) {
if (keysState == 0 || force) {
Thread t = repeatThread;
if (t != null) {
t.interrupt();
repeatThread = null;
}
}
}
}
}
Loading