Skip to content

make search --sync delay configurable #238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

make search --sync delay configurable #238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
667ff72
make search --sync delay configurable
sparr Jan 23, 2019
0c78014
man page update for search --syncsleep
sparr Jan 23, 2019
b08675e
Merge branch 'master' into configure-sync-usleep
sparr Jun 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions cmd_search.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ int cmd_search(context_t *context) {
unsigned int i;
int c;
int op_sync = False;
int op_syncsleep = 500000;

int search_title = 0;
int search_name = 0;
Expand All @@ -19,8 +20,8 @@ int cmd_search(context_t *context) {
enum {
opt_unused, opt_title, opt_onlyvisible, opt_name, opt_shell, opt_prefix, opt_class, opt_maxdepth,
opt_pid, opt_help, opt_any, opt_all, opt_screen, opt_classname, opt_desktop,
opt_limit, opt_sync, opt_role
};
opt_limit, opt_sync, opt_role, opt_syncsleep
} optlist_t;
struct option longopts[] = {
{ "all", no_argument, NULL, opt_all },
{ "any", no_argument, NULL, opt_any },
Expand All @@ -39,6 +40,7 @@ int cmd_search(context_t *context) {
{ "limit", required_argument, NULL, opt_limit },
{ "sync", no_argument, NULL, opt_sync },
{ "role", no_argument, NULL, opt_role },
{ "syncsleep", required_argument, NULL, opt_syncsleep },
{ 0, 0, 0, 0 },
};
static const char *usage =
Expand All @@ -62,6 +64,7 @@ int cmd_search(context_t *context) {
"--all Require all conditions match a window. Default is --any\n"
"--any Windows matching any condition will be reported\n"
"--sync Wait until a search result is found.\n"
"--syncsleep Delay between searches with --sync. Default is 500ms.\n"
"-h, --help show this help output\n"
"\n"
"If none of --name, --classname, --class, or --role are specified, the \n"
Expand Down Expand Up @@ -138,6 +141,14 @@ int cmd_search(context_t *context) {
case opt_sync:
op_sync = True;
break;
case opt_syncsleep:
op_syncsleep = strtol(optarg, NULL, 0) * 1000;
if (op_syncsleep == 0) {
fprintf(stderr, "Invalid syncsleep value\n");
fprintf(stderr, usage, cmd);
return EXIT_FAILURE;
}
break;
default:
fprintf(stderr, "Invalid usage\n");
fprintf(stderr, usage, cmd);
Expand Down Expand Up @@ -206,8 +217,7 @@ int cmd_search(context_t *context) {
if (op_sync && nwindows == 0) {
xdotool_debug(context, "No search results, still waiting...");

/* TODO(sissel): Make this tunable */
usleep(500000);
usleep(op_syncsleep);
}
} while (op_sync && nwindows == 0);

Expand Down
4 changes: 4 additions & 0 deletions xdotool.pod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,6 +458,10 @@ For example:
google-chrome &
xdotool search --sync --onlyvisible --class "google-chrome"

=item B<--syncsleep N>

Delay in milliseconds between searches when using --sync. Default 500ms.

=back

=item B<selectwindow>
Expand Down