diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2008-12-19 21:05:47 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-01-08 11:45:22 +1000 |
| commit | eb2d7b3d700952ba88c77deacf687b251300e660 (patch) | |
| tree | e79d63b2f06d33660183f9c4fb526470d60b922a /include | |
| parent | 673eb23aac578dcdc04e2a99d1fa5c2987eb58b8 (diff) | |
dix: move focus handling into enterleave.c.
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>
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 e14f698e7..3a9bfa273 100644 --- a/include/input.h +++ b/include/input.h @@ -509,8 +509,6 @@ extern _X_EXPORT int AllocMasterDevice(ClientPtr client, extern _X_EXPORT void DeepCopyDeviceClasses(DeviceIntPtr from, DeviceIntPtr to); -extern _X_EXPORT int FocusSemaphoresIsset(WindowPtr win); - /* Implemented by the DDX. */ extern _X_EXPORT int NewInputDeviceRequest( InputOption *options, diff --git a/include/windowstr.h b/include/windowstr.h index 9f86e2c50..8ce32305e 100644 --- a/include/windowstr.h +++ b/include/windowstr.h @@ -179,11 +179,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; /* |