GUI version n-1

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1694 b3059339-0415-0410-9bf9-f77b7e298cf2

7 files changed, 1753 insertions, 0 deletions

diff --git a/Gui/wm/widget.h b/Gui/wm/widget.h
new file mode 100644
index 0000000000..b7751568ea
--- /dev/null
+++ b/Gui/wm/widget.h
@@ -0,0 +1,2 @@
+
+#define wgIsRect( X,Y,tX,tY,bX,bY ) ( ( X > tX )&&( Y > tY )&&( X < bX )&&( Y < bY ) )
\ No newline at end of file
diff --git a/Gui/wm/ws.c b/Gui/wm/ws.c
new file mode 100644
index 0000000000..49122e8500
--- /dev/null
+++ b/Gui/wm/ws.c
@@ -0,0 +1,1077 @@
+
+// --------------------------------------------------------------------------
+//  AutoSpace Window System for Linux/Win32 v0.85
+//   Writed by pontscho/fresh!mindworkz
+// --------------------------------------------------------------------------
+
+#include <X11/Xlib.h>
+#include <X11/Xproto.h>
+#include <X11/Xutil.h>
+#include <X11/keysym.h>
+#include <X11/Xatom.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+#include "ws.h"
+#include "wsconv.h"
+#include "../../config.h"
+
+#include <X11/extensions/xf86dga.h>
+#include <X11/extensions/xf86dgastr.h>
+#include <X11/extensions/XShm.h>
+#include <X11/extensions/shape.h>
+#include <sys/ipc.h>
+#include <sys/shm.h>
+
+typedef struct
+{
+ long flags;
+ long functions;
+ long decorations;
+ long input_mode;
+ long status;
+} MotifWmHints;
+
+Atom                 wsMotifHints;
+
+unsigned int         wsMaxX         = 0; // Screen width.
+unsigned int         wsMaxY         = 0; // Screen height.
+
+Display            * wsDisplay;
+int                  wsScreen;
+Window               wsRootWin;
+XEvent               wsEvent;
+int                  wsWindowDepth;
+GC                   wsHGC;
+MotifWmHints         wsMotifWmHints;
+Atom                 wsTextProperlyAtom = None;
+
+int                  wsDepthOnScreen = 0;
+int                  wsRedMask = 0;
+int                  wsGreenMask = 0;
+int                  wsBlueMask = 0;
+int                  wsOutMask = 0;
+
+int                  wsTrue    = True;
+
+wsTWindow          * wsWindowList[5] = { NULL,NULL,NULL,NULL,NULL };
+int                  wsWLCount = 0;
+
+unsigned long        wsKeyTable[512];
+
+int                  wsUseXShm = 1;
+int                  wsUseDGA = 1;
+int                  wsUseXShape = 1;
+
+int XShmGetEventBase( Display* );
+inline int wsSearch( Window win );
+
+#define MWM_HINTS_FUNCTIONS     (1L << 0)
+#define MWM_HINTS_DECORATIONS   (1L << 1)
+#define MWM_HINTS_INPUT_MODE    (1L << 2)
+#define MWM_HINTS_STATUS        (1L << 3)
+
+#define MWM_FUNC_ALL            (1L << 0)
+#define MWM_FUNC_RESIZE         (1L << 1)
+#define MWM_FUNC_MOVE           (1L << 2)
+#define MWM_FUNC_MINIMIZE       (1L << 3)
+#define MWM_FUNC_MAXIMIZE       (1L << 4)
+#define MWM_FUNC_CLOSE          (1L << 5)
+
+#define MWM_DECOR_ALL           (1L << 0)
+#define MWM_DECOR_BORDER        (1L << 1)
+#define MWM_DECOR_RESIZEH       (1L << 2)
+#define MWM_DECOR_TITLE         (1L << 3)
+#define MWM_DECOR_MENU          (1L << 4)
+#define MWM_DECOR_MINIMIZE      (1L << 5)
+#define MWM_DECOR_MAXIMIZE      (1L << 6)
+
+#define MWM_INPUT_MODELESS 0
+#define MWM_INPUT_PRIMARY_APPLICATION_MODAL 1
+#define MWM_INPUT_SYSTEM_MODAL 2
+#define MWM_INPUT_FULL_APPLICATION_MODAL 3
+#define MWM_INPUT_APPLICATION_MODAL MWM_INPUT_PRIMARY_APPLICATION_MODAL
+
+#define MWM_TEAROFF_WINDOW      (1L<<0)
+
+void wsWindowDecoration( wsTWindow * win,long d )
+{
+ wsMotifHints=XInternAtom( wsDisplay,"_MOTIF_WM_HINTS",0 );
+ if ( wsMotifHints != None )
+  {
+   memset( &wsMotifWmHints,0,sizeof( MotifWmHints ) );
+   wsMotifWmHints.flags=( d?0:MWM_HINTS_FUNCTIONS | MWM_HINTS_DECORATIONS );
+   wsMotifWmHints.functions=( d?0:MWM_FUNC_MOVE | MWM_FUNC_CLOSE | MWM_FUNC_MINIMIZE | MWM_FUNC_MAXIMIZE | MWM_FUNC_RESIZE );
+   wsMotifWmHints.decorations=( d?MWM_DECOR_ALL:0 );
+   XChangeProperty( wsDisplay,win->WindowID,wsMotifHints,wsMotifHints,32,
+                    PropModeReplace,(unsigned char *)&wsMotifWmHints,5 );
+  }
+}
+
+// ----------------------------------------------------------------------------------------------
+//   Init X Window System.
+// ----------------------------------------------------------------------------------------------
+
+int wsIOErrorHandler( Display * dpy )
+{
+ fprintf( stderr,"[ws] io error in display.\n" );
+ exit( 0 );
+}
+
+int wsErrorHandler( Display * dpy,XErrorEvent * Event )
+{
+ char type[128];
+ XGetErrorText( wsDisplay,Event->error_code,type,128 );
+ fprintf(stderr,"[ws] Error in display.\n");
+ fprintf(stderr,"[ws]  Error code: %d ( %s )\n",Event->error_code,type );
+ fprintf(stderr,"[ws]  Request code: %d\n",Event->request_code );
+ fprintf(stderr,"[ws]  Minor code: %d\n",Event->minor_code );
+ exit( 0 );
+}
+
+void wsXInit( void )
+{
+ char * DisplayName = ":0.0";
+ int    eventbase;
+ int    errorbase;
+
+ if ( getenv( "DISPLAY" ) ) DisplayName=getenv( "DISPLAY" );
+ wsDisplay=XOpenDisplay( DisplayName );
+ if ( !wsDisplay )
+  {
+   fprintf( stderr,"[ws] couldn't open the display !\n" );
+   exit( 0 );
+  }
+
+ if ( !XShmQueryExtension( wsDisplay ) )
+  {
+   fprintf( stderr,"[ws] sorry, your system is not supported X shared memory extension.\n" );
+   wsUseXShm=0;
+  }
+// if ( !XDGAQueryExtension( wsDisplay,&eventbase,&errorbase ) )
+  {
+   fprintf( stderr,"[ws] sorry, your system is not supported DGA extension.\n" );
+   wsUseDGA=0;
+  }
+ #ifdef HAVE_XSHAPE
+  if ( !XShapeQueryExtension( wsDisplay,&eventbase,&errorbase ) )
+   {
+    fprintf( stderr,"[ws] sorry, your system is not supported XShape extension.\n" );
+    wsUseXShape=0;
+   }
+ #else
+  wsUseXShape=0;
+ #endif
+
+ XSynchronize( wsDisplay,True );
+
+ wsScreen=DefaultScreen( wsDisplay );
+ wsRootWin=RootWindow( wsDisplay,wsScreen );
+ wsMaxX=DisplayWidth( wsDisplay,wsScreen );
+ wsMaxY=DisplayHeight( wsDisplay,wsScreen );
+
+ wsGetDepthOnScreen();
+ #ifdef DEBUG
+  {
+   int minor,major,shp;
+   fprintf( stderr,"[ws] Screen depth: %d\n",wsDepthOnScreen );
+   fprintf( stderr,"[ws] red mask: 0x%x\n",wsRedMask );
+   fprintf( stderr,"[ws] green mask: 0x%x\n",wsGreenMask );
+   fprintf( stderr,"[ws] blue mask: 0x%x\n",wsBlueMask );
+   if ( wsUseXShm )
+    {
+     XShmQueryVersion( wsDisplay,&major,&minor,&shp );
+     fprintf( stderr,"[ws] XShm version is %d.%d\n",major,minor );
+    }
+   if ( wsUseDGA )
+    {
+//     XDGAQueryVersion( wsDisplay,&major,&minor );
+//     fprintf( stderr,"[ws] DGA version is %d.%d\n",major,minor );
+    }
+   #ifdef HAVE_XSHAPE
+    if ( wsUseXShape )
+     {
+      XShapeQueryVersion( wsDisplay,&major,&minor );
+      fprintf( stderr,"[ws] XShape version is %d.%d\n",major,minor );
+     }
+   #endif
+  }
+ #endif
+ initConverter();
+ wsOutMask=wsGetOutMask();
+ switch ( wsOutMask )
+  {
+   case wsRGB32:
+     wsConvFunc=BGR8880_to_RGB8880_c;
+     break;
+   case wsBGR32:
+     wsConvFunc=BGR8880_to_BGR8880_c;
+     break;
+   case wsRGB24:
+     #ifdef xHAVE_MMX
+      wsConvFunc=BGR8880_to_RGB888_mmx;
+     #else
+      wsConvFunc=BGR8880_to_RGB888_c;
+     #endif
+     break;
+   case wsBGR24:
+     wsConvFunc=BGR8880_to_BGR888_c;
+     break;
+   case wsRGB16:
+     wsConvFunc=BGR8880_to_RGB565_c;
+     break;
+   case wsBGR16:
+     wsConvFunc=BGR8880_to_BGR565_c;
+     break;
+   case wsRGB15:
+     wsConvFunc=BGR8880_to_RGB555_c;
+     break;
+   case wsBGR15:
+     wsConvFunc=BGR8880_to_BGR555_c;
+     break;
+  }
+ XSetIOErrorHandler( wsIOErrorHandler );
+ XSetErrorHandler( wsErrorHandler );
+}
+
+// ----------------------------------------------------------------------------------------------
+//   Create window.
+//     X,Y   : window position
+//     wX,wY : size of window
+//     bW    : border width
+//     cV    : visible mouse cursor on window
+//     D     : visible frame, title, etc.
+//     sR    : screen ratio
+// ----------------------------------------------------------------------------------------------
+
+XClassHint           wsClassHint;
+XTextProperty        wsTextProperty;
+Window               LeaderWindow;
+
+void wsCreateWindow( wsTWindow * win,int X,int Y,int wX,int hY,int bW,int cV,unsigned char D,char * label )
+{
+ win->Property=D;
+ if ( D & wsShowFrame ) win->Decorations=1;
+ wsHGC=DefaultGC( wsDisplay,wsScreen );
+// The window position and size.
+ switch ( X )
+  {
+   case -1: win->X=( wsMaxX / 2 ) - ( wX / 2 ); break;
+   case -2: win->X=wsMaxX - wX - 1; break;
+   default: win->X=X; break;
+  }
+ switch ( Y )
+  {
+   case -1: win->Y=( wsMaxY / 2 ) - ( hY / 2 ); break;
+   case -2: win->Y=wsMaxY - hY - 1; break;
+   default: win->Y=Y; break;
+  }
+ win->Width=wX;
+ win->Height=hY;
+ win->OldX=win->X;
+ win->OldY=win->Y;
+ win->OldWidth=win->Width;
+ win->OldHeight=win->Height;
+
+// Border size for window.
+ win->BorderWidth=bW;
+// Hide Mouse Cursor
+ win->wsCursor=None;
+ win->wsMouseEventType=cV;
+ win->wsCursorData[0]=0;
+ win->wsCursorPixmap=XCreateBitmapFromData( wsDisplay,wsRootWin,win->wsCursorData,1,1 );
+ if ( !(cV & wsShowMouseCursor) ) win->wsCursor=XCreatePixmapCursor( wsDisplay,win->wsCursorPixmap,win->wsCursorPixmap,&win->wsColor,&win->wsColor,0,0 );
+
+ XGetWindowAttributes( wsDisplay,wsRootWin,&win->Attribs );
+ if ( win->Attribs.depth < 15 )
+  {
+   fprintf( stderr,"[ws] sorry, this color depth is not enough.\n" );
+   exit( 0 );
+  }
+ XMatchVisualInfo( wsDisplay,wsScreen,win->Attribs.depth,TrueColor,&win->VisualInfo );
+
+// ---
+ win->AtomLeaderClient=XInternAtom( wsDisplay,"WM_CLIENT_LEADER",False );
+ win->AtomDeleteWindow=XInternAtom( wsDisplay,"WM_DELETE_WINDOW",False );
+ win->AtomTakeFocus=XInternAtom( wsDisplay,"WM_TAKE_FOCUS",False );
+ win->AtomRolle=XInternAtom( wsDisplay,"WM_WINDOW_ROLE",False );
+ win->AtomProtocols=XInternAtom( wsDisplay,"WM_PROTOCOLS",False );
+ {
+  char buf[32]; int i;
+  sprintf( buf,"_%s_REMOTE",label );
+  for( i=0;i<strlen( buf );i++ )
+    if ( ( buf[i] >= 'a' )&&( buf[i] <= 'z' ) ) buf[i]=buf[i] - 32;
+  for( i=0;i<strlen( buf );i++ )
+    if ( buf[i] == ' ' ) buf[i]='_';
+  fprintf( stderr,"[ws] atomname: %s\n",buf );
+  win->AtomRemote=XInternAtom( wsDisplay,buf,False );
+ }
+ win->AtomsProtocols[0]=win->AtomDeleteWindow;
+ win->AtomsProtocols[1]=win->AtomTakeFocus;
+ win->AtomsProtocols[2]=win->AtomRolle;
+// ---
+
+// win->WindowAttrib.background_pixel=BlackPixel( wsDisplay,wsScreen );
+// win->WindowAttrib.border_pixel=BlackPixel( wsDisplay,wsScreen );
+ win->WindowAttrib.background_pixel=BlackPixel( wsDisplay,wsScreen );
+ win->WindowAttrib.border_pixel=WhitePixel( wsDisplay,wsScreen );
+ win->WindowAttrib.colormap=XCreateColormap( wsDisplay,wsRootWin,win->VisualInfo.visual,AllocNone );
+ win->WindowAttrib.event_mask=StructureNotifyMask | FocusChangeMask |
+                              //SubstructureRedirectMask |
+                              //SubstructureNotifyMask |
+                              //ResizeRedirectMask |
+                              //GCGraphicsExposures |
+                              ExposureMask | PropertyChangeMask |
+                              EnterWindowMask | LeaveWindowMask |
+                              VisibilityChangeMask |
+                              KeyPressMask | KeyReleaseMask;
+ if ( ( cV & wsHandleMouseButton ) ) win->WindowAttrib.event_mask|=ButtonPressMask | ButtonReleaseMask;
+ if ( ( cV & wsHandleMouseMove ) ) win->WindowAttrib.event_mask|=PointerMotionMask;
+ win->WindowAttrib.cursor=win->wsCursor;
+ win->WindowAttrib.override_redirect=False;
+ if ( D & wsOverredirect ) win->WindowAttrib.override_redirect=True;
+
+//  win->WindowAttrib.save_under=True;
+//  win->WindowAttrib.do_not_propagate_mask = True;
+
+ win->WindowMask=CWBackPixel | CWBorderPixel |
+                 CWColormap | CWEventMask | CWCursor |
+                 CWX | CWY | CWWidth | CWHeight |
+                 CWOverrideRedirect;
+
+ win->WindowID=XCreateWindow( wsDisplay,
+  (win->Parent != 0?win->Parent:wsRootWin),
+  win->X,win->Y,win->Width,win->Height,win->BorderWidth,
+  win->VisualInfo.depth,
+  InputOutput,
+  win->VisualInfo.visual,
+  win->WindowMask,&win->WindowAttrib );
+
+ wsClassHint.res_name=label;
+ wsClassHint.res_class="mPlayer";
+ XSetClassHint( wsDisplay,win->WindowID,&wsClassHint );
+
+ win->SizeHint.flags=PPosition | PSize | PResizeInc; // | PBaseSize
+ win->SizeHint.x=win->X;
+ win->SizeHint.y=win->Y;
+ win->SizeHint.width=win->Width;
+ win->SizeHint.height=win->Height;
+ if ( D & wsMaxSize )
+  {
+   win->SizeHint.flags|=PMaxSize;
+   win->SizeHint.min_width=win->Width;
+   win->SizeHint.min_height=win->Height;
+  }
+ if ( D & wsMinSize )
+  {
+   win->SizeHint.flags|=PMinSize;
+   win->SizeHint.max_width=win->Width;
+   win->SizeHint.max_height=win->Height;
+  }
+ win->SizeHint.height_inc=1;
+ win->SizeHint.width_inc=1;
+// win->SizeHint.base_width=win->Width;
+// win->SizeHint.base_height=win->Height;
+ XSetWMNormalHints( wsDisplay,win->WindowID,&win->SizeHint );
+
+ win->WMHints.flags=InputHint | StateHint;
+ win->WMHints.input=True;
+ win->WMHints.initial_state=NormalState;
+ XSetWMHints( wsDisplay,win->WindowID,&win->WMHints );
+
+ wsWindowDecoration( win,win->Decorations );
+ XStoreName( wsDisplay,win->WindowID,label );
+ XmbSetWMProperties( wsDisplay,win->WindowID,label,label,NULL,0,NULL,NULL,NULL );
+
+ XSetWMProtocols( wsDisplay,win->WindowID,win->AtomsProtocols,3 );
+ XChangeProperty( wsDisplay,win->WindowID,
+                  win->AtomLeaderClient,
+                  XA_WINDOW,32,PropModeReplace,
+                  (unsigned char *)&LeaderWindow,1 );
+
+ wsTextProperty.value=label;
+ wsTextProperty.encoding=XA_STRING;
+ wsTextProperty.format=8;
+ wsTextProperty.nitems=strlen( label );
+ XSetWMIconName( wsDisplay,win->WindowID,&wsTextProperty );
+
+ XChangeProperty( wsDisplay,win->WindowID,
+                  win->AtomRemote,XA_STRING,
+                  8,PropModeReplace,
+                  "REALIZED",8 );
+
+//  win->Font=XLoadQueryFont( wsDisplay,"-adobe-helvetica-bold-r-normal--14-140-75-75-p-77-iso8859-1" );
+//  -adobe-times-medium-r-normal--14-140-75-75-p-77-iso8859-1" );
+//  -misc-fixed-bold-r-normal--13-120-75-75-C-80-iso8859-1" );
+//  -misc-fixed-bold-r-normal--15-140-75-75-C-90-iso8859-1" );
+//  -misc-fixed-medium-r-normal--15-140-75-75-C-90-iso8859-1" );
+//  -adobe-times-medium-r-normal--24-240-75-75-p-124-iso8859-1" );
+//  -adobe-helvetica-medium-r-normal--10-100-75-75-p-56-iso8859-1" );
+//  -*-helvetica-bold-o-normal--14-*-*-*-p-*-iso8859-1" );
+//  if ( !win->Font ) win->Font=XLoadQueryFont( wsDisplay,"fixed" );
+//  if ( !win->Font )
+//   {
+//    fprintf( stderr,"[main] could not load font.\n" );
+//    exit( 0 );
+//   }
+//  win->FontHeight=win->Font->ascent + win->Font->descent;
+//
+//  #ifdef DEBUG
+//   fprintf( stderr,"[ws] font height: %d\n",win->FontHeight );
+//  #endif
+
+//  win->wGCV.font=win->Font->fid;
+//  win->wGCV.foreground=wsBlack;
+//  win->wGCV.background=wsBlack;
+
+ win->wGC=XCreateGC( wsDisplay,win->WindowID,
+//  GCForeground | GCBackground,
+  0,
+  &win->wGCV );
+
+ win->Visible=0;
+ win->Focused=0;
+ win->Mapped=0;
+ win->Rolled=0;
+ if ( D & wsShowWindow ) XMapWindow( wsDisplay,win->WindowID );
+
+ wsCreateImage( win );
+// --- End of creating --------------------------------------------------------------------------
+
+ wsWindowList[wsWLCount++]=win;
+
+ XFlush( wsDisplay );
+ XSync( wsDisplay,False );
+
+ win->ReDraw=NULL;
+ win->ReSize=NULL;
+ win->Idle=NULL;
+ win->MouseHandler=NULL;
+ win->KeyHandler=NULL;
+ #ifdef DEBUG
+  fprintf( stderr,"[ws] window is created. ( %s ).\n",label );
+ #endif
+}
+
+void wsDestroyWindow( wsTWindow * win )
+{
+ int l;
+ l=wsSearch( win->WindowID );
+ wsWindowList[l]=NULL;
+ if ( win->wsCursor != None )
+   {
+    XFreeCursor( wsDisplay,win->wsCursor );
+    win->wsCursor=None;
+   }
+ XUnmapWindow( wsDisplay,win->WindowID );
+ wsDestroyImage( win );
+ XDestroyWindow( wsDisplay,win->WindowID );
+ win->ReDraw=NULL;
+ win->ReSize=NULL;
+ win->Idle=NULL;
+ win->MouseHandler=NULL;
+ win->KeyHandler=NULL;
+ win->Visible=0;
+ win->Focused=0;
+ win->Mapped=0;
+ win->Rolled=0;
+}
+
+// ----------------------------------------------------------------------------------------------
+//   Handle events.
+// ----------------------------------------------------------------------------------------------
+
+inline int wsSearch( Window win )
+{
+ int i;
+ for ( i=0;i<wsWLCount;i++ ) if ( wsWindowList[i]->WindowID == win ) return i;
+ return -1;
+}
+
+Bool wsEvents( Display * display,XEvent * Event,XPointer arg )
+{
+ KeySym        keySym;
+ unsigned long i = 0;
+ int           l;
+ int           x,y;
+ Window        child_window = 0;
+
+ l=wsSearch( Event->xany.window );
+ if ( l == -1 ) return !wsTrue;
+ switch( Event->type )
+  {
+   case ClientMessage:
+        if ( Event->xclient.message_type == wsWindowList[l]->AtomProtocols )
+         {
+          if ( Event->xclient.data.l[0] == wsWindowList[l]->AtomDeleteWindow )
+           { wsTrue=False; break; }
+          if ( Event->xclient.data.l[0] == wsWindowList[l]->AtomTakeFocus )
+           { i=wsWindowFocusIn;  wsWindowList[l]->Focused=wsFocused; goto expose; }
+          if ( Event->xclient.data.l[0] == wsWindowList[l]->AtomRolle )
+           { fprintf( stderr,"[ws] rolled.\n" ); }
+         }
+        break;
+
+//   case CirculateRequest:fprintf( stderr,"[ws,r] win: 0x%x\n",(int)Event->xcirculaterequest.window ); break;
+//   case CirculateNotify: fprintf( stderr,"[ws,c] win: 0x%x\n",(int)Event->xcirculate.window );        break;
+
+   case MapNotify:   i=wsWindowMapped;   wsWindowList[l]->Mapped=wsMapped;   goto expose;
+   case UnmapNotify: i=wsWindowUnmapped; wsWindowList[l]->Mapped=wsNone;     goto expose;
+   case FocusIn:
+        if ( wsWindowList[l]->Focused == wsFocused ) break;
+        i=wsWindowFocusIn; wsWindowList[l]->Focused=wsFocused; goto expose;
+   case FocusOut:
+        if ( wsWindowList[l]->Focused == wsNone ) break;
+        i=wsWindowFocusOut; wsWindowList[l]->Focused=wsNone;   goto expose;
+   case VisibilityNotify:
+        switch( Event->xvisibility.state )
+         {
+          case VisibilityUnobscured:        i=wsWindowVisible;        wsWindowList[l]->Visible=wsVisible;    goto expose;
+          case VisibilityFullyObscured:     i=wsWindowNotVisible;     wsWindowList[l]->Visible=wsNotVisible; goto expose;
+          case VisibilityPartiallyObscured: i=wsWindowPartialVisible; wsWindowList[l]->Visible=wsPVisible;   goto expose;
+         }
+expose:
+        wsWindowList[l]->State=i;
+        if ( wsWindowList[l]->ReDraw ) wsWindowList[l]->ReDraw( wsDisplay,Event->xany.window );
+        break;
+
+   case Expose:
+        wsWindowList[l]->State=wsWindowExpose;
+        if ( ( wsWindowList[l]->ReDraw )&&( !Event->xexpose.count ) ) wsWindowList[l]->ReDraw( wsDisplay,Event->xany.window );
+        break;
+
+   case ConfigureNotify:
+        XTranslateCoordinates( wsDisplay,wsWindowList[l]->WindowID,wsRootWin,0,0,&x,&y,&child_window );
+        if ( ( wsWindowList[l]->X != x )||( wsWindowList[l]->Y != y )||( wsWindowList[l]->Width != Event->xconfigure.width )||( wsWindowList[l]->Height != Event->xconfigure.height ) )
+          {
+           wsWindowList[l]->X=x; wsWindowList[l]->Y=y;
+           wsWindowList[l]->Width=Event->xconfigure.width; wsWindowList[l]->Height=Event->xconfigure.height;
+//           fprintf( stderr,"[ws] resize: %d,%d %dx%d\n",wsWindowList[l]->X,wsWindowList[l]->Y,Event->xconfigure.width,Event->xconfigure.height );
+           if ( wsWindowList[l]->ReSize ) wsWindowList[l]->ReSize( wsWindowList[l]->X,wsWindowList[l]->Y,wsWindowList[l]->Width,wsWindowList[l]->Height );
+          }
+
+        wsWindowList[l]->Rolled=wsNone;
+        if ( Event->xconfigure.y < 0 )
+          { i=wsWindowRolled; wsWindowList[l]->Rolled=wsRolled; goto expose; }
+
+        break;
+
+   case KeyPress:   i=wsKeyPressed;  goto keypressed;
+   case KeyRelease: i=wsKeyReleased;
+keypressed:
+        wsWindowList[l]->Alt=0;
+        wsWindowList[l]->Shift=0;
+        wsWindowList[l]->NumLock=0;
+        wsWindowList[l]->Control=0;
+        wsWindowList[l]->CapsLock=0;
+        if ( Event->xkey.state & Mod1Mask ) wsWindowList[l]->Alt=1;
+        if ( Event->xkey.state & Mod2Mask ) wsWindowList[l]->NumLock=1;
+        if ( Event->xkey.state & ControlMask ) wsWindowList[l]->Control=1;
+        if ( Event->xkey.state & ShiftMask ) wsWindowList[l]->Shift=1;
+        if ( Event->xkey.state & LockMask ) wsWindowList[l]->CapsLock=1;
+        keySym=XKeycodeToKeysym( wsDisplay,Event->xkey.keycode,0 );
+        if ( keySym != NoSymbol )
+         {
+          keySym=( (keySym&0xff00) != 0?( (keySym&0x00ff) + 256 ):( keySym ) );
+          wsKeyTable[ keySym ]=i;
+          if ( wsWindowList[l]->KeyHandler )
+            wsWindowList[l]->KeyHandler( Event->xkey.state,i,keySym );
+         }
+        break;
+
+   case MotionNotify:  i=wsMoveMouse;                 goto buttonreleased;
+   case ButtonRelease: i=Event->xbutton.button + 128; goto buttonreleased;
+   case ButtonPress:   i=Event->xbutton.button;       goto buttonreleased;
+   case EnterNotify:   i=wsEnterWindow;               goto buttonreleased;
+   case LeaveNotify:   i=wsLeaveWindow;
+buttonreleased:
+        if ( wsWindowList[l]->MouseHandler )
+          wsWindowList[l]->MouseHandler( i,Event->xbutton.x,Event->xbutton.y,Event->xmotion.x_root,Event->xmotion.y_root );
+        break;
+
+   case PropertyNotify:
+//        fprintf(stderr,"[ws] PropertyNotify %s\n",XGetAtomName( wsDisplay,Event->xproperty.atom ) );
+        if ( Event->xproperty.atom == wsWindowList[l]->AtomRemote )
+         {
+          Atom            type;
+          int             format;
+          unsigned long   nitems, bytesafter;
+          unsigned char * args = NULL;
+
+//          fprintf( stderr,"[ws] remote property notify.\n" );
+          XGetWindowProperty( wsDisplay,
+                              Event->xproperty.window,
+                              Event->xproperty.atom,
+                              0,( 65536 / sizeof( long ) ),
+                              False,XA_STRING,
+                              &type,&format,&nitems,&bytesafter,
+                              &args );
+          if ( ( nitems )&&( wsWindowList[l]->RemoteHandler ) )
+           {
+            args[strlen( args ) - 1]=0;
+            wsWindowList[l]->RemoteHandler( args );
+            args[strlen( args ) - 1]=1;
+            XFree( args );
+           }
+         }
+        break;
+
+  }
+ XFlush( wsDisplay );
+ XSync( wsDisplay,False );
+ return !wsTrue;
+// return True;
+}
+
+Bool wsDummyEvents( Display * display,XEvent * Event,XPointer arg )
+{ return True; }
+
+void wsMainLoop( void )
+{
+ fprintf( stderr,"[ws] init threads: %d\n",XInitThreads() );
+ XSynchronize( wsDisplay,False );
+ XLockDisplay( wsDisplay );
+// XIfEvent( wsDisplay,&wsEvent,wsEvents,NULL );
+ while( wsTrue )
+  {
+   XIfEvent( wsDisplay,&wsEvent,wsDummyEvents,NULL );
+   wsEvents( wsDisplay,&wsEvent,NULL );
+  }
+ XUnlockDisplay( wsDisplay );
+}
+
+// ----------------------------------------------------------------------------------------------
+//    Switch to fullscreen.
+// ----------------------------------------------------------------------------------------------
+void wsFullScreen( wsTWindow * win )
+{
+ int decoration = 0;
+ XUnmapWindow( wsDisplay,win->WindowID );
+ win->SizeHint.flags=0;
+ if ( win->isFullScreen )
+  {
+   win->X=win->OldX;
+   win->Y=win->OldY;
+   win->Width=win->OldWidth;
+   win->Height=win->OldHeight;
+   win->isFullScreen=False;
+   if ( win->Property & wsMaxSize )
+    {
+     win->SizeHint.flags|=PMaxSize;
+     win->SizeHint.max_width=win->Width;
+     win->SizeHint.max_height=win->Height;
+    }
+   if ( win->Property & wsMinSize )
+    {
+     win->SizeHint.flags|=PMinSize;
+     win->SizeHint.min_width=win->Width;
+     win->SizeHint.min_height=win->Height;
+    }
+   decoration=win->Decorations;
+   wsScreenSaverOn( wsDisplay );
+  }
+  else
+   {
+    win->OldX=win->X; win->OldY=win->Y;
+    win->OldWidth=win->Width; win->OldHeight=win->Height;
+    win->X=0; win->Y=0;
+    win->Width=wsMaxX; win->Height=wsMaxY;
+    win->isFullScreen=True;
+//    if ( win->Property & wsMaxSize )
+//     {
+//      win->SizeHint.flags|=PMaxSize;
+//      win->SizeHint.min_width=0;
+//      win->SizeHint.min_height=0;
+//     }
+//    if ( win->Property & wsMinSize )
+//     {
+//      win->SizeHint.flags|=PMinSize;
+//      win->SizeHint.max_width=4096;
+//      win->SizeHint.max_height=4096;
+//     }
+    wsScreenSaverOff( wsDisplay );
+   }
+
+ win->SizeHint.flags|=PPosition | PSize;
+ win->SizeHint.x=win->X;
+ win->SizeHint.y=win->Y;
+ win->SizeHint.width=win->Width;
+ win->SizeHint.height=win->Height;
+ XSetWMNormalHints( wsDisplay,win->WindowID,&win->SizeHint );
+
+ XMoveResizeWindow( wsDisplay,win->WindowID,win->X,win->Y,win->Width,win->Height );
+ wsWindowDecoration( win,decoration );
+ XRaiseWindow( wsDisplay,win->WindowID );
+ XMapWindow( wsDisplay,win->WindowID );
+}
+
+// ----------------------------------------------------------------------------------------------
+//    Redraw screen.
+// ----------------------------------------------------------------------------------------------
+void wsPostRedisplay( wsTWindow * win )
+{
+ if ( win->ReDraw )
+  {
+   win->ReDraw( wsDisplay,win->WindowID );
+   XFlush( wsDisplay );
+  }
+}
+
+// ----------------------------------------------------------------------------------------------
+//    Do Exit.
+// ----------------------------------------------------------------------------------------------
+void wsDoExit( void )
+{ wsTrue=False; wsResizeWindow( wsWindowList[0],32,32 ); }
+
+// ----------------------------------------------------------------------------------------------
+//    Put 'Image' to window.
+// ----------------------------------------------------------------------------------------------
+void wsConvert( wsTWindow * win,unsigned char * Image,unsigned int Size )
+{ if ( wsConvFunc ) wsConvFunc( Image,win->ImageData,win->xImage->width * win->xImage->height ); }
+
+void wsPutImage( wsTWindow * win )
+{
+ if ( wsUseXShm )
+  {
+   XShmPutImage( wsDisplay,win->WindowID,win->wGC,win->xImage,
+    0,0,
+    ( win->Width - win->xImage->width ) / 2,( win->Height - win->xImage->height ) / 2,
+    win->xImage->width,win->xImage->height,0 );
+//    win->Width,win->Height,0 );
+  }
+  else
+   {
+    XPutImage( wsDisplay,win->WindowID,win->wGC,win->xImage,
+    0,0,
+    ( win->Width - win->xImage->width ) / 2,( win->Height - win->xImage->height ) / 2,
+    win->xImage->width,win->xImage->height );
+   }
+}
+
+// ----------------------------------------------------------------------------------------------
+//    Move window to x, y.
+// ----------------------------------------------------------------------------------------------
+void wsMoveWindow( wsTWindow * win,int x, int y )
+{
+ switch ( x )
+  {
+   case -1: win->X=( wsMaxX / 2 ) - ( win->Width / 2 ); break;
+   case -2: win->X=wsMaxX - win->Width; break;
+   default: win->X=x; break;
+  }
+ switch ( y )
+  {
+   case -1: win->Y=( wsMaxY / 2 ) - ( win->Height / 2 ); break;
+   case -2: win->Y=wsMaxY - win->Height; break;
+   default: win->Y=y; break;
+  }
+
+ win->SizeHint.flags=PPosition;
+ win->SizeHint.x=win->X;
+ win->SizeHint.y=win->Y;
+ XSetWMNormalHints( wsDisplay,win->WindowID,&win->SizeHint );
+
+ XMoveWindow( wsDisplay,win->WindowID,win->X,win->Y );
+}
+
+// ----------------------------------------------------------------------------------------------
+//    Resize window to sx, sy.
+// ----------------------------------------------------------------------------------------------
+void wsResizeWindow( wsTWindow * win,int sx, int sy )
+{
+ win->Width=sx;
+ win->Height=sy;
+
+ win->SizeHint.flags=PSize;
+ win->SizeHint.width=win->Width;
+ win->SizeHint.height=win->Height;
+ if ( win->Property & wsMinSize )
+  {
+   win->SizeHint.flags|=PMinSize;
+   win->SizeHint.min_width=win->Width;
+   win->SizeHint.min_height=win->Height;
+  }
+ if ( win->Property & wsMaxSize )
+  {
+   win->SizeHint.flags|=PMaxSize;
+   win->SizeHint.max_width=win->Width;
+   win->SizeHint.max_height=win->Height;
+  }
+ XSetWMNormalHints( wsDisplay,win->WindowID,&win->SizeHint );
+ XResizeWindow( wsDisplay,win->WindowID,sx,sy );
+}
+
+// ----------------------------------------------------------------------------------------------
+//    Iconify window.
+// ----------------------------------------------------------------------------------------------
+void wsIconify( wsTWindow win )
+{ XIconifyWindow( wsDisplay,win.WindowID,0 ); }
+
+// ----------------------------------------------------------------------------------------------
+//    Move top the window.
+// ----------------------------------------------------------------------------------------------
+void wsMoveTopWindow( wsTWindow * win )
+{ XRaiseWindow( wsDisplay,win->WindowID ); }
+//{ XUnmapWindow( wsDisplay,win.WindowID ); XMapWindow( wsDisplay,win.WindowID ); }
+
+// ----------------------------------------------------------------------------------------------
+//    Set window background to 'color'.
+// ----------------------------------------------------------------------------------------------
+void wsSetBackground( wsTWindow * win,int color )
+{ XSetWindowBackground( wsDisplay,win->WindowID,color ); }
+
+void wsSetBackgroundRGB( wsTWindow * win,int r,int g,int b )
+{
+ int color = 0;
+ switch ( wsOutMask )
+  {
+   case wsRGB32:
+   case wsRGB24: color=( r << 16 ) + ( g << 8 ) + b;  break;
+   case wsBGR32:
+   case wsBGR24: color=( b << 16 ) + ( g << 8 ) + r;  break;
+   case wsRGB16: PACK_RGB16( r,g,b,color ); break;
+   case wsBGR16: PACK_RGB16( b,g,r,color ); break;
+   case wsRGB15: PACK_RGB15( r,g,b,color ); break;
+   case wsBGR15: PACK_RGB15( b,g,r,color ); break;
+  }
+ XSetWindowBackground( wsDisplay,win->WindowID,color );
+}
+
+
+// ----------------------------------------------------------------------------------------------
+//    Draw string at x,y with fc ( foreground color ) and bc ( background color ).
+// ----------------------------------------------------------------------------------------------
+void wsDrawString( wsTWindow win,int x,int y,char * str,int fc,int bc )
+{
+ XSetForeground( wsDisplay,win.wGC,bc );
+ XFillRectangle( wsDisplay,win.WindowID,win.wGC,x,y,
+   XTextWidth( win.Font,str,strlen( str ) ) + 20,
+   win.FontHeight + 2 );
+ XSetForeground( wsDisplay,win.wGC,fc );
+ XDrawString( wsDisplay,win.WindowID,win.wGC,x + 10,y + 13,str,strlen( str ) );
+}
+
+// ----------------------------------------------------------------------------------------------
+//    Calculation string width.
+// ----------------------------------------------------------------------------------------------
+int wsTextWidth( wsTWindow win,char * str )
+{ return XTextWidth( win.Font,str,strlen( str ) ) + 20; }
+
+// ----------------------------------------------------------------------------------------------
+//    Show / hide mouse cursor.
+// ----------------------------------------------------------------------------------------------
+void wsVisibleMouse( wsTWindow * win,int m )
+{
+ switch ( m )
+  {
+   case wsShowMouseCursor:
+    if ( win->wsCursor != None )
+     {
+      XFreeCursor( wsDisplay,win->wsCursor );
+      win->wsCursor=None;
+     }
+    XDefineCursor( wsDisplay,win->WindowID,0 );
+    break;
+   case wsHideMouseCursor:
+    win->wsCursor=XCreatePixmapCursor( wsDisplay,win->wsCursorPixmap,win->wsCursorPixmap,&win->wsColor,&win->wsColor,0,0 );
+    XDefineCursor( wsDisplay,win->WindowID,win->wsCursor );
+    break;
+  }
+ XFlush( wsDisplay );
+}
+
+int wsGetDepthOnScreen( void )
+{
+ int                 bpp,ibpp;
+ XImage            * mXImage;
+ XWindowAttributes   attribs;
+
+ mXImage=XGetImage( wsDisplay,wsRootWin,0,0,1,1,AllPlanes,ZPixmap );
+ bpp=mXImage->bits_per_pixel;
+
+ XGetWindowAttributes( wsDisplay,wsRootWin,&attribs );
+ ibpp=attribs.depth;
+ mXImage=XGetImage( wsDisplay,wsRootWin,0,0,1,1,AllPlanes,ZPixmap );
+ bpp=mXImage->bits_per_pixel;
+ if ( ( ibpp + 7 ) / 8 != ( bpp + 7 ) / 8 ) ibpp=bpp;
+ wsDepthOnScreen=ibpp;
+ wsRedMask=mXImage->red_mask;
+ wsGreenMask=mXImage->green_mask;
+ wsBlueMask=mXImage->blue_mask;
+ XDestroyImage( mXImage );
+ return ibpp;
+}
+
+void wsXDone( void )
+{
+// if ( wsSwitchedAnotherVideoMode ) wsChangeVideoMode( wsOldXResolution,wsOldYResolution );
+// if ( wsUseDGA ) XF86DGADirectVideo( wsDisplay,wsScreen,0 );
+ XCloseDisplay( wsDisplay );
+}
+
+void wsVisibleWindow( wsTWindow * win,int show )
+{
+ switch( show )
+  {
+   case wsShowWindow: XMapWindow( wsDisplay,win->WindowID ); break;
+   case wsHideWindow: XUnmapWindow( wsDisplay,win->WindowID ); break;
+  }
+ XFlush( wsDisplay );
+}
+
+void wsDestroyImage( wsTWindow * win )
+{
+ if ( win->xImage )
+  {
+   XDestroyImage( win->xImage );
+   if ( wsUseXShm )
+    {
+     XShmDetach( wsDisplay,&win->Shminfo );
+     shmdt( win->Shminfo.shmaddr );
+    }
+  }
+ win->xImage=NULL;
+}
+
+void wsCreateImage( wsTWindow * win )
+{
+ int CompletionType = -1;
+ if ( wsUseXShm )
+  {
+   CompletionType=XShmGetEventBase( wsDisplay ) + ShmCompletion;
+   win->xImage=XShmCreateImage( wsDisplay,win->VisualInfo.visual,
+                   win->Attribs.depth,ZPixmap,NULL,&win->Shminfo,win->Width,win->Height );
+   if ( win->xImage == NULL )
+    {
+     fprintf( stderr,"[ws] shared memory extension error.\n" );
+     exit( 0 );
+    }
+//   #ifdef DEBUG
+//    fprintf( stderr,"[ws] Screen depth: %d\n",win->xImage->bits_per_pixel );
+//   #endif
+   win->Shminfo.shmid=shmget( IPC_PRIVATE,win->xImage->bytes_per_line * win->xImage->height,IPC_CREAT|0777 );
+   if ( win->Shminfo.shmid < 0 )
+    {
+     XDestroyImage( win->xImage );
+     fprintf( stderr,"[ws] shared memory extension error.\n" );
+     exit( 0 );
+    }
+   win->Shminfo.shmaddr=(char *)shmat( win->Shminfo.shmid,0,0 );
+
+   if ( win->Shminfo.shmaddr == ((char *) -1) )
+    {
+     XDestroyImage( win->xImage );
+     if ( win->Shminfo.shmaddr != ((char *) -1) ) shmdt( win->Shminfo.shmaddr );
+     fprintf( stderr,"[ws] shared memory extension error.\n" );
+     exit( 0 );
+    }
+   win->xImage->data=win->Shminfo.shmaddr;
+   win->Shminfo.readOnly=0;
+   XShmAttach( wsDisplay,&win->Shminfo );
+   shmctl( win->Shminfo.shmid,IPC_RMID,0 );
+  }
+  else
+   {
+    win->xImage=XCreateImage( wsDisplay,win->VisualInfo.visual,win->Attribs.depth,
+                              ZPixmap,0,0,win->Width,win->Height,
+                              (wsDepthOnScreen == 3) ? 32 : wsDepthOnScreen,
+                              0 );
+    if ( ( win->xImage->data=malloc( win->xImage->bytes_per_line * win->xImage->height ) ) == NULL )
+     {
+      fprintf( stderr,"[ws] sorry, not enough memory for draw buffer.\n" );
+      exit( 0 );
+     }
+   }
+ win->ImageData=(unsigned char *)win->xImage->data;
+ win->ImageDataw=(unsigned short int *)win->xImage->data;
+ win->ImageDatadw=(unsigned int *)win->xImage->data;
+}
+
+void wsResizeImage( wsTWindow * win )
+{ wsDestroyImage( win ); wsCreateImage( win ); }
+
+int wsGetOutMask( void )
+{
+ if ( ( wsDepthOnScreen == 32 )&&( wsRedMask == 0xff0000 )&&( wsGreenMask == 0x00ff00 )&&( wsBlueMask == 0x0000ff ) ) return wsRGB32;
+ if ( ( wsDepthOnScreen == 32 )&&( wsRedMask == 0x0000ff )&&( wsGreenMask == 0x00ff00 )&&( wsBlueMask == 0xff0000 ) ) return wsBGR32;
+ if ( ( wsDepthOnScreen == 24 )&&( wsRedMask == 0xff0000 )&&( wsGreenMask == 0x00ff00 )&&( wsBlueMask == 0x0000ff ) ) return wsRGB24;
+ if ( ( wsDepthOnScreen == 24 )&&( wsRedMask == 0x0000ff )&&( wsGreenMask == 0x00ff00 )&&( wsBlueMask == 0xff0000 ) ) return wsBGR24;
+ if ( ( wsDepthOnScreen == 16 )&&( wsRedMask == 0xf800 )&&( wsGreenMask == 0x7e0 )&&( wsBlueMask ==   0x1f ) ) return wsRGB16;
+ if ( ( wsDepthOnScreen == 16 )&&( wsRedMask ==   0x1f )&&( wsGreenMask == 0x7e0 )&&( wsBlueMask == 0xf800 ) ) return wsBGR16;
+ if ( ( wsDepthOnScreen == 15 )&&( wsRedMask == 0x7c00 )&&( wsGreenMask == 0x3e0 )&&( wsBlueMask ==   0x1f ) ) return wsRGB15;
+ if ( ( wsDepthOnScreen == 15 )&&( wsRedMask ==   0x1f )&&( wsGreenMask == 0x3e0 )&&( wsBlueMask == 0x7c00 ) ) return wsBGR15;
+ return 0;
+}
+
+void wsSetTitle( wsTWindow * win,char * name )
+{ XStoreName( wsDisplay,win->WindowID,name ); }
+
+void wsSetMousePosition( wsTWindow * win,int x, int y )
+{ XWarpPointer( wsDisplay,wsRootWin,win->WindowID,0,0,0,0,x,y ); }
+
+static int dpms_disabled=0;
+static int timeout_save=0;
+
+void wsScreenSaverOn( Display *mDisplay )
+{
+ int nothing;
+ if ( dpms_disabled )
+  {
+   if ( DPMSQueryExtension( mDisplay,&nothing,&nothing ) )
+    {
+     if ( !DPMSEnable( mDisplay ) ) fprintf( stderr,"DPMS not available ?\n" ); // restoring power saving settings
+      else
+       {
+        // DPMS does not seem to be enabled unless we call DPMSInfo
+        BOOL onoff;
+        CARD16 state;
+        DPMSInfo( mDisplay,&state,&onoff );
+        if ( onoff ) fprintf( stderr,"Successfully enabled DPMS.\n" );
+         else fprintf( stderr,"Could not enable DPMS.\n" );
+       }
+    }
+  }
+
+ if ( timeout_save )
+  {
+   int dummy, interval, prefer_blank, allow_exp;
+   XGetScreenSaver( mDisplay,&dummy,&interval,&prefer_blank,&allow_exp );
+   XSetScreenSaver( mDisplay,timeout_save,interval,prefer_blank,allow_exp );
+   XGetScreenSaver( mDisplay,&timeout_save,&interval,&prefer_blank,&allow_exp );
+  }
+}
+
+void wsScreenSaverOff( Display * mDisplay )
+{
+ int interval,prefer_blank,allow_exp,nothing;
+
+ if ( DPMSQueryExtension( mDisplay,&nothing,&nothing ) )
+  {
+   BOOL onoff;
+   CARD16 state;
+   DPMSInfo( mDisplay,&state,&onoff );
+   if ( onoff )
+    {
+      Status stat;
+      fprintf( stderr,"Disabling DPMS.\n" );
+      dpms_disabled=1;
+      stat=DPMSDisable( mDisplay );  // monitor powersave off
+      fprintf( stderr,"stat: %d.\n",stat );
+   }
+  }
+ XGetScreenSaver( mDisplay,&timeout_save,&interval,&prefer_blank,&allow_exp );
+ if ( timeout_save ) XSetScreenSaver( mDisplay,0,interval,prefer_blank,allow_exp ); // turning off screensaver
+}
+
+void wsSetShape( wsTWindow * win,char * data )
+{
+#ifdef HAVE_XSHAPE
+ if ( ( !wsUseXShape )||( !data ) ) return;
+ win->Mask=XCreateBitmapFromData( wsDisplay,win->WindowID,data,win->Width,win->Height );
+ XShapeCombineMask( wsDisplay,win->WindowID,ShapeBounding,0,0,win->Mask,ShapeSet );
+ XFreePixmap( wsDisplay,win->Mask );
+#endif
+}
+
+#include "wsmkeys.h"
diff --git a/Gui/wm/ws.h b/Gui/wm/ws.h
new file mode 100644
index 0000000000..be10ff0b0d
--- /dev/null
+++ b/Gui/wm/ws.h
@@ -0,0 +1,239 @@
+
+// ----------------------------------------------------------------------------------------------
+//  AutoSpace Window System for Linux/Win32 v0.61
+//   Writed by pontscho / fresh!mindworkz
+// ----------------------------------------------------------------------------------------------
+
+#ifndef __MY_WS
+#define __MY_WS
+
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/keysym.h>
+#include <X11/Xatom.h>
+#include <X11/extensions/XShm.h>
+#include <X11/extensions/dpms.h>
+
+#define  wsKeyReleased   0
+#define  wsKeyPressed    1
+
+#define  wsShift        (1L<<0)
+#define  wsLock         (1L<<1)
+#define  wsCtrl         (1L<<2)
+#define  wsAlt          (1L<<3)
+
+#define  wsPLMouseButton 1
+#define  wsPMMouseButton 2
+#define  wsPRMouseButton 3
+#define  wsRLMouseButton 1 + 128
+#define  wsRMMouseButton 2 + 128
+#define  wsRRMouseButton 3 + 128
+#define  wsEnterWindow   253
+#define  wsLeaveWindow   254
+#define  wsMoveMouse     255
+
+#define  wsShowMouseCursor   1
+#define  wsMouse             1
+#define  wsHideMouseCursor   0
+#define  wsNoMouse           0
+#define  wsHandleMouseButton 2
+#define  wsHandleMouseMove   4
+
+#define  wsHideFrame    0
+#define  wsNoFrame      0
+#define  wsShowFrame    1
+#define  wsFrame        1
+#define  wsMaxSize      2
+#define  wsMinSize      4
+#define  wsShowWindow   8
+#define  wsHideWindow   16
+#define  wsOverredirect 32
+
+#define  wsNoBorder 0
+
+#define  wsSysName "AutoSpace Window System LiTe"
+
+#define wsRGB32 1
+#define wsBGR32 2
+#define wsRGB24 3
+#define wsBGR24 4
+#define wsRGB16 5
+#define wsBGR16 6
+#define wsRGB15 7
+#define wsBGR15 8
+
+#define wsWindowVisible          1
+#define wsWindowPartialVisible   2
+#define wsWindowNotVisible       4
+#define wsWindowMapped           8
+#define wsWindowUnmapped        16
+#define wsWindowFocusIn         32
+#define wsWindowFocusOut        64
+#define wsWindowExpose         128
+#define wsWindowRolled         256
+
+#define wsNone       0
+#define wsMapped     1
+#define wsFocused    2
+#define wsVisible    3
+#define wsNotVisible 4
+#define wsPVisible   5
+#define wsRolled     6
+
+#define wsParamDisplay Display *dpy,Window w
+
+typedef   void (*wsTReDraw)( wsParamDisplay );
+typedef   void (*wsTReSize)( unsigned int X,unsigned int Y,unsigned int width,unsigned int height );
+typedef   void (*wsTIdle)( void );
+typedef   void (*wsTKeyHandler)( int State,int Type,int Key );
+typedef   void (*wsTMouseHandler)( int Button,int X,int Y,int RX,int RY  );
+typedef   void (*wsRemoteHandler)( char * str );
+
+typedef struct
+{
+ Window               WindowID;
+ Window               Parent;
+ int                  X,Y,Width,Height;
+ int                  OldX,OldY,OldWidth,OldHeight;
+ int                  MaxX,MaxY;
+ int                  isFullScreen;
+ int                  BorderWidth;
+ int                  Property;
+ unsigned char *      bImage;
+ XImage        *      xImage;
+ Pixmap               Mask;
+ int                  Decorations;
+
+ int                  State;
+ int                  Visible;
+ int                  Mapped;
+ int                  Focused;
+ int                  Rolled;
+
+ wsTReDraw            ReDraw;
+ wsTReSize            ReSize;
+ wsTIdle              Idle;
+ wsTKeyHandler        KeyHandler;
+ wsTMouseHandler      MouseHandler;
+ wsRemoteHandler      RemoteHandler;
+
+ int                  Alt;
+ int                  Shift;
+ int                  Control;
+ int                  NumLock;
+ int                  CapsLock;
+// --- Misc -------------------------------------------------------------------------------------
+
+ Atom                 AtomDeleteWindow;
+ Atom                 AtomTakeFocus;
+ Atom                 AtomRolle;
+ Atom                 AtomProtocols;
+ Atom                 AtomsProtocols[3];
+ Atom                 AtomLeaderClient;
+ Atom                 AtomRemote;
+
+ XShmSegmentInfo      Shminfo;
+ unsigned char      * ImageData;
+ unsigned short int * ImageDataw;
+ unsigned int       * ImageDatadw;
+ GC                   wGC;
+ XGCValues            wGCV;
+ unsigned long        WindowMask;
+ XVisualInfo          VisualInfo;
+ XWindowAttributes    Attribs;
+ XSetWindowAttributes WindowAttrib;
+ XSizeHints           SizeHint;
+ XWMHints             WMHints;
+
+ XFontStruct        * Font;
+ int                  FontHeight;
+
+ Cursor               wsCursor;
+ char                 wsCursorData[1];
+ Pixmap               wsCursorPixmap;
+ int                  wsMouseEventType;
+ XColor               wsColor;
+} wsTWindow;
+
+extern unsigned int         wsMaxX;
+extern unsigned int         wsMaxY;
+
+extern Display            * wsDisplay;
+extern int                  wsScreen;
+extern Window               wsRootWin;
+
+extern unsigned char      * wsImageData;
+
+extern XEvent               wsEvent;
+
+extern int                  wsDepthOnScreen;
+extern int                  wsRedMask;
+extern int                  wsGreenMask;
+extern int                  wsBlueMask;
+
+extern int                  wsUseXShm;
+extern int                  wsUseDGA;
+
+// ----------------------------------------------------------------------------------------------
+//  wsKeyTable
+// ----------------------------------------------------------------------------------------------
+extern unsigned long        wsKeyTable[512];
+
+extern void wsXDone( void );
+extern void wsXInit( void );
+
+extern int wsGetDepthOnScreen( void );
+
+extern void wsDoExit( void );
+extern void wsMainLoop( void );
+
+// ----------------------------------------------------------------------------------------------
+//  wsCrateWindow: create a new window on the screen.
+//   X,Y   : window position
+//   wX,hY : window size
+//   bW    : window frame size
+//   cV    : mouse cursor visible
+//   D     : "decoration", visible titlebar, etc ...
+// ----------------------------------------------------------------------------------------------
+extern void wsCreateWindow( wsTWindow * win,int X,int Y,int wX,int hY,int bW,int cV,unsigned char D,char * label );
+extern void wsDestroyWindow( wsTWindow * win );
+extern void wsMoveWindow( wsTWindow * win,int x, int y );
+extern void wsResizeWindow( wsTWindow * win,int sx, int sy );
+extern void wsIconify( wsTWindow win );
+extern void wsMoveTopWindow( wsTWindow * win );
+extern void wsSetBackground( wsTWindow * win,int color );
+extern void wsSetBackgroundRGB( wsTWindow * win,int r,int g,int b );
+#define wsClearWindow( win ); XClearWindow( wsDisplay,win.WindowID );
+extern void wsSetTitle( wsTWindow * win,char * name );
+extern void wsVisibleWindow( wsTWindow * win,int show );
+extern void wsWindowDecoration( wsTWindow * win,long d );
+extern void wsFullScreen( wsTWindow * win );
+extern void wsPostRedisplay( wsTWindow * win );
+extern void wsSetShape( wsTWindow * win,char * data );
+
+// ----------------------------------------------------------------------------------------------
+//    Draw string at x,y with fc ( foreground color ) and bc ( background color ).
+// ----------------------------------------------------------------------------------------------
+extern void wsDrawString( wsTWindow win,int x,int y,char * str,int fc,int bc );
+extern int  wsTextWidth( wsTWindow win,char * str );
+
+// ----------------------------------------------------------------------------------------------
+//    Show / hide mouse cursor.
+// ----------------------------------------------------------------------------------------------
+extern void wsVisibleMouse( wsTWindow * win,int m );
+extern void wsSetMousePosition( wsTWindow * win,int x, int y );
+
+// ----------------------------------------------------------------------------------------------
+// Image handling
+// ----------------------------------------------------------------------------------------------
+extern void wsCreateImage( wsTWindow * win );
+extern void wsConvert( wsTWindow * win,unsigned char * Image,unsigned int Size );
+extern void wsPutImage( wsTWindow * win );
+extern void wsResizeImage( wsTWindow * win );
+extern void wsDestroyImage( wsTWindow * win );
+extern int  wsGetOutMask( void );
+
+extern void wsScreenSaverOn( Display *mDisplay );
+extern void wsScreenSaverOff( Display * mDisplay );
+
+#endif
\ No newline at end of file
diff --git a/Gui/wm/wsconv.c b/Gui/wm/wsconv.c
new file mode 100644
index 0000000000..935672cf09
--- /dev/null
+++ b/Gui/wm/wsconv.c
@@ -0,0 +1,204 @@
+
+#include <stdlib.h>
+#include <stdio.h>
+
+#include "../../config.h"
+#ifdef xHAVE_MMX
+ #include "../../main/libvo/mmx.h"
+ #include "../../main/libvo/fastmemcpy.h"
+#endif
+#include "wsconv.h"
+
+wsTConvFunc wsConvFunc = NULL;
+
+// ---
+
+#define COPY_RGB_24(src,dst) dst[0]=src[0];dst[1]=src[1];dst[2]=src[2]
+
+#define SWAP_RGB_24(src,dst) dst[1]=src[0];dst[1]=src[1];dst[2]=src[0]
+
+void BGR8880_to_RGB555_c( unsigned char * in_pixels, unsigned char * out_pixels, int num_pixels)
+{
+ unsigned short pixel;
+ int i;
+ for(i = 0; i < num_pixels; i++)
+  {
+   PACK_RGB15(in_pixels[0],in_pixels[1],in_pixels[2],pixel);
+   *(unsigned short*)out_pixels = pixel;
+   in_pixels += 4;
+   out_pixels += 2;
+  }
+}
+
+void BGR8880_to_BGR555_c( unsigned char * in_pixels, unsigned char * out_pixels, int num_pixels)
+{
+ unsigned short pixel;
+ int i;
+ for(i = 0; i < num_pixels; i++)
+  {
+   PACK_RGB15(in_pixels[2],in_pixels[1],in_pixels[0],pixel);
+   *(unsigned short*)out_pixels = pixel;
+   in_pixels += 4;
+   out_pixels += 2;
+  }
+}
+
+void BGR8880_to_RGB565_c( unsigned char * in_pixels, unsigned char * out_pixels, int num_pixels)
+{
+ unsigned short pixel;
+ int i;
+ for(i = 0; i < num_pixels; i++)
+  {
+   PACK_RGB16(in_pixels[0],in_pixels[1],in_pixels[2],pixel);
+   *(unsigned short*)out_pixels = pixel;
+   in_pixels += 4;
+   out_pixels += 2;
+  }
+}
+
+void BGR8880_to_BGR565_c( unsigned char * in_pixels, unsigned char * out_pixels, int num_pixels)
+{
+ unsigned short pixel;
+ int i;
+ for(i = 0; i < num_pixels; i++)
+  {
+   PACK_RGB16(in_pixels[2],in_pixels[1],in_pixels[0],pixel);
+   *(unsigned short*)out_pixels = pixel;
+   in_pixels += 4;
+   out_pixels += 2;
+  }
+}
+
+void BGR8880_to_RGB888_c( unsigned char * in_pixels, unsigned char * out_pixels,int num_pixels )
+{
+ int i;
+ for(i = 0; i < num_pixels; i++)
+  {
+   COPY_RGB_24(in_pixels,out_pixels);
+   in_pixels += 4;
+   out_pixels += 3;
+  }
+}
+
+void BGR8880_to_BGR888_c( unsigned char * in_pixels, unsigned char * out_pixels,int num_pixels )
+{
+ int i;
+ for(i = 0; i < num_pixels; i++)
+  {
+   SWAP_RGB_24(in_pixels,out_pixels);
+   in_pixels += 4;
+   out_pixels += 3;
+  }
+}
+
+void BGR8880_to_BGR8880_c( unsigned char * in_pixels, unsigned char * out_pixels,int num_pixels )
+{
+ int i;
+ for(i = 0; i < num_pixels; i++)
+  {
+   SWAP_RGB_24(in_pixels,out_pixels);
+   in_pixels += 4;
+   out_pixels += 4;
+  }
+}
+
+void BGR8880_to_RGB8880_c( unsigned char * in_pixels, unsigned char * out_pixels,int num_pixels )
+{ memcpy( out_pixels,in_pixels,num_pixels * 4 ); }
+
+/*
+
+unsigned char * map_5_to_8[32];
+unsigned char * map_6_to_8[64];
+
+#define POINTER_TO_GUINT16(a) *((unsigned short*)a)
+#define RGB16_TO_R(pixel) map_5_to_8[pixel & RGB16_LOWER_MASK]
+#define RGB16_TO_G(pixel) map_6_to_8[(pixel & RGB16_MIDDLE_MASK)>>5]
+#define RGB16_TO_B(pixel) map_5_to_8[(pixel & RGB16_UPPER_MASK)>>11]
+#define RGB16_LOWER_MASK  0x001f
+#define RGB16_MIDDLE_MASK 0x07e0
+#define RGB16_UPPER_MASK  0xf800
+
+void RGB565_to_RGB888_c( unsigned char * in_pixels, unsigned char * out_pixels,int num_pixels)
+{
+ unsigned short in_pixel;
+ int i;
+ for(i = 0; i < num_pixels; i++)
+  {
+   in_pixel = POINTER_TO_GUINT16(in_pixels);
+   out_pixels[0] = RGB16_TO_R(in_pixel);
+   out_pixels[1] = RGB16_TO_G(in_pixel);
+   out_pixels[2] = RGB16_TO_B(in_pixel);
+   in_pixels += 2;
+   out_pixels += 3;
+  }
+}
+
+*/
+
+// ---
+
+#ifdef xHAVE_MMX
+
+#define LOAD_32(in) movq_m2r(*in, mm0); in += 8;\
+                    movq_m2r(*in, mm1); in += 8
+
+#define PACK_32_TO_24 movq_r2r(mm0, mm2);\
+                      pand_m2r(rgb32_l_mask,mm0);\
+                      pand_m2r(rgb32_u_mask,mm2);\
+                      psrlq_i2r(8, mm2);\
+                      por_r2r(mm2,mm0);\
+                      movq_r2r(mm1, mm2);\
+                      pand_m2r(rgb32_l_mask,mm1);\
+                      pand_m2r(rgb32_u_mask,mm2);\
+                      psrlq_i2r(8, mm2);\
+                      por_r2r(mm2,mm1);
+
+#define WRITE_24(out) movq_r2m(mm0, *out); out+=6;\
+                      movq_r2m(mm1, *out); out+=6;
+
+#define WRITE_16(out) movq_r2m(mm0, *out); out+=8;
+
+static mmx_t rgb32_l_mask; // Mask for the lower of  2 RGB24 pixels
+static mmx_t rgb32_u_mask; // Mask for the upper of  2 RGB24 pixels
+
+static mmx_t rgb32_r_mask; // Mask for the reds of   2 RGB32 pixels
+static mmx_t rgb32_g_mask; // Mask for the greens of 2 RGB32 pixels
+static mmx_t rgb32_b_mask; // Mask for the blues  of 2 RGB32 pixels
+
+static mmx_t lower_dword_mask; // Mask for the lower doublewords
+static mmx_t upper_dword_mask; // Mask for the upper doublewords
+
+void BGR8880_to_RGB888_mmx(unsigned char * in_pixels,unsigned char * out_pixels,int num_pixels)
+{
+ int imax = num_pixels/4;
+ int i;
+
+ for(i = 0; i < imax; i++)
+  {
+   LOAD_32(in_pixels);
+   PACK_32_TO_24;
+   WRITE_24(out_pixels);
+  }
+ emms();
+}
+
+#endif
+
+// ---
+
+void initConverter( void )
+{
+#ifdef xHAVE_MMX
+// int i;
+
+// for(i = 0; i < 64; i++) map_6_to_8[i] = (unsigned char)((float)i/63.0*255.0+0.5);
+// for(i = 0; i < 32; i++) map_5_to_8[i] = (unsigned char)((float)i/31.0*255.0+0.5);
+
+ rgb32_l_mask.q = 0x0000000000FFFFFFLL; // Mask for the lower of 2 RGB32 pixels
+ rgb32_u_mask.q = 0x00FFFFFF00000000LL; // Mask for the upper of 2 RGB32 pixels
+
+ rgb32_r_mask.q = 0x000000FF000000FFLL; // Mask for the reds of   2 RGB32 pixels
+ rgb32_g_mask.q = 0x0000FF000000FF00LL; // Mask for the greens of 2 RGB32 pixels
+ rgb32_b_mask.q = 0x00FF000000FF0000LL; // Mask for the blues  of 2 RGB32 pixels
+#endif
+}
\ No newline at end of file
diff --git a/Gui/wm/wsconv.h b/Gui/wm/wsconv.h
new file mode 100644
index 0000000000..9005c4a90a
--- /dev/null
+++ b/Gui/wm/wsconv.h
@@ -0,0 +1,39 @@
+
+#ifndef __WSCONV_H
+#define __WSCONV_H
+
+#include "../../config.h"
+
+#define PACK_RGB16(r,g,b,pixel) pixel=(b>>3);\
+                                pixel<<=6;\
+                                pixel|=(g>>2);\
+                                pixel<<=5;\
+                                pixel|=(r>>3)
+
+#define PACK_RGB15(r,g,b,pixel) pixel=(b>>3);\
+                                pixel<<=5;\
+                                pixel|=(g>>3);\
+                                pixel<<=5;\
+                                pixel|=(r>>3)
+
+typedef void(*wsTConvFunc)( unsigned char * in_pixels, unsigned char * out_pixels, int num_pixels );
+extern wsTConvFunc wsConvFunc;
+
+extern void BGR8880_to_RGB555_c( unsigned char * in_pixels, unsigned char * out_pixels, int num_pixels );
+extern void BGR8880_to_BGR555_c( unsigned char * in_pixels, unsigned char * out_pixels, int num_pixels );
+extern void BGR8880_to_RGB565_c( unsigned char * in_pixels, unsigned char * out_pixels, int num_pixels );
+extern void BGR8880_to_BGR565_c( unsigned char * in_pixels, unsigned char * out_pixels, int num_pixels );
+extern void BGR8880_to_RGB888_c( unsigned char * in_pixels, unsigned char * out_pixels,int num_pixels );
+extern void BGR8880_to_BGR888_c( unsigned char * in_pixels, unsigned char * out_pixels,int num_pixels );
+extern void BGR8880_to_BGR8880_c( unsigned char * in_pixels, unsigned char * out_pixels,int num_pixels );
+extern void BGR8880_to_RGB8880_c( unsigned char * in_pixels, unsigned char * out_pixels,int num_pixels );
+
+#ifdef xHAVE_MMX
+ extern void BGR8880_to_RGB888_mmx(unsigned char * in_pixels,unsigned char * out_pixels,int num_pixels);
+#endif
+
+extern void RGB565_to_RGB888_c( unsigned char * in_pixels, unsigned char * out_pixels,int num_pixels);
+
+extern void initConverter( void );
+
+#endif
\ No newline at end of file
diff --git a/Gui/wm/wskeys.h b/Gui/wm/wskeys.h
new file mode 100644
index 0000000000..3a932969e1
--- /dev/null
+++ b/Gui/wm/wskeys.h
@@ -0,0 +1,140 @@
+
+#ifndef _MY_WSKEY
+#define _MY_WSKEY
+
+#define wsKeyNone -1
+
+#define wsosbrackets '['
+#define wscsbrackets ']'
+#define wsomore      '<'
+#define wscmore      '>'
+
+#define wsq 'q'
+#define wsa 'a'
+#define wsz 'z'
+#define wsw 'w'
+#define wss 's'
+#define wsx 'x'
+#define wse 'e'
+#define wsd 'd'
+#define wsr 'r'
+#define wsf 'f'
+#define wsv 'v'
+#define wst 't'
+#define wsg 'g'
+#define wsb 'b'
+#define wsy 'y'
+#define wsh 'h'
+#define wsn 'n'
+#define wsu 'u'
+#define wsj 'j'
+#define wsm 'm'
+#define wsi 'i'
+#define wsk 'k'
+#define wso 'o'
+#define wsl 'l'
+#define wsp 'p'
+#define wsc 'c'
+
+#define wsQ 'Q'
+#define wsA 'A'
+#define wsZ 'Z'
+#define wsW 'W'
+#define wsS 'S'
+#define wsX 'X'
+#define wsE 'E'
+#define wsD 'D'
+#define wsR 'R'
+#define wsF 'F'
+#define wsV 'V'
+#define wsT 'T'
+#define wsG 'G'
+#define wsB 'B'
+#define wsY 'Y'
+#define wsH 'H'
+#define wsN 'N'
+#define wsU 'U'
+#define wsJ 'J'
+#define wsM 'M'
+#define wsI 'I'
+#define wsK 'K'
+#define wsO 'O'
+#define wsL 'L'
+#define wsP 'P'
+#define wsC 'C'
+
+#define ws0 '0'
+#define ws1 '1'
+#define ws2 '2'
+#define ws3 '3'
+#define ws4 '4'
+#define ws5 '5'
+#define ws6 '6'
+#define ws7 '7'
+#define ws8 '8'
+#define ws9 '9'
+
+#define wsSpace ' '
+
+#define wsUp            0x52 + 256
+#define wsDown          0x54 + 256
+#define wsLeft          0x51 + 256
+#define wsRight         0x53 + 256
+#define wsLeftCtrl      0xe3 + 256
+#define wsRightCtrl     0xe4 + 256
+#define wsLeftAlt       0xe9 + 256
+#define wsRightAlt      0x7e + 256
+#define wsLeftShift     0xe1 + 256
+#define wsRightShift    0xe2 + 256
+#define wsEnter         0x0d + 256
+#define wsBackSpace     0x08 + 256
+#define wsCapsLock      0xe5 + 256
+#define wsTab           0x09 + 256
+#define wsF1            0xbe + 256
+#define wsF2            0xbf + 256
+#define wsF3            0xc0 + 256
+#define wsF4            0xc1 + 256
+#define wsF5            0xc2 + 256
+#define wsF6            0xc3 + 256
+#define wsF7            0xc4 + 256
+#define wsF8            0xc5 + 256
+#define wsF9            0xc6 + 256
+#define wsF10           0xc7 + 256
+#define wsInsert        0x63 + 256
+#define wsDelete        0xff + 256
+#define wsHome          0x50 + 256
+#define wsEnd           0x57 + 256
+#define wsPageUp        0x55 + 256
+#define wsPageDown      0x56 + 256
+#define wsNumLock       0x7f + 256
+#define wsEscape        0x1b + 256
+#define wsGrayEnter     0x8d + 256
+#define wsGrayPlus      0xab + 256
+#define wsGrayMinus     0xad + 256
+#define wsGrayMul       0xaa + 256
+#define wsGrayDiv       0xaf + 256
+
+#define wsGrayInsert    0xb0 + 256
+#define wsGrayDelete    0xae + 256
+#define wsGrayEnd       0xb1 + 256
+#define wsGrayDown      0xb2 + 256
+#define wsGrayPageDown  0xb3 + 256
+#define wsGrayLeft      0xb4 + 256
+#define wsGray5         0xb5 + 256
+#define wsGrayRight     0xb6 + 256
+#define wsGrayHome      0xb7 + 256
+#define wsGrayUp        0xb8 + 256
+#define wsGrayPageUp    0xb9 + 256
+
+#define wsKeyNumber 116
+
+typedef struct
+{
+ int    code;
+ char * name;
+} TwsKeyNames;
+
+extern TwsKeyNames wsKeyNames[ wsKeyNumber ];
+
+#endif
+
diff --git a/Gui/wm/wsmkeys.h b/Gui/wm/wsmkeys.h
new file mode 100644
index 0000000000..3b3528a9b8
--- /dev/null
+++ b/Gui/wm/wsmkeys.h
@@ -0,0 +1,52 @@
+
+#include "wskeys.h"
+
+TwsKeyNames wsKeyNames[ wsKeyNumber ] =
+ {
+  { wsq, "q" }, { wsa, "a" }, { wsz, "z" }, { wsw, "w" }, { wss, "s" }, { wsx, "x" },
+  { wse, "e" }, { wsd, "d" }, { wsr, "r" }, { wsf, "f" }, { wsv, "v" }, { wst, "t" },
+  { wsg, "g" }, { wsb, "b" }, { wsy, "y" }, { wsh, "h" }, { wsn, "n" }, { wsu, "u" },
+  { wsj, "j" }, { wsm, "m" }, { wsi, "i" }, { wsk, "k" }, { wso, "o" }, { wsl, "l" },
+  { wsp, "p" }, { wsc, "c" },
+
+  { wsQ, "Q" }, { wsA, "A" }, { wsZ, "Z" }, { wsW, "W" }, { wsS, "S" }, { wsX, "X" },
+  { wsE, "E" }, { wsD, "D" }, { wsR, "R" }, { wsF, "F" }, { wsV, "V" }, { wsT, "T" },
+  { wsG, "G" }, { wsB, "B" }, { wsY, "Y" }, { wsH, "H" }, { wsN, "N" }, { wsU, "U" },
+  { wsJ, "J" }, { wsM, "M" }, { wsI, "I" }, { wsK, "K" }, { wsO, "O" }, { wsL, "L" },
+  { wsP, "P" }, { wsC, "C" },
+
+  { wsUp,         "Up"    }, { wsDown,       "Down"  }, { wsLeft,        "Left"  },
+  { wsRight,      "Right" }, { wsPageUp,    "PageUp" }, { wsPageDown, "PageDown" },
+
+  { wsLeftCtrl,   "LeftCtrl" }, { wsRightCtrl,  "RightCtrl" }, { wsLeftAlt,    "LeftAlt"    },
+  { wsRightAlt,   "RightAlt" }, { wsLeftShift,  "LeftShift" }, { wsRightShift, "RightShift" },
+
+
+  { wsBackSpace,  "BackSpace" },
+  { wsCapsLock,   "CapsLock" },
+  { wsNumLock,    "NumLock" },
+
+  { wsF1, "F1" }, { wsF2, "F2" }, { wsF3, "F3" }, { wsF4, "F4" }, { wsF5,   "F5" },
+  { wsF6, "F6" }, { wsF7, "F7" }, { wsF8, "F8" }, { wsF9, "F9" }, { wsF10, "F10" },
+
+  { wsEnter,         "Enter" }, { wsTab,             "Tab" }, { wsSpace,         "Space" },
+  { wsInsert,       "Insert" }, { wsDelete,       "Delete" }, { wsHome,           "Home" },
+  { wsEnd,             "End" }, { wsEscape,       "Escape" },
+
+  { wsosbrackets, "[" }, { wscsbrackets, "]" },
+  { wsomore,      "<" }, { wscmore,      ">" },
+
+  { ws0, "0" }, { ws1, "1" }, { ws2, "2" }, { ws3, "3" }, { ws4, "4" },
+  { ws5, "5" }, { ws6, "6" }, { ws7, "7" }, { ws8, "8" }, { ws9, "9" },
+
+  { wsGrayEnter,       "GrayEnter" }, { wsGrayPlus,         "GrayPlus" },
+  { wsGrayMinus,       "GrayMinus" }, { wsGrayMul,           "GrayMul" },
+  { wsGrayDiv,           "GrayDiv" }, { wsGrayInsert,     "GrayInsert" },
+  { wsGrayDelete,     "GrayDelete" }, { wsGrayEnd,           "GrayEnd" },
+  { wsGrayDown,         "GrayDown" }, { wsGrayPageDown, "GrayPageDown" },
+  { wsGrayLeft,         "GrayLeft" }, { wsGray5,               "Gray5" },
+  { wsGrayRight,       "GrayRight" }, { wsGrayHome,         "GrayHome" },
+  { wsGrayUp,             "GrayUp" }, { wsGrayPageUp,     "GrayPageUp" },
+
+  { wsKeyNone, "None" }
+ };