Merge pull request godotengine#101684 from bruvzg/wl_ime_upd

Repiteo · Repiteo · commit d6f688b9fce6 · 2025-01-17T10:16:45.000-06:00
[Wayland] Fix excessive IME updates.
diff --git a/platform/linuxbsd/wayland/display_server_wayland.cpp b/platform/linuxbsd/wayland/display_server_wayland.cpp
@@ -1223,10 +1223,12 @@ void DisplayServerWayland::process_events() {
 
 		Ref<WaylandThread::IMEUpdateEventMessage> ime_update_msg = msg;
 		if (ime_update_msg.is_valid()) {
-			ime_text = ime_update_msg->text;
-			ime_selection = ime_update_msg->selection;
+			if (ime_text != ime_update_msg->text || ime_selection != ime_update_msg->selection) {
+				ime_text = ime_update_msg->text;
+				ime_selection = ime_update_msg->selection;
 
-			OS::get_singleton()->get_main_loop()->notification(MainLoop::NOTIFICATION_OS_IME_UPDATE);
+				OS::get_singleton()->get_main_loop()->notification(MainLoop::NOTIFICATION_OS_IME_UPDATE);
+			}
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1223,10 +1223,12 @@ void DisplayServerWayland::process_events() {`
`1223`	`1223`
`1224`	`1224`	`Ref<WaylandThread::IMEUpdateEventMessage> ime_update_msg = msg;`
`1225`	`1225`	`if (ime_update_msg.is_valid()) {`
`1226`		`- ime_text = ime_update_msg->text;`
`1227`		`- ime_selection = ime_update_msg->selection;`
	`1226`	`+ if (ime_text != ime_update_msg->text \|\| ime_selection != ime_update_msg->selection) {`
	`1227`	`+ ime_text = ime_update_msg->text;`
	`1228`	`+ ime_selection = ime_update_msg->selection;`
`1228`	`1229`
`1229`		`- OS::get_singleton()->get_main_loop()->notification(MainLoop::NOTIFICATION_OS_IME_UPDATE);`
	`1230`	`+ OS::get_singleton()->get_main_loop()->notification(MainLoop::NOTIFICATION_OS_IME_UPDATE);`
	`1231`	`+ }`
`1230`	`1232`	`}`
`1231`	`1233`	`}`
`1232`	`1234`