Changeset 52c4264 in mainline for uspace/app

Timestamp:

2012-08-17T12:23:52Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

267f235

Parents:

ae2c925 (diff), ad78054 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

Location:

uspace/app

Files:

• bdsh/cmds/modules/bdd/bdd.c (modified) (1 diff)
• bdsh/input.c (modified) (1 diff)
• blkdump/blkdump.c (modified) (1 diff)
• edit/Makefile (modified) (1 diff)
• edit/edit.c (modified) (20 diffs)
• edit/search.c (added)
• edit/search.h (added)
• edit/search_impl.h (added)
• edit/sheet.c (modified) (1 diff)
• edit/sheet.h (modified) (1 diff)
• ext2info/ext2info.c (modified) (1 diff)
• init/init.c (modified) (9 diffs)
• mkexfat/mkexfat.c (modified) (1 diff)
• mkfat/mkfat.c (modified) (1 diff)
• mkmfs/mkmfs.c (modified) (1 diff)
• vdemo/Makefile (added)
• vdemo/vdemo.c (added)
• vlaunch/Makefile (added)
• vlaunch/vlaunch.c (added)
• vterm/Makefile (added)
• vterm/vterm.c (added)

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

@@ -38 +38 @@
 #include "cmds.h"
 
-#include <libblock.h>
+#include <block.h>
 #include <loc.h>
 #include <errno.h>

uspace/app/bdsh/input.c

@@ -268 +268 @@
         if (rc != EOK) {
                 /* Error in communication with console */
+                cli_quit = 1;
                 return;
         }

uspace/app/blkdump/blkdump.c

@@ -40 +40 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <libblock.h>
+#include <block.h>
 #include <mem.h>
 #include <loc.h>

uspace/app/edit/Makefile

@@ -33 +33 @@
 SOURCES = \
         edit.c \
-        sheet.c
+        sheet.c \
+        search.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/app/edit/edit.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2009 Jiri Svoboda
+ * Copyright (c) 2012 Martin Sucha
  * All rights reserved.
  *
@@ -49 +50 @@
 
 #include "sheet.h"
+#include "search.h"
 
 enum redraw_flags {
@@ -83 +85 @@
          */
         int ideal_column;
+        
+        char *previous_search;
+        bool previous_search_reverse;
 } pane_t;
 
@@ -140 +145 @@
 static void delete_char_after(void);
 static void caret_update(void);
-static void caret_move(int drow, int dcolumn, enum dir_spec align_dir);
-static void caret_move_word_left(void);
-static void caret_move_word_right(void);
-static void caret_move_to_line(int row);
+static void caret_move_relative(int drow, int dcolumn, enum dir_spec align_dir, bool select);
+static void caret_move_absolute(int row, int column, enum dir_spec align_dir, bool select);
+static void caret_move(spt_t spt, bool select, bool update_ideal_column);
+static void caret_move_word_left(bool select);
+static void caret_move_word_right(bool select);
 static void caret_go_to_line_ask(void);
 
@@ -149 +155 @@
 static void selection_sel_all(void);
 static void selection_sel_range(spt_t pa, spt_t pb);
-static void selection_sel_prev_word(void);
-static void selection_sel_next_word(void);
 static void selection_get_points(spt_t *pa, spt_t *pb);
 static void selection_delete(void);
 static void selection_copy(void);
 static void insert_clipboard_data(void);
+
+static void search(char *pattern, bool reverse);
+static void search_prompt(bool reverse);
+static void search_repeat(void);
 
 static void pt_get_sof(spt_t *pt);
@@ -163 +171 @@
 static bool pt_is_delimiter(spt_t *pt);
 static bool pt_is_punctuation(spt_t *pt);
+static spt_t pt_find_word_left(spt_t spt);
+static spt_t pt_find_word_left(spt_t spt);
+
 static int tag_cmp(tag_t const *a, tag_t const *b);
 static int spt_cmp(spt_t const *a, spt_t const *b);
@@ -173 +184 @@
 {
         kbd_event_t ev;
-        coord_t coord;
         bool new_file;
         int rc;
-
-        spt_t pt;
 
         con = console_init(stdin, stdout);
@@ -197 +205 @@
 
         /* Place caret at the beginning of file. */
-        coord.row = coord.column = 1;
-        sheet_get_cell_pt(doc.sh, &coord, dir_before, &pt);
-        sheet_place_tag(doc.sh, &pt, &pane.caret_pos);
-        pane.ideal_column = coord.column;
+        spt_t sof;
+        pt_get_sof(&sof);
+        sheet_place_tag(doc.sh, &sof, &pane.caret_pos);
+        pane.ideal_column = 1;
 
         if (argc == 2) {
@@ -216 +224 @@
                 new_file = true;
 
+        /* Place selection start tag. */
+        sheet_place_tag(doc.sh, &sof, &pane.sel_start);
+
         /* Move to beginning of file. */
-        caret_move(-ED_INFTY, -ED_INFTY, dir_before);
-
-        /* Place selection start tag. */
-        tag_get_pt(&pane.caret_pos, &pt);
-        sheet_place_tag(doc.sh, &pt, &pane.sel_start);
+        pt_get_sof(&sof);
+        caret_move(sof, true, true);
 
         /* Initial display */
@@ -369 +377 @@
 static void key_handle_ctrl(kbd_event_t const *ev)
 {
+        spt_t pt;
         switch (ev->key) {
         case KC_Q:
@@ -400 +409 @@
                 selection_sel_all();
                 break;
-        case KC_W:
-                if (selection_active())
-                        break;
-                selection_sel_prev_word();
-                selection_delete();
-                break;
         case KC_RIGHT:
-                caret_move_word_right();
+                caret_move_word_right(false);
                 break;
         case KC_LEFT:
-                caret_move_word_left();
+                caret_move_word_left(false);
                 break;
         case KC_L:
                 caret_go_to_line_ask();
                 break;
+        case KC_F:
+                search_prompt(false);
+                break;
+        case KC_N:
+                search_repeat();
+                break;
+        case KC_HOME:
+                pt_get_sof(&pt);
+                caret_move(pt, false, true);
+                break;
+        case KC_END:
+                pt_get_eof(&pt);
+                caret_move(pt, false, true);
+                break;
         default:
                 break;
@@ -422 +439 @@
 static void key_handle_shift_ctrl(kbd_event_t const *ev)
 {
+        spt_t pt;
         switch(ev->key) {
         case KC_LEFT:
-                selection_sel_prev_word();
+                caret_move_word_left(true);
                 break;
         case KC_RIGHT:
-                selection_sel_next_word();
+                caret_move_word_right(true);
+                break;
+        case KC_F:
+                search_prompt(true);
+                break;
+        case KC_HOME:
+                pt_get_sof(&pt);
+                caret_move(pt, true, true);
+                break;
+        case KC_END:
+                pt_get_eof(&pt);
+                caret_move(pt, true, true);
                 break;
         default:
@@ -435 +464 @@
 
 /** Move caret while preserving or resetting selection. */
-static void caret_movement(int drow, int dcolumn, enum dir_spec align_dir,
-    bool select)
-{
-        spt_t pt;
-        spt_t caret_pt;
+static void caret_move(spt_t new_caret_pt, bool select, bool update_ideal_column)
+{
+        spt_t old_caret_pt, old_sel_pt;
         coord_t c_old, c_new;
         bool had_sel;
 
         /* Check if we had selection before. */
-        tag_get_pt(&pane.caret_pos, &caret_pt);
-        tag_get_pt(&pane.sel_start, &pt);
-        had_sel = !spt_equal(&caret_pt, &pt);
-
-        caret_move(drow, dcolumn, align_dir);
+        tag_get_pt(&pane.caret_pos, &old_caret_pt);
+        tag_get_pt(&pane.sel_start, &old_sel_pt);
+        had_sel = !spt_equal(&old_caret_pt, &old_sel_pt);
+
+        /* Place tag of the caret */
+        sheet_remove_tag(doc.sh, &pane.caret_pos);
+        sheet_place_tag(doc.sh, &new_caret_pt, &pane.caret_pos);
 
         if (select == false) {
                 /* Move sel_start to the same point as caret. */
                 sheet_remove_tag(doc.sh, &pane.sel_start);
-                tag_get_pt(&pane.caret_pos, &pt);
-                sheet_place_tag(doc.sh, &pt, &pane.sel_start);
-        }
-
+                sheet_place_tag(doc.sh, &new_caret_pt, &pane.sel_start);
+        }
+
+        spt_get_coord(&new_caret_pt, &c_new);
         if (select) {
-                tag_get_pt(&pane.caret_pos, &pt);
-                spt_get_coord(&caret_pt, &c_old);
-                spt_get_coord(&pt, &c_new);
+                spt_get_coord(&old_caret_pt, &c_old);
 
                 if (c_old.row == c_new.row)
@@ -471 +498 @@
                 pane.rflags |= REDRAW_TEXT;
         }
+        
+        if (update_ideal_column)
+                pane.ideal_column = c_new.column;
+        
+        caret_update();
 }
 
@@ -477 +509 @@
         switch (key) {
         case KC_LEFT:
-                caret_movement(0, -1, dir_before, select);
+                caret_move_relative(0, -1, dir_before, select);
                 break;
         case KC_RIGHT:
-                caret_movement(0, 0, dir_after, select);
+                caret_move_relative(0, 0, dir_after, select);
                 break;
         case KC_UP:
-                caret_movement(-1, 0, dir_before, select);
+                caret_move_relative(-1, 0, dir_before, select);
                 break;
         case KC_DOWN:
-                caret_movement(+1, 0, dir_before, select);
+                caret_move_relative(+1, 0, dir_before, select);
                 break;
         case KC_HOME:
-                caret_movement(0, -ED_INFTY, dir_before, select);
+                caret_move_relative(0, -ED_INFTY, dir_after, select);
                 break;
         case KC_END:
-                caret_movement(0, +ED_INFTY, dir_before, select);
+                caret_move_relative(0, +ED_INFTY, dir_before, select);
                 break;
         case KC_PAGE_UP:
-                caret_movement(-pane.rows, 0, dir_before, select);
+                caret_move_relative(-pane.rows, 0, dir_before, select);
                 break;
         case KC_PAGE_DOWN:
-                caret_movement(+pane.rows, 0, dir_before, select);
+                caret_move_relative(+pane.rows, 0, dir_before, select);
                 break;
         default:
@@ -1012 +1044 @@
 }
 
-/** Change the caret position.
+/** Relatively move caret position.
  *
  * Moves caret relatively to the current position. Looking at the first
@@ -1018 +1050 @@
  * to a new character cell, and thus a new character. Then we either go to the
  * point before the the character or after it, depending on @a align_dir.
+ *
+ * @param select true if the selection tag should stay where it is
  */
-static void caret_move(int drow, int dcolumn, enum dir_spec align_dir)
+static void caret_move_relative(int drow, int dcolumn, enum dir_spec align_dir,
+    bool select)
 {
         spt_t pt;
@@ -1055 +1090 @@
          */
         sheet_get_cell_pt(doc.sh, &coord, align_dir, &pt);
-        sheet_remove_tag(doc.sh, &pane.caret_pos);
-        sheet_place_tag(doc.sh, &pt, &pane.caret_pos);
 
         /* For non-vertical movement set the new value for @c ideal_column. */
-        if (!pure_vertical) {
-                spt_get_coord(&pt, &coord);
-                pane.ideal_column = coord.column;
-        }
-
-        caret_update();
-}
-
-static void caret_move_word_left(void) 
-{
+        caret_move(pt, select, !pure_vertical);
+}
+
+/** Absolutely move caret position.
+ *
+ * Moves caret to a specified position. We get to a new character cell, and
+ * thus a new character. Then we either go to the point before the the character
+ * or after it, depending on @a align_dir.
+ *
+ * @param select true if the selection tag should stay where it is
+ */
+static void caret_move_absolute(int row, int column, enum dir_spec align_dir,
+    bool select)
+{
+        coord_t coord;
+        coord.row = row;
+        coord.column = column;
+        
         spt_t pt;
-
+        sheet_get_cell_pt(doc.sh, &coord, align_dir, &pt);
+        
+        caret_move(pt, select, true);
+}
+
+/** Find beginning of a word to the left of spt */
+static spt_t pt_find_word_left(spt_t spt) 
+{
         do {
-                caret_move(0, -1, dir_before);
-
-                tag_get_pt(&pane.caret_pos, &pt);
-
-                sheet_remove_tag(doc.sh, &pane.sel_start);
-                sheet_place_tag(doc.sh, &pt, &pane.sel_start);
-        } while (!pt_is_word_beginning(&pt));
-
-        pane.rflags |= REDRAW_TEXT;
-}
-
-static void caret_move_word_right(void) 
+                spt_prev_char(spt, &spt);
+        } while (!pt_is_word_beginning(&spt));
+        return spt;
+}
+
+/** Find beginning of a word to the right of spt */
+static spt_t pt_find_word_right(spt_t spt) 
+{
+        do {
+                spt_next_char(spt, &spt);
+        } while (!pt_is_word_beginning(&spt));
+        return spt;
+}
+
+static void caret_move_word_left(bool select) 
 {
         spt_t pt;
-
-        do {
-                caret_move(0, 0, dir_after);
-
-                tag_get_pt(&pane.caret_pos, &pt);
-
-                sheet_remove_tag(doc.sh, &pane.sel_start);
-                sheet_place_tag(doc.sh, &pt, &pane.sel_start);
-        } while (!pt_is_word_beginning(&pt));
-
-        pane.rflags |= REDRAW_TEXT;
-}
-
-/** Change the caret position to a beginning of a given line
- */
-static void caret_move_to_line(int row)
+        tag_get_pt(&pane.caret_pos, &pt);
+        spt_t word_left = pt_find_word_left(pt);
+        caret_move(word_left, select, true);
+}
+
+static void caret_move_word_right(bool select) 
 {
         spt_t pt;
-        coord_t coord;
-
         tag_get_pt(&pane.caret_pos, &pt);
-        spt_get_coord(&pt, &coord);
-
-        caret_movement(row - coord.row, 0, dir_before, false);
+        spt_t word_right = pt_find_word_right(pt);
+        caret_move(word_right, select, true);
 }
 
@@ -1126 +1164 @@
         int line = strtol(sline, &endptr, 10);
         if (*endptr != '\0') {
+                free(sline);
                 status_display("Invalid number entered.");
                 return;
         }
-        
-        caret_move_to_line(line);
-}
-
+        free(sline);
+        
+        caret_move_absolute(line, pane.ideal_column, dir_before, false);
+}
+
+/* Search operations */
+static int search_spt_producer(void *data, wchar_t *ret)
+{
+        assert(data != NULL);
+        assert(ret != NULL);
+        spt_t *spt = data;
+        *ret = spt_next_char(*spt, spt);
+        return EOK;
+}
+
+static int search_spt_reverse_producer(void *data, wchar_t *ret)
+{
+        assert(data != NULL);
+        assert(ret != NULL);
+        spt_t *spt = data;
+        *ret = spt_prev_char(*spt, spt);
+        return EOK;
+}
+
+static int search_spt_mark(void *data, void **mark)
+{
+        assert(data != NULL);
+        assert(mark != NULL);
+        spt_t *spt = data;
+        spt_t *new = calloc(1, sizeof(spt_t));
+        *mark = new;
+        if (new == NULL)
+                return ENOMEM;
+        *new = *spt;
+        return EOK;
+}
+
+static void search_spt_mark_free(void *data)
+{
+        free(data);
+}
+
+static search_ops_t search_spt_ops = {
+        .equals = char_exact_equals,
+        .producer = search_spt_producer,
+        .mark = search_spt_mark,
+        .mark_free = search_spt_mark_free,
+};
+
+static search_ops_t search_spt_reverse_ops = {
+        .equals = char_exact_equals,
+        .producer = search_spt_reverse_producer,
+        .mark = search_spt_mark,
+        .mark_free = search_spt_mark_free,
+};
+
+/** Ask for line and go to it. */
+static void search_prompt(bool reverse)
+{
+        char *pattern;
+        
+        const char *prompt_text = "Find next";
+        if (reverse)
+                prompt_text = "Find previous";
+        
+        const char *default_value = "";
+        if (pane.previous_search)
+                default_value = pane.previous_search;
+        
+        pattern = prompt(prompt_text, default_value);
+        if (pattern == NULL) {
+                status_display("Search cancelled.");
+                return;
+        }
+        
+        if (pane.previous_search)
+                free(pane.previous_search);
+        pane.previous_search = pattern;
+        pane.previous_search_reverse = reverse;
+        
+        search(pattern, reverse);
+}
+
+static void search_repeat(void)
+{
+        if (pane.previous_search == NULL) {
+                status_display("No previous search to repeat.");
+                return;
+        }
+        
+        search(pane.previous_search, pane.previous_search_reverse);
+}
+
+static void search(char *pattern, bool reverse)
+{
+        status_display("Searching...");
+        
+        spt_t sp, producer_pos;
+        tag_get_pt(&pane.caret_pos, &sp);
+        
+        /* Start searching on the position before/after caret */
+        if (!reverse) {
+                spt_next_char(sp, &sp);
+        }
+        else {
+                spt_prev_char(sp, &sp);
+        }
+        producer_pos = sp;
+        
+        search_ops_t ops = search_spt_ops;
+        if (reverse)
+                ops = search_spt_reverse_ops;
+        
+        search_t *search = search_init(pattern, &producer_pos, ops, reverse);
+        if (search == NULL) {
+                status_display("Failed initializing search.");
+                return;
+        }
+        
+        match_t match;
+        int rc = search_next_match(search, &match);
+        if (rc != EOK) {
+                status_display("Failed searching.");
+                search_fini(search);
+        }
+        
+        if (match.end) {
+                status_display("Match found.");
+                assert(match.end != NULL);
+                spt_t *end = match.end;
+                caret_move(*end, false, true);
+                while (match.length > 0) {
+                        match.length--;
+                        if (reverse) {
+                                spt_next_char(*end, end);
+                        }
+                        else {
+                                spt_prev_char(*end, end);
+                        }
+                }
+                caret_move(*end, true, true);
+                free(end);
+        }
+        else {
+                status_display("Not found.");
+        }
+        
+        search_fini(search);
+}
 
 /** Check for non-empty selection. */
@@ -1202 +1386 @@
         pane.rflags |= REDRAW_TEXT;
         caret_update();
-}
-
-/** Add the previous word to the selection */
-static void selection_sel_prev_word(void)
-{
-        spt_t cpt, wpt, spt, ept;
-
-        selection_get_points(&spt, &ept);
-
-        tag_get_pt(&pane.caret_pos, &cpt);
-        caret_move_word_left();
-        tag_get_pt(&pane.caret_pos, &wpt);
-
-        if (spt_cmp(&spt, &cpt) == 0)
-                selection_sel_range(ept, wpt);
-        else
-                selection_sel_range(spt, wpt);
-}
-
-/** Add the next word to the selection */
-static void selection_sel_next_word(void)
-{
-        spt_t cpt, wpt, spt, ept;
-
-        selection_get_points(&spt, &ept);
-
-        tag_get_pt(&pane.caret_pos, &cpt);
-        caret_move_word_right();
-        tag_get_pt(&pane.caret_pos, &wpt);
-
-        if (spt_cmp(&ept, &cpt) == 0)
-                selection_sel_range(spt, wpt);
-        else
-                selection_sel_range(ept, wpt);
 }
 

uspace/app/edit/sheet.c

@@ -323 +323 @@
 }
 
+/** Get a character at spt and return next spt */
+wchar_t spt_next_char(spt_t spt, spt_t *next)
+{
+        wchar_t ch = str_decode(spt.sh->data, &spt.b_off, spt.sh->text_size);
+        if (next)
+                *next = spt;
+        return ch;
+}
+
+wchar_t spt_prev_char(spt_t spt, spt_t *prev)
+{
+        wchar_t ch = str_decode_reverse(spt.sh->data, &spt.b_off, spt.sh->text_size);
+        if (prev)
+                *prev = spt;
+        return ch;
+}
+
 /** Place a tag on the specified s-point. */
 void sheet_place_tag(sheet_t *sh, spt_t const *pt, tag_t *tag)

uspace/app/edit/sheet.h

@@ -101 +101 @@
 extern void spt_get_coord(spt_t const *, coord_t *);
 extern bool spt_equal(spt_t const *, spt_t const *);
+extern wchar_t spt_next_char(spt_t, spt_t *);
+extern wchar_t spt_prev_char(spt_t, spt_t *);
 
 extern void sheet_place_tag(sheet_t *, spt_t const *, tag_t *);

uspace/app/ext2info/ext2info.c

@@ -40 +40 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <libblock.h>
+#include <block.h>
 #include <mem.h>
 #include <loc.h>

uspace/app/init/init.c

@@ -37 +37 @@
 #include <stdio.h>
 #include <unistd.h>
+#include <stdarg.h>
 #include <vfs/vfs.h>
 #include <bool.h>
@@ -65 +66 @@
 #define SRV_CONSOLE  "/srv/console"
 #define APP_GETTERM  "/app/getterm"
+
+#define SRV_COMPOSITOR  "/srv/compositor"
+
+#define HID_INPUT              "hid/input"
+#define HID_OUTPUT             "hid/output"
+#define HID_COMPOSITOR_SERVER  ":0"
+
+#define srv_start(path, ...) \
+        srv_startl(path, path, ##__VA_ARGS__, NULL)
 
 /** Print banner */
@@ -143 +153 @@
 }
 
-static void spawn(const char *fname)
-{
-        int rc;
+static int srv_startl(const char *path, ...)
+{
         struct stat s;
-        
-        if (stat(fname, &s) == ENOENT)
-                return;
-        
-        printf("%s: Spawning %s\n", NAME, fname);
-        rc = task_spawnl(NULL, fname, fname, NULL);
-        if (rc != EOK) {
-                printf("%s: Error spawning %s (%s)\n", NAME, fname,
-                    str_error(rc));
-        }
-}
-
-static void srv_start(const char *fname)
-{
+        if (stat(path, &s) == ENOENT) {
+                printf("%s: Unable to stat %s\n", NAME, path);
+                return ENOENT;
+        }
+        
+        printf("%s: Starting %s\n", NAME, path);
+        
+        va_list ap;
+        const char *arg;
+        int cnt = 0;
+        
+        va_start(ap, path);
+        do {
+                arg = va_arg(ap, const char *);
+                cnt++;
+        } while (arg != NULL);
+        va_end(ap);
+        
+        va_start(ap, path);
         task_id_t id;
+        int rc = task_spawn(&id, path, cnt, ap);
+        va_end(ap);
+        
+        if (rc != EOK) {
+                printf("%s: Error spawning %s (%s)\n", NAME, path,
+                    str_error(rc));
+                return rc;
+        }
+        
+        if (!id) {
+                printf("%s: Error spawning %s (invalid task id)\n", NAME,
+                    path);
+                return EINVAL;
+        }
+        
         task_exit_t texit;
-        int rc, retval;
-        struct stat s;
-        
-        if (stat(fname, &s) == ENOENT)
-                return;
-        
-        printf("%s: Starting %s\n", NAME, fname);
-        rc = task_spawnl(&id, fname, fname, NULL);
-        if (!id) {
-                printf("%s: Error spawning %s (%s)\n", NAME, fname,
-                    str_error(rc));
-                return;
-        }
-        
+        int retval;
         rc = task_wait(id, &texit, &retval);
         if (rc != EOK) {
-                printf("%s: Error waiting for %s (%s)\n", NAME, fname,
-                    str_error(rc));
-                return;
+                printf("%s: Error waiting for %s (%s)\n", NAME, path,
+                    str_error(rc));
+                return rc;
         }
         
         if (texit != TASK_EXIT_NORMAL) {
                 printf("%s: Server %s failed to start (unexpectedly "
-                    "terminated)\n", NAME, fname);
-                return;
-        }
-
-        if (retval != 0) {
+                    "terminated)\n", NAME, path);
+                return EINVAL;
+        }
+        
+        if (retval != 0)
                 printf("%s: Server %s failed to start (exit code %d)\n", NAME,
-                        fname, retval);
-        }
-}
-
-static void console(const char *isvc, const char *fbsvc)
-{
-        printf("%s: Spawning %s %s %s\n", NAME, SRV_CONSOLE, isvc, fbsvc);
-        
+                    path, retval);
+        
+        return retval;
+}
+
+static int console(const char *isvc, const char *osvc)
+{
         /* Wait for the input service to be ready */
         service_id_t service_id;
@@ -206 +221 @@
                 printf("%s: Error waiting on %s (%s)\n", NAME, isvc,
                     str_error(rc));
-                return;
-        }
-        
-        /* Wait for the framebuffer service to be ready */
-        rc = loc_service_get_id(fbsvc, &service_id, IPC_FLAG_BLOCKING);
-        if (rc != EOK) {
-                printf("%s: Error waiting on %s (%s)\n", NAME, fbsvc,
-                    str_error(rc));
-                return;
-        }
-        
-        rc = task_spawnl(NULL, SRV_CONSOLE, SRV_CONSOLE, isvc, fbsvc, NULL);
-        if (rc != EOK) {
-                printf("%s: Error spawning %s %s %s (%s)\n", NAME, SRV_CONSOLE,
-                    isvc, fbsvc, str_error(rc));
-        }
+                return rc;
+        }
+        
+        /* Wait for the output service to be ready */
+        rc = loc_service_get_id(osvc, &service_id, IPC_FLAG_BLOCKING);
+        if (rc != EOK) {
+                printf("%s: Error waiting on %s (%s)\n", NAME, osvc,
+                    str_error(rc));
+                return rc;
+        }
+        
+        return srv_start(SRV_CONSOLE, isvc, osvc);
+}
+
+static int compositor(const char *isvc, const char *name)
+{
+        /* Wait for the input service to be ready */
+        service_id_t service_id;
+        int rc = loc_service_get_id(isvc, &service_id, IPC_FLAG_BLOCKING);
+        if (rc != EOK) {
+                printf("%s: Error waiting on %s (%s)\n", NAME, isvc,
+                    str_error(rc));
+                return rc;
+        }
+        
+        return srv_start(SRV_COMPOSITOR, isvc, name);
+}
+
+static int gui_start(const char *app, const char *srv_name)
+{
+        char winreg[50];
+        snprintf(winreg, sizeof(winreg), "%s%s%s", "comp", srv_name, "/winreg");
+        
+        printf("%s: Spawning %s %s\n", NAME, app, winreg);
+        
+        task_id_t id;
+        int rc = task_spawnl(&id, app, app, winreg, NULL);
+        if (rc != EOK) {
+                printf("%s: Error spawning %s %s (%s)\n", NAME, app,
+                    winreg, str_error(rc));
+                return -1;
+        }
+        
+        task_exit_t texit;
+        int retval;
+        rc = task_wait(id, &texit, &retval);
+        if ((rc != EOK) || (texit != TASK_EXIT_NORMAL)) {
+                printf("%s: Error retrieving retval from %s (%s)\n", NAME,
+                    app, str_error(rc));
+                return -1;
+        }
+        
+        return retval;
 }
 
@@ -227 +279 @@
 {
         char term[LOC_NAME_MAXLEN];
-        int rc;
-        
         snprintf(term, LOC_NAME_MAXLEN, "%s/%s", LOCFS_MOUNT_POINT, svc);
         
@@ -235 +285 @@
         /* Wait for the terminal service to be ready */
         service_id_t service_id;
-        rc = loc_service_get_id(svc, &service_id, IPC_FLAG_BLOCKING);
+        int rc = loc_service_get_id(svc, &service_id, IPC_FLAG_BLOCKING);
         if (rc != EOK) {
                 printf("%s: Error waiting on %s (%s)\n", NAME, term,
@@ -279 +329 @@
         if (!mount_root(STRING(RDFMT))) {
                 printf("%s: Exiting\n", NAME);
-                return -1;
+                return 1;
         }
         
         /* Make sure tmpfs is running. */
-        if (str_cmp(STRING(RDFMT), "tmpfs") != 0) {
-                spawn("/srv/tmpfs");
-        }
-        
-        spawn("/srv/locfs");
-        spawn("/srv/taskmon");
+        if (str_cmp(STRING(RDFMT), "tmpfs") != 0)
+                srv_start("/srv/tmpfs");
+        
+        srv_start("/srv/locfs");
+        srv_start("/srv/taskmon");
         
         if (!mount_locfs()) {
                 printf("%s: Exiting\n", NAME);
-                return -2;
+                return 2;
         }
         
         mount_tmpfs();
         
-        spawn("/srv/devman");
-        spawn("/srv/apic");
-        spawn("/srv/i8259");
-        spawn("/srv/obio");
+        srv_start("/srv/devman");
+        srv_start("/srv/apic");
+        srv_start("/srv/i8259");
+        srv_start("/srv/obio");
         srv_start("/srv/cuda_adb");
         srv_start("/srv/s3c24xx_uart");
         srv_start("/srv/s3c24xx_ts");
         
-        spawn("/srv/loopip");
-        spawn("/srv/ethip");
-        spawn("/srv/inetsrv");
-        spawn("/srv/tcp");
-        spawn("/srv/udp");
-        
-        spawn("/srv/fb");
-        spawn("/srv/input");
-        console("hid/input", "hid/fb0");
-        
-        spawn("/srv/clipboard");
-        spawn("/srv/remcons");
+        srv_start("/srv/loopip");
+        srv_start("/srv/ethip");
+        srv_start("/srv/inetsrv");
+        srv_start("/srv/tcp");
+        srv_start("/srv/udp");
+        
+        srv_start("/srv/clipboard");
+        srv_start("/srv/remcons");
         
         /*
@@ -325 +370 @@
         srv_start("/srv/ata_bd");
         srv_start("/srv/gxe_bd");
-#else
-        (void) srv_start;
 #endif
         
 #ifdef CONFIG_MOUNT_DATA
         /* Make sure fat is running. */
-        if (str_cmp(STRING(RDFMT), "fat") != 0) {
+        if (str_cmp(STRING(RDFMT), "fat") != 0)
                 srv_start("/srv/fat");
-        }
+        
         mount_data();
 #else
@@ -339 +382 @@
 #endif
         
-        getterm("term/vc0", "/app/bdsh", true);
-        getterm("term/vc1", "/app/bdsh", false);
-        getterm("term/vc2", "/app/bdsh", false);
-        getterm("term/vc3", "/app/bdsh", false);
-        getterm("term/vc4", "/app/bdsh", false);
-        getterm("term/vc5", "/app/bdsh", false);
-        getterm("term/vc6", "/app/klog", false);
+        srv_start("/srv/input", HID_INPUT);
+        srv_start("/srv/output", HID_OUTPUT);
+        
+        int rc = compositor(HID_INPUT, HID_COMPOSITOR_SERVER);
+        if (rc == EOK) {
+                gui_start("/app/vlaunch", HID_COMPOSITOR_SERVER);
+                gui_start("/app/vterm", HID_COMPOSITOR_SERVER);
+        } else {
+                rc = console(HID_INPUT, HID_OUTPUT);
+                if (rc == EOK) {
+                        getterm("term/vc0", "/app/bdsh", true);
+                        getterm("term/vc1", "/app/bdsh", false);
+                        getterm("term/vc2", "/app/bdsh", false);
+                        getterm("term/vc3", "/app/bdsh", false);
+                        getterm("term/vc4", "/app/bdsh", false);
+                        getterm("term/vc5", "/app/bdsh", false);
+                        getterm("term/vc6", "/app/klog", false);
+                }
+        }
         
         return 0;

uspace/app/mkexfat/mkexfat.c

@@ -38 +38 @@
 
 #include <stdio.h>
-#include <libblock.h>
+#include <block.h>
 #include <assert.h>
 #include <errno.h>

uspace/app/mkfat/mkfat.c

@@ -40 +40 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <libblock.h>
+#include <block.h>
 #include <mem.h>
 #include <loc.h>

uspace/app/mkmfs/mkmfs.c

@@ -39 +39 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <libblock.h>
+#include <block.h>
 #include <unistd.h>
 #include <errno.h>