2006-10-01 22:30:10 +00:00
|
|
|
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
|
|
|
|
Comprehensively rename to Mutter
Code:
All references in the code not related to themes, keybindings, or
GConf were changed from 'metacity' to 'mutter'. This includes, among other
things, strings, comments, the atoms used in the message protocol, and
the envvars used for debugging. The GConf schema file was reduced to
the 3 settings new to mutter.
The overall version was brought up to 2.27 to match current gnome.
Structure:
All files named '*metacity*' were renamed '*mutter*' with appropriate
changes in the automake system. Files removed are
doc/creating_themes, src/themes, doc/metacity-theme.dtd,
metacity.doap. These files will eventually end up in an external
gnome-wm-data module.
Installation location:
On the filesystem the mutter-plugindir was change from
$(libdir)/metacity/plugins/clutter to just $(libdir)/mutter/plugins.
The mutter-plugins.pc.in reflects these changes.
Note:
mutter.desktop.in and mutter-wm.desktop both continue to have
X-GNOME-WMSettingsModule=metacity set. This allows
gnome-control-center to continue using libmetacity.so for
configuration. This is fine since most the general keybindings and wm
settings are being read from /apps/metacity/* in gconf.
2009-06-10 10:29:20 +00:00
|
|
|
/* Mutter Keybindings */
|
2012-12-13 01:50:43 +00:00
|
|
|
/*
|
2004-02-23 01:48:29 +00:00
|
|
|
* Copyright (C) 2001 Havoc Pennington
|
|
|
|
* Copyright (C) 2002 Red Hat Inc.
|
|
|
|
* Copyright (C) 2003 Rob Adams
|
2006-01-10 19:43:21 +00:00
|
|
|
* Copyright (C) 2004-2006 Elijah Newren
|
2012-12-13 01:50:43 +00:00
|
|
|
*
|
2001-06-06 04:47:37 +00:00
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU General Public License as
|
|
|
|
* published by the Free Software Foundation; either version 2 of the
|
|
|
|
* License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful, but
|
|
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* General Public License for more details.
|
2012-12-13 01:50:43 +00:00
|
|
|
*
|
2001-06-06 04:47:37 +00:00
|
|
|
* You should have received a copy of the GNU General Public License
|
2014-01-12 01:42:06 +00:00
|
|
|
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
2001-06-06 04:47:37 +00:00
|
|
|
*/
|
|
|
|
|
2013-02-18 13:19:28 +00:00
|
|
|
/**
|
|
|
|
* SECTION:keybindings
|
|
|
|
* @Title: MetaKeybinding
|
|
|
|
* @Short_Description: Key bindings
|
|
|
|
*/
|
|
|
|
|
2008-02-27 04:39:10 +00:00
|
|
|
#define _GNU_SOURCE
|
|
|
|
|
2001-12-09 22:41:12 +00:00
|
|
|
#include <config.h>
|
2009-01-29 14:16:01 +00:00
|
|
|
#include "keybindings-private.h"
|
2008-09-18 15:09:11 +00:00
|
|
|
#include "workspace-private.h"
|
2012-08-10 00:27:18 +00:00
|
|
|
#include <meta/compositor.h>
|
2011-03-06 00:29:12 +00:00
|
|
|
#include <meta/errors.h>
|
Merge of all the changes on the constraints_experiments branch. This is
2005-11-18 Elijah Newren <newren@gmail.com>
Merge of all the changes on the constraints_experiments branch.
This is just a summary, to get the full ChangeLog of those
changes (approx. 2000 lines):
cvs -q -z3 update -Pd -r constraints_experiments
cvs -q -z3 diff -pu -r CONSTRAINTS_EXPERIMENTS_BRANCHPOINT ChangeLog
Bugs fixed:
unfiled - constraints.c is overly complicated[1]
unfiled - constraints.c is not robust when all constraints
cannot simultaneously be met (constraints need to be
prioritized)
unfiled - keep-titlebar-onscreen constraint is decoration
unaware (since get_outermost_onscreen_positions()
forgets to include decorations)
unfiled - keyboard snap-moving and snap-resizing snap to hidden
edges
109553 - gravity w/ simultaneous move & resize doesn't work
113601 - maximize vertical and horizontal should toggle and be
constrained
122196 - windows show up under vertical panels
122670 - jerky/random resizing of window via keyboard[2]
124582 - keyboard and mouse snap-resizing and snap-moving
erroneously moves the window multidimensionally
136307 - don't allow apps to resize themselves off the screen
(*cough* filechooser *cough*)
142016, 143784 - windows should not span multiple xineramas
unless placed there by the user
143145 - clamp new windows to screensize and force them
onscreen, if they'll fit
144126 - Handle pathological strut lists sanely[3]
149867 - fixed aspect ratio windows are difficult to resize[4]
152898 - make screen edges consistent; allow easy slamming of
windows into the left, right, and bottom edges of the
screen too.
154706 - bouncing weirdness at screen edge with keyboard moving
or resizing
156699 - avoid struts when placing windows, if possible (nasty
a11y blocker)
302456 - dragging offscreen too restrictive
304857 - wireframe moving off the top of the screen is misleading
308521 - make uni-directional resizing easier with
alt-middle-drag and prevent the occasional super
annoying resize-the-wrong-side(s) behavior
312007 - snap-resize moves windows with a minimum size
constraint
312104 - resizing the top of a window can cause the bottom to
grow
319351 - don't instantly snap on mouse-move-snapping, remove
braindeadedness of having order of releasing shift and
releasing button press matter so much
[1] fixed in my opinion, anyway.
[2] Actually, it's not totally fixed--it's just annoying
instead of almost completely unusable. Matthias had a
suggestion that may fix the remainder of the problems (see
http://tinyurl.com/bwzuu).
[3] This bug was originally about not-quite-so-pathological
cases but was left open for the worse cases. The code from
the branch handles the remainder of the cases mentioned in
this bug.
[4] Actually, although it's far better there's still some minor
issues left: a slight drift that's only noticeable after
lots of resizing, and potential problems with partially
onscreen constraints due to not clearing any
fixed_directions flags (aspect ratio windows get resized in
both directions and thus aren't fixed in one of them)
New feature:
81704 - edge resistance for user move and resize operations;
in particular 3 different kinds of resistance are
implemented:
Pixel-Distance: window movement is resisted when it
aligns with an edge unless the movement is greater than
a threshold number of pixels
Timeout: window movement past an edge is prevented until
a certain amount of time has elapsed during the
operation since the first request to move it past that
edge
Keyboard-Buildup: when moving or resizing with the
keyboard, once a window is aligned with a certain edge
it cannot move past until the correct direction has
been pressed enough times (e.g. 2 or 3 times)
Major changes:
- constraints.c has been rewritten; very few lines of code from
the old version remain. There is a comment near the top of
the function explaining the basics of how the new framework
works. A more detailed explanation can be found in
doc/how-constraints-works.txt
- edge-resistance.[ch] are new files implementing edge-resistance.
- boxes.[ch] are new files containing low-level error-prone
functions used heavily in constraints.c and edge-resistance.c,
among various places throughout the code. testboxes.c
contains a thorough testsuite for the boxes.[ch] functions
compiled into a program, testboxes.
- meta_window_move_resize_internal() *must* be told the gravity
of the associated operation (if it's just a move operation,
the gravity will be ignored, but for resize and move+resize
the correct value is needed)
- the craziness of different values that
meta_window_move_resize_internal() accepts has been documented
in a large comment at the beginning of the function. It may
be possible to clean this up some, but until then things will
remain as they were before--caller beware.
- screen and xinerama usable areas (i.e. places not covered by
e.g. panels) are cached in the workspace now, as are the
screen and xinerama edges. These get updated with the
workarea in src/workspace.c:ensure_work_areas_validated()
2005-11-19 14:58:50 +00:00
|
|
|
#include "edge-resistance.h"
|
2001-06-23 05:49:35 +00:00
|
|
|
#include "ui.h"
|
2011-03-06 00:29:12 +00:00
|
|
|
#include "frame.h"
|
2001-07-12 05:53:56 +00:00
|
|
|
#include "place.h"
|
2013-12-11 16:57:45 +00:00
|
|
|
#include "screen-private.h"
|
2011-03-06 00:29:12 +00:00
|
|
|
#include <meta/prefs.h>
|
2013-09-11 08:18:53 +00:00
|
|
|
#include "util-private.h"
|
2014-04-07 14:48:16 +00:00
|
|
|
#include "meta-accel-parse.h"
|
2001-06-06 04:47:37 +00:00
|
|
|
|
2002-04-28 04:52:26 +00:00
|
|
|
#include <string.h>
|
2003-09-29 16:55:26 +00:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
2001-06-06 04:47:37 +00:00
|
|
|
|
2014-04-07 18:24:53 +00:00
|
|
|
#include <linux/input.h>
|
|
|
|
|
2014-04-07 19:41:37 +00:00
|
|
|
#include <xkbcommon/xkbcommon.h>
|
|
|
|
|
2004-10-20 23:16:08 +00:00
|
|
|
#ifdef HAVE_XKB
|
|
|
|
#include <X11/XKBlib.h>
|
|
|
|
#endif
|
|
|
|
|
2014-03-19 02:01:31 +00:00
|
|
|
#include "wayland/meta-wayland.h"
|
2014-04-01 03:19:13 +00:00
|
|
|
#include "meta-backend.h"
|
2014-03-19 02:01:31 +00:00
|
|
|
|
2011-10-28 01:05:43 +00:00
|
|
|
#define SCHEMA_COMMON_KEYBINDINGS "org.gnome.desktop.wm.keybindings"
|
|
|
|
#define SCHEMA_MUTTER_KEYBINDINGS "org.gnome.mutter.keybindings"
|
2013-07-16 12:37:49 +00:00
|
|
|
#define SCHEMA_MUTTER_WAYLAND_KEYBINDINGS "org.gnome.mutter.wayland.keybindings"
|
2011-10-28 01:05:43 +00:00
|
|
|
|
|
|
|
static gboolean add_builtin_keybinding (MetaDisplay *display,
|
|
|
|
const char *name,
|
2012-03-27 14:42:42 +00:00
|
|
|
GSettings *settings,
|
2011-10-28 01:05:43 +00:00
|
|
|
MetaKeyBindingFlags flags,
|
|
|
|
MetaKeyBindingAction action,
|
|
|
|
MetaKeyHandlerFunc handler,
|
|
|
|
int handler_arg);
|
2008-10-06 00:24:07 +00:00
|
|
|
|
2011-11-04 18:18:57 +00:00
|
|
|
static void
|
|
|
|
meta_key_binding_free (MetaKeyBinding *binding)
|
|
|
|
{
|
|
|
|
g_slice_free (MetaKeyBinding, binding);
|
|
|
|
}
|
|
|
|
|
|
|
|
static MetaKeyBinding *
|
|
|
|
meta_key_binding_copy (MetaKeyBinding *binding)
|
|
|
|
{
|
|
|
|
return g_slice_dup (MetaKeyBinding, binding);
|
|
|
|
}
|
|
|
|
|
2012-04-10 05:25:13 +00:00
|
|
|
G_DEFINE_BOXED_TYPE(MetaKeyBinding,
|
|
|
|
meta_key_binding,
|
|
|
|
meta_key_binding_copy,
|
|
|
|
meta_key_binding_free)
|
2011-11-04 18:18:57 +00:00
|
|
|
|
|
|
|
const char *
|
|
|
|
meta_key_binding_get_name (MetaKeyBinding *binding)
|
|
|
|
{
|
|
|
|
return binding->name;
|
|
|
|
}
|
|
|
|
|
|
|
|
MetaVirtualModifier
|
|
|
|
meta_key_binding_get_modifiers (MetaKeyBinding *binding)
|
|
|
|
{
|
|
|
|
return binding->modifiers;
|
|
|
|
}
|
|
|
|
|
|
|
|
guint
|
|
|
|
meta_key_binding_get_mask (MetaKeyBinding *binding)
|
|
|
|
{
|
|
|
|
return binding->mask;
|
|
|
|
}
|
|
|
|
|
2012-11-16 23:32:04 +00:00
|
|
|
gboolean
|
|
|
|
meta_key_binding_is_builtin (MetaKeyBinding *binding)
|
|
|
|
{
|
|
|
|
return binding->handler->flags & META_KEY_BINDING_BUILTIN;
|
|
|
|
}
|
|
|
|
|
2008-10-06 00:24:07 +00:00
|
|
|
/* These can't be bound to anything, but they are used to handle
|
|
|
|
* various other events. TODO: Possibly we should include them as event
|
|
|
|
* handler functions and have some kind of flag to say they're unbindable.
|
|
|
|
*/
|
|
|
|
|
2013-10-03 22:03:53 +00:00
|
|
|
static gboolean process_mouse_move_resize_grab (MetaDisplay *display,
|
|
|
|
MetaScreen *screen,
|
|
|
|
MetaWindow *window,
|
|
|
|
ClutterKeyEvent *event);
|
|
|
|
|
|
|
|
static gboolean process_keyboard_move_grab (MetaDisplay *display,
|
|
|
|
MetaScreen *screen,
|
|
|
|
MetaWindow *window,
|
|
|
|
ClutterKeyEvent *event);
|
|
|
|
|
|
|
|
static gboolean process_keyboard_resize_grab (MetaDisplay *display,
|
|
|
|
MetaScreen *screen,
|
|
|
|
MetaWindow *window,
|
|
|
|
ClutterKeyEvent *event);
|
|
|
|
|
2013-03-31 17:06:40 +00:00
|
|
|
static void grab_key_bindings (MetaDisplay *display);
|
|
|
|
static void ungrab_key_bindings (MetaDisplay *display);
|
2002-04-28 04:52:26 +00:00
|
|
|
|
2011-10-28 01:05:43 +00:00
|
|
|
static GHashTable *key_handlers;
|
2012-08-28 13:28:11 +00:00
|
|
|
static GHashTable *external_grabs;
|
2011-10-28 01:05:43 +00:00
|
|
|
|
|
|
|
#define HANDLER(name) g_hash_table_lookup (key_handlers, (name))
|
|
|
|
|
|
|
|
static void
|
|
|
|
key_handler_free (MetaKeyHandler *handler)
|
|
|
|
{
|
|
|
|
g_free (handler->name);
|
|
|
|
if (handler->user_data_free_func && handler->user_data)
|
|
|
|
handler->user_data_free_func (handler->user_data);
|
|
|
|
g_free (handler);
|
|
|
|
}
|
2001-06-23 05:49:35 +00:00
|
|
|
|
2012-08-28 13:28:11 +00:00
|
|
|
typedef struct _MetaKeyGrab MetaKeyGrab;
|
|
|
|
struct _MetaKeyGrab {
|
|
|
|
char *name;
|
|
|
|
guint action;
|
|
|
|
MetaKeyCombo *combo;
|
|
|
|
};
|
|
|
|
|
|
|
|
static void
|
|
|
|
meta_key_grab_free (MetaKeyGrab *grab)
|
|
|
|
{
|
|
|
|
g_free (grab->name);
|
|
|
|
g_free (grab->combo);
|
|
|
|
g_free (grab);
|
|
|
|
}
|
|
|
|
|
2014-03-03 13:08:34 +00:00
|
|
|
static guint32
|
|
|
|
key_binding_key (guint32 keycode,
|
|
|
|
guint32 mask)
|
|
|
|
{
|
|
|
|
/* On X, keycodes are only 8 bits while libxkbcommon supports 32 bit
|
|
|
|
keycodes, but since we're using the same XKB keymaps that X uses,
|
|
|
|
we won't find keycodes bigger than 8 bits in practice. The bits
|
|
|
|
that mutter cares about in the modifier mask are also all in the
|
|
|
|
lower 8 bits both on X and clutter key events. This means that we
|
|
|
|
can use a 32 bit integer to safely concatenate both keycode and
|
|
|
|
mask and thus making it easy to use them as an index in a
|
|
|
|
GHashTable. */
|
|
|
|
guint32 key = keycode & 0xffff;
|
|
|
|
return (key << 16) | (mask & 0xffff);
|
|
|
|
}
|
|
|
|
|
2012-08-28 13:28:11 +00:00
|
|
|
|
2001-06-23 05:49:35 +00:00
|
|
|
static void
|
2002-04-28 04:52:26 +00:00
|
|
|
reload_keymap (MetaDisplay *display)
|
|
|
|
{
|
|
|
|
if (display->keymap)
|
|
|
|
meta_XFree (display->keymap);
|
|
|
|
|
|
|
|
display->keymap = XGetKeyboardMapping (display->xdisplay,
|
|
|
|
display->min_keycode,
|
|
|
|
display->max_keycode -
|
2004-10-15 22:43:52 +00:00
|
|
|
display->min_keycode + 1,
|
2012-12-13 01:50:43 +00:00
|
|
|
&display->keysyms_per_keycode);
|
2002-04-28 04:52:26 +00:00
|
|
|
}
|
|
|
|
|
2014-04-07 21:49:06 +00:00
|
|
|
static const char *
|
|
|
|
keysym_name (xkb_keysym_t keysym)
|
|
|
|
{
|
|
|
|
static char name[32] = "";
|
|
|
|
xkb_keysym_get_name (keysym, name, sizeof (name));
|
|
|
|
return name;
|
|
|
|
}
|
|
|
|
|
2002-04-28 04:52:26 +00:00
|
|
|
static void
|
|
|
|
reload_modmap (MetaDisplay *display)
|
2001-06-06 04:47:37 +00:00
|
|
|
{
|
2002-04-28 04:52:26 +00:00
|
|
|
XModifierKeymap *modmap;
|
|
|
|
int map_size;
|
2001-06-06 04:47:37 +00:00
|
|
|
int i;
|
2014-04-07 21:19:39 +00:00
|
|
|
int num_lock_mask = 0;
|
|
|
|
int scroll_lock_mask = 0;
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2002-04-28 04:52:26 +00:00
|
|
|
modmap = XGetModifierMapping (display->xdisplay);
|
|
|
|
display->ignored_modifier_mask = 0;
|
|
|
|
|
|
|
|
/* Multiple bits may get set in each of these */
|
2002-07-14 03:16:41 +00:00
|
|
|
display->meta_mask = 0;
|
|
|
|
display->hyper_mask = 0;
|
|
|
|
display->super_mask = 0;
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2002-04-28 04:52:26 +00:00
|
|
|
/* there are 8 modifiers, and the first 3 are shift, shift lock,
|
|
|
|
* and control
|
|
|
|
*/
|
|
|
|
map_size = 8 * modmap->max_keypermod;
|
|
|
|
i = 3 * modmap->max_keypermod;
|
|
|
|
while (i < map_size)
|
2001-06-06 04:47:37 +00:00
|
|
|
{
|
2002-04-28 04:52:26 +00:00
|
|
|
/* get the key code at this point in the map,
|
|
|
|
* see if its keysym is one we're interested in
|
|
|
|
*/
|
2006-04-13 13:16:42 +00:00
|
|
|
int keycode = modmap->modifiermap[i];
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2002-04-28 04:52:26 +00:00
|
|
|
if (keycode >= display->min_keycode &&
|
|
|
|
keycode <= display->max_keycode)
|
|
|
|
{
|
|
|
|
int j = 0;
|
|
|
|
KeySym *syms = display->keymap +
|
|
|
|
(keycode - display->min_keycode) * display->keysyms_per_keycode;
|
|
|
|
|
|
|
|
while (j < display->keysyms_per_keycode)
|
|
|
|
{
|
2002-06-16 03:03:08 +00:00
|
|
|
if (syms[j] != 0)
|
|
|
|
{
|
|
|
|
meta_topic (META_DEBUG_KEYBINDINGS,
|
|
|
|
"Keysym %s bound to modifier 0x%x\n",
|
2014-04-07 21:49:06 +00:00
|
|
|
keysym_name (syms[j]),
|
2002-06-16 03:03:08 +00:00
|
|
|
(1 << ( i / modmap->max_keypermod)));
|
|
|
|
}
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2014-04-07 21:45:38 +00:00
|
|
|
if (syms[j] == XKB_KEY_Num_Lock)
|
2002-04-28 04:52:26 +00:00
|
|
|
{
|
|
|
|
/* Mod1Mask is 1 << 3 for example, i.e. the
|
|
|
|
* fourth modifier, i / keyspermod is the modifier
|
|
|
|
* index
|
|
|
|
*/
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2014-04-07 21:19:39 +00:00
|
|
|
num_lock_mask |= (1 << ( i / modmap->max_keypermod));
|
2002-04-28 04:52:26 +00:00
|
|
|
}
|
2014-04-07 21:45:38 +00:00
|
|
|
else if (syms[j] == XKB_KEY_Scroll_Lock)
|
2002-04-28 04:52:26 +00:00
|
|
|
{
|
2014-04-07 21:19:39 +00:00
|
|
|
scroll_lock_mask |= (1 << ( i / modmap->max_keypermod));
|
2002-04-28 04:52:26 +00:00
|
|
|
}
|
2014-04-07 21:45:38 +00:00
|
|
|
else if (syms[j] == XKB_KEY_Super_L ||
|
|
|
|
syms[j] == XKB_KEY_Super_R)
|
2002-07-14 03:16:41 +00:00
|
|
|
{
|
|
|
|
display->super_mask |= (1 << ( i / modmap->max_keypermod));
|
|
|
|
}
|
2014-04-07 21:45:38 +00:00
|
|
|
else if (syms[j] == XKB_KEY_Hyper_L ||
|
|
|
|
syms[j] == XKB_KEY_Hyper_R)
|
2002-07-14 03:16:41 +00:00
|
|
|
{
|
|
|
|
display->hyper_mask |= (1 << ( i / modmap->max_keypermod));
|
2012-12-13 01:50:43 +00:00
|
|
|
}
|
2014-04-07 21:45:38 +00:00
|
|
|
else if (syms[j] == XKB_KEY_Meta_L ||
|
|
|
|
syms[j] == XKB_KEY_Meta_R)
|
2002-07-14 03:16:41 +00:00
|
|
|
{
|
|
|
|
display->meta_mask |= (1 << ( i / modmap->max_keypermod));
|
|
|
|
}
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2002-04-28 04:52:26 +00:00
|
|
|
++j;
|
|
|
|
}
|
|
|
|
}
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2001-06-06 04:47:37 +00:00
|
|
|
++i;
|
|
|
|
}
|
2002-04-28 04:52:26 +00:00
|
|
|
|
2014-04-07 21:19:39 +00:00
|
|
|
display->ignored_modifier_mask = (num_lock_mask |
|
|
|
|
scroll_lock_mask |
|
2002-05-11 02:38:58 +00:00
|
|
|
LockMask);
|
2002-04-28 04:52:26 +00:00
|
|
|
|
|
|
|
meta_topic (META_DEBUG_KEYBINDINGS,
|
2002-07-14 03:16:41 +00:00
|
|
|
"Ignoring modmask 0x%x num lock 0x%x scroll lock 0x%x hyper 0x%x super 0x%x meta 0x%x\n",
|
2002-04-28 04:52:26 +00:00
|
|
|
display->ignored_modifier_mask,
|
2014-04-07 21:19:39 +00:00
|
|
|
num_lock_mask,
|
|
|
|
scroll_lock_mask,
|
2002-07-14 03:16:41 +00:00
|
|
|
display->hyper_mask,
|
|
|
|
display->super_mask,
|
|
|
|
display->meta_mask);
|
2014-04-07 19:41:37 +00:00
|
|
|
|
|
|
|
XFreeModifiermap (modmap);
|
2002-04-28 04:52:26 +00:00
|
|
|
}
|
|
|
|
|
2013-04-10 11:34:26 +00:00
|
|
|
/* Original code from gdk_x11_keymap_get_entries_for_keyval() in
|
|
|
|
* gdkkeys-x11.c */
|
|
|
|
static int
|
|
|
|
get_keycodes_for_keysym (MetaDisplay *display,
|
|
|
|
int keysym,
|
|
|
|
int **keycodes)
|
|
|
|
{
|
|
|
|
GArray *retval;
|
|
|
|
int n_keycodes;
|
|
|
|
int keycode;
|
|
|
|
|
|
|
|
retval = g_array_new (FALSE, FALSE, sizeof (int));
|
|
|
|
|
2014-04-07 18:49:46 +00:00
|
|
|
/* Special-case: Fake mutter keysym */
|
|
|
|
if (keysym == META_KEY_ABOVE_TAB)
|
|
|
|
{
|
2014-04-07 18:24:53 +00:00
|
|
|
keycode = KEY_GRAVE + 8;
|
2014-04-07 18:49:46 +00:00
|
|
|
g_array_append_val (retval, keycode);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2013-04-10 11:34:26 +00:00
|
|
|
keycode = display->min_keycode;
|
|
|
|
while (keycode <= display->max_keycode)
|
|
|
|
{
|
|
|
|
const KeySym *syms = display->keymap + (keycode - display->min_keycode) * display->keysyms_per_keycode;
|
|
|
|
int i = 0;
|
|
|
|
|
|
|
|
while (i < display->keysyms_per_keycode)
|
|
|
|
{
|
|
|
|
if (syms[i] == (unsigned int)keysym)
|
|
|
|
g_array_append_val (retval, keycode);
|
|
|
|
|
|
|
|
++i;
|
|
|
|
}
|
|
|
|
|
|
|
|
++keycode;
|
|
|
|
}
|
|
|
|
|
2014-04-07 18:49:46 +00:00
|
|
|
out:
|
2013-04-10 11:34:26 +00:00
|
|
|
n_keycodes = retval->len;
|
|
|
|
*keycodes = (int*) g_array_free (retval, n_keycodes == 0 ? TRUE : FALSE);
|
|
|
|
return n_keycodes;
|
|
|
|
}
|
|
|
|
|
2014-04-07 18:51:13 +00:00
|
|
|
static guint
|
|
|
|
get_first_keycode_for_keysym (MetaDisplay *display,
|
|
|
|
guint keysym)
|
|
|
|
{
|
|
|
|
int *keycodes;
|
|
|
|
int n_keycodes;
|
|
|
|
int keycode;
|
|
|
|
|
|
|
|
n_keycodes = get_keycodes_for_keysym (display, keysym, &keycodes);
|
|
|
|
|
|
|
|
if (n_keycodes > 0)
|
|
|
|
keycode = keycodes[0];
|
|
|
|
else
|
|
|
|
keycode = 0;
|
|
|
|
|
|
|
|
g_free (keycodes);
|
|
|
|
return keycode;
|
|
|
|
}
|
|
|
|
|
2013-04-10 11:34:26 +00:00
|
|
|
static void
|
|
|
|
reload_iso_next_group_combos (MetaDisplay *display)
|
|
|
|
{
|
|
|
|
const char *iso_next_group_option;
|
|
|
|
MetaKeyCombo *combos;
|
|
|
|
int *keycodes;
|
|
|
|
int n_keycodes;
|
|
|
|
int n_combos;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
g_clear_pointer (&display->iso_next_group_combos, g_free);
|
|
|
|
display->n_iso_next_group_combos = 0;
|
|
|
|
|
|
|
|
iso_next_group_option = meta_prefs_get_iso_next_group_option ();
|
|
|
|
if (iso_next_group_option == NULL)
|
|
|
|
return;
|
|
|
|
|
2014-04-07 21:45:38 +00:00
|
|
|
n_keycodes = get_keycodes_for_keysym (display, XKB_KEY_ISO_Next_Group, &keycodes);
|
2013-04-10 11:34:26 +00:00
|
|
|
|
|
|
|
if (g_str_equal (iso_next_group_option, "toggle") ||
|
|
|
|
g_str_equal (iso_next_group_option, "lalt_toggle") ||
|
|
|
|
g_str_equal (iso_next_group_option, "lwin_toggle") ||
|
|
|
|
g_str_equal (iso_next_group_option, "rwin_toggle") ||
|
|
|
|
g_str_equal (iso_next_group_option, "lshift_toggle") ||
|
|
|
|
g_str_equal (iso_next_group_option, "rshift_toggle") ||
|
|
|
|
g_str_equal (iso_next_group_option, "lctrl_toggle") ||
|
|
|
|
g_str_equal (iso_next_group_option, "rctrl_toggle") ||
|
|
|
|
g_str_equal (iso_next_group_option, "sclk_toggle") ||
|
|
|
|
g_str_equal (iso_next_group_option, "menu_toggle") ||
|
|
|
|
g_str_equal (iso_next_group_option, "caps_toggle"))
|
|
|
|
{
|
|
|
|
n_combos = n_keycodes;
|
|
|
|
combos = g_new (MetaKeyCombo, n_combos);
|
|
|
|
|
|
|
|
for (i = 0; i < n_keycodes; ++i)
|
|
|
|
{
|
2014-04-07 21:45:38 +00:00
|
|
|
combos[i].keysym = XKB_KEY_ISO_Next_Group;
|
2013-04-10 11:34:26 +00:00
|
|
|
combos[i].keycode = keycodes[i];
|
|
|
|
combos[i].modifiers = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (g_str_equal (iso_next_group_option, "shift_caps_toggle") ||
|
|
|
|
g_str_equal (iso_next_group_option, "shifts_toggle"))
|
|
|
|
{
|
|
|
|
n_combos = n_keycodes;
|
|
|
|
combos = g_new (MetaKeyCombo, n_combos);
|
|
|
|
|
|
|
|
for (i = 0; i < n_keycodes; ++i)
|
|
|
|
{
|
2014-04-07 21:45:38 +00:00
|
|
|
combos[i].keysym = XKB_KEY_ISO_Next_Group;
|
2013-04-10 11:34:26 +00:00
|
|
|
combos[i].keycode = keycodes[i];
|
|
|
|
combos[i].modifiers = ShiftMask;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (g_str_equal (iso_next_group_option, "alt_caps_toggle") ||
|
|
|
|
g_str_equal (iso_next_group_option, "alt_space_toggle"))
|
|
|
|
{
|
|
|
|
n_combos = n_keycodes;
|
|
|
|
combos = g_new (MetaKeyCombo, n_combos);
|
|
|
|
|
|
|
|
for (i = 0; i < n_keycodes; ++i)
|
|
|
|
{
|
2014-04-07 21:45:38 +00:00
|
|
|
combos[i].keysym = XKB_KEY_ISO_Next_Group;
|
2013-04-10 11:34:26 +00:00
|
|
|
combos[i].keycode = keycodes[i];
|
|
|
|
combos[i].modifiers = Mod1Mask;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (g_str_equal (iso_next_group_option, "ctrl_shift_toggle") ||
|
|
|
|
g_str_equal (iso_next_group_option, "lctrl_lshift_toggle") ||
|
|
|
|
g_str_equal (iso_next_group_option, "rctrl_rshift_toggle"))
|
|
|
|
{
|
|
|
|
n_combos = n_keycodes * 2;
|
|
|
|
combos = g_new (MetaKeyCombo, n_combos);
|
|
|
|
|
|
|
|
for (i = 0; i < n_keycodes; ++i)
|
|
|
|
{
|
2014-04-07 21:45:38 +00:00
|
|
|
combos[i].keysym = XKB_KEY_ISO_Next_Group;
|
2013-04-10 11:34:26 +00:00
|
|
|
combos[i].keycode = keycodes[i];
|
|
|
|
combos[i].modifiers = ShiftMask;
|
|
|
|
|
2014-04-07 21:45:38 +00:00
|
|
|
combos[i + n_keycodes].keysym = XKB_KEY_ISO_Next_Group;
|
2013-04-10 11:34:26 +00:00
|
|
|
combos[i + n_keycodes].keycode = keycodes[i];
|
|
|
|
combos[i + n_keycodes].modifiers = ControlMask;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (g_str_equal (iso_next_group_option, "ctrl_alt_toggle"))
|
|
|
|
{
|
|
|
|
n_combos = n_keycodes * 2;
|
|
|
|
combos = g_new (MetaKeyCombo, n_combos);
|
|
|
|
|
|
|
|
for (i = 0; i < n_keycodes; ++i)
|
|
|
|
{
|
2014-04-07 21:45:38 +00:00
|
|
|
combos[i].keysym = XKB_KEY_ISO_Next_Group;
|
2013-04-10 11:34:26 +00:00
|
|
|
combos[i].keycode = keycodes[i];
|
|
|
|
combos[i].modifiers = Mod1Mask;
|
|
|
|
|
2014-04-07 21:45:38 +00:00
|
|
|
combos[i + n_keycodes].keysym = XKB_KEY_ISO_Next_Group;
|
2013-04-10 11:34:26 +00:00
|
|
|
combos[i + n_keycodes].keycode = keycodes[i];
|
|
|
|
combos[i + n_keycodes].modifiers = ControlMask;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (g_str_equal (iso_next_group_option, "alt_shift_toggle") ||
|
|
|
|
g_str_equal (iso_next_group_option, "lalt_lshift_toggle"))
|
|
|
|
{
|
|
|
|
n_combos = n_keycodes * 2;
|
|
|
|
combos = g_new (MetaKeyCombo, n_combos);
|
|
|
|
|
|
|
|
for (i = 0; i < n_keycodes; ++i)
|
|
|
|
{
|
2014-04-07 21:45:38 +00:00
|
|
|
combos[i].keysym = XKB_KEY_ISO_Next_Group;
|
2013-04-10 11:34:26 +00:00
|
|
|
combos[i].keycode = keycodes[i];
|
|
|
|
combos[i].modifiers = Mod1Mask;
|
|
|
|
|
2014-04-07 21:45:38 +00:00
|
|
|
combos[i + n_keycodes].keysym = XKB_KEY_ISO_Next_Group;
|
2013-04-10 11:34:26 +00:00
|
|
|
combos[i + n_keycodes].keycode = keycodes[i];
|
|
|
|
combos[i + n_keycodes].modifiers = ShiftMask;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
n_combos = 0;
|
|
|
|
combos = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
g_free (keycodes);
|
|
|
|
|
|
|
|
display->n_iso_next_group_combos = n_combos;
|
|
|
|
display->iso_next_group_combos = combos;
|
|
|
|
}
|
|
|
|
|
2014-03-03 13:08:34 +00:00
|
|
|
static void
|
|
|
|
binding_reload_keycode_foreach (gpointer key,
|
|
|
|
gpointer value,
|
|
|
|
gpointer data)
|
|
|
|
{
|
|
|
|
MetaDisplay *display = data;
|
|
|
|
MetaKeyBinding *binding = value;
|
|
|
|
|
|
|
|
if (binding->keysym)
|
2014-04-07 18:51:13 +00:00
|
|
|
binding->keycode = get_first_keycode_for_keysym (display, binding->keysym);
|
2014-03-03 13:08:34 +00:00
|
|
|
}
|
|
|
|
|
2002-04-28 04:52:26 +00:00
|
|
|
static void
|
|
|
|
reload_keycodes (MetaDisplay *display)
|
|
|
|
{
|
|
|
|
meta_topic (META_DEBUG_KEYBINDINGS,
|
|
|
|
"Reloading keycodes for binding tables\n");
|
2010-11-22 21:10:34 +00:00
|
|
|
|
|
|
|
if (display->overlay_key_combo.keysym != 0)
|
2008-12-02 23:13:11 +00:00
|
|
|
{
|
2010-11-22 23:21:47 +00:00
|
|
|
display->overlay_key_combo.keycode =
|
2014-04-07 18:51:13 +00:00
|
|
|
get_first_keycode_for_keysym (display, display->overlay_key_combo.keysym);
|
2008-12-02 23:13:11 +00:00
|
|
|
}
|
2012-08-29 19:03:31 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
display->overlay_key_combo.keycode = 0;
|
|
|
|
}
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2013-04-10 11:34:26 +00:00
|
|
|
reload_iso_next_group_combos (display);
|
|
|
|
|
2014-03-03 13:08:34 +00:00
|
|
|
g_hash_table_foreach (display->key_bindings, binding_reload_keycode_foreach, display);
|
|
|
|
}
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2014-03-03 13:08:34 +00:00
|
|
|
static void
|
|
|
|
binding_reload_modifiers_foreach (gpointer key,
|
|
|
|
gpointer value,
|
|
|
|
gpointer data)
|
|
|
|
{
|
|
|
|
MetaDisplay *display = data;
|
|
|
|
MetaKeyBinding *binding = value;
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2014-03-03 13:08:34 +00:00
|
|
|
meta_display_devirtualize_modifiers (display,
|
|
|
|
binding->modifiers,
|
|
|
|
&binding->mask);
|
|
|
|
meta_topic (META_DEBUG_KEYBINDINGS,
|
|
|
|
" Devirtualized mods 0x%x -> 0x%x (%s)\n",
|
|
|
|
binding->modifiers,
|
|
|
|
binding->mask,
|
|
|
|
binding->name);
|
2002-04-28 04:52:26 +00:00
|
|
|
}
|
|
|
|
|
2002-07-14 03:16:41 +00:00
|
|
|
static void
|
|
|
|
reload_modifiers (MetaDisplay *display)
|
|
|
|
{
|
|
|
|
meta_topic (META_DEBUG_KEYBINDINGS,
|
|
|
|
"Reloading keycodes for binding tables\n");
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2014-03-03 13:08:34 +00:00
|
|
|
g_hash_table_foreach (display->key_bindings, binding_reload_modifiers_foreach, display);
|
2002-07-14 03:16:41 +00:00
|
|
|
}
|
|
|
|
|
2014-03-03 13:08:34 +00:00
|
|
|
static void
|
|
|
|
index_binding (MetaDisplay *display,
|
|
|
|
MetaKeyBinding *binding)
|
2002-04-28 04:52:26 +00:00
|
|
|
{
|
2014-03-03 13:08:34 +00:00
|
|
|
guint32 index_key;
|
2002-04-28 04:52:26 +00:00
|
|
|
|
2014-03-03 13:08:34 +00:00
|
|
|
index_key = key_binding_key (binding->keycode, binding->mask);
|
|
|
|
g_hash_table_replace (display->key_bindings_index,
|
|
|
|
GINT_TO_POINTER (index_key), binding);
|
|
|
|
}
|
2003-02-22 20:31:51 +00:00
|
|
|
|
2014-03-03 13:08:34 +00:00
|
|
|
static void
|
|
|
|
binding_index_foreach (gpointer key,
|
|
|
|
gpointer value,
|
|
|
|
gpointer data)
|
|
|
|
{
|
|
|
|
MetaDisplay *display = data;
|
|
|
|
MetaKeyBinding *binding = value;
|
2002-04-28 04:52:26 +00:00
|
|
|
|
2014-03-03 13:08:34 +00:00
|
|
|
index_binding (display, binding);
|
|
|
|
}
|
2008-11-22 19:02:54 +00:00
|
|
|
|
2014-03-03 13:08:34 +00:00
|
|
|
static void
|
|
|
|
rebuild_binding_index (MetaDisplay *display)
|
|
|
|
{
|
|
|
|
g_hash_table_remove_all (display->key_bindings_index);
|
|
|
|
g_hash_table_foreach (display->key_bindings, binding_index_foreach, display);
|
2008-11-22 19:02:54 +00:00
|
|
|
}
|
|
|
|
|
2002-04-28 04:52:26 +00:00
|
|
|
static void
|
2011-10-28 01:05:43 +00:00
|
|
|
rebuild_binding_table (MetaDisplay *display,
|
2012-08-28 13:28:11 +00:00
|
|
|
GList *prefs,
|
|
|
|
GList *grabs)
|
2002-04-28 04:52:26 +00:00
|
|
|
{
|
2014-03-03 13:08:34 +00:00
|
|
|
MetaKeyBinding *b;
|
2012-08-28 13:28:11 +00:00
|
|
|
GList *p, *g;
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2014-03-03 13:08:34 +00:00
|
|
|
g_hash_table_remove_all (display->key_bindings);
|
2002-04-28 04:52:26 +00:00
|
|
|
|
2011-10-28 01:05:43 +00:00
|
|
|
p = prefs;
|
|
|
|
while (p)
|
2002-04-28 04:52:26 +00:00
|
|
|
{
|
2011-10-28 01:05:43 +00:00
|
|
|
MetaKeyPref *pref = (MetaKeyPref*)p->data;
|
2014-02-25 18:49:16 +00:00
|
|
|
GSList *tmp = pref->combos;
|
Allow any keybinding pref to be specified either with <foo>, a string, or
2004-04-17 Thomas Thurman <thomas@thurman.org.uk>
* keybindings.c (count_bindings, rebuild_binding_table):
* prefs.c (change_notify, screen_bindings,
window_bindings, init_bindings, update_binding,
find_and_update_list_binding, update_list_binding,
meta_prefs_get_window_binding): Allow any keybinding pref
to be specified either with <foo>, a string, or <foo>_list,
a list of strings, or both. Fixes #164831.
2006-04-17 17:23:09 +00:00
|
|
|
|
|
|
|
while (tmp)
|
2002-04-28 04:52:26 +00:00
|
|
|
{
|
Allow any keybinding pref to be specified either with <foo>, a string, or
2004-04-17 Thomas Thurman <thomas@thurman.org.uk>
* keybindings.c (count_bindings, rebuild_binding_table):
* prefs.c (change_notify, screen_bindings,
window_bindings, init_bindings, update_binding,
find_and_update_list_binding, update_list_binding,
meta_prefs_get_window_binding): Allow any keybinding pref
to be specified either with <foo>, a string, or <foo>_list,
a list of strings, or both. Fixes #164831.
2006-04-17 17:23:09 +00:00
|
|
|
MetaKeyCombo *combo = tmp->data;
|
2003-02-22 20:31:51 +00:00
|
|
|
|
Patch from Ed Catmur to fix keybindings with hex-values (coming from
2006-08-21 Elijah Newren <newren gmail com>
Patch from Ed Catmur to fix keybindings with hex-values (coming
from special extended keyboard keys). #140448.
* src/keybindings.c (struct _MetaKeyBinding): change keycode from
KeyCode to unsigned int (comment from Elijah: why???),
(reload_keycodes): only grab keysyms for keybindings that have
them, (count_bindings, rebuild_binding_table): bindings can be
valid either due to a valid keysym or a valid keycode,
(display_get_keybinding_action, meta_change_keygrab,
process_tab_grab, process_workspace_switch_grab): handle keycode
as well as keysym
* src/prefs.[ch] (struct MetaKeyCombo, update_binding,
update_list_binding): handle keycode as well as keysym
* src/ui.[ch] (meta_ui_accelerator_parse): new function special
cases strings of the form "0x[0-9a-fA-F]+" and otherwise calling
gtk_accelerator_parse(), (meta_ui_parse_accelerator,
meta_ui_parse_modifier): call meta_ui_accelerator_parse instead of
gtk_accelerator_parse.
2006-08-21 19:06:26 +00:00
|
|
|
if (combo && (combo->keysym != None || combo->keycode != 0))
|
2003-02-22 20:31:51 +00:00
|
|
|
{
|
2011-10-28 01:05:43 +00:00
|
|
|
MetaKeyHandler *handler = HANDLER (pref->name);
|
|
|
|
|
2014-03-03 13:08:34 +00:00
|
|
|
b = g_malloc0 (sizeof (MetaKeyBinding));
|
|
|
|
|
|
|
|
b->name = pref->name;
|
|
|
|
b->handler = handler;
|
|
|
|
b->flags = handler->flags;
|
|
|
|
b->keysym = combo->keysym;
|
|
|
|
b->keycode = combo->keycode;
|
|
|
|
b->modifiers = combo->modifiers;
|
|
|
|
b->mask = 0;
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2014-03-03 13:08:34 +00:00
|
|
|
g_hash_table_add (display->key_bindings, b);
|
Allow any keybinding pref to be specified either with <foo>, a string, or
2004-04-17 Thomas Thurman <thomas@thurman.org.uk>
* keybindings.c (count_bindings, rebuild_binding_table):
* prefs.c (change_notify, screen_bindings,
window_bindings, init_bindings, update_binding,
find_and_update_list_binding, update_list_binding,
meta_prefs_get_window_binding): Allow any keybinding pref
to be specified either with <foo>, a string, or <foo>_list,
a list of strings, or both. Fixes #164831.
2006-04-17 17:23:09 +00:00
|
|
|
|
2011-10-28 01:05:43 +00:00
|
|
|
if (pref->add_shift &&
|
Allow any keybinding pref to be specified either with <foo>, a string, or
2004-04-17 Thomas Thurman <thomas@thurman.org.uk>
* keybindings.c (count_bindings, rebuild_binding_table):
* prefs.c (change_notify, screen_bindings,
window_bindings, init_bindings, update_binding,
find_and_update_list_binding, update_list_binding,
meta_prefs_get_window_binding): Allow any keybinding pref
to be specified either with <foo>, a string, or <foo>_list,
a list of strings, or both. Fixes #164831.
2006-04-17 17:23:09 +00:00
|
|
|
(combo->modifiers & META_VIRTUAL_SHIFT_MASK) == 0)
|
|
|
|
{
|
|
|
|
meta_topic (META_DEBUG_KEYBINDINGS,
|
|
|
|
"Binding %s also needs Shift grabbed\n",
|
2012-12-13 01:50:43 +00:00
|
|
|
pref->name);
|
|
|
|
|
2014-03-03 13:08:34 +00:00
|
|
|
b = g_malloc0 (sizeof (MetaKeyBinding));
|
|
|
|
|
|
|
|
b->name = pref->name;
|
|
|
|
b->handler = handler;
|
|
|
|
b->flags = handler->flags;
|
|
|
|
b->keysym = combo->keysym;
|
|
|
|
b->keycode = combo->keycode;
|
|
|
|
b->modifiers = combo->modifiers | META_VIRTUAL_SHIFT_MASK;
|
|
|
|
b->mask = 0;
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2014-03-03 13:08:34 +00:00
|
|
|
g_hash_table_add (display->key_bindings, b);
|
Allow any keybinding pref to be specified either with <foo>, a string, or
2004-04-17 Thomas Thurman <thomas@thurman.org.uk>
* keybindings.c (count_bindings, rebuild_binding_table):
* prefs.c (change_notify, screen_bindings,
window_bindings, init_bindings, update_binding,
find_and_update_list_binding, update_list_binding,
meta_prefs_get_window_binding): Allow any keybinding pref
to be specified either with <foo>, a string, or <foo>_list,
a list of strings, or both. Fixes #164831.
2006-04-17 17:23:09 +00:00
|
|
|
}
|
2003-02-22 20:31:51 +00:00
|
|
|
}
|
2012-12-13 01:50:43 +00:00
|
|
|
|
Allow any keybinding pref to be specified either with <foo>, a string, or
2004-04-17 Thomas Thurman <thomas@thurman.org.uk>
* keybindings.c (count_bindings, rebuild_binding_table):
* prefs.c (change_notify, screen_bindings,
window_bindings, init_bindings, update_binding,
find_and_update_list_binding, update_list_binding,
meta_prefs_get_window_binding): Allow any keybinding pref
to be specified either with <foo>, a string, or <foo>_list,
a list of strings, or both. Fixes #164831.
2006-04-17 17:23:09 +00:00
|
|
|
tmp = tmp->next;
|
2002-04-28 04:52:26 +00:00
|
|
|
}
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2011-10-28 01:05:43 +00:00
|
|
|
p = p->next;
|
2002-04-28 04:52:26 +00:00
|
|
|
}
|
|
|
|
|
2012-08-28 13:28:11 +00:00
|
|
|
g = grabs;
|
|
|
|
while (g)
|
|
|
|
{
|
|
|
|
MetaKeyGrab *grab = (MetaKeyGrab*)g->data;
|
|
|
|
if (grab->combo && (grab->combo->keysym != None || grab->combo->keycode != 0))
|
|
|
|
{
|
|
|
|
MetaKeyHandler *handler = HANDLER ("external-grab");
|
|
|
|
|
2014-03-03 13:08:34 +00:00
|
|
|
b = g_malloc0 (sizeof (MetaKeyBinding));
|
2012-08-28 13:28:11 +00:00
|
|
|
|
2014-03-03 13:08:34 +00:00
|
|
|
b->name = grab->name;
|
|
|
|
b->handler = handler;
|
|
|
|
b->flags = handler->flags;
|
|
|
|
b->keysym = grab->combo->keysym;
|
|
|
|
b->keycode = grab->combo->keycode;
|
|
|
|
b->modifiers = grab->combo->modifiers;
|
|
|
|
b->mask = 0;
|
|
|
|
|
|
|
|
g_hash_table_add (display->key_bindings, b);
|
2012-08-28 13:28:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
g = g->next;
|
|
|
|
}
|
|
|
|
|
2003-02-22 20:31:51 +00:00
|
|
|
meta_topic (META_DEBUG_KEYBINDINGS,
|
|
|
|
" %d bindings in table\n",
|
2014-03-03 13:08:34 +00:00
|
|
|
g_hash_table_size (display->key_bindings));
|
2003-02-22 20:31:51 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2008-11-22 19:02:54 +00:00
|
|
|
rebuild_key_binding_table (MetaDisplay *display)
|
2003-02-22 20:31:51 +00:00
|
|
|
{
|
2012-08-28 13:28:11 +00:00
|
|
|
GList *prefs, *grabs;
|
2011-10-28 01:05:43 +00:00
|
|
|
|
2003-02-22 20:31:51 +00:00
|
|
|
meta_topic (META_DEBUG_KEYBINDINGS,
|
2008-11-22 19:02:54 +00:00
|
|
|
"Rebuilding key binding table from preferences\n");
|
2011-10-28 01:05:43 +00:00
|
|
|
|
|
|
|
prefs = meta_prefs_get_keybindings ();
|
2012-08-28 13:28:11 +00:00
|
|
|
grabs = g_hash_table_get_values (external_grabs);
|
2014-03-03 13:08:34 +00:00
|
|
|
rebuild_binding_table (display, prefs, grabs);
|
2011-10-28 01:05:43 +00:00
|
|
|
g_list_free (prefs);
|
2012-08-28 13:28:11 +00:00
|
|
|
g_list_free (grabs);
|
2003-02-22 20:31:51 +00:00
|
|
|
}
|
2002-04-28 04:52:26 +00:00
|
|
|
|
2008-12-02 23:13:11 +00:00
|
|
|
static void
|
|
|
|
rebuild_special_bindings (MetaDisplay *display)
|
|
|
|
{
|
|
|
|
MetaKeyCombo combo;
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2008-12-02 23:13:11 +00:00
|
|
|
meta_prefs_get_overlay_binding (&combo);
|
2012-08-29 19:03:31 +00:00
|
|
|
display->overlay_key_combo = combo;
|
2008-12-02 23:13:11 +00:00
|
|
|
}
|
|
|
|
|
2003-02-22 20:31:51 +00:00
|
|
|
static void
|
2013-03-31 17:06:40 +00:00
|
|
|
ungrab_key_bindings (MetaDisplay *display)
|
2002-04-28 04:52:26 +00:00
|
|
|
{
|
|
|
|
GSList *tmp;
|
2008-11-22 19:02:54 +00:00
|
|
|
GSList *windows;
|
2002-04-28 04:52:26 +00:00
|
|
|
|
2002-11-06 16:00:56 +00:00
|
|
|
meta_error_trap_push (display); /* for efficiency push outer trap */
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2013-10-03 22:31:09 +00:00
|
|
|
meta_screen_ungrab_keys (display->screen);
|
2002-11-06 16:00:56 +00:00
|
|
|
|
2009-06-15 19:32:23 +00:00
|
|
|
windows = meta_display_list_windows (display, META_LIST_DEFAULT);
|
2002-04-28 04:52:26 +00:00
|
|
|
tmp = windows;
|
|
|
|
while (tmp != NULL)
|
|
|
|
{
|
|
|
|
MetaWindow *w = tmp->data;
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2002-04-28 04:52:26 +00:00
|
|
|
meta_window_ungrab_keys (w);
|
2013-03-31 17:06:40 +00:00
|
|
|
|
|
|
|
tmp = tmp->next;
|
|
|
|
}
|
|
|
|
meta_error_trap_pop (display);
|
|
|
|
|
|
|
|
g_slist_free (windows);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
grab_key_bindings (MetaDisplay *display)
|
|
|
|
{
|
|
|
|
GSList *tmp;
|
|
|
|
GSList *windows;
|
|
|
|
|
|
|
|
meta_error_trap_push (display); /* for efficiency push outer trap */
|
|
|
|
|
2013-10-03 22:31:09 +00:00
|
|
|
meta_screen_grab_keys (display->screen);
|
2013-03-31 17:06:40 +00:00
|
|
|
|
|
|
|
windows = meta_display_list_windows (display, META_LIST_DEFAULT);
|
|
|
|
tmp = windows;
|
|
|
|
while (tmp != NULL)
|
|
|
|
{
|
|
|
|
MetaWindow *w = tmp->data;
|
|
|
|
|
2002-04-28 04:52:26 +00:00
|
|
|
meta_window_grab_keys (w);
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2002-04-28 04:52:26 +00:00
|
|
|
tmp = tmp->next;
|
|
|
|
}
|
2010-10-25 18:44:30 +00:00
|
|
|
meta_error_trap_pop (display);
|
2002-04-28 04:52:26 +00:00
|
|
|
|
|
|
|
g_slist_free (windows);
|
|
|
|
}
|
|
|
|
|
2009-08-25 20:54:54 +00:00
|
|
|
static MetaKeyBinding *
|
|
|
|
display_get_keybinding (MetaDisplay *display,
|
2014-03-03 13:08:34 +00:00
|
|
|
guint32 keycode,
|
|
|
|
guint32 mask)
|
2002-07-14 03:16:41 +00:00
|
|
|
{
|
2014-03-03 13:08:34 +00:00
|
|
|
guint32 key;
|
2002-07-14 03:16:41 +00:00
|
|
|
|
2014-03-03 18:33:08 +00:00
|
|
|
mask = mask & 0xff & ~display->ignored_modifier_mask;
|
2014-03-03 13:08:34 +00:00
|
|
|
key = key_binding_key (keycode, mask);
|
2014-03-03 18:33:08 +00:00
|
|
|
|
2014-03-03 13:08:34 +00:00
|
|
|
return g_hash_table_lookup (display->key_bindings_index, GINT_TO_POINTER (key));
|
2009-08-25 20:54:54 +00:00
|
|
|
}
|
|
|
|
|
2012-12-21 10:32:55 +00:00
|
|
|
static guint
|
2014-04-07 19:59:38 +00:00
|
|
|
next_dynamic_keybinding_action (void)
|
|
|
|
{
|
2012-12-21 10:32:55 +00:00
|
|
|
static guint num_dynamic_bindings = 0;
|
|
|
|
return META_KEYBINDING_ACTION_LAST + (++num_dynamic_bindings);
|
|
|
|
}
|
|
|
|
|
2011-10-28 01:05:43 +00:00
|
|
|
static gboolean
|
2011-11-04 18:18:57 +00:00
|
|
|
add_keybinding_internal (MetaDisplay *display,
|
|
|
|
const char *name,
|
2012-03-27 14:42:42 +00:00
|
|
|
GSettings *settings,
|
2011-11-04 18:18:57 +00:00
|
|
|
MetaKeyBindingFlags flags,
|
|
|
|
MetaKeyBindingAction action,
|
|
|
|
MetaKeyHandlerFunc func,
|
|
|
|
int data,
|
|
|
|
gpointer user_data,
|
|
|
|
GDestroyNotify free_data)
|
2011-10-28 01:05:43 +00:00
|
|
|
{
|
|
|
|
MetaKeyHandler *handler;
|
|
|
|
|
2012-03-27 14:42:42 +00:00
|
|
|
if (!meta_prefs_add_keybinding (name, settings, action, flags))
|
2011-10-28 01:05:43 +00:00
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
handler = g_new0 (MetaKeyHandler, 1);
|
|
|
|
handler->name = g_strdup (name);
|
|
|
|
handler->func = func;
|
|
|
|
handler->default_func = func;
|
|
|
|
handler->data = data;
|
|
|
|
handler->flags = flags;
|
2011-11-04 18:18:57 +00:00
|
|
|
handler->user_data = user_data;
|
|
|
|
handler->user_data_free_func = free_data;
|
2011-10-28 01:05:43 +00:00
|
|
|
|
|
|
|
g_hash_table_insert (key_handlers, g_strdup (name), handler);
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
2011-11-04 18:18:57 +00:00
|
|
|
static gboolean
|
|
|
|
add_builtin_keybinding (MetaDisplay *display,
|
|
|
|
const char *name,
|
2012-03-27 14:42:42 +00:00
|
|
|
GSettings *settings,
|
2011-11-04 18:18:57 +00:00
|
|
|
MetaKeyBindingFlags flags,
|
|
|
|
MetaKeyBindingAction action,
|
|
|
|
MetaKeyHandlerFunc handler,
|
|
|
|
int handler_arg)
|
|
|
|
{
|
2012-03-27 14:42:42 +00:00
|
|
|
return add_keybinding_internal (display, name, settings,
|
2011-11-04 18:18:57 +00:00
|
|
|
flags | META_KEY_BINDING_BUILTIN,
|
|
|
|
action, handler, handler_arg, NULL, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* meta_display_add_keybinding:
|
|
|
|
* @display: a #MetaDisplay
|
|
|
|
* @name: the binding's name
|
2012-03-27 14:42:42 +00:00
|
|
|
* @settings: the #GSettings object where @name is stored
|
2011-11-04 18:18:57 +00:00
|
|
|
* @flags: flags to specify binding details
|
|
|
|
* @handler: function to run when the keybinding is invoked
|
|
|
|
* @user_data: the data to pass to @handler
|
|
|
|
* @free_data: function to free @user_data
|
|
|
|
*
|
|
|
|
* Add a keybinding at runtime. The key @name in @schema needs to be of
|
|
|
|
* type %G_VARIANT_TYPE_STRING_ARRAY, with each string describing a
|
2013-02-13 14:44:06 +00:00
|
|
|
* keybinding in the form of "<Control>a" or "<Shift><Alt>F1". The parser
|
2011-11-04 18:18:57 +00:00
|
|
|
* is fairly liberal and allows lower or upper case, and also abbreviations
|
2013-02-13 14:44:06 +00:00
|
|
|
* such as "<Ctl>" and "<Ctrl>". If the key is set to the empty list or a
|
2011-11-04 18:18:57 +00:00
|
|
|
* list with a single element of either "" or "disabled", the keybinding is
|
|
|
|
* disabled.
|
|
|
|
* If %META_KEY_BINDING_REVERSES is specified in @flags, the binding
|
2013-02-13 14:44:06 +00:00
|
|
|
* may be reversed by holding down the "shift" key; therefore, "<Shift>"
|
2011-11-04 18:18:57 +00:00
|
|
|
* cannot be one of the keys used. @handler is expected to check for the
|
|
|
|
* "shift" modifier in this case and reverse its action.
|
|
|
|
*
|
|
|
|
* Use meta_display_remove_keybinding() to remove the binding.
|
|
|
|
*
|
2012-12-12 13:03:58 +00:00
|
|
|
* Returns: the corresponding keybinding action if the keybinding was
|
|
|
|
* added successfully, otherwise %META_KEYBINDING_ACTION_NONE
|
2011-11-04 18:18:57 +00:00
|
|
|
*/
|
2012-12-12 13:03:58 +00:00
|
|
|
guint
|
2011-11-04 18:18:57 +00:00
|
|
|
meta_display_add_keybinding (MetaDisplay *display,
|
|
|
|
const char *name,
|
2012-03-27 14:42:42 +00:00
|
|
|
GSettings *settings,
|
2011-11-04 18:18:57 +00:00
|
|
|
MetaKeyBindingFlags flags,
|
|
|
|
MetaKeyHandlerFunc handler,
|
|
|
|
gpointer user_data,
|
|
|
|
GDestroyNotify free_data)
|
|
|
|
{
|
2012-12-21 10:32:55 +00:00
|
|
|
guint new_action = next_dynamic_keybinding_action ();
|
2012-12-12 13:03:58 +00:00
|
|
|
|
|
|
|
if (!add_keybinding_internal (display, name, settings, flags, new_action,
|
|
|
|
handler, 0, user_data, free_data))
|
|
|
|
return META_KEYBINDING_ACTION_NONE;
|
|
|
|
|
|
|
|
return new_action;
|
2011-11-04 18:18:57 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* meta_display_remove_keybinding:
|
|
|
|
* @display: the #MetaDisplay
|
|
|
|
* @name: name of the keybinding to remove
|
|
|
|
*
|
|
|
|
* Remove keybinding @name; the function will fail if @name is not a known
|
|
|
|
* keybinding or has not been added with meta_display_add_keybinding().
|
|
|
|
*
|
|
|
|
* Returns: %TRUE if the binding has been removed sucessfully,
|
|
|
|
* otherwise %FALSE
|
|
|
|
*/
|
|
|
|
gboolean
|
|
|
|
meta_display_remove_keybinding (MetaDisplay *display,
|
|
|
|
const char *name)
|
|
|
|
{
|
|
|
|
if (!meta_prefs_remove_keybinding (name))
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
g_hash_table_remove (key_handlers, name);
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
2010-03-16 22:05:13 +00:00
|
|
|
/**
|
|
|
|
* meta_display_get_keybinding_action:
|
|
|
|
* @display: A #MetaDisplay
|
|
|
|
* @keycode: Raw keycode
|
|
|
|
* @mask: Event mask
|
|
|
|
*
|
2012-12-12 13:03:58 +00:00
|
|
|
* Get the keybinding action bound to @keycode. Builtin keybindings
|
|
|
|
* have a fixed associated #MetaKeyBindingAction, for bindings added
|
|
|
|
* dynamically the function will return the keybinding action
|
|
|
|
* meta_display_add_keybinding() returns on registration.
|
2011-11-04 18:18:57 +00:00
|
|
|
*
|
2010-10-14 15:24:38 +00:00
|
|
|
* Returns: The action that should be taken for the given key, or
|
|
|
|
* %META_KEYBINDING_ACTION_NONE.
|
2010-03-16 22:05:13 +00:00
|
|
|
*/
|
2012-12-12 13:03:58 +00:00
|
|
|
guint
|
2010-03-16 22:05:13 +00:00
|
|
|
meta_display_get_keybinding_action (MetaDisplay *display,
|
|
|
|
unsigned int keycode,
|
|
|
|
unsigned long mask)
|
2009-08-25 20:54:54 +00:00
|
|
|
{
|
|
|
|
MetaKeyBinding *binding;
|
|
|
|
|
2012-08-10 20:08:03 +00:00
|
|
|
/* This is much more vague than the MetaDisplay::overlay-key signal,
|
|
|
|
* which is only emitted if the overlay-key is the only key pressed;
|
|
|
|
* as this method is primarily intended for plugins to allow processing
|
|
|
|
* of mutter keybindings while holding a grab, the overlay-key-only-pressed
|
|
|
|
* tracking is left to the plugin here.
|
|
|
|
*/
|
2012-08-29 21:06:45 +00:00
|
|
|
if (keycode == (unsigned int)display->overlay_key_combo.keycode)
|
2012-08-10 20:08:03 +00:00
|
|
|
return META_KEYBINDING_ACTION_OVERLAY_KEY;
|
|
|
|
|
2014-02-26 18:01:52 +00:00
|
|
|
binding = display_get_keybinding (display, keycode, mask);
|
2011-01-14 16:46:31 +00:00
|
|
|
|
2009-08-25 20:54:54 +00:00
|
|
|
if (binding)
|
2012-08-28 13:28:11 +00:00
|
|
|
{
|
|
|
|
MetaKeyGrab *grab = g_hash_table_lookup (external_grabs, binding->name);
|
|
|
|
if (grab)
|
|
|
|
return grab->action;
|
|
|
|
else
|
|
|
|
return (guint) meta_prefs_get_keybinding_action (binding->name);
|
|
|
|
}
|
2009-08-25 20:54:54 +00:00
|
|
|
else
|
2012-08-28 13:28:11 +00:00
|
|
|
{
|
|
|
|
return META_KEYBINDING_ACTION_NONE;
|
|
|
|
}
|
2002-07-14 03:16:41 +00:00
|
|
|
}
|
|
|
|
|
2002-04-28 04:52:26 +00:00
|
|
|
void
|
|
|
|
meta_display_process_mapping_event (MetaDisplay *display,
|
|
|
|
XEvent *event)
|
2012-12-13 01:50:43 +00:00
|
|
|
{
|
2010-05-02 15:35:33 +00:00
|
|
|
gboolean keymap_changed = FALSE;
|
|
|
|
gboolean modmap_changed = FALSE;
|
|
|
|
|
2010-05-02 15:27:25 +00:00
|
|
|
#ifdef HAVE_XKB
|
|
|
|
if (event->type == display->xkb_base_event_type)
|
|
|
|
{
|
|
|
|
meta_topic (META_DEBUG_KEYBINDINGS,
|
|
|
|
"XKB mapping changed, will redo keybindings\n");
|
|
|
|
|
2010-05-02 15:35:33 +00:00
|
|
|
keymap_changed = TRUE;
|
|
|
|
modmap_changed = TRUE;
|
2010-05-02 15:27:25 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
#endif
|
2002-04-28 04:52:26 +00:00
|
|
|
if (event->xmapping.request == MappingModifier)
|
|
|
|
{
|
|
|
|
meta_topic (META_DEBUG_KEYBINDINGS,
|
|
|
|
"Received MappingModifier event, will reload modmap and redo keybindings\n");
|
|
|
|
|
2010-05-02 15:35:33 +00:00
|
|
|
modmap_changed = TRUE;
|
2002-04-28 04:52:26 +00:00
|
|
|
}
|
|
|
|
else if (event->xmapping.request == MappingKeyboard)
|
|
|
|
{
|
|
|
|
meta_topic (META_DEBUG_KEYBINDINGS,
|
|
|
|
"Received MappingKeyboard event, will reload keycodes and redo keybindings\n");
|
|
|
|
|
2010-05-02 15:35:33 +00:00
|
|
|
keymap_changed = TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Now to do the work itself */
|
|
|
|
|
|
|
|
if (keymap_changed || modmap_changed)
|
|
|
|
{
|
2013-03-31 17:06:40 +00:00
|
|
|
ungrab_key_bindings (display);
|
|
|
|
|
2010-05-02 15:35:33 +00:00
|
|
|
if (keymap_changed)
|
|
|
|
reload_keymap (display);
|
|
|
|
|
|
|
|
/* Deciphering the modmap depends on the loaded keysyms to find out
|
|
|
|
* what modifiers is Super and so forth, so we need to reload it
|
|
|
|
* even when only the keymap changes */
|
2002-04-28 04:52:26 +00:00
|
|
|
reload_modmap (display);
|
2010-05-02 15:35:33 +00:00
|
|
|
|
|
|
|
if (keymap_changed)
|
|
|
|
reload_keycodes (display);
|
|
|
|
|
|
|
|
reload_modifiers (display);
|
2002-04-28 04:52:26 +00:00
|
|
|
|
2014-03-03 13:08:34 +00:00
|
|
|
rebuild_binding_index (display);
|
|
|
|
|
2013-03-31 17:06:40 +00:00
|
|
|
grab_key_bindings (display);
|
2002-04-28 04:52:26 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
bindings_changed_callback (MetaPreference pref,
|
|
|
|
void *data)
|
|
|
|
{
|
|
|
|
MetaDisplay *display;
|
|
|
|
|
|
|
|
display = data;
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2002-04-28 04:52:26 +00:00
|
|
|
switch (pref)
|
|
|
|
{
|
2008-11-22 19:02:54 +00:00
|
|
|
case META_PREF_KEYBINDINGS:
|
2013-03-31 17:06:40 +00:00
|
|
|
ungrab_key_bindings (display);
|
2008-11-22 19:02:54 +00:00
|
|
|
rebuild_key_binding_table (display);
|
2008-12-02 23:13:11 +00:00
|
|
|
rebuild_special_bindings (display);
|
2002-04-28 04:52:26 +00:00
|
|
|
reload_keycodes (display);
|
2002-07-14 03:16:41 +00:00
|
|
|
reload_modifiers (display);
|
2014-03-03 13:08:34 +00:00
|
|
|
rebuild_binding_index (display);
|
2013-03-31 17:06:40 +00:00
|
|
|
grab_key_bindings (display);
|
2002-04-28 04:52:26 +00:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-06-06 04:47:37 +00:00
|
|
|
|
2002-04-28 04:52:26 +00:00
|
|
|
void
|
|
|
|
meta_display_shutdown_keys (MetaDisplay *display)
|
|
|
|
{
|
2002-08-06 04:11:23 +00:00
|
|
|
/* Note that display->xdisplay is invalid in this function */
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2002-04-28 04:52:26 +00:00
|
|
|
meta_prefs_remove_listener (bindings_changed_callback, display);
|
|
|
|
|
|
|
|
if (display->keymap)
|
|
|
|
meta_XFree (display->keymap);
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2014-03-03 13:08:34 +00:00
|
|
|
g_hash_table_destroy (display->key_bindings_index);
|
|
|
|
g_hash_table_destroy (display->key_bindings);
|
2002-04-28 04:52:26 +00:00
|
|
|
}
|
|
|
|
|
2001-10-05 02:58:48 +00:00
|
|
|
/* Grab/ungrab, ignoring all annoying modifiers like NumLock etc. */
|
|
|
|
static void
|
|
|
|
meta_change_keygrab (MetaDisplay *display,
|
|
|
|
Window xwindow,
|
|
|
|
gboolean grab,
|
|
|
|
int keysym,
|
2003-02-22 20:31:51 +00:00
|
|
|
unsigned int keycode,
|
2001-10-05 02:58:48 +00:00
|
|
|
int modmask)
|
|
|
|
{
|
2003-05-21 03:45:58 +00:00
|
|
|
unsigned int ignored_mask;
|
2001-10-05 02:58:48 +00:00
|
|
|
|
2012-11-20 23:04:42 +00:00
|
|
|
unsigned char mask_bits[XIMaskLen (XI_LASTEVENT)] = { 0 };
|
|
|
|
XIEventMask mask = { XIAllMasterDevices, sizeof (mask_bits), mask_bits };
|
|
|
|
|
|
|
|
XISetMask (mask.mask, XI_KeyPress);
|
|
|
|
XISetMask (mask.mask, XI_KeyRelease);
|
|
|
|
|
2001-10-05 02:58:48 +00:00
|
|
|
/* Grab keycode/modmask, together with
|
2002-04-28 04:52:26 +00:00
|
|
|
* all combinations of ignored modifiers.
|
2001-10-05 02:58:48 +00:00
|
|
|
* X provides no better way to do this.
|
|
|
|
*/
|
2002-04-28 04:52:26 +00:00
|
|
|
|
|
|
|
meta_topic (META_DEBUG_KEYBINDINGS,
|
Patch from Ed Catmur to fix keybindings with hex-values (coming from
2006-08-21 Elijah Newren <newren gmail com>
Patch from Ed Catmur to fix keybindings with hex-values (coming
from special extended keyboard keys). #140448.
* src/keybindings.c (struct _MetaKeyBinding): change keycode from
KeyCode to unsigned int (comment from Elijah: why???),
(reload_keycodes): only grab keysyms for keybindings that have
them, (count_bindings, rebuild_binding_table): bindings can be
valid either due to a valid keysym or a valid keycode,
(display_get_keybinding_action, meta_change_keygrab,
process_tab_grab, process_workspace_switch_grab): handle keycode
as well as keysym
* src/prefs.[ch] (struct MetaKeyCombo, update_binding,
update_list_binding): handle keycode as well as keysym
* src/ui.[ch] (meta_ui_accelerator_parse): new function special
cases strings of the form "0x[0-9a-fA-F]+" and otherwise calling
gtk_accelerator_parse(), (meta_ui_parse_accelerator,
meta_ui_parse_modifier): call meta_ui_accelerator_parse instead of
gtk_accelerator_parse.
2006-08-21 19:06:26 +00:00
|
|
|
"%s keybinding %s keycode %d mask 0x%x on 0x%lx\n",
|
2002-04-28 04:52:26 +00:00
|
|
|
grab ? "Grabbing" : "Ungrabbing",
|
Patch from Ed Catmur to fix keybindings with hex-values (coming from
2006-08-21 Elijah Newren <newren gmail com>
Patch from Ed Catmur to fix keybindings with hex-values (coming
from special extended keyboard keys). #140448.
* src/keybindings.c (struct _MetaKeyBinding): change keycode from
KeyCode to unsigned int (comment from Elijah: why???),
(reload_keycodes): only grab keysyms for keybindings that have
them, (count_bindings, rebuild_binding_table): bindings can be
valid either due to a valid keysym or a valid keycode,
(display_get_keybinding_action, meta_change_keygrab,
process_tab_grab, process_workspace_switch_grab): handle keycode
as well as keysym
* src/prefs.[ch] (struct MetaKeyCombo, update_binding,
update_list_binding): handle keycode as well as keysym
* src/ui.[ch] (meta_ui_accelerator_parse): new function special
cases strings of the form "0x[0-9a-fA-F]+" and otherwise calling
gtk_accelerator_parse(), (meta_ui_parse_accelerator,
meta_ui_parse_modifier): call meta_ui_accelerator_parse instead of
gtk_accelerator_parse.
2006-08-21 19:06:26 +00:00
|
|
|
keysym_name (keysym), keycode,
|
2002-06-09 03:44:16 +00:00
|
|
|
modmask, xwindow);
|
2002-10-21 21:44:35 +00:00
|
|
|
|
|
|
|
/* efficiency, avoid so many XSync() */
|
|
|
|
meta_error_trap_push (display);
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2001-10-05 02:58:48 +00:00
|
|
|
ignored_mask = 0;
|
2003-05-21 03:45:58 +00:00
|
|
|
while (ignored_mask <= display->ignored_modifier_mask)
|
2001-10-05 02:58:48 +00:00
|
|
|
{
|
2012-11-20 23:04:42 +00:00
|
|
|
XIGrabModifiers mods;
|
|
|
|
|
2002-04-28 04:52:26 +00:00
|
|
|
if (ignored_mask & ~(display->ignored_modifier_mask))
|
2001-10-05 02:58:48 +00:00
|
|
|
{
|
2002-04-28 04:52:26 +00:00
|
|
|
/* Not a combination of ignored modifiers
|
2001-10-05 02:58:48 +00:00
|
|
|
* (it contains some non-ignored modifiers)
|
|
|
|
*/
|
|
|
|
++ignored_mask;
|
|
|
|
continue;
|
|
|
|
}
|
2002-10-21 21:44:35 +00:00
|
|
|
|
2012-11-20 23:04:42 +00:00
|
|
|
mods = (XIGrabModifiers) { modmask | ignored_mask, 0 };
|
|
|
|
|
2002-10-21 21:44:35 +00:00
|
|
|
if (meta_is_debugging ())
|
2014-04-06 19:52:44 +00:00
|
|
|
meta_error_trap_push (display);
|
2001-10-05 02:58:48 +00:00
|
|
|
if (grab)
|
2012-11-20 23:04:42 +00:00
|
|
|
XIGrabKeycode (display->xdisplay,
|
|
|
|
META_VIRTUAL_CORE_KEYBOARD_ID,
|
|
|
|
keycode, xwindow,
|
|
|
|
XIGrabModeSync, XIGrabModeAsync,
|
|
|
|
False, &mask, 1, &mods);
|
2001-10-05 02:58:48 +00:00
|
|
|
else
|
2012-11-20 23:04:42 +00:00
|
|
|
XIUngrabKeycode (display->xdisplay,
|
|
|
|
META_VIRTUAL_CORE_KEYBOARD_ID,
|
|
|
|
keycode, xwindow, 1, &mods);
|
2002-10-21 21:44:35 +00:00
|
|
|
|
|
|
|
if (meta_is_debugging ())
|
|
|
|
{
|
|
|
|
int result;
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2010-10-25 18:44:30 +00:00
|
|
|
result = meta_error_trap_pop_with_return (display);
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2002-10-21 21:44:35 +00:00
|
|
|
if (grab && result != Success)
|
2012-12-13 01:50:43 +00:00
|
|
|
{
|
2002-10-21 21:44:35 +00:00
|
|
|
if (result == BadAccess)
|
2013-09-11 08:37:36 +00:00
|
|
|
meta_warning ("Some other program is already using the key %s with modifiers %x as a binding\n", keysym_name (keysym), modmask | ignored_mask);
|
2002-10-21 21:44:35 +00:00
|
|
|
else
|
|
|
|
meta_topic (META_DEBUG_KEYBINDINGS,
|
|
|
|
"Failed to grab key %s with modifiers %x\n",
|
|
|
|
keysym_name (keysym), modmask | ignored_mask);
|
|
|
|
}
|
2001-10-05 02:58:48 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
++ignored_mask;
|
|
|
|
}
|
2002-10-21 21:44:35 +00:00
|
|
|
|
2010-10-25 18:44:30 +00:00
|
|
|
meta_error_trap_pop (display);
|
2001-10-05 02:58:48 +00:00
|
|
|
}
|
|
|
|
|
2014-03-03 13:08:34 +00:00
|
|
|
typedef struct
|
|
|
|
{
|
|
|
|
MetaDisplay *display;
|
|
|
|
Window xwindow;
|
|
|
|
gboolean binding_per_window;
|
|
|
|
gboolean grab;
|
|
|
|
} ChangeKeygrabData;
|
|
|
|
|
|
|
|
static void
|
|
|
|
change_keygrab_foreach (gpointer key,
|
|
|
|
gpointer value,
|
|
|
|
gpointer user_data)
|
|
|
|
{
|
|
|
|
ChangeKeygrabData *data = user_data;
|
|
|
|
MetaKeyBinding *binding = value;
|
|
|
|
|
|
|
|
if (!!data->binding_per_window ==
|
|
|
|
!!(binding->flags & META_KEY_BINDING_PER_WINDOW) &&
|
|
|
|
binding->keycode != 0)
|
|
|
|
{
|
|
|
|
meta_change_keygrab (data->display, data->xwindow, data->grab,
|
|
|
|
binding->keysym,
|
|
|
|
binding->keycode,
|
|
|
|
binding->mask);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-10-05 02:58:48 +00:00
|
|
|
static void
|
2014-03-03 13:08:34 +00:00
|
|
|
change_binding_keygrabs (MetaDisplay *display,
|
2013-03-31 17:06:40 +00:00
|
|
|
Window xwindow,
|
|
|
|
gboolean binding_per_window,
|
|
|
|
gboolean grab)
|
2001-06-06 04:47:37 +00:00
|
|
|
{
|
2014-03-03 13:08:34 +00:00
|
|
|
ChangeKeygrabData data;
|
2001-06-06 04:47:37 +00:00
|
|
|
|
2014-03-03 13:08:34 +00:00
|
|
|
data.display = display;
|
|
|
|
data.xwindow = xwindow;
|
|
|
|
data.binding_per_window = binding_per_window;
|
|
|
|
data.grab = grab;
|
2002-11-06 16:00:56 +00:00
|
|
|
|
|
|
|
meta_error_trap_push (display);
|
2014-03-03 13:08:34 +00:00
|
|
|
g_hash_table_foreach (display->key_bindings, change_keygrab_foreach, &data);
|
2010-10-25 18:44:30 +00:00
|
|
|
meta_error_trap_pop (display);
|
2001-06-06 04:47:37 +00:00
|
|
|
}
|
|
|
|
|
2001-06-23 05:49:35 +00:00
|
|
|
static void
|
2013-03-31 17:06:40 +00:00
|
|
|
meta_screen_change_keygrabs (MetaScreen *screen,
|
|
|
|
gboolean grab)
|
2001-06-06 04:47:37 +00:00
|
|
|
{
|
2013-03-31 17:06:40 +00:00
|
|
|
MetaDisplay *display = screen->display;
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2013-03-31 17:06:40 +00:00
|
|
|
if (display->overlay_key_combo.keycode != 0)
|
|
|
|
meta_change_keygrab (display, screen->xroot, grab,
|
|
|
|
display->overlay_key_combo.keysym,
|
|
|
|
display->overlay_key_combo.keycode,
|
|
|
|
display->overlay_key_combo.modifiers);
|
|
|
|
|
2013-04-10 11:34:26 +00:00
|
|
|
if (display->iso_next_group_combos)
|
|
|
|
{
|
|
|
|
int i = 0;
|
|
|
|
while (i < display->n_iso_next_group_combos)
|
|
|
|
{
|
|
|
|
if (display->iso_next_group_combos[i].keycode != 0)
|
|
|
|
{
|
|
|
|
meta_change_keygrab (display, screen->xroot, grab,
|
|
|
|
display->iso_next_group_combos[i].keysym,
|
|
|
|
display->iso_next_group_combos[i].keycode,
|
|
|
|
display->iso_next_group_combos[i].modifiers);
|
|
|
|
}
|
|
|
|
++i;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-03-03 13:08:34 +00:00
|
|
|
change_binding_keygrabs (screen->display, screen->xroot, FALSE, grab);
|
2001-06-06 04:47:37 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2002-04-28 04:52:26 +00:00
|
|
|
meta_screen_grab_keys (MetaScreen *screen)
|
2001-06-23 05:49:35 +00:00
|
|
|
{
|
2002-07-01 03:20:29 +00:00
|
|
|
if (screen->all_keys_grabbed)
|
|
|
|
return;
|
|
|
|
|
2002-04-28 04:52:26 +00:00
|
|
|
if (screen->keys_grabbed)
|
|
|
|
return;
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2013-03-31 17:06:40 +00:00
|
|
|
meta_screen_change_keygrabs (screen, TRUE);
|
2002-04-28 04:52:26 +00:00
|
|
|
|
|
|
|
screen->keys_grabbed = TRUE;
|
2001-06-23 05:49:35 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
meta_screen_ungrab_keys (MetaScreen *screen)
|
|
|
|
{
|
2013-03-31 17:06:40 +00:00
|
|
|
if (!screen->keys_grabbed)
|
|
|
|
return;
|
|
|
|
|
|
|
|
meta_screen_change_keygrabs (screen, FALSE);
|
|
|
|
|
|
|
|
screen->keys_grabbed = FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
meta_window_change_keygrabs (MetaWindow *window,
|
|
|
|
Window xwindow,
|
|
|
|
gboolean grab)
|
|
|
|
{
|
2014-03-03 13:08:34 +00:00
|
|
|
change_binding_keygrabs (window->display, xwindow, TRUE, grab);
|
2001-06-23 05:49:35 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
meta_window_grab_keys (MetaWindow *window)
|
|
|
|
{
|
2001-07-11 06:22:00 +00:00
|
|
|
if (window->all_keys_grabbed)
|
|
|
|
return;
|
2003-02-27 22:44:36 +00:00
|
|
|
|
2008-11-23 19:28:40 +00:00
|
|
|
if (window->type == META_WINDOW_DOCK
|
|
|
|
|| window->override_redirect)
|
2003-02-27 22:44:36 +00:00
|
|
|
{
|
|
|
|
if (window->keys_grabbed)
|
2013-03-31 17:06:40 +00:00
|
|
|
meta_window_change_keygrabs (window, window->xwindow, FALSE);
|
2003-02-27 22:44:36 +00:00
|
|
|
window->keys_grabbed = FALSE;
|
|
|
|
return;
|
|
|
|
}
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2001-06-23 05:49:35 +00:00
|
|
|
if (window->keys_grabbed)
|
|
|
|
{
|
|
|
|
if (window->frame && !window->grab_on_frame)
|
2013-03-31 17:06:40 +00:00
|
|
|
meta_window_change_keygrabs (window, window->xwindow, FALSE);
|
2001-06-23 05:49:35 +00:00
|
|
|
else if (window->frame == NULL &&
|
|
|
|
window->grab_on_frame)
|
|
|
|
; /* continue to regrab on client window */
|
|
|
|
else
|
|
|
|
return; /* already all good */
|
|
|
|
}
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2013-03-31 17:06:40 +00:00
|
|
|
meta_window_change_keygrabs (window,
|
2013-12-06 05:57:11 +00:00
|
|
|
meta_window_get_toplevel_xwindow (window),
|
2013-03-31 17:06:40 +00:00
|
|
|
TRUE);
|
2001-06-23 05:49:35 +00:00
|
|
|
|
|
|
|
window->keys_grabbed = TRUE;
|
|
|
|
window->grab_on_frame = window->frame != NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
meta_window_ungrab_keys (MetaWindow *window)
|
|
|
|
{
|
|
|
|
if (window->keys_grabbed)
|
|
|
|
{
|
|
|
|
if (window->grab_on_frame &&
|
|
|
|
window->frame != NULL)
|
2013-03-31 17:06:40 +00:00
|
|
|
meta_window_change_keygrabs (window, window->frame->xwindow, FALSE);
|
2001-06-23 05:49:35 +00:00
|
|
|
else if (!window->grab_on_frame)
|
2013-03-31 17:06:40 +00:00
|
|
|
meta_window_change_keygrabs (window, window->xwindow, FALSE);
|
2002-06-09 00:09:01 +00:00
|
|
|
|
|
|
|
window->keys_grabbed = FALSE;
|
2001-06-23 05:49:35 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-08-28 13:28:11 +00:00
|
|
|
static void
|
2013-10-03 22:03:53 +00:00
|
|
|
handle_external_grab (MetaDisplay *display,
|
|
|
|
MetaScreen *screen,
|
|
|
|
MetaWindow *window,
|
|
|
|
ClutterKeyEvent *event,
|
|
|
|
MetaKeyBinding *binding,
|
|
|
|
gpointer user_data)
|
2012-08-28 13:28:11 +00:00
|
|
|
{
|
|
|
|
guint action = meta_display_get_keybinding_action (display,
|
|
|
|
binding->keycode,
|
|
|
|
binding->mask);
|
2013-10-03 22:03:53 +00:00
|
|
|
meta_display_accelerator_activate (display, action, event);
|
2012-08-28 13:28:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
guint
|
|
|
|
meta_display_grab_accelerator (MetaDisplay *display,
|
|
|
|
const char *accelerator)
|
|
|
|
{
|
2014-03-03 13:08:34 +00:00
|
|
|
MetaKeyBinding *binding;
|
2012-08-28 13:28:11 +00:00
|
|
|
MetaKeyGrab *grab;
|
|
|
|
guint keysym = 0;
|
|
|
|
guint keycode = 0;
|
|
|
|
guint mask = 0;
|
|
|
|
MetaVirtualModifier modifiers = 0;
|
|
|
|
|
2014-04-07 14:48:16 +00:00
|
|
|
if (!meta_parse_accelerator (accelerator, &keysym, &keycode, &modifiers))
|
2012-08-28 13:28:11 +00:00
|
|
|
{
|
|
|
|
meta_topic (META_DEBUG_KEYBINDINGS,
|
|
|
|
"Failed to parse accelerator\n");
|
2013-09-11 08:37:36 +00:00
|
|
|
meta_warning ("\"%s\" is not a valid accelerator\n", accelerator);
|
2012-08-28 13:28:11 +00:00
|
|
|
|
|
|
|
return META_KEYBINDING_ACTION_NONE;
|
|
|
|
}
|
|
|
|
|
|
|
|
meta_display_devirtualize_modifiers (display, modifiers, &mask);
|
2014-04-07 18:51:13 +00:00
|
|
|
keycode = get_first_keycode_for_keysym (display, keysym);
|
2012-08-28 13:28:11 +00:00
|
|
|
|
|
|
|
if (keycode == 0)
|
|
|
|
return META_KEYBINDING_ACTION_NONE;
|
|
|
|
|
2014-03-03 18:33:08 +00:00
|
|
|
if (display_get_keybinding (display, keycode, mask))
|
|
|
|
return META_KEYBINDING_ACTION_NONE;
|
2012-08-28 13:28:11 +00:00
|
|
|
|
2013-10-03 22:31:09 +00:00
|
|
|
meta_change_keygrab (display, display->screen->xroot, TRUE, keysym, keycode, mask);
|
2012-08-28 13:28:11 +00:00
|
|
|
|
|
|
|
grab = g_new0 (MetaKeyGrab, 1);
|
|
|
|
grab->action = next_dynamic_keybinding_action ();
|
|
|
|
grab->name = meta_external_binding_name_for_action (grab->action);
|
|
|
|
grab->combo = g_malloc0 (sizeof (MetaKeyCombo));
|
|
|
|
grab->combo->keysym = keysym;
|
|
|
|
grab->combo->keycode = keycode;
|
|
|
|
grab->combo->modifiers = modifiers;
|
|
|
|
|
|
|
|
g_hash_table_insert (external_grabs, grab->name, grab);
|
|
|
|
|
2014-03-03 13:08:34 +00:00
|
|
|
binding = g_malloc0 (sizeof (MetaKeyBinding));
|
2012-08-28 13:28:11 +00:00
|
|
|
binding->name = grab->name;
|
|
|
|
binding->handler = HANDLER ("external-grab");
|
|
|
|
binding->keysym = grab->combo->keysym;
|
|
|
|
binding->keycode = grab->combo->keycode;
|
|
|
|
binding->modifiers = grab->combo->modifiers;
|
|
|
|
binding->mask = mask;
|
|
|
|
|
2014-03-03 13:08:34 +00:00
|
|
|
g_hash_table_add (display->key_bindings, binding);
|
|
|
|
index_binding (display, binding);
|
|
|
|
|
2012-08-28 13:28:11 +00:00
|
|
|
return grab->action;
|
|
|
|
}
|
|
|
|
|
|
|
|
gboolean
|
|
|
|
meta_display_ungrab_accelerator (MetaDisplay *display,
|
|
|
|
guint action)
|
|
|
|
{
|
2014-03-03 18:33:08 +00:00
|
|
|
MetaKeyBinding *binding;
|
2012-08-28 13:28:11 +00:00
|
|
|
MetaKeyGrab *grab;
|
|
|
|
char *key;
|
2014-03-04 19:26:49 +00:00
|
|
|
guint mask = 0;
|
2014-03-04 19:33:56 +00:00
|
|
|
guint keycode = 0;
|
2012-08-28 13:28:11 +00:00
|
|
|
|
|
|
|
g_return_val_if_fail (action != META_KEYBINDING_ACTION_NONE, FALSE);
|
|
|
|
|
|
|
|
key = meta_external_binding_name_for_action (action);
|
|
|
|
grab = g_hash_table_lookup (external_grabs, key);
|
|
|
|
if (!grab)
|
|
|
|
return FALSE;
|
|
|
|
|
2014-03-04 19:26:49 +00:00
|
|
|
meta_display_devirtualize_modifiers (display, grab->combo->modifiers, &mask);
|
2014-04-07 18:51:13 +00:00
|
|
|
keycode = get_first_keycode_for_keysym (display, grab->combo->keysym);
|
2014-03-04 19:26:49 +00:00
|
|
|
|
2014-03-04 19:33:56 +00:00
|
|
|
binding = display_get_keybinding (display, keycode, mask);
|
2014-03-03 18:33:08 +00:00
|
|
|
if (binding)
|
|
|
|
{
|
2014-03-03 13:08:34 +00:00
|
|
|
guint32 index_key;
|
|
|
|
|
2013-10-03 22:31:09 +00:00
|
|
|
meta_change_keygrab (display, display->screen->xroot, FALSE,
|
|
|
|
binding->keysym,
|
|
|
|
binding->keycode,
|
|
|
|
binding->mask);
|
2014-03-03 18:33:08 +00:00
|
|
|
|
2014-03-03 13:08:34 +00:00
|
|
|
index_key = key_binding_key (binding->keycode, binding->mask);
|
|
|
|
g_hash_table_remove (display->key_bindings_index, GINT_TO_POINTER (index_key));
|
|
|
|
|
|
|
|
g_hash_table_remove (display->key_bindings, binding);
|
2014-03-03 18:33:08 +00:00
|
|
|
}
|
2012-08-28 13:28:11 +00:00
|
|
|
|
|
|
|
g_hash_table_remove (external_grabs, key);
|
|
|
|
g_free (key);
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
2003-01-21 22:40:25 +00:00
|
|
|
#ifdef WITH_VERBOSE_MODE
|
|
|
|
static const char*
|
|
|
|
grab_status_to_string (int status)
|
|
|
|
{
|
|
|
|
switch (status)
|
|
|
|
{
|
|
|
|
case AlreadyGrabbed:
|
|
|
|
return "AlreadyGrabbed";
|
|
|
|
case GrabSuccess:
|
|
|
|
return "GrabSuccess";
|
|
|
|
case GrabNotViewable:
|
|
|
|
return "GrabNotViewable";
|
|
|
|
case GrabFrozen:
|
|
|
|
return "GrabFrozen";
|
|
|
|
case GrabInvalidTime:
|
|
|
|
return "GrabInvalidTime";
|
|
|
|
default:
|
|
|
|
return "(unknown)";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif /* WITH_VERBOSE_MODE */
|
|
|
|
|
2002-06-27 05:08:32 +00:00
|
|
|
static gboolean
|
2002-07-02 05:03:28 +00:00
|
|
|
grab_keyboard (MetaDisplay *display,
|
2006-09-09 20:19:56 +00:00
|
|
|
Window xwindow,
|
2013-03-29 01:38:43 +00:00
|
|
|
guint32 timestamp,
|
|
|
|
int grab_mode)
|
2002-06-27 05:08:32 +00:00
|
|
|
{
|
|
|
|
int result;
|
2003-01-21 22:40:25 +00:00
|
|
|
int grab_status;
|
2012-11-20 22:11:13 +00:00
|
|
|
|
|
|
|
unsigned char mask_bits[XIMaskLen (XI_LASTEVENT)] = { 0 };
|
|
|
|
XIEventMask mask = { XIAllMasterDevices, sizeof (mask_bits), mask_bits };
|
|
|
|
|
|
|
|
XISetMask (mask.mask, XI_KeyPress);
|
|
|
|
XISetMask (mask.mask, XI_KeyRelease);
|
|
|
|
|
2002-07-02 05:03:28 +00:00
|
|
|
/* Grab the keyboard, so we get key releases and all key
|
2002-06-27 05:08:32 +00:00
|
|
|
* presses
|
|
|
|
*/
|
2014-04-06 19:52:44 +00:00
|
|
|
meta_error_trap_push (display);
|
2002-06-27 05:08:32 +00:00
|
|
|
|
2013-03-29 01:38:43 +00:00
|
|
|
/* Strictly, we only need to set grab_mode on the keyboard device
|
|
|
|
* while the pointer should always be XIGrabModeAsync. Unfortunately
|
|
|
|
* there is a bug in the X server, only fixed (link below) in 1.15,
|
|
|
|
* which swaps these arguments for keyboard devices. As such, we set
|
|
|
|
* both the device and the paired device mode which works around
|
|
|
|
* that bug and also works on fixed X servers.
|
|
|
|
*
|
|
|
|
* http://cgit.freedesktop.org/xorg/xserver/commit/?id=9003399708936481083424b4ff8f18a16b88b7b3
|
|
|
|
*/
|
2012-11-20 22:11:13 +00:00
|
|
|
grab_status = XIGrabDevice (display->xdisplay,
|
|
|
|
META_VIRTUAL_CORE_KEYBOARD_ID,
|
|
|
|
xwindow,
|
|
|
|
timestamp,
|
|
|
|
None,
|
2013-03-29 01:38:43 +00:00
|
|
|
grab_mode, grab_mode,
|
2013-05-29 18:51:43 +00:00
|
|
|
False, /* owner_events */
|
2012-11-20 22:11:13 +00:00
|
|
|
&mask);
|
|
|
|
|
|
|
|
if (grab_status != Success)
|
2002-06-27 05:08:32 +00:00
|
|
|
{
|
2010-10-25 18:44:30 +00:00
|
|
|
meta_error_trap_pop_with_return (display);
|
2002-06-27 05:08:32 +00:00
|
|
|
meta_topic (META_DEBUG_KEYBINDINGS,
|
2012-11-20 22:11:13 +00:00
|
|
|
"XIGrabDevice() returned failure status %s time %u\n",
|
2003-01-21 22:40:25 +00:00
|
|
|
grab_status_to_string (grab_status),
|
Fix issues on 64-bit machines with timestamps by using guint32 (like gtk+
2006-09-13 Elijah Newren <newren gmail com>
* src/common.h (MetaWindowMenuFunc):
* src/core.[ch] (meta_core_user_lower_and_unfocus,
meta_core_user_focus, meta_core_show_window_menu,
meta_core_begin_grab_op, meta_core_end_grab_op):
* src/delete.c (delete_ping_reply_func, delete_ping_timeout_func,
meta_window_delete):
* src/display.[ch] (struct MetaDisplay, struct MetaPingData,
sanity_check_timestamps, meta_display_open, event_callback,
meta_spew_event, meta_display_set_grab_op_cursor,
meta_display_begin_grab_op, meta_display_end_grab_op,
meta_display_ping_timeout, meta_display_ping_window,
process_pong_message, timestamp_too_old,
meta_display_set_input_focus_window):
* src/keybindings.[ch] (grab_keyboard, ungrab_keyboard,
meta_screen_grab_all_keys, meta_window_grab_all_keys,
meta_window_ungrab_all_keys, error_on_generic_command,
error_on_command, error_on_terminal_command):
* src/metacity-dialog.c (on_realize, warn_about_no_sm_support,
error_about_command, main):
* src/screen.[ch] (struct _MetaScreen, meta_screen_new,
meta_screen_show_desktop, meta_screen_apply_startup_properties):
* src/session.c (warn_about_lame_clients_and_finish_interact):
* src/window.[ch] (struct _MetaWindow,
intervening_user_event_occurred, window_activate,
meta_window_delete, meta_window_focus,
meta_window_send_icccm_message, meta_window_client_message,
menu_callback, meta_window_show_menu, struct EventScannerData,
check_use_this_motion_notify, meta_window_begin_grab_op,
meta_window_set_user_time):
* src/workspace.[ch] (focus_ancestor_or_mru_window,
meta_workspace_activate_with_focus, meta_workspace_activate,
meta_workspace_focus_default_window,
focus_ancestor_or_mru_window):
Fix issues on 64-bit machines with timestamps by using guint32
(like gtk+ does) instead of Time. #348305
2006-09-13 16:32:33 +00:00
|
|
|
timestamp);
|
2003-01-21 22:40:25 +00:00
|
|
|
return FALSE;
|
2002-10-21 21:44:35 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2010-10-25 18:44:30 +00:00
|
|
|
result = meta_error_trap_pop_with_return (display);
|
2002-10-21 21:44:35 +00:00
|
|
|
if (result != Success)
|
|
|
|
{
|
|
|
|
meta_topic (META_DEBUG_KEYBINDINGS,
|
2012-11-20 22:11:13 +00:00
|
|
|
"XIGrabDevice() resulted in an error\n");
|
2002-10-21 21:44:35 +00:00
|
|
|
return FALSE;
|
|
|
|
}
|
2002-06-27 05:08:32 +00:00
|
|
|
}
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2002-06-27 05:08:32 +00:00
|
|
|
meta_topic (META_DEBUG_KEYBINDINGS, "Grabbed all keys\n");
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2002-06-27 05:08:32 +00:00
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
Fix issues on 64-bit machines with timestamps by using guint32 (like gtk+
2006-09-13 Elijah Newren <newren gmail com>
* src/common.h (MetaWindowMenuFunc):
* src/core.[ch] (meta_core_user_lower_and_unfocus,
meta_core_user_focus, meta_core_show_window_menu,
meta_core_begin_grab_op, meta_core_end_grab_op):
* src/delete.c (delete_ping_reply_func, delete_ping_timeout_func,
meta_window_delete):
* src/display.[ch] (struct MetaDisplay, struct MetaPingData,
sanity_check_timestamps, meta_display_open, event_callback,
meta_spew_event, meta_display_set_grab_op_cursor,
meta_display_begin_grab_op, meta_display_end_grab_op,
meta_display_ping_timeout, meta_display_ping_window,
process_pong_message, timestamp_too_old,
meta_display_set_input_focus_window):
* src/keybindings.[ch] (grab_keyboard, ungrab_keyboard,
meta_screen_grab_all_keys, meta_window_grab_all_keys,
meta_window_ungrab_all_keys, error_on_generic_command,
error_on_command, error_on_terminal_command):
* src/metacity-dialog.c (on_realize, warn_about_no_sm_support,
error_about_command, main):
* src/screen.[ch] (struct _MetaScreen, meta_screen_new,
meta_screen_show_desktop, meta_screen_apply_startup_properties):
* src/session.c (warn_about_lame_clients_and_finish_interact):
* src/window.[ch] (struct _MetaWindow,
intervening_user_event_occurred, window_activate,
meta_window_delete, meta_window_focus,
meta_window_send_icccm_message, meta_window_client_message,
menu_callback, meta_window_show_menu, struct EventScannerData,
check_use_this_motion_notify, meta_window_begin_grab_op,
meta_window_set_user_time):
* src/workspace.[ch] (focus_ancestor_or_mru_window,
meta_workspace_activate_with_focus, meta_workspace_activate,
meta_workspace_focus_default_window,
focus_ancestor_or_mru_window):
Fix issues on 64-bit machines with timestamps by using guint32
(like gtk+ does) instead of Time. #348305
2006-09-13 16:32:33 +00:00
|
|
|
ungrab_keyboard (MetaDisplay *display, guint32 timestamp)
|
2002-06-27 05:08:32 +00:00
|
|
|
{
|
|
|
|
meta_error_trap_push (display);
|
|
|
|
|
|
|
|
meta_topic (META_DEBUG_KEYBINDINGS,
|
Fix issues on 64-bit machines with timestamps by using guint32 (like gtk+
2006-09-13 Elijah Newren <newren gmail com>
* src/common.h (MetaWindowMenuFunc):
* src/core.[ch] (meta_core_user_lower_and_unfocus,
meta_core_user_focus, meta_core_show_window_menu,
meta_core_begin_grab_op, meta_core_end_grab_op):
* src/delete.c (delete_ping_reply_func, delete_ping_timeout_func,
meta_window_delete):
* src/display.[ch] (struct MetaDisplay, struct MetaPingData,
sanity_check_timestamps, meta_display_open, event_callback,
meta_spew_event, meta_display_set_grab_op_cursor,
meta_display_begin_grab_op, meta_display_end_grab_op,
meta_display_ping_timeout, meta_display_ping_window,
process_pong_message, timestamp_too_old,
meta_display_set_input_focus_window):
* src/keybindings.[ch] (grab_keyboard, ungrab_keyboard,
meta_screen_grab_all_keys, meta_window_grab_all_keys,
meta_window_ungrab_all_keys, error_on_generic_command,
error_on_command, error_on_terminal_command):
* src/metacity-dialog.c (on_realize, warn_about_no_sm_support,
error_about_command, main):
* src/screen.[ch] (struct _MetaScreen, meta_screen_new,
meta_screen_show_desktop, meta_screen_apply_startup_properties):
* src/session.c (warn_about_lame_clients_and_finish_interact):
* src/window.[ch] (struct _MetaWindow,
intervening_user_event_occurred, window_activate,
meta_window_delete, meta_window_focus,
meta_window_send_icccm_message, meta_window_client_message,
menu_callback, meta_window_show_menu, struct EventScannerData,
check_use_this_motion_notify, meta_window_begin_grab_op,
meta_window_set_user_time):
* src/workspace.[ch] (focus_ancestor_or_mru_window,
meta_workspace_activate_with_focus, meta_workspace_activate,
meta_workspace_focus_default_window,
focus_ancestor_or_mru_window):
Fix issues on 64-bit machines with timestamps by using guint32
(like gtk+ does) instead of Time. #348305
2006-09-13 16:32:33 +00:00
|
|
|
"Ungrabbing keyboard with timestamp %u\n",
|
2002-06-27 05:08:32 +00:00
|
|
|
timestamp);
|
2012-11-20 22:11:13 +00:00
|
|
|
XIUngrabDevice (display->xdisplay, META_VIRTUAL_CORE_KEYBOARD_ID, timestamp);
|
2010-10-25 18:44:30 +00:00
|
|
|
meta_error_trap_pop (display);
|
2002-06-27 05:08:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
gboolean
|
Fix issues on 64-bit machines with timestamps by using guint32 (like gtk+
2006-09-13 Elijah Newren <newren gmail com>
* src/common.h (MetaWindowMenuFunc):
* src/core.[ch] (meta_core_user_lower_and_unfocus,
meta_core_user_focus, meta_core_show_window_menu,
meta_core_begin_grab_op, meta_core_end_grab_op):
* src/delete.c (delete_ping_reply_func, delete_ping_timeout_func,
meta_window_delete):
* src/display.[ch] (struct MetaDisplay, struct MetaPingData,
sanity_check_timestamps, meta_display_open, event_callback,
meta_spew_event, meta_display_set_grab_op_cursor,
meta_display_begin_grab_op, meta_display_end_grab_op,
meta_display_ping_timeout, meta_display_ping_window,
process_pong_message, timestamp_too_old,
meta_display_set_input_focus_window):
* src/keybindings.[ch] (grab_keyboard, ungrab_keyboard,
meta_screen_grab_all_keys, meta_window_grab_all_keys,
meta_window_ungrab_all_keys, error_on_generic_command,
error_on_command, error_on_terminal_command):
* src/metacity-dialog.c (on_realize, warn_about_no_sm_support,
error_about_command, main):
* src/screen.[ch] (struct _MetaScreen, meta_screen_new,
meta_screen_show_desktop, meta_screen_apply_startup_properties):
* src/session.c (warn_about_lame_clients_and_finish_interact):
* src/window.[ch] (struct _MetaWindow,
intervening_user_event_occurred, window_activate,
meta_window_delete, meta_window_focus,
meta_window_send_icccm_message, meta_window_client_message,
menu_callback, meta_window_show_menu, struct EventScannerData,
check_use_this_motion_notify, meta_window_begin_grab_op,
meta_window_set_user_time):
* src/workspace.[ch] (focus_ancestor_or_mru_window,
meta_workspace_activate_with_focus, meta_workspace_activate,
meta_workspace_focus_default_window,
focus_ancestor_or_mru_window):
Fix issues on 64-bit machines with timestamps by using guint32
(like gtk+ does) instead of Time. #348305
2006-09-13 16:32:33 +00:00
|
|
|
meta_screen_grab_all_keys (MetaScreen *screen, guint32 timestamp)
|
2002-06-27 05:08:32 +00:00
|
|
|
{
|
|
|
|
gboolean retval;
|
|
|
|
|
|
|
|
if (screen->all_keys_grabbed)
|
|
|
|
return FALSE;
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2002-06-27 05:08:32 +00:00
|
|
|
if (screen->keys_grabbed)
|
|
|
|
meta_screen_ungrab_keys (screen);
|
|
|
|
|
|
|
|
meta_topic (META_DEBUG_KEYBINDINGS,
|
|
|
|
"Grabbing all keys on RootWindow\n");
|
2013-03-29 01:38:43 +00:00
|
|
|
retval = grab_keyboard (screen->display, screen->xroot, timestamp, XIGrabModeAsync);
|
2002-06-27 05:08:32 +00:00
|
|
|
if (retval)
|
2009-05-05 08:39:29 +00:00
|
|
|
{
|
|
|
|
screen->all_keys_grabbed = TRUE;
|
|
|
|
g_object_notify (G_OBJECT (screen), "keyboard-grabbed");
|
|
|
|
}
|
2002-07-01 03:20:29 +00:00
|
|
|
else
|
|
|
|
meta_screen_grab_keys (screen);
|
2002-06-27 05:08:32 +00:00
|
|
|
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
Fix issues on 64-bit machines with timestamps by using guint32 (like gtk+
2006-09-13 Elijah Newren <newren gmail com>
* src/common.h (MetaWindowMenuFunc):
* src/core.[ch] (meta_core_user_lower_and_unfocus,
meta_core_user_focus, meta_core_show_window_menu,
meta_core_begin_grab_op, meta_core_end_grab_op):
* src/delete.c (delete_ping_reply_func, delete_ping_timeout_func,
meta_window_delete):
* src/display.[ch] (struct MetaDisplay, struct MetaPingData,
sanity_check_timestamps, meta_display_open, event_callback,
meta_spew_event, meta_display_set_grab_op_cursor,
meta_display_begin_grab_op, meta_display_end_grab_op,
meta_display_ping_timeout, meta_display_ping_window,
process_pong_message, timestamp_too_old,
meta_display_set_input_focus_window):
* src/keybindings.[ch] (grab_keyboard, ungrab_keyboard,
meta_screen_grab_all_keys, meta_window_grab_all_keys,
meta_window_ungrab_all_keys, error_on_generic_command,
error_on_command, error_on_terminal_command):
* src/metacity-dialog.c (on_realize, warn_about_no_sm_support,
error_about_command, main):
* src/screen.[ch] (struct _MetaScreen, meta_screen_new,
meta_screen_show_desktop, meta_screen_apply_startup_properties):
* src/session.c (warn_about_lame_clients_and_finish_interact):
* src/window.[ch] (struct _MetaWindow,
intervening_user_event_occurred, window_activate,
meta_window_delete, meta_window_focus,
meta_window_send_icccm_message, meta_window_client_message,
menu_callback, meta_window_show_menu, struct EventScannerData,
check_use_this_motion_notify, meta_window_begin_grab_op,
meta_window_set_user_time):
* src/workspace.[ch] (focus_ancestor_or_mru_window,
meta_workspace_activate_with_focus, meta_workspace_activate,
meta_workspace_focus_default_window,
focus_ancestor_or_mru_window):
Fix issues on 64-bit machines with timestamps by using guint32
(like gtk+ does) instead of Time. #348305
2006-09-13 16:32:33 +00:00
|
|
|
meta_screen_ungrab_all_keys (MetaScreen *screen, guint32 timestamp)
|
2002-06-27 05:08:32 +00:00
|
|
|
{
|
|
|
|
if (screen->all_keys_grabbed)
|
|
|
|
{
|
2006-09-09 20:19:56 +00:00
|
|
|
ungrab_keyboard (screen->display, timestamp);
|
2002-06-27 05:08:32 +00:00
|
|
|
|
|
|
|
screen->all_keys_grabbed = FALSE;
|
|
|
|
screen->keys_grabbed = FALSE;
|
|
|
|
|
|
|
|
/* Re-establish our standard bindings */
|
|
|
|
meta_screen_grab_keys (screen);
|
2009-05-05 08:39:29 +00:00
|
|
|
g_object_notify (G_OBJECT (screen), "keyboard-grabbed");
|
2002-06-27 05:08:32 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-07-11 06:22:00 +00:00
|
|
|
gboolean
|
2006-08-21 18:38:21 +00:00
|
|
|
meta_window_grab_all_keys (MetaWindow *window,
|
Fix issues on 64-bit machines with timestamps by using guint32 (like gtk+
2006-09-13 Elijah Newren <newren gmail com>
* src/common.h (MetaWindowMenuFunc):
* src/core.[ch] (meta_core_user_lower_and_unfocus,
meta_core_user_focus, meta_core_show_window_menu,
meta_core_begin_grab_op, meta_core_end_grab_op):
* src/delete.c (delete_ping_reply_func, delete_ping_timeout_func,
meta_window_delete):
* src/display.[ch] (struct MetaDisplay, struct MetaPingData,
sanity_check_timestamps, meta_display_open, event_callback,
meta_spew_event, meta_display_set_grab_op_cursor,
meta_display_begin_grab_op, meta_display_end_grab_op,
meta_display_ping_timeout, meta_display_ping_window,
process_pong_message, timestamp_too_old,
meta_display_set_input_focus_window):
* src/keybindings.[ch] (grab_keyboard, ungrab_keyboard,
meta_screen_grab_all_keys, meta_window_grab_all_keys,
meta_window_ungrab_all_keys, error_on_generic_command,
error_on_command, error_on_terminal_command):
* src/metacity-dialog.c (on_realize, warn_about_no_sm_support,
error_about_command, main):
* src/screen.[ch] (struct _MetaScreen, meta_screen_new,
meta_screen_show_desktop, meta_screen_apply_startup_properties):
* src/session.c (warn_about_lame_clients_and_finish_interact):
* src/window.[ch] (struct _MetaWindow,
intervening_user_event_occurred, window_activate,
meta_window_delete, meta_window_focus,
meta_window_send_icccm_message, meta_window_client_message,
menu_callback, meta_window_show_menu, struct EventScannerData,
check_use_this_motion_notify, meta_window_begin_grab_op,
meta_window_set_user_time):
* src/workspace.[ch] (focus_ancestor_or_mru_window,
meta_workspace_activate_with_focus, meta_workspace_activate,
meta_workspace_focus_default_window,
focus_ancestor_or_mru_window):
Fix issues on 64-bit machines with timestamps by using guint32
(like gtk+ does) instead of Time. #348305
2006-09-13 16:32:33 +00:00
|
|
|
guint32 timestamp)
|
2001-07-11 06:22:00 +00:00
|
|
|
{
|
|
|
|
Window grabwindow;
|
2002-06-27 05:08:32 +00:00
|
|
|
gboolean retval;
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2013-11-15 02:34:20 +00:00
|
|
|
/* We don't need to grab Wayland clients */
|
|
|
|
if (window->client_type == META_WINDOW_CLIENT_TYPE_WAYLAND)
|
|
|
|
return TRUE;
|
|
|
|
|
2001-07-11 06:22:00 +00:00
|
|
|
if (window->all_keys_grabbed)
|
|
|
|
return FALSE;
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2001-07-11 06:22:00 +00:00
|
|
|
if (window->keys_grabbed)
|
|
|
|
meta_window_ungrab_keys (window);
|
|
|
|
|
|
|
|
/* Make sure the window is focused, otherwise the grab
|
|
|
|
* won't do a lot of good.
|
|
|
|
*/
|
2002-01-03 23:28:19 +00:00
|
|
|
meta_topic (META_DEBUG_FOCUS,
|
|
|
|
"Focusing %s because we're grabbing all its keys\n",
|
|
|
|
window->desc);
|
2006-08-21 18:38:21 +00:00
|
|
|
meta_window_focus (window, timestamp);
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2013-12-06 05:57:11 +00:00
|
|
|
grabwindow = meta_window_get_toplevel_xwindow (window);
|
2002-06-27 05:08:32 +00:00
|
|
|
|
|
|
|
meta_topic (META_DEBUG_KEYBINDINGS,
|
|
|
|
"Grabbing all keys on window %s\n", window->desc);
|
2013-03-29 01:38:43 +00:00
|
|
|
retval = grab_keyboard (window->display, grabwindow, timestamp, XIGrabModeAsync);
|
2002-06-27 05:08:32 +00:00
|
|
|
if (retval)
|
2001-07-11 06:22:00 +00:00
|
|
|
{
|
2002-06-27 05:08:32 +00:00
|
|
|
window->keys_grabbed = FALSE;
|
|
|
|
window->all_keys_grabbed = TRUE;
|
|
|
|
window->grab_on_frame = window->frame != NULL;
|
2001-07-11 06:22:00 +00:00
|
|
|
}
|
2002-01-03 23:28:19 +00:00
|
|
|
|
2002-06-27 05:08:32 +00:00
|
|
|
return retval;
|
2001-07-11 06:22:00 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
Fix issues on 64-bit machines with timestamps by using guint32 (like gtk+
2006-09-13 Elijah Newren <newren gmail com>
* src/common.h (MetaWindowMenuFunc):
* src/core.[ch] (meta_core_user_lower_and_unfocus,
meta_core_user_focus, meta_core_show_window_menu,
meta_core_begin_grab_op, meta_core_end_grab_op):
* src/delete.c (delete_ping_reply_func, delete_ping_timeout_func,
meta_window_delete):
* src/display.[ch] (struct MetaDisplay, struct MetaPingData,
sanity_check_timestamps, meta_display_open, event_callback,
meta_spew_event, meta_display_set_grab_op_cursor,
meta_display_begin_grab_op, meta_display_end_grab_op,
meta_display_ping_timeout, meta_display_ping_window,
process_pong_message, timestamp_too_old,
meta_display_set_input_focus_window):
* src/keybindings.[ch] (grab_keyboard, ungrab_keyboard,
meta_screen_grab_all_keys, meta_window_grab_all_keys,
meta_window_ungrab_all_keys, error_on_generic_command,
error_on_command, error_on_terminal_command):
* src/metacity-dialog.c (on_realize, warn_about_no_sm_support,
error_about_command, main):
* src/screen.[ch] (struct _MetaScreen, meta_screen_new,
meta_screen_show_desktop, meta_screen_apply_startup_properties):
* src/session.c (warn_about_lame_clients_and_finish_interact):
* src/window.[ch] (struct _MetaWindow,
intervening_user_event_occurred, window_activate,
meta_window_delete, meta_window_focus,
meta_window_send_icccm_message, meta_window_client_message,
menu_callback, meta_window_show_menu, struct EventScannerData,
check_use_this_motion_notify, meta_window_begin_grab_op,
meta_window_set_user_time):
* src/workspace.[ch] (focus_ancestor_or_mru_window,
meta_workspace_activate_with_focus, meta_workspace_activate,
meta_workspace_focus_default_window,
focus_ancestor_or_mru_window):
Fix issues on 64-bit machines with timestamps by using guint32
(like gtk+ does) instead of Time. #348305
2006-09-13 16:32:33 +00:00
|
|
|
meta_window_ungrab_all_keys (MetaWindow *window, guint32 timestamp)
|
2001-07-11 06:22:00 +00:00
|
|
|
{
|
|
|
|
if (window->all_keys_grabbed)
|
|
|
|
{
|
2006-09-09 20:19:56 +00:00
|
|
|
ungrab_keyboard (window->display, timestamp);
|
2002-01-03 23:28:19 +00:00
|
|
|
|
2001-07-11 06:22:00 +00:00
|
|
|
window->grab_on_frame = FALSE;
|
|
|
|
window->all_keys_grabbed = FALSE;
|
|
|
|
window->keys_grabbed = FALSE;
|
|
|
|
|
|
|
|
/* Re-establish our standard bindings */
|
|
|
|
meta_window_grab_keys (window);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-03-29 01:38:43 +00:00
|
|
|
void
|
|
|
|
meta_display_freeze_keyboard (MetaDisplay *display, Window window, guint32 timestamp)
|
|
|
|
{
|
|
|
|
grab_keyboard (display, window, timestamp, XIGrabModeSync);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
meta_display_ungrab_keyboard (MetaDisplay *display, guint32 timestamp)
|
|
|
|
{
|
|
|
|
ungrab_keyboard (display, timestamp);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
meta_display_unfreeze_keyboard (MetaDisplay *display, guint32 timestamp)
|
|
|
|
{
|
|
|
|
meta_error_trap_push (display);
|
|
|
|
XIAllowEvents (display->xdisplay, META_VIRTUAL_CORE_KEYBOARD_ID,
|
|
|
|
XIAsyncDevice, timestamp);
|
|
|
|
/* We shouldn't need to unfreeze the pointer device here, however we
|
|
|
|
* have to, due to the workaround we do in grab_keyboard().
|
|
|
|
*/
|
|
|
|
XIAllowEvents (display->xdisplay, META_VIRTUAL_CORE_POINTER_ID,
|
|
|
|
XIAsyncDevice, timestamp);
|
|
|
|
meta_error_trap_pop (display);
|
|
|
|
}
|
|
|
|
|
2012-12-13 01:50:43 +00:00
|
|
|
static gboolean
|
2014-04-07 19:41:37 +00:00
|
|
|
is_modifier (xkb_keysym_t keysym)
|
|
|
|
{
|
|
|
|
switch (keysym)
|
|
|
|
{
|
|
|
|
case XKB_KEY_Shift_L:
|
|
|
|
case XKB_KEY_Shift_R:
|
|
|
|
case XKB_KEY_Control_L:
|
|
|
|
case XKB_KEY_Control_R:
|
|
|
|
case XKB_KEY_Caps_Lock:
|
|
|
|
case XKB_KEY_Shift_Lock:
|
|
|
|
case XKB_KEY_Meta_L:
|
|
|
|
case XKB_KEY_Meta_R:
|
|
|
|
case XKB_KEY_Alt_L:
|
|
|
|
case XKB_KEY_Alt_R:
|
|
|
|
case XKB_KEY_Super_L:
|
|
|
|
case XKB_KEY_Super_R:
|
|
|
|
case XKB_KEY_Hyper_L:
|
|
|
|
case XKB_KEY_Hyper_R:
|
|
|
|
return TRUE;
|
|
|
|
default:
|
|
|
|
return FALSE;
|
2001-08-19 18:09:10 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-08-25 20:54:54 +00:00
|
|
|
static void
|
2013-10-03 22:03:53 +00:00
|
|
|
invoke_handler (MetaDisplay *display,
|
|
|
|
MetaScreen *screen,
|
|
|
|
MetaKeyHandler *handler,
|
|
|
|
MetaWindow *window,
|
|
|
|
ClutterKeyEvent *event,
|
|
|
|
MetaKeyBinding *binding)
|
2009-08-25 20:54:54 +00:00
|
|
|
{
|
|
|
|
if (handler->func)
|
|
|
|
(* handler->func) (display, screen,
|
2011-10-28 01:05:43 +00:00
|
|
|
handler->flags & META_KEY_BINDING_PER_WINDOW ?
|
2012-12-13 01:50:43 +00:00
|
|
|
window : NULL,
|
2009-08-25 20:54:54 +00:00
|
|
|
event,
|
|
|
|
binding,
|
|
|
|
handler->user_data);
|
|
|
|
else
|
|
|
|
(* handler->default_func) (display, screen,
|
2011-10-28 01:05:43 +00:00
|
|
|
handler->flags & META_KEY_BINDING_PER_WINDOW ?
|
2012-12-13 01:50:43 +00:00
|
|
|
window: NULL,
|
2009-08-25 20:54:54 +00:00
|
|
|
event,
|
|
|
|
binding,
|
|
|
|
NULL);
|
|
|
|
}
|
|
|
|
|
2008-03-11 03:37:54 +00:00
|
|
|
static gboolean
|
2014-03-03 13:08:34 +00:00
|
|
|
process_event (MetaDisplay *display,
|
2002-10-16 20:12:24 +00:00
|
|
|
MetaScreen *screen,
|
2002-04-28 04:52:26 +00:00
|
|
|
MetaWindow *window,
|
2014-02-26 17:56:17 +00:00
|
|
|
ClutterKeyEvent *event)
|
2001-06-06 04:47:37 +00:00
|
|
|
{
|
2014-03-03 18:33:08 +00:00
|
|
|
MetaKeyBinding *binding;
|
2001-06-06 04:47:37 +00:00
|
|
|
|
2002-06-16 03:03:08 +00:00
|
|
|
/* we used to have release-based bindings but no longer. */
|
2013-10-03 22:03:53 +00:00
|
|
|
if (event->type == CLUTTER_KEY_RELEASE)
|
2008-03-11 03:37:54 +00:00
|
|
|
return FALSE;
|
2002-04-28 04:52:26 +00:00
|
|
|
|
2014-03-03 18:33:08 +00:00
|
|
|
binding = display_get_keybinding (display,
|
|
|
|
event->hardware_keycode,
|
|
|
|
event->modifier_state);
|
|
|
|
if (!binding ||
|
2014-03-20 14:24:43 +00:00
|
|
|
(!window && binding->flags & META_KEY_BINDING_PER_WINDOW))
|
|
|
|
goto not_found;
|
|
|
|
|
|
|
|
/* If the compositor filtered out the keybindings, that
|
|
|
|
* means they don't want the binding to trigger, so we do
|
|
|
|
* the same thing as if the binding didn't exist. */
|
2014-03-18 21:31:22 +00:00
|
|
|
if (meta_compositor_filter_keybinding (display->compositor, binding))
|
2014-03-03 18:33:08 +00:00
|
|
|
goto not_found;
|
|
|
|
|
|
|
|
if (binding->handler == NULL)
|
|
|
|
meta_bug ("Binding %s has no handler\n", binding->name);
|
|
|
|
else
|
|
|
|
meta_topic (META_DEBUG_KEYBINDINGS,
|
|
|
|
"Running handler for %s\n",
|
|
|
|
binding->name);
|
2011-10-28 01:05:43 +00:00
|
|
|
|
2014-03-03 18:33:08 +00:00
|
|
|
/* Global keybindings count as a let-the-terminal-lose-focus
|
|
|
|
* due to new window mapping until the user starts
|
|
|
|
* interacting with the terminal again.
|
|
|
|
*/
|
|
|
|
display->allow_terminal_deactivation = TRUE;
|
2006-01-15 17:03:57 +00:00
|
|
|
|
2014-03-03 18:33:08 +00:00
|
|
|
invoke_handler (display, screen, binding->handler, window, event, binding);
|
2009-02-03 13:20:51 +00:00
|
|
|
|
2014-03-03 18:33:08 +00:00
|
|
|
return TRUE;
|
2002-06-16 03:03:08 +00:00
|
|
|
|
2014-03-03 18:33:08 +00:00
|
|
|
not_found:
|
2002-06-16 03:03:08 +00:00
|
|
|
meta_topic (META_DEBUG_KEYBINDINGS,
|
|
|
|
"No handler found for this event in this binding table\n");
|
2008-03-11 03:37:54 +00:00
|
|
|
return FALSE;
|
2001-06-06 04:47:37 +00:00
|
|
|
}
|
2002-06-27 05:08:32 +00:00
|
|
|
|
2011-07-09 00:48:01 +00:00
|
|
|
static gboolean
|
|
|
|
process_overlay_key (MetaDisplay *display,
|
|
|
|
MetaScreen *screen,
|
2014-02-26 17:56:17 +00:00
|
|
|
ClutterKeyEvent *event,
|
|
|
|
MetaWindow *window)
|
2011-07-09 00:48:01 +00:00
|
|
|
{
|
|
|
|
if (display->overlay_key_only_pressed)
|
|
|
|
{
|
2013-10-03 22:03:53 +00:00
|
|
|
if (event->hardware_keycode != (int)display->overlay_key_combo.keycode)
|
2011-07-09 00:48:01 +00:00
|
|
|
{
|
|
|
|
display->overlay_key_only_pressed = FALSE;
|
|
|
|
|
|
|
|
/* OK, the user hit modifier+key rather than pressing and
|
|
|
|
* releasing the ovelay key. We want to handle the key
|
|
|
|
* sequence "normally". Unfortunately, using
|
|
|
|
* XAllowEvents(..., ReplayKeyboard, ...) doesn't quite
|
|
|
|
* work, since global keybindings won't be activated ("this
|
|
|
|
* time, however, the function ignores any passive grabs at
|
|
|
|
* above (toward the root of) the grab_window of the grab
|
|
|
|
* just released.") So, we first explicitly check for one of
|
|
|
|
* our global keybindings, and if not found, we then replay
|
|
|
|
* the event. Other clients with global grabs will be out of
|
|
|
|
* luck.
|
|
|
|
*/
|
2014-03-03 13:08:34 +00:00
|
|
|
if (process_event (display, screen, window, event))
|
2011-07-09 00:48:01 +00:00
|
|
|
{
|
|
|
|
/* As normally, after we've handled a global key
|
|
|
|
* binding, we unfreeze the keyboard but keep the grab
|
|
|
|
* (this is important for something like cycling
|
|
|
|
* windows */
|
2013-10-03 22:03:53 +00:00
|
|
|
XIAllowEvents (display->xdisplay,
|
|
|
|
clutter_input_device_get_device_id (event->device),
|
2012-11-15 21:35:42 +00:00
|
|
|
XIAsyncDevice, event->time);
|
2011-07-09 00:48:01 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* Replay the event so it gets delivered to our
|
|
|
|
* per-window key bindings or to the application */
|
2013-10-03 22:03:53 +00:00
|
|
|
XIAllowEvents (display->xdisplay,
|
|
|
|
clutter_input_device_get_device_id (event->device),
|
2012-11-15 21:35:42 +00:00
|
|
|
XIReplayDevice, event->time);
|
2011-07-09 00:48:01 +00:00
|
|
|
}
|
|
|
|
}
|
2013-10-03 22:03:53 +00:00
|
|
|
else if (event->type == CLUTTER_KEY_RELEASE)
|
2011-07-09 00:48:01 +00:00
|
|
|
{
|
2013-03-04 16:23:46 +00:00
|
|
|
MetaKeyBinding *binding;
|
|
|
|
|
2011-07-09 00:48:01 +00:00
|
|
|
display->overlay_key_only_pressed = FALSE;
|
2013-10-03 22:03:53 +00:00
|
|
|
|
2011-07-09 00:48:01 +00:00
|
|
|
/* We want to unfreeze events, but keep the grab so that if the user
|
|
|
|
* starts typing into the overlay we get all the keys */
|
2013-10-03 22:03:53 +00:00
|
|
|
XIAllowEvents (display->xdisplay,
|
|
|
|
clutter_input_device_get_device_id (event->device),
|
2012-11-15 21:35:42 +00:00
|
|
|
XIAsyncDevice, event->time);
|
2012-08-29 21:07:34 +00:00
|
|
|
|
2013-03-04 16:23:46 +00:00
|
|
|
binding = display_get_keybinding (display,
|
|
|
|
display->overlay_key_combo.keycode,
|
2014-04-07 21:22:55 +00:00
|
|
|
0);
|
2013-03-04 16:23:46 +00:00
|
|
|
if (binding &&
|
2014-03-18 21:31:22 +00:00
|
|
|
meta_compositor_filter_keybinding (display->compositor, binding))
|
2013-03-04 16:23:46 +00:00
|
|
|
return TRUE;
|
2011-07-09 00:48:01 +00:00
|
|
|
meta_display_overlay_key_activate (display);
|
|
|
|
}
|
2013-08-05 15:00:32 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
/* In some rare race condition, mutter might not receive the Super_L
|
|
|
|
* KeyRelease event because:
|
|
|
|
* - the compositor might end the modal mode and call XIUngrabDevice
|
|
|
|
* while the key is still down
|
|
|
|
* - passive grabs are only activated on KeyPress and not KeyRelease.
|
|
|
|
*
|
|
|
|
* In this case, display->overlay_key_only_pressed might be wrong.
|
|
|
|
* Mutter still ought to acknowledge events, otherwise the X server
|
|
|
|
* will not send the next events.
|
|
|
|
*
|
|
|
|
* https://bugzilla.gnome.org/show_bug.cgi?id=666101
|
|
|
|
*/
|
2013-10-03 22:03:53 +00:00
|
|
|
XIAllowEvents (display->xdisplay,
|
|
|
|
clutter_input_device_get_device_id (event->device),
|
2013-08-05 15:00:32 +00:00
|
|
|
XIAsyncDevice, event->time);
|
|
|
|
}
|
2011-07-09 00:48:01 +00:00
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
2013-10-03 22:03:53 +00:00
|
|
|
else if (event->type == CLUTTER_KEY_PRESS &&
|
|
|
|
event->hardware_keycode == (int)display->overlay_key_combo.keycode)
|
2011-07-09 00:48:01 +00:00
|
|
|
{
|
|
|
|
display->overlay_key_only_pressed = TRUE;
|
|
|
|
/* We keep the keyboard frozen - this allows us to use ReplayKeyboard
|
|
|
|
* on the next event if it's not the release of the overlay key */
|
2013-10-03 22:03:53 +00:00
|
|
|
XIAllowEvents (display->xdisplay,
|
|
|
|
clutter_input_device_get_device_id (event->device),
|
2012-11-15 21:35:42 +00:00
|
|
|
XISyncDevice, event->time);
|
2011-07-09 00:48:01 +00:00
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2013-04-10 11:34:26 +00:00
|
|
|
static gboolean
|
|
|
|
process_iso_next_group (MetaDisplay *display,
|
|
|
|
MetaScreen *screen,
|
2013-10-03 22:03:53 +00:00
|
|
|
ClutterKeyEvent *event)
|
2013-04-10 11:34:26 +00:00
|
|
|
{
|
|
|
|
gboolean activate;
|
|
|
|
int i;
|
|
|
|
|
2013-11-25 13:06:10 +00:00
|
|
|
if (event->type == CLUTTER_KEY_RELEASE)
|
2013-04-10 11:34:26 +00:00
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
activate = FALSE;
|
|
|
|
|
|
|
|
for (i = 0; i < display->n_iso_next_group_combos; ++i)
|
|
|
|
{
|
2013-10-03 22:03:53 +00:00
|
|
|
if (event->hardware_keycode == display->iso_next_group_combos[i].keycode &&
|
|
|
|
event->modifier_state == (unsigned int)display->iso_next_group_combos[i].modifiers)
|
2013-04-10 11:34:26 +00:00
|
|
|
{
|
|
|
|
/* If the signal handler returns TRUE the keyboard will
|
|
|
|
remain frozen. It's the signal handler's responsibility
|
|
|
|
to unfreeze it. */
|
|
|
|
if (!meta_display_modifiers_accelerator_activate (display))
|
2013-10-03 22:03:53 +00:00
|
|
|
XIAllowEvents (display->xdisplay,
|
|
|
|
clutter_input_device_get_device_id (event->device),
|
2013-04-10 11:34:26 +00:00
|
|
|
XIAsyncDevice, event->time);
|
|
|
|
activate = TRUE;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return activate;
|
|
|
|
}
|
|
|
|
|
2007-12-09 22:56:12 +00:00
|
|
|
/* Handle a key event. May be called recursively: some key events cause
|
|
|
|
* grabs to be ended and then need to be processed again in their own
|
|
|
|
* right. This cannot cause infinite recursion because we never call
|
|
|
|
* ourselves when there wasn't a grab, and we always clear the grab
|
|
|
|
* first; the invariant is enforced using an assertion. See #112560.
|
2009-08-11 23:41:50 +00:00
|
|
|
*
|
|
|
|
* The return value is whether we handled the key event.
|
|
|
|
*
|
2007-12-09 22:56:12 +00:00
|
|
|
* FIXME: We need to prove there are no race conditions here.
|
|
|
|
* FIXME: Does it correctly handle alt-Tab being followed by another
|
|
|
|
* grabbing keypress without letting go of alt?
|
|
|
|
* FIXME: An iterative solution would probably be simpler to understand
|
|
|
|
* (and help us solve the other fixmes).
|
|
|
|
*/
|
2009-08-11 23:41:50 +00:00
|
|
|
gboolean
|
2013-10-03 22:03:53 +00:00
|
|
|
meta_display_process_key_event (MetaDisplay *display,
|
|
|
|
MetaWindow *window,
|
|
|
|
ClutterKeyEvent *event)
|
2001-06-23 05:49:35 +00:00
|
|
|
{
|
2008-03-11 03:37:54 +00:00
|
|
|
gboolean keep_grab;
|
2002-06-27 05:08:32 +00:00
|
|
|
gboolean all_keys_grabbed;
|
2008-12-02 23:13:11 +00:00
|
|
|
gboolean handled;
|
2002-06-27 05:08:32 +00:00
|
|
|
MetaScreen *screen;
|
2008-11-22 19:02:54 +00:00
|
|
|
|
2002-08-10 15:55:18 +00:00
|
|
|
/* window may be NULL */
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2013-10-03 22:31:09 +00:00
|
|
|
screen = display->screen;
|
2001-07-11 06:22:00 +00:00
|
|
|
|
2002-06-27 05:08:32 +00:00
|
|
|
all_keys_grabbed = window ? window->all_keys_grabbed : screen->all_keys_grabbed;
|
2011-07-09 00:48:01 +00:00
|
|
|
if (!all_keys_grabbed)
|
|
|
|
{
|
2014-02-26 17:56:17 +00:00
|
|
|
handled = process_overlay_key (display, screen, event, window);
|
2011-07-09 00:48:01 +00:00
|
|
|
if (handled)
|
|
|
|
return TRUE;
|
2013-04-10 11:34:26 +00:00
|
|
|
|
2013-10-03 22:03:53 +00:00
|
|
|
handled = process_iso_next_group (display, screen, event);
|
2013-04-10 11:34:26 +00:00
|
|
|
if (handled)
|
|
|
|
return TRUE;
|
2011-07-09 00:48:01 +00:00
|
|
|
}
|
|
|
|
|
2013-10-03 22:03:53 +00:00
|
|
|
XIAllowEvents (display->xdisplay,
|
|
|
|
clutter_input_device_get_device_id (event->device),
|
2012-11-15 21:35:42 +00:00
|
|
|
XIAsyncDevice, event->time);
|
2011-07-09 00:48:01 +00:00
|
|
|
|
|
|
|
keep_grab = TRUE;
|
2008-03-11 03:37:54 +00:00
|
|
|
if (all_keys_grabbed)
|
2001-07-11 06:22:00 +00:00
|
|
|
{
|
2008-03-11 03:37:54 +00:00
|
|
|
if (display->grab_op == META_GRAB_OP_NONE)
|
2009-08-11 23:41:50 +00:00
|
|
|
return TRUE;
|
2008-03-11 03:37:54 +00:00
|
|
|
/* If we get here we have a global grab, because
|
2012-12-13 01:50:43 +00:00
|
|
|
* we're in some special keyboard mode such as window move
|
|
|
|
* mode.
|
|
|
|
*/
|
2014-03-18 21:57:53 +00:00
|
|
|
if ((window && window == display->grab_window) || !window)
|
2008-03-11 03:37:54 +00:00
|
|
|
{
|
|
|
|
switch (display->grab_op)
|
|
|
|
{
|
|
|
|
case META_GRAB_OP_MOVING:
|
|
|
|
case META_GRAB_OP_RESIZING_SE:
|
2012-12-13 01:50:43 +00:00
|
|
|
case META_GRAB_OP_RESIZING_S:
|
|
|
|
case META_GRAB_OP_RESIZING_SW:
|
2008-03-11 03:37:54 +00:00
|
|
|
case META_GRAB_OP_RESIZING_N:
|
|
|
|
case META_GRAB_OP_RESIZING_NE:
|
|
|
|
case META_GRAB_OP_RESIZING_NW:
|
|
|
|
case META_GRAB_OP_RESIZING_W:
|
|
|
|
case META_GRAB_OP_RESIZING_E:
|
|
|
|
meta_topic (META_DEBUG_KEYBINDINGS,
|
|
|
|
"Processing event for mouse-only move/resize\n");
|
|
|
|
g_assert (window != NULL);
|
2013-10-03 22:03:53 +00:00
|
|
|
keep_grab = process_mouse_move_resize_grab (display, screen, window, event);
|
2008-03-11 03:37:54 +00:00
|
|
|
break;
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2008-03-11 03:37:54 +00:00
|
|
|
case META_GRAB_OP_KEYBOARD_MOVING:
|
|
|
|
meta_topic (META_DEBUG_KEYBINDINGS,
|
|
|
|
"Processing event for keyboard move\n");
|
|
|
|
g_assert (window != NULL);
|
2013-10-03 22:03:53 +00:00
|
|
|
keep_grab = process_keyboard_move_grab (display, screen, window, event);
|
2008-03-11 03:37:54 +00:00
|
|
|
break;
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2008-03-11 03:37:54 +00:00
|
|
|
case META_GRAB_OP_KEYBOARD_RESIZING_UNKNOWN:
|
|
|
|
case META_GRAB_OP_KEYBOARD_RESIZING_S:
|
|
|
|
case META_GRAB_OP_KEYBOARD_RESIZING_N:
|
|
|
|
case META_GRAB_OP_KEYBOARD_RESIZING_W:
|
|
|
|
case META_GRAB_OP_KEYBOARD_RESIZING_E:
|
|
|
|
case META_GRAB_OP_KEYBOARD_RESIZING_SE:
|
|
|
|
case META_GRAB_OP_KEYBOARD_RESIZING_NE:
|
|
|
|
case META_GRAB_OP_KEYBOARD_RESIZING_SW:
|
2012-12-13 01:50:43 +00:00
|
|
|
case META_GRAB_OP_KEYBOARD_RESIZING_NW:
|
2008-03-11 03:37:54 +00:00
|
|
|
meta_topic (META_DEBUG_KEYBINDINGS,
|
|
|
|
"Processing event for keyboard resize\n");
|
|
|
|
g_assert (window != NULL);
|
2013-10-03 22:03:53 +00:00
|
|
|
keep_grab = process_keyboard_resize_grab (display, screen, window, event);
|
2008-03-11 03:37:54 +00:00
|
|
|
break;
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2008-03-11 03:37:54 +00:00
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!keep_grab)
|
2013-10-03 22:03:53 +00:00
|
|
|
meta_display_end_grab_op (display, event->time);
|
2009-08-11 23:41:50 +00:00
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2008-03-11 03:37:54 +00:00
|
|
|
/* Do the normal keybindings */
|
2014-03-03 13:08:34 +00:00
|
|
|
return process_event (display, screen, window, event);
|
2001-08-19 18:09:10 +00:00
|
|
|
}
|
|
|
|
|
2006-08-21 18:38:21 +00:00
|
|
|
static gboolean
|
2013-10-03 22:03:53 +00:00
|
|
|
process_mouse_move_resize_grab (MetaDisplay *display,
|
|
|
|
MetaScreen *screen,
|
|
|
|
MetaWindow *window,
|
|
|
|
ClutterKeyEvent *event)
|
2006-08-21 18:38:21 +00:00
|
|
|
{
|
|
|
|
/* don't care about releases, but eat them, don't end grab */
|
2013-10-03 22:03:53 +00:00
|
|
|
if (event->type == CLUTTER_KEY_RELEASE)
|
2006-08-21 18:38:21 +00:00
|
|
|
return TRUE;
|
|
|
|
|
2013-10-03 22:03:53 +00:00
|
|
|
if (event->keyval == CLUTTER_KEY_Escape)
|
2006-08-21 18:38:21 +00:00
|
|
|
{
|
2011-01-13 16:58:11 +00:00
|
|
|
/* Hide the tiling preview if necessary */
|
|
|
|
if (window->tile_mode != META_TILE_NONE)
|
2012-03-24 10:29:39 +00:00
|
|
|
meta_screen_hide_tile_preview (screen);
|
2011-01-13 16:58:11 +00:00
|
|
|
|
2011-01-19 16:00:46 +00:00
|
|
|
/* Restore the original tile mode */
|
|
|
|
window->tile_mode = display->grab_tile_mode;
|
2011-10-08 15:00:16 +00:00
|
|
|
window->tile_monitor_number = display->grab_tile_monitor_number;
|
2011-01-19 16:00:46 +00:00
|
|
|
|
2006-08-21 18:38:21 +00:00
|
|
|
/* End move or resize and restore to original state. If the
|
|
|
|
* window was a maximized window that had been "shaken loose" we
|
|
|
|
* need to remaximize it. In normal cases, we need to do a
|
2009-05-07 17:53:47 +00:00
|
|
|
* moveresize now to get the position back to the original.
|
2006-08-21 18:38:21 +00:00
|
|
|
*/
|
2011-01-19 16:00:46 +00:00
|
|
|
if (window->shaken_loose || window->tile_mode == META_TILE_MAXIMIZED)
|
2014-03-13 22:32:20 +00:00
|
|
|
meta_window_maximize (window, META_MAXIMIZE_BOTH);
|
2011-01-19 16:00:46 +00:00
|
|
|
else if (window->tile_mode != META_TILE_NONE)
|
|
|
|
meta_window_tile (window);
|
2009-05-07 17:53:47 +00:00
|
|
|
else
|
2006-08-21 18:38:21 +00:00
|
|
|
meta_window_move_resize (display->grab_window,
|
|
|
|
TRUE,
|
|
|
|
display->grab_initial_window_pos.x,
|
|
|
|
display->grab_initial_window_pos.y,
|
|
|
|
display->grab_initial_window_pos.width,
|
|
|
|
display->grab_initial_window_pos.height);
|
|
|
|
|
2008-03-11 03:37:54 +00:00
|
|
|
/* End grab */
|
2006-08-21 18:38:21 +00:00
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
2001-08-19 18:09:10 +00:00
|
|
|
static gboolean
|
2013-10-03 22:03:53 +00:00
|
|
|
process_keyboard_move_grab (MetaDisplay *display,
|
|
|
|
MetaScreen *screen,
|
|
|
|
MetaWindow *window,
|
|
|
|
ClutterKeyEvent *event)
|
2001-08-19 18:09:10 +00:00
|
|
|
{
|
|
|
|
gboolean handled;
|
|
|
|
int x, y;
|
|
|
|
int incr;
|
|
|
|
gboolean smart_snap;
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2001-08-19 18:09:10 +00:00
|
|
|
handled = FALSE;
|
2001-07-11 06:22:00 +00:00
|
|
|
|
2001-08-19 18:09:10 +00:00
|
|
|
/* don't care about releases, but eat them, don't end grab */
|
2013-10-03 22:03:53 +00:00
|
|
|
if (event->type == CLUTTER_KEY_RELEASE)
|
2001-08-19 18:09:10 +00:00
|
|
|
return TRUE;
|
2001-07-11 06:22:00 +00:00
|
|
|
|
2001-08-19 18:09:10 +00:00
|
|
|
/* don't end grab on modifier key presses */
|
2014-04-07 19:41:37 +00:00
|
|
|
if (is_modifier (event->keyval))
|
2001-08-19 18:09:10 +00:00
|
|
|
return TRUE;
|
|
|
|
|
2009-05-07 17:53:47 +00:00
|
|
|
meta_window_get_position (window, &x, &y);
|
2001-08-19 18:09:10 +00:00
|
|
|
|
2013-10-03 22:03:53 +00:00
|
|
|
smart_snap = (event->modifier_state & CLUTTER_SHIFT_MASK) != 0;
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2001-07-11 06:22:00 +00:00
|
|
|
#define SMALL_INCREMENT 1
|
|
|
|
#define NORMAL_INCREMENT 10
|
|
|
|
|
2001-08-19 18:09:10 +00:00
|
|
|
if (smart_snap)
|
Merge of all the changes on the constraints_experiments branch. This is
2005-11-18 Elijah Newren <newren@gmail.com>
Merge of all the changes on the constraints_experiments branch.
This is just a summary, to get the full ChangeLog of those
changes (approx. 2000 lines):
cvs -q -z3 update -Pd -r constraints_experiments
cvs -q -z3 diff -pu -r CONSTRAINTS_EXPERIMENTS_BRANCHPOINT ChangeLog
Bugs fixed:
unfiled - constraints.c is overly complicated[1]
unfiled - constraints.c is not robust when all constraints
cannot simultaneously be met (constraints need to be
prioritized)
unfiled - keep-titlebar-onscreen constraint is decoration
unaware (since get_outermost_onscreen_positions()
forgets to include decorations)
unfiled - keyboard snap-moving and snap-resizing snap to hidden
edges
109553 - gravity w/ simultaneous move & resize doesn't work
113601 - maximize vertical and horizontal should toggle and be
constrained
122196 - windows show up under vertical panels
122670 - jerky/random resizing of window via keyboard[2]
124582 - keyboard and mouse snap-resizing and snap-moving
erroneously moves the window multidimensionally
136307 - don't allow apps to resize themselves off the screen
(*cough* filechooser *cough*)
142016, 143784 - windows should not span multiple xineramas
unless placed there by the user
143145 - clamp new windows to screensize and force them
onscreen, if they'll fit
144126 - Handle pathological strut lists sanely[3]
149867 - fixed aspect ratio windows are difficult to resize[4]
152898 - make screen edges consistent; allow easy slamming of
windows into the left, right, and bottom edges of the
screen too.
154706 - bouncing weirdness at screen edge with keyboard moving
or resizing
156699 - avoid struts when placing windows, if possible (nasty
a11y blocker)
302456 - dragging offscreen too restrictive
304857 - wireframe moving off the top of the screen is misleading
308521 - make uni-directional resizing easier with
alt-middle-drag and prevent the occasional super
annoying resize-the-wrong-side(s) behavior
312007 - snap-resize moves windows with a minimum size
constraint
312104 - resizing the top of a window can cause the bottom to
grow
319351 - don't instantly snap on mouse-move-snapping, remove
braindeadedness of having order of releasing shift and
releasing button press matter so much
[1] fixed in my opinion, anyway.
[2] Actually, it's not totally fixed--it's just annoying
instead of almost completely unusable. Matthias had a
suggestion that may fix the remainder of the problems (see
http://tinyurl.com/bwzuu).
[3] This bug was originally about not-quite-so-pathological
cases but was left open for the worse cases. The code from
the branch handles the remainder of the cases mentioned in
this bug.
[4] Actually, although it's far better there's still some minor
issues left: a slight drift that's only noticeable after
lots of resizing, and potential problems with partially
onscreen constraints due to not clearing any
fixed_directions flags (aspect ratio windows get resized in
both directions and thus aren't fixed in one of them)
New feature:
81704 - edge resistance for user move and resize operations;
in particular 3 different kinds of resistance are
implemented:
Pixel-Distance: window movement is resisted when it
aligns with an edge unless the movement is greater than
a threshold number of pixels
Timeout: window movement past an edge is prevented until
a certain amount of time has elapsed during the
operation since the first request to move it past that
edge
Keyboard-Buildup: when moving or resizing with the
keyboard, once a window is aligned with a certain edge
it cannot move past until the correct direction has
been pressed enough times (e.g. 2 or 3 times)
Major changes:
- constraints.c has been rewritten; very few lines of code from
the old version remain. There is a comment near the top of
the function explaining the basics of how the new framework
works. A more detailed explanation can be found in
doc/how-constraints-works.txt
- edge-resistance.[ch] are new files implementing edge-resistance.
- boxes.[ch] are new files containing low-level error-prone
functions used heavily in constraints.c and edge-resistance.c,
among various places throughout the code. testboxes.c
contains a thorough testsuite for the boxes.[ch] functions
compiled into a program, testboxes.
- meta_window_move_resize_internal() *must* be told the gravity
of the associated operation (if it's just a move operation,
the gravity will be ignored, but for resize and move+resize
the correct value is needed)
- the craziness of different values that
meta_window_move_resize_internal() accepts has been documented
in a large comment at the beginning of the function. It may
be possible to clean this up some, but until then things will
remain as they were before--caller beware.
- screen and xinerama usable areas (i.e. places not covered by
e.g. panels) are cached in the workspace now, as are the
screen and xinerama edges. These get updated with the
workarea in src/workspace.c:ensure_work_areas_validated()
2005-11-19 14:58:50 +00:00
|
|
|
incr = 1;
|
2013-10-03 22:03:53 +00:00
|
|
|
else if (event->modifier_state & CLUTTER_CONTROL_MASK)
|
2001-08-19 18:09:10 +00:00
|
|
|
incr = SMALL_INCREMENT;
|
|
|
|
else
|
|
|
|
incr = NORMAL_INCREMENT;
|
2001-07-12 05:53:56 +00:00
|
|
|
|
2013-10-03 22:03:53 +00:00
|
|
|
if (event->keyval == CLUTTER_KEY_Escape)
|
2003-04-25 03:32:41 +00:00
|
|
|
{
|
2006-08-21 18:38:21 +00:00
|
|
|
/* End move and restore to original state. If the window was a
|
|
|
|
* maximized window that had been "shaken loose" we need to
|
|
|
|
* remaximize it. In normal cases, we need to do a moveresize
|
2009-05-07 17:53:47 +00:00
|
|
|
* now to get the position back to the original.
|
2003-10-12 06:25:38 +00:00
|
|
|
*/
|
2006-08-21 18:38:21 +00:00
|
|
|
if (window->shaken_loose)
|
2014-03-13 22:32:20 +00:00
|
|
|
meta_window_maximize (window, META_MAXIMIZE_BOTH);
|
2009-05-07 17:53:47 +00:00
|
|
|
else
|
2005-08-03 02:22:00 +00:00
|
|
|
meta_window_move_resize (display->grab_window,
|
|
|
|
TRUE,
|
|
|
|
display->grab_initial_window_pos.x,
|
|
|
|
display->grab_initial_window_pos.y,
|
|
|
|
display->grab_initial_window_pos.width,
|
|
|
|
display->grab_initial_window_pos.height);
|
2003-04-25 03:32:41 +00:00
|
|
|
}
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2002-04-28 04:52:26 +00:00
|
|
|
/* When moving by increments, we still snap to edges if the move
|
|
|
|
* to the edge is smaller than the increment. This is because
|
|
|
|
* Shift + arrow to snap is sort of a hidden feature. This way
|
|
|
|
* people using just arrows shouldn't get too frustrated.
|
|
|
|
*/
|
2013-10-03 22:03:53 +00:00
|
|
|
switch (event->keyval)
|
2001-08-19 18:09:10 +00:00
|
|
|
{
|
2013-10-03 22:03:53 +00:00
|
|
|
case CLUTTER_KEY_KP_Home:
|
|
|
|
case CLUTTER_KEY_KP_Prior:
|
|
|
|
case CLUTTER_KEY_Up:
|
|
|
|
case CLUTTER_KEY_KP_Up:
|
2001-08-19 18:09:10 +00:00
|
|
|
y -= incr;
|
|
|
|
handled = TRUE;
|
|
|
|
break;
|
2013-10-03 22:03:53 +00:00
|
|
|
case CLUTTER_KEY_KP_End:
|
|
|
|
case CLUTTER_KEY_KP_Next:
|
|
|
|
case CLUTTER_KEY_Down:
|
|
|
|
case CLUTTER_KEY_KP_Down:
|
2001-08-19 18:09:10 +00:00
|
|
|
y += incr;
|
|
|
|
handled = TRUE;
|
|
|
|
break;
|
2003-04-25 03:32:41 +00:00
|
|
|
}
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2013-10-03 22:03:53 +00:00
|
|
|
switch (event->keyval)
|
2003-04-25 03:32:41 +00:00
|
|
|
{
|
2013-10-03 22:03:53 +00:00
|
|
|
case CLUTTER_KEY_KP_Home:
|
|
|
|
case CLUTTER_KEY_KP_End:
|
|
|
|
case CLUTTER_KEY_Left:
|
|
|
|
case CLUTTER_KEY_KP_Left:
|
2001-08-19 18:09:10 +00:00
|
|
|
x -= incr;
|
|
|
|
handled = TRUE;
|
|
|
|
break;
|
2013-10-03 22:03:53 +00:00
|
|
|
case CLUTTER_KEY_KP_Prior:
|
|
|
|
case CLUTTER_KEY_KP_Next:
|
|
|
|
case CLUTTER_KEY_Right:
|
|
|
|
case CLUTTER_KEY_KP_Right:
|
2001-08-19 18:09:10 +00:00
|
|
|
x += incr;
|
|
|
|
handled = TRUE;
|
|
|
|
break;
|
|
|
|
}
|
2001-07-12 05:53:56 +00:00
|
|
|
|
2001-08-19 18:09:10 +00:00
|
|
|
if (handled)
|
Patch to provide extra cues to the user when using window menu move and
2002-08-08 Craig Black <blackc@speakeasy.net>
Patch to provide extra cues to the user when using
window menu move and resize, #85724.
* src/common.h: add new cursors
* src/display.c: (grab_op_is_mouse)
(meta_display_create_x_cursor), (xcursor_for_op),
(meta_display_set_grab_op_cursor),
(meta_display_begin_grab_op):
The keyboard move and resize grab ops now also use the mouse.
Allow the grab cursor to be changed during the grab op.
Hold onto the initial grab position in case of reset.
* src/display.h: save the initial grab position
* src/keybindings.c: (process_keyboard_move_grab),
(process_keyboard_resize_grab), (handle_begin_move),
(handle_begin_resize):
The keyboard move and resize grab ops now also use the mouse.
* src/window.c: (meta_window_client_message), (menu_callback),
(update_move), (update_resize),
(meta_window_handle_mouse_grab_op_event), (warp_pointer),
(meta_window_warp_pointer), (meta_window_begin_grab_op),
(meta_window_update_resize_grab_op):
When moving or resizing a window use the last grab position
in computing change increment.
Provide support for warping the mouse pointer.
* src/window.h: new warp pointer and grab op helper functions
2002-08-09 04:27:23 +00:00
|
|
|
{
|
Merge of all the changes on the constraints_experiments branch. This is
2005-11-18 Elijah Newren <newren@gmail.com>
Merge of all the changes on the constraints_experiments branch.
This is just a summary, to get the full ChangeLog of those
changes (approx. 2000 lines):
cvs -q -z3 update -Pd -r constraints_experiments
cvs -q -z3 diff -pu -r CONSTRAINTS_EXPERIMENTS_BRANCHPOINT ChangeLog
Bugs fixed:
unfiled - constraints.c is overly complicated[1]
unfiled - constraints.c is not robust when all constraints
cannot simultaneously be met (constraints need to be
prioritized)
unfiled - keep-titlebar-onscreen constraint is decoration
unaware (since get_outermost_onscreen_positions()
forgets to include decorations)
unfiled - keyboard snap-moving and snap-resizing snap to hidden
edges
109553 - gravity w/ simultaneous move & resize doesn't work
113601 - maximize vertical and horizontal should toggle and be
constrained
122196 - windows show up under vertical panels
122670 - jerky/random resizing of window via keyboard[2]
124582 - keyboard and mouse snap-resizing and snap-moving
erroneously moves the window multidimensionally
136307 - don't allow apps to resize themselves off the screen
(*cough* filechooser *cough*)
142016, 143784 - windows should not span multiple xineramas
unless placed there by the user
143145 - clamp new windows to screensize and force them
onscreen, if they'll fit
144126 - Handle pathological strut lists sanely[3]
149867 - fixed aspect ratio windows are difficult to resize[4]
152898 - make screen edges consistent; allow easy slamming of
windows into the left, right, and bottom edges of the
screen too.
154706 - bouncing weirdness at screen edge with keyboard moving
or resizing
156699 - avoid struts when placing windows, if possible (nasty
a11y blocker)
302456 - dragging offscreen too restrictive
304857 - wireframe moving off the top of the screen is misleading
308521 - make uni-directional resizing easier with
alt-middle-drag and prevent the occasional super
annoying resize-the-wrong-side(s) behavior
312007 - snap-resize moves windows with a minimum size
constraint
312104 - resizing the top of a window can cause the bottom to
grow
319351 - don't instantly snap on mouse-move-snapping, remove
braindeadedness of having order of releasing shift and
releasing button press matter so much
[1] fixed in my opinion, anyway.
[2] Actually, it's not totally fixed--it's just annoying
instead of almost completely unusable. Matthias had a
suggestion that may fix the remainder of the problems (see
http://tinyurl.com/bwzuu).
[3] This bug was originally about not-quite-so-pathological
cases but was left open for the worse cases. The code from
the branch handles the remainder of the cases mentioned in
this bug.
[4] Actually, although it's far better there's still some minor
issues left: a slight drift that's only noticeable after
lots of resizing, and potential problems with partially
onscreen constraints due to not clearing any
fixed_directions flags (aspect ratio windows get resized in
both directions and thus aren't fixed in one of them)
New feature:
81704 - edge resistance for user move and resize operations;
in particular 3 different kinds of resistance are
implemented:
Pixel-Distance: window movement is resisted when it
aligns with an edge unless the movement is greater than
a threshold number of pixels
Timeout: window movement past an edge is prevented until
a certain amount of time has elapsed during the
operation since the first request to move it past that
edge
Keyboard-Buildup: when moving or resizing with the
keyboard, once a window is aligned with a certain edge
it cannot move past until the correct direction has
been pressed enough times (e.g. 2 or 3 times)
Major changes:
- constraints.c has been rewritten; very few lines of code from
the old version remain. There is a comment near the top of
the function explaining the basics of how the new framework
works. A more detailed explanation can be found in
doc/how-constraints-works.txt
- edge-resistance.[ch] are new files implementing edge-resistance.
- boxes.[ch] are new files containing low-level error-prone
functions used heavily in constraints.c and edge-resistance.c,
among various places throughout the code. testboxes.c
contains a thorough testsuite for the boxes.[ch] functions
compiled into a program, testboxes.
- meta_window_move_resize_internal() *must* be told the gravity
of the associated operation (if it's just a move operation,
the gravity will be ignored, but for resize and move+resize
the correct value is needed)
- the craziness of different values that
meta_window_move_resize_internal() accepts has been documented
in a large comment at the beginning of the function. It may
be possible to clean this up some, but until then things will
remain as they were before--caller beware.
- screen and xinerama usable areas (i.e. places not covered by
e.g. panels) are cached in the workspace now, as are the
screen and xinerama edges. These get updated with the
workarea in src/workspace.c:ensure_work_areas_validated()
2005-11-19 14:58:50 +00:00
|
|
|
MetaRectangle old_rect;
|
2003-10-12 06:25:38 +00:00
|
|
|
meta_topic (META_DEBUG_KEYBINDINGS,
|
|
|
|
"Computed new window location %d,%d due to keypress\n",
|
|
|
|
x, y);
|
Merge of all the changes on the constraints_experiments branch. This is
2005-11-18 Elijah Newren <newren@gmail.com>
Merge of all the changes on the constraints_experiments branch.
This is just a summary, to get the full ChangeLog of those
changes (approx. 2000 lines):
cvs -q -z3 update -Pd -r constraints_experiments
cvs -q -z3 diff -pu -r CONSTRAINTS_EXPERIMENTS_BRANCHPOINT ChangeLog
Bugs fixed:
unfiled - constraints.c is overly complicated[1]
unfiled - constraints.c is not robust when all constraints
cannot simultaneously be met (constraints need to be
prioritized)
unfiled - keep-titlebar-onscreen constraint is decoration
unaware (since get_outermost_onscreen_positions()
forgets to include decorations)
unfiled - keyboard snap-moving and snap-resizing snap to hidden
edges
109553 - gravity w/ simultaneous move & resize doesn't work
113601 - maximize vertical and horizontal should toggle and be
constrained
122196 - windows show up under vertical panels
122670 - jerky/random resizing of window via keyboard[2]
124582 - keyboard and mouse snap-resizing and snap-moving
erroneously moves the window multidimensionally
136307 - don't allow apps to resize themselves off the screen
(*cough* filechooser *cough*)
142016, 143784 - windows should not span multiple xineramas
unless placed there by the user
143145 - clamp new windows to screensize and force them
onscreen, if they'll fit
144126 - Handle pathological strut lists sanely[3]
149867 - fixed aspect ratio windows are difficult to resize[4]
152898 - make screen edges consistent; allow easy slamming of
windows into the left, right, and bottom edges of the
screen too.
154706 - bouncing weirdness at screen edge with keyboard moving
or resizing
156699 - avoid struts when placing windows, if possible (nasty
a11y blocker)
302456 - dragging offscreen too restrictive
304857 - wireframe moving off the top of the screen is misleading
308521 - make uni-directional resizing easier with
alt-middle-drag and prevent the occasional super
annoying resize-the-wrong-side(s) behavior
312007 - snap-resize moves windows with a minimum size
constraint
312104 - resizing the top of a window can cause the bottom to
grow
319351 - don't instantly snap on mouse-move-snapping, remove
braindeadedness of having order of releasing shift and
releasing button press matter so much
[1] fixed in my opinion, anyway.
[2] Actually, it's not totally fixed--it's just annoying
instead of almost completely unusable. Matthias had a
suggestion that may fix the remainder of the problems (see
http://tinyurl.com/bwzuu).
[3] This bug was originally about not-quite-so-pathological
cases but was left open for the worse cases. The code from
the branch handles the remainder of the cases mentioned in
this bug.
[4] Actually, although it's far better there's still some minor
issues left: a slight drift that's only noticeable after
lots of resizing, and potential problems with partially
onscreen constraints due to not clearing any
fixed_directions flags (aspect ratio windows get resized in
both directions and thus aren't fixed in one of them)
New feature:
81704 - edge resistance for user move and resize operations;
in particular 3 different kinds of resistance are
implemented:
Pixel-Distance: window movement is resisted when it
aligns with an edge unless the movement is greater than
a threshold number of pixels
Timeout: window movement past an edge is prevented until
a certain amount of time has elapsed during the
operation since the first request to move it past that
edge
Keyboard-Buildup: when moving or resizing with the
keyboard, once a window is aligned with a certain edge
it cannot move past until the correct direction has
been pressed enough times (e.g. 2 or 3 times)
Major changes:
- constraints.c has been rewritten; very few lines of code from
the old version remain. There is a comment near the top of
the function explaining the basics of how the new framework
works. A more detailed explanation can be found in
doc/how-constraints-works.txt
- edge-resistance.[ch] are new files implementing edge-resistance.
- boxes.[ch] are new files containing low-level error-prone
functions used heavily in constraints.c and edge-resistance.c,
among various places throughout the code. testboxes.c
contains a thorough testsuite for the boxes.[ch] functions
compiled into a program, testboxes.
- meta_window_move_resize_internal() *must* be told the gravity
of the associated operation (if it's just a move operation,
the gravity will be ignored, but for resize and move+resize
the correct value is needed)
- the craziness of different values that
meta_window_move_resize_internal() accepts has been documented
in a large comment at the beginning of the function. It may
be possible to clean this up some, but until then things will
remain as they were before--caller beware.
- screen and xinerama usable areas (i.e. places not covered by
e.g. panels) are cached in the workspace now, as are the
screen and xinerama edges. These get updated with the
workarea in src/workspace.c:ensure_work_areas_validated()
2005-11-19 14:58:50 +00:00
|
|
|
|
2009-05-07 17:53:47 +00:00
|
|
|
meta_window_get_client_root_coords (window, &old_rect);
|
Merge of all the changes on the constraints_experiments branch. This is
2005-11-18 Elijah Newren <newren@gmail.com>
Merge of all the changes on the constraints_experiments branch.
This is just a summary, to get the full ChangeLog of those
changes (approx. 2000 lines):
cvs -q -z3 update -Pd -r constraints_experiments
cvs -q -z3 diff -pu -r CONSTRAINTS_EXPERIMENTS_BRANCHPOINT ChangeLog
Bugs fixed:
unfiled - constraints.c is overly complicated[1]
unfiled - constraints.c is not robust when all constraints
cannot simultaneously be met (constraints need to be
prioritized)
unfiled - keep-titlebar-onscreen constraint is decoration
unaware (since get_outermost_onscreen_positions()
forgets to include decorations)
unfiled - keyboard snap-moving and snap-resizing snap to hidden
edges
109553 - gravity w/ simultaneous move & resize doesn't work
113601 - maximize vertical and horizontal should toggle and be
constrained
122196 - windows show up under vertical panels
122670 - jerky/random resizing of window via keyboard[2]
124582 - keyboard and mouse snap-resizing and snap-moving
erroneously moves the window multidimensionally
136307 - don't allow apps to resize themselves off the screen
(*cough* filechooser *cough*)
142016, 143784 - windows should not span multiple xineramas
unless placed there by the user
143145 - clamp new windows to screensize and force them
onscreen, if they'll fit
144126 - Handle pathological strut lists sanely[3]
149867 - fixed aspect ratio windows are difficult to resize[4]
152898 - make screen edges consistent; allow easy slamming of
windows into the left, right, and bottom edges of the
screen too.
154706 - bouncing weirdness at screen edge with keyboard moving
or resizing
156699 - avoid struts when placing windows, if possible (nasty
a11y blocker)
302456 - dragging offscreen too restrictive
304857 - wireframe moving off the top of the screen is misleading
308521 - make uni-directional resizing easier with
alt-middle-drag and prevent the occasional super
annoying resize-the-wrong-side(s) behavior
312007 - snap-resize moves windows with a minimum size
constraint
312104 - resizing the top of a window can cause the bottom to
grow
319351 - don't instantly snap on mouse-move-snapping, remove
braindeadedness of having order of releasing shift and
releasing button press matter so much
[1] fixed in my opinion, anyway.
[2] Actually, it's not totally fixed--it's just annoying
instead of almost completely unusable. Matthias had a
suggestion that may fix the remainder of the problems (see
http://tinyurl.com/bwzuu).
[3] This bug was originally about not-quite-so-pathological
cases but was left open for the worse cases. The code from
the branch handles the remainder of the cases mentioned in
this bug.
[4] Actually, although it's far better there's still some minor
issues left: a slight drift that's only noticeable after
lots of resizing, and potential problems with partially
onscreen constraints due to not clearing any
fixed_directions flags (aspect ratio windows get resized in
both directions and thus aren't fixed in one of them)
New feature:
81704 - edge resistance for user move and resize operations;
in particular 3 different kinds of resistance are
implemented:
Pixel-Distance: window movement is resisted when it
aligns with an edge unless the movement is greater than
a threshold number of pixels
Timeout: window movement past an edge is prevented until
a certain amount of time has elapsed during the
operation since the first request to move it past that
edge
Keyboard-Buildup: when moving or resizing with the
keyboard, once a window is aligned with a certain edge
it cannot move past until the correct direction has
been pressed enough times (e.g. 2 or 3 times)
Major changes:
- constraints.c has been rewritten; very few lines of code from
the old version remain. There is a comment near the top of
the function explaining the basics of how the new framework
works. A more detailed explanation can be found in
doc/how-constraints-works.txt
- edge-resistance.[ch] are new files implementing edge-resistance.
- boxes.[ch] are new files containing low-level error-prone
functions used heavily in constraints.c and edge-resistance.c,
among various places throughout the code. testboxes.c
contains a thorough testsuite for the boxes.[ch] functions
compiled into a program, testboxes.
- meta_window_move_resize_internal() *must* be told the gravity
of the associated operation (if it's just a move operation,
the gravity will be ignored, but for resize and move+resize
the correct value is needed)
- the craziness of different values that
meta_window_move_resize_internal() accepts has been documented
in a large comment at the beginning of the function. It may
be possible to clean this up some, but until then things will
remain as they were before--caller beware.
- screen and xinerama usable areas (i.e. places not covered by
e.g. panels) are cached in the workspace now, as are the
screen and xinerama edges. These get updated with the
workarea in src/workspace.c:ensure_work_areas_validated()
2005-11-19 14:58:50 +00:00
|
|
|
|
2012-12-13 01:50:43 +00:00
|
|
|
meta_window_edge_resistance_for_move (window,
|
Merge of all the changes on the constraints_experiments branch. This is
2005-11-18 Elijah Newren <newren@gmail.com>
Merge of all the changes on the constraints_experiments branch.
This is just a summary, to get the full ChangeLog of those
changes (approx. 2000 lines):
cvs -q -z3 update -Pd -r constraints_experiments
cvs -q -z3 diff -pu -r CONSTRAINTS_EXPERIMENTS_BRANCHPOINT ChangeLog
Bugs fixed:
unfiled - constraints.c is overly complicated[1]
unfiled - constraints.c is not robust when all constraints
cannot simultaneously be met (constraints need to be
prioritized)
unfiled - keep-titlebar-onscreen constraint is decoration
unaware (since get_outermost_onscreen_positions()
forgets to include decorations)
unfiled - keyboard snap-moving and snap-resizing snap to hidden
edges
109553 - gravity w/ simultaneous move & resize doesn't work
113601 - maximize vertical and horizontal should toggle and be
constrained
122196 - windows show up under vertical panels
122670 - jerky/random resizing of window via keyboard[2]
124582 - keyboard and mouse snap-resizing and snap-moving
erroneously moves the window multidimensionally
136307 - don't allow apps to resize themselves off the screen
(*cough* filechooser *cough*)
142016, 143784 - windows should not span multiple xineramas
unless placed there by the user
143145 - clamp new windows to screensize and force them
onscreen, if they'll fit
144126 - Handle pathological strut lists sanely[3]
149867 - fixed aspect ratio windows are difficult to resize[4]
152898 - make screen edges consistent; allow easy slamming of
windows into the left, right, and bottom edges of the
screen too.
154706 - bouncing weirdness at screen edge with keyboard moving
or resizing
156699 - avoid struts when placing windows, if possible (nasty
a11y blocker)
302456 - dragging offscreen too restrictive
304857 - wireframe moving off the top of the screen is misleading
308521 - make uni-directional resizing easier with
alt-middle-drag and prevent the occasional super
annoying resize-the-wrong-side(s) behavior
312007 - snap-resize moves windows with a minimum size
constraint
312104 - resizing the top of a window can cause the bottom to
grow
319351 - don't instantly snap on mouse-move-snapping, remove
braindeadedness of having order of releasing shift and
releasing button press matter so much
[1] fixed in my opinion, anyway.
[2] Actually, it's not totally fixed--it's just annoying
instead of almost completely unusable. Matthias had a
suggestion that may fix the remainder of the problems (see
http://tinyurl.com/bwzuu).
[3] This bug was originally about not-quite-so-pathological
cases but was left open for the worse cases. The code from
the branch handles the remainder of the cases mentioned in
this bug.
[4] Actually, although it's far better there's still some minor
issues left: a slight drift that's only noticeable after
lots of resizing, and potential problems with partially
onscreen constraints due to not clearing any
fixed_directions flags (aspect ratio windows get resized in
both directions and thus aren't fixed in one of them)
New feature:
81704 - edge resistance for user move and resize operations;
in particular 3 different kinds of resistance are
implemented:
Pixel-Distance: window movement is resisted when it
aligns with an edge unless the movement is greater than
a threshold number of pixels
Timeout: window movement past an edge is prevented until
a certain amount of time has elapsed during the
operation since the first request to move it past that
edge
Keyboard-Buildup: when moving or resizing with the
keyboard, once a window is aligned with a certain edge
it cannot move past until the correct direction has
been pressed enough times (e.g. 2 or 3 times)
Major changes:
- constraints.c has been rewritten; very few lines of code from
the old version remain. There is a comment near the top of
the function explaining the basics of how the new framework
works. A more detailed explanation can be found in
doc/how-constraints-works.txt
- edge-resistance.[ch] are new files implementing edge-resistance.
- boxes.[ch] are new files containing low-level error-prone
functions used heavily in constraints.c and edge-resistance.c,
among various places throughout the code. testboxes.c
contains a thorough testsuite for the boxes.[ch] functions
compiled into a program, testboxes.
- meta_window_move_resize_internal() *must* be told the gravity
of the associated operation (if it's just a move operation,
the gravity will be ignored, but for resize and move+resize
the correct value is needed)
- the craziness of different values that
meta_window_move_resize_internal() accepts has been documented
in a large comment at the beginning of the function. It may
be possible to clean this up some, but until then things will
remain as they were before--caller beware.
- screen and xinerama usable areas (i.e. places not covered by
e.g. panels) are cached in the workspace now, as are the
screen and xinerama edges. These get updated with the
workarea in src/workspace.c:ensure_work_areas_validated()
2005-11-19 14:58:50 +00:00
|
|
|
old_rect.x,
|
|
|
|
old_rect.y,
|
|
|
|
&x,
|
|
|
|
&y,
|
|
|
|
NULL,
|
|
|
|
smart_snap,
|
|
|
|
TRUE);
|
|
|
|
|
2009-05-07 17:53:47 +00:00
|
|
|
meta_window_move (window, TRUE, x, y);
|
2003-10-12 06:25:38 +00:00
|
|
|
meta_window_update_keyboard_move (window);
|
Patch to provide extra cues to the user when using window menu move and
2002-08-08 Craig Black <blackc@speakeasy.net>
Patch to provide extra cues to the user when using
window menu move and resize, #85724.
* src/common.h: add new cursors
* src/display.c: (grab_op_is_mouse)
(meta_display_create_x_cursor), (xcursor_for_op),
(meta_display_set_grab_op_cursor),
(meta_display_begin_grab_op):
The keyboard move and resize grab ops now also use the mouse.
Allow the grab cursor to be changed during the grab op.
Hold onto the initial grab position in case of reset.
* src/display.h: save the initial grab position
* src/keybindings.c: (process_keyboard_move_grab),
(process_keyboard_resize_grab), (handle_begin_move),
(handle_begin_resize):
The keyboard move and resize grab ops now also use the mouse.
* src/window.c: (meta_window_client_message), (menu_callback),
(update_move), (update_resize),
(meta_window_handle_mouse_grab_op_event), (warp_pointer),
(meta_window_warp_pointer), (meta_window_begin_grab_op),
(meta_window_update_resize_grab_op):
When moving or resizing a window use the last grab position
in computing change increment.
Provide support for warping the mouse pointer.
* src/window.h: new warp pointer and grab op helper functions
2002-08-09 04:27:23 +00:00
|
|
|
}
|
2001-07-11 06:22:00 +00:00
|
|
|
|
2001-08-19 18:09:10 +00:00
|
|
|
return handled;
|
|
|
|
}
|
|
|
|
|
2002-06-19 04:12:49 +00:00
|
|
|
static gboolean
|
2013-10-03 22:03:53 +00:00
|
|
|
process_keyboard_resize_grab_op_change (MetaDisplay *display,
|
|
|
|
MetaScreen *screen,
|
|
|
|
MetaWindow *window,
|
|
|
|
ClutterKeyEvent *event)
|
2002-06-19 04:12:49 +00:00
|
|
|
{
|
|
|
|
gboolean handled;
|
|
|
|
|
2005-08-03 02:22:00 +00:00
|
|
|
handled = FALSE;
|
2002-06-19 04:12:49 +00:00
|
|
|
switch (display->grab_op)
|
|
|
|
{
|
|
|
|
case META_GRAB_OP_KEYBOARD_RESIZING_UNKNOWN:
|
2013-10-03 22:03:53 +00:00
|
|
|
switch (event->keyval)
|
2002-06-19 04:12:49 +00:00
|
|
|
{
|
2013-10-03 22:03:53 +00:00
|
|
|
case CLUTTER_KEY_Up:
|
|
|
|
case CLUTTER_KEY_KP_Up:
|
2012-12-13 01:50:43 +00:00
|
|
|
display->grab_op = META_GRAB_OP_KEYBOARD_RESIZING_N;
|
2002-06-19 04:12:49 +00:00
|
|
|
handled = TRUE;
|
|
|
|
break;
|
2013-10-03 22:03:53 +00:00
|
|
|
case CLUTTER_KEY_Down:
|
|
|
|
case CLUTTER_KEY_KP_Down:
|
2002-06-19 04:12:49 +00:00
|
|
|
display->grab_op = META_GRAB_OP_KEYBOARD_RESIZING_S;
|
|
|
|
handled = TRUE;
|
|
|
|
break;
|
2013-10-03 22:03:53 +00:00
|
|
|
case CLUTTER_KEY_Left:
|
|
|
|
case CLUTTER_KEY_KP_Left:
|
2002-06-19 04:12:49 +00:00
|
|
|
display->grab_op = META_GRAB_OP_KEYBOARD_RESIZING_W;
|
|
|
|
handled = TRUE;
|
|
|
|
break;
|
2013-10-03 22:03:53 +00:00
|
|
|
case CLUTTER_KEY_Right:
|
|
|
|
case CLUTTER_KEY_KP_Right:
|
2002-06-19 04:12:49 +00:00
|
|
|
display->grab_op = META_GRAB_OP_KEYBOARD_RESIZING_E;
|
|
|
|
handled = TRUE;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2002-06-19 04:12:49 +00:00
|
|
|
case META_GRAB_OP_KEYBOARD_RESIZING_S:
|
2013-10-03 22:03:53 +00:00
|
|
|
switch (event->keyval)
|
2002-06-19 04:12:49 +00:00
|
|
|
{
|
2013-10-03 22:03:53 +00:00
|
|
|
case CLUTTER_KEY_Left:
|
|
|
|
case CLUTTER_KEY_KP_Left:
|
2005-08-03 02:22:00 +00:00
|
|
|
display->grab_op = META_GRAB_OP_KEYBOARD_RESIZING_W;
|
2002-06-19 04:12:49 +00:00
|
|
|
handled = TRUE;
|
|
|
|
break;
|
2013-10-03 22:03:53 +00:00
|
|
|
case CLUTTER_KEY_Right:
|
|
|
|
case CLUTTER_KEY_KP_Right:
|
2005-08-03 02:22:00 +00:00
|
|
|
display->grab_op = META_GRAB_OP_KEYBOARD_RESIZING_E;
|
2002-06-19 04:12:49 +00:00
|
|
|
handled = TRUE;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case META_GRAB_OP_KEYBOARD_RESIZING_N:
|
2013-10-03 22:03:53 +00:00
|
|
|
switch (event->keyval)
|
2002-06-19 04:12:49 +00:00
|
|
|
{
|
2013-10-03 22:03:53 +00:00
|
|
|
case CLUTTER_KEY_Left:
|
|
|
|
case CLUTTER_KEY_KP_Left:
|
2005-08-03 02:22:00 +00:00
|
|
|
display->grab_op = META_GRAB_OP_KEYBOARD_RESIZING_W;
|
2002-06-19 04:12:49 +00:00
|
|
|
handled = TRUE;
|
|
|
|
break;
|
2013-10-03 22:03:53 +00:00
|
|
|
case CLUTTER_KEY_Right:
|
|
|
|
case CLUTTER_KEY_KP_Right:
|
2005-08-03 02:22:00 +00:00
|
|
|
display->grab_op = META_GRAB_OP_KEYBOARD_RESIZING_E;
|
2002-06-19 04:12:49 +00:00
|
|
|
handled = TRUE;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2002-06-19 04:12:49 +00:00
|
|
|
case META_GRAB_OP_KEYBOARD_RESIZING_W:
|
2013-10-03 22:03:53 +00:00
|
|
|
switch (event->keyval)
|
2002-06-19 04:12:49 +00:00
|
|
|
{
|
2013-10-03 22:03:53 +00:00
|
|
|
case CLUTTER_KEY_Up:
|
|
|
|
case CLUTTER_KEY_KP_Up:
|
2012-12-13 01:50:43 +00:00
|
|
|
display->grab_op = META_GRAB_OP_KEYBOARD_RESIZING_N;
|
2002-06-19 04:12:49 +00:00
|
|
|
handled = TRUE;
|
|
|
|
break;
|
2013-10-03 22:03:53 +00:00
|
|
|
case CLUTTER_KEY_Down:
|
|
|
|
case CLUTTER_KEY_KP_Down:
|
2005-08-03 02:22:00 +00:00
|
|
|
display->grab_op = META_GRAB_OP_KEYBOARD_RESIZING_S;
|
2002-06-19 04:12:49 +00:00
|
|
|
handled = TRUE;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case META_GRAB_OP_KEYBOARD_RESIZING_E:
|
2013-10-03 22:03:53 +00:00
|
|
|
switch (event->keyval)
|
2002-06-19 04:12:49 +00:00
|
|
|
{
|
2013-10-03 22:03:53 +00:00
|
|
|
case CLUTTER_KEY_Up:
|
|
|
|
case CLUTTER_KEY_KP_Up:
|
2012-12-13 01:50:43 +00:00
|
|
|
display->grab_op = META_GRAB_OP_KEYBOARD_RESIZING_N;
|
2002-06-19 04:12:49 +00:00
|
|
|
handled = TRUE;
|
|
|
|
break;
|
2013-10-03 22:03:53 +00:00
|
|
|
case CLUTTER_KEY_Down:
|
|
|
|
case CLUTTER_KEY_KP_Down:
|
2005-08-03 02:22:00 +00:00
|
|
|
display->grab_op = META_GRAB_OP_KEYBOARD_RESIZING_S;
|
2002-06-19 04:12:49 +00:00
|
|
|
handled = TRUE;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2002-06-19 04:12:49 +00:00
|
|
|
case META_GRAB_OP_KEYBOARD_RESIZING_SE:
|
|
|
|
case META_GRAB_OP_KEYBOARD_RESIZING_NE:
|
|
|
|
case META_GRAB_OP_KEYBOARD_RESIZING_SW:
|
|
|
|
case META_GRAB_OP_KEYBOARD_RESIZING_NW:
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
g_assert_not_reached ();
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (handled)
|
Patch to provide extra cues to the user when using window menu move and
2002-08-08 Craig Black <blackc@speakeasy.net>
Patch to provide extra cues to the user when using
window menu move and resize, #85724.
* src/common.h: add new cursors
* src/display.c: (grab_op_is_mouse)
(meta_display_create_x_cursor), (xcursor_for_op),
(meta_display_set_grab_op_cursor),
(meta_display_begin_grab_op):
The keyboard move and resize grab ops now also use the mouse.
Allow the grab cursor to be changed during the grab op.
Hold onto the initial grab position in case of reset.
* src/display.h: save the initial grab position
* src/keybindings.c: (process_keyboard_move_grab),
(process_keyboard_resize_grab), (handle_begin_move),
(handle_begin_resize):
The keyboard move and resize grab ops now also use the mouse.
* src/window.c: (meta_window_client_message), (menu_callback),
(update_move), (update_resize),
(meta_window_handle_mouse_grab_op_event), (warp_pointer),
(meta_window_warp_pointer), (meta_window_begin_grab_op),
(meta_window_update_resize_grab_op):
When moving or resizing a window use the last grab position
in computing change increment.
Provide support for warping the mouse pointer.
* src/window.h: new warp pointer and grab op helper functions
2002-08-09 04:27:23 +00:00
|
|
|
{
|
2003-10-12 06:25:38 +00:00
|
|
|
meta_window_update_keyboard_resize (window, TRUE);
|
2012-12-13 01:50:43 +00:00
|
|
|
return TRUE;
|
2003-10-12 06:25:38 +00:00
|
|
|
}
|
2002-06-19 04:12:49 +00:00
|
|
|
|
2005-08-03 02:22:00 +00:00
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
2013-10-03 22:03:53 +00:00
|
|
|
process_keyboard_resize_grab (MetaDisplay *display,
|
|
|
|
MetaScreen *screen,
|
|
|
|
MetaWindow *window,
|
|
|
|
ClutterKeyEvent *event)
|
2005-08-03 02:22:00 +00:00
|
|
|
{
|
|
|
|
gboolean handled;
|
|
|
|
int height_inc;
|
|
|
|
int width_inc;
|
|
|
|
int width, height;
|
|
|
|
gboolean smart_snap;
|
|
|
|
int gravity;
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2005-08-03 02:22:00 +00:00
|
|
|
handled = FALSE;
|
|
|
|
|
|
|
|
/* don't care about releases, but eat them, don't end grab */
|
2013-10-03 22:03:53 +00:00
|
|
|
if (event->type == CLUTTER_KEY_RELEASE)
|
2005-08-03 02:22:00 +00:00
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
/* don't end grab on modifier key presses */
|
2014-04-07 19:41:37 +00:00
|
|
|
if (is_modifier (event->keyval))
|
2005-08-03 02:22:00 +00:00
|
|
|
return TRUE;
|
|
|
|
|
2013-10-03 22:03:53 +00:00
|
|
|
if (event->keyval == CLUTTER_KEY_Escape)
|
2005-08-03 02:22:00 +00:00
|
|
|
{
|
2009-05-07 17:53:47 +00:00
|
|
|
/* End resize and restore to original state. */
|
|
|
|
meta_window_move_resize (display->grab_window,
|
|
|
|
TRUE,
|
|
|
|
display->grab_initial_window_pos.x,
|
|
|
|
display->grab_initial_window_pos.y,
|
|
|
|
display->grab_initial_window_pos.width,
|
|
|
|
display->grab_initial_window_pos.height);
|
2005-08-03 02:22:00 +00:00
|
|
|
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2013-10-03 22:03:53 +00:00
|
|
|
if (process_keyboard_resize_grab_op_change (display, screen, window, event))
|
2005-08-03 02:22:00 +00:00
|
|
|
return TRUE;
|
|
|
|
|
2009-05-07 17:53:47 +00:00
|
|
|
width = window->rect.width;
|
|
|
|
height = window->rect.height;
|
2002-06-19 04:12:49 +00:00
|
|
|
|
|
|
|
gravity = meta_resize_gravity_from_grab_op (display->grab_op);
|
|
|
|
|
2013-10-03 22:03:53 +00:00
|
|
|
smart_snap = (event->modifier_state & CLUTTER_SHIFT_MASK) != 0;
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2002-06-19 04:12:49 +00:00
|
|
|
#define SMALL_INCREMENT 1
|
|
|
|
#define NORMAL_INCREMENT 10
|
|
|
|
|
|
|
|
if (smart_snap)
|
|
|
|
{
|
Merge of all the changes on the constraints_experiments branch. This is
2005-11-18 Elijah Newren <newren@gmail.com>
Merge of all the changes on the constraints_experiments branch.
This is just a summary, to get the full ChangeLog of those
changes (approx. 2000 lines):
cvs -q -z3 update -Pd -r constraints_experiments
cvs -q -z3 diff -pu -r CONSTRAINTS_EXPERIMENTS_BRANCHPOINT ChangeLog
Bugs fixed:
unfiled - constraints.c is overly complicated[1]
unfiled - constraints.c is not robust when all constraints
cannot simultaneously be met (constraints need to be
prioritized)
unfiled - keep-titlebar-onscreen constraint is decoration
unaware (since get_outermost_onscreen_positions()
forgets to include decorations)
unfiled - keyboard snap-moving and snap-resizing snap to hidden
edges
109553 - gravity w/ simultaneous move & resize doesn't work
113601 - maximize vertical and horizontal should toggle and be
constrained
122196 - windows show up under vertical panels
122670 - jerky/random resizing of window via keyboard[2]
124582 - keyboard and mouse snap-resizing and snap-moving
erroneously moves the window multidimensionally
136307 - don't allow apps to resize themselves off the screen
(*cough* filechooser *cough*)
142016, 143784 - windows should not span multiple xineramas
unless placed there by the user
143145 - clamp new windows to screensize and force them
onscreen, if they'll fit
144126 - Handle pathological strut lists sanely[3]
149867 - fixed aspect ratio windows are difficult to resize[4]
152898 - make screen edges consistent; allow easy slamming of
windows into the left, right, and bottom edges of the
screen too.
154706 - bouncing weirdness at screen edge with keyboard moving
or resizing
156699 - avoid struts when placing windows, if possible (nasty
a11y blocker)
302456 - dragging offscreen too restrictive
304857 - wireframe moving off the top of the screen is misleading
308521 - make uni-directional resizing easier with
alt-middle-drag and prevent the occasional super
annoying resize-the-wrong-side(s) behavior
312007 - snap-resize moves windows with a minimum size
constraint
312104 - resizing the top of a window can cause the bottom to
grow
319351 - don't instantly snap on mouse-move-snapping, remove
braindeadedness of having order of releasing shift and
releasing button press matter so much
[1] fixed in my opinion, anyway.
[2] Actually, it's not totally fixed--it's just annoying
instead of almost completely unusable. Matthias had a
suggestion that may fix the remainder of the problems (see
http://tinyurl.com/bwzuu).
[3] This bug was originally about not-quite-so-pathological
cases but was left open for the worse cases. The code from
the branch handles the remainder of the cases mentioned in
this bug.
[4] Actually, although it's far better there's still some minor
issues left: a slight drift that's only noticeable after
lots of resizing, and potential problems with partially
onscreen constraints due to not clearing any
fixed_directions flags (aspect ratio windows get resized in
both directions and thus aren't fixed in one of them)
New feature:
81704 - edge resistance for user move and resize operations;
in particular 3 different kinds of resistance are
implemented:
Pixel-Distance: window movement is resisted when it
aligns with an edge unless the movement is greater than
a threshold number of pixels
Timeout: window movement past an edge is prevented until
a certain amount of time has elapsed during the
operation since the first request to move it past that
edge
Keyboard-Buildup: when moving or resizing with the
keyboard, once a window is aligned with a certain edge
it cannot move past until the correct direction has
been pressed enough times (e.g. 2 or 3 times)
Major changes:
- constraints.c has been rewritten; very few lines of code from
the old version remain. There is a comment near the top of
the function explaining the basics of how the new framework
works. A more detailed explanation can be found in
doc/how-constraints-works.txt
- edge-resistance.[ch] are new files implementing edge-resistance.
- boxes.[ch] are new files containing low-level error-prone
functions used heavily in constraints.c and edge-resistance.c,
among various places throughout the code. testboxes.c
contains a thorough testsuite for the boxes.[ch] functions
compiled into a program, testboxes.
- meta_window_move_resize_internal() *must* be told the gravity
of the associated operation (if it's just a move operation,
the gravity will be ignored, but for resize and move+resize
the correct value is needed)
- the craziness of different values that
meta_window_move_resize_internal() accepts has been documented
in a large comment at the beginning of the function. It may
be possible to clean this up some, but until then things will
remain as they were before--caller beware.
- screen and xinerama usable areas (i.e. places not covered by
e.g. panels) are cached in the workspace now, as are the
screen and xinerama edges. These get updated with the
workarea in src/workspace.c:ensure_work_areas_validated()
2005-11-19 14:58:50 +00:00
|
|
|
height_inc = 1;
|
|
|
|
width_inc = 1;
|
2002-06-19 04:12:49 +00:00
|
|
|
}
|
2013-10-03 22:03:53 +00:00
|
|
|
else if (event->modifier_state & CLUTTER_CONTROL_MASK)
|
2002-06-19 04:12:49 +00:00
|
|
|
{
|
Merge of all the changes on the constraints_experiments branch. This is
2005-11-18 Elijah Newren <newren@gmail.com>
Merge of all the changes on the constraints_experiments branch.
This is just a summary, to get the full ChangeLog of those
changes (approx. 2000 lines):
cvs -q -z3 update -Pd -r constraints_experiments
cvs -q -z3 diff -pu -r CONSTRAINTS_EXPERIMENTS_BRANCHPOINT ChangeLog
Bugs fixed:
unfiled - constraints.c is overly complicated[1]
unfiled - constraints.c is not robust when all constraints
cannot simultaneously be met (constraints need to be
prioritized)
unfiled - keep-titlebar-onscreen constraint is decoration
unaware (since get_outermost_onscreen_positions()
forgets to include decorations)
unfiled - keyboard snap-moving and snap-resizing snap to hidden
edges
109553 - gravity w/ simultaneous move & resize doesn't work
113601 - maximize vertical and horizontal should toggle and be
constrained
122196 - windows show up under vertical panels
122670 - jerky/random resizing of window via keyboard[2]
124582 - keyboard and mouse snap-resizing and snap-moving
erroneously moves the window multidimensionally
136307 - don't allow apps to resize themselves off the screen
(*cough* filechooser *cough*)
142016, 143784 - windows should not span multiple xineramas
unless placed there by the user
143145 - clamp new windows to screensize and force them
onscreen, if they'll fit
144126 - Handle pathological strut lists sanely[3]
149867 - fixed aspect ratio windows are difficult to resize[4]
152898 - make screen edges consistent; allow easy slamming of
windows into the left, right, and bottom edges of the
screen too.
154706 - bouncing weirdness at screen edge with keyboard moving
or resizing
156699 - avoid struts when placing windows, if possible (nasty
a11y blocker)
302456 - dragging offscreen too restrictive
304857 - wireframe moving off the top of the screen is misleading
308521 - make uni-directional resizing easier with
alt-middle-drag and prevent the occasional super
annoying resize-the-wrong-side(s) behavior
312007 - snap-resize moves windows with a minimum size
constraint
312104 - resizing the top of a window can cause the bottom to
grow
319351 - don't instantly snap on mouse-move-snapping, remove
braindeadedness of having order of releasing shift and
releasing button press matter so much
[1] fixed in my opinion, anyway.
[2] Actually, it's not totally fixed--it's just annoying
instead of almost completely unusable. Matthias had a
suggestion that may fix the remainder of the problems (see
http://tinyurl.com/bwzuu).
[3] This bug was originally about not-quite-so-pathological
cases but was left open for the worse cases. The code from
the branch handles the remainder of the cases mentioned in
this bug.
[4] Actually, although it's far better there's still some minor
issues left: a slight drift that's only noticeable after
lots of resizing, and potential problems with partially
onscreen constraints due to not clearing any
fixed_directions flags (aspect ratio windows get resized in
both directions and thus aren't fixed in one of them)
New feature:
81704 - edge resistance for user move and resize operations;
in particular 3 different kinds of resistance are
implemented:
Pixel-Distance: window movement is resisted when it
aligns with an edge unless the movement is greater than
a threshold number of pixels
Timeout: window movement past an edge is prevented until
a certain amount of time has elapsed during the
operation since the first request to move it past that
edge
Keyboard-Buildup: when moving or resizing with the
keyboard, once a window is aligned with a certain edge
it cannot move past until the correct direction has
been pressed enough times (e.g. 2 or 3 times)
Major changes:
- constraints.c has been rewritten; very few lines of code from
the old version remain. There is a comment near the top of
the function explaining the basics of how the new framework
works. A more detailed explanation can be found in
doc/how-constraints-works.txt
- edge-resistance.[ch] are new files implementing edge-resistance.
- boxes.[ch] are new files containing low-level error-prone
functions used heavily in constraints.c and edge-resistance.c,
among various places throughout the code. testboxes.c
contains a thorough testsuite for the boxes.[ch] functions
compiled into a program, testboxes.
- meta_window_move_resize_internal() *must* be told the gravity
of the associated operation (if it's just a move operation,
the gravity will be ignored, but for resize and move+resize
the correct value is needed)
- the craziness of different values that
meta_window_move_resize_internal() accepts has been documented
in a large comment at the beginning of the function. It may
be possible to clean this up some, but until then things will
remain as they were before--caller beware.
- screen and xinerama usable areas (i.e. places not covered by
e.g. panels) are cached in the workspace now, as are the
screen and xinerama edges. These get updated with the
workarea in src/workspace.c:ensure_work_areas_validated()
2005-11-19 14:58:50 +00:00
|
|
|
width_inc = SMALL_INCREMENT;
|
|
|
|
height_inc = SMALL_INCREMENT;
|
2012-12-13 01:50:43 +00:00
|
|
|
}
|
2002-06-19 04:12:49 +00:00
|
|
|
else
|
|
|
|
{
|
Merge of all the changes on the constraints_experiments branch. This is
2005-11-18 Elijah Newren <newren@gmail.com>
Merge of all the changes on the constraints_experiments branch.
This is just a summary, to get the full ChangeLog of those
changes (approx. 2000 lines):
cvs -q -z3 update -Pd -r constraints_experiments
cvs -q -z3 diff -pu -r CONSTRAINTS_EXPERIMENTS_BRANCHPOINT ChangeLog
Bugs fixed:
unfiled - constraints.c is overly complicated[1]
unfiled - constraints.c is not robust when all constraints
cannot simultaneously be met (constraints need to be
prioritized)
unfiled - keep-titlebar-onscreen constraint is decoration
unaware (since get_outermost_onscreen_positions()
forgets to include decorations)
unfiled - keyboard snap-moving and snap-resizing snap to hidden
edges
109553 - gravity w/ simultaneous move & resize doesn't work
113601 - maximize vertical and horizontal should toggle and be
constrained
122196 - windows show up under vertical panels
122670 - jerky/random resizing of window via keyboard[2]
124582 - keyboard and mouse snap-resizing and snap-moving
erroneously moves the window multidimensionally
136307 - don't allow apps to resize themselves off the screen
(*cough* filechooser *cough*)
142016, 143784 - windows should not span multiple xineramas
unless placed there by the user
143145 - clamp new windows to screensize and force them
onscreen, if they'll fit
144126 - Handle pathological strut lists sanely[3]
149867 - fixed aspect ratio windows are difficult to resize[4]
152898 - make screen edges consistent; allow easy slamming of
windows into the left, right, and bottom edges of the
screen too.
154706 - bouncing weirdness at screen edge with keyboard moving
or resizing
156699 - avoid struts when placing windows, if possible (nasty
a11y blocker)
302456 - dragging offscreen too restrictive
304857 - wireframe moving off the top of the screen is misleading
308521 - make uni-directional resizing easier with
alt-middle-drag and prevent the occasional super
annoying resize-the-wrong-side(s) behavior
312007 - snap-resize moves windows with a minimum size
constraint
312104 - resizing the top of a window can cause the bottom to
grow
319351 - don't instantly snap on mouse-move-snapping, remove
braindeadedness of having order of releasing shift and
releasing button press matter so much
[1] fixed in my opinion, anyway.
[2] Actually, it's not totally fixed--it's just annoying
instead of almost completely unusable. Matthias had a
suggestion that may fix the remainder of the problems (see
http://tinyurl.com/bwzuu).
[3] This bug was originally about not-quite-so-pathological
cases but was left open for the worse cases. The code from
the branch handles the remainder of the cases mentioned in
this bug.
[4] Actually, although it's far better there's still some minor
issues left: a slight drift that's only noticeable after
lots of resizing, and potential problems with partially
onscreen constraints due to not clearing any
fixed_directions flags (aspect ratio windows get resized in
both directions and thus aren't fixed in one of them)
New feature:
81704 - edge resistance for user move and resize operations;
in particular 3 different kinds of resistance are
implemented:
Pixel-Distance: window movement is resisted when it
aligns with an edge unless the movement is greater than
a threshold number of pixels
Timeout: window movement past an edge is prevented until
a certain amount of time has elapsed during the
operation since the first request to move it past that
edge
Keyboard-Buildup: when moving or resizing with the
keyboard, once a window is aligned with a certain edge
it cannot move past until the correct direction has
been pressed enough times (e.g. 2 or 3 times)
Major changes:
- constraints.c has been rewritten; very few lines of code from
the old version remain. There is a comment near the top of
the function explaining the basics of how the new framework
works. A more detailed explanation can be found in
doc/how-constraints-works.txt
- edge-resistance.[ch] are new files implementing edge-resistance.
- boxes.[ch] are new files containing low-level error-prone
functions used heavily in constraints.c and edge-resistance.c,
among various places throughout the code. testboxes.c
contains a thorough testsuite for the boxes.[ch] functions
compiled into a program, testboxes.
- meta_window_move_resize_internal() *must* be told the gravity
of the associated operation (if it's just a move operation,
the gravity will be ignored, but for resize and move+resize
the correct value is needed)
- the craziness of different values that
meta_window_move_resize_internal() accepts has been documented
in a large comment at the beginning of the function. It may
be possible to clean this up some, but until then things will
remain as they were before--caller beware.
- screen and xinerama usable areas (i.e. places not covered by
e.g. panels) are cached in the workspace now, as are the
screen and xinerama edges. These get updated with the
workarea in src/workspace.c:ensure_work_areas_validated()
2005-11-19 14:58:50 +00:00
|
|
|
width_inc = NORMAL_INCREMENT;
|
|
|
|
height_inc = NORMAL_INCREMENT;
|
2002-06-19 04:12:49 +00:00
|
|
|
}
|
Merge of all the changes on the constraints_experiments branch. This is
2005-11-18 Elijah Newren <newren@gmail.com>
Merge of all the changes on the constraints_experiments branch.
This is just a summary, to get the full ChangeLog of those
changes (approx. 2000 lines):
cvs -q -z3 update -Pd -r constraints_experiments
cvs -q -z3 diff -pu -r CONSTRAINTS_EXPERIMENTS_BRANCHPOINT ChangeLog
Bugs fixed:
unfiled - constraints.c is overly complicated[1]
unfiled - constraints.c is not robust when all constraints
cannot simultaneously be met (constraints need to be
prioritized)
unfiled - keep-titlebar-onscreen constraint is decoration
unaware (since get_outermost_onscreen_positions()
forgets to include decorations)
unfiled - keyboard snap-moving and snap-resizing snap to hidden
edges
109553 - gravity w/ simultaneous move & resize doesn't work
113601 - maximize vertical and horizontal should toggle and be
constrained
122196 - windows show up under vertical panels
122670 - jerky/random resizing of window via keyboard[2]
124582 - keyboard and mouse snap-resizing and snap-moving
erroneously moves the window multidimensionally
136307 - don't allow apps to resize themselves off the screen
(*cough* filechooser *cough*)
142016, 143784 - windows should not span multiple xineramas
unless placed there by the user
143145 - clamp new windows to screensize and force them
onscreen, if they'll fit
144126 - Handle pathological strut lists sanely[3]
149867 - fixed aspect ratio windows are difficult to resize[4]
152898 - make screen edges consistent; allow easy slamming of
windows into the left, right, and bottom edges of the
screen too.
154706 - bouncing weirdness at screen edge with keyboard moving
or resizing
156699 - avoid struts when placing windows, if possible (nasty
a11y blocker)
302456 - dragging offscreen too restrictive
304857 - wireframe moving off the top of the screen is misleading
308521 - make uni-directional resizing easier with
alt-middle-drag and prevent the occasional super
annoying resize-the-wrong-side(s) behavior
312007 - snap-resize moves windows with a minimum size
constraint
312104 - resizing the top of a window can cause the bottom to
grow
319351 - don't instantly snap on mouse-move-snapping, remove
braindeadedness of having order of releasing shift and
releasing button press matter so much
[1] fixed in my opinion, anyway.
[2] Actually, it's not totally fixed--it's just annoying
instead of almost completely unusable. Matthias had a
suggestion that may fix the remainder of the problems (see
http://tinyurl.com/bwzuu).
[3] This bug was originally about not-quite-so-pathological
cases but was left open for the worse cases. The code from
the branch handles the remainder of the cases mentioned in
this bug.
[4] Actually, although it's far better there's still some minor
issues left: a slight drift that's only noticeable after
lots of resizing, and potential problems with partially
onscreen constraints due to not clearing any
fixed_directions flags (aspect ratio windows get resized in
both directions and thus aren't fixed in one of them)
New feature:
81704 - edge resistance for user move and resize operations;
in particular 3 different kinds of resistance are
implemented:
Pixel-Distance: window movement is resisted when it
aligns with an edge unless the movement is greater than
a threshold number of pixels
Timeout: window movement past an edge is prevented until
a certain amount of time has elapsed during the
operation since the first request to move it past that
edge
Keyboard-Buildup: when moving or resizing with the
keyboard, once a window is aligned with a certain edge
it cannot move past until the correct direction has
been pressed enough times (e.g. 2 or 3 times)
Major changes:
- constraints.c has been rewritten; very few lines of code from
the old version remain. There is a comment near the top of
the function explaining the basics of how the new framework
works. A more detailed explanation can be found in
doc/how-constraints-works.txt
- edge-resistance.[ch] are new files implementing edge-resistance.
- boxes.[ch] are new files containing low-level error-prone
functions used heavily in constraints.c and edge-resistance.c,
among various places throughout the code. testboxes.c
contains a thorough testsuite for the boxes.[ch] functions
compiled into a program, testboxes.
- meta_window_move_resize_internal() *must* be told the gravity
of the associated operation (if it's just a move operation,
the gravity will be ignored, but for resize and move+resize
the correct value is needed)
- the craziness of different values that
meta_window_move_resize_internal() accepts has been documented
in a large comment at the beginning of the function. It may
be possible to clean this up some, but until then things will
remain as they were before--caller beware.
- screen and xinerama usable areas (i.e. places not covered by
e.g. panels) are cached in the workspace now, as are the
screen and xinerama edges. These get updated with the
workarea in src/workspace.c:ensure_work_areas_validated()
2005-11-19 14:58:50 +00:00
|
|
|
|
|
|
|
/* If this is a resize increment window, make the amount we resize
|
|
|
|
* the window by match that amount (well, unless snap resizing...)
|
2002-06-19 04:12:49 +00:00
|
|
|
*/
|
Merge of all the changes on the constraints_experiments branch. This is
2005-11-18 Elijah Newren <newren@gmail.com>
Merge of all the changes on the constraints_experiments branch.
This is just a summary, to get the full ChangeLog of those
changes (approx. 2000 lines):
cvs -q -z3 update -Pd -r constraints_experiments
cvs -q -z3 diff -pu -r CONSTRAINTS_EXPERIMENTS_BRANCHPOINT ChangeLog
Bugs fixed:
unfiled - constraints.c is overly complicated[1]
unfiled - constraints.c is not robust when all constraints
cannot simultaneously be met (constraints need to be
prioritized)
unfiled - keep-titlebar-onscreen constraint is decoration
unaware (since get_outermost_onscreen_positions()
forgets to include decorations)
unfiled - keyboard snap-moving and snap-resizing snap to hidden
edges
109553 - gravity w/ simultaneous move & resize doesn't work
113601 - maximize vertical and horizontal should toggle and be
constrained
122196 - windows show up under vertical panels
122670 - jerky/random resizing of window via keyboard[2]
124582 - keyboard and mouse snap-resizing and snap-moving
erroneously moves the window multidimensionally
136307 - don't allow apps to resize themselves off the screen
(*cough* filechooser *cough*)
142016, 143784 - windows should not span multiple xineramas
unless placed there by the user
143145 - clamp new windows to screensize and force them
onscreen, if they'll fit
144126 - Handle pathological strut lists sanely[3]
149867 - fixed aspect ratio windows are difficult to resize[4]
152898 - make screen edges consistent; allow easy slamming of
windows into the left, right, and bottom edges of the
screen too.
154706 - bouncing weirdness at screen edge with keyboard moving
or resizing
156699 - avoid struts when placing windows, if possible (nasty
a11y blocker)
302456 - dragging offscreen too restrictive
304857 - wireframe moving off the top of the screen is misleading
308521 - make uni-directional resizing easier with
alt-middle-drag and prevent the occasional super
annoying resize-the-wrong-side(s) behavior
312007 - snap-resize moves windows with a minimum size
constraint
312104 - resizing the top of a window can cause the bottom to
grow
319351 - don't instantly snap on mouse-move-snapping, remove
braindeadedness of having order of releasing shift and
releasing button press matter so much
[1] fixed in my opinion, anyway.
[2] Actually, it's not totally fixed--it's just annoying
instead of almost completely unusable. Matthias had a
suggestion that may fix the remainder of the problems (see
http://tinyurl.com/bwzuu).
[3] This bug was originally about not-quite-so-pathological
cases but was left open for the worse cases. The code from
the branch handles the remainder of the cases mentioned in
this bug.
[4] Actually, although it's far better there's still some minor
issues left: a slight drift that's only noticeable after
lots of resizing, and potential problems with partially
onscreen constraints due to not clearing any
fixed_directions flags (aspect ratio windows get resized in
both directions and thus aren't fixed in one of them)
New feature:
81704 - edge resistance for user move and resize operations;
in particular 3 different kinds of resistance are
implemented:
Pixel-Distance: window movement is resisted when it
aligns with an edge unless the movement is greater than
a threshold number of pixels
Timeout: window movement past an edge is prevented until
a certain amount of time has elapsed during the
operation since the first request to move it past that
edge
Keyboard-Buildup: when moving or resizing with the
keyboard, once a window is aligned with a certain edge
it cannot move past until the correct direction has
been pressed enough times (e.g. 2 or 3 times)
Major changes:
- constraints.c has been rewritten; very few lines of code from
the old version remain. There is a comment near the top of
the function explaining the basics of how the new framework
works. A more detailed explanation can be found in
doc/how-constraints-works.txt
- edge-resistance.[ch] are new files implementing edge-resistance.
- boxes.[ch] are new files containing low-level error-prone
functions used heavily in constraints.c and edge-resistance.c,
among various places throughout the code. testboxes.c
contains a thorough testsuite for the boxes.[ch] functions
compiled into a program, testboxes.
- meta_window_move_resize_internal() *must* be told the gravity
of the associated operation (if it's just a move operation,
the gravity will be ignored, but for resize and move+resize
the correct value is needed)
- the craziness of different values that
meta_window_move_resize_internal() accepts has been documented
in a large comment at the beginning of the function. It may
be possible to clean this up some, but until then things will
remain as they were before--caller beware.
- screen and xinerama usable areas (i.e. places not covered by
e.g. panels) are cached in the workspace now, as are the
screen and xinerama edges. These get updated with the
workarea in src/workspace.c:ensure_work_areas_validated()
2005-11-19 14:58:50 +00:00
|
|
|
if (window->size_hints.width_inc > 1)
|
|
|
|
width_inc = window->size_hints.width_inc;
|
|
|
|
if (window->size_hints.height_inc > 1)
|
|
|
|
height_inc = window->size_hints.height_inc;
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2013-10-03 22:03:53 +00:00
|
|
|
switch (event->keyval)
|
2002-06-19 04:12:49 +00:00
|
|
|
{
|
2013-10-03 22:03:53 +00:00
|
|
|
case CLUTTER_KEY_Up:
|
|
|
|
case CLUTTER_KEY_KP_Up:
|
2002-06-19 04:12:49 +00:00
|
|
|
switch (gravity)
|
|
|
|
{
|
|
|
|
case NorthGravity:
|
|
|
|
case NorthWestGravity:
|
|
|
|
case NorthEastGravity:
|
|
|
|
/* Move bottom edge up */
|
Merge of all the changes on the constraints_experiments branch. This is
2005-11-18 Elijah Newren <newren@gmail.com>
Merge of all the changes on the constraints_experiments branch.
This is just a summary, to get the full ChangeLog of those
changes (approx. 2000 lines):
cvs -q -z3 update -Pd -r constraints_experiments
cvs -q -z3 diff -pu -r CONSTRAINTS_EXPERIMENTS_BRANCHPOINT ChangeLog
Bugs fixed:
unfiled - constraints.c is overly complicated[1]
unfiled - constraints.c is not robust when all constraints
cannot simultaneously be met (constraints need to be
prioritized)
unfiled - keep-titlebar-onscreen constraint is decoration
unaware (since get_outermost_onscreen_positions()
forgets to include decorations)
unfiled - keyboard snap-moving and snap-resizing snap to hidden
edges
109553 - gravity w/ simultaneous move & resize doesn't work
113601 - maximize vertical and horizontal should toggle and be
constrained
122196 - windows show up under vertical panels
122670 - jerky/random resizing of window via keyboard[2]
124582 - keyboard and mouse snap-resizing and snap-moving
erroneously moves the window multidimensionally
136307 - don't allow apps to resize themselves off the screen
(*cough* filechooser *cough*)
142016, 143784 - windows should not span multiple xineramas
unless placed there by the user
143145 - clamp new windows to screensize and force them
onscreen, if they'll fit
144126 - Handle pathological strut lists sanely[3]
149867 - fixed aspect ratio windows are difficult to resize[4]
152898 - make screen edges consistent; allow easy slamming of
windows into the left, right, and bottom edges of the
screen too.
154706 - bouncing weirdness at screen edge with keyboard moving
or resizing
156699 - avoid struts when placing windows, if possible (nasty
a11y blocker)
302456 - dragging offscreen too restrictive
304857 - wireframe moving off the top of the screen is misleading
308521 - make uni-directional resizing easier with
alt-middle-drag and prevent the occasional super
annoying resize-the-wrong-side(s) behavior
312007 - snap-resize moves windows with a minimum size
constraint
312104 - resizing the top of a window can cause the bottom to
grow
319351 - don't instantly snap on mouse-move-snapping, remove
braindeadedness of having order of releasing shift and
releasing button press matter so much
[1] fixed in my opinion, anyway.
[2] Actually, it's not totally fixed--it's just annoying
instead of almost completely unusable. Matthias had a
suggestion that may fix the remainder of the problems (see
http://tinyurl.com/bwzuu).
[3] This bug was originally about not-quite-so-pathological
cases but was left open for the worse cases. The code from
the branch handles the remainder of the cases mentioned in
this bug.
[4] Actually, although it's far better there's still some minor
issues left: a slight drift that's only noticeable after
lots of resizing, and potential problems with partially
onscreen constraints due to not clearing any
fixed_directions flags (aspect ratio windows get resized in
both directions and thus aren't fixed in one of them)
New feature:
81704 - edge resistance for user move and resize operations;
in particular 3 different kinds of resistance are
implemented:
Pixel-Distance: window movement is resisted when it
aligns with an edge unless the movement is greater than
a threshold number of pixels
Timeout: window movement past an edge is prevented until
a certain amount of time has elapsed during the
operation since the first request to move it past that
edge
Keyboard-Buildup: when moving or resizing with the
keyboard, once a window is aligned with a certain edge
it cannot move past until the correct direction has
been pressed enough times (e.g. 2 or 3 times)
Major changes:
- constraints.c has been rewritten; very few lines of code from
the old version remain. There is a comment near the top of
the function explaining the basics of how the new framework
works. A more detailed explanation can be found in
doc/how-constraints-works.txt
- edge-resistance.[ch] are new files implementing edge-resistance.
- boxes.[ch] are new files containing low-level error-prone
functions used heavily in constraints.c and edge-resistance.c,
among various places throughout the code. testboxes.c
contains a thorough testsuite for the boxes.[ch] functions
compiled into a program, testboxes.
- meta_window_move_resize_internal() *must* be told the gravity
of the associated operation (if it's just a move operation,
the gravity will be ignored, but for resize and move+resize
the correct value is needed)
- the craziness of different values that
meta_window_move_resize_internal() accepts has been documented
in a large comment at the beginning of the function. It may
be possible to clean this up some, but until then things will
remain as they were before--caller beware.
- screen and xinerama usable areas (i.e. places not covered by
e.g. panels) are cached in the workspace now, as are the
screen and xinerama edges. These get updated with the
workarea in src/workspace.c:ensure_work_areas_validated()
2005-11-19 14:58:50 +00:00
|
|
|
height -= height_inc;
|
2002-06-19 04:12:49 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case SouthGravity:
|
|
|
|
case SouthWestGravity:
|
|
|
|
case SouthEastGravity:
|
|
|
|
/* Move top edge up */
|
Merge of all the changes on the constraints_experiments branch. This is
2005-11-18 Elijah Newren <newren@gmail.com>
Merge of all the changes on the constraints_experiments branch.
This is just a summary, to get the full ChangeLog of those
changes (approx. 2000 lines):
cvs -q -z3 update -Pd -r constraints_experiments
cvs -q -z3 diff -pu -r CONSTRAINTS_EXPERIMENTS_BRANCHPOINT ChangeLog
Bugs fixed:
unfiled - constraints.c is overly complicated[1]
unfiled - constraints.c is not robust when all constraints
cannot simultaneously be met (constraints need to be
prioritized)
unfiled - keep-titlebar-onscreen constraint is decoration
unaware (since get_outermost_onscreen_positions()
forgets to include decorations)
unfiled - keyboard snap-moving and snap-resizing snap to hidden
edges
109553 - gravity w/ simultaneous move & resize doesn't work
113601 - maximize vertical and horizontal should toggle and be
constrained
122196 - windows show up under vertical panels
122670 - jerky/random resizing of window via keyboard[2]
124582 - keyboard and mouse snap-resizing and snap-moving
erroneously moves the window multidimensionally
136307 - don't allow apps to resize themselves off the screen
(*cough* filechooser *cough*)
142016, 143784 - windows should not span multiple xineramas
unless placed there by the user
143145 - clamp new windows to screensize and force them
onscreen, if they'll fit
144126 - Handle pathological strut lists sanely[3]
149867 - fixed aspect ratio windows are difficult to resize[4]
152898 - make screen edges consistent; allow easy slamming of
windows into the left, right, and bottom edges of the
screen too.
154706 - bouncing weirdness at screen edge with keyboard moving
or resizing
156699 - avoid struts when placing windows, if possible (nasty
a11y blocker)
302456 - dragging offscreen too restrictive
304857 - wireframe moving off the top of the screen is misleading
308521 - make uni-directional resizing easier with
alt-middle-drag and prevent the occasional super
annoying resize-the-wrong-side(s) behavior
312007 - snap-resize moves windows with a minimum size
constraint
312104 - resizing the top of a window can cause the bottom to
grow
319351 - don't instantly snap on mouse-move-snapping, remove
braindeadedness of having order of releasing shift and
releasing button press matter so much
[1] fixed in my opinion, anyway.
[2] Actually, it's not totally fixed--it's just annoying
instead of almost completely unusable. Matthias had a
suggestion that may fix the remainder of the problems (see
http://tinyurl.com/bwzuu).
[3] This bug was originally about not-quite-so-pathological
cases but was left open for the worse cases. The code from
the branch handles the remainder of the cases mentioned in
this bug.
[4] Actually, although it's far better there's still some minor
issues left: a slight drift that's only noticeable after
lots of resizing, and potential problems with partially
onscreen constraints due to not clearing any
fixed_directions flags (aspect ratio windows get resized in
both directions and thus aren't fixed in one of them)
New feature:
81704 - edge resistance for user move and resize operations;
in particular 3 different kinds of resistance are
implemented:
Pixel-Distance: window movement is resisted when it
aligns with an edge unless the movement is greater than
a threshold number of pixels
Timeout: window movement past an edge is prevented until
a certain amount of time has elapsed during the
operation since the first request to move it past that
edge
Keyboard-Buildup: when moving or resizing with the
keyboard, once a window is aligned with a certain edge
it cannot move past until the correct direction has
been pressed enough times (e.g. 2 or 3 times)
Major changes:
- constraints.c has been rewritten; very few lines of code from
the old version remain. There is a comment near the top of
the function explaining the basics of how the new framework
works. A more detailed explanation can be found in
doc/how-constraints-works.txt
- edge-resistance.[ch] are new files implementing edge-resistance.
- boxes.[ch] are new files containing low-level error-prone
functions used heavily in constraints.c and edge-resistance.c,
among various places throughout the code. testboxes.c
contains a thorough testsuite for the boxes.[ch] functions
compiled into a program, testboxes.
- meta_window_move_resize_internal() *must* be told the gravity
of the associated operation (if it's just a move operation,
the gravity will be ignored, but for resize and move+resize
the correct value is needed)
- the craziness of different values that
meta_window_move_resize_internal() accepts has been documented
in a large comment at the beginning of the function. It may
be possible to clean this up some, but until then things will
remain as they were before--caller beware.
- screen and xinerama usable areas (i.e. places not covered by
e.g. panels) are cached in the workspace now, as are the
screen and xinerama edges. These get updated with the
workarea in src/workspace.c:ensure_work_areas_validated()
2005-11-19 14:58:50 +00:00
|
|
|
height += height_inc;
|
2002-06-19 04:12:49 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case EastGravity:
|
|
|
|
case WestGravity:
|
|
|
|
case CenterGravity:
|
|
|
|
g_assert_not_reached ();
|
|
|
|
break;
|
|
|
|
}
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2002-06-19 04:12:49 +00:00
|
|
|
handled = TRUE;
|
|
|
|
break;
|
|
|
|
|
2013-10-03 22:03:53 +00:00
|
|
|
case CLUTTER_KEY_Down:
|
|
|
|
case CLUTTER_KEY_KP_Down:
|
2002-06-19 04:12:49 +00:00
|
|
|
switch (gravity)
|
|
|
|
{
|
|
|
|
case NorthGravity:
|
|
|
|
case NorthWestGravity:
|
|
|
|
case NorthEastGravity:
|
|
|
|
/* Move bottom edge down */
|
|
|
|
height += height_inc;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case SouthGravity:
|
|
|
|
case SouthWestGravity:
|
|
|
|
case SouthEastGravity:
|
|
|
|
/* Move top edge down */
|
Merge of all the changes on the constraints_experiments branch. This is
2005-11-18 Elijah Newren <newren@gmail.com>
Merge of all the changes on the constraints_experiments branch.
This is just a summary, to get the full ChangeLog of those
changes (approx. 2000 lines):
cvs -q -z3 update -Pd -r constraints_experiments
cvs -q -z3 diff -pu -r CONSTRAINTS_EXPERIMENTS_BRANCHPOINT ChangeLog
Bugs fixed:
unfiled - constraints.c is overly complicated[1]
unfiled - constraints.c is not robust when all constraints
cannot simultaneously be met (constraints need to be
prioritized)
unfiled - keep-titlebar-onscreen constraint is decoration
unaware (since get_outermost_onscreen_positions()
forgets to include decorations)
unfiled - keyboard snap-moving and snap-resizing snap to hidden
edges
109553 - gravity w/ simultaneous move & resize doesn't work
113601 - maximize vertical and horizontal should toggle and be
constrained
122196 - windows show up under vertical panels
122670 - jerky/random resizing of window via keyboard[2]
124582 - keyboard and mouse snap-resizing and snap-moving
erroneously moves the window multidimensionally
136307 - don't allow apps to resize themselves off the screen
(*cough* filechooser *cough*)
142016, 143784 - windows should not span multiple xineramas
unless placed there by the user
143145 - clamp new windows to screensize and force them
onscreen, if they'll fit
144126 - Handle pathological strut lists sanely[3]
149867 - fixed aspect ratio windows are difficult to resize[4]
152898 - make screen edges consistent; allow easy slamming of
windows into the left, right, and bottom edges of the
screen too.
154706 - bouncing weirdness at screen edge with keyboard moving
or resizing
156699 - avoid struts when placing windows, if possible (nasty
a11y blocker)
302456 - dragging offscreen too restrictive
304857 - wireframe moving off the top of the screen is misleading
308521 - make uni-directional resizing easier with
alt-middle-drag and prevent the occasional super
annoying resize-the-wrong-side(s) behavior
312007 - snap-resize moves windows with a minimum size
constraint
312104 - resizing the top of a window can cause the bottom to
grow
319351 - don't instantly snap on mouse-move-snapping, remove
braindeadedness of having order of releasing shift and
releasing button press matter so much
[1] fixed in my opinion, anyway.
[2] Actually, it's not totally fixed--it's just annoying
instead of almost completely unusable. Matthias had a
suggestion that may fix the remainder of the problems (see
http://tinyurl.com/bwzuu).
[3] This bug was originally about not-quite-so-pathological
cases but was left open for the worse cases. The code from
the branch handles the remainder of the cases mentioned in
this bug.
[4] Actually, although it's far better there's still some minor
issues left: a slight drift that's only noticeable after
lots of resizing, and potential problems with partially
onscreen constraints due to not clearing any
fixed_directions flags (aspect ratio windows get resized in
both directions and thus aren't fixed in one of them)
New feature:
81704 - edge resistance for user move and resize operations;
in particular 3 different kinds of resistance are
implemented:
Pixel-Distance: window movement is resisted when it
aligns with an edge unless the movement is greater than
a threshold number of pixels
Timeout: window movement past an edge is prevented until
a certain amount of time has elapsed during the
operation since the first request to move it past that
edge
Keyboard-Buildup: when moving or resizing with the
keyboard, once a window is aligned with a certain edge
it cannot move past until the correct direction has
been pressed enough times (e.g. 2 or 3 times)
Major changes:
- constraints.c has been rewritten; very few lines of code from
the old version remain. There is a comment near the top of
the function explaining the basics of how the new framework
works. A more detailed explanation can be found in
doc/how-constraints-works.txt
- edge-resistance.[ch] are new files implementing edge-resistance.
- boxes.[ch] are new files containing low-level error-prone
functions used heavily in constraints.c and edge-resistance.c,
among various places throughout the code. testboxes.c
contains a thorough testsuite for the boxes.[ch] functions
compiled into a program, testboxes.
- meta_window_move_resize_internal() *must* be told the gravity
of the associated operation (if it's just a move operation,
the gravity will be ignored, but for resize and move+resize
the correct value is needed)
- the craziness of different values that
meta_window_move_resize_internal() accepts has been documented
in a large comment at the beginning of the function. It may
be possible to clean this up some, but until then things will
remain as they were before--caller beware.
- screen and xinerama usable areas (i.e. places not covered by
e.g. panels) are cached in the workspace now, as are the
screen and xinerama edges. These get updated with the
workarea in src/workspace.c:ensure_work_areas_validated()
2005-11-19 14:58:50 +00:00
|
|
|
height -= height_inc;
|
2002-06-19 04:12:49 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case EastGravity:
|
|
|
|
case WestGravity:
|
|
|
|
case CenterGravity:
|
|
|
|
g_assert_not_reached ();
|
|
|
|
break;
|
|
|
|
}
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2002-06-19 04:12:49 +00:00
|
|
|
handled = TRUE;
|
|
|
|
break;
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2013-10-03 22:03:53 +00:00
|
|
|
case CLUTTER_KEY_Left:
|
|
|
|
case CLUTTER_KEY_KP_Left:
|
2002-07-03 02:32:40 +00:00
|
|
|
switch (gravity)
|
|
|
|
{
|
|
|
|
case EastGravity:
|
|
|
|
case SouthEastGravity:
|
|
|
|
case NorthEastGravity:
|
2005-08-03 02:22:00 +00:00
|
|
|
/* Move left edge left */
|
Merge of all the changes on the constraints_experiments branch. This is
2005-11-18 Elijah Newren <newren@gmail.com>
Merge of all the changes on the constraints_experiments branch.
This is just a summary, to get the full ChangeLog of those
changes (approx. 2000 lines):
cvs -q -z3 update -Pd -r constraints_experiments
cvs -q -z3 diff -pu -r CONSTRAINTS_EXPERIMENTS_BRANCHPOINT ChangeLog
Bugs fixed:
unfiled - constraints.c is overly complicated[1]
unfiled - constraints.c is not robust when all constraints
cannot simultaneously be met (constraints need to be
prioritized)
unfiled - keep-titlebar-onscreen constraint is decoration
unaware (since get_outermost_onscreen_positions()
forgets to include decorations)
unfiled - keyboard snap-moving and snap-resizing snap to hidden
edges
109553 - gravity w/ simultaneous move & resize doesn't work
113601 - maximize vertical and horizontal should toggle and be
constrained
122196 - windows show up under vertical panels
122670 - jerky/random resizing of window via keyboard[2]
124582 - keyboard and mouse snap-resizing and snap-moving
erroneously moves the window multidimensionally
136307 - don't allow apps to resize themselves off the screen
(*cough* filechooser *cough*)
142016, 143784 - windows should not span multiple xineramas
unless placed there by the user
143145 - clamp new windows to screensize and force them
onscreen, if they'll fit
144126 - Handle pathological strut lists sanely[3]
149867 - fixed aspect ratio windows are difficult to resize[4]
152898 - make screen edges consistent; allow easy slamming of
windows into the left, right, and bottom edges of the
screen too.
154706 - bouncing weirdness at screen edge with keyboard moving
or resizing
156699 - avoid struts when placing windows, if possible (nasty
a11y blocker)
302456 - dragging offscreen too restrictive
304857 - wireframe moving off the top of the screen is misleading
308521 - make uni-directional resizing easier with
alt-middle-drag and prevent the occasional super
annoying resize-the-wrong-side(s) behavior
312007 - snap-resize moves windows with a minimum size
constraint
312104 - resizing the top of a window can cause the bottom to
grow
319351 - don't instantly snap on mouse-move-snapping, remove
braindeadedness of having order of releasing shift and
releasing button press matter so much
[1] fixed in my opinion, anyway.
[2] Actually, it's not totally fixed--it's just annoying
instead of almost completely unusable. Matthias had a
suggestion that may fix the remainder of the problems (see
http://tinyurl.com/bwzuu).
[3] This bug was originally about not-quite-so-pathological
cases but was left open for the worse cases. The code from
the branch handles the remainder of the cases mentioned in
this bug.
[4] Actually, although it's far better there's still some minor
issues left: a slight drift that's only noticeable after
lots of resizing, and potential problems with partially
onscreen constraints due to not clearing any
fixed_directions flags (aspect ratio windows get resized in
both directions and thus aren't fixed in one of them)
New feature:
81704 - edge resistance for user move and resize operations;
in particular 3 different kinds of resistance are
implemented:
Pixel-Distance: window movement is resisted when it
aligns with an edge unless the movement is greater than
a threshold number of pixels
Timeout: window movement past an edge is prevented until
a certain amount of time has elapsed during the
operation since the first request to move it past that
edge
Keyboard-Buildup: when moving or resizing with the
keyboard, once a window is aligned with a certain edge
it cannot move past until the correct direction has
been pressed enough times (e.g. 2 or 3 times)
Major changes:
- constraints.c has been rewritten; very few lines of code from
the old version remain. There is a comment near the top of
the function explaining the basics of how the new framework
works. A more detailed explanation can be found in
doc/how-constraints-works.txt
- edge-resistance.[ch] are new files implementing edge-resistance.
- boxes.[ch] are new files containing low-level error-prone
functions used heavily in constraints.c and edge-resistance.c,
among various places throughout the code. testboxes.c
contains a thorough testsuite for the boxes.[ch] functions
compiled into a program, testboxes.
- meta_window_move_resize_internal() *must* be told the gravity
of the associated operation (if it's just a move operation,
the gravity will be ignored, but for resize and move+resize
the correct value is needed)
- the craziness of different values that
meta_window_move_resize_internal() accepts has been documented
in a large comment at the beginning of the function. It may
be possible to clean this up some, but until then things will
remain as they were before--caller beware.
- screen and xinerama usable areas (i.e. places not covered by
e.g. panels) are cached in the workspace now, as are the
screen and xinerama edges. These get updated with the
workarea in src/workspace.c:ensure_work_areas_validated()
2005-11-19 14:58:50 +00:00
|
|
|
width += width_inc;
|
2002-07-03 02:32:40 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case WestGravity:
|
|
|
|
case SouthWestGravity:
|
|
|
|
case NorthWestGravity:
|
|
|
|
/* Move right edge left */
|
Merge of all the changes on the constraints_experiments branch. This is
2005-11-18 Elijah Newren <newren@gmail.com>
Merge of all the changes on the constraints_experiments branch.
This is just a summary, to get the full ChangeLog of those
changes (approx. 2000 lines):
cvs -q -z3 update -Pd -r constraints_experiments
cvs -q -z3 diff -pu -r CONSTRAINTS_EXPERIMENTS_BRANCHPOINT ChangeLog
Bugs fixed:
unfiled - constraints.c is overly complicated[1]
unfiled - constraints.c is not robust when all constraints
cannot simultaneously be met (constraints need to be
prioritized)
unfiled - keep-titlebar-onscreen constraint is decoration
unaware (since get_outermost_onscreen_positions()
forgets to include decorations)
unfiled - keyboard snap-moving and snap-resizing snap to hidden
edges
109553 - gravity w/ simultaneous move & resize doesn't work
113601 - maximize vertical and horizontal should toggle and be
constrained
122196 - windows show up under vertical panels
122670 - jerky/random resizing of window via keyboard[2]
124582 - keyboard and mouse snap-resizing and snap-moving
erroneously moves the window multidimensionally
136307 - don't allow apps to resize themselves off the screen
(*cough* filechooser *cough*)
142016, 143784 - windows should not span multiple xineramas
unless placed there by the user
143145 - clamp new windows to screensize and force them
onscreen, if they'll fit
144126 - Handle pathological strut lists sanely[3]
149867 - fixed aspect ratio windows are difficult to resize[4]
152898 - make screen edges consistent; allow easy slamming of
windows into the left, right, and bottom edges of the
screen too.
154706 - bouncing weirdness at screen edge with keyboard moving
or resizing
156699 - avoid struts when placing windows, if possible (nasty
a11y blocker)
302456 - dragging offscreen too restrictive
304857 - wireframe moving off the top of the screen is misleading
308521 - make uni-directional resizing easier with
alt-middle-drag and prevent the occasional super
annoying resize-the-wrong-side(s) behavior
312007 - snap-resize moves windows with a minimum size
constraint
312104 - resizing the top of a window can cause the bottom to
grow
319351 - don't instantly snap on mouse-move-snapping, remove
braindeadedness of having order of releasing shift and
releasing button press matter so much
[1] fixed in my opinion, anyway.
[2] Actually, it's not totally fixed--it's just annoying
instead of almost completely unusable. Matthias had a
suggestion that may fix the remainder of the problems (see
http://tinyurl.com/bwzuu).
[3] This bug was originally about not-quite-so-pathological
cases but was left open for the worse cases. The code from
the branch handles the remainder of the cases mentioned in
this bug.
[4] Actually, although it's far better there's still some minor
issues left: a slight drift that's only noticeable after
lots of resizing, and potential problems with partially
onscreen constraints due to not clearing any
fixed_directions flags (aspect ratio windows get resized in
both directions and thus aren't fixed in one of them)
New feature:
81704 - edge resistance for user move and resize operations;
in particular 3 different kinds of resistance are
implemented:
Pixel-Distance: window movement is resisted when it
aligns with an edge unless the movement is greater than
a threshold number of pixels
Timeout: window movement past an edge is prevented until
a certain amount of time has elapsed during the
operation since the first request to move it past that
edge
Keyboard-Buildup: when moving or resizing with the
keyboard, once a window is aligned with a certain edge
it cannot move past until the correct direction has
been pressed enough times (e.g. 2 or 3 times)
Major changes:
- constraints.c has been rewritten; very few lines of code from
the old version remain. There is a comment near the top of
the function explaining the basics of how the new framework
works. A more detailed explanation can be found in
doc/how-constraints-works.txt
- edge-resistance.[ch] are new files implementing edge-resistance.
- boxes.[ch] are new files containing low-level error-prone
functions used heavily in constraints.c and edge-resistance.c,
among various places throughout the code. testboxes.c
contains a thorough testsuite for the boxes.[ch] functions
compiled into a program, testboxes.
- meta_window_move_resize_internal() *must* be told the gravity
of the associated operation (if it's just a move operation,
the gravity will be ignored, but for resize and move+resize
the correct value is needed)
- the craziness of different values that
meta_window_move_resize_internal() accepts has been documented
in a large comment at the beginning of the function. It may
be possible to clean this up some, but until then things will
remain as they were before--caller beware.
- screen and xinerama usable areas (i.e. places not covered by
e.g. panels) are cached in the workspace now, as are the
screen and xinerama edges. These get updated with the
workarea in src/workspace.c:ensure_work_areas_validated()
2005-11-19 14:58:50 +00:00
|
|
|
width -= width_inc;
|
2002-07-03 02:32:40 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case NorthGravity:
|
|
|
|
case SouthGravity:
|
|
|
|
case CenterGravity:
|
|
|
|
g_assert_not_reached ();
|
|
|
|
break;
|
|
|
|
}
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2002-07-03 02:32:40 +00:00
|
|
|
handled = TRUE;
|
2002-06-19 04:12:49 +00:00
|
|
|
break;
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2013-10-03 22:03:53 +00:00
|
|
|
case CLUTTER_KEY_Right:
|
|
|
|
case CLUTTER_KEY_KP_Right:
|
2002-07-03 02:32:40 +00:00
|
|
|
switch (gravity)
|
|
|
|
{
|
|
|
|
case EastGravity:
|
|
|
|
case SouthEastGravity:
|
|
|
|
case NorthEastGravity:
|
|
|
|
/* Move left edge right */
|
Merge of all the changes on the constraints_experiments branch. This is
2005-11-18 Elijah Newren <newren@gmail.com>
Merge of all the changes on the constraints_experiments branch.
This is just a summary, to get the full ChangeLog of those
changes (approx. 2000 lines):
cvs -q -z3 update -Pd -r constraints_experiments
cvs -q -z3 diff -pu -r CONSTRAINTS_EXPERIMENTS_BRANCHPOINT ChangeLog
Bugs fixed:
unfiled - constraints.c is overly complicated[1]
unfiled - constraints.c is not robust when all constraints
cannot simultaneously be met (constraints need to be
prioritized)
unfiled - keep-titlebar-onscreen constraint is decoration
unaware (since get_outermost_onscreen_positions()
forgets to include decorations)
unfiled - keyboard snap-moving and snap-resizing snap to hidden
edges
109553 - gravity w/ simultaneous move & resize doesn't work
113601 - maximize vertical and horizontal should toggle and be
constrained
122196 - windows show up under vertical panels
122670 - jerky/random resizing of window via keyboard[2]
124582 - keyboard and mouse snap-resizing and snap-moving
erroneously moves the window multidimensionally
136307 - don't allow apps to resize themselves off the screen
(*cough* filechooser *cough*)
142016, 143784 - windows should not span multiple xineramas
unless placed there by the user
143145 - clamp new windows to screensize and force them
onscreen, if they'll fit
144126 - Handle pathological strut lists sanely[3]
149867 - fixed aspect ratio windows are difficult to resize[4]
152898 - make screen edges consistent; allow easy slamming of
windows into the left, right, and bottom edges of the
screen too.
154706 - bouncing weirdness at screen edge with keyboard moving
or resizing
156699 - avoid struts when placing windows, if possible (nasty
a11y blocker)
302456 - dragging offscreen too restrictive
304857 - wireframe moving off the top of the screen is misleading
308521 - make uni-directional resizing easier with
alt-middle-drag and prevent the occasional super
annoying resize-the-wrong-side(s) behavior
312007 - snap-resize moves windows with a minimum size
constraint
312104 - resizing the top of a window can cause the bottom to
grow
319351 - don't instantly snap on mouse-move-snapping, remove
braindeadedness of having order of releasing shift and
releasing button press matter so much
[1] fixed in my opinion, anyway.
[2] Actually, it's not totally fixed--it's just annoying
instead of almost completely unusable. Matthias had a
suggestion that may fix the remainder of the problems (see
http://tinyurl.com/bwzuu).
[3] This bug was originally about not-quite-so-pathological
cases but was left open for the worse cases. The code from
the branch handles the remainder of the cases mentioned in
this bug.
[4] Actually, although it's far better there's still some minor
issues left: a slight drift that's only noticeable after
lots of resizing, and potential problems with partially
onscreen constraints due to not clearing any
fixed_directions flags (aspect ratio windows get resized in
both directions and thus aren't fixed in one of them)
New feature:
81704 - edge resistance for user move and resize operations;
in particular 3 different kinds of resistance are
implemented:
Pixel-Distance: window movement is resisted when it
aligns with an edge unless the movement is greater than
a threshold number of pixels
Timeout: window movement past an edge is prevented until
a certain amount of time has elapsed during the
operation since the first request to move it past that
edge
Keyboard-Buildup: when moving or resizing with the
keyboard, once a window is aligned with a certain edge
it cannot move past until the correct direction has
been pressed enough times (e.g. 2 or 3 times)
Major changes:
- constraints.c has been rewritten; very few lines of code from
the old version remain. There is a comment near the top of
the function explaining the basics of how the new framework
works. A more detailed explanation can be found in
doc/how-constraints-works.txt
- edge-resistance.[ch] are new files implementing edge-resistance.
- boxes.[ch] are new files containing low-level error-prone
functions used heavily in constraints.c and edge-resistance.c,
among various places throughout the code. testboxes.c
contains a thorough testsuite for the boxes.[ch] functions
compiled into a program, testboxes.
- meta_window_move_resize_internal() *must* be told the gravity
of the associated operation (if it's just a move operation,
the gravity will be ignored, but for resize and move+resize
the correct value is needed)
- the craziness of different values that
meta_window_move_resize_internal() accepts has been documented
in a large comment at the beginning of the function. It may
be possible to clean this up some, but until then things will
remain as they were before--caller beware.
- screen and xinerama usable areas (i.e. places not covered by
e.g. panels) are cached in the workspace now, as are the
screen and xinerama edges. These get updated with the
workarea in src/workspace.c:ensure_work_areas_validated()
2005-11-19 14:58:50 +00:00
|
|
|
width -= width_inc;
|
2002-07-03 02:32:40 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case WestGravity:
|
|
|
|
case SouthWestGravity:
|
|
|
|
case NorthWestGravity:
|
|
|
|
/* Move right edge right */
|
|
|
|
width += width_inc;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case NorthGravity:
|
|
|
|
case SouthGravity:
|
|
|
|
case CenterGravity:
|
|
|
|
g_assert_not_reached ();
|
|
|
|
break;
|
|
|
|
}
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2002-07-03 02:32:40 +00:00
|
|
|
handled = TRUE;
|
2002-06-19 04:12:49 +00:00
|
|
|
break;
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2002-06-19 04:12:49 +00:00
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* fixup hack (just paranoia, not sure it's required) */
|
|
|
|
if (height < 1)
|
|
|
|
height = 1;
|
|
|
|
if (width < 1)
|
|
|
|
width = 1;
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2002-06-19 04:12:49 +00:00
|
|
|
if (handled)
|
Patch to provide extra cues to the user when using window menu move and
2002-08-08 Craig Black <blackc@speakeasy.net>
Patch to provide extra cues to the user when using
window menu move and resize, #85724.
* src/common.h: add new cursors
* src/display.c: (grab_op_is_mouse)
(meta_display_create_x_cursor), (xcursor_for_op),
(meta_display_set_grab_op_cursor),
(meta_display_begin_grab_op):
The keyboard move and resize grab ops now also use the mouse.
Allow the grab cursor to be changed during the grab op.
Hold onto the initial grab position in case of reset.
* src/display.h: save the initial grab position
* src/keybindings.c: (process_keyboard_move_grab),
(process_keyboard_resize_grab), (handle_begin_move),
(handle_begin_resize):
The keyboard move and resize grab ops now also use the mouse.
* src/window.c: (meta_window_client_message), (menu_callback),
(update_move), (update_resize),
(meta_window_handle_mouse_grab_op_event), (warp_pointer),
(meta_window_warp_pointer), (meta_window_begin_grab_op),
(meta_window_update_resize_grab_op):
When moving or resizing a window use the last grab position
in computing change increment.
Provide support for warping the mouse pointer.
* src/window.h: new warp pointer and grab op helper functions
2002-08-09 04:27:23 +00:00
|
|
|
{
|
Merge of all the changes on the constraints_experiments branch. This is
2005-11-18 Elijah Newren <newren@gmail.com>
Merge of all the changes on the constraints_experiments branch.
This is just a summary, to get the full ChangeLog of those
changes (approx. 2000 lines):
cvs -q -z3 update -Pd -r constraints_experiments
cvs -q -z3 diff -pu -r CONSTRAINTS_EXPERIMENTS_BRANCHPOINT ChangeLog
Bugs fixed:
unfiled - constraints.c is overly complicated[1]
unfiled - constraints.c is not robust when all constraints
cannot simultaneously be met (constraints need to be
prioritized)
unfiled - keep-titlebar-onscreen constraint is decoration
unaware (since get_outermost_onscreen_positions()
forgets to include decorations)
unfiled - keyboard snap-moving and snap-resizing snap to hidden
edges
109553 - gravity w/ simultaneous move & resize doesn't work
113601 - maximize vertical and horizontal should toggle and be
constrained
122196 - windows show up under vertical panels
122670 - jerky/random resizing of window via keyboard[2]
124582 - keyboard and mouse snap-resizing and snap-moving
erroneously moves the window multidimensionally
136307 - don't allow apps to resize themselves off the screen
(*cough* filechooser *cough*)
142016, 143784 - windows should not span multiple xineramas
unless placed there by the user
143145 - clamp new windows to screensize and force them
onscreen, if they'll fit
144126 - Handle pathological strut lists sanely[3]
149867 - fixed aspect ratio windows are difficult to resize[4]
152898 - make screen edges consistent; allow easy slamming of
windows into the left, right, and bottom edges of the
screen too.
154706 - bouncing weirdness at screen edge with keyboard moving
or resizing
156699 - avoid struts when placing windows, if possible (nasty
a11y blocker)
302456 - dragging offscreen too restrictive
304857 - wireframe moving off the top of the screen is misleading
308521 - make uni-directional resizing easier with
alt-middle-drag and prevent the occasional super
annoying resize-the-wrong-side(s) behavior
312007 - snap-resize moves windows with a minimum size
constraint
312104 - resizing the top of a window can cause the bottom to
grow
319351 - don't instantly snap on mouse-move-snapping, remove
braindeadedness of having order of releasing shift and
releasing button press matter so much
[1] fixed in my opinion, anyway.
[2] Actually, it's not totally fixed--it's just annoying
instead of almost completely unusable. Matthias had a
suggestion that may fix the remainder of the problems (see
http://tinyurl.com/bwzuu).
[3] This bug was originally about not-quite-so-pathological
cases but was left open for the worse cases. The code from
the branch handles the remainder of the cases mentioned in
this bug.
[4] Actually, although it's far better there's still some minor
issues left: a slight drift that's only noticeable after
lots of resizing, and potential problems with partially
onscreen constraints due to not clearing any
fixed_directions flags (aspect ratio windows get resized in
both directions and thus aren't fixed in one of them)
New feature:
81704 - edge resistance for user move and resize operations;
in particular 3 different kinds of resistance are
implemented:
Pixel-Distance: window movement is resisted when it
aligns with an edge unless the movement is greater than
a threshold number of pixels
Timeout: window movement past an edge is prevented until
a certain amount of time has elapsed during the
operation since the first request to move it past that
edge
Keyboard-Buildup: when moving or resizing with the
keyboard, once a window is aligned with a certain edge
it cannot move past until the correct direction has
been pressed enough times (e.g. 2 or 3 times)
Major changes:
- constraints.c has been rewritten; very few lines of code from
the old version remain. There is a comment near the top of
the function explaining the basics of how the new framework
works. A more detailed explanation can be found in
doc/how-constraints-works.txt
- edge-resistance.[ch] are new files implementing edge-resistance.
- boxes.[ch] are new files containing low-level error-prone
functions used heavily in constraints.c and edge-resistance.c,
among various places throughout the code. testboxes.c
contains a thorough testsuite for the boxes.[ch] functions
compiled into a program, testboxes.
- meta_window_move_resize_internal() *must* be told the gravity
of the associated operation (if it's just a move operation,
the gravity will be ignored, but for resize and move+resize
the correct value is needed)
- the craziness of different values that
meta_window_move_resize_internal() accepts has been documented
in a large comment at the beginning of the function. It may
be possible to clean this up some, but until then things will
remain as they were before--caller beware.
- screen and xinerama usable areas (i.e. places not covered by
e.g. panels) are cached in the workspace now, as are the
screen and xinerama edges. These get updated with the
workarea in src/workspace.c:ensure_work_areas_validated()
2005-11-19 14:58:50 +00:00
|
|
|
MetaRectangle old_rect;
|
2003-10-12 06:25:38 +00:00
|
|
|
meta_topic (META_DEBUG_KEYBINDINGS,
|
Merge of all the changes on the constraints_experiments branch. This is
2005-11-18 Elijah Newren <newren@gmail.com>
Merge of all the changes on the constraints_experiments branch.
This is just a summary, to get the full ChangeLog of those
changes (approx. 2000 lines):
cvs -q -z3 update -Pd -r constraints_experiments
cvs -q -z3 diff -pu -r CONSTRAINTS_EXPERIMENTS_BRANCHPOINT ChangeLog
Bugs fixed:
unfiled - constraints.c is overly complicated[1]
unfiled - constraints.c is not robust when all constraints
cannot simultaneously be met (constraints need to be
prioritized)
unfiled - keep-titlebar-onscreen constraint is decoration
unaware (since get_outermost_onscreen_positions()
forgets to include decorations)
unfiled - keyboard snap-moving and snap-resizing snap to hidden
edges
109553 - gravity w/ simultaneous move & resize doesn't work
113601 - maximize vertical and horizontal should toggle and be
constrained
122196 - windows show up under vertical panels
122670 - jerky/random resizing of window via keyboard[2]
124582 - keyboard and mouse snap-resizing and snap-moving
erroneously moves the window multidimensionally
136307 - don't allow apps to resize themselves off the screen
(*cough* filechooser *cough*)
142016, 143784 - windows should not span multiple xineramas
unless placed there by the user
143145 - clamp new windows to screensize and force them
onscreen, if they'll fit
144126 - Handle pathological strut lists sanely[3]
149867 - fixed aspect ratio windows are difficult to resize[4]
152898 - make screen edges consistent; allow easy slamming of
windows into the left, right, and bottom edges of the
screen too.
154706 - bouncing weirdness at screen edge with keyboard moving
or resizing
156699 - avoid struts when placing windows, if possible (nasty
a11y blocker)
302456 - dragging offscreen too restrictive
304857 - wireframe moving off the top of the screen is misleading
308521 - make uni-directional resizing easier with
alt-middle-drag and prevent the occasional super
annoying resize-the-wrong-side(s) behavior
312007 - snap-resize moves windows with a minimum size
constraint
312104 - resizing the top of a window can cause the bottom to
grow
319351 - don't instantly snap on mouse-move-snapping, remove
braindeadedness of having order of releasing shift and
releasing button press matter so much
[1] fixed in my opinion, anyway.
[2] Actually, it's not totally fixed--it's just annoying
instead of almost completely unusable. Matthias had a
suggestion that may fix the remainder of the problems (see
http://tinyurl.com/bwzuu).
[3] This bug was originally about not-quite-so-pathological
cases but was left open for the worse cases. The code from
the branch handles the remainder of the cases mentioned in
this bug.
[4] Actually, although it's far better there's still some minor
issues left: a slight drift that's only noticeable after
lots of resizing, and potential problems with partially
onscreen constraints due to not clearing any
fixed_directions flags (aspect ratio windows get resized in
both directions and thus aren't fixed in one of them)
New feature:
81704 - edge resistance for user move and resize operations;
in particular 3 different kinds of resistance are
implemented:
Pixel-Distance: window movement is resisted when it
aligns with an edge unless the movement is greater than
a threshold number of pixels
Timeout: window movement past an edge is prevented until
a certain amount of time has elapsed during the
operation since the first request to move it past that
edge
Keyboard-Buildup: when moving or resizing with the
keyboard, once a window is aligned with a certain edge
it cannot move past until the correct direction has
been pressed enough times (e.g. 2 or 3 times)
Major changes:
- constraints.c has been rewritten; very few lines of code from
the old version remain. There is a comment near the top of
the function explaining the basics of how the new framework
works. A more detailed explanation can be found in
doc/how-constraints-works.txt
- edge-resistance.[ch] are new files implementing edge-resistance.
- boxes.[ch] are new files containing low-level error-prone
functions used heavily in constraints.c and edge-resistance.c,
among various places throughout the code. testboxes.c
contains a thorough testsuite for the boxes.[ch] functions
compiled into a program, testboxes.
- meta_window_move_resize_internal() *must* be told the gravity
of the associated operation (if it's just a move operation,
the gravity will be ignored, but for resize and move+resize
the correct value is needed)
- the craziness of different values that
meta_window_move_resize_internal() accepts has been documented
in a large comment at the beginning of the function. It may
be possible to clean this up some, but until then things will
remain as they were before--caller beware.
- screen and xinerama usable areas (i.e. places not covered by
e.g. panels) are cached in the workspace now, as are the
screen and xinerama edges. These get updated with the
workarea in src/workspace.c:ensure_work_areas_validated()
2005-11-19 14:58:50 +00:00
|
|
|
"Computed new window size due to keypress: "
|
|
|
|
"%dx%d, gravity %s\n",
|
|
|
|
width, height, meta_gravity_to_string (gravity));
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2009-05-07 17:53:47 +00:00
|
|
|
old_rect = window->rect; /* Don't actually care about x,y */
|
Merge of all the changes on the constraints_experiments branch. This is
2005-11-18 Elijah Newren <newren@gmail.com>
Merge of all the changes on the constraints_experiments branch.
This is just a summary, to get the full ChangeLog of those
changes (approx. 2000 lines):
cvs -q -z3 update -Pd -r constraints_experiments
cvs -q -z3 diff -pu -r CONSTRAINTS_EXPERIMENTS_BRANCHPOINT ChangeLog
Bugs fixed:
unfiled - constraints.c is overly complicated[1]
unfiled - constraints.c is not robust when all constraints
cannot simultaneously be met (constraints need to be
prioritized)
unfiled - keep-titlebar-onscreen constraint is decoration
unaware (since get_outermost_onscreen_positions()
forgets to include decorations)
unfiled - keyboard snap-moving and snap-resizing snap to hidden
edges
109553 - gravity w/ simultaneous move & resize doesn't work
113601 - maximize vertical and horizontal should toggle and be
constrained
122196 - windows show up under vertical panels
122670 - jerky/random resizing of window via keyboard[2]
124582 - keyboard and mouse snap-resizing and snap-moving
erroneously moves the window multidimensionally
136307 - don't allow apps to resize themselves off the screen
(*cough* filechooser *cough*)
142016, 143784 - windows should not span multiple xineramas
unless placed there by the user
143145 - clamp new windows to screensize and force them
onscreen, if they'll fit
144126 - Handle pathological strut lists sanely[3]
149867 - fixed aspect ratio windows are difficult to resize[4]
152898 - make screen edges consistent; allow easy slamming of
windows into the left, right, and bottom edges of the
screen too.
154706 - bouncing weirdness at screen edge with keyboard moving
or resizing
156699 - avoid struts when placing windows, if possible (nasty
a11y blocker)
302456 - dragging offscreen too restrictive
304857 - wireframe moving off the top of the screen is misleading
308521 - make uni-directional resizing easier with
alt-middle-drag and prevent the occasional super
annoying resize-the-wrong-side(s) behavior
312007 - snap-resize moves windows with a minimum size
constraint
312104 - resizing the top of a window can cause the bottom to
grow
319351 - don't instantly snap on mouse-move-snapping, remove
braindeadedness of having order of releasing shift and
releasing button press matter so much
[1] fixed in my opinion, anyway.
[2] Actually, it's not totally fixed--it's just annoying
instead of almost completely unusable. Matthias had a
suggestion that may fix the remainder of the problems (see
http://tinyurl.com/bwzuu).
[3] This bug was originally about not-quite-so-pathological
cases but was left open for the worse cases. The code from
the branch handles the remainder of the cases mentioned in
this bug.
[4] Actually, although it's far better there's still some minor
issues left: a slight drift that's only noticeable after
lots of resizing, and potential problems with partially
onscreen constraints due to not clearing any
fixed_directions flags (aspect ratio windows get resized in
both directions and thus aren't fixed in one of them)
New feature:
81704 - edge resistance for user move and resize operations;
in particular 3 different kinds of resistance are
implemented:
Pixel-Distance: window movement is resisted when it
aligns with an edge unless the movement is greater than
a threshold number of pixels
Timeout: window movement past an edge is prevented until
a certain amount of time has elapsed during the
operation since the first request to move it past that
edge
Keyboard-Buildup: when moving or resizing with the
keyboard, once a window is aligned with a certain edge
it cannot move past until the correct direction has
been pressed enough times (e.g. 2 or 3 times)
Major changes:
- constraints.c has been rewritten; very few lines of code from
the old version remain. There is a comment near the top of
the function explaining the basics of how the new framework
works. A more detailed explanation can be found in
doc/how-constraints-works.txt
- edge-resistance.[ch] are new files implementing edge-resistance.
- boxes.[ch] are new files containing low-level error-prone
functions used heavily in constraints.c and edge-resistance.c,
among various places throughout the code. testboxes.c
contains a thorough testsuite for the boxes.[ch] functions
compiled into a program, testboxes.
- meta_window_move_resize_internal() *must* be told the gravity
of the associated operation (if it's just a move operation,
the gravity will be ignored, but for resize and move+resize
the correct value is needed)
- the craziness of different values that
meta_window_move_resize_internal() accepts has been documented
in a large comment at the beginning of the function. It may
be possible to clean this up some, but until then things will
remain as they were before--caller beware.
- screen and xinerama usable areas (i.e. places not covered by
e.g. panels) are cached in the workspace now, as are the
screen and xinerama edges. These get updated with the
workarea in src/workspace.c:ensure_work_areas_validated()
2005-11-19 14:58:50 +00:00
|
|
|
|
|
|
|
/* Do any edge resistance/snapping */
|
|
|
|
meta_window_edge_resistance_for_resize (window,
|
|
|
|
old_rect.width,
|
|
|
|
old_rect.height,
|
|
|
|
&width,
|
|
|
|
&height,
|
|
|
|
gravity,
|
|
|
|
NULL,
|
|
|
|
smart_snap,
|
|
|
|
TRUE);
|
|
|
|
|
2009-05-07 17:53:47 +00:00
|
|
|
/* We don't need to update unless the specified width and height
|
|
|
|
* are actually different from what we had before.
|
|
|
|
*/
|
|
|
|
if (window->rect.width != width || window->rect.height != height)
|
2012-12-13 01:50:43 +00:00
|
|
|
meta_window_resize_with_gravity (window,
|
2009-05-07 17:53:47 +00:00
|
|
|
TRUE,
|
|
|
|
width,
|
|
|
|
height,
|
|
|
|
gravity);
|
|
|
|
|
2003-10-12 06:25:38 +00:00
|
|
|
meta_window_update_keyboard_resize (window, FALSE);
|
Patch to provide extra cues to the user when using window menu move and
2002-08-08 Craig Black <blackc@speakeasy.net>
Patch to provide extra cues to the user when using
window menu move and resize, #85724.
* src/common.h: add new cursors
* src/display.c: (grab_op_is_mouse)
(meta_display_create_x_cursor), (xcursor_for_op),
(meta_display_set_grab_op_cursor),
(meta_display_begin_grab_op):
The keyboard move and resize grab ops now also use the mouse.
Allow the grab cursor to be changed during the grab op.
Hold onto the initial grab position in case of reset.
* src/display.h: save the initial grab position
* src/keybindings.c: (process_keyboard_move_grab),
(process_keyboard_resize_grab), (handle_begin_move),
(handle_begin_resize):
The keyboard move and resize grab ops now also use the mouse.
* src/window.c: (meta_window_client_message), (menu_callback),
(update_move), (update_resize),
(meta_window_handle_mouse_grab_op_event), (warp_pointer),
(meta_window_warp_pointer), (meta_window_begin_grab_op),
(meta_window_update_resize_grab_op):
When moving or resizing a window use the last grab position
in computing change increment.
Provide support for warping the mouse pointer.
* src/window.h: new warp pointer and grab op helper functions
2002-08-09 04:27:23 +00:00
|
|
|
}
|
2002-06-19 04:12:49 +00:00
|
|
|
|
|
|
|
return handled;
|
|
|
|
}
|
|
|
|
|
2001-06-06 04:47:37 +00:00
|
|
|
static void
|
2013-10-03 22:03:53 +00:00
|
|
|
handle_switch_to_workspace (MetaDisplay *display,
|
|
|
|
MetaScreen *screen,
|
|
|
|
MetaWindow *event_window,
|
|
|
|
ClutterKeyEvent *event,
|
|
|
|
MetaKeyBinding *binding,
|
|
|
|
gpointer dummy)
|
2001-06-06 04:47:37 +00:00
|
|
|
{
|
2008-10-06 00:24:07 +00:00
|
|
|
gint which = binding->handler->data;
|
2001-06-06 04:47:37 +00:00
|
|
|
MetaWorkspace *workspace;
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2008-10-06 00:24:07 +00:00
|
|
|
workspace = meta_screen_get_workspace_by_index (screen, which);
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2001-08-03 13:56:39 +00:00
|
|
|
if (workspace)
|
|
|
|
{
|
2012-11-15 21:35:42 +00:00
|
|
|
meta_workspace_activate (workspace, event->time);
|
2001-06-06 04:47:37 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* We could offer to create it I suppose */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2002-12-08 21:09:05 +00:00
|
|
|
|
|
|
|
static void
|
2013-10-03 22:03:53 +00:00
|
|
|
handle_maximize_vertically (MetaDisplay *display,
|
|
|
|
MetaScreen *screen,
|
|
|
|
MetaWindow *window,
|
|
|
|
ClutterKeyEvent *event,
|
|
|
|
MetaKeyBinding *binding,
|
|
|
|
gpointer dummy)
|
2002-12-08 21:09:05 +00:00
|
|
|
{
|
2008-11-22 19:02:54 +00:00
|
|
|
if (window->has_resize_func)
|
2002-12-08 21:09:05 +00:00
|
|
|
{
|
Merge of all the changes on the constraints_experiments branch. This is
2005-11-18 Elijah Newren <newren@gmail.com>
Merge of all the changes on the constraints_experiments branch.
This is just a summary, to get the full ChangeLog of those
changes (approx. 2000 lines):
cvs -q -z3 update -Pd -r constraints_experiments
cvs -q -z3 diff -pu -r CONSTRAINTS_EXPERIMENTS_BRANCHPOINT ChangeLog
Bugs fixed:
unfiled - constraints.c is overly complicated[1]
unfiled - constraints.c is not robust when all constraints
cannot simultaneously be met (constraints need to be
prioritized)
unfiled - keep-titlebar-onscreen constraint is decoration
unaware (since get_outermost_onscreen_positions()
forgets to include decorations)
unfiled - keyboard snap-moving and snap-resizing snap to hidden
edges
109553 - gravity w/ simultaneous move & resize doesn't work
113601 - maximize vertical and horizontal should toggle and be
constrained
122196 - windows show up under vertical panels
122670 - jerky/random resizing of window via keyboard[2]
124582 - keyboard and mouse snap-resizing and snap-moving
erroneously moves the window multidimensionally
136307 - don't allow apps to resize themselves off the screen
(*cough* filechooser *cough*)
142016, 143784 - windows should not span multiple xineramas
unless placed there by the user
143145 - clamp new windows to screensize and force them
onscreen, if they'll fit
144126 - Handle pathological strut lists sanely[3]
149867 - fixed aspect ratio windows are difficult to resize[4]
152898 - make screen edges consistent; allow easy slamming of
windows into the left, right, and bottom edges of the
screen too.
154706 - bouncing weirdness at screen edge with keyboard moving
or resizing
156699 - avoid struts when placing windows, if possible (nasty
a11y blocker)
302456 - dragging offscreen too restrictive
304857 - wireframe moving off the top of the screen is misleading
308521 - make uni-directional resizing easier with
alt-middle-drag and prevent the occasional super
annoying resize-the-wrong-side(s) behavior
312007 - snap-resize moves windows with a minimum size
constraint
312104 - resizing the top of a window can cause the bottom to
grow
319351 - don't instantly snap on mouse-move-snapping, remove
braindeadedness of having order of releasing shift and
releasing button press matter so much
[1] fixed in my opinion, anyway.
[2] Actually, it's not totally fixed--it's just annoying
instead of almost completely unusable. Matthias had a
suggestion that may fix the remainder of the problems (see
http://tinyurl.com/bwzuu).
[3] This bug was originally about not-quite-so-pathological
cases but was left open for the worse cases. The code from
the branch handles the remainder of the cases mentioned in
this bug.
[4] Actually, although it's far better there's still some minor
issues left: a slight drift that's only noticeable after
lots of resizing, and potential problems with partially
onscreen constraints due to not clearing any
fixed_directions flags (aspect ratio windows get resized in
both directions and thus aren't fixed in one of them)
New feature:
81704 - edge resistance for user move and resize operations;
in particular 3 different kinds of resistance are
implemented:
Pixel-Distance: window movement is resisted when it
aligns with an edge unless the movement is greater than
a threshold number of pixels
Timeout: window movement past an edge is prevented until
a certain amount of time has elapsed during the
operation since the first request to move it past that
edge
Keyboard-Buildup: when moving or resizing with the
keyboard, once a window is aligned with a certain edge
it cannot move past until the correct direction has
been pressed enough times (e.g. 2 or 3 times)
Major changes:
- constraints.c has been rewritten; very few lines of code from
the old version remain. There is a comment near the top of
the function explaining the basics of how the new framework
works. A more detailed explanation can be found in
doc/how-constraints-works.txt
- edge-resistance.[ch] are new files implementing edge-resistance.
- boxes.[ch] are new files containing low-level error-prone
functions used heavily in constraints.c and edge-resistance.c,
among various places throughout the code. testboxes.c
contains a thorough testsuite for the boxes.[ch] functions
compiled into a program, testboxes.
- meta_window_move_resize_internal() *must* be told the gravity
of the associated operation (if it's just a move operation,
the gravity will be ignored, but for resize and move+resize
the correct value is needed)
- the craziness of different values that
meta_window_move_resize_internal() accepts has been documented
in a large comment at the beginning of the function. It may
be possible to clean this up some, but until then things will
remain as they were before--caller beware.
- screen and xinerama usable areas (i.e. places not covered by
e.g. panels) are cached in the workspace now, as are the
screen and xinerama edges. These get updated with the
workarea in src/workspace.c:ensure_work_areas_validated()
2005-11-19 14:58:50 +00:00
|
|
|
if (window->maximized_vertically)
|
|
|
|
meta_window_unmaximize (window, META_MAXIMIZE_VERTICAL);
|
|
|
|
else
|
|
|
|
meta_window_maximize (window, META_MAXIMIZE_VERTICAL);
|
2002-12-08 21:09:05 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2013-10-03 22:03:53 +00:00
|
|
|
handle_maximize_horizontally (MetaDisplay *display,
|
|
|
|
MetaScreen *screen,
|
|
|
|
MetaWindow *window,
|
|
|
|
ClutterKeyEvent *event,
|
|
|
|
MetaKeyBinding *binding,
|
|
|
|
gpointer dummy)
|
2002-12-08 21:09:05 +00:00
|
|
|
{
|
2008-11-22 19:02:54 +00:00
|
|
|
if (window->has_resize_func)
|
2002-12-08 21:09:05 +00:00
|
|
|
{
|
Merge of all the changes on the constraints_experiments branch. This is
2005-11-18 Elijah Newren <newren@gmail.com>
Merge of all the changes on the constraints_experiments branch.
This is just a summary, to get the full ChangeLog of those
changes (approx. 2000 lines):
cvs -q -z3 update -Pd -r constraints_experiments
cvs -q -z3 diff -pu -r CONSTRAINTS_EXPERIMENTS_BRANCHPOINT ChangeLog
Bugs fixed:
unfiled - constraints.c is overly complicated[1]
unfiled - constraints.c is not robust when all constraints
cannot simultaneously be met (constraints need to be
prioritized)
unfiled - keep-titlebar-onscreen constraint is decoration
unaware (since get_outermost_onscreen_positions()
forgets to include decorations)
unfiled - keyboard snap-moving and snap-resizing snap to hidden
edges
109553 - gravity w/ simultaneous move & resize doesn't work
113601 - maximize vertical and horizontal should toggle and be
constrained
122196 - windows show up under vertical panels
122670 - jerky/random resizing of window via keyboard[2]
124582 - keyboard and mouse snap-resizing and snap-moving
erroneously moves the window multidimensionally
136307 - don't allow apps to resize themselves off the screen
(*cough* filechooser *cough*)
142016, 143784 - windows should not span multiple xineramas
unless placed there by the user
143145 - clamp new windows to screensize and force them
onscreen, if they'll fit
144126 - Handle pathological strut lists sanely[3]
149867 - fixed aspect ratio windows are difficult to resize[4]
152898 - make screen edges consistent; allow easy slamming of
windows into the left, right, and bottom edges of the
screen too.
154706 - bouncing weirdness at screen edge with keyboard moving
or resizing
156699 - avoid struts when placing windows, if possible (nasty
a11y blocker)
302456 - dragging offscreen too restrictive
304857 - wireframe moving off the top of the screen is misleading
308521 - make uni-directional resizing easier with
alt-middle-drag and prevent the occasional super
annoying resize-the-wrong-side(s) behavior
312007 - snap-resize moves windows with a minimum size
constraint
312104 - resizing the top of a window can cause the bottom to
grow
319351 - don't instantly snap on mouse-move-snapping, remove
braindeadedness of having order of releasing shift and
releasing button press matter so much
[1] fixed in my opinion, anyway.
[2] Actually, it's not totally fixed--it's just annoying
instead of almost completely unusable. Matthias had a
suggestion that may fix the remainder of the problems (see
http://tinyurl.com/bwzuu).
[3] This bug was originally about not-quite-so-pathological
cases but was left open for the worse cases. The code from
the branch handles the remainder of the cases mentioned in
this bug.
[4] Actually, although it's far better there's still some minor
issues left: a slight drift that's only noticeable after
lots of resizing, and potential problems with partially
onscreen constraints due to not clearing any
fixed_directions flags (aspect ratio windows get resized in
both directions and thus aren't fixed in one of them)
New feature:
81704 - edge resistance for user move and resize operations;
in particular 3 different kinds of resistance are
implemented:
Pixel-Distance: window movement is resisted when it
aligns with an edge unless the movement is greater than
a threshold number of pixels
Timeout: window movement past an edge is prevented until
a certain amount of time has elapsed during the
operation since the first request to move it past that
edge
Keyboard-Buildup: when moving or resizing with the
keyboard, once a window is aligned with a certain edge
it cannot move past until the correct direction has
been pressed enough times (e.g. 2 or 3 times)
Major changes:
- constraints.c has been rewritten; very few lines of code from
the old version remain. There is a comment near the top of
the function explaining the basics of how the new framework
works. A more detailed explanation can be found in
doc/how-constraints-works.txt
- edge-resistance.[ch] are new files implementing edge-resistance.
- boxes.[ch] are new files containing low-level error-prone
functions used heavily in constraints.c and edge-resistance.c,
among various places throughout the code. testboxes.c
contains a thorough testsuite for the boxes.[ch] functions
compiled into a program, testboxes.
- meta_window_move_resize_internal() *must* be told the gravity
of the associated operation (if it's just a move operation,
the gravity will be ignored, but for resize and move+resize
the correct value is needed)
- the craziness of different values that
meta_window_move_resize_internal() accepts has been documented
in a large comment at the beginning of the function. It may
be possible to clean this up some, but until then things will
remain as they were before--caller beware.
- screen and xinerama usable areas (i.e. places not covered by
e.g. panels) are cached in the workspace now, as are the
screen and xinerama edges. These get updated with the
workarea in src/workspace.c:ensure_work_areas_validated()
2005-11-19 14:58:50 +00:00
|
|
|
if (window->maximized_horizontally)
|
|
|
|
meta_window_unmaximize (window, META_MAXIMIZE_HORIZONTAL);
|
|
|
|
else
|
|
|
|
meta_window_maximize (window, META_MAXIMIZE_HORIZONTAL);
|
2002-12-08 21:09:05 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-07-24 18:55:23 +00:00
|
|
|
static void
|
2013-11-19 19:02:42 +00:00
|
|
|
handle_always_on_top (MetaDisplay *display,
|
|
|
|
MetaScreen *screen,
|
|
|
|
MetaWindow *window,
|
|
|
|
ClutterKeyEvent *event,
|
|
|
|
MetaKeyBinding *binding,
|
|
|
|
gpointer dummy)
|
2013-07-24 18:55:23 +00:00
|
|
|
{
|
|
|
|
if (window->wm_state_above == FALSE)
|
|
|
|
meta_window_make_above (window);
|
|
|
|
else
|
|
|
|
meta_window_unmake_above (window);
|
|
|
|
}
|
|
|
|
|
2006-11-05 22:23:44 +00:00
|
|
|
/* Move a window to a corner; to_bottom/to_right are FALSE for the
|
|
|
|
* top or left edge, or TRUE for the bottom/right edge. xchange/ychange
|
|
|
|
* are FALSE if that dimension is not to be changed, TRUE otherwise.
|
|
|
|
* Together they describe which of the four corners, or four sides,
|
|
|
|
* is desired.
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
handle_move_to_corner_backend (MetaDisplay *display,
|
2012-12-13 01:50:43 +00:00
|
|
|
MetaScreen *screen,
|
|
|
|
MetaWindow *window,
|
|
|
|
gboolean xchange,
|
|
|
|
gboolean ychange,
|
|
|
|
gboolean to_right,
|
|
|
|
gboolean to_bottom,
|
|
|
|
gpointer dummy)
|
2006-11-05 22:23:44 +00:00
|
|
|
{
|
|
|
|
MetaRectangle work_area;
|
2013-11-19 17:24:45 +00:00
|
|
|
MetaRectangle frame_rect;
|
2006-11-05 22:23:44 +00:00
|
|
|
int orig_x, orig_y;
|
|
|
|
int new_x, new_y;
|
|
|
|
|
2009-08-31 13:52:16 +00:00
|
|
|
meta_window_get_work_area_all_monitors (window, &work_area);
|
2013-11-19 17:24:45 +00:00
|
|
|
meta_window_get_frame_rect (window, &frame_rect);
|
2006-11-05 22:23:44 +00:00
|
|
|
meta_window_get_position (window, &orig_x, &orig_y);
|
|
|
|
|
|
|
|
if (xchange) {
|
|
|
|
new_x = work_area.x + (to_right ?
|
2013-11-19 17:24:45 +00:00
|
|
|
work_area.width - frame_rect.width :
|
2012-12-13 01:50:43 +00:00
|
|
|
0);
|
2006-11-05 22:23:44 +00:00
|
|
|
} else {
|
|
|
|
new_x = orig_x;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ychange) {
|
|
|
|
new_y = work_area.y + (to_bottom ?
|
2013-11-19 17:24:45 +00:00
|
|
|
work_area.height - frame_rect.height :
|
2012-12-13 01:50:43 +00:00
|
|
|
0);
|
2006-11-05 22:23:44 +00:00
|
|
|
} else {
|
|
|
|
new_y = orig_y;
|
|
|
|
}
|
|
|
|
|
2012-03-12 19:40:12 +00:00
|
|
|
meta_window_move_frame (window,
|
|
|
|
TRUE,
|
|
|
|
new_x,
|
|
|
|
new_y);
|
2006-11-05 22:23:44 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2013-10-03 22:03:53 +00:00
|
|
|
handle_move_to_corner_nw (MetaDisplay *display,
|
|
|
|
MetaScreen *screen,
|
|
|
|
MetaWindow *window,
|
|
|
|
ClutterKeyEvent *event,
|
|
|
|
MetaKeyBinding *binding,
|
|
|
|
gpointer dummy)
|
2006-11-05 22:23:44 +00:00
|
|
|
{
|
2009-01-29 14:53:03 +00:00
|
|
|
handle_move_to_corner_backend (display, screen, window, TRUE, TRUE, FALSE, FALSE, dummy);
|
2006-11-05 22:23:44 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2013-10-03 22:03:53 +00:00
|
|
|
handle_move_to_corner_ne (MetaDisplay *display,
|
|
|
|
MetaScreen *screen,
|
|
|
|
MetaWindow *window,
|
|
|
|
ClutterKeyEvent *event,
|
|
|
|
MetaKeyBinding *binding,
|
|
|
|
gpointer dummy)
|
2006-11-05 22:23:44 +00:00
|
|
|
{
|
2009-01-29 14:53:03 +00:00
|
|
|
handle_move_to_corner_backend (display, screen, window, TRUE, TRUE, TRUE, FALSE, dummy);
|
2006-11-05 22:23:44 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2013-10-03 22:03:53 +00:00
|
|
|
handle_move_to_corner_sw (MetaDisplay *display,
|
|
|
|
MetaScreen *screen,
|
|
|
|
MetaWindow *window,
|
|
|
|
ClutterKeyEvent *event,
|
|
|
|
MetaKeyBinding *binding,
|
|
|
|
gpointer dummy)
|
2006-11-05 22:23:44 +00:00
|
|
|
{
|
2009-01-29 14:53:03 +00:00
|
|
|
handle_move_to_corner_backend (display, screen, window, TRUE, TRUE, FALSE, TRUE, dummy);
|
2006-11-05 22:23:44 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2013-10-03 22:03:53 +00:00
|
|
|
handle_move_to_corner_se (MetaDisplay *display,
|
|
|
|
MetaScreen *screen,
|
|
|
|
MetaWindow *window,
|
|
|
|
ClutterKeyEvent *event,
|
|
|
|
MetaKeyBinding *binding,
|
|
|
|
gpointer dummy)
|
2006-11-05 22:23:44 +00:00
|
|
|
{
|
2009-01-29 14:53:03 +00:00
|
|
|
handle_move_to_corner_backend (display, screen, window, TRUE, TRUE, TRUE, TRUE, dummy);
|
2006-11-05 22:23:44 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2013-10-03 22:03:53 +00:00
|
|
|
handle_move_to_side_n (MetaDisplay *display,
|
|
|
|
MetaScreen *screen,
|
|
|
|
MetaWindow *window,
|
|
|
|
ClutterKeyEvent *event,
|
|
|
|
MetaKeyBinding *binding,
|
|
|
|
gpointer dummy)
|
2006-11-05 22:23:44 +00:00
|
|
|
{
|
2009-01-29 14:53:03 +00:00
|
|
|
handle_move_to_corner_backend (display, screen, window, FALSE, TRUE, FALSE, FALSE, dummy);
|
2006-11-05 22:23:44 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2013-10-03 22:03:53 +00:00
|
|
|
handle_move_to_side_s (MetaDisplay *display,
|
|
|
|
MetaScreen *screen,
|
|
|
|
MetaWindow *window,
|
|
|
|
ClutterKeyEvent *event,
|
|
|
|
MetaKeyBinding *binding,
|
|
|
|
gpointer dummy)
|
2006-11-05 22:23:44 +00:00
|
|
|
{
|
2009-01-29 14:53:03 +00:00
|
|
|
handle_move_to_corner_backend (display, screen, window, FALSE, TRUE, FALSE, TRUE, dummy);
|
2006-11-05 22:23:44 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2013-10-03 22:03:53 +00:00
|
|
|
handle_move_to_side_e (MetaDisplay *display,
|
|
|
|
MetaScreen *screen,
|
|
|
|
MetaWindow *window,
|
|
|
|
ClutterKeyEvent *event,
|
|
|
|
MetaKeyBinding *binding,
|
|
|
|
gpointer dummy)
|
2006-11-05 22:23:44 +00:00
|
|
|
{
|
2009-01-29 14:53:03 +00:00
|
|
|
handle_move_to_corner_backend (display, screen, window, TRUE, FALSE, TRUE, FALSE, dummy);
|
2006-11-05 22:23:44 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2013-10-03 22:03:53 +00:00
|
|
|
handle_move_to_side_w (MetaDisplay *display,
|
|
|
|
MetaScreen *screen,
|
|
|
|
MetaWindow *window,
|
|
|
|
ClutterKeyEvent *event,
|
|
|
|
MetaKeyBinding *binding,
|
|
|
|
gpointer dummy)
|
2006-11-05 22:23:44 +00:00
|
|
|
{
|
2009-01-29 14:53:03 +00:00
|
|
|
handle_move_to_corner_backend (display, screen, window, TRUE, FALSE, FALSE, FALSE, dummy);
|
2006-11-05 22:23:44 +00:00
|
|
|
}
|
|
|
|
|
2008-09-01 01:32:39 +00:00
|
|
|
static void
|
2013-10-03 22:03:53 +00:00
|
|
|
handle_move_to_center (MetaDisplay *display,
|
|
|
|
MetaScreen *screen,
|
|
|
|
MetaWindow *window,
|
|
|
|
ClutterKeyEvent *event,
|
|
|
|
MetaKeyBinding *binding,
|
|
|
|
gpointer dummy)
|
2008-09-01 01:32:39 +00:00
|
|
|
{
|
|
|
|
MetaRectangle work_area;
|
2013-11-19 17:24:45 +00:00
|
|
|
MetaRectangle frame_rect;
|
2008-09-01 01:32:39 +00:00
|
|
|
int orig_x, orig_y;
|
|
|
|
int frame_width, frame_height;
|
|
|
|
|
2009-08-31 13:52:16 +00:00
|
|
|
meta_window_get_work_area_all_monitors (window, &work_area);
|
2013-11-19 17:24:45 +00:00
|
|
|
meta_window_get_frame_rect (window, &frame_rect);
|
2008-09-01 01:32:39 +00:00
|
|
|
meta_window_get_position (window, &orig_x, &orig_y);
|
|
|
|
|
|
|
|
frame_width = (window->frame ? window->frame->child_x : 0);
|
|
|
|
frame_height = (window->frame ? window->frame->child_y : 0);
|
|
|
|
|
|
|
|
meta_window_move_resize (window,
|
2012-12-13 01:50:43 +00:00
|
|
|
TRUE,
|
2013-11-19 17:24:45 +00:00
|
|
|
work_area.x + (work_area.width +frame_width -frame_rect.width )/2,
|
|
|
|
work_area.y + (work_area.height+frame_height-frame_rect.height)/2,
|
2012-12-13 01:50:43 +00:00
|
|
|
window->rect.width,
|
|
|
|
window->rect.height);
|
2008-09-01 01:32:39 +00:00
|
|
|
}
|
|
|
|
|
2001-10-15 03:39:41 +00:00
|
|
|
static void
|
2013-10-03 22:03:53 +00:00
|
|
|
handle_show_desktop (MetaDisplay *display,
|
|
|
|
MetaScreen *screen,
|
|
|
|
MetaWindow *window,
|
|
|
|
ClutterKeyEvent *event,
|
|
|
|
MetaKeyBinding *binding,
|
|
|
|
gpointer dummy)
|
2001-10-15 03:39:41 +00:00
|
|
|
{
|
Make the "showing desktop" mode be per-workspace instead of per-screen.
2004-10-16 Elijah Newren <newren@math.utah.edu>
Make the "showing desktop" mode be per-workspace instead of
per-screen. (fixes #142198)
* src/keybindings.c (handle_toggle_desktop): access
showing_desktop through the active workspace
* src/screen.c (meta_screen_new): remove initialization of
screen->showing_desktop,
(meta_screen_update_showing_desktop_hint): rename and make not
static and access showing_desktop through the active workspace,
(queue_windows_showing): replace meta_display_list_windows() with
screen->active_workspace->windows,
(meta_screen_minimize_all_on_active_workspace_except): renamed
from meta_screen_minimize_all_except since it now only works on
the active workspace, (meta_screen_show_desktop,
meta_screen_unshow_desktop): access showing_desktop through the
active workspace
* src/screen.h (struct _MetaScreen): remove showing_desktop field,
(meta_screen_minimize_all_on_active_workspace_except): rename from
meta_screen_minimize_all_except,
(meta_screen_update)_showing_desktop_hint): export this function too
* src/window.c (maybe_leave_show_desktop_mode): access
showing_desktop through the active workspace and use new name for
meta_screen_minimize_all_on_active_workspace_except,
(window_should_be_showing): access showing_desktop through the
active workspace
* src/workspace.c (meta_workspace_new): initialize
workspace->showing_desktop, (meta_workspace_activate_with_focus):
add note that old can be NULL, update showing_desktop_hint if
different on this workspace than the previous one
* src/workspace.h (struct _MetaWorkspace): add showing_desktop
field
2004-10-17 04:28:29 +00:00
|
|
|
if (screen->active_workspace->showing_desktop)
|
2003-05-16 21:59:08 +00:00
|
|
|
{
|
|
|
|
meta_screen_unshow_desktop (screen);
|
2012-12-13 01:50:43 +00:00
|
|
|
meta_workspace_focus_default_window (screen->active_workspace,
|
Fix a variety of focus race conditions in all focus modes, or at least
2004-10-04 Elijah Newren <newren@math.utah.edu>
Fix a variety of focus race conditions in all focus modes, or at
least make them harder to trigger (fixes #152000)
* src/core.[ch] (meta_core_user_lower_and_unfocus): add a
timestamp parameter; pass it along to
meta_workspace_focus_default_window
* src/display.[ch] (meta_display_get_current_time_roundtrip): new
function
* src/display.c (event_callback): pass a timestamp to the
meta_workspace_activate and meta_workspace_focus_default_window
function calls
* src/frames.c (meta_frames_button_press_event): pass a timestamp
to meta_core_user_lower_and_unfocus
* src/keybindings.c (handle_activate_workspace): pass a timestamp
to meta_workspace_activate, (process_workspace_switch_grab): pass
a timestamp to meta_workspace_focus_default_window and
meta_workspace_activate, (handle_toggle_desktop): pass a timestamp
to meta_workspace_focus_default_window,
(do_handle_move_to_workspace): pass a timestamp to
meta_workspace_activate_with_focus, (handle_workspace_switch):
meta_workspace_activate
* src/screen.c (meta_screen_new): pass a timestamp to
meta_workspace_activate
* src/window.c (meta_window_free): pass a timestamp to
meta_workspace_focus_default_window, (idle_calc_showing): don't
increment the focus sentinel here, (meta_window_minimize): pass a
timestamp to meta_workspace_focus_default_window,
(meta_window_client_message), pass a timestamp to
meta_workspace_focus_default_window
* src/workspace.h (meta_workspace_activate): add timestamp
parameter, (meta_workspace_activate_with_focus): add timestamp
parameter, (meta_workspace_focus_default_window): add timestamp
parameter
* src/workspace.c (meta_workspace_focus_mru_window): make this
function take a timestamp and use it for meta_window_focus or
XSetInputFocus, (meta_workspace_activate_with_focus): make this
function take a timestamp and pass it along to meta_window_focus
and meta_workspace_focus_default_window,
(meta_workspace_activate): make this function take a timestamp and
pass it to meta_workspace_activate_with_focus),
(meta_workspace_focus_default_window): make this function take a
timestamp, warn if its 0 but try to handle that case sanely, and
pass the timestamp on to meta_window_focus or
meta_workspace_focus_mru_window or XSetInputFocus
2004-10-04 20:32:59 +00:00
|
|
|
NULL,
|
2012-11-15 21:35:42 +00:00
|
|
|
event->time);
|
2003-05-16 21:59:08 +00:00
|
|
|
}
|
2001-10-15 03:39:41 +00:00
|
|
|
else
|
2012-11-15 21:35:42 +00:00
|
|
|
meta_screen_show_desktop (screen, event->time);
|
2001-10-15 03:39:41 +00:00
|
|
|
}
|
|
|
|
|
2003-02-24 02:16:09 +00:00
|
|
|
static void
|
2013-10-03 22:03:53 +00:00
|
|
|
handle_panel (MetaDisplay *display,
|
|
|
|
MetaScreen *screen,
|
|
|
|
MetaWindow *window,
|
|
|
|
ClutterKeyEvent *event,
|
|
|
|
MetaKeyBinding *binding,
|
|
|
|
gpointer dummy)
|
2003-02-24 02:16:09 +00:00
|
|
|
{
|
2008-10-06 00:24:07 +00:00
|
|
|
MetaKeyBindingAction action = binding->handler->data;
|
2003-02-24 02:16:09 +00:00
|
|
|
Atom action_atom;
|
|
|
|
XClientMessageEvent ev;
|
|
|
|
|
|
|
|
action_atom = None;
|
|
|
|
switch (action)
|
|
|
|
{
|
2012-12-13 01:50:43 +00:00
|
|
|
/* FIXME: The numbers are wrong */
|
2003-02-24 02:16:09 +00:00
|
|
|
case META_KEYBINDING_ACTION_PANEL_MAIN_MENU:
|
2008-05-02 18:49:01 +00:00
|
|
|
action_atom = display->atom__GNOME_PANEL_ACTION_MAIN_MENU;
|
2003-02-24 02:16:09 +00:00
|
|
|
break;
|
|
|
|
case META_KEYBINDING_ACTION_PANEL_RUN_DIALOG:
|
2008-05-02 18:49:01 +00:00
|
|
|
action_atom = display->atom__GNOME_PANEL_ACTION_RUN_DIALOG;
|
2003-02-24 02:16:09 +00:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return;
|
|
|
|
}
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2003-02-24 02:16:09 +00:00
|
|
|
ev.type = ClientMessage;
|
|
|
|
ev.window = screen->xroot;
|
2008-05-02 18:49:01 +00:00
|
|
|
ev.message_type = display->atom__GNOME_PANEL_ACTION;
|
2003-02-24 02:16:09 +00:00
|
|
|
ev.format = 32;
|
|
|
|
ev.data.l[0] = action_atom;
|
2012-11-15 21:35:42 +00:00
|
|
|
ev.data.l[1] = event->time;
|
2003-02-24 02:16:09 +00:00
|
|
|
|
2003-02-26 01:55:25 +00:00
|
|
|
meta_topic (META_DEBUG_KEYBINDINGS,
|
2013-10-03 22:03:53 +00:00
|
|
|
"Sending panel message with timestamp %u, and turning mouse_mode "
|
2012-11-15 21:35:42 +00:00
|
|
|
"off due to keybinding press\n", event->time);
|
2007-04-03 20:19:12 +00:00
|
|
|
display->mouse_mode = FALSE;
|
2003-02-26 01:55:25 +00:00
|
|
|
|
2003-02-24 02:16:09 +00:00
|
|
|
meta_error_trap_push (display);
|
2003-02-26 01:55:25 +00:00
|
|
|
|
|
|
|
/* Release the grab for the panel before sending the event */
|
2012-11-15 21:35:42 +00:00
|
|
|
XUngrabKeyboard (display->xdisplay, event->time);
|
2003-02-26 01:55:25 +00:00
|
|
|
|
2003-02-24 02:16:09 +00:00
|
|
|
XSendEvent (display->xdisplay,
|
|
|
|
screen->xroot,
|
|
|
|
False,
|
|
|
|
StructureNotifyMask,
|
|
|
|
(XEvent*) &ev);
|
2003-02-26 01:55:25 +00:00
|
|
|
|
2010-10-25 18:44:30 +00:00
|
|
|
meta_error_trap_pop (display);
|
2003-02-24 02:16:09 +00:00
|
|
|
}
|
|
|
|
|
2001-06-23 05:49:35 +00:00
|
|
|
static void
|
2013-10-03 22:03:53 +00:00
|
|
|
handle_activate_window_menu (MetaDisplay *display,
|
|
|
|
MetaScreen *screen,
|
|
|
|
MetaWindow *event_window,
|
|
|
|
ClutterKeyEvent *event,
|
|
|
|
MetaKeyBinding *binding,
|
|
|
|
gpointer dummy)
|
2001-06-23 05:49:35 +00:00
|
|
|
{
|
|
|
|
if (display->focus_window)
|
|
|
|
{
|
|
|
|
int x, y;
|
|
|
|
|
|
|
|
meta_window_get_position (display->focus_window,
|
|
|
|
&x, &y);
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2007-05-25 14:36:12 +00:00
|
|
|
if (meta_ui_get_direction() == META_UI_DIRECTION_RTL)
|
2012-12-13 01:50:43 +00:00
|
|
|
x += display->focus_window->rect.width;
|
2007-05-25 14:36:12 +00:00
|
|
|
|
2001-06-23 05:49:35 +00:00
|
|
|
meta_window_show_menu (display->focus_window,
|
|
|
|
x, y,
|
|
|
|
0,
|
2012-11-15 21:35:42 +00:00
|
|
|
event->time);
|
2001-06-23 05:49:35 +00:00
|
|
|
}
|
|
|
|
}
|
2001-06-24 02:22:10 +00:00
|
|
|
|
|
|
|
static void
|
2013-10-03 22:03:53 +00:00
|
|
|
do_choose_window (MetaDisplay *display,
|
|
|
|
MetaScreen *screen,
|
|
|
|
MetaWindow *event_window,
|
|
|
|
ClutterKeyEvent *event,
|
|
|
|
MetaKeyBinding *binding,
|
2013-04-23 16:52:25 +00:00
|
|
|
gboolean backward)
|
2001-06-24 02:22:10 +00:00
|
|
|
{
|
2008-10-06 00:24:07 +00:00
|
|
|
MetaTabList type = binding->handler->data;
|
2002-09-04 04:15:46 +00:00
|
|
|
MetaWindow *initial_selection;
|
2008-10-06 00:24:07 +00:00
|
|
|
|
2002-04-28 04:52:26 +00:00
|
|
|
meta_topic (META_DEBUG_KEYBINDINGS,
|
2013-04-23 16:52:25 +00:00
|
|
|
"Tab list = %u\n", type);
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2002-10-18 22:19:05 +00:00
|
|
|
/* reverse direction if shift is down */
|
2013-10-03 22:03:53 +00:00
|
|
|
if (event->modifier_state & CLUTTER_SHIFT_MASK)
|
2002-10-18 22:19:05 +00:00
|
|
|
backward = !backward;
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2002-09-04 04:15:46 +00:00
|
|
|
initial_selection = meta_display_get_tab_next (display,
|
|
|
|
type,
|
|
|
|
screen->active_workspace,
|
|
|
|
NULL,
|
|
|
|
backward);
|
2002-07-06 16:50:48 +00:00
|
|
|
|
2013-04-23 16:52:25 +00:00
|
|
|
meta_window_activate (initial_selection, event->time);
|
2001-06-24 02:22:10 +00:00
|
|
|
}
|
2001-06-24 03:18:10 +00:00
|
|
|
|
2002-07-06 16:50:48 +00:00
|
|
|
static void
|
2013-10-03 22:03:53 +00:00
|
|
|
handle_switch (MetaDisplay *display,
|
|
|
|
MetaScreen *screen,
|
|
|
|
MetaWindow *event_window,
|
|
|
|
ClutterKeyEvent *event,
|
|
|
|
MetaKeyBinding *binding,
|
|
|
|
gpointer dummy)
|
2001-06-24 03:18:10 +00:00
|
|
|
{
|
2011-10-28 01:05:43 +00:00
|
|
|
gint backwards = (binding->handler->flags & META_KEY_BINDING_IS_REVERSED) != 0;
|
2013-04-23 16:52:25 +00:00
|
|
|
do_choose_window (display, screen, event_window, event, binding, backwards);
|
2002-06-09 03:44:16 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2013-10-03 22:03:53 +00:00
|
|
|
handle_cycle (MetaDisplay *display,
|
|
|
|
MetaScreen *screen,
|
|
|
|
MetaWindow *event_window,
|
|
|
|
ClutterKeyEvent *event,
|
|
|
|
MetaKeyBinding *binding,
|
|
|
|
gpointer dummy)
|
2002-06-09 03:44:16 +00:00
|
|
|
{
|
2011-10-28 01:05:43 +00:00
|
|
|
gint backwards = (binding->handler->flags & META_KEY_BINDING_IS_REVERSED) != 0;
|
2013-04-23 16:52:25 +00:00
|
|
|
do_choose_window (display, screen, event_window, event, binding, backwards);
|
2009-08-25 20:54:54 +00:00
|
|
|
}
|
2008-10-06 00:24:07 +00:00
|
|
|
|
2002-04-05 15:52:49 +00:00
|
|
|
static void
|
2013-10-03 22:03:53 +00:00
|
|
|
handle_toggle_fullscreen (MetaDisplay *display,
|
|
|
|
MetaScreen *screen,
|
|
|
|
MetaWindow *window,
|
|
|
|
ClutterKeyEvent *event,
|
|
|
|
MetaKeyBinding *binding,
|
|
|
|
gpointer dummy)
|
2002-04-05 15:52:49 +00:00
|
|
|
{
|
2008-11-22 19:02:54 +00:00
|
|
|
if (window->fullscreen)
|
|
|
|
meta_window_unmake_fullscreen (window);
|
|
|
|
else if (window->has_fullscreen_func)
|
|
|
|
meta_window_make_fullscreen (window);
|
2002-04-05 15:52:49 +00:00
|
|
|
}
|
2002-01-11 03:31:14 +00:00
|
|
|
|
2003-06-27 14:49:56 +00:00
|
|
|
static void
|
2013-10-03 22:03:53 +00:00
|
|
|
handle_toggle_above (MetaDisplay *display,
|
|
|
|
MetaScreen *screen,
|
|
|
|
MetaWindow *window,
|
|
|
|
ClutterKeyEvent *event,
|
|
|
|
MetaKeyBinding *binding,
|
|
|
|
gpointer dummy)
|
2003-06-27 14:49:56 +00:00
|
|
|
{
|
2008-11-22 19:02:54 +00:00
|
|
|
if (window->wm_state_above)
|
|
|
|
meta_window_unmake_above (window);
|
|
|
|
else
|
|
|
|
meta_window_make_above (window);
|
2003-06-27 14:49:56 +00:00
|
|
|
}
|
|
|
|
|
2011-11-15 16:29:56 +00:00
|
|
|
static void
|
2013-10-03 22:03:53 +00:00
|
|
|
handle_toggle_tiled (MetaDisplay *display,
|
|
|
|
MetaScreen *screen,
|
|
|
|
MetaWindow *window,
|
|
|
|
ClutterKeyEvent *event,
|
|
|
|
MetaKeyBinding *binding,
|
|
|
|
gpointer dummy)
|
2011-11-15 16:29:56 +00:00
|
|
|
{
|
|
|
|
MetaTileMode mode = binding->handler->data;
|
|
|
|
|
|
|
|
if ((META_WINDOW_TILED_LEFT (window) && mode == META_TILE_LEFT) ||
|
|
|
|
(META_WINDOW_TILED_RIGHT (window) && mode == META_TILE_RIGHT))
|
|
|
|
{
|
|
|
|
window->tile_monitor_number = window->saved_maximize ? window->monitor->number
|
2012-12-13 01:50:43 +00:00
|
|
|
: -1;
|
2011-11-15 16:29:56 +00:00
|
|
|
window->tile_mode = window->saved_maximize ? META_TILE_MAXIMIZED
|
2012-12-13 01:50:43 +00:00
|
|
|
: META_TILE_NONE;
|
2011-11-15 16:29:56 +00:00
|
|
|
|
|
|
|
if (window->saved_maximize)
|
2014-03-13 22:32:20 +00:00
|
|
|
meta_window_maximize (window, META_MAXIMIZE_BOTH);
|
2011-11-15 16:29:56 +00:00
|
|
|
else
|
2014-03-13 22:32:20 +00:00
|
|
|
meta_window_unmaximize (window, META_MAXIMIZE_BOTH);
|
2011-11-15 16:29:56 +00:00
|
|
|
}
|
|
|
|
else if (meta_window_can_tile_side_by_side (window))
|
|
|
|
{
|
|
|
|
window->tile_monitor_number = window->monitor->number;
|
|
|
|
window->tile_mode = mode;
|
|
|
|
/* Maximization constraints beat tiling constraints, so if the window
|
|
|
|
* is maximized, tiling won't have any effect unless we unmaximize it
|
|
|
|
* horizontally first; rather than calling meta_window_unmaximize(),
|
|
|
|
* we just set the flag and rely on meta_window_tile() syncing it to
|
|
|
|
* save an additional roundtrip.
|
2011-12-13 14:42:39 +00:00
|
|
|
*/
|
2011-11-15 16:29:56 +00:00
|
|
|
window->maximized_horizontally = FALSE;
|
|
|
|
meta_window_tile (window);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2002-01-11 03:31:14 +00:00
|
|
|
static void
|
2013-10-03 22:03:53 +00:00
|
|
|
handle_toggle_maximized (MetaDisplay *display,
|
|
|
|
MetaScreen *screen,
|
|
|
|
MetaWindow *window,
|
|
|
|
ClutterKeyEvent *event,
|
|
|
|
MetaKeyBinding *binding,
|
|
|
|
gpointer dummy)
|
2002-04-28 04:52:26 +00:00
|
|
|
{
|
2008-11-22 19:02:54 +00:00
|
|
|
if (META_WINDOW_MAXIMIZED (window))
|
2014-03-13 22:32:20 +00:00
|
|
|
meta_window_unmaximize (window, META_MAXIMIZE_BOTH);
|
2008-11-22 19:02:54 +00:00
|
|
|
else if (window->has_maximize_func)
|
2014-03-13 22:32:20 +00:00
|
|
|
meta_window_maximize (window, META_MAXIMIZE_BOTH);
|
2002-04-28 04:52:26 +00:00
|
|
|
}
|
|
|
|
|
2002-08-21 06:47:16 +00:00
|
|
|
static void
|
2013-10-03 22:03:53 +00:00
|
|
|
handle_maximize (MetaDisplay *display,
|
|
|
|
MetaScreen *screen,
|
|
|
|
MetaWindow *window,
|
|
|
|
ClutterKeyEvent *event,
|
|
|
|
MetaKeyBinding *binding,
|
|
|
|
gpointer dummy)
|
2002-08-21 06:47:16 +00:00
|
|
|
{
|
2008-11-22 19:02:54 +00:00
|
|
|
if (window->has_maximize_func)
|
2014-03-13 22:32:20 +00:00
|
|
|
meta_window_maximize (window, META_MAXIMIZE_BOTH);
|
2002-08-21 06:47:16 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2013-10-03 22:03:53 +00:00
|
|
|
handle_unmaximize (MetaDisplay *display,
|
|
|
|
MetaScreen *screen,
|
|
|
|
MetaWindow *window,
|
|
|
|
ClutterKeyEvent *event,
|
|
|
|
MetaKeyBinding *binding,
|
|
|
|
gpointer dummy)
|
2002-08-21 06:47:16 +00:00
|
|
|
{
|
2008-11-22 19:02:54 +00:00
|
|
|
if (window->maximized_vertically || window->maximized_horizontally)
|
2014-03-13 22:32:20 +00:00
|
|
|
meta_window_unmaximize (window, META_MAXIMIZE_BOTH);
|
2002-08-21 06:47:16 +00:00
|
|
|
}
|
|
|
|
|
2002-04-28 04:52:26 +00:00
|
|
|
static void
|
2013-10-03 22:03:53 +00:00
|
|
|
handle_toggle_shaded (MetaDisplay *display,
|
|
|
|
MetaScreen *screen,
|
|
|
|
MetaWindow *window,
|
|
|
|
ClutterKeyEvent *event,
|
|
|
|
MetaKeyBinding *binding,
|
|
|
|
gpointer dummy)
|
2002-04-28 04:52:26 +00:00
|
|
|
{
|
2008-11-22 19:02:54 +00:00
|
|
|
if (window->shaded)
|
2012-11-15 21:35:42 +00:00
|
|
|
meta_window_unshade (window, event->time);
|
2008-11-22 19:02:54 +00:00
|
|
|
else if (window->has_shade_func)
|
2012-11-15 21:35:42 +00:00
|
|
|
meta_window_shade (window, event->time);
|
2002-04-28 04:52:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2013-10-03 22:03:53 +00:00
|
|
|
handle_close (MetaDisplay *display,
|
|
|
|
MetaScreen *screen,
|
|
|
|
MetaWindow *window,
|
|
|
|
ClutterKeyEvent *event,
|
|
|
|
MetaKeyBinding *binding,
|
|
|
|
gpointer dummy)
|
2002-04-28 04:52:26 +00:00
|
|
|
{
|
2008-11-22 19:02:54 +00:00
|
|
|
if (window->has_close_func)
|
2012-11-15 21:35:42 +00:00
|
|
|
meta_window_delete (window, event->time);
|
2002-04-28 04:52:26 +00:00
|
|
|
}
|
|
|
|
|
2002-05-25 02:30:00 +00:00
|
|
|
static void
|
2013-10-03 22:03:53 +00:00
|
|
|
handle_minimize (MetaDisplay *display,
|
|
|
|
MetaScreen *screen,
|
|
|
|
MetaWindow *window,
|
|
|
|
ClutterKeyEvent *event,
|
|
|
|
MetaKeyBinding *binding,
|
|
|
|
gpointer dummy)
|
2002-05-25 02:30:00 +00:00
|
|
|
{
|
2008-11-22 19:02:54 +00:00
|
|
|
if (window->has_minimize_func)
|
|
|
|
meta_window_minimize (window);
|
2002-05-25 02:30:00 +00:00
|
|
|
}
|
|
|
|
|
2002-04-28 04:52:26 +00:00
|
|
|
static void
|
2013-10-03 22:03:53 +00:00
|
|
|
handle_begin_move (MetaDisplay *display,
|
|
|
|
MetaScreen *screen,
|
|
|
|
MetaWindow *window,
|
|
|
|
ClutterKeyEvent *event,
|
|
|
|
MetaKeyBinding *binding,
|
|
|
|
gpointer dummy)
|
2002-04-28 04:52:26 +00:00
|
|
|
{
|
2008-11-22 19:02:54 +00:00
|
|
|
if (window->has_move_func)
|
2002-04-28 04:52:26 +00:00
|
|
|
{
|
Patch to provide extra cues to the user when using window menu move and
2002-08-08 Craig Black <blackc@speakeasy.net>
Patch to provide extra cues to the user when using
window menu move and resize, #85724.
* src/common.h: add new cursors
* src/display.c: (grab_op_is_mouse)
(meta_display_create_x_cursor), (xcursor_for_op),
(meta_display_set_grab_op_cursor),
(meta_display_begin_grab_op):
The keyboard move and resize grab ops now also use the mouse.
Allow the grab cursor to be changed during the grab op.
Hold onto the initial grab position in case of reset.
* src/display.h: save the initial grab position
* src/keybindings.c: (process_keyboard_move_grab),
(process_keyboard_resize_grab), (handle_begin_move),
(handle_begin_resize):
The keyboard move and resize grab ops now also use the mouse.
* src/window.c: (meta_window_client_message), (menu_callback),
(update_move), (update_resize),
(meta_window_handle_mouse_grab_op_event), (warp_pointer),
(meta_window_warp_pointer), (meta_window_begin_grab_op),
(meta_window_update_resize_grab_op):
When moving or resizing a window use the last grab position
in computing change increment.
Provide support for warping the mouse pointer.
* src/window.h: new warp pointer and grab op helper functions
2002-08-09 04:27:23 +00:00
|
|
|
meta_window_begin_grab_op (window,
|
|
|
|
META_GRAB_OP_KEYBOARD_MOVING,
|
2006-10-13 00:28:34 +00:00
|
|
|
FALSE,
|
2012-11-15 21:35:42 +00:00
|
|
|
event->time);
|
2002-04-28 04:52:26 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2013-10-03 22:03:53 +00:00
|
|
|
handle_begin_resize (MetaDisplay *display,
|
|
|
|
MetaScreen *screen,
|
|
|
|
MetaWindow *window,
|
|
|
|
ClutterKeyEvent *event,
|
|
|
|
MetaKeyBinding *binding,
|
|
|
|
gpointer dummy)
|
2002-04-28 04:52:26 +00:00
|
|
|
{
|
2008-11-22 19:02:54 +00:00
|
|
|
if (window->has_resize_func)
|
2002-07-10 03:51:01 +00:00
|
|
|
{
|
Patch to provide extra cues to the user when using window menu move and
2002-08-08 Craig Black <blackc@speakeasy.net>
Patch to provide extra cues to the user when using
window menu move and resize, #85724.
* src/common.h: add new cursors
* src/display.c: (grab_op_is_mouse)
(meta_display_create_x_cursor), (xcursor_for_op),
(meta_display_set_grab_op_cursor),
(meta_display_begin_grab_op):
The keyboard move and resize grab ops now also use the mouse.
Allow the grab cursor to be changed during the grab op.
Hold onto the initial grab position in case of reset.
* src/display.h: save the initial grab position
* src/keybindings.c: (process_keyboard_move_grab),
(process_keyboard_resize_grab), (handle_begin_move),
(handle_begin_resize):
The keyboard move and resize grab ops now also use the mouse.
* src/window.c: (meta_window_client_message), (menu_callback),
(update_move), (update_resize),
(meta_window_handle_mouse_grab_op_event), (warp_pointer),
(meta_window_warp_pointer), (meta_window_begin_grab_op),
(meta_window_update_resize_grab_op):
When moving or resizing a window use the last grab position
in computing change increment.
Provide support for warping the mouse pointer.
* src/window.h: new warp pointer and grab op helper functions
2002-08-09 04:27:23 +00:00
|
|
|
meta_window_begin_grab_op (window,
|
|
|
|
META_GRAB_OP_KEYBOARD_RESIZING_UNKNOWN,
|
2006-10-13 00:28:34 +00:00
|
|
|
FALSE,
|
2012-11-15 21:35:42 +00:00
|
|
|
event->time);
|
2002-07-10 03:51:01 +00:00
|
|
|
}
|
2002-04-28 04:52:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2013-10-03 22:03:53 +00:00
|
|
|
handle_toggle_on_all_workspaces (MetaDisplay *display,
|
|
|
|
MetaScreen *screen,
|
|
|
|
MetaWindow *window,
|
|
|
|
ClutterKeyEvent *event,
|
|
|
|
MetaKeyBinding *binding,
|
|
|
|
gpointer dummy)
|
2002-04-28 04:52:26 +00:00
|
|
|
{
|
2011-02-28 10:41:23 +00:00
|
|
|
if (window->on_all_workspaces_requested)
|
2008-11-22 19:02:54 +00:00
|
|
|
meta_window_unstick (window);
|
|
|
|
else
|
|
|
|
meta_window_stick (window);
|
2002-04-28 04:52:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2013-10-03 22:03:53 +00:00
|
|
|
handle_move_to_workspace (MetaDisplay *display,
|
|
|
|
MetaScreen *screen,
|
|
|
|
MetaWindow *window,
|
|
|
|
ClutterKeyEvent *event,
|
|
|
|
MetaKeyBinding *binding,
|
|
|
|
gpointer dummy)
|
2002-04-28 04:52:26 +00:00
|
|
|
{
|
2008-10-06 00:24:07 +00:00
|
|
|
gint which = binding->handler->data;
|
|
|
|
gboolean flip = (which < 0);
|
2002-04-28 04:52:26 +00:00
|
|
|
MetaWorkspace *workspace;
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2008-09-06 22:01:56 +00:00
|
|
|
/* If which is zero or positive, it's a workspace number, and the window
|
|
|
|
* should move to the workspace with that number.
|
|
|
|
*
|
|
|
|
* However, if it's negative, it's a direction with respect to the current
|
|
|
|
* position; it's expressed as a member of the MetaMotionDirection enum,
|
|
|
|
* all of whose members are negative. Such a change is called a flip.
|
|
|
|
*/
|
2002-04-28 04:52:26 +00:00
|
|
|
|
2008-11-22 19:02:54 +00:00
|
|
|
if (window->always_sticky)
|
2002-05-26 15:54:38 +00:00
|
|
|
return;
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2002-04-28 04:52:26 +00:00
|
|
|
workspace = NULL;
|
2008-09-06 22:01:56 +00:00
|
|
|
if (flip)
|
2012-12-13 01:50:43 +00:00
|
|
|
{
|
2002-04-28 04:52:26 +00:00
|
|
|
workspace = meta_workspace_get_neighbor (screen->active_workspace,
|
|
|
|
which);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2002-10-16 20:12:24 +00:00
|
|
|
workspace = meta_screen_get_workspace_by_index (screen, which);
|
2002-04-28 04:52:26 +00:00
|
|
|
}
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2002-04-28 04:52:26 +00:00
|
|
|
if (workspace)
|
|
|
|
{
|
2002-05-25 02:33:55 +00:00
|
|
|
/* Activate second, so the window is never unmapped */
|
2002-04-28 04:52:26 +00:00
|
|
|
meta_window_change_workspace (window, workspace);
|
2003-05-17 00:00:55 +00:00
|
|
|
if (flip)
|
2005-02-22 02:11:25 +00:00
|
|
|
{
|
|
|
|
meta_topic (META_DEBUG_FOCUS,
|
|
|
|
"Resetting mouse_mode to FALSE due to "
|
2008-09-06 22:01:56 +00:00
|
|
|
"handle_move_to_workspace() call with flip set.\n");
|
2012-04-14 13:12:48 +00:00
|
|
|
meta_display_clear_mouse_mode (workspace->screen->display);
|
2005-02-22 02:11:25 +00:00
|
|
|
meta_workspace_activate_with_focus (workspace,
|
|
|
|
window,
|
2012-11-15 21:35:42 +00:00
|
|
|
event->time);
|
2005-02-22 02:11:25 +00:00
|
|
|
}
|
2002-04-28 04:52:26 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* We could offer to create it I suppose */
|
2012-12-13 01:50:43 +00:00
|
|
|
}
|
2002-04-28 04:52:26 +00:00
|
|
|
}
|
|
|
|
|
2013-12-11 16:57:45 +00:00
|
|
|
static void
|
|
|
|
handle_move_to_monitor (MetaDisplay *display,
|
|
|
|
MetaScreen *screen,
|
|
|
|
MetaWindow *window,
|
|
|
|
ClutterKeyEvent *event,
|
|
|
|
MetaKeyBinding *binding,
|
|
|
|
gpointer dummy)
|
|
|
|
{
|
|
|
|
gint which = binding->handler->data;
|
|
|
|
const MetaMonitorInfo *current, *new;
|
|
|
|
|
|
|
|
current = meta_screen_get_monitor_for_window (screen, window);
|
|
|
|
new = meta_screen_get_monitor_neighbor (screen, current->number, which);
|
|
|
|
|
|
|
|
if (new == NULL)
|
|
|
|
return;
|
|
|
|
|
|
|
|
meta_window_move_to_monitor (window, new->number);
|
|
|
|
}
|
|
|
|
|
2012-12-13 01:50:43 +00:00
|
|
|
static void
|
2013-10-03 22:03:53 +00:00
|
|
|
handle_raise_or_lower (MetaDisplay *display,
|
|
|
|
MetaScreen *screen,
|
|
|
|
MetaWindow *window,
|
|
|
|
ClutterKeyEvent *event,
|
|
|
|
MetaKeyBinding *binding,
|
|
|
|
gpointer dummy)
|
2002-05-29 03:11:24 +00:00
|
|
|
{
|
|
|
|
/* Get window at pointer */
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2008-11-22 19:02:54 +00:00
|
|
|
MetaWindow *above = NULL;
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2008-11-22 19:02:54 +00:00
|
|
|
/* Check if top */
|
|
|
|
if (meta_stack_get_top (window->screen->stack) == window)
|
|
|
|
{
|
|
|
|
meta_window_lower (window);
|
|
|
|
return;
|
|
|
|
}
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2008-11-22 19:02:54 +00:00
|
|
|
/* else check if windows in same layer are intersecting it */
|
2012-12-13 01:50:43 +00:00
|
|
|
|
|
|
|
above = meta_stack_get_above (window->screen->stack, window, TRUE);
|
2002-05-29 03:11:24 +00:00
|
|
|
|
2008-11-22 19:02:54 +00:00
|
|
|
while (above)
|
|
|
|
{
|
|
|
|
MetaRectangle tmp, win_rect, above_rect;
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2008-11-22 19:02:54 +00:00
|
|
|
if (above->mapped)
|
|
|
|
{
|
2013-11-19 17:24:45 +00:00
|
|
|
meta_window_get_frame_rect (window, &win_rect);
|
|
|
|
meta_window_get_frame_rect (above, &above_rect);
|
2012-12-13 01:50:43 +00:00
|
|
|
|
2008-11-22 19:02:54 +00:00
|
|
|
/* Check if obscured */
|
|
|
|
if (meta_rectangle_intersect (&win_rect, &above_rect, &tmp))
|
2002-10-20 15:22:40 +00:00
|
|
|
{
|
2008-11-22 19:02:54 +00:00
|
|
|
meta_window_raise (window);
|
|
|
|
return;
|
2002-10-20 15:22:40 +00:00
|
|
|
}
|
2008-11-22 19:02:54 +00:00
|
|
|
}
|
2012-12-13 01:50:43 +00:00
|
|
|
|
|
|
|
above = meta_stack_get_above (window->screen->stack, above, TRUE);
|
2002-05-29 03:11:24 +00:00
|
|
|
}
|
2008-11-22 19:02:54 +00:00
|
|
|
|
|
|
|
/* window is not obscured */
|
|
|
|
meta_window_lower (window);
|
2002-05-29 03:11:24 +00:00
|
|
|
}
|
|
|
|
|
2002-08-15 05:14:49 +00:00
|
|
|
static void
|
2013-10-03 22:03:53 +00:00
|
|
|
handle_raise (MetaDisplay *display,
|
|
|
|
MetaScreen *screen,
|
|
|
|
MetaWindow *window,
|
|
|
|
ClutterKeyEvent *event,
|
|
|
|
MetaKeyBinding *binding,
|
|
|
|
gpointer dummy)
|
2002-08-15 05:14:49 +00:00
|
|
|
{
|
2008-11-22 19:02:54 +00:00
|
|
|
meta_window_raise (window);
|
2002-08-15 05:14:49 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2013-10-03 22:03:53 +00:00
|
|
|
handle_lower (MetaDisplay *display,
|
|
|
|
MetaScreen *screen,
|
|
|
|
MetaWindow *window,
|
|
|
|
ClutterKeyEvent *event,
|
|
|
|
MetaKeyBinding *binding,
|
|
|
|
gpointer dummy)
|
2002-08-15 05:14:49 +00:00
|
|
|
{
|
2008-11-22 19:02:54 +00:00
|
|
|
meta_window_lower (window);
|
2002-08-15 05:14:49 +00:00
|
|
|
}
|
|
|
|
|
2002-04-28 04:52:26 +00:00
|
|
|
static void
|
2013-10-03 22:03:53 +00:00
|
|
|
handle_set_spew_mark (MetaDisplay *display,
|
|
|
|
MetaScreen *screen,
|
|
|
|
MetaWindow *window,
|
|
|
|
ClutterKeyEvent *event,
|
|
|
|
MetaKeyBinding *binding,
|
|
|
|
gpointer dummy)
|
2002-01-11 03:31:14 +00:00
|
|
|
{
|
|
|
|
meta_verbose ("-- MARK MARK MARK MARK --\n");
|
|
|
|
}
|
|
|
|
|
2013-07-16 12:37:49 +00:00
|
|
|
static void
|
2013-10-03 22:03:53 +00:00
|
|
|
handle_switch_vt (MetaDisplay *display,
|
|
|
|
MetaScreen *screen,
|
|
|
|
MetaWindow *window,
|
|
|
|
ClutterKeyEvent *event,
|
|
|
|
MetaKeyBinding *binding,
|
|
|
|
gpointer dummy)
|
2013-07-16 12:37:49 +00:00
|
|
|
{
|
2014-02-02 00:22:56 +00:00
|
|
|
gint vt = binding->handler->data;
|
2014-02-02 00:34:24 +00:00
|
|
|
GError *error = NULL;
|
2014-01-16 18:40:41 +00:00
|
|
|
|
2014-04-01 03:19:13 +00:00
|
|
|
if (!meta_activate_vt (vt, &error))
|
2014-02-02 00:22:56 +00:00
|
|
|
{
|
2014-02-02 00:34:24 +00:00
|
|
|
g_warning ("Failed to switch VT: %s", error->message);
|
|
|
|
g_error_free (error);
|
2014-02-02 00:22:56 +00:00
|
|
|
}
|
2013-07-16 12:37:49 +00:00
|
|
|
}
|
|
|
|
|
2012-09-01 20:09:39 +00:00
|
|
|
/**
|
|
|
|
* meta_keybindings_set_custom_handler:
|
|
|
|
* @name: The name of the keybinding to set
|
|
|
|
* @handler: (allow-none): The new handler function
|
|
|
|
* @user_data: User data to pass to the callback
|
|
|
|
* @free_data: Will be called when this handler is overridden.
|
|
|
|
*
|
|
|
|
* Allows users to register a custom handler for a
|
|
|
|
* builtin key binding.
|
|
|
|
*
|
|
|
|
* Returns: %TRUE if the binding known as @name was found,
|
|
|
|
* %FALSE otherwise.
|
|
|
|
*/
|
2009-01-29 15:07:57 +00:00
|
|
|
gboolean
|
|
|
|
meta_keybindings_set_custom_handler (const gchar *name,
|
|
|
|
MetaKeyHandlerFunc handler,
|
|
|
|
gpointer user_data,
|
2009-03-25 14:50:40 +00:00
|
|
|
GDestroyNotify free_data)
|
2009-01-29 15:07:57 +00:00
|
|
|
{
|
2011-10-28 01:05:43 +00:00
|
|
|
MetaKeyHandler *key_handler = HANDLER (name);
|
2009-01-29 15:07:57 +00:00
|
|
|
|
|
|
|
if (!key_handler)
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
if (key_handler->user_data_free_func && key_handler->user_data)
|
2009-01-29 15:29:43 +00:00
|
|
|
key_handler->user_data_free_func (key_handler->user_data);
|
2009-01-29 15:07:57 +00:00
|
|
|
|
|
|
|
key_handler->func = handler;
|
|
|
|
key_handler->user_data = user_data;
|
|
|
|
key_handler->user_data_free_func = free_data;
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
2011-10-28 01:05:43 +00:00
|
|
|
static void
|
|
|
|
init_builtin_key_bindings (MetaDisplay *display)
|
|
|
|
{
|
2012-12-13 01:50:43 +00:00
|
|
|
#define REVERSES_AND_REVERSED (META_KEY_BINDING_REVERSES | \
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_IS_REVERSED)
|
2012-03-27 14:42:42 +00:00
|
|
|
GSettings *common_keybindings = g_settings_new (SCHEMA_COMMON_KEYBINDINGS);
|
|
|
|
GSettings *mutter_keybindings = g_settings_new (SCHEMA_MUTTER_KEYBINDINGS);
|
2013-07-16 12:37:49 +00:00
|
|
|
GSettings *mutter_wayland_keybindings = g_settings_new (SCHEMA_MUTTER_WAYLAND_KEYBINDINGS);
|
2011-10-28 01:05:43 +00:00
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"switch-to-workspace-1",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_NONE,
|
|
|
|
META_KEYBINDING_ACTION_WORKSPACE_1,
|
|
|
|
handle_switch_to_workspace, 0);
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"switch-to-workspace-2",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_NONE,
|
|
|
|
META_KEYBINDING_ACTION_WORKSPACE_2,
|
|
|
|
handle_switch_to_workspace, 1);
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"switch-to-workspace-3",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_NONE,
|
|
|
|
META_KEYBINDING_ACTION_WORKSPACE_3,
|
|
|
|
handle_switch_to_workspace, 2);
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"switch-to-workspace-4",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_NONE,
|
|
|
|
META_KEYBINDING_ACTION_WORKSPACE_4,
|
|
|
|
handle_switch_to_workspace, 3);
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"switch-to-workspace-5",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_NONE,
|
|
|
|
META_KEYBINDING_ACTION_WORKSPACE_5,
|
|
|
|
handle_switch_to_workspace, 4);
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"switch-to-workspace-6",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_NONE,
|
|
|
|
META_KEYBINDING_ACTION_WORKSPACE_6,
|
|
|
|
handle_switch_to_workspace, 5);
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"switch-to-workspace-7",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_NONE,
|
|
|
|
META_KEYBINDING_ACTION_WORKSPACE_7,
|
|
|
|
handle_switch_to_workspace, 6);
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"switch-to-workspace-8",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_NONE,
|
|
|
|
META_KEYBINDING_ACTION_WORKSPACE_8,
|
|
|
|
handle_switch_to_workspace, 7);
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"switch-to-workspace-9",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_NONE,
|
|
|
|
META_KEYBINDING_ACTION_WORKSPACE_9,
|
|
|
|
handle_switch_to_workspace, 8);
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"switch-to-workspace-10",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_NONE,
|
|
|
|
META_KEYBINDING_ACTION_WORKSPACE_10,
|
|
|
|
handle_switch_to_workspace, 9);
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"switch-to-workspace-11",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_NONE,
|
|
|
|
META_KEYBINDING_ACTION_WORKSPACE_11,
|
|
|
|
handle_switch_to_workspace, 10);
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"switch-to-workspace-12",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_NONE,
|
|
|
|
META_KEYBINDING_ACTION_WORKSPACE_12,
|
|
|
|
handle_switch_to_workspace, 11);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"switch-to-workspace-left",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_NONE,
|
|
|
|
META_KEYBINDING_ACTION_WORKSPACE_LEFT,
|
2013-04-23 16:52:25 +00:00
|
|
|
NULL, 0);
|
2011-10-28 01:05:43 +00:00
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"switch-to-workspace-right",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_NONE,
|
|
|
|
META_KEYBINDING_ACTION_WORKSPACE_RIGHT,
|
2013-04-23 16:52:25 +00:00
|
|
|
NULL, 0);
|
2011-10-28 01:05:43 +00:00
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"switch-to-workspace-up",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_NONE,
|
|
|
|
META_KEYBINDING_ACTION_WORKSPACE_UP,
|
2013-04-23 16:52:25 +00:00
|
|
|
NULL, 0);
|
2011-10-28 01:05:43 +00:00
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"switch-to-workspace-down",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_NONE,
|
|
|
|
META_KEYBINDING_ACTION_WORKSPACE_DOWN,
|
2013-04-23 16:52:25 +00:00
|
|
|
NULL, 0);
|
2011-10-28 01:05:43 +00:00
|
|
|
|
|
|
|
|
|
|
|
/* The ones which have inverses. These can't be bound to any keystroke
|
|
|
|
* containing Shift because Shift will invert their "backward" state.
|
|
|
|
*
|
|
|
|
* TODO: "NORMAL" and "DOCKS" should be renamed to the same name as their
|
|
|
|
* action, for obviousness.
|
|
|
|
*
|
|
|
|
* TODO: handle_switch and handle_cycle should probably really be the
|
|
|
|
* same function checking a bit in the parameter for difference.
|
|
|
|
*/
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"switch-group",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_REVERSES,
|
|
|
|
META_KEYBINDING_ACTION_SWITCH_GROUP,
|
|
|
|
handle_switch, META_TAB_LIST_GROUP);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"switch-group-backward",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
REVERSES_AND_REVERSED,
|
|
|
|
META_KEYBINDING_ACTION_SWITCH_GROUP_BACKWARD,
|
|
|
|
handle_switch, META_TAB_LIST_GROUP);
|
|
|
|
|
2012-11-23 02:48:14 +00:00
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"switch-applications",
|
|
|
|
common_keybindings,
|
|
|
|
META_KEY_BINDING_REVERSES,
|
|
|
|
META_KEYBINDING_ACTION_SWITCH_APPLICATIONS,
|
|
|
|
handle_switch, META_TAB_LIST_NORMAL);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"switch-applications-backward",
|
|
|
|
common_keybindings,
|
|
|
|
REVERSES_AND_REVERSED,
|
|
|
|
META_KEYBINDING_ACTION_SWITCH_APPLICATIONS_BACKWARD,
|
|
|
|
handle_switch, META_TAB_LIST_NORMAL);
|
|
|
|
|
2011-10-28 01:05:43 +00:00
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"switch-windows",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_REVERSES,
|
|
|
|
META_KEYBINDING_ACTION_SWITCH_WINDOWS,
|
|
|
|
handle_switch, META_TAB_LIST_NORMAL);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"switch-windows-backward",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
REVERSES_AND_REVERSED,
|
|
|
|
META_KEYBINDING_ACTION_SWITCH_WINDOWS_BACKWARD,
|
|
|
|
handle_switch, META_TAB_LIST_NORMAL);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"switch-panels",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_REVERSES,
|
|
|
|
META_KEYBINDING_ACTION_SWITCH_PANELS,
|
|
|
|
handle_switch, META_TAB_LIST_DOCKS);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"switch-panels-backward",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
REVERSES_AND_REVERSED,
|
|
|
|
META_KEYBINDING_ACTION_SWITCH_PANELS_BACKWARD,
|
|
|
|
handle_switch, META_TAB_LIST_DOCKS);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"cycle-group",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_REVERSES,
|
|
|
|
META_KEYBINDING_ACTION_CYCLE_GROUP,
|
|
|
|
handle_cycle, META_TAB_LIST_GROUP);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"cycle-group-backward",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
REVERSES_AND_REVERSED,
|
|
|
|
META_KEYBINDING_ACTION_CYCLE_GROUP_BACKWARD,
|
|
|
|
handle_cycle, META_TAB_LIST_GROUP);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"cycle-windows",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_REVERSES,
|
|
|
|
META_KEYBINDING_ACTION_CYCLE_WINDOWS,
|
|
|
|
handle_cycle, META_TAB_LIST_NORMAL);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"cycle-windows-backward",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
REVERSES_AND_REVERSED,
|
|
|
|
META_KEYBINDING_ACTION_CYCLE_WINDOWS_BACKWARD,
|
|
|
|
handle_cycle, META_TAB_LIST_NORMAL);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"cycle-panels",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_REVERSES,
|
|
|
|
META_KEYBINDING_ACTION_CYCLE_PANELS,
|
|
|
|
handle_cycle, META_TAB_LIST_DOCKS);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"cycle-panels-backward",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
REVERSES_AND_REVERSED,
|
|
|
|
META_KEYBINDING_ACTION_CYCLE_PANELS_BACKWARD,
|
|
|
|
handle_cycle, META_TAB_LIST_DOCKS);
|
|
|
|
|
2012-12-13 01:50:43 +00:00
|
|
|
/***********************************/
|
2011-10-28 01:05:43 +00:00
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"show-desktop",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_NONE,
|
|
|
|
META_KEYBINDING_ACTION_SHOW_DESKTOP,
|
|
|
|
handle_show_desktop, 0);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"panel-main-menu",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_NONE,
|
|
|
|
META_KEYBINDING_ACTION_PANEL_MAIN_MENU,
|
|
|
|
handle_panel, META_KEYBINDING_ACTION_PANEL_MAIN_MENU);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"panel-run-dialog",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_NONE,
|
|
|
|
META_KEYBINDING_ACTION_PANEL_RUN_DIALOG,
|
|
|
|
handle_panel, META_KEYBINDING_ACTION_PANEL_RUN_DIALOG);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"set-spew-mark",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_NONE,
|
|
|
|
META_KEYBINDING_ACTION_SET_SPEW_MARK,
|
|
|
|
handle_set_spew_mark, 0);
|
|
|
|
|
2013-07-16 12:37:49 +00:00
|
|
|
if (meta_is_wayland_compositor ())
|
|
|
|
{
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"switch-to-session-1",
|
|
|
|
mutter_wayland_keybindings,
|
|
|
|
META_KEY_BINDING_NONE,
|
|
|
|
META_KEYBINDING_ACTION_NONE,
|
|
|
|
handle_switch_vt, 1);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"switch-to-session-2",
|
|
|
|
mutter_wayland_keybindings,
|
|
|
|
META_KEY_BINDING_NONE,
|
|
|
|
META_KEYBINDING_ACTION_NONE,
|
|
|
|
handle_switch_vt, 2);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"switch-to-session-3",
|
|
|
|
mutter_wayland_keybindings,
|
|
|
|
META_KEY_BINDING_NONE,
|
|
|
|
META_KEYBINDING_ACTION_NONE,
|
|
|
|
handle_switch_vt, 3);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"switch-to-session-4",
|
|
|
|
mutter_wayland_keybindings,
|
|
|
|
META_KEY_BINDING_NONE,
|
|
|
|
META_KEYBINDING_ACTION_NONE,
|
|
|
|
handle_switch_vt, 4);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"switch-to-session-5",
|
|
|
|
mutter_wayland_keybindings,
|
|
|
|
META_KEY_BINDING_NONE,
|
|
|
|
META_KEYBINDING_ACTION_NONE,
|
|
|
|
handle_switch_vt, 5);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"switch-to-session-6",
|
|
|
|
mutter_wayland_keybindings,
|
|
|
|
META_KEY_BINDING_NONE,
|
|
|
|
META_KEYBINDING_ACTION_NONE,
|
|
|
|
handle_switch_vt, 6);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"switch-to-session-7",
|
|
|
|
mutter_wayland_keybindings,
|
|
|
|
META_KEY_BINDING_NONE,
|
|
|
|
META_KEYBINDING_ACTION_NONE,
|
|
|
|
handle_switch_vt, 7);
|
|
|
|
}
|
|
|
|
|
2011-10-28 01:05:43 +00:00
|
|
|
#undef REVERSES_AND_REVERSED
|
|
|
|
|
2012-12-13 01:50:43 +00:00
|
|
|
/************************ PER WINDOW BINDINGS ************************/
|
2011-10-28 01:05:43 +00:00
|
|
|
|
2012-12-13 01:50:43 +00:00
|
|
|
/* These take a window as an extra parameter; they have no effect
|
|
|
|
* if no window is active.
|
|
|
|
*/
|
2011-10-28 01:05:43 +00:00
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"activate-window-menu",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_PER_WINDOW,
|
|
|
|
META_KEYBINDING_ACTION_ACTIVATE_WINDOW_MENU,
|
|
|
|
handle_activate_window_menu, 0);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"toggle-fullscreen",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_PER_WINDOW,
|
|
|
|
META_KEYBINDING_ACTION_TOGGLE_FULLSCREEN,
|
|
|
|
handle_toggle_fullscreen, 0);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"toggle-maximized",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_PER_WINDOW,
|
|
|
|
META_KEYBINDING_ACTION_TOGGLE_MAXIMIZED,
|
|
|
|
handle_toggle_maximized, 0);
|
|
|
|
|
2011-11-15 16:29:56 +00:00
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"toggle-tiled-left",
|
2012-03-27 14:42:42 +00:00
|
|
|
mutter_keybindings,
|
2011-11-15 16:29:56 +00:00
|
|
|
META_KEY_BINDING_PER_WINDOW,
|
|
|
|
META_KEYBINDING_ACTION_TOGGLE_TILED_LEFT,
|
|
|
|
handle_toggle_tiled, META_TILE_LEFT);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"toggle-tiled-right",
|
2012-03-27 14:42:42 +00:00
|
|
|
mutter_keybindings,
|
2011-11-15 16:29:56 +00:00
|
|
|
META_KEY_BINDING_PER_WINDOW,
|
|
|
|
META_KEYBINDING_ACTION_TOGGLE_TILED_RIGHT,
|
|
|
|
handle_toggle_tiled, META_TILE_RIGHT);
|
|
|
|
|
2011-10-28 01:05:43 +00:00
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"toggle-above",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_PER_WINDOW,
|
|
|
|
META_KEYBINDING_ACTION_TOGGLE_ABOVE,
|
|
|
|
handle_toggle_above, 0);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"maximize",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_PER_WINDOW,
|
|
|
|
META_KEYBINDING_ACTION_MAXIMIZE,
|
|
|
|
handle_maximize, 0);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"unmaximize",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_PER_WINDOW,
|
|
|
|
META_KEYBINDING_ACTION_UNMAXIMIZE,
|
|
|
|
handle_unmaximize, 0);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"toggle-shaded",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_PER_WINDOW,
|
|
|
|
META_KEYBINDING_ACTION_TOGGLE_SHADED,
|
|
|
|
handle_toggle_shaded, 0);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"minimize",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_PER_WINDOW,
|
|
|
|
META_KEYBINDING_ACTION_MINIMIZE,
|
|
|
|
handle_minimize, 0);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"close",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_PER_WINDOW,
|
|
|
|
META_KEYBINDING_ACTION_CLOSE,
|
|
|
|
handle_close, 0);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"begin-move",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_PER_WINDOW,
|
|
|
|
META_KEYBINDING_ACTION_BEGIN_MOVE,
|
|
|
|
handle_begin_move, 0);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"begin-resize",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_PER_WINDOW,
|
|
|
|
META_KEYBINDING_ACTION_BEGIN_RESIZE,
|
|
|
|
handle_begin_resize, 0);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"toggle-on-all-workspaces",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_PER_WINDOW,
|
|
|
|
META_KEYBINDING_ACTION_TOGGLE_ON_ALL_WORKSPACES,
|
|
|
|
handle_toggle_on_all_workspaces, 0);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"move-to-workspace-1",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_PER_WINDOW,
|
|
|
|
META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_1,
|
|
|
|
handle_move_to_workspace, 0);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"move-to-workspace-2",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_PER_WINDOW,
|
|
|
|
META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_2,
|
|
|
|
handle_move_to_workspace, 1);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"move-to-workspace-3",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_PER_WINDOW,
|
|
|
|
META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_3,
|
|
|
|
handle_move_to_workspace, 2);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"move-to-workspace-4",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_PER_WINDOW,
|
|
|
|
META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_4,
|
|
|
|
handle_move_to_workspace, 3);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"move-to-workspace-5",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_PER_WINDOW,
|
|
|
|
META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_5,
|
|
|
|
handle_move_to_workspace, 4);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"move-to-workspace-6",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_PER_WINDOW,
|
|
|
|
META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_6,
|
|
|
|
handle_move_to_workspace, 5);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"move-to-workspace-7",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_PER_WINDOW,
|
|
|
|
META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_7,
|
|
|
|
handle_move_to_workspace, 6);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"move-to-workspace-8",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_PER_WINDOW,
|
|
|
|
META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_8,
|
|
|
|
handle_move_to_workspace, 7);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"move-to-workspace-9",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_PER_WINDOW,
|
|
|
|
META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_9,
|
|
|
|
handle_move_to_workspace, 8);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"move-to-workspace-10",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_PER_WINDOW,
|
|
|
|
META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_10,
|
|
|
|
handle_move_to_workspace, 9);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"move-to-workspace-11",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_PER_WINDOW,
|
|
|
|
META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_11,
|
|
|
|
handle_move_to_workspace, 10);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"move-to-workspace-12",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_PER_WINDOW,
|
|
|
|
META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_12,
|
|
|
|
handle_move_to_workspace, 11);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"move-to-workspace-left",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_PER_WINDOW,
|
|
|
|
META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_LEFT,
|
|
|
|
handle_move_to_workspace, META_MOTION_LEFT);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"move-to-workspace-right",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_PER_WINDOW,
|
|
|
|
META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_RIGHT,
|
|
|
|
handle_move_to_workspace, META_MOTION_RIGHT);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"move-to-workspace-up",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_PER_WINDOW,
|
|
|
|
META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_UP,
|
|
|
|
handle_move_to_workspace, META_MOTION_UP);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"move-to-workspace-down",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_PER_WINDOW,
|
|
|
|
META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_DOWN,
|
|
|
|
handle_move_to_workspace, META_MOTION_DOWN);
|
|
|
|
|
2013-12-11 16:57:45 +00:00
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"move-to-monitor-left",
|
|
|
|
common_keybindings,
|
|
|
|
META_KEY_BINDING_PER_WINDOW,
|
|
|
|
META_KEYBINDING_ACTION_MOVE_TO_MONITOR_LEFT,
|
|
|
|
handle_move_to_monitor, META_SCREEN_LEFT);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"move-to-monitor-right",
|
|
|
|
common_keybindings,
|
|
|
|
META_KEY_BINDING_PER_WINDOW,
|
|
|
|
META_KEYBINDING_ACTION_MOVE_TO_MONITOR_RIGHT,
|
|
|
|
handle_move_to_monitor, META_SCREEN_RIGHT);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"move-to-monitor-down",
|
|
|
|
common_keybindings,
|
|
|
|
META_KEY_BINDING_PER_WINDOW,
|
|
|
|
META_KEYBINDING_ACTION_MOVE_TO_MONITOR_DOWN,
|
|
|
|
handle_move_to_monitor, META_SCREEN_DOWN);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"move-to-monitor-up",
|
|
|
|
common_keybindings,
|
|
|
|
META_KEY_BINDING_PER_WINDOW,
|
|
|
|
META_KEYBINDING_ACTION_MOVE_TO_MONITOR_UP,
|
|
|
|
handle_move_to_monitor, META_SCREEN_UP);
|
|
|
|
|
2011-10-28 01:05:43 +00:00
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"raise-or-lower",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_PER_WINDOW,
|
|
|
|
META_KEYBINDING_ACTION_RAISE_OR_LOWER,
|
|
|
|
handle_raise_or_lower, 0);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"raise",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_PER_WINDOW,
|
|
|
|
META_KEYBINDING_ACTION_RAISE,
|
|
|
|
handle_raise, 0);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"lower",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_PER_WINDOW,
|
|
|
|
META_KEYBINDING_ACTION_LOWER,
|
|
|
|
handle_lower, 0);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"maximize-vertically",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_PER_WINDOW,
|
|
|
|
META_KEYBINDING_ACTION_MAXIMIZE_VERTICALLY,
|
|
|
|
handle_maximize_vertically, 0);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"maximize-horizontally",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_PER_WINDOW,
|
|
|
|
META_KEYBINDING_ACTION_MAXIMIZE_HORIZONTALLY,
|
|
|
|
handle_maximize_horizontally, 0);
|
|
|
|
|
2013-07-24 18:55:23 +00:00
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"always-on-top",
|
|
|
|
common_keybindings,
|
|
|
|
META_KEY_BINDING_PER_WINDOW,
|
|
|
|
META_KEYBINDING_ACTION_ALWAYS_ON_TOP,
|
|
|
|
handle_always_on_top, 0);
|
|
|
|
|
2011-10-28 01:05:43 +00:00
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"move-to-corner-nw",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_PER_WINDOW,
|
|
|
|
META_KEYBINDING_ACTION_MOVE_TO_CORNER_NW,
|
|
|
|
handle_move_to_corner_nw, 0);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"move-to-corner-ne",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_PER_WINDOW,
|
|
|
|
META_KEYBINDING_ACTION_MOVE_TO_CORNER_NE,
|
|
|
|
handle_move_to_corner_ne, 0);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"move-to-corner-sw",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_PER_WINDOW,
|
|
|
|
META_KEYBINDING_ACTION_MOVE_TO_CORNER_SW,
|
|
|
|
handle_move_to_corner_sw, 0);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"move-to-corner-se",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_PER_WINDOW,
|
|
|
|
META_KEYBINDING_ACTION_MOVE_TO_CORNER_SE,
|
|
|
|
handle_move_to_corner_se, 0);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"move-to-side-n",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_PER_WINDOW,
|
|
|
|
META_KEYBINDING_ACTION_MOVE_TO_SIDE_N,
|
|
|
|
handle_move_to_side_n, 0);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"move-to-side-s",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_PER_WINDOW,
|
|
|
|
META_KEYBINDING_ACTION_MOVE_TO_SIDE_S,
|
|
|
|
handle_move_to_side_s, 0);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"move-to-side-e",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_PER_WINDOW,
|
|
|
|
META_KEYBINDING_ACTION_MOVE_TO_SIDE_E,
|
|
|
|
handle_move_to_side_e, 0);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"move-to-side-w",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_PER_WINDOW,
|
|
|
|
META_KEYBINDING_ACTION_MOVE_TO_SIDE_W,
|
|
|
|
handle_move_to_side_w, 0);
|
|
|
|
|
|
|
|
add_builtin_keybinding (display,
|
|
|
|
"move-to-center",
|
2012-03-27 14:42:42 +00:00
|
|
|
common_keybindings,
|
2011-10-28 01:05:43 +00:00
|
|
|
META_KEY_BINDING_PER_WINDOW,
|
|
|
|
META_KEYBINDING_ACTION_MOVE_TO_CENTER,
|
|
|
|
handle_move_to_center, 0);
|
2012-03-27 14:42:42 +00:00
|
|
|
|
|
|
|
g_object_unref (common_keybindings);
|
|
|
|
g_object_unref (mutter_keybindings);
|
2014-02-25 16:09:06 +00:00
|
|
|
g_object_unref (mutter_wayland_keybindings);
|
2011-10-28 01:05:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
meta_display_init_keys (MetaDisplay *display)
|
|
|
|
{
|
2012-08-29 21:07:34 +00:00
|
|
|
MetaKeyHandler *handler;
|
|
|
|
|
2011-10-28 01:05:43 +00:00
|
|
|
/* Keybindings */
|
|
|
|
display->keymap = NULL;
|
|
|
|
display->keysyms_per_keycode = 0;
|
|
|
|
display->min_keycode = 0;
|
|
|
|
display->max_keycode = 0;
|
|
|
|
display->ignored_modifier_mask = 0;
|
|
|
|
display->hyper_mask = 0;
|
|
|
|
display->super_mask = 0;
|
|
|
|
display->meta_mask = 0;
|
2014-03-03 13:08:34 +00:00
|
|
|
|
|
|
|
display->key_bindings = g_hash_table_new_full (NULL, NULL, NULL, g_free);
|
|
|
|
display->key_bindings_index = g_hash_table_new (NULL, NULL);
|
2011-10-28 01:05:43 +00:00
|
|
|
|
|
|
|
XDisplayKeycodes (display->xdisplay,
|
|
|
|
&display->min_keycode,
|
|
|
|
&display->max_keycode);
|
|
|
|
|
|
|
|
meta_topic (META_DEBUG_KEYBINDINGS,
|
|
|
|
"Display has keycode range %d to %d\n",
|
|
|
|
display->min_keycode,
|
|
|
|
display->max_keycode);
|
|
|
|
|
|
|
|
reload_keymap (display);
|
|
|
|
reload_modmap (display);
|
|
|
|
|
|
|
|
key_handlers = g_hash_table_new_full (g_str_hash, g_str_equal, g_free,
|
|
|
|
(GDestroyNotify) key_handler_free);
|
2012-08-29 21:07:34 +00:00
|
|
|
|
|
|
|
handler = g_new0 (MetaKeyHandler, 1);
|
|
|
|
handler->name = g_strdup ("overlay-key");
|
|
|
|
handler->flags = META_KEY_BINDING_BUILTIN;
|
|
|
|
|
|
|
|
g_hash_table_insert (key_handlers, g_strdup ("overlay-key"), handler);
|
|
|
|
|
2013-04-10 11:34:26 +00:00
|
|
|
handler = g_new0 (MetaKeyHandler, 1);
|
|
|
|
handler->name = g_strdup ("iso-next-group");
|
|
|
|
handler->flags = META_KEY_BINDING_BUILTIN;
|
|
|
|
|
|
|
|
g_hash_table_insert (key_handlers, g_strdup ("iso-next-group"), handler);
|
|
|
|
|
2012-08-28 13:28:11 +00:00
|
|
|
handler = g_new0 (MetaKeyHandler, 1);
|
|
|
|
handler->name = g_strdup ("external-grab");
|
|
|
|
handler->func = handle_external_grab;
|
|
|
|
handler->default_func = handle_external_grab;
|
|
|
|
|
|
|
|
g_hash_table_insert (key_handlers, g_strdup ("external-grab"), handler);
|
|
|
|
|
|
|
|
external_grabs = g_hash_table_new_full (g_str_hash, g_str_equal,
|
|
|
|
NULL,
|
|
|
|
(GDestroyNotify)meta_key_grab_free);
|
|
|
|
|
2011-10-28 01:05:43 +00:00
|
|
|
init_builtin_key_bindings (display);
|
|
|
|
|
|
|
|
rebuild_key_binding_table (display);
|
|
|
|
rebuild_special_bindings (display);
|
|
|
|
|
|
|
|
reload_keycodes (display);
|
|
|
|
reload_modifiers (display);
|
2014-03-03 13:08:34 +00:00
|
|
|
rebuild_binding_index (display);
|
2011-10-28 01:05:43 +00:00
|
|
|
|
|
|
|
/* Keys are actually grabbed in meta_screen_grab_keys() */
|
|
|
|
|
|
|
|
meta_prefs_add_listener (bindings_changed_callback, display);
|
|
|
|
|
|
|
|
#ifdef HAVE_XKB
|
|
|
|
/* meta_display_init_keys() should have already called XkbQueryExtension() */
|
|
|
|
if (display->xkb_base_event_type != -1)
|
|
|
|
XkbSelectEvents (display->xdisplay, XkbUseCoreKbd,
|
|
|
|
XkbNewKeyboardNotifyMask | XkbMapNotifyMask,
|
|
|
|
XkbNewKeyboardNotifyMask | XkbMapNotifyMask);
|
|
|
|
#endif
|
|
|
|
}
|