From b53f28ab77de0df7e5700edaecded9e86bf0ecf0 Mon Sep 17 00:00:00 2001
From: Etienne Brateau <etienne.brateau@ensiie.fr>
Date: Sat, 15 Dec 2018 18:20:54 +0100
Subject: [PATCH] Reformat more code
---
log/include/logglobals.h | 14 -
log/src/log.c | 17 +-
log/src/screen.c | 2 +
psys/include/p2c/newci.h | 2 -
psys/src/newci.c | 2 +-
psys/src/newcrt.c | 1685 +++++++++++++++++++-------------------
6 files changed, 875 insertions(+), 847 deletions(-)
diff --git a/log/include/logglobals.h b/log/include/logglobals.h
index 2ce5504..7eb5a03 100644
--- a/log/include/logglobals.h
+++ b/log/include/logglobals.h
@@ -38,11 +38,6 @@ extern int findprocedure (char *name, void (**start)());
/*22*/
/*23*/
-extern const rablisttype rablist;
-
-extern const rabmustype discomadness;
-
-
extern log_action_t gg; /* External global variables */
extern short cursx, cursy; /* Current position of cursor */
@@ -81,7 +76,6 @@ extern kindattrtype kindattr;
extern na_strlist_t *gatefilenames;
extern short maxkinds, catwidth;
extern catboxrec *catboxes;
-extern librstrrec *librstrs;
extern char *gatesname[maxgatesfiles];
extern char *loghelpname, *lognewsname; /* Names of system files */
@@ -165,14 +159,6 @@ extern log_tool *simtype_common; /* Common-pin type */
extern double status_oldtime, status_oldtstep;
extern long status_oldmem;
-extern rablistrec rabtable[rabtabsize]; /* Positions of rabbits */
-extern short rabstate; /* Rabbit recognizer state */
-
-extern long helpptr; /* Help descriptor */
-
-extern int popup_grid; /* Pop-up menus */
-extern logmenurec *popupmenus[4];
-
extern filerecfilerec *libf1[maxgatesfiles]; /* Library files */
extern short libfstart[maxgatesfiles];
/* First descriptor record in LIBF1 */
diff --git a/log/src/log.c b/log/src/log.c
index c601070..fc976a8 100644
--- a/log/src/log.c
+++ b/log/src/log.c
@@ -293,7 +293,6 @@ log_tool *simtype_common; /* Common-pin type */
double status_oldtime, status_oldtstep;
long status_oldmem;
-rablistrec rabtable[rabtabsize]; /* Positions of rabbits */
short rabstate; /* Rabbit recognizer state */
long helpptr; /* Help descriptor */
@@ -12771,13 +12770,13 @@ struct LOC_initialize {
static int tryfindfile(char *name, char *path, struct LOC_initialize *LINK)
{
- int Result;
+ int result;
char fname[256];
FILE *f;
char *ep;
f = NULL;
- Result = false;
+ result = false;
if (*name != '\0' && (*path == '\0' || (name[0] != '*' && name[0] != '/' && name[0] != '%' && name[0] != '~')))
{
TRY(try31);
@@ -12802,7 +12801,7 @@ static int tryfindfile(char *name, char *path, struct LOC_initialize *LINK)
goto _Ltry31;
}
strcpy(name, fname);
- Result = true;
+ result = true;
RECOVER2(try31,_Ltry31);
if (P_escapecode == -20)
_Escape(P_escapecode);
@@ -12810,7 +12809,7 @@ static int tryfindfile(char *name, char *path, struct LOC_initialize *LINK)
}
if (f != NULL)
fclose(f);
- return Result;
+ return result;
}
static int locatefile(char *name, struct LOC_initialize *LINK)
@@ -16169,17 +16168,18 @@ static void initialize()
strcpy(swtab[7].switch_, "xX"); /* XDisplay name */
swtab[7].kind = 'M';
- newci_parseswitch(swtab, 8L, V.cmdbuf);
+ newci_parseswitch(swtab, 8, V.cmdbuf);
+ /* handle other arguments */
if (*V.cmdbuf != '\0')
{
if (*V.cmdbuf != '\0')
printf("Unrecognized option: -%s\n", V.cmdbuf);
- printf(
- "\nUsage: LOG [ -v ] [ -c cnffile ] [ -x X_display_name ] [ file ]\n");
+ printf("\nUsage: LOG [ -v ] [ -c cnffile ] [ -x X_display_name ] [ file ]\n");
_Escape(0);
}
+ /* set display name id exists */
if (swtab[7].used > 0)
{
m_set_display_name(swtab[7].UU.s);
@@ -16714,7 +16714,6 @@ static void initialize()
#undef rtn
-
static void shownews()
{
FILE *f;
diff --git a/log/src/screen.c b/log/src/screen.c
index 01dfcb8..3c06f22 100644
--- a/log/src/screen.c
+++ b/log/src/screen.c
@@ -38,6 +38,8 @@
#include "utils.h"
#include "screen.h"
+static rablistrec rabtable[rabtabsize]; /* Positions of rabbits */
+
/*================= INITSCREEN =================*/
/*= =*/
/*= Initialize color graphics, graphics tablet, =*/
diff --git a/psys/include/p2c/newci.h b/psys/include/p2c/newci.h
index c049b48..ffb4dbb 100644
--- a/psys/include/p2c/newci.h
+++ b/psys/include/p2c/newci.h
@@ -35,8 +35,6 @@ typedef struct newci_parserec {
} UU;
} newci_parserec;
-typedef newci_parserec* newci_parsetab;
-
typedef struct newci_fshandle {
long a;
long b;
diff --git a/psys/src/newci.c b/psys/src/newci.c
index 29d7591..86ded32 100644
--- a/psys/src/newci.c
+++ b/psys/src/newci.c
@@ -142,7 +142,7 @@ void newci_eatargument()
P_argc--;
}
-void newci_parseswitch(newci_parsetab tab, size_t size, char *bad)
+void newci_parseswitch(newci_parserec* tab, size_t size, char *bad)
{
int found;
size_t pos = 1;
diff --git a/psys/src/newcrt.c b/psys/src/newcrt.c
index babfdab..4b5820c 100644
--- a/psys/src/newcrt.c
+++ b/psys/src/newcrt.c
@@ -36,74 +36,73 @@
#if 0
#define NC_SCREEN(i) (*({ int _i = (i); \
- if (_i < 0 || _i >= TextW*TextH) \
- _i=0, _i/=_i; \
- nc_screen + _i; }))
+ if (_i < 0 || _i >= TextW*TextH) \
+ _i=0, _i/=_i; \
+ nc_screen + _i; }))
#else
#define NC_SCREEN(i) (nc_screen[i])
#endif
static long WindowEventMask = ExposureMask | KeyPressMask |
- ButtonPressMask | ButtonReleaseMask |
- PointerMotionMask | StructureNotifyMask;
-static unsigned long WinAttrMask = CWBackPixel | CWBorderPixel | CWEventMask |
- CWCursor;
+ ButtonPressMask | ButtonReleaseMask |
+ PointerMotionMask | StructureNotifyMask;
+static unsigned long WinAttrMask = CWBackPixel | CWBorderPixel | CWEventMask | CWCursor;
static XSetWindowAttributes WinAttr = {
- None, /* background_pixmap */
- 0, /* background_pixel */
- CopyFromParent, /* border_pixmap */
- 0, /* border_pixel */
- ForgetGravity, /* bit_gravity */
- NorthWestGravity, /* win_gravity */
- NotUseful, /* backing_store */
- 0, /* backing_planes */
- 0, /* backing_pixel */
- False, /* save_under */
- 0, /* event_mask */
- 0, /* do_not_propogate_mask */
- False, /* override_redirect */
- CopyFromParent, /* colormap */
- None, /* cursor */
+ None, /* background_pixmap */
+ 0, /* background_pixel */
+ CopyFromParent, /* border_pixmap */
+ 0, /* border_pixel */
+ ForgetGravity, /* bit_gravity */
+ NorthWestGravity, /* win_gravity */
+ NotUseful, /* backing_store */
+ 0, /* backing_planes */
+ 0, /* backing_pixel */
+ False, /* save_under */
+ 0, /* event_mask */
+ 0, /* do_not_propogate_mask */
+ False, /* override_redirect */
+ CopyFromParent, /* colormap */
+ None, /* cursor */
};
static XWMHints WinWMHints = {
- InputHint, /* flags */
- True, /* input */
- NormalState, /* initial_state */
- None, /* icon_pixmap */
- None, /* icon_window */
- 0, 0, /* icon_x, icon_y */
- None, /* icon_mask */
- None, /* window_group */
+ InputHint, /* flags */
+ True, /* input */
+ NormalState, /* initial_state */
+ None, /* icon_pixmap */
+ None, /* icon_window */
+ 0, 0, /* icon_x, icon_y */
+ None, /* icon_mask */
+ None, /* window_group */
};
static XSizeHints WinSizeHints = {
- USSize|PMinSize|PMaxSize, /* flags */
- 0, 0, /* x, y */
- WinW, WinH, /* width, height */
- WinW, WinH, /* min_width, min_height */
- WinW, WinH, /* max_width, max_height */
- 0, 0, /* width_inc, height_inc */
- { 0, 0 }, /* min_aspect */
- { 0, 0 }, /* max_aspect */
+ USSize|PMinSize|PMaxSize, /* flags */
+ 0, 0, /* x, y */
+ WinW, WinH, /* width, height */
+ WinW, WinH, /* min_width, min_height */
+ WinW, WinH, /* max_width, max_height */
+ 0, 0, /* width_inc, height_inc */
+ { 0, 0 }, /* min_aspect */
+ { 0, 0 }, /* max_aspect */
};
static char *progname = "newcrt";
static nc_windowRec __nc_curWindow = {
- 0, TextH, 0, TextW,
- TextH * TextW,
- 0, 0, 0, WinH, 0, WinW, 0, WinW-1, 0, WinH-1,
- 0, 0, 0, 0, 0,
- 0, NULL,
+ 0, TextH, 0, TextW,
+ TextH * TextW,
+ 0, 0, 0, WinH, 0, WinW, 0, WinW-1, 0, WinH-1,
+ 0, 0, 0, 0, 0,
+ 0, NULL,
};
static nc_windowRec __nc_mainWindow = {
- 0, TextH, 0, TextW,
- TextH * TextW,
- 0, 0, 0, WinH, 0, WinW, 0, WinW-1, 0, WinH-1,
- 0, 0, 0, 0, 0,
- 0, NULL,
+ 0, TextH, 0, TextW,
+ TextH * TextW,
+ 0, 0, 0, WinH, 0, WinW, 0, WinW-1, 0, WinH-1,
+ 0, 0, 0, 0, 0,
+ 0, NULL,
};
nc_windowRec *nc_curWindow = &__nc_curWindow;
@@ -114,7 +113,7 @@ nc_windowRec *nc_defaultWindow = &__nc_mainWindow;
extern XColor m_colors[ColorSets+1][ColorsInSet]; /* From mylib */
static int colortrans[8] = {
- m_green, m_yellow, m_black, m_red, m_cyan, m_white, m_blue, m_purple,
+ m_green, m_yellow, m_black, m_red, m_cyan, m_white, m_blue, m_purple,
};
static int ascent;
@@ -125,151 +124,158 @@ char *usrgeo, *defgeo = {"640x312+60+20"};
int jc_winX, jc_winY, x_pad, y_pad;
/*unsigned*/ int jc_winW, jc_winH;
-char * nc_usrfont;
+char *nc_usrfont;
static void WindowInitialize()
{
- Window root;
- XEvent event;
- int screennum;
-
- screennum = DefaultScreen(m_display);
- root = DefaultRootWindow(m_display);
-
- if (BlackAndWhite) {
- WinAttr.background_pixel = BlackPixel(m_display, DefaultScreen(m_display));
- WinAttr.border_pixel = WhitePixel(m_display, DefaultScreen(m_display));
- } else {
- WinAttr.background_pixel = m_colors[0][m_black].pixel;
- WinAttr.border_pixel = m_colors[0][m_black].pixel;
- }
+ Window root;
+ XEvent event;
+ int screennum;
+
+ screennum = DefaultScreen(m_display);
+ root = DefaultRootWindow(m_display);
+
+ if (BlackAndWhite)
+ {
+ WinAttr.background_pixel = BlackPixel(m_display, DefaultScreen(m_display));
+ WinAttr.border_pixel = WhitePixel(m_display, DefaultScreen(m_display));
+ }
+ else
+ {
+ WinAttr.background_pixel = m_colors[0][m_black].pixel;
+ WinAttr.border_pixel = m_colors[0][m_black].pixel;
+ }
#if 0 /* simple cleanup ***mdg*** */
- WinAttr.background_pixel = m_colors[0][m_black].pixel;
- WinAttr.border_pixel = m_colors[m_black]->pixel;
+ WinAttr.background_pixel = m_colors[0][m_black].pixel;
+ WinAttr.border_pixel = m_colors[m_black]->pixel;
#endif
- WinAttr.event_mask = WindowEventMask;
- WinAttr.cursor = XCreateFontCursor(m_display, XC_tcross);
- XRecolorCursor(m_display, WinAttr.cursor, &m_colors[0][15],
- &m_colors[0][m_black]);
- WinSizeHints.max_width = XDisplayWidth(m_display, screennum);
- WinSizeHints.max_height = XDisplayHeight(m_display, screennum);
+ WinAttr.event_mask = WindowEventMask;
+ WinAttr.cursor = XCreateFontCursor(m_display, XC_tcross);
+ XRecolorCursor(m_display, WinAttr.cursor, &m_colors[0][15],
+ &m_colors[0][m_black]);
+ WinSizeHints.max_width = XDisplayWidth(m_display, screennum);
+ WinSizeHints.max_height = XDisplayHeight(m_display, screennum);
- if (!(nc_usrfont = XGetDefault (m_display, "newcrt", "font")))
- nc_usrfont = strdup(DefaultFont);
+ if (!(nc_usrfont = XGetDefault (m_display, "newcrt", "font")))
+ nc_usrfont = strdup(DefaultFont);
- /* This next section allows entries in .Xdefaults to set initial
- size and position of the newcrt window.
- Jim Clark 7/13/92 */
+ /* This next section allows entries in .Xdefaults to set initial
+ size and position of the newcrt window.
+ Jim Clark 7/13/92 */
- usrgeo = XGetDefault(m_display, "newcrt", "geometry");
+ usrgeo = XGetDefault(m_display, "newcrt", "geometry");
- if (usrgeo == NULL)
- WinSizeHints.flags |= PPosition;
- else
- WinSizeHints.flags |= USPosition;
+ if (usrgeo == NULL)
+ WinSizeHints.flags |= PPosition;
+ else
+ WinSizeHints.flags |= USPosition;
- x_pad = 0;
- y_pad = 0;
+ x_pad = 0;
+ y_pad = 0;
- XGeometry(m_display,screennum, usrgeo, defgeo, WinBorder, nc_fontwidth,
- nc_fontheight, x_pad, y_pad, &jc_winX, &jc_winY,
- &jc_winW, &jc_winH);
+ XGeometry(m_display,screennum, usrgeo, defgeo, WinBorder, nc_fontwidth,
+ nc_fontheight, x_pad, y_pad, &jc_winX, &jc_winY,
+ &jc_winW, &jc_winH);
- nc_window = XCreateWindow(m_display, root, jc_winX, jc_winY,
- jc_winW, jc_winH, WinBorder,
- CopyFromParent, InputOutput,
- DefaultVisual(m_display, screennum),
- WinAttrMask, &WinAttr);
+ nc_window = XCreateWindow(m_display, root, jc_winX, jc_winY,
+ jc_winW, jc_winH, WinBorder,
+ CopyFromParent, InputOutput,
+ DefaultVisual(m_display, screennum),
+ WinAttrMask, &WinAttr);
- /* End of revised section. */
+ /* End of revised section. */
- XStoreName(m_display, nc_window, "newcrt");
- XSetIconName(m_display, nc_window, "newcrt");
- XSetCommand(m_display, nc_window, &progname, 1);
- XSetWMHints(m_display, nc_window, &WinWMHints);
- XSetNormalHints(m_display, nc_window, &WinSizeHints);
+ XStoreName(m_display, nc_window, "newcrt");
+ XSetIconName(m_display, nc_window, "newcrt");
+ XSetCommand(m_display, nc_window, &progname, 1);
+ XSetWMHints(m_display, nc_window, &WinWMHints);
+ XSetNormalHints(m_display, nc_window, &WinSizeHints);
- XMapWindow(m_display, nc_window);
+ XMapWindow(m_display, nc_window);
-/* nc_gc = XCreateGC(m_display, nc_window, 0, NULL); */
+ /* nc_gc = XCreateGC(m_display, nc_window, 0, NULL); */
- XWindowEvent(m_display, nc_window, ExposureMask, &event);
+ XWindowEvent(m_display, nc_window, ExposureMask, &event);
}
-void nc_makeWindow(w, ptop, pheight, pleft, pwidth)
-nc_windowRec *w;
-int ptop, pheight, pleft, pwidth;
+void nc_makeWindow(nc_windowRec *w, int ptop, int pheight, int pleft, int pwidth)
{
- w->top = ptop;
- w->height = pheight;
- w->left = pleft;
- w->width = pwidth;
- w->area = pwidth * pheight;
- w->font = 0;
- w->gcolor = 0;
- w->gtop = 0;
- w->gheight = pheight * nc_fontheight;
- w->gleft = 0;
- w->gwidth = pwidth * nc_fontwidth;
- w->gminx = 0;
- w->gmaxx = w->gwidth-1;
- w->gminy = 0;
- w->gmaxy = w->gheight-1;
- w->goffx = 0;
- w->goffy = 0;
- w->savex = 0;
- w->savey = 0;
- w->saveHigh = 0;
- w->saveSize = 0;
- w->saveArea = NULL;
+ w->top = ptop;
+ w->height = pheight;
+ w->left = pleft;
+ w->width = pwidth;
+ w->area = pwidth * pheight;
+ w->font = 0;
+ w->gcolor = 0;
+ w->gtop = 0;
+ w->gheight = pheight * nc_fontheight;
+ w->gleft = 0;
+ w->gwidth = pwidth * nc_fontwidth;
+ w->gminx = 0;
+ w->gmaxx = w->gwidth-1;
+ w->gminy = 0;
+ w->gmaxy = w->gheight-1;
+ w->goffx = 0;
+ w->goffy = 0;
+ w->savex = 0;
+ w->savey = 0;
+ w->saveHigh = 0;
+ w->saveSize = 0;
+ w->saveArea = NULL;
}
void nc_initialize()
{
- int i, dir, des;
- XCharStruct cs;
- Font fontnum;
-
- if (! m_initialized)
- m_init_graphics();
- WindowInitialize();
- nc_gc = XCreateGC(m_display, nc_window, 0, NULL);
-
- if (BlackAndWhite) {
- XSetForeground(m_display, nc_gc,
- WhitePixel(m_display, screennum));
- XSetBackground(m_display, nc_gc, BlackPixel(m_display, screennum));
- } else {
- XSetForeground(m_display, nc_gc,
- m_colors[0][colortrans[nc_green/4096]].pixel);
- XSetBackground(m_display, nc_gc, m_colors[0][m_black].pixel);
- }
- nc_highlight = nc_green;
- fontnum = XLoadFont(m_display, nc_usrfont);
- XSetFont(m_display, nc_gc, fontnum);
- nc_cursorgc = XCreateGC(m_display, nc_window, 0, NULL);
-
- if (BlackAndWhite) {
- XSetForeground(m_display, nc_cursorgc,
- WhitePixel(m_display, screennum));
- XSetBackground(m_display, nc_cursorgc, BlackPixel(m_display, screennum));
- } else {
- XSetForeground(m_display, nc_cursorgc,
- m_colors[0][colortrans[nc_green/4096]].pixel);
- XSetBackground(m_display, nc_cursorgc, m_colors[0][m_black].pixel);
- }
-
- XSetFunction(m_display, nc_cursorgc, GXxor);
- cursor_flag = 0;
-
- XQueryTextExtents(m_display, fontnum, "X", 1, &dir, &ascent, &des, &cs);
-
- nc_screen = (nc_crtword *) malloc(TextW * TextH * sizeof(nc_crtword));
- for (i = 0; i < TextW * TextH; i++)
- NC_SCREEN(i).i = 32;
- XPOS = YPOS = 0;
- nc_initialized = 1;
+ int i, dir, des;
+ XCharStruct cs;
+ Font fontnum;
+
+ if (!m_initialized)
+ m_init_graphics();
+ WindowInitialize();
+ nc_gc = XCreateGC(m_display, nc_window, 0, NULL);
+
+ if (BlackAndWhite)
+ {
+ XSetForeground(m_display, nc_gc,
+ WhitePixel(m_display, screennum));
+ XSetBackground(m_display, nc_gc, BlackPixel(m_display, screennum));
+ }
+ else
+ {
+ XSetForeground(m_display, nc_gc,
+ m_colors[0][colortrans[nc_green/4096]].pixel);
+ XSetBackground(m_display, nc_gc, m_colors[0][m_black].pixel);
+ }
+ nc_highlight = nc_green;
+ fontnum = XLoadFont(m_display, nc_usrfont);
+ XSetFont(m_display, nc_gc, fontnum);
+ nc_cursorgc = XCreateGC(m_display, nc_window, 0, NULL);
+
+ if (BlackAndWhite)
+ {
+ XSetForeground(m_display, nc_cursorgc,
+ WhitePixel(m_display, screennum));
+ XSetBackground(m_display, nc_cursorgc, BlackPixel(m_display, screennum));
+ }
+ else
+ {
+ XSetForeground(m_display, nc_cursorgc,
+ m_colors[0][colortrans[nc_green/4096]].pixel);
+ XSetBackground(m_display, nc_cursorgc, m_colors[0][m_black].pixel);
+ }
+
+ XSetFunction(m_display, nc_cursorgc, GXxor);
+ cursor_flag = 0;
+
+ XQueryTextExtents(m_display, fontnum, "X", 1, &dir, &ascent, &des, &cs);
+
+ nc_screen = (nc_crtword *) malloc(TextW * TextH * sizeof(nc_crtword));
+ for (i = 0; i < TextW * TextH; i++)
+ NC_SCREEN(i).i = 32;
+ XPOS = YPOS = 0;
+ nc_initialized = 1;
}
@@ -280,793 +286,830 @@ void nc_setGraphics(int on_or_off)
extern void CheckRefresh();
-void nc_putChar(x, y, c)
-int x, y;
-uchar c;
+void nc_putChar(int x, int y, int c)
{
- if (! nc_initialized)
- nc_initialize();
- CheckRefresh();
- if (x >= 0 && x < nc_curWindow->width &&
- y >= 0 && y < nc_curWindow->height) {
- NC_SCREEN(y*TextW+x).i = nc_highlight + c;
- XDrawImageString(m_display, nc_window, nc_gc,
- nc_curWindow->gleft+x*nc_fontwidth,
- nc_curWindow->top+y*nc_fontheight + ascent,
- (char *)&c, 1);
- if (nc_highlight & nc_under) {
- XDrawLine(m_display, nc_window, nc_gc,
- nc_curWindow->gleft+x*nc_fontwidth,
- nc_curWindow->top+y*nc_fontheight + ascent + 1,
- nc_curWindow->gleft+(x+1)*nc_fontwidth-1,
- nc_curWindow->top+y*nc_fontheight + ascent + 1);
- }
- }
+ if (! nc_initialized)
+ nc_initialize();
+ CheckRefresh();
+ if (x >= 0 && x < nc_curWindow->width &&
+ y >= 0 && y < nc_curWindow->height)
+ {
+ NC_SCREEN(y*TextW+x).i = nc_highlight + c;
+ XDrawImageString(m_display, nc_window, nc_gc,
+ nc_curWindow->gleft+x*nc_fontwidth,
+ nc_curWindow->top+y*nc_fontheight + ascent,
+ (char *)&c, 1);
+ if (nc_highlight & nc_under)
+ {
+ XDrawLine(m_display, nc_window, nc_gc,
+ nc_curWindow->gleft+x*nc_fontwidth,
+ nc_curWindow->top+y*nc_fontheight + ascent + 1,
+ nc_curWindow->gleft+(x+1)*nc_fontwidth-1,
+ nc_curWindow->top+y*nc_fontheight + ascent + 1);
+ }
+ }
}
-static void show_string(str)
-char *str;
+static void show_string(char *str)
{
- unsigned char c;
-
- while (*str) {
- c = (unsigned char) *str;
- if ((c < ' ') || (c > 126))
- fprintf(stderr, "[%d]", c);
- else
- fprintf(stderr, "%c", c);
- str++;
- }
+ unsigned char c;
+
+ while (*str)
+ {
+ c = (unsigned char) *str;
+ if ((c < ' ') || (c > 126))
+ fprintf(stderr, "[%d]", c);
+ else
+ fprintf(stderr, "%c", c);
+ str++;
+ }
}
-void nc_putChars(x, y, len, cp) /* daveg, 10/6/89 */
-int x, y, len;
-char *cp;
+void nc_putChars(int x, int y, int len, char* cp) /* daveg, 10/6/89 */
{
- if (! nc_text_in_window) {
- fprintf(stderr, "Warning! nc_putChars(%d,%d,%d,'", x, y, len);
- show_string(cp);
- fprintf(stderr, "') called\n");
- return;
- }
- if (! nc_initialized)
- nc_initialize();
- CheckRefresh();
- if (x < 0) {
- cp -= x;
- len += x;
- x = 0;
- }
- if (x + len > nc_curWindow->width) {
- len = nc_curWindow->width - x;
- }
- if (len > 0 && y >= 0 && y < nc_curWindow->height) {
- int i;
- for (i = 0; i < len; i++)
- NC_SCREEN(y*TextW+x+i).i = nc_highlight + cp[i];
- XDrawImageString(m_display, nc_window, nc_gc,
- nc_curWindow->gleft+x*nc_fontwidth,
- nc_curWindow->top+y*nc_fontheight + ascent,
- cp, len);
- if (nc_highlight & nc_under) {
- XDrawLine(m_display, nc_window, nc_gc,
- nc_curWindow->gleft+x*nc_fontwidth,
- nc_curWindow->top+y*nc_fontheight + ascent + 1,
- nc_curWindow->gleft+x*nc_fontwidth + len*nc_fontwidth - 1,
- nc_curWindow->top+y*nc_fontheight + ascent + 1);
- }
- }
+ if (!nc_text_in_window)
+ {
+ fprintf(stderr, "Warning! nc_putChars(%d,%d,%d,'", x, y, len);
+ show_string(cp);
+ fprintf(stderr, "') called\n");
+ return;
+ }
+ if (! nc_initialized)
+ nc_initialize();
+ CheckRefresh();
+ if (x < 0)
+ {
+ cp -= x;
+ len += x;
+ x = 0;
+ }
+ if (x + len > nc_curWindow->width)
+ {
+ len = nc_curWindow->width - x;
+ }
+ if (len > 0 && y >= 0 && y < nc_curWindow->height)
+ {
+ for (int i = 0; i < len; i++)
+ NC_SCREEN(y*TextW+x+i).i = nc_highlight + cp[i];
+ XDrawImageString(m_display, nc_window, nc_gc,
+ nc_curWindow->gleft+x*nc_fontwidth,
+ nc_curWindow->top+y*nc_fontheight + ascent,
+ cp, len);
+ if (nc_highlight & nc_under) {
+ XDrawLine(m_display, nc_window, nc_gc,
+ nc_curWindow->gleft+x*nc_fontwidth,
+ nc_curWindow->top+y*nc_fontheight + ascent + 1,
+ nc_curWindow->gleft+x*nc_fontwidth + len*nc_fontwidth - 1,
+ nc_curWindow->top+y*nc_fontheight + ascent + 1);
+ }
+ }
}
-static void refresh_area(x1, y1, x2, y2)
-int x1, y1, x2, y2;
+static void refresh_area(int x1, int y1, int x2, int y2)
{
- nc_crtword *p;
- int i, j, len;
- short savehighlight = nc_highlight;
- char linebuf[TextW];
-
- if (nc_initialized) {
- for (j = y1; j <= y2; j++)
- for (i = x1, p = nc_screen + j*TextW; i <= x2; i += len, p += len) {
- nc_setHighlight(p->i & ~0377);
- if (bigendian)
- {
- for (len = 0; len+i <= x2 && p[len].U1.h == p->U1.h; len++)
- linebuf[len] = p[len].U1.c;
- }
- else
- {
- for (len = 0; len+i <= x2 && p[len].U1.c == p->U1.c; len++)
- linebuf[len] = p[len].U1.h;
- }
- XDrawImageString(m_display, nc_window, nc_gc,
- i * nc_fontwidth,
- j * nc_fontheight + ascent, linebuf, len);
- if (nc_highlight & nc_under) {
- XDrawLine(m_display, nc_window, nc_gc,
- i*nc_fontwidth,
- j*nc_fontheight + ascent + 1,
- i*nc_fontwidth + len*nc_fontwidth - 1,
- j*nc_fontheight + ascent + 1);
+ nc_crtword *p;
+ int i, j, len;
+ short savehighlight = nc_highlight;
+ char linebuf[TextW];
+
+ if (nc_initialized)
+ {
+ for (j = y1; j <= y2; j++)
+ for (i = x1, p = nc_screen + j*TextW; i <= x2; i += len, p += len)
+ {
+ nc_setHighlight(p->i & ~0377);
+ if (bigendian)
+ {
+ for (len = 0; len+i <= x2 && p[len].U1.h == p->U1.h; len++)
+ linebuf[len] = p[len].U1.c;
+ }
+ else
+ {
+ for (len = 0; len+i <= x2 && p[len].U1.c == p->U1.c; len++)
+ linebuf[len] = p[len].U1.h;
+ }
+ XDrawImageString(m_display, nc_window, nc_gc,
+ i * nc_fontwidth,
+ j * nc_fontheight + ascent, linebuf, len);
+ if (nc_highlight & nc_under) {
+ XDrawLine(m_display, nc_window, nc_gc,
+ i*nc_fontwidth,
+ j*nc_fontheight + ascent + 1,
+ i*nc_fontwidth + len*nc_fontwidth - 1,
+ j*nc_fontheight + ascent + 1);
+ }
+ }
+ nc_setHighlight(savehighlight);
}
- }
- nc_setHighlight(savehighlight);
- }
}
void nc_refreshScreen()
{
- XEvent event;
+ XEvent event;
#if 0
- nc_crtword *p;
- int i, done = 1;
- short savehighlight = nc_highlight;
+ nc_crtword *p;
+ int i, done = 1;
+ short savehighlight = nc_highlight;
#endif
- if (nc_initialized) {
- while (XCheckTypedWindowEvent(m_display, nc_window, Expose, &event))
- ;
- refresh_area(0, 0, TextW-1, TextH-1);
-#if 0
- for (i = 0, p = nc_screen; i < TextW * TextH; i++, p++)
- if (bigendian)
- {
- if (p->U1.c != ' ') {
- nc_setHighlight(p->i & ~0377);
- XDrawImageString(m_display, nc_window, nc_gc,
- i%TextW * nc_fontwidth,
- i/TextW * nc_fontheight + ascent, &p->U1.c, 1);
- }
- }
- else
+ if (nc_initialized)
{
- if (p->U1.h != ' ') {
- nc_setHighlight(p->i & ~0377);
- XDrawImageString(m_display, nc_window, nc_gc,
- i%TextW * nc_fontwidth,
- i/TextW * nc_fontheight + ascent, &p->U1.h, 1);
- }
- }
- nc_setHighlight(savehighlight);
+ while (XCheckTypedWindowEvent(m_display, nc_window, Expose, &event))
+ ;
+ refresh_area(0, 0, TextW-1, TextH-1);
+#if 0
+ for (i = 0, p = nc_screen; i < TextW * TextH; i++, p++)
+ if (bigendian)
+ {
+ if (p->U1.c != ' ') {
+ nc_setHighlight(p->i & ~0377);
+ XDrawImageString(m_display, nc_window, nc_gc,
+ i%TextW * nc_fontwidth,
+ i/TextW * nc_fontheight + ascent, &p->U1.c, 1);
+ }
+ }
+ else
+ {
+ if (p->U1.h != ' ') {
+ nc_setHighlight(p->i & ~0377);
+ XDrawImageString(m_display, nc_window, nc_gc,
+ i%TextW * nc_fontwidth,
+ i/TextW * nc_fontheight + ascent, &p->U1.h, 1);
+ }
+ }
+ nc_setHighlight(savehighlight);
#endif
- }
+ }
}
void CheckRefresh()
{
- XEvent event;
+ XEvent event;
- if (XCheckTypedWindowEvent(m_display, nc_window, Expose, &event))
- nc_refreshScreen();
+ if (XCheckTypedWindowEvent(m_display, nc_window, Expose, &event))
+ nc_refreshScreen();
}
-void nc_setWindow_(w)
-nc_windowRec *w;
+void nc_setWindow_(nc_windowRec *w)
{
- if (! nc_text_in_window) {
- return;
- }
- if (! nc_initialized)
- nc_initialize();
- CheckRefresh();
- nc_curWindow = w;
+ if (! nc_text_in_window)
+ {
+ return;
+ }
+ if (! nc_initialized)
+ nc_initialize();
+ CheckRefresh();
+ nc_curWindow = w;
}
-void nc_setHighlight(newhighlight)
-int newhighlight;
+void nc_setHighlight(int newhighlight)
{
- if (! nc_text_in_window) {
- return;
- }
- if (! nc_initialized)
- nc_initialize();
- if (newhighlight == nc_highlight)
- return;
- CheckRefresh();
- if (newhighlight & nc_inv) {
- if (BlackAndWhite) {
- XSetForeground(m_display, nc_gc, BlackPixel(m_display, screennum));
- XSetBackground(m_display, nc_gc,
- WhitePixel(m_display, screennum));
- } else {
- XSetForeground(m_display, nc_gc, m_colors[0][m_black].pixel);
- XSetBackground(m_display, nc_gc,
- m_colors[0][colortrans[(newhighlight & colormask)
- /4096]].pixel);
- }
- } else {
-
- if (BlackAndWhite) {
- XSetBackground(m_display, nc_gc, BlackPixel(m_display, screennum));
- XSetForeground(m_display, nc_gc,
- WhitePixel(m_display, screennum));
- } else {
- XSetForeground(m_display, nc_gc,
- m_colors[0][colortrans[(newhighlight & colormask)
- /4096]].pixel);
- XSetBackground(m_display, nc_gc, m_colors[0][m_black].pixel);
- }
- }
- nc_highlight = newhighlight;
+ if (! nc_text_in_window)
+ {
+ return;
+ }
+ if (! nc_initialized)
+ nc_initialize();
+ if (newhighlight == nc_highlight)
+ return;
+ CheckRefresh();
+ if (newhighlight & nc_inv)
+ {
+ if (BlackAndWhite)
+ {
+ XSetForeground(m_display, nc_gc, BlackPixel(m_display, screennum));
+ XSetBackground(m_display, nc_gc,
+ WhitePixel(m_display, screennum));
+ }
+ else
+ {
+ XSetForeground(m_display, nc_gc, m_colors[0][m_black].pixel);
+ XSetBackground(m_display, nc_gc,
+ m_colors[0][colortrans[(newhighlight & colormask)
+ /4096]].pixel);
+ }
+ }
+ else
+ {
+ if (BlackAndWhite)
+ {
+ XSetBackground(m_display, nc_gc, BlackPixel(m_display, screennum));
+ XSetForeground(m_display, nc_gc,
+ WhitePixel(m_display, screennum));
+ }
+ else
+ {
+ XSetForeground(m_display, nc_gc,
+ m_colors[0][colortrans[(newhighlight & colormask)
+ /4096]].pixel);
+ XSetBackground(m_display, nc_gc, m_colors[0][m_black].pixel);
+ }
+ }
+ nc_highlight = newhighlight;
}
-void nc_putStr(x, y, str)
-int x, y;
-char *str;
+void nc_putStr(int x, int y, char *str)
{
- if (! nc_text_in_window) {
- fprintf(stderr, "Warning! nc_putStr(%d,%d,'", x, y);
- show_string(str);
- fprintf(stderr, "') called\n");
- return;
- }
- if (! nc_initialized)
- nc_initialize();
- if (x >= 0 && x < nc_curWindow->width &&
- y >= 0 && y < nc_curWindow->height)
- while (*str != '\0') {
- if (x == nc_curWindow->width) {
- x = 0;
- if (++y == nc_curWindow->height)
- break;
- }
- NC_SCREEN(y*TextW+x).i = nc_highlight + *str;
- XDrawImageString(m_display, nc_window, nc_gc,
- nc_curWindow->gleft+nc_fontwidth*x,
- nc_curWindow->gtop+nc_fontheight*y + ascent,
- str++, 1);
- if (nc_highlight & nc_under) {
- XDrawLine(m_display, nc_window, nc_gc,
- nc_curWindow->gleft+x*nc_fontwidth,
- nc_curWindow->top+y*nc_fontheight + ascent + 1,
- nc_curWindow->gleft+x*nc_fontwidth + nc_fontwidth - 1,
- nc_curWindow->top+y*nc_fontheight + ascent + 1);
- }
- x++;
- }
- XFlush(m_display);
- CheckRefresh();
+ if (! nc_text_in_window)
+ {
+ fprintf(stderr, "Warning! nc_putStr(%d,%d,'", x, y);
+ show_string(str);
+ fprintf(stderr, "') called\n");
+ return;
+ }
+ if (! nc_initialized)
+ nc_initialize();
+ if (x >= 0 && x < nc_curWindow->width &&
+ y >= 0 && y < nc_curWindow->height)
+ while (*str != '\0')
+ {
+ if (x == nc_curWindow->width)
+ {
+ x = 0;
+ if (++y == nc_curWindow->height)
+ break;
+ }
+ NC_SCREEN(y*TextW+x).i = nc_highlight + *str;
+ XDrawImageString(m_display, nc_window, nc_gc,
+ nc_curWindow->gleft+nc_fontwidth*x,
+ nc_curWindow->gtop+nc_fontheight*y + ascent,
+ str++, 1);
+ if (nc_highlight & nc_under)
+ {
+ XDrawLine(m_display, nc_window, nc_gc,
+ nc_curWindow->gleft+x*nc_fontwidth,
+ nc_curWindow->top+y*nc_fontheight + ascent + 1,
+ nc_curWindow->gleft+x*nc_fontwidth + nc_fontwidth - 1,
+ nc_curWindow->top+y*nc_fontheight + ascent + 1);
+ }
+ x++;
+ }
+ XFlush(m_display);
+ CheckRefresh();
}
-void nc_writeStr(x, y, str_)
-int x, y;
-char *str_;
+void nc_writeStr(int x, int y, char* str_)
{
- int i, len;
- unsigned char *str = (unsigned char *)str_;
-
- if (! nc_text_in_window) {
- fprintf(stderr, "Warning! nc_writeStr(%d,%d,'", x, y);
- show_string(str_);
- fprintf(stderr, "') called\n");
- return;
- }
- if (! nc_initialized)
- nc_initialize();
- if (x < 0)
- x = 0;
- if (x >= nc_curWindow->width) {
- x = 0;
- y++;
- }
- if (y < 0)
- y = 0;
- if (y >= nc_curWindow->height) {
- nc_scrollUp();
- y = nc_curWindow->height-1;
- }
- XPOS = x;
- YPOS = y;
- for (i = 0; *str != '\0'; i++, str++) {
- if (*str < 32)
- switch (*str) {
- case 1: /* Cursor home */
- XPOS = YPOS = 0;
- break;
- case 8: /* Cursor left */
- if (--XPOS < 0) {
- if (YPOS > 0) {
- XPOS = nc_curWindow->width-1;
- YPOS--;
- } else
- XPOS = YPOS = 0;
+ int i, len;
+ unsigned char *str = (unsigned char *)str_;
+
+ if (! nc_text_in_window)
+ {
+ fprintf(stderr, "Warning! nc_writeStr(%d,%d,'", x, y);
+ show_string(str_);
+ fprintf(stderr, "') called\n");
+ return;
}
- break;
- case 9: /* Clear to EOL */
- nc_clearXY(XPOS, YPOS, nc_curWindow->width-XPOS, 1);
- break;
- case 10: /* Cursor down */
- if (++YPOS == nc_curWindow->height) {
- nc_scrollUp();
- YPOS--;
+ if (! nc_initialized)
+ nc_initialize();
+ if (x < 0)
+ x = 0;
+ if (x >= nc_curWindow->width)
+ {
+ x = 0;
+ y++;
}
- break;
- case 11: /* Clear to end of screen */
- nc_clearXY(XPOS, YPOS, nc_curWindow->width-XPOS, 1);
- nc_clearXY(0, YPOS+1, nc_curWindow->width,nc_curWindow->height-YPOS-1);
- break;
- case 12: /* Clear screen */
- nc_clearXY(0, 0, nc_curWindow->width, nc_curWindow->height);
- XPOS = 0;
- YPOS = 0;
- break;
- case 13: /* Carriage Return */
- XPOS = 0;
- break;
- case 28: /* Cursor right */
- if (++XPOS == nc_curWindow->width) {
- XPOS = 0;
- if (++YPOS == nc_curWindow->height) {
- nc_scrollUp();
- YPOS--;
- }
+ if (y < 0)
+ y = 0;
+ if (y >= nc_curWindow->height)
+ {
+ nc_scrollUp();
+ y = nc_curWindow->height-1;
}
- break;
- case 31: /* Cursor up */
- if (YPOS > 0)
- YPOS--;
- break;
- }
- else if (*str >= 128)
- switch (*str) {
- case 128: /* Normal */
- nc_setHighlight(nc_highlight & colormask);
- break;
- case 129: /* Inverse */
- nc_setHighlight((nc_highlight & colormask) + nc_inv);
- break;
- case 130: /* Blinking */
- nc_setHighlight((nc_highlight & colormask) + nc_blink);
- break;
- case 131: /* B + I */
- nc_setHighlight((nc_highlight & colormask) + nc_blink + nc_inv);
- break;
- case 132: /* Underline */
- nc_setHighlight((nc_highlight & colormask) + nc_under);
- break;
- case 133: /* U + I */
- nc_setHighlight((nc_highlight & colormask) + nc_under + nc_inv);
- break;
- case 134: /* U + B */
- nc_setHighlight((nc_highlight & colormask) + nc_under + nc_blink);
- break;
- case 135: /* U + B +I */
- nc_setHighlight((nc_highlight & colormask) + nc_under+nc_blink+nc_inv);
- break;
- case 136: /* Green */
- nc_setHighlight((nc_highlight & attrmask) + nc_green);
- break;
- case 137: /* Yellow */
- nc_setHighlight((nc_highlight & attrmask) + nc_yellow);
- break;
- case 138: /* Black */
- nc_setHighlight((nc_highlight & attrmask) + nc_black);
- break;
- case 139: /* Red */
- nc_setHighlight((nc_highlight & attrmask) + nc_red);
- break;
- case 140: /* Cyan */
- nc_setHighlight((nc_highlight & attrmask) + nc_cyan);
- break;
- case 141: /* White */
- nc_setHighlight((nc_highlight & attrmask) + nc_white);
- break;
- case 142: /* Blue */
- nc_setHighlight((nc_highlight & attrmask) + nc_blue);
- break;
- case 143: /* Purple */
- nc_setHighlight((nc_highlight & attrmask) + nc_purple);
- break;
- }
- else {
- len = 0;
- do {
- NC_SCREEN(YPOS*TextW+XPOS+len).i = nc_highlight + str[len];
- len++;
- } while (str[len] >= ' ' && str[len] < 128 &&
- XPOS + len < nc_curWindow->width);
- XDrawImageString(m_display, nc_window, nc_gc,
- nc_curWindow->gleft+nc_fontwidth*XPOS,
- nc_curWindow->gtop+nc_fontheight*YPOS + ascent,
- (char *)str, len);
- if (nc_highlight & nc_under) {
- XDrawLine(m_display, nc_window, nc_gc,
- nc_curWindow->gleft+XPOS*nc_fontwidth,
- nc_curWindow->top+YPOS*nc_fontheight + ascent + 1,
- nc_curWindow->gleft+XPOS*nc_fontwidth + len*nc_fontwidth-1,
- nc_curWindow->top+YPOS*nc_fontheight + ascent + 1);
- }
- str += len - 1;
- XPOS += len;
- if (XPOS == nc_curWindow->width) {
- XPOS = 0;
- if (++YPOS == nc_curWindow->height) {
- nc_scrollUp();
- YPOS--;
+ XPOS = x;
+ YPOS = y;
+ for (i = 0; *str != '\0'; i++, str++)
+ {
+ if (*str < 32)
+ {
+ switch (*str)
+ {
+ case 1: /* Cursor home */
+ XPOS = YPOS = 0;
+ break;
+ case 8: /* Cursor left */
+ if (--XPOS < 0)
+ {
+ if (YPOS > 0)
+ {
+ XPOS = nc_curWindow->width-1;
+ YPOS--;
+ } else
+ XPOS = YPOS = 0;
+ }
+ break;
+ case 9: /* Clear to EOL */
+ nc_clearXY(XPOS, YPOS, nc_curWindow->width-XPOS, 1);
+ break;
+ case 10: /* Cursor down */
+ if (++YPOS == nc_curWindow->height)
+ {
+ nc_scrollUp();
+ YPOS--;
+ }
+ break;
+ case 11: /* Clear to end of screen */
+ nc_clearXY(XPOS, YPOS, nc_curWindow->width-XPOS, 1);
+ nc_clearXY(0, YPOS+1, nc_curWindow->width,nc_curWindow->height-YPOS-1);
+ break;
+ case 12: /* Clear screen */
+ nc_clearXY(0, 0, nc_curWindow->width, nc_curWindow->height);
+ XPOS = 0;
+ YPOS = 0;
+ break;
+ case 13: /* Carriage Return */
+ XPOS = 0;
+ break;
+ case 28: /* Cursor right */
+ if (++XPOS == nc_curWindow->width)
+ {
+ XPOS = 0;
+ if (++YPOS == nc_curWindow->height)
+ {
+ nc_scrollUp();
+ YPOS--;
+ }
+ }
+ break;
+ case 31: /* Cursor up */
+ if (YPOS > 0)
+ YPOS--;
+ break;
+ }
+ }
+ else if (*str >= 128)
+ {
+ switch (*str)
+ {
+ case 128: /* Normal */
+ nc_setHighlight(nc_highlight & colormask);
+ break;
+ case 129: /* Inverse */
+ nc_setHighlight((nc_highlight & colormask) + nc_inv);
+ break;
+ case 130: /* Blinking */
+ nc_setHighlight((nc_highlight & colormask) + nc_blink);
+ break;
+ case 131: /* B + I */
+ nc_setHighlight((nc_highlight & colormask) + nc_blink + nc_inv);
+ break;
+ case 132: /* Underline */
+ nc_setHighlight((nc_highlight & colormask) + nc_under);
+ break;
+ case 133: /* U + I */
+ nc_setHighlight((nc_highlight & colormask) + nc_under + nc_inv);
+ break;
+ case 134: /* U + B */
+ nc_setHighlight((nc_highlight & colormask) + nc_under + nc_blink);
+ break;
+ case 135: /* U + B +I */
+ nc_setHighlight((nc_highlight & colormask) + nc_under+nc_blink+nc_inv);
+ break;
+ case 136: /* Green */
+ nc_setHighlight((nc_highlight & attrmask) + nc_green);
+ break;
+ case 137: /* Yellow */
+ nc_setHighlight((nc_highlight & attrmask) + nc_yellow);
+ break;
+ case 138: /* Black */
+ nc_setHighlight((nc_highlight & attrmask) + nc_black);
+ break;
+ case 139: /* Red */
+ nc_setHighlight((nc_highlight & attrmask) + nc_red);
+ break;
+ case 140: /* Cyan */
+ nc_setHighlight((nc_highlight & attrmask) + nc_cyan);
+ break;
+ case 141: /* White */
+ nc_setHighlight((nc_highlight & attrmask) + nc_white);
+ break;
+ case 142: /* Blue */
+ nc_setHighlight((nc_highlight & attrmask) + nc_blue);
+ break;
+ case 143: /* Purple */
+ nc_setHighlight((nc_highlight & attrmask) + nc_purple);
+ break;
+ }
+ }
+ else
+ {
+ len = 0;
+ do
+ {
+ NC_SCREEN(YPOS*TextW+XPOS+len).i = nc_highlight + str[len];
+ len++;
+ } while (str[len] >= ' ' && str[len] < 128 &&
+ XPOS + len < nc_curWindow->width);
+ XDrawImageString(m_display, nc_window, nc_gc,
+ nc_curWindow->gleft+nc_fontwidth*XPOS,
+ nc_curWindow->gtop+nc_fontheight*YPOS + ascent,
+ (char *)str, len);
+ if (nc_highlight & nc_under)
+ {
+ XDrawLine(m_display, nc_window, nc_gc,
+ nc_curWindow->gleft+XPOS*nc_fontwidth,
+ nc_curWindow->top+YPOS*nc_fontheight + ascent + 1,
+ nc_curWindow->gleft+XPOS*nc_fontwidth + len*nc_fontwidth-1,
+ nc_curWindow->top+YPOS*nc_fontheight + ascent + 1);
+ }
+ str += len - 1;
+ XPOS += len;
+ if (XPOS == nc_curWindow->width) {
+ XPOS = 0;
+ if (++YPOS == nc_curWindow->height) {
+ nc_scrollUp();
+ YPOS--;
+ }
+ }
+ }
}
- }
- }
- }
- XFlush(m_display);
- CheckRefresh();
-/* fprintf(stderr, "nc_writeStr exits, cursor at (%d,%d)\n", XPOS, YPOS); */
+ XFlush(m_display);
+ CheckRefresh();
+ /* fprintf(stderr, "nc_writeStr exits, cursor at (%d,%d)\n", XPOS, YPOS); */
}
static void Handle_Graphics_Exposures()
{
- XEvent event;
- XGraphicsExposeEvent *gx;
-
- while (1) {
- XWindowEvent(m_display, nc_window, ExposureMask, &event);
- if (event.type == NoExpose)
- return;
- if (event.type == GraphicsExpose) {
- gx = &(event.xgraphicsexpose);
- while (event.type == GraphicsExpose) {
- refresh_area(gx->x / nc_fontwidth,
- gx->y / nc_fontheight,
- (gx->x + gx->width) / nc_fontwidth,
- (gx->y + gx->height) / nc_fontheight);
- if (gx->count)
- XWindowEvent(m_display, nc_window, ExposureMask, &event);
- else
- return;
- }
- } else {
- XPutBackEvent(m_display, &event);
- return;
- }
- }
+ XEvent event;
+ XGraphicsExposeEvent *gx;
+
+ while (1)
+ {
+ XWindowEvent(m_display, nc_window, ExposureMask, &event);
+ if (event.type == NoExpose)
+ return;
+ if (event.type == GraphicsExpose)
+ {
+ gx = &(event.xgraphicsexpose);
+ while (event.type == GraphicsExpose)
+ {
+ refresh_area(gx->x / nc_fontwidth,
+ gx->y / nc_fontheight,
+ (gx->x + gx->width) / nc_fontwidth,
+ (gx->y + gx->height) / nc_fontheight);
+ if (gx->count)
+ XWindowEvent(m_display, nc_window, ExposureMask, &event);
+ else
+ return;
+ }
+ }
+ else
+ {
+ XPutBackEvent(m_display, &event);
+ return;
+ }
+ }
}
void nc_scrollUp()
{
- int i;
-
- if (! nc_text_in_window) {
- return;
- }
- if (nc_initialized) {
-/* fprintf(stdout, "nc_scrollUp()\n");
- getchar(); */
- XCopyArea(m_display, nc_window, nc_window, nc_gc,
- nc_curWindow->gleft, nc_curWindow->gtop+nc_fontheight,
- nc_curWindow->gwidth, nc_curWindow->gheight-nc_fontheight,
- nc_curWindow->gleft, nc_curWindow->gtop);
- XClearArea(m_display, nc_window, nc_curWindow->gleft,
- nc_curWindow->gheight-nc_fontheight,
- nc_curWindow->gwidth, nc_fontheight, False);
- memcpy((char *) nc_screen, (char *) &NC_SCREEN(TextW), TextW*(TextH-1)*2);
- for (i = TextW*(TextH-1); i < TextW * TextH; i++)
- NC_SCREEN(i).i = 32;
- Handle_Graphics_Exposures();
-/* getchar();
- XNoOp(m_display);
- XFlush(m_display); */
- CheckRefresh();
- }
+ int i;
+
+ if (! nc_text_in_window)
+ {
+ return;
+ }
+ if (nc_initialized)
+ {
+ /* fprintf(stdout, "nc_scrollUp()\n");
+ getchar(); */
+ XCopyArea(m_display, nc_window, nc_window, nc_gc,
+ nc_curWindow->gleft, nc_curWindow->gtop+nc_fontheight,
+ nc_curWindow->gwidth, nc_curWindow->gheight-nc_fontheight,
+ nc_curWindow->gleft, nc_curWindow->gtop);
+ XClearArea(m_display, nc_window, nc_curWindow->gleft,
+ nc_curWindow->gheight-nc_fontheight,
+ nc_curWindow->gwidth, nc_fontheight, False);
+ memcpy((char *) nc_screen, (char *) &NC_SCREEN(TextW), TextW*(TextH-1)*2);
+ for (i = TextW*(TextH-1); i < TextW * TextH; i++)
+ NC_SCREEN(i).i = 32;
+ Handle_Graphics_Exposures();
+ /* getchar();
+ XNoOp(m_display);
+ XFlush(m_display); */
+ CheckRefresh();
+ }
}
-void nc_clearXY(x, y, dx, dy)
-int x, y, dx, dy;
+void nc_clearXY(int x, int y, int dx, int dy)
{
- int i, j;
-
- if (! nc_text_in_window) {
- return;
- }
- if (nc_initialized) {
-/* fprintf(stdout, "nc_clearXY(%d, %d, %d, %d)\n", x, y, dx, dy);
- getchar(); */
- if ((dx > 0) && (dy > 0)) {
- XClearArea(m_display, nc_window, nc_curWindow->gleft+nc_fontwidth*x,
- nc_curWindow->gtop+nc_fontheight*y,
- nc_fontwidth*dx, nc_fontheight*dy, False);
- XFlush(m_display);
- for (j = y; j < y + dy; j++)
- for (i = x; i < x + dx; i++)
- NC_SCREEN(j * TextW + i).i = 32;
- }
-/* getchar();
- XNoOp(m_display);
- XFlush(m_display); */
- CheckRefresh();
- }
+ int i, j;
+
+ if (! nc_text_in_window)
+ {
+ return;
+ }
+ if (nc_initialized)
+ {
+ /* fprintf(stdout, "nc_clearXY(%d, %d, %d, %d)\n", x, y, dx, dy);
+ getchar(); */
+ if ((dx > 0) && (dy > 0))
+ {
+ XClearArea(m_display, nc_window, nc_curWindow->gleft+nc_fontwidth*x,
+ nc_curWindow->gtop+nc_fontheight*y,
+ nc_fontwidth*dx, nc_fontheight*dy, False);
+ XFlush(m_display);
+ for (j = y; j < y + dy; j++)
+ for (i = x; i < x + dx; i++)
+ NC_SCREEN(j * TextW + i).i = 32;
+ }
+ /* getchar();
+ XNoOp(m_display);
+ XFlush(m_display); */
+ CheckRefresh();
+ }
}
-void nc_getXY(x, y)
-long *x, *y;
+void nc_getXY(long *x, long *y)
{
- if (! nc_text_in_window) {
- *x = *y = 0;
- return;
- }
- if (! nc_initialized)
- nc_initialize();
- *x = (long) XPOS;
- *y = (long) YPOS;
- CheckRefresh();
+ if (! nc_text_in_window)
+ {
+ *x = *y = 0;
+ return;
+ }
+ if (! nc_initialized)
+ nc_initialize();
+ *x = (long) XPOS;
+ *y = (long) YPOS;
+ CheckRefresh();
}
-void nc_gotoXY(x, y)
-int x, y;
+void nc_gotoXY(int x, int y)
{
-/* fprintf(stderr, "nc_gotoXY(%d,%d)\n", x, y); */
- if (! nc_text_in_window) {
- return;
- }
- if (! nc_initialized)
- nc_initialize();
- XPOS = x;
- YPOS = y;
- CheckRefresh();
+ /* fprintf(stderr, "nc_gotoXY(%d,%d)\n", x, y); */
+ if (! nc_text_in_window)
+ {
+ return;
+ }
+ if (! nc_initialized)
+ nc_initialize();
+ XPOS = x;
+ YPOS = y;
+ CheckRefresh();
}
-static void fix_string(str, buf)
-unsigned char *str, *buf;
+static void fix_string(unsigned char *str, unsigned char *buf)
{
- unsigned char *cp1, *cp2;
-
- cp2 = buf;
- for (cp1 = str; *cp1; cp1++) {
- switch (*cp1) {
- case 1: /* Cursor home */
- case 8: /* Cursor left */
- case 9: /* Clear to EOL */
- case 11: /* Clear to end of screen */
- case 12: /* Clear screen */
- case 28: /* Cursor right */
- case 31: /* Cursor up */
- break;
- case 10: /* Cursor down */
- case 13: /* Carriage Return */
- default:
- if (*cp1 <= 127)
- *cp2++ = *cp1;
- }
- }
- *cp2 = '\0';
+ unsigned char *cp1, *cp2;
+
+ cp2 = buf;
+ for (cp1 = str; *cp1; cp1++)
+ {
+ switch (*cp1)
+ {
+ case 1: /* Cursor home */
+ case 8: /* Cursor left */
+ case 9: /* Clear to EOL */
+ case 11: /* Clear to end of screen */
+ case 12: /* Clear screen */
+ case 28: /* Cursor right */
+ case 31: /* Cursor up */
+ break;
+ case 10: /* Cursor down */
+ case 13: /* Carriage Return */
+ default:
+ if (*cp1 <= 127)
+ *cp2++ = *cp1;
+ }
+ }
+ *cp2 = '\0';
}
void nc_printf(char * fmt, ...)
-
{
- va_list args;
- char fmt2[1024];
- char printbuffer[2000], printbuffer2[2000];
- char *p1, *p2;
-
-/* fprintf(stderr, "nc_printf() called, cursor at (%d,%d)\n", XPOS, YPOS); */
-
- va_start(args, fmt);
-
- if (! nc_text_in_window) {
- fix_string((unsigned char *) fmt, (unsigned char *) fmt2);
- vprintf(fmt2, args);
- va_end(args);
- return;
- }
- vsprintf(printbuffer, fmt, args);
- va_end(args);
- for (p1 = printbuffer, p2 = printbuffer2; *p1 != '\0'; p1++, p2++)
- if ((*p2 = *p1) == '\n')
- *(++p2) = '\015';
- *p2 = '\0';
-
- nc_writeStr(XPOS, YPOS, printbuffer2);
+ va_list args;
+ char fmt2[1024];
+ char printbuffer[2000], printbuffer2[2000];
+ char *p1, *p2;
-}
+ /* fprintf(stderr, "nc_printf() called, cursor at (%d,%d)\n", XPOS, YPOS); */
+ va_start(args, fmt);
+
+ if (! nc_text_in_window)
+ {
+ fix_string((unsigned char *) fmt, (unsigned char *) fmt2);
+ vprintf(fmt2, args);
+ va_end(args);
+ return;
+ }
+ vsprintf(printbuffer, fmt, args);
+ va_end(args);
+ for (p1 = printbuffer, p2 = printbuffer2; *p1 != '\0'; p1++, p2++)
+ if ((*p2 = *p1) == '\n')
+ *(++p2) = '\015';
+ *p2 = '\0';
+
+ nc_writeStr(XPOS, YPOS, printbuffer2);
+}
void zfprintf(FILE * outfile, char * fmt, ...)
{
- va_list args;
- char fmt2[1024];
- char printbuffer[2000], printbuffer2[2000];
- char *p1, *p2;
+ va_list args;
+ char fmt2[1024];
+ char printbuffer[2000], printbuffer2[2000];
+ char *p1, *p2;
- va_start(args, fmt);
+ va_start(args, fmt);
}
void nc_fprintf(FILE * outfile, char * fmt, ...)
{
- va_list args;
- char fmt2[1024];
- char printbuffer[2000], printbuffer2[2000];
- char *p1, *p2;
-
- va_start(args, fmt);
-
- if (nc_text_in_window && ((outfile == stdout)/* || (outfile == stderr) */)) {
- vsprintf(printbuffer, fmt, args);
- va_end(args);
- for (p1 = printbuffer, p2 = printbuffer2; *p1 != '\0'; p1++, p2++)
- if ((*p2 = *p1) == '\n')
- *(++p2) = '\015';
- *p2 = '\0';
-
- nc_writeStr(XPOS, YPOS, printbuffer2);
- } else {
- fix_string((unsigned char *) fmt, (unsigned char *) fmt2);
- vfprintf(outfile, fmt2, args);
- va_end(args);
- }
+ va_list args;
+ char fmt2[1024];
+ char printbuffer[2000], printbuffer2[2000];
+ char *p1, *p2;
+
+ va_start(args, fmt);
+
+ if (nc_text_in_window && ((outfile == stdout)/* || (outfile == stderr) */)) {
+ vsprintf(printbuffer, fmt, args);
+ va_end(args);
+ for (p1 = printbuffer, p2 = printbuffer2; *p1 != '\0'; p1++, p2++)
+ if ((*p2 = *p1) == '\n')
+ *(++p2) = '\015';
+ *p2 = '\0';
+
+ nc_writeStr(XPOS, YPOS, printbuffer2);
+ } else {
+ fix_string((unsigned char *) fmt, (unsigned char *) fmt2);
+ vfprintf(outfile, fmt2, args);
+ va_end(args);
+ }
}
void nc_puts(char * s)
{
- char str2[1024];
+ char str2[1024];
-/* fprintf(stderr, "nc_puts() called, cursor at (%d,%d)\n", XPOS, YPOS); */
- if (! nc_text_in_window) {
- fix_string((unsigned char *) s, (unsigned char *) str2);
+ /* fprintf(stderr, "nc_puts() called, cursor at (%d,%d)\n", XPOS, YPOS); */
+ if (! nc_text_in_window) {
+ fix_string((unsigned char *) s, (unsigned char *) str2);
#undef puts
- puts(str2);
+ puts(str2);
#define puts nc_puts
- return;
- }
- nc_writeStr(XPOS, YPOS, s);
- nc_writeStr(XPOS, YPOS, "\n\015");
-/* fprintf(stderr, "nc_puts() exits, cursor at (%d,%d)\n", XPOS, YPOS); */
+ return;
+ }
+ nc_writeStr(XPOS, YPOS, s);
+ nc_writeStr(XPOS, YPOS, "\n\015");
+ /* fprintf(stderr, "nc_puts() exits, cursor at (%d,%d)\n", XPOS, YPOS); */
}
void nc_fputs(char * s, FILE *outfile)
{
- char printbuffer[2000];
- char *p;
- char str2[1024];
-
- if (nc_text_in_window && ((outfile == stdout) || (outfile == stderr))) {
- for (p = printbuffer; *s != '\0'; s++, p++)
- if ((*p = *s) == '\n')
- *(++p) = '\015';
- *p = '\0';
- nc_writeStr(XPOS, YPOS, printbuffer);
- } else {
- fix_string((unsigned char *) s, (unsigned char *) str2);
+ char printbuffer[2000];
+ char *p;
+ char str2[1024];
+
+ if (nc_text_in_window && ((outfile == stdout) || (outfile == stderr))) {
+ for (p = printbuffer; *s != '\0'; s++, p++)
+ if ((*p = *s) == '\n')
+ *(++p) = '\015';
+ *p = '\0';
+ nc_writeStr(XPOS, YPOS, printbuffer);
+ } else {
+ fix_string((unsigned char *) s, (unsigned char *) str2);
#undef fputs
- fputs(str2, outfile);
+ fputs(str2, outfile);
#define fputs nc_fputs
- }
+ }
}
void nc_putchar(uchar c)
{
- char buffer[2];
-
- if (! nc_text_in_window) {
- if (c <= 127)
- nc_putc(c, stdout);
- return;
- }
-/* fprintf(stderr, "nc_putchar() called, cursor at (%d,%d)\n", XPOS, YPOS); */
- if (c == '\n')
- nc_writeStr(XPOS, YPOS, "\015\n");
- else {
- buffer[0] = c;
- buffer[1] = '\0';
- nc_writeStr(XPOS, YPOS, buffer);
- }
-/* fprintf(stderr, "nc_putchar() exits, cursor at (%d,%d)\n", XPOS, YPOS); */
+ char buffer[2];
+
+ if (! nc_text_in_window) {
+ if (c <= 127)
+ nc_putc(c, stdout);
+ return;
+ }
+ /* fprintf(stderr, "nc_putchar() called, cursor at (%d,%d)\n", XPOS, YPOS); */
+ if (c == '\n')
+ nc_writeStr(XPOS, YPOS, "\015\n");
+ else {
+ buffer[0] = c;
+ buffer[1] = '\0';
+ nc_writeStr(XPOS, YPOS, buffer);
+ }
+ /* fprintf(stderr, "nc_putchar() exits, cursor at (%d,%d)\n", XPOS, YPOS); */
}
void nc_putc(uchar c, FILE *outfile)
{
- uchar buffer[2];
+ uchar buffer[2];
- if (nc_text_in_window && ((outfile == stdout) || (outfile == stderr)))
- nc_putchar(c);
- else if (c <= 127)
- fputc(c, outfile);
+ if (nc_text_in_window && ((outfile == stdout) || (outfile == stderr)))
+ nc_putchar(c);
+ else if (c <= 127)
+ fputc(c, outfile);
}
void nc_togglecursor()
{
- if (! nc_initialized)
- return;
- cursor_flag = ! cursor_flag;
- if (BlackAndWhite)
- XSetForeground(m_display, nc_cursorgc,
- WhitePixel(m_display, screennum)
- ^ m_colors[0][m_black].pixel);
- else
- XSetForeground(m_display, nc_cursorgc,
- m_colors[0][colortrans[(nc_highlight & colormask)
- /4096]].pixel ^ m_colors[0][m_black].pixel);
- XFillRectangle(m_display, nc_window, nc_cursorgc,
- nc_curWindow->gleft+nc_fontwidth*XPOS,
- nc_curWindow->gtop+nc_fontheight*YPOS,
- nc_fontwidth, nc_fontheight);
+ if (! nc_initialized)
+ return;
+ cursor_flag = ! cursor_flag;
+ if (BlackAndWhite)
+ XSetForeground(m_display, nc_cursorgc,
+ WhitePixel(m_display, screennum)
+ ^ m_colors[0][m_black].pixel);
+ else
+ XSetForeground(m_display, nc_cursorgc,
+ m_colors[0][colortrans[(nc_highlight & colormask)
+ /4096]].pixel ^ m_colors[0][m_black].pixel);
+ XFillRectangle(m_display, nc_window, nc_cursorgc,
+ nc_curWindow->gleft+nc_fontwidth*XPOS,
+ nc_curWindow->gtop+nc_fontheight*YPOS,
+ nc_fontwidth, nc_fontheight);
}
void nc_cursor_on()
{
- if (!cursor_flag)
- nc_togglecursor();
+ if (!cursor_flag)
+ nc_togglecursor();
}
void nc_cursor_off()
{
- if (cursor_flag)
- nc_togglecursor();
+ if (cursor_flag)
+ nc_togglecursor();
}
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
char *nc_gets(buf)
-char *buf;
+ char *buf;
{
- int pos;
- uchar c;
+ int pos;
+ uchar c;
- if (! nc_text_in_window) {
+ if (! nc_text_in_window) {
#undef gets
- return(gets(buf));
+ return(gets(buf));
#define gets nc_gets
- }
- if (! nc_initialized)
- nc_initialize();
- pos = 0;
- for (;;) {
-/* fprintf(stderr, "Text cursor at (%d, %d)\n", XPOS, YPOS); */
- c = m_inkey();
- if (c == '\10') {
- if (pos > 0) {
- pos--;
- nc_writeStr(XPOS, YPOS, "\b \b");
- }
- } else if (c == 'U' - '@') {
- while (pos > 0) {
- pos--;
- nc_writeStr(XPOS, YPOS, "\b \b");
- }
- } else if (c == '\15') {
- XPOS = 0;
- if (++YPOS >= nc_curWindow->height) {
- YPOS--;
- nc_scrollUp();
- }
- buf[pos] = '\0';
- return(buf);
- } else if (c >= ' ' && c < 127) {
- buf[pos++] = c;
- nc_putChar(XPOS, YPOS, c);
- if (++XPOS == nc_curWindow->width) {
- XPOS = 0;
- if (++YPOS == nc_curWindow->height) {
- nc_scrollUp();
- YPOS--;
}
- }
- }
- }
+ if (! nc_initialized)
+ nc_initialize();
+ pos = 0;
+ for (;;) {
+ /* fprintf(stderr, "Text cursor at (%d, %d)\n", XPOS, YPOS); */
+ c = m_inkey();
+ if (c == '\10') {
+ if (pos > 0) {
+ pos--;
+ nc_writeStr(XPOS, YPOS, "\b \b");
+ }
+ } else if (c == 'U' - '@') {
+ while (pos > 0) {
+ pos--;
+ nc_writeStr(XPOS, YPOS, "\b \b");
+ }
+ } else if (c == '\15') {
+ XPOS = 0;
+ if (++YPOS >= nc_curWindow->height) {
+ YPOS--;
+ nc_scrollUp();
+ }
+ buf[pos] = '\0';
+ return(buf);
+ } else if (c >= ' ' && c < 127) {
+ buf[pos++] = c;
+ nc_putChar(XPOS, YPOS, c);
+ if (++XPOS == nc_curWindow->width) {
+ XPOS = 0;
+ if (++YPOS == nc_curWindow->height) {
+ nc_scrollUp();
+ YPOS--;
+ }
+ }
+ }
+ }
}
#pragma clang diagnostic pop
char *nc_fgets(s, n, stream)
-char *s;
-int n;
-FILE *stream;
+ char *s;
+ int n;
+ FILE *stream;
{
- if (nc_text_in_window && (stream == stdin))
- return(nc_gets(s));
- else
+ if (nc_text_in_window && (stream == stdin))
+ return(nc_gets(s));
+ else
#undef fgets
- return(fgets(s, n, stream));
+ return(fgets(s, n, stream));
#define fgets nc_fgets
}
@@ -1075,10 +1118,10 @@ FILE *stream;
short nc_gType()
{
- return nc_g300;
+ return nc_g300;
}
int nc_alphashared()
{
- return false;
+ return false;
}
--
GitLab