From b84171a863c0cb4e8d034e4d81963b6359dbd800 Mon Sep 17 00:00:00 2001
From: Etienne Brateau <etienne.brateau@ensiie.fr>
Date: Sat, 15 Dec 2018 18:41:09 +0100
Subject: [PATCH] Remove unused newtablet
---
psys/include/p2c/newtablet.h | 59 ------------------------------------
psys/src/Makefile | 3 --
psys/src/newtablet.c | 46 ----------------------------
3 files changed, 108 deletions(-)
delete mode 100644 psys/include/p2c/newtablet.h
delete mode 100644 psys/src/newtablet.c
diff --git a/psys/include/p2c/newtablet.h b/psys/include/p2c/newtablet.h
deleted file mode 100644
index 4b0e17f..0000000
--- a/psys/include/p2c/newtablet.h
+++ /dev/null
@@ -1,59 +0,0 @@
-#ifndef NEWTABLET_H
-#define NEWTABLET_H
-
-
-#ifdef NEWTABLET_G
-# define vextern
-#else
-# define vextern extern
-#endif
-
-
-
-typedef enum {
- nt_none, nt_tablet, nt_mouse, nt_dials, nt_knob
-} nt_dev;
-
-typedef char nt_mkeytype[4][1 - 0 + 1];
-
-
-
-#define nt_down 1024
-#define nt_near 256
-
-#define nt_minDev nt_none
-#define nt_maxDev nt_knob
-
-
-
-vextern long nt_dial[9];
-vextern long nt_knobX, nt_knobY;
-vextern int nt_IsCursor[(long)nt_maxDev - (long)nt_minDev + 1];
-vextern nt_mkeytype nt_MButtonKey;
-vextern nt_dev nt_PreferredTablet;
-
-
-
-extern int nt_install ();
-extern int nt_init (long device);
-extern int nt_read (long *x, long *y, long *status);
-extern void nt_info (char *s, long *xl, long *yl, long *xh, long *yh);
-extern void nt_devname (char *s, int dev);
-extern nt_dev nt_devtype (char *s);
-extern int nt_HasDevice (int dev);
-extern void nt_ReadDevice (int dev, long *x, long *y, long *status);
-extern void nt_DevChange (int dev, long *dx, long *dy, long *status);
-extern void nt_SetDevice (int dev, long x, long y);
-extern void nt_ReadMouse (long *x, long *y, long *mstatus);
-extern void nt_cleardials ();
-extern long nt_dialchange (long dial);
-extern void nt_setdial (long dial, long val);
-extern void nt_ResetMouseButtons ();
-
-
-#undef vextern
-
-#endif /*NEWTABLET_H*/
-
-/* End. */
-
diff --git a/psys/src/Makefile b/psys/src/Makefile
index 7387c4c..b96912f 100644
--- a/psys/src/Makefile
+++ b/psys/src/Makefile
@@ -98,7 +98,6 @@ OBJS = sysdevs.o \
fs.o \
iodecl.o \
loader.o \
- newtablet.o \
lunix_pas.o \
general_1.o \
general_2.o \
@@ -263,7 +262,6 @@ psysinc:
cp ../include/p2c/rnd.h psys/include/p2c
cp ../include/p2c/iodecl.h psys/include/p2c
cp ../include/p2c/mylib.h psys/include/p2c
- cp ../include/p2c/newtablet.h psys/include/p2c
cp ../include/p2c/lunix_pas.h psys/include/p2c
cp ../include/p2c/loader.h psys/include/p2c
cp ../include/p2c/math.h psys/include/p2c
@@ -291,7 +289,6 @@ psyssrc:
cp newci.c psys/src
cp newcrt.c psys/src
cp newkbd.c psys/src
- cp newtablet.c psys/src
cp numex.c psys/src
cp p2clib.c psys/src
cp plot.c psys/src
diff --git a/psys/src/newtablet.c b/psys/src/newtablet.c
deleted file mode 100644
index aa84a35..0000000
--- a/psys/src/newtablet.c
+++ /dev/null
@@ -1,46 +0,0 @@
-#define NEWTABLET_G
-
-#include <stdio.h>
-#include <p2c/p2c.h>
-#include <p2c/newtablet.h>
-
-#ifndef MYLIB_H
-#include <p2c/mylib.h>
-#endif
-
-int nt_init(device)
-long device;
-{
- return(1);
-}
-
-void nt_info(s, xl, yl, xh, yh)
-char *s;
-long *xl, *yl, *xh, *yh;
-{
- if (! m_initialized)
- m_init_graphics();
-
- strcpy(s, "mouse");
- *xl = 0;
- *yl = 0;
- *xh = m_across;
- *yh = m_down;
-}
-
-int nt_read(x, y, status)
-long *x, *y, *status;
-{
- m_tablet_info pen;
-
- m_readpen(&pen);
- *x = pen.x;
- *y = pen.y;
- *status = pen.depressed * nt_down + pen.near_ * nt_near;
-
- return (1);
-}
-
-
-
-
--
GitLab