frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

present: Refactor present_screen_init 

To initialize easily different flip modes, refactor
'present_screen_init'.

Signed-off-by: Roman Gilg <subdiff@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Roman Gilg 2018-03-13 16:00:43 +01:00 committed by Adam Jackson
parent 6d813bbd5e
commit 3aaaac0be5
1 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
present/present_screen.c
View File

@ -170,11 +170,8 @@ present_clip_notify(WindowPtr window, int dx, int dy)
wrap(screen_priv, screen, ClipNotify, present_clip_notify); wrap(screen_priv, screen, ClipNotify, present_clip_notify);
} }
/* static Bool
* Initialize a screen for use with present present_screen_register_priv_keys(void)
*/
int
present_screen_init(ScreenPtr screen, present_screen_info_ptr info)
{ {
if (!dixRegisterPrivateKey(&present_screen_private_key, PRIVATE_SCREEN, 0)) if (!dixRegisterPrivateKey(&present_screen_private_key, PRIVATE_SCREEN, 0))
return FALSE; return FALSE;
@ -182,20 +179,43 @@ present_screen_init(ScreenPtr screen, present_screen_info_ptr info)
if (!dixRegisterPrivateKey(&present_window_private_key, PRIVATE_WINDOW, 0)) if (!dixRegisterPrivateKey(&present_window_private_key, PRIVATE_WINDOW, 0))
return FALSE; return FALSE;
if (!present_screen_priv(screen)) { return TRUE;
present_screen_priv_ptr screen_priv = calloc(1, sizeof (present_screen_priv_rec)); }
static present_screen_priv_ptr
present_screen_priv_init(ScreenPtr screen)
{
present_screen_priv_ptr screen_priv;
screen_priv = calloc(1, sizeof (present_screen_priv_rec));
if (!screen_priv) if (!screen_priv)
return FALSE; return NULL;
wrap(screen_priv, screen, CloseScreen, present_close_screen); wrap(screen_priv, screen, CloseScreen, present_close_screen);
wrap(screen_priv, screen, DestroyWindow, present_destroy_window); wrap(screen_priv, screen, DestroyWindow, present_destroy_window);
wrap(screen_priv, screen, ConfigNotify, present_config_notify); wrap(screen_priv, screen, ConfigNotify, present_config_notify);
wrap(screen_priv, screen, ClipNotify, present_clip_notify); wrap(screen_priv, screen, ClipNotify, present_clip_notify);
screen_priv->info = info;
dixSetPrivate(&screen->devPrivates, &present_screen_private_key, screen_priv); dixSetPrivate(&screen->devPrivates, &present_screen_private_key, screen_priv);
return screen_priv;
}
/*
* Initialize a screen for use with present
*/
int
present_screen_init(ScreenPtr screen, present_screen_info_ptr info)
{
if (!present_screen_register_priv_keys())
return FALSE;
if (!present_screen_priv(screen)) {
present_screen_priv_ptr screen_priv = present_screen_priv_init(screen);
if (!screen_priv)
return FALSE;
screen_priv->info = info;
present_scmd_init_mode_hooks(screen_priv); present_scmd_init_mode_hooks(screen_priv);
present_fake_screen_init(screen); present_fake_screen_init(screen);