update font rendering

Author: medvednikov

query.v

@@ -88,14 +88,14 @@ fn (mut vid Vid) draw_query() {
 	vid.vg.draw_rect(x, y, width, height, gx.white)
 	// query window title
 	vid.vg.draw_rect(x, y, width, vid.line_height, vid.cfg.title_color)
-	vid.ft.draw_text(x + 10, y, vid.typ_to_str(), vid.cfg.file_name_cfg)
+	vid.vg.draw_text(x + 10, y, vid.typ_to_str(), vid.cfg.file_name_cfg)
 	// query background
 	vid.vg.draw_rect(0, 0, vid.win_width, vid.line_height, vid.cfg.title_color)
 	mut q := vid.query
 	if vid.query_type == QueryType.search || vid.query_type == QueryType.grep {
 		q = vid.search_query
 	}
-	vid.ft.draw_text(x + 10, y + 30, q, txt_cfg)
+	vid.vg.draw_text(x + 10, y + 30, q, txt_cfg)
 	if vid.query_type == .ctrlp {
 		vid.draw_ctrlp_files(x, y)
 	}
@@ -118,7 +118,7 @@ fn (mut vid Vid) draw_ctrlp_files(x, y int) {
 		if !file.contains(vid.query.to_lower()) {
 			continue
 		}
-		vid.ft.draw_text(x + 10, y + 60 + 30 * j, file, txt_cfg)
+		vid.vg.draw_text(x + 10, y + 60 + 30 * j, file, txt_cfg)
 		j++
 	}
 }
@@ -135,7 +135,7 @@ fn (mut vid Vid) draw_top_tasks(x, y int) {
 			continue
 		}
 		// println('DOES CONTAIN "$file" $j')
-		vid.ft.draw_text(x + 10, y + 60 + 30 * j, task, txt_cfg)
+		vid.vg.draw_text(x + 10, y + 60 + 30 * j, task, txt_cfg)
 		j++
 	}
 }
@@ -158,8 +158,8 @@ fn (mut vid Vid) draw_git_grep(x, y int) {
 		if i == vid.gg_pos {
 			vid.vg.draw_rect(x, yy, query_width * 2, 30, vid.cfg.vcolor)
 		}
-		vid.ft.draw_text(x + 10, yy, path, txt_cfg)
-		vid.ft.draw_text(x + 250, yy, text, txt_cfg)
+		vid.vg.draw_text(x + 10, yy, path, txt_cfg)
+		vid.vg.draw_text(x + 250, yy, text, txt_cfg)
 	}
 }
 

timer.v

@@ -1,7 +1,6 @@
 module main
 
 import gg
-import gg.ft
 import gx
 import os
 import time
@@ -25,7 +24,6 @@ const (
 struct Timer {
 mut:
 	gg &gg.Context
-	ft &ft.FT
 	tasks []Task
 	date time.Time
 
@@ -106,10 +104,9 @@ fn (mut t Timer) load_tasks() {
 }
 
 
-fn new_timer(gg &gg.Context, ft &ft.FT) Timer {
+fn new_timer(gg &gg.Context) Timer {
 	mut timer := Timer {
 		gg: gg
-		ft: ft
 		date: time.now()
 	}
 	timer.load_tasks()
@@ -142,7 +139,7 @@ fn (mut t Timer) draw() {
 		y := f64(window_y) + f64(task.start) / scale + 10
 		height := f64(task.end - task.start) / scale
 		t.gg.draw_rect(f32(x), f32(y), f32(hour_width),	f32(height), task.color)
-		t.ft.draw_text(int(x)+hour_width + 10, int(y)+5, task.name + ' ' + task.duration, gx.TextCfg{ color: task.color })
+		t.gg.draw_text(int(x)+hour_width + 10, int(y)+5, task.name + ' ' + task.duration, gx.TextCfg{ color: task.color })
 		if task.productive {
 			total += task.duration_min
 		}
@@ -151,7 +148,7 @@ fn (mut t Timer) draw() {
 		hour_y := window_y + hour * hour_width + 10
 		hour_x := window_x + 30
 		if hour < 24 {
-			t.ft.draw_text(hour_x - 25, hour_y + 10,
+			t.gg.draw_text(hour_x - 25, hour_y + 10,
 				'${hour:02d}', time_cfg)
 		}
 		t.gg.draw_line(hour_x, hour_y, hour_x + hour_width, hour_y, gx.gray)
@@ -163,11 +160,11 @@ fn (mut t Timer) draw() {
 	t.gg.draw_line(window_x + 30 + hour_width, window_y + 10, window_x+30+hour_width, window_y+10+24*
 		hour_width, gx.gray)
 	// Draw the in the top right corner
-	t.ft.draw_text_def(window_x + window_width - 100, 20, t.date.ymmdd())
+	t.gg.draw_text_def(window_x + window_width - 100, 20, t.date.ymmdd())
 	// Draw total time
 	h := total/ 60
 	m := total % 60
-	t.ft.draw_text(window_x + window_width - 100, 100, '$h:${m:02d}', gx.TextCfg{ color: color_productive })
+	t.gg.draw_text(window_x + window_width - 100, 100, '$h:${m:02d}', gx.TextCfg{ color: color_productive })
 
 
 }

vid.v

@@ -5,7 +5,6 @@
 module main
 
 import gg
-import gg.ft
 import os
 import time
 import uiold
@@ -71,7 +70,6 @@ mut:
 	all_git_files    []string
 	top_tasks        []string
 	vg               &gg.Context
-	ft               &ft.FT
 	query            string
 	search_query     string
 	query_type       QueryType
@@ -118,10 +116,6 @@ Options:
 )
 
 const ( fpath = os.resource_abs_path('RobotoMono-Regular.ttf') )
-fn init_gui(mut vid Vid){
-	x := ft.new({ font_path: fpath, scale: 2 }) or {panic(err)}
-	vid.ft = x
-}
 
 fn main() {
 	if '-h' in os.args || '--help' in os.args {
@@ -174,7 +168,6 @@ fn main() {
 		//font_size: 13
 		view: 0
 		vg: 0
-		ft: 0
 	}
 	vid.handle_segfault()
 	vid.cfg.init_colors()
@@ -199,16 +192,16 @@ fn main() {
 		event_fn: on_event
 		keydown_fn: key_down
 		char_fn: on_char
-		init_fn: init_gui
+		font_path: os.resource_abs_path('RobotoMono-Regular.ttf')
 	})
 		println('FULL SCREEN=${!is_window}')
-	vid.timer = new_timer(vid.vg, vid.ft)
+	vid.timer = new_timer(vid.vg)
 	vid.load_all_tasks()
-    //
+
 	// TODO linux and windows
 	//C.AXUIElementCreateApplication(234)
 	uiold.reg_key_vid()
-    //
+
 	// Open workspaces or a file
 	println(os.args)
 	mut cur_dir := os.getwd()
@@ -291,7 +284,6 @@ fn frame(mut vid Vid) {
 	//if !vid.refresh {
 		//return
 	//}
-	vid.ft.flush()
 	vid.vg.begin()
 	vid.draw()
 	vid.vg.end()
@@ -348,29 +340,29 @@ fn (mut vid Vid) draw() {
 		if v.changed && !v.path.ends_with('/out') {
 			name = '$name [+]'
 		}
-		vid.ft.draw_text(vid.split_x(i - from) + v.padding_left + 10, 1, name, vid.cfg.file_name_cfg)
+		vid.vg.draw_text(vid.split_x(i - from) + v.padding_left + 10, 1, name, vid.cfg.file_name_cfg)
 	}
 	// Git diff stats
 	if vid.git_diff_plus != '+' {
-		vid.ft.draw_text(vid.win_width - 400, 1, vid.git_diff_plus, vid.cfg.plus_cfg)
+		vid.vg.draw_text(vid.win_width - 400, 1, vid.git_diff_plus, vid.cfg.plus_cfg)
 	}
 	if vid.git_diff_minus != '-' {
-		vid.ft.draw_text(vid.win_width - 350, 1, vid.git_diff_minus, vid.cfg.minus_cfg)
+		vid.vg.draw_text(vid.win_width - 350, 1, vid.git_diff_minus, vid.cfg.minus_cfg)
 	}
 	// Workspaces
 	nr_spaces := vid.workspaces.len
 	cur_space := vid.workspace_idx + 1
 	space_name := short_space(vid.workspace)
-	vid.ft.draw_text(vid.win_width - 220, 1, '[$space_name]', vid.cfg.file_name_cfg)
-	vid.ft.draw_text(vid.win_width - 150, 1, '$cur_space/$nr_spaces', vid.cfg.file_name_cfg)
+	vid.vg.draw_text(vid.win_width - 220, 1, '[$space_name]', vid.cfg.file_name_cfg)
+	vid.vg.draw_text(vid.win_width - 150, 1, '$cur_space/$nr_spaces', vid.cfg.file_name_cfg)
 	// Time
-	vid.ft.draw_text(vid.win_width - 50, 1, now.hhmm(), vid.cfg.file_name_cfg)
+	vid.vg.draw_text(vid.win_width - 50, 1, now.hhmm(), vid.cfg.file_name_cfg)
 	// vid.vg.draw_text(vid.win_width - 550, 1, now.hhmmss(), file_name_cfg)
 	// vim top right next to current time
 	/*
 	if vid.start_unix > 0 {
 		minutes := '1m' //vid.timer.minutes()
-		vid.ft.draw_text(vid.win_width - 300, 1, '${minutes}m' !,
+		vid.vg.draw_text(vid.win_width - 300, 1, '${minutes}m' !,
 			vid.cfg.file_name_cfg)
 	}
 	*/
@@ -379,10 +371,10 @@ fn (mut vid Vid) draw() {
 		task_text_width := vid.cur_task.len * vid.char_width
 		task_x := vid.win_width - split_width - task_text_width - 10
 		// vid.timer.vg.draw_text(task_x, 1, vid.timer.cur_task.to_upper(), file_name_cfg)
-		vid.ft.draw_text(task_x, 1, vid.cur_task, vid.cfg.file_name_cfg)
+		vid.vg.draw_text(task_x, 1, vid.cur_task, vid.cfg.file_name_cfg)
 		// Draw current task time
 		task_time_x := (vid.nr_splits - 1) * split_width - 50
-		vid.ft.draw_text(task_time_x, 1, '${vid.task_minutes()}m',
+		vid.vg.draw_text(task_time_x, 1, '${vid.task_minutes()}m',
 			vid.cfg.file_name_cfg)
 	}
 	// Splits
@@ -431,7 +423,7 @@ fn (mut vid Vid) draw_split(i, split_from int) {
 		}
 		// Line number
 		line_number := j + 1
-		vid.ft.draw_text(x+3, y, '$line_number', vid.cfg.line_nr_cfg)
+		vid.vg.draw_text(x+3, y, '$line_number', vid.cfg.line_nr_cfg)
 		// Tab offset
 		mut line_x := x + 10
 		mut nr_tabs := 0
@@ -461,7 +453,7 @@ fn (mut vid Vid) draw_split(i, split_from int) {
 				vid.draw_line(line_x, y, s)// SYNTAX HL
 			}
 			else {
-				vid.ft.draw_text(line_x, y, line, vid.cfg.txt_cfg)// NO SYNTAX
+				vid.vg.draw_text(line_x, y, line, vid.cfg.txt_cfg)// NO SYNTAX
 			}
 		}
 		line_nr++
@@ -486,12 +478,12 @@ fn (mut vid Vid) draw_line(x, y int, line string) {
 	// Red/green test hack
 	if line.contains('[32m') &&
 	line.contains('PASS') {
-		vid.ft.draw_text(x, y, line[5..], vid.cfg.green_cfg)
+		vid.vg.draw_text(x, y, line[5..], vid.cfg.green_cfg)
 		return
 	}
 	else if line.contains('[31m') &&
 	line.contains('FAIL') {
-		vid.ft.draw_text(x, y, line[5..], vid.cfg.red_cfg)
+		vid.vg.draw_text(x, y, line[5..], vid.cfg.red_cfg)
 		return
 	//} else if line[0] == `-` {
 	}
@@ -556,12 +548,12 @@ fn (mut vid Vid) draw_line(x, y int, line string) {
 		}
 	}
 	if vid.is_ml_comment {
-		vid.ft.draw_text(x, y, line, vid.cfg.comment_cfg)
+		vid.vg.draw_text(x, y, line, vid.cfg.comment_cfg)
 		return
 	}
 	if vid.chunks.len == 0 {
 		// println('no chunks')
-		vid.ft.draw_text(x, y, line, vid.cfg.txt_cfg)
+		vid.vg.draw_text(x, y, line, vid.cfg.txt_cfg)
 		return
 	}
 	mut pos := 0
@@ -575,7 +567,7 @@ fn (mut vid Vid) draw_line(x, y int, line string) {
 		// since we don't have a seperate chunk for text)
 		if chunk.start > pos + 1 {
 			s := line[pos..chunk.start]
-			vid.ft.draw_text(x + pos * vid.char_width, y, s, vid.cfg.txt_cfg)
+			vid.vg.draw_text(x + pos * vid.char_width, y, s, vid.cfg.txt_cfg)
 		}
 		// Keyword string etc
 		typ := chunk.typ
@@ -585,12 +577,12 @@ fn (mut vid Vid) draw_line(x, y int, line string) {
 			.a_comment { vid.cfg.comment_cfg }
 		}
 		s := line[chunk.start..chunk.end]
-		vid.ft.draw_text(x + chunk.start * vid.char_width, y, s, cfg)
+		vid.vg.draw_text(x + chunk.start * vid.char_width, y, s, cfg)
 		pos = chunk.end
 		// Final text chunk
 		if i == vid.chunks.len - 1 && chunk.end < line.len {
 			final := line[chunk.end..line.len]
-			vid.ft.draw_text(x + pos * vid.char_width, y, final, vid.cfg.txt_cfg)
+			vid.vg.draw_text(x + pos * vid.char_width, y, final, vid.cfg.txt_cfg)
 		}
 	}
 }