[Brlcad-commits] CVS: brlcad/src/libdm dm-ogl_win.c,14.11.2.1,14.11.2.2
Open Source Solid Modeling CAD
Brought to you by:
brlcad
Menu
▾
▴
[Brlcad-commits] CVS: brlcad/src/libdm dm-ogl_win.c,14.11.2.1,14.11.2.2
|
From: Bob P. <bo...@us...> - 2005-11-17 17:35:41
|
Update of /cvsroot/brlcad/brlcad/src/libdm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4150 Modified Files: Tag: bobWinPort dm-ogl_win.c Log Message: Fixed a line of code that was trashing the stack. Other minor mods. Index: dm-ogl_win.c =================================================================== RCS file: /cvsroot/brlcad/brlcad/src/libdm/dm-ogl_win.c,v retrieving revision 14.11.2.1 retrieving revision 14.11.2.2 diff -w -u -r14.11.2.1 -r14.11.2.2 --- dm-ogl_win.c 8 Sep 2005 15:45:16 -0000 14.11.2.1 +++ dm-ogl_win.c 17 Nov 2005 17:35:30 -0000 14.11.2.2 @@ -1987,14 +1987,19 @@ logfont.lfClipPrecision = CLIP_DEFAULT_PRECIS ; logfont.lfQuality = DEFAULT_QUALITY; logfont.lfPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE; +#if 1 + logfont.lfFaceName[0] = (TCHAR)0; +#else logfont.lfFaceName[LF_FACESIZE] = (TCHAR) 0; +#endif if ((((struct dm_xvars *)dmp->dm_vars.pub_vars)->fontstruct = CreateFontIndirect(&logfont)) == NULL ) { /* ????? add backup later */ /* Try hardcoded backup font */ /* if ((((struct dm_xvars *)dmp->dm_vars.pub_vars)->fontstruct = - (HFONT *)CreateFontIndirect(&logfont)) == NULL) */{ + (HFONT *)CreateFontIndirect(&logfont)) == NULL) */ + { bu_log("ogl_configureWin_guts: Can't open font '%s' or '%s'\n", FONT9, FONTBACK); return TCL_ERROR; } @@ -2002,10 +2007,11 @@ oldfont = SelectObject(((struct dm_xvars *)dmp->dm_vars.pub_vars)->hdc,((struct dm_xvars *)dmp->dm_vars.pub_vars)->fontstruct); wglUseFontBitmaps(((struct dm_xvars *)dmp->dm_vars.pub_vars)->hdc,0,256,((struct ogl_vars *)dmp->dm_vars.priv_vars)->fontOffset); + + if (oldfont != NULL) DeleteObject(SelectObject(((struct dm_xvars *)dmp->dm_vars.pub_vars)->hdc,oldfont)); } - /* Always try to choose a the font that best fits the window size. */ @@ -2023,15 +2029,22 @@ logfont.lfClipPrecision = CLIP_DEFAULT_PRECIS ; logfont.lfQuality = DEFAULT_QUALITY; logfont.lfPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE; +#if 1 + logfont.lfFaceName[0] = (TCHAR) 0; +#else logfont.lfFaceName[LF_FACESIZE] = (TCHAR) 0; +#endif if ((((struct dm_xvars *)dmp->dm_vars.pub_vars)->fontstruct = - CreateFontIndirect(&logfont)) == NULL ) - { + CreateFontIndirect(&logfont)) == NULL ) { + bu_log("ogl_configureWin_guts: Can't open font '%s' or '%s'\n", FONT9, FONTBACK); + return TCL_ERROR; } oldfont = SelectObject(((struct dm_xvars *)dmp->dm_vars.pub_vars)->hdc,((struct dm_xvars *)dmp->dm_vars.pub_vars)->fontstruct); wglUseFontBitmaps(((struct dm_xvars *)dmp->dm_vars.pub_vars)->hdc,0,256,((struct ogl_vars *)dmp->dm_vars.priv_vars)->fontOffset); + + if (oldfont != NULL) DeleteObject(SelectObject(((struct dm_xvars *)dmp->dm_vars.pub_vars)->hdc,oldfont)); } @@ -2045,6 +2058,8 @@ ((struct dm_xvars *)dmp->dm_vars.pub_vars)->fontstruct = newfontstruct; oldfont = SelectObject(((struct dm_xvars *)dmp->dm_vars.pub_vars)->hdc,((struct dm_xvars *)dmp->dm_vars.pub_vars)->fontstruct); wglUseFontBitmaps(((struct dm_xvars *)dmp->dm_vars.pub_vars)->hdc,0,256,((struct ogl_vars *)dmp->dm_vars.priv_vars)->fontOffset); + + if (oldfont != NULL) DeleteObject(SelectObject(((struct dm_xvars *)dmp->dm_vars.pub_vars)->hdc,oldfont)); } } @@ -2057,6 +2072,8 @@ ((struct dm_xvars *)dmp->dm_vars.pub_vars)->fontstruct = newfontstruct; oldfont = SelectObject(((struct dm_xvars *)dmp->dm_vars.pub_vars)->hdc,((struct dm_xvars *)dmp->dm_vars.pub_vars)->fontstruct); wglUseFontBitmaps(((struct dm_xvars *)dmp->dm_vars.pub_vars)->hdc,0,256,((struct ogl_vars *)dmp->dm_vars.priv_vars)->fontOffset); + + if (oldfont != NULL) DeleteObject(SelectObject(((struct dm_xvars *)dmp->dm_vars.pub_vars)->hdc,oldfont)); } } @@ -2080,6 +2097,8 @@ ((struct dm_xvars *)dmp->dm_vars.pub_vars)->fontstruct = newfontstruct; oldfont = SelectObject(((struct dm_xvars *)dmp->dm_vars.pub_vars)->hdc,((struct dm_xvars *)dmp->dm_vars.pub_vars)->fontstruct); wglUseFontBitmaps(((struct dm_xvars *)dmp->dm_vars.pub_vars)->hdc,0,256,((struct ogl_vars *)dmp->dm_vars.priv_vars)->fontOffset); + + if (oldfont != NULL) DeleteObject(SelectObject(((struct dm_xvars *)dmp->dm_vars.pub_vars)->hdc,oldfont)); } } @@ -2091,6 +2110,8 @@ ((struct dm_xvars *)dmp->dm_vars.pub_vars)->fontstruct = newfontstruct; oldfont = SelectObject(((struct dm_xvars *)dmp->dm_vars.pub_vars)->hdc,((struct dm_xvars *)dmp->dm_vars.pub_vars)->fontstruct); wglUseFontBitmaps(((struct dm_xvars *)dmp->dm_vars.pub_vars)->hdc,0,256,((struct ogl_vars *)dmp->dm_vars.priv_vars)->fontOffset); + + if (oldfont != NULL) DeleteObject(SelectObject(((struct dm_xvars *)dmp->dm_vars.pub_vars)->hdc,oldfont)); } } |