Commit 032ac6f8 authored by Gerd Hoffmann's avatar Gerd Hoffmann Committed by Anthony Liguori
Browse files

curses: fixup SIGWINCH handler mess 



Don't run code in the signal handler, only set a flag.
Use sigaction(2) to avoid non-portable signal(2) semantics.
Make #ifdefs less messy.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Reviewed-by: default avatarLaszlo Ersek <lersek@redhat.com>
Message-id: 1385130903-20531-1-git-send-email-kraxel@redhat.com
Signed-off-by: default avatarAnthony Liguori <aliguori@amazon.com>
parent 16f4e8fa

ui/curses.c

+28 −16
Original line number Diff line number Diff line
@@ -106,9 +106,9 @@ static void curses_resize(DisplayChangeListener *dcl, 
    curses_calc_pad();

}



#ifndef _WIN32

#if defined(SIGWINCH) && defined(KEY_RESIZE)

static void curses_winch_handler(int signum)

#if !defined(_WIN32) && defined(SIGWINCH) && defined(KEY_RESIZE)

static volatile sig_atomic_t got_sigwinch;

static void curses_winch_check(void)

{

    struct winsize {

        unsigned short ws_row;
@@ -117,18 +117,34 @@ static void curses_winch_handler(int signum) 
        unsigned short ws_ypixel;   /* unused */

    } ws;



    /* terminal size changed */

    if (ioctl(1, TIOCGWINSZ, &ws) == -1)

    if (!got_sigwinch) {

        return;

    }

    got_sigwinch = false;



    if (ioctl(1, TIOCGWINSZ, &ws) == -1) {

        return;

    }



    resize_term(ws.ws_row, ws.ws_col);

    curses_calc_pad();

    invalidate = 1;

}



    /* some systems require this */

    signal(SIGWINCH, curses_winch_handler);

static void curses_winch_handler(int signum)

{

    got_sigwinch = true;

}

#endif



static void curses_winch_init(void)

{

    struct sigaction old, winch = {

        .sa_handler  = curses_winch_handler,

    };

    sigaction(SIGWINCH, &winch, &old);

}

#else

static void curses_winch_check(void) {}

static void curses_winch_init(void) {}

#endif



static void curses_cursor_position(DisplayChangeListener *dcl,
@@ -163,6 +179,8 @@ static void curses_refresh(DisplayChangeListener *dcl) 
{

    int chr, nextchr, keysym, keycode, keycode_alt;



    curses_winch_check();



    if (invalidate) {

        clear();

        refresh();
@@ -349,13 +367,7 @@ void curses_display_init(DisplayState *ds, int full_screen) 
    curses_keyboard_setup();

    atexit(curses_atexit);



#ifndef _WIN32

#if defined(SIGWINCH) && defined(KEY_RESIZE)

    /* some curses implementations provide a handler, but we

     * want to be sure this is handled regardless of the library */

    signal(SIGWINCH, curses_winch_handler);

#endif

#endif

    curses_winch_init();



    dcl = (DisplayChangeListener *) g_malloc0(sizeof(DisplayChangeListener));

    dcl->ops = &dcl_ops;