Mercurial > hg > xemacs-beta
view netinstall/iniparse.y @ 4916:a6c778975d7d
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 | 3078fd1074e8 |
children |
line wrap: on
line source
%{ /* * Copyright (c) 2000, Red Hat, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * A copy of the GNU General Public License can be found at * http://www.gnu.org/ * * Written by DJ Delorie <dj@cygnus.com> * */ /* Parse the setup.ini files. inilex.l provides the tokens for this. */ #include <stdio.h> #include <stdlib.h> #include <string.h> #include "win32.h" #include "ini.h" #include "iniparse.h" #include "port.h" #define YYERROR_VERBOSE 1 /*#define YYDEBUG 1*/ static Package *cp; static int trust; extern unsigned int setup_timestamp; extern char *setup_version; extern int yylineno; extern int CDECL yyerror (char *s, ...); #define cpt (cp->info+trust) %} %token STRING %token SETUP_TIMESTAMP SETUP_VERSION VERSION INSTALL SOURCE SDESC LDESC TYPE %token T_PREV T_CURR T_TEST T_UNKNOWN %% whole_file : setup_headers packages ; setup_headers : setup_header setup_headers | /* empty */ ; setup_header : SETUP_TIMESTAMP STRING '\n' { setup_timestamp = strtoul ($2, 0, 0); } | SETUP_VERSION STRING '\n' { setup_version = strdup ($2); } | '\n' | error { yyerror ("unrecognized line in setup.ini headers (do you have the latest setup?)"); } '\n' ; packages : package packages | /* empty */ ; package : '@' STRING '\n' { new_package($2); } lines ; lines : simple_line '\n' lines | simple_line ; simple_line : VERSION STRING { cpt->version = $2; } | SDESC STRING { cp->sdesc = $2; } | LDESC STRING { cp->ldesc = $2; } | INSTALL STRING STRING { cpt->install = $2; cpt->install_size = atoi($3); } | SOURCE STRING STRING { cpt->source = $2; cpt->source_size = atoi($3); } | TYPE STRING { if (!strcmp ($2, "cygwin")) cp->type = TY_CYGWIN; else if (!strcmp ($2, "native")) cp->type = TY_NATIVE; else cp->type = TY_GENERIC; } | T_PREV { trust = TRUST_PREV; } | T_CURR { trust = TRUST_CURR; } | T_TEST { trust = TRUST_TEST; } | T_UNKNOWN { trust = TRUST_UNKNOWN; } | /* empty */ | error '\n' { yylineno --; yyerror ("unrecognized line in package %s (do you have the latest setup?)", cp->name); yylineno ++; } ; %% Package *package = 0; Package *xemacs_package = 0; int npackages = 0; static int maxpackages = 0; Package * new_package (char *name) { if (package == 0) maxpackages = npackages = 0; if (npackages >= maxpackages) { maxpackages += 10; if (package) package = (Package *) realloc (package, maxpackages * sizeof (Package)); else package = (Package *) malloc (maxpackages * sizeof (Package)); } cp = package + npackages; npackages ++; memset (cp, 0, sizeof (Package)); cp->name = name; trust = TRUST_CURR; return cp; }