Move general FLTK stuff to own directory

Let's separate TigerVNC specific things from stuff that could be part of
upstream FLTK. These are files that we would like to collaborate with
other FLTK users, so they are more liberally licensed and avoid using
TigerVNC specific things.

9 files changed, 25 insertions, 19 deletions

diff --git a/vncviewer/CMakeLists.txt b/vncviewer/CMakeLists.txt
index 15eac661..95180454 100644
--- a/vncviewer/CMakeLists.txt
+++ b/vncviewer/CMakeLists.txt
@@ -4,6 +4,7 @@ include_directories(${GETTEXT_INCLUDE_DIR})
 include_directories(${CMAKE_SOURCE_DIR}/common)
 
 add_executable(vncviewer
+  fltk/MonitorArrangement.cxx
   menukey.cxx
   BaseTouchHandler.cxx
   CConn.cxx
@@ -18,7 +19,6 @@ add_executable(vncviewer
   parameters.cxx
   keysym2ucs.c
   touch.cxx
-  MonitorArrangement.cxx
   MonitorIndicesParameter.cxx
   vncviewer.cxx)
 
diff --git a/vncviewer/OptionsDialog.cxx b/vncviewer/OptionsDialog.cxx
index 2a904dd8..78197c6f 100644
--- a/vncviewer/OptionsDialog.cxx
+++ b/vncviewer/OptionsDialog.cxx
@@ -36,11 +36,12 @@
 #endif
 
 #include "OptionsDialog.h"
-#include "fltk_layout.h"
 #include "i18n.h"
 #include "menukey.h"
 #include "parameters.h"
-#include "MonitorArrangement.h"
+
+#include "fltk/layout.h"
+#include "fltk/MonitorArrangement.h"
 
 #include <FL/Fl.H>
 #include <FL/Fl_Tabs.H>
diff --git a/vncviewer/ServerDialog.cxx b/vncviewer/ServerDialog.cxx
index f2f4113a..e153d3d3 100644
--- a/vncviewer/ServerDialog.cxx
+++ b/vncviewer/ServerDialog.cxx
@@ -39,9 +39,9 @@
 #include <rfb/Exception.h>
 #include <rfb/LogWriter.h>
 
+#include "fltk/layout.h"
 #include "ServerDialog.h"
 #include "OptionsDialog.h"
-#include "fltk_layout.h"
 #include "i18n.h"
 #include "vncviewer.h"
 #include "parameters.h"
diff --git a/vncviewer/UserDialog.cxx b/vncviewer/UserDialog.cxx
index 1d90cc50..acd86b1a 100644
--- a/vncviewer/UserDialog.cxx
+++ b/vncviewer/UserDialog.cxx
@@ -38,8 +38,8 @@
 #include <rfb/Password.h>
 #include <rfb/Exception.h>
 
+#include "fltk/layout.h"
 #include "i18n.h"
-#include "fltk_layout.h"
 #include "parameters.h"
 #include "UserDialog.h"
 
diff --git a/vncviewer/Viewport.cxx b/vncviewer/Viewport.cxx
index 81ad9827..14116d11 100644
--- a/vncviewer/Viewport.cxx
+++ b/vncviewer/Viewport.cxx
@@ -55,12 +55,12 @@
 #define MAPVK_VK_TO_VSC 0
 #endif
 
+#include "fltk/layout.h"
 #include "Viewport.h"
 #include "CConn.h"
 #include "OptionsDialog.h"
 #include "DesktopWindow.h"
 #include "i18n.h"
-#include "fltk_layout.h"
 #include "parameters.h"
 #include "keysym2ucs.h"
 #include "menukey.h"
diff --git a/vncviewer/MonitorArrangement.cxx b/vncviewer/fltk/MonitorArrangement.cxx
index 7910ab88..7910ab88 100644
--- a/vncviewer/MonitorArrangement.cxx
+++ b/vncviewer/fltk/MonitorArrangement.cxx
diff --git a/vncviewer/MonitorArrangement.h b/vncviewer/fltk/MonitorArrangement.h
index d6db2677..d6db2677 100644
--- a/vncviewer/MonitorArrangement.h
+++ b/vncviewer/fltk/MonitorArrangement.h
diff --git a/vncviewer/fltk_layout.h b/vncviewer/fltk/layout.h
index 9e5c2d47..8153f9b1 100644
--- a/vncviewer/fltk_layout.h
+++ b/vncviewer/fltk/layout.h
@@ -1,19 +1,24 @@
 /* Copyright 2011 Pierre Ossman <ossman@cendio.se> for Cendio AB
  * 
- * This is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
  * 
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
  * 
- * You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
- * USA.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 
 #ifndef __FLTK_LAYOUT_H__
diff --git a/vncviewer/vncviewer.cxx b/vncviewer/vncviewer.cxx
index 3f30fada..4dd4eac8 100644
--- a/vncviewer/vncviewer.cxx
+++ b/vncviewer/vncviewer.cxx
@@ -67,6 +67,7 @@
 #include <FL/fl_ask.H>
 #include <FL/x.H>
 
+#include "fltk/layout.h"
 #include "i18n.h"
 #include "parameters.h"
 #include "CConn.h"
@@ -74,7 +75,6 @@
 #include "UserDialog.h"
 #include "touch.h"
 #include "vncviewer.h"
-#include "fltk_layout.h"
 
 #ifdef WIN32
 #include "resource.h"