Changeset 3e828ea in mainline for uspace/lib/gui


Ignore:
Timestamp:
2019-09-23T12:49:29Z (6 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
9be2358
Parents:
9259d20 (diff), 1a4ec93f (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.
git-author:
Jiri Svoboda <jiri@…> (2019-09-22 12:49:07)
git-committer:
Jiri Svoboda <jiri@…> (2019-09-23 12:49:29)
Message:

Merge changes from master, especially Meson build

Location:
uspace/lib/gui
Files:
1 deleted
14 edited
1 moved

Legend:

Unmodified
Added
Removed

  • uspace/lib/gui/button.c

    r9259d20 r3e828ea  
    3636#include <str.h>
    3737#include <stdlib.h>
    38 #include <drawctx.h>
    39 #include <surface.h>
    40 #include <font/embedded.h>
     38#include <draw/drawctx.h>
     39#include <draw/surface.h>
     40#include <draw/font.h>
    4141#include <errno.h>
    4242#include "common.h"

  • uspace/lib/gui/button.h

    r9259d20 r3e828ea  
    4040#include <io/pixel.h>
    4141
    42 #include <source.h>
    43 #include <font.h>
     42#include <draw/source.h>
     43#include <draw/font.h>
    4444
    4545#include "connection.h"

  • uspace/lib/gui/canvas.c

    r9259d20 r3e828ea  
    3636#include <stdlib.h>
    3737#include <transform.h>
    38 #include <source.h>
    39 #include <surface.h>
    40 #include <drawctx.h>
     38#include <draw/source.h>
     39#include <draw/surface.h>
     40#include <draw/drawctx.h>
    4141#include "window.h"
    4242#include "canvas.h"

  • uspace/lib/gui/canvas.h

    r9259d20 r3e828ea  
    3939#include <stdbool.h>
    4040#include <io/pixel.h>
    41 #include <surface.h>
     41#include <draw/surface.h>
    4242#include "widget.h"
    4343#include "connection.h"

  • uspace/lib/gui/common.c

    r9259d20 r3e828ea  
    3636#include <stddef.h>
    3737#include <stdint.h>
    38 #include <drawctx.h>
     38#include <draw/drawctx.h>
    3939#include "common.h"
    4040

  • uspace/lib/gui/common.h

    r9259d20 r3e828ea  
    3737#define GUI_COMMON_H_
    3838
    39 #include <drawctx.h>
     39#include <draw/drawctx.h>
    4040
    4141extern void draw_icon_cross(surface_t *, sysarg_t, sysarg_t, pixel_t, pixel_t);

  • uspace/lib/gui/grid.c

    r9259d20 r3e828ea  
    3838#include <mem.h>
    3939#include <stdlib.h>
    40 #include <surface.h>
     40#include <draw/surface.h>
    4141#include "window.h"
    4242#include "grid.h"

  • uspace/lib/gui/label.c

    r9259d20 r3e828ea  
    3535
    3636#include <str.h>
    37 #include <drawctx.h>
     37#include <draw/drawctx.h>
    3838#include <stdlib.h>
    39 #include <surface.h>
    40 #include <font/embedded.h>
     39#include <draw/surface.h>
     40#include <draw/font.h>
    4141#include <errno.h>
    4242#include "window.h"

  • uspace/lib/gui/label.h

    r9259d20 r3e828ea  
    4040#include <io/pixel.h>
    4141
    42 #include <source.h>
    43 #include <font.h>
     42#include <draw/source.h>
     43#include <draw/font.h>
    4444
    4545#include "connection.h"

  • uspace/lib/gui/meson.build

    r9259d20 r3e828ea  
    2727#
    2828
    29 USPACE_PREFIX = ../../..
    30 
    31 LIBS = draw softrend drv compress math
    32 
    33 BINARY = compositor
    34 
    35 SOURCES = \
    36         compositor.c
    37 
    38 include $(USPACE_PREFIX)/Makefile.common
     29deps = [ 'draw' , 'softrend' , 'graph' ]
     30src = files(
     31        'common.c',
     32        'button.c',
     33        'canvas.c',
     34        'connection.c',
     35        'grid.c',
     36        'label.c',
     37        'minimal.c',
     38        'terminal.c',
     39        'widget.c',
     40        'window.c',
     41)

  • uspace/lib/gui/minimal.c

    r9259d20 r3e828ea  
    3535
    3636#include <stdlib.h>
    37 #include <surface.h>
     37#include <draw/surface.h>
    3838
    3939#include "window.h"

  • uspace/lib/gui/terminal.c

    r9259d20 r3e828ea  
    3737#include <stdlib.h>
    3838#include <io/chargrid.h>
    39 #include <surface.h>
    40 #include <gfx/font-8x16.h>
     39#include <draw/surface.h>
     40#include <draw/gfx.h>
    4141#include <io/con_srv.h>
    4242#include <io/concaps.h>

  • uspace/lib/gui/terminal.h

    r9259d20 r3e828ea  
    3939#include <stddef.h>
    4040#include <fibril_synch.h>
    41 #include <font.h>
     41#include <draw/font.h>
    4242#include <io/chargrid.h>
    4343#include <io/con_srv.h>

  • uspace/lib/gui/window.c

    r9259d20 r3e828ea  
    5252
    5353#include <io/pixel.h>
    54 #include <source.h>
    55 #include <font.h>
    56 #include <drawctx.h>
    57 #include <surface.h>
    58 #include <font/embedded.h>
     54#include <draw/source.h>
     55#include <draw/font.h>
     56#include <draw/drawctx.h>
     57#include <draw/surface.h>
    5958
    6059#include "common.h"

  • uspace/lib/gui/window.h

    r9259d20 r3e828ea  
    4242#include <ipc/window.h>
    4343#include <io/window.h>
    44 #include <surface.h>
     44#include <draw/surface.h>
    4545
    4646#include "widget.h"
Note: See TracChangeset for help on using the changeset viewer.