X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=Ada95%2Fsamples%2Fncurses2-util.adb;h=e0f3d35bbca43659597f9694faca557fee8252e3;hp=907dcef9c7aa846a53c9607f61c33d395321ba4b;hb=73b54c0812e4b8dfddcf87f59c7488bb3c10e10d;hpb=46722468f47c2b77b3987729b4bcf2321cccfd01

diff --git a/Ada95/samples/ncurses2-util.adb b/Ada95/samples/ncurses2-util.adb
index 907dcef9..e0f3d35b 100644
--- a/Ada95/samples/ncurses2-util.adb
+++ b/Ada95/samples/ncurses2-util.adb
@@ -7,7 +7,7 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 2000 Free Software Foundation, Inc.                        --
+-- Copyright (c) 2000-2008,2014 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,22 +35,14 @@
 ------------------------------------------------------------------------------
 --  Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000
 --  Version Control
---  $Revision: 1.1 $
+--  $Revision: 1.9 $
+--  $Date: 2014/05/24 21:32:18 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
-with Terminal_Interface.Curses; use Terminal_Interface.Curses;
-
-with Ada.Text_IO;
-
-with Terminal_Interface.Curses; use Terminal_Interface.Curses;
-pragma Warnings (Off);
-with Terminal_Interface.Curses.Aux;
-pragma Warnings (On);
+with Ada.Text_IO; use Ada.Text_IO;
 
 with Terminal_Interface.Curses.Trace; use Terminal_Interface.Curses.Trace;
 
-with Ada.Text_IO; use Ada.Text_IO;
-
 with Interfaces.C;
 with Interfaces.C.Strings;
 
@@ -58,7 +50,6 @@ with Ada.Characters.Handling;
 
 with ncurses2.genericPuts;
 
-
 package body ncurses2.util is
 
    --  #defines from C
@@ -104,12 +95,12 @@ package body ncurses2.util is
    end Getchar;
 
    procedure Getchar (win : Window := Standard_Window) is
-      x : Key_Code;
    begin
-      x := Getchar (win);
+      if Getchar (win) < 0 then
+         Beep;
+      end if;
    end Getchar;
 
-
    procedure Pause is
    begin
       Move_Cursor (Line => Lines - 1, Column => 0);
@@ -117,11 +108,9 @@ package body ncurses2.util is
       Getchar;
    end Pause;
 
-
    procedure Cannot (s : String) is
       use Interfaces.C;
       use Interfaces.C.Strings;
-      use Terminal_Interface.Curses.Aux;
       function getenv (x : char_array)  return chars_ptr;
       pragma Import (C, getenv, "getenv");
       tmp1 : char_array (0 .. 10);
@@ -161,8 +150,6 @@ package body ncurses2.util is
       Refresh;
    end ShellOut;
 
-
-
    function Is_Digit (c : Key_Code) return Boolean is
    begin
       if c >= 16#100# then
@@ -178,7 +165,6 @@ package body ncurses2.util is
       Add (Ch => newl);
    end P;
 
-
    function Code_To_Char (c : Key_Code) return Character is
    begin
       if c > Character'Pos (Character'Last) then