Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-26 12:27:52 +00:00
Code Issues Releases Activity

Tweaks

Browse Source 
Signed-off-by: Tin <tin.svagelj@live.com>
This commit is contained in:
Tin 2023-11-08 04:15:01 +01:00 committed by Brenden Matthews
parent b4fa9b8ad9
commit f6a08f79b4
No known key found for this signature in database
GPG Key ID: 137B7AC2BDFD8DF0
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/display-wayland.cc
View File

@ -439,7 +439,7 @@ static void on_pointer_enter(void *data, wl_pointer *pointer, uint32_t serial,
size_t x = static_cast<size_t>(wl_fixed_to_double(surface_x)); size_t x = static_cast<size_t>(wl_fixed_to_double(surface_x));
size_t y = static_cast<size_t>(wl_fixed_to_double(surface_y)); size_t y = static_cast<size_t>(wl_fixed_to_double(surface_y));
last_known_positions[pointer] = {x, y}; last_known_positions[pointer] = std::array<size_t, 2>{x, y};
size_t abs_x = w->rectangle.x + x; size_t abs_x = w->rectangle.x + x;
size_t abs_y = w->rectangle.y + y; size_t abs_y = w->rectangle.y + y;
@ -485,7 +485,7 @@ static void on_pointer_motion(void *data,
size_t x = static_cast<size_t>(wl_fixed_to_double(surface_x)); size_t x = static_cast<size_t>(wl_fixed_to_double(surface_x));
size_t y = static_cast<size_t>(wl_fixed_to_double(surface_y)); size_t y = static_cast<size_t>(wl_fixed_to_double(surface_y));
last_known_positions[pointer] = std::array<size_t, 2> {x, y}; last_known_positions[pointer] = std::array<size_t, 2>{x, y};
size_t abs_x = w->rectangle.x + x; size_t abs_x = w->rectangle.x + x;
size_t abs_y = w->rectangle.y + y; size_t abs_y = w->rectangle.y + y;
@ -630,6 +630,7 @@ bool display_output_wayland::initialize() {
wl_surface_commit(global_window->surface); wl_surface_commit(global_window->surface);
wl_display_roundtrip(global_display); wl_display_roundtrip(global_display);
wayland_create_window(); wayland_create_window();
return true; return true;
} }

2
src/display-x11.cc
View File

@ -231,7 +231,7 @@ bool display_output_x11::shutdown() {
} }
inline void propagate_unconsumed_event(XEvent &ev, bool is_consumed) { inline void propagate_unconsumed_event(XEvent &ev, bool is_consumed) {
uint32_t capture_mask = ButtonPressMask | ButtonReleaseMask | ButtonMotionMask; const uint32_t capture_mask = ButtonPressMask | ButtonReleaseMask | ButtonMotionMask;
// SAFETY: XEvent is a union and all event types this function gets called for // SAFETY: XEvent is a union and all event types this function gets called for
// share same alignment and accessed fields share same offsets. // share same alignment and accessed fields share same offsets.

2
src/main.cc
View File

@ -183,7 +183,7 @@ static void print_version() {
#endif #endif
#endif /* BUILD_X11 */ #endif /* BUILD_X11 */
#ifdef BUILD_WAYLAND #ifdef BUILD_WAYLAND
<< _(" X11:\n") << _(" Wayland:\n")
#ifdef BUILD_MOUSE_EVENTS #ifdef BUILD_MOUSE_EVENTS
<< _(" * Mouse events\n") << _(" * Mouse events\n")
#endif #endif