gnome-shell r187 - trunk/scripts
- From: danw svn gnome org
- To: svn-commits-list gnome org
- Subject: gnome-shell r187 - trunk/scripts
- Date: Thu, 5 Feb 2009 15:35:23 +0000 (UTC)
Author: danw
Date: Thu Feb 5 15:35:23 2009
New Revision: 187
URL: http://svn.gnome.org/viewvc/gnome-shell?rev=187&view=rev
Log:
Add -w (widescreen) and --geometry options to start-in-Xephyr. #570580
Modified:
trunk/scripts/launcher.py
trunk/scripts/start-in-Xephyr
Modified: trunk/scripts/launcher.py
==============================================================================
--- trunk/scripts/launcher.py (original)
+++ trunk/scripts/launcher.py Thu Feb 5 15:35:23 2009
@@ -24,8 +24,8 @@
return (server_glx_extensions, client_glx_extensions, glx_extensions)
class Launcher:
- def __init__(self):
- self.use_tfp = True
+ def __init__(self, use_tfp=True, accept_geometry=False):
+ self.use_tfp = use_tfp
# Figure out the path to the plugin when uninstalled
scripts_dir = os.path.dirname(os.path.abspath(sys.argv[0]))
@@ -40,6 +40,12 @@
parser.add_option("", "--debug-command", metavar="COMMAND",
help="Command to use for debugging (defaults to 'gdb --args')")
parser.add_option("-v", "--verbose", action="store_true")
+ if accept_geometry:
+ parser.add_option("", "--geometry", metavar="GEOMETRY",
+ help="Specify screen geometry",
+ default="1024x768");
+ parser.add_option("-w", "--wide", action="store_true",
+ help="Use widescreen (1280x800)")
self.options, args = parser.parse_args()
@@ -53,10 +59,8 @@
else:
self.debug_command = ["gdb", "--args"]
- def set_use_tfp(self, use_tfp):
- """Sets whether we try to use GLX_EXT_texture_for_pixmap"""
-
- self.use_tfp = use_tfp
+ if self.options.wide:
+ self.options.geometry = "1280x800"
def start_shell(self):
"""Starts gnome-shell. Returns a subprocess.Popen object"""
@@ -120,9 +124,10 @@
args.extend(['metacity', '--mutter-plugins=' + plugin, '--replace'])
return subprocess.Popen(args, env=env)
- def is_verbose (self):
+ def is_verbose(self):
"""Returns whether the Launcher was started in verbose mode"""
return self.options.verbose
-
-
+ def get_geometry(self):
+ """Returns the command-line specified geometry"""
+ return self.options.geometry
Modified: trunk/scripts/start-in-Xephyr
==============================================================================
--- trunk/scripts/start-in-Xephyr (original)
+++ trunk/scripts/start-in-Xephyr Thu Feb 5 15:35:23 2009
@@ -11,10 +11,8 @@
from launcher import Launcher
-launcher = Launcher()
-
# GL_EXT_texture_from_pixmap doesn't work in Xepyhr
-launcher.set_use_tfp(False)
+launcher = Launcher(use_tfp=False, accept_geometry=True)
# Temporary directory to hold our X credentials
tmpdir = tempfile.mkdtemp("", "gnome-shell.")
@@ -38,7 +36,7 @@
# Launch Xephyr
xephyr = subprocess.Popen(["Xephyr", display,
"-auth", xauth_file,
- "-screen", "1024x748",
+ "-screen", launcher.get_geometry(),
"-host-cursor"])
os.environ['DISPLAY'] = display
os.environ['XAUTHORITY'] = xauth_file
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]