awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[awesome-menu] Remember the last completion request (FS#136) 

Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Julien Danjou 2008-03-31 15:32:41 +02:00
parent 6c6d86eef1
commit 99c9e00d99
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
awesome-menu.c
View File

@ -110,6 +110,8 @@ typedef struct
unsigned int numlockmask; unsigned int numlockmask;
/** The text */ /** The text */
char *text; char *text;
/** The text when we asked to complete */
char *text_complete;
/** The text length */ /** The text length */
size_t text_size; size_t text_size;
/** Item list */ /** Item list */
@ -336,7 +338,6 @@ item_list_fill_file(const char *directory)
static void static void
complete(Bool reverse) complete(Bool reverse)
{ {
char *word;
int loop = 2; int loop = 2;
item_t *item = NULL; item_t *item = NULL;
item_t *(*item_iter)(item_t **, item_t *) = item_list_next_cycle; item_t *(*item_iter)(item_t **, item_t *) = item_list_next_cycle;
@ -353,8 +354,9 @@ complete(Bool reverse)
{ {
if(item->match) if(item->match)
{ {
word = get_last_word(globalconf.text); a_strcpy(globalconf.text_complete,
a_strcpy(word, globalconf.text_size - (word - globalconf.text), item->data); globalconf.text_size - (globalconf.text_complete - globalconf.text),
item->data);
globalconf.item_selected = item; globalconf.item_selected = item;
return; return;
} }
@ -556,6 +558,8 @@ handle_kpress(XKeyEvent *e)
switch(ksym) switch(ksym)
{ {
case XK_space:
globalconf.text_complete = globalconf.text + a_strlen(globalconf.text) + 1;
default: default:
if(num && !iscntrl((int) buf[0])) if(num && !iscntrl((int) buf[0]))
{ {
@ -740,7 +744,7 @@ main(int argc, char **argv)
* 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 = 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); compute_match(NULL);