comparison src/xfaces.c @ 83353:532e0a9335a9

Merged in changes from CVS trunk. Plus added lisp/term tweaks. Patches applied: * [e-mail]--2004/emacs--cvs-trunk--0--base-0 tag of [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-474 * [e-mail]--2004/emacs--cvs-trunk--0--patch-1 Add CVS metadata files. * [e-mail]--2004/emacs--cvs-trunk--0--patch-2 Update from CVS. git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-393

83352:b258b3492423

/* xfaces.c -- "Face" primitives.
   Copyright (C) 1993, 1994, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
   Free Software Foundation.

This file is part of GNU Emacs.

GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by

#endif  /* WINDOWSNT */

#ifdef MAC_OS
/* Mac OS emulation of GCs */

extern XGCValues *XCreateGC (void *, Window, unsigned long, XGCValues *);

static INLINE GC
x_create_gc (f, mask, xgcv)
     struct frame *f;
     unsigned long mask;

DEFUN ("internal-lisp-face-p", Finternal_lisp_face_p,
       Sinternal_lisp_face_p, 1, 2, 0,
       doc: /* Return non-nil if FACE names a face.
If optional second parameter FRAME is non-nil, check for the
existence of a frame-local face with name FACE on that frame.
Otherwise check for the existence of a global face.  */)
     (face, frame)
     Lisp_Object face, frame;
{

	{
#ifdef USE_MOTIF
	  const char *suffix = "List";
	  Bool motif = True;
#else
	  const char *suffix = "";
	  Bool motif = False;
#endif
#if defined HAVE_X_I18N
	  extern char *xic_create_fontsetname
	    P_ ((char *base_fontname, Bool motif));

  if (STRINGP (try_family))
    nfonts = try_alternative_families (f, try_family, registry, fonts);

#ifdef MAC_OS
  /* When realizing the default face and a font spec does not matched
     exactly, Emacs looks for ones with the same registry as the
     default font.  On the Mac, this is mac-roman, which does not work
     if the family is -etl-fixed, e.g.  The following widens the
     choices and fixes that problem.  */
  if (nfonts == 0 && STRINGP (try_family) && STRINGP (registry)
      && xstricmp (SDATA (registry), "mac-roman") == 0)
    nfonts = try_alternative_families (f, try_family, Qnil, fonts);
#endif

  if (EQ (try_family, family))
    family = face_family;

83353:532e0a9335a9

/* xfaces.c -- "Face" primitives.
   Copyright (C) 1993, 1994, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
                 2005 Free Software Foundation, Inc.

This file is part of GNU Emacs.

GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by

#endif  /* WINDOWSNT */

#ifdef MAC_OS
/* Mac OS emulation of GCs */

static INLINE GC
x_create_gc (f, mask, xgcv)
     struct frame *f;
     unsigned long mask;

DEFUN ("internal-lisp-face-p", Finternal_lisp_face_p,
       Sinternal_lisp_face_p, 1, 2, 0,
       doc: /* Return non-nil if FACE names a face.
If optional second argument FRAME is non-nil, check for the
existence of a frame-local face with name FACE on that frame.
Otherwise check for the existence of a global face.  */)
     (face, frame)
     Lisp_Object face, frame;
{

	{
#ifdef USE_MOTIF
	  const char *suffix = "List";
	  Bool motif = True;
#else
#if defined HAVE_X_I18N

	  const char *suffix = "Set";
#else
	  const char *suffix = "";
#endif
	  Bool motif = False;
#endif
#if defined HAVE_X_I18N
	  extern char *xic_create_fontsetname
	    P_ ((char *base_fontname, Bool motif));

  if (STRINGP (try_family))
    nfonts = try_alternative_families (f, try_family, registry, fonts);

#ifdef MAC_OS
  if (nfonts == 0 && STRINGP (try_family) && STRINGP (registry))
    if (xstricmp (SDATA (registry), "mac-roman") == 0)
      /* When realizing the default face and a font spec does not
	 matched exactly, Emacs looks for ones with the same registry
	 as the default font.  On the Mac, this is mac-roman, which
	 does not work if the family is -etl-fixed, e.g.  The
	 following widens the choices and fixes that problem.  */
      nfonts = try_alternative_families (f, try_family, Qnil, fonts);
    else if (SBYTES (try_family) > 0
	     && SREF (try_family, SBYTES (try_family) - 1) != '*')
      /* Some Central European/Cyrillic font family names have the
	 Roman counterpart name as their prefix.  */
      nfonts = try_alternative_families (f, concat2 (try_family,
						     build_string ("*")),
					 registry, fonts);
#endif

  if (EQ (try_family, family))
    family = face_family;