pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplified the X11 window creation

Browse source
This commit is contained in:
Sam Lantinga 2011-02-21 22:52:31 -08:00
parent f817468a0b
commit 642eea1ebc
1 changed files with 10 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

47
src/video/x11/SDL_x11window.c
View file

@ -265,20 +265,15 @@ X11_CreateWindow(_THIS, SDL_Window * window)
Visual *visual; Visual *visual;
int depth; int depth;
XSetWindowAttributes xattr; XSetWindowAttributes xattr;
int x, y;
Window w; Window w;
XSizeHints *sizehints; XSizeHints *sizehints;
XWMHints *wmhints; XWMHints *wmhints;
XClassHint *classhints; XClassHint *classhints;
SDL_bool oldstyle_fullscreen;
Atom _NET_WM_WINDOW_TYPE; Atom _NET_WM_WINDOW_TYPE;
Atom _NET_WM_WINDOW_TYPE_NORMAL; Atom _NET_WM_WINDOW_TYPE_NORMAL;
int wmstate_count; int wmstate_count;
Atom wmstate_atoms[3]; Atom wmstate_atoms[3];
/* ICCCM2.0-compliant window managers can handle fullscreen windows */
oldstyle_fullscreen = X11_IsWindowOldFullscreen(_this, window);
#if SDL_VIDEO_DRIVER_X11_XINERAMA #if SDL_VIDEO_DRIVER_X11_XINERAMA
/* FIXME /* FIXME
if ( use_xinerama ) { if ( use_xinerama ) {
@ -318,36 +313,14 @@ X11_CreateWindow(_THIS, SDL_Window * window)
depth = displaydata->depth; depth = displaydata->depth;
} }
if (oldstyle_fullscreen) {
xattr.override_redirect = True;
} else {
xattr.override_redirect = False; xattr.override_redirect = False;
}
xattr.background_pixel = 0; xattr.background_pixel = 0;
xattr.border_pixel = 0; xattr.border_pixel = 0;
xattr.colormap = XCreateColormap(display, RootWindow(display, screen), visual, AllocNone); xattr.colormap = XCreateColormap(display, RootWindow(display, screen), visual, AllocNone);
if (oldstyle_fullscreen w = XCreateWindow(display, RootWindow(display, screen),
|| SDL_WINDOWPOS_ISCENTERED(window->x)) { window->x, window->y, window->w, window->h,
X11_GetDisplaySize(_this, window, &x, NULL); 0, depth, InputOutput, visual,
x = (x - window->w) / 2;
} else if (SDL_WINDOWPOS_ISUNDEFINED(window->x)) {
x = 0;
} else {
x = window->x;
}
if (oldstyle_fullscreen
|| SDL_WINDOWPOS_ISCENTERED(window->y)) {
X11_GetDisplaySize(_this, window, NULL, &y);
y = (y - window->h) / 2;
} else if (SDL_WINDOWPOS_ISUNDEFINED(window->y)) {
y = 0;
} else {
y = window->y;
}
w = XCreateWindow(display, RootWindow(display, screen), x, y,
window->w, window->h, 0, depth, InputOutput, visual,
(CWOverrideRedirect | CWBackPixel | CWBorderPixel | (CWOverrideRedirect | CWBackPixel | CWBorderPixel |
CWColormap), &xattr); CWColormap), &xattr);
if (!w) { if (!w) {
@ -370,24 +343,19 @@ X11_CreateWindow(_THIS, SDL_Window * window)
sizehints = XAllocSizeHints(); sizehints = XAllocSizeHints();
if (sizehints) { if (sizehints) {
if (!(window->flags & SDL_WINDOW_RESIZABLE) if (!(window->flags & SDL_WINDOW_RESIZABLE)) {
|| oldstyle_fullscreen) {
sizehints->min_width = sizehints->max_width = window->w; sizehints->min_width = sizehints->max_width = window->w;
sizehints->min_height = sizehints->max_height = window->h; sizehints->min_height = sizehints->max_height = window->h;
sizehints->flags = PMaxSize | PMinSize; sizehints->flags = PMaxSize | PMinSize;
} }
if (!oldstyle_fullscreen sizehints->x = window->x;
&& !SDL_WINDOWPOS_ISUNDEFINED(window->x) sizehints->y = window->y;
&& !SDL_WINDOWPOS_ISUNDEFINED(window->y)) {
sizehints->x = x;
sizehints->y = y;
sizehints->flags |= USPosition; sizehints->flags |= USPosition;
}
XSetWMNormalHints(display, w, sizehints); XSetWMNormalHints(display, w, sizehints);
XFree(sizehints); XFree(sizehints);
} }
if ((window->flags & SDL_WINDOW_BORDERLESS) || oldstyle_fullscreen) { if (window->flags & SDL_WINDOW_BORDERLESS) {
SDL_bool set; SDL_bool set;
Atom WM_HINTS; Atom WM_HINTS;
@ -512,6 +480,7 @@ X11_CreateWindow(_THIS, SDL_Window * window)
XDestroyWindow(display, w); XDestroyWindow(display, w);
return -1; return -1;
} }
#ifdef X_HAVE_UTF8_STRING #ifdef X_HAVE_UTF8_STRING
{ {
Uint32 fevent = 0; Uint32 fevent = 0;