Mercurial > emacs

comparison src/xfaces.c @ 83271:1830bcd0eec0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged from miles@gnu.org--gnu-2005 (patch 39-44, 184-191) Patches applied: * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-184 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-185 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-186 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-187 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-188 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-189 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-190 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-191 Update from CVS * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-39 Merge from emacs--cvs-trunk--0 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-40 Update from CVS * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-41 Update from CVS * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-42 Update from CVS * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-43 Update from CVS * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-44 Merge from emacs--cvs-trunk--0 git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-311
author Karoly Lorentey <lorentey@elte.hu>
date Sat, 19 Mar 2005 17:55:13 +0000
parents 389421e988c2 11723b2eac2e
children 26c9034f3533
comparison
equal deleted inserted replaced
83270:42406ecdf5bf 83271:1830bcd0eec0
4693 || !UNSPECIFIEDP (LFACE_SLANT (lface)) 4693 || !UNSPECIFIEDP (LFACE_SLANT (lface))
4694 || !UNSPECIFIEDP (LFACE_HEIGHT (lface)))) 4694 || !UNSPECIFIEDP (LFACE_HEIGHT (lface))))
4695 { 4695 {
4696 #ifdef USE_MOTIF 4696 #ifdef USE_MOTIF
4697 const char *suffix = "List"; 4697 const char *suffix = "List";
4698 Bool motif = True;
4698 #else 4699 #else
4699 const char *suffix = ""; 4700 const char *suffix = "";
4701 Bool motif = False;
4702 #endif
4703 #if defined HAVE_X_I18N
4704 extern char *xic_create_fontsetname
4705 P_ ((char *base_fontname, Bool motif));
4706 char *fontsetname = xic_create_fontsetname (face->font_name, motif);
4707 #else
4708 char *fontsetname = face->font_name;
4700 #endif 4709 #endif
4701 sprintf (line, "%s.pane.menubar*font%s: %s", 4710 sprintf (line, "%s.pane.menubar*font%s: %s",
4702 myname, suffix, face->font_name); 4711 myname, suffix, fontsetname);
4703 XrmPutLineResource (&rdb, line); 4712 XrmPutLineResource (&rdb, line);
4704 sprintf (line, "%s.%s*font%s: %s", 4713 sprintf (line, "%s.%s*font%s: %s",
4705 myname, popup_path, suffix, face->font_name); 4714 myname, popup_path, suffix, fontsetname);
4706 XrmPutLineResource (&rdb, line); 4715 XrmPutLineResource (&rdb, line);
4707 changed_p = 1; 4716 changed_p = 1;
4717 if (fontsetname != face->font_name)
4718 xfree (fontsetname);
4708 } 4719 }
4709 4720
4710 if (changed_p && f->output_data.x->menubar_widget) 4721 if (changed_p && f->output_data.x->menubar_widget)
4711 free_frame_menubar (f); 4722 free_frame_menubar (f);
4712 } 4723 }
7772 dump_realized_face (face) 7783 dump_realized_face (face)
7773 struct face *face; 7784 struct face *face;
7774 { 7785 {
7775 fprintf (stderr, "ID: %d\n", face->id); 7786 fprintf (stderr, "ID: %d\n", face->id);
7776 #ifdef HAVE_X_WINDOWS 7787 #ifdef HAVE_X_WINDOWS
7777 fprintf (stderr, "gc: %d\n", (int) face->gc); 7788 fprintf (stderr, "gc: %ld\n", (long) face->gc);
7778 #endif 7789 #endif
7779 fprintf (stderr, "foreground: 0x%lx (%s)\n", 7790 fprintf (stderr, "foreground: 0x%lx (%s)\n",
7780 face->foreground, 7791 face->foreground,
7781 SDATA (face->lface[LFACE_FOREGROUND_INDEX])); 7792 SDATA (face->lface[LFACE_FOREGROUND_INDEX]));
7782 fprintf (stderr, "background: 0x%lx (%s)\n", 7793 fprintf (stderr, "background: 0x%lx (%s)\n",