]> git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - gl_draw.c
Add more CHECKGLERROR calls, and clean up a few obsolete code scraps.
[xonotic/darkplaces.git] / gl_draw.c
index a4d4425e2790655ba2a133abaadba4be19e027ae..c7e69946a48fbf6feb0f6e9d1befaf6390049002 100644 (file)
--- a/gl_draw.c
+++ b/gl_draw.c
@@ -24,275 +24,56 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "cl_video.h"
 
-cvar_t r_textshadow = {0, "r_textshadow", "0" "draws a shadow on all text to improve readability"};
+#include "ft2.h"
+#include "ft2_fontdefs.h"
 
-static rtexture_t *char_texture;
-cachepic_t *r_crosshairs[NUMCROSSHAIRS+1];
+struct cachepic_s
+{
+       // size of pic
+       int width, height;
+       // this flag indicates that it should be loaded and unloaded on demand
+       int autoload;
+       // texture flags to upload with
+       int texflags;
+       // texture may be freed after a while
+       int lastusedframe;
+       // renderable texture
+       skinframe_t *skinframe;
+       // used for hash lookups
+       struct cachepic_s *chain;
+       // flags - CACHEPICFLAG_NEWPIC for example
+       unsigned int flags;
+       // name of pic
+       char name[MAX_QPATH];
+};
+
+dp_fonts_t dp_fonts;
+static mempool_t *fonts_mempool = NULL;
+
+cvar_t r_textshadow = {CVAR_SAVE, "r_textshadow", "0", "draws a shadow on all text to improve readability (note: value controls offset, 1 = 1 pixel, 1.5 = 1.5 pixels, etc)"};
+cvar_t r_textbrightness = {CVAR_SAVE, "r_textbrightness", "0", "additional brightness for text color codes (0 keeps colors as is, 1 makes them all white)"};
+cvar_t r_textcontrast = {CVAR_SAVE, "r_textcontrast", "1", "additional contrast for text color codes (1 keeps colors as is, 0 makes them all black)"};
+
+cvar_t r_font_postprocess_blur = {CVAR_SAVE, "r_font_postprocess_blur", "0", "font blur amount"};
+cvar_t r_font_postprocess_outline = {CVAR_SAVE, "r_font_postprocess_outline", "0", "font outline amount"};
+cvar_t r_font_postprocess_shadow_x = {CVAR_SAVE, "r_font_postprocess_shadow_x", "0", "font shadow X shift amount, applied during outlining"};
+cvar_t r_font_postprocess_shadow_y = {CVAR_SAVE, "r_font_postprocess_shadow_y", "0", "font shadow Y shift amount, applied during outlining"};
+cvar_t r_font_postprocess_shadow_z = {CVAR_SAVE, "r_font_postprocess_shadow_z", "0", "font shadow Z shift amount, applied during blurring"};
+cvar_t r_font_hinting = {CVAR_SAVE, "r_font_hinting", "3", "0 = no hinting, 1 = light autohinting, 2 = full autohinting, 3 = full hinting"};
+cvar_t r_font_antialias = {CVAR_SAVE, "r_font_antialias", "1", "0 = monochrome, 1 = grey" /* , 2 = rgb, 3 = bgr" */};
+cvar_t r_nearest_2d = {CVAR_SAVE, "r_nearest_2d", "0", "use nearest filtering on all 2d textures (including conchars)"};
+cvar_t r_nearest_conchars = {CVAR_SAVE, "r_nearest_conchars", "0", "use nearest filtering on conchars texture"};
 
 //=============================================================================
 /* Support Routines */
 
-#define FONT_FILESIZE 13468
-#define MAX_CACHED_PICS 1024
-#define CACHEPICHASHSIZE 256
 static cachepic_t *cachepichash[CACHEPICHASHSIZE];
 static cachepic_t cachepics[MAX_CACHED_PICS];
 static int numcachepics;
 
-static rtexturepool_t *drawtexturepool;
-
-static unsigned char concharimage[FONT_FILESIZE] =
-{
-#include "lhfont.h"
-};
-
-static rtexture_t *draw_generateconchars(void)
-{
-       int i;
-       unsigned char buffer[65536][4], *data = NULL;
-       double random;
-
-       data = LoadTGA (concharimage, FONT_FILESIZE, 256, 256);
-// Gold numbers
-       for (i = 0;i < 8192;i++)
-       {
-               random = lhrandom (0.0,1.0);
-               buffer[i][0] = 83 + (unsigned char)(random * 64);
-               buffer[i][1] = 71 + (unsigned char)(random * 32);
-               buffer[i][2] = 23 + (unsigned char)(random * 16);
-               buffer[i][3] = data[i*4+0];
-       }
-// White chars
-       for (i = 8192;i < 32768;i++)
-       {
-               random = lhrandom (0.0,1.0);
-               buffer[i][0] = 95 + (unsigned char)(random * 64);
-               buffer[i][1] = 95 + (unsigned char)(random * 64);
-               buffer[i][2] = 95 + (unsigned char)(random * 64);
-               buffer[i][3] = data[i*4+0];
-       }
-// Gold numbers
-       for (i = 32768;i < 40960;i++)
-       {
-               random = lhrandom (0.0,1.0);
-               buffer[i][0] = 83 + (unsigned char)(random * 64);
-               buffer[i][1] = 71 + (unsigned char)(random * 32);
-               buffer[i][2] = 23 + (unsigned char)(random * 16);
-               buffer[i][3] = data[i*4+0];
-       }
-// Red chars
-       for (i = 40960;i < 65536;i++)
-       {
-               random = lhrandom (0.0,1.0);
-               buffer[i][0] = 96 + (unsigned char)(random * 64);
-               buffer[i][1] = 43 + (unsigned char)(random * 32);
-               buffer[i][2] = 27 + (unsigned char)(random * 32);
-               buffer[i][3] = data[i*4+0];
-       }
-
-#if 0
-       Image_WriteTGARGBA ("gfx/generated_conchars.tga", 256, 256, &buffer[0][0]);
-#endif
+rtexturepool_t *drawtexturepool;
 
-       Mem_Free(data);
-       return R_LoadTexture2D(drawtexturepool, "conchars", 256, 256, &buffer[0][0], TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE, NULL);
-}
-
-static char *pointerimage =
-       "333333332......."
-       "26777761........"
-       "2655541........."
-       "265541.........."
-       "2654561........."
-       "26414561........"
-       "251.14561......."
-       "21...14561......"
-       "1.....141......."
-       ".......1........"
-       "................"
-       "................"
-       "................"
-       "................"
-       "................"
-       "................"
-;
-
-static rtexture_t *draw_generatemousepointer(void)
-{
-       int i;
-       unsigned char buffer[256][4];
-       for (i = 0;i < 256;i++)
-       {
-               if (pointerimage[i] == '.')
-               {
-                       buffer[i][0] = 0;
-                       buffer[i][1] = 0;
-                       buffer[i][2] = 0;
-                       buffer[i][3] = 0;
-               }
-               else
-               {
-                       buffer[i][0] = (pointerimage[i] - '0') * 16;
-                       buffer[i][1] = (pointerimage[i] - '0') * 16;
-                       buffer[i][2] = (pointerimage[i] - '0') * 16;
-                       buffer[i][3] = 255;
-               }
-       }
-       return R_LoadTexture2D(drawtexturepool, "mousepointer", 16, 16, &buffer[0][0], TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE, NULL);
-}
-
-static char *crosshairtexdata[NUMCROSSHAIRS] =
-{
-       "................"
-       "................"
-       "................"
-       "...33......33..."
-       "...355....553..."
-       "....577..775...."
-       ".....77..77....."
-       "................"
-       "................"
-       ".....77..77....."
-       "....577..775...."
-       "...355....553..."
-       "...33......33..."
-       "................"
-       "................"
-       "................"
-       ,
-       "................"
-       "................"
-       "................"
-       "...3........3..."
-       "....5......5...."
-       ".....7....7....."
-       "......7..7......"
-       "................"
-       "................"
-       "......7..7......"
-       ".....7....7....."
-       "....5......5...."
-       "...3........3..."
-       "................"
-       "................"
-       "................"
-       ,
-       "................"
-       ".......77......."
-       ".......77......."
-       "................"
-       "................"
-       ".......44......."
-       ".......44......."
-       ".77..44..44..77."
-       ".77..44..44..77."
-       ".......44......."
-       ".......44......."
-       "................"
-       "................"
-       ".......77......."
-       ".......77......."
-       "................"
-       ,
-       "................"
-       "................"
-       "................"
-       "................"
-       "................"
-       "................"
-       "................"
-       "................"
-       "........7777777."
-       "........752....."
-       "........72......"
-       "........7......."
-       "........7......."
-       "........7......."
-       "........7......."
-       "................"
-       ,
-       "................"
-       "................"
-       "................"
-       "................"
-       "................"
-       "........7......."
-       "................"
-       "........4......."
-       ".....7.4.4.7...."
-       "........4......."
-       "................"
-       "........7......."
-       "................"
-       "................"
-       "................"
-       "................"
-       ,
-       "................"
-       "................"
-       "................"
-       "................"
-       "................"
-       "................"
-       "................"
-       ".......55......."
-       ".......55......."
-       "................"
-       "................"
-       "................"
-       "................"
-       "................"
-       "................"
-       "................"
-};
-
-static rtexture_t *draw_generatecrosshair(int num)
-{
-       int i;
-       char *in;
-       unsigned char data[16*16][4];
-       in = crosshairtexdata[num];
-       for (i = 0;i < 16*16;i++)
-       {
-               if (in[i] == '.')
-               {
-                       data[i][0] = 255;
-                       data[i][1] = 255;
-                       data[i][2] = 255;
-                       data[i][3] = 0;
-               }
-               else
-               {
-                       data[i][0] = 255;
-                       data[i][1] = 255;
-                       data[i][2] = 255;
-                       data[i][3] = (unsigned char) ((int) (in[i] - '0') * 255 / 7);
-               }
-       }
-       return R_LoadTexture2D(drawtexturepool, va("crosshair%i", num), 16, 16, &data[0][0], TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE, NULL);
-}
-
-static rtexture_t *draw_generateditherpattern(void)
-{
-#if 1
-       int x, y;
-       unsigned char data[8*8*4];
-       for (y = 0;y < 8;y++)
-       {
-               for (x = 0;x < 8;x++)
-               {
-                       data[(y*8+x)*4+0] = data[(y*8+x)*4+1] = data[(y*8+x)*4+2] = ((x^y) & 4) ? 255 : 0;
-                       data[(y*8+x)*4+3] = 255;
-               }
-       }
-       return R_LoadTexture2D(drawtexturepool, "ditherpattern", 8, 8, data, TEXTYPE_RGBA, TEXF_FORCENEAREST | TEXF_PRECACHE, NULL);
-#else
-       unsigned char data[16];
-       memset(data, 255, sizeof(data));
-       data[0] = data[1] = data[2] = data[12] = data[13] = data[14] = 0;
-       return R_LoadTexture2D(drawtexturepool, "ditherpattern", 2, 2, data, TEXTYPE_RGBA, TEXF_FORCENEAREST | TEXF_PRECACHE, NULL);
-#endif
-}
+int draw_frame = 1;
 
 /*
 ================
@@ -300,27 +81,45 @@ Draw_CachePic
 ================
 */
 // FIXME: move this to client somehow
-cachepic_t     *Draw_CachePic (const char *path, qboolean persistent)
+cachepic_t *Draw_CachePic_Flags(const char *path, unsigned int cachepicflags)
 {
        int crc, hashkey;
        cachepic_t *pic;
-       qpic_t *p;
-       int flags;
-
-       if (!strncmp(CLVIDEOPREFIX, path, sizeof(CLVIDEOPREFIX) - 1))
-       {
-               clvideo_t *video;
-
-               video = CL_GetVideoByName(path);
-               if( video )
-                       return &video->cpif;
-       }
-
+       int texflags;
+
+       texflags = TEXF_ALPHA;
+       if (!(cachepicflags & CACHEPICFLAG_NOCLAMP))
+               texflags |= TEXF_CLAMP;
+       if (cachepicflags & CACHEPICFLAG_MIPMAP)
+               texflags |= TEXF_MIPMAP;
+       if (!(cachepicflags & CACHEPICFLAG_NOCOMPRESSION) && gl_texturecompression_2d.integer && gl_texturecompression.integer)
+               texflags |= TEXF_COMPRESS;
+       if ((cachepicflags & CACHEPICFLAG_NEAREST) || r_nearest_2d.integer)
+               texflags |= TEXF_FORCENEAREST;
+
+       // check whether the picture has already been cached
        crc = CRC_Block((unsigned char *)path, strlen(path));
        hashkey = ((crc >> 8) ^ crc) % CACHEPICHASHSIZE;
        for (pic = cachepichash[hashkey];pic;pic = pic->chain)
-               if (!strcmp (path, pic->name))
+       {
+               if (!strcmp(path, pic->name))
+               {
+                       // if it was created (or replaced) by Draw_NewPic, just return it
+                       if (!(pic->flags & CACHEPICFLAG_NEWPIC))
+                       {
+                               // reload the pic if texflags changed in important ways
+                               // ignore TEXF_COMPRESS when comparing, because fallback pics remove the flag, and ignore TEXF_MIPMAP because QC specifies that
+                               if (!pic->skinframe || !pic->skinframe->base || ((pic->texflags ^ texflags) & ~(TEXF_COMPRESS | TEXF_MIPMAP)))
+                                       goto reload;
+                               if (!(cachepicflags & CACHEPICFLAG_NOTPERSISTENT))
+                                       pic->autoload = false; // caller is making this pic persistent
+                       }
+                       if (pic->skinframe)
+                               R_SkinFrame_MarkUsed(pic->skinframe);
+                       pic->lastusedframe = draw_frame;
                        return pic;
+               }
+       }
 
        if (numcachepics == MAX_CACHED_PICS)
        {
@@ -329,68 +128,106 @@ cachepic_t       *Draw_CachePic (const char *path, qboolean persistent)
                return cachepics; // return the first one
        }
        pic = cachepics + (numcachepics++);
+       memset(pic, 0, sizeof(*pic));
        strlcpy (pic->name, path, sizeof(pic->name));
        // link into list
        pic->chain = cachepichash[hashkey];
        cachepichash[hashkey] = pic;
 
-       flags = TEXF_ALPHA;
-       if (persistent)
-               flags |= TEXF_PRECACHE;
-       if (!strcmp(path, "gfx/colorcontrol/ditherpattern"))
-               flags |= TEXF_CLAMP;
+reload:
+       if (pic->skinframe)
+               R_SkinFrame_PurgeSkinFrame(pic->skinframe);
+
+       pic->flags = cachepicflags;
+       pic->texflags = texflags;
+       pic->autoload = (cachepicflags & CACHEPICFLAG_NOTPERSISTENT) != 0;
+       pic->lastusedframe = draw_frame;
 
-       // load the pic from disk
-       pic->tex = loadtextureimage(drawtexturepool, path, 0, 0, false, flags);
-       if (pic->tex == NULL && !strncmp(path, "gfx/", 4))
+       if (pic->skinframe)
        {
-               // compatibility with older versions
-               pic->tex = loadtextureimage(drawtexturepool, path + 4, 0, 0, false, flags);
-               // failed to find gfx/whatever.tga or similar, try the wad
-               if (pic->tex == NULL && (p = (qpic_t *)W_GetLumpName (path + 4)))
-               {
-                       if (!strcmp(path, "gfx/conchars"))
-                       {
-                               // conchars is a raw image and with color 0 as transparent instead of 255
-                               pic->tex = R_LoadTexture2D(drawtexturepool, path, 128, 128, (unsigned char *)p, TEXTYPE_PALETTE, flags, palette_font);
-                       }
-                       else
-                               pic->tex = R_LoadTexture2D(drawtexturepool, path, p->width, p->height, p->data, TEXTYPE_PALETTE, flags, palette_transparent);
-               }
+               // reload image after it was unloaded or texflags changed significantly
+               R_SkinFrame_LoadExternal_SkinFrame(pic->skinframe, pic->name, texflags | TEXF_FORCE_RELOAD, (cachepicflags & CACHEPICFLAG_QUIET) == 0, (cachepicflags & CACHEPICFLAG_FAILONMISSING) == 0);
+       }
+       else
+       {
+               // load high quality image (this falls back to low quality too)
+               pic->skinframe = R_SkinFrame_LoadExternal(pic->name, texflags | TEXF_FORCE_RELOAD, (cachepicflags & CACHEPICFLAG_QUIET) == 0, (cachepicflags & CACHEPICFLAG_FAILONMISSING) == 0);
        }
 
-       if (pic->tex == NULL && !strcmp(path, "gfx/conchars"))
-               pic->tex = draw_generateconchars();
-       if (pic->tex == NULL && !strcmp(path, "ui/mousepointer"))
-               pic->tex = draw_generatemousepointer();
-       if (pic->tex == NULL && !strcmp(path, "gfx/prydoncursor001"))
-               pic->tex = draw_generatemousepointer();
-       if (pic->tex == NULL && !strcmp(path, "gfx/crosshair1"))
-               pic->tex = draw_generatecrosshair(0);
-       if (pic->tex == NULL && !strcmp(path, "gfx/crosshair2"))
-               pic->tex = draw_generatecrosshair(1);
-       if (pic->tex == NULL && !strcmp(path, "gfx/crosshair3"))
-               pic->tex = draw_generatecrosshair(2);
-       if (pic->tex == NULL && !strcmp(path, "gfx/crosshair4"))
-               pic->tex = draw_generatecrosshair(3);
-       if (pic->tex == NULL && !strcmp(path, "gfx/crosshair5"))
-               pic->tex = draw_generatecrosshair(4);
-       if (pic->tex == NULL && !strcmp(path, "gfx/crosshair6"))
-               pic->tex = draw_generatecrosshair(5);
-       if (pic->tex == NULL && !strcmp(path, "gfx/colorcontrol/ditherpattern"))
-               pic->tex = draw_generateditherpattern();
-       if (pic->tex == NULL)
-       {
-               Con_Printf("Draw_CachePic: failed to load %s\n", path);
-               pic->tex = r_texture_notexture;
-       }
-
-       pic->width = R_TextureWidth(pic->tex);
-       pic->height = R_TextureHeight(pic->tex);
+       // get the dimensions of the image we loaded (if it was successful)
+       if (pic->skinframe && pic->skinframe->base)
+       {
+               pic->width = R_TextureWidth(pic->skinframe->base);
+               pic->height = R_TextureHeight(pic->skinframe->base);
+       }
+
+       // check for a low quality version of the pic and use its size if possible, to match the stock hud
+       Image_GetStockPicSize(pic->name, &pic->width, &pic->height);
+
        return pic;
 }
 
-cachepic_t *Draw_NewPic(const char *picname, int width, int height, int alpha, unsigned char *pixels)
+cachepic_t *Draw_CachePic (const char *path)
+{
+       return Draw_CachePic_Flags (path, 0); // default to persistent!
+}
+
+const char *Draw_GetPicName(cachepic_t *pic)
+{
+       if (pic == NULL)
+               return "";
+       return pic->name;
+}
+
+int Draw_GetPicWidth(cachepic_t *pic)
+{
+       if (pic == NULL)
+               return 0;
+       return pic->width;
+}
+
+int Draw_GetPicHeight(cachepic_t *pic)
+{
+       if (pic == NULL)
+               return 0;
+       return pic->height;
+}
+
+qboolean Draw_IsPicLoaded(cachepic_t *pic)
+{
+       if (pic == NULL)
+               return false;
+       if (pic->autoload && (!pic->skinframe || !pic->skinframe->base))
+               pic->skinframe = R_SkinFrame_LoadExternal(pic->name, pic->texflags | TEXF_FORCE_RELOAD, false, true);
+       // skinframe will only be NULL if the pic was created with CACHEPICFLAG_FAILONMISSING and not found
+       return pic->skinframe != NULL && pic->skinframe->base != NULL;
+}
+
+rtexture_t *Draw_GetPicTexture(cachepic_t *pic)
+{
+       if (pic == NULL)
+               return NULL;
+       if (pic->autoload && (!pic->skinframe || !pic->skinframe->base))
+               pic->skinframe = R_SkinFrame_LoadExternal(pic->name, pic->texflags | TEXF_FORCE_RELOAD, false, true);
+       pic->lastusedframe = draw_frame;
+       return pic->skinframe ? pic->skinframe->base : NULL;
+}
+
+void Draw_Frame(void)
+{
+       int i;
+       cachepic_t *pic;
+       static double nextpurgetime;
+       if (nextpurgetime > realtime)
+               return;
+       nextpurgetime = realtime + 0.05;
+       for (i = 0, pic = cachepics;i < numcachepics;i++, pic++)
+               if (pic->autoload && pic->skinframe && pic->skinframe->base && pic->lastusedframe < draw_frame)
+                       R_SkinFrame_PurgeSkinFrame(pic->skinframe);
+       draw_frame++;
+}
+
+cachepic_t *Draw_NewPic(const char *picname, int width, int height, unsigned char *pixels_bgra, textype_t textype, int texflags)
 {
        int crc, hashkey;
        cachepic_t *pic;
@@ -403,35 +240,40 @@ cachepic_t *Draw_NewPic(const char *picname, int width, int height, int alpha, u
 
        if (pic)
        {
-               if (pic->tex && pic->width == width && pic->height == height)
+               if (pic->flags & CACHEPICFLAG_NEWPIC && pic->skinframe && pic->skinframe->base && pic->width == width && pic->height == height)
                {
-                       R_UpdateTexture(pic->tex, pixels, 0, 0, width, height);
+                       R_UpdateTexture(pic->skinframe->base, pixels_bgra, 0, 0, 0, width, height, 1);
+                       R_SkinFrame_MarkUsed(pic->skinframe);
+                       pic->lastusedframe = draw_frame;
                        return pic;
                }
        }
        else
        {
-               if (pic == NULL)
+               if (numcachepics == MAX_CACHED_PICS)
                {
-                       if (numcachepics == MAX_CACHED_PICS)
-                       {
-                               Con_Printf ("Draw_NewPic: numcachepics == MAX_CACHED_PICS\n");
-                               // FIXME: support NULL in callers?
-                               return cachepics; // return the first one
-                       }
-                       pic = cachepics + (numcachepics++);
-                       strcpy (pic->name, picname);
-                       // link into list
-                       pic->chain = cachepichash[hashkey];
-                       cachepichash[hashkey] = pic;
+                       Con_Printf ("Draw_NewPic: numcachepics == MAX_CACHED_PICS\n");
+                       // FIXME: support NULL in callers?
+                       return cachepics; // return the first one
                }
+               pic = cachepics + (numcachepics++);
+               memset(pic, 0, sizeof(*pic));
+               strlcpy (pic->name, picname, sizeof(pic->name));
+               // link into list
+               pic->chain = cachepichash[hashkey];
+               cachepichash[hashkey] = pic;
        }
 
+       R_SkinFrame_PurgeSkinFrame(pic->skinframe);
+
+       pic->autoload = false;
+       pic->flags = CACHEPICFLAG_NEWPIC; // disable texflags checks in Draw_CachePic
+       pic->flags |= (texflags & TEXF_CLAMP) ? 0 : CACHEPICFLAG_NOCLAMP;
+       pic->flags |= (texflags & TEXF_FORCENEAREST) ? CACHEPICFLAG_NEAREST : 0;
        pic->width = width;
        pic->height = height;
-       if (pic->tex)
-               R_FreeTexture(pic->tex);
-       pic->tex = R_LoadTexture2D(drawtexturepool, picname, width, height, pixels, TEXTYPE_RGBA, alpha ? TEXF_ALPHA : 0, NULL);
+       pic->skinframe = R_SkinFrame_LoadInternalBGRA(picname, texflags | TEXF_FORCE_RELOAD, pixels_bgra, width, height, vid.sRGB2D);
+       pic->lastusedframe = draw_frame;
        return pic;
 }
 
@@ -440,14 +282,14 @@ void Draw_FreePic(const char *picname)
        int crc;
        int hashkey;
        cachepic_t *pic;
-       // this doesn't really free the pic, but does free it's texture
+       // this doesn't really free the pic, but does free its texture
        crc = CRC_Block((unsigned char *)picname, strlen(picname));
        hashkey = ((crc >> 8) ^ crc) % CACHEPICHASHSIZE;
        for (pic = cachepichash[hashkey];pic;pic = pic->chain)
        {
-               if (!strcmp (picname, pic->name) && pic->tex)
+               if (!strcmp (picname, pic->name) && pic->skinframe)
                {
-                       R_FreeTexture(pic->tex);
+                       R_SkinFrame_PurgeSkinFrame(pic->skinframe);
                        pic->width = 0;
                        pic->height = 0;
                        return;
@@ -455,174 +297,523 @@ void Draw_FreePic(const char *picname)
        }
 }
 
-/*
-===============
-Draw_Init
-===============
-*/
-static void gl_draw_start(void)
+static float snap_to_pixel_x(float x, float roundUpAt);
+extern int con_linewidth; // to force rewrapping
+void LoadFont(qboolean override, const char *name, dp_font_t *fnt, float scale, float voffset)
 {
-       int i;
-       drawtexturepool = R_AllocTexturePool();
+       int i, ch;
+       float maxwidth;
+       char widthfile[MAX_QPATH];
+       char *widthbuf;
+       fs_offset_t widthbufsize;
 
-       numcachepics = 0;
-       memset(cachepichash, 0, sizeof(cachepichash));
+       if(override || !fnt->texpath[0])
+       {
+               strlcpy(fnt->texpath, name, sizeof(fnt->texpath));
+               // load the cvars when the font is FIRST loader
+               fnt->settings.scale = scale;
+               fnt->settings.voffset = voffset;
+               fnt->settings.antialias = r_font_antialias.integer;
+               fnt->settings.hinting = r_font_hinting.integer;
+               fnt->settings.outline = r_font_postprocess_outline.value;
+               fnt->settings.blur = r_font_postprocess_blur.value;
+               fnt->settings.shadowx = r_font_postprocess_shadow_x.value;
+               fnt->settings.shadowy = r_font_postprocess_shadow_y.value;
+               fnt->settings.shadowz = r_font_postprocess_shadow_z.value;
+       }
+       // fix bad scale
+       if (fnt->settings.scale <= 0)
+               fnt->settings.scale = 1;
 
-       char_texture = Draw_CachePic("gfx/conchars", true)->tex;
-       for (i = 1;i <= NUMCROSSHAIRS;i++)
-               r_crosshairs[i] = Draw_CachePic(va("gfx/crosshair%i", i), true);
-}
+       if(drawtexturepool == NULL)
+               return; // before gl_draw_start, so will be loaded later
 
-static void gl_draw_shutdown(void)
-{
-       R_FreeTexturePool(&drawtexturepool);
+       if(fnt->ft2)
+       {
+               // clear freetype font
+               Font_UnloadFont(fnt->ft2);
+               Mem_Free(fnt->ft2);
+               fnt->ft2 = NULL;
+       }
 
-       numcachepics = 0;
-       memset(cachepichash, 0, sizeof(cachepichash));
-}
+       if(fnt->req_face != -1)
+       {
+               if(!Font_LoadFont(fnt->texpath, fnt))
+                       Con_DPrintf("Failed to load font-file for '%s', it will not support as many characters.\n", fnt->texpath);
+       }
 
-static void gl_draw_newmap(void)
-{
-}
+       fnt->pic = Draw_CachePic_Flags(fnt->texpath, CACHEPICFLAG_QUIET | CACHEPICFLAG_NOCOMPRESSION | (r_nearest_conchars.integer ? CACHEPICFLAG_NEAREST : 0) | CACHEPICFLAG_FAILONMISSING);
+       if(!Draw_IsPicLoaded(fnt->pic))
+       {
+               for (i = 0; i < MAX_FONT_FALLBACKS; ++i)
+               {
+                       if (!fnt->fallbacks[i][0])
+                               break;
+                       fnt->pic = Draw_CachePic_Flags(fnt->fallbacks[i], CACHEPICFLAG_QUIET | CACHEPICFLAG_NOCOMPRESSION | (r_nearest_conchars.integer ? CACHEPICFLAG_NEAREST : 0) | CACHEPICFLAG_FAILONMISSING);
+                       if(Draw_IsPicLoaded(fnt->pic))
+                               break;
+               }
+               if(!Draw_IsPicLoaded(fnt->pic))
+               {
+                       fnt->pic = Draw_CachePic_Flags("gfx/conchars", CACHEPICFLAG_NOCOMPRESSION | (r_nearest_conchars.integer ? CACHEPICFLAG_NEAREST : 0));
+                       strlcpy(widthfile, "gfx/conchars.width", sizeof(widthfile));
+               }
+               else
+                       dpsnprintf(widthfile, sizeof(widthfile), "%s.width", fnt->fallbacks[i]);
+       }
+       else
+               dpsnprintf(widthfile, sizeof(widthfile), "%s.width", fnt->texpath);
 
-void GL_Draw_Init (void)
-{
-       Cvar_RegisterVariable(&r_textshadow);
-       R_RegisterModule("GL_Draw", gl_draw_start, gl_draw_shutdown, gl_draw_newmap);
-}
+       // unspecified width == 1 (base width)
+       for(ch = 0; ch < 256; ++ch)
+               fnt->width_of[ch] = 1;
 
-void DrawQ_Begin(void)
-{
-       r_view_width = bound(0, r_refdef.width, vid.width);
-       r_view_height = bound(0, r_refdef.height, vid.height);
-       r_view_depth = 1;
-       r_view_x = bound(0, r_refdef.x, vid.width - r_refdef.width);
-       r_view_y = bound(0, r_refdef.y, vid.height - r_refdef.height);
-       r_view_z = 0;
-       r_view_matrix = r_refdef.viewentitymatrix;
-       GL_ColorMask(r_refdef.colormask[0], r_refdef.colormask[1], r_refdef.colormask[2], 1);
+       // FIXME load "name.width", if it fails, fill all with 1
+       if((widthbuf = (char *) FS_LoadFile(widthfile, tempmempool, true, &widthbufsize)))
+       {
+               float extraspacing = 0;
+               const char *p = widthbuf;
 
-       qglViewport(r_view_x, vid.height - (r_view_y + r_view_height), r_view_width, r_view_height);
-       GL_SetupView_Mode_Ortho(0, 0, vid_conwidth.integer, vid_conheight.integer, -10, 100);
-       qglDepthFunc(GL_LEQUAL);
-       R_Mesh_Matrix(&identitymatrix);
+               ch = 0;
+               while(ch < 256)
+               {
+                       if(!COM_ParseToken_Simple(&p, false, false, true))
+                               return;
+
+                       switch(*com_token)
+                       {
+                               case '0':
+                               case '1':
+                               case '2':
+                               case '3':
+                               case '4':
+                               case '5':
+                               case '6':
+                               case '7':
+                               case '8':
+                               case '9':
+                               case '+':
+                               case '-':
+                               case '.':
+                                       fnt->width_of[ch] = atof(com_token) + extraspacing;
+                                       ch++;
+                                       break;
+                               default:
+                                       if(!strcmp(com_token, "extraspacing"))
+                                       {
+                                               if(!COM_ParseToken_Simple(&p, false, false, true))
+                                                       return;
+                                               extraspacing = atof(com_token);
+                                       }
+                                       else if(!strcmp(com_token, "scale"))
+                                       {
+                                               if(!COM_ParseToken_Simple(&p, false, false, true))
+                                                       return;
+                                               fnt->settings.scale = atof(com_token);
+                                       }
+                                       else
+                                       {
+                                               Con_Printf("Warning: skipped unknown font property %s\n", com_token);
+                                               if(!COM_ParseToken_Simple(&p, false, false, true))
+                                                       return;
+                                       }
+                                       break;
+                       }
+               }
 
-       GL_DepthMask(true);
-       GL_DepthTest(false);
-       GL_Color(1,1,1,1);
+               Mem_Free(widthbuf);
+       }
 
-       r_refdef.draw2dstage = true;
+       if(fnt->ft2)
+       {
+               for (i = 0; i < MAX_FONT_SIZES; ++i)
+               {
+                       ft2_font_map_t *map = Font_MapForIndex(fnt->ft2, i);
+                       if (!map)
+                               break;
+                       for(ch = 0; ch < 256; ++ch)
+                               map->width_of[ch] = Font_SnapTo(fnt->width_of[ch], 1/map->size);
+               }
+       }
+
+       maxwidth = fnt->width_of[0];
+       for(i = 1; i < 256; ++i)
+               maxwidth = max(maxwidth, fnt->width_of[i]);
+       fnt->maxwidth = maxwidth;
+
+       // fix up maxwidth for overlap
+       fnt->maxwidth *= fnt->settings.scale;
+
+       if(fnt == FONT_CONSOLE)
+               con_linewidth = -1; // rewrap console in next frame
 }
 
-void DrawQ_Pic(float x, float y, cachepic_t *pic, float width, float height, float red, float green, float blue, float alpha, int flags)
+extern cvar_t developer_font;
+dp_font_t *FindFont(const char *title, qboolean allocate_new)
 {
-       if (!r_refdef.draw2dstage)
+       int i, oldsize;
+
+       // find font
+       for(i = 0; i < dp_fonts.maxsize; ++i)
+               if(!strcmp(dp_fonts.f[i].title, title))
+                       return &dp_fonts.f[i];
+       // if not found - try allocate
+       if (allocate_new)
        {
-               Con_Printf("DrawQ_Pic: not in 2d rendering stage!\n");
-               return;
+               // find any font with empty title
+               for(i = 0; i < dp_fonts.maxsize; ++i)
+               {
+                       if(!strcmp(dp_fonts.f[i].title, ""))
+                       {
+                               strlcpy(dp_fonts.f[i].title, title, sizeof(dp_fonts.f[i].title));
+                               return &dp_fonts.f[i];
+                       }
+               }
+               // if no any 'free' fonts - expand buffer
+               oldsize = dp_fonts.maxsize;
+               dp_fonts.maxsize = dp_fonts.maxsize + FONTS_EXPAND;
+               if (developer_font.integer)
+                       Con_Printf("FindFont: enlarging fonts buffer (%i -> %i)\n", oldsize, dp_fonts.maxsize);
+               dp_fonts.f = (dp_font_t *)Mem_Realloc(fonts_mempool, dp_fonts.f, sizeof(dp_font_t) * dp_fonts.maxsize);
+               // relink ft2 structures
+               for(i = 0; i < oldsize; ++i)
+                       if (dp_fonts.f[i].ft2)
+                               dp_fonts.f[i].ft2->settings = &dp_fonts.f[i].settings;
+               // register a font in first expanded slot
+               strlcpy(dp_fonts.f[oldsize].title, title, sizeof(dp_fonts.f[oldsize].title));
+               return &dp_fonts.f[oldsize];
        }
-       DrawQ_SuperPic(x,y,pic,width,height,0,0,red,green,blue,alpha,1,0,red,green,blue,alpha,0,1,red,green,blue,alpha,1,1,red,green,blue,alpha,flags);
+       return NULL;
+}
+
+static float snap_to_pixel_x(float x, float roundUpAt)
+{
+       float pixelpos = x * vid.width / vid_conwidth.value;
+       int snap = (int) pixelpos;
+       if (pixelpos - snap >= roundUpAt) ++snap;
+       return ((float)snap * vid_conwidth.value / vid.width);
+       /*
+       x = (int)(x * vid.width / vid_conwidth.value);
+       x = (x * vid_conwidth.value / vid.width);
+       return x;
+       */
+}
+
+static float snap_to_pixel_y(float y, float roundUpAt)
+{
+       float pixelpos = y * vid.height / vid_conheight.value;
+       int snap = (int) pixelpos;
+       if (pixelpos - snap > roundUpAt) ++snap;
+       return ((float)snap * vid_conheight.value / vid.height);
+       /*
+       y = (int)(y * vid.height / vid_conheight.value);
+       y = (y * vid_conheight.value / vid.height);
+       return y;
+       */
 }
 
-void DrawQ_String_Real(float x, float y, const char *string, int maxlen, float w, float h, float red, float green, float blue, float alpha, int flags)
+static void LoadFont_f(void)
 {
-       int i, num;
-       float *av, *at;
-       int batchcount;
-       rmeshstate_t m;
-       float vertex3f[QUADELEMENTS_MAXQUADS*4*3];
-       float texcoord2f[QUADELEMENTS_MAXQUADS*4*2];
+       dp_font_t *f;
+       int i, sizes;
+       const char *filelist, *c, *cm;
+       float sz, scale, voffset;
+       char mainfont[MAX_QPATH];
 
-       if (!r_refdef.draw2dstage)
+       if(Cmd_Argc() < 2)
        {
-               Con_Printf("DrawQ_String: not in 2d rendering stage!\n");
+               Con_Printf("Available font commands:\n");
+               for(i = 0; i < dp_fonts.maxsize; ++i)
+                       if (dp_fonts.f[i].title[0])
+                               Con_Printf("  loadfont %s gfx/tgafile[...] [custom switches] [sizes...]\n", dp_fonts.f[i].title);
+               Con_Printf("A font can simply be gfx/tgafile, or alternatively you\n"
+                          "can specify multiple fonts and faces\n"
+                          "Like this: gfx/vera-sans:2,gfx/fallback:1\n"
+                          "to load face 2 of the font gfx/vera-sans and use face 1\n"
+                          "of gfx/fallback as fallback font.\n"
+                          "You can also specify a list of font sizes to load, like this:\n"
+                          "loadfont console gfx/conchars,gfx/fallback 8 12 16 24 32\n"
+                          "In many cases, 8 12 16 24 32 should be a good choice.\n"
+                          "custom switches:\n"
+                          " scale x : scale all characters by this amount when rendering (doesnt change line height)\n"
+                          " voffset x : offset all chars vertical when rendering, this is multiplied to character height\n"
+                       );
                return;
        }
-
-       if (!r_render.integer)
-               return;
-
-       if (alpha < (1.0f / 255.0f))
+       f = FindFont(Cmd_Argv(1), true);
+       if(f == NULL)
+       {
+               Con_Printf("font function not found\n");
                return;
+       }
 
-       if(flags == DRAWFLAG_ADDITIVE)
-               GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
-       else if(flags == DRAWFLAG_MODULATE)
-               GL_BlendFunc(GL_DST_COLOR, GL_ZERO);
-       else if(flags == DRAWFLAG_2XMODULATE)
-               GL_BlendFunc(GL_DST_COLOR,GL_SRC_COLOR);
+       if(Cmd_Argc() < 3)
+               filelist = "gfx/conchars";
        else
-               GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+               filelist = Cmd_Argv(2);
 
-       GL_Color(red, green, blue, alpha);
+       memset(f->fallbacks, 0, sizeof(f->fallbacks));
+       memset(f->fallback_faces, 0, sizeof(f->fallback_faces));
 
-       memset(&m, 0, sizeof(m));
-       m.pointer_vertex = vertex3f;
-       m.pointer_color = NULL;
-       m.pointer_texcoord[0] = texcoord2f;
-       m.tex[0] = R_GetTexture(char_texture);
-       R_Mesh_State(&m);
+       // first font is handled "normally"
+       c = strchr(filelist, ':');
+       cm = strchr(filelist, ',');
+       if(c && (!cm || c < cm))
+               f->req_face = atoi(c+1);
+       else
+       {
+               f->req_face = 0;
+               c = cm;
+       }
 
-       at = texcoord2f;
-       av = vertex3f;
-       batchcount = 0;
+       if(!c || (c - filelist) > MAX_QPATH)
+               strlcpy(mainfont, filelist, sizeof(mainfont));
+       else
+       {
+               memcpy(mainfont, filelist, c - filelist);
+               mainfont[c - filelist] = 0;
+       }
 
-       if (maxlen < 1)
-               maxlen = 9999;
-       for (i = 0;i < maxlen && x < vid_conwidth.integer && (num = string[i]);i++, x += w)
+       for(i = 0; i < MAX_FONT_FALLBACKS; ++i)
        {
-               float s, t, u, v;
-               if (num == ' ')
-                       continue;
-               s = (num & 15)*0.0625f + (0.5f / 256.0f);
-               t = (num >> 4)*0.0625f + (0.5f / 256.0f);
-               u = 0.0625f - (1.0f / 256.0f);
-               v = 0.0625f - (1.0f / 256.0f);
-               at[ 0] = s  ;at[ 1] = t  ;
-               at[ 2] = s+u;at[ 3] = t  ;
-               at[ 4] = s+u;at[ 5] = t+v;
-               at[ 6] = s  ;at[ 7] = t+v;
-               av[ 0] = x  ;av[ 1] = y  ;av[ 2] = 10;
-               av[ 3] = x+w;av[ 4] = y  ;av[ 5] = 10;
-               av[ 6] = x+w;av[ 7] = y+h;av[ 8] = 10;
-               av[ 9] = x  ;av[10] = y+h;av[11] = 10;
-               at += 8;
-               av += 12;
-               batchcount++;
-               if (batchcount >= QUADELEMENTS_MAXQUADS)
+               c = strchr(filelist, ',');
+               if(!c)
+                       break;
+               filelist = c + 1;
+               if(!*filelist)
+                       break;
+               c = strchr(filelist, ':');
+               cm = strchr(filelist, ',');
+               if(c && (!cm || c < cm))
+                       f->fallback_faces[i] = atoi(c+1);
+               else
+               {
+                       f->fallback_faces[i] = 0; // f->req_face; could make it stick to the default-font's face index
+                       c = cm;
+               }
+               if(!c || (c-filelist) > MAX_QPATH)
                {
-                       GL_LockArrays(0, batchcount * 4);
-                       R_Mesh_Draw(0, batchcount * 4, batchcount * 2, quadelements);
-                       GL_LockArrays(0, 0);
-                       batchcount = 0;
-                       at = texcoord2f;
-                       av = vertex3f;
+                       strlcpy(f->fallbacks[i], filelist, sizeof(mainfont));
+               }
+               else
+               {
+                       memcpy(f->fallbacks[i], filelist, c - filelist);
+                       f->fallbacks[i][c - filelist] = 0;
                }
        }
-       if (batchcount > 0)
+
+       // for now: by default load only one size: the default size
+       f->req_sizes[0] = 0;
+       for(i = 1; i < MAX_FONT_SIZES; ++i)
+               f->req_sizes[i] = -1;
+
+       scale = 1;
+       voffset = 0;
+       if(Cmd_Argc() >= 4)
        {
-               GL_LockArrays(0, batchcount * 4);
-               R_Mesh_Draw(0, batchcount * 4, batchcount * 2, quadelements);
-               GL_LockArrays(0, 0);
+               for(sizes = 0, i = 3; i < Cmd_Argc(); ++i)
+               {
+                       // special switches
+                       if (!strcmp(Cmd_Argv(i), "scale"))
+                       {
+                               i++;
+                               if (i < Cmd_Argc())
+                                       scale = atof(Cmd_Argv(i));
+                               continue;
+                       }
+                       if (!strcmp(Cmd_Argv(i), "voffset"))
+                       {
+                               i++;
+                               if (i < Cmd_Argc())
+                                       voffset = atof(Cmd_Argv(i));
+                               continue;
+                       }
+
+                       if (sizes == -1)
+                               continue; // no slot for other sizes
+
+                       // parse one of sizes
+                       sz = atof(Cmd_Argv(i));
+                       if (sz > 0.001f && sz < 1000.0f) // do not use crap sizes
+                       {
+                               // search for duplicated sizes
+                               int j;
+                               for (j=0; j<sizes; j++)
+                                       if (f->req_sizes[j] == sz)
+                                               break;
+                               if (j != sizes)
+                                       continue; // sz already in req_sizes, don't add it again
+
+                               if (sizes == MAX_FONT_SIZES)
+                               {
+                                       Con_Printf("Warning: specified more than %i different font sizes, exceding ones are ignored\n", MAX_FONT_SIZES);
+                                       sizes = -1;
+                                       continue;
+                               }
+                               f->req_sizes[sizes] = sz;
+                               sizes++;
+                       }
+               }
        }
+
+       LoadFont(true, mainfont, f, scale, voffset);
+}
+
+/*
+===============
+Draw_Init
+===============
+*/
+static void gl_draw_start(void)
+{
+       int i;
+       char vabuf[1024];
+       drawtexturepool = R_AllocTexturePool();
+
+       numcachepics = 0;
+       memset(cachepichash, 0, sizeof(cachepichash));
+
+       font_start();
+
+       // load default font textures
+       for(i = 0; i < dp_fonts.maxsize; ++i)
+               if (dp_fonts.f[i].title[0])
+                       LoadFont(false, va(vabuf, sizeof(vabuf), "gfx/font_%s", dp_fonts.f[i].title), &dp_fonts.f[i], 1, 0);
+
+       // draw the loading screen so people have something to see in the newly opened window
+       SCR_UpdateLoadingScreen(true, true);
 }
 
-void DrawQ_String(float x, float y, const char *string, int maxlen, float scalex, float scaley, float red, float green, float blue, float alpha, int flags)
+static void gl_draw_shutdown(void)
 {
-       if (!r_refdef.draw2dstage)
+       font_shutdown();
+
+       R_FreeTexturePool(&drawtexturepool);
+
+       numcachepics = 0;
+       memset(cachepichash, 0, sizeof(cachepichash));
+}
+
+static void gl_draw_newmap(void)
+{
+       int i;
+       font_newmap();
+
+       // mark all of the persistent pics so they are not purged...
+       for (i = 0; i < numcachepics; i++)
        {
-               Con_Printf("DrawQ_String: not in 2d rendering stage!\n");
-               return;
+               cachepic_t *pic = cachepics + i;
+               if (!pic->autoload && pic->skinframe)
+                       R_SkinFrame_MarkUsed(pic->skinframe);
        }
+}
 
-       if (r_textshadow.integer)
-               DrawQ_String_Real(x+scalex*0.25,y+scaley*0.25,string,maxlen,scalex,scaley,0,0,0,alpha*0.8,flags);
+void GL_Draw_Init (void)
+{
+       int i, j;
+
+       Cvar_RegisterVariable(&r_font_postprocess_blur);
+       Cvar_RegisterVariable(&r_font_postprocess_outline);
+       Cvar_RegisterVariable(&r_font_postprocess_shadow_x);
+       Cvar_RegisterVariable(&r_font_postprocess_shadow_y);
+       Cvar_RegisterVariable(&r_font_postprocess_shadow_z);
+       Cvar_RegisterVariable(&r_font_hinting);
+       Cvar_RegisterVariable(&r_font_antialias);
+       Cvar_RegisterVariable(&r_textshadow);
+       Cvar_RegisterVariable(&r_textbrightness);
+       Cvar_RegisterVariable(&r_textcontrast);
+       Cvar_RegisterVariable(&r_nearest_2d);
+       Cvar_RegisterVariable(&r_nearest_conchars);
+
+       // allocate fonts storage
+       fonts_mempool = Mem_AllocPool("FONTS", 0, NULL);
+       dp_fonts.maxsize = MAX_FONTS;
+       dp_fonts.f = (dp_font_t *)Mem_Alloc(fonts_mempool, sizeof(dp_font_t) * dp_fonts.maxsize);
+       memset(dp_fonts.f, 0, sizeof(dp_font_t) * dp_fonts.maxsize);
+
+       // assign starting font names
+       strlcpy(FONT_DEFAULT->title, "default", sizeof(FONT_DEFAULT->title));
+       strlcpy(FONT_DEFAULT->texpath, "gfx/conchars", sizeof(FONT_DEFAULT->texpath));
+       strlcpy(FONT_CONSOLE->title, "console", sizeof(FONT_CONSOLE->title));
+       strlcpy(FONT_SBAR->title, "sbar", sizeof(FONT_SBAR->title));
+       strlcpy(FONT_NOTIFY->title, "notify", sizeof(FONT_NOTIFY->title));
+       strlcpy(FONT_CHAT->title, "chat", sizeof(FONT_CHAT->title));
+       strlcpy(FONT_CENTERPRINT->title, "centerprint", sizeof(FONT_CENTERPRINT->title));
+       strlcpy(FONT_INFOBAR->title, "infobar", sizeof(FONT_INFOBAR->title));
+       strlcpy(FONT_MENU->title, "menu", sizeof(FONT_MENU->title));
+       for(i = 0, j = 0; i < MAX_USERFONTS; ++i)
+               if(!FONT_USER(i)->title[0])
+                       dpsnprintf(FONT_USER(i)->title, sizeof(FONT_USER(i)->title), "user%d", j++);
+
+       Cmd_AddCommand ("loadfont",LoadFont_f, "loadfont function tganame loads a font; example: loadfont console gfx/veramono; loadfont without arguments lists the available functions");
+       R_RegisterModule("GL_Draw", gl_draw_start, gl_draw_shutdown, gl_draw_newmap, NULL, NULL);
+}
+
+void DrawQ_Start(void)
+{
+       r_refdef.draw2dstage = 1;
+       R_ResetViewRendering2D_Common(0, NULL, NULL, 0, 0, vid.width, vid.height, vid_conwidth.integer, vid_conheight.integer);
+}
+
+qboolean r_draw2d_force = false;
+
+void DrawQ_Pic(float x, float y, cachepic_t *pic, float width, float height, float red, float green, float blue, float alpha, int flags)
+{
+       dp_model_t *mod = CL_Mesh_UI();
+       msurface_t *surf;
+       int e0, e1, e2, e3;
+       if (!pic)
+               pic = Draw_CachePic("white");
+       // make sure pic is loaded - we don't use the texture here, Mod_Mesh_GetTexture looks up the skinframe by name
+       Draw_GetPicTexture(pic);
+       if (width == 0)
+               width = pic->width;
+       if (height == 0)
+               height = pic->height;
+       surf = Mod_Mesh_AddSurface(mod, Mod_Mesh_GetTexture(mod, pic->name, flags, pic->texflags, MATERIALFLAG_VERTEXCOLOR), true);
+       e0 = Mod_Mesh_IndexForVertex(mod, surf, x        , y         , 0, 0, 0, -1, 0, 0, 0, 0, red, green, blue, alpha);
+       e1 = Mod_Mesh_IndexForVertex(mod, surf, x + width, y         , 0, 0, 0, -1, 1, 0, 0, 0, red, green, blue, alpha);
+       e2 = Mod_Mesh_IndexForVertex(mod, surf, x + width, y + height, 0, 0, 0, -1, 1, 1, 0, 0, red, green, blue, alpha);
+       e3 = Mod_Mesh_IndexForVertex(mod, surf, x        , y + height, 0, 0, 0, -1, 0, 1, 0, 0, red, green, blue, alpha);
+       Mod_Mesh_AddTriangle(mod, surf, e0, e1, e2);
+       Mod_Mesh_AddTriangle(mod, surf, e0, e2, e3);
+}
 
-       DrawQ_String_Real(x,y,string,maxlen,scalex,scaley,red,green,blue,alpha,flags);
+void DrawQ_RotPic(float x, float y, cachepic_t *pic, float width, float height, float org_x, float org_y, float angle, float red, float green, float blue, float alpha, int flags)
+{
+       float af = DEG2RAD(-angle); // forward
+       float ar = DEG2RAD(-angle + 90); // right
+       float sinaf = sin(af);
+       float cosaf = cos(af);
+       float sinar = sin(ar);
+       float cosar = cos(ar);
+       dp_model_t *mod = CL_Mesh_UI();
+       msurface_t *surf;
+       int e0, e1, e2, e3;
+       if (!pic)
+               pic = Draw_CachePic("white");
+       // make sure pic is loaded - we don't use the texture here, Mod_Mesh_GetTexture looks up the skinframe by name
+       Draw_GetPicTexture(pic);
+       if (width == 0)
+               width = pic->width;
+       if (height == 0)
+               height = pic->height;
+       surf = Mod_Mesh_AddSurface(mod, Mod_Mesh_GetTexture(mod, pic->name, flags, pic->texflags, MATERIALFLAG_VERTEXCOLOR), true);
+       e0 = Mod_Mesh_IndexForVertex(mod, surf, x - cosaf *          org_x  - cosar *           org_y , y - sinaf *          org_x  - sinar *           org_y , 0, 0, 0, -1, 0, 0, 0, 0, red, green, blue, alpha);
+       e1 = Mod_Mesh_IndexForVertex(mod, surf, x + cosaf * (width - org_x) - cosar *           org_y , y + sinaf * (width - org_x) - sinar *           org_y , 0, 0, 0, -1, 1, 0, 0, 0, red, green, blue, alpha);
+       e2 = Mod_Mesh_IndexForVertex(mod, surf, x + cosaf * (width - org_x) + cosar * (height - org_y), y + sinaf * (width - org_x) + sinar * (height - org_y), 0, 0, 0, -1, 1, 1, 0, 0, red, green, blue, alpha);
+       e3 = Mod_Mesh_IndexForVertex(mod, surf, x - cosaf *          org_x  + cosar * (height - org_y), y - sinaf *          org_x  + sinar * (height - org_y), 0, 0, 0, -1, 0, 1, 0, 0, red, green, blue, alpha);
+       Mod_Mesh_AddTriangle(mod, surf, e0, e1, e2);
+       Mod_Mesh_AddTriangle(mod, surf, e0, e2, e3);
 }
 
-// color tag printing
-static vec4_t string_colors[] =
+void DrawQ_Fill(float x, float y, float width, float height, float red, float green, float blue, float alpha, int flags)
+{
+       DrawQ_Pic(x, y, Draw_CachePic("white"), width, height, red, green, blue, alpha, flags);
+}
+
+/// color tag printing
+static const vec4_t string_colors[] =
 {
        // Quake3 colors
        // LordHavoc: why on earth is cyan before magenta in Quake3?
@@ -651,334 +842,665 @@ static vec4_t string_colors[] =
 
 #define STRING_COLORS_COUNT    (sizeof(string_colors) / sizeof(vec4_t))
 
-// color is read and changed in the end
-void DrawQ_ColoredString( float x, float y, const char *text, int maxlen, float scalex, float scaley, float basered, float basegreen, float baseblue, float basealpha, int flags, int *outcolor )
+static void DrawQ_GetTextColor(float color[4], int colorindex, float r, float g, float b, float a, qboolean shadow)
 {
-       vec_t *color;
-       int len;
-       int colorindex;
-       const char *start, *current;
+       float C = r_textcontrast.value;
+       float B = r_textbrightness.value;
+       if (colorindex & 0x10000) // that bit means RGB color
+       {
+               color[0] = ((colorindex >> 12) & 0xf) / 15.0;
+               color[1] = ((colorindex >> 8) & 0xf) / 15.0;
+               color[2] = ((colorindex >> 4) & 0xf) / 15.0;
+               color[3] = (colorindex & 0xf) / 15.0;
+       }
+       else
+               Vector4Copy(string_colors[colorindex], color);
+       Vector4Set(color, color[0] * r * C + B, color[1] * g * C + B, color[2] * b * C + B, color[3] * a);
+       if (shadow)
+       {
+               float shadowalpha = (color[0]+color[1]+color[2]) * 0.8;
+               Vector4Set(color, 0, 0, 0, color[3] * bound(0, shadowalpha, 1));
+       }
+}
 
-       if (!r_refdef.draw2dstage)
+// NOTE: this function always draws exactly one character if maxwidth <= 0
+float DrawQ_TextWidth_UntilWidth_TrackColors_Scale(const char *text, size_t *maxlen, float w, float h, float sw, float sh, int *outcolor, qboolean ignorecolorcodes, const dp_font_t *fnt, float maxwidth)
+{
+       const char *text_start = text;
+       int colorindex = STRING_COLOR_DEFAULT;
+       size_t i;
+       float x = 0;
+       Uchar ch, mapch, nextch;
+       Uchar prevch = 0; // used for kerning
+       int tempcolorindex;
+       float kx;
+       int map_index = 0;
+       size_t bytes_left;
+       ft2_font_map_t *fontmap = NULL;
+       ft2_font_map_t *map = NULL;
+       //ft2_font_map_t *prevmap = NULL;
+       ft2_font_t *ft2 = fnt->ft2;
+       // float ftbase_x;
+       qboolean snap = true;
+       qboolean least_one = false;
+       float dw; // display w
+       //float dh; // display h
+       const float *width_of;
+
+       if (!h) h = w;
+       if (!h) {
+               w = h = 1;
+               snap = false;
+       }
+       // do this in the end
+       w *= fnt->settings.scale;
+       h *= fnt->settings.scale;
+
+       // find the most fitting size:
+       if (ft2 != NULL)
        {
-               Con_Printf("DrawQ_ColoredString: not in 2d rendering stage!\n");
-               return;
+               if (snap)
+                       map_index = Font_IndexForSize(ft2, h, &w, &h);
+               else
+                       map_index = Font_IndexForSize(ft2, h, NULL, NULL);
+               fontmap = Font_MapForIndex(ft2, map_index);
        }
-       if( !outcolor || *outcolor == -1 ) {
+
+       dw = w * sw;
+       //dh = h * sh;
+
+       if (*maxlen < 1)
+               *maxlen = 1<<30;
+
+       if (!outcolor || *outcolor == -1)
                colorindex = STRING_COLOR_DEFAULT;
-       } else {
+       else
                colorindex = *outcolor;
+
+       // maxwidth /= fnt->scale; // w and h are multiplied by it already
+       // ftbase_x = snap_to_pixel_x(0);
+       
+       if(maxwidth <= 0)
+       {
+               least_one = true;
+               maxwidth = -maxwidth;
        }
-       color = string_colors[colorindex];
 
-       if( maxlen < 1)
-               len = (int)strlen( text );
+       //if (snap)
+       //      x = snap_to_pixel_x(x, 0.4); // haha, it's 0 anyway
+
+       if (fontmap)
+               width_of = fontmap->width_of;
        else
-               len = min( maxlen, (int) strlen( text ) );
-
-       start = current = text;
-       while( len > 0 ) {
-               // check for color control char
-               if( *current == STRING_COLOR_TAG ) {
-                       // get next char
-                       current++;
-                       len--;
-                       if( len == 0 ) {
-                               break;
+               width_of = fnt->width_of;
+
+       i = 0;
+       while (((bytes_left = *maxlen - (text - text_start)) > 0) && *text)
+       {
+               size_t i0 = i;
+               nextch = ch = u8_getnchar(text, &text, bytes_left);
+               i = text - text_start;
+               if (!ch)
+                       break;
+               if (ch == ' ' && !fontmap)
+               {
+                       if(!least_one || i0) // never skip the first character
+                       if(x + width_of[(int) ' '] * dw > maxwidth)
+                       {
+                               i = i0;
+                               break; // oops, can't draw this
                        }
-                       // display the tag char?
-                       if( *current == STRING_COLOR_TAG ) {
-                               // only display one of the two
-                               start = current;
-                               // get the next char
-                               current++;
-                               len--;
-                       } else if( '0' <= *current && *current <= '9' ) {
-                               colorindex = 0;
-                               do {
-                                       colorindex = colorindex * 10 + (*current - '0');
-                                       // only read as long as it makes a valid index
-                                       if( colorindex >= (int)STRING_COLORS_COUNT ) {
-                                               // undo the last operation
-                                               colorindex /= 10;
-                                               break;
+                       x += width_of[(int) ' '] * dw;
+                       continue;
+               }
+               // i points to the char after ^
+               if (ch == STRING_COLOR_TAG && !ignorecolorcodes && i < *maxlen)
+               {
+                       ch = *text; // colors are ascii, so no u8_ needed
+                       if (ch <= '9' && ch >= '0') // ^[0-9] found
+                       {
+                               colorindex = ch - '0';
+                               ++text;
+                               ++i;
+                               continue;
+                       }
+                       // i points to the char after ^...
+                       // i+3 points to 3 in ^x123
+                       // i+3 == *maxlen would mean that char is missing
+                       else if (ch == STRING_COLOR_RGB_TAG_CHAR && i + 3 < *maxlen ) // ^x found
+                       {
+                               // building colorindex...
+                               ch = tolower(text[1]);
+                               tempcolorindex = 0x10000; // binary: 1,0000,0000,0000,0000
+                               if (ch <= '9' && ch >= '0') tempcolorindex |= (ch - '0') << 12;
+                               else if (ch >= 'a' && ch <= 'f') tempcolorindex |= (ch - 87) << 12;
+                               else tempcolorindex = 0;
+                               if (tempcolorindex)
+                               {
+                                       ch = tolower(text[2]);
+                                       if (ch <= '9' && ch >= '0') tempcolorindex |= (ch - '0') << 8;
+                                       else if (ch >= 'a' && ch <= 'f') tempcolorindex |= (ch - 87) << 8;
+                                       else tempcolorindex = 0;
+                                       if (tempcolorindex)
+                                       {
+                                               ch = tolower(text[3]);
+                                               if (ch <= '9' && ch >= '0') tempcolorindex |= (ch - '0') << 4;
+                                               else if (ch >= 'a' && ch <= 'f') tempcolorindex |= (ch - 87) << 4;
+                                               else tempcolorindex = 0;
+                                               if (tempcolorindex)
+                                               {
+                                                       colorindex = tempcolorindex | 0xf;
+                                                       // ...done! now colorindex has rgba codes (1,rrrr,gggg,bbbb,aaaa)
+                                                       i+=4;
+                                                       text += 4;
+                                                       continue;
+                                               }
                                        }
-                                       current++;
-                                       len--;
-                               } while( len > 0 && '0' <= *current && *current <= '9' );
-                               // set the color
-                               color = string_colors[colorindex];
-                               // we jump over the color tag
-                               start = current;
+                               }
                        }
+                       else if (ch == STRING_COLOR_TAG) // ^^ found, ignore the first ^ and go to print the second
+                       {
+                               i++;
+                               text++;
+                       }
+                       i--;
                }
-               // go on and read normal text in until the next control char
-               while( len > 0 && *current != STRING_COLOR_TAG ) {
-                       current++;
-                       len--;
-               }
-               // display the text
-               if( start != current ) {
-                       // draw the string
-                       DrawQ_String( x, y, start, current - start, scalex, scaley, basered * color[0], basegreen * color[1], baseblue * color[2], basealpha * color[3], flags );
-                       // update x to be at the new start position
-                       x += (current - start) * scalex;
-                       // set start accordingly
-                       start = current;
+               ch = nextch;
+
+               if (!fontmap || (ch <= 0xFF && fontmap->glyphs[ch].image) || (ch >= 0xE000 && ch <= 0xE0FF))
+               {
+                       if (ch > 0xE000)
+                               ch -= 0xE000;
+                       if (ch > 0xFF)
+                               continue;
+                       if (fontmap)
+                               map = ft2_oldstyle_map;
+                       prevch = 0;
+                       if(!least_one || i0) // never skip the first character
+                       if(x + width_of[ch] * dw > maxwidth)
+                       {
+                               i = i0;
+                               break; // oops, can't draw this
+                       }
+                       x += width_of[ch] * dw;
+               } else {
+                       if (!map || map == ft2_oldstyle_map || ch < map->start || ch >= map->start + FONT_CHARS_PER_MAP)
+                       {
+                               map = FontMap_FindForChar(fontmap, ch);
+                               if (!map)
+                               {
+                                       if (!Font_LoadMapForIndex(ft2, map_index, ch, &map))
+                                               break;
+                                       if (!map)
+                                               break;
+                               }
+                       }
+                       mapch = ch - map->start;
+                       if (prevch && Font_GetKerningForMap(ft2, map_index, w, h, prevch, ch, &kx, NULL))
+                               x += kx * dw;
+                       x += map->glyphs[mapch].advance_x * dw;
+                       //prevmap = map;
+                       prevch = ch;
                }
        }
 
-       // return the last colorindex
-       if( outcolor ) {
+       *maxlen = i;
+
+       if (outcolor)
                *outcolor = colorindex;
-       }
+
+       return x;
 }
 
-void DrawQ_SuperPic(float x, float y, cachepic_t *pic, float width, float height, float s1, float t1, float r1, float g1, float b1, float a1, float s2, float t2, float r2, float g2, float b2, float a2, float s3, float t3, float r3, float g3, float b3, float a3, float s4, float t4, float r4, float g4, float b4, float a4, int flags)
+float DrawQ_Color[4];
+float DrawQ_String_Scale(float startx, float starty, const char *text, size_t maxlen, float w, float h, float sw, float sh, float basered, float basegreen, float baseblue, float basealpha, int flags, int *outcolor, qboolean ignorecolorcodes, const dp_font_t *fnt)
 {
-       rmeshstate_t m;
-       float floats[36];
-
-       if (!r_refdef.draw2dstage)
-       {
-               Con_Printf("DrawQ_SuperPic: not in 2d rendering stage!\n");
-               return;
+       int shadow, colorindex = STRING_COLOR_DEFAULT;
+       size_t i;
+       float x = startx, y, s, t, u, v, thisw;
+       Uchar ch, mapch, nextch;
+       Uchar prevch = 0; // used for kerning
+       int tempcolorindex;
+       int map_index = 0;
+       //ft2_font_map_t *prevmap = NULL; // the previous map
+       ft2_font_map_t *map = NULL;     // the currently used map
+       ft2_font_map_t *fontmap = NULL; // the font map for the size
+       float ftbase_y;
+       const char *text_start = text;
+       float kx, ky;
+       ft2_font_t *ft2 = fnt->ft2;
+       qboolean snap = true;
+       float pix_x, pix_y;
+       size_t bytes_left;
+       float dw, dh;
+       const float *width_of;
+       dp_model_t *mod = CL_Mesh_UI();
+       msurface_t *surf = NULL;
+       int e0, e1, e2, e3;
+       int tw, th;
+       tw = Draw_GetPicWidth(fnt->pic);
+       th = Draw_GetPicHeight(fnt->pic);
+
+       if (!h) h = w;
+       if (!h) {
+               h = w = 1;
+               snap = false;
        }
 
-       if (!r_render.integer)
-               return;
-
-       if(flags == DRAWFLAG_ADDITIVE)
-               GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
-       else if(flags == DRAWFLAG_MODULATE)
-               GL_BlendFunc(GL_DST_COLOR, GL_ZERO);
-       else if(flags == DRAWFLAG_2XMODULATE)
-               GL_BlendFunc(GL_DST_COLOR,GL_SRC_COLOR);
-       else
-               GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+       starty -= (fnt->settings.scale - 1) * h * 0.5 - fnt->settings.voffset*h; // center & offset
+       w *= fnt->settings.scale;
+       h *= fnt->settings.scale;
 
-       memset(&m, 0, sizeof(m));
-       m.pointer_vertex = floats;
-       m.pointer_color = floats + 20;
-       if (pic)
+       if (ft2 != NULL)
        {
-               if (width == 0)
-                       width = pic->width;
-               if (height == 0)
-                       height = pic->height;
-               m.tex[0] = R_GetTexture(pic->tex);
-               m.pointer_texcoord[0] = floats + 12;
-               floats[12] = s1;floats[13] = t1;
-               floats[14] = s2;floats[15] = t2;
-               floats[16] = s4;floats[17] = t4;
-               floats[18] = s3;floats[19] = t3;
+               if (snap)
+                       map_index = Font_IndexForSize(ft2, h, &w, &h);
+               else
+                       map_index = Font_IndexForSize(ft2, h, NULL, NULL);
+               fontmap = Font_MapForIndex(ft2, map_index);
        }
-       R_Mesh_State(&m);
 
-       floats[2] = floats[5] = floats[8] = floats[11] = 0;
-       floats[0] = floats[9] = x;
-       floats[1] = floats[4] = y;
-       floats[3] = floats[6] = x + width;
-       floats[7] = floats[10] = y + height;
-       floats[20] = r1;floats[21] = g1;floats[22] = b1;floats[23] = a1;
-       floats[24] = r2;floats[25] = g2;floats[26] = b2;floats[27] = a2;
-       floats[28] = r4;floats[29] = g4;floats[30] = b4;floats[31] = a4;
-       floats[32] = r3;floats[33] = g3;floats[34] = b3;floats[35] = a3;
+       dw = w * sw;
+       dh = h * sh;
 
-       R_Mesh_Draw(0, 4, 2, polygonelements);
-}
+       // draw the font at its baseline when using freetype
+       //ftbase_x = 0;
+       ftbase_y = dh * (4.5/6.0);
 
-void DrawQ_Mesh (drawqueuemesh_t *mesh, int flags)
-{
-       rmeshstate_t m;
+       if (maxlen < 1)
+               maxlen = 1<<30;
+
+       if(!r_draw2d.integer && !r_draw2d_force)
+               return startx + DrawQ_TextWidth_UntilWidth_TrackColors_Scale(text, &maxlen, w, h, sw, sh, NULL, ignorecolorcodes, fnt, 1000000000);
 
-       if (!r_refdef.draw2dstage)
+       //ftbase_x = snap_to_pixel_x(ftbase_x);
+       if(snap)
        {
-               Con_Printf("DrawQ_Mesh: not in 2d rendering stage!\n");
-               return;
+               startx = snap_to_pixel_x(startx, 0.4);
+               starty = snap_to_pixel_y(starty, 0.4);
+               ftbase_y = snap_to_pixel_y(ftbase_y, 0.3);
        }
 
-       if (!r_render.integer)
-               return;
+       pix_x = vid.width / vid_conwidth.value;
+       pix_y = vid.height / vid_conheight.value;
 
-       if(flags == DRAWFLAG_ADDITIVE)
-               GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
-       else if(flags == DRAWFLAG_MODULATE)
-               GL_BlendFunc(GL_DST_COLOR, GL_ZERO);
-       else if(flags == DRAWFLAG_2XMODULATE)
-               GL_BlendFunc(GL_DST_COLOR,GL_SRC_COLOR);
+       if (fontmap)
+               width_of = fontmap->width_of;
        else
-               GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+               width_of = fnt->width_of;
+
+       for (shadow = r_textshadow.value != 0 && basealpha > 0;shadow >= 0;shadow--)
+       {
+               prevch = 0;
+               text = text_start;
 
-       memset(&m, 0, sizeof(m));
-       m.pointer_vertex = mesh->data_vertex3f;
-       m.pointer_color = mesh->data_color4f;
-       m.tex[0] = R_GetTexture(mesh->texture);
-       if (m.tex[0])
-               m.pointer_texcoord[0] = mesh->data_texcoord2f;
-       R_Mesh_State(&m);
+               if (!outcolor || *outcolor == -1)
+                       colorindex = STRING_COLOR_DEFAULT;
+               else
+                       colorindex = *outcolor;
+
+               DrawQ_GetTextColor(DrawQ_Color, colorindex, basered, basegreen, baseblue, basealpha, shadow != 0);
 
-       GL_LockArrays(0, mesh->num_vertices);
-       R_Mesh_Draw(0, mesh->num_vertices, mesh->num_triangles, mesh->data_element3i);
-       GL_LockArrays(0, 0);
+               x = startx;
+               y = starty;
+               /*
+               if (shadow)
+               {
+                       x += r_textshadow.value * vid.width / vid_conwidth.value;
+                       y += r_textshadow.value * vid.height / vid_conheight.value;
+               }
+               */
+               while (((bytes_left = maxlen - (text - text_start)) > 0) && *text)
+               {
+                       nextch = ch = u8_getnchar(text, &text, bytes_left);
+                       i = text - text_start;
+                       if (!ch)
+                               break;
+                       if (ch == ' ' && !fontmap)
+                       {
+                               x += width_of[(int) ' '] * dw;
+                               continue;
+                       }
+                       if (ch == STRING_COLOR_TAG && !ignorecolorcodes && i < maxlen)
+                       {
+                               ch = *text; // colors are ascii, so no u8_ needed
+                               if (ch <= '9' && ch >= '0') // ^[0-9] found
+                               {
+                                       colorindex = ch - '0';
+                                       DrawQ_GetTextColor(DrawQ_Color, colorindex, basered, basegreen, baseblue, basealpha, shadow != 0);
+                                       ++text;
+                                       ++i;
+                                       continue;
+                               }
+                               else if (ch == STRING_COLOR_RGB_TAG_CHAR && i+3 < maxlen ) // ^x found
+                               {
+                                       // building colorindex...
+                                       ch = tolower(text[1]);
+                                       tempcolorindex = 0x10000; // binary: 1,0000,0000,0000,0000
+                                       if (ch <= '9' && ch >= '0') tempcolorindex |= (ch - '0') << 12;
+                                       else if (ch >= 'a' && ch <= 'f') tempcolorindex |= (ch - 87) << 12;
+                                       else tempcolorindex = 0;
+                                       if (tempcolorindex)
+                                       {
+                                               ch = tolower(text[2]);
+                                               if (ch <= '9' && ch >= '0') tempcolorindex |= (ch - '0') << 8;
+                                               else if (ch >= 'a' && ch <= 'f') tempcolorindex |= (ch - 87) << 8;
+                                               else tempcolorindex = 0;
+                                               if (tempcolorindex)
+                                               {
+                                                       ch = tolower(text[3]);
+                                                       if (ch <= '9' && ch >= '0') tempcolorindex |= (ch - '0') << 4;
+                                                       else if (ch >= 'a' && ch <= 'f') tempcolorindex |= (ch - 87) << 4;
+                                                       else tempcolorindex = 0;
+                                                       if (tempcolorindex)
+                                                       {
+                                                               colorindex = tempcolorindex | 0xf;
+                                                               // ...done! now colorindex has rgba codes (1,rrrr,gggg,bbbb,aaaa)
+                                                               //Con_Printf("^1colorindex:^7 %x\n", colorindex);
+                                                               DrawQ_GetTextColor(DrawQ_Color, colorindex, basered, basegreen, baseblue, basealpha, shadow != 0);
+                                                               i+=4;
+                                                               text+=4;
+                                                               continue;
+                                                       }
+                                               }
+                                       }
+                               }
+                               else if (ch == STRING_COLOR_TAG)
+                               {
+                                       i++;
+                                       text++;
+                               }
+                               i--;
+                       }
+                       // get the backup
+                       ch = nextch;
+                       // using a value of -1 for the oldstyle map because NULL means uninitialized...
+                       // this way we don't need to rebind fnt->tex for every old-style character
+                       // E000..E0FF: emulate old-font characters (to still have smileys and such available)
+                       if (shadow)
+                       {
+                               x += 1.0/pix_x * r_textshadow.value;
+                               y += 1.0/pix_y * r_textshadow.value;
+                       }
+                       if (!fontmap || (ch <= 0xFF && fontmap->glyphs[ch].image) || (ch >= 0xE000 && ch <= 0xE0FF))
+                       {
+                               if (ch >= 0xE000)
+                                       ch -= 0xE000;
+                               if (ch > 0xFF)
+                                       goto out;
+                               if (fontmap)
+                                       map = ft2_oldstyle_map;
+                               prevch = 0;
+                               //num = (unsigned char) text[i];
+                               //thisw = fnt->width_of[num];
+                               thisw = fnt->width_of[ch];
+                               // FIXME make these smaller to just include the occupied part of the character for slightly faster rendering
+                               if (r_nearest_conchars.integer)
+                               {
+                                       s = (ch & 15)*0.0625f;
+                                       t = (ch >> 4)*0.0625f;
+                                       u = 0.0625f * thisw;
+                                       v = 0.0625f;
+                               }
+                               else
+                               {
+                                       s = (ch & 15)*0.0625f + (0.5f / tw);
+                                       t = (ch >> 4)*0.0625f + (0.5f / th);
+                                       u = 0.0625f * thisw - (1.0f / tw);
+                                       v = 0.0625f - (1.0f / th);
+                               }
+                               surf = Mod_Mesh_AddSurface(mod, Mod_Mesh_GetTexture(mod, fnt->pic->name, flags, TEXF_ALPHA | TEXF_CLAMP, MATERIALFLAG_VERTEXCOLOR), true);
+                               e0 = Mod_Mesh_IndexForVertex(mod, surf, x         , y   , 10, 0, 0, -1, s  , t  , 0, 0, DrawQ_Color[0], DrawQ_Color[1], DrawQ_Color[2], DrawQ_Color[3]);
+                               e1 = Mod_Mesh_IndexForVertex(mod, surf, x+dw*thisw, y   , 10, 0, 0, -1, s+u, t  , 0, 0, DrawQ_Color[0], DrawQ_Color[1], DrawQ_Color[2], DrawQ_Color[3]);
+                               e2 = Mod_Mesh_IndexForVertex(mod, surf, x+dw*thisw, y+dh, 10, 0, 0, -1, s+u, t+v, 0, 0, DrawQ_Color[0], DrawQ_Color[1], DrawQ_Color[2], DrawQ_Color[3]);
+                               e3 = Mod_Mesh_IndexForVertex(mod, surf, x         , y+dh, 10, 0, 0, -1, s  , t+v, 0, 0, DrawQ_Color[0], DrawQ_Color[1], DrawQ_Color[2], DrawQ_Color[3]);
+                               Mod_Mesh_AddTriangle(mod, surf, e0, e1, e2);
+                               Mod_Mesh_AddTriangle(mod, surf, e0, e2, e3);
+                               x += width_of[ch] * dw;
+                       } else {
+                               if (!map || map == ft2_oldstyle_map || ch < map->start || ch >= map->start + FONT_CHARS_PER_MAP)
+                               {
+                                       // find the new map
+                                       map = FontMap_FindForChar(fontmap, ch);
+                                       if (!map)
+                                       {
+                                               if (!Font_LoadMapForIndex(ft2, map_index, ch, &map))
+                                               {
+                                                       shadow = -1;
+                                                       break;
+                                               }
+                                               if (!map)
+                                               {
+                                                       // this shouldn't happen
+                                                       shadow = -1;
+                                                       break;
+                                               }
+                                       }
+                               }
+
+                               mapch = ch - map->start;
+                               thisw = map->glyphs[mapch].advance_x;
+
+                               //x += ftbase_x;
+                               y += ftbase_y;
+                               if (prevch && Font_GetKerningForMap(ft2, map_index, w, h, prevch, ch, &kx, &ky))
+                               {
+                                       x += kx * dw;
+                                       y += ky * dh;
+                               }
+                               else
+                                       kx = ky = 0;
+                               surf = Mod_Mesh_AddSurface(mod, Mod_Mesh_GetTexture(mod, map->pic->name, flags, TEXF_ALPHA | TEXF_CLAMP, MATERIALFLAG_VERTEXCOLOR), true);
+                               e0 = Mod_Mesh_IndexForVertex(mod, surf, x + dw * map->glyphs[mapch].vxmin, y + dh * map->glyphs[mapch].vymin, 10, 0, 0, -1, map->glyphs[mapch].txmin, map->glyphs[mapch].tymin, 0, 0, DrawQ_Color[0], DrawQ_Color[1], DrawQ_Color[2], DrawQ_Color[3]);
+                               e1 = Mod_Mesh_IndexForVertex(mod, surf, x + dw * map->glyphs[mapch].vxmax, y + dh * map->glyphs[mapch].vymin, 10, 0, 0, -1, map->glyphs[mapch].txmax, map->glyphs[mapch].tymin, 0, 0, DrawQ_Color[0], DrawQ_Color[1], DrawQ_Color[2], DrawQ_Color[3]);
+                               e2 = Mod_Mesh_IndexForVertex(mod, surf, x + dw * map->glyphs[mapch].vxmax, y + dh * map->glyphs[mapch].vymax, 10, 0, 0, -1, map->glyphs[mapch].txmax, map->glyphs[mapch].tymax, 0, 0, DrawQ_Color[0], DrawQ_Color[1], DrawQ_Color[2], DrawQ_Color[3]);
+                               e3 = Mod_Mesh_IndexForVertex(mod, surf, x + dw * map->glyphs[mapch].vxmin, y + dh * map->glyphs[mapch].vymax, 10, 0, 0, -1, map->glyphs[mapch].txmin, map->glyphs[mapch].tymax, 0, 0, DrawQ_Color[0], DrawQ_Color[1], DrawQ_Color[2], DrawQ_Color[3]);
+                               Mod_Mesh_AddTriangle(mod, surf, e0, e1, e2);
+                               Mod_Mesh_AddTriangle(mod, surf, e0, e2, e3);
+                               //x -= ftbase_x;
+                               y -= ftbase_y;
+
+                               x += thisw * dw;
+
+                               //prevmap = map;
+                               prevch = ch;
+                       }
+out:
+                       if (shadow)
+                       {
+                               x -= 1.0/pix_x * r_textshadow.value;
+                               y -= 1.0/pix_y * r_textshadow.value;
+                       }
+               }
+       }
+
+       if (outcolor)
+               *outcolor = colorindex;
+       
+       // note: this relies on the proper text (not shadow) being drawn last
+       return x;
 }
 
-void DrawQ_LineLoop (drawqueuemesh_t *mesh, int flags)
+float DrawQ_String(float startx, float starty, const char *text, size_t maxlen, float w, float h, float basered, float basegreen, float baseblue, float basealpha, int flags, int *outcolor, qboolean ignorecolorcodes, const dp_font_t *fnt)
 {
-       int num;
+       return DrawQ_String_Scale(startx, starty, text, maxlen, w, h, 1, 1, basered, basegreen, baseblue, basealpha, flags, outcolor, ignorecolorcodes, fnt);
+}
 
-       if (!r_refdef.draw2dstage)
-       {
-               Con_Printf("DrawQ_LineLoop: not in 2d rendering stage!\n");
-               return;
-       }
+float DrawQ_TextWidth_UntilWidth_TrackColors(const char *text, size_t *maxlen, float w, float h, int *outcolor, qboolean ignorecolorcodes, const dp_font_t *fnt, float maxwidth)
+{
+       return DrawQ_TextWidth_UntilWidth_TrackColors_Scale(text, maxlen, w, h, 1, 1, outcolor, ignorecolorcodes, fnt, maxwidth);
+}
 
-       if (!r_render.integer)
-               return;
+float DrawQ_TextWidth(const char *text, size_t maxlen, float w, float h, qboolean ignorecolorcodes, const dp_font_t *fnt)
+{
+       return DrawQ_TextWidth_UntilWidth(text, &maxlen, w, h, ignorecolorcodes, fnt, 1000000000);
+}
 
-       if(flags == DRAWFLAG_ADDITIVE)
-               GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
-       else if(flags == DRAWFLAG_MODULATE)
-               GL_BlendFunc(GL_DST_COLOR, GL_ZERO);
-       else if(flags == DRAWFLAG_2XMODULATE)
-               GL_BlendFunc(GL_DST_COLOR,GL_SRC_COLOR);
-       else
-               GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+float DrawQ_TextWidth_UntilWidth(const char *text, size_t *maxlen, float w, float h, qboolean ignorecolorcodes, const dp_font_t *fnt, float maxWidth)
+{
+       return DrawQ_TextWidth_UntilWidth_TrackColors(text, maxlen, w, h, NULL, ignorecolorcodes, fnt, maxWidth);
+}
 
-       GL_Color(1,1,1,1);
-       qglBegin(GL_LINE_LOOP);
-       for (num = 0;num < mesh->num_vertices;num++)
+#if 0
+// not used
+// no ^xrgb management
+static int DrawQ_BuildColoredText(char *output2c, size_t maxoutchars, const char *text, int maxreadchars, qboolean ignorecolorcodes, int *outcolor)
+{
+       int color, numchars = 0;
+       char *outputend2c = output2c + maxoutchars - 2;
+       if (!outcolor || *outcolor == -1)
+               color = STRING_COLOR_DEFAULT;
+       else
+               color = *outcolor;
+       if (!maxreadchars)
+               maxreadchars = 1<<30;
+       textend = text + maxreadchars;
+       while (text != textend && *text)
        {
-               if (mesh->data_color4f)
-                       GL_Color(mesh->data_color4f[num*4+0], mesh->data_color4f[num*4+1], mesh->data_color4f[num*4+2], mesh->data_color4f[num*4+3]);
-               qglVertex2f(mesh->data_vertex3f[num*3+0], mesh->data_vertex3f[num*3+1]);
+               if (*text == STRING_COLOR_TAG && !ignorecolorcodes && text + 1 != textend)
+               {
+                       if (text[1] == STRING_COLOR_TAG)
+                               text++;
+                       else if (text[1] >= '0' && text[1] <= '9')
+                       {
+                               color = text[1] - '0';
+                               text += 2;
+                               continue;
+                       }
+               }
+               if (output2c >= outputend2c)
+                       break;
+               *output2c++ = *text++;
+               *output2c++ = color;
+               numchars++;
        }
-       qglEnd();
+       output2c[0] = output2c[1] = 0;
+       if (outcolor)
+               *outcolor = color;
+       return numchars;
 }
+#endif
 
-//LordHavoc: FIXME: this is nasty!
-void DrawQ_LineWidth (float width)
+void DrawQ_SuperPic(float x, float y, cachepic_t *pic, float width, float height, float s1, float t1, float r1, float g1, float b1, float a1, float s2, float t2, float r2, float g2, float b2, float a2, float s3, float t3, float r3, float g3, float b3, float a3, float s4, float t4, float r4, float g4, float b4, float a4, int flags)
 {
-       if (!r_refdef.draw2dstage)
-       {
-               Con_Printf("DrawQ_LineWidth: not in 2d rendering stage!\n");
-               return;
-       }
-       qglLineWidth(width);
+       dp_model_t *mod = CL_Mesh_UI();
+       msurface_t *surf;
+       int e0, e1, e2, e3;
+       if (!pic)
+               pic = Draw_CachePic("white");
+       // make sure pic is loaded - we don't use the texture here, Mod_Mesh_GetTexture looks up the skinframe by name
+       Draw_GetPicTexture(pic);
+       if (width == 0)
+               width = pic->width;
+       if (height == 0)
+               height = pic->height;
+       surf = Mod_Mesh_AddSurface(mod, Mod_Mesh_GetTexture(mod, pic->name, flags, pic->texflags, MATERIALFLAG_VERTEXCOLOR), true);
+       e0 = Mod_Mesh_IndexForVertex(mod, surf, x        , y         , 0, 0, 0, -1, s1, t1, 0, 0, r1, g1, b1, a1);
+       e1 = Mod_Mesh_IndexForVertex(mod, surf, x + width, y         , 0, 0, 0, -1, s2, t2, 0, 0, r2, g2, b2, a2);
+       e2 = Mod_Mesh_IndexForVertex(mod, surf, x + width, y + height, 0, 0, 0, -1, s4, t4, 0, 0, r4, g4, b4, a4);
+       e3 = Mod_Mesh_IndexForVertex(mod, surf, x        , y + height, 0, 0, 0, -1, s3, t3, 0, 0, r3, g3, b3, a3);
+       Mod_Mesh_AddTriangle(mod, surf, e0, e1, e2);
+       Mod_Mesh_AddTriangle(mod, surf, e0, e2, e3);
 }
 
-//[515]: this is old, delete
 void DrawQ_Line (float width, float x1, float y1, float x2, float y2, float r, float g, float b, float alpha, int flags)
 {
-       if (!r_refdef.draw2dstage)
+       dp_model_t *mod = CL_Mesh_UI();
+       msurface_t *surf;
+       int e0, e1, e2, e3;
+       float offsetx, offsety;
+       // width is measured in real pixels
+       if (fabs(x2 - x1) > fabs(y2 - y1))
        {
-               Con_Printf("DrawQ_Line: not in 2d rendering stage!\n");
-               return;
+               offsetx = 0;
+               offsety = 0.5f * width * vid_conheight.value / vid.height;
        }
-
-       if (!r_render.integer)
-               return;
-
-       if(width > 0)
-               DrawQ_LineWidth(width);
-
-       if(flags == DRAWFLAG_ADDITIVE)
-               GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
-       else if(flags == DRAWFLAG_MODULATE)
-               GL_BlendFunc(GL_DST_COLOR, GL_ZERO);
-       else if(flags == DRAWFLAG_2XMODULATE)
-               GL_BlendFunc(GL_DST_COLOR,GL_SRC_COLOR);
        else
-               GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
-       GL_Color(r,g,b,alpha);
-       qglBegin(GL_LINES);
-       qglVertex2f(x1, y1);
-       qglVertex2f(x2, y2);
-       qglEnd();
+       {
+               offsetx = 0.5f * width * vid_conwidth.value / vid.width;
+               offsety = 0;
+       }
+       surf = Mod_Mesh_AddSurface(mod, Mod_Mesh_GetTexture(mod, "white", 0, 0, MATERIALFLAG_VERTEXCOLOR), true);
+       e0 = Mod_Mesh_IndexForVertex(mod, surf, x1 - offsetx, y1 - offsety, 10, 0, 0, -1, 0, 0, 0, 0, r, g, b, alpha);
+       e1 = Mod_Mesh_IndexForVertex(mod, surf, x2 - offsetx, y2 - offsety, 10, 0, 0, -1, 0, 0, 0, 0, r, g, b, alpha);
+       e2 = Mod_Mesh_IndexForVertex(mod, surf, x2 + offsetx, y2 + offsety, 10, 0, 0, -1, 0, 0, 0, 0, r, g, b, alpha);
+       e3 = Mod_Mesh_IndexForVertex(mod, surf, x1 + offsetx, y1 + offsety, 10, 0, 0, -1, 0, 0, 0, 0, r, g, b, alpha);
+       Mod_Mesh_AddTriangle(mod, surf, e0, e1, e2);
+       Mod_Mesh_AddTriangle(mod, surf, e0, e2, e3);
 }
 
 void DrawQ_SetClipArea(float x, float y, float width, float height)
 {
-       if (!r_refdef.draw2dstage)
-       {
-               Con_Printf("DrawQ_SetClipArea: not in 2d rendering stage!\n");
-               return;
-       }
+       int ix, iy, iw, ih;
+       DrawQ_FlushUI();
 
        // We have to convert the con coords into real coords
-       // OGL uses top to bottom
-       GL_Scissor(x * ((float)vid.width / vid_conwidth.integer), y * ((float) vid.height / vid_conheight.integer), width * ((float)vid.width / vid_conwidth.integer), height * ((float)vid.height / vid_conheight.integer));
+       // OGL uses bottom to top (origin is in bottom left)
+       ix = (int)(0.5 + x * ((float)r_refdef.view.width / vid_conwidth.integer)) + r_refdef.view.x;
+       iy = (int)(0.5 + y * ((float)r_refdef.view.height / vid_conheight.integer)) + r_refdef.view.y;
+       iw = (int)(0.5 + width * ((float)r_refdef.view.width / vid_conwidth.integer));
+       ih = (int)(0.5 + height * ((float)r_refdef.view.height / vid_conheight.integer));
+       switch(vid.renderpath)
+       {
+       case RENDERPATH_GL20:
+       case RENDERPATH_GLES2:
+               GL_Scissor(ix, vid.height - iy - ih, iw, ih);
+               break;
+       }
 
        GL_ScissorTest(true);
 }
 
 void DrawQ_ResetClipArea(void)
 {
-       if (!r_refdef.draw2dstage)
-       {
-               Con_Printf("DrawQ_ResetClipArea: not in 2d rendering stage!\n");
-               return;
-       }
+       DrawQ_FlushUI();
        GL_ScissorTest(false);
 }
 
 void DrawQ_Finish(void)
 {
-       if (!r_refdef.draw2dstage)
-       {
-               Con_Printf("R_DrawQueue: not in 2d rendering stage!\n");
-               return;
-       }
+       DrawQ_FlushUI();
+       r_refdef.draw2dstage = 0;
+}
 
-       r_refdef.draw2dstage = false;
+void DrawQ_RecalcView(void)
+{
+       DrawQ_FlushUI();
+       if(r_refdef.draw2dstage)
+               r_refdef.draw2dstage = -1; // next draw call will set viewport etc. again
 }
 
-static float blendvertex3f[9] = {-5000, -5000, 10, 10000, -5000, 10, -5000, 10000, 10};
-void R_DrawGamma(void)
+void DrawQ_FlushUI(void)
 {
-       rmeshstate_t m;
-       float c[4];
-       if (!vid_usinghwgamma)
+       int i;
+       dp_model_t *mod = CL_Mesh_UI();
+       if (mod->num_surfaces == 0)
+               return;
+
+       if (!r_draw2d.integer && !r_draw2d_force)
        {
-               // all the blends ignore depth
-               memset(&m, 0, sizeof(m));
-               m.pointer_vertex = blendvertex3f;
-               R_Mesh_State(&m);
-               GL_DepthMask(true);
-               GL_DepthTest(false);
-               if (v_color_enable.integer)
-               {
-                       c[0] = v_color_white_r.value;
-                       c[1] = v_color_white_g.value;
-                       c[2] = v_color_white_b.value;
-               }
-               else
-                       c[0] = c[1] = c[2] = v_contrast.value;
-               if (c[0] >= 1.01f || c[1] >= 1.01f || c[2] >= 1.01f)
-               {
-                       GL_BlendFunc(GL_DST_COLOR, GL_ONE);
-                       while (c[0] >= 1.01f || c[1] >= 1.01f || c[2] >= 1.01f)
-                       {
-                               GL_Color(bound(0, c[0] - 1, 1), bound(0, c[1] - 1, 1), bound(0, c[2] - 1, 1), 1);
-                               R_Mesh_Draw(0, 3, 1, polygonelements);
-                               VectorScale(c, 0.5, c);
-                       }
-               }
-               if (v_color_enable.integer)
-               {
-                       c[0] = v_color_black_r.value;
-                       c[1] = v_color_black_g.value;
-                       c[2] = v_color_black_b.value;
-               }
+               Mod_Mesh_Reset(mod);
+               return;
+       }
+
+       // TODO: render the mesh using R_Q1BSP_Draw or similar, for full material support.
+       GL_DepthMask(false);
+       R_Mesh_PrepareVertices_Generic_Arrays(mod->surfmesh.num_vertices, mod->surfmesh.data_vertex3f, mod->surfmesh.data_lightmapcolor4f, mod->surfmesh.data_texcoordtexture2f);
+       for (i = 0; i < mod->num_surfaces; i++)
+       {
+               msurface_t *surf = mod->data_surfaces + i;
+               texture_t *tex = surf->texture;
+               if (tex->currentmaterialflags & MATERIALFLAG_CUSTOMBLEND)
+                       GL_BlendFunc(tex->customblendfunc[0], tex->customblendfunc[1]);
+               else if (tex->currentmaterialflags & MATERIALFLAG_ADD)
+                       GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
+               else if (tex->currentmaterialflags & MATERIALFLAG_ALPHA)
+                       GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
                else
-                       c[0] = c[1] = c[2] = v_brightness.value;
-               if (c[0] >= 0.01f || c[1] >= 0.01f || c[2] >= 0.01f)
-               {
-                       GL_BlendFunc(GL_ONE, GL_ONE);
-                       GL_Color(c[0], c[1], c[2], 1);
-                       R_Mesh_Draw(0, 3, 1, polygonelements);
-               }
+                       GL_BlendFunc(GL_ONE, GL_ZERO);
+               R_SetupShader_Generic(tex->currentskinframe->base, (tex->currentmaterialflags & MATERIALFLAG_CUSTOMBLEND) ? false : true, true, false);
+               R_Mesh_Draw(surf->num_firstvertex, surf->num_vertices, surf->num_firsttriangle, surf->num_triangles, mod->surfmesh.data_element3i, NULL, 0, mod->surfmesh.data_element3s, NULL, 0);
        }
-}
 
+       Mod_Mesh_Reset(mod);
+}