pidgin-commits

[Gaim-commits] SF.net SVN: gaim: [17072] trunk/console/libgnt/gntutils.c

[<sa...@us...>]

Revision: 17072
Author:   sadrul
Date:     2006-08-28 16:31:12 -0700 (Mon, 28 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=17072&view=rev

Log Message:
-----------
Apparently wcwidth isn't there everywhere. Thanks to Bleeter for this.

Modified Paths:
--------------
    trunk/console/libgnt/gntutils.c
Modified: trunk/console/libgnt/gntutils.c
===================================================================
--- trunk/console/libgnt/gntutils.c	2006-08-28 20:43:12 UTC (rev 17071)
+++ trunk/console/libgnt/gntutils.c	2006-08-28 23:31:12 UTC (rev 17072)
@@ -4,6 +4,10 @@
 #include <string.h>
 #include <wchar.h>
 
+#ifndef __USE_XOPEN
+#define wcwidth(X) 1
+#endif
+
 void gnt_util_get_text_bound(const char *text, int *width, int *height)
 {
 	const char *s = text, *last;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17126] trunk/console/libgnt/gntutils.c

[<sa...@us...>]

Revision: 17126
          http://svn.sourceforge.net/gaim/?rev=17126&view=rev
Author:   sadrul
Date:     2006-09-02 00:38:08 -0700 (Sat, 02 Sep 2006)

Log Message:
-----------
how about now?

Modified Paths:
--------------
    trunk/console/libgnt/gntutils.c

Modified: trunk/console/libgnt/gntutils.c
===================================================================
--- trunk/console/libgnt/gntutils.c	2006-09-02 06:24:50 UTC (rev 17125)
+++ trunk/console/libgnt/gntutils.c	2006-09-02 07:38:08 UTC (rev 17126)
@@ -2,14 +2,17 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <wchar.h>
 
 #include "config.h"
 
 #ifndef HAVE_WCWIDTH
 #define wcwidth(X) 1
+#else
+#define __USE_XOPEN
 #endif
 
+#include <wchar.h>
+
 void gnt_util_get_text_bound(const char *text, int *width, int *height)
 {
 	const char *s = text, *last;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17468] trunk/console/libgnt/gntutils.c

[<sa...@us...>]

Revision: 17468
          http://svn.sourceforge.net/gaim/?rev=17468&view=rev
Author:   sadrul
Date:     2006-10-11 20:33:07 -0700 (Wed, 11 Oct 2006)

Log Message:
-----------
Make sure things don't go crazy when you add text to a textview which is yet to
be given a size.

Modified Paths:
--------------
    trunk/console/libgnt/gntutils.c

Modified: trunk/console/libgnt/gntutils.c
===================================================================
--- trunk/console/libgnt/gntutils.c	2006-10-12 03:30:25 UTC (rev 17467)
+++ trunk/console/libgnt/gntutils.c	2006-10-12 03:33:07 UTC (rev 17468)
@@ -59,6 +59,10 @@
 	int width = 0;
 	const char *str = string;
 
+	if (len <= 0) {
+		len = g_utf8_strlen(string, -1);
+	}
+
 	while (width < len && *str) {
 		size = g_unichar_iswide(g_utf8_get_char(str)) ? 2 : 1;
 		if (width + size > len)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.