summaryrefslogtreecommitdiff
path: root/vcl/unx
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@collabora.com>2014-05-02 12:29:15 -0400
committerKohei Yoshida <kohei.yoshida@collabora.com>2014-05-02 15:43:46 -0400
commitdd9c9a69da7b22c4166391df082ac23878312a01 (patch)
tree46733d80da3c1b52c2c141867c95c45a6c795f28 /vcl/unx
parentaf10cb2c9cf2ea331850a054095e94110670de96 (diff)
Add the "quoteright" key to the list of available keyboard shortcuts.
Change-Id: I24800c28b1513b883c42d9ce1c787eaf07815b92
Diffstat (limited to 'vcl/unx')
-rw-r--r--vcl/unx/generic/app/saldisp.cxx8
-rw-r--r--vcl/unx/gtk/window/gtksalframe.cxx1
-rw-r--r--vcl/unx/gtk/window/gtksalmenu.cxx1
3 files changed, 9 insertions, 1 deletions
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index d7231e07fd87..a5cef39d2b79 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -919,7 +919,9 @@ OUString SalDisplay::GetKeyName( sal_uInt16 nKeyCode ) const
case KEY_SEMICOLON:
aCustomKeyName = ";";
break;
-
+ case KEY_QUOTERIGHT:
+ aCustomKeyName = "'";
+ break;
default:
nKeySym = 0;
break;
@@ -1262,6 +1264,10 @@ sal_uInt16 SalDisplay::GetKeyCode( KeySym keysym, char*pcPrintable ) const
nKey = KEY_SEMICOLON;
*pcPrintable = ';';
break;
+ case XK_quoteright:
+ nKey = KEY_QUOTERIGHT;
+ *pcPrintable = '\'';
+ break;
// - - - - - - - - - - - - - Apollo - - - - - - - - - - - - - 0x1000
case 0x1000FF02: // apXK_Copy
nKey = KEY_COPY;
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx
index a8207be07815..b5967e0c31dc 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -255,6 +255,7 @@ static sal_uInt16 GetKeyCode( guint keyval )
case GDK_bracketleft: nCode = KEY_BRACKETLEFT; break;
case GDK_bracketright: nCode = KEY_BRACKETRIGHT; break;
case GDK_semicolon: nCode = KEY_SEMICOLON; break;
+ case GDK_quoteright: nCode = KEY_QUOTERIGHT; break;
// some special cases, also see saldisp.cxx
// - - - - - - - - - - - - - Apollo - - - - - - - - - - - - - 0x1000
case 0x1000FF02: // apXK_Copy
diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx b/vcl/unx/gtk/window/gtksalmenu.cxx
index 203b9b42794d..6143e6c72101 100644
--- a/vcl/unx/gtk/window/gtksalmenu.cxx
+++ b/vcl/unx/gtk/window/gtksalmenu.cxx
@@ -139,6 +139,7 @@ static void KeyCodeToGdkKey ( const KeyCode& rKeyCode, guint* pGdkKeyCode, GdkMo
case KEY_BRACKETLEFT: nKeyCode = GDK_bracketleft; break;
case KEY_BRACKETRIGHT: nKeyCode = GDK_bracketright; break;
case KEY_SEMICOLON: nKeyCode = GDK_semicolon; break;
+ case KEY_QUOTERIGHT: nKeyCode = GDK_quoteright; break;
// Special cases
case KEY_COPY: nKeyCode = GDK_Copy; break;