Changeset 7e38970d in mainline

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

Files:

• meson/part/initrd_manifest/meson.build (modified) (view diffs)
• tools/export.sh (modified) (view diffs)
• tools/xcw/bin/helenos-pkg-config (modified) (view diffs)
• tools/xcw/demo/Makefile (modified) (view diffs)
• uspace/app/barber/barber.c (modified) (view diffs)
• uspace/app/barber/meson.build (modified) (view diffs)
• uspace/app/calculator/calculator.c (added)
• uspace/app/calculator/doc/doxygroups.h (moved) (moved from uspace/app/vcalc/doc/doxygroups.h ) (view diffs)
• uspace/app/calculator/meson.build (moved) (moved from uspace/app/fontviewer/meson.build ) (view diffs)
• uspace/app/fontedit/doc/doxygroups.h (added)
• uspace/app/fontedit/fontedit.c (added)
• uspace/app/fontedit/fontedit.h (added)
• uspace/app/fontedit/meson.build (added)
• uspace/app/fontviewer/doc/doxygroups.h (deleted)
• uspace/app/fontviewer/fontviewer.c (deleted)
• uspace/app/gfxdemo/doc/doxygroups.h (modified) (view diffs)
• uspace/app/gfxdemo/gfxdemo.c (modified) (view diffs)
• uspace/app/gfxdemo/meson.build (modified) (view diffs)
• uspace/app/hello/doc/doxygroups.h (added)
• uspace/app/hello/hello.c (added)
• uspace/app/hello/hello.h (added)
• uspace/app/hello/meson.build (moved) (moved from uspace/app/vterm/meson.build ) (view diffs)
• uspace/app/init/init.c (modified) (view diffs)
• uspace/app/launcher/doc/doxygroups.h (moved) (moved from uspace/app/vlaunch/doc/doxygroups.h ) (view diffs)
• uspace/app/launcher/gfx/helenos.tga (moved) (moved from uspace/app/vlaunch/gfx/helenos.tga ) (view diffs)
• uspace/app/launcher/launcher.c (added)
• uspace/app/launcher/launcher.h (added)
• uspace/app/launcher/meson.build (moved) (moved from uspace/app/vlaunch/meson.build ) (view diffs)
• uspace/app/meson.build (modified) (view diffs)
• uspace/app/terminal/doc/doxygroups.h (moved) (moved from uspace/app/vterm/doc/doxygroups.h ) (view diffs)
• uspace/app/terminal/main.c (moved) (moved from uspace/app/vterm/vterm.c ) (view diffs)
• uspace/app/terminal/meson.build (moved) (moved from uspace/lib/guigfx/meson.build ) (view diffs)
• uspace/app/terminal/terminal.c (moved) (moved from uspace/lib/gui/terminal.c ) (view diffs)
• uspace/app/terminal/terminal.h (moved) (moved from uspace/lib/gui/terminal.h ) (view diffs)
• uspace/app/uidemo/doc/doxygroups.h (added)
• uspace/app/uidemo/meson.build (added)
• uspace/app/uidemo/uidemo.c (added)
• uspace/app/uidemo/uidemo.h (moved) (moved from uspace/lib/guigfx/include/guigfx/canvas.h ) (view diffs)
• uspace/app/vcalc/vcalc.c (deleted)
• uspace/app/vdemo/doc/doxygroups.h (deleted)
• uspace/app/vdemo/vdemo.c (deleted)
• uspace/app/viewer/meson.build (modified) (view diffs)
• uspace/app/viewer/viewer.c (modified) (view diffs)
• uspace/app/vlaunch/vlaunch.c (deleted)
• uspace/dist/data/font/helena.tpf (added)
• uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.c (modified) (view diffs)
• uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.h (modified) (view diffs)
• uspace/drv/fb/amdm37x_dispc/meson.build (modified) (view diffs)
• uspace/drv/fb/kfb/meson.build (modified) (view diffs)
• uspace/drv/fb/kfb/port.c (modified) (view diffs)
• uspace/lib/c/include/io/pixelmap.h (modified) (view diffs)
• uspace/lib/c/include/io/window.h (deleted)
• uspace/lib/congfx/src/console.c (modified) (view diffs)
• uspace/lib/display/include/types/display.h (modified) (view diffs)
• uspace/lib/display/include/types/display/wndparams.h (modified) (view diffs)
• uspace/lib/display/private/display.h (added)
• uspace/lib/display/src/display.c (modified) (view diffs)
• uspace/lib/display/test/display.c (modified) (view diffs)
• uspace/lib/draw/codec/webp.c (deleted)
• uspace/lib/draw/cursor.c (deleted)
• uspace/lib/draw/cursor/embedded.c (deleted)
• uspace/lib/draw/doc/doxygroups.h (deleted)
• uspace/lib/draw/drawctx.c (deleted)
• uspace/lib/draw/font.c (deleted)
• uspace/lib/draw/font/bitmap_backend.c (deleted)
• uspace/lib/draw/font/embedded.c (deleted)
• uspace/lib/draw/font/pcf.c (deleted)
• uspace/lib/draw/gfx/cursor-11x18.c (deleted)
• uspace/lib/draw/include/draw/font.h (deleted)
• uspace/lib/draw/path.c (deleted)
• uspace/lib/draw/source.c (deleted)
• uspace/lib/draw/surface.c (deleted)
• uspace/lib/fbfont/doc/doxygroups.h (added)
• uspace/lib/fbfont/include/fbfont/font-8x16.h (moved) (moved from uspace/srv/hid/output/gfx/font-8x16.h ) (view diffs)
• uspace/lib/fbfont/meson.build (moved) (moved from uspace/app/vcalc/meson.build ) (view diffs)
• uspace/lib/fbfont/src/font-8x16.c (moved) (moved from uspace/lib/draw/gfx/font-8x16.c ) (view diffs)
• uspace/lib/gfx/include/gfx/coord.h (modified) (view diffs)
• uspace/lib/gfx/include/types/gfx/bitmap.h (modified) (view diffs)
• uspace/lib/gfx/private/color.h (modified) (view diffs)
• uspace/lib/gfx/src/bitmap.c (modified) (view diffs)
• uspace/lib/gfx/src/coord.c (modified) (view diffs)
• uspace/lib/gfx/test/coord.c (modified) (view diffs)
• uspace/lib/gfxfont/doc/doxygroups.h (added)
• uspace/lib/gfxfont/include/gfx/font.h (added)
• uspace/lib/gfxfont/include/gfx/glyph.h (added)
• uspace/lib/gfxfont/include/gfx/glyph_bmp.h (added)
• uspace/lib/gfxfont/include/gfx/text.h (added)
• uspace/lib/gfxfont/include/gfx/typeface.h (moved) (moved from uspace/lib/gui/grid.h ) (view diffs)
• uspace/lib/gfxfont/include/types/gfx/font.h (moved) (moved from uspace/lib/draw/include/draw/cursor.h ) (view diffs)
• uspace/lib/gfxfont/include/types/gfx/glyph.h (moved) (moved from uspace/lib/gui/connection.h ) (view diffs)
• uspace/lib/gfxfont/include/types/gfx/glyph_bmp.h (added)
• uspace/lib/gfxfont/include/types/gfx/text.h (added)
• uspace/lib/gfxfont/include/types/gfx/typeface.h (added)
• uspace/lib/gfxfont/meson.build (moved) (moved from uspace/lib/gui/meson.build ) (view diffs)
• uspace/lib/gfxfont/private/font.h (added)
• uspace/lib/gfxfont/private/glyph.h (added)
• uspace/lib/gfxfont/private/glyph_bmp.h (moved) (moved from uspace/lib/gui/button.h ) (view diffs)
• uspace/lib/gfxfont/private/tpf_file.h (added)
• uspace/lib/gfxfont/private/typeface.h (added)
• uspace/lib/gfxfont/src/font.c (added)
• uspace/lib/gfxfont/src/glyph.c (added)
• uspace/lib/gfxfont/src/glyph_bmp.c (added)
• uspace/lib/gfxfont/src/text.c (added)
• uspace/lib/gfxfont/src/typeface.c (added)
• uspace/lib/gfxfont/test/font.c (added)
• uspace/lib/gfxfont/test/glyph.c (added)
• uspace/lib/gfxfont/test/glyph_bmp.c (added)
• uspace/lib/gfxfont/test/main.c (added)
• uspace/lib/gfxfont/test/text.c (added)
• uspace/lib/gfxfont/test/tpf.c (added)
• uspace/lib/gfxfont/test/typeface.c (added)
• uspace/lib/gfximage/doc/doxygroups.h (added)
• uspace/lib/gfximage/include/gfximage/tga.h (moved) (moved from uspace/lib/gui/common.h ) (view diffs)
• uspace/lib/gfximage/include/gfximage/tga_gz.h (moved) (moved from uspace/lib/draw/include/draw/codec.h ) (view diffs)
• uspace/lib/gfximage/meson.build (added)
• uspace/lib/gfximage/src/tga.c (moved) (moved from uspace/lib/draw/codec/tga.c ) (view diffs)
• uspace/lib/gfximage/src/tga_gz.c (moved) (moved from uspace/lib/draw/codec/tga.gz.c ) (view diffs)
• uspace/lib/gui/button.c (deleted)
• uspace/lib/gui/canvas.c (deleted)
• uspace/lib/gui/common.c (deleted)
• uspace/lib/gui/connection.c (deleted)
• uspace/lib/gui/doc/doxygroups.h (deleted)
• uspace/lib/gui/grid.c (deleted)
• uspace/lib/gui/label.c (deleted)
• uspace/lib/gui/minimal.c (deleted)
• uspace/lib/gui/widget.c (deleted)
• uspace/lib/gui/widget.h (deleted)
• uspace/lib/gui/window.c (deleted)
• uspace/lib/gui/window.h (deleted)
• uspace/lib/guigfx/doc/doxygroups.h (deleted)
• uspace/lib/guigfx/src/canvas.c (deleted)
• uspace/lib/memgfx/src/memgc.c (modified) (view diffs)
• uspace/lib/meson.build (modified) (view diffs)
• uspace/lib/pixconv/doc/doxygroups.h (moved) (moved from uspace/lib/softrend/doc/doxygroups.h ) (view diffs)
• uspace/lib/pixconv/meson.build (moved) (moved from uspace/app/vdemo/meson.build ) (view diffs)
• uspace/lib/pixconv/pixconv.c (moved) (moved from uspace/lib/softrend/pixconv.c ) (view diffs)
• uspace/lib/pixconv/pixconv.h (moved) (moved from uspace/lib/softrend/pixconv.h ) (view diffs)
• uspace/lib/riff/doc/doxygroups.h (added)
• uspace/lib/riff/include/riff/chunk.h (added)
• uspace/lib/riff/include/riff/rwave.h (added)
• uspace/lib/riff/include/types/riff/chunk.h (added)
• uspace/lib/riff/include/types/riff/rwave.h (added)
• uspace/lib/riff/meson.build (moved) (moved from uspace/lib/softrend/meson.build ) (view diffs)
• uspace/lib/riff/src/chunk.c (added)
• uspace/lib/riff/src/rwave.c (added)
• uspace/lib/riff/test/chunk.c (added)
• uspace/lib/riff/test/main.c (added)
• uspace/lib/riff/test/rwave.c (added)
• uspace/lib/softrend/compose.c (deleted)
• uspace/lib/softrend/compose.h (deleted)
• uspace/lib/softrend/filter.c (deleted)
• uspace/lib/softrend/rectangle.c (deleted)
• uspace/lib/softrend/transform.c (deleted)
• uspace/lib/softrend/transform.h (deleted)
• uspace/lib/ui/doc/doxygroups.h (added)
• uspace/lib/ui/include/types/ui/control.h (added)
• uspace/lib/ui/include/types/ui/cursor.h (moved) (moved from uspace/lib/draw/include/draw/gfx.h ) (view diffs)
• uspace/lib/ui/include/types/ui/entry.h (moved) (moved from uspace/lib/guigfx/include/types/guigfx/canvas.h ) (view diffs)
• uspace/lib/ui/include/types/ui/event.h (added)
• uspace/lib/ui/include/types/ui/fixed.h (added)
• uspace/lib/ui/include/types/ui/image.h (added)
• uspace/lib/ui/include/types/ui/label.h (added)
• uspace/lib/ui/include/types/ui/pbutton.h (added)
• uspace/lib/ui/include/types/ui/resource.h (added)
• uspace/lib/ui/include/types/ui/ui.h (moved) (moved from uspace/lib/softrend/filter.h ) (view diffs)
• uspace/lib/ui/include/types/ui/wdecor.h (moved) (moved from uspace/lib/draw/include/draw/surface.h ) (view diffs)
• uspace/lib/ui/include/types/ui/window.h (added)
• uspace/lib/ui/include/ui/control.h (added)
• uspace/lib/ui/include/ui/entry.h (moved) (moved from uspace/lib/gui/canvas.h ) (view diffs)
• uspace/lib/ui/include/ui/fixed.h (added)
• uspace/lib/ui/include/ui/image.h (added)
• uspace/lib/ui/include/ui/label.h (moved) (moved from uspace/lib/gui/label.h ) (view diffs)
• uspace/lib/ui/include/ui/paint.h (added)
• uspace/lib/ui/include/ui/pbutton.h (moved) (moved from uspace/lib/draw/include/draw/source.h ) (view diffs)
• uspace/lib/ui/include/ui/resource.h (added)
• uspace/lib/ui/include/ui/ui.h (added)
• uspace/lib/ui/include/ui/wdecor.h (added)
• uspace/lib/ui/include/ui/window.h (added)
• uspace/lib/ui/meson.build (moved) (moved from uspace/lib/draw/meson.build ) (view diffs)
• uspace/lib/ui/private/control.h (moved) (moved from uspace/lib/softrend/rectangle.h ) (view diffs)
• uspace/lib/ui/private/dummygc.h (moved) (moved from uspace/lib/c/include/io/mode.h ) (view diffs)
• uspace/lib/ui/private/entry.h (added)
• uspace/lib/ui/private/fixed.h (moved) (moved from uspace/lib/draw/include/draw/path.h ) (view diffs)
• uspace/lib/ui/private/image.h (moved) (moved from uspace/lib/guigfx/private/canvas.h ) (view diffs)
• uspace/lib/ui/private/label.h (added)
• uspace/lib/ui/private/pbutton.h (added)
• uspace/lib/ui/private/resource.h (added)
• uspace/lib/ui/private/ui.h (moved) (moved from uspace/lib/gui/minimal.h ) (view diffs)
• uspace/lib/ui/private/wdecor.h (added)
• uspace/lib/ui/private/window.h (moved) (moved from uspace/lib/draw/include/draw/drawctx.h ) (view diffs)
• uspace/lib/ui/src/control.c (added)
• uspace/lib/ui/src/dummygc.c (added)
• uspace/lib/ui/src/entry.c (added)
• uspace/lib/ui/src/fixed.c (added)
• uspace/lib/ui/src/image.c (added)
• uspace/lib/ui/src/label.c (added)
• uspace/lib/ui/src/paint.c (added)
• uspace/lib/ui/src/pbutton.c (added)
• uspace/lib/ui/src/resource.c (added)
• uspace/lib/ui/src/ui.c (added)
• uspace/lib/ui/src/wdecor.c (added)
• uspace/lib/ui/src/window.c (added)
• uspace/lib/ui/test/control.c (added)
• uspace/lib/ui/test/entry.c (added)
• uspace/lib/ui/test/fixed.c (added)
• uspace/lib/ui/test/image.c (added)
• uspace/lib/ui/test/label.c (added)
• uspace/lib/ui/test/main.c (added)
• uspace/lib/ui/test/paint.c (added)
• uspace/lib/ui/test/pbutton.c (added)
• uspace/lib/ui/test/resource.c (added)
• uspace/lib/ui/test/ui.c (added)
• uspace/lib/ui/test/wdecor.c (added)
• uspace/lib/ui/test/window.c (added)
• uspace/srv/hid/display/seat.c (modified) (view diffs)
• uspace/srv/hid/display/window.c (modified) (view diffs)
• uspace/srv/hid/output/gfx/font-8x16.c (deleted)
• uspace/srv/hid/rfb/main.c (modified) (view diffs)