Changeset 6885

Timestamp:

08/04/09 14:13:49 (3 years ago)

Author:

Sewi

Message:

50% fix for ticket #390: Copy&Paste error

File:

• trunk/Padre/lib/Padre/Wx/Editor.pm (modified) (7 diffs)

trunk/Padre/lib/Padre/Wx/Editor.pm

@@ -34 +34 @@
 my $data_private;
 my $width;
+my $Clipboard_Old;
 
 sub new {
@@ -63 +64 @@
     Wx::Event::EVT_CHAR( $self, \&on_char );
     Wx::Event::EVT_SET_FOCUS( $self, \&on_focus );
+    Wx::Event::EVT_MIDDLE_UP($self, \&on_middle_up );
 
     # Smart highlighting...
@@ -728 +730 @@
 
         # Only on X11 based platforms
-        Wx::wxTheClipboard->UsePrimarySelection(1);
+#       Wx::wxTheClipboard->UsePrimarySelection(1);
         $self->put_text_to_clipboard($text);
-        Wx::wxTheClipboard->UsePrimarySelection(0);
+#       Wx::wxTheClipboard->UsePrimarySelection(0);
     }
 
@@ -736 +738 @@
     if ( $doc->can('event_on_left_up') ) {
         $doc->event_on_left_up( $self, $event );
+    }
+
+    $event->Skip;
+    return;
+}
+
+sub on_middle_up {
+    my ( $self, $event ) = @_;
+
+    # TODO: Sometimes there are unexpected effects when using the middle button.
+    # It seems that another event is doing something but not within this module.
+    # Please look at ticket #390 for details!
+
+    Padre::Current->editor->Paste;
+
+    my $doc = $self->{Document};
+    if ( $doc->can('event_on_middle_up') ) {
+        $doc->event_on_middle_up( $self, $event );
     }
 
@@ -1040 +1060 @@
 }
 
+sub Paste {
+    my $self = shift;
+
+    # Workaround for Copy/Paste bug ticket #390
+    my $text = $self->get_text_from_clipboard;
+    $self->ReplaceSelection($text);
+
+    return 1;
+}
+
 sub put_text_to_clipboard {
     my ( $self, $text ) = @_;
     @_ = (); # Feeble attempt to kill Scalars Leaked
 
+        # Backup last clipboard value:
+        $self->{Clipboard_Old} = $self->get_text_from_clipboard
+         if $self->{Clipboard_Old} ne $self->get_text_from_clipboard;
+
     Wx::wxTheClipboard->Open;
     Wx::wxTheClipboard->SetData( Wx::TextDataObject->new($text) );
@@ -1053 +1087 @@
 sub get_text_from_clipboard {
 
-    # This is to be used as a method even if we don't use $self!
-    # my $self = shift;
+    my $self = shift;
+
     my $text = '';
     Wx::wxTheClipboard->Open;
@@ -1060 +1094 @@
         my $data = Wx::TextDataObject->new;
         if ( Wx::wxTheClipboard->GetData($data) ) {
-            $text = $data->GetText;
-        }
-    }
+            $text = $data->GetText if defined($data);
+        }
+    }
+    if ($text eq $self->GetSelectedText) {
+        $text = $self->{Clipboard_Old};
+    }
+
     Wx::wxTheClipboard->Close;
     return $text;