提交: 4dd6127a23319b8407ea2c3ee1d1f1c50e3bd70a - trjp_sawfish (git)

Japanese translation of message catalog for Sawfish Window-Manager

Commit MetaInfo

• 修订版: 4dd6127a23319b8407ea2c3ee1d1f1c50e3bd70a (tree)
• 时间: 2002-05-07 12:17:18
• 作者: John Harper <jsh@src....>
• Commiter: John Harper

Log Message

merged more changes from HEAD

更改概述

• modified: src/ChangeLog
• modified: src/events.c
• modified: src/functions.c
• modified: src/sawmill_subrs.h

差异

--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
[phone]  John Harper  <[e-mail]>
+
+	* More merging from HEAD:
+
+	2002-04-22  John Harper  <[e-mail]>
+
+	* functions.c (Fset_x_text_property): added optional fourth arg
+	ENCODING-ATOM. To allow #67397 to be fixed
+
+	* events.c: more focus change fallout
+
 2002-04-21  John Harper  <[e-mail]>
 
 	* Merged changes from HEAD:

--- a/src/events.c
+++ b/src/events.c
@@ -905,6 +905,19 @@ leave_notify (XEvent *ev)
 static Lisp_Window *last_focused;
 
 static void
+report_focus_change (Lisp_Window *w)
+{
+    if (w != 0
+	&& w->focus_change != 0
+	&& !WINDOW_IS_GONE_P (w))
+    {
+	DB (("  calling focus change %p on %s\n",
+	     w->focus_change, rep_STR(w->name)));
+	w->focus_change (w);
+    }
+}
+
+static void
 focus_in (XEvent *ev)
 {
     Lisp_Window *w = find_window_by_id (ev->xfocus.window);
@@ -912,18 +925,16 @@ focus_in (XEvent *ev)
 	return;
     if (w != 0 && w->visible)
     {
+	Lisp_Window *old = focus_window;
 	focus_window = w;
 
 	if (last_focused != w)
 	{
 	    last_focused = w;
+	    if (old != 0)
+		report_focus_change (old);
 	    install_colormaps (w);
-	    if (w->focus_change != 0)
-	    {
-		DB (("  calling focus change %p on %s\n",
-		     w->focus_change, rep_STR(w->name)));
-		w->focus_change (w);
-	    }
+	    report_focus_change (w);
 	    if (!WINDOW_IS_GONE_P (w))
 	    {
 		Fcall_window_hook (Qfocus_in_hook, rep_VAL(w),
@@ -945,16 +956,14 @@ focus_out (XEvent *ev)
     if (w != 0 && ev->xfocus.detail != NotifyInferior)
     {
 	if (focus_window == w)
+	{
 	    focus_window = 0;
+	    report_focus_change (w);
+	}
+
 	if (last_focused == w)
 	{
 	    last_focused = 0;
-	    if (w->focus_change != 0)
-	    {
-		DB (("  calling focus change %p on %s\n",
-		     w->focus_change, rep_STR(w->name)));
-		w->focus_change (w);
-	    }
 	    if (!WINDOW_IS_GONE_P (w))
 	    {
 		Fcall_window_hook (Qfocus_out_hook, rep_VAL(w),

--- a/src/functions.c
+++ b/src/functions.c
@@ -826,13 +826,13 @@ get-x-text-property WINDOW PROPERTY
 }
 
 DEFUN("set-x-text-property", Fset_x_text_property, Sset_x_text_property, 
-      (repv win, repv prop, repv vect), rep_Subr3) /*
+      (repv win, repv prop, repv vect, repv enc), rep_Subr4) /*
 ::doc:sawfish.wm.misc#set-x-text-prooperty::
-set-x-text-property WINDOW PROPERTY STRING-VECTOR
+set-x-text-property WINDOW PROPERTY STRING-VECTOR [ENCODING-ATOM]
 ::end:: */
 {
     Window w;
-    Atom a_prop;
+    Atom a_prop, enc_atom;
     XTextProperty t_prop;
     char **strings;
     int count, i;
@@ -844,6 +844,11 @@ set-x-text-property WINDOW PROPERTY STRING-VECTOR
 	return WINDOWP(win) ? Qnil : rep_signal_arg_error (win, 1);
     a_prop = XInternAtom (dpy, rep_STR(rep_SYM(prop)->name), False);
 
+    if (rep_SYMBOLP (enc))
+	enc_atom = XInternAtom (dpy, rep_STR(rep_SYM(enc)->name), False);
+    else
+	enc_atom = 0;
+
     count = rep_VECT_LEN(vect);
     strings = alloca (sizeof (char *) * (count + 1));
     for (i = 0; i < count; i++)
@@ -854,6 +859,8 @@ set-x-text-property WINDOW PROPERTY STRING-VECTOR
     }
     if (XStringListToTextProperty (strings, count, &t_prop) != 0)
     {
+	if (enc_atom != 0)
+	    t_prop.encoding = enc_atom;
 	XSetTextProperty (dpy, w, &t_prop, a_prop);
 	XFree (t_prop.value);
     }

--- a/src/sawmill_subrs.h
+++ b/src/sawmill_subrs.h
@@ -176,7 +176,7 @@ extern repv Fget_x_property (repv win, repv prop);
 extern repv Fset_x_property (repv win, repv prop, repv data,
 			     repv type, repv format);
 extern repv Fget_x_text_property (repv win, repv prop);
-extern repv Fset_x_text_property (repv win, repv prop, repv vect);
+extern repv Fset_x_text_property (repv win, repv prop, repv vect, repv enc);
 extern repv Fsend_client_message (repv win, repv type, repv data, repv format);
 extern repv Fcreate_window (repv parent, repv x, repv y,
 			    repv width, repv height);