From 5f55e1cd63883c8d48a0e212e8910f6dfd536a50 Mon Sep 17 00:00:00 2001 From: Bill Spitzak Date: Thu, 7 Mar 2002 19:22:58 +0000 Subject: Back-ported cut & paste code from fltk2.0. This code splits the cut & paste into two buffers. The "SELECTION" is used for the currently highlighted text and for middle-mouse paste and (if possible) for handling drag & drop. The "CLIPBOARD" is for Ctrl+C and Ctrl+V style cut & paste. This matches how Motif, GTK, and KDE 3.0 work. But many older X applications (including KDE 2) can only see SELECTION, this results in cut & paste incompatability that is familiar to X users. However this now moves fltk over to the majority camp. On all systems this eliminates the annoying inability to select a region and replace it with Ctrl+V. On Mac and Win32 the SELECTION is local to the application, so middle-mouse paste only works between fields in the application. There may be tricks (special clipboard data types? use drag & drop?) to make it communicate, but unless there are standards it would be fltk-only. The file Fl_cutpaste.cxx has been deleted, so update the IDE files! The Win32 and Mac versions have NOT BEEN TESTED! I tried to be careful editing them but they may need some work. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1989 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl_Input_.cxx | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'src/Fl_Input_.cxx') diff --git a/src/Fl_Input_.cxx b/src/Fl_Input_.cxx index f72ebb078..c9a811e81 100644 --- a/src/Fl_Input_.cxx +++ b/src/Fl_Input_.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Input_.cxx,v 1.21.2.11.2.6 2002/01/01 15:11:30 easysw Exp $" +// "$Id: Fl_Input_.cxx,v 1.21.2.11.2.7 2002/03/07 19:22:56 spitzak Exp $" // // Common input widget routines for the Fast Light Tool Kit (FLTK). // @@ -500,14 +500,13 @@ int Fl_Input_::up_down_position(int i, int keepmark) { return j; } -int Fl_Input_::copy() { - if (mark() != position()) { - int b, e; if (position() < mark()) { - b = position(); e = mark(); - } else { - e = position(); b = mark(); - } - Fl::selection(*this, value()+b, (type()!=FL_SECRET_INPUT) ? e-b : 0); +int Fl_Input_::copy(int clipboard) { + int b = position(); + int e = mark(); + if (b != e) { + if (b > e) {b = mark(); e = position();} + if (type() == FL_SECRET_INPUT) e = b; + Fl::copy(value()+b, e-b, clipboard); return 1; } return 0; @@ -662,8 +661,8 @@ int Fl_Input_::yank() { int Fl_Input_::copy_cuts() { // put the yank buffer into the X clipboard - if (!yankcut) return 0; - Fl::selection(*this, undobuffer, yankcut); + if (!yankcut || type()==FL_SECRET_INPUT) return 0; + Fl::copy(undobuffer, yankcut, 1); return 1; } @@ -705,7 +704,7 @@ int Fl_Input_::handletext(int event, int X, int Y, int W, int H) { case FL_RELEASE: // handle_mouse(X, Y, W, H, 1); - copy(); + copy(0); return 1; // case FL_SELECTIONCLEAR: @@ -859,5 +858,5 @@ Fl_Input_::~Fl_Input_() { } // -// End of "$Id: Fl_Input_.cxx,v 1.21.2.11.2.6 2002/01/01 15:11:30 easysw Exp $". +// End of "$Id: Fl_Input_.cxx,v 1.21.2.11.2.7 2002/03/07 19:22:56 spitzak Exp $". // -- cgit v1.2.3