* Platform/X11/X11GLNative.cs: Fullscreen toggling support through NET

WM.
This commit is contained in:
the_fiddler 2008-04-25 21:49:24 +00:00
parent cfcb861ad4
commit c33e34456d

View file

@ -627,10 +627,10 @@ namespace OpenTK.Platform.X11
if (minimized) if (minimized)
return WindowState.Minimized; return WindowState.Minimized;
else if (fullscreen) // Must come before maximized!
return OpenTK.WindowState.Fullscreen;
else if (maximized == 2) else if (maximized == 2)
return OpenTK.WindowState.Maximized; return OpenTK.WindowState.Maximized;
else if (fullscreen)
return OpenTK.WindowState.Fullscreen;
attributes = new XWindowAttributes(); attributes = new XWindowAttributes();
Functions.XGetWindowAttributes(window.Display, window.WindowHandle, ref attributes); Functions.XGetWindowAttributes(window.Display, window.WindowHandle, ref attributes);
@ -651,54 +651,48 @@ namespace OpenTK.Platform.X11
if (current_state == OpenTK.WindowState.Minimized) if (current_state == OpenTK.WindowState.Minimized)
Functions.XMapWindow(window.Display, window.WindowHandle); Functions.XMapWindow(window.Display, window.WindowHandle);
else if (current_state == OpenTK.WindowState.Fullscreen)
switch (value)
{
case OpenTK.WindowState.Normal:
if (current_state == OpenTK.WindowState.Maximized ||
current_state == OpenTK.WindowState.Fullscreen)
{ {
WindowBorder = _previous_window_border;
Functions.SendNetWMMessage(window, _atom_wm_state, _atom_state_toggle,
_atom_wm_state_fullscreen,
IntPtr.Zero);
}
else if (current_state == OpenTK.WindowState.Maximized)
Functions.SendNetWMMessage(window, _atom_wm_state, _atom_state_toggle, Functions.SendNetWMMessage(window, _atom_wm_state, _atom_state_toggle,
_atom_wm_state_maximized_horizontal, _atom_wm_state_maximized_horizontal,
_atom_wm_state_maximized_vertical); _atom_wm_state_maximized_vertical);
if (current_state == WindowState.Fullscreen) switch (value)
WindowBorder = _previous_window_border; {
} case OpenTK.WindowState.Normal:
else if (current_state == OpenTK.WindowState.Minimized)
Functions.XMapWindow(window.Display, window.WindowHandle);
Functions.XRaiseWindow(window.Display, window.WindowHandle); Functions.XRaiseWindow(window.Display, window.WindowHandle);
break; break;
case OpenTK.WindowState.Maximized: case OpenTK.WindowState.Maximized:
case OpenTK.WindowState.Fullscreen:
if (current_state == WindowState.Minimized)
Functions.XMapWindow(window.Display, window.WindowHandle);
Functions.SendNetWMMessage(window, _atom_wm_state, _atom_state_enable, Functions.SendNetWMMessage(window, _atom_wm_state, _atom_state_enable,
_atom_wm_state_maximized_horizontal, _atom_wm_state_maximized_horizontal,
_atom_wm_state_maximized_vertical); _atom_wm_state_maximized_vertical);
if (this.WindowState == WindowState.Fullscreen)
{
_previous_window_border = this.WindowBorder;
this.WindowBorder = WindowBorder.Hidden;
}
Functions.XRaiseWindow(window.Display, window.WindowHandle); Functions.XRaiseWindow(window.Display, window.WindowHandle);
break; break;
case WindowState.Minimized: case WindowState.Minimized:
if (current_state == WindowState.Maximized || current_state == WindowState.Fullscreen)
Functions.SendNetWMMessage(window, _atom_wm_state, _atom_state_toggle,
_atom_wm_state_maximized_horizontal,
_atom_wm_state_maximized_vertical);
// FIXME multiscreen support // FIXME multiscreen support
Functions.XIconifyWindow(window.Display, window.WindowHandle, window.Screen); Functions.XIconifyWindow(window.Display, window.WindowHandle, window.Screen);
break;
case WindowState.Fullscreen:
_previous_window_border = this.WindowBorder;
this.WindowBorder = WindowBorder.Hidden;
Functions.SendNetWMMessage(window, _atom_wm_state, _atom_state_enable,
_atom_wm_state_fullscreen,
IntPtr.Zero);
break; break;
} }
} }