Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed6b129e authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topics "cursor_type_hotspot", "set_viewport_in_input_reader" 

* changes:
  PointerController: Add guards to ensure display is valid
  Move setDisplayViewport to InputReader.
  Stop loading animation for addtional cursor type.
  Add cursor type and hotspot to surface metadata.
parents c3aafb85 ca7d7234

core/jni/android_view_SurfaceControl.cpp

+1 −4
Original line number Diff line number Diff line
@@ -483,11 +483,8 @@ static void nativeSetMetadata(JNIEnv* env, jclass clazz, jlong transactionObj, 


    auto transaction = reinterpret_cast<SurfaceComposerClient::Transaction*>(transactionObj);



    std::vector<uint8_t> byteData(parcel->dataSize());

    memcpy(byteData.data(), parcel->data(), parcel->dataSize());



    SurfaceControl* const ctrl = reinterpret_cast<SurfaceControl*>(nativeObject);

    transaction->setMetadata(ctrl, id, std::move(byteData));

    transaction->setMetadata(ctrl, id, *parcel);

}



static void nativeSetColor(JNIEnv* env, jclass clazz, jlong transactionObj,

libs/input/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ cc_library_shared { 
    ],



    shared_libs: [

        "libbinder",

        "libcutils",

        "liblog",

        "libutils",

libs/input/PointerController.cpp

+24 −9
Original line number Diff line number Diff line
@@ -257,19 +257,24 @@ void PointerController::unfade(Transition transition) { 
void PointerController::setPresentation(Presentation presentation) {

    AutoMutex _l(mLock);



    if (presentation == PRESENTATION_POINTER && mLocked.additionalMouseResources.empty()) {

        mPolicy->loadAdditionalMouseResources(&mLocked.additionalMouseResources,

                &mLocked.animationResources, mLocked.viewport.displayId);

    if (mLocked.presentation == presentation) {

        return;

    }



    if (mLocked.presentation != presentation) {

    mLocked.presentation = presentation;

    mLocked.presentationChanged = true;



        if (presentation != PRESENTATION_SPOT) {

            fadeOutAndReleaseAllSpotsLocked();

    if (!mLocked.viewport.isValid()) {

        return;

    }



    if (presentation == PRESENTATION_POINTER) {

        if (mLocked.additionalMouseResources.empty()) {

            mPolicy->loadAdditionalMouseResources(&mLocked.additionalMouseResources,

                                                  &mLocked.animationResources,

                                                  mLocked.viewport.displayId);

        }

        fadeOutAndReleaseAllSpotsLocked();

        updatePointerLocked();

    }

}
@@ -291,6 +296,9 @@ void PointerController::setSpots(const PointerCoords* spotCoords, 
#endif



    AutoMutex _l(mLock);

    if (!mLocked.viewport.isValid()) {

        return;

    }



    std::vector<Spot*> newSpots;

    std::map<int32_t, std::vector<Spot*>>::const_iterator iter =
@@ -337,6 +345,9 @@ void PointerController::clearSpots() { 
#endif



    AutoMutex _l(mLock);

    if (!mLocked.viewport.isValid()) {

        return;

    }



    fadeOutAndReleaseAllSpotsLocked();

}
@@ -758,6 +769,10 @@ void PointerController::fadeOutAndReleaseAllSpotsLocked() { 
}



void PointerController::loadResourcesLocked() REQUIRES(mLock) {

    if (!mLocked.viewport.isValid()) {

        return;

    }



    mPolicy->loadPointerResources(&mResources, mLocked.viewport.displayId);

    mPolicy->loadPointerIcon(&mLocked.pointerIcon, mLocked.viewport.displayId);

libs/input/PointerController.h

+1 −1
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ public: 
    virtual int32_t getDisplayId() const;

    virtual void fade(Transition transition);

    virtual void unfade(Transition transition);

    virtual void setDisplayViewport(const DisplayViewport& viewport);



    virtual void setPresentation(Presentation presentation);

    virtual void setSpots(const PointerCoords* spotCoords,
@@ -108,7 +109,6 @@ public: 


    void updatePointerIcon(int32_t iconId);

    void setCustomPointerIcon(const SpriteIcon& icon);

    void setDisplayViewport(const DisplayViewport& viewport);

    void setInactivityTimeout(InactivityTimeout inactivityTimeout);

    void reloadPointerResources();

libs/input/SpriteController.cpp

+23 −2
Original line number Diff line number Diff line
@@ -245,7 +245,8 @@ void SpriteController::doUpdateSprites() { 
        if (update.state.surfaceControl != NULL && (becomingVisible || becomingHidden

                || (wantSurfaceVisibleAndDrawn && (update.state.dirty & (DIRTY_ALPHA

                        | DIRTY_POSITION | DIRTY_TRANSFORMATION_MATRIX | DIRTY_LAYER

                        | DIRTY_VISIBILITY | DIRTY_HOTSPOT | DIRTY_DISPLAY_ID))))) {

                        | DIRTY_VISIBILITY | DIRTY_HOTSPOT | DIRTY_DISPLAY_ID

                        | DIRTY_ICON_STYLE))))) {

            needApplyTransaction = true;



            if (wantSurfaceVisibleAndDrawn
@@ -274,6 +275,21 @@ void SpriteController::doUpdateSprites() { 
                        update.state.transformationMatrix.dtdy);

            }



            if (wantSurfaceVisibleAndDrawn

                    && (becomingVisible

                            || (update.state.dirty & (DIRTY_HOTSPOT | DIRTY_ICON_STYLE)))) {

                Parcel p;

                p.writeInt32(update.state.icon.style);

                p.writeFloat(update.state.icon.hotSpotX);

                p.writeFloat(update.state.icon.hotSpotY);



                // Pass cursor metadata in the sprite surface so that when Android is running as a

                // client OS (e.g. ARC++) the host OS can get the requested cursor metadata and

                // update mouse cursor in the host OS.

                t.setMetadata(

                        update.state.surfaceControl, METADATA_MOUSE_CURSOR, p);

            }



            int32_t surfaceLayer = mOverlayLayer + update.state.layer;

            if (wantSurfaceVisibleAndDrawn

                    && (becomingVisible || (update.state.dirty & DIRTY_LAYER))) {
@@ -397,9 +413,14 @@ void SpriteController::SpriteImpl::setIcon(const SpriteIcon& icon) { 
        } else {

            dirty = DIRTY_BITMAP;

        }



        if (mLocked.state.icon.style != icon.style) {

            mLocked.state.icon.style = icon.style;

            dirty |= DIRTY_ICON_STYLE;

        }

    } else if (mLocked.state.icon.isValid()) {

        mLocked.state.icon.bitmap.reset();

        dirty = DIRTY_BITMAP | DIRTY_HOTSPOT;

        dirty = DIRTY_BITMAP | DIRTY_HOTSPOT | DIRTY_ICON_STYLE;

    } else {

        return; // setting to invalid icon and already invalid so nothing to do

    }