diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f3807f..cec4697 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,7 +16,7 @@ If a change only affects particular applications, they are listed in parentheses - feat(buffyboard): Allow disabling input devices via config - feat(buffyboard): Add CLI flags for overriding geometry & DPI - fix(unl0kr): Shutdown message box doesn't close on decline -- fix(unl0kr): Shutdown message box buttons are unstyled +- fix(unl0kr): Shutdown message box buttons and label are unstyled - fix(unl0kr): Build fails when DRM is disabled - misc: Update lvgl to git master (2023-03-30) diff --git a/buffyboard/regenerate-screenshots.sh b/buffyboard/regenerate-screenshots.sh index ef1e38f..5e76255 100755 --- a/buffyboard/regenerate-screenshots.sh +++ b/buffyboard/regenerate-screenshots.sh @@ -2,8 +2,6 @@ # Change this depending on what device you're generating the screenshots on fb_res=1920x1080 -fb_depth=8 -fb_format=rgba executable=$1 outdir=screenshots @@ -14,6 +12,8 @@ themes=( breezy-dark pmos-light pmos-dark + nord-light + nord-dark ) resolutions=( @@ -50,14 +50,8 @@ touchscreen=false EOF } -# Hide cursor -echo -e '\033[?25l' - function clean_up() { rm -f $config - - # Show cursor - echo -e '\033[?25h' } trap clean_up EXIT @@ -67,6 +61,8 @@ mkdir "$outdir" readme="# Buffyboard themes"$'\n' +clear # Blank the screen + for theme in ${themes[@]}; do write_config $theme @@ -78,17 +74,16 @@ for theme in ${themes[@]}; do sleep 3 # Wait for UI to render - cat /dev/fb0 > "$outdir/$theme-$res" + ../../fbcat/fbcat /dev/fb0 > "$outdir/$theme-$res.ppm" convert -size $fb_res \ - -depth $fb_depth \ + $outdir/$theme-$res.ppm \ screenshot-background.png \ - $fb_format:"$outdir/$theme-$res" \ -crop $res+0+0 \ -gravity NorthWest \ -composite \ "$outdir/$theme-$res.png" - rm "$outdir/$theme-$res" + rm "$outdir/$theme-$res.ppm" kill -15 $pid readme="$readme\"$res\""$'\n' diff --git a/buffyboard/screenshot-background.png b/buffyboard/screenshot-background.png index ac1e330..cff15a7 100644 Binary files a/buffyboard/screenshot-background.png and b/buffyboard/screenshot-background.png differ diff --git a/buffyboard/screenshots/README.md b/buffyboard/screenshots/README.md index e62c110..0677e83 100644 --- a/buffyboard/screenshots/README.md +++ b/buffyboard/screenshots/README.md @@ -47,3 +47,27 @@ 1280x800 1440x720 1920x1080 + +## nord-light + +480x800 +800x480 +540x960 +960x540 +768x1024 +1024x768 +1280x800 +1440x720 +1920x1080 + +## nord-dark + +480x800 +800x480 +540x960 +960x540 +768x1024 +1024x768 +1280x800 +1440x720 +1920x1080 diff --git a/buffyboard/screenshots/breezy-dark-1024x768.png b/buffyboard/screenshots/breezy-dark-1024x768.png index 843b205..69adae8 100644 Binary files a/buffyboard/screenshots/breezy-dark-1024x768.png and b/buffyboard/screenshots/breezy-dark-1024x768.png differ diff --git a/buffyboard/screenshots/breezy-dark-1280x800.png b/buffyboard/screenshots/breezy-dark-1280x800.png index 52c3222..2e06948 100644 Binary files a/buffyboard/screenshots/breezy-dark-1280x800.png and b/buffyboard/screenshots/breezy-dark-1280x800.png differ diff --git a/buffyboard/screenshots/breezy-dark-1440x720.png b/buffyboard/screenshots/breezy-dark-1440x720.png index 5487cd7..e083ac0 100644 Binary files a/buffyboard/screenshots/breezy-dark-1440x720.png and b/buffyboard/screenshots/breezy-dark-1440x720.png differ diff --git a/buffyboard/screenshots/breezy-dark-1920x1080.png b/buffyboard/screenshots/breezy-dark-1920x1080.png index 4ea1275..e92d70b 100644 Binary files a/buffyboard/screenshots/breezy-dark-1920x1080.png and b/buffyboard/screenshots/breezy-dark-1920x1080.png differ diff --git a/buffyboard/screenshots/breezy-dark-480x800.png b/buffyboard/screenshots/breezy-dark-480x800.png index 99d9f64..344b901 100644 Binary files a/buffyboard/screenshots/breezy-dark-480x800.png and b/buffyboard/screenshots/breezy-dark-480x800.png differ diff --git a/buffyboard/screenshots/breezy-dark-540x960.png b/buffyboard/screenshots/breezy-dark-540x960.png index 878c785..9c50d6a 100644 Binary files a/buffyboard/screenshots/breezy-dark-540x960.png and b/buffyboard/screenshots/breezy-dark-540x960.png differ diff --git a/buffyboard/screenshots/breezy-dark-768x1024.png b/buffyboard/screenshots/breezy-dark-768x1024.png index eecb812..91c7c44 100644 Binary files a/buffyboard/screenshots/breezy-dark-768x1024.png and b/buffyboard/screenshots/breezy-dark-768x1024.png differ diff --git a/buffyboard/screenshots/breezy-dark-800x480.png b/buffyboard/screenshots/breezy-dark-800x480.png index fcacd56..db30940 100644 Binary files a/buffyboard/screenshots/breezy-dark-800x480.png and b/buffyboard/screenshots/breezy-dark-800x480.png differ diff --git a/buffyboard/screenshots/breezy-dark-960x540.png b/buffyboard/screenshots/breezy-dark-960x540.png index a212ec9..8697929 100644 Binary files a/buffyboard/screenshots/breezy-dark-960x540.png and b/buffyboard/screenshots/breezy-dark-960x540.png differ diff --git a/buffyboard/screenshots/breezy-light-1024x768.png b/buffyboard/screenshots/breezy-light-1024x768.png index 20086dd..48370e3 100644 Binary files a/buffyboard/screenshots/breezy-light-1024x768.png and b/buffyboard/screenshots/breezy-light-1024x768.png differ diff --git a/buffyboard/screenshots/breezy-light-1280x800.png b/buffyboard/screenshots/breezy-light-1280x800.png index 3512b60..a4b2c18 100644 Binary files a/buffyboard/screenshots/breezy-light-1280x800.png and b/buffyboard/screenshots/breezy-light-1280x800.png differ diff --git a/buffyboard/screenshots/breezy-light-1440x720.png b/buffyboard/screenshots/breezy-light-1440x720.png index af009a4..07a46f3 100644 Binary files a/buffyboard/screenshots/breezy-light-1440x720.png and b/buffyboard/screenshots/breezy-light-1440x720.png differ diff --git a/buffyboard/screenshots/breezy-light-1920x1080.png b/buffyboard/screenshots/breezy-light-1920x1080.png index 70a9531..7c792b4 100644 Binary files a/buffyboard/screenshots/breezy-light-1920x1080.png and b/buffyboard/screenshots/breezy-light-1920x1080.png differ diff --git a/buffyboard/screenshots/breezy-light-480x800.png b/buffyboard/screenshots/breezy-light-480x800.png index ab77dfe..4913f20 100644 Binary files a/buffyboard/screenshots/breezy-light-480x800.png and b/buffyboard/screenshots/breezy-light-480x800.png differ diff --git a/buffyboard/screenshots/breezy-light-540x960.png b/buffyboard/screenshots/breezy-light-540x960.png index 4d4e049..a9a9762 100644 Binary files a/buffyboard/screenshots/breezy-light-540x960.png and b/buffyboard/screenshots/breezy-light-540x960.png differ diff --git a/buffyboard/screenshots/breezy-light-768x1024.png b/buffyboard/screenshots/breezy-light-768x1024.png index a7ae780..a9713a4 100644 Binary files a/buffyboard/screenshots/breezy-light-768x1024.png and b/buffyboard/screenshots/breezy-light-768x1024.png differ diff --git a/buffyboard/screenshots/breezy-light-800x480.png b/buffyboard/screenshots/breezy-light-800x480.png index 5f5eb02..fb885d1 100644 Binary files a/buffyboard/screenshots/breezy-light-800x480.png and b/buffyboard/screenshots/breezy-light-800x480.png differ diff --git a/buffyboard/screenshots/breezy-light-960x540.png b/buffyboard/screenshots/breezy-light-960x540.png index b1498ec..7f3f4e7 100644 Binary files a/buffyboard/screenshots/breezy-light-960x540.png and b/buffyboard/screenshots/breezy-light-960x540.png differ diff --git a/buffyboard/screenshots/nord-dark-1024x768.png b/buffyboard/screenshots/nord-dark-1024x768.png new file mode 100644 index 0000000..f5d74ac Binary files /dev/null and b/buffyboard/screenshots/nord-dark-1024x768.png differ diff --git a/buffyboard/screenshots/nord-dark-1280x800.png b/buffyboard/screenshots/nord-dark-1280x800.png new file mode 100644 index 0000000..c9971df Binary files /dev/null and b/buffyboard/screenshots/nord-dark-1280x800.png differ diff --git a/buffyboard/screenshots/nord-dark-1440x720.png b/buffyboard/screenshots/nord-dark-1440x720.png new file mode 100644 index 0000000..774b84a Binary files /dev/null and b/buffyboard/screenshots/nord-dark-1440x720.png differ diff --git a/buffyboard/screenshots/nord-dark-1920x1080.png b/buffyboard/screenshots/nord-dark-1920x1080.png new file mode 100644 index 0000000..8708509 Binary files /dev/null and b/buffyboard/screenshots/nord-dark-1920x1080.png differ diff --git a/buffyboard/screenshots/nord-dark-480x800.png b/buffyboard/screenshots/nord-dark-480x800.png new file mode 100644 index 0000000..b12d101 Binary files /dev/null and b/buffyboard/screenshots/nord-dark-480x800.png differ diff --git a/buffyboard/screenshots/nord-dark-540x960.png b/buffyboard/screenshots/nord-dark-540x960.png new file mode 100644 index 0000000..4834945 Binary files /dev/null and b/buffyboard/screenshots/nord-dark-540x960.png differ diff --git a/buffyboard/screenshots/nord-dark-768x1024.png b/buffyboard/screenshots/nord-dark-768x1024.png new file mode 100644 index 0000000..3ee3536 Binary files /dev/null and b/buffyboard/screenshots/nord-dark-768x1024.png differ diff --git a/buffyboard/screenshots/nord-dark-800x480.png b/buffyboard/screenshots/nord-dark-800x480.png new file mode 100644 index 0000000..688119c Binary files /dev/null and b/buffyboard/screenshots/nord-dark-800x480.png differ diff --git a/buffyboard/screenshots/nord-dark-960x540.png b/buffyboard/screenshots/nord-dark-960x540.png new file mode 100644 index 0000000..ceccbac Binary files /dev/null and b/buffyboard/screenshots/nord-dark-960x540.png differ diff --git a/buffyboard/screenshots/nord-light-1024x768.png b/buffyboard/screenshots/nord-light-1024x768.png new file mode 100644 index 0000000..6e041cd Binary files /dev/null and b/buffyboard/screenshots/nord-light-1024x768.png differ diff --git a/buffyboard/screenshots/nord-light-1280x800.png b/buffyboard/screenshots/nord-light-1280x800.png new file mode 100644 index 0000000..a1c3918 Binary files /dev/null and b/buffyboard/screenshots/nord-light-1280x800.png differ diff --git a/buffyboard/screenshots/nord-light-1440x720.png b/buffyboard/screenshots/nord-light-1440x720.png new file mode 100644 index 0000000..4f1652f Binary files /dev/null and b/buffyboard/screenshots/nord-light-1440x720.png differ diff --git a/buffyboard/screenshots/nord-light-1920x1080.png b/buffyboard/screenshots/nord-light-1920x1080.png new file mode 100644 index 0000000..514f1b1 Binary files /dev/null and b/buffyboard/screenshots/nord-light-1920x1080.png differ diff --git a/buffyboard/screenshots/nord-light-480x800.png b/buffyboard/screenshots/nord-light-480x800.png new file mode 100644 index 0000000..ed43e58 Binary files /dev/null and b/buffyboard/screenshots/nord-light-480x800.png differ diff --git a/buffyboard/screenshots/nord-light-540x960.png b/buffyboard/screenshots/nord-light-540x960.png new file mode 100644 index 0000000..e28463d Binary files /dev/null and b/buffyboard/screenshots/nord-light-540x960.png differ diff --git a/buffyboard/screenshots/nord-light-768x1024.png b/buffyboard/screenshots/nord-light-768x1024.png new file mode 100644 index 0000000..5396101 Binary files /dev/null and b/buffyboard/screenshots/nord-light-768x1024.png differ diff --git a/buffyboard/screenshots/nord-light-800x480.png b/buffyboard/screenshots/nord-light-800x480.png new file mode 100644 index 0000000..26b0a8d Binary files /dev/null and b/buffyboard/screenshots/nord-light-800x480.png differ diff --git a/buffyboard/screenshots/nord-light-960x540.png b/buffyboard/screenshots/nord-light-960x540.png new file mode 100644 index 0000000..bcc725f Binary files /dev/null and b/buffyboard/screenshots/nord-light-960x540.png differ diff --git a/buffyboard/screenshots/pmos-dark-1024x768.png b/buffyboard/screenshots/pmos-dark-1024x768.png index 345f101..31ec6b1 100644 Binary files a/buffyboard/screenshots/pmos-dark-1024x768.png and b/buffyboard/screenshots/pmos-dark-1024x768.png differ diff --git a/buffyboard/screenshots/pmos-dark-1280x800.png b/buffyboard/screenshots/pmos-dark-1280x800.png index 2d0730a..ad23809 100644 Binary files a/buffyboard/screenshots/pmos-dark-1280x800.png and b/buffyboard/screenshots/pmos-dark-1280x800.png differ diff --git a/buffyboard/screenshots/pmos-dark-1440x720.png b/buffyboard/screenshots/pmos-dark-1440x720.png index bc4bb26..5ddb528 100644 Binary files a/buffyboard/screenshots/pmos-dark-1440x720.png and b/buffyboard/screenshots/pmos-dark-1440x720.png differ diff --git a/buffyboard/screenshots/pmos-dark-1920x1080.png b/buffyboard/screenshots/pmos-dark-1920x1080.png index 776324a..402640c 100644 Binary files a/buffyboard/screenshots/pmos-dark-1920x1080.png and b/buffyboard/screenshots/pmos-dark-1920x1080.png differ diff --git a/buffyboard/screenshots/pmos-dark-480x800.png b/buffyboard/screenshots/pmos-dark-480x800.png index c24ff54..5299c65 100644 Binary files a/buffyboard/screenshots/pmos-dark-480x800.png and b/buffyboard/screenshots/pmos-dark-480x800.png differ diff --git a/buffyboard/screenshots/pmos-dark-540x960.png b/buffyboard/screenshots/pmos-dark-540x960.png index 66038a0..bf52274 100644 Binary files a/buffyboard/screenshots/pmos-dark-540x960.png and b/buffyboard/screenshots/pmos-dark-540x960.png differ diff --git a/buffyboard/screenshots/pmos-dark-768x1024.png b/buffyboard/screenshots/pmos-dark-768x1024.png index 955d72c..4930eee 100644 Binary files a/buffyboard/screenshots/pmos-dark-768x1024.png and b/buffyboard/screenshots/pmos-dark-768x1024.png differ diff --git a/buffyboard/screenshots/pmos-dark-800x480.png b/buffyboard/screenshots/pmos-dark-800x480.png index 88f1b0d..c9f8ec2 100644 Binary files a/buffyboard/screenshots/pmos-dark-800x480.png and b/buffyboard/screenshots/pmos-dark-800x480.png differ diff --git a/buffyboard/screenshots/pmos-dark-960x540.png b/buffyboard/screenshots/pmos-dark-960x540.png index fef8c52..fff86b2 100644 Binary files a/buffyboard/screenshots/pmos-dark-960x540.png and b/buffyboard/screenshots/pmos-dark-960x540.png differ diff --git a/buffyboard/screenshots/pmos-light-1024x768.png b/buffyboard/screenshots/pmos-light-1024x768.png index b36f894..85b0c22 100644 Binary files a/buffyboard/screenshots/pmos-light-1024x768.png and b/buffyboard/screenshots/pmos-light-1024x768.png differ diff --git a/buffyboard/screenshots/pmos-light-1280x800.png b/buffyboard/screenshots/pmos-light-1280x800.png index 3807bed..24f4553 100644 Binary files a/buffyboard/screenshots/pmos-light-1280x800.png and b/buffyboard/screenshots/pmos-light-1280x800.png differ diff --git a/buffyboard/screenshots/pmos-light-1440x720.png b/buffyboard/screenshots/pmos-light-1440x720.png index eabba07..1b45bf2 100644 Binary files a/buffyboard/screenshots/pmos-light-1440x720.png and b/buffyboard/screenshots/pmos-light-1440x720.png differ diff --git a/buffyboard/screenshots/pmos-light-1920x1080.png b/buffyboard/screenshots/pmos-light-1920x1080.png index 3ecc062..cd33f3e 100644 Binary files a/buffyboard/screenshots/pmos-light-1920x1080.png and b/buffyboard/screenshots/pmos-light-1920x1080.png differ diff --git a/buffyboard/screenshots/pmos-light-480x800.png b/buffyboard/screenshots/pmos-light-480x800.png index e90aaf4..337c1ab 100644 Binary files a/buffyboard/screenshots/pmos-light-480x800.png and b/buffyboard/screenshots/pmos-light-480x800.png differ diff --git a/buffyboard/screenshots/pmos-light-540x960.png b/buffyboard/screenshots/pmos-light-540x960.png index cdbe145..20da132 100644 Binary files a/buffyboard/screenshots/pmos-light-540x960.png and b/buffyboard/screenshots/pmos-light-540x960.png differ diff --git a/buffyboard/screenshots/pmos-light-768x1024.png b/buffyboard/screenshots/pmos-light-768x1024.png index 944c740..bce768e 100644 Binary files a/buffyboard/screenshots/pmos-light-768x1024.png and b/buffyboard/screenshots/pmos-light-768x1024.png differ diff --git a/buffyboard/screenshots/pmos-light-800x480.png b/buffyboard/screenshots/pmos-light-800x480.png index e67edf9..6c132fd 100644 Binary files a/buffyboard/screenshots/pmos-light-800x480.png and b/buffyboard/screenshots/pmos-light-800x480.png differ diff --git a/buffyboard/screenshots/pmos-light-960x540.png b/buffyboard/screenshots/pmos-light-960x540.png index 875d025..32e8958 100644 Binary files a/buffyboard/screenshots/pmos-light-960x540.png and b/buffyboard/screenshots/pmos-light-960x540.png differ diff --git a/shared/theme.c b/shared/theme.c index db9c8c1..cc5b7a0 100644 --- a/shared/theme.c +++ b/shared/theme.c @@ -285,7 +285,11 @@ static void apply_theme_cb(lv_theme_t *theme, lv_obj_t *obj) { return; } - if (lv_obj_check_type(obj, &lv_label_class) && (lv_obj_check_type(lv_obj_get_parent(obj), &lv_msgbox_class) || lv_obj_check_type(lv_obj_get_parent(obj), &lv_msgbox_content_class))) { + if (lv_obj_check_type(obj, &lv_label_class) && + (lv_obj_check_type(lv_obj_get_parent(obj), &lv_msgbox_class) + || lv_obj_check_type(lv_obj_get_parent(obj), &lv_msgbox_header_class) + || lv_obj_check_type(lv_obj_get_parent(obj), &lv_msgbox_content_class))) + { lv_obj_add_style(obj, &(styles.msgbox_label), 0); return; /* Inherit styling from message box */ } diff --git a/shared/themes.c b/shared/themes.c index e9ab2cb..ab34a4d 100644 --- a/shared/themes.c +++ b/shared/themes.c @@ -632,16 +632,344 @@ static const bbx_theme pmos_dark = { } }; +/* Nord themes (based on https://www.nordtheme.com/docs/colors-and-palettes) */ + +#define NORD0 0x2e3440 +#define NORD1 0x3b4252 +#define NORD2 0x434c5e +#define NORD3 0x4c566a +#define NORD4 0xd8dee9 +#define NORD5 0xe5e9f0 +#define NORD6 0xeceff4 +#define NORD7 0x8fbcbb +#define NORD8 0x88c0d0 +#define NORD9 0x81a1c1 +#define NORD10 0x5e81ac +#define NORD11 0xbf616a +#define NORD12 0xd08770 +#define NORD13 0xebcb8b +#define NORD14 0xa3be8c +#define NORD15 0xb48ead + +static const bbx_theme nord_light = { + .name = "nord-light", + .window = { + .bg_color = NORD6, + }, + .header = { + .bg_color = NORD4, + .border_width = 1, + .border_color = NORD4, + .pad = 20, + .gap = 10 + }, + .keyboard = { + .bg_color = NORD4, + .border_width = 1, + .border_color = NORD4, + .pad = 20, + .gap = 10, + .keys = { + .border_width = 1, + .corner_radius = 3, + .key_char = { + .normal = { + .fg_color = NORD0, + .bg_color = NORD9, + .border_color = NORD10 + }, + .pressed = { + .fg_color = NORD6, + .bg_color = NORD10, + .border_color = NORD10 + } + }, + .key_non_char = { + .normal = { + .fg_color = NORD0, + .bg_color = NORD8, + .border_color = NORD10 + }, + .pressed = { + .fg_color = NORD6, + .bg_color = NORD10, + .border_color = NORD10 + } + }, + .key_mod_act = { + .normal = { + .fg_color = NORD10, + .bg_color = 0xbed5da, + .border_color = 0x009900 + }, + .pressed = { + .fg_color = NORD6, + .bg_color = NORD10, + .border_color = NORD10 + } + }, + .key_mod_inact = { + .normal = { + .fg_color = NORD0, + .bg_color = NORD8, + .border_color = NORD10 + }, + .pressed = { + .fg_color = 0xf2f7f8, + .bg_color = 0x009900, + .border_color = 0x009900 + } + } + } + }, + .button = { + .border_width = 1, + .corner_radius = 3, + .pad = 8, + .normal = { + .fg_color = NORD0, + .bg_color = NORD8, + .border_color = NORD10 + }, + .pressed = { + .fg_color = NORD6, + .bg_color = NORD10, + .border_color = NORD10 + } + }, + .textarea = { + .fg_color = NORD0, + .bg_color = NORD5, + .border_width = 1, + .border_color = NORD0, + .corner_radius = 3, + .pad = 8, + .placeholder_color = NORD10, + .cursor = { + .width = 2, + .color = NORD0, + .period = 700 + } + }, + .dropdown = { + .button = { + .border_width = 1, + .corner_radius = 3, + .pad = 8, + .normal = { + .fg_color = NORD0, + .bg_color = NORD8, + .border_color = NORD10 + }, + .pressed = { + .fg_color = NORD6, + .bg_color = NORD10, + .border_color = NORD10 + } + }, + .list = { + .fg_color = NORD0, + .bg_color = NORD4, + .selection_fg_color = NORD6, + .selection_bg_color = NORD10, + .border_width = 1, + .border_color = NORD10, + .corner_radius = 0, + .pad = 8 + } + }, + .label = { + .fg_color = 0x070c0d + }, + .msgbox = { + .fg_color = NORD0, + .bg_color = NORD4, + .border_width = 1, + .border_color = NORD10, + .corner_radius = 3, + .pad = 20, + .gap = 20, + .dimming = { + .color = NORD0, + .opacity = 225 + } + }, + .bar = { + .border_width = 1, + .border_color = 0x009900, + .corner_radius = 3, + .indicator = { + .bg_color = 0x009900 + } + } +}; + +static const bbx_theme nord_dark = { + .name = "nord-dark", + .window = { + .bg_color = NORD0, + }, + .header = { + .bg_color = NORD1, + .border_width = 1, + .border_color = NORD2, + .pad = 20, + .gap = 10 + }, + .keyboard = { + .bg_color = NORD1, + .border_width = 1, + .border_color = NORD2, + .pad = 20, + .gap = 10, + .keys = { + .border_width = 1, + .corner_radius = 3, + .key_char = { + .normal = { + .fg_color = NORD0, + .bg_color = NORD9, + .border_color = NORD10 + }, + .pressed = { + .fg_color = NORD6, + .bg_color = NORD10, + .border_color = NORD10 + } + }, + .key_non_char = { + .normal = { + .fg_color = NORD0, + .bg_color = NORD8, + .border_color = NORD10 + }, + .pressed = { + .fg_color = NORD6, + .bg_color = NORD10, + .border_color = NORD10 + } + }, + .key_mod_act = { + .normal = { + .fg_color = NORD10, + .bg_color = 0xbed5da, + .border_color = 0x009900 + }, + .pressed = { + .fg_color = NORD6, + .bg_color = NORD10, + .border_color = NORD10 + } + }, + .key_mod_inact = { + .normal = { + .fg_color = NORD0, + .bg_color = NORD8, + .border_color = NORD10 + }, + .pressed = { + .fg_color = 0xf2f7f8, + .bg_color = 0x009900, + .border_color = 0x009900 + } + } + } + }, + .button = { + .border_width = 1, + .corner_radius = 3, + .pad = 8, + .normal = { + .fg_color = NORD0, + .bg_color = NORD8, + .border_color = NORD10 + }, + .pressed = { + .fg_color = NORD6, + .bg_color = NORD10, + .border_color = NORD10 + } + }, + .textarea = { + .fg_color = NORD6, + .bg_color = NORD2, + .border_width = 1, + .border_color = NORD4, + .corner_radius = 3, + .pad = 8, + .placeholder_color = NORD10, + .cursor = { + .width = 2, + .color = NORD4, + .period = 700 + } + }, + .dropdown = { + .button = { + .border_width = 1, + .corner_radius = 3, + .pad = 8, + .normal = { + .fg_color = NORD0, + .bg_color = NORD8, + .border_color = NORD10 + }, + .pressed = { + .fg_color = NORD6, + .bg_color = NORD10, + .border_color = NORD10 + } + }, + .list = { + .fg_color = NORD6, + .bg_color = NORD1, + .selection_fg_color = NORD6, + .selection_bg_color = NORD10, + .border_width = 1, + .border_color = NORD10, + .corner_radius = 0, + .pad = 8 + } + }, + .label = { + .fg_color = 0x070c0d + }, + .msgbox = { + .fg_color = NORD6, + .bg_color = NORD1, + .border_width = 1, + .border_color = NORD10, + .corner_radius = 3, + .pad = 20, + .gap = 20, + .dimming = { + .color = NORD0, + .opacity = 225 + } + }, + .bar = { + .border_width = 1, + .border_color = 0x009900, + .corner_radius = 3, + .indicator = { + .bg_color = 0x009900 + } + } +}; + + /** * Public interface */ -const int bbx_themes_num_themes = 4; +const int bbx_themes_num_themes = 6; const bbx_theme *bbx_themes_themes[] = { &breezy_light, &breezy_dark, &pmos_light, - &pmos_dark + &pmos_dark, + &nord_light, + &nord_dark, }; bbx_themes_theme_id_t bbx_themes_find_theme_with_name(const char *name) { diff --git a/unl0kr/regenerate-screenshots.sh b/unl0kr/regenerate-screenshots.sh index 01a87ac..28fc2da 100755 --- a/unl0kr/regenerate-screenshots.sh +++ b/unl0kr/regenerate-screenshots.sh @@ -2,8 +2,6 @@ # Change this depending on what device you're generating the screenshots on fb_res=1920x1080 -fb_depth=8 -fb_format=rgba executable=$1 outdir=screenshots @@ -14,6 +12,8 @@ themes=( breezy-dark pmos-light pmos-dark + nord-light + nord-dark ) resolutions=( @@ -79,14 +79,14 @@ for theme in ${themes[@]}; do readme="$readme"$'\n'"## $theme"$'\n\n' for res in ${resolutions[@]}; do - CRYPTTAB_SOURCE=/dev/sda1 $executable -g $res -C $config & + $executable -g $res -C $config & pid=$! sleep 3 # Wait for UI to render - cat /dev/fb0 > "$outdir/$theme-$res" - convert -size $fb_res -depth $fb_depth $fb_format:"$outdir/$theme-$res" -crop $res+0+0 "$outdir/$theme-$res.png" - rm "$outdir/$theme-$res" + ../../fbcat/fbcat /dev/fb0 > "$outdir/$theme-$res.ppm" + convert -size $fb_res "$outdir/$theme-$res.ppm" -crop $res+0+0 "$outdir/$theme-$res.png" + rm "$outdir/$theme-$res.ppm" kill -15 $pid readme="$readme\"$res\""$'\n' diff --git a/unl0kr/unl0kr.conf b/unl0kr/unl0kr.conf index 31307be..3edf4a1 100644 --- a/unl0kr/unl0kr.conf +++ b/unl0kr/unl0kr.conf @@ -13,8 +13,8 @@ obscured=true #bullet= [theme] -default=breezy-light -alternate=breezy-dark +default=nord-light +alternate=nord-dark #[input] #keyboard=false