From ec1aaac5c0fb621461a171bb241d2e1c74509d1e Mon Sep 17 00:00:00 2001
From: Po Lu <luangruo@yahoo.com>
Date: Thu, 24 Feb 2022 11:58:41 +0800
Subject: [PATCH] Set border colors through the toolkit

* src/xfns.c (x_set_border_pixel): Set colors through Xt to
avoid some problems.
---
 src/xfns.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/xfns.c b/src/xfns.c
index 977096c13c6..03adb5ab8d7 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1472,6 +1472,21 @@ x_set_border_pixel (struct frame *f, unsigned long pix)
   unload_color (f, f->output_data.x->border_pixel);
   f->output_data.x->border_pixel = pix;
 
+#ifdef USE_X_TOOLKIT
+  if (f->output_data.x->widget && f->border_width > 0)
+    {
+      block_input ();
+      XtVaSetValues (f->output_data.x->widget, XtNborderColor,
+		     (Pixel) pix, NULL);
+      unblock_input ();
+
+      if (FRAME_VISIBLE_P (f))
+	redraw_frame (f);
+
+      return;
+    }
+#endif
+
   if (FRAME_X_WINDOW (f) != 0 && f->border_width > 0)
     {
       block_input ();
-- 
2.39.5