Merge lp:~loic.molinari/unity/unity-keyboard-navigation into lp:unity

[Loïc Molinari]

=== modified file 'src/Launcher.cpp'
--- src/Launcher.cpp	2011-01-26 14:11:37 +0000
+++ src/Launcher.cpp	2011-01-26 15:39:45 +0000
@@ -188,6 +188,9 @@
     OnMouseMove.connect  (sigc::mem_fun (this, &Launcher::RecvMouseMove));
     OnMouseWheel.connect (sigc::mem_fun (this, &Launcher::RecvMouseWheel));
 
+    OnKeyPressed.connect (sigc::mem_fun (this, &Launcher::RecvKeyPressed));
+    OnKeyReleased.connect (sigc::mem_fun (this, &Launcher::RecvKeyReleased));
+
     QuicklistManager::Default ()->quicklist_opened.connect (sigc::mem_fun(this, &Launcher::RecvQuicklistOpened));
     QuicklistManager::Default ()->quicklist_closed.connect (sigc::mem_fun(this, &Launcher::RecvQuicklistClosed));
     
@@ -1950,6 +1953,22 @@
   EnsureAnimation ();
 }
 
+void Launcher::RecvKeyPressed (unsigned int  key_sym, unsigned long key_code,
+                               unsigned long key_state)
+{
+  // FIXME(loicm) Hey Mirco, now you can put your stuff here ...
+  fprintf (stdout, "Launcher::RecvKeyPressed (%d, %ld, %ld)\n", key_sym,
+           key_code, key_state);
+}
+
+void Launcher::RecvKeyReleased (unsigned int  key_sym, unsigned long key_code,
+                                unsigned long key_state)
+{
+  // FIXME(loicm) ... and there ;)
+  fprintf (stdout, "Launcher::RecvKeyReleased (%d, %ld, %ld)\n", key_sym,
+           key_code, key_state);
+}
+
 void Launcher::RecvQuicklistOpened (QuicklistView *quicklist)
 {
   EventLogic ();

=== modified file 'src/Launcher.h'
--- src/Launcher.h	2011-01-24 11:26:31 +0000
+++ src/Launcher.h	2011-01-26 15:39:45 +0000
@@ -108,6 +108,9 @@
   virtual void RecvMouseMove(int x, int y, int dx, int dy, unsigned long button_flags, unsigned long key_flags);
   virtual void RecvMouseWheel(int x, int y, int wheel_delta, unsigned long button_flags, unsigned long key_flags);
 
+  virtual void RecvKeyPressed (unsigned int key_sym, unsigned long key_code, unsigned long key_state);
+  virtual void RecvKeyReleased (unsigned int key_sym, unsigned long key_code, unsigned long key_state);
+
   virtual void RecvQuicklistOpened (QuicklistView *quicklist);
   virtual void RecvQuicklistClosed (QuicklistView *quicklist);
 

=== modified file 'src/unityshell.cpp'
--- src/unityshell.cpp	2011-01-24 10:44:25 +0000
+++ src/unityshell.cpp	2011-01-26 15:39:45 +0000
@@ -209,6 +209,17 @@
   return false;
 }
 
+bool
+UnityScreen::navigateLauncherKeyInitiate (CompAction         *action,
+                                          CompAction::State   state,
+                                          CompOption::Vector &options)
+{
+  CompWindow *w = screen->findWindow (launcherWindow->GetInputWindowId ());
+  if (w != NULL)
+    w->moveInputFocusTo ();
+  return false;
+}
+
 gboolean
 UnityScreen::initPluginActions (gpointer data)
 {
@@ -487,6 +498,7 @@
   optionSetUrgentAnimationNotify   (boost::bind (&UnityScreen::optionChanged, this, _1, _2));
   optionSetShowLauncherInitiate (boost::bind (&UnityScreen::showLauncherKeyInitiate, this, _1, _2, _3));
   optionSetShowLauncherTerminate (boost::bind (&UnityScreen::showLauncherKeyTerminate, this, _1, _2, _3));
+  optionSetNavigateLauncherInitiate (boost::bind (&UnityScreen::navigateLauncherKeyInitiate, this, _1, _2, _3));
 
   g_timeout_add (0, &UnityScreen::initPluginActions, this);
   g_timeout_add (5000, (GSourceFunc) write_logger_data_to_disk, NULL);

=== modified file 'src/unityshell.h'
--- src/unityshell.h	2011-01-20 04:06:54 +0000
+++ src/unityshell.h	2011-01-26 15:39:45 +0000
@@ -100,6 +100,9 @@
 	showLauncherKeyTerminate (CompAction *action, CompAction::State state,
                               CompOption::Vector &options);
 
+  bool navigateLauncherKeyInitiate (CompAction *action, CompAction::State state,
+                                    CompOption::Vector &options);
+
 	/* handle option changes and change settings inside of the
 	 * panel and dock views */
 	void optionChanged (CompOption *, Options num);
@@ -155,7 +158,7 @@
 	bool    damaged;
 	CompWindowList _withRemovedNuxWindows;
 
-	friend class UnityWindow;
+  friend class UnityWindow;
 };
 
 class UnityWindow :

=== modified file 'unityshell.xml.in'
--- unityshell.xml.in	2011-01-04 16:16:10 +0000
+++ unityshell.xml.in	2011-01-26 15:39:45 +0000
@@ -49,6 +49,11 @@
                     <_long>Make the launcher appear with that key</_long>
                     <default>&lt;Super&gt;</default>
                   </option>
+		  <option name="navigate_launcher" type="key">
+		    <_short>Navigate launcher</_short>
+		    <_long>Navigate the launcher with the keyboard</_long>
+		    <default>&lt;Alt&gt;F1</default>
+                  </option>
 	          </group>
 	          <group>
                 <_short>Experimental</_short>