comparison src/xfns.c @ 83271:1830bcd0eec0

Merged from [e-mail]--gnu-2005 (patch 39-44, 184-191) Patches applied: * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-184 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-185 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-186 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-187 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-188 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-189 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-190 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-191 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-39 Merge from emacs--cvs-trunk--0 * [e-mail]--gnu-2005/gnus--rel--5.10--patch-40 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-41 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-42 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-43 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-44 Merge from emacs--cvs-trunk--0 git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-311

83270:42406ecdf5bf

/* Create an X fontset on frame F with base font name BASE_FONTNAME.  */

char xic_defaut_fontset[] = "-*-*-*-r-normal--14-*-*-*-*-*-*-*";

char *
xic_create_fontsetname (base_fontname)
     char *base_fontname;
{
  /* Make a fontset name from the base font name.  */
  if (xic_defaut_fontset == base_fontname)
    /* There is no base font name, use the default.  */
    return base_fontname;
  else
    {
      /* Make a fontset name from the base font name.
	 The font set will be made of the following elements:
	 - the base font.
	 - the base font where the charset spec is replaced by -*-*.
	 - the same but with the family also replaced with -*-*-.  */
      char *p = base_fontname;
      char *fontsetname;
      int i;
	
      for (i = 0; *p; p++)
	if (*p == '-') i++;
      if (i != 14)
	{ /* As the font name doesn't conform to XLFD, we can't
	     modify it to generalize it to allcs and allfamilies.
	     Use the specified font plus the default.  */
	  int len = strlen (base_fontname) + strlen (xic_defaut_fontset) + 2;
	  fontsetname = xmalloc (len);
	  bzero (fontsetname, len);
	  strcpy (fontsetname, base_fontname);
	  strcat (fontsetname, ",");
	  strcat (fontsetname, xic_defaut_fontset);
	}
      else
	{
	  int len;
	  char *p1 = NULL;
	  char *font_allcs = NULL;
	  char *font_allfamilies = NULL;
	  char *allcs = "*-*-*-*-*-*-*";
	  char *allfamilies = "-*-*-";
	  
	  for (i = 0, p = base_fontname; i < 8; p++)
	    {
	      if (*p == '-')
		{
		  i++;
		  if (i == 3)
		    p1 = p + 1;
		}
	    }
	  /* Build the font spec that matches all charsets.  */
	  len = p - base_fontname + strlen (allcs) + 1;
	  font_allcs = (char *) alloca (len);

	  /* Build the font spec that matches all families.  */
	  len = p - p1 + strlen (allcs) + strlen (allfamilies) + 1;
	  font_allfamilies = (char *) alloca (len);
	  bzero (font_allfamilies, len);
	  strcpy (font_allfamilies, allfamilies);
	  bcopy (p1, font_allfamilies + (strlen (allfamilies)), p - p1);
	  strcat (font_allfamilies, allcs);

	  /* Build the actual font set name.  */
	  len = strlen (base_fontname) + strlen (font_allcs)
	    + strlen (font_allfamilies) + 3;
	  fontsetname = xmalloc (len);
	  bzero (fontsetname, len);
	  strcpy (fontsetname, base_fontname);
	  strcat (fontsetname, ",");
	  strcat (fontsetname, font_allcs);
	  strcat (fontsetname, ",");
	  strcat (fontsetname, font_allfamilies);
	}
      return fontsetname;
    }
}

static XFontSet
xic_create_xfontset (f, base_fontname)
     struct frame *f;

        }
    }

  if (!xfs)
    {
      char *fontsetname = xic_create_fontsetname (base_fontname);

      /* New fontset.  */
      xfs = XCreateFontSet (FRAME_X_DISPLAY (f),
                            fontsetname, &missing_list,
                            &missing_count, &def_string);
      if (missing_list)
        XFreeStringList (missing_list);
      if (fontsetname != base_fontname)
	xfree (fontsetname);
    }

  if (FRAME_XIC_BASE_FONTNAME (f))
    xfree (FRAME_XIC_BASE_FONTNAME (f));
  FRAME_XIC_BASE_FONTNAME (f) = xstrdup (base_fontname);

  Lisp_Object buffer;
  struct buffer *old_buffer;

  check_x ();

  /* Use this general default value to start with until we know if
     this frame has a specified name.  */
  Vx_resource_name = Vinvocation_name;

#ifdef MULTI_KBOARD
  kb = dpyinfo->kboard;
#else
  kb = &the_only_kboard;

  name = x_get_arg (dpyinfo, parms, Qname, "name", "Name", RES_TYPE_STRING);
  if (!STRINGP (name)
      && !EQ (name, Qunbound)
      && !NILP (name))
    error ("Invalid frame name--not a string or nil");

  Vx_resource_name = name;

  frame = Qnil;
  GCPRO3 (parms, name, frame);
  f = make_frame (1);
  XSETFRAME (frame, f);

83271:1830bcd0eec0

/* Create an X fontset on frame F with base font name BASE_FONTNAME.  */

char xic_defaut_fontset[] = "-*-*-*-r-normal--14-*-*-*-*-*-*-*";

/* Create an Xt fontset spec from the name of a base font.
   If `motif' is True use the Motif syntax.  */
char *
xic_create_fontsetname (base_fontname, motif)
     char *base_fontname;
     Bool motif;
{
  const char *sep = motif ? ";" : ",";
  char *fontsetname;

  /* Make a fontset name from the base font name.  */
  if (xic_defaut_fontset == base_fontname)
    { /* There is no base font name, use the default.  */
      int len = strlen (base_fontname) + 2;
      fontsetname = xmalloc (len);
      bzero (fontsetname, len);
      strcpy (fontsetname, base_fontname);
    }
  else
    {
      /* Make a fontset name from the base font name.
	 The font set will be made of the following elements:
	 - the base font.
	 - the base font where the charset spec is replaced by -*-*.
	 - the same but with the family also replaced with -*-*-.  */
      char *p = base_fontname;
      int i;
      
      for (i = 0; *p; p++)
	if (*p == '-') i++;
      if (i != 14)
	{ /* As the font name doesn't conform to XLFD, we can't
	     modify it to generalize it to allcs and allfamilies.
	     Use the specified font plus the default.  */
	  int len = strlen (base_fontname) + strlen (xic_defaut_fontset) + 3;
	  fontsetname = xmalloc (len);
	  bzero (fontsetname, len);
	  strcpy (fontsetname, base_fontname);
	  strcat (fontsetname, sep);
	  strcat (fontsetname, xic_defaut_fontset);
	}
      else
	{
	  int len;
	  char *p1 = NULL, *p2 = NULL;
	  char *font_allcs = NULL;
	  char *font_allfamilies = NULL;
	  char *font_all = NULL;
	  char *allcs = "*-*-*-*-*-*-*";
	  char *allfamilies = "-*-*-";
	  char *all = "*-*-*-*-";
	  
	  for (i = 0, p = base_fontname; i < 8; p++)
	    {
	      if (*p == '-')
		{
		  i++;
		  if (i == 3)
		    p1 = p + 1;
		  else if (i == 7)
		    p2 = p + 1;
		}
	    }
	  /* Build the font spec that matches all charsets.  */
	  len = p - base_fontname + strlen (allcs) + 1;
	  font_allcs = (char *) alloca (len);

	  /* Build the font spec that matches all families.  */
	  len = p - p1 + strlen (allcs) + strlen (allfamilies) + 1;
	  font_allfamilies = (char *) alloca (len);
	  bzero (font_allfamilies, len);
	  strcpy (font_allfamilies, allfamilies);
	  bcopy (p1, font_allfamilies + strlen (allfamilies), p - p1);
	  strcat (font_allfamilies, allcs);

	  /* Build the font spec that matches all.  */
	  len = p - p2 + strlen (allcs) + strlen (all) + strlen (allfamilies) + 1;
	  font_all = (char *) alloca (len);
	  bzero (font_all, len);
	  strcpy (font_all, allfamilies);
	  strcat (font_all, all);
	  bcopy (p2, font_all + strlen (all) + strlen (allfamilies), p - p2);
	  strcat (font_all, allcs);

	  /* Build the actual font set name.  */
	  len = strlen (base_fontname) + strlen (font_allcs)
	    + strlen (font_allfamilies) + strlen (font_all) + 5;
	  fontsetname = xmalloc (len);
	  bzero (fontsetname, len);
	  strcpy (fontsetname, base_fontname);
	  strcat (fontsetname, sep);
	  strcat (fontsetname, font_allcs);
	  strcat (fontsetname, sep);
	  strcat (fontsetname, font_allfamilies);
	  strcat (fontsetname, sep);
	  strcat (fontsetname, font_all);
	}
    }
  if (motif)
    strcat (fontsetname, ":");
  return fontsetname;
}

static XFontSet
xic_create_xfontset (f, base_fontname)
     struct frame *f;

        }
    }

  if (!xfs)
    {
      char *fontsetname = xic_create_fontsetname (base_fontname, False);

      /* New fontset.  */
      xfs = XCreateFontSet (FRAME_X_DISPLAY (f),
                            fontsetname, &missing_list,
                            &missing_count, &def_string);
      if (missing_list)
        XFreeStringList (missing_list);
      xfree (fontsetname);
    }

  if (FRAME_XIC_BASE_FONTNAME (f))
    xfree (FRAME_XIC_BASE_FONTNAME (f));
  FRAME_XIC_BASE_FONTNAME (f) = xstrdup (base_fontname);

  Lisp_Object buffer;
  struct buffer *old_buffer;

  check_x ();


#ifdef MULTI_KBOARD
  kb = dpyinfo->kboard;
#else
  kb = &the_only_kboard;

  name = x_get_arg (dpyinfo, parms, Qname, "name", "Name", RES_TYPE_STRING);
  if (!STRINGP (name)
      && !EQ (name, Qunbound)
      && !NILP (name))
    error ("Invalid frame name--not a string or nil");

  frame = Qnil;
  GCPRO3 (parms, name, frame);
  f = make_frame (1);
  XSETFRAME (frame, f);