diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-22 01:38:02 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-22 01:38:02 +0000 |
| commit | a9f1a15d107e8631adf8a44b44fa8a978bf7fe31 (patch) | |
| tree | 81f5d72bf56ef3482eba8ecf0cb1604bfbb35863 /remoting | |
| parent | 7d778fb3afe9eb0da4ea3c13856491efea43cdde (diff) | |
| download | chromium_src-a9f1a15d107e8631adf8a44b44fa8a978bf7fe31.zip chromium_src-a9f1a15d107e8631adf8a44b44fa8a978bf7fe31.tar.gz chromium_src-a9f1a15d107e8631adf8a44b44fa8a978bf7fe31.tar.bz2 | |
Linux: Fix the build for Ubuntu Precise.
BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9817020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128133 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/host/local_input_monitor_thread_linux.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/remoting/host/local_input_monitor_thread_linux.cc b/remoting/host/local_input_monitor_thread_linux.cc index cae44f1..1adb054 100644 --- a/remoting/host/local_input_monitor_thread_linux.cc +++ b/remoting/host/local_input_monitor_thread_linux.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -15,6 +15,7 @@ // These includes need to be later than dictated by the style guide due to // Xlib header pollution, specifically the min, max, and Status macros. +#include <X11/XKBlib.h> #include <X11/Xlibint.h> #include <X11/extensions/record.h> @@ -167,7 +168,7 @@ void LocalInputMonitorThread::LocalMouseMoved(const SkIPoint& pos) { } void LocalInputMonitorThread::LocalKeyPressed(int key_code, bool down) { - int key_sym = XKeycodeToKeysym(display_, key_code, 0); + KeySym key_sym = XkbKeycodeToKeysym(display_, key_code, 0, 0); if (key_sym == XK_Control_L || key_sym == XK_Control_R) { ctrl_pressed_ = down; } else if (key_sym == XK_Alt_L || key_sym == XK_Alt_R) { |