Changeset 6045ecf in mainline

Timestamp:

2011-08-21T10:28:01Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f737c1d5

Parents:

19d007e

Message:

Enhance justify aligment mode and align bdsh help to the left

Location:

uspace

Files:

• app/bdsh/cmds/modules/help/help.c (modified) (1 diff)
• lib/fmtutil/fmtutil.c (modified) (8 diffs)
• lib/fmtutil/fmtutil.h (modified) (1 diff)

uspace/app/bdsh/cmds/modules/help/help.c

@@ -153 +153 @@
             "To learn more please point your browser to the HelenOS User's "
             "Guide: http://trac.helenos.org/trac.fcgi/wiki/UsersGuide\n\n",
-             ALIGN_JUSTIFY);
+            ALIGN_LEFT);
 }
 

uspace/lib/fmtutil/fmtutil.c

@@ -60 +60 @@
 }
 
-static int print_line(wchar_t *wstr, size_t chars, void *data)
-{
-        //char *line = wstr_to_astr(wstr);
+/** Line consumer that prints the lines aligned according to spec
+ *
+ **/
+static int print_line(wchar_t *wstr, size_t chars, bool last, void *data)
+{
         printmode_t *pm = (printmode_t *) data;
-        //if (line == NULL) {
-        //      return ENOMEM;
-        //}
+        wchar_t old_char = wstr[chars];
         wstr[chars] = 0;
-        return print_aligned_w(wstr, pm->width, pm->alignment);
-        //printf("%s", line);
-        //if (pm->newline_always || chars < pm->width)
-        //      printf("\n");
-        //free(line);
-        //return EOK;
+        int rc = print_aligned_w(wstr, pm->width, last, pm->alignment);
+        wstr[chars] = old_char;
+        return rc;
 }
 
@@ -91 +88 @@
 }
 
-int print_aligned_w(const wchar_t *wstr, size_t width, align_mode_t mode)
+int print_aligned_w(const wchar_t *wstr, size_t width, bool last,
+    align_mode_t mode)
 {
         size_t i;
         size_t len = wstr_length(wstr);
-        if (mode == ALIGN_LEFT) {
+        if (mode == ALIGN_LEFT || (mode == ALIGN_JUSTIFY && last)) {
                 for (i = 0; i < width; i++) {
                         if (i < len)
@@ -171 +169 @@
         return EOK;
 }
-int print_aligned(const char *str, size_t width, align_mode_t mode)
+int print_aligned(const char *str, size_t width, bool last, align_mode_t mode)
 {
         wchar_t *wstr = str_to_awstr(str);
@@ -177 +175 @@
                 return ENOMEM;
         }
-        int rc = print_aligned_w(wstr, width, mode);
+        int rc = print_aligned_w(wstr, width, last, mode);
         free(wstr);
         return rc;
 }
 
-/**
- */
 int wrap(wchar_t *wstr, size_t width, line_consumer_fn consumer, void *data)
 {
@@ -202 +198 @@
                 while (wstr[pos] == ' ' || wstr[pos] == '\n') {
                         if (wstr[pos] == '\n') {
-                                consumer(wstr + line_start, line_len, data);
+                                consumer(wstr + line_start, line_len, true,
+                                    data);
                                 last_word_end = line_start = pos + 1;
                                 line_len = 0;
@@ -213 +210 @@
                     wstr[pos] != '\n')
                         pos++;
+                bool last = wstr[pos] == 0;
                 /* Check if the line still fits width */
                 if (pos - line_start > width) {
                         if (line_len > 0)
-                                consumer(wstr + line_start, line_len, data);
+                                consumer(wstr + line_start, line_len, last,
+                                    data);
                         line_start = last_word_end = word_start;
                         line_len = 0;
@@ -222 +221 @@
                 /* Check if we need to force wrap of long word*/
                 if (pos - word_start > width) {
-                        consumer(wstr + word_start, width, data);
+                        consumer(wstr + word_start, width, last, data);
                         pos = line_start = last_word_end = word_start + width;
                         line_len = 0;
@@ -233 +232 @@
          */
         if (pos - line_start > 0)
-                consumer(wstr + line_start, pos - line_start, data);
+                consumer(wstr + line_start, pos - line_start, true, data);
 
         return EOK;

uspace/lib/fmtutil/fmtutil.h

@@ -39 +39 @@
  * @param content pointer to line data (note: this is NOT null-terminated)
  * @param size number of characters in line
+ * @param end_of_para true if the line is the last line of the paragraph
  * @param data user data
  * 
  * @returns EOK on success or error code on failure
  */
-typedef int (*line_consumer_fn)(wchar_t *, size_t, void *);
+typedef int (*line_consumer_fn)(wchar_t *, size_t, bool, void *);
 
-extern int print_aligned_w(const wchar_t *, size_t, align_mode_t);
-extern int print_aligned(const char *, size_t, align_mode_t);
+extern int print_aligned_w(const wchar_t *, size_t, bool, align_mode_t);
+extern int print_aligned(const char *, size_t, bool, align_mode_t);
 extern int print_wrapped(const char *, size_t, align_mode_t);
 extern int print_wrapped_console(const char *, align_mode_t);