Skip to content

Commit

Permalink
move randr init to a method
Browse files Browse the repository at this point in the history
git-svn-id: https://xpra.org/svn/Xpra/trunk@12974 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Jul 10, 2016
1 parent 96d385b commit e02d4b5
Showing 1 changed file with 19 additions and 16 deletions.
35 changes: 19 additions & 16 deletions src/xpra/x11/x11_server_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,25 +94,28 @@ def x11_init(self):
log.error("Error: limited keyboard support")
self.init_x11_atoms()
if self.randr:
self.randr = RandR.has_randr()
if self.randr and len(RandR.get_screen_sizes())<=1:
#disable randr when we are dealing with a Xvfb
#with only one resolution available
#since we don't support adding them on the fly yet
self.randr = False
if self.randr:
display = gtk.gdk.display_get_default()
i=0
while i<display.get_n_screens():
screen = display.get_screen(i)
screen.connect("size-changed", self._screen_size_changed)
i += 1
else:
log.warn("Warning: no X11 RandR support on %s", os.environ.get("DISPLAY"))
log("randr enabled: %s", self.randr)
self.init_randr()
self.init_cursor()
self.query_opengl()

def init_randr(self):
self.randr = RandR.has_randr()
if self.randr and len(RandR.get_screen_sizes())<=1:
#disable randr when we are dealing with a Xvfb
#with only one resolution available
#since we don't support adding them on the fly yet
self.randr = False
if self.randr:
display = gtk.gdk.display_get_default()
i=0
while i<display.get_n_screens():
screen = display.get_screen(i)
screen.connect("size-changed", self._screen_size_changed)
i += 1
log("randr enabled: %s", self.randr)
else:
log.warn("Warning: no X11 RandR support on %s", os.environ.get("DISPLAY"))

def init_cursor(self):
#cursor:
self.default_cursor_data = None
Expand Down

0 comments on commit e02d4b5

Please sign in to comment.