#105 X11.cpp is broken down to parts to be more managable. 4.x-dev

Fri, 21 Feb 2020 17:02:44 +0200

author
cemkalyoncu
date
Fri, 21 Feb 2020 17:02:44 +0200
branch
4.x-dev
changeset 1345
c8e54573063a
parent 1343
f4d7cf6a3c6a
child 1346
ca79f2704ec6

#105 X11.cpp is broken down to parts to be more managable.

Source/Gorgon/Containers/Wave.h file | annotate | diff | comparison | revisions
Source/Gorgon/Input/Mouse.h file | annotate | diff | comparison | revisions
Source/Gorgon/Window.h file | annotate | diff | comparison | revisions
Source/Gorgon/WindowManager/X11.cpp file | annotate | diff | comparison | revisions
Source/Gorgon/WindowManager/X11/Clipboard.cpp file | annotate | diff | comparison | revisions
Source/Gorgon/WindowManager/X11/DnD.cpp file | annotate | diff | comparison | revisions
Source/Gorgon/WindowManager/X11/Input.cpp file | annotate | diff | comparison | revisions
Source/Gorgon/WindowManager/X11/Monitor.cpp file | annotate | diff | comparison | revisions
Source/Gorgon/WindowManager/X11/Window.cpp file | annotate | diff | comparison | revisions
Source/Gorgon/WindowManager/X11/X11.cpp file | annotate | diff | comparison | revisions
Source/Gorgon/WindowManager/X11/X11.h file | annotate | diff | comparison | revisions
Source/Gorgon/WindowManager/X11/X11Keysym.h file | annotate | diff | comparison | revisions
Source/Gorgon/WindowManager/X11/dir.cmake file | annotate | diff | comparison | revisions
Source/Gorgon/WindowManager/X11Keysym.h file | annotate | diff | comparison | revisions
Source/Gorgon/WindowManager/dir.cmake file | annotate | diff | comparison | revisions
--- a/Source/Gorgon/Containers/Wave.h	Sat Feb 15 10:22:44 2020 +0200
+++ b/Source/Gorgon/Containers/Wave.h	Fri Feb 21 17:02:44 2020 +0200
@@ -5,10 +5,6 @@
 #include <string>
 
 #include "../Types.h"
-#include "../Geometry/Point.h"
-#include "../Geometry/Size.h"
-#include "../Graphics/Color.h"
-
 #include "../Audio/Basic.h"
 #include "../IO/Stream.h"
 
--- a/Source/Gorgon/Input/Mouse.h	Sat Feb 15 10:22:44 2020 +0200
+++ b/Source/Gorgon/Input/Mouse.h	Fri Feb 21 17:02:44 2020 +0200
@@ -1,6 +1,8 @@
 /// @file
 
 #pragma once
+
+#include "../Types.h"
 #include "../Enum.h"
 
 namespace Gorgon { namespace Input {
--- a/Source/Gorgon/Window.h	Sat Feb 15 10:22:44 2020 +0200
+++ b/Source/Gorgon/Window.h	Fri Feb 21 17:02:44 2020 +0200
@@ -32,6 +32,7 @@
 		friend internal::windowdata *WindowManager::internal::getdata(const Window&);
 		friend struct internal::windowdata;
         friend class Layer;
+        friend class windaccess;
 	public:
 		/// Fullscreen tag
 		static const struct FullscreenTag {
@@ -402,6 +403,18 @@
         /// If the mouse is moved more than this value during a mouse down/up sequence, it will not 
         /// register as a click operation. Default is 5px.
 		static int ClickThreshold;
+        
+        /// These functions are used internally
+		void mouse_down(Geometry::Point location, Input::Mouse::Button button);
+
+        /// These functions are used internally
+        void mouse_up(Geometry::Point location, Input::Mouse::Button button);
+
+        /// These functions are used internally
+        void mouse_event(Input::Mouse::EventType event, Geometry::Point location, Input::Mouse::Button button, float amount);
+
+        /// These functions are used internally
+        void mouse_location();
 
 	protected:
 		Window(const WindowManager::Monitor &monitor, Geometry::Rectangle rect, const std::string &name, const std::string &title, bool allowresize, bool visible);
@@ -411,10 +424,6 @@
 		
 		virtual void added(Layer &layer) override;
 		
-		void mouse_down(Geometry::Point location, Input::Mouse::Button button);
-		void mouse_up(Geometry::Point location, Input::Mouse::Button button);
-		void mouse_event(Input::Mouse::EventType event, Geometry::Point location, Input::Mouse::Button button, float amount);
-        void mouse_location();
         
         void deleting(Layer *layer) { if(layer==down) down = MouseHandler{}; }
 
--- a/Source/Gorgon/WindowManager/X11.cpp	Sat Feb 15 10:22:44 2020 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2740 +0,0 @@
-#include "../WindowManager.h"
-#include <thread>
-#include "../Geometry/Margin.h"
-#include <limits.h>
-#include "../Window.h"
-#include "../Time.h"
-#include "../OS.h"
-#include "../Graphics.h"
-#include "../Utils/Assert.h"
-
-#include "../Graphics/Layer.h"
-
-#include "../Encoding/URI.h"
-#include "../Input/DnD.h"
-#include "../Containers/Vector.h"
-#include "../Encoding/PNG.h"
-#include "../Encoding/JPEG.h"
-#include "../IO/MemoryStream.h"
-#include "../Any.h"
-
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/extensions/Xrandr.h>
-#include <X11/XKBlib.h>
-#include <X11/extensions/Xinerama.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include <GL/glx.h>
-
-#include "X11Keysym.h"
-
-
-#undef None
-
-
-namespace Gorgon { 
-
-	namespace internal {
-	
-		struct windowdata {
-			::Window handle = 0;
-            bool min = false;
-			bool pointerdisplayed=true;
-			bool move=false;
-			Geometry::Point moveto;
-			bool ismapped=false;
-			GLXContext context=0;
-            bool focused = false;
-            Geometry::Point ppoint = {INT_MIN, INT_MIN};
-			
-			std::map<Input::Key, ConsumableEvent<Window, Input::Key, bool>::Token> handlers;
-            std::set<KeySym> pressed;
-            
-            struct xdnddata {
-                bool filelist = false;
-                bool utf8 = false;
-                bool string = false;
-                
-                bool requested = false;
-                int  drop = 0;
-                
-                bool localpointer = false;
-            } xdnd;
-		};
-		
-        static int None = 0;
-	}
-
-	namespace WindowManager {
-		
-		/// @cond INTERNAL
-		/// X11 display information
-		Display *display = nullptr;
-		
-		/// Depends on monitor, might be moved
-		Visual  *visual  = nullptr;
-
-		/// Blank cursor to remove WindowManager cursor
-		Cursor blank_cursor;
-		
-		/// XRandr extension to query physical monitors
-		bool xrandr = false;
-		
-		/// Xinerama extension to query physical monitors, this is for legacy systems
-		bool xinerama = false;
-		
-		///@{ X11 atoms for various data identifiers
-		Atom XA_CLIPBOARD;
-		Atom XA_TIMESTAMP;
-		Atom XA_TARGETS;
-		Atom XA_PROTOCOLS;
-		Atom WM_DELETE_WINDOW;
-		Atom XA_TEXT;
-		Atom XA_STRING;
-        Atom XA_UTF8_STRING;
-        Atom XA_TEXT_HTML;
-        Atom XA_URL;
-        Atom XA_PNG;
-        Atom XA_JPG;
-        Atom XA_BMP;
-		Atom XA_ATOM;
-		Atom XA_CARDINAL;
-		Atom XA_INCR;
-		Atom XA_NET_FRAME_EXTENTS;
-		Atom XA_NET_WORKAREA;
-		Atom XA_NET_REQUEST_FRAME_EXTENTS;
-        Atom XA_WM_NAME;
-        Atom XA_NET_WM_NAME;
-        Atom XA_NET_WM_STATE;
-        Atom XA_NET_WM_STATE_ADD = 1;
-        Atom XA_NET_WM_STATE_FULLSCREEN;
-        Atom XA_NET_WM_STATE_MAXIMIZED_HORZ;
-        Atom XA_NET_WM_STATE_MAXIMIZED_VERT;
-        Atom XA_NET_WM_STATE_HIDDEN;
-        Atom XA_NET_ACTIVE_WINDOW;
-        Atom XA_WM_CHANGE_STATE;
-        Atom XA_STRUT;
-        Atom XA_NET_WM_ICON;
-        Atom XA_PRIMARY;
-        Atom XA_CP_PROP;
-        Atom XdndAware;
-        Atom XdndSelection;
-        Atom XdndEnter;
-        Atom XdndFinished;
-        Atom XdndStatus;
-        Atom XdndPosition;
-        Atom XdndLeave;
-        Atom XdndDrop;
-        Atom XdndActionCopy;
-        Atom XdndActionMove;
-        Atom XdndTypeList;
-        Atom XA_Filelist;
-		///@}
-			
-		///@{ waits for specific events
-		static int waitfor_mapnotify(Display *d, XEvent *e, char *arg) {
-			return (e->type == MapNotify) && (e->xmap.window == (::Window)arg);
-		}
-		
-		static int waitfor_propertynotify(Display *d, XEvent *e, char *arg) {
-			return (e->type == PropertyNotify) && (e->xproperty.window == (::Window)arg);
-		}
-		
-		static int waitfor_cppropertynotify(Display *d, XEvent *e, char *arg) {
-			return (e->type == PropertyNotify) && (e->xproperty.atom == XA_CP_PROP) && (e->xproperty.window == (::Window)arg);
-		}
-		
-		static int waitfor_selectionnotify(Display *d, XEvent *e, char *arg) {
-			return (e->type == SelectionNotify);
-		}
-		namespace internal {
-			Gorgon::internal::windowdata *getdata(const Window &w) {
-				return w.data;
-			}
-			
-			struct monitordata {
-				int index = -1;
-				RROutput out = 0;
-				
-				~monitordata() {
-				}
-			};
-            
-            struct icondata {
-                ~icondata() {
-                    delete[] data;
-                }
-                
-                long w = 0, h = 0;
-                Byte *data = nullptr;
-            };
-			
-			intptr_t context;
-
-			void switchcontext(Gorgon::internal::windowdata &data) {
-				glXMakeCurrent(WindowManager::display, data.handle, data.context);
-				context=reinterpret_cast<intptr_t>(&data);
-			}
-
-			void finalizerender(Gorgon::internal::windowdata &data) {
-				glFinish();
-				glFlush();
-				glXSwapBuffers(WindowManager::display, data.handle);
-				XFlush(WindowManager::display);
-			}
-			
-			void XdndInit(::Gorgon::internal::windowdata *w) {
-				Atom version = 5;
-				
-				XChangeProperty(display, w->handle, XdndAware, XA_ATOM, 32, PropModeReplace, (unsigned char *)&version, 1);
-			}
-		}
-		///@}
-		
-		template<class T_>
-		T_ GetX4Prop(Atom atom, ::Window w, const T_ &def) {
-			Atom actual_type;
-			int actual_format;
-			unsigned long item_count;
-			unsigned long bytes_left;
-			
-			Byte *data;
-
-			int status = XGetWindowProperty(
-				display,
-				w,
-				atom,
-				0, 4, 0, AnyPropertyType,
-				&actual_type, &actual_format,
-				&item_count, &bytes_left,
-				&data
-			);
-			
-			if(status!=Success) return def;
-			
-			if(item_count<4 || actual_format!=32) return def;
-			
-			long *cardinals=reinterpret_cast<long*>(data);
-			
-			T_ ret={
-				(int)cardinals[0],
-				(int)cardinals[1],
-				(int)cardinals[2],
-				(int)cardinals[3]
-			};
-			
-			XFree(data);
-			
-			return ret;
-		}
-		/// @endcond
-		
-		void init() {
-			//get display
-			display = XOpenDisplay(NULL);
-			visual = XDefaultVisualOfScreen(DefaultScreenOfDisplay(display));
-			
-			//query atoms
-            XA_PRIMARY  =XInternAtom(display, "PRIMARY", False);
-			XA_CLIPBOARD=XInternAtom(display, "CLIPBOARD", 1);
-			XA_TIMESTAMP=XInternAtom(display, "TIMESTAMP", 1);
-			XA_TARGETS  =XInternAtom (display, "TARGETS", 0);
-			XA_PROTOCOLS=XInternAtom(display, "WM_PROTOCOLS", 0);
-			XA_STRING   =XInternAtom(display, "STRING", 0);
-			XA_TEXT   =XInternAtom(display, "TEXT", 0);
-			XA_UTF8_STRING   =XInternAtom(display, "UTF8_STRING", 0);
-			XA_CARDINAL =XInternAtom(display, "CARDINAL", 0);
-			XA_ATOM     =XInternAtom(display, "ATOM", 0);
-			WM_DELETE_WINDOW = XInternAtom(display, "WM_DELETE_WINDOW", 0);
-			XA_NET_FRAME_EXTENTS = XInternAtom(display, "_NET_FRAME_EXTENTS", 0);
-			XA_NET_WORKAREA = XInternAtom(display, "_NET_WORKAREA", 0);
-			XA_NET_REQUEST_FRAME_EXTENTS = XInternAtom(display, "_NET_REQUEST_FRAME_EXTENTS", 0);
-            XA_NET_WM_STATE_MAXIMIZED_HORZ  =  XInternAtom(display, "_NET_WM_STATE_MAXIMIZED_HORZ", False);
-            XA_NET_WM_STATE_MAXIMIZED_VERT  =  XInternAtom(display, "_NET_WM_STATE_MAXIMIZED_VERT", False);
-            XA_NET_WM_STATE_HIDDEN  = XInternAtom(display, "_NET_WM_STATE_HIDDEN", False);
-            XA_NET_ACTIVE_WINDOW = XInternAtom(display, "_NET_ACTIVE_WINDOW", False);
-            
-            XA_TEXT_HTML = XInternAtom(display, "text/html", False);
-            XA_URL = XInternAtom(display, "text/x-moz-url", False);
-            XA_PNG = XInternAtom(display, "image/png", False);
-            XA_JPG = XInternAtom(display, "image/jpeg", False);
-            XA_BMP = XInternAtom(display, "image/bmp", False);
-            XA_CP_PROP = XInternAtom(display, "GORGON_CP_PROP", False);
-            XA_INCR= XInternAtom(display, "INCR", False);
-            
-            XA_WM_NAME  = XInternAtom(display, "WM_NAME", False);
-            XA_NET_WM_NAME  = XInternAtom(display, "_NET_WM_NAME", False);
-            XA_NET_WM_STATE = XInternAtom(display, "_NET_WM_STATE", False);
-            XA_NET_WM_STATE_FULLSCREEN = XInternAtom(display, "_NET_WM_STATE_FULLSCREEN", False);
-            XA_STRUT = XInternAtom(display, "_NET_WM_STRUT_PARTIAL", False);
-            XA_WM_CHANGE_STATE = XInternAtom(display, "WM_CHANGE_STATE", False);
-            XA_NET_WM_ICON = XInternAtom(display, "_NET_WM_ICON", False);
-            
-            XdndAware         = XInternAtom(display, "XdndAware",         False);
-            XdndSelection     = XInternAtom(display, "XdndSelection",     False);
-            XdndStatus        = XInternAtom(display, "XdndStatus",     	  False);
-            XdndTypeList      = XInternAtom(display, "XdndTypeList",      False);
-            XdndEnter         = XInternAtom(display, "XdndEnter",         False);
-            XdndFinished      = XInternAtom(display, "XdndFinished",      False);
-            XdndPosition      = XInternAtom(display, "XdndPosition",      False);
-            XdndLeave         = XInternAtom(display, "XdndLeave",         False);
-            XdndDrop          = XInternAtom(display, "XdndDrop",          False);
-            XdndActionCopy    = XInternAtom(display, "XdndActionCopy",    False);
-            XdndActionMove    = XInternAtom(display, "XdndActionMove",    False);
-            XA_Filelist       = XInternAtom(display, "text/uri-list",	  False);
-
-			char data[1]={0};
-			XColor dummy;
-			Pixmap blank = XCreateBitmapFromData (display, DefaultRootWindow(display), data, 1, 1);
-			blank_cursor = XCreatePixmapCursor(display, blank, blank, &dummy, &dummy, 0, 0);
-			XFreePixmap (display, blank);
-			
-			//detect extensions
-			int eventbase, errorbase;
-			xrandr=(bool)XRRQueryExtension(display, &eventbase, &errorbase);
-			
-			xinerama=(bool)XineramaQueryExtension(display, &eventbase, &errorbase);
-			xinerama=xinerama && (bool)XineramaIsActive(display);
-			
-			Monitor::Refresh(true);
-            
-            setenv("__GL_YIELD", "USLEEP", 1);
-		}
-
-        std::string GetAtomName(Atom atom) {
-            if(!atom)
-                return "[None]";
-            else 
-                return XGetAtomName(WindowManager::display, atom);
-        }
-		//BEGIN Clipboard related
-        
-        ///@cond internal        
-        template<class T_>
-        std::shared_ptr<CopyFreeAny> make_clipboarddata(T_ data) {
-            return std::shared_ptr<CopyFreeAny>{new CopyFreeAny_impl<T_>(std::move(data))};            
-        }
-       
-        struct clipboardentry {
-            Atom type;
-            std::shared_ptr<CopyFreeAny> data;
-            
-            bool operator ==(const clipboardentry &other) const {
-                return type == other.type;
-            }
-        };
-        
-        std::vector<clipboardentry> clipboard_entries;
-        
-        ::Window getanywindow() {
-            ::Window windowhandle=0;
-			for(auto &w : Window::Windows) {
-				auto data=internal::getdata(w);
-				if(data && data->handle) {
-					windowhandle=data->handle;
-					break;
-				}
-			}
-			
-			//if 0 try creating an unmapped window
-			if(windowhandle==0) {
-#ifdef NDEBUG
-				return windowhandle;
-#else
-				throw std::runtime_error("Cannot copy without a window, if necessary create a hidden window");
-#endif
-			}
-			
-			return windowhandle;
-        }
-		
-        std::vector<Atom> getclipboardformats() {
-            std::vector<Atom> ret;
-            
-            
-			::Window owner=XGetSelectionOwner(display, XA_CLIPBOARD);
-			if(!owner)
-				return ret;
-			
-			auto windowhandle = getanywindow();
-            
-			if(windowhandle==0) {
-				return ret;
-			}
-			
-			//check if we own the clipboard
-			for(auto &w : Window::Windows) {
-				auto data=internal::getdata(w);
-				if(data && data->handle == owner) {
-					//we are the owner!
-                    
-                    //get the list from our own buffer and be done with it
-                    for(auto &d : clipboard_entries) {
-                        ret.push_back(d.type);
-                    }
-                    
-                    return ret;
-				}
-			}
-			
-			XEvent event;
-            
-            XConvertSelection (display, XA_CLIPBOARD, XA_TARGETS, XA_CP_PROP, windowhandle, CurrentTime);
-            XFlush(display);
-            
-            XIfEvent(display, &event, waitfor_selectionnotify, (char*)windowhandle);
-            
-            if(event.xselection.property == XA_CP_PROP) {
-                //process targets
-				Atom type;
-				unsigned long len, bytes, dummy;
-				unsigned char *data;
-				int format;
-
-				XGetWindowProperty(display, windowhandle, XA_CP_PROP, 0, 0, 0, XA_ATOM, &type, &format, &len, &bytes, &data);
-				
-				if(bytes) {
-					XGetWindowProperty (display, windowhandle, 
-							XA_CP_PROP, 0,bytes,0,
-							XA_ATOM, &type, &format,
-							&len, &dummy, &data);
-					
-                    Atom *atoms = (Atom*)data;
-                    
-                    for(int i=0;i<bytes/4;i++) {
-                        ret.push_back(atoms[i]);
-                    }
-                    
-					XFree(data);
-                    XDeleteProperty(display, windowhandle, XA_CP_PROP);
-				}
-            }
-            
-            return ret;
-        }
-        ///@endcond
-		
-		std::vector<Resource::GID::Type> GetClipboardFormats() {
-            std::vector<Resource::GID::Type> ret;
-            
-			auto list = getclipboardformats();
-                    
-            for(auto atom : list) {
-                if(atom == XA_TEXT || atom == XA_STRING || atom == XA_UTF8_STRING)
-                    Containers::PushBackUnique(ret, Resource::GID::Text);
-                else if(atom == XA_TEXT_HTML)
-                    Containers::PushBackUnique(ret, Resource::GID::HTML);
-                else if(atom == XA_URL)
-                    Containers::PushBackUnique(ret, Resource::GID::URL);
-                else if(atom == XA_PNG || atom == XA_JPG || atom == XA_BMP)
-                    Containers::PushBackUnique(ret, Resource::GID::Image_Data);
-                else if(atom == XA_Filelist) {
-                    Containers::PushBackUnique(ret, Resource::GID::FileList);
-                    Containers::PushBackUnique(ret, Resource::GID::URIList);
-                }
-                else
-                    ;//std::cout<<GetAtomName(atom)<<std::endl;
-            }
-            //std::cout<<std::endl;
-            
-            return ret;
-        }
-		
-		std::string GetClipboardText(Resource::GID::Type requesttype) {
-			::Window owner=XGetSelectionOwner(display, XA_CLIPBOARD);
-			if(!owner)
-				return "";
-			
-			::Window windowhandle = getanywindow();
-			if(windowhandle==0) {
-				return "";
-			}
-			
-			Atom request = 0;
-            
-            //fallback for text, rest is not that important, modern implementations support TARGETS
-            if(requesttype == Resource::GID::Text)
-                request = XA_TEXT;
-			
-			XEvent event;
-            
-            auto list = getclipboardformats();
-            for(auto atom : list) {
-                if(requesttype == Resource::GID::Text && atom == XA_UTF8_STRING)  {
-                    request = XA_UTF8_STRING;
-                    break; //perfect match no need to continue
-                }
-                else if(requesttype == Resource::GID::Text && atom == XA_STRING) {
-                    request = XA_STRING;
-                    //utf8 is better, search for it
-                }
-                else if(requesttype == Resource::GID::Text && atom == XA_TEXT && request != XA_STRING) {
-                    request = XA_TEXT;
-                    //utf8 is better, search for it
-                }
-                else if(requesttype == Resource::GID::HTML && atom == XA_TEXT_HTML) {
-                    request = XA_TEXT_HTML;
-                    break; //perfect match no need to continue
-                }
-                else if(requesttype == Resource::GID::URL && atom == XA_URL) {
-                    request = XA_URL;
-                    break; //perfect match no need to continue
-                }
-            }
-            
-            if(request == 0) return "";
-            
-            
-			//check if we own the clipboard
-			for(auto &w : Window::Windows) {
-				auto data=internal::getdata(w);
-				if(data && data->handle == owner) {
-					//we are the owner!
-                    
-                    //get the data from our own buffer and be done with it
-                    for(auto &d : clipboard_entries) {
-                        if(d.type == request) {
-                            if( d.type == WindowManager::XA_STRING || 
-                                d.type == WindowManager::XA_TEXT || 
-                                d.type == WindowManager::XA_UTF8_STRING || 
-                                d.type == WindowManager::XA_TEXT_HTML || 
-                                d.type == WindowManager::XA_URL)
-                            {
-                                return d.data->GetData<std::string>();
-                            }
-                            else {
-                                return "";
-                            }
-                        }
-                    }
-                    
-                    return "";
-				}
-			}
-			
-			XConvertSelection (display, XA_CLIPBOARD, request, XA_CP_PROP, windowhandle, CurrentTime);
-			XFlush(display);
-			
-			XIfEvent(display, &event, waitfor_selectionnotify, (char*)windowhandle);
-			if (event.xselection.property == XA_CP_PROP) {
-				Atom type;
-				unsigned long len, bytes, dummy;
-				unsigned char *data;
-				int format;
-
-				XGetWindowProperty(display, windowhandle, XA_CP_PROP, 0, 0, 0, AnyPropertyType, &type, &format, &len, &bytes, &data);
-				
-				if(bytes) {
-					XGetWindowProperty (display, windowhandle, 
-							XA_CP_PROP, 0,bytes,0,
-							AnyPropertyType, &type, &format,
-							&len, &dummy, &data);
-					
-					std::string tmp((char*)data, bytes);
-					XFree(data);
-                    XDeleteProperty(display, windowhandle, XA_CP_PROP);
-
-					return tmp;
-				}
-			}
-			
-			return "";
-		}
-
-		void SetClipboardText(const std::string &text, Resource::GID::Type type, bool unicode, bool append) {
-			::Window windowhandle=getanywindow();
-            
-            if(!windowhandle) return;
-			
-			if(!append)
-                clipboard_entries.clear();
-
-			if(type == Resource::GID::Text) {
-                auto d = make_clipboarddata(text);
-                Containers::PushBackOrUpdate(clipboard_entries, clipboardentry{XA_TEXT, d});
-                Containers::PushBackOrUpdate(clipboard_entries, clipboardentry{XA_STRING, d});
-                
-                if(unicode) {
-                    Containers::PushBackOrUpdate(clipboard_entries, clipboardentry{XA_UTF8_STRING, d});
-                }
-            }
-            else if(type == Resource::GID::HTML) {
-                auto d = make_clipboarddata(text);
-                Containers::PushBackOrUpdate(clipboard_entries, clipboardentry{XA_TEXT_HTML, d});
-            }
-            else if(type == Resource::GID::URL) {
-                auto d = make_clipboarddata(text);
-                Containers::PushBackOrUpdate(clipboard_entries, clipboardentry{XA_URL, d});
-            }
-            else {
-                return;
-            }
-			
-			XSetSelectionOwner(display, XA_CLIPBOARD, windowhandle, CurrentTime);
-			XFlush(display);
-		}
-		
-		std::vector<std::string> GetClipboardList(Resource::GID::Type requesttype) {
-            std::vector<std::string> ret;
-            
-			::Window owner=XGetSelectionOwner(display, XA_CLIPBOARD);
-			if(!owner)
-				return ret;
-			
-			::Window windowhandle = getanywindow();
-			if(windowhandle==0) {
-				return ret;
-			}
-			
-			Atom request = 0;
-			
-			XEvent event;
-            
-            auto list = getclipboardformats();
-            for(auto atom : list) {
-                if((requesttype == Resource::GID::FileList || requesttype == Resource::GID::URIList) && atom == XA_Filelist)  {
-                    request = XA_Filelist;
-                    break; //perfect match no need to continue
-                }
-            }
-            
-            if(request == 0) return ret;
-            
-            unsigned long len = 0, bytes = 0, dummy;
-            unsigned char *data = nullptr;
-            
-			//check if we own the clipboard
-			for(auto &w : Window::Windows) {
-				auto wdata=internal::getdata(w);
-				if(wdata && wdata->handle == owner) {
-					//we are the owner!
-                    
-                    //get the data from our own buffer and be done with it
-                    for(auto &d : clipboard_entries) {
-                        if(d.type == request) {
-                            if( d.type == WindowManager::XA_Filelist ) {
-                                auto &str = d.data->GetData<std::string>();
-                                data = (unsigned char*)&str[0];
-                                len = str.length();
-                            }
-                        }
-                    }
-                    
-                    if(!data) return ret;
-				}
-			}
-			
-			
-			if(!data) {
-                XConvertSelection (display, XA_CLIPBOARD, request, XA_CP_PROP, windowhandle, CurrentTime);
-                XFlush(display);
-                
-                XIfEvent(display, &event, waitfor_selectionnotify, (char*)windowhandle);
-            }
-            
-			if (data || event.xselection.property == XA_CP_PROP) {
-				Atom type;
-				int format;
-
-                if(!data)
-                    XGetWindowProperty(display, windowhandle, XA_CP_PROP, 0, 0, 0, AnyPropertyType, &type, &format, &len, &bytes, &data);
-				
-				if(bytes) {
-					XGetWindowProperty (display, windowhandle, 
-							XA_CP_PROP, 0,bytes,0,
-							AnyPropertyType, &type, &format,
-							&len, &dummy, &data);
-
-                }
-                if(data) {
-                    int p=0;
-                    for(int i=0;i<(int)len+1;i++) {
-                        if(i==(int)len || (char)data[i]=='\n') {
-                            if(i-p>1) {
-                                std::string s((char*)(data+p), (int)(i-p));
-                                if(requesttype == Resource::GID::FileList) {
-                                    if(s.length()>6 && s.substr(0, 7)=="file://") 
-                                        s=s.substr(7);
-                                    else
-                                        continue;
-                                    
-                                    if(s[s.length()-1]=='\r')
-                                        s.resize(s.length()-1);
-                                }
-                                else if(requesttype == Resource::GID::URIList) {
-                                    if(s[s.length()-1]=='\r')
-                                        s.resize(s.length()-1);
-                                }
-                                
-                                ret.push_back(Encoding::URIDecode(s));
-                                p=i+1;
-                            }
-                        }
-                    }
-                    
-                    if(bytes) {
-                        XFree(data);
-                        XDeleteProperty(display, windowhandle, XA_CP_PROP);
-                    }
-
-					return ret;
-				}
-			}
-			
-			return ret;
-		}
-	
-        void SetClipboardList(std::vector<std::string> list, Resource::GID::Type type, bool append) {
-			::Window windowhandle=getanywindow();
-            
-            if(!windowhandle) return;
-			
-			if(!append)
-                clipboard_entries.clear();
-
-            if(type == Resource::GID::FileList) {
-                std::string txt;
-                
-                for(auto &e : list) {
-                    if(!txt.empty())
-                        txt += "\n";
-                    
-                    txt = txt + "file://" + e;
-                }
-                
-                auto d = make_clipboarddata(std::move(txt));
-                Containers::PushBackOrUpdate(clipboard_entries, clipboardentry{XA_Filelist, d});
-                Containers::PushBackOrUpdate(clipboard_entries, clipboardentry{XA_UTF8_STRING, d});
-                Containers::PushBackOrUpdate(clipboard_entries, clipboardentry{XA_STRING, d});
-                Containers::PushBackOrUpdate(clipboard_entries, clipboardentry{XA_TEXT, d});
-                
-                XSetSelectionOwner(display, XA_CLIPBOARD, windowhandle, CurrentTime);
-                XFlush(display);
-            }
-            else if(type == Resource::GID::URIList) {
-                std::string txt;
-                
-                for(auto &e : list) {
-                    if(!txt.empty())
-                        txt += "\n";
-                    
-                    txt = txt + e;
-                }
-                
-                auto d = make_clipboarddata(std::move(txt));
-                Containers::PushBackOrUpdate(clipboard_entries, clipboardentry{XA_Filelist, d});
-                Containers::PushBackOrUpdate(clipboard_entries, clipboardentry{XA_UTF8_STRING, d});
-                Containers::PushBackOrUpdate(clipboard_entries, clipboardentry{XA_STRING, d});
-                Containers::PushBackOrUpdate(clipboard_entries, clipboardentry{XA_TEXT, d});
-                
-                XSetSelectionOwner(display, XA_CLIPBOARD, windowhandle, CurrentTime);
-                XFlush(display);
-            }
-        }
-        
-        Containers::Image GetClipboardBitmap() {
-            Containers::Image ret;
-            
-			::Window owner=XGetSelectionOwner(display, XA_CLIPBOARD);
-			if(!owner)
-				return ret;
-			
-			::Window windowhandle = getanywindow();
-			if(windowhandle==0) {
-				return ret;
-			}
-            
-			//check if we own the clipboard
-			for(auto &w : Window::Windows) {
-				auto wdata=internal::getdata(w);
-				if(wdata && wdata->handle == owner) {
-					//we are the owner!
-                    
-                    //get the data from our own buffer and be done with it
-                    for(auto &d : clipboard_entries) {
-                        if(d.type == XA_PNG || d.type == XA_BMP || d.type == XA_JPG) {
-                            auto &data = d.data->GetData<Containers::Image>();
-                            return data.Duplicate();
-                        }
-                    }
-                    
-                    return ret;
-				}
-			}
-			
-			Atom request = 0;
-			
-			XEvent event;
-			
-            auto list = getclipboardformats();
-            for(auto atom : list) {
-                if(atom == XA_PNG)  { //best tı go for png, as most systems do not add alpha on other types
-                    request = XA_PNG;
-                    break; //perfect match no need to continue
-                }
-                else if(atom == XA_BMP) {
-                    request = XA_BMP;
-                }
-                else if(request == 0 && atom == XA_JPG) {
-                    request = XA_JPG;
-                    //this is the worst case
-                }
-            }
-						
-			XConvertSelection (display, XA_CLIPBOARD, request, XA_CP_PROP, windowhandle, CurrentTime);
-			XFlush(display);
-			
-			XIfEvent(display, &event, waitfor_selectionnotify, (char*)windowhandle);
-			if (event.xselection.property == XA_CP_PROP) {
-				Atom type;
-				unsigned long len, bytes, dummy;
-				unsigned char *data;
-				int format;
-
-				XGetWindowProperty(display, windowhandle, XA_CP_PROP, 0, (unsigned long)-1, 1, AnyPropertyType, &type, &format, &bytes, &dummy, &data);
-                bytes *= format/8;
-                
-                if(type == XA_INCR) {
-                    std::vector<Byte> imgdata;
-                    //std::cout<<"Starting INCR"<<std::endl;
-                    unsigned long initsize = *(int32_t*)data;
-                    
-                    while(true) {                        
-                        while(XCheckIfEvent(display, &event, waitfor_cppropertynotify, (char*)windowhandle) == False) {
-                            XFlush(display);
-                            std::this_thread::yield();
-                        }
-                        
-                        XFlush(display);
-                        XGetWindowProperty(display, windowhandle, XA_CP_PROP, 0, (unsigned long)-1, 1, AnyPropertyType, &type, &format, &bytes, &dummy, &data);
-                        
-                        if(!bytes) {
-                            if(imgdata.size()<initsize)
-                                continue;
-                            else
-                                break;
-                        }
-                        
-                        if(type == 0)
-                            continue;
-                        
-                        bytes *= format/8;
-                        
-                        auto cur = imgdata.size();
-                        imgdata.resize(imgdata.size()+bytes);
-                        
-                        memcpy(&imgdata[cur], data, bytes);
-                        XFree(data);
-                    }
-                    //std::cout<<"INCR done: "<<imgdata.size()<<std::endl;
-                   
-					if(request == XA_PNG) {
-                        Encoding::Png.Decode(imgdata, ret);
-                    }
-                    else if(request == XA_BMP) {
-                        IO::MemoryInputStream stream((char *)&imgdata[0], (char *)&imgdata[0]+imgdata.size());
-                        ret.ImportBMP(stream);
-                    }
-                    else if(request == XA_JPG) {
-                        Encoding::Jpg.Decode(imgdata, ret);
-                    }
-                    //std::cout<<"Decode done"<<std::endl;
-                }
-				else if(bytes) {					
-					if(request == XA_PNG) {
-                        Encoding::Png.Decode(data, bytes, ret);
-                    }
-                    else if(request == XA_BMP) {
-                        IO::MemoryInputStream stream((char *)data, (char *)data+bytes);
-                        ret.ImportBMP(stream);
-                    }
-                    else if(request == XA_JPG) {
-                        Encoding::Jpg.Decode(data, bytes, ret);
-                    }
-                    
-					XFree(data);
-				}
-			}
-			
-            return ret;
-        }
-        
-        void SetClipboardBitmap(Containers::Image img, bool append) {
-			::Window windowhandle=getanywindow();
-            
-            if(!windowhandle) return;
-			
-			if(!append)
-                clipboard_entries.clear();
-
-            Graphics::ColorMode mode = img.GetMode();
-            
-            auto d = make_clipboarddata(std::move(img));
-            //believe or not BMPv5 is a better fit, allows alpha only images
-            Containers::PushBackOrUpdate(clipboard_entries, clipboardentry{XA_BMP, d}); 
-            Containers::PushBackOrUpdate(clipboard_entries, clipboardentry{XA_PNG, d});
-            if(!Graphics::HasAlpha(mode))
-                Containers::PushBackOrUpdate(clipboard_entries, clipboardentry{XA_JPG, d});
-            
-            XSetSelectionOwner(display, XA_CLIPBOARD, windowhandle, CurrentTime);
-            XFlush(display);
-        }
-        //END
-
-		std::string osgetkeyname(Input::Keyboard::Key key) {
-            int keycount;
-            
-            KeySym *keys = XGetKeyboardMapping(display,
-                key,
-                1,
-                &keycount
-            );
-            
-            if(keycount < 1) return "";
-            
-            KeySym keysym;
-            
-            if(keycount > 1) keysym = keys[1]; //capital key
-            else keysym = keys[0];
-            
-            
-            XFree(keys);
-            
-            std::string ret;
-            Char c = keysym2ucs(keysym);
-            String::AppendUnicode(ret, c);
-            
-			return ret;
-		}
-
-		//BEGIN Monitor Related
-		
-		Monitor::Monitor() {
-			data = new internal::monitordata;
-		}
-		
-		Monitor::~Monitor() {
-			delete data;
-		}
-		
-		void addpadding(const Monitor *monitor, int l, int t, int r, int b) {
-            Monitor *mon = nullptr;
-            
-            for(auto &mon2 : Monitor::monitors) {
-                if(&mon2 == monitor)
-                    mon = &mon2;
-            }
-            
-            if(mon) {
-                mon->usable.Left  += l;
-                mon->usable.Top   += t;
-                mon->usable.Right -= r;
-                mon->usable.Bottom-= b;
-            }
-        }
-
-        static void fixmonitorworkarea(int parent = 0, int x = 0, int y = 0) {
-            ::Window* children, w;
-            
-            unsigned int child_count;
-            
-            if(parent == 0)
-                parent=XDefaultRootWindow(display);
-
-            XQueryTree(display, parent, &w, &w, &children, &child_count);
-            
-            for(int i=0; i<child_count; i++) {
-                Atom actual_type;
-                int actual_format;
-                unsigned long item_count;
-                unsigned long bytes_left;
-                Byte *data;
-                
-                XWindowAttributes xwa;
-                XGetWindowAttributes(display, children[i], &xwa);
-                
-                int status = XGetWindowProperty(
-                    display, children[i], XA_STRUT, 
-                    0, 12 * 4, 0,
-                    XA_CARDINAL, &actual_type, &actual_format,
-                    &item_count, &bytes_left, &data
-                );
-                
-                if(status == Success && item_count) {
-                    long *cardinals=reinterpret_cast<long*>(data);
-                    
-                    auto monitor = Monitor::FromLocation({int(x+xwa.x), int(y+xwa.y)});
-                    
-                    if(monitor) {
-                        addpadding(monitor, cardinals[0], cardinals[2], cardinals[1], cardinals[3]);
-                    }
-                    
-                    XFree(data);
-                }
-                
-                fixmonitorworkarea(children[i], x+xwa.x, y+xwa.y);
-            }
-        }
-		
-		void Monitor::Refresh(bool force) {
-			//check if change is needed or forced
-			
-			monitors.Destroy();
-			Monitor::primary=nullptr;
-			
-			if(xrandr) {
-				auto root=XDefaultRootWindow(display);
-				XRRScreenResources* sr = XRRGetScreenResources(display, root);
-				RROutput primary = XRRGetOutputPrimary(display, root);
-				
-				if(!sr) {
-					goto failsafe;
-				}
-				
-				XRRCrtcInfo*   ci = nullptr;
-				XRROutputInfo* oi = nullptr;
-				int ind = 0;
-				try {
-					for(int i=0; i<sr->ncrtc; i++) {
-						ci = XRRGetCrtcInfo(display, sr, sr->crtcs[i]);
-						
-						for(int j=0; j<ci->noutput; j++) {
-							oi = XRRGetOutputInfo(display, sr, ci->outputs[j]);
-							
-							if(oi->connection==0) {
-								auto monitor=new Monitor();
-								monitor->data->index=ind++;
-								monitor->data->out=ci->outputs[j];
-								monitor->area={(int)ci->x, (int)ci->y, (int)ci->width, (int)ci->height};
-                                monitor->usable = monitor->area;
-								monitor->isprimary=(ci->outputs[j]==primary);
-								if(monitor->IsPrimary()) Monitor::primary=monitor;
-								monitor->name=oi->name;
-								if(monitor->IsPrimary())
-									monitors.Insert(monitor, 0);
-								else
-									monitors.Add(monitor);
-							}
-							
-							XRRFreeOutputInfo(oi);
-							oi=nullptr;
-						}
-						
-						XRRFreeCrtcInfo(ci);
-						ci=nullptr;
-					}
-				}
-				catch(...) {
-					XRRFreeScreenResources(sr);
-					if(ci) {
-						XRRFreeCrtcInfo(ci);
-					}
-					if(oi) {
-						XRRFreeOutputInfo(oi);
-					}
-					throw;
-				}
-				
-				XRRFreeScreenResources(sr);
-				
-				if(monitors.GetCount()) {
-					if(Monitor::primary==nullptr) {
-						Monitor::primary=monitors.First().CurrentPtr();
-					}
-					
-					fixmonitorworkarea();
-					return;
-				}
-			}
-			
-failsafe: //this should use X11 screen as monitor
-			Geometry::Rectangle rect;
-			rect.X=0;
-			rect.Y=0;
-			
-			Screen  *screen  = XScreenOfDisplay(display, 0);
-			rect.Width       = XWidthOfScreen(screen);
-			rect.Height      = XHeightOfScreen(screen);
-			
-            auto &monitor = *new Monitor();
-            monitors.Add(monitor);
-            
-            monitor.name = "Default";
-            monitor.data->index = -1;
-            monitor.data->out   = -1;
-            monitor.area = rect;
-            monitor.usable = rect;
-            
-            Monitor::primary = &monitor;
-            fixmonitorworkarea();
-		}
-		
-		bool Monitor::IsChangeEventSupported() {
-			return false;//xrandr;
-		}
-		
-		//END
-		
-		    
-        Geometry::Point GetMousePosition(Gorgon::internal::windowdata *wind) {
-            Geometry::Point ret;
-            
-            int rx,ry;
-            ::Window root, child;
-            unsigned mask;
-            
-            if(XQueryPointer(display, wind->handle, &root, &child, &rx, &ry, &ret.X, &ret.Y, &mask) == False) {
-                ret.X = -1;
-                ret.Y = -1;
-            }
-
-            return ret;
-        }
-
-	
-        Icon::Icon() {
-            data = new internal::icondata;
-        }
-        
-        Icon::Icon(const Containers::Image &image) {
-            data = new internal::icondata;
-            FromImage(image);
-        }
-        
-        Icon::Icon(Icon &&icon) {
-            data = new internal::icondata;
-            std::swap(data, icon.data);
-        }
-        
-        Icon &Icon::operator =(Icon &&icon) {
-            Destroy();
-            
-            std::swap(data, icon.data);
-            return *this;
-        }
-        
-        void Icon::FromImage(const Containers::Image &image) {
-			unsigned long*img=new unsigned long[2+image.GetWidth()*image.GetHeight()];
-			
-			img[0]=image.GetWidth();
-			img[1]=image.GetHeight();
-			
-			image.CopyToBGRABufferLong(img+2);
-			
-			data->w = image.GetWidth();
-            data->h = image.GetHeight();
-            
-            data->data = (Byte*)img;
-        }
-        
-        void Icon::Destroy() {
-            if(data->data) {
-                delete data->data;
-                data->w = 0;
-                data->h = 0;
-            }
-        }
-        
-        Icon::~Icon() {
-            Destroy();
-            
-            delete data;
-        }
-	
-		Event<> Monitor::ChangedEvent;
-		Containers::Collection<Monitor> Monitor::monitors;
-		Monitor *Monitor::primary=nullptr;
-	}
-	
-	Window::Window(const WindowManager::Monitor &monitor, Geometry::Rectangle rect, const std::string &name, const std::string &title, bool allowresize, bool visible) : 
-	data(new internal::windowdata) {
-		
-		this->name = name;
-        this->allowresize = allowresize;
-        pointerlayer = new Graphics::Layer;
-        Add(pointerlayer);
-
-#ifndef NDEBUG
-		ASSERT(WindowManager::display, "Window manager system is not initialized.");
-#endif
-		
-		windows.Add(this);
-		
-		//using defaults
-		int screen = DefaultScreen(WindowManager::display);
-		int depth  = DefaultDepth(WindowManager::display,screen);
-		
-		//adjust atrributes
-		XSetWindowAttributes attributes;
-		
-		attributes.event_mask = 
-					StructureNotifyMask |    //move resize
-					KeyPressMask |           //keyboard
-					KeyReleaseMask |
-					ButtonPressMask |        //mouse
-					ButtonReleaseMask|    
-					FocusChangeMask|         //activate/deactivate
-					EnterWindowMask |
-					LeaveWindowMask |
-					PropertyChangeMask |
-					OwnerGrabButtonMask |
-					
-					SubstructureRedirectMask //??
-		;
-		
-		bool autoplaced=false;
-		if(rect.TopLeft()==automaticplacement) {
-			rect.Move( (monitor.GetUsable()-rect.GetSize()).Center() );
-			autoplaced=true;
-		}
-		
-		auto rootwin=XRootWindow(WindowManager::display,screen);
-		
-		data->handle = XCreateWindow(WindowManager::display, 
-			rootwin,
-			rect.X,rect.Y, rect.Width,rect.Height,
-			0, depth, InputOutput, 
-			WindowManager::visual, CWEventMask, &attributes
-		);
-		
-		XClassHint *classhint=XAllocClassHint();
-		classhint->res_name=(char*)malloc(name.length()+1);
-		strcpy(classhint->res_name, name.c_str());
-		classhint->res_class=(char*)malloc(name.length()+1);
-		strcpy(classhint->res_class, name.c_str());
-		XSetClassHint(WindowManager::display, data->handle, classhint);
-		XFree(classhint);
-	
-		XStoreName(WindowManager::display, data->handle, (char*)title.c_str());
-        
-        if(!allowresize) {
-            XSizeHints *sizehints=XAllocSizeHints();
-            sizehints->min_width=rect.Width;
-            sizehints->max_width=rect.Width;
-            sizehints->min_height=rect.Height;
-            sizehints->max_height=rect.Height;
-            sizehints->flags=PMinSize | PMaxSize | PWinGravity;
-            if(autoplaced)
-                sizehints->win_gravity = CenterGravity;
-            
-            XSetWMNormalHints(WindowManager::display, data->handle, sizehints);		
-            XFree(sizehints);
-        }
-		
-		XSetWMProtocols(WindowManager::display, data->handle, &WindowManager::WM_DELETE_WINDOW, 1);
-		
-		if(visible) {
-			XEvent event;
-			
-			XFlush(WindowManager::display);
-			
-			XMapWindow(WindowManager::display,data->handle);
-			XIfEvent(WindowManager::display, &event, &WindowManager::waitfor_mapnotify, (char*)data->handle);
-            
-            XMoveWindow(WindowManager::display, data->handle, rect.X, rect.Y);
-	
-            if(autoplaced) {
-                XFlush(WindowManager::display);
-                
-                std::this_thread::sleep_for(std::chrono::milliseconds(10)); //wait for a short time to ensure window frame is ready.
-                
-                auto borders = WindowManager::GetX4Prop<Geometry::Margin>(WindowManager::XA_NET_FRAME_EXTENTS, data->handle, {0,0,0,0});
-                std::swap(borders.Top, borders.Right);
-                rect.Move( (monitor.GetUsable()-(rect.GetSize()+borders.Total())).Center() );
-            }
-            
-            XMoveWindow(WindowManager::display, data->handle, rect.X, rect.Y);
-            
-			XFlush(WindowManager::display);			
-		}
-		else {
-			data->move=true;
-			data->moveto=rect.TopLeft();
-		}
-		
-		data->ismapped=visible;
-		
-		Layer::Resize(rect.GetSize());
-        data->ppoint=rect.TopLeft();
-
-		createglcontext();
-		glsize = rect.GetSize();
-        
-        WindowManager::internal::XdndInit(data);
-	}
-	
-	Window::Window(const Gorgon::Window::FullscreenTag &, const WindowManager::Monitor &mon, const std::string &name, const std::string &title) : data(new internal::windowdata) {
-		
-		this->name = name;
-        pointerlayer = new Graphics::Layer;
-        Add(pointerlayer);
-
-#ifndef NDEBUG
-		ASSERT(WindowManager::display, "Window manager system is not initialized.");
-#endif
-		
-		windows.Add(this);
-		
-		//using defaults
-		int screen = DefaultScreen(WindowManager::display);
-		int depth  = DefaultDepth(WindowManager::display,screen);
-		
-		//adjust atrributes
-		XSetWindowAttributes attributes;
-		
-		attributes.event_mask = 
-					StructureNotifyMask |    //move resize
-					KeyPressMask |           //keyboard
-					KeyReleaseMask |
-					ButtonPressMask |        //mouse
-					ButtonReleaseMask|    
-					PropertyChangeMask |
-					FocusChangeMask|         //activate/deactivate
-					SubstructureRedirectMask //??
-		;
-		
-		bool autoplaced = false;
-		
-		auto rootwin=XRootWindow(WindowManager::display,screen);
-		
-		data->handle = XCreateWindow(WindowManager::display, 
-			rootwin,
-			mon.GetLocation().X,mon.GetLocation().Y,mon.GetSize().Width,mon.GetSize().Height,
-			0, depth, InputOutput, 
-			WindowManager::visual, CWEventMask, &attributes
-		);
-		
-		XClassHint *classhint=XAllocClassHint();
-		classhint->res_name=(char*)malloc(name.length()+1);
-		strcpy(classhint->res_name, name.c_str());
-		classhint->res_class=(char*)malloc(name.length()+1);
-		strcpy(classhint->res_class, name.c_str());
-		XSetClassHint(WindowManager::display, data->handle, classhint);
-		XFree(classhint);
-	
-		XStoreName(WindowManager::display, data->handle, (char*)title.c_str());
-		
-		XSetWMProtocols(WindowManager::display, data->handle, &WindowManager::WM_DELETE_WINDOW, 1);
-		
-        XEvent event;
-        
-        XFlush(WindowManager::display);
-        
-        Atom flist[] = {WindowManager::XA_NET_WM_STATE_FULLSCREEN, 0};
-        
-        XChangeProperty(WindowManager::display, data->handle, WindowManager::XA_NET_WM_STATE, WindowManager::XA_ATOM, 32, PropModeReplace, (Byte*)flist, 1);
-        
-        XMapWindow(WindowManager::display,data->handle);
-        XIfEvent(WindowManager::display, &event, &WindowManager::waitfor_mapnotify, (char*)data->handle);
-        
-        XMoveWindow(WindowManager::display, data->handle, mon.GetLocation().X, mon.GetLocation().Y);
-        
-        XFlush(WindowManager::display);
-		
-		data->ismapped=true;        
-        data->ppoint=mon.GetLocation();
-		
-		Layer::Resize(mon.GetSize());
-
-		createglcontext();
-		glsize = mon.GetSize();
-        
-        WindowManager::internal::XdndInit(data);
-	}
-	
-	void Window::Destroy() {
-        if(data) {
-            Close();
-        }
-        
-		windows.Remove(this);
-
-        delete pointerlayer;
-        pointerlayer = nullptr;
-
-        delete data;
-        data = nullptr;
-    }
-	
-	void Window::Show() {
-		Layer::Show();
-		
-		XEvent event;
-
-		XMapWindow(WindowManager::display, data->handle);
-		XIfEvent(WindowManager::display, &event, WindowManager::waitfor_mapnotify, (char*)data->handle);
-		XRaiseWindow(WindowManager::display, data->handle);
-		if(data->move) {
-			XMoveWindow(WindowManager::display, data->handle, data->moveto.X, data->moveto.Y);
-			data->move=false;
-		}		
-		XFlush(WindowManager::display);
-		data->ismapped=true;
-	}
-	
-	void Window::Hide() {
-		Layer::Hide();
-		
-		XUnmapWindow(WindowManager::display, data->handle);
-		data->ismapped=false;
-	}
-		
-	void Window::HidePointer() {
-        if(iswmpointer) {
-            if(data->pointerdisplayed) {
-                data->pointerdisplayed=false;
-                XDefineCursor(WindowManager::display, data->handle, WindowManager::blank_cursor);
-                XFlush(WindowManager::display);
-            }
-        }
-        else {
-            pointerlayer->Clear();
-            pointerlayer->Hide();
-        }
-		showptr = false;
-	}
-		
-	void Window::ShowPointer() {
-        if(iswmpointer) {
-            if(!data->pointerdisplayed) {
-                data->pointerdisplayed=true;
-                XDefineCursor(WindowManager::display, data->handle, 0);
-                XFlush(WindowManager::display);
-            }
-        }
-        else {
-            pointerlayer->Show();
-        }
-		showptr = true;
-	}
-	
-	void Window::Move(const Geometry::Point &location) {
-		if(data->ismapped) {
-            auto borders = WindowManager::GetX4Prop<Geometry::Margin>(WindowManager::XA_NET_FRAME_EXTENTS, data->handle, {0,0,0,0});
-            std::swap(borders.Top, borders.Right);
-
- 			XMoveWindow(WindowManager::display, data->handle, location.X+borders.Left, location.Y+borders.Top);
-			XFlush(WindowManager::display);
-		}
-		else {
-			data->move=true;
-			data->moveto=location;
-		}
-	}
-    
-	void Window::Resize(const Geometry::Size &size) {
-        if(!allowresize) {
-            XSizeHints *sizehints=XAllocSizeHints();
-            sizehints->min_width=size.Width;
-            sizehints->max_width=size.Width;
-            sizehints->min_height=size.Height;
-            sizehints->max_height=size.Height;
-            sizehints->flags=PMinSize | PMaxSize;
-            XSetWMNormalHints(WindowManager::display, data->handle, sizehints);
-            XFree(sizehints);
-        }
-
-		XResizeWindow(WindowManager::display, data->handle, size.Width, size.Height);
-		XFlush(WindowManager::display);
-	}
-
-    Input::Mouse::Button buttonfromx11(unsigned btn) {
-        using Input::Mouse::Button;
-        switch(btn) {
-        case 1:
-            return Button::Left;
-        case 2:
-            return Button::Middle;
-        case 3:
-            return Button::Right;
-        case 8:
-            return Button::X1;
-        case 9:
-            return Button::X2;
-        default:
-            return Button::None;
-        }
-    }
-	
-	Input::Keyboard::Key mapx11key(KeySym key, unsigned int keycode) {
-        if(key == 'i') {
-            int keycount;
-            
-            KeySym *keys = XGetKeyboardMapping(WindowManager::display,
-                keycode,
-                1,
-                &keycount
-            );
-            
-            if(keycount < 2) return 'I';
-            
-            KeySym keysym;
-            
-            keysym = keys[1]; //capital key
-            
-            if(keysym != 'I')
-                return keycode + Input::Keyboard::Keycodes::OSTransport;
-        }
-        
-        if(key >= 'a' && key <='z')
-            return key + ('A' - 'a');
-        
-        if(key >= '0' && key <='9')
-            return key;
-        
-        if(key >= 'A' && key <='Z')
-            return key;
-        
-        switch(key) {
-            case XK_Shift_L:
-                return Input::Keyboard::Keycodes::Shift;
-            case XK_Shift_R:
-                return Input::Keyboard::Keycodes::RShift;
-            case XK_Control_L:
-                return Input::Keyboard::Keycodes::Control;
-            case XK_Control_R:
-                return Input::Keyboard::Keycodes::RControl;
-            case XK_Alt_L:
-                return Input::Keyboard::Keycodes::Alt;
-            case XK_Alt_R:
-                return Input::Keyboard::Keycodes::RAlt;
-            case XK_Super_L:
-                return Input::Keyboard::Keycodes::Meta;
-            case XK_Super_R:
-                return Input::Keyboard::Keycodes::RMeta;
-                
-            case XK_Home:
-                return Input::Keyboard::Keycodes::Home;
-            case XK_End:
-                return Input::Keyboard::Keycodes::End;
-            case XK_Insert:
-                return Input::Keyboard::Keycodes::Insert;
-            case XK_Delete:
-                return Input::Keyboard::Keycodes::Delete;
-            case XK_Prior:
-                return Input::Keyboard::Keycodes::PageUp;
-            case XK_Next:
-                return Input::Keyboard::Keycodes::PageDown;
-
-            case XK_Print:
-                return Input::Keyboard::Keycodes::PrintScreen;
-            case XK_Pause:
-                return Input::Keyboard::Keycodes::Pause;
-
-            case XK_Menu:
-                return Input::Keyboard::Keycodes::Menu;
-
-            case XK_Caps_Lock:
-                return Input::Keyboard::Keycodes::CapsLock;
-            case XK_Num_Lock:
-                return Input::Keyboard::Keycodes::Numlock;
-            case XK_Scroll_Lock:
-                return Input::Keyboard::Keycodes::ScrollLock;
-
-            case XK_Return:
-                return Input::Keyboard::Keycodes::Enter;
-            case XK_Tab:
-                return Input::Keyboard::Keycodes::Tab;
-            case XK_BackSpace:
-                return Input::Keyboard::Keycodes::Backspace;
-            case XK_space:
-                return Input::Keyboard::Keycodes::Space;
-            case XK_Escape:
-                return Input::Keyboard::Keycodes::Escape;
-
-            case XK_Left:
-                return Input::Keyboard::Keycodes::Left;
-            case XK_Up:
-                return Input::Keyboard::Keycodes::Up;
-            case XK_Right:
-                return Input::Keyboard::Keycodes::Right;
-            case XK_Down:
-                return Input::Keyboard::Keycodes::Down;
-
-            case XK_F1:
-                return Input::Keyboard::Keycodes::F1;
-            case XK_F2:
-                return Input::Keyboard::Keycodes::F2;
-            case XK_F3:
-                return Input::Keyboard::Keycodes::F3;
-            case XK_F4:
-                return Input::Keyboard::Keycodes::F4;
-            case XK_F5:
-                return Input::Keyboard::Keycodes::F5;
-            case XK_F6:
-                return Input::Keyboard::Keycodes::F6;
-            case XK_F7:
-                return Input::Keyboard::Keycodes::F7;
-            case XK_F8:
-                return Input::Keyboard::Keycodes::F8;
-            case XK_F9:
-                return Input::Keyboard::Keycodes::F9;
-            case XK_F10:
-                return Input::Keyboard::Keycodes::F10;
-            case XK_F11:
-                return Input::Keyboard::Keycodes::F11;
-            case XK_F12:
-                return Input::Keyboard::Keycodes::F12;
-
-
-            case XK_KP_0:
-            case XK_KP_Insert:
-                return Input::Keyboard::Keycodes::Numpad_0;
-            case XK_KP_1:
-            case XK_KP_End:
-                return Input::Keyboard::Keycodes::Numpad_1;
-            case XK_KP_2:
-            case XK_KP_Down:
-                return Input::Keyboard::Keycodes::Numpad_2;
-            case XK_KP_3:
-            case XK_KP_Next:
-                return Input::Keyboard::Keycodes::Numpad_3;
-            case XK_KP_4:
-            case XK_KP_Left:
-                return Input::Keyboard::Keycodes::Numpad_4;
-            case XK_KP_5:
-            case XK_KP_Begin:
-                return Input::Keyboard::Keycodes::Numpad_5;
-            case XK_KP_6:
-            case XK_KP_Right:
-                return Input::Keyboard::Keycodes::Numpad_6;
-            case XK_KP_7:
-            case XK_KP_Home:
-                return Input::Keyboard::Keycodes::Numpad_7;
-            case XK_KP_8:
-            case XK_KP_Up:
-                return Input::Keyboard::Keycodes::Numpad_8;
-            case XK_KP_9:
-            case XK_KP_Prior:
-                return Input::Keyboard::Keycodes::Numpad_9;
-            case XK_KP_Decimal:
-                return Input::Keyboard::Keycodes::Numpad_Decimal;
-            case XK_KP_Divide:
-                return Input::Keyboard::Keycodes::Numpad_Div;
-            case XK_KP_Multiply:
-                return Input::Keyboard::Keycodes::Numpad_Mult;
-            case XK_KP_Enter:
-                return Input::Keyboard::Keycodes::Numpad_Enter;
-            case XK_KP_Add:
-                return Input::Keyboard::Keycodes::Numpad_Plus;
-            case XK_KP_Subtract:
-                return Input::Keyboard::Keycodes::Numpad_Minus;
-        }
-        return keycode + Input::Keyboard::Keycodes::OSTransport;
-    }
-    
-    void assertkeys(Window &wind, internal::windowdata *data) {
-        char keys[32];
-        XQueryKeymap(WindowManager::display, keys);
-        
-        for(auto it=data->pressed.begin(); it!=data->pressed.end(); ++it) {
-            auto key = *it;
-            KeyCode kc = XKeysymToKeycode(WindowManager::display, key);
-            if((keys[kc >> 3] & (1 << (kc & 7))) == 0) {
-                auto ggekey = mapx11key(key, kc);
-                it = data->pressed.erase(it);
-                
-                //modifiers
-                switch(key) {
-                    case XK_Shift_L:
-                    case XK_Shift_R:
-                        Input::Keyboard::CurrentModifier.Remove(Input::Keyboard::Modifier::Shift);
-                        break;
-                        
-                    case XK_Control_L:
-                    case XK_Control_R:
-                        Input::Keyboard::CurrentModifier.Remove(Input::Keyboard::Modifier::Ctrl);
-                        break;
-                        
-                    case XK_Alt_L:
-                        Input::Keyboard::CurrentModifier.Remove(Input::Keyboard::Modifier::Alt);
-                        break;
-                        
-                    case XK_Alt_R:
-                        Input::Keyboard::CurrentModifier.Remove(Input::Keyboard::Modifier::Alt);
-                        break;
-                        
-                    case XK_Super_L:
-                    case XK_Super_R:
-                        Input::Keyboard::CurrentModifier.Remove(Input::Keyboard::Modifier::Meta);
-                        break;
-                }
-                
-                
-                if(data->handlers.count(ggekey)>0 && data->handlers[ggekey] != wind.KeyEvent.EmptyToken) {
-                    wind.KeyEvent.FireFor(data->handlers[ggekey], ggekey, 0.f);
-                    data->handlers[ggekey] = wind.KeyEvent.EmptyToken;
-                }
-                else {
-                    wind.KeyEvent(ggekey, 0.f);
-                }
-            }
-        }
-    }
-        
-    std::string xeventname(XEvent &event) {
-        switch (event.type) {
-
-        case KeyPress: 
-            return "KeyPress";
-
-        case KeyRelease: 
-            return "KeyRelease";
-
-        case ButtonPress: 
-            return "ButtonPress";
-
-        case ButtonRelease: 
-            return "ButtonRelease";
-
-        case MotionNotify: 
-            return "MotionNotify";
-
-        case EnterNotify: 
-            return "EnterNotify";
-
-        case LeaveNotify: 
-            return "LeaveNotify";
-
-        case FocusIn: 
-            return "FocusIn";
-
-        case FocusOut: 
-            return "FocusOut";
-
-        case KeymapNotify: 
-            return "KeymapNotify";
-
-        case Expose: 
-            return "Expose";
-
-        case GraphicsExpose: 
-            return "GraphicsExpose";
-
-        case NoExpose: 
-            return "NoExpose";
-
-        case VisibilityNotify: 
-            return "VisibilityNotify";
-
-        case CreateNotify: 
-            return "CreateNotify";
-
-        case DestroyNotify: 
-            return "DestroyNotify";
-
-        case UnmapNotify: 
-            return "UnmapNotify";
-
-        case MapNotify: 
-            return "MapNotify";
-
-        case MapRequest: 
-            return "MapRequest";
-
-        case ReparentNotify: 
-            return "ReparentNotify";
-
-        case ConfigureNotify: 
-            return "ConfigureNotify";
-
-        case ConfigureRequest: 
-            return "ConfigureRequest";
-
-        case GravityNotify: 
-            return "GravityNotify";
-
-        case ResizeRequest: 
-            return "ResizeRequest";
-
-        case CirculateNotify: 
-            return "CirculateNotify";
-
-        case CirculateRequest: 
-            return "CirculateRequest";
-
-        case PropertyNotify: 
-            return "PropertyNotify";
-
-        case SelectionClear: 
-            return "SelectionClear";
-
-        case SelectionRequest: 
-            return "SelectionRequest";
-
-        case SelectionNotify: 
-            return "SelectionNotify";
-
-        case ColormapNotify: 
-            return "ColormapNotify";
-
-        case ClientMessage: 
-            return "ClientMessage";
-
-        case MappingNotify: 
-            return "MappingNotify";
-            
-        }
-        
-        return "Unknown";
-    }
-	
-	void Window::processmessages() {
-		XEvent event;
-        
-        mouselocation = WindowManager::GetMousePosition(data);
-        if(cursorover)
-            mouse_location();
-
-		while(XEventsQueued(WindowManager::display, QueuedAfterReading)) {
-			XNextEvent(WindowManager::display, &event);
-			KeySym key;
-            //std::cout<<"XEV: "<<xeventname(event)<<std::endl;
-            
-			switch(event.type) {
-				case ClientMessage: {
-					if (event.xclient.message_type == WindowManager::XA_PROTOCOLS
-							&& event.xclient.format == 32
-							&& event.xclient.data.l[0] == (long)WindowManager::WM_DELETE_WINDOW)
-					{
-						bool allow;
-						allow=true;
-						ClosingEvent(allow);
-						
-						if(allow) {
-							Close();
-							break;
-						}
-					}
-                    else if(event.xclient.message_type==WindowManager::XdndEnter) {
-                        unsigned long len, bytes, dummy;
-                        unsigned char *data=NULL;
-                        Atom type;
-                        int format;
-                        
-                        this->data->xdnd.drop = false;
-                        this->data->xdnd.requested = false;
-                        
-                        cursorover = true;
-                        
-                        std::vector<Atom> atoms;
-                        
-                        if(event.xclient.data.l[1] & 1) {
-                            //get the length
-                            XGetWindowProperty(WindowManager::display, event.xclient.data.l[0], 
-                                               WindowManager::XdndTypeList, 0, 0, 0, AnyPropertyType, 
-                                               &type, &format, &len, &bytes, &data);
-                            
-                            //read the data
-                            XGetWindowProperty(WindowManager::display, event.xclient.data.l[0], 
-                                            WindowManager::XdndTypeList, 0,bytes,0,
-                                            AnyPropertyType, &type, &format,
-                                            &len, &dummy, &data);
-                       
-                            Atom *atomlist=(Atom*)data;
-                            for(int i=0;i<(int)bytes/4;i++) {
-                                if(atomlist[i] != internal::None)
-                                    atoms.push_back(atomlist[i]);
-                            }
-                        }
-                        else {
-                            for(int i=2; i<=4; i++)
-                                if(event.xclient.data.l[i] != internal::None)
-                                    atoms.push_back(event.xclient.data.l[i]);
-                        }
-                        
-                        for(auto atom : atoms) {
-                            //std::cout<<WindowManager::GetAtomName(atom)<<std::endl;
-                            
-                            if(atom == WindowManager::XA_Filelist)
-                                this->data->xdnd.filelist = true;
-                            
-                            if(atom == WindowManager::XA_UTF8_STRING)
-                                this->data->xdnd.utf8 = true;
-                            else if(atom == WindowManager::XA_STRING)
-                                this->data->xdnd.string = true;
-                        }
-                        
-                        this->data->xdnd.localpointer = this->IsLocalPointer();
-                        this->SwitchToWMPointers();
-                    }
-                    else if(event.xclient.message_type==WindowManager::XdndPosition) {
-                        XClientMessageEvent m;
-                        memset(&m, sizeof(m), 0);
-                        m.type = ClientMessage;
-                        m.display = event.xclient.display;
-                        m.window = event.xclient.data.l[0];
-                        m.message_type = WindowManager::XdndStatus;
-                        m.format=32;
-                        m.data.l[0] = data->handle;
-                        m.data.l[1] = this->data->xdnd.filelist || this->data->xdnd.utf8 || this->data->xdnd.string;
-                        m.data.l[2] = 0;
-                        m.data.l[3] = 0; 
-                        
-                        if(!Input::IsDragging() || !Input::GetDragOperation().HasTarget()) { 
-                            m.data.l[4] = internal::None;
-                        }
-                        else {
-                            auto &drag = Input::GetDragOperation();
-                            
-                            if(drag.HasData(Resource::GID::File)) {
-                                auto &data=dynamic_cast<FileData&>(drag.GetData(Resource::GID::File));
-
-                                if(data.Action==data.Move)
-                                    m.data.l[4] = WindowManager::XdndActionMove;
-                                else
-                                    m.data.l[4] = WindowManager::XdndActionCopy;
-                            }
-                            else if(drag.HasData(Resource::GID::Text)) {
-                                    m.data.l[4] = WindowManager::XdndActionCopy;
-                            }
-                            else {
-                                m.data.l[4] = internal::None;
-                            }
-                        }
-                        
-                        XSendEvent(WindowManager::display, event.xclient.data.l[0], False, NoEventMask, (XEvent*)&m);
-
-                        if(!Input::IsDragging()) {
-                            if(this->data->xdnd.filelist) {
-                                if(this->data->xdnd.requested || OS::GetEnvVar("XDG_CURRENT_DESKTOP") == "KDE") {
-                                    auto &drag = Input::PrepareDrag();
-                                    drag.AssumeData(*new FileData);
-                                    Input::StartDrag();
-                                    Input::GetDragOperation().MarkAsOS();
-                                }
-                                else {
-                                    XConvertSelection(WindowManager::display, WindowManager::XdndSelection, 
-                                                    WindowManager::XA_Filelist, WindowManager::XA_PRIMARY, 
-                                                    this->data->handle, event.xclient.data.l[2]);
-                                }
-                            }
-                            
-                            if(this->data->xdnd.utf8 || this->data->xdnd.string) {
-                                if(this->data->xdnd.requested || OS::GetEnvVar("XDG_CURRENT_DESKTOP") == "KDE") {
-                                    auto &drag = Input::PrepareDrag();
-                                    drag.AddTextData("");
-                                    Input::StartDrag();
-                                    Input::GetDragOperation().MarkAsOS();
-                                }
-                                else {
-                                    XConvertSelection(WindowManager::display, WindowManager::XdndSelection, 
-                                                    WindowManager::XA_STRING, WindowManager::XA_PRIMARY, 
-                                                    this->data->handle, event.xclient.data.l[2]);
-                                }
-                            }
-                            
-                            this->data->xdnd.requested = true;
-
-                        }
-                    }
-                    else if(event.xclient.message_type == WindowManager::XdndLeave) {
-                        cursorover = true;
-
-                        Input::CancelDrag();
-                        if(this->data->xdnd.localpointer)
-                            SwitchToLocalPointers();
-                    }
-                    else if(event.xclient.message_type == WindowManager::XdndDrop) {
-                        //std::cout<<"Drop"<<std::endl;
-
-                        this->data->xdnd.drop = 0;
-                        
-                        if(this->data->xdnd.filelist) {
-                            XConvertSelection(WindowManager::display, WindowManager::XdndSelection, 
-                                              WindowManager::XA_Filelist, WindowManager::XA_PRIMARY, 
-                                              this->data->handle, event.xclient.data.l[2]);
-                            
-                            this->data->xdnd.drop++;
-                        }
-                        
-                        if(this->data->xdnd.utf8 || this->data->xdnd.string) {
-                            XConvertSelection(WindowManager::display, WindowManager::XdndSelection, 
-                                            WindowManager::XA_STRING, 
-                                            WindowManager::XA_PRIMARY, this->data->handle, event.xclient.data.l[2]);
-                            
-                            this->data->xdnd.drop++;
-                        }
-                       
-                        if(this->data->xdnd.localpointer)
-                            SwitchToLocalPointers();
-                    }
-				} // Client Message
-				break;
-                
-                case SelectionNotify:
-                    if (event.xselection.property != (unsigned)internal::None) {
-                        if(this->data->xdnd.filelist) {
-                            unsigned long len, bytes, dummy;
-                            unsigned char *data=NULL;
-                            Atom type;
-                            int format;
-                            
-                            FileData *dragdata = nullptr;
-                            if(Input::IsDragging() && Input::GetDragOperation().HasData(Resource::GID::File)) {
-                                dragdata = dynamic_cast<FileData*>(&Input::GetDragOperation().GetData(Resource::GID::File));
-                            }
-                            else {
-                                dragdata = new FileData();
-                            }
-                            
-                            bytes = 0;
-
-                            if(event.xselection.property != internal::None)
-                                XGetWindowProperty(WindowManager::display, this->data->handle, event.xselection.property, 0, 0, 0, AnyPropertyType, &type, &format, &len, &bytes, &data);
-
-                            if(bytes) {
-                                XGetWindowProperty(WindowManager::display, this->data->handle, 
-                                        event.xselection.property, 0,bytes,0,
-                                        AnyPropertyType, &type, &format,
-                                        &len, &dummy, &data);
-                                
-                                
-                                dragdata->Clear();
-                                
-                                int p=0;
-                                for(int i=0;i<(int)len+1;i++) {
-                                    if(i==(int)len || (char)data[i]=='\n') {
-                                        if(i-p>1) {
-                                            std::string s((char*)(data+p), (int)(i-p));
-                                            if(s.length()>6 && s.substr(0, 7)=="file://") 
-                                                s=s.substr(7);
-                                            if(s[s.length()-1]=='\r')
-                                                s.resize(s.length()-1);
-                                            
-                                            dragdata->AddFile(Encoding::URIDecode(s));
-                                            p=i+1;
-                                        }
-                                    }
-                                }
-                                
-                                XFree(data);
-                                XDeleteProperty(WindowManager::display, this->data->handle, event.xselection.property);
-
-                                if(!Input::IsDragging()) {
-                                    auto &drag = Input::PrepareDrag();
-                                    drag.AssumeData(*dragdata);
-                                    Input::StartDrag();
-                                    Input::GetDragOperation().MarkAsOS();
-                                    Input::GetDragOperation().DataReady();
-                                }
-                                else if(!Input::GetDragOperation().HasData(Resource::GID::File)) {
-                                    auto &drag = Input::GetDragOperation();
-                                    drag.AssumeData(*dragdata);
-                                    Input::GetDragOperation().DataReady();
-                                }
-                                else if(!Input::IsDragging() || !Input::GetDragOperation().HasData(Resource::GID::File)) {
-                                    delete dragdata;
-                                }
-                                else {
-                                    Input::GetDragOperation().DataReady();
-                                }
-                            }
-                        }
-                        else if(this->data->xdnd.utf8 || this->data->xdnd.string) {
-                            Atom type;
-                            unsigned long len, bytes, dummy;
-                            unsigned char *data;
-                            int format;
-                        
-                            XGetWindowProperty(WindowManager::display, this->data->handle, event.xselection.property, 0, 0, 0, AnyPropertyType, &type, &format, &len, &bytes, &data);
-
-                            if(bytes) {
-                                XGetWindowProperty (WindowManager::display, this->data->handle, 
-                                        event.xselection.property, 0,bytes,0,
-                                        AnyPropertyType, &type, &format,
-                                        &len, &dummy, &data);
-                                
-                                std::string tmp((char*)data, bytes);
-                                
-                                XFree(data);
-                                XDeleteProperty(WindowManager::display, this->data->handle, event.xselection.property);
-                                
-                                if(Input::IsDragging() && Input::GetDragOperation().HasData(Resource::GID::Text)) {
-                                    auto &dragdata = dynamic_cast<TextData&>(Input::GetDragOperation().GetData(Resource::GID::Text));
-                                    dragdata.SetText(tmp);
-                                    Input::GetDragOperation().DataReady();
-                                }
-                                else {
-                                    if(Input::IsDragging()) {
-                                        Input::GetDragOperation().AddTextData(tmp);
-                                        Input::GetDragOperation().DataReady();
-                                    }
-                                    else {
-                                        Input::BeginDrag(tmp);
-                                        Input::GetDragOperation().MarkAsOS();
-                                        Input::GetDragOperation().DataReady();
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    if(this->data->xdnd.drop == 1) {
-                        Input::Drop(mouselocation);
-                        this->data->xdnd = decltype(this->data->xdnd)();
-                    }
-                    else if(this->data->xdnd.drop)
-                        this->data->xdnd.drop--;
-                    
-                    break;
-                    
-                case SelectionClear:
-                    WindowManager::clipboard_entries.clear();
-                    break;
-                
-                case SelectionRequest: {
-                    XEvent respond;
-                    respond.xselection.property= 0;
-                    
-                    Atom proptoset;
-                    proptoset = event.xselectionrequest.property==internal::None ? WindowManager::XA_PRIMARY : event.xselectionrequest.property;
-                    
-                    if(event.xselectionrequest.selection==WindowManager::XA_CLIPBOARD) {
-                        if(event.xselectionrequest.target==WindowManager::XA_TARGETS) {
-                            std::vector<Atom> supported = {WindowManager::XA_TARGETS};
-                            
-                            for(auto &d : WindowManager::clipboard_entries) {
-                                supported.push_back(d.type);
-                            }
-                            
-                            XChangeProperty (WindowManager::display,
-                                event.xselectionrequest.requestor,
-                                proptoset,
-                                WindowManager::XA_ATOM,
-                                32,
-                                PropModeReplace,
-                                (unsigned char *)(&supported[0]),
-                                supported.size()
-                            );
-                            respond.xselection.property=proptoset;
-                        }
-                        else {
-                            WindowManager::clipboardentry *entry = nullptr;
-                            for(auto &d : WindowManager::clipboard_entries) {
-                                if(d.type == event.xselectionrequest.target) {
-                                    entry = &d;
-                                }
-                            }
-                            
-                            if(entry) {
-                                if( entry->type == WindowManager::XA_STRING || 
-                                    entry->type == WindowManager::XA_TEXT || 
-                                    entry->type == WindowManager::XA_UTF8_STRING || 
-                                    entry->type == WindowManager::XA_TEXT_HTML || 
-                                    entry->type == WindowManager::XA_Filelist || 
-                                    entry->type == WindowManager::XA_URL) 
-                                {
-                                    std::string &str = entry->data->GetData<std::string>();
-                                    
-                                    XChangeProperty (WindowManager::display,
-                                        event.xselectionrequest.requestor,
-                                        proptoset,
-                                        entry->type,
-                                        8,
-                                        PropModeReplace,
-                                        (unsigned char*) &str[0],
-                                        (int)str.length()
-                                    );
-                                    
-                                    respond.xselection.property=proptoset;
-                                }
-                                else if(entry->type == WindowManager::XA_PNG) {
-                                    Containers::Image &img = entry->data->GetData<Containers::Image>();
-                                    
-                                    std::vector<Byte> data;
-                                    Encoding::Png.Encode(img, data);
-                                    
-                                    XChangeProperty (WindowManager::display,
-                                        event.xselectionrequest.requestor,
-                                        proptoset,
-                                        entry->type,
-                                        8,
-                                        PropModeReplace,
-                                        &data[0],
-                                        (int)data.size()
-                                    );
-                                    
-                                    respond.xselection.property=proptoset;
-                                }
-                                else if(entry->type == WindowManager::XA_JPG) {
-                                    Containers::Image &img = entry->data->GetData<Containers::Image>();
-                                    
-                                    std::vector<Byte> data;
-                                    Encoding::Jpg.Encode(img, data);
-                                    
-                                    XChangeProperty (WindowManager::display,
-                                        event.xselectionrequest.requestor,
-                                        proptoset,
-                                        entry->type,
-                                        8,
-                                        PropModeReplace,
-                                        &data[0],
-                                        (int)data.size()
-                                    );
-                                    
-                                    respond.xselection.property=proptoset;
-                                }
-                                else if(entry->type == WindowManager::XA_BMP) {
-                                    Containers::Image &img = entry->data->GetData<Containers::Image>();
-                                    
-                                    std::ostringstream data;
-                                    img.ExportBMP(data);
-                                    
-                                    XChangeProperty (WindowManager::display,
-                                        event.xselectionrequest.requestor,
-                                        proptoset,
-                                        entry->type,
-                                        8,
-                                        PropModeReplace,
-                                        (Byte*)&data.str()[0],
-                                        (int)data.str().size()
-                                    );
-                                    
-                                    respond.xselection.property=proptoset;
-                                }
-                            }
-                        }
-                    }
-                    
-                    respond.xselection.type= SelectionNotify;
-                    respond.xselection.display= event.xselectionrequest.display;
-                    respond.xselection.requestor= event.xselectionrequest.requestor;
-                    respond.xselection.selection=event.xselectionrequest.selection;
-                    respond.xselection.target= event.xselectionrequest.target;
-                    respond.xselection.time = event.xselectionrequest.time;
-                    XSendEvent (WindowManager::display, event.xselectionrequest.requestor,0,0,&respond);
-                    XFlush (WindowManager::display);
-                }
-                break;
-                 
-                case EnterNotify:
-                    cursorover = true;
-                    break;
-                    
-                case ConfigureNotify: {
-                    auto xce = event.xconfigure;
-                    
-                    if(GetSize().Width != xce.width || GetSize().Height != xce.height) {
-                        Layer::Resize({(int)xce.width, (int)xce.height});
-                        
-						activatecontext();
-                        GL::Resize({(int)xce.width, (int)xce.height});
-                        
-                        ResizedEvent();
-                    }
-                    else {
-                        int x, y;
-                        ::Window r;
-                        XTranslateCoordinates(WindowManager::display, data->handle, RootWindow(WindowManager::display, XDefaultScreen(WindowManager::display)), 
-                            xce.x, xce.y, &x, &y, &r
-                        );
-                        
-                        if(data->ppoint.X != x || data->ppoint.Y != y ) {
-                            data->ppoint = {x, y};
-
-                            MovedEvent();
-                        }
-                    }
-                }
-                break;
-                    
-                case LeaveNotify:
-                    cursorover = false;
-                    break;
-					
-				case FocusIn: {
-                    assertkeys(*this, data);
-                    
-                    if(event.xfocus.mode == NotifyNormal) {
-                        if(!data->focused) {
-                            FocusedEvent();
-                            data->focused = true;
-                        }
-                    }                    
-                }
-				break;
-					
-				case FocusOut: {
-                    if(data->focused) {
-                        LostFocusEvent();
-                        data->focused = false;
-                    }
-                }
-				break;
-                   
-                    
-                case PropertyNotify:
-                    if(event.xproperty.atom == WindowManager::XA_NET_WM_STATE) {
-                        bool minstate = IsMinimized();
-                        
-                        if(minstate && !data->min) {
-                            MinimizedEvent();
-                            data->min = true;
-                        }
-                        else if(!minstate && data->min) {
-                            RestoredEvent();
-                            data->min = false;
-                        }
-                    }
-                    break;
-					
-				case KeyPress: {
-					key=XLookupKeysym(&event.xkey,0);
-					
-                    data->pressed.insert(key);
-                    
-					//modifiers
-					switch(key) {
-						case XK_Shift_L:
-						case XK_Shift_R:
-							Input::Keyboard::CurrentModifier.Add(Input::Keyboard::Modifier::Shift);
-							break;
-							
-						case XK_Control_L:
-						case XK_Control_R:
-							Input::Keyboard::CurrentModifier.Add(Input::Keyboard::Modifier::Ctrl);
-							break;
-							
-						case XK_Alt_L:
-							Input::Keyboard::CurrentModifier.Add(Input::Keyboard::Modifier::Alt);
-							break;
-							
-						case XK_Alt_R:
-							Input::Keyboard::CurrentModifier.Add(Input::Keyboard::Modifier::Alt);
-							break;
-							
-						case XK_Super_L:
-						case XK_Super_R:
-							Input::Keyboard::CurrentModifier.Add(Input::Keyboard::Modifier::Meta);
-							break;
-					}
-					auto ggekey = mapx11key(key, event.xkey.keycode);
-					auto token=KeyEvent(ggekey, true);
-					if(token != KeyEvent.EmptyToken) {
-						data->handlers[ggekey]=token;
-						
-						break;
-					}
-					
-					if(!Input::Keyboard::CurrentModifier.IsModified()) {
-                        XLookupString(&event.xkey, nullptr, 0, &key, nullptr); //append shift and other mods                    
-                        Input::Keyboard::Char c = keysym2ucs(key);
-                        
-                        if(c != 0xfffd) {
-                            if( (c>=0x20 || c == '\t' || c ==13) && (c < 0x7f || c > 0x9f)) { //exclude c0 & c1 but keep tab
-                                CharacterEvent(c);
-                            }
-                        }
-                    }
-				} //Keypress
-				break;
-					
-					
-				case KeyRelease: {
-					key=XLookupKeysym(&event.xkey,0);
-                        
-                    auto ggekey = mapx11key(key, event.xkey.keycode);
-						
-					if(XEventsQueued(WindowManager::display, QueuedAfterReading)) {
-						XEvent nextevent;
-						XPeekEvent(WindowManager::display, &nextevent);
-                        
-						if(nextevent.type == KeyPress && nextevent.xkey.time == event.xkey.time && 
-							nextevent.xkey.keycode == event.xkey.keycode
-						) {
-							
-							if(data->handlers.count(ggekey)>0 && data->handlers[ggekey]!=KeyEvent.EmptyToken) {
-								//if keypress handled, key will not be repeated.
-                                //what about backspace, arrow keys and delete?
-							}
-							else if(!Input::Keyboard::CurrentModifier.IsModified()) {
-                                XLookupString(&event.xkey, nullptr, 0, &key, nullptr);
-                                Input::Keyboard::Char c = keysym2ucs(key);
-                                
-                                if(c != 0xfffd) {
-                                    if( (c>=0x20 || c == '\t' || c =='\n') && (c < 0x7f || c > 0x9f)) { //exclude c0 & c1 but keep enter and tab
-                                        CharacterEvent(c);
-                                    }
-                                }
-							}
-					
-							XNextEvent(WindowManager::display, &nextevent);
-							break;
-						}
-					}
-					
-                    data->pressed.erase(key);
-					
-					//modifiers
-					switch(key) {
-						case XK_Shift_L:
-						case XK_Shift_R:
-							Input::Keyboard::CurrentModifier.Remove(Input::Keyboard::Modifier::Shift);
-							break;
-							
-						case XK_Control_L:
-						case XK_Control_R:
-							Input::Keyboard::CurrentModifier.Remove(Input::Keyboard::Modifier::Ctrl);
-							break;
-							
-						case XK_Alt_L:
-							Input::Keyboard::CurrentModifier.Remove(Input::Keyboard::Modifier::Alt);
-							break;
-							
-						case XK_Alt_R:
-							Input::Keyboard::CurrentModifier.Remove(Input::Keyboard::Modifier::Alt);
-							break;
-							
-						case XK_Super_L:
-						case XK_Super_R:
-							Input::Keyboard::CurrentModifier.Remove(Input::Keyboard::Modifier::Meta);
-							break;
-					}
-					
-					
-					if(data->handlers.count(ggekey)>0 && data->handlers[ggekey]!=KeyEvent.EmptyToken) {
-						KeyEvent.FireFor(data->handlers[ggekey], ggekey, 0.f);
-						data->handlers[ggekey]=KeyEvent.EmptyToken;
-					}
-					else {
-						KeyEvent(ggekey, 0.f);
-					}
-					
-				} //Keyrelease
-				break;
-					
-                case ButtonPress:
-                    if(event.xbutton.button==4) {
-                        mouse_event(Input::Mouse::EventType::Scroll_Vert, {event.xbutton.x, event.xbutton.y}, buttonfromx11(event.xbutton.button), 1);
-                    }
-                    else if(event.xbutton.button==5) {
-                        mouse_event(Input::Mouse::EventType::Scroll_Vert, {event.xbutton.x, event.xbutton.y}, buttonfromx11(event.xbutton.button), -1);
-                    }
-                    else {
-                        mouse_down({event.xbutton.x, event.xbutton.y}, buttonfromx11(event.xbutton.button));
-                    }
-                    break;
-                case ButtonRelease:
-                    if(event.xbutton.button!=4 && event.xbutton.button!=5) {
-                        mouse_up({event.xbutton.x, event.xbutton.y}, buttonfromx11(event.xbutton.button));
-                    }
-                    break;
-                default:
-                    //std::cout<<xeventname(event)<<std::endl;
-                    break;
-			}
-		}
-	}
-	
-	void Window::Close() {
-        XDestroyWindow(WindowManager::display, data->handle);
-        data->handle = 0;
-        
-		DestroyedEvent();
-	}
-	
-	void Window::createglcontext() {
-		static int attributeListDbl[] = {
-			GLX_RGBA,
-			GLX_DOUBLEBUFFER,
-			GLX_RED_SIZE,   1,
-			GLX_GREEN_SIZE, 1,
-			GLX_BLUE_SIZE,  1,
-			internal::None
-		};
-		
-		XVisualInfo *vi = glXChooseVisual(WindowManager::display, DefaultScreen(WindowManager::display), attributeListDbl);
-		
-		GLXContext prev=0;
-		for(auto &w : windows) {
-			if(w.data->context!=0) {
-				prev=w.data->context;
-			}
-		}
-		
-		data->context = glXCreateContext(WindowManager::display, vi, prev, GL_TRUE);		
-		WindowManager::internal::switchcontext(*data);
-
-		if(data->context==0) {
-			OS::DisplayMessage("OpenGL context creation failed");
-			exit(1);
-		}
-
-		Graphics::Initialize();
-
-		GL::SetupContext(bounds.GetSize());
-
-		// test code
-		glXSwapBuffers(WindowManager::display, data->handle);		
-		XFlush(WindowManager::display);
-	}
-
-	void Window::SetTitle(const std::string &title) {	
-		XStoreName(WindowManager::display, data->handle, title.c_str());
-        XFlush(WindowManager::display);
-	}
-
-	std::string Window::GetTitle() const {
-        Atom type;
-        int format;
-        unsigned long len, remainder;
-        
-        Byte *prop;
-        
-        XGetWindowProperty(WindowManager::display, data->handle, WindowManager::XA_NET_WM_NAME, 0, 1024,
-                           False, WindowManager::XA_UTF8_STRING, &type, &format, &len, &remainder, &prop);
-        
-        if(!prop) {
-            XGetWindowProperty(WindowManager::display, data->handle, WindowManager::XA_WM_NAME, 0, 1024,
-                            False, AnyPropertyType, &type, &format, &len, &remainder, &prop);
-        }
-        
-        std::string ret((char*)prop, len);
-        XFree(prop);
-        
-		return ret;
-	}
-
-	bool Window::IsClosed() const {
-		return data->handle == 0;
-	}
-
-	Geometry::Bounds Window::GetExteriorBounds() const {
-        auto borders = WindowManager::GetX4Prop<Geometry::Margin>(WindowManager::XA_NET_FRAME_EXTENTS, data->handle, {0,0,0,0});
-        std::swap(borders.Top, borders.Right);
-        
-        ::Window r, c;
-        int x, y;
-        unsigned w, h, bw, d;
-        
-        XGetGeometry(WindowManager::display, data->handle, &r, &x, &y, &w, &h, &bw, &d);
-        
-        XTranslateCoordinates( WindowManager::display, data->handle, r, 0, 0, &x, &y, &c );
-        
-        return Geometry::Bounds(x, y, x+w, y+h) + borders;
-    }
-
-	void Window::Focus() {
-        XClientMessageEvent ev;
-        std::memset (&ev, 0, sizeof ev);
-        ev.type = ClientMessage;
-        ev.window = data->handle;
-        ev.message_type = WindowManager::XA_NET_ACTIVE_WINDOW;
-        ev.format = 32;
-        ev.data.l[0] = 1;
-        ev.data.l[1] = CurrentTime;
-        XSendEvent (WindowManager::display, RootWindow(WindowManager::display, XDefaultScreen(WindowManager::display)), False, SubstructureRedirectMask | SubstructureNotifyMask, (XEvent*)&ev);
-        XFlush (WindowManager::display);  
-    }
-
-	bool Window::IsFocused() const {
-        ::Window focused;
-        int r;
-
-        XGetInputFocus(WindowManager::display, &focused, &r);
-        
-		return focused == data->handle;
-	}
-
-	void Window::Minimize() {
-        XIconifyWindow(WindowManager::display, data->handle, 0);
-        XFlush(WindowManager::display);
-	}
-
-	void Window::Maximize() {
-        if(!allowresize) {
-            XSizeHints *sizehints=XAllocSizeHints();
-            sizehints->max_width=INT_MAX;
-            sizehints->max_height=INT_MAX;
-            sizehints->flags=PMaxSize;
-            XSetWMNormalHints(WindowManager::display, data->handle, sizehints);	
-            XFree(sizehints);
-        
-            XFlush(WindowManager::display);
-            
-            std::this_thread::sleep_for(std::chrono::milliseconds(10));
-        }
-
-        XEvent xev;
-
-        memset(&xev, 0, sizeof(xev));
-        xev.type = ClientMessage;
-        xev.xclient.window = data->handle;
-        xev.xclient.message_type = WindowManager::XA_NET_WM_STATE;
-        xev.xclient.format = 32;
-        xev.xclient.data.l[0] = WindowManager::XA_NET_WM_STATE_ADD;
-        xev.xclient.data.l[1] = WindowManager::XA_NET_WM_STATE_MAXIMIZED_HORZ;
-        xev.xclient.data.l[2] = WindowManager::XA_NET_WM_STATE_MAXIMIZED_VERT;
-
-        XSendEvent(WindowManager::display, DefaultRootWindow(WindowManager::display), False, SubstructureNotifyMask, &xev);
-        XFlush(WindowManager::display);
-        
-        ::Window r;
-        int x, y;
-        unsigned w, h, bw, d;
-        
-        std::this_thread::sleep_for(std::chrono::milliseconds(10)); //wait for a short time to ensure window frame is ready.
-       
-        XGetGeometry(WindowManager::display, data->handle, &r, &x, &y, &w, &h, &bw, &d);
-        
-        if(!allowresize) {
-            XSizeHints *sizehints=XAllocSizeHints();
-            sizehints->min_width=w;
-            sizehints->max_width=w;
-            sizehints->min_height=h;
-            sizehints->max_height=h;
-            sizehints->flags=PMinSize | PMaxSize;
-            XSetWMNormalHints(WindowManager::display, data->handle, sizehints);	
-            XFlush(WindowManager::display);
-            XFree(sizehints);
-        }
-	}
-
-	void Window::Restore() {
-        Atom type;
-        int format;
-        unsigned long count, b;
-        unsigned char *properties = NULL;
-        
-        bool min = false, max = false;
-    
-        ::XGetWindowProperty(WindowManager::display, data->handle, WindowManager::XA_NET_WM_STATE, 0, LONG_MAX, False, AnyPropertyType, &type, &format, &count, &b, &properties);
-        for(int i=0; i<count; i++) {
-            auto prop = reinterpret_cast<unsigned long *>(properties)[i];
-            if(prop == WindowManager::XA_NET_WM_STATE_HIDDEN)
-                min = true;
-            else if(prop == WindowManager::XA_NET_WM_STATE_MAXIMIZED_HORZ || prop == WindowManager::XA_NET_WM_STATE_MAXIMIZED_VERT)
-                max = true;
-        }
-            
-
-		if(min) {
-            Focus();
-		}
-		else if(max) {
-            if(!allowresize) {
-                XSizeHints *sizehints=XAllocSizeHints();
-                sizehints->min_width=0;
-                sizehints->min_height=0;
-                sizehints->flags=PMinSize;
-                XSetWMNormalHints(WindowManager::display, data->handle, sizehints);	
-                XFree(sizehints);
-                
-                XFlush(WindowManager::display);
-                
-                std::this_thread::sleep_for(std::chrono::milliseconds(10));
-            }
-            
-            XEvent xev;
-
-            memset(&xev, 0, sizeof(xev));
-            xev.type = ClientMessage;
-            xev.xclient.window = data->handle;
-            xev.xclient.message_type = WindowManager::XA_NET_WM_STATE;
-            xev.xclient.format = 32;
-            xev.xclient.data.l[0] = 0;      
-            xev.xclient.data.l[1] = WindowManager::XA_NET_WM_STATE_MAXIMIZED_HORZ;
-            xev.xclient.data.l[2] = WindowManager::XA_NET_WM_STATE_MAXIMIZED_VERT;
-
-            XSendEvent(WindowManager::display, DefaultRootWindow(WindowManager::display), False, SubstructureNotifyMask, &xev);
-            XFlush(WindowManager::display);
-            
-            ::Window r;
-            int x, y;
-            unsigned w, h, bw, d;
-            
-            std::this_thread::sleep_for(std::chrono::milliseconds(10)); //wait for a short time to ensure window frame is ready.
-        
-            XGetGeometry(WindowManager::display, data->handle, &r, &x, &y, &w, &h, &bw, &d);
-            
-            if(!allowresize) {
-                XSizeHints *sizehints=XAllocSizeHints();
-                sizehints->min_width=w;
-                sizehints->max_width=w;
-                sizehints->min_height=h;
-                sizehints->max_height=h;
-                sizehints->flags=PMinSize | PMaxSize;
-                XSetWMNormalHints(WindowManager::display, data->handle, sizehints);	
-                XFlush(WindowManager::display);
-                XFree(sizehints);            
-            }
-        }
-        XFree(properties);
-	}
-
-	bool Window::IsMinimized() const {
-        Atom type;
-        int format;
-        unsigned long count, b;
-        unsigned char *properties = NULL;
-        
-        bool min = false;
-    
-        ::XGetWindowProperty(WindowManager::display, data->handle, WindowManager::XA_NET_WM_STATE, 0, LONG_MAX, False, AnyPropertyType, &type, &format, &count, &b, &properties);
-        for(int i=0; i<count; i++) {
-            auto prop = reinterpret_cast<unsigned long *>(properties)[i];
-            if(prop == WindowManager::XA_NET_WM_STATE_HIDDEN)
-                min = true;
-        }
-        XFree(properties);
-        
-        return min;
-	}
-
-	bool Window::IsMaximized() const {
-        Atom type;
-        int format;
-        unsigned long count, b;
-        unsigned char *properties = NULL;
-        
-        bool min = false, max = false;
-    
-        ::XGetWindowProperty(WindowManager::display, data->handle, WindowManager::XA_NET_WM_STATE, 0, LONG_MAX, False, AnyPropertyType, &type, &format, &count, &b, &properties);
-        for(int i=0; i<count; i++) {
-            auto prop = reinterpret_cast<unsigned long *>(properties)[i];
-            
-            if(prop == WindowManager::XA_NET_WM_STATE_MAXIMIZED_HORZ || prop == WindowManager::XA_NET_WM_STATE_MAXIMIZED_VERT)
-                max = true;
-        }
-        XFree(properties);
-        
-        return max;
-	}
-	
-	void Window::AllowResize() {
-        XSizeHints *sizehints=XAllocSizeHints();
-        sizehints->min_width=0;
-        sizehints->max_width=INT_MAX;
-        sizehints->min_height=0;
-        sizehints->max_height=INT_MAX;
-        sizehints->flags=PMinSize | PMaxSize;
-        XSetWMNormalHints(WindowManager::display, data->handle, sizehints);	
-        XFlush(WindowManager::display);
-        XFree(sizehints);
-    }
-	
-	void Window::PreventResize() {
-        auto sz = GetSize();
-        XSizeHints *sizehints=XAllocSizeHints();
-        sizehints->min_width=sz.Width;
-        sizehints->max_width=sz.Width;
-        sizehints->min_height=sz.Height;
-        sizehints->max_height=sz.Height;
-        sizehints->flags=PMinSize | PMaxSize;
-        XSetWMNormalHints(WindowManager::display, data->handle, sizehints);	
-        XFlush(WindowManager::display);
-        XFree(sizehints);
-    }
-
-    void Window::SetIcon(const WindowManager::Icon& icon) {
-        XChangeProperty(WindowManager::display, data->handle, WindowManager::XA_NET_WM_ICON, WindowManager::XA_CARDINAL , 32, PropModeReplace, icon.data->data, icon.data->w*icon.data->h+2);
-        XSync(WindowManager::display, 1);
-    }
-
-	void Window::updatedataowner() {
-	}
-    
-}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Source/Gorgon/WindowManager/X11/Clipboard.cpp	Fri Feb 21 17:02:44 2020 +0200
@@ -0,0 +1,689 @@
+#include "../../WindowManager.h"
+
+#include "X11.h"
+
+#include "../../Containers/Vector.h"
+
+#include "../../Encoding/URI.h"
+#include "../../Encoding/PNG.h"
+#include "../../Encoding/JPEG.h"
+#include "../../IO/MemoryStream.h"
+
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <memory>
+#include <thread>
+
+namespace Gorgon { namespace WindowManager { 
+
+    ///@cond internal        
+    template<class T_>
+    std::shared_ptr<CopyFreeAny> make_clipboarddata(T_ data) {
+        return std::shared_ptr<CopyFreeAny>{new CopyFreeAny_impl<T_>(std::move(data))};            
+    }
+    std::vector<clipboardentry> clipboard_entries;
+    
+    std::vector<Atom> getclipboardformats() {
+        std::vector<Atom> ret;
+        
+        
+        ::Window owner=XGetSelectionOwner(display, XA_CLIPBOARD);
+        if(!owner)
+            return ret;
+        
+        auto windowhandle = getanywindow();
+        
+        if(windowhandle==0) {
+            return ret;
+        }
+        
+        //check if we own the clipboard
+        for(auto &w : Window::Windows) {
+            auto data=internal::getdata(w);
+            if(data && data->handle == owner) {
+                //we are the owner!
+                
+                //get the list from our own buffer and be done with it
+                for(auto &d : clipboard_entries) {
+                    ret.push_back(d.type);
+                }
+                
+                return ret;
+            }
+        }
+        
+        XEvent event;
+        
+        XConvertSelection (display, XA_CLIPBOARD, XA_TARGETS, XA_CP_PROP, windowhandle, CurrentTime);
+        XFlush(display);
+        
+        XIfEvent(display, &event, waitfor_selectionnotify, (char*)windowhandle);
+        
+        if(event.xselection.property == XA_CP_PROP) {
+            //process targets
+            Atom type;
+            unsigned long len, bytes, dummy;
+            unsigned char *data;
+            int format;
+
+            XGetWindowProperty(display, windowhandle, XA_CP_PROP, 0, 0, 0, XA_ATOM, &type, &format, &len, &bytes, &data);
+            
+            if(bytes) {
+                XGetWindowProperty (display, windowhandle, 
+                        XA_CP_PROP, 0,bytes,0,
+                        XA_ATOM, &type, &format,
+                        &len, &dummy, &data);
+                
+                Atom *atoms = (Atom*)data;
+                
+                for(int i=0;i<bytes/4;i++) {
+                    ret.push_back(atoms[i]);
+                }
+                
+                XFree(data);
+                XDeleteProperty(display, windowhandle, XA_CP_PROP);
+            }
+        }
+        
+        return ret;
+    }
+    
+    void handleselectionrequest(XEvent event) {
+        XEvent respond;
+        respond.xselection.property= 0;
+        
+        Atom proptoset;
+        proptoset = event.xselectionrequest.property==None ? WindowManager::XA_PRIMARY : event.xselectionrequest.property;
+        
+        if(event.xselectionrequest.selection==WindowManager::XA_CLIPBOARD) {
+            if(event.xselectionrequest.target==WindowManager::XA_TARGETS) {
+                std::vector<Atom> supported = {WindowManager::XA_TARGETS};
+                
+                for(auto &d : WindowManager::clipboard_entries) {
+                    supported.push_back(d.type);
+                }
+                
+                XChangeProperty (WindowManager::display,
+                    event.xselectionrequest.requestor,
+                    proptoset,
+                    WindowManager::XA_ATOM,
+                    32,
+                    PropModeReplace,
+                    (unsigned char *)(&supported[0]),
+                    supported.size()
+                );
+                respond.xselection.property=proptoset;
+            }
+            else {
+                WindowManager::clipboardentry *entry = nullptr;
+                for(auto &d : WindowManager::clipboard_entries) {
+                    if(d.type == event.xselectionrequest.target) {
+                        entry = &d;
+                    }
+                }
+                
+                if(entry) {
+                    if( entry->type == WindowManager::XA_STRING || 
+                        entry->type == WindowManager::XA_TEXT || 
+                        entry->type == WindowManager::XA_UTF8_STRING || 
+                        entry->type == WindowManager::XA_TEXT_HTML || 
+                        entry->type == WindowManager::XA_Filelist || 
+                        entry->type == WindowManager::XA_URL) 
+                    {
+                        std::string &str = entry->data->GetData<std::string>();
+                        
+                        XChangeProperty (WindowManager::display,
+                            event.xselectionrequest.requestor,
+                            proptoset,
+                            entry->type,
+                            8,
+                            PropModeReplace,
+                            (unsigned char*) &str[0],
+                            (int)str.length()
+                        );
+                        
+                        respond.xselection.property=proptoset;
+                    }
+                    else if(entry->type == WindowManager::XA_PNG) {
+                        Containers::Image &img = entry->data->GetData<Containers::Image>();
+                        
+                        std::vector<Byte> data;
+                        Encoding::Png.Encode(img, data);
+                        
+                        XChangeProperty (WindowManager::display,
+                            event.xselectionrequest.requestor,
+                            proptoset,
+                            entry->type,
+                            8,
+                            PropModeReplace,
+                            &data[0],
+                            (int)data.size()
+                        );
+                        
+                        respond.xselection.property=proptoset;
+                    }
+                    else if(entry->type == WindowManager::XA_JPG) {
+                        Containers::Image &img = entry->data->GetData<Containers::Image>();
+                        
+                        std::vector<Byte> data;
+                        Encoding::Jpg.Encode(img, data);
+                        
+                        XChangeProperty (WindowManager::display,
+                            event.xselectionrequest.requestor,
+                            proptoset,
+                            entry->type,
+                            8,
+                            PropModeReplace,
+                            &data[0],
+                            (int)data.size()
+                        );
+                        
+                        respond.xselection.property=proptoset;
+                    }
+                    else if(entry->type == WindowManager::XA_BMP) {
+                        Containers::Image &img = entry->data->GetData<Containers::Image>();
+                        
+                        std::ostringstream data;
+                        img.ExportBMP(data);
+                        
+                        XChangeProperty (WindowManager::display,
+                            event.xselectionrequest.requestor,
+                            proptoset,
+                            entry->type,
+                            8,
+                            PropModeReplace,
+                            (Byte*)&data.str()[0],
+                            (int)data.str().size()
+                        );
+                        
+                        respond.xselection.property=proptoset;
+                    }
+                }
+            }
+        }
+        
+        respond.xselection.type= SelectionNotify;
+        respond.xselection.display= event.xselectionrequest.display;
+        respond.xselection.requestor= event.xselectionrequest.requestor;
+        respond.xselection.selection=event.xselectionrequest.selection;
+        respond.xselection.target= event.xselectionrequest.target;
+        respond.xselection.time = event.xselectionrequest.time;
+        XSendEvent (WindowManager::display, event.xselectionrequest.requestor,0,0,&respond);
+        XFlush (WindowManager::display);        
+    }
+    
+    void handleclipboardevent(XEvent event) {
+        switch(event.type) {
+        case SelectionRequest: 
+            handleselectionrequest(event);
+        }
+    }
+    ///@endcond
+    
+    std::vector<Resource::GID::Type> GetClipboardFormats() {
+        std::vector<Resource::GID::Type> ret;
+        
+        auto list = getclipboardformats();
+                
+        for(auto atom : list) {
+            if(atom == XA_TEXT || atom == XA_STRING || atom == XA_UTF8_STRING)
+                Containers::PushBackUnique(ret, Resource::GID::Text);
+            else if(atom == XA_TEXT_HTML)
+                Containers::PushBackUnique(ret, Resource::GID::HTML);
+            else if(atom == XA_URL)
+                Containers::PushBackUnique(ret, Resource::GID::URL);
+            else if(atom == XA_PNG || atom == XA_JPG || atom == XA_BMP)
+                Containers::PushBackUnique(ret, Resource::GID::Image_Data);
+            else if(atom == XA_Filelist) {
+                Containers::PushBackUnique(ret, Resource::GID::FileList);
+                Containers::PushBackUnique(ret, Resource::GID::URIList);
+            }
+            else
+                ;//std::cout<<GetAtomName(atom)<<std::endl;
+        }
+        //std::cout<<std::endl;
+        
+        return ret;
+    }
+    
+    std::string GetClipboardText(Resource::GID::Type requesttype) {
+        ::Window owner=XGetSelectionOwner(display, XA_CLIPBOARD);
+        if(!owner)
+            return "";
+        
+        ::Window windowhandle = getanywindow();
+        if(windowhandle==0) {
+            return "";
+        }
+        
+        Atom request = 0;
+        
+        //fallback for text, rest is not that important, modern implementations support TARGETS
+        if(requesttype == Resource::GID::Text)
+            request = XA_TEXT;
+        
+        XEvent event;
+        
+        auto list = getclipboardformats();
+        for(auto atom : list) {
+            if(requesttype == Resource::GID::Text && atom == XA_UTF8_STRING)  {
+                request = XA_UTF8_STRING;
+                break; //perfect match no need to continue
+            }
+            else if(requesttype == Resource::GID::Text && atom == XA_STRING) {
+                request = XA_STRING;
+                //utf8 is better, search for it
+            }
+            else if(requesttype == Resource::GID::Text && atom == XA_TEXT && request != XA_STRING) {
+                request = XA_TEXT;
+                //utf8 is better, search for it
+            }
+            else if(requesttype == Resource::GID::HTML && atom == XA_TEXT_HTML) {
+                request = XA_TEXT_HTML;
+                break; //perfect match no need to continue
+            }
+            else if(requesttype == Resource::GID::URL && atom == XA_URL) {
+                request = XA_URL;
+                break; //perfect match no need to continue
+            }
+        }
+        
+        if(request == 0) return "";
+        
+        
+        //check if we own the clipboard
+        for(auto &w : Window::Windows) {
+            auto data=internal::getdata(w);
+            if(data && data->handle == owner) {
+                //we are the owner!
+                
+                //get the data from our own buffer and be done with it
+                for(auto &d : clipboard_entries) {
+                    if(d.type == request) {
+                        if( d.type == WindowManager::XA_STRING || 
+                            d.type == WindowManager::XA_TEXT || 
+                            d.type == WindowManager::XA_UTF8_STRING || 
+                            d.type == WindowManager::XA_TEXT_HTML || 
+                            d.type == WindowManager::XA_URL)
+                        {
+                            return d.data->GetData<std::string>();
+                        }
+                        else {
+                            return "";
+                        }
+                    }
+                }
+                
+                return "";
+            }
+        }
+        
+        XConvertSelection (display, XA_CLIPBOARD, request, XA_CP_PROP, windowhandle, CurrentTime);
+        XFlush(display);
+        
+        XIfEvent(display, &event, waitfor_selectionnotify, (char*)windowhandle);
+        if (event.xselection.property == XA_CP_PROP) {
+            Atom type;
+            unsigned long len, bytes, dummy;
+            unsigned char *data;
+            int format;
+
+            XGetWindowProperty(display, windowhandle, XA_CP_PROP, 0, 0, 0, AnyPropertyType, &type, &format, &len, &bytes, &data);
+            
+            if(bytes) {
+                XGetWindowProperty (display, windowhandle, 
+                        XA_CP_PROP, 0,bytes,0,
+                        AnyPropertyType, &type, &format,
+                        &len, &dummy, &data);
+                
+                std::string tmp((char*)data, bytes);
+                XFree(data);
+                XDeleteProperty(display, windowhandle, XA_CP_PROP);
+
+                return tmp;
+            }
+        }
+        
+        return "";
+    }
+
+    void SetClipboardText(const std::string &text, Resource::GID::Type type, bool unicode, bool append) {
+        ::Window windowhandle=getanywindow();
+        
+        if(!windowhandle) return;
+        
+        if(!append)
+            clipboard_entries.clear();
+
+        if(type == Resource::GID::Text) {
+            auto d = make_clipboarddata(text);
+            Containers::PushBackOrUpdate(clipboard_entries, clipboardentry{XA_TEXT, d});
+            Containers::PushBackOrUpdate(clipboard_entries, clipboardentry{XA_STRING, d});
+            
+            if(unicode) {
+                Containers::PushBackOrUpdate(clipboard_entries, clipboardentry{XA_UTF8_STRING, d});
+            }
+        }
+        else if(type == Resource::GID::HTML) {
+            auto d = make_clipboarddata(text);
+            Containers::PushBackOrUpdate(clipboard_entries, clipboardentry{XA_TEXT_HTML, d});
+        }
+        else if(type == Resource::GID::URL) {
+            auto d = make_clipboarddata(text);
+            Containers::PushBackOrUpdate(clipboard_entries, clipboardentry{XA_URL, d});
+        }
+        else {
+            return;
+        }
+        
+        XSetSelectionOwner(display, XA_CLIPBOARD, windowhandle, CurrentTime);
+        XFlush(display);
+    }
+    
+    std::vector<std::string> GetClipboardList(Resource::GID::Type requesttype) {
+        std::vector<std::string> ret;
+        
+        ::Window owner=XGetSelectionOwner(display, XA_CLIPBOARD);
+        if(!owner)
+            return ret;
+        
+        ::Window windowhandle = getanywindow();
+        if(windowhandle==0) {
+            return ret;
+        }
+        
+        Atom request = 0;
+        
+        XEvent event;
+        
+        auto list = getclipboardformats();
+        for(auto atom : list) {
+            if((requesttype == Resource::GID::FileList || requesttype == Resource::GID::URIList) && atom == XA_Filelist)  {
+                request = XA_Filelist;
+                break; //perfect match no need to continue
+            }
+        }
+        
+        if(request == 0) return ret;
+        
+        unsigned long len = 0, bytes = 0, dummy;
+        unsigned char *data = nullptr;
+        
+        //check if we own the clipboard
+        for(auto &w : Window::Windows) {
+            auto wdata=internal::getdata(w);
+            if(wdata && wdata->handle == owner) {
+                //we are the owner!
+                
+                //get the data from our own buffer and be done with it
+                for(auto &d : clipboard_entries) {
+                    if(d.type == request) {
+                        if( d.type == WindowManager::XA_Filelist ) {
+                            auto &str = d.data->GetData<std::string>();
+                            data = (unsigned char*)&str[0];
+                            len = str.length();
+                        }
+                    }
+                }
+                
+                if(!data) return ret;
+            }
+        }
+        
+        
+        if(!data) {
+            XConvertSelection (display, XA_CLIPBOARD, request, XA_CP_PROP, windowhandle, CurrentTime);
+            XFlush(display);
+            
+            XIfEvent(display, &event, waitfor_selectionnotify, (char*)windowhandle);
+        }
+        
+        if (data || event.xselection.property == XA_CP_PROP) {
+            Atom type;
+            int format;
+
+            if(!data)
+                XGetWindowProperty(display, windowhandle, XA_CP_PROP, 0, 0, 0, AnyPropertyType, &type, &format, &len, &bytes, &data);
+            
+            if(bytes) {
+                XGetWindowProperty (display, windowhandle, 
+                        XA_CP_PROP, 0,bytes,0,
+                        AnyPropertyType, &type, &format,
+                        &len, &dummy, &data);
+
+            }
+            if(data) {
+                int p=0;
+                for(int i=0;i<(int)len+1;i++) {
+                    if(i==(int)len || (char)data[i]=='\n') {
+                        if(i-p>1) {
+                            std::string s((char*)(data+p), (int)(i-p));
+                            if(requesttype == Resource::GID::FileList) {
+                                if(s.length()>6 && s.substr(0, 7)=="file://") 
+                                    s=s.substr(7);
+                                else
+                                    continue;
+                                
+                                if(s[s.length()-1]=='\r')
+                                    s.resize(s.length()-1);
+                            }
+                            else if(requesttype == Resource::GID::URIList) {
+                                if(s[s.length()-1]=='\r')
+                                    s.resize(s.length()-1);
+                            }
+                            
+                            ret.push_back(Encoding::URIDecode(s));
+                            p=i+1;
+                        }
+                    }
+                }
+                
+                if(bytes) {
+                    XFree(data);
+                    XDeleteProperty(display, windowhandle, XA_CP_PROP);
+                }
+
+                return ret;
+            }
+        }
+        
+        return ret;
+    }
+
+    void SetClipboardList(std::vector<std::string> list, Resource::GID::Type type, bool append) {
+        ::Window windowhandle=getanywindow();
+        
+        if(!windowhandle) return;
+        
+        if(!append)
+            clipboard_entries.clear();
+
+        if(type == Resource::GID::FileList) {
+            std::string txt;
+            
+            for(auto &e : list) {
+                if(!txt.empty())
+                    txt += "\n";
+                
+                txt = txt + "file://" + e;
+            }
+            
+            auto d = make_clipboarddata(std::move(txt));
+            Containers::PushBackOrUpdate(clipboard_entries, clipboardentry{XA_Filelist, d});
+            Containers::PushBackOrUpdate(clipboard_entries, clipboardentry{XA_UTF8_STRING, d});
+            Containers::PushBackOrUpdate(clipboard_entries, clipboardentry{XA_STRING, d});
+            Containers::PushBackOrUpdate(clipboard_entries, clipboardentry{XA_TEXT, d});
+            
+            XSetSelectionOwner(display, XA_CLIPBOARD, windowhandle, CurrentTime);
+            XFlush(display);
+        }
+        else if(type == Resource::GID::URIList) {
+            std::string txt;
+            
+            for(auto &e : list) {
+                if(!txt.empty())
+                    txt += "\n";
+                
+                txt = txt + e;
+            }
+            
+            auto d = make_clipboarddata(std::move(txt));
+            Containers::PushBackOrUpdate(clipboard_entries, clipboardentry{XA_Filelist, d});
+            Containers::PushBackOrUpdate(clipboard_entries, clipboardentry{XA_UTF8_STRING, d});
+            Containers::PushBackOrUpdate(clipboard_entries, clipboardentry{XA_STRING, d});
+            Containers::PushBackOrUpdate(clipboard_entries, clipboardentry{XA_TEXT, d});
+            
+            XSetSelectionOwner(display, XA_CLIPBOARD, windowhandle, CurrentTime);
+            XFlush(display);
+        }
+    }
+    
+    Containers::Image GetClipboardBitmap() {
+        Containers::Image ret;
+        
+        ::Window owner=XGetSelectionOwner(display, XA_CLIPBOARD);
+        if(!owner)
+            return ret;
+        
+        ::Window windowhandle = getanywindow();
+        if(windowhandle==0) {
+            return ret;
+        }
+        
+        //check if we own the clipboard
+        for(auto &w : Window::Windows) {
+            auto wdata=internal::getdata(w);
+            if(wdata && wdata->handle == owner) {
+                //we are the owner!
+                
+                //get the data from our own buffer and be done with it
+                for(auto &d : clipboard_entries) {
+                    if(d.type == XA_PNG || d.type == XA_BMP || d.type == XA_JPG) {
+                        auto &data = d.data->GetData<Containers::Image>();
+                        return data.Duplicate();
+                    }
+                }
+                
+                return ret;
+            }
+        }
+        
+        Atom request = 0;
+        
+        XEvent event;
+        
+        auto list = getclipboardformats();
+        for(auto atom : list) {
+            if(atom == XA_PNG)  { //best tı go for png, as most systems do not add alpha on other types
+                request = XA_PNG;
+                break; //perfect match no need to continue
+            }
+            else if(atom == XA_BMP) {
+                request = XA_BMP;
+            }
+            else if(request == 0 && atom == XA_JPG) {
+                request = XA_JPG;
+                //this is the worst case
+            }
+        }
+                    
+        XConvertSelection (display, XA_CLIPBOARD, request, XA_CP_PROP, windowhandle, CurrentTime);
+        XFlush(display);
+        
+        XIfEvent(display, &event, waitfor_selectionnotify, (char*)windowhandle);
+        if (event.xselection.property == XA_CP_PROP) {
+            Atom type;
+            unsigned long len, bytes, dummy;
+            unsigned char *data;
+            int format;
+
+            XGetWindowProperty(display, windowhandle, XA_CP_PROP, 0, (unsigned long)-1, 1, AnyPropertyType, &type, &format, &bytes, &dummy, &data);
+            bytes *= format/8;
+            
+            if(type == XA_INCR) {
+                std::vector<Byte> imgdata;
+                //std::cout<<"Starting INCR"<<std::endl;
+                unsigned long initsize = *(int32_t*)data;
+                
+                while(true) {                        
+                    while(XCheckIfEvent(display, &event, waitfor_cppropertynotify, (char*)windowhandle) == False) {
+                        XFlush(display);
+                        std::this_thread::yield();
+                    }
+                    
+                    XFlush(display);
+                    XGetWindowProperty(display, windowhandle, XA_CP_PROP, 0, (unsigned long)-1, 1, AnyPropertyType, &type, &format, &bytes, &dummy, &data);
+                    
+                    if(!bytes) {
+                        if(imgdata.size()<initsize)
+                            continue;
+                        else
+                            break;
+                    }
+                    
+                    if(type == 0)
+                        continue;
+                    
+                    bytes *= format/8;
+                    
+                    auto cur = imgdata.size();
+                    imgdata.resize(imgdata.size()+bytes);
+                    
+                    memcpy(&imgdata[cur], data, bytes);
+                    XFree(data);
+                }
+                //std::cout<<"INCR done: "<<imgdata.size()<<std::endl;
+                
+                if(request == XA_PNG) {
+                    Encoding::Png.Decode(imgdata, ret);
+                }
+                else if(request == XA_BMP) {
+                    IO::MemoryInputStream stream((char *)&imgdata[0], (char *)&imgdata[0]+imgdata.size());
+                    ret.ImportBMP(stream);
+                }
+                else if(request == XA_JPG) {
+                    Encoding::Jpg.Decode(imgdata, ret);
+                }
+                //std::cout<<"Decode done"<<std::endl;
+            }
+            else if(bytes) {					
+                if(request == XA_PNG) {
+                    Encoding::Png.Decode(data, bytes, ret);
+                }
+                else if(request == XA_BMP) {
+                    IO::MemoryInputStream stream((char *)data, (char *)data+bytes);
+                    ret.ImportBMP(stream);
+                }
+                else if(request == XA_JPG) {
+                    Encoding::Jpg.Decode(data, bytes, ret);
+                }
+                
+                XFree(data);
+            }
+        }
+        
+        return ret;
+    }
+    
+    void SetClipboardBitmap(Containers::Image img, bool append) {
+        ::Window windowhandle=getanywindow();
+        
+        if(!windowhandle) return;
+        
+        if(!append)
+            clipboard_entries.clear();
+
+        Graphics::ColorMode mode = img.GetMode();
+        
+        auto d = make_clipboarddata(std::move(img));
+        //believe or not BMPv5 is a better fit, allows alpha only images
+        Containers::PushBackOrUpdate(clipboard_entries, clipboardentry{XA_BMP, d}); 
+        Containers::PushBackOrUpdate(clipboard_entries, clipboardentry{XA_PNG, d});
+        if(!Graphics::HasAlpha(mode))
+            Containers::PushBackOrUpdate(clipboard_entries, clipboardentry{XA_JPG, d});
+        
+        XSetSelectionOwner(display, XA_CLIPBOARD, windowhandle, CurrentTime);
+        XFlush(display);
+    }
+
+} }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Source/Gorgon/WindowManager/X11/DnD.cpp	Fri Feb 21 17:02:44 2020 +0200
@@ -0,0 +1,337 @@
+
+#include "X11.h"
+
+
+#include "../../WindowManager.h"
+
+#include "../../Encoding/URI.h"
+
+namespace Gorgon { 
+    
+    class windaccess {
+    public:
+        windaccess(Window &wind) : wind(wind) { }
+        
+        auto &cursorover() { return wind.cursorover; }
+        
+        auto &mouselocation() { return wind.mouselocation; }
+        
+        Window &wind;
+    };
+    
+namespace WindowManager { 
+
+    void handledndenter(XEvent event, Window &wind) {
+        auto data = WindowManager::internal::getdata(wind);
+        
+        windaccess windp(wind);
+        
+        unsigned long len, bytes, dummy;
+        unsigned char *dat=NULL;
+        Atom type;
+        int format;
+        
+        data->xdnd.drop = false;
+        data->xdnd.requested = false;
+        
+        windp.cursorover() = true;
+        
+        std::vector<Atom> atoms;
+        
+        if(event.xclient.data.l[1] & 1) {
+            //get the length
+            XGetWindowProperty(WindowManager::display, event.xclient.data.l[0], 
+                            WindowManager::XdndTypeList, 0, 0, 0, AnyPropertyType, 
+                            &type, &format, &len, &bytes, &dat);
+            
+            //read the data
+            XGetWindowProperty(WindowManager::display, event.xclient.data.l[0], 
+                            WindowManager::XdndTypeList, 0,bytes,0,
+                            AnyPropertyType, &type, &format,
+                            &len, &dummy, &dat);
+    
+            Atom *atomlist=(Atom*)dat;
+            for(int i=0;i<(int)bytes/4;i++) {
+                if(atomlist[i] != None)
+                    atoms.push_back(atomlist[i]);
+            }
+        }
+        else {
+            for(int i=2; i<=4; i++)
+                if(event.xclient.data.l[i] != None)
+                    atoms.push_back(event.xclient.data.l[i]);
+        }
+        
+        for(auto atom : atoms) {
+            //std::cout<<WindowManager::GetAtomName(atom)<<std::endl;
+            
+            if(atom == WindowManager::XA_Filelist)
+                data->xdnd.filelist = true;
+            
+            if(atom == WindowManager::XA_UTF8_STRING)
+                data->xdnd.utf8 = true;
+            else if(atom == WindowManager::XA_STRING)
+                data->xdnd.string = true;
+        }
+        
+        data->xdnd.localpointer = wind.IsLocalPointer();
+        wind.SwitchToWMPointers();
+
+    }
+    
+    void handledndleave(XEvent, Window &wind) {
+        auto data = WindowManager::internal::getdata(wind);
+        
+        windaccess windp(wind);
+        
+        windp.cursorover() = true;
+
+        Input::CancelDrag();
+        if(data->xdnd.localpointer)
+            wind.SwitchToLocalPointers();
+    }
+    
+    void handlednddrop(XEvent event, Window &wind) {
+        auto data = WindowManager::internal::getdata(wind);
+        
+        windaccess windp(wind);
+        
+        data->xdnd.drop = 0;
+        
+        if(data->xdnd.filelist) {
+            XConvertSelection(WindowManager::display, WindowManager::XdndSelection, 
+                            WindowManager::XA_Filelist, WindowManager::XA_PRIMARY, 
+                            data->handle, event.xclient.data.l[2]);
+            
+            data->xdnd.drop++;
+        }
+        
+        if(data->xdnd.utf8 || data->xdnd.string) {
+            XConvertSelection(WindowManager::display, WindowManager::XdndSelection, 
+                            WindowManager::XA_STRING, 
+                            WindowManager::XA_PRIMARY, data->handle, event.xclient.data.l[2]);
+            
+            data->xdnd.drop++;
+        }
+    
+        if(data->xdnd.localpointer)
+            wind.SwitchToLocalPointers();
+    }
+    void handledndposition(XEvent event, Window &wind) {
+        auto data = WindowManager::internal::getdata(wind);
+        
+        XClientMessageEvent m;
+        memset(&m, sizeof(m), 0);
+        m.type = ClientMessage;
+        m.display = event.xclient.display;
+        m.window = event.xclient.data.l[0];
+        m.message_type = WindowManager::XdndStatus;
+        m.format=32;
+        m.data.l[0] = data->handle;
+        m.data.l[1] = data->xdnd.filelist || data->xdnd.utf8 || data->xdnd.string;
+        m.data.l[2] = 0;
+        m.data.l[3] = 0; 
+
+        if(!Input::IsDragging() || !Input::GetDragOperation().HasTarget()) { 
+            m.data.l[4] = None;
+        }
+        else {
+            auto &drag = Input::GetDragOperation();
+            
+            if(drag.HasData(Resource::GID::File)) {
+                auto &data=dynamic_cast<FileData&>(drag.GetData(Resource::GID::File));
+
+                if(data.Action==data.Move)
+                    m.data.l[4] = WindowManager::XdndActionMove;
+                else
+                    m.data.l[4] = WindowManager::XdndActionCopy;
+            }
+            else if(drag.HasData(Resource::GID::Text)) {
+                    m.data.l[4] = WindowManager::XdndActionCopy;
+            }
+            else {
+                m.data.l[4] = None;
+            }
+        }
+
+        XSendEvent(WindowManager::display, event.xclient.data.l[0], False, NoEventMask, (XEvent*)&m);
+
+        if(!Input::IsDragging()) {
+            if(data->xdnd.filelist) {
+                if(data->xdnd.requested || OS::GetEnvVar("XDG_CURRENT_DESKTOP") == "KDE") {
+                    auto &drag = Input::PrepareDrag();
+                    drag.AssumeData(*new FileData);
+                    Input::StartDrag();
+                    Input::GetDragOperation().MarkAsOS();
+                }
+                else {
+                    XConvertSelection(WindowManager::display, WindowManager::XdndSelection, 
+                                    WindowManager::XA_Filelist, WindowManager::XA_PRIMARY, 
+                                    data->handle, event.xclient.data.l[2]);
+                }
+            }
+            
+            if(data->xdnd.utf8 || data->xdnd.string) {
+                if(data->xdnd.requested || OS::GetEnvVar("XDG_CURRENT_DESKTOP") == "KDE") {
+                    auto &drag = Input::PrepareDrag();
+                    drag.AddTextData("");
+                    Input::StartDrag();
+                    Input::GetDragOperation().MarkAsOS();
+                }
+                else {
+                    XConvertSelection(WindowManager::display, WindowManager::XdndSelection, 
+                                    WindowManager::XA_STRING, WindowManager::XA_PRIMARY, 
+                                    data->handle, event.xclient.data.l[2]);
+                }
+            }
+            
+            data->xdnd.requested = true;
+
+        } 
+    }
+    
+    void handledndselectionnotify(XEvent event, Window &wind) {
+        auto data = WindowManager::internal::getdata(wind);
+        
+        windaccess windp(wind);
+        
+        if (event.xselection.property != (unsigned)None) {
+            if(data->xdnd.filelist) {
+                unsigned long len, bytes, dummy;
+                unsigned char *dat=NULL;
+                Atom type;
+                int format;
+                
+                FileData *dragdata = nullptr;
+                if(Input::IsDragging() && Input::GetDragOperation().HasData(Resource::GID::File)) {
+                    dragdata = dynamic_cast<FileData*>(&Input::GetDragOperation().GetData(Resource::GID::File));
+                }
+                else {
+                    dragdata = new FileData();
+                }
+                
+                bytes = 0;
+
+                if(event.xselection.property != None)
+                    XGetWindowProperty(WindowManager::display, data->handle, event.xselection.property, 0, 0, 0, AnyPropertyType, &type, &format, &len, &bytes, &dat);
+
+                if(bytes) {
+                    XGetWindowProperty(WindowManager::display, data->handle, 
+                            event.xselection.property, 0,bytes,0,
+                            AnyPropertyType, &type, &format,
+                            &len, &dummy, &dat);
+                    
+                    
+                    dragdata->Clear();
+                    
+                    int p=0;
+                    for(int i=0;i<(int)len+1;i++) {
+                        if(i==(int)len || (char)dat[i]=='\n') {
+                            if(i-p>1) {
+                                std::string s((char*)(dat+p), (int)(i-p));
+                                if(s.length()>6 && s.substr(0, 7)=="file://") 
+                                    s=s.substr(7);
+                                if(s[s.length()-1]=='\r')
+                                    s.resize(s.length()-1);
+                                
+                                dragdata->AddFile(Encoding::URIDecode(s));
+                                p=i+1;
+                            }
+                        }
+                    }
+                    
+                    XFree(dat);
+                    XDeleteProperty(WindowManager::display, data->handle, event.xselection.property);
+
+                    if(!Input::IsDragging()) {
+                        auto &drag = Input::PrepareDrag();
+                        drag.AssumeData(*dragdata);
+                        Input::StartDrag();
+                        Input::GetDragOperation().MarkAsOS();
+                        Input::GetDragOperation().DataReady();
+                    }
+                    else if(!Input::GetDragOperation().HasData(Resource::GID::File)) {
+                        auto &drag = Input::GetDragOperation();
+                        drag.AssumeData(*dragdata);
+                        Input::GetDragOperation().DataReady();
+                    }
+                    else if(!Input::IsDragging() || !Input::GetDragOperation().HasData(Resource::GID::File)) {
+                        delete dragdata;
+                    }
+                    else {
+                        Input::GetDragOperation().DataReady();
+                    }
+                }
+            }
+            else if(data->xdnd.utf8 || data->xdnd.string) {
+                Atom type;
+                unsigned long len, bytes, dummy;
+                unsigned char *dat;
+                int format;
+            
+                XGetWindowProperty(WindowManager::display, data->handle, event.xselection.property, 0, 0, 0, AnyPropertyType, &type, &format, &len, &bytes, &dat);
+
+                if(bytes) {
+                    XGetWindowProperty (WindowManager::display, data->handle, 
+                            event.xselection.property, 0,bytes,0,
+                            AnyPropertyType, &type, &format,
+                            &len, &dummy, &dat);
+                    
+                    std::string tmp((char*)dat, bytes);
+                    
+                    XFree(dat);
+                    XDeleteProperty(WindowManager::display, data->handle, event.xselection.property);
+                    
+                    if(Input::IsDragging() && Input::GetDragOperation().HasData(Resource::GID::Text)) {
+                        auto &dragdata = dynamic_cast<TextData&>(Input::GetDragOperation().GetData(Resource::GID::Text));
+                        dragdata.SetText(tmp);
+                        Input::GetDragOperation().DataReady();
+                    }
+                    else {
+                        if(Input::IsDragging()) {
+                            Input::GetDragOperation().AddTextData(tmp);
+                            Input::GetDragOperation().DataReady();
+                        }
+                        else {
+                            Input::BeginDrag(tmp);
+                            Input::GetDragOperation().MarkAsOS();
+                            Input::GetDragOperation().DataReady();
+                        }
+                    }
+                }
+            }
+        }
+        if(data->xdnd.drop == 1) {
+            Input::Drop(windp.mouselocation());
+            data->xdnd = decltype(data->xdnd)();
+        }
+        else if(data->xdnd.drop)
+            data->xdnd.drop--;
+    }
+    
+    void handledndevent(XEvent event, Window &wind) {
+        switch(event.type) {
+            case ClientMessage:
+                if(event.xclient.message_type==WindowManager::XdndEnter) {
+                    handledndenter(event, wind);
+                }
+                else if(event.xclient.message_type==WindowManager::XdndPosition) {
+                    handledndposition(event, wind);
+                }
+                else if(event.xclient.message_type==WindowManager::XdndLeave) {
+                    handledndleave(event, wind);
+                }
+                else if(event.xclient.message_type==WindowManager::XdndDrop) {
+                    handlednddrop(event, wind);
+                }
+                
+                break;
+                
+            case SelectionNotify:
+                handledndselectionnotify(event, wind);
+                
+                break;
+        }
+    }
+    
+} }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Source/Gorgon/WindowManager/X11/Input.cpp	Fri Feb 21 17:02:44 2020 +0200
@@ -0,0 +1,461 @@
+#include "X11.h"
+#include "X11Keysym.h"
+
+
+long keysym2ucs(KeySym keysym)
+{
+    int min = 0;
+    int max = sizeof(keysymtab) / sizeof(struct codepair) - 1;
+    int mid;
+
+    /* first check for Latin-1 characters (1:1 mapping) */
+    if ((keysym >= 0x0020 && keysym <= 0x007e) ||
+        (keysym >= 0x00a0 && keysym <= 0x00ff))
+        return keysym;
+
+    /* also check for directly encoded 24-bit UCS characters */
+    if ((keysym & 0xff000000) == 0x01000000)
+        return keysym & 0x00ffffff;
+
+    /* binary search in table */
+    while (max >= min) {
+        mid = (min + max) / 2;
+        if (keysymtab[mid].keysym < keysym)
+            min = mid + 1;
+        else if (keysymtab[mid].keysym > keysym)
+            max = mid - 1;
+        else {
+            /* found it */
+            return keysymtab[mid].ucs;
+        }
+    }
+
+    /* no matching Unicode value found */
+    return 0xfffd;
+}
+
+namespace Gorgon { namespace WindowManager {
+    
+
+    std::string osgetkeyname(Input::Keyboard::Key key) {
+        int keycount;
+        
+        KeySym *keys = XGetKeyboardMapping(display,
+            key,
+            1,
+            &keycount
+        );
+        
+        if(keycount < 1) return "";
+        
+        KeySym keysym;
+        
+        if(keycount > 1) keysym = keys[1]; //capital key
+        else keysym = keys[0];
+        
+        
+        XFree(keys);
+        
+        std::string ret;
+        Char c = keysym2ucs(keysym);
+        String::AppendUnicode(ret, c);
+        
+        return ret;
+    }
+    
+    Input::Mouse::Button buttonfromx11(unsigned btn) {
+        using Input::Mouse::Button;
+        switch(btn) {
+        case 1:
+            return Button::Left;
+        case 2:
+            return Button::Middle;
+        case 3:
+            return Button::Right;
+        case 8:
+            return Button::X1;
+        case 9:
+            return Button::X2;
+        default:
+            return Button::None;
+        }
+    }
+    
+    Input::Keyboard::Key mapx11key(KeySym key, unsigned int keycode) {
+        if(key == 'i') {
+            int keycount;
+            
+            KeySym *keys = XGetKeyboardMapping(WindowManager::display,
+                keycode,
+                1,
+                &keycount
+            );
+            
+            if(keycount < 2) return 'I';
+            
+            KeySym keysym;
+            
+            keysym = keys[1]; //capital key
+            
+            if(keysym != 'I')
+                return keycode + Input::Keyboard::Keycodes::OSTransport;
+        }
+        
+        if(key >= 'a' && key <='z')
+            return key + ('A' - 'a');
+        
+        if(key >= '0' && key <='9')
+            return key;
+        
+        if(key >= 'A' && key <='Z')
+            return key;
+        
+        switch(key) {
+            case XK_Shift_L:
+                return Input::Keyboard::Keycodes::Shift;
+            case XK_Shift_R:
+                return Input::Keyboard::Keycodes::RShift;
+            case XK_Control_L:
+                return Input::Keyboard::Keycodes::Control;
+            case XK_Control_R:
+                return Input::Keyboard::Keycodes::RControl;
+            case XK_Alt_L:
+                return Input::Keyboard::Keycodes::Alt;
+            case XK_Alt_R:
+                return Input::Keyboard::Keycodes::RAlt;
+            case XK_Super_L:
+                return Input::Keyboard::Keycodes::Meta;
+            case XK_Super_R:
+                return Input::Keyboard::Keycodes::RMeta;
+                
+            case XK_Home:
+                return Input::Keyboard::Keycodes::Home;
+            case XK_End:
+                return Input::Keyboard::Keycodes::End;
+            case XK_Insert:
+                return Input::Keyboard::Keycodes::Insert;
+            case XK_Delete:
+                return Input::Keyboard::Keycodes::Delete;
+            case XK_Prior:
+                return Input::Keyboard::Keycodes::PageUp;
+            case XK_Next:
+                return Input::Keyboard::Keycodes::PageDown;
+
+            case XK_Print:
+                return Input::Keyboard::Keycodes::PrintScreen;
+            case XK_Pause:
+                return Input::Keyboard::Keycodes::Pause;
+
+            case XK_Menu:
+                return Input::Keyboard::Keycodes::Menu;
+
+            case XK_Caps_Lock:
+                return Input::Keyboard::Keycodes::CapsLock;
+            case XK_Num_Lock:
+                return Input::Keyboard::Keycodes::Numlock;
+            case XK_Scroll_Lock:
+                return Input::Keyboard::Keycodes::ScrollLock;
+
+            case XK_Return:
+                return Input::Keyboard::Keycodes::Enter;
+            case XK_Tab:
+                return Input::Keyboard::Keycodes::Tab;
+            case XK_BackSpace:
+                return Input::Keyboard::Keycodes::Backspace;
+            case XK_space:
+                return Input::Keyboard::Keycodes::Space;
+            case XK_Escape:
+                return Input::Keyboard::Keycodes::Escape;
+
+            case XK_Left:
+                return Input::Keyboard::Keycodes::Left;
+            case XK_Up:
+                return Input::Keyboard::Keycodes::Up;
+            case XK_Right:
+                return Input::Keyboard::Keycodes::Right;
+            case XK_Down:
+                return Input::Keyboard::Keycodes::Down;
+
+            case XK_F1:
+                return Input::Keyboard::Keycodes::F1;
+            case XK_F2:
+                return Input::Keyboard::Keycodes::F2;
+            case XK_F3:
+                return Input::Keyboard::Keycodes::F3;
+            case XK_F4:
+                return Input::Keyboard::Keycodes::F4;
+            case XK_F5:
+                return Input::Keyboard::Keycodes::F5;
+            case XK_F6:
+                return Input::Keyboard::Keycodes::F6;
+            case XK_F7:
+                return Input::Keyboard::Keycodes::F7;
+            case XK_F8:
+                return Input::Keyboard::Keycodes::F8;
+            case XK_F9:
+                return Input::Keyboard::Keycodes::F9;
+            case XK_F10:
+                return Input::Keyboard::Keycodes::F10;
+            case XK_F11:
+                return Input::Keyboard::Keycodes::F11;
+            case XK_F12:
+                return Input::Keyboard::Keycodes::F12;
+
+
+            case XK_KP_0:
+            case XK_KP_Insert:
+                return Input::Keyboard::Keycodes::Numpad_0;
+            case XK_KP_1:
+            case XK_KP_End:
+                return Input::Keyboard::Keycodes::Numpad_1;
+            case XK_KP_2:
+            case XK_KP_Down:
+                return Input::Keyboard::Keycodes::Numpad_2;
+            case XK_KP_3:
+            case XK_KP_Next:
+                return Input::Keyboard::Keycodes::Numpad_3;
+            case XK_KP_4:
+            case XK_KP_Left:
+                return Input::Keyboard::Keycodes::Numpad_4;
+            case XK_KP_5:
+            case XK_KP_Begin:
+                return Input::Keyboard::Keycodes::Numpad_5;
+            case XK_KP_6:
+            case XK_KP_Right:
+                return Input::Keyboard::Keycodes::Numpad_6;
+            case XK_KP_7:
+            case XK_KP_Home:
+                return Input::Keyboard::Keycodes::Numpad_7;
+            case XK_KP_8:
+            case XK_KP_Up:
+                return Input::Keyboard::Keycodes::Numpad_8;
+            case XK_KP_9:
+            case XK_KP_Prior:
+                return Input::Keyboard::Keycodes::Numpad_9;
+            case XK_KP_Decimal:
+                return Input::Keyboard::Keycodes::Numpad_Decimal;
+            case XK_KP_Divide:
+                return Input::Keyboard::Keycodes::Numpad_Div;
+            case XK_KP_Multiply:
+                return Input::Keyboard::Keycodes::Numpad_Mult;
+            case XK_KP_Enter:
+                return Input::Keyboard::Keycodes::Numpad_Enter;
+            case XK_KP_Add:
+                return Input::Keyboard::Keycodes::Numpad_Plus;
+            case XK_KP_Subtract:
+                return Input::Keyboard::Keycodes::Numpad_Minus;
+        }
+        return keycode + Input::Keyboard::Keycodes::OSTransport;
+    }
+    
+    void assertkeys(Window &wind, Gorgon::internal::windowdata *data) {
+        char keys[32];
+        XQueryKeymap(WindowManager::display, keys);
+        
+        for(auto it=data->pressed.begin(); it!=data->pressed.end(); ++it) {
+            auto key = *it;
+            KeyCode kc = XKeysymToKeycode(WindowManager::display, key);
+            if((keys[kc >> 3] & (1 << (kc & 7))) == 0) {
+                auto ggekey = mapx11key(key, kc);
+                it = data->pressed.erase(it);
+                
+                //modifiers
+                switch(key) {
+                    case XK_Shift_L:
+                    case XK_Shift_R:
+                        Input::Keyboard::CurrentModifier.Remove(Input::Keyboard::Modifier::Shift);
+                        break;
+                        
+                    case XK_Control_L:
+                    case XK_Control_R:
+                        Input::Keyboard::CurrentModifier.Remove(Input::Keyboard::Modifier::Ctrl);
+                        break;
+                        
+                    case XK_Alt_L:
+                        Input::Keyboard::CurrentModifier.Remove(Input::Keyboard::Modifier::Alt);
+                        break;
+                        
+                    case XK_Alt_R:
+                        Input::Keyboard::CurrentModifier.Remove(Input::Keyboard::Modifier::Alt);
+                        break;
+                        
+                    case XK_Super_L:
+                    case XK_Super_R:
+                        Input::Keyboard::CurrentModifier.Remove(Input::Keyboard::Modifier::Meta);
+                        break;
+                }
+                
+                
+                if(data->handlers.count(ggekey)>0 && data->handlers[ggekey] != wind.KeyEvent.EmptyToken) {
+                    wind.KeyEvent.FireFor(data->handlers[ggekey], ggekey, 0.f);
+                    data->handlers[ggekey] = wind.KeyEvent.EmptyToken;
+                }
+                else {
+                    wind.KeyEvent(ggekey, 0.f);
+                }
+            }
+        }
+    }
+        
+    void handlekeypressevent(XEvent event, Window &wind) { 
+        auto key=XLookupKeysym(&event.xkey,0);
+        auto data = WindowManager::internal::getdata(wind);
+        
+        data->pressed.insert(key);
+        
+        //modifiers
+        switch(key) {
+            case XK_Shift_L:
+            case XK_Shift_R:
+                Input::Keyboard::CurrentModifier.Add(Input::Keyboard::Modifier::Shift);
+                break;
+                
+            case XK_Control_L:
+            case XK_Control_R:
+                Input::Keyboard::CurrentModifier.Add(Input::Keyboard::Modifier::Ctrl);
+                break;
+                
+            case XK_Alt_L:
+                Input::Keyboard::CurrentModifier.Add(Input::Keyboard::Modifier::Alt);
+                break;
+                
+            case XK_Alt_R:
+                Input::Keyboard::CurrentModifier.Add(Input::Keyboard::Modifier::Alt);
+                break;
+                
+            case XK_Super_L:
+            case XK_Super_R:
+                Input::Keyboard::CurrentModifier.Add(Input::Keyboard::Modifier::Meta);
+                break;
+        }
+        auto ggekey = WindowManager::mapx11key(key, event.xkey.keycode);
+        auto token = wind.KeyEvent(ggekey, true);
+        if(token != wind.KeyEvent.EmptyToken) {
+            data->handlers[ggekey]=token;
+            
+            return;
+        }
+        
+        if(!Input::Keyboard::CurrentModifier.IsModified()) {
+            XLookupString(&event.xkey, nullptr, 0, &key, nullptr); //append shift and other mods                    
+            Input::Keyboard::Char c = keysym2ucs(key);
+            
+            if(c != 0xfffd) {
+                if( (c>=0x20 || c == '\t' || c ==13) && (c < 0x7f || c > 0x9f)) { //exclude c0 & c1 but keep tab
+                    wind.CharacterEvent(c);
+                }
+            }
+        }
+    }
+    
+    void handlekeyreleaseevent(XEvent event, Window &wind) {
+        auto key=XLookupKeysym(&event.xkey,0);
+        auto data = WindowManager::internal::getdata(wind);
+            
+        auto ggekey = WindowManager::mapx11key(key, event.xkey.keycode);
+            
+        if(XEventsQueued(WindowManager::display, QueuedAfterReading)) {
+            XEvent nextevent;
+            XPeekEvent(WindowManager::display, &nextevent);
+            
+            if(nextevent.type == KeyPress && nextevent.xkey.time == event.xkey.time && 
+                nextevent.xkey.keycode == event.xkey.keycode
+            ) {
+                
+                if(data->handlers.count(ggekey)>0 && data->handlers[ggekey] != wind.KeyEvent.EmptyToken) {
+                    //if keypress handled, key will not be repeated.
+                    //what about backspace, arrow keys and delete?
+                }
+                else if(!Input::Keyboard::CurrentModifier.IsModified()) {
+                    XLookupString(&event.xkey, nullptr, 0, &key, nullptr);
+                    Input::Keyboard::Char c = keysym2ucs(key);
+                    
+                    if(c != 0xfffd) {
+                        if( (c>=0x20 || c == '\t' || c =='\n') && (c < 0x7f || c > 0x9f)) { //exclude c0 & c1 but keep enter and tab
+                            wind.CharacterEvent(c);
+                        }
+                    }
+                }
+        
+                XNextEvent(WindowManager::display, &nextevent);
+                return;
+            }
+        }
+        
+        data->pressed.erase(key);
+        
+        //modifiers
+        switch(key) {
+            case XK_Shift_L:
+            case XK_Shift_R:
+                Input::Keyboard::CurrentModifier.Remove(Input::Keyboard::Modifier::Shift);
+                break;
+                
+            case XK_Control_L:
+            case XK_Control_R:
+                Input::Keyboard::CurrentModifier.Remove(Input::Keyboard::Modifier::Ctrl);
+                break;
+                
+            case XK_Alt_L:
+                Input::Keyboard::CurrentModifier.Remove(Input::Keyboard::Modifier::Alt);
+                break;
+                
+            case XK_Alt_R:
+                Input::Keyboard::CurrentModifier.Remove(Input::Keyboard::Modifier::Alt);
+                break;
+                
+            case XK_Super_L:
+            case XK_Super_R:
+                Input::Keyboard::CurrentModifier.Remove(Input::Keyboard::Modifier::Meta);
+                break;
+        }
+        
+        
+        if(data->handlers.count(ggekey)>0 && data->handlers[ggekey] != wind.KeyEvent.EmptyToken) {
+            wind.KeyEvent.FireFor(data->handlers[ggekey], ggekey, 0.f);
+            data->handlers[ggekey] = wind.KeyEvent.EmptyToken;
+        }
+        else {
+            wind.KeyEvent(ggekey, 0.f);
+        }
+                
+    }
+    
+    void handlebuttonpressevent(XEvent event, Window &wind) {
+        if(event.xbutton.button==4) {
+            wind.mouse_event(Input::Mouse::EventType::Scroll_Vert, {event.xbutton.x, event.xbutton.y}, WindowManager::buttonfromx11(event.xbutton.button), 1);
+        }
+        else if(event.xbutton.button==5) {
+            wind.mouse_event(Input::Mouse::EventType::Scroll_Vert, {event.xbutton.x, event.xbutton.y}, WindowManager::buttonfromx11(event.xbutton.button), -1);
+        }
+        else {
+            wind.mouse_down({event.xbutton.x, event.xbutton.y}, WindowManager::buttonfromx11(event.xbutton.button));
+        }
+    }
+    
+    void handlebuttonreleaseevent(XEvent event, Window &wind) {
+        if(event.xbutton.button!=4 && event.xbutton.button!=5) {
+            wind.mouse_up({event.xbutton.x, event.xbutton.y}, WindowManager::buttonfromx11(event.xbutton.button));
+        }
+    }
+    
+    void handleinputevent(XEvent event, Window &wind) {
+        switch(event.type) {
+        case KeyPress:
+            handlekeypressevent(event, wind);
+            break;
+        
+        case KeyRelease:
+            handlekeyreleaseevent(event, wind);
+            break;
+            
+        case ButtonPress:
+            handlebuttonpressevent(event, wind);
+            break;
+            
+        case ButtonRelease:
+            handlebuttonreleaseevent(event, wind);
+            break;
+        }
+    }
+} }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Source/Gorgon/WindowManager/X11/Monitor.cpp	Fri Feb 21 17:02:44 2020 +0200
@@ -0,0 +1,186 @@
+#include "X11.h"
+
+#include <X11/extensions/Xinerama.h>
+#include <X11/extensions/Xrandr.h>
+
+namespace Gorgon { namespace WindowManager {
+
+        
+    namespace internal {
+        struct monitordata {
+            int index = -1;
+            RROutput out = 0;
+            
+            ~monitordata() {
+            }
+        };
+    }
+        
+    Monitor::Monitor() {
+        data = new internal::monitordata;
+    }
+    
+    Monitor::~Monitor() {
+        delete data;
+    }
+    
+    void addpadding(const Monitor *monitor, int l, int t, int r, int b) {
+        Monitor *mon = nullptr;
+        
+        for(auto &mon2 : Monitor::monitors) {
+            if(&mon2 == monitor)
+                mon = &mon2;
+        }
+        
+        if(mon) {
+            mon->usable.Left  += l;
+            mon->usable.Top   += t;
+            mon->usable.Right -= r;
+            mon->usable.Bottom-= b;
+        }
+    }
+
+    static void fixmonitorworkarea(int parent = 0, int x = 0, int y = 0) {
+        ::Window* children, w;
+        
+        unsigned int child_count;
+        
+        if(parent == 0)
+            parent=XDefaultRootWindow(display);
+
+        XQueryTree(display, parent, &w, &w, &children, &child_count);
+        
+        for(int i=0; i<child_count; i++) {
+            Atom actual_type;
+            int actual_format;
+            unsigned long item_count;
+            unsigned long bytes_left;
+            Byte *data;
+            
+            XWindowAttributes xwa;
+            XGetWindowAttributes(display, children[i], &xwa);
+            
+            int status = XGetWindowProperty(
+                display, children[i], XA_STRUT, 
+                0, 12 * 4, 0,
+                XA_CARDINAL, &actual_type, &actual_format,
+                &item_count, &bytes_left, &data
+            );
+            
+            if(status == Success && item_count) {
+                long *cardinals=reinterpret_cast<long*>(data);
+                
+                auto monitor = Monitor::FromLocation({int(x+xwa.x), int(y+xwa.y)});
+                
+                if(monitor) {
+                    addpadding(monitor, cardinals[0], cardinals[2], cardinals[1], cardinals[3]);
+                }
+                
+                XFree(data);
+            }
+            
+            fixmonitorworkarea(children[i], x+xwa.x, y+xwa.y);
+        }
+    }
+    
+    void Monitor::Refresh(bool force) {
+        //check if change is needed or forced
+        
+        monitors.Destroy();
+        Monitor::primary=nullptr;
+        
+        if(xrandr) {
+            auto root=XDefaultRootWindow(display);
+            XRRScreenResources* sr = XRRGetScreenResources(display, root);
+            RROutput primary = XRRGetOutputPrimary(display, root);
+            
+            if(!sr) {
+                goto failsafe;
+            }
+            
+            XRRCrtcInfo*   ci = nullptr;
+            XRROutputInfo* oi = nullptr;
+            int ind = 0;
+            try {
+                for(int i=0; i<sr->ncrtc; i++) {
+                    ci = XRRGetCrtcInfo(display, sr, sr->crtcs[i]);
+                    
+                    for(int j=0; j<ci->noutput; j++) {
+                        oi = XRRGetOutputInfo(display, sr, ci->outputs[j]);
+                        
+                        if(oi->connection==0) {
+                            auto monitor=new Monitor();
+                            monitor->data->index=ind++;
+                            monitor->data->out=ci->outputs[j];
+                            monitor->area={(int)ci->x, (int)ci->y, (int)ci->width, (int)ci->height};
+                            monitor->usable = monitor->area;
+                            monitor->isprimary=(ci->outputs[j]==primary);
+                            if(monitor->IsPrimary()) Monitor::primary=monitor;
+                            monitor->name=oi->name;
+                            if(monitor->IsPrimary())
+                                monitors.Insert(monitor, 0);
+                            else
+                                monitors.Add(monitor);
+                        }
+                        
+                        XRRFreeOutputInfo(oi);
+                        oi=nullptr;
+                    }
+                    
+                    XRRFreeCrtcInfo(ci);
+                    ci=nullptr;
+                }
+            }
+            catch(...) {
+                XRRFreeScreenResources(sr);
+                if(ci) {
+                    XRRFreeCrtcInfo(ci);
+                }
+                if(oi) {
+                    XRRFreeOutputInfo(oi);
+                }
+                throw;
+            }
+            
+            XRRFreeScreenResources(sr);
+            
+            if(monitors.GetCount()) {
+                if(Monitor::primary==nullptr) {
+                    Monitor::primary=monitors.First().CurrentPtr();
+                }
+                
+                fixmonitorworkarea();
+                return;
+            }
+        }
+        
+failsafe: //this should use X11 screen as monitor
+        Geometry::Rectangle rect;
+        rect.X=0;
+        rect.Y=0;
+        
+        Screen  *screen  = XScreenOfDisplay(display, 0);
+        rect.Width       = XWidthOfScreen(screen);
+        rect.Height      = XHeightOfScreen(screen);
+        
+        auto &monitor = *new Monitor();
+        monitors.Add(monitor);
+        
+        monitor.name = "Default";
+        monitor.data->index = -1;
+        monitor.data->out   = -1;
+        monitor.area = rect;
+        monitor.usable = rect;
+        
+        Monitor::primary = &monitor;
+        fixmonitorworkarea();
+    }
+    
+    bool Monitor::IsChangeEventSupported() {
+        return false;//xrandr;
+    }
+
+    Event<> Monitor::ChangedEvent;
+    Containers::Collection<Monitor> Monitor::monitors;
+    Monitor *Monitor::primary=nullptr;    
+} }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Source/Gorgon/WindowManager/X11/Window.cpp	Fri Feb 21 17:02:44 2020 +0200
@@ -0,0 +1,789 @@
+#include "X11.h"
+#include <thread>
+
+#include "../../WindowManager.h"
+#include "../../Window.h"
+#include "../../Graphics/Layer.h"
+#include "../../Encoding/URI.h"
+#include "X11Keysym.h"
+
+
+namespace Gorgon { namespace WindowManager {
+
+namespace internal {
+    
+    Gorgon::internal::windowdata *getdata(const Window &w) {
+        return w.data;
+    }
+    
+}
+    
+    ::Window getanywindow() {
+        ::Window windowhandle=0;
+        for(auto &w : Window::Windows) {
+            auto data=internal::getdata(w);
+            if(data && data->handle) {
+                windowhandle=data->handle;
+                break;
+            }
+        }
+        
+        //TODO: if 0 try creating an unmapped window
+        
+        if(windowhandle==0) {   
+#ifdef NDEBUG
+            return windowhandle;
+#else
+            throw std::runtime_error("Cannot copy without a window, if necessary create a hidden window");
+#endif
+        }
+        
+        return windowhandle;
+    }
+
+    
+} 
+    
+    Window::Window(const WindowManager::Monitor &monitor, Geometry::Rectangle rect, const std::string &name, const std::string &title, bool allowresize, bool visible) : 
+    data(new internal::windowdata) {
+        
+        this->name = name;
+        this->allowresize = allowresize;
+        pointerlayer = new Graphics::Layer;
+        Add(pointerlayer);
+
+#ifndef NDEBUG
+        ASSERT(WindowManager::display, "Window manager system is not initialized.");
+#endif
+        
+        windows.Add(this);
+        
+        //using defaults
+        int screen = DefaultScreen(WindowManager::display);
+        int depth  = DefaultDepth(WindowManager::display,screen);
+        
+        //adjust atrributes
+        XSetWindowAttributes attributes;
+        
+        attributes.event_mask = 
+                    StructureNotifyMask |    //move resize
+                    KeyPressMask |           //keyboard
+                    KeyReleaseMask |
+                    ButtonPressMask |        //mouse
+                    ButtonReleaseMask|    
+                    FocusChangeMask|         //activate/deactivate
+                    EnterWindowMask |
+                    LeaveWindowMask |
+                    PropertyChangeMask |
+                    OwnerGrabButtonMask |
+                    
+                    SubstructureRedirectMask //??
+        ;
+        
+        bool autoplaced=false;
+        if(rect.TopLeft()==automaticplacement) {
+            rect.Move( (monitor.GetUsable()-rect.GetSize()).Center() );
+            autoplaced=true;
+        }
+        
+        auto rootwin=XRootWindow(WindowManager::display,screen);
+        
+        data->handle = XCreateWindow(WindowManager::display, 
+            rootwin,
+            rect.X,rect.Y, rect.Width,rect.Height,
+            0, depth, InputOutput, 
+            WindowManager::visual, CWEventMask, &attributes
+        );
+        
+        XClassHint *classhint=XAllocClassHint();
+        classhint->res_name=(char*)malloc(name.length()+1);
+        strcpy(classhint->res_name, name.c_str());
+        classhint->res_class=(char*)malloc(name.length()+1);
+        strcpy(classhint->res_class, name.c_str());
+        XSetClassHint(WindowManager::display, data->handle, classhint);
+        XFree(classhint);
+    
+        XStoreName(WindowManager::display, data->handle, (char*)title.c_str());
+        
+        if(!allowresize) {
+            XSizeHints *sizehints=XAllocSizeHints();
+            sizehints->min_width=rect.Width;
+            sizehints->max_width=rect.Width;
+            sizehints->min_height=rect.Height;
+            sizehints->max_height=rect.Height;
+            sizehints->flags=PMinSize | PMaxSize | PWinGravity;
+            if(autoplaced)
+                sizehints->win_gravity = CenterGravity;
+            
+            XSetWMNormalHints(WindowManager::display, data->handle, sizehints);		
+            XFree(sizehints);
+        }
+        
+        XSetWMProtocols(WindowManager::display, data->handle, &WindowManager::WM_DELETE_WINDOW, 1);
+        
+        if(visible) {
+            XEvent event;
+            
+            XFlush(WindowManager::display);
+            
+            XMapWindow(WindowManager::display,data->handle);
+            XIfEvent(WindowManager::display, &event, &WindowManager::waitfor_mapnotify, (char*)data->handle);
+            
+            XMoveWindow(WindowManager::display, data->handle, rect.X, rect.Y);
+    
+            if(autoplaced) {
+                XFlush(WindowManager::display);
+                
+                std::this_thread::sleep_for(std::chrono::milliseconds(10)); //wait for a short time to ensure window frame is ready.
+                
+                auto borders = WindowManager::GetX4Prop<Geometry::Margin>(WindowManager::XA_NET_FRAME_EXTENTS, data->handle, {0,0,0,0});
+                std::swap(borders.Top, borders.Right);
+                rect.Move( (monitor.GetUsable()-(rect.GetSize()+borders.Total())).Center() );
+            }
+            
+            XMoveWindow(WindowManager::display, data->handle, rect.X, rect.Y);
+            
+            XFlush(WindowManager::display);			
+        }
+        else {
+            data->move=true;
+            data->moveto=rect.TopLeft();
+        }
+        
+        data->ismapped=visible;
+        
+        Layer::Resize(rect.GetSize());
+        data->ppoint=rect.TopLeft();
+
+        createglcontext();
+        glsize = rect.GetSize();
+        
+        WindowManager::XdndInit(data);
+    }
+    
+    Window::Window(const Gorgon::Window::FullscreenTag &, const WindowManager::Monitor &mon, const std::string &name, const std::string &title) : data(new internal::windowdata) {
+        
+        this->name = name;
+        pointerlayer = new Graphics::Layer;
+        Add(pointerlayer);
+
+#ifndef NDEBUG
+        ASSERT(WindowManager::display, "Window manager system is not initialized.");
+#endif
+        
+        windows.Add(this);
+        
+        //using defaults
+        int screen = DefaultScreen(WindowManager::display);
+        int depth  = DefaultDepth(WindowManager::display,screen);
+        
+        //adjust atrributes
+        XSetWindowAttributes attributes;
+        
+        attributes.event_mask = 
+                    StructureNotifyMask |    //move resize
+                    KeyPressMask |           //keyboard
+                    KeyReleaseMask |
+                    ButtonPressMask |        //mouse
+                    ButtonReleaseMask|    
+                    PropertyChangeMask |
+                    FocusChangeMask|         //activate/deactivate
+                    SubstructureRedirectMask //??
+        ;
+        
+        bool autoplaced = false;
+        
+        auto rootwin=XRootWindow(WindowManager::display,screen);
+        
+        data->handle = XCreateWindow(WindowManager::display, 
+            rootwin,
+            mon.GetLocation().X,mon.GetLocation().Y,mon.GetSize().Width,mon.GetSize().Height,
+            0, depth, InputOutput, 
+            WindowManager::visual, CWEventMask, &attributes
+        );
+        
+        XClassHint *classhint=XAllocClassHint();
+        classhint->res_name=(char*)malloc(name.length()+1);
+        strcpy(classhint->res_name, name.c_str());
+        classhint->res_class=(char*)malloc(name.length()+1);
+        strcpy(classhint->res_class, name.c_str());
+        XSetClassHint(WindowManager::display, data->handle, classhint);
+        XFree(classhint);
+    
+        XStoreName(WindowManager::display, data->handle, (char*)title.c_str());
+        
+        XSetWMProtocols(WindowManager::display, data->handle, &WindowManager::WM_DELETE_WINDOW, 1);
+        
+        XEvent event;
+        
+        XFlush(WindowManager::display);
+        
+        Atom flist[] = {WindowManager::XA_NET_WM_STATE_FULLSCREEN, 0};
+        
+        XChangeProperty(WindowManager::display, data->handle, WindowManager::XA_NET_WM_STATE, WindowManager::XA_ATOM, 32, PropModeReplace, (Byte*)flist, 1);
+        
+        XMapWindow(WindowManager::display,data->handle);
+        XIfEvent(WindowManager::display, &event, &WindowManager::waitfor_mapnotify, (char*)data->handle);
+        
+        XMoveWindow(WindowManager::display, data->handle, mon.GetLocation().X, mon.GetLocation().Y);
+        
+        XFlush(WindowManager::display);
+        
+        data->ismapped=true;        
+        data->ppoint=mon.GetLocation();
+        
+        Layer::Resize(mon.GetSize());
+
+        createglcontext();
+        glsize = mon.GetSize();
+        
+        WindowManager::XdndInit(data);
+    }
+    
+    void Window::Destroy() {
+        if(data) {
+            Close();
+        }
+        
+        windows.Remove(this);
+
+        delete pointerlayer;
+        pointerlayer = nullptr;
+
+        delete data;
+        data = nullptr;
+    }
+    
+    void Window::Show() {
+        Layer::Show();
+        
+        XEvent event;
+
+        XMapWindow(WindowManager::display, data->handle);
+        XIfEvent(WindowManager::display, &event, WindowManager::waitfor_mapnotify, (char*)data->handle);
+        XRaiseWindow(WindowManager::display, data->handle);
+        if(data->move) {
+            XMoveWindow(WindowManager::display, data->handle, data->moveto.X, data->moveto.Y);
+            data->move=false;
+        }		
+        XFlush(WindowManager::display);
+        data->ismapped=true;
+    }
+    
+    void Window::Hide() {
+        Layer::Hide();
+        
+        XUnmapWindow(WindowManager::display, data->handle);
+        data->ismapped=false;
+    }
+        
+    void Window::HidePointer() {
+        if(iswmpointer) {
+            if(data->pointerdisplayed) {
+                data->pointerdisplayed=false;
+                XDefineCursor(WindowManager::display, data->handle, WindowManager::blank_cursor);
+                XFlush(WindowManager::display);
+            }
+        }
+        else {
+            pointerlayer->Clear();
+            pointerlayer->Hide();
+        }
+        showptr = false;
+    }
+        
+    void Window::ShowPointer() {
+        if(iswmpointer) {
+            if(!data->pointerdisplayed) {
+                data->pointerdisplayed=true;
+                XDefineCursor(WindowManager::display, data->handle, 0);
+                XFlush(WindowManager::display);
+            }
+        }
+        else {
+            pointerlayer->Show();
+        }
+        showptr = true;
+    }
+    
+    void Window::Move(const Geometry::Point &location) {
+        if(data->ismapped) {
+            auto borders = WindowManager::GetX4Prop<Geometry::Margin>(WindowManager::XA_NET_FRAME_EXTENTS, data->handle, {0,0,0,0});
+            std::swap(borders.Top, borders.Right);
+
+            XMoveWindow(WindowManager::display, data->handle, location.X+borders.Left, location.Y+borders.Top);
+            XFlush(WindowManager::display);
+        }
+        else {
+            data->move=true;
+            data->moveto=location;
+        }
+    }
+    
+    void Window::Resize(const Geometry::Size &size) {
+        if(!allowresize) {
+            XSizeHints *sizehints=XAllocSizeHints();
+            sizehints->min_width=size.Width;
+            sizehints->max_width=size.Width;
+            sizehints->min_height=size.Height;
+            sizehints->max_height=size.Height;
+            sizehints->flags=PMinSize | PMaxSize;
+            XSetWMNormalHints(WindowManager::display, data->handle, sizehints);
+            XFree(sizehints);
+        }
+
+        XResizeWindow(WindowManager::display, data->handle, size.Width, size.Height);
+        XFlush(WindowManager::display);
+    }
+
+    
+    void Window::Close() {
+        XDestroyWindow(WindowManager::display, data->handle);
+        data->handle = 0;
+        
+        DestroyedEvent();
+    }
+    
+    void Window::createglcontext() {
+        static int attributeListDbl[] = {
+            GLX_RGBA,
+            GLX_DOUBLEBUFFER,
+            GLX_RED_SIZE,   1,
+            GLX_GREEN_SIZE, 1,
+            GLX_BLUE_SIZE,  1,
+            None
+        };
+        
+        XVisualInfo *vi = glXChooseVisual(WindowManager::display, DefaultScreen(WindowManager::display), attributeListDbl);
+        
+        GLXContext prev=0;
+        for(auto &w : windows) {
+            if(w.data->context!=0) {
+                prev=w.data->context;
+            }
+        }
+        
+        data->context = glXCreateContext(WindowManager::display, vi, prev, GL_TRUE);		
+        WindowManager::internal::switchcontext(*data);
+
+        if(data->context==0) {
+            OS::DisplayMessage("OpenGL context creation failed");
+            exit(1);
+        }
+
+        Graphics::Initialize();
+
+        GL::SetupContext(bounds.GetSize());
+
+        // test code
+        glXSwapBuffers(WindowManager::display, data->handle);		
+        XFlush(WindowManager::display);
+    }
+
+    void Window::SetTitle(const std::string &title) {	
+        XStoreName(WindowManager::display, data->handle, title.c_str());
+        XFlush(WindowManager::display);
+    }
+
+    std::string Window::GetTitle() const {
+        Atom type;
+        int format;
+        unsigned long len, remainder;
+        
+        Byte *prop;
+        
+        XGetWindowProperty(WindowManager::display, data->handle, WindowManager::XA_NET_WM_NAME, 0, 1024,
+                        False, WindowManager::XA_UTF8_STRING, &type, &format, &len, &remainder, &prop);
+        
+        if(!prop) {
+            XGetWindowProperty(WindowManager::display, data->handle, WindowManager::XA_WM_NAME, 0, 1024,
+                            False, AnyPropertyType, &type, &format, &len, &remainder, &prop);
+        }
+        
+        std::string ret((char*)prop, len);
+        XFree(prop);
+        
+        return ret;
+    }
+
+    bool Window::IsClosed() const {
+        return data->handle == 0;
+    }
+
+    Geometry::Bounds Window::GetExteriorBounds() const {
+        auto borders = WindowManager::GetX4Prop<Geometry::Margin>(WindowManager::XA_NET_FRAME_EXTENTS, data->handle, {0,0,0,0});
+        std::swap(borders.Top, borders.Right);
+        
+        ::Window r, c;
+        int x, y;
+        unsigned w, h, bw, d;
+        
+        XGetGeometry(WindowManager::display, data->handle, &r, &x, &y, &w, &h, &bw, &d);
+        
+        XTranslateCoordinates( WindowManager::display, data->handle, r, 0, 0, &x, &y, &c );
+        
+        return Geometry::Bounds(x, y, x+w, y+h) + borders;
+    }
+
+    void Window::Focus() {
+        XClientMessageEvent ev;
+        std::memset (&ev, 0, sizeof ev);
+        ev.type = ClientMessage;
+        ev.window = data->handle;
+        ev.message_type = WindowManager::XA_NET_ACTIVE_WINDOW;
+        ev.format = 32;
+        ev.data.l[0] = 1;
+        ev.data.l[1] = CurrentTime;
+        XSendEvent (WindowManager::display, RootWindow(WindowManager::display, XDefaultScreen(WindowManager::display)), False, SubstructureRedirectMask | SubstructureNotifyMask, (XEvent*)&ev);
+        XFlush (WindowManager::display);  
+    }
+
+    bool Window::IsFocused() const {
+        ::Window focused;
+        int r;
+
+        XGetInputFocus(WindowManager::display, &focused, &r);
+        
+        return focused == data->handle;
+    }
+
+    void Window::Minimize() {
+        XIconifyWindow(WindowManager::display, data->handle, 0);
+        XFlush(WindowManager::display);
+    }
+
+    void Window::Maximize() {
+        if(!allowresize) {
+            XSizeHints *sizehints=XAllocSizeHints();
+            sizehints->max_width=std::numeric_limits<int>::max();
+            sizehints->max_height=std::numeric_limits<int>::max();
+            sizehints->flags=PMaxSize;
+            XSetWMNormalHints(WindowManager::display, data->handle, sizehints);	
+            XFree(sizehints);
+        
+            XFlush(WindowManager::display);
+            
+            std::this_thread::sleep_for(std::chrono::milliseconds(10));
+        }
+
+        XEvent xev;
+
+        memset(&xev, 0, sizeof(xev));
+        xev.type = ClientMessage;
+        xev.xclient.window = data->handle;
+        xev.xclient.message_type = WindowManager::XA_NET_WM_STATE;
+        xev.xclient.format = 32;
+        xev.xclient.data.l[0] = WindowManager::XA_NET_WM_STATE_ADD;
+        xev.xclient.data.l[1] = WindowManager::XA_NET_WM_STATE_MAXIMIZED_HORZ;
+        xev.xclient.data.l[2] = WindowManager::XA_NET_WM_STATE_MAXIMIZED_VERT;
+
+        XSendEvent(WindowManager::display, DefaultRootWindow(WindowManager::display), False, SubstructureNotifyMask, &xev);
+        XFlush(WindowManager::display);
+        
+        ::Window r;
+        int x, y;
+        unsigned w, h, bw, d;
+        
+        std::this_thread::sleep_for(std::chrono::milliseconds(10)); //wait for a short time to ensure window frame is ready.
+    
+        XGetGeometry(WindowManager::display, data->handle, &r, &x, &y, &w, &h, &bw, &d);
+        
+        if(!allowresize) {
+            XSizeHints *sizehints=XAllocSizeHints();
+            sizehints->min_width=w;
+            sizehints->max_width=w;
+            sizehints->min_height=h;
+            sizehints->max_height=h;
+            sizehints->flags=PMinSize | PMaxSize;
+            XSetWMNormalHints(WindowManager::display, data->handle, sizehints);	
+            XFlush(WindowManager::display);
+            XFree(sizehints);
+        }
+    }
+
+    void Window::Restore() {
+        Atom type;
+        int format;
+        unsigned long count, b;
+        unsigned char *properties = NULL;
+        
+        bool min = false, max = false;
+    
+        ::XGetWindowProperty(WindowManager::display, data->handle, WindowManager::XA_NET_WM_STATE, 0, std::numeric_limits<long>::max(), False, AnyPropertyType, &type, &format, &count, &b, &properties);
+        for(int i=0; i<count; i++) {
+            auto prop = reinterpret_cast<unsigned long *>(properties)[i];
+            if(prop == WindowManager::XA_NET_WM_STATE_HIDDEN)
+                min = true;
+            else if(prop == WindowManager::XA_NET_WM_STATE_MAXIMIZED_HORZ || prop == WindowManager::XA_NET_WM_STATE_MAXIMIZED_VERT)
+                max = true;
+        }
+            
+
+        if(min) {
+            Focus();
+        }
+        else if(max) {
+            if(!allowresize) {
+                XSizeHints *sizehints=XAllocSizeHints();
+                sizehints->min_width=0;
+                sizehints->min_height=0;
+                sizehints->flags=PMinSize;
+                XSetWMNormalHints(WindowManager::display, data->handle, sizehints);	
+                XFree(sizehints);
+                
+                XFlush(WindowManager::display);
+                
+                std::this_thread::sleep_for(std::chrono::milliseconds(10));
+            }
+            
+            XEvent xev;
+
+            memset(&xev, 0, sizeof(xev));
+            xev.type = ClientMessage;
+            xev.xclient.window = data->handle;
+            xev.xclient.message_type = WindowManager::XA_NET_WM_STATE;
+            xev.xclient.format = 32;
+            xev.xclient.data.l[0] = 0;      
+            xev.xclient.data.l[1] = WindowManager::XA_NET_WM_STATE_MAXIMIZED_HORZ;
+            xev.xclient.data.l[2] = WindowManager::XA_NET_WM_STATE_MAXIMIZED_VERT;
+
+            XSendEvent(WindowManager::display, DefaultRootWindow(WindowManager::display), False, SubstructureNotifyMask, &xev);
+            XFlush(WindowManager::display);
+            
+            ::Window r;
+            int x, y;
+            unsigned w, h, bw, d;
+            
+            std::this_thread::sleep_for(std::chrono::milliseconds(10)); //wait for a short time to ensure window frame is ready.
+        
+            XGetGeometry(WindowManager::display, data->handle, &r, &x, &y, &w, &h, &bw, &d);
+            
+            if(!allowresize) {
+                XSizeHints *sizehints=XAllocSizeHints();
+                sizehints->min_width=w;
+                sizehints->max_width=w;
+                sizehints->min_height=h;
+                sizehints->max_height=h;
+                sizehints->flags=PMinSize | PMaxSize;
+                XSetWMNormalHints(WindowManager::display, data->handle, sizehints);	
+                XFlush(WindowManager::display);
+                XFree(sizehints);            
+            }
+        }
+        XFree(properties);
+    }
+
+    bool Window::IsMinimized() const {
+        Atom type;
+        int format;
+        unsigned long count, b;
+        unsigned char *properties = NULL;
+        
+        bool min = false;
+    
+        ::XGetWindowProperty(WindowManager::display, data->handle, WindowManager::XA_NET_WM_STATE, 0, std::numeric_limits<long>::max(), False, AnyPropertyType, &type, &format, &count, &b, &properties);
+        for(int i=0; i<count; i++) {
+            auto prop = reinterpret_cast<unsigned long *>(properties)[i];
+            if(prop == WindowManager::XA_NET_WM_STATE_HIDDEN)
+                min = true;
+        }
+        XFree(properties);
+        
+        return min;
+    }
+
+    bool Window::IsMaximized() const {
+        Atom type;
+        int format;
+        unsigned long count, b;
+        unsigned char *properties = NULL;
+        
+        bool min = false, max = false;
+    
+        ::XGetWindowProperty(WindowManager::display, data->handle, WindowManager::XA_NET_WM_STATE, 0, std::numeric_limits<long>::max(), False, AnyPropertyType, &type, &format, &count, &b, &properties);
+        for(int i=0; i<count; i++) {
+            auto prop = reinterpret_cast<unsigned long *>(properties)[i];
+            
+            if(prop == WindowManager::XA_NET_WM_STATE_MAXIMIZED_HORZ || prop == WindowManager::XA_NET_WM_STATE_MAXIMIZED_VERT)
+                max = true;
+        }
+        XFree(properties);
+        
+        return max;
+    }
+    
+    void Window::AllowResize() {
+        XSizeHints *sizehints=XAllocSizeHints();
+        sizehints->min_width=0;
+        sizehints->max_width=std::numeric_limits<int>::max();
+        sizehints->min_height=0;
+        sizehints->max_height=std::numeric_limits<int>::max();
+        sizehints->flags=PMinSize | PMaxSize;
+        XSetWMNormalHints(WindowManager::display, data->handle, sizehints);	
+        XFlush(WindowManager::display);
+        XFree(sizehints);
+    }
+    
+    void Window::PreventResize() {
+        auto sz = GetSize();
+        XSizeHints *sizehints=XAllocSizeHints();
+        sizehints->min_width=sz.Width;
+        sizehints->max_width=sz.Width;
+        sizehints->min_height=sz.Height;
+        sizehints->max_height=sz.Height;
+        sizehints->flags=PMinSize | PMaxSize;
+        XSetWMNormalHints(WindowManager::display, data->handle, sizehints);	
+        XFlush(WindowManager::display);
+        XFree(sizehints);
+    }
+
+    void Window::SetIcon(const WindowManager::Icon& icon) {
+        XChangeProperty(WindowManager::display, data->handle, WindowManager::XA_NET_WM_ICON, WindowManager::XA_CARDINAL , 32, PropModeReplace, icon.data->data, icon.data->w*icon.data->h+2);
+        XSync(WindowManager::display, 1);
+    }
+
+    void Window::updatedataowner() {
+    }
+ 
+    void Window::processmessages() {
+        XEvent event;
+        
+        mouselocation = WindowManager::GetMousePosition(data);
+        if(cursorover)
+            mouse_location();
+
+        while(XEventsQueued(WindowManager::display, QueuedAfterReading)) {
+            XNextEvent(WindowManager::display, &event);
+            KeySym key;
+            //std::cout<<"XEV: "<<xeventname(event)<<std::endl;
+            
+            switch(event.type) {
+                case ClientMessage: {
+                    if (event.xclient.message_type == WindowManager::XA_PROTOCOLS
+                            && event.xclient.format == 32
+                            && event.xclient.data.l[0] == (long)WindowManager::WM_DELETE_WINDOW)
+                    {
+                        bool allow;
+                        allow=true;
+                        ClosingEvent(allow);
+                        
+                        if(allow) {
+                            Close();
+                            break;
+                        }
+                    }
+                    else if(event.xclient.message_type==WindowManager::XdndEnter) {
+                        WindowManager::handledndevent(event, *this);
+                    }
+                    else if(event.xclient.message_type==WindowManager::XdndPosition) {
+                        WindowManager::handledndevent(event, *this);
+                    }
+                    else if(event.xclient.message_type == WindowManager::XdndLeave) {
+                        WindowManager::handledndevent(event, *this);
+                    }
+                    else if(event.xclient.message_type == WindowManager::XdndDrop) {
+                        WindowManager::handledndevent(event, *this);
+                    }
+                } // Client Message
+                break;
+                
+                case SelectionNotify:
+                    WindowManager::handledndevent(event, *this);
+                    
+                    break;
+                    
+                case SelectionClear:
+                    WindowManager::clipboard_entries.clear();
+                    break;
+                
+                case SelectionRequest: 
+                    WindowManager::handleclipboardevent(event);
+                    break;
+                
+                case EnterNotify:
+                    cursorover = true;
+                    break;
+                    
+                case ConfigureNotify: {
+                    auto xce = event.xconfigure;
+                    
+                    if(GetSize().Width != xce.width || GetSize().Height != xce.height) {
+                        Layer::Resize({(int)xce.width, (int)xce.height});
+                        
+                        activatecontext();
+                        GL::Resize({(int)xce.width, (int)xce.height});
+                        
+                        ResizedEvent();
+                    }
+                    else {
+                        int x, y;
+                        ::Window r;
+                        XTranslateCoordinates(WindowManager::display, data->handle, RootWindow(WindowManager::display, XDefaultScreen(WindowManager::display)), 
+                            xce.x, xce.y, &x, &y, &r
+                        );
+                        
+                        if(data->ppoint.X != x || data->ppoint.Y != y ) {
+                            data->ppoint = {x, y};
+
+                            MovedEvent();
+                        }
+                    }
+                }
+                break;
+                    
+                case LeaveNotify:
+                    cursorover = false;
+                    break;
+                    
+                case FocusIn: {
+                    WindowManager::assertkeys(*this, data);
+                    
+                    if(event.xfocus.mode == NotifyNormal) {
+                        if(!data->focused) {
+                            FocusedEvent();
+                            data->focused = true;
+                        }
+                    }                    
+                }
+                break;
+                    
+                case FocusOut: {
+                    if(data->focused) {
+                        LostFocusEvent();
+                        data->focused = false;
+                    }
+                }
+                break;
+                
+                    
+                case PropertyNotify:
+                    if(event.xproperty.atom == WindowManager::XA_NET_WM_STATE) {
+                        bool minstate = IsMinimized();
+                        
+                        if(minstate && !data->min) {
+                            MinimizedEvent();
+                            data->min = true;
+                        }
+                        else if(!minstate && data->min) {
+                            RestoredEvent();
+                            data->min = false;
+                        }
+                    }
+                    break;
+                    
+                case KeyPress:
+                case KeyRelease:
+                case ButtonPress:
+                case ButtonRelease:
+                    
+                    WindowManager::handleinputevent(event, *this);
+                    
+                    break;
+                    
+                default:
+                    //std::cout<<xeventname(event)<<std::endl;
+                    break;
+            }
+        }
+    }   
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Source/Gorgon/WindowManager/X11/X11.cpp	Fri Feb 21 17:02:44 2020 +0200
@@ -0,0 +1,397 @@
+#include "X11.h"
+
+#include "../../WindowManager.h"
+#include <thread>
+#include "../../Geometry/Margin.h"
+#include "../../Time.h"
+#include "../../OS.h"
+#include "../../Graphics.h"
+#include "../../Utils/Assert.h"
+
+#include "../../Graphics/Layer.h"
+
+#include "../../Encoding/URI.h"
+#include "../../Encoding/PNG.h"
+#include "../../Encoding/JPEG.h"
+#include "../../IO/MemoryStream.h"
+
+#include <X11/Xutil.h>
+#include <X11/XKBlib.h>
+#include <unistd.h>
+#include <stdlib.h>
+
+
+#include <X11/extensions/Xinerama.h>
+#include <X11/extensions/Xrandr.h>
+
+
+#include "X11Keysym.h"
+#include <limits.h>
+
+#undef None
+
+
+namespace Gorgon { namespace WindowManager {
+    
+    /// @cond INTERNAL
+    /// X11 display information
+    Display *display = nullptr;
+    
+    /// Depends on monitor, might be moved
+    Visual  *visual  = nullptr;
+
+    /// Blank cursor to remove WindowManager cursor
+    Cursor blank_cursor;
+    
+    /// XRandr extension to query physical monitors
+    bool xrandr = false;
+    
+    /// Xinerama extension to query physical monitors, this is for legacy systems
+    bool xinerama = false;
+    
+    ///@{ X11 atoms for various data identifiers
+    Atom XA_CLIPBOARD;
+    Atom XA_TIMESTAMP;
+    Atom XA_TARGETS;
+    Atom XA_PROTOCOLS;
+    Atom WM_DELETE_WINDOW;
+    Atom XA_TEXT;
+    Atom XA_STRING;
+    Atom XA_UTF8_STRING;
+    Atom XA_TEXT_HTML;
+    Atom XA_URL;
+    Atom XA_PNG;
+    Atom XA_JPG;
+    Atom XA_BMP;
+    Atom XA_ATOM;
+    Atom XA_CARDINAL;
+    Atom XA_INCR;
+    Atom XA_NET_FRAME_EXTENTS;
+    Atom XA_NET_WORKAREA;
+    Atom XA_NET_REQUEST_FRAME_EXTENTS;
+    Atom XA_WM_NAME;
+    Atom XA_NET_WM_NAME;
+    Atom XA_NET_WM_STATE;
+    Atom XA_NET_WM_STATE_ADD = 1;
+    Atom XA_NET_WM_STATE_FULLSCREEN;
+    Atom XA_NET_WM_STATE_MAXIMIZED_HORZ;
+    Atom XA_NET_WM_STATE_MAXIMIZED_VERT;
+    Atom XA_NET_WM_STATE_HIDDEN;
+    Atom XA_NET_ACTIVE_WINDOW;
+    Atom XA_WM_CHANGE_STATE;
+    Atom XA_STRUT;
+    Atom XA_NET_WM_ICON;
+    Atom XA_PRIMARY;
+    Atom XA_CP_PROP;
+    Atom XdndAware;
+    Atom XdndSelection;
+    Atom XdndEnter;
+    Atom XdndFinished;
+    Atom XdndStatus;
+    Atom XdndPosition;
+    Atom XdndLeave;
+    Atom XdndDrop;
+    Atom XdndActionCopy;
+    Atom XdndActionMove;
+    Atom XdndTypeList;
+    Atom XA_Filelist;
+    ///@}
+        
+    ///@{ waits for specific events
+    int waitfor_mapnotify(Display *d, XEvent *e, char *arg) {
+        return (e->type == MapNotify) && (e->xmap.window == (::Window)arg);
+    }
+    
+    int waitfor_propertynotify(Display *d, XEvent *e, char *arg) {
+        return (e->type == PropertyNotify) && (e->xproperty.window == (::Window)arg);
+    }
+    
+    int waitfor_cppropertynotify(Display *d, XEvent *e, char *arg) {
+        return (e->type == PropertyNotify) && (e->xproperty.atom == XA_CP_PROP) && (e->xproperty.window == (::Window)arg);
+    }
+    
+    int waitfor_selectionnotify(Display *d, XEvent *e, char *arg) {
+        return (e->type == SelectionNotify);
+    }
+    
+    namespace internal {
+        intptr_t context;
+
+        void switchcontext(Gorgon::internal::windowdata &data) {
+            glXMakeCurrent(WindowManager::display, data.handle, data.context);
+            context=reinterpret_cast<intptr_t>(&data);
+        }
+
+        void finalizerender(Gorgon::internal::windowdata &data) {
+            glFinish();
+            glFlush();
+            glXSwapBuffers(WindowManager::display, data.handle);
+            XFlush(WindowManager::display);
+        }
+        
+    }
+    ///@}
+    
+    void XdndInit(Gorgon::internal::windowdata *w) {
+        Atom version = 5;
+        
+        XChangeProperty(display, w->handle, XdndAware, XA_ATOM, 32, PropModeReplace, (unsigned char *)&version, 1);
+    }
+        
+    /// @endcond
+    
+    void init() {
+        //get display
+        display = XOpenDisplay(NULL);
+        visual = XDefaultVisualOfScreen(DefaultScreenOfDisplay(display));
+        
+        //query atoms
+        XA_PRIMARY  =XInternAtom(display, "PRIMARY", False);
+        XA_CLIPBOARD=XInternAtom(display, "CLIPBOARD", 1);
+        XA_TIMESTAMP=XInternAtom(display, "TIMESTAMP", 1);
+        XA_TARGETS  =XInternAtom (display, "TARGETS", 0);
+        XA_PROTOCOLS=XInternAtom(display, "WM_PROTOCOLS", 0);
+        XA_STRING   =XInternAtom(display, "STRING", 0);
+        XA_TEXT   =XInternAtom(display, "TEXT", 0);
+        XA_UTF8_STRING   =XInternAtom(display, "UTF8_STRING", 0);
+        XA_CARDINAL =XInternAtom(display, "CARDINAL", 0);
+        XA_ATOM     =XInternAtom(display, "ATOM", 0);
+        WM_DELETE_WINDOW = XInternAtom(display, "WM_DELETE_WINDOW", 0);
+        XA_NET_FRAME_EXTENTS = XInternAtom(display, "_NET_FRAME_EXTENTS", 0);
+        XA_NET_WORKAREA = XInternAtom(display, "_NET_WORKAREA", 0);
+        XA_NET_REQUEST_FRAME_EXTENTS = XInternAtom(display, "_NET_REQUEST_FRAME_EXTENTS", 0);
+        XA_NET_WM_STATE_MAXIMIZED_HORZ  =  XInternAtom(display, "_NET_WM_STATE_MAXIMIZED_HORZ", False);
+        XA_NET_WM_STATE_MAXIMIZED_VERT  =  XInternAtom(display, "_NET_WM_STATE_MAXIMIZED_VERT", False);
+        XA_NET_WM_STATE_HIDDEN  = XInternAtom(display, "_NET_WM_STATE_HIDDEN", False);
+        XA_NET_ACTIVE_WINDOW = XInternAtom(display, "_NET_ACTIVE_WINDOW", False);
+        
+        XA_TEXT_HTML = XInternAtom(display, "text/html", False);
+        XA_URL = XInternAtom(display, "text/x-moz-url", False);
+        XA_PNG = XInternAtom(display, "image/png", False);
+        XA_JPG = XInternAtom(display, "image/jpeg", False);
+        XA_BMP = XInternAtom(display, "image/bmp", False);
+        XA_CP_PROP = XInternAtom(display, "GORGON_CP_PROP", False);
+        XA_INCR= XInternAtom(display, "INCR", False);
+        
+        XA_WM_NAME  = XInternAtom(display, "WM_NAME", False);
+        XA_NET_WM_NAME  = XInternAtom(display, "_NET_WM_NAME", False);
+        XA_NET_WM_STATE = XInternAtom(display, "_NET_WM_STATE", False);
+        XA_NET_WM_STATE_FULLSCREEN = XInternAtom(display, "_NET_WM_STATE_FULLSCREEN", False);
+        XA_STRUT = XInternAtom(display, "_NET_WM_STRUT_PARTIAL", False);
+        XA_WM_CHANGE_STATE = XInternAtom(display, "WM_CHANGE_STATE", False);
+        XA_NET_WM_ICON = XInternAtom(display, "_NET_WM_ICON", False);
+        
+        XdndAware         = XInternAtom(display, "XdndAware",         False);
+        XdndSelection     = XInternAtom(display, "XdndSelection",     False);
+        XdndStatus        = XInternAtom(display, "XdndStatus",     	  False);
+        XdndTypeList      = XInternAtom(display, "XdndTypeList",      False);
+        XdndEnter         = XInternAtom(display, "XdndEnter",         False);
+        XdndFinished      = XInternAtom(display, "XdndFinished",      False);
+        XdndPosition      = XInternAtom(display, "XdndPosition",      False);
+        XdndLeave         = XInternAtom(display, "XdndLeave",         False);
+        XdndDrop          = XInternAtom(display, "XdndDrop",          False);
+        XdndActionCopy    = XInternAtom(display, "XdndActionCopy",    False);
+        XdndActionMove    = XInternAtom(display, "XdndActionMove",    False);
+        XA_Filelist       = XInternAtom(display, "text/uri-list",	  False);
+
+        char data[1]={0};
+        XColor dummy;
+        Pixmap blank = XCreateBitmapFromData (display, DefaultRootWindow(display), data, 1, 1);
+        blank_cursor = XCreatePixmapCursor(display, blank, blank, &dummy, &dummy, 0, 0);
+        XFreePixmap (display, blank);
+        
+        //detect extensions
+        int eventbase, errorbase;
+        xrandr=(bool)XRRQueryExtension(display, &eventbase, &errorbase);
+        
+        xinerama=(bool)XineramaQueryExtension(display, &eventbase, &errorbase);
+        xinerama=xinerama && (bool)XineramaIsActive(display);
+        
+        Monitor::Refresh(true);
+        
+        setenv("__GL_YIELD", "USLEEP", 1);
+    }
+
+    std::string GetAtomName(Atom atom) {
+        if(!atom)
+            return "[None]";
+        else 
+            return XGetAtomName(WindowManager::display, atom);
+    }
+
+        
+    Geometry::Point GetMousePosition(Gorgon::internal::windowdata *wind) {
+        Geometry::Point ret;
+        
+        int rx,ry;
+        ::Window root, child;
+        unsigned mask;
+        
+        if(XQueryPointer(display, wind->handle, &root, &child, &rx, &ry, &ret.X, &ret.Y, &mask) == False) {
+            ret.X = -1;
+            ret.Y = -1;
+        }
+
+        return ret;
+    }
+
+
+    Icon::Icon() {
+        data = new internal::icondata;
+    }
+    
+    Icon::Icon(const Containers::Image &image) {
+        data = new internal::icondata;
+        FromImage(image);
+    }
+    
+    Icon::Icon(Icon &&icon) {
+        data = new internal::icondata;
+        std::swap(data, icon.data);
+    }
+    
+    Icon &Icon::operator =(Icon &&icon) {
+        Destroy();
+        
+        std::swap(data, icon.data);
+        return *this;
+    }
+    
+    void Icon::FromImage(const Containers::Image &image) {
+        unsigned long*img=new unsigned long[2+image.GetWidth()*image.GetHeight()];
+        
+        img[0]=image.GetWidth();
+        img[1]=image.GetHeight();
+        
+        image.CopyToBGRABufferLong(img+2);
+        
+        data->w = image.GetWidth();
+        data->h = image.GetHeight();
+        
+        data->data = (Byte*)img;
+    }
+    
+    void Icon::Destroy() {
+        if(data->data) {
+            delete data->data;
+            data->w = 0;
+            data->h = 0;
+        }
+    }
+    
+    Icon::~Icon() {
+        Destroy();
+        
+        delete data;
+    }
+
+    
+    std::string xeventname(XEvent &event) {
+        switch (event.type) {
+
+        case KeyPress: 
+            return "KeyPress";
+
+        case KeyRelease: 
+            return "KeyRelease";
+
+        case ButtonPress: 
+            return "ButtonPress";
+
+        case ButtonRelease: 
+            return "ButtonRelease";
+
+        case MotionNotify: 
+            return "MotionNotify";
+
+        case EnterNotify: 
+            return "EnterNotify";
+
+        case LeaveNotify: 
+            return "LeaveNotify";
+
+        case FocusIn: 
+            return "FocusIn";
+
+        case FocusOut: 
+            return "FocusOut";
+
+        case KeymapNotify: 
+            return "KeymapNotify";
+
+        case Expose: 
+            return "Expose";
+
+        case GraphicsExpose: 
+            return "GraphicsExpose";
+
+        case NoExpose: 
+            return "NoExpose";
+
+        case VisibilityNotify: 
+            return "VisibilityNotify";
+
+        case CreateNotify: 
+            return "CreateNotify";
+
+        case DestroyNotify: 
+            return "DestroyNotify";
+
+        case UnmapNotify: 
+            return "UnmapNotify";
+
+        case MapNotify: 
+            return "MapNotify";
+
+        case MapRequest: 
+            return "MapRequest";
+
+        case ReparentNotify: 
+            return "ReparentNotify";
+
+        case ConfigureNotify: 
+            return "ConfigureNotify";
+
+        case ConfigureRequest: 
+            return "ConfigureRequest";
+
+        case GravityNotify: 
+            return "GravityNotify";
+
+        case ResizeRequest: 
+            return "ResizeRequest";
+
+        case CirculateNotify: 
+            return "CirculateNotify";
+
+        case CirculateRequest: 
+            return "CirculateRequest";
+
+        case PropertyNotify: 
+            return "PropertyNotify";
+
+        case SelectionClear: 
+            return "SelectionClear";
+
+        case SelectionRequest: 
+            return "SelectionRequest";
+
+        case SelectionNotify: 
+            return "SelectionNotify";
+
+        case ColormapNotify: 
+            return "ColormapNotify";
+
+        case ClientMessage: 
+            return "ClientMessage";
+
+        case MappingNotify: 
+            return "MappingNotify";
+            
+        }
+        
+        return "Unknown";
+    }
+    
+    
+} }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Source/Gorgon/WindowManager/X11/X11.h	Fri Feb 21 17:02:44 2020 +0200
@@ -0,0 +1,230 @@
+#pragma once
+
+#include <map>
+#include <set>
+#include <string>
+#include <limits>
+#include <memory>
+
+#include <X11/X.h>
+#include <X11/Xlib.h>
+
+#undef None
+#undef Success
+
+#include <GL/glx.h>
+
+#include "../../Geometry/Point.h"
+#include "../../Event.h"
+#include "../../Input.h"
+#include "../../Input/DnD.h"
+#include "../../Any.h"
+
+#include "../../Window.h"
+
+
+
+static constexpr int Success = 0, None = 0;
+
+namespace Gorgon { 
+
+
+namespace internal {
+
+    struct windowdata {
+        ::Window handle = 0;
+        bool min = false;
+        bool pointerdisplayed=true;
+        bool move=false;
+        Geometry::Point moveto;
+        bool ismapped=false;
+        GLXContext context=0;
+        bool focused = false;
+        Geometry::Point ppoint = {std::numeric_limits<int>::min(), std::numeric_limits<int>::min()};
+        
+        std::map<Input::Key, ConsumableEvent<Window, Input::Key, bool>::Token> handlers;
+        std::set<KeySym> pressed;
+        
+        struct xdnddata {
+            bool filelist = false;
+            bool utf8 = false;
+            bool string = false;
+            
+            bool requested = false;
+            int  drop = 0;
+            
+            bool localpointer = false;
+        } xdnd;
+    };
+}
+
+namespace WindowManager {
+    
+            
+    ///@{ X11 atoms for various data identifiers
+    extern Atom 
+         XA_CLIPBOARD,
+         XA_TIMESTAMP,
+         XA_TARGETS,
+         XA_PROTOCOLS,
+         WM_DELETE_WINDOW,
+         XA_TEXT,
+         XA_STRING,
+         XA_UTF8_STRING,
+         XA_TEXT_HTML,
+         XA_URL,
+         XA_PNG,
+         XA_JPG,
+         XA_BMP,
+         XA_ATOM,
+         XA_CARDINAL,
+         XA_INCR,
+         XA_NET_FRAME_EXTENTS,
+         XA_NET_WORKAREA,
+         XA_NET_REQUEST_FRAME_EXTENTS,
+         XA_WM_NAME,
+         XA_NET_WM_NAME,
+         XA_NET_WM_STATE,
+         XA_NET_WM_STATE_ADD,
+         XA_NET_WM_STATE_FULLSCREEN,
+         XA_NET_WM_STATE_MAXIMIZED_HORZ,
+         XA_NET_WM_STATE_MAXIMIZED_VERT,
+         XA_NET_WM_STATE_HIDDEN,
+         XA_NET_ACTIVE_WINDOW,
+         XA_WM_CHANGE_STATE,
+         XA_STRUT,
+         XA_NET_WM_ICON,
+         XA_PRIMARY,
+         XA_CP_PROP,
+         XdndAware,
+         XdndSelection,
+         XdndEnter,
+         XdndFinished,
+         XdndStatus,
+         XdndPosition,
+         XdndLeave,
+         XdndDrop,
+         XdndActionCopy,
+         XdndActionMove,
+         XdndTypeList,
+         XA_Filelist;
+    ///@}
+
+    
+    ///@cond internal    
+    struct clipboardentry {
+        Atom type;
+        std::shared_ptr<CopyFreeAny> data;
+        
+        bool operator ==(const clipboardentry &other) const {
+            return type == other.type;
+        }
+    };
+    
+    namespace internal {
+        Gorgon::internal::windowdata *getdata(const Window &w);
+        
+        struct icondata {
+            ~icondata() {
+                delete[] data;
+            }
+            
+            long w = 0, h = 0;
+            Byte *data = nullptr;
+        };
+        
+    }
+    
+    Geometry::Point GetMousePosition(Gorgon::internal::windowdata *wind);
+    
+    void XdndInit(Gorgon::internal::windowdata *w);
+    
+    std::string xeventname(XEvent &event);
+    
+    std::string GetAtomName(Atom atom);
+    
+    Input::Mouse::Button buttonfromx11(unsigned btn);
+    
+    Input::Keyboard::Key mapx11key(KeySym key, unsigned int keycode);
+    
+    void assertkeys(Window &wind, Gorgon::internal::windowdata *data);
+    
+    std::string xeventname(XEvent &event);
+    
+    
+    
+    /// X11 display information
+    extern Display *display;
+    
+    /// Depends on monitor, might be moved
+    extern Visual  *visual;
+
+    /// Blank cursor to remove WindowManager cursor
+    extern Cursor blank_cursor;
+    
+    /// XRandr extension to query physical monitors
+    extern bool xrandr;
+    
+    /// Xinerama extension to query physical monitors, this is for legacy systems
+    extern bool xinerama;
+    
+
+    ///@{ waits for specific events
+    int waitfor_mapnotify(Display *d, XEvent *e, char *arg);
+    
+    int waitfor_propertynotify(Display *d, XEvent *e, char *arg);
+    
+    int waitfor_cppropertynotify(Display *d, XEvent *e, char *arg);
+    
+    int waitfor_selectionnotify(Display *d, XEvent *e, char *arg);
+    
+    ::Window getanywindow();
+    
+    extern std::vector<clipboardentry> clipboard_entries;
+    
+    void handleclipboardevent(XEvent event);
+    
+    void handledndevent(XEvent event, Window &wind);
+    
+    void handleinputevent(XEvent event, Window &wind);
+
+    template<class T_>
+    T_ GetX4Prop(Atom atom, ::Window w, const T_ &def) {
+        Atom actual_type;
+        int actual_format;
+        unsigned long item_count;
+        unsigned long bytes_left;
+        
+        Byte *data;
+
+        int status = XGetWindowProperty(
+            display,
+            w,
+            atom,
+            0, 4, 0, AnyPropertyType,
+            &actual_type, &actual_format,
+            &item_count, &bytes_left,
+            &data
+        );
+        
+        if(status!=Success) return def;
+        
+        if(item_count<4 || actual_format!=32) return def;
+        
+        long *cardinals=reinterpret_cast<long*>(data);
+        
+        T_ ret={
+            (int)cardinals[0],
+            (int)cardinals[1],
+            (int)cardinals[2],
+            (int)cardinals[3]
+        };
+        
+        XFree(data);
+        
+        return ret;
+    }
+    
+    ///@endcond
+}}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Source/Gorgon/WindowManager/X11/X11Keysym.h	Fri Feb 21 17:02:44 2020 +0200
@@ -0,0 +1,821 @@
+// !!!This file should only be included from X11.cpp. Forward declare
+// keysym2ucs function if you need the services of this file
+
+/* $XFree86$
+ * This module converts keysym values into the corresponding ISO 10646
+ * (UCS, Unicode) values.
+ *
+ * The array keysymtab[] contains pairs of X11 keysym values for graphical
+ * characters and the corresponding Unicode value. The function
+ * keysym2ucs() maps a keysym onto a Unicode value using a binary search,
+ * therefore keysymtab[] must remain SORTED by keysym value.
+ *
+ * The keysym -> UTF-8 conversion will hopefully one day be provided
+ * by Xlib via XmbLookupString() and should ideally not have to be
+ * done in X applications. But we are not there yet.
+ *
+ * We allow to represent any UCS character in the range U-00000000 to
+ * U-00FFFFFF by a keysym value in the range 0x01000000 to 0x01ffffff.
+ * This admittedly does not cover the entire 31-bit space of UCS, but
+ * it does cover all of the characters up to U-10FFFF, which can be
+ * represented by UTF-16, and more, and it is very unlikely that higher
+ * UCS codes will ever be assigned by ISO. So to get Unicode character
+ * U+ABCD you can directly use keysym 0x0100abcd.
+ *
+ * NOTE: The comments in the table below contain the actual character
+ * encoded in UTF-8, so for viewing and editing best use an editor in
+ * UTF-8 mode.
+ *
+ * Author: Markus G. Kuhn <http://www.cl.cam.ac.uk/~mgk25/>,
+ *         University of Cambridge, April 2001
+ *
+ * Special thanks to Richard Verhoeven <river@win.tue.nl> for preparing
+ * an initial draft of the mapping table.
+ *
+ * This software is in the public domain. Share and enjoy!
+ *
+ * AUTOMATICALLY GENERATED FILE, DO NOT EDIT !!! (unicode/convmap.pl)
+ */
+
+struct codepair {
+  unsigned short keysym;
+  unsigned short ucs;
+};
+
+constexpr codepair keysymtab[] = {
+  { 0x01a1, 0x0104 }, /*                     Aogonek Ą LATIN CAPITAL LETTER A WITH OGONEK */
+  { 0x01a2, 0x02d8 }, /*                       breve ˘ BREVE */
+  { 0x01a3, 0x0141 }, /*                     Lstroke Ł LATIN CAPITAL LETTER L WITH STROKE */
+  { 0x01a5, 0x013d }, /*                      Lcaron Ľ LATIN CAPITAL LETTER L WITH CARON */
+  { 0x01a6, 0x015a }, /*                      Sacute Ś LATIN CAPITAL LETTER S WITH ACUTE */
+  { 0x01a9, 0x0160 }, /*                      Scaron Š LATIN CAPITAL LETTER S WITH CARON */
+  { 0x01aa, 0x015e }, /*                    Scedilla Ş LATIN CAPITAL LETTER S WITH CEDILLA */
+  { 0x01ab, 0x0164 }, /*                      Tcaron Ť LATIN CAPITAL LETTER T WITH CARON */
+  { 0x01ac, 0x0179 }, /*                      Zacute Ź LATIN CAPITAL LETTER Z WITH ACUTE */
+  { 0x01ae, 0x017d }, /*                      Zcaron Ž LATIN CAPITAL LETTER Z WITH CARON */
+  { 0x01af, 0x017b }, /*                   Zabovedot Ż LATIN CAPITAL LETTER Z WITH DOT ABOVE */
+  { 0x01b1, 0x0105 }, /*                     aogonek ą LATIN SMALL LETTER A WITH OGONEK */
+  { 0x01b2, 0x02db }, /*                      ogonek ˛ OGONEK */
+  { 0x01b3, 0x0142 }, /*                     lstroke ł LATIN SMALL LETTER L WITH STROKE */
+  { 0x01b5, 0x013e }, /*                      lcaron ľ LATIN SMALL LETTER L WITH CARON */
+  { 0x01b6, 0x015b }, /*                      sacute ś LATIN SMALL LETTER S WITH ACUTE */
+  { 0x01b7, 0x02c7 }, /*                       caron ˇ CARON */
+  { 0x01b9, 0x0161 }, /*                      scaron š LATIN SMALL LETTER S WITH CARON */
+  { 0x01ba, 0x015f }, /*                    scedilla ş LATIN SMALL LETTER S WITH CEDILLA */
+  { 0x01bb, 0x0165 }, /*                      tcaron ť LATIN SMALL LETTER T WITH CARON */
+  { 0x01bc, 0x017a }, /*                      zacute ź LATIN SMALL LETTER Z WITH ACUTE */
+  { 0x01bd, 0x02dd }, /*                 doubleacute ˝ DOUBLE ACUTE ACCENT */
+  { 0x01be, 0x017e }, /*                      zcaron ž LATIN SMALL LETTER Z WITH CARON */
+  { 0x01bf, 0x017c }, /*                   zabovedot ż LATIN SMALL LETTER Z WITH DOT ABOVE */
+  { 0x01c0, 0x0154 }, /*                      Racute Ŕ LATIN CAPITAL LETTER R WITH ACUTE */
+  { 0x01c3, 0x0102 }, /*                      Abreve Ă LATIN CAPITAL LETTER A WITH BREVE */
+  { 0x01c5, 0x0139 }, /*                      Lacute Ĺ LATIN CAPITAL LETTER L WITH ACUTE */
+  { 0x01c6, 0x0106 }, /*                      Cacute Ć LATIN CAPITAL LETTER C WITH ACUTE */
+  { 0x01c8, 0x010c }, /*                      Ccaron Č LATIN CAPITAL LETTER C WITH CARON */
+  { 0x01ca, 0x0118 }, /*                     Eogonek Ę LATIN CAPITAL LETTER E WITH OGONEK */
+  { 0x01cc, 0x011a }, /*                      Ecaron Ě LATIN CAPITAL LETTER E WITH CARON */
+  { 0x01cf, 0x010e }, /*                      Dcaron Ď LATIN CAPITAL LETTER D WITH CARON */
+  { 0x01d0, 0x0110 }, /*                     Dstroke Đ LATIN CAPITAL LETTER D WITH STROKE */
+  { 0x01d1, 0x0143 }, /*                      Nacute Ń LATIN CAPITAL LETTER N WITH ACUTE */
+  { 0x01d2, 0x0147 }, /*                      Ncaron Ň LATIN CAPITAL LETTER N WITH CARON */
+  { 0x01d5, 0x0150 }, /*                Odoubleacute Ő LATIN CAPITAL LETTER O WITH DOUBLE ACUTE */
+  { 0x01d8, 0x0158 }, /*                      Rcaron Ř LATIN CAPITAL LETTER R WITH CARON */
+  { 0x01d9, 0x016e }, /*                       Uring Ů LATIN CAPITAL LETTER U WITH RING ABOVE */
+  { 0x01db, 0x0170 }, /*                Udoubleacute Ű LATIN CAPITAL LETTER U WITH DOUBLE ACUTE */
+  { 0x01de, 0x0162 }, /*                    Tcedilla Ţ LATIN CAPITAL LETTER T WITH CEDILLA */
+  { 0x01e0, 0x0155 }, /*                      racute ŕ LATIN SMALL LETTER R WITH ACUTE */
+  { 0x01e3, 0x0103 }, /*                      abreve ă LATIN SMALL LETTER A WITH BREVE */
+  { 0x01e5, 0x013a }, /*                      lacute ĺ LATIN SMALL LETTER L WITH ACUTE */
+  { 0x01e6, 0x0107 }, /*                      cacute ć LATIN SMALL LETTER C WITH ACUTE */
+  { 0x01e8, 0x010d }, /*                      ccaron č LATIN SMALL LETTER C WITH CARON */
+  { 0x01ea, 0x0119 }, /*                     eogonek ę LATIN SMALL LETTER E WITH OGONEK */
+  { 0x01ec, 0x011b }, /*                      ecaron ě LATIN SMALL LETTER E WITH CARON */
+  { 0x01ef, 0x010f }, /*                      dcaron ď LATIN SMALL LETTER D WITH CARON */
+  { 0x01f0, 0x0111 }, /*                     dstroke đ LATIN SMALL LETTER D WITH STROKE */
+  { 0x01f1, 0x0144 }, /*                      nacute ń LATIN SMALL LETTER N WITH ACUTE */
+  { 0x01f2, 0x0148 }, /*                      ncaron ň LATIN SMALL LETTER N WITH CARON */
+  { 0x01f5, 0x0151 }, /*                odoubleacute ő LATIN SMALL LETTER O WITH DOUBLE ACUTE */
+  { 0x01f8, 0x0159 }, /*                      rcaron ř LATIN SMALL LETTER R WITH CARON */
+  { 0x01f9, 0x016f }, /*                       uring ů LATIN SMALL LETTER U WITH RING ABOVE */
+  { 0x01fb, 0x0171 }, /*                udoubleacute ű LATIN SMALL LETTER U WITH DOUBLE ACUTE */
+  { 0x01fe, 0x0163 }, /*                    tcedilla ţ LATIN SMALL LETTER T WITH CEDILLA */
+  { 0x01ff, 0x02d9 }, /*                    abovedot ˙ DOT ABOVE */
+  { 0x02a1, 0x0126 }, /*                     Hstroke Ħ LATIN CAPITAL LETTER H WITH STROKE */
+  { 0x02a6, 0x0124 }, /*                 Hcircumflex Ĥ LATIN CAPITAL LETTER H WITH CIRCUMFLEX */
+  { 0x02a9, 0x0130 }, /*                   Iabovedot İ LATIN CAPITAL LETTER I WITH DOT ABOVE */
+  { 0x02ab, 0x011e }, /*                      Gbreve Ğ LATIN CAPITAL LETTER G WITH BREVE */
+  { 0x02ac, 0x0134 }, /*                 Jcircumflex Ĵ LATIN CAPITAL LETTER J WITH CIRCUMFLEX */
+  { 0x02b1, 0x0127 }, /*                     hstroke ħ LATIN SMALL LETTER H WITH STROKE */
+  { 0x02b6, 0x0125 }, /*                 hcircumflex ĥ LATIN SMALL LETTER H WITH CIRCUMFLEX */
+  { 0x02b9, 0x0131 }, /*                    idotless ı LATIN SMALL LETTER DOTLESS I */
+  { 0x02bb, 0x011f }, /*                      gbreve ğ LATIN SMALL LETTER G WITH BREVE */
+  { 0x02bc, 0x0135 }, /*                 jcircumflex ĵ LATIN SMALL LETTER J WITH CIRCUMFLEX */
+  { 0x02c5, 0x010a }, /*                   Cabovedot Ċ LATIN CAPITAL LETTER C WITH DOT ABOVE */
+  { 0x02c6, 0x0108 }, /*                 Ccircumflex Ĉ LATIN CAPITAL LETTER C WITH CIRCUMFLEX */
+  { 0x02d5, 0x0120 }, /*                   Gabovedot Ġ LATIN CAPITAL LETTER G WITH DOT ABOVE */
+  { 0x02d8, 0x011c }, /*                 Gcircumflex Ĝ LATIN CAPITAL LETTER G WITH CIRCUMFLEX */
+  { 0x02dd, 0x016c }, /*                      Ubreve Ŭ LATIN CAPITAL LETTER U WITH BREVE */
+  { 0x02de, 0x015c }, /*                 Scircumflex Ŝ LATIN CAPITAL LETTER S WITH CIRCUMFLEX */
+  { 0x02e5, 0x010b }, /*                   cabovedot ċ LATIN SMALL LETTER C WITH DOT ABOVE */
+  { 0x02e6, 0x0109 }, /*                 ccircumflex ĉ LATIN SMALL LETTER C WITH CIRCUMFLEX */
+  { 0x02f5, 0x0121 }, /*                   gabovedot ġ LATIN SMALL LETTER G WITH DOT ABOVE */
+  { 0x02f8, 0x011d }, /*                 gcircumflex ĝ LATIN SMALL LETTER G WITH CIRCUMFLEX */
+  { 0x02fd, 0x016d }, /*                      ubreve ŭ LATIN SMALL LETTER U WITH BREVE */
+  { 0x02fe, 0x015d }, /*                 scircumflex ŝ LATIN SMALL LETTER S WITH CIRCUMFLEX */
+  { 0x03a2, 0x0138 }, /*                         kra ĸ LATIN SMALL LETTER KRA */
+  { 0x03a3, 0x0156 }, /*                    Rcedilla Ŗ LATIN CAPITAL LETTER R WITH CEDILLA */
+  { 0x03a5, 0x0128 }, /*                      Itilde Ĩ LATIN CAPITAL LETTER I WITH TILDE */
+  { 0x03a6, 0x013b }, /*                    Lcedilla Ļ LATIN CAPITAL LETTER L WITH CEDILLA */
+  { 0x03aa, 0x0112 }, /*                     Emacron Ē LATIN CAPITAL LETTER E WITH MACRON */
+  { 0x03ab, 0x0122 }, /*                    Gcedilla Ģ LATIN CAPITAL LETTER G WITH CEDILLA */
+  { 0x03ac, 0x0166 }, /*                      Tslash Ŧ LATIN CAPITAL LETTER T WITH STROKE */
+  { 0x03b3, 0x0157 }, /*                    rcedilla ŗ LATIN SMALL LETTER R WITH CEDILLA */
+  { 0x03b5, 0x0129 }, /*                      itilde ĩ LATIN SMALL LETTER I WITH TILDE */
+  { 0x03b6, 0x013c }, /*                    lcedilla ļ LATIN SMALL LETTER L WITH CEDILLA */
+  { 0x03ba, 0x0113 }, /*                     emacron ē LATIN SMALL LETTER E WITH MACRON */
+  { 0x03bb, 0x0123 }, /*                    gcedilla ģ LATIN SMALL LETTER G WITH CEDILLA */
+  { 0x03bc, 0x0167 }, /*                      tslash ŧ LATIN SMALL LETTER T WITH STROKE */
+  { 0x03bd, 0x014a }, /*                         ENG Ŋ LATIN CAPITAL LETTER ENG */
+  { 0x03bf, 0x014b }, /*                         eng ŋ LATIN SMALL LETTER ENG */
+  { 0x03c0, 0x0100 }, /*                     Amacron Ā LATIN CAPITAL LETTER A WITH MACRON */
+  { 0x03c7, 0x012e }, /*                     Iogonek Į LATIN CAPITAL LETTER I WITH OGONEK */
+  { 0x03cc, 0x0116 }, /*                   Eabovedot Ė LATIN CAPITAL LETTER E WITH DOT ABOVE */
+  { 0x03cf, 0x012a }, /*                     Imacron Ī LATIN CAPITAL LETTER I WITH MACRON */
+  { 0x03d1, 0x0145 }, /*                    Ncedilla Ņ LATIN CAPITAL LETTER N WITH CEDILLA */
+  { 0x03d2, 0x014c }, /*                     Omacron Ō LATIN CAPITAL LETTER O WITH MACRON */
+  { 0x03d3, 0x0136 }, /*                    Kcedilla Ķ LATIN CAPITAL LETTER K WITH CEDILLA */
+  { 0x03d9, 0x0172 }, /*                     Uogonek Ų LATIN CAPITAL LETTER U WITH OGONEK */
+  { 0x03dd, 0x0168 }, /*                      Utilde Ũ LATIN CAPITAL LETTER U WITH TILDE */
+  { 0x03de, 0x016a }, /*                     Umacron Ū LATIN CAPITAL LETTER U WITH MACRON */
+  { 0x03e0, 0x0101 }, /*                     amacron ā LATIN SMALL LETTER A WITH MACRON */
+  { 0x03e7, 0x012f }, /*                     iogonek į LATIN SMALL LETTER I WITH OGONEK */
+  { 0x03ec, 0x0117 }, /*                   eabovedot ė LATIN SMALL LETTER E WITH DOT ABOVE */
+  { 0x03ef, 0x012b }, /*                     imacron ī LATIN SMALL LETTER I WITH MACRON */
+  { 0x03f1, 0x0146 }, /*                    ncedilla ņ LATIN SMALL LETTER N WITH CEDILLA */
+  { 0x03f2, 0x014d }, /*                     omacron ō LATIN SMALL LETTER O WITH MACRON */
+  { 0x03f3, 0x0137 }, /*                    kcedilla ķ LATIN SMALL LETTER K WITH CEDILLA */
+  { 0x03f9, 0x0173 }, /*                     uogonek ų LATIN SMALL LETTER U WITH OGONEK */
+  { 0x03fd, 0x0169 }, /*                      utilde ũ LATIN SMALL LETTER U WITH TILDE */
+  { 0x03fe, 0x016b }, /*                     umacron ū LATIN SMALL LETTER U WITH MACRON */
+  { 0x047e, 0x203e }, /*                    overline ‾ OVERLINE */
+  { 0x04a1, 0x3002 }, /*               kana_fullstop 。 IDEOGRAPHIC FULL STOP */
+  { 0x04a2, 0x300c }, /*         kana_openingbracket 「 LEFT CORNER BRACKET */
+  { 0x04a3, 0x300d }, /*         kana_closingbracket 」 RIGHT CORNER BRACKET */
+  { 0x04a4, 0x3001 }, /*                  kana_comma 、 IDEOGRAPHIC COMMA */
+  { 0x04a5, 0x30fb }, /*            kana_conjunctive ・ KATAKANA MIDDLE DOT */
+  { 0x04a6, 0x30f2 }, /*                     kana_WO ヲ KATAKANA LETTER WO */
+  { 0x04a7, 0x30a1 }, /*                      kana_a ァ KATAKANA LETTER SMALL A */
+  { 0x04a8, 0x30a3 }, /*                      kana_i ィ KATAKANA LETTER SMALL I */
+  { 0x04a9, 0x30a5 }, /*                      kana_u ゥ KATAKANA LETTER SMALL U */
+  { 0x04aa, 0x30a7 }, /*                      kana_e ェ KATAKANA LETTER SMALL E */
+  { 0x04ab, 0x30a9 }, /*                      kana_o ォ KATAKANA LETTER SMALL O */
+  { 0x04ac, 0x30e3 }, /*                     kana_ya ャ KATAKANA LETTER SMALL YA */
+  { 0x04ad, 0x30e5 }, /*                     kana_yu ュ KATAKANA LETTER SMALL YU */
+  { 0x04ae, 0x30e7 }, /*                     kana_yo ョ KATAKANA LETTER SMALL YO */
+  { 0x04af, 0x30c3 }, /*                    kana_tsu ッ KATAKANA LETTER SMALL TU */
+  { 0x04b0, 0x30fc }, /*              prolongedsound ー KATAKANA-HIRAGANA PROLONGED SOUND MARK */
+  { 0x04b1, 0x30a2 }, /*                      kana_A ア KATAKANA LETTER A */
+  { 0x04b2, 0x30a4 }, /*                      kana_I イ KATAKANA LETTER I */
+  { 0x04b3, 0x30a6 }, /*                      kana_U ウ KATAKANA LETTER U */
+  { 0x04b4, 0x30a8 }, /*                      kana_E エ KATAKANA LETTER E */
+  { 0x04b5, 0x30aa }, /*                      kana_O オ KATAKANA LETTER O */
+  { 0x04b6, 0x30ab }, /*                     kana_KA カ KATAKANA LETTER KA */
+  { 0x04b7, 0x30ad }, /*                     kana_KI キ KATAKANA LETTER KI */
+  { 0x04b8, 0x30af }, /*                     kana_KU ク KATAKANA LETTER KU */
+  { 0x04b9, 0x30b1 }, /*                     kana_KE ケ KATAKANA LETTER KE */
+  { 0x04ba, 0x30b3 }, /*                     kana_KO コ KATAKANA LETTER KO */
+  { 0x04bb, 0x30b5 }, /*                     kana_SA サ KATAKANA LETTER SA */
+  { 0x04bc, 0x30b7 }, /*                    kana_SHI シ KATAKANA LETTER SI */
+  { 0x04bd, 0x30b9 }, /*                     kana_SU ス KATAKANA LETTER SU */
+  { 0x04be, 0x30bb }, /*                     kana_SE セ KATAKANA LETTER SE */
+  { 0x04bf, 0x30bd }, /*                     kana_SO ソ KATAKANA LETTER SO */
+  { 0x04c0, 0x30bf }, /*                     kana_TA タ KATAKANA LETTER TA */
+  { 0x04c1, 0x30c1 }, /*                    kana_CHI チ KATAKANA LETTER TI */
+  { 0x04c2, 0x30c4 }, /*                    kana_TSU ツ KATAKANA LETTER TU */
+  { 0x04c3, 0x30c6 }, /*                     kana_TE テ KATAKANA LETTER TE */
+  { 0x04c4, 0x30c8 }, /*                     kana_TO ト KATAKANA LETTER TO */
+  { 0x04c5, 0x30ca }, /*                     kana_NA ナ KATAKANA LETTER NA */
+  { 0x04c6, 0x30cb }, /*                     kana_NI ニ KATAKANA LETTER NI */
+  { 0x04c7, 0x30cc }, /*                     kana_NU ヌ KATAKANA LETTER NU */
+  { 0x04c8, 0x30cd }, /*                     kana_NE ネ KATAKANA LETTER NE */
+  { 0x04c9, 0x30ce }, /*                     kana_NO ノ KATAKANA LETTER NO */
+  { 0x04ca, 0x30cf }, /*                     kana_HA ハ KATAKANA LETTER HA */
+  { 0x04cb, 0x30d2 }, /*                     kana_HI ヒ KATAKANA LETTER HI */
+  { 0x04cc, 0x30d5 }, /*                     kana_FU フ KATAKANA LETTER HU */
+  { 0x04cd, 0x30d8 }, /*                     kana_HE ヘ KATAKANA LETTER HE */
+  { 0x04ce, 0x30db }, /*                     kana_HO ホ KATAKANA LETTER HO */
+  { 0x04cf, 0x30de }, /*                     kana_MA マ KATAKANA LETTER MA */
+  { 0x04d0, 0x30df }, /*                     kana_MI ミ KATAKANA LETTER MI */
+  { 0x04d1, 0x30e0 }, /*                     kana_MU ム KATAKANA LETTER MU */
+  { 0x04d2, 0x30e1 }, /*                     kana_ME メ KATAKANA LETTER ME */
+  { 0x04d3, 0x30e2 }, /*                     kana_MO モ KATAKANA LETTER MO */
+  { 0x04d4, 0x30e4 }, /*                     kana_YA ヤ KATAKANA LETTER YA */
+  { 0x04d5, 0x30e6 }, /*                     kana_YU ユ KATAKANA LETTER YU */
+  { 0x04d6, 0x30e8 }, /*                     kana_YO ヨ KATAKANA LETTER YO */
+  { 0x04d7, 0x30e9 }, /*                     kana_RA ラ KATAKANA LETTER RA */
+  { 0x04d8, 0x30ea }, /*                     kana_RI リ KATAKANA LETTER RI */
+  { 0x04d9, 0x30eb }, /*                     kana_RU ル KATAKANA LETTER RU */
+  { 0x04da, 0x30ec }, /*                     kana_RE レ KATAKANA LETTER RE */
+  { 0x04db, 0x30ed }, /*                     kana_RO ロ KATAKANA LETTER RO */
+  { 0x04dc, 0x30ef }, /*                     kana_WA ワ KATAKANA LETTER WA */
+  { 0x04dd, 0x30f3 }, /*                      kana_N ン KATAKANA LETTER N */
+  { 0x04de, 0x309b }, /*                 voicedsound ゛ KATAKANA-HIRAGANA VOICED SOUND MARK */
+  { 0x04df, 0x309c }, /*             semivoicedsound ゜ KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK */
+  { 0x05ac, 0x060c }, /*                Arabic_comma ، ARABIC COMMA */
+  { 0x05bb, 0x061b }, /*            Arabic_semicolon ؛ ARABIC SEMICOLON */
+  { 0x05bf, 0x061f }, /*        Arabic_question_mark ؟ ARABIC QUESTION MARK */
+  { 0x05c1, 0x0621 }, /*                Arabic_hamza ء ARABIC LETTER HAMZA */
+  { 0x05c2, 0x0622 }, /*          Arabic_maddaonalef آ ARABIC LETTER ALEF WITH MADDA ABOVE */
+  { 0x05c3, 0x0623 }, /*          Arabic_hamzaonalef أ ARABIC LETTER ALEF WITH HAMZA ABOVE */
+  { 0x05c4, 0x0624 }, /*           Arabic_hamzaonwaw ؤ ARABIC LETTER WAW WITH HAMZA ABOVE */
+  { 0x05c5, 0x0625 }, /*       Arabic_hamzaunderalef إ ARABIC LETTER ALEF WITH HAMZA BELOW */
+  { 0x05c6, 0x0626 }, /*           Arabic_hamzaonyeh ئ ARABIC LETTER YEH WITH HAMZA ABOVE */
+  { 0x05c7, 0x0627 }, /*                 Arabic_alef ا ARABIC LETTER ALEF */
+  { 0x05c8, 0x0628 }, /*                  Arabic_beh ب ARABIC LETTER BEH */
+  { 0x05c9, 0x0629 }, /*           Arabic_tehmarbuta ة ARABIC LETTER TEH MARBUTA */
+  { 0x05ca, 0x062a }, /*                  Arabic_teh ت ARABIC LETTER TEH */
+  { 0x05cb, 0x062b }, /*                 Arabic_theh ث ARABIC LETTER THEH */
+  { 0x05cc, 0x062c }, /*                 Arabic_jeem ج ARABIC LETTER JEEM */
+  { 0x05cd, 0x062d }, /*                  Arabic_hah ح ARABIC LETTER HAH */
+  { 0x05ce, 0x062e }, /*                 Arabic_khah خ ARABIC LETTER KHAH */
+  { 0x05cf, 0x062f }, /*                  Arabic_dal د ARABIC LETTER DAL */
+  { 0x05d0, 0x0630 }, /*                 Arabic_thal ذ ARABIC LETTER THAL */
+  { 0x05d1, 0x0631 }, /*                   Arabic_ra ر ARABIC LETTER REH */
+  { 0x05d2, 0x0632 }, /*                 Arabic_zain ز ARABIC LETTER ZAIN */
+  { 0x05d3, 0x0633 }, /*                 Arabic_seen س ARABIC LETTER SEEN */
+  { 0x05d4, 0x0634 }, /*                Arabic_sheen ش ARABIC LETTER SHEEN */
+  { 0x05d5, 0x0635 }, /*                  Arabic_sad ص ARABIC LETTER SAD */
+  { 0x05d6, 0x0636 }, /*                  Arabic_dad ض ARABIC LETTER DAD */
+  { 0x05d7, 0x0637 }, /*                  Arabic_tah ط ARABIC LETTER TAH */
+  { 0x05d8, 0x0638 }, /*                  Arabic_zah ظ ARABIC LETTER ZAH */
+  { 0x05d9, 0x0639 }, /*                  Arabic_ain ع ARABIC LETTER AIN */
+  { 0x05da, 0x063a }, /*                Arabic_ghain غ ARABIC LETTER GHAIN */
+  { 0x05e0, 0x0640 }, /*              Arabic_tatweel ـ ARABIC TATWEEL */
+  { 0x05e1, 0x0641 }, /*                  Arabic_feh ف ARABIC LETTER FEH */
+  { 0x05e2, 0x0642 }, /*                  Arabic_qaf ق ARABIC LETTER QAF */
+  { 0x05e3, 0x0643 }, /*                  Arabic_kaf ك ARABIC LETTER KAF */
+  { 0x05e4, 0x0644 }, /*                  Arabic_lam ل ARABIC LETTER LAM */
+  { 0x05e5, 0x0645 }, /*                 Arabic_meem م ARABIC LETTER MEEM */
+  { 0x05e6, 0x0646 }, /*                 Arabic_noon ن ARABIC LETTER NOON */
+  { 0x05e7, 0x0647 }, /*                   Arabic_ha ه ARABIC LETTER HEH */
+  { 0x05e8, 0x0648 }, /*                  Arabic_waw و ARABIC LETTER WAW */
+  { 0x05e9, 0x0649 }, /*          Arabic_alefmaksura ى ARABIC LETTER ALEF MAKSURA */
+  { 0x05ea, 0x064a }, /*                  Arabic_yeh ي ARABIC LETTER YEH */
+  { 0x05eb, 0x064b }, /*             Arabic_fathatan ً ARABIC FATHATAN */
+  { 0x05ec, 0x064c }, /*             Arabic_dammatan ٌ ARABIC DAMMATAN */
+  { 0x05ed, 0x064d }, /*             Arabic_kasratan ٍ ARABIC KASRATAN */
+  { 0x05ee, 0x064e }, /*                Arabic_fatha َ ARABIC FATHA */
+  { 0x05ef, 0x064f }, /*                Arabic_damma ُ ARABIC DAMMA */
+  { 0x05f0, 0x0650 }, /*                Arabic_kasra ِ ARABIC KASRA */
+  { 0x05f1, 0x0651 }, /*               Arabic_shadda ّ ARABIC SHADDA */
+  { 0x05f2, 0x0652 }, /*                Arabic_sukun ْ ARABIC SUKUN */
+  { 0x06a1, 0x0452 }, /*                 Serbian_dje ђ CYRILLIC SMALL LETTER DJE */
+  { 0x06a2, 0x0453 }, /*               Macedonia_gje ѓ CYRILLIC SMALL LETTER GJE */
+  { 0x06a3, 0x0451 }, /*                 Cyrillic_io ё CYRILLIC SMALL LETTER IO */
+  { 0x06a4, 0x0454 }, /*                Ukrainian_ie є CYRILLIC SMALL LETTER UKRAINIAN IE */
+  { 0x06a5, 0x0455 }, /*               Macedonia_dse ѕ CYRILLIC SMALL LETTER DZE */
+  { 0x06a6, 0x0456 }, /*                 Ukrainian_i і CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I */
+  { 0x06a7, 0x0457 }, /*                Ukrainian_yi ї CYRILLIC SMALL LETTER YI */
+  { 0x06a8, 0x0458 }, /*                 Cyrillic_je ј CYRILLIC SMALL LETTER JE */
+  { 0x06a9, 0x0459 }, /*                Cyrillic_lje љ CYRILLIC SMALL LETTER LJE */
+  { 0x06aa, 0x045a }, /*                Cyrillic_nje њ CYRILLIC SMALL LETTER NJE */
+  { 0x06ab, 0x045b }, /*                Serbian_tshe ћ CYRILLIC SMALL LETTER TSHE */
+  { 0x06ac, 0x045c }, /*               Macedonia_kje ќ CYRILLIC SMALL LETTER KJE */
+  { 0x06ae, 0x045e }, /*         Byelorussian_shortu ў CYRILLIC SMALL LETTER SHORT U */
+  { 0x06af, 0x045f }, /*               Cyrillic_dzhe џ CYRILLIC SMALL LETTER DZHE */
+  { 0x06b0, 0x2116 }, /*                  numerosign № NUMERO SIGN */
+  { 0x06b1, 0x0402 }, /*                 Serbian_DJE Ђ CYRILLIC CAPITAL LETTER DJE */
+  { 0x06b2, 0x0403 }, /*               Macedonia_GJE Ѓ CYRILLIC CAPITAL LETTER GJE */
+  { 0x06b3, 0x0401 }, /*                 Cyrillic_IO Ё CYRILLIC CAPITAL LETTER IO */
+  { 0x06b4, 0x0404 }, /*                Ukrainian_IE Є CYRILLIC CAPITAL LETTER UKRAINIAN IE */
+  { 0x06b5, 0x0405 }, /*               Macedonia_DSE Ѕ CYRILLIC CAPITAL LETTER DZE */
+  { 0x06b6, 0x0406 }, /*                 Ukrainian_I І CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I */
+  { 0x06b7, 0x0407 }, /*                Ukrainian_YI Ї CYRILLIC CAPITAL LETTER YI */
+  { 0x06b8, 0x0408 }, /*                 Cyrillic_JE Ј CYRILLIC CAPITAL LETTER JE */
+  { 0x06b9, 0x0409 }, /*                Cyrillic_LJE Љ CYRILLIC CAPITAL LETTER LJE */
+  { 0x06ba, 0x040a }, /*                Cyrillic_NJE Њ CYRILLIC CAPITAL LETTER NJE */
+  { 0x06bb, 0x040b }, /*                Serbian_TSHE Ћ CYRILLIC CAPITAL LETTER TSHE */
+  { 0x06bc, 0x040c }, /*               Macedonia_KJE Ќ CYRILLIC CAPITAL LETTER KJE */
+  { 0x06be, 0x040e }, /*         Byelorussian_SHORTU Ў CYRILLIC CAPITAL LETTER SHORT U */
+  { 0x06bf, 0x040f }, /*               Cyrillic_DZHE Џ CYRILLIC CAPITAL LETTER DZHE */
+  { 0x06c0, 0x044e }, /*                 Cyrillic_yu ю CYRILLIC SMALL LETTER YU */
+  { 0x06c1, 0x0430 }, /*                  Cyrillic_a а CYRILLIC SMALL LETTER A */
+  { 0x06c2, 0x0431 }, /*                 Cyrillic_be б CYRILLIC SMALL LETTER BE */
+  { 0x06c3, 0x0446 }, /*                Cyrillic_tse ц CYRILLIC SMALL LETTER TSE */
+  { 0x06c4, 0x0434 }, /*                 Cyrillic_de д CYRILLIC SMALL LETTER DE */
+  { 0x06c5, 0x0435 }, /*                 Cyrillic_ie е CYRILLIC SMALL LETTER IE */
+  { 0x06c6, 0x0444 }, /*                 Cyrillic_ef ф CYRILLIC SMALL LETTER EF */
+  { 0x06c7, 0x0433 }, /*                Cyrillic_ghe г CYRILLIC SMALL LETTER GHE */
+  { 0x06c8, 0x0445 }, /*                 Cyrillic_ha х CYRILLIC SMALL LETTER HA */
+  { 0x06c9, 0x0438 }, /*                  Cyrillic_i и CYRILLIC SMALL LETTER I */
+  { 0x06ca, 0x0439 }, /*             Cyrillic_shorti й CYRILLIC SMALL LETTER SHORT I */
+  { 0x06cb, 0x043a }, /*                 Cyrillic_ka к CYRILLIC SMALL LETTER KA */
+  { 0x06cc, 0x043b }, /*                 Cyrillic_el л CYRILLIC SMALL LETTER EL */
+  { 0x06cd, 0x043c }, /*                 Cyrillic_em м CYRILLIC SMALL LETTER EM */
+  { 0x06ce, 0x043d }, /*                 Cyrillic_en н CYRILLIC SMALL LETTER EN */
+  { 0x06cf, 0x043e }, /*                  Cyrillic_o о CYRILLIC SMALL LETTER O */
+  { 0x06d0, 0x043f }, /*                 Cyrillic_pe п CYRILLIC SMALL LETTER PE */
+  { 0x06d1, 0x044f }, /*                 Cyrillic_ya я CYRILLIC SMALL LETTER YA */
+  { 0x06d2, 0x0440 }, /*                 Cyrillic_er р CYRILLIC SMALL LETTER ER */
+  { 0x06d3, 0x0441 }, /*                 Cyrillic_es с CYRILLIC SMALL LETTER ES */
+  { 0x06d4, 0x0442 }, /*                 Cyrillic_te т CYRILLIC SMALL LETTER TE */
+  { 0x06d5, 0x0443 }, /*                  Cyrillic_u у CYRILLIC SMALL LETTER U */
+  { 0x06d6, 0x0436 }, /*                Cyrillic_zhe ж CYRILLIC SMALL LETTER ZHE */
+  { 0x06d7, 0x0432 }, /*                 Cyrillic_ve в CYRILLIC SMALL LETTER VE */
+  { 0x06d8, 0x044c }, /*           Cyrillic_softsign ь CYRILLIC SMALL LETTER SOFT SIGN */
+  { 0x06d9, 0x044b }, /*               Cyrillic_yeru ы CYRILLIC SMALL LETTER YERU */
+  { 0x06da, 0x0437 }, /*                 Cyrillic_ze з CYRILLIC SMALL LETTER ZE */
+  { 0x06db, 0x0448 }, /*                Cyrillic_sha ш CYRILLIC SMALL LETTER SHA */
+  { 0x06dc, 0x044d }, /*                  Cyrillic_e э CYRILLIC SMALL LETTER E */
+  { 0x06dd, 0x0449 }, /*              Cyrillic_shcha щ CYRILLIC SMALL LETTER SHCHA */
+  { 0x06de, 0x0447 }, /*                Cyrillic_che ч CYRILLIC SMALL LETTER CHE */
+  { 0x06df, 0x044a }, /*           Cyrillic_hardsign ъ CYRILLIC SMALL LETTER HARD SIGN */
+  { 0x06e0, 0x042e }, /*                 Cyrillic_YU Ю CYRILLIC CAPITAL LETTER YU */
+  { 0x06e1, 0x0410 }, /*                  Cyrillic_A А CYRILLIC CAPITAL LETTER A */
+  { 0x06e2, 0x0411 }, /*                 Cyrillic_BE Б CYRILLIC CAPITAL LETTER BE */
+  { 0x06e3, 0x0426 }, /*                Cyrillic_TSE Ц CYRILLIC CAPITAL LETTER TSE */
+  { 0x06e4, 0x0414 }, /*                 Cyrillic_DE Д CYRILLIC CAPITAL LETTER DE */
+  { 0x06e5, 0x0415 }, /*                 Cyrillic_IE Е CYRILLIC CAPITAL LETTER IE */
+  { 0x06e6, 0x0424 }, /*                 Cyrillic_EF Ф CYRILLIC CAPITAL LETTER EF */
+  { 0x06e7, 0x0413 }, /*                Cyrillic_GHE Г CYRILLIC CAPITAL LETTER GHE */
+  { 0x06e8, 0x0425 }, /*                 Cyrillic_HA Х CYRILLIC CAPITAL LETTER HA */
+  { 0x06e9, 0x0418 }, /*                  Cyrillic_I И CYRILLIC CAPITAL LETTER I */
+  { 0x06ea, 0x0419 }, /*             Cyrillic_SHORTI Й CYRILLIC CAPITAL LETTER SHORT I */
+  { 0x06eb, 0x041a }, /*                 Cyrillic_KA К CYRILLIC CAPITAL LETTER KA */
+  { 0x06ec, 0x041b }, /*                 Cyrillic_EL Л CYRILLIC CAPITAL LETTER EL */
+  { 0x06ed, 0x041c }, /*                 Cyrillic_EM М CYRILLIC CAPITAL LETTER EM */
+  { 0x06ee, 0x041d }, /*                 Cyrillic_EN Н CYRILLIC CAPITAL LETTER EN */
+  { 0x06ef, 0x041e }, /*                  Cyrillic_O О CYRILLIC CAPITAL LETTER O */
+  { 0x06f0, 0x041f }, /*                 Cyrillic_PE П CYRILLIC CAPITAL LETTER PE */
+  { 0x06f1, 0x042f }, /*                 Cyrillic_YA Я CYRILLIC CAPITAL LETTER YA */
+  { 0x06f2, 0x0420 }, /*                 Cyrillic_ER Р CYRILLIC CAPITAL LETTER ER */
+  { 0x06f3, 0x0421 }, /*                 Cyrillic_ES С CYRILLIC CAPITAL LETTER ES */
+  { 0x06f4, 0x0422 }, /*                 Cyrillic_TE Т CYRILLIC CAPITAL LETTER TE */
+  { 0x06f5, 0x0423 }, /*                  Cyrillic_U У CYRILLIC CAPITAL LETTER U */
+  { 0x06f6, 0x0416 }, /*                Cyrillic_ZHE Ж CYRILLIC CAPITAL LETTER ZHE */
+  { 0x06f7, 0x0412 }, /*                 Cyrillic_VE В CYRILLIC CAPITAL LETTER VE */
+  { 0x06f8, 0x042c }, /*           Cyrillic_SOFTSIGN Ь CYRILLIC CAPITAL LETTER SOFT SIGN */
+  { 0x06f9, 0x042b }, /*               Cyrillic_YERU Ы CYRILLIC CAPITAL LETTER YERU */
+  { 0x06fa, 0x0417 }, /*                 Cyrillic_ZE З CYRILLIC CAPITAL LETTER ZE */
+  { 0x06fb, 0x0428 }, /*                Cyrillic_SHA Ш CYRILLIC CAPITAL LETTER SHA */
+  { 0x06fc, 0x042d }, /*                  Cyrillic_E Э CYRILLIC CAPITAL LETTER E */
+  { 0x06fd, 0x0429 }, /*              Cyrillic_SHCHA Щ CYRILLIC CAPITAL LETTER SHCHA */
+  { 0x06fe, 0x0427 }, /*                Cyrillic_CHE Ч CYRILLIC CAPITAL LETTER CHE */
+  { 0x06ff, 0x042a }, /*           Cyrillic_HARDSIGN Ъ CYRILLIC CAPITAL LETTER HARD SIGN */
+  { 0x07a1, 0x0386 }, /*           Greek_ALPHAaccent Ά GREEK CAPITAL LETTER ALPHA WITH TONOS */
+  { 0x07a2, 0x0388 }, /*         Greek_EPSILONaccent Έ GREEK CAPITAL LETTER EPSILON WITH TONOS */
+  { 0x07a3, 0x0389 }, /*             Greek_ETAaccent Ή GREEK CAPITAL LETTER ETA WITH TONOS */
+  { 0x07a4, 0x038a }, /*            Greek_IOTAaccent Ί GREEK CAPITAL LETTER IOTA WITH TONOS */
+  { 0x07a5, 0x03aa }, /*         Greek_IOTAdiaeresis Ϊ GREEK CAPITAL LETTER IOTA WITH DIALYTIKA */
+  { 0x07a7, 0x038c }, /*         Greek_OMICRONaccent Ό GREEK CAPITAL LETTER OMICRON WITH TONOS */
+  { 0x07a8, 0x038e }, /*         Greek_UPSILONaccent Ύ GREEK CAPITAL LETTER UPSILON WITH TONOS */
+  { 0x07a9, 0x03ab }, /*       Greek_UPSILONdieresis Ϋ GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA */
+  { 0x07ab, 0x038f }, /*           Greek_OMEGAaccent Ώ GREEK CAPITAL LETTER OMEGA WITH TONOS */
+  { 0x07ae, 0x0385 }, /*        Greek_accentdieresis ΅ GREEK DIALYTIKA TONOS */
+  { 0x07af, 0x2015 }, /*              Greek_horizbar ― HORIZONTAL BAR */
+  { 0x07b1, 0x03ac }, /*           Greek_alphaaccent ά GREEK SMALL LETTER ALPHA WITH TONOS */
+  { 0x07b2, 0x03ad }, /*         Greek_epsilonaccent έ GREEK SMALL LETTER EPSILON WITH TONOS */
+  { 0x07b3, 0x03ae }, /*             Greek_etaaccent ή GREEK SMALL LETTER ETA WITH TONOS */
+  { 0x07b4, 0x03af }, /*            Greek_iotaaccent ί GREEK SMALL LETTER IOTA WITH TONOS */
+  { 0x07b5, 0x03ca }, /*          Greek_iotadieresis ϊ GREEK SMALL LETTER IOTA WITH DIALYTIKA */
+  { 0x07b6, 0x0390 }, /*    Greek_iotaaccentdieresis ΐ GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS */
+  { 0x07b7, 0x03cc }, /*         Greek_omicronaccent ό GREEK SMALL LETTER OMICRON WITH TONOS */
+  { 0x07b8, 0x03cd }, /*         Greek_upsilonaccent ύ GREEK SMALL LETTER UPSILON WITH TONOS */
+  { 0x07b9, 0x03cb }, /*       Greek_upsilondieresis ϋ GREEK SMALL LETTER UPSILON WITH DIALYTIKA */
+  { 0x07ba, 0x03b0 }, /* Greek_upsilonaccentdieresis ΰ GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS */
+  { 0x07bb, 0x03ce }, /*           Greek_omegaaccent ώ GREEK SMALL LETTER OMEGA WITH TONOS */
+  { 0x07c1, 0x0391 }, /*                 Greek_ALPHA Α GREEK CAPITAL LETTER ALPHA */
+  { 0x07c2, 0x0392 }, /*                  Greek_BETA Β GREEK CAPITAL LETTER BETA */
+  { 0x07c3, 0x0393 }, /*                 Greek_GAMMA Γ GREEK CAPITAL LETTER GAMMA */
+  { 0x07c4, 0x0394 }, /*                 Greek_DELTA Δ GREEK CAPITAL LETTER DELTA */
+  { 0x07c5, 0x0395 }, /*               Greek_EPSILON Ε GREEK CAPITAL LETTER EPSILON */
+  { 0x07c6, 0x0396 }, /*                  Greek_ZETA Ζ GREEK CAPITAL LETTER ZETA */
+  { 0x07c7, 0x0397 }, /*                   Greek_ETA Η GREEK CAPITAL LETTER ETA */
+  { 0x07c8, 0x0398 }, /*                 Greek_THETA Θ GREEK CAPITAL LETTER THETA */
+  { 0x07c9, 0x0399 }, /*                  Greek_IOTA Ι GREEK CAPITAL LETTER IOTA */
+  { 0x07ca, 0x039a }, /*                 Greek_KAPPA Κ GREEK CAPITAL LETTER KAPPA */
+  { 0x07cb, 0x039b }, /*                Greek_LAMBDA Λ GREEK CAPITAL LETTER LAMDA */
+  { 0x07cc, 0x039c }, /*                    Greek_MU Μ GREEK CAPITAL LETTER MU */
+  { 0x07cd, 0x039d }, /*                    Greek_NU Ν GREEK CAPITAL LETTER NU */
+  { 0x07ce, 0x039e }, /*                    Greek_XI Ξ GREEK CAPITAL LETTER XI */
+  { 0x07cf, 0x039f }, /*               Greek_OMICRON Ο GREEK CAPITAL LETTER OMICRON */
+  { 0x07d0, 0x03a0 }, /*                    Greek_PI Π GREEK CAPITAL LETTER PI */
+  { 0x07d1, 0x03a1 }, /*                   Greek_RHO Ρ GREEK CAPITAL LETTER RHO */
+  { 0x07d2, 0x03a3 }, /*                 Greek_SIGMA Σ GREEK CAPITAL LETTER SIGMA */
+  { 0x07d4, 0x03a4 }, /*                   Greek_TAU Τ GREEK CAPITAL LETTER TAU */
+  { 0x07d5, 0x03a5 }, /*               Greek_UPSILON Υ GREEK CAPITAL LETTER UPSILON */
+  { 0x07d6, 0x03a6 }, /*                   Greek_PHI Φ GREEK CAPITAL LETTER PHI */
+  { 0x07d7, 0x03a7 }, /*                   Greek_CHI Χ GREEK CAPITAL LETTER CHI */
+  { 0x07d8, 0x03a8 }, /*                   Greek_PSI Ψ GREEK CAPITAL LETTER PSI */
+  { 0x07d9, 0x03a9 }, /*                 Greek_OMEGA Ω GREEK CAPITAL LETTER OMEGA */
+  { 0x07e1, 0x03b1 }, /*                 Greek_alpha α GREEK SMALL LETTER ALPHA */
+  { 0x07e2, 0x03b2 }, /*                  Greek_beta β GREEK SMALL LETTER BETA */
+  { 0x07e3, 0x03b3 }, /*                 Greek_gamma γ GREEK SMALL LETTER GAMMA */
+  { 0x07e4, 0x03b4 }, /*                 Greek_delta δ GREEK SMALL LETTER DELTA */
+  { 0x07e5, 0x03b5 }, /*               Greek_epsilon ε GREEK SMALL LETTER EPSILON */
+  { 0x07e6, 0x03b6 }, /*                  Greek_zeta ζ GREEK SMALL LETTER ZETA */
+  { 0x07e7, 0x03b7 }, /*                   Greek_eta η GREEK SMALL LETTER ETA */
+  { 0x07e8, 0x03b8 }, /*                 Greek_theta θ GREEK SMALL LETTER THETA */
+  { 0x07e9, 0x03b9 }, /*                  Greek_iota ι GREEK SMALL LETTER IOTA */
+  { 0x07ea, 0x03ba }, /*                 Greek_kappa κ GREEK SMALL LETTER KAPPA */
+  { 0x07eb, 0x03bb }, /*                Greek_lambda λ GREEK SMALL LETTER LAMDA */
+  { 0x07ec, 0x03bc }, /*                    Greek_mu μ GREEK SMALL LETTER MU */
+  { 0x07ed, 0x03bd }, /*                    Greek_nu ν GREEK SMALL LETTER NU */
+  { 0x07ee, 0x03be }, /*                    Greek_xi ξ GREEK SMALL LETTER XI */
+  { 0x07ef, 0x03bf }, /*               Greek_omicron ο GREEK SMALL LETTER OMICRON */
+  { 0x07f0, 0x03c0 }, /*                    Greek_pi π GREEK SMALL LETTER PI */
+  { 0x07f1, 0x03c1 }, /*                   Greek_rho ρ GREEK SMALL LETTER RHO */
+  { 0x07f2, 0x03c3 }, /*                 Greek_sigma σ GREEK SMALL LETTER SIGMA */
+  { 0x07f3, 0x03c2 }, /*       Greek_finalsmallsigma ς GREEK SMALL LETTER FINAL SIGMA */
+  { 0x07f4, 0x03c4 }, /*                   Greek_tau τ GREEK SMALL LETTER TAU */
+  { 0x07f5, 0x03c5 }, /*               Greek_upsilon υ GREEK SMALL LETTER UPSILON */
+  { 0x07f6, 0x03c6 }, /*                   Greek_phi φ GREEK SMALL LETTER PHI */
+  { 0x07f7, 0x03c7 }, /*                   Greek_chi χ GREEK SMALL LETTER CHI */
+  { 0x07f8, 0x03c8 }, /*                   Greek_psi ψ GREEK SMALL LETTER PSI */
+  { 0x07f9, 0x03c9 }, /*                 Greek_omega ω GREEK SMALL LETTER OMEGA */
+  { 0x08a1, 0x23b7 }, /*                 leftradical ⎷ ??? */
+  { 0x08a2, 0x250c }, /*              topleftradical ┌ BOX DRAWINGS LIGHT DOWN AND RIGHT */
+  { 0x08a3, 0x2500 }, /*              horizconnector ─ BOX DRAWINGS LIGHT HORIZONTAL */
+  { 0x08a4, 0x2320 }, /*                 topintegral ⌠ TOP HALF INTEGRAL */
+  { 0x08a5, 0x2321 }, /*                 botintegral ⌡ BOTTOM HALF INTEGRAL */
+  { 0x08a6, 0x2502 }, /*               vertconnector │ BOX DRAWINGS LIGHT VERTICAL */
+  { 0x08a7, 0x23a1 }, /*            topleftsqbracket ⎡ ??? */
+  { 0x08a8, 0x23a3 }, /*            botleftsqbracket ⎣ ??? */
+  { 0x08a9, 0x23a4 }, /*           toprightsqbracket ⎤ ??? */
+  { 0x08aa, 0x23a6 }, /*           botrightsqbracket ⎦ ??? */
+  { 0x08ab, 0x239b }, /*               topleftparens ⎛ ??? */
+  { 0x08ac, 0x239d }, /*               botleftparens ⎝ ??? */
+  { 0x08ad, 0x239e }, /*              toprightparens ⎞ ??? */
+  { 0x08ae, 0x23a0 }, /*              botrightparens ⎠ ??? */
+  { 0x08af, 0x23a8 }, /*        leftmiddlecurlybrace ⎨ ??? */
+  { 0x08b0, 0x23ac }, /*       rightmiddlecurlybrace ⎬ ??? */
+/*  0x08b1                          topleftsummation ? ??? */
+/*  0x08b2                          botleftsummation ? ??? */
+/*  0x08b3                 topvertsummationconnector ? ??? */
+/*  0x08b4                 botvertsummationconnector ? ??? */
+/*  0x08b5                         toprightsummation ? ??? */
+/*  0x08b6                         botrightsummation ? ??? */
+/*  0x08b7                      rightmiddlesummation ? ??? */
+  { 0x08bc, 0x2264 }, /*               lessthanequal ≤ LESS-THAN OR EQUAL TO */
+  { 0x08bd, 0x2260 }, /*                    notequal ≠ NOT EQUAL TO */
+  { 0x08be, 0x2265 }, /*            greaterthanequal ≥ GREATER-THAN OR EQUAL TO */
+  { 0x08bf, 0x222b }, /*                    integral ∫ INTEGRAL */
+  { 0x08c0, 0x2234 }, /*                   therefore ∴ THEREFORE */
+  { 0x08c1, 0x221d }, /*                   variation ∝ PROPORTIONAL TO */
+  { 0x08c2, 0x221e }, /*                    infinity ∞ INFINITY */
+  { 0x08c5, 0x2207 }, /*                       nabla ∇ NABLA */
+  { 0x08c8, 0x223c }, /*                 approximate ∼ TILDE OPERATOR */
+  { 0x08c9, 0x2243 }, /*                similarequal ≃ ASYMPTOTICALLY EQUAL TO */
+  { 0x08cd, 0x21d4 }, /*                    ifonlyif ⇔ LEFT RIGHT DOUBLE ARROW */
+  { 0x08ce, 0x21d2 }, /*                     implies ⇒ RIGHTWARDS DOUBLE ARROW */
+  { 0x08cf, 0x2261 }, /*                   identical ≡ IDENTICAL TO */
+  { 0x08d6, 0x221a }, /*                     radical √ SQUARE ROOT */
+  { 0x08da, 0x2282 }, /*                  includedin ⊂ SUBSET OF */
+  { 0x08db, 0x2283 }, /*                    includes ⊃ SUPERSET OF */
+  { 0x08dc, 0x2229 }, /*                intersection ∩ INTERSECTION */
+  { 0x08dd, 0x222a }, /*                       union ∪ UNION */
+  { 0x08de, 0x2227 }, /*                  logicaland ∧ LOGICAL AND */
+  { 0x08df, 0x2228 }, /*                   logicalor ∨ LOGICAL OR */
+  { 0x08ef, 0x2202 }, /*           partialderivative ∂ PARTIAL DIFFERENTIAL */
+  { 0x08f6, 0x0192 }, /*                    function ƒ LATIN SMALL LETTER F WITH HOOK */
+  { 0x08fb, 0x2190 }, /*                   leftarrow ← LEFTWARDS ARROW */
+  { 0x08fc, 0x2191 }, /*                     uparrow ↑ UPWARDS ARROW */
+  { 0x08fd, 0x2192 }, /*                  rightarrow → RIGHTWARDS ARROW */
+  { 0x08fe, 0x2193 }, /*                   downarrow ↓ DOWNWARDS ARROW */
+/*  0x09df                                     blank ? ??? */
+  { 0x09e0, 0x25c6 }, /*                soliddiamond ◆ BLACK DIAMOND */
+  { 0x09e1, 0x2592 }, /*                checkerboard ▒ MEDIUM SHADE */
+  { 0x09e2, 0x2409 }, /*                          ht ␉ SYMBOL FOR HORIZONTAL TABULATION */
+  { 0x09e3, 0x240c }, /*                          ff ␌ SYMBOL FOR FORM FEED */
+  { 0x09e4, 0x240d }, /*                          cr ␍ SYMBOL FOR CARRIAGE RETURN */
+  { 0x09e5, 0x240a }, /*                          lf ␊ SYMBOL FOR LINE FEED */
+  { 0x09e8, 0x2424 }, /*                          nl ␤ SYMBOL FOR NEWLINE */
+  { 0x09e9, 0x240b }, /*                          vt ␋ SYMBOL FOR VERTICAL TABULATION */
+  { 0x09ea, 0x2518 }, /*              lowrightcorner ┘ BOX DRAWINGS LIGHT UP AND LEFT */
+  { 0x09eb, 0x2510 }, /*               uprightcorner ┐ BOX DRAWINGS LIGHT DOWN AND LEFT */
+  { 0x09ec, 0x250c }, /*                upleftcorner ┌ BOX DRAWINGS LIGHT DOWN AND RIGHT */
+  { 0x09ed, 0x2514 }, /*               lowleftcorner └ BOX DRAWINGS LIGHT UP AND RIGHT */
+  { 0x09ee, 0x253c }, /*               crossinglines ┼ BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL */
+  { 0x09ef, 0x23ba }, /*              horizlinescan1 ⎺ HORIZONTAL SCAN LINE-1 (Unicode 3.2 draft) */
+  { 0x09f0, 0x23bb }, /*              horizlinescan3 ⎻ HORIZONTAL SCAN LINE-3 (Unicode 3.2 draft) */
+  { 0x09f1, 0x2500 }, /*              horizlinescan5 ─ BOX DRAWINGS LIGHT HORIZONTAL */
+  { 0x09f2, 0x23bc }, /*              horizlinescan7 ⎼ HORIZONTAL SCAN LINE-7 (Unicode 3.2 draft) */
+  { 0x09f3, 0x23bd }, /*              horizlinescan9 ⎽ HORIZONTAL SCAN LINE-9 (Unicode 3.2 draft) */
+  { 0x09f4, 0x251c }, /*                       leftt ├ BOX DRAWINGS LIGHT VERTICAL AND RIGHT */
+  { 0x09f5, 0x2524 }, /*                      rightt ┤ BOX DRAWINGS LIGHT VERTICAL AND LEFT */
+  { 0x09f6, 0x2534 }, /*                        bott ┴ BOX DRAWINGS LIGHT UP AND HORIZONTAL */
+  { 0x09f7, 0x252c }, /*                        topt ┬ BOX DRAWINGS LIGHT DOWN AND HORIZONTAL */
+  { 0x09f8, 0x2502 }, /*                     vertbar │ BOX DRAWINGS LIGHT VERTICAL */
+  { 0x0aa1, 0x2003 }, /*                     emspace   EM SPACE */
+  { 0x0aa2, 0x2002 }, /*                     enspace   EN SPACE */
+  { 0x0aa3, 0x2004 }, /*                    em3space   THREE-PER-EM SPACE */
+  { 0x0aa4, 0x2005 }, /*                    em4space   FOUR-PER-EM SPACE */
+  { 0x0aa5, 0x2007 }, /*                  digitspace   FIGURE SPACE */
+  { 0x0aa6, 0x2008 }, /*                  punctspace   PUNCTUATION SPACE */
+  { 0x0aa7, 0x2009 }, /*                   thinspace   THIN SPACE */
+  { 0x0aa8, 0x200a }, /*                   hairspace   HAIR SPACE */
+  { 0x0aa9, 0x2014 }, /*                      emdash — EM DASH */
+  { 0x0aaa, 0x2013 }, /*                      endash – EN DASH */
+/*  0x0aac                               signifblank ? ??? */
+  { 0x0aae, 0x2026 }, /*                    ellipsis … HORIZONTAL ELLIPSIS */
+  { 0x0aaf, 0x2025 }, /*             doubbaselinedot ‥ TWO DOT LEADER */
+  { 0x0ab0, 0x2153 }, /*                    onethird ⅓ VULGAR FRACTION ONE THIRD */
+  { 0x0ab1, 0x2154 }, /*                   twothirds ⅔ VULGAR FRACTION TWO THIRDS */
+  { 0x0ab2, 0x2155 }, /*                    onefifth ⅕ VULGAR FRACTION ONE FIFTH */
+  { 0x0ab3, 0x2156 }, /*                   twofifths ⅖ VULGAR FRACTION TWO FIFTHS */
+  { 0x0ab4, 0x2157 }, /*                 threefifths ⅗ VULGAR FRACTION THREE FIFTHS */
+  { 0x0ab5, 0x2158 }, /*                  fourfifths ⅘ VULGAR FRACTION FOUR FIFTHS */
+  { 0x0ab6, 0x2159 }, /*                    onesixth ⅙ VULGAR FRACTION ONE SIXTH */
+  { 0x0ab7, 0x215a }, /*                  fivesixths ⅚ VULGAR FRACTION FIVE SIXTHS */
+  { 0x0ab8, 0x2105 }, /*                      careof ℅ CARE OF */
+  { 0x0abb, 0x2012 }, /*                     figdash ‒ FIGURE DASH */
+  { 0x0abc, 0x2329 }, /*            leftanglebracket 〈 LEFT-POINTING ANGLE BRACKET */
+/*  0x0abd                              decimalpoint ? ??? */
+  { 0x0abe, 0x232a }, /*           rightanglebracket 〉 RIGHT-POINTING ANGLE BRACKET */
+/*  0x0abf                                    marker ? ??? */
+  { 0x0ac3, 0x215b }, /*                   oneeighth ⅛ VULGAR FRACTION ONE EIGHTH */
+  { 0x0ac4, 0x215c }, /*                threeeighths ⅜ VULGAR FRACTION THREE EIGHTHS */
+  { 0x0ac5, 0x215d }, /*                 fiveeighths ⅝ VULGAR FRACTION FIVE EIGHTHS */
+  { 0x0ac6, 0x215e }, /*                seveneighths ⅞ VULGAR FRACTION SEVEN EIGHTHS */
+  { 0x0ac9, 0x2122 }, /*                   trademark ™ TRADE MARK SIGN */
+  { 0x0aca, 0x2613 }, /*               signaturemark ☓ SALTIRE */
+/*  0x0acb                         trademarkincircle ? ??? */
+  { 0x0acc, 0x25c1 }, /*            leftopentriangle ◁ WHITE LEFT-POINTING TRIANGLE */
+  { 0x0acd, 0x25b7 }, /*           rightopentriangle ▷ WHITE RIGHT-POINTING TRIANGLE */
+  { 0x0ace, 0x25cb }, /*                emopencircle ○ WHITE CIRCLE */
+  { 0x0acf, 0x25af }, /*             emopenrectangle ▯ WHITE VERTICAL RECTANGLE */
+  { 0x0ad0, 0x2018 }, /*         leftsinglequotemark ‘ LEFT SINGLE QUOTATION MARK */
+  { 0x0ad1, 0x2019 }, /*        rightsinglequotemark ’ RIGHT SINGLE QUOTATION MARK */
+  { 0x0ad2, 0x201c }, /*         leftdoublequotemark “ LEFT DOUBLE QUOTATION MARK */
+  { 0x0ad3, 0x201d }, /*        rightdoublequotemark ” RIGHT DOUBLE QUOTATION MARK */
+  { 0x0ad4, 0x211e }, /*                prescription ℞ PRESCRIPTION TAKE */
+  { 0x0ad6, 0x2032 }, /*                     minutes ′ PRIME */
+  { 0x0ad7, 0x2033 }, /*                     seconds ″ DOUBLE PRIME */
+  { 0x0ad9, 0x271d }, /*                  latincross ✝ LATIN CROSS */
+/*  0x0ada                                  hexagram ? ??? */
+  { 0x0adb, 0x25ac }, /*            filledrectbullet ▬ BLACK RECTANGLE */
+  { 0x0adc, 0x25c0 }, /*         filledlefttribullet ◀ BLACK LEFT-POINTING TRIANGLE */
+  { 0x0add, 0x25b6 }, /*        filledrighttribullet ▶ BLACK RIGHT-POINTING TRIANGLE */
+  { 0x0ade, 0x25cf }, /*              emfilledcircle ● BLACK CIRCLE */
+  { 0x0adf, 0x25ae }, /*                emfilledrect ▮ BLACK VERTICAL RECTANGLE */
+  { 0x0ae0, 0x25e6 }, /*            enopencircbullet ◦ WHITE BULLET */
+  { 0x0ae1, 0x25ab }, /*          enopensquarebullet ▫ WHITE SMALL SQUARE */
+  { 0x0ae2, 0x25ad }, /*              openrectbullet ▭ WHITE RECTANGLE */
+  { 0x0ae3, 0x25b3 }, /*             opentribulletup △ WHITE UP-POINTING TRIANGLE */
+  { 0x0ae4, 0x25bd }, /*           opentribulletdown ▽ WHITE DOWN-POINTING TRIANGLE */
+  { 0x0ae5, 0x2606 }, /*                    openstar ☆ WHITE STAR */
+  { 0x0ae6, 0x2022 }, /*          enfilledcircbullet • BULLET */
+  { 0x0ae7, 0x25aa }, /*            enfilledsqbullet ▪ BLACK SMALL SQUARE */
+  { 0x0ae8, 0x25b2 }, /*           filledtribulletup ▲ BLACK UP-POINTING TRIANGLE */
+  { 0x0ae9, 0x25bc }, /*         filledtribulletdown ▼ BLACK DOWN-POINTING TRIANGLE */
+  { 0x0aea, 0x261c }, /*                 leftpointer ☜ WHITE LEFT POINTING INDEX */
+  { 0x0aeb, 0x261e }, /*                rightpointer ☞ WHITE RIGHT POINTING INDEX */
+  { 0x0aec, 0x2663 }, /*                        club ♣ BLACK CLUB SUIT */
+  { 0x0aed, 0x2666 }, /*                     diamond ♦ BLACK DIAMOND SUIT */
+  { 0x0aee, 0x2665 }, /*                       heart ♥ BLACK HEART SUIT */
+  { 0x0af0, 0x2720 }, /*                maltesecross ✠ MALTESE CROSS */
+  { 0x0af1, 0x2020 }, /*                      dagger † DAGGER */
+  { 0x0af2, 0x2021 }, /*                doubledagger ‡ DOUBLE DAGGER */
+  { 0x0af3, 0x2713 }, /*                   checkmark ✓ CHECK MARK */
+  { 0x0af4, 0x2717 }, /*                 ballotcross ✗ BALLOT X */
+  { 0x0af5, 0x266f }, /*                musicalsharp ♯ MUSIC SHARP SIGN */
+  { 0x0af6, 0x266d }, /*                 musicalflat ♭ MUSIC FLAT SIGN */
+  { 0x0af7, 0x2642 }, /*                  malesymbol ♂ MALE SIGN */
+  { 0x0af8, 0x2640 }, /*                femalesymbol ♀ FEMALE SIGN */
+  { 0x0af9, 0x260e }, /*                   telephone ☎ BLACK TELEPHONE */
+  { 0x0afa, 0x2315 }, /*           telephonerecorder ⌕ TELEPHONE RECORDER */
+  { 0x0afb, 0x2117 }, /*         phonographcopyright ℗ SOUND RECORDING COPYRIGHT */
+  { 0x0afc, 0x2038 }, /*                       caret ‸ CARET */
+  { 0x0afd, 0x201a }, /*          singlelowquotemark ‚ SINGLE LOW-9 QUOTATION MARK */
+  { 0x0afe, 0x201e }, /*          doublelowquotemark „ DOUBLE LOW-9 QUOTATION MARK */
+/*  0x0aff                                    cursor ? ??? */
+  { 0x0ba3, 0x003c }, /*                   leftcaret < LESS-THAN SIGN */
+  { 0x0ba6, 0x003e }, /*                  rightcaret > GREATER-THAN SIGN */
+  { 0x0ba8, 0x2228 }, /*                   downcaret ∨ LOGICAL OR */
+  { 0x0ba9, 0x2227 }, /*                     upcaret ∧ LOGICAL AND */
+  { 0x0bc0, 0x00af }, /*                     overbar ¯ MACRON */
+  { 0x0bc2, 0x22a5 }, /*                    downtack ⊥ UP TACK */
+  { 0x0bc3, 0x2229 }, /*                      upshoe ∩ INTERSECTION */
+  { 0x0bc4, 0x230a }, /*                   downstile ⌊ LEFT FLOOR */
+  { 0x0bc6, 0x005f }, /*                    underbar _ LOW LINE */
+  { 0x0bca, 0x2218 }, /*                         jot ∘ RING OPERATOR */
+  { 0x0bcc, 0x2395 }, /*                        quad ⎕ APL FUNCTIONAL SYMBOL QUAD */
+  { 0x0bce, 0x22a4 }, /*                      uptack ⊤ DOWN TACK */
+  { 0x0bcf, 0x25cb }, /*                      circle ○ WHITE CIRCLE */
+  { 0x0bd3, 0x2308 }, /*                     upstile ⌈ LEFT CEILING */
+  { 0x0bd6, 0x222a }, /*                    downshoe ∪ UNION */
+  { 0x0bd8, 0x2283 }, /*                   rightshoe ⊃ SUPERSET OF */
+  { 0x0bda, 0x2282 }, /*                    leftshoe ⊂ SUBSET OF */
+  { 0x0bdc, 0x22a2 }, /*                    lefttack ⊢ RIGHT TACK */
+  { 0x0bfc, 0x22a3 }, /*                   righttack ⊣ LEFT TACK */
+  { 0x0cdf, 0x2017 }, /*        hebrew_doublelowline ‗ DOUBLE LOW LINE */
+  { 0x0ce0, 0x05d0 }, /*                hebrew_aleph א HEBREW LETTER ALEF */
+  { 0x0ce1, 0x05d1 }, /*                  hebrew_bet ב HEBREW LETTER BET */
+  { 0x0ce2, 0x05d2 }, /*                hebrew_gimel ג HEBREW LETTER GIMEL */
+  { 0x0ce3, 0x05d3 }, /*                hebrew_dalet ד HEBREW LETTER DALET */
+  { 0x0ce4, 0x05d4 }, /*                   hebrew_he ה HEBREW LETTER HE */
+  { 0x0ce5, 0x05d5 }, /*                  hebrew_waw ו HEBREW LETTER VAV */
+  { 0x0ce6, 0x05d6 }, /*                 hebrew_zain ז HEBREW LETTER ZAYIN */
+  { 0x0ce7, 0x05d7 }, /*                 hebrew_chet ח HEBREW LETTER HET */
+  { 0x0ce8, 0x05d8 }, /*                  hebrew_tet ט HEBREW LETTER TET */
+  { 0x0ce9, 0x05d9 }, /*                  hebrew_yod י HEBREW LETTER YOD */
+  { 0x0cea, 0x05da }, /*            hebrew_finalkaph ך HEBREW LETTER FINAL KAF */
+  { 0x0ceb, 0x05db }, /*                 hebrew_kaph כ HEBREW LETTER KAF */
+  { 0x0cec, 0x05dc }, /*                hebrew_lamed ל HEBREW LETTER LAMED */
+  { 0x0ced, 0x05dd }, /*             hebrew_finalmem ם HEBREW LETTER FINAL MEM */
+  { 0x0cee, 0x05de }, /*                  hebrew_mem מ HEBREW LETTER MEM */
+  { 0x0cef, 0x05df }, /*             hebrew_finalnun ן HEBREW LETTER FINAL NUN */
+  { 0x0cf0, 0x05e0 }, /*                  hebrew_nun נ HEBREW LETTER NUN */
+  { 0x0cf1, 0x05e1 }, /*               hebrew_samech ס HEBREW LETTER SAMEKH */
+  { 0x0cf2, 0x05e2 }, /*                 hebrew_ayin ע HEBREW LETTER AYIN */
+  { 0x0cf3, 0x05e3 }, /*              hebrew_finalpe ף HEBREW LETTER FINAL PE */
+  { 0x0cf4, 0x05e4 }, /*                   hebrew_pe פ HEBREW LETTER PE */
+  { 0x0cf5, 0x05e5 }, /*            hebrew_finalzade ץ HEBREW LETTER FINAL TSADI */
+  { 0x0cf6, 0x05e6 }, /*                 hebrew_zade צ HEBREW LETTER TSADI */
+  { 0x0cf7, 0x05e7 }, /*                 hebrew_qoph ק HEBREW LETTER QOF */
+  { 0x0cf8, 0x05e8 }, /*                 hebrew_resh ר HEBREW LETTER RESH */
+  { 0x0cf9, 0x05e9 }, /*                 hebrew_shin ש HEBREW LETTER SHIN */
+  { 0x0cfa, 0x05ea }, /*                  hebrew_taw ת HEBREW LETTER TAV */
+  { 0x0da1, 0x0e01 }, /*                  Thai_kokai ก THAI CHARACTER KO KAI */
+  { 0x0da2, 0x0e02 }, /*                Thai_khokhai ข THAI CHARACTER KHO KHAI */
+  { 0x0da3, 0x0e03 }, /*               Thai_khokhuat ฃ THAI CHARACTER KHO KHUAT */
+  { 0x0da4, 0x0e04 }, /*               Thai_khokhwai ค THAI CHARACTER KHO KHWAI */
+  { 0x0da5, 0x0e05 }, /*                Thai_khokhon ฅ THAI CHARACTER KHO KHON */
+  { 0x0da6, 0x0e06 }, /*             Thai_khorakhang ฆ THAI CHARACTER KHO RAKHANG */
+  { 0x0da7, 0x0e07 }, /*                 Thai_ngongu ง THAI CHARACTER NGO NGU */
+  { 0x0da8, 0x0e08 }, /*                Thai_chochan จ THAI CHARACTER CHO CHAN */
+  { 0x0da9, 0x0e09 }, /*               Thai_choching ฉ THAI CHARACTER CHO CHING */
+  { 0x0daa, 0x0e0a }, /*               Thai_chochang ช THAI CHARACTER CHO CHANG */
+  { 0x0dab, 0x0e0b }, /*                   Thai_soso ซ THAI CHARACTER SO SO */
+  { 0x0dac, 0x0e0c }, /*                Thai_chochoe ฌ THAI CHARACTER CHO CHOE */
+  { 0x0dad, 0x0e0d }, /*                 Thai_yoying ญ THAI CHARACTER YO YING */
+  { 0x0dae, 0x0e0e }, /*                Thai_dochada ฎ THAI CHARACTER DO CHADA */
+  { 0x0daf, 0x0e0f }, /*                Thai_topatak ฏ THAI CHARACTER TO PATAK */
+  { 0x0db0, 0x0e10 }, /*                Thai_thothan ฐ THAI CHARACTER THO THAN */
+  { 0x0db1, 0x0e11 }, /*          Thai_thonangmontho ฑ THAI CHARACTER THO NANGMONTHO */
+  { 0x0db2, 0x0e12 }, /*             Thai_thophuthao ฒ THAI CHARACTER THO PHUTHAO */
+  { 0x0db3, 0x0e13 }, /*                  Thai_nonen ณ THAI CHARACTER NO NEN */
+  { 0x0db4, 0x0e14 }, /*                  Thai_dodek ด THAI CHARACTER DO DEK */
+  { 0x0db5, 0x0e15 }, /*                  Thai_totao ต THAI CHARACTER TO TAO */
+  { 0x0db6, 0x0e16 }, /*               Thai_thothung ถ THAI CHARACTER THO THUNG */
+  { 0x0db7, 0x0e17 }, /*              Thai_thothahan ท THAI CHARACTER THO THAHAN */
+  { 0x0db8, 0x0e18 }, /*               Thai_thothong ธ THAI CHARACTER THO THONG */
+  { 0x0db9, 0x0e19 }, /*                   Thai_nonu น THAI CHARACTER NO NU */
+  { 0x0dba, 0x0e1a }, /*               Thai_bobaimai บ THAI CHARACTER BO BAIMAI */
+  { 0x0dbb, 0x0e1b }, /*                  Thai_popla ป THAI CHARACTER PO PLA */
+  { 0x0dbc, 0x0e1c }, /*               Thai_phophung ผ THAI CHARACTER PHO PHUNG */
+  { 0x0dbd, 0x0e1d }, /*                   Thai_fofa ฝ THAI CHARACTER FO FA */
+  { 0x0dbe, 0x0e1e }, /*                Thai_phophan พ THAI CHARACTER PHO PHAN */
+  { 0x0dbf, 0x0e1f }, /*                  Thai_fofan ฟ THAI CHARACTER FO FAN */
+  { 0x0dc0, 0x0e20 }, /*             Thai_phosamphao ภ THAI CHARACTER PHO SAMPHAO */
+  { 0x0dc1, 0x0e21 }, /*                   Thai_moma ม THAI CHARACTER MO MA */
+  { 0x0dc2, 0x0e22 }, /*                  Thai_yoyak ย THAI CHARACTER YO YAK */
+  { 0x0dc3, 0x0e23 }, /*                  Thai_rorua ร THAI CHARACTER RO RUA */
+  { 0x0dc4, 0x0e24 }, /*                     Thai_ru ฤ THAI CHARACTER RU */
+  { 0x0dc5, 0x0e25 }, /*                 Thai_loling ล THAI CHARACTER LO LING */
+  { 0x0dc6, 0x0e26 }, /*                     Thai_lu ฦ THAI CHARACTER LU */
+  { 0x0dc7, 0x0e27 }, /*                 Thai_wowaen ว THAI CHARACTER WO WAEN */
+  { 0x0dc8, 0x0e28 }, /*                 Thai_sosala ศ THAI CHARACTER SO SALA */
+  { 0x0dc9, 0x0e29 }, /*                 Thai_sorusi ษ THAI CHARACTER SO RUSI */
+  { 0x0dca, 0x0e2a }, /*                  Thai_sosua ส THAI CHARACTER SO SUA */
+  { 0x0dcb, 0x0e2b }, /*                  Thai_hohip ห THAI CHARACTER HO HIP */
+  { 0x0dcc, 0x0e2c }, /*                Thai_lochula ฬ THAI CHARACTER LO CHULA */
+  { 0x0dcd, 0x0e2d }, /*                   Thai_oang อ THAI CHARACTER O ANG */
+  { 0x0dce, 0x0e2e }, /*               Thai_honokhuk ฮ THAI CHARACTER HO NOKHUK */
+  { 0x0dcf, 0x0e2f }, /*              Thai_paiyannoi ฯ THAI CHARACTER PAIYANNOI */
+  { 0x0dd0, 0x0e30 }, /*                  Thai_saraa ะ THAI CHARACTER SARA A */
+  { 0x0dd1, 0x0e31 }, /*             Thai_maihanakat ั THAI CHARACTER MAI HAN-AKAT */
+  { 0x0dd2, 0x0e32 }, /*                 Thai_saraaa า THAI CHARACTER SARA AA */
+  { 0x0dd3, 0x0e33 }, /*                 Thai_saraam ำ THAI CHARACTER SARA AM */
+  { 0x0dd4, 0x0e34 }, /*                  Thai_sarai ิ THAI CHARACTER SARA I */
+  { 0x0dd5, 0x0e35 }, /*                 Thai_saraii ี THAI CHARACTER SARA II */
+  { 0x0dd6, 0x0e36 }, /*                 Thai_saraue ึ THAI CHARACTER SARA UE */
+  { 0x0dd7, 0x0e37 }, /*                Thai_sarauee ื THAI CHARACTER SARA UEE */
+  { 0x0dd8, 0x0e38 }, /*                  Thai_sarau ุ THAI CHARACTER SARA U */
+  { 0x0dd9, 0x0e39 }, /*                 Thai_sarauu ู THAI CHARACTER SARA UU */
+  { 0x0dda, 0x0e3a }, /*                Thai_phinthu ฺ THAI CHARACTER PHINTHU */
+/*  0x0dde                    Thai_maihanakat_maitho ? ??? */
+  { 0x0ddf, 0x0e3f }, /*                   Thai_baht ฿ THAI CURRENCY SYMBOL BAHT */
+  { 0x0de0, 0x0e40 }, /*                  Thai_sarae เ THAI CHARACTER SARA E */
+  { 0x0de1, 0x0e41 }, /*                 Thai_saraae แ THAI CHARACTER SARA AE */
+  { 0x0de2, 0x0e42 }, /*                  Thai_sarao โ THAI CHARACTER SARA O */
+  { 0x0de3, 0x0e43 }, /*          Thai_saraaimaimuan ใ THAI CHARACTER SARA AI MAIMUAN */
+  { 0x0de4, 0x0e44 }, /*         Thai_saraaimaimalai ไ THAI CHARACTER SARA AI MAIMALAI */
+  { 0x0de5, 0x0e45 }, /*            Thai_lakkhangyao ๅ THAI CHARACTER LAKKHANGYAO */
+  { 0x0de6, 0x0e46 }, /*               Thai_maiyamok ๆ THAI CHARACTER MAIYAMOK */
+  { 0x0de7, 0x0e47 }, /*              Thai_maitaikhu ็ THAI CHARACTER MAITAIKHU */
+  { 0x0de8, 0x0e48 }, /*                  Thai_maiek ่ THAI CHARACTER MAI EK */
+  { 0x0de9, 0x0e49 }, /*                 Thai_maitho ้ THAI CHARACTER MAI THO */
+  { 0x0dea, 0x0e4a }, /*                 Thai_maitri ๊ THAI CHARACTER MAI TRI */
+  { 0x0deb, 0x0e4b }, /*            Thai_maichattawa ๋ THAI CHARACTER MAI CHATTAWA */
+  { 0x0dec, 0x0e4c }, /*            Thai_thanthakhat ์ THAI CHARACTER THANTHAKHAT */
+  { 0x0ded, 0x0e4d }, /*               Thai_nikhahit ํ THAI CHARACTER NIKHAHIT */
+  { 0x0df0, 0x0e50 }, /*                 Thai_leksun ๐ THAI DIGIT ZERO */
+  { 0x0df1, 0x0e51 }, /*                Thai_leknung ๑ THAI DIGIT ONE */
+  { 0x0df2, 0x0e52 }, /*                Thai_leksong ๒ THAI DIGIT TWO */
+  { 0x0df3, 0x0e53 }, /*                 Thai_leksam ๓ THAI DIGIT THREE */
+  { 0x0df4, 0x0e54 }, /*                  Thai_leksi ๔ THAI DIGIT FOUR */
+  { 0x0df5, 0x0e55 }, /*                  Thai_lekha ๕ THAI DIGIT FIVE */
+  { 0x0df6, 0x0e56 }, /*                 Thai_lekhok ๖ THAI DIGIT SIX */
+  { 0x0df7, 0x0e57 }, /*                Thai_lekchet ๗ THAI DIGIT SEVEN */
+  { 0x0df8, 0x0e58 }, /*                Thai_lekpaet ๘ THAI DIGIT EIGHT */
+  { 0x0df9, 0x0e59 }, /*                 Thai_lekkao ๙ THAI DIGIT NINE */
+  { 0x0ea1, 0x3131 }, /*               Hangul_Kiyeog ㄱ HANGUL LETTER KIYEOK */
+  { 0x0ea2, 0x3132 }, /*          Hangul_SsangKiyeog ㄲ HANGUL LETTER SSANGKIYEOK */
+  { 0x0ea3, 0x3133 }, /*           Hangul_KiyeogSios ㄳ HANGUL LETTER KIYEOK-SIOS */
+  { 0x0ea4, 0x3134 }, /*                Hangul_Nieun ㄴ HANGUL LETTER NIEUN */
+  { 0x0ea5, 0x3135 }, /*           Hangul_NieunJieuj ㄵ HANGUL LETTER NIEUN-CIEUC */
+  { 0x0ea6, 0x3136 }, /*           Hangul_NieunHieuh ㄶ HANGUL LETTER NIEUN-HIEUH */
+  { 0x0ea7, 0x3137 }, /*               Hangul_Dikeud ㄷ HANGUL LETTER TIKEUT */
+  { 0x0ea8, 0x3138 }, /*          Hangul_SsangDikeud ㄸ HANGUL LETTER SSANGTIKEUT */
+  { 0x0ea9, 0x3139 }, /*                Hangul_Rieul ㄹ HANGUL LETTER RIEUL */
+  { 0x0eaa, 0x313a }, /*          Hangul_RieulKiyeog ㄺ HANGUL LETTER RIEUL-KIYEOK */
+  { 0x0eab, 0x313b }, /*           Hangul_RieulMieum ㄻ HANGUL LETTER RIEUL-MIEUM */
+  { 0x0eac, 0x313c }, /*           Hangul_RieulPieub ㄼ HANGUL LETTER RIEUL-PIEUP */
+  { 0x0ead, 0x313d }, /*            Hangul_RieulSios ㄽ HANGUL LETTER RIEUL-SIOS */
+  { 0x0eae, 0x313e }, /*           Hangul_RieulTieut ㄾ HANGUL LETTER RIEUL-THIEUTH */
+  { 0x0eaf, 0x313f }, /*          Hangul_RieulPhieuf ㄿ HANGUL LETTER RIEUL-PHIEUPH */
+  { 0x0eb0, 0x3140 }, /*           Hangul_RieulHieuh ㅀ HANGUL LETTER RIEUL-HIEUH */
+  { 0x0eb1, 0x3141 }, /*                Hangul_Mieum ㅁ HANGUL LETTER MIEUM */
+  { 0x0eb2, 0x3142 }, /*                Hangul_Pieub ㅂ HANGUL LETTER PIEUP */
+  { 0x0eb3, 0x3143 }, /*           Hangul_SsangPieub ㅃ HANGUL LETTER SSANGPIEUP */
+  { 0x0eb4, 0x3144 }, /*            Hangul_PieubSios ㅄ HANGUL LETTER PIEUP-SIOS */
+  { 0x0eb5, 0x3145 }, /*                 Hangul_Sios ㅅ HANGUL LETTER SIOS */
+  { 0x0eb6, 0x3146 }, /*            Hangul_SsangSios ㅆ HANGUL LETTER SSANGSIOS */
+  { 0x0eb7, 0x3147 }, /*                Hangul_Ieung ㅇ HANGUL LETTER IEUNG */
+  { 0x0eb8, 0x3148 }, /*                Hangul_Jieuj ㅈ HANGUL LETTER CIEUC */
+  { 0x0eb9, 0x3149 }, /*           Hangul_SsangJieuj ㅉ HANGUL LETTER SSANGCIEUC */
+  { 0x0eba, 0x314a }, /*                Hangul_Cieuc ㅊ HANGUL LETTER CHIEUCH */
+  { 0x0ebb, 0x314b }, /*               Hangul_Khieuq ㅋ HANGUL LETTER KHIEUKH */
+  { 0x0ebc, 0x314c }, /*                Hangul_Tieut ㅌ HANGUL LETTER THIEUTH */
+  { 0x0ebd, 0x314d }, /*               Hangul_Phieuf ㅍ HANGUL LETTER PHIEUPH */
+  { 0x0ebe, 0x314e }, /*                Hangul_Hieuh ㅎ HANGUL LETTER HIEUH */
+  { 0x0ebf, 0x314f }, /*                    Hangul_A ㅏ HANGUL LETTER A */
+  { 0x0ec0, 0x3150 }, /*                   Hangul_AE ㅐ HANGUL LETTER AE */
+  { 0x0ec1, 0x3151 }, /*                   Hangul_YA ㅑ HANGUL LETTER YA */
+  { 0x0ec2, 0x3152 }, /*                  Hangul_YAE ㅒ HANGUL LETTER YAE */
+  { 0x0ec3, 0x3153 }, /*                   Hangul_EO ㅓ HANGUL LETTER EO */
+  { 0x0ec4, 0x3154 }, /*                    Hangul_E ㅔ HANGUL LETTER E */
+  { 0x0ec5, 0x3155 }, /*                  Hangul_YEO ㅕ HANGUL LETTER YEO */
+  { 0x0ec6, 0x3156 }, /*                   Hangul_YE ㅖ HANGUL LETTER YE */
+  { 0x0ec7, 0x3157 }, /*                    Hangul_O ㅗ HANGUL LETTER O */
+  { 0x0ec8, 0x3158 }, /*                   Hangul_WA ㅘ HANGUL LETTER WA */
+  { 0x0ec9, 0x3159 }, /*                  Hangul_WAE ㅙ HANGUL LETTER WAE */
+  { 0x0eca, 0x315a }, /*                   Hangul_OE ㅚ HANGUL LETTER OE */
+  { 0x0ecb, 0x315b }, /*                   Hangul_YO ㅛ HANGUL LETTER YO */
+  { 0x0ecc, 0x315c }, /*                    Hangul_U ㅜ HANGUL LETTER U */
+  { 0x0ecd, 0x315d }, /*                  Hangul_WEO ㅝ HANGUL LETTER WEO */
+  { 0x0ece, 0x315e }, /*                   Hangul_WE ㅞ HANGUL LETTER WE */
+  { 0x0ecf, 0x315f }, /*                   Hangul_WI ㅟ HANGUL LETTER WI */
+  { 0x0ed0, 0x3160 }, /*                   Hangul_YU ㅠ HANGUL LETTER YU */
+  { 0x0ed1, 0x3161 }, /*                   Hangul_EU ㅡ HANGUL LETTER EU */
+  { 0x0ed2, 0x3162 }, /*                   Hangul_YI ㅢ HANGUL LETTER YI */
+  { 0x0ed3, 0x3163 }, /*                    Hangul_I ㅣ HANGUL LETTER I */
+  { 0x0ed4, 0x11a8 }, /*             Hangul_J_Kiyeog ᆨ HANGUL JONGSEONG KIYEOK */
+  { 0x0ed5, 0x11a9 }, /*        Hangul_J_SsangKiyeog ᆩ HANGUL JONGSEONG SSANGKIYEOK */
+  { 0x0ed6, 0x11aa }, /*         Hangul_J_KiyeogSios ᆪ HANGUL JONGSEONG KIYEOK-SIOS */
+  { 0x0ed7, 0x11ab }, /*              Hangul_J_Nieun ᆫ HANGUL JONGSEONG NIEUN */
+  { 0x0ed8, 0x11ac }, /*         Hangul_J_NieunJieuj ᆬ HANGUL JONGSEONG NIEUN-CIEUC */
+  { 0x0ed9, 0x11ad }, /*         Hangul_J_NieunHieuh ᆭ HANGUL JONGSEONG NIEUN-HIEUH */
+  { 0x0eda, 0x11ae }, /*             Hangul_J_Dikeud ᆮ HANGUL JONGSEONG TIKEUT */
+  { 0x0edb, 0x11af }, /*              Hangul_J_Rieul ᆯ HANGUL JONGSEONG RIEUL */
+  { 0x0edc, 0x11b0 }, /*        Hangul_J_RieulKiyeog ᆰ HANGUL JONGSEONG RIEUL-KIYEOK */
+  { 0x0edd, 0x11b1 }, /*         Hangul_J_RieulMieum ᆱ HANGUL JONGSEONG RIEUL-MIEUM */
+  { 0x0ede, 0x11b2 }, /*         Hangul_J_RieulPieub ᆲ HANGUL JONGSEONG RIEUL-PIEUP */
+  { 0x0edf, 0x11b3 }, /*          Hangul_J_RieulSios ᆳ HANGUL JONGSEONG RIEUL-SIOS */
+  { 0x0ee0, 0x11b4 }, /*         Hangul_J_RieulTieut ᆴ HANGUL JONGSEONG RIEUL-THIEUTH */
+  { 0x0ee1, 0x11b5 }, /*        Hangul_J_RieulPhieuf ᆵ HANGUL JONGSEONG RIEUL-PHIEUPH */
+  { 0x0ee2, 0x11b6 }, /*         Hangul_J_RieulHieuh ᆶ HANGUL JONGSEONG RIEUL-HIEUH */
+  { 0x0ee3, 0x11b7 }, /*              Hangul_J_Mieum ᆷ HANGUL JONGSEONG MIEUM */
+  { 0x0ee4, 0x11b8 }, /*              Hangul_J_Pieub ᆸ HANGUL JONGSEONG PIEUP */
+  { 0x0ee5, 0x11b9 }, /*          Hangul_J_PieubSios ᆹ HANGUL JONGSEONG PIEUP-SIOS */
+  { 0x0ee6, 0x11ba }, /*               Hangul_J_Sios ᆺ HANGUL JONGSEONG SIOS */
+  { 0x0ee7, 0x11bb }, /*          Hangul_J_SsangSios ᆻ HANGUL JONGSEONG SSANGSIOS */
+  { 0x0ee8, 0x11bc }, /*              Hangul_J_Ieung ᆼ HANGUL JONGSEONG IEUNG */
+  { 0x0ee9, 0x11bd }, /*              Hangul_J_Jieuj ᆽ HANGUL JONGSEONG CIEUC */
+  { 0x0eea, 0x11be }, /*              Hangul_J_Cieuc ᆾ HANGUL JONGSEONG CHIEUCH */
+  { 0x0eeb, 0x11bf }, /*             Hangul_J_Khieuq ᆿ HANGUL JONGSEONG KHIEUKH */
+  { 0x0eec, 0x11c0 }, /*              Hangul_J_Tieut ᇀ HANGUL JONGSEONG THIEUTH */
+  { 0x0eed, 0x11c1 }, /*             Hangul_J_Phieuf ᇁ HANGUL JONGSEONG PHIEUPH */
+  { 0x0eee, 0x11c2 }, /*              Hangul_J_Hieuh ᇂ HANGUL JONGSEONG HIEUH */
+  { 0x0eef, 0x316d }, /*     Hangul_RieulYeorinHieuh ㅭ HANGUL LETTER RIEUL-YEORINHIEUH */
+  { 0x0ef0, 0x3171 }, /*    Hangul_SunkyeongeumMieum ㅱ HANGUL LETTER KAPYEOUNMIEUM */
+  { 0x0ef1, 0x3178 }, /*    Hangul_SunkyeongeumPieub ㅸ HANGUL LETTER KAPYEOUNPIEUP */
+  { 0x0ef2, 0x317f }, /*              Hangul_PanSios ㅿ HANGUL LETTER PANSIOS */
+  { 0x0ef3, 0x3181 }, /*    Hangul_KkogjiDalrinIeung ㆁ HANGUL LETTER YESIEUNG */
+  { 0x0ef4, 0x3184 }, /*   Hangul_SunkyeongeumPhieuf ㆄ HANGUL LETTER KAPYEOUNPHIEUPH */
+  { 0x0ef5, 0x3186 }, /*          Hangul_YeorinHieuh ㆆ HANGUL LETTER YEORINHIEUH */
+  { 0x0ef6, 0x318d }, /*                Hangul_AraeA ㆍ HANGUL LETTER ARAEA */
+  { 0x0ef7, 0x318e }, /*               Hangul_AraeAE ㆎ HANGUL LETTER ARAEAE */
+  { 0x0ef8, 0x11eb }, /*            Hangul_J_PanSios ᇫ HANGUL JONGSEONG PANSIOS */
+  { 0x0ef9, 0x11f0 }, /*  Hangul_J_KkogjiDalrinIeung ᇰ HANGUL JONGSEONG YESIEUNG */
+  { 0x0efa, 0x11f9 }, /*        Hangul_J_YeorinHieuh ᇹ HANGUL JONGSEONG YEORINHIEUH */
+  { 0x0eff, 0x20a9 }, /*                  Korean_Won ₩ WON SIGN */
+  { 0x13a4, 0x20ac }, /*                        Euro € EURO SIGN */
+  { 0x13bc, 0x0152 }, /*                          OE ΠLATIN CAPITAL LIGATURE OE */
+  { 0x13bd, 0x0153 }, /*                          oe œ LATIN SMALL LIGATURE OE */
+  { 0x13be, 0x0178 }, /*                  Ydiaeresis Ÿ LATIN CAPITAL LETTER Y WITH DIAERESIS */
+  { 0x20ac, 0x20ac }, /*                    EuroSign € EURO SIGN */
+};
+
+long keysym2ucs(KeySym keysym);
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Source/Gorgon/WindowManager/X11/dir.cmake	Fri Feb 21 17:02:44 2020 +0200
@@ -0,0 +1,14 @@
+set(Local
+    X11.h
+    X11.cpp
+    X11Keysym.h
+    Clipboard.cpp
+    DnD.cpp
+    Monitor.cpp
+    Input.cpp
+    Window.cpp
+)
+
+FIND_PACKAGE(X11 REQUIRED)
+
+LIST(APPEND Libs ${X11_LIBRARIES} ${X11_Xrandr_LIB} ${X11_Xinerama_LIB})
--- a/Source/Gorgon/WindowManager/X11Keysym.h	Sat Feb 15 10:22:44 2020 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,851 +0,0 @@
-// !!!This file should only be included from X11.cpp. Forward declare
-// keysym2ucs function if you need the services of this file
-
-/* $XFree86$
- * This module converts keysym values into the corresponding ISO 10646
- * (UCS, Unicode) values.
- *
- * The array keysymtab[] contains pairs of X11 keysym values for graphical
- * characters and the corresponding Unicode value. The function
- * keysym2ucs() maps a keysym onto a Unicode value using a binary search,
- * therefore keysymtab[] must remain SORTED by keysym value.
- *
- * The keysym -> UTF-8 conversion will hopefully one day be provided
- * by Xlib via XmbLookupString() and should ideally not have to be
- * done in X applications. But we are not there yet.
- *
- * We allow to represent any UCS character in the range U-00000000 to
- * U-00FFFFFF by a keysym value in the range 0x01000000 to 0x01ffffff.
- * This admittedly does not cover the entire 31-bit space of UCS, but
- * it does cover all of the characters up to U-10FFFF, which can be
- * represented by UTF-16, and more, and it is very unlikely that higher
- * UCS codes will ever be assigned by ISO. So to get Unicode character
- * U+ABCD you can directly use keysym 0x0100abcd.
- *
- * NOTE: The comments in the table below contain the actual character
- * encoded in UTF-8, so for viewing and editing best use an editor in
- * UTF-8 mode.
- *
- * Author: Markus G. Kuhn <http://www.cl.cam.ac.uk/~mgk25/>,
- *         University of Cambridge, April 2001
- *
- * Special thanks to Richard Verhoeven <river@win.tue.nl> for preparing
- * an initial draft of the mapping table.
- *
- * This software is in the public domain. Share and enjoy!
- *
- * AUTOMATICALLY GENERATED FILE, DO NOT EDIT !!! (unicode/convmap.pl)
- */
-
-struct codepair {
-  unsigned short keysym;
-  unsigned short ucs;
-};
-
-constexpr codepair keysymtab[] = {
-  { 0x01a1, 0x0104 }, /*                     Aogonek Ą LATIN CAPITAL LETTER A WITH OGONEK */
-  { 0x01a2, 0x02d8 }, /*                       breve ˘ BREVE */
-  { 0x01a3, 0x0141 }, /*                     Lstroke Ł LATIN CAPITAL LETTER L WITH STROKE */
-  { 0x01a5, 0x013d }, /*                      Lcaron Ľ LATIN CAPITAL LETTER L WITH CARON */
-  { 0x01a6, 0x015a }, /*                      Sacute Ś LATIN CAPITAL LETTER S WITH ACUTE */
-  { 0x01a9, 0x0160 }, /*                      Scaron Š LATIN CAPITAL LETTER S WITH CARON */
-  { 0x01aa, 0x015e }, /*                    Scedilla Ş LATIN CAPITAL LETTER S WITH CEDILLA */
-  { 0x01ab, 0x0164 }, /*                      Tcaron Ť LATIN CAPITAL LETTER T WITH CARON */
-  { 0x01ac, 0x0179 }, /*                      Zacute Ź LATIN CAPITAL LETTER Z WITH ACUTE */
-  { 0x01ae, 0x017d }, /*                      Zcaron Ž LATIN CAPITAL LETTER Z WITH CARON */
-  { 0x01af, 0x017b }, /*                   Zabovedot Ż LATIN CAPITAL LETTER Z WITH DOT ABOVE */
-  { 0x01b1, 0x0105 }, /*                     aogonek ą LATIN SMALL LETTER A WITH OGONEK */
-  { 0x01b2, 0x02db }, /*                      ogonek ˛ OGONEK */
-  { 0x01b3, 0x0142 }, /*                     lstroke ł LATIN SMALL LETTER L WITH STROKE */
-  { 0x01b5, 0x013e }, /*                      lcaron ľ LATIN SMALL LETTER L WITH CARON */
-  { 0x01b6, 0x015b }, /*                      sacute ś LATIN SMALL LETTER S WITH ACUTE */
-  { 0x01b7, 0x02c7 }, /*                       caron ˇ CARON */
-  { 0x01b9, 0x0161 }, /*                      scaron š LATIN SMALL LETTER S WITH CARON */
-  { 0x01ba, 0x015f }, /*                    scedilla ş LATIN SMALL LETTER S WITH CEDILLA */
-  { 0x01bb, 0x0165 }, /*                      tcaron ť LATIN SMALL LETTER T WITH CARON */
-  { 0x01bc, 0x017a }, /*                      zacute ź LATIN SMALL LETTER Z WITH ACUTE */
-  { 0x01bd, 0x02dd }, /*                 doubleacute ˝ DOUBLE ACUTE ACCENT */
-  { 0x01be, 0x017e }, /*                      zcaron ž LATIN SMALL LETTER Z WITH CARON */
-  { 0x01bf, 0x017c }, /*                   zabovedot ż LATIN SMALL LETTER Z WITH DOT ABOVE */
-  { 0x01c0, 0x0154 }, /*                      Racute Ŕ LATIN CAPITAL LETTER R WITH ACUTE */
-  { 0x01c3, 0x0102 }, /*                      Abreve Ă LATIN CAPITAL LETTER A WITH BREVE */
-  { 0x01c5, 0x0139 }, /*                      Lacute Ĺ LATIN CAPITAL LETTER L WITH ACUTE */
-  { 0x01c6, 0x0106 }, /*                      Cacute Ć LATIN CAPITAL LETTER C WITH ACUTE */
-  { 0x01c8, 0x010c }, /*                      Ccaron Č LATIN CAPITAL LETTER C WITH CARON */
-  { 0x01ca, 0x0118 }, /*                     Eogonek Ę LATIN CAPITAL LETTER E WITH OGONEK */
-  { 0x01cc, 0x011a }, /*                      Ecaron Ě LATIN CAPITAL LETTER E WITH CARON */
-  { 0x01cf, 0x010e }, /*                      Dcaron Ď LATIN CAPITAL LETTER D WITH CARON */
-  { 0x01d0, 0x0110 }, /*                     Dstroke Đ LATIN CAPITAL LETTER D WITH STROKE */
-  { 0x01d1, 0x0143 }, /*                      Nacute Ń LATIN CAPITAL LETTER N WITH ACUTE */
-  { 0x01d2, 0x0147 }, /*                      Ncaron Ň LATIN CAPITAL LETTER N WITH CARON */
-  { 0x01d5, 0x0150 }, /*                Odoubleacute Ő LATIN CAPITAL LETTER O WITH DOUBLE ACUTE */
-  { 0x01d8, 0x0158 }, /*                      Rcaron Ř LATIN CAPITAL LETTER R WITH CARON */
-  { 0x01d9, 0x016e }, /*                       Uring Ů LATIN CAPITAL LETTER U WITH RING ABOVE */
-  { 0x01db, 0x0170 }, /*                Udoubleacute Ű LATIN CAPITAL LETTER U WITH DOUBLE ACUTE */
-  { 0x01de, 0x0162 }, /*                    Tcedilla Ţ LATIN CAPITAL LETTER T WITH CEDILLA */
-  { 0x01e0, 0x0155 }, /*                      racute ŕ LATIN SMALL LETTER R WITH ACUTE */
-  { 0x01e3, 0x0103 }, /*                      abreve ă LATIN SMALL LETTER A WITH BREVE */
-  { 0x01e5, 0x013a }, /*                      lacute ĺ LATIN SMALL LETTER L WITH ACUTE */
-  { 0x01e6, 0x0107 }, /*                      cacute ć LATIN SMALL LETTER C WITH ACUTE */
-  { 0x01e8, 0x010d }, /*                      ccaron č LATIN SMALL LETTER C WITH CARON */
-  { 0x01ea, 0x0119 }, /*                     eogonek ę LATIN SMALL LETTER E WITH OGONEK */
-  { 0x01ec, 0x011b }, /*                      ecaron ě LATIN SMALL LETTER E WITH CARON */
-  { 0x01ef, 0x010f }, /*                      dcaron ď LATIN SMALL LETTER D WITH CARON */
-  { 0x01f0, 0x0111 }, /*                     dstroke đ LATIN SMALL LETTER D WITH STROKE */
-  { 0x01f1, 0x0144 }, /*                      nacute ń LATIN SMALL LETTER N WITH ACUTE */
-  { 0x01f2, 0x0148 }, /*                      ncaron ň LATIN SMALL LETTER N WITH CARON */
-  { 0x01f5, 0x0151 }, /*                odoubleacute ő LATIN SMALL LETTER O WITH DOUBLE ACUTE */
-  { 0x01f8, 0x0159 }, /*                      rcaron ř LATIN SMALL LETTER R WITH CARON */
-  { 0x01f9, 0x016f }, /*                       uring ů LATIN SMALL LETTER U WITH RING ABOVE */
-  { 0x01fb, 0x0171 }, /*                udoubleacute ű LATIN SMALL LETTER U WITH DOUBLE ACUTE */
-  { 0x01fe, 0x0163 }, /*                    tcedilla ţ LATIN SMALL LETTER T WITH CEDILLA */
-  { 0x01ff, 0x02d9 }, /*                    abovedot ˙ DOT ABOVE */
-  { 0x02a1, 0x0126 }, /*                     Hstroke Ħ LATIN CAPITAL LETTER H WITH STROKE */
-  { 0x02a6, 0x0124 }, /*                 Hcircumflex Ĥ LATIN CAPITAL LETTER H WITH CIRCUMFLEX */
-  { 0x02a9, 0x0130 }, /*                   Iabovedot İ LATIN CAPITAL LETTER I WITH DOT ABOVE */
-  { 0x02ab, 0x011e }, /*                      Gbreve Ğ LATIN CAPITAL LETTER G WITH BREVE */
-  { 0x02ac, 0x0134 }, /*                 Jcircumflex Ĵ LATIN CAPITAL LETTER J WITH CIRCUMFLEX */
-  { 0x02b1, 0x0127 }, /*                     hstroke ħ LATIN SMALL LETTER H WITH STROKE */
-  { 0x02b6, 0x0125 }, /*                 hcircumflex ĥ LATIN SMALL LETTER H WITH CIRCUMFLEX */
-  { 0x02b9, 0x0131 }, /*                    idotless ı LATIN SMALL LETTER DOTLESS I */
-  { 0x02bb, 0x011f }, /*                      gbreve ğ LATIN SMALL LETTER G WITH BREVE */
-  { 0x02bc, 0x0135 }, /*                 jcircumflex ĵ LATIN SMALL LETTER J WITH CIRCUMFLEX */
-  { 0x02c5, 0x010a }, /*                   Cabovedot Ċ LATIN CAPITAL LETTER C WITH DOT ABOVE */
-  { 0x02c6, 0x0108 }, /*                 Ccircumflex Ĉ LATIN CAPITAL LETTER C WITH CIRCUMFLEX */
-  { 0x02d5, 0x0120 }, /*                   Gabovedot Ġ LATIN CAPITAL LETTER G WITH DOT ABOVE */
-  { 0x02d8, 0x011c }, /*                 Gcircumflex Ĝ LATIN CAPITAL LETTER G WITH CIRCUMFLEX */
-  { 0x02dd, 0x016c }, /*                      Ubreve Ŭ LATIN CAPITAL LETTER U WITH BREVE */
-  { 0x02de, 0x015c }, /*                 Scircumflex Ŝ LATIN CAPITAL LETTER S WITH CIRCUMFLEX */
-  { 0x02e5, 0x010b }, /*                   cabovedot ċ LATIN SMALL LETTER C WITH DOT ABOVE */
-  { 0x02e6, 0x0109 }, /*                 ccircumflex ĉ LATIN SMALL LETTER C WITH CIRCUMFLEX */
-  { 0x02f5, 0x0121 }, /*                   gabovedot ġ LATIN SMALL LETTER G WITH DOT ABOVE */
-  { 0x02f8, 0x011d }, /*                 gcircumflex ĝ LATIN SMALL LETTER G WITH CIRCUMFLEX */
-  { 0x02fd, 0x016d }, /*                      ubreve ŭ LATIN SMALL LETTER U WITH BREVE */
-  { 0x02fe, 0x015d }, /*                 scircumflex ŝ LATIN SMALL LETTER S WITH CIRCUMFLEX */
-  { 0x03a2, 0x0138 }, /*                         kra ĸ LATIN SMALL LETTER KRA */
-  { 0x03a3, 0x0156 }, /*                    Rcedilla Ŗ LATIN CAPITAL LETTER R WITH CEDILLA */
-  { 0x03a5, 0x0128 }, /*                      Itilde Ĩ LATIN CAPITAL LETTER I WITH TILDE */
-  { 0x03a6, 0x013b }, /*                    Lcedilla Ļ LATIN CAPITAL LETTER L WITH CEDILLA */
-  { 0x03aa, 0x0112 }, /*                     Emacron Ē LATIN CAPITAL LETTER E WITH MACRON */
-  { 0x03ab, 0x0122 }, /*                    Gcedilla Ģ LATIN CAPITAL LETTER G WITH CEDILLA */
-  { 0x03ac, 0x0166 }, /*                      Tslash Ŧ LATIN CAPITAL LETTER T WITH STROKE */
-  { 0x03b3, 0x0157 }, /*                    rcedilla ŗ LATIN SMALL LETTER R WITH CEDILLA */
-  { 0x03b5, 0x0129 }, /*                      itilde ĩ LATIN SMALL LETTER I WITH TILDE */
-  { 0x03b6, 0x013c }, /*                    lcedilla ļ LATIN SMALL LETTER L WITH CEDILLA */
-  { 0x03ba, 0x0113 }, /*                     emacron ē LATIN SMALL LETTER E WITH MACRON */
-  { 0x03bb, 0x0123 }, /*                    gcedilla ģ LATIN SMALL LETTER G WITH CEDILLA */
-  { 0x03bc, 0x0167 }, /*                      tslash ŧ LATIN SMALL LETTER T WITH STROKE */
-  { 0x03bd, 0x014a }, /*                         ENG Ŋ LATIN CAPITAL LETTER ENG */
-  { 0x03bf, 0x014b }, /*                         eng ŋ LATIN SMALL LETTER ENG */
-  { 0x03c0, 0x0100 }, /*                     Amacron Ā LATIN CAPITAL LETTER A WITH MACRON */
-  { 0x03c7, 0x012e }, /*                     Iogonek Į LATIN CAPITAL LETTER I WITH OGONEK */
-  { 0x03cc, 0x0116 }, /*                   Eabovedot Ė LATIN CAPITAL LETTER E WITH DOT ABOVE */
-  { 0x03cf, 0x012a }, /*                     Imacron Ī LATIN CAPITAL LETTER I WITH MACRON */
-  { 0x03d1, 0x0145 }, /*                    Ncedilla Ņ LATIN CAPITAL LETTER N WITH CEDILLA */
-  { 0x03d2, 0x014c }, /*                     Omacron Ō LATIN CAPITAL LETTER O WITH MACRON */
-  { 0x03d3, 0x0136 }, /*                    Kcedilla Ķ LATIN CAPITAL LETTER K WITH CEDILLA */
-  { 0x03d9, 0x0172 }, /*                     Uogonek Ų LATIN CAPITAL LETTER U WITH OGONEK */
-  { 0x03dd, 0x0168 }, /*                      Utilde Ũ LATIN CAPITAL LETTER U WITH TILDE */
-  { 0x03de, 0x016a }, /*                     Umacron Ū LATIN CAPITAL LETTER U WITH MACRON */
-  { 0x03e0, 0x0101 }, /*                     amacron ā LATIN SMALL LETTER A WITH MACRON */
-  { 0x03e7, 0x012f }, /*                     iogonek į LATIN SMALL LETTER I WITH OGONEK */
-  { 0x03ec, 0x0117 }, /*                   eabovedot ė LATIN SMALL LETTER E WITH DOT ABOVE */
-  { 0x03ef, 0x012b }, /*                     imacron ī LATIN SMALL LETTER I WITH MACRON */
-  { 0x03f1, 0x0146 }, /*                    ncedilla ņ LATIN SMALL LETTER N WITH CEDILLA */
-  { 0x03f2, 0x014d }, /*                     omacron ō LATIN SMALL LETTER O WITH MACRON */
-  { 0x03f3, 0x0137 }, /*                    kcedilla ķ LATIN SMALL LETTER K WITH CEDILLA */
-  { 0x03f9, 0x0173 }, /*                     uogonek ų LATIN SMALL LETTER U WITH OGONEK */
-  { 0x03fd, 0x0169 }, /*                      utilde ũ LATIN SMALL LETTER U WITH TILDE */
-  { 0x03fe, 0x016b }, /*                     umacron ū LATIN SMALL LETTER U WITH MACRON */
-  { 0x047e, 0x203e }, /*                    overline ‾ OVERLINE */
-  { 0x04a1, 0x3002 }, /*               kana_fullstop 。 IDEOGRAPHIC FULL STOP */
-  { 0x04a2, 0x300c }, /*         kana_openingbracket 「 LEFT CORNER BRACKET */
-  { 0x04a3, 0x300d }, /*         kana_closingbracket 」 RIGHT CORNER BRACKET */
-  { 0x04a4, 0x3001 }, /*                  kana_comma 、 IDEOGRAPHIC COMMA */
-  { 0x04a5, 0x30fb }, /*            kana_conjunctive ・ KATAKANA MIDDLE DOT */
-  { 0x04a6, 0x30f2 }, /*                     kana_WO ヲ KATAKANA LETTER WO */
-  { 0x04a7, 0x30a1 }, /*                      kana_a ァ KATAKANA LETTER SMALL A */
-  { 0x04a8, 0x30a3 }, /*                      kana_i ィ KATAKANA LETTER SMALL I */
-  { 0x04a9, 0x30a5 }, /*                      kana_u ゥ KATAKANA LETTER SMALL U */
-  { 0x04aa, 0x30a7 }, /*                      kana_e ェ KATAKANA LETTER SMALL E */
-  { 0x04ab, 0x30a9 }, /*                      kana_o ォ KATAKANA LETTER SMALL O */
-  { 0x04ac, 0x30e3 }, /*                     kana_ya ャ KATAKANA LETTER SMALL YA */
-  { 0x04ad, 0x30e5 }, /*                     kana_yu ュ KATAKANA LETTER SMALL YU */
-  { 0x04ae, 0x30e7 }, /*                     kana_yo ョ KATAKANA LETTER SMALL YO */
-  { 0x04af, 0x30c3 }, /*                    kana_tsu ッ KATAKANA LETTER SMALL TU */
-  { 0x04b0, 0x30fc }, /*              prolongedsound ー KATAKANA-HIRAGANA PROLONGED SOUND MARK */
-  { 0x04b1, 0x30a2 }, /*                      kana_A ア KATAKANA LETTER A */
-  { 0x04b2, 0x30a4 }, /*                      kana_I イ KATAKANA LETTER I */
-  { 0x04b3, 0x30a6 }, /*                      kana_U ウ KATAKANA LETTER U */
-  { 0x04b4, 0x30a8 }, /*                      kana_E エ KATAKANA LETTER E */
-  { 0x04b5, 0x30aa }, /*                      kana_O オ KATAKANA LETTER O */
-  { 0x04b6, 0x30ab }, /*                     kana_KA カ KATAKANA LETTER KA */
-  { 0x04b7, 0x30ad }, /*                     kana_KI キ KATAKANA LETTER KI */
-  { 0x04b8, 0x30af }, /*                     kana_KU ク KATAKANA LETTER KU */
-  { 0x04b9, 0x30b1 }, /*                     kana_KE ケ KATAKANA LETTER KE */
-  { 0x04ba, 0x30b3 }, /*                     kana_KO コ KATAKANA LETTER KO */
-  { 0x04bb, 0x30b5 }, /*                     kana_SA サ KATAKANA LETTER SA */
-  { 0x04bc, 0x30b7 }, /*                    kana_SHI シ KATAKANA LETTER SI */
-  { 0x04bd, 0x30b9 }, /*                     kana_SU ス KATAKANA LETTER SU */
-  { 0x04be, 0x30bb }, /*                     kana_SE セ KATAKANA LETTER SE */
-  { 0x04bf, 0x30bd }, /*                     kana_SO ソ KATAKANA LETTER SO */
-  { 0x04c0, 0x30bf }, /*                     kana_TA タ KATAKANA LETTER TA */
-  { 0x04c1, 0x30c1 }, /*                    kana_CHI チ KATAKANA LETTER TI */
-  { 0x04c2, 0x30c4 }, /*                    kana_TSU ツ KATAKANA LETTER TU */
-  { 0x04c3, 0x30c6 }, /*                     kana_TE テ KATAKANA LETTER TE */
-  { 0x04c4, 0x30c8 }, /*                     kana_TO ト KATAKANA LETTER TO */
-  { 0x04c5, 0x30ca }, /*                     kana_NA ナ KATAKANA LETTER NA */
-  { 0x04c6, 0x30cb }, /*                     kana_NI ニ KATAKANA LETTER NI */
-  { 0x04c7, 0x30cc }, /*                     kana_NU ヌ KATAKANA LETTER NU */
-  { 0x04c8, 0x30cd }, /*                     kana_NE ネ KATAKANA LETTER NE */
-  { 0x04c9, 0x30ce }, /*                     kana_NO ノ KATAKANA LETTER NO */
-  { 0x04ca, 0x30cf }, /*                     kana_HA ハ KATAKANA LETTER HA */
-  { 0x04cb, 0x30d2 }, /*                     kana_HI ヒ KATAKANA LETTER HI */
-  { 0x04cc, 0x30d5 }, /*                     kana_FU フ KATAKANA LETTER HU */
-  { 0x04cd, 0x30d8 }, /*                     kana_HE ヘ KATAKANA LETTER HE */
-  { 0x04ce, 0x30db }, /*                     kana_HO ホ KATAKANA LETTER HO */
-  { 0x04cf, 0x30de }, /*                     kana_MA マ KATAKANA LETTER MA */
-  { 0x04d0, 0x30df }, /*                     kana_MI ミ KATAKANA LETTER MI */
-  { 0x04d1, 0x30e0 }, /*                     kana_MU ム KATAKANA LETTER MU */
-  { 0x04d2, 0x30e1 }, /*                     kana_ME メ KATAKANA LETTER ME */
-  { 0x04d3, 0x30e2 }, /*                     kana_MO モ KATAKANA LETTER MO */
-  { 0x04d4, 0x30e4 }, /*                     kana_YA ヤ KATAKANA LETTER YA */
-  { 0x04d5, 0x30e6 }, /*                     kana_YU ユ KATAKANA LETTER YU */
-  { 0x04d6, 0x30e8 }, /*                     kana_YO ヨ KATAKANA LETTER YO */
-  { 0x04d7, 0x30e9 }, /*                     kana_RA ラ KATAKANA LETTER RA */
-  { 0x04d8, 0x30ea }, /*                     kana_RI リ KATAKANA LETTER RI */
-  { 0x04d9, 0x30eb }, /*                     kana_RU ル KATAKANA LETTER RU */
-  { 0x04da, 0x30ec }, /*                     kana_RE レ KATAKANA LETTER RE */
-  { 0x04db, 0x30ed }, /*                     kana_RO ロ KATAKANA LETTER RO */
-  { 0x04dc, 0x30ef }, /*                     kana_WA ワ KATAKANA LETTER WA */
-  { 0x04dd, 0x30f3 }, /*                      kana_N ン KATAKANA LETTER N */
-  { 0x04de, 0x309b }, /*                 voicedsound ゛ KATAKANA-HIRAGANA VOICED SOUND MARK */
-  { 0x04df, 0x309c }, /*             semivoicedsound ゜ KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK */
-  { 0x05ac, 0x060c }, /*                Arabic_comma ، ARABIC COMMA */
-  { 0x05bb, 0x061b }, /*            Arabic_semicolon ؛ ARABIC SEMICOLON */
-  { 0x05bf, 0x061f }, /*        Arabic_question_mark ؟ ARABIC QUESTION MARK */
-  { 0x05c1, 0x0621 }, /*                Arabic_hamza ء ARABIC LETTER HAMZA */
-  { 0x05c2, 0x0622 }, /*          Arabic_maddaonalef آ ARABIC LETTER ALEF WITH MADDA ABOVE */
-  { 0x05c3, 0x0623 }, /*          Arabic_hamzaonalef أ ARABIC LETTER ALEF WITH HAMZA ABOVE */
-  { 0x05c4, 0x0624 }, /*           Arabic_hamzaonwaw ؤ ARABIC LETTER WAW WITH HAMZA ABOVE */
-  { 0x05c5, 0x0625 }, /*       Arabic_hamzaunderalef إ ARABIC LETTER ALEF WITH HAMZA BELOW */
-  { 0x05c6, 0x0626 }, /*           Arabic_hamzaonyeh ئ ARABIC LETTER YEH WITH HAMZA ABOVE */
-  { 0x05c7, 0x0627 }, /*                 Arabic_alef ا ARABIC LETTER ALEF */
-  { 0x05c8, 0x0628 }, /*                  Arabic_beh ب ARABIC LETTER BEH */
-  { 0x05c9, 0x0629 }, /*           Arabic_tehmarbuta ة ARABIC LETTER TEH MARBUTA */
-  { 0x05ca, 0x062a }, /*                  Arabic_teh ت ARABIC LETTER TEH */
-  { 0x05cb, 0x062b }, /*                 Arabic_theh ث ARABIC LETTER THEH */
-  { 0x05cc, 0x062c }, /*                 Arabic_jeem ج ARABIC LETTER JEEM */
-  { 0x05cd, 0x062d }, /*                  Arabic_hah ح ARABIC LETTER HAH */
-  { 0x05ce, 0x062e }, /*                 Arabic_khah خ ARABIC LETTER KHAH */
-  { 0x05cf, 0x062f }, /*                  Arabic_dal د ARABIC LETTER DAL */
-  { 0x05d0, 0x0630 }, /*                 Arabic_thal ذ ARABIC LETTER THAL */
-  { 0x05d1, 0x0631 }, /*                   Arabic_ra ر ARABIC LETTER REH */
-  { 0x05d2, 0x0632 }, /*                 Arabic_zain ز ARABIC LETTER ZAIN */
-  { 0x05d3, 0x0633 }, /*                 Arabic_seen س ARABIC LETTER SEEN */
-  { 0x05d4, 0x0634 }, /*                Arabic_sheen ش ARABIC LETTER SHEEN */
-  { 0x05d5, 0x0635 }, /*                  Arabic_sad ص ARABIC LETTER SAD */
-  { 0x05d6, 0x0636 }, /*                  Arabic_dad ض ARABIC LETTER DAD */
-  { 0x05d7, 0x0637 }, /*                  Arabic_tah ط ARABIC LETTER TAH */
-  { 0x05d8, 0x0638 }, /*                  Arabic_zah ظ ARABIC LETTER ZAH */
-  { 0x05d9, 0x0639 }, /*                  Arabic_ain ع ARABIC LETTER AIN */
-  { 0x05da, 0x063a }, /*                Arabic_ghain غ ARABIC LETTER GHAIN */
-  { 0x05e0, 0x0640 }, /*              Arabic_tatweel ـ ARABIC TATWEEL */
-  { 0x05e1, 0x0641 }, /*                  Arabic_feh ف ARABIC LETTER FEH */
-  { 0x05e2, 0x0642 }, /*                  Arabic_qaf ق ARABIC LETTER QAF */
-  { 0x05e3, 0x0643 }, /*                  Arabic_kaf ك ARABIC LETTER KAF */
-  { 0x05e4, 0x0644 }, /*                  Arabic_lam ل ARABIC LETTER LAM */
-  { 0x05e5, 0x0645 }, /*                 Arabic_meem م ARABIC LETTER MEEM */
-  { 0x05e6, 0x0646 }, /*                 Arabic_noon ن ARABIC LETTER NOON */
-  { 0x05e7, 0x0647 }, /*                   Arabic_ha ه ARABIC LETTER HEH */
-  { 0x05e8, 0x0648 }, /*                  Arabic_waw و ARABIC LETTER WAW */
-  { 0x05e9, 0x0649 }, /*          Arabic_alefmaksura ى ARABIC LETTER ALEF MAKSURA */
-  { 0x05ea, 0x064a }, /*                  Arabic_yeh ي ARABIC LETTER YEH */
-  { 0x05eb, 0x064b }, /*             Arabic_fathatan ً ARABIC FATHATAN */
-  { 0x05ec, 0x064c }, /*             Arabic_dammatan ٌ ARABIC DAMMATAN */
-  { 0x05ed, 0x064d }, /*             Arabic_kasratan ٍ ARABIC KASRATAN */
-  { 0x05ee, 0x064e }, /*                Arabic_fatha َ ARABIC FATHA */
-  { 0x05ef, 0x064f }, /*                Arabic_damma ُ ARABIC DAMMA */
-  { 0x05f0, 0x0650 }, /*                Arabic_kasra ِ ARABIC KASRA */
-  { 0x05f1, 0x0651 }, /*               Arabic_shadda ّ ARABIC SHADDA */
-  { 0x05f2, 0x0652 }, /*                Arabic_sukun ْ ARABIC SUKUN */
-  { 0x06a1, 0x0452 }, /*                 Serbian_dje ђ CYRILLIC SMALL LETTER DJE */
-  { 0x06a2, 0x0453 }, /*               Macedonia_gje ѓ CYRILLIC SMALL LETTER GJE */
-  { 0x06a3, 0x0451 }, /*                 Cyrillic_io ё CYRILLIC SMALL LETTER IO */
-  { 0x06a4, 0x0454 }, /*                Ukrainian_ie є CYRILLIC SMALL LETTER UKRAINIAN IE */
-  { 0x06a5, 0x0455 }, /*               Macedonia_dse ѕ CYRILLIC SMALL LETTER DZE */
-  { 0x06a6, 0x0456 }, /*                 Ukrainian_i і CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I */
-  { 0x06a7, 0x0457 }, /*                Ukrainian_yi ї CYRILLIC SMALL LETTER YI */
-  { 0x06a8, 0x0458 }, /*                 Cyrillic_je ј CYRILLIC SMALL LETTER JE */
-  { 0x06a9, 0x0459 }, /*                Cyrillic_lje љ CYRILLIC SMALL LETTER LJE */
-  { 0x06aa, 0x045a }, /*                Cyrillic_nje њ CYRILLIC SMALL LETTER NJE */
-  { 0x06ab, 0x045b }, /*                Serbian_tshe ћ CYRILLIC SMALL LETTER TSHE */
-  { 0x06ac, 0x045c }, /*               Macedonia_kje ќ CYRILLIC SMALL LETTER KJE */
-  { 0x06ae, 0x045e }, /*         Byelorussian_shortu ў CYRILLIC SMALL LETTER SHORT U */
-  { 0x06af, 0x045f }, /*               Cyrillic_dzhe џ CYRILLIC SMALL LETTER DZHE */
-  { 0x06b0, 0x2116 }, /*                  numerosign № NUMERO SIGN */
-  { 0x06b1, 0x0402 }, /*                 Serbian_DJE Ђ CYRILLIC CAPITAL LETTER DJE */
-  { 0x06b2, 0x0403 }, /*               Macedonia_GJE Ѓ CYRILLIC CAPITAL LETTER GJE */
-  { 0x06b3, 0x0401 }, /*                 Cyrillic_IO Ё CYRILLIC CAPITAL LETTER IO */
-  { 0x06b4, 0x0404 }, /*                Ukrainian_IE Є CYRILLIC CAPITAL LETTER UKRAINIAN IE */
-  { 0x06b5, 0x0405 }, /*               Macedonia_DSE Ѕ CYRILLIC CAPITAL LETTER DZE */
-  { 0x06b6, 0x0406 }, /*                 Ukrainian_I І CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I */
-  { 0x06b7, 0x0407 }, /*                Ukrainian_YI Ї CYRILLIC CAPITAL LETTER YI */
-  { 0x06b8, 0x0408 }, /*                 Cyrillic_JE Ј CYRILLIC CAPITAL LETTER JE */
-  { 0x06b9, 0x0409 }, /*                Cyrillic_LJE Љ CYRILLIC CAPITAL LETTER LJE */
-  { 0x06ba, 0x040a }, /*                Cyrillic_NJE Њ CYRILLIC CAPITAL LETTER NJE */
-  { 0x06bb, 0x040b }, /*                Serbian_TSHE Ћ CYRILLIC CAPITAL LETTER TSHE */
-  { 0x06bc, 0x040c }, /*               Macedonia_KJE Ќ CYRILLIC CAPITAL LETTER KJE */
-  { 0x06be, 0x040e }, /*         Byelorussian_SHORTU Ў CYRILLIC CAPITAL LETTER SHORT U */
-  { 0x06bf, 0x040f }, /*               Cyrillic_DZHE Џ CYRILLIC CAPITAL LETTER DZHE */
-  { 0x06c0, 0x044e }, /*                 Cyrillic_yu ю CYRILLIC SMALL LETTER YU */
-  { 0x06c1, 0x0430 }, /*                  Cyrillic_a а CYRILLIC SMALL LETTER A */
-  { 0x06c2, 0x0431 }, /*                 Cyrillic_be б CYRILLIC SMALL LETTER BE */
-  { 0x06c3, 0x0446 }, /*                Cyrillic_tse ц CYRILLIC SMALL LETTER TSE */
-  { 0x06c4, 0x0434 }, /*                 Cyrillic_de д CYRILLIC SMALL LETTER DE */
-  { 0x06c5, 0x0435 }, /*                 Cyrillic_ie е CYRILLIC SMALL LETTER IE */
-  { 0x06c6, 0x0444 }, /*                 Cyrillic_ef ф CYRILLIC SMALL LETTER EF */
-  { 0x06c7, 0x0433 }, /*                Cyrillic_ghe г CYRILLIC SMALL LETTER GHE */
-  { 0x06c8, 0x0445 }, /*                 Cyrillic_ha х CYRILLIC SMALL LETTER HA */
-  { 0x06c9, 0x0438 }, /*                  Cyrillic_i и CYRILLIC SMALL LETTER I */
-  { 0x06ca, 0x0439 }, /*             Cyrillic_shorti й CYRILLIC SMALL LETTER SHORT I */
-  { 0x06cb, 0x043a }, /*                 Cyrillic_ka к CYRILLIC SMALL LETTER KA */
-  { 0x06cc, 0x043b }, /*                 Cyrillic_el л CYRILLIC SMALL LETTER EL */
-  { 0x06cd, 0x043c }, /*                 Cyrillic_em м CYRILLIC SMALL LETTER EM */
-  { 0x06ce, 0x043d }, /*                 Cyrillic_en н CYRILLIC SMALL LETTER EN */
-  { 0x06cf, 0x043e }, /*                  Cyrillic_o о CYRILLIC SMALL LETTER O */
-  { 0x06d0, 0x043f }, /*                 Cyrillic_pe п CYRILLIC SMALL LETTER PE */
-  { 0x06d1, 0x044f }, /*                 Cyrillic_ya я CYRILLIC SMALL LETTER YA */
-  { 0x06d2, 0x0440 }, /*                 Cyrillic_er р CYRILLIC SMALL LETTER ER */
-  { 0x06d3, 0x0441 }, /*                 Cyrillic_es с CYRILLIC SMALL LETTER ES */
-  { 0x06d4, 0x0442 }, /*                 Cyrillic_te т CYRILLIC SMALL LETTER TE */
-  { 0x06d5, 0x0443 }, /*                  Cyrillic_u у CYRILLIC SMALL LETTER U */
-  { 0x06d6, 0x0436 }, /*                Cyrillic_zhe ж CYRILLIC SMALL LETTER ZHE */
-  { 0x06d7, 0x0432 }, /*                 Cyrillic_ve в CYRILLIC SMALL LETTER VE */
-  { 0x06d8, 0x044c }, /*           Cyrillic_softsign ь CYRILLIC SMALL LETTER SOFT SIGN */
-  { 0x06d9, 0x044b }, /*               Cyrillic_yeru ы CYRILLIC SMALL LETTER YERU */
-  { 0x06da, 0x0437 }, /*                 Cyrillic_ze з CYRILLIC SMALL LETTER ZE */
-  { 0x06db, 0x0448 }, /*                Cyrillic_sha ш CYRILLIC SMALL LETTER SHA */
-  { 0x06dc, 0x044d }, /*                  Cyrillic_e э CYRILLIC SMALL LETTER E */
-  { 0x06dd, 0x0449 }, /*              Cyrillic_shcha щ CYRILLIC SMALL LETTER SHCHA */
-  { 0x06de, 0x0447 }, /*                Cyrillic_che ч CYRILLIC SMALL LETTER CHE */
-  { 0x06df, 0x044a }, /*           Cyrillic_hardsign ъ CYRILLIC SMALL LETTER HARD SIGN */
-  { 0x06e0, 0x042e }, /*                 Cyrillic_YU Ю CYRILLIC CAPITAL LETTER YU */
-  { 0x06e1, 0x0410 }, /*                  Cyrillic_A А CYRILLIC CAPITAL LETTER A */
-  { 0x06e2, 0x0411 }, /*                 Cyrillic_BE Б CYRILLIC CAPITAL LETTER BE */
-  { 0x06e3, 0x0426 }, /*                Cyrillic_TSE Ц CYRILLIC CAPITAL LETTER TSE */
-  { 0x06e4, 0x0414 }, /*                 Cyrillic_DE Д CYRILLIC CAPITAL LETTER DE */
-  { 0x06e5, 0x0415 }, /*                 Cyrillic_IE Е CYRILLIC CAPITAL LETTER IE */
-  { 0x06e6, 0x0424 }, /*                 Cyrillic_EF Ф CYRILLIC CAPITAL LETTER EF */
-  { 0x06e7, 0x0413 }, /*                Cyrillic_GHE Г CYRILLIC CAPITAL LETTER GHE */
-  { 0x06e8, 0x0425 }, /*                 Cyrillic_HA Х CYRILLIC CAPITAL LETTER HA */
-  { 0x06e9, 0x0418 }, /*                  Cyrillic_I И CYRILLIC CAPITAL LETTER I */
-  { 0x06ea, 0x0419 }, /*             Cyrillic_SHORTI Й CYRILLIC CAPITAL LETTER SHORT I */
-  { 0x06eb, 0x041a }, /*                 Cyrillic_KA К CYRILLIC CAPITAL LETTER KA */
-  { 0x06ec, 0x041b }, /*                 Cyrillic_EL Л CYRILLIC CAPITAL LETTER EL */
-  { 0x06ed, 0x041c }, /*                 Cyrillic_EM М CYRILLIC CAPITAL LETTER EM */
-  { 0x06ee, 0x041d }, /*                 Cyrillic_EN Н CYRILLIC CAPITAL LETTER EN */
-  { 0x06ef, 0x041e }, /*                  Cyrillic_O О CYRILLIC CAPITAL LETTER O */
-  { 0x06f0, 0x041f }, /*                 Cyrillic_PE П CYRILLIC CAPITAL LETTER PE */
-  { 0x06f1, 0x042f }, /*                 Cyrillic_YA Я CYRILLIC CAPITAL LETTER YA */
-  { 0x06f2, 0x0420 }, /*                 Cyrillic_ER Р CYRILLIC CAPITAL LETTER ER */
-  { 0x06f3, 0x0421 }, /*                 Cyrillic_ES С CYRILLIC CAPITAL LETTER ES */
-  { 0x06f4, 0x0422 }, /*                 Cyrillic_TE Т CYRILLIC CAPITAL LETTER TE */
-  { 0x06f5, 0x0423 }, /*                  Cyrillic_U У CYRILLIC CAPITAL LETTER U */
-  { 0x06f6, 0x0416 }, /*                Cyrillic_ZHE Ж CYRILLIC CAPITAL LETTER ZHE */
-  { 0x06f7, 0x0412 }, /*                 Cyrillic_VE В CYRILLIC CAPITAL LETTER VE */
-  { 0x06f8, 0x042c }, /*           Cyrillic_SOFTSIGN Ь CYRILLIC CAPITAL LETTER SOFT SIGN */
-  { 0x06f9, 0x042b }, /*               Cyrillic_YERU Ы CYRILLIC CAPITAL LETTER YERU */
-  { 0x06fa, 0x0417 }, /*                 Cyrillic_ZE З CYRILLIC CAPITAL LETTER ZE */
-  { 0x06fb, 0x0428 }, /*                Cyrillic_SHA Ш CYRILLIC CAPITAL LETTER SHA */
-  { 0x06fc, 0x042d }, /*                  Cyrillic_E Э CYRILLIC CAPITAL LETTER E */
-  { 0x06fd, 0x0429 }, /*              Cyrillic_SHCHA Щ CYRILLIC CAPITAL LETTER SHCHA */
-  { 0x06fe, 0x0427 }, /*                Cyrillic_CHE Ч CYRILLIC CAPITAL LETTER CHE */
-  { 0x06ff, 0x042a }, /*           Cyrillic_HARDSIGN Ъ CYRILLIC CAPITAL LETTER HARD SIGN */
-  { 0x07a1, 0x0386 }, /*           Greek_ALPHAaccent Ά GREEK CAPITAL LETTER ALPHA WITH TONOS */
-  { 0x07a2, 0x0388 }, /*         Greek_EPSILONaccent Έ GREEK CAPITAL LETTER EPSILON WITH TONOS */
-  { 0x07a3, 0x0389 }, /*             Greek_ETAaccent Ή GREEK CAPITAL LETTER ETA WITH TONOS */
-  { 0x07a4, 0x038a }, /*            Greek_IOTAaccent Ί GREEK CAPITAL LETTER IOTA WITH TONOS */
-  { 0x07a5, 0x03aa }, /*         Greek_IOTAdiaeresis Ϊ GREEK CAPITAL LETTER IOTA WITH DIALYTIKA */
-  { 0x07a7, 0x038c }, /*         Greek_OMICRONaccent Ό GREEK CAPITAL LETTER OMICRON WITH TONOS */
-  { 0x07a8, 0x038e }, /*         Greek_UPSILONaccent Ύ GREEK CAPITAL LETTER UPSILON WITH TONOS */
-  { 0x07a9, 0x03ab }, /*       Greek_UPSILONdieresis Ϋ GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA */
-  { 0x07ab, 0x038f }, /*           Greek_OMEGAaccent Ώ GREEK CAPITAL LETTER OMEGA WITH TONOS */
-  { 0x07ae, 0x0385 }, /*        Greek_accentdieresis ΅ GREEK DIALYTIKA TONOS */
-  { 0x07af, 0x2015 }, /*              Greek_horizbar ― HORIZONTAL BAR */
-  { 0x07b1, 0x03ac }, /*           Greek_alphaaccent ά GREEK SMALL LETTER ALPHA WITH TONOS */
-  { 0x07b2, 0x03ad }, /*         Greek_epsilonaccent έ GREEK SMALL LETTER EPSILON WITH TONOS */
-  { 0x07b3, 0x03ae }, /*             Greek_etaaccent ή GREEK SMALL LETTER ETA WITH TONOS */
-  { 0x07b4, 0x03af }, /*            Greek_iotaaccent ί GREEK SMALL LETTER IOTA WITH TONOS */
-  { 0x07b5, 0x03ca }, /*          Greek_iotadieresis ϊ GREEK SMALL LETTER IOTA WITH DIALYTIKA */
-  { 0x07b6, 0x0390 }, /*    Greek_iotaaccentdieresis ΐ GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS */
-  { 0x07b7, 0x03cc }, /*         Greek_omicronaccent ό GREEK SMALL LETTER OMICRON WITH TONOS */
-  { 0x07b8, 0x03cd }, /*         Greek_upsilonaccent ύ GREEK SMALL LETTER UPSILON WITH TONOS */
-  { 0x07b9, 0x03cb }, /*       Greek_upsilondieresis ϋ GREEK SMALL LETTER UPSILON WITH DIALYTIKA */
-  { 0x07ba, 0x03b0 }, /* Greek_upsilonaccentdieresis ΰ GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS */
-  { 0x07bb, 0x03ce }, /*           Greek_omegaaccent ώ GREEK SMALL LETTER OMEGA WITH TONOS */
-  { 0x07c1, 0x0391 }, /*                 Greek_ALPHA Α GREEK CAPITAL LETTER ALPHA */
-  { 0x07c2, 0x0392 }, /*                  Greek_BETA Β GREEK CAPITAL LETTER BETA */
-  { 0x07c3, 0x0393 }, /*                 Greek_GAMMA Γ GREEK CAPITAL LETTER GAMMA */
-  { 0x07c4, 0x0394 }, /*                 Greek_DELTA Δ GREEK CAPITAL LETTER DELTA */
-  { 0x07c5, 0x0395 }, /*               Greek_EPSILON Ε GREEK CAPITAL LETTER EPSILON */
-  { 0x07c6, 0x0396 }, /*                  Greek_ZETA Ζ GREEK CAPITAL LETTER ZETA */
-  { 0x07c7, 0x0397 }, /*                   Greek_ETA Η GREEK CAPITAL LETTER ETA */
-  { 0x07c8, 0x0398 }, /*                 Greek_THETA Θ GREEK CAPITAL LETTER THETA */
-  { 0x07c9, 0x0399 }, /*                  Greek_IOTA Ι GREEK CAPITAL LETTER IOTA */
-  { 0x07ca, 0x039a }, /*                 Greek_KAPPA Κ GREEK CAPITAL LETTER KAPPA */
-  { 0x07cb, 0x039b }, /*                Greek_LAMBDA Λ GREEK CAPITAL LETTER LAMDA */
-  { 0x07cc, 0x039c }, /*                    Greek_MU Μ GREEK CAPITAL LETTER MU */
-  { 0x07cd, 0x039d }, /*                    Greek_NU Ν GREEK CAPITAL LETTER NU */
-  { 0x07ce, 0x039e }, /*                    Greek_XI Ξ GREEK CAPITAL LETTER XI */
-  { 0x07cf, 0x039f }, /*               Greek_OMICRON Ο GREEK CAPITAL LETTER OMICRON */
-  { 0x07d0, 0x03a0 }, /*                    Greek_PI Π GREEK CAPITAL LETTER PI */
-  { 0x07d1, 0x03a1 }, /*                   Greek_RHO Ρ GREEK CAPITAL LETTER RHO */
-  { 0x07d2, 0x03a3 }, /*                 Greek_SIGMA Σ GREEK CAPITAL LETTER SIGMA */
-  { 0x07d4, 0x03a4 }, /*                   Greek_TAU Τ GREEK CAPITAL LETTER TAU */
-  { 0x07d5, 0x03a5 }, /*               Greek_UPSILON Υ GREEK CAPITAL LETTER UPSILON */
-  { 0x07d6, 0x03a6 }, /*                   Greek_PHI Φ GREEK CAPITAL LETTER PHI */
-  { 0x07d7, 0x03a7 }, /*                   Greek_CHI Χ GREEK CAPITAL LETTER CHI */
-  { 0x07d8, 0x03a8 }, /*                   Greek_PSI Ψ GREEK CAPITAL LETTER PSI */
-  { 0x07d9, 0x03a9 }, /*                 Greek_OMEGA Ω GREEK CAPITAL LETTER OMEGA */
-  { 0x07e1, 0x03b1 }, /*                 Greek_alpha α GREEK SMALL LETTER ALPHA */
-  { 0x07e2, 0x03b2 }, /*                  Greek_beta β GREEK SMALL LETTER BETA */
-  { 0x07e3, 0x03b3 }, /*                 Greek_gamma γ GREEK SMALL LETTER GAMMA */
-  { 0x07e4, 0x03b4 }, /*                 Greek_delta δ GREEK SMALL LETTER DELTA */
-  { 0x07e5, 0x03b5 }, /*               Greek_epsilon ε GREEK SMALL LETTER EPSILON */
-  { 0x07e6, 0x03b6 }, /*                  Greek_zeta ζ GREEK SMALL LETTER ZETA */
-  { 0x07e7, 0x03b7 }, /*                   Greek_eta η GREEK SMALL LETTER ETA */
-  { 0x07e8, 0x03b8 }, /*                 Greek_theta θ GREEK SMALL LETTER THETA */
-  { 0x07e9, 0x03b9 }, /*                  Greek_iota ι GREEK SMALL LETTER IOTA */
-  { 0x07ea, 0x03ba }, /*                 Greek_kappa κ GREEK SMALL LETTER KAPPA */
-  { 0x07eb, 0x03bb }, /*                Greek_lambda λ GREEK SMALL LETTER LAMDA */
-  { 0x07ec, 0x03bc }, /*                    Greek_mu μ GREEK SMALL LETTER MU */
-  { 0x07ed, 0x03bd }, /*                    Greek_nu ν GREEK SMALL LETTER NU */
-  { 0x07ee, 0x03be }, /*                    Greek_xi ξ GREEK SMALL LETTER XI */
-  { 0x07ef, 0x03bf }, /*               Greek_omicron ο GREEK SMALL LETTER OMICRON */
-  { 0x07f0, 0x03c0 }, /*                    Greek_pi π GREEK SMALL LETTER PI */
-  { 0x07f1, 0x03c1 }, /*                   Greek_rho ρ GREEK SMALL LETTER RHO */
-  { 0x07f2, 0x03c3 }, /*                 Greek_sigma σ GREEK SMALL LETTER SIGMA */
-  { 0x07f3, 0x03c2 }, /*       Greek_finalsmallsigma ς GREEK SMALL LETTER FINAL SIGMA */
-  { 0x07f4, 0x03c4 }, /*                   Greek_tau τ GREEK SMALL LETTER TAU */
-  { 0x07f5, 0x03c5 }, /*               Greek_upsilon υ GREEK SMALL LETTER UPSILON */
-  { 0x07f6, 0x03c6 }, /*                   Greek_phi φ GREEK SMALL LETTER PHI */
-  { 0x07f7, 0x03c7 }, /*                   Greek_chi χ GREEK SMALL LETTER CHI */
-  { 0x07f8, 0x03c8 }, /*                   Greek_psi ψ GREEK SMALL LETTER PSI */
-  { 0x07f9, 0x03c9 }, /*                 Greek_omega ω GREEK SMALL LETTER OMEGA */
-  { 0x08a1, 0x23b7 }, /*                 leftradical ⎷ ??? */
-  { 0x08a2, 0x250c }, /*              topleftradical ┌ BOX DRAWINGS LIGHT DOWN AND RIGHT */
-  { 0x08a3, 0x2500 }, /*              horizconnector ─ BOX DRAWINGS LIGHT HORIZONTAL */
-  { 0x08a4, 0x2320 }, /*                 topintegral ⌠ TOP HALF INTEGRAL */
-  { 0x08a5, 0x2321 }, /*                 botintegral ⌡ BOTTOM HALF INTEGRAL */
-  { 0x08a6, 0x2502 }, /*               vertconnector │ BOX DRAWINGS LIGHT VERTICAL */
-  { 0x08a7, 0x23a1 }, /*            topleftsqbracket ⎡ ??? */
-  { 0x08a8, 0x23a3 }, /*            botleftsqbracket ⎣ ??? */
-  { 0x08a9, 0x23a4 }, /*           toprightsqbracket ⎤ ??? */
-  { 0x08aa, 0x23a6 }, /*           botrightsqbracket ⎦ ??? */
-  { 0x08ab, 0x239b }, /*               topleftparens ⎛ ??? */
-  { 0x08ac, 0x239d }, /*               botleftparens ⎝ ??? */
-  { 0x08ad, 0x239e }, /*              toprightparens ⎞ ??? */
-  { 0x08ae, 0x23a0 }, /*              botrightparens ⎠ ??? */
-  { 0x08af, 0x23a8 }, /*        leftmiddlecurlybrace ⎨ ??? */
-  { 0x08b0, 0x23ac }, /*       rightmiddlecurlybrace ⎬ ??? */
-/*  0x08b1                          topleftsummation ? ??? */
-/*  0x08b2                          botleftsummation ? ??? */
-/*  0x08b3                 topvertsummationconnector ? ??? */
-/*  0x08b4                 botvertsummationconnector ? ??? */
-/*  0x08b5                         toprightsummation ? ??? */
-/*  0x08b6                         botrightsummation ? ??? */
-/*  0x08b7                      rightmiddlesummation ? ??? */
-  { 0x08bc, 0x2264 }, /*               lessthanequal ≤ LESS-THAN OR EQUAL TO */
-  { 0x08bd, 0x2260 }, /*                    notequal ≠ NOT EQUAL TO */
-  { 0x08be, 0x2265 }, /*            greaterthanequal ≥ GREATER-THAN OR EQUAL TO */
-  { 0x08bf, 0x222b }, /*                    integral ∫ INTEGRAL */
-  { 0x08c0, 0x2234 }, /*                   therefore ∴ THEREFORE */
-  { 0x08c1, 0x221d }, /*                   variation ∝ PROPORTIONAL TO */
-  { 0x08c2, 0x221e }, /*                    infinity ∞ INFINITY */
-  { 0x08c5, 0x2207 }, /*                       nabla ∇ NABLA */
-  { 0x08c8, 0x223c }, /*                 approximate ∼ TILDE OPERATOR */
-  { 0x08c9, 0x2243 }, /*                similarequal ≃ ASYMPTOTICALLY EQUAL TO */
-  { 0x08cd, 0x21d4 }, /*                    ifonlyif ⇔ LEFT RIGHT DOUBLE ARROW */
-  { 0x08ce, 0x21d2 }, /*                     implies ⇒ RIGHTWARDS DOUBLE ARROW */
-  { 0x08cf, 0x2261 }, /*                   identical ≡ IDENTICAL TO */
-  { 0x08d6, 0x221a }, /*                     radical √ SQUARE ROOT */
-  { 0x08da, 0x2282 }, /*                  includedin ⊂ SUBSET OF */
-  { 0x08db, 0x2283 }, /*                    includes ⊃ SUPERSET OF */
-  { 0x08dc, 0x2229 }, /*                intersection ∩ INTERSECTION */
-  { 0x08dd, 0x222a }, /*                       union ∪ UNION */
-  { 0x08de, 0x2227 }, /*                  logicaland ∧ LOGICAL AND */
-  { 0x08df, 0x2228 }, /*                   logicalor ∨ LOGICAL OR */
-  { 0x08ef, 0x2202 }, /*           partialderivative ∂ PARTIAL DIFFERENTIAL */
-  { 0x08f6, 0x0192 }, /*                    function ƒ LATIN SMALL LETTER F WITH HOOK */
-  { 0x08fb, 0x2190 }, /*                   leftarrow ← LEFTWARDS ARROW */
-  { 0x08fc, 0x2191 }, /*                     uparrow ↑ UPWARDS ARROW */
-  { 0x08fd, 0x2192 }, /*                  rightarrow → RIGHTWARDS ARROW */
-  { 0x08fe, 0x2193 }, /*                   downarrow ↓ DOWNWARDS ARROW */
-/*  0x09df                                     blank ? ??? */
-  { 0x09e0, 0x25c6 }, /*                soliddiamond ◆ BLACK DIAMOND */
-  { 0x09e1, 0x2592 }, /*                checkerboard ▒ MEDIUM SHADE */
-  { 0x09e2, 0x2409 }, /*                          ht ␉ SYMBOL FOR HORIZONTAL TABULATION */
-  { 0x09e3, 0x240c }, /*                          ff ␌ SYMBOL FOR FORM FEED */
-  { 0x09e4, 0x240d }, /*                          cr ␍ SYMBOL FOR CARRIAGE RETURN */
-  { 0x09e5, 0x240a }, /*                          lf ␊ SYMBOL FOR LINE FEED */
-  { 0x09e8, 0x2424 }, /*                          nl ␤ SYMBOL FOR NEWLINE */
-  { 0x09e9, 0x240b }, /*                          vt ␋ SYMBOL FOR VERTICAL TABULATION */
-  { 0x09ea, 0x2518 }, /*              lowrightcorner ┘ BOX DRAWINGS LIGHT UP AND LEFT */
-  { 0x09eb, 0x2510 }, /*               uprightcorner ┐ BOX DRAWINGS LIGHT DOWN AND LEFT */
-  { 0x09ec, 0x250c }, /*                upleftcorner ┌ BOX DRAWINGS LIGHT DOWN AND RIGHT */
-  { 0x09ed, 0x2514 }, /*               lowleftcorner └ BOX DRAWINGS LIGHT UP AND RIGHT */
-  { 0x09ee, 0x253c }, /*               crossinglines ┼ BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL */
-  { 0x09ef, 0x23ba }, /*              horizlinescan1 ⎺ HORIZONTAL SCAN LINE-1 (Unicode 3.2 draft) */
-  { 0x09f0, 0x23bb }, /*              horizlinescan3 ⎻ HORIZONTAL SCAN LINE-3 (Unicode 3.2 draft) */
-  { 0x09f1, 0x2500 }, /*              horizlinescan5 ─ BOX DRAWINGS LIGHT HORIZONTAL */
-  { 0x09f2, 0x23bc }, /*              horizlinescan7 ⎼ HORIZONTAL SCAN LINE-7 (Unicode 3.2 draft) */
-  { 0x09f3, 0x23bd }, /*              horizlinescan9 ⎽ HORIZONTAL SCAN LINE-9 (Unicode 3.2 draft) */
-  { 0x09f4, 0x251c }, /*                       leftt ├ BOX DRAWINGS LIGHT VERTICAL AND RIGHT */
-  { 0x09f5, 0x2524 }, /*                      rightt ┤ BOX DRAWINGS LIGHT VERTICAL AND LEFT */
-  { 0x09f6, 0x2534 }, /*                        bott ┴ BOX DRAWINGS LIGHT UP AND HORIZONTAL */
-  { 0x09f7, 0x252c }, /*                        topt ┬ BOX DRAWINGS LIGHT DOWN AND HORIZONTAL */
-  { 0x09f8, 0x2502 }, /*                     vertbar │ BOX DRAWINGS LIGHT VERTICAL */
-  { 0x0aa1, 0x2003 }, /*                     emspace   EM SPACE */
-  { 0x0aa2, 0x2002 }, /*                     enspace   EN SPACE */
-  { 0x0aa3, 0x2004 }, /*                    em3space   THREE-PER-EM SPACE */
-  { 0x0aa4, 0x2005 }, /*                    em4space   FOUR-PER-EM SPACE */
-  { 0x0aa5, 0x2007 }, /*                  digitspace   FIGURE SPACE */
-  { 0x0aa6, 0x2008 }, /*                  punctspace   PUNCTUATION SPACE */
-  { 0x0aa7, 0x2009 }, /*                   thinspace   THIN SPACE */
-  { 0x0aa8, 0x200a }, /*                   hairspace   HAIR SPACE */
-  { 0x0aa9, 0x2014 }, /*                      emdash — EM DASH */
-  { 0x0aaa, 0x2013 }, /*                      endash – EN DASH */
-/*  0x0aac                               signifblank ? ??? */
-  { 0x0aae, 0x2026 }, /*                    ellipsis … HORIZONTAL ELLIPSIS */
-  { 0x0aaf, 0x2025 }, /*             doubbaselinedot ‥ TWO DOT LEADER */
-  { 0x0ab0, 0x2153 }, /*                    onethird ⅓ VULGAR FRACTION ONE THIRD */
-  { 0x0ab1, 0x2154 }, /*                   twothirds ⅔ VULGAR FRACTION TWO THIRDS */
-  { 0x0ab2, 0x2155 }, /*                    onefifth ⅕ VULGAR FRACTION ONE FIFTH */
-  { 0x0ab3, 0x2156 }, /*                   twofifths ⅖ VULGAR FRACTION TWO FIFTHS */
-  { 0x0ab4, 0x2157 }, /*                 threefifths ⅗ VULGAR FRACTION THREE FIFTHS */
-  { 0x0ab5, 0x2158 }, /*                  fourfifths ⅘ VULGAR FRACTION FOUR FIFTHS */
-  { 0x0ab6, 0x2159 }, /*                    onesixth ⅙ VULGAR FRACTION ONE SIXTH */
-  { 0x0ab7, 0x215a }, /*                  fivesixths ⅚ VULGAR FRACTION FIVE SIXTHS */
-  { 0x0ab8, 0x2105 }, /*                      careof ℅ CARE OF */
-  { 0x0abb, 0x2012 }, /*                     figdash ‒ FIGURE DASH */
-  { 0x0abc, 0x2329 }, /*            leftanglebracket 〈 LEFT-POINTING ANGLE BRACKET */
-/*  0x0abd                              decimalpoint ? ??? */
-  { 0x0abe, 0x232a }, /*           rightanglebracket 〉 RIGHT-POINTING ANGLE BRACKET */
-/*  0x0abf                                    marker ? ??? */
-  { 0x0ac3, 0x215b }, /*                   oneeighth ⅛ VULGAR FRACTION ONE EIGHTH */
-  { 0x0ac4, 0x215c }, /*                threeeighths ⅜ VULGAR FRACTION THREE EIGHTHS */
-  { 0x0ac5, 0x215d }, /*                 fiveeighths ⅝ VULGAR FRACTION FIVE EIGHTHS */
-  { 0x0ac6, 0x215e }, /*                seveneighths ⅞ VULGAR FRACTION SEVEN EIGHTHS */
-  { 0x0ac9, 0x2122 }, /*                   trademark ™ TRADE MARK SIGN */
-  { 0x0aca, 0x2613 }, /*               signaturemark ☓ SALTIRE */
-/*  0x0acb                         trademarkincircle ? ??? */
-  { 0x0acc, 0x25c1 }, /*            leftopentriangle ◁ WHITE LEFT-POINTING TRIANGLE */
-  { 0x0acd, 0x25b7 }, /*           rightopentriangle ▷ WHITE RIGHT-POINTING TRIANGLE */
-  { 0x0ace, 0x25cb }, /*                emopencircle ○ WHITE CIRCLE */
-  { 0x0acf, 0x25af }, /*             emopenrectangle ▯ WHITE VERTICAL RECTANGLE */
-  { 0x0ad0, 0x2018 }, /*         leftsinglequotemark ‘ LEFT SINGLE QUOTATION MARK */
-  { 0x0ad1, 0x2019 }, /*        rightsinglequotemark ’ RIGHT SINGLE QUOTATION MARK */
-  { 0x0ad2, 0x201c }, /*         leftdoublequotemark “ LEFT DOUBLE QUOTATION MARK */
-  { 0x0ad3, 0x201d }, /*        rightdoublequotemark ” RIGHT DOUBLE QUOTATION MARK */
-  { 0x0ad4, 0x211e }, /*                prescription ℞ PRESCRIPTION TAKE */
-  { 0x0ad6, 0x2032 }, /*                     minutes ′ PRIME */
-  { 0x0ad7, 0x2033 }, /*                     seconds ″ DOUBLE PRIME */
-  { 0x0ad9, 0x271d }, /*                  latincross ✝ LATIN CROSS */
-/*  0x0ada                                  hexagram ? ??? */
-  { 0x0adb, 0x25ac }, /*            filledrectbullet ▬ BLACK RECTANGLE */
-  { 0x0adc, 0x25c0 }, /*         filledlefttribullet ◀ BLACK LEFT-POINTING TRIANGLE */
-  { 0x0add, 0x25b6 }, /*        filledrighttribullet ▶ BLACK RIGHT-POINTING TRIANGLE */
-  { 0x0ade, 0x25cf }, /*              emfilledcircle ● BLACK CIRCLE */
-  { 0x0adf, 0x25ae }, /*                emfilledrect ▮ BLACK VERTICAL RECTANGLE */
-  { 0x0ae0, 0x25e6 }, /*            enopencircbullet ◦ WHITE BULLET */
-  { 0x0ae1, 0x25ab }, /*          enopensquarebullet ▫ WHITE SMALL SQUARE */
-  { 0x0ae2, 0x25ad }, /*              openrectbullet ▭ WHITE RECTANGLE */
-  { 0x0ae3, 0x25b3 }, /*             opentribulletup △ WHITE UP-POINTING TRIANGLE */
-  { 0x0ae4, 0x25bd }, /*           opentribulletdown ▽ WHITE DOWN-POINTING TRIANGLE */
-  { 0x0ae5, 0x2606 }, /*                    openstar ☆ WHITE STAR */
-  { 0x0ae6, 0x2022 }, /*          enfilledcircbullet • BULLET */
-  { 0x0ae7, 0x25aa }, /*            enfilledsqbullet ▪ BLACK SMALL SQUARE */
-  { 0x0ae8, 0x25b2 }, /*           filledtribulletup ▲ BLACK UP-POINTING TRIANGLE */
-  { 0x0ae9, 0x25bc }, /*         filledtribulletdown ▼ BLACK DOWN-POINTING TRIANGLE */
-  { 0x0aea, 0x261c }, /*                 leftpointer ☜ WHITE LEFT POINTING INDEX */
-  { 0x0aeb, 0x261e }, /*                rightpointer ☞ WHITE RIGHT POINTING INDEX */
-  { 0x0aec, 0x2663 }, /*                        club ♣ BLACK CLUB SUIT */
-  { 0x0aed, 0x2666 }, /*                     diamond ♦ BLACK DIAMOND SUIT */
-  { 0x0aee, 0x2665 }, /*                       heart ♥ BLACK HEART SUIT */
-  { 0x0af0, 0x2720 }, /*                maltesecross ✠ MALTESE CROSS */
-  { 0x0af1, 0x2020 }, /*                      dagger † DAGGER */
-  { 0x0af2, 0x2021 }, /*                doubledagger ‡ DOUBLE DAGGER */
-  { 0x0af3, 0x2713 }, /*                   checkmark ✓ CHECK MARK */
-  { 0x0af4, 0x2717 }, /*                 ballotcross ✗ BALLOT X */
-  { 0x0af5, 0x266f }, /*                musicalsharp ♯ MUSIC SHARP SIGN */
-  { 0x0af6, 0x266d }, /*                 musicalflat ♭ MUSIC FLAT SIGN */
-  { 0x0af7, 0x2642 }, /*                  malesymbol ♂ MALE SIGN */
-  { 0x0af8, 0x2640 }, /*                femalesymbol ♀ FEMALE SIGN */
-  { 0x0af9, 0x260e }, /*                   telephone ☎ BLACK TELEPHONE */
-  { 0x0afa, 0x2315 }, /*           telephonerecorder ⌕ TELEPHONE RECORDER */
-  { 0x0afb, 0x2117 }, /*         phonographcopyright ℗ SOUND RECORDING COPYRIGHT */
-  { 0x0afc, 0x2038 }, /*                       caret ‸ CARET */
-  { 0x0afd, 0x201a }, /*          singlelowquotemark ‚ SINGLE LOW-9 QUOTATION MARK */
-  { 0x0afe, 0x201e }, /*          doublelowquotemark „ DOUBLE LOW-9 QUOTATION MARK */
-/*  0x0aff                                    cursor ? ??? */
-  { 0x0ba3, 0x003c }, /*                   leftcaret < LESS-THAN SIGN */
-  { 0x0ba6, 0x003e }, /*                  rightcaret > GREATER-THAN SIGN */
-  { 0x0ba8, 0x2228 }, /*                   downcaret ∨ LOGICAL OR */
-  { 0x0ba9, 0x2227 }, /*                     upcaret ∧ LOGICAL AND */
-  { 0x0bc0, 0x00af }, /*                     overbar ¯ MACRON */
-  { 0x0bc2, 0x22a5 }, /*                    downtack ⊥ UP TACK */
-  { 0x0bc3, 0x2229 }, /*                      upshoe ∩ INTERSECTION */
-  { 0x0bc4, 0x230a }, /*                   downstile ⌊ LEFT FLOOR */
-  { 0x0bc6, 0x005f }, /*                    underbar _ LOW LINE */
-  { 0x0bca, 0x2218 }, /*                         jot ∘ RING OPERATOR */
-  { 0x0bcc, 0x2395 }, /*                        quad ⎕ APL FUNCTIONAL SYMBOL QUAD */
-  { 0x0bce, 0x22a4 }, /*                      uptack ⊤ DOWN TACK */
-  { 0x0bcf, 0x25cb }, /*                      circle ○ WHITE CIRCLE */
-  { 0x0bd3, 0x2308 }, /*                     upstile ⌈ LEFT CEILING */
-  { 0x0bd6, 0x222a }, /*                    downshoe ∪ UNION */
-  { 0x0bd8, 0x2283 }, /*                   rightshoe ⊃ SUPERSET OF */
-  { 0x0bda, 0x2282 }, /*                    leftshoe ⊂ SUBSET OF */
-  { 0x0bdc, 0x22a2 }, /*                    lefttack ⊢ RIGHT TACK */
-  { 0x0bfc, 0x22a3 }, /*                   righttack ⊣ LEFT TACK */
-  { 0x0cdf, 0x2017 }, /*        hebrew_doublelowline ‗ DOUBLE LOW LINE */
-  { 0x0ce0, 0x05d0 }, /*                hebrew_aleph א HEBREW LETTER ALEF */
-  { 0x0ce1, 0x05d1 }, /*                  hebrew_bet ב HEBREW LETTER BET */
-  { 0x0ce2, 0x05d2 }, /*                hebrew_gimel ג HEBREW LETTER GIMEL */
-  { 0x0ce3, 0x05d3 }, /*                hebrew_dalet ד HEBREW LETTER DALET */
-  { 0x0ce4, 0x05d4 }, /*                   hebrew_he ה HEBREW LETTER HE */
-  { 0x0ce5, 0x05d5 }, /*                  hebrew_waw ו HEBREW LETTER VAV */
-  { 0x0ce6, 0x05d6 }, /*                 hebrew_zain ז HEBREW LETTER ZAYIN */
-  { 0x0ce7, 0x05d7 }, /*                 hebrew_chet ח HEBREW LETTER HET */
-  { 0x0ce8, 0x05d8 }, /*                  hebrew_tet ט HEBREW LETTER TET */
-  { 0x0ce9, 0x05d9 }, /*                  hebrew_yod י HEBREW LETTER YOD */
-  { 0x0cea, 0x05da }, /*            hebrew_finalkaph ך HEBREW LETTER FINAL KAF */
-  { 0x0ceb, 0x05db }, /*                 hebrew_kaph כ HEBREW LETTER KAF */
-  { 0x0cec, 0x05dc }, /*                hebrew_lamed ל HEBREW LETTER LAMED */
-  { 0x0ced, 0x05dd }, /*             hebrew_finalmem ם HEBREW LETTER FINAL MEM */
-  { 0x0cee, 0x05de }, /*                  hebrew_mem מ HEBREW LETTER MEM */
-  { 0x0cef, 0x05df }, /*             hebrew_finalnun ן HEBREW LETTER FINAL NUN */
-  { 0x0cf0, 0x05e0 }, /*                  hebrew_nun נ HEBREW LETTER NUN */
-  { 0x0cf1, 0x05e1 }, /*               hebrew_samech ס HEBREW LETTER SAMEKH */
-  { 0x0cf2, 0x05e2 }, /*                 hebrew_ayin ע HEBREW LETTER AYIN */
-  { 0x0cf3, 0x05e3 }, /*              hebrew_finalpe ף HEBREW LETTER FINAL PE */
-  { 0x0cf4, 0x05e4 }, /*                   hebrew_pe פ HEBREW LETTER PE */
-  { 0x0cf5, 0x05e5 }, /*            hebrew_finalzade ץ HEBREW LETTER FINAL TSADI */
-  { 0x0cf6, 0x05e6 }, /*                 hebrew_zade צ HEBREW LETTER TSADI */
-  { 0x0cf7, 0x05e7 }, /*                 hebrew_qoph ק HEBREW LETTER QOF */
-  { 0x0cf8, 0x05e8 }, /*                 hebrew_resh ר HEBREW LETTER RESH */
-  { 0x0cf9, 0x05e9 }, /*                 hebrew_shin ש HEBREW LETTER SHIN */
-  { 0x0cfa, 0x05ea }, /*                  hebrew_taw ת HEBREW LETTER TAV */
-  { 0x0da1, 0x0e01 }, /*                  Thai_kokai ก THAI CHARACTER KO KAI */
-  { 0x0da2, 0x0e02 }, /*                Thai_khokhai ข THAI CHARACTER KHO KHAI */
-  { 0x0da3, 0x0e03 }, /*               Thai_khokhuat ฃ THAI CHARACTER KHO KHUAT */
-  { 0x0da4, 0x0e04 }, /*               Thai_khokhwai ค THAI CHARACTER KHO KHWAI */
-  { 0x0da5, 0x0e05 }, /*                Thai_khokhon ฅ THAI CHARACTER KHO KHON */
-  { 0x0da6, 0x0e06 }, /*             Thai_khorakhang ฆ THAI CHARACTER KHO RAKHANG */
-  { 0x0da7, 0x0e07 }, /*                 Thai_ngongu ง THAI CHARACTER NGO NGU */
-  { 0x0da8, 0x0e08 }, /*                Thai_chochan จ THAI CHARACTER CHO CHAN */
-  { 0x0da9, 0x0e09 }, /*               Thai_choching ฉ THAI CHARACTER CHO CHING */
-  { 0x0daa, 0x0e0a }, /*               Thai_chochang ช THAI CHARACTER CHO CHANG */
-  { 0x0dab, 0x0e0b }, /*                   Thai_soso ซ THAI CHARACTER SO SO */
-  { 0x0dac, 0x0e0c }, /*                Thai_chochoe ฌ THAI CHARACTER CHO CHOE */
-  { 0x0dad, 0x0e0d }, /*                 Thai_yoying ญ THAI CHARACTER YO YING */
-  { 0x0dae, 0x0e0e }, /*                Thai_dochada ฎ THAI CHARACTER DO CHADA */
-  { 0x0daf, 0x0e0f }, /*                Thai_topatak ฏ THAI CHARACTER TO PATAK */
-  { 0x0db0, 0x0e10 }, /*                Thai_thothan ฐ THAI CHARACTER THO THAN */
-  { 0x0db1, 0x0e11 }, /*          Thai_thonangmontho ฑ THAI CHARACTER THO NANGMONTHO */
-  { 0x0db2, 0x0e12 }, /*             Thai_thophuthao ฒ THAI CHARACTER THO PHUTHAO */
-  { 0x0db3, 0x0e13 }, /*                  Thai_nonen ณ THAI CHARACTER NO NEN */
-  { 0x0db4, 0x0e14 }, /*                  Thai_dodek ด THAI CHARACTER DO DEK */
-  { 0x0db5, 0x0e15 }, /*                  Thai_totao ต THAI CHARACTER TO TAO */
-  { 0x0db6, 0x0e16 }, /*               Thai_thothung ถ THAI CHARACTER THO THUNG */
-  { 0x0db7, 0x0e17 }, /*              Thai_thothahan ท THAI CHARACTER THO THAHAN */
-  { 0x0db8, 0x0e18 }, /*               Thai_thothong ธ THAI CHARACTER THO THONG */
-  { 0x0db9, 0x0e19 }, /*                   Thai_nonu น THAI CHARACTER NO NU */
-  { 0x0dba, 0x0e1a }, /*               Thai_bobaimai บ THAI CHARACTER BO BAIMAI */
-  { 0x0dbb, 0x0e1b }, /*                  Thai_popla ป THAI CHARACTER PO PLA */
-  { 0x0dbc, 0x0e1c }, /*               Thai_phophung ผ THAI CHARACTER PHO PHUNG */
-  { 0x0dbd, 0x0e1d }, /*                   Thai_fofa ฝ THAI CHARACTER FO FA */
-  { 0x0dbe, 0x0e1e }, /*                Thai_phophan พ THAI CHARACTER PHO PHAN */
-  { 0x0dbf, 0x0e1f }, /*                  Thai_fofan ฟ THAI CHARACTER FO FAN */
-  { 0x0dc0, 0x0e20 }, /*             Thai_phosamphao ภ THAI CHARACTER PHO SAMPHAO */
-  { 0x0dc1, 0x0e21 }, /*                   Thai_moma ม THAI CHARACTER MO MA */
-  { 0x0dc2, 0x0e22 }, /*                  Thai_yoyak ย THAI CHARACTER YO YAK */
-  { 0x0dc3, 0x0e23 }, /*                  Thai_rorua ร THAI CHARACTER RO RUA */
-  { 0x0dc4, 0x0e24 }, /*                     Thai_ru ฤ THAI CHARACTER RU */
-  { 0x0dc5, 0x0e25 }, /*                 Thai_loling ล THAI CHARACTER LO LING */
-  { 0x0dc6, 0x0e26 }, /*                     Thai_lu ฦ THAI CHARACTER LU */
-  { 0x0dc7, 0x0e27 }, /*                 Thai_wowaen ว THAI CHARACTER WO WAEN */
-  { 0x0dc8, 0x0e28 }, /*                 Thai_sosala ศ THAI CHARACTER SO SALA */
-  { 0x0dc9, 0x0e29 }, /*                 Thai_sorusi ษ THAI CHARACTER SO RUSI */
-  { 0x0dca, 0x0e2a }, /*                  Thai_sosua ส THAI CHARACTER SO SUA */
-  { 0x0dcb, 0x0e2b }, /*                  Thai_hohip ห THAI CHARACTER HO HIP */
-  { 0x0dcc, 0x0e2c }, /*                Thai_lochula ฬ THAI CHARACTER LO CHULA */
-  { 0x0dcd, 0x0e2d }, /*                   Thai_oang อ THAI CHARACTER O ANG */
-  { 0x0dce, 0x0e2e }, /*               Thai_honokhuk ฮ THAI CHARACTER HO NOKHUK */
-  { 0x0dcf, 0x0e2f }, /*              Thai_paiyannoi ฯ THAI CHARACTER PAIYANNOI */
-  { 0x0dd0, 0x0e30 }, /*                  Thai_saraa ะ THAI CHARACTER SARA A */
-  { 0x0dd1, 0x0e31 }, /*             Thai_maihanakat ั THAI CHARACTER MAI HAN-AKAT */
-  { 0x0dd2, 0x0e32 }, /*                 Thai_saraaa า THAI CHARACTER SARA AA */
-  { 0x0dd3, 0x0e33 }, /*                 Thai_saraam ำ THAI CHARACTER SARA AM */
-  { 0x0dd4, 0x0e34 }, /*                  Thai_sarai ิ THAI CHARACTER SARA I */
-  { 0x0dd5, 0x0e35 }, /*                 Thai_saraii ี THAI CHARACTER SARA II */
-  { 0x0dd6, 0x0e36 }, /*                 Thai_saraue ึ THAI CHARACTER SARA UE */
-  { 0x0dd7, 0x0e37 }, /*                Thai_sarauee ื THAI CHARACTER SARA UEE */
-  { 0x0dd8, 0x0e38 }, /*                  Thai_sarau ุ THAI CHARACTER SARA U */
-  { 0x0dd9, 0x0e39 }, /*                 Thai_sarauu ู THAI CHARACTER SARA UU */
-  { 0x0dda, 0x0e3a }, /*                Thai_phinthu ฺ THAI CHARACTER PHINTHU */
-/*  0x0dde                    Thai_maihanakat_maitho ? ??? */
-  { 0x0ddf, 0x0e3f }, /*                   Thai_baht ฿ THAI CURRENCY SYMBOL BAHT */
-  { 0x0de0, 0x0e40 }, /*                  Thai_sarae เ THAI CHARACTER SARA E */
-  { 0x0de1, 0x0e41 }, /*                 Thai_saraae แ THAI CHARACTER SARA AE */
-  { 0x0de2, 0x0e42 }, /*                  Thai_sarao โ THAI CHARACTER SARA O */
-  { 0x0de3, 0x0e43 }, /*          Thai_saraaimaimuan ใ THAI CHARACTER SARA AI MAIMUAN */
-  { 0x0de4, 0x0e44 }, /*         Thai_saraaimaimalai ไ THAI CHARACTER SARA AI MAIMALAI */
-  { 0x0de5, 0x0e45 }, /*            Thai_lakkhangyao ๅ THAI CHARACTER LAKKHANGYAO */
-  { 0x0de6, 0x0e46 }, /*               Thai_maiyamok ๆ THAI CHARACTER MAIYAMOK */
-  { 0x0de7, 0x0e47 }, /*              Thai_maitaikhu ็ THAI CHARACTER MAITAIKHU */
-  { 0x0de8, 0x0e48 }, /*                  Thai_maiek ่ THAI CHARACTER MAI EK */
-  { 0x0de9, 0x0e49 }, /*                 Thai_maitho ้ THAI CHARACTER MAI THO */
-  { 0x0dea, 0x0e4a }, /*                 Thai_maitri ๊ THAI CHARACTER MAI TRI */
-  { 0x0deb, 0x0e4b }, /*            Thai_maichattawa ๋ THAI CHARACTER MAI CHATTAWA */
-  { 0x0dec, 0x0e4c }, /*            Thai_thanthakhat ์ THAI CHARACTER THANTHAKHAT */
-  { 0x0ded, 0x0e4d }, /*               Thai_nikhahit ํ THAI CHARACTER NIKHAHIT */
-  { 0x0df0, 0x0e50 }, /*                 Thai_leksun ๐ THAI DIGIT ZERO */
-  { 0x0df1, 0x0e51 }, /*                Thai_leknung ๑ THAI DIGIT ONE */
-  { 0x0df2, 0x0e52 }, /*                Thai_leksong ๒ THAI DIGIT TWO */
-  { 0x0df3, 0x0e53 }, /*                 Thai_leksam ๓ THAI DIGIT THREE */
-  { 0x0df4, 0x0e54 }, /*                  Thai_leksi ๔ THAI DIGIT FOUR */
-  { 0x0df5, 0x0e55 }, /*                  Thai_lekha ๕ THAI DIGIT FIVE */
-  { 0x0df6, 0x0e56 }, /*                 Thai_lekhok ๖ THAI DIGIT SIX */
-  { 0x0df7, 0x0e57 }, /*                Thai_lekchet ๗ THAI DIGIT SEVEN */
-  { 0x0df8, 0x0e58 }, /*                Thai_lekpaet ๘ THAI DIGIT EIGHT */
-  { 0x0df9, 0x0e59 }, /*                 Thai_lekkao ๙ THAI DIGIT NINE */
-  { 0x0ea1, 0x3131 }, /*               Hangul_Kiyeog ㄱ HANGUL LETTER KIYEOK */
-  { 0x0ea2, 0x3132 }, /*          Hangul_SsangKiyeog ㄲ HANGUL LETTER SSANGKIYEOK */
-  { 0x0ea3, 0x3133 }, /*           Hangul_KiyeogSios ㄳ HANGUL LETTER KIYEOK-SIOS */
-  { 0x0ea4, 0x3134 }, /*                Hangul_Nieun ㄴ HANGUL LETTER NIEUN */
-  { 0x0ea5, 0x3135 }, /*           Hangul_NieunJieuj ㄵ HANGUL LETTER NIEUN-CIEUC */
-  { 0x0ea6, 0x3136 }, /*           Hangul_NieunHieuh ㄶ HANGUL LETTER NIEUN-HIEUH */
-  { 0x0ea7, 0x3137 }, /*               Hangul_Dikeud ㄷ HANGUL LETTER TIKEUT */
-  { 0x0ea8, 0x3138 }, /*          Hangul_SsangDikeud ㄸ HANGUL LETTER SSANGTIKEUT */
-  { 0x0ea9, 0x3139 }, /*                Hangul_Rieul ㄹ HANGUL LETTER RIEUL */
-  { 0x0eaa, 0x313a }, /*          Hangul_RieulKiyeog ㄺ HANGUL LETTER RIEUL-KIYEOK */
-  { 0x0eab, 0x313b }, /*           Hangul_RieulMieum ㄻ HANGUL LETTER RIEUL-MIEUM */
-  { 0x0eac, 0x313c }, /*           Hangul_RieulPieub ㄼ HANGUL LETTER RIEUL-PIEUP */
-  { 0x0ead, 0x313d }, /*            Hangul_RieulSios ㄽ HANGUL LETTER RIEUL-SIOS */
-  { 0x0eae, 0x313e }, /*           Hangul_RieulTieut ㄾ HANGUL LETTER RIEUL-THIEUTH */
-  { 0x0eaf, 0x313f }, /*          Hangul_RieulPhieuf ㄿ HANGUL LETTER RIEUL-PHIEUPH */
-  { 0x0eb0, 0x3140 }, /*           Hangul_RieulHieuh ㅀ HANGUL LETTER RIEUL-HIEUH */
-  { 0x0eb1, 0x3141 }, /*                Hangul_Mieum ㅁ HANGUL LETTER MIEUM */
-  { 0x0eb2, 0x3142 }, /*                Hangul_Pieub ㅂ HANGUL LETTER PIEUP */
-  { 0x0eb3, 0x3143 }, /*           Hangul_SsangPieub ㅃ HANGUL LETTER SSANGPIEUP */
-  { 0x0eb4, 0x3144 }, /*            Hangul_PieubSios ㅄ HANGUL LETTER PIEUP-SIOS */
-  { 0x0eb5, 0x3145 }, /*                 Hangul_Sios ㅅ HANGUL LETTER SIOS */
-  { 0x0eb6, 0x3146 }, /*            Hangul_SsangSios ㅆ HANGUL LETTER SSANGSIOS */
-  { 0x0eb7, 0x3147 }, /*                Hangul_Ieung ㅇ HANGUL LETTER IEUNG */
-  { 0x0eb8, 0x3148 }, /*                Hangul_Jieuj ㅈ HANGUL LETTER CIEUC */
-  { 0x0eb9, 0x3149 }, /*           Hangul_SsangJieuj ㅉ HANGUL LETTER SSANGCIEUC */
-  { 0x0eba, 0x314a }, /*                Hangul_Cieuc ㅊ HANGUL LETTER CHIEUCH */
-  { 0x0ebb, 0x314b }, /*               Hangul_Khieuq ㅋ HANGUL LETTER KHIEUKH */
-  { 0x0ebc, 0x314c }, /*                Hangul_Tieut ㅌ HANGUL LETTER THIEUTH */
-  { 0x0ebd, 0x314d }, /*               Hangul_Phieuf ㅍ HANGUL LETTER PHIEUPH */
-  { 0x0ebe, 0x314e }, /*                Hangul_Hieuh ㅎ HANGUL LETTER HIEUH */
-  { 0x0ebf, 0x314f }, /*                    Hangul_A ㅏ HANGUL LETTER A */
-  { 0x0ec0, 0x3150 }, /*                   Hangul_AE ㅐ HANGUL LETTER AE */
-  { 0x0ec1, 0x3151 }, /*                   Hangul_YA ㅑ HANGUL LETTER YA */
-  { 0x0ec2, 0x3152 }, /*                  Hangul_YAE ㅒ HANGUL LETTER YAE */
-  { 0x0ec3, 0x3153 }, /*                   Hangul_EO ㅓ HANGUL LETTER EO */
-  { 0x0ec4, 0x3154 }, /*                    Hangul_E ㅔ HANGUL LETTER E */
-  { 0x0ec5, 0x3155 }, /*                  Hangul_YEO ㅕ HANGUL LETTER YEO */
-  { 0x0ec6, 0x3156 }, /*                   Hangul_YE ㅖ HANGUL LETTER YE */
-  { 0x0ec7, 0x3157 }, /*                    Hangul_O ㅗ HANGUL LETTER O */
-  { 0x0ec8, 0x3158 }, /*                   Hangul_WA ㅘ HANGUL LETTER WA */
-  { 0x0ec9, 0x3159 }, /*                  Hangul_WAE ㅙ HANGUL LETTER WAE */
-  { 0x0eca, 0x315a }, /*                   Hangul_OE ㅚ HANGUL LETTER OE */
-  { 0x0ecb, 0x315b }, /*                   Hangul_YO ㅛ HANGUL LETTER YO */
-  { 0x0ecc, 0x315c }, /*                    Hangul_U ㅜ HANGUL LETTER U */
-  { 0x0ecd, 0x315d }, /*                  Hangul_WEO ㅝ HANGUL LETTER WEO */
-  { 0x0ece, 0x315e }, /*                   Hangul_WE ㅞ HANGUL LETTER WE */
-  { 0x0ecf, 0x315f }, /*                   Hangul_WI ㅟ HANGUL LETTER WI */
-  { 0x0ed0, 0x3160 }, /*                   Hangul_YU ㅠ HANGUL LETTER YU */
-  { 0x0ed1, 0x3161 }, /*                   Hangul_EU ㅡ HANGUL LETTER EU */
-  { 0x0ed2, 0x3162 }, /*                   Hangul_YI ㅢ HANGUL LETTER YI */
-  { 0x0ed3, 0x3163 }, /*                    Hangul_I ㅣ HANGUL LETTER I */
-  { 0x0ed4, 0x11a8 }, /*             Hangul_J_Kiyeog ᆨ HANGUL JONGSEONG KIYEOK */
-  { 0x0ed5, 0x11a9 }, /*        Hangul_J_SsangKiyeog ᆩ HANGUL JONGSEONG SSANGKIYEOK */
-  { 0x0ed6, 0x11aa }, /*         Hangul_J_KiyeogSios ᆪ HANGUL JONGSEONG KIYEOK-SIOS */
-  { 0x0ed7, 0x11ab }, /*              Hangul_J_Nieun ᆫ HANGUL JONGSEONG NIEUN */
-  { 0x0ed8, 0x11ac }, /*         Hangul_J_NieunJieuj ᆬ HANGUL JONGSEONG NIEUN-CIEUC */
-  { 0x0ed9, 0x11ad }, /*         Hangul_J_NieunHieuh ᆭ HANGUL JONGSEONG NIEUN-HIEUH */
-  { 0x0eda, 0x11ae }, /*             Hangul_J_Dikeud ᆮ HANGUL JONGSEONG TIKEUT */
-  { 0x0edb, 0x11af }, /*              Hangul_J_Rieul ᆯ HANGUL JONGSEONG RIEUL */
-  { 0x0edc, 0x11b0 }, /*        Hangul_J_RieulKiyeog ᆰ HANGUL JONGSEONG RIEUL-KIYEOK */
-  { 0x0edd, 0x11b1 }, /*         Hangul_J_RieulMieum ᆱ HANGUL JONGSEONG RIEUL-MIEUM */
-  { 0x0ede, 0x11b2 }, /*         Hangul_J_RieulPieub ᆲ HANGUL JONGSEONG RIEUL-PIEUP */
-  { 0x0edf, 0x11b3 }, /*          Hangul_J_RieulSios ᆳ HANGUL JONGSEONG RIEUL-SIOS */
-  { 0x0ee0, 0x11b4 }, /*         Hangul_J_RieulTieut ᆴ HANGUL JONGSEONG RIEUL-THIEUTH */
-  { 0x0ee1, 0x11b5 }, /*        Hangul_J_RieulPhieuf ᆵ HANGUL JONGSEONG RIEUL-PHIEUPH */
-  { 0x0ee2, 0x11b6 }, /*         Hangul_J_RieulHieuh ᆶ HANGUL JONGSEONG RIEUL-HIEUH */
-  { 0x0ee3, 0x11b7 }, /*              Hangul_J_Mieum ᆷ HANGUL JONGSEONG MIEUM */
-  { 0x0ee4, 0x11b8 }, /*              Hangul_J_Pieub ᆸ HANGUL JONGSEONG PIEUP */
-  { 0x0ee5, 0x11b9 }, /*          Hangul_J_PieubSios ᆹ HANGUL JONGSEONG PIEUP-SIOS */
-  { 0x0ee6, 0x11ba }, /*               Hangul_J_Sios ᆺ HANGUL JONGSEONG SIOS */
-  { 0x0ee7, 0x11bb }, /*          Hangul_J_SsangSios ᆻ HANGUL JONGSEONG SSANGSIOS */
-  { 0x0ee8, 0x11bc }, /*              Hangul_J_Ieung ᆼ HANGUL JONGSEONG IEUNG */
-  { 0x0ee9, 0x11bd }, /*              Hangul_J_Jieuj ᆽ HANGUL JONGSEONG CIEUC */
-  { 0x0eea, 0x11be }, /*              Hangul_J_Cieuc ᆾ HANGUL JONGSEONG CHIEUCH */
-  { 0x0eeb, 0x11bf }, /*             Hangul_J_Khieuq ᆿ HANGUL JONGSEONG KHIEUKH */
-  { 0x0eec, 0x11c0 }, /*              Hangul_J_Tieut ᇀ HANGUL JONGSEONG THIEUTH */
-  { 0x0eed, 0x11c1 }, /*             Hangul_J_Phieuf ᇁ HANGUL JONGSEONG PHIEUPH */
-  { 0x0eee, 0x11c2 }, /*              Hangul_J_Hieuh ᇂ HANGUL JONGSEONG HIEUH */
-  { 0x0eef, 0x316d }, /*     Hangul_RieulYeorinHieuh ㅭ HANGUL LETTER RIEUL-YEORINHIEUH */
-  { 0x0ef0, 0x3171 }, /*    Hangul_SunkyeongeumMieum ㅱ HANGUL LETTER KAPYEOUNMIEUM */
-  { 0x0ef1, 0x3178 }, /*    Hangul_SunkyeongeumPieub ㅸ HANGUL LETTER KAPYEOUNPIEUP */
-  { 0x0ef2, 0x317f }, /*              Hangul_PanSios ㅿ HANGUL LETTER PANSIOS */
-  { 0x0ef3, 0x3181 }, /*    Hangul_KkogjiDalrinIeung ㆁ HANGUL LETTER YESIEUNG */
-  { 0x0ef4, 0x3184 }, /*   Hangul_SunkyeongeumPhieuf ㆄ HANGUL LETTER KAPYEOUNPHIEUPH */
-  { 0x0ef5, 0x3186 }, /*          Hangul_YeorinHieuh ㆆ HANGUL LETTER YEORINHIEUH */
-  { 0x0ef6, 0x318d }, /*                Hangul_AraeA ㆍ HANGUL LETTER ARAEA */
-  { 0x0ef7, 0x318e }, /*               Hangul_AraeAE ㆎ HANGUL LETTER ARAEAE */
-  { 0x0ef8, 0x11eb }, /*            Hangul_J_PanSios ᇫ HANGUL JONGSEONG PANSIOS */
-  { 0x0ef9, 0x11f0 }, /*  Hangul_J_KkogjiDalrinIeung ᇰ HANGUL JONGSEONG YESIEUNG */
-  { 0x0efa, 0x11f9 }, /*        Hangul_J_YeorinHieuh ᇹ HANGUL JONGSEONG YEORINHIEUH */
-  { 0x0eff, 0x20a9 }, /*                  Korean_Won ₩ WON SIGN */
-  { 0x13a4, 0x20ac }, /*                        Euro € EURO SIGN */
-  { 0x13bc, 0x0152 }, /*                          OE ΠLATIN CAPITAL LIGATURE OE */
-  { 0x13bd, 0x0153 }, /*                          oe œ LATIN SMALL LIGATURE OE */
-  { 0x13be, 0x0178 }, /*                  Ydiaeresis Ÿ LATIN CAPITAL LETTER Y WITH DIAERESIS */
-  { 0x20ac, 0x20ac }, /*                    EuroSign € EURO SIGN */
-};
-
-long keysym2ucs(KeySym keysym)
-{
-    int min = 0;
-    int max = sizeof(keysymtab) / sizeof(struct codepair) - 1;
-    int mid;
-
-    /* first check for Latin-1 characters (1:1 mapping) */
-    if ((keysym >= 0x0020 && keysym <= 0x007e) ||
-        (keysym >= 0x00a0 && keysym <= 0x00ff))
-        return keysym;
-
-    /* also check for directly encoded 24-bit UCS characters */
-    if ((keysym & 0xff000000) == 0x01000000)
-        return keysym & 0x00ffffff;
-
-    /* binary search in table */
-    while (max >= min) {
-        mid = (min + max) / 2;
-        if (keysymtab[mid].keysym < keysym)
-            min = mid + 1;
-        else if (keysymtab[mid].keysym > keysym)
-            max = mid - 1;
-        else {
-            /* found it */
-            return keysymtab[mid].ucs;
-        }
-    }
-
-    /* no matching Unicode value found */
-    return 0xfffd;
-}
--- a/Source/Gorgon/WindowManager/dir.cmake	Sat Feb 15 10:22:44 2020 +0200
+++ b/Source/Gorgon/WindowManager/dir.cmake	Fri Feb 21 17:02:44 2020 +0200
@@ -9,16 +9,9 @@
 	)
 ELSE()
 	LIST(APPEND Local
-		X11.cpp
-		X11Keysym.h
+		X11
 	)
 	
-	#INCLUDE(${CMAKE_CURRENT_LIST_DIR}/XRANDR.cmake)
 	
-	FIND_PACKAGE(X11 REQUIRED)
-	#FIND_PACKAGE(Xrandr REQUIRED)
-
-	LIST(APPEND Libs ${X11_LIBRARIES}  ${X11_Xrandr_LIB} ${X11_Xinerama_LIB})
-
 ENDIF()
 

mercurial