summaryrefslogtreecommitdiff
path: root/FL
diff options
context:
space:
mode:
authorBill Spitzak <spitzak@gmail.com>2002-03-07 19:22:58 +0000
committerBill Spitzak <spitzak@gmail.com>2002-03-07 19:22:58 +0000
commit5f55e1cd63883c8d48a0e212e8910f6dfd536a50 (patch)
tree2249cb0f557d70a897c8c9939ee8df8d036ed14f /FL
parentcab1dedbd1f7f20d56a7c4bcb781569f03f52422 (diff)
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
Diffstat (limited to 'FL')
-rw-r--r--FL/Fl.H11
-rw-r--r--FL/Fl_Input_.H6
-rw-r--r--FL/x.H5
3 files changed, 13 insertions, 9 deletions
diff --git a/FL/Fl.H b/FL/Fl.H
index e387af6ed..51146a871 100644
--- a/FL/Fl.H
+++ b/FL/Fl.H
@@ -1,5 +1,5 @@
//
-// "$Id: Fl.H,v 1.8.2.11.2.13 2002/01/09 21:50:02 easysw Exp $"
+// "$Id: Fl.H,v 1.8.2.11.2.14 2002/03/07 19:22:55 spitzak Exp $"
//
// Main header file for the Fast Light Tool Kit (FLTK).
//
@@ -169,11 +169,14 @@ public:
static FL_EXPORT void add_handler(int (*h)(int));
// cut/paste:
+ static FL_EXPORT void copy(const char* stuff, int len, int clipboard = 0);
+ static FL_EXPORT void paste(Fl_Widget &receiver, int clipboard /*=0*/);
+ static FL_EXPORT int dnd();
+ // These are for back-compatability only:
static FL_EXPORT Fl_Widget* selection_owner() {return selection_owner_;}
static FL_EXPORT void selection_owner(Fl_Widget*);
- static FL_EXPORT void selection(Fl_Widget &owner, const char* stuff, int len);
+ static FL_EXPORT void selection(Fl_Widget &owner, const char*, int len);
static FL_EXPORT void paste(Fl_Widget &receiver);
- static FL_EXPORT int dnd();
// screen size:
#if defined(WIN32) || defined(__APPLE__)
@@ -244,5 +247,5 @@ public:
#endif // !Fl_H
//
-// End of "$Id: Fl.H,v 1.8.2.11.2.13 2002/01/09 21:50:02 easysw Exp $".
+// End of "$Id: Fl.H,v 1.8.2.11.2.14 2002/03/07 19:22:55 spitzak Exp $".
//
diff --git a/FL/Fl_Input_.H b/FL/Fl_Input_.H
index c021484a7..dd43a6dc1 100644
--- a/FL/Fl_Input_.H
+++ b/FL/Fl_Input_.H
@@ -1,5 +1,5 @@
//
-// "$Id: Fl_Input_.H,v 1.6.2.4.2.2 2002/01/01 15:11:27 easysw Exp $"
+// "$Id: Fl_Input_.H,v 1.6.2.4.2.3 2002/03/07 19:22:56 spitzak Exp $"
//
// Input base class header file for the Fast Light Tool Kit (FLTK).
//
@@ -105,7 +105,7 @@ public:
int cut(int n) {return replace(position(), position()+n, 0);}
int cut(int a, int b) {return replace(a, b, 0);}
int insert(const char* t, int l=0){return replace(position_, mark_, t, l);}
- FL_EXPORT int copy();
+ FL_EXPORT int copy(int clipboard);
FL_EXPORT int undo();
FL_EXPORT int copy_cuts();
@@ -122,5 +122,5 @@ public:
#endif
//
-// End of "$Id: Fl_Input_.H,v 1.6.2.4.2.2 2002/01/01 15:11:27 easysw Exp $".
+// End of "$Id: Fl_Input_.H,v 1.6.2.4.2.3 2002/03/07 19:22:56 spitzak Exp $".
//
diff --git a/FL/x.H b/FL/x.H
index 467f5f1f3..32e1307b4 100644
--- a/FL/x.H
+++ b/FL/x.H
@@ -1,5 +1,5 @@
//
-// "$Id: x.H,v 1.10.2.8.2.6 2002/03/06 18:11:00 easysw Exp $"
+// "$Id: x.H,v 1.10.2.8.2.7 2002/03/07 19:22:56 spitzak Exp $"
//
// X11 header file for the Fast Light Tool Kit (FLTK).
//
@@ -58,6 +58,7 @@ FL_EXPORT void fl_close_display();
// constant info about the X server connection:
extern FL_EXPORT Display *fl_display;
+extern FL_EXPORT Window fl_message_window;
extern FL_EXPORT int fl_screen;
extern FL_EXPORT XVisualInfo *fl_visual;
extern FL_EXPORT Colormap fl_colormap;
@@ -136,5 +137,5 @@ extern FL_EXPORT int fl_parse_color(const char* p, uchar& r, uchar& g, uchar& b)
#endif
//
-// End of "$Id: x.H,v 1.10.2.8.2.6 2002/03/06 18:11:00 easysw Exp $".
+// End of "$Id: x.H,v 1.10.2.8.2.7 2002/03/07 19:22:56 spitzak Exp $".
//