diff -Nru fs-uae-arcade-2.5.31dev/debian/changelog fs-uae-arcade-2.5.32dev/debian/changelog
--- fs-uae-arcade-2.5.31dev/debian/changelog 2015-06-05 20:14:25.000000000 +0000
+++ fs-uae-arcade-2.5.32dev/debian/changelog 2015-06-13 21:41:48.000000000 +0000
@@ -1,4 +1,4 @@
-fs-uae-arcade (2.5.31dev-0utopic) utopic; urgency=low
+fs-uae-arcade (2.5.32dev-0utopic) utopic; urgency=low
* Dummy changelog entry
diff -Nru fs-uae-arcade-2.5.31dev/dist/macosx/Info.plist fs-uae-arcade-2.5.32dev/dist/macosx/Info.plist
--- fs-uae-arcade-2.5.31dev/dist/macosx/Info.plist 2015-06-05 20:12:20.000000000 +0000
+++ fs-uae-arcade-2.5.32dev/dist/macosx/Info.plist 2015-06-13 21:38:48.000000000 +0000
@@ -19,11 +19,11 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 2.5.31
+ 2.5.32
CFBundleSignature
????
CFBundleVersion
- 2.5.31
+ 2.5.32
LSHasLocalizedDisplayName
LSMinimumSystemVersion
diff -Nru fs-uae-arcade-2.5.31dev/fsgs/runner.py fs-uae-arcade-2.5.32dev/fsgs/runner.py
--- fs-uae-arcade-2.5.31dev/fsgs/runner.py 2015-06-05 20:12:20.000000000 +0000
+++ fs-uae-arcade-2.5.32dev/fsgs/runner.py 2015-06-13 21:38:48.000000000 +0000
@@ -135,11 +135,12 @@
def screen_size(self):
refresh_rate_tool = RefreshRateTool()
+ # FIXME: screen size monitor size
width = refresh_rate_tool.get_current_mode()["width"]
height = refresh_rate_tool.get_current_mode()["height"]
- if width > 2 * height:
- print("width > 2 * height, assuming dual-monitor setup...")
- return width // 2, height
+ # if width > 2 * height:
+ # print("width > 2 * height, assuming dual-monitor setup...")
+ # return width // 2, height
return width, height
def get_screen_width(self):
diff -Nru fs-uae-arcade-2.5.31dev/fs-uae-arcade fs-uae-arcade-2.5.32dev/fs-uae-arcade
--- fs-uae-arcade-2.5.31dev/fs-uae-arcade 2015-06-05 20:12:21.000000000 +0000
+++ fs-uae-arcade-2.5.32dev/fs-uae-arcade 2015-06-13 21:38:49.000000000 +0000
@@ -19,7 +19,7 @@
FSGSDirectories.initialize()
socket.setdefaulttimeout(30.0)
-initialize_application("fs-uae-arcade", version="2.5.31dev", series="devel")
+initialize_application("fs-uae-arcade", version="2.5.32dev", series="devel")
os.environ["SDL_VIDEO_MAC_FULLSCREEN_SPACES"] = "0"
try:
diff -Nru fs-uae-arcade-2.5.31dev/fs-uae-arcade.spec fs-uae-arcade-2.5.32dev/fs-uae-arcade.spec
--- fs-uae-arcade-2.5.31dev/fs-uae-arcade.spec 2015-06-05 20:12:21.000000000 +0000
+++ fs-uae-arcade-2.5.32dev/fs-uae-arcade.spec 2015-06-13 21:38:49.000000000 +0000
@@ -1,6 +1,6 @@
%define name fs-uae-arcade
-%define version 2.5.31dev
-%define unmangled_version 2.5.31dev
+%define version 2.5.32dev
+%define unmangled_version 2.5.32dev
%define release 1%{?dist}
Summary: Fullscreen game browser for FS-UAE
diff -Nru fs-uae-arcade-2.5.31dev/game_center/main.py fs-uae-arcade-2.5.32dev/game_center/main.py
--- fs-uae-arcade-2.5.31dev/game_center/main.py 2015-06-05 20:12:21.000000000 +0000
+++ fs-uae-arcade-2.5.32dev/game_center/main.py 2015-06-13 21:38:49.000000000 +0000
@@ -180,6 +180,16 @@
app.settings["game-center:top-clock"] = "1" if use_top_clock else "0"
app.settings["game-center:top-logo"] = "1" if use_top_logo else "0"
+ monitor = "middle-left"
+ for arg in sys.argv:
+ if arg.startswith("--monitor="):
+ monitor = arg[10:]
+ app.settings["monitor"] = monitor
+ break
+ else:
+ if app.settings["monitor"]:
+ monitor = app.settings["monitor"]
+
if macosx and use_fullscreen and use_fullscreen_window:
# noinspection PyUnresolvedReferences
import objc
@@ -211,6 +221,26 @@
if use_fullscreen:
# fs_width += 1
main_window.resize(fs_width, fs_height)
+
+ desktop = application.qapplication.desktop()
+ screens = []
+ for i in range(desktop.screenCount()):
+ geometry = desktop.screenGeometry(i)
+ screens.append([geometry.x(), i, geometry])
+ screens.sort()
+ if monitor == "left":
+ mon = 0
+ elif monitor == "middle-right":
+ mon = 2
+ elif monitor == "right":
+ mon = 3
+ else: # middle-left
+ mon = 1
+ display = round(mon / 3 * (len(screens) - 1))
+ geometry = screens[display][2]
+
+ main_window.setGeometry(geometry)
+
if use_fullscreen_window:
print("using fullscreen window")
@@ -227,6 +257,7 @@
# main_window.activateWindow()
else:
main_window.showFullScreen()
+ # main_window.windowHandle().setScreen(screen)
else:
if not use_window_decorations:
main_window.setWindowFlags(Qt.FramelessWindowHint)
diff -Nru fs-uae-arcade-2.5.31dev/game_center/qtui/qtwindow.py fs-uae-arcade-2.5.32dev/game_center/qtui/qtwindow.py
--- fs-uae-arcade-2.5.31dev/game_center/qtui/qtwindow.py 2015-06-05 20:12:21.000000000 +0000
+++ fs-uae-arcade-2.5.32dev/game_center/qtui/qtwindow.py 2015-06-13 21:38:49.000000000 +0000
@@ -50,7 +50,7 @@
else:
self.setWindowTitle("FS Game Center")
self.gl_widget = GLWidget(self, callback)
- if not "--show-cursor" in sys.argv:
+ if "--show-cursor" not in sys.argv:
self.setCursor(Qt.BlankCursor)
self.gl_widget.setCursor(Qt.BlankCursor)
self.setCentralWidget(self.gl_widget)
diff -Nru fs-uae-arcade-2.5.31dev/setup.py fs-uae-arcade-2.5.32dev/setup.py
--- fs-uae-arcade-2.5.31dev/setup.py 2015-06-05 20:12:20.000000000 +0000
+++ fs-uae-arcade-2.5.32dev/setup.py 2015-06-13 21:38:48.000000000 +0000
@@ -20,7 +20,7 @@
name = "fs-uae-arcade"
py_name = "fs_uae_arcade"
tar_name = "fs-uae-arcade"
-version = "2.5.31dev"
+version = "2.5.32dev"
author = "Frode Solheim"
author_email = "frode@fs-uae.net"
package_map = {
@@ -120,7 +120,7 @@
else:
setup_kwargs["executables"] = [Executable(s) for s in scripts]
- setup_kwargs["version"] = "2.5.31"
+ setup_kwargs["version"] = "2.5.32"
build_exe_options = {
"includes": [
# "ctypes",
@@ -168,7 +168,7 @@
if sys.platform == "darwin":
setup_kwargs["name"] = title
- setup_kwargs["version"] = "2.5.31"
+ setup_kwargs["version"] = "2.5.32"
else:
setup_kwargs["scripts"] = scripts
diff -Nru fs-uae-arcade-2.5.31dev/VERSION fs-uae-arcade-2.5.32dev/VERSION
--- fs-uae-arcade-2.5.31dev/VERSION 2015-06-05 20:12:21.000000000 +0000
+++ fs-uae-arcade-2.5.32dev/VERSION 2015-06-13 21:38:49.000000000 +0000
@@ -1 +1 @@
-2.5.31dev
+2.5.32dev