enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

remove e_screensaver_force_update() 

this was just used to set up x11 screensaver stuff, which has now been
relocated to the related comp_init function
This commit is contained in:
Mike Blumenkrantz 2015-07-27 15:54:15 -04:00
parent 7f638d98bf
commit 4543e26ca6
4 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/bin/e_comp_x.c
View File

@ -5350,6 +5350,19 @@ e_comp_x_init(void)
ecore_x_sync();
_x_idle_flush = ecore_idle_enterer_add(_e_comp_x_flusher, NULL);
if (e_comp->comp_type != E_PIXMAP_TYPE_WL)
{
int timeout = e_screensaver_timeout_get(EINA_TRUE);
ecore_x_screensaver_set(timeout + 10,
0,
!e_config->screensaver_blanking,
!e_config->screensaver_expose);
ecore_x_screensaver_set(timeout,
0,
e_config->screensaver_blanking,
e_config->screensaver_expose);
}
return EINA_TRUE;
}

1
src/bin/e_main.c
View File

@ -706,7 +706,6 @@ main(int argc, char **argv)
}
TS("Screens Init Done");
_e_main_shutdown_push(_e_main_screens_shutdown);
e_screensaver_force_update();
TS("E_Pointer Init");
if (!e_pointer_init())

23
src/bin/e_screensaver.c
View File

@ -116,28 +116,6 @@ e_screensaver_update(void)
#endif
}
E_API void
e_screensaver_force_update(void)
{
#ifndef HAVE_WAYLAND_ONLY
int timeout = e_screensaver_timeout_get(EINA_TRUE);
if (e_comp_util_has_x())
{
ecore_x_screensaver_set(timeout + 10,
0,
// e_config->screensaver_interval,
!e_config->screensaver_blanking,
!e_config->screensaver_expose);
ecore_x_screensaver_set(timeout,
0,
// e_config->screensaver_interval,
e_config->screensaver_blanking,
e_config->screensaver_expose);
}
#else
#endif
}
static Eina_Bool
_e_screensaver_handler_config_mode_cb(void *data EINA_UNUSED, int type EINA_UNUSED, void *event EINA_UNUSED)
{
@ -286,7 +264,6 @@ _e_screensaver_handler_screensaver_on_cb(void *data EINA_UNUSED, int type EINA_U
static Eina_Bool
_e_screensaver_handler_screensaver_off_cb(void *data EINA_UNUSED, int type EINA_UNUSED, void *event EINA_UNUSED)
{
// e_screensaver_force_update();
// e_dpms_force_update();
_e_screensaver_on = EINA_FALSE;

1
src/bin/e_screensaver.h
View File

@ -8,7 +8,6 @@ EINTERN int e_screensaver_init(void);
EINTERN int e_screensaver_shutdown(void);
E_API void e_screensaver_update(void);
E_API void e_screensaver_force_update(void);
E_API int e_screensaver_timeout_get(Eina_Bool use_idle);
E_API void e_screensaver_attrs_set(int timeout, int blanking, int expose);