gnustep/libs-back
0
0
Fork 0
mirror of https://github.com/gnustep/libs-back.git synced 2025-05-29 16:31:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move window creation to a private theme method.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/branches/theme_window_override@35136 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Gregory John Casamento 2012-05-02 06:16:09 +00:00
parent d4c29acec6
commit 4ab65eaadc
1 changed files with 74 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

130
Source/x11/XGServerWindow.m
View file

@ -43,6 +43,7 @@
#include <AppKit/NSWindow.h>
#include <AppKit/NSImage.h>
#include <AppKit/NSBitmapImageRep.h>
#include <GNUstepGUI/GSTheme.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
@ -94,6 +95,54 @@ static NSMapTable *windowtags = NULL;
static int last_win_num = 0;
@interface GSTheme (Backend)
- (Window) createWindowWithDisplay: (Display *)disp
parent: (Window)parent
X: (int)x
Y: (int)y
width: (unsigned int)width
height: (unsigned int)height
borderWidth: (unsigned int)borderWidth
depth: (int)depth
class: (unsigned int)cls
visual: (Visual *)visual
valuemask: (unsigned long)valuemask
attributes: (XSetWindowAttributes *)attrs;
@end
@implementation GSTheme (Backend)
// Create Window method...
- (Window) createWindowWithDisplay: (Display *)disp
parent: (Window)parent
X: (int)x
Y: (int)y
width: (unsigned int)width
height: (unsigned int)height
borderWidth: (unsigned int)borderWidth
depth: (int)depth
class: (unsigned int)cls
visual: (Visual *)visual
valuemask: (unsigned long)valuemask
attributes: (XSetWindowAttributes *)attrs
{
Window ident;
ident = XCreateWindow(disp,
parent,
x,
y,
width,
height,
borderWidth,
depth,
cls,
visual,
valuemask,
attrs);
return ident;
}
// End create window method...
@end
@interface NSCursor (BackendPrivate)
- (void *)_cid;
@end
@ -791,19 +840,19 @@ _get_next_prop_new_event(Display *display, XEvent *event, char *arg)
window->xwn_attrs.save_under = False;
window->xwn_attrs.override_redirect = False;
window->ident = [self createWindowWithDisplay: dpy
parent: window->root
X: NSMinX(frame)
Y: NSMinY(frame)
width: NSWidth(frame)
height: NSHeight(frame)
borderWidth: 0
depth: context->depth
class: CopyFromParent
visual: context->visual
valuemask: (CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect)
attributes: &window->xwn_attrs];
window->ident = [[GSTheme theme] createWindowWithDisplay: dpy
parent: window->root
X: NSMinX(frame)
Y: NSMinY(frame)
width: NSWidth(frame)
height: NSHeight(frame)
borderWidth: 0
depth: context->depth
class: CopyFromParent
visual: context->visual
valuemask: (CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect)
attributes: &window->xwn_attrs];
/*
window->ident = XCreateWindow(dpy, window->root,
NSMinX(frame), NSMinY(frame),
@ -1965,37 +2014,6 @@ _get_next_prop_new_event(Display *display, XEvent *event, char *arg)
}
}
// Create Window method...
- (Window) createWindowWithDisplay: (Display *)disp
parent: (Window)parent
X: (int)x
Y: (int)y
width: (unsigned int)width
height: (unsigned int)height
borderWidth: (unsigned int)borderWidth
depth: (int)depth
class: (unsigned int)cls
visual: (Visual *)visual
valuemask: (unsigned long)valuemask
attributes: (XSetWindowAttributes *)attrs
{
Window ident;
ident = XCreateWindow(disp,
parent,
x,
y,
width,
height,
borderWidth,
depth,
cls,
visual,
valuemask,
attrs);
return ident;
}
// End create window method...
- (int) window: (NSRect)frame : (NSBackingStoreType)type : (unsigned int)style
: (int)screen
{
@ -2052,18 +2070,18 @@ _get_next_prop_new_event(Display *display, XEvent *event, char *arg)
*/
window->xwn_attrs.override_redirect = False;
window->ident = [self createWindowWithDisplay: dpy
parent: window->root
X: NSMinX(frame)
Y: NSMinY(frame)
width: NSWidth(frame)
height: NSHeight(frame)
borderWidth: 0
depth: context->depth
class: CopyFromParent
visual: context->visual
valuemask: (CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect)
attributes: &window->xwn_attrs];
window->ident = [[GSTheme theme] createWindowWithDisplay: dpy
parent: window->root
X: NSMinX(frame)
Y: NSMinY(frame)
width: NSWidth(frame)
height: NSHeight(frame)
borderWidth: 0
depth: context->depth
class: CopyFromParent
visual: context->visual
valuemask: (CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect)
attributes: &window->xwn_attrs];
/*