RepoMirrors/bemenu
1
0
Fork 1
mirror of https://github.com/Cloudef/bemenu synced 2025-02-23 02:16:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup curses better.

Browse Source
This commit is contained in:
Jari Vetoniemi 2014-04-10 20:01:34 +03:00
parent 8631506d9d
commit e874818889
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/draw/curses.c
View File

@ -1,10 +1,12 @@
#include "../internal.h"
#define _XOPEN_SOURCE 700
#include <wchar.h>
#include <string.h>
#include <stdlib.h>
#include <locale.h>
#include <ncurses.h>
#include <dlfcn.h>
#include <signal.h>
#include <assert.h>
/* ncurses.h likes to define stuff for us.
@ -24,6 +26,7 @@
* Dynamically loaded curses API.
*/
static struct curses {
struct sigaction action;
void *handle;
WINDOW *stdscr;
WINDOW* (*initscr)(void);
@ -87,7 +90,7 @@ static void _bmDrawCursesDrawLine(int pair, int y, const char *format, ...)
static void _bmDrawCursesRender(const bmMenu *menu)
{
if (!curses.stdscr) {
freopen("/dev/tty", "rw", stdin);
freopen("/dev/tty", "r", stdin);
setlocale(LC_CTYPE, "");
if ((curses.stdscr = curses.initscr()) == NULL)
return;
@ -134,6 +137,7 @@ static void _bmDrawCursesEndWin(void)
curses.endwin();
curses.stdscr = NULL;
freopen("/dev/tty", "w", stdout);
}
static bmKey _bmDrawCursesGetKey(unsigned int *unicode)
@ -218,9 +222,17 @@ static void _bmDrawCursesFree(void)
if (curses.handle)
dlclose(curses.handle);
sigaction(SIGABRT, &curses.action, NULL);
sigaction(SIGSEGV, &curses.action, NULL);
memset(&curses, 0, sizeof(curses));
}
static void _bmDrawCursesCrashHandler(int sig)
{
(void)sig;
_bmDrawCursesFree();
}
int _bmDrawCursesInit(struct _bmRenderApi *api)
{
memset(&curses, 0, sizeof(curses));
@ -270,6 +282,11 @@ int _bmDrawCursesInit(struct _bmRenderApi *api)
api->render = _bmDrawCursesRender;
api->free = _bmDrawCursesFree;
struct sigaction action;
memset(&action, 0, sizeof(struct sigaction));
action.sa_handler = _bmDrawCursesCrashHandler;
sigaction(SIGABRT, &action, &curses.action);
sigaction(SIGSEGV, &action, &curses.action);
return 1;
function_pointer_exception: