From 3361da406bbb9c655bf0603490d7d811ddcee1c5 Mon Sep 17 00:00:00 2001
From: Ivica Ico Bukvic <ico@vt.edu>
Date: Wed, 20 Aug 2014 23:06:29 -0400
Subject: [PATCH] *cleaned up g_editor.c to remove compile warnings *fixed
coloring of cords to correspond with themed colors *fixed color prefs to
properly update existing objects, removed tk syntax leftovers that prevented
certain commands from taking place in tkpath, and removed redundant
conditions
---
pd/src/dialog_prefs.tcl | 9 ++++---
pd/src/g_editor.c | 54 +++++++++++++++++++----------------------
pd/src/pd.tk | 15 ++++++------
3 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/pd/src/dialog_prefs.tcl b/pd/src/dialog_prefs.tcl
index 19b1af4fd..f2ce4c000 100644
--- a/pd/src/dialog_prefs.tcl
+++ b/pd/src/dialog_prefs.tcl
@@ -184,21 +184,24 @@ proc ::dialog_prefs::set_color {array key op} {
lappend commands "itemconfigure \
outlet&&signal -fill $c"
}
- outlet {set commands [list "itemconfigure outlet -outline $c"]}
+ #outlet {set commands [list "itemconfigure outlet -stroke $c"]}
signal_cord {set commands [list "itemconfigure \
all_cords&&signal -stroke $c"]
lappend commands "itemconfigure \
(outlet&&signal)||(inlet&&signal) -stroke $c"
}
control_cord {set commands [list "itemconfigure \
- all_cords&&control -stroke $c"]}
+ all_cords&&control -stroke $c"]
+ lappend commands "itemconfigure \
+ ((inlet||outlet)&&control) -stroke $c"
+ }
selection {
set commands [list "itemconfigure \
selected&&text&&(!box&&!iemgui) -fill $c"]
lappend commands "itemconfigure \
selected&&(border&&(!iemgui)) -fill $c"
lappend commands "itemconfigure \
- selected&&border&&iemgui -outline $c"
+ selected&&border&&iemgui -stroke $c"
}
box_border {set commands [list "itemconfigure \
(box)&&(!iemgui) -stroke $c"]}
diff --git a/pd/src/g_editor.c b/pd/src/g_editor.c
index 622fff7a4..d01cb8ad4 100644
--- a/pd/src/g_editor.c
+++ b/pd/src/g_editor.c
@@ -42,7 +42,7 @@ static t_binbuf *copy_binbuf;
static t_glist *glist_finddirty(t_glist *x);
static void canvas_reselect(t_canvas *x);
static void canvas_cut(t_canvas *x);
-static void canvas_undo(t_canvas *x);
+//static void canvas_undo(t_canvas *x);
static int paste_xyoffset = 0; /* a counter of pastes to make x,y offsets */
//static void canvas_mouseup_gop(t_canvas *x, t_gobj *g);
static void canvas_done_popup(t_canvas *x, t_float which, t_float xpos,
@@ -352,7 +352,7 @@ void canvas_check_nlet_highlights(t_glist *x)
{
sys_vgui(".x%x.c itemconfigure %s -stroke %s -fill %s -strokewidth 1\n",
x, x->gl_editor->canvas_cnct_inlet_tag,
- (last_inlet_filter ? "black" : (inlet_issignal ?
+ (last_inlet_filter ? "$pd_colors(iemgui_nlet)" : (inlet_issignal ?
"$pd_colors(signal_cord)" : "$pd_colors(control_cord)")),
(inlet_issignal ?
"$pd_colors(signal_nlet)" : "$pd_colors(control_nlet)"));
@@ -373,7 +373,7 @@ void canvas_check_nlet_highlights(t_glist *x)
{
sys_vgui(".x%x.c itemconfigure %s -stroke %s -fill %s -strokewidth 1\n",
x, x->gl_editor->canvas_cnct_outlet_tag,
- (last_outlet_filter ? "black" : (outlet_issignal ?
+ (last_outlet_filter ? "$pd_colors(iemgui_nlet)" : (outlet_issignal ?
"$pd_colors(signal_cord)" : "$pd_colors(control_cord)")),
(outlet_issignal ?
"$pd_colors(signal_nlet)" : "$pd_colors(control_nlet)"));
@@ -3235,7 +3235,7 @@ void canvas_doclick(t_canvas *x, int xpos, int ypos, int which,
"-stroke %s -fill %s -strokewidth 1\n",
x, x->gl_editor->canvas_cnct_outlet_tag,
(last_outlet_filter ?
- "black" : (outlet_issignal ?
+ "$pd_colors(iemgui_nlet)" : (outlet_issignal ?
"$pd_colors(signal_cord)" :
"$pd_colors(control_cord)")),
(outlet_issignal ?
@@ -3247,8 +3247,6 @@ void canvas_doclick(t_canvas *x, int xpos, int ypos, int which,
last_outlet_filter =
gobj_filter_highlight_behavior(
(t_text *)&ob->ob_g);
- //fprintf(stderr,"last_outlet_filter == %d\n",
- // last_outlet_filter);
sprintf(x->gl_editor->canvas_cnct_outlet_tag,
"%so%d", rtext_gettag(yr), closest);
sys_vgui(".x%x.c itemconfigure %s "
@@ -3309,7 +3307,7 @@ void canvas_doclick(t_canvas *x, int xpos, int ypos, int which,
"-strokewidth 1\n",
x, x->gl_editor->canvas_cnct_inlet_tag,
(last_inlet_filter ?
- "black" :
+ "$pd_colors(iemgui_nlet)" :
(inlet_issignal ?
"$pd_colors(signal_cord)" :
"$pd_colors(control_cord)")),
@@ -3322,8 +3320,6 @@ void canvas_doclick(t_canvas *x, int xpos, int ypos, int which,
{
last_inlet_filter =
gobj_filter_highlight_behavior((t_text *)&ob->ob_g);
- //fprintf(stderr,"last_inlet_filter == %d\n",
- // last_inlet_filter);
sprintf(x->gl_editor->canvas_cnct_inlet_tag,
"%si%d", rtext_gettag(yr), closest);
sys_vgui(".x%x.c itemconfigure %s "
@@ -3407,7 +3403,7 @@ void canvas_doclick(t_canvas *x, int xpos, int ypos, int which,
"-strokewidth 1\n",
x, x->gl_editor->canvas_cnct_inlet_tag,
(last_inlet_filter ?
- "black" :
+ "$pd_colors(iemgui_nlet)" :
(inlet_issignal ?
"$pd_colors(signal_cord)" :
"$pd_colors(control_cord)")),
@@ -3428,7 +3424,7 @@ void canvas_doclick(t_canvas *x, int xpos, int ypos, int which,
"-strokewidth 1\n",
x, x->gl_editor->canvas_cnct_outlet_tag,
(last_outlet_filter ?
- "black" :
+ "$pd_colors(iemgui_nlet)" :
(outlet_issignal ?
"$pd_colors(signal_cord)" :
"$pd_colors(control_cord)")),
@@ -3536,7 +3532,7 @@ void canvas_doclick(t_canvas *x, int xpos, int ypos, int which,
"-strokewidth 1\n",
x, x->gl_editor->canvas_cnct_inlet_tag,
(last_inlet_filter ?
- "black" :
+ "$pd_colors(iemgui_nlet)" :
(inlet_issignal ?
"$pd_colors(signal_cord)" :
"$pd_colors(control_cord)")),
@@ -3556,7 +3552,7 @@ void canvas_doclick(t_canvas *x, int xpos, int ypos, int which,
"-strokewidth 1\n",
x, x->gl_editor->canvas_cnct_outlet_tag,
(last_outlet_filter ?
- "black" :
+ "$pd_colors(iemgui_nlet)" :
(outlet_issignal ?
"$pd_colors(signal_cord)" :
"$pd_colors(control_cord)")),
@@ -3581,7 +3577,7 @@ void canvas_doclick(t_canvas *x, int xpos, int ypos, int which,
sys_vgui(".x%x.c itemconfigure %s -stroke %s -fill %s -strokewidth 1\n",
x, x->gl_editor->canvas_cnct_inlet_tag,
(last_inlet_filter ?
- "black" :
+ "$pd_colors(iemgui_nlet)" :
(inlet_issignal ?
"$pd_colors(signal_cord)" :
"$pd_colors(control_cord)")),
@@ -3601,7 +3597,7 @@ void canvas_doclick(t_canvas *x, int xpos, int ypos, int which,
sys_vgui(".x%x.c itemconfigure %s -stroke %s -fill %s -strokewidth 1\n",
x, x->gl_editor->canvas_cnct_outlet_tag,
(last_outlet_filter ?
- "black" :
+ "$pd_colors(iemgui_nlet)" :
(outlet_issignal ?
"$pd_colors(signal_cord)" :
"$pd_colors(control_cord)")),
@@ -3924,7 +3920,7 @@ int canvas_doconnect_doit(t_canvas *x, t_gobj *y1, t_gobj *y2,
sys_vgui(".x%x.c itemconfigure %s -stroke %s -fill %s -strokewidth 1\n",
x, x->gl_editor->canvas_cnct_inlet_tag,
(last_inlet_filter ?
- "black" :
+ "$pd_colors(iemgui_nlet)" :
(obj_issignalinlet(ob2, closest2) ?
"$pd_colors(signal_cord)" :
"$pd_colors(control_cord)")),
@@ -3942,7 +3938,7 @@ int canvas_doconnect_doit(t_canvas *x, t_gobj *y1, t_gobj *y2,
sys_vgui(".x%x.c itemconfigure %s -stroke %s -fill %s -strokewidth 1\n",
x, x->gl_editor->canvas_cnct_outlet_tag,
(last_outlet_filter ?
- "black" :
+ "$pd_colors(iemgui_nlet)" :
(outlet_issignal ?
"$pd_colors(signal_cord)" :
"$pd_colors(control_cord)")),
@@ -4496,7 +4492,7 @@ void canvas_doconnect(t_canvas *x, int xpos, int ypos, int which, int doit)
"-strokewidth 1\n",
x, x->gl_editor->canvas_cnct_inlet_tag,
(last_inlet_filter ?
- "black" :
+ "$pd_colors(iemgui_nlet)" :
(inlet_issignal ?
"$pd_colors(signal_cord)" :
"$pd_colors(control_cord)")),
@@ -4541,7 +4537,7 @@ void canvas_doconnect(t_canvas *x, int xpos, int ypos, int which, int doit)
sys_vgui(".x%x.c itemconfigure %s -stroke %s -fill %s -strokewidth 1\n",
x, x->gl_editor->canvas_cnct_inlet_tag,
(last_inlet_filter ?
- "black" :
+ "$pd_colors(iemgui_nlet)" :
(inlet_issignal ?
"$pd_colors(signal_cord)" :
"$pd_colors(control_cord)")),
@@ -4745,7 +4741,7 @@ void canvas_mouseup(t_canvas *x,
"-strokewidth 1\n",
x, x->gl_editor->canvas_cnct_outlet_tag,
(last_outlet_filter ?
- "black" :
+ "$pd_colors(iemgui_nlet)" :
(outlet_issignal ?
"$pd_colors(signal_cord)" :
"$pd_colors(control_cord)")),
@@ -4759,7 +4755,7 @@ void canvas_mouseup(t_canvas *x,
"-strokewidth 1\n",
x, x->gl_editor->canvas_cnct_inlet_tag,
(last_inlet_filter ?
- "black" :
+ "$pd_colors(iemgui_nlet)" :
(inlet_issignal ?
"$pd_colors(signal_cord)" :
"$pd_colors(control_cord)")),
@@ -7071,20 +7067,20 @@ static void canvas_tidy(t_canvas *x)
#define NHIST 15
/* LATER might have to speed this up */
-static void canvas_tidyold(t_canvas *x)
+/*static void canvas_tidyold(t_canvas *x)
{
t_gobj *y, *y2;
int ax1, ay1, ax2, ay2, bx1, by1, bx2, by2;
int histogram[NHIST], *ip, i, besthist, bestdist;
- /* if nobody is selected, this means do it to all boxes;
- othewise just the selection */
+ // if nobody is selected, this means do it to all boxes;
+ // othewise just the selection
int all = (x->gl_editor ? (x->gl_editor->e_selection == 0) : 1);
//canvas_setundo(x, canvas_undo_move, canvas_undo_set_move(x, !all),
// "motion");
canvas_undo_add(x, 4, "motion", canvas_undo_set_move(x, !all));
- /* tidy horizontally */
+ // tidy horizontally
for (y = x->gl_list; y; y = y->g_next)
if (all || glist_isselected(x, y))
{
@@ -7109,7 +7105,7 @@ static void canvas_tidyold(t_canvas *x)
}
nothorizhead: ;
}
- /* tidy vertically. First guess the user's favorite vertical spacing */
+ // tidy vertically. First guess the user's favorite vertical spacing
for (i = NHIST, ip = histogram; i--; ip++) *ip = 0;
for (y = x->gl_list; y; y = y->g_next)
if (all || glist_isselected(x, y))
@@ -7173,7 +7169,7 @@ static void canvas_tidyold(t_canvas *x)
nothead: ;
}
canvas_dirty(x, 1);
-}
+}*/
static void canvas_texteditor(t_canvas *x)
{
@@ -7249,7 +7245,7 @@ void canvas_editmode(t_canvas *x, t_floatarg fyesplease)
"-strokewidth 1\n",
x, x->gl_editor->canvas_cnct_inlet_tag,
(last_inlet_filter ?
- "black" :
+ "$pd_colors(iemgui_nlet)" :
(inlet_issignal ?
"$pd_colors(signal_cord)" :
"$pd_colors(control_cord)")),
@@ -7264,7 +7260,7 @@ void canvas_editmode(t_canvas *x, t_floatarg fyesplease)
"-strokewidth 1\n",
x, x->gl_editor->canvas_cnct_outlet_tag,
(last_outlet_filter ?
- "black" :
+ "$pd_colors(iemgui_nlet)" :
(outlet_issignal ?
"$pd_colors(signal_cord)" :
"$pd_colors(control_cord)")),
diff --git a/pd/src/pd.tk b/pd/src/pd.tk
index 5c740e981..6508bc1c5 100644
--- a/pd/src/pd.tk
+++ b/pd/src/pd.tk
@@ -160,7 +160,7 @@ if { [info tclversion] >= 8.5 } {
proc match_linux_wm {list} {
global pd_nt linux_wm_bgcolor linux_wm_hlcolor
if { [info tclversion] >= 8.5 && $pd_nt == 0 } {
- if {[lsearch -regexp $list ::] == -1} {
+ if {[lsearch -regexp $list ::] != 0} {
#puts stderr [lindex $list 0]
if {[lindex $list 0] != "button" \
&& [lindex $list 0] != "checkbutton" \
@@ -197,6 +197,7 @@ proc match_linux_wm {list} {
if {[info exists newlist]} {
eval $newlist
} else {
+ #puts stderr "[lsearch -regexp $list ::]:::::[lindex $list 0]::::::$list"
eval $list
}
}
@@ -801,7 +802,7 @@ match_linux_wm [list frame .controls]
#if { [info tclversion] >= 8.5 && $pd_nt == 0 } {
# ttk::separator .eyecandy
# pack .eyecandy .controls -fill x -expand 0
-#} else {checkbutton
+#} else {
pack .controls -fill x -expand 1
#}
match_linux_wm [list frame .controls.switches]
@@ -5928,11 +5929,11 @@ proc pdtk_iemgui_dialog {id mainheader \
match_linux_wm [list frame $id.colors.select]
pack $id.colors.select -side top
- ttk::radiobutton $id.colors.select.radio0 -value 0 -variable \
+ match_linux_wm [list radiobutton $id.colors.select.radio0 -value 0 -variable \
::dialog($vid:l2_f1_b0) -text "background" -width 10]
- ttk::radiobutton $id.colors.select.radio1 -value 1 -variable \
+ match_linux_wm [list radiobutton $id.colors.select.radio1 -value 1 -variable \
::dialog($vid:l2_f1_b0) -text "front" -width 5]
- ttk::radiobutton $id.colors.select.radio2 -value 2 -variable \
+ match_linux_wm [list radiobutton $id.colors.select.radio2 -value 2 -variable \
::dialog($vid:l2_f1_b0) -text "label" -width 5]
if { $::dialog($vid:fcol) >= 0 } {
pack $id.colors.select.radio0 $id.colors.select.radio1 \
@@ -6548,12 +6549,12 @@ proc pdtk_canvas_dialog {id xscale yscale graphme x1 y1 x2 y2 \
-textvariable ::dialog($vid:yscale) -width 10]
pack $id.yscale.label $id.yscale.entry -side left -padx 3
- match_linux_wm [list ttk::checkbutton $id.graphme -text {graph on parent} \
+ match_linux_wm [list checkbutton $id.graphme -text {graph on parent} \
-variable ::dialog($vid:graphme) \
-command [concat canvas_checkcommand $wid]]
pack $id.graphme -side top
- match_linux_wm [list ttk::checkbutton $id.hidetext \
+ match_linux_wm [list checkbutton $id.hidetext \
-text {hide object name and arguments} \
-variable ::dialog($vid:hidetext) \
-command [concat canvas_checkcommand $wid]]
--
GitLab