Hi all,
I've played around with Ecore_Fb on my zaurus and I've run into some
problems with events getting through to evas.
First, there were some comments about libts support in ecore a couple of
weeks ago, this libts implementation (ecore_fb_ts_c) seems to be very
ipaq specific, and is not used anywhere and deprecated.
I've altered it and attach patches here to enable it again and only
support the libts mouse events and remove all the ipaq
backlightning,led,brightnes...etc stuff, I've also removed the
calibration.
Now ecore_event_handler_add(ECORE_FB_EVENT_MOUSE_*...) events works, but
I can't get any evas_object_event_callbacks to work (subsequently edje
files don't receive any mouse events either).
I've tried evas_event_feed_mouse in an app but I can't get any more
events than mouse_in and mouse_out fed to the evas_object. I'm not sure
I grok evas_event_feed*.
Any hints to solve this would be very appreciated, I've looked at
ecore_evas_fb.c but can't find anything wrong with it.
/Cheers
Tobias
diff -Nurd ecore_fb.orig/Ecore_Fb.h ecore_fb/Ecore_Fb.h
--- ecore_fb.orig/Ecore_Fb.h 2008-01-05 20:30:50.777011014 +0100
+++ ecore_fb/Ecore_Fb.h 2008-01-05 20:40:54.033980381 +0100
@@ -135,6 +135,7 @@
EAPI int ecore_fb_shutdown(void);
EAPI void ecore_fb_size_get(int *w, int *h);
+EAPI int ecore_fb_ts_init(void);
/* DEPRECATED */
#if 0
EAPI void ecore_fb_touch_screen_calibrate_set(int xscale, int xtrans, int yscale, int ytrans, int xyswap);
diff -Nurd ecore_fb.orig/Makefile.am ecore_fb/Makefile.am
--- ecore_fb.orig/Makefile.am 2008-01-05 20:30:50.777011014 +0100
+++ ecore_fb/Makefile.am 2008-01-05 20:30:50.309082399 +0100
@@ -14,9 +14,9 @@
ecore_fb.c \
ecore_fb_vt.c \
ecore_fb_li.c \
+ecore_fb_ts.c \
ecore_fb_private.h
# deprecated sources (might not compile):
-# ecore_fb_ts.c
# ecore_fb_kbd.c
# ecore_fb_ps2.c
diff -Nurd ecore_fb.orig/ecore_fb_ts.c ecore_fb/ecore_fb_ts.c
--- ecore_fb.orig/ecore_fb_ts.c 2008-01-05 20:30:50.777011014 +0100
+++ ecore_fb/ecore_fb_ts.c 2008-01-05 20:30:50.277087281 +0100
@@ -1,21 +1,17 @@
+#include "Ecore_Fb.h"
+#include "ecore_fb_private.h"
+#include "config.h"
#ifdef HAVE_TSLIB
#include <tslib.h>
#include <errno.h>
#endif
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;
static int _ecore_fb_ts_fd_handler(void *data, Ecore_Fd_Handler *fd_handler);
static int _ecore_fb_ts_fd = 0;
static int _ecore_fb_ts_event_byte_count = 0;
-static int _ecore_fb_ts_apply_cal = 0;
static Ecore_Fb_Ts_Event _ecore_fb_ts_event;
-static Ecore_Fb_Ts_Calibrate _ecore_fb_ts_cal = {1,1,0,0,0};
static Ecore_Fd_Handler *_ecore_fb_ts_fd_handler_handle = NULL;
#ifdef HAVE_TSLIB
@@ -23,7 +19,7 @@
struct ts_sample _ecore_fb_tslib_event;
#endif
-
+static double _ecore_fb_double_click_time = 0.25;
struct _Ecore_Fb_Ts_Event
{
@@ -33,45 +29,13 @@
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;
-};
-
-
-int
+EAPI int
ecore_fb_ts_init(void)
{
+ int prev_flags;
#ifdef HAVE_TSLIB
char *tslib_tsdevice = NULL;
if ( ( tslib_tsdevice = getenv("TSLIB_TSDEVICE") ) != NULL )
@@ -129,241 +93,20 @@
_ecore_fb_ts_fd_handler_handle = NULL;
}
-/**
- * @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;
-}
static int
@@ -383,10 +126,7 @@
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 );
+ num = ts_read( _ecore_fb_tslib_tsdev, &_ecore_fb_tslib_event, 1 );
if ( num != 1 )
{
return 1; /* no more samples at this time */
@@ -395,6 +135,7 @@
y = _ecore_fb_tslib_event.y;
pressure = _ecore_fb_tslib_event.pressure;
v = 1; /* loop, there might be more samples */
+ t = ecore_time_get();
#else
ptr = (char *)&(_ecore_fb_ts_event);
ptr += _ecore_fb_ts_event_byte_count;
@@ -403,18 +144,9 @@
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;
- }
+ x = _ecore_fb_ts_event.x;
+ y = _ecore_fb_ts_event.y;
pressure = _ecore_fb_ts_event.pressure;
#endif
/* add event to queue */
@@ -440,7 +172,7 @@
e->x = x;
e->y = y;
e->button = 1;
- if ((t - last_time) <= _ecore_fb_double_click_time)
+ if ((t - last_time) <= _ecore_fb_double_click_time)
e->double_click = 1;
if ((t - last_last_time) <= (2 * _ecore_fb_double_click_time))
{
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
