wok-current annotate accessx/stuff/accessx.diff @ rev 16879

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