Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[awesome-menu] Grab keyboard earlier if stdin is not a tty 

Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Julien Danjou 2008-04-01 16:43:18 +02:00
parent 4ae523c531
commit 7a220718d2
1 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
awesome-menu.c
View File

@ -642,6 +642,23 @@ item_list_fill_stdin(void)
return has_entry; return has_entry;
} }
/** Grab the keyboard.
*/
static void
keyboard_grab(void)
{
int i;
for(i = 1000; i; i--)
{
if(XGrabKeyboard(globalconf.display, DefaultRootWindow(globalconf.display), True,
GrabModeAsync, GrabModeAsync, CurrentTime) == GrabSuccess)
break;
usleep(1000);
}
if(!i)
eprint("cannot grab keyboard");
}
/** Main function of awesome-menu. /** Main function of awesome-menu.
* \param argc number of elements in argv * \param argc number of elements in argv
* \param argv arguments array * \param argv arguments array
@ -735,27 +752,27 @@ main(int argc, char **argv)
geometry.width, geometry.height, geometry.width, geometry.height,
globalconf.sw->drawable); globalconf.sw->drawable);
if(!item_list_fill_stdin())
item_list_fill_file(NULL);
/* Allocate a default size for the text on the heap instead of /* Allocate a default size for the text on the heap instead of
* using stack allocation with PATH_MAX (may not been defined * using stack allocation with PATH_MAX (may not been defined
* according to POSIX). This string size may be increased if * according to POSIX). This string size may be increased if
* needed */ * needed */
globalconf.text_complete = globalconf.text = p_new(char, CHUNK_SIZE); globalconf.text_complete = globalconf.text = p_new(char, CHUNK_SIZE);
globalconf.text_size = CHUNK_SIZE; globalconf.text_size = CHUNK_SIZE;
compute_match(NULL);
for(opt = 1000; opt; opt--) if(isatty(STDIN_FILENO))
{ {
if(XGrabKeyboard(globalconf.display, DefaultRootWindow(globalconf.display), True, if(!item_list_fill_stdin())
GrabModeAsync, GrabModeAsync, CurrentTime) == GrabSuccess) item_list_fill_file(NULL);
break; keyboard_grab();
usleep(1000);
} }
if(!opt) else
eprint("cannot grab keyboard"); {
keyboard_grab();
if(!item_list_fill_stdin())
item_list_fill_file(NULL);
}
compute_match(NULL);
redraw(); redraw();