devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=feff00178e7331ef8e32a2b8353aa73e431c2aa4
commit feff00178e7331ef8e32a2b8353aa73e431c2aa4 Author: Chris Michael <[email protected]> Date: Thu Jan 22 12:42:06 2015 -0500 ecore-drm: Cleanup private header file Summary: This moves the logind function prototypes to the private header and thus removes the need for a separate logind header file. @fix Signed-off-by: Chris Michael <[email protected]> --- src/lib/ecore_drm/ecore_drm_private.h | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/src/lib/ecore_drm/ecore_drm_private.h b/src/lib/ecore_drm/ecore_drm_private.h index 2a1bac9..d3ccec5 100644 --- a/src/lib/ecore_drm/ecore_drm_private.h +++ b/src/lib/ecore_drm/ecore_drm_private.h @@ -19,6 +19,9 @@ # include <sys/stat.h> # include <sys/ioctl.h> +# include <linux/vt.h> +# include <linux/kd.h> +# include <linux/major.h> # include <linux/input.h> # include <libinput.h> # include <xkbcommon/xkbcommon.h> @@ -27,6 +30,10 @@ # include <xf86drmMode.h> # include <drm_fourcc.h> +# ifdef HAVE_SYSTEMD_LOGIN +# include <systemd/sd-login.h> +# endif + # include <Eeze.h> # include <Eldbus.h> # include <Ecore_Drm.h> @@ -231,6 +238,7 @@ void _ecore_drm_event_activate_send(Eina_Bool active); Eina_Bool _ecore_drm_launcher_device_open(const char *device, Ecore_Drm_Open_Cb callback, void *data, int flags); int _ecore_drm_launcher_device_open_no_pending(const char *device, int flags); void _ecore_drm_launcher_device_close(const char *device, int fd); +int _ecore_drm_launcher_device_flags_set(int fd, int flags); Eina_Bool _ecore_drm_tty_switch(Ecore_Drm_Device *dev, int activate_vt); @@ -245,4 +253,19 @@ void _ecore_drm_output_fb_release(Ecore_Drm_Output *output, Ecore_Drm_Fb *fb); void _ecore_drm_output_repaint_start(Ecore_Drm_Output *output); void _ecore_drm_output_frame_finish(Ecore_Drm_Output *output); +Eina_Bool _ecore_drm_logind_connect(Ecore_Drm_Device *dev); +void _ecore_drm_logind_disconnect(Ecore_Drm_Device *dev); +void _ecore_drm_logind_restore(Ecore_Drm_Device *dev); +Eina_Bool _ecore_drm_logind_device_open(const char *device, Ecore_Drm_Open_Cb callback, void *data); +int _ecore_drm_logind_device_open_no_pending(const char *device); +void _ecore_drm_logind_device_close(const char *device); + +int _ecore_drm_dbus_init(Ecore_Drm_Device *dev); +int _ecore_drm_dbus_shutdown(void); +int _ecore_drm_dbus_device_take(uint32_t major, uint32_t minor, Ecore_Drm_Open_Cb callback, void *data); +int _ecore_drm_dbus_device_take_no_pending(uint32_t major, uint32_t minor, Eina_Bool *paused_out, double timeout); +void _ecore_drm_dbus_device_release(uint32_t major, uint32_t minor); +Eina_Bool _ecore_drm_dbus_session_take(const char *session); +Eina_Bool _ecore_drm_dbus_session_release(const char *session); + #endif --
