From d91cf5736e80b9a5b44bf6b8eb6be8a9cb6b0f8c Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Wed, 4 Jan 2017 10:31:53 -0600 Subject: [PATCH] With last changes the Tom Thumb 3x5 font is now 4x6 --- graphics/Kconfig | 8 ++++---- include/nuttx/nx/nxfonts.h | 10 +++++----- libnx/Makefile | 2 +- libnx/nxfonts/Make.defs | 6 +++--- libnx/nxfonts/Makefile.sources | 6 +++--- libnx/nxfonts/nxfonts_bitmaps.c | 2 +- libnx/nxfonts/nxfonts_getfont.c | 10 +++++----- ...nxfonts_tom-thumb-3x6.h => nxfonts_tom-thumb-4x6.h} | 8 ++++---- 8 files changed, 26 insertions(+), 26 deletions(-) rename libnx/nxfonts/{nxfonts_tom-thumb-3x6.h => nxfonts_tom-thumb-4x6.h} (99%) diff --git a/graphics/Kconfig b/graphics/Kconfig index b58b2c11ba..4347326f84 100644 --- a/graphics/Kconfig +++ b/graphics/Kconfig @@ -555,12 +555,12 @@ config NXFONT_X11_MISC_FIXED_10X20 This option enables support for a "x11-misc-fixed-10x20". (font ID FONTID_X11_MISC_FIXED_10X20 == 42). -config NXFONT_TOM_THUMB_3X6 - bool "Tom Thumb Monospace 3x6" +config NXFONT_TOM_THUMB_4X6 + bool "Tom Thumb Monospace 4x6" default n ---help--- - This option enables support for a small, 3x5 font. - (font ID FONTID_TOM_THUMB_3X6 == 43). + This option enables support for a small, 3x5 font (with blank space + padding to 4x6) (font ID FONTID_TOM_THUMB_4X6 == 43). endmenu diff --git a/include/nuttx/nx/nxfonts.h b/include/nuttx/nx/nxfonts.h index a7ba1a2318..aca51a0874 100644 --- a/include/nuttx/nx/nxfonts.h +++ b/include/nuttx/nx/nxfonts.h @@ -195,10 +195,10 @@ #elif defined(CONFIG_NXFONT_MONO5X8) # define NXFONT_DEFAULT FONTID_MONO5X8 -/* Tom Thumb mono-space 3x6 font */ +/* Tom Thumb mono-space 4x6 font */ -#elif defined(CONFIG_NXFONT_TOM_THUMB_3X6) -# define NXFONT_DEFAULT FONTID_TOM_THUMB_3X6 +#elif defined(CONFIG_NXFONT_TOM_THUMB_4X6) +# define NXFONT_DEFAULT FONTID_TOM_THUMB_4X6 #endif @@ -394,8 +394,8 @@ enum nx_fontid_e , FONTID_X11_MISC_FIXED_10X20 = 42 /* X11 misc fixed 10x20 */ #endif -#ifdef CONFIG_NXFONT_TOM_THUMB_3X6 - , FONTID_TOM_THUMB_3X6 = 43 /* Tom Thumb monospace 3x6 */ +#ifdef CONFIG_NXFONT_TOM_THUMB_4X6 + , FONTID_TOM_THUMB_4X6 = 43 /* Tom Thumb monospace 4x6 */ #endif }; diff --git a/libnx/Makefile b/libnx/Makefile index 20de21cb01..af0da579f4 100644 --- a/libnx/Makefile +++ b/libnx/Makefile @@ -225,7 +225,7 @@ ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_10X20),y) $(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=42 EXTRADEFINES=$(EXTRADEFINES) endif -ifeq ($(CONFIG_NXFONT_TOM_THUMB_3X6),y) +ifeq ($(CONFIG_NXFONT_TOM_THUMB_4X6),y) $(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=43 EXTRADEFINES=$(EXTRADEFINES) endif diff --git a/libnx/nxfonts/Make.defs b/libnx/nxfonts/Make.defs index 8d9c08af90..9403f08bdd 100644 --- a/libnx/nxfonts/Make.defs +++ b/libnx/nxfonts/Make.defs @@ -225,10 +225,10 @@ ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_10X20),y) CSRCS += nxfonts_bitmaps_x11-misc-fixed-10x20.c endif -# Tom Thumb mono-space 3x6 font +# Tom Thumb mono-space 4x6 font -ifeq ($(CONFIG_NXFONT_TOM_THUMB_3X6),y) -CSRCS += nxfonts_tom-thumb-3x6.c +ifeq ($(CONFIG_NXFONT_TOM_THUMB_4X6),y) +CSRCS += nxfonts_tom-thumb-4x6.c endif # Add the nxfont/ directory to the build diff --git a/libnx/nxfonts/Makefile.sources b/libnx/nxfonts/Makefile.sources index 3046fbe83b..5c079cddcc 100644 --- a/libnx/nxfonts/Makefile.sources +++ b/libnx/nxfonts/Makefile.sources @@ -296,11 +296,11 @@ NXFONTS_PREFIX := g_x11_misc_fixed_10x20_ GEN_CSRC = nxfonts_bitmaps_x11-misc-fixed-10x20.c endif -# Tom Thumb mono-space 3x6 font +# Tom Thumb mono-space 4x6 font ifeq ($(NXFONTS_FONTID),43) -NXFONTS_PREFIX := g_tom_thumb_3x6_ -GEN_CSRC = nxfonts_tom-thumb-3x6.c +NXFONTS_PREFIX := g_tom_thumb_4x6_ +GEN_CSRC = nxfonts_tom-thumb-4x6.c endif DEPENDENCY := nxfonts_bitmaps.c diff --git a/libnx/nxfonts/nxfonts_bitmaps.c b/libnx/nxfonts/nxfonts_bitmaps.c index 57ac0852a3..b9a6fc1ca4 100644 --- a/libnx/nxfonts/nxfonts_bitmaps.c +++ b/libnx/nxfonts/nxfonts_bitmaps.c @@ -131,7 +131,7 @@ #elif NXFONTS_FONTID == 42 # include "nxfonts_x11-misc-fixed-10x20.h" #elif NXFONTS_FONTID == 43 -# include "nxfonts_tom-thumb-3x6.h" +# include "nxfonts_tom-thumb-4x6.h" #else # error "No font ID specified" #endif diff --git a/libnx/nxfonts/nxfonts_getfont.c b/libnx/nxfonts/nxfonts_getfont.c index a3e034034a..afe0f7bc68 100644 --- a/libnx/nxfonts/nxfonts_getfont.c +++ b/libnx/nxfonts/nxfonts_getfont.c @@ -238,8 +238,8 @@ extern const struct nx_fontpackage_s g_x11_misc_fixed_9x18B_package; extern const struct nx_fontpackage_s g_x11_misc_fixed_10x20_package; #endif -#ifdef CONFIG_NXFONT_TOM_THUMB_3X6 -extern const struct nx_fontpackage_s g_tom_thumb_3x6_package; +#ifdef CONFIG_NXFONT_TOM_THUMB_4X6 +extern const struct nx_fontpackage_s g_tom_thumb_4x6_package; #endif static FAR const struct nx_fontpackage_s *g_fontpackages[] = @@ -426,10 +426,10 @@ static FAR const struct nx_fontpackage_s *g_fontpackages[] = &g_x11_misc_fixed_10x20_package, #endif -/* Tom Thumb mono-space 3x6 font */ +/* Tom Thumb mono-space 4x6 font */ -#ifdef CONFIG_NXFONT_TOM_THUMB_3X6 - &g_tom_thumb_3x6_package, +#ifdef CONFIG_NXFONT_TOM_THUMB_4X6 + &g_tom_thumb_4x6_package, #endif NULL diff --git a/libnx/nxfonts/nxfonts_tom-thumb-3x6.h b/libnx/nxfonts/nxfonts_tom-thumb-4x6.h similarity index 99% rename from libnx/nxfonts/nxfonts_tom-thumb-3x6.h rename to libnx/nxfonts/nxfonts_tom-thumb-4x6.h index a6a2f28d4d..dcd34efe97 100644 --- a/libnx/nxfonts/nxfonts_tom-thumb-3x6.h +++ b/libnx/nxfonts/nxfonts_tom-thumb-4x6.h @@ -1,5 +1,5 @@ /**************************************************************************** - * libnx/nxfonts/nxfonts_tom-thumb-3x6.h + * libnx/nxfonts/nxfonts_tom-thumb-4x6.h * * Copyright (C) 2017 Alan Carvalho de Assis. All rights reserved. * Author: Alan Carvalho de Assis @@ -36,8 +36,8 @@ * ****************************************************************************/ -#ifndef __LIBNX_NXFONTS_NXFONTS_TOM_THUMB_3X6_H -#define __LIBNX_NXFONTS_NXFONTS_TOM_THUMB_3X6_H +#ifndef __LIBNX_NXFONTS_NXFONTS_TOM_THUMB_4X6_H +#define __LIBNX_NXFONTS_NXFONTS_TOM_THUMB_4X6_H /**************************************************************************** * Included Files @@ -49,7 +49,7 @@ /* Font ID */ -#define NXFONT_ID FONTID_TOM_THUMB_3X6 +#define NXFONT_ID FONTID_TOM_THUMB_4X6 /* Ranges of 7-bit and 8-bit fonts */