Enlightenment CVS committal
Author : turran
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_fb
Modified Files:
Ecore_Fb.h Makefile.am ecore_fb.c ecore_fb_private.h
Added Files:
ecore_fb_kbd.c ecore_fb_keytable.h ecore_fb_li.c
ecore_fb_ps2.c ecore_fb_ts.c ecore_fb_vt.c
Removed Files:
ecore_fb_keytab.h
Log Message:
Ecore_Fb changes:
================
+ remove of old ps2, touchscreen and keyboard input handlers
+ old code is kept on sperated files for backup in case someone needs
it, but wont compile
+ addition of new linux input (evdev) handlers. (touchscreen is handled
as an absolute axis device, no need for old code). It supports
multiple input devices, you can have several mice for example.
+ new vt code, now it support allocating a new tty if root, or use
current tty if normal user, correct vt switching on both cases
+ some more cleanups
Ecore_Evas_Fb changes:
=====================
+ use the new ecore_fb
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_fb/Ecore_Fb.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- Ecore_Fb.h 27 Dec 2005 17:17:30 -0000 1.6
+++ Ecore_Fb.h 31 Jul 2006 04:13:51 -0000 1.7
@@ -31,68 +31,112 @@
* maybe a new module?
* - code to get battery info
* - code to get thermal info
+ * ecore evas fb isnt good enough for weird things, like multiple fb's, same
happens here.
+ * backlight support using new kernel interface
+ * absolute axis
+ * joystick
+ *
*/
#ifdef __cplusplus
extern "C" {
#endif
+
+typedef struct _Ecore_Fb_Input_Device Ecore_Fb_Input_Device; /* an input
device handler */
+
+/* device capabilities */
+typedef enum _Ecore_Fb_Input_Device_Cap Ecore_Fb_Input_Device_Cap;
+enum _Ecore_Fb_Input_Device_Cap
+{
+ ECORE_FB_INPUT_DEVICE_CAP_NONE = 0x00000000,
+ ECORE_FB_INPUT_DEVICE_CAP_RELATIVE = 0x00000001,
+ ECORE_FB_INPUT_DEVICE_CAP_ABSOLUTE = 0x00000002,
+ ECORE_FB_INPUT_DEVICE_CAP_KEYS_OR_BUTTONS = 0x00000004
+};
+
+
EAPI extern int ECORE_FB_EVENT_KEY_DOWN; /**< FB Key Down event */
EAPI extern int ECORE_FB_EVENT_KEY_UP; /**< FB Key Up event */
EAPI extern int ECORE_FB_EVENT_MOUSE_BUTTON_DOWN; /**< FB Mouse Down event */
EAPI extern int ECORE_FB_EVENT_MOUSE_BUTTON_UP; /**< FB Mouse Up event */
EAPI extern int ECORE_FB_EVENT_MOUSE_MOVE; /**< FB Mouse Move event */
+EAPI extern int ECORE_FB_EVENT_MOUSE_WHEEL; /**< FB Mouse Wheel event */
typedef struct _Ecore_Fb_Event_Key_Down Ecore_Fb_Event_Key_Down; /**<
FB Key Down event */
typedef struct _Ecore_Fb_Event_Key_Up Ecore_Fb_Event_Key_Up; /**<
FB Key Up event */
typedef struct _Ecore_Fb_Event_Mouse_Button_Down
Ecore_Fb_Event_Mouse_Button_Down; /**< FB Mouse Down event */
typedef struct _Ecore_Fb_Event_Mouse_Button_Up
Ecore_Fb_Event_Mouse_Button_Up; /**< FB Mouse Up event */
typedef struct _Ecore_Fb_Event_Mouse_Move Ecore_Fb_Event_Mouse_Move;
/**< FB Mouse Move event */
+typedef struct _Ecore_Fb_Event_Mouse_Wheel Ecore_Fb_Event_Mouse_Wheel;
/**< FB Mouse Wheel event */
struct _Ecore_Fb_Event_Key_Down /** FB Key Down event */
{
- char *keyname; /**< The name of the key that was pressed */
- char *keysymbol; /**< The logical symbol of the key that was pressed */
- char *key_compose; /**< The UTF-8 string conversion if any */
+ Ecore_Fb_Input_Device *dev; /**< The device associated with the event */
+ char *keyname; /**< The name of the key that was pressed */
+ char *keysymbol; /**< The logical symbol of the key that was pressed
*/
+ char *key_compose; /**< The UTF-8 string conversion if any */
};
struct _Ecore_Fb_Event_Key_Up /** FB Key Up event */
{
- char *keyname; /**< The name of the key that was released */
- char *keysymbol; /**< The logical symbol of the key that was pressed */
- char *key_compose; /**< The UTF-8 string conversion if any */
+ Ecore_Fb_Input_Device *dev; /**< The device associated with the event */
+ char *keyname; /**< The name of the key that was released */
+ char *keysymbol; /**< The logical symbol of the key that was pressed
*/
+ char *key_compose; /**< The UTF-8 string conversion if any */
};
struct _Ecore_Fb_Event_Mouse_Button_Down /** FB Mouse Down event */
{
- int button; /**< Mouse button that was pressed (1 - 32) */
- int x; /**< Mouse co-ordinates when mouse button was pressed */
- int y; /**< Mouse co-ordinates when mouse button was pressed */
- int double_click : 1; /**< Set if click was a double click */
- int triple_click : 1; /**< Set if click was a triple click */
+ Ecore_Fb_Input_Device *dev; /**< The device associated with the event */
+ int button; /**< Mouse button that was pressed (1 - 32) */
+ int x; /**< Mouse co-ordinates when mouse button was pressed */
+ int y; /**< Mouse co-ordinates when mouse button was pressed */
+ int double_click : 1; /**< Set if click was a double click */
+ int triple_click : 1; /**< Set if click was a triple click */
};
struct _Ecore_Fb_Event_Mouse_Button_Up /** FB Mouse Up event */
{
- int button; /**< Mouse button that was released (1 - 32) */
- int x; /**< Mouse co-ordinates when mouse button was raised */
- int y; /**< Mouse co-ordinates when mouse button was raised */
+ Ecore_Fb_Input_Device *dev; /**< The device associated with the event */
+ int button; /**< Mouse button that was released (1 - 32) */
+ int x; /**< Mouse co-ordinates when mouse button was raised */
+ int y; /**< Mouse co-ordinates when mouse button was raised */
};
struct _Ecore_Fb_Event_Mouse_Move /** FB Mouse Move event */
{
- int x; /**< Mouse co-ordinates where the mouse cursor moved to */
- int y; /**< Mouse co-ordinates where the mouse cursor moved to */
+ Ecore_Fb_Input_Device *dev; /**< The device associated with the event */
+ int x; /**< Mouse co-ordinates where the mouse cursor moved to */
+ int y; /**< Mouse co-ordinates where the mouse cursor moved to */
};
+struct _Ecore_Fb_Event_Mouse_Wheel /** FB Mouse Wheel event */
+{
+ Ecore_Fb_Input_Device *dev;
+ int x,y;
+ int direction; /* 0 = vertical, 1 = horizontal */
+ int wheel; /* value 1 (left/up), -1 (right/down) */
+};
+/* ecore_fb_vt.c */
+EAPI void ecore_fb_callback_gain_set(void (*func) (void *data), void *data);
+EAPI void ecore_fb_callback_lose_set(void (*func) (void *data), void *data);
+/* ecore_fb_li.c */
+EAPI Ecore_Fb_Input_Device *ecore_fb_input_device_open(const char
*dev);
+EAPI void
ecore_fb_input_device_close(Ecore_Fb_Input_Device *dev);
+EAPI void
ecore_fb_input_device_listen(Ecore_Fb_Input_Device *dev, int listen);
+EAPI const char
*ecore_fb_input_device_name_get(Ecore_Fb_Input_Device *dev);
+EAPI Ecore_Fb_Input_Device_Cap
ecore_fb_input_device_cap_get(Ecore_Fb_Input_Device *dev);
+EAPI void
ecore_fb_input_device_axis_size_set(Ecore_Fb_Input_Device *dev, int w, int h);
+EAPI void
ecore_fb_input_threshold_click_set(Ecore_Fb_Input_Device *dev, double
threshold);
+EAPI double
ecore_fb_input_threshold_click_get(Ecore_Fb_Input_Device *dev);
+/* ecore_fb.c */
EAPI int ecore_fb_init(const char *name);
EAPI int ecore_fb_shutdown(void);
-
-EAPI void ecore_fb_double_click_time_set(double t);
-EAPI double ecore_fb_double_click_time_get(void);
-
EAPI void ecore_fb_size_get(int *w, int *h);
+/* DEPRECATED */
+#if 0
EAPI void ecore_fb_touch_screen_calibrate_set(int xscale, int xtrans, int
yscale, int ytrans, int xyswap);
EAPI void ecore_fb_touch_screen_calibrate_get(int *xscale, int *xtrans, int
*yscale, int *ytrans, int *xyswap);
@@ -109,9 +153,7 @@
EAPI double ecore_fb_contrast_get(void);
EAPI double ecore_fb_light_sensor_get(void);
-
-EAPI void ecore_fb_callback_gain_set(void (*func) (void *data), void *data);
-EAPI void ecore_fb_callback_lose_set(void (*func) (void *data), void *data);
+#endif
#ifdef __cplusplus
}
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_fb/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- Makefile.am 15 Sep 2005 04:19:45 -0000 1.8
+++ Makefile.am 31 Jul 2006 04:13:51 -0000 1.9
@@ -15,8 +15,13 @@
libecore_fb_la_SOURCES = \
ecore_fb.c \
-ecore_fb_private.h \
-ecore_fb_keytab.h
+ecore_fb_vt.c \
+ecore_fb_li.c \
+ecore_fb_private.h
+# deprecated sources (might not compile):
+# ecore_fb_ts.c
+# ecore_fb_kbd.c
+# ecore_fb_ps2.c
libecore_fb_la_LIBADD = \
@tslib_libs@ \
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_fb/ecore_fb.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- ecore_fb.c 6 Jan 2006 18:26:37 -0000 1.14
+++ ecore_fb.c 31 Jul 2006 04:13:51 -0000 1.15
@@ -1,261 +1,21 @@
-#include "ecore_private.h"
-#include "Ecore.h"
-#include "ecore_fb_private.h"
#include "Ecore_Fb.h"
-
-#ifdef HAVE_TSLIB
-#include <tslib.h>
-#include <errno.h>
-#endif
-
-#include <termios.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <linux/kd.h>
-#include <linux/vt.h>
-#include <linux/fb.h>
-#include <sys/ioctl.h>
-#include <signal.h>
-
-typedef struct _Ecore_Fb_Ts_Event Ecore_Fb_Ts_Event;
-typedef struct _Ecore_Fb_Ts_Calibrate Ecore_Fb_Ts_Calibrate;
-typedef struct _Ecore_Fb_Ts_Backlight Ecore_Fb_Ts_Backlight;
-typedef struct _Ecore_Fb_Ts_Contrast Ecore_Fb_Ts_Contrast;
-typedef struct _Ecore_Fb_Ts_Led Ecore_Fb_Ts_Led;
-typedef struct _Ecore_Fb_Ts_Flite Ecore_Fb_Ts_Flite;
-typedef struct _Ecore_Fb_Ps2_Event Ecore_Fb_Ps2_Event;
-
-struct _Ecore_Fb_Ts_Event
-{
- unsigned short pressure;
- unsigned short x;
- unsigned short y;
- unsigned short _unused;
-};
-
-struct _Ecore_Fb_Ts_Calibrate
-{
- int xscale;
- int xtrans;
- int yscale;
- int ytrans;
- int xyswap;
-};
-
-struct _Ecore_Fb_Ts_Backlight
-{
- int on;
- unsigned char brightness;
-};
-
-struct _Ecore_Fb_Ts_Contrast
-{
- unsigned char contrast;
-};
-
-struct _Ecore_Fb_Ts_Led
-{
- unsigned char on;
- unsigned char blink_time;
- unsigned char on_time;
- unsigned char off_time;
-};
-
-struct _Ecore_Fb_Ts_Flite
-{
- unsigned char mode;
- unsigned char pwr;
- unsigned char brightness;
-};
-
-struct _Ecore_Fb_Ps2_Event
-{
- unsigned char button;
- unsigned char x;
- unsigned char y;
- unsigned char z;
-};
-
-#ifdef HAVE_TSLIB
-struct tsdev *_ecore_fb_tslib_tsdev = NULL;
-struct ts_sample _ecore_fb_tslib_event;
-#endif
+#include "ecore_fb_private.h"
static void _ecore_fb_size_get(int *w, int *h);
-static int _ecore_fb_ts_fd_handler(void *data, Ecore_Fd_Handler *fd_handler);
-static int _ecore_fb_kbd_fd_handler(void *data, Ecore_Fd_Handler *fd_handler);
-static int _ecore_fb_ps2_fd_handler(void *data, Ecore_Fd_Handler *fd_handler);
-static void _ecore_fb_event_free_key_down(void *data, void *ev);
-static void _ecore_fb_event_free_key_up(void *data, void *ev);
-static int _ecore_fb_signal_usr_handler(void *data, int type, void *ev);
-static void _ecore_fb_vt_switch(int vt);
EAPI int ECORE_FB_EVENT_KEY_DOWN = 0;
EAPI int ECORE_FB_EVENT_KEY_UP = 0;
EAPI int ECORE_FB_EVENT_MOUSE_BUTTON_DOWN = 0;
EAPI int ECORE_FB_EVENT_MOUSE_BUTTON_UP = 0;
EAPI int ECORE_FB_EVENT_MOUSE_MOVE = 0;
+EAPI int ECORE_FB_EVENT_MOUSE_WHEEL = 0;
-static Ecore_Event_Handler *_ecore_fb_user_handler = NULL;
-static Ecore_Event_Filter *_ecore_fb_filter_handler = NULL;
-static Ecore_Fd_Handler *_ecore_fb_ts_fd_handler_handle = NULL;
-static Ecore_Fd_Handler *_ecore_fb_kbd_fd_handler_handle = NULL;
static int _ecore_fb_init_count = 0;
-static int _ecore_fb_ts_fd = 0;
-static int _ecore_fb_ps2_fd = 0;
-static int _ecore_fb_kbd_fd = 0;
-static int _ecore_fb_tty_fd = 0;
static int _ecore_fb_console_w = 0;
static int _ecore_fb_console_h = 0;
-static int _ecore_fb_ts_event_byte_count = 0;
-static int _ecore_fb_ps2_event_byte_count = 0;
-static Ecore_Fb_Ts_Event _ecore_fb_ts_event;
-static Ecore_Fb_Ps2_Event _ecore_fb_ps2_event;
-static int _ecore_fb_tty_prev_mode = 0;
-static int _ecore_fb_tty_prev_kd_mode = 0;
-static struct termios _ecore_fb_tty_prev_tio_mode;
-static struct vt_mode _ecore_fb_vt_prev_mode;
-static int _ecore_fb_current_vt = 0;
-static int _ecore_fb_ctrl = 0;
-static int _ecore_fb_alt = 0;
-static int _ecore_fb_shift = 0;
-static int _ecore_fb_lock = 0;
-
-static void (*_ecore_fb_func_fb_lost) (void *data) = NULL;
-static void *_ecore_fb_func_fb_lost_data = NULL;
-static void (*_ecore_fb_func_fb_gain) (void *data) = NULL;
-static void *_ecore_fb_func_fb_gain_data = NULL;
-static void *_ecore_fb_event_filter_start(void *data);
-static int _ecore_fb_event_filter_filter(void *data, void *loop_data, int
type, void *event);
-static void _ecore_fb_event_filter_end(void *data, void *loop_data);
-
static double _ecore_fb_double_click_time = 0.25;
-static struct _Ecore_Fb_Ts_Calibrate _ecore_fb_ts_cal = {1,1,0,0,0};
-static int _ecore_fb_ts_apply_cal = 0;
-
-static const char *_ecore_fb_kbd_syms[128 * 6] =
-{
-#include "ecore_fb_keytab.h"
-};
-
-static const char *_ecore_fb_btn_syms[128] =
-{
- "0x00",
- "Escape",
- "F1",
- "F2",
- "F3",
- "F4",
- "Up",
- "Right",
- "Left",
- "Down",
- "Return",
- "0x1b",
- "0x1c",
- "0x1d",
- "0x1e",
- "0x1f",
- "0x20",
- "0x21",
- "0x22",
- "0x23",
- "0x24",
- "0x25",
- "0x26",
- "0x27",
- "0x28",
- "0x29",
- "0x2a",
- "0x2b",
- "0x2c",
- "0x2d",
- "0x2e",
- "0x2f",
- "0x30",
- "0x31",
- "0x32",
- "0x33",
- "0x34",
- "0x35",
- "0x36",
- "0x37",
- "0x38",
- "0x39",
- "0x3a",
- "0x3b",
- "0x3c",
- "0x3d",
- "0x3e",
- "0x3f",
- "0x40",
- "0x41",
- "0x42",
- "0x43",
- "0x44",
- "0x45",
- "0x46",
- "0x47",
- "0x48",
- "0x49",
- "0x4a",
- "0x4b",
- "0x4c",
- "0x4d",
- "0x4e",
- "0x4f",
- "0x50",
- "0x51",
- "0x52",
- "0x53",
- "0x54",
- "0x55",
- "0x56",
- "0x57",
- "0x58",
- "0x59",
- "0x5a",
- "0x5b",
- "0x5c",
- "0x5d",
- "0x5e",
- "0x5f",
- "0x60",
- "0x61",
- "0x62",
- "0x63",
- "0x64",
- "0x65",
- "0x66",
- "0x67",
- "0x68",
- "0x69",
- "0x6a",
- "0x6b",
- "0x6c",
- "0x6d",
- "0x6e",
- "0x6f",
- "0x70",
- "0x71",
- "0x72",
- "0x73",
- "0x74",
- "0x75",
- "0x76",
- "0x77",
- "0x78",
- "0x79",
- "0x7a",
- "0x7b",
- "0x7c",
- "0x7d",
- "0x7e",
- "0x7f"
-};
/**
* @defgroup Ecore_FB_Library_Group Framebuffer Library Functions
@@ -273,158 +33,18 @@
EAPI int
ecore_fb_init(const char *name __UNUSED__)
{
- int prev_flags;
-#ifdef HAVE_TSLIB
- char *tslib_tsdevice = NULL;
-#endif
-
- _ecore_fb_init_count++;
- if (_ecore_fb_init_count > 1) return _ecore_fb_init_count;
-#ifdef HAVE_TSLIB
- if ( ( tslib_tsdevice = getenv("TSLIB_TSDEVICE") ) != NULL )
- {
- printf( "ECORE_FB: TSLIB_TSDEVICE = '%s'\n", tslib_tsdevice );
- _ecore_fb_tslib_tsdev = ts_open( tslib_tsdevice, 1 ); /* 1 =
nonblocking, 0 = blocking */
-
- if ( !_ecore_fb_tslib_tsdev )
- {
- printf( "ECORE_FB: Can't ts_open (%s)\n", strerror( errno ) );
- return 0;
- }
-
- if ( ts_config( _ecore_fb_tslib_tsdev ) )
- {
- printf( "ECORE_FB: Can't ts_config (%s)\n", strerror( errno ) );
- return 0;
- }
- _ecore_fb_ts_fd = ts_fd( _ecore_fb_tslib_tsdev );
- if ( _ecore_fb_ts_fd < 0 )
- {
- printf( "ECORE_FB: Can't open touchscreen (%s)\n", strerror( errno
) );
- return 0;
- }
- }
-#else
- _ecore_fb_ts_fd = open("/dev/touchscreen/0", O_RDONLY);
-#endif
- if (_ecore_fb_ts_fd >= 0)
- {
- prev_flags = fcntl(_ecore_fb_ts_fd, F_GETFL);
- fcntl(_ecore_fb_ts_fd, F_SETFL, prev_flags | O_NONBLOCK);
- _ecore_fb_ts_fd_handler_handle =
ecore_main_fd_handler_add(_ecore_fb_ts_fd,
-
ECORE_FD_READ,
-
_ecore_fb_ts_fd_handler, NULL,
- NULL, NULL);
- if (!_ecore_fb_ts_fd_handler_handle)
- {
- close(_ecore_fb_ts_fd);
- }
- }
- if (_ecore_fb_ts_fd < 0)
- {
- _ecore_fb_ps2_fd = open("/dev/psaux", O_RDWR);
- if (_ecore_fb_ps2_fd >= 0)
- {
- prev_flags = fcntl(_ecore_fb_ps2_fd, F_GETFL);
- fcntl(_ecore_fb_ps2_fd, F_SETFL, prev_flags | O_NONBLOCK);
- _ecore_fb_ts_fd_handler_handle =
ecore_main_fd_handler_add(_ecore_fb_ps2_fd,
-
ECORE_FD_READ,
-
_ecore_fb_ps2_fd_handler, NULL,
- NULL,
NULL);
- if (!_ecore_fb_ts_fd_handler_handle)
- {
- close(_ecore_fb_ps2_fd);
- }
- }
- }
- _ecore_fb_kbd_fd = open("/dev/touchscreen/key", O_RDONLY);
- _ecore_fb_tty_fd = open("/dev/tty0", O_RDONLY);
- if (_ecore_fb_tty_fd >= 0)
- {
- struct termios tio;
- struct vt_mode new_vtmode;
- int vtno;
-
- if ((ioctl(_ecore_fb_tty_fd, VT_OPENQRY, &vtno) != -1))
- {
- char buf[64];
-
- _ecore_fb_current_vt = vtno;
- ioctl(_ecore_fb_tty_fd, VT_ACTIVATE, _ecore_fb_current_vt);
- close(_ecore_fb_tty_fd);
- snprintf(buf, sizeof(buf), "/dev/tty%i", _ecore_fb_current_vt);
-/* FIXME: switch away works.. but switch to the allocated vt doesnt */
-/* printf("%s\n", buf); */
- _ecore_fb_tty_fd = open(buf, O_RDWR);
- if (_ecore_fb_current_vt == 1)
- {
- Ecore_Event_Signal_User *e;
-
- e = _ecore_event_signal_user_new();
- if (e)
- {
- e->number = 2;
- ecore_event_add(ECORE_EVENT_SIGNAL_USER, e, NULL, NULL);
- }
- }
- }
- tcgetattr(_ecore_fb_tty_fd, &_ecore_fb_tty_prev_tio_mode);
- ioctl(_ecore_fb_tty_fd, KDGETMODE, &_ecore_fb_tty_prev_kd_mode);
- ioctl(_ecore_fb_tty_fd, KDGKBMODE, &_ecore_fb_tty_prev_mode);
- ioctl(_ecore_fb_tty_fd, VT_GETMODE, &_ecore_fb_vt_prev_mode);
- tio.c_iflag = tio.c_oflag = tio.c_cflag = tio.c_lflag = 0;
- tio.c_cc[VTIME] = 0;
- tio.c_cc[VMIN] = 1;
- new_vtmode.mode = VT_PROCESS;
- new_vtmode.waitv = 0;
- new_vtmode.relsig = SIGUSR1;
- new_vtmode.acqsig = SIGUSR2;
- tcsetattr(_ecore_fb_tty_fd, TCSAFLUSH, &tio);
- ioctl(_ecore_fb_tty_fd, KDSETMODE, KD_GRAPHICS);
- ioctl(_ecore_fb_tty_fd, KDSKBMODE, K_MEDIUMRAW);
- ioctl(_ecore_fb_tty_fd, VT_SETMODE, &new_vtmode);
- }
- if (_ecore_fb_kbd_fd <= 0) _ecore_fb_kbd_fd = _ecore_fb_tty_fd;
- if (_ecore_fb_kbd_fd >= 0)
- {
- prev_flags = fcntl(_ecore_fb_kbd_fd, F_GETFL);
- fcntl(_ecore_fb_kbd_fd, F_SETFL, prev_flags | O_NONBLOCK);
- _ecore_fb_kbd_fd_handler_handle =
ecore_main_fd_handler_add(_ecore_fb_kbd_fd,
-
ECORE_FD_READ,
-
_ecore_fb_kbd_fd_handler, NULL,
- NULL, NULL);
- if (!_ecore_fb_kbd_fd_handler_handle)
- {
- tcsetattr(_ecore_fb_tty_fd, TCSAFLUSH,
&_ecore_fb_tty_prev_tio_mode);
- ioctl(_ecore_fb_tty_fd, KDSETMODE, _ecore_fb_tty_prev_kd_mode);
- ioctl(_ecore_fb_tty_fd, KDSKBMODE, _ecore_fb_tty_prev_mode);
- close(_ecore_fb_tty_fd);
- close(_ecore_fb_ts_fd);
- close(_ecore_fb_kbd_fd);
- if (_ecore_fb_ps2_fd > 0) close(_ecore_fb_ps2_fd);
- if (_ecore_fb_tty_fd != _ecore_fb_kbd_fd)
- close(_ecore_fb_tty_fd);
- ecore_main_fd_handler_del(_ecore_fb_ts_fd_handler_handle);
- _ecore_fb_ts_fd_handler_handle = NULL;
- _ecore_fb_init_count--;
- return 0;
- }
- }
- if (!ECORE_FB_EVENT_KEY_DOWN)
- {
- ECORE_FB_EVENT_KEY_DOWN = ecore_event_type_new();
- ECORE_FB_EVENT_KEY_UP = ecore_event_type_new();
- ECORE_FB_EVENT_MOUSE_BUTTON_DOWN = ecore_event_type_new();
- ECORE_FB_EVENT_MOUSE_BUTTON_UP = ecore_event_type_new();
- ECORE_FB_EVENT_MOUSE_MOVE = ecore_event_type_new();
-
- }
- _ecore_fb_size_get(&_ecore_fb_console_w, &_ecore_fb_console_h);
- _ecore_fb_user_handler = ecore_event_handler_add(ECORE_EVENT_SIGNAL_USER,
-
_ecore_fb_signal_usr_handler,
- NULL);
- _ecore_fb_filter_handler =
ecore_event_filter_add(_ecore_fb_event_filter_start,
_ecore_fb_event_filter_filter, _ecore_fb_event_filter_end, NULL);
- return _ecore_fb_init_count;
+ if(!_ecore_fb_init_count)
+ {
+ if(!ecore_fb_vt_init()) return 0;
+ ECORE_FB_EVENT_KEY_DOWN = ecore_event_type_new();
+ ECORE_FB_EVENT_KEY_UP = ecore_event_type_new();
+ ECORE_FB_EVENT_MOUSE_BUTTON_DOWN = ecore_event_type_new();
+ ECORE_FB_EVENT_MOUSE_BUTTON_UP = ecore_event_type_new();
+ ECORE_FB_EVENT_MOUSE_MOVE = ecore_event_type_new();
+ ECORE_FB_EVENT_MOUSE_WHEEL = ecore_event_type_new();
+ _ecore_fb_size_get(&_ecore_fb_console_w, &_ecore_fb_console_h);
+ }
+ return ++_ecore_fb_init_count;
}
/**
@@ -436,81 +56,15 @@
EAPI int
ecore_fb_shutdown(void)
{
- _ecore_fb_init_count--;
- if (_ecore_fb_init_count > 0) return _ecore_fb_init_count;
- if (_ecore_fb_init_count < 0)
- {
- _ecore_fb_init_count = 0;
- return 0;
- }
- if (_ecore_fb_tty_fd != 0)
- {
- tcsetattr(_ecore_fb_tty_fd, TCSAFLUSH, &_ecore_fb_tty_prev_tio_mode);
- ioctl(_ecore_fb_tty_fd, KDSETMODE, _ecore_fb_tty_prev_kd_mode);
- ioctl(_ecore_fb_tty_fd, KDSKBMODE, _ecore_fb_tty_prev_mode);
- ioctl(_ecore_fb_tty_fd, VT_SETMODE, &_ecore_fb_vt_prev_mode);
- close(_ecore_fb_tty_fd);
- if (_ecore_fb_tty_fd == _ecore_fb_kbd_fd) _ecore_fb_kbd_fd = 0;
- }
- if (_ecore_fb_ps2_fd > 0) close(_ecore_fb_ps2_fd);
- if (_ecore_fb_ts_fd >= 0) close(_ecore_fb_ts_fd);
- if (_ecore_fb_kbd_fd >= 0) close(_ecore_fb_kbd_fd);
- if (_ecore_fb_ts_fd_handler_handle)
- ecore_main_fd_handler_del(_ecore_fb_ts_fd_handler_handle);
- if (_ecore_fb_kbd_fd_handler_handle)
- ecore_main_fd_handler_del(_ecore_fb_kbd_fd_handler_handle);
- if (_ecore_fb_user_handler)
- ecore_event_handler_del(_ecore_fb_user_handler);
- ecore_event_filter_del(_ecore_fb_filter_handler);
- _ecore_fb_ts_fd = 0;
- _ecore_fb_kbd_fd = 0;
- _ecore_fb_tty_fd = 0;
- _ecore_fb_ps2_fd = 0;
- _ecore_fb_ts_fd_handler_handle = NULL;
- _ecore_fb_filter_handler = NULL;
- _ecore_fb_kbd_fd_handler_handle = NULL;
- _ecore_fb_user_handler = NULL;
- _ecore_fb_ctrl = 0;
- _ecore_fb_alt = 0;
- return _ecore_fb_init_count;
+ _ecore_fb_init_count--;
+ if(!_ecore_fb_init_count)
+ {
+ ecore_fb_vt_shutdown();
+ return 0;
+ }
+ return _ecore_fb_init_count;
}
-/**
- * @defgroup Ecore_FB_Click_Group Framebuffer Double Click Functions
- *
- * Functions that deal with the double click time of the framebuffer.
- */
-
-/**
- * Sets the timeout for a double and triple clicks to be flagged.
- *
- * This sets the time between clicks before the double_click flag is
- * set in a button down event. If 3 clicks occur within double this
- * time, the triple_click flag is also set.
- *
- * @param t The time in seconds
- * @ingroup Ecore_FB_Click_Group
- */
-EAPI void
-ecore_fb_double_click_time_set(double t)
-{
- if (t < 0.0) t = 0.0;
- _ecore_fb_double_click_time = t;
-}
-
-/**
- * Retrieves the double and triple click flag timeout.
- *
- * See @ref ecore_x_double_click_time_set for more information.
- *
- * @return The timeout for double clicks in seconds.
- * @ingroup Ecore_FB_Click_Group
- */
-EAPI double
-ecore_fb_double_click_time_get(void)
-{
- return _ecore_fb_double_click_time;
-}
/**
* Retrieves the width and height of the current frame buffer in pixels.
@@ -524,267 +78,6 @@
if (h) *h = _ecore_fb_console_h;
}
-/**
- * @defgroup Ecore_FB_Calibrate_Group Framebuffer Calibration Functions
- *
- * Functions that calibrate the screen.
- */
-
-/**
- * Calibrates the touschreen using the given parameters.
- * @param xscale X scaling, where 256 = 1.0
- * @param xtrans X translation.
- * @param yscale Y scaling.
- * @param ytrans Y translation.
- * @param xyswap Swap X & Y flag.
- * @ingroup Ecore_FB_Calibrate_Group
- */
-EAPI void
-ecore_fb_touch_screen_calibrate_set(int xscale, int xtrans, int yscale, int
ytrans, int xyswap)
-{
- Ecore_Fb_Ts_Calibrate cal;
-
- if (_ecore_fb_ts_fd < 0) return;
- cal.xscale = xscale;
- cal.xtrans = xtrans;
- cal.yscale = yscale;
- cal.ytrans = ytrans;
- cal.xyswap = xyswap;
- if (ioctl(_ecore_fb_ts_fd, TS_SET_CAL, (void *)&cal))
- {
- _ecore_fb_ts_cal = cal;
- _ecore_fb_ts_apply_cal = 1;
- }
-}
-
-/**
- * Retrieves the calibration parameters of the touchscreen.
- * @param xscale Pointer to an integer in which to store the X scaling.
- * Note that 256 = 1.0.
- * @param xtrans Pointer to an integer in which to store the X translation.
- * @param yscale Pointer to an integer in which to store the Y scaling.
- * @param ytrans Pointer to an integer in which to store the Y translation.
- * @param xyswap Pointer to an integer in which to store the Swap X & Y flag.
- * @ingroup Ecore_FB_Calibrate_Group
- */
-EAPI void
-ecore_fb_touch_screen_calibrate_get(int *xscale, int *xtrans, int *yscale, int
*ytrans, int *xyswap)
-{
- Ecore_Fb_Ts_Calibrate cal;
-
- if (_ecore_fb_ts_fd < 0) return;
- if (!_ecore_fb_ts_apply_cal)
- {
- if (ioctl(_ecore_fb_ts_fd, TS_GET_CAL, (void *)&cal))
- _ecore_fb_ts_cal = cal;
- }
- else
- cal = _ecore_fb_ts_cal;
- if (xscale) *xscale = cal.xscale;
- if (xtrans) *xtrans = cal.xtrans;
- if (yscale) *yscale = cal.yscale;
- if (ytrans) *ytrans = cal.ytrans;
- if (xyswap) *xyswap = cal.xyswap;
-}
-
-/**
- * @defgroup Ecore_FB_Backlight_Group Framebuffer Backlight Functions
- *
- * Functions that deal with the backlight of a framebuffer's screen.
- */
-
-/**
- * Turns on or off the backlight.
- * @param on @c 1 to turn the backlight on. @c 0 to turn it off.
- * @ingroup Ecore_FB_Backlight_Group
- */
-EAPI void
-ecore_fb_backlight_set(int on)
-{
- Ecore_Fb_Ts_Backlight bl;
-
- if (_ecore_fb_ts_fd < 0) return;
- ioctl(_ecore_fb_ts_fd, TS_GET_BACKLIGHT, &bl);
- bl.on = on;
- ioctl(_ecore_fb_ts_fd, TS_SET_BACKLIGHT, &bl);
-}
-
-/**
- * Retrieves the backlight state.
- * @return Whether the backlight is on.
- * @ingroup Ecore_FB_Backlight_Group
- */
-EAPI int
-ecore_fb_backlight_get(void)
-{
- Ecore_Fb_Ts_Backlight bl;
-
- if (_ecore_fb_ts_fd < 0) return 1;
- ioctl(_ecore_fb_ts_fd, TS_GET_BACKLIGHT, &bl);
- return bl.on;
-}
-
-/**
- * Sets the backlight brightness.
- * @param br Brightness between 0.0 to 1.0, where 0.0 is darkest and 1.0
- * is brightest.
- * @ingroup Ecore_FB_Backlight_Group
- */
-EAPI void
-ecore_fb_backlight_brightness_set(double br)
-{
- Ecore_Fb_Ts_Backlight bl;
- int val;
-
- if (br < 0) br = 0;
- if (br > 1) br = 1;
- val = (int)(255.0 * br);
- ioctl(_ecore_fb_ts_fd, TS_GET_BACKLIGHT, &bl);
- bl.brightness = val;
- ioctl(_ecore_fb_ts_fd, TS_SET_BACKLIGHT, &bl);
-}
-
-/**
- * Retrieves the backlight brightness.
- * @return The current backlight brigntess, where 0.0 is the darkest and
- * 1.0 is the brightest.
- * @ingroup Ecore_FB_Backlight_Group
- */
-EAPI double
-ecore_fb_backlight_brightness_get(void)
-{
- Ecore_Fb_Ts_Backlight bl;
-
- if (_ecore_fb_ts_fd < 0) return 1.0;
- ioctl(_ecore_fb_ts_fd, TS_GET_BACKLIGHT, &bl);
- return (double)bl.brightness / 255.0;
-}
-
-/**
- * @defgroup Ecore_FB_LED_Group Framebuffer LED Functions
- *
- * Functions that deal with the light emitting diode connected to the
- * current framebuffer.
- */
-
-/**
- * Sets whether the current framebuffer's LED to the given state.
- * @param on @c 1 to indicate the LED should be on, @c 0 if it should be off.
- * @ingroup Ecore_FB_LED_Group
- */
-EAPI void
-ecore_fb_led_set(int on)
-{
- Ecore_Fb_Ts_Led led;
-
- if (_ecore_fb_ts_fd < 0) return;
- if (on) led.on = 1;
- else led.on = 0;
- ioctl(_ecore_fb_ts_fd, LED_ON, &led);
-}
-
-/**
- * Makes the LED of the current framebuffer blink.
- * @param speed Number to give the speed on the blink.
- * @ingroup Ecore_FB_LED_Group
- * @todo Documentation: Work out what speed the units are in.
- */
-EAPI void
-ecore_fb_led_blink_set(double speed)
-{
- Ecore_Fb_Ts_Led led;
-
- if (_ecore_fb_ts_fd < 0) return;
- led.on = 1;
- led.on_time = (unsigned char)(speed * 10);
- led.off_time = (unsigned char)(speed * 10);
- led.blink_time = 255;
- ioctl(_ecore_fb_ts_fd, LED_ON, &led);
-}
-
-/**
- * @defgroup Ecore_FB_Contrast_Group Framebuffer Contrast Functions
- *
- * Values that set and retrieve the contrast of a framebuffer screen.
- */
-
-/**
- * Sets the contrast used by the framebuffer screen.
- * @param cr Value between 0 and 1 that gives the new contrast of the screen.
- * @ingroup Ecore_FB_Contrast_Group
- */
-EAPI void
-ecore_fb_contrast_set(double cr)
-{
- Ecore_Fb_Ts_Contrast ct;
- int val;
-
- if (cr < 0) cr = 0;
- if (cr > 1) cr = 1;
- val = (int)(255.0 * cr);
- ct.contrast = val;
- ioctl(_ecore_fb_ts_fd, TS_SET_CONTRAST, &ct);
-}
-
-/**
- * Retrieves the contrast currently being used by the framebuffer screen.
- * @return A value between 0 and 1 that represents the current contrast of the
- * screen.
- * @ingroup Ecore_FB_Contrast_Group
- */
-EAPI double
-ecore_fb_contrast_get(void)
-{
- Ecore_Fb_Ts_Contrast ct;
-
- if (_ecore_fb_ts_fd < 0) return 1.0;
- ioctl(_ecore_fb_ts_fd, TS_GET_CONTRAST, &ct);
- return (double)ct.contrast / 255.0;
-}
-
-/**
- * To be documented.
- *
- * FIXME: To be fixed.
- */
-EAPI double
-ecore_fb_light_sensor_get(void)
-{
- Ecore_Fb_Ts_Flite fl;
-
- if (_ecore_fb_ts_fd < 0) return 0.0;
- fl.mode = 3;
- fl.brightness = 0;
- ioctl(_ecore_fb_ts_fd, FLITE_ON, &fl);
- return (double)fl.brightness / 255.0;
-}
-
-/**
- * To be documented.
- *
- * FIXME: To be fixed.
- * @todo Documentation: Find out what this does.
- */
-EAPI void
-ecore_fb_callback_gain_set(void (*func) (void *data), void *data)
-{
- _ecore_fb_func_fb_gain = func;
- _ecore_fb_func_fb_gain_data = data;
-}
-
-/**
- * To be documented.
- *
- * FIXME: To be fixed.
- * @todo Documentation: Find out what this does.
- */
-EAPI void
-ecore_fb_callback_lose_set(void (*func) (void *data), void *data)
-{
- _ecore_fb_func_fb_lost = func;
- _ecore_fb_func_fb_lost_data = data;
-}
-
static void
_ecore_fb_size_get(int *w, int *h)
{
@@ -807,516 +100,4 @@
close(fb);
if (w) *w = fb_var.xres;
if (h) *h = fb_var.yres;
-}
-
-static int
-_ecore_fb_ts_fd_handler(void *data __UNUSED__, Ecore_Fd_Handler *fd_handler
__UNUSED__)
-{
- static int prev_x = 0, prev_y = 0, prev_pressure = 0;
- static double last_time = 0;
- static double last_last_time = 0;
- int v = 0;
-
- do
- {
- int x, y, pressure;
- int num;
- char *ptr;
- double t;
- int did_triple = 0;
-
-#ifdef HAVE_TSLIB
- if ( _ecore_fb_ts_apply_cal )
- num = ts_read_raw( _ecore_fb_tslib_tsdev, &_ecore_fb_tslib_event, 1 );
- else
- num = ts_read( _ecore_fb_tslib_tsdev, &_ecore_fb_tslib_event, 1 );
- if ( num != 1 )
- {
- return 1; /* no more samples at this time */
- }
- x = _ecore_fb_tslib_event.x;
- y = _ecore_fb_tslib_event.y;
- pressure = _ecore_fb_tslib_event.pressure;
- v = 1; /* loop, there might be more samples */
-#else
- ptr = (char *)&(_ecore_fb_ts_event);
- ptr += _ecore_fb_ts_event_byte_count;
- num = sizeof(Ecore_Fb_Ts_Event) - _ecore_fb_ts_event_byte_count;
- v = read(_ecore_fb_ts_fd, ptr, num);
- if (v < 0) return 1;
- _ecore_fb_ts_event_byte_count += v;
- if (v < num) return 1;
- t = ecore_time_get();
- _ecore_fb_ts_event_byte_count = 0;
- if (_ecore_fb_ts_apply_cal)
- {
- x = ((_ecore_fb_ts_cal.xscale * _ecore_fb_ts_event.x) >> 8) +
_ecore_fb_ts_cal.xtrans;
- y = ((_ecore_fb_ts_cal.yscale * _ecore_fb_ts_event.y) >> 8) +
_ecore_fb_ts_cal.ytrans;
- }
- else
- {
- x = _ecore_fb_ts_event.x;
- y = _ecore_fb_ts_event.y;
- }
- pressure = _ecore_fb_ts_event.pressure;
-#endif
- /* add event to queue */
- /* always add a move event */
- if ((pressure) || (prev_pressure))
- {
- /* MOVE: mouse is down and was */
- Ecore_Fb_Event_Mouse_Move *e;
-
- e = calloc(1, sizeof(Ecore_Fb_Event_Mouse_Move));
- if (!e) goto retry;
- e->x = x;
- e->y = y;
- ecore_event_add(ECORE_FB_EVENT_MOUSE_MOVE, e, NULL, NULL);
- }
- if ((pressure) && (!prev_pressure))
- {
- /* DOWN: mouse is down, but was not now */
- Ecore_Fb_Event_Mouse_Button_Down *e;
-
- e = calloc(1, sizeof(Ecore_Fb_Event_Mouse_Button_Down));
- if (!e) goto retry;
- e->x = x;
- e->y = y;
- e->button = 1;
- if ((t - last_time) <= _ecore_fb_double_click_time)
- e->double_click = 1;
- if ((t - last_last_time) <= (2 * _ecore_fb_double_click_time))
- {
- did_triple = 1;
- e->triple_click = 1;
- }
- ecore_event_add(ECORE_FB_EVENT_MOUSE_BUTTON_DOWN, e, NULL, NULL);
- }
- else if ((!pressure) && (prev_pressure))
- {
- /* UP: mouse was down, but is not now */
- Ecore_Fb_Event_Mouse_Button_Up *e;
-
- e = calloc(1, sizeof(Ecore_Fb_Event_Mouse_Button_Up));
- if (!e) goto retry;
- e->x = prev_x;
- e->y = prev_y;
- e->button = 1;
- ecore_event_add(ECORE_FB_EVENT_MOUSE_BUTTON_UP, e, NULL, NULL);
- }
- if (did_triple)
- {
- last_time = 0;
- last_last_time = 0;
- }
- else
- {
- last_last_time = last_time;
- last_time = t;
- }
- retry:
- prev_x = x;
- prev_y = y;
- prev_pressure = pressure;
- }
- while (v > 0);
- return 1;
-}
-
-static int
-_ecore_fb_kbd_fd_handler(void *data __UNUSED__, Ecore_Fd_Handler *fd_handler
__UNUSED__)
-{
- int v = 0;
-
- do
- {
- unsigned char buf;
-
- v = read(_ecore_fb_kbd_fd, &buf, 1);
- if (v < 0) return 1;
- if (v < 1) return 1;
- if (buf & 0x80)
- {
- /* DOWN */
- int vt_switch = -1;
- Ecore_Fb_Event_Key_Down *e;
-
- e = calloc(1, sizeof(Ecore_Fb_Event_Key_Down));
- if (!e) goto retry;
- if (_ecore_fb_kbd_fd == _ecore_fb_tty_fd)
- {
- int add = 0;
-
- if (_ecore_fb_shift) add = 1;
- else if (_ecore_fb_lock) add = 2;
- e->keyname = strdup(_ecore_fb_kbd_syms[(buf & 0x7f) * 6]);
- e->keysymbol = strdup(_ecore_fb_kbd_syms[((buf & 0x7f) * 6) +
add]);
- e->key_compose = strdup(_ecore_fb_kbd_syms[((buf & 0x7f) * 6)
+ 3 + add]);
- }
- else
- e->keyname = strdup(_ecore_fb_btn_syms[buf & 0x7f]);
- if (!e->keyname)
- {
- free(e);
- goto retry;
- }
- ecore_event_add(ECORE_FB_EVENT_KEY_DOWN, e,
_ecore_fb_event_free_key_down, NULL);
- if (!strcmp(e->keyname, "Control_L"))
- _ecore_fb_ctrl++;
- else if (!strcmp(e->keyname, "Control_R"))
- _ecore_fb_ctrl++;
- else if (!strcmp(e->keyname, "Alt_L"))
- _ecore_fb_alt++;
- else if (!strcmp(e->keyname, "Alt_R"))
- _ecore_fb_alt++;
- else if (!strcmp(e->keyname, "Shift_L"))
- _ecore_fb_shift++;
- else if (!strcmp(e->keyname, "Shift_R"))
- _ecore_fb_shift++;
- else if (!strcmp(e->keyname, "Caps_Lock"))
- _ecore_fb_lock++;
- else if (!strcmp(e->keyname, "F1")) vt_switch = 0;
- else if (!strcmp(e->keyname, "F2")) vt_switch = 1;
- else if (!strcmp(e->keyname, "F3")) vt_switch = 2;
- else if (!strcmp(e->keyname, "F4")) vt_switch = 3;
- else if (!strcmp(e->keyname, "F5")) vt_switch = 4;
- else if (!strcmp(e->keyname, "F6")) vt_switch = 5;
- else if (!strcmp(e->keyname, "F7")) vt_switch = 6;
- else if (!strcmp(e->keyname, "F8")) vt_switch = 7;
- else if (!strcmp(e->keyname, "F9")) vt_switch = 8;
- else if (!strcmp(e->keyname, "F10")) vt_switch = 9;
- else if (!strcmp(e->keyname, "F11")) vt_switch = 10;
- else if (!strcmp(e->keyname, "F12")) vt_switch = 11;
- if (_ecore_fb_ctrl > 2) _ecore_fb_ctrl = 2;
- if (_ecore_fb_alt > 2) _ecore_fb_alt = 2;
- if ((vt_switch >= 0) &&
- (_ecore_fb_ctrl) &&
- (_ecore_fb_alt))
- _ecore_fb_vt_switch(vt_switch);
- }
- else
- {
- /* UP */
- Ecore_Fb_Event_Key_Up *e;
-
- e = calloc(1, sizeof(Ecore_Fb_Event_Key_Up));
- if (!e) goto retry;
- if (_ecore_fb_kbd_fd == _ecore_fb_tty_fd)
- {
- int add = 0;
-
- if (_ecore_fb_shift) add = 1;
- else if (_ecore_fb_lock) add = 2;
- e->keyname = strdup(_ecore_fb_kbd_syms[(buf & 0x7f) * 6]);
- e->keysymbol = strdup(_ecore_fb_kbd_syms[((buf & 0x7f) * 6) +
add]);
- e->key_compose = strdup(_ecore_fb_kbd_syms[((buf & 0x7f) * 6)
+ 3 + add]);
- }
- else
- e->keyname = strdup(_ecore_fb_btn_syms[buf & 0x7f]);
- if (!e->keyname)
- {
- free(e);
- goto retry;
- }
- ecore_event_add(ECORE_FB_EVENT_KEY_UP, e,
_ecore_fb_event_free_key_up, NULL);
- if (!strcmp(e->keyname, "Control_L"))
- _ecore_fb_ctrl--;
- else if (!strcmp(e->keyname, "Control_R"))
- _ecore_fb_ctrl--;
- else if (!strcmp(e->keyname, "Alt_L"))
- _ecore_fb_alt--;
- else if (!strcmp(e->keyname, "Alt_R"))
- _ecore_fb_alt--;
- else if (!strcmp(e->keyname, "Shift_L"))
- _ecore_fb_shift--;
- else if (!strcmp(e->keyname, "Shift_R"))
- _ecore_fb_shift--;
- else if (!strcmp(e->keyname, "Caps_Lock"))
- _ecore_fb_lock--;
- if (_ecore_fb_ctrl < 0) _ecore_fb_ctrl = 0;
- if (_ecore_fb_alt < 0) _ecore_fb_alt = 0;
- if (_ecore_fb_shift < 0) _ecore_fb_shift = 0;
- if (_ecore_fb_lock < 0) _ecore_fb_lock = 0;
- }
- retry:
- ;
- }
- while (v > 0);
- return 1;
-}
-
-static int
-_ecore_fb_ps2_fd_handler(void *data __UNUSED__, Ecore_Fd_Handler *fd_handler
__UNUSED__)
-{
- static int prev_x = 0, prev_y = 0, prev_button = 0;
- static double last_time = 0;
- static double last_last_time = 0;
- int v = 0;
-
- do
- {
- int x, y, button, i;
- int num;
- char *ptr;
- double t;
- int did_triple = 0;
-
- ptr = (char *)&(_ecore_fb_ps2_event);
- ptr += _ecore_fb_ps2_event_byte_count;
- num = sizeof(Ecore_Fb_Ps2_Event) - _ecore_fb_ps2_event_byte_count;
- v = read(_ecore_fb_ps2_fd, ptr, num);
- if (v < 0) return 1;
- _ecore_fb_ps2_event_byte_count += v;
- if (v < num) return 1;
- t = ecore_time_get();
- _ecore_fb_ps2_event_byte_count = 0;
- if (_ecore_fb_ps2_event.button & 0x10)
- x = prev_x + (0xffffff00 | _ecore_fb_ps2_event.x);
- else
- x = prev_x + _ecore_fb_ps2_event.x;
- if (_ecore_fb_ps2_event.button & 0x20)
- y = prev_y - (0xffffff00 | _ecore_fb_ps2_event.y);
- else
- y = prev_y - _ecore_fb_ps2_event.y;
- button = _ecore_fb_ps2_event.button & 0x7;
- if (x < 0) x = 0;
- if (y < 0) y = 0;
- if (x >= _ecore_fb_console_w) x = _ecore_fb_console_w - 1;
- if (y >= _ecore_fb_console_h) y = _ecore_fb_console_h - 1;
- /* add event to queue */
- /* always add a move event */
- if (1)
- {
- /* MOVE: mouse is down and was */
- Ecore_Fb_Event_Mouse_Move *e;
-
- e = calloc(1, sizeof(Ecore_Fb_Event_Mouse_Move));
- if (!e) goto retry;
- e->x = x;
- e->y = y;
- ecore_event_add(ECORE_FB_EVENT_MOUSE_MOVE, e, NULL, NULL);
- }
- for (i = 1; i <= 3; i++)
- {
- int mask;
-
- mask = 1 << (i - 1);
- if (((button & mask)) && (!(prev_button & mask)))
- {
- /* DOWN: mouse is down, but was not now */
- Ecore_Fb_Event_Mouse_Button_Down *e;
-
- e = calloc(1, sizeof(Ecore_Fb_Event_Mouse_Button_Down));
- if (!e) goto retry;
- e->x = x;
- e->y = y;
- e->button = 1;
- if ((t - last_time) <= _ecore_fb_double_click_time)
- e->double_click = 1;
- if ((t - last_last_time) <= (2 * _ecore_fb_double_click_time))
- {
- did_triple = 1;
- e->triple_click = 1;
- }
- ecore_event_add(ECORE_FB_EVENT_MOUSE_BUTTON_DOWN, e, NULL,
NULL);
- }
- else if ((!(button & mask)) && ((prev_button & mask)))
- {
- /* UP: mouse was down, but is not now */
- Ecore_Fb_Event_Mouse_Button_Up *e;
-
- e = calloc(1, sizeof(Ecore_Fb_Event_Mouse_Button_Up));
- if (!e) goto retry;
- e->x = x;
- e->y = y;
- e->button = 1;
- ecore_event_add(ECORE_FB_EVENT_MOUSE_BUTTON_UP, e, NULL,
NULL);
- }
- }
- if (did_triple)
- {
- last_time = 0;
- last_last_time = 0;
- }
- else
- {
- last_last_time = last_time;
- last_time = t;
- }
- retry:
- prev_x = x;
- prev_y = y;
- prev_button = button;
- }
- while (v > 0);
- return 1;
-}
-
-static void
-_ecore_fb_event_free_key_down(void *data __UNUSED__, void *ev)
-{
- Ecore_Fb_Event_Key_Up *e;
-
- e = ev;
- free(e->keyname);
- if (e->keysymbol) free(e->keysymbol);
- if (e->key_compose) free(e->key_compose);
- free(e);
-}
-
-static void
-_ecore_fb_event_free_key_up(void *data __UNUSED__, void *ev)
-{
- Ecore_Fb_Event_Key_Up *e;
-
- e = ev;
- free(e->keyname);
- if (e->keysymbol) free(e->keysymbol);
- if (e->key_compose) free(e->key_compose);
- free(e);
-}
-
-static int
-_ecore_fb_signal_usr_handler(void *data __UNUSED__, int type __UNUSED__, void
*ev)
-{
- Ecore_Event_Signal_User *e;
-
- e = (Ecore_Event_Signal_User *)ev;
- if (e->number == 1)
- {
- /* release */
- if (_ecore_fb_func_fb_lost)
- _ecore_fb_func_fb_lost(_ecore_fb_func_fb_lost_data);
- if (_ecore_fb_ps2_fd > 0) close(_ecore_fb_ps2_fd);
- if (_ecore_fb_ts_fd >= 0) close(_ecore_fb_ts_fd);
- if (_ecore_fb_ts_fd_handler_handle)
- ecore_main_fd_handler_del(_ecore_fb_ts_fd_handler_handle);
- _ecore_fb_ps2_fd = 0;
- _ecore_fb_ts_fd = 0;
- _ecore_fb_ts_fd_handler_handle = NULL;
- ioctl(_ecore_fb_tty_fd, VT_RELDISP, 1);
- }
- else if (e->number == 2)
- {
- int prev_flags;
-
- /* gain */
- if (_ecore_fb_func_fb_gain)
- _ecore_fb_func_fb_gain(_ecore_fb_func_fb_gain_data);
- if (!_ecore_fb_ts_fd)
- {
- _ecore_fb_ts_fd = open("/dev/touchscreen/0", O_RDONLY);
- if (_ecore_fb_ts_fd >= 0)
- {
- prev_flags = fcntl(_ecore_fb_ts_fd, F_GETFL);
- fcntl(_ecore_fb_ts_fd, F_SETFL, prev_flags | O_NONBLOCK);
- _ecore_fb_ts_fd_handler_handle =
ecore_main_fd_handler_add(_ecore_fb_ts_fd,
-
ECORE_FD_READ,
-
_ecore_fb_ts_fd_handler, NULL,
-
NULL, NULL);
- if (!_ecore_fb_ts_fd_handler_handle)
- {
- close(_ecore_fb_ts_fd);
- }
- }
- }
- if (_ecore_fb_ts_fd < 0)
- {
- if (!_ecore_fb_ps2_fd)
- {
- _ecore_fb_ps2_fd = open("/dev/psaux", O_RDWR);
- if (_ecore_fb_ps2_fd >= 0)
- {
- prev_flags = fcntl(_ecore_fb_ps2_fd, F_GETFL);
- fcntl(_ecore_fb_ps2_fd, F_SETFL, prev_flags |
O_NONBLOCK);
- _ecore_fb_ts_fd_handler_handle =
ecore_main_fd_handler_add(_ecore_fb_ps2_fd,
-
ECORE_FD_READ,
-
_ecore_fb_ps2_fd_handler, NULL,
-
NULL, NULL);
- if (!_ecore_fb_ts_fd_handler_handle)
- {
- close(_ecore_fb_ps2_fd);
- }
- }
- }
- }
- if (_ecore_fb_tty_fd != 0)
- {
- struct termios tio;
- struct vt_mode new_vtmode;
-
- tio.c_iflag = tio.c_oflag = tio.c_cflag = tio.c_lflag = 0;
- tio.c_cc[VTIME] = 0;
- tio.c_cc[VMIN] = 1;
- new_vtmode.mode = VT_PROCESS;
- new_vtmode.waitv = 0;
- new_vtmode.relsig = SIGUSR1;
- new_vtmode.acqsig = SIGUSR2;
- tcsetattr(_ecore_fb_tty_fd, TCSAFLUSH, &tio);
- ioctl(_ecore_fb_tty_fd, KDSETMODE, KD_GRAPHICS);
- ioctl(_ecore_fb_tty_fd, KDSKBMODE, K_MEDIUMRAW);
- ioctl(_ecore_fb_tty_fd, VT_SETMODE, &new_vtmode);
- }
- }
- return 1;
-}
-
-static void
-_ecore_fb_vt_switch(int vt)
-{
- vt++;
- if (_ecore_fb_tty_fd != 0)
- {
- if (vt != _ecore_fb_current_vt)
- {
- tcsetattr(_ecore_fb_tty_fd, TCSAFLUSH,
&_ecore_fb_tty_prev_tio_mode);
- ioctl(_ecore_fb_tty_fd, KDSETMODE, _ecore_fb_tty_prev_kd_mode);
- ioctl(_ecore_fb_tty_fd, KDSKBMODE, _ecore_fb_tty_prev_mode);
- }
- }
- ioctl(_ecore_fb_tty_fd, VT_ACTIVATE, vt);
-}
-
-typedef struct _Ecore_Fb_Filter_Data Ecore_Fb_Filter_Data;
-
-struct _Ecore_Fb_Filter_Data
-{
- int last_event_type;
-};
-
-static void *
-_ecore_fb_event_filter_start(void *data __UNUSED__)
-{
- Ecore_Fb_Filter_Data *filter_data;
-
- filter_data = calloc(1, sizeof(Ecore_Fb_Filter_Data));
- return filter_data;
-}
-
-static int
-_ecore_fb_event_filter_filter(void *data __UNUSED__, void *loop_data,int type,
void *event __UNUSED__)
-{
- Ecore_Fb_Filter_Data *filter_data;
-
- filter_data = loop_data;
- if (!filter_data) return 1;
- if (type == ECORE_FB_EVENT_MOUSE_MOVE)
- {
- if ((filter_data->last_event_type) == ECORE_FB_EVENT_MOUSE_MOVE)
- {
- filter_data->last_event_type = type;
- return 0;
- }
- }
- filter_data->last_event_type = type;
- return 1;
-}
-
-static void
-_ecore_fb_event_filter_end(void *data __UNUSED__, void *loop_data)
-{
- Ecore_Fb_Filter_Data *filter_data;
-
- filter_data = loop_data;
- if (filter_data) free(filter_data);
}
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_fb/ecore_fb_private.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ecore_fb_private.h 23 Sep 2003 08:09:31 -0000 1.2
+++ ecore_fb_private.h 31 Jul 2006 04:13:51 -0000 1.3
@@ -1,6 +1,58 @@
#ifndef _ECORE_FB_PRIVATE_H
#define _ECORE_FB_PRIVATE_H
+#include "ecore_private.h"
+#include "Ecore.h"
+#include "Ecore_Data.h"
+
+#include <stdio.h>
+#include <unistd.h>
+#include <termios.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/ioctl.h>
+#include <linux/kd.h>
+#include <linux/vt.h>
+#include <linux/fb.h>
+#include <linux/input.h>
+#include <signal.h>
+#include <fcntl.h>
+#include <errno.h>
+
+/* ecore_fb_li.c */
+struct _Ecore_Fb_Input_Device
+{
+ int fd;
+ Ecore_Fd_Handler *handler;
+ int listen;
+ struct {
+ Ecore_Fb_Input_Device_Cap cap;
+ char *name;
+ char *dev;
+ } info;
+ struct
+ {
+ int x,y;
+ int w,h;
+ double last;
+ double prev;
+ double threshold;
+ double acceleration;
+ } mouse;
+ struct
+ {
+ int shift;
+ int ctrl;
+ int alt;
+ int lock;
+ } keyboard;
+};
+
+/* ecore_fb_vt.c */
+int ecore_fb_vt_init(void);
+void ecore_fb_vt_shutdown(void);
+
+#if 0
/* hacks to stop people NEEDING #include <linux/h3600_ts.h> */
#ifndef TS_SET_CAL
#define TS_SET_CAL 0x4014660b
@@ -25,6 +77,7 @@
#endif
#ifndef FLITE_ON
#define FLITE_ON 0x40046607
+#endif
#endif
#endif
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
