dany/wvkbd
1
0
Fork 0
mirror of https://github.com/jjsullivan5196/wvkbd.git synced 2025-03-13 02:42:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use output dimensions to detect landscape mode

Browse Source 
Most displays are in landscape mode by default, so checking to see if
it's rotated will produce the exact opposite of the expected results.

Signed-off-by: Maarten van Gompel <proycon@anaproy.nl>
This commit is contained in:
ArenM 2022-07-04 23:46:18 -04:00 committed by Maarten van Gompel
parent b974877be4
commit f540cf36fa
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
main.c
View File

@ -251,21 +251,24 @@ static void
display_handle_geometry(void *data, struct wl_output *wl_output, int x, int y, display_handle_geometry(void *data, struct wl_output *wl_output, int x, int y,
int physical_width, int physical_height, int subpixel, int physical_width, int physical_height, int subpixel,
const char *make, const char *model, int transform) { const char *make, const char *model, int transform) {
if (transform % 2 == 0 && keyboard.landscape) { // Swap width and height on rotated displays
keyboard.landscape = false; if (transform % 2 != 0) {
height = normal_height; int tmp = physical_width;
} else if (transform % 2 != 0 && !keyboard.landscape) { physical_width = physical_height;
keyboard.landscape = true; physical_height = tmp;
height = landscape_height;
} else {
return; // no changes
} }
bool landscape = physical_width > physical_height;
if (landscape == keyboard.landscape) return;
keyboard.landscape = landscape;
enum layout_id layer; enum layout_id layer;
if (keyboard.landscape) { if (keyboard.landscape) {
layer = keyboard.landscape_layers[0]; layer = keyboard.landscape_layers[0];
height = landscape_height;
} else { } else {
layer = keyboard.layers[0]; layer = keyboard.layers[0];
height = normal_height;
} }
keyboard.layout = &keyboard.layouts[layer]; keyboard.layout = &keyboard.layouts[layer];