be1ff3d903
It is enough to get the global cursor location when repainting it. So we do not need to query the relative position. If later on we find this is not right we should be still able to get the relative position from the surface position instead of calling into XWayland. Also it is not expected and apparently unnecessary to move the cursor in the paint function. Therefore remove this call too.
80 lines
1.3 KiB
C++
80 lines
1.3 KiB
C++
#ifndef C_SIDE
|
|
extern "C" {
|
|
#endif
|
|
|
|
#include <stdint.h>
|
|
|
|
extern uint32_t currentOutputWidth;
|
|
extern uint32_t currentOutputHeight;
|
|
|
|
unsigned int get_time_in_milliseconds(void);
|
|
|
|
int steamcompmgr_main(int argc, char **argv);
|
|
|
|
#ifndef C_SIDE
|
|
}
|
|
|
|
#include "rendervulkan.hpp"
|
|
|
|
#include <mutex>
|
|
#include <vector>
|
|
|
|
#include <wlr/render/dmabuf.h>
|
|
|
|
#include <X11/extensions/Xfixes.h>
|
|
|
|
struct ResListEntry_t {
|
|
struct wlr_surface *surf;
|
|
struct wlr_dmabuf_attributes attribs;
|
|
};
|
|
|
|
struct _XDisplay;
|
|
struct _win;
|
|
|
|
class MouseCursor
|
|
{
|
|
public:
|
|
explicit MouseCursor(_XDisplay *display);
|
|
|
|
int x() const;
|
|
int y() const;
|
|
|
|
void move(int x, int y);
|
|
void updatePosition();
|
|
void constrainPosition();
|
|
void resetPosition();
|
|
|
|
void paint(struct _win *window, struct Composite_t *pComposite,
|
|
struct VulkanPipeline_t *pPipeline);
|
|
void setDirty();
|
|
|
|
private:
|
|
void warp(int x, int y);
|
|
void checkSuspension();
|
|
|
|
void queryButtonMask(unsigned int &mask);
|
|
|
|
bool getTexture();
|
|
|
|
int m_x, m_y;
|
|
int m_hotspotX, m_hotspotY;
|
|
int m_width, m_height;
|
|
|
|
VulkanTexture_t m_texture;
|
|
bool m_dirty;
|
|
bool m_imageEmpty;
|
|
|
|
unsigned int m_lastMovedTime;
|
|
bool m_hideForMovement;
|
|
|
|
PointerBarrier m_scaledFocusBarriers[4];
|
|
|
|
bool m_hasPlane;
|
|
|
|
_XDisplay *m_display;
|
|
};
|
|
|
|
extern std::mutex wayland_commit_lock;
|
|
extern std::vector<ResListEntry_t> wayland_commit_queue;
|
|
|
|
#endif
|