#571 new kbd layout wip

This commit is contained in:
Vadim Grigoruk committed 2018-08-09 01:21:06 +03:00
1 parent 10bbae4822
commit 7dc0311298
6 files changed
+97 -5

No files matched your search

+1 -1
View File
@@ -258,7 +258,7 @@ bin/menu.o: src/menu.c $(TIC80_H) $(TIC_H)
bin/surf.o: src/surf.c $(TIC80_H) $(TIC_H)
$(CC) $< $(OPT) $(INCLUDES) -c -o $@
bin/system.o: src/system.c src/keycodes.inl src/kbdlayout.inl $(TIC80_H) $(TIC_H)
bin/system.o: src/system.c src/keycodes.inl src/kbdlayout.inl src/kbdlabels.inl $(TIC80_H) $(TIC_H)
$(CC) $< $(OPT) $(INCLUDES) -c -o $@
bin/chip.o: src/system/chip.c src/keycodes.c $(TIC80_H) $(TIC_H)
+1 -1
View File
@@ -1 +1 @@
0x78, 0xda, 0xed, 0x5b, 0x4d, 0x6c, 0x1b, 0xc7, 0x15, 0x5e, 0xff, 0xa4, 0x0d, 0x19, 0xd7, 0x63, 0x01, 0x45, 0xd0, 0x9f, 0xb4, 0x59, 0xa8, 0x49, 0x4c, 0x4a, 0x24, 0x45, 0x91, 0x92, 0xe2, 0xc8, 0xd9, 0xba, 0xb2, 0x48, 0xfd, 0x34, 0xfa, 0x83, 0x24, 0xda, 0x0d, 0x8c, 0x44, 0x5d, 0x91, 0x4b, 0x89, 0x08, 0xc5, 0x55, 0x77, 0x49, 0x4b, 0x72, 0x20, 0x20, 0x08, 0x10, 0x40, 0x3d, 0xb9, 0x07, 0x17, 0xa8, 0x0e, 0x85, 0x5a, 0xe4, 0xa6, 0x5e, 0x7a, 0xf1, 0xa5, 0x3a, 0x18, 0xed, 0xad, 0x05, 0x5a, 0x14, 0x41, 0xd1, 0x43, 0x51, 0x14, 0x05, 0x8a, 0x5e, 0xe9, 0x05, 0x02, 0x18, 0x35, 0x02, 0x64, 0xfb, 0xde, 0xec, 0xec, 0x72, 0x76, 0x77, 0x96, 0x72, 0xd0, 0xa4, 0x88, 0x5a, 0xcd, 0x6a, 0x38, 0x3b, 0xf3, 0xe6, 0xbd, 0x9d, 0xf7, 0xbe, 0xf7, 0xde, 0xcc, 0x2e, 0xa0, 0x33, 0x7f, 0x8f, 0x4b, 0x1f, 0xdb, 0x50, 0x7a, 0x7b, 0x7b, 0xef, 0xee, 0xed, 0xed, 0xdd, 0xc5, 0x16, 0xba, 0x77, 0x6d, 0xcb, 0xab, 0xb6, 0xfd, 0xb0, 0xdd, 0xdb, 0x6b, 0xb7, 0xf7, 0xf6, 0xac, 0x76, 0xef, 0xbb, 0x56, 0xdb, 0xbe, 0x6b, 0xd9, 0xd6, 0x5d, 0xcb, 0x72, 0x2b, 0xe5, 0xef, 0xe9, 0xe9, 0xd1, 0xab, 0xd5, 0xaa, 0x8e, 0x2d, 0x74, 0x75, 0xe0, 0x73, 0x2b, 0xf2, 0xf7, 0xf4, 0xd8, 0xed, 0x6a, 0xd5, 0x6a, 0xf7, 0xa8, 0xc0, 0xaf, 0x5b, 0x6d, 0xcb, 0xa9, 0x0f, 0x2d, 0x5d, 0xb2, 0x29, 0x7f, 0xa1, 0x50, 0x38, 0xd8, 0xdf, 0xdf, 0x3f, 0xc0, 0x16, 0xba, 0x07, 0x04, 0x2a, 0xf0, 0x1e, 0x30, 0xfe, 0x42, 0xc1, 0x6e, 0xef, 0xef, 0x5b, 0xed, 0xc2, 0x3d, 0xe0, 0x3f, 0xb0, 0xda, 0x04, 0xaa, 0x75, 0x00, 0xfc, 0x07, 0x8c, 0xbf, 0x54, 0x2a, 0x3d, 0x38, 0x3a, 0x3a, 0x7a, 0x80, 0x2d, 0x74, 0x69, 0x25, 0x12, 0xc1, 0x16, 0xf9, 0x4b, 0x25, 0xbb, 0x7d, 0x74, 0x64, 0xb5, 0x4b, 0xf7, 0x81, 0xff, 0x01, 0xc8, 0x7c, 0x60, 0x59, 0x12, 0x54, 0x6c, 0x7f, 0x76, 0x78, 0x18, 0x3f, 0xc4, 0x32, 0xfa, 0xfe, 0xe1, 0x61, 0x3e, 0x7f, 0x38, 0x9a, 0xcf, 0xbf, 0x8f, 0x5d, 0xf8, 0x19, 0xcd, 0xe6, 0xf3, 0xe7, 0x5c, 0x3a, 0x1d, 0x07, 0x3a, 0x9d, 0x17, 0xa2, 0xbf, 0xcf, 0xf8, 0x59, 0x0b, 0x7d, 0x1f, 0x7d, 0x94, 0xc9, 0x1f, 0x65, 0xfc, 0xa3, 0x1d, 0xfe, 0x5f, 0x1e, 0x1d, 0x3d, 0x73, 0x74, 0xeb, 0xfe, 0xd1, 0xd1, 0xfd, 0x5b, 0x4e, 0x2d, 0x95, 0x68, 0x0b, 0x23, 0xb7, 0x16, 0x4a, 0xa5, 0xa7, 0xbe, 0x5f, 0xad, 0x7e, 0xa1, 0xda, 0xa3, 0x56, 0xab, 0xea, 0xb3, 0x55, 0xbe, 0x85, 0xbb, 0x67, 0x2f, 0xf5, 0xf4, 0x9c, 0x79, 0x67, 0x6f, 0xef, 0xe9, 0xbd, 0x77, 0x13, 0x7b, 0xb4, 0x26, 0xde, 0xdd, 0x73, 0xef, 0xe1, 0x2e, 0x21, 0xf7, 0xf6, 0x9e, 0xfd, 0xd1, 0xfe, 0x7e, 0x6c, 0xff, 0xde, 0xf4, 0x3e, 0xad, 0xd3, 0x05, 0xb0, 0x32, 0xb6, 0xf7, 0xf6, 0xef, 0xc1, 0xef, 0x77, 0x0a, 0x85, 0xf3, 0x14, 0x6f, 0xc4, 0x9e, 0x5e, 0xff, 0xa2, 0xf7, 0x03, 0xe0, 0x07, 0xb6, 0x64, 0xa1, 0x6d, 0x3f, 0xb6, 0xef, 0x4a, 0x36, 0x60, 0xff, 0xf0, 0x2e, 0xe0, 0xbf, 0xc7, 0x2a, 0xfa, 0x83, 0x64, 0x3d, 0x6c, 0xdb, 0x76, 0xbb, 0x4d, 0xf1, 0x46, 0xec, 0xab, 0x8f, 0xa0, 0xc5, 0xab, 0x5a, 0x7d, 0x1e, 0xfc, 0xc0, 0xe3, 0xd7, 0x2d, 0x0b, 0xb0, 0xa7, 0x55, 0xaf, 0x5a, 0x36, 0xf5, 0x83, 0x9e, 0x0e, 0x3f, 0xc5, 0x1b, 0xb1, 0x7f, 0xfc, 0xf8, 0xf1, 0xc1, 0xfe, 0xc1, 0x01, 0xde, 0xcf, 0x83, 0x1f, 0x78, 0xfc, 0x07, 0x96, 0x05, 0xd8, 0x5b, 0x8f, 0xa1, 0x1e, 0xec, 0x5b, 0x36, 0xf5, 0x83, 0x42, 0x87, 0x9f, 0x62, 0x8d, 0xd8, 0x1f, 0x61, 0xfb, 0x11, 0xbd, 0x5f, 0x01, 0x3f, 0xf0, 0xf8, 0x1f, 0x48, 0x36, 0x60, 0xff, 0xf0, 0x01, 0xe0, 0x7f, 0xc4, 0x2a, 0xfa, 0x83, 0xcb, 0x2f, 0x41, 0x89, 0xf2, 0x01, 0x1c, 0xe7, 0xe9, 0x41, 0x1f, 0xf0, 0xd3, 0xc3, 0x3e, 0xe0, 0xa3, 0x0b, 0x7c, 0xc0, 0xa5, 0x47, 0xf9, 0x00, 0x8e, 0x23, 0x3d, 0xca, 0x07, 0x70, 0x1c, 0xe9, 0x51, 0x3e, 0x80, 0xe3, 0x48, 0x8f, 0xf2, 0x01, 0x1c, 0x17, 0xc6, 0x2f, 0x2d, 0x55, 0x5d, 0xb7, 0x1f, 0x89, 0xe2, 0x17, 0xe8, 0x80, 0x27, 0xd4, 0x47, 0x50, 0x25, 0xe9, 0x52, 0x0f, 0xfc, 0xf5, 0x48, 0xc0, 0x7b, 0x89, 0x55, 0x5f, 0x81, 0xe7, 0xe3, 0x0f, 0xb8, 0x2a, 0x4e, 0x71, 0xeb, 0x19, 0xb7, 0xbe, 0x59, 0x6a, 0xb7, 0xef, 0x7f, 0xf4, 0xcf, 0xf6, 0xfd, 0x23, 0xa7, 0x62, 0x9f, 0x2f, 0x34, 0x84, 0xf3, 0xf9, 0xfc, 0x35, 0x68, 0x44, 0x95, 0x91, 0xb1, 0xf9, 0x30, 0xa2, 0x76, 0x2d, 0xd2, 0x31, 0x85, 0xc9, 0xcf, 0xdb, 0x4f, 0x50, 0x44, 0xf3, 0xa4, 0xcf, 0x79, 0xe9, 0xc4, 0x2f, 0xb6, 0x8f, 0xec, 0x70, 0xfc, 0x4a, 0x18, 0xb3, 0x0f, 0x21, 0x76, 0xa9, 0x0f, 0x04, 0xe3, 0xd7, 0x85, 0xd9, 0xc5, 0x9e, 0x02, 0x8c, 0xfe, 0x80, 0x7e, 0x41, 0xb1, 0xf7, 0xb0, 0x66, 0xd8, 0x9f, 0x71, 0xfc, 0x81, 0x3d, 0xff, 0xdb, 0xf9, 0x76, 0xdb, 0xdc, 0xfa, 0x87, 0x57, 0xb1, 0xcf, 0x17, 0x1f, 0xde, 0x80, 0xe6, 0x35, 0xf4, 0x05, 0xb4, 0x73, 0xc7, 0xd6, 0x1c, 0xd6, 0xd7, 0x3e, 0x84, 0x61, 0xb7, 0x52, 0x62, 0x04, 0x0f, 0x57, 0xc2, 0x3c, 0xc7, 0x61, 0xec, 0x96, 0x27, 0xf1, 0x05, 0xe9, 0xb4, 0xfc, 0x47, 0x25, 0x68, 0x54, 0x51, 0xfc, 0xdb, 0x5d, 0xf2, 0x00, 0xef, 0x3b, 0x62, 0xfc, 0x7d, 0xbe, 0x63, 0x9f, 0xb4, 0xf8, 0xfd, 0x5f, 0x2f, 0xc2, 0xbc, 0xef, 0xc7, 0x52, 0x90, 0xf3, 0x3b, 0x58, 0x9e, 0xfd, 0xed, 0xf3, 0xa7, 0x46, 0x3c, 0x2d, 0xa7, 0xe5, 0xb4, 0x74, 0xd9, 0x64, 0xb8, 0x2a, 0x71, 0x2d, 0x2b, 0x78, 0xca, 0xc5, 0x1a, 0x55, 0x90, 0x66, 0xdb, 0xc4, 0xd7, 0xfa, 0xe8, 0x30, 0x46, 0x08, 0xb6, 0xd0, 0x81, 0x9b, 0xe0, 0xae, 0x02, 0x54, 0x20, 0xd2, 0x1b, 0xd6, 0x10, 0x3f, 0xbf, 0Line truncated
0x78, 0xda, 0xed, 0x5b, 0x4d, 0x6c, 0x24, 0x47, 0x15, 0xee, 0xcd, 0x0f, 0xe0, 0xc9, 0xb2, 0x15, 0x4b, 0x28, 0xe2, 0x3f, 0x2d, 0x93, 0xc4, 0x33, 0xf6, 0xcc, 0x78, 0x3c, 0x6d, 0x9b, 0x65, 0x97, 0xc6, 0x78, 0x3d, 0xb3, 0xb6, 0x61, 0xd7, 0x5e, 0x6c, 0xcf, 0x2e, 0xd1, 0x0a, 0x4c, 0x7b, 0xa6, 0xc7, 0x1e, 0x31, 0x9e, 0x36, 0xdd, 0x33, 0x6b, 0x3b, 0xd1, 0x4a, 0x21, 0x10, 0xc9, 0x9c, 0x96, 0x9f, 0x8d, 0x84, 0x0f, 0xc8, 0x09, 0xb9, 0x2d, 0x17, 0x7e, 0xb4, 0x17, 0x7c, 0x58, 0xc1, 0x0d, 0x24, 0x10, 0x42, 0x88, 0x03, 0x42, 0x5c, 0x10, 0xd7, 0xd9, 0x96, 0x2c, 0x45, 0x44, 0x48, 0x69, 0xde, 0xab, 0xae, 0xee, 0xa9, 0xee, 0xae, 0x6e, 0x6f, 0x20, 0x41, 0x71, 0x70, 0xb5, 0x6b, 0xaa, 0xab, 0x5e, 0xbd, 0xd7, 0xf5, 0xde, 0xf7, 0xde, 0xab, 0xea, 0x96, 0x7c, 0xea, 0x85, 0x27, 0xa4, 0x37, 0x1d, 0x28, 0x03, 0x03, 0x03, 0xb7, 0x76, 0x77, 0x77, 0x6f, 0x61, 0x0b, 0xdd, 0x5b, 0x8e, 0xed, 0x57, 0xc7, 0xb9, 0xdf, 0x1d, 0x18, 0x70, 0xba, 0xbb, 0xbb, 0x76, 0x77, 0xe0, 0x45, 0xbb, 0xeb, 0xdc, 0xb2, 0x1d, 0xfb, 0x96, 0x6d, 0x7b, 0x95, 0xf2, 0xf7, 0xf7, 0xf7, 0x1b, 0xf5, 0x7a, 0xdd, 0xc0, 0x16, 0xba, 0x06, 0xf0, 0x79, 0x15, 0xf9, 0xfb, 0xfb, 0x9d, 0x6e, 0xbd, 0x6e, 0x77, 0xfb, 0x35, 0xe0, 0x37, 0xec, 0xae, 0xed, 0xd6, 0xfb, 0xb6, 0x21, 0x39, 0x94, 0xbf, 0x54, 0x2a, 0xed, 0xef, 0xed, 0xed, 0xed, 0x63, 0x0b, 0xdd, 0x7d, 0x02, 0x15, 0x78, 0xf7, 0x19, 0x7f, 0xa9, 0xe4, 0x74, 0xf7, 0xf6, 0xec, 0x6e, 0xe9, 0x36, 0xf0, 0xef, 0xdb, 0x5d, 0x02, 0xd5, 0xde, 0x07, 0xfe, 0x7d, 0xc6, 0x5f, 0xa9, 0x54, 0xee, 0x1d, 0x1c, 0x1c, 0xdc, 0xc3, 0x16, 0xba, 0xb4, 0x12, 0x89, 0x60, 0x8b, 0xfc, 0x95, 0x8a, 0xd3, 0x3d, 0x38, 0xb0, 0xbb, 0x95, 0xbb, 0xc0, 0x7f, 0x0f, 0x64, 0xde, 0xb3, 0x6d, 0x09, 0x2a, 0xb6, 0xaf, 0xdc, 0xb9, 0x93, 0xba, 0x83, 0xe5, 0xdc, 0x6b, 0x77, 0xee, 0x28, 0xca, 0x9d, 0x73, 0x8a, 0xf2, 0x1a, 0x76, 0xe1, 0xe7, 0x5c, 0x41, 0x51, 0x1e, 0xf6, 0xe8, 0x74, 0x1c, 0xe8, 0x74, 0x5e, 0x84, 0xfe, 0x1a, 0xe3, 0x67, 0x2d, 0xf4, 0x03, 0xf4, 0x73, 0x4c, 0xfe, 0x39, 0xc6, 0x7f, 0xae, 0xc7, 0xff, 0xd3, 0x83, 0x83, 0xc7, 0x0e, 0xae, 0xdf, 0x3d, 0x38, 0xb8, 0x7b, 0xdd, 0xad, 0x95, 0x0a, 0x6d, 0x61, 0xe4, 0xfa, 0x95, 0x4a, 0xe5, 0xd1, 0xaf, 0xd5, 0xeb, 0xef, 0xab, 0xf7, 0x6b, 0xf5, 0xba, 0xf6, 0x44, 0x9d, 0x6f, 0xe1, 0xee, 0x89, 0xc7, 0xfb, 0xfb, 0x4f, 0xbd, 0xb0, 0xbb, 0xfb, 0x81, 0xdd, 0x17, 0xd3, 0xbb, 0xb4, 0xa6, 0x5f, 0xdc, 0xf5, 0xee, 0xe1, 0x2e, 0x2d, 0x0f, 0x0c, 0x3c, 0xf4, 0xdd, 0xbd, 0xbd, 0xbe, 0xbd, 0xdb, 0x73, 0x7b, 0xb4, 0xce, 0x95, 0xc0, 0xca, 0xd8, 0xde, 0xde, 0xbb, 0x0d, 0xbf, 0x9f, 0x2f, 0x95, 0x1e, 0xa1, 0x78, 0x23, 0xf6, 0xf4, 0xfa, 0x27, 0xbd, 0x1f, 0x01, 0x3f, 0x70, 0x24, 0x1b, 0x6d, 0xfb, 0xa6, 0x73, 0x4b, 0x72, 0x00, 0xfb, 0xfb, 0xb7, 0x00, 0xff, 0x5d, 0x56, 0xd1, 0x1f, 0x24, 0xfb, 0x7e, 0xd7, 0x71, 0xba, 0x5d, 0x8a, 0x37, 0x62, 0x5f, 0x7f, 0x1d, 0x5a, 0xbc, 0xea, 0xf5, 0x27, 0xc1, 0x0f, 0x7c, 0x7e, 0xc3, 0xb6, 0x01, 0x7b, 0x5a, 0x8d, 0xba, 0xed, 0x50, 0x3f, 0xe8, 0xef, 0xf1, 0x53, 0xbc, 0x11, 0xfb, 0x37, 0xde, 0x78, 0x63, 0x7f, 0x6f, 0x7f, 0x1f, 0xef, 0x17, 0xc0, 0x0f, 0x7c, 0xfe, 0x7d, 0xdb, 0x06, 0xec, 0xed, 0x37, 0xa0, 0xee, 0xef, 0xd9, 0x0e, 0xf5, 0x83, 0x52, 0x8f, 0x9f, 0x62, 0x8d, 0xd8, 0x1f, 0x60, 0xfb, 0x2f, 0x7a, 0xbf, 0x02, 0x7e, 0xe0, 0xf3, 0xdf, 0x93, 0x1c, 0xc0, 0xfe, 0xfe, 0x3d, 0xc0, 0xff, 0x80, 0x55, 0xf4, 0x07, 0x8f, 0x5f, 0x82, 0x12, 0xe7, 0x03, 0x38, 0xce, 0xd3, 0xc3, 0x3e, 0x10, 0xa4, 0x47, 0x7d, 0x20, 0x40, 0x17, 0xf8, 0x80, 0x47, 0x8f, 0xf3, 0x01, 0x1c, 0x47, 0x7a, 0x9c, 0x0f, 0xe0, 0x38, 0xd2, 0xe3, 0x7c, 0x00, 0xc7, 0x91, 0x1e, 0xe7, 0x03, 0x38, 0x2e, 0x8c, 0x5f, 0x5a, 0xea, 0x86, 0xe1, 0xbc, 0x2e, 0x8a, 0x5f, 0xa0, 0x03, 0x9e, 0x50, 0x5f, 0x87, 0x2a, 0x49, 0x8f, 0xf7, 0xc3, 0x5f, 0xbf, 0x04, 0xbc, 0x8f, 0xb3, 0x1a, 0x28, 0xf0, 0x7c, 0xfc, 0x01, 0x57, 0xc5, 0x29, 0x5e, 0x3d, 0xe5, 0xd5, 0xaf, 0x56, 0xba, 0xdd, 0xbb, 0xff, 0xfa, 0x47, 0xf7, 0xee, 0x81, 0x5b, 0xb1, 0xcf, 0x17, 0x1a, 0xc2, 0x8a, 0xa2, 0x4c, 0x42, 0x23, 0xaa, 0x8c, 0x8c, 0xcd, 0x61, 0x4c, 0x4d, 0x2c, 0xd2, 0x11, 0x85, 0xc9, 0x57, 0x9c, 0x07, 0x28, 0xa2, 0x79, 0x93, 0x47, 0xd4, 0x84, 0x75, 0xd3, 0x2a, 0xbd, 0xc3, 0xa5, 0x17, 0xbf, 0xd8, 0xbe, 0xee, 0x44, 0xe3, 0x57, 0xc2, 0x98, 0xbd, 0x0f, 0xb1, 0x4b, 0x7d, 0x20, 0x1c, 0xbf, 0x1e, 0xcc, 0x1e, 0xf6, 0x14, 0x60, 0xf4, 0x07, 0xf4, 0x0b, 0x8a, 0xbd, 0x8f, 0x35, 0xc3, 0xfe, 0x94, 0xeb, 0x0f, 0xec, 0xf9, 0x9f, 0x53, 0xba, 0x5d, 0x6b, 0xeb, 0xef, 0x7e, 0xc5, 0x3e, 0x5f, 0x02, 0xf6, 0x02, 0x8b, 0x4c, 0xa2, 0x2f, 0xa0, 0x9d, 0x7b, 0xb6, 0xe6, 0xec, 0x35, 0x79, 0x08, 0xc3, 0x5e, 0x75, 0xed, 0x2f, 0xe6, 0xe1, 0x11, 0x8a, 0xf0, 0x1c, 0x85, 0xb1, 0x57, 0x1e, 0xc4, 0x17, 0xa4, 0x77, 0x79, 0x89, 0x89, 0xaf, 0x49, 0xa8, 0x30, 0x36, 0xa9, 0x88, 0xe2, 0x0b, 0x7e, 0x0e, 0x15, 0xac, 0x87, 0x2c, 0xbe, 0x22, 0xfc, 0x93, 0x8a, 0x5b, 0x1d, 0x21, 0x3f, 0xf2, 0xd1, 0x2a, 0x88, 0x4f, 0x1c, 0x50, 0x58, 0x9d, 0x14, 0x18, 0x55, 0x14, 0xff, 0x4e, 0x42, 0x1e, 0xe0, 0x7d, 0x47, 0x8c, 0x7f, 0xc0, 0x77, 0xde, 0x72, 0x7e, 0x38, 0xee, 0x85, 0xe1, 0x14, 0x1b, 0x5f, 0x0c, 0xe3, 0xf8, 0xf8, 0x72, 0x7d, 0x25, 0x96, 0xff, 0xf0, 0x88, 0xf8, 0x8c, 0Line truncated
BIN
View File
Binary file not shown.
+72
View File
@@ -0,0 +1,72 @@
{"ESC", 0*8+3, 0*8+3, true},
{"F1", 2*8+4, 0*8+3, true},
{"F2", 4*8+4, 0*8+3, true},
{"F3", 6*8+4, 0*8+3, true},
{"F4", 8*8+4, 0*8+3, true},
{"F5", 10*8+4, 0*8+3, true},
{"F6", 12*8+4, 0*8+3, true},
{"F7", 14*8+4, 0*8+3, true},
{"F8", 16*8+4, 0*8+3, true},
{"F9", 18*8+4, 0*8+3, true},
{"F10", 20*8+3, 0*8+3, true},
{"TAB", 0*8+3, 2*8+4, true},
{"`", 2*8+3, 2*8+3},
{"[", 4*8+3, 2*8+3},
{"]", 6*8+3, 2*8+3},
{";", 8*8+3, 2*8+3},
{"'", 10*8+3, 2*8+3},
{"-", 12*8+3, 2*8+3},
{"=", 14*8+3, 2*8+3},
{"/", 16*8+3, 2*8+3},
{"F11", 18*8+3, 2*8+3, true},
{"F12", 20*8+3, 2*8+3, true},
{"1", 0*8+3, 4*8+3},
{"2", 2*8+3, 4*8+3},
{"3", 4*8+3, 4*8+3},
{"4", 6*8+3, 4*8+3},
{"5", 8*8+3, 4*8+3},
{"6", 10*8+3, 4*8+3},
{"7", 12*8+3, 4*8+3},
{"8", 14*8+3, 4*8+3},
{"9", 16*8+3, 4*8+3},
{"0", 18*8+3, 4*8+3},
{"BAC", 20*8+3, 4*8+4, true},
{"Q", 0*8+3, 6*8+3},
{"W", 2*8+3, 6*8+3},
{"E", 4*8+3, 6*8+3},
{"R", 6*8+3, 6*8+3},
{"T", 8*8+3, 6*8+3},
{"Y", 10*8+3, 6*8+3},
{"U", 12*8+3, 6*8+3},
{"I", 14*8+3, 6*8+3},
{"O", 16*8+3, 6*8+3},
{"P", 18*8+3, 6*8+3},
{"\\", 20*8+3, 6*8+3},
{"A", 1*8+3, 8*8+3},
{"S", 3*8+3, 8*8+3},
{"D", 5*8+3, 8*8+3},
{"F", 7*8+3, 8*8+3},
{"G", 9*8+3, 8*8+3},
{"H", 11*8+3, 8*8+3},
{"J", 13*8+3, 8*8+3},
{"K", 15*8+3, 8*8+3},
{"L", 17*8+3, 8*8+3},
{"ENTER", 19*8+3, 8*8+4, true},
{"Z", 2*8+3, 10*8+3},
{"X", 4*8+3, 10*8+3},
{"C", 6*8+3, 10*8+3},
{"V", 8*8+3, 10*8+3},
{"B", 10*8+3, 10*8+3},
{"N", 12*8+3, 10*8+3},
{"M", 14*8+3, 10*8+3},
{",", 16*8+3, 10*8+3},
{".", 18*8+3, 10*8+3, true},
{"CTRL", 0*8+5, 12*8+4, true},
{"ALT", 3*8+6, 12*8+4, true},
+22 -2
View File
@@ -168,6 +168,26 @@ static void updateGamepadParts()
platform.gamepad.part.y = (SDL_Point){rect.w - 2*tileSize, 0*tileSize + offset};
}
static void drawKeyboardLabels(s32 shift)
{
tic_mem* tic = platform.studio->tic;
enum{Color = tic_color_dark_gray};
typedef struct {const char* text; s32 x; s32 y; bool alt;} Label;
static const Label Labels[] =
{
#include "kbdlabels.inl"
};
for(s32 i = 0; i < COUNT_OF(Labels); i++)
{
const Label* label = Labels + i;
if(label->text)
tic->api.text(tic, label->text, label->x, label->y + shift, Color, label->alt);
}
}
static void initTouchKeyboard()
{
tic_mem* tic = platform.studio->tic;
@@ -190,7 +210,7 @@ static void initTouchKeyboard()
tic->api.map(tic, &platform.studio->config()->cart->bank0.map,
&platform.studio->config()->cart->bank0.tiles, 8, 0, Cols, Rows, 0, 0, -1, 1);
// drawKeyboardLabels(0);
drawKeyboardLabels(0);
tic->api.blit(tic, NULL, NULL, NULL);
@@ -210,7 +230,7 @@ static void initTouchKeyboard()
tic->api.map(tic, &platform.studio->config()->cart->bank0.map,
&platform.studio->config()->cart->bank0.tiles, TIC_MAP_SCREEN_WIDTH+8, 0, Cols, Rows, 0, 0, -1, 1);
// drawKeyboardLabels(2);
drawKeyboardLabels(2);
tic->api.blit(tic, NULL, NULL, NULL);
+1 -1
View File
@@ -662,7 +662,7 @@ static s32 api_fixed_text(tic_mem* memory, const char* text, s32 x, s32 y, u8 co
static s32 drawNonFixedChar(tic_mem* memory, u8 symbol, s32 x, s32 y, s32 width, s32 height, u8 color, s32 scale, bool alt)
{
const u8* ptr = memory->font.data + (symbol)*BITS_IN_BYTE + (alt ? TIC_FONT_CHARS / 2 : 0);
const u8* ptr = memory->font.data + (symbol + (alt ? TIC_FONT_CHARS / 2 : 0))*BITS_IN_BYTE;
const s32 FontWidth = alt ? TIC_ALTFONT_WIDTH : TIC_FONT_WIDTH;