Add a sample application that runs on unix.

git-svn-id: http://skia.googlecode.com/svn/trunk@938 2bbb7eff-a529-9590-31e7-b0007b416f81

1 files changed, 20 insertions, 12 deletions

diff --git a/include/views/SkOSWindow_Unix.h b/include/views/SkOSWindow_Unix.h
index 26f51be162..1b008e1ac4 100644
--- a/include/views/SkOSWindow_Unix.h
+++ b/include/views/SkOSWindow_Unix.h
@@ -20,39 +20,47 @@
 #include "SkWindow.h"
 #include <X11/Xlib.h>
 
+class SkBitmap;
+class SkEvent;
+
 struct SkUnixWindow {
   Display* fDisplay;
   Window fWin;
   size_t fOSWin;
+  GC fGc;
 };
 
 class SkOSWindow : public SkWindow {
 public:
-    SkOSWindow(Display* display, Window win);
+    SkOSWindow(void*);
+    ~SkOSWindow();
 
-    void*   getHWND() const { return (void*)fUnixWindow.fWin; }
-  void* getDisplay() const { return (void*)fUnixWindow.fDisplay; }
-  void* getUnixWindow() const { return (void*)&fUnixWindow; }
-  void  setSize(int width, int height);
-    void    updateSize();
+    void* getHWND() const { return (void*)fUnixWindow.fWin; }
+    void* getDisplay() const { return (void*)fUnixWindow.fDisplay; }
+    void* getUnixWindow() const { return (void*)&fUnixWindow; }
+    void setUnixWindow(Display*, Window, size_t, GC);
+    bool attachGL(const SkBitmap* offscreen);
+    void detachGL();
+    void presentGL();
 
-    static bool PostEvent(SkEvent* evt, SkEventSinkID, SkMSec delay);
+    //static bool PostEvent(SkEvent* evt, SkEventSinkID, SkMSec delay);
 
-    static bool WndProc(SkUnixWindow* w,  XEvent &e);
+    //static bool WndProc(SkUnixWindow* w,  XEvent &e);
 
 protected:
     // overrides from SkWindow
+    virtual bool onEvent(const SkEvent&);
     virtual void onHandleInval(const SkIRect&);
-    // overrides from SkView
-    virtual void onAddMenu(const SkOSMenu*);
+    virtual bool onHandleChar(SkUnichar);
+    virtual bool onHandleKey(SkKey);
+    virtual bool onHandleKeyUp(SkKey);
+    virtual void onSetTitle(const char title[]);
 
 private:
     SkUnixWindow  fUnixWindow;
 
     void    doPaint();
 
-    void*   fMBar;
-
     typedef SkWindow INHERITED;
 };