Mercurial > emacs
comparison src/xfaces.c @ 60669:cffa9a821286
(x_update_menu_appearance) [USE_MOTIF]:
Use xic_create_fontsetname to create a fontset so utf-8 locales work.
(dump_realized_face): Fix warning.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Thu, 17 Mar 2005 18:43:47 +0000 |
parents | ffb5cb773521 |
children | 11723b2eac2e |
comparison
equal
deleted
inserted
replaced
60668:34f4b9f0b40d | 60669:cffa9a821286 |
---|---|
4693 #ifdef USE_MOTIF | 4693 #ifdef USE_MOTIF |
4694 const char *suffix = "List"; | 4694 const char *suffix = "List"; |
4695 #else | 4695 #else |
4696 const char *suffix = ""; | 4696 const char *suffix = ""; |
4697 #endif | 4697 #endif |
4698 #if defined HAVE_X_I18N && defined USE_MOTIF | |
4699 extern char *xic_create_fontsetname | |
4700 P_ ((char *base_fontname, Bool motif)); | |
4701 char *fontsetname = xic_create_fontsetname (face->font_name, True); | |
4702 #else | |
4703 char *fontsetname = face->font_name; | |
4704 #endif | |
4698 sprintf (line, "%s.pane.menubar*font%s: %s", | 4705 sprintf (line, "%s.pane.menubar*font%s: %s", |
4699 myname, suffix, face->font_name); | 4706 myname, suffix, fontsetname); |
4700 XrmPutLineResource (&rdb, line); | 4707 XrmPutLineResource (&rdb, line); |
4701 sprintf (line, "%s.%s*font%s: %s", | 4708 sprintf (line, "%s.%s*font%s: %s", |
4702 myname, popup_path, suffix, face->font_name); | 4709 myname, popup_path, suffix, fontsetname); |
4703 XrmPutLineResource (&rdb, line); | 4710 XrmPutLineResource (&rdb, line); |
4704 changed_p = 1; | 4711 changed_p = 1; |
4705 } | 4712 } |
4706 | 4713 |
4707 if (changed_p && f->output_data.x->menubar_widget) | 4714 if (changed_p && f->output_data.x->menubar_widget) |
7763 dump_realized_face (face) | 7770 dump_realized_face (face) |
7764 struct face *face; | 7771 struct face *face; |
7765 { | 7772 { |
7766 fprintf (stderr, "ID: %d\n", face->id); | 7773 fprintf (stderr, "ID: %d\n", face->id); |
7767 #ifdef HAVE_X_WINDOWS | 7774 #ifdef HAVE_X_WINDOWS |
7768 fprintf (stderr, "gc: %d\n", (int) face->gc); | 7775 fprintf (stderr, "gc: %ld\n", (long) face->gc); |
7769 #endif | 7776 #endif |
7770 fprintf (stderr, "foreground: 0x%lx (%s)\n", | 7777 fprintf (stderr, "foreground: 0x%lx (%s)\n", |
7771 face->foreground, | 7778 face->foreground, |
7772 SDATA (face->lface[LFACE_FOREGROUND_INDEX])); | 7779 SDATA (face->lface[LFACE_FOREGROUND_INDEX])); |
7773 fprintf (stderr, "background: 0x%lx (%s)\n", | 7780 fprintf (stderr, "background: 0x%lx (%s)\n", |