gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 12:28:22 +01:00
Code Issues Projects Releases Wiki Activity

Update for 0.51.0

Browse Source
This commit is contained in:
dan
1999-01-25 19:06:50 +00:00
parent 3aeb1eb052
commit 416e3a82be
238 changed files with 24235 additions and 11473 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/misc.c
View File

@@ -782,7 +782,8 @@ getuserinput(WScreen *scr, char *line, int *ptr)
char *ret;
char *title;
char *prompt;
int j, k, state;
int j, state;
int begin;
char tbuffer[256], pbuffer[256];
title = _("Program Arguments");
@@ -796,11 +797,12 @@ getuserinput(WScreen *scr, char *line, int *ptr)
state = _STARTING;
j = 0;
for (; line[*ptr]==0 && state!=_DONE; *ptr++) {
for (; line[*ptr]!=0 && state!=_DONE; (*ptr)++) {
switch (state) {
case _STARTING:
if (line[*ptr]=='(') {
state = _TITLE;
begin = *ptr+1;
} else {
state = _DONE;
}
@@ -810,37 +812,38 @@ getuserinput(WScreen *scr, char *line, int *ptr)
if (j <= 0 && line[*ptr]==',') {
j = 0;
if (*ptr > 1) {
strncpy(tbuffer, &line[1], WMIN(*ptr, 255));
tbuffer[WMIN(*ptr, 255)] = 0;
if (*ptr > begin) {
strncpy(tbuffer, &line[begin], WMIN(*ptr-begin, 255));
tbuffer[WMIN(*ptr-begin, 255)] = 0;
title = (char*)tbuffer;
}
k = *ptr+1;
begin = *ptr+1;
state = _PROMPT;
} else if (j <= 0 && line[*ptr]==')') {
if (*ptr > 1) {
strncpy(tbuffer, &line[1], WMIN(*ptr, 255));
tbuffer[WMIN(*ptr, 255)] = 0;
if (*ptr > begin) {
strncpy(tbuffer, &line[begin], WMIN(*ptr-begin, 255));
tbuffer[WMIN(*ptr-begin, 255)] = 0;
title = (char*)tbuffer;
}
state = _DONE;
} else if (line[*ptr]=='(')
j++;
else if (line[*ptr]==')')
} else if (line[*ptr]=='(') {
j++;
} else if (line[*ptr]==')') {
j--;
}
break;
case _PROMPT:
if (line[*ptr]==')' && j==0) {
if (*ptr-k > 1) {
strncpy(pbuffer, &line[k], WMIN(*ptr-k, 255));
pbuffer[WMIN(*ptr-k, 255)] = 0;
title = (char*)pbuffer;
if (*ptr-begin > 1) {
strncpy(pbuffer, &line[begin], WMIN(*ptr-begin, 255));
pbuffer[WMIN(*ptr-begin, 255)] = 0;
prompt = (char*)pbuffer;
}
state = _DONE;
} else if (line[*ptr]=='(')
@@ -919,6 +922,7 @@ get_dnd_selection(WScreen *scr)
* OPTION w NORMAL <selected window id>
* OPTION a NORMAL <input text>
* OPTION d NORMAL <OffiX DND selection object>
* OPTION W NORMAL <current workspace>
* OPTION etc. NORMAL %<input>
*/
#define TMPBUFSIZE 64
@@ -1004,6 +1008,21 @@ ExpandOptions(WScreen *scr, char *cmdline)
}
break;
case 'W':
sprintf(tmpbuf, "0x%x",
(unsigned int)scr->current_workspace);
slen = strlen(tmpbuf);
olen += slen;
nout = realloc(out,olen);
if (!nout) {
wwarning(_("out of memory during expansion of \"%W\""));
goto error;
}
out = nout;
strcat(out,tmpbuf);
optr+=slen;
break;
case 'a':
ptr++;
user_input = getuserinput(scr, cmdline, &ptr);