Mercurial > 510Connectbot
annotate app/src/main/java/com/five_ten_sg/connectbot/service/TerminalMonitor.java @ 499:267e72057707
updates for android10+
author | Carl Byington <carl@five-ten-sg.com> |
---|---|
date | Tue, 07 Jun 2022 16:04:52 -0700 |
parents | f698820bffdf |
children | b8cc360e1550 |
rev | line source |
---|---|
0 | 1 package com.five_ten_sg.connectbot.service; |
2 | |
496
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
3 import android.app.ActivityManager; |
0 | 4 import android.content.ComponentName; |
5 import android.content.Context; | |
6 import android.content.Intent; | |
7 import android.content.ServiceConnection; | |
155 | 8 import android.net.Uri; |
0 | 9 import android.os.IBinder; |
10 import android.util.Log; | |
11 import android.view.View; | |
496
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
12 import android.view.inputmethod.InputMethodManager; |
0 | 13 import de.mud.terminal.vt320; |
14 import java.io.IOException; | |
15 import java.io.InputStream; | |
16 import java.io.OutputStream; | |
17 import java.net.InetAddress; | |
18 import java.net.Socket; | |
19 import java.nio.charset.Charset; | |
252
932e34a11e9e
add range checking on get/set fields
Carl Byington <carl@five-ten-sg.com>
parents:
251
diff
changeset
|
20 import java.util.Arrays; |
0 | 21 import java.util.HashMap; |
15
1588e359a972
queue pending monitor commands until socket is open
Carl Byington <carl@five-ten-sg.com>
parents:
0
diff
changeset
|
22 import java.util.concurrent.ArrayBlockingQueue; |
1588e359a972
queue pending monitor commands until socket is open
Carl Byington <carl@five-ten-sg.com>
parents:
0
diff
changeset
|
23 import java.util.concurrent.BlockingQueue; |
1588e359a972
queue pending monitor commands until socket is open
Carl Byington <carl@five-ten-sg.com>
parents:
0
diff
changeset
|
24 import java.util.concurrent.ConcurrentHashMap; |
0 | 25 |
174
b010f9dc801f
add switch session command from the monitor
Carl Byington <carl@five-ten-sg.com>
parents:
173
diff
changeset
|
26 import com.five_ten_sg.connectbot.ConsoleActivity; |
b010f9dc801f
add switch session command from the monitor
Carl Byington <carl@five-ten-sg.com>
parents:
173
diff
changeset
|
27 import com.five_ten_sg.connectbot.bean.HostBean; |
b010f9dc801f
add switch session command from the monitor
Carl Byington <carl@five-ten-sg.com>
parents:
173
diff
changeset
|
28 |
b010f9dc801f
add switch session command from the monitor
Carl Byington <carl@five-ten-sg.com>
parents:
173
diff
changeset
|
29 |
0 | 30 public class TerminalMonitor { |
457
105815cce146
minimum version android 5, target and compile version api 28
Carl Byington <carl@five-ten-sg.com>
parents:
438
diff
changeset
|
31 public final static String TAG = "ConnectBot.TermMonitor"; |
0 | 32 |
172
cb9e359ea2bd
add switch session command from the monitor
Carl Byington <carl@five-ten-sg.com>
parents:
155
diff
changeset
|
33 public static final char MONITOR_CMD_INIT = 0; |
cb9e359ea2bd
add switch session command from the monitor
Carl Byington <carl@five-ten-sg.com>
parents:
155
diff
changeset
|
34 public static final char MONITOR_CMD_ACTIVATE = 1; |
cb9e359ea2bd
add switch session command from the monitor
Carl Byington <carl@five-ten-sg.com>
parents:
155
diff
changeset
|
35 public static final char MONITOR_CMD_KEYSTATE = 2; |
cb9e359ea2bd
add switch session command from the monitor
Carl Byington <carl@five-ten-sg.com>
parents:
155
diff
changeset
|
36 public static final char MONITOR_CMD_CURSORMOVE = 3; |
cb9e359ea2bd
add switch session command from the monitor
Carl Byington <carl@five-ten-sg.com>
parents:
155
diff
changeset
|
37 public static final char MONITOR_CMD_SCREENCHANGE = 4; |
cb9e359ea2bd
add switch session command from the monitor
Carl Byington <carl@five-ten-sg.com>
parents:
155
diff
changeset
|
38 public static final char MONITOR_CMD_FIELDVALUE = 5; |
cb9e359ea2bd
add switch session command from the monitor
Carl Byington <carl@five-ten-sg.com>
parents:
155
diff
changeset
|
39 public static final char MONITOR_CMD_SETFIELD = 5; |
cb9e359ea2bd
add switch session command from the monitor
Carl Byington <carl@five-ten-sg.com>
parents:
155
diff
changeset
|
40 public static final char MONITOR_CMD_GETFIELD = 6; |
cb9e359ea2bd
add switch session command from the monitor
Carl Byington <carl@five-ten-sg.com>
parents:
155
diff
changeset
|
41 public static final char MONITOR_CMD_SCREENWATCH = 7; |
cb9e359ea2bd
add switch session command from the monitor
Carl Byington <carl@five-ten-sg.com>
parents:
155
diff
changeset
|
42 public static final char MONITOR_CMD_DEPRESS = 8; |
cb9e359ea2bd
add switch session command from the monitor
Carl Byington <carl@five-ten-sg.com>
parents:
155
diff
changeset
|
43 public static final char MONITOR_CMD_SHOWURL = 9; |
cb9e359ea2bd
add switch session command from the monitor
Carl Byington <carl@five-ten-sg.com>
parents:
155
diff
changeset
|
44 public static final char MONITOR_CMD_SWITCHSESSION = 10; |
205
f86f1e37b504
add cursor request command to the TE
Carl Byington <carl@five-ten-sg.com>
parents:
176
diff
changeset
|
45 public static final char MONITOR_CMD_CURSORREQUEST = 11; |
459
a3239022798d
compile 32 and 64 bit arch, bump version
Carl Byington <carl@five-ten-sg.com>
parents:
457
diff
changeset
|
46 public static final char MONITOR_CMD_SAYSTRING = 12; |
496
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
47 public static final char MONITOR_CMD_SETFOCUS = 13; |
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
48 public static final char MONITOR_CMD_KEYBOARD = 14; |
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
49 public static final char MONITOR_CMD_DEPRESSUNICODE= 15; |
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
50 public static final char MONITOR_CMD_FOREGROUND = 16; |
0 | 51 |
424
09c1d3aae3f0
updateDirty before testChanged, try to eliminate sending duplicate screenChanged to the monitor
Carl Byington <carl@five-ten-sg.com>
parents:
422
diff
changeset
|
52 public static final String[] commands = { |
09c1d3aae3f0
updateDirty before testChanged, try to eliminate sending duplicate screenChanged to the monitor
Carl Byington <carl@five-ten-sg.com>
parents:
422
diff
changeset
|
53 "cmd_init", |
09c1d3aae3f0
updateDirty before testChanged, try to eliminate sending duplicate screenChanged to the monitor
Carl Byington <carl@five-ten-sg.com>
parents:
422
diff
changeset
|
54 "cmd_activate", |
09c1d3aae3f0
updateDirty before testChanged, try to eliminate sending duplicate screenChanged to the monitor
Carl Byington <carl@five-ten-sg.com>
parents:
422
diff
changeset
|
55 "cmd_keystate", |
09c1d3aae3f0
updateDirty before testChanged, try to eliminate sending duplicate screenChanged to the monitor
Carl Byington <carl@five-ten-sg.com>
parents:
422
diff
changeset
|
56 "cmd_cursormove", |
09c1d3aae3f0
updateDirty before testChanged, try to eliminate sending duplicate screenChanged to the monitor
Carl Byington <carl@five-ten-sg.com>
parents:
422
diff
changeset
|
57 "cmd_screenchange", |
09c1d3aae3f0
updateDirty before testChanged, try to eliminate sending duplicate screenChanged to the monitor
Carl Byington <carl@five-ten-sg.com>
parents:
422
diff
changeset
|
58 "cmd_fieldvalue/setfield", |
09c1d3aae3f0
updateDirty before testChanged, try to eliminate sending duplicate screenChanged to the monitor
Carl Byington <carl@five-ten-sg.com>
parents:
422
diff
changeset
|
59 "cmd_getfield", |
09c1d3aae3f0
updateDirty before testChanged, try to eliminate sending duplicate screenChanged to the monitor
Carl Byington <carl@five-ten-sg.com>
parents:
422
diff
changeset
|
60 "cmd_screenwatch", |
09c1d3aae3f0
updateDirty before testChanged, try to eliminate sending duplicate screenChanged to the monitor
Carl Byington <carl@five-ten-sg.com>
parents:
422
diff
changeset
|
61 "cmd_depress", |
09c1d3aae3f0
updateDirty before testChanged, try to eliminate sending duplicate screenChanged to the monitor
Carl Byington <carl@five-ten-sg.com>
parents:
422
diff
changeset
|
62 "cmd_showurl", |
09c1d3aae3f0
updateDirty before testChanged, try to eliminate sending duplicate screenChanged to the monitor
Carl Byington <carl@five-ten-sg.com>
parents:
422
diff
changeset
|
63 "cmd_switchsession", |
460
4776062555f3
compile 32 and 64 bit arch, bump version
Carl Byington <carl@five-ten-sg.com>
parents:
459
diff
changeset
|
64 "cmd_cursorrequest", |
496
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
65 "cmd_saystring", |
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
66 "cmd_setfocus", |
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
67 "cmd_keyboard", |
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
68 "cmd_depressunicode", |
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
69 "cmd_foreground" |
424
09c1d3aae3f0
updateDirty before testChanged, try to eliminate sending duplicate screenChanged to the monitor
Carl Byington <carl@five-ten-sg.com>
parents:
422
diff
changeset
|
70 }; |
09c1d3aae3f0
updateDirty before testChanged, try to eliminate sending duplicate screenChanged to the monitor
Carl Byington <carl@five-ten-sg.com>
parents:
422
diff
changeset
|
71 |
229
594101a0876a
add why argument on cursor updates
Carl Byington <carl@five-ten-sg.com>
parents:
227
diff
changeset
|
72 public static final char CURSOR_REQUESTED = 0; |
594101a0876a
add why argument on cursor updates
Carl Byington <carl@five-ten-sg.com>
parents:
227
diff
changeset
|
73 public static final char CURSOR_SCREEN_CHANGE = 1; |
594101a0876a
add why argument on cursor updates
Carl Byington <carl@five-ten-sg.com>
parents:
227
diff
changeset
|
74 public static final char CURSOR_USER_KEY = 2; |
594101a0876a
add why argument on cursor updates
Carl Byington <carl@five-ten-sg.com>
parents:
227
diff
changeset
|
75 |
0 | 76 private static final int MONITORPORT = 6000; |
496
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
77 private static final int MONITORPORT2 = 6001; // protocol version 2 |
0 | 78 |
496
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
79 private TerminalManager parent = null; |
0 | 80 private vt320 buffer = null; |
81 private View view = null; | |
174
b010f9dc801f
add switch session command from the monitor
Carl Byington <carl@five-ten-sg.com>
parents:
173
diff
changeset
|
82 private HostBean host = null; |
470
2cc170e3fc9b
audible bell checkbox enables/disables bell volume setting; monitor init string is now a url socket://target/initstring
Carl Byington <carl@five-ten-sg.com>
parents:
460
diff
changeset
|
83 private Uri uri = null; |
496
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
84 private int port = 0; |
470
2cc170e3fc9b
audible bell checkbox enables/disables bell volume setting; monitor init string is now a url socket://target/initstring
Carl Byington <carl@five-ten-sg.com>
parents:
460
diff
changeset
|
85 private String target = null; |
0 | 86 private String init = null; |
87 private int start_line = 0; // monitor part of the screen for changes | |
88 private int end_line = 500; // "" | |
89 private int start_column = 0; // "" | |
90 private int end_column = 500; // "" | |
16
48a8daea9221
delay sending cursor move notifications until the host is quiet
Carl Byington <carl@five-ten-sg.com>
parents:
15
diff
changeset
|
91 private boolean modified = false; // used to delay screen change notifications |
229
594101a0876a
add why argument on cursor updates
Carl Byington <carl@five-ten-sg.com>
parents:
227
diff
changeset
|
92 private boolean moved = false; // used to delay cursor moved notifications |
16
48a8daea9221
delay sending cursor move notifications until the host is quiet
Carl Byington <carl@five-ten-sg.com>
parents:
15
diff
changeset
|
93 private int to_line = 0; // "" |
48a8daea9221
delay sending cursor move notifications until the host is quiet
Carl Byington <carl@five-ten-sg.com>
parents:
15
diff
changeset
|
94 private int to_column = 0; // "" |
113
cb3b9b660b3d
depress() keys from the terminal monitor go straight thru buffer.keyPressed() rather than detour though the key listener
Carl Byington <carl@five-ten-sg.com>
parents:
112
diff
changeset
|
95 private HashMap<Integer, Integer> keymap = null; // map MS VK_ keys to vt320 virtual keys |
0 | 96 private IBinder bound = null; |
97 private Socket monitor_socket = null; | |
98 private InputStream monitor_in = null; | |
99 private OutputStream monitor_out = null; | |
100 private MyReader monitor_reader = null; | |
402
14aa0621aa7d
Backed out changeset 2f2b5a244a4d
Carl Byington <carl@five-ten-sg.com>
parents:
401
diff
changeset
|
101 private BlockingQueue<char[]> pending_commands = new ArrayBlockingQueue<char[]>(100); |
0 | 102 private MyServiceConnection monitor_connection = new MyServiceConnection(); |
103 | |
104 class MyReader extends Thread { | |
105 private InputStream monitor_in; | |
106 private byte[] b; | |
107 private boolean is_closing = false; | |
108 | |
109 public MyReader(InputStream monitor_in) { | |
110 this.monitor_in = monitor_in; | |
111 b = new byte[100]; | |
112 Log.i(TAG, "MyReader constructor"); | |
113 } | |
114 | |
115 public void closing() { | |
116 is_closing = true; | |
117 } | |
118 | |
119 private char[] forceRead(int len) throws IOException { | |
120 int len2 = len * 2; | |
121 int off = 0; | |
122 | |
123 if (b.length < len2) b = new byte[len2]; | |
124 | |
125 while (off < len2) { | |
126 int l = monitor_in.read(b, off, len2 - off); | |
127 | |
128 if (l < 0) throw new IOException("eof"); | |
129 | |
130 off += l; | |
131 } | |
132 | |
133 return bytesToChars(b, len2); | |
134 } | |
135 | |
136 public void run() { | |
137 while (true) { | |
138 try { | |
139 char[] len = forceRead(1); | |
140 char[] packet = forceRead(len[0]); | |
141 char cmd = packet[0]; | |
425 | 142 Log.i(TAG, String.format("received %s", commands[cmd])); |
0 | 143 |
144 switch (cmd) { | |
145 case MONITOR_CMD_SETFIELD: | |
153
3ca280646f2d
allow zero length setfield
Carl Byington <carl@five-ten-sg.com>
parents:
148
diff
changeset
|
146 if (packet.length >= 3) |
0 | 147 setField(packet[1], packet[2], packet, 3); |
112
77ac18bc1b2f
cleanup java formatting
Carl Byington <carl@five-ten-sg.com>
parents:
101
diff
changeset
|
148 |
0 | 149 break; |
150 | |
151 case MONITOR_CMD_GETFIELD: | |
152 if (packet.length == 4) | |
153 getField(packet[1], packet[2], packet[3]); | |
112
77ac18bc1b2f
cleanup java formatting
Carl Byington <carl@five-ten-sg.com>
parents:
101
diff
changeset
|
154 |
0 | 155 break; |
156 | |
157 case MONITOR_CMD_SCREENWATCH: | |
158 if (packet.length == 4) | |
159 screenWatch(packet[1], packet[2], packet[3]); | |
112
77ac18bc1b2f
cleanup java formatting
Carl Byington <carl@five-ten-sg.com>
parents:
101
diff
changeset
|
160 |
0 | 161 break; |
162 | |
163 case MONITOR_CMD_DEPRESS: | |
164 if (packet.length == 2) | |
165 depress(packet[1]); | |
112
77ac18bc1b2f
cleanup java formatting
Carl Byington <carl@five-ten-sg.com>
parents:
101
diff
changeset
|
166 |
0 | 167 break; |
168 | |
155 | 169 case MONITOR_CMD_SHOWURL: |
170 if (packet.length > 1) | |
171 showUrl(packet, 1); | |
172 | |
173 break; | |
174 | |
173
5f26d0ba6abd
add switch session command from the monitor
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
175 case MONITOR_CMD_SWITCHSESSION: |
172
cb9e359ea2bd
add switch session command from the monitor
Carl Byington <carl@five-ten-sg.com>
parents:
155
diff
changeset
|
176 if (packet.length == 1) |
cb9e359ea2bd
add switch session command from the monitor
Carl Byington <carl@five-ten-sg.com>
parents:
155
diff
changeset
|
177 switchSession(); |
cb9e359ea2bd
add switch session command from the monitor
Carl Byington <carl@five-ten-sg.com>
parents:
155
diff
changeset
|
178 |
cb9e359ea2bd
add switch session command from the monitor
Carl Byington <carl@five-ten-sg.com>
parents:
155
diff
changeset
|
179 break; |
cb9e359ea2bd
add switch session command from the monitor
Carl Byington <carl@five-ten-sg.com>
parents:
155
diff
changeset
|
180 |
205
f86f1e37b504
add cursor request command to the TE
Carl Byington <carl@five-ten-sg.com>
parents:
176
diff
changeset
|
181 case MONITOR_CMD_CURSORREQUEST: |
f86f1e37b504
add cursor request command to the TE
Carl Byington <carl@five-ten-sg.com>
parents:
176
diff
changeset
|
182 if (packet.length == 1) |
f86f1e37b504
add cursor request command to the TE
Carl Byington <carl@five-ten-sg.com>
parents:
176
diff
changeset
|
183 cursorRequest(); |
f86f1e37b504
add cursor request command to the TE
Carl Byington <carl@five-ten-sg.com>
parents:
176
diff
changeset
|
184 |
f86f1e37b504
add cursor request command to the TE
Carl Byington <carl@five-ten-sg.com>
parents:
176
diff
changeset
|
185 break; |
f86f1e37b504
add cursor request command to the TE
Carl Byington <carl@five-ten-sg.com>
parents:
176
diff
changeset
|
186 |
496
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
187 case MONITOR_CMD_SETFOCUS: |
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
188 if (packet.length == 3) |
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
189 setFocus(packet[1], packet[2]); |
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
190 |
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
191 break; |
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
192 |
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
193 case MONITOR_CMD_KEYBOARD: |
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
194 if (packet.length == 2) |
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
195 keyboard(packet[1]); |
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
196 |
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
197 break; |
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
198 |
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
199 case MONITOR_CMD_DEPRESSUNICODE: |
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
200 if (packet.length == 2) |
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
201 depressunicode(packet[1]); |
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
202 |
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
203 break; |
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
204 |
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
205 case MONITOR_CMD_FOREGROUND: |
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
206 if (packet.length == 1) |
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
207 foreground(); |
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
208 |
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
209 break; |
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
210 |
0 | 211 default: |
212 break; | |
213 } | |
214 } | |
215 catch (IOException e) { | |
216 if (!is_closing) Log.e(TAG, "exception in MyReader.run()", e); | |
217 | |
218 break; | |
219 } | |
220 } | |
221 } | |
222 } | |
223 | |
224 class MyServiceConnection implements ServiceConnection { | |
225 public void onServiceConnected(ComponentName className, IBinder service) { | |
226 bound = service; | |
227 Log.i(TAG, "bound to service"); | |
477
d7461da8145b
only bind to the MonitorService for localhost monitor connections
Carl Byington <carl@five-ten-sg.com>
parents:
470
diff
changeset
|
228 DoConnect(); |
d7461da8145b
only bind to the MonitorService for localhost monitor connections
Carl Byington <carl@five-ten-sg.com>
parents:
470
diff
changeset
|
229 } |
d7461da8145b
only bind to the MonitorService for localhost monitor connections
Carl Byington <carl@five-ten-sg.com>
parents:
470
diff
changeset
|
230 public void DoConnect() { |
0 | 231 try { |
470
2cc170e3fc9b
audible bell checkbox enables/disables bell volume setting; monitor init string is now a url socket://target/initstring
Carl Byington <carl@five-ten-sg.com>
parents:
460
diff
changeset
|
232 InetAddress serverAddr = InetAddress.getByName(target); |
410
e2a56e383bad
wait for monitor socket to be created
Carl Byington <carl@five-ten-sg.com>
parents:
405
diff
changeset
|
233 int tries = 0; |
411
8bff0bfaec3a
wait for monitor socket to be created
Carl Byington <carl@five-ten-sg.com>
parents:
410
diff
changeset
|
234 while (tries < 10) { |
410
e2a56e383bad
wait for monitor socket to be created
Carl Byington <carl@five-ten-sg.com>
parents:
405
diff
changeset
|
235 try { |
411
8bff0bfaec3a
wait for monitor socket to be created
Carl Byington <carl@five-ten-sg.com>
parents:
410
diff
changeset
|
236 Thread.sleep(100); |
496
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
237 monitor_socket = new Socket(serverAddr, port); |
421
660ac2d2003b
break out of infinite loop
Carl Byington <carl@five-ten-sg.com>
parents:
418
diff
changeset
|
238 break; |
410
e2a56e383bad
wait for monitor socket to be created
Carl Byington <carl@five-ten-sg.com>
parents:
405
diff
changeset
|
239 } |
412
057854c77217
wait for monitor socket to be created
Carl Byington <carl@five-ten-sg.com>
parents:
411
diff
changeset
|
240 catch (Exception e) { |
417
4dcc071e1feb
monitor failure should not kill the TE
Carl Byington <carl@five-ten-sg.com>
parents:
412
diff
changeset
|
241 monitor_socket = null; |
410
e2a56e383bad
wait for monitor socket to be created
Carl Byington <carl@five-ten-sg.com>
parents:
405
diff
changeset
|
242 Log.e(TAG, "exception connecting to monitor socket", e); |
e2a56e383bad
wait for monitor socket to be created
Carl Byington <carl@five-ten-sg.com>
parents:
405
diff
changeset
|
243 tries = tries + 1; |
e2a56e383bad
wait for monitor socket to be created
Carl Byington <carl@five-ten-sg.com>
parents:
405
diff
changeset
|
244 } |
e2a56e383bad
wait for monitor socket to be created
Carl Byington <carl@five-ten-sg.com>
parents:
405
diff
changeset
|
245 } |
417
4dcc071e1feb
monitor failure should not kill the TE
Carl Byington <carl@five-ten-sg.com>
parents:
412
diff
changeset
|
246 if (monitor_socket != null) { |
4dcc071e1feb
monitor failure should not kill the TE
Carl Byington <carl@five-ten-sg.com>
parents:
412
diff
changeset
|
247 Log.i(TAG, "connected to monitor socket, send init " + init); |
492
e88d48be89a8
add TCP_NODELAY to the monitor socket
Carl Byington <carl@five-ten-sg.com>
parents:
479
diff
changeset
|
248 monitor_socket.setTcpNoDelay(true); |
417
4dcc071e1feb
monitor failure should not kill the TE
Carl Byington <carl@five-ten-sg.com>
parents:
412
diff
changeset
|
249 monitor_in = monitor_socket.getInputStream(); |
4dcc071e1feb
monitor failure should not kill the TE
Carl Byington <carl@five-ten-sg.com>
parents:
412
diff
changeset
|
250 monitor_out = monitor_socket.getOutputStream(); |
4dcc071e1feb
monitor failure should not kill the TE
Carl Byington <carl@five-ten-sg.com>
parents:
412
diff
changeset
|
251 monitor_reader = new MyReader(monitor_in); |
4dcc071e1feb
monitor failure should not kill the TE
Carl Byington <carl@five-ten-sg.com>
parents:
412
diff
changeset
|
252 monitor_reader.start(); |
4dcc071e1feb
monitor failure should not kill the TE
Carl Byington <carl@five-ten-sg.com>
parents:
412
diff
changeset
|
253 String x = " " + init; |
4dcc071e1feb
monitor failure should not kill the TE
Carl Byington <carl@five-ten-sg.com>
parents:
412
diff
changeset
|
254 monitorWrite(MONITOR_CMD_INIT, x.toCharArray()); |
4dcc071e1feb
monitor failure should not kill the TE
Carl Byington <carl@five-ten-sg.com>
parents:
412
diff
changeset
|
255 char [] c; |
112
77ac18bc1b2f
cleanup java formatting
Carl Byington <carl@five-ten-sg.com>
parents:
101
diff
changeset
|
256 |
417
4dcc071e1feb
monitor failure should not kill the TE
Carl Byington <carl@five-ten-sg.com>
parents:
412
diff
changeset
|
257 while (true) { |
4dcc071e1feb
monitor failure should not kill the TE
Carl Byington <carl@five-ten-sg.com>
parents:
412
diff
changeset
|
258 c = pending_commands.poll(); |
402
14aa0621aa7d
Backed out changeset 2f2b5a244a4d
Carl Byington <carl@five-ten-sg.com>
parents:
401
diff
changeset
|
259 |
417
4dcc071e1feb
monitor failure should not kill the TE
Carl Byington <carl@five-ten-sg.com>
parents:
412
diff
changeset
|
260 if (c == null) break; |
402
14aa0621aa7d
Backed out changeset 2f2b5a244a4d
Carl Byington <carl@five-ten-sg.com>
parents:
401
diff
changeset
|
261 |
417
4dcc071e1feb
monitor failure should not kill the TE
Carl Byington <carl@five-ten-sg.com>
parents:
412
diff
changeset
|
262 monitorWrite(c[1], c); |
4dcc071e1feb
monitor failure should not kill the TE
Carl Byington <carl@five-ten-sg.com>
parents:
412
diff
changeset
|
263 } |
402
14aa0621aa7d
Backed out changeset 2f2b5a244a4d
Carl Byington <carl@five-ten-sg.com>
parents:
401
diff
changeset
|
264 } |
0 | 265 } |
266 catch (IOException e) { | |
267 Log.e(TAG, "exception in onServiceConnected()", e); | |
268 } | |
269 } | |
270 public void onServiceDisconnected(ComponentName classNam) { | |
271 bound = null; | |
272 Log.i(TAG, "unbound from service"); | |
273 } | |
274 }; | |
275 | |
276 | |
496
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
277 public TerminalMonitor(TerminalManager parent, vt320 buffer, View view, HostBean host, String url) { |
0 | 278 this.parent = parent; |
279 this.buffer = buffer; | |
280 this.view = view; | |
172
cb9e359ea2bd
add switch session command from the monitor
Carl Byington <carl@five-ten-sg.com>
parents:
155
diff
changeset
|
281 this.host = host; |
470
2cc170e3fc9b
audible bell checkbox enables/disables bell volume setting; monitor init string is now a url socket://target/initstring
Carl Byington <carl@five-ten-sg.com>
parents:
460
diff
changeset
|
282 this.uri = Uri.parse(url); |
496
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
283 this.port = (uri.getScheme().equals("socket2")) ? MONITORPORT2 : MONITORPORT; |
470
2cc170e3fc9b
audible bell checkbox enables/disables bell volume setting; monitor init string is now a url socket://target/initstring
Carl Byington <carl@five-ten-sg.com>
parents:
460
diff
changeset
|
284 this.target = uri.getHost(); |
2cc170e3fc9b
audible bell checkbox enables/disables bell volume setting; monitor init string is now a url socket://target/initstring
Carl Byington <carl@five-ten-sg.com>
parents:
460
diff
changeset
|
285 this.init = uri.getPath(); |
0 | 286 // setup the windows->android keymapping |
19
b3d0d806cbe2
cleaner url for MS vk_ key documentation
Carl Byington <carl@five-ten-sg.com>
parents:
18
diff
changeset
|
287 // http://msdn.microsoft.com/en-us/library/windows/desktop/dd375731 |
112
77ac18bc1b2f
cleanup java formatting
Carl Byington <carl@five-ten-sg.com>
parents:
101
diff
changeset
|
288 keymap = new HashMap<Integer, Integer>(); |
113
cb3b9b660b3d
depress() keys from the terminal monitor go straight thru buffer.keyPressed() rather than detour though the key listener
Carl Byington <carl@five-ten-sg.com>
parents:
112
diff
changeset
|
289 keymap.put(0x08, vt320.KEY_BACK_SPACE); // vk_back |
cb3b9b660b3d
depress() keys from the terminal monitor go straight thru buffer.keyPressed() rather than detour though the key listener
Carl Byington <carl@five-ten-sg.com>
parents:
112
diff
changeset
|
290 keymap.put(0x09, vt320.KEY_TAB); // vk_tab |
cb3b9b660b3d
depress() keys from the terminal monitor go straight thru buffer.keyPressed() rather than detour though the key listener
Carl Byington <carl@five-ten-sg.com>
parents:
112
diff
changeset
|
291 keymap.put(0x0d, vt320.KEY_ENTER); // vk_return |
cb3b9b660b3d
depress() keys from the terminal monitor go straight thru buffer.keyPressed() rather than detour though the key listener
Carl Byington <carl@five-ten-sg.com>
parents:
112
diff
changeset
|
292 keymap.put(0x1b, vt320.KEY_ESCAPE); // vk_escape |
cb3b9b660b3d
depress() keys from the terminal monitor go straight thru buffer.keyPressed() rather than detour though the key listener
Carl Byington <carl@five-ten-sg.com>
parents:
112
diff
changeset
|
293 keymap.put(0x21, vt320.KEY_PAGE_UP); // vk_prior |
cb3b9b660b3d
depress() keys from the terminal monitor go straight thru buffer.keyPressed() rather than detour though the key listener
Carl Byington <carl@five-ten-sg.com>
parents:
112
diff
changeset
|
294 keymap.put(0x22, vt320.KEY_PAGE_DOWN); // vk_next |
cb3b9b660b3d
depress() keys from the terminal monitor go straight thru buffer.keyPressed() rather than detour though the key listener
Carl Byington <carl@five-ten-sg.com>
parents:
112
diff
changeset
|
295 keymap.put(0x23, vt320.KEY_END); // vk_end |
cb3b9b660b3d
depress() keys from the terminal monitor go straight thru buffer.keyPressed() rather than detour though the key listener
Carl Byington <carl@five-ten-sg.com>
parents:
112
diff
changeset
|
296 keymap.put(0x24, vt320.KEY_HOME); // vk_home |
cb3b9b660b3d
depress() keys from the terminal monitor go straight thru buffer.keyPressed() rather than detour though the key listener
Carl Byington <carl@five-ten-sg.com>
parents:
112
diff
changeset
|
297 keymap.put(0x25, vt320.KEY_LEFT); // vk_left |
cb3b9b660b3d
depress() keys from the terminal monitor go straight thru buffer.keyPressed() rather than detour though the key listener
Carl Byington <carl@five-ten-sg.com>
parents:
112
diff
changeset
|
298 keymap.put(0x26, vt320.KEY_UP); // vk_up |
cb3b9b660b3d
depress() keys from the terminal monitor go straight thru buffer.keyPressed() rather than detour though the key listener
Carl Byington <carl@five-ten-sg.com>
parents:
112
diff
changeset
|
299 keymap.put(0x27, vt320.KEY_RIGHT); // vk_right |
cb3b9b660b3d
depress() keys from the terminal monitor go straight thru buffer.keyPressed() rather than detour though the key listener
Carl Byington <carl@five-ten-sg.com>
parents:
112
diff
changeset
|
300 keymap.put(0x28, vt320.KEY_DOWN); // vk_down |
cb3b9b660b3d
depress() keys from the terminal monitor go straight thru buffer.keyPressed() rather than detour though the key listener
Carl Byington <carl@five-ten-sg.com>
parents:
112
diff
changeset
|
301 keymap.put(0x2d, vt320.KEY_INSERT); // vk_insert |
cb3b9b660b3d
depress() keys from the terminal monitor go straight thru buffer.keyPressed() rather than detour though the key listener
Carl Byington <carl@five-ten-sg.com>
parents:
112
diff
changeset
|
302 keymap.put(0x2e, vt320.KEY_DELETE); // vk_delete |
cb3b9b660b3d
depress() keys from the terminal monitor go straight thru buffer.keyPressed() rather than detour though the key listener
Carl Byington <carl@five-ten-sg.com>
parents:
112
diff
changeset
|
303 keymap.put(0x70, vt320.KEY_F1); // vk_f1 |
cb3b9b660b3d
depress() keys from the terminal monitor go straight thru buffer.keyPressed() rather than detour though the key listener
Carl Byington <carl@five-ten-sg.com>
parents:
112
diff
changeset
|
304 keymap.put(0x71, vt320.KEY_F2); // vk_f2 |
cb3b9b660b3d
depress() keys from the terminal monitor go straight thru buffer.keyPressed() rather than detour though the key listener
Carl Byington <carl@five-ten-sg.com>
parents:
112
diff
changeset
|
305 keymap.put(0x72, vt320.KEY_F3); // vk_f3 |
cb3b9b660b3d
depress() keys from the terminal monitor go straight thru buffer.keyPressed() rather than detour though the key listener
Carl Byington <carl@five-ten-sg.com>
parents:
112
diff
changeset
|
306 keymap.put(0x73, vt320.KEY_F4); // vk_f4 |
cb3b9b660b3d
depress() keys from the terminal monitor go straight thru buffer.keyPressed() rather than detour though the key listener
Carl Byington <carl@five-ten-sg.com>
parents:
112
diff
changeset
|
307 keymap.put(0x74, vt320.KEY_F5); // vk_f5 |
cb3b9b660b3d
depress() keys from the terminal monitor go straight thru buffer.keyPressed() rather than detour though the key listener
Carl Byington <carl@five-ten-sg.com>
parents:
112
diff
changeset
|
308 keymap.put(0x75, vt320.KEY_F6); // vk_f6 |
cb3b9b660b3d
depress() keys from the terminal monitor go straight thru buffer.keyPressed() rather than detour though the key listener
Carl Byington <carl@five-ten-sg.com>
parents:
112
diff
changeset
|
309 keymap.put(0x76, vt320.KEY_F7); // vk_f7 |
cb3b9b660b3d
depress() keys from the terminal monitor go straight thru buffer.keyPressed() rather than detour though the key listener
Carl Byington <carl@five-ten-sg.com>
parents:
112
diff
changeset
|
310 keymap.put(0x77, vt320.KEY_F8); // vk_f8 |
cb3b9b660b3d
depress() keys from the terminal monitor go straight thru buffer.keyPressed() rather than detour though the key listener
Carl Byington <carl@five-ten-sg.com>
parents:
112
diff
changeset
|
311 keymap.put(0x78, vt320.KEY_F9); // vk_f9 |
cb3b9b660b3d
depress() keys from the terminal monitor go straight thru buffer.keyPressed() rather than detour though the key listener
Carl Byington <carl@five-ten-sg.com>
parents:
112
diff
changeset
|
312 keymap.put(0x79, vt320.KEY_F10); // vk_f10 |
cb3b9b660b3d
depress() keys from the terminal monitor go straight thru buffer.keyPressed() rather than detour though the key listener
Carl Byington <carl@five-ten-sg.com>
parents:
112
diff
changeset
|
313 keymap.put(0x7a, vt320.KEY_F11); // vk_f11 |
cb3b9b660b3d
depress() keys from the terminal monitor go straight thru buffer.keyPressed() rather than detour though the key listener
Carl Byington <carl@five-ten-sg.com>
parents:
112
diff
changeset
|
314 keymap.put(0x7b, vt320.KEY_F12); // vk_f12 |
176 | 315 keymap.put(0x7c, vt320.KEY_F13); // vk_f13 |
316 keymap.put(0x7d, vt320.KEY_F14); // vk_f14 | |
317 keymap.put(0x7e, vt320.KEY_F15); // vk_f15 | |
318 keymap.put(0x7f, vt320.KEY_F16); // vk_f16 | |
319 keymap.put(0x80, vt320.KEY_F17); // vk_f17 | |
320 keymap.put(0x81, vt320.KEY_F18); // vk_f18 | |
321 keymap.put(0x82, vt320.KEY_F19); // vk_f19 | |
322 keymap.put(0x83, vt320.KEY_F20); // vk_f20 | |
323 keymap.put(0x84, vt320.KEY_F21); // vk_f21 | |
324 keymap.put(0x85, vt320.KEY_F22); // vk_f22 | |
325 keymap.put(0x86, vt320.KEY_F23); // vk_f23 | |
326 keymap.put(0x87, vt320.KEY_F24); // vk_f24 | |
479
3a83f40439d7
only bind to the MonitorService for localhost monitor connections
Carl Byington <carl@five-ten-sg.com>
parents:
477
diff
changeset
|
327 if (target.equals("localhost")) { |
477
d7461da8145b
only bind to the MonitorService for localhost monitor connections
Carl Byington <carl@five-ten-sg.com>
parents:
470
diff
changeset
|
328 // bind to the monitor service for localhost connections |
d7461da8145b
only bind to the MonitorService for localhost monitor connections
Carl Byington <carl@five-ten-sg.com>
parents:
470
diff
changeset
|
329 Intent intent = new Intent("com.five_ten_sg.connectbot.monitor.MonitorService"); |
d7461da8145b
only bind to the MonitorService for localhost monitor connections
Carl Byington <carl@five-ten-sg.com>
parents:
470
diff
changeset
|
330 intent.setPackage("com.five_ten_sg.connectbot.monitor"); |
d7461da8145b
only bind to the MonitorService for localhost monitor connections
Carl Byington <carl@five-ten-sg.com>
parents:
470
diff
changeset
|
331 parent.bindService(intent, monitor_connection, Context.BIND_AUTO_CREATE); |
d7461da8145b
only bind to the MonitorService for localhost monitor connections
Carl Byington <carl@five-ten-sg.com>
parents:
470
diff
changeset
|
332 } |
d7461da8145b
only bind to the MonitorService for localhost monitor connections
Carl Byington <carl@five-ten-sg.com>
parents:
470
diff
changeset
|
333 else { |
d7461da8145b
only bind to the MonitorService for localhost monitor connections
Carl Byington <carl@five-ten-sg.com>
parents:
470
diff
changeset
|
334 // direct socket connection to external device |
d7461da8145b
only bind to the MonitorService for localhost monitor connections
Carl Byington <carl@five-ten-sg.com>
parents:
470
diff
changeset
|
335 monitor_connection.DoConnect(); |
d7461da8145b
only bind to the MonitorService for localhost monitor connections
Carl Byington <carl@five-ten-sg.com>
parents:
470
diff
changeset
|
336 } |
0 | 337 Log.i(TAG, "constructor"); |
338 } | |
339 | |
340 | |
341 public void Disconnect() { | |
342 if (monitor_reader != null) monitor_reader.closing(); | |
402
14aa0621aa7d
Backed out changeset 2f2b5a244a4d
Carl Byington <carl@five-ten-sg.com>
parents:
401
diff
changeset
|
343 |
0 | 344 try { |
345 if (monitor_out != null) monitor_out.close(); | |
346 | |
347 if (monitor_in != null) monitor_in.close(); | |
348 | |
349 if (monitor_socket != null) monitor_socket.close(); | |
350 | |
351 Log.i(TAG, "disconnected from monitor socket"); | |
352 } | |
353 catch (IOException e) { | |
354 Log.e(TAG, "exception in Disconnect() closing sockets", e); | |
355 } | |
356 | |
357 monitor_reader = null; | |
358 monitor_out = null; | |
359 monitor_in = null; | |
360 monitor_socket = null; | |
361 | |
362 if (bound != null) parent.unbindService(monitor_connection); | |
363 | |
364 monitor_connection = null; | |
365 } | |
366 | |
367 | |
368 public char[] bytesToChars(byte[] b, int len) { | |
369 char[] c = new char[len >> 1]; | |
370 int bp = 0; | |
371 | |
372 for (int i = 0; i < c.length; i++) { | |
373 byte b1 = b[bp++]; | |
374 byte b2 = b[bp++]; | |
375 c[i] = (char)(((b1 & 0x00FF) << 8) + (b2 & 0x00FF)); | |
376 } | |
377 | |
378 return c; | |
379 } | |
380 | |
381 | |
382 public byte[] charsToBytes(char[] c) { | |
383 byte[] b = new byte[c.length << 1]; | |
384 int bp = 0; | |
385 | |
386 for (int i = 0; i < c.length; i++) { | |
387 b[bp++] = (byte)((c[i] & 0xff00) >> 8); | |
388 b[bp++] = (byte)(c[i] & 0x00ff); | |
389 } | |
390 | |
391 return b; | |
392 } | |
393 | |
394 | |
402
14aa0621aa7d
Backed out changeset 2f2b5a244a4d
Carl Byington <carl@five-ten-sg.com>
parents:
401
diff
changeset
|
395 public synchronized void monitorWrite(char cmd, char[] c) { |
14aa0621aa7d
Backed out changeset 2f2b5a244a4d
Carl Byington <carl@five-ten-sg.com>
parents:
401
diff
changeset
|
396 try { |
14aa0621aa7d
Backed out changeset 2f2b5a244a4d
Carl Byington <carl@five-ten-sg.com>
parents:
401
diff
changeset
|
397 if (monitor_out != null) { |
14aa0621aa7d
Backed out changeset 2f2b5a244a4d
Carl Byington <carl@five-ten-sg.com>
parents:
401
diff
changeset
|
398 c[0] = (char)(c.length - 1); // number of chars following |
14aa0621aa7d
Backed out changeset 2f2b5a244a4d
Carl Byington <carl@five-ten-sg.com>
parents:
401
diff
changeset
|
399 c[1] = cmd; |
424
09c1d3aae3f0
updateDirty before testChanged, try to eliminate sending duplicate screenChanged to the monitor
Carl Byington <carl@five-ten-sg.com>
parents:
422
diff
changeset
|
400 Log.i(TAG, String.format("sending %s", commands[cmd])); |
402
14aa0621aa7d
Backed out changeset 2f2b5a244a4d
Carl Byington <carl@five-ten-sg.com>
parents:
401
diff
changeset
|
401 monitor_out.write(charsToBytes(c)); |
424
09c1d3aae3f0
updateDirty before testChanged, try to eliminate sending duplicate screenChanged to the monitor
Carl Byington <carl@five-ten-sg.com>
parents:
422
diff
changeset
|
402 monitor_out.flush(); |
402
14aa0621aa7d
Backed out changeset 2f2b5a244a4d
Carl Byington <carl@five-ten-sg.com>
parents:
401
diff
changeset
|
403 } |
14aa0621aa7d
Backed out changeset 2f2b5a244a4d
Carl Byington <carl@five-ten-sg.com>
parents:
401
diff
changeset
|
404 else { |
14aa0621aa7d
Backed out changeset 2f2b5a244a4d
Carl Byington <carl@five-ten-sg.com>
parents:
401
diff
changeset
|
405 c[1] = cmd; |
417
4dcc071e1feb
monitor failure should not kill the TE
Carl Byington <carl@five-ten-sg.com>
parents:
412
diff
changeset
|
406 pending_commands.offer(c); |
402
14aa0621aa7d
Backed out changeset 2f2b5a244a4d
Carl Byington <carl@five-ten-sg.com>
parents:
401
diff
changeset
|
407 } |
14aa0621aa7d
Backed out changeset 2f2b5a244a4d
Carl Byington <carl@five-ten-sg.com>
parents:
401
diff
changeset
|
408 } |
14aa0621aa7d
Backed out changeset 2f2b5a244a4d
Carl Byington <carl@five-ten-sg.com>
parents:
401
diff
changeset
|
409 catch (IOException e) { |
14aa0621aa7d
Backed out changeset 2f2b5a244a4d
Carl Byington <carl@five-ten-sg.com>
parents:
401
diff
changeset
|
410 Log.i(TAG, "exception in monitorWrite(), monitor died or closed the socket", e); |
14aa0621aa7d
Backed out changeset 2f2b5a244a4d
Carl Byington <carl@five-ten-sg.com>
parents:
401
diff
changeset
|
411 |
14aa0621aa7d
Backed out changeset 2f2b5a244a4d
Carl Byington <carl@five-ten-sg.com>
parents:
401
diff
changeset
|
412 try { |
14aa0621aa7d
Backed out changeset 2f2b5a244a4d
Carl Byington <carl@five-ten-sg.com>
parents:
401
diff
changeset
|
413 monitor_out.close(); |
14aa0621aa7d
Backed out changeset 2f2b5a244a4d
Carl Byington <carl@five-ten-sg.com>
parents:
401
diff
changeset
|
414 } |
14aa0621aa7d
Backed out changeset 2f2b5a244a4d
Carl Byington <carl@five-ten-sg.com>
parents:
401
diff
changeset
|
415 catch (IOException ee) { |
14aa0621aa7d
Backed out changeset 2f2b5a244a4d
Carl Byington <carl@five-ten-sg.com>
parents:
401
diff
changeset
|
416 Log.e(TAG, "exception in monitorWrite() closing output stream", ee); |
14aa0621aa7d
Backed out changeset 2f2b5a244a4d
Carl Byington <carl@five-ten-sg.com>
parents:
401
diff
changeset
|
417 } |
14aa0621aa7d
Backed out changeset 2f2b5a244a4d
Carl Byington <carl@five-ten-sg.com>
parents:
401
diff
changeset
|
418 |
14aa0621aa7d
Backed out changeset 2f2b5a244a4d
Carl Byington <carl@five-ten-sg.com>
parents:
401
diff
changeset
|
419 monitor_out = null; |
14aa0621aa7d
Backed out changeset 2f2b5a244a4d
Carl Byington <carl@five-ten-sg.com>
parents:
401
diff
changeset
|
420 } |
0 | 421 }; |
422 | |
227
2dd627df4dfb
delay testChanged() by 10ms for async transports; sendScreen resets watch area to the entire screen
Carl Byington <carl@five-ten-sg.com>
parents:
212
diff
changeset
|
423 public void resetWatch() { |
2dd627df4dfb
delay testChanged() by 10ms for async transports; sendScreen resets watch area to the entire screen
Carl Byington <carl@five-ten-sg.com>
parents:
212
diff
changeset
|
424 start_line = 0; |
2dd627df4dfb
delay testChanged() by 10ms for async transports; sendScreen resets watch area to the entire screen
Carl Byington <carl@five-ten-sg.com>
parents:
212
diff
changeset
|
425 end_line = 500; |
2dd627df4dfb
delay testChanged() by 10ms for async transports; sendScreen resets watch area to the entire screen
Carl Byington <carl@five-ten-sg.com>
parents:
212
diff
changeset
|
426 start_column = 0; |
2dd627df4dfb
delay testChanged() by 10ms for async transports; sendScreen resets watch area to the entire screen
Carl Byington <carl@five-ten-sg.com>
parents:
212
diff
changeset
|
427 end_column = 500; |
2dd627df4dfb
delay testChanged() by 10ms for async transports; sendScreen resets watch area to the entire screen
Carl Byington <carl@five-ten-sg.com>
parents:
212
diff
changeset
|
428 }; |
2dd627df4dfb
delay testChanged() by 10ms for async transports; sendScreen resets watch area to the entire screen
Carl Byington <carl@five-ten-sg.com>
parents:
212
diff
changeset
|
429 |
0 | 430 public void sendScreen(char cmd) { |
431 char lines = (char)(buffer.height & 0x0000ffff); | |
432 char columns = (char)(buffer.width & 0x0000ffff); | |
433 char[] arg = new char[4 + lines * columns]; | |
434 arg[2] = lines; | |
435 arg[3] = columns; | |
436 int base = 4; | |
112
77ac18bc1b2f
cleanup java formatting
Carl Byington <carl@five-ten-sg.com>
parents:
101
diff
changeset
|
437 |
0 | 438 for (int i = 0; i < lines; i++) { |
439 System.arraycopy(buffer.charArray[buffer.screenBase + i], 0, arg, base, columns); | |
440 base += columns; | |
441 } | |
112
77ac18bc1b2f
cleanup java formatting
Carl Byington <carl@five-ten-sg.com>
parents:
101
diff
changeset
|
442 |
0 | 443 monitorWrite(cmd, arg); |
227
2dd627df4dfb
delay testChanged() by 10ms for async transports; sendScreen resets watch area to the entire screen
Carl Byington <carl@five-ten-sg.com>
parents:
212
diff
changeset
|
444 resetWatch(); |
0 | 445 } |
446 | |
447 public synchronized void activate() { | |
448 sendScreen(MONITOR_CMD_ACTIVATE); | |
235
ea49747c5447
activate needs to send a cursor update
Carl Byington <carl@five-ten-sg.com>
parents:
229
diff
changeset
|
449 cursorMoved(CURSOR_SCREEN_CHANGE); |
0 | 450 } |
451 | |
148
69333ca1563c
add ptt button p2 preference
Carl Byington <carl@five-ten-sg.com>
parents:
147
diff
changeset
|
452 public synchronized void keyState(boolean down) { |
0 | 453 char[] arg = new char[3]; |
148
69333ca1563c
add ptt button p2 preference
Carl Byington <carl@five-ten-sg.com>
parents:
147
diff
changeset
|
454 arg[2] = (char)((down) ? 1 : 0); |
147
1350adb077b1
monitor key state tracking
Carl Byington <carl@five-ten-sg.com>
parents:
145
diff
changeset
|
455 monitorWrite(MONITOR_CMD_KEYSTATE, arg); |
0 | 456 } |
457 | |
458 public synchronized void cursorMove(int l, int c) { | |
229
594101a0876a
add why argument on cursor updates
Carl Byington <carl@five-ten-sg.com>
parents:
227
diff
changeset
|
459 if ((to_line != l) || (to_column != c)) moved = true; |
307 | 460 |
17
02717d15de9b
delay sending cursor move notifications until the host is quiet
Carl Byington <carl@five-ten-sg.com>
parents:
16
diff
changeset
|
461 to_line = l; |
16
48a8daea9221
delay sending cursor move notifications until the host is quiet
Carl Byington <carl@five-ten-sg.com>
parents:
15
diff
changeset
|
462 to_column = c; |
48a8daea9221
delay sending cursor move notifications until the host is quiet
Carl Byington <carl@five-ten-sg.com>
parents:
15
diff
changeset
|
463 } |
48a8daea9221
delay sending cursor move notifications until the host is quiet
Carl Byington <carl@five-ten-sg.com>
parents:
15
diff
changeset
|
464 |
229
594101a0876a
add why argument on cursor updates
Carl Byington <carl@five-ten-sg.com>
parents:
227
diff
changeset
|
465 public void cursorMoved(char why) { |
594101a0876a
add why argument on cursor updates
Carl Byington <carl@five-ten-sg.com>
parents:
227
diff
changeset
|
466 char[] arg = new char[5]; |
18
49fc5fba28f3
delay sending cursor move notifications until the host is quiet
Carl Byington <carl@five-ten-sg.com>
parents:
17
diff
changeset
|
467 arg[2] = (char)(to_line & 0x0000ffff); |
49fc5fba28f3
delay sending cursor move notifications until the host is quiet
Carl Byington <carl@five-ten-sg.com>
parents:
17
diff
changeset
|
468 arg[3] = (char)(to_column & 0x0000ffff); |
229
594101a0876a
add why argument on cursor updates
Carl Byington <carl@five-ten-sg.com>
parents:
227
diff
changeset
|
469 arg[4] = why; |
0 | 470 monitorWrite(MONITOR_CMD_CURSORMOVE, arg); |
229
594101a0876a
add why argument on cursor updates
Carl Byington <carl@five-ten-sg.com>
parents:
227
diff
changeset
|
471 moved = false; |
594101a0876a
add why argument on cursor updates
Carl Byington <carl@five-ten-sg.com>
parents:
227
diff
changeset
|
472 } |
594101a0876a
add why argument on cursor updates
Carl Byington <carl@five-ten-sg.com>
parents:
227
diff
changeset
|
473 |
594101a0876a
add why argument on cursor updates
Carl Byington <carl@five-ten-sg.com>
parents:
227
diff
changeset
|
474 public void testMoved() { |
594101a0876a
add why argument on cursor updates
Carl Byington <carl@five-ten-sg.com>
parents:
227
diff
changeset
|
475 if (moved) cursorMoved(CURSOR_USER_KEY); |
0 | 476 } |
477 | |
478 public synchronized void testChanged() { | |
479 if (modified) { | |
480 modified = false; | |
481 sendScreen(MONITOR_CMD_SCREENCHANGE); | |
229
594101a0876a
add why argument on cursor updates
Carl Byington <carl@five-ten-sg.com>
parents:
227
diff
changeset
|
482 cursorMoved(CURSOR_SCREEN_CHANGE); |
594101a0876a
add why argument on cursor updates
Carl Byington <carl@five-ten-sg.com>
parents:
227
diff
changeset
|
483 } |
594101a0876a
add why argument on cursor updates
Carl Byington <carl@five-ten-sg.com>
parents:
227
diff
changeset
|
484 else { |
594101a0876a
add why argument on cursor updates
Carl Byington <carl@five-ten-sg.com>
parents:
227
diff
changeset
|
485 if (moved) cursorMoved(CURSOR_SCREEN_CHANGE); |
16
48a8daea9221
delay sending cursor move notifications until the host is quiet
Carl Byington <carl@five-ten-sg.com>
parents:
15
diff
changeset
|
486 } |
0 | 487 } |
488 | |
489 public synchronized void screenChanged(int llow, int lhigh, int clow, int chigh) { | |
490 if ((start_line <= lhigh) && (llow <= end_line) && (start_column <= chigh) && (clow <= end_column)) { | |
491 modified = true; | |
492 } | |
493 } | |
494 | |
495 public synchronized void screenChanged(int l, int c) { | |
496 screenChanged(l, l, c, c); | |
497 } | |
498 | |
499 public synchronized void setField(int l, int c, char[] data, int offset) { | |
250
2bf2724d8610
add range checking on get/set fields
Carl Byington <carl@five-ten-sg.com>
parents:
235
diff
changeset
|
500 int len = data.length - offset; |
2bf2724d8610
add range checking on get/set fields
Carl Byington <carl@five-ten-sg.com>
parents:
235
diff
changeset
|
501 char[] da = new char[len]; |
2bf2724d8610
add range checking on get/set fields
Carl Byington <carl@five-ten-sg.com>
parents:
235
diff
changeset
|
502 System.arraycopy(data, offset, da, 0, len); |
422
651aff5a46c7
synchronize font size listeners; log get/set field values
Carl Byington <carl@five-ten-sg.com>
parents:
421
diff
changeset
|
503 Log.i(TAG, String.format("setField(line %d, col %d, value %s)", l, c, new String(da))); |
307 | 504 |
250
2bf2724d8610
add range checking on get/set fields
Carl Byington <carl@five-ten-sg.com>
parents:
235
diff
changeset
|
505 if ((l > 60000) || (c > 60000)) { |
2bf2724d8610
add range checking on get/set fields
Carl Byington <carl@five-ten-sg.com>
parents:
235
diff
changeset
|
506 l = -1; |
2bf2724d8610
add range checking on get/set fields
Carl Byington <carl@five-ten-sg.com>
parents:
235
diff
changeset
|
507 c = -1; |
2bf2724d8610
add range checking on get/set fields
Carl Byington <carl@five-ten-sg.com>
parents:
235
diff
changeset
|
508 } |
2bf2724d8610
add range checking on get/set fields
Carl Byington <carl@five-ten-sg.com>
parents:
235
diff
changeset
|
509 else { |
2bf2724d8610
add range checking on get/set fields
Carl Byington <carl@five-ten-sg.com>
parents:
235
diff
changeset
|
510 // ignore setfield outside screen boundaries |
405
d3c5480e8441
fix broken fillRegenerationBuffer/fillScreenArray attempt to handle missing attributes; fix setfield outside screen boundaries
Carl Byington <carl@five-ten-sg.com>
parents:
404
diff
changeset
|
511 if ((l >= buffer.height) || (c + len > buffer.width)) return; |
250
2bf2724d8610
add range checking on get/set fields
Carl Byington <carl@five-ten-sg.com>
parents:
235
diff
changeset
|
512 } |
307 | 513 |
100 | 514 buffer.setField(l, c, da); |
0 | 515 } |
516 | |
155 | 517 public synchronized void showUrl(char [] data, int offset) { |
518 char[] da = new char[data.length - offset]; | |
307 | 519 System.arraycopy(data, offset, da, 0, data.length - offset); |
155 | 520 String url = new String(da); |
521 Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url)); | |
522 parent.startActivity(intent); | |
523 } | |
524 | |
0 | 525 public synchronized void getField(int l, int c, int len) { |
422
651aff5a46c7
synchronize font size listeners; log get/set field values
Carl Byington <carl@five-ten-sg.com>
parents:
421
diff
changeset
|
526 Log.i(TAG, String.format("getField(line %d, col %d, len %d)", l, c, len)); |
0 | 527 char[] arg2 = new char[4 + len]; |
528 arg2[2] = (char)(l & 0x0000ffff); | |
529 arg2[3] = (char)(c & 0x0000ffff); | |
530 int base = 4; | |
307 | 531 |
404
ec74f347ab5f
fix bad args to arrays.fill(); bump version number
Carl Byington <carl@five-ten-sg.com>
parents:
402
diff
changeset
|
532 if ((l >= buffer.height) || (c + len > buffer.width)) { |
ec74f347ab5f
fix bad args to arrays.fill(); bump version number
Carl Byington <carl@five-ten-sg.com>
parents:
402
diff
changeset
|
533 Arrays.fill(arg2, base, base + len, ' '); |
250
2bf2724d8610
add range checking on get/set fields
Carl Byington <carl@five-ten-sg.com>
parents:
235
diff
changeset
|
534 } |
2bf2724d8610
add range checking on get/set fields
Carl Byington <carl@five-ten-sg.com>
parents:
235
diff
changeset
|
535 else { |
2bf2724d8610
add range checking on get/set fields
Carl Byington <carl@five-ten-sg.com>
parents:
235
diff
changeset
|
536 System.arraycopy(buffer.charArray[buffer.screenBase + l], c, arg2, base, len); |
2bf2724d8610
add range checking on get/set fields
Carl Byington <carl@five-ten-sg.com>
parents:
235
diff
changeset
|
537 } |
307 | 538 |
422
651aff5a46c7
synchronize font size listeners; log get/set field values
Carl Byington <carl@five-ten-sg.com>
parents:
421
diff
changeset
|
539 char[] da = new char[len]; |
651aff5a46c7
synchronize font size listeners; log get/set field values
Carl Byington <carl@five-ten-sg.com>
parents:
421
diff
changeset
|
540 System.arraycopy(arg2, base, da, 0, len); |
651aff5a46c7
synchronize font size listeners; log get/set field values
Carl Byington <carl@five-ten-sg.com>
parents:
421
diff
changeset
|
541 Log.i(TAG, String.format("getField value %s", new String(da))); |
651aff5a46c7
synchronize font size listeners; log get/set field values
Carl Byington <carl@five-ten-sg.com>
parents:
421
diff
changeset
|
542 |
0 | 543 monitorWrite(MONITOR_CMD_FIELDVALUE, arg2); |
544 } | |
545 | |
546 public synchronized void screenWatch(int l, int c, int len) { | |
425 | 547 Log.i(TAG, String.format("screenWatch(line %d, col %d, len %d)", l, c, len)); |
0 | 548 start_line = l; |
549 end_line = l; | |
550 start_column = c; | |
551 end_column = c + len - 1; | |
552 } | |
553 | |
554 public synchronized void depress(int vk_key) { | |
496
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
555 Log.i(TAG, String.format("depress(%04x)", vk_key)); |
0 | 556 Integer x = keymap.get(new Integer(vk_key)); |
307 | 557 |
496
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
558 if (x != null) buffer.keyDepressed(x); |
0 | 559 } |
172
cb9e359ea2bd
add switch session command from the monitor
Carl Byington <carl@five-ten-sg.com>
parents:
155
diff
changeset
|
560 |
cb9e359ea2bd
add switch session command from the monitor
Carl Byington <carl@five-ten-sg.com>
parents:
155
diff
changeset
|
561 public synchronized void switchSession() { |
cb9e359ea2bd
add switch session command from the monitor
Carl Byington <carl@five-ten-sg.com>
parents:
155
diff
changeset
|
562 Log.i(TAG, "switchSession()"); |
cb9e359ea2bd
add switch session command from the monitor
Carl Byington <carl@five-ten-sg.com>
parents:
155
diff
changeset
|
563 Intent intent = new Intent(parent, ConsoleActivity.class); |
cb9e359ea2bd
add switch session command from the monitor
Carl Byington <carl@five-ten-sg.com>
parents:
155
diff
changeset
|
564 intent.setAction(Intent.ACTION_VIEW); |
cb9e359ea2bd
add switch session command from the monitor
Carl Byington <carl@five-ten-sg.com>
parents:
155
diff
changeset
|
565 intent.setData(host.getUri()); |
cb9e359ea2bd
add switch session command from the monitor
Carl Byington <carl@five-ten-sg.com>
parents:
155
diff
changeset
|
566 parent.startActivity(intent); |
cb9e359ea2bd
add switch session command from the monitor
Carl Byington <carl@five-ten-sg.com>
parents:
155
diff
changeset
|
567 } |
cb9e359ea2bd
add switch session command from the monitor
Carl Byington <carl@five-ten-sg.com>
parents:
155
diff
changeset
|
568 |
205
f86f1e37b504
add cursor request command to the TE
Carl Byington <carl@five-ten-sg.com>
parents:
176
diff
changeset
|
569 |
f86f1e37b504
add cursor request command to the TE
Carl Byington <carl@five-ten-sg.com>
parents:
176
diff
changeset
|
570 public synchronized void cursorRequest() { |
229
594101a0876a
add why argument on cursor updates
Carl Byington <carl@five-ten-sg.com>
parents:
227
diff
changeset
|
571 cursorMoved(CURSOR_REQUESTED); |
205
f86f1e37b504
add cursor request command to the TE
Carl Byington <carl@five-ten-sg.com>
parents:
176
diff
changeset
|
572 } |
f86f1e37b504
add cursor request command to the TE
Carl Byington <carl@five-ten-sg.com>
parents:
176
diff
changeset
|
573 |
496
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
574 public synchronized void setFocus(int l, int c) { |
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
575 buffer.setField(l, c, new char[0]); |
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
576 } |
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
577 |
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
578 public synchronized void keyboard(int show) { |
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
579 InputMethodManager inputMethodManager = (InputMethodManager)parent.getSystemService(Context.INPUT_METHOD_SERVICE); |
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
580 View view = parent.activity.getCurrentView(); |
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
581 if (view == null) return; |
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
582 if (show != 0) { |
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
583 inputMethodManager.showSoftInput(view, 0); |
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
584 } else { |
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
585 inputMethodManager.hideSoftInputFromWindow(view.getWindowToken(), 0); |
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
586 } |
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
587 } |
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
588 |
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
589 public synchronized void depressunicode(int ascii) { |
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
590 Log.i(TAG, String.format("depressunicode(%04x)", ascii)); |
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
591 buffer.keyUnicodeDepressed(ascii); |
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
592 } |
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
593 |
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
594 public synchronized void foreground() { |
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
595 ActivityManager activityManager = (ActivityManager) parent.getSystemService(Context.ACTIVITY_SERVICE); |
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
596 activityManager.moveTaskToFront(parent.activity.getTaskId(), 0); |
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
597 } |
f698820bffdf
add socket2 monitor protocol
Carl Byington <carl@five-ten-sg.com>
parents:
492
diff
changeset
|
598 |
0 | 599 } |