Merge lp:~brandontschaefer/nux/xim-tests into lp:nux

[Brandon Schaefer]

XIM Support and Tests.

Fixed this branch to work with Unity: https://code.launchpad.net/~paulliu/nux/nux
To add XIM Support, as well as get some test for it.

This lets users add test for each IM easily in the text file xim-test-commands.txt. Ill probably have to write documentation but there are examples for 3 IMs.

The bases is:
0 = like an init function. It starts the IM with the name you give it.
1 = Key sequences to get the IM in the correct state. ie. ctrl+space
2 = Input you would type into your IM, ie. ninhao
3 = Checks the current text with what it should be.
4 = halt. So we know when to end the current IM test.

To test the three I have in there you'll need: fcitx, hime, and gcin
(sudo apt-get install gcin-chewing fcitx-googlepinyin hime-anthy)

The XIMController is in control of the current XICClient which gets switched based on the current XInputWindow(Dash/Hud. Each window has it's own XICClient).

XIMController gets allocated in GraphicsDisaplyX11 which you can get the XIMController anywhere else through GetGraphicsDisplay()->GetXIMController(). This is how XInputWindow gets a hold of the current XIMController.

***Note*** I still need to figure a good way out to only make XICClients for those windows that accept text....but as of right now any BaseWindow that ->EnableInputWindow() will create an XICClient for that window. (Im thinking I could hijack the bool take_focus which is only true for the Dash/Hud)

[Jay Taoko (jaytaoko)]

The test is failing on my system. When the program runs, some of the xim test passes while other fails. Anything I am missing on my system? In running on precise.

review: Needs Fixing

[Brandon Schaefer (brandontschaefer)]

Resubmitted as a lot has changed now....

[Andrea Azzarone (azzar1)]

76 + if (m_xim_controller)
77 + {
78 + delete m_xim_controller;
79 + }

What about using a smart ptr?

95 + void GraphicsDisplay::XICFocus()
96 + {
97 + m_xim_controller->FocusInXIC();
98 + }
99 +
100 + void GraphicsDisplay::XICUnFocus()
101 + {
102 + m_xim_controller->FocusOutXIC();
103 + }

I see that m_xim_controller is not initialized in the ctor. So I think that we should add a null check. Or am I missing something?

+* Copyright 2010-2012 Inalogic® Inc.

I think you don't need 2010 :)

I'll continue the review tomorrow (it's late now...).

[Brandon Schaefer (brandontschaefer)]

Well we want to avoid using the new C++ standard for now in Nux. Pointers aren't that bad ;).

The reason I didn't do a NULL check is the m_xim_controller gets initialized when the OpenGL window is created.

In GLWindowManager.cpp

112 GraphicsDisplay *glwindow = new GraphicsDisplay();
113 glwindow->CreateOpenGLWindow(WindowTitle, WindowWidth, WindowHeight, Style, GLWindow, FullscreenFlag, create_rendering_data);

or this function:

128 GraphicsDisplay *glwindow = new GraphicsDisplay();
129 glwindow->CreateFromOpenGLWindow(WindowHandle, WindowDCHandle, OpenGLRenderingContext);

Right after the GrapichsDisplay is created the window is made which allocates the controller.

For sanity reason I can check for NULL...but it doesn't seem necessary, because if the m_xim_controller is NULL then so is the m_X11Display and m_X11Window which I don't see those checked for NULL else where in there...let me know what you think.

And yes...it is no longer 2010 haha :)

[Brandon Schaefer (brandontschaefer)]

Or are you talking about nux::ObjectPtr?

[Andrea Azzarone (azzar1)]

> Well we want to avoid using the new C++ standard for now in Nux. Pointers
> aren't that bad ;).

I think that the 'old" C++ standard has smart ptrs too :) Boost can help here too.

>
> The reason I didn't do a NULL check is the m_xim_controller gets initialized
> when the OpenGL window is created.
>
> In GLWindowManager.cpp
>
> 112 GraphicsDisplay *glwindow = new GraphicsDisplay();
> 113 glwindow->CreateOpenGLWindow(WindowTitle, WindowWidth, WindowHeight,
> Style, GLWindow, FullscreenFlag, create_rendering_data);
>
> or this function:
>
> 128 GraphicsDisplay *glwindow = new GraphicsDisplay();
> 129 glwindow->CreateFromOpenGLWindow(WindowHandle, WindowDCHandle,
> OpenGLRenderingContext);
>
> Right after the GrapichsDisplay is created the window is made which allocates
> the controller.
>
> For sanity reason I can check for NULL...but it doesn't seem necessary,
> because if the m_xim_controller is NULL then so is the m_X11Display and
> m_X11Window which I don't see those checked for NULL else where in there...let
> me know what you think.

Perfect. Yeah it's not necessary. Never mind my comment ;)

>
> And yes...it is no longer 2010 haha :)

[Andrea Azzarone (azzar1)]

> Or are you talking about nux::ObjectPtr?

No, don't use nux::ObjectPtr. boost::shared_ptr should be good.

[Andrea Azzarone (azzar1)]

review: Approve

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-nux/184/console reported an error when processing this lp:~brandontschaefer/nux/xim-tests branch.
Not merging it.

[Łukasz Zemczak (sil2100)]

Ok, first of all - I approve of this code and think it's very useful to have, but.

After consulting with the release team, we have decided to postpone this feature to 13.04. So sadly, here I need to disapprove of it so that it does not accidentally land in 12.10 lp:nux trunk.

But what I would like to do is (what Iain proposed) creating a PPA with unity and nux versions including this feature, making it public for people to test and comment (through the 2 bugs that are mentioned). So that we have it fully tested for 13.04.

review: Disapprove

[lp:~brandontschaefer/nux/xim-tests]

664. By Brandon Schaefer on 2012-09-11

* merged trunk

665. By Brandon Schaefer on 2012-10-19

* Merged trunk

666. By Brandon Schaefer on 2012-11-05

* Merge with thumpers nux.armel-fixes

667. By Brandon Schaefer on 2012-11-23

* Merged trunk

668. By Brandon Schaefer on 2012-11-24

* Moved to std::shared_ptr
* Fixed headers
* Moved to new logger

669. By Brandon Schaefer on 2012-11-27

* Following up on review

670. By Brandon Schaefer on 2012-11-27

* Fixed conflict, merged trunk

671. By Brandon Schaefer on 2012-12-02

* Merged trunk

Unmerged revisions

=== modified file 'INSTALL'
--- INSTALL	2010-09-01 19:25:37 +0000
+++ INSTALL	2012-11-05 17:50:27 +0000
@@ -1,8 +1,8 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
+Inc.
 
    Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
@@ -226,6 +226,11 @@
 
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
 
+   HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved.  Use GNU `make'
+instead.
+
    On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
 parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
 a workaround.  If GNU CC is not installed, it is therefore recommended

=== modified file 'Nux/Area.cpp'
--- Nux/Area.cpp	2012-09-30 23:28:23 +0000
+++ Nux/Area.cpp	2012-11-05 17:50:27 +0000
@@ -24,10 +24,12 @@
 #include "Area.h"
 #include "NuxGraphics/GraphicsEngine.h"
 #include "Layout.h"
-#include "VSplitter.h"
-#include "HSplitter.h"
 #include "BaseWindow.h"
-#include "MenuPage.h"
+#if !defined(NUX_MINIMAL)
+#  include "VSplitter.h"
+#  include "HSplitter.h"
+#  include "MenuPage.h"
+#endif
 
 #ifdef NUX_GESTURES_SUPPORT
 #include "NuxGraphics/GestureEvent.h"
@@ -512,21 +514,23 @@
 
       if (ic->CanBreakLayout())
       {
-
-        if ((child != 0) &&
-             (ic->Type().IsObjectType(VSplitter::StaticObjectType) || ic->Type().IsObjectType(HSplitter::StaticObjectType)))
+#if !defined(NUX_MINIMAL)
+        if ((child != 0) && (ic->Type().IsObjectType(VSplitter::StaticObjectType) || ic->Type().IsObjectType(HSplitter::StaticObjectType)))
         {
           // If this element is a Splitter, then we submit its child to the refresh list. We don't want to submit the
           // splitter because this will cause a redraw of all parts of the splitter(costly and unnecessary).
           window_thread_->QueueObjectLayout(child);
         }
         else
+#endif
         {
           window_thread_->QueueObjectLayout(ic);
         }
       }
       else if (ic->parent_area_)
+      {
         ic->parent_area_->ReconfigureParentLayout(this);
+      }
       else
       {
         window_thread_->QueueObjectLayout(ic);
@@ -551,14 +555,19 @@
 
           if (ic->CanBreakLayout())
           {
+#if !defined(NUX_MINIMAL)
             if ((child != 0) &&
-                 (ic->Type().IsObjectType(VSplitter::StaticObjectType) || ic->Type().IsObjectType(HSplitter::StaticObjectType)))
+                (ic->Type().IsObjectType(VSplitter::StaticObjectType) ||
+                 ic->Type().IsObjectType(HSplitter::StaticObjectType)))
             {
-              // If the parent of this element is a splitter, then we submit its child to the refresh list. We don't want to submit the
-              // splitter because this will cause a redraw of all parts of the splitter(costly and unnecessary).
+              // If the parent of this element is a splitter, then we submit
+              // its child to the refresh list. We don't want to submit the
+              // splitter because this will cause a redraw of all parts of the
+              // splitter(costly and unnecessary).
               window_thread_->QueueObjectLayout(this);
             }
             else
+#endif
             {
               window_thread_->QueueObjectLayout(ic);
             }
@@ -774,7 +783,9 @@
   Geometry Area::GetAbsoluteGeometry() const
   {
     if (Type().IsDerivedFromType(BaseWindow::StaticObjectType) ||
+#if !defined(NUX_MINIMAL)
       Type().IsDerivedFromType(MenuPage::StaticObjectType) ||
+#endif
       (this == window_thread_->GetLayout()))
     {
       // Do not apply the _2D_xform matrix  to a BaseWindow or the main layout
@@ -952,19 +963,20 @@
        // then return false.
        return false;
      }
- 
+
      bool mouse_pointer_inside_area = false;
- 
+#if !defined(NUX_MINIMAL)
      if (Type().IsDerivedFromType(MenuPage::StaticObjectType))
      {
        // A MenuPage geometry is already in absolute coordinates.
        mouse_pointer_inside_area = geometry_.IsInside(mouse_position);
      }
      else
+#endif
      {
        mouse_pointer_inside_area = GetAbsoluteGeometry().IsInside(mouse_position);
      }
- 
+
      if ((event_type == NUX_MOUSE_WHEEL) && mouse_pointer_inside_area)
      {
        if (accept_mouse_wheel_event_ == false)
@@ -985,22 +997,23 @@
        //    - it is not enabled
        //    - it is not visible
        // then return false.
- 
+
        return false;
      }
- 
+
      bool mouse_pointer_inside_area = false;
- 
+#if !defined(NUX_MINIMAL)
      if (Type().IsDerivedFromType(MenuPage::StaticObjectType))
      {
        // A MenuPage geometry is already in absolute coordinates.
        mouse_pointer_inside_area = geometry_.IsInside(mouse_position);
      }
      else
+#endif
      {
        mouse_pointer_inside_area = GetAbsoluteGeometry().IsInside(mouse_position);
      }
- 
+
      return mouse_pointer_inside_area;
    }
 

=== modified file 'Nux/Area.h'
--- Nux/Area.h	2012-09-26 06:44:12 +0000
+++ Nux/Area.h	2012-11-05 17:50:27 +0000
@@ -795,12 +795,13 @@
 
     friend class Layout;
     friend class View;
+    friend class WindowCompositor;
     friend class WindowThread;
+#if !defined(NUX_MINIMAL)
     friend class HSplitter;
     friend class VSplitter;
-    friend class WindowCompositor;
+#endif
   };
-
 }
 #endif // BASEOBJECT_H
 

=== modified file 'Nux/BaseWindow.cpp'
--- Nux/BaseWindow.cpp	2012-10-02 07:32:55 +0000
+++ Nux/BaseWindow.cpp	2012-11-05 17:50:27 +0000
@@ -27,7 +27,6 @@
 #include "HLayout.h"
 #include "WindowCompositor.h"
 #include "BaseWindow.h"
-#include "TextEntry.h"
 
 namespace nux
 {
@@ -57,7 +56,7 @@
     _size_match_layout = false;
     _is_visible = false;
     _is_modal = false;
-#if defined(NUX_OS_LINUX)
+#if defined(USE_X11)
     m_input_window_enabled = false;
     m_input_window = 0;
 #endif
@@ -85,7 +84,7 @@
       _enter_focus_input_area->UnReference();
     }
 
-#if defined(NUX_OS_LINUX)
+#if defined(USE_X11)
     if (m_input_window)
       delete m_input_window;
 #endif
@@ -239,12 +238,13 @@
 
   }
 
-  #if defined(NUX_OS_LINUX)
+#if defined(NUX_OS_LINUX)
   void BaseWindow::EnableInputWindow(bool        b,
                                       const char* title,
                                       bool        take_focus,
                                       bool        override_redirect)
   {
+#if defined(USE_X11)
     if (b)
     {
       if (m_input_window == 0)
@@ -260,56 +260,79 @@
         m_input_window->Hide();
       m_input_window_enabled = false;
     }
+#endif
   }
 
   bool BaseWindow::InputWindowEnabled()
   {
+#if defined(USE_X11)
     return m_input_window_enabled;
+#else
+    return false;
+#endif
   }
 
   void BaseWindow::InputWindowEnableStruts(bool enable)
   {
+#if defined(USE_X11)
     if (m_input_window)
       m_input_window->EnableStruts(enable);
+#endif
   }
 
   bool BaseWindow::InputWindowStrutsEnabled()
   {
+#if defined(USE_X11)
     return m_input_window_enabled && m_input_window->StrutsEnabled();
+#else
+    return false;
+#endif
   }
 
   void BaseWindow::InputWindowEnableOverlayStruts(bool enable)
   {
+#if defined(USE_X11)
     if (m_input_window)
       m_input_window->EnableOverlayStruts(enable);
+#endif
   }
 
   bool BaseWindow::InputWindowOverlayStrutsEnabled()
   {
+#if defined(USE_X11)
     return m_input_window && m_input_window->OverlayStrutsEnabled();
+#else
+    return false;
+#endif
   }
 
   void BaseWindow::SetInputFocus()
   {
+#if defined(USE_X11)
     if (m_input_window)
       m_input_window->SetInputFocus();
+#endif
   }
 
   Window BaseWindow::GetInputWindowId()
   {
+#if defined(USE_X11)
     if (m_input_window)
       return m_input_window->GetWindow();
     else
       return 0;
+#else
+    return 0;
+#endif
   }
 
-  #endif
+#endif
 
   void BaseWindow::SetGeometry(const Geometry &geo)
   {
     Area::SetGeometry(geo);
 
-    #if defined(NUX_OS_LINUX)
+    #if defined(USE_X11)
     if (m_input_window)
       m_input_window->SetGeometry(geo);
     #endif

=== modified file 'Nux/BaseWindow.h'
--- Nux/BaseWindow.h	2012-10-10 22:46:50 +0000
+++ Nux/BaseWindow.h	2012-11-05 17:50:27 +0000
@@ -27,11 +27,9 @@
 #include <boost/scoped_ptr.hpp>
 #include "ScrollView.h"
 
-#if defined(NUX_OS_WINDOWS)
-#include "NuxGraphics/Events.h"
-#elif defined(NUX_OS_LINUX)
-#include "NuxGraphics/Events.h"
-#include "NuxGraphics/XInputWindow.h"
+#include "NuxGraphics/Events.h"
+#if defined(USE_X11)
+#  include "NuxGraphics/XInputWindow.h"
 #endif
 
 #include "InputArea.h"
@@ -242,7 +240,7 @@
 
     bool ChildNeedsRedraw();
 
-    #if defined(NUX_OS_LINUX)
+    #if defined(USE_X11)
     bool m_input_window_enabled;
     XInputWindow *m_input_window;
     #endif

=== modified file 'Nux/FloatingWindow.cpp'
--- Nux/FloatingWindow.cpp	2012-10-10 22:46:50 +0000
+++ Nux/FloatingWindow.cpp	2012-11-05 17:50:27 +0000
@@ -279,7 +279,7 @@
 
     SetGeometry(geo);
 
-#if defined(NUX_OS_LINUX)
+#if defined(USE_X11)
     if (m_input_window != 0)
     {
       //nuxDebugMsg("Resize Input window: %d, %d, %d, %d", geo.x, geo.y, geo.width, geo.height);
@@ -309,7 +309,7 @@
 
     _title_bar->SetGeometry(Geometry(0, 0, geo.GetWidth(), _title_bar_height));
 
-#if defined(NUX_OS_LINUX)
+#if defined(USE_X11)
     if (m_input_window != 0)
     {
       //nuxDebugMsg("Resize Input window: %d, %d, %d, %d", geo.x, geo.y, geo.width, geo.height);
@@ -322,11 +322,10 @@
 
   void FloatingWindow::RecvCloseButtonClick(int /* x */, int /* y */, unsigned long /* button_flags */, unsigned long /* key_flags */)
   {
-#if defined(NUX_OS_LINUX)
+#if defined(USE_X11)
     // Disable the input window if there is one.
     EnableInputWindow(false);
 #endif
-    
     StopModal();
   }
 

=== modified file 'Nux/GesturesSubscription.cpp'
--- Nux/GesturesSubscription.cpp	2012-10-28 15:59:17 +0000
+++ Nux/GesturesSubscription.cpp	2012-11-05 17:50:27 +0000
@@ -31,7 +31,11 @@
 GesturesSubscription::GesturesSubscription()
   : gesture_classes_(DRAG_GESTURE|PINCH_GESTURE|ROTATE_GESTURE),
     num_touches_(2),
+#if defined(USE_X11)
     window_id_(GetWindowThread()->GetGraphicsDisplay().GetWindowHandle()),
+#else
+    window_id_(0),
+#endif
     sub_(nullptr),
     is_active_(false),
     drag_threshold_(0.0026f),

=== modified file 'Nux/InputArea.cpp'
--- Nux/InputArea.cpp	2012-10-28 15:59:17 +0000
+++ Nux/InputArea.cpp	2012-11-05 17:50:27 +0000
@@ -125,7 +125,7 @@
 
   void InputArea::HandleDndMove(Event &event)
   {
-#if defined(NUX_OS_LINUX)
+#if defined(DRAG_AND_DROP_SUPPORTED)
     std::list<char *> mimes;
 
     mimes = GetWindowThread()->GetGraphicsDisplay().GetDndMimeTypes();
@@ -139,7 +139,7 @@
 
   void InputArea::HandleDndDrop(Event &event)
   {
-#if defined(NUX_OS_LINUX)
+#if defined(DRAG_AND_DROP_SUPPORTED)
     ProcessDndDrop(event.x, event.y);
 #endif
   }
@@ -147,16 +147,21 @@
 #if defined(NUX_OS_LINUX)
   void InputArea::SendDndStatus(bool accept, DndAction action, Geometry region)
   {
+#if defined(DRAG_AND_DROP_SUPPORTED)
     GetWindowThread()->GetGraphicsDisplay().SendDndStatus(accept, action, Rect(region.x, region.y, region.width, region.height));
+#endif
   }
 
   void InputArea::SendDndFinished(bool accepted, DndAction action)
   {
+#if defined(DRAG_AND_DROP_SUPPORTED)
     GetWindowThread()->GetGraphicsDisplay().SendDndFinished(accepted, action);
+#endif
   }
 
   void InputArea::ProcessDndMove(int x, int y, std::list<char *> /* mimes */)
   {
+#if defined(DRAG_AND_DROP_SUPPORTED)
     // must learn to deal with x/y offsets
     Area *parent = GetToplevel();
 
@@ -167,11 +172,14 @@
     }
 
     SendDndStatus(false, DNDACTION_NONE, Geometry(x, y, GetGeometry().width, GetGeometry().height));
+#endif
   }
 
   void InputArea::ProcessDndDrop(int /* x */, int /* y */)
   {
+#if defined(DRAG_AND_DROP_SUPPORTED)
     SendDndFinished(false, DNDACTION_NONE);
+#endif
   }
 
   void InputArea::ProcessDndEnter()
@@ -181,23 +189,25 @@
   void InputArea::ProcessDndLeave()
   {
   }
-  
+
   void InputArea::SetDndEnabled(bool as_source, bool as_target)
   {
+#if defined(DRAG_AND_DROP_SUPPORTED)
     _dnd_enabled_as_source = as_source;
     _dnd_enabled_as_target = as_target;
+#endif
   }
-  
+
   bool InputArea::DndSourceDragBegin()
   {
     return false;
   }
-  
-  NBitmapData * InputArea::DndSourceGetDragImage()
+
+  NBitmapData* InputArea::DndSourceGetDragImage()
   {
     return 0;
   }
-  
+
   std::list<const char *> InputArea::DndSourceGetDragTypes()
   {
     std::list<const char *> types;
@@ -205,7 +215,7 @@
     types.push_back("UTF8_STRING");
     return types;
   }
-    
+
   const char * InputArea::DndSourceGetDataForType(const char *type, int *size, int *format)
   {
     *format = 8;
@@ -215,33 +225,36 @@
       *size = (int) strlen("this is just a test");
       return "this is just a test";
     }
-    
+
     *size = 0;
     return 0;
   }
-  
-  void InputArea::InnerDndSourceDragFinished(DndAction result, void *data) 
-  { 
+
+  void InputArea::InnerDndSourceDragFinished(DndAction result, void *data)
+  {
+#if defined(DRAG_AND_DROP_SUPPORTED)
     InputArea *self = static_cast<InputArea *> (data);
     self->DndSourceDragFinished(result);
+#endif
   }
-  
+
   void InputArea::DndSourceDragFinished(DndAction /* result */)
   {
-  
   }
-  
+
   void InputArea::StartDragAsSource()
   {
+#if defined(DRAG_AND_DROP_SUPPORTED)
     GraphicsDisplay::DndSourceFuncs funcs;
-    
+
     funcs.get_drag_image = &InputArea::InnerDndSourceGetDragImage;
     funcs.get_drag_types = &InputArea::InnerDndSourceGetDragTypes;
     funcs.get_data_for_type = &InputArea::InnerDndSourceGetDataForType;
     funcs.drag_finished = &InputArea::InnerDndSourceDragFinished;
-    
+
     if (DndSourceDragBegin())
       GetWindowThread()->GetGraphicsDisplay().StartDndDrag(funcs, this);
+#endif
   }
 #endif
 

=== modified file 'Nux/InputMethodIBus.cpp'
--- Nux/InputMethodIBus.cpp	2012-10-01 23:37:25 +0000
+++ Nux/InputMethodIBus.cpp	2012-11-05 17:50:27 +0000
@@ -464,16 +464,13 @@
               // FIXME add support to Hyper and Meta keys in nux::Event
             }
           }
-
           if (!is_modifier && key)
             ev.x11_keysym = key;
         }
-
         if (ev.x11_keysym)
         {
           hotkeys.push_back(ev);
         }
-
         g_strfreev(binding);
       }
     }
@@ -504,7 +501,6 @@
           return (ev.key_modifiers == modifiers);
       }
     }
-
     return false;
   }
 }

=== modified file 'Nux/MainLoopGLib.cpp'
--- Nux/MainLoopGLib.cpp	2012-10-28 15:59:17 +0000
+++ Nux/MainLoopGLib.cpp	2012-11-05 17:50:27 +0000
@@ -80,14 +80,18 @@
 
     gboolean retval;
     *timeout = -1;
-  #if defined(NUX_OS_WINDOWS)
+#if defined(NUX_OS_WINDOWS)
     MSG msg;
     retval = PeekMessageW(&msg, NULL, 0, 0, PM_NOREMOVE) ? TRUE : FALSE;
-  #elif defined(NUX_OS_LINUX)
+#elif defined(NUX_OS_LINUX)
+# if defined(USE_X11)
     retval = GetGraphicsDisplay()->HasXPendingEvent() ? TRUE : FALSE;
-  #else
-  #error Not implemented.
-  #endif
+# else
+    retval = false;
+# endif
+#else
+# error Not implemented.
+#endif
 
     nux_glib_threads_unlock();
     return retval;
@@ -97,23 +101,21 @@
   {
     nux_glib_threads_lock();
 
-    gboolean retval;
+    gboolean retval = FALSE;
     NuxEventSource *event_source = (NuxEventSource*) source;
 
     if ((event_source->event_poll_fd.revents & G_IO_IN))
     {
-  #if defined(NUX_OS_WINDOWS)
+#if defined(NUX_OS_WINDOWS)
       MSG msg;
       retval = PeekMessageW(&msg, NULL, 0, 0, PM_NOREMOVE) ? TRUE : FALSE;
-  #elif defined(NUX_OS_LINUX)
+#elif defined(NUX_OS_LINUX)
+#  if defined(USE_X11)
       retval = GetGraphicsDisplay()->HasXPendingEvent() ? TRUE : FALSE;
-  #else
-  #error Not implemented.
-  #endif
-    }
-    else
-    {
-      retval = FALSE;
+#  endif
+#else
+#  error Not implemented.
+#endif
     }
 
     nux_glib_threads_unlock();
@@ -166,6 +168,7 @@
 
   static gboolean nux_timeline_dispatch(GSource *source, GSourceFunc /* callback */, gpointer user_data)
   {
+#if !defined(NUX_MINIMAL)
     bool has_timelines_left = false;
     nux_glib_threads_lock();
     gint64 micro_secs = g_source_get_time(source);
@@ -182,6 +185,7 @@
     }
 
     nux_glib_threads_unlock();
+#endif
     return TRUE;
   }
 
@@ -248,9 +252,11 @@
 #if defined(NUX_OS_WINDOWS)
     event_source->event_poll_fd.fd = G_WIN32_MSG_HANDLE;
 #elif defined(NUX_OS_LINUX)
+#  if defined(USE_X11)
     event_source->event_poll_fd.fd = ConnectionNumber(GetGraphicsDisplay().GetX11Display());
+#  endif
 #else
-#error Not implemented.
+#  error Not implemented.
 #endif
 
     event_source->event_poll_fd.events = G_IO_IN;
@@ -278,8 +284,10 @@
         sigc::mem_fun(this, &WindowThread::ProcessGestureEvent));
 #endif
 
+#if !defined(NUX_MINIMAL)
     if (_Timelines->size() > 0)
       StartMasterClock();
+#endif
 
     if (!IsEmbeddedWindow())
     {
@@ -386,10 +394,11 @@
       else if (main_loop_glib_context_ != 0)
         g_source_attach(_MasterClock, main_loop_glib_context_);
 
-
+#if !defined(NUX_MINIMAL)
       gint64 micro_secs = g_source_get_time(_MasterClock);
       last_timeline_frame_time_sec_ = micro_secs / 1000000;
       last_timeline_frame_time_usec_ = micro_secs % 1000000;
+#endif
     }
   }
 

=== modified file 'Nux/Makefile.am'
--- Nux/Makefile.am	2012-10-25 10:41:45 +0000
+++ Nux/Makefile.am	2012-11-05 17:50:27 +0000
@@ -35,38 +35,22 @@
   $(srcdir)/AbstractComboBox.cpp \
   $(srcdir)/AbstractPaintLayer.cpp \
   $(srcdir)/AbstractThread.cpp \
-  $(srcdir)/ActionItem.cpp \
-  $(srcdir)/AnimatedTextureArea.cpp \
-  $(srcdir)/PaintLayer.cpp \
-  $(srcdir)/InputArea.cpp \
   $(srcdir)/Area.cpp \
   $(srcdir)/BaseWindow.cpp \
   $(srcdir)/BasicView.cpp \
   $(srcdir)/Button.cpp \
+  $(srcdir)/CairoWrapper.cpp \
   $(srcdir)/Canvas.cpp \
-  $(srcdir)/CairoWrapper.cpp \
   $(srcdir)/CheckBox.cpp \
   $(srcdir)/ClientArea.cpp \
-  $(srcdir)/ColorEditor.cpp \
-  $(srcdir)/ColorPickerDialog.cpp \
-  $(srcdir)/ColorPreview.cpp \
   $(srcdir)/Coverflow.cpp \
   $(srcdir)/CoverflowItem.cpp \
   $(srcdir)/CoverflowModel.cpp \
-  $(srcdir)/Dialog.cpp \
-  $(srcdir)/DoubleValidator.cpp \
-  $(srcdir)/EditTextBox.cpp \
-  $(srcdir)/FileSelector.cpp \
-  $(srcdir)/FloatingWindow.cpp \
+  $(srcdir)/EMMetrics.cpp \
   $(srcdir)/GridHLayout.cpp \
-  $(srcdir)/GroupBox.cpp \
-  $(srcdir)/GroupBox2.cpp \
-  $(srcdir)/HexRegExpValidator.cpp \
   $(srcdir)/HLayout.cpp \
-  $(srcdir)/HScrollBar.cpp \
   $(srcdir)/HSplitter.cpp \
-  $(srcdir)/IntegerValidator.cpp \
-  $(srcdir)/View.cpp \
+  $(srcdir)/InputArea.cpp \
   $(srcdir)/KeyboardHandler.cpp \
   $(srcdir)/KineticScrolling/AxisDecelerationAnimation.cpp \
   $(srcdir)/KineticScrolling/KineticAxisScroller.cpp \
@@ -78,14 +62,47 @@
   $(srcdir)/Layout.cpp \
   $(srcdir)/LinearLayout.cpp \
   $(srcdir)/MainLoopGLib.cpp \
+  $(srcdir)/Nux.cpp \
+  $(srcdir)/NuxGlobalInitializer.cpp \
+  $(srcdir)/Painter.cpp \
+  $(srcdir)/PaintLayer.cpp \
+  $(srcdir)/StaticText.cpp \
+  $(srcdir)/StaticTextBox.cpp \
+  $(srcdir)/SystemThread.cpp \
+  $(srcdir)/TextEntry.cpp \
+  $(srcdir)/TextLoader.cpp \
+  $(srcdir)/TextureArea.cpp \
+  $(srcdir)/Theme.cpp \
+  $(srcdir)/TimerProc.cpp \
+  $(srcdir)/Utils.cpp \
+  $(srcdir)/VLayout.cpp \
+  $(srcdir)/View.cpp \
+  $(srcdir)/VSplitter.cpp \
+  $(srcdir)/WidgetMetrics.cpp \
+  $(srcdir)/WindowCompositor.cpp \
+  $(srcdir)/WindowThread.cpp
+
+if !NUX_MINIMAL
+source_cpp += \
+  $(srcdir)/ActionItem.cpp \
+  $(srcdir)/AnimatedTextureArea.cpp \
+  $(srcdir)/ColorEditor.cpp \
+  $(srcdir)/ColorPickerDialog.cpp \
+  $(srcdir)/ColorPreview.cpp \
+  $(srcdir)/Dialog.cpp \
+  $(srcdir)/DoubleValidator.cpp \
+  $(srcdir)/EditTextBox.cpp \
+  $(srcdir)/FileSelector.cpp \
+  $(srcdir)/FloatingWindow.cpp \
+  $(srcdir)/GroupBox.cpp \
+  $(srcdir)/GroupBox2.cpp \
+  $(srcdir)/HexRegExpValidator.cpp \
+  $(srcdir)/HScrollBar.cpp \
+  $(srcdir)/IntegerValidator.cpp \
   $(srcdir)/MenuPage.cpp \
   $(srcdir)/MenuBar.cpp \
-  $(srcdir)/EMMetrics.cpp \
   $(srcdir)/MouseAreaCtrl.cpp \
   $(srcdir)/NumericValuator.cpp \
-  $(srcdir)/Nux.cpp \
-  $(srcdir)/NuxGlobalInitializer.cpp \
-  $(srcdir)/Painter.cpp \
   $(srcdir)/Panel.cpp \
   $(srcdir)/PopUpWindow.cpp \
   $(srcdir)/RadioButton.cpp \
@@ -98,28 +115,19 @@
   $(srcdir)/SpinBox.cpp \
   $(srcdir)/SpinBoxDouble.cpp \
   $(srcdir)/SpinBox_Logic.cpp \
-  $(srcdir)/StaticText.cpp \
-  $(srcdir)/StaticTextBox.cpp \
-  $(srcdir)/SystemThread.cpp \
   $(srcdir)/TabView.cpp \
-  $(srcdir)/TextEntry.cpp \
-  $(srcdir)/InputMethodIBus.cpp \
-  $(srcdir)/TextLoader.cpp \
-  $(srcdir)/TextureArea.cpp \
   $(srcdir)/Timeline.cpp \
   $(srcdir)/TimelineEasings.cpp \
-  $(srcdir)/TimerProc.cpp \
   $(srcdir)/ToggleButton.cpp \
   $(srcdir)/ToolButton.cpp \
-  $(srcdir)/Utils.cpp \
-  $(srcdir)/Theme.cpp \
   $(srcdir)/Validator.cpp \
-  $(srcdir)/VLayout.cpp \
-  $(srcdir)/VScrollBar.cpp \
-  $(srcdir)/VSplitter.cpp \
-  $(srcdir)/WidgetMetrics.cpp \
-  $(srcdir)/WindowCompositor.cpp \
-  $(srcdir)/WindowThread.cpp
+  $(srcdir)/VScrollBar.cpp
+endif
+
+if USE_X11
+source_cpp += \
+  $(srcdir)/InputMethodIBus.cpp
+endif
 
 if HAVE_GEIS
 source_cpp += \
@@ -130,65 +138,82 @@
 endif
 
 source_h = \
-  $(builddir)/ABI.h \
+  $(builddir)/Features.h \
   $(srcdir)/AbstractButton.h \
   $(srcdir)/AbstractCheckedButton.h \
   $(srcdir)/AbstractComboBox.h \
   $(srcdir)/AbstractPaintLayer.h \
   $(srcdir)/AbstractThread.h \
-  $(srcdir)/ActionItem.h \
-  $(srcdir)/AnimatedTextureArea.h \
-  $(srcdir)/PaintLayer.h \
-  $(srcdir)/InputArea.h \
   $(srcdir)/Area.h \
   $(srcdir)/BaseWindow.h \
   $(srcdir)/BasicView.h \
   $(srcdir)/Button.h \
+  $(srcdir)/CairoWrapper.h \
   $(srcdir)/Canvas.h \
-  $(srcdir)/CairoWrapper.h \
   $(srcdir)/CheckBox.h \
   $(srcdir)/ClientArea.h \
+  $(srcdir)/Coverflow.h \
+  $(srcdir)/CoverflowItem.h \
+  $(srcdir)/CoverflowModel.h \
+  $(srcdir)/EMMetrics.h \
+  $(srcdir)/GridHLayout.h \
+  $(srcdir)/HLayout.h \
+  $(srcdir)/HSplitter.h \
+  $(srcdir)/InputArea.h \
+  $(srcdir)/KeyboardHandler.h \
+  $(srcdir)/KineticScrolling/AxisDecelerationAnimation.h \
+  $(srcdir)/KineticScrolling/KineticAxisScroller.h \
+  $(srcdir)/KineticScrolling/KineticScroller.h \
+  $(srcdir)/KineticScrolling/KineticScrollingEnums.h \
+  $(srcdir)/KineticScrolling/KineticScrollingTickSource.h \
+  $(srcdir)/KineticScrolling/VelocityCalculator.h \
+  $(srcdir)/KineticScrollView.h \
+  $(srcdir)/LayeredLayout.h \
+  $(srcdir)/Layout.h \
+  $(srcdir)/LinearLayout.h \
+  $(srcdir)/Nux.h \
+  $(srcdir)/NuxGlobalInitializer.h \
+  $(srcdir)/Painter.h \
+  $(srcdir)/PaintLayer.h \
+  $(srcdir)/StaticText.h \
+  $(srcdir)/StaticTextBox.h \
+  $(srcdir)/SystemThread.h \
+  $(srcdir)/TextEntry.h \
+  $(srcdir)/TextLoader.h \
+  $(srcdir)/TextureArea.h \
+  $(srcdir)/Theme.h \
+  $(srcdir)/TimerProc.h \
+  $(srcdir)/Utils.h \
+  $(srcdir)/VLayout.h \
+  $(srcdir)/View.h \
+  $(srcdir)/VSplitter.h \
+  $(srcdir)/WidgetMetrics.h \
+  $(srcdir)/WindowCompositor.h \
+  $(srcdir)/WindowThread.h
+
+if !NUX_MINIMAL
+source_h += \
+  $(builddir)/ABI.h \
+  $(srcdir)/ActionItem.h \
+  $(srcdir)/AnimatedTextureArea.h \
   $(srcdir)/ColorEditor.h \
   $(srcdir)/ColorPickerDialog.h \
   $(srcdir)/ColorPreview.h \
-  $(srcdir)/Coverflow.h \
-  $(srcdir)/CoverflowItem.h \
-  $(srcdir)/CoverflowModel.h \
   $(srcdir)/Dialog.h \
   $(srcdir)/DoubleValidator.h \
   $(srcdir)/EditTextBox.h \
-  $(builddir)/Features.h \
   $(srcdir)/FileSelector.h \
   $(srcdir)/FloatingWindow.h \
-  $(srcdir)/GridHLayout.h \
   $(srcdir)/GroupBox.h \
   $(srcdir)/GroupBox2.h \
   $(srcdir)/HexRegExpValidator.h \
-  $(srcdir)/HLayout.h \
   $(srcdir)/HScrollBar.h \
-  $(srcdir)/HSplitter.h \
   $(srcdir)/IntegerValidator.h \
-  $(srcdir)/View.h \
-  $(srcdir)/KeyboardHandler.h \
-  $(srcdir)/KineticScrolling/AxisDecelerationAnimation.h \
-  $(srcdir)/KineticScrolling/KineticAxisScroller.h \
-  $(srcdir)/KineticScrolling/KineticScroller.h \
-  $(srcdir)/KineticScrolling/KineticScrollingEnums.h \
-  $(srcdir)/KineticScrolling/KineticScrollingTickSource.h \
-  $(srcdir)/KineticScrolling/VelocityCalculator.h \
-  $(srcdir)/KineticScrollView.h \
-  $(srcdir)/LayeredLayout.h \
-  $(srcdir)/Layout.h \
-  $(srcdir)/LinearLayout.h \
   $(srcdir)/MenuPage.h \
   $(srcdir)/MenuBar.h \
-  $(srcdir)/EMMetrics.h \
   $(srcdir)/MouseAreaCtrl.h \
   $(srcdir)/NumericValuator.h \
-  $(srcdir)/Nux.h \
   $(srcdir)/NuxTimerTickSource.h \
-  $(srcdir)/NuxGlobalInitializer.h \
-  $(srcdir)/Painter.h \
   $(srcdir)/Panel.h \
   $(srcdir)/PopUpWindow.h \
   $(srcdir)/RadioButton.h \
@@ -202,29 +227,20 @@
   $(srcdir)/SpinBox.h \
   $(srcdir)/SpinBoxDouble.h \
   $(srcdir)/SpinBox_Logic.h \
-  $(srcdir)/StaticText.h \
-  $(srcdir)/StaticTextBox.h \
-  $(srcdir)/SystemThread.h \
   $(srcdir)/TabView.h \
-  $(srcdir)/TextEntry.h \
   $(srcdir)/TextEntryComposeSeqs.h \
-  $(srcdir)/InputMethodIBus.h \
-  $(srcdir)/TextLoader.h \
-  $(srcdir)/TextureArea.h \
   $(srcdir)/Timeline.h \
   $(srcdir)/TimelineEasings.h \
-  $(srcdir)/TimerProc.h \
   $(srcdir)/ToolButton.h \
   $(srcdir)/ToggleButton.h \
-  $(srcdir)/Theme.h \
-  $(srcdir)/Utils.h \
   $(srcdir)/Validator.h \
-  $(srcdir)/VLayout.h \
-  $(srcdir)/VScrollBar.h \
-  $(srcdir)/VSplitter.h \
-  $(srcdir)/WidgetMetrics.h \
-  $(srcdir)/WindowCompositor.h \
-  $(srcdir)/WindowThread.h
+  $(srcdir)/VScrollBar.h
+endif
+
+if USE_X11
+source_cpp += \
+  $(srcdir)/InputMethodIBus.h
+endif
 
 if HAVE_GEIS
 source_h += \

=== modified file 'Nux/MenuPage.h'
--- Nux/MenuPage.h	2012-10-10 22:46:50 +0000
+++ Nux/MenuPage.h	2012-11-05 17:50:27 +0000
@@ -19,7 +19,6 @@
  *
  */
 
-
 #ifndef MENUPAGE_H
 #define MENUPAGE_H
 

=== modified file 'Nux/Nux.cpp'
--- Nux/Nux.cpp	2012-09-26 06:44:12 +0000
+++ Nux/Nux.cpp	2012-11-05 17:50:27 +0000
@@ -177,6 +177,7 @@
     return w;
   }
 
+#elif defined(NO_X11)
 #elif defined(NUX_OS_LINUX)
 #ifdef NUX_OPENGLES_20
   WindowThread *CreateFromForeignWindow (Window X11Window, EGLContext OpenGLContext,

=== modified file 'Nux/Nux.h'
--- Nux/Nux.h	2012-08-17 12:41:21 +0000
+++ Nux/Nux.h	2012-11-05 17:50:27 +0000
@@ -67,7 +67,9 @@
 #include "AbstractThread.h"
 #include "WindowThread.h"
 #include "WindowCompositor.h"
-#include "Timeline.h"
+#if !defined(NUX_MINIMAL)
+#  include "Timeline.h"
+#endif
 #include "SystemThread.h"
 
 
@@ -167,6 +169,7 @@
                                         HGLRC OpenGLRenderingContext,
                                         ThreadUserInitFunc user_init_func,
                                         void *data);
+#elif defined(NO_X11)
 #elif defined(NUX_OS_LINUX)
   //! Create a main graphics thread. This thread has a window and no parent window.
 #ifdef NUX_OPENGLES_20

=== modified file 'Nux/TextEntry.cpp'
--- Nux/TextEntry.cpp	2012-10-02 07:32:55 +0000
+++ Nux/TextEntry.cpp	2012-11-05 17:50:27 +0000
@@ -29,11 +29,14 @@
 #include "TextEntry.h"
 
 #if defined(NUX_OS_LINUX)
-#include "TextEntryComposeSeqs.h"
-#include <X11/cursorfont.h>
-#include "InputMethodIBus.h"
+# include "TextEntryComposeSeqs.h"
+# if defined(USE_X11)
+#  include <X11/cursorfont.h>
+#  include "InputMethodIBus.h"
+# endif
 #endif
 
+
 namespace nux
 {
   static const int kInnerBorderX = 2;
@@ -151,7 +154,7 @@
     , font_dpi_(96.0)
     , _text_color(color::White)
     , align_(CairoGraphics::ALIGN_LEFT)
-#if defined(NUX_OS_LINUX)
+#if defined(USE_X11)
     , caret_cursor_(None)
     , ime_(new IBusIMEContext(this))
 #endif
@@ -198,7 +201,7 @@
     if (_texture2D)
       _texture2D->UnReference();
 
-#if defined(NUX_OS_LINUX)
+#if defined(USE_X11)
     if (ime_)
       delete ime_;
 #endif
@@ -301,7 +304,7 @@
     const char*      character ,   /*character*/
     unsigned short   /* keyCount */      /*key repeat count*/)
   {
-#if defined(NUX_OS_LINUX)
+#if defined(USE_X11)
     if (im_running())
     {
       // FIXME Have to get the x11_keycode for ibus-hangul/korean input
@@ -318,7 +321,7 @@
     if (event_type == NUX_KEYUP)
       return;
 
-#if defined(NUX_OS_LINUX)
+#if !defined(NO_X11)
     if (IsInCompositionMode() || IsInitialCompositionKeySym(keysym))
     {
       if (HandleComposition(keysym))
@@ -525,7 +528,7 @@
 
   void TextEntry::RecvMouseEnter(int /* x */, int /* y */, unsigned long /* button_flags */, unsigned long /* key_flags */)
   {
-#if defined(NUX_OS_LINUX)
+#if defined(USE_X11)
     if (caret_cursor_ == None)
     {
       Display* display = nux::GetGraphicsDisplay()->GetX11Display();
@@ -542,7 +545,7 @@
 
   void TextEntry::RecvMouseLeave(int /* x */, int /* y */, unsigned long /* button_flags */, unsigned long /* key_flags */)
   {
-#if defined(NUX_OS_LINUX)
+#if defined(USE_X11)
     if (caret_cursor_ != None)
     {
       Display* display = nux::GetGraphicsDisplay()->GetX11Display();
@@ -676,7 +679,7 @@
 
   bool TextEntry::IsInitialCompositionKeySym(unsigned long keysym) const
   {
-#if defined(NUX_OS_LINUX)
+#if defined(USE_X11)
     /* Checks if a keysym is a valid initial composition key */
     if (keysym == XK_Multi_key ||
         (keysym >= XK_dead_grave && keysym <= XK_dead_currency) ||
@@ -690,7 +693,7 @@
 
   bool TextEntry::HandleComposition(unsigned long keysym)
   {
-#if defined(NUX_OS_LINUX)
+#if defined(USE_X11)
     bool composition_mode = IsInCompositionMode();
 
     if (composition_mode && IsModifierKey(keysym))
@@ -860,8 +863,9 @@
       if (!readonly_ /*&& im_context_*/)
       {
         need_im_reset_ = true;
-#if defined(NUX_OS_LINUX)
+#if defined(USE_X11)
         ime_->Focus();
+        nux::GetWindowThread()->GetGraphicsDisplay().XICFocus();
 #endif
         //gtk_im_context_focus_in(im_context_);
         //UpdateIMCursorLocation();
@@ -882,8 +886,9 @@
       if (!readonly_ /*&& im_context_*/)
       {
         need_im_reset_ = true;
-#if defined(NUX_OS_LINUX)
+#if defined(USE_X11)
         ime_->Blur();
+        nux::GetWindowThread()->GetGraphicsDisplay().XICUnFocus();
 #endif
         //gtk_im_context_focus_out(im_context_);
       }
@@ -1730,7 +1735,7 @@
 
   bool TextEntry::im_running()
   {
-#if defined(NUX_OS_LINUX)
+#if defined(USE_X11)
     return ime_->IsConnected();
 #else
     return false;
@@ -2334,7 +2339,7 @@
     unsigned int eventType = event.type;
     unsigned int key_sym = event.GetKeySym();
 
-#if defined(NUX_OS_LINUX)
+#if defined(USE_X11)
     if (im_running())
     {
       // Always allow IBus hotkey events

=== modified file 'Nux/TextEntry.h'
--- Nux/TextEntry.h	2012-10-15 12:00:02 +0000
+++ Nux/TextEntry.h	2012-11-05 17:50:27 +0000
@@ -471,7 +471,7 @@
 
     CairoGraphics::Alignment align_;
 
-#if defined(NUX_OS_LINUX)
+#if defined(USE_X11)
     Cursor caret_cursor_;
 #endif
 
@@ -480,7 +480,7 @@
     std::list<Rect> last_cursor_region_;
     std::list<Rect> cursor_region_;
 
-#if defined(NUX_OS_LINUX)
+#if defined(USE_X11)
     IBusIMEContext* ime_;
     friend class IBusIMEContext;
 #endif

=== modified file 'Nux/WindowCompositor.cpp'
--- Nux/WindowCompositor.cpp	2012-10-28 15:59:17 +0000
+++ Nux/WindowCompositor.cpp	2012-11-05 17:50:27 +0000
@@ -27,9 +27,12 @@
 #include "NuxGraphics/GLError.h"
 #include "WindowThread.h"
 #include "BaseWindow.h"
+#if !defined(NUX_MINIMAL)
 #include "MenuPage.h"
+#endif
 #include "PaintLayer.h"
 #include "Painter.h"
+#include "Layout.h"
 
 #include "NuxGraphics/FontTexture.h"
 namespace nux
@@ -43,7 +46,6 @@
     m_OverlayWindow             = NULL;
     _tooltip_window             = NULL;
     m_TooltipArea               = NULL;
-    _menu_chain                 = NULL;
     m_Background                = NULL;
     _tooltip_window             = NULL;
     OverlayDrawingCommand       = NULL;
@@ -53,8 +55,6 @@
     inside_event_cycle_         = false;
     inside_rendering_cycle_     = false;
     _dnd_area                   = NULL;
-    _mouse_over_menu_page       = NULL;
-    _mouse_owner_menu_page      = NULL;
     _starting_menu_event_cycle  = false;
     _menu_is_active             = false;
     on_menu_closure_continue_with_event_ = false;
@@ -69,7 +69,13 @@
     m_MainColorRT = GetGraphicsDisplay()->GetGpuDevice()->CreateSystemCapableDeviceTexture(2, 2, 1, BITFMT_R8G8B8A8, NUX_TRACKER_LOCATION);
     m_MainDepthRT = GetGraphicsDisplay()->GetGpuDevice()->CreateSystemCapableDeviceTexture(2, 2, 1, BITFMT_D24S8, NUX_TRACKER_LOCATION);
 
-    _menu_chain = new std::list<MenuPage*>;
+#if !defined(NUX_MINIMAL)
+    _mouse_over_menu_page       = NULL;
+    _mouse_owner_menu_page      = NULL;
+    _menu_chain                 = NULL;
+    _menu_chain                 = new std::list<MenuPage*>;
+#endif
+
     m_MenuRemoved = false;
     m_Background = new ColorLayer(Color(0xFF4D4D4D));
 
@@ -89,12 +95,14 @@
     m_FrameBufferObject.Release();
     m_MainColorRT.Release();
     m_MainDepthRT.Release();
-    _menu_chain->clear();
     _view_window_list.clear();
     _modal_view_window_list.clear();
 
-    NUX_SAFE_DELETE(_menu_chain);
-    NUX_SAFE_DELETE(m_Background);
+#if !defined(NUX_MINIMAL)
+    _menu_chain->clear();
+    delete _menu_chain;
+#endif
+    delete m_Background;
   }
 
   WindowCompositor::RenderTargetTextures& WindowCompositor::GetWindowBuffer(BaseWindow* window)
@@ -167,8 +175,10 @@
   {
     mouse_over_area_ = NULL;
     SetMouseOwnerArea(NULL);
+#if !defined(NUX_MINIMAL)
     _mouse_over_menu_page   = NULL;
     _mouse_owner_menu_page  = NULL;
+#endif
   }
 
   void WindowCompositor::FindAreaUnderMouse(const Point& mouse_position,
@@ -342,7 +352,7 @@
 
           if (abs(dnd_safety_y_) > 30 || abs(dnd_safety_x_) > 30)
           {
-#ifdef NUX_OS_LINUX
+#if defined(DRAG_AND_DROP_SUPPORTED)
             mouse_owner_area_->StartDragAsSource();
 #endif
             ResetMousePointerAreas();
@@ -678,6 +688,7 @@
     UpdateEventTrackingByMouseOwnerAncestor(event);
   }
 
+#if !defined(NUX_MINIMAL)
   void WindowCompositor::MenuEventCycle(Event& event)
   {
     // _mouse_owner_menu_page: the menu page that has the mouse down
@@ -859,6 +870,7 @@
       }
     }
   }
+#endif
 
   void WindowCompositor::FindKeyFocusArea(NuxEventType event_type,
     unsigned int key_symbol,
@@ -1018,8 +1030,10 @@
                     event.GetKeySym(),
 #if defined(NUX_OS_WINDOWS)
                     event.win32_keycode,
-#elif defined(NUX_OS_LINUX)
+#elif defined(USE_X11)
                     event.x11_keycode,
+#else
+                    0,
 #endif
                     event.GetKeyState(),
                     event.GetText(),
@@ -1041,8 +1055,10 @@
             event.GetKeySym(),
 #if defined(NUX_OS_WINDOWS)
             event.win32_keycode,
-#elif defined(NUX_OS_LINUX)
+#elif defined(USE_X11)
             event.x11_keycode,
+#else
+            0,
 #endif
             event.GetKeyState(),
             event.GetText(),
@@ -1096,6 +1112,7 @@
     if (((event.type >= NUX_MOUSE_PRESSED) && (event.type <= NUX_MOUSE_WHEEL)) ||
     (event.type == NUX_WINDOW_MOUSELEAVE))
     {
+#if !defined(NUX_MINIMAL)
       bool menu_active = false;
       if (_menu_chain->size())
       {
@@ -1105,6 +1122,7 @@
       }
 
       if ((menu_active && on_menu_closure_continue_with_event_) || !(menu_active))
+#endif
       {
         MouseEventCycle(event);
       }
@@ -1345,6 +1363,7 @@
 
   void WindowCompositor::DrawMenu(bool force_draw)
   {
+#if !defined(NUX_MINIMAL)
     ObjectWeakPtr<BaseWindow> window = m_MenuWindow;
 
     if (window.IsValid())
@@ -1369,10 +1388,7 @@
       (*rev_it_menu)->ProcessDraw(window_thread_->GetGraphicsEngine(), force_draw);
       SetProcessingTopView(NULL);
     }
-
-//     GetGraphicsDisplay()->GetGraphicsEngine()->SetContext(0, 0,
-//                                             window_thread_->GetGraphicsEngine().GetWindowWidth(),
-//                                             window_thread_->GetGraphicsEngine().GetWindowHeight());
+#endif
   }
 
   void WindowCompositor::DrawOverlay(bool /* force_draw */)
@@ -1693,6 +1709,7 @@
     }
   }
 
+#if !defined(NUX_MINIMAL)
   void WindowCompositor::AddMenu(MenuPage* menu, BaseWindow* window, bool OverrideCurrentMenuChain)
   {
     if (_menu_chain->size() == 0)
@@ -1784,6 +1801,7 @@
       m_MenuWindow            = NULL;
     }
   }
+#endif
 
   void WindowCompositor::SetWidgetDrawingOverlay(InputArea* ic, BaseWindow* OverlayWindow)
   {
@@ -2096,7 +2114,7 @@
 
   void WindowCompositor::SetDnDArea(InputArea* area)
   {
-#if defined(NUX_OS_LINUX)
+#if defined(DRAG_AND_DROP_SUPPORTED)
     if (_dnd_area == area)
       return;
 
@@ -2106,7 +2124,7 @@
       _dnd_area->UnReference();
     }
     _dnd_area = area;
-    
+
     if (_dnd_area)
     {
       _dnd_area->Reference();

=== modified file 'Nux/WindowCompositor.h'
--- Nux/WindowCompositor.h	2012-10-10 22:46:50 +0000
+++ Nux/WindowCompositor.h	2012-11-05 17:50:27 +0000
@@ -82,9 +82,12 @@
     
     void KeyboardEventCycle(Event& event);
 
+#if !defined(NUX_MINIMAL)
     void MenuEventCycle(Event& event);
     MenuPage* _mouse_owner_menu_page;
     MenuPage* _mouse_over_menu_page;
+#endif
+
     bool      _starting_menu_event_cycle;
     bool      _menu_is_active;
 
@@ -252,9 +255,11 @@
     void StartModalWindow(ObjectWeakPtr<BaseWindow>);
     void StopModalWindow(ObjectWeakPtr<BaseWindow>);
 
+#if !defined(NUX_MINIMAL)
     void AddMenu(MenuPage* menu, BaseWindow* window, bool OverrideCurrentMenuChain = true);
     void RemoveMenu(MenuPage* menu);
     void CleanMenu();
+#endif
 
     void PushModalWindow(ObjectWeakPtr<BaseWindow> window);
 
@@ -504,7 +509,9 @@
     WindowList _modal_view_window_list;
     WeakBaseWindowPtr _always_on_front_window;  //!< Floating view that always remains on top.
 
+#if !defined(NUX_MINIMAL)
     std::list<MenuPage* >* _menu_chain;
+#endif
 
     std::map<BaseWindow*, struct RenderTargetTextures> _window_to_texture_map;
 

=== modified file 'Nux/WindowThread.cpp'
--- Nux/WindowThread.cpp	2012-11-04 11:02:49 +0000
+++ Nux/WindowThread.cpp	2012-11-05 17:50:27 +0000
@@ -83,10 +83,12 @@
     _draw_requested_to_host_wm       = false;
     first_pass_        = true;
 
+#if !defined(NUX_MINIMAL)
     _Timelines = new std::list<Timeline*> ();
     gint64 micro_secs = g_get_real_time();
     last_timeline_frame_time_sec_ = micro_secs / 1000000;
     last_timeline_frame_time_usec_ = micro_secs % 1000000;
+#endif
     _MasterClock = NULL;
 
 #if (defined(NUX_OS_LINUX) || defined(NUX_USE_GLIB_LOOP_ON_WINDOWS)) && (!defined(NUX_DISABLE_GLIB_LOOP))
@@ -94,7 +96,7 @@
     main_loop_glib_context_   = 0;
 #endif
 
-#if defined(NUX_OS_LINUX)
+#if defined(USE_X11)
     x11display_ = NULL;
     ownx11display_ = false;
 #endif
@@ -113,16 +115,18 @@
 #endif
 
     ThreadDtor();
+#if !defined(NUX_MINIMAL)
     std::list<Timeline*>::iterator li;
     for (li=_Timelines->begin(); li!=_Timelines->end(); ++li)
     {
       (*li)->UnReference();
     }
-    
     delete _Timelines;
+#endif
+
     delete async_wake_up_signal_;
 
-#if defined(NUX_OS_LINUX)
+#if defined(USE_X11)
     if (x11display_ && ownx11display_)
     {
       XCloseDisplay(x11display_);
@@ -376,6 +380,7 @@
       StopLayoutCycle();
   }
 
+#if !defined(NUX_MINIMAL)
   void WindowThread::AddTimeline(Timeline *timeline)
   {
     _Timelines->push_back(timeline);
@@ -391,6 +396,7 @@
       StopMasterClock();
     }
   }
+#endif
 
   int WindowThread::Run(void * /* ptr */)
   {
@@ -936,6 +942,7 @@
     return state;
   }
 
+#if !defined(NUX_MINIMAL)
   bool WindowThread::ProcessTimelines(gint64 micro_secs)
   {
     // go through our timelines and tick them
@@ -979,6 +986,7 @@
     // return if we have any timelines left
     return (_Timelines->size() != 0);
   }
+#endif
 
   void WindowThread::EnableMouseKeyboardInput()
   {
@@ -1084,9 +1092,7 @@
       return true;
     }
 
-#if defined(NUX_OS_WINDOWS)
     SetWin32ThreadName(GetThreadId(), window_title_.c_str());
-#endif
 
     if (RegisterNuxThread(this) == FALSE)
     {
@@ -1137,6 +1143,7 @@
 
     return true;
   }
+#elif defined(NO_X11)
 #elif defined(NUX_OS_LINUX)
 #ifdef NUX_OPENGLES_20
   bool WindowThread::ThreadCtor(Display *X11Display, Window X11Window, EGLContext OpenGLContext)
@@ -1323,8 +1330,10 @@
 
 #if defined(NUX_OS_WINDOWS)
   bool WindowThread::ProcessForeignEvent(HWND hWnd, MSG msg, WPARAM wParam, LPARAM lParam, void *data)
-#elif defined(NUX_OS_LINUX)
+#elif defined(USE_X11)
   bool WindowThread::ProcessForeignEvent(XEvent *xevent, void * /* data */)
+#else
+  bool WindowThread::ProcessForeignEvent()
 #endif
   {
     if (graphics_display_->IsPauseThreadGraphicsRendering())
@@ -1336,7 +1345,7 @@
     memset(&nux_event, 0, sizeof(Event));
 #if defined(NUX_OS_WINDOWS)
     graphics_display_->ProcessForeignWin32Event(hWnd, msg, wParam, lParam, &nux_event);
-#elif defined(NUX_OS_LINUX)
+#elif defined(USE_X11)
     graphics_display_->ProcessForeignX11Event(xevent, &nux_event);
 #endif
 

=== modified file 'Nux/WindowThread.h'
--- Nux/WindowThread.h	2012-09-26 00:43:42 +0000
+++ Nux/WindowThread.h	2012-11-05 17:50:27 +0000
@@ -42,7 +42,9 @@
   class SystemThread;
   class UXTheme;
   class TimerHandler;
+#if !defined(NUX_MINIMAL)
   class Timeline;
+#endif
   class Event;
   class Area;
   struct ClientAreaDraw;
@@ -216,8 +218,10 @@
 
 #if defined(NUX_OS_WINDOWS)
     bool ProcessForeignEvent(HWND hWnd, MSG msg, WPARAM wParam, LPARAM lParam, void *data);
-#elif defined(NUX_OS_LINUX)
+#elif defined(USE_X11)
     bool ProcessForeignEvent(XEvent *event, void *data);
+#else
+    bool ProcessForeignEvent();
 #endif
 
     /*!
@@ -229,6 +233,7 @@
     */
     void RenderInterfaceFromForeignCmd(Geometry *clip);
 
+#if !defined(NUX_MINIMAL)
     /*!
         Add a timeline to our window
     */
@@ -237,6 +242,7 @@
     bool ProcessTimelines(gint64 micro_secs);
     long last_timeline_frame_time_sec_;
     long last_timeline_frame_time_usec_;
+#endif
 
     void StartMasterClock();
     void StopMasterClock();
@@ -357,7 +363,7 @@
         This function is called when Nux is embedded. \sa IsEmbeddedWindow.
     */
     virtual bool ThreadCtor(HWND WindowHandle, HDC WindowDCHandle, HGLRC OpenGLRenderingContext);
-#elif defined(NUX_OS_LINUX)
+#elif defined(USE_X11)
 #ifdef NUX_OPENGLES_20
     /*!
         Constructor-like function for the thread.
@@ -536,7 +542,9 @@
     //! Set to true to schedule a compute cycle on the main layout.
     bool queue_main_layout_;
 
+#if !defined(NUX_MINIMAL)
     std::list<Timeline*> *_Timelines;
+#endif
 
     bool first_pass_;                     //!< True when going through the ExecutionLoop for the first time.
     unsigned int window_initial_width_;   //!< Window height at startup.
@@ -692,16 +700,20 @@
     friend WindowThread *CreateFromForeignWindow(HWND WindowHandle, HDC WindowDCHandle, HGLRC OpenGLRenderingContext,
         ThreadUserInitFunc UserInitFunc,
         void *InitData);
-#elif defined(NUX_OS_LINUX)
-#ifdef NUX_OPENGLES_20
+#elif defined(USE_X11)
+#  ifdef NUX_OPENGLES_20
     friend WindowThread *CreateFromForeignWindow (Window X11Window, EGLContext OpenGLContext,
         ThreadUserInitFunc UserInitFunc,
         void *InitData);
-#else
+#  else
     friend WindowThread *CreateFromForeignWindow (Window X11Window, GLXContext OpenGLContext,
         ThreadUserInitFunc UserInitFunc,
         void *InitData);
-#endif
+#  endif
+#elif defined(NO_X11)
+    friend WindowThread *CreateFromForeignWindow (EGLDisplay disp, EGLContext OpenGLContext,
+        ThreadUserInitFunc UserInitFunc,
+        void *InitData);
 #endif
 
     friend SystemThread *CreateSystemThread(AbstractThread *Parent, ThreadUserInitFunc UserInitFunc, void *InitData);

=== modified file 'NuxCore/Logger.cpp'
--- NuxCore/Logger.cpp	2012-10-29 07:28:01 +0000
+++ NuxCore/Logger.cpp	2012-11-05 17:50:27 +0000
@@ -31,7 +31,7 @@
 #include "LoggingWriter.h"
 
 #if defined(NUX_OS_LINUX)
-#include <execinfo.h>
+#  include <execinfo.h>
 #endif
 
 #include <sstream>
@@ -381,6 +381,11 @@
 
   return sout.str();
 }
+#else
+std::string Backtrace(int /*levels*/)
+{
+  return "Backtrace not supported on this platform.\n";
+}
 #endif
 
 BlockTracer::BlockTracer(Logger const& logger,

=== modified file 'NuxCore/System.h'
--- NuxCore/System.h	2011-10-19 03:23:03 +0000
+++ NuxCore/System.h	2012-11-05 17:50:27 +0000
@@ -29,6 +29,8 @@
 
 #ifdef _WIN32
     #define NUX_OS_WINDOWS
+#elif __arm__
+    #define NUX_OS_LINUX
 #elif __linux__
     #define NUX_OS_LINUX
 #elif __APPLE__
@@ -67,10 +69,31 @@
 #elif defined(_M_IX86) || defined(__i386__)
   #define NUX_ARCH_i386
 #elif defined(__arm__)
-	#define NUX_ARCH_arm
-#endif
-
-
+  #define NUX_ARCH_ARM
+#endif
+
+// If we are compiling for linux, and neither USE_X11 or NO_X11 are set,
+// then assume that we are compiling for X11
+#if defined(NUX_OS_LINUX)
+#  if defined(USE_X11)
+#    if defined(NO_X11)
+#      error Can not define both USE_X11 and NO_X11
+#    endif
+#  elif !defined(NO_X11)
+#    define USE_X11
+# endif
+#elif defined(USE_X11)
+#  error X11 not supported on non-linux systems
+#endif
+
+#if defined(USE_X11)
+#  define DRAG_AND_DROP_SUPPORTED
+#endif
+
+// Right now, we only support minimal builds for ARM if no X.
+#if (defined(NUX_ARCH_ARM) && defined(NO_X11) && !defined(NUX_MINIMAL))
+#  define NUX_MINIMAL
+#endif
 
 // Compiler Macros:
 // NUX_GNUCPP_COMPILER

=== modified file 'NuxGraphics/CairoGraphics.h'
--- NuxGraphics/CairoGraphics.h	2012-05-25 20:36:09 +0000
+++ NuxGraphics/CairoGraphics.h	2012-11-05 17:50:27 +0000
@@ -23,7 +23,11 @@
 #ifndef CAIROGRAPHICS_H
 #define CAIROGRAPHICS_H
 
+#ifdef NUX_ARCH_ARM
+#include "cairo.h"
+#else
 #include "cairo/cairo.h"
+#endif
 #include "BitmapFormats.h"
 #include "ImageSurface.h"
 

=== modified file 'NuxGraphics/Events.cpp'
--- NuxGraphics/Events.cpp	2012-01-30 07:53:02 +0000
+++ NuxGraphics/Events.cpp	2012-11-05 17:50:27 +0000
@@ -87,7 +87,7 @@
     win32_keysym = 0;
 #endif
 
-#if defined(NUX_OS_LINUX)
+#if defined(USE_X11)
     x11_keycode = 0;
     x11_keysym = 0;
     x11_timestamp = 0;
@@ -107,7 +107,7 @@
     win32_keysym = 0;
 #endif
 
-#if defined(NUX_OS_LINUX)
+#if defined(USE_X11)
     x11_keycode = 0;
     x11_keysym = 0;
     x11_key_state = 0;
@@ -195,14 +195,13 @@
   {
 #if defined(NUX_OS_WINDOWS)
     return win32_keysym;
-#endif
-
-#if defined(NUX_OS_LINUX)
+#elif defined(USE_X11)
     return x11_keysym;
-#endif
-
+#else
     return 0;
+#endif
   }
+
   unsigned short Event::GetKeyRepeatCount() const
   {
     return key_repeat_count;

=== modified file 'NuxGraphics/Events.h'
--- NuxGraphics/Events.h	2012-09-26 16:09:07 +0000
+++ NuxGraphics/Events.h	2012-11-05 17:50:27 +0000
@@ -27,8 +27,10 @@
 
 #if defined(NUX_OS_WINDOWS)
   #include "VirtualKeyCodes.h"
-#elif defined(NUX_OS_LINUX)
+#elif defined(USE_X11)
   #include "VirtualKeyCodesX11.h"
+#elif defined(NO_X11)
+  #include "VirtualKeyCodes.h"
 #else
   #error VirtualKeyCode file not Implemented.
 #endif
@@ -396,9 +398,7 @@
 #if defined(NUX_OS_WINDOWS)
     int win32_keycode; // Not used. Just a place holder.
     int win32_keysym;
-#endif
-
-#if defined(NUX_OS_LINUX)
+#elif defined(USE_X11)
     Time          x11_timestamp;  //!< X11 timestamp.
     Window        x11_window;     //!< X11 window.
     unsigned int  x11_key_state;  //!< X11 key state (xevent.xkey.state).

=== modified file 'NuxGraphics/FontRenderer.cpp'
--- NuxGraphics/FontRenderer.cpp	2012-09-30 14:55:52 +0000
+++ NuxGraphics/FontRenderer.cpp	2012-11-05 17:50:27 +0000
@@ -141,6 +141,7 @@
       //CHECKGL(glBindAttribLocation(_shader_prog->GetOpenGLID(), 0, "_Position"));
       _shader_prog->Link();
     }
+#ifndef NUX_OPENGLES_20
     else
     {
       _asm_shader_prog = GetGraphicsDisplay()->GetGpuDevice()->CreateAsmShaderProgram();
@@ -154,6 +155,7 @@
       _asm_font_texture_rect_prog->LoadPixelShader(FontAsmFrgRect.c_str());
       _asm_font_texture_rect_prog->Link();
     }
+#endif
   }
 
   FontRenderer::~FontRenderer()
@@ -469,7 +471,9 @@
     int in_attrib_scale = 0;
     int in_attrib_offset = 0;
 
+#ifndef NUX_OPENGLES_20
     ObjectPtr<IOpenGLAsmShaderProgram> shader_program;
+#endif
     if (_graphics_engine.UsingGLSLCodePath())
     {
       _shader_prog->Begin();
@@ -576,7 +580,9 @@
     }
     else
     {
+#ifndef NUX_OPENGLES_20
       shader_program->End();
+#endif
     }
 
     _graphics_engine.GetRenderStates().SetColorMask(TRUE, TRUE, TRUE, TRUE);

=== modified file 'NuxGraphics/FontRenderer.h'
--- NuxGraphics/FontRenderer.h	2012-08-27 09:09:21 +0000
+++ NuxGraphics/FontRenderer.h	2012-11-05 17:50:27 +0000
@@ -105,11 +105,10 @@
     ObjectPtr<IOpenGLVertexShader> _vertex_shader_prog;
     ObjectPtr<IOpenGLShaderProgram> _shader_prog;
 
-    //ObjectPtr<IOpenGLAsmPixelShader> m_AsmPixelShaderProg;
-    //ObjectPtr<IOpenGLAsmVertexShader> m_AsmVertexShaderProg;
+#ifndef NUX_OPENGLES_20
     ObjectPtr<IOpenGLAsmShaderProgram> _asm_shader_prog;
-
     ObjectPtr<IOpenGLAsmShaderProgram> _asm_font_texture_rect_prog;
+#endif
   };
 
 }

=== modified file 'NuxGraphics/GLDeviceObjects.h'
--- NuxGraphics/GLDeviceObjects.h	2011-04-06 21:54:09 +0000
+++ NuxGraphics/GLDeviceObjects.h	2012-11-05 17:50:27 +0000
@@ -43,7 +43,9 @@
 #include "IOpenGLTexture2D.h"
 #include "IOpenGLAnimatedTexture.h"
 #include "IOpenGLGLSLShader.h"
+#ifndef NUX_OPENGLES_20 
 #include "IOpenGLAsmShader.h"
+#endif
 #include "IOpenGLQuery.h"
 #include "IOpenGLVertexDeclaration.h"
 #include "IOpenGLFrameBufferObject.h"

=== modified file 'NuxGraphics/GLRenderStates.cpp'
--- NuxGraphics/GLRenderStates.cpp	2012-09-30 14:55:52 +0000
+++ NuxGraphics/GLRenderStates.cpp	2012-11-05 17:50:27 +0000
@@ -49,7 +49,6 @@
       UL_MAP(FRONTFACE                    ,           GL_CCW          ,       1);
 
       UL_MAP(SCISSORTESTENABLE            ,           GL_FALSE        ,       1);
-      UL_MAP(FOGENABLE                    ,           GL_FALSE        ,       1);
 
       UL_MAP(ZTESTENABLE                  ,           GL_FALSE        ,       1);
       UL_MAP(ZWRITEENABLE                 ,           GL_TRUE         ,       1);
@@ -89,11 +88,8 @@
       UL_MAP(BACK_STENCILZPASS            ,           GL_KEEP         ,       1);
 
 
-      UL_MAP(POINTSMOOTHENABLE            ,           GL_FALSE        ,       1);
       UL_MAP(LINESMOOTHENABLE             ,           GL_FALSE        ,       1);
-      UL_MAP(POINTSIZE                    ,           1               ,       1);
       UL_MAP(LINEWIDTH                    ,           1               ,       1);
-      UL_MAP(POINTHINT                    ,           GL_FASTEST      ,       1);
       UL_MAP(LINEHINT                     ,           GL_FASTEST      ,       1);
 
       UL_MAP(COLORWRITEENABLE_R           ,           GL_TRUE         ,       1);
@@ -140,10 +136,10 @@
       s_StateLUT.default_render_state[GFXRS_SRCBLEND].iValue, s_StateLUT.default_render_state[GFXRS_DESTBLEND].iValue,
       s_StateLUT.default_render_state[GFXRS_SRCBLENDALPHA].iValue, s_StateLUT.default_render_state[GFXRS_DESTBLENDALPHA ].iValue );
 
-
+#ifndef NUX_OPENGLES_20
     HW__EnableAlphaTest( s_StateLUT.default_render_state[GFXRS_ALPHATESTENABLE].iValue );
     HW__SetAlphaTestFunc( s_StateLUT.default_render_state[GFXRS_ALPHATESTFUNC].iValue, s_StateLUT.default_render_state[GFXRS_ALPHATESTREF].iValue );
-
+#endif
 
     HW__EnableStencil( s_StateLUT.default_render_state[GFXRS_STENCILENABLE].iValue );
     HW__SetStencilFunc(
@@ -155,12 +151,11 @@
       s_StateLUT.default_render_state[GFXRS_FRONT_STENCILZFAIL].iValue,
       s_StateLUT.default_render_state[GFXRS_FRONT_STENCILZPASS].iValue);
 
+#ifndef NUX_OPENGLES_20
     HW__EnableLineSmooth(s_StateLUT.default_render_state[GFXRS_LINESMOOTHENABLE].iValue);
+#endif
     HW__SetLineWidth(s_StateLUT.default_render_state[GFXRS_LINEWIDTH].iValue, s_StateLUT.default_render_state[GFXRS_LINEHINT].iValue);
 
-    HW__EnablePointSmooth(s_StateLUT.default_render_state[GFXRS_POINTSMOOTHENABLE].iValue);
-    HW__SetPointSize(s_StateLUT.default_render_state[GFXRS_POINTSIZE].iValue, s_StateLUT.default_render_state[GFXRS_POINTHINT].iValue);
-
 #if 0
     HW__EnableTwoSidedStencil( s_StateLUT.default_render_state[GFXRS_TWOSIDEDSTENCILENABLE].iValue );
 
@@ -185,7 +180,6 @@
 
     HW__EnableScissor( s_StateLUT.default_render_state[GFXRS_SCISSORTESTENABLE].iValue );
 
-    HW__EnableFog( s_StateLUT.default_render_state[GFXRS_FOGENABLE].iValue );
   }
 
   void GpuRenderStates::SubmitChangeStates()
@@ -205,10 +199,10 @@
       render_state_changes_[GFXRS_SRCBLEND].iValue, render_state_changes_[GFXRS_DESTBLEND].iValue,
       render_state_changes_[GFXRS_SRCBLENDALPHA].iValue, render_state_changes_[GFXRS_DESTBLENDALPHA ].iValue );
 
-
+#ifndef NUX_OPENGLES_20
     HW__EnableAlphaTest( render_state_changes_[GFXRS_ALPHATESTENABLE].iValue );
     HW__SetAlphaTestFunc( render_state_changes_[GFXRS_ALPHATESTFUNC].iValue, render_state_changes_[GFXRS_ALPHATESTREF].iValue );
-
+#endif
 
     HW__EnableStencil( render_state_changes_[GFXRS_STENCILENABLE].iValue );
 
@@ -221,12 +215,11 @@
       render_state_changes_[GFXRS_FRONT_STENCILZFAIL].iValue,
       render_state_changes_[GFXRS_FRONT_STENCILZPASS].iValue);
 
+#ifndef NUX_OPENGLES_20
     HW__EnableLineSmooth(render_state_changes_[GFXRS_LINESMOOTHENABLE].iValue);
+#endif
     HW__SetLineWidth(render_state_changes_[GFXRS_LINEWIDTH].iValue, render_state_changes_[GFXRS_LINEHINT].iValue);
 
-    HW__EnablePointSmooth(render_state_changes_[GFXRS_POINTSMOOTHENABLE].iValue);
-    HW__SetPointSize(render_state_changes_[GFXRS_POINTSIZE].iValue, render_state_changes_[GFXRS_POINTHINT].iValue);
-        
 #if 0
     HW__EnableTwoSidedStencil( s_StateLUT.default_render_state[GFXRS_TWOSIDEDSTENCILENABLE].iValue );
 
@@ -251,8 +244,6 @@
 
     HW__EnableScissor( render_state_changes_[GFXRS_SCISSORTESTENABLE].iValue );
 
-    HW__EnableFog( render_state_changes_[GFXRS_FOGENABLE].iValue );
-
   }
 
   void GpuRenderStates::ResetStateChangeToDefault()

=== modified file 'NuxGraphics/GLRenderStates.h'
--- NuxGraphics/GLRenderStates.h	2012-09-30 14:55:52 +0000
+++ NuxGraphics/GLRenderStates.h	2012-11-05 17:50:27 +0000
@@ -38,7 +38,6 @@
     GFXRS_FRONTFACE,                                            // GL_CCW
 
     GFXRS_SCISSORTESTENABLE,                                    // GL_FALSE
-    GFXRS_FOGENABLE,                                            // GL_FALSE
 
     GFXRS_ZTESTENABLE,                                          // GL_TRUE
     GFXRS_ZWRITEENABLE,                                         // GL_TRUE
@@ -78,11 +77,8 @@
     GFXRS_BACK_STENCILZPASS,                                    // GL_KEEP
 
 
-    GFXRS_POINTSMOOTHENABLE,                                    // GL_FLASE
     GFXRS_LINESMOOTHENABLE,                                     // GL_FALSE
-    GFXRS_POINTSIZE,                                            // 1.0f
     GFXRS_LINEWIDTH,                                            // 1.0f
-    GFXRS_POINTHINT,                                            // GL_FASTEST
     GFXRS_LINEHINT,                                             // GL_FASTEST
 
     GFXRS_COLORWRITEENABLE_R,                                   // TRUE or FALSE
@@ -90,10 +86,6 @@
     GFXRS_COLORWRITEENABLE_B,                                   // TRUE or FALSE
     GFXRS_COLORWRITEENABLE_A,                                   // TRUE or FALSE
 
-    GFXRS_POLYGONOFFSETENABLE,                                  // GL_FALSE
-    GFXRS_POLYGONOFFSETFACTOR,                                  // 0.0f
-    GFXRS_POLYGONOFFSETUNITS,                                   // 0.0f
-
     GFXRS_MAX_RENDERSTATES,
   };
 
@@ -153,10 +145,12 @@
     void CheckRenderStatesConformity();
 
     // Render states
+#ifndef NUX_OPENGLES_20    
     inline void SetAlphaTest(
       bool EnableAlphaTest_,
       unsigned int AlphaTestFunc_    = GL_ALWAYS,
       BYTE  AlphaTestRef_     = 0);
+#endif
 
     inline void SetBlend(bool AlphaBlendEnable_);
     inline void SetBlend(bool AlphaBlendEnable_,
@@ -232,11 +226,6 @@
       unsigned int  LineWidth = 1,
       unsigned int HINT = GL_FASTEST);
 
-    inline void EnablePointSmooth(
-      bool EnablePointSmooth = TRUE,
-      unsigned int  PointSize = 1,
-      unsigned int HINT = GL_FASTEST);
-
     inline void SetColorMask(
       unsigned int bRed      = TRUE,
       unsigned int bGreen    = TRUE,
@@ -252,7 +241,6 @@
     inline void SetDepthMask(unsigned int bDepth = TRUE);
 
     inline void EnableScissor(unsigned int bScissor = FALSE);
-    inline void EnableFog(unsigned int bFog = FALSE);
 #ifndef NUX_OPENGLES_20
     inline void SetPolygonMode(unsigned int FrontMode = GL_FILL, unsigned int BackMode = GL_FILL);
 #else
@@ -267,11 +255,12 @@
     GpuBrand gpu_brand_;
     GpuInfo* gpu_info_;
 
+#ifndef NUX_OPENGLES_20
     inline void HW__EnableAlphaTest(unsigned int b);
-
     inline void HW__SetAlphaTestFunc(
       unsigned int AlphaTestFunc_,
       BYTE  AlphaTestRef_);
+#endif
 
     inline void HW__EnableAlphaBlend(unsigned int b);
 
@@ -326,22 +315,20 @@
       unsigned int ZPassOp_);
 #endif
 
+#ifndef NUX_OPENGLES_20
     inline void HW__EnableLineSmooth(unsigned int EnableLineSmooth);
+#endif
     inline void HW__SetLineWidth(unsigned int width, unsigned int HINT);
 
-    inline void HW__EnablePointSmooth(unsigned int EnablePointSmooth);
-    inline void HW__SetPointSize(unsigned int size, unsigned int HINT);
-
     inline void HW__SetColorMask(unsigned int bRed, unsigned int bGreen, unsigned int bBlue, unsigned int bAlpha);
     inline void HW__SetDepthMask(unsigned int bDepth);
 
     inline void HW__EnableScissor(unsigned int bScissor);
-    inline void HW__EnableFog(unsigned int bFog);
-
+
+
+#ifndef NUX_OPENGLES_20
     inline void HW__SetPolygonMode(unsigned int FrontMode, unsigned int BackMode);
-    inline void HW__EnablePolygonOffset(unsigned int EnablePolygonOffset);
-    inline void HW__SetPolygonOffset(float Factor, float Units);
-
+#endif
   private:
     RenderStateMap render_state_changes_[GFXRS_MAX_RENDERSTATES];
     RenderStateMap sampler_state_changes_[4][GFXSS_MAX_SAMPLERSTATES];
@@ -355,7 +342,7 @@
 //#define SET_RS_VALUE_FLOAT(a, b)  (a).fValue = (b)
 //#define RS_VALUE_FLOAT(a, b)      (a).fValue
 
-
+#ifndef NUX_OPENGLES_20
   inline void GpuRenderStates::SetAlphaTest(
     bool EnableAlphaTest_,
     unsigned int AlphaTestFunc_,
@@ -380,6 +367,7 @@
       HW__SetAlphaTestFunc(AlphaTestFunc_, AlphaTestRef_);
     }
   }
+#endif
 
   inline void GpuRenderStates::SetBlend(bool AlphaBlendEnable_)
   {
@@ -725,7 +713,9 @@
     {
       if (!RS_VALUE(render_state_changes_[GFXRS_LINESMOOTHENABLE]))
       {
+#ifndef NUX_OPENGLES_20        
         HW__EnableLineSmooth(GL_TRUE);
+#endif
       }
 
       if ((RS_VALUE(render_state_changes_[GFXRS_LINEWIDTH]) != LineWidth) ||
@@ -736,36 +726,13 @@
     }
     else
     {
+#ifndef NUX_OPENGLES_20      
       HW__EnableLineSmooth(GL_FALSE);
+#endif
       HW__SetLineWidth(LineWidth, Hint);
     }
   }
 
-  inline void GpuRenderStates::EnablePointSmooth(
-    bool EnablePointSmooth,
-    unsigned int  PointSize,
-    unsigned int Hint)
-  {
-    if (EnablePointSmooth)
-    {
-      if (!RS_VALUE(render_state_changes_[GFXRS_POINTSMOOTHENABLE]))
-      {
-        HW__EnablePointSmooth(GL_TRUE);
-      }
-
-      if ((RS_VALUE(render_state_changes_[GFXRS_POINTSIZE]) != PointSize) ||
-           (RS_VALUE(render_state_changes_[GFXRS_POINTHINT]) != Hint))
-      {
-        HW__SetLineWidth(PointSize, Hint);
-      }
-    }
-    else
-    {
-      HW__EnablePointSmooth(GL_FALSE);
-      HW__SetLineWidth(PointSize, Hint);
-    }
-  }
-
   inline void GpuRenderStates::SetColorMask(
     unsigned int bRed,
     unsigned int bGreen,
@@ -810,14 +777,7 @@
     }
   }
 
-  inline void GpuRenderStates::EnableFog(unsigned int bFog)
-  {
-    if ((RS_VALUE(render_state_changes_[GFXRS_FOGENABLE]) != bFog))
-    {
-      HW__EnableFog(bFog);
-    }
-  }
-
+#ifndef NUX_OPENGLES_20
   inline void GpuRenderStates::SetPolygonMode(unsigned int FrontMode, unsigned int BackMode)
   {
     if ((RS_VALUE(render_state_changes_[GFXRS_FRONT_POLYGONMODE]) != FrontMode) ||
@@ -826,34 +786,15 @@
       HW__SetPolygonMode(FrontMode, BackMode);
     }
   }
-
-  inline void GpuRenderStates::SetPolygonOffset(unsigned int bEnable,
-      float Factor, float Units)
+#else
+  inline void GpuRenderStates::SetPolygonMode(unsigned int /*FrontMode*/, unsigned int /*BackMode*/)
   {
-    if (bEnable)
-    {
-      if (!RS_VALUE(render_state_changes_[GFXRS_POLYGONOFFSETENABLE]))
-      {
-        HW__EnablePolygonOffset(GL_TRUE);
-      }
-
-      if ((RS_VALUE(render_state_changes_[GFXRS_POLYGONOFFSETFACTOR]) != static_cast<unsigned int> (Factor)) ||
-           (RS_VALUE(render_state_changes_[GFXRS_POLYGONOFFSETUNITS]) != static_cast<unsigned int> (Units)))
-      {
-        HW__SetPolygonOffset(Factor, Units);
-      }
-    }
-    else
-    {
-      HW__EnablePolygonOffset(GL_FALSE);
-    }
   }
-
-
-//////////////////////////////////////
+#endif
+
+#ifndef NUX_OPENGLES_20
   inline void GpuRenderStates::HW__EnableAlphaTest(unsigned int b)
   {
-#ifndef NUX_OPENGLES_20
     if (b)
     {
       CHECKGL(glEnable(GL_ALPHA_TEST));
@@ -864,13 +805,11 @@
     }
 
     SET_RS_VALUE(render_state_changes_[GFXRS_ALPHATESTENABLE], b ? GL_TRUE : GL_FALSE);
-#endif
   }
 
   inline void GpuRenderStates::HW__SetAlphaTestFunc(unsigned int AlphaTestFunc_,
       BYTE  AlphaTestRef_)
   {
-#ifndef NUX_OPENGLES_20
     nuxAssertMsg(
       (AlphaTestFunc_ == GL_NEVER) ||
       (AlphaTestFunc_ == GL_LESS) ||
@@ -885,8 +824,8 @@
     CHECKGL(glAlphaFunc(AlphaTestFunc_, (float) AlphaTestRef_ * (1.0f / 255.0f)));
     SET_RS_VALUE(render_state_changes_[GFXRS_ALPHATESTFUNC], AlphaTestFunc_);
     SET_RS_VALUE(render_state_changes_[GFXRS_ALPHATESTREF], AlphaTestRef_);
+  }
 #endif
-  }
 
   inline void GpuRenderStates::HW__EnableAlphaBlend(unsigned int b)
   {
@@ -1337,9 +1276,10 @@
   }
 #endif
 
+#ifndef NUX_OPENGLES_20
   inline void GpuRenderStates::HW__EnableLineSmooth(unsigned int EnableLineSmooth)
   {
-#ifndef NUX_OPENGLES_20
+
     if (EnableLineSmooth)
     {
       CHECKGL(glEnable(GL_LINE_SMOOTH));
@@ -1350,8 +1290,8 @@
     }
 
     SET_RS_VALUE(render_state_changes_[GFXRS_LINESMOOTHENABLE], EnableLineSmooth ? GL_TRUE : GL_FALSE);
+  }
 #endif
-  }
 
   inline void GpuRenderStates::HW__SetLineWidth(unsigned int width,  unsigned int Hint)
   {
@@ -1370,38 +1310,6 @@
 #endif
   }
 
-  inline void GpuRenderStates::HW__EnablePointSmooth(unsigned int EnablePointSmooth)
-  {
-#ifndef NUX_OPENGLES_20
-    if (EnablePointSmooth)
-    {
-      CHECKGL(glEnable(GL_POINT_SMOOTH));
-    }
-    else
-    {
-      CHECKGL(glDisable(GL_POINT_SMOOTH));
-    }
-
-    SET_RS_VALUE(render_state_changes_[GFXRS_POINTSMOOTHENABLE], EnablePointSmooth ? GL_TRUE : GL_FALSE);
-#endif
-  }
-
-  inline void GpuRenderStates::HW__SetPointSize(unsigned int size,  unsigned int Hint)
-  {
-#ifndef NUX_OPENGLES_20
-    nuxAssertMsg(
-      (Hint == GL_NICEST) ||
-      (Hint == GL_FASTEST) ||
-      (Hint == GL_DONT_CARE),
-      "Error(HW__SetPointSize): Invalid Point Hint RenderState");
-
-    CHECKGL(glPointSize(size));
-    CHECKGL(glHint(GL_POINT_SMOOTH_HINT, Hint);)
-    SET_RS_VALUE(render_state_changes_[GFXRS_POINTSIZE], size);
-    SET_RS_VALUE(render_state_changes_[GFXRS_POINTHINT], Hint);
-#endif
-  }
-
   inline void GpuRenderStates::HW__SetColorMask(
     unsigned int bRed,
     unsigned int bGreen,
@@ -1435,25 +1343,9 @@
     SET_RS_VALUE(render_state_changes_[GFXRS_SCISSORTESTENABLE], bScissor ? GL_TRUE : GL_FALSE);
   }
 
-  inline void GpuRenderStates::HW__EnableFog(unsigned int bFog)
-  {
 #ifndef NUX_OPENGLES_20
-    if (bFog)
-    {
-      CHECKGL(glEnable(GL_FOG));
-    }
-    else
-    {
-      CHECKGL(glDisable(GL_FOG));
-    }
-
-    SET_RS_VALUE(render_state_changes_[GFXRS_FOGENABLE], bFog ? GL_TRUE : GL_FALSE);
-#endif
-  }
-
   inline void GpuRenderStates::HW__SetPolygonMode(unsigned int FrontMode, unsigned int BackMode)
   {
-#ifndef NUX_OPENGLES_20
     nuxAssertMsg(
       (FrontMode == GL_FILL) ||
       (FrontMode == GL_LINE) ||
@@ -1471,30 +1363,8 @@
 
     SET_RS_VALUE(render_state_changes_[GFXRS_FRONT_POLYGONMODE], FrontMode);
     SET_RS_VALUE(render_state_changes_[GFXRS_BACK_POLYGONMODE], BackMode);
+  }
 #endif
-  }
-
-  inline void GpuRenderStates::HW__EnablePolygonOffset(unsigned int EnablePolygonOffset)
-  {
-    if (EnablePolygonOffset)
-    {
-      CHECKGL(glEnable(GL_POLYGON_OFFSET_FILL));
-    }
-    else
-    {
-      CHECKGL(glDisable(GL_POLYGON_OFFSET_FILL));
-    }
-
-    SET_RS_VALUE(render_state_changes_[GL_POLYGON_OFFSET_FILL], EnablePolygonOffset ? GL_TRUE : GL_FALSE);
-  }
-
-  inline void GpuRenderStates::HW__SetPolygonOffset(float Factor, float Units)
-  {
-    CHECKGL(glPolygonOffset(Factor, Units));
-
-    SET_RS_VALUE(render_state_changes_[GFXRS_POLYGONOFFSETFACTOR], static_cast<unsigned int> (Factor));
-    SET_RS_VALUE(render_state_changes_[GFXRS_POLYGONOFFSETUNITS], static_cast<unsigned int> (Units));
-  }
 
 #undef SET_RS_VALUE
 #undef RS_VALUE

=== modified file 'NuxGraphics/GLResource.h'
--- NuxGraphics/GLResource.h	2012-11-04 11:02:49 +0000
+++ NuxGraphics/GLResource.h	2012-11-05 17:50:27 +0000
@@ -92,17 +92,13 @@
     #include "EGL/egl.h"
     #include "GLES2/gl2.h"
     #include "GLES2/gl2ext.h"
-    // Explicitly include X11 headers as many EGL implementations don't
-    // do it for us.
-    #include <X11/Xlib.h>
-    #include <X11/Xutil.h>
   #else
     #ifndef GLEW_MX
       #define GLEW_MX
     #endif
     #include "GL/glew.h"
     #include "GL/glxew.h"
-    
+
     GLEWContext *glewGetContext();
     GLXEWContext *glxewGetContext();
 
@@ -112,6 +108,12 @@
     #endif
   #endif
 
+  #ifdef USE_X11
+    // Explicitly include X11 headers as many EGL implementations don't
+    // do it for us.
+    #include <X11/Xlib.h>
+    #include <X11/Xutil.h>
+  #endif
 #endif
 
 #include "RunTimeStats.h"

=== modified file 'NuxGraphics/GLSh_ColorPicker.cpp'
--- NuxGraphics/GLSh_ColorPicker.cpp	2012-10-10 22:46:50 +0000
+++ NuxGraphics/GLSh_ColorPicker.cpp	2012-11-05 17:50:27 +0000
@@ -252,7 +252,11 @@
   {
     const char* FrgShaderCode;
 
+#ifdef NUX_ARCH_ARM
+    if (GetGraphicsDisplay()->GetGraphicsEngine()->UsingGLSLCodePath())
+#else
     if (GetGraphicsDisplay()->GetGraphicsEngine()->UsingGLSLCodePath() && (GetGraphicsDisplay()->GetGpuDevice()->GetGPUBrand() != GPU_BRAND_INTEL))
+#endif
     {
       switch(color_channel)
       {
@@ -345,11 +349,12 @@
           break;
         }
       }
-
+#ifndef NUX_OPENGLES_20
       m_AsmProg = GetGraphicsDisplay()->GetGpuDevice()->CreateAsmShaderProgram();
       m_AsmProg->LoadVertexShader(AsmVtxShader);
       m_AsmProg->LoadPixelShader(FrgShaderCode);
       m_AsmProg->Link();
+#endif
     }
   }
 
@@ -357,7 +362,9 @@
   {
     GlobalPixelShader = ObjectPtr<IOpenGLPixelShader> (0);
     sprog.Release();
+#ifndef NUX_OPENGLES_20
     m_AsmProg.Release();
+#endif
   }
 
   void GLSh_ColorPicker::SetColor(float R, float G, float B, float A)
@@ -385,7 +392,11 @@
       fx + width,  fy,          0.0f, 1.0f,
     };
 
+#ifdef NUX_ARCH_ARM
+    if (GetGraphicsDisplay()->GetGraphicsEngine()->UsingGLSLCodePath())
+#else
     if (GetGraphicsDisplay()->GetGraphicsEngine()->UsingGLSLCodePath() && (GetGraphicsDisplay()->GetGpuDevice()->GetGPUBrand() != GPU_BRAND_INTEL))
+#endif
     {
       CHECKGL(glBindBufferARB(GL_ARRAY_BUFFER_ARB, 0));
       CHECKGL(glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0));

=== modified file 'NuxGraphics/GLSh_ColorPicker.h'
--- NuxGraphics/GLSh_ColorPicker.h	2011-10-19 20:32:38 +0000
+++ NuxGraphics/GLSh_ColorPicker.h	2012-11-05 17:50:27 +0000
@@ -46,7 +46,9 @@
 
     ObjectPtr<IOpenGLPixelShader> GlobalPixelShader;
     ObjectPtr<IOpenGLShaderProgram> sprog;
+#ifndef NUX_OPENGLES_20
     ObjectPtr<IOpenGLAsmShaderProgram> m_AsmProg;
+#endif
 
     UINT ViewPortX;
     UINT ViewPortY;

=== modified file 'NuxGraphics/GLSh_DrawFunction.cpp'
--- NuxGraphics/GLSh_DrawFunction.cpp	2012-10-10 22:46:50 +0000
+++ NuxGraphics/GLSh_DrawFunction.cpp	2012-11-05 17:50:27 +0000
@@ -111,10 +111,12 @@
     }
     else
     {
+#ifndef NUX_OPENGLES_20
       m_AsmProg = GetGraphicsDisplay()->GetGpuDevice()->CreateAsmShaderProgram();
       m_AsmProg->LoadVertexShader(AsmVtxShader.c_str());
       m_AsmProg->LoadPixelShader(AsmFrgShader.c_str());
       m_AsmProg->Link();
+#endif
     }
   }
 

=== modified file 'NuxGraphics/GLSh_DrawFunction.h'
--- NuxGraphics/GLSh_DrawFunction.h	2011-10-19 20:32:38 +0000
+++ NuxGraphics/GLSh_DrawFunction.h	2012-11-05 17:50:27 +0000
@@ -48,7 +48,9 @@
   private:
     Color background_color_;
     ObjectPtr<IOpenGLShaderProgram> sprog;
+#ifndef NUX_OPENGLES_20
     ObjectPtr<IOpenGLAsmShaderProgram> m_AsmProg;
+#endif
 
     float _ScreenOffsetX, _ScreenOffsetY;
     UINT ViewPortX;

=== modified file 'NuxGraphics/GLWindowManager.cpp'
--- NuxGraphics/GLWindowManager.cpp	2012-08-14 00:19:27 +0000
+++ NuxGraphics/GLWindowManager.cpp	2012-11-05 17:50:27 +0000
@@ -130,12 +130,12 @@
 
     return glwindow;
   }
-#elif defined(NUX_OS_LINUX)
-#ifdef NUX_OPENGLES_20
+#elif defined(USE_X11)
+#  ifdef NUX_OPENGLES_20
   GraphicsDisplay *DisplayAccessController::CreateFromForeignWindow(Display *X11Display, Window X11Window, EGLContext OpenGLContext)
-#else
+#  else
   GraphicsDisplay *DisplayAccessController::CreateFromForeignWindow(Display *X11Display, Window X11Window, GLXContext OpenGLContext)
-#endif
+#  endif
   {
     if (GetGraphicsDisplay())
     {
@@ -150,7 +150,7 @@
     return glwindow;
   }
 #endif
-}
+} // namespace nux
 
 #ifndef NUX_OPENGLES_20
 GLEWContext *glewGetContext()

=== modified file 'NuxGraphics/GLWindowManager.h'
--- NuxGraphics/GLWindowManager.h	2012-08-14 00:19:27 +0000
+++ NuxGraphics/GLWindowManager.h	2012-11-05 17:50:27 +0000
@@ -67,13 +67,15 @@
 #if defined(NUX_OS_WINDOWS)
     //! Create a GraphicsDisplay from a foreign window and display.
     GraphicsDisplay *CreateFromForeignWindow(HWND WindowHandle, HDC WindowDCHandle, HGLRC OpenGLRenderingContext);
-#elif defined(NUX_OS_LINUX)
+#elif defined(USE_X11)
     //! Create a GraphicsDisplay from a foreign window and display.
-#ifdef NUX_OPENGLES_20
+#  ifdef NUX_OPENGLES_20
     GraphicsDisplay *CreateFromForeignWindow(Display *X11Display, Window X11Window, EGLContext OpenGLContext);
-#else
+#  else
     GraphicsDisplay *CreateFromForeignWindow(Display *X11Display, Window X11Window, GLXContext OpenGLContext);
-#endif
+#  endif
+#elif defined(NO_X11)
+    GraphicsDisplay *CreateFromForeignWindow(EGLDisplay *disp, EGLContext OpenGLContext);
 #endif
 
     static DisplayAccessController &Instance();

=== modified file 'NuxGraphics/GpuDevice.cpp'
--- NuxGraphics/GpuDevice.cpp	2012-10-10 22:46:50 +0000
+++ NuxGraphics/GpuDevice.cpp	2012-11-05 17:50:27 +0000
@@ -187,6 +187,12 @@
   STREAMSOURCE GpuDevice::_StreamSource[MAX_NUM_STREAM];
 
   GpuInfo::GpuInfo()
+  : _opengl_max_texture_size(0)
+  , _opengl_max_texture_units(0)
+  , _opengl_max_texture_coords(0)
+  , _opengl_max_texture_image_units(0)
+  , _opengl_max_fb_attachment(0)
+  , _opengl_max_vertex_attributes(0)
   {
     _support_opengl_version_11 = false;
     _support_opengl_version_12 = false;
@@ -229,6 +235,12 @@
     CHECKGL(glGetIntegerv(GL_MAX_VERTEX_ATTRIBS, &_opengl_max_vertex_attributes));
     CHECKGL(glGetIntegerv(GL_MAX_COLOR_ATTACHMENTS_EXT, &_opengl_max_fb_attachment));
 #else
+    // By opengl es 2.0 standard, GL_MAX_TEXTURE_SIZE should return a minimum of 64.
+    CHECKGL(glGetIntegerv(GL_MAX_TEXTURE_SIZE, &_opengl_max_texture_size));
+    // GL_MAX_TEXTURE_UNITS is not supported under opengl es 2.0.
+    // GL_MAX_TEXTURE_IMAGE_UNITS is supported under opengl es 2.0.
+    CHECKGL(glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &_opengl_max_texture_image_units));
+    // GL_MAX_COLOR_ATTACHMENTS_EXT is not supported under opengl es 2.0.
     _opengl_max_fb_attachment = 1;
 #endif
 
@@ -284,8 +296,8 @@
     int req_opengl_major,
     int req_opengl_minor,
     bool opengl_es_20)
-#elif defined(NUX_OS_LINUX)
-#ifdef NUX_OPENGLES_20
+#elif defined(USE_X11)
+#  ifdef NUX_OPENGLES_20
   GpuDevice::GpuDevice(unsigned int DeviceWidth, unsigned int DeviceHeight, BitmapFormat DeviceFormat,
     Display *display,
     Window window,
@@ -295,7 +307,7 @@
     int req_opengl_major,
     int req_opengl_minor,
     bool opengl_es_20)
-#else
+#  else
   GpuDevice::GpuDevice(unsigned int /* DeviceWidth */, unsigned int /* DeviceHeight */, BitmapFormat /* DeviceFormat */,
     Display *display,
     Window window,
@@ -305,7 +317,14 @@
     int req_opengl_major,
     int req_opengl_minor,
     bool opengl_es_20)
-#endif
+#  endif
+#elif defined(NO_X11)
+  GpuDevice::GpuDevice(unsigned int DeviceWidth, unsigned int DeviceHeight, BitmapFormat DeviceFormat,
+    EGLDisplay display,
+    EGLConfig fb_config,
+    EGLContext &opengl_rendering_context,
+    int req_opengl_major,
+    int req_opengl_minor)
 #endif
     : opengl_major_(0)
     , opengl_minor_(0)
@@ -416,11 +435,13 @@
 #if defined(NUX_OS_WINDOWS)
     bool opengl_es_context_created = false;
     if (((opengl_major_ >= 3) && (req_opengl_major >= 3)) || (opengl_major_ >= 3) || opengl_es_20)
-#elif defined(NUX_OS_LINUX)
+#elif defined(USE_X11) // Should this be GLES check?
     //bool opengl_es_context_created = false;
     if (has_glx_13_support &&
     (((opengl_major_ >= 3) && (req_opengl_major >= 3)) ||
     ((opengl_major_ >= 3) && opengl_es_20)))
+#elif defined(NO_X11)
+    if (((opengl_major_ >= 3) && (req_opengl_major >= 3)) || (opengl_major_ >= 3))
 #endif
     {
       // Create a new Opengl Rendering Context
@@ -455,6 +476,7 @@
         }
       }
 
+#if !defined(NO_X11)
       if (opengl_es_20)
       {
 #if defined(NUX_OS_WINDOWS)
@@ -503,14 +525,16 @@
         }*/
 #endif
       }
-      else if (requested_profile_is_supported)
+      else
+#endif
+      if (requested_profile_is_supported)
       {
+#if defined(NUX_OS_WINDOWS)
         int profile_mask = 0;
         int profile_value = 0;
         int flag_mask = 0;
         int flag_value = 0;
 
-#if defined(NUX_OS_WINDOWS)
         if (((req_opengl_major == 3) && (req_opengl_minor >= 3)) || (req_opengl_major >= 4))
         {
           profile_mask = WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB;
@@ -542,6 +566,11 @@
           wglMakeCurrent(device_context, opengl_rendering_context);
         }
 #elif defined(NUX_OS_LINUX) && !defined(NUX_OPENGLES_20)
+        int profile_mask = 0;
+        int profile_value = 0;
+        int flag_mask = 0;
+        int flag_value = 0;
+
         if (((req_opengl_major == 3) && (req_opengl_minor >= 3)) || (req_opengl_major >= 4))
         {
           profile_mask  = GLX_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB;

=== modified file 'NuxGraphics/GpuDevice.h'
--- NuxGraphics/GpuDevice.h	2012-10-25 07:13:47 +0000
+++ NuxGraphics/GpuDevice.h	2012-11-05 17:50:27 +0000
@@ -243,9 +243,12 @@
     ObjectPtr<IOpenGLShaderProgram> CreateShaderProgram();
     ObjectPtr<IOpenGLVertexShader> CreateVertexShader();
     ObjectPtr<IOpenGLPixelShader> CreatePixelShader();
+
+#ifndef NUX_OPENGLES_20    
     ObjectPtr<IOpenGLAsmShaderProgram> CreateAsmShaderProgram();
     ObjectPtr<IOpenGLAsmVertexShader> CreateAsmVertexShader();
     ObjectPtr<IOpenGLAsmPixelShader> CreateAsmPixelShader();
+#endif
 
 #if (NUX_ENABLE_CG_SHADERS)
     ObjectPtr<ICgVertexShader> CreateCGVertexShader();
@@ -439,7 +442,7 @@
       int req_opengl_minor = 0,   // requested opengl minor version.
       bool opengl_es_20 = false);
 
-#elif defined(NUX_OS_LINUX)
+#elif defined(USE_X11)
     #ifdef NUX_OPENGLES_20
         GpuDevice(unsigned int DeviceWidth, unsigned int DeviceHeight,
           BitmapFormat DeviceFormat,
@@ -463,6 +466,14 @@
           int req_opengl_minor = 0,   // requested opengl minor version.
           bool opengl_es_20 = false);
     #endif
+#elif defined(NO_X11)
+    GpuDevice(unsigned int DeviceWidth, unsigned int DeviceHeight, BitmapFormat DeviceFormat,
+      EGLDisplay display,
+      EGLConfig fb_config,
+      EGLContext &opengl_rendering_context,
+      int req_opengl_major,
+      int req_opengl_minor);
+
 #endif
     ~GpuDevice();
     friend class IOpenGLSurface;

=== modified file 'NuxGraphics/GpuDeviceShader.cpp'
--- NuxGraphics/GpuDeviceShader.cpp	2012-09-24 09:04:26 +0000
+++ NuxGraphics/GpuDeviceShader.cpp	2012-11-05 17:50:27 +0000
@@ -54,6 +54,7 @@
     return result;
   }
 
+#ifndef NUX_OPENGLES_20
   ObjectPtr<IOpenGLAsmShaderProgram> GpuDevice::CreateAsmShaderProgram()
   {
     ObjectPtr<IOpenGLAsmShaderProgram> result;
@@ -74,6 +75,7 @@
     result.Adopt(new IOpenGLAsmPixelShader());
     return result;
   }
+#endif
 
 #if (NUX_ENABLE_CG_SHADERS)
 

=== modified file 'NuxGraphics/GraphicsDisplay.h'
--- NuxGraphics/GraphicsDisplay.h	2011-10-19 20:32:38 +0000
+++ NuxGraphics/GraphicsDisplay.h	2012-11-05 17:50:27 +0000
@@ -25,7 +25,7 @@
 
 #if defined(NUX_OS_WINDOWS)
   #include "GraphicsDisplayWin.h"
-#elif defined(NUX_OS_LINUX)
+#elif defined(USE_X11)
   #include "GraphicsDisplayX11.h"
 #else
   #error "GraphicsDisplay.h" is not implemented for this platform.

=== modified file 'NuxGraphics/GraphicsDisplayX11.cpp'
--- NuxGraphics/GraphicsDisplayX11.cpp	2012-10-10 22:46:50 +0000
+++ NuxGraphics/GraphicsDisplayX11.cpp	2012-11-05 17:50:27 +0000
@@ -36,6 +36,7 @@
 #include <X11/extensions/shape.h>
 #include <X11/XKBlib.h>
 
+
 namespace nux
 {
   int GraphicsDisplay::double_click_time_delay = 400; // milliseconds
@@ -183,7 +184,17 @@
     return(event->type == MapNotify) && (event->xmap.window == (Window) arg);
   }
 
-// TODO: change windowWidth, windowHeight, to window_size;
+  void GraphicsDisplay::XICFocus()
+  {
+    m_xim_controller->FocusInXIC();
+  }
+
+  void GraphicsDisplay::XICUnFocus()
+  {
+    m_xim_controller->FocusOutXIC();
+  }
+
+  // TODO: change windowWidth, windowHeight, to window_size;
   static NCriticalSection CreateOpenGLWindow_CriticalSection;
   bool GraphicsDisplay::CreateOpenGLWindow(const char* window_title,
                                          unsigned int WindowWidth,
@@ -568,6 +579,16 @@
       //XMapRaised(m_X11Display, m_X11Window);
     }
 
+    m_xim_controller.reset(new XIMController(m_X11Display));
+    m_xim_controller->SetFocusedWindow(m_X11Window);
+
+    if (m_xim_controller->IsXICValid())
+    {
+      long im_event_mask=0;
+      XGetICValues(m_xim_controller->GetXIC(), XNFilterEvents, &im_event_mask, NULL);
+      m_X11Attr.event_mask |= im_event_mask;
+    }
+
 #ifndef NUX_OPENGLES_20
     if (_has_glx_13)
     {
@@ -672,6 +693,8 @@
 
     gfx_interface_created_ = true;
 
+    m_xim_controller.reset(new XIMController(m_X11Display));
+
     // m_DeviceFactory = new GpuDevice(viewport_size_.GetWidth(), viewport_size_.GetHeight(), BITFMT_R8G8B8A8);
     m_DeviceFactory = new GpuDevice(viewport_size_.width, viewport_size_.height, BITFMT_R8G8B8A8,
         m_X11Display,
@@ -699,6 +722,11 @@
     return m_DeviceFactory;
   }
 
+  void GraphicsDisplay::SetFocusedWindowForXIMController(Window window)
+  {
+    m_xim_controller->SetFocusedWindow(window);
+  }
+
   int GraphicsDisplay::GetGlXMajor() const
   {
     return _glx_major;
@@ -1231,6 +1259,9 @@
       bool bProcessEvent = true;
       XNextEvent(m_X11Display, &xevent);
 
+      if (XFilterEvent(&xevent, None) == True)
+        return true;
+
       if (!_event_filters.empty())
       {
         for (auto filter : _event_filters)
@@ -1540,6 +1571,8 @@
         m_pEvent->dy = 0;
         m_pEvent->virtual_code = 0;
         //nuxDebugMsg("[GraphicsDisplay::ProcessXEvents]: FocusIn event.");
+
+        m_xim_controller->FocusInXIC();
         break;
       }
 
@@ -1555,6 +1588,8 @@
         m_pEvent->dy = 0;
         m_pEvent->virtual_code = 0;
         //nuxDebugMsg("[GraphicsDisplay::ProcessXEvents]: FocusOut event.");
+
+        m_xim_controller->FocusOutXIC();
         break;
       }
 
@@ -1585,7 +1620,15 @@
          skip = true;
         }
 
-        int num_char_stored = XLookupString(&xevent.xkey, buffer, NUX_EVENT_TEXT_BUFFER_SIZE, (KeySym*) &m_pEvent->x11_keysym, NULL);
+        int num_char_stored = 0;
+        if (m_xim_controller->IsXICValid())
+        {
+          num_char_stored = XmbLookupString(m_xim_controller->GetXIC(), &xevent.xkey, buffer, NUX_EVENT_TEXT_BUFFER_SIZE, (KeySym*) &m_pEvent->x11_keysym, NULL);
+        }
+        else
+        {
+          num_char_stored = XLookupString(&xevent.xkey, buffer, NUX_EVENT_TEXT_BUFFER_SIZE, (KeySym*) &m_pEvent->x11_keysym, NULL);
+        }
         if (num_char_stored && (!skip))
         {
           Memcpy(m_pEvent->text, buffer, num_char_stored);

=== modified file 'NuxGraphics/GraphicsDisplayX11.h'
--- NuxGraphics/GraphicsDisplayX11.h	2012-10-10 22:46:50 +0000
+++ NuxGraphics/GraphicsDisplayX11.h	2012-11-05 17:50:27 +0000
@@ -27,6 +27,7 @@
 #include "GLTimer.h"
 #include "GLDeviceObjects.h"
 #include "GLRenderStates.h"
+#include "XIMController.h"
 
 /* Xlib.h is the default header that is included and has the core functionallity */
 #include <X11/Xlib.h>
@@ -35,10 +36,11 @@
 /* keysym.h contains keysymbols which we use to resolv what keys that are being pressed */
 #include <X11/keysym.h>
 
-
 #include <X11/extensions/xf86vmode.h>
 #include <X11/extensions/Xinerama.h>
 
+#include <boost/shared_ptr.hpp>
+
 namespace nux
 {
 
@@ -85,6 +87,8 @@
     Window      m_X11Window;
     XVisualInfo *m_X11VisualInfo;
 
+    boost::shared_ptr<XIMController> m_xim_controller;
+
     int         parent_window_;
 #ifndef NUX_OPENGLES_20
     GLXContext  m_GLCtx;
@@ -284,6 +288,8 @@
 
     GpuDevice* GetGpuDevice() const;
 
+    void SetFocusedWindowForXIMController(Window window);
+
     // Dialog
     /*bool StartOpenFileDialog(FileDialogOption& fdo);
     bool StartSaveFileDialog(FileDialogOption& fdo);
@@ -343,6 +349,8 @@
 
     void * KeyboardGrabData() { return _global_keyboard_grab_data; }
     void * PointerGrabData() { return _global_pointer_grab_data; }
+    void XICFocus();
+    void XICUnFocus();
 
   private:
     void InitGlobalGrabWindow();

=== modified file 'NuxGraphics/GraphicsEngine.cpp'
--- NuxGraphics/GraphicsEngine.cpp	2012-10-10 22:46:50 +0000
+++ NuxGraphics/GraphicsEngine.cpp	2012-11-05 17:50:27 +0000
@@ -195,19 +195,18 @@
     SetScissor(0, 0, _graphics_display.GetWindowWidth(), _graphics_display.GetWindowHeight());
     EnableScissoring(true);
 
-
-    bool opengl_14_support = true;
-
-    if ((_graphics_display.GetGpuDevice()->GetOpenGLMajorVersion() == 1) &&
-      (_graphics_display.GetGpuDevice()->GetOpenGLMinorVersion() < 4))
-    {
-      // OpenGL version is less than OpenGL 1.4
-      opengl_14_support = false;
-    }
-
     if (create_rendering_data)
     {
 #ifndef NUX_OPENGLES_20
+      bool opengl_14_support = true;
+
+      if ((_graphics_display.GetGpuDevice()->GetOpenGLMajorVersion() == 1) &&
+        (_graphics_display.GetGpuDevice()->GetOpenGLMinorVersion() < 4))
+      {
+        // OpenGL version is less than OpenGL 1.4
+        opengl_14_support = false;
+      }
+            
       if (_graphics_display.GetGpuDevice()->GetGpuInfo().Support_ARB_Fragment_Shader() &&
         _graphics_display.GetGpuDevice()->GetGpuInfo().Support_ARB_Vertex_Program() &&
         opengl_14_support)
@@ -245,6 +244,9 @@
       _offscreen_color_rt1  = _graphics_display.GetGpuDevice()->CreateTexture(2, 2, 1, BITFMT_R8G8B8A8, NUX_TRACKER_LOCATION);
       _offscreen_color_rt2  = _graphics_display.GetGpuDevice()->CreateTexture(2, 2, 1, BITFMT_R8G8B8A8, NUX_TRACKER_LOCATION);
       _offscreen_color_rt3  = _graphics_display.GetGpuDevice()->CreateTexture(2, 2, 1, BITFMT_R8G8B8A8, NUX_TRACKER_LOCATION);
+
+      _offscreen_depth_rt0  = _graphics_display.GetGpuDevice()->CreateTexture(2, 2, 1, BITFMT_D24S8, NUX_TRACKER_LOCATION);
+      _offscreen_depth_rt1  = _graphics_display.GetGpuDevice()->CreateTexture(2, 2, 1, BITFMT_D24S8, NUX_TRACKER_LOCATION);
     }
   }
 
@@ -1313,7 +1315,7 @@
     if ((depthbuffer.IsValid()) && ((depthbuffer->GetWidth() != width) || (depthbuffer->GetHeight() != height)))
     {
       // Generate a new depth texture only if a valid one was passed to this function.
-      depthbuffer = _graphics_display.GetGpuDevice()->CreateTexture(width, height, 1, BITFMT_D24S8, NUX_TRACKER_LOCATION);
+      depthbuffer = _graphics_display.GetGpuDevice()->CreateTexture(width, height, 1, BITFMT_D24S8, NUX_TRACKER_LOCATION);      
     }
 
     fbo->FormatFrameBufferObject(width, height, BITFMT_R8G8B8A8);

=== modified file 'NuxGraphics/GraphicsEngine.h'
--- NuxGraphics/GraphicsEngine.h	2012-10-12 03:42:26 +0000
+++ NuxGraphics/GraphicsEngine.h	2012-11-05 17:50:27 +0000
@@ -275,6 +275,7 @@
       ObjectPtr<IOpenGLBaseTexture>& src_device_texture,
       TexCoordXForm& texxform0, const Color& c0);
 
+#ifndef NUX_OPENGLES_20
     // ASM
     void QRP_ASM_1Tex(int x, int y, int width, int height, ObjectPtr<IOpenGLBaseTexture> Tex0, TexCoordXForm& texxform, const Color& color0);
     void QRP_ASM_1TexPremultiply(int x, int y, int width, int height, ObjectPtr<IOpenGLBaseTexture> Tex0, TexCoordXForm& texxform, const Color& color0);
@@ -393,7 +394,7 @@
       ObjectPtr<IOpenGLBaseTexture>& dst_device_texture,
       ObjectPtr<IOpenGLBaseTexture>& src_device_texture,
       TexCoordXForm& texxform0, const Color& c0);
-
+#endif
     // GLSL
 
     void QRP_GLSL_1Tex(int x, int y, int width, int height, ObjectPtr<IOpenGLBaseTexture> DeviceTexture, TexCoordXForm& texxform, const Color& c0);

=== modified file 'NuxGraphics/IOpenGLSurface.cpp'
--- NuxGraphics/IOpenGLSurface.cpp	2012-10-10 06:25:39 +0000
+++ NuxGraphics/IOpenGLSurface.cpp	2012-11-05 17:50:27 +0000
@@ -518,16 +518,17 @@
     // Because we use SubImage when unlocking surfaces, we must first get some dummy data in the surface before we can make a lock.
     int texwidth = ImageSurface::GetLevelWidth(_BaseTexture->_PixelFormat, _BaseTexture->_Width, _SMipLevel);
     int texheight = ImageSurface::GetLevelHeight(_BaseTexture->_PixelFormat, _BaseTexture->_Height, _SMipLevel);
-    int size = ImageSurface::GetLevelSize(_BaseTexture->_PixelFormat, _BaseTexture->_Width, _BaseTexture->_Height, _SMipLevel);
     int MemAlignment = ImageSurface::GetMemAlignment(_BaseTexture->_PixelFormat);
 
     nuxAssert( texwidth > 0 ); // Should never happen
     nuxAssert( texheight > 0 ); // Should never happen
+
+    CHECKGL(glPixelStorei(GL_UNPACK_ALIGNMENT, MemAlignment));
+
+#ifndef NUX_OPENGLES_20
+    int size = ImageSurface::GetLevelSize(_BaseTexture->_PixelFormat, _BaseTexture->_Width, _BaseTexture->_Height, _SMipLevel);
     nuxAssert( size > 0 ); // Should never happen
 
-    CHECKGL(glPixelStorei(GL_UNPACK_ALIGNMENT, MemAlignment));
-
-#ifndef NUX_OPENGLES_20
     if ( _BaseTexture->_PixelFormat == BITFMT_DXT1 ||
          _BaseTexture->_PixelFormat == BITFMT_DXT2 ||
          _BaseTexture->_PixelFormat == BITFMT_DXT3 ||

=== modified file 'NuxGraphics/Makefile.am'
--- NuxGraphics/Makefile.am	2012-07-27 19:40:40 +0000
+++ NuxGraphics/Makefile.am	2012-11-05 17:50:27 +0000
@@ -1,4 +1,4 @@
-CLEANFILES = 
+CLEANFILES =
 DISTCLEANFILES =
 EXTRA_DIST = $(srcdir)/GraphicsDisplayWin.cpp \
              $(srcdir)/GraphicsDisplayWin.h
@@ -34,7 +34,6 @@
   $(srcdir)/FontTexture.h \
   $(srcdir)/FontRenderer.h \
   $(srcdir)/GdkGraphics.h \
-  $(srcdir)/GraphicsDisplayX11.h \
   $(srcdir)/Gfx_Interface.h \
   $(srcdir)/GLDeviceFrameBufferObject.h \
   $(srcdir)/GLDeviceObjects.h \
@@ -63,7 +62,6 @@
   $(srcdir)/MeshFileLoader-OBJ.h \
   $(srcdir)/ImageSurface.h \
   $(srcdir)/IOpenGLAnimatedTexture.h \
-  $(srcdir)/IOpenGLAsmShader.h \
   $(srcdir)/IOpenGLBaseTexture.h \
   $(srcdir)/IOpenGLCubeTexture.h \
   $(srcdir)/IOpenGLFrameBufferObject.h \
@@ -85,12 +83,24 @@
   $(srcdir)/OpenGLDefinitions.h \
   $(srcdir)/OpenGLMapping.h \
   $(srcdir)/RenderingPipe.h \
-  $(srcdir)/RenderingPipeAsm.h \
   $(srcdir)/RenderingPipeGLSL.h \
   $(srcdir)/RenderingPipeTextureBlendShaderSource.h \
-  $(srcdir)/RunTimeStats.h \
+  $(srcdir)/RunTimeStats.h
+
+if USE_X11
+source_h += \
+  $(srcdir)/GraphicsDisplayX11.h \
   $(srcdir)/VirtualKeyCodesX11.h \
-  $(srcdir)/XInputWindow.h
+  $(srcdir)/XInputWindow.h \
+  $(srcdir)/XICClient.h \
+  $(srcdir)/XIMController.h
+endif
+
+if !NUX_OPENGLES_20
+source_h += \
+  $(srcdir)/IOpenGLAsmShader.h \
+  $(srcdir)/RenderingPipeAsm.h
+endif
 
 if HAVE_GEIS
 source_h += \
@@ -127,13 +137,11 @@
   $(srcdir)/GpuDeviceShader.cpp \
   $(srcdir)/GpuDeviceTexture.cpp \
   $(srcdir)/GpuDeviceVertex.cpp \
-  $(srcdir)/GraphicsDisplayX11.cpp \
   $(srcdir)/GraphicsEngine.cpp \
   $(srcdir)/MeshData.cpp \
   $(srcdir)/MeshFileLoader-OBJ.cpp \
   $(srcdir)/ImageSurface.cpp \
   $(srcdir)/IOpenGLAnimatedTexture.cpp \
-  $(srcdir)/IOpenGLAsmShader.cpp \
   $(srcdir)/IOpenGLBaseTexture.cpp \
   $(srcdir)/IOpenGLCubeTexture.cpp \
   $(srcdir)/IOpenGLFrameBufferObject.cpp \
@@ -152,18 +160,31 @@
   $(srcdir)/NuxGraphicsObject.cpp \
   $(srcdir)/NuxGraphicsResources.cpp \
   $(srcdir)/RenderingPipe.cpp \
-  $(srcdir)/RenderingPipeAsm.cpp \
   $(srcdir)/RenderingPipeGLSL.cpp \
   $(srcdir)/RenderingPipeTextureBlend.cpp \
   $(srcdir)/GLRenderingAPI.cpp \
-  $(srcdir)/RunTimeStats.cpp \
-  $(srcdir)/XInputWindow.cpp
+  $(srcdir)/RunTimeStats.cpp
+
+if USE_X11
+source_cpp += \
+  $(srcdir)/GraphicsDisplayX11.cpp \
+  $(srcdir)/XInputWindow.cpp \
+  $(srcdir)/XICClient.cpp \
+  $(srcdir)/XIMController.cpp
+endif
+
+if !NUX_OPENGLES_20
+source_cpp += \
+  $(srcdir)/IOpenGLAsmShader.cpp \
+  $(srcdir)/RenderingPipeAsm.cpp
+endif
 
 if HAVE_GEIS
 source_cpp += \
   $(srcdir)/GestureEvent.cpp
 endif
 
+
 libnux_graphics_@NUX_API_VERSION@_la_SOURCES = \
   $(source_cpp) \
   $(source_h)

=== modified file 'NuxGraphics/RenderingPipeGLSL.cpp'
--- NuxGraphics/RenderingPipeGLSL.cpp	2012-10-10 22:46:50 +0000
+++ NuxGraphics/RenderingPipeGLSL.cpp	2012-11-05 17:50:27 +0000
@@ -489,139 +489,6 @@
     _alpha_replicate_prog->Link();
   }
 
-  void GraphicsEngine::InitSLHorizontalGaussFilter()
-  {
-    ObjectPtr<IOpenGLVertexShader> VS = _graphics_display.m_DeviceFactory->CreateVertexShader();
-    ObjectPtr<IOpenGLPixelShader> PS = _graphics_display.m_DeviceFactory->CreatePixelShader();
-
-    const char* VSString = NUX_VERTEX_SHADER_HEADER
-        "uniform mat4 ViewProjectionMatrix;  \n\
-        attribute vec4 AVertex;             \n\
-        attribute vec4 MyTextureCoord0;     \n\
-        attribute vec4 VertexColor;         \n\
-        varying vec4 varyTexCoord0;         \n\
-        varying vec4 varyVertexColor;       \n\
-        void main()                         \n\
-        {                                   \n\
-          varyTexCoord0 = MyTextureCoord0;  \n\
-          varyVertexColor = VertexColor;    \n\
-          gl_Position =  ViewProjectionMatrix * (AVertex);  \n\
-        }";
-
-
-    const char* PSString = NUX_FRAGMENT_SHADER_HEADER
-        "varying vec4 varyTexCoord0;                                   \n\
-        varying vec4 varyVertexColor;                                 \n\
-        uniform sampler2D TextureObject0;                             \n\
-        uniform vec2 TextureSize0;                                    \n\
-        vec4 SampleTexture(sampler2D TexObject, vec2 TexCoord)        \n\
-        {                                                             \n\
-          return texture2D(TexObject, TexCoord.st);                   \n\
-        }                                                             \n\
-        #define NUM_SAMPLES 7                                         \n\
-        uniform float W[NUM_SAMPLES];                                 \n\
-        void main()                                                   \n\
-        {                                                             \n\
-          vec4 sum   = vec4(0.0, 0.0, 0.0, 0.0);                     \n\
-          vec2 delta = vec2(1.0 / TextureSize0.x, 0.0);              \n\
-          vec2 texCoord = vec2(varyTexCoord0.s, varyTexCoord0.t);    \n\
-          texCoord.x -= float((NUM_SAMPLES - 1) / 2) / TextureSize0.x; \n\
-          texCoord.y += 0.0 / TextureSize0.y;                         \n\
-          sum += SampleTexture(TextureObject0, texCoord) * W[0];     \n\
-          texCoord += delta;                                          \n\
-          sum += SampleTexture(TextureObject0, texCoord) * W[1];     \n\
-          texCoord += delta;                                          \n\
-          sum += SampleTexture(TextureObject0, texCoord) * W[2];     \n\
-          texCoord += delta;                                          \n\
-          sum += SampleTexture(TextureObject0, texCoord) * W[3];     \n\
-          texCoord += delta;                                          \n\
-          sum += SampleTexture(TextureObject0, texCoord) * W[4];     \n\
-          texCoord += delta;                                          \n\
-          sum += SampleTexture(TextureObject0, texCoord) * W[5];     \n\
-          texCoord += delta;                                          \n\
-          sum += SampleTexture(TextureObject0, texCoord) * W[6];     \n\
-          texCoord += delta;                                          \n\
-          gl_FragColor = vec4(sum.x, sum.y, sum.z, sum.w);           \n\
-        }";
-
-    _horizontal_gauss_filter_prog = _graphics_display.m_DeviceFactory->CreateShaderProgram();
-    VS->SetShaderCode(TCHAR_TO_ANSI(VSString));
-    PS->SetShaderCode(TCHAR_TO_ANSI(PSString), "#define SAMPLERTEX2D");
-
-    _horizontal_gauss_filter_prog->ClearShaderObjects();
-    _horizontal_gauss_filter_prog->AddShaderObject(VS);
-    _horizontal_gauss_filter_prog->AddShaderObject(PS);
-    CHECKGL(glBindAttribLocation(_horizontal_gauss_filter_prog->GetOpenGLID(), 0, "AVertex"));
-    _horizontal_gauss_filter_prog->Link();
-
-  }
-  
-  void GraphicsEngine::InitSLVerticalGaussFilter()
-  {
-    ObjectPtr<IOpenGLVertexShader> VS = _graphics_display.m_DeviceFactory->CreateVertexShader();
-    ObjectPtr<IOpenGLPixelShader> PS = _graphics_display.m_DeviceFactory->CreatePixelShader();
-
-    const char* VSString = NUX_VERTEX_SHADER_HEADER
-        "uniform mat4 ViewProjectionMatrix;  \n\
-        attribute vec4 AVertex;             \n\
-        attribute vec4 MyTextureCoord0;     \n\
-        attribute vec4 VertexColor;         \n\
-        varying vec4 varyTexCoord0;         \n\
-        varying vec4 varyVertexColor;       \n\
-        void main()                         \n\
-        {                                   \n\
-          varyTexCoord0 = MyTextureCoord0;  \n\
-          varyVertexColor = VertexColor;    \n\
-          gl_Position =  ViewProjectionMatrix * (AVertex);  \n\
-        }";
-
-
-    const char* PSString = NUX_FRAGMENT_SHADER_HEADER
-        "varying vec4 varyTexCoord0;                                   \n\
-        varying vec4 varyVertexColor;                                 \n\
-        uniform sampler2D TextureObject0;                             \n\
-        uniform vec2 TextureSize0;                                    \n\
-        vec4 SampleTexture(sampler2D TexObject, vec2 TexCoord)       \n\
-        {                                                             \n\
-          return texture2D(TexObject, TexCoord.st);                  \n\
-        }                                                             \n\
-        #define NUM_SAMPLES 7                                         \n\
-        uniform float W [NUM_SAMPLES];                                \n\
-        void main()                                                  \n\
-        {                                                             \n\
-          vec4 sum   = vec4(0.0, 0.0, 0.0, 0.0);                     \n\
-          vec2 delta = vec2(0.0, 1.0 / TextureSize0.y);              \n\
-          vec2 texCoord = vec2(varyTexCoord0.s, varyTexCoord0.t);    \n\
-          texCoord.x += 0.0 / TextureSize0.x;                         \n\
-          texCoord.y -= float((NUM_SAMPLES - 1) / 2) / TextureSize0.y;     \n\
-          sum += SampleTexture(TextureObject0, texCoord) * W[0];     \n\
-          texCoord += delta;                                          \n\
-          sum += SampleTexture(TextureObject0, texCoord) * W[1];     \n\
-          texCoord += delta;                                          \n\
-          sum += SampleTexture(TextureObject0, texCoord) * W[2];     \n\
-          texCoord += delta;                                          \n\
-          sum += SampleTexture(TextureObject0, texCoord) * W[3];     \n\
-          texCoord += delta;                                          \n\
-          sum += SampleTexture(TextureObject0, texCoord) * W[4];     \n\
-          texCoord += delta;                                          \n\
-          sum += SampleTexture(TextureObject0, texCoord) * W[5];     \n\
-          texCoord += delta;                                          \n\
-          sum += SampleTexture(TextureObject0, texCoord) * W[6];     \n\
-          texCoord += delta;                                          \n\
-          gl_FragColor = vec4(sum.x, sum.y, sum.z, sum.w);           \n\
-        }";
-
-    _vertical_gauss_filter_prog = _graphics_display.m_DeviceFactory->CreateShaderProgram();
-    VS->SetShaderCode(TCHAR_TO_ANSI(VSString));
-    PS->SetShaderCode(TCHAR_TO_ANSI(PSString), "#define SAMPLERTEX2D");
-
-    _vertical_gauss_filter_prog->ClearShaderObjects();
-    _vertical_gauss_filter_prog->AddShaderObject(VS);
-    _vertical_gauss_filter_prog->AddShaderObject(PS);
-    CHECKGL(glBindAttribLocation(_vertical_gauss_filter_prog->GetOpenGLID(), 0, "AVertex"));
-    _vertical_gauss_filter_prog->Link();
-  }
-  
   void GraphicsEngine::InitSLHorizontalHQGaussFilter(int sigma)
   {
     int k = Clamp<int>(sigma, NUX_MIN_GAUSSIAN_SIGMA, NUX_MAX_GAUSSIAN_SIGMA);
@@ -1691,6 +1558,69 @@
     ShaderProg->End();
   }
 
+  void GraphicsEngine::InitSLHorizontalGaussFilter()
+  {
+    ObjectPtr<IOpenGLVertexShader> VS = _graphics_display.m_DeviceFactory->CreateVertexShader();
+    ObjectPtr<IOpenGLPixelShader> PS = _graphics_display.m_DeviceFactory->CreatePixelShader();
+
+    const char* VSString = NUX_VERTEX_SHADER_HEADER
+        "uniform mat4 ViewProjectionMatrix;  \n\
+        attribute vec4 AVertex;             \n\
+        attribute vec4 MyTextureCoord0;     \n\
+        varying vec4 varyTexCoord0;         \n\
+        void main()                         \n\
+        {                                   \n\
+          varyTexCoord0 = MyTextureCoord0;  \n\
+          gl_Position =  ViewProjectionMatrix * (AVertex);  \n\
+        }";
+
+
+    const char* PSString = NUX_FRAGMENT_SHADER_HEADER
+        "varying vec4 varyTexCoord0;                                   \n\
+        uniform sampler2D TextureObject0;                             \n\
+        uniform vec2 TextureSize0;                                    \n\
+        vec4 SampleTexture(sampler2D TexObject, vec2 TexCoord)        \n\
+        {                                                             \n\
+          return texture2D(TexObject, TexCoord.st);                   \n\
+        }                                                             \n\
+        #define NUM_SAMPLES 7                                         \n\
+        uniform float W[NUM_SAMPLES];                                 \n\
+        void main()                                                   \n\
+        {                                                             \n\
+          vec4 sum   = vec4(0.0, 0.0, 0.0, 0.0);                     \n\
+          vec2 delta = vec2(1.0 / TextureSize0.x, 0.0);              \n\
+          vec2 texCoord = vec2(varyTexCoord0.s, varyTexCoord0.t);    \n\
+          texCoord.x -= float((NUM_SAMPLES - 1) / 2) / TextureSize0.x; \n\
+          texCoord.y += 0.0 / TextureSize0.y;                         \n\
+          sum += SampleTexture(TextureObject0, texCoord) * W[0];     \n\
+          texCoord += delta;                                          \n\
+          sum += SampleTexture(TextureObject0, texCoord) * W[1];     \n\
+          texCoord += delta;                                          \n\
+          sum += SampleTexture(TextureObject0, texCoord) * W[2];     \n\
+          texCoord += delta;                                          \n\
+          sum += SampleTexture(TextureObject0, texCoord) * W[3];     \n\
+          texCoord += delta;                                          \n\
+          sum += SampleTexture(TextureObject0, texCoord) * W[4];     \n\
+          texCoord += delta;                                          \n\
+          sum += SampleTexture(TextureObject0, texCoord) * W[5];     \n\
+          texCoord += delta;                                          \n\
+          sum += SampleTexture(TextureObject0, texCoord) * W[6];     \n\
+          texCoord += delta;                                          \n\
+          gl_FragColor = vec4(sum.x, sum.y, sum.z, sum.w);           \n\
+        }";
+
+    _horizontal_gauss_filter_prog = _graphics_display.m_DeviceFactory->CreateShaderProgram();
+    VS->SetShaderCode(TCHAR_TO_ANSI(VSString));
+    PS->SetShaderCode(TCHAR_TO_ANSI(PSString));
+
+    _horizontal_gauss_filter_prog->ClearShaderObjects();
+    _horizontal_gauss_filter_prog->AddShaderObject(VS);
+    _horizontal_gauss_filter_prog->AddShaderObject(PS);
+    CHECKGL(glBindAttribLocation(_horizontal_gauss_filter_prog->GetOpenGLID(), 0, "AVertex"));
+    _horizontal_gauss_filter_prog->Link();
+
+  }
+
   void GraphicsEngine::QRP_GLSL_HorizontalGauss(int x, int y, int width, int height, ObjectPtr<IOpenGLBaseTexture> device_texture, TexCoordXForm &texxform0, const Color & /* c0 */, float sigma)
   {
     if (!_horizontal_gauss_filter_prog.IsValid())
@@ -1718,6 +1648,7 @@
 
     CHECKGL(glBindBufferARB(GL_ARRAY_BUFFER_ARB, 0));
     CHECKGL(glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0));
+
     ShaderProg->Begin();
 
     int TextureObjectLocation = ShaderProg->GetUniformLocationARB("TextureObject0");
@@ -1725,10 +1656,9 @@
     int TextureSizeLocation   = ShaderProg->GetUniformLocationARB("TextureSize0");
     int VertexLocation        = ShaderProg->GetAttributeLocation("AVertex");
     int TextureCoord0Location = ShaderProg->GetAttributeLocation("MyTextureCoord0");
-    
+
     SetTexture(GL_TEXTURE0, device_texture);
     CHECKGL(glUniform1iARB(TextureObjectLocation, 0));
-
     sigma = Clamp <float> (sigma, 0.1f, 9.0f);
     // Set the Gaussian weights
     {
@@ -1763,6 +1693,68 @@
     ShaderProg->End();
   }
 
+  void GraphicsEngine::InitSLVerticalGaussFilter()
+  {
+    ObjectPtr<IOpenGLVertexShader> VS = _graphics_display.m_DeviceFactory->CreateVertexShader();
+    ObjectPtr<IOpenGLPixelShader> PS = _graphics_display.m_DeviceFactory->CreatePixelShader();
+
+    const char* VSString = NUX_VERTEX_SHADER_HEADER
+        "uniform mat4 ViewProjectionMatrix;  \n\
+        attribute vec4 AVertex;             \n\
+        attribute vec4 MyTextureCoord0;     \n\
+        varying vec4 varyTexCoord0;         \n\
+        void main()                         \n\
+        {                                   \n\
+          varyTexCoord0 = MyTextureCoord0;  \n\
+          gl_Position =  ViewProjectionMatrix * (AVertex);  \n\
+        }";
+
+
+    const char* PSString = NUX_FRAGMENT_SHADER_HEADER
+        "varying vec4 varyTexCoord0;                                   \n\
+        uniform sampler2D TextureObject0;                             \n\
+        uniform vec2 TextureSize0;                                    \n\
+        vec4 SampleTexture(sampler2D TexObject, vec2 TexCoord)       \n\
+        {                                                             \n\
+          return texture2D(TexObject, TexCoord.st);                  \n\
+        }                                                             \n\
+        #define NUM_SAMPLES 7                                         \n\
+        uniform float W [NUM_SAMPLES];                                \n\
+        void main()                                                  \n\
+        {                                                             \n\
+          vec4 sum   = vec4(0.0, 0.0, 0.0, 0.0);                     \n\
+          vec2 delta = vec2(0.0, 1.0 / TextureSize0.y);              \n\
+          vec2 texCoord = vec2(varyTexCoord0.s, varyTexCoord0.t);    \n\
+          texCoord.x += 0.0 / TextureSize0.x;                         \n\
+          texCoord.y -= float((NUM_SAMPLES - 1) / 2) / TextureSize0.y;     \n\
+          sum += SampleTexture(TextureObject0, texCoord) * W[0];     \n\
+          texCoord += delta;                                          \n\
+          sum += SampleTexture(TextureObject0, texCoord) * W[1];     \n\
+          texCoord += delta;                                          \n\
+          sum += SampleTexture(TextureObject0, texCoord) * W[2];     \n\
+          texCoord += delta;                                          \n\
+          sum += SampleTexture(TextureObject0, texCoord) * W[3];     \n\
+          texCoord += delta;                                          \n\
+          sum += SampleTexture(TextureObject0, texCoord) * W[4];     \n\
+          texCoord += delta;                                          \n\
+          sum += SampleTexture(TextureObject0, texCoord) * W[5];     \n\
+          texCoord += delta;                                          \n\
+          sum += SampleTexture(TextureObject0, texCoord) * W[6];     \n\
+          texCoord += delta;                                          \n\
+          gl_FragColor = vec4(sum.x, sum.y, sum.z, sum.w);           \n\
+        }";
+
+    _vertical_gauss_filter_prog = _graphics_display.m_DeviceFactory->CreateShaderProgram();
+    VS->SetShaderCode(TCHAR_TO_ANSI(VSString));
+    PS->SetShaderCode(TCHAR_TO_ANSI(PSString));
+
+    _vertical_gauss_filter_prog->ClearShaderObjects();
+    _vertical_gauss_filter_prog->AddShaderObject(VS);
+    _vertical_gauss_filter_prog->AddShaderObject(PS);
+    CHECKGL(glBindAttribLocation(_vertical_gauss_filter_prog->GetOpenGLID(), 0, "AVertex"));
+    _vertical_gauss_filter_prog->Link();
+  }
+
   void GraphicsEngine::QRP_GLSL_VerticalGauss(int x, int y, int width, int height, ObjectPtr<IOpenGLBaseTexture> device_texture, TexCoordXForm &texxform0, const Color & /* c0 */, float sigma)
   {
     if (!_vertical_gauss_filter_prog.IsValid())
@@ -2085,6 +2077,7 @@
     num_pass = Clamp<int> (num_pass, 1, 50);
 
     ObjectPtr<IOpenGLFrameBufferObject> prevFBO = GetGraphicsDisplay()->GetGpuDevice()->GetCurrentFrameBufferObject();
+
     int previous_width = 0;
     int previous_height = 0;
     if (prevFBO.IsValid())
@@ -2105,6 +2098,7 @@
     _offscreen_color_rt1->SetFiltering(GL_NEAREST, GL_NEAREST);
 
     SetFrameBufferHelper(_offscreen_fbo, _offscreen_color_rt0, _offscreen_depth_rt0, buffer_width, buffer_height);
+
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
 
     QRP_GLSL_1Tex(x, y, quad_width, quad_height, device_texture, texxform, color::White);
@@ -2114,11 +2108,13 @@
     {
       SetFrameBufferHelper(_offscreen_fbo, _offscreen_color_rt1, _offscreen_depth_rt1, buffer_width, buffer_height);
       glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
-      QRP_GLSL_HorizontalGauss(0, 0, buffer_width, buffer_height, _offscreen_color_rt0, texxform1, c0, sigma);
+      if (_offscreen_color_rt0.IsValid())
+        QRP_GLSL_HorizontalGauss(0, 0, buffer_width, buffer_height, _offscreen_color_rt0, texxform1, c0, sigma);
 
       SetFrameBufferHelper(_offscreen_fbo, _offscreen_color_rt0, _offscreen_depth_rt0, buffer_width, buffer_height);
       glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
-      QRP_GLSL_VerticalGauss(0, 0, buffer_width, buffer_height, _offscreen_color_rt1, texxform1, c0, sigma);
+      if (_offscreen_color_rt1.IsValid())
+        QRP_GLSL_VerticalGauss(0, 0, buffer_width, buffer_height, _offscreen_color_rt1, texxform1, c0, sigma);
     }
 
     _offscreen_fbo->Deactivate();

=== modified file 'NuxGraphics/VirtualKeyCodes.h'
--- NuxGraphics/VirtualKeyCodes.h	2011-10-19 20:32:38 +0000
+++ NuxGraphics/VirtualKeyCodes.h	2012-11-05 17:50:27 +0000
@@ -134,9 +134,14 @@
 #define NUX_VK_RSHIFT                                   0xA1                   //   Right SHIFT key
 #define NUX_VK_LCONTROL                                 0xA2                   //   Left CONTROL key
 #define NUX_VK_RCONTROL                                 0xA3                   //   Right CONTROL key
+// To match VK in X11 file.
+#define NUX_VK_CONTROL                                  NUX_VK_LCONTROL
 #define NUX_VK_CAPITAL                                  0x14                   //   CAPS LOCK key
 #define NUX_VK_LSUPER                                   0x5B                   //   Left Windows key(Microsoft Natural Keyboard)
 #define NUX_VK_RSUPER                                   0x5C                   //   Right Windows key(Microsoft Natural Keyboard)
+// To match VK in X11 file.
+#define NUX_VK_LWIN                                     NUX_VK_LSUPER
+#define NUX_VK_RWIN                                     NUX_VK_RSUPER
 #define NUX_VK_LALT                                     0xA4                   //   Left MENU key
 #define NUX_VK_RALT                                     0xA5                   //   Right MENU key
 

=== added file 'NuxGraphics/XICClient.cpp'
--- NuxGraphics/XICClient.cpp	1970-01-01 00:00:00 +0000
+++ NuxGraphics/XICClient.cpp	2012-11-05 17:50:27 +0000
@@ -0,0 +1,115 @@
+/*
+* Copyright 2012 Inalogic® Inc.
+*
+* This program is free software: you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License, as
+* published by the  Free Software Foundation; either version 2.1 or 3.0
+* of the License.
+*
+* This program is distributed in the hope that it will be useful, but
+* WITHOUT ANY WARRANTY; without even the implied warranties of
+* MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
+* PURPOSE.  See the applicable version of the GNU Lesser General Public
+* License for more details.
+*
+* You should have received a copy of both the GNU Lesser General Public
+* License along with this program. If not, see <http://www.gnu.org/licenses/>
+*
+* Authored by: Brandon Schaefer <[e-mail]>
+*
+*/
+
+
+#include "XICClient.h"
+#include "NuxCore/NuxCore.h"
+
+XICClient::XICClient()
+  : xic_(NULL),
+    xim_style_(0),
+    focused_(false)
+{
+}
+
+XICClient::~XICClient()
+{
+}
+
+void XICClient::ResetXIC(XIM xim, Window window)
+{
+  if (!xim_style_)
+    SetupXIMStyle(xim);
+  SetupXIC(xim, window);
+}
+
+void XICClient::SetupXIC(XIM xim, Window window)
+{
+  xic_ = XCreateIC(xim, XNInputStyle, xim_style_, XNClientWindow, window, XNFocusWindow, window, NULL);
+}
+
+void XICClient::SetupXIMStyle(XIM xim)
+{
+  int i;
+  XIMStyles *xim_styles = NULL;
+  XIMStyle root_style = (XIMPreeditNothing|XIMStatusNothing);
+
+  XGetIMValues(xim, XNQueryInputStyle, &xim_styles, NULL);
+
+  for (i = 0; i < xim_styles->count_styles; ++i)
+    if (xim_styles->supported_styles[i] == root_style)
+      break;
+
+  if (i >= xim_styles->count_styles)
+    xim_style_ = 0;
+  xim_style_ = root_style;
+}
+
+bool XICClient::HasXIC() const
+{
+  if (xic_ == NULL)
+    return false;
+  return true;
+}
+
+XIC XICClient::GetXIC() const
+{
+  return xic_;
+}
+
+void XICClient::Reinitialize()
+{
+  xic_ = NULL;
+  xim_style_ = 0;
+  focused_ = false;
+}
+
+void XICClient::FocusInXIC()
+{
+  if (xic_ && !focused_)
+  {
+    XSetICFocus(xic_);
+    focused_ = true;
+  }
+}
+
+void XICClient::FocusOutXIC()
+{
+  if (xic_ && focused_)
+  {
+    XUnsetICFocus(xic_);
+    focused_ = false;
+  }
+}
+
+bool XICClient::IsFocused() const
+{
+  return focused_;
+}
+
+void XICClient::DestroyXIC()
+{
+  if (xic_)
+  {
+    XDestroyIC(xic_);
+    xic_ = NULL;
+  }
+}

=== added file 'NuxGraphics/XICClient.h'
--- NuxGraphics/XICClient.h	1970-01-01 00:00:00 +0000
+++ NuxGraphics/XICClient.h	2012-11-05 17:50:27 +0000
@@ -0,0 +1,56 @@
+/*
+* Copyright 2012 Inalogic® Inc.
+*
+* This program is free software: you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License, as
+* published by the  Free Software Foundation; either version 2.1 or 3.0
+* of the License.
+*
+* This program is distributed in the hope that it will be useful, but
+* WITHOUT ANY WARRANTY; without even the implied warranties of
+* MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
+* PURPOSE.  See the applicable version of the GNU Lesser General Public
+* License for more details.
+*
+* You should have received a copy of both the GNU Lesser General Public
+* License along with this program. If not, see <http://www.gnu.org/licenses/>
+*
+* Authored by: Brandon Schaefer <[e-mail]>
+*
+*/
+
+#ifndef XICCLIENT_H
+#define XICCLIENT_H
+
+/* Xlib.h is the default header that is included and has the core functionallity */
+#include <X11/Xlib.h>
+
+class XICClient
+{
+public:
+  XICClient();
+  ~XICClient();
+
+  void ResetXIC(XIM xim, Window window);
+
+  bool HasXIC() const;
+  XIC GetXIC() const;
+
+  void Reinitialize();
+
+  void FocusInXIC();
+  void FocusOutXIC();
+  bool IsFocused() const;
+
+  void DestroyXIC();
+private:
+  void SetupXIC(XIM xim, Window window);
+  void SetupXIMStyle(XIM xim);
+
+  XIC xic_;
+  XIMStyle xim_style_;
+
+  bool focused_;
+};
+
+#endif // XICClient.h

=== added file 'NuxGraphics/XIMController.cpp'
--- NuxGraphics/XIMController.cpp	1970-01-01 00:00:00 +0000
+++ NuxGraphics/XIMController.cpp	2012-11-05 17:50:27 +0000
@@ -0,0 +1,140 @@
+/*
+* Copyright 2012 Inalogic® Inc.
+*
+* This program is free software: you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License, as
+* published by the  Free Software Foundation; either version 2.1 or 3.0
+* of the License.
+*
+* This program is distributed in the hope that it will be useful, but
+* WITHOUT ANY WARRANTY; without even the implied warranties of
+* MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
+* PURPOSE.  See the applicable version of the GNU Lesser General Public
+* License for more details.
+*
+* You should have received a copy of both the GNU Lesser General Public
+* License along with this program. If not, see <http://www.gnu.org/licenses/>
+*
+* Authored by: Brandon Schaefer <[e-mail]>
+*
+*/
+
+#include "XIMController.h"
+#include "NuxCore/NuxCore.h"
+#include "GraphicsDisplayX11.h"
+
+
+XIMController::XIMController(Display* display)
+  : display_(display),
+    window_(0),
+    xim_(NULL)
+{
+  InitXIMCallback();
+}
+
+XIMController::~XIMController()
+{
+  /* The XIC must be destroyed before the XIM */
+  if (xic_client_.HasXIC())
+    xic_client_.DestroyXIC();
+
+  if (xim_)
+    XCloseIM(xim_);
+}
+
+void XIMController::SetFocusedWindow(Window window)
+{
+  window_ = window;
+  if (xim_)
+    xic_client_.ResetXIC(xim_, window);
+}
+
+bool XIMController::IsXICValid() const
+{
+  return xic_client_.HasXIC();
+}
+
+XIC XIMController::GetXIC() const
+{
+  return xic_client_.GetXIC();
+}
+
+void XIMController::FocusInXIC()
+{
+  xic_client_.FocusInXIC();
+}
+
+void XIMController::FocusOutXIC()
+{
+  xic_client_.FocusOutXIC();
+}
+
+void XIMController::InitXIMCallback()
+{
+  const char *xmodifier;
+  /* don't do anything if we are using ibus */
+  xmodifier = getenv("XMODIFIERS");
+  if (xmodifier && strstr(xmodifier,"ibus") != NULL)
+  {
+    nuxDebugMsg("[GraphicsDisplay::InitXIM] ibus natively supported");
+    return;
+  }
+
+  if (setlocale(LC_ALL, "") == NULL)
+  {
+    nuxDebugMsg("[GraphicsDisplay::InitXIM] cannot setlocale");
+  }
+
+  if (XSupportsLocale())
+  {
+    if (XSetLocaleModifiers("") == NULL)
+    {
+      nuxDebugMsg("[GraphicsDisplay::InitXIM] XSetLocaleModifiers failed.");
+    }
+    XRegisterIMInstantiateCallback(display_, NULL, NULL, NULL,
+                                   XIMController::SetupXIMClientCallback,
+                                   (XPointer)this);
+  }
+}
+
+void XIMController::SetupXIMClientCallback(Display *dpy, XPointer client_data, XPointer call_data)
+{
+  XIMController* self = (XIMController*)client_data;
+  self->SetupXIM();
+}
+
+void XIMController::EndXIMClientCallback(Display *dpy, XPointer client_data, XPointer call_data)
+{
+  XIMController* self = (XIMController*)client_data;
+  self->xim_ = NULL;
+  self->xic_client_.Reinitialize();
+  self->InitXIMCallback();
+}
+
+void XIMController::SetupXIM()
+{
+  xim_ = XOpenIM(display_, NULL, NULL, NULL);
+  if (xim_)
+  {
+    SetupXIMDestroyedCallback();
+
+    if (window_)
+      xic_client_.ResetXIC(xim_, window_);
+
+    XUnregisterIMInstantiateCallback (display_, NULL, NULL, NULL,
+                                      XIMController::SetupXIMClientCallback,
+                                      (XPointer)this);
+  }
+  else
+  {
+    nuxDebugMsg("[GraphicsDisplay::XIMStartCallback] Failed to open IM.");
+  }
+}
+
+void XIMController::SetupXIMDestroyedCallback()
+{
+  XIMCallback destroy_callback;
+  destroy_callback.callback = (XIMProc)XIMController::EndXIMClientCallback;
+  destroy_callback.client_data = (XPointer)this;
+  XSetIMValues (xim_, XNDestroyCallback, &destroy_callback, NULL);
+}

=== added file 'NuxGraphics/XIMController.h'
--- NuxGraphics/XIMController.h	1970-01-01 00:00:00 +0000
+++ NuxGraphics/XIMController.h	2012-11-05 17:50:27 +0000
@@ -0,0 +1,57 @@
+/*
+* Copyright 2012 Inalogic® Inc.
+*
+* This program is free software: you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License, as
+* published by the  Free Software Foundation; either version 2.1 or 3.0
+* of the License.
+*
+* This program is distributed in the hope that it will be useful, but
+* WITHOUT ANY WARRANTY; without even the implied warranties of
+* MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
+* PURPOSE.  See the applicable version of the GNU Lesser General Public
+* License for more details.
+*
+* You should have received a copy of both the GNU Lesser General Public
+* License along with this program. If not, see <http://www.gnu.org/licenses/>
+*
+* Authored by: Brandon Schaefer <[e-mail]>
+*
+*/
+
+#ifndef XIMCONTROLLER_H
+#define XIMCONTROLLER_H
+
+#include "XICClient.h"
+
+/* Xlib.h is the default header that is included and has the core functionallity */
+#include <X11/Xlib.h>
+
+class XIMController
+{
+public:
+  XIMController(Display* display);
+  ~XIMController();
+
+  void SetFocusedWindow(Window window);
+
+  bool IsXICValid() const;
+  XIC GetXIC() const;
+
+  void FocusInXIC();
+  void FocusOutXIC();
+private:
+  void InitXIMCallback();
+  static void SetupXIMClientCallback(Display *dpy, XPointer client_data, XPointer call_data);
+  static void EndXIMClientCallback(Display *dpy, XPointer client_data, XPointer call_data);
+
+  void SetupXIM();
+  void SetupXIMDestroyedCallback();
+
+  Display* display_;
+  Window window_;
+  XIM xim_;
+  XICClient xic_client_;
+};
+
+#endif // XIMController.h

=== modified file 'NuxGraphics/XInputWindow.cpp'
--- NuxGraphics/XInputWindow.cpp	2012-09-19 04:53:45 +0000
+++ NuxGraphics/XInputWindow.cpp	2012-11-05 17:50:27 +0000
@@ -22,6 +22,8 @@
 #include "XInputWindow.h"
 #include "GraphicsDisplayX11.h"
 #include "GLThread.h"
+#include "XIMController.h"
+
 
 // Jay, what is this for?  It isn't referenced anywhere.
 #define xdnd_version 5
@@ -376,8 +378,9 @@
 
   void XInputWindow::Show()
   {
+    GetGraphicsDisplay()->SetFocusedWindowForXIMController(window_);
+
     shown_ = true;
-
     if (!mapped_)
     {
       XMapRaised(display_, window_);

=== modified file 'NuxGraphics/XInputWindow.h'
--- NuxGraphics/XInputWindow.h	2012-01-18 19:51:33 +0000
+++ NuxGraphics/XInputWindow.h	2012-11-05 17:50:27 +0000
@@ -35,6 +35,7 @@
 #include "NuxCore/NuxCore.h"
 #include "NuxCore/Rect.h"
 
+
 namespace nux
 {
 

=== modified file 'configure.ac'
--- configure.ac	2012-10-18 03:30:41 +0000
+++ configure.ac	2012-11-05 17:50:27 +0000
@@ -23,7 +23,7 @@
 # e.g.: december 5th, 2011 is: 20111205
 # To make more than one API change in a day, add a number to the date. Like 20111205.xx
 
-m4_define([nux_abi_version], [20121012.01])
+m4_define([nux_abi_version], [20121017.01])
 
 m4_define([nux_version],
           [nux_major_version.nux_minor_version.nux_micro_version])
@@ -119,6 +119,21 @@
 GL_PKGS="gl glu glew glewmx xext x11"
 MAINTAINER_CFLAGS=""
 
+# X11 build
+AC_ARG_ENABLE([x_support],
+             [AC_HELP_STRING([--enable-x-support=@<:@no/yes@:>@],
+             [Enable X11 code path @<:@default=yes@:>@])],
+             [],
+             [enable_x_support=yes])
+AS_IF([test "x$enable_x_support" = "xyes"], [
+        MAINTAINER_CFLAGS+=" -DUSE_X11"
+      ])
+AS_IF([test "x$enable_x_support" = "xno"], [
+        MAINTAINER_CFLAGS+=" -DNO_X11"
+      ])
+
+AM_CONDITIONAL(USE_X11, [test "x$enable_x_support" = "xyes"])
+
 # Enable opengl es 20 code path
 AC_ARG_ENABLE([opengles_20],
               [AC_HELP_STRING([--enable-opengles-20=@<:@no/yes@:>@],
@@ -127,12 +142,25 @@
               [enable_opengles_20=no])
 AS_IF([test "x$enable_opengles_20" = "xyes"],
       [
-         MAINTAINER_CFLAGS+=" -DNUX_OPENGLES_20"
-         GL_PKGS="egl glesv2"
+        MAINTAINER_CFLAGS+=" -DNUX_OPENGLES_20"
+        GL_PKGS="egl glesv2"
       ]
 )
 AM_CONDITIONAL(NUX_OPENGLES_20, [test "x$enable_opengles_20" = "xyes"])
 
+# Minimal builds
+AC_ARG_ENABLE([minimal_build],
+              [AC_HELP_STRING([--enable-minimal-build=@<:@no/yes@:>@],
+              [Enable minimal builds @<:@default=no@:>@])],
+              [],
+              [enable_minimal_build=no])
+
+AS_IF([test "x$enable_minimal_build" = "xyes"], [
+        MAINTAINER_CFLAGS+=" -DNUX_MINIMAL"
+      ])
+AM_CONDITIONAL(NUX_MINIMAL, [test "x$enable_minimal_build" = "xyes"])
+
+
 AC_SUBST(GL_PKGS)
 AC_SUBST(MAINTAINER_CFLAGS)
 
@@ -339,7 +367,7 @@
 dnl ==========================================================================
 
 if test "x$GCC" = "xyes"; then
-  GCC_FLAGS="-g -Wall -Wextra -std=c++0x"
+  GCC_FLAGS="-g -Werror -Wall -Wextra -Wno-unused-parameter -std=c++0x"
 fi
 
 # gcc flags for building the tests.
@@ -355,7 +383,7 @@
 
 AS_IF([test "x$enable_maintainer_mode" = "xyes" && test "x$GCC" = "xyes"],
       [
-         MAINTAINER_CFLAGS+="-Wall -Wextra -Wcast-align -Wno-uninitialized -Wempty-body -Wformat-security -Winit-self"
+         MAINTAINER_CFLAGS+="-Werror -Wall -Wextra -Wcast-align -Wno-uninitialized -Wempty-body -Wformat-security -Winit-self -Wno-unused-parameter"
       ]
 )
 
@@ -368,8 +396,8 @@
               [enable_debug=no])
 AS_IF([test "x$enable_debug" = "xyes"],
       [
-         MAINTAINER_CFLAGS+=" -DNUX_DEBUG"
-         GCC_FLAGS="-g -O0 -Wall -Wextra -std=c++0x"
+        MAINTAINER_CFLAGS+=" -DNUX_DEBUG"
+        GCC_FLAGS="-g -O0 -Wall -Wextra -Wno-unused-parameter -std=c++0x"
       ]
 )
 
@@ -458,6 +486,8 @@
 echo -e "        Build Gpu Tests    : ${BOLD_WHITE}${enable_gputests}${RESET}"
 echo -e "        Build Nux Tests    : ${BOLD_WHITE}${enable_tests}${RESET}"
 echo -e "        Gestures support   : ${BOLD_WHITE}${have_geis}${RESET}"
+echo -e "        X11 build support  : ${BOLD_WHITE}${enable_x_support}${RESET}"
+echo -e "        Minimal build      : ${BOLD_WHITE}${enable_minimal_build}${RESET}"
 echo ""
 
 echo -e "${RESET}"

=== modified file 'examples/Makefile.am'
--- examples/Makefile.am	2012-10-02 14:57:05 +0000
+++ examples/Makefile.am	2012-11-05 17:50:27 +0000
@@ -60,7 +60,7 @@
   $(top_builddir)/Nux/libnux-@NUX_API_VERSION@.la \
   $(NUX_EXAMPLES_LIBS) \
   $(NUX_LIBS) \
-  $(IBUS_LIBS) 
+  $(IBUS_LIBS)
 
 # This is the individual executable build. For every $exe in noinst_PROGRAMS
 # you need a $exe_SOURCES and $exe_LDADD so it builds
@@ -123,7 +123,7 @@
 # To distribute source add the source code here
 #sourceexampledir = "$(pkgdatadir)/examples"
 #sourceexample_DATA = $(combobox_SOURCES) \
-#                    
+#
 
 endif
 

=== modified file 'gputests/framebufferobject.cpp'
--- gputests/framebufferobject.cpp	2012-09-26 06:44:12 +0000
+++ gputests/framebufferobject.cpp	2012-11-05 17:50:27 +0000
@@ -36,7 +36,7 @@
  
 void RenderToFrameBufferObject ()
 {
-  nux::GraphicsDisplay* graphics_display = gGLWindowManager.CreateGLWindow("Window", 570, 270, nux::WINDOWSTYLE_NORMAL, 0, false);
+  nux::GraphicsDisplay* graphics_display = gGLWindowManager.CreateGLWindow("Window", 200, 200, nux::WINDOWSTYLE_NORMAL, 0, false);
   nux::GraphicsEngine* graphics_engine = graphics_display->GetGraphicsEngine();
 
   graphics_display->ShowWindow();
@@ -54,19 +54,22 @@
   graphics_engine->GetWindowSize(w, h);
   graphics_engine->SetViewport(0, 0, w, h);
   graphics_engine->SetContext(0, 0, w, h);
+  graphics_engine->SetScissor(0, 0, w, h);
   graphics_engine->Push2DWindow(w, h);
 
   nux::Event event;
   memset(&event, 0, sizeof(nux::Event));
 
+  bool first_time = true;
   do
   {
     CHECKGL( glClearColor(0, 0, 0, 1) );
     CHECKGL( glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT|GL_STENCIL_BUFFER_BIT) );
 
     graphics_display->GetSystemEvent(&event);
-    if(event.type == nux::NUX_SIZE_CONFIGURATION)
+    if(first_time || (event.type == nux::NUX_SIZE_CONFIGURATION))
     {
+      first_time = false;
       graphics_engine->DisableAllTextureMode(0);
       graphics_engine->DisableAllTextureMode(1);
       graphics_engine->DisableAllTextureMode(2);
@@ -76,15 +79,21 @@
       graphics_engine->SetScissor(0, 0, w, h);
       graphics_engine->SetContext(0, 0, w, h);
       graphics_engine->Push2DWindow(w, h);
-
-      fbo         = graphics_display->GetGpuDevice ()->CreateFrameBufferObject ();
-      texture_rt  = graphics_display->GetGpuDevice ()->CreateSystemCapableDeviceTexture (graphics_display->GetWindowWidth(), graphics_display->GetWindowHeight(), 1, nux::BITFMT_R8G8B8A8);
-      depth_rt    = graphics_display->GetGpuDevice ()->CreateSystemCapableDeviceTexture (graphics_display->GetWindowWidth(), graphics_display->GetWindowHeight(), 1, nux::BITFMT_D24S8);
+      fbo         = graphics_display->GetGpuDevice()->CreateFrameBufferObject ();
+      texture_rt  = graphics_display->GetGpuDevice()->CreateSystemCapableDeviceTexture(graphics_display->GetWindowWidth(), graphics_display->GetWindowHeight(), 1, nux::BITFMT_R8G8B8A8);
+      depth_rt    = graphics_display->GetGpuDevice()->CreateSystemCapableDeviceTexture (graphics_display->GetWindowWidth(), graphics_display->GetWindowHeight(), 1, nux::BITFMT_D24S8);
     }
 
     fbo->FormatFrameBufferObject (graphics_display->GetWindowWidth(), graphics_display->GetWindowHeight(), nux::BITFMT_R8G8B8A8);
-    fbo->SetRenderTarget (0, texture_rt->GetSurfaceLevel (0));
-    fbo->SetDepthSurface (depth_rt->GetSurfaceLevel (0));
+    if (texture_rt.IsValid())
+    {
+      fbo->SetRenderTarget(0, texture_rt->GetSurfaceLevel(0));
+    }
+    if (depth_rt.IsValid())
+    {
+      fbo->SetDepthSurface(depth_rt->GetSurfaceLevel(0));
+    }
+
     fbo->Activate();
 
     graphics_engine->GetWindowSize(w, h);
@@ -99,7 +108,8 @@
 
     graphics_engine->QRP_Color(geo.x, geo.y, geo.width, geo.height, nux::color::RandomColor());
 
-    graphics_display->GetGpuDevice ()->DeactivateFrameBuffer ();
+    // Restore the back buffer
+    graphics_display->GetGpuDevice()->DeactivateFrameBuffer();
 
     nux::TexCoordXForm texxform;
     graphics_engine->QRP_1Tex(0, 0, graphics_display->GetWindowWidth(), graphics_display->GetWindowHeight(), texture_rt, texxform, nux::color::White);

=== modified file 'gputests/quad_2texmod.cpp'
--- gputests/quad_2texmod.cpp	2012-09-26 06:44:12 +0000
+++ gputests/quad_2texmod.cpp	2012-11-05 17:50:27 +0000
@@ -90,6 +90,7 @@
   memset(&event, 0, sizeof(nux::Event));
   graphics_engine->GetWindowSize(w, h);
   graphics_engine->SetViewport(0, 0, w, h);
+  graphics_engine->SetScissor(0, 0, w, h);
   graphics_engine->SetContext(0, 0, w, h);
   graphics_engine->Push2DWindow(w, h);
 

=== modified file 'gputests/texture_blur.cpp'
--- gputests/texture_blur.cpp	2012-09-26 06:44:12 +0000
+++ gputests/texture_blur.cpp	2012-11-05 17:50:27 +0000
@@ -56,16 +56,18 @@
   graphics_engine->GetWindowSize(w, h);
   graphics_engine->SetViewport(0, 0, w, h);
   graphics_engine->SetContext(0, 0, w, h);
+  graphics_engine->SetScissor(0, 0, w, h);
   graphics_engine->Push2DWindow(w, h);
 
   nux::Event event;
   memset(&event, 0, sizeof(nux::Event));
   
-  char fps [25];
+  /*char fps [25];
   int frame_counter = 0;
   int frame_periode = 0;
   float frame_rate = 0;
   float periode_time = 0;
+  */
   bool first_time = true;
   do
   {
@@ -86,15 +88,28 @@
       graphics_engine->SetContext(0, 0, w, h);
       graphics_engine->Push2DWindow(w, h);
 
-      fbo         = graphics_display->GetGpuDevice ()->CreateFrameBufferObject ();
-      texture_rt  = graphics_display->GetGpuDevice ()->CreateSystemCapableDeviceTexture (graphics_display->GetWindowWidth(), graphics_display->GetWindowHeight(), 1, nux::BITFMT_R8G8B8A8);
-      depth_rt    = graphics_display->GetGpuDevice ()->CreateSystemCapableDeviceTexture (graphics_display->GetWindowWidth(), graphics_display->GetWindowHeight(), 1, nux::BITFMT_D24S8);
-      fbo->FormatFrameBufferObject (graphics_display->GetWindowWidth(), graphics_display->GetWindowHeight(), nux::BITFMT_R8G8B8A8);
-    }
-
-    fbo->SetRenderTarget (0, texture_rt->GetSurfaceLevel (0));
-    fbo->SetDepthSurface (depth_rt->GetSurfaceLevel (0));
+      fbo         = graphics_display->GetGpuDevice()->CreateFrameBufferObject();
+      texture_rt  = graphics_display->GetGpuDevice()->CreateSystemCapableDeviceTexture(graphics_display->GetWindowWidth(), graphics_display->GetWindowHeight(), 1, nux::BITFMT_R8G8B8A8);
+      depth_rt    = graphics_display->GetGpuDevice()->CreateSystemCapableDeviceTexture(graphics_display->GetWindowWidth(), graphics_display->GetWindowHeight(), 1, nux::BITFMT_D24S8);
+    }
+
+    fbo->FormatFrameBufferObject(graphics_display->GetWindowWidth(), graphics_display->GetWindowHeight(), nux::BITFMT_R8G8B8A8);
+    if (texture_rt.IsValid())
+    {
+      fbo->SetRenderTarget(0, texture_rt->GetSurfaceLevel (0));
+    }
+
+    if (depth_rt.IsValid())
+    {
+      fbo->SetDepthSurface(depth_rt->GetSurfaceLevel (0));
+    }
     fbo->Activate();
+
+    graphics_engine->GetWindowSize(w, h);
+    graphics_engine->SetViewport(0, 0, w, h);
+    graphics_engine->SetContext(0, 0, w, h);
+    graphics_engine->Push2DWindow(w, h);
+
     for (int i = 0; i < 1; i++)
     {
       nux::Rect geo (nux::RandomUInt(graphics_display->GetWindowWidth()),
@@ -106,16 +121,24 @@
     }
 
     // Restore the back buffer
-    graphics_display->GetGpuDevice ()->DeactivateFrameBuffer ();
+    graphics_display->GetGpuDevice()->DeactivateFrameBuffer();
+
+    nux::ObjectPtr <nux::IOpenGLBaseTexture> tex_blur;
 
     nux::TexCoordXForm texxform;
-    // Make a blurred copy of the previous render target
-    nux::ObjectPtr <nux::IOpenGLBaseTexture> tex_blur = graphics_engine->QRP_GetBlurTexture (
-      0, 0, texture_rt->GetWidth (), texture_rt->GetHeight (),
-      texture_rt, texxform, nux::color::White, 1.0f);
+    //Make a blurred copy of the previous render target
+    printf("exec 0\n");
+    if (texture_rt.IsValid() && graphics_engine)
+    {
+      tex_blur = graphics_engine->QRP_GLSL_GetBlurTexture(
+              0, 0, texture_rt->GetWidth(), texture_rt->GetHeight(),
+              texture_rt, texxform, nux::color::White, 7.0f);
+    }
+    printf("exec 1\n");
 
     graphics_engine->QRP_1Tex(0, 0, tex_blur->GetWidth(), tex_blur->GetHeight(), tex_blur, texxform, nux::color::White);
 
+    /*
     sprintf(fps, "FPS: %3.2f", frame_rate);
     nux::PageBBox page;
     page.xmin = 0;
@@ -125,9 +148,7 @@
     page.x_margin = 0;
     page.y_margin = 0;
     graphics_engine->RenderColorTextLineStatic(graphics_engine->GetBoldFont (), page, fps, nux::color::White, false, nux::eAlignTextLeft);
-
-    graphics_display->SwapBuffer();
-
+    
     float frame_time = graphics_display->GetFrameTime();
     graphics_display->ResetFrameTime();
     periode_time += frame_time;
@@ -141,8 +162,10 @@
       periode_time = 0.0f;
       frame_periode = 0;
     }
-
-  } while((event.type != nux::NUX_TERMINATE_APP) && (event.GetVirtualKeyState(NUX_VK_ESCAPE) == 0));
+    */
+  
+    graphics_display->SwapBuffer();
+  } while((event.type != nux::NUX_TERMINATE_APP));
 
   fbo.Release ();
   texture_rt.Release ();

=== modified file 'gputests/texture_copy_blur.cpp'
--- gputests/texture_copy_blur.cpp	2012-09-26 06:44:12 +0000
+++ gputests/texture_copy_blur.cpp	2012-11-05 17:50:27 +0000
@@ -62,11 +62,12 @@
   nux::Event event;
   memset(&event, 0, sizeof(nux::Event));
 
-  char fps [25];
+  /*char fps [25];
   int frame_counter = 0;
   int frame_periode = 0;
   float frame_rate = 0;
   float periode_time = 0;
+  */
   bool first_time = true;
   do
   {
@@ -122,7 +123,7 @@
     // Render the blurred texture
     graphics_engine->QRP_1Tex(0, 0, tex_blur->GetWidth(), tex_blur->GetHeight(), tex_blur, texxform, nux::color::White);
 
-    sprintf(fps, "FPS: %3.2f", frame_rate);
+    /*sprintf(fps, "FPS: %3.2f", frame_rate);
     nux::PageBBox page;
     page.xmin = 0;
     page.xmax = 100;
@@ -147,6 +148,7 @@
       periode_time = 0.0f;
       frame_periode = 0;
     }
+    */
 
   } while((event.type != nux::NUX_TERMINATE_APP) && (event.GetVirtualKeyState(NUX_VK_ESCAPE) == 0));
 

=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2012-10-11 17:31:41 +0000
+++ tests/Makefile.am	2012-11-05 17:50:27 +0000
@@ -25,6 +25,7 @@
   xtest-text-entry-deadkeys \
   xtest-text-entry-compositionkeys \
   xtest-text-entry-logic \
+  xtest-text-entry-xim \
   xtest-focus-on-mouse-enter
 
 gtest_nuxcore_SOURCES = \
@@ -301,6 +302,14 @@
 xtest_text_entry_compositionkeys_LDADD = $(TestLibs)
 xtest_text_entry_compositionkeys_LDFLAGS = -lpthread -lXtst
 
+xtest_text_entry_xim_SOURCES = xtest-text-entry-xim.cpp \
+  nux_automated_test_framework.cpp \
+  nux_automated_test_framework.h
+
+xtest_text_entry_xim_CPPFLAGS = $(TestFlags)
+xtest_text_entry_xim_LDADD = $(TestLibs)
+xtest_text_entry_xim_LDFLAGS = -lpthread -lXtst
+
 #run make test as part of make check
 check-local: test gtest test-apps
 
@@ -314,7 +323,7 @@
 check-headless: gtest-nuxcore
 	@gtester --verbose -k -o=test-nux-results.xml ./gtest-nuxcore
 
-test-apps: test-graphics-display test-empty-window xtest-text-entry xtest-button xtest-mouse-events xtest-mouse-buttons xtest-hgrid-key-navigation xtest-hlayout-key-navigation xtest-vlayout-key-navigation xtest-scrollbar xtest-focus-on-mouse-down xtest-focus-on-mouse-enter xtest-keynav-directions xtest-text-entry-logic xtest-text-entry-deadkeys xtest-text-entry-compositionkeys
+test-apps: test-graphics-display test-empty-window xtest-text-entry-xim xtest-text-entry xtest-button xtest-mouse-events xtest-mouse-buttons xtest-hgrid-key-navigation xtest-hlayout-key-navigation xtest-vlayout-key-navigation xtest-scrollbar xtest-focus-on-mouse-down xtest-focus-on-mouse-enter xtest-keynav-directions xtest-text-entry-logic xtest-text-entry-deadkeys xtest-text-entry-compositionkeys
 	./test-graphics-display
 	./test-empty-window
 	./xtest-text-entry
@@ -331,7 +340,7 @@
 	./xtest-text-entry-logic
 	./xtest-text-entry-deadkeys
 	./xtest-text-entry-compositionkeys
-  
+
 
 check-report:
 	@gtester -k -o=test-nux-results.xml -k ./test-nux \

=== modified file 'tests/nux_automated_test_framework.cpp'
--- tests/nux_automated_test_framework.cpp	2012-09-26 06:44:12 +0000
+++ tests/nux_automated_test_framework.cpp	2012-11-05 17:50:27 +0000
@@ -23,6 +23,7 @@
 #include <X11/keysym.h>
 #include "nux_automated_test_framework.h"
 
+#define MAX_KEYS 4 // Max keys
 
 int NuxAutomatedTestFramework::mouse_motion_time_span = 1000; // milliseconds
 int NuxAutomatedTestFramework::mouse_click_time_span = 300;   // milliseconds
@@ -394,6 +395,7 @@
     }
     nux::SleepForMilliseconds(300);
   }
+  XFlush(display_);
 }
 
 void NuxAutomatedTestFramework::ViewSendCompositionKeys(const std::string& str)
@@ -406,6 +408,92 @@
   ViewSendString(str);
 }
 
+
+// Send strings in the format of "key+key+key" up to 4 where the last key is not a modifier
+// example "ctrl+alt+=
+void NuxAutomatedTestFramework::ViewSendKeys(const std::string& str)
+{
+  std::string keys[MAX_KEYS];
+  KeySym keys_sym[MAX_KEYS] = {0};
+  size_t f_ptr = 0, s_ptr = 0;
+  int i = 0;
+
+  //Split up keys on the +
+  while (s_ptr != std::string::npos && i < MAX_KEYS)
+  {
+    s_ptr = str.find("+", f_ptr);
+    keys[i] = str.substr(f_ptr, (s_ptr-f_ptr));
+    f_ptr = s_ptr+1;
+    i++;
+  }
+
+  // Find what the key_sym should be for each key
+  for (int i = 0; i < MAX_KEYS; i++)
+  {
+    if (keys[i].empty())
+    {
+      break;
+    }
+    else if (keys[i] == "ctrl")
+    {
+      keys_sym[i] = XK_Control_L;
+    }
+    else if (keys[i] == "alt")
+    {
+      keys_sym[i] = XK_Alt_L;
+    }
+    else if (keys[i] == "space")
+    {
+      keys_sym[i] = XK_space;
+    }
+    else if (keys[i] == "enter" || keys[i] == "return")
+    {
+      keys_sym[i] = XK_Return;
+    }
+    else if (keys[i] == "=")
+    {
+      keys_sym[i] = XK_equal;
+    }
+    else if (keys[i] == "[")
+    {
+      keys_sym[i] = XK_bracketleft;
+    }
+    else if (keys[i] =="shift")
+    {
+      keys_sym[i] = XK_Shift_L;
+    }
+    else
+    {
+      // If nothing is found try and find it...
+      if (!(keys_sym[i] = XStringToKeysym(keys[i].c_str())))
+        printf("Undefinded Key: %s (Add it to this list)\n", keys[i].c_str());
+    }
+  }
+  XTestGrabControl(display_, True);
+  KeyCode modcode[MAX_KEYS] = {0};
+
+  // Press the keys from 0,1,2,3
+  for (int i = 0; i < MAX_KEYS; i++)
+  {
+    if (keys_sym[i] != 0)
+    {
+      modcode[i] = XKeysymToKeycode(display_, keys_sym[i]);
+      XTestFakeKeyEvent(display_, modcode[i], True, 0);
+    }
+  }
+
+  // Release the keys from 3,2,1,0
+  for (int i = MAX_KEYS-1; i >= 0; i--)
+  {
+    if (keys_sym[i] != 0)
+    {
+      XTestFakeKeyEvent(display_, modcode[i], False, 0);
+    }
+  }
+  XTestGrabControl(display_, False);
+  XFlush(display_);
+}
+
 void NuxAutomatedTestFramework::ViewSendKeyCombo(KeySym modsym0, KeySym modsym1, KeySym modsym2, const char c)
 {
   KeyCode keycode = 0;
@@ -528,7 +616,7 @@
   /* Generate modkey release */
   XTestFakeKeyEvent(display_, modcode1, False, 0);
   XTestFakeKeyEvent(display_, modcode0, False, 0);
-
+  XFlush(display_);
 }
 
 void NuxAutomatedTestFramework::PutMouseAt(int x, int y)

=== modified file 'tests/nux_automated_test_framework.h'
--- tests/nux_automated_test_framework.h	2012-08-28 21:38:54 +0000
+++ tests/nux_automated_test_framework.h	2012-11-05 17:50:27 +0000
@@ -90,6 +90,8 @@
   void ViewSendDown();
   //! Simulate composition keys.
   void ViewSendCompositionKeys(const std::string &str);
+  //! Simulate 1-4 key presses.
+  void ViewSendKeys(const std::string &str);
 
   void ViewSendIBusToggle();
 

=== added file 'tests/xim-test-commands.txt'
--- tests/xim-test-commands.txt	1970-01-01 00:00:00 +0000
+++ tests/xim-test-commands.txt	2012-11-05 17:50:27 +0000
@@ -0,0 +1,52 @@
+//
+// Copyright 2010 Inalogic Inc.
+//
+// This program is free software: you can redistribute it and/or modify it
+// under the terms of the GNU General Public License version 3, as published
+// by the  Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranties of
+// MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
+// PURPOSE.  See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// version 3 along with this program.  If not, see
+// <http://www.gnu.org/licenses/>
+//
+// Author by: Brandon Schaefer <[e-mail]>
+
+// 0 is the name of the IM
+// 1 is any key sequences you need to enter to get the IM
+//   in the correct state while testing
+// 2 is text that will get inputed to the IM. The input is what you
+//   would normally type to get your desired CJK string
+// 3 is the expect result that the IM should turn your input into
+// 4 is when we know the test is over and to close the current IM
+
+// This test GCIN with chewing
+0 gcin
+1 ctrl+space
+1 ctrl+alt+[
+2 w91o3g4
+1 enter
+1 ctrl+space
+3 北市
+4 halt
+
+// This test Fcitx with google pinyin
+0 fcitx
+1 ctrl+space
+2 dianshi ji1
+3 耟椒晃
+4 halt
+
+// This test Hime with anthy
+0 hime
+1 ctrl+space
+1 ctrl+alt+=
+2 shisutemu
+1 enter
+1 ctrl+space
+3 しすてむ
+4 halt

=== added file 'tests/xtest-text-entry-xim.cpp'
--- tests/xtest-text-entry-xim.cpp	1970-01-01 00:00:00 +0000
+++ tests/xtest-text-entry-xim.cpp	2012-11-05 17:50:27 +0000
@@ -0,0 +1,450 @@
+/*
+ * Copyright 2010 Inalogic Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the  Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 3 along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>
+ *
+ * Authored by: Brandon Schaefer <[e-mail]>
+ *
+ */
+
+#include "Nux/Nux.h"
+#include "Nux/WindowThread.h"
+#include "Nux/VLayout.h"
+#include "Nux/TextEntry.h"
+#include "Nux/InputMethodIBus.h"
+#include "Nux/ProgramFramework/ProgramTemplate.h"
+#include "Nux/ProgramFramework/TestView.h"
+#include <X11/extensions/XTest.h>
+#include <X11/keysym.h>
+#include "nux_automated_test_framework.h"
+
+#include <sys/types.h>
+#include <signal.h>
+#include <stdio.h>
+
+#include <fstream>
+#include <queue>
+
+class TextTextEntry: public ProgramTemplate
+{
+public:
+  TextTextEntry(const char* program_name, int window_width, int window_height, int program_life_span);
+  ~TextTextEntry();
+
+  virtual void UserInterfaceSetup();
+
+  void TextEntryClick(nux::TextEntry* text_entry);
+  void OnActivated();
+  void OnCursorMoved(int);
+  void ResetEvents();
+
+  nux::TextEntry* text_entry_;
+
+  bool clicked_;
+  bool activated_;
+  bool cursor_moved_;
+};
+
+TextTextEntry::TextTextEntry(const char* program_name,
+  int window_width,
+  int window_height,
+  int program_life_span)
+  : ProgramTemplate(program_name, window_width, window_height, program_life_span)
+  , clicked_(false)
+  , activated_(false)
+  , cursor_moved_(false)
+{
+  ResetEvents();
+  text_entry_ = NULL;
+}
+
+TextTextEntry::~TextTextEntry()
+{
+}
+
+void TextTextEntry::ResetEvents()
+{
+  clicked_ = false;
+  activated_ = false;
+  cursor_moved_ = false;
+}
+
+void TextTextEntry::TextEntryClick(nux::TextEntry* text_entry)
+{
+  if (text_entry_ == text_entry)
+  {
+    clicked_ = true;
+  }
+}
+
+void TextTextEntry::OnActivated()
+{
+  activated_ = true;
+}
+
+void TextTextEntry::OnCursorMoved(int position)
+{
+  cursor_moved_ = true;
+}
+
+void TextTextEntry::UserInterfaceSetup()
+{
+  nux::VLayout* main_layout = new nux::VLayout(NUX_TRACKER_LOCATION);
+  text_entry_ = new nux::TextEntry("", NUX_TRACKER_LOCATION);
+  text_entry_->activated.connect(sigc::mem_fun(this, &TextTextEntry::OnActivated));
+  text_entry_->cursor_moved.connect(sigc::mem_fun(this, &TextTextEntry::OnCursorMoved));
+  text_entry_->SetFontSize(76);
+
+  main_layout->AddView(text_entry_, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
+  main_layout->SetSpaceBetweenChildren(10);
+  main_layout->SetContentDistribution(nux::MAJOR_POSITION_CENTER);
+
+  static_cast<nux::WindowThread*>(window_thread_)->SetLayout(main_layout);
+
+  nux::ColorLayer background(nux::Color(0xFF4D4D4D));
+  static_cast<nux::WindowThread*>(window_thread_)->SetWindowBackgroundPaintLayer(&background);
+}
+
+TextTextEntry* test_textentry = NULL;
+
+// Returns dynamic memory, delete me!
+char* ReadInCommands(const char* path)
+{
+  char* raw_file = NULL;
+  long size;
+  std::ifstream file(path, std::ios::in|std::ios::ate);
+
+  if (file.is_open())
+  {
+    size = file.tellg();
+    raw_file = new char[size+1];
+    file.seekg (0, std::ios::beg);
+    file.read(raw_file, size);
+    file.close();
+  }
+  return raw_file;
+}
+
+void TokenizeCommands(char* raw_cmds, std::queue<std::string>& token_queue)
+{
+  int i = 0;
+  int size = strlen(raw_cmds);
+
+  while (i < size)
+  {
+    if (raw_cmds[i] == '/' && raw_cmds[i+1] == '/')
+    {
+      while (raw_cmds[i] != '\n' && i < size)
+      {
+        i++;
+      }
+      i++;
+    }
+    else if (raw_cmds[i] >= '0' && raw_cmds[i] <= '9')
+    {
+      std::string num = "";
+      while (raw_cmds[i] != ' ' && i < size)
+      {
+        num += raw_cmds[i];
+        i++;
+      }
+      token_queue.push(num);
+
+      while (raw_cmds[i] == ' ') {i++;}
+
+      std::string cmd = "";
+      while (raw_cmds[i] != '\n' && raw_cmds[i] != '\0' && i < size)
+      {
+        cmd += raw_cmds[i];
+        i++;
+      }
+      token_queue.push(cmd);
+    }
+    else
+    {
+      i++;
+    }
+  }
+}
+
+void KillInputMethod(const char* im_name)
+{
+  FILE* f_ptr;
+  char pgrep[128] = "pgrep ";
+  char pid[128];
+  char* last = NULL;
+  int cur_pid = 0;
+
+  strcat(pgrep, im_name);
+  if ((f_ptr = popen(pgrep, "r")) == NULL)
+    return;
+
+  while(fgets(pid, 128, f_ptr) != NULL)
+  {
+    cur_pid = strtol(pid, &last, 10);
+    if (*last == '\0' || *last == '\n')
+    {
+      // Make sure it's dead
+      kill(cur_pid, SIGKILL);
+      kill(cur_pid, SIGSTOP);
+    }
+  }
+  pclose(f_ptr);
+}
+
+void KillCurrentInputMethod()
+{
+  const char* xmodifier;
+  xmodifier = getenv("XMODIFIERS");
+  if (!xmodifier)
+    return;
+
+  KillInputMethod(strchr(xmodifier, '=')+1);
+}
+
+/*
+  0 - Name of Input method
+  1 - what keys we should press
+  2 - what to type
+  3 - what to expect
+  4 - we are done with this IM
+
+  CFG (If someone complains that we need to check the input)
+  **Note I cheated with Key, Letter and CJK...can be filled in
+  S -> 0 L | 1 K | 2 L | 3 C | 4 <halt>
+  K -> K+K | <Key>
+  L -> LL | <Letter>
+  C -> CC | <CJK>
+
+  example:
+  0 fcitx
+  1 ctrl+space
+  2 ninhao <CJK>
+
+  Abstract Syntax
+  IM        = 0 <name>
+  KeyStrokes= 1 <key> | 1 <key+key> | 1 <key+key+key> | 1 <key+key+key+key>
+  Input     = 2 <input>
+  Expect    = 3 <cjk>
+  Halt      = 4 halt
+
+  0 -> popen(im_name)
+  1 -> RunKeyStrokes(keys)
+  2 -> TypeInput(input)
+  3 -> CheckInput(cjk)
+  4 -> pclose(im_name)
+*/
+
+std::vector<std::string>& GetSplitEnvPath()
+{
+  static std::vector<std::string> split_path;
+
+  if (split_path.empty())
+  {
+    std::string tmp;
+    size_t colon_ptr = 0, start_ptr = 0;
+
+    const std::string env_path(getenv("PATH"));
+
+    if (!env_path.empty())
+    {
+      // Splits the env path var up on (":")
+      while (colon_ptr != std::string::npos)
+      {
+        colon_ptr = env_path.find(":", start_ptr);
+        tmp = env_path.substr(start_ptr, (colon_ptr-start_ptr));
+        start_ptr = colon_ptr+1;
+        split_path.push_back(tmp);
+      }
+    }
+  }
+  return split_path;
+}
+
+bool CheckIMExist(const char* im_name)
+{
+  std::vector<std::string> split_path = GetSplitEnvPath();
+  std::string command("ls ");
+  char buf [128];
+  FILE* path = NULL;
+
+  for (unsigned int i = 0; i < split_path.size(); i++)
+  {
+    if ((path = popen((command + split_path[i]).c_str(),"r")) == NULL)
+      return false;
+
+    while (fgets(buf, 128, path) != NULL)
+    {
+      if (strstr(buf, im_name))
+        return true;
+    }
+  }
+  return false;
+}
+
+FILE* OpenIM(const char* im_name)
+{
+  FILE* open_file = NULL;
+
+  if (CheckIMExist(im_name))
+  {
+    open_file = popen(im_name,"r");
+    nux::SleepForMilliseconds(500);
+  }
+  return open_file;
+}
+
+bool CheckInput(const std::string cjk, NuxAutomatedTestFramework* test)
+{
+  std::string message("Test is: " + cjk);
+  test->TestReportMsg(test_textentry->text_entry_->GetText() == cjk, message.c_str());
+
+  test->ViewSendCtrlA();
+  nux::SleepForMilliseconds(500);
+
+  test->ViewSendDelete();
+  nux::SleepForMilliseconds(500);
+  return true;
+}
+
+std::string next_token (std::queue<std::string>& tokens)
+{
+  std::string next_token;
+  if (!tokens.empty())
+  {
+    next_token = tokens.front();
+    tokens.pop();
+  }
+  return next_token;
+}
+
+bool RunCommands(std::queue<std::string>& tokens, NuxAutomatedTestFramework* test)
+{
+  std::string next_cmd;
+  std::string im_name;
+  std::string cur_cmd = next_token(tokens);
+  FILE* start_im = NULL;
+
+  while (!tokens.empty())
+  {
+    next_cmd = next_token(tokens);
+    if (cur_cmd == "0")
+    {
+      if ((start_im = OpenIM(next_cmd.c_str())) != NULL)
+      {
+        im_name = next_cmd.c_str();
+        nux::SleepForMilliseconds(500);
+      }
+      else
+      {
+        fprintf(stderr, "Command not found: %s\n", next_cmd.c_str());
+
+        // Skip the test
+        while (cur_cmd != "4")
+        {
+          cur_cmd = next_token(tokens);
+        }
+        next_cmd = next_token(tokens);
+      }
+    }
+    else if (cur_cmd == "1")
+    {
+      test->ViewSendKeys(next_cmd);
+    }
+    else if (cur_cmd == "2")
+    {
+      test->ViewSendString(next_cmd);
+    }
+    else if (cur_cmd == "3")
+    {
+      CheckInput(next_cmd, test);
+    }
+    else if (cur_cmd == "4")
+    {
+      KillInputMethod(im_name.c_str());
+      pclose(start_im);
+    }
+    else
+    {
+      fprintf(stderr, "Error - Incorrect command: %s\n", cur_cmd.c_str());
+      return false;
+    }
+    nux::SleepForMilliseconds(500);
+    cur_cmd = next_token(tokens);
+  }
+
+  return true;
+}
+
+void TestingThread(nux::NThread* thread, void* user_data)
+{
+  while (test_textentry->ReadyToGo() == false)
+  {
+    nuxDebugMsg("Waiting to start");
+    nux::SleepForMilliseconds(300);
+  }
+
+  nux::SleepForMilliseconds(1300);
+  nux::WindowThread* wnd_thread = static_cast<nux::WindowThread*>(user_data);
+  NuxAutomatedTestFramework test(wnd_thread);
+  test.Startup();
+  test.TestReportMsg(test_textentry->text_entry_, "TextEntry created");
+
+  test_textentry->ResetEvents();
+  test.ViewSendMouseMotionToCenter(test_textentry->text_entry_);
+
+  test.ViewSendMouseClick(0,1);
+
+  std::queue<std::string> tokens;
+  char* raw_commands;
+
+  // Just kills what should be the current IM (if there is one)
+  KillCurrentInputMethod();
+
+  raw_commands = ReadInCommands("xim-test-commands.txt");
+  if (raw_commands)
+  {
+    TokenizeCommands(raw_commands, tokens);
+    delete raw_commands;
+    RunCommands(tokens, &test);
+  }
+
+  if (test.WhenDoneTerminateProgram())
+  {
+    wnd_thread->ExitMainLoop();
+  }
+  nuxDebugMsg("Exit testing thread");
+}
+
+int main(int argc, char** argv)
+{
+  int xstatus = XInitThreads();
+  nuxAssertMsg(xstatus > 0, "XInitThreads has failed");
+
+  test_textentry = new TextTextEntry("Text Entry", 600, 200, 40000);
+  test_textentry->Startup();
+  test_textentry->UserInterfaceSetup();
+
+  nux::SystemThread* test_thread = nux::CreateSystemThread(NULL, &TestingThread, test_textentry->GetWindowThread());
+
+  test_thread->Start(test_textentry);
+
+  test_textentry->Run();
+
+  delete test_thread;
+  delete test_textentry;
+
+  return 0;
+}
+