Changeset 7e38970d in mainline for uspace/lib

Timestamp:

2020-12-07T00:08:37Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

25f26600

Parents:

7a873f0 (diff), 8596474 (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 branch 'jxsvoboda-gfx' into master

Location:

uspace/lib

Files:

• c/include/io/pixelmap.h (modified) (view diffs)
• c/include/io/window.h (deleted)
• congfx/src/console.c (modified) (view diffs)
• display/include/types/display.h (modified) (view diffs)
• display/include/types/display/wndparams.h (modified) (view diffs)
• display/private/display.h (added)
• display/src/display.c (modified) (view diffs)
• display/test/display.c (modified) (view diffs)
• draw/codec/webp.c (deleted)
• draw/cursor.c (deleted)
• draw/cursor/embedded.c (deleted)
• draw/doc/doxygroups.h (deleted)
• draw/drawctx.c (deleted)
• draw/font.c (deleted)
• draw/font/bitmap_backend.c (deleted)
• draw/font/embedded.c (deleted)
• draw/font/pcf.c (deleted)
• draw/gfx/cursor-11x18.c (deleted)
• draw/include/draw/font.h (deleted)
• draw/path.c (deleted)
• draw/source.c (deleted)
• draw/surface.c (deleted)
• fbfont/doc/doxygroups.h (added)
• fbfont/include/fbfont/font-8x16.h (moved) (moved from uspace/srv/hid/output/gfx/font-8x16.h ) (view diffs)
• fbfont/meson.build (moved) (moved from uspace/app/vcalc/meson.build ) (view diffs)
• fbfont/src/font-8x16.c (moved) (moved from uspace/lib/draw/gfx/font-8x16.c ) (view diffs)
• gfx/include/gfx/coord.h (modified) (view diffs)
• gfx/include/types/gfx/bitmap.h (modified) (view diffs)
• gfx/private/color.h (modified) (view diffs)
• gfx/src/bitmap.c (modified) (view diffs)
• gfx/src/coord.c (modified) (view diffs)
• gfx/test/coord.c (modified) (view diffs)
• gfxfont/doc/doxygroups.h (added)
• gfxfont/include/gfx/font.h (added)
• gfxfont/include/gfx/glyph.h (added)
• gfxfont/include/gfx/glyph_bmp.h (added)
• gfxfont/include/gfx/text.h (added)
• gfxfont/include/gfx/typeface.h (moved) (moved from uspace/lib/gui/grid.h ) (view diffs)
• gfxfont/include/types/gfx/font.h (moved) (moved from uspace/lib/draw/include/draw/cursor.h ) (view diffs)
• gfxfont/include/types/gfx/glyph.h (moved) (moved from uspace/lib/gui/connection.h ) (view diffs)
• gfxfont/include/types/gfx/glyph_bmp.h (added)
• gfxfont/include/types/gfx/text.h (added)
• gfxfont/include/types/gfx/typeface.h (added)
• gfxfont/meson.build (moved) (moved from uspace/lib/gui/meson.build ) (view diffs)
• gfxfont/private/font.h (added)
• gfxfont/private/glyph.h (added)
• gfxfont/private/glyph_bmp.h (moved) (moved from uspace/lib/gui/button.h ) (view diffs)
• gfxfont/private/tpf_file.h (added)
• gfxfont/private/typeface.h (added)
• gfxfont/src/font.c (added)
• gfxfont/src/glyph.c (added)
• gfxfont/src/glyph_bmp.c (added)
• gfxfont/src/text.c (added)
• gfxfont/src/typeface.c (added)
• gfxfont/test/font.c (added)
• gfxfont/test/glyph.c (added)
• gfxfont/test/glyph_bmp.c (added)
• gfxfont/test/main.c (added)
• gfxfont/test/text.c (added)
• gfxfont/test/tpf.c (added)
• gfxfont/test/typeface.c (added)
• gfximage/doc/doxygroups.h (added)
• gfximage/include/gfximage/tga.h (moved) (moved from uspace/lib/gui/common.h ) (view diffs)
• gfximage/include/gfximage/tga_gz.h (moved) (moved from uspace/lib/draw/include/draw/codec.h ) (view diffs)
• gfximage/meson.build (added)
• gfximage/src/tga.c (moved) (moved from uspace/lib/draw/codec/tga.c ) (view diffs)
• gfximage/src/tga_gz.c (moved) (moved from uspace/lib/draw/codec/tga.gz.c ) (view diffs)
• gui/button.c (deleted)
• gui/canvas.c (deleted)
• gui/common.c (deleted)
• gui/connection.c (deleted)
• gui/doc/doxygroups.h (deleted)
• gui/grid.c (deleted)
• gui/label.c (deleted)
• gui/minimal.c (deleted)
• gui/widget.c (deleted)
• gui/widget.h (deleted)
• gui/window.c (deleted)
• gui/window.h (deleted)
• guigfx/doc/doxygroups.h (deleted)
• guigfx/src/canvas.c (deleted)
• memgfx/src/memgc.c (modified) (view diffs)
• meson.build (modified) (view diffs)
• pixconv/doc/doxygroups.h (moved) (moved from uspace/lib/softrend/doc/doxygroups.h ) (view diffs)
• pixconv/meson.build (moved) (moved from uspace/app/vdemo/meson.build ) (view diffs)
• pixconv/pixconv.c (moved) (moved from uspace/lib/softrend/pixconv.c ) (view diffs)
• pixconv/pixconv.h (moved) (moved from uspace/lib/softrend/pixconv.h ) (view diffs)
• riff/doc/doxygroups.h (added)
• riff/include/riff/chunk.h (added)
• riff/include/riff/rwave.h (added)
• riff/include/types/riff/chunk.h (added)
• riff/include/types/riff/rwave.h (added)
• riff/meson.build (moved) (moved from uspace/lib/softrend/meson.build ) (view diffs)
• riff/src/chunk.c (added)
• riff/src/rwave.c (added)
• riff/test/chunk.c (added)
• riff/test/main.c (added)
• riff/test/rwave.c (added)
• softrend/compose.c (deleted)
• softrend/compose.h (deleted)
• softrend/filter.c (deleted)
• softrend/rectangle.c (deleted)
• softrend/transform.c (deleted)
• softrend/transform.h (deleted)
• ui/doc/doxygroups.h (added)
• ui/include/types/ui/control.h (added)
• ui/include/types/ui/cursor.h (moved) (moved from uspace/lib/draw/include/draw/gfx.h ) (view diffs)
• ui/include/types/ui/entry.h (moved) (moved from uspace/lib/guigfx/include/types/guigfx/canvas.h ) (view diffs)
• ui/include/types/ui/event.h (added)
• ui/include/types/ui/fixed.h (added)
• ui/include/types/ui/image.h (added)
• ui/include/types/ui/label.h (added)
• ui/include/types/ui/pbutton.h (added)
• ui/include/types/ui/resource.h (added)
• ui/include/types/ui/ui.h (moved) (moved from uspace/lib/softrend/filter.h ) (view diffs)
• ui/include/types/ui/wdecor.h (moved) (moved from uspace/lib/draw/include/draw/surface.h ) (view diffs)
• ui/include/types/ui/window.h (added)
• ui/include/ui/control.h (added)
• ui/include/ui/entry.h (moved) (moved from uspace/lib/gui/canvas.h ) (view diffs)
• ui/include/ui/fixed.h (added)
• ui/include/ui/image.h (added)
• ui/include/ui/label.h (moved) (moved from uspace/lib/gui/label.h ) (view diffs)
• ui/include/ui/paint.h (added)
• ui/include/ui/pbutton.h (moved) (moved from uspace/lib/draw/include/draw/source.h ) (view diffs)
• ui/include/ui/resource.h (added)
• ui/include/ui/ui.h (added)
• ui/include/ui/wdecor.h (added)
• ui/include/ui/window.h (added)
• ui/meson.build (moved) (moved from uspace/lib/draw/meson.build ) (view diffs)
• ui/private/control.h (moved) (moved from uspace/lib/softrend/rectangle.h ) (view diffs)
• ui/private/dummygc.h (moved) (moved from uspace/lib/c/include/io/mode.h ) (view diffs)
• ui/private/entry.h (added)
• ui/private/fixed.h (moved) (moved from uspace/lib/draw/include/draw/path.h ) (view diffs)
• ui/private/image.h (moved) (moved from uspace/lib/guigfx/private/canvas.h ) (view diffs)
• ui/private/label.h (added)
• ui/private/pbutton.h (added)
• ui/private/resource.h (added)
• ui/private/ui.h (moved) (moved from uspace/lib/gui/minimal.h ) (view diffs)
• ui/private/wdecor.h (added)
• ui/private/window.h (moved) (moved from uspace/lib/draw/include/draw/drawctx.h ) (view diffs)
• ui/src/control.c (added)
• ui/src/dummygc.c (added)
• ui/src/entry.c (added)
• ui/src/fixed.c (added)
• ui/src/image.c (added)
• ui/src/label.c (added)
• ui/src/paint.c (added)
• ui/src/pbutton.c (added)
• ui/src/resource.c (added)
• ui/src/ui.c (added)
• ui/src/wdecor.c (added)
• ui/src/window.c (added)
• ui/test/control.c (added)
• ui/test/entry.c (added)
• ui/test/fixed.c (added)
• ui/test/image.c (added)
• ui/test/label.c (added)
• ui/test/main.c (added)
• ui/test/paint.c (added)
• ui/test/pbutton.c (added)
• ui/test/resource.c (added)
• ui/test/ui.c (added)
• ui/test/wdecor.c (added)
• ui/test/window.c (added)