Fix codestyle issues

Author: codeation

draw.c

@@ -1,58 +1,67 @@
 #include "terminal.h"
 #include <gtk/gtk.h>
 
+// draw elem
+
 #define DRAW_ELEM_FILL 1
 #define DRAW_ELEM_LINE 2
 #define DRAW_ELEM_TEXT 3
 #define DRAW_ELEM_IMAGE 4
 
-// general
-
 typedef struct {
     int type;
-} type_elem;
+    union {
+        struct {
+            double x, y, width, height;
+            double r, g, b, a;
+        } fill;
+        struct {
+            double x0, y0, x1, y1;
+            double r, g, b, a;
+        } line;
+        struct {
+            double x, y;
+            double scale_x, scale_y;
+            cairo_surface_t *bitmap;
+        } image;
+        struct {
+            double x, y;
+            char *text;
+            PangoLayout *layout;
+            double r, g, b, a;
+        } text;
+    } data;
+} DrawElem;
 
 // fill
 
-typedef struct {
-    int type;
-    double x, y, width, height;
-    double r, g, b, a;
-} fill_elem;
-
-static inline void elem_fill_draw(cairo_t *cr, fill_elem *e) {
-    cairo_set_source_rgba(cr, e->r, e->g, e->b, e->a);
-    cairo_rectangle(cr, e->x, e->y, e->width, e->height);
+static inline void elem_fill_draw(cairo_t *cr, DrawElem *e) {
+    cairo_set_source_rgba(cr, e->data.fill.r, e->data.fill.g, e->data.fill.b, e->data.fill.a);
+    cairo_rectangle(cr, e->data.fill.x, e->data.fill.y, e->data.fill.width, e->data.fill.height);
     cairo_fill(cr);
 }
 
 void elem_fill_add(int id, double x, double y, double width, double height, double r, double g, double b, double a) {
-    fill_elem *e = g_malloc(sizeof(fill_elem));
+    DrawElem *e = g_malloc(sizeof(DrawElem));
     e->type = DRAW_ELEM_FILL;
-    e->x = x;
-    e->y = y;
-    e->width = width;
-    e->height = height;
-    e->r = r;
-    e->g = g;
-    e->b = b;
-    e->a = a;
+    e->data.fill.x = x;
+    e->data.fill.y = y;
+    e->data.fill.width = width;
+    e->data.fill.height = height;
+    e->data.fill.r = r;
+    e->data.fill.g = g;
+    e->data.fill.b = b;
+    e->data.fill.a = a;
     window_add_draw(id, e);
 }
 
 // line
 
-typedef struct {
-    int type;
-    double x0, y0, x1, y1;
-    double r, g, b, a;
-} line_elem;
-
-static inline void elem_line_draw(cairo_t *cr, line_elem *e) {
-    cairo_set_source_rgba(cr, e->r, e->g, e->b, e->a);
+static inline void elem_line_draw(cairo_t *cr, DrawElem *e) {
+    cairo_set_source_rgba(cr, e->data.line.r, e->data.line.g, e->data.line.b, e->data.line.a);
     cairo_set_line_width(cr, 1);
-    cairo_move_to(cr, e->x0, e->y0);
-    cairo_line_to(cr, e->x1, e->y1);
+    cairo_move_to(cr, e->data.line.x0, e->data.line.y0);
+    cairo_line_to(cr, e->data.line.x1, e->data.line.y1);
     cairo_stroke(cr);
 }
 
@@ -64,16 +73,16 @@ void elem_line_add(int id, double x0, double y0, double x1, double y1, double r,
         y0 += 0.5;
         y1 += 0.5;
     }
-    line_elem *e = g_malloc(sizeof(line_elem));
+    DrawElem *e = g_malloc(sizeof(DrawElem));
     e->type = DRAW_ELEM_LINE;
-    e->x0 = x0;
-    e->y0 = y0;
-    e->x1 = x1;
-    e->y1 = y1;
-    e->r = r;
-    e->g = g;
-    e->b = b;
-    e->a = a;
+    e->data.line.x0 = x0;
+    e->data.line.y0 = y0;
+    e->data.line.x1 = x1;
+    e->data.line.y1 = y1;
+    e->data.line.r = r;
+    e->data.line.g = g;
+    e->data.line.b = b;
+    e->data.line.a = a;
     window_add_draw(id, e);
 }
 
@@ -83,7 +92,7 @@ typedef struct {
     unsigned char *data;
     double width, height;
     cairo_surface_t *bitmap;
-} bitmap_elem;
+} BitmapElem;
 
 static GHashTable *bitmap_table = NULL;
 
@@ -101,7 +110,7 @@ void bitmap_add(int id, int width, int height, unsigned char *data) {
         }
         row += stride;
     }
-    bitmap_elem *e = g_malloc(sizeof(bitmap_elem));
+    BitmapElem *e = g_malloc(sizeof(BitmapElem));
     e->data = data;
     e->width = width;
     e->height = height;
@@ -113,7 +122,7 @@ void bitmap_add(int id, int width, int height, unsigned char *data) {
 }
 
 void bitmap_rem(int id) {
-    bitmap_elem *e = g_hash_table_lookup(bitmap_table, GINT_TO_POINTER(id));
+    BitmapElem *e = g_hash_table_lookup(bitmap_table, GINT_TO_POINTER(id));
     g_assert(e);
     g_hash_table_remove(bitmap_table, GINT_TO_POINTER(id));
     cairo_surface_destroy(e->bitmap);
@@ -123,29 +132,22 @@ void bitmap_rem(int id) {
 
 // image drawing
 
-typedef struct {
-    int type;
-    double x, y;
-    double scale_x, scale_y;
-    cairo_surface_t *bitmap;
-} image_elem;
-
-static inline void elem_image_draw(cairo_t *cr, image_elem *e) {
-    cairo_surface_set_device_scale(e->bitmap, e->scale_x, e->scale_y);
-    cairo_set_source_surface(cr, e->bitmap, e->x, e->y);
+static inline void elem_image_draw(cairo_t *cr, DrawElem *e) {
+    cairo_surface_set_device_scale(e->data.image.bitmap, e->data.image.scale_x, e->data.image.scale_y);
+    cairo_set_source_surface(cr, e->data.image.bitmap, e->data.image.x, e->data.image.y);
     cairo_paint(cr);
 }
 
 void elem_image_add(int id, double x, double y, double width, double height, int imageid) {
-    image_elem *e = g_malloc(sizeof(image_elem));
-    bitmap_elem *b = g_hash_table_lookup(bitmap_table, GINT_TO_POINTER(imageid));
+    BitmapElem *b = g_hash_table_lookup(bitmap_table, GINT_TO_POINTER(imageid));
     g_assert(b);
+    DrawElem *e = g_malloc(sizeof(DrawElem));
     e->type = DRAW_ELEM_IMAGE;
-    e->x = x;
-    e->y = y;
-    e->scale_x = b->width / width;
-    e->scale_y = b->height / height;
-    e->bitmap = b->bitmap;
+    e->data.image.x = x;
+    e->data.image.y = y;
+    e->data.image.scale_x = b->width / width;
+    e->data.image.scale_y = b->height / height;
+    e->data.image.bitmap = b->bitmap;
     window_add_draw(id, e);
 }
 
@@ -155,15 +157,15 @@ typedef struct {
     int height;
     PangoFontDescription *desc;
     PangoLayout *layout;
-} font_elem;
+} FontElem;
 
 static PangoContext *top_pango_context = NULL;
 
-static font_elem *font_elem_new(int height, char *family, int style, int variant, int weight, int stretch) {
+static FontElem *font_elem_new(int height, char *family, int style, int variant, int weight, int stretch) {
     if (top_pango_context == NULL) {
         top_pango_context = gtk_widget_get_pango_context(top);
     }
-    font_elem *e = g_malloc(sizeof(font_elem));
+    FontElem *e = g_malloc(sizeof(FontElem));
     e->height = height;
     e->desc = pango_font_description_new();
     pango_font_description_set_family(e->desc, family);
@@ -177,7 +179,7 @@ static font_elem *font_elem_new(int height, char *family, int style, int variant
     return e;
 }
 
-static void font_elem_free(font_elem *e) {
+static void font_elem_free(FontElem *e) {
     g_object_unref(e->layout);
     pango_font_description_free(e->desc);
     g_free(e);
@@ -186,15 +188,15 @@ static void font_elem_free(font_elem *e) {
 static GHashTable *font_elem_table = NULL;
 
 void font_elem_add(int id, int height, char *family, int style, int variant, int weight, int stretch) {
-    font_elem *e = font_elem_new(height, family, style, variant, weight, stretch);
+    FontElem *e = font_elem_new(height, family, style, variant, weight, stretch);
     if (font_elem_table == NULL) {
         font_elem_table = g_hash_table_new(g_direct_hash, g_direct_equal);
     }
     g_hash_table_insert(font_elem_table, GINT_TO_POINTER(id), e);
 }
 
 void font_elem_rem(int id) {
-    font_elem *e = g_hash_table_lookup(font_elem_table, GINT_TO_POINTER(id));
+    FontElem *e = g_hash_table_lookup(font_elem_table, GINT_TO_POINTER(id));
     g_assert(e);
     g_hash_table_remove(font_elem_table, GINT_TO_POINTER(id));
     font_elem_free(e);
@@ -203,22 +205,22 @@ void font_elem_rem(int id) {
 static GHashTable *font_metric_table = NULL;
 
 void font_metric_add(int id, int height, char *family, int style, int variant, int weight, int stretch) {
-    font_elem *e = font_elem_new(height, family, style, variant, weight, stretch);
+    FontElem *e = font_elem_new(height, family, style, variant, weight, stretch);
     if (font_metric_table == NULL) {
         font_metric_table = g_hash_table_new(g_direct_hash, g_direct_equal);
     }
     g_hash_table_insert(font_metric_table, GINT_TO_POINTER(id), e);
 }
 
 void font_metric_rem(int id) {
-    font_elem *e = g_hash_table_lookup(font_metric_table, GINT_TO_POINTER(id));
+    FontElem *e = g_hash_table_lookup(font_metric_table, GINT_TO_POINTER(id));
     g_assert(e);
     g_hash_table_remove(font_metric_table, GINT_TO_POINTER(id));
     font_elem_free(e);
 }
 
 void get_font_metrics(int fontid, int16_t *lineheight, int16_t *baseline, int16_t *ascent, int16_t *descent) {
-    font_elem *f = g_hash_table_lookup(font_metric_table, GINT_TO_POINTER(fontid));
+    FontElem *f = g_hash_table_lookup(font_metric_table, GINT_TO_POINTER(fontid));
     g_assert(f);
     *baseline = (int16_t)(pango_layout_get_baseline(f->layout) / PANGO_SCALE);
     PangoFontMetrics *metrics = pango_context_get_metrics(pango_layout_get_context(f->layout), f->desc, NULL);
@@ -231,7 +233,7 @@ void get_font_metrics(int fontid, int16_t *lineheight, int16_t *baseline, int16_
 // text split
 
 int16_t *font_metric_split_text(int fontid, char *text, int edge, int indent) {
-    font_elem *f = g_hash_table_lookup(font_metric_table, GINT_TO_POINTER(fontid));
+    FontElem *f = g_hash_table_lookup(font_metric_table, GINT_TO_POINTER(fontid));
     g_assert(f);
     pango_layout_set_wrap(f->layout, PANGO_WRAP_WORD_CHAR);
     pango_layout_set_width(f->layout, PANGO_SCALE * edge);
@@ -251,19 +253,16 @@ int16_t *font_metric_split_text(int fontid, char *text, int edge, int indent) {
     }
 #ifdef PANGO_AVAILABLE_ENUMERATOR_IN_1_56
     pango_layout_set_wrap(f->layout, PANGO_WRAP_NONE);
-#else
-    static char *zero = "\0";
-    pango_layout_set_text(f->layout, zero, 0);
+#endif
     pango_layout_set_width(f->layout, -1);
     pango_layout_set_indent(f->layout, 0);
-#endif
     return out;
 }
 
 // text rect
 
 void font_metric_rect_text(int fontid, char *text, int16_t *width, int16_t *height) {
-    font_elem *f = g_hash_table_lookup(font_metric_table, GINT_TO_POINTER(fontid));
+    FontElem *f = g_hash_table_lookup(font_metric_table, GINT_TO_POINTER(fontid));
     g_assert(f);
     pango_layout_set_text(f->layout, text, -1);
     int w, h;
@@ -272,45 +271,38 @@ void font_metric_rect_text(int fontid, char *text, int16_t *width, int16_t *heig
     *height = (int16_t)h;
 }
 
-// text
+// text drawing
 
-typedef struct {
-    int type;
-    double x, y;
-    char *text;
-    PangoLayout *layout;
-    double r, g, b, a;
-} text_elem;
-
-static inline void elem_text_draw(cairo_t *cr, text_elem *e) {
-    pango_layout_set_text(e->layout, e->text, -1);
-    cairo_set_source_rgba(cr, e->r, e->g, e->b, e->a);
-    cairo_move_to(cr, e->x, e->y);
-    pango_cairo_show_layout(cr, e->layout);
+static inline void elem_text_draw(cairo_t *cr, DrawElem *e) {
+    pango_layout_set_text(e->data.text.layout, e->data.text.text, -1);
+    cairo_set_source_rgba(cr, e->data.text.r, e->data.text.g, e->data.text.b, e->data.text.a);
+    cairo_move_to(cr, e->data.text.x, e->data.text.y);
+    pango_cairo_show_layout(cr, e->data.text.layout);
 }
 
-static inline void elem_text_destroy(text_elem *e) { g_free(e->text); }
+static inline void elem_text_destroy(DrawElem *e) { g_free(e->data.text.text); }
 
 void elem_text_add(int id, double x, double y, char *text, int fontid, double r, double g, double b, double a) {
-    font_elem *f = g_hash_table_lookup(font_elem_table, GINT_TO_POINTER(fontid));
+    FontElem *f = g_hash_table_lookup(font_elem_table, GINT_TO_POINTER(fontid));
     g_assert(f);
-    text_elem *e = g_malloc(sizeof(text_elem));
+    DrawElem *e = g_malloc(sizeof(DrawElem));
     e->type = DRAW_ELEM_TEXT;
-    e->x = x;
-    e->y = y;
-    e->text = text;
-    e->layout = f->layout;
-    e->r = r;
-    e->g = g;
-    e->b = b;
-    e->a = a;
+    e->data.text.x = x;
+    e->data.text.y = y;
+    e->data.text.text = text;
+    e->data.text.layout = f->layout;
+    e->data.text.r = r;
+    e->data.text.g = g;
+    e->data.text.b = b;
+    e->data.text.a = a;
     window_add_draw(id, e);
 }
 
 // any elem
 
-void draw_any_elem(gpointer e, gpointer cr) {
-    switch (((type_elem *)e)->type) {
+void draw_any_elem(gpointer data, gpointer cr) {
+    DrawElem *e = data;
+    switch (e->type) {
     case DRAW_ELEM_FILL:
         elem_fill_draw(cr, e);
         break;
@@ -326,8 +318,9 @@ void draw_any_elem(gpointer e, gpointer cr) {
     }
 }
 
-void elem_draw_destroy(gpointer e) {
-    switch (((type_elem *)e)->type) {
+void elem_draw_destroy(gpointer data) {
+    DrawElem *e = data;
+    switch (e->type) {
     case DRAW_ELEM_TEXT:
         elem_text_destroy(e);
         break;