To: vim_dev@googlegroups.com

Subject: Patch 7.4.393

Fcc: outbox

From: Bram Moolenaar <Bram@moolenaar.net>

Mime-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

------------

Patch 7.4.393

Problem:    Text drawing on newer MS-Windows systems is suboptimal.  Some

	    multi-byte characters are not displayed, even though the same font

	    in Notepad can display them. (Srinath Avadhanula)

Solution:   Add the 'renderoptions' option to enable Direct-X drawing. (Taro

	    Muraoka)

Files:	    runtime/doc/eval.txt, runtime/doc/options.txt,

	    runtime/doc/various.txt, src/Make_cyg.mak, src/Make_ming.mak,

	    src/Make_mvc.mak, src/eval.c, src/gui_dwrite.cpp,

	    src/gui_dwrite.h, src/gui_w32.c, src/gui_w48.c, src/option.c,

	    src/option.h, src/version.c, src/vim.h, src/proto/gui_w32.pro

*** ../vim-7.4.392/runtime/doc/eval.txt	2014-06-25 18:15:18.442838249 +0200

--- runtime/doc/eval.txt	2014-08-06 14:35:24.871243363 +0200

***************

*** 6606,6611 ****

--- 6622,6628 ----

  dialog_gui		Compiled with GUI dialog support.

  diff			Compiled with |vimdiff| and 'diff' support.

  digraphs		Compiled with support for digraphs.

+ directx			Compiled with support for Direct-X and 'renderoptions'.

  dnd			Compiled with support for the "~ register |quote_~|.

  dos16			16 bits DOS version of Vim.

  dos32			32 bits DOS (DJGPP) version of Vim.

***************

*** 6744,6750 ****

  writebackup		Compiled with 'writebackup' default on.

  xfontset		Compiled with X fontset support |xfontset|.

  xim			Compiled with X input method support |xim|.

! xpm_w32			Compiled with pixmap support for Win32.

  xsmp			Compiled with X session management support.

  xsmp_interact		Compiled with interactive X session management support.

  xterm_clipboard		Compiled with support for xterm clipboard.

--- 6761,6769 ----

  writebackup		Compiled with 'writebackup' default on.

  xfontset		Compiled with X fontset support |xfontset|.

  xim			Compiled with X input method support |xim|.

! xpm			Compiled with pixmap support.

! xpm_w32			Compiled with pixmap support for Win32. (Only for

! 			backward compatibility. Use "xpm" instead.)

  xsmp			Compiled with X session management support.

  xsmp_interact		Compiled with interactive X session management support.

  xterm_clipboard		Compiled with support for xterm clipboard.

*** ../vim-7.4.392/runtime/doc/options.txt	2014-07-02 19:59:35.446375136 +0200

--- runtime/doc/options.txt	2014-08-06 14:36:59.591242682 +0200

***************

*** 5647,5652 ****

--- 5650,5726 ----

  	this option at the default "on".  Only switch it off when working with

  	old Vi scripts.

+                                                *'renderoptions'* *'rop'*

+ 'renderoptions' 'rop'	string  (default: empty)

+ 			global

+ 			{not in Vi}

+ 			{only available when compiled with GUI and DIRECTX on

+ 			MS-Windows}

+ 	Select a text renderer and set its options.  The options depend on the

+ 	renderer.

+ 

+ 	Syntax: >

+ 		set rop=type:{renderer}(,{name}:{value})*

+ <

+ 	Currently, only one optional renderer is available.

+ 

+ 	render	behavior    ~

+ 	directx	Vim will draw text using DirectX (DirectWrite).  It makes

+ 		drawn glyphs more beautiful than default GDI.

+ 		It requires 'encoding' is "utf-8", and only works on

+ 		MS-Windows Vista or newer version.

+ 

+ 		Options:

+ 		  name	    meaning		type	value       ~

+ 		  gamma	    gamma		float	1.0 - 2.2 (maybe)

+ 		  contrast  enhancedContrast	float	(unknown)

+ 		  level	    clearTypeLevel	float	(unknown)

+ 		  geom	    pixelGeometry	int	0 - 2 (see below)

+ 		  renmode   renderingMode	int	0 - 6 (see below)

+ 		  taamode   textAntialiasMode	int	0 - 3 (see below)

+ 

+ 		See this URL for detail:

+ 		  http://msdn.microsoft.com/en-us/library/dd368190.aspx

+ 

+ 		For geom: structure of a device pixel.

+ 		  0 - DWRITE_PIXEL_GEOMETRY_FLAT

+ 		  1 - DWRITE_PIXEL_GEOMETRY_RGB

+ 		  2 - DWRITE_PIXEL_GEOMETRY_BGR

+ 

+ 		See this URL for detail:

+ 		  http://msdn.microsoft.com/en-us/library/dd368114.aspx

+ 

+ 		For renmode: method of rendering glyphs.

+ 		  0 - DWRITE_RENDERING_MODE_DEFAULT

+ 		  1 - DWRITE_RENDERING_MODE_ALIASED

+ 		  2 - DWRITE_RENDERING_MODE_GDI_CLASSIC

+ 		  3 - DWRITE_RENDERING_MODE_GDI_NATURAL

+ 		  4 - DWRITE_RENDERING_MODE_NATURAL

+ 		  5 - DWRITE_RENDERING_MODE_NATURAL_SYMMETRIC

+ 		  6 - DWRITE_RENDERING_MODE_OUTLINE

+ 

+ 		See this URL for detail:

+ 		  http://msdn.microsoft.com/en-us/library/dd368118.aspx

+ 

+ 		For taamode: antialiasing mode used for drawing text.

+ 		  0 - D2D1_TEXT_ANTIALIAS_MODE_DEFAULT

+ 		  1 - D2D1_TEXT_ANTIALIAS_MODE_CLEARTYPE

+ 		  2 - D2D1_TEXT_ANTIALIAS_MODE_GRAYSCALE

+ 		  3 - D2D1_TEXT_ANTIALIAS_MODE_ALIASED

+ 

+ 		See this URL for detail:

+ 		  http://msdn.microsoft.com/en-us/library/dd368170.aspx

+ 

+ 		Example: >

+ 		  set encoding=utf-8

+ 		  set gfn=Ricty_Diminished:h12:cSHIFTJIS

+ 		  set rop=type:directx

+ <

+ 		If select a raster font (Courier, Terminal or FixedSys) to

+ 		'guifont', it fallbacks to be drawn by GDI automatically.

+ 

+ 	Other render types are currently not supported.

+ 

  						*'report'*

  'report'		number	(default 2)

  			global

*** ../vim-7.4.392/runtime/doc/various.txt	2013-08-10 13:25:06.000000000 +0200

--- runtime/doc/various.txt	2014-08-06 14:37:28.843242472 +0200

***************

*** 320,325 ****

--- 337,343 ----

  N  *+dialog_con_gui*	Support for |:confirm| with GUI and console dialog.

  N  *+diff*		|vimdiff| and 'diff'

  N  *+digraphs*		|digraphs| *E196*

+ m  *+directx*		Win32 GUI only: DirectX and |'renderoptions'|

     *+dnd*		Support for DnD into the "~ register |quote_~|.

  B  *+emacs_tags*	|emacs-tags| files

  N  *+eval*		expression evaluation |eval.txt|

***************

*** 426,431 ****

--- 445,451 ----

  m  *+writebackup*	|'writebackup'| is default on

  m  *+xim*		X input method |xim|

     *+xfontset*		X fontset support |xfontset|

+    *+xpm*		pixmap support

  m  *+xpm_w32*		Win32 GUI only: pixmap support |w32-xpm-support|

     *+xsmp*		XSMP (X session management) support

     *+xsmp_interact*	interactive XSMP (X session management) support

*** ../vim-7.4.392/src/Make_cyg.mak	2013-12-11 15:06:36.000000000 +0100

--- src/Make_cyg.mak	2014-08-06 14:21:57.455249166 +0200

***************

*** 8,13 ****

--- 8,14 ----

  # Cygwin application use the Makefile (just like on Unix).

  #

  # GUI		no or yes: set to yes if you want the GUI version (yes)

+ # DIRECTX	no or yes: set to yes if you want use DirectWrite (no)

  # PERL		define to path to Perl dir to get Perl support (not defined)

  #   PERL_VER	  define to version of Perl being used (56)

  #   DYNAMIC_PERL  no or yes: set to yes to load the Perl DLL dynamically (yes)

***************

*** 88,93 ****

--- 89,98 ----

  ARCH = i386

  endif

+ ifndef DIRECTX

+ DIRECTX = no

+ endif

+ 

  ifndef WINVER

  WINVER = 0x0500

  endif

***************

*** 470,475 ****

--- 475,489 ----

  endif

  ##############################

+ ifeq (yes, $(DIRECTX))

+ # Only allow DIRECTX for a GUI build.

+ DEFINES += -DFEAT_DIRECTX -DDYNAMIC_DIRECTX

+ EXTRA_OBJS += $(OUTDIR)/gui_dwrite.o

+ EXTRA_LIBS += -ld2d1 -ldwrite

+ USE_STDCPLUS = yes

+ endif

+ 

+ ##############################

  ifdef XPM

  # Only allow XPM for a GUI build.

  DEFINES += -DFEAT_XPM_W32

***************

*** 495,505 ****

  DEFINES += -DFEAT_OLE

  EXTRA_OBJS += $(OUTDIR)/if_ole.o

  EXTRA_LIBS += -loleaut32

! ifeq (yes, $(STATIC_STDCPLUS))

! EXTRA_LIBS += -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic

! else

! EXTRA_LIBS += -lstdc++

! endif

  endif

  ##############################

--- 509,515 ----

  DEFINES += -DFEAT_OLE

  EXTRA_OBJS += $(OUTDIR)/if_ole.o

  EXTRA_LIBS += -loleaut32

! USE_STDCPLUS = yes

  endif

  ##############################

***************

*** 513,518 ****

--- 523,537 ----

  DIRSLASH = \\

  endif

+ ##############################

+ ifeq (yes, $(USE_STDCPLUS))

+ ifeq (yes, $(STATIC_STDCPLUS))

+ EXTRA_LIBS += -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic

+ else

+ EXTRA_LIBS += -lstdc++

+ endif

+ endif

+ 

  #>>>>> end of choices

  ###########################################################################

***************

*** 643,648 ****

--- 662,670 ----

  $(OUTDIR)/gui_w32.o:	gui_w32.c gui_w48.c $(INCL)

  	$(CC) -c $(CFLAGS) gui_w32.c -o $(OUTDIR)/gui_w32.o

+ $(OUTDIR)/gui_dwrite.o:	gui_dwrite.cpp $(INCL) gui_dwrite.h

+ 	$(CC) -c $(CFLAGS) gui_dwrite.cpp -o $(OUTDIR)/gui_dwrite.o

+ 

  $(OUTDIR)/if_cscope.o:	if_cscope.c $(INCL) if_cscope.h

  	$(CC) -c $(CFLAGS) if_cscope.c -o $(OUTDIR)/if_cscope.o

*** ../vim-7.4.392/src/Make_ming.mak	2014-01-06 15:44:59.000000000 +0100

--- src/Make_ming.mak	2014-08-06 14:21:57.455249166 +0200

***************

*** 31,36 ****

--- 31,38 ----

  OPTIMIZE=MAXSPEED

  # set to yes to make gvim, no for vim

  GUI=yes

+ # set to yes if you want to use DirectWrite (DirectX)

+ DIRECTX=no

  # FEATURES=[TINY | SMALL  | NORMAL | BIG | HUGE]

  # Set to TINY to make minimal version (few features).

  FEATURES=BIG

***************

*** 456,461 ****

--- 458,471 ----

  endif

  endif

+ # DirectWrite (DirectX)

+ ifeq ($(DIRECTX),yes)

+ # Only allow DirectWrite for a GUI build.

+ ifeq (yes, $(GUI))

+ DEFINES += -DFEAT_DIRECTX -DDYNAMIC_DIRECTX

+ endif

+ endif

+ 

  # Only allow XPM for a GUI build.

  ifeq (yes, $(GUI))

***************

*** 593,598 ****

--- 603,616 ----

  LIB += -lwsock32

  endif

  endif

+ ifeq ($(DIRECTX),yes)

+ # Only allow DIRECTX for a GUI build.

+ ifeq (yes, $(GUI))

+ OBJ += $(OUTDIR)/gui_dwrite.o

+ LIB += -ld2d1 -ldwrite

+ USE_STDCPLUS = yes

+ endif

+ endif

  ifdef XPM

  # Only allow XPM for a GUI build.

  ifeq (yes, $(GUI))

***************

*** 650,660 ****

  ifeq (yes, $(OLE))

  LIB += -loleaut32

  OBJ += $(OUTDIR)/if_ole.o

! ifeq (yes, $(STATIC_STDCPLUS))

! LIB += -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic

! else

! LIB += -lstdc++

! endif

  endif

  ifeq (yes, $(MBYTE))

--- 668,674 ----

  ifeq (yes, $(OLE))

  LIB += -loleaut32

  OBJ += $(OUTDIR)/if_ole.o

! USE_STDCPLUS = yes

  endif

  ifeq (yes, $(MBYTE))

***************

*** 678,683 ****

--- 692,705 ----

  DEFINES+=-DDYNAMIC_ICONV

  endif

+ ifeq (yes, $(USE_STDCPLUS))

+ ifeq (yes, $(STATIC_STDCPLUS))

+ LIB += -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic

+ else

+ LIB += -lstdc++

+ endif

+ endif

+ 

  all: $(TARGET) vimrun.exe xxd/xxd.exe install.exe uninstal.exe GvimExt/gvimext.dll

  vimrun.exe: vimrun.c

***************

*** 751,756 ****

--- 773,781 ----

  $(OUTDIR)/gui_w32.o:	gui_w32.c gui_w48.c $(INCL)

  	$(CC) -c $(CFLAGS) gui_w32.c -o $(OUTDIR)/gui_w32.o

+ $(OUTDIR)/gui_dwrite.o:	gui_dwrite.cpp $(INCL) gui_dwrite.h

+ 	$(CC) -c $(CFLAGS) gui_dwrite.cpp -o $(OUTDIR)/gui_dwrite.o

+ 

  $(OUTDIR)/if_cscope.o:	if_cscope.c $(INCL) if_cscope.h

  	$(CC) -c $(CFLAGS) if_cscope.c -o $(OUTDIR)/if_cscope.o

*** ../vim-7.4.392/src/Make_mvc.mak	2014-05-22 16:29:03.374353200 +0200

--- src/Make_mvc.mak	2014-08-06 14:21:57.455249166 +0200

***************

*** 24,29 ****

--- 24,32 ----

  #

  #	GUI interface: GUI=yes (default is no)

  #

+ #	GUI with DirectWrite(DirectX): DIRECTX=yes

+ #	  (default is no, requires GUI=yes)

+ #

  #	OLE interface: OLE=yes (usually with GUI=yes)

  #

  #	Multibyte support: MBYTE=yes (default is no)

***************

*** 168,173 ****

--- 171,179 ----

  !else

  OBJDIR = .\ObjC

  !endif

+ !if "$(DIRECTX)" == "yes"

+ OBJDIR = $(OBJDIR)X

+ !endif

  !if "$(OLE)" == "yes"

  OBJDIR = $(OBJDIR)O

  !endif

***************

*** 292,297 ****

--- 298,310 ----

  NETBEANS_LIB	= WSock32.lib

  !endif

+ # DirectWrite(DirectX)

+ !if "$(DIRECTX)" == "yes"

+ DIRECTX_DEFS	= -DFEAT_DIRECTX -DDYNAMIC_DIRECTX

+ DIRECTX_INCL	= gui_dwrite.h

+ DIRECTX_OBJ	= $(OUTDIR)\gui_dwrite.obj

+ !endif

+ 

  !ifndef XPM

  # XPM is not set, use the included xpm files, depending on the architecture.

  !if "$(CPU)" == "AMD64"

***************

*** 642,647 ****

--- 655,666 ----

  SUBSYSTEM = console

  !endif

+ !if "$(GUI)" == "yes" && "$(DIRECTX)" == "yes"

+ CFLAGS = $(CFLAGS) $(DIRECTX_DEFS)

+ GUI_INCL = $(GUI_INCL) $(DIRECTX_INCL)

+ GUI_OBJ = $(GUI_OBJ) $(DIRECTX_OBJ)

+ !endif

+ 

  # iconv.dll library (dynamically loaded)

  !ifndef ICONV

  ICONV = yes

***************

*** 1107,1112 ****

--- 1126,1133 ----

  $(OUTDIR)/gui_w32.obj:	$(OUTDIR) gui_w32.c gui_w48.c $(INCL) $(GUI_INCL)

+ $(OUTDIR)/gui_dwrite.obj:	$(OUTDIR) gui_dwrite.cpp $(INCL) $(GUI_INCL)

+ 

  $(OUTDIR)/if_cscope.obj: $(OUTDIR) if_cscope.c  $(INCL)

  $(OUTDIR)/if_lua.obj: $(OUTDIR) if_lua.c  $(INCL)

*** ../vim-7.4.392/src/eval.c	2014-08-06 13:36:56.091268582 +0200

--- src/eval.c	2014-08-06 14:21:57.459249166 +0200

***************

*** 12464,12469 ****

--- 12464,12472 ----

  #ifdef FEAT_DIGRAPHS

  	"digraphs",

  #endif

+ #ifdef FEAT_DIRECTX

+ 	"directx",

+ #endif

  #ifdef FEAT_DND

  	"dnd",

  #endif

*** ../vim-7.4.392/src/gui_dwrite.cpp	2014-08-06 14:49:19.663237363 +0200

--- src/gui_dwrite.cpp	2014-08-06 14:39:48.775241466 +0200

***************

*** 0 ****

--- 1,901 ----

+ /* vi:set ts=8 sts=4 sw=4 noet: */

+ /*

+  * Author: MURAOKA Taro <koron.kaoriya@gmail.com>

+  *

+  * Contributors:

+  *  - Ken Takata

+  *

+  * Copyright (C) 2013 MURAOKA Taro <koron.kaoriya@gmail.com>

+  * THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE.

+  */

+ 

+ #define WIN32_LEAN_AND_MEAN

+ 

+ #ifndef DYNAMIC_DIRECTX

+ # if WINVER < 0x0600

+ #  error WINVER must be 0x0600 or above to use DirectWrite(DirectX)

+ # endif

+ #endif

+ 

+ #include <windows.h>

+ #include <crtdbg.h>

+ #include <assert.h>

+ #include <math.h>

+ #include <d2d1.h>

+ #include <d2d1helper.h>

+ #include <dwrite.h>

+ 

+ #include "gui_dwrite.h"

+ 

+ #ifdef __MINGW32__

+ # define __maybenull	SAL__maybenull

+ # define __in		SAL__in

+ # define __out		SAL__out

+ #endif

+ 

+ #ifdef DYNAMIC_DIRECTX

+ extern "C" HINSTANCE vimLoadLib(char *name);

+ 

+ typedef int (WINAPI *PGETUSERDEFAULTLOCALENAME)(LPWSTR, int);

+ typedef HRESULT (WINAPI *PD2D1CREATEFACTORY)(D2D1_FACTORY_TYPE,

+ 	REFIID, const D2D1_FACTORY_OPTIONS *, void **);

+ typedef HRESULT (WINAPI *PDWRITECREATEFACTORY)(DWRITE_FACTORY_TYPE,

+ 	REFIID, IUnknown **);

+ 

+ static HINSTANCE hD2D1DLL = NULL;

+ static HINSTANCE hDWriteDLL = NULL;

+ 

+ static PGETUSERDEFAULTLOCALENAME pGetUserDefaultLocaleName = NULL;

+ static PD2D1CREATEFACTORY pD2D1CreateFactory = NULL;

+ static PDWRITECREATEFACTORY pDWriteCreateFactory = NULL;

+ 

+ #define GetUserDefaultLocaleName	(*pGetUserDefaultLocaleName)

+ #define D2D1CreateFactory		(*pD2D1CreateFactory)

+ #define DWriteCreateFactory		(*pDWriteCreateFactory)

+ 

+     static void

+ unload(HINSTANCE &hinst)

+ {

+     if (hinst != NULL)

+     {

+ 	FreeLibrary(hinst);

+ 	hinst = NULL;

+     }

+ }

+ #endif // DYNAMIC_DIRECTX

+ 

+ template <class T> inline void SafeRelease(T **ppT)

+ {

+     if (*ppT)

+     {

+ 	(*ppT)->Release();

+ 	*ppT = NULL;

+     }

+ }

+ 

+ struct GdiTextRendererContext

+ {

+     // const fields.

+     COLORREF color;

+     FLOAT cellWidth;

+ 

+     // working fields.

+     FLOAT offsetX;

+ };

+ 

+     static DWRITE_PIXEL_GEOMETRY

+ ToPixelGeometry(int value)

+ {

+     switch (value)

+     {

+ 	default:

+ 	case 0:

+ 	    return DWRITE_PIXEL_GEOMETRY_FLAT;

+ 	case 1:

+ 	    return DWRITE_PIXEL_GEOMETRY_RGB;

+ 	case 2:

+ 	    return DWRITE_PIXEL_GEOMETRY_BGR;

+     }

+ }

+ 

+     static int

+ ToInt(DWRITE_PIXEL_GEOMETRY value)

+ {

+     switch (value)

+     {

+ 	case DWRITE_PIXEL_GEOMETRY_FLAT:

+ 	    return 0;

+ 	case DWRITE_PIXEL_GEOMETRY_RGB:

+ 	    return 1;

+ 	case DWRITE_PIXEL_GEOMETRY_BGR:

+ 	    return 2;

+ 	default:

+ 	    return -1;

+     }

+ }

+ 

+     static DWRITE_RENDERING_MODE

+ ToRenderingMode(int value)

+ {

+     switch (value)

+     {

+ 	default:

+ 	case 0:

+ 	    return DWRITE_RENDERING_MODE_DEFAULT;

+ 	case 1:

+ 	    return DWRITE_RENDERING_MODE_ALIASED;

+ 	case 2:

+ 	    return DWRITE_RENDERING_MODE_CLEARTYPE_GDI_CLASSIC;

+ 	case 3:

+ 	    return DWRITE_RENDERING_MODE_CLEARTYPE_GDI_NATURAL;

+ 	case 4:

+ 	    return DWRITE_RENDERING_MODE_CLEARTYPE_NATURAL;

+ 	case 5:

+ 	    return DWRITE_RENDERING_MODE_CLEARTYPE_NATURAL_SYMMETRIC;

+ 	case 6:

+ 	    return DWRITE_RENDERING_MODE_OUTLINE;

+     }

+ }

+ 

+     static D2D1_TEXT_ANTIALIAS_MODE

+ ToTextAntialiasMode(int value)

+ {

+     switch (value)

+     {

+ 	default:

+ 	case 0:

+ 	    return D2D1_TEXT_ANTIALIAS_MODE_DEFAULT;

+ 	case 1:

+ 	    return D2D1_TEXT_ANTIALIAS_MODE_CLEARTYPE;

+ 	case 2:

+ 	    return D2D1_TEXT_ANTIALIAS_MODE_GRAYSCALE;

+ 	case 3:

+ 	    return D2D1_TEXT_ANTIALIAS_MODE_ALIASED;

+     }

+ }

+ 

+     static int

+ ToInt(DWRITE_RENDERING_MODE value)

+ {

+     switch (value)

+     {

+ 	case DWRITE_RENDERING_MODE_DEFAULT:

+ 	    return 0;

+ 	case DWRITE_RENDERING_MODE_ALIASED:

+ 	    return 1;

+ 	case DWRITE_RENDERING_MODE_CLEARTYPE_GDI_CLASSIC:

+ 	    return 2;

+ 	case DWRITE_RENDERING_MODE_CLEARTYPE_GDI_NATURAL:

+ 	    return 3;

+ 	case DWRITE_RENDERING_MODE_CLEARTYPE_NATURAL:

+ 	    return 4;

+ 	case DWRITE_RENDERING_MODE_CLEARTYPE_NATURAL_SYMMETRIC:

+ 	    return 5;

+ 	case DWRITE_RENDERING_MODE_OUTLINE:

+ 	    return 6;

+ 	default:

+ 	    return -1;

+     }

+ }

+ 

+ class AdjustedGlyphRun : public DWRITE_GLYPH_RUN

+ {

+ private:

+     FLOAT mDelta;

+     FLOAT *mAdjustedAdvances;

+ 

+ public:

+     AdjustedGlyphRun(

+ 	    const DWRITE_GLYPH_RUN *glyphRun,

+ 	    FLOAT cellWidth) :

+ 	DWRITE_GLYPH_RUN(*glyphRun),

+ 	mDelta(0.0f),

+ 	mAdjustedAdvances(new FLOAT[glyphRun->glyphCount])

+     {

+ 	assert(cellWidth != 0.0f);

+ 	for (UINT32 i = 0; i < glyphRun->glyphCount; ++i)

+ 	{

+ 	    FLOAT orig = glyphRun->glyphAdvances[i];

+ 	    FLOAT adjusted = adjustToCell(orig, cellWidth);

+ 	    mAdjustedAdvances[i] = adjusted;

+ 	    mDelta += adjusted - orig;

+ 	}

+ 	glyphAdvances = mAdjustedAdvances;

+     }

+ 

+     ~AdjustedGlyphRun(void)

+     {

+ 	delete[] mAdjustedAdvances;

+     }

+ 

+     FLOAT getDelta(void) const

+     {

+ 	return mDelta;

+     }

+ 

+     static FLOAT adjustToCell(FLOAT value, FLOAT cellWidth)

+     {

+ 	int cellCount = (int)floor(value / cellWidth + 0.5f);

+ 	if (cellCount < 1)

+ 	    cellCount = 1;

+ 	return cellCount * cellWidth;

+     }

+ };

+ 

+ class GdiTextRenderer : public IDWriteTextRenderer

+ {

+ public:

+     GdiTextRenderer(

+ 	    IDWriteBitmapRenderTarget* bitmapRenderTarget,

+ 	    IDWriteRenderingParams* renderingParams) :

+ 	cRefCount_(0),

+ 	pRenderTarget_(bitmapRenderTarget),

+ 	pRenderingParams_(renderingParams)

+     {

+ 	pRenderTarget_->AddRef();

+ 	pRenderingParams_->AddRef();

+ 	AddRef();

+     }

+ 

+     ~GdiTextRenderer()

+     {

+ 	SafeRelease(&pRenderTarget_);

+ 	SafeRelease(&pRenderingParams_);

+     }

+ 

+     IFACEMETHOD(IsPixelSnappingDisabled)(

+ 	__maybenull void* clientDrawingContext,

+ 	__out BOOL* isDisabled)

+     {

+ 	*isDisabled = FALSE;

+ 	return S_OK;

+     }

+ 

+     IFACEMETHOD(GetCurrentTransform)(

+ 	__maybenull void* clientDrawingContext,

+ 	__out DWRITE_MATRIX* transform)

+     {

+ 	//forward the render target's transform

+ 	pRenderTarget_->GetCurrentTransform(transform);

+ 	return S_OK;

+     }

+ 

+     IFACEMETHOD(GetPixelsPerDip)(

+ 	__maybenull void* clientDrawingContext,

+ 	__out FLOAT* pixelsPerDip)

+     {

+ 	*pixelsPerDip = pRenderTarget_->GetPixelsPerDip();

+ 	return S_OK;

+     }

+ 

+     IFACEMETHOD(DrawGlyphRun)(

+ 	__maybenull void* clientDrawingContext,

+ 	FLOAT baselineOriginX,

+ 	FLOAT baselineOriginY,

+ 	DWRITE_MEASURING_MODE measuringMode,

+ 	__in DWRITE_GLYPH_RUN const* glyphRun,

+ 	__in DWRITE_GLYPH_RUN_DESCRIPTION const* glyphRunDescription,

+ 	IUnknown* clientDrawingEffect)

+     {

+ 	HRESULT hr = S_OK;

+ 

+ 	GdiTextRendererContext *context =

+ 	    reinterpret_cast<GdiTextRendererContext*>(clientDrawingContext);

+ 

+ 	AdjustedGlyphRun adjustedGlyphRun(glyphRun, context->cellWidth);

+ 

+ 	// Pass on the drawing call to the render target to do the real work.

+ 	RECT dirtyRect = {0};

+ 

+ 	hr = pRenderTarget_->DrawGlyphRun(

+ 		baselineOriginX + context->offsetX,

+ 		baselineOriginY,

+ 		measuringMode,

+ 		&adjustedGlyphRun,

+ 		pRenderingParams_,

+ 		context->color,

+ 		&dirtyRect);

+ 

+ 	context->offsetX += adjustedGlyphRun.getDelta();

+ 

+ 	return hr;

+     }

+ 

+     IFACEMETHOD(DrawUnderline)(

+ 	__maybenull void* clientDrawingContext,

+ 	FLOAT baselineOriginX,

+ 	FLOAT baselineOriginY,

+ 	__in DWRITE_UNDERLINE const* underline,

+ 	IUnknown* clientDrawingEffect)

+     {

+ 	return E_NOTIMPL;

+     }

+ 

+     IFACEMETHOD(DrawStrikethrough)(

+ 	__maybenull void* clientDrawingContext,

+ 	FLOAT baselineOriginX,

+ 	FLOAT baselineOriginY,

+ 	__in DWRITE_STRIKETHROUGH const* strikethrough,

+ 	IUnknown* clientDrawingEffect)

+     {

+ 	return E_NOTIMPL;

+     }

+ 

+     IFACEMETHOD(DrawInlineObject)(

+ 	__maybenull void* clientDrawingContext,

+ 	FLOAT originX,

+ 	FLOAT originY,

+ 	IDWriteInlineObject* inlineObject,

+ 	BOOL isSideways,

+ 	BOOL isRightToLeft,

+ 	IUnknown* clientDrawingEffect)

+     {

+ 	return E_NOTIMPL;

+     }

+ 

+ public:

+     IFACEMETHOD_(unsigned long, AddRef) ()

+     {

+ 	return InterlockedIncrement(&cRefCount_);

+     }

+ 

+     IFACEMETHOD_(unsigned long, Release) ()

+     {

+ 	long newCount = InterlockedDecrement(&cRefCount_);

+ 

+ 	if (newCount == 0)

+ 	{

+ 	    delete this;

+ 	    return 0;

+ 	}

+ 	return newCount;

+     }

+ 

+     IFACEMETHOD(QueryInterface)(

+ 	IID const& riid,

+ 	void** ppvObject)

+     {

+ 	if (__uuidof(IDWriteTextRenderer) == riid)

+ 	{

+ 	    *ppvObject = this;

+ 	}

+ 	else if (__uuidof(IDWritePixelSnapping) == riid)

+ 	{

+ 	    *ppvObject = this;

+ 	}

+ 	else if (__uuidof(IUnknown) == riid)

+ 	{

+ 	    *ppvObject = this;

+ 	}

+ 	else

+ 	{

+ 	    *ppvObject = NULL;

+ 	    return E_FAIL;

+ 	}

+ 

+ 	return S_OK;

+     }

+ 

+ private:

+     unsigned long cRefCount_;

+     IDWriteBitmapRenderTarget* pRenderTarget_;

+     IDWriteRenderingParams* pRenderingParams_;

+ };

+ 

+ struct DWriteContext {

+     FLOAT mDpiScaleX;

+     FLOAT mDpiScaleY;

+     bool mDrawing;

+ 

+     ID2D1Factory *mD2D1Factory;

+ 

+     ID2D1DCRenderTarget *mRT;

+     ID2D1SolidColorBrush *mBrush;

+ 

+     IDWriteFactory *mDWriteFactory;

+     IDWriteGdiInterop *mGdiInterop;

+     IDWriteRenderingParams *mRenderingParams;

+     IDWriteTextFormat *mTextFormat;

+ 

+     HFONT mLastHFont;

+     DWRITE_FONT_WEIGHT mFontWeight;

+     DWRITE_FONT_STYLE mFontStyle;

+ 

+     D2D1_TEXT_ANTIALIAS_MODE mTextAntialiasMode;

+ 

+     // METHODS

+ 

+     DWriteContext();

+ 

+     virtual ~DWriteContext();

+ 

+     HRESULT SetLOGFONT(const LOGFONTW &logFont, float fontSize);

+ 

+     void SetFont(HFONT hFont);

+ 

+     void SetFont(const LOGFONTW &logFont);

+ 

+     void DrawText(HDC hdc, const WCHAR* text, int len,

+ 	int x, int y, int w, int h, int cellWidth, COLORREF color);

+ 

+     float PixelsToDipsX(int x);

+ 

+     float PixelsToDipsY(int y);

+ 

+     void SetRenderingParams(

+ 	    const DWriteRenderingParams *params);

+ 

+     DWriteRenderingParams *GetRenderingParams(

+ 	    DWriteRenderingParams *params);

+ };

+ 

+ DWriteContext::DWriteContext() :

+     mDpiScaleX(1.f),

+     mDpiScaleY(1.f),

+     mDrawing(false),

+     mD2D1Factory(NULL),

+     mRT(NULL),

+     mBrush(NULL),

+     mDWriteFactory(NULL),

+     mGdiInterop(NULL),

+     mRenderingParams(NULL),

+     mTextFormat(NULL),

+     mLastHFont(NULL),

+     mFontWeight(DWRITE_FONT_WEIGHT_NORMAL),