Skip to content

Commit 6531a52

Browse files
hpjanssonhpjansson
committed
ChafaCanvas: pixel_canvas -> pixel_renderer
1 parent 0b2672c commit 6531a52

File tree

2 files changed

+37
-37
lines changed

2 files changed

+37
-37
lines changed

‎chafa/chafa-canvas.c‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -371,20 +371,20 @@ find_best_solid_char (ChafaCanvas *canvas)
371371
}
372372

373373
static void
374-
destroy_pixel_canvas (ChafaCanvas *canvas)
374+
destroy_pixel_renderer (ChafaCanvas *canvas)
375375
{
376-
if (canvas->pixel_canvas)
376+
if (canvas->pixel_renderer)
377377
{
378378
if (canvas->config.pixel_mode == CHAFA_PIXEL_MODE_SYMBOLS)
379-
chafa_symbol_renderer_destroy (canvas->pixel_canvas);
379+
chafa_symbol_renderer_destroy (canvas->pixel_renderer);
380380
else if (canvas->config.pixel_mode == CHAFA_PIXEL_MODE_SIXELS)
381-
chafa_sixel_renderer_destroy (canvas->pixel_canvas);
381+
chafa_sixel_renderer_destroy (canvas->pixel_renderer);
382382
else if (canvas->config.pixel_mode == CHAFA_PIXEL_MODE_KITTY)
383-
chafa_kitty_renderer_destroy (canvas->pixel_canvas);
383+
chafa_kitty_renderer_destroy (canvas->pixel_renderer);
384384
else if (canvas->config.pixel_mode == CHAFA_PIXEL_MODE_ITERM2)
385-
chafa_iterm2_renderer_destroy (canvas->pixel_canvas);
385+
chafa_iterm2_renderer_destroy (canvas->pixel_renderer);
386386

387-
canvas->pixel_canvas = NULL;
387+
canvas->pixel_renderer = NULL;
388388
}
389389
}
390390

@@ -413,7 +413,7 @@ draw_all_pixels (ChafaCanvas *canvas, ChafaPixelType src_pixel_type,
413413
canvas->pixels = NULL;
414414
}
415415

416-
destroy_pixel_canvas (canvas);
416+
destroy_pixel_renderer (canvas);
417417

418418
if (canvas->config.pixel_mode == CHAFA_PIXEL_MODE_KITTY
419419
|| canvas->config.pixel_mode == CHAFA_PIXEL_MODE_ITERM2)
@@ -426,12 +426,12 @@ draw_all_pixels (ChafaCanvas *canvas, ChafaPixelType src_pixel_type,
426426
{
427427
/* Symbol mode */
428428

429-
canvas->pixel_canvas = chafa_symbol_renderer_new (canvas,
430-
0,
431-
0,
432-
canvas->config.width,
433-
canvas->config.height);
434-
chafa_symbol_renderer_draw_all_pixels (canvas->pixel_canvas,
429+
canvas->pixel_renderer = chafa_symbol_renderer_new (canvas,
430+
0,
431+
0,
432+
canvas->config.width,
433+
canvas->config.height);
434+
chafa_symbol_renderer_draw_all_pixels (canvas->pixel_renderer,
435435
src_pixel_type,
436436
src_pixels,
437437
src_width, src_height,
@@ -445,12 +445,12 @@ draw_all_pixels (ChafaCanvas *canvas, ChafaPixelType src_pixel_type,
445445
/* Sixel mode */
446446

447447
canvas->fg_palette.alpha_threshold = canvas->config.alpha_threshold;
448-
canvas->pixel_canvas = chafa_sixel_renderer_new (canvas->width_pixels,
449-
canvas->height_pixels,
450-
canvas->config.color_space,
451-
&canvas->fg_palette,
452-
&canvas->dither);
453-
chafa_sixel_renderer_draw_all_pixels (canvas->pixel_canvas,
448+
canvas->pixel_renderer = chafa_sixel_renderer_new (canvas->width_pixels,
449+
canvas->height_pixels,
450+
canvas->config.color_space,
451+
&canvas->fg_palette,
452+
&canvas->dither);
453+
chafa_sixel_renderer_draw_all_pixels (canvas->pixel_renderer,
454454
src_pixel_type,
455455
src_pixels,
456456
src_width, src_height,
@@ -464,11 +464,11 @@ draw_all_pixels (ChafaCanvas *canvas, ChafaPixelType src_pixel_type,
464464
/* Kitty mode */
465465

466466
canvas->fg_palette.alpha_threshold = canvas->config.alpha_threshold;
467-
canvas->pixel_canvas = chafa_kitty_renderer_new (canvas->width_pixels,
468-
canvas->height_pixels);
467+
canvas->pixel_renderer = chafa_kitty_renderer_new (canvas->width_pixels,
468+
canvas->height_pixels);
469469

470-
if (canvas->pixel_canvas)
471-
chafa_kitty_renderer_draw_all_pixels (canvas->pixel_canvas,
470+
if (canvas->pixel_renderer)
471+
chafa_kitty_renderer_draw_all_pixels (canvas->pixel_renderer,
472472
src_pixel_type,
473473
src_pixels,
474474
src_width, src_height,
@@ -482,11 +482,11 @@ draw_all_pixels (ChafaCanvas *canvas, ChafaPixelType src_pixel_type,
482482
/* iTerm2 mode */
483483

484484
canvas->fg_palette.alpha_threshold = canvas->config.alpha_threshold;
485-
canvas->pixel_canvas = chafa_iterm2_renderer_new (canvas->width_pixels,
486-
canvas->height_pixels);
485+
canvas->pixel_renderer = chafa_iterm2_renderer_new (canvas->width_pixels,
486+
canvas->height_pixels);
487487

488-
if (canvas->pixel_canvas)
489-
chafa_iterm2_renderer_draw_all_pixels (canvas->pixel_canvas,
488+
if (canvas->pixel_renderer)
489+
chafa_iterm2_renderer_draw_all_pixels (canvas->pixel_renderer,
490490
src_pixel_type,
491491
src_pixels,
492492
src_width, src_height,
@@ -649,7 +649,7 @@ chafa_canvas_new_similar (ChafaCanvas *orig)
649649
chafa_canvas_config_copy_contents (&canvas->config, &orig->config);
650650

651651
canvas->pixels = NULL;
652-
canvas->pixel_canvas = NULL;
652+
canvas->pixel_renderer = NULL;
653653
canvas->cells = g_new (ChafaCanvasCell, canvas->config.width * canvas->config.height);
654654
canvas->needs_clear = TRUE;
655655

@@ -699,7 +699,7 @@ chafa_canvas_unref (ChafaCanvas *canvas)
699699
if (canvas->placement)
700700
chafa_placement_unref (canvas->placement);
701701
chafa_canvas_config_deinit (&canvas->config);
702-
destroy_pixel_canvas (canvas);
702+
destroy_pixel_renderer (canvas);
703703
chafa_dither_deinit (&canvas->dither);
704704
chafa_palette_deinit (&canvas->fg_palette);
705705
chafa_palette_deinit (&canvas->bg_palette);
@@ -880,33 +880,33 @@ chafa_canvas_print (ChafaCanvas *canvas, ChafaTermInfo *term_info)
880880
}
881881
else if (canvas->config.pixel_mode == CHAFA_PIXEL_MODE_SIXELS
882882
&& chafa_term_info_get_seq (term_info, CHAFA_TERM_SEQ_BEGIN_SIXELS)
883-
&& canvas->pixel_canvas)
883+
&& canvas->pixel_renderer)
884884
{
885885
/* Sixel mode */
886886

887887
str = g_string_new ("");
888-
chafa_sixel_renderer_build_ansi (canvas->pixel_canvas, term_info, str,
888+
chafa_sixel_renderer_build_ansi (canvas->pixel_renderer, term_info, str,
889889
canvas->config.passthrough);
890890
}
891891
else if (canvas->config.pixel_mode == CHAFA_PIXEL_MODE_KITTY
892892
&& chafa_term_info_get_seq (term_info, CHAFA_TERM_SEQ_BEGIN_KITTY_IMMEDIATE_IMAGE_V1)
893-
&& canvas->pixel_canvas)
893+
&& canvas->pixel_renderer)
894894
{
895895
/* Kitty mode */
896896

897897
str = g_string_new ("");
898-
chafa_kitty_renderer_build_ansi (canvas->pixel_canvas, term_info, str,
898+
chafa_kitty_renderer_build_ansi (canvas->pixel_renderer, term_info, str,
899899
canvas->config.width, canvas->config.height,
900900
canvas->placement ? canvas->placement->id : -1,
901901
canvas->config.passthrough);
902902
}
903903
else if (canvas->config.pixel_mode == CHAFA_PIXEL_MODE_ITERM2
904-
&& canvas->pixel_canvas)
904+
&& canvas->pixel_renderer)
905905
{
906906
/* iTerm2 mode */
907907

908908
str = g_string_new ("");
909-
chafa_iterm2_renderer_build_ansi (canvas->pixel_canvas, term_info, str,
909+
chafa_iterm2_renderer_build_ansi (canvas->pixel_renderer, term_info, str,
910910
canvas->config.width, canvas->config.height);
911911
}
912912
else

‎chafa/internal/chafa-canvas-internal.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ struct ChafaCanvas
7676

7777
/* This is NULL in CHAFA_PIXEL_MODE_SYMBOLS, otherwise one of:
7878
* (ChafaSixelRenderer *), (ChafaKittyRenderer *), (ChafaIterm2Canvas *) */
79-
gpointer pixel_canvas;
79+
gpointer pixel_renderer;
8080

8181
/* It's possible to have a single placement that covers the entire
8282
* canvas. In this case, it is stored here. */

0 commit comments

Comments
 (0)