From: Steinar H. Gunderson Date: Sat, 19 Feb 2005 02:23:42 +0000 (+0000) Subject: Add a framework for UCS-4 strings. X-Git-Url: https://git.sesse.net/?p=ccbs;a=commitdiff_plain;h=8c33a89ba47845203836e612c56cda70a3ce0f7a Add a framework for UCS-4 strings. --- diff --git a/bigscreen/ccbs_bigscreen.cpp b/bigscreen/ccbs_bigscreen.cpp index 08d2bf2..da78fa1 100644 --- a/bigscreen/ccbs_bigscreen.cpp +++ b/bigscreen/ccbs_bigscreen.cpp @@ -1,12 +1,79 @@ #include +#include +#include #include #include #include "glwindow.h" +iconv_t ucs4_iconv; + +// UCS-4 string +class widestring : public std::basic_string +{ +public: +}; + +template<> +void std::char_traits::assign(unsigned &to, unsigned const &from) +{ + to = from; +} + +template<> +unsigned *std::char_traits::copy(unsigned *to, unsigned const *from, unsigned n) +{ + return static_cast(memcpy(to, from, n * sizeof(unsigned))); +} + +template<> +unsigned *std::char_traits::move(unsigned *to, unsigned const *from, unsigned n) +{ + return static_cast(memmove(to, from, n * sizeof(unsigned))); +} + +template<> +unsigned *std::char_traits::assign(unsigned *to, size_t n, unsigned a) +{ + for (unsigned i = 0; i < n; ++i) + *to++ = a; + return to; +} + + +template<> +void pqxx::from_string(const char *from, widestring &to) +{ + unsigned bytes = std::strlen(from); + char *from_buf = strdup(from); + unsigned *to_buf = new unsigned[bytes + 1]; + + char *inptr = from_buf, *outptr = reinterpret_cast (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"); + } + + to.erase(to.begin(), to.end()); + std::copy(to_buf, reinterpret_cast (outptr), std::back_inserter(to)); + + free(from_buf); + delete[] to_buf; +} + class Tournament { public: int id; - std::string name; + widestring name; }; Tournament active_tournament; @@ -55,7 +122,7 @@ public: tourn->name = tournament["tournamentname"].as(tourn->name); } catch (PGSTD::out_of_range &e) { tourn->id = -1; - tourn->name = ""; +// tourn->name = ""; } } }; @@ -94,7 +161,9 @@ void main_loop(pqxx::connection &conn) int main(int argc, char **argv) { - GLWindow glw("CCBS bigscreen", 800, 600, 32, false, 16, -1); + 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_"); FlagTrigger tournament_changed(conn, "active_tournament");