← Back to branch summary

~ubuntu-branches/ubuntu/wily/mutter/wily

« back to all changes in this revision

Viewing changes to src/core/keybindings.c

  • Committer: Bazaar Package Importer
  • Author(s): Didier Roche
  • Date: 2010-10-01 11:39:17 UTC
  • mfrom: (1.2.1 upstream) (10.1.20 maverick)
  • Revision ID: james.westby@ubuntu.com-20101001113917-d1c9zswwaehyn07e
Tags: 2.31.5-0ubuntu9
https://launchpad.net/bugs/651085
* debian/patches/20_unity_no_3D_detection.patch:
  - add an extra string in fallback mode to guide user in live session
    (LP: #651085)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/core/keybindings.c
499
499
  return NULL;
500
500
}
501
501
 
502
 
static MetaKeyBindingAction
503
 
display_get_keybinding_action (MetaDisplay  *display,
504
 
                               unsigned int  keysym,
505
 
                               unsigned int  keycode,
506
 
                               unsigned long mask)
 
502
/**
 
503
 * meta_display_get_keybinding_action:
 
504
 * @display: A #MetaDisplay
 
505
 * @keysym: Key symbol
 
506
 * @keycode: Raw keycode
 
507
 * @mask: Event mask
 
508
 *
 
509
 * Returns: The action that should be taken for the given key, or %META_KEYBINDING_ACTION_NONE.
 
510
 *
 
511
 */
 
512
MetaKeyBindingAction
 
513
meta_display_get_keybinding_action (MetaDisplay  *display,
 
514
                                    unsigned int  keysym,
 
515
                                    unsigned int  keycode,
 
516
                                    unsigned long mask)
507
517
{
508
518
  MetaKeyBinding *binding;
509
519
 
 
520
  mask = mask & 0xff & ~display->ignored_modifier_mask;
510
521
  binding = display_get_keybinding (display, keysym, keycode, mask);
511
522
 
512
523
  if (binding)
2756
2767
      MetaWorkspace *target_workspace;
2757
2768
      MetaKeyBindingAction action;
2758
2769
 
2759
 
      action = display_get_keybinding_action (display,
2760
 
                                              keysym,
2761
 
                                              event->xkey.keycode,
2762
 
                                              display->grab_mask);
 
2770
      action = meta_display_get_keybinding_action (display,
 
2771
                                                   keysym,
 
2772
                                                   event->xkey.keycode,
 
2773
                                                   display->grab_mask);
2763
2774
 
2764
2775
      switch (action)
2765
2776
        {