Commit 862e9cfb authored by Robert Sprowson's avatar Robert Sprowson
Browse files

Correct the "initial font cache size" multiplier.

Rectangular pixel sprites added.

Version 0.08. Tagged as 'FontSetup-0_08'
parent b0ad6831
......@@ -95,8 +95,10 @@ install: ${FILES}
${CP} ${LDIR}.!Help ${INSTAPP}.!Help ${CPFLAGS}
${CP} ${LDIR}.!Run ${INSTAPP}.!Run ${CPFLAGS}
${CP} ${RDIR}.!RunImage ${INSTAPP}.!RunImage ${CPFLAGS}
${CP} ${RDIR}.!Sprites ${INSTAPP}.!Sprites ${CPFLAGS}
${CP} ${RDIR}.!Sprites22 ${INSTAPP}.!Sprites22 ${CPFLAGS}
${CP} ${LDIR}.Blank ${INSTAPP}.Blank ${CPFLAGS}
${CP} ${RDIR}.CoSprite ${INSTAPP}.CoSprite ${CPFLAGS}
${CP} ${RDIR}.CoSprite22 ${INSTAPP}.CoSprite22 ${CPFLAGS}
${CP} ${LDIR}.Messages ${INSTAPP}.Messages ${CPFLAGS}
${CP} ${LDIR}.Res ${INSTAPP}.Res ${CPFLAGS}
......
File added
File added
_TaskName:Fonts Setup
_Purpose:Configuring fonts
_Author: Acorn Computers Ltd, 1998
_Version:0.07 (19-Dec-02)
_Version:0.08 (22-Jan-03)
_ConfigText:Fonts
_ConfigHelp:Click SELECT to open the font configuration window.
_ConfigSprite:co_fonts
......
/* (0.07)
/* (0.08)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.68.
*
*/
#define Module_MajorVersion_CMHG 0.07
#define Module_MajorVersion_CMHG 0.08
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 19 Dec 2002
#define Module_Date_CMHG 22 Jan 2003
#define Module_MajorVersion "0.07"
#define Module_Version 7
#define Module_MajorVersion "0.08"
#define Module_Version 8
#define Module_MinorVersion ""
#define Module_Date "19 Dec 2002"
#define Module_Date "22 Jan 2003"
#define Module_ApplicationDate "19-Dec-02"
#define Module_ApplicationDate "22-Jan-03"
#define Module_ComponentName "FontSetup"
#define Module_ComponentPath "RiscOS/Sources/SystemRes/Configure2/PlugIns/FontSetup"
#define Module_FullVersion "0.07"
#define Module_HelpVersion "0.07 (19 Dec 2002)"
#define Module_LibraryVersionInfo "0:7"
#define Module_FullVersion "0.08"
#define Module_HelpVersion "0.08 (22 Jan 2003)"
#define Module_LibraryVersionInfo "0:8"
......@@ -53,7 +53,7 @@ const cmos cmos_details [7] = { { 0x8C, 1, 4 }, /* WimpFont */
{ 0xCB, 0, 8 }, /* FontMax3 EOR 24 */
{ 0xCC, 0, 8 }, /* FontMax4 */
{ 0xCD, 0, 8 }, /* FontMax5 */
{ 0x86, 0, 8 }, /* FontSize / fontstepsizeK */
{ 0x86, 0, 8 }, /* FontSize / 4 */
{ 0xC8, 0, 8 } }; /* FontMax / fontstepsizeK */
/* Global variables */
......@@ -63,7 +63,7 @@ unsigned int fontstepsize = 4;
Purpose: Different versions of the Font Manager module place different
interpretations upon the CMOS values for the configured font
cache size and maximum size. For example, versions < 3.42
maximum size. For example, versions < 3.42
multiply the stored value by 4 KB whereas versions >= 4.32
will multiply it by 64 KB.
In: -
......@@ -82,7 +82,7 @@ void setup_gadgets_by_fontmanager (void)
else
fontstepsize = 4;
throw (numberrange_set_bounds (0x7, mainwindow_id, mainwindow_cacheinit, 0, 255*fontstepsize, fontstepsize, 0));
throw (numberrange_set_bounds (0x7, mainwindow_id, mainwindow_cacheinit, 0, 255*4, 4, 0));
throw (numberrange_set_bounds (0x7, mainwindow_id, mainwindow_cachelimit, 0, 255*fontstepsize, fontstepsize, 0));
}
......@@ -148,7 +148,7 @@ void settings_read (int(*get)(cmos item, void *messages))
}
throw (numberrange_set_value (0, mainwindow_id, mainwindow_vertaa, fontmax5));
value = get (FontSize, &messages) * fontstepsize;
value = get (FontSize, &messages) * 4;
throw (numberrange_set_value (0, mainwindow_id, mainwindow_cacheinit, value));
value = get (FontMax, &messages) * fontstepsize;
......@@ -242,7 +242,7 @@ BOOL settings_write (void)
_swi (Font_SetFontMax, _INR(0,7), fontmax, fontmax1, fontmax2, fontmax3, fontmax4, fontmax5, 0, 0);
throw (numberrange_get_value (0, mainwindow_id, mainwindow_cacheinit, &fontsize));
cmos_write (FontSize, fontsize / fontstepsize );
cmos_write (FontSize, fontsize / 4 );
sprintf (string, "ChangeDynamicArea -FontSize %dK", fontsize);
_swix (OS_CLI, _IN(0), string);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment