[PD-cvs] pd/src desire.c,1.1.2.29,1.1.2.30

[Mathieu Bouchard]

Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22558

Modified Files:
      Tag: devel_0_39
	desire.c 
Log Message:
hackage.


Index: desire.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v
retrieving revision 1.1.2.29
retrieving revision 1.1.2.30
diff -C2 -d -r1.1.2.29 -r1.1.2.30
*** desire.c	24 Sep 2005 21:19:34 -0000	1.1.2.29
--- desire.c	24 Sep 2005 22:32:35 -0000	1.1.2.30
***************
*** 5236,5244 ****
  
  static void graph_vis(t_gobj *gr, t_glist *unused_glist, int vis);
! static void graph_graphrect(t_gobj *z, t_glist *glist,
!     int *xp1, int *yp1, int *xp2, int *yp2);
! static void graph_getrect(t_gobj *z, t_glist *glist,
!     int *xp1, int *yp1, int *xp2, int *yp2);
! 
  void canvas_drawredrect(t_canvas *x, int doit);
  
--- 5236,5241 ----
  
  static void graph_vis(t_gobj *gr, t_glist *unused_glist, int vis);
! static void graph_graphrect(t_gobj *z, t_glist *glist, int *xp1, int *yp1, int *xp2, int *yp2);
! static void graph_getrect  (t_gobj *z, t_glist *glist, int *xp1, int *yp1, int *xp2, int *yp2);
  void canvas_drawredrect(t_canvas *x, int doit);
  
***************
*** 5254,5257 ****
--- 5251,5255 ----
          y2->g_next = y;
      }
+     sys_vgui("%lx add %lx\n",(long)x,(long)y);
      /* voodoo */
      /* if (x->gl_editor && (ob = pd_checkobject(&y->g_pd))) rtext_new(x, ob); */
***************
*** 11535,11539 ****
  	pd_upload(self);
  	//if (!glist_isvisible(glist_getcanvas(glist))) return; /* <-- doesn't really work */
! 	sys_mgui(self,"draw","");
  }
  
--- 11533,11537 ----
  	pd_upload(self);
  	//if (!glist_isvisible(glist_getcanvas(glist))) return; /* <-- doesn't really work */
! 	//sys_mgui(self,"draw","");
  }
  
***************
*** 11541,11545 ****
      t_text *x = (t_text *)pd_new(text_class);
      t_atom at;
!     sys_vgui("global _; set _(%lx:canvas) %lx\n",(long)x,(long)gl);
      x->te_width = 0;
      x->te_type = T_TEXT;
--- 11539,11543 ----
      t_text *x = (t_text *)pd_new(text_class);
      t_atom at;
!     sys_vgui("comment_new_as %lx \"\"\n",(long)x);
      x->te_width = 0;
      x->te_type = T_TEXT;
***************
*** 11593,11597 ****
      }
      if (!x) x = (t_text *)pd_new(text_class);
!     sys_vgui("global _ focus; set _(%lx:canvas) %lx; set focus(objname) {%.*s}\n",(long)x,(long)gl,n,s);
      //sys_vgui("global _ focus; set _(%x:canvas) %lx; set focus(objname) {%.*s}\n",(long)x,(long)gl,s);
      //sys_vgui("global _; set _(%x:canvas) %lx\n",(long)x,(long)gl);
--- 11591,11596 ----
      }
      if (!x) x = (t_text *)pd_new(text_class);
!     sys_vgui("global focus; set focus(objname) {%.*s}\n",n,s);
!     //sys_vgui("global _ focus; set _(%lx:canvas) %lx; set focus(objname) {%.*s}\n",(long)x,(long)gl,n,s);
      //sys_vgui("global _ focus; set _(%x:canvas) %lx; set focus(objname) {%.*s}\n",(long)x,(long)gl,s);
      //sys_vgui("global _; set _(%x:canvas) %lx\n",(long)x,(long)gl);
***************
*** 11601,11604 ****
--- 11600,11604 ----
      x->te_width = 0;
      x->te_type = T_OBJECT;
+     pd_changed(x);
      glist_add(gl, &x->te_g);
      if (selected) {
***************
*** 12049,12064 ****
  static void text_vis(t_gobj *z, t_glist *glist, int vis) {
      t_text *x = (t_text *)z;
! 		pd_changed(x);
! 		sys_mgui(z,"draw","");
!     if (vis) {
! 	if (text_shouldvis(x, glist)) {
! //		pd_changed(x);
! //		sys_mgui(x,"draw","");
! 	} {
! 		post("#$^#!^#^#^ canvas not visible?");
! 	}
!     } else {
! 	sys_mgui(z,"erase","");
!     }
  }
  
--- 12049,12054 ----
  static void text_vis(t_gobj *z, t_glist *glist, int vis) {
      t_text *x = (t_text *)z;
!     pd_changed(x);
!     if (vis) {if (text_shouldvis(x, glist)) /*pd_changed(x)*/;}
  }