diff options
| author | Keith Packard <keithp@keithp.com> | 2009-01-11 15:56:28 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2009-01-11 15:56:28 -0800 |
| commit | 02c059ea99a791b9e3643b4fb131af01306b1c23 (patch) | |
| tree | ccf76ef02f72d79cb4507116c79858378c76655e /include | |
| parent | c75445754e283dc2a306ef1cf2bbd94b40423640 (diff) | |
| download | xserver-server-1.6-enterleave.tar.gz | |
dix: move focus handling into enterleave.c.server-1.6-enterleave
This commit moves the focus handling from events.c into enterleave.c and
implements a model similar to the core enter/leave model.
For a full description of the model, see:
http://lists.freedesktop.org/archives/xorg/2008-December/041740.html
This commit also gets rid of the focusinout array in the WindowRec, ditching
it in favour of a local array that keeps the current focus window for each
device.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit eb2d7b3d700952ba88c77deacf687b251300e660)
Conflicts:
dix/events.c
include/input.h
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/input.h | 2 | ||||
| -rw-r--r-- | include/windowstr.h | 5 |
2 files changed, 0 insertions, 7 deletions
diff --git a/include/input.h b/include/input.h index 82ee2360c..cf7f82407 100644 --- a/include/input.h +++ b/include/input.h @@ -509,8 +509,6 @@ extern int AllocMasterDevice(ClientPtr client, extern void DeepCopyDeviceClasses(DeviceIntPtr from, DeviceIntPtr to); -extern int FocusSemaphoresIsset(WindowPtr win); - /* Implemented by the DDX. */ extern int NewInputDeviceRequest( InputOption *options, diff --git a/include/windowstr.h b/include/windowstr.h index c8f35ee3e..a31fdc1df 100644 --- a/include/windowstr.h +++ b/include/windowstr.h @@ -188,11 +188,6 @@ typedef struct _Window { #ifdef ROOTLESS unsigned rootlessUnhittable:1; /* doesn't hit-test */ #endif - /* Used to maintain semantics of core protocol for Enter/LeaveNotifies and - * FocusIn/Out events for multiple pointers/keyboards. Each device ID - * corresponds to one bit. If set, the device is in the window/has focus. - */ - char focusinout[(MAXDEVICES + 7)/8]; } WindowRec; /* |