aboutsummaryrefslogtreecommitdiffstats
path: root/src/nsfns.m
diff options
context:
space:
mode:
Diffstat (limited to 'src/nsfns.m')
-rw-r--r--src/nsfns.m23
1 files changed, 8 insertions, 15 deletions
diff --git a/src/nsfns.m b/src/nsfns.m
index 43002ca6fef..1ed3e23cba5 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -49,13 +49,6 @@ GNUstep port and post-20 update by Adrian Robert (arobert@cogsci.ucsd.edu)
49#include "macfont.h" 49#include "macfont.h"
50#endif 50#endif
51 51
52#if 0
53int fns_trace_num = 1;
54#define NSTRACE(x) fprintf (stderr, "%s:%d: [%d] " #x "\n", \
55 __FILE__, __LINE__, ++fns_trace_num)
56#else
57#define NSTRACE(x)
58#endif
59 52
60#ifdef HAVE_NS 53#ifdef HAVE_NS
61 54
@@ -364,7 +357,7 @@ static void
364x_set_icon_name (struct frame *f, Lisp_Object arg, Lisp_Object oldval) 357x_set_icon_name (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
365{ 358{
366 NSView *view = FRAME_NS_VIEW (f); 359 NSView *view = FRAME_NS_VIEW (f);
367 NSTRACE (x_set_icon_name); 360 NSTRACE ("x_set_icon_name");
368 361
369 /* see if it's changed */ 362 /* see if it's changed */
370 if (STRINGP (arg)) 363 if (STRINGP (arg))
@@ -436,7 +429,7 @@ ns_set_name_internal (struct frame *f, Lisp_Object name)
436static void 429static void
437ns_set_name (struct frame *f, Lisp_Object name, int explicit) 430ns_set_name (struct frame *f, Lisp_Object name, int explicit)
438{ 431{
439 NSTRACE (ns_set_name); 432 NSTRACE ("ns_set_name");
440 433
441 /* Make sure that requests from lisp code override requests from 434 /* Make sure that requests from lisp code override requests from
442 Emacs redisplay code. */ 435 Emacs redisplay code. */
@@ -477,7 +470,7 @@ ns_set_name (struct frame *f, Lisp_Object name, int explicit)
477static void 470static void
478x_explicitly_set_name (struct frame *f, Lisp_Object arg, Lisp_Object oldval) 471x_explicitly_set_name (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
479{ 472{
480 NSTRACE (x_explicitly_set_name); 473 NSTRACE ("x_explicitly_set_name");
481 ns_set_name (f, arg, 1); 474 ns_set_name (f, arg, 1);
482} 475}
483 476
@@ -488,7 +481,7 @@ x_explicitly_set_name (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
488void 481void
489x_implicitly_set_name (struct frame *f, Lisp_Object arg, Lisp_Object oldval) 482x_implicitly_set_name (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
490{ 483{
491 NSTRACE (x_implicitly_set_name); 484 NSTRACE ("x_implicitly_set_name");
492 485
493 /* Deal with NS specific format t. */ 486 /* Deal with NS specific format t. */
494 if (FRAME_NS_P (f) && ((FRAME_ICONIFIED_P (f) && EQ (Vicon_title_format, Qt)) 487 if (FRAME_NS_P (f) && ((FRAME_ICONIFIED_P (f) && EQ (Vicon_title_format, Qt))
@@ -505,7 +498,7 @@ x_implicitly_set_name (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
505static void 498static void
506x_set_title (struct frame *f, Lisp_Object name, Lisp_Object old_name) 499x_set_title (struct frame *f, Lisp_Object name, Lisp_Object old_name)
507{ 500{
508 NSTRACE (x_set_title); 501 NSTRACE ("x_set_title");
509 /* Don't change the title if it's already NAME. */ 502 /* Don't change the title if it's already NAME. */
510 if (EQ (name, f->title)) 503 if (EQ (name, f->title))
511 return; 504 return;
@@ -533,7 +526,7 @@ ns_set_name_as_filename (struct frame *f)
533 NSAutoreleasePool *pool; 526 NSAutoreleasePool *pool;
534 Lisp_Object encoded_name, encoded_filename; 527 Lisp_Object encoded_name, encoded_filename;
535 NSString *str; 528 NSString *str;
536 NSTRACE (ns_set_name_as_filename); 529 NSTRACE ("ns_set_name_as_filename");
537 530
538 if (f->explicit_name || ! NILP (f->title)) 531 if (f->explicit_name || ! NILP (f->title))
539 return; 532 return;
@@ -729,7 +722,7 @@ ns_implicitly_set_icon_type (struct frame *f)
729 NSAutoreleasePool *pool; 722 NSAutoreleasePool *pool;
730 BOOL setMini = YES; 723 BOOL setMini = YES;
731 724
732 NSTRACE (ns_implicitly_set_icon_type); 725 NSTRACE ("ns_implicitly_set_icon_type");
733 726
734 block_input (); 727 block_input ();
735 pool = [[NSAutoreleasePool alloc] init]; 728 pool = [[NSAutoreleasePool alloc] init];
@@ -797,7 +790,7 @@ x_set_icon_type (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
797 id image = nil; 790 id image = nil;
798 BOOL setMini = YES; 791 BOOL setMini = YES;
799 792
800 NSTRACE (x_set_icon_type); 793 NSTRACE ("x_set_icon_type");
801 794
802 if (!NILP (arg) && SYMBOLP (arg)) 795 if (!NILP (arg) && SYMBOLP (arg))
803 { 796 {