win32: Update DeviceManager device creation

This commit is contained in:
Emmanuele Bassi 2011-01-19 16:34:37 +00:00
parent 73cf6bd52c
commit 400ecdfc81

View File

@ -48,12 +48,16 @@ static void
clutter_device_manager_win32_constructed (GObject *gobject) clutter_device_manager_win32_constructed (GObject *gobject)
{ {
ClutterDeviceManager *manager = CLUTTER_DEVICE_MANAGER (gobject); ClutterDeviceManager *manager = CLUTTER_DEVICE_MANAGER (gobject);
ClutterDeviceManagerWin32 *manager_win32;
ClutterInputDevice *device; ClutterInputDevice *device;
device = g_object_new (CLUTTER_TYPE_INPUT_DEVICE, device = g_object_new (CLUTTER_TYPE_INPUT_DEVICE,
"id", 0, "id", 0,
"name", "Core Pointer", "name", "Core Pointer",
"device-type", CLUTTER_POINTER_DEVICE, "device-type", CLUTTER_POINTER_DEVICE,
"device-mode", CLUTTER_INPUT_MODE_MASTER,
"has-cursor", TRUE,
"enabled", TRUE,
NULL); NULL);
CLUTTER_NOTE (BACKEND, "Added core pointer device"); CLUTTER_NOTE (BACKEND, "Added core pointer device");
_clutter_device_manager_add_device (manager, device); _clutter_device_manager_add_device (manager, device);
@ -62,9 +66,18 @@ clutter_device_manager_win32_constructed (GObject *gobject)
"id", 1, "id", 1,
"name", "Core Keyboard", "name", "Core Keyboard",
"device-type", CLUTTER_KEYBOARD_DEVICE, "device-type", CLUTTER_KEYBOARD_DEVICE,
"device-mode", CLUTTER_INPUT_MODE_MASTER,
"enabled", TRUE,
NULL); NULL);
CLUTTER_NOTE (BACKEND, "Added core keyboard device"); CLUTTER_NOTE (BACKEND, "Added core keyboard device");
_clutter_device_manager_add_device (manager, device); _clutter_device_manager_add_device (manager, device);
manager_win32 = CLUTTER_DEVICE_MANAGER_WIN32 (manager);
_clutter_input_device_set_associated_device (manager_win32->core_pointer,
manager_win32->core_keyboard);
_clutter_input_device_set_associated_device (manager_win32->core_keyboard,
manager_win32->core_pointer);
} }
static void static void