Yes and yes. Covering that use case was actually the main reason I splitted that code out of sugar-build. On Tuesday, 8 January 2013, Simon Schampijer wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> Hi Daniel, the new module is this one [1] I presume. We currently have the emulator packaged for Fedora qit a Desktop file so there is an easy way to launch Sugar from within another Desktop. I guess this would then be a separate package based on sugar-runner. Regards, Simon [1] <a href="http://git.sugarlabs.org/sugar-runner" target="_blank">http://git.sugarlabs.org/sugar-runner</a> [2] <a href="http://koji.fedoraproject.org/koji/rpminfo?rpmID=3585350" target="_blank">http://koji.fedoraproject.org/koji/rpminfo?rpmID=3585350</a> On 12/16/2012 12:24 AM, Daniel Narvaez wrote: <blockquote style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> From: Daniel Narvaez <<a>dwnarvaez@gmail.com</a>> Replaced by the sugar-runner module. Rationale: * sugar-runner is similar in concept to sugar-emulator but it provides a better user experience. It runs also from a text console (into a standard X server). It works around Xephyr issues like international keyboards and multiple outputs. It tries to work out of the box everywhere, for example by offering to tweak Xwrapper.config where necessary. * sugar-runner is better tested with recent sugar code and recent distributions. It also integrates with sugar-build. * A separate module make sense here because most users will never run this code. It's largely a collection of hacks which are not necessary when running as a normal desktop environment. Why now: * We are starting to use GSettings, which requires to setup the xdg directories to avoid conflicts with GNOME. Thus we would require to make changes to sugar-emulator to setup these properly. Maintaining two separate implementation of basically the same thing is a waste of resources. * We are at the beginning of the cycle, the best time for potentially disruptive changes. --- README | 1 - bin/Makefile.am | 1 - bin/sugar-emulator | 14 --- <a href="http://configure.ac" target="_blank">configure.ac</a> | 1 - data/Makefile.am | 3 - data/<a href="http://sugar-emulator.desktop.in" target="_blank">sugar-emulator.desktop.in</a> | 10 --- src/jarabe/model/session.py | 15 +--- src/jarabe/model/sound.py | 10 +-- src/jarabe/util/Makefile.am | 1 - src/jarabe/util/emulator.py | 194 ---------------------------------------- src/jarabe/view/keyhandler.py | 5 -- 11 files changed, 5 insertions(+), 250 deletions(-) delete mode 100755 bin/sugar-emulator delete mode 100644 data/<a href="http://sugar-emulator.desktop.in" target="_blank">sugar-emulator.desktop.in</a> delete mode 100644 src/jarabe/util/emulator.py diff --git a/README b/README index 1f89810..cfc196e 100644 --- a/README +++ b/README @@ -38,7 +38,6 @@ Alt+r Rotate the screen Alt+o Toggle overlay visibility Alt+= Open the developer console Alt+0 Open the developer console -Alt+q Quit the emulator Ctrl+s Activate sketch mode in chat diff --git a/bin/Makefile.am b/bin/Makefile.am index cb671da..bd38323 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -1,6 +1,5 @@ python_scripts = \ sugar-control-panel \ - sugar-emulator \ sugar-install-bundle \ sugar-launch diff --git a/bin/sugar-emulator b/bin/sugar-emulator deleted file mode 100755 index 308aac7..0000000 --- a/bin/sugar-emulator +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -if [ "$(id -u)" -eq 0 -o "$(id -ru)" -eq 0 ] ; then - echo Refusing to run as root. - exit 3 -fi - -# Source debug definitions -if [ -f ~/.sugar/debug ]; then - . ~/.sugar/debug -fi - -# Start emulator -python -c "import sys; from jarabe.util import emulator; sys.argv[0]='$0'; emulator.main()" "$@" diff --git a/<a href="http://configure.ac" target="_blank">configure.ac</a> b/<a href="http://configure.ac" target="_blank">configure.ac</a> index 137e53a..9eae29e 100644 --- a/<a href="http://configure.ac" target="_blank">configure.ac</a> +++ b/<a href="http://configure.ac" target="_blank">configure.ac</a> @@ -48,7 +48,6 @@ bin/Makefile bin/sugar data/icons/Makefile data/Makefile -data/sugar-emulator.desktop extensions/cpsection/aboutcomputer/Makefile extensions/cpsection/aboutme/Makefile extensions/cpsection/datetime/Makefile diff --git a/data/Makefile.am b/data/Makefile.am index 6a62d23..39bdb35 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -23,9 +23,6 @@ GTKRC_FILES = \ xsessionsdir = $(datadir)/xsessions xsessions_DATA = sugar.desktop -applicationsdir = $(datadir)/applications -applications_DATA = sugar-emulator.desktop - mime_xml_in_files = <a href="http://sugar.xml.in" target="_blank">sugar.xml.in</a> mime_xml_files = $(mime_xml_in_files:.<a href="http://xml.in" target="_blank">xml.in</a>=.xml) @INTLTOOL_XML_RULE@ diff --git a/data/<a href="http://sugar-emulator.desktop.in" target="_blank">sugar-emulator.desktop.in</a> b/data/<a href="http://sugar-emulator.desktop.in" target="_blank"></a></blockquote> _______________________________________________ Sugar-devel mailing list <a>Sugar-devel@lists.sugarlabs.org</a> <a href="http://lists.sugarlabs.org/listinfo/sugar-devel" target="_blank">http://lists.sugarlabs.org/listinfo/sugar-devel</a> </blockquote> -- Daniel Narvaez