Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_x
Modified Files:
Ecore_X.h ecore_x.c ecore_x_events.c ecore_x_private.h
ecore_x_screensaver.c
Log Message:
Applied Ravenlock's screensaver patches.
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/Ecore_X.h,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -3 -r1.181 -r1.182
--- Ecore_X.h 29 Dec 2006 02:56:33 -0000 1.181
+++ Ecore_X.h 13 Feb 2007 16:24:37 -0000 1.182
@@ -981,6 +981,7 @@
EAPI void ecore_x_kill(Ecore_X_Window win);
EAPI Ecore_X_Time ecore_x_current_time_get(void);
+EAPI Ecore_X_Time ecore_x_current_user_activity_time_get(void);
EAPI void ecore_x_error_handler_set(void (*func) (void *data),
const void *data);
EAPI void ecore_x_io_error_handler_set(void (*func) (void *data),
const void *data);
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/ecore_x.c,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -3 -r1.123 -r1.124
--- ecore_x.c 2 Dec 2006 06:40:24 -0000 1.123
+++ ecore_x.c 13 Feb 2007 16:24:37 -0000 1.124
@@ -37,6 +37,7 @@
Display *_ecore_x_disp = NULL;
double _ecore_x_double_click_time = 0.25;
Time _ecore_x_event_last_time = 0;
+Time _ecore_x_event_last_user_activity_time = 0;
Window _ecore_x_event_last_win = 0;
int _ecore_x_event_last_root_x = 0;
int _ecore_x_event_last_root_y = 0;
@@ -51,7 +52,7 @@
EAPI Ecore_X_Atom ECORE_X_ATOM_UTF8_STRING = 0;
EAPI Ecore_X_Atom ECORE_X_ATOM_COMPOUND_TEXT = 0;
-Ecore_X_Atom _ecore_x_atoms_wm_protocols[ECORE_X_WM_PROTOCOL_NUM];
+Ecore_X_Atom _ecore_x_atoms_wm_protocols[ECORE_X_WM_PROTOCOL_NUM];
/*
* GNOME hints.
@@ -646,6 +647,16 @@
ecore_x_current_time_get(void)
{
return _ecore_x_event_last_time;
+}
+
+/*
+ * Return the last time a *USER* generated an event
+ * Should corespond to key-down, key-up, mouse-down, mouse-up, mouse move
+ */
+EAPI Ecore_X_Time
+ecore_x_current_user_activity_time_get()
+{
+ return _ecore_x_event_last_user_activity_time;
}
static int
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/ecore_x_events.c,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -3 -r1.93 -r1.94
--- ecore_x_events.c 19 Dec 2006 06:51:51 -0000 1.93
+++ ecore_x_events.c 13 Feb 2007 16:24:37 -0000 1.94
@@ -228,6 +228,7 @@
e->time = xevent->xkey.time;
e->modifiers = xevent->xkey.state;
_ecore_x_event_last_time = e->time;
+ _ecore_x_event_last_user_activity_time = e->time;
ecore_event_add(ECORE_X_EVENT_KEY_DOWN, e, _ecore_x_event_free_key_down,
NULL);
}
@@ -279,6 +280,7 @@
e->time = xevent->xkey.time;
e->modifiers = xevent->xkey.state;
_ecore_x_event_last_time = e->time;
+ _ecore_x_event_last_user_activity_time = e->time;
ecore_event_add(ECORE_X_EVENT_KEY_UP, e, _ecore_x_event_free_key_up, NULL);
}
@@ -332,6 +334,7 @@
e->event_win = xevent->xbutton.window;
e->time = xevent->xbutton.time;
_ecore_x_event_last_time = e->time;
+ _ecore_x_event_last_user_activity_time = e->time;
_ecore_x_event_last_win = e->win;
_ecore_x_event_last_root_x = e->root.x;
_ecore_x_event_last_root_y = e->root.y;
@@ -376,6 +379,7 @@
e->event_win = xevent->xbutton.window;
e->time = xevent->xbutton.time;
_ecore_x_event_last_time = e->time;
+ _ecore_x_event_last_user_activity_time = e->time;
_ecore_x_event_last_win = e->win;
_ecore_x_event_last_root_x = e->root.x;
_ecore_x_event_last_root_y = e->root.y;
@@ -431,6 +435,7 @@
if (!e->double_click && !e->triple_click)
_ecore_x_mouse_up_count = 0;
_ecore_x_event_last_time = e->time;
+ _ecore_x_event_last_user_activity_time = e->time;
_ecore_x_event_last_win = e->win;
_ecore_x_event_last_root_x = e->root.x;
_ecore_x_event_last_root_y = e->root.y;
@@ -497,6 +502,7 @@
e->event_win = xevent->xbutton.window;
e->time = xevent->xbutton.time;
_ecore_x_event_last_time = e->time;
+ _ecore_x_event_last_user_activity_time = e->time;
_ecore_x_event_last_win = e->win;
_ecore_x_event_last_root_x = e->root.x;
_ecore_x_event_last_root_y = e->root.y;
@@ -538,6 +544,7 @@
e->triple_click = 1;
}
_ecore_x_event_last_time = e->time;
+ _ecore_x_event_last_user_activity_time = e->time;
_ecore_x_event_last_win = e->win;
_ecore_x_event_last_root_x = e->root.x;
_ecore_x_event_last_root_y = e->root.y;
@@ -563,6 +570,7 @@
e->event_win = xevent->xmotion.window;
e->time = xevent->xmotion.time;
_ecore_x_event_last_time = e->time;
+ _ecore_x_event_last_user_activity_time = e->time;
_ecore_x_event_last_win = e->win;
_ecore_x_event_last_root_x = e->root.x;
_ecore_x_event_last_root_y = e->root.y;
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/ecore_x_private.h,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -3 -r1.57 -r1.58
--- ecore_x_private.h 13 Feb 2007 02:29:01 -0000 1.57
+++ ecore_x_private.h 13 Feb 2007 16:24:37 -0000 1.58
@@ -146,6 +146,7 @@
extern Display *_ecore_x_disp;
extern double _ecore_x_double_click_time;
extern Time _ecore_x_event_last_time;
+extern Time _ecore_x_event_last_user_activity_time;
extern Window _ecore_x_event_last_win;
extern int _ecore_x_event_last_root_x;
extern int _ecore_x_event_last_root_y;
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/ecore_x_screensaver.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ecore_x_screensaver.c 29 Dec 2006 02:56:33 -0000 1.5
+++ ecore_x_screensaver.c 13 Feb 2007 16:24:37 -0000 1.6
@@ -19,6 +19,12 @@
}
EAPI void
+ecore_x_screensaver_set(int timeout, int interval, int blank, int expose)
+{
+ XSetScreenSaver(_ecore_x_disp, timeout, interval, blank, expose);
+}
+
+EAPI void
ecore_x_screensaver_timeout_set(double timeout)
{
int pto, pint, pblank, pexpo;
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
