Changeset 10cb47e in mainline for uspace/app


Ignore:
Timestamp:
2016-08-31T15:43:01Z (9 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
bdfdc51c
Parents:
58563585
Message:

add support for custom client data into widgets

Location:
uspace/app
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • uspace/app/barber/barber.c

    r58563585 r10cb47e  
    308308       
    309309        winreg = argv[1];
    310         window_t *main_window = window_open(argv[1],
     310        window_t *main_window = window_open(argv[1], NULL,
    311311            WINDOW_MAIN | WINDOW_DECORATED, "barber");
    312312        if (!main_window) {
     
    315315        }
    316316       
    317         frame_canvas = create_canvas(window_root(main_window),
     317        frame_canvas = create_canvas(window_root(main_window), NULL,
    318318            FRAME_WIDTH, FRAME_HEIGHT, frames[frame]);
    319319       
  • uspace/app/fontviewer/fontviewer.c

    r58563585 r10cb47e  
    260260        }
    261261       
    262         main_window = window_open(argv[1], WINDOW_MAIN, "fontviewer");
     262        main_window = window_open(argv[1], NULL, WINDOW_MAIN, "fontviewer");
    263263        if (!main_window) {
    264264                printf("Cannot open main window.\n");
     
    282282        }
    283283       
    284         canvas = create_canvas(window_root(main_window),
     284        canvas = create_canvas(window_root(main_window), NULL,
    285285            WINDOW_WIDTH, WINDOW_HEIGHT, surface);
    286286        if (canvas == NULL) {
  • uspace/app/vdemo/vdemo.c

    r58563585 r10cb47e  
    8585        lbl->confirm = on_confirm;
    8686        lbl->cancel = on_cancel;
    87         bool initialized = init_label(
    88             &lbl->label, parent, caption, points, background, foreground);
     87        bool initialized = init_label(&lbl->label, parent, NULL, caption,
     88            points, background, foreground);
    8989        lbl->label.widget.destroy = my_label_destroy;
    9090        return initialized;
     
    110110{
    111111        if (argc >= 2) {
    112                 window_t *main_window = window_open(argv[1],
     112                window_t *main_window = window_open(argv[1], NULL,
    113113                    WINDOW_MAIN | WINDOW_DECORATED | WINDOW_RESIZEABLE, "vdemo");
    114114                if (!main_window) {
     
    128128                my_label_t *lbl_action = create_my_label(NULL, "Hello there!", 16,
    129129                    lbl_bg, lbl_text);
    130                 button_t *btn_confirm = create_button(NULL, "Confirm", 16, btn_bg,
    131                     btn_fg, btn_text);
    132                 button_t *btn_cancel = create_button(NULL, "Cancel", 16, btn_bg,
    133                     btn_fg, btn_text);
    134                 grid_t *grid = create_grid(window_root(main_window), 2, 2, grd_bg);
     130                button_t *btn_confirm = create_button(NULL, NULL, "Confirm", 16,
     131                    btn_bg, btn_fg, btn_text);
     132                button_t *btn_cancel = create_button(NULL, NULL, "Cancel", 16,
     133                    btn_bg, btn_fg, btn_text);
     134                grid_t *grid = create_grid(window_root(main_window), NULL, 2, 2,
     135                    grd_bg);
    135136                if (!lbl_action || !btn_confirm || !btn_cancel || !grid) {
    136137                        window_close(main_window);
  • uspace/app/viewer/viewer.c

    r58563585 r10cb47e  
    157157                }
    158158        } else {
    159                 canvas = create_canvas(window_root(main_window),
     159                canvas = create_canvas(window_root(main_window), NULL,
    160160                    img_width, img_height, local_surface);
    161161                if (canvas == NULL) {
     
    219219                flags |= WINDOW_DECORATED;
    220220
    221         main_window = window_open(argv[1], flags, "viewer");
     221        main_window = window_open(argv[1], NULL, flags, "viewer");
    222222        if (!main_window) {
    223223                printf("Cannot open main window.\n");
  • uspace/app/vlaunch/vlaunch.c

    r58563585 r10cb47e  
    8585}
    8686
    87 static void on_vterm(widget_t *widget, void *data)
     87static void on_btn_click(widget_t *widget, void *data)
    8888{
    89         app_launch("/app/vterm");
    90 }
    91 
    92 static void on_vdemo(widget_t *widget, void *data)
    93 {
    94         app_launch("/app/vdemo");
    95 }
    96 
    97 static void on_vlaunch(widget_t *widget, void *data)
    98 {
    99         app_launch("/app/vlaunch");
     89        const char *app = (const char *) widget_get_data(widget);
     90        app_launch(app);
    10091}
    10192
     
    114105       
    115106        winreg = argv[1];
    116         window_t *main_window = window_open(argv[1],
     107        window_t *main_window = window_open(argv[1], NULL,
    117108            WINDOW_MAIN | WINDOW_DECORATED | WINDOW_RESIZEABLE, "vlaunch");
    118109        if (!main_window) {
     
    130121        pixel_t lbl_text = PIXEL(255, 0, 0, 0);
    131122       
    132         canvas_t *logo_canvas = create_canvas(NULL, LOGO_WIDTH, LOGO_HEIGHT,
     123        canvas_t *logo_canvas = create_canvas(NULL, NULL, LOGO_WIDTH, LOGO_HEIGHT,
    133124            logo);
    134         label_t *lbl_caption = create_label(NULL, "Launch application:", 16,
    135             lbl_bg, lbl_text);
    136         button_t *btn_vterm = create_button(NULL, "vterm", 16, btn_bg,
    137             btn_fg, btn_text);
    138         button_t *btn_vdemo = create_button(NULL, "vdemo", 16, btn_bg,
    139             btn_fg, btn_text);
    140         button_t *btn_vlaunch = create_button(NULL, "vlaunch", 16, btn_bg,
    141             btn_fg, btn_text);
    142         grid_t *grid = create_grid(window_root(main_window), 1, 5, grd_bg);
     125        label_t *lbl_caption = create_label(NULL, NULL, "Launch application:",
     126            16, lbl_bg, lbl_text);
     127        button_t *btn_vterm = create_button(NULL, "/app/vterm", "vterm",
     128            16, btn_bg, btn_fg, btn_text);
     129        button_t *btn_vdemo = create_button(NULL, "/app/vdemo", "vdemo",
     130            16, btn_bg, btn_fg, btn_text);
     131        button_t *btn_vlaunch = create_button(NULL, "/app/vlaunch", "vlaunch",
     132            16, btn_bg, btn_fg, btn_text);
     133        grid_t *grid = create_grid(window_root(main_window), NULL, 1, 5, grd_bg);
    143134       
    144135        if ((!logo_canvas) || (!lbl_caption) || (!btn_vterm) ||
     
    149140        }
    150141       
    151         sig_connect(&btn_vterm->clicked, NULL, on_vterm);
    152         sig_connect(&btn_vdemo->clicked, NULL, on_vdemo);
    153         sig_connect(&btn_vlaunch->clicked, NULL, on_vlaunch);
     142        sig_connect(&btn_vterm->clicked, &btn_vterm->widget, on_btn_click);
     143        sig_connect(&btn_vdemo->clicked, &btn_vdemo->widget, on_btn_click);
     144        sig_connect(&btn_vlaunch->clicked, &btn_vlaunch->widget, on_btn_click);
    154145       
    155146        grid->add(grid, &logo_canvas->widget, 0, 0, 1, 1);
  • uspace/app/vterm/vterm.c

    r58563585 r10cb47e  
    4949        }
    5050       
    51         window_t *main_window = window_open(argv[1],
     51        window_t *main_window = window_open(argv[1], NULL,
    5252            WINDOW_MAIN | WINDOW_DECORATED, "vterm");
    5353        if (!main_window) {
     
    5858        window_resize(main_window, 0, 0, 648, 508, WINDOW_PLACEMENT_ANY);
    5959        terminal_t *terminal_widget =
    60             create_terminal(window_root(main_window), 640, 480);
     60            create_terminal(window_root(main_window), NULL, 640, 480);
    6161        if (!terminal_widget) {
    6262                window_close(main_window);
Note: See TracChangeset for help on using the changeset viewer.