From: Steinar H. Gunderson <sesse@samfundet.no>
Date: Sat, 19 Feb 2005 14:54:39 +0000 (+0000)
Subject: Move widestring into its own file.
X-Git-Url: https://git.sesse.net/?p=ccbs;a=commitdiff_plain;h=141adc9f5acb9ed1e98a206abb0d2e9cfdce6d2f

Move widestring into its own file.
---

diff --git a/bigscreen/Makefile b/bigscreen/Makefile
index 7f46559..ac92796 100644
--- a/bigscreen/Makefile
+++ b/bigscreen/Makefile
@@ -4,7 +4,7 @@ CPPFLAGS=-I/usr/include/postgresql $(shell freetype-config --cflags) -Itinyptc/
 CXXFLAGS=-g -Wall
 LDFLAGS=-L/usr/X11R6/lib
 LIBS=$(shell freetype-config --libs) $(shell libpq3-config) -lpqxx tinyptc/libtinyptc.a -lX11
-CCBS_BIGSCREEN_OBJS=ccbs_bigscreen.o flagtrigger.o
+CCBS_BIGSCREEN_OBJS=ccbs_bigscreen.o flagtrigger.o widestring.o
 
 all: ccbs-bigscreen
 
diff --git a/bigscreen/ccbs_bigscreen.cpp b/bigscreen/ccbs_bigscreen.cpp
index 9740a8e..fb0d757 100644
--- a/bigscreen/ccbs_bigscreen.cpp
+++ b/bigscreen/ccbs_bigscreen.cpp
@@ -6,50 +6,8 @@
 #include <ft2build.h>
 #include FT_FREETYPE_H
 #include <tinyptc.h>
-#include <endian.h>
 #include "flagtrigger.h"
-
-iconv_t ucs4_iconv;
-
-// UCS-4 string with support for getting from UTF-8
-class widestring : public std::wstring
-{
-public:
-	void operator= (const char *from)
-	{
-		unsigned bytes = std::strlen(from);
-		char *from_buf = strdup(from);
-		wchar_t *to_buf = new wchar_t[bytes + 1];
-
-		char *inptr = from_buf, *outptr = reinterpret_cast<char *> (to_buf);
-
-		size_t in_left = bytes;
-		size_t out_left = bytes * sizeof(wchar_t);
-
-		size_t ret = iconv(ucs4_iconv, NULL, NULL, &outptr, &out_left);
-		if (ret == (size_t)(-1)) {
-			throw std::runtime_error("Error in iconv during initialization");
-		}
-
-		ret = iconv(ucs4_iconv, &inptr, &in_left, &outptr, &out_left);
-		if (ret == (size_t)(-1)) {
-			perror("iconv");
-			throw std::runtime_error("Error in iconv during conversion");
-		}
-
-		erase(begin(), end());
-		std::copy(to_buf, reinterpret_cast<wchar_t *> (outptr), std::back_inserter(*this));
-
-		free(from_buf);
-		delete[] to_buf;
-	}
-};
-
-template<>
-void pqxx::from_string<widestring>(const char *from, widestring &to)
-{
-	to = from;
-}
+#include "widestring.h"
 
 int my_draw_text(const widestring &str, unsigned char *buf, int xpos, int ypos, bool real_render, int r, int g, int b, std::vector<FT_Face> &fontlist);
 
@@ -211,12 +169,6 @@ int my_draw_text(const widestring &str, unsigned char *buf, int xpos, int ypos,
 
 int main(int argc, char **argv)
 {
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-	ucs4_iconv = iconv_open("ucs-4le", "utf-8");
-#else	
-	ucs4_iconv = iconv_open("ucs-4be", "utf-8");
-#endif
-	
 	ptc_open("CCBS bigscreen", 800, 600);
 	
 	try {
diff --git a/bigscreen/widestring.cpp b/bigscreen/widestring.cpp
new file mode 100644
index 0000000..c31f4fc
--- /dev/null
+++ b/bigscreen/widestring.cpp
@@ -0,0 +1,54 @@
+#include <iconv.h>
+#include <endian.h>
+#include <exception>
+#include <pqxx/util>
+#include "widestring.h"
+
+static iconv_t ucs4_iconv;
+static bool iconv_initialized = false;
+
+void widestring::operator= (const char *from)
+{
+	if (!iconv_initialized) {
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+		ucs4_iconv = iconv_open("ucs-4le", "utf-8");
+#else
+		ucs4_iconv = iconv_open("ucs-4be", "utf-8");
+#endif
+
+		iconv_initialized = true;
+	}
+	
+	unsigned bytes = std::strlen(from);
+	char *from_buf = strdup(from);
+	wchar_t *to_buf = new wchar_t[bytes + 1];
+
+	char *inptr = from_buf, *outptr = reinterpret_cast<char *> (to_buf);
+
+	size_t in_left = bytes;
+	size_t out_left = bytes * sizeof(wchar_t);
+
+	size_t ret = iconv(ucs4_iconv, NULL, NULL, &outptr, &out_left);
+	if (ret == (size_t)(-1)) {
+		throw std::runtime_error("Error in iconv during initialization");
+	}
+
+	ret = iconv(ucs4_iconv, &inptr, &in_left, &outptr, &out_left);
+	if (ret == (size_t)(-1)) {
+		perror("iconv");
+		throw std::runtime_error("Error in iconv during conversion");
+	}
+
+	erase(begin(), end());
+	std::copy(to_buf, reinterpret_cast<wchar_t *> (outptr), std::back_inserter(*this));
+
+	free(from_buf);
+	delete[] to_buf;
+}
+
+template<>
+void pqxx::from_string<widestring>(const char *from, widestring &to)
+{
+	to = from;
+}
+
diff --git a/bigscreen/widestring.h b/bigscreen/widestring.h
new file mode 100644
index 0000000..ca899bd
--- /dev/null
+++ b/bigscreen/widestring.h
@@ -0,0 +1,13 @@
+#ifndef _WIDESTRING_H
+#define _WIDESTRING_H 1
+
+#include <string>
+
+// UCS-4 string with support for getting from UTF-8
+class widestring : public std::wstring
+{
+public:
+	void operator= (const char *from);
+};
+
+#endif /* !defined(_WIDESTRING_H) */