mirror of
https://github.com/rfivet/uemacs.git
synced 2024-09-25 06:55:54 -04:00
Move globals defines out of estruct.h.
This commit is contained in:
parent
ba2dc0e5f8
commit
94d21c96f3
59
Makefile
59
Makefile
@ -126,77 +126,76 @@ depend: ${SRC}
|
|||||||
|
|
||||||
# DO NOT DELETE THIS LINE -- make depend uses it
|
# DO NOT DELETE THIS LINE -- make depend uses it
|
||||||
|
|
||||||
ansi.o: ansi.c estruct.h retcode.h
|
ansi.o: ansi.c estruct.h
|
||||||
basic.o: basic.c basic.h buffer.h crypt.h line.h utf8.h display.h \
|
basic.o: basic.c basic.h buffer.h crypt.h line.h utf8.h display.h \
|
||||||
estruct.h retcode.h input.h bind.h random.h terminal.h defines.h \
|
estruct.h input.h bind.h random.h terminal.h defines.h retcode.h \
|
||||||
window.h
|
window.h
|
||||||
bind.o: bind.c bind.h estruct.h retcode.h bindable.h buffer.h crypt.h \
|
bind.o: bind.c bind.h estruct.h bindable.h buffer.h crypt.h line.h utf8.h \
|
||||||
line.h utf8.h display.h ebind.h exec.h file.h flook.h input.h names.h \
|
display.h ebind.h exec.h retcode.h file.h flook.h input.h names.h \
|
||||||
window.h defines.h
|
window.h defines.h
|
||||||
bindable.o: bindable.c bindable.h defines.h buffer.h crypt.h line.h \
|
bindable.o: bindable.c bindable.h defines.h buffer.h crypt.h line.h \
|
||||||
utf8.h display.h estruct.h retcode.h file.h input.h bind.h lock.h \
|
utf8.h display.h estruct.h file.h retcode.h input.h bind.h lock.h \
|
||||||
terminal.h
|
terminal.h
|
||||||
buffer.o: buffer.c buffer.h crypt.h line.h utf8.h defines.h display.h \
|
buffer.o: buffer.c buffer.h crypt.h line.h utf8.h defines.h display.h \
|
||||||
estruct.h retcode.h file.h input.h bind.h window.h
|
estruct.h file.h retcode.h input.h bind.h window.h
|
||||||
crypt.o: crypt.c crypt.h
|
crypt.o: crypt.c crypt.h
|
||||||
display.o: display.c display.h buffer.h crypt.h line.h utf8.h estruct.h \
|
display.o: display.c display.h buffer.h crypt.h line.h utf8.h estruct.h \
|
||||||
retcode.h input.h bind.h termio.h terminal.h defines.h version.h \
|
input.h bind.h termio.h terminal.h defines.h retcode.h version.h \
|
||||||
wrapper.h window.h
|
wrapper.h window.h
|
||||||
ebind.o: ebind.c ebind.h basic.h bind.h estruct.h retcode.h bindable.h \
|
ebind.o: ebind.c ebind.h basic.h bind.h estruct.h bindable.h buffer.h \
|
||||||
buffer.h crypt.h line.h utf8.h eval.h exec.h file.h isearch.h random.h \
|
crypt.h line.h utf8.h eval.h exec.h retcode.h file.h isearch.h random.h \
|
||||||
region.h search.h spawn.h window.h defines.h word.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 \
|
eval.o: eval.c eval.h basic.h bind.h buffer.h crypt.h line.h utf8.h \
|
||||||
display.h estruct.h retcode.h exec.h execute.h flook.h input.h random.h \
|
display.h estruct.h exec.h retcode.h execute.h flook.h input.h random.h \
|
||||||
search.h terminal.h defines.h termio.h version.h window.h
|
search.h terminal.h defines.h termio.h version.h window.h
|
||||||
exec.o: exec.c exec.h retcode.h buffer.h crypt.h line.h utf8.h bind.h \
|
exec.o: exec.c exec.h retcode.h buffer.h crypt.h line.h utf8.h bind.h \
|
||||||
display.h estruct.h eval.h file.h flook.h input.h random.h window.h \
|
display.h estruct.h eval.h file.h flook.h input.h random.h window.h \
|
||||||
defines.h
|
defines.h
|
||||||
execute.o: execute.c execute.h estruct.h retcode.h bind.h random.h \
|
execute.o: execute.c execute.h estruct.h bind.h random.h display.h file.h \
|
||||||
display.h file.h crypt.h buffer.h line.h utf8.h terminal.h defines.h \
|
crypt.h retcode.h buffer.h line.h utf8.h terminal.h defines.h window.h
|
||||||
window.h
|
|
||||||
file.o: file.c file.h crypt.h retcode.h buffer.h line.h utf8.h defines.h \
|
file.o: file.c file.h crypt.h retcode.h buffer.h line.h utf8.h defines.h \
|
||||||
estruct.h execute.h fileio.h input.h bind.h lock.h log.h window.h
|
estruct.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
|
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
|
flook.o: flook.c flook.h retcode.h defines.h fileio.h crypt.h
|
||||||
ibmpc.o: ibmpc.c estruct.h retcode.h
|
ibmpc.o: ibmpc.c estruct.h
|
||||||
input.o: input.c input.h bind.h estruct.h retcode.h bindable.h display.h \
|
input.o: input.c input.h bind.h estruct.h bindable.h display.h exec.h \
|
||||||
exec.h names.h terminal.h defines.h wrapper.h
|
retcode.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 \
|
isearch.o: isearch.c isearch.h basic.h buffer.h crypt.h line.h utf8.h \
|
||||||
display.h estruct.h retcode.h exec.h input.h bind.h search.h terminal.h \
|
display.h estruct.h exec.h retcode.h input.h bind.h search.h terminal.h \
|
||||||
defines.h window.h
|
defines.h window.h
|
||||||
line.o: line.c line.h utf8.h buffer.h crypt.h estruct.h retcode.h log.h \
|
line.o: line.c line.h utf8.h buffer.h crypt.h estruct.h log.h retcode.h \
|
||||||
window.h defines.h
|
window.h defines.h
|
||||||
lock.o: lock.c lock.h estruct.h retcode.h
|
lock.o: lock.c estruct.h lock.h
|
||||||
log.o: log.c log.h retcode.h
|
log.o: log.c log.h retcode.h
|
||||||
main.o: main.c estruct.h retcode.h basic.h bind.h bindable.h buffer.h \
|
main.o: main.c estruct.h basic.h bind.h bindable.h buffer.h crypt.h \
|
||||||
crypt.h line.h utf8.h display.h eval.h execute.h file.h input.h lock.h \
|
line.h utf8.h display.h eval.h execute.h file.h retcode.h input.h lock.h \
|
||||||
log.h random.h search.h terminal.h defines.h termio.h version.h window.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 \
|
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 retcode.h file.h isearch.h \
|
line.h utf8.h display.h eval.h exec.h retcode.h file.h isearch.h \
|
||||||
region.h random.h search.h spawn.h window.h defines.h word.h
|
region.h random.h search.h spawn.h window.h defines.h word.h
|
||||||
pklock.o: pklock.c estruct.h retcode.h pklock.h
|
pklock.o: pklock.c estruct.h pklock.h
|
||||||
posix.o: posix.c termio.h
|
posix.o: posix.c termio.h
|
||||||
random.o: random.c random.h basic.h buffer.h crypt.h line.h utf8.h \
|
random.o: random.c random.h basic.h buffer.h crypt.h line.h utf8.h \
|
||||||
display.h estruct.h retcode.h execute.h input.h bind.h log.h search.h \
|
display.h estruct.h execute.h input.h bind.h log.h retcode.h search.h \
|
||||||
terminal.h defines.h window.h
|
terminal.h defines.h window.h
|
||||||
region.o: region.c region.h line.h utf8.h buffer.h crypt.h estruct.h \
|
region.o: region.c region.h line.h utf8.h buffer.h crypt.h estruct.h \
|
||||||
retcode.h log.h random.h window.h defines.h
|
log.h retcode.h random.h window.h defines.h
|
||||||
search.o: search.c search.h line.h utf8.h basic.h buffer.h crypt.h \
|
search.o: search.c search.h line.h utf8.h basic.h buffer.h crypt.h \
|
||||||
display.h estruct.h retcode.h input.h bind.h log.h terminal.h defines.h \
|
display.h estruct.h input.h bind.h log.h retcode.h terminal.h defines.h \
|
||||||
window.h
|
window.h
|
||||||
spawn.o: spawn.c spawn.h defines.h buffer.h crypt.h line.h utf8.h \
|
spawn.o: spawn.c spawn.h defines.h buffer.h crypt.h line.h utf8.h \
|
||||||
display.h estruct.h retcode.h exec.h file.h flook.h input.h bind.h log.h \
|
display.h estruct.h exec.h retcode.h file.h flook.h input.h bind.h log.h \
|
||||||
terminal.h window.h
|
terminal.h window.h
|
||||||
tcap.o: tcap.c terminal.h defines.h retcode.h display.h estruct.h \
|
tcap.o: tcap.c terminal.h defines.h retcode.h display.h estruct.h \
|
||||||
termio.h
|
termio.h
|
||||||
termio.o: termio.c termio.h estruct.h retcode.h utf8.h
|
termio.o: termio.c termio.h estruct.h retcode.h utf8.h
|
||||||
utf8.o: utf8.c utf8.h
|
utf8.o: utf8.c utf8.h
|
||||||
vmsvt.o: vmsvt.c estruct.h retcode.h
|
vmsvt.o: vmsvt.c estruct.h
|
||||||
vt52.o: vt52.c estruct.h retcode.h
|
vt52.o: vt52.c estruct.h
|
||||||
window.o: window.c window.h defines.h buffer.h crypt.h line.h utf8.h \
|
window.o: window.c window.h defines.h buffer.h crypt.h line.h utf8.h \
|
||||||
basic.h display.h estruct.h retcode.h execute.h terminal.h wrapper.h
|
basic.h display.h estruct.h execute.h terminal.h retcode.h wrapper.h
|
||||||
word.o: word.c word.h basic.h buffer.h crypt.h line.h utf8.h estruct.h \
|
word.o: word.c word.h basic.h buffer.h crypt.h line.h utf8.h estruct.h \
|
||||||
retcode.h log.h random.h region.h window.h defines.h
|
log.h retcode.h random.h region.h window.h defines.h
|
||||||
wrapper.o: wrapper.c wrapper.h
|
wrapper.o: wrapper.c wrapper.h
|
||||||
|
|
||||||
# DEPENDENCIES MUST END AT END OF FILE
|
# DEPENDENCIES MUST END AT END OF FILE
|
||||||
|
@ -3,7 +3,6 @@
|
|||||||
*/
|
*/
|
||||||
#define USG 1
|
#define USG 1
|
||||||
|
|
||||||
#define NBUFN 16 /* # of bytes, buffer name */
|
|
||||||
#define NSTRING 128 /* # of bytes, string buffers */
|
#define NSTRING 128 /* # of bytes, string buffers */
|
||||||
|
|
||||||
#define PKCODE 1
|
#define PKCODE 1
|
||||||
@ -14,3 +13,6 @@
|
|||||||
#define META 0x20000000 /* Meta flag, or'ed in */
|
#define META 0x20000000 /* Meta flag, or'ed in */
|
||||||
#define CTLX 0x40000000 /* ^X flag, or'ed in */
|
#define CTLX 0x40000000 /* ^X flag, or'ed in */
|
||||||
#define SPEC 0x80000000 /* special key (function keys) */
|
#define SPEC 0x80000000 /* special key (function keys) */
|
||||||
|
|
||||||
|
#define MAXCOL 500
|
||||||
|
#define MAXROW 500
|
||||||
|
3
ebind.h
3
ebind.h
@ -4,5 +4,6 @@ struct key_tab {
|
|||||||
int (*k_fp)( int, int) ; /* Routine to handle it */
|
int (*k_fp)( int, int) ; /* Routine to handle it */
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
extern struct key_tab keytab[]; /* key bind to functions table */
|
#define NBINDS 256 /* max # of bound keys */
|
||||||
|
extern struct key_tab keytab[ NBINDS] ; /* key bind to functions table */
|
||||||
|
|
||||||
|
14
estruct.h
14
estruct.h
@ -12,9 +12,6 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#define MAXCOL 500
|
|
||||||
#define MAXROW 500
|
|
||||||
|
|
||||||
#ifdef MSDOS
|
#ifdef MSDOS
|
||||||
#undef MSDOS
|
#undef MSDOS
|
||||||
#endif
|
#endif
|
||||||
@ -226,27 +223,16 @@
|
|||||||
|
|
||||||
/* Internal constants. */
|
/* Internal constants. */
|
||||||
|
|
||||||
#define NBINDS 256 /* max # of bound keys */
|
|
||||||
#define NFILEN 80 /* # of bytes, file name */
|
#define NFILEN 80 /* # of bytes, file name */
|
||||||
#define NBUFN 16 /* # of bytes, buffer name */
|
|
||||||
#define NLINE 256 /* # of bytes, input line */
|
|
||||||
#define NSTRING 128 /* # of bytes, string buffers */
|
#define NSTRING 128 /* # of bytes, string buffers */
|
||||||
#define NPAT 128 /* # of bytes, pattern */
|
#define NPAT 128 /* # of bytes, pattern */
|
||||||
#define HUGE 1000 /* Huge number */
|
#define HUGE 1000 /* Huge number */
|
||||||
#define NLOCKS 100 /* max # of file locks active */
|
|
||||||
|
|
||||||
#define CONTROL 0x10000000 /* Control flag, or'ed in */
|
#define CONTROL 0x10000000 /* Control flag, or'ed in */
|
||||||
#define META 0x20000000 /* Meta flag, or'ed in */
|
#define META 0x20000000 /* Meta flag, or'ed in */
|
||||||
#define CTLX 0x40000000 /* ^X flag, or'ed in */
|
#define CTLX 0x40000000 /* ^X flag, or'ed in */
|
||||||
#define SPEC 0x80000000 /* special key (function keys) */
|
#define SPEC 0x80000000 /* special key (function keys) */
|
||||||
|
|
||||||
#include "retcode.h"
|
|
||||||
|
|
||||||
#define BELL 0x07 /* a bell character */
|
|
||||||
#define TAB 0x09 /* a tab character */
|
|
||||||
|
|
||||||
#define INTWIDTH sizeof(int) * 3
|
|
||||||
|
|
||||||
/* Internal defined functions */
|
/* Internal defined functions */
|
||||||
|
|
||||||
#ifdef abs
|
#ifdef abs
|
||||||
|
2
eval.c
2
eval.c
@ -937,6 +937,8 @@ static int svar(struct variable_description *var, char *value)
|
|||||||
*/
|
*/
|
||||||
char *itoa(int i)
|
char *itoa(int i)
|
||||||
{
|
{
|
||||||
|
#define INTWIDTH sizeof( int) * 3
|
||||||
|
|
||||||
int digit; /* current digit being used */
|
int digit; /* current digit being used */
|
||||||
char *sp; /* pointer into result */
|
char *sp; /* pointer into result */
|
||||||
int sign; /* sign of resulting number */
|
int sign; /* sign of resulting number */
|
||||||
|
2
line.h
2
line.h
@ -3,6 +3,8 @@
|
|||||||
|
|
||||||
#include "utf8.h"
|
#include "utf8.h"
|
||||||
|
|
||||||
|
#define NLINE 256 /* # of bytes, input line */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* All text is kept in circularly linked lists of "struct line" structures. These
|
* All text is kept in circularly linked lists of "struct line" structures. These
|
||||||
* begin at the header line (which is the blank line beyond the end of the
|
* begin at the header line (which is the blank line beyond the end of the
|
||||||
|
3
lock.c
3
lock.c
@ -22,6 +22,7 @@
|
|||||||
|
|
||||||
#include <sys/errno.h>
|
#include <sys/errno.h>
|
||||||
|
|
||||||
|
#define NLOCKS 100 /* max # of file locks active */
|
||||||
static char *lname[ NLOCKS] ; /* names of all locked files */
|
static char *lname[ NLOCKS] ; /* names of all locked files */
|
||||||
static int numlocks ; /* # of current locks active */
|
static int numlocks ; /* # of current locks active */
|
||||||
|
|
||||||
@ -45,7 +46,7 @@ int lockchk( const char *fname)
|
|||||||
return TRUE;
|
return TRUE;
|
||||||
|
|
||||||
/* if we have a full locking table, bitch and leave */
|
/* if we have a full locking table, bitch and leave */
|
||||||
if (numlocks == NLOCKS) {
|
if( numlocks >= NLOCKS) {
|
||||||
mlwrite("LOCK ERROR: Lock table full");
|
mlwrite("LOCK ERROR: Lock table full");
|
||||||
return ABORT;
|
return ABORT;
|
||||||
}
|
}
|
||||||
|
2
search.h
2
search.h
@ -5,6 +5,8 @@
|
|||||||
|
|
||||||
#include "line.h"
|
#include "line.h"
|
||||||
|
|
||||||
|
#define BELL 0x07 /* a bell character */
|
||||||
|
|
||||||
extern unsigned int matchlen ;
|
extern unsigned int matchlen ;
|
||||||
extern char *patmatch ;
|
extern char *patmatch ;
|
||||||
|
|
||||||
|
3
tcap.c
3
tcap.c
@ -37,7 +37,8 @@ boolean eolexist = TRUE ; /* does clear to EOL exist */
|
|||||||
boolean revexist = FALSE ; /* does reverse video exist? */
|
boolean revexist = FALSE ; /* does reverse video exist? */
|
||||||
boolean sgarbf = TRUE ; /* TRUE if screen is garbage */
|
boolean sgarbf = TRUE ; /* TRUE if screen is garbage */
|
||||||
|
|
||||||
char sres[ NBUFN] ; /* current screen resolution */
|
char sres[ 16] ; /* current screen resolution */
|
||||||
|
/* NORMAL, CGA, EGA, VGA */
|
||||||
|
|
||||||
#if UNIX
|
#if UNIX
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
|
@ -76,5 +76,6 @@ extern boolean revexist ; /* does reverse video exist? */
|
|||||||
extern boolean sgarbf ; /* State of screen unknown */
|
extern boolean sgarbf ; /* State of screen unknown */
|
||||||
|
|
||||||
extern char sres[] ; /* Current screen resolution. */
|
extern char sres[] ; /* Current screen resolution. */
|
||||||
|
/* NORMAL, CGA, EGA, VGA */
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
1
termio.c
1
termio.c
@ -15,6 +15,7 @@
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
#include "estruct.h"
|
#include "estruct.h"
|
||||||
|
#include "retcode.h"
|
||||||
#include "utf8.h"
|
#include "utf8.h"
|
||||||
|
|
||||||
|
|
||||||
|
2
word.c
2
word.c
@ -21,6 +21,8 @@
|
|||||||
#include "region.h"
|
#include "region.h"
|
||||||
#include "window.h"
|
#include "window.h"
|
||||||
|
|
||||||
|
#define TAB 0x09 /* a tab character */
|
||||||
|
|
||||||
#if PKCODE
|
#if PKCODE
|
||||||
static int justflag = FALSE ; /* justify, don't fill */
|
static int justflag = FALSE ; /* justify, don't fill */
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user