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

- added a new version of wstrappend() with different behavior from the

Browse Source 
old one (the one renamed to wstrconcat). The new wstrappend(dst, src)
  will modify and return dst, without creating a new string to hold the
  result, except if dst==NULL, in which case its equivalent to calling
  wstrdup(src)
This commit is contained in:
dan
2000-11-02 02:51:53 +00:00
parent 2bd2b72af9
commit a81a0685ef
4 changed files with 97 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/misc.c
View File

@@ -1023,18 +1023,6 @@ keysymToString(KeySym keysym, unsigned int state)
}
#endif
static char *
appendrealloc(char *a, char *b)
{
if (a == NULL)
return wstrdup(b);
else {
char *c = wstrconcat(a, b);
wfree(a);
return c;
}
}
char*
GetShortcutString(char *text)
@@ -1061,39 +1049,39 @@ GetShortcutString(char *text)
modmask |= mod;
if (strcasecmp(text, "Meta")==0) {
buffer = appendrealloc(buffer, "M+");
buffer = wstrappend(buffer, "M+");
} else if (strcasecmp(text, "Alt")==0) {
buffer = appendrealloc(buffer, "A+");
buffer = wstrappend(buffer, "A+");
} else if (strcasecmp(text, "Shift")==0) {
buffer = appendrealloc(buffer, "Sh+");
buffer = wstrappend(buffer, "Sh+");
} else if (strcasecmp(text, "Mod1")==0) {
buffer = appendrealloc(buffer, "M1+");
buffer = wstrappend(buffer, "M1+");
} else if (strcasecmp(text, "Mod2")==0) {
buffer = appendrealloc(buffer, "M2+");
buffer = wstrappend(buffer, "M2+");
} else if (strcasecmp(text, "Mod3")==0) {
buffer = appendrealloc(buffer, "M3+");
buffer = wstrappend(buffer, "M3+");
} else if (strcasecmp(text, "Mod4")==0) {
buffer = appendrealloc(buffer, "M4+");
buffer = wstrappend(buffer, "M4+");
} else if (strcasecmp(text, "Mod5")==0) {
buffer = appendrealloc(buffer, "M5+");
buffer = wstrappend(buffer, "M5+");
} else if (strcasecmp(text, "Control")==0) {
control = 1;
} else {
buffer = appendrealloc(buffer, text);
buffer = wstrappend(buffer, text);
}
text = k+1;
}
if (control) {
buffer = appendrealloc(buffer, "^");
buffer = wstrappend(buffer, "^");
}
buffer = appendrealloc(buffer, text);
buffer = wstrappend(buffer, text);
/* get key */
/* ksym = XStringToKeysym(text);
tmp = keysymToString(ksym, modmask);
puts(tmp);
buffer = wstrconcat(buffer, tmp);
buffer = wstrappend(buffer, tmp);
*/
wfree(tmp);