mirror of
https://github.com/apache/nuttx.git
synced 2026-05-18 17:18:28 +08:00
Lots of fonts that derive from X11-misc-fixed-* fonts. Converted for use by NuttX by Pierre-Noel Bouteville
This commit is contained in:
Gregory Nutt
@@ -369,6 +369,160 @@ config NXFONT_PIXEL_LCD_MACHINE
|
||||
This option enables support for a small LCD, The "Pixel lcd machine"
|
||||
(font ID FONTID_PIXEL_LCD_MACHINE == 20).
|
||||
|
||||
config NXFONT_X11_MISC_FIXED_4X6
|
||||
bool "x11 misc fixed 4x6"
|
||||
default n
|
||||
---help---
|
||||
This option enables support for a "x11-misc-fixed-4x6".
|
||||
(font ID FONTID_X11_MISC_FIXED_4X6 == 21).
|
||||
|
||||
config NXFONT_X11_MISC_FIXED_5X7
|
||||
bool "x11 misc fixed 5x7"
|
||||
default n
|
||||
---help---
|
||||
This option enables support for a "x11-misc-fixed-5x7".
|
||||
(font ID FONTID_X11_MISC_FIXED_5X7 == 22).
|
||||
|
||||
config NXFONT_X11_MISC_FIXED_5X8
|
||||
bool "x11 misc fixed 5x8"
|
||||
default n
|
||||
---help---
|
||||
This option enables support for a "x11-misc-fixed-5x8".
|
||||
(font ID FONTID_X11_MISC_FIXED_5X8 == 23).
|
||||
|
||||
config NXFONT_X11_MISC_FIXED_6X9
|
||||
bool "x11 misc fixed 6x9"
|
||||
default n
|
||||
---help---
|
||||
This option enables support for a "x11-misc-fixed-6x9".
|
||||
(font ID FONTID_X11_MISC_FIXED_6X9 == 24).
|
||||
|
||||
config NXFONT_X11_MISC_FIXED_6X10
|
||||
bool "x11 misc fixed 6x10"
|
||||
default n
|
||||
---help---
|
||||
This option enables support for a "x11-misc-fixed-6x10".
|
||||
(font ID FONTID_X11_MISC_FIXED_6X10 == 25).
|
||||
|
||||
config NXFONT_X11_MISC_FIXED_6X12
|
||||
bool "x11 misc fixed 6x12"
|
||||
default n
|
||||
---help---
|
||||
This option enables support for a "x11-misc-fixed-6x12".
|
||||
(font ID FONTID_X11_MISC_FIXED_6X12 == 26).
|
||||
|
||||
config NXFONT_X11_MISC_FIXED_6X13
|
||||
bool "x11 misc fixed 6x13"
|
||||
default n
|
||||
---help---
|
||||
This option enables support for a "x11-misc-fixed-6x13".
|
||||
(font ID FONTID_X11_MISC_FIXED_6X13 == 27).
|
||||
|
||||
config NXFONT_X11_MISC_FIXED_6X13B
|
||||
bool "x11 misc fixed 6x13B"
|
||||
default n
|
||||
---help---
|
||||
This option enables support for a "x11-misc-fixed-6x13B".
|
||||
(font ID FONTID_X11_MISC_FIXED_6X13B == 28).
|
||||
|
||||
config NXFONT_X11_MISC_FIXED_6X13O
|
||||
bool "x11 misc fixed 6x13O"
|
||||
default n
|
||||
---help---
|
||||
This option enables support for a "x11-misc-fixed-6x13O".
|
||||
(font ID FONTID_X11_MISC_FIXED_6X13O == 29).
|
||||
|
||||
config NXFONT_X11_MISC_FIXED_7X13
|
||||
bool "x11 misc fixed 7x13"
|
||||
default n
|
||||
---help---
|
||||
This option enables support for a "x11-misc-fixed-7x13".
|
||||
(font ID FONTID_X11_MISC_FIXED_7X13 == 30).
|
||||
|
||||
config NXFONT_X11_MISC_FIXED_7X13B
|
||||
bool "x11 misc fixed 7x13B"
|
||||
default n
|
||||
---help---
|
||||
This option enables support for a "x11-misc-fixed-7x13B".
|
||||
(font ID FONTID_X11_MISC_FIXED_7X13B == 31).
|
||||
|
||||
config NXFONT_X11_MISC_FIXED_7X13O
|
||||
bool "x11 misc fixed 7x13O"
|
||||
default n
|
||||
---help---
|
||||
This option enables support for a "x11-misc-fixed-7x13O".
|
||||
(font ID FONTID_X11_MISC_FIXED_7X13O == 32).
|
||||
|
||||
config NXFONT_X11_MISC_FIXED_7X14
|
||||
bool "x11 misc fixed 7x14"
|
||||
default n
|
||||
---help---
|
||||
This option enables support for a "x11-misc-fixed-7x14".
|
||||
(font ID FONTID_X11_MISC_FIXED_7X14 == 33).
|
||||
|
||||
config NXFONT_X11_MISC_FIXED_7X14B
|
||||
bool "x11 misc fixed 7x14B"
|
||||
default n
|
||||
---help---
|
||||
This option enables support for a "x11-misc-fixed-7x14B".
|
||||
(font ID FONTID_X11_MISC_FIXED_7X14B == 34).
|
||||
|
||||
config NXFONT_X11_MISC_FIXED_8X13
|
||||
bool "x11 misc fixed 8x13"
|
||||
default n
|
||||
---help---
|
||||
This option enables support for a "x11-misc-fixed-8x13".
|
||||
(font ID FONTID_X11_MISC_FIXED_8X13 == 35).
|
||||
|
||||
config NXFONT_X11_MISC_FIXED_8X13B
|
||||
bool "x11 misc fixed 8x13B"
|
||||
default n
|
||||
---help---
|
||||
This option enables support for a "x11-misc-fixed-8x13B".
|
||||
(font ID FONTID_X11_MISC_FIXED_8X13B == 36).
|
||||
|
||||
config NXFONT_X11_MISC_FIXED_8X13O
|
||||
bool "x11 misc fixed 8x13O"
|
||||
default n
|
||||
---help---
|
||||
This option enables support for a "x11-misc-fixed-8x13O".
|
||||
(font ID FONTID_X11_MISC_FIXED_8X13O == 37).
|
||||
|
||||
config NXFONT_X11_MISC_FIXED_9X15
|
||||
bool "x11 misc fixed 9x15"
|
||||
default n
|
||||
---help---
|
||||
This option enables support for a "x11-misc-fixed-9x15".
|
||||
(font ID FONTID_X11_MISC_FIXED_9X15 == 38).
|
||||
|
||||
config NXFONT_X11_MISC_FIXED_9X15B
|
||||
bool "x11 misc fixed 9x15B"
|
||||
default n
|
||||
---help---
|
||||
This option enables support for a "x11-misc-fixed-9x15B".
|
||||
(font ID FONTID_X11_MISC_FIXED_9X15B == 39).
|
||||
|
||||
config NXFONT_X11_MISC_FIXED_9X18
|
||||
bool "x11 misc fixed 9x18"
|
||||
default n
|
||||
---help---
|
||||
This option enables support for a "x11-misc-fixed-9x18".
|
||||
(font ID FONTID_X11_MISC_FIXED_9X18 == 40).
|
||||
|
||||
config NXFONT_X11_MISC_FIXED_9X18B
|
||||
bool "x11 misc fixed 9x18B"
|
||||
default n
|
||||
---help---
|
||||
This option enables support for a "x11-misc-fixed-9x18B".
|
||||
(font ID FONTID_X11_MISC_FIXED_9X18B == 41).
|
||||
|
||||
config NXFONT_X11_MISC_FIXED_10X20
|
||||
bool "x11 misc fixed 10x20"
|
||||
default n
|
||||
---help---
|
||||
This option enables support for a "x11-misc-fixed-10x20".
|
||||
(font ID FONTID_X11_MISC_FIXED_10X20 == 42).
|
||||
|
||||
endmenu
|
||||
|
||||
menuconfig NXTERM
|
||||
|
||||
@@ -121,6 +121,74 @@
|
||||
#elif defined(CONFIG_NXFONT_PIXEL_LCD_MACHINE)
|
||||
# define NXFONT_DEFAULT FONTID_PIXEL_LCD_MACHINE
|
||||
|
||||
/* X11 misc fixed fonts */
|
||||
|
||||
#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_4X6)
|
||||
# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_4X6
|
||||
|
||||
#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_5X7)
|
||||
# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_5X7
|
||||
|
||||
#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_5X8)
|
||||
# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_5X8
|
||||
|
||||
#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_6X9)
|
||||
# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_6X9
|
||||
|
||||
#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_6X10)
|
||||
# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_6X10
|
||||
|
||||
#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_6X12)
|
||||
# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_6X12
|
||||
|
||||
#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_6X13)
|
||||
# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_6X13
|
||||
|
||||
#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_6X13B)
|
||||
# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_6X13B
|
||||
|
||||
#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_6X13O)
|
||||
# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_6X13O
|
||||
|
||||
#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_7X13)
|
||||
# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_7X13
|
||||
|
||||
#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_7X13B)
|
||||
# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_7X13B
|
||||
|
||||
#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_7X13O)
|
||||
# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_7X13O
|
||||
|
||||
#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_7X14)
|
||||
# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_7X14
|
||||
|
||||
#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_7X14B)
|
||||
# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_7X14B
|
||||
|
||||
#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_8X13)
|
||||
# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_8X13
|
||||
|
||||
#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_8X13B)
|
||||
# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_8X13B
|
||||
|
||||
#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_8X13O)
|
||||
# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_8X13O
|
||||
|
||||
#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_9X15)
|
||||
# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_9X15
|
||||
|
||||
#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_9X15B)
|
||||
# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_9X15B
|
||||
|
||||
#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_9X18)
|
||||
# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_9X18
|
||||
|
||||
#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_9X18B)
|
||||
# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_9X18B
|
||||
|
||||
#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_10X20)
|
||||
# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_10X20
|
||||
|
||||
/* Mono-space fonts */
|
||||
|
||||
#elif defined(CONFIG_NXFONT_MONO5X8)
|
||||
@@ -229,6 +297,96 @@ enum nx_fontid_e
|
||||
#ifdef CONFIG_NXFONT_PIXEL_LCD_MACHINE
|
||||
, FONTID_PIXEL_LCD_MACHINE = 20 /* Pixel lcd machine font */
|
||||
#endif
|
||||
|
||||
/* X11 misc fixed fonts */
|
||||
|
||||
#ifdef CONFIG_NXFONT_X11_MISC_FIXED_4X6
|
||||
, FONTID_X11_MISC_FIXED_4X6 = 21 /* X11 misc fixed 4x6 */
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_NXFONT_X11_MISC_FIXED_5X7
|
||||
, FONTID_X11_MISC_FIXED_5X7 = 22 /* X11 misc fixed 5x7 */
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_NXFONT_X11_MISC_FIXED_5X8
|
||||
, FONTID_X11_MISC_FIXED_5X8 = 23 /* X11 misc fixed 5x8 */
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_NXFONT_X11_MISC_FIXED_6X9
|
||||
, FONTID_X11_MISC_FIXED_6X9 = 24 /* X11 misc fixed 6x9 */
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_NXFONT_X11_MISC_FIXED_6X10
|
||||
, FONTID_X11_MISC_FIXED_6X10 = 25 /* X11 misc fixed 6x10 */
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_NXFONT_X11_MISC_FIXED_6X12
|
||||
, FONTID_X11_MISC_FIXED_6X12 = 26 /* X11 misc fixed 6x12 */
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_NXFONT_X11_MISC_FIXED_6X13
|
||||
, FONTID_X11_MISC_FIXED_6X13 = 27 /* X11 misc fixed 6x13 */
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_NXFONT_X11_MISC_FIXED_6X13B
|
||||
, FONTID_X11_MISC_FIXED_6X13B = 28 /* X11 misc fixed 6x13b */
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_NXFONT_X11_MISC_FIXED_6X13O
|
||||
, FONTID_X11_MISC_FIXED_6X13O = 29 /* X11 misc fixed 6x13o */
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_NXFONT_X11_MISC_FIXED_7X13
|
||||
, FONTID_X11_MISC_FIXED_7X13 = 30 /* X11 misc fixed 7x13 */
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_NXFONT_X11_MISC_FIXED_7X13B
|
||||
, FONTID_X11_MISC_FIXED_7X13B = 31 /* X11 misc fixed 7x13b */
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_NXFONT_X11_MISC_FIXED_7X13O
|
||||
, FONTID_X11_MISC_FIXED_7X13O = 32 /* X11 misc fixed 7x13o */
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_NXFONT_X11_MISC_FIXED_7X14
|
||||
, FONTID_X11_MISC_FIXED_7X14 = 33 /* X11 misc fixed 7x14 */
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_NXFONT_X11_MISC_FIXED_7X14B
|
||||
, FONTID_X11_MISC_FIXED_7X14B = 34 /* X11 misc fixed 7x14b */
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_NXFONT_X11_MISC_FIXED_8X13
|
||||
, FONTID_X11_MISC_FIXED_8X13 = 35 /* X11 misc fixed 8x13 */
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_NXFONT_X11_MISC_FIXED_8X13B
|
||||
, FONTID_X11_MISC_FIXED_8X13B = 36 /* X11 misc fixed 8x13b */
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_NXFONT_X11_MISC_FIXED_8X13O
|
||||
, FONTID_X11_MISC_FIXED_8X13O = 37 /* X11 misc fixed 8x13o */
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_NXFONT_X11_MISC_FIXED_9X15
|
||||
, FONTID_X11_MISC_FIXED_9X15 = 38 /* X11 misc fixed 9x15 */
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_NXFONT_X11_MISC_FIXED_9X15B
|
||||
, FONTID_X11_MISC_FIXED_9X15B = 39 /* X11 misc fixed 9x15b */
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_NXFONT_X11_MISC_FIXED_9X18
|
||||
, FONTID_X11_MISC_FIXED_9X18 = 40 /* X11 misc fixed 9x18 */
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_NXFONT_X11_MISC_FIXED_9X18B
|
||||
, FONTID_X11_MISC_FIXED_9X18B = 41 /* X11 misc fixed 9x18b */
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_NXFONT_X11_MISC_FIXED_10X20
|
||||
, FONTID_X11_MISC_FIXED_10X20 = 42 /* X11 misc fixed 10x20 */
|
||||
#endif
|
||||
};
|
||||
|
||||
/* This structures provides the metrics for one glyph */
|
||||
|
||||
@@ -158,6 +158,72 @@ endif
|
||||
ifeq ($(CONFIG_NXFONT_PIXEL_LCD_MACHINE),y)
|
||||
$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=20 EXTRADEFINES=$(EXTRADEFINES)
|
||||
endif
|
||||
ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_4X6),y)
|
||||
$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=21 EXTRADEFINES=$(EXTRADEFINES)
|
||||
endif
|
||||
ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_5X7),y)
|
||||
$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=22 EXTRADEFINES=$(EXTRADEFINES)
|
||||
endif
|
||||
ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_5X8),y)
|
||||
$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=23 EXTRADEFINES=$(EXTRADEFINES)
|
||||
endif
|
||||
ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_6X9),y)
|
||||
$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=24 EXTRADEFINES=$(EXTRADEFINES)
|
||||
endif
|
||||
ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_6X10),y)
|
||||
$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=25 EXTRADEFINES=$(EXTRADEFINES)
|
||||
endif
|
||||
ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_6X12),y)
|
||||
$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=26 EXTRADEFINES=$(EXTRADEFINES)
|
||||
endif
|
||||
ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_6X13),y)
|
||||
$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=27 EXTRADEFINES=$(EXTRADEFINES)
|
||||
endif
|
||||
ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_6X13B),y)
|
||||
$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=28 EXTRADEFINES=$(EXTRADEFINES)
|
||||
endif
|
||||
ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_6X13O),y)
|
||||
$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=29 EXTRADEFINES=$(EXTRADEFINES)
|
||||
endif
|
||||
ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_7X13),y)
|
||||
$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=30 EXTRADEFINES=$(EXTRADEFINES)
|
||||
endif
|
||||
ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_7X13B),y)
|
||||
$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=31 EXTRADEFINES=$(EXTRADEFINES)
|
||||
endif
|
||||
ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_7X13O),y)
|
||||
$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=32 EXTRADEFINES=$(EXTRADEFINES)
|
||||
endif
|
||||
ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_7X14),y)
|
||||
$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=33 EXTRADEFINES=$(EXTRADEFINES)
|
||||
endif
|
||||
ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_7X14B),y)
|
||||
$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=34 EXTRADEFINES=$(EXTRADEFINES)
|
||||
endif
|
||||
ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_8X13),y)
|
||||
$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=35 EXTRADEFINES=$(EXTRADEFINES)
|
||||
endif
|
||||
ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_8X13B),y)
|
||||
$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=36 EXTRADEFINES=$(EXTRADEFINES)
|
||||
endif
|
||||
ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_8X13O),y)
|
||||
$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=37 EXTRADEFINES=$(EXTRADEFINES)
|
||||
endif
|
||||
ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_9X15),y)
|
||||
$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=38 EXTRADEFINES=$(EXTRADEFINES)
|
||||
endif
|
||||
ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_9X15B),y)
|
||||
$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=39 EXTRADEFINES=$(EXTRADEFINES)
|
||||
endif
|
||||
ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_9X18),y)
|
||||
$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=40 EXTRADEFINES=$(EXTRADEFINES)
|
||||
endif
|
||||
ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_9X18B),y)
|
||||
$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=41 EXTRADEFINES=$(EXTRADEFINES)
|
||||
endif
|
||||
ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_10X20),y)
|
||||
$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=42 EXTRADEFINES=$(EXTRADEFINES)
|
||||
endif
|
||||
|
||||
gensources: gen1bppsources gen2bppsource gen4bppsource gen8bppsource gen16bppsource gen24bppsource gen32bppsources genfontsources
|
||||
|
||||
|
||||
@@ -135,6 +135,98 @@ ifeq ($(CONFIG_NXFONT_PIXEL_LCD_MACHINE),y)
|
||||
CSRCS += nxfonts_bitmaps_pixel-lcd-machine.c
|
||||
endif
|
||||
|
||||
# X11 misc fixed fonts
|
||||
|
||||
ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_4X6),y)
|
||||
CSRCS += nxfonts_bitmaps_x11-misc-fixed-4x6.c
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_5X7),y)
|
||||
CSRCS += nxfonts_bitmaps_x11-misc-fixed-5x7.c
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_5X8),y)
|
||||
CSRCS += nxfonts_bitmaps_x11-misc-fixed-5x8.c
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_6X9),y)
|
||||
CSRCS += nxfonts_bitmaps_x11-misc-fixed-6x9.c
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_6X10),y)
|
||||
CSRCS += nxfonts_bitmaps_x11-misc-fixed-6x10.c
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_6X12),y)
|
||||
CSRCS += nxfonts_bitmaps_x11-misc-fixed-6x12.c
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_6X13),y)
|
||||
CSRCS += nxfonts_bitmaps_x11-misc-fixed-6x13.c
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_6X13B),y)
|
||||
CSRCS += nxfonts_bitmaps_x11-misc-fixed-6x13B.c
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_6X13O),y)
|
||||
CSRCS += nxfonts_bitmaps_x11-misc-fixed-6x13O.c
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_7X13),y)
|
||||
CSRCS += nxfonts_bitmaps_x11-misc-fixed-7x13.c
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_7X13B),y)
|
||||
CSRCS += nxfonts_bitmaps_x11-misc-fixed-7x13B.c
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_7X13O),y)
|
||||
CSRCS += nxfonts_bitmaps_x11-misc-fixed-7x13O.c
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_7X14),y)
|
||||
CSRCS += nxfonts_bitmaps_x11-misc-fixed-7x14.c
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_7X14B),y)
|
||||
CSRCS += nxfonts_bitmaps_x11-misc-fixed-7x14B.c
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_8X13),y)
|
||||
CSRCS += nxfonts_bitmaps_x11-misc-fixed-8x13.c
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_8X13B),y)
|
||||
CSRCS += nxfonts_bitmaps_x11-misc-fixed-8x13B.c
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_8X13O),y)
|
||||
CSRCS += nxfonts_bitmaps_x11-misc-fixed-8x13O.c
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_9X15),y)
|
||||
CSRCS += nxfonts_bitmaps_x11-misc-fixed-9x15.c
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_9X15B),y)
|
||||
CSRCS += nxfonts_bitmaps_x11-misc-fixed-9x15B.c
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_9X18),y)
|
||||
CSRCS += nxfonts_bitmaps_x11-misc-fixed-9x18.c
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_9X18B),y)
|
||||
CSRCS += nxfonts_bitmaps_x11-misc-fixed-9x18B.c
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_10X20),y)
|
||||
CSRCS += nxfonts_bitmaps_x11-misc-fixed-10x20.c
|
||||
endif
|
||||
|
||||
|
||||
|
||||
# Add the nxfont/ directory to the build
|
||||
|
||||
DEPPATH += --dep-path nxfonts
|
||||
|
||||
@@ -184,6 +184,119 @@ NXFONTS_PREFIX := g_pixel_lcd_machine_
|
||||
GEN_CSRC = nxfonts_bitmaps_pixel-lcd-machine.c
|
||||
endif
|
||||
|
||||
# X11-misc-fixed fonts
|
||||
|
||||
ifeq ($(NXFONTS_FONTID),21)
|
||||
NXFONTS_PREFIX := g_x11_misc_fixed_4x6_
|
||||
GEN_CSRC = nxfonts_bitmaps_x11-misc-fixed-4x6.c
|
||||
endif
|
||||
|
||||
ifeq ($(NXFONTS_FONTID),22)
|
||||
NXFONTS_PREFIX := g_x11_misc_fixed_5x7_
|
||||
GEN_CSRC = nxfonts_bitmaps_x11-misc-fixed-5x7.c
|
||||
endif
|
||||
|
||||
ifeq ($(NXFONTS_FONTID),23)
|
||||
NXFONTS_PREFIX := g_x11_misc_fixed_5x8_
|
||||
GEN_CSRC = nxfonts_bitmaps_x11-misc-fixed-5x8.c
|
||||
endif
|
||||
|
||||
ifeq ($(NXFONTS_FONTID),24)
|
||||
NXFONTS_PREFIX := g_x11_misc_fixed_6x9_
|
||||
GEN_CSRC = nxfonts_bitmaps_x11-misc-fixed-6x9.c
|
||||
endif
|
||||
|
||||
ifeq ($(NXFONTS_FONTID),25)
|
||||
NXFONTS_PREFIX := g_x11_misc_fixed_6x10_
|
||||
GEN_CSRC = nxfonts_bitmaps_x11-misc-fixed-6x10.c
|
||||
endif
|
||||
|
||||
ifeq ($(NXFONTS_FONTID),26)
|
||||
NXFONTS_PREFIX := g_x11_misc_fixed_6x12_
|
||||
GEN_CSRC = nxfonts_bitmaps_x11-misc-fixed-6x12.c
|
||||
endif
|
||||
|
||||
ifeq ($(NXFONTS_FONTID),27)
|
||||
NXFONTS_PREFIX := g_x11_misc_fixed_6x13_
|
||||
GEN_CSRC = nxfonts_bitmaps_x11-misc-fixed-6x13.c
|
||||
endif
|
||||
|
||||
ifeq ($(NXFONTS_FONTID),28)
|
||||
NXFONTS_PREFIX := g_x11_misc_fixed_6x13B_
|
||||
GEN_CSRC = nxfonts_bitmaps_x11-misc-fixed-6x13B.c
|
||||
endif
|
||||
|
||||
ifeq ($(NXFONTS_FONTID),29)
|
||||
NXFONTS_PREFIX := g_x11_misc_fixed_6x13O_
|
||||
GEN_CSRC = nxfonts_bitmaps_x11-misc-fixed-6x13O.c
|
||||
endif
|
||||
|
||||
ifeq ($(NXFONTS_FONTID),30)
|
||||
NXFONTS_PREFIX := g_x11_misc_fixed_7x13_
|
||||
GEN_CSRC = nxfonts_bitmaps_x11-misc-fixed-7x13.c
|
||||
endif
|
||||
|
||||
ifeq ($(NXFONTS_FONTID),31)
|
||||
NXFONTS_PREFIX := g_x11_misc_fixed_7x13B_
|
||||
GEN_CSRC = nxfonts_bitmaps_x11-misc-fixed-7x13B.c
|
||||
endif
|
||||
|
||||
ifeq ($(NXFONTS_FONTID),32)
|
||||
NXFONTS_PREFIX := g_x11_misc_fixed_7x13O_
|
||||
GEN_CSRC = nxfonts_bitmaps_x11-misc-fixed-7x13O.c
|
||||
endif
|
||||
|
||||
ifeq ($(NXFONTS_FONTID),33)
|
||||
NXFONTS_PREFIX := g_x11_misc_fixed_7x14_
|
||||
GEN_CSRC = nxfonts_bitmaps_x11-misc-fixed-7x14.c
|
||||
endif
|
||||
|
||||
ifeq ($(NXFONTS_FONTID),34)
|
||||
NXFONTS_PREFIX := g_x11_misc_fixed_7x14B_
|
||||
GEN_CSRC = nxfonts_bitmaps_x11-misc-fixed-7x14B.c
|
||||
endif
|
||||
|
||||
ifeq ($(NXFONTS_FONTID),35)
|
||||
NXFONTS_PREFIX := g_x11_misc_fixed_8x13_
|
||||
GEN_CSRC = nxfonts_bitmaps_x11-misc-fixed-8x13.c
|
||||
endif
|
||||
|
||||
ifeq ($(NXFONTS_FONTID),36)
|
||||
NXFONTS_PREFIX := g_x11_misc_fixed_8x13B_
|
||||
GEN_CSRC = nxfonts_bitmaps_x11-misc-fixed-8x13B.c
|
||||
endif
|
||||
|
||||
ifeq ($(NXFONTS_FONTID),37)
|
||||
NXFONTS_PREFIX := g_x11_misc_fixed_8x13O_
|
||||
GEN_CSRC = nxfonts_bitmaps_x11-misc-fixed-8x13O.c
|
||||
endif
|
||||
|
||||
ifeq ($(NXFONTS_FONTID),38)
|
||||
NXFONTS_PREFIX := g_x11_misc_fixed_9x15_
|
||||
GEN_CSRC = nxfonts_bitmaps_x11-misc-fixed-9x15.c
|
||||
endif
|
||||
|
||||
ifeq ($(NXFONTS_FONTID),39)
|
||||
NXFONTS_PREFIX := g_x11_misc_fixed_9x15B_
|
||||
GEN_CSRC = nxfonts_bitmaps_x11-misc-fixed-9x15B.c
|
||||
endif
|
||||
|
||||
ifeq ($(NXFONTS_FONTID),40)
|
||||
NXFONTS_PREFIX := g_x11_misc_fixed_9x18_
|
||||
GEN_CSRC = nxfonts_bitmaps_x11-misc-fixed-9x18.c
|
||||
endif
|
||||
|
||||
ifeq ($(NXFONTS_FONTID),41)
|
||||
NXFONTS_PREFIX := g_x11_misc_fixed_9x18B_
|
||||
GEN_CSRC = nxfonts_bitmaps_x11-misc-fixed-9x18B.c
|
||||
endif
|
||||
|
||||
ifeq ($(NXFONTS_FONTID),42)
|
||||
NXFONTS_PREFIX := g_x11_misc_fixed_10x20_
|
||||
GEN_CSRC = nxfonts_bitmaps_x11-misc-fixed-10x20.c
|
||||
endif
|
||||
|
||||
|
||||
DEPENDENCY := nxfonts_bitmaps.c
|
||||
CPPFLAGS += -DNXFONTS_FONTID=$(NXFONTS_FONTID)
|
||||
CPPFLAGS += -DNXFONTS_PREFIX=$(NXFONTS_PREFIX)
|
||||
|
||||
@@ -86,6 +86,50 @@
|
||||
# include "nxfonts_pixel-unicode.h"
|
||||
#elif NXFONTS_FONTID == 20
|
||||
# include "nxfonts_pixel-lcd-machine.h"
|
||||
#elif NXFONTS_FONTID == 21
|
||||
# include "nxfonts_x11-misc-fixed-4x6.h"
|
||||
#elif NXFONTS_FONTID == 22
|
||||
# include "nxfonts_x11-misc-fixed-5x7.h"
|
||||
#elif NXFONTS_FONTID == 23
|
||||
# include "nxfonts_x11-misc-fixed-5x8.h"
|
||||
#elif NXFONTS_FONTID == 24
|
||||
# include "nxfonts_x11-misc-fixed-6x9.h"
|
||||
#elif NXFONTS_FONTID == 25
|
||||
# include "nxfonts_x11-misc-fixed-6x10.h"
|
||||
#elif NXFONTS_FONTID == 26
|
||||
# include "nxfonts_x11-misc-fixed-6x12.h"
|
||||
#elif NXFONTS_FONTID == 27
|
||||
# include "nxfonts_x11-misc-fixed-6x13.h"
|
||||
#elif NXFONTS_FONTID == 28
|
||||
# include "nxfonts_x11-misc-fixed-6x13B.h"
|
||||
#elif NXFONTS_FONTID == 29
|
||||
# include "nxfonts_x11-misc-fixed-6x13O.h"
|
||||
#elif NXFONTS_FONTID == 30
|
||||
# include "nxfonts_x11-misc-fixed-7x13.h"
|
||||
#elif NXFONTS_FONTID == 31
|
||||
# include "nxfonts_x11-misc-fixed-7x13B.h"
|
||||
#elif NXFONTS_FONTID == 32
|
||||
# include "nxfonts_x11-misc-fixed-7x13O.h"
|
||||
#elif NXFONTS_FONTID == 33
|
||||
# include "nxfonts_x11-misc-fixed-7x14.h"
|
||||
#elif NXFONTS_FONTID == 34
|
||||
# include "nxfonts_x11-misc-fixed-7x14B.h"
|
||||
#elif NXFONTS_FONTID == 35
|
||||
# include "nxfonts_x11-misc-fixed-8x13.h"
|
||||
#elif NXFONTS_FONTID == 36
|
||||
# include "nxfonts_x11-misc-fixed-8x13B.h"
|
||||
#elif NXFONTS_FONTID == 37
|
||||
# include "nxfonts_x11-misc-fixed-8x13O.h"
|
||||
#elif NXFONTS_FONTID == 38
|
||||
# include "nxfonts_x11-misc-fixed-9x15.h"
|
||||
#elif NXFONTS_FONTID == 39
|
||||
# include "nxfonts_x11-misc-fixed-9x15B.h"
|
||||
#elif NXFONTS_FONTID == 40
|
||||
# include "nxfonts_x11-misc-fixed-9x18.h"
|
||||
#elif NXFONTS_FONTID == 41
|
||||
# include "nxfonts_x11-misc-fixed-9x18B.h"
|
||||
#elif NXFONTS_FONTID == 42
|
||||
# include "nxfonts_x11-misc-fixed-10x20.h"
|
||||
#else
|
||||
# error "No font ID specified"
|
||||
#endif
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user