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

Commit 43beafe0 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:
  Let InputReader set mouse cursor's display.
  Add metadata for mouse cursor.
parents b87b05f2 0a080c36

libs/gui/SurfaceComposerClient.cpp

+3 −2
Original line number Diff line number Diff line
@@ -701,14 +701,15 @@ SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::setLayer 
}



SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::setMetadata(

        const sp<SurfaceControl>& sc, uint32_t key, std::vector<uint8_t> data) {

        const sp<SurfaceControl>& sc, uint32_t key, const Parcel& p) {

    layer_state_t* s = getLayerState(sc);

    if (!s) {

        mStatus = BAD_INDEX;

        return *this;

    }

    s->what |= layer_state_t::eMetadataChanged;

    s->metadata.mMap[key] = std::move(data);



    s->metadata.mMap[key] = {p.data(), p.data() + p.dataSize()};



    registerSurfaceControlForCallback(sc);

    return *this;

libs/gui/include/gui/LayerMetadata.h

+6 −1
Original line number Diff line number Diff line
@@ -22,7 +22,12 @@ 


namespace android {



enum { METADATA_OWNER_UID = 1, METADATA_WINDOW_TYPE = 2, METADATA_TASK_ID = 3 };

enum {

    METADATA_OWNER_UID = 1,

    METADATA_WINDOW_TYPE = 2,

    METADATA_TASK_ID = 3,

    METADATA_MOUSE_CURSOR = 4,

};



struct LayerMetadata : public Parcelable {

    std::unordered_map<uint32_t, std::vector<uint8_t>> mMap;

libs/gui/include/gui/SurfaceComposerClient.h

+1 −2
Original line number Diff line number Diff line
@@ -362,8 +362,7 @@ public: 
        Transaction& setCrop_legacy(const sp<SurfaceControl>& sc, const Rect& crop);

        Transaction& setCornerRadius(const sp<SurfaceControl>& sc, float cornerRadius);

        Transaction& setLayerStack(const sp<SurfaceControl>& sc, uint32_t layerStack);

        Transaction& setMetadata(const sp<SurfaceControl>& sc, uint32_t key,

                                 std::vector<uint8_t> data);

        Transaction& setMetadata(const sp<SurfaceControl>& sc, uint32_t key, const Parcel& p);

        // Defers applying any changes made in this transaction until the Layer

        // identified by handle reaches the given frameNumber. If the Layer identified

        // by handle is removed, then we will apply this transaction regardless of

services/inputflinger/InputReaderBase.cpp

+11 −1
Original line number Diff line number Diff line
@@ -99,6 +99,16 @@ std::optional<DisplayViewport> InputReaderConfiguration::getDisplayViewportByPor 
    return std::nullopt;

}



std::optional<DisplayViewport> InputReaderConfiguration::getDisplayViewportById(

        int32_t displayId) const {

    for (const DisplayViewport& currentViewport : mDisplays) {

        if (currentViewport.displayId == displayId) {

            return std::make_optional(currentViewport);

        }

    }

    return std::nullopt;

}



void InputReaderConfiguration::setDisplayViewports(const std::vector<DisplayViewport>& viewports) {

    mDisplays = viewports;

}

services/inputflinger/include/InputReaderBase.h

+5 −1
Original line number Diff line number Diff line
@@ -172,6 +172,9 @@ struct InputReaderConfiguration { 
    // Used to determine which DisplayViewport should be tied to which InputDevice.

    std::unordered_map<std::string, uint8_t> portAssociations;



    // The suggested display ID to show the cursor.

    int32_t defaultPointerDisplayId;



    // Velocity control parameters for mouse pointer movements.

    VelocityControlParameters pointerVelocityControlParameters;
@@ -274,6 +277,7 @@ struct InputReaderConfiguration { 
    std::optional<DisplayViewport> getDisplayViewportByUniqueId(const std::string& uniqueDisplayId)

            const;

    std::optional<DisplayViewport> getDisplayViewportByPort(uint8_t physicalPort) const;

    std::optional<DisplayViewport> getDisplayViewportById(int32_t displayId) const;

    void setDisplayViewports(const std::vector<DisplayViewport>& viewports);