Browse Source

Fix ST ISO4755 and ExternalPipe Conflict

main
Yiğit Çolakoğlu 4 years ago
parent
commit
9023106631
2 changed files with 5 additions and 4 deletions
  1. +2
    -2
      suckless/st/config.h
  2. +3
    -2
      suckless/st/st.c

+ 2
- 2
suckless/st/config.h View File

@ -214,8 +214,8 @@ static Shortcut shortcuts[] = {
{ TERMMOD, XK_V, clippaste, {.i = 0} }, { TERMMOD, XK_V, clippaste, {.i = 0} },
{ TERMMOD, XK_Y, selpaste, {.i = 0} }, { TERMMOD, XK_Y, selpaste, {.i = 0} },
{ ShiftMask, XK_Insert, selpaste, {.i = 0} }, { ShiftMask, XK_Insert, selpaste, {.i = 0} },
{ ALTMOD, XK_Num_Lock, numlock, {.i = 0} },
{ ALTMOD, XK_I, iso14755, {.i = 0} },
{ TERMMOD, XK_Num_Lock, numlock, {.i = 0} },
{ TERMMOD, XK_I, iso14755, {.i = 0} },
{ ALTMOD, XK_Up, zoom, {.f = +1} }, { ALTMOD, XK_Up, zoom, {.f = +1} },
{ ALTMOD, XK_Down, zoom, {.f = -1} }, { ALTMOD, XK_Down, zoom, {.f = -1} },
{ ALTMOD, XK_K, zoom, {.f = +1} }, { ALTMOD, XK_K, zoom, {.f = +1} },


+ 3
- 2
suckless/st/st.c View File

@ -724,10 +724,11 @@ sigchld(int a)
die("waiting for pid %hd failed: %s\n", pid, strerror(errno)); die("waiting for pid %hd failed: %s\n", pid, strerror(errno));
if (pid != p) { if (pid != p) {
if (p == 0 && wait(&stat) < 0)
if (p == 0 && waitpid(-1 ,&stat, WNOHANG) < 0)
/* Changed from wait(&stat) to waitpid(-1, &stat, WNOHANG) */
/* Otherwise the terminal would hang after calling iso4755 */
die("wait: %s\n", strerror(errno)); die("wait: %s\n", strerror(errno));
/* reinstall sigchld handler */
signal(SIGCHLD, sigchld); signal(SIGCHLD, sigchld);
return; return;
} }


Loading…
Cancel
Save