Changeset f126c87 in mainline for uspace/app

Timestamp:

2016-09-01T16:46:27Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

2a2fbc8

Parents:

9befb0d (diff), bdfdc51c (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 from mainline.

Location:

uspace/app

Files:

• barber/barber.c (modified) (2 diffs)
• fontviewer/fontviewer.c (modified) (2 diffs)
• usbinfo/info.c (modified) (4 diffs)
• usbinfo/list.c (modified) (1 diff)
• usbinfo/usbinfo.h (modified) (3 diffs)
• vcalc/Makefile (added)
• vcalc/vcalc.c (added)
• vdemo/vdemo.c (modified) (3 diffs)
• viewer/viewer.c (modified) (2 diffs)
• vlaunch/vlaunch.c (modified) (4 diffs)
• vterm/vterm.c (modified) (2 diffs)

uspace/app/barber/barber.c

@@ -308 +308 @@
         
         winreg = argv[1];
-        window_t *main_window = window_open(argv[1],
+        window_t *main_window = window_open(argv[1], NULL,
             WINDOW_MAIN | WINDOW_DECORATED, "barber");
         if (!main_window) {
@@ -315 +315 @@
         }
         
-        frame_canvas = create_canvas(window_root(main_window),
+        frame_canvas = create_canvas(window_root(main_window), NULL,
             FRAME_WIDTH, FRAME_HEIGHT, frames[frame]);
         

uspace/app/fontviewer/fontviewer.c

@@ -260 +260 @@
         }
         
-        main_window = window_open(argv[1], WINDOW_MAIN, "fontviewer");
+        main_window = window_open(argv[1], NULL, WINDOW_MAIN, "fontviewer");
         if (!main_window) {
                 printf("Cannot open main window.\n");
@@ -282 +282 @@
         }
         
-        canvas = create_canvas(window_root(main_window),
+        canvas = create_canvas(window_root(main_window), NULL,
             WINDOW_WIDTH, WINDOW_HEIGHT, surface);
         if (canvas == NULL) {

uspace/app/usbinfo/info.c

@@ -93 +93 @@
         init_match_ids(&matches);
         usb_device_create_match_ids_from_device_descriptor(
-                &usb_device_descriptors(usb_dev)->device, &matches);
+            &usb_device_descriptors(usb_dev)->device, &matches);
         printf("%sDevice match ids (0x%04x by 0x%04x, %s)\n", get_indent(0),
             usb_device_descriptors(usb_dev)->device.product_id,
@@ -229 +229 @@
 {
         dump_descriptor_tree_callback(
-            (const uint8_t *)&usb_device_descriptors(usb_dev)->device,
+            (const uint8_t *) &usb_device_descriptors(usb_dev)->device,
             (size_t) -1, NULL);
 
@@ -242 +242 @@
 {
         dump_descriptor_tree_callback(
-            (const uint8_t *)&usb_device_descriptors(usb_dev)->device,
+            (const uint8_t *) &usb_device_descriptors(usb_dev)->device,
             (size_t) -1, usb_dev);
 
@@ -296 +296 @@
         uint64_t str_mask = 0;
         find_string_indexes_callback(
-            (const uint8_t *)&usb_device_descriptors(usb_dev)->device, 0,
+            (const uint8_t *) &usb_device_descriptors(usb_dev)->device, 0,
             &str_mask);
 

uspace/app/usbinfo/list.c

@@ -148 +148 @@
         }
 
-        for (unsigned i = 0; i < count; ++i) {
+        for (unsigned int i = 0; i < count; ++i) {
                 print_usb_bus(svcs[i]);
         }

uspace/app/usbinfo/usbinfo.h

@@ -44 +44 @@
 typedef struct {
         int opt;
-        void (*action)(usb_device_t *usb_dev);
+        void (*action)(usb_device_t *);
         bool active;
 } usbinfo_action_t;
@@ -51 +51 @@
 #define NAME "usbinfo"
 
-void dump_buffer(const char *, size_t, const uint8_t *, size_t);
-const char *get_indent(size_t);
-void dump_match_ids(match_id_list_t *, const char *);
-void dump_usb_descriptor(uint8_t *, size_t);
-void dump_descriptor_tree(uint8_t *, size_t);
+extern void dump_buffer(const char *, size_t, const uint8_t *, size_t);
+extern const char *get_indent(size_t);
+extern void dump_match_ids(match_id_list_t *, const char *);
+extern void dump_usb_descriptor(uint8_t *, size_t);
+extern void dump_descriptor_tree(uint8_t *, size_t);
 
 static inline void internal_error(int err)
@@ -63 +63 @@
 
 typedef void (*dump_descriptor_in_tree_t)(const uint8_t *, size_t, void *);
-void browse_descriptor_tree(uint8_t *, size_t, usb_dp_descriptor_nesting_t *,
-    dump_descriptor_in_tree_t, size_t, void *);
 
-void list(void);
+extern void browse_descriptor_tree(uint8_t *, size_t,
+    usb_dp_descriptor_nesting_t *, dump_descriptor_in_tree_t, size_t, void *);
 
-void dump_short_device_identification(usb_device_t *);
-void dump_device_match_ids(usb_device_t *);
-void dump_descriptor_tree_brief(usb_device_t *);
-void dump_descriptor_tree_full(usb_device_t *);
-void dump_strings(usb_device_t *);
-void dump_status(usb_device_t *);
-void dump_hidreport_raw(usb_device_t *);
-void dump_hidreport_usages(usb_device_t *);
+extern void list(void);
+
+extern void dump_short_device_identification(usb_device_t *);
+extern void dump_device_match_ids(usb_device_t *);
+extern void dump_descriptor_tree_brief(usb_device_t *);
+extern void dump_descriptor_tree_full(usb_device_t *);
+extern void dump_strings(usb_device_t *);
+extern void dump_status(usb_device_t *);
+extern void dump_hidreport_raw(usb_device_t *);
+extern void dump_hidreport_usages(usb_device_t *);
 
 #endif

uspace/app/vdemo/vdemo.c

@@ -85 +85 @@
         lbl->confirm = on_confirm;
         lbl->cancel = on_cancel;
-        bool initialized = init_label(
-            &lbl->label, parent, caption, points, background, foreground);
+        bool initialized = init_label(&lbl->label, parent, NULL, caption,
+            points, background, foreground);
         lbl->label.widget.destroy = my_label_destroy;
         return initialized;
@@ -110 +110 @@
 {
         if (argc >= 2) {
-                window_t *main_window = window_open(argv[1],
+                window_t *main_window = window_open(argv[1], NULL,
                     WINDOW_MAIN | WINDOW_DECORATED | WINDOW_RESIZEABLE, "vdemo");
                 if (!main_window) {
@@ -128 +128 @@
                 my_label_t *lbl_action = create_my_label(NULL, "Hello there!", 16,
                     lbl_bg, lbl_text);
-                button_t *btn_confirm = create_button(NULL, "Confirm", 16, btn_bg,
-                    btn_fg, btn_text);
-                button_t *btn_cancel = create_button(NULL, "Cancel", 16, btn_bg,
-                    btn_fg, btn_text);
-                grid_t *grid = create_grid(window_root(main_window), 2, 2, grd_bg);
+                button_t *btn_confirm = create_button(NULL, NULL, "Confirm", 16,
+                    btn_bg, btn_fg, btn_text);
+                button_t *btn_cancel = create_button(NULL, NULL, "Cancel", 16,
+                    btn_bg, btn_fg, btn_text);
+                grid_t *grid = create_grid(window_root(main_window), NULL, 2, 2,
+                    grd_bg);
                 if (!lbl_action || !btn_confirm || !btn_cancel || !grid) {
                         window_close(main_window);

uspace/app/viewer/viewer.c

@@ -157 +157 @@
                 }
         } else {
-                canvas = create_canvas(window_root(main_window),
+                canvas = create_canvas(window_root(main_window), NULL,
                     img_width, img_height, local_surface);
                 if (canvas == NULL) {
@@ -219 +219 @@
                 flags |= WINDOW_DECORATED;
 
-        main_window = window_open(argv[1], flags, "viewer");
+        main_window = window_open(argv[1], NULL, flags, "viewer");
         if (!main_window) {
                 printf("Cannot open main window.\n");

uspace/app/vlaunch/vlaunch.c

@@ -85 +85 @@
 }
 
-static void on_vterm(widget_t *widget, void *data)
+static void on_btn_click(widget_t *widget, void *data)
 {
-        app_launch("/app/vterm");
-}
-
-static void on_vdemo(widget_t *widget, void *data)
-{
-        app_launch("/app/vdemo");
-}
-
-static void on_vlaunch(widget_t *widget, void *data)
-{
-        app_launch("/app/vlaunch");
+        const char *app = (const char *) widget_get_data(widget);
+        app_launch(app);
 }
 
@@ -114 +105 @@
         
         winreg = argv[1];
-        window_t *main_window = window_open(argv[1],
+        window_t *main_window = window_open(argv[1], NULL,
             WINDOW_MAIN | WINDOW_DECORATED | WINDOW_RESIZEABLE, "vlaunch");
         if (!main_window) {
@@ -130 +121 @@
         pixel_t lbl_text = PIXEL(255, 0, 0, 0);
         
-        canvas_t *logo_canvas = create_canvas(NULL, LOGO_WIDTH, LOGO_HEIGHT,
+        canvas_t *logo_canvas = create_canvas(NULL, NULL, LOGO_WIDTH, LOGO_HEIGHT,
             logo);
-        label_t *lbl_caption = create_label(NULL, "Launch application:", 16,
-            lbl_bg, lbl_text);
-        button_t *btn_vterm = create_button(NULL, "vterm", 16, btn_bg,
-            btn_fg, btn_text);
-        button_t *btn_vdemo = create_button(NULL, "vdemo", 16, btn_bg,
-            btn_fg, btn_text);
-        button_t *btn_vlaunch = create_button(NULL, "vlaunch", 16, btn_bg,
-            btn_fg, btn_text);
-        grid_t *grid = create_grid(window_root(main_window), 1, 5, grd_bg);
+        label_t *lbl_caption = create_label(NULL, NULL, "Launch application:",
+            16, lbl_bg, lbl_text);
+        button_t *btn_vterm = create_button(NULL, "/app/vterm", "vterm",
+            16, btn_bg, btn_fg, btn_text);
+        button_t *btn_vcalc = create_button(NULL, "/app/vcalc", "vcalc",
+            16, btn_bg, btn_fg, btn_text);
+        button_t *btn_vdemo = create_button(NULL, "/app/vdemo", "vdemo",
+            16, btn_bg, btn_fg, btn_text);
+        button_t *btn_vlaunch = create_button(NULL, "/app/vlaunch", "vlaunch",
+            16, btn_bg, btn_fg, btn_text);
+        grid_t *grid = create_grid(window_root(main_window), NULL, 1, 6, grd_bg);
         
         if ((!logo_canvas) || (!lbl_caption) || (!btn_vterm) ||
-            (!btn_vdemo) || (!btn_vlaunch) || (!grid)) {
+            (!btn_vcalc) || (!btn_vdemo) || (!btn_vlaunch) || (!grid)) {
                 window_close(main_window);
                 printf("Cannot create widgets.\n");
@@ -149 +142 @@
         }
         
-        sig_connect(&btn_vterm->clicked, NULL, on_vterm);
-        sig_connect(&btn_vdemo->clicked, NULL, on_vdemo);
-        sig_connect(&btn_vlaunch->clicked, NULL, on_vlaunch);
+        sig_connect(&btn_vterm->clicked, &btn_vterm->widget, on_btn_click);
+        sig_connect(&btn_vcalc->clicked, &btn_vcalc->widget, on_btn_click);
+        sig_connect(&btn_vdemo->clicked, &btn_vdemo->widget, on_btn_click);
+        sig_connect(&btn_vlaunch->clicked, &btn_vlaunch->widget, on_btn_click);
         
         grid->add(grid, &logo_canvas->widget, 0, 0, 1, 1);
         grid->add(grid, &lbl_caption->widget, 0, 1, 1, 1);
         grid->add(grid, &btn_vterm->widget, 0, 2, 1, 1);
-        grid->add(grid, &btn_vdemo->widget, 0, 3, 1, 1);
-        grid->add(grid, &btn_vlaunch->widget, 0, 4, 1, 1);
+        grid->add(grid, &btn_vcalc->widget, 0, 3, 1, 1);
+        grid->add(grid, &btn_vdemo->widget, 0, 4, 1, 1);
+        grid->add(grid, &btn_vlaunch->widget, 0, 5, 1, 1);
         
-        window_resize(main_window, 0, 0, 210, 130 + LOGO_HEIGHT,
+        window_resize(main_window, 0, 0, 210, 164 + LOGO_HEIGHT,
             WINDOW_PLACEMENT_RIGHT | WINDOW_PLACEMENT_TOP);
         window_exec(main_window);

uspace/app/vterm/vterm.c

@@ -49 +49 @@
         }
         
-        window_t *main_window = window_open(argv[1],
+        window_t *main_window = window_open(argv[1], NULL,
             WINDOW_MAIN | WINDOW_DECORATED, "vterm");
         if (!main_window) {
@@ -58 +58 @@
         window_resize(main_window, 0, 0, 648, 508, WINDOW_PLACEMENT_ANY);
         terminal_t *terminal_widget =
-            create_terminal(window_root(main_window), 640, 480);
+            create_terminal(window_root(main_window), NULL, 640, 480);
         if (!terminal_widget) {
                 window_close(main_window);