Accept FS #10244 by Wincent Balin: more pdbox work done for GSoC; also some keyword and line-ending fixes by me

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21626 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Peter D'Hoye 2009-07-03 22:16:11 +00:00
parent eabeb928dd
commit 0d4560cb03
113 changed files with 10637 additions and 4420 deletions

View file

@ -6,6 +6,14 @@
/* thanks to Miller Puckette, Guenther Geiger and Krzystof Czaja */
#ifdef ROCKBOX
#include "plugin.h"
#include "pdbox.h"
#include "m_pd.h"
#include "g_canvas.h"
#include "g_all_guis.h"
#define snprintf rb->snprintf
#else /* ROCKBOX */
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
@ -21,6 +29,7 @@
#else
#include <unistd.h>
#endif
#endif /* ROCKBOX */
/* #define GGEE_HSLIDER_COMPATIBLE */
@ -185,12 +194,20 @@ void iemgui_verify_snd_ne_rcv(t_iemgui *iemgui)
t_symbol *iemgui_new_dogetname(t_iemgui *iemgui, int indx, t_atom *argv)
{
#ifdef ROCKBOX
(void) iemgui;
#endif
if (IS_A_SYMBOL(argv, indx))
return (atom_getsymbolarg(indx, 100000, argv));
else if (IS_A_FLOAT(argv, indx))
{
char str[80];
#ifdef ROCKBOX
snprintf(str, sizeof(str)-1,
"%d", (int)atom_getintarg(indx, 100000, argv));
#else
sprintf(str, "%d", (int)atom_getintarg(indx, 100000, argv));
#endif
return (gensym(str));
}
else return (gensym("empty"));
@ -261,6 +278,10 @@ void iemgui_all_sym2dollararg(t_iemgui *iemgui, t_symbol **srlsym)
void iemgui_first_dollararg2sym(t_iemgui *iemgui, t_symbol **srlsym)
{
#ifdef ROCKBOX
(void) iemgui;
(void) srlsym;
#endif
/* delete this function */
}
@ -341,8 +362,12 @@ void iemgui_all_raute2dollar(t_symbol **srlsym)
void iemgui_send(void *x, t_iemgui *iemgui, t_symbol *s)
{
t_symbol *snd;
#ifdef ROCKBOX
int sndable=1, oldsndrcvable=0;
#else
int pargc, tail_len, nth_arg, sndable=1, oldsndrcvable=0;
t_atom *pargv;
#endif
if(iemgui->x_fsf.x_rcv_able)
oldsndrcvable += IEM_GUI_OLD_RCV_FLAG;
@ -364,8 +389,12 @@ void iemgui_send(void *x, t_iemgui *iemgui, t_symbol *s)
void iemgui_receive(void *x, t_iemgui *iemgui, t_symbol *s)
{
t_symbol *rcv;
#ifdef ROCKBOX
int rcvable=1, oldsndrcvable=0;
#else
int pargc, tail_len, nth_arg, rcvable=1, oldsndrcvable=0;
t_atom *pargv;
#endif
if(iemgui->x_fsf.x_rcv_able)
oldsndrcvable += IEM_GUI_OLD_RCV_FLAG;
@ -399,34 +428,55 @@ void iemgui_receive(void *x, t_iemgui *iemgui, t_symbol *s)
void iemgui_label(void *x, t_iemgui *iemgui, t_symbol *s)
{
t_symbol *lab;
#ifndef ROCKBOX
int pargc, tail_len, nth_arg;
t_atom *pargv;
#endif
#ifdef ROCKBOX
(void) x;
#endif
lab = iemgui_raute2dollar(s);
iemgui->x_lab_unexpanded = lab;
iemgui->x_lab = lab = canvas_realizedollar(iemgui->x_glist, lab);
#ifndef ROCKBOX
if(glist_isvisible(iemgui->x_glist))
sys_vgui(".x%x.c itemconfigure %xLABEL -text {%s} \n",
glist_getcanvas(iemgui->x_glist), x,
strcmp(s->s_name, "empty")?iemgui->x_lab->s_name:"");
#endif
}
void iemgui_label_pos(void *x, t_iemgui *iemgui, t_symbol *s, int ac, t_atom *av)
{
#ifdef ROCKBOX
(void) x;
(void) s;
#endif
iemgui->x_ldx = (int)atom_getintarg(0, ac, av);
iemgui->x_ldy = (int)atom_getintarg(1, ac, av);
#ifndef ROCKBOX
if(glist_isvisible(iemgui->x_glist))
sys_vgui(".x%x.c coords %xLABEL %d %d\n",
glist_getcanvas(iemgui->x_glist), x,
iemgui->x_obj.te_xpix+iemgui->x_ldx,
iemgui->x_obj.te_ypix+iemgui->x_ldy);
#endif
}
void iemgui_label_font(void *x, t_iemgui *iemgui, t_symbol *s, int ac, t_atom *av)
{
int f = (int)atom_getintarg(0, ac, av);
#ifdef ROCKBOX
(void) x;
(void) s;
#endif
if(f == 1) strcpy(iemgui->x_font, "helvetica");
else if(f == 2) strcpy(iemgui->x_font, "times");
else
@ -439,9 +489,11 @@ void iemgui_label_font(void *x, t_iemgui *iemgui, t_symbol *s, int ac, t_atom *a
if(f < 4)
f = 4;
iemgui->x_fontsize = f;
#ifndef ROCKBOX
if(glist_isvisible(iemgui->x_glist))
sys_vgui(".x%x.c itemconfigure %xLABEL -font {%s %d bold}\n",
glist_getcanvas(iemgui->x_glist), x, iemgui->x_font, iemgui->x_fontsize);
#endif
}
void iemgui_size(void *x, t_iemgui *iemgui)
@ -455,6 +507,9 @@ void iemgui_size(void *x, t_iemgui *iemgui)
void iemgui_delta(void *x, t_iemgui *iemgui, t_symbol *s, int ac, t_atom *av)
{
#ifdef ROCKBOX
(void) s;
#endif
iemgui->x_obj.te_xpix += (int)atom_getintarg(0, ac, av);
iemgui->x_obj.te_ypix += (int)atom_getintarg(1, ac, av);
if(glist_isvisible(iemgui->x_glist))
@ -466,6 +521,9 @@ void iemgui_delta(void *x, t_iemgui *iemgui, t_symbol *s, int ac, t_atom *av)
void iemgui_pos(void *x, t_iemgui *iemgui, t_symbol *s, int ac, t_atom *av)
{
#ifdef ROCKBOX
(void) s;
#endif
iemgui->x_obj.te_xpix = (int)atom_getintarg(0, ac, av);
iemgui->x_obj.te_ypix = (int)atom_getintarg(1, ac, av);
if(glist_isvisible(iemgui->x_glist))
@ -477,6 +535,9 @@ void iemgui_pos(void *x, t_iemgui *iemgui, t_symbol *s, int ac, t_atom *av)
void iemgui_color(void *x, t_iemgui *iemgui, t_symbol *s, int ac, t_atom *av)
{
#ifdef ROCKBOX
(void) s;
#endif
iemgui->x_bcol = iemgui_compatible_col(atom_getintarg(0, ac, av));
if(ac > 2)
{
@ -561,21 +622,36 @@ int iemgui_dialog(t_iemgui *iemgui, t_symbol **srl, int argc, t_atom *argv)
srl[0] = atom_getsymbolarg(7, argc, argv);
else if(IS_A_FLOAT(argv,7))
{
#ifdef ROCKBOX
snprintf(str, sizeof(str)-1,
"%d", (int)atom_getintarg(7, argc, argv));
#else
sprintf(str, "%d", (int)atom_getintarg(7, argc, argv));
#endif
srl[0] = gensym(str);
}
if(IS_A_SYMBOL(argv,8))
srl[1] = atom_getsymbolarg(8, argc, argv);
else if(IS_A_FLOAT(argv,8))
{
#ifdef ROCKBOX
snprintf(str, sizeof(str)-1,
"%d", (int)atom_getintarg(8, argc, argv));
#else
sprintf(str, "%d", (int)atom_getintarg(8, argc, argv));
#endif
srl[1] = gensym(str);
}
if(IS_A_SYMBOL(argv,9))
srl[2] = atom_getsymbolarg(9, argc, argv);
else if(IS_A_FLOAT(argv,9))
{
#ifdef ROCKBOX
snprintf(str, sizeof(str)-1,
"%d", (int)atom_getintarg(9, argc, argv));
#else
sprintf(str, "%d", (int)atom_getintarg(9, argc, argv));
#endif
srl[2] = gensym(str);
}
if(init != 0) init = 1;