event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
/*
|
|
|
|
* Clutter.
|
|
|
|
*
|
|
|
|
* An OpenGL based 'interactive canvas' library.
|
|
|
|
*
|
2011-01-18 07:59:49 -05:00
|
|
|
* Copyright © 2011 Intel Corp.
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
* version 2 of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This library 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
|
|
|
|
* Lesser General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
|
|
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
*
|
|
|
|
* Author: Emmanuele Bassi <ebassi@linux.intel.com>
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "config.h"
|
|
|
|
|
2011-01-26 05:32:42 -05:00
|
|
|
#include <stdint.h>
|
|
|
|
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
#include "clutter-device-manager-xi2.h"
|
|
|
|
|
|
|
|
#include "clutter-backend-x11.h"
|
|
|
|
#include "clutter-input-device-xi2.h"
|
|
|
|
#include "clutter-stage-x11.h"
|
|
|
|
|
|
|
|
#include "clutter-backend.h"
|
|
|
|
#include "clutter-debug.h"
|
|
|
|
#include "clutter-device-manager-private.h"
|
2011-02-18 11:27:49 -05:00
|
|
|
#include "clutter-event-private.h"
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
#include "clutter-event-translator.h"
|
2012-10-07 16:48:02 -04:00
|
|
|
#include "clutter-keysyms.h"
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
#include "clutter-stage-private.h"
|
|
|
|
#include "clutter-private.h"
|
|
|
|
|
|
|
|
#include <X11/extensions/XInput2.h>
|
|
|
|
|
|
|
|
enum
|
|
|
|
{
|
|
|
|
PROP_0,
|
|
|
|
|
|
|
|
PROP_OPCODE,
|
|
|
|
|
|
|
|
PROP_LAST
|
|
|
|
};
|
|
|
|
|
|
|
|
static GParamSpec *obj_props[PROP_LAST] = { NULL, };
|
|
|
|
|
|
|
|
static const char *clutter_input_axis_atom_names[] = {
|
|
|
|
"Abs X", /* CLUTTER_INPUT_AXIS_X */
|
|
|
|
"Abs Y", /* CLUTTER_INPUT_AXIS_Y */
|
|
|
|
"Abs Pressure", /* CLUTTER_INPUT_AXIS_PRESSURE */
|
|
|
|
"Abs Tilt X", /* CLUTTER_INPUT_AXIS_XTILT */
|
|
|
|
"Abs Tilt Y", /* CLUTTER_INPUT_AXIS_YTILT */
|
|
|
|
"Abs Wheel", /* CLUTTER_INPUT_AXIS_WHEEL */
|
2012-04-09 06:56:26 -04:00
|
|
|
"Abs Distance", /* CLUTTER_INPUT_AXIS_DISTANCE */
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
};
|
|
|
|
|
|
|
|
#define N_AXIS_ATOMS G_N_ELEMENTS (clutter_input_axis_atom_names)
|
|
|
|
|
|
|
|
static Atom clutter_input_axis_atoms[N_AXIS_ATOMS] = { 0, };
|
|
|
|
|
|
|
|
static void clutter_event_translator_iface_init (ClutterEventTranslatorIface *iface);
|
|
|
|
|
|
|
|
#define clutter_device_manager_xi2_get_type _clutter_device_manager_xi2_get_type
|
|
|
|
|
|
|
|
G_DEFINE_TYPE_WITH_CODE (ClutterDeviceManagerXI2,
|
|
|
|
clutter_device_manager_xi2,
|
|
|
|
CLUTTER_TYPE_DEVICE_MANAGER,
|
|
|
|
G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_EVENT_TRANSLATOR,
|
|
|
|
clutter_event_translator_iface_init));
|
|
|
|
|
|
|
|
static void
|
|
|
|
translate_valuator_class (Display *xdisplay,
|
|
|
|
ClutterInputDevice *device,
|
|
|
|
XIValuatorClassInfo *class)
|
|
|
|
{
|
|
|
|
static gboolean atoms_initialized = FALSE;
|
2011-02-19 11:48:59 -05:00
|
|
|
ClutterInputAxis i, axis = CLUTTER_INPUT_AXIS_IGNORE;
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
|
|
|
|
if (G_UNLIKELY (!atoms_initialized))
|
|
|
|
{
|
|
|
|
XInternAtoms (xdisplay,
|
|
|
|
(char **) clutter_input_axis_atom_names, N_AXIS_ATOMS,
|
|
|
|
False,
|
|
|
|
clutter_input_axis_atoms);
|
|
|
|
|
|
|
|
atoms_initialized = TRUE;
|
|
|
|
}
|
|
|
|
|
2013-01-28 08:49:51 -05:00
|
|
|
for (i = 0;
|
|
|
|
i < N_AXIS_ATOMS;
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
i += 1)
|
|
|
|
{
|
|
|
|
if (clutter_input_axis_atoms[i] == class->label)
|
|
|
|
{
|
2013-01-28 08:49:51 -05:00
|
|
|
axis = i + 1;
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
_clutter_input_device_add_axis (device, axis,
|
|
|
|
class->min,
|
|
|
|
class->max,
|
|
|
|
class->resolution);
|
2011-01-21 10:26:52 -05:00
|
|
|
|
|
|
|
CLUTTER_NOTE (BACKEND,
|
|
|
|
"Added axis '%s' (min:%.2f, max:%.2fd, res:%d) of device %d",
|
|
|
|
clutter_input_axis_atom_names[axis],
|
|
|
|
class->min,
|
|
|
|
class->max,
|
|
|
|
class->resolution,
|
|
|
|
device->id);
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
translate_device_classes (Display *xdisplay,
|
|
|
|
ClutterInputDevice *device,
|
|
|
|
XIAnyClassInfo **classes,
|
|
|
|
guint n_classes)
|
|
|
|
{
|
|
|
|
gint i;
|
|
|
|
|
|
|
|
for (i = 0; i < n_classes; i++)
|
|
|
|
{
|
|
|
|
XIAnyClassInfo *class_info = classes[i];
|
|
|
|
|
|
|
|
switch (class_info->type)
|
|
|
|
{
|
|
|
|
case XIKeyClass:
|
|
|
|
{
|
|
|
|
XIKeyClassInfo *key_info = (XIKeyClassInfo *) class_info;
|
|
|
|
gint j;
|
|
|
|
|
2011-01-21 05:24:34 -05:00
|
|
|
_clutter_input_device_set_n_keys (device,
|
|
|
|
key_info->num_keycodes);
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
|
|
|
|
for (j = 0; j < key_info->num_keycodes; j++)
|
|
|
|
{
|
|
|
|
clutter_input_device_set_key (device, j,
|
|
|
|
key_info->keycodes[i],
|
|
|
|
0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case XIValuatorClass:
|
|
|
|
translate_valuator_class (xdisplay, device,
|
|
|
|
(XIValuatorClassInfo *) class_info);
|
|
|
|
break;
|
|
|
|
|
2012-04-11 23:07:34 -04:00
|
|
|
#ifdef HAVE_XINPUT_2_2
|
2012-03-19 08:16:53 -04:00
|
|
|
case XIScrollClass:
|
|
|
|
{
|
|
|
|
XIScrollClassInfo *scroll_info = (XIScrollClassInfo *) class_info;
|
|
|
|
ClutterScrollDirection direction;
|
|
|
|
|
|
|
|
if (scroll_info->scroll_type == XIScrollTypeVertical)
|
|
|
|
direction = CLUTTER_SCROLL_DOWN;
|
|
|
|
else
|
|
|
|
direction = CLUTTER_SCROLL_RIGHT;
|
|
|
|
|
|
|
|
CLUTTER_NOTE (BACKEND, "Scroll valuator %d: %s, increment: %f",
|
|
|
|
scroll_info->number,
|
|
|
|
scroll_info->scroll_type == XIScrollTypeVertical
|
|
|
|
? "vertical"
|
|
|
|
: "horizontal",
|
|
|
|
scroll_info->increment);
|
|
|
|
|
|
|
|
_clutter_input_device_add_scroll_info (device,
|
|
|
|
scroll_info->number,
|
|
|
|
direction,
|
|
|
|
scroll_info->increment);
|
|
|
|
}
|
|
|
|
break;
|
2012-04-11 23:07:34 -04:00
|
|
|
#endif /* HAVE_XINPUT_2_2 */
|
2012-03-19 08:16:53 -04:00
|
|
|
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-03-19 10:28:34 -04:00
|
|
|
static gboolean
|
|
|
|
is_touch_device (XIAnyClassInfo **classes,
|
|
|
|
guint n_classes,
|
|
|
|
ClutterInputDeviceType *device_type,
|
|
|
|
guint *n_touch_points)
|
|
|
|
{
|
2012-04-11 23:07:34 -04:00
|
|
|
#ifdef HAVE_XINPUT_2_2
|
2012-03-19 10:28:34 -04:00
|
|
|
guint i;
|
|
|
|
|
|
|
|
for (i = 0; i < n_classes; i++)
|
|
|
|
{
|
|
|
|
XITouchClassInfo *class = (XITouchClassInfo *) classes[i];
|
|
|
|
|
|
|
|
if (class->type != XITouchClass)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (class->num_touches > 0)
|
|
|
|
{
|
|
|
|
if (class->mode == XIDirectTouch)
|
|
|
|
*device_type = CLUTTER_TOUCHSCREEN_DEVICE;
|
|
|
|
else if (class->mode == XIDependentTouch)
|
|
|
|
*device_type = CLUTTER_TOUCHPAD_DEVICE;
|
|
|
|
else
|
|
|
|
continue;
|
|
|
|
|
|
|
|
*n_touch_points = class->num_touches;
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
static ClutterInputDevice *
|
|
|
|
create_device (ClutterDeviceManagerXI2 *manager_xi2,
|
|
|
|
ClutterBackendX11 *backend_x11,
|
|
|
|
XIDeviceInfo *info)
|
|
|
|
{
|
2012-03-19 10:28:34 -04:00
|
|
|
ClutterInputDeviceType source, touch_source;
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
ClutterInputDevice *retval;
|
|
|
|
ClutterInputMode mode;
|
2011-01-19 11:23:45 -05:00
|
|
|
gboolean is_enabled;
|
2012-03-19 10:28:34 -04:00
|
|
|
guint num_touches = 0;
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
|
|
|
|
if (info->use == XIMasterKeyboard || info->use == XISlaveKeyboard)
|
|
|
|
source = CLUTTER_KEYBOARD_DEVICE;
|
2012-03-19 10:28:34 -04:00
|
|
|
else if (info->use == XISlavePointer &&
|
|
|
|
is_touch_device (info->classes, info->num_classes,
|
|
|
|
&touch_source,
|
|
|
|
&num_touches))
|
|
|
|
{
|
|
|
|
source = touch_source;
|
|
|
|
}
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
else
|
|
|
|
{
|
|
|
|
gchar *name;
|
|
|
|
|
|
|
|
name = g_ascii_strdown (info->name, -1);
|
|
|
|
|
|
|
|
if (strstr (name, "eraser") != NULL)
|
|
|
|
source = CLUTTER_ERASER_DEVICE;
|
|
|
|
else if (strstr (name, "cursor") != NULL)
|
|
|
|
source = CLUTTER_CURSOR_DEVICE;
|
|
|
|
else if (strstr (name, "wacom") != NULL || strstr (name, "pen") != NULL)
|
|
|
|
source = CLUTTER_PEN_DEVICE;
|
|
|
|
else
|
|
|
|
source = CLUTTER_POINTER_DEVICE;
|
|
|
|
|
|
|
|
g_free (name);
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (info->use)
|
|
|
|
{
|
|
|
|
case XIMasterKeyboard:
|
|
|
|
case XIMasterPointer:
|
|
|
|
mode = CLUTTER_INPUT_MODE_MASTER;
|
2011-01-19 11:23:45 -05:00
|
|
|
is_enabled = TRUE;
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
break;
|
|
|
|
|
|
|
|
case XISlaveKeyboard:
|
|
|
|
case XISlavePointer:
|
|
|
|
mode = CLUTTER_INPUT_MODE_SLAVE;
|
2011-01-19 11:23:45 -05:00
|
|
|
is_enabled = FALSE;
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
break;
|
|
|
|
|
|
|
|
case XIFloatingSlave:
|
|
|
|
default:
|
|
|
|
mode = CLUTTER_INPUT_MODE_FLOATING;
|
2011-01-19 11:23:45 -05:00
|
|
|
is_enabled = FALSE;
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
retval = g_object_new (CLUTTER_TYPE_INPUT_DEVICE_XI2,
|
|
|
|
"name", info->name,
|
|
|
|
"id", info->deviceid,
|
|
|
|
"has-cursor", (info->use == XIMasterPointer),
|
|
|
|
"device-manager", manager_xi2,
|
|
|
|
"device-type", source,
|
|
|
|
"device-mode", mode,
|
|
|
|
"backend", backend_x11,
|
2011-01-19 11:23:45 -05:00
|
|
|
"enabled", is_enabled,
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
NULL);
|
|
|
|
|
|
|
|
translate_device_classes (backend_x11->xdpy, retval,
|
|
|
|
info->classes,
|
|
|
|
info->num_classes);
|
|
|
|
|
|
|
|
CLUTTER_NOTE (BACKEND, "Created device '%s' (id: %d, has-cursor: %s)",
|
|
|
|
info->name,
|
|
|
|
info->deviceid,
|
|
|
|
info->use == XIMasterPointer ? "yes" : "no");
|
|
|
|
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
|
|
|
static ClutterInputDevice *
|
|
|
|
add_device (ClutterDeviceManagerXI2 *manager_xi2,
|
|
|
|
ClutterBackendX11 *backend_x11,
|
|
|
|
XIDeviceInfo *info,
|
|
|
|
gboolean in_construction)
|
|
|
|
{
|
|
|
|
ClutterInputDevice *device;
|
|
|
|
|
|
|
|
device = create_device (manager_xi2, backend_x11, info);
|
|
|
|
|
|
|
|
/* we don't go through the DeviceManager::add_device() vfunc because
|
|
|
|
* that emits the signal, and we only do it conditionally
|
|
|
|
*/
|
|
|
|
g_hash_table_replace (manager_xi2->devices_by_id,
|
|
|
|
GINT_TO_POINTER (info->deviceid),
|
|
|
|
g_object_ref (device));
|
|
|
|
|
|
|
|
if (info->use == XIMasterPointer ||
|
|
|
|
info->use == XIMasterKeyboard)
|
|
|
|
{
|
|
|
|
manager_xi2->master_devices =
|
|
|
|
g_list_prepend (manager_xi2->master_devices, device);
|
|
|
|
}
|
|
|
|
else if (info->use == XISlavePointer ||
|
|
|
|
info->use == XISlaveKeyboard ||
|
|
|
|
info->use == XIFloatingSlave)
|
|
|
|
{
|
|
|
|
manager_xi2->slave_devices =
|
|
|
|
g_list_prepend (manager_xi2->slave_devices, device);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
g_warning ("Unhandled device: %s",
|
|
|
|
clutter_input_device_get_device_name (device));
|
|
|
|
|
|
|
|
/* relationships between devices and signal emissions are not
|
|
|
|
* necessary while we're constructing the device manager instance
|
|
|
|
*/
|
|
|
|
if (!in_construction)
|
|
|
|
{
|
|
|
|
if (info->use == XISlavePointer || info->use == XISlaveKeyboard)
|
|
|
|
{
|
|
|
|
ClutterInputDevice *master;
|
|
|
|
|
|
|
|
master = g_hash_table_lookup (manager_xi2->devices_by_id,
|
|
|
|
GINT_TO_POINTER (info->attachment));
|
|
|
|
_clutter_input_device_set_associated_device (device, master);
|
|
|
|
_clutter_input_device_add_slave (master, device);
|
|
|
|
}
|
|
|
|
|
2011-01-18 08:01:27 -05:00
|
|
|
/* blow the cache */
|
|
|
|
g_slist_free (manager_xi2->all_devices);
|
|
|
|
manager_xi2->all_devices = NULL;
|
|
|
|
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
g_signal_emit_by_name (manager_xi2, "device-added", device);
|
|
|
|
}
|
|
|
|
|
|
|
|
return device;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
remove_device (ClutterDeviceManagerXI2 *manager_xi2,
|
|
|
|
gint device_id)
|
|
|
|
{
|
|
|
|
ClutterInputDevice *device;
|
|
|
|
|
|
|
|
device = g_hash_table_lookup (manager_xi2->devices_by_id,
|
|
|
|
GINT_TO_POINTER (device_id));
|
|
|
|
|
|
|
|
if (device != NULL)
|
|
|
|
{
|
|
|
|
manager_xi2->master_devices =
|
|
|
|
g_list_remove (manager_xi2->master_devices, device);
|
|
|
|
manager_xi2->slave_devices =
|
|
|
|
g_list_remove (manager_xi2->slave_devices, device);
|
|
|
|
|
2011-01-18 08:01:27 -05:00
|
|
|
/* blow the cache */
|
|
|
|
g_slist_free (manager_xi2->all_devices);
|
|
|
|
manager_xi2->all_devices = NULL;
|
|
|
|
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
g_signal_emit_by_name (manager_xi2, "device-removed", device);
|
|
|
|
|
|
|
|
g_object_run_dispose (G_OBJECT (device));
|
|
|
|
|
|
|
|
g_hash_table_remove (manager_xi2->devices_by_id,
|
|
|
|
GINT_TO_POINTER (device_id));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
translate_hierarchy_event (ClutterBackendX11 *backend_x11,
|
|
|
|
ClutterDeviceManagerXI2 *manager_xi2,
|
|
|
|
XIHierarchyEvent *ev)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < ev->num_info; i++)
|
|
|
|
{
|
|
|
|
if (ev->info[i].flags & XIDeviceEnabled)
|
|
|
|
{
|
|
|
|
XIDeviceInfo *info;
|
|
|
|
int n_devices;
|
|
|
|
|
2011-01-21 06:41:36 -05:00
|
|
|
CLUTTER_NOTE (EVENT, "Hierarchy event: device enabled");
|
|
|
|
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
info = XIQueryDevice (backend_x11->xdpy,
|
|
|
|
ev->info[i].deviceid,
|
|
|
|
&n_devices);
|
2011-02-19 11:44:38 -05:00
|
|
|
add_device (manager_xi2, backend_x11, &info[0], FALSE);
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
}
|
|
|
|
else if (ev->info[i].flags & XIDeviceDisabled)
|
|
|
|
{
|
2011-01-21 06:41:36 -05:00
|
|
|
CLUTTER_NOTE (EVENT, "Hierarchy event: device disabled");
|
|
|
|
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
remove_device (manager_xi2, ev->info[i].deviceid);
|
|
|
|
}
|
|
|
|
else if ((ev->info[i].flags & XISlaveAttached) ||
|
|
|
|
(ev->info[i].flags & XISlaveDetached))
|
|
|
|
{
|
|
|
|
ClutterInputDevice *master, *slave;
|
|
|
|
XIDeviceInfo *info;
|
|
|
|
int n_devices;
|
2012-04-24 10:21:25 -04:00
|
|
|
gboolean send_changed = FALSE;
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
|
2011-01-21 06:41:36 -05:00
|
|
|
CLUTTER_NOTE (EVENT, "Hierarchy event: slave %s",
|
|
|
|
(ev->info[i].flags & XISlaveAttached)
|
|
|
|
? "attached"
|
|
|
|
: "detached");
|
|
|
|
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
slave = g_hash_table_lookup (manager_xi2->devices_by_id,
|
|
|
|
GINT_TO_POINTER (ev->info[i].deviceid));
|
|
|
|
master = clutter_input_device_get_associated_device (slave);
|
|
|
|
|
|
|
|
/* detach the slave in both cases */
|
|
|
|
if (master != NULL)
|
|
|
|
{
|
|
|
|
_clutter_input_device_remove_slave (master, slave);
|
|
|
|
_clutter_input_device_set_associated_device (slave, NULL);
|
2012-04-24 10:21:25 -04:00
|
|
|
|
|
|
|
send_changed = TRUE;
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
/* and attach the slave to the new master if needed */
|
|
|
|
if (ev->info[i].flags & XISlaveAttached)
|
|
|
|
{
|
|
|
|
info = XIQueryDevice (backend_x11->xdpy,
|
|
|
|
ev->info[i].deviceid,
|
|
|
|
&n_devices);
|
|
|
|
master = g_hash_table_lookup (manager_xi2->devices_by_id,
|
|
|
|
GINT_TO_POINTER (info->attachment));
|
|
|
|
_clutter_input_device_set_associated_device (slave, master);
|
|
|
|
_clutter_input_device_add_slave (master, slave);
|
|
|
|
|
2012-04-24 10:21:25 -04:00
|
|
|
send_changed = TRUE;
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
XIFreeDeviceInfo (info);
|
|
|
|
}
|
2012-04-24 10:21:25 -04:00
|
|
|
|
|
|
|
if (send_changed)
|
|
|
|
{
|
|
|
|
ClutterStage *stage = _clutter_input_device_get_stage (master);
|
|
|
|
if (stage != NULL)
|
|
|
|
_clutter_stage_x11_events_device_changed (CLUTTER_STAGE_X11 (_clutter_stage_get_window (stage)),
|
|
|
|
master,
|
|
|
|
CLUTTER_DEVICE_MANAGER (manager_xi2));
|
|
|
|
}
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
clutter_device_manager_xi2_select_events (ClutterDeviceManager *manager,
|
|
|
|
Window xwindow,
|
|
|
|
XIEventMask *event_mask)
|
|
|
|
{
|
|
|
|
Display *xdisplay;
|
|
|
|
|
|
|
|
xdisplay = clutter_x11_get_default_display ();
|
|
|
|
|
|
|
|
XISelectEvents (xdisplay, xwindow, event_mask, 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
static ClutterStage *
|
|
|
|
get_event_stage (ClutterEventTranslator *translator,
|
|
|
|
XIEvent *xi_event)
|
|
|
|
{
|
|
|
|
Window xwindow = None;
|
|
|
|
|
|
|
|
switch (xi_event->evtype)
|
|
|
|
{
|
|
|
|
case XI_KeyPress:
|
|
|
|
case XI_KeyRelease:
|
|
|
|
case XI_ButtonPress:
|
|
|
|
case XI_ButtonRelease:
|
|
|
|
case XI_Motion:
|
2012-04-11 23:07:34 -04:00
|
|
|
#ifdef HAVE_XINPUT_2_2
|
2012-03-19 10:28:34 -04:00
|
|
|
case XI_TouchBegin:
|
|
|
|
case XI_TouchUpdate:
|
|
|
|
case XI_TouchEnd:
|
2012-04-11 23:07:34 -04:00
|
|
|
#endif /* HAVE_XINPUT_2_2 */
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
{
|
|
|
|
XIDeviceEvent *xev = (XIDeviceEvent *) xi_event;
|
|
|
|
|
|
|
|
xwindow = xev->event;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case XI_Enter:
|
|
|
|
case XI_Leave:
|
|
|
|
case XI_FocusIn:
|
|
|
|
case XI_FocusOut:
|
|
|
|
{
|
|
|
|
XIEnterEvent *xev = (XIEnterEvent *) xi_event;
|
|
|
|
|
|
|
|
xwindow = xev->event;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (xwindow == None)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
return clutter_x11_get_stage_from_window (xwindow);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* print_key_sym: Translate a symbol to its printable form if any
|
|
|
|
* @symbol: the symbol to translate
|
|
|
|
* @buffer: the buffer where to put the translated string
|
|
|
|
* @len: size of the buffer
|
|
|
|
*
|
|
|
|
* Translates @symbol into a printable representation in @buffer, if possible.
|
|
|
|
*
|
|
|
|
* Return value: The number of bytes of the translated string, 0 if the
|
|
|
|
* symbol can't be printed
|
|
|
|
*
|
|
|
|
* Note: The code is derived from libX11's src/KeyBind.c
|
|
|
|
* Copyright 1985, 1987, 1998 The Open Group
|
|
|
|
*
|
|
|
|
* Note: This code works for Latin-1 symbols. clutter_keysym_to_unicode()
|
|
|
|
* does the work for the other keysyms.
|
|
|
|
*/
|
|
|
|
static int
|
2011-01-26 05:32:42 -05:00
|
|
|
print_keysym (uint32_t symbol,
|
|
|
|
char *buffer,
|
|
|
|
int len)
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
{
|
|
|
|
unsigned long high_bytes;
|
|
|
|
unsigned char c;
|
|
|
|
|
|
|
|
high_bytes = symbol >> 8;
|
|
|
|
if (!(len &&
|
|
|
|
((high_bytes == 0) ||
|
|
|
|
((high_bytes == 0xFF) &&
|
|
|
|
(((symbol >= CLUTTER_KEY_BackSpace) &&
|
|
|
|
(symbol <= CLUTTER_KEY_Clear)) ||
|
|
|
|
(symbol == CLUTTER_KEY_Return) ||
|
|
|
|
(symbol == CLUTTER_KEY_Escape) ||
|
|
|
|
(symbol == CLUTTER_KEY_KP_Space) ||
|
|
|
|
(symbol == CLUTTER_KEY_KP_Tab) ||
|
|
|
|
(symbol == CLUTTER_KEY_KP_Enter) ||
|
|
|
|
((symbol >= CLUTTER_KEY_KP_Multiply) &&
|
|
|
|
(symbol <= CLUTTER_KEY_KP_9)) ||
|
|
|
|
(symbol == CLUTTER_KEY_KP_Equal) ||
|
|
|
|
(symbol == CLUTTER_KEY_Delete))))))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* if X keysym, convert to ascii by grabbing low 7 bits */
|
|
|
|
if (symbol == CLUTTER_KEY_KP_Space)
|
|
|
|
c = CLUTTER_KEY_space & 0x7F; /* patch encoding botch */
|
|
|
|
else if (high_bytes == 0xFF)
|
|
|
|
c = symbol & 0x7F;
|
|
|
|
else
|
|
|
|
c = symbol & 0xFF;
|
|
|
|
|
|
|
|
buffer[0] = c;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static gdouble *
|
|
|
|
translate_axes (ClutterInputDevice *device,
|
|
|
|
gdouble x,
|
|
|
|
gdouble y,
|
|
|
|
ClutterStageX11 *stage_x11,
|
|
|
|
XIValuatorState *valuators)
|
|
|
|
{
|
|
|
|
guint n_axes = clutter_input_device_get_n_axes (device);
|
|
|
|
guint i;
|
|
|
|
gdouble *retval;
|
|
|
|
double *values;
|
|
|
|
|
|
|
|
retval = g_new0 (gdouble, n_axes);
|
|
|
|
values = valuators->values;
|
|
|
|
|
|
|
|
for (i = 0; i < valuators->mask_len * 8; i++)
|
|
|
|
{
|
|
|
|
ClutterInputAxis axis;
|
|
|
|
gdouble val;
|
|
|
|
|
|
|
|
if (!XIMaskIsSet (valuators->mask, i))
|
|
|
|
continue;
|
|
|
|
|
2011-01-18 11:13:26 -05:00
|
|
|
axis = clutter_input_device_get_axis (device, i);
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
val = *values++;
|
|
|
|
|
|
|
|
switch (axis)
|
|
|
|
{
|
|
|
|
case CLUTTER_INPUT_AXIS_X:
|
|
|
|
retval[i] = x;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case CLUTTER_INPUT_AXIS_Y:
|
|
|
|
retval[i] = y;
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
_clutter_input_device_translate_axis (device, i, val, &retval[i]);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
2012-03-19 08:16:53 -04:00
|
|
|
static gdouble
|
|
|
|
scroll_valuators_changed (ClutterInputDevice *device,
|
|
|
|
XIValuatorState *valuators,
|
|
|
|
gdouble *dx_p,
|
|
|
|
gdouble *dy_p)
|
|
|
|
{
|
|
|
|
gboolean retval = FALSE;
|
|
|
|
guint n_axes, n_val, i;
|
|
|
|
double *values;
|
|
|
|
|
|
|
|
n_axes = clutter_input_device_get_n_axes (device);
|
|
|
|
values = valuators->values;
|
|
|
|
|
|
|
|
*dx_p = *dy_p = 0.0;
|
|
|
|
|
|
|
|
n_val = 0;
|
|
|
|
|
|
|
|
for (i = 0; i < MIN (valuators->mask_len * 8, n_axes); i++)
|
|
|
|
{
|
|
|
|
ClutterScrollDirection direction;
|
|
|
|
gdouble delta;
|
|
|
|
|
|
|
|
if (!XIMaskIsSet (valuators->mask, i))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (_clutter_input_device_get_scroll_delta (device, i,
|
|
|
|
values[n_val],
|
|
|
|
&direction,
|
|
|
|
&delta))
|
|
|
|
{
|
|
|
|
retval = TRUE;
|
|
|
|
|
|
|
|
if (direction == CLUTTER_SCROLL_UP ||
|
|
|
|
direction == CLUTTER_SCROLL_DOWN)
|
|
|
|
*dy_p = delta;
|
2012-04-20 13:31:58 -04:00
|
|
|
else
|
|
|
|
*dx_p = delta;
|
2012-03-19 08:16:53 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
n_val += 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
static ClutterTranslateReturn
|
|
|
|
clutter_device_manager_xi2_translate_event (ClutterEventTranslator *translator,
|
|
|
|
gpointer native,
|
|
|
|
ClutterEvent *event)
|
|
|
|
{
|
|
|
|
ClutterDeviceManagerXI2 *manager_xi2 = CLUTTER_DEVICE_MANAGER_XI2 (translator);
|
|
|
|
ClutterTranslateReturn retval = CLUTTER_TRANSLATE_CONTINUE;
|
|
|
|
ClutterBackendX11 *backend_x11;
|
2011-01-21 06:41:36 -05:00
|
|
|
ClutterStageX11 *stage_x11 = NULL;
|
|
|
|
ClutterStage *stage = NULL;
|
2011-01-21 10:26:52 -05:00
|
|
|
ClutterInputDevice *device, *source_device;
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
XGenericEventCookie *cookie;
|
|
|
|
XIEvent *xi_event;
|
|
|
|
XEvent *xevent;
|
|
|
|
|
|
|
|
backend_x11 = CLUTTER_BACKEND_X11 (clutter_get_default_backend ());
|
|
|
|
|
|
|
|
xevent = native;
|
|
|
|
|
|
|
|
cookie = &xevent->xcookie;
|
|
|
|
|
|
|
|
if (cookie->type != GenericEvent ||
|
|
|
|
cookie->extension != manager_xi2->opcode)
|
2011-07-14 15:58:25 -04:00
|
|
|
return CLUTTER_TRANSLATE_CONTINUE;
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
|
|
|
|
xi_event = (XIEvent *) cookie->data;
|
|
|
|
|
2011-07-14 15:58:25 -04:00
|
|
|
if (!xi_event)
|
|
|
|
return CLUTTER_TRANSLATE_REMOVE;
|
|
|
|
|
2011-01-21 06:41:36 -05:00
|
|
|
if (!(xi_event->evtype == XI_HierarchyChanged ||
|
|
|
|
xi_event->evtype == XI_DeviceChanged))
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
{
|
2011-01-21 06:41:36 -05:00
|
|
|
stage = get_event_stage (translator, xi_event);
|
|
|
|
if (stage == NULL || CLUTTER_ACTOR_IN_DESTRUCTION (stage))
|
2011-07-14 15:58:25 -04:00
|
|
|
return CLUTTER_TRANSLATE_CONTINUE;
|
2011-01-21 06:41:36 -05:00
|
|
|
else
|
|
|
|
stage_x11 = CLUTTER_STAGE_X11 (_clutter_stage_get_window (stage));
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
event->any.stage = stage;
|
|
|
|
|
|
|
|
switch (xi_event->evtype)
|
|
|
|
{
|
|
|
|
case XI_HierarchyChanged:
|
|
|
|
{
|
|
|
|
XIHierarchyEvent *xev = (XIHierarchyEvent *) xi_event;
|
|
|
|
|
|
|
|
translate_hierarchy_event (backend_x11, manager_xi2, xev);
|
|
|
|
}
|
|
|
|
retval = CLUTTER_TRANSLATE_REMOVE;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case XI_DeviceChanged:
|
|
|
|
{
|
|
|
|
XIDeviceChangedEvent *xev = (XIDeviceChangedEvent *) xi_event;
|
|
|
|
|
|
|
|
device = g_hash_table_lookup (manager_xi2->devices_by_id,
|
|
|
|
GINT_TO_POINTER (xev->deviceid));
|
2012-11-28 21:17:11 -05:00
|
|
|
source_device = g_hash_table_lookup (manager_xi2->devices_by_id,
|
|
|
|
GINT_TO_POINTER (xev->sourceid));
|
2012-06-20 07:19:05 -04:00
|
|
|
if (device)
|
|
|
|
{
|
|
|
|
_clutter_input_device_reset_axes (device);
|
|
|
|
translate_device_classes (backend_x11->xdpy,
|
|
|
|
device,
|
|
|
|
xev->classes,
|
|
|
|
xev->num_classes);
|
|
|
|
}
|
2012-11-28 21:17:11 -05:00
|
|
|
|
|
|
|
if (source_device)
|
2013-02-07 19:10:50 -05:00
|
|
|
_clutter_input_device_reset_scroll_info (source_device);
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
}
|
|
|
|
retval = CLUTTER_TRANSLATE_REMOVE;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case XI_KeyPress:
|
|
|
|
case XI_KeyRelease:
|
|
|
|
{
|
|
|
|
XIDeviceEvent *xev = (XIDeviceEvent *) xi_event;
|
|
|
|
ClutterEventX11 *event_x11;
|
|
|
|
char buffer[7] = { 0, };
|
|
|
|
gunichar n;
|
|
|
|
|
|
|
|
event->key.type = event->type = (xev->evtype == XI_KeyPress)
|
|
|
|
? CLUTTER_KEY_PRESS
|
|
|
|
: CLUTTER_KEY_RELEASE;
|
|
|
|
|
|
|
|
event->key.time = xev->time;
|
|
|
|
event->key.stage = stage;
|
|
|
|
event->key.modifier_state =
|
2013-03-05 19:30:52 -05:00
|
|
|
_clutter_input_device_xi2_translate_state (&xev->mods, &xev->buttons, &xev->group);
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
event->key.hardware_keycode = xev->detail;
|
|
|
|
|
|
|
|
/* keyval is the key ignoring all modifiers ('1' vs. '!') */
|
|
|
|
event->key.keyval =
|
|
|
|
_clutter_keymap_x11_translate_key_state (backend_x11->keymap,
|
|
|
|
event->key.hardware_keycode,
|
2012-12-22 22:21:16 -05:00
|
|
|
&event->key.modifier_state,
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
NULL);
|
|
|
|
|
|
|
|
/* KeyEvents have platform specific data associated to them */
|
|
|
|
event_x11 = _clutter_event_x11_new ();
|
|
|
|
_clutter_event_set_platform_data (event, event_x11);
|
|
|
|
|
|
|
|
event_x11->key_group =
|
|
|
|
_clutter_keymap_x11_get_key_group (backend_x11->keymap,
|
|
|
|
event->key.modifier_state);
|
|
|
|
event_x11->key_is_modifier =
|
|
|
|
_clutter_keymap_x11_get_is_modifier (backend_x11->keymap,
|
|
|
|
event->key.hardware_keycode);
|
|
|
|
event_x11->num_lock_set =
|
|
|
|
_clutter_keymap_x11_get_num_lock_state (backend_x11->keymap);
|
|
|
|
event_x11->caps_lock_set =
|
|
|
|
_clutter_keymap_x11_get_caps_lock_state (backend_x11->keymap);
|
|
|
|
|
2011-01-21 10:26:52 -05:00
|
|
|
source_device = g_hash_table_lookup (manager_xi2->devices_by_id,
|
|
|
|
GINT_TO_POINTER (xev->sourceid));
|
2011-02-22 12:12:34 -05:00
|
|
|
clutter_event_set_source_device (event, source_device);
|
2011-01-18 09:09:04 -05:00
|
|
|
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
device = g_hash_table_lookup (manager_xi2->devices_by_id,
|
|
|
|
GINT_TO_POINTER (xev->deviceid));
|
2011-02-22 12:12:34 -05:00
|
|
|
clutter_event_set_device (event, device);
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
|
|
|
|
/* XXX keep this in sync with the evdev device manager */
|
|
|
|
n = print_keysym (event->key.keyval, buffer, sizeof (buffer));
|
|
|
|
if (n == 0)
|
|
|
|
{
|
|
|
|
/* not printable */
|
|
|
|
event->key.unicode_value = (gunichar) '\0';
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
event->key.unicode_value = g_utf8_get_char_validated (buffer, n);
|
|
|
|
if (event->key.unicode_value == -1 ||
|
|
|
|
event->key.unicode_value == -2)
|
|
|
|
event->key.unicode_value = (gunichar) '\0';
|
|
|
|
}
|
|
|
|
|
2011-01-19 11:23:45 -05:00
|
|
|
CLUTTER_NOTE (EVENT,
|
|
|
|
"%s: win:0x%x device:%d source:%d, key: %12s (%d)",
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
event->any.type == CLUTTER_KEY_PRESS
|
|
|
|
? "key press "
|
|
|
|
: "key release",
|
|
|
|
(unsigned int) stage_x11->xwin,
|
2011-01-19 11:23:45 -05:00
|
|
|
xev->deviceid,
|
|
|
|
xev->sourceid,
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
event->key.keyval ? buffer : "(none)",
|
|
|
|
event->key.keyval);
|
|
|
|
|
|
|
|
if (xi_event->evtype == XI_KeyPress)
|
|
|
|
_clutter_stage_x11_set_user_time (stage_x11, event->key.time);
|
|
|
|
|
|
|
|
retval = CLUTTER_TRANSLATE_QUEUE;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case XI_ButtonPress:
|
|
|
|
case XI_ButtonRelease:
|
|
|
|
{
|
|
|
|
XIDeviceEvent *xev = (XIDeviceEvent *) xi_event;
|
|
|
|
|
2012-09-21 08:05:37 -04:00
|
|
|
source_device = g_hash_table_lookup (manager_xi2->devices_by_id,
|
|
|
|
GINT_TO_POINTER (xev->sourceid));
|
|
|
|
device = g_hash_table_lookup (manager_xi2->devices_by_id,
|
|
|
|
GINT_TO_POINTER (xev->deviceid));
|
|
|
|
|
|
|
|
/* Set the stage for core events coming out of nowhere (see bug #684509) */
|
|
|
|
if (clutter_input_device_get_device_mode (device) == CLUTTER_INPUT_MODE_MASTER &&
|
|
|
|
clutter_input_device_get_pointer_stage (device) == NULL &&
|
|
|
|
stage != NULL)
|
|
|
|
_clutter_input_device_set_stage (device, stage);
|
|
|
|
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
switch (xev->detail)
|
|
|
|
{
|
|
|
|
case 4:
|
|
|
|
case 5:
|
|
|
|
case 6:
|
|
|
|
case 7:
|
2012-07-17 10:13:12 -04:00
|
|
|
/* we only generate Scroll events on ButtonPress */
|
|
|
|
if (xi_event->evtype == XI_ButtonRelease)
|
|
|
|
return CLUTTER_TRANSLATE_REMOVE;
|
|
|
|
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
event->scroll.type = event->type = CLUTTER_SCROLL;
|
|
|
|
|
|
|
|
if (xev->detail == 4)
|
|
|
|
event->scroll.direction = CLUTTER_SCROLL_UP;
|
|
|
|
else if (xev->detail == 5)
|
|
|
|
event->scroll.direction = CLUTTER_SCROLL_DOWN;
|
|
|
|
else if (xev->detail == 6)
|
|
|
|
event->scroll.direction = CLUTTER_SCROLL_LEFT;
|
|
|
|
else
|
|
|
|
event->scroll.direction = CLUTTER_SCROLL_RIGHT;
|
|
|
|
|
|
|
|
event->scroll.stage = stage;
|
|
|
|
|
|
|
|
event->scroll.time = xev->time;
|
|
|
|
event->scroll.x = xev->event_x;
|
|
|
|
event->scroll.y = xev->event_y;
|
|
|
|
event->scroll.modifier_state =
|
|
|
|
_clutter_input_device_xi2_translate_state (&xev->mods,
|
2013-03-05 19:30:52 -05:00
|
|
|
&xev->buttons,
|
|
|
|
&xev->group);
|
2011-01-21 10:26:52 -05:00
|
|
|
|
2011-02-22 12:12:34 -05:00
|
|
|
clutter_event_set_source_device (event, source_device);
|
|
|
|
clutter_event_set_device (event, device);
|
2011-01-18 17:30:21 -05:00
|
|
|
|
|
|
|
event->scroll.axes = translate_axes (event->scroll.device,
|
|
|
|
event->scroll.x,
|
|
|
|
event->scroll.y,
|
|
|
|
stage_x11,
|
|
|
|
&xev->valuators);
|
|
|
|
|
2012-07-17 10:13:12 -04:00
|
|
|
CLUTTER_NOTE (EVENT,
|
2012-09-21 04:05:59 -04:00
|
|
|
"scroll: win:0x%x, device:%d '%s', time:%d "
|
2012-07-17 10:13:12 -04:00
|
|
|
"(direction:%s, "
|
2012-07-18 13:05:10 -04:00
|
|
|
"x:%.2f, y:%.2f, "
|
|
|
|
"emulated:%s)",
|
2012-07-17 10:13:12 -04:00
|
|
|
(unsigned int) stage_x11->xwin,
|
2012-09-21 04:05:59 -04:00
|
|
|
device->id,
|
2012-07-17 10:13:12 -04:00
|
|
|
device->device_name,
|
|
|
|
event->any.time,
|
|
|
|
event->scroll.direction == CLUTTER_SCROLL_UP ? "up" :
|
|
|
|
event->scroll.direction == CLUTTER_SCROLL_DOWN ? "down" :
|
|
|
|
event->scroll.direction == CLUTTER_SCROLL_LEFT ? "left" :
|
|
|
|
event->scroll.direction == CLUTTER_SCROLL_RIGHT ? "right" :
|
|
|
|
"invalid",
|
|
|
|
event->scroll.x,
|
2012-07-18 13:05:10 -04:00
|
|
|
event->scroll.y,
|
2012-09-02 17:48:52 -04:00
|
|
|
#ifdef HAVE_XINPUT_2_2
|
|
|
|
(xev->flags & XIPointerEmulated) ? "yes" : "no"
|
|
|
|
#else
|
|
|
|
"no"
|
|
|
|
#endif
|
|
|
|
);
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
event->button.type = event->type =
|
|
|
|
(xi_event->evtype == XI_ButtonPress) ? CLUTTER_BUTTON_PRESS
|
|
|
|
: CLUTTER_BUTTON_RELEASE;
|
|
|
|
|
|
|
|
event->button.stage = stage;
|
|
|
|
|
|
|
|
event->button.time = xev->time;
|
|
|
|
event->button.x = xev->event_x;
|
|
|
|
event->button.y = xev->event_y;
|
|
|
|
event->button.button = xev->detail;
|
|
|
|
event->button.modifier_state =
|
|
|
|
_clutter_input_device_xi2_translate_state (&xev->mods,
|
2013-03-05 19:30:52 -05:00
|
|
|
&xev->buttons,
|
|
|
|
&xev->group);
|
2011-01-18 09:09:04 -05:00
|
|
|
|
2011-02-22 12:12:34 -05:00
|
|
|
clutter_event_set_source_device (event, source_device);
|
|
|
|
clutter_event_set_device (event, device);
|
2011-01-18 17:30:21 -05:00
|
|
|
|
|
|
|
event->button.axes = translate_axes (event->button.device,
|
|
|
|
event->button.x,
|
|
|
|
event->button.y,
|
|
|
|
stage_x11,
|
|
|
|
&xev->valuators);
|
2012-07-17 10:13:12 -04:00
|
|
|
|
|
|
|
CLUTTER_NOTE (EVENT,
|
2012-09-21 04:05:59 -04:00
|
|
|
"%s: win:0x%x, device:%d '%s', time:%d "
|
2012-07-18 13:05:10 -04:00
|
|
|
"(button:%d, "
|
|
|
|
"x:%.2f, y:%.2f, "
|
|
|
|
"axes:%s, "
|
|
|
|
"emulated:%s)",
|
2012-07-17 10:13:12 -04:00
|
|
|
event->any.type == CLUTTER_BUTTON_PRESS
|
|
|
|
? "button press "
|
|
|
|
: "button release",
|
|
|
|
(unsigned int) stage_x11->xwin,
|
2012-09-21 04:05:59 -04:00
|
|
|
device->id,
|
2012-07-17 10:13:12 -04:00
|
|
|
device->device_name,
|
|
|
|
event->any.time,
|
|
|
|
event->button.button,
|
|
|
|
event->button.x,
|
|
|
|
event->button.y,
|
2012-07-18 13:05:10 -04:00
|
|
|
event->button.axes != NULL ? "yes" : "no",
|
2012-09-02 17:48:52 -04:00
|
|
|
#ifdef HAVE_XINPUT_2_2
|
|
|
|
(xev->flags & XIPointerEmulated) ? "yes" : "no"
|
|
|
|
#else
|
|
|
|
"no"
|
|
|
|
#endif
|
|
|
|
);
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2011-01-21 10:26:52 -05:00
|
|
|
if (source_device != NULL && device->stage != NULL)
|
|
|
|
_clutter_input_device_set_stage (source_device, device->stage);
|
|
|
|
|
2012-04-11 23:07:34 -04:00
|
|
|
#ifdef HAVE_XINPUT_2_2
|
2012-03-19 10:28:34 -04:00
|
|
|
if (xev->flags & XIPointerEmulated)
|
|
|
|
_clutter_event_set_pointer_emulated (event, TRUE);
|
2012-04-11 23:07:34 -04:00
|
|
|
#endif /* HAVE_XINPUT_2_2 */
|
2012-03-19 10:28:34 -04:00
|
|
|
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
if (xi_event->evtype == XI_ButtonPress)
|
|
|
|
_clutter_stage_x11_set_user_time (stage_x11, event->button.time);
|
|
|
|
|
|
|
|
retval = CLUTTER_TRANSLATE_QUEUE;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case XI_Motion:
|
|
|
|
{
|
|
|
|
XIDeviceEvent *xev = (XIDeviceEvent *) xi_event;
|
2012-03-19 08:16:53 -04:00
|
|
|
gdouble delta_x, delta_y;
|
|
|
|
|
|
|
|
source_device = g_hash_table_lookup (manager_xi2->devices_by_id,
|
|
|
|
GINT_TO_POINTER (xev->sourceid));
|
2012-09-21 08:05:37 -04:00
|
|
|
device = g_hash_table_lookup (manager_xi2->devices_by_id,
|
|
|
|
GINT_TO_POINTER (xev->deviceid));
|
|
|
|
|
|
|
|
/* Set the stage for core events coming out of nowhere (see bug #684509) */
|
|
|
|
if (clutter_input_device_get_device_mode (device) == CLUTTER_INPUT_MODE_MASTER &&
|
|
|
|
clutter_input_device_get_pointer_stage (device) == NULL &&
|
|
|
|
stage != NULL)
|
|
|
|
_clutter_input_device_set_stage (device, stage);
|
2012-03-19 08:16:53 -04:00
|
|
|
|
|
|
|
if (scroll_valuators_changed (source_device,
|
|
|
|
&xev->valuators,
|
|
|
|
&delta_x, &delta_y))
|
|
|
|
{
|
|
|
|
event->scroll.type = event->type = CLUTTER_SCROLL;
|
|
|
|
event->scroll.direction = CLUTTER_SCROLL_SMOOTH;
|
|
|
|
|
|
|
|
event->scroll.stage = stage;
|
|
|
|
event->scroll.time = xev->time;
|
|
|
|
event->scroll.x = xev->event_x;
|
|
|
|
event->scroll.y = xev->event_y;
|
|
|
|
event->scroll.modifier_state =
|
|
|
|
_clutter_input_device_xi2_translate_state (&xev->mods,
|
2013-03-05 19:30:52 -05:00
|
|
|
&xev->buttons,
|
|
|
|
&xev->group);
|
2012-03-19 08:16:53 -04:00
|
|
|
|
|
|
|
clutter_event_set_scroll_delta (event, delta_x, delta_y);
|
|
|
|
clutter_event_set_source_device (event, source_device);
|
|
|
|
clutter_event_set_device (event, device);
|
|
|
|
|
|
|
|
CLUTTER_NOTE (EVENT,
|
2012-09-21 04:05:59 -04:00
|
|
|
"smooth scroll: win:0x%x device:%d '%s' (x:%.2f, y:%.2f, delta:%f, %f)",
|
2012-03-19 08:16:53 -04:00
|
|
|
(unsigned int) stage_x11->xwin,
|
2012-09-21 04:05:59 -04:00
|
|
|
event->scroll.device->id,
|
2012-03-19 08:16:53 -04:00
|
|
|
event->scroll.device->device_name,
|
|
|
|
event->scroll.x,
|
|
|
|
event->scroll.y,
|
|
|
|
delta_x, delta_y);
|
|
|
|
|
|
|
|
retval = CLUTTER_TRANSLATE_QUEUE;
|
|
|
|
break;
|
|
|
|
}
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
|
|
|
|
event->motion.type = event->type = CLUTTER_MOTION;
|
|
|
|
|
|
|
|
event->motion.stage = stage;
|
|
|
|
|
|
|
|
event->motion.time = xev->time;
|
|
|
|
event->motion.x = xev->event_x;
|
|
|
|
event->motion.y = xev->event_y;
|
|
|
|
event->motion.modifier_state =
|
|
|
|
_clutter_input_device_xi2_translate_state (&xev->mods,
|
2013-03-05 19:30:52 -05:00
|
|
|
&xev->buttons,
|
|
|
|
&xev->group);
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
|
2011-02-22 12:12:34 -05:00
|
|
|
clutter_event_set_source_device (event, source_device);
|
|
|
|
clutter_event_set_device (event, device);
|
2011-01-18 09:09:04 -05:00
|
|
|
|
2011-01-18 17:30:21 -05:00
|
|
|
event->motion.axes = translate_axes (event->motion.device,
|
|
|
|
event->motion.x,
|
|
|
|
event->motion.y,
|
|
|
|
stage_x11,
|
|
|
|
&xev->valuators);
|
|
|
|
|
2011-01-21 10:26:52 -05:00
|
|
|
if (source_device != NULL && device->stage != NULL)
|
|
|
|
_clutter_input_device_set_stage (source_device, device->stage);
|
|
|
|
|
2012-04-11 23:07:34 -04:00
|
|
|
#ifdef HAVE_XINPUT_2_2
|
2012-03-19 10:28:34 -04:00
|
|
|
if (xev->flags & XIPointerEmulated)
|
|
|
|
_clutter_event_set_pointer_emulated (event, TRUE);
|
2012-04-11 23:07:34 -04:00
|
|
|
#endif /* HAVE_XINPUT_2_2 */
|
2012-03-19 10:28:34 -04:00
|
|
|
|
2012-09-21 04:05:59 -04:00
|
|
|
CLUTTER_NOTE (EVENT, "motion: win:0x%x device:%d '%s' (x:%.2f, y:%.2f, axes:%s)",
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
(unsigned int) stage_x11->xwin,
|
2012-09-21 04:05:59 -04:00
|
|
|
event->motion.device->id,
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
event->motion.device->device_name,
|
|
|
|
event->motion.x,
|
2011-01-21 10:26:52 -05:00
|
|
|
event->motion.y,
|
|
|
|
event->motion.axes != NULL ? "yes" : "no");
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
|
|
|
|
retval = CLUTTER_TRANSLATE_QUEUE;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2012-04-11 23:07:34 -04:00
|
|
|
#ifdef HAVE_XINPUT_2_2
|
2012-03-19 10:28:34 -04:00
|
|
|
case XI_TouchBegin:
|
|
|
|
case XI_TouchEnd:
|
|
|
|
{
|
|
|
|
XIDeviceEvent *xev = (XIDeviceEvent *) xi_event;
|
|
|
|
|
|
|
|
source_device = g_hash_table_lookup (manager_xi2->devices_by_id,
|
|
|
|
GINT_TO_POINTER (xev->sourceid));
|
|
|
|
|
|
|
|
if (xi_event->evtype == XI_TouchBegin)
|
|
|
|
event->touch.type = event->type = CLUTTER_TOUCH_BEGIN;
|
|
|
|
else
|
|
|
|
event->touch.type = event->type = CLUTTER_TOUCH_END;
|
|
|
|
|
|
|
|
event->touch.stage = stage;
|
|
|
|
event->touch.time = xev->time;
|
|
|
|
event->touch.x = xev->event_x;
|
|
|
|
event->touch.y = xev->event_y;
|
|
|
|
event->touch.modifier_state =
|
|
|
|
_clutter_input_device_xi2_translate_state (&xev->mods,
|
2013-03-05 19:30:52 -05:00
|
|
|
&xev->buttons,
|
|
|
|
&xev->group);
|
2012-03-19 10:28:34 -04:00
|
|
|
|
|
|
|
clutter_event_set_source_device (event, source_device);
|
|
|
|
|
|
|
|
device = g_hash_table_lookup (manager_xi2->devices_by_id,
|
|
|
|
GINT_TO_POINTER (xev->deviceid));
|
|
|
|
clutter_event_set_device (event, device);
|
|
|
|
|
2012-05-03 12:58:12 -04:00
|
|
|
event->touch.axes = translate_axes (event->touch.device,
|
2012-03-19 10:28:34 -04:00
|
|
|
event->motion.x,
|
|
|
|
event->motion.y,
|
|
|
|
stage_x11,
|
|
|
|
&xev->valuators);
|
|
|
|
|
|
|
|
if (xi_event->evtype == XI_TouchBegin)
|
|
|
|
{
|
|
|
|
event->touch.modifier_state |= CLUTTER_BUTTON1_MASK;
|
|
|
|
|
|
|
|
_clutter_stage_x11_set_user_time (stage_x11, event->touch.time);
|
|
|
|
}
|
|
|
|
|
|
|
|
event->touch.sequence = GUINT_TO_POINTER (xev->detail);
|
|
|
|
|
|
|
|
if (xev->flags & XITouchEmulatingPointer)
|
|
|
|
_clutter_event_set_pointer_emulated (event, TRUE);
|
|
|
|
|
2012-09-21 04:05:59 -04:00
|
|
|
CLUTTER_NOTE (EVENT, "touch %s: win:0x%x device:%d '%s' (seq:%d, x:%.2f, y:%.2f, axes:%s)",
|
2012-03-19 10:28:34 -04:00
|
|
|
event->type == CLUTTER_TOUCH_BEGIN ? "begin" : "end",
|
|
|
|
(unsigned int) stage_x11->xwin,
|
2012-09-21 04:05:59 -04:00
|
|
|
event->touch.device->id,
|
2012-03-19 10:28:34 -04:00
|
|
|
event->touch.device->device_name,
|
2012-09-05 04:38:17 -04:00
|
|
|
GPOINTER_TO_UINT (event->touch.sequence),
|
2012-03-19 10:28:34 -04:00
|
|
|
event->touch.x,
|
|
|
|
event->touch.y,
|
|
|
|
event->touch.axes != NULL ? "yes" : "no");
|
|
|
|
|
|
|
|
retval = CLUTTER_TRANSLATE_QUEUE;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case XI_TouchUpdate:
|
|
|
|
{
|
|
|
|
XIDeviceEvent *xev = (XIDeviceEvent *) xi_event;
|
|
|
|
|
|
|
|
source_device = g_hash_table_lookup (manager_xi2->devices_by_id,
|
|
|
|
GINT_TO_POINTER (xev->sourceid));
|
|
|
|
|
|
|
|
event->touch.type = event->type = CLUTTER_TOUCH_UPDATE;
|
|
|
|
event->touch.stage = stage;
|
|
|
|
event->touch.time = xev->time;
|
|
|
|
event->touch.sequence = GUINT_TO_POINTER (xev->detail);
|
|
|
|
event->touch.x = xev->event_x;
|
|
|
|
event->touch.y = xev->event_y;
|
|
|
|
|
|
|
|
clutter_event_set_source_device (event, source_device);
|
|
|
|
|
|
|
|
device = g_hash_table_lookup (manager_xi2->devices_by_id,
|
|
|
|
GINT_TO_POINTER (xev->deviceid));
|
|
|
|
clutter_event_set_device (event, device);
|
|
|
|
|
2012-05-03 12:58:12 -04:00
|
|
|
event->touch.axes = translate_axes (event->touch.device,
|
2012-03-19 10:28:34 -04:00
|
|
|
event->motion.x,
|
|
|
|
event->motion.y,
|
|
|
|
stage_x11,
|
|
|
|
&xev->valuators);
|
|
|
|
|
|
|
|
event->touch.modifier_state =
|
|
|
|
_clutter_input_device_xi2_translate_state (&xev->mods,
|
2013-03-05 19:30:52 -05:00
|
|
|
&xev->buttons,
|
|
|
|
&xev->group);
|
2012-03-19 10:28:34 -04:00
|
|
|
event->touch.modifier_state |= CLUTTER_BUTTON1_MASK;
|
|
|
|
|
|
|
|
if (xev->flags & XITouchEmulatingPointer)
|
|
|
|
_clutter_event_set_pointer_emulated (event, TRUE);
|
|
|
|
|
2012-09-21 04:05:59 -04:00
|
|
|
CLUTTER_NOTE (EVENT, "touch update: win:0x%x device:%d '%s' (seq:%d, x:%.2f, y:%.2f, axes:%s)",
|
2012-03-19 10:28:34 -04:00
|
|
|
(unsigned int) stage_x11->xwin,
|
2012-09-21 04:05:59 -04:00
|
|
|
event->touch.device->id,
|
2012-03-19 10:28:34 -04:00
|
|
|
event->touch.device->device_name,
|
2012-09-05 04:38:17 -04:00
|
|
|
GPOINTER_TO_UINT (event->touch.sequence),
|
2012-03-19 10:28:34 -04:00
|
|
|
event->touch.x,
|
|
|
|
event->touch.y,
|
|
|
|
event->touch.axes != NULL ? "yes" : "no");
|
|
|
|
|
|
|
|
retval = CLUTTER_TRANSLATE_QUEUE;
|
|
|
|
}
|
|
|
|
break;
|
2012-04-11 23:07:34 -04:00
|
|
|
#endif /* HAVE_XINPUT_2_2 */
|
2012-03-19 10:28:34 -04:00
|
|
|
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
case XI_Enter:
|
|
|
|
case XI_Leave:
|
|
|
|
{
|
|
|
|
XIEnterEvent *xev = (XIEnterEvent *) xi_event;
|
|
|
|
|
|
|
|
device = g_hash_table_lookup (manager_xi2->devices_by_id,
|
|
|
|
GINT_TO_POINTER (xev->deviceid));
|
|
|
|
|
2011-01-27 12:26:16 -05:00
|
|
|
source_device = g_hash_table_lookup (manager_xi2->devices_by_id,
|
|
|
|
GINT_TO_POINTER (xev->sourceid));
|
|
|
|
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
if (xi_event->evtype == XI_Enter)
|
|
|
|
{
|
2011-01-27 12:26:16 -05:00
|
|
|
event->crossing.type = event->type = CLUTTER_ENTER;
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
|
2011-01-27 12:26:16 -05:00
|
|
|
event->crossing.stage = stage;
|
|
|
|
event->crossing.source = CLUTTER_ACTOR (stage);
|
|
|
|
event->crossing.related = NULL;
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
|
2011-01-27 12:26:16 -05:00
|
|
|
event->crossing.time = xev->time;
|
|
|
|
event->crossing.x = xev->event_x;
|
|
|
|
event->crossing.y = xev->event_y;
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
|
2012-08-31 12:36:57 -04:00
|
|
|
_clutter_input_device_set_stage (device, stage);
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (device->stage == NULL)
|
|
|
|
{
|
|
|
|
CLUTTER_NOTE (EVENT,
|
|
|
|
"Discarding Leave for ButtonRelease "
|
|
|
|
"event off-stage");
|
|
|
|
|
|
|
|
retval = CLUTTER_TRANSLATE_REMOVE;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
event->crossing.type = event->type = CLUTTER_LEAVE;
|
|
|
|
|
2011-01-27 12:26:16 -05:00
|
|
|
event->crossing.stage = stage;
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
event->crossing.source = CLUTTER_ACTOR (stage);
|
2011-01-27 12:26:16 -05:00
|
|
|
event->crossing.related = NULL;
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
|
|
|
|
event->crossing.time = xev->time;
|
|
|
|
event->crossing.x = xev->event_x;
|
|
|
|
event->crossing.y = xev->event_y;
|
2011-01-27 12:26:16 -05:00
|
|
|
|
2012-08-31 12:36:57 -04:00
|
|
|
_clutter_input_device_set_stage (device, NULL);
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
}
|
|
|
|
|
2012-03-19 10:27:54 -04:00
|
|
|
_clutter_input_device_reset_scroll_info (source_device);
|
|
|
|
|
2011-01-27 12:26:16 -05:00
|
|
|
clutter_event_set_device (event, device);
|
2011-02-22 12:12:34 -05:00
|
|
|
clutter_event_set_source_device (event, source_device);
|
2011-01-27 12:26:16 -05:00
|
|
|
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
retval = CLUTTER_TRANSLATE_QUEUE;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case XI_FocusIn:
|
|
|
|
case XI_FocusOut:
|
|
|
|
retval = CLUTTER_TRANSLATE_CONTINUE;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
clutter_event_translator_iface_init (ClutterEventTranslatorIface *iface)
|
|
|
|
{
|
|
|
|
iface->translate_event = clutter_device_manager_xi2_translate_event;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
clutter_device_manager_xi2_add_device (ClutterDeviceManager *manager,
|
|
|
|
ClutterInputDevice *device)
|
|
|
|
{
|
2011-01-18 08:02:15 -05:00
|
|
|
/* XXX implement */
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
clutter_device_manager_xi2_remove_device (ClutterDeviceManager *manager,
|
|
|
|
ClutterInputDevice *device)
|
|
|
|
{
|
2011-01-18 08:02:15 -05:00
|
|
|
/* XXX implement */
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
static const GSList *
|
|
|
|
clutter_device_manager_xi2_get_devices (ClutterDeviceManager *manager)
|
|
|
|
{
|
|
|
|
ClutterDeviceManagerXI2 *manager_xi2 = CLUTTER_DEVICE_MANAGER_XI2 (manager);
|
|
|
|
GSList *all_devices = NULL;
|
|
|
|
GList *l;
|
|
|
|
|
|
|
|
if (manager_xi2->all_devices != NULL)
|
|
|
|
return manager_xi2->all_devices;
|
|
|
|
|
|
|
|
for (l = manager_xi2->master_devices; l != NULL; l = l->next)
|
|
|
|
all_devices = g_slist_prepend (all_devices, l->data);
|
|
|
|
|
|
|
|
for (l = manager_xi2->slave_devices; l != NULL; l = l->next)
|
|
|
|
all_devices = g_slist_prepend (all_devices, l->data);
|
|
|
|
|
|
|
|
manager_xi2->all_devices = g_slist_reverse (all_devices);
|
|
|
|
|
|
|
|
return manager_xi2->all_devices;
|
|
|
|
}
|
|
|
|
|
|
|
|
static ClutterInputDevice *
|
|
|
|
clutter_device_manager_xi2_get_device (ClutterDeviceManager *manager,
|
|
|
|
gint id)
|
|
|
|
{
|
|
|
|
ClutterDeviceManagerXI2 *manager_xi2 = CLUTTER_DEVICE_MANAGER_XI2 (manager);
|
|
|
|
|
|
|
|
return g_hash_table_lookup (manager_xi2->devices_by_id,
|
|
|
|
GINT_TO_POINTER (id));
|
|
|
|
}
|
|
|
|
|
|
|
|
static ClutterInputDevice *
|
|
|
|
clutter_device_manager_xi2_get_core_device (ClutterDeviceManager *manager,
|
|
|
|
ClutterInputDeviceType device_type)
|
|
|
|
{
|
2011-01-18 08:03:07 -05:00
|
|
|
ClutterDeviceManagerXI2 *manager_xi2 = CLUTTER_DEVICE_MANAGER_XI2 (manager);
|
|
|
|
ClutterBackendX11 *backend_x11;
|
|
|
|
ClutterInputDevice *device;
|
|
|
|
int device_id;
|
|
|
|
|
|
|
|
backend_x11 =
|
|
|
|
CLUTTER_BACKEND_X11 (_clutter_device_manager_get_backend (manager));
|
|
|
|
|
|
|
|
XIGetClientPointer (backend_x11->xdpy, None, &device_id);
|
|
|
|
|
|
|
|
device = g_hash_table_lookup (manager_xi2->devices_by_id,
|
|
|
|
GINT_TO_POINTER (device_id));
|
|
|
|
|
|
|
|
switch (device_type)
|
|
|
|
{
|
|
|
|
case CLUTTER_POINTER_DEVICE:
|
|
|
|
return device;
|
|
|
|
|
|
|
|
case CLUTTER_KEYBOARD_DEVICE:
|
|
|
|
return clutter_input_device_get_associated_device (device);
|
|
|
|
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
relate_masters (gpointer key,
|
|
|
|
gpointer value,
|
|
|
|
gpointer data)
|
|
|
|
{
|
|
|
|
ClutterDeviceManagerXI2 *manager_xi2 = data;
|
|
|
|
ClutterInputDevice *device, *relative;
|
|
|
|
|
|
|
|
device = g_hash_table_lookup (manager_xi2->devices_by_id, key);
|
|
|
|
relative = g_hash_table_lookup (manager_xi2->devices_by_id, value);
|
|
|
|
|
|
|
|
_clutter_input_device_set_associated_device (device, relative);
|
|
|
|
_clutter_input_device_set_associated_device (relative, device);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
relate_slaves (gpointer key,
|
|
|
|
gpointer value,
|
|
|
|
gpointer data)
|
|
|
|
{
|
|
|
|
ClutterDeviceManagerXI2 *manager_xi2 = data;
|
|
|
|
ClutterInputDevice *master, *slave;
|
|
|
|
|
2013-01-31 17:11:23 -05:00
|
|
|
slave = g_hash_table_lookup (manager_xi2->devices_by_id, key);
|
|
|
|
master = g_hash_table_lookup (manager_xi2->devices_by_id, value);
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
|
|
|
|
_clutter_input_device_set_associated_device (slave, master);
|
|
|
|
_clutter_input_device_add_slave (master, slave);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
clutter_device_manager_xi2_constructed (GObject *gobject)
|
|
|
|
{
|
|
|
|
ClutterDeviceManagerXI2 *manager_xi2 = CLUTTER_DEVICE_MANAGER_XI2 (gobject);
|
|
|
|
ClutterDeviceManager *manager = CLUTTER_DEVICE_MANAGER (gobject);
|
|
|
|
ClutterBackendX11 *backend_x11;
|
|
|
|
GHashTable *masters, *slaves;
|
|
|
|
XIDeviceInfo *info;
|
|
|
|
XIEventMask event_mask;
|
|
|
|
unsigned char mask[2] = { 0, };
|
|
|
|
int n_devices, i;
|
|
|
|
|
|
|
|
backend_x11 =
|
|
|
|
CLUTTER_BACKEND_X11 (_clutter_device_manager_get_backend (manager));
|
|
|
|
|
|
|
|
masters = g_hash_table_new (NULL, NULL);
|
|
|
|
slaves = g_hash_table_new (NULL, NULL);
|
|
|
|
|
|
|
|
info = XIQueryDevice (backend_x11->xdpy, XIAllDevices, &n_devices);
|
|
|
|
|
|
|
|
for (i = 0; i < n_devices; i++)
|
|
|
|
{
|
|
|
|
XIDeviceInfo *xi_device = &info[i];
|
|
|
|
|
2011-02-19 11:44:38 -05:00
|
|
|
add_device (manager_xi2, backend_x11, xi_device, TRUE);
|
event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.
The new design for handling X11 event translation works this way:
- ClutterBackend::translate_event() has been added as the central
point used by a ClutterBackend implementation to translate a
native event into a ClutterEvent;
- ClutterEventTranslator is a private interface that should be
implemented by backend-specific objects, like stage
implementations and ClutterDeviceManager sub-classes, and
allows dealing with class-specific event translation;
- ClutterStageX11 implements EventTranslator, and deals with the
stage-relative X11 events coming from the X11 event source;
- ClutterStageGLX overrides EventTranslator, in order to
deal with the INTEL_GLX_swap_event extension, and it chains up
to the X11 default implementation;
- ClutterDeviceManagerX11 has been split into two separate classes,
one that deals with core and (optionally) XI1 events, and the
other that deals with XI2 events; the selection is done at run-time,
since the core+XI1 and XI2 mechanisms are mutually exclusive.
All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-04 07:32:04 -05:00
|
|
|
|
|
|
|
if (xi_device->use == XIMasterPointer ||
|
|
|
|
xi_device->use == XIMasterKeyboard)
|
|
|
|
{
|
|
|
|
g_hash_table_insert (masters,
|
|
|
|
GINT_TO_POINTER (xi_device->deviceid),
|
|
|
|
GINT_TO_POINTER (xi_device->attachment));
|
|
|
|
}
|
|
|
|
else if (xi_device->use == XISlavePointer ||
|
|
|
|
xi_device->use == XISlaveKeyboard)
|
|
|
|
{
|
|
|
|
g_hash_table_insert (slaves,
|
|
|
|
GINT_TO_POINTER (xi_device->deviceid),
|
|
|
|
GINT_TO_POINTER (xi_device->attachment));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
XIFreeDeviceInfo (info);
|
|
|
|
|
|
|
|
g_hash_table_foreach (masters, relate_masters, manager_xi2);
|
|
|
|
g_hash_table_destroy (masters);
|
|
|
|
|
|
|
|
g_hash_table_foreach (slaves, relate_slaves, manager_xi2);
|
|
|
|
g_hash_table_destroy (slaves);
|
|
|
|
|
|
|
|
XISetMask (mask, XI_HierarchyChanged);
|
|
|
|
XISetMask (mask, XI_DeviceChanged);
|
|
|
|
|
|
|
|
event_mask.deviceid = XIAllDevices;
|
|
|
|
event_mask.mask_len = sizeof (mask);
|
|
|
|
event_mask.mask = mask;
|
|
|
|
|
|
|
|
clutter_device_manager_xi2_select_events (manager,
|
|
|
|
clutter_x11_get_root_window (),
|
|
|
|
&event_mask);
|
|
|
|
|
|
|
|
if (G_OBJECT_CLASS (clutter_device_manager_xi2_parent_class)->constructed)
|
|
|
|
G_OBJECT_CLASS (clutter_device_manager_xi2_parent_class)->constructed (gobject);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
clutter_device_manager_xi2_set_property (GObject *gobject,
|
|
|
|
guint prop_id,
|
|
|
|
const GValue *value,
|
|
|
|
GParamSpec *pspec)
|
|
|
|
{
|
|
|
|
ClutterDeviceManagerXI2 *manager_xi2 = CLUTTER_DEVICE_MANAGER_XI2 (gobject);
|
|
|
|
|
|
|
|
switch (prop_id)
|
|
|
|
{
|
|
|
|
case PROP_OPCODE:
|
|
|
|
manager_xi2->opcode = g_value_get_int (value);
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
clutter_device_manager_xi2_class_init (ClutterDeviceManagerXI2Class *klass)
|
|
|
|
{
|
|
|
|
ClutterDeviceManagerClass *manager_class;
|
|
|
|
GObjectClass *gobject_class;
|
|
|
|
|
|
|
|
obj_props[PROP_OPCODE] =
|
|
|
|
g_param_spec_int ("opcode",
|
|
|
|
"Opcode",
|
|
|
|
"The XI2 opcode",
|
|
|
|
-1, G_MAXINT,
|
|
|
|
-1,
|
|
|
|
CLUTTER_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY);
|
|
|
|
|
|
|
|
gobject_class = G_OBJECT_CLASS (klass);
|
|
|
|
gobject_class->constructed = clutter_device_manager_xi2_constructed;
|
|
|
|
gobject_class->set_property = clutter_device_manager_xi2_set_property;
|
|
|
|
|
|
|
|
g_object_class_install_properties (gobject_class, PROP_LAST, obj_props);
|
|
|
|
|
|
|
|
manager_class = CLUTTER_DEVICE_MANAGER_CLASS (klass);
|
|
|
|
manager_class->add_device = clutter_device_manager_xi2_add_device;
|
|
|
|
manager_class->remove_device = clutter_device_manager_xi2_remove_device;
|
|
|
|
manager_class->get_devices = clutter_device_manager_xi2_get_devices;
|
|
|
|
manager_class->get_core_device = clutter_device_manager_xi2_get_core_device;
|
|
|
|
manager_class->get_device = clutter_device_manager_xi2_get_device;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
clutter_device_manager_xi2_init (ClutterDeviceManagerXI2 *self)
|
|
|
|
{
|
|
|
|
self->devices_by_id = g_hash_table_new_full (NULL, NULL,
|
|
|
|
NULL,
|
|
|
|
(GDestroyNotify) g_object_unref);
|
|
|
|
}
|