X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fwidechar%2Flib_slk_wset.c;h=646b5d9e2fa81b9b299629a8cd34f2b25cbfc2c9;hp=cda5eae3d1ed3ff3459eddf7b8dc7e4a236baa83;hb=dfaa1a3001fd447819f5edc2e523acc1a04f1440;hpb=a8987e73ec254703634802b4f7ee30d3a485524d

diff --git a/ncurses/widechar/lib_slk_wset.c b/ncurses/widechar/lib_slk_wset.c
index cda5eae3..646b5d9e 100644
--- a/ncurses/widechar/lib_slk_wset.c
+++ b/ncurses/widechar/lib_slk_wset.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2003,2004 Free Software Foundation, Inc.                   *
+ * Copyright (c) 2003-2004,2005 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -27,7 +27,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- *  Author: Thomas E. Dickey, 2003                                          *
+ *  Author: Thomas E. Dickey                                                *
  ****************************************************************************/
 
 /*
@@ -36,114 +36,37 @@
  */
 #include <curses.priv.h>
 
-#ifdef HAVE_WCTYPE_H
+#if HAVE_WCTYPE_H
 #include <wctype.h>
 #endif
 
-MODULE_ID("$Id: lib_slk_wset.c,v 1.6 2004/01/03 21:14:03 tom Exp $")
+MODULE_ID("$Id: lib_slk_wset.c,v 1.11 2005/01/16 01:03:53 tom Exp $")
 
 NCURSES_EXPORT(int)
-slk_wset(int i, const wchar_t * astr, int format)
+slk_wset(int i, const wchar_t *astr, int format)
 {
-    static wchar_t empty[] =
-    {L'\0'};
     int result = ERR;
-    SLK *slk = SP->_slk;
-    int offset;
     size_t arglen;
-    const wchar_t *p;
+    const wchar_t *str;
+    char *mystr;
+    mbstate_t state;
 
     T((T_CALLED("slk_wset(%d, %s, %d)"), i, _nc_viswbuf(astr), format));
 
-    if (astr == 0)
-	astr = empty;
-    arglen = wcslen(astr);
-    while (iswspace(*astr)) {
-	--arglen;
-	++astr;			/* skip over leading spaces  */
-    }
-    p = astr;
-    while (iswprint(*p))
-	p++;			/* The first non-print stops */
-
-    arglen = (size_t) (p - astr);
-
-    if (slk != NULL &&
-	i >= 1 &&
-	i <= slk->labcnt &&
-	format >= 0 &&
-	format <= 2) {
-	char *new_text;
-	size_t n;
-	size_t used = 0;
-	int mycols;
-	mbstate_t state;
-
-	--i;			/* Adjust numbering of labels */
-
-	/*
-	 * Reduce the actual number of columns to fit in the label field.
-	 */
-	while (arglen != 0 && wcswidth(astr, arglen) > slk->maxlen) {
-	    --arglen;
-	}
-	mycols = wcswidth(astr, arglen);
-
-	/*
-	 * translate the wide-character string to multibyte form.
-	 */
-	memset(&state, 0, sizeof(state));
-
-	if ((new_text = (char *) _nc_doalloc(0, MB_LEN_MAX * arglen)) == 0)
-	    returnCode(ERR);
-
-	for (n = 0; n < arglen; ++n) {
-	    used += wcrtomb(new_text + used, astr[n], &state);
-	}
-	new_text[used] = '\0';
-
-	if (used >= (size_t) (slk->maxlen + 1)) {
-	    if ((slk->ent[i].ent_text = (char *) _nc_doalloc(slk->ent[i].ent_text,
-							     used + 1)) == 0)
-		returnCode(ERR);
-	    if ((slk->ent[i].form_text = (char *) _nc_doalloc(slk->ent[i].form_text,
-							      used + 1)) == 0)
-		returnCode(ERR);
-	}
-
-	(void) strcpy(slk->ent[i].ent_text, new_text);
-	free(new_text);
-
-	sprintf(slk->ent[i].form_text, "%*s", (size_t) slk->maxlen, " ");
-
-	switch (format) {
-	default:
-	case 0:		/* left-aligned */
-	    offset = 0;
-	    break;
-	case 1:		/* centered */
-	    offset = (slk->maxlen - mycols) / 2;
-	    break;
-	case 2:		/* right-aligned */
-	    offset = slk->maxlen - mycols;
-	    break;
-	}
-	if (offset < 0)
-	    offset = 0;
-	strcpy(slk->ent[i].form_text + offset,
-	       slk->ent[i].ent_text);
-	/*
-	 * Pad the display with blanks on the right, unless it is already
-	 * right-aligned.
-	 */
-	if (format != 2 && mycols < slk->maxlen) {
-	    sprintf(slk->ent[i].form_text + offset + used,
-		    "%*s",
-		    slk->maxlen - (mycols - offset),
-		    " ");
+    init_mb(state);
+    str = astr;
+    if ((arglen = wcsrtombs(NULL, &str, 0, &state)) != (size_t) -1) {
+	if ((mystr = (char *) _nc_doalloc(0, arglen + 1)) != 0) {
+	    str = astr;
+	    if (wcsrtombs(mystr, &str, arglen, &state) != (size_t) -1) {
+		/* glibc documentation claims that the terminating L'\0'
+		 * is written, but it is not...
+		 */
+		mystr[arglen] = 0;
+		result = slk_set(i, mystr, format);
+	    }
+	    free(mystr);
 	}
-	slk->ent[i].dirty = TRUE;
-	result = OK;
     }
     returnCode(result);
 }