ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-07-08 21:40:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Restore resolution available on OpenTK startup, not on X11 startup.

Browse source
This commit is contained in:
the_fiddler 2008-01-27 14:23:13 +00:00
parent 5776585303
commit 7198c69f11
1 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
Source/OpenTK/Platform/X11/X11XrandrDisplayDevice.cs
View file

@ -24,9 +24,10 @@ namespace OpenTK.Platform.X11
// size_index (needed for XRRSetScreenConfig). The size_index // size_index (needed for XRRSetScreenConfig). The size_index
// is simply the sequence number of the resolution as returned by // is simply the sequence number of the resolution as returned by
// XRRSizes. This is done per available screen. // XRRSizes. This is done per available screen.
// The default size for all screens is 0 - no need to store that separately.
static List<Dictionary<DisplayResolution, int>> screenResolutionToIndex = static List<Dictionary<DisplayResolution, int>> screenResolutionToIndex =
new List<Dictionary<DisplayResolution, int>>(); new List<Dictionary<DisplayResolution, int>>();
// Store a mapping between DisplayDevices and their default resolutions.
static Dictionary<DisplayDevice, int> deviceToDefaultResolution = new Dictionary<DisplayDevice, int>();
// Store a mapping between DisplayDevices and X11 screens. // Store a mapping between DisplayDevices and X11 screens.
static Dictionary<DisplayDevice, int> deviceToScreen = new Dictionary<DisplayDevice, int>(); static Dictionary<DisplayDevice, int> deviceToScreen = new Dictionary<DisplayDevice, int>();
// Keep the time when the config of each screen was last updated. // Keep the time when the config of each screen was last updated.
@ -75,14 +76,25 @@ namespace OpenTK.Platform.X11
++resolution_count; ++resolution_count;
} }
float current_refresh_rate = FindCurrentRefreshRate(screen);
int current_depth = FindCurrentDepth(screen);
// The default resolution (but not refresh rate) is the first one in available_res. // The resolution of the current DisplayDevice is discovered through XRRConfigCurrentConfiguration.
// Its refresh rate is discovered by the FindCurrentRefreshRate call. // Its refresh rate is discovered by the FindCurrentRefreshRate call.
// Its depth is discovered by the FindCurrentDepth call. // Its depth is discovered by the FindCurrentDepth call.
deviceToScreen.Add(new DisplayDevice(new DisplayResolution(available_res[0].Width, available_res[0].Height, current_depth, current_refresh_rate), float current_refresh_rate = FindCurrentRefreshRate(screen);
screen == API.DefaultScreen, available_res), screen); int current_depth = FindCurrentDepth(screen);
IntPtr screen_config = Functions.XRRGetScreenInfo(API.DefaultDisplay, Functions.XRootWindow(API.DefaultDisplay, screen));
ushort current_rotation; // Not needed.
int current_resolution_index = Functions.XRRConfigCurrentConfiguration(screen_config, out current_rotation);
DisplayDevice current_device = new DisplayDevice(
new DisplayResolution(
available_res[current_resolution_index].Width,
available_res[current_resolution_index].Height,
current_depth, current_refresh_rate),
screen == API.DefaultScreen, available_res);
deviceToScreen.Add(current_device, screen);
deviceToDefaultResolution.Add(current_device, current_resolution_index);
} }
} }
@ -156,7 +168,7 @@ namespace OpenTK.Platform.X11
new_resolution_index = screenResolutionToIndex[screen] new_resolution_index = screenResolutionToIndex[screen]
[new DisplayResolution(resolution.Width, resolution.Height, resolution.BitsPerPixel, 0)]; [new DisplayResolution(resolution.Width, resolution.Height, resolution.BitsPerPixel, 0)];
else else
new_resolution_index = 0; new_resolution_index = deviceToDefaultResolution[device];
Debug.Print("Changing size of screen {0} from {1} to {2}", Debug.Print("Changing size of screen {0} from {1} to {2}",
screen, current_resolution_index, new_resolution_index); screen, current_resolution_index, new_resolution_index);