Mercurial > hg > xemacs-beta

comparison src/objects-gtk.c @ 2527:491f8cf78a9c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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 5bfedec8927e
comparison
equal deleted inserted replaced
2526:902d5bd9b75c 2527:491f8cf78a9c
202 TO_EXTERNAL_FORMAT (LISP_STRING, color, C_STRING_ALLOCA, extname, Qctext); 202 TO_EXTERNAL_FORMAT (LISP_STRING, color, C_STRING_ALLOCA, extname, Qctext);
203 203
204 if (gdk_color_parse (extname, &c) != TRUE) 204 if (gdk_color_parse (extname, &c) != TRUE)
205 return(0); 205 return(0);
206 return (1); 206 return (1);
207 }
208
209 static Lisp_Object
210 gtk_color_list (void)
211 {
212 /* #### BILL!!!
213 Is this correct? */
214 return call0 (intern ("x-color-list-internal"));
207 } 215 }
208 216
209 217
210 /************************************************************************/ 218 /************************************************************************/
211 /* font instances */ 219 /* font instances */
328 } 336 }
329 } 337 }
330 338
331 /* Forward declarations for X specific functions at the end of the file */ 339 /* Forward declarations for X specific functions at the end of the file */
332 Lisp_Object __get_gtk_font_truename (GdkFont *gdk_font, int expandp); 340 Lisp_Object __get_gtk_font_truename (GdkFont *gdk_font, int expandp);
333 static Lisp_Object __gtk_list_fonts_internal (const char *pattern); 341 static Lisp_Object __gtk_font_list_internal (const char *pattern);
334 342
335 static Lisp_Object 343 static Lisp_Object
336 gtk_font_instance_truename (struct Lisp_Font_Instance *f, 344 gtk_font_instance_truename (struct Lisp_Font_Instance *f,
337 Error_Behavior UNUSED (errb)) 345 Error_Behavior UNUSED (errb))
338 { 346 {
359 /* There seems to be no way to get this information under Gtk */ 367 /* There seems to be no way to get this information under Gtk */
360 return result; 368 return result;
361 } 369 }
362 370
363 static Lisp_Object 371 static Lisp_Object
364 gtk_list_fonts (Lisp_Object pattern, Lisp_Object UNUSED (device), 372 gtk_font_list (Lisp_Object pattern, Lisp_Object UNUSED (device),
365 Lisp_Object UNUSED (maxnumber)) 373 Lisp_Object UNUSED (maxnumber))
366 { 374 {
367 const char *patternext; 375 const char *patternext;
368 376
369 TO_EXTERNAL_FORMAT (LISP_STRING, pattern, C_STRING_ALLOCA, patternext, Qbinary); 377 TO_EXTERNAL_FORMAT (LISP_STRING, pattern, C_STRING_ALLOCA, patternext, Qbinary);
370 378
371 return (__gtk_list_fonts_internal (patternext)); 379 return (__gtk_font_list_internal (patternext));
372 } 380 }
373 381
374 #ifdef MULE 382 #ifdef MULE
375 383
376 static int 384 static int
452 CONSOLE_HAS_METHOD (gtk, finalize_color_instance); 460 CONSOLE_HAS_METHOD (gtk, finalize_color_instance);
453 CONSOLE_HAS_METHOD (gtk, color_instance_equal); 461 CONSOLE_HAS_METHOD (gtk, color_instance_equal);
454 CONSOLE_HAS_METHOD (gtk, color_instance_hash); 462 CONSOLE_HAS_METHOD (gtk, color_instance_hash);
455 CONSOLE_HAS_METHOD (gtk, color_instance_rgb_components); 463 CONSOLE_HAS_METHOD (gtk, color_instance_rgb_components);
456 CONSOLE_HAS_METHOD (gtk, valid_color_name_p); 464 CONSOLE_HAS_METHOD (gtk, valid_color_name_p);
465 CONSOLE_HAS_METHOD (gtk, color_list);
457 466
458 CONSOLE_HAS_METHOD (gtk, initialize_font_instance); 467 CONSOLE_HAS_METHOD (gtk, initialize_font_instance);
459 CONSOLE_HAS_METHOD (gtk, print_font_instance); 468 CONSOLE_HAS_METHOD (gtk, print_font_instance);
460 CONSOLE_HAS_METHOD (gtk, finalize_font_instance); 469 CONSOLE_HAS_METHOD (gtk, finalize_font_instance);
461 CONSOLE_HAS_METHOD (gtk, font_instance_truename); 470 CONSOLE_HAS_METHOD (gtk, font_instance_truename);
462 CONSOLE_HAS_METHOD (gtk, font_instance_properties); 471 CONSOLE_HAS_METHOD (gtk, font_instance_properties);
463 CONSOLE_HAS_METHOD (gtk, list_fonts); 472 CONSOLE_HAS_METHOD (gtk, font_list);
464 #ifdef MULE 473 #ifdef MULE
465 CONSOLE_HAS_METHOD (gtk, find_charset_font); 474 CONSOLE_HAS_METHOD (gtk, find_charset_font);
466 CONSOLE_HAS_METHOD (gtk, font_spec_matches_charset); 475 CONSOLE_HAS_METHOD (gtk, font_spec_matches_charset);
467 #endif 476 #endif
468 } 477 }
585 names = names->next; 594 names = names->next;
586 } 595 }
587 return (font_name); 596 return (font_name);
588 } 597 }
589 598
590 static Lisp_Object __gtk_list_fonts_internal (const char *pattern) 599 static Lisp_Object __gtk_font_list_internal (const char *pattern)
591 { 600 {
592 char **names; 601 char **names;
593 int count = 0; 602 int count = 0;
594 Lisp_Object result = Qnil; 603 Lisp_Object result = Qnil;
595 604