From df5b66d838b9bbb1fca0cbd61f4536595a9b2287 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Mon, 13 Apr 2009 12:22:17 -0400
Subject: [PATCH] Add 'encoding'

---
 common/content/buffer.js            | 51 ++++++++++++++++++++++++++++-
 common/content/liberator.xul        |  4 +++
 vimperator/NEWS                     |  1 +
 vimperator/locale/en-US/options.txt |  7 ++++
 4 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/common/content/buffer.js b/common/content/buffer.js
index 4d204ad6..fd8f11de 100644
--- a/common/content/buffer.js
+++ b/common/content/buffer.js
@@ -139,6 +139,55 @@ function Buffer() //{{{
     ////////////////////// OPTIONS /////////////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
 
+    function getWebNav() {
+        function call(val, fn) {
+            try
+            {
+                return fn(val);
+            }
+            catch(e)
+            {
+                return val
+            }
+        }
+        return [
+            function() getBrowser().webNavigation,
+            function(webNav) webNav.sessionHistory.QueryInterface(Ci.nsIWebNavigation)
+        ].reduce(call, null);
+    }
+
+    options.add(["encoding", "enc"],
+        "Sets the current buffer's character encoding",
+        "string", "UTF-8",
+        {
+            scope: options.OPTION_SCOPE_LOCAL,
+            getter: function() getBrowser().docShell.QueryInterface(Ci.nsIDocCharset).charset,
+            setter: function(val)
+            {
+                // Stolen from browser.jar/content/browser/browser.js, more or
+                // less.
+                try
+                {
+                    var docCharset = getBrowser().docShell.QueryInterface(Ci.nsIDocCharset).charset = val
+                    PlacesUtils.history.setCharsetForURI(getWebNavigation().currentURI, val);
+                    getWebNav().reload(Ci.nsIWebNavigation.LOAD_FLAGS_CHARSET_CHANGE);
+                }
+                catch (e) { liberator.reportError(e) }
+            },
+            completer: function(context) {
+                context.anchored = false;
+                context.generate = function() {
+                    let names = util.Array.uniq(
+                        util.Array.flatten(
+                            'more1 more2 more3 more4 more5 unicode'.split(' ').map(function(key)
+                                options.getPref('intl.charsetmenu.browser.' + key).split(', '))));
+                    let bundle = document.getElementById('liberator-charset-bundle');
+                    return names.map(function(name) [name, bundle.getString(name.toLowerCase() + '.title')])
+                };
+            }
+        });
+
+    // FIXME: Most certainly belongs elsewhere.
     options.add(["fullscreen", "fs"],
         "Show the current window fullscreen",
         "boolean", false,
@@ -147,7 +196,7 @@ function Buffer() //{{{
             getter: function () window.fullScreen
         });
 
-        options.add(["nextpattern"], // \u00BB is » (>> in a single char)
+    options.add(["nextpattern"], // \u00BB is » (>> in a single char)
         "Patterns to use when guessing the 'next' page in a document sequence",
         "stringlist", "\\bnext\\b,^>$,^(>>|\u00BB)$,^(>|\u00BB),(>|\u00BB)$,\\bmore\\b");
 
diff --git a/common/content/liberator.xul b/common/content/liberator.xul
index d26700a7..2d2ce540 100644
--- a/common/content/liberator.xul
+++ b/common/content/liberator.xul
@@ -43,6 +43,10 @@ the terms of any one of the MPL, the GPL or the LGPL.
     <script type="application/x-javascript;version=1.8" src="&liberator.content;liberator-overlay.js"/>
 
     <window id="&liberator.mainWindow;">
+        <stringbundleset id="liberator-stringbundles">
+            <stringbundle id="liberator-charset-bundle"
+                src="chrome://global/locale/charsetTitles.properties"/>
+        </stringbundleset>
 
         <keyset id="mainKeyset">
             <key id="key_open_vimbar" key=":" oncommand="liberator.modules.commandline.open(':', '', liberator.modules.modes.EX);" modifiers=""/>
diff --git a/vimperator/NEWS b/vimperator/NEWS
index b6c67cf5..449362f9 100644
--- a/vimperator/NEWS
+++ b/vimperator/NEWS
@@ -1,5 +1,6 @@
 2009-XX-XX:
     * version 2.1 (probably)
+    * add 'encoding'
     * add 'hintinputs'
     * add :silent
     * add $MY_VIMPERATORRC
diff --git a/vimperator/locale/en-US/options.txt b/vimperator/locale/en-US/options.txt
index 32904c24..edf7212f 100644
--- a/vimperator/locale/en-US/options.txt
+++ b/vimperator/locale/en-US/options.txt
@@ -307,6 +307,13 @@ A list of autocommand event names which should be ignored. If the list contains
 the value "all" then all events are ignored.
 ____
 
+|\'enc'| |\'encoding'|
+||'encoding'|| string (default: "UTF-8")
+____
+Changes the character encodign of the current buffer. Valid only for the
+current page.
+____
+
 
 |\'nofc'| |\'nofocuscontent'| |\'fc'| |\'focuscontent'|
 ||'focuscontent' 'fc'|| boolean (default: off)