Documentation: add missing mentions of the Wayland platform.

7 files changed, 19 insertions, 10 deletions

diff --git a/FL/fl_draw.H b/FL/fl_draw.H
index 66125d351..b801c715d 100644
--- a/FL/fl_draw.H
+++ b/FL/fl_draw.H
@@ -889,8 +889,8 @@ FL_EXPORT void fl_draw(const char *str, int x, int y);
   Draw a nul-terminated UTF-8 string starting at the given \p x, \p y
   location and rotating \p angle degrees counter-clockwise.
   This version of fl_draw provides direct access to the text drawing
-  function of the underlying OS and is supported by Xft, Win32 and MacOS
-  fltk subsets.
+  function of the underlying OS and is supported by all fltk platforms except
+  X11 without Xft.
 */
 FL_EXPORT void fl_draw(int angle, const char *str, int x, int y);
 /**
diff --git a/README.CMake.txt b/README.CMake.txt
index 9eeda3e16..b3d089be5 100644
--- a/README.CMake.txt
+++ b/README.CMake.txt
@@ -163,6 +163,10 @@ OPTION_USE_PANGO - default OFF
    unicode-defined scripts with limited support of right-to-left scripts.
    This option makes sense only under X11, and also requires Xft.
 
+OPTION_USE_WAYLAND - default OFF
+   Enables use of the Wayland system for all window operations.
+   This option requires a Wayland-equipped system, i.e., Linux or FreeBSD.
+
 OPTION_ABI_VERSION - default EMPTY
    Use a numeric value corresponding to the FLTK ABI version you want to
    build in the form 1xxyy for FLTK 1.x.y (xx and yy with leading zeroes).
diff --git a/README.txt b/README.txt
index f64c4d611..b3c736bef 100644
--- a/README.txt
+++ b/README.txt
@@ -4,8 +4,8 @@ README - Fast Light Tool Kit (FLTK) Version 1.4.0
 WHAT IS FLTK?
 
     The Fast Light Tool Kit ("FLTK", pronounced "fulltick") is a
-    a cross-platform C++ GUI toolkit for UNIX(r)/Linux(r) (X11),
-    Microsoft(r) Windows(r), and macOS(r). FLTK provides
+    a cross-platform C++ GUI toolkit for UNIX(r)/Linux(r) (X11 or
+    Wayland), Microsoft(r) Windows(r), and macOS(r). FLTK provides
     modern GUI functionality without the bloat and supports 3D
     graphics via OpenGL(r) and its built-in GLUT emulation. It
     was originally developed by Mr. Bill Spitzak and is
@@ -70,6 +70,8 @@ BUILDING AND INSTALLING FLTK UNDER UNIX AND macOS
         --enable-threads        - Enable multithreading support
         --enable-xdbe           - Enable the X double-buffer extension
         --enable-xft            - Enable the Xft library (anti-aliased fonts)
+        --enable-pango          - Draw text with the pango library
+        --enable-wayland        - Use the Wayland system for handling windows
 
         --bindir=/path          - Set the location for executables
                                   [default = /usr/local/bin]
diff --git a/documentation/src/enumerations.dox b/documentation/src/enumerations.dox
index 541d1e603..889be58be 100644
--- a/documentation/src/enumerations.dox
+++ b/documentation/src/enumerations.dox
@@ -153,9 +153,9 @@ value:
   - FL_ALT - One of the alt keys is down.
   - FL_NUM_LOCK - The num lock is on.
   - FL_META - One of the meta/Windows keys is down.
-  - FL_COMMAND - An alias for FL_CTRL on Windows and X11,
+  - FL_COMMAND - An alias for FL_CTRL on Windows, X11 and Wayland,
     or FL_META on MacOS X.
-  - FL_CONTROL - An alias for FL_META on Windows and X11,
+  - FL_CONTROL - An alias for FL_META on Windows, X11 and Wayland,
     or FL_CTRL on MacOS X.
   - FL_SCROLL_LOCK - The scroll lock is on.
   - FL_BUTTON1 - Mouse button 1 is pushed.
diff --git a/documentation/src/intro.dox b/documentation/src/intro.dox
index 8df76f07c..89ac09ac8 100644
--- a/documentation/src/intro.dox
+++ b/documentation/src/intro.dox
@@ -4,7 +4,7 @@
 
 The Fast Light Tool Kit ("FLTK", pronounced
 "fulltick") is a cross-platform C++ GUI toolkit for
-UNIX®/Linux® (X11), Microsoft® Windows®, and
+UNIX®/Linux® (X11 or Wayland), Microsoft® Windows®, and
 Apple® macOS®. FLTK provides modern GUI functionality without the
 bloat and supports 3D graphics via OpenGL® and its built-in
 GLUT emulation. It was originally developed by Mr. Bill Spitzak
@@ -94,7 +94,7 @@ Here are some of the core features unique to FLTK:
 
 \li The FLUID program (which includes every widget) is 538k.
 
-\li Written directly atop core libraries (Xlib, Windows or Cocoa) for
+\li Written directly atop core libraries (Xlib, Wayland, Windows or Cocoa) for
     maximum speed, and carefully optimized for code size and performance.
 
 \li Precise low-level compatibility between the X11, Windows and MacOS
@@ -218,6 +218,9 @@ Enable the pango library for drawing any text in any script under X11.
 When targeting cygwin, build with X11 GUI instead of windows GDI.
 Also applicable to macOS platforms supplemented with XQuartz.
 
+\par --enable-wayland
+Enable use of the Wayland system for window handling.
+
 \par --enable-cp936
 Under X11, enable use of the GB2312 locale
 
diff --git a/src/Fl_compose.cxx b/src/Fl_compose.cxx
index b83121467..ed8f42f69 100644
--- a/src/Fl_compose.cxx
+++ b/src/Fl_compose.cxx
@@ -49,7 +49,7 @@ int Fl::compose_state = 0;
 
  <p>On some platforms, text input can involve marked text, that is,
  temporary text replaced by other text during the input process. This occurs,
- e.g., under macOS when using dead keys or when entering CJK characters.
+ e.g., under Wayland or macOS when using dead keys or when entering CJK characters.
  Text editing widgets should preferentially signal
  marked text, usually underlining it. Widgets can use
  <tt>int Fl::compose_state</tt> <i>after</i> having called Fl::compose(int&)
diff --git a/src/drivers/Posix/Fl_Posix_System_Driver.cxx b/src/drivers/Posix/Fl_Posix_System_Driver.cxx
index d64a8fdcf..9cb4656af 100644
--- a/src/drivers/Posix/Fl_Posix_System_Driver.cxx
+++ b/src/drivers/Posix/Fl_Posix_System_Driver.cxx
@@ -1,5 +1,5 @@
 //
-// Definition of Posix system driver (used by both the X11 and macOS platforms).
+// Definition of Posix system driver (used by the X11, Wayland and macOS platforms).
 //
 // Copyright 1998-2021 by Bill Spitzak and others.
 //