Enlightenment CVS committal
Author : barbieri
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_x
Modified Files:
Ecore_X.h ecore_x_screensaver.c
Log Message:
Fix ecore_x_screensaver insanity
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/Ecore_X.h,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -3 -r1.190 -r1.191
--- Ecore_X.h 6 Oct 2007 08:37:32 -0000 1.190
+++ Ecore_X.h 5 Nov 2007 20:47:29 -0000 1.191
@@ -325,8 +325,8 @@
Ecore_X_Window win;
Ecore_X_Window event_win;
Ecore_X_Time time;
- int double_click : 1;
- int triple_click : 1;
+ unsigned int double_click : 1;
+ unsigned int triple_click : 1;
};
struct _Ecore_X_Event_Mouse_Button_Up
@@ -340,8 +340,8 @@
Ecore_X_Window win;
Ecore_X_Window event_win;
Ecore_X_Time time;
- int double_click : 1;
- int triple_click : 1;
+ unsigned int double_click : 1;
+ unsigned int triple_click : 1;
};
struct _Ecore_X_Event_Mouse_Move
@@ -481,8 +481,8 @@
Ecore_X_Window abovewin;
int x, y, w, h;
int border;
- int override : 1;
- int from_wm : 1;
+ unsigned int override : 1;
+ unsigned int from_wm : 1;
Ecore_X_Time time;
};
@@ -1485,15 +1485,15 @@
EAPI int ecore_x_screensaver_idle_time_get(void);
EAPI void ecore_x_get_screensaver_prefetch(void);
EAPI void ecore_x_get_screensaver_fetch(void);
-EAPI void ecore_x_screensaver_set(int timeout, int interval,
int blank, int expose);
-EAPI void ecore_x_screensaver_timeout_set(double timeout);
-EAPI double ecore_x_screensaver_timeout_get(void);
-EAPI void ecore_x_screensaver_blank_set(double timeout);
-EAPI double ecore_x_screensaver_blank_get(void);
-EAPI void ecore_x_screensaver_expose_set(double timeout);
-EAPI double ecore_x_screensaver_expose_get(void);
-EAPI void ecore_x_screensaver_interval_set(double timeout);
-EAPI double ecore_x_screensaver_interval_get(void);
+EAPI void ecore_x_screensaver_set(int timeout, int interval,
int prefer_blanking, int allow_exposures);
+EAPI void ecore_x_screensaver_timeout_set(int timeout);
+EAPI int ecore_x_screensaver_timeout_get(void);
+EAPI void ecore_x_screensaver_blank_set(int timeout);
+EAPI int ecore_x_screensaver_blank_get(void);
+EAPI void ecore_x_screensaver_expose_set(int timeout);
+EAPI int ecore_x_screensaver_expose_get(void);
+EAPI void ecore_x_screensaver_interval_set(int timeout);
+EAPI int ecore_x_screensaver_interval_get(void);
EAPI void ecore_x_screensaver_event_listen_set(int on);
/* FIXME: these funcs need categorising */
@@ -1504,11 +1504,11 @@
int x, y, w, h;
int border;
int depth;
- char visible : 1;
- char viewable : 1;
- char override : 1;
- char input_only : 1;
- char save_under : 1;
+ unsigned char visible : 1;
+ unsigned char viewable : 1;
+ unsigned char override : 1;
+ unsigned char input_only : 1;
+ unsigned char save_under : 1;
struct {
Ecore_X_Event_Mask mine;
Ecore_X_Event_Mask all;
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/ecore_x_screensaver.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- ecore_x_screensaver.c 4 Apr 2007 11:43:29 -0000 1.10
+++ ecore_x_screensaver.c 5 Nov 2007 20:47:29 -0000 1.11
@@ -31,10 +31,10 @@
return _screensaver_available;
}
-EAPI int
+EAPI int
ecore_x_screensaver_idle_time_get(void)
{
-#ifdef ECORE_XSS
+#ifdef ECORE_XSS
XScreenSaverInfo *xss;
int idle;
@@ -50,85 +50,81 @@
}
EAPI void
-ecore_x_screensaver_set(int timeout, int interval, int blank, int expose)
+ecore_x_screensaver_set(int timeout, int interval, int prefer_blanking, int
allow_exposures)
{
- XSetScreenSaver(_ecore_x_disp, timeout, interval, blank, expose);
+ XSetScreenSaver(_ecore_x_disp, timeout, interval, prefer_blanking,
allow_exposures);
}
EAPI void
-ecore_x_screensaver_timeout_set(double timeout)
+ecore_x_screensaver_timeout_set(int timeout)
{
int pto, pint, pblank, pexpo;
-
- XGetScreenSaver(_ecore_x_disp, &pto, &pint, &pblank, &pexpo);
- XSetScreenSaver(_ecore_x_disp, (int)timeout,
- pint, pblank, pexpo);
+
+ XGetScreenSaver(_ecore_x_disp, &pto, &pint, &pblank, &pexpo);
+ XSetScreenSaver(_ecore_x_disp, timeout, pint, pblank, pexpo);
}
-EAPI double
+EAPI int
ecore_x_screensaver_timeout_get(void)
{
int pto, pint, pblank, pexpo;
-
+
XGetScreenSaver(_ecore_x_disp, &pto, &pint, &pblank, &pexpo);
- return (double)pto;
+ return pto;
}
EAPI void
-ecore_x_screensaver_blank_set(double blank)
+ecore_x_screensaver_blank_set(int blank)
{
int pto, pint, pblank, pexpo;
-
- XGetScreenSaver(_ecore_x_disp, &pto, &pint, &pblank, &pexpo);
- XSetScreenSaver(_ecore_x_disp, pto,
- pint, (int)blank, pexpo);
+
+ XGetScreenSaver(_ecore_x_disp, &pto, &pint, &pblank, &pexpo);
+ XSetScreenSaver(_ecore_x_disp, pto, pint, blank, pexpo);
}
-EAPI double
+EAPI int
ecore_x_screensaver_blank_get(void)
{
int pto, pint, pblank, pexpo;
-
+
XGetScreenSaver(_ecore_x_disp, &pto, &pint, &pblank, &pexpo);
- return (double)pblank;
+ return pblank;
}
EAPI void
-ecore_x_screensaver_expose_set(double expose)
+ecore_x_screensaver_expose_set(int expose)
{
int pto, pint, pblank, pexpo;
-
- XGetScreenSaver(_ecore_x_disp, &pto, &pint, &pblank, &pexpo);
- XSetScreenSaver(_ecore_x_disp, pto,
- pint, pblank, (int)expose);
+
+ XGetScreenSaver(_ecore_x_disp, &pto, &pint, &pblank, &pexpo);
+ XSetScreenSaver(_ecore_x_disp, pto, pint, pblank, expose);
}
EAPI double
ecore_x_screensaver_expose_get(void)
{
int pto, pint, pblank, pexpo;
-
+
XGetScreenSaver(_ecore_x_disp, &pto, &pint, &pblank, &pexpo);
return (double)pexpo;
}
EAPI void
-ecore_x_screensaver_interval_set(double interval)
+ecore_x_screensaver_interval_set(int interval)
{
int pto, pint, pblank, pexpo;
-
- XGetScreenSaver(_ecore_x_disp, &pto, &pint, &pblank, &pexpo);
- XSetScreenSaver(_ecore_x_disp, pto,
- (int)interval, pblank, pexpo);
+
+ XGetScreenSaver(_ecore_x_disp, &pto, &pint, &pblank, &pexpo);
+ XSetScreenSaver(_ecore_x_disp, pto, interval, pblank, pexpo);
}
-EAPI double
+EAPI int
ecore_x_screensaver_interval_get(void)
{
int pto, pint, pblank, pexpo;
-
+
XGetScreenSaver(_ecore_x_disp, &pto, &pint, &pblank, &pexpo);
- return (double)pint;
+ return pint;
}
EAPI void
@@ -136,7 +132,7 @@
{
#ifdef ECORE_XSS
Ecore_X_Window root;
-
+
root = DefaultRootWindow(_ecore_x_disp);
if (on)
XScreenSaverSelectInput(_ecore_x_disp, root, ScreenSaverNotifyMask);
@@ -144,5 +140,5 @@
XScreenSaverSelectInput(_ecore_x_disp, root, 0);
#else
on = 0;
-#endif
+#endif
}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
