Lots of fonts that derive from X11-misc-fixed-* fonts. Converted for use by NuttX by Pierre-Noel Bouteville

libnx/Makefile

@@ -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
 

libnx/nxfonts/Make.defs

@@ -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

libnx/nxfonts/Makefile.sources

@@ -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)

libnx/nxfonts/nxfonts_bitmaps.c

@@ -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