fdo-mirrors/plymouth
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/plymouth/plymouth.git synced 2026-04-30 23:47:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'use-fallback-image-if-bgrt-is-not-supported' into 'master'

Browse source 
Use fallback image if BGRT is not supported

See merge request plymouth/plymouth!125
This commit is contained in:
Ray Strode 2020-12-07 22:39:07 +00:00
commit c4ced2a2d7
1 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/plugins/splash/two-step/plugin.c
View file

@ -139,6 +139,7 @@ struct _ply_boot_splash_plugin
ply_image_t *header_image;
ply_image_t *background_tile_image;
ply_image_t *background_bgrt_image;
ply_image_t *background_bgrt_fallback_image;
ply_image_t *watermark_image;
ply_list_t *views;
@ -1048,6 +1049,10 @@ create_plugin (ply_key_file_t *key_file)
plugin->background_tile_image = ply_image_new (image_path);
free (image_path);
asprintf (&image_path, "%s/bgrt-fallback.png", image_dir);
plugin->background_bgrt_fallback_image = ply_image_new (image_path);
free (image_path);
asprintf (&image_path, "%s/watermark.png", image_dir);
plugin->watermark_image = ply_image_new (image_path);
free (image_path);
@ -1243,6 +1248,9 @@ destroy_plugin (ply_boot_splash_plugin_t *plugin)
if (plugin->background_bgrt_image != NULL)
ply_image_free (plugin->background_bgrt_image);
if (plugin->background_bgrt_fallback_image != NULL)
ply_image_free (plugin->background_bgrt_fallback_image);
if (plugin->watermark_image != NULL)
ply_image_free (plugin->watermark_image);
@ -1655,11 +1663,17 @@ show_splash_screen (ply_boot_splash_plugin_t *plugin,
plugin->background_bgrt_raw_width = ply_image_get_width (plugin->background_bgrt_image);
plugin->background_bgrt_raw_height = ply_image_get_height (plugin->background_bgrt_image);
} else {
ply_image_free (plugin->background_bgrt_image);
plugin->background_bgrt_image = NULL;
for (i = 0; i < PLY_BOOT_SPLASH_MODE_COUNT; i++)
plugin->mode_settings[i].use_firmware_background = false;
plugin->use_firmware_background = false;
ply_trace ("loading background bgrt fallback image");
if (ply_image_load (plugin->background_bgrt_fallback_image)) {
plugin->background_bgrt_image = plugin->background_bgrt_fallback_image;
plugin->background_bgrt_fallback_image = NULL;
} else {
ply_image_free (plugin->background_bgrt_image);
plugin->background_bgrt_image = NULL;
for (i = 0; i < PLY_BOOT_SPLASH_MODE_COUNT; i++)
plugin->mode_settings[i].use_firmware_background = false;
plugin->use_firmware_background = false;
}
}
}