Skip to content

KeyboardLayout: subscribe to Sway events to update keyboard layout #833

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
3akev wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

KeyboardLayout: subscribe to Sway events to update keyboard layout #833

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
43 changes: 15 additions & 28 deletions Services/Compositor/SwayService.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ Item {
return;
try {
I3.refreshWorkspaces();
I3.dispatch('(["input"])');
Qt.callLater(() => {
safeUpdateWorkspaces();
safeUpdateWindows();
Expand Down Expand Up @@ -111,16 +110,6 @@ Item {
}
}

Timer {
id: keyboardLayoutUpdateTimer
interval: 1000
running: true
repeat: true
onTriggered: {
queryKeyboardLayout();
}
}

function queryKeyboardLayout() {
swayInputsProcess.running = true;
}
Expand Down Expand Up @@ -290,22 +279,17 @@ Item {

function handleInputEvent(ev) {
try {
let beforeParenthesis;
const parenthesisPos = ev.lastIndexOf('(');

if (parenthesisPos === -1) {
beforeParenthesis = ev;
} else {
beforeParenthesis = ev.substring(0, parenthesisPos);
const eventData = JSON.parse(ev);
if (eventData.change == "xkb_layout" && eventData.input != null) {
const input = eventData.input;
if (input.type == "keyboard" && input.xkb_active_layout_name != null) {
const layoutName = input.xkb_active_layout_name;
KeyboardLayoutService.setCurrentLayout(layoutName);
Logger.d("SwayService", "Keyboard layout switched:", layoutName);
}
}

const layoutNameStart = beforeParenthesis.lastIndexOf(',') + 1;
const layoutName = ev.substring(layoutNameStart);

KeyboardLayoutService.setCurrentLayout(layoutName);
Logger.d("HyprlandService", "Keyboard layout switched:", layoutName);
} catch (e) {
Logger.e("HyprlandService", "Error handling activelayout:", e);
Logger.e("SwayService", "Error handling input event:", e);
}
}

Expand Down Expand Up @@ -338,10 +322,13 @@ Item {
if (event.type === "output") {
Qt.callLater(queryDisplayScales);
}
}
}

if (event.type == "get_inputs") {
handleInputEvent(event.data);
}
I3IpcListener {
subscriptions: ["input"]
onIpcEvent: function (event) {
handleInputEvent(event.data);
}
}

Expand Down