install: true,
)
-# input_generator_files = ['input-generator.c']
-# input_generator_deps = [
-# dependency('wayland-client', required: true),
-# tizen_extension_client,
-# ]
-#
-# executable('input-generator',
-# input_generator_files,
-# dependencies: input_generator_deps,
-# install_dir: libds_tizen_bindir,
-# install: true,
-# )
+input_generator_files = ['input-generator.c']
+input_generator_deps = [
+ dependency('wayland-client', required: true),
+ tizen_extension_client,
+]
+
+executable('input-generator',
+ input_generator_files,
+ dependencies: input_generator_deps,
+ install_dir: libds_tizen_bindir,
+ install: true,
+)
'tinyds-tdm-renderer.c',
]
-#executable('tinyds-tdm-libinput',
-# tinyds_tdm_libinput_files,
-# dependencies: [
-# common_deps,
-# dependency('pixman-1', required: true),
-# dependency('threads', required: true),
-# ],
-# install_dir: libds_tizen_bindir,
-# install : true
-#)
+executable('tinyds-tdm-libinput',
+ tinyds_tdm_libinput_files,
+ dependencies: [
+ common_deps,
+ dep_libds_tizen_input_devicemgr,
+ dependency('pixman-1', required: true),
+ dependency('threads', required: true),
+ ],
+ install_dir: libds_tizen_bindir,
+ install : true
+)
executable('tinyds-tdm-dpms',
'tinyds-tdm-dpms.c',
%description keyrouter-devel
Keyrouter Development package for Wayland Compositor Library
-%package tizen-input-devicemgr
+%package input-devicemgr
Summary: Library for tizen input devicemgr
Group: Development/Libraries
-%description tizen-input-devicemgr
+%description input-devicemgr
Library for tizen input devicemgr
-%package tizen-input-devicemgr-devel
+%package input-devicemgr-devel
Summary: Development package for tizen input devicemgr
Group: Development/Libraries
-%description tizen-input-devicemgr-devel
+%description input-devicemgr-devel
Development package for tizen input devicemgr
%prep
%{_bindir}/ds-simple-tbm
%{_bindir}/tinyds-tdm-dpms
%{_bindir}/ds-simple-dpms
+%{_bindir}/tinyds-tdm-libinput
+%{_bindir}/input-generator
%files keyrouter
%manifest %{name}.manifest
%{_libdir}/pkgconfig/libds-tizen-keyrouter.pc
%{_libdir}/libds-tizen-keyrouter.so
-# %files input-devicemgr
-# %manifest %{name}.manifest
-# %defattr(-,root,root,-)
-# %license LICENSE
-# %{_libdir}/libds-tizen-input-devicemgr.so.*
-#
-# %files input-devicemgr-devel
-# %manifest %{name}.manifest
-# %defattr(-,root,root,-)
-# %license LICENSE
-# %{_includedir}/libds-tizen/input-devicemgr.h
-# %{_libdir}/pkgconfig/libds-tizen-input-devicemgr.pc
-# %{_libdir}/libds-tizen-input-devicemgr.so
-# %{_bindir}/tinyds-tdm-libinput
-# %{_bindir}/input-generator
+%files input-devicemgr
+%manifest %{name}.manifest
+%defattr(-,root,root,-)
+%license LICENSE
+%{_libdir}/libds-tizen-input-devicemgr.so.*
+
+%files input-devicemgr-devel
+%manifest %{name}.manifest
+%defattr(-,root,root,-)
+%license LICENSE
+%{_includedir}/libds-tizen/input-devicemgr.h
+%{_libdir}/pkgconfig/libds-tizen-input-devicemgr.pc
+%{_libdir}/libds-tizen-input-devicemgr.so
+%{_bindir}/tinyds-tdm-libinput
+%{_bindir}/input-generator
#include <libds-tizen/input-devicemgr.h>
#include <libds/interfaces/backend.h>
#include <libds/interfaces/keyboard.h>
-#include <libds/seat.h>
#include "util.h"
#include "input-devicemgr.h"
-#include "src/libds/seat.h"
#define TIZEN_INPUT_DEVICEMGR_VERSION 4
#define TIZEN_PRIV_INPUT_GENERATOR "http://tizen.org/privilege/inputgenerator"
goto err_kbd;
}
- tz_devicemgr->grab = calloc(1, sizeof(struct ds_seat_keyboard_grab));
- if (!tz_devicemgr->grab)
- {
+ tz_devicemgr->grab = ds_seat_create_keyboard_grab(
+ tz_devicemgr->seat, &devicemgr_keyboard_grab_iface, tz_devicemgr);
+ if (!tz_devicemgr->grab) {
goto err_grab;
}
- tz_devicemgr->grab->iface = &devicemgr_keyboard_grab_iface;
- tz_devicemgr->grab->seat = tz_devicemgr->seat;
- tz_devicemgr->grab->data = tz_devicemgr;
-
wl_signal_init(&tz_devicemgr->events.destroy);
wl_list_init(&tz_devicemgr->clients);
wl_list_init(&tz_devicemgr->pressed_keys);
ds_inf("Global created: ds_tizen_input_devicemgr(%p) ", tz_devicemgr);
return tz_devicemgr;
+
err_grab:
free(tz_devicemgr->devices.kbd);
err_kbd:
tz_devicemgr_keymap_list_cleanup(tz_devicemgr);
tz_devicemgr_blocked_keys_cleanup(tz_devicemgr);
tz_devicemgr_ungrab_keyboard(tz_devicemgr);
+ ds_seat_keyboard_destroy_grab(tz_devicemgr->grab);
wl_signal_emit(&tz_devicemgr->events.destroy, tz_devicemgr);
wl_list_remove(&tz_devicemgr->backend_destroy.link);
}
free(tz_devicemgr->devices.kbd);
- free(tz_devicemgr->grab);
free(tz_devicemgr);
}
devicemgr_keyboard_grab_iface_key(struct ds_seat_keyboard_grab *grab,
uint32_t time_msec, uint32_t key, uint32_t state)
{
- struct ds_tizen_input_devicemgr *devicemgr = grab->data;
+ struct ds_tizen_input_devicemgr *devicemgr;
struct ds_tizen_input_devicemgr_key_info *keydata, *tmp;
bool key_blocked = false;
ds_inf("devicemgr. keyboard_grab_iface_key");
+ devicemgr = ds_seat_keyboard_grab_get_data(grab);
if (!devicemgr->block_resource) {
if (state == WL_KEYBOARD_KEY_STATE_PRESSED) {
goto finish;
finish:
tizen_input_device_manager_send_error(resource, ret);
-}
\ No newline at end of file
+}
+
#include <linux/uinput.h>
#include <wayland-server.h>
#include <tizen-extension-server-protocol.h>
-#include "libds/interfaces/input_device.h"
+#include <libds/interfaces/input_device.h>
#include <libds/seat.h>
struct ds_tizen_input_devicemgr_device {
)
subdir('keyrouter')
-#subdir('input-devicemgr')
+subdir('input-devicemgr')