Author: duncan
Date: Mon Feb 25 17:33:19 2008
New Revision: 10445
Log:
Added OSD_X11_CURSORS to allow no cursor when running xine
Modified:
branches/rel-1-7/freevo/freevo_config.py
branches/rel-1-7/freevo/local_conf.py.example
branches/rel-1-7/freevo/src/main.py
branches/rel-1/freevo/freevo_config.py
branches/rel-1/freevo/local_conf.py.example
branches/rel-1/freevo/src/main.py
Modified: branches/rel-1-7/freevo/freevo_config.py
==============================================================================
--- branches/rel-1-7/freevo/freevo_config.py (original)
+++ branches/rel-1-7/freevo/freevo_config.py Mon Feb 25 17:33:19 2008
@@ -347,6 +347,7 @@
'''),
(5.23,
''' Added XMLTV_TIMEZONE to allow the time zone to be specified
+ Added OSD_X11_CURSORS to allow custom cursor to be set, stops xine
showing a cursor
'''),
]
@@ -1352,9 +1353,17 @@
#
OSD_SDL_EXEC_AFTER_CLOSE = ""
+#
+# Number of pixels to move the display to centre the OSD on the display
+#
OSD_OVERSCAN_LEFT = OSD_OVERSCAN_RIGHT = 0
OSD_OVERSCAN_TOP = OSD_OVERSCAN_BOTTOM = 0
+#
+# Setting the cursors when freevo is run in fullscreen mode
+#
+OSD_X11_CURSORS = None
+
# Exec a script after the osd startup. Matrox G400 users who wants to
# use the framebuffer and have a PAL tv may set this to
Modified: branches/rel-1-7/freevo/local_conf.py.example
==============================================================================
--- branches/rel-1-7/freevo/local_conf.py.example (original)
+++ branches/rel-1-7/freevo/local_conf.py.example Mon Feb 25 17:33:19 2008
@@ -924,6 +924,12 @@
# OSD_OVERSCAN_TOP = OSD_OVERSCAN_BOTTOM = 0
#
+# Setting the cursors when freevo is run in fullscreen mode
+#
+# OSD_X11_CURSORS = '/usr/lib/X11/cursors/black.cursor
/usr/lib/X11/cursors/blank.cursor'
+
+
+#
# Execute a script on OSD startup.
#
# OSD_SDL_EXEC_AFTER_STARTUP = ""
Modified: branches/rel-1-7/freevo/src/main.py
==============================================================================
--- branches/rel-1-7/freevo/src/main.py (original)
+++ branches/rel-1-7/freevo/src/main.py Mon Feb 25 17:33:19 2008
@@ -370,7 +370,11 @@
# force fullscreen mode
# deactivate screen blanking and set osd to fullscreen
if sys.argv[1] == '--force-fs':
+ _debug_('os.system(\'xset -dpms s off\')')
os.system('xset -dpms s off')
+ if config.OSD_X11_CURSORS is not None:
+ _debug_('os.system(\'xsetroot -cursor %s\')' %
config.OSD_X11_CURSORS)
+ os.system('xsetroot -cursor %s' % config.OSD_X11_CURSORS)
config.START_FULLSCREEN_X = 1
# activate a trace function
Modified: branches/rel-1/freevo/freevo_config.py
==============================================================================
--- branches/rel-1/freevo/freevo_config.py (original)
+++ branches/rel-1/freevo/freevo_config.py Mon Feb 25 17:33:19 2008
@@ -348,6 +348,7 @@
'''),
(5.23,
''' Added XMLTV_TIMEZONE to allow the time zone to be specified
+ Added OSD_X11_CURSORS to allow custom cursor to be set, stops xine
showing a cursor
'''),
]
@@ -1353,9 +1354,17 @@
#
OSD_SDL_EXEC_AFTER_CLOSE = ""
+#
+# Number of pixels to move the display to centre the OSD on the display
+#
OSD_OVERSCAN_LEFT = OSD_OVERSCAN_RIGHT = 0
OSD_OVERSCAN_TOP = OSD_OVERSCAN_BOTTOM = 0
+#
+# Setting the cursors when freevo is run in fullscreen mode
+#
+OSD_X11_CURSORS = None
+
# Exec a script after the osd startup. Matrox G400 users who wants to
# use the framebuffer and have a PAL tv may set this to
Modified: branches/rel-1/freevo/local_conf.py.example
==============================================================================
--- branches/rel-1/freevo/local_conf.py.example (original)
+++ branches/rel-1/freevo/local_conf.py.example Mon Feb 25 17:33:19 2008
@@ -924,6 +924,12 @@
# OSD_OVERSCAN_TOP = OSD_OVERSCAN_BOTTOM = 0
#
+# Setting the cursors when freevo is run in fullscreen mode
+#
+# OSD_X11_CURSORS = '/usr/lib/X11/cursors/black.cursor
/usr/lib/X11/cursors/blank.cursor'
+
+
+#
# Execute a script on OSD startup.
#
# OSD_SDL_EXEC_AFTER_STARTUP = ""
Modified: branches/rel-1/freevo/src/main.py
==============================================================================
--- branches/rel-1/freevo/src/main.py (original)
+++ branches/rel-1/freevo/src/main.py Mon Feb 25 17:33:19 2008
@@ -365,7 +365,11 @@
# force fullscreen mode
# deactivate screen blanking and set osd to fullscreen
if sys.argv[1] == '--force-fs':
+ _debug_('os.system(\'xset -dpms s off\')')
os.system('xset -dpms s off')
+ if config.OSD_X11_CURSORS is not None:
+ _debug_('os.system(\'xsetroot -cursor %s\')' %
config.OSD_X11_CURSORS)
+ os.system('xsetroot -cursor %s' % config.OSD_X11_CURSORS)
config.START_FULLSCREEN_X = 1
# activate a trace function
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
