2 files changed, 22 insertions, 2 deletions
diff --git a/src/Fl.cxx b/src/Fl.cxx
index 6264c4a30..374847047 100644
--- a/src/Fl.cxx
+++ b/src/Fl.cxx
@@ -778,7 +778,7 @@ static handler_link *handlers = 0;
 
   - \ref FL_SHORTCUT events that are not recognized by any widget.
     This lets you provide global shortcut keys.
-  - \ref FL_SCREEN_CONFIGURATION_CHANGED events (not implemented on the X11 platform).
+  - \ref FL_SCREEN_CONFIGURATION_CHANGED events.
   - System events that FLTK does not recognize.  See fl_xevent.
   - \e Some other events when the widget FLTK selected returns
     zero from its handle() method.  Exactly which ones may change
diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx
index bc528aa34..360981ed8 100644
--- a/src/Fl_x.cxx
+++ b/src/Fl_x.cxx
@@ -43,6 +43,10 @@
 #  include <X11/Xlocale.h>
 #  include <X11/Xlib.h>
 #  include <X11/keysym.h>
+#ifdef HAVE_XRANDR
+#include <X11/extensions/Xrandr.h>
+static int randrEventBase = -1;
+#endif
 
 static Fl_Xlib_Graphics_Driver fl_xlib_driver;
 static Fl_Display_Device fl_xlib_display(&fl_xlib_driver);
@@ -587,6 +591,7 @@ void fl_open_display() {
   fl_open_display(d);
 }
 
+
 void fl_open_display(Display* d) {
   fl_display = d;
 
@@ -637,6 +642,12 @@ void fl_open_display(Display* d) {
 #if !USE_COLORMAP
   Fl::visual(FL_RGB);
 #endif
+#ifdef HAVE_XRANDR
+  int error_base;
+  if (XRRQueryExtension(d, &randrEventBase, &error_base))
+    XRRSelectInput(d, RootWindow(d, fl_screen), RRScreenChangeNotifyMask);
+  else randrEventBase = -1;
+#endif
 }
 
 void fl_close_display() {
@@ -920,7 +931,16 @@ int fl_handle(const XEvent& thisevent)
 
   if ( XFilterEvent((XEvent *)&xevent, 0) )
       return(1);
-
+  
+#ifdef HAVE_XRANDR  
+  if( randrEventBase >= 0 && xevent.type == randrEventBase + RRScreenChangeNotify) {
+    XRRUpdateConfiguration (&xevent);
+    Fl::call_screen_init();
+    fl_init_workarea();
+    Fl::handle(FL_SCREEN_CONFIGURATION_CHANGED, NULL);
+  }
+#endif
+  
   switch (xevent.type) {
 
   case KeymapNotify: