glcomp: remove 'type' that is always set to 'pangotext'

diff --git a/cmd/smyrna/draw.c b/cmd/smyrna/draw.c
index 162175eb4b503b82fa504dc6f4bf7d066cdd9013..26463e9efcdf7d5b8424c4d7b66056ed456927f7 100644 (file)
--- a/cmd/smyrna/draw.c
+++ b/cmd/smyrna/draw.c
@@ -366,7 +366,7 @@ static void EmbedText(sdot_op* o, int param)
                char **ptr = &escaped;
                (void)xml_escape(o->op.u.text.text, flags, put, ptr);
 
-               o->font = glNewFont(view->widgets, escaped, &view->penColor, pangotext,
+               o->font = glNewFont(view->widgets, escaped, &view->penColor,
                                    font_op->op.u.font.name, font_op->op.u.font.size, 0);
 
                free(escaped);

diff --git a/lib/glcomp/glcompdefs.h b/lib/glcomp/glcompdefs.h
index 3c8fb450208aeb609ac7a5ceac7d4cc66eec0f55..7751da909c04900bd9b56e7a6ed8f4a00a1d6040 100644 (file)
--- a/lib/glcomp/glcompdefs.h
+++ b/lib/glcomp/glcompdefs.h
@@ -78,7 +78,6 @@ extern "C" {
 #define        GLCOMP_DEFAULT_WIDTH    10.0f
 #define        GLCOMP_DEFAULT_HEIGHT   10.0f
 
-    typedef enum { gluttext, pangotext } glCompFontType;
     typedef enum { glAlignNone, glAlignLeft, glAlignTop, glAlignBottom,
            glAlignRight, glAlignParent, glAlignCenter } glCompAlignment;
 
@@ -185,7 +184,6 @@ extern "C" {
     typedef struct {
        char *fontdesc;         //font description , only used with pango fonts
        glCompColor color;
-       glCompFontType type;
        void *glutfont;         /*glut font pointer if used */
        int transparent;
        glCompTex *tex;         /* texture, if type is pangotext */

diff --git a/lib/glcomp/glcompfont.c b/lib/glcomp/glcompfont.c
index 65fcf12bcc655bf1b7a84d3d7fb6d45cfadeacff..6b4a5f6f1736614c0c4b6681d886529c49d72bd2 100644 (file)
--- a/lib/glcomp/glcompfont.c
+++ b/lib/glcomp/glcompfont.c
@@ -45,7 +45,7 @@ void glDeleteFont(glCompFont * f)
 
 }
 
-glCompFont *glNewFont (glCompSet * s, char *text, glCompColor * c,glCompFontType type, char *fontdesc, int fs,int is2D)
+glCompFont *glNewFont (glCompSet * s, char *text, glCompColor * c, char *fontdesc, int fs,int is2D)
 {
     glCompFont *font = gv_alloc(sizeof(glCompFont));
     font->reference = 0;
@@ -55,13 +55,9 @@ glCompFont *glNewFont (glCompSet * s, char *text, glCompColor * c,glCompFontType
     font->color.A = c->A;
     font->justify.VJustify = GL_FONTVJUSTIFY;
     font->justify.HJustify = GL_FONTHJUSTIFY;
-    font->type=type;
     font->is2D=is2D;
 
-    if (font->type == gluttext)
-       font->glutfont = DEFAULT_GLUT_FONT;
-    else
-       font->glutfont = NULL;
+    font->glutfont = NULL;
 
     font->fontdesc = gv_strdup(fontdesc);
     font->size = fs;
@@ -90,7 +86,6 @@ glCompFont *glNewFontFromParent(glCompObj * o, char *text)
        font->color.B = parent->font->color.B;
        font->color.A = parent->font->color.A;
 
-       font->type = parent->font->type;
        font->glutfont = parent->font->glutfont;
        font->fontdesc = gv_strdup(parent->font->fontdesc);
        font->size = parent->font->size;
@@ -113,8 +108,7 @@ glCompFont *glNewFontFromParent(glCompObj * o, char *text)
        c.G = GLCOMPSET_FONT_COLOR_G;
        c.B = GLCOMPSET_FONT_COLOR_B;
        c.A = GLCOMPSET_FONT_COLOR_ALPHA;
-       font =
-           glNewFont (o->common.compset, text, &c, pangotext,
+       font = glNewFont(o->common.compset, text, &c,
                     GLCOMPSET_FONT_DESC, GLCOMPSET_FONT_SIZE,1);
     }
     return font;

diff --git a/lib/glcomp/glcompfont.h b/lib/glcomp/glcompfont.h
index 1562473cef447ad3ef71cd6f79aa19e90876dcd0..432913565ff1e7b4cbfa9a2395ca6693f0dafac4 100644 (file)
--- a/lib/glcomp/glcompfont.h
+++ b/lib/glcomp/glcompfont.h
@@ -27,7 +27,7 @@ extern "C" {
     void glprintfglut(void *font, GLfloat xpos, GLfloat ypos, GLfloat zpos, char *bf);
 
     glCompFont *glNewFont(glCompSet * s, char *text, glCompColor * c,
-          glCompFontType type, char *fontdesc, int fs,int is2D);
+                          char *fontdesc, int fs,int is2D);
     glCompFont *glNewFontFromParent(glCompObj * o, char *text);
     void glDeleteFont(glCompFont * f);
     void glCompDrawText(glCompFont * f,GLfloat x,GLfloat y);