X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=gl_draw.c;h=6b5c76222ba1ec9d8d902d0569c82804d64ff059;hb=f63d47ebec8bb8dae5a902eaf5111aa6b89811eb;hp=66b2b89ecea1454bd23908fc060ab39f644e7309;hpb=9b4696df9959f0c951ce4ab7a26323b41d0cc4a2;p=xonotic%2Fdarkplaces.git

diff --git a/gl_draw.c b/gl_draw.c
index 66b2b89e..6b5c7622 100644
--- a/gl_draw.c
+++ b/gl_draw.c
@@ -28,12 +28,21 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "ft2.h"
 #include "ft2_fontdefs.h"
 
-dp_font_t dp_fonts[MAX_FONTS] = {{0}};
+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" */};
+
 extern cvar_t v_glslgamma;
 
 //=============================================================================
@@ -58,7 +67,7 @@ static rtexture_t *draw_generateconchars(void)
 	double random;
 	rtexture_t *tex;
 
-	data = LoadTGA_BGRA (concharimage, FONT_FILESIZE);
+	data = LoadTGA_BGRA (concharimage, FONT_FILESIZE, NULL);
 // Gold numbers
 	for (i = 0;i < 8192;i++)
 	{
@@ -100,7 +109,7 @@ static rtexture_t *draw_generateconchars(void)
 	Image_WriteTGABGRA ("gfx/generated_conchars.tga", 256, 256, data);
 #endif
 
-	tex = R_LoadTexture2D(drawtexturepool, "conchars", 256, 256, data, TEXTYPE_BGRA, TEXF_ALPHA, NULL);
+	tex = R_LoadTexture2D(drawtexturepool, "conchars", 256, 256, data, TEXTYPE_BGRA, TEXF_ALPHA, -1, NULL);
 	Mem_Free(data);
 	return tex;
 }
@@ -112,7 +121,7 @@ static rtexture_t *draw_generateditherpattern(void)
 	for (y = 0;y < 8;y++)
 		for (x = 0;x < 8;x++)
 			pixels[y][x] = ((x^y) & 4) ? 254 : 0;
-	return R_LoadTexture2D(drawtexturepool, "ditherpattern", 8, 8, pixels[0], TEXTYPE_PALETTE, TEXF_FORCENEAREST, palette_bgra_transparent);
+	return R_LoadTexture2D(drawtexturepool, "ditherpattern", 8, 8, pixels[0], TEXTYPE_PALETTE, TEXF_FORCENEAREST, -1, palette_bgra_transparent);
 }
 
 typedef struct embeddedpic_s
@@ -283,13 +292,13 @@ static rtexture_t *draw_generatepic(const char *name, qboolean quiet)
 	const embeddedpic_t *p;
 	for (p = embeddedpics;p->name;p++)
 		if (!strcmp(name, p->name))
-			return R_LoadTexture2D(drawtexturepool, p->name, p->width, p->height, (const unsigned char *)p->pixels, TEXTYPE_PALETTE, TEXF_ALPHA, palette_bgra_embeddedpic);
+			return R_LoadTexture2D(drawtexturepool, p->name, p->width, p->height, (const unsigned char *)p->pixels, TEXTYPE_PALETTE, TEXF_ALPHA, -1, palette_bgra_embeddedpic);
 	if (!strcmp(name, "gfx/conchars"))
 		return draw_generateconchars();
 	if (!strcmp(name, "gfx/colorcontrol/ditherpattern"))
 		return draw_generateditherpattern();
 	if (!quiet)
-		Con_Printf("Draw_CachePic: failed to load %s\n", name);
+		Con_DPrintf("Draw_CachePic: failed to load %s\n", name);
 	return r_texture_notexture;
 }
 
@@ -308,13 +317,31 @@ cachepic_t *Draw_CachePic_Flags(const char *path, unsigned int cachepicflags)
 	fs_offset_t lmpsize;
 	unsigned char *lmpdata;
 	char lmpname[MAX_QPATH];
+	int texflags;
+	int j;
+
+	texflags = TEXF_ALPHA;
+	if (!(cachepicflags & CACHEPICFLAG_NOCLAMP))
+		texflags |= TEXF_CLAMP;
+	if (!(cachepicflags & CACHEPICFLAG_NOCOMPRESSION) && gl_texturecompression_2d.integer)
+		texflags |= TEXF_COMPRESS;
 
 	// 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))
-			return pic;
+			if(!((pic->texflags ^ texflags) & ~(TEXF_COMPRESS))) // ignore TEXF_COMPRESS when comparing, because fallback pics remove the flag
+			{
+				if(!(cachepicflags & CACHEPICFLAG_NOTPERSISTENT))
+				{
+					if(pic->tex)
+						pic->autoload = false; // persist it
+					else
+						goto reload; // load it below, and then persist
+				}
+				return pic;
+			}
 
 	if (numcachepics == MAX_CACHED_PICS)
 	{
@@ -328,6 +355,7 @@ cachepic_t *Draw_CachePic_Flags(const char *path, unsigned int cachepicflags)
 	pic->chain = cachepichash[hashkey];
 	cachepichash[hashkey] = pic;
 
+reload:
 	// check whether it is an dynamic texture (if so, we can directly use its texture handler)
 	pic->tex = CL_GetDynTexture( path );
 	// if so, set the width/height, too
@@ -338,24 +366,33 @@ cachepic_t *Draw_CachePic_Flags(const char *path, unsigned int cachepicflags)
 		return pic;
 	}
 
-	pic->texflags = TEXF_ALPHA;
-	if (!(cachepicflags & CACHEPICFLAG_NOCLAMP))
-		pic->texflags |= TEXF_CLAMP;
-	if (!(cachepicflags & CACHEPICFLAG_NOCOMPRESSION) && gl_texturecompression_2d.integer)
-		pic->texflags |= TEXF_COMPRESS;
-
+	pic->hasalpha = true; // assume alpha unless we know it has none
+	pic->texflags = texflags;
 	pic->autoload = (cachepicflags & CACHEPICFLAG_NOTPERSISTENT);
 
 	// load a high quality image from disk if possible
-	pixels = loadimagepixelsbgra(path, false, true);
+	pixels = loadimagepixelsbgra(path, false, true, r_texture_convertsRGB_2d.integer, NULL);
 	if (pixels == NULL && !strncmp(path, "gfx/", 4))
-		pixels = loadimagepixelsbgra(path+4, false, true);
+		pixels = loadimagepixelsbgra(path+4, false, true, r_texture_convertsRGB_2d.integer, NULL);
 	if (pixels)
 	{
+		pic->hasalpha = false;
+		if (pic->texflags & TEXF_ALPHA)
+		{
+			for (j = 3;j < image_width * image_height * 4;j += 4)
+			{
+				if (pixels[j] < 255)
+				{
+					pic->hasalpha = true;
+					break;
+				}
+			}
+		}
+
 		pic->width = image_width;
 		pic->height = image_height;
 		if (!pic->autoload)
-			pic->tex = R_LoadTexture2D(drawtexturepool, path, image_width, image_height, pixels, TEXTYPE_BGRA, pic->texflags, NULL);
+			pic->tex = R_LoadTexture2D(drawtexturepool, path, image_width, image_height, pixels, TEXTYPE_BGRA, pic->texflags & (pic->hasalpha ? ~0 : ~TEXF_ALPHA), -1, NULL);
 	}
 	else
 	{
@@ -380,7 +417,7 @@ cachepic_t *Draw_CachePic_Flags(const char *path, unsigned int cachepicflags)
 			pic->height = lmpdata[4] + lmpdata[5] * 256 + lmpdata[6] * 65536 + lmpdata[7] * 16777216;
 			// if no high quality replacement image was found, upload the original low quality texture
 			if (!pixels)
-				pic->tex = R_LoadTexture2D(drawtexturepool, path, pic->width, pic->height, lmpdata + 8, TEXTYPE_PALETTE, pic->texflags, palette_bgra_transparent);
+				pic->tex = R_LoadTexture2D(drawtexturepool, path, pic->width, pic->height, lmpdata + 8, TEXTYPE_PALETTE, pic->texflags, -1, palette_bgra_transparent);
 		}
 		Mem_Free(lmpdata);
 	}
@@ -396,7 +433,7 @@ cachepic_t *Draw_CachePic_Flags(const char *path, unsigned int cachepicflags)
 			pic->height = 128;
 			// if no high quality replacement image was found, upload the original low quality texture
 			if (!pixels)
-				pic->tex = R_LoadTexture2D(drawtexturepool, path, 128, 128, lmpdata, TEXTYPE_PALETTE, pic->texflags, palette_bgra_font);
+				pic->tex = R_LoadTexture2D(drawtexturepool, path, 128, 128, lmpdata, TEXTYPE_PALETTE, pic->texflags, -1, palette_bgra_font);
 		}
 		else
 		{
@@ -404,7 +441,7 @@ cachepic_t *Draw_CachePic_Flags(const char *path, unsigned int cachepicflags)
 			pic->height = lmpdata[4] + lmpdata[5] * 256 + lmpdata[6] * 65536 + lmpdata[7] * 16777216;
 			// if no high quality replacement image was found, upload the original low quality texture
 			if (!pixels)
-				pic->tex = R_LoadTexture2D(drawtexturepool, path, pic->width, pic->height, lmpdata + 8, TEXTYPE_PALETTE, pic->texflags, palette_bgra_transparent);
+				pic->tex = R_LoadTexture2D(drawtexturepool, path, pic->width, pic->height, lmpdata + 8, TEXTYPE_PALETTE, pic->texflags, -1, palette_bgra_transparent);
 		}
 	}
 
@@ -426,7 +463,7 @@ cachepic_t *Draw_CachePic_Flags(const char *path, unsigned int cachepicflags)
 
 cachepic_t *Draw_CachePic (const char *path)
 {
-	return Draw_CachePic_Flags (path, 0);
+	return Draw_CachePic_Flags (path, 0); // default to persistent!
 }
 
 int draw_frame = 1;
@@ -435,9 +472,9 @@ rtexture_t *Draw_GetPicTexture(cachepic_t *pic)
 {
 	if (pic->autoload && !pic->tex)
 	{
-		pic->tex = loadtextureimage(drawtexturepool, pic->name, false, pic->texflags, true);
+		pic->tex = loadtextureimage(drawtexturepool, pic->name, false, pic->texflags, true, r_texture_convertsRGB_2d.integer);
 		if (pic->tex == NULL && !strncmp(pic->name, "gfx/", 4))
-			pic->tex = loadtextureimage(drawtexturepool, pic->name+4, false, pic->texflags, true);
+			pic->tex = loadtextureimage(drawtexturepool, pic->name+4, false, pic->texflags, true, r_texture_convertsRGB_2d.integer);
 		if (pic->tex == NULL)
 			pic->tex = draw_generatepic(pic->name, true);
 	}
@@ -450,11 +487,9 @@ void Draw_Frame(void)
 	int i;
 	cachepic_t *pic;
 	static double nextpurgetime;
-	int purgeframe;
 	if (nextpurgetime > realtime)
 		return;
 	nextpurgetime = realtime + 0.05;
-	purgeframe = draw_frame - 1;
 	for (i = 0, pic = cachepics;i < numcachepics;i++, pic++)
 	{
 		if (pic->autoload && pic->tex && pic->lastusedframe < draw_frame)
@@ -507,7 +542,7 @@ cachepic_t *Draw_NewPic(const char *picname, int width, int height, int alpha, u
 	pic->height = height;
 	if (pic->tex)
 		R_FreeTexture(pic->tex);
-	pic->tex = R_LoadTexture2D(drawtexturepool, picname, width, height, pixels_bgra, TEXTYPE_BGRA, (alpha ? TEXF_ALPHA : 0) | TEXF_ALLOWUPDATES, NULL);
+	pic->tex = R_LoadTexture2D(drawtexturepool, picname, width, height, pixels_bgra, TEXTYPE_BGRA, (alpha ? TEXF_ALPHA : 0), -1, NULL);
 	return pic;
 }
 
@@ -532,17 +567,33 @@ void Draw_FreePic(const char *picname)
 	}
 }
 
+static float snap_to_pixel_x(float x, float roundUpAt);
 extern int con_linewidth; // to force rewrapping
-static void LoadFont(qboolean override, const char *name, dp_font_t *fnt)
+void LoadFont(qboolean override, const char *name, dp_font_t *fnt, float scale, float voffset)
 {
-	int i;
-	float maxwidth, scale;
+	int i, ch;
+	float maxwidth;
 	char widthfile[MAX_QPATH];
 	char *widthbuf;
 	fs_offset_t widthbufsize;
 
 	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;
 
 	if(drawtexturepool == NULL)
 		return; // before gl_draw_start, so will be loaded later
@@ -558,30 +609,42 @@ static void LoadFont(qboolean override, const char *name, dp_font_t *fnt)
 	if(fnt->req_face != -1)
 	{
 		if(!Font_LoadFont(fnt->texpath, fnt))
-			Con_Printf("Failed to load font-file for '%s', it will not support as many characters.\n", fnt->texpath);
+			Con_DPrintf("Failed to load font-file for '%s', it will not support as many characters.\n", fnt->texpath);
 	}
 
 	fnt->tex = Draw_CachePic_Flags(fnt->texpath, CACHEPICFLAG_QUIET | CACHEPICFLAG_NOCOMPRESSION)->tex;
 	if(fnt->tex == r_texture_notexture)
 	{
-		fnt->tex = Draw_CachePic_Flags("gfx/conchars", CACHEPICFLAG_NOCOMPRESSION)->tex;
-		strlcpy(widthfile, "gfx/conchars.width", sizeof(widthfile));
+		for (i = 0; i < MAX_FONT_FALLBACKS; ++i)
+		{
+			if (!fnt->fallbacks[i][0])
+				break;
+			fnt->tex = Draw_CachePic_Flags(fnt->fallbacks[i], CACHEPICFLAG_QUIET | CACHEPICFLAG_NOCOMPRESSION)->tex;
+			if(fnt->tex != r_texture_notexture)
+				break;
+		}
+		if(fnt->tex == r_texture_notexture)
+		{
+			fnt->tex = Draw_CachePic_Flags("gfx/conchars", CACHEPICFLAG_NOCOMPRESSION)->tex;
+			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);
 
 	// unspecified width == 1 (base width)
-	for(i = 1; i < 256; ++i)
-		fnt->width_of[i] = 1;
-	scale = 1;
+	for(ch = 0; ch < 256; ++ch)
+		fnt->width_of[ch] = 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;
-		int ch = 0;
 
+		ch = 0;
 		while(ch < 256)
 		{
 			if(!COM_ParseToken_Simple(&p, false, false))
@@ -602,7 +665,8 @@ static void LoadFont(qboolean override, const char *name, dp_font_t *fnt)
 				case '+':
 				case '-':
 				case '.':
-					fnt->width_of[ch++] = atof(com_token) + extraspacing;
+					fnt->width_of[ch] = atof(com_token) + extraspacing;
+					ch++;
 					break;
 				default:
 					if(!strcmp(com_token, "extraspacing"))
@@ -615,7 +679,7 @@ static void LoadFont(qboolean override, const char *name, dp_font_t *fnt)
 					{
 						if(!COM_ParseToken_Simple(&p, false, false))
 							return;
-						scale = atof(com_token);
+						fnt->settings.scale = atof(com_token);
 					}
 					else
 					{
@@ -630,29 +694,65 @@ static void LoadFont(qboolean override, const char *name, dp_font_t *fnt)
 		Mem_Free(widthbuf);
 	}
 
-	maxwidth = fnt->width_of[1];
-	for(i = 2; i < 256; ++i)
+	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 *= scale;
-	fnt->scale = scale;
+	fnt->maxwidth *= fnt->settings.scale;
 
 	if(fnt == FONT_CONSOLE)
 		con_linewidth = -1; // rewrap console in next frame
 }
 
-static dp_font_t *FindFont(const char *title)
+extern cvar_t developer_font;
+dp_font_t *FindFont(const char *title, qboolean allocate_new)
 {
 	int i;
-	for(i = 0; i < MAX_FONTS; ++i)
-		if(!strcmp(dp_fonts[i].title, title))
-			return &dp_fonts[i];
+
+	// 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)
+	{
+		// 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
+		i = dp_fonts.maxsize;
+		dp_fonts.maxsize = dp_fonts.maxsize + FONTS_EXPAND;
+		if (developer_font.integer)
+			Con_Printf("FindFont: enlarging fonts buffer (%i -> %i)\n", i, dp_fonts.maxsize);
+		dp_fonts.f = Mem_Realloc(fonts_mempool, dp_fonts.f, sizeof(dp_font_t) * dp_fonts.maxsize);
+		// register a font in first expanded slot
+		strlcpy(dp_fonts.f[i].title, title, sizeof(dp_fonts.f[i].title));
+		return &dp_fonts.f[i];
+	}
 	return NULL;
 }
 
-static inline float snap_to_pixel_x(float x, float roundUpAt)
+static float snap_to_pixel_x(float x, float roundUpAt)
 {
 	float pixelpos = x * vid.width / vid_conwidth.value;
 	int snap = (int) pixelpos;
@@ -665,7 +765,7 @@ static inline float snap_to_pixel_x(float x, float roundUpAt)
 	*/
 }
 
-static inline float snap_to_pixel_y(float y, float roundUpAt)
+static float snap_to_pixel_y(float y, float roundUpAt)
 {
 	float pixelpos = y * vid.height / vid_conheight.value;
 	int snap = (int) pixelpos;
@@ -681,16 +781,17 @@ static inline float snap_to_pixel_y(float y, float roundUpAt)
 static void LoadFont_f(void)
 {
 	dp_font_t *f;
-	int i, si;
-	float sz, sn;
+	int i, sizes;
 	const char *filelist, *c, *cm;
+	float sz, scale, voffset;
 	char mainfont[MAX_QPATH];
 
 	if(Cmd_Argc() < 2)
 	{
 		Con_Printf("Available font commands:\n");
-		for(i = 0; i < MAX_FONTS; ++i)
-			Con_Printf("  loadfont %s gfx/tgafile[...] [sizes...]\n", dp_fonts[i].title);
+		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"
@@ -699,10 +800,13 @@ static void LoadFont_f(void)
 			   "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;
 	}
-	f = FindFont(Cmd_Argv(1));
+	f = FindFont(Cmd_Argv(1), true);
 	if(f == NULL)
 	{
 		Con_Printf("font function not found\n");
@@ -769,32 +873,56 @@ static void LoadFont_f(void)
 	for(i = 1; i < MAX_FONT_SIZES; ++i)
 		f->req_sizes[i] = -1;
 
-	// for some reason this argc is 3 even when using 2 arguments here, maybe nexuiz screws up
-	if(Cmd_Argc() >= 3)
+	scale = 1;
+	voffset = 0;
+	if(Cmd_Argc() >= 4)
 	{
-		for(i = 0; i < Cmd_Argc()-3; ++i)
+		for(sizes = 0, i = 3; i < Cmd_Argc(); ++i)
 		{
-			sz = atof(Cmd_Argv(i+3));
-			if (IS_NAN(sz)) // do not use crap sizes
+			// 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;
-			// now try to scale to our actual size:
-			if (vid.width > 0)
-				sn = snap_to_pixel_y(sz, 0.5);
-			else
+			}
+
+			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
 			{
-				sn = sz * vid_height.value / vid_conheight.value;
-				si = (int)sn;
-				if ( sn - (float)si >= 0.5 )
-					++si;
-				sn = si * vid_conheight.value / vid_height.value;
+				// 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++;
 			}
-			if (!IS_NAN(sn))
-				f->req_sizes[i] = sn;
-			else
-				f->req_sizes[i] = sz;
 		}
 	}
-	LoadFont(true, mainfont, f);
+
+	LoadFont(true, mainfont, f, scale, voffset);
 }
 
 /*
@@ -812,8 +940,10 @@ static void gl_draw_start(void)
 
 	font_start();
 
-	for(i = 0; i < MAX_FONTS; ++i)
-		LoadFont(false, va("gfx/font_%s", dp_fonts[i].title), &dp_fonts[i]);
+	// load default font textures
+	for(i = 0; i < dp_fonts.maxsize; ++i)
+		if (dp_fonts.f[i].title[0])
+			LoadFont(false, va("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);
@@ -837,14 +967,27 @@ static void gl_draw_newmap(void)
 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);
-	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);
 
+	// allocate fonts storage
+	fonts_mempool = Mem_AllocPool("FONTS", 0, NULL);
+	dp_fonts.maxsize = MAX_FONTS;
+	dp_fonts.f = 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_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));
@@ -853,17 +996,19 @@ void GL_Draw_Init (void)
 	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++);
-	Font_Init();
+		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_Setup(void)
+static void _DrawQ_Setup(void)
 {
 	r_viewport_t viewport;
-	if (r_refdef.draw2dstage)
+	if (r_refdef.draw2dstage == 1)
 		return;
-	r_refdef.draw2dstage = true;
+	r_refdef.draw2dstage = 1;
 	CHECKGLERROR
 	R_Viewport_InitOrtho(&viewport, &identitymatrix, r_refdef.view.x, vid.height - r_refdef.view.y - r_refdef.view.height, r_refdef.view.width, r_refdef.view.height, 0, 0, vid_conwidth.integer, vid_conheight.integer, -10, 100, NULL);
 	R_SetViewport(&viewport);
@@ -873,36 +1018,63 @@ void _DrawQ_Setup(void)
 	GL_CullFace(GL_FRONT); // quake is backwards, this culls back faces
 	R_EntityMatrix(&identitymatrix);
 
-	GL_DepthMask(true);
 	GL_DepthRange(0, 1);
 	GL_PolygonOffset(0, 0);
 	GL_DepthTest(false);
 	GL_Color(1,1,1,1);
 	GL_AlphaTest(false);
-	GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 }
 
-static void _DrawQ_ProcessDrawFlag(int flags)
+qboolean r_draw2d_force = false;
+void _DrawQ_SetupAndProcessDrawFlag(int flags, cachepic_t *pic, float alpha)
 {
 	_DrawQ_Setup();
 	CHECKGLERROR
+	if(!r_draw2d.integer && !r_draw2d_force)
+		return;
+	DrawQ_ProcessDrawFlag(flags, (alpha < 1) || (pic && pic->hasalpha));
+}
+void DrawQ_ProcessDrawFlag(int flags, qboolean alpha)
+{
 	if(flags == DRAWFLAG_ADDITIVE)
-		GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
+	{
+		GL_DepthMask(false);
+		GL_BlendFunc(alpha ? GL_SRC_ALPHA : GL_ONE, GL_ONE);
+	}
 	else if(flags == DRAWFLAG_MODULATE)
+	{
+		GL_DepthMask(false);
 		GL_BlendFunc(GL_DST_COLOR, GL_ZERO);
+	}
 	else if(flags == DRAWFLAG_2XMODULATE)
-		GL_BlendFunc(GL_DST_COLOR,GL_SRC_COLOR);
+	{
+		GL_DepthMask(false);
+		GL_BlendFunc(GL_DST_COLOR, GL_SRC_COLOR);
+	}
 	else if(flags == DRAWFLAG_SCREEN)
-		GL_BlendFunc(GL_ONE_MINUS_DST_COLOR,GL_ONE);
-	else
+	{
+		GL_DepthMask(false);
+		GL_BlendFunc(GL_ONE_MINUS_DST_COLOR, GL_ONE);
+	}
+	else if(alpha)
+	{
+		GL_DepthMask(false);
 		GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+	}
+	else
+	{
+		GL_DepthMask(true);
+		GL_BlendFunc(GL_ONE, GL_ZERO);
+	}
 }
 
 void DrawQ_Pic(float x, float y, cachepic_t *pic, float width, float height, float red, float green, float blue, float alpha, int flags)
 {
 	float floats[20];
 
-	_DrawQ_ProcessDrawFlag(flags);
+	_DrawQ_SetupAndProcessDrawFlag(flags, pic, alpha);
+	if(!r_draw2d.integer && !r_draw2d_force)
+		return;
 	GL_Color(red, green, blue, alpha);
 
 	R_Mesh_VertexPointer(floats, 0, 0);
@@ -957,7 +1129,9 @@ void DrawQ_RotPic(float x, float y, cachepic_t *pic, float width, float height,
 	float sinar = sin(ar);
 	float cosar = cos(ar);
 
-	_DrawQ_ProcessDrawFlag(flags);
+	_DrawQ_SetupAndProcessDrawFlag(flags, pic, alpha);
+	if(!r_draw2d.integer && !r_draw2d_force)
+		return;
 	GL_Color(red, green, blue, alpha);
 
 	R_Mesh_VertexPointer(floats, 0, 0);
@@ -1005,7 +1179,9 @@ void DrawQ_Fill(float x, float y, float width, float height, float red, float gr
 {
 	float floats[12];
 
-	_DrawQ_ProcessDrawFlag(flags);
+	_DrawQ_SetupAndProcessDrawFlag(flags, NULL, alpha);
+	if(!r_draw2d.integer && !r_draw2d_force)
+		return;
 	GL_Color(red, green, blue, alpha);
 
 	R_Mesh_VertexPointer(floats, 0, 0);
@@ -1073,8 +1249,10 @@ static void DrawQ_GetTextColor(float color[4], int colorindex, float r, float g,
 	}
 }
 
-float DrawQ_TextWidth_Font_UntilWidth_TrackColors_Size(const char *text, float w, float h, size_t *maxlen, int *outcolor, qboolean ignorecolorcodes, const dp_font_t *fnt, float maxwidth)
+// 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;
@@ -1083,12 +1261,17 @@ float DrawQ_TextWidth_Font_UntilWidth_TrackColors_Size(const char *text, float w
 	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_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) {
@@ -1096,8 +1279,8 @@ float DrawQ_TextWidth_Font_UntilWidth_TrackColors_Size(const char *text, float w
 		snap = false;
 	}
 	// do this in the end
-	w *= fnt->scale;
-	h *= fnt->scale;
+	w *= fnt->settings.scale;
+	h *= fnt->settings.scale;
 
 	// find the most fitting size:
 	if (ft2 != NULL)
@@ -1109,6 +1292,9 @@ float DrawQ_TextWidth_Font_UntilWidth_TrackColors_Size(const char *text, float w
 		fontmap = Font_MapForIndex(ft2, map_index);
 	}
 
+	dw = w * sw;
+	//dh = h * sh;
+
 	if (*maxlen < 1)
 		*maxlen = 1<<30;
 
@@ -1119,26 +1305,42 @@ float DrawQ_TextWidth_Font_UntilWidth_TrackColors_Size(const char *text, float w
 
 	// 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;
+	}
+
+	//if (snap)
+	//	x = snap_to_pixel_x(x, 0.4); // haha, it's 0 anyway
+
+	if (fontmap)
+		width_of = fontmap->width_of;
+	else
+		width_of = fnt->width_of;
 
-	for (i = 0;i < *maxlen && *text;)
+	for (i = 0;((bytes_left = *maxlen - (text - text_start)) > 0) && *text;)
 	{
-		nextch = ch = u8_getchar(text, &text);
-		//i = text - text_start;
+		size_t i0 = i;
+		nextch = ch = u8_getnchar(text, &text, bytes_left);
+		i = text - text_start;
 		if (!ch)
 			break;
-		if (snap)
-			x = snap_to_pixel_x(x, 0.4);
 		if (ch == ' ' && !fontmap)
 		{
-			if(x + fnt->width_of[(int) ' '] * w > maxwidth)
+			if(!least_one || i0) // never skip the first character
+			if(x + width_of[(int) ' '] * dw > maxwidth)
+			{
+				i = i0;
 				break; // oops, can't draw this
-			x += fnt->width_of[(int) ' '] * w;
-			++i;
+			}
+			x += width_of[(int) ' '] * dw;
 			continue;
 		}
-		if (ch == STRING_COLOR_TAG && !ignorecolorcodes && i + 1 < *maxlen)
+		// i points to the char after ^
+		if (ch == STRING_COLOR_TAG && !ignorecolorcodes && i < *maxlen)
 		{
-			++i;
 			ch = *text; // colors are ascii, so no u8_ needed
 			if (ch <= '9' && ch >= '0') // ^[0-9] found
 			{
@@ -1147,6 +1349,9 @@ float DrawQ_TextWidth_Font_UntilWidth_TrackColors_Size(const char *text, float w
 				++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...
@@ -1186,7 +1391,6 @@ float DrawQ_TextWidth_Font_UntilWidth_TrackColors_Size(const char *text, float w
 			i--;
 		}
 		ch = nextch;
-		++i;
 
 		if (!fontmap || (ch <= 0xFF && fontmap->glyphs[ch].image) || (ch >= 0xE000 && ch <= 0xE0FF))
 		{
@@ -1197,11 +1401,15 @@ float DrawQ_TextWidth_Font_UntilWidth_TrackColors_Size(const char *text, float w
 			if (fontmap)
 				map = ft2_oldstyle_map;
 			prevch = 0;
-			if(x + fnt->width_of[ch] * w > maxwidth)
+			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 += fnt->width_of[ch] * w;
+			}
+			x += width_of[ch] * dw;
 		} else {
-			if (!map || map == ft2_oldstyle_map || map->start < ch || map->start + FONT_CHARS_PER_MAP >= ch)
+			if (!map || map == ft2_oldstyle_map || ch < map->start || ch >= map->start + FONT_CHARS_PER_MAP)
 			{
 				map = FontMap_FindForChar(fontmap, ch);
 				if (!map)
@@ -1214,9 +1422,9 @@ float DrawQ_TextWidth_Font_UntilWidth_TrackColors_Size(const char *text, float w
 			}
 			mapch = ch - map->start;
 			if (prevch && Font_GetKerningForMap(ft2, map_index, w, h, prevch, ch, &kx, NULL))
-				x += kx * w;
-			x += map->glyphs[mapch].advance_x * w;
-			prevmap = map;
+				x += kx * dw;
+			x += map->glyphs[mapch].advance_x * dw;
+			//prevmap = map;
 			prevch = ch;
 		}
 	}
@@ -1229,7 +1437,7 @@ float DrawQ_TextWidth_Font_UntilWidth_TrackColors_Size(const char *text, float w
 	return x;
 }
 
-float DrawQ_String_Font(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)
+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)
 {
 	int shadow, colorindex = STRING_COLOR_DEFAULT;
 	size_t i;
@@ -1244,7 +1452,7 @@ float DrawQ_String_Font(float startx, float starty, const char *text, size_t max
 	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 *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;
@@ -1253,6 +1461,9 @@ float DrawQ_String_Font(float startx, float starty, const char *text, size_t max
 	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;
 
 	int tw, th;
 	tw = R_TextureWidth(fnt->tex);
@@ -1264,9 +1475,9 @@ float DrawQ_String_Font(float startx, float starty, const char *text, size_t max
 		snap = false;
 	}
 
-	starty -= (fnt->scale - 1) * h * 0.5; // center
-	w *= fnt->scale;
-	h *= fnt->scale;
+	starty -= (fnt->settings.scale - 1) * h * 0.5 - fnt->settings.voffset*h; // center & offset
+	w *= fnt->settings.scale;
+	h *= fnt->settings.scale;
 
 	if (ft2 != NULL)
 	{
@@ -1277,19 +1488,24 @@ float DrawQ_String_Font(float startx, float starty, const char *text, size_t max
 		fontmap = Font_MapForIndex(ft2, map_index);
 	}
 
+	dw = w * sw;
+	dh = h * sh;
+
 	// draw the font at its baseline when using freetype
 	//ftbase_x = 0;
-	ftbase_y = h * (4.5/6.0);
+	ftbase_y = dh * (4.5/6.0);
 
 	if (maxlen < 1)
 		maxlen = 1<<30;
 
-	_DrawQ_ProcessDrawFlag(flags);
+	_DrawQ_SetupAndProcessDrawFlag(flags, NULL, 0);
+	if(!r_draw2d.integer && !r_draw2d_force)
+		return startx + DrawQ_TextWidth_UntilWidth_TrackColors_Scale(text, &maxlen, w, h, sw, sh, NULL, ignorecolorcodes, fnt, 1000000000);
 
 	R_Mesh_ColorPointer(color4f, 0, 0);
 	R_Mesh_ResetTextureState();
 	if (!fontmap)
-		R_Mesh_TexBind(0, R_GetTexture(fnt->tex));
+		R_Mesh_TexBind(0, fnt->tex);
 	R_Mesh_TexCoordPointer(0, 2, texcoord2f, 0, 0);
 	R_Mesh_VertexPointer(vertex3f, 0, 0);
 	R_SetupShader_Generic(fnt->tex, NULL, GL_MODULATE, 1);
@@ -1300,12 +1516,24 @@ float DrawQ_String_Font(float startx, float starty, const char *text, size_t max
 	batchcount = 0;
 
 	//ftbase_x = snap_to_pixel_x(ftbase_x);
-	ftbase_y = snap_to_pixel_y(ftbase_y, 0.3);
+	if(snap)
+	{
+		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);
+	}
 
 	pix_x = vid.width / vid_conwidth.value;
 	pix_y = vid.height / vid_conheight.value;
+
+	if (fontmap)
+		width_of = fontmap->width_of;
+	else
+		width_of = fnt->width_of;
+
 	for (shadow = r_textshadow.value != 0 && basealpha > 0;shadow >= 0;shadow--)
 	{
+		prevch = 0;
 		text = text_start;
 
 		if (!outcolor || *outcolor == -1)
@@ -1324,26 +1552,19 @@ float DrawQ_String_Font(float startx, float starty, const char *text, size_t max
 			y += r_textshadow.value * vid.height / vid_conheight.value;
 		}
 		*/
-		for (i = 0;i < maxlen && *text;)
+		for (i = 0;((bytes_left = maxlen - (text - text_start)) > 0) && *text;)
 		{
-			nextch = ch = u8_getchar(text, &text);
-			//i = text - text_start;
+			nextch = ch = u8_getnchar(text, &text, bytes_left);
+			i = text - text_start;
 			if (!ch)
 				break;
-			if (snap)
-			{
-				x = snap_to_pixel_x(x, 0.4);
-				y = snap_to_pixel_y(y, 0.4);
-			}
 			if (ch == ' ' && !fontmap)
 			{
-				x += fnt->width_of[(int) ' '] * w;
-				++i;
+				x += width_of[(int) ' '] * dw;
 				continue;
 			}
-			if (ch == STRING_COLOR_TAG && !ignorecolorcodes && i + 1 < maxlen)
+			if (ch == STRING_COLOR_TAG && !ignorecolorcodes && i < maxlen)
 			{
-				++i;
 				ch = *text; // colors are ascii, so no u8_ needed
 				if (ch <= '9' && ch >= '0') // ^[0-9] found
 				{
@@ -1395,14 +1616,13 @@ float DrawQ_String_Font(float startx, float starty, const char *text, size_t max
 			}
 			// get the backup
 			ch = nextch;
-			++i;
 			// 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 += pix_x * r_textshadow.value;
-				y += pix_y * r_textshadow.value;
+				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))
 			{
@@ -1417,9 +1637,7 @@ float DrawQ_String_Font(float startx, float starty, const char *text, size_t max
 						if (batchcount)
 						{
 							// switching from freetype to non-freetype rendering
-							GL_LockArrays(0, batchcount * 4);
 							R_Mesh_Draw(0, batchcount * 4, 0, batchcount * 2, quadelement3i, quadelement3s, 0, 0);
-							GL_LockArrays(0, 0);
 							batchcount = 0;
 							ac = color4f;
 							at = texcoord2f;
@@ -1447,34 +1665,30 @@ float DrawQ_String_Font(float startx, float starty, const char *text, size_t max
 				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*thisw	; av[ 4] = y	; av[ 5] = 10;
-				av[ 6] = x+w*thisw	; av[ 7] = y+h	; av[ 8] = 10;
-				av[ 9] = x			; av[10] = y+h	; av[11] = 10;
+				av[ 3] = x+dw*thisw	; av[ 4] = y	; av[ 5] = 10;
+				av[ 6] = x+dw*thisw	; av[ 7] = y+dh	; av[ 8] = 10;
+				av[ 9] = x			; av[10] = y+dh	; av[11] = 10;
 				ac += 16;
 				at += 8;
 				av += 12;
 				batchcount++;
 				if (batchcount >= QUADELEMENTS_MAXQUADS)
 				{
-					GL_LockArrays(0, batchcount * 4);
 					R_Mesh_Draw(0, batchcount * 4, 0, batchcount * 2, quadelement3i, quadelement3s, 0, 0);
-					GL_LockArrays(0, 0);
 					batchcount = 0;
 					ac = color4f;
 					at = texcoord2f;
 					av = vertex3f;
 				}
-				x += thisw * w;
+				x += width_of[ch] * dw;
 			} else {
-				if (!map || map == ft2_oldstyle_map || map->start < ch || map->start + FONT_CHARS_PER_MAP >= ch)
+				if (!map || map == ft2_oldstyle_map || ch < map->start || ch >= map->start + FONT_CHARS_PER_MAP)
 				{
 					// new charmap - need to render
 					if (batchcount)
 					{
 						// we need a different character map, render what we currently have:
-						GL_LockArrays(0, batchcount * 4);
 						R_Mesh_Draw(0, batchcount * 4, 0, batchcount * 2, quadelement3i, quadelement3s, 0, 0);
-						GL_LockArrays(0, 0);
 						batchcount = 0;
 						ac = color4f;
 						at = texcoord2f;
@@ -1506,8 +1720,8 @@ float DrawQ_String_Font(float startx, float starty, const char *text, size_t max
 				y += ftbase_y;
 				if (prevch && Font_GetKerningForMap(ft2, map_index, w, h, prevch, ch, &kx, &ky))
 				{
-					x += kx * w;
-					y += ky * h;
+					x += kx * dw;
+					y += ky * dh;
 				}
 				else
 					kx = ky = 0;
@@ -1519,45 +1733,39 @@ float DrawQ_String_Font(float startx, float starty, const char *text, size_t max
 				at[2] = map->glyphs[mapch].txmax; at[3] = map->glyphs[mapch].tymin;
 				at[4] = map->glyphs[mapch].txmax; at[5] = map->glyphs[mapch].tymax;
 				at[6] = map->glyphs[mapch].txmin; at[7] = map->glyphs[mapch].tymax;
-				av[ 0] = x + w * map->glyphs[mapch].vxmin; av[ 1] = y + h * map->glyphs[mapch].vymin; av[ 2] = 10;
-				av[ 3] = x + w * map->glyphs[mapch].vxmax; av[ 4] = y + h * map->glyphs[mapch].vymin; av[ 5] = 10;
-				av[ 6] = x + w * map->glyphs[mapch].vxmax; av[ 7] = y + h * map->glyphs[mapch].vymax; av[ 8] = 10;
-				av[ 9] = x + w * map->glyphs[mapch].vxmin; av[10] = y + h * map->glyphs[mapch].vymax; av[11] = 10;
+				av[ 0] = x + dw * map->glyphs[mapch].vxmin; av[ 1] = y + dh * map->glyphs[mapch].vymin; av[ 2] = 10;
+				av[ 3] = x + dw * map->glyphs[mapch].vxmax; av[ 4] = y + dh * map->glyphs[mapch].vymin; av[ 5] = 10;
+				av[ 6] = x + dw * map->glyphs[mapch].vxmax; av[ 7] = y + dh * map->glyphs[mapch].vymax; av[ 8] = 10;
+				av[ 9] = x + dw * map->glyphs[mapch].vxmin; av[10] = y + dh * map->glyphs[mapch].vymax; av[11] = 10;
 				//x -= ftbase_x;
 				y -= ftbase_y;
 
-				x += thisw * w;
+				x += thisw * dw;
 				ac += 16;
 				at += 8;
 				av += 12;
 				batchcount++;
 				if (batchcount >= QUADELEMENTS_MAXQUADS)
 				{
-					GL_LockArrays(0, batchcount * 4);
 					R_Mesh_Draw(0, batchcount * 4, 0, batchcount * 2, quadelement3i, quadelement3s, 0, 0);
-					GL_LockArrays(0, 0);
 					batchcount = 0;
 					ac = color4f;
 					at = texcoord2f;
 					av = vertex3f;
 				}
 
-				prevmap = map;
+				//prevmap = map;
 				prevch = ch;
 			}
 			if (shadow)
 			{
-				x -= pix_x * r_textshadow.value;
-				y -= pix_y * r_textshadow.value;
+				x -= 1.0/pix_x * r_textshadow.value;
+				y -= 1.0/pix_y * r_textshadow.value;
 			}
 		}
 	}
 	if (batchcount > 0)
-	{
-		GL_LockArrays(0, batchcount * 4);
 		R_Mesh_Draw(0, batchcount * 4, 0, batchcount * 2, quadelement3i, quadelement3s, 0, 0);
-		GL_LockArrays(0, 0);
-	}
 
 	if (outcolor)
 		*outcolor = colorindex;
@@ -1566,34 +1774,24 @@ float DrawQ_String_Font(float startx, float starty, const char *text, size_t max
 	return x;
 }
 
-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)
-{
-	return DrawQ_String_Font(startx, starty, text, maxlen, w, h, basered, basegreen, baseblue, basealpha, flags, outcolor, ignorecolorcodes, &dp_fonts[0]);
-}
-
-float DrawQ_TextWidth_Font(const char *text, size_t maxlen, qboolean ignorecolorcodes, const dp_font_t *fnt)
+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)
 {
-	return DrawQ_TextWidth_Font_UntilWidth(text, &maxlen, ignorecolorcodes, fnt, 1000000000);
+	return DrawQ_String_Scale(startx, starty, text, maxlen, w, h, 1, 1, basered, basegreen, baseblue, basealpha, flags, outcolor, ignorecolorcodes, fnt);
 }
 
-float DrawQ_TextWidth_Font_Size(const char *text, float w, float h, size_t maxlen, qboolean ignorecolorcodes, const dp_font_t *fnt)
+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_Font_UntilWidth_Size(text, w, h, &maxlen, ignorecolorcodes, fnt, 1000000000);
+	return DrawQ_TextWidth_UntilWidth_TrackColors_Scale(text, maxlen, w, h, 1, 1, outcolor, ignorecolorcodes, fnt, maxwidth);
 }
 
-float DrawQ_TextWidth_Font_UntilWidth(const char *text, size_t *maxlen, qboolean ignorecolorcodes, const dp_font_t *fnt, float maxWidth)
+float DrawQ_TextWidth(const char *text, size_t maxlen, float w, float h, qboolean ignorecolorcodes, const dp_font_t *fnt)
 {
-	return DrawQ_TextWidth_Font_UntilWidth_TrackColors(text, maxlen, NULL, ignorecolorcodes, fnt, maxWidth);
+	return DrawQ_TextWidth_UntilWidth(text, &maxlen, w, h, ignorecolorcodes, fnt, 1000000000);
 }
 
-float DrawQ_TextWidth_Font_UntilWidth_Size(const char *text, float w, float h, size_t *maxlen, qboolean ignorecolorcodes, const dp_font_t *fnt, float maxWidth)
+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_Font_UntilWidth_TrackColors_Size(text, w, h, maxlen, NULL, ignorecolorcodes, fnt, maxWidth);
-}
-
-float DrawQ_TextWidth_Font_UntilWidth_TrackColors(const char *text, size_t *maxlen, int *outcolor, qboolean ignorecolorcodes, const dp_font_t *fnt, float maxwidth)
-{
-	return DrawQ_TextWidth_Font_UntilWidth_TrackColors_Size(text, 0, 0, maxlen, outcolor, ignorecolorcodes, fnt, maxwidth);
+	return DrawQ_TextWidth_UntilWidth_TrackColors(text, maxlen, w, h, NULL, ignorecolorcodes, fnt, maxWidth);
 }
 
 #if 0
@@ -1640,7 +1838,9 @@ void DrawQ_SuperPic(float x, float y, cachepic_t *pic, float width, float height
 {
 	float floats[36];
 
-	_DrawQ_ProcessDrawFlag(flags);
+	_DrawQ_SetupAndProcessDrawFlag(flags, pic, a1*a2*a3*a4);
+	if(!r_draw2d.integer && !r_draw2d_force)
+		return;
 
 	R_Mesh_VertexPointer(floats, 0, 0);
 	R_Mesh_ColorPointer(floats + 20, 0, 0);
@@ -1674,9 +1874,13 @@ void DrawQ_SuperPic(float x, float y, cachepic_t *pic, float width, float height
 	R_Mesh_Draw(0, 4, 0, 2, polygonelement3i, polygonelement3s, 0, 0);
 }
 
-void DrawQ_Mesh (drawqueuemesh_t *mesh, int flags)
+void DrawQ_Mesh (drawqueuemesh_t *mesh, int flags, qboolean hasalpha)
 {
-	_DrawQ_ProcessDrawFlag(flags);
+	_DrawQ_Setup();
+	CHECKGLERROR
+	if(!r_draw2d.integer && !r_draw2d_force)
+		return;
+	DrawQ_ProcessDrawFlag(flags, hasalpha);
 
 	R_Mesh_VertexPointer(mesh->data_vertex3f, 0, 0);
 	R_Mesh_ColorPointer(mesh->data_color4f, 0, 0);
@@ -1684,16 +1888,16 @@ void DrawQ_Mesh (drawqueuemesh_t *mesh, int flags)
 	R_Mesh_TexCoordPointer(0, 2, mesh->data_texcoord2f, 0, 0);
 	R_SetupShader_Generic(mesh->texture, NULL, GL_MODULATE, 1);
 
-	GL_LockArrays(0, mesh->num_vertices);
 	R_Mesh_Draw(0, mesh->num_vertices, 0, mesh->num_triangles, mesh->data_element3i, mesh->data_element3s, 0, 0);
-	GL_LockArrays(0, 0);
 }
 
 void DrawQ_LineLoop (drawqueuemesh_t *mesh, int flags)
 {
 	int num;
 
-	_DrawQ_ProcessDrawFlag(flags);
+	_DrawQ_SetupAndProcessDrawFlag(flags, NULL, 1);
+	if(!r_draw2d.integer && !r_draw2d_force)
+		return;
 
 	GL_Color(1,1,1,1);
 	CHECKGLERROR
@@ -1711,7 +1915,9 @@ void DrawQ_LineLoop (drawqueuemesh_t *mesh, int flags)
 //[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)
 {
-	_DrawQ_ProcessDrawFlag(flags);
+	_DrawQ_SetupAndProcessDrawFlag(flags, NULL, alpha);
+	if(!r_draw2d.integer && !r_draw2d_force)
+		return;
 
 	R_SetupShader_Generic(NULL, NULL, GL_MODULATE, 1);
 
@@ -1736,8 +1942,8 @@ void DrawQ_SetClipArea(float x, float y, float width, float height)
 	// OGL uses top to bottom
 	ix = (int)(0.5 + x * ((float)vid.width / vid_conwidth.integer));
 	iy = (int)(0.5 + y * ((float) vid.height / vid_conheight.integer));
-	iw = (int)(width * ((float)vid.width / vid_conwidth.integer));
-	ih = (int)(height * ((float)vid.height / vid_conheight.integer));
+	iw = (int)(0.5 + (x+width) * ((float)vid.width / vid_conwidth.integer)) - ix;
+	ih = (int)(0.5 + (y+height) * ((float) vid.height / vid_conheight.integer)) - iy;
 	GL_Scissor(ix, vid.height - iy - ih, iw, ih);
 
 	GL_ScissorTest(true);
@@ -1751,7 +1957,13 @@ void DrawQ_ResetClipArea(void)
 
 void DrawQ_Finish(void)
 {
-	r_refdef.draw2dstage = false;
+	r_refdef.draw2dstage = 0;
+}
+
+void DrawQ_RecalcView(void)
+{
+	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};