[svn-upgrade] Integrating new upstream version, ion3 (20070203)

[ion3.git] / ioncore / infowin.c

diff --git a/ioncore/infowin.c b/ioncore/infowin.c
index 95622b47095a3cad191e1af6dae30c1756638b3f..463b16e8a5eb277f1d6407e676eab85fd82fe14c 100644 (file)
--- a/ioncore/infowin.c
+++ b/ioncore/infowin.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/infowin.h
  *
- * Copyright (c) Tuomo Valkonen 1999-2006. 
+ * Copyright (c) Tuomo Valkonen 1999-2007. 
  *
  * Ion is free software; you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License as published by
@@ -45,7 +45,8 @@ bool infowin_init(WInfoWin *p, WWindow *parent, const WFitParams *fp,
         goto fail2;
     
     p->brush=NULL;
-    p->attr=NULL;
+    
+    gr_stylespec_init(&p->attr);
     
     infowin_updategr(p);
     
@@ -62,7 +63,8 @@ bool infowin_init(WInfoWin *p, WWindow *parent, const WFitParams *fp,
 
     return TRUE;
 
-fail3:    
+fail3:
+    gr_stylespec_unalloc(&p->attr);
     free(p->style);
 fail2:
     free(p->buffer);
@@ -86,11 +88,6 @@ void infowin_deinit(WInfoWin *p)
         p->buffer=NULL;
     }
 
-    if(p->attr!=NULL){
-        free(p->attr);
-        p->attr=NULL;
-    }
-    
     if(p->style!=NULL){
         free(p->style);
         p->style=NULL;
@@ -101,6 +98,8 @@ void infowin_deinit(WInfoWin *p)
         p->brush=NULL;
     }
     
+    gr_stylespec_unalloc(&p->attr);
+    
     window_deinit(&(p->wwin));
 }
 
@@ -124,7 +123,8 @@ void infowin_draw(WInfoWin *p, bool complete)
     g.h=REGION_GEOM(p).h;
 
     grbrush_begin(p->brush, &g, GRBRUSH_NO_CLEAR_OK);
-    grbrush_draw_textbox(p->brush, &g, p->buffer, p->attr, TRUE);
+    grbrush_init_attr(p->brush, &p->attr);
+    grbrush_draw_textbox(p->brush, &g, p->buffer, TRUE);
     grbrush_end(p->brush);
 }
 
@@ -157,25 +157,9 @@ void infowin_updategr(WInfoWin *p)
 /*{{{ Content-setting */
 
 
-bool infowin_set_attr2(WInfoWin *p, const char *attr1, const char *attr2)
+GrStyleSpec *infowin_stylespec(WInfoWin *p)
 {
-    char *p2=NULL;
-    
-    if(attr1!=NULL){
-        if(attr2==NULL)
-            p2=scopy(attr1);
-        else
-            libtu_asprintf(&p2, "%s-%s", attr1, attr2);
-        if(p2==NULL)
-            return FALSE;
-    }
-    
-    if(p->attr)
-        free(p->attr);
-    
-    p->attr=p2;
-    
-    return TRUE;
+    return &p->attr;
 }