Remove cairo text-renderer

[platform/upstream/kmscon.git] / src / text.h

diff --git a/src/text.h b/src/text.h
index 906b897..902e3cd 100644 (file)
--- a/src/text.h
+++ b/src/text.h
@@ -1,7 +1,7 @@
 /*
  * kmscon - Text Renderer
  *
- * Copyright (c) 2012 David Herrmann <dh.herrmann@googlemail.com>
+ * Copyright (c) 2012-2013 David Herrmann <dh.herrmann@googlemail.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files
@@ -28,81 +28,90 @@
  * The Text-Renderer subsystem provides a simple way to draw text into a
  * framebuffer. The system is modular and several different backends are
  * available that can be used.
- * The system is split into:
- *  - Font renderer: The font renderer allows selecting fonts and rendering
- *    single glyphs into memory-buffers
- *  - Text renderer: The text renderer uses the font renderer to draw a whole
- *    console into a framebuffer.
  */
 
 #ifndef KMSCON_TEXT_H
 #define KMSCON_TEXT_H
 
+#include <errno.h>
+#include <libtsm.h>
 #include <stdlib.h>
-#include "unicode.h"
-#include "uterm.h"
-
-/* fonts */
-
-struct kmscon_font_attr;
-struct kmscon_glyph;
-struct kmscon_font;
-struct kmscon_font_ops;
-
-#define KMSCON_FONT_MAX_NAME 128
-#define KMSCON_FONT_DEFAULT_NAME "monospace"
-#define KMSCON_FONT_DEFAULT_PPI 72
-
-struct kmscon_font_attr {
-       char name[KMSCON_FONT_MAX_NAME];
-       unsigned int ppi;
-       unsigned int points;
-       bool bold;
-       bool italic;
-       unsigned int height;
-       unsigned int width;
-};
+#include "font.h"
+#include "kmscon_module.h"
+#include "uterm_video.h"
 
-void kmscon_font_attr_normalize(struct kmscon_font_attr *attr);
-bool kmscon_font_attr_match(const struct kmscon_font_attr *a1,
-                           const struct kmscon_font_attr *a2);
+/* text renderer */
 
-struct kmscon_glyph {
-       unsigned int ascent;
-       unsigned int descent;
-       struct uterm_video_buffer buf;
-};
+struct kmscon_text;
+struct kmscon_text_ops;
 
-struct kmscon_font {
+struct kmscon_text {
        unsigned long ref;
-       const struct kmscon_font_ops *ops;
-       struct kmscon_font_attr attr;
+       struct shl_register_record *record;
+       const struct kmscon_text_ops *ops;
        void *data;
+
+       struct kmscon_font *font;
+       struct kmscon_font *bold_font;
+       struct uterm_display *disp;
+       unsigned int cols;
+       unsigned int rows;
+       bool rendering;
 };
 
-struct kmscon_font_ops {
+struct kmscon_text_ops {
        const char *name;
-       int (*init) (struct kmscon_font *out,
-                    const struct kmscon_font_attr *attr);
-       void (*destroy) (struct kmscon_font *font);
-       int (*render) (struct kmscon_font *font, kmscon_symbol_t sym,
-                      const struct kmscon_glyph **out);
-       void (*drop) (struct kmscon_font *font,
-                     const struct kmscon_glyph *glyph);
+       struct kmscon_module *owner;
+       int (*init) (struct kmscon_text *txt);
+       void (*destroy) (struct kmscon_text *txt);
+       int (*set) (struct kmscon_text *txt);
+       void (*unset) (struct kmscon_text *txt);
+       int (*prepare) (struct kmscon_text *txt);
+       int (*draw) (struct kmscon_text *txt,
+                    uint32_t id, const uint32_t *ch, size_t len,
+                    unsigned int width,
+                    unsigned int posx, unsigned int posy,
+                    const struct tsm_screen_attr *attr);
+       int (*render) (struct kmscon_text *txt);
+       void (*abort) (struct kmscon_text *txt);
 };
 
-int kmscon_font_register(const struct kmscon_font_ops *ops);
-void kmscon_font_unregister(const char *name);
+int kmscon_text_register(const struct kmscon_text_ops *ops);
+void kmscon_text_unregister(const char *name);
+
+int kmscon_text_new(struct kmscon_text **out, const char *backend);
+void kmscon_text_ref(struct kmscon_text *txt);
+void kmscon_text_unref(struct kmscon_text *txt);
+
+int kmscon_text_set(struct kmscon_text *txt,
+                   struct kmscon_font *font,
+                   struct kmscon_font *bold_font,
+                   struct uterm_display *disp);
+void kmscon_text_unset(struct kmscon_text *txt);
+unsigned int kmscon_text_get_cols(struct kmscon_text *txt);
+unsigned int kmscon_text_get_rows(struct kmscon_text *txt);
+
+int kmscon_text_prepare(struct kmscon_text *txt);
+int kmscon_text_draw(struct kmscon_text *txt,
+                    uint32_t id, const uint32_t *ch, size_t len,
+                    unsigned int width,
+                    unsigned int posx, unsigned int posy,
+                    const struct tsm_screen_attr *attr);
+int kmscon_text_render(struct kmscon_text *txt);
+void kmscon_text_abort(struct kmscon_text *txt);
+
+int kmscon_text_draw_cb(struct tsm_screen *con,
+                       uint32_t id, const uint32_t *ch, size_t len,
+                       unsigned int width,
+                       unsigned int posx, unsigned int posy,
+                       const struct tsm_screen_attr *attr,
+                       tsm_age_t age, void *data);
 
-int kmscon_font_find(struct kmscon_font **out,
-                    const struct kmscon_font_attr *attr,
-                    const char *backend);
-void kmscon_font_ref(struct kmscon_font *font);
-void kmscon_font_unref(struct kmscon_font *font);
+/* modularized backends */
 
-int kmscon_font_render(struct kmscon_font *font, kmscon_symbol_t sym,
-                      const struct kmscon_glyph **out);
-void kmscon_font_drop(struct kmscon_font *font,
-                     const struct kmscon_glyph *glyph);
+extern struct kmscon_text_ops kmscon_text_bblit_ops;
+extern struct kmscon_text_ops kmscon_text_bbulk_ops;
+extern struct kmscon_text_ops kmscon_text_gltex_ops;
+extern struct kmscon_text_ops kmscon_text_pixman_ops;
 
 #endif /* KMSCON_TEXT_H */