Mercurial > hg > xemacs-beta
comparison src/objects-x.c @ 2527:491f8cf78a9c
[xemacs-hg @ 2005-01-28 02:58:38 by ben]
Abstract font-list/color-list
font-menu.el, font.el, frame.el, gtk-font-menu.el, minibuf.el, msw-faces.el, msw-font-menu.el, obsolete.el, x-faces.el, x-font-menu.el: list-fonts->font-list. Create color-list. Abstract out
x/msw-specific versions and obsolete the x/msw-specific Lisp
functions.
console-impl.h, objects-gtk.c, objects-msw.c, objects-tty.c, objects-x.c, objects.c: list-fonts->font-list. Create color-list. Abstract out
x/msw-specific versions and obsolete the x/msw-specific Lisp
functions.
author | ben |
---|---|
date | Fri, 28 Jan 2005 02:58:52 +0000 |
parents | de9952d2ed18 |
children | ad2f4ae9895b |
comparison
equal
deleted
inserted
replaced
2526:902d5bd9b75c | 2527:491f8cf78a9c |
---|---|
353 LISP_STRING_TO_EXTERNAL (color, extname, Qx_color_name_encoding); | 353 LISP_STRING_TO_EXTERNAL (color, extname, Qx_color_name_encoding); |
354 | 354 |
355 return XParseColor (dpy, cmap, extname, &c); | 355 return XParseColor (dpy, cmap, extname, &c); |
356 } | 356 } |
357 | 357 |
358 static Lisp_Object | |
359 x_color_list (void) | |
360 { | |
361 return call0 (intern ("x-color-list-internal")); | |
362 } | |
363 | |
358 | 364 |
359 /************************************************************************/ | 365 /************************************************************************/ |
360 /* font instances */ | 366 /* font instances */ |
361 /************************************************************************/ | 367 /************************************************************************/ |
362 | 368 |
851 } | 857 } |
852 return result; | 858 return result; |
853 } | 859 } |
854 | 860 |
855 static Lisp_Object | 861 static Lisp_Object |
856 x_list_fonts (Lisp_Object pattern, Lisp_Object device, Lisp_Object maxnumber) | 862 x_font_list (Lisp_Object pattern, Lisp_Object device, Lisp_Object maxnumber) |
857 { | 863 { |
858 Extbyte **names; | 864 Extbyte **names; |
859 int count = 0; | 865 int count = 0; |
860 int max_number = MAX_FONT_COUNT; | 866 int max_number = MAX_FONT_COUNT; |
861 Lisp_Object result = Qnil; | 867 Lisp_Object result = Qnil; |
1003 CONSOLE_HAS_METHOD (x, finalize_color_instance); | 1009 CONSOLE_HAS_METHOD (x, finalize_color_instance); |
1004 CONSOLE_HAS_METHOD (x, color_instance_equal); | 1010 CONSOLE_HAS_METHOD (x, color_instance_equal); |
1005 CONSOLE_HAS_METHOD (x, color_instance_hash); | 1011 CONSOLE_HAS_METHOD (x, color_instance_hash); |
1006 CONSOLE_HAS_METHOD (x, color_instance_rgb_components); | 1012 CONSOLE_HAS_METHOD (x, color_instance_rgb_components); |
1007 CONSOLE_HAS_METHOD (x, valid_color_name_p); | 1013 CONSOLE_HAS_METHOD (x, valid_color_name_p); |
1014 CONSOLE_HAS_METHOD (x, color_list); | |
1008 | 1015 |
1009 CONSOLE_HAS_METHOD (x, initialize_font_instance); | 1016 CONSOLE_HAS_METHOD (x, initialize_font_instance); |
1010 CONSOLE_HAS_METHOD (x, print_font_instance); | 1017 CONSOLE_HAS_METHOD (x, print_font_instance); |
1011 CONSOLE_HAS_METHOD (x, finalize_font_instance); | 1018 CONSOLE_HAS_METHOD (x, finalize_font_instance); |
1012 CONSOLE_HAS_METHOD (x, font_instance_truename); | 1019 CONSOLE_HAS_METHOD (x, font_instance_truename); |
1013 CONSOLE_HAS_METHOD (x, font_instance_properties); | 1020 CONSOLE_HAS_METHOD (x, font_instance_properties); |
1014 CONSOLE_HAS_METHOD (x, list_fonts); | 1021 CONSOLE_HAS_METHOD (x, font_list); |
1015 #ifdef MULE | 1022 #ifdef MULE |
1016 CONSOLE_HAS_METHOD (x, find_charset_font); | 1023 CONSOLE_HAS_METHOD (x, find_charset_font); |
1017 CONSOLE_HAS_METHOD (x, font_spec_matches_charset); | 1024 CONSOLE_HAS_METHOD (x, font_spec_matches_charset); |
1018 #endif | 1025 #endif |
1019 } | 1026 } |