github.com/Interlisp.maiko
1
0
Fork 0
mirror of https://github.com/Interlisp/maiko.git synced 2026-01-26 11:52:25 +00:00
Code Issues Projects Releases Wiki Activity

Make sure OLD_CURSOR code is only for SUNDISPLAY. (#279)

Browse Source 
This is work in progress on Interlisp/medley#84.
This commit is contained in:
Bruce Mitchener
2021-01-25 07:58:18 +07:00
committed by GitHub
parent ab28391c18
commit db21b00a9f
4 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bin/compile-flags
View File

@@ -97,7 +97,8 @@ ORG_FILPCORSORBAR If true, you get the pixwin version of cursor changing;
otherwise, it gets done by direct writes into the display otherwise, it gets done by direct writes into the display
region. region.
OLD_CURSOR If true, uses the pixwin cursor code (e.g., win_setcursor); OLD_CURSOR If true, uses the pixwin cursor code (e.g., win_setcursor);
otherwise, uses the direct-write technique. otherwise, uses the direct-write technique. This is only needed
for SUNDISPLAY.
OS4_TYPE4BUG If true, includes the patches around SunOS 4.0.x's failure OS4_TYPE4BUG If true, includes the patches around SunOS 4.0.x's failure
to tell you you've got a Type-4 keyboard. to tell you you've got a Type-4 keyboard.
ALLDIRSEARCH CURRENTLY HARD DISABLED IN directory.c; looks like it ALLDIRSEARCH CURRENTLY HARD DISABLED IN directory.c; looks like it

2
inc/bitblt.h
View File

@@ -57,7 +57,7 @@ extern int DisplayRasterWidth;
#define ShowCursor { (currentdsp->mouse_visible)(IOPage68K->dlmousex, \ #define ShowCursor { (currentdsp->mouse_visible)(IOPage68K->dlmousex, \
IOPage68K->dlmousey); } IOPage68K->dlmousey); }
#elif OLD_CURSOR #elif defined(SUNDISPLAY) && defined(OLD_CURSOR)
extern struct winlock DisplayLockArea; extern struct winlock DisplayLockArea;
#define HideCursor \ #define HideCursor \
ioctl( LispWindowFd, WINLOCKSCREEN, &DisplayLockArea) ioctl( LispWindowFd, WINLOCKSCREEN, &DisplayLockArea)

2
src/dspsubrs.c
View File

@@ -99,7 +99,7 @@ void DSP_Cursor(LispPTR *args, int argnum)
extern int ScreenLocked; extern int ScreenLocked;
extern DLword *EmCursorX68K, *EmCursorY68K; extern DLword *EmCursorX68K, *EmCursorY68K;
extern int LastCursorX, LastCursorY; extern int LastCursorX, LastCursorY;
#if !defined(OLD_CURSOR) #if defined(SUNDISPLAY) && !defined(OLD_CURSOR)
static int Init = T; static int Init = T;
#endif #endif

3
src/keyevent.c
View File

@@ -173,6 +173,8 @@ typedef struct {
/* EmXXXX68K are already swapped, no need for GETWORD */ /* EmXXXX68K are already swapped, no need for GETWORD */
#ifdef SUNDISPLAY
#ifdef OLD_CURSOR #ifdef OLD_CURSOR
#define TrackCursor(cx, cy) \ #define TrackCursor(cx, cy) \
{ \ { \
@@ -190,6 +192,7 @@ typedef struct {
*EmCursorY68K = cy; \ *EmCursorY68K = cy; \
} }
#endif /* OLD_CURSOR */ #endif /* OLD_CURSOR */
#endif /* SUNDISPLAY */
/* commented out is some code that would also clobber /* commented out is some code that would also clobber
Irq_Stk_Check & Irq_Stk_End to force Irq_Stk_Check & Irq_Stk_End to force