File kterm-6.2.0-nonvoid.patch of Package kterm
Index: kterm-6.2.0/button.c
===================================================================
--- kterm-6.2.0.orig/button.c
+++ kterm-6.2.0/button.c
@@ -61,20 +61,20 @@ extern void DoSecureKeyboard();
extern char *xterm_name;
-static void PointToRowCol();
-static void SelectionReceived();
-static void TrackDown();
-static void ComputeSelect();
-static void EditorButton();
-static void ExtendExtend();
-static void ReHiliteText();
-static void SelectSet();
-static void StartSelect();
-static int Length();
+static void PointToRowCol(y, x, r, c);
+static void SelectionReceived(w, client_data, selection, type, value, length, format);
+static void TrackDown(event);
+static void ComputeSelect(startRow, startCol, endRow, endCol, extend);
+static void EditorButton(event);
+static void ExtendExtend(row, col);
+static void ReHiliteText(frow, fcol, trow, tcol);
+static void SelectSet(w, event, params, num_params);
+static void StartSelect(row, col);
+static int Length(screen, row, scol, ecol);
#ifdef KTERM
-static Ichr *SaveText();
+static Ichr *SaveText(screen, row, scol, ecol, lp, eol);
#else /* !KTERM */
-static char *SaveText();
+static char *SaveText(screen, row, scol, ecol, lp, eol);
#endif /* !KTERM */
extern XtermWidget term;
@@ -777,10 +777,7 @@ Cardinal *num_params; /* unused */
}
-ScrollSelection(screen, amount)
-register TScreen* screen;
-register int amount;
-{
+int ScrollSelection(register TScreen* screen, register int amount) {
register int minrow = -screen->savedlines - screen->topline;
register int maxrow = screen->max_row - screen->topline;
register int maxcol = screen->max_col;
@@ -808,14 +805,12 @@ register int amount;
screen->startHCoord = Coordinate (screen->startHRow, screen->startHCol);
screen->endHCoord = Coordinate (screen->endHRow, screen->endHCol);
+ return 0;
}
/*ARGSUSED*/
-ResizeSelection (screen, rows, cols)
- TScreen *screen;
- int rows, cols;
-{
+int ResizeSelection (TScreen* screen, int rows, int cols) {
rows--; /* decr to get 0-max */
cols--;
@@ -830,6 +825,7 @@ ResizeSelection (screen, rows, cols)
if (endRCol > cols) endRCol = cols;
if (endSCol > cols) endSCol = cols;
if (rawCol > cols) rawCol = cols;
+ return 0;
}
static void
@@ -842,7 +838,7 @@ PointToRowCol(y, x, r, c)
maximum value. */
{
register TScreen *screen = &term->screen;
- register row, col;
+ register int row, col;
row = (y - screen->border) / FontHeight(screen);
if(row < firstValidRow)
@@ -1254,10 +1250,8 @@ register Bchr *ptr;
#endif /* KTERM && KTERM_MBCC */
-TrackText(frow, fcol, trow, tcol)
- register int frow, fcol, trow, tcol;
+int TrackText(register int frow, register int fcol, register int trow, register int tcol) {
/* Guaranteed (frow, fcol) <= (trow, tcol) */
-{
register int from, to;
register TScreen *screen = &term->screen;
int old_startrow, old_startcol, old_endrow, old_endcol;
@@ -1267,7 +1261,7 @@ TrackText(frow, fcol, trow, tcol)
old_endrow = screen->endHRow;
old_endcol = screen->endHCol;
if (frow == old_startrow && fcol == old_startcol &&
- trow == old_endrow && tcol == old_endcol) return;
+ trow == old_endrow && tcol == old_endcol) return 0;
screen->startHRow = frow;
screen->startHCol = fcol;
screen->endHRow = trow;
@@ -1296,6 +1290,7 @@ TrackText(frow, fcol, trow, tcol)
}
screen->startHCoord = from;
screen->endHCoord = to;
+ return 0;
}
static void
@@ -1688,10 +1683,7 @@ static void _OwnSelection(termw, selecti
TrackText(0, 0, 0, 0);
}
-/* void */
-DisownSelection(termw)
- register XtermWidget termw;
-{
+int DisownSelection(register XtermWidget termw) {
Atom* atoms = termw->screen.selection_atoms;
Cardinal count = termw->screen.selection_count;
int i;
@@ -1716,6 +1708,7 @@ DisownSelection(termw)
termw->screen.selection_count = 0;
termw->screen.startHRow = termw->screen.startHCol = 0;
termw->screen.endHRow = termw->screen.endHCol = 0;
+ return 0;
}
Index: kterm-6.2.0/charproc.c
===================================================================
--- kterm-6.2.0.orig/charproc.c
+++ kterm-6.2.0/charproc.c
@@ -983,9 +983,7 @@ static WidgetClassRec xtermClassRec = {
WidgetClass xtermWidgetClass = (WidgetClass)&xtermClassRec;
#ifdef KTERM
-doSS(gset)
-short gset;
-{
+int doSS(short gset) {
register Char c, min, max, print_min, print_max;
register Char *cp = bptr;
@@ -1040,11 +1038,10 @@ short gset;
donottext:
bcnt -= cp - bptr;
bptr = cp;
+ return 0;
}
-doLS(gset)
-short gset;
-{
+int doLS(short gset) {
register Char c, min, max, print_min, print_max;
register Char *cp = bptr;
register int cnt = bcnt > TEXT_BUF_SIZE ? TEXT_BUF_SIZE : bcnt;
@@ -1139,11 +1136,11 @@ short gset;
}
bcnt -= cp - bptr;
bptr = cp;
+ return 0;
}
# ifdef KTERM_KANJIMODE
-doSJIS()
-{
+int doSJIS() {
Char dotextbuf[TEXT_BUF_SIZE];
register Char c1, c2;
register Char *cp = bptr;
@@ -1191,6 +1188,7 @@ doSJIS()
dotext(&term->screen, term->flags, GSET_KANJI, dotextbuf, dcp);
bcnt -= cp - bptr;
bptr = cp;
+ return 0;
}
# endif /* KTERM_KANJIMODE */
#endif /* KTERM */
@@ -2009,7 +2007,7 @@ static void VTparse()
}
}
-static finput()
+static int finput()
{
return(doinput());
}
@@ -2024,11 +2022,7 @@ static char *v_bufend; /* end of physic
/* Write data to the pty as typed by the user, pasted with the mouse,
or generated by us in response to a query ESC sequence. */
-v_write(f, d, len)
- int f;
- char *d;
- int len;
-{
+int v_write(int f, char* d, int len) {
int riten;
int c = len;
@@ -2171,7 +2165,7 @@ static fd_set select_mask;
static fd_set write_mask;
static int pty_read_bytes;
-in_put()
+int in_put()
{
register TScreen *screen = &term->screen;
register int i;
@@ -2523,7 +2517,7 @@ WriteText(screen, str, len, flags)
/*
* process ANSI modes set, reset
*/
-ansi_modes(termw, func)
+int ansi_modes(termw, func)
XtermWidget termw;
void (*func)();
{
@@ -2541,12 +2535,13 @@ ansi_modes(termw, func)
break;
}
}
+ return 0;
}
/*
* process DEC private modes set, reset
*/
-dpmodes(termw, func)
+int dpmodes(termw, func)
XtermWidget termw;
void (*func)();
{
@@ -2723,14 +2718,13 @@ dpmodes(termw, func)
break;
}
}
+ return 0;
}
/*
* process xterm private modes save
*/
-savemodes(termw)
- XtermWidget termw;
-{
+int savemodes(XtermWidget termw) {
register TScreen *screen = &termw->screen;
register int i;
@@ -2794,14 +2788,13 @@ savemodes(termw)
break;
}
}
+ return 0;
}
/*
* process xterm private modes restore
*/
-restoremodes(termw)
- XtermWidget termw;
-{
+int restoremodes(XtermWidget termw) {
register TScreen *screen = &termw->screen;
register int i, j;
@@ -2936,6 +2929,7 @@ restoremodes(termw)
break;
}
}
+ return 0;
}
/*
@@ -2958,10 +2952,7 @@ static void bitclr(p, mask)
*p &= ~mask;
}
-unparseseq(ap, fd)
- register ANSI *ap;
- int fd;
-{
+int unparseseq(register ANSI* ap, int fd) {
register int c;
register int i;
register int inters;
@@ -2989,26 +2980,22 @@ unparseseq(ap, fd)
}
unparseputc((char) ap->a_final, fd);
}
+ return 0;
}
-unparseputn(n, fd)
-unsigned int n;
-int fd;
-{
+int unparseputn(unsigned int n, int fd) {
unsigned int q;
q = n/10;
if (q != 0)
unparseputn(q, fd);
unparseputc((char) ('0' + (n%10)), fd);
+ return 0;
}
-unparseputc(c, fd)
-char c;
-int fd;
-{
+int unparseputc(char c, int fd) {
char buf[2];
- register i = 1;
+ register int i = 1;
extern XtermWidget term;
if((buf[0] = c) == '\r' && (term->flags & LINEFEED)) {
@@ -3016,15 +3003,14 @@ int fd;
i++;
}
v_write(fd, buf, i);
+ return 0;
}
-unparsefputs (s, fd)
- register char *s;
- int fd;
-{
+int unparsefputs (register char* s, int fd) {
if (s) {
while (*s) unparseputc (*s++, fd);
}
+ return 0;
}
static void SwitchBufs();
@@ -3092,9 +3078,7 @@ SwitchBufs(screen)
/* swap buffer line pointers between alt and regular screens */
-SwitchBufPtrs(screen)
- register TScreen *screen;
-{
+int SwitchBufPtrs(register TScreen* screen) {
register int rows = screen->max_row + 1;
#ifdef KTERM
Bchr *savebuf [MAX_ROWS];
@@ -3115,10 +3099,10 @@ SwitchBufPtrs(screen)
2 * sizeof(char *) * rows);
memmove( (char *)screen->altbuf, (char *)save, 2 * sizeof(char *) * rows);
#endif /* !KTERM */
+ return 0;
}
-VTRun()
-{
+int VTRun() {
register TScreen *screen = &term->screen;
register int i;
@@ -3158,6 +3142,7 @@ VTRun()
VTparse();
HideCursor();
screen->cursor_set = OFF;
+ return 0;
}
/*ARGSUSED*/
@@ -3920,8 +3905,7 @@ static Boolean VTSetValues (cur, request
/*
* Shows cursor at new cursor position in screen.
*/
-ShowCursor()
-{
+int ShowCursor() {
register TScreen *screen = &term->screen;
register int x, y, flags;
#ifdef KTERM
@@ -3932,7 +3916,7 @@ ShowCursor()
#endif /* !KTERM */
Boolean in_selection;
- if (eventMode != NORMAL) return;
+ if (eventMode != NORMAL) return 0;
#ifdef STATUSLINE
if (screen->cur_row - screen->topline > screen->max_row
@@ -3940,7 +3924,7 @@ ShowCursor()
#else /* !STATUSLINE */
if (screen->cur_row - screen->topline > screen->max_row)
#endif /* !STATUSLINE */
- return;
+ return 0;
#ifdef KTERM
gset = screen->buf[y = screen->cursor_row = screen->cur_row]
[x = screen->cursor_col = screen->cur_col].gset;
@@ -4039,13 +4023,13 @@ ShowCursor()
#ifdef KTERM_KINPUT2
Kinput2SendSpot();
#endif /* KTERM_KINPUT2 */
+ return 0;
}
/*
* hide cursor at previous cursor position in screen.
*/
-HideCursor()
-{
+int HideCursor() {
register TScreen *screen = &term->screen;
#ifndef KTERM
GC currentGC;
@@ -4065,7 +4049,7 @@ HideCursor()
#else /* !STATUSLINE */
if(screen->cursor_row - screen->topline > screen->max_row)
#endif /* !STATUSLINE */
- return;
+ return 0;
#ifdef KTERM
gset = screen->buf[y = screen->cursor_row][x = screen->cursor_col].gset;
if (gset == MBC2) {
@@ -4132,11 +4116,10 @@ HideCursor()
x, y+1, x + FontWidth(screen), y+1);
#endif /* !KTERM */
screen->cursor_state = OFF;
+ return 0;
}
-VTReset(full)
- Boolean full;
-{
+int VTReset(Boolean full) {
register TScreen *screen = &term->screen;
/* reset scrolling region */
@@ -4213,13 +4196,12 @@ VTReset(full)
CursorSet(screen, 0, 0, term->flags);
}
longjmp(vtjmpbuf, 1); /* force ground state in parser */
+ return 0;
}
#ifdef STATUSLINE
-ToStatus(col)
-int col;
-{
+int ToStatus(int col) {
register TScreen *screen = &term->screen;
if (screen->cursor_state)
@@ -4234,24 +4216,24 @@ int col;
screen->cur_row = screen->max_row + 1;
}
screen->cur_col = col;
+ return 0;
}
-FromStatus()
-{
+int FromStatus() {
register TScreen *screen = &term->screen;
if (!screen->instatus)
- return;
+ return 0;
screen->instatus = FALSE;
CursorRestore(term, &screen->statussc);
+ return 0;
}
-ShowStatus()
-{
+int ShowStatus() {
register TScreen *screen = &term->screen;
if (screen->statusheight)
- return;
+ return 0;
screen->statusheight = FontHeight(screen) + 2;
DoResizeScreen(term);
/* patch for ScrollBarRight cyamauch@phyas.aichi-edu.ac.jp */
@@ -4266,17 +4248,17 @@ ShowStatus()
Height(screen) + screen->border * 2 + screen->statusheight);
}
}
+ return 0;
}
-HideStatus()
-{
+int HideStatus() {
register TScreen *screen = &term->screen;
# ifndef KTERM
register int i, j;
# endif /* !KTERM */
if (!screen->statusheight)
- return;
+ return 0;
if (screen->instatus)
FromStatus();
screen->statusheight = 0;
@@ -4301,10 +4283,10 @@ HideStatus()
Height(screen) + screen->border * 2);
}
}
+ return 0;
}
-EraseStatus()
-{
+int EraseStatus() {
register TScreen *screen = &term->screen;
register int j, pix;
# ifdef KTERM
@@ -4314,7 +4296,7 @@ EraseStatus()
# endif /* !KTERM */
if (!screen->statusheight)
- return;
+ return 0;
# ifdef KTERM
bzero(screen->buf[screen->max_row + 1],
j = sizeof(Bchr) * (screen->max_col+1));
@@ -4329,11 +4311,10 @@ EraseStatus()
Height(screen) + screen->border * 2 + 1,
Width(screen),
screen->statusheight - 2);
+ return 0;
}
-StatusBox(screen)
-register TScreen *screen;
-{
+int StatusBox(register TScreen* screen) {
# ifdef KTERM
int fnum = F_ISO8859_1; /* *GC */
# endif /* KTERM */
@@ -4343,6 +4324,7 @@ register TScreen *screen;
Height(screen) + screen->border * 2,
Width(screen) + screen->border * 2 - 1,
screen->statusheight - 1);
+ return 0;
}
#endif /* STATUSLINE */
@@ -5177,9 +5159,7 @@ update_font_info (screen, doresize)
#endif /* KTERM */
}
-set_vt_box (screen)
- TScreen *screen;
-{
+int set_vt_box (TScreen* screen) {
XPoint *vp;
#ifdef KTERM
@@ -5204,13 +5184,12 @@ set_vt_box (screen)
vp->y = -(FontHeight(screen) - 1);
screen->box = VTbox;
#endif /* !KTERM */
+ return 0;
}
#ifdef KTERM
-set_vt_graphics (screen)
- TScreen *screen;
-{
+int set_vt_graphics (TScreen *screen) {
static GC bmgc;
static Pixmap gray;
static Pixmap vtgraphics[256]; /* Bitmaps */
@@ -5325,18 +5304,16 @@ set_vt_graphics (screen)
XDrawLine(dpy, vtgraphics['~'], bmgc, w2, h2-1, w2, h2+1);
screen->graphics = vtgraphics;
+ return 0;
}
#endif /* KTERM */
#ifdef KTERM
-set_cursor_gcs (screen, fnum)
- int fnum;
+int set_cursor_gcs (TScreen* screen, int fnum) {
#else /* !KTERM */
-set_cursor_gcs (screen)
+int set_cursor_gcs (TScreen* screen) {
#endif /* !KTERM */
- TScreen *screen;
-{
XGCValues xgcv;
unsigned long mask;
unsigned long cc = screen->cursorcolor;
@@ -5399,6 +5376,7 @@ set_cursor_gcs (screen)
screen->cursorGC = new_cursorGC;
screen->reversecursorGC = new_reversecursorGC;
screen->cursoroutlineGC = new_cursoroutlineGC;
+ return 0;
}
#ifdef KTERM
Index: kterm-6.2.0/cursor.c
===================================================================
--- kterm-6.2.0.orig/cursor.c
+++ kterm-6.2.0/cursor.c
@@ -30,9 +30,7 @@
#include "ptyx.h" /* also gets Xlib.h */
-static void _CheckSelection(screen)
-register TScreen *screen;
-{
+static void _CheckSelection(register TScreen* screen) {
#ifdef ENBUG /* kagotani */
extern XtermWidget term; /* %%% gross */
@@ -55,11 +53,7 @@ register TScreen *screen;
* (this includes scrolling regions)
* The origin is considered to be 0, 0 for this procedure.
*/
-CursorSet(screen, row, col, flags)
-register TScreen *screen;
-register int row, col;
-unsigned flags;
-{
+int CursorSet(register TScreen* screen, register int row, register int col, unsigned flags) {
register int maxr;
col = (col < 0 ? 0 : col);
@@ -73,15 +67,13 @@ unsigned flags;
screen->cur_row = (row <= maxr ? row : maxr);
screen->do_wrap = 0;
_CheckSelection(screen);
+ return 0;
}
/*
* moves the cursor left n, no wrap around
*/
-CursorBack(screen, n)
-register TScreen *screen;
-int n;
-{
+int CursorBack(register TScreen* screen, int n) {
register int i, j, k, rev;
extern XtermWidget term;
@@ -102,30 +94,26 @@ int n;
}
screen->do_wrap = 0;
_CheckSelection(screen);
+ return 0;
}
/*
* moves the cursor forward n, no wraparound
*/
-CursorForward(screen, n)
-register TScreen *screen;
-int n;
-{
+int CursorForward(register TScreen* screen, int n) {
screen->cur_col += n;
if (screen->cur_col > screen->max_col)
screen->cur_col = screen->max_col;
screen->do_wrap = 0;
_CheckSelection(screen);
+ return 0;
}
/*
* moves the cursor down n, no scrolling.
* Won't pass bottom margin or bottom of screen.
*/
-CursorDown(screen, n)
-register TScreen *screen;
-int n;
-{
+int CursorDown(register TScreen* screen, int n) {
register int max;
max = (screen->cur_row > screen->bot_marg ?
@@ -136,16 +124,14 @@ int n;
screen->cur_row = max;
screen->do_wrap = 0;
_CheckSelection(screen);
+ return 0;
}
/*
* moves the cursor up n, no linestarving.
* Won't pass top margin or top of screen.
*/
-CursorUp(screen, n)
-register TScreen *screen;
-int n;
-{
+int CursorUp(register TScreen* screen, int n) {
register int min;
min = (screen->cur_row < screen->top_marg ?
@@ -156,16 +142,14 @@ int n;
screen->cur_row = min;
screen->do_wrap = 0;
_CheckSelection(screen);
+ return 0;
}
/*
* Moves cursor down amount lines, scrolls if necessary.
* Won't leave scrolling region. No carriage return.
*/
-Index(screen, amount)
-register TScreen *screen;
-register int amount;
-{
+int Index(register TScreen* screen, register int amount) {
register int j;
/*
@@ -175,21 +159,19 @@ register int amount;
if (screen->cur_row > screen->bot_marg
|| screen->cur_row + amount <= screen->bot_marg) {
CursorDown(screen, amount);
- return;
+ return 0;
}
CursorDown(screen, j = screen->bot_marg - screen->cur_row);
Scroll(screen, amount - j);
+ return 0;
}
/*
* Moves cursor up amount lines, reverse scrolls if necessary.
* Won't leave scrolling region. No carriage return.
*/
-RevIndex(screen, amount)
-register TScreen *screen;
-register int amount;
-{
+int RevIndex(register TScreen* screen, register int amount) {
/*
* reverse indexing when above scrolling region is cursor up.
* if cursor low enough, no reverse indexing needed
@@ -197,31 +179,28 @@ register int amount;
if (screen->cur_row < screen->top_marg
|| screen->cur_row-amount >= screen->top_marg) {
CursorUp(screen, amount);
- return;
+ return 0;
}
RevScroll(screen, amount - (screen->cur_row - screen->top_marg));
CursorUp(screen, screen->cur_row - screen->top_marg);
+ return 0;
}
/*
* Moves Cursor To First Column In Line
*/
-CarriageReturn(screen)
-register TScreen *screen;
-{
+int CarriageReturn(register TScreen* screen) {
screen->cur_col = 0;
screen->do_wrap = 0;
_CheckSelection(screen);
+ return 0;
}
/*
* Save Cursor and Attributes
*/
-CursorSave(term, sc)
-register XtermWidget term;
-register SavedCursor *sc;
-{
+int CursorSave(register XtermWidget term, register SavedCursor* sc) {
register TScreen *screen = &term->screen;
sc->row = screen->cur_row;
@@ -230,15 +209,13 @@ register SavedCursor *sc;
sc->curgl = screen->curgl;
sc->curgr = screen->curgr;
memmove( sc->gsets, screen->gsets, sizeof(screen->gsets));
+ return 0;
}
/*
* Restore Cursor and Attributes
*/
-CursorRestore(term, sc)
-register XtermWidget term;
-register SavedCursor *sc;
-{
+int CursorRestore(register XtermWidget term, register SavedCursor* sc) {
register TScreen *screen = &term->screen;
memmove( screen->gsets, sc->gsets, sizeof(screen->gsets));
@@ -248,4 +225,5 @@ register SavedCursor *sc;
term->flags |= sc->flags & (BOLD|INVERSE|UNDERLINE|ORIGIN);
CursorSet (screen, (term->flags & ORIGIN) ? sc->row - screen->top_marg
: sc->row, sc->col, term->flags);
+ return 0;
}
Index: kterm-6.2.0/input.c
===================================================================
--- kterm-6.2.0.orig/input.c
+++ kterm-6.2.0/input.c
@@ -64,12 +64,7 @@ register TScreen *screen;
}
}
-Input (keyboard, screen, event, eightbit)
- register TKeyboard *keyboard;
- register TScreen *screen;
- register XKeyEvent *event;
- Bool eightbit;
-{
+int Input (register TKeyboard *keyboard, register TScreen *screen, register XKeyEvent *event, Bool eightbit) {
#ifdef KTERM
#define STRBUFSIZE 256
@@ -226,14 +221,10 @@ Input (keyboard, screen, event, eightbit
if (keysym == XK_F2) TekPrint();
#endif
#endif /* !KTERM_NOTEK */
- return;
+ return 0;
}
-StringInput (screen, string, nbytes)
- register TScreen *screen;
- register char *string;
- int nbytes;
-{
+int StringInput (register TScreen *screen, register char string, int nbytes) {
int pty = screen->respond;
#ifndef KTERM_NOTEK
@@ -249,6 +240,7 @@ StringInput (screen, string, nbytes)
if(!screen->TekEmu)
#endif /* !KTERM_NOTEK */
AdjustAfterInput(screen);
+ return 0;
}
static int funcvalue (keycode)
Index: kterm-6.2.0/kinput2.c
===================================================================
--- kterm-6.2.0.orig/kinput2.c
+++ kterm-6.2.0/kinput2.c
@@ -111,11 +111,7 @@ Boolean *continuep;
}
}
-static int
-forwardErrorHandler(dpy, error)
-Display *dpy;
-XErrorEvent *error;
-{
+static int forwardErrorHandler(Display *dpy, XErrorEvent *error) {
if (error->request_code == X_SendEvent &&
error->error_code == BadWindow) {
/* IMS dead */
@@ -124,6 +120,7 @@ XErrorEvent *error;
} else {
(*originalerrorhandler)(dpy, error);
}
+ return 0;
}
static void
Index: kterm-6.2.0/main.c
===================================================================
--- kterm-6.2.0.orig/main.c
+++ kterm-6.2.0/main.c
@@ -1871,16 +1871,16 @@ int pty_search(pty)
return 1;
}
-get_terminal ()
+int get_terminal () {
/*
* sets up X and initializes the terminal structure except for term.buf.fildes.
*/
-{
register TScreen *screen = &term->screen;
screen->arrow = make_colored_cursor (XC_left_ptr,
screen->mousecolor,
screen->mousecolorback);
+ return 0;
}
#ifndef KTERM_NOTEK
@@ -3278,11 +3278,7 @@ Exit(n)
}
/* ARGSUSED */
-resize(screen, TermName, oldtc, newtc)
-TScreen *screen;
-char *TermName;
-register char *oldtc, *newtc;
-{
+int resize(TScreen *screen, char *TermName, register char *oldtc, register char *newtc) {
#ifndef USE_SYSV_ENVVARS
register char *ptr1, *ptr2;
register int i;
@@ -3318,6 +3314,7 @@ register char *oldtc, *newtc;
ptr2 = strchr(ptr2, ':');
strcat (newtc, ptr2);
#endif /* USE_SYSV_ENVVARS */
+ return 0;
}
/*
@@ -3374,7 +3371,7 @@ static SIGNAL_T reapchild (n)
}
/* VARARGS1 */
-consolepr(fmt,x0,x1,x2,x3,x4,x5,x6,x7,x8,x9)
+int consolepr(fmt,x0,x1,x2,x3,x4,x5,x6,x7,x8,x9)
char *fmt;
{
extern char *SysErrorMsg();
@@ -3397,6 +3394,7 @@ char *fmt;
close(f);
}
#endif /* TIOCNOTTY */
+ return 0;
}
Index: kterm-6.2.0/misc.c
===================================================================
--- kterm-6.2.0.orig/misc.c
+++ kterm-6.2.0/misc.c
@@ -61,8 +61,7 @@ extern char *getenv();
static void DoSpecialEnterNotify();
static void DoSpecialLeaveNotify();
-xevents()
-{
+int xevents() {
XEvent event;
register TScreen *screen = &term->screen;
extern XtAppContext app_con;
@@ -85,11 +84,11 @@ xevents()
* If there's no XEvents, don't wait around...
*/
if ((input_mask & XtIMXEvent) != XtIMXEvent)
- return;
+ return 0;
#else /* !KTERM_XAW3D */
if (!XPending (screen->display))
/* protect against events/errors being swallowed by us or Xlib */
- return;
+ return 0;
#endif /* !KTERM_XAW3D */
do {
if (waitingForTrackInfo)
@@ -139,6 +138,7 @@ xevents()
#else /* !KTERM_XAW3D */
} while (QLength(screen->display) > 0);
#endif /* !KTERM_XAW3D */
+ return 0;
}
@@ -315,10 +315,7 @@ caddr_t eventdata;
-selectwindow(screen, flag)
-register TScreen *screen;
-register int flag;
-{
+int selectwindow(register TScreen *screen, register int flag) {
#ifndef KTERM_NOTEK
if(screen->TekEmu) {
if(!Ttoggled)
@@ -326,7 +323,7 @@ register int flag;
screen->select |= flag;
if(!Ttoggled)
TCursorToggle(TOGGLE);
- return;
+ return 0;
} else {
#endif /* !KTERM_NOTEK */
if (screen->xic)
@@ -339,17 +336,16 @@ register int flag;
screen->select |= flag;
if(screen->cursor_state)
ShowCursor();
- return;
+ return 0;
#ifndef KTERM_NOTEK
}
#endif /* !KTERM_NOTEK */
+ return 0;
}
-unselectwindow(screen, flag)
-register TScreen *screen;
-register int flag;
+int unselectwindow(register TScreen *screen, register int flag) {
{
- if (screen->always_highlight) return;
+ if (screen->always_highlight) return 0;
#ifndef KTERM_NOTEK
if(screen->TekEmu) {
@@ -370,14 +366,12 @@ register int flag;
#ifndef KTERM_NOTEK
}
#endif /* !KTERM_NOTEK */
+ return 0;
}
static long lastBellTime; /* in milliseconds */
-Bell(which,percent)
- int which;
- int percent;
-{
+int Bell(int which, int percent) {
extern XtermWidget term;
register TScreen *screen = &term->screen;
struct timeval curtime;
@@ -398,14 +392,14 @@ Bell(which,percent)
GetBytesAvailable (ConnectionNumber(screen->display)) > 0)
xevents();
if(screen->bellInProgress) { /* even after new events? */
- return;
+ return 0;
}
}
X_GETTIMEOFDAY(&curtime);
now_msecs = 1000*curtime.tv_sec + curtime.tv_usec/1000;
if(lastBellTime != 0 && now_msecs - lastBellTime >= 0 &&
now_msecs - lastBellTime < screen->bellSuppressTime) {
- return;
+ return 0;
}
lastBellTime = now_msecs;
}
@@ -433,11 +427,11 @@ Bell(which,percent)
XA_NOTICE, XA_NOTICE, 8, PropModeAppend, NULL, 0);
screen->bellInProgress = TRUE;
}
+ return 0;
}
-VisualBell()
-{
+int VisualBell() {
extern XtermWidget term;
register TScreen *screen = &term->screen;
register Pixel xorPixel = screen->foreground ^ term->core.background_pixel;
@@ -484,6 +478,7 @@ VisualBell()
#ifndef KTERM_NOTEK
}
#endif /* !KTERM_NOTEK */
+ return 0;
}
/* ARGSUSED */
@@ -500,8 +495,7 @@ void HandleBellPropertyChange(w, data, e
}
}
-Redraw()
-{
+int Redraw() {
extern XtermWidget term;
register TScreen *screen = &term->screen;
XExposeEvent event;
@@ -530,6 +524,7 @@ Redraw()
TekExpose (tekWidget, &event, NULL);
}
#endif /* !KTERM_NOTEK */
+ return 0;
}
#if defined(ALLOWLOGGING) || defined(DEBUG)
@@ -825,36 +820,29 @@ int (*func)();
}
}
-static ChangeGroup(attribute, value)
- String attribute;
- XtArgVal value;
-{
+static int ChangeGroup(String attribute, XtArgVal value) {
extern Widget toplevel;
Arg args[1];
XtSetArg( args[0], attribute, value );
XtSetValues( toplevel, args, 1 );
+ return 0;
}
-Changename(name)
-register char *name;
-{
+int Changename(register char *name) {
ChangeGroup( XtNiconName, (XtArgVal)name );
+ return 0;
}
-Changetitle(name)
-register char *name;
-{
+int Changetitle(register char *name) {
ChangeGroup( XtNtitle, (XtArgVal)name );
+ return 0;
}
#ifndef DEBUG
/* ARGSUSED */
#endif
-Panic(s, a)
-char *s;
-int a;
-{
+int Panic(char* s, int a) {
#ifdef DEBUG
if(debug) {
fprintf(stderr, "%s: PANIC! ", xterm_name);
@@ -863,6 +851,7 @@ int a;
fflush(stderr);
}
#endif /* DEBUG */
+ return 0;
}
char *SysErrorMsg (n)
@@ -885,11 +874,10 @@ int i;
Cleanup(i);
}
-Error (i)
-int i;
-{
+int Error (int i) {
fprintf (stderr, "%s: Error %d\n", xterm_name, i);
Cleanup(i);
+ return 0;
}
@@ -916,9 +904,7 @@ int code;
* was allocated using calloc, with enough extra room at the end so not
* to have to do a realloc().
*/
-Setenv (var, value)
-register char *var, *value;
-{
+int Setenv (register char* var, register char* value) {
extern char **environ;
register int envindex = 0;
register int len = strlen(var);
@@ -929,7 +915,7 @@ register char *var, *value;
environ[envindex] = (char *)malloc ((unsigned)len + strlen (value) + 1);
strcpy (environ [envindex], var);
strcat (environ [envindex], value);
- return;
+ return 0;
}
envindex ++;
}
@@ -942,6 +928,7 @@ register char *var, *value;
(void) strcpy (environ [envindex], var);
strcat (environ [envindex], value);
environ [++envindex] = NULL;
+ return 0;
}
/*
@@ -963,25 +950,22 @@ register char *s1, *s2;
}
/*ARGSUSED*/
-xerror(d, ev)
-Display *d;
-register XErrorEvent *ev;
-{
+int xerror(Display *d, register XErrorEvent *ev) {
fprintf (stderr, "%s: warning, error event receieved:\n", xterm_name);
(void) XmuPrintDefaultErrorMessage (d, ev, stderr);
Exit (ERROR_XERROR);
+ return 0;
}
/*ARGSUSED*/
-xioerror(dpy)
-Display *dpy;
-{
+int xioerror(Display* dpy) {
(void) fprintf (stderr,
"%s: fatal IO error %d (%s) or KillClient on X server \"%s\"\r\n",
xterm_name, errno, SysErrorMsg (errno),
DisplayString (dpy));
Exit(ERROR_XIOERROR);
+ return 0;
}
void xt_error(message)
Index: kterm-6.2.0/screen.c
===================================================================
--- kterm-6.2.0.orig/screen.c
+++ kterm-6.2.0/screen.c
@@ -254,9 +254,9 @@ Reallocate(sbuf, sbufaddr, nrow, ncol, o
}
#ifdef KTERM
-ScreenWrite (screen, str, flags, gset, length)
+int ScreenWrite (screen, str, flags, gset, length)
#else /* !KTERM */
-ScreenWrite (screen, str, flags, length)
+int ScreenWrite (screen, str, flags, length)
#endif /* !KTERM */
/*
Writes str into buf at row row and column col. Characters are set to match
@@ -287,7 +287,7 @@ register int length; /* length of strin
if (length > avail)
length = avail;
if (length <= 0)
- return;
+ return 0;
#ifdef KTERM
col = col0 = screen->buf[avail = screen->cur_row] + screen->cur_col;
@@ -332,9 +332,10 @@ register int length; /* length of strin
if (wrappedbit)
*attrs0 |= LINEWRAPPED;
#endif /* !KTERM */
+ return 0;
}
-ScrnInsertLine (sb, last, where, n, size)
+int ScrnInsertLine (sb, last, where, n, size)
/*
Inserts n blank lines at sb + where, treating last as a bottom margin.
Size is the size of each entry in sb.
@@ -398,10 +399,11 @@ register int where, n, size;
#else /* !KTERM */
memmove( (char *) &sb[2 * where], (char *)save, 2 * sizeof(char *) * n);
#endif /* !KTERM */
+ return 0;
}
-ScrnDeleteLine (sb, last, where, n, size)
+int ScrnDeleteLine (sb, last, where, n, size)
/*
Deletes n lines at sb + where, treating last as a bottom margin.
Size is the size of each entry in sb.
@@ -455,10 +457,11 @@ int where;
memmove( (char *) &sb[2 * last], (char *)save,
2 * sizeof(char *) * n);
#endif /* !KTERM */
+ return 0;
}
-ScrnInsertChar (sb, row, col, n, size)
+int ScrnInsertChar (sb, row, col, n, size)
/*
Inserts n blanks in sb at row, col. Size is the size of each row.
*/
@@ -505,10 +508,11 @@ ScrnInsertChar (sb, row, col, n, size)
if (wrappedbit)
attrs[0] |= LINEWRAPPED;
#endif /* !KTERM */
+ return 0;
}
-ScrnDeleteChar (sb, row, col, n, size)
+int ScrnDeleteChar (sb, row, col, n, size)
/*
Deletes n characters in sb at row, col. Size is the size of each row.
*/
@@ -540,10 +544,11 @@ ScrnDeleteChar (sb, row, col, n, size)
if (wrappedbit)
attrs[0] |= LINEWRAPPED;
#endif /* !KTERM */
+ return 0;
}
-ScrnRefresh (screen, toprow, leftcol, nrows, ncols, force)
+int ScrnRefresh (screen, toprow, leftcol, nrows, ncols, force)
/*
Repaints the area enclosed by the parameters.
Requires: (toprow, leftcol), (toprow + nrows, leftcol + ncols) are
@@ -794,9 +799,10 @@ Boolean force; /* ... leading/trailing
x, y+1, x + n * FontWidth(screen), y+1);
#endif /* !KTERM */
}
+ return 0;
}
-ClearBufRows (screen, first, last)
+int ClearBufRows (screen, first, last)
/*
Sets the rows first though last of the buffer of screen to spaces.
Requires first <= last; first, last are rows of screen->buf.
@@ -813,6 +819,7 @@ register int first, last;
while (first <= last)
bzero (screen->buf [first++], (screen->max_col + 1));
#endif /* !KTERM */
+ return 0;
}
/*
@@ -1145,7 +1152,7 @@ register int row, col, len;
}
#ifdef KTERM
-ScreenDraw(screen, row, col, endcol, flags, oncursor)
+int ScreenDraw(screen, row, col, endcol, flags, oncursor)
TScreen *screen;
int row; /* in screen->buf */
int col;
@@ -1306,5 +1313,6 @@ Boolean oncursor;
if (dbuf2 != drawbuf2) XtFree((char *)dbuf2);
#endif /* KTERM_MBCS */
if (dbuf != drawbuf) XtFree(dbuf);
+ return 0;
}
#endif /* KTERM */
Index: kterm-6.2.0/scrollbar.c
===================================================================
--- kterm-6.2.0.orig/scrollbar.c
+++ kterm-6.2.0/scrollbar.c
@@ -221,7 +221,7 @@ static void RealizeScrollBar (sbw, scree
}
-ScrollBarReverseVideo(scrollWidget)
+int ScrollBarReverseVideo(scrollWidget)
register Widget scrollWidget;
{
Arg args[4];
@@ -243,11 +243,12 @@ ScrollBarReverseVideo(scrollWidget)
nargs--; /* don't set border pixel */
}
XtSetValues (scrollWidget, args, nargs);
+ return 0;
}
-ScrollBarDrawThumb(scrollWidget)
+int ScrollBarDrawThumb(scrollWidget)
register Widget scrollWidget;
{
register TScreen *screen = &term->screen;
@@ -260,10 +261,10 @@ ScrollBarDrawThumb(scrollWidget)
XawScrollbarSetThumb(scrollWidget,
((float)thumbTop) / totalHeight,
((float)thumbHeight) / totalHeight);
-
+ return 0;
}
-ResizeScrollBar(scrollWidget, x, y, height)
+int ResizeScrollBar(scrollWidget, x, y, height)
register Widget scrollWidget;
int x, y;
unsigned height;
@@ -271,9 +272,10 @@ ResizeScrollBar(scrollWidget, x, y, heig
XtConfigureWidget(scrollWidget, x, y, scrollWidget->core.width,
height, scrollWidget->core.border_width);
ScrollBarDrawThumb(scrollWidget);
+ return 0;
}
-WindowScroll(screen, top)
+int WindowScroll(screen, top)
register TScreen *screen;
int top;
{
@@ -290,7 +292,7 @@ WindowScroll(screen, top)
top = 0;
if((i = screen->topline - top) == 0) {
ScrollBarDrawThumb(screen->scrollWidget);
- return;
+ return 0;
}
if(screen->cursor_state)
@@ -322,10 +324,11 @@ WindowScroll(screen, top)
ScrnRefresh(screen, refreshtop, 0, lines, screen->max_col + 1, False);
ScrollBarDrawThumb(screen->scrollWidget);
+ return 0;
}
-ScrollBarOn (xw, init, doalloc)
+int ScrollBarOn (xw, init, doalloc)
XtermWidget xw;
int init, doalloc;
{
@@ -338,29 +341,29 @@ ScrollBarOn (xw, init, doalloc)
#endif
if(screen->scrollbar)
- return;
+ return 0;
/* patch for ScrollBarRight cyamauch@phyas.aichi-edu.ac.jp */
if(screen->useRight)
- return;
+ return 0;
if (init) { /* then create it only */
- if (screen->scrollWidget) return;
+ if (screen->scrollWidget) return 0;
/* make it a dummy size and resize later */
if ((screen->scrollWidget = CreateScrollBar (xw, -1, - 1, 5))
== NULL) {
Bell(XkbBI_MinorError,0);
- return;
+ return 0;
}
- return;
+ return 0;
}
if (!screen->scrollWidget) {
Bell (XkbBI_MinorError,0);
Bell (XkbBI_MinorError,0);
- return;
+ return 0;
}
if (doalloc && screen->allbuf) {
@@ -436,14 +439,13 @@ ScrollBarOn (xw, init, doalloc)
XClearWindow (screen->display, XtWindow (term));
Redraw ();
}
+ return 0;
}
-ScrollBarOff(screen)
- register TScreen *screen;
-{
+int ScrollBarOff(register TScreen* screen) {
/* patch for ScrollBarRight cyamauch@phyas.aichi-edu.ac.jp */
if( screen->scrollbar==0 && screen->useRight==0 )
- return;
+ return 0;
XtUnmapWidget(screen->scrollWidget);
screen->scrollbar = 0;
/* patch for ScrollBarRight cyamauch@phyas.aichi-edu.ac.jp */
@@ -454,6 +456,7 @@ ScrollBarOff(screen)
XClearWindow (screen->display, XtWindow (term));
Redraw ();
}
+ return 0;
}
/*ARGSUSED*/
Index: kterm-6.2.0/tabs.c
===================================================================
--- kterm-6.2.0.orig/tabs.c
+++ kterm-6.2.0/tabs.c
@@ -37,9 +37,7 @@
/*
* places tabstops at only every 8 columns
*/
-TabReset(tabs)
-Tabs tabs;
-{
+int TabReset(Tabs tabs) {
register int i;
for (i=0; i<TAB_ARRAY_SIZE; ++i)
@@ -47,27 +45,30 @@ Tabs tabs;
for (i=0; i<MAX_TABS; i+=8)
TabSet(tabs, i);
+ return 0;
}
/*
* places a tabstop at col
*/
-TabSet(tabs, col)
+int TabSet(tabs, col)
Tabs tabs;
int col;
{
tabs[col >> 5] |= (1 << (col & 31));
+ return 0;
}
/*
* clears a tabstop at col
*/
-TabClear(tabs, col)
+int TabClear(tabs, col)
Tabs tabs;
int col;
{
tabs[col >> 5] &= ~(1 << (col & 31));
+ return 0;
}
/*
@@ -96,11 +97,10 @@ TabNext (tabs, col)
/*
* clears all tabs
*/
-TabZonk (tabs)
-Tabs tabs;
-{
+int TabZonk (Tabs tabs) {
register int i;
for (i=0; i<TAB_ARRAY_SIZE; ++i)
tabs[i] = 0;
+ return 0;
}
Index: kterm-6.2.0/util.c
===================================================================
--- kterm-6.2.0.orig/util.c
+++ kterm-6.2.0/util.c
@@ -45,9 +45,7 @@ static int fnum = F_ISO8859_1; /* refere
/*
* These routines are used for the jump scroll feature
*/
-FlushScroll(screen)
-register TScreen *screen;
-{
+int FlushScroll(register TScreen* screen) {
register int i;
register int shift = -screen->topline;
register int bot = screen->max_row - shift;
@@ -124,9 +122,10 @@ register TScreen *screen;
ScrnRefresh(screen, refreshtop, 0, refreshheight,
screen->max_col + 1, False);
}
+ return 0;
}
-AddToRefresh(screen)
+int AddToRefresh(screen)
register TScreen *screen;
{
register int amount = screen->refresh_amt;
@@ -164,7 +163,7 @@ register TScreen *screen;
* All done within the scrolling region, of course.
* requires: amount > 0
*/
-Scroll(screen, amount)
+int Scroll(screen, amount)
register TScreen *screen;
register int amount;
{
@@ -197,7 +196,7 @@ register int amount;
ScrollSelection(screen, -(amount));
if (amount == i) {
ClearScreen(screen);
- return;
+ return 0;
}
shift = -screen->topline;
bot = screen->max_row - shift;
@@ -258,6 +257,7 @@ register int amount;
if(refreshheight > 0)
ScrnRefresh(screen, refreshtop, 0, refreshheight,
screen->max_col + 1, False);
+ return 0;
}
@@ -267,7 +267,7 @@ register int amount;
* All done within the scrolling region, of course.
* Requires: amount > 0
*/
-RevScroll(screen, amount)
+int RevScroll(screen, amount)
register TScreen *screen;
register int amount;
{
@@ -328,6 +328,7 @@ register int amount;
}
ScrnInsertLine (screen->buf, screen->bot_marg, screen->top_marg,
amount, screen->max_col + 1);
+ return 0;
}
/*
@@ -335,7 +336,7 @@ register int amount;
* inserts n blank lines at the cursor's position. Lines above the
* bottom margin are lost.
*/
-InsertLine (screen, n)
+int InsertLine (screen, n)
register TScreen *screen;
register int n;
{
@@ -349,7 +350,7 @@ register int n;
if (screen->cur_row < screen->top_marg ||
screen->cur_row > screen->bot_marg)
- return;
+ return 0;
if(screen->cursor_state)
HideCursor();
screen->do_wrap = 0;
@@ -390,13 +391,14 @@ register int n;
/* adjust screen->buf */
ScrnInsertLine(screen->buf, screen->bot_marg, screen->cur_row, n,
screen->max_col + 1);
+ return 0;
}
/*
* If cursor not in scrolling region, returns. Else, deletes n lines
* at the cursor's position, lines added at bottom margin are blank.
*/
-DeleteLine(screen, n)
+int DeleteLine(screen, n)
register TScreen *screen;
register int n;
{
@@ -410,7 +412,7 @@ register int n;
if (screen->cur_row < screen->top_marg ||
screen->cur_row > screen->bot_marg)
- return;
+ return 0;
if(screen->cursor_state)
HideCursor();
screen->do_wrap = 0;
@@ -471,12 +473,13 @@ register int n;
else
ScrnDeleteLine(screen->buf, screen->bot_marg, screen->cur_row,
n, screen->max_col + 1);
+ return 0;
}
/*
* Insert n blanks at the cursor's position, no wraparound
*/
-InsertChar (screen, n)
+int InsertChar (screen, n)
register TScreen *screen;
register int n;
{
@@ -526,12 +529,13 @@ InsertChar (screen, n)
/* adjust screen->buf */
ScrnInsertChar(screen->buf, screen->cur_row, screen->cur_col, n,
screen->max_col + 1);
+ return 0;
}
/*
* Deletes n chars at the cursor's position, no wraparound.
*/
-DeleteChar (screen, n)
+int DeleteChar (screen, n)
register TScreen *screen;
register int n;
{
@@ -579,13 +583,14 @@ DeleteChar (screen, n)
/* adjust screen->buf */
ScrnDeleteChar (screen->buf, screen->cur_row, screen->cur_col, n,
screen->max_col + 1);
+ return 0;
}
/*
* Clear from cursor position to beginning of display, inclusive.
*/
-ClearAbove (screen)
+int ClearAbove (screen)
register TScreen *screen;
{
register top, height;
@@ -607,12 +612,13 @@ register TScreen *screen;
ClearLeft(screen);
}
ClearBufRows(screen, 0, screen->cur_row - 1);
+ return 0;
}
/*
* Clear from cursor position to end of display, inclusive.
*/
-ClearBelow (screen)
+int ClearBelow (screen)
register TScreen *screen;
{
register top;
@@ -629,12 +635,13 @@ register TScreen *screen;
FontHeight(screen), FALSE);
}
ClearBufRows(screen, screen->cur_row + 1, screen->max_row);
+ return 0;
}
/*
* Clear last part of cursor's line, inclusive.
*/
-ClearRight (screen)
+int ClearRight (screen)
register TScreen *screen;
{
if(screen->cursor_state)
@@ -677,12 +684,13 @@ register TScreen *screen;
/* with the right part cleared, we can't be wrapping */
screen->buf [2 * screen->cur_row + 1] [0] &= ~LINEWRAPPED;
#endif /* !KTERM */
+ return 0;
}
/*
* Clear first part of cursor's line, inclusive.
*/
-ClearLeft (screen)
+int ClearLeft (screen)
register TScreen *screen;
{
int i;
@@ -738,12 +746,13 @@ ClearLeft (screen)
i++, cp++)
*cp = CHARDRAWN;
#endif /* !KTERM */
+ return 0;
}
/*
* Erase the cursor's line.
*/
-ClearLine(screen)
+int ClearLine(screen)
register TScreen *screen;
{
if(screen->cursor_state)
@@ -775,9 +784,10 @@ register TScreen *screen;
bzero (screen->buf [2 * screen->cur_row], (screen->max_col + 1));
bzero (screen->buf [2 * screen->cur_row + 1], (screen->max_col + 1));
#endif /* !KTERM */
+ return 0;
}
-ClearScreen(screen)
+int ClearScreen(screen)
register TScreen *screen;
{
register int top;
@@ -802,9 +812,10 @@ register TScreen *screen;
FontHeight(screen), FALSE);
}
ClearBufRows (screen, 0, screen->max_row);
+ return 0;
}
-CopyWait(screen)
+int CopyWait(screen)
register TScreen *screen;
{
XEvent reply;
@@ -840,6 +851,7 @@ register TScreen *screen;
break;
}
}
+ return 0;
}
/*
@@ -925,7 +937,7 @@ vertical_copy_area(screen, firstline, nl
/*
* use when scrolling the entire screen
*/
-scrolling_copy_area(screen, firstline, nlines, amount)
+int scrolling_copy_area(screen, firstline, nlines, amount)
TScreen *screen;
int firstline; /* line on screen to start copying at */
int nlines;
@@ -935,6 +947,7 @@ scrolling_copy_area(screen, firstline, n
if(nlines > 0) {
vertical_copy_area(screen, firstline, nlines, amount);
}
+ return 0;
}
/*
@@ -986,7 +999,7 @@ HandleExposure (screen, event)
* have been translated to allow for any CopyArea in progress.
* The rectangle passed in is pixel coordinates.
*/
-handle_translated_exposure (screen, rect_x, rect_y, rect_width, rect_height)
+int handle_translated_exposure (screen, rect_x, rect_y, rect_width, rect_height)
register TScreen *screen;
register int rect_x, rect_y;
register unsigned int rect_width, rect_height;
@@ -1040,9 +1053,7 @@ handle_translated_exposure (screen, rect
return (0);
}
-ReverseVideo (termw)
- XtermWidget termw;
-{
+int ReverseVideo (XtermWidget termw) {
register TScreen *screen = &termw->screen;
GC tmpGC;
#ifndef KTERM_NOTEK
@@ -1140,13 +1151,11 @@ ReverseVideo (termw)
#ifdef KTERM_KINPUT2
Kinput2SendColor();
#endif /* KTERM_KINPUT2 */
+ return 0;
}
-recolor_cursor (cursor, fg, bg)
- Cursor cursor; /* X cursor ID to set */
- unsigned long fg, bg; /* pixel indexes to look up */
-{
+int recolor_cursor (Cursor cursor, unsigned long fg, unsigned long bg) {
register TScreen *screen = &term->screen;
register Display *dpy = screen->display;
XColor colordefs[2]; /* 0 is foreground, 1 is background */
@@ -1156,7 +1165,7 @@ recolor_cursor (cursor, fg, bg)
XQueryColors (dpy, DefaultColormap (dpy, DefaultScreen (dpy)),
colordefs, 2);
XRecolorCursor (dpy, cursor, colordefs, colordefs+1);
- return;
+ return 0;
}
#ifdef KTERM_MBCS
@@ -1164,9 +1173,7 @@ recolor_cursor (cursor, fg, bg)
* If the cursor points the second byte of a multi byte character,
* replace this character with two blanks.
*/
-BreakMBchar(screen)
-register TScreen *screen;
-{
+int BreakMBchar(register TScreen* screen) {
register Bchr *ptr;
if (screen->cur_col >= 1 && screen->cur_col <= screen->max_col
&& screen->buf[screen->cur_row][screen->cur_col].gset == MBC2) {
@@ -1194,6 +1201,7 @@ register TScreen *screen;
ptr = screen->buf[screen->cur_row] + screen->cur_col - 1;
bzero((char*)ptr, 2 * sizeof(Bchr));
}
+ return 0;
}
#endif /* KTERM_MBCS */
