Used morphos_wcwidth that was defined in tty_update.c

form/frm_driver.c
  menu/m_global.c
  ncurses/tinfo/lib_acs.c
  test/ins_wide.c
  test/key_names.c
  test/ncurses.c
  test/savescreen.c
  test/test_add_wchstr.c
  test/test_addwstr.c
  test/view.c
This commit is contained in:
aigor44 2022-11-16 23:12:40 +01:00
parent c3b252696c
commit 05697160a7
10 changed files with 70 additions and 0 deletions

View File

@ -104,6 +104,14 @@ Perhaps at some time we will make this configurable at runtime.
#define myINSNSTR(w, s, n) wide_winsnstr(w, s, n)
#define myINNSTR(w, s, n) wide_winnstr(w, s, n)
#define myWCWIDTH(w, y, x) cell_width(w, y, x)
//MLA-begin
#ifdef __MORPHOS__
#define wcwidth morphos_wcwidth
int wcwidth(wchar_t ucs);
#endif
//MLA-end
#else
#define myADDNSTR(w, s, n) waddnstr(w, s, n)
#define myINSNSTR(w, s, n) winsnstr(w, s, n)

View File

@ -249,6 +249,13 @@ _nc_Disconnect_Items(MENU *menu)
|
| Return Values : the width
+--------------------------------------------------------------------------*/
//MLA-begin
#ifdef __MORPHOS__
#define wcwidth morphos_wcwidth
int wcwidth(wchar_t ucs);
#endif
//MLA-end
MENU_EXPORT(int)
_nc_Calculate_Text_Width(const TEXT *item /*FIXME: limit length */ )
{

View File

@ -257,6 +257,13 @@ _nc_init_acs(void)
#endif
#if !NCURSES_WCWIDTH_GRAPHICS
//MLA-begin
#ifdef __MORPHOS__
#define wcwidth morphos_wcwidth
int wcwidth(wchar_t ucs);
#endif
//MLA-end
NCURSES_EXPORT(int)
_nc_wacs_width(unsigned ch)
{

View File

@ -104,6 +104,13 @@ legend(WINDOW *win, int level, Options state, wchar_t *buffer, int length)
waddwstr(win, buffer);
waddstr(win, ">");
}
//MLA-begin
#ifdef __MORPHOS__
#define wcwidth morphos_wcwidth
int wcwidth(wchar_t ucs);
#endif
//MLA-end
static int
ColOf(const wchar_t *buffer, int length, int margin)

View File

@ -33,6 +33,12 @@
#include <test.priv.h>
#if USE_WIDEC_SUPPORT
//MLA-begin
#ifdef __MORPHOS__
#define wcwidth morphos_wcwidth
int wcwidth(wchar_t ucs);
#endif
//MLA-end
static void
usage(void)

View File

@ -3955,6 +3955,13 @@ merge_wide_attr(cchar_t *dst, const cchar_t *src, attr_t attr, NCURSES_PAIRS_T p
* characters (1024 total). However, taking repeats and double-width cells
* into account, use 256 characters for the page.
*/
//MLA-begin
#ifdef __MORPHOS__
#define wcwidth morphos_wcwidth
int wcwidth(wchar_t ucs);
#endif
//MLA-end
static void
show_paged_widechars(unsigned base,
unsigned pagesize,

View File

@ -163,6 +163,12 @@ get_command(int color, int which, int last)
return ch;
}
//MLA-begin
#ifdef __MORPHOS__
#define wcwidth morphos_wcwidth
int wcwidth(wchar_t ucs);
#endif
//MLA-end
static int
dump_screen(char **files, int color, int which, int last, bool use_colors)

View File

@ -190,6 +190,14 @@ legend(WINDOW *win, int level, Options state, wchar_t *buffer, int length)
waddstr(win, ">");
}
//MLA-begin
#ifdef __MORPHOS__
#define wcwidth morphos_wcwidth
int wcwidth(wchar_t ucs);
#endif
//MLA-end
static int
ColOf(const wchar_t *buffer, int length, int margin)
{

View File

@ -113,6 +113,13 @@ legend(WINDOW *win, int level, Options state, wchar_t *buffer, int length)
waddstr(win, ">");
}
//MLA-begin
#ifdef __MORPHOS__
#define wcwidth morphos_wcwidth
int wcwidth(wchar_t ucs);
#endif
//MLA-end
static int
ColOf(wchar_t *buffer, int length, int margin)
{

View File

@ -86,6 +86,13 @@ failed(const char *msg)
ExitProgram(EXIT_FAILURE);
}
//MLA-begin
#ifdef __MORPHOS__
#define wcwidth morphos_wcwidth
int wcwidth(wchar_t ucs);
#endif
//MLA-end
static int
ch_len(NCURSES_CH_T *src)
{