From 1f10112d8ac2bb7609c23882bac6462a0f50af62 Mon Sep 17 00:00:00 2001
From: Tomeu Vizoso <tomeu@zviratko.(none)>
Date: Thu, 09 Jul 2009 18:43:44 +0000
Subject: Switch to metacity as the window manager. #602

---
diff --git a/bin/sugar-emulator b/bin/sugar-emulator
index acd5976..7f06609 100644
--- a/bin/sugar-emulator
+++ b/bin/sugar-emulator
@@ -88,11 +88,10 @@ def _start_xephyr(dpi, dimensions, fullscreen):
                     tries -= 1
                     time.sleep(0.1)
 
-def _start_matchbox():
-    cmd = ['matchbox-window-manager']
+def _start_window_manager():
+    cmd = ['metacity']
 
-    cmd.extend(['-use_titlebar', 'no'])
-    cmd.extend(['-theme', 'sugar'])
+    cmd.extend(['--no-force-fullscreen'])
 
     gobject.spawn_async(cmd, flags=gobject.SPAWN_SEARCH_PATH)
 
@@ -157,7 +156,7 @@ def main():
     if not args:
         command.append('sugar')
     else:
-        _start_matchbox()
+        _start_window_manager()
 
         if args[0].endswith('.py'):
             command.append('python')
diff --git a/bin/sugar.in b/bin/sugar.in
index 3c9b9b6..7b5ca25 100644
--- a/bin/sugar.in
+++ b/bin/sugar.in
@@ -16,7 +16,6 @@ if [ -f ~/.sugar/debug ]; then
         . ~/.sugar/debug
 fi
 
-matchbox-window-manager -use_titlebar no -theme sugar \
-                        -kbdconfig @prefix@/share/sugar/data/kbdconfig &
+metacity --no-force-fullscreen &
 
 exec sugar-session
diff --git a/src/jarabe/desktop/favoritesview.py b/src/jarabe/desktop/favoritesview.py
index 75aad39..5d197c5 100644
--- a/src/jarabe/desktop/favoritesview.py
+++ b/src/jarabe/desktop/favoritesview.py
@@ -623,7 +623,8 @@ class CurrentActivityIcon(CanvasIcon, hippo.CanvasItem):
         self.connect('button-release-event', self.__button_release_event_cb)
 
     def __button_release_event_cb(self, icon, event):
-        self._home_model.get_active_activity().get_window().activate(1)
+        window = self._home_model.get_active_activity().get_window()
+        window.activate(gtk.get_current_event_time())
 
     def _update(self):
         self.props.file_name = self._home_activity.get_icon_path()
diff --git a/src/jarabe/frame/framewindow.py b/src/jarabe/frame/framewindow.py
index 02bb131..5cb1241 100644
--- a/src/jarabe/frame/framewindow.py
+++ b/src/jarabe/frame/framewindow.py
@@ -93,7 +93,7 @@ class FrameWindow(gtk.Window):
             self.resize(self.size, gtk.gdk.screen_height())
 
     def _realize_cb(self, widget):
-        self.window.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_DIALOG)
+        self.window.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_DOCK)
         self.window.set_accept_focus(False)
 
     def _enter_notify_cb(self, window, event):
diff --git a/src/jarabe/model/shell.py b/src/jarabe/model/shell.py
index 709eb03..d7810ba 100644
--- a/src/jarabe/model/shell.py
+++ b/src/jarabe/model/shell.py
@@ -457,6 +457,12 @@ class ShellModel(gobject.GObject):
             if activity_id:
                 home_activity = self.get_activity_by_id(activity_id)
 
+                xid = window.get_xid()
+                gdk_window = gtk.gdk.window_foreign_new(xid)
+                gdk_window.set_decorations(0)
+
+                window.maximize()
+
             if not home_activity:
                 home_activity = Activity(activity_info, activity_id, window)
                 self._add_activity(home_activity)
diff --git a/src/jarabe/view/launcher.py b/src/jarabe/view/launcher.py
index 3071790..0d0532f 100644
--- a/src/jarabe/view/launcher.py
+++ b/src/jarabe/view/launcher.py
@@ -61,6 +61,7 @@ class LaunchWindow(gtk.Window):
         wm.set_activity_id(widget.window, str(self._activity_id))
         widget.window.property_change('_SUGAR_WINDOW_TYPE', 'STRING', 8,
                                       gtk.gdk.PROP_MODE_REPLACE, 'launcher')
+        widget.window.set_decorations(0)
 
     def __size_changed_cb(self, screen):
         self._update_size()
--
cgit v0.9.1