Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 37 additions & 4 deletions src/input.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -170,7 +170,7 @@ namespace input {
touch_port_event {std::move(touch_port_event)},
feedback_queue {std::move(feedback_queue)},
mouse_left_button_timeout {},
touch_port {{0, 0, 0, 0}, 0, 0, 1.0f},
touch_port {{0, 0, 0, 0}, 0, 0, 1.0f, 1.0f, 0, 0},
accumulated_vscroll_delta {},
accumulated_hscroll_delta {} {
}
Expand DownExpand Up@@ -480,7 +480,29 @@ namespace input {
x = std::clamp(x, offsetX, (size.first * scalarX) - offsetX);
y = std::clamp(y, offsetY, (size.second * scalarY) - offsetY);

return std::pair {(x - offsetX) * touch_port.scalar_inv, (y - offsetY) * touch_port.scalar_inv};
/*
x and y here below have the coordinates of the surface of the streaming resolution,
and are dependent on how that comes configured from the client (scalar_inv is calculated
from the proportion of that and the device's **physical** size).
*/
x = (x - offsetX) * touch_port.scalar_inv;
y = (y - offsetY) * touch_port.scalar_inv;

/*
This final operation is a bit weird and has been brought about with lots of trial and error. A better
way to do this may exist.

Basically, this is what makes the touchscreen map to the coordinates inputtino expects properly.
Since inputtino's dimensions are now logical (because scaling breaks everything otherwise), using the previous
x and y coordinates would be incorrect when screens are scaled, because the touch port is smaller (or larger)
by a factor (that factor is touch_port.scalar_tpcoords), and that factor must be used to account for that difference
when moving the cursor. Otherwise, it will move either slower or faster than your finger proportionally to
scalar_tpcoords, and be offset *inversely* proportionally to scalar_tpcoords. So you must account for both differences
by multiplying and dividing.
*/
float final_x = (x + touch_port.offset_x * touch_port.scalar_tpcoords) / touch_port.scalar_tpcoords;
float final_y = (y + touch_port.offset_y * touch_port.scalar_tpcoords) / touch_port.scalar_tpcoords;
return std::pair {final_x, final_y};
}

/**
Expand DownExpand Up@@ -545,11 +567,22 @@ namespace input {
}

auto &touch_port = input->touch_port;

int touch_port_dim_x;
int touch_port_dim_y;
if (touch_port.env_logical_width != 0 && touch_port.env_logical_height != 0) {
touch_port_dim_x = touch_port.env_logical_width;
touch_port_dim_y = touch_port.env_logical_height;
} else {
touch_port_dim_x = touch_port.env_width;
touch_port_dim_y = touch_port.env_height;
}

platf::touch_port_t abs_port {
touch_port.offset_x,
touch_port.offset_y,
touch_port.env_width,
touch_port.env_height
touch_port_dim_x,
touch_port_dim_y
};

platf::abs_mouse(platf_input, abs_port, tpcoords->first, tpcoords->second);
Expand Down
4 changes: 3 additions & 1 deletion src/input.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,9 @@ namespace input {
// Offset x and y coordinates of the client
float client_offsetX, client_offsetY;

float scalar_inv;
float scalar_inv, scalar_tpcoords;

int env_logical_width, env_logical_height;

explicit operator bool() const {
return width != 0 && height != 0 && env_width != 0 && env_height != 0;
Expand Down
3 changes: 3 additions & 0 deletions src/platform/common.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -270,6 +270,7 @@ namespace platf {
struct touch_port_t {
int offset_x, offset_y;
int width, height;
int logical_width, logical_height;
};

// These values must match Limelight-internal.h's SS_FF_* constants!
Expand DownExpand Up@@ -535,8 +536,10 @@ namespace platf {
// Offsets for when streaming a specific monitor. By default, they are 0.
int offset_x, offset_y;
int env_width, env_height;
int env_logical_width, env_logical_height;

int width, height;
int logical_width, logical_height;

protected:
// collect capture timing data (at loglevel debug)
Expand Down
19 changes: 17 additions & 2 deletions src/platform/linux/kmsgrab.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,6 +123,9 @@ namespace platf {
static int env_width;
static int env_height;

static int env_logical_width;
static int env_logical_height;

std::string_view plane_type(std::uint64_t val) {
switch (val) {
case DRM_PLANE_TYPE_OVERLAY:
Expand DownExpand Up@@ -686,13 +689,19 @@ namespace platf {
this->env_width = ::platf::kms::env_width;
this->env_height = ::platf::kms::env_height;

this->env_logical_width = ::platf::kms::env_logical_width;
this->env_logical_height = ::platf::kms::env_logical_height;

auto monitor = pos->crtc_to_monitor.find(plane->crtc_id);
if (monitor != std::end(pos->crtc_to_monitor)) {
auto &viewport = monitor->second.viewport;

width = viewport.width;
height = viewport.height;

logical_width = viewport.logical_width;
logical_height = viewport.logical_height;

switch (card.get_panel_orientation(plane->plane_id)) {
case DRM_MODE_ROTATE_270:
BOOST_LOG(debug) << "Detected panel orientation at 90, swapping width and height.";
Expand DownExpand Up@@ -1542,8 +1551,8 @@ namespace platf {
if (monitor_descriptor.index == index && monitor_descriptor.type == type) {
monitor_descriptor.viewport.offset_x = monitor->viewport.offset_x;
monitor_descriptor.viewport.offset_y = monitor->viewport.offset_y;
monitor_descriptor.viewport.width = monitor->viewport.width;
monitor_descriptor.viewport.height = monitor->viewport.height;
monitor_descriptor.viewport.logical_width = monitor->viewport.logical_width;
monitor_descriptor.viewport.logical_height = monitor->viewport.logical_height;

// A sanity check, it's guesswork after all.
if (
Expand DownExpand Up@@ -1682,6 +1691,9 @@ namespace platf {
kms::env_width = 0;
kms::env_height = 0;

kms::env_logical_width = 0;
kms::env_logical_height = 0;

for (auto &card_descriptor : cds) {
for (auto &[_, monitor_descriptor] : card_descriptor.crtc_to_monitor) {
BOOST_LOG(debug) << "Monitor description"sv;
Expand All@@ -1690,6 +1702,9 @@ namespace platf {

kms::env_width = std::max(kms::env_width, (int) (monitor_descriptor.viewport.offset_x + monitor_descriptor.viewport.width));
kms::env_height = std::max(kms::env_height, (int) (monitor_descriptor.viewport.offset_y + monitor_descriptor.viewport.height));

kms::env_logical_height = std::max(kms::env_logical_height, (int) (monitor_descriptor.viewport.offset_y + monitor_descriptor.viewport.logical_height));
kms::env_logical_width = std::max(kms::env_logical_width, (int) (monitor_descriptor.viewport.offset_x + monitor_descriptor.viewport.logical_width));
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/platform/linux/wayland.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,8 +144,8 @@ namespace wl {
}

void monitor_t::xdg_size(zxdg_output_v1 *, std::int32_t width, std::int32_t height) {
viewport.width = width;
viewport.height = height;
viewport.logical_width = width;
viewport.logical_height = height;
BOOST_LOG(info) << "Logical size: "sv << width << 'x' << height;
}

Expand Down
15 changes: 15 additions & 0 deletions src/video.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -1993,6 +1993,18 @@ namespace video {

auto scalar = std::fminf(wt / wd, ht / hd);

// we initialize scalar_tpcoords and logical dimensions to default values in case they are not set (non-KMS)
float scalar_tpcoords = 1.0f;
int display_env_logical_width = 0;
int display_env_logical_height = 0;
if (display->logical_width && display->logical_height && display->env_logical_width && display->env_logical_height) {
float lwd = display->logical_width;
float lhd = display->logical_height;
scalar_tpcoords = std::fminf(wd / lwd, hd / lhd);
display_env_logical_width = display->env_logical_width;
display_env_logical_height = display->env_logical_height;
}

auto w2 = scalar * wd;
auto h2 = scalar * hd;

Expand All@@ -2011,6 +2023,9 @@ namespace video {
offsetX,
offsetY,
1.0f / scalar,
scalar_tpcoords,
display_env_logical_width,
display_env_logical_height
};
}

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 37 additions & 4 deletions src/input.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -170,7 +170,7 @@ namespace input {
touch_port_event {std::move(touch_port_event)},
feedback_queue {std::move(feedback_queue)},
mouse_left_button_timeout {},
touch_port {{0, 0, 0, 0}, 0, 0, 1.0f},
touch_port {{0, 0, 0, 0}, 0, 0, 1.0f, 1.0f, 0, 0},
accumulated_vscroll_delta {},
accumulated_hscroll_delta {} {
}
Expand DownExpand Up@@ -480,7 +480,29 @@ namespace input {
x = std::clamp(x, offsetX, (size.first * scalarX) - offsetX);
y = std::clamp(y, offsetY, (size.second * scalarY) - offsetY);

return std::pair {(x - offsetX) * touch_port.scalar_inv, (y - offsetY) * touch_port.scalar_inv};
/*
x and y here below have the coordinates of the surface of the streaming resolution,
and are dependent on how that comes configured from the client (scalar_inv is calculated
from the proportion of that and the device's **physical** size).
*/
x = (x - offsetX) * touch_port.scalar_inv;
y = (y - offsetY) * touch_port.scalar_inv;

/*
This final operation is a bit weird and has been brought about with lots of trial and error. A better
way to do this may exist.

Basically, this is what makes the touchscreen map to the coordinates inputtino expects properly.
Since inputtino's dimensions are now logical (because scaling breaks everything otherwise), using the previous
x and y coordinates would be incorrect when screens are scaled, because the touch port is smaller (or larger)
by a factor (that factor is touch_port.scalar_tpcoords), and that factor must be used to account for that difference
when moving the cursor. Otherwise, it will move either slower or faster than your finger proportionally to
scalar_tpcoords, and be offset *inversely* proportionally to scalar_tpcoords. So you must account for both differences
by multiplying and dividing.
*/
float final_x = (x + touch_port.offset_x * touch_port.scalar_tpcoords) / touch_port.scalar_tpcoords;
float final_y = (y + touch_port.offset_y * touch_port.scalar_tpcoords) / touch_port.scalar_tpcoords;
return std::pair {final_x, final_y};
}

/**
Expand DownExpand Up@@ -545,11 +567,22 @@ namespace input {
}

auto &touch_port = input->touch_port;

int touch_port_dim_x;
int touch_port_dim_y;
if (touch_port.env_logical_width != 0 && touch_port.env_logical_height != 0) {
touch_port_dim_x = touch_port.env_logical_width;
touch_port_dim_y = touch_port.env_logical_height;
} else {
touch_port_dim_x = touch_port.env_width;
touch_port_dim_y = touch_port.env_height;
}

platf::touch_port_t abs_port {
touch_port.offset_x,
touch_port.offset_y,
touch_port.env_width,
touch_port.env_height
touch_port_dim_x,
touch_port_dim_y
};

platf::abs_mouse(platf_input, abs_port, tpcoords->first, tpcoords->second);
Expand Down
4 changes: 3 additions & 1 deletion src/input.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,9 @@ namespace input {
// Offset x and y coordinates of the client
float client_offsetX, client_offsetY;

float scalar_inv;
float scalar_inv, scalar_tpcoords;

int env_logical_width, env_logical_height;

explicit operator bool() const {
return width != 0 && height != 0 && env_width != 0 && env_height != 0;
Expand Down
3 changes: 3 additions & 0 deletions src/platform/common.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -270,6 +270,7 @@ namespace platf {
struct touch_port_t {
int offset_x, offset_y;
int width, height;
int logical_width, logical_height;
};

// These values must match Limelight-internal.h's SS_FF_* constants!
Expand DownExpand Up@@ -535,8 +536,10 @@ namespace platf {
// Offsets for when streaming a specific monitor. By default, they are 0.
int offset_x, offset_y;
int env_width, env_height;
int env_logical_width, env_logical_height;

int width, height;
int logical_width, logical_height;

protected:
// collect capture timing data (at loglevel debug)
Expand Down
19 changes: 17 additions & 2 deletions src/platform/linux/kmsgrab.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,6 +123,9 @@ namespace platf {
static int env_width;
static int env_height;

static int env_logical_width;
static int env_logical_height;

std::string_view plane_type(std::uint64_t val) {
switch (val) {
case DRM_PLANE_TYPE_OVERLAY:
Expand DownExpand Up@@ -686,13 +689,19 @@ namespace platf {
this->env_width = ::platf::kms::env_width;
this->env_height = ::platf::kms::env_height;

this->env_logical_width = ::platf::kms::env_logical_width;
this->env_logical_height = ::platf::kms::env_logical_height;

auto monitor = pos->crtc_to_monitor.find(plane->crtc_id);
if (monitor != std::end(pos->crtc_to_monitor)) {
auto &viewport = monitor->second.viewport;

width = viewport.width;
height = viewport.height;

logical_width = viewport.logical_width;
logical_height = viewport.logical_height;

switch (card.get_panel_orientation(plane->plane_id)) {
case DRM_MODE_ROTATE_270:
BOOST_LOG(debug) << "Detected panel orientation at 90, swapping width and height.";
Expand DownExpand Up@@ -1542,8 +1551,8 @@ namespace platf {
if (monitor_descriptor.index == index && monitor_descriptor.type == type) {
monitor_descriptor.viewport.offset_x = monitor->viewport.offset_x;
monitor_descriptor.viewport.offset_y = monitor->viewport.offset_y;
monitor_descriptor.viewport.width = monitor->viewport.width;
monitor_descriptor.viewport.height = monitor->viewport.height;
monitor_descriptor.viewport.logical_width = monitor->viewport.logical_width;
monitor_descriptor.viewport.logical_height = monitor->viewport.logical_height;

// A sanity check, it's guesswork after all.
if (
Expand DownExpand Up@@ -1682,6 +1691,9 @@ namespace platf {
kms::env_width = 0;
kms::env_height = 0;

kms::env_logical_width = 0;
kms::env_logical_height = 0;

for (auto &card_descriptor : cds) {
for (auto &[_, monitor_descriptor] : card_descriptor.crtc_to_monitor) {
BOOST_LOG(debug) << "Monitor description"sv;
Expand All@@ -1690,6 +1702,9 @@ namespace platf {

kms::env_width = std::max(kms::env_width, (int) (monitor_descriptor.viewport.offset_x + monitor_descriptor.viewport.width));
kms::env_height = std::max(kms::env_height, (int) (monitor_descriptor.viewport.offset_y + monitor_descriptor.viewport.height));

kms::env_logical_height = std::max(kms::env_logical_height, (int) (monitor_descriptor.viewport.offset_y + monitor_descriptor.viewport.logical_height));
kms::env_logical_width = std::max(kms::env_logical_width, (int) (monitor_descriptor.viewport.offset_x + monitor_descriptor.viewport.logical_width));
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/platform/linux/wayland.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,8 +144,8 @@ namespace wl {
}

void monitor_t::xdg_size(zxdg_output_v1 *, std::int32_t width, std::int32_t height) {
viewport.width = width;
viewport.height = height;
viewport.logical_width = width;
viewport.logical_height = height;
BOOST_LOG(info) << "Logical size: "sv << width << 'x' << height;
}

Expand Down
15 changes: 15 additions & 0 deletions src/video.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -1993,6 +1993,18 @@ namespace video {

auto scalar = std::fminf(wt / wd, ht / hd);

// we initialize scalar_tpcoords and logical dimensions to default values in case they are not set (non-KMS)
float scalar_tpcoords = 1.0f;
int display_env_logical_width = 0;
int display_env_logical_height = 0;
if (display->logical_width && display->logical_height && display->env_logical_width && display->env_logical_height) {
float lwd = display->logical_width;
float lhd = display->logical_height;
scalar_tpcoords = std::fminf(wd / lwd, hd / lhd);
display_env_logical_width = display->env_logical_width;
display_env_logical_height = display->env_logical_height;
}

auto w2 = scalar * wd;
auto h2 = scalar * hd;

Expand All@@ -2011,6 +2023,9 @@ namespace video {
offsetX,
offsetY,
1.0f / scalar,
scalar_tpcoords,
display_env_logical_width,
display_env_logical_height
};
}

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 37 additions & 4 deletions src/input.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -170,7 +170,7 @@ namespace input {
touch_port_event {std::move(touch_port_event)},
feedback_queue {std::move(feedback_queue)},
mouse_left_button_timeout {},
touch_port {{0, 0, 0, 0}, 0, 0, 1.0f},
touch_port {{0, 0, 0, 0}, 0, 0, 1.0f, 1.0f, 0, 0},
accumulated_vscroll_delta {},
accumulated_hscroll_delta {} {
}
Expand DownExpand Up@@ -480,7 +480,29 @@ namespace input {
x = std::clamp(x, offsetX, (size.first * scalarX) - offsetX);
y = std::clamp(y, offsetY, (size.second * scalarY) - offsetY);

return std::pair {(x - offsetX) * touch_port.scalar_inv, (y - offsetY) * touch_port.scalar_inv};
/*
x and y here below have the coordinates of the surface of the streaming resolution,
and are dependent on how that comes configured from the client (scalar_inv is calculated
from the proportion of that and the device's **physical** size).
*/
x = (x - offsetX) * touch_port.scalar_inv;
y = (y - offsetY) * touch_port.scalar_inv;

/*
This final operation is a bit weird and has been brought about with lots of trial and error. A better
way to do this may exist.

Basically, this is what makes the touchscreen map to the coordinates inputtino expects properly.
Since inputtino's dimensions are now logical (because scaling breaks everything otherwise), using the previous
x and y coordinates would be incorrect when screens are scaled, because the touch port is smaller (or larger)
by a factor (that factor is touch_port.scalar_tpcoords), and that factor must be used to account for that difference
when moving the cursor. Otherwise, it will move either slower or faster than your finger proportionally to
scalar_tpcoords, and be offset *inversely* proportionally to scalar_tpcoords. So you must account for both differences
by multiplying and dividing.
*/
float final_x = (x + touch_port.offset_x * touch_port.scalar_tpcoords) / touch_port.scalar_tpcoords;
float final_y = (y + touch_port.offset_y * touch_port.scalar_tpcoords) / touch_port.scalar_tpcoords;
return std::pair {final_x, final_y};
}

/**
Expand DownExpand Up@@ -545,11 +567,22 @@ namespace input {
}

auto &touch_port = input->touch_port;

int touch_port_dim_x;
int touch_port_dim_y;
if (touch_port.env_logical_width != 0 && touch_port.env_logical_height != 0) {
touch_port_dim_x = touch_port.env_logical_width;
touch_port_dim_y = touch_port.env_logical_height;
} else {
touch_port_dim_x = touch_port.env_width;
touch_port_dim_y = touch_port.env_height;
}

platf::touch_port_t abs_port {
touch_port.offset_x,
touch_port.offset_y,
touch_port.env_width,
touch_port.env_height
touch_port_dim_x,
touch_port_dim_y
};

platf::abs_mouse(platf_input, abs_port, tpcoords->first, tpcoords->second);
Expand Down
4 changes: 3 additions & 1 deletion src/input.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,9 @@ namespace input {
// Offset x and y coordinates of the client
float client_offsetX, client_offsetY;

float scalar_inv;
float scalar_inv, scalar_tpcoords;

int env_logical_width, env_logical_height;

explicit operator bool() const {
return width != 0 && height != 0 && env_width != 0 && env_height != 0;
Expand Down
3 changes: 3 additions & 0 deletions src/platform/common.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -270,6 +270,7 @@ namespace platf {
struct touch_port_t {
int offset_x, offset_y;
int width, height;
int logical_width, logical_height;
};

// These values must match Limelight-internal.h's SS_FF_* constants!
Expand DownExpand Up@@ -535,8 +536,10 @@ namespace platf {
// Offsets for when streaming a specific monitor. By default, they are 0.
int offset_x, offset_y;
int env_width, env_height;
int env_logical_width, env_logical_height;

int width, height;
int logical_width, logical_height;

protected:
// collect capture timing data (at loglevel debug)
Expand Down
19 changes: 17 additions & 2 deletions src/platform/linux/kmsgrab.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,6 +123,9 @@ namespace platf {
static int env_width;
static int env_height;

static int env_logical_width;
static int env_logical_height;

std::string_view plane_type(std::uint64_t val) {
switch (val) {
case DRM_PLANE_TYPE_OVERLAY:
Expand DownExpand Up@@ -686,13 +689,19 @@ namespace platf {
this->env_width = ::platf::kms::env_width;
this->env_height = ::platf::kms::env_height;

this->env_logical_width = ::platf::kms::env_logical_width;
this->env_logical_height = ::platf::kms::env_logical_height;

auto monitor = pos->crtc_to_monitor.find(plane->crtc_id);
if (monitor != std::end(pos->crtc_to_monitor)) {
auto &viewport = monitor->second.viewport;

width = viewport.width;
height = viewport.height;

logical_width = viewport.logical_width;
logical_height = viewport.logical_height;

switch (card.get_panel_orientation(plane->plane_id)) {
case DRM_MODE_ROTATE_270:
BOOST_LOG(debug) << "Detected panel orientation at 90, swapping width and height.";
Expand DownExpand Up@@ -1542,8 +1551,8 @@ namespace platf {
if (monitor_descriptor.index == index && monitor_descriptor.type == type) {
monitor_descriptor.viewport.offset_x = monitor->viewport.offset_x;
monitor_descriptor.viewport.offset_y = monitor->viewport.offset_y;
monitor_descriptor.viewport.width = monitor->viewport.width;
monitor_descriptor.viewport.height = monitor->viewport.height;
monitor_descriptor.viewport.logical_width = monitor->viewport.logical_width;
monitor_descriptor.viewport.logical_height = monitor->viewport.logical_height;

// A sanity check, it's guesswork after all.
if (
Expand DownExpand Up@@ -1682,6 +1691,9 @@ namespace platf {
kms::env_width = 0;
kms::env_height = 0;

kms::env_logical_width = 0;
kms::env_logical_height = 0;

for (auto &card_descriptor : cds) {
for (auto &[_, monitor_descriptor] : card_descriptor.crtc_to_monitor) {
BOOST_LOG(debug) << "Monitor description"sv;
Expand All@@ -1690,6 +1702,9 @@ namespace platf {

kms::env_width = std::max(kms::env_width, (int) (monitor_descriptor.viewport.offset_x + monitor_descriptor.viewport.width));
kms::env_height = std::max(kms::env_height, (int) (monitor_descriptor.viewport.offset_y + monitor_descriptor.viewport.height));

kms::env_logical_height = std::max(kms::env_logical_height, (int) (monitor_descriptor.viewport.offset_y + monitor_descriptor.viewport.logical_height));
kms::env_logical_width = std::max(kms::env_logical_width, (int) (monitor_descriptor.viewport.offset_x + monitor_descriptor.viewport.logical_width));
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/platform/linux/wayland.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,8 +144,8 @@ namespace wl {
}

void monitor_t::xdg_size(zxdg_output_v1 *, std::int32_t width, std::int32_t height) {
viewport.width = width;
viewport.height = height;
viewport.logical_width = width;
viewport.logical_height = height;
BOOST_LOG(info) << "Logical size: "sv << width << 'x' << height;
}

Expand Down
15 changes: 15 additions & 0 deletions src/video.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -1993,6 +1993,18 @@ namespace video {

auto scalar = std::fminf(wt / wd, ht / hd);

// we initialize scalar_tpcoords and logical dimensions to default values in case they are not set (non-KMS)
float scalar_tpcoords = 1.0f;
int display_env_logical_width = 0;
int display_env_logical_height = 0;
if (display->logical_width && display->logical_height && display->env_logical_width && display->env_logical_height) {
float lwd = display->logical_width;
float lhd = display->logical_height;
scalar_tpcoords = std::fminf(wd / lwd, hd / lhd);
display_env_logical_width = display->env_logical_width;
display_env_logical_height = display->env_logical_height;
}

auto w2 = scalar * wd;
auto h2 = scalar * hd;

Expand All@@ -2011,6 +2023,9 @@ namespace video {
offsetX,
offsetY,
1.0f / scalar,
scalar_tpcoords,
display_env_logical_width,
display_env_logical_height
};
}

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 37 additions & 4 deletions src/input.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -170,7 +170,7 @@ namespace input {
touch_port_event {std::move(touch_port_event)},
feedback_queue {std::move(feedback_queue)},
mouse_left_button_timeout {},
touch_port {{0, 0, 0, 0}, 0, 0, 1.0f},
touch_port {{0, 0, 0, 0}, 0, 0, 1.0f, 1.0f, 0, 0},
accumulated_vscroll_delta {},
accumulated_hscroll_delta {} {
}
Expand DownExpand Up@@ -480,7 +480,29 @@ namespace input {
x = std::clamp(x, offsetX, (size.first * scalarX) - offsetX);
y = std::clamp(y, offsetY, (size.second * scalarY) - offsetY);

return std::pair {(x - offsetX) * touch_port.scalar_inv, (y - offsetY) * touch_port.scalar_inv};
/*
x and y here below have the coordinates of the surface of the streaming resolution,
and are dependent on how that comes configured from the client (scalar_inv is calculated
from the proportion of that and the device's **physical** size).
*/
x = (x - offsetX) * touch_port.scalar_inv;
y = (y - offsetY) * touch_port.scalar_inv;

/*
This final operation is a bit weird and has been brought about with lots of trial and error. A better
way to do this may exist.

Basically, this is what makes the touchscreen map to the coordinates inputtino expects properly.
Since inputtino's dimensions are now logical (because scaling breaks everything otherwise), using the previous
x and y coordinates would be incorrect when screens are scaled, because the touch port is smaller (or larger)
by a factor (that factor is touch_port.scalar_tpcoords), and that factor must be used to account for that difference
when moving the cursor. Otherwise, it will move either slower or faster than your finger proportionally to
scalar_tpcoords, and be offset *inversely* proportionally to scalar_tpcoords. So you must account for both differences
by multiplying and dividing.
*/
float final_x = (x + touch_port.offset_x * touch_port.scalar_tpcoords) / touch_port.scalar_tpcoords;
float final_y = (y + touch_port.offset_y * touch_port.scalar_tpcoords) / touch_port.scalar_tpcoords;
return std::pair {final_x, final_y};
}

/**
Expand DownExpand Up@@ -545,11 +567,22 @@ namespace input {
}

auto &touch_port = input->touch_port;

int touch_port_dim_x;
int touch_port_dim_y;
if (touch_port.env_logical_width != 0 && touch_port.env_logical_height != 0) {
touch_port_dim_x = touch_port.env_logical_width;
touch_port_dim_y = touch_port.env_logical_height;
} else {
touch_port_dim_x = touch_port.env_width;
touch_port_dim_y = touch_port.env_height;
}

platf::touch_port_t abs_port {
touch_port.offset_x,
touch_port.offset_y,
touch_port.env_width,
touch_port.env_height
touch_port_dim_x,
touch_port_dim_y
};

platf::abs_mouse(platf_input, abs_port, tpcoords->first, tpcoords->second);
Expand Down
4 changes: 3 additions & 1 deletion src/input.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,9 @@ namespace input {
// Offset x and y coordinates of the client
float client_offsetX, client_offsetY;

float scalar_inv;
float scalar_inv, scalar_tpcoords;

int env_logical_width, env_logical_height;

explicit operator bool() const {
return width != 0 && height != 0 && env_width != 0 && env_height != 0;
Expand Down
3 changes: 3 additions & 0 deletions src/platform/common.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -270,6 +270,7 @@ namespace platf {
struct touch_port_t {
int offset_x, offset_y;
int width, height;
int logical_width, logical_height;
};

// These values must match Limelight-internal.h's SS_FF_* constants!
Expand DownExpand Up@@ -535,8 +536,10 @@ namespace platf {
// Offsets for when streaming a specific monitor. By default, they are 0.
int offset_x, offset_y;
int env_width, env_height;
int env_logical_width, env_logical_height;

int width, height;
int logical_width, logical_height;

protected:
// collect capture timing data (at loglevel debug)
Expand Down
19 changes: 17 additions & 2 deletions src/platform/linux/kmsgrab.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,6 +123,9 @@ namespace platf {
static int env_width;
static int env_height;

static int env_logical_width;
static int env_logical_height;

std::string_view plane_type(std::uint64_t val) {
switch (val) {
case DRM_PLANE_TYPE_OVERLAY:
Expand DownExpand Up@@ -686,13 +689,19 @@ namespace platf {
this->env_width = ::platf::kms::env_width;
this->env_height = ::platf::kms::env_height;

this->env_logical_width = ::platf::kms::env_logical_width;
this->env_logical_height = ::platf::kms::env_logical_height;

auto monitor = pos->crtc_to_monitor.find(plane->crtc_id);
if (monitor != std::end(pos->crtc_to_monitor)) {
auto &viewport = monitor->second.viewport;

width = viewport.width;
height = viewport.height;

logical_width = viewport.logical_width;
logical_height = viewport.logical_height;

switch (card.get_panel_orientation(plane->plane_id)) {
case DRM_MODE_ROTATE_270:
BOOST_LOG(debug) << "Detected panel orientation at 90, swapping width and height.";
Expand DownExpand Up@@ -1542,8 +1551,8 @@ namespace platf {
if (monitor_descriptor.index == index && monitor_descriptor.type == type) {
monitor_descriptor.viewport.offset_x = monitor->viewport.offset_x;
monitor_descriptor.viewport.offset_y = monitor->viewport.offset_y;
monitor_descriptor.viewport.width = monitor->viewport.width;
monitor_descriptor.viewport.height = monitor->viewport.height;
monitor_descriptor.viewport.logical_width = monitor->viewport.logical_width;
monitor_descriptor.viewport.logical_height = monitor->viewport.logical_height;

// A sanity check, it's guesswork after all.
if (
Expand DownExpand Up@@ -1682,6 +1691,9 @@ namespace platf {
kms::env_width = 0;
kms::env_height = 0;

kms::env_logical_width = 0;
kms::env_logical_height = 0;

for (auto &card_descriptor : cds) {
for (auto &[_, monitor_descriptor] : card_descriptor.crtc_to_monitor) {
BOOST_LOG(debug) << "Monitor description"sv;
Expand All@@ -1690,6 +1702,9 @@ namespace platf {

kms::env_width = std::max(kms::env_width, (int) (monitor_descriptor.viewport.offset_x + monitor_descriptor.viewport.width));
kms::env_height = std::max(kms::env_height, (int) (monitor_descriptor.viewport.offset_y + monitor_descriptor.viewport.height));

kms::env_logical_height = std::max(kms::env_logical_height, (int) (monitor_descriptor.viewport.offset_y + monitor_descriptor.viewport.logical_height));
kms::env_logical_width = std::max(kms::env_logical_width, (int) (monitor_descriptor.viewport.offset_x + monitor_descriptor.viewport.logical_width));
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/platform/linux/wayland.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,8 +144,8 @@ namespace wl {
}

void monitor_t::xdg_size(zxdg_output_v1 *, std::int32_t width, std::int32_t height) {
viewport.width = width;
viewport.height = height;
viewport.logical_width = width;
viewport.logical_height = height;
BOOST_LOG(info) << "Logical size: "sv << width << 'x' << height;
}

Expand Down
15 changes: 15 additions & 0 deletions src/video.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -1993,6 +1993,18 @@ namespace video {

auto scalar = std::fminf(wt / wd, ht / hd);

// we initialize scalar_tpcoords and logical dimensions to default values in case they are not set (non-KMS)
float scalar_tpcoords = 1.0f;
int display_env_logical_width = 0;
int display_env_logical_height = 0;
if (display->logical_width && display->logical_height && display->env_logical_width && display->env_logical_height) {
float lwd = display->logical_width;
float lhd = display->logical_height;
scalar_tpcoords = std::fminf(wd / lwd, hd / lhd);
display_env_logical_width = display->env_logical_width;
display_env_logical_height = display->env_logical_height;
}

auto w2 = scalar * wd;
auto h2 = scalar * hd;

Expand All@@ -2011,6 +2023,9 @@ namespace video {
offsetX,
offsetY,
1.0f / scalar,
scalar_tpcoords,
display_env_logical_width,
display_env_logical_height
};
}

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 37 additions & 4 deletions src/input.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -170,7 +170,7 @@ namespace input {
touch_port_event {std::move(touch_port_event)},
feedback_queue {std::move(feedback_queue)},
mouse_left_button_timeout {},
touch_port {{0, 0, 0, 0}, 0, 0, 1.0f},
touch_port {{0, 0, 0, 0}, 0, 0, 1.0f, 1.0f, 0, 0},
accumulated_vscroll_delta {},
accumulated_hscroll_delta {} {
}
Expand DownExpand Up@@ -480,7 +480,29 @@ namespace input {
x = std::clamp(x, offsetX, (size.first * scalarX) - offsetX);
y = std::clamp(y, offsetY, (size.second * scalarY) - offsetY);

return std::pair {(x - offsetX) * touch_port.scalar_inv, (y - offsetY) * touch_port.scalar_inv};
/*
x and y here below have the coordinates of the surface of the streaming resolution,
and are dependent on how that comes configured from the client (scalar_inv is calculated
from the proportion of that and the device's **physical** size).
*/
x = (x - offsetX) * touch_port.scalar_inv;
y = (y - offsetY) * touch_port.scalar_inv;

/*
This final operation is a bit weird and has been brought about with lots of trial and error. A better
way to do this may exist.

Basically, this is what makes the touchscreen map to the coordinates inputtino expects properly.
Since inputtino's dimensions are now logical (because scaling breaks everything otherwise), using the previous
x and y coordinates would be incorrect when screens are scaled, because the touch port is smaller (or larger)
by a factor (that factor is touch_port.scalar_tpcoords), and that factor must be used to account for that difference
when moving the cursor. Otherwise, it will move either slower or faster than your finger proportionally to
scalar_tpcoords, and be offset *inversely* proportionally to scalar_tpcoords. So you must account for both differences
by multiplying and dividing.
*/
float final_x = (x + touch_port.offset_x * touch_port.scalar_tpcoords) / touch_port.scalar_tpcoords;
float final_y = (y + touch_port.offset_y * touch_port.scalar_tpcoords) / touch_port.scalar_tpcoords;
return std::pair {final_x, final_y};
}

/**
Expand DownExpand Up@@ -545,11 +567,22 @@ namespace input {
}

auto &touch_port = input->touch_port;

int touch_port_dim_x;
int touch_port_dim_y;
if (touch_port.env_logical_width != 0 && touch_port.env_logical_height != 0) {
touch_port_dim_x = touch_port.env_logical_width;
touch_port_dim_y = touch_port.env_logical_height;
} else {
touch_port_dim_x = touch_port.env_width;
touch_port_dim_y = touch_port.env_height;
}

platf::touch_port_t abs_port {
touch_port.offset_x,
touch_port.offset_y,
touch_port.env_width,
touch_port.env_height
touch_port_dim_x,
touch_port_dim_y
};

platf::abs_mouse(platf_input, abs_port, tpcoords->first, tpcoords->second);
Expand Down
4 changes: 3 additions & 1 deletion src/input.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,9 @@ namespace input {
// Offset x and y coordinates of the client
float client_offsetX, client_offsetY;

float scalar_inv;
float scalar_inv, scalar_tpcoords;

int env_logical_width, env_logical_height;

explicit operator bool() const {
return width != 0 && height != 0 && env_width != 0 && env_height != 0;
Expand Down
3 changes: 3 additions & 0 deletions src/platform/common.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -270,6 +270,7 @@ namespace platf {
struct touch_port_t {
int offset_x, offset_y;
int width, height;
int logical_width, logical_height;
};

// These values must match Limelight-internal.h's SS_FF_* constants!
Expand DownExpand Up@@ -535,8 +536,10 @@ namespace platf {
// Offsets for when streaming a specific monitor. By default, they are 0.
int offset_x, offset_y;
int env_width, env_height;
int env_logical_width, env_logical_height;

int width, height;
int logical_width, logical_height;

protected:
// collect capture timing data (at loglevel debug)
Expand Down
19 changes: 17 additions & 2 deletions src/platform/linux/kmsgrab.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,6 +123,9 @@ namespace platf {
static int env_width;
static int env_height;

static int env_logical_width;
static int env_logical_height;

std::string_view plane_type(std::uint64_t val) {
switch (val) {
case DRM_PLANE_TYPE_OVERLAY:
Expand DownExpand Up@@ -686,13 +689,19 @@ namespace platf {
this->env_width = ::platf::kms::env_width;
this->env_height = ::platf::kms::env_height;

this->env_logical_width = ::platf::kms::env_logical_width;
this->env_logical_height = ::platf::kms::env_logical_height;

auto monitor = pos->crtc_to_monitor.find(plane->crtc_id);
if (monitor != std::end(pos->crtc_to_monitor)) {
auto &viewport = monitor->second.viewport;

width = viewport.width;
height = viewport.height;

logical_width = viewport.logical_width;
logical_height = viewport.logical_height;

switch (card.get_panel_orientation(plane->plane_id)) {
case DRM_MODE_ROTATE_270:
BOOST_LOG(debug) << "Detected panel orientation at 90, swapping width and height.";
Expand DownExpand Up@@ -1542,8 +1551,8 @@ namespace platf {
if (monitor_descriptor.index == index && monitor_descriptor.type == type) {
monitor_descriptor.viewport.offset_x = monitor->viewport.offset_x;
monitor_descriptor.viewport.offset_y = monitor->viewport.offset_y;
monitor_descriptor.viewport.width = monitor->viewport.width;
monitor_descriptor.viewport.height = monitor->viewport.height;
monitor_descriptor.viewport.logical_width = monitor->viewport.logical_width;
monitor_descriptor.viewport.logical_height = monitor->viewport.logical_height;

// A sanity check, it's guesswork after all.
if (
Expand DownExpand Up@@ -1682,6 +1691,9 @@ namespace platf {
kms::env_width = 0;
kms::env_height = 0;

kms::env_logical_width = 0;
kms::env_logical_height = 0;

for (auto &card_descriptor : cds) {
for (auto &[_, monitor_descriptor] : card_descriptor.crtc_to_monitor) {
BOOST_LOG(debug) << "Monitor description"sv;
Expand All@@ -1690,6 +1702,9 @@ namespace platf {

kms::env_width = std::max(kms::env_width, (int) (monitor_descriptor.viewport.offset_x + monitor_descriptor.viewport.width));
kms::env_height = std::max(kms::env_height, (int) (monitor_descriptor.viewport.offset_y + monitor_descriptor.viewport.height));

kms::env_logical_height = std::max(kms::env_logical_height, (int) (monitor_descriptor.viewport.offset_y + monitor_descriptor.viewport.logical_height));
kms::env_logical_width = std::max(kms::env_logical_width, (int) (monitor_descriptor.viewport.offset_x + monitor_descriptor.viewport.logical_width));
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/platform/linux/wayland.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,8 +144,8 @@ namespace wl {
}

void monitor_t::xdg_size(zxdg_output_v1 *, std::int32_t width, std::int32_t height) {
viewport.width = width;
viewport.height = height;
viewport.logical_width = width;
viewport.logical_height = height;
BOOST_LOG(info) << "Logical size: "sv << width << 'x' << height;
}

Expand Down
15 changes: 15 additions & 0 deletions src/video.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -1993,6 +1993,18 @@ namespace video {

auto scalar = std::fminf(wt / wd, ht / hd);

// we initialize scalar_tpcoords and logical dimensions to default values in case they are not set (non-KMS)
float scalar_tpcoords = 1.0f;
int display_env_logical_width = 0;
int display_env_logical_height = 0;
if (display->logical_width && display->logical_height && display->env_logical_width && display->env_logical_height) {
float lwd = display->logical_width;
float lhd = display->logical_height;
scalar_tpcoords = std::fminf(wd / lwd, hd / lhd);
display_env_logical_width = display->env_logical_width;
display_env_logical_height = display->env_logical_height;
}

auto w2 = scalar * wd;
auto h2 = scalar * hd;

Expand All@@ -2011,6 +2023,9 @@ namespace video {
offsetX,
offsetY,
1.0f / scalar,
scalar_tpcoords,
display_env_logical_width,
display_env_logical_height
};
}

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 37 additions & 4 deletions src/input.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -170,7 +170,7 @@ namespace input {
touch_port_event {std::move(touch_port_event)},
feedback_queue {std::move(feedback_queue)},
mouse_left_button_timeout {},
touch_port {{0, 0, 0, 0}, 0, 0, 1.0f},
touch_port {{0, 0, 0, 0}, 0, 0, 1.0f, 1.0f, 0, 0},
accumulated_vscroll_delta {},
accumulated_hscroll_delta {} {
}
Expand DownExpand Up@@ -480,7 +480,29 @@ namespace input {
x = std::clamp(x, offsetX, (size.first * scalarX) - offsetX);
y = std::clamp(y, offsetY, (size.second * scalarY) - offsetY);

return std::pair {(x - offsetX) * touch_port.scalar_inv, (y - offsetY) * touch_port.scalar_inv};
/*
x and y here below have the coordinates of the surface of the streaming resolution,
and are dependent on how that comes configured from the client (scalar_inv is calculated
from the proportion of that and the device's **physical** size).
*/
x = (x - offsetX) * touch_port.scalar_inv;
y = (y - offsetY) * touch_port.scalar_inv;

/*
This final operation is a bit weird and has been brought about with lots of trial and error. A better
way to do this may exist.

Basically, this is what makes the touchscreen map to the coordinates inputtino expects properly.
Since inputtino's dimensions are now logical (because scaling breaks everything otherwise), using the previous
x and y coordinates would be incorrect when screens are scaled, because the touch port is smaller (or larger)
by a factor (that factor is touch_port.scalar_tpcoords), and that factor must be used to account for that difference
when moving the cursor. Otherwise, it will move either slower or faster than your finger proportionally to
scalar_tpcoords, and be offset *inversely* proportionally to scalar_tpcoords. So you must account for both differences
by multiplying and dividing.
*/
float final_x = (x + touch_port.offset_x * touch_port.scalar_tpcoords) / touch_port.scalar_tpcoords;
float final_y = (y + touch_port.offset_y * touch_port.scalar_tpcoords) / touch_port.scalar_tpcoords;
return std::pair {final_x, final_y};
}

/**
Expand DownExpand Up@@ -545,11 +567,22 @@ namespace input {
}

auto &touch_port = input->touch_port;

int touch_port_dim_x;
int touch_port_dim_y;
if (touch_port.env_logical_width != 0 && touch_port.env_logical_height != 0) {
touch_port_dim_x = touch_port.env_logical_width;
touch_port_dim_y = touch_port.env_logical_height;
} else {
touch_port_dim_x = touch_port.env_width;
touch_port_dim_y = touch_port.env_height;
}

platf::touch_port_t abs_port {
touch_port.offset_x,
touch_port.offset_y,
touch_port.env_width,
touch_port.env_height
touch_port_dim_x,
touch_port_dim_y
};

platf::abs_mouse(platf_input, abs_port, tpcoords->first, tpcoords->second);
Expand Down
4 changes: 3 additions & 1 deletion src/input.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,9 @@ namespace input {
// Offset x and y coordinates of the client
float client_offsetX, client_offsetY;

float scalar_inv;
float scalar_inv, scalar_tpcoords;

int env_logical_width, env_logical_height;

explicit operator bool() const {
return width != 0 && height != 0 && env_width != 0 && env_height != 0;
Expand Down
3 changes: 3 additions & 0 deletions src/platform/common.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -270,6 +270,7 @@ namespace platf {
struct touch_port_t {
int offset_x, offset_y;
int width, height;
int logical_width, logical_height;
};

// These values must match Limelight-internal.h's SS_FF_* constants!
Expand DownExpand Up@@ -535,8 +536,10 @@ namespace platf {
// Offsets for when streaming a specific monitor. By default, they are 0.
int offset_x, offset_y;
int env_width, env_height;
int env_logical_width, env_logical_height;

int width, height;
int logical_width, logical_height;

protected:
// collect capture timing data (at loglevel debug)
Expand Down
19 changes: 17 additions & 2 deletions src/platform/linux/kmsgrab.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,6 +123,9 @@ namespace platf {
static int env_width;
static int env_height;

static int env_logical_width;
static int env_logical_height;

std::string_view plane_type(std::uint64_t val) {
switch (val) {
case DRM_PLANE_TYPE_OVERLAY:
Expand DownExpand Up@@ -686,13 +689,19 @@ namespace platf {
this->env_width = ::platf::kms::env_width;
this->env_height = ::platf::kms::env_height;

this->env_logical_width = ::platf::kms::env_logical_width;
this->env_logical_height = ::platf::kms::env_logical_height;

auto monitor = pos->crtc_to_monitor.find(plane->crtc_id);
if (monitor != std::end(pos->crtc_to_monitor)) {
auto &viewport = monitor->second.viewport;

width = viewport.width;
height = viewport.height;

logical_width = viewport.logical_width;
logical_height = viewport.logical_height;

switch (card.get_panel_orientation(plane->plane_id)) {
case DRM_MODE_ROTATE_270:
BOOST_LOG(debug) << "Detected panel orientation at 90, swapping width and height.";
Expand DownExpand Up@@ -1542,8 +1551,8 @@ namespace platf {
if (monitor_descriptor.index == index && monitor_descriptor.type == type) {
monitor_descriptor.viewport.offset_x = monitor->viewport.offset_x;
monitor_descriptor.viewport.offset_y = monitor->viewport.offset_y;
monitor_descriptor.viewport.width = monitor->viewport.width;
monitor_descriptor.viewport.height = monitor->viewport.height;
monitor_descriptor.viewport.logical_width = monitor->viewport.logical_width;
monitor_descriptor.viewport.logical_height = monitor->viewport.logical_height;

// A sanity check, it's guesswork after all.
if (
Expand DownExpand Up@@ -1682,6 +1691,9 @@ namespace platf {
kms::env_width = 0;
kms::env_height = 0;

kms::env_logical_width = 0;
kms::env_logical_height = 0;

for (auto &card_descriptor : cds) {
for (auto &[_, monitor_descriptor] : card_descriptor.crtc_to_monitor) {
BOOST_LOG(debug) << "Monitor description"sv;
Expand All@@ -1690,6 +1702,9 @@ namespace platf {

kms::env_width = std::max(kms::env_width, (int) (monitor_descriptor.viewport.offset_x + monitor_descriptor.viewport.width));
kms::env_height = std::max(kms::env_height, (int) (monitor_descriptor.viewport.offset_y + monitor_descriptor.viewport.height));

kms::env_logical_height = std::max(kms::env_logical_height, (int) (monitor_descriptor.viewport.offset_y + monitor_descriptor.viewport.logical_height));
kms::env_logical_width = std::max(kms::env_logical_width, (int) (monitor_descriptor.viewport.offset_x + monitor_descriptor.viewport.logical_width));
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/platform/linux/wayland.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,8 +144,8 @@ namespace wl {
}

void monitor_t::xdg_size(zxdg_output_v1 *, std::int32_t width, std::int32_t height) {
viewport.width = width;
viewport.height = height;
viewport.logical_width = width;
viewport.logical_height = height;
BOOST_LOG(info) << "Logical size: "sv << width << 'x' << height;
}

Expand Down
15 changes: 15 additions & 0 deletions src/video.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -1993,6 +1993,18 @@ namespace video {

auto scalar = std::fminf(wt / wd, ht / hd);

// we initialize scalar_tpcoords and logical dimensions to default values in case they are not set (non-KMS)
float scalar_tpcoords = 1.0f;
int display_env_logical_width = 0;
int display_env_logical_height = 0;
if (display->logical_width && display->logical_height && display->env_logical_width && display->env_logical_height) {
float lwd = display->logical_width;
float lhd = display->logical_height;
scalar_tpcoords = std::fminf(wd / lwd, hd / lhd);
display_env_logical_width = display->env_logical_width;
display_env_logical_height = display->env_logical_height;
}

auto w2 = scalar * wd;
auto h2 = scalar * hd;

Expand All@@ -2011,6 +2023,9 @@ namespace video {
offsetX,
offsetY,
1.0f / scalar,
scalar_tpcoords,
display_env_logical_width,
display_env_logical_height
};
}

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 37 additions & 4 deletions src/input.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -170,7 +170,7 @@ namespace input {
touch_port_event {std::move(touch_port_event)},
feedback_queue {std::move(feedback_queue)},
mouse_left_button_timeout {},
touch_port {{0, 0, 0, 0}, 0, 0, 1.0f},
touch_port {{0, 0, 0, 0}, 0, 0, 1.0f, 1.0f, 0, 0},
accumulated_vscroll_delta {},
accumulated_hscroll_delta {} {
}
Expand DownExpand Up@@ -480,7 +480,29 @@ namespace input {
x = std::clamp(x, offsetX, (size.first * scalarX) - offsetX);
y = std::clamp(y, offsetY, (size.second * scalarY) - offsetY);

return std::pair {(x - offsetX) * touch_port.scalar_inv, (y - offsetY) * touch_port.scalar_inv};
/*
x and y here below have the coordinates of the surface of the streaming resolution,
and are dependent on how that comes configured from the client (scalar_inv is calculated
from the proportion of that and the device's **physical** size).
*/
x = (x - offsetX) * touch_port.scalar_inv;
y = (y - offsetY) * touch_port.scalar_inv;

/*
This final operation is a bit weird and has been brought about with lots of trial and error. A better
way to do this may exist.

Basically, this is what makes the touchscreen map to the coordinates inputtino expects properly.
Since inputtino's dimensions are now logical (because scaling breaks everything otherwise), using the previous
x and y coordinates would be incorrect when screens are scaled, because the touch port is smaller (or larger)
by a factor (that factor is touch_port.scalar_tpcoords), and that factor must be used to account for that difference
when moving the cursor. Otherwise, it will move either slower or faster than your finger proportionally to
scalar_tpcoords, and be offset *inversely* proportionally to scalar_tpcoords. So you must account for both differences
by multiplying and dividing.
*/
float final_x = (x + touch_port.offset_x * touch_port.scalar_tpcoords) / touch_port.scalar_tpcoords;
float final_y = (y + touch_port.offset_y * touch_port.scalar_tpcoords) / touch_port.scalar_tpcoords;
return std::pair {final_x, final_y};
}

/**
Expand DownExpand Up@@ -545,11 +567,22 @@ namespace input {
}

auto &touch_port = input->touch_port;

int touch_port_dim_x;
int touch_port_dim_y;
if (touch_port.env_logical_width != 0 && touch_port.env_logical_height != 0) {
touch_port_dim_x = touch_port.env_logical_width;
touch_port_dim_y = touch_port.env_logical_height;
} else {
touch_port_dim_x = touch_port.env_width;
touch_port_dim_y = touch_port.env_height;
}

platf::touch_port_t abs_port {
touch_port.offset_x,
touch_port.offset_y,
touch_port.env_width,
touch_port.env_height
touch_port_dim_x,
touch_port_dim_y
};

platf::abs_mouse(platf_input, abs_port, tpcoords->first, tpcoords->second);
Expand Down
4 changes: 3 additions & 1 deletion src/input.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,9 @@ namespace input {
// Offset x and y coordinates of the client
float client_offsetX, client_offsetY;

float scalar_inv;
float scalar_inv, scalar_tpcoords;

int env_logical_width, env_logical_height;

explicit operator bool() const {
return width != 0 && height != 0 && env_width != 0 && env_height != 0;
Expand Down
3 changes: 3 additions & 0 deletions src/platform/common.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -270,6 +270,7 @@ namespace platf {
struct touch_port_t {
int offset_x, offset_y;
int width, height;
int logical_width, logical_height;
};

// These values must match Limelight-internal.h's SS_FF_* constants!
Expand DownExpand Up@@ -535,8 +536,10 @@ namespace platf {
// Offsets for when streaming a specific monitor. By default, they are 0.
int offset_x, offset_y;
int env_width, env_height;
int env_logical_width, env_logical_height;

int width, height;
int logical_width, logical_height;

protected:
// collect capture timing data (at loglevel debug)
Expand Down
19 changes: 17 additions & 2 deletions src/platform/linux/kmsgrab.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,6 +123,9 @@ namespace platf {
static int env_width;
static int env_height;

static int env_logical_width;
static int env_logical_height;

std::string_view plane_type(std::uint64_t val) {
switch (val) {
case DRM_PLANE_TYPE_OVERLAY:
Expand DownExpand Up@@ -686,13 +689,19 @@ namespace platf {
this->env_width = ::platf::kms::env_width;
this->env_height = ::platf::kms::env_height;

this->env_logical_width = ::platf::kms::env_logical_width;
this->env_logical_height = ::platf::kms::env_logical_height;

auto monitor = pos->crtc_to_monitor.find(plane->crtc_id);
if (monitor != std::end(pos->crtc_to_monitor)) {
auto &viewport = monitor->second.viewport;

width = viewport.width;
height = viewport.height;

logical_width = viewport.logical_width;
logical_height = viewport.logical_height;

switch (card.get_panel_orientation(plane->plane_id)) {
case DRM_MODE_ROTATE_270:
BOOST_LOG(debug) << "Detected panel orientation at 90, swapping width and height.";
Expand DownExpand Up@@ -1542,8 +1551,8 @@ namespace platf {
if (monitor_descriptor.index == index && monitor_descriptor.type == type) {
monitor_descriptor.viewport.offset_x = monitor->viewport.offset_x;
monitor_descriptor.viewport.offset_y = monitor->viewport.offset_y;
monitor_descriptor.viewport.width = monitor->viewport.width;
monitor_descriptor.viewport.height = monitor->viewport.height;
monitor_descriptor.viewport.logical_width = monitor->viewport.logical_width;
monitor_descriptor.viewport.logical_height = monitor->viewport.logical_height;

// A sanity check, it's guesswork after all.
if (
Expand DownExpand Up@@ -1682,6 +1691,9 @@ namespace platf {
kms::env_width = 0;
kms::env_height = 0;

kms::env_logical_width = 0;
kms::env_logical_height = 0;

for (auto &card_descriptor : cds) {
for (auto &[_, monitor_descriptor] : card_descriptor.crtc_to_monitor) {
BOOST_LOG(debug) << "Monitor description"sv;
Expand All@@ -1690,6 +1702,9 @@ namespace platf {

kms::env_width = std::max(kms::env_width, (int) (monitor_descriptor.viewport.offset_x + monitor_descriptor.viewport.width));
kms::env_height = std::max(kms::env_height, (int) (monitor_descriptor.viewport.offset_y + monitor_descriptor.viewport.height));

kms::env_logical_height = std::max(kms::env_logical_height, (int) (monitor_descriptor.viewport.offset_y + monitor_descriptor.viewport.logical_height));
kms::env_logical_width = std::max(kms::env_logical_width, (int) (monitor_descriptor.viewport.offset_x + monitor_descriptor.viewport.logical_width));
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/platform/linux/wayland.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,8 +144,8 @@ namespace wl {
}

void monitor_t::xdg_size(zxdg_output_v1 *, std::int32_t width, std::int32_t height) {
viewport.width = width;
viewport.height = height;
viewport.logical_width = width;
viewport.logical_height = height;
BOOST_LOG(info) << "Logical size: "sv << width << 'x' << height;
}

Expand Down
15 changes: 15 additions & 0 deletions src/video.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -1993,6 +1993,18 @@ namespace video {

auto scalar = std::fminf(wt / wd, ht / hd);

// we initialize scalar_tpcoords and logical dimensions to default values in case they are not set (non-KMS)
float scalar_tpcoords = 1.0f;
int display_env_logical_width = 0;
int display_env_logical_height = 0;
if (display->logical_width && display->logical_height && display->env_logical_width && display->env_logical_height) {
float lwd = display->logical_width;
float lhd = display->logical_height;
scalar_tpcoords = std::fminf(wd / lwd, hd / lhd);
display_env_logical_width = display->env_logical_width;
display_env_logical_height = display->env_logical_height;
}

auto w2 = scalar * wd;
auto h2 = scalar * hd;

Expand All@@ -2011,6 +2023,9 @@ namespace video {
offsetX,
offsetY,
1.0f / scalar,
scalar_tpcoords,
display_env_logical_width,
display_env_logical_height
};
}

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 37 additions & 4 deletions src/input.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -170,7 +170,7 @@ namespace input {
touch_port_event {std::move(touch_port_event)},
feedback_queue {std::move(feedback_queue)},
mouse_left_button_timeout {},
touch_port {{0, 0, 0, 0}, 0, 0, 1.0f},
touch_port {{0, 0, 0, 0}, 0, 0, 1.0f, 1.0f, 0, 0},
accumulated_vscroll_delta {},
accumulated_hscroll_delta {} {
}
Expand DownExpand Up@@ -480,7 +480,29 @@ namespace input {
x = std::clamp(x, offsetX, (size.first * scalarX) - offsetX);
y = std::clamp(y, offsetY, (size.second * scalarY) - offsetY);

return std::pair {(x - offsetX) * touch_port.scalar_inv, (y - offsetY) * touch_port.scalar_inv};
/*
x and y here below have the coordinates of the surface of the streaming resolution,
and are dependent on how that comes configured from the client (scalar_inv is calculated
from the proportion of that and the device's **physical** size).
*/
x = (x - offsetX) * touch_port.scalar_inv;
y = (y - offsetY) * touch_port.scalar_inv;

/*
This final operation is a bit weird and has been brought about with lots of trial and error. A better
way to do this may exist.

Basically, this is what makes the touchscreen map to the coordinates inputtino expects properly.
Since inputtino's dimensions are now logical (because scaling breaks everything otherwise), using the previous
x and y coordinates would be incorrect when screens are scaled, because the touch port is smaller (or larger)
by a factor (that factor is touch_port.scalar_tpcoords), and that factor must be used to account for that difference
when moving the cursor. Otherwise, it will move either slower or faster than your finger proportionally to
scalar_tpcoords, and be offset *inversely* proportionally to scalar_tpcoords. So you must account for both differences
by multiplying and dividing.
*/
float final_x = (x + touch_port.offset_x * touch_port.scalar_tpcoords) / touch_port.scalar_tpcoords;
float final_y = (y + touch_port.offset_y * touch_port.scalar_tpcoords) / touch_port.scalar_tpcoords;
return std::pair {final_x, final_y};
}

/**
Expand DownExpand Up@@ -545,11 +567,22 @@ namespace input {
}

auto &touch_port = input->touch_port;

int touch_port_dim_x;
int touch_port_dim_y;
if (touch_port.env_logical_width != 0 && touch_port.env_logical_height != 0) {
touch_port_dim_x = touch_port.env_logical_width;
touch_port_dim_y = touch_port.env_logical_height;
} else {
touch_port_dim_x = touch_port.env_width;
touch_port_dim_y = touch_port.env_height;
}

platf::touch_port_t abs_port {
touch_port.offset_x,
touch_port.offset_y,
touch_port.env_width,
touch_port.env_height
touch_port_dim_x,
touch_port_dim_y
};

platf::abs_mouse(platf_input, abs_port, tpcoords->first, tpcoords->second);
Expand Down
4 changes: 3 additions & 1 deletion src/input.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,9 @@ namespace input {
// Offset x and y coordinates of the client
float client_offsetX, client_offsetY;

float scalar_inv;
float scalar_inv, scalar_tpcoords;

int env_logical_width, env_logical_height;

explicit operator bool() const {
return width != 0 && height != 0 && env_width != 0 && env_height != 0;
Expand Down
3 changes: 3 additions & 0 deletions src/platform/common.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -270,6 +270,7 @@ namespace platf {
struct touch_port_t {
int offset_x, offset_y;
int width, height;
int logical_width, logical_height;
};

// These values must match Limelight-internal.h's SS_FF_* constants!
Expand DownExpand Up@@ -535,8 +536,10 @@ namespace platf {
// Offsets for when streaming a specific monitor. By default, they are 0.
int offset_x, offset_y;
int env_width, env_height;
int env_logical_width, env_logical_height;

int width, height;
int logical_width, logical_height;

protected:
// collect capture timing data (at loglevel debug)
Expand Down
19 changes: 17 additions & 2 deletions src/platform/linux/kmsgrab.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,6 +123,9 @@ namespace platf {
static int env_width;
static int env_height;

static int env_logical_width;
static int env_logical_height;

std::string_view plane_type(std::uint64_t val) {
switch (val) {
case DRM_PLANE_TYPE_OVERLAY:
Expand DownExpand Up@@ -686,13 +689,19 @@ namespace platf {
this->env_width = ::platf::kms::env_width;
this->env_height = ::platf::kms::env_height;

this->env_logical_width = ::platf::kms::env_logical_width;
this->env_logical_height = ::platf::kms::env_logical_height;

auto monitor = pos->crtc_to_monitor.find(plane->crtc_id);
if (monitor != std::end(pos->crtc_to_monitor)) {
auto &viewport = monitor->second.viewport;

width = viewport.width;
height = viewport.height;

logical_width = viewport.logical_width;
logical_height = viewport.logical_height;

switch (card.get_panel_orientation(plane->plane_id)) {
case DRM_MODE_ROTATE_270:
BOOST_LOG(debug) << "Detected panel orientation at 90, swapping width and height.";
Expand DownExpand Up@@ -1542,8 +1551,8 @@ namespace platf {
if (monitor_descriptor.index == index && monitor_descriptor.type == type) {
monitor_descriptor.viewport.offset_x = monitor->viewport.offset_x;
monitor_descriptor.viewport.offset_y = monitor->viewport.offset_y;
monitor_descriptor.viewport.width = monitor->viewport.width;
monitor_descriptor.viewport.height = monitor->viewport.height;
monitor_descriptor.viewport.logical_width = monitor->viewport.logical_width;
monitor_descriptor.viewport.logical_height = monitor->viewport.logical_height;

// A sanity check, it's guesswork after all.
if (
Expand DownExpand Up@@ -1682,6 +1691,9 @@ namespace platf {
kms::env_width = 0;
kms::env_height = 0;

kms::env_logical_width = 0;
kms::env_logical_height = 0;

for (auto &card_descriptor : cds) {
for (auto &[_, monitor_descriptor] : card_descriptor.crtc_to_monitor) {
BOOST_LOG(debug) << "Monitor description"sv;
Expand All@@ -1690,6 +1702,9 @@ namespace platf {

kms::env_width = std::max(kms::env_width, (int) (monitor_descriptor.viewport.offset_x + monitor_descriptor.viewport.width));
kms::env_height = std::max(kms::env_height, (int) (monitor_descriptor.viewport.offset_y + monitor_descriptor.viewport.height));

kms::env_logical_height = std::max(kms::env_logical_height, (int) (monitor_descriptor.viewport.offset_y + monitor_descriptor.viewport.logical_height));
kms::env_logical_width = std::max(kms::env_logical_width, (int) (monitor_descriptor.viewport.offset_x + monitor_descriptor.viewport.logical_width));
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/platform/linux/wayland.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,8 +144,8 @@ namespace wl {
}

void monitor_t::xdg_size(zxdg_output_v1 *, std::int32_t width, std::int32_t height) {
viewport.width = width;
viewport.height = height;
viewport.logical_width = width;
viewport.logical_height = height;
BOOST_LOG(info) << "Logical size: "sv << width << 'x' << height;
}

Expand Down
15 changes: 15 additions & 0 deletions src/video.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -1993,6 +1993,18 @@ namespace video {

auto scalar = std::fminf(wt / wd, ht / hd);

// we initialize scalar_tpcoords and logical dimensions to default values in case they are not set (non-KMS)
float scalar_tpcoords = 1.0f;
int display_env_logical_width = 0;
int display_env_logical_height = 0;
if (display->logical_width && display->logical_height && display->env_logical_width && display->env_logical_height) {
float lwd = display->logical_width;
float lhd = display->logical_height;
scalar_tpcoords = std::fminf(wd / lwd, hd / lhd);
display_env_logical_width = display->env_logical_width;
display_env_logical_height = display->env_logical_height;
}

auto w2 = scalar * wd;
auto h2 = scalar * hd;

Expand All@@ -2011,6 +2023,9 @@ namespace video {
offsetX,
offsetY,
1.0f / scalar,
scalar_tpcoords,
display_env_logical_width,
display_env_logical_height
};
}

Expand Down
Loading