Merge lp:~pali/ubuntu/natty/plymouth/plymouth into lp:ubuntu/oneiric/plymouth

[Pali]

Added support for scrolling boot log messages in theme ubuntu-logo and in plugins: text and ubuntu-text.
Log message must start with prefix 'log:', status reason message must be 'log:ok' or 'log:failed'
Scrolling boot log messages looks like in old usplash

Examples:
 $ plymouth message --text='log:Starting daemon xyz' # Show message 'Starting daemon xyz...'
 $ plymouth message --text='log:ok' # Append status reason message 'ok'
 $ plymouth message --text='log:Starting daemon abc' # Show next message 'Starting daemon abc...'
 $ plymouth message --text='log:failed' # Append status reason message 'failed'

[Martin Pitt (pitti)]

Pali,

thanks for your work on this!

I think the chance of getting this accepted would be higher if you would send this as a patch to upstream instead:

  https://bugs.freedesktop.org/enter_bug.cgi?product=plymouth

That way, the experts of that software can review your patch and integrate it upstream, instead of distros carrying big patches for new features.

Thanks!

[Pali (pali)]

Ok,

I try to add support for 'log:' to all plymouth themes/splashes and correct handling in plymouth-upstart bridge.
Then I send all patches to upstream.

I'd like to have full functional verbose boot log in plymouth with upstart (not in ubuntu and text theme).

Can you tell me if which of these plugins is ubuntu specified and which is in upstream?
* text
* ubuntu-text
* ubuntu-logo
* details

[Colin Watson (cjwatson)]

Well, that's true for the text splash; and I agree that it would be good to have that interface be standard. However, once the patch to the text splash has been reviewed, we'll still need Ubuntu-specific changes to the ubuntu-text and ubuntu-logo splash.

[Colin Watson (cjwatson)]

It'll be clear when you look at upstream's git repository; but text and
details are upstream, while ubuntu-text and ubuntu-logo are
Ubuntu-specific.

[Pali (pali)]

Thanks for info!

[Pali (pali)]

Now I finished my patches. Boot log messages working fine with details, text, ubuntu-text and ubuntu-logo theme.
Writing log messages from upstart-bridge is done by plymouth 'log:' prefix too (removed old code with write messages directly to console).

So is patches ready for merge.

What missing is kubuntu-logo theme which is in different package (kubuntu-default-settings). But this theme is same as ubuntu-logo (diff say me differences only in background image).

Problem is with pushing patches to upstream. Ubuntu plymouth in bzr and upstream plymouth in git are very divergented. It is not simple to apply my patches on top of git plymouth repostory.

[Pali (pali)]

for kubuntu-logo theme is merge request here:
https://code.launchpad.net/~pali/ubuntu/oneiric/kubuntu-default-settings/kubuntu-default-settings/+merge/63334

[Pali (pali)]

Merge request for initramfs scripts is here:
https://code.launchpad.net/~pali/ubuntu/oneiric/initramfs-tools/initramfs-tools/+merge/64373

[Scott Moser (smoser)]

Pali,
  I believe that Martin (comment 2011-05-30) was suggesting that you try to get your changes into upstream plymouth (probably by mailing to the mailing list http://lists.freedesktop.org/mailman/listinfo/plymouth ).
  It looks like you've done a fair amount of valuable work, but Ubuntu would rather not carry that delta without an idea as to whether or not upstream is accepting of it.

[Pali (pali)]

Relevant patch for upstream (text, details and upstart plugins) was sent to mailingslist. Other changes are ubuntu specified (ubuntu-text, ubuntu-logo).

[Sebastien Bacher (seb128)]

could you give a pointer to the list discussion? http://lists.freedesktop.org/archives/plymouth/2011-June has no mention of it

[Sebastien Bacher (seb128)]

setting the merge request to "work in progress", you should set it back to "needs review" once you sent the patches that need to go upstream to fdo

[Pali (pali)]

I sent mail, but I'm not member of mailinglist, so I got:

Your mail to 'plymouth' with the subject

    [PATCH] Add support for scrolling boot log messages

Is being held until the list moderator can review it for approval.

The reason it is being held:

    Post by non-member to a members-only list

[Pali (pali)]

Here is pointer to patch on plymouth list: http://lists.freedesktop.org/archives/plymouth/2011-June/000546.html

[Pali (pali)]

Cryptsetup patch is in this merge request:
https://code.launchpad.net/~pali/ubuntu/oneiric/cryptsetup/cryptsetup/+merge/67208

[Pali (pali)]

Patch which redirect System V init script boot log messages to plymouth is here:
https://code.launchpad.net/~pali/ubuntu/oneiric/lsb/lsb/+merge/68212

[Clint Byrum (clint-fewbar)]

Pali, thanks so much for pushing this upstream. It looks like there are a lot of patches from that list without a response. Maybe send Ray a private request for a review? I think this is pretty cool and would be a useful feature, but agree that we probably would prefer that it be accepted upstream.

[Chris Halse Rogers (raof)]

I note that Ray has (finally :)) commented on your patches and raised some design questions. Have you seen his reply, and are you planning to modify your patch in response? It'd be great to get all these boot-splash improvements in!

[Martin Pitt (pitti)]

This is (and should be) handled upstream now, thus I close this merge proposal. Thanks!

[Pali (pali)]

This merge request also change file themes/ubuntu-logo/ubuntu-logo.script which is not in upstream and ubuntu specific.

[Pali (pali)]

This cannot be upstreamed, because ubuntu using ubuntu specified settings like theme, logo...

[Evan Broder (broder)]

Pali, I'm a little confused why you've reopened this merge proposal. It seems to be the same patchset that you originally proposed, and that Ray reviewed on the plymouth mailing list. We do not generally accept invasive patches like this when they haven't been accepted by upstream.

Please work on modifying the patches so that upstream will accept the non-Ubuntu-specific portions, and then we can consider the Ubuntu-specific stuff.

Unmerged revisions

1406. By Pali on 2011-10-30

ubuntu-logo: fix position and count of boot log messages

1405. By Pali on 2011-10-30

Make sure that plymouth-upstart-bridge will be started after plymouth in runlevel 0 and 6

1404. By Pali on 2011-06-17

plymouth-upstart-bridge has now no console output

1403. By Pali on 2011-06-03

ubuntu-text plugin: Increase count of buffered message lines to 40

1402. By Pali on 2011-06-03

text plugin: Increase count of buffered message lines to 40, fixed centering log messages

1401. By Pali on 2011-06-03

Clean code plymouth-upstart-bridge

1400. By Pali on 2011-06-03

Removed duplicated code ( printing boot log messages ) in plymouth-upstart-bridge
Now it is in splash plugins

1399. By Pali on 2011-06-03

Added support for for scrolling boot log messages in plymouth-upstart-bridge

1398. By Pali on 2011-06-03

Added support for scrolling boot log messages in details plugin

1397. By Pali on 2011-05-22

Added support for scrolling boot log messages in text plugin

=== modified file 'debian/plymouth.plymouth-upstart-bridge.upstart'
--- debian/plymouth.plymouth-upstart-bridge.upstart	2011-01-21 18:09:36 +0000
+++ debian/plymouth.plymouth-upstart-bridge.upstart	2011-06-17 20:26:30 +0000
@@ -9,6 +9,4 @@
           or runlevel [06])
 stop on stopping plymouth
 
-console output
-
 exec plymouth-upstart-bridge
 
=== modified file 'src/plugins/splash/details/plugin.c'
--- src/plugins/splash/details/plugin.c	2011-04-21 06:55:41 +0000
+++ src/plugins/splash/details/plugin.c	2011-06-17 20:26:30 +0000
@@ -18,6 +18,7 @@
  * 02111-1307, USA.
  *
  * Written by: Ray Strode <[e-mail]>
+ *             Pali Rohár <[e-mail]>
  */
 #include "config.h"
 
@@ -428,6 +429,43 @@
 
   if (!strncmp (message, "keys:", strlen ("keys:")))
     message_to_display = message + strlen ("keys:");
+  else if (!strncmp (message, "log:", strlen ("log:")))
+    {
+      if (!strncmp (message, "log:ok", 6) || !strncmp(message, "log:failed", 10))
+        {
+          if (plugin->state == PLY_BOOT_SPLASH_DISPLAY_NORMAL)
+            {
+              ply_list_node_t *node = ply_list_get_first_node (plugin->views);
+
+              while (node != NULL)
+                {
+                  view_t *view = ply_list_node_get_data (node);
+                  node = ply_list_get_next_node (plugin->views, node);
+
+                  int cols = ply_text_display_get_number_of_columns (view->display) - 7;
+                  ply_text_display_write (view->display, "\033[1A\033[%dC", cols); // Move cursor to previous end of line
+
+                  if (!strncmp (message, "log:ok", 6))
+                    ply_text_display_write (view->display, "[ OK ]\r\n");
+                  else
+                    {
+                      ply_text_display_write (view->display, "[");
+                      ply_text_display_set_foreground_color (view->display, PLY_TERMINAL_COLOR_RED);
+                      ply_text_display_write (view->display, "fail");
+                      ply_text_display_set_foreground_color (view->display, PLY_TERMINAL_COLOR_DEFAULT);
+                      ply_text_display_write (view->display, "]\r\n");
+                    }
+                }
+            }
+
+          return;
+        }
+      else
+        {
+          message_to_display = calloc (strlen (message + 4) + strlen(" * ") + 3, sizeof (char));
+          sprintf (message_to_display, " * %s", message + 4);
+        }
+    }
   else
     message_to_display = message;
 
 
=== modified file 'src/plugins/splash/text/plugin.c'
--- src/plugins/splash/text/plugin.c	2010-04-13 23:02:26 +0000
+++ src/plugins/splash/text/plugin.c	2011-06-17 20:26:30 +0000
@@ -19,6 +19,7 @@
  *
  * Written by: Adam Jackson <[e-mail]>
  *             Ray Strode <[e-mail]>
+ *             Pali Rohár <[e-mail]>
  */
 #include "config.h"
 
@@ -57,6 +58,8 @@
 #define CLEAR_LINE_SEQUENCE "\033[2K\r\n"
 #define BACKSPACE "\b\033[0K"
 
+#define MAX_LOG_MESSAGES 40
+
 typedef enum {
    PLY_BOOT_SPLASH_DISPLAY_NORMAL,
    PLY_BOOT_SPLASH_DISPLAY_QUESTION_ENTRY,
@@ -73,6 +76,7 @@
   ply_boot_splash_display_type_t state;
 
   char *message;
+  char *log_messages[MAX_LOG_MESSAGES];
 
   uint32_t is_animating : 1;
 };
@@ -112,6 +116,11 @@
 }
 
 static void
+view_text_display_message (view_t *view,
+                           int x, int y,
+                           const char *message);
+
+static void
 view_show_message (view_t *view)
 {
   ply_boot_splash_plugin_t *plugin;
@@ -122,15 +131,77 @@
   display_width = ply_text_display_get_number_of_columns (view->display);
   display_height = ply_text_display_get_number_of_rows (view->display);
 
-  ply_text_display_set_cursor_position (view->display, 0,
-                                        display_height / 2);
+  if (!strncmp (plugin->message, "log:", 4))
+    {
+      int max_width, begin, i, y;
+
+      if (!strncmp (plugin->message, "log:ok", 6) || !strncmp(plugin->message, "log:failed", 10))
+        {
+          if (plugin->log_messages[MAX_LOG_MESSAGES-1] != NULL)
+            {
+              int size = strlen (plugin->log_messages[MAX_LOG_MESSAGES-1]);
+              if (!(size > 2 && !strncmp (plugin->log_messages[MAX_LOG_MESSAGES-1] + size - 2, "ok", 2)) &&
+                  !(size > 6 && !strncmp (plugin->log_messages[MAX_LOG_MESSAGES-1] + size - 6, "failed", 6)))
+                {
+                  char *new_message = calloc (strlen (plugin->message + 4) + strlen (plugin->log_messages[MAX_LOG_MESSAGES-1]) + 4, sizeof (char));
+                  sprintf (new_message, "%s   %s", plugin->log_messages[MAX_LOG_MESSAGES-1], plugin->message + 4);
+                  free (plugin->log_messages[MAX_LOG_MESSAGES-1]);
+                  plugin->log_messages[MAX_LOG_MESSAGES-1] = new_message;
+                }
+            }
+        }
+      else
+        {
+          if (plugin->log_messages[0] != NULL)
+            free (plugin->log_messages[0]);
+
+          for (i = 0; i < MAX_LOG_MESSAGES-1; i++)
+            plugin->log_messages[i] = plugin->log_messages[i+1];
+
+          if (strlen (plugin->message + 4) > display_width - MAX_LOG_MESSAGES)
+            plugin->message[display_width - MAX_LOG_MESSAGES] = 0;
+
+          plugin->log_messages[MAX_LOG_MESSAGES-1] = calloc (strlen (plugin->message + 4) + 4, sizeof (char));
+          strcpy (plugin->log_messages[MAX_LOG_MESSAGES-1], plugin->message + 4);
+          strcpy (plugin->log_messages[MAX_LOG_MESSAGES-1] + strlen(plugin->log_messages[MAX_LOG_MESSAGES-1]), "...");
+        }
+
+      begin = MAX_LOG_MESSAGES - display_height + 5;
+      max_width = 0;
+      y = 3;
+
+      if (begin < 0)
+        begin = 0;
+
+      for (i = begin; i < MAX_LOG_MESSAGES; i++)
+        if (plugin->log_messages[i] != NULL)
+          if (max_width < strlen (plugin->log_messages[i]))
+            max_width = strlen (plugin->log_messages[i]);
+
+      if (max_width > display_width)
+        max_width = display_width;
+
+      if (max_width < display_width / 2)
+        max_width = display_width / 2;
+
+      for (i = begin; i < MAX_LOG_MESSAGES; i++)
+        if (plugin->log_messages[i] != NULL)
+          view_text_display_message (view, (display_width - max_width) / 2, y++, plugin->log_messages[i]);
+    }
+  else
+    view_text_display_message (view, (display_width - strlen (plugin->message)) / 2, display_height / 2, plugin->message);
+}
+
+static void
+view_text_display_message (view_t *view,
+                           int x, int y,
+                           const char *message)
+{
+  ply_text_display_set_cursor_position (view->display, 0, y);
   ply_text_display_clear_line (view->display);
-  ply_text_display_set_cursor_position (view->display,
-                                        (display_width -
-                                        strlen (plugin->message)) / 2,
-                                        display_height / 2);
+  ply_text_display_set_cursor_position (view->display, x, y);
 
-  ply_text_display_write (view->display, "%s", plugin->message);
+  ply_text_display_write (view->display, "%s", message);
 }
 
 static void
@@ -317,12 +388,16 @@
 create_plugin (ply_key_file_t *key_file)
 {
   ply_boot_splash_plugin_t *plugin;
+  int i;
 
   ply_trace ("creating plugin");
 
   plugin = calloc (1, sizeof (ply_boot_splash_plugin_t));
   plugin->message = NULL;
 
+  for (i = 0; i < MAX_LOG_MESSAGES; i++)
+    plugin->log_messages[i] = NULL;
+
   plugin->views = ply_list_new ();
 
   return plugin;
@@ -365,6 +440,7 @@
 destroy_plugin (ply_boot_splash_plugin_t *plugin)
 {
   ply_trace ("destroying plugin");
+  int i;
 
   if (plugin == NULL)
     return;
@@ -378,6 +454,10 @@
   if (plugin->message != NULL)
     free (plugin->message);
 
+  for (i = 0; i < MAX_LOG_MESSAGES; i++)
+    if (plugin->log_messages[i] != NULL)
+      free (plugin->log_messages[i]);
+
   free (plugin);
 }
 
 
=== modified file 'src/plugins/splash/ubuntu-text/plugin.c'
--- src/plugins/splash/ubuntu-text/plugin.c	2010-11-01 18:53:55 +0000
+++ src/plugins/splash/ubuntu-text/plugin.c	2011-06-17 20:26:30 +0000
@@ -21,6 +21,7 @@
  * Written by: Scott James Remnant <[e-mail]>
  *             Adam Jackson <[e-mail]>
  *             Ray Strode <[e-mail]>
+ *             Pali Rohár <[e-mail]>
  */
 #include "config.h"
 
@@ -59,6 +60,8 @@
 #define CLEAR_LINE_SEQUENCE "\033[2K\r\n"
 #define BACKSPACE "\b\033[0K"
 
+#define MAX_LOG_MESSAGES 40
+
 typedef enum {
    PLY_BOOT_SPLASH_DISPLAY_NORMAL,
    PLY_BOOT_SPLASH_DISPLAY_QUESTION_ENTRY,
@@ -75,6 +78,7 @@
   ply_boot_splash_display_type_t state;
 
   char *message;
+  char *log_messages[MAX_LOG_MESSAGES];
 
   uint32_t is_animating : 1;
   uint32_t black;
@@ -114,6 +118,12 @@
 }
 
 static void
+view_text_display_message (view_t *view,
+                           int x, int y,
+                           ply_terminal_color_t color,
+                           const char *message);
+
+static void
 view_show_message (view_t *view)
 {
   ply_boot_splash_plugin_t *plugin;
@@ -126,6 +136,61 @@
   display_width = ply_text_display_get_number_of_columns (view->display);
   display_height = ply_text_display_get_number_of_rows (view->display);
 
+  if (!strncmp (plugin->message, "log:", 4))
+    {
+      int max_width, begin, i;
+
+      if (!strncmp (plugin->message, "log:ok", 6) || !strncmp(plugin->message, "log:failed", 10))
+        {
+          if (plugin->log_messages[MAX_LOG_MESSAGES-1] != NULL)
+            {
+              int size = strlen (plugin->log_messages[MAX_LOG_MESSAGES-1]);
+              if (!(size > 2 && !strncmp (plugin->log_messages[MAX_LOG_MESSAGES-1] + size - 2, "ok", 2)) &&
+                  !(size > 6 && !strncmp (plugin->log_messages[MAX_LOG_MESSAGES-1] + size - 6, "failed", 6)))
+                {
+                  char *new_message = calloc (strlen (plugin->message + 4) + strlen (plugin->log_messages[MAX_LOG_MESSAGES-1]) + 4, sizeof (char));
+                  sprintf (new_message, "%s   %s", plugin->log_messages[MAX_LOG_MESSAGES-1], plugin->message + 4);
+                  free (plugin->log_messages[MAX_LOG_MESSAGES-1]);
+                  plugin->log_messages[MAX_LOG_MESSAGES-1] = new_message;
+                }
+            }
+        }
+      else
+        {
+          if (plugin->log_messages[0] != NULL)
+            free (plugin->log_messages[0]);
+
+          for (i = 0; i < MAX_LOG_MESSAGES-1; i++)
+            plugin->log_messages[i] = plugin->log_messages[i+1];
+
+          if (strlen (plugin->message + 4) > display_width - MAX_LOG_MESSAGES)
+            plugin->message[display_width - MAX_LOG_MESSAGES] = 0;
+
+          plugin->log_messages[MAX_LOG_MESSAGES-1] = calloc (strlen (plugin->message + 4) + 4, sizeof (char));
+          strcpy (plugin->log_messages[MAX_LOG_MESSAGES-1], plugin->message + 4);
+          strcpy (plugin->log_messages[MAX_LOG_MESSAGES-1] + strlen(plugin->log_messages[MAX_LOG_MESSAGES-1]), "...");
+        }
+
+      begin = MAX_LOG_MESSAGES - display_height / 2 + 4;
+      max_width = 0;
+      color = PLY_TERMINAL_COLOR_WHITE;
+      y = display_height / 2 + 4;
+
+      if (begin < 0)
+        begin = 0;
+
+      for (i = begin; i < MAX_LOG_MESSAGES; i++)
+        if (plugin->log_messages[i] != NULL)
+          if (max_width < strlen (plugin->log_messages[i]))
+            max_width = strlen (plugin->log_messages[i]);
+
+      for (i = begin; i < MAX_LOG_MESSAGES; i++)
+        if (plugin->log_messages[i] != NULL)
+          view_text_display_message (view, (display_width - max_width) / 2, y++, color, plugin->log_messages[i]);
+
+      return;
+    }
+
   if (!strncmp (plugin->message, "keys:", 5))
     {
       message = plugin->message + 5;
@@ -139,12 +204,18 @@
       y = display_height / 2 + 7;
     }
 
+  view_text_display_message (view, (display_width - strlen (message)) / 2, y, color, message);
+}
+
+static void
+view_text_display_message (view_t *view,
+                           int x, int y,
+                           ply_terminal_color_t color,
+                           const char *message)
+{
   ply_text_display_set_cursor_position (view->display, 0, y);
   ply_text_display_clear_line (view->display);
-  ply_text_display_set_cursor_position (view->display,
-                                        (display_width -
-                                        strlen (message)) / 2,
-                                        y);
+  ply_text_display_set_cursor_position (view->display, x, y);
 
   ply_text_display_set_foreground_color (view->display, color);
   ply_text_display_write (view->display, "%s", message);
@@ -157,7 +228,6 @@
 {
   ply_boot_splash_plugin_t *plugin;
   int display_width, display_height;
-  int i;
 
   plugin = view->plugin;
 
@@ -320,6 +390,7 @@
 create_plugin (ply_key_file_t *key_file)
 {
   char *option;
+  int i;
 
   ply_boot_splash_plugin_t *plugin;
 
@@ -328,6 +399,9 @@
   plugin = calloc (1, sizeof (ply_boot_splash_plugin_t));
   plugin->message = NULL;
 
+  for (i = 0; i < MAX_LOG_MESSAGES; i++)
+    plugin->log_messages[i] = NULL;
+
   plugin->views = ply_list_new ();
 
   /* Not a pretty API for setting defaults for your config file... */
@@ -391,6 +465,7 @@
 destroy_plugin (ply_boot_splash_plugin_t *plugin)
 {
   ply_trace ("destroying plugin");
+  int i;
 
   if (plugin == NULL)
     return;
@@ -404,6 +479,10 @@
   if (plugin->message != NULL)
     free (plugin->message);
 
+  for (i = 0; i < MAX_LOG_MESSAGES; i++)
+    if (plugin->log_messages[i] != NULL)
+      free (plugin->log_messages[i]);
+
   free (plugin);
 }
 
 
=== modified file 'src/upstart-bridge/plymouth-upstart-bridge.c'
--- src/upstart-bridge/plymouth-upstart-bridge.c	2011-01-21 18:09:36 +0000
+++ src/upstart-bridge/plymouth-upstart-bridge.c	2011-06-17 20:26:30 +0000
@@ -18,6 +18,7 @@
  * 02111-1307, USA.
  *
  * Written by: Colin Watson <[e-mail]>
+ *             Pali Rohár <[e-mail]>
  */
 #include "config.h"
 
@@ -71,55 +72,22 @@
                ply_upstart_monitor_instance_properties_t *instance,
                const char *action, bool ok)
 {
-  int xenl;
-  const char *hpa;
+  char *message;
+  const char *description;
+
+  if (job->description == NULL || job->description[0] == '\0')
+    description = job->name;
+  else
+    description = job->description;
+
+  message = calloc (strlen (action) + strlen (description) + 10, sizeof (char));
+  sprintf (message, "log:%s%s%s", action ? action : "", action ? " " : "", description);
 
   ply_boot_client_update_daemon (state->client, job->name, NULL, NULL, state);
-
-  if (job->description == NULL || job->description[0] == '\0')
-    return;
-
-  printf (" * %s%s%s",
-          action ? action : "", action ? " " : "", job->description);
-
-  xenl = tigetflag ("xenl");
-  hpa = get_string_capability ("hpa");
-
-  if (xenl > 0 && hpa)
-    {
-      int cols, col;
-      char *hpa_out;
-
-      cols = tigetnum ("cols");
-      if (cols < 6)
-        cols = 80;
-      col = cols - 7;
-
-      hpa_out = tiparm (hpa, col);
-      fputs (hpa_out, stdout);
-
-      if (ok)
-        puts ("[ OK ]");
-      else
-        {
-          const char *setaf, *op;
-          char *setaf_out = NULL;
-
-          setaf = get_string_capability ("setaf");
-          if (setaf)
-            setaf_out = tiparm (setaf, 1); /* red */
-          op = get_string_capability ("op");
-
-          printf ("[%sfail%s]\n", setaf_out ? setaf_out : "", op ? op : "");
-        }
-    }
-  else
-    {
-      if (ok)
-        puts ("   ...done.");
-      else
-        puts ("   ...fail!");
-    }
+  ply_boot_client_tell_daemon_to_display_message (state->client, message, NULL, NULL, state);
+  ply_boot_client_tell_daemon_to_display_message (state->client, ok ? "log:ok" : "log:failed", NULL, NULL, state);
+
+  free(message);
 }
 
 static void
 
=== modified file 'themes/ubuntu-logo/ubuntu-logo.script'
--- themes/ubuntu-logo/ubuntu-logo.script	2010-12-13 13:56:11 +0000
+++ themes/ubuntu-logo/ubuntu-logo.script	2011-06-17 20:26:30 +0000
@@ -18,6 +18,7 @@
 #  02111-1307, USA.
 # 
 #  Written by: Alberto Milone <[e-mail]>
+#              Pali Rohár <[e-mail]>
 #
 #  Based on the example provided with the "script plugin" written by:
 #              Charlie Brej   <[e-mail]>
@@ -87,7 +88,7 @@
     local.min_height;
 
     # Put the 1st line below the logo + some spacing 
-    y = logo.y + logo.height + (progress_indicator.bullet_height * 7 ); # + logo_spacing;
+    y = logo.y + logo.height + (progress_indicator.bullet_height * 2 ); # + logo_spacing;
 
     text_height = first_line_height * 7.5;
 
@@ -221,6 +222,14 @@
 # a bit if needed.
 top_of_the_text = TextYOffset();
 
+# Character 'M' is the biggest - calculate maximum characters for line
+log_line_width = Window.GetWidth () / ImageToTintedText ("M").GetWidth () - 5;
+# Calculate line count
+log_line_count = ( Window.GetHeight () - top_of_the_text ) / ( ImageToTintedText ("M").GetHeight () * 1.1 );
+
+for (i = 0; i < log_line_count; i++)
+    log_notification[i] = "";
+
 #-----------------------------------------Logo functions------------------------------
 
 # Call this when updating the screen
@@ -483,6 +492,46 @@
     if (keys != NULL)
         message = StringCopy (message, keys + StringLength(local.substring), NULL);
 
+    local.substring = "log:";
+    local.log = StringString (message, local.substring);
+    if (log != NULL) {
+        message = StringCopy (message, log + StringLength (local.substring), NULL);
+
+        if (message == "ok" || message == "failed") {
+            local.last = 0;
+            for (last = 0; last < log_line_count-1; last++) {}
+
+            local.len = StringLength (log_notification[last]);
+            local.ok = "";
+            local.failed = "";
+
+            if (len > 2)
+                ok = StringCopy (log_notification[last], len - 2, NULL);
+
+            if (len > 6)
+                failed = StringCopy (log_notification[last], len - 6, NULL);
+
+            if (len > 0 && ok != "ok" && failed != "failed")
+                log_notification[last] += "   " + message;
+        } else {
+            if (StringLength (message) > log_line_width-6)
+                message = message.SubString (0, log_line_width-9);
+            message += "...";
+
+            for (i = 0; i < log_line_count-1; i++)
+                log_notification[i] = log_notification[i+1];
+            log_notification[i] = message;
+        }
+
+        message = "";
+        for (i = 0; i < log_line_count; i++)
+            if (log_notification[i] != "")
+                message += log_notification[i] + "\n";
+
+        label = get_message_label ("", 1, 1);
+        setup_message ("", label.x, label.y, 10000, 1);
+    }
+
     local.label.is_fake = is_fake;
     label = get_message_label(message, is_fake, is_action_line);
     label.z = 10000;