pd/src SConscript, 1.1.4.25, 1.1.4.26 desire.c, 1.1.2.14, 1.1.2.15 desire.h, 1.1.2.1, 1.1.2.2 - Pd-cvs

16 Sep 2005


      Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26848
Modified Files:
      Tag: devel_0_39
    SConscript desire.c desire.h 
Log Message:
copied all other g_*.c files into desire.c
(sorry, can't even compile for now)
Index: SConscript
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/SConscript,v
retrieving revision 1.1.4.25
retrieving revision 1.1.4.26
diff -C2 -d -r1.1.4.25 -r1.1.4.26
*** SConscript	16 Sep 2005 18:40:10 -0000	1.1.4.25
--- SConscript	16 Sep 2005 19:13:09 -0000	1.1.4.26
***************
*** 38,44 ****
    d_mayer_fft.c d_misc.c d_osc.c d_resample.c d_soundfile.c d_ugen.c
-   g_graph.c g_guiconnect.c g_io.c g_readwrite.c g_scalar.c
-   g_template.c g_traversal.c
- 
    m_atom.c m_binbuf.c m_class.c m_conf.c m_fifo.c
    m_glob.c m_memory.c m_obj.c m_pd.c m_sched.c m_simd.c
--- 38,41 ----
***************
*** 60,64 ****
    	g_numbox.c g_vdial.c g_vslider.c g_vumeter.c
    	g_text.c g_toggle.c g_rtext.c g_all_guis.c
! 		g_array.c g_canvas.c g_editor.c
    """)
--- 57,62 ----
    	g_numbox.c g_vdial.c g_vslider.c g_vumeter.c
    	g_text.c g_toggle.c g_rtext.c g_all_guis.c
! 		g_array.c g_canvas.c g_editor.c g_graph.c g_guiconnect.c
! 		g_readwrite.c g_io.c g_scalar.c g_template.c g_traversal.c
    """)
Index: desire.h
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** desire.h	8 Sep 2005 09:53:25 -0000	1.1.2.1
--- desire.h	16 Sep 2005 19:13:09 -0000	1.1.2.2
***************
*** 51,57 ****
  in future releases.  The public (stable) API is in m_pd.h. */
- #ifndef __G_CANVAS_H
- #define __G_CANVAS_H
- 
  #if defined(_LANGUAGE_C_PLUS_PLUS) || defined(__cplusplus)
  extern "C" {
--- 51,54 ----
***************
*** 621,638 ****
      t_symbol *s, int argc, t_atom *argv);
! EXTERN t_float template_getfloat(t_template *x, t_symbol *fieldname,
!     t_word *wp, int loud);
! EXTERN void template_setfloat(t_template *x, t_symbol *fieldname,
!     t_word *wp, t_float f, int loud);
! EXTERN t_symbol *template_getsymbol(t_template *x, t_symbol *fieldname,
!     t_word *wp, int loud);
! EXTERN void template_setsymbol(t_template *x, t_symbol *fieldname,
!     t_word *wp, t_symbol *s, int loud);
! EXTERN t_float fielddesc_getcoord(t_fielddesc *f, t_template *,
!     t_word *wp, int loud);
! EXTERN void fielddesc_setcoord(t_fielddesc *f, t_template *,
!     t_word *wp, float pix, int loud);
! EXTERN t_float fielddesc_cvttocoord(t_fielddesc *f, float val);
! EXTERN float fielddesc_cvtfromcoord(t_fielddesc *f, float coord);
--- 618,629 ----
      t_symbol *s, int argc, t_atom *argv);
! EXTERN t_float   template_getfloat(t_template *x, t_symbol *fieldname, t_word *wp, int loud);
! EXTERN void      template_setfloat(t_template *x, t_symbol *fieldname, t_word *wp, t_float f, int loud);
! EXTERN t_symbol *template_getsymbol(t_template *x, t_symbol *fieldname, t_word *wp, int loud);
! EXTERN void      template_setsymbol(t_template *x, t_symbol *fieldname, t_word *wp, t_symbol *s, int loud);
! EXTERN t_float  fielddesc_getcoord(t_fielddesc *f, t_template *, t_word *wp, int loud);
! EXTERN void     fielddesc_setcoord(t_fielddesc *f, t_template *, t_word *wp, float pix, int loud);
! EXTERN t_float  fielddesc_cvttocoord(t_fielddesc *f, float val);
! EXTERN float    fielddesc_cvtfromcoord(t_fielddesc *f, float coord);
***************
*** 649,789 ****
  typedef void (*t_iemfunptr)(void *x, t_glist *glist, int mode);
- typedef struct _iemgui
- {
-     t_object x_obj;
-     t_glist *x_glist; /* why? */
-     t_iemfunptr x_draw; /* this will die soon */
-     int x_h, x_w;
-     int x_ldx, x_ldy;
-     int x_isa; /* bit 0: loadinit; bit 20: scale */
-     int x_font_style, x_fontsize;
-     int x_fcol, x_bcol, x_lcol; /* foreground, background, label colors */
-     t_symbol *x_snd, *x_rcv, *x_lab; /* send, receive, label symbols */
- } t_iemgui;
- 
- typedef struct _bng
- {
-     t_iemgui x_gui;
-     int      x_flashed;
-     int      x_locked;
-     int      x_ftbreak; /* flash time break (ms) */
-     int      x_fthold;  /* flash time hold  (ms) */
-     t_clock  *x_clock_hld;
-     t_clock  *x_clock_brk;
-     t_clock  *x_clock_lck;
- } t_bng;
- 
- typedef struct _slider
- {
-     t_iemgui x_gui;
-     t_symbol *x_flavor;
-     int      x_pos;
-     int      x_val;
-     double   x_min;
-     double   x_max;
-     double   x_k;
-     int      x_steady;
-     int      x_is_log;
- } t_slider;
- 
- typedef struct _radio
- {
-     t_iemgui x_gui;
-     t_symbol *x_flavor;
-     int      x_on;
-     int      x_on_old;
-     int      x_change;
-     int      x_number;
-     t_atom   x_at[2];
- } t_radio;
- 
- typedef struct _toggle
- {
-     t_iemgui x_gui;
-     float    x_on;
-     float    x_nonzero;
- } t_toggle;
- 
- typedef struct _my_canvas
- {
-     t_iemgui x_gui;
-     t_atom   x_at[3];
-     int      x_vis_w;
-     int      x_vis_h;
- } t_my_canvas, t_cnv;
- 
- typedef struct _dropper
- {
-     t_iemgui x_gui;
-     t_symbol *x_s;
-     t_symbol *x_ds;
- } t_dropper;
- 
- typedef struct _vu
- {
-     t_iemgui x_gui;
-     int      x_led_size;
-     int      x_peak;
-     int      x_rms;
-     float    x_fp;
-     float    x_fr;
-     int      x_scale;
-     void     *x_out_rms;
-     void     *x_out_peak;
- } t_vu;
- 
- typedef struct _nbx /* Number2 */
- {
-     t_iemgui x_gui;
-     t_clock  *x_clock_reset;
-     t_clock  *x_clock_wait;
-     double   x_val;
-     double   x_min;
-     double   x_max;
-     double   x_k;
-     char     x_buf[32];
-     int      x_numwidth;
-     int      x_log_height;
-     int      x_finemoved;
-     int      x_change;
-     int      x_is_log;
- } t_my_numbox, t_nbx;
- 
  EXTERN int sys_noloadbang;
- EXTERN int iemgui_clip_size(int size);
- EXTERN int iemgui_clip_font(int size);
- EXTERN t_symbol *iemgui_new_dogetname(t_iemgui *iemgui, int indx, t_atom *argv);
- EXTERN void iemgui_size(t_iemgui *x);
- 
- /* adds the aforementioned methods to a iemgui class (pd has no inheritance) */
- EXTERN void iemgui_subclass (t_class *c);
- 
- /* widgetbehaviour */
- EXTERN void iemgui_displace(t_gobj *z, t_glist *glist, int dx, int dy);
- EXTERN void iemgui_select(t_gobj *z, t_glist *glist, int selected);
- EXTERN void iemgui_delete(t_gobj *z, t_glist *glist);
- EXTERN void iemgui_vis(t_gobj *z, t_glist *glist, int vis);
- 
- /* miscellaneous */
  EXTERN int canvas_getdollarzero(void);
  EXTERN void canvas_getargs(int *argcp, t_atom **argvp);
! EXTERN int pd_scanargs(int argc, t_atom *argv, char *format, ...);
! EXTERN void pd_upload(t_gobj *self, t_canvas *can);
! EXTERN void sys_mgui(t_iemgui *self, const char *sel, const char *fmt, ...);
! EXTERN t_iemgui *iemgui_new(t_class *qlass);
! EXTERN void iemgui_draw(t_iemgui *x, t_glist *glist, int mode);
  EXTERN void iemgui_propertiesfn(t_gobj *x, t_glist *owner);
- EXTERN const char *iemgui_get_font(t_iemgui *self);
- EXTERN void iemgui_constrain(t_iemgui *x);
  EXTERN t_symbol *s_empty;
  EXTERN int convert_color2(int x);
! EXTERN void iemgui_init(t_iemgui *x, t_floatarg f);
! EXTERN void binbuf_update(t_iemgui *x, t_symbol *qlass, int argc, t_atom *argv);
! EXTERN /*bool*/ int iemgui_loadbang (/*t_iemgui*/ void *x);
! EXTERN /*bool*/ int iemgui_forward (/*t_iemgui*/ void *x); /* was x_put_in2out */
! EXTERN int pd_saveargs(t_binbuf *b, char *fmt, ...);
! EXTERN int pd_savehead(t_binbuf *b, t_iemgui *x, char *name);
! EXTERN void iemgui_getrect(t_gobj *z, t_glist *glist,
! int *xp1, int *yp1, int *xp2, int *yp2);
#if defined(_LANGUAGE_C_PLUS_PLUS) || defined(__cplusplus)
--- 640,656 ----
  typedef void (*t_iemfunptr)(void *x, t_glist *glist, int mode);
EXTERN int sys_noloadbang;
  EXTERN int canvas_getdollarzero(void);
  EXTERN void canvas_getargs(int *argcp, t_atom **argvp);
! //EXTERN int pd_scanargs(int argc, t_atom *argv, char *format, ...);
! EXTERN void pd_upload(t_gobj *self);
! EXTERN void sys_mgui(t_gobj *self,   const char *sel, const char *fmt, ...);
  EXTERN void iemgui_propertiesfn(t_gobj *x, t_glist *owner);
  EXTERN t_symbol *s_empty;
  EXTERN int convert_color2(int x);
! //EXTERN void binbuf_update(t_iemgui *x, t_symbol *qlass, int argc, t_atom *argv);
! //EXTERN int pd_saveargs(t_binbuf *b, char *fmt, ...);
! //EXTERN int pd_savehead(t_binbuf *b, t_iemgui *x, char *name);
! EXTERN void iemgui_getrect(t_gobj *z, t_glist *glist, int *xp1, int *yp1, int *xp2, int *yp2);
#if defined(_LANGUAGE_C_PLUS_PLUS) || defined(__cplusplus)
Index: desire.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -C2 -d -r1.1.2.14 -r1.1.2.15
*** desire.c	16 Sep 2005 18:40:10 -0000	1.1.2.14
--- desire.c	16 Sep 2005 19:13:09 -0000	1.1.2.15
***************
*** 11,20 ****
#include "m_pd.h"
! 
! #include "g_canvas.h"
! //#include "desire.h"
! 
  #include "m_imp.h"
! #include "t_tk.h"
  #include "s_stuff.h"
  #include <ctype.h>
[...6614 lines suppressed...]
! /*bool*/ int iemgui_loadbang (/*t_iemgui*/ void *x) {
    t_iemgui *self = (t_iemgui *)x;
    return !sys_noloadbang && self->isa&1;
  }
! /*bool*/ int iemgui_forward (/*t_iemgui*/ void *x) {
    t_iemgui *self = (t_iemgui *)x;
    return !self->snd || !self->rcv || self->snd != self->rcv;
--- 13121,13130 ----
  }
! static /*bool*/ int iemgui_loadbang (/*t_iemgui*/ void *x) {
    t_iemgui *self = (t_iemgui *)x;
    return !sys_noloadbang && self->isa&1;
  }
! static /*bool*/ int iemgui_forward (/*t_iemgui*/ void *x) {
    t_iemgui *self = (t_iemgui *)x;
    return !self->snd || !self->rcv || self->snd != self->rcv;