Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-06 16:50:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

With last changes the Tom Thumb 3x5 font is now 4x6

Browse Source
This commit is contained in:
Gregory Nutt
2017-01-04 10:31:53 -06:00
parent 1ff532e484
commit d91cf5736e
8 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libnx/Makefile
+1 -1
View File
@@ -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
libnx/nxfonts/Make.defs
+3 -3
View File
@@ -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
libnx/nxfonts/Makefile.sources
+3 -3
View File
@@ -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
libnx/nxfonts/nxfonts_bitmaps.c
+1 -1
View File
@@ -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
libnx/nxfonts/nxfonts_getfont.c
+5 -5
View File
@@ -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
libnx/nxfonts/nxfonts_tom-thumb-3x6.h → libnx/nxfonts/nxfonts_tom-thumb-4x6.h
+4 -4
View File
@@ -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 <acassis@gmail.com>
@@ -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 */