File kterm-6.2.0-gcc15.patch of Package kterm
Index: kterm-6.2.0/button.c
===================================================================
--- kterm-6.2.0.orig/button.c
+++ kterm-6.2.0/button.c
@@ -33,6 +33,7 @@ button.c Handles button events in the te
#include "ptyx.h" /* Xlib headers included here. */
#include <X11/Xatom.h>
#include <stdio.h>
+#include <stdlib.h>
#include <X11/Xmu/Atoms.h>
#include <X11/Xmu/StdSel.h>
@@ -45,9 +46,7 @@ button.c Handles button events in the te
#include "screen.h"
#include "misc.h"
-extern void *malloc();
-
-extern void DoSecureKeyboard();
+extern void DoSecureKeyboard(Time time);
#define KeyState(x) (((x) & (ShiftMask|ControlMask)) + (((x) & Mod1Mask) ? 2 : 0))
/* adds together the bits:
@@ -65,20 +64,20 @@ extern void DoSecureKeyboard();
extern char *xterm_name;
-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);
+static void PointToRowCol(register int y, register int x, int *r, int *c);
+static void SelectionReceived(Widget w, XtPointer client_data, Atom *selection, Atom *type, XtPointer value, unsigned long *length, int *format);
+static void TrackDown(register XButtonEvent *event);
+static void ComputeSelect(int startRow, int startCol, int endRow, int endCol, Bool extend);
+static void EditorButton(register XButtonEvent *event);
+static void ExtendExtend(int row, int col);
+static void ReHiliteText(register int frow, register int fcol, register int trow, register int tcol);
+static void SelectSet(Widget w, XEvent *event, String *params, Cardinal num_params);
+static void StartSelect(int row, int col);
+static int Length(register TScreen *screen, register int row, register int scol, register int ecol);
#ifdef KTERM
-static Ichr *SaveText(screen, row, scol, ecol, lp, eol);
+static Ichr *SaveText(TScreen *screen, int row, int scol, int ecol, register Ichr *lp, int *eol);
#else /* !KTERM */
-static char *SaveText(screen, row, scol, ecol, lp, eol);
+static char *SaveText(TScreen *screen, int row, int scol, int ecol, register char *lp, int *eol);
#endif /* !KTERM */
extern XtermWidget term;
@@ -125,7 +124,7 @@ static int replyToEmacs;
* by Kiyoshi KANAZAWA, Nov. 29, 1990.
* Support word-select for MBCS.
*/
-static int mbcsCharClass ();
+static int mbcsCharClass (register Bchr *);
#endif /* KTERM && KTERM_MBCC */
int TrackText(register int frow, register int fcol, register int trow, register int tcol);
@@ -157,7 +156,7 @@ XEvent* event;
if (KeyModifiers == 0) {
if (event->type == ButtonPress)
- EditorButton(event);
+ EditorButton(&(event->xbutton));
return True;
}
return False;
@@ -165,7 +164,7 @@ XEvent* event;
case 2: /* DEC vt200 compatible */
if (KeyModifiers == 0 || KeyModifiers == ControlMask) {
- EditorButton(event);
+ EditorButton(&(event->xbutton));
return True;
}
return False;
@@ -174,11 +173,11 @@ XEvent* event;
if ( event->type == ButtonPress &&
KeyModifiers == 0 &&
event->xbutton.button == Button1 ) {
- TrackDown(event);
+ TrackDown(&(event->xbutton));
return True;
}
if (KeyModifiers == 0 || KeyModifiers == ControlMask) {
- EditorButton(event);
+ EditorButton(&(event->xbutton));
return True;
}
/* fall through */
@@ -214,7 +213,7 @@ Cardinal *num_params; /* unused */
}
}
-static void EndExtend();
+static void EndExtend(Widget w, XEvent *event, String *params, Cardinal num_params, Bool use_cursor_loc);
static void do_select_end (w, event, params, num_params, use_cursor_loc)
Widget w;
@@ -226,7 +225,7 @@ Bool use_cursor_loc;
((XtermWidget)w)->screen.selection_time = event->xbutton.time;
switch (eventMode) {
case NORMAL :
- (void) SendMousePosition(w, event);
+ (void) SendMousePosition(w, event->xbutton);
break;
case LEFTEXTENSION :
case RIGHTEXTENSION :
@@ -373,11 +372,11 @@ int *format;
if (*type == XA_COMPOUND_TEXT(XtDisplay(w))) {
Char *ct = (Char *)value;
Ichr *cs;
- int (*func)();
+ int (*func)(Ichr *, char *);
int n;
- int convCStoJIS();
+ int convCStoJIS(Ichr *, char *);
# ifdef KTERM_KANJIMODE
- int convCStoEUC(), convCStoSJIS();
+ int convCStoEUC(Ichr *, char *), convCStoSJIS(Ichr *, char *);
# endif /* KTERM_KANJIMODE */
Ichr cbuf[256 + 1];
@@ -461,7 +460,7 @@ XEvent *event; /* assumed to be XButto
String *params; /* selections in precedence order */
Cardinal *num_params;
{
- if (SendMousePosition(w, event)) return;
+ if (SendMousePosition(w, event->xbutton)) return;
_GetSelection(w, event->xbutton.time, params, *num_params);
}
@@ -491,7 +490,7 @@ Widget w;
XEvent *event; /* must be XButtonEvent* */
int startrow, startcol;
{
- if (SendMousePosition(w, event)) return;
+ if (SendMousePosition(w, event->xbutton)) return;
SetSelectUnit(event->xbutton.time, SELECTCHAR);
replyToEmacs = FALSE;
StartSelect(startrow, startcol);
@@ -661,7 +660,7 @@ HandleSelectSet(w, event, params, num_pa
SelectSet (w, event, params, *num_params);
}
-static void SaltTextAway();
+static void SaltTextAway(int crow, int ccol, int row, int col, String *params, Cardinal num_params);
/* ARGSUSED */
static void
@@ -1339,7 +1338,7 @@ ReHiliteText(frow, fcol, trow, tcol)
}
}
-static void _OwnSelection();
+static void _OwnSelection(register XtermWidget termw, String *selections, Cardinal count);
static void
SaltTextAway(crow, ccol, row, col, params, num_params)
Index: kterm-6.2.0/menu.h
===================================================================
--- kterm-6.2.0.orig/menu.h
+++ kterm-6.2.0/menu.h
@@ -75,7 +75,7 @@ extern void HandleSetTekText();
extern void HandleTekPage();
extern void HandleTekReset();
extern void HandleTekCopy();
-extern void DoSecureKeyboard();
+extern void DoSecureKeyboard(Time time);
#ifdef STATUSLINE
extern void HandleStatusLine();
extern void HandleStatusReverse();
Index: kterm-6.2.0/charproc.c
===================================================================
--- kterm-6.2.0.orig/charproc.c
+++ kterm-6.2.0/charproc.c
@@ -102,9 +102,6 @@ extern jmp_buf VTend;
extern XtAppContext app_con;
extern Widget toplevel;
-extern void exit();
-extern void *malloc();
-extern void *realloc();
extern fd_set Select_mask;
extern fd_set X_mask;
extern fd_set pty_mask;
@@ -298,33 +295,33 @@ static Char pending_byte;
/* event handlers */
-extern void HandleKeyPressed(), HandleEightBitKeyPressed();
-extern void HandleStringEvent();
-extern void HandleEnterWindow();
-extern void HandleLeaveWindow();
-extern void HandleBellPropertyChange();
-extern void HandleFocusChange();
-static void HandleKeymapChange();
-extern void HandleInsertSelection();
-extern void HandleSelectStart(), HandleKeyboardSelectStart();
-extern void HandleSelectExtend(), HandleSelectSet();
-extern void HandleSelectEnd(), HandleKeyboardSelectEnd();
-extern void HandleStartExtend(), HandleKeyboardStartExtend();
-static void HandleBell();
-static void HandleVisualBell();
-static void HandleIgnore();
-extern void HandleSecure();
-extern void HandleScrollForward();
-extern void HandleScrollBack();
-extern void HandleCreateMenu(), HandlePopupMenu();
-extern void HandleSetFont();
-extern void SetVTFont();
+extern void HandleKeyPressed(Widget, XEvent *, String *, Cardinal *), HandleEightBitKeyPressed(Widget, XEvent *, String *, Cardinal *);
+extern void HandleStringEvent(Widget, XEvent *, String *, Cardinal *);
+extern void HandleEnterWindow(Widget, caddr_t, register XEnterWindowEvent *);
+extern void HandleLeaveWindow(Widget, caddr_t, register XEnterWindowEvent *);
+extern void HandleBellPropertyChange(Widget, XtPointer, XEvent *, Boolean);
+extern void HandleFocusChange(Widget, caddr_t, register XFocusChangeEvent *);
+static void HandleKeymapChange(Widget, XEvent *, String *, Cardinal *);
+extern void HandleInsertSelection(Widget, XEvent *, String *, Cardinal *);
+extern void HandleSelectStart(Widget, XEvent *, String *, Cardinal *), HandleKeyboardSelectStart(Widget, XEvent *, String *, Cardinal *);
+extern void HandleSelectExtend(Widget, XEvent *, String *, Cardinal *), HandleSelectSet(Widget, XEvent *, String *, Cardinal *);
+extern void HandleSelectEnd(Widget, XEvent *, String *, Cardinal *), HandleKeyboardSelectEnd(Widget, XEvent *, String *, Cardinal *);
+extern void HandleStartExtend(Widget, XEvent *, String *, Cardinal *), HandleKeyboardStartExtend(Widget, XEvent *, String *, Cardinal *);
+static void HandleBell(Widget, XEvent *, String *, Cardinal *);
+static void HandleVisualBell(Widget, XEvent *, String *, Cardinal *);
+static void HandleIgnore(Widget, XEvent *, String *, Cardinal *);
+extern void HandleSecure(Widget, XEvent *, String *, Cardinal *);
+extern void HandleScrollForward(Widget, XEvent *, String *, Cardinal *);
+extern void HandleScrollBack(Widget, XEvent *, String *, Cardinal *);
+extern void HandleCreateMenu(Widget, XEvent *, String *, Cardinal *), HandlePopupMenu(Widget, XEvent *, String *, Cardinal *);
+extern void HandleSetFont(Widget, XEvent *, String *, Cardinal *);
+extern void SetVTFont(int, Bool, char *, char *);
#ifdef KTERM_XIM
-extern void HandleOpenIM();
-extern void HandleCloseIM();
+extern void HandleOpenIM(Widget, XEvent *, String *, Cardinal *);
+extern void HandleCloseIM(Widget, XEvent *, String *, Cardinal *);
#endif /* KTERM_XIM */
#ifdef KTERM_KINPUT2
-extern void HandleBeginConversion();
+extern void HandleBeginConversion(Widget, XEvent *, String *, Cardinal *);
#endif /* KTERM_KINPUT2 */
extern Boolean SendMousePosition();
