From 5f6acdaa5cc447b8ddfa8ba9242faf03c607a01f Mon Sep 17 00:00:00 2001 From: Chris Double Date: Thu, 19 Sep 2013 16:17:40 +1200 Subject: [PATCH] Allow remote desktop sharing to work again on Linux Git commit 882d8cf2 fixed a problem where restarting a snapshot that had open worlds would fail on Linux due to using the fully qualified display name. Unfortunately it broke support for sharing worlds on other displays - they would always open on the local display. The fix backs out that change so that remote displays work and fixes the original issue by using the default display name. --- objects/ui2/canvas.self | 7 ++----- objects/ui2/worldMorph.self | 6 +++--- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/objects/ui2/canvas.self b/objects/ui2/canvas.self index e1ca2124..86b4c7f9 100644 --- a/objects/ui2/canvas.self +++ b/objects/ui2/canvas.self @@ -1,7 +1,7 @@ '$Revision: 30.17 $' ' -Copyright 1992-2012 AUTHORS. -See the LICENSE file for license information. +Copyright 1992-2011 AUTHORS. +See the legal/LICENSE file for license information and legal/AUTHORS for authors. ' @@ -2354,9 +2354,6 @@ the pixmapCache some day. | n: displayName. - "For Linux, default to local display" - host osName = 'linux' ifTrue: [n: '']. - [ | err | err: [|:exit| ^ xlib display open: n diff --git a/objects/ui2/worldMorph.self b/objects/ui2/worldMorph.self index d03ac271..ebe76c7a 100644 --- a/objects/ui2/worldMorph.self +++ b/objects/ui2/worldMorph.self @@ -1,7 +1,7 @@ '$Revision: 30.30 $' ' -Copyright 1992-2012 AUTHORS. -See the LICENSE file for license information. +Copyright 1992-2011 AUTHORS. +See the legal/LICENSE file for license information and legal/AUTHORS for authors. ' @@ -2119,7 +2119,7 @@ on the default display.\x7fModuleInfo: Module: worldMorph InitialContents: Follo oldBounds: (3@24 max: wc position) ## wc size. oldOffset: wc offset. releaseParts. - addWindowOnDisplay: (platformSpecificNameFor: wc displayName) Bounds: oldBounds. + addWindowOnDisplay: (platformSpecificNameFor: wc originalDisplayName) Bounds: oldBounds. winCanvases first offset: oldOffset. "set scroll offset of new canvas" morphsDo: [| :m |