Changeset 2bb6d04 in mainline for uspace/lib/gui


Ignore:
Timestamp:
2019-06-25T14:58:16Z (6 years ago)
Author:
Jiří Zárevúcky <zarevucky.jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
aeba767
Parents:
cd9531d3
git-author:
Jiří Zárevúcky <zarevucky.jiri@…> (2019-06-13 12:14:16)
git-committer:
Jiří Zárevúcky <zarevucky.jiri@…> (2019-06-25 14:58:16)
Message:

Curb the proliferation of libdraw headers

libdraw provides a lot of ambiguously named headers, which makes it
confusing. This change merges the subdirectories into single headers,
and moves all headers into draw subdirectory, so that it's obvious
at a glance what library the header belongs to.

Compare:

#include <path.h>
#include <source.h>
#include <font/bitmap_backend.h>
#include <font/pcf.h>

vs.

#include <draw/path.h>
#include <draw/source.h>
#include <draw/font.h>

Location:
uspace/lib/gui
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/gui/button.c

    rcd9531d3 r2bb6d04  
    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

    rcd9531d3 r2bb6d04  
    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

    rcd9531d3 r2bb6d04  
    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

    rcd9531d3 r2bb6d04  
    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

    rcd9531d3 r2bb6d04  
    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

    rcd9531d3 r2bb6d04  
    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

    rcd9531d3 r2bb6d04  
    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

    rcd9531d3 r2bb6d04  
    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

    rcd9531d3 r2bb6d04  
    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/minimal.c

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

  • uspace/lib/gui/terminal.c

    rcd9531d3 r2bb6d04  
    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

    rcd9531d3 r2bb6d04  
    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

    rcd9531d3 r2bb6d04  
    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

    rcd9531d3 r2bb6d04  
    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.