mirror-github-bspeice/libcvautomation
1
0
Fork 0
mirror of https://github.com/bspeice/libcvautomation synced 2025-05-11 10:41:28 -04:00
Code Issues Releases Wiki Activity

Rename the xte_pointerLocation function to xte_mouseLocation

Browse Source
This commit is contained in:
Bradlee Speice 2012-07-25 13:44:42 -04:00
parent 174ccd3fb5
commit 2b451fc624
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/libcvautomation/libcvautomation-xtest.h
View File

@ -27,8 +27,8 @@
* If it's not, return 0 (false) */ * If it's not, return 0 (false) */
Bool xte_XTestSupported ( Display *displayLocation ); Bool xte_XTestSupported ( Display *displayLocation );
/* Get the current location of the pointer */ /* Get the current location of the mouse */
cvaPoint xte_pointerLocation ( Display *displayLocation ); cvaPoint xte_mouseLocation ( Display *displayLocation );
/* Click the mouse where it is currently at */ /* Click the mouse where it is currently at */
void xte_clickMouse ( Display *displayLocation, int mouseButton ); void xte_clickMouse ( Display *displayLocation, int mouseButton );
@ -461,10 +461,10 @@ Wait for an image to show up on screen. For example, this can be used to make su
* \warning The program using this library is responsible for checking to see if XTest is supported. * \warning The program using this library is responsible for checking to see if XTest is supported.
*/ */
/** \fn cvaPoint xte_pointerLocation ( Display *displayLocation ); /** \fn cvaPoint xte_mouseLocation ( Display *displayLocation );
* \brief Grab the current location of the pointer * \brief Grab the current location of the mouse
* \param displayLocation The Display of which to grab the pointer location from * \param displayLocation The Display of which to grab the mouse location from
* \returns cvaPoint with the current location of the pointer * \returns cvaPoint with the current location of the mouse
*/ */
/** \fn void xte_clickMouse ( Display *displayLocation, int mouseButton ); /** \fn void xte_clickMouse ( Display *displayLocation, int mouseButton );

28
libcvautomation/libcvautomation-xtest.c
View File

@ -46,11 +46,11 @@ Bool xte_XTestSupported ( Display *displayLocation )
/* /*
* === FUNCTION ====================================================================== * === FUNCTION ======================================================================
* Name: xte_pointerLocation * Name: xte_mouseLocation
* Description: Return the current location of the pointer * Description: Return the current location of the mouse
* ===================================================================================== * =====================================================================================
*/ */
cvaPoint xte_pointerLocation ( Display *displayLocation ) cvaPoint xte_mouseLocation ( Display *displayLocation )
{ {
/* The next few variables we discard, but need them for the function call */ /* The next few variables we discard, but need them for the function call */
Window root, child; Window root, child;
@ -98,7 +98,7 @@ void xte_clickMouseXY ( Display *displayLocation, int xLocation, int yLocation,
{ {
/* To avoid specifying the screen number we're using, calculate the pointer's /* To avoid specifying the screen number we're using, calculate the pointer's
* current location, and move to the new wanted location using relative motion */ * current location, and move to the new wanted location using relative motion */
cvaPoint pointerLocation = xte_pointerLocation( displayLocation ); cvaPoint pointerLocation = xte_mouseLocation( displayLocation );
int xIncrement, yIncrement; int xIncrement, yIncrement;
xIncrement = xLocation - pointerLocation.x; xIncrement = xLocation - pointerLocation.x;
@ -148,7 +148,7 @@ cvaPoint xte_clickMouseImage ( Display *displayLocation, IplImage *subImage, int
return resultPoint; return resultPoint;
cvaPoint pointerLocation; cvaPoint pointerLocation;
pointerLocation = xte_pointerLocation( displayLocation ); pointerLocation = xte_mouseLocation( displayLocation );
int movementX, movementY; int movementX, movementY;
@ -182,7 +182,7 @@ cvaPoint xte_clickMouseImage_location ( Display *displayLocation, const char *fi
return resultPoint; return resultPoint;
cvaPoint pointerLocation; cvaPoint pointerLocation;
pointerLocation = xte_pointerLocation( displayLocation ); pointerLocation = xte_mouseLocation( displayLocation );
int movementX, movementY; int movementX, movementY;
@ -220,7 +220,7 @@ cvaPoint xte_clickMouseImage_center ( Display *displayLocation, IplImage *subIma
return resultPoint; return resultPoint;
cvaPoint pointerLocation; cvaPoint pointerLocation;
pointerLocation = xte_pointerLocation( displayLocation ); pointerLocation = xte_mouseLocation( displayLocation );
int movementX, movementY; int movementX, movementY;
@ -254,7 +254,7 @@ cvaPoint xte_clickMouseImage_location_center ( Display *displayLocation, const c
return resultPoint; return resultPoint;
cvaPoint pointerLocation; cvaPoint pointerLocation;
pointerLocation = xte_pointerLocation( displayLocation ); pointerLocation = xte_mouseLocation( displayLocation );
int movementX, movementY; int movementX, movementY;
@ -279,7 +279,7 @@ cvaPoint xte_clickMouseImage_location_center ( Display *displayLocation, const c
void xte_hoverMouseXY ( Display *displayLocation, int xLocation, int yLocation ) void xte_hoverMouseXY ( Display *displayLocation, int xLocation, int yLocation )
{ {
cvaPoint pointerLocation; cvaPoint pointerLocation;
pointerLocation = xte_pointerLocation( displayLocation ); pointerLocation = xte_mouseLocation( displayLocation );
int xIncrement, yIncrement; int xIncrement, yIncrement;
xIncrement = xLocation - pointerLocation.x; xIncrement = xLocation - pointerLocation.x;
@ -321,7 +321,7 @@ cvaPoint xte_hoverMouseImage ( Display *displayLocation, IplImage *subImage, int
return resultPoint; return resultPoint;
cvaPoint pointerLocation; cvaPoint pointerLocation;
pointerLocation = xte_pointerLocation( displayLocation ); pointerLocation = xte_mouseLocation( displayLocation );
int xIncrement, yIncrement; int xIncrement, yIncrement;
xIncrement = resultPoint.x - pointerLocation.x; xIncrement = resultPoint.x - pointerLocation.x;
@ -351,7 +351,7 @@ cvaPoint xte_hoverMouseImage_location ( Display *displayLocation, const char *fi
return resultPoint; return resultPoint;
cvaPoint pointerLocation; cvaPoint pointerLocation;
pointerLocation = xte_pointerLocation( displayLocation ); pointerLocation = xte_mouseLocation( displayLocation );
int xIncrement, yIncrement; int xIncrement, yIncrement;
xIncrement = resultPoint.x - pointerLocation.x; xIncrement = resultPoint.x - pointerLocation.x;
@ -381,7 +381,7 @@ cvaPoint xte_hoverMouseImage_center ( Display *displayLocation, IplImage *subIma
return resultPoint; return resultPoint;
cvaPoint pointerLocation; cvaPoint pointerLocation;
pointerLocation = xte_pointerLocation( displayLocation ); pointerLocation = xte_mouseLocation( displayLocation );
int xIncrement, yIncrement; int xIncrement, yIncrement;
xIncrement = resultPoint.x - pointerLocation.x; xIncrement = resultPoint.x - pointerLocation.x;
@ -411,7 +411,7 @@ cvaPoint xte_hoverMouseImage_location_center ( Display *displayLocation, const c
return resultPoint; return resultPoint;
cvaPoint pointerLocation; cvaPoint pointerLocation;
pointerLocation = xte_pointerLocation( displayLocation ); pointerLocation = xte_mouseLocation( displayLocation );
int xIncrement, yIncrement; int xIncrement, yIncrement;
xIncrement = resultPoint.x - pointerLocation.x; xIncrement = resultPoint.x - pointerLocation.x;
@ -889,7 +889,7 @@ cvaPoint xte_commandString ( Display *displayLocation, char *commandString, int
if (sscanf( s_commandString, "mousexy %i %i", &xLocation, &yLocation ) != 2) if (sscanf( s_commandString, "mousexy %i %i", &xLocation, &yLocation ) != 2)
{ {
cvaPoint pointerLocation; cvaPoint pointerLocation;
pointerLocation = xte_pointerLocation( displayLocation ); pointerLocation = xte_mouseLocation( displayLocation );
xLocation = pointerLocation.x; xLocation = pointerLocation.x;
yLocation = pointerLocation.y; yLocation = pointerLocation.y;
} }