next step towards gui revival

svn path=/trunk/externals/ggee/; revision=64

1 files changed, 6 insertions, 69 deletions

diff --git a/gui/state.c b/gui/state.c
index 22abdd2..40d3501 100755
--- a/gui/state.c
+++ b/gui/state.c
@@ -10,68 +10,6 @@
 #endif

 

 

-/*

- * The iem stuff doesn't work yet !!!

-*/

-

-typedef struct _iem_fstyle_flags

-{

-    unsigned int x_font_style:6;

-    unsigned int x_rcv_able:1;

-    unsigned int x_snd_able:1;

-    unsigned int x_lab_is_unique:1;

-    unsigned int x_rcv_is_unique:1;

-    unsigned int x_snd_is_unique:1;

-    unsigned int x_lab_arg_tail_len:6;

-    unsigned int x_lab_is_arg_num:6;

-    unsigned int x_shiftdown:1;

-    unsigned int x_selected:1;

-    unsigned int x_finemoved:1;

-    unsigned int x_put_in2out:1;

-    unsigned int x_change:1;

-    unsigned int x_thick:1;

-    unsigned int x_lin0_log1:1;

-    unsigned int x_steady:1;

-    unsigned int dummy:1;

-} t_iem_fstyle_flags;

-

-typedef struct _iem_init_symargs

-{

-    unsigned int x_loadinit:1;

-    unsigned int x_rcv_arg_tail_len:6;

-    unsigned int x_snd_arg_tail_len:6;

-    unsigned int x_rcv_is_arg_num:6;

-    unsigned int x_snd_is_arg_num:6;

-    unsigned int x_scale:1;

-    unsigned int x_flashed:1;

-    unsigned int x_locked:1;

-    unsigned int dummy:4;

-} t_iem_init_symargs;

-

-

-typedef struct _iemgui

-{

-    t_object           x_obj;

-    void            *x_glist;

-    void*        x_draw;

-    int                x_h;

-    int                x_w;

-    int                x_ldx;

-    int                x_ldy;

-    char               x_font[16];

-    t_iem_fstyle_flags x_fsf;

-    int                x_fontsize;

-    t_iem_init_symargs x_isa;

-    int                x_fcol;

-    int                x_bcol;

-    int                x_lcol;

-    int                x_unique_num;

-    t_symbol           *x_snd;

-    t_symbol           *x_rcv;

-    t_symbol           *x_lab;

-} t_iemgui;

-

-

 

 /* hacks .... this duplicates definitions in pd and must be 

  * adjusted if something changes there !!!! */

@@ -82,10 +20,10 @@ typedef struct _mygatom
 {

     t_text a_text;

     t_atom a_atom;

-} t_mygatom; /* this is not !! the real t_atom ...*/

+} t_mygatom; /* this is not !! the real t_gatom ...*/

 

 #define TATOM(a) (&((t_mygatom*)a)->a_atom)

-

+#define ATOMVAL(a) a->a_w.w_float

 

 /* glist's are not visible, but the only thing we need is to

    get the list link from them */

@@ -164,23 +102,22 @@ void state_dosave(t_state *x)
 	  if (a->te_type == T_ATOM) {

 	       if (TATOM(a)->a_type == A_SYMBOL) {

 		    if (strlen(TATOM(a)->a_w.w_symbol->s_name))

-/*			 fprintf(fp,"%s\n",TATOM(a)->a_w.w_symbol->s_name);*/

 			 fprintf(fp,"%s\n",atom_getsymbol(TATOM(a))->s_name);

 		    else

 			 fprintf(fp,EMPTYSYMBOL"\n");

 	       }

 	       else {

 		    fprintf(fp,"%f\n",atom_getfloat(TATOM(a)));

-		    fprintf(stderr,"%f\n",atom_getfloat(TATOM(a)));

 	       }

 	  }

 

 	  /* slider should be an atom as well ... how to do it ? */

 

 	  if (!strcmp(class_getname(a->te_pd),"slider")) {

-	        float val = atom_getfloat(TATOM(a));

-		fprintf(fp,"%f\n",val);

-		fprintf(stderr,"slider %f\n",atom_getfloat(TATOM(a)));

+		fprintf(fp,"%f\n",atom_getfloat(TATOM(a)));

+	  }

+	  if (!strcmp(class_getname(a->te_pd),"sliderh")) {

+		fprintf(fp,"%f\n",atom_getfloat(TATOM(a)));

 	  }

 #if 0

 	  if (!strcmp(class_getname(a->te_pd),"vsl")) {