diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-08 19:17:52 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-08 19:17:52 +0000 |
| commit | 6e1c9a71bb4ccb4dbf81f8729bc2532e9b0f3674 (patch) | |
| tree | fe730c8880b289fac330a94553d962db6dfee8a4 /media/tools | |
| parent | aff9bafc5f3f2e857046eccefb1cfb673435ea19 (diff) | |
| download | chromium_src-6e1c9a71bb4ccb4dbf81f8729bc2532e9b0f3674.zip chromium_src-6e1c9a71bb4ccb4dbf81f8729bc2532e9b0f3674.tar.gz chromium_src-6e1c9a71bb4ccb4dbf81f8729bc2532e9b0f3674.tar.bz2 | |
Replace use of XKeycodeToKeysym() with XkbKeycodeToKeysym() in player_x11.
BUG=117274
TEST=player_x11 comples with gcc 4.6.3 / ubuntu 12.04
TBR=bungeman@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9632006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125653 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/tools')
| -rw-r--r-- | media/tools/player_x11/player_x11.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc index 8d9b4e0..e656b8e 100644 --- a/media/tools/player_x11/player_x11.cc +++ b/media/tools/player_x11/player_x11.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include <X11/keysym.h> +#include <X11/XKBlib.h> #include <X11/Xlib.h> #include <signal.h> @@ -199,7 +199,7 @@ void PeriodicalUpdate( break; case KeyPress: { - KeySym key = XKeycodeToKeysym(g_display, e.xkey.keycode, 0); + KeySym key = XkbKeycodeToKeysym(g_display, e.xkey.keycode, 0, 0); if (key == XK_Escape) { g_running = false; // Quit message_loop only when pipeline is fully stopped. |