SliTaz Repositories

     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/accessx/stuff/accessx.diff	Sat Dec 17 11:45:19 2011 +0100
     1.3 @@ -0,0 +1,549 @@
     1.4 +--- orig.Access.C	2003-09-19 17:08:01.000000000 +0100
     1.5 ++++ Access.C	2010-10-03 12:29:36.000000000 +0100
     1.6 +@@ -19,6 +19,7 @@
     1.7 +  */
     1.8 + 
     1.9 + #include <X11/Xlib.h>
    1.10 ++#include <iostream>
    1.11 + #include <X11/XKBlib.h>
    1.12 + #include "Access.h"
    1.13 + 
    1.14 +@@ -62,43 +63,43 @@
    1.15 + 
    1.16 + void Access::ShowDiagnostics()
    1.17 + {
    1.18 +-  cout << "AccessX Timeout:       " << onoroff(GetAccessXTOState()) << endl;
    1.19 +-  cout << "AccessX Timeout Value: " << GetAccessXDelay() << endl;
    1.20 ++  std::cout << "AccessX Timeout:       " << onoroff(GetAccessXTOState()) << std::endl;
    1.21 ++  std::cout << "AccessX Timeout Value: " << GetAccessXDelay() << std::endl;
    1.22 + 
    1.23 +-  cout << endl;
    1.24 ++  std::cout << std::endl;
    1.25 + 
    1.26 +-  cout << "MouseKeys:             " << onoroff(GetMouseKeysState()) << endl;
    1.27 +-  cout << "  - Delay:             " << GetMouseKeysDelay() << endl;
    1.28 +-  cout << "  - Interval:          " << GetMouseKeysInterval() << endl;
    1.29 +-  cout << "  - T to Max:          " << GetMouseKeysTimeToMax() << endl;
    1.30 +-  cout << "  - Max Speed:         " << GetMouseKeysMaxSpeed() << endl;
    1.31 +-  cout << "  - Curve:             " << GetMouseKeysCurve() << endl;
    1.32 ++  std::cout << "MouseKeys:             " << onoroff(GetMouseKeysState()) << std::endl;
    1.33 ++  std::cout << "  - Delay:             " << GetMouseKeysDelay() << std::endl;
    1.34 ++  std::cout << "  - Interval:          " << GetMouseKeysInterval() << std::endl;
    1.35 ++  std::cout << "  - T to Max:          " << GetMouseKeysTimeToMax() << std::endl;
    1.36 ++  std::cout << "  - Max Speed:         " << GetMouseKeysMaxSpeed() << std::endl;
    1.37 ++  std::cout << "  - Curve:             " << GetMouseKeysCurve() << std::endl;
    1.38 + 
    1.39 +-  cout << endl;
    1.40 ++  std::cout << std::endl;
    1.41 + 
    1.42 +-  cout << "SlowKeys:              " << onoroff(GetSlowKeysState()) << endl;
    1.43 +-  cout << "  - Delay:             " << GetSlowKeysDelay() << endl;
    1.44 ++  std::cout << "SlowKeys:              " << onoroff(GetSlowKeysState()) << std::endl;
    1.45 ++  std::cout << "  - Delay:             " << GetSlowKeysDelay() << std::endl;
    1.46 + 
    1.47 +-  cout << endl;
    1.48 ++  std::cout << std::endl;
    1.49 + 
    1.50 +-  cout << "StickyKeys:            " << onoroff(GetStickyKeysState()) << endl;
    1.51 +-  cout << "  - Latch/Lock:        " << onoroff(GetStickyKeysLatchToLockState())
    1.52 +-       << endl;
    1.53 +-  cout << "  - 2 Key Dis:         " <<
    1.54 +-    onoroff(GetStickyKeysTwoKeyDisableState()) << endl;
    1.55 ++  std::cout << "StickyKeys:            " << onoroff(GetStickyKeysState()) << std::endl;
    1.56 ++  std::cout << "  - Latch/Lock:        " << onoroff(GetStickyKeysLatchToLockState())
    1.57 ++       << std::endl;
    1.58 ++  std::cout << "  - 2 Key Dis:         " <<
    1.59 ++    onoroff(GetStickyKeysTwoKeyDisableState()) << std::endl;
    1.60 + 
    1.61 +-  cout << endl;
    1.62 ++  std::cout << std::endl;
    1.63 + 
    1.64 +-  cout << "BounceKeys:            " << onoroff(GetBounceKeysState()) << endl;
    1.65 +-  cout << "  - Delay:             " << GetBounceKeysDelay() << endl;
    1.66 ++  std::cout << "BounceKeys:            " << onoroff(GetBounceKeysState()) << std::endl;
    1.67 ++  std::cout << "  - Delay:             " << GetBounceKeysDelay() << std::endl;
    1.68 + 
    1.69 +-  cout << endl;
    1.70 ++  std::cout << std::endl;
    1.71 + 
    1.72 +-  cout << "RepeatKeys:            " << onoroff(GetRepeatKeysState()) << endl;
    1.73 +-  cout << "  - Delay:             " << GetRepeatKeysDelay() << endl;
    1.74 +-  cout << "  - Interval:          " << GetRepeatKeysInterval() << endl;
    1.75 ++  std::cout << "RepeatKeys:            " << onoroff(GetRepeatKeysState()) << std::endl;
    1.76 ++  std::cout << "  - Delay:             " << GetRepeatKeysDelay() << std::endl;
    1.77 ++  std::cout << "  - Interval:          " << GetRepeatKeysInterval() << std::endl;
    1.78 + 
    1.79 +-  cout << endl;
    1.80 ++  std::cout << std::endl;
    1.81 + }
    1.82 + 
    1.83 + //
    1.84 +--- orig.Access.h	2003-09-19 17:00:42.000000000 +0100
    1.85 ++++ Access.h	2010-10-03 12:24:20.000000000 +0100
    1.86 +@@ -21,7 +21,7 @@
    1.87 +  *
    1.88 +  */
    1.89 + 
    1.90 +-#include <iostream.h>
    1.91 ++#include <iostream>
    1.92 + #include <math.h>
    1.93 + 
    1.94 + inline char* onoroff(int val)
    1.95 +--- orig.ax.C	2003-09-19 17:09:31.000000000 +0100
    1.96 ++++ ax.C	2010-10-03 12:31:00.000000000 +0100
    1.97 +@@ -62,45 +62,45 @@
    1.98 + 
    1.99 + void showHelp(void) {
   1.100 + 
   1.101 +-  cout << "Usage: accessx [options & option/value pairs]"
   1.102 +-       << endl << endl;
   1.103 +-  cout << "status:                  Show status of AccessX Features" << endl
   1.104 +-       << "help:                    Show this help text" << endl
   1.105 +-       << "loadconfig:              Load the ~/AccessX config file" << endl
   1.106 +-       << endl
   1.107 +-       << "+timeout:                Enable AccessX Timeout" << endl
   1.108 +-       << "-timeout:                Disable AccessX Timeout" << endl
   1.109 +-       << "timeout <value>:         Set AccessX Timeout" << endl
   1.110 +-       << endl
   1.111 +-       << "+mousekeys:              Enable MouseKeys" << endl
   1.112 +-       << "-mousekeys:              Disable MouseKeys" << endl
   1.113 +-       << "mousedelay <value>:      Set MouseKeys Delay" << endl
   1.114 +-       << "mouseinterval <value>:   Set MouseKeys Interval" << endl
   1.115 +-       << "mousetimetomax <value>:  Set MouseKeys time to max speed" << endl
   1.116 +-       << "mousemaxspeed <value>:   Set MouseKeys max speed" << endl
   1.117 +-       << "mousecurve <value>:      Set MouseKeys acceleration curve" << endl
   1.118 +-       << endl
   1.119 +-       << "+slowkeys:               Enable SlowKeys" << endl
   1.120 +-       << "-slowkeys:               Disable SlowKeys" << endl
   1.121 +-       << "slowdelay <value>:       Set SlowKeys Delay" << endl
   1.122 +-       << endl
   1.123 +-       << "+stickykeys:             Enable StickyKeys" << endl
   1.124 +-       << "-stickykeys:             Disable StickyKeys" << endl
   1.125 +-       << "+stickylatchtolock:      Enable S.K. Latch To Lock" << endl
   1.126 +-       << "-stickylatchtolock:      Disbale S.K. Latch To Lock" << endl
   1.127 +-       << "+stickytwokeydisable:    Enable S.K. Two Key Disable" << endl
   1.128 +-       << "-stickytwokeydisable:    Disable S.K. Two Key Disable" << endl
   1.129 +-       << endl
   1.130 +-       << "+bouncekeys:             Enable BounceKeys" << endl
   1.131 +-       << "-bouncekeys:             Disable BounceKeys" << endl
   1.132 +-       << "bouncedelay <value>:     Set Debounce Delay" << endl
   1.133 +-       << endl
   1.134 +-       << "+repeatkeys:             Enable RepeatKeys" << endl
   1.135 +-       << "-repeatkeys:             Disable RepeatKeys" << endl
   1.136 +-       << "repeatdelay <value>:     Set RepeatKeys Delay" << endl
   1.137 +-       << "repeatinterval <value>:  Set RepeatKeys Interval" << endl << endl
   1.138 +-       << "With no options, loads config file." << endl
   1.139 +-       << endl;
   1.140 ++  std::cout << "Usage: accessx [options & option/value pairs]"
   1.141 ++       << std::endl << std::endl;
   1.142 ++  std::cout << "status:                  Show status of AccessX Features" << std::endl
   1.143 ++       << "help:                    Show this help text" << std::endl
   1.144 ++       << "loadconfig:              Load the ~/AccessX config file" << std::endl
   1.145 ++       << std::endl
   1.146 ++       << "+timeout:                Enable AccessX Timeout" << std::endl
   1.147 ++       << "-timeout:                Disable AccessX Timeout" << std::endl
   1.148 ++       << "timeout <value>:         Set AccessX Timeout" << std::endl
   1.149 ++       << std::endl
   1.150 ++       << "+mousekeys:              Enable MouseKeys" << std::endl
   1.151 ++       << "-mousekeys:              Disable MouseKeys" << std::endl
   1.152 ++       << "mousedelay <value>:      Set MouseKeys Delay" << std::endl
   1.153 ++       << "mouseinterval <value>:   Set MouseKeys Interval" << std::endl
   1.154 ++       << "mousetimetomax <value>:  Set MouseKeys time to max speed" << std::endl
   1.155 ++       << "mousemaxspeed <value>:   Set MouseKeys max speed" << std::endl
   1.156 ++       << "mousecurve <value>:      Set MouseKeys acceleration curve" << std::endl
   1.157 ++       << std::endl
   1.158 ++       << "+slowkeys:               Enable SlowKeys" << std::endl
   1.159 ++       << "-slowkeys:               Disable SlowKeys" << std::endl
   1.160 ++       << "slowdelay <value>:       Set SlowKeys Delay" << std::endl
   1.161 ++       << std::endl
   1.162 ++       << "+stickykeys:             Enable StickyKeys" << std::endl
   1.163 ++       << "-stickykeys:             Disable StickyKeys" << std::endl
   1.164 ++       << "+stickylatchtolock:      Enable S.K. Latch To Lock" << std::endl
   1.165 ++       << "-stickylatchtolock:      Disbale S.K. Latch To Lock" << std::endl
   1.166 ++       << "+stickytwokeydisable:    Enable S.K. Two Key Disable" << std::endl
   1.167 ++       << "-stickytwokeydisable:    Disable S.K. Two Key Disable" << std::endl
   1.168 ++       << std::endl
   1.169 ++       << "+bouncekeys:             Enable BounceKeys" << std::endl
   1.170 ++       << "-bouncekeys:             Disable BounceKeys" << std::endl
   1.171 ++       << "bouncedelay <value>:     Set Debounce Delay" << std::endl
   1.172 ++       << std::endl
   1.173 ++       << "+repeatkeys:             Enable RepeatKeys" << std::endl
   1.174 ++       << "-repeatkeys:             Disable RepeatKeys" << std::endl
   1.175 ++       << "repeatdelay <value>:     Set RepeatKeys Delay" << std::endl
   1.176 ++       << "repeatinterval <value>:  Set RepeatKeys Interval" << std::endl << std::endl
   1.177 ++       << "With no options, loads config file." << std::endl
   1.178 ++       << std::endl;
   1.179 + }
   1.180 + 
   1.181 + 
   1.182 +@@ -115,26 +115,26 @@
   1.183 + 
   1.184 + void showRawStatus(Access* ax)
   1.185 + {
   1.186 +-  cout << ax->GetAccessXTOState() << endl;
   1.187 +-  cout << (int)ceil(ax->GetAccessXDelay() / 60.0) << endl;
   1.188 +-  cout << ax->GetMouseKeysState() << endl;
   1.189 +-  cout << (int)ceil(ax->GetMouseKeysTimeToMax() / 1000.0) << endl;
   1.190 +-  cout << ax->GetMouseKeysMaxSpeed() << endl;
   1.191 +-  cout << ax->GetSlowKeysState() << endl;
   1.192 +-  cout << (float)(ax->GetSlowKeysDelay() / 1000.0) << endl;
   1.193 +-  cout << ax->GetStickyKeysState() << endl;
   1.194 +-  cout << ax->GetStickyKeysLatchToLockState() << endl;
   1.195 +-  cout << ax->GetStickyKeysTwoKeyDisableState() << endl;
   1.196 +-  cout << ax->GetBounceKeysState() << endl;
   1.197 +-  cout << (float)(ax->GetBounceKeysDelay() / 1000.0) << endl;
   1.198 +-  cout << ax->GetRepeatKeysState() << endl;
   1.199 +-  cout << (float)(ax->GetRepeatKeysDelay() / 1000.0) << endl;
   1.200 +-  cout << (float)(1000.0 / ax->GetRepeatKeysInterval()) << endl;
   1.201 +-  cout << ToggleKeysToggleSet << endl;
   1.202 +-  cout << SoundOnOffToggleSet << endl;
   1.203 +-  cout << SlowKeysOnAcceptToggleSet << endl;
   1.204 +-  cout << SlowKeysOnPressToggleSet << endl;
   1.205 +-  cout << EnableAccessXToggleSet << endl;
   1.206 ++  std::cout << ax->GetAccessXTOState() << std::endl;
   1.207 ++  std::cout << (int)ceil(ax->GetAccessXDelay() / 60.0) << std::endl;
   1.208 ++  std::cout << ax->GetMouseKeysState() << std::endl;
   1.209 ++  std::cout << (int)ceil(ax->GetMouseKeysTimeToMax() / 1000.0) << std::endl;
   1.210 ++  std::cout << ax->GetMouseKeysMaxSpeed() << std::endl;
   1.211 ++  std::cout << ax->GetSlowKeysState() << std::endl;
   1.212 ++  std::cout << (float)(ax->GetSlowKeysDelay() / 1000.0) << std::endl;
   1.213 ++  std::cout << ax->GetStickyKeysState() << std::endl;
   1.214 ++  std::cout << ax->GetStickyKeysLatchToLockState() << std::endl;
   1.215 ++  std::cout << ax->GetStickyKeysTwoKeyDisableState() << std::endl;
   1.216 ++  std::cout << ax->GetBounceKeysState() << std::endl;
   1.217 ++  std::cout << (float)(ax->GetBounceKeysDelay() / 1000.0) << std::endl;
   1.218 ++  std::cout << ax->GetRepeatKeysState() << std::endl;
   1.219 ++  std::cout << (float)(ax->GetRepeatKeysDelay() / 1000.0) << std::endl;
   1.220 ++  std::cout << (float)(1000.0 / ax->GetRepeatKeysInterval()) << std::endl;
   1.221 ++  std::cout << ToggleKeysToggleSet << std::endl;
   1.222 ++  std::cout << SoundOnOffToggleSet << std::endl;
   1.223 ++  std::cout << SlowKeysOnAcceptToggleSet << std::endl;
   1.224 ++  std::cout << SlowKeysOnPressToggleSet << std::endl;
   1.225 ++  std::cout << EnableAccessXToggleSet << std::endl;
   1.226 + }
   1.227 + 
   1.228 + ///////////////////////////////////////////////////////////////////////////////
   1.229 +@@ -183,7 +183,7 @@
   1.230 +       index++;
   1.231 +       rc = getValue(argv[index], &value);
   1.232 +       if(rc) {
   1.233 +-	cout << "Invalid Option." << endl;
   1.234 ++	std::cout << "Invalid Option." << std::endl;
   1.235 + 	exit(2);
   1.236 +       }
   1.237 +       ax->SetAccessXDelay(value);
   1.238 +@@ -201,7 +201,7 @@
   1.239 +       index++;
   1.240 +       rc = getValue(argv[index], &value);
   1.241 +       if(rc) {
   1.242 +-	cout << "Invalid Option." << endl;
   1.243 ++	std::cout << "Invalid Option." << std::endl;
   1.244 + 	exit(2);
   1.245 +       }
   1.246 +       ax->SetMouseKeysDelay(value);
   1.247 +@@ -210,7 +210,7 @@
   1.248 +       index++;
   1.249 +       rc = getValue(argv[index], &value);
   1.250 +       if(rc) {
   1.251 +-	cout << "Invalid Option." << endl;
   1.252 ++	std::cout << "Invalid Option." << std::endl;
   1.253 + 	exit(2);
   1.254 +       }
   1.255 +       ax->SetMouseKeysInterval(value);
   1.256 +@@ -219,7 +219,7 @@
   1.257 +       index++;
   1.258 +       rc = getValue(argv[index], &value);
   1.259 +       if(rc) {
   1.260 +-	cout << "Invalid Option." << endl;
   1.261 ++	std::cout << "Invalid Option." << std::endl;
   1.262 + 	exit(2);
   1.263 +       }
   1.264 +       ax->SetMouseKeysTimeToMax(value);
   1.265 +@@ -228,7 +228,7 @@
   1.266 +       index++;
   1.267 +       rc = getValue(argv[index], &value);
   1.268 +       if(rc) {
   1.269 +-	cout << "Invalid Option." << endl;
   1.270 ++	std::cout << "Invalid Option." << std::endl;
   1.271 + 	exit(2);
   1.272 +       }
   1.273 +       ax->SetMouseKeysMaxSpeed(value);
   1.274 +@@ -237,7 +237,7 @@
   1.275 +       index++;
   1.276 +       rc = getValue(argv[index], &value);
   1.277 +       if(rc) {
   1.278 +-	cout << "Invalid Option." << endl;
   1.279 ++	std::cout << "Invalid Option." << std::endl;
   1.280 + 	exit(2);
   1.281 +       }
   1.282 +       ax->SetMouseKeysCurve(value);
   1.283 +@@ -255,7 +255,7 @@
   1.284 +       index++;
   1.285 +       rc = getValue(argv[index], &value);
   1.286 +       if(rc) {
   1.287 +-	cout << "Invalid Option." << endl;
   1.288 ++	std::cout << "Invalid Option." << std::endl;
   1.289 + 	exit(2);
   1.290 +       }
   1.291 +       ax->SetSlowKeysDelay(value);
   1.292 +@@ -294,7 +294,7 @@
   1.293 +       index++;
   1.294 +       rc = getValue(argv[index], &value);
   1.295 +       if(rc) {
   1.296 +-	cout << "Invalid Option." << endl;
   1.297 ++	std::cout << "Invalid Option." << std::endl;
   1.298 + 	exit(2);
   1.299 +       }
   1.300 +       ax->SetBounceKeysDelay(value);
   1.301 +@@ -312,7 +312,7 @@
   1.302 +       index++;
   1.303 +       rc = getValue(argv[index], &value);
   1.304 +       if(rc) {
   1.305 +-	cout << "Invalid Option." << endl;
   1.306 ++	std::cout << "Invalid Option." << std::endl;
   1.307 + 	exit(2);
   1.308 +       }
   1.309 +       ax->SetRepeatKeysDelay(value);
   1.310 +@@ -321,7 +321,7 @@
   1.311 +       index++;
   1.312 +       rc = getValue(argv[index], &value);
   1.313 +       if(rc) {
   1.314 +-	cout << "Invalid Option." << endl;
   1.315 ++	std::cout << "Invalid Option." << std::endl;
   1.316 + 	exit(2);
   1.317 +       }
   1.318 +       ax->SetRepeatKeysInterval(value);
   1.319 +@@ -330,7 +330,7 @@
   1.320 +     // AccessX Unknown Features ---------------------------------------------
   1.321 + 
   1.322 +     else {
   1.323 +-      cout << "Unknown Option!" << endl;
   1.324 ++      std::cout << "Unknown Option!" << std::endl;
   1.325 +       exit(1);
   1.326 +     }
   1.327 + 
   1.328 +@@ -490,14 +490,14 @@
   1.329 +       else if(!strcmp(param, "*TimeOutScale.value:")) {
   1.330 + 	rc = getValue(value, &TimeOutScaleValue);
   1.331 + 	if(rc) {
   1.332 +-	  cout << "Invalid Config File Option." << endl;
   1.333 ++	  std::cout << "Invalid Config File Option." << std::endl;
   1.334 + 	  exit(10);
   1.335 + 	}
   1.336 +       }
   1.337 +       else if(!strcmp(param, "*TimeOutScale.decimalPoints:")) {
   1.338 + 	rc = getValue(value, &TimeOutScaleDecimalPoints);
   1.339 + 	if(rc) {
   1.340 +-	  cout << "Invalid Config File Option." << endl;
   1.341 ++	  std::cout << "Invalid Config File Option." << std::endl;
   1.342 + 	  exit(10);
   1.343 + 	}
   1.344 +       }
   1.345 +@@ -505,7 +505,7 @@
   1.346 +       else if(!strcmp(param, "*KRGSlowKeysDelayScale.value:")) {
   1.347 + 	rc = getValue(value, &KRGSlowKeysDelayScaleValue);
   1.348 + 	if(rc) {
   1.349 +-	  cout << "Invalid Config File Option." << endl;
   1.350 ++	  std::cout << "Invalid Config File Option." << std::endl;
   1.351 + 	  exit(10);
   1.352 + 	}
   1.353 +       }
   1.354 +@@ -513,7 +513,7 @@
   1.355 +       else if(!strcmp(param, "*KRGSlowKeysDelayScale.decimalPoints:")) {
   1.356 + 	rc = getValue(value, &KRGSlowKeysDelayScaleDecimalPoints);
   1.357 + 	if(rc) {
   1.358 +-	  cout << "Invalid Config File Option." << endl;
   1.359 ++	  std::cout << "Invalid Config File Option." << std::endl;
   1.360 + 	  exit(10);
   1.361 + 	}
   1.362 +       }
   1.363 +@@ -521,7 +521,7 @@
   1.364 +       else if(!strcmp(param, "*MouseMaxSpeedScale.value:")) {
   1.365 + 	rc = getValue(value, &MouseMaxSpeedScaleValue);
   1.366 + 	if(rc) {
   1.367 +-	  cout << "Invalid Config File Option." << endl;
   1.368 ++	  std::cout << "Invalid Config File Option." << std::endl;
   1.369 + 	  exit(10);
   1.370 + 	}
   1.371 +       }
   1.372 +@@ -529,7 +529,7 @@
   1.373 +       else if(!strcmp(param, "*MouseMaxSpeedScale.decimalPoints:")) {
   1.374 + 	rc = getValue(value, &MouseMaxSpeedScaleDecimalPoints);
   1.375 + 	if(rc) {
   1.376 +-	  cout << "Invalid Config File Option." << endl;
   1.377 ++	  std::cout << "Invalid Config File Option." << std::endl;
   1.378 + 	  exit(10);
   1.379 + 	}
   1.380 +       }
   1.381 +@@ -537,7 +537,7 @@
   1.382 +       else if(!strcmp(param, "*KRGDebounceScale.value:")) {
   1.383 + 	rc = getValue(value, &KRGDebounceScaleValue);
   1.384 + 	if(rc) {
   1.385 +-	  cout << "Invalid Config File Option." << endl;
   1.386 ++	  std::cout << "Invalid Config File Option." << std::endl;
   1.387 + 	  exit(10);
   1.388 + 	}
   1.389 +       }
   1.390 +@@ -545,7 +545,7 @@
   1.391 +       else if(!strcmp(param, "*KRGDebounceScale.decimalPoints:")) {
   1.392 + 	rc = getValue(value, &KRGDebounceScaleDecimalPoints);
   1.393 + 	if(rc) {
   1.394 +-	  cout << "Invalid Config File Option." << endl;
   1.395 ++	  std::cout << "Invalid Config File Option." << std::endl;
   1.396 + 	  exit(10);
   1.397 + 	}
   1.398 +       }
   1.399 +@@ -553,7 +553,7 @@
   1.400 +       else if(!strcmp(param, "*KRGRepeatDelayScale.value:")) {
   1.401 + 	rc = getValue(value, &KRGRepeatDelayScaleValue);
   1.402 + 	if(rc) {
   1.403 +-	  cout << "Invalid Config File Option." << endl;
   1.404 ++	  std::cout << "Invalid Config File Option." << std::endl;
   1.405 + 	  exit(10);
   1.406 + 	}
   1.407 +       }
   1.408 +@@ -561,7 +561,7 @@
   1.409 +       else if(!strcmp(param, "*KRGRepeatDelayScale.decimalPoints:")) {
   1.410 + 	rc = getValue(value, &KRGRepeatDelayScaleDecimalPoints);
   1.411 + 	if(rc) {
   1.412 +-	  cout << "Invalid Config File Option." << endl;
   1.413 ++	  std::cout << "Invalid Config File Option." << std::endl;
   1.414 + 	  exit(10);
   1.415 + 	}
   1.416 +       }
   1.417 +@@ -569,7 +569,7 @@
   1.418 +       else if(!strcmp(param, "*KRGRepeatRateScale.value:")) {
   1.419 + 	rc = getValue(value, &KRGRepeatRateScaleValue);
   1.420 + 	if(rc) {
   1.421 +-	  cout << "Invalid Config File Option." << endl;
   1.422 ++	  std::cout << "Invalid Config File Option." << std::endl;
   1.423 + 	  exit(10);
   1.424 + 	}
   1.425 +       }
   1.426 +@@ -577,7 +577,7 @@
   1.427 +       else if(!strcmp(param, "*KRGRepeatRateScale.decimalPoints:")) {
   1.428 + 	rc = getValue(value, &KRGRepeatRateScaleDecimalPoints);
   1.429 + 	if(rc) {
   1.430 +-	  cout << "Invalid Config File Option." << endl;
   1.431 ++	  std::cout << "Invalid Config File Option." << std::endl;
   1.432 + 	  exit(10);
   1.433 + 	}
   1.434 +       }
   1.435 +@@ -585,7 +585,7 @@
   1.436 +       else if(!strcmp(param, "*MouseTimeToMaxScale.value:")) {
   1.437 + 	rc = getValue(value, &MouseTimeToMaxScaleValue);
   1.438 + 	if(rc) {
   1.439 +-	  cout << "Invalid Config File Option." << endl;
   1.440 ++	  std::cout << "Invalid Config File Option." << std::endl;
   1.441 + 	  exit(10);
   1.442 + 	}
   1.443 +       }
   1.444 +@@ -593,13 +593,13 @@
   1.445 +       else if(!strcmp(param, "*MouseTimeToMaxScale.decimalPoints:")) {
   1.446 + 	rc = getValue(value, &MouseTimeToMaxScaleDecimalPoints);
   1.447 + 	if(rc) {
   1.448 +-	  cout << "Invalid Config File Option." << endl;
   1.449 ++	  std::cout << "Invalid Config File Option." << std::endl;
   1.450 + 	  exit(10);
   1.451 + 	}
   1.452 +       }
   1.453 + 
   1.454 +       else {
   1.455 +-	cout << "Invalid Config File Parameter." << endl;
   1.456 ++	std::cout << "Invalid Config File Parameter." << std::endl;
   1.457 + 	exit(10);
   1.458 +       }
   1.459 +     }
   1.460 +@@ -621,7 +621,7 @@
   1.461 +       SlowKeysDelayValue /= 10;
   1.462 + 
   1.463 +     if(SlowKeysDelayValue == 0) {
   1.464 +-      cout << "Config File: Slow Keys Delay Cannot Be Zero." << endl;
   1.465 ++      std::cout << "Config File: Slow Keys Delay Cannot Be Zero." << std::endl;
   1.466 +       exit(10);
   1.467 +     }
   1.468 + 
   1.469 +@@ -629,7 +629,7 @@
   1.470 +       TimeOutValue /= 10;
   1.471 + 
   1.472 +     if(TimeOutValue == 0) {
   1.473 +-      cout << "Config File: Timeout Value Cannot Be Zero." << endl;
   1.474 ++      std::cout << "Config File: Timeout Value Cannot Be Zero." << std::endl;
   1.475 +       exit(10);
   1.476 +     }
   1.477 + 
   1.478 +@@ -637,7 +637,7 @@
   1.479 +       MouseMaxSpeedValue /= 10;
   1.480 + 
   1.481 +     if(MouseMaxSpeedValue == 0) {
   1.482 +-      cout << "Config File: Mouse Keys Max Speed Cannot Be Zero." << endl;
   1.483 ++      std::cout << "Config File: Mouse Keys Max Speed Cannot Be Zero." << std::endl;
   1.484 +       exit(10);
   1.485 +     }
   1.486 + 
   1.487 +@@ -645,7 +645,7 @@
   1.488 +       MouseTimeToMaxValue /= 10;
   1.489 + 
   1.490 +     if(MouseTimeToMaxValue == 0) {
   1.491 +-      cout << "Config File: Mouse Keys Time To Max Cannot Be Zero." << endl;
   1.492 ++      std::cout << "Config File: Mouse Keys Time To Max Cannot Be Zero." << std::endl;
   1.493 +       exit(10);
   1.494 +     }
   1.495 + 
   1.496 +@@ -653,7 +653,7 @@
   1.497 +       DebounceValue /= 10;
   1.498 + 
   1.499 +     if(DebounceValue == 0) {
   1.500 +-      cout << "Config File: Debounce Delay Cannot Be Zero." << endl;
   1.501 ++      std::cout << "Config File: Debounce Delay Cannot Be Zero." << std::endl;
   1.502 +       exit(10);
   1.503 +     }
   1.504 + 
   1.505 +@@ -661,7 +661,7 @@
   1.506 +       RepeatDelayValue /= 10;
   1.507 + 
   1.508 +     if(RepeatDelayValue == 0) {
   1.509 +-      cout << "Config File: Repeat Keys Delay Cannot Be Zero." << endl;
   1.510 ++      std::cout << "Config File: Repeat Keys Delay Cannot Be Zero." << std::endl;
   1.511 +       exit(10);
   1.512 +     }
   1.513 + 
   1.514 +@@ -669,7 +669,7 @@
   1.515 +       RepeatRateValue /= 10;
   1.516 + 
   1.517 +     if(RepeatRateValue == 0) {
   1.518 +-      cout << "Config File: Repeat Keys Rate Cannot Be Zero." << endl;
   1.519 ++      std::cout << "Config File: Repeat Keys Rate Cannot Be Zero." << std::endl;
   1.520 +       exit(10);
   1.521 +     }
   1.522 + 
   1.523 +@@ -695,14 +695,14 @@
   1.524 +     ax->SetRepeatKeysInterval((int)floor(1000.0/RepeatRateValue));
   1.525 + 
   1.526 +     if(!quiet) {
   1.527 +-      cout << "Config file ~/AccessX loaded." << endl
   1.528 +-	   << "\"ax help\" for help." << endl;
   1.529 ++      std::cout << "Config file ~/AccessX loaded." << std::endl
   1.530 ++	   << "\"ax help\" for help." << std::endl;
   1.531 +     }
   1.532 +   }
   1.533 +   else {
   1.534 +     if(!quiet) {
   1.535 +-      cout << "Config File ~/AccessX not found!" << endl
   1.536 +-	   << "\"ax help\" for help." << endl;
   1.537 ++      std::cout << "Config File ~/AccessX not found!" << std::endl
   1.538 ++	   << "\"ax help\" for help." << std::endl;
   1.539 +     }
   1.540 +   }
   1.541 + }
   1.542 +--- orig.ax.h	2003-09-19 17:06:56.000000000 +0100
   1.543 ++++ ax.h	2010-10-03 12:24:42.000000000 +0100
   1.544 +@@ -24,7 +24,7 @@
   1.545 + 
   1.546 + // Include Files
   1.547 + 
   1.548 +-#include <iostream.h>
   1.549 ++#include <iostream>
   1.550 + #include <stdio.h>
   1.551 + #include <stdlib.h>
   1.552 + #include <string.h>