[PD-cvs] pd/src desire.c, 1.1.2.217.2.3, 1.1.2.217.2.4 m_binbuf.c, 1.4.4.1.2.8.2.1, 1.4.4.1.2.8.2.2 s_inter.c, 1.5.4.10.2.25.2.1, 1.5.4.10.2.25.2.2
Mathieu Bouchard
matju at users.sourceforge.net
Thu Nov 30 19:10:53 CET 2006
Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19884
Modified Files:
Tag: desiredata
desire.c m_binbuf.c s_inter.c
Log Message:
removed server-side font stuff
Index: s_inter.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_inter.c,v
retrieving revision 1.5.4.10.2.25.2.1
retrieving revision 1.5.4.10.2.25.2.2
diff -C2 -d -r1.5.4.10.2.25.2.1 -r1.5.4.10.2.25.2.2
*** s_inter.c 30 Nov 2006 03:34:23 -0000 1.5.4.10.2.25.2.1
--- s_inter.c 30 Nov 2006 18:10:51 -0000 1.5.4.10.2.25.2.2
***************
*** 97,101 ****
extern char pd_version[];
extern int sys_guisetportnumber;
- extern char sys_font[]; /* tb: typeface */
static int sys_nfdpoll;
--- 97,100 ----
***************
*** 889,905 ****
#define FIRSTPORTNUM 5400
- #define MAXFONTS 21
- static int defaultfontshit[MAXFONTS] = {
- 8, 5, 9, 10, 6, 10, 12, 7, 13, 14, 9, 17, 16, 10, 19, 24, 15, 28,
- 24, 15, 28};
-
static int sys_start_watchdog_thread(void);
static t_int fake_initfromgui(t_int* dummy)
{
- /* fake the GUI's message giving cwd and font sizes; then
- skip starting the GUI up. */
char cmdbuf[4*MAXPDSTRING];
- t_atom zz[MAXFONTS+2];
int i;
#ifdef MSW
--- 888,896 ----
***************
*** 912,920 ****
#endif
! SETSYMBOL(zz, gensym(cmdbuf));
! for (i = 0; i < MAXFONTS; i++)
! SETFLOAT(zz+i+1, defaultfontshit[i]);
! SETFLOAT(zz+i+1,0);
! glob_initfromgui(0, 0, MAXFONTS+2, zz);
return 0;
}
--- 903,907 ----
#endif
! glob_initfromgui(0,0);
return 0;
}
***************
*** 1131,1136 ****
sys_get_audio_apis(buf);
sys_get_midi_apis(buf2);
! sys_vgui("pdtk_pd_startup {%s} %s %s {%s}\n", pd_version, buf, buf2,
! sys_font);
}
return (0);
--- 1118,1122 ----
sys_get_audio_apis(buf);
sys_get_midi_apis(buf2);
! sys_vgui("pdtk_pd_startup {%s} %s %s {%s}\n", pd_version, buf, buf2, 666);
}
return (0);
Index: m_binbuf.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/m_binbuf.c,v
retrieving revision 1.4.4.1.2.8.2.1
retrieving revision 1.4.4.1.2.8.2.2
diff -C2 -d -r1.4.4.1.2.8.2.1 -r1.4.4.1.2.8.2.2
*** m_binbuf.c 30 Nov 2006 03:54:58 -0000 1.4.4.1.2.8.2.1
--- m_binbuf.c 30 Nov 2006 18:10:51 -0000 1.4.4.1.2.8.2.2
***************
*** 951,955 ****
atom_getfloatarg(5, natom, nextmess) -
atom_getfloatarg(3, natom, nextmess),
! (float)sys_defaultfont);
}
}
--- 951,955 ----
atom_getfloatarg(5, natom, nextmess) -
atom_getfloatarg(3, natom, nextmess),
! 10.);
}
}
Index: desire.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v
retrieving revision 1.1.2.217.2.3
retrieving revision 1.1.2.217.2.4
diff -C2 -d -r1.1.2.217.2.3 -r1.1.2.217.2.4
*** desire.c 30 Nov 2006 17:09:59 -0000 1.1.2.217.2.3
--- desire.c 30 Nov 2006 18:10:49 -0000 1.1.2.217.2.4
***************
*** 504,508 ****
int width = CANVAS_DEFCANVASWIDTH, xloc = 0;
int height = CANVAS_DEFCANVASHEIGHT, yloc = CANVAS_DEFCANVASYLOC;
! int vis=0, font = owner?owner->font:sys_defaultfont;
canvas_init(x);
x->te_type = T_OBJECT;
--- 504,508 ----
int width = CANVAS_DEFCANVASWIDTH, xloc = 0;
int height = CANVAS_DEFCANVASHEIGHT, yloc = CANVAS_DEFCANVASYLOC;
! int vis=0, font = owner?owner->font:42 /*sys_defaultfont*/;
canvas_init(x);
x->te_type = T_OBJECT;
***************
*** 546,550 ****
}
x->willvis = vis;
! x->font = sys_nearestfontsize(font);
pd_pushsym(x);
x->next_add = -1;
--- 546,550 ----
}
x->willvis = vis;
! x->font = 10 /*sys_nearestfontsize(font)*/;
pd_pushsym(x);
x->next_add = -1;
***************
*** 600,604 ****
x->x1 = x1; x->y1 = y1; x->te_xpix = (short)px1; x->pixwidth = (int)(px2-px1);
x->x2 = x2; x->y2 = y2; x->te_ypix = (short)py1; x->pixheight = (int)(py2-py1);
! x->font = (canvas_getcurrent() ? canvas_getcurrent()->font : sys_defaultfont);
x->screenx1 = x->screeny1 = 0; x->screenx2 = 450; x->screeny2 = 300;
if (x->name != s_Pd) pd_bind(x, canvas_makebindsym(x->name));
--- 600,604 ----
x->x1 = x1; x->y1 = y1; x->te_xpix = (short)px1; x->pixwidth = (int)(px2-px1);
x->x2 = x2; x->y2 = y2; x->te_ypix = (short)py1; x->pixheight = (int)(py2-py1);
! x->font = (canvas_getcurrent() ? canvas_getcurrent()->font : 42 /*sys_defaultfont*/);
x->screenx1 = x->screeny1 = 0; x->screenx2 = 450; x->screeny2 = 300;
if (x->name != s_Pd) pd_bind(x, canvas_makebindsym(x->name));
***************
*** 2594,2598 ****
t_symbol *s = garray_getname((t_garray *)g);
sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor sw -font "FONT" -tags %s\n",
! (long)c, x1, ymin, s->s_name, sys_hostfontsize(canvas_getfont(x)), tag);
}
/* draw ticks on horizontal borders. If lperb field is zero, this is disabled. */
--- 2594,2598 ----
t_symbol *s = garray_getname((t_garray *)g);
sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor sw -font "FONT" -tags %s\n",
! (long)c, x1, ymin, s->s_name, 42 /*sys_hostfontsize(canvas_getfont(x))*/, tag);
}
/* draw ticks on horizontal borders. If lperb field is zero, this is disabled. */
***************
*** 5133,5137 ****
sys_vgui(".x%lx.c create text %d %d -anchor nw -fill %s -text {%s}",
(long)canvas_getcanvas(canvas), xloc, yloc, colorstring, buf);
! sys_vgui(" -font "FONT, sys_hostfontsize(canvas_getfont(canvas)));
sys_vgui(" -tags drawnumber%lx\n", (long)data);
} else sys_vgui(".x%lx.c delete drawnumber%lx\n", (long)canvas_getcanvas(canvas), (long)data);
--- 5133,5137 ----
sys_vgui(".x%lx.c create text %d %d -anchor nw -fill %s -text {%s}",
(long)canvas_getcanvas(canvas), xloc, yloc, colorstring, buf);
! sys_vgui(" -font "FONT, 42 /*sys_hostfontsize(canvas_getfont(canvas))*/);
sys_vgui(" -tags drawnumber%lx\n", (long)data);
} else sys_vgui(".x%lx.c delete drawnumber%lx\n", (long)canvas_getcanvas(canvas), (long)data);
More information about the Pd-cvs
mailing list