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

src/g_editor.c

@@ -1615,6 +1615,7 @@ static void canvas_doarrange(t_canvas *x, t_float which, t_gobj *oldy, t_gobj *o
 		// and finally redraw
 		canvas_redraw(x);
 	}
+	canvas_dirty(x, 1);
 }
 
     /* called from the gui when a popup menu comes back with "properties,"
@@ -1642,7 +1643,7 @@ static void canvas_done_popup(t_canvas *x, t_float which, t_float xpos, t_float
 				}
 			}
 			// this was a bogus call--get me out of here!
-			if (!y) return;
+			if (!x->gl_editor->e_selection) return;
 		}
 	}
 	

src/m_pd.h

@@ -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-20110109"
+#define PD_TEST_VERSION "extended-l2ork-20110201"
 
 /* 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 */

src/pd.tk

@@ -1656,12 +1656,15 @@ proc menu_mycnv {name accel} {
 
 ############iemlib##################
 
-# correct edit menu, enabling or disabling undo/redo
-# LATER also cut/copy/paste
+# correct edit menu, enabling or disabling undo/redo/cut/copy/paste
 proc menu_fixeditmenu {name} {
     global pd_undoaction
     global pd_redoaction
     global pd_undocanvas
+
+	global global_selection
+	global global_clipboard
+
     #    puts stderr [concat menu_fixeditmenu $name $pd_undocanvas $pd_undoaction]
     if {$name == $pd_undocanvas && $pd_undoaction != "no"} {
         $name.m.edit entryconfigure "Undo*" -state normal \
@@ -1675,6 +1678,18 @@ proc menu_fixeditmenu {name} {
     } else {
         $name.m.edit entryconfigure "Redo*" -state disabled
     }
+
+    if {$global_selection == 1} {
+        $name.m.edit entryconfigure "Duplicate" -state normal
+    } else {
+        $name.m.edit entryconfigure "Duplicate" -state disabled
+    }
+
+    if {$global_clipboard == 1} {
+        $name.m.edit entryconfigure "Paste" -state normal
+    } else {
+        $name.m.edit entryconfigure "Paste" -state disabled
+    }
 }
 
 # message from Pd to update the currently available undo/redo action
@@ -4960,35 +4975,27 @@ proc pdtk_canvas_magicglassval {name value} {
 
 proc pdtk_canvas_update_edit_menu {name value} {
 	global global_selection
-	global menu_windowlist
 
 	set global_selection $value
 
     if { $value } {
 		$name.m.edit entryconfigure "Cut" -state normal
 		$name.m.edit entryconfigure "Copy" -state normal
-		#$name.m.edit entryconfigure "Duplicate" -state normal
+		$name.m.edit entryconfigure "Duplicate" -state normal
 		$name.m.edit entryconfigure "Reselect" -state normal
 		$name.m.edit entryconfigure "Bring To Front" -state normal
 		$name.m.edit entryconfigure "Send To Back" -state normal
 		$name.m.edit entryconfigure "Tidy Up" -state normal
 
-		foreach i $menu_windowlist {
-		    [lindex $i 1].m.edit entryconfigure "Duplicate" -state normal
-		}
-
     } else {                          
 		$name.m.edit entryconfigure "Cut" -state disabled
 		$name.m.edit entryconfigure "Copy" -state disabled
-		#$name.m.edit entryconfigure "Duplicate" -state disabled
+		$name.m.edit entryconfigure "Duplicate" -state disabled
 		$name.m.edit entryconfigure "Reselect" -state disabled
 		$name.m.edit entryconfigure "Bring To Front" -state disabled
 		$name.m.edit entryconfigure "Send To Back" -state disabled
 		$name.m.edit entryconfigure "Tidy Up" -state disabled
 
-		foreach i $menu_windowlist {
-		    [lindex $i 1].m.edit entryconfigure "Duplicate" -state disabled
-		}
     }                                                 
 }
 
@@ -4996,20 +5003,7 @@ proc pdtk_canvas_update_paste_menu {value} {
 	global global_clipboard
 	global menu_windowlist
 
-	set global_clipboard $value
-
-    if { $value } {
-		foreach i $menu_windowlist {
-		    [lindex $i 1].m.edit entryconfigure "Paste" -state normal
-		}
-		.mbar.edit entryconfigure "Paste" -state normal
-    } else {      
-		# probably unnecessary                    
-		foreach i $menu_windowlist {
-		    [lindex $i 1].m.edit entryconfigure "Paste" -state disabled
-		}
-		.mbar.edit entryconfigure "Paste" -state disabled
-    }                                                 
+	set global_clipboard $value                                                
 }
 
 ############ pdtk_text_new -- create a new text object #2###########