mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-31 22:35:35 +00:00
Code Issues Releases Wiki Activity

utils/apparmor/sandbox.py: change 'resolution' to 'geometry'

Browse Source
This commit is contained in:
Jamie Strandboge
2012-08-24 12:06:54 -05:00
parent 72dbf597cc
commit ec5973a3e6
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
utils/apparmor/sandbox.py
View File

@@ -55,8 +55,8 @@ def parse_args(args=None, parser=None):
default=False, default=False,
help='Show debug messages', help='Show debug messages',
action='store_true') action='store_true')
parser.add_option('-r', '--with-resolution', parser.add_option('-r', '--with-geometry',
dest='resolution', dest='geometry',
default='640x480', default='640x480',
help='Resolution for X application') help='Resolution for X application')
parser.add_option('--profile', parser.add_option('--profile',
@@ -130,8 +130,8 @@ def run_sandbox(command, opt):
return rc, report return rc, report
class SandboxXserver(): class SandboxXserver():
def __init__(self, resolution, title, driver=None): def __init__(self, geometry, title, driver=None):
self.resolution = resolution self.geometry = geometry
self.title = title self.title = title
self.pids = [] self.pids = []
self.find_free_x_display() self.find_free_x_display()
@@ -200,7 +200,7 @@ class SandboxXephyr(SandboxXserver):
] ]
x_args = ['-nolisten', 'tcp', x_args = ['-nolisten', 'tcp',
'-screen', self.resolution, '-screen', self.geometry,
'-br', # black background '-br', # black background
'-reset', # reset after last client exists '-reset', # reset after last client exists
'-terminate', # terminate at server reset '-terminate', # terminate at server reset
@@ -390,7 +390,7 @@ EndSection
self.pids.append(listener_attach) self.pids.append(listener_attach)
os.environ["DISPLAY"] = self.display os.environ["DISPLAY"] = self.display
msg("TODO: --with-resolution not honored in xpra") msg("TODO: --with-geometry not honored in xpra")
msg("TODO: filter '~/.xpra/run-xpra'") msg("TODO: filter '~/.xpra/run-xpra'")
def run_xsandbox(command, opt): def run_xsandbox(command, opt):
@@ -402,11 +402,11 @@ def run_xsandbox(command, opt):
# first, start X # first, start X
if opt.xserver.lower() == "xephyr": if opt.xserver.lower() == "xephyr":
x = SandboxXephyr(opt.resolution, command[0]) x = SandboxXephyr(opt.geometry, command[0])
elif opt.xserver.lower() == "xpra3d": elif opt.xserver.lower() == "xpra3d":
x = SandboxXpra(opt.resolution, command[0], driver="xdummy") x = SandboxXpra(opt.geometry, command[0], driver="xdummy")
else: else:
x = SandboxXpra(opt.resolution, command[0]) x = SandboxXpra(opt.geometry, command[0])
try: try:
x.start() x.start()