Don't request colormap and property notifications that we don't use

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@23605 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2006-09-24 18:21:21 +00:00
parent 1b6a91ff4d
commit 38c35f71c3
2 changed files with 23 additions and 13 deletions

View file

@ -351,7 +351,7 @@ _parse_display_name(NSString *name, int *dn, int *sn)
@implementation XGServer
/* Initialize AppKit backend */
+ (void)initializeBackend
+ (void) initializeBackend
{
NSDebugLog(@"Initializing GNUstep x11 backend.\n");
[GSDisplayServer setDefaultServerClass: [XGServer class]];
@ -367,7 +367,7 @@ _parse_display_name(NSString *name, int *dn, int *sn)
return [(XGServer*)GSCurrentServer() xDisplay];
}
- _initXContext
- (id) _initXContext
{
int screen_number, display_number;
NSString *display_name;
@ -376,7 +376,8 @@ _parse_display_name(NSString *name, int *dn, int *sn)
display_name = [server_info objectForKey: GSDisplayName];
if (display_name == nil)
{
NSString *host = [[NSUserDefaults standardUserDefaults] stringForKey: @"NSHost"];
NSString *host = [[NSUserDefaults standardUserDefaults]
stringForKey: @"NSHost"];
NSString *dn = [server_info objectForKey: GSDisplayNumber];
NSString *sn = [server_info objectForKey: GSScreenNumber];
@ -540,7 +541,7 @@ _parse_display_name(NSString *name, int *dn, int *sn)
Returns the closest color in the current colormap to the indicated
X color
*/
- (XColor)xColorFromColor: (XColor)color forScreen: (int)screen_number
- (XColor) xColorFromColor: (XColor)color forScreen: (int)screen_number
{
Status ret;
RColor rcolor;

View file

@ -1234,15 +1234,24 @@ static void setWindowHintsForStyle (Display *dpy, Window window,
valuemask = (GCForeground | GCBackground | GCFunction);
window->gc = XCreateGC(dpy, window->ident, valuemask, &values);
// Set the X event mask
XSelectInput(dpy, window->ident, ExposureMask | KeyPressMask |
KeyReleaseMask | ButtonPressMask |
ButtonReleaseMask | ButtonMotionMask |
StructureNotifyMask | PointerMotionMask |
EnterWindowMask | LeaveWindowMask |
FocusChangeMask | PropertyChangeMask |
ColormapChangeMask | KeymapStateMask |
VisibilityChangeMask);
/* Set the X event mask
*/
XSelectInput(dpy, window->ident, ExposureMask
| KeyPressMask
| KeyReleaseMask
| ButtonPressMask
| ButtonReleaseMask
| ButtonMotionMask
| StructureNotifyMask
| PointerMotionMask
| EnterWindowMask
| LeaveWindowMask
| FocusChangeMask
// | PropertyChangeMask
// | ColormapChangeMask
| KeymapStateMask
| VisibilityChangeMask
);
/*
* Initial attributes for any GNUstep window tell Window Maker not to