From 908b0fb727fcdd0d17d5b19f72c5f5e2451ba6c0 Mon Sep 17 00:00:00 2001
From: Maxim Ermilov <zaspire@rambler.ru>
Date: Wed, 17 Mar 2010 18:22:27 +0300
Subject: [PATCH] support arrow-up to recall previous commands

runDialog store history in gconf.
https://bugzilla.gnome.org/show_bug.cgi?id=612635
---
 data/gnome-shell.schemas | 12 +++++++++
 js/ui/runDialog.js       | 56 +++++++++++++++++++++++++++++++++++++---
 2 files changed, 64 insertions(+), 4 deletions(-)

diff --git a/data/gnome-shell.schemas b/data/gnome-shell.schemas
index bc3dd425a..6153b34e9 100644
--- a/data/gnome-shell.schemas
+++ b/data/gnome-shell.schemas
@@ -45,6 +45,18 @@
 	</locale>
       </schema>
 
+      <schema>
+        <key>/schemas/desktop/gnome/shell/run_dialog/history</key>
+	<applyto>/desktop/gnome/shell/run_dialog/history</applyto>
+	<owner>gnome-shell</owner>
+	<type>list</type>
+	<list_type>string</list_type>
+	<default>[]</default>
+	<locale name="C">
+	  <short>History for command (Alt-F2) dialog</short>
+	</locale>
+      </schema>
+
       <schema>
         <key>/schemas/desktop/gnome/shell/sidebar/visible</key>
 	<applyto>/desktop/gnome/shell/sidebar/visible</applyto>
diff --git a/js/ui/runDialog.js b/js/ui/runDialog.js
index 7808780be..2cd851868 100644
--- a/js/ui/runDialog.js
+++ b/js/ui/runDialog.js
@@ -18,6 +18,9 @@ const Main = imports.ui.main;
 
 const MAX_FILE_DELETED_BEFORE_INVALID = 10;
 
+const HISTORY_KEY = 'run_dialog/history';
+const HISTORY_LIMIT = 512;
+
 function CommandCompleter() {
     this._init();
 }
@@ -174,11 +177,19 @@ RunDialog.prototype = {
     _init : function() {
         this._isOpen = false;
 
-        let gconf = Shell.GConf.get_default();
-        gconf.connect('changed::development_tools', Lang.bind(this, function () {
-            this._enableInternalCommands = gconf.get_boolean('development_tools');
+        this._gconf = Shell.GConf.get_default();
+        this._gconf.connect('changed::development_tools', Lang.bind(this, function () {
+            this._enableInternalCommands = this._gconf.get_boolean('development_tools');
+        }));
+        this._enableInternalCommands = this._gconf.get_boolean('development_tools');
+
+        this._history = this._gconf.get_string_list(HISTORY_KEY);
+        this._historyIndex = -1;
+
+        this._gconf.connect('changed::' + HISTORY_KEY, Lang.bind(this, function() {
+            this._history = this._gconf.get_string_list(HISTORY_KEY);
+            this._historyIndex = this._history.length;
         }));
-        this._enableInternalCommands = gconf.get_boolean('development_tools');
 
         this._internalCommands = { 'lg':
                                    Lang.bind(this, function() {
@@ -249,6 +260,14 @@ RunDialog.prototype = {
         this._group.connect('notify::visible', Lang.bind(this._commandCompleter, this._commandCompleter.update));
         this._entryText.connect('key-press-event', Lang.bind(this, function(o, e) {
             let symbol = e.get_key_symbol();
+            if (symbol == Clutter.Down) {
+                this._setCommandFromHistory(this._historyIndex++);
+                return true;
+            }
+            if (symbol == Clutter.Up) {
+                this._setCommandFromHistory(this._historyIndex--);
+                return true;
+            }
             if (symbol == Clutter.Return) {
                 if (e.get_state() & Clutter.ModifierType.CONTROL_MASK)
                     this._run(o.get_text(), true);
@@ -301,8 +320,19 @@ RunDialog.prototype = {
         }
     },
 
+    _saveHistory : function() {
+        if (this._history.length > HISTORY_LIMIT) {
+            this._history.splice(0, this._history.length - HISTORY_LIMIT);
+        }
+        this._gconf.set_string_list(HISTORY_KEY, this._history);
+    },
+
     _run : function(input, inTerminal) {
         let command = input;
+
+        this._history.push(input);
+        this._saveHistory();
+
         this._commandError = false;
         let f;
         if (this._enableInternalCommands)
@@ -350,6 +380,22 @@ RunDialog.prototype = {
         }
     },
 
+    _setCommandFromHistory: function(lastI) {
+        if (this._historyIndex < 0)
+            this._historyIndex = 0;
+        if (this._historyIndex > this._history.length)
+            this._historyIndex = this._history.length;
+
+        let text = this._entryText.get_text();
+        if (text) {
+            this._history[lastI] = text;
+        }
+        if (this._history[this._historyIndex]) {
+            this._entryText.set_text(this._history[this._historyIndex]);
+        } else
+            this._entryText.set_text('');
+    },
+
     open : function() {
         if (this._isOpen) // Already shown
             return;
@@ -360,6 +406,8 @@ RunDialog.prototype = {
         // Position the dialog on the current monitor
         let monitor = global.get_focus_monitor();
 
+        this._historyIndex = this._history.length;
+
         this._box.set_position(monitor.x, monitor.y);
         this._box.set_size(monitor.width, monitor.height);