rev |
line source |
al@19784
|
1 Patch for deprecated <iostream.h>
|
al@19784
|
2
|
al@19784
|
3 --- a/Access.C 2003-09-19 17:08:01.000000000 +0100
|
al@19784
|
4 +++ b/Access.C 2010-10-03 12:29:36.000000000 +0100
|
al@19784
|
5 @@ -19,6 +19,7 @@
|
al@19784
|
6 */
|
al@19784
|
7
|
al@19784
|
8 #include <X11/Xlib.h>
|
al@19784
|
9 +#include <iostream>
|
al@19784
|
10 #include <X11/XKBlib.h>
|
al@19784
|
11 #include "Access.h"
|
al@19784
|
12
|
al@19784
|
13 @@ -62,43 +63,43 @@
|
al@19784
|
14
|
al@19784
|
15 void Access::ShowDiagnostics()
|
al@19784
|
16 {
|
al@19784
|
17 - cout << "AccessX Timeout: " << onoroff(GetAccessXTOState()) << endl;
|
al@19784
|
18 - cout << "AccessX Timeout Value: " << GetAccessXDelay() << endl;
|
al@19784
|
19 + std::cout << "AccessX Timeout: " << onoroff(GetAccessXTOState()) << std::endl;
|
al@19784
|
20 + std::cout << "AccessX Timeout Value: " << GetAccessXDelay() << std::endl;
|
al@19784
|
21
|
al@19784
|
22 - cout << endl;
|
al@19784
|
23 + std::cout << std::endl;
|
al@19784
|
24
|
al@19784
|
25 - cout << "MouseKeys: " << onoroff(GetMouseKeysState()) << endl;
|
al@19784
|
26 - cout << " - Delay: " << GetMouseKeysDelay() << endl;
|
al@19784
|
27 - cout << " - Interval: " << GetMouseKeysInterval() << endl;
|
al@19784
|
28 - cout << " - T to Max: " << GetMouseKeysTimeToMax() << endl;
|
al@19784
|
29 - cout << " - Max Speed: " << GetMouseKeysMaxSpeed() << endl;
|
al@19784
|
30 - cout << " - Curve: " << GetMouseKeysCurve() << endl;
|
al@19784
|
31 + std::cout << "MouseKeys: " << onoroff(GetMouseKeysState()) << std::endl;
|
al@19784
|
32 + std::cout << " - Delay: " << GetMouseKeysDelay() << std::endl;
|
al@19784
|
33 + std::cout << " - Interval: " << GetMouseKeysInterval() << std::endl;
|
al@19784
|
34 + std::cout << " - T to Max: " << GetMouseKeysTimeToMax() << std::endl;
|
al@19784
|
35 + std::cout << " - Max Speed: " << GetMouseKeysMaxSpeed() << std::endl;
|
al@19784
|
36 + std::cout << " - Curve: " << GetMouseKeysCurve() << std::endl;
|
al@19784
|
37
|
al@19784
|
38 - cout << endl;
|
al@19784
|
39 + std::cout << std::endl;
|
al@19784
|
40
|
al@19784
|
41 - cout << "SlowKeys: " << onoroff(GetSlowKeysState()) << endl;
|
al@19784
|
42 - cout << " - Delay: " << GetSlowKeysDelay() << endl;
|
al@19784
|
43 + std::cout << "SlowKeys: " << onoroff(GetSlowKeysState()) << std::endl;
|
al@19784
|
44 + std::cout << " - Delay: " << GetSlowKeysDelay() << std::endl;
|
al@19784
|
45
|
al@19784
|
46 - cout << endl;
|
al@19784
|
47 + std::cout << std::endl;
|
al@19784
|
48
|
al@19784
|
49 - cout << "StickyKeys: " << onoroff(GetStickyKeysState()) << endl;
|
al@19784
|
50 - cout << " - Latch/Lock: " << onoroff(GetStickyKeysLatchToLockState())
|
al@19784
|
51 - << endl;
|
al@19784
|
52 - cout << " - 2 Key Dis: " <<
|
al@19784
|
53 - onoroff(GetStickyKeysTwoKeyDisableState()) << endl;
|
al@19784
|
54 + std::cout << "StickyKeys: " << onoroff(GetStickyKeysState()) << std::endl;
|
al@19784
|
55 + std::cout << " - Latch/Lock: " << onoroff(GetStickyKeysLatchToLockState())
|
al@19784
|
56 + << std::endl;
|
al@19784
|
57 + std::cout << " - 2 Key Dis: " <<
|
al@19784
|
58 + onoroff(GetStickyKeysTwoKeyDisableState()) << std::endl;
|
al@19784
|
59
|
al@19784
|
60 - cout << endl;
|
al@19784
|
61 + std::cout << std::endl;
|
al@19784
|
62
|
al@19784
|
63 - cout << "BounceKeys: " << onoroff(GetBounceKeysState()) << endl;
|
al@19784
|
64 - cout << " - Delay: " << GetBounceKeysDelay() << endl;
|
al@19784
|
65 + std::cout << "BounceKeys: " << onoroff(GetBounceKeysState()) << std::endl;
|
al@19784
|
66 + std::cout << " - Delay: " << GetBounceKeysDelay() << std::endl;
|
al@19784
|
67
|
al@19784
|
68 - cout << endl;
|
al@19784
|
69 + std::cout << std::endl;
|
al@19784
|
70
|
al@19784
|
71 - cout << "RepeatKeys: " << onoroff(GetRepeatKeysState()) << endl;
|
al@19784
|
72 - cout << " - Delay: " << GetRepeatKeysDelay() << endl;
|
al@19784
|
73 - cout << " - Interval: " << GetRepeatKeysInterval() << endl;
|
al@19784
|
74 + std::cout << "RepeatKeys: " << onoroff(GetRepeatKeysState()) << std::endl;
|
al@19784
|
75 + std::cout << " - Delay: " << GetRepeatKeysDelay() << std::endl;
|
al@19784
|
76 + std::cout << " - Interval: " << GetRepeatKeysInterval() << std::endl;
|
al@19784
|
77
|
al@19784
|
78 - cout << endl;
|
al@19784
|
79 + std::cout << std::endl;
|
al@19784
|
80 }
|
al@19784
|
81
|
al@19784
|
82 //
|
al@19784
|
83 --- a/Access.h 2003-09-19 17:00:42.000000000 +0100
|
al@19784
|
84 +++ b/Access.h 2010-10-03 12:24:20.000000000 +0100
|
al@19784
|
85 @@ -21,7 +21,7 @@
|
al@19784
|
86 *
|
al@19784
|
87 */
|
al@19784
|
88
|
al@19784
|
89 -#include <iostream.h>
|
al@19784
|
90 +#include <iostream>
|
al@19784
|
91 #include <math.h>
|
al@19784
|
92
|
al@19784
|
93 inline char* onoroff(int val)
|
al@19784
|
94 --- a/ax.C 2003-09-19 17:09:31.000000000 +0100
|
al@19784
|
95 +++ b/ax.C 2010-10-03 12:31:00.000000000 +0100
|
al@19784
|
96 @@ -62,45 +62,45 @@
|
al@19784
|
97
|
al@19784
|
98 void showHelp(void) {
|
al@19784
|
99
|
al@19784
|
100 - cout << "Usage: accessx [options & option/value pairs]"
|
al@19784
|
101 - << endl << endl;
|
al@19784
|
102 - cout << "status: Show status of AccessX Features" << endl
|
al@19784
|
103 - << "help: Show this help text" << endl
|
al@19784
|
104 - << "loadconfig: Load the ~/AccessX config file" << endl
|
al@19784
|
105 - << endl
|
al@19784
|
106 - << "+timeout: Enable AccessX Timeout" << endl
|
al@19784
|
107 - << "-timeout: Disable AccessX Timeout" << endl
|
al@19784
|
108 - << "timeout <value>: Set AccessX Timeout" << endl
|
al@19784
|
109 - << endl
|
al@19784
|
110 - << "+mousekeys: Enable MouseKeys" << endl
|
al@19784
|
111 - << "-mousekeys: Disable MouseKeys" << endl
|
al@19784
|
112 - << "mousedelay <value>: Set MouseKeys Delay" << endl
|
al@19784
|
113 - << "mouseinterval <value>: Set MouseKeys Interval" << endl
|
al@19784
|
114 - << "mousetimetomax <value>: Set MouseKeys time to max speed" << endl
|
al@19784
|
115 - << "mousemaxspeed <value>: Set MouseKeys max speed" << endl
|
al@19784
|
116 - << "mousecurve <value>: Set MouseKeys acceleration curve" << endl
|
al@19784
|
117 - << endl
|
al@19784
|
118 - << "+slowkeys: Enable SlowKeys" << endl
|
al@19784
|
119 - << "-slowkeys: Disable SlowKeys" << endl
|
al@19784
|
120 - << "slowdelay <value>: Set SlowKeys Delay" << endl
|
al@19784
|
121 - << endl
|
al@19784
|
122 - << "+stickykeys: Enable StickyKeys" << endl
|
al@19784
|
123 - << "-stickykeys: Disable StickyKeys" << endl
|
al@19784
|
124 - << "+stickylatchtolock: Enable S.K. Latch To Lock" << endl
|
al@19784
|
125 - << "-stickylatchtolock: Disbale S.K. Latch To Lock" << endl
|
al@19784
|
126 - << "+stickytwokeydisable: Enable S.K. Two Key Disable" << endl
|
al@19784
|
127 - << "-stickytwokeydisable: Disable S.K. Two Key Disable" << endl
|
al@19784
|
128 - << endl
|
al@19784
|
129 - << "+bouncekeys: Enable BounceKeys" << endl
|
al@19784
|
130 - << "-bouncekeys: Disable BounceKeys" << endl
|
al@19784
|
131 - << "bouncedelay <value>: Set Debounce Delay" << endl
|
al@19784
|
132 - << endl
|
al@19784
|
133 - << "+repeatkeys: Enable RepeatKeys" << endl
|
al@19784
|
134 - << "-repeatkeys: Disable RepeatKeys" << endl
|
al@19784
|
135 - << "repeatdelay <value>: Set RepeatKeys Delay" << endl
|
al@19784
|
136 - << "repeatinterval <value>: Set RepeatKeys Interval" << endl << endl
|
al@19784
|
137 - << "With no options, loads config file." << endl
|
al@19784
|
138 - << endl;
|
al@19784
|
139 + std::cout << "Usage: accessx [options & option/value pairs]"
|
al@19784
|
140 + << std::endl << std::endl;
|
al@19784
|
141 + std::cout << "status: Show status of AccessX Features" << std::endl
|
al@19784
|
142 + << "help: Show this help text" << std::endl
|
al@19784
|
143 + << "loadconfig: Load the ~/AccessX config file" << std::endl
|
al@19784
|
144 + << std::endl
|
al@19784
|
145 + << "+timeout: Enable AccessX Timeout" << std::endl
|
al@19784
|
146 + << "-timeout: Disable AccessX Timeout" << std::endl
|
al@19784
|
147 + << "timeout <value>: Set AccessX Timeout" << std::endl
|
al@19784
|
148 + << std::endl
|
al@19784
|
149 + << "+mousekeys: Enable MouseKeys" << std::endl
|
al@19784
|
150 + << "-mousekeys: Disable MouseKeys" << std::endl
|
al@19784
|
151 + << "mousedelay <value>: Set MouseKeys Delay" << std::endl
|
al@19784
|
152 + << "mouseinterval <value>: Set MouseKeys Interval" << std::endl
|
al@19784
|
153 + << "mousetimetomax <value>: Set MouseKeys time to max speed" << std::endl
|
al@19784
|
154 + << "mousemaxspeed <value>: Set MouseKeys max speed" << std::endl
|
al@19784
|
155 + << "mousecurve <value>: Set MouseKeys acceleration curve" << std::endl
|
al@19784
|
156 + << std::endl
|
al@19784
|
157 + << "+slowkeys: Enable SlowKeys" << std::endl
|
al@19784
|
158 + << "-slowkeys: Disable SlowKeys" << std::endl
|
al@19784
|
159 + << "slowdelay <value>: Set SlowKeys Delay" << std::endl
|
al@19784
|
160 + << std::endl
|
al@19784
|
161 + << "+stickykeys: Enable StickyKeys" << std::endl
|
al@19784
|
162 + << "-stickykeys: Disable StickyKeys" << std::endl
|
al@19784
|
163 + << "+stickylatchtolock: Enable S.K. Latch To Lock" << std::endl
|
al@19784
|
164 + << "-stickylatchtolock: Disbale S.K. Latch To Lock" << std::endl
|
al@19784
|
165 + << "+stickytwokeydisable: Enable S.K. Two Key Disable" << std::endl
|
al@19784
|
166 + << "-stickytwokeydisable: Disable S.K. Two Key Disable" << std::endl
|
al@19784
|
167 + << std::endl
|
al@19784
|
168 + << "+bouncekeys: Enable BounceKeys" << std::endl
|
al@19784
|
169 + << "-bouncekeys: Disable BounceKeys" << std::endl
|
al@19784
|
170 + << "bouncedelay <value>: Set Debounce Delay" << std::endl
|
al@19784
|
171 + << std::endl
|
al@19784
|
172 + << "+repeatkeys: Enable RepeatKeys" << std::endl
|
al@19784
|
173 + << "-repeatkeys: Disable RepeatKeys" << std::endl
|
al@19784
|
174 + << "repeatdelay <value>: Set RepeatKeys Delay" << std::endl
|
al@19784
|
175 + << "repeatinterval <value>: Set RepeatKeys Interval" << std::endl << std::endl
|
al@19784
|
176 + << "With no options, loads config file." << std::endl
|
al@19784
|
177 + << std::endl;
|
al@19784
|
178 }
|
al@19784
|
179
|
al@19784
|
180
|
al@19784
|
181 @@ -115,26 +115,26 @@
|
al@19784
|
182
|
al@19784
|
183 void showRawStatus(Access* ax)
|
al@19784
|
184 {
|
al@19784
|
185 - cout << ax->GetAccessXTOState() << endl;
|
al@19784
|
186 - cout << (int)ceil(ax->GetAccessXDelay() / 60.0) << endl;
|
al@19784
|
187 - cout << ax->GetMouseKeysState() << endl;
|
al@19784
|
188 - cout << (int)ceil(ax->GetMouseKeysTimeToMax() / 1000.0) << endl;
|
al@19784
|
189 - cout << ax->GetMouseKeysMaxSpeed() << endl;
|
al@19784
|
190 - cout << ax->GetSlowKeysState() << endl;
|
al@19784
|
191 - cout << (float)(ax->GetSlowKeysDelay() / 1000.0) << endl;
|
al@19784
|
192 - cout << ax->GetStickyKeysState() << endl;
|
al@19784
|
193 - cout << ax->GetStickyKeysLatchToLockState() << endl;
|
al@19784
|
194 - cout << ax->GetStickyKeysTwoKeyDisableState() << endl;
|
al@19784
|
195 - cout << ax->GetBounceKeysState() << endl;
|
al@19784
|
196 - cout << (float)(ax->GetBounceKeysDelay() / 1000.0) << endl;
|
al@19784
|
197 - cout << ax->GetRepeatKeysState() << endl;
|
al@19784
|
198 - cout << (float)(ax->GetRepeatKeysDelay() / 1000.0) << endl;
|
al@19784
|
199 - cout << (float)(1000.0 / ax->GetRepeatKeysInterval()) << endl;
|
al@19784
|
200 - cout << ToggleKeysToggleSet << endl;
|
al@19784
|
201 - cout << SoundOnOffToggleSet << endl;
|
al@19784
|
202 - cout << SlowKeysOnAcceptToggleSet << endl;
|
al@19784
|
203 - cout << SlowKeysOnPressToggleSet << endl;
|
al@19784
|
204 - cout << EnableAccessXToggleSet << endl;
|
al@19784
|
205 + std::cout << ax->GetAccessXTOState() << std::endl;
|
al@19784
|
206 + std::cout << (int)ceil(ax->GetAccessXDelay() / 60.0) << std::endl;
|
al@19784
|
207 + std::cout << ax->GetMouseKeysState() << std::endl;
|
al@19784
|
208 + std::cout << (int)ceil(ax->GetMouseKeysTimeToMax() / 1000.0) << std::endl;
|
al@19784
|
209 + std::cout << ax->GetMouseKeysMaxSpeed() << std::endl;
|
al@19784
|
210 + std::cout << ax->GetSlowKeysState() << std::endl;
|
al@19784
|
211 + std::cout << (float)(ax->GetSlowKeysDelay() / 1000.0) << std::endl;
|
al@19784
|
212 + std::cout << ax->GetStickyKeysState() << std::endl;
|
al@19784
|
213 + std::cout << ax->GetStickyKeysLatchToLockState() << std::endl;
|
al@19784
|
214 + std::cout << ax->GetStickyKeysTwoKeyDisableState() << std::endl;
|
al@19784
|
215 + std::cout << ax->GetBounceKeysState() << std::endl;
|
al@19784
|
216 + std::cout << (float)(ax->GetBounceKeysDelay() / 1000.0) << std::endl;
|
al@19784
|
217 + std::cout << ax->GetRepeatKeysState() << std::endl;
|
al@19784
|
218 + std::cout << (float)(ax->GetRepeatKeysDelay() / 1000.0) << std::endl;
|
al@19784
|
219 + std::cout << (float)(1000.0 / ax->GetRepeatKeysInterval()) << std::endl;
|
al@19784
|
220 + std::cout << ToggleKeysToggleSet << std::endl;
|
al@19784
|
221 + std::cout << SoundOnOffToggleSet << std::endl;
|
al@19784
|
222 + std::cout << SlowKeysOnAcceptToggleSet << std::endl;
|
al@19784
|
223 + std::cout << SlowKeysOnPressToggleSet << std::endl;
|
al@19784
|
224 + std::cout << EnableAccessXToggleSet << std::endl;
|
al@19784
|
225 }
|
al@19784
|
226
|
al@19784
|
227 ///////////////////////////////////////////////////////////////////////////////
|
al@19784
|
228 @@ -183,7 +183,7 @@
|
al@19784
|
229 index++;
|
al@19784
|
230 rc = getValue(argv[index], &value);
|
al@19784
|
231 if(rc) {
|
al@19784
|
232 - cout << "Invalid Option." << endl;
|
al@19784
|
233 + std::cout << "Invalid Option." << std::endl;
|
al@19784
|
234 exit(2);
|
al@19784
|
235 }
|
al@19784
|
236 ax->SetAccessXDelay(value);
|
al@19784
|
237 @@ -201,7 +201,7 @@
|
al@19784
|
238 index++;
|
al@19784
|
239 rc = getValue(argv[index], &value);
|
al@19784
|
240 if(rc) {
|
al@19784
|
241 - cout << "Invalid Option." << endl;
|
al@19784
|
242 + std::cout << "Invalid Option." << std::endl;
|
al@19784
|
243 exit(2);
|
al@19784
|
244 }
|
al@19784
|
245 ax->SetMouseKeysDelay(value);
|
al@19784
|
246 @@ -210,7 +210,7 @@
|
al@19784
|
247 index++;
|
al@19784
|
248 rc = getValue(argv[index], &value);
|
al@19784
|
249 if(rc) {
|
al@19784
|
250 - cout << "Invalid Option." << endl;
|
al@19784
|
251 + std::cout << "Invalid Option." << std::endl;
|
al@19784
|
252 exit(2);
|
al@19784
|
253 }
|
al@19784
|
254 ax->SetMouseKeysInterval(value);
|
al@19784
|
255 @@ -219,7 +219,7 @@
|
al@19784
|
256 index++;
|
al@19784
|
257 rc = getValue(argv[index], &value);
|
al@19784
|
258 if(rc) {
|
al@19784
|
259 - cout << "Invalid Option." << endl;
|
al@19784
|
260 + std::cout << "Invalid Option." << std::endl;
|
al@19784
|
261 exit(2);
|
al@19784
|
262 }
|
al@19784
|
263 ax->SetMouseKeysTimeToMax(value);
|
al@19784
|
264 @@ -228,7 +228,7 @@
|
al@19784
|
265 index++;
|
al@19784
|
266 rc = getValue(argv[index], &value);
|
al@19784
|
267 if(rc) {
|
al@19784
|
268 - cout << "Invalid Option." << endl;
|
al@19784
|
269 + std::cout << "Invalid Option." << std::endl;
|
al@19784
|
270 exit(2);
|
al@19784
|
271 }
|
al@19784
|
272 ax->SetMouseKeysMaxSpeed(value);
|
al@19784
|
273 @@ -237,7 +237,7 @@
|
al@19784
|
274 index++;
|
al@19784
|
275 rc = getValue(argv[index], &value);
|
al@19784
|
276 if(rc) {
|
al@19784
|
277 - cout << "Invalid Option." << endl;
|
al@19784
|
278 + std::cout << "Invalid Option." << std::endl;
|
al@19784
|
279 exit(2);
|
al@19784
|
280 }
|
al@19784
|
281 ax->SetMouseKeysCurve(value);
|
al@19784
|
282 @@ -255,7 +255,7 @@
|
al@19784
|
283 index++;
|
al@19784
|
284 rc = getValue(argv[index], &value);
|
al@19784
|
285 if(rc) {
|
al@19784
|
286 - cout << "Invalid Option." << endl;
|
al@19784
|
287 + std::cout << "Invalid Option." << std::endl;
|
al@19784
|
288 exit(2);
|
al@19784
|
289 }
|
al@19784
|
290 ax->SetSlowKeysDelay(value);
|
al@19784
|
291 @@ -294,7 +294,7 @@
|
al@19784
|
292 index++;
|
al@19784
|
293 rc = getValue(argv[index], &value);
|
al@19784
|
294 if(rc) {
|
al@19784
|
295 - cout << "Invalid Option." << endl;
|
al@19784
|
296 + std::cout << "Invalid Option." << std::endl;
|
al@19784
|
297 exit(2);
|
al@19784
|
298 }
|
al@19784
|
299 ax->SetBounceKeysDelay(value);
|
al@19784
|
300 @@ -312,7 +312,7 @@
|
al@19784
|
301 index++;
|
al@19784
|
302 rc = getValue(argv[index], &value);
|
al@19784
|
303 if(rc) {
|
al@19784
|
304 - cout << "Invalid Option." << endl;
|
al@19784
|
305 + std::cout << "Invalid Option." << std::endl;
|
al@19784
|
306 exit(2);
|
al@19784
|
307 }
|
al@19784
|
308 ax->SetRepeatKeysDelay(value);
|
al@19784
|
309 @@ -321,7 +321,7 @@
|
al@19784
|
310 index++;
|
al@19784
|
311 rc = getValue(argv[index], &value);
|
al@19784
|
312 if(rc) {
|
al@19784
|
313 - cout << "Invalid Option." << endl;
|
al@19784
|
314 + std::cout << "Invalid Option." << std::endl;
|
al@19784
|
315 exit(2);
|
al@19784
|
316 }
|
al@19784
|
317 ax->SetRepeatKeysInterval(value);
|
al@19784
|
318 @@ -330,7 +330,7 @@
|
al@19784
|
319 // AccessX Unknown Features ---------------------------------------------
|
al@19784
|
320
|
al@19784
|
321 else {
|
al@19784
|
322 - cout << "Unknown Option!" << endl;
|
al@19784
|
323 + std::cout << "Unknown Option!" << std::endl;
|
al@19784
|
324 exit(1);
|
al@19784
|
325 }
|
al@19784
|
326
|
al@19784
|
327 @@ -490,14 +490,14 @@
|
al@19784
|
328 else if(!strcmp(param, "*TimeOutScale.value:")) {
|
al@19784
|
329 rc = getValue(value, &TimeOutScaleValue);
|
al@19784
|
330 if(rc) {
|
al@19784
|
331 - cout << "Invalid Config File Option." << endl;
|
al@19784
|
332 + std::cout << "Invalid Config File Option." << std::endl;
|
al@19784
|
333 exit(10);
|
al@19784
|
334 }
|
al@19784
|
335 }
|
al@19784
|
336 else if(!strcmp(param, "*TimeOutScale.decimalPoints:")) {
|
al@19784
|
337 rc = getValue(value, &TimeOutScaleDecimalPoints);
|
al@19784
|
338 if(rc) {
|
al@19784
|
339 - cout << "Invalid Config File Option." << endl;
|
al@19784
|
340 + std::cout << "Invalid Config File Option." << std::endl;
|
al@19784
|
341 exit(10);
|
al@19784
|
342 }
|
al@19784
|
343 }
|
al@19784
|
344 @@ -505,7 +505,7 @@
|
al@19784
|
345 else if(!strcmp(param, "*KRGSlowKeysDelayScale.value:")) {
|
al@19784
|
346 rc = getValue(value, &KRGSlowKeysDelayScaleValue);
|
al@19784
|
347 if(rc) {
|
al@19784
|
348 - cout << "Invalid Config File Option." << endl;
|
al@19784
|
349 + std::cout << "Invalid Config File Option." << std::endl;
|
al@19784
|
350 exit(10);
|
al@19784
|
351 }
|
al@19784
|
352 }
|
al@19784
|
353 @@ -513,7 +513,7 @@
|
al@19784
|
354 else if(!strcmp(param, "*KRGSlowKeysDelayScale.decimalPoints:")) {
|
al@19784
|
355 rc = getValue(value, &KRGSlowKeysDelayScaleDecimalPoints);
|
al@19784
|
356 if(rc) {
|
al@19784
|
357 - cout << "Invalid Config File Option." << endl;
|
al@19784
|
358 + std::cout << "Invalid Config File Option." << std::endl;
|
al@19784
|
359 exit(10);
|
al@19784
|
360 }
|
al@19784
|
361 }
|
al@19784
|
362 @@ -521,7 +521,7 @@
|
al@19784
|
363 else if(!strcmp(param, "*MouseMaxSpeedScale.value:")) {
|
al@19784
|
364 rc = getValue(value, &MouseMaxSpeedScaleValue);
|
al@19784
|
365 if(rc) {
|
al@19784
|
366 - cout << "Invalid Config File Option." << endl;
|
al@19784
|
367 + std::cout << "Invalid Config File Option." << std::endl;
|
al@19784
|
368 exit(10);
|
al@19784
|
369 }
|
al@19784
|
370 }
|
al@19784
|
371 @@ -529,7 +529,7 @@
|
al@19784
|
372 else if(!strcmp(param, "*MouseMaxSpeedScale.decimalPoints:")) {
|
al@19784
|
373 rc = getValue(value, &MouseMaxSpeedScaleDecimalPoints);
|
al@19784
|
374 if(rc) {
|
al@19784
|
375 - cout << "Invalid Config File Option." << endl;
|
al@19784
|
376 + std::cout << "Invalid Config File Option." << std::endl;
|
al@19784
|
377 exit(10);
|
al@19784
|
378 }
|
al@19784
|
379 }
|
al@19784
|
380 @@ -537,7 +537,7 @@
|
al@19784
|
381 else if(!strcmp(param, "*KRGDebounceScale.value:")) {
|
al@19784
|
382 rc = getValue(value, &KRGDebounceScaleValue);
|
al@19784
|
383 if(rc) {
|
al@19784
|
384 - cout << "Invalid Config File Option." << endl;
|
al@19784
|
385 + std::cout << "Invalid Config File Option." << std::endl;
|
al@19784
|
386 exit(10);
|
al@19784
|
387 }
|
al@19784
|
388 }
|
al@19784
|
389 @@ -545,7 +545,7 @@
|
al@19784
|
390 else if(!strcmp(param, "*KRGDebounceScale.decimalPoints:")) {
|
al@19784
|
391 rc = getValue(value, &KRGDebounceScaleDecimalPoints);
|
al@19784
|
392 if(rc) {
|
al@19784
|
393 - cout << "Invalid Config File Option." << endl;
|
al@19784
|
394 + std::cout << "Invalid Config File Option." << std::endl;
|
al@19784
|
395 exit(10);
|
al@19784
|
396 }
|
al@19784
|
397 }
|
al@19784
|
398 @@ -553,7 +553,7 @@
|
al@19784
|
399 else if(!strcmp(param, "*KRGRepeatDelayScale.value:")) {
|
al@19784
|
400 rc = getValue(value, &KRGRepeatDelayScaleValue);
|
al@19784
|
401 if(rc) {
|
al@19784
|
402 - cout << "Invalid Config File Option." << endl;
|
al@19784
|
403 + std::cout << "Invalid Config File Option." << std::endl;
|
al@19784
|
404 exit(10);
|
al@19784
|
405 }
|
al@19784
|
406 }
|
al@19784
|
407 @@ -561,7 +561,7 @@
|
al@19784
|
408 else if(!strcmp(param, "*KRGRepeatDelayScale.decimalPoints:")) {
|
al@19784
|
409 rc = getValue(value, &KRGRepeatDelayScaleDecimalPoints);
|
al@19784
|
410 if(rc) {
|
al@19784
|
411 - cout << "Invalid Config File Option." << endl;
|
al@19784
|
412 + std::cout << "Invalid Config File Option." << std::endl;
|
al@19784
|
413 exit(10);
|
al@19784
|
414 }
|
al@19784
|
415 }
|
al@19784
|
416 @@ -569,7 +569,7 @@
|
al@19784
|
417 else if(!strcmp(param, "*KRGRepeatRateScale.value:")) {
|
al@19784
|
418 rc = getValue(value, &KRGRepeatRateScaleValue);
|
al@19784
|
419 if(rc) {
|
al@19784
|
420 - cout << "Invalid Config File Option." << endl;
|
al@19784
|
421 + std::cout << "Invalid Config File Option." << std::endl;
|
al@19784
|
422 exit(10);
|
al@19784
|
423 }
|
al@19784
|
424 }
|
al@19784
|
425 @@ -577,7 +577,7 @@
|
al@19784
|
426 else if(!strcmp(param, "*KRGRepeatRateScale.decimalPoints:")) {
|
al@19784
|
427 rc = getValue(value, &KRGRepeatRateScaleDecimalPoints);
|
al@19784
|
428 if(rc) {
|
al@19784
|
429 - cout << "Invalid Config File Option." << endl;
|
al@19784
|
430 + std::cout << "Invalid Config File Option." << std::endl;
|
al@19784
|
431 exit(10);
|
al@19784
|
432 }
|
al@19784
|
433 }
|
al@19784
|
434 @@ -585,7 +585,7 @@
|
al@19784
|
435 else if(!strcmp(param, "*MouseTimeToMaxScale.value:")) {
|
al@19784
|
436 rc = getValue(value, &MouseTimeToMaxScaleValue);
|
al@19784
|
437 if(rc) {
|
al@19784
|
438 - cout << "Invalid Config File Option." << endl;
|
al@19784
|
439 + std::cout << "Invalid Config File Option." << std::endl;
|
al@19784
|
440 exit(10);
|
al@19784
|
441 }
|
al@19784
|
442 }
|
al@19784
|
443 @@ -593,13 +593,13 @@
|
al@19784
|
444 else if(!strcmp(param, "*MouseTimeToMaxScale.decimalPoints:")) {
|
al@19784
|
445 rc = getValue(value, &MouseTimeToMaxScaleDecimalPoints);
|
al@19784
|
446 if(rc) {
|
al@19784
|
447 - cout << "Invalid Config File Option." << endl;
|
al@19784
|
448 + std::cout << "Invalid Config File Option." << std::endl;
|
al@19784
|
449 exit(10);
|
al@19784
|
450 }
|
al@19784
|
451 }
|
al@19784
|
452
|
al@19784
|
453 else {
|
al@19784
|
454 - cout << "Invalid Config File Parameter." << endl;
|
al@19784
|
455 + std::cout << "Invalid Config File Parameter." << std::endl;
|
al@19784
|
456 exit(10);
|
al@19784
|
457 }
|
al@19784
|
458 }
|
al@19784
|
459 @@ -621,7 +621,7 @@
|
al@19784
|
460 SlowKeysDelayValue /= 10;
|
al@19784
|
461
|
al@19784
|
462 if(SlowKeysDelayValue == 0) {
|
al@19784
|
463 - cout << "Config File: Slow Keys Delay Cannot Be Zero." << endl;
|
al@19784
|
464 + std::cout << "Config File: Slow Keys Delay Cannot Be Zero." << std::endl;
|
al@19784
|
465 exit(10);
|
al@19784
|
466 }
|
al@19784
|
467
|
al@19784
|
468 @@ -629,7 +629,7 @@
|
al@19784
|
469 TimeOutValue /= 10;
|
al@19784
|
470
|
al@19784
|
471 if(TimeOutValue == 0) {
|
al@19784
|
472 - cout << "Config File: Timeout Value Cannot Be Zero." << endl;
|
al@19784
|
473 + std::cout << "Config File: Timeout Value Cannot Be Zero." << std::endl;
|
al@19784
|
474 exit(10);
|
al@19784
|
475 }
|
al@19784
|
476
|
al@19784
|
477 @@ -637,7 +637,7 @@
|
al@19784
|
478 MouseMaxSpeedValue /= 10;
|
al@19784
|
479
|
al@19784
|
480 if(MouseMaxSpeedValue == 0) {
|
al@19784
|
481 - cout << "Config File: Mouse Keys Max Speed Cannot Be Zero." << endl;
|
al@19784
|
482 + std::cout << "Config File: Mouse Keys Max Speed Cannot Be Zero." << std::endl;
|
al@19784
|
483 exit(10);
|
al@19784
|
484 }
|
al@19784
|
485
|
al@19784
|
486 @@ -645,7 +645,7 @@
|
al@19784
|
487 MouseTimeToMaxValue /= 10;
|
al@19784
|
488
|
al@19784
|
489 if(MouseTimeToMaxValue == 0) {
|
al@19784
|
490 - cout << "Config File: Mouse Keys Time To Max Cannot Be Zero." << endl;
|
al@19784
|
491 + std::cout << "Config File: Mouse Keys Time To Max Cannot Be Zero." << std::endl;
|
al@19784
|
492 exit(10);
|
al@19784
|
493 }
|
al@19784
|
494
|
al@19784
|
495 @@ -653,7 +653,7 @@
|
al@19784
|
496 DebounceValue /= 10;
|
al@19784
|
497
|
al@19784
|
498 if(DebounceValue == 0) {
|
al@19784
|
499 - cout << "Config File: Debounce Delay Cannot Be Zero." << endl;
|
al@19784
|
500 + std::cout << "Config File: Debounce Delay Cannot Be Zero." << std::endl;
|
al@19784
|
501 exit(10);
|
al@19784
|
502 }
|
al@19784
|
503
|
al@19784
|
504 @@ -661,7 +661,7 @@
|
al@19784
|
505 RepeatDelayValue /= 10;
|
al@19784
|
506
|
al@19784
|
507 if(RepeatDelayValue == 0) {
|
al@19784
|
508 - cout << "Config File: Repeat Keys Delay Cannot Be Zero." << endl;
|
al@19784
|
509 + std::cout << "Config File: Repeat Keys Delay Cannot Be Zero." << std::endl;
|
al@19784
|
510 exit(10);
|
al@19784
|
511 }
|
al@19784
|
512
|
al@19784
|
513 @@ -669,7 +669,7 @@
|
al@19784
|
514 RepeatRateValue /= 10;
|
al@19784
|
515
|
al@19784
|
516 if(RepeatRateValue == 0) {
|
al@19784
|
517 - cout << "Config File: Repeat Keys Rate Cannot Be Zero." << endl;
|
al@19784
|
518 + std::cout << "Config File: Repeat Keys Rate Cannot Be Zero." << std::endl;
|
al@19784
|
519 exit(10);
|
al@19784
|
520 }
|
al@19784
|
521
|
al@19784
|
522 @@ -695,14 +695,14 @@
|
al@19784
|
523 ax->SetRepeatKeysInterval((int)floor(1000.0/RepeatRateValue));
|
al@19784
|
524
|
al@19784
|
525 if(!quiet) {
|
al@19784
|
526 - cout << "Config file ~/AccessX loaded." << endl
|
al@19784
|
527 - << "\"ax help\" for help." << endl;
|
al@19784
|
528 + std::cout << "Config file ~/AccessX loaded." << std::endl
|
al@19784
|
529 + << "\"ax help\" for help." << std::endl;
|
al@19784
|
530 }
|
al@19784
|
531 }
|
al@19784
|
532 else {
|
al@19784
|
533 if(!quiet) {
|
al@19784
|
534 - cout << "Config File ~/AccessX not found!" << endl
|
al@19784
|
535 - << "\"ax help\" for help." << endl;
|
al@19784
|
536 + std::cout << "Config File ~/AccessX not found!" << std::endl
|
al@19784
|
537 + << "\"ax help\" for help." << std::endl;
|
al@19784
|
538 }
|
al@19784
|
539 }
|
al@19784
|
540 }
|
al@19784
|
541 --- a/ax.h 2003-09-19 17:06:56.000000000 +0100
|
al@19784
|
542 +++ b/ax.h 2010-10-03 12:24:42.000000000 +0100
|
al@19784
|
543 @@ -24,7 +24,7 @@
|
al@19784
|
544
|
al@19784
|
545 // Include Files
|
al@19784
|
546
|
al@19784
|
547 -#include <iostream.h>
|
al@19784
|
548 +#include <iostream>
|
al@19784
|
549 #include <stdio.h>
|
al@19784
|
550 #include <stdlib.h>
|
al@19784
|
551 #include <string.h>
|