X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=Ada95%2Fgen%2Fterminal_interface-curses.ads.m4;h=afe65f435192f221119430829ae8ddf46337065d;hp=bd879cdde4329441a868a033c9ac8d9be82a37bb;hb=5a9c046f10f72b47ad32801a8e54fe3d05aa8051;hpb=46722468f47c2b77b3987729b4bcf2321cccfd01;ds=sidebyside

diff --git a/Ada95/gen/terminal_interface-curses.ads.m4 b/Ada95/gen/terminal_interface-curses.ads.m4
index bd879cdd..afe65f43 100644
--- a/Ada95/gen/terminal_interface-curses.ads.m4
+++ b/Ada95/gen/terminal_interface-curses.ads.m4
@@ -9,7 +9,7 @@ include(M4MACRO)----------------------------------------------------------------
 --                                 S P E C                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 1998 Free Software Foundation, Inc.                        --
+-- Copyright (c) 1998-2006,2007 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            --
@@ -36,9 +36,9 @@ include(M4MACRO)----------------------------------------------------------------
 -- authorization.                                                           --
 ------------------------------------------------------------------------------
 --  Author:  Juergen Pfeifer, 1996
---  Contact: http://www.familiepfeifer.de/Contact.aspx?Lang=en
 --  Version Control:
---  $Revision: 1.30 $
+--  $Revision: 1.39 $
+--  $Date: 2007/03/31 23:36:32 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 include(`Base_Defs')
@@ -60,11 +60,12 @@ include(`Version_Info')
    subtype Column_Count is Column_Position range 1 .. Column_Position'Last;
    --  Type to count columns. We do not allow null windows, so must be positive
 
-   type Key_Code is new Natural;
+   type Key_Code is new Integer;
    --  That is anything including real characters, special keys and logical
    --  request codes.
 
-   subtype Real_Key_Code is Key_Code range 0 .. M4_KEY_MAX;
+   --  FIXME: The "-1" should be Curses_Err
+   subtype Real_Key_Code is Key_Code range -1 .. M4_KEY_MAX;
    --  This are the codes that potentially represent a real keystroke.
    --  Not all codes may be possible on a specific terminal. To check the
    --  availability of a special key, the Has_Key function is provided.
@@ -187,25 +188,21 @@ include(`AC_Rep')
    function Number_Of_Color_Pairs return Natural;
    pragma Inline (Number_Of_Color_Pairs);
 
-   ACS_Map : array (Character'Val (0) .. Character'Val (127)) of
-     Attributed_Character;
-   pragma Import (C, ACS_Map, "acs_map");
-   --
-   --
-   --  Constants for several characters from the Alternate Character Set
-   --  You must use this constants as indices into the ACS_Map array
-   --  to get the corresponding attributed character at runtime.
-   --
 include(`ACS_Map')dnl
 
    --  MANPAGE(`curs_initscr.3x')
-   --  | Not implemented: newterm, set_term, delscreen, curscr
+   --  | Not implemented: newterm, set_term, delscreen
 
    --  ANCHOR(`stdscr',`Standard_Window')
    function Standard_Window return Window;
    --  AKA
    pragma Inline (Standard_Window);
 
+   --  ANCHOR(`curscr',`Current_Window')
+   function Current_Window return Window;
+   --  AKA
+   pragma Inline (Current_Window);
+
    --  ANCHOR(`initscr()',`Init_Screen')
    procedure Init_Screen;
 
@@ -213,14 +210,14 @@ include(`ACS_Map')dnl
    procedure Init_Windows renames Init_Screen;
    --  AKA
    pragma Inline (Init_Screen);
-   pragma Inline (Init_Windows);
+   --  pragma Inline (Init_Windows);
 
    --  ANCHOR(`endwin()',`End_Windows')
    procedure End_Windows;
    --  AKA
    procedure End_Screen renames End_Windows;
    pragma Inline (End_Windows);
-   pragma Inline (End_Screen);
+   --  pragma Inline (End_Screen);
 
    --  ANCHOR(`isendwin()',`Is_End_Window')
    function Is_End_Window return Boolean;
@@ -300,7 +297,7 @@ include(`ACS_Map')dnl
       First_Line_Position   : Line_Position;
       First_Column_Position : Column_Position) return Window
      renames Create;
-   pragma Inline (New_Window);
+   --  pragma Inline (New_Window);
 
    --  ANCHOR(`delwin()',`Delete')
    procedure Delete (Win : in out Window);
@@ -1532,7 +1529,6 @@ include(`ACS_Map')dnl
    --  MANPAGE(`curs_scanw.3x')
    --  Not implemented: scanw, wscanw, mvscanw, mvwscanw, vwscanw, vw_scanw
 
-
    --  MANPAGE(`resizeterm.3x')
    --  Not Implemented: resizeterm