ec3ed6a5eb
I have manually examined all of these diffs and restored a few files that seem to require manual adjustment. The following files still need to be modified manually, in a separate CL: android_sample/SampleApp/AndroidManifest.xml android_sample/SampleApp/res/layout/layout.xml android_sample/SampleApp/res/menu/sample.xml android_sample/SampleApp/res/values/strings.xml android_sample/SampleApp/src/com/skia/sampleapp/SampleApp.java android_sample/SampleApp/src/com/skia/sampleapp/SampleView.java experimental/CiCarbonSampleMain.c experimental/CocoaDebugger/main.m experimental/FileReaderApp/main.m experimental/SimpleCocoaApp/main.m experimental/iOSSampleApp/Shared/SkAlertPrompt.h experimental/iOSSampleApp/Shared/SkAlertPrompt.m experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig experimental/iOSSampleApp/SkiOSSampleApp-Debug.xcconfig experimental/iOSSampleApp/SkiOSSampleApp-Release.xcconfig gpu/src/android/GrGLDefaultInterface_android.cpp gyp/common.gypi gyp_skia include/ports/SkHarfBuzzFont.h include/views/SkOSWindow_wxwidgets.h make.bat make.py src/opts/memset.arm.S src/opts/memset16_neon.S src/opts/memset32_neon.S src/opts/opts_check_arm.cpp src/ports/SkDebug_brew.cpp src/ports/SkMemory_brew.cpp src/ports/SkOSFile_brew.cpp src/ports/SkXMLParser_empty.cpp src/utils/ios/SkImageDecoder_iOS.mm src/utils/ios/SkOSFile_iOS.mm src/utils/ios/SkStream_NSData.mm tests/FillPathTest.cpp Review URL: http://codereview.appspot.com/4816058 git-svn-id: http://skia.googlecode.com/svn/trunk@1982 2bbb7eff-a529-9590-31e7-b0007b416f81
71 lines
1.5 KiB
C++
71 lines
1.5 KiB
C++
|
|
/*
|
|
* Copyright 2006 The Android Open Source Project
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
|
|
#ifndef SkOSWindow_Unix_DEFINED
|
|
#define SkOSWindow_Unix_DEFINED
|
|
|
|
#include "SkWindow.h"
|
|
#include <X11/Xlib.h>
|
|
#include <GL/glx.h>
|
|
|
|
class SkBitmap;
|
|
class SkEvent;
|
|
|
|
struct SkUnixWindow {
|
|
Display* fDisplay;
|
|
Window fWin;
|
|
size_t fOSWin;
|
|
GC fGc;
|
|
GLXContext fGLContext;
|
|
bool fGLCreated;
|
|
};
|
|
|
|
class SkOSWindow : public SkWindow {
|
|
public:
|
|
SkOSWindow(void*);
|
|
~SkOSWindow();
|
|
|
|
void* getHWND() const { return (void*)fUnixWindow.fWin; }
|
|
void* getDisplay() const { return (void*)fUnixWindow.fDisplay; }
|
|
void* getUnixWindow() const { return (void*)&fUnixWindow; }
|
|
void loop();
|
|
void post_linuxevent();
|
|
bool attachGL();
|
|
void detachGL();
|
|
void presentGL();
|
|
|
|
//static bool PostEvent(SkEvent* evt, SkEventSinkID, SkMSec delay);
|
|
|
|
//static bool WndProc(SkUnixWindow* w, XEvent &e);
|
|
|
|
protected:
|
|
// overrides from SkWindow
|
|
virtual bool onEvent(const SkEvent&);
|
|
virtual void onHandleInval(const SkIRect&);
|
|
virtual bool onHandleChar(SkUnichar);
|
|
virtual bool onHandleKey(SkKey);
|
|
virtual bool onHandleKeyUp(SkKey);
|
|
virtual void onSetTitle(const char title[]);
|
|
|
|
private:
|
|
SkUnixWindow fUnixWindow;
|
|
bool fGLAttached;
|
|
|
|
// Needed for GL
|
|
XVisualInfo* fVi;
|
|
|
|
void doPaint();
|
|
void mapWindowAndWait();
|
|
|
|
typedef SkWindow INHERITED;
|
|
};
|
|
|
|
#endif
|
|
|