diff --git a/include/graphics/newkbd.h b/include/graphics/newkbd.h
index 2ff50b8cd5153baa2327bb142b0330f634cdece7..77064a89d24d54a9108d2613f2335030f2059e4c 100644
--- a/include/graphics/newkbd.h
+++ b/include/graphics/newkbd.h
@@ -34,12 +34,6 @@ typedef nk_keyinfovector nk_keymatrix[nk_keyhigh - nk_keylow + 1];
typedef uchar nk_keycapsvector[(nk_keyhigh - nk_keylow + 8) / 8];
-typedef struct nk_keytransinfo {
- nk_keymatrix matrix;
- nk_keycapsvector caps;
- short rpgbufsize;
-} nk_keytransinfo;
-
int nk_capslock;
#define nk_keybufsize m_pollkbd
@@ -50,7 +44,6 @@ void nk_ungetkey (uchar c);
#define nk_gotoxy(x,y) nc_gotoXY(x,y)
#define nk_getxy(x,y) nc_getXY(x,y)
int nk_setcapslock (int newcaps);
-void nk_settransarray (int opcode, nk_keytransinfo **table);
#endif /*NEWKBD_H*/
diff --git a/include/logglobals.h b/include/logglobals.h
index 466e5ea15bcbf4728b47edddf8a9e867230172d7..f37887cc99d485b7b2d3ed838d50a07d11162dc8 100644
--- a/include/logglobals.h
+++ b/include/logglobals.h
@@ -115,8 +115,6 @@ extern int modeflag; /* Mode area contains a word */
extern long modetime; /* Time (in minutes) in mode display */
extern log_krec *modeprobekind;
-extern nk_keytransinfo *curkeytrans; /* Current keyboard definitions */
-
enum cursors { normal, grid, delete__, copy_, paste, boxcursor};
extern enum cursors cursortype;
extern enum cursors oldcursortype;
diff --git a/src/graphics/newkbd.c b/src/graphics/newkbd.c
index ac8a66b5de39db1b77c6469b8fb97158cdf05a52..94b50cafd21328570464f1c67bf6cd881a01887f 100644
--- a/src/graphics/newkbd.c
+++ b/src/graphics/newkbd.c
@@ -169,16 +169,4 @@ void nk_keybufclear()
// noop
}
}
-
-
-void nk_settransarray(int mode, nk_keytransinfo ** mat)
-{
- static int dummy;
-
- if (mode == nk_ktsupplied) {
- /* ignore it for now! */
- } else {
- *mat = (nk_keytransinfo *)(&dummy);
- }
-}
diff --git a/src/log.c b/src/log.c
index 77301335d2bb62f080c1d98911c4250a6c26aac7..877384b46cb3ed93b4126b4ccabd4ceda6aeec0a 100644
--- a/src/log.c
+++ b/src/log.c
@@ -186,9 +186,6 @@ int modeflag; ///< Mode area contains a word
long modetime; ///< Time (in minutes) in mode display
log_krec *modeprobekind;
-nk_keytransinfo *curkeytrans; ///< Current keyboard definitions
-
-
/* menupicture, errorpicture : m_picturevar; { Various saved images */
short bottomcount; ///< How many nested BEGINBOTTOMs
@@ -7449,7 +7446,6 @@ struct LOC_doshellescape {
static void recov(struct LOC_doshellescape *LINK)
{
- nk_settransarray(nk_ktsupplied, &curkeytrans);
initwindow2();
if (m_maxcolor != LINK->oldc)
@@ -7464,7 +7460,6 @@ static void recov(struct LOC_doshellescape *LINK)
static void doshellescape(char *arg)
{
struct LOC_doshellescape V;
- nk_keytransinfo *ktemp;
long i, j;
char STR1[256];
@@ -7473,7 +7468,6 @@ static void doshellescape(char *arg)
V.oldc = m_maxcolor;
TRY(try22);
closedumpfiles();
- nk_settransarray(nk_ktstandard, &ktemp);
m_alpha_off();
m_graphics_on();
recov(&V);
@@ -11271,10 +11265,8 @@ static void initialize()
char s[256];
int flag;
char cnfname[256];
- nk_keytransinfo *keytrans;
char STR2[256], STR3[256];
short FORLIM;
- nk_keytransinfo *WITH;
log_sigrec *WITH1;
strcpy(swtab[0].switch_, "cC"); /* CNF file name */
@@ -11687,49 +11679,6 @@ static void initialize()
setvlsimode(vlsi);
labelcaps = true;
signalcaps = true;
- nk_settransarray(nk_ktstandard, &keytrans);
- curkeytrans = (nk_keytransinfo *)Malloc(sizeof(nk_keytransinfo));
- *curkeytrans = *keytrans;
- nk_settransarray(nk_ktsupplied, &curkeytrans);
- WITH = curkeytrans;
- for (i = 25; i <= 125; i++)
- {
- if (WITH->matrix[i - nk_keylow][-nk_keymodlow].c == 154) /*del chr*/
- WITH->matrix[i - nk_keylow][-nk_keymodlow].c = 24;
- else if (islower(WITH->matrix[i - nk_keylow][-nk_keymodlow].c))
- {
- WITH->matrix[i - nk_keylow][2 - nk_keymodlow].c =
- WITH->matrix[i - nk_keylow][-nk_keymodlow].c + 71;
- WITH->matrix[i - nk_keylow][3 - nk_keymodlow].c =
- WITH->matrix[i - nk_keylow][-nk_keymodlow].c + 117;
- WITH->matrix[i - nk_keylow][2 - nk_keymodlow].k = nk_kknormal;
- WITH->matrix[i - nk_keylow][3 - nk_keymodlow].k = nk_kknormal;
- } else if (isdigit(WITH->matrix[i - nk_keylow][-nk_keymodlow].c))
- {
- WITH->matrix[i - nk_keylow][2 - nk_keymodlow].c =
- WITH->matrix[i - nk_keylow][-nk_keymodlow].c + 192;
- WITH->matrix[i - nk_keylow][3 - nk_keymodlow].c =
- WITH->matrix[i - nk_keylow][-nk_keymodlow].c + 192;
- WITH->matrix[i - nk_keylow][2 - nk_keymodlow].k = nk_kknormal;
- WITH->matrix[i - nk_keylow][3 - nk_keymodlow].k = nk_kknormal;
- }
- if (WITH->matrix[i - nk_keylow][1 - nk_keymodlow].c == 157)
- /*shift-left*/
- WITH->matrix[i - nk_keylow][1 - nk_keymodlow].c = 25;
- else if (WITH->matrix[i - nk_keylow][1 - nk_keymodlow].c == 158)
- WITH->matrix[i - nk_keylow][1 - nk_keymodlow].c = 26;
- }
- for (i = 60; i <= 79; i++)
- {
- WITH->matrix[i - nk_keylow][1 - nk_keymodlow].c = i + 134;
- WITH->matrix[i - nk_keylow][2 - nk_keymodlow].c = i + 68;
- WITH->matrix[i - nk_keylow][3 - nk_keymodlow].c = i + 88;
- WITH->matrix[i - nk_keylow][1 - nk_keymodlow].k = nk_kknormal;
- WITH->matrix[i - nk_keylow][2 - nk_keymodlow].k = nk_kknormal;
- WITH->matrix[i - nk_keylow][3 - nk_keymodlow].k = nk_kknormal;
- }
- WITH->matrix[46 - nk_keylow][-nk_keymodlow].c = 7;
- WITH->matrix[46 - nk_keylow][-nk_keymodlow].k = nk_kknormal;
XRebindKeysym(m_display, XStringToKeysym("BackSpace"), NULL, 0, (unsigned char * )"\007", 1);
gg.refrflag = true;
gg.markers = false;
@@ -11894,7 +11843,6 @@ int main(int argc, char * argv[])
dumpfile = NULL;
gg.initdone = false;
entrycapslock = nk_capslock;
- nk_settransarray(nk_ktcurrent, &curkeytrans);
gg.traceopen = false;
gg.dumpopen = false;
excpline = -1;
@@ -12273,7 +12221,6 @@ int main(int argc, char * argv[])
ENDTRY(try44);
closedumpfiles();
nk_setcapslock(entrycapslock);
- nk_settransarray(nk_ktstandard, &curkeytrans);
showalpha();
cleanlog();
if (dumpfile != NULL)
diff --git a/src/loged.c b/src/loged.c
index 1a02f0390c40a04bd81e3c0578d3a2d070e9c615..0280b9ed6fddf5deb0b728ddcaaa1bc81635bbab 100644
--- a/src/loged.c
+++ b/src/loged.c
@@ -4684,7 +4684,6 @@ static void labelcmd()
short i, i1, p, x, y, xx, yy, len;
char snail[5];
int refr;
- nk_keytransinfo *keytrans, *keytrans2;
char ch;
if (*argument != '\0') {
@@ -4696,25 +4695,6 @@ static void labelcmd()
wrmsg("No current gate");
else {
TRY(try10);
- nk_settransarray(nk_ktstandard, &keytrans2);
- keytrans = (nk_keytransinfo *)Malloc(sizeof(nk_keytransinfo));
- *keytrans = *keytrans2;
- nk_settransarray(nk_ktsupplied, &keytrans);
- keytrans->matrix[40 - nk_keylow][-nk_keymodlow].c = 1; /*ins ln*/
- keytrans->matrix[41 - nk_keylow][-nk_keymodlow].c = 2; /*del ln*/
- keytrans->matrix[42 - nk_keylow][-nk_keymodlow].c = 4;
- /*recall not implemented*/
- keytrans->matrix[43 - nk_keylow][-nk_keymodlow].c = 0; /*ins char*/
- keytrans->matrix[44 - nk_keylow][-nk_keymodlow].c = 5; /*del char*/
- keytrans->matrix[45 - nk_keylow][-nk_keymodlow].c = 6; /*clr end*/
- keytrans->matrix[46 - nk_keylow][-nk_keymodlow].c = 7; /*back space*/
- keytrans->matrix[40 - nk_keylow][-nk_keymodlow].k = nk_kknormal;
- keytrans->matrix[41 - nk_keylow][-nk_keymodlow].k = nk_kknormal;
- keytrans->matrix[42 - nk_keylow][-nk_keymodlow].k = nk_kknormal;
- keytrans->matrix[43 - nk_keylow][-nk_keymodlow].k = nk_kknone;
- keytrans->matrix[44 - nk_keylow][-nk_keymodlow].k = nk_kknormal;
- keytrans->matrix[45 - nk_keylow][-nk_keymodlow].k = nk_kknormal;
- keytrans->matrix[46 - nk_keylow][-nk_keymodlow].k = nk_kknormal;
len = 1;
while (kind.lbl[len - 1] != '\0')
len++;
@@ -4853,9 +4833,7 @@ static void labelcmd()
kind.lbl[len] = '\0';
}
menuflag = true;
- nk_settransarray(nk_ktstandard, &keytrans);
RECOVER(try10);
- nk_settransarray(nk_ktstandard, &keytrans);
_Escape(P_escapecode);
ENDTRY(try10);
}