~hp/d2tk

8f83a1f3a4395260d5ae4fb8036d42b7415b5f4c — Hanspeter Portner 6 months ago ef3c5d3
ci: update to alpine 3.18, add sign step
4 files changed, 42 insertions(+), 36 deletions(-)

M .builds/alpine-latest.yml
M example/example.c
M meson_options.txt
M src/base.c
M .builds/alpine-latest.yml => .builds/alpine-latest.yml +12 -2
@@ 6,8 6,8 @@
image: alpine/latest

packages:
  - clang15-analyzer
  - llvm15
  - clang16-analyzer
  - llvm16
  - reuse
  - meson
  - git-subtree


@@ 31,6 31,7 @@ secrets:
  - 0545580c-42ac-4700-b322-4e9df924eb07 # runner-ssh
  - 5fe806cd-3af4-4588-9898-8115d9262144 # hut-config
  - d6d10b2a-542a-4b45-b1be-6ef30a8ab558 # git-config
  - 3de1773e-3503-46f5-8ab4-5212026517f4 # pgp-key

sources:
  - https://git.open-music-kontrollers.ch/~hp/ci


@@ 83,6 84,15 @@ tasks:
      ci-meson analyzer build
      ci-meson analyzer test

  - sign: |
      . ~/ci/activate

      if ! ci-istag; then
        complete-build
      fi

      ci-archivesign

  - deploy: |
      . ~/ci/activate


M example/example.c => example/example.c +1 -1
@@ 56,7 56,7 @@ typedef enum _bar_t {
	BAR_MAX
} bar_t;

static int32_t bar = BAR_LINEEDIT;
static int32_t bar = BAR_PANE;
static const char *bar_lbl [BAR_MAX] = {
	[BAR_MIX]        = "Mix of many",
	[BAR_SPINNER]    = "Spinner",

M meson_options.txt => meson_options.txt +1 -1
@@ 55,4 55,4 @@ option('use-fontconfig',
	value : 'disabled',
	yield : true)

option('version', type : 'string', value : '0.4.2')
option('version', type : 'string', value : '0.5.11')

M src/base.c => src/base.c +28 -32
@@ 677,13 677,9 @@ d2tk_base_is_active_hot(d2tk_base_t *base, d2tk_id_t id,
}

#define nocol 0x0
#define light_grey 0x7f7f7fff
#define dark_grey 0x3f3f3fff
#define darker_grey 0x222222ff
#define black 0x000000ff
#define white 0xffffffff
#define light_orange 0xffcf00ff
#define dark_orange 0xcf9f00ff
#define col1 0x020202ff
#define col2 0x026cfdff
#define col3 0xfdfdfdff

#define FONT_SANS_BOLD "FiraSans:bold"



@@ 695,36 691,36 @@ d2tk_base_get_default_style(void)
		.border_width                    = 1,
		.padding                         = 1,
		.rounding                        = 4,
		.bg_color                        = darker_grey,
		.bg_color                        = col1,
		.fill_color = {
			[D2TK_TRIPLE_NONE]             = dark_grey,
			[D2TK_TRIPLE_HOT]              = light_grey,
			[D2TK_TRIPLE_ACTIVE]           = dark_orange,
			[D2TK_TRIPLE_ACTIVE_HOT]       = light_orange,
			[D2TK_TRIPLE_FOCUS]            = dark_grey,
			[D2TK_TRIPLE_HOT_FOCUS]        = light_grey,
			[D2TK_TRIPLE_ACTIVE_FOCUS]     = dark_orange,
			[D2TK_TRIPLE_ACTIVE_HOT_FOCUS] = light_orange,
			[D2TK_TRIPLE_NONE]             = col3,
			[D2TK_TRIPLE_HOT]              = col3,
			[D2TK_TRIPLE_ACTIVE]           = col2,
			[D2TK_TRIPLE_ACTIVE_HOT]       = col2,
			[D2TK_TRIPLE_FOCUS]            = col3,
			[D2TK_TRIPLE_HOT_FOCUS]        = col3,
			[D2TK_TRIPLE_ACTIVE_FOCUS]     = col2,
			[D2TK_TRIPLE_ACTIVE_HOT_FOCUS] = col2,
		},
		.stroke_color = {
			[D2TK_TRIPLE_NONE]             = black,
			[D2TK_TRIPLE_HOT]              = black,
			[D2TK_TRIPLE_ACTIVE]           = black,
			[D2TK_TRIPLE_ACTIVE_HOT]       = black,
			[D2TK_TRIPLE_FOCUS]            = white,
			[D2TK_TRIPLE_HOT_FOCUS]        = white,
			[D2TK_TRIPLE_ACTIVE_FOCUS]     = white,
			[D2TK_TRIPLE_ACTIVE_HOT_FOCUS] = white,
			[D2TK_TRIPLE_NONE]             = col1,
			[D2TK_TRIPLE_HOT]              = col2,
			[D2TK_TRIPLE_ACTIVE]           = col1,
			[D2TK_TRIPLE_ACTIVE_HOT]       = col3,
			[D2TK_TRIPLE_FOCUS]            = col1,
			[D2TK_TRIPLE_HOT_FOCUS]        = col2,
			[D2TK_TRIPLE_ACTIVE_FOCUS]     = col1,
			[D2TK_TRIPLE_ACTIVE_HOT_FOCUS] = col3,
		},
		.text_stroke_color = {
			[D2TK_TRIPLE_NONE]             = white,
			[D2TK_TRIPLE_HOT]              = light_orange,
			[D2TK_TRIPLE_ACTIVE]           = white,
			[D2TK_TRIPLE_ACTIVE_HOT]       = dark_grey,
			[D2TK_TRIPLE_FOCUS]            = white,
			[D2TK_TRIPLE_HOT_FOCUS]        = light_orange,
			[D2TK_TRIPLE_ACTIVE_FOCUS]     = white,
			[D2TK_TRIPLE_ACTIVE_HOT_FOCUS] = dark_grey
			[D2TK_TRIPLE_NONE]             = col1,
			[D2TK_TRIPLE_HOT]              = col2,
			[D2TK_TRIPLE_ACTIVE]           = col1,
			[D2TK_TRIPLE_ACTIVE_HOT]       = col3,
			[D2TK_TRIPLE_FOCUS]            = col1,
			[D2TK_TRIPLE_HOT_FOCUS]        = col2,
			[D2TK_TRIPLE_ACTIVE_FOCUS]     = col1,
			[D2TK_TRIPLE_ACTIVE_HOT_FOCUS] = col3
		},
		.text_fill_color = {
			[D2TK_TRIPLE_NONE]             = nocol,