forked from enlightenment/enlightenment
freebsd: make elput optional.
This commit is contained in:
parent
56d2cdc294
commit
e1eed5190b
|
@ -1,3 +1,3 @@
|
||||||
#!/bin/sh -e
|
#!/bin/sh -e
|
||||||
meson -Dsystemd=false -Ddevice-udev=false -Dgesture-recognition=false \
|
meson -Dsystemd=false -Delput=false -Ddevice-udev=false -Dgesture-recognition=false \
|
||||||
$@ . build
|
$@ . build
|
||||||
|
|
|
@ -309,7 +309,7 @@ dep_eo = dependency('eo' , required: true)
|
||||||
dep_eldbus = dependency('eldbus' , required: true)
|
dep_eldbus = dependency('eldbus' , required: true)
|
||||||
dep_emotion = dependency('emotion' , required: true)
|
dep_emotion = dependency('emotion' , required: true)
|
||||||
dep_elementary = dependency('elementary' , required: true)
|
dep_elementary = dependency('elementary' , required: true)
|
||||||
dep_elput = dependency('elput' , required: true)
|
dep_elput = dependency('elput' , required: false)
|
||||||
|
|
||||||
dep_wayland = []
|
dep_wayland = []
|
||||||
if get_option('wl') == true
|
if get_option('wl') == true
|
||||||
|
@ -361,6 +361,10 @@ else
|
||||||
dep_ecore_x = dependency('ecore-x')
|
dep_ecore_x = dependency('ecore-x')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
if get_option('elput') == true
|
||||||
|
config_h.set('HAVE_ELPUT', '1')
|
||||||
|
endif
|
||||||
|
|
||||||
dep_xkeyboard_config = dependency('xkeyboard-config', required: false)
|
dep_xkeyboard_config = dependency('xkeyboard-config', required: false)
|
||||||
if dep_xkeyboard_config.found() == true
|
if dep_xkeyboard_config.found() == true
|
||||||
config_h.set_quoted('XKB_BASE', dep_xkeyboard_config.get_pkgconfig_variable('xkb_base'))
|
config_h.set_quoted('XKB_BASE', dep_xkeyboard_config.get_pkgconfig_variable('xkb_base'))
|
||||||
|
|
|
@ -40,6 +40,11 @@ option('libexif',
|
||||||
value: true,
|
value: true,
|
||||||
description: 'enable EXIF support: (default=true)')
|
description: 'enable EXIF support: (default=true)')
|
||||||
|
|
||||||
|
option('elput',
|
||||||
|
type: 'boolean',
|
||||||
|
value: true,
|
||||||
|
description: 'enable elput support: (default=true)')
|
||||||
|
|
||||||
option('device-udev',
|
option('device-udev',
|
||||||
type: 'boolean',
|
type: 'boolean',
|
||||||
value: true,
|
value: true,
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
#ifdef HAVE_ELPUT
|
||||||
|
|
||||||
#include <e.h>
|
#include <e.h>
|
||||||
#include <Eina.h>
|
#include <Eina.h>
|
||||||
#include <grp.h>
|
#include <grp.h>
|
||||||
|
@ -247,3 +249,5 @@ e_bindings_gesture_capable_devices_get(void)
|
||||||
{
|
{
|
||||||
return gesture_capable_devices;
|
return gesture_capable_devices;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
#ifdef HAVE_ELPUT
|
||||||
|
|
||||||
#ifdef E_TYPEDEFS
|
#ifdef E_TYPEDEFS
|
||||||
|
|
||||||
typedef void (*E_Bindings_Swipe_Live_Update)(void *data, Eina_Bool end, double direction, double length, double error, unsigned int fingers);
|
typedef void (*E_Bindings_Swipe_Live_Update)(void *data, Eina_Bool end, double direction, double length, double error, unsigned int fingers);
|
||||||
|
@ -11,3 +13,5 @@ E_API void e_bindings_swipe_live_update_hook_set(E_Bindings_Swipe_Live_Update up
|
||||||
E_API int e_bindings_gesture_capable_devices_get(void);
|
E_API int e_bindings_gesture_capable_devices_get(void);
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
|
@ -1053,11 +1053,12 @@ main(int argc, char **argv)
|
||||||
TS("E_Comp_Canvas Keys Grab");
|
TS("E_Comp_Canvas Keys Grab");
|
||||||
e_comp_canvas_keys_grab();
|
e_comp_canvas_keys_grab();
|
||||||
TS("E_Comp_Canvas Keys Grab Done");
|
TS("E_Comp_Canvas Keys Grab Done");
|
||||||
|
#ifdef HAVE_ELPUT
|
||||||
TS("E_Gesture Init");
|
TS("E_Gesture Init");
|
||||||
e_gesture_init();
|
e_gesture_init();
|
||||||
TS("E_Gesture Init Done");
|
TS("E_Gesture Init Done");
|
||||||
_e_main_shutdown_push(e_gesture_shutdown);
|
_e_main_shutdown_push(e_gesture_shutdown);
|
||||||
|
#endif
|
||||||
|
|
||||||
TS("Run Startup Apps");
|
TS("Run Startup Apps");
|
||||||
if (!nostartup)
|
if (!nostartup)
|
||||||
|
|
|
@ -33,10 +33,12 @@ e_modapi_init(E_Module *m)
|
||||||
_("Edge Bindings"), NULL,
|
_("Edge Bindings"), NULL,
|
||||||
"preferences-desktop-edge-bindings",
|
"preferences-desktop-edge-bindings",
|
||||||
e_int_config_edgebindings);
|
e_int_config_edgebindings);
|
||||||
|
#ifdef HAVE_ELPUT
|
||||||
e_configure_registry_item_add("keyboard_and_mouse/swipe_bindings", 10,
|
e_configure_registry_item_add("keyboard_and_mouse/swipe_bindings", 10,
|
||||||
_("Swipe Bindings"), NULL,
|
_("Swipe Bindings"), NULL,
|
||||||
"preferences-desktop-swipe-bindings",
|
"preferences-desktop-swipe-bindings",
|
||||||
e_int_config_swipebindings);
|
e_int_config_swipebindings);
|
||||||
|
#endif
|
||||||
|
|
||||||
e_configure_registry_category_add("advanced", 80, _("Advanced"), NULL, "preferences-advanced");
|
e_configure_registry_category_add("advanced", 80, _("Advanced"), NULL, "preferences-advanced");
|
||||||
e_configure_registry_item_add("advanced/signal_bindings", 10,
|
e_configure_registry_item_add("advanced/signal_bindings", 10,
|
||||||
|
|
|
@ -5,8 +5,9 @@ src = files(
|
||||||
'e_int_config_keybindings.c',
|
'e_int_config_keybindings.c',
|
||||||
'e_int_config_mousebindings.c',
|
'e_int_config_mousebindings.c',
|
||||||
'e_int_config_signalbindings.c',
|
'e_int_config_signalbindings.c',
|
||||||
'e_int_config_swipebindings.c',
|
|
||||||
'e_mod_main.h'
|
'e_mod_main.h'
|
||||||
)
|
)
|
||||||
|
if get_option('gesture-recognition') == true
|
||||||
|
src += files('e_int_config_swipebindings.c')
|
||||||
|
endif
|
||||||
desktop_only = true
|
desktop_only = true
|
||||||
|
|
Loading…
Reference in New Issue