Re-add OpenGL window, we commented it out and forgot it that way.

[ccbs] / bigscreen / ccbs_bigscreen.cpp

diff --git a/bigscreen/ccbs_bigscreen.cpp b/bigscreen/ccbs_bigscreen.cpp
index 08d2bf24576fad8da550d4c5f07e7ebdad037638..17b71df61154d8364861df88db16910cc47ccf3a 100644 (file)
--- a/bigscreen/ccbs_bigscreen.cpp
+++ b/bigscreen/ccbs_bigscreen.cpp
@@ -1,12 +1,83 @@
 #include <cstdio>
+#include <cstring>
+#include <iconv.h>
 #include <unistd.h>
 #include <pqxx/pqxx>
 #include "glwindow.h"
 
+iconv_t ucs4_iconv;
+
+// UCS-4 string
+class widestring : public std::basic_string<unsigned>
+{
+public:
+       void operator= (const char *from)
+       {
+               unsigned bytes = std::strlen(from);
+               char *from_buf = strdup(from);
+               unsigned *to_buf = new unsigned[bytes + 1];
+
+               char *inptr = from_buf, *outptr = reinterpret_cast<char *> (to_buf);
+
+               size_t in_left = bytes;
+               size_t out_left = bytes * sizeof(unsigned);
+
+               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<unsigned *> (outptr), std::back_inserter(*this));
+
+               free(from_buf);
+               delete[] to_buf;
+       }
+};
+
+template<>
+void std::char_traits<unsigned>::assign(unsigned &to, unsigned const &from)
+{
+       to = from;
+}
+
+template<>
+unsigned *std::char_traits<unsigned>::copy(unsigned *to, unsigned const *from, unsigned n)
+{
+       return static_cast<unsigned *>(memcpy(to, from, n * sizeof(unsigned)));
+}
+
+template<>
+unsigned *std::char_traits<unsigned>::move(unsigned *to, unsigned const *from, unsigned n)
+{
+       return static_cast<unsigned *>(memmove(to, from, n * sizeof(unsigned)));
+}
+
+template<>
+unsigned *std::char_traits<unsigned>::assign(unsigned *to, size_t n, unsigned a)
+{
+       for (unsigned i = 0; i < n; ++i)
+               *to++ = a;
+       return to;
+}
+
+
+template<>
+void pqxx::from_string<widestring>(const char *from, widestring &to)
+{
+       to = from;
+}
+
 class Tournament {
 public:
        int id;
-       std::string name;
+       widestring name;
 };
 
 Tournament active_tournament;
@@ -94,6 +165,8 @@ void main_loop(pqxx::connection &conn)
 
 int main(int argc, char **argv)
 {
+       ucs4_iconv = iconv_open("ucs-4", "utf-8");
+       
        GLWindow glw("CCBS bigscreen", 800, 600, 32, false, 16, -1);
        try {
                pqxx::connection conn("dbname=ccbs host=altersex.samfundet.no user=ccbs password=GeT|>>B_");