Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_fb
Modified Files:
ecore_fb.c
Log Message:
formatting
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_fb/ecore_fb.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- ecore_fb.c 31 May 2005 22:30:47 -0000 1.10
+++ ecore_fb.c 31 May 2005 22:42:24 -0000 1.11
@@ -516,10 +516,11 @@
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;
- }
+ if (ioctl(_ecore_fb_ts_fd, TS_SET_CAL, (void *)&cal))
+ {
+ _ecore_fb_ts_cal = cal;
+ _ecore_fb_ts_apply_cal = 1;
+ }
}
/**
@@ -538,14 +539,13 @@
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;
+ if (!_ecore_fb_ts_apply_cal)
+ {
+ if (ioctl(_ecore_fb_ts_fd, TS_GET_CAL, (void *)&cal))
+ _ecore_fb_ts_cal = cal;
}
- }
- if (_ecore_fb_ts_apply_cal) {
+ else
cal = _ecore_fb_ts_cal;
- }
if (xscale) *xscale = cal.xscale;
if (xtrans) *xtrans = cal.xtrans;
if (yscale) *yscale = cal.yscale;
@@ -800,13 +800,16 @@
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;
- }
+ 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;
/* add event to queue */
/* always add a move event */
-------------------------------------------------------
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo!
Search APIs Find out how you can build Yahoo! directly into your own
Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
