emacs: src/macterm.c comparison

comparison src/macterm.c @ 90729:6588c6259dfb

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 545-562) - Update from CVS - Update from erc--emacs--22 - Merge from gnus--rel--5.10 - erc-iswitchb: Temporarily enable iswitchb mode * gnus--rel--5.10 (patch 172-176) - Merge from emacs--devo--0 - Update from CVS - Update from CVS: lisp/legacy-gnus-agent.el: Add Copyright notice. Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-156

author	Miles Bader <miles@gnu.org>
date	Sat, 16 Dec 2006 01:29:26 +0000
parents	dbe3f29e61d6 1accf28d80f2
children	95d0cdf160ea

comparison

equal deleted inserted replaced

-:a65a92d83186
+:6588c6259dfb
 {
 ATSUTextLayout text_layout;
 UniChar ch = c;
 err = atsu_get_text_layout_with_text_ptr (&ch, 1, style, &text_layout);
-if (err == noErr)
+if (err == noErr
+	  && (font_ascent_return || font_descent_return || overall_return))
 	{
 	  ATSTrapezoid glyph_bounds;
 	  err = ATSUGetGlyphBounds (text_layout, 0, 0,
 				    kATSUFromTextBeginning, kATSUToTextEnd,
 #if USE_ATSUI
 /* Hash table linking font family names to ATSU font IDs.  */
 static Lisp_Object atsu_font_id_hash;
 /* Alist linking Font Manager style to face attributes.  */
 static Lisp_Object fm_style_face_attributes_alist;
-static Lisp_Object Vmac_atsu_font_table;
 extern Lisp_Object QCfamily, QCweight, QCslant, Qnormal, Qbold, Qitalic;
 #endif
 /* Alist linking character set strings to Mac text encoding and Emacs
 coding system. */
 						    charset));
 }
 }
 #if USE_ATSUI
+static FMFontStyle
+fm_get_style_from_font (font)
+FMFont font;
+{
+OSStatus err;
+FMFontStyle style = normal;
+ByteCount len;
+UInt16 mac_style;
+FMFontFamily font_family;
+#define FONT_HEADER_MAC_STYLE_OFFSET (4*4 + 2*2 + 8*2 + 2*4)
+/* FMGetFontFamilyInstanceFromFont returns `normal' as the style of
+some font (e.g., Optima) even if it is `bold'.  */
+err = FMGetFontTable (font, 'head', FONT_HEADER_MAC_STYLE_OFFSET,
+			sizeof (mac_style), &mac_style, &len);
+if (err == noErr
+&& len >= FONT_HEADER_MAC_STYLE_OFFSET + sizeof (mac_style))
+style = EndianU16_BtoN (mac_style);
+else
+FMGetFontFamilyInstanceFromFont (font, &font_family, &style);
+return style;
+}
+static ATSUFontID
+atsu_find_font_from_family_name (family)
+const char *family;
+{
+struct Lisp_Hash_Table *h = XHASH_TABLE (atsu_font_id_hash);
+unsigned hash_code;
+int i;
+Lisp_Object rest, best;
+FMFontStyle min_style, style;
+i = hash_lookup (h, make_unibyte_string (family, strlen (family)),
+		   &hash_code);
+if (i < 0)
+return kATSUInvalidFontID;
+rest = HASH_VALUE (h, i);
+if (INTEGERP (rest) || (CONSP (rest) && INTEGERP (XCDR (rest))))
+return cons_to_long (rest);
+rest = Fnreverse (rest);
+best = XCAR (rest);
+rest = XCDR (rest);
+if (!NILP (rest)
+&& (min_style = fm_get_style_from_font (cons_to_long (best))) != normal)
+do
+{
+	style = fm_get_style_from_font (cons_to_long (XCAR (rest)));
+	if (style < min_style)
+	  {
+	    best = XCAR (rest);
+	    if (style == normal)
+	      break;
+	    else
+	      min_style = style;
+	  }
+	rest = XCDR (rest);
+}
+while (!NILP (rest));
+HASH_VALUE (h, i) = best;
+return cons_to_long (best);
+}
 static Lisp_Object
 fm_style_to_face_attributes (fm_style)
 FMFontStyle fm_style;
 {
 Lisp_Object tem;
 fm_style_face_attributes_alist =
 Fcons (Fcons (make_number (fm_style), tem),
 	   fm_style_face_attributes_alist);
 return tem;
+}
+static Lisp_Object
+atsu_find_font_family_name (font_id)
+ATSUFontID font_id;
+{
+OSStatus err;
+ByteCount len;
+Lisp_Object family = Qnil;
+err = ATSUFindFontName (font_id, kFontFamilyName,
+			  kFontMacintoshPlatform, kFontNoScript,
+			  kFontNoLanguage, 0, NULL, &len, NULL);
+if (err == noErr)
+{
+family = make_uninit_string (len);
+err = ATSUFindFontName (font_id, kFontFamilyName,
+			      kFontMacintoshPlatform, kFontNoScript,
+			      kFontNoLanguage, len, SDATA (family),
+			      NULL, NULL);
+}
+if (err == noErr)
+decode_mac_font_name (SDATA (family), len + 1, Qnil);
+return family;
+}
+Lisp_Object
+mac_atsu_font_face_attributes (font_id)
+ATSUFontID font_id;
+{
+Lisp_Object family, style_attrs;
+family = atsu_find_font_family_name (font_id);
+if (NILP (family))
+return Qnil;
+style_attrs = fm_style_to_face_attributes (fm_get_style_from_font (font_id));
+return Fcons (QCfamily, Fcons (family, style_attrs));
 }
 #endif
 /* Sets up the table font_name_table to contain the list of all fonts
 in the system the first time the table is used so that the Resource
 OSStatus err;
 struct Lisp_Hash_Table *h;
 unsigned hash_code;
 ItemCount nfonts, i;
 ATSUFontID *font_ids = NULL;
-Ptr name;
+Lisp_Object prev_family = Qnil;
-ByteCount name_len;
+int j;
-Lisp_Object family;
 atsu_font_id_hash =
 	make_hash_table (Qequal, make_number (DEFAULT_HASH_SIZE),
 			 make_float (DEFAULT_REHASH_SIZE),
 			 make_float (DEFAULT_REHASH_THRESHOLD),
 	  err = ATSUGetFontIDs (font_ids, nfonts, NULL);
 	}
 if (err == noErr)
 	for (i = 0; i < nfonts; i++)
 	  {
-	    err = ATSUFindFontName (font_ids[i], kFontFamilyName,
+	    Lisp_Object family;
-				    kFontMacintoshPlatform, kFontNoScript,
-				    kFontNoLanguage, 0, NULL, &name_len, NULL);
+	    family = atsu_find_font_family_name (font_ids[i]);
-	    if (err != noErr)
+	    if (NILP (family) || SREF (family, 0) == '.')
 	      continue;
-	    name = xmalloc (name_len + 1);
+	    if (!NILP (Fequal (prev_family, family)))
-	    name[name_len] = '\0';
+	      family = prev_family;
-	    err = ATSUFindFontName (font_ids[i], kFontFamilyName,
+	    else
-				    kFontMacintoshPlatform, kFontNoScript,
+	      j = hash_lookup (h, family, &hash_code);
-				    kFontNoLanguage, name_len, name,
+	    if (j < 0)
-				    NULL, NULL);
-	    if (err == noErr)
 	      {
-		FMFontFamily ff;
+		add_mac_font_name (SDATA (family), 0, normal, "iso10646-1");
-		FMFontStyle style = normal;
+		j = hash_put (h, family, Fcons (long_to_cons (font_ids[i]),
+						Qnil), hash_code);
-		decode_mac_font_name (name, name_len + 1, Qnil);
-		family = make_unibyte_string (name, name_len);
-		FMGetFontFamilyInstanceFromFont (font_ids[i], &ff, &style);
-		Fputhash ((font_ids[i] > MOST_POSITIVE_FIXNUM
-			   ? make_float (font_ids[i])
-			   : make_number (font_ids[i])),
-			  Fcons (QCfamily,
-				 Fcons (family,
-					fm_style_to_face_attributes (style))),
-			  Vmac_atsu_font_table);
-		if (*name != '.'
-		    && hash_lookup (h, family, &hash_code) < 0)
-		  {
-		    add_mac_font_name (name, 0, normal, "iso10646-1");
-		    hash_put (h, family, long_to_cons (font_ids[i]),
-			      hash_code);
-		  }
 	      }
-	    xfree (name);
+	    else if (EQ (prev_family, family))
+	      HASH_VALUE (h, j) = Fcons (long_to_cons (font_ids[i]),
+					 HASH_VALUE (h, j));
+	    prev_family = family;
 	  }
 if (font_ids)
 	xfree (font_ids);
 }
 #endif
 	 &bold_p, &italic_p};
 static const ATSUFontFeatureType types[] =
 	{kAllTypographicFeaturesType, kDiacriticsType};
 static const ATSUFontFeatureSelector selectors[] =
 	{kAllTypeFeaturesOffSelector, kDecomposeDiacriticsSelector};
-Lisp_Object font_id_cons;
 FMFontStyle style;
-font_id_cons = Fgethash (make_unibyte_string (family, strlen (family)),
+font_id = atsu_find_font_from_family_name (family);
-			       atsu_font_id_hash, Qnil);
+if (font_id == kATSUInvalidFontID)
-if (NILP (font_id_cons))
+	return;
-	return NULL;
-font_id = cons_to_long (font_id_cons);
 size_fixed = Long2Fix (size);
 bold_p = (fontface & bold) != 0;
 italic_p = (fontface & italic) != 0;
 err = ATSUCreateStyle (&mac_style);
 if (err != noErr)
 	  if (c == 0xad)
 	    /* Soft hyphen is not supported in ATSUI.  */
 	    continue;
 	  else if (c == 0x7f)
 	    {
-	      c = 0x9f;
+#if USE_CG_TEXT_DRAWING
-	      continue;
+	      if (font->cg_glyphs)
+		{
+		  c = 0x9f;
+		  pcm = NULL;
+		  continue;
+		}
+#endif
+	      break;
 	    }
-	  mac_query_char_extents (font->mac_style, c, NULL, NULL, pcm + c,
+	  mac_query_char_extents (font->mac_style, c, NULL, NULL,
+				  pcm ? pcm + c : NULL,
 #if USE_CG_TEXT_DRAWING
 				  (font->cg_glyphs ? font->cg_glyphs + c
 				   : NULL)
 #else
 				    NULL
 		 ASCII or Latin-1 characters.  */
 	      CGFontRelease (font->cg_font);
 	      font->cg_font = NULL;
 	      xfree (font->cg_glyphs);
 	      font->cg_glyphs = NULL;
+	      if (pcm == NULL)
+		break;
 	    }
 #endif
 	}
 }
 else
 #endif
 {
+OSStatus err;
 FontInfo the_fontinfo;
 int is_two_byte_font;
 #if USE_CG_DRAWING
 mac_prepare_for_quickdraw (f);
 	    xmalloc (sizeof (XCharStruct) * (0xff - 0x20 + 1));
 	  bzero (font->bounds.per_char,
 		 sizeof (XCharStruct) * (0xff - 0x20 + 1));
 	  space_bounds = font->bounds.per_char;
-	  mac_query_char_extents (NULL, 0x20, &font->ascent, &font->descent,
+	  err = mac_query_char_extents (NULL, 0x20, &font->ascent,
-				  space_bounds, NULL);
+					&font->descent, space_bounds, NULL);
+	  if (err != noErr || space_bounds->width <= 0)
+	    {
+	      mac_unload_font (&one_mac_display_info, font);
+	      return NULL;
+	    }
 	  for (c = 0x21, pcm = space_bounds + 1; c <= 0xff; c++, pcm++)
 	    mac_query_char_extents (NULL, c, NULL, NULL, pcm, NULL);
 	}
 }
 						   &apple_event);
 	  if (err == noErr)
 	    {
 	      mac_store_apple_event (class_key, id_key, &apple_event);
 	      AEDisposeDesc (&apple_event);
-	      /* Post a harmless event so as to wake up from
+	      mac_wakeup_from_rne ();
-		 ReceiveNextEvent.  */
-	      mac_post_mouse_moved_event ();
 	    }
 	}
 }
 return err;
 #if TARGET_API_MAC_CARBON
 		    FrontNonFloatingWindow ()
 #else
 		    FrontWindow ()
 #endif
-		    != window_ptr)
+		    != window_ptr
+		    || (mac_window_to_frame (window_ptr)
+			!= dpyinfo->x_focus_frame))
 		  SelectWindow (window_ptr);
 		else
 		  {
 		    ControlPartCode control_part_code;
 		    ControlHandle ch;
 /* We don't yet support this, but defining this here avoids whining
 from cus-start.el and other places, like "M-x set-variable".  */
 DEFVAR_BOOL ("x-use-underline-position-properties",
 	       &x_use_underline_position_properties,
 doc: /* *Non-nil means make use of UNDERLINE_POSITION font properties.
-nil means ignore them.  If you encounter fonts with bogus
+A value of nil means ignore them.  If you encounter fonts with bogus
 UNDERLINE_POSITION font properties, for example 7x13 on XFree prior
 to 4.1, set this to nil.
 NOTE: Not supported on Mac yet.  */);
 x_use_underline_position_properties = 0;
 DEFVAR_BOOL ("x-underline-at-descent-line",
 	       &x_underline_at_descent_line,
 doc: /* *Non-nil means to draw the underline at the same place as the descent line.
-nil means to draw the underline according to the value of the variable
+A value of nil means to draw the underline according to the value of the
-`x-use-underline-position-properties', which is usually at the baseline
+variable `x-use-underline-position-properties', which is usually at the
-level.  The default value is nil.  */);
+baseline level.  The default value is nil.  */);
 x_underline_at_descent_line = 0;
 DEFVAR_LISP ("x-toolkit-scroll-bars", &Vx_toolkit_scroll_bars,
 doc: /* If not nil, Emacs uses toolkit scroll bars.  */);
 #ifdef USE_TOOLKIT_SCROLL_BARS
 DEFVAR_LISP ("mac-emulate-three-button-mouse",
 	       &Vmac_emulate_three_button_mouse,
 doc: /* *Specify a way of three button mouse emulation.
 The value can be nil, t, or the symbol `reverse'.
-nil means that no emulation should be done and the modifiers should be
+A value of nil means that no emulation should be done and the modifiers
-placed on the mouse-1 event.
+should be placed on the mouse-1 event.
 t means that when the option-key is held down while pressing the mouse
 button, the click will register as mouse-2 and while the command-key
 is held down, the click will register as mouse-3.
 The symbol `reverse' means that the option-key will register for
 mouse-3 and the command-key will register for mouse-2.  */);
 CODING_SYSTEM is a coding system corresponding to TEXT-ENCODING.  */);
 Vmac_charset_info_alist =
 Fcons (list3 (build_string ("mac-roman"),
 		  make_number (smRoman), Qnil), Qnil);
-#if USE_ATSUI
-DEFVAR_LISP ("mac-atsu-font-table", &Vmac_atsu_font_table,
-doc: /* Hash table of ATSU font IDs vs plist of attributes and values.  */);
-Vmac_atsu_font_table =
-make_hash_table (Qeql, make_number (DEFAULT_HASH_SIZE),
-		     make_float (DEFAULT_REHASH_SIZE),
-		     make_float (DEFAULT_REHASH_THRESHOLD),
-		     Qnil, Qnil, Qnil);
-#endif
 #if USE_MAC_TSM
 DEFVAR_LISP ("mac-ts-active-input-overlay", &Vmac_ts_active_input_overlay,
 doc: /* Overlay used to display Mac TSM active input area.  */);
 Vmac_ts_active_input_overlay = Qnil;

Mercurial > emacs

comparison src/macterm.c @ 90729:6588c6259dfb