From a1e222d156384332a510414d09101878ce0c2dc9 Mon Sep 17 00:00:00 2001
From: Ben Avison <bavison@gitlab.riscosopen.org>
Date: Fri, 28 Aug 1998 15:38:32 +0000
Subject: [PATCH] Window object gadgets now sorted in component order.
Bugfix: encoding information is no longer stored in Wimp$Font, so the alphabet
can be set independently.
---
History | 4 ++++
Resources/UK/Messages | 2 +-
Resources/UK/Res,fae | Bin 5844 -> 5844 bytes
c/Settings | 28 ++++++++++++++++++++++++++++
4 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/History b/History
index c8902b9..7eac3bd 100644
--- a/History
+++ b/History
@@ -12,3 +12,7 @@ Version Date Who Change
first Message_PlugInQuit
0.04 22/07/1998 BJGA "Desktop font" label was getting truncated when
NewHall.Bold was selected as the desktop font
+0.05 28/08/1998 BJGA Window object now sorted in component order.
+ Bugfix: encoding information is no longer
+ stored in Wimp$Font, so the alphabet can now be
+ set independently
diff --git a/Resources/UK/Messages b/Resources/UK/Messages
index e21c0d5..a028692 100644
--- a/Resources/UK/Messages
+++ b/Resources/UK/Messages
@@ -1,7 +1,7 @@
_TaskName:Fonts Setup
_Purpose:Configuring fonts
_Author:© Acorn Computers Ltd, 1998
-_Version:0.04 (22-Jul-98)
+_Version:0.05 (28-Aug-98)
_ConfigText:Fonts
_ConfigHelp:Click SELECT to open the font configuration window.
_ConfigSprite:co_fonts
diff --git a/Resources/UK/Res,fae b/Resources/UK/Res,fae
index 4236c3444e6003a84ec5ff4491cbe1bc37575108..144661216471983a82de2bc8f01a19c9ec34c1bb 100644
GIT binary patch
delta 1089
zcmXxjO-K}B7zgm@ot@c_nVlMQ8iQ<z>|=@i$hK0HvQ5c@l_%Lcg-M4H3rbijP&)L5
z<;nwn9m<1*bdUu*lofRF5Gk<-2@9hRLLZoQDl^Fbvpx+w{O13>yU)z~zOz&1Q{}m+
z;z_MkdqDhE+p0|vd!fzV4<g!uvrG{c!6h7oA>B8VD7{6=)_9NZaW>?bYc-;$D8146
zVaPXT5Kr)cUc$4X#LiTRXgdbaK>U<mP!%O%6fL7DBm<GpVSEBM=|mRq(~H?vj@gQI
z8`aM`w<+J4M?6_*omFwp7;&CcPIcN?zQt9Dqk&X{oZ#Xwo*HczU>rG%@elA+nBVEX
zeK|~&L);x%zGIo0!qs6^1|r<0``WDt-_TR0i^mIQ&=lo+hHtkZjvy|=Sm8m}7*2U8
zMsyI>R=7Hadxsin2-8dB-p8;YeXtngZ5TgWm_etJFkc}Bt^dUMwc(qZNz{)xVDeAH
zH--@R^K(_n&0)v<gj9#Y4Hj1@-`r*q4I)ljd{_C}dyB_ZHM^Q)uESh|FQ(&sQ}gY1
z#9(*6K%I|hTfA?$dW=f9O@tZ$-`xt$_b#9mtiTuyc11S+TKEyyTAOh8^1MAe+81wE
z{KWdsU6C%XwJZ5qw2reYYxsEaFTPlGh&^XybZJG2;(Spz_dCBw_paKgcqTH=W^5N{
zVl8~fJkN`<`#g?()V<W>VzIDJR0{E-ddZDqi_}j`&WMBJu=rApqgl|;6_aAU*dcZ<
z+e3X)$cxkBf*8C>xTN)BLTnY&Vn%!>j*GM6oao|R4*HcA?7@ts&?{aMhsB(j7hSy0
tg$821*eG_0!(vX%i__vqsH*TJI{pwr!?@@|tR~e+ZV;P;I$!q=`~&QLyD|U(
delta 1064
zcmYk)ZAep57zgm@zHQgD7w^=3A-NgKn!#w2gj6ikQ3OU3Q89ufB8cjvAZch&BGJo-
zC&DN)q5L3Wl728MFc=a^;0GgvAVCSSumU5CYW=T!g2u-0{LgdFbMIkiIzAmAwl%(>
zm#YCH>cuaqaoTcKN+Y_9IIr=b?&{w(eyK;-M;eIgjTGHOb^LcW+oBUK!!oQqig7(h
ztWEq&cT^uz4Q8iwo<O@dh}#eg3_j>{L*)k1KEyP%xy-kr_!vfGm|28=n8k;Pmn?V9
zS4=&@RGUeJZ?43awodObIjU{c`%T`jMR!i1xEb{yF!FC5#JkcsC8!qKXlrAl))QG-
zM3e9}4De&EQq5xIJ?)l{KWMJi?;|?Fuk;eG&|}JvSMyF)=jW@M8`^>R7O@nq!hF)G
zR8fq)gSFax!*H#3#B-~=r;M0dLGpH2=W)_-Ly0`1VZ>P&;J8_-K4P>NGj)p7rmH6v
zpEVn{K2o`DbMXJO9Ql*YE?{*J^v=78`Vj055TOx1JYl-3AMqMOBFIZ<+8E@p)u6hA
zxj*E2kc$mhO(MR>qQMYf@{RI>y2F`BhHnNAacjXIKIPQ#`A8%GEO5B0XbWE~>|<5f
z&Po4$u2!E%=ImV>&-v&1VSapMZMa0^Goc}Vm!ILq@UxKt$JIC%{Lbm3?oJ0sz-6FP
zu}<s|$Hf=og7`&ruz7XASOHO@l;kGyfXuf^?#kIoJyLieg;8-voRvD^+F?kx=s@p5
zwUW1s$Hmj)WpPTJ5m#32L<ihYuW?LFh|S`4@wWI>%!r@FWw8i1*6VjzY!SP}9&y++
ZfrVo-F(a1aj(ZKN#FW_N$ybVZ{{>9mxtRa}
diff --git a/c/Settings b/c/Settings
index a70a7fb..bd348c9 100644
--- a/c/Settings
+++ b/c/Settings
@@ -25,6 +25,8 @@ Date Who Change
27/05/1998 BJGA Initial faded-out values are now forcibly constrained
by "parent" fontmax setting
28/05/1998 BJGA Implemented settings_write
+28/08/1998 BJGA Strips encoding information from font identifier
+ returned by fontmenu_get_font()
\**************************************************************************/
@@ -142,6 +144,32 @@ BOOL settings_write (void)
char string [256];
throw (fontmenu_get_font (0, fontmenu_id, string, sizeof(string), NULL));
+ {
+ /* Strip out the encoding information ("\E" and/or "\e") */
+ const char *rd = string;
+ char *wr = string;
+ do
+ {
+ if (*rd == '\\' && (*(rd+1) == 'E' || *(rd+1) == 'e'))
+ {
+ /* Skip qualifier */
+ do
+ {
+ rd++;
+ }
+ while (*rd != '\\' && *rd >= ' ');
+ }
+ else
+ {
+ /* Copy byte down */
+ *wr = *rd;
+ rd++;
+ wr++;
+ }
+ }
+ while (*rd >= ' ');
+ *wr = '\0';
+ }
DeskFont_Set (status_file, string);
throw (numberrange_get_value (0, mainwindow_id, mainwindow_cachelimit, &fontmax));
--
GitLab