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

Correct minor bugs in last changes.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@25393 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2007-08-15 13:42:36 +00:00
parent 32d116c7b2
commit 05a23a6aae
3 changed files with 31 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2007-08-15 Fred Kiefer <FredKiefer@gmx.de>
* Source/x11/XGServerWindow.m (-_checkWMSupports:,
-_tryRequestFrameExtents:): Correct minor errors.
* Source/art/ftfont.m (-coveredCharacterSet): Protect against
illegal characters.
2007-08-15 Fred Kiefer <FredKiefer@gmx.de>
* Source/x11/XGServerWindow.m: Add more EWMH methods and helper

4
Source/art/ftfont.m
View file

@ -896,6 +896,10 @@ static FT_Error ft_get_face(FTC_FaceID fid, FT_Library lib, FT_Pointer data, FT_
while (glyphindex != 0)
{
count++;
if (charcode >= 1114112)
{
break;
}
if (charcode == NSMaxRange(range))
{
range.length++;

25
Source/x11/XGServerWindow.m
View file

@ -568,7 +568,7 @@ static void setWindowHintsForStyle (Display *dpy, Window window,
Atom *data;
Atom supported;
if ((generic.wm & XGWM_EWMH) != 0)
if ((generic.wm & XGWM_EWMH) == 0)
{
return NO;
}
@ -599,6 +599,13 @@ _get_next_prop_new_event(Display *display, XEvent *event, char *arg)
{
XID *data = (XID*)arg;
/*
NSLog(@"Got Xevent type %d expected %d \n window %d expected %d \n atom %d expected %d \n state %d expected %d",
event->type, PropertyNotify,
event->xproperty.window, data[0],
event->xproperty.atom, data[1],
event->xproperty.state, PropertyNewValue);
*/
if (event->type == PropertyNotify &&
event->xproperty.window == data[0] &&
event->xproperty.atom == data[1] &&
@ -619,6 +626,14 @@ _get_next_prop_new_event(Display *display, XEvent *event, char *arg)
XID event_data[2];
NSDate *limit;
if (_net_frame_extents == None)
{
_net_frame_extents = XInternAtom(dpy, "_NET_FRAME_EXTENTS", False);
}
event_data[0] = window->ident;
event_data[1] = _net_frame_extents;
if (_net_request_frame_extents == None)
{
_net_request_frame_extents = XInternAtom(dpy, "_NET_REQUEST_FRAME_EXTENTS",
@ -627,12 +642,10 @@ _get_next_prop_new_event(Display *display, XEvent *event, char *arg)
if (![self _checkWMSupports: _net_request_frame_extents])
{
NSLog(@"_NET_REQUEST_FRAME_EXTENTS not supported");
return NO;
}
event_data[0] = window->ident;
event_data[1] = _net_request_frame_extents;
[self _sendRoot: window->root
type: _net_request_frame_extents
window: window->ident
@ -663,6 +676,8 @@ _get_next_prop_new_event(Display *display, XEvent *event, char *arg)
}
}
NSLog(@"_NET_REQUEST_FRAME_EXTENTS no reply");
return NO;
}
@ -747,7 +762,7 @@ _get_next_prop_new_event(Display *display, XEvent *event, char *arg)
| EnterWindowMask
| LeaveWindowMask
| FocusChangeMask
// | PropertyChangeMask
| PropertyChangeMask
// | ColormapChangeMask
| KeymapStateMask
| VisibilityChangeMask