src/video/x11/SDL_x11window.c
changeset 6486 e3264eea9607
parent 6485 3f600ccf393c
child 6487 b18a011ecc45
     1.1 --- a/src/video/x11/SDL_x11window.c	Fri Sep 28 01:15:48 2012 -0700
     1.2 +++ b/src/video/x11/SDL_x11window.c	Fri Sep 28 01:36:26 2012 -0700
     1.3 @@ -118,16 +118,21 @@
     1.4  X11_GetWMStateProperty(_THIS, Uint32 flags, Atom atoms[5])
     1.5  {
     1.6      SDL_VideoData *videodata = (SDL_VideoData *) _this->driverdata;
     1.7 -    Atom _NET_WM_STATE_HIDDEN = videodata->_NET_WM_STATE_HIDDEN;
     1.8 +    /*Atom _NET_WM_STATE_HIDDEN = videodata->_NET_WM_STATE_HIDDEN;*/
     1.9      Atom _NET_WM_STATE_FOCUSED = videodata->_NET_WM_STATE_FOCUSED;
    1.10      Atom _NET_WM_STATE_MAXIMIZED_VERT = videodata->_NET_WM_STATE_MAXIMIZED_VERT;
    1.11      Atom _NET_WM_STATE_MAXIMIZED_HORZ = videodata->_NET_WM_STATE_MAXIMIZED_HORZ;
    1.12      Atom _NET_WM_STATE_FULLSCREEN = videodata->_NET_WM_STATE_FULLSCREEN;
    1.13      int count = 0;
    1.14  
    1.15 +    /* The window manager sets this property, we shouldn't set it.
    1.16 +       If we did, this would indicate to the window manager that we don't
    1.17 +       actually want to be mapped during XMapRaised(), which would be bad.
    1.18 +     *
    1.19      if (flags & SDL_WINDOW_HIDDEN) {
    1.20          atoms[count++] = _NET_WM_STATE_HIDDEN;
    1.21      }
    1.22 +    */
    1.23      if (flags & SDL_WINDOW_INPUT_FOCUS) {
    1.24          atoms[count++] = _NET_WM_STATE_FOCUSED;
    1.25      }
    1.26 @@ -169,7 +174,7 @@
    1.27  
    1.28          for (i = 0; i < numItems; ++i) {
    1.29              if (atoms[i] == _NET_WM_STATE_HIDDEN) {
    1.30 -                flags |= (SDL_WINDOW_HIDDEN|SDL_WINDOW_MINIMIZED);
    1.31 +                flags |= SDL_WINDOW_HIDDEN;
    1.32              } else if (atoms[i] == _NET_WM_STATE_FOCUSED) {
    1.33                  flags |= SDL_WINDOW_INPUT_FOCUS;
    1.34              } else if (atoms[i] == _NET_WM_STATE_MAXIMIZED_VERT) {