github.com/Interlisp.maiko
1
0
Fork 0
mirror of https://github.com/Interlisp/maiko.git synced 2026-05-03 23:09:34 +00:00
Code Issues Projects Releases Wiki Activity

Fix !XWINDOW to be SUNDISPLAY ifdefery. (#234)

Browse Source 
Some of the `ifndef XWINDOW` code should have been
`ifdef SUNDISPLAY` instead.
This commit is contained in:
Bruce Mitchener
2021-01-19 14:45:59 +07:00
committed by GitHub
parent db6b351397
commit 7a24b41fc4
4 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/bbtsub.c
View File

@@ -36,15 +36,12 @@
#include "xdefs.h" #include "xdefs.h"
#endif /* XWINDOW */ #endif /* XWINDOW */
#ifndef XWINDOW #ifdef SUNDISPLAY
#ifndef NOPIXRECT #ifndef NOPIXRECT
#ifndef DOS
#include <sunwindow/window_hs.h> #include <sunwindow/window_hs.h>
#include <sunwindow/win_ioctl.h> #include <sunwindow/win_ioctl.h>
#endif /* DOS */
#endif /* NOPIXRECT */ #endif /* NOPIXRECT */
#endif /* SUNDISPLAY */
#endif /* XWINDOW */
#include "lispemul.h" #include "lispemul.h"
#include "lspglob.h" #include "lspglob.h"

4
src/kbdsubrs.c
View File

@@ -59,9 +59,9 @@ extern DspInterface currentdsp;
* *
****************************************************/ ****************************************************/
#ifndef XWINDOW #ifdef SUNDISPLAY
extern struct screen LispScreen; extern struct screen LispScreen;
#endif /* XWINDOW */ #endif /* SUNDISPLAY */
#ifdef XWINDOW #ifdef XWINDOW
#include <X11/Xlib.h> #include <X11/Xlib.h>

11
src/keyevent.c
View File

@@ -38,8 +38,7 @@
void Mouse_hndlr(void); /* Fields mouse events from driver */ void Mouse_hndlr(void); /* Fields mouse events from driver */
/* (during servicing of mouse interrupt) */ /* (during servicing of mouse interrupt) */
#elif XWINDOW #elif SUNDISPLAY
#else
#include <sunwindow/window_hs.h> #include <sunwindow/window_hs.h>
#include <sunwindow/win_ioctl.h> #include <sunwindow/win_ioctl.h>
#include <suntool/window.h> #include <suntool/window.h>
@@ -277,9 +276,9 @@ DLword ColorCursor_savebitmap[CURSORWIDTH / COLORPIXELS_IN_DLWORD * CURSORHEIGHT
void getsignaldata(int sig) void getsignaldata(int sig)
{ {
#ifndef DOS #ifndef DOS
#ifndef XWINDOW #ifdef SUNDISPLAY
struct inputevent event; struct inputevent event;
#endif /* XWINDOW */ #endif /* SUNDISPLAY */
fd_set rfds, efds; fd_set rfds, efds;
u_int iflags; u_int iflags;
int i; int i;
@@ -374,6 +373,7 @@ getmore:
#endif /* DOS */ #endif /* DOS */
} /* end getsignaldata */ } /* end getsignaldata */
#ifdef SUNDISPLAY
/************************************************************************/ /************************************************************************/
/* */ /* */
/* k b _ e v e n t */ /* k b _ e v e n t */
@@ -382,7 +382,6 @@ getmore:
/* occurred, 0 if one didn't occur. */ /* occurred, 0 if one didn't occur. */
/* */ /* */
/************************************************************************/ /************************************************************************/
#if (!defined(XWINDOW) && !defined(DOS))
extern int for_makeinit; extern int for_makeinit;
int kb_event(struct inputevent *event); int kb_event(struct inputevent *event);
@@ -499,7 +498,7 @@ int kb_event(struct inputevent *event);
} /* if *EmRealUtilin68K end */ } /* if *EmRealUtilin68K end */
return (1); return (1);
} }
#endif /* neither XWINDOW nor DOS*/ #endif /* SUNDISPLAY */
/************************************************************************/ /************************************************************************/
/* */ /* */

7
src/uraid.c
View File

@@ -35,11 +35,9 @@
#include <sys/select.h> #include <sys/select.h>
#endif /* DOS */ #endif /* DOS */
#ifndef XWINDOW
#ifdef SUNDISPLAY #ifdef SUNDISPLAY
#include <sundev/kbd.h> #include <sundev/kbd.h>
#include <sundev/kbio.h> #include <sundev/kbio.h>
#endif /* SUNDISPLAY */
#include <errno.h> #include <errno.h>
#ifndef NOPIXRECT #ifndef NOPIXRECT
#include <sunwindow/window_hs.h> #include <sunwindow/window_hs.h>
@@ -48,12 +46,9 @@
#include <sunwindow/win_cursor.h> #include <sunwindow/win_cursor.h>
#include <sunwindow/cms.h> #include <sunwindow/cms.h>
#include <sys/mman.h> #include <sys/mman.h>
#ifdef SUNDISPLAY
extern int Win_security_p; extern int Win_security_p;
#endif /* SUNDISPLAY */
#endif /* NOPIXRECT */ #endif /* NOPIXRECT */
#endif /* XWINDOW */ #endif /* SUNDISPLAY */
#ifdef OS5 #ifdef OS5
#include <stropts.h> #include <stropts.h>