remove unused plot char variants

Author: braindigitalis

src/flanterm/fb.c

@@ -80,66 +80,6 @@ static void flanterm_fb_swap_palette(struct flanterm_context *_ctx) {
 	ctx->text_fg = tmp;
 }
 
-static void plot_char_scaled_canvas(struct flanterm_context *_ctx, struct flanterm_fb_char *c, size_t x, size_t y) {
-	struct flanterm_fb_context *ctx = (void *) _ctx;
-
-	if (x >= _ctx->cols || y >= _ctx->rows) {
-		return;
-	}
-
-	x = ctx->offset_x + x * ctx->glyph_width;
-	y = ctx->offset_y + y * ctx->glyph_height;
-
-	bool *glyph = &ctx->font_bool[c->c * ctx->font_height * ctx->font_width];
-	// naming: fx,fy for font coordinates, gx,gy for glyph coordinates
-	for (size_t gy = 0; gy < ctx->glyph_height; gy++) {
-		uint8_t fy = gy / ctx->font_scale_y;
-		volatile uint32_t *fb_line = ctx->framebuffer + x + (y + gy) * (ctx->pitch / 4);
-		uint32_t *canvas_line = ctx->canvas + x + (y + gy) * ctx->width;
-		bool *glyph_pointer = glyph + (fy * ctx->font_width);
-		for (size_t fx = 0; fx < ctx->font_width; fx++) {
-			for (size_t i = 0; i < ctx->font_scale_x; i++) {
-				size_t gx = ctx->font_scale_x * fx + i;
-				uint32_t bg = c->bg == 0xffffffff ? canvas_line[gx] : c->bg;
-				uint32_t fg = c->fg == 0xffffffff ? canvas_line[gx] : c->fg;
-				fb_line[gx] = *glyph_pointer ? fg : bg;
-			}
-			glyph_pointer++;
-		}
-	}
-}
-
-static void plot_char_scaled_uncanvas(struct flanterm_context *_ctx, struct flanterm_fb_char *c, size_t x, size_t y) {
-	struct flanterm_fb_context *ctx = (void *) _ctx;
-
-	if (x >= _ctx->cols || y >= _ctx->rows) {
-		return;
-	}
-
-	uint32_t default_bg = ctx->default_bg;
-
-	uint32_t bg = c->bg == 0xffffffff ? default_bg : c->bg;
-	uint32_t fg = c->fg == 0xffffffff ? default_bg : c->fg;
-
-	x = ctx->offset_x + x * ctx->glyph_width;
-	y = ctx->offset_y + y * ctx->glyph_height;
-
-	bool *glyph = &ctx->font_bool[c->c * ctx->font_height * ctx->font_width];
-	// naming: fx,fy for font coordinates, gx,gy for glyph coordinates
-	for (size_t gy = 0; gy < ctx->glyph_height; gy++) {
-		uint8_t fy = gy / ctx->font_scale_y;
-		volatile uint32_t *fb_line = ctx->framebuffer + x + (y + gy) * (ctx->pitch / 4);
-		bool *glyph_pointer = glyph + (fy * ctx->font_width);
-		for (size_t fx = 0; fx < ctx->font_width; fx++) {
-			for (size_t i = 0; i < ctx->font_scale_x; i++) {
-				size_t gx = ctx->font_scale_x * fx + i;
-				fb_line[gx] = *glyph_pointer ? fg : bg;
-			}
-			glyph_pointer++;
-		}
-	}
-}
-
 static void plot_char_unscaled_canvas(struct flanterm_context *_ctx, struct flanterm_fb_char *c, size_t x, size_t y) {
 	struct flanterm_fb_context *ctx = (void *) _ctx;
 
@@ -172,38 +112,6 @@ int64_t flanterm_ex_get_bounding_max_y() {
 	return ft_max_y;
 }
 
-static void plot_char_unscaled_uncanvas(struct flanterm_context *_ctx, struct flanterm_fb_char *c, size_t x, size_t y) {
-	struct flanterm_fb_context *ctx = (void *) _ctx;
-
-	if (x >= _ctx->cols || y >= _ctx->rows) {
-		return;
-	}
-
-	uint32_t default_bg = ctx->default_bg;
-
-	uint32_t bg = c->bg == 0xffffffff ? default_bg : c->bg;
-	uint32_t fg = c->fg == 0xffffffff ? default_bg : c->fg;
-
-	x = ctx->offset_x + x * ctx->glyph_width;
-	y = ctx->offset_y + y * ctx->glyph_height;
-
-	bool *glyph = &ctx->font_bool[c->c * ctx->font_height * ctx->font_width];
-	// naming: fx,fy for font coordinates, gx,gy for glyph coordinates
-	if (ft_min_y == -1 || ft_min_y > (int64_t) y) {
-		ft_min_y = (int64_t) y;
-	}
-	if (ft_max_y == -1 || ft_max_y < (int64_t) (y + ctx->glyph_height)) {
-		ft_max_y = (int64_t) (y + ctx->glyph_height);
-	}
-	for (size_t gy = 0; gy < ctx->glyph_height; gy++) {
-		volatile uint32_t *fb_line = ctx->framebuffer + x + (y + gy) * (ctx->pitch / 4);
-		bool *glyph_pointer = glyph + (gy * ctx->font_width);
-		for (size_t fx = 0; fx < ctx->font_width; fx++) {
-			fb_line[fx] = *(glyph_pointer++) ? fg : bg;
-		}
-	}
-}
-
 static inline bool compare_char(struct flanterm_fb_char *a, struct flanterm_fb_char *b) {
 	return !(a->c != b->c || a->bg != b->bg || a->fg != b->fg);
 }
@@ -759,20 +667,7 @@ struct flanterm_context *flanterm_fb_init(
 		}
 	}
 
-//	if (font_scale_x == 1 && font_scale_y == 1) {
-//		if (canvas == NULL) {
-//			ctx->plot_char = plot_char_unscaled_uncanvas;
-//		} else {
-			ctx->plot_char = plot_char_unscaled_canvas;
-//		}
-//	} else {
-//		if (canvas == NULL) {
-//			ctx->plot_char = plot_char_scaled_uncanvas;
-//		} else {
-//			ctx->plot_char = plot_char_scaled_canvas;
-//		}
-//	}
-
+	ctx->plot_char = plot_char_unscaled_canvas;
 	_ctx->raw_putchar = flanterm_fb_raw_putchar;
 	_ctx->clear = flanterm_fb_clear;
 	_ctx->set_cursor_pos = flanterm_fb_set_cursor_pos;