mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-10-23 04:30:24 +02:00
Code Releases Activity

24705: rationalise curses and term headers even more

Browse source
This commit is contained in:
Peter Stephenson 2008-03-13 11:10:59 +00:00
parent 37a7e81390
commit 2ca42b2025
7 changed files with 171 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Src/Modules/curses.c
View file

@ -41,26 +41,8 @@
# undef HAVE_NCURSESW_NCURSES_H
#endif
#ifdef ZSH_IGNORE_NCURSES
# ifdef HAVE_CURSES_H
# include <curses.h>
# endif
#else
# ifdef HAVE_NCURSESW_NCURSES_H
# include <ncursesw/ncurses.h>
# else
# ifdef HAVE_NCURSES_NCURSES_H
# include <ncurses/ncurses.h>
# else
# ifdef HAVE_NCURSES_H
# include <ncurses.h>
# else
# ifdef HAVE_CURSES_H
# include <curses.h>
# endif
# endif
# endif
# endif
#ifdef ZSH_HAVE_CURSES_H
# include "../zshcurses.h"
#endif
#ifdef HAVE_SETCCHAR

8
Src/Modules/termcap.c
View file

@ -36,7 +36,7 @@
#include "../../config.h"
#ifdef HAVE_TGETENT
# if defined(HAVE_CURSES_H) && defined(HAVE_TERM_H)
# if defined(ZSH_HAVE_CURSES_H) && defined(ZSH_HAVE_TERM_H)
# define USES_TERM_H 1
# else
# ifdef HAVE_TERMCAP_H
@ -54,10 +54,10 @@
# ifdef HAVE_TERMIO_H
# include <termio.h>
# endif
# ifdef TERM_H_NEEDS_CURSES_H
# include <curses.h>
# ifdef ZSH_HAVE_CURSES_H
# include "../zshcurses.h"
# endif
# include <term.h>
# include "../zshterm.h"
# else
# ifdef USES_TERMCAP_H
# include <termcap.h>

28
Src/Modules/terminfo.c
View file

@ -30,7 +30,7 @@
#define USES_TERM_H 1
#include "terminfo.mdh"
#if defined(HAVE_TIGETFLAG) && (defined(HAVE_CURSES_H) || defined(HAVE_NCURSES_H) || defined(HAVE_NCURSES_NCURSES_H) || defined(HAVE_NCURSESW_NCURSES_H))
#if defined(HAVE_TIGETFLAG) && defined(ZSH_HAVE_CURSES_H)
# define USE_TERMINFO_MODULE 1
#else
# undef USE_TERMINFO_MODULE
@ -49,30 +49,12 @@
# undef offsetof
# endif
#ifdef ZSH_IGNORE_NCURSES
# ifdef HAVE_CURSES_H
# include <curses.h>
# endif
#else
# ifdef HAVE_NCURSESW_NCURSES_H
# include <ncursesw/ncurses.h>
# else
# ifdef HAVE_NCURSES_NCURSES_H
# include <ncurses/ncurses.h>
# else
# ifdef HAVE_NCURSES_H
# include <ncurses.h>
# else
# ifdef HAVE_CURSES_H
# include <curses.h>
# endif
# endif
# endif
# endif
#ifdef ZSH_HAVE_CURSES_H
# include "../zshcurses.h"
#endif
# ifdef HAVE_TERM_H
# include <term.h>
# ifdef ZSH_HAVE_TERM_H
# include "../zshterm.h"
# endif
/* echoti: output a terminfo capability */

19
Src/zsh.mdd
View file

@ -33,9 +33,26 @@ init.o: bltinmods.list zshpaths.h zshxmods.h
init.o params.o parse.o: version.h
version.h: $(sdir_top)/Config/version.mk
# The main shell doesn't currently need zshcurses.h and zshterm.h,
# but make sure these are built with the headers.
# If it did need need them they would be in headers at the top instead.
version.h: $(sdir_top)/Config/version.mk zshcurses.h zshterm.h
echo '#define ZSH_VERSION "'$(VERSION)'"' > $@
zshcurses.h: ../config.h
@if test x$(ZSH_CURSES_H) != x; then \
echo "#include <$(ZSH_CURSES_H)>" >zshcurses.h; \
else \
echo >zshcurses.h; \
fi
zshterm.h: ../config.h
@if test x$(ZSH_TERM_H) != x; then \
echo "#include <$(ZSH_TERM_H)>" >zshterm.h; \
else \
echo >zshterm.h; \
fi
zshpaths.h: Makemod $(CONFIG_INCS)
@echo '#define MODULE_DIR "'$(MODDIR)'"' > zshpaths.h.tmp
@if test x$(sitescriptdir) != xno; then \