X-Git-Url: https://ncurses.scripts.mit.edu/?a=blobdiff_plain;ds=sidebyside;f=Ada95%2Fsamples%2Fncurses2-m.adb;h=7ce969ce278d981a6958b324b6d587370adfe720;hb=06b5ef53baf520efffbf26929b29d3994af8dfb1;hp=d4f2b8a03286421c7d4e51239ab5360b2a970316;hpb=46722468f47c2b77b3987729b4bcf2321cccfd01;p=ncurses.git

diff --git a/Ada95/samples/ncurses2-m.adb b/Ada95/samples/ncurses2-m.adb
index d4f2b8a0..7ce969ce 100644
--- a/Ada95/samples/ncurses2-m.adb
+++ b/Ada95/samples/ncurses2-m.adb
@@ -7,7 +7,7 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 2000 Free Software Foundation, Inc.                        --
+-- Copyright (c) 2000-2008,2018 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            --
@@ -35,7 +35,8 @@
 ------------------------------------------------------------------------------
 --  Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000
 --  Version Control
---  $Revision: 1.1 $
+--  $Revision: 1.9 $
+--  $Date: 2018/07/07 23:33:16 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 --  TODO use Default_Character where appropriate
@@ -49,13 +50,11 @@ with Terminal_Interface.Curses.Trace; use Terminal_Interface.Curses.Trace;
 with Ada.Text_IO; use Ada.Text_IO;
 
 with Ada.Characters.Latin_1;
---  with Ada.Characters.Handling;
 
 with Ada.Command_Line; use Ada.Command_Line;
 
 with Ada.Strings.Unbounded;
 
-
 with ncurses2.util; use ncurses2.util;
 with ncurses2.getch_test;
 with ncurses2.attr_test;
@@ -64,7 +63,6 @@ with ncurses2.demo_panels;
 with ncurses2.color_edit;
 with ncurses2.slk_test;
 with ncurses2.acs_display;
-with ncurses2.color_edit;
 with ncurses2.acs_and_scroll;
 with ncurses2.flushinp_test;
 with ncurses2.test_sgr_attributes;
@@ -77,7 +75,6 @@ with ncurses2.trace_set;
 with ncurses2.getopt; use ncurses2.getopt;
 
 package body ncurses2.m is
-   use Int_IO;
 
    function To_trace (n : Integer) return Trace_Attribute_Set;
    procedure usage;
@@ -174,7 +171,6 @@ package body ncurses2.m is
       return 0; -- Curses_OK;
    end rip_footer;
 
-
    function rip_header (
                         Win : Window;
                         Columns : Column_Count) return Integer;
@@ -236,7 +232,6 @@ package body ncurses2.m is
       Set_KeyPad_Mode (SwitchOn => True);
    end Set_Terminal_Modes;
 
-
    nap_msec : Integer := 1;
 
    function Do_Single_Test (c : Character) return Boolean is
@@ -289,7 +284,6 @@ package body ncurses2.m is
       return True;
    end Do_Single_Test;
 
-
    command : Character;
    my_e_param : Soft_Label_Key_Format := Four_Four;
    assumed_colors : Boolean := False;
@@ -302,14 +296,12 @@ package body ncurses2.m is
    c : Integer;
    c2 : Character;
    optind : Integer := 1; -- must be initialized to one.
-   type stringa is access String;
    optarg : getopt.stringa;
 
    length : Integer;
    tmpi : Integer;
 
    package myio is new Ada.Text_IO.Integer_IO (Integer);
-   use myio;
 
    save_trace : Integer := 0;
    save_trace_set : Trace_Attribute_Set;
@@ -333,7 +325,7 @@ package body ncurses2.m is
                default_colors := True;
             when 'e' =>
                myio.Get (optarg.all, tmpi, length);
-               if Integer (tmpi) > 3 then
+               if tmpi > 3 then
                   usage;
                   return 1;
                end if;
@@ -359,7 +351,6 @@ package body ncurses2.m is
       save_trace_set := To_trace (save_trace);
       Trace_On (save_trace_set);
 
-
       Init_Soft_Label_Keys (my_e_param);
 
       Init_Screen;
@@ -447,14 +438,8 @@ package body ncurses2.m is
 
          exit when command = 'q';
       end loop;
+      Curses_Free_All;
       return 0; -- TODO ExitProgram(EXIT_SUCCESS);
    end main;
 
 end ncurses2.m;
-
-
-
-
-
-
-