Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(17)

Side by Side Diff: ui/base/keycodes/keyboard_code_conversion_x.cc

Issue 10696161: Do not ignore F3-F7 and F9 key presses on an Apple keyboard. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address comment Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | ui/base/keycodes/keyboard_codes_posix.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/base/keycodes/keyboard_code_conversion_x.h" 5 #include "ui/base/keycodes/keyboard_code_conversion_x.h"
6 6
7 #define XK_3270 // for XK_3270_BackTab 7 #define XK_3270 // for XK_3270_BackTab
8 #include <X11/keysym.h> 8 #include <X11/keysym.h>
9 #include <X11/Xlib.h> 9 #include <X11/Xlib.h>
10 #include <X11/Xutil.h> 10 #include <X11/Xutil.h>
(...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after
358 case XF86XK_Favorites: 358 case XF86XK_Favorites:
359 return VKEY_BROWSER_FAVORITES; 359 return VKEY_BROWSER_FAVORITES;
360 case XF86XK_HomePage: 360 case XF86XK_HomePage:
361 return VKEY_BROWSER_HOME; 361 return VKEY_BROWSER_HOME;
362 case XF86XK_AudioMute: 362 case XF86XK_AudioMute:
363 return VKEY_VOLUME_MUTE; 363 return VKEY_VOLUME_MUTE;
364 case XF86XK_AudioLowerVolume: 364 case XF86XK_AudioLowerVolume:
365 return VKEY_VOLUME_DOWN; 365 return VKEY_VOLUME_DOWN;
366 case XF86XK_AudioRaiseVolume: 366 case XF86XK_AudioRaiseVolume:
367 return VKEY_VOLUME_UP; 367 return VKEY_VOLUME_UP;
368 case XF86XK_AudioNext:
369 return VKEY_MEDIA_NEXT_TRACK;
370 case XF86XK_AudioPrev:
371 return VKEY_MEDIA_PREV_TRACK;
368 case XF86XK_AudioStop: 372 case XF86XK_AudioStop:
369 return VKEY_MEDIA_STOP; 373 return VKEY_MEDIA_STOP;
370 case XF86XK_AudioPlay: 374 case XF86XK_AudioPlay:
371 return VKEY_MEDIA_PLAY_PAUSE; 375 return VKEY_MEDIA_PLAY_PAUSE;
372 case XF86XK_Mail: 376 case XF86XK_Mail:
373 return VKEY_MEDIA_LAUNCH_MAIL; 377 return VKEY_MEDIA_LAUNCH_MAIL;
378 case XF86XK_LaunchA: // F3 on an Apple keyboard.
379 return VKEY_MEDIA_LAUNCH_APP1;
380 case XF86XK_LaunchB: // F4 on an Apple keyboard.
374 case XF86XK_Calculator: 381 case XF86XK_Calculator:
375 return VKEY_MEDIA_LAUNCH_APP2; 382 return VKEY_MEDIA_LAUNCH_APP2;
376 case XF86XK_MonBrightnessDown: 383 case XF86XK_MonBrightnessDown:
377 return VKEY_BRIGHTNESS_DOWN; 384 return VKEY_BRIGHTNESS_DOWN;
378 case XF86XK_MonBrightnessUp: 385 case XF86XK_MonBrightnessUp:
379 return VKEY_BRIGHTNESS_UP; 386 return VKEY_BRIGHTNESS_UP;
387 case XF86XK_KbdBrightnessDown:
388 return VKEY_KBD_BRIGHTNESS_DOWN;
389 case XF86XK_KbdBrightnessUp:
390 return VKEY_KBD_BRIGHTNESS_UP;
380 391
381 // TODO(sad): some keycodes are still missing. 392 // TODO(sad): some keycodes are still missing.
382 } 393 }
383 DLOG(WARNING) << "Unknown keysym: " << StringPrintf("0x%x", keysym); 394 DLOG(WARNING) << "Unknown keysym: " << StringPrintf("0x%x", keysym);
384 return VKEY_UNKNOWN; 395 return VKEY_UNKNOWN;
385 } 396 }
386 397
387 uint16 GetCharacterFromXEvent(XEvent* xev) { 398 uint16 GetCharacterFromXEvent(XEvent* xev) {
388 char buf[6]; 399 char buf[6];
389 int bytes_written = XLookupString(&xev->xkey, buf, 6, NULL, NULL); 400 int bytes_written = XLookupString(&xev->xkey, buf, 6, NULL, NULL);
(...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after
702 case VKEY_BROWSER_FAVORITES: 713 case VKEY_BROWSER_FAVORITES:
703 return XF86XK_Favorites; 714 return XF86XK_Favorites;
704 case VKEY_BROWSER_HOME: 715 case VKEY_BROWSER_HOME:
705 return XF86XK_HomePage; 716 return XF86XK_HomePage;
706 case VKEY_VOLUME_MUTE: 717 case VKEY_VOLUME_MUTE:
707 return XF86XK_AudioMute; 718 return XF86XK_AudioMute;
708 case VKEY_VOLUME_DOWN: 719 case VKEY_VOLUME_DOWN:
709 return XF86XK_AudioLowerVolume; 720 return XF86XK_AudioLowerVolume;
710 case VKEY_VOLUME_UP: 721 case VKEY_VOLUME_UP:
711 return XF86XK_AudioRaiseVolume; 722 return XF86XK_AudioRaiseVolume;
723 case VKEY_MEDIA_NEXT_TRACK:
Yusuke Sato 2012/07/10 20:43:52 also added code for reverse conversion for consist
724 return XF86XK_AudioNext;
725 case VKEY_MEDIA_PREV_TRACK:
726 return XF86XK_AudioPrev;
712 case VKEY_MEDIA_STOP: 727 case VKEY_MEDIA_STOP:
713 return XF86XK_AudioStop; 728 return XF86XK_AudioStop;
714 case VKEY_MEDIA_PLAY_PAUSE: 729 case VKEY_MEDIA_PLAY_PAUSE:
715 return XF86XK_AudioPlay; 730 return XF86XK_AudioPlay;
716 case VKEY_MEDIA_LAUNCH_MAIL: 731 case VKEY_MEDIA_LAUNCH_MAIL:
717 return XF86XK_Mail; 732 return XF86XK_Mail;
733 case VKEY_MEDIA_LAUNCH_APP1:
734 return XF86XK_LaunchA;
718 case VKEY_MEDIA_LAUNCH_APP2: 735 case VKEY_MEDIA_LAUNCH_APP2:
719 return XF86XK_Calculator; 736 return XF86XK_LaunchB;
720 case VKEY_BRIGHTNESS_DOWN: 737 case VKEY_BRIGHTNESS_DOWN:
721 return XF86XK_MonBrightnessDown; 738 return XF86XK_MonBrightnessDown;
722 case VKEY_BRIGHTNESS_UP: 739 case VKEY_BRIGHTNESS_UP:
723 return XF86XK_MonBrightnessUp; 740 return XF86XK_MonBrightnessUp;
741 case VKEY_KBD_BRIGHTNESS_DOWN:
742 return XF86XK_KbdBrightnessDown;
743 case VKEY_KBD_BRIGHTNESS_UP:
744 return XF86XK_KbdBrightnessUp;
724 745
725 default: 746 default:
726 LOG(WARNING) << "Unknown keycode:" << keycode; 747 LOG(WARNING) << "Unknown keycode:" << keycode;
727 return 0; 748 return 0;
728 } 749 }
729 } 750 }
730 751
731 } // namespace ui 752 } // namespace ui
OLDNEW
« no previous file with comments | « no previous file | ui/base/keycodes/keyboard_codes_posix.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698