Changeset c74a75e96a5bf4752d1e3d6a697ddbde67435e61

Timestamp:

09/13/07 23:58:05 (1 year ago)

Author:

Rafaël Carré <funman@videolan.org>

git-committer:

Rafaël Carré <funman@videolan.org> 1189720685 +0000

git-parent:

[1fd6a94503a42e517cc2bbcb194391d6e7052939]

git-author:

Rafaël Carré <funman@videolan.org> 1189720685 +0000

Message:

ncurses: fallback on libncurses if libncursesw isn't available (macosx)
it is now enabled by default if headers & library are present

Files:

• configure.ac (modified) (1 diff)
• modules/gui/ncurses.c (modified) (5 diffs)

configure.ac

@@ -5311 +5311 @@
-dnl
-AC_ARG_ENABLE(ncurses,
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-   fi])
-

modules/gui/ncurses.c

@@ -33 +33 @@
-#include <time.h>
-
+#ifdef HAVE_NCURSESW_CURSES_H
-#include <ncursesw/curses.h>
+#else
+#include <curses.h>
+#endif
-
-#include <vlc_interface.h>
@@ -1126 +1130 @@
-    char    *p_buf = NULL;
-    int      i_len;
+#ifdef HAVE_NCURSESW_CURSES_H
-    size_t   i_char_len;    /* UCS character length */
-    size_t   i_width;       /* Display width */
-    wchar_t *psz_wide;      /* wchar_t representation of p_buf */
+#endif
-
-    va_start( vl_args, p_fmt );
@@ -1138 +1144 @@
-
-    i_len = strlen( p_buf );
+#ifdef HAVE_NCURSESW_CURSES_H
-    psz_wide = (wchar_t *) malloc( sizeof( wchar_t ) * ( i_len + 1 ) );
-
@@ -1150 +1157 @@
-            i_width = i_len;
-    }
-
-    if( i_width > w )
-
+
+
+
+
-        char *psz_local;
-        int i_cut = i_len - w;
@@ -1178 +1187 @@
-        mvprintw( y, x, "%s", psz_local );
-        LocaleFree( p_buf );
+#ifdef HAVE_NCURSESW_CURSES_H
-        mvhline( y, x + i_width, ' ', w - i_width );
+#else
+        mvhline( y, x + i_len, ' ', w - i_len );
+#endif
-    }
-}