Add example code to Fl_Window_Driver.

Some refactoring of a take_focus() function into driver structures (not too happy with it, because it has some kind of bug fix. However, shouldn't *all* Fl_Windows always have an FL_Window_Driver?)

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11196 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

FL/Fl_Window.H

@@ -636,6 +636,8 @@ public:
    */
   int decorated_h();
 
+  Fl_Window_Driver *driver() { return i; }
+
 };
 
 #endif

FL/Fl_Window_Driver.H

@@ -38,6 +38,8 @@ public:
   Fl_Window_Driver(Fl_Window *);
   virtual ~Fl_Window_Driver();
   static Fl_Window_Driver *newWindowDriver(Fl_Window *);
+
+  virtual void take_focus() { }
 };
 
 

src/Fl.cxx

@@ -1001,24 +1001,16 @@ void Fl::focus(Fl_Widget *o) {
       if (!w1) w1 = o->window();
       while (w1) { win=w1; w1=win->window(); }
       if (win) {
-#ifdef __APPLE__ // PORTME: Fl_Window_Driver - platform window focus
+        if (fl_xfocus != win) {
-	if (fl_xfocus != win) {
+          Fl_Window_Driver *drvr = win->driver();
-	  Fl_X *x = Fl_X::i(win);
+#ifdef USE_X11 // platform fix
-	  if (x) x->set_key_window();
+          if (!Fl_X::ewmh_supported()) win->show(); // Old WMs, XMapRaised
-	}
+          else if (drvr) drvr->take_focus();
-#elif defined(USE_X11)
+#else
-	if (fl_xfocus != win) {
+          if (drvr) drvr->take_focus();
-	  Fl_X *x = Fl_X::i(win);
-	  if (!Fl_X::ewmh_supported())
-	    win->show(); // Old WMs, XMapRaised
-	  else if (x) // New WMs use the NETWM attribute:
-	    Fl_X::activate_window(x->xid);
-	}
-#elif defined(WIN32)
-#elif defined(FL_PORTING)
-#  pragma message "FL_PORTING: handle platform specifics for change of keyboard focus here"
 #endif
-	fl_xfocus = win;
+          fl_xfocus = win;
+        }
       }
     }
     // take focus from the old focused window

src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx

@@ -33,6 +33,14 @@ Fl_Cocoa_Window_Driver::Fl_Cocoa_Window_Driver(Fl_Window *win)
 }
 
 
+extern Fl_Window *fl_xfocus;
+
+
+void Fl_Cocoa_Window_Driver::take_focus()
+{
+  set_key_window();
+}
+
 
 //
 // End of "$Id$".

src/drivers/Cocoa/Fl_Cocoa_Window_Driver.h

@@ -46,6 +46,7 @@ class FL_EXPORT Fl_Cocoa_Window_Driver : public Fl_Window_Driver
 {
 public:
   Fl_Cocoa_Window_Driver(Fl_Window*);
+  virtual void take_focus();
 };
 
 

src/drivers/X11/Fl_X11_Window_Driver.cxx

@@ -33,6 +33,16 @@ Fl_X11_Window_Driver::Fl_X11_Window_Driver(Fl_Window *win)
 }
 
 
+void Fl_X11_Window_Driver::take_focus()
+{
+  if (!Fl_X::ewmh_supported())
+      win->show(); // Old WMs, XMapRaised
+    else if (x) // New WMs use the NETWM attribute:
+      Fl_X::activate_window(x->xid);
+  }
+}
+
+
 //
 // End of "$Id$".
 //

src/drivers/X11/Fl_X11_Window_Driver.h

@@ -46,6 +46,7 @@ class FL_EXPORT Fl_X11_Window_Driver : public Fl_Window_Driver
 {
 public:
   Fl_X11_Window_Driver(Fl_Window*);
+  virtual void take_focus();
 };