Tests for GUI implementation

Makefile

@@ -15,6 +15,8 @@ endif
 ifeq ($(SDL), 2)
 	LDFLAGS += -lSDL2 -lSDL_ttf
 	ASFLAGS += -DSDL2=1
+	SDL_SCANCODE = /usr/include/SDL2/SDL_scancode.h
+	SDL_KEYCODE = /usr/include/SDL2/SDL_keycode.h
 else
 	LDFLAGS += -lSDL -lSDL_ttf
 	ASFLAGS += -DSDL1=1
@@ -33,6 +35,11 @@ $(TARGET): $(OBJ)
 $(OBJ): $(SRC) $(DEPS) Makefile
 	$(NASM) $(ASFLAGS) $<
 
+sdl_keys_.asm:
+	echo "%%define SDLK_SCANCODE_MASK (1<<30)" > $@ ;
+	sed -nE 's/^[ \t]+(SDL_SCANCODE_[^ ]+) = ([^,]+),.*$$/%%define \1 \2/pg' $(SDL_SCANCODE) >> $@ ; 
+	sed -nE -e 's/SDL_SCANCODE_TO_KEYCODE\(([^\)]+)\)/(SDLK_SCANCODE_MASK | \1)/' -e "s/'/\"/g" -e 's/^[ \t]+(SDLK_[^ ]+) = ([^,]+),.*$$/%%define \1 \2/pg' $(SDL_KEYCODE) >> $@
+
 .PHONY: clean
 
 clean:

utils.asm

@@ -3,3 +3,8 @@
 	__%1_len:
 	%define %1_len (__%1_len - %1)
 %endmacro
+
+%macro OPT_CHR 2
+	.%1: db %2
+	align 4, db 0
+%endmacro

yaglitch.asm

@@ -49,6 +49,28 @@ section .data
 		dq OP.gt ; t
 		dq OP.eq ; u
 
+	opt_chr: ; pointers on OP chr repr
+		OPT_CHR a, "T"
+		OPT_CHR b, "Put"
+		OPT_CHR c, "Drop"
+		OPT_CHR d, "*"
+		OPT_CHR e, "/"
+		OPT_CHR f, "+"
+		OPT_CHR g, "-"
+		OPT_CHR h, "%"
+		OPT_CHR j, "<<"
+		OPT_CHR k, ">>"
+		OPT_CHR l, "&"
+		OPT_CHR m, "|"
+		OPT_CHR n, "^"
+		OPT_CHR o, "Not"
+		OPT_CHR p, "Dup"
+		OPT_CHR q, "Pck"
+		OPT_CHR r, "Swp"
+		OPT_CHR s, "<"
+		OPT_CHR t, ">"
+		OPT_CHR eq, "="
+
 
 	audiospec_wanted: ; SDL_audio configuration
 		dd 8000 ; freq
@@ -75,6 +97,7 @@ section .data
 	FC_FILE: db "file", 0x0
 	;FC_SPACING: db "spacing", 0x0
 	;FC_LANG: db "lang", 0x0
+	teststr: db "0123456789ABCDEF", 0x0
 
 section .bss
 
@@ -110,7 +133,9 @@ section .bss
 		.rd: resd 1
 		.wr: resd 1
 
+	; visu_* are SDL stuff
 	visu_data_buff: resb 0x100
+	visu_data_sz: resq 1
 
 	%ifdef SDL2
 		visu_win: resq 1
@@ -122,18 +147,20 @@ section .bss
 
 	text_surf: resq 1
 
+	; ttf_* are SDL_ttf stuff
 	ttf_font: resq 1
 
 	ttf_font_surf: resq 1
 
 	sdl_color: resd 1
 
-	fc_config: resq 1
-	fc_pattern: resq 1
-	fc_object_set: resq 1
-	fc_font_set: resq 1
-	fc_font_file_ptr: resq 1
-	fc_result: resd 1
+	; fc_* are fontconfig stuff
+	fc_config: resq 1 ; ptr on FcConfig
+	fc_pattern: resq 1 ; ptr on FcPatter
+	fc_object_set: resq 1 ; object set (listing wanted property)
+	fc_font_set: resq 1 ; font set (when listing fonts)
+	fc_font_file_ptr: resq 1 ; pointer on filename ptr
+	fc_result: resd 1 ; an FcResult memory space
 
 section .text
 global _start
@@ -480,6 +507,9 @@ sdl_init:
 	; RAZ surface & blit
 	;call clear_screen ;useless
 
+	;
+	; Print glitch name in window (left for further utilisation)
+	;
 
 	; init fontconfig
 	call FcInitLoadConfigAndFonts
@@ -527,7 +557,8 @@ dbg:
 
 	mov dword [sdl_color], 0xFFFFFFFF
 	mov rdi, [ttf_font]
-	mov rsi, glitch_name
+	;mov rsi, glitch_name
+	mov rsi, teststr
 	mov rdx, [sdl_color]
 	call TTF_RenderText_Solid ; render text in surface
 	mov [ttf_font_surf], rax
@@ -563,7 +594,7 @@ loop_event:
 evt: ; not exit event
 
 
-visu:
+visu_upd:
 	; starts by reading from IPC pipe
 	xor rax, rax ; sys_read
 	xor rdi, rdi
@@ -573,6 +604,40 @@ visu:
 	syscall
 	cmp rax, -1
 	je exit_fatal
+	test rax, rax
+	jz loop_event ; no data in pipe, loop again
+	; datas in pipe, updating screen
+	mov [visu_data_sz], rax
+
+	mov rdi, [visu_surf]
+	push rdi
+	call SDL_LockSurface
+
+	pushf
+	mov rsi, [rsp]
+	xor rcx, rcx
+	mov ecx, [rsi+16] ; surf_w
+	push rcx
+	dec qword [rsp] ; surf_w - 1, droping last colon
+	xor rax, rax
+	xor rdx, rdx
+	mov eax, [rsi+24] ; surf_pitch
+	mul ecx
+	mov rdx, rax ; line size in bytes
+
+	mov rsi, [rsi+32] ; surf_pixels
+	mov rcx, [rsp] ; surf_w - 1
+	add rsi, [rsp]
+	mov rdi, rsi
+	inc rdi ; destination is last colon
+	push rdi
+	mov rsi, [visu_data_buff]
+	.loop_shift:
+		mov rcx, 0xFF ; shift all 0xff pixels on colons
+	
+	pop rdi
+	pop rcx
+	popf
 
 	jmp loop_event ; loop again
 

yaglitch_ui.asm

@@ -1,6 +1,7 @@
 
 
 clear_screen:
+	; fill screen with a color
 	mov rdi, [visu_surf]
 	push rdi
 	call SDL_LockSurface
@@ -32,6 +33,7 @@ clear_screen:
 	mov rdi, [visu_surf]
 
 blitflip_visu:
+	; blit a suface on screen and flip screen
 	; with rdi the src surface
 
 	xor rsi, rsi
@@ -42,6 +44,7 @@ blitflip_visu:
 	jnz sdl_error
 
 flip_visu:
+	; flip screen
 
 	%ifdef SDL2
 		mov rdi, [visu_win]