/****************************************************************************
- * Copyright (c) 1998,2005,2007 Free Software Foundation, Inc. *
+ * Copyright (c) 1998,2010,2011 Free Software Foundation, Inc. *
* *
* Permission is hereby granted, free of charge, to any person obtaining a *
* copy of this software and associated documentation files (the *
/*
Version Control
- $Id: gen.c,v 1.48 2007/05/05 17:24:36 tom Exp $
+ $Id: gen.c,v 1.60 2011/04/30 19:47:19 Nicolas.Boulenguez Exp $
--------------------------------------------------------------------------*/
/*
This program generates various record structures and constants from the
to produce the real source.
*/
+#ifdef HAVE_CONFIG_H
#include <ncurses_cfg.h>
+#else
+#include <ncurses.h>
+#define HAVE_USE_DEFAULT_COLORS 1
+#endif
#include <stdlib.h>
#include <stddef.h>
#include <menu.h>
#include <form.h>
+#define UChar(c) ((unsigned char)(c))
#define RES_NAME "Reserved"
static const char *model = "";
int l = 0;
*high = -1;
- *low = 8 * len;
+ *low = (int)(8 * len);
for (i = 0; i < len; i++, s++)
{
}
l++;
if (little_endian)
- *s >>= 1;
+ {
+ *s >>= 1;
+ }
else
- *s <<= 1;
+ {
+ *s = (char)(*s << 1);
+ }
}
}
else
* bit size, i.e. they fit into an (u)int or a (u)short.
*/
static void
- gen_reps
- (const name_attribute_pair * nap, /* array of name_attribute_pair records */
- const char *name, /* name of the represented record type */
- int len, /* size of the record in bytes */
- int bias)
+gen_reps(
+ const name_attribute_pair * nap, /* array of name_attribute_pair records */
+ const char *name, /* name of the represented record type */
+ int len, /* size of the record in bytes */
+ int bias)
{
- int i, n, l, cnt = 0, low, high;
+ const int len_bits = (8 * len);
+ int i, l, low, high;
int width = strlen(RES_NAME) + 3;
unsigned long a;
- unsigned long mask = 0;
assert(nap != NULL);
for (i = 0; nap[i].name != (char *)0; i++)
{
- cnt++;
- l = strlen(nap[i].name);
+ l = (int)strlen(nap[i].name);
if (l > width)
width = l;
}
for (i = 0; nap[i].name != (char *)0; i++)
{
a = nap[i].attr;
- mask |= a;
l = find_pos((char *)&a, sizeof(a), &low, &high);
if (l >= 0)
printf(" %-*s at 0 range %2d .. %2d;\n", width, nap[i].name,
low - bias, high - bias);
}
- i = 1;
- n = cnt;
printf(" end record;\n");
- printf(" for %s'Size use %d;\n", name, 8 * len);
+ printf(" pragma Warnings (Off);");
+ printf(" for %s'Size use %d;\n", name, len_bits);
+ printf(" pragma Warnings (On);\n");
printf(" -- Please note: this rep. clause is generated and may be\n");
printf(" -- different on your system.");
}
static void
chtype_rep(const char *name, attr_t mask)
{
- attr_t x = -1;
+ attr_t x = (attr_t)-1;
attr_t t = x & mask;
int low, high;
int l = find_pos((char *)&t, sizeof(t), &low, &high);
mrep_rep("Z", &x);
memset(&x, 0, sizeof(x));
- x.bstate = -1;
+ x.bstate = (mmask_t) - 1;
mrep_rep("Bstate", &x);
printf(" end record;\n");
gen_attr_set(const char *name)
{
/* All of the A_xxx symbols are defined in ncurses, but not all are nonzero
- * if "configure --enable-widec" is specified.
+ * if "configure --enable-widec" is not specified. Originally (in
+ * 1999-2000), the ifdef's also were needed since the proposed bit-layout
+ * for wide characters allocated 16-bits for A_CHARTEXT, leaving too few
+ * bits for a few of the A_xxx symbols.
*/
static const name_attribute_pair nap[] =
{
chtype attr = A_ATTRIBUTES & ~A_COLOR;
int start = -1;
int len = 0;
- int i, set;
+ int i;
+ chtype set;
for (i = 0; i < (int)(8 * sizeof(chtype)); i++)
{
- set = attr & 1;
+ set = (attr & 1);
if (set)
{
if (start < 0)
{"Internal_Calls", TRACE_ICALLS},
{"Character_Calls", TRACE_CCALLS},
{"Termcap_TermInfo", TRACE_DATABASE},
+ {"Attributes_And_Colors", TRACE_ATTRS},
{(char *)0, 0}
};
gen_reps(nap, name, sizeof(int), 0);
if (mode == 0) /* Generate the new name */
printf(" %-30s : constant Special_Key_Code := 8#%3o#;\n", name, value);
else
- { /* generate the old name, but only if it doesn't conflict with the old
- * name (Ada95 isn't case sensitive!)
- */
+ {
const char *s = old_name;
const char *t = name;
- while (*s && *t && (toupper(*s++) == toupper(*t++)));
+ /* generate the old name, but only if it doesn't conflict with the old
+ * name (Ada95 isn't case sensitive!)
+ */
+ while (*s && *t && (toupper(UChar(*s++)) == toupper(UChar(*t++))));
if (*s || *t)
printf(" %-16s : Special_Key_Code renames %s;\n", old_name, name);
}
static void
acs_def(const char *name, chtype *a)
{
- int c = a - &acs_map[0];
+ int c = (int)(a - &acs_map[0]);
printf(" %-24s : constant Character := ", name);
- if (isprint(c) && (c != '`'))
+ if (isprint(UChar(c)) && (c != '`'))
printf("'%c';\n", c);
else
printf("Character'Val (%d);\n", c);
#if USE_REENTRANT || BROKEN_LINKER
printf(" type C_ACS_Ptr is access C_ACS_Map;\n");
printf(" function ACS_Map return C_ACS_Ptr;\n");
- printf(" pragma Import (C, ACS_Map, \"_nc_acs_map\");\n");
+ printf(" pragma Import (C, ACS_Map, \""
+ NCURSES_WRAP_PREFIX
+ "acs_map\");\n");
#else
printf(" ACS_Map : C_ACS_Map;\n");
printf(" pragma Import (C, ACS_Map, \"acs_map\");\n");
printf(" function %s return %s\n", ada_func, ada_type);
printf(" is\n");
printf(" function Result return %s;\n", c_type);
- printf(" pragma Import (C, Result, \"_nc_%s\");\n", c_var);
+ printf(" pragma Import (C, Result, \"" NCURSES_WRAP_PREFIX "%s\");\n", c_var);
printf(" begin\n");
if (strcmp(c_type, ada_type))
printf(" return %s (Result);\n", ada_type);
printf(" %-16s : constant Color_Number := %d;\n", name, value);
}
-#define HAVE_USE_DEFAULT_COLORS 1
-
/*
* Generate all color definitions
*/
static void
gen_color(void)
{
-#ifdef HAVE_USE_DEFAULT_COLORS
+#if HAVE_USE_DEFAULT_COLORS
color_def("Default_Color", -1);
#endif
#ifdef COLOR_BLACK
*etimin = code;
if (code > *etimax)
*etimax = code;
- return strlen(buf);
+ return (int)strlen(buf);
}
static void
printf(" Sizeof%-*s : constant Natural := %2ld; -- %s\n",
12, "_bool", (long)sizeof(bool), "bool");
- /* In ncurses _maxy and _maxx needs an offset for the "public"
- * value
- */
- printf(" Offset%-*s : constant Natural := %2d; -- %s\n",
- 12, "_XY", 1, "int");
- printf("\n");
printf(" type Curses_Bool is mod 2 ** Interfaces.C.%s'Size;\n", s_bool);
}
}
printf(" subtype Eti_Error is C_Int range %d .. %d;\n\n",
etimin, etimax);
- printf(buf);
+ printf("%s", buf);
}
break;
default:
projects / ncurses.git / blobdiff