← 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): Emilio Pozuelo Monfort, Laurent Bigonville, Emilio Pozuelo Monfort
  • Date: 2011-02-19 15:20:42 UTC
  • mfrom: (0.3.17 experimental)
  • Revision ID: james.westby@ubuntu.com-20110219152042-aqoiuxyn4o6speec
Tags: 2.91.6-1
[ Laurent Bigonville ]
* New upstream release.
* debian/control.in:
  - Remove duplicate Section
  - Drop gir1.2-mutter-2.91 Conflicts/Replaces against libmutter-private0
    package
* debian/watch: Drop call to uupdate
* debian/mutter.lintian-overrides: Add overrides for manpages shipped
  in mutter-common

[ Emilio Pozuelo Monfort ]
* debian/control.in:
  + Update for the new gtk+ 3 package names.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/core/keybindings.c
535
535
  mask = mask & 0xff & ~display->ignored_modifier_mask;
536
536
  binding = display_get_keybinding (display, keysym, keycode, mask);
537
537
 
 
538
  if (!binding && keycode == meta_display_get_above_tab_keycode (display))
 
539
    binding = display_get_keybinding (display, META_KEY_ABOVE_TAB, keycode, mask);
 
540
 
538
541
  if (binding)
539
542
    return meta_prefs_get_keybinding_action (binding->name);
540
543
  else
1548
1551
 
1549
1552
  if (keysym == XK_Escape)
1550
1553
    {
 
1554
      /* Hide the tiling preview if necessary */
 
1555
      if (window->tile_mode != META_TILE_NONE)
 
1556
        meta_screen_tile_preview_hide (screen);
 
1557
 
 
1558
      /* Restore the original tile mode */
 
1559
      window->tile_mode = display->grab_tile_mode;
 
1560
 
1551
1561
      /* End move or resize and restore to original state.  If the
1552
1562
       * window was a maximized window that had been "shaken loose" we
1553
1563
       * need to remaximize it.  In normal cases, we need to do a
1554
1564
       * moveresize now to get the position back to the original.
1555
1565
       */
1556
 
      if (window->shaken_loose)
 
1566
      if (window->shaken_loose || window->tile_mode == META_TILE_MAXIMIZED)
1557
1567
        meta_window_maximize (window,
1558
1568
                              META_MAXIMIZE_HORIZONTAL |
1559
1569
                              META_MAXIMIZE_VERTICAL);
 
1570
      else if (window->tile_mode != META_TILE_NONE)
 
1571
        meta_window_tile (window);
1560
1572
      else
1561
1573
        meta_window_move_resize (display->grab_window,
1562
1574
                                 TRUE,