Preston_PLB
/
sngrep
forked from Mirrors/sngrep
1
0
Fork 0
Code Pull Requests Activity

Add support for Unicode Output

This commit is contained in:
Kaian 2015-02-24 23:42:50 +01:00
parent 1838370731 930b07eb71
commit f7cf974af0
3 changed files with 59 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
configure.ac
View File

@ -33,20 +33,50 @@ AC_CHECK_HEADER([ncurses.h], [], [
AC_MSG_ERROR([ You need to have ncurses development files installed to compile sngrep.])
])
AC_CHECK_LIB([ncurses], [initscr], [], [
AC_MSG_ERROR([ You need to have libncurses installed to compile sngrep.])
])
# Check for Ncurses Wide character support
AC_ARG_ENABLE([unicode],
AC_HELP_STRING([--enable-unicode], [Enable Ncurses Unicode support]),
[AC_SUBST(UNICODE, $enableval)],
[AC_SUBST(UNICODE, no)]
)
AC_CHECK_LIB([panel], [new_panel], [], [
AC_MSG_ERROR([ You need to have ncurses panel library installed to compile sngrep.])
])
AS_IF([test "x$enable_unicode" == "xyes"], [
# Ncurses with wide-character support
AC_DEFINE([WITH_UNICODE], [], [Compile With Unicode compatibility])
AC_CHECK_LIB([form], [new_form], [], [
AC_MSG_ERROR([ You need to have ncurses forms library installed to compile sngrep.])
])
AC_CHECK_LIB([ncursesw], [initscr], [], [
AC_MSG_ERROR([ You need to have libncursesw installed to compile sngrep.])
])
AC_CHECK_LIB([menu], [new_item], [], [
AC_MSG_ERROR([ You need to have ncurses menu library installed to compile sngrep.])
AC_CHECK_LIB([panelw], [new_panel], [], [
AC_MSG_ERROR([ You need to have ncurses panelw library installed to compile sngrep.])
])
AC_CHECK_LIB([formw], [new_form], [], [
AC_MSG_ERROR([ You need to have ncurses formsw library installed to compile sngrep.])
])
AC_CHECK_LIB([menuw], [new_item], [], [
AC_MSG_ERROR([ You need to have ncurses menuw library installed to compile sngrep.])
])
], [
# Ncurses without wide-character support
AC_CHECK_LIB([ncurses], [initscr], [], [
AC_MSG_ERROR([ You need to have libncurses installed to compile sngrep.])
])
AC_CHECK_LIB([panel], [new_panel], [], [
AC_MSG_ERROR([ You need to have ncurses panel library installed to compile sngrep.])
])
AC_CHECK_LIB([form], [new_form], [], [
AC_MSG_ERROR([ You need to have ncurses forms library installed to compile sngrep.])
])
AC_CHECK_LIB([menu], [new_item], [], [
AC_MSG_ERROR([ You need to have ncurses menu library installed to compile sngrep.])
])
])
AC_CHECK_LIB([pthread], [pthread_create], [], [
@ -62,8 +92,11 @@ AC_CHECK_HEADER([pcap.h], [], [
# Check for SSL dependencies
AC_ARG_ENABLE([openssl],
AC_HELP_STRING([--disable-openssl], [Disable TLS SIP Transport]))
AC_HELP_STRING([--disable-openssl], [Disable SSL Support (TLS SIP Transport)]),
[AC_SUBST(OPENSSL, $enableval)],
[AC_SUBST(OPENSSL, yes)]
)
AS_IF([test "x$enable_openssl" != "xno"], [
AC_CHECK_LIB([ssl], [SSL_new], [], [
@ -105,12 +138,12 @@ if test "x${silent}" != "xyes" ; then
echo
fi
AC_MSG_NOTICE
AC_MSG_NOTICE( ====================================================== )
AC_MSG_NOTICE( sngrep configure finished )
AC_MSG_NOTICE( ---------------------------------------------------- )
AC_MSG_NOTICE( ====================================================== )
AC_MSG_NOTICE( sngrep configure finished )
AC_MSG_NOTICE( ====================================================== )
AC_MSG_NOTICE( OpenSSL Support : ${OPENSSL} )
AC_MSG_NOTICE( Unicode Support : ${UNICODE} )
AC_MSG_NOTICE( ====================================================== )
AC_MSG_NOTICE

3
src/ui_manager.c
View File

@ -30,6 +30,7 @@
#include <string.h>
#include <math.h>
#include <stdlib.h>
#include <locale.h>
#include "option.h"
#include "ui_manager.h"
#include "ui_call_list.h"
@ -124,6 +125,8 @@ init_interface()
{
int bg, fg;
const char *term;
// Set Locale
setlocale(LC_CTYPE, "");
// Initialize curses
if (!initscr()) {

6
src/ui_manager.h
View File

@ -35,8 +35,12 @@
*/
#ifndef __SNGREP_UI_MANAGER_H
#define __SNGREP_UI_MANAGER_H
#ifdef WITH_UNICODE
#define _X_OPEN_SOURCE_EXTENDED
#include <ncursesw/ncurses.h>
#else
#include <ncurses.h>
#endif
#include <panel.h>
#include "sip.h"
#include "group.h"