Send plymouth mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.freedesktop.org/mailman/listinfo/plymouth
or, via email, send a message with subject or body 'help' to
[email protected]
You can reach the person managing the list at
[email protected]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of plymouth digest..."
Today's Topics:
1. [PATCH 1/2] [script] check that there are pixel displays
(Scott James Remnant)
2. [PATCH 2/2] [main] unset keyboard if splash fails to show
(Scott James Remnant)
3. Re: [PATCH 1/2] [script] check that there are pixel displays
(Charlie Brej)
4. Re: [PATCH 1/2] [script] check that there are pixel displays
(Scott James Remnant)
----------------------------------------------------------------------
Message: 1
Date: Thu, 11 Mar 2010 20:25:19 +0000
From: Scott James Remnant <[email protected]>
Subject: [PATCH 1/2] [script] check that there are pixel displays
To: [email protected]
Message-ID: <[email protected]>
The script plugin only works on pixel displays, however there wasn't
any check for this, so if a script-based theme was your default
Plymouth would not fallback to using the text plugin instead.
---
src/plugins/splash/script/plugin.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/plugins/splash/script/plugin.c
b/src/plugins/splash/script/plugin.c
index b35994c..4930677 100644
--- a/src/plugins/splash/script/plugin.c
+++ b/src/plugins/splash/script/plugin.c
@@ -348,6 +348,12 @@ show_splash_screen (ply_boot_splash_plugin_t *plugin,
{
assert (plugin != NULL);
+ if (ply_list_get_length (plugin->displays) == 0)
+ {
+ ply_trace ("no pixel displays");
+ return false;
+ }
+
plugin->loop = loop;
plugin->mode = mode;
--
1.7.0
------------------------------
Message: 2
Date: Thu, 11 Mar 2010 20:26:36 +0000
From: Scott James Remnant <[email protected]>
Subject: [PATCH 2/2] [main] unset keyboard if splash fails to show
To: [email protected]
Message-ID: <[email protected]>
Since script implements a set_keyboard function (the only plugin to
do so), the previous commit reveals a bug where set_keyboard is
called for the plugin but unset_keyboard isn't called if the plugin
fails to be loaded
---
src/main.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/main.c b/src/main.c
index 71e552c..aebab61 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1185,6 +1185,7 @@ start_boot_splash (state_t *state,
if (!ply_boot_splash_show (splash, splash_mode))
{
ply_save_errno ();
+ ply_boot_splash_unset_keyboard (splash);
ply_boot_splash_free (splash);
ply_restore_errno ();
return NULL;
--
1.7.0
------------------------------
Message: 3
Date: Thu, 11 Mar 2010 20:32:35 +0000
From: Charlie Brej <[email protected]>
Subject: Re: [PATCH 1/2] [script] check that there are pixel displays
To: Scott James Remnant <[email protected]>
Cc: [email protected]
Message-ID: <[email protected]>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
On 11/03/10 20:25, Scott James Remnant wrote:
> The script plugin only works on pixel displays, however there wasn't
> any check for this, so if a script-based theme was your default
> Plymouth would not fallback to using the text plugin instead.
> ---
> src/plugins/splash/script/plugin.c | 6 ++++++
> 1 files changed, 6 insertions(+), 0 deletions(-)
>
> diff --git a/src/plugins/splash/script/plugin.c
> b/src/plugins/splash/script/plugin.c
> index b35994c..4930677 100644
> --- a/src/plugins/splash/script/plugin.c
> +++ b/src/plugins/splash/script/plugin.c
> @@ -348,6 +348,12 @@ show_splash_screen (ply_boot_splash_plugin_t *plugin,
> {
> assert (plugin != NULL);
>
> + if (ply_list_get_length (plugin->displays) == 0)
> + {
> + ply_trace ("no pixel displays");
> + return false;
> + }
> +
> plugin->loop = loop;
> plugin->mode = mode;
>
Fine by me although I thought the other plugins did it by not attaching
to any displays and letting the system notice they're not connected. Ray?
------------------------------
Message: 4
Date: Thu, 11 Mar 2010 20:38:16 +0000
From: Scott James Remnant <[email protected]>
Subject: Re: [PATCH 1/2] [script] check that there are pixel displays
To: Charlie Brej <[email protected]>
Cc: [email protected]
Message-ID: <1268339896.3639.6.ca...@wing-commander>
Content-Type: text/plain; charset="utf-8"
On Thu, 2010-03-11 at 20:32 +0000, Charlie Brej wrote:
> Fine by me although I thought the other plugins did it by not attaching
> to any displays and letting the system notice they're not connected. Ray?
>
The other plugins do it by creating "views" as pixel displays are added,
then on show_splash activating those views and failing if it fails to
activate any view.
script didn't match this pattern
Scott
--
Scott James Remnant
[email protected]
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part
URL:
<http://lists.freedesktop.org/archives/plymouth/attachments/20100311/60c8c288/attachment-0001.pgp>
------------------------------
_______________________________________________
plymouth mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/plymouth
End of plymouth Digest, Vol 17, Issue 6
***************************************
