Improved search criteria option parsing #146
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- option --match added to skip error message searching all three - simplified logic, removed extra variables - updated help
Marked default search as deprecated given the warning message and unanticpated behavior it can cause with COMMAND CHANINING. Reordered manpage a little to identify criteria and options.
|
Jordan (@jordansissel) please let me know if there are any questions or concerns on this PR. I think you will find this fixes some bugs around search and --pid that have been reported a few times.. |
| @@ -142,39 +153,36 @@ int cmd_search(context_t *context) { | |||
| consume_args(context, optind); | |||
|
|
|||
| /* We require a pattern or a pid to search for */ | |||
| if (context->argc < 1 && search.pid == 0) { | |||
| if ((context->argc < 1 && search.pid == 0) && | |||
| !(search.searchmask & (SEARCH_NAME | SEARCH_CLASS | SEARCH_CLASSNAME))) { | |||
There was a problem hiding this comment.
Minor note: SEARCH_PID could also just be looked for in the searchmask here as in line 164. Effect is the same, not sure which is clearer.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Search criteria option parsing is is improved in this PR. Fixes at least #14 and #71
The old default behavior, which was already deprecated by the warning message emitted as been further deprecated in this PR. A new option --match is added that is preferable and more explicit than the "assumption" previously made which avoids the warning. The manpage has been update to reflect more clearly that a [criteria] is required for search.
This PR fixes the case where you do
xdotool search --pid $$ getwindowname "%@"
previously it would consume the COMMAND CHAINING getwindowname as the search criteria and report "%@" as an error.
Previously deprecated --title option was removed from the manpage and usage.