gnustep/libs-back
0
0
Fork 0
mirror of https://github.com/gnustep/libs-back.git synced 2025-04-23 08:07:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge the two checks for xshm in XWindowBuffer.

Browse source 
Better check for unicode encoding in art fonts.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@29410 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fredkiefer 2010-01-26 09:21:01 +00:00
parent 877ca5a93c
commit 3630eca51a
3 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2010-01-26 Fred Kiefer <FredKiefer@gmx.de>
* Source/x11/XWindowBuffer.m (+windowBufferForWindow:depthInfo:):
Merge the two checks for xshm.
* Source/art/ftfont.m (-initWithFontName:...screenFont:):
Initialize unicodeCmap to -1 to be able to detect missing unicode
encoding in a font.
2010-01-25 04:13-EST Gregory John Casamento <greg.casamento@gmail.com>
* Source/win32/w32_create.m: (-decodeWM_CREATEParams:::) add

2
Source/art/ftfont.m
View file

@ -285,7 +285,7 @@ static FT_Error ft_get_face(FTC_FaceID fid, FT_Library lib,
FT_Face face = ft_size->face;
FT_CharMap cmap;
FT_Encoding e;
unicodeCmap = 0;
unicodeCmap = -1;
if (!face)
{

13
Source/x11/XWindowBuffer.m
View file

@ -77,20 +77,13 @@ static void test_xshm(Display *display, Visual *visual, int drawing_depth)
/* This seems to return success if the X server understands the XShm
protocol, regardless of whether XShm can actually be used or not... */
if (!XShmQueryExtension(display))
{
NSLog(@"XShm not supported by X server.");
NSLog(xshm_warning);
use_xshm = 0;
return;
}
{
int major, minor;
if (!XShmQueryVersion(display, &major, &minor, &use_xshm_pixmaps))
if (!XShmQueryExtension(display) ||
!XShmQueryVersion(display, &major, &minor, &use_xshm_pixmaps))
{
NSLog(@"XShm pixmaps not supported by X server.");
NSLog(@"XShm not supported by X server.");
NSLog(xshm_warning);
use_xshm = 0;
return;