-
Notifications
You must be signed in to change notification settings - Fork 1
Add per-game virtual desktop resolution configuration #14
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
aegispotae
wants to merge
1
commit into
italomandara:main
Choose a base branch
from
aegispotae:configres
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,3 @@ | ||
| Config.xcconfig | ||
| .DS_Store | ||
| xcuserdata/ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,112 @@ | ||
| // | ||
| // Resolution.swift | ||
| // Procyon | ||
| // | ||
| // Resolution configuration for CrossOver bottles using Wine registry. | ||
| // Based on CXRes logic. | ||
| // | ||
|
|
||
| import AppKit | ||
|
|
||
| struct ResolutionProfile: Codable, Identifiable, Equatable, Hashable { | ||
| var id = UUID() | ||
| var name: String | ||
| var resolution: String | ||
| } | ||
|
|
||
| struct ResolutionState { | ||
| var isVirtualDesktopEnabled: Bool | ||
| var resolution: String // e.g. "1920x1080" | ||
| var dpi: UInt32 // e.g. 96 | ||
| } | ||
|
|
||
| class BottleResolutionManager { | ||
| private let bottleURL: URL | ||
| private let registryFile: WineRegistryFile | ||
|
|
||
| private let explorerPath = "Software\\\\Wine\\\\Explorer" | ||
| private let desktopsPath = "Software\\\\Wine\\\\Explorer\\\\Desktops" | ||
| private let fontsPath = "Software\\\\Wine\\\\Fonts" | ||
|
|
||
| init(bottleURL: URL) { | ||
| self.bottleURL = bottleURL | ||
| let regURL = bottleURL.appendingPathComponent("user.reg") | ||
| self.registryFile = WineRegistryFile(fileURL: regURL) | ||
| } | ||
|
|
||
| // MARK: - Read | ||
|
|
||
| func loadCurrentState() throws -> ResolutionState { | ||
| try registryFile.load() | ||
|
|
||
| let explorerSection = registryFile.section(forPath: explorerPath) | ||
| let desktopsSection = registryFile.section(forPath: desktopsPath) | ||
| let fontsSection = registryFile.section(forPath: fontsPath) | ||
|
|
||
| let desktopValue = explorerSection?.getValue(forKey: "Desktop") ?? "" | ||
| let isEnabled = !desktopValue.isEmpty | ||
| let resolution = desktopsSection?.getValue(forKey: "Default") ?? "1920x1080" | ||
| let dpiStr = fontsSection?.getValue(forKey: "LogPixels") ?? "96" | ||
| let dpi = UInt32(dpiStr) ?? 96 | ||
|
|
||
| return ResolutionState( | ||
| isVirtualDesktopEnabled: isEnabled, | ||
| resolution: resolution, | ||
| dpi: dpi | ||
| ) | ||
| } | ||
|
|
||
| // MARK: - Write | ||
|
|
||
| func applyResolution(_ resolution: String?, dpi: UInt32? = nil) throws { | ||
| try registryFile.load() | ||
|
|
||
| let explorerSection = registryFile.section(forPath: explorerPath) | ||
| let desktopsSection = registryFile.section(forPath: desktopsPath) | ||
|
|
||
| if let resolution = resolution { | ||
| // Enable virtual desktop with given resolution | ||
| explorerSection?.addOrSetValue(forKey: "Desktop", stringValue: "Default") | ||
| desktopsSection?.addOrSetValue(forKey: "Default", stringValue: resolution) | ||
| console.log("Setting resolution to \(resolution)") | ||
| } else { | ||
| // Disable virtual desktop | ||
| explorerSection?.addOrSetValue(forKey: "Desktop", stringValue: "") | ||
| console.log("Disabling virtual desktop") | ||
| } | ||
|
|
||
| if let dpi = dpi { | ||
| let fontsSection = registryFile.section(forPath: fontsPath) | ||
| fontsSection?.setDword(forKey: "LogPixels", value: dpi) | ||
| console.log("Setting DPI to \(dpi)") | ||
| } | ||
|
|
||
| try registryFile.save() | ||
| } | ||
|
|
||
| func disableVirtualDesktop() throws { | ||
| try applyResolution(nil) | ||
| } | ||
|
|
||
| // MARK: - Display detection | ||
|
|
||
| static func detectDisplayProfiles() -> [ResolutionProfile] { | ||
| let screens = NSScreen.screens | ||
| guard !screens.isEmpty else { | ||
| return [ResolutionProfile(name: "Default", resolution: "1920x1080")] | ||
| } | ||
| var profiles: [ResolutionProfile] = [] | ||
| var seen = Set<String>() | ||
| for screen in screens { | ||
| let backing = screen.convertRectToBacking(screen.frame) | ||
| let w = Int(backing.width) | ||
| let h = Int(backing.height) | ||
| let res = "\(w)x\(h)" | ||
| guard !seen.contains(res) else { continue } | ||
| seen.insert(res) | ||
| let name = screen == screens.first ? "Built-in" : "External" | ||
| profiles.append(ResolutionProfile(name: name, resolution: res)) | ||
| } | ||
| return profiles | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we probably won't need the resolution configuration, there's an incoming fix in crossover preview that will be ready on the next minor release
3Shain/dxmt#140 (comment)