From e3a3aa376e03a6e8891241a820e09a1ca1ae867b Mon Sep 17 00:00:00 2001 From: "Rich O." Date: Tue, 3 Nov 2026 10:48:53 -0500 Subject: [PATCH] palm-client: new-message alert lists the count per conversation; icon from meshcore-visor-hair-1.png Checks add the messages they pulled (outside muted channels) to a pending table in unsaved prefs, with names looked up while they have globals; the display launch lists up to five conversations and 'N more elsewhere'. make_icon.sh takes a PNG and thresholds the 1-bit icons instead of dithering. --- palm-client/resources/icon/large1.bmp | Bin 150 -> 150 bytes palm-client/resources/icon/large4.bmp | Bin 470 -> 470 bytes palm-client/resources/icon/large8.bmp | Bin 1782 -> 1782 bytes palm-client/resources/icon/small1.bmp | Bin 98 -> 98 bytes palm-client/resources/icon/small4.bmp | Bin 190 -> 190 bytes palm-client/resources/icon/small8.bmp | Bin 1222 -> 1222 bytes palm-client/src/bgcheck.c | 157 ++++++++++++++++++++------ palm-client/src/bgcheck.h | 3 +- palm-client/tools/make_icon.sh | 17 +-- 9 files changed, 134 insertions(+), 43 deletions(-) diff --git a/palm-client/resources/icon/large1.bmp b/palm-client/resources/icon/large1.bmp index 6d00430abf439ccf97d5de7e6e341a3550ef91d3..110c1dc1065c945c4d5217918ded2e5b0a90c28a 100644 GIT binary patch literal 150 zcmZ{a%?&_M5QHB^I6IQ4!4r3PO{ihJ(3k>5AF`iWFOFvO&FtU2?5Su}bfOiFs8pf# k^KA<~ALzcrD*0e-(eYfFb7A;fd7{!sesbIr1B&B&c}9_Q?B qzF}D;y&~yL6sIgw|HC#ZiOI)?WU^16qW3(H$@5Z~F6ru(=0ZP}{FK`O literal 470 zcmZ?ry~fA@24z4}1BexXSPY068CZZM149B-9>f-aVo6C!23=iUhQh)^hTz~}hKUm= zGHl(tmErX1(+vOr|7ZC7_b8P)RuoWPUS0|nU`z*cfS?Gbz#Rvl z#mU7QVk zV+c@Eg~+G4hK7c^xHu_kL-<>PTrh}2<7Yzn)6$^w=@5SPvaqz&u&~gy?GS!>RmQ5V UyR*_}wL|&k?d8*!m+uDi092WjV*mgE diff --git a/palm-client/resources/icon/large8.bmp b/palm-client/resources/icon/large8.bmp index 1940e1c37f48e9fec5d309b4d1f438305414fb79..57b84df3ceb6a4fb7e7b22d4fe188d5942f0f8c3 100644 GIT binary patch literal 1782 zcmeH{FOTX#5Wt7Fw6wI3(*G^pZfUo)*AMW-$#?di;R}%9QD__ri$vl`P&fp60)@cf zNKiN&h6HhUuW*RMsh2!?lg!L!e>=0Yv&sDWePZD%KN)}|Tltw9nHHdwS%5#()qR>m z<}P}1g#u6%1uV;gBuO9$0w{_ChG76g2$Cd$=jUg5d3k}?*H>sZo6u^tpxtgmr_+I6 zuLs?37yA7^3 z!-bUfkDU6UN)=Tumj$U(tuSBW8AmQV72Wh|w&iKXFC6r$XeqjhRAgd$F2a@pp!#|4UJI8OBLK0u;x zqx$v@G%Gs!c)Lhv`7>de+sUGu=bmoYJXFUXc3e}HMV=MHJP)F<(FkHf;vh-GnACkM z%5xI>5eegvJk^uvdaj=4d5V!wyvX+(I3hR>aO1B0I1ZyA@O_LUgo7Fh5hnTY%bMUc ZYJ@>R{47lxJw5XHvXi1HPU0|E`(Fdkk|F>A literal 1782 zcmeHHTT2vS7=G5BT%Fz3S=U{2#+lu99A{@|a(4T6XU7NvNfM$938WyrD6zT;sv9qY zAgGHp0_hBaPz2G52qWl>(upXjtf=TJQc{A@3cRszR;5|@FZl4i2fpWd-*@J{_}Vu8 zDMtYo10-n{rxvB=K?U`|qq0JncODw3>3l7cbv0;?RD;MOT6Gmoi40_+5vJ9Nmew6u z)6s{njT^9MdpGv&-ie+qo6&A%5LhH);~k2<2f3--lD$q6`Hq=A-U@_QoY|{ z?w^L(^8wkxZ&-VI0@lf|XuCa$_B&H(zxNAW*T>QO@CUY@_=LTqlgJMY@{jG^eP#uoE( z6UShMucETD!slZcFuql$dqJkaaa^RXfC$I=%DD#F&A0F?ixA<2qWZ?VXgFN!ARMM` zsFp9{TSB2wjRP91t3#pMaJ13g-{g5-D1at>v_4!DX?64Im>849m?+Umk0=On%gyH` zK@#b`7!wLQF(%t?-j?NrAWEX-=mbYs^m+Mw&Q42d*)+v?LNX=EOyu0(!0-!7{|C`^3=IGOF)#oC7Ge%O diff --git a/palm-client/resources/icon/small4.bmp b/palm-client/resources/icon/small4.bmp index 7448bc00a102e7c9a7713f90241348deaedd324f..4d9f19301d23a7efcc6959d114a73e9d8e2d2967 100644 GIT binary patch delta 125 zcmdnTxQ}synK};-4}*q=218(AAVXeW9>a_oGZ?zMx)?TY+{p0%|9^&GzkV@1fBt-8 zqUgi|7LW201_p-o@`CbGB_%_5AYEeW;smBcT!X>1pr9a#E&{4E2hwF}Y0lw5x^m{s OnbU!E1(0qpF8}~!jxa$0 delta 126 zcmdnTxQ}synRaPuDMNaCIzvcE2!ph=G{cM;GZ=b%dl^=*Ud?dj$`ywH|Nk@m`0<0` z<;#~76Gc5bT8xd2GddbNS``_XJb-iytD7U34s&q;iMJ>+D1rE`3=9k)y3H-c6(rtX Ro|aYtq&rrXSIy{X006_(G=%^F diff --git a/palm-client/resources/icon/small8.bmp b/palm-client/resources/icon/small8.bmp index eef5ab5b8e68416599e230f239b46c6284415882..aa6187de1eaf6655555e081cff24193dfe33c3fb 100644 GIT binary patch literal 1222 zcmeH@%}N4s6vdDIt#LkWD*JA7w3=zkNz0slpu0eDsV^Xi58zUlf`+0XqTtT0Zgt&* z_=yYMiwhfu2BK&1!nybS?p@vU@%in9RS|QlrgNL3O*!DQ_Fq>2Z4T=ILI@~|0!`Ck z7zQlMg5x;wJP$z-Ac`U+NrEiPP!t8KszTE==(>(*G>TX(hIl-VL?VG?GKo|wg>*WN zOeTYDHj7*?hkQPdLZN_Sv4~QsgmSrzN~MBowTfD;hI+k@Mx%jdvx!!#g?77*PN#!z zw~Jn{hkn10!C-*laEQ@pgzmuBK{omhgF@^b2DSW~49=;W8JueFGnmYL%%I=%fFWnjR)&Cy z_Zh-x9bxd<{e~fA?;D2jrOz4C<~(IcI{1d6qppf!=EOdRnNz1QESfc)Va3Av46Bzc zVpx9bGsE@=Ul^{w{lW16|9^%LKmH)QZj?P50;3^7hY(OyRFnc+!zc@6Dl!1EBnvAW zn*_5oj4vf2DJ?6*ir`Di%1BE~z|{+}bMWx6GYP=d^Kx-=a&mDA!uXversion == VM_BG_PENDING_VERSION; +} + +static void SavePending(BgPending *pend) +{ + pend->version = VM_BG_PENDING_VERSION; + PrefSetAppPreferences(VM_CREATOR, VM_BG_PENDING_ID, VM_BG_PENDING_VERSION, pend, sizeof(*pend), false); +} + +static void ClearPending(void) +{ + BgPending pend; + + MemSet(&pend, sizeof(pend), 0); + SavePending(&pend); +} + void BgSchedule(void) { UInt16 minutes = BgInterval(); @@ -120,7 +170,7 @@ void BgAlarmTriggered(SysAlarmTriggeredParamType *p) { UInt16 card; LocalID id; - UInt32 open, shown = 0, result; + UInt32 open, result; UInt16 kinds = 0; Err err; @@ -136,57 +186,92 @@ void BgAlarmTriggered(SysAlarmTriggeredParamType *p) WriteStatus(VM_BG_LAUNCH_ERR, err, 0); if (err != errNone || !kinds) return; - FtrGet(VM_CREATOR, VM_FTR_BG_KINDS, &shown); - FtrSet(VM_CREATOR, VM_FTR_BG_KINDS, shown | kinds); p->purgeAlarm = false; /* the system sends sysAppLaunchCmdDisplayAlarm next */ } -/* One line per kind, in priority order. A switch, not a table: a pointer table needs globals. */ -static void AppendKind(Char *text, UInt8 kind) -{ - const Char *name; - - switch (kind) { - case VM_SND_DIRECT: name = "Direct message"; break; - case VM_SND_MENTION: name = "Mention of you"; break; - case VM_SND_ROOM: name = "Room post"; break; - case VM_SND_PRIVATE: name = "Private channel"; break; - case VM_SND_HASHTAG: name = "Hashtag channel"; break; - case VM_SND_PUBLIC: name = "Public channel"; break; - case VM_SND_CONTACT: name = "New contact"; break; - default: return; - } - if (text[0]) - StrCat(text, "\n"); - StrCat(text, name); -} - void BgDisplayAlarm(void) { - UInt32 kinds = 0; - UInt16 card; + BgPending pend; + UInt16 card, i; LocalID id; - UInt8 kind; - Char text[VM_SND_COUNT * 17]; + Char text[24 + VM_BG_PENDING_MAX * (VM_BG_NAME_LEN + 9) + 24]; - if (FtrGet(VM_CREATOR, VM_FTR_BG_KINDS, &kinds) != errNone || !kinds) + if (!LoadPending(&pend) || !pend.total) return; - FtrUnregister(VM_CREATOR, VM_FTR_BG_KINDS); - text[0] = 0; - for (kind = 0; kind < VM_SND_COUNT; kind++) - if (kinds & (1 << kind)) - AppendKind(text, kind); + ClearPending(); + StrIToA(text, pend.total); + StrCat(text, pend.total == 1 ? " new message" : " new messages"); + for (i = 0; i < pend.n; i++) { + StrCat(text, "\n"); + StrCat(text, pend.convs[i].name); + StrCat(text, ": "); + StrIToA(text + StrLen(text), pend.convs[i].count); + } + if (pend.more) { + StrCat(text, "\n"); + StrIToA(text + StrLen(text), pend.more); + StrCat(text, " more elsewhere"); + } if (FrmCustomAlert(BgNewAlert, text, "", "") == 0 && FindSelf(&card, &id)) SysUIAppSwitch(card, id, sysAppLaunchCmdNormalLaunch, NULL); } +/* ---- with globals (VM_LAUNCH_BGCHECK) ---- */ + +static void CountConv(BgPending *pend, const VmConv *conv) +{ + UInt16 i; + + pend->total++; + for (i = 0; i < pend->n; i++) + if (ConvEqual(&pend->convs[i].conv, conv)) { + pend->convs[i].count++; + return; + } + if (pend->n == VM_BG_PENDING_MAX) { + pend->more++; + return; + } + pend->convs[i].conv = *conv; + pend->convs[i].count = 1; + ConvName(conv, pend->convs[i].name, sizeof(pend->convs[i].name)); + pend->n++; +} + +/* Adds the messages received since 'since' (outside muted channels) to what the alert will list. */ +static void AddPending(UInt32 since) +{ + BgPending pend; + const VmMsgHeader *h; + VmChannel ch; + UInt16 i; + Boolean newer; + + if (!LoadPending(&pend)) + MemSet(&pend, sizeof(pend), 0); + for (i = MessagesCount(); i-- > 0; ) { + h = MessagesLock(i); + if (!h) + continue; + newer = h->received >= since; + if (newer && h->dir == VM_DIR_IN && + !(h->conv.type == VM_CONV_CHANNEL && ChannelsFindSlot(h->conv.channel, &ch) && ChannelMuted(&ch))) + CountConv(&pend, &h->conv); + MessagesRelease(i); + if (!newer) + break; /* records are in arrival order */ + } + SavePending(&pend); +} + UInt16 BgCheckRun(void) { UInt16 kinds, n; - + UInt32 start; Err err; AppLoadPrefs(); + start = SessionNow(); err = SessionConnectLight(); if (err == errNone) { for (n = 0; n < VM_BG_SYNC_ROUNDS && SessionMessageWaiting(); n++) @@ -195,6 +280,8 @@ UInt16 BgCheckRun(void) } kinds = SessionTakeSounds() & SoundsEnabledKinds(); SoundsNotify(kinds, NULL); + if (kinds) + AddPending(start); WriteStatus(err == errNone ? VM_BG_DONE : VM_BG_NO_RADIO, err, kinds); ContactsClose(); ChannelsClose(); diff --git a/palm-client/src/bgcheck.h b/palm-client/src/bgcheck.h index 2a9f7ea..f383e75 100644 --- a/palm-client/src/bgcheck.h +++ b/palm-client/src/bgcheck.h @@ -5,7 +5,8 @@ * BgAlarmTriggered sublaunches the app again with new globals * (VM_LAUNCH_BGCHECK). That launch connects, pulls what the radio queued, * and plays the notification sound. If anything new arrived, the alarm stays - * for display, and BgDisplayAlarm shows an alert with an Open button. + * for display, and BgDisplayAlarm shows an alert with the count per + * conversation and an Open button. * * While the app is open it checks for itself: the alarm keeps coming and is * skipped. diff --git a/palm-client/tools/make_icon.sh b/palm-client/tools/make_icon.sh index fd6ff85..2adff48 100755 --- a/palm-client/tools/make_icon.sh +++ b/palm-client/tools/make_icon.sh @@ -1,22 +1,25 @@ #!/bin/sh -# Renders the app icon BMPs in resources/icon/ from the SVG (needs rsvg-convert -# and ImageMagick: brew install librsvg imagemagick). The BMPs are committed, so +# Renders the app icon BMPs in resources/icon/ from an SVG or PNG (needs +# ImageMagick, and rsvg-convert for SVG: brew install librsvg imagemagick). The BMPs are committed, so # the build itself doesn't need these tools. # -# tools/make_icon.sh [icon.svg] +# tools/make_icon.sh [icon.svg|icon.png] # -# Large icon 32x22 and small (list view) 15x9, each at 1 bit (ordered dither), +# Large icon 32x22 and small (list view) 15x9, each at 1 bit (threshold 85%: keeps line art's thin strokes), # 4 bits (16 grays: the Visor Neo) and 8 bits (colour; pilrc maps it to the # Palm palette). White is transparent. set -e cd "$(dirname "$0")/.." -SVG="${1:-../meshcore-visor-hair.svg}" +SRC="${1:-../meshcore-visor-hair-1.png}" OUT=resources/icon TMP=$(mktemp -d) trap 'rm -rf "$TMP"' EXIT mkdir -p "$OUT" -rsvg-convert -w 512 -h 512 "$SVG" -o "$TMP/full.png" +case "$SRC" in +*.svg) rsvg-convert -w 512 -h 512 "$SRC" -o "$TMP/full.png" ;; +*) magick "$SRC" -background white -alpha remove "$TMP/full.png" ;; +esac magick "$TMP/full.png" -trim +repage "$TMP/trim.png" for spec in large:32x22 small:15x9; do @@ -24,7 +27,7 @@ for spec in large:32x22 small:15x9; do size=${spec#*:} magick "$TMP/trim.png" -resize "$size" -background white -gravity center -extent "$size" \ -alpha remove "$TMP/$name.png" - magick "$TMP/$name.png" -colorspace Gray -ordered-dither o2x2 -threshold 50% -type Bilevel -compress None "BMP3:$OUT/${name}1.bmp" + magick "$TMP/$name.png" -colorspace Gray -threshold 85% -type Bilevel -compress None "BMP3:$OUT/${name}1.bmp" magick "$TMP/$name.png" -colorspace Gray -dither None -colors 16 -type Palette -compress None "BMP3:$OUT/${name}4.bmp" magick "$TMP/$name.png" -dither None -colors 64 -type Palette -compress None "BMP3:$OUT/${name}8.bmp" done