emacs: src/nsfns.m comparison

comparison src/nsfns.m @ 112033:a80c1e8d9df4

Encode frame title and icon name before setting. * coding.h (ENCODE_UTF_8): Remove "Used by ..." comment. * nsfns.m (ns_set_name_iconic): Remove. (ns_set_name_internal): New function. (Vicon_title_format): Extern declare. (ns_set_name): Call ns_set_name_internal. (x_explicitly_set_name): Remove call to ns_set_name_iconic. (x_implicitly_set_name): Ditto. (x_set_title): Remove commet about EXPLICIT. Call ns_set_name_internal. (ns_set_name_as_filename): Encode name with ENCODE_UTF_8 (Bug#7517).

author	Jan D. <jan.h.d@swipnet.se>
date	Thu, 30 Dec 2010 12:30:55 +0100
parents	ca0d9a916432
children	9c611deb66fa

comparison

equal deleted inserted replaced

-:209df3f0dcc6
+:a80c1e8d9df4
 extern Lisp_Object Qface_set_after_frame_default;
 extern Lisp_Object Qunderline, Qundefined;
 extern Lisp_Object Qheight, Qminibuffer, Qname, Qonly, Qwidth;
 extern Lisp_Object Qunsplittable, Qmenu_bar_lines, Qbuffer_predicate, Qtitle;
 extern Lisp_Object Qnone;
-extern Lisp_Object Vframe_title_format;
+extern Lisp_Object Vframe_title_format, Vicon_title_format;
 /* The below are defined in frame.c.  */
 extern Lisp_Object Vmenu_bar_mode, Vtool_bar_mode;
 [[view window] setMiniwindowTitle:
 [NSString stringWithUTF8String: SDATA (arg)]];
 }
 static void
-ns_set_name_iconic (struct frame *f, Lisp_Object name, int explicit)
+ns_set_name_internal (FRAME_PTR f, Lisp_Object name)
 {
+struct gcpro gcpro1;
+Lisp_Object encoded_name, encoded_icon_name;
+NSString *str;
 NSView *view = FRAME_NS_VIEW (f);
-NSTRACE (ns_set_name_iconic);
+GCPRO1 (name);
+encoded_name = ENCODE_UTF_8 (name);
+UNGCPRO;
+str = [NSString stringWithUTF8String: SDATA (encoded_name)];
+/* Don't change the name if it's already NAME.  */
+if (! [[[view window] title] isEqualToString: str])
+[[view window] setTitle: str];
+if (!STRINGP (f->icon_name))
+encoded_icon_name = encoded_name;
+else
+encoded_icon_name = ENCODE_UTF_8 (f->icon_name);
+str = [NSString stringWithUTF8String: SDATA (encoded_icon_name)];
+if ([[view window] miniwindowTitle] &&
+! [[[view window] miniwindowTitle] isEqualToString: str])
+[[view window] setMiniwindowTitle: str];
+}
+static void
+ns_set_name (struct frame *f, Lisp_Object name, int explicit)
+{
+NSView *view;
+NSTRACE (ns_set_name);
 if (ns_in_resize)
 return;
 /* Make sure that requests from lisp code override requests from
 update_mode_lines = 1;
 f->explicit_name = ! NILP (name);
 }
 else if (f->explicit_name)
-name = f->name;
+return;
+if (NILP (name))
+name = build_string([ns_app_name UTF8String]);
+else
+CHECK_STRING (name);
+/* Don't change the name if it's already NAME.  */
+if (! NILP (Fstring_equal (name, f->name)))
+return;
+f->name = name;
 /* title overrides explicit name */
 if (! NILP (f->title))
 name = f->title;
-/* icon_name overrides title and explicit name */
+ns_set_name_internal (f, name);
-if (! NILP (f->icon_name))
-name = f->icon_name;
-if (NILP (name))
-name = build_string([ns_app_name UTF8String]);
-else
-CHECK_STRING (name);
-/* Don't change the name if it's already NAME.  */
-if ([[view window] miniwindowTitle] &&
-([[[view window] miniwindowTitle]
-isEqualToString: [NSString stringWithUTF8String:
-SDATA (name)]]))
-return;
-[[view window] setMiniwindowTitle:
-[NSString stringWithUTF8String: SDATA (name)]];
-}
-static void
-ns_set_name (struct frame *f, Lisp_Object name, int explicit)
-{
-NSView *view;
-NSTRACE (ns_set_name);
-if (ns_in_resize)
-return;
-/* Make sure that requests from lisp code override requests from
-Emacs redisplay code.  */
-if (explicit)
-{
-/* If we're switching from explicit to implicit, we had better
-update the mode lines and thereby update the title.  */
-if (f->explicit_name && NILP (name))
-update_mode_lines = 1;
-f->explicit_name = ! NILP (name);
-}
-else if (f->explicit_name)
-return;
-if (NILP (name))
-name = build_string([ns_app_name UTF8String]);
-f->name = name;
-/* title overrides explicit name */
-if (! NILP (f->title))
-name = f->title;
-CHECK_STRING (name);
-view = FRAME_NS_VIEW (f);
-/* Don't change the name if it's already NAME.  */
-if ([[[view window] title]
-isEqualToString: [NSString stringWithUTF8String:
-SDATA (name)]])
-return;
-[[view window] setTitle: [NSString stringWithUTF8String:
-SDATA (name)]];
 }
 /* This function should be called when the user's lisp code has
 specified a name for the frame; the name will override any set by the
 redisplay code.  */
 static void
 x_explicitly_set_name (FRAME_PTR f, Lisp_Object arg, Lisp_Object oldval)
 {
 NSTRACE (x_explicitly_set_name);
-ns_set_name_iconic (f, arg, 1);
 ns_set_name (f, arg, 1);
 }
 /* This function should be called by Emacs redisplay code to set the
 lisp code.  */
 void
 x_implicitly_set_name (FRAME_PTR f, Lisp_Object arg, Lisp_Object oldval)
 {
 NSTRACE (x_implicitly_set_name);
-if (FRAME_ICONIFIED_P (f))
-ns_set_name_iconic (f, arg, 0);
+/* Deal with NS specific format t.  */
-else if (FRAME_NS_P (f) && EQ (Vframe_title_format, Qt))
+if (FRAME_NS_P (f) && ((FRAME_ICONIFIED_P (f) && EQ (Vicon_title_format, Qt))
+|| EQ (Vframe_title_format, Qt)))
 ns_set_name_as_filename (f);
 else
 ns_set_name (f, arg, 0);
 }
 /* Change the title of frame F to NAME.
-If NAME is nil, use the frame name as the title.
+If NAME is nil, use the frame name as the title.  */
-If EXPLICIT is non-zero, that indicates that lisp code is setting the
-name; if NAME is a string, set F's name to NAME and set
-F->explicit_name; if NAME is Qnil, then clear F->explicit_name.
-If EXPLICIT is zero, that indicates that Emacs redisplay code is
-suggesting a new name, which lisp code should override; if
-F->explicit_name is set, ignore the new name; otherwise, set it.  */
 static void
 x_set_title (struct frame *f, Lisp_Object name, Lisp_Object old_name)
 {
 NSTRACE (x_set_title);
 /* Don't change the title if it's already NAME.  */
 return;
 update_mode_lines = 1;
 f->title = name;
+if (NILP (name))
+name = f->name;
+else
+CHECK_STRING (name);
+ns_set_name_internal (f, name);
 }
 void
 ns_set_name_as_filename (struct frame *f)
 NSView *view;
 Lisp_Object name;
 Lisp_Object buf = XWINDOW (f->selected_window)->buffer;
 const char *title;
 NSAutoreleasePool *pool;
+struct gcpro gcpro1;
+Lisp_Object encoded_name;
 NSTRACE (ns_set_name_as_filename);
 if (f->explicit_name || ! NILP (f->title) || ns_in_resize)
 return;
 BLOCK_INPUT;
 pool = [[NSAutoreleasePool alloc] init];
 name = XBUFFER (buf)->filename;
-if (NILP (name) || FRAME_ICONIFIED_P (f)) name =XBUFFER (buf)->name;
+if (NILP (name) || FRAME_ICONIFIED_P (f)) name = XBUFFER (buf)->name;
 if (FRAME_ICONIFIED_P (f) && !NILP (f->icon_name))
 name = f->icon_name;
 if (NILP (name))
 name = build_string ([ns_app_name UTF8String]);
 else
 CHECK_STRING (name);
+GCPRO1 (name);
+encoded_name = ENCODE_UTF_8 (name);
+UNGCPRO;
 view = FRAME_NS_VIEW (f);
 title = FRAME_ICONIFIED_P (f) ? [[[view window] miniwindowTitle] UTF8String]
 : [[[view window] title] UTF8String];
-if (title && (! strcmp (title, SDATA (name))))
+if (title && (! strcmp (title, SDATA (encoded_name))))
 {
 [pool release];
 UNBLOCK_INPUT;
 return;
 }
 {
 #ifdef NS_IMPL_COCOA
 /* work around a bug observed on 10.3 where
 setTitleWithRepresentedFilename does not clear out previous state
 if given filename does not exist */
-NSString *str = [NSString stringWithUTF8String: SDATA (name)];
+NSString *str = [NSString stringWithUTF8String: SDATA (encoded_name)];
 if (![[NSFileManager defaultManager] fileExistsAtPath: str])
 {
 [[view window] setTitleWithRepresentedFilename: @""];
 [[view window] setTitle: str];
 }
 {
 [[view window] setTitleWithRepresentedFilename: str];
 }
 #else
 [[view window] setTitleWithRepresentedFilename:
-[NSString stringWithUTF8String: SDATA (name)]];
+[NSString stringWithUTF8String: SDATA (encoded_name)]];
 #endif
 f->name = name;
 }
 else
 {
 [[view window] setMiniwindowTitle:
-[NSString stringWithUTF8String: SDATA (name)]];
+[NSString stringWithUTF8String: SDATA (encoded_name)]];
 }
 [pool release];
 UNBLOCK_INPUT;
 }

Mercurial > emacs

comparison src/nsfns.m @ 112033:a80c1e8d9df4