Mercurial > hg > xemacs-beta

comparison src/glyphs-x.c @ 4916:a6c778975d7d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
split USE_XFT into HAVE_XFT/USE_XFT -------------------- ChangeLog entries follow: -------------------- ChangeLog addition: 2010-02-01 Ben Wing <ben@xemacs.org> * configure: * configure.ac (TAB): USE_XFT* -> HAVE_XFT*. lwlib/ChangeLog addition: 2010-02-01 Ben Wing <ben@xemacs.org> * lwlib-colors.c: * lwlib-colors.h: * lwlib-fonts.c: * lwlib-fonts.h: * xlwmenu.c: * xlwmenu.c (xlwMenuResources): * xlwmenu.c (x_xft_text_width): * xlwmenu.c (label_button_draw): * xlwmenu.c (push_button_size): * xlwmenu.c (push_button_draw): * xlwmenu.c (make_drawing_gcs): * xlwmenu.c (extract_font_extents): * xlwmenu.c (default_font_of_font_list): * xlwmenu.c (XlwMenuInitialize): * xlwmenu.c (XlwMenuDestroy): * xlwmenu.c (XlwMenuSetValues): * xlwmenuP.h: * xlwmenuP.h (_XlwMenu_part): * xlwtabs.c: * xlwtabs.c (TabsInit): * xlwtabs.c (TabsDestroy): * xlwtabs.c (TabsSetValues): * xlwtabs.c (DrawTab): * xlwtabs.c (TabWidth): * xlwtabs.c (TabsAllocFgGC): * xlwtabs.c (TabsAllocGreyGC): * xlwtabsP.h: USE_XFT* -> HAVE_XFT*. src/ChangeLog addition: 2010-02-01 Ben Wing <ben@xemacs.org> * Makefile.in.in: * compiler.h: * config.h.in: * console-x-impl.h: * console-x-impl.h (struct x_frame): * console-x-impl.h (FRAME_X_TOTALLY_VISIBLE_P): * console-x.h: * console-xlike-inc.h: * emacs.c (main_1): * faces.c (complex_vars_of_faces): * font-mgr.h: * frame-x.c (x_delete_frame): * frame-x.c (x_update_frame_external_traits): * glyphs-x.c (update_widget_face): * inline.c: * objects-x-impl.h: * objects-x-impl.h (struct x_color_instance_data): * objects-x-impl.h (struct x_font_instance_data): * objects-x.c: * objects-x.c (x_initialize_color_instance): * objects-x.c (x_initialize_font_instance): * objects-x.c (x_print_font_instance): * objects-x.c (x_finalize_font_instance): * objects-x.c (x_font_instance_truename): * objects-x.c (vars_of_objects_x): * objects-x.h: USE_XFT* -> HAVE_XFT*. But in objects-xlike-inc.c and redisplay-xlike-inc.c, continue to use USE_XFT, and define it appropriately in console-xlike-inc.h when both HAVE_XFT and THIS_IS_X -- even if HAVE_XFT, we don't want to enable XFT code when included in a *-gtk.c file.
author Ben Wing <ben@xemacs.org>
date Mon, 01 Feb 2010 22:00:29 -0600
parents b3ea9c582280
children cbe181529c34
comparison
equal deleted inserted replaced
4909:87175eb65ff4 4916:a6c778975d7d
2374 Lisp_Font_Instance *fi = 2374 Lisp_Font_Instance *fi =
2375 XFONT_INSTANCE (query_string_font (IMAGE_INSTANCE_WIDGET_TEXT (ii), 2375 XFONT_INSTANCE (query_string_font (IMAGE_INSTANCE_WIDGET_TEXT (ii),
2376 face, 2376 face,
2377 domain)); 2377 domain));
2378 XFontStruct *fs = FONT_INSTANCE_X_FONT (fi); 2378 XFontStruct *fs = FONT_INSTANCE_X_FONT (fi);
2379 #ifdef USE_XFT 2379 #ifdef HAVE_XFT
2380 XftFont *rf = FONT_INSTANCE_X_XFTFONT (fi); 2380 XftFont *rf = FONT_INSTANCE_X_XFTFONT (fi);
2381 2381
2382 if (rf) 2382 if (rf)
2383 { 2383 {
2384 /* #### What to do about Motif? */ 2384 /* #### What to do about Motif? */
2393 lw_add_widget_value_arg (wv, XmNfontList, (XtArgVal) fontList); 2393 lw_add_widget_value_arg (wv, XmNfontList, (XtArgVal) fontList);
2394 #endif 2394 #endif
2395 lw_add_widget_value_arg (wv, XtNfont, (XtArgVal) fs); 2395 lw_add_widget_value_arg (wv, XtNfont, (XtArgVal) fs);
2396 } 2396 }
2397 2397
2398 #ifdef USE_XFT 2398 #ifdef HAVE_XFT
2399 /* #### sanity check, should wrap in appropriate ERROR_CHECK macro */ 2399 /* #### sanity check, should wrap in appropriate ERROR_CHECK macro */
2400 if (!rf && !fs) 2400 if (!rf && !fs)
2401 warn_when_safe_lispobj 2401 warn_when_safe_lispobj
2402 (intern ("xft"), Qdebug, 2402 (intern ("xft"), Qdebug,
2403 Fcons (build_string ("missing font in update_widget_face"), 2403 Fcons (build_string ("missing font in update_widget_face"),