1
0
mirror of https://github.com/rfivet/uemacs.git synced 2024-09-24 14:46:00 -04:00

Introduce globals.h to prepare rmoval of edef.h.

This commit is contained in:
Renaud 2013-10-09 13:15:38 +08:00
parent 7573dcd226
commit cfd92b066c
5 changed files with 112 additions and 95 deletions

103
Makefile
View File

@ -1,8 +1,8 @@
# Makefile for emacs, updated Sat Sep 28 09:31:49 CST 2013
# Makefile for emacs, updated Wed, Oct 09, 2013 1:11:02 PM
SRC=ansi.c basic.c bindable.c bind.c buffer.c crypt.c display.c ebind.c eval.c exec.c execute.c file.c fileio.c flook.c globals.c ibmpc.c input.c isearch.c line.c lock.c log.c main.c names.c pklock.c posix.c random.c region.c search.c spawn.c tcap.c termio.c utf8.c vmsvt.c vt52.c window.c word.c wrapper.c
OBJ=ansi.o basic.o bindable.o bind.o buffer.o crypt.o display.o ebind.o eval.o exec.o execute.o file.o fileio.o flook.o globals.o ibmpc.o input.o isearch.o line.o lock.o log.o main.o names.o pklock.o posix.o random.o region.o search.o spawn.o tcap.o termio.o utf8.o vmsvt.o vt52.o window.o word.o wrapper.o
HDR=basic.h bindable.h bind.h buffer.h crypt.h defines.h display.h ebind.h edef.h efunc.h estruct.h eval.h exec.h execute.h file.h fileio.h flook.h input.h isearch.h line.h lock.h log.h names.h pklock.h random.h region.h retcode.h search.h spawn.h terminal.h termio.h utf8.h version.h window.h word.h wrapper.h
SRC=ansi.c basic.c bind.c bindable.c buffer.c crypt.c display.c ebind.c eval.c exec.c execute.c file.c fileio.c flook.c globals.c ibmpc.c input.c isearch.c line.c lock.c log.c main.c names.c pklock.c posix.c random.c region.c search.c spawn.c tcap.c termio.c utf8.c vmsvt.c vt52.c window.c word.c wrapper.c
OBJ=ansi.o basic.o bind.o bindable.o buffer.o crypt.o display.o ebind.o eval.o exec.o execute.o file.o fileio.o flook.o globals.o ibmpc.o input.o isearch.o line.o lock.o log.o main.o names.o pklock.o posix.o random.o region.o search.o spawn.o tcap.o termio.o utf8.o vmsvt.o vt52.o window.o word.o wrapper.o
HDR=basic.h bind.h bindable.h buffer.h crypt.h defines.h display.h ebind.h edef.h efunc.h estruct.h eval.h exec.h execute.h file.h fileio.h flook.h globals.h input.h isearch.h line.h lock.h log.h names.h pklock.h random.h region.h retcode.h search.h spawn.h terminal.h termio.h utf8.h version.h window.h word.h wrapper.h
# DO NOT ADD OR MODIFY ANY LINES ABOVE THIS -- make source creates them
@ -126,80 +126,83 @@ depend: ${SRC}
# DO NOT DELETE THIS LINE -- make depend uses it
ansi.o: ansi.c estruct.h retcode.h edef.h
ansi.o: ansi.c estruct.h retcode.h edef.h globals.h
basic.o: basic.c basic.h buffer.h crypt.h line.h utf8.h display.h \
estruct.h retcode.h edef.h input.h bind.h random.h terminal.h defines.h \
window.h
estruct.h retcode.h edef.h globals.h input.h bind.h random.h terminal.h \
defines.h window.h
bind.o: bind.c bind.h edef.h estruct.h retcode.h globals.h bindable.h \
buffer.h crypt.h line.h utf8.h display.h ebind.h exec.h file.h flook.h \
input.h names.h window.h defines.h
bindable.o: bindable.c bindable.h defines.h buffer.h crypt.h line.h \
utf8.h display.h edef.h estruct.h retcode.h file.h input.h bind.h lock.h \
terminal.h
bind.o: bind.c bind.h edef.h estruct.h retcode.h bindable.h buffer.h \
crypt.h line.h utf8.h display.h ebind.h exec.h file.h flook.h input.h \
names.h window.h defines.h
utf8.h display.h edef.h estruct.h retcode.h globals.h file.h input.h \
bind.h lock.h terminal.h
buffer.o: buffer.c buffer.h crypt.h line.h utf8.h defines.h display.h \
edef.h estruct.h retcode.h file.h input.h bind.h window.h
edef.h estruct.h retcode.h globals.h file.h input.h bind.h window.h
crypt.o: crypt.c crypt.h
display.o: display.c display.h buffer.h crypt.h line.h utf8.h estruct.h \
retcode.h edef.h input.h bind.h termio.h terminal.h defines.h version.h \
wrapper.h window.h
retcode.h edef.h globals.h input.h bind.h termio.h terminal.h defines.h \
version.h wrapper.h window.h
ebind.o: ebind.c ebind.h basic.h bind.h edef.h estruct.h retcode.h \
bindable.h buffer.h crypt.h line.h utf8.h eval.h exec.h file.h isearch.h \
random.h region.h search.h spawn.h window.h defines.h word.h
globals.h bindable.h buffer.h crypt.h line.h utf8.h eval.h exec.h file.h \
isearch.h random.h region.h search.h spawn.h window.h defines.h word.h
eval.o: eval.c eval.h basic.h bind.h buffer.h crypt.h line.h utf8.h \
display.h estruct.h retcode.h edef.h exec.h execute.h flook.h input.h \
random.h search.h terminal.h defines.h termio.h version.h window.h
exec.o: exec.c exec.h buffer.h crypt.h line.h utf8.h bind.h display.h \
estruct.h retcode.h edef.h eval.h file.h flook.h input.h window.h \
defines.h
execute.o: execute.c execute.h edef.h estruct.h retcode.h bind.h random.h \
display.h file.h crypt.h buffer.h line.h utf8.h terminal.h defines.h \
display.h estruct.h retcode.h edef.h globals.h exec.h execute.h flook.h \
input.h random.h search.h terminal.h defines.h termio.h version.h \
window.h
exec.o: exec.c exec.h buffer.h crypt.h line.h utf8.h bind.h display.h \
estruct.h retcode.h edef.h globals.h eval.h file.h flook.h input.h \
window.h defines.h
execute.o: execute.c execute.h edef.h estruct.h retcode.h globals.h \
bind.h random.h display.h file.h crypt.h buffer.h line.h utf8.h \
terminal.h defines.h window.h
file.o: file.c file.h crypt.h retcode.h buffer.h line.h utf8.h defines.h \
estruct.h edef.h execute.h fileio.h input.h bind.h lock.h log.h window.h
estruct.h edef.h globals.h execute.h fileio.h input.h bind.h lock.h \
log.h window.h
fileio.o: fileio.c fileio.h crypt.h retcode.h defines.h
flook.o: flook.c flook.h retcode.h defines.h fileio.h crypt.h
globals.o: globals.c defines.h edef.h estruct.h retcode.h
ibmpc.o: ibmpc.c estruct.h retcode.h edef.h
input.o: input.c input.h bind.h edef.h estruct.h retcode.h bindable.h \
display.h exec.h names.h terminal.h defines.h wrapper.h
globals.o: globals.c globals.h defines.h retcode.h
ibmpc.o: ibmpc.c estruct.h retcode.h edef.h globals.h
input.o: input.c input.h bind.h edef.h estruct.h retcode.h globals.h \
bindable.h display.h exec.h names.h terminal.h defines.h wrapper.h
isearch.o: isearch.c isearch.h basic.h buffer.h crypt.h line.h utf8.h \
display.h estruct.h retcode.h edef.h input.h bind.h search.h terminal.h \
defines.h window.h
display.h estruct.h retcode.h edef.h globals.h input.h bind.h search.h \
terminal.h defines.h window.h
line.o: line.c line.h utf8.h buffer.h crypt.h edef.h estruct.h retcode.h \
log.h window.h defines.h
lock.o: lock.c lock.h estruct.h retcode.h display.h edef.h input.h bind.h
globals.h log.h window.h defines.h
lock.o: lock.c lock.h estruct.h retcode.h display.h edef.h globals.h \
input.h bind.h
log.o: log.c log.h retcode.h
main.o: main.c basic.h bind.h bindable.h buffer.h crypt.h line.h utf8.h \
display.h edef.h estruct.h retcode.h eval.h execute.h file.h input.h \
lock.h log.h random.h search.h terminal.h defines.h termio.h version.h \
window.h
display.h edef.h estruct.h retcode.h globals.h eval.h execute.h file.h \
input.h lock.h log.h random.h search.h terminal.h defines.h termio.h \
version.h window.h
names.o: names.c names.h basic.h bind.h bindable.h buffer.h crypt.h \
line.h utf8.h display.h eval.h exec.h file.h retcode.h isearch.h \
region.h random.h search.h spawn.h window.h defines.h word.h
pklock.o: pklock.c pklock.h estruct.h retcode.h edef.h
pklock.o: pklock.c pklock.h estruct.h retcode.h edef.h globals.h
posix.o: posix.c termio.h
random.o: random.c random.h basic.h buffer.h crypt.h line.h utf8.h \
display.h estruct.h retcode.h edef.h execute.h input.h bind.h log.h \
search.h terminal.h defines.h window.h
display.h estruct.h retcode.h edef.h globals.h execute.h input.h bind.h \
log.h search.h terminal.h defines.h window.h
region.o: region.c region.h line.h utf8.h buffer.h crypt.h estruct.h \
retcode.h edef.h log.h window.h defines.h
retcode.h edef.h globals.h log.h window.h defines.h
search.o: search.c search.h line.h utf8.h basic.h buffer.h crypt.h \
display.h edef.h estruct.h retcode.h input.h bind.h log.h terminal.h \
defines.h window.h
display.h edef.h estruct.h retcode.h globals.h input.h bind.h log.h \
terminal.h defines.h window.h
spawn.o: spawn.c spawn.h defines.h buffer.h crypt.h line.h utf8.h \
display.h estruct.h retcode.h edef.h file.h flook.h input.h bind.h log.h \
terminal.h window.h
display.h estruct.h retcode.h edef.h globals.h file.h flook.h input.h \
bind.h log.h terminal.h window.h
tcap.o: tcap.c terminal.h defines.h display.h estruct.h retcode.h edef.h \
termio.h
globals.h termio.h
termio.o: termio.c termio.h estruct.h retcode.h utf8.h
utf8.o: utf8.c utf8.h
vmsvt.o: vmsvt.c estruct.h retcode.h edef.h
vt52.o: vt52.c estruct.h retcode.h edef.h
vmsvt.o: vmsvt.c estruct.h retcode.h edef.h globals.h
vt52.o: vt52.c estruct.h retcode.h edef.h globals.h
window.o: window.c window.h defines.h buffer.h crypt.h line.h utf8.h \
basic.h display.h edef.h estruct.h retcode.h execute.h terminal.h \
wrapper.h
basic.h display.h edef.h estruct.h retcode.h globals.h execute.h \
terminal.h wrapper.h
word.o: word.c word.h basic.h buffer.h crypt.h line.h utf8.h estruct.h \
retcode.h edef.h log.h random.h region.h window.h defines.h
retcode.h edef.h globals.h log.h random.h region.h window.h defines.h
wrapper.o: wrapper.c wrapper.h
# DEPENDENCIES MUST END AT END OF FILE

View File

@ -3,8 +3,14 @@
*/
#define USG 1
#define NBUFN 16 /* # of bytes, buffer name */
#define NSTRING 128 /* # of bytes, string buffers */
#define PKCODE 1
#define SCROLLCODE 1 /* scrolling code P.K. */
#define ENVFUNC 1
#define CONTROL 0x10000000 /* Control flag, or'ed in */
#define META 0x20000000 /* Meta flag, or'ed in */
#define CTLX 0x40000000 /* ^X flag, or'ed in */
#define SPEC 0x80000000 /* special key (function keys) */

43
edef.h
View File

@ -11,47 +11,6 @@
#define EDEF_H_
#include "estruct.h"
/* Initialized global external declarations. */
extern int fillcol; /* Fill column */
extern int eolexist; /* does clear to EOL exist? */
extern int revexist; /* does reverse video exist? */
extern int flickcode; /* do flicker supression? */
extern int gfcolor; /* global forgrnd color (white) */
extern int gbcolor; /* global backgrnd color (black) */
extern int sgarbf; /* State of screen unknown */
extern int clexec; /* command line execution flag */
extern int discmd; /* display command flag */
extern int disinp; /* display input characters */
extern int metac; /* current meta character */
extern int ctlxc; /* current control X prefix char */
extern int reptc; /* current universal repeat char */
extern int abortc; /* current abort command char */
extern int tabmask;
extern int restflag; /* restricted use? */
extern long envram; /* # of bytes current in use by malloc */
extern int rval; /* return value of a subprocess */
extern int overlap; /* line overlap in forw/back page */
extern int scrollcount; /* number of lines to scroll */
/* Uninitialized global external declarations. */
#define CFCPCN 0x0001 /* Last command was C-P, C-N */
#define CFKILL 0x0002 /* Last command was a kill */
extern int thisflag; /* Flags, this command */
extern int lastflag; /* Flags, last command */
extern int curgoal; /* Goal for C-P, C-N */
extern char sres[NBUFN]; /* Current screen resolution. */
#include "globals.h"
#endif /* EDEF_H_ */

View File

@ -1,7 +1,8 @@
#include "defines.h"
/* globals.c -- implements global.h */
#include "globals.h"
/* #include "estruct.h" */
#include "edef.h"
#include "defines.h"
#include "retcode.h"
/* initialized global definitions */

48
globals.h Normal file
View File

@ -0,0 +1,48 @@
/* globals.h -- Global variable definitions */
#ifndef __GLOBALS_H__
#define __GLOBALS_H__
/* Initialized global external declarations. */
extern int fillcol; /* Fill column */
extern int eolexist; /* does clear to EOL exist? */
extern int revexist; /* does reverse video exist? */
extern int flickcode; /* do flicker supression? */
extern int gfcolor; /* global forgrnd color (white) */
extern int gbcolor; /* global backgrnd color (black) */
extern int sgarbf; /* State of screen unknown */
extern int clexec; /* command line execution flag */
extern int discmd; /* display command flag */
extern int disinp; /* display input characters */
extern int metac; /* current meta character */
extern int ctlxc; /* current control X prefix char */
extern int reptc; /* current universal repeat char */
extern int abortc; /* current abort command char */
extern int tabmask;
extern int restflag; /* restricted use? */
extern long envram; /* # of bytes current in use by malloc */
extern int rval; /* return value of a subprocess */
extern int overlap; /* line overlap in forw/back page */
extern int scrollcount; /* number of lines to scroll */
/* Uninitialized global external declarations. */
#define CFCPCN 0x0001 /* Last command was C-P, C-N */
#define CFKILL 0x0002 /* Last command was a kill */
extern int thisflag; /* Flags, this command */
extern int lastflag; /* Flags, last command */
extern int curgoal; /* Goal for C-P, C-N */
extern char sres[] ; /* Current screen resolution. */
#endif