Commit 7567cb69 authored by Ivica Bukvic's avatar Ivica Bukvic Committed by Hans-Christoph Steiner
Browse files

Pd-0.42.5-extended-l2ork-dev-20110108.tar.bz2

parent 563ff859
......@@ -613,6 +613,7 @@ t_symbol *canvas_makebindsym(t_symbol *s)
void canvas_reflecttitle(t_canvas *x)
{
//fprintf(stderr,"canvas_reflecttitle\n");
char namebuf[MAXPDSTRING];
t_canvasenvironment *env = canvas_getenv(x);
if (env->ce_argc)
......@@ -636,7 +637,7 @@ void canvas_reflecttitle(t_canvas *x)
x, x->gl_dirty, canvas_getdir(x)->s_name, x->gl_name->s_name);
sys_vgui("wm title .x%lx {%s%s}\n", x, x->gl_name->s_name, namebuf);
#else
if(glist_istoplevel(x) || !x->gl_isgraph || x->gl_isgraph && x->gl_havewindow)
if(glist_istoplevel(x) || !x->gl_isgraph || x->gl_isgraph && x->gl_havewindow || x->gl_loading)
sys_vgui("wm title .x%lx {%s%c%s - %s}\n",
x, x->gl_name->s_name, (x->gl_dirty? '*' : ' '), namebuf,
canvas_getdir(x)->s_name);
......
......@@ -130,6 +130,7 @@ void gobj_delete(t_gobj *x, t_glist *glist)
int gobj_shouldvis(t_gobj *x, struct _glist *glist)
{
t_object *ob;
//fprintf(stderr,"shouldvis\n");
if (!glist->gl_havewindow && glist->gl_isgraph && glist->gl_goprect &&
glist->gl_owner && (pd_class(&glist->gl_pd) != garray_class))
{
......
......@@ -597,7 +597,7 @@ t_float glist_ytopixels(t_glist *x, t_float yval)
{
int x1, y1, x2, y2;
if (!x->gl_owner)
bug("glist_pixelstox");
bug("glist_pixelstoy");
graph_graphrect(&x->gl_gobj, x->gl_owner, &x1, &y1, &x2, &y2);
return (y1 + (y2 - y1) * (yval - x->gl_y1) / (x->gl_y2 - x->gl_y1));
}
......@@ -909,11 +909,6 @@ static void graph_getrect(t_gobj *z, t_glist *glist,
int x21, y21, x22, y22;
graph_graphrect(z, glist, &x1, &y1, &x2, &y2);
/* fix visibility of edge items */
x1 -= 1;
y1 -= 1;
//x2 += 1;
y2 += 1;
if (canvas_showtext(x))
{
......@@ -946,6 +941,19 @@ static void graph_getrect(t_gobj *z, t_glist *glist,
}
x->gl_havewindow = hadwindow;
}
/* fix visibility of edge items for garrays */
int has_garray = 0;
for (g = x->gl_list; g; g = g->g_next) {
if (pd_class(&g->g_pd) == garray_class) {
has_garray = 1;
}
}
if (has_garray) {
x1 -= 1;
y1 -= 2;
//x2 += 1;
y2 += 1;
}
}
else text_widgetbehavior.w_getrectfn(z, glist, &x1, &y1, &x2, &y2);
*xp1 = x1;
......
......@@ -1715,14 +1715,15 @@ static void plot_vis(t_gobj *z, t_glist *glist,
minyval = yval;
if (i == nelem-1 || inextx != ixpix)
{
//we subtract 1 from y to keep it in sync with the rest of the types of templates
sys_vgui(
".x%lx.c create rectangle %d %d %d %d -fill black -width 0 -tags plot%lx\n",
glist_getcanvas(glist),
ixpix, (int)glist_ytopixels(glist,
basey + fielddesc_cvttocoord(yfielddesc, minyval)),
basey + fielddesc_cvttocoord(yfielddesc, minyval)) - 1,
inextx, (int)(glist_ytopixels(glist,
basey + fielddesc_cvttocoord(yfielddesc, maxyval))
+ linewidth), data);
+ linewidth) - 1, data);
ndrawn++;
minyval = 1e20;
maxyval = -1e20;
......
......@@ -1378,10 +1378,10 @@ void glist_drawiofor(t_glist *glist, t_object *ob, int firsttime,
onset, y2 - 2,
onset + IOWIDTH, y2);
// jsarlo
sys_vgui(".x%x.c raise %so%d\n",
/*sys_vgui(".x%x.c raise %so%d\n",
glist_getcanvas(glist),
tag,
i);
i);*/
// end jsarlo
}
n = obj_ninlets(ob);
......@@ -1405,10 +1405,10 @@ void glist_drawiofor(t_glist *glist, t_object *ob, int firsttime,
onset, y1,
onset + IOWIDTH, y1 + EXTRAPIX);
// jsarlo
sys_vgui(".x%x.c raise %si%d\n",
/*sys_vgui(".x%x.c raise %si%d\n",
glist_getcanvas(glist),
tag,
i);
i);*/
// end jsarlo
}
}
......
......@@ -11,7 +11,7 @@ extern "C" {
#define PD_MAJOR_VERSION 0
#define PD_MINOR_VERSION 42
#define PD_BUGFIX_VERSION 5
#define PD_TEST_VERSION "extended-l2ork-20110105"
#define PD_TEST_VERSION "extended-l2ork-20110108"
/* old name for "MSW" flag -- we have to take it for the sake of many old
"nmakefiles" for externs, which will define NT and not MSW */
......
......@@ -4506,6 +4506,10 @@ proc pdtk_array_dialog {id name n flags newone canvas} {
wm protocol $id WM_DELETE_WINDOW [concat array_cancel $id]
pdtk_panelkeybindings $id "array"
global pd_nt ctrl_key
pdtk_standardkeybindings $id
#override panelkeybindings with an unusual ok/apply format
bind $id <KeyPress-Return> [format "array_ok $id $canvas"]
match_linux_wm [list frame $id.name]
pack $id.name -side top -pady 3
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment