diff options
author | Mathias Agopian <mathias@google.com> | 2012-08-08 19:42:09 -0700 |
---|---|---|
committer | Mathias Agopian <mathias@google.com> | 2012-08-10 13:18:24 -0700 |
commit | 3165cc21cfea781988407b19bd83292b19f05f55 (patch) | |
tree | c15822a2e6e291d2b33bffb31769b4c2ec003d20 /include | |
parent | 1e26087493ac0e7d7dc6dea8ad85cfef08b3271f (diff) | |
download | frameworks_native-3165cc21cfea781988407b19bd83292b19f05f55.zip frameworks_native-3165cc21cfea781988407b19bd83292b19f05f55.tar.gz frameworks_native-3165cc21cfea781988407b19bd83292b19f05f55.tar.bz2 |
libgui includes refactoring
Change-Id: I1d24ec17f5003ec2abab5f7472daaff4cc4cc2d3
Diffstat (limited to 'include')
-rw-r--r-- | include/gui/ISurfaceComposer.h | 70 | ||||
-rw-r--r-- | include/gui/ISurfaceComposerClient.h | 42 | ||||
-rw-r--r-- | include/private/gui/LayerState.h | 27 |
3 files changed, 64 insertions, 75 deletions
diff --git a/include/gui/ISurfaceComposer.h b/include/gui/ISurfaceComposer.h index 82a5956..b2f8889 100644 --- a/include/gui/ISurfaceComposer.h +++ b/include/gui/ISurfaceComposer.h @@ -39,54 +39,13 @@ class DisplayInfo; class IDisplayEventConnection; class IMemoryHeap; -class ISurfaceComposer : public IInterface -{ +class ISurfaceComposer: public IInterface { public: DECLARE_META_INTERFACE(SurfaceComposer); - enum { // (keep in sync with Surface.java) - eHidden = 0x00000004, - eDestroyBackbuffer = 0x00000020, - eSecure = 0x00000080, - eNonPremultiplied = 0x00000100, - eOpaque = 0x00000400, - eProtectedByApp = 0x00000800, - eProtectedByDRM = 0x00001000, - - eFXSurfaceNormal = 0x00000000, - eFXSurfaceBlur = 0x00010000, - eFXSurfaceDim = 0x00020000, - eFXSurfaceScreenshot= 0x00030000, - eFXSurfaceMask = 0x000F0000, - }; - - enum { - ePositionChanged = 0x00000001, - eLayerChanged = 0x00000002, - eSizeChanged = 0x00000004, - eAlphaChanged = 0x00000008, - eMatrixChanged = 0x00000010, - eTransparentRegionChanged = 0x00000020, - eVisibilityChanged = 0x00000040, - eLayerStackChanged = 0x00000080, - eCropChanged = 0x00000100, - }; - - enum { - eLayerHidden = 0x01, - }; - - enum { - eOrientationDefault = 0, - eOrientation90 = 1, - eOrientation180 = 2, - eOrientation270 = 3, - eOrientationUnchanged = 4, - eOrientationSwapMask = 0x01 - }; - + // flags for setTransactionState() enum { - eSynchronous = 0x01, + eSynchronous = 0x01, }; /* create connection with surface flinger, requires @@ -99,10 +58,8 @@ public: virtual sp<IGraphicBufferAlloc> createGraphicBufferAlloc() = 0; /* open/close transactions. requires ACCESS_SURFACE_FLINGER permission */ - virtual void setTransactionState( - const Vector<ComposerState>& state, - const Vector<DisplayState>& displays, - uint32_t flags) = 0; + virtual void setTransactionState(const Vector<ComposerState>& state, + const Vector<DisplayState>& displays, uint32_t flags) = 0; /* signal that we're done booting. * Requires ACCESS_SURFACE_FLINGER permission @@ -112,11 +69,10 @@ public: /* Capture the specified screen. requires READ_FRAME_BUFFER permission * This function will fail if there is a secure window on screen. */ - virtual status_t captureScreen(DisplayID dpy, - sp<IMemoryHeap>* heap, + virtual status_t captureScreen(DisplayID dpy, sp<IMemoryHeap>* heap, uint32_t* width, uint32_t* height, PixelFormat* format, - uint32_t reqWidth, uint32_t reqHeight, - uint32_t minLayerZ, uint32_t maxLayerZ) = 0; + uint32_t reqWidth, uint32_t reqHeight, uint32_t minLayerZ, + uint32_t maxLayerZ) = 0; /* verify that an ISurfaceTexture was created by SurfaceFlinger. */ @@ -142,8 +98,7 @@ public: // ---------------------------------------------------------------------------- -class BnSurfaceComposer : public BnInterface<ISurfaceComposer> -{ +class BnSurfaceComposer: public BnInterface<ISurfaceComposer> { public: enum { // Note: BOOT_FINISHED must remain this value, it is called from @@ -153,7 +108,6 @@ public: CREATE_GRAPHIC_BUFFER_ALLOC, GET_DISPLAY_INFO, SET_TRANSACTION_STATE, - SET_ORIENTATION, CAPTURE_SCREEN, AUTHENTICATE_SURFACE, CREATE_DISPLAY_EVENT_CONNECTION, @@ -162,10 +116,8 @@ public: CONNECT_DISPLAY, }; - virtual status_t onTransact( uint32_t code, - const Parcel& data, - Parcel* reply, - uint32_t flags = 0); + virtual status_t onTransact(uint32_t code, const Parcel& data, + Parcel* reply, uint32_t flags = 0); }; // ---------------------------------------------------------------------------- diff --git a/include/gui/ISurfaceComposerClient.h b/include/gui/ISurfaceComposerClient.h index c793933..259c1df 100644 --- a/include/gui/ISurfaceComposerClient.h +++ b/include/gui/ISurfaceComposerClient.h @@ -42,9 +42,26 @@ class ISurfaceComposerClient : public IInterface public: DECLARE_META_INTERFACE(SurfaceComposerClient); + // flags for createSurface() + enum { // (keep in sync with Surface.java) + eHidden = 0x00000004, + eDestroyBackbuffer = 0x00000020, + eSecure = 0x00000080, + eNonPremultiplied = 0x00000100, + eOpaque = 0x00000400, + eProtectedByApp = 0x00000800, + eProtectedByDRM = 0x00001000, + + eFXSurfaceNormal = 0x00000000, + eFXSurfaceBlur = 0x00010000, // deprecated, same as Dim + eFXSurfaceDim = 0x00020000, + eFXSurfaceScreenshot= 0x00030000, + eFXSurfaceMask = 0x000F0000, + }; + struct surface_data_t { - int32_t token; - int32_t identity; + int32_t token; + int32_t identity; status_t readFromParcel(const Parcel& parcel); status_t writeToParcel(Parcel* parcel) const; }; @@ -52,29 +69,22 @@ public: /* * Requires ACCESS_SURFACE_FLINGER permission */ - virtual sp<ISurface> createSurface( surface_data_t* data, - const String8& name, - DisplayID display, - uint32_t w, - uint32_t h, - PixelFormat format, - uint32_t flags) = 0; + virtual sp<ISurface> createSurface(surface_data_t* data, + const String8& name, DisplayID display, uint32_t w, uint32_t h, + PixelFormat format, uint32_t flags) = 0; /* * Requires ACCESS_SURFACE_FLINGER permission */ - virtual status_t destroySurface(SurfaceID sid) = 0; + virtual status_t destroySurface(SurfaceID sid) = 0; }; // ---------------------------------------------------------------------------- -class BnSurfaceComposerClient : public BnInterface<ISurfaceComposerClient> -{ +class BnSurfaceComposerClient: public BnInterface<ISurfaceComposerClient> { public: - virtual status_t onTransact( uint32_t code, - const Parcel& data, - Parcel* reply, - uint32_t flags = 0); + virtual status_t onTransact(uint32_t code, const Parcel& data, + Parcel* reply, uint32_t flags = 0); }; // ---------------------------------------------------------------------------- diff --git a/include/private/gui/LayerState.h b/include/private/gui/LayerState.h index 61acaac..90e74a9 100644 --- a/include/private/gui/LayerState.h +++ b/include/private/gui/LayerState.h @@ -33,6 +33,23 @@ class ISurfaceComposerClient; struct layer_state_t { + + enum { + eLayerHidden = 0x01, + }; + + enum { + ePositionChanged = 0x00000001, + eLayerChanged = 0x00000002, + eSizeChanged = 0x00000004, + eAlphaChanged = 0x00000008, + eMatrixChanged = 0x00000010, + eTransparentRegionChanged = 0x00000020, + eVisibilityChanged = 0x00000040, + eLayerStackChanged = 0x00000080, + eCropChanged = 0x00000100, + }; + layer_state_t() : surface(0), what(0), x(0), y(0), z(0), w(0), h(0), layerStack(0), @@ -79,6 +96,16 @@ struct ComposerState { }; struct DisplayState { + + enum { + eOrientationDefault = 0, + eOrientation90 = 1, + eOrientation180 = 2, + eOrientation270 = 3, + eOrientationUnchanged = 4, + eOrientationSwapMask = 0x01 + }; + int32_t displayId; sp<ISurfaceTexture> surface; uint32_t layerStack; |