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

Fix the order of some logic, and fix the eval syntax

Browse Source
This commit is contained in:
Bradlee Speice
2012-08-03 14:12:02 -04:00
parent 3343652be4
commit 1c6607c3db
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
examples/cva-input.c
View File

@ -122,19 +122,19 @@ int main( int argc, char** argv )
cvaPoint returnPoint; cvaPoint returnPoint;
returnPoint = xte_commandString( display, optarg, mouseButton, searchMethod, tolerance, timeout ); returnPoint = xte_commandString( display, optarg, mouseButton, searchMethod, tolerance, timeout );
if (returnPoint.x != -1 && returnPoint.y != -1) if (returnPoint.x == -2 && returnPoint.y == -2)
{
printf("%s%s%i%s%i\n", optarg, separator, returnPoint.x, separator, returnPoint.y);
returnCode = 0;
}
else if (returnPoint.x == -2 && returnPoint.y == -2)
{ {
/* Not an error, just that the command didn't use returnPoint */ /* Not an error, just that the command didn't use returnPoint */
printf("%s\n", optarg); printf("%s\n", optarg);
returnCode = 0; returnCode = 0;
} }
else if (returnPoint.x != -1 && returnPoint.y != -1)
{
printf("%s%s%i%s%i\n", optarg, separator, returnPoint.x, separator, returnPoint.y);
returnCode = 0;
}
break; break;
case 'o': case 'o':

10
libcvautomation_funcs
View File

@ -578,10 +578,10 @@ key_str ()
return 255 return 255
fi fi
COMMAND_LINE="-s 'keystring $*' " COMMAND_LINE="-s 'keystring $*'"
out "key_str: \"$*\"" out "key_str: \"$*\""
eval '$CVAINPUT $COMMAND_LINE >> $OUTFILE' eval "$CVAINPUT $COMMAND_LINE >> $OUTFILE"
return $? return $?
} # ---------- end of function key_str ---------- } # ---------- end of function key_str ----------
@ -602,7 +602,7 @@ key_down ()
out "key_down: $1" out "key_down: $1"
eval '$CVAINPUT -s "keydown $1" >> $OUTFILE' eval "$CVAINPUT -s 'keydown $1' >> $OUTFILE"
return $? return $?
} # ---------- end of function key_down ---------- } # ---------- end of function key_down ----------
@ -622,7 +622,7 @@ key_up ()
out "key_up: $1" out "key_up: $1"
eval '$CVAINPUT -s "keyup $1" >> $OUTFILE' eval "$CVAINPUT -s 'keyup $1' >> $OUTFILE"
return $? return $?
} # ---------- end of function key_up ---------- } # ---------- end of function key_up ----------
@ -642,7 +642,7 @@ key_click ()
out "key_click: $1" out "key_click: $1"
eval '$CVAINPUT -s "keyclick $1" >> $OUTFILE' eval "$CVAINPUT -s 'keyclick $1' >> $OUTFILE"
return $? return $?
} # ---------- end of function key_press ---------- } # ---------- end of function key_press ----------