mirror of
				https://github.com/bspeice/libcvautomation
				synced 2025-11-03 18:00:43 -05:00 
			
		
		
		
	Fix the order of some logic, and fix the eval syntax
This commit is contained in:
		@ -122,19 +122,19 @@ int main( int argc, char** argv )
 | 
			
		||||
				cvaPoint returnPoint;
 | 
			
		||||
				returnPoint = xte_commandString( display, optarg, mouseButton, searchMethod, tolerance, timeout );
 | 
			
		||||
 | 
			
		||||
				if (returnPoint.x != -1 && returnPoint.y != -1)
 | 
			
		||||
				{
 | 
			
		||||
					printf("%s%s%i%s%i\n", optarg, separator, returnPoint.x, separator, returnPoint.y);
 | 
			
		||||
					returnCode = 0;
 | 
			
		||||
				}
 | 
			
		||||
 | 
			
		||||
				else if (returnPoint.x == -2 && returnPoint.y == -2)
 | 
			
		||||
				if (returnPoint.x == -2 && returnPoint.y == -2)
 | 
			
		||||
				{
 | 
			
		||||
					/* Not an error, just that the command didn't use returnPoint */
 | 
			
		||||
					printf("%s\n", optarg);
 | 
			
		||||
					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;
 | 
			
		||||
 | 
			
		||||
			case 'o':
 | 
			
		||||
 | 
			
		||||
@ -581,7 +581,7 @@ key_str ()
 | 
			
		||||
	COMMAND_LINE="-s 'keystring $*'"
 | 
			
		||||
 | 
			
		||||
	out "key_str: \"$*\""
 | 
			
		||||
	eval '$CVAINPUT $COMMAND_LINE >> $OUTFILE'
 | 
			
		||||
	eval "$CVAINPUT $COMMAND_LINE >> $OUTFILE"
 | 
			
		||||
 | 
			
		||||
	return $?
 | 
			
		||||
}	# ----------  end of function key_str  ----------
 | 
			
		||||
@ -602,7 +602,7 @@ key_down ()
 | 
			
		||||
 | 
			
		||||
	out "key_down: $1"
 | 
			
		||||
 | 
			
		||||
	eval '$CVAINPUT -s "keydown $1" >> $OUTFILE'
 | 
			
		||||
	eval "$CVAINPUT -s 'keydown $1' >> $OUTFILE"
 | 
			
		||||
 | 
			
		||||
	return $?
 | 
			
		||||
}	# ----------  end of function key_down  ----------
 | 
			
		||||
@ -622,7 +622,7 @@ key_up ()
 | 
			
		||||
 | 
			
		||||
	out "key_up: $1"
 | 
			
		||||
 | 
			
		||||
	eval '$CVAINPUT -s "keyup $1" >> $OUTFILE'
 | 
			
		||||
	eval "$CVAINPUT -s 'keyup $1' >> $OUTFILE"
 | 
			
		||||
 | 
			
		||||
	return $?
 | 
			
		||||
}	# ----------  end of function key_up  ----------
 | 
			
		||||
@ -642,7 +642,7 @@ key_click ()
 | 
			
		||||
 | 
			
		||||
	out "key_click: $1"
 | 
			
		||||
	
 | 
			
		||||
	eval '$CVAINPUT -s "keyclick $1" >> $OUTFILE'
 | 
			
		||||
	eval "$CVAINPUT -s 'keyclick $1' >> $OUTFILE"
 | 
			
		||||
	
 | 
			
		||||
	return $?
 | 
			
		||||
}	# ----------  end of function key_press  ----------
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user