From b3d7f1e05a1ccea8181f3a30aa1bd734da41a168 Mon Sep 17 00:00:00 2001
From: James Whitehead II <jnwhiteh@gmail.com>
Date: Sun, 17 Oct 2010 13:29:17 +0100
Subject: [PATCH] =?UTF-8?q?Fix=20bindings=20with=20non-latin=20keys,=20such=20?=
 =?UTF-8?q?as=20=C3=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Clique.lua |    2 +-
 Utils.lua  |   39 +++++++++++++++++++++++++++++++++++++--
 2 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/Clique.lua b/Clique.lua
index eb9f894..a41a3b1 100755
--- a/Clique.lua
+++ b/Clique.lua
@@ -397,7 +397,7 @@ function addon:GetBindingAttributes(global)
     end
 
     for idx, entry in ipairs(self.bindings) do
-        if self:ShouldSetBinding(entry, global) then 
+        if self:ShouldSetBinding(entry, global) and entry.key then 
             if not entry.key:match("BUTTON%d+$") then
                 -- This is a key binding, so we need a binding for it
                 
diff --git a/Utils.lua b/Utils.lua
index 033b44e..42ebd00 100644
--- a/Utils.lua
+++ b/Utils.lua
@@ -46,6 +46,35 @@ function addon:GetPrefixString(split)
     return prefix
 end
 
+-- This function can return a substring of a UTF-8 string, properly handling
+-- UTF-8 codepoints.  Rather than taking a start index and optionally an end
+-- index, it takes the string, the start index and the number of characters
+-- to select from the string.
+--
+-- UTF-8 Reference:
+-- 0xxxxxx - ASCII character
+-- 110yyyxx - 2 byte UTF codepoint
+-- 1110yyyy - 3 byte UTF codepoint
+-- 11110zzz - 4 byte UTF codepoint
+
+local function utf8sub(str, start, numChars)
+    local currentIndex = start
+    while numChars > 0 and currentIndex <= #str do
+        local char = string.byte(str, currentIndex)
+        if char >= 240 then
+            currentIndex = currentIndex + 4
+        elseif char >= 225 then
+            currentIndex = currentIndex + 3
+        elseif char >= 192 then
+            currentIndex = currentIndex + 2
+        else
+            currentIndex = currentIndex + 1
+        end
+        numChars = numChars - 1
+    end
+    return str:sub(start, currentIndex - 1)
+end
+
 local convertMap = setmetatable({
     LSHIFT = L["LShift"],
     RSHIFT = L["RShift"],
@@ -66,7 +95,13 @@ local convertMap = setmetatable({
         if k:match("^BUTTON(%d+)$") then
             return k:gsub("^BUTTON(%d+)$", "Button%1")
         else
-            return k:sub(1,1) .. k:sub(2, -1):lower()
+            if utf8sub(k, 1, 1) ~= k:sub(1, 1) then
+                -- If the first character is a multi-byte UTF-8 character
+                return k
+            else
+                -- Make the first character upper-case, lower the rest
+                return tostring(k:sub(1, 1):upper()) .. tostring(k:sub(2, -1):lower())
+            end
         end
     end,
 })
@@ -243,7 +278,7 @@ function addon:GetBindingPrefixSuffix(binding)
     if button then
         suffix = button
     else
-        local mbid = (prefix .. suffix):gsub("[^A-Za-z0-9]", "")
+        local mbid = (prefix .. suffix)
         suffix = "cliquebutton" .. mbid
         prefix = ""
     end
-- 
1.7.9.5