From afeea62214872689fa39068655c8c6ca663b78a5 Mon Sep 17 00:00:00 2001
From: Rimsoo <50300684+Rimsoo@users.noreply.github.com>
Date: Thu, 24 Apr 2025 23:32:47 +0200
Subject: [PATCH] fixes #3676 including #3224

---
 src/modules/hyprland/language.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/modules/hyprland/language.cpp b/src/modules/hyprland/language.cpp
index 2371a397..1dbdfeba 100644
--- a/src/modules/hyprland/language.cpp
+++ b/src/modules/hyprland/language.cpp
@@ -66,7 +66,11 @@ auto Language::update() -> void {
 void Language::onEvent(const std::string& ev) {
   std::lock_guard<std::mutex> lg(mutex_);
   std::string kbName(begin(ev) + ev.find_last_of('>') + 1, begin(ev) + ev.find_first_of(','));
-  auto layoutName = ev.substr(ev.find_first_of(',') + 1);
+  
+  // Last comma before variants parenthesis, eg:
+  // activelayout>>micro-star-int'l-co.,-ltd.-msi-gk50-elite-gaming-keyboard,English (US, intl., with dead keys)
+  std::string beforParenthesis(begin(ev), begin(ev) + ev.find_last_of('('));
+  auto layoutName = ev.substr(beforParenthesis.find_last_of(',') + 1);
 
   if (config_.isMember("keyboard-name") && kbName != config_["keyboard-name"].asString())
     return;  // ignore