github.com/Interlisp.maiko
1
0
Fork 0
mirror of https://github.com/Interlisp/maiko.git synced 2026-01-14 07:30:21 +00:00
Code Issues Projects Releases Wiki Activity

Correct spelling of ...visible (was ...vissible) in all source files.

Browse Source 
modified:   ../inc/bitblt.h
	modified:   ../inc/devif.h
	modified:   ../src/bitblt.c
	modified:   ../src/dosmouse.c
	modified:   ../src/dspif.c
	modified:   ../src/initdsp.c
	modified:   ../src/keyevent.c
	modified:   ../src/vesafns.asm
	modified:   ../src/vesainit.c
	modified:   ../src/vgainit.c
	modified:   ../src/vmemsave.c
	modified:   ../src/xbbt.c
	modified:   ../src/xc.c
	modified:   ../src/xc.c.orig
	modified:   ../src/xinit.c
	modified:   ../src/xlspwin.c
	modified:   ../src/xscroll.c
	modified:   ../src/xwinman.c
This commit is contained in:
Nick Briggs 2017-06-22 23:32:22 -07:00
parent afb6ae3397
commit cef5b57a9d
18 changed files with 114 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inc/bitblt.h Executable file → Normal file
View File

@ -51,8 +51,8 @@ extern int DisplayRasterWidth;
#ifdef DOS
#define HideCursor { (currentdsp->mouse_invissible)(currentdsp, IOPage68K); }
#define ShowCursor { (currentdsp->mouse_vissible)(IOPage68K->dlmousex, \
#define HideCursor { (currentdsp->mouse_invisible)(currentdsp, IOPage68K); }
#define ShowCursor { (currentdsp->mouse_visible)(IOPage68K->dlmousex, \
IOPage68K->dlmousey); }
#elif OLD_CURSOR

10
inc/devif.h Executable file → Normal file
View File

@ -216,13 +216,13 @@ typedef struct
unsigned long (* bitblt_from_screen)();
unsigned long (* scroll_region)(); /* ie. bbt from screen to screen */
void (* mouse_invissible)(); /* MOUSE_INVISSIBLE
void (* mouse_invisible)(); /* MOUSE_INVISSIBLE
args: self (a dsp), iop (an IOPAGE preferably the one and only)
This method makes the mouse invissible on the screen. Note that
This method makes the mouse invisible on the screen. Note that
the dsp supplys the method and the iop supplys the data. */
void (* mouse_vissible)(); /* MOUSE_VISSIBLE
void (* mouse_visible)(); /* MOUSE_VISSIBLE
args: self (a dsp), iop (an IOPAGE preferably the one and only)
This method makes the mouse vissible on the screen. Note that
This method makes the mouse visible on the screen. Note that
the dsp supplys the method and the iop supplys the data. */
MRegion Display; /* Dimensions of the physical display. */
unsigned short bitsperpixel;
@ -258,7 +258,7 @@ typedef struct
Window SWGrav;
Window NWGrav;
GC Copy_GC;
MRegion Vissible;
MRegion Visible;
unsigned int InternalBorderWidth;
unsigned int ScrollBarWidth;
Pixmap ScrollBarPixmap;

4
src/bitblt.c
View File

@ -129,7 +129,7 @@ LispPTR N_OP_pilotbitblt(LispPTR pilot_bt_tbl,int tos)
#ifdef SUNDISPLAY
if (displayflg) HideCursor;
#elif DOS
if (displayflg) (currentdsp->mouse_invissible)(currentdsp, IOPage68K);
if (displayflg) (currentdsp->mouse_invisible)(currentdsp, IOPage68K);
;
#endif /* SUNDISPLAY / DOS */
@ -146,7 +146,7 @@ LispPTR N_OP_pilotbitblt(LispPTR pilot_bt_tbl,int tos)
if (displayflg) ShowCursor;
#elif DOS
flush_display_lineregion(dx, dstbase, w, h);
if (displayflg) (currentdsp->mouse_vissible)(IOPage68K->dlmousex, IOPage68K->dlmousey);
if (displayflg) (currentdsp->mouse_visible)(IOPage68K->dlmousex, IOPage68K->dlmousey);
#endif /* SUNDISPLAY / DOS */
#ifdef XWINDOW

8
src/dosmouse.c
View File

@ -212,9 +212,9 @@ void DosMouseBeforeRaid(MouseInterface mouse, DspInterface dsp)
/* d o s _ c u r s o r _ i n v i s s i b l e */
/* Since we only blit the cursor to the VESA/VGA displaybuffer */
/* and not to the emulator displaybuffer we can make the cursor*/
/* invissible just by updateing the area under the cursor! */
/* invisible just by updateing the area under the cursor! */
/***************************************************************/
void dos_cursor_invissible(DspInterface dsp, IOPAGE *iop)
void dos_cursor_invisible(DspInterface dsp, IOPAGE *iop)
{ (dsp->bitblt_to_screen)(dsp, DisplayRegion68k, iop->dlcursorx, iop->dlcursory, 16, 16); }
@ -254,10 +254,10 @@ set_DOSmouseposition(DspInterface dsp, int x, int y)
/* *(currentmouse->timestamp) = MiscStats->secondstmp; */
(currentdsp->mouse_invissible)(currentdsp, IOPage68K);
(currentdsp->mouse_invisible)(currentdsp, IOPage68K);
currentmouse->Cursor.New.x = IOPage68K->dlcursorx = x;
currentmouse->Cursor.New.y = IOPage68K->dlcursory = y;
(currentdsp->mouse_vissible)(x, y);
(currentdsp->mouse_visible)(x, y);
dsp->device.locked--;
currentmouse->device.active--;

4
src/dspif.c
View File

@ -133,8 +133,8 @@ void describedsp(DspInterface dsp) {
printf("bitblt_to_screen= %p\n", dsp->bitblt_to_screen);
printf("cleardisplay= %p\n", dsp->cleardisplay);
#ifdef DOS
printf("mouse_vissible= %d\n", dsp->mouse_vissible);
printf("mouse_invissible= %d\n", dsp->mouse_invissible);
printf("mouse_visible= %d\n", dsp->mouse_visible);
printf("mouse_invisible= %d\n", dsp->mouse_invisible);
printf("\n");
#endif /* DOS */
fflush(stdout);

6
src/initdsp.c
View File

@ -679,9 +679,9 @@ void flush_display_buffer() {
#endif /* SUNDISPLAY */
#ifdef XWINDOW
(currentdsp->bitblt_to_screen)(currentdsp, DisplayRegion68k, currentdsp->Vissible.x,
currentdsp->Vissible.y, currentdsp->Vissible.width,
currentdsp->Vissible.height);
(currentdsp->bitblt_to_screen)(currentdsp, DisplayRegion68k, currentdsp->Visible.x,
currentdsp->Visible.y, currentdsp->Visible.width,
currentdsp->Visible.height);
#elif DOS
TPRINT(("Enter flush_display_buffer\n"));
(currentdsp->bitblt_to_screen)(currentdsp, DisplayRegion68k, 0, 0, currentdsp->Display.width,

4
src/keyevent.c
View File

@ -607,7 +607,7 @@ void taking_mouse_down() {
static int src_comp = 0, op = 0, gray = 0, num_gray = 0, curr_gray_line = 0;
#ifdef DOS
(currentdsp->mouse_invissible)(currentdsp, IOPage68K);
(currentdsp->mouse_invisible)(currentdsp, IOPage68K);
#else
if (!DisplayInitialized) return;
@ -761,7 +761,7 @@ void copy_cursor(int newx, int newy)
void taking_mouse_up(int newx, int newy)
{
#ifdef DOS
(currentdsp->mouse_vissible)(newx, newy);
(currentdsp->mouse_visible)(newx, newy);
#else
if (!DisplayInitialized) return;
/* save hidden bitmap */

10
src/vesafns.asm Executable file → Normal file
View File

@ -74,8 +74,8 @@ DATA SEGMENT USE32
bitblit_from_screen DD ?
scroll_region DD ?
mouse_invissible DD ?
mouse_vissible DD ?
mouse_invisible DD ?
mouse_visible DD ?
Disp MRegion <>
bitsperpixel DD ?
@ -246,8 +246,8 @@ Dosclearbanks ENDP
;; **************************************************
dsp = 8
iop = 12
PUBLIC DOSCursorVissible
DOSCursorVissible PROC NEAR
PUBLIC DOSCursorVisible
DOSCursorVisible PROC NEAR
enter 32,0
push edx
@ -290,7 +290,7 @@ bltcur: lodsw ; cursorbitmap to ax
pop edx
RET2C 0
DOSCursorVissible ENDP
DOSCursorVisible ENDP
;; **************************************************

16
src/vesainit.c
View File

@ -81,8 +81,8 @@ extern unsigned long Dosbbt1();
extern unsigned long Dosbbt2();
extern unsigned long Dosbbt3();
extern void Dosclearbanks();
extern long DOSCursorVissible();
extern long dos_cursor_invissible();
extern long DOSCursorVisible();
extern long dos_cursor_invisible();
extern int dostaking_mouse_down();
extern int dostaking_mouse_up();
@ -301,8 +301,8 @@ void VESA_enter(DspInterface dsp)
/* These are needed in the interrupt processing. Lock'em to prevent pagefaults. */
_dpmi_lockregion(dsp, sizeof(*dsp));
_dpmi_lockregion(dsp->bitblt_to_screen, 0x2000);
_dpmi_lockregion(dsp->mouse_invissible, 0x2000);
_dpmi_lockregion(dsp->mouse_vissible, 0x2000);
_dpmi_lockregion(dsp->mouse_invisible, 0x2000);
_dpmi_lockregion(dsp->mouse_visible, 0x2000);
_dpmi_lockregion((void *)&docopy, 0x2000);
TPRINT(("Exit VESA_enter\n"));
@ -317,8 +317,8 @@ void VESA_exit(DspInterface dsp)
_dpmi_unlockregion(DisplayRegion68k, 1600 * 1208 / 8);
_dpmi_unlockregion(dsp->bitblt_to_screen, 0x2000);
_dpmi_unlockregion(dsp->mouse_invissible, 0x2000);
_dpmi_unlockregion(dsp->mouse_vissible, 0x2000);
_dpmi_unlockregion(dsp->mouse_invisible, 0x2000);
_dpmi_unlockregion(dsp->mouse_visible, 0x2000);
_dpmi_unlockregion((void *)&docopy, 0x2000);
_dpmi_unlockregion(dsp, sizeof(*dsp));
@ -451,8 +451,8 @@ void VESA_init(DspInterface dsp, char *lispbitmap, int width_hint, int height_hi
dsp->bitblt_from_screen = (PFUL)&GenericPanic;
dsp->scroll_region = (PFUL)&GenericPanic;
dsp->mouse_invissible = (PFV)&dostaking_mouse_down;
dsp->mouse_vissible = (PFV)&dostaking_mouse_up;
dsp->mouse_invisible = (PFV)&dostaking_mouse_down;
dsp->mouse_visible = (PFV)&dostaking_mouse_up;
TPRINT(("Exit VESA_init\n"));
}

12
src/vgainit.c
View File

@ -56,8 +56,8 @@ void VGA_setmax(DspInterface dsp)
/* These are needed in the interrupt processing. Lock'em to prevent pagefaults. */
_dpmi_lockregion(dsp, sizeof(*dsp));
_dpmi_lockregion(dsp->bitblt_to_screen, 0x2000);
_dpmi_lockregion(dsp->mouse_invissible, 0x2000);
_dpmi_lockregion(dsp->mouse_vissible, 0x2000);
_dpmi_lockregion(dsp->mouse_invisible, 0x2000);
_dpmi_lockregion(dsp->mouse_visible, 0x2000);
_dpmi_lockregion((void *)&docopy, 0x2000);
}
@ -71,8 +71,8 @@ void VGA_exit(DspInterface dsp)
/* These are needed in the interrupt processing. Lock'em to prevent pagefaults. */
_dpmi_unlockregion(dsp, sizeof(*dsp));
_dpmi_unlockregion(dsp->bitblt_to_screen, 0x2000);
_dpmi_unlockregion(dsp->mouse_invissible, 0x2000);
_dpmi_unlockregion(dsp->mouse_vissible, 0x2000);
_dpmi_unlockregion(dsp->mouse_invisible, 0x2000);
_dpmi_unlockregion(dsp->mouse_visible, 0x2000);
_dpmi_unlockregion((void *)&docopy, 0x2000);
_setvideomode(_DEFAULTMODE);
@ -145,8 +145,8 @@ VGA_init(DspInterface dsp, char *lispbitmap, int width_hint, int height_hint, in
dsp->BytesPerLine = 80;
dsp->LinesPerBank = 512;
dsp->mouse_invissible = (PFV)&dostaking_mouse_down;
dsp->mouse_vissible = (PFV)&dostaking_mouse_up;
dsp->mouse_invisible = (PFV)&dostaking_mouse_down;
dsp->mouse_visible = (PFV)&dostaking_mouse_up;
dsp->device.locked = FALSE;
dsp->device.active = FALSE;

4
src/vmemsave.c
View File

@ -369,7 +369,7 @@ LispPTR vmem_save(char *sysout_file_name)
/* For DOS, must also take the mouse cursor away (it's */
/* written into the display-region bitmap). */
currentdsp->device.locked++;
(currentdsp->mouse_invissible)(currentdsp, IOPage68K);
(currentdsp->mouse_invisible)(currentdsp, IOPage68K);
#endif /* SUNDISPLAY || DOS */
/* set FPTOVP */
@ -553,7 +553,7 @@ LispPTR vmem_save(char *sysout_file_name)
#elif DOS
/* Must also put the mouse back. */
(currentdsp->mouse_vissible)(IOPage68K->dlmousex, IOPage68K->dlmousey);
(currentdsp->mouse_visible)(IOPage68K->dlmousex, IOPage68K->dlmousey);
currentdsp->device.locked--;
#endif /* SUNDISPLAY */

24
src/xbbt.c
View File

@ -41,36 +41,36 @@ unsigned long clipping_Xbitblt(DspInterface dsp, int dummy, int x, int y, int w,
{
int temp_x, temp_y, LowerRightX, LowerRightY;
LowerRightX = dsp->Vissible.x + dsp->Vissible.width;
LowerRightY = dsp->Vissible.y + dsp->Vissible.height;
LowerRightX = dsp->Visible.x + dsp->Visible.width;
LowerRightY = dsp->Visible.y + dsp->Visible.height;
temp_x = x + w - 1;
temp_y = y + h - 1;
if ((temp_x < dsp->Vissible.x) || (x > LowerRightX) || (temp_y < dsp->Vissible.y) ||
if ((temp_x < dsp->Visible.x) || (x > LowerRightX) || (temp_y < dsp->Visible.y) ||
(y > LowerRightY))
return (0);
if ((x >= dsp->Vissible.x) && (temp_x <= LowerRightX) && (y >= dsp->Vissible.y) &&
if ((x >= dsp->Visible.x) && (temp_x <= LowerRightX) && (y >= dsp->Visible.y) &&
(temp_y <= LowerRightY)) {
XLOCK;
XPutImage(dsp->display_id, dsp->DisplayWindow, dsp->Copy_GC, &dsp->ScreenBitmap, x, y,
x - dsp->Vissible.x, y - dsp->Vissible.y, w, h);
x - dsp->Visible.x, y - dsp->Visible.y, w, h);
XFlush(dsp->display_id);
XUNLOCK;
return (0);
}
if (x < dsp->Vissible.x) {
w -= dsp->Vissible.x - x;
x = dsp->Vissible.x;
if (x < dsp->Visible.x) {
w -= dsp->Visible.x - x;
x = dsp->Visible.x;
}
if (temp_x > LowerRightX) w -= temp_x - LowerRightX;
if (y < dsp->Vissible.y) {
h -= dsp->Vissible.y - y;
y = dsp->Vissible.y;
if (y < dsp->Visible.y) {
h -= dsp->Visible.y - y;
y = dsp->Visible.y;
}
if (temp_y > LowerRightY) h -= temp_y - LowerRightY;
@ -78,7 +78,7 @@ unsigned long clipping_Xbitblt(DspInterface dsp, int dummy, int x, int y, int w,
if ((w > 0) && (h > 0)) {
XLOCK;
XPutImage(dsp->display_id, dsp->DisplayWindow, dsp->Copy_GC, &dsp->ScreenBitmap, x, y,
x - dsp->Vissible.x, y - dsp->Vissible.y, w, h);
x - dsp->Visible.x, y - dsp->Visible.y, w, h);
XFlush(dsp->display_id);
XUNLOCK;
}

4
src/xc.c
View File

@ -1345,7 +1345,7 @@ check_interrupt:
currentdsp->device.locked++;
/* Remove the mouse from the old place on the screen */
(currentdsp->mouse_invissible)(currentdsp, IOPage68K);
(currentdsp->mouse_invisible)(currentdsp, IOPage68K);
/* Find the new delta */
regs.w.eax = 0x000B; /* Function 0xB = get delta mickeys */
@ -1367,7 +1367,7 @@ check_interrupt:
IOPage68K->dlmousey = IOPage68K->dlcursory = currentmouse->Cursor.New.y;
/* Paint the mouse back up on the screen on the new place */
(currentdsp->mouse_vissible)(currentmouse->Cursor.New.x, currentmouse->Cursor.New.y);
(currentdsp->mouse_visible)(currentmouse->Cursor.New.x, currentmouse->Cursor.New.y);
currentmouse->Cursor.Moved = FALSE;
currentdsp->device.locked--;
}

4
src/xc.c.orig Executable file → Normal file
View File

@ -938,7 +938,7 @@ stackoverflow_help:
currentdsp->device.locked++;
/* Remove the mouse from the old place on the screen */
(currentdsp->mouse_invissible)(currentdsp, IOPage68K);
(currentdsp->mouse_invisible)(currentdsp, IOPage68K);
/* Find the new delta */
regs.w.eax = 0x000B; /* Function 0xB = get delta mickeys */
@ -964,7 +964,7 @@ stackoverflow_help:
currentmouse->Cursor.New.y;
/* Paint the mouse back up on the screen on the new place */
(currentdsp->mouse_vissible)( currentmouse->Cursor.New.x,
(currentdsp->mouse_visible)( currentmouse->Cursor.New.x,
currentmouse->Cursor.New.y);
currentmouse->Cursor.Moved = FALSE;
currentdsp->device.locked--;

14
src/xinit.c
View File

@ -183,8 +183,8 @@ void Xevent_before_raid(DspInterface dsp)
void Xevent_after_raid(DspInterface dsp)
{
init_Xevent(dsp);
(dsp->bitblt_to_screen)(dsp, 0, dsp->Vissible.x, dsp->Vissible.y, dsp->Vissible.width,
dsp->Vissible.height);
(dsp->bitblt_to_screen)(dsp, 0, dsp->Visible.x, dsp->Visible.y, dsp->Visible.width,
dsp->Visible.height);
XLOCK;
XFlush(dsp->display_id);
XUNLOCK;
@ -274,8 +274,8 @@ DspInterface X_init(DspInterface dsp, char *lispbitmap, int width_hint, int heig
dsp->ScrollBarWidth = SCROLL_WIDTH;
dsp->InternalBorderWidth = DEF_BDRWIDE;
dsp->Vissible.x = LispDisplayRequestedX;
dsp->Vissible.y = LispDisplayRequestedY;
dsp->Visible.x = LispDisplayRequestedX;
dsp->Visible.y = LispDisplayRequestedY;
/* Set the width and height of the display. */
if (height_hint == 0) {
@ -312,11 +312,11 @@ DspInterface X_init(DspInterface dsp, char *lispbitmap, int width_hint, int heig
dsp->cleardisplay = (PFV)GenericReturnT;
dsp->set_color_map_entry = (PFUL)GenericReturnT;
/* Set the geometry of the Vissible (Lisp) window. */
dsp->Vissible.width =
/* Set the geometry of the Visible (Lisp) window. */
dsp->Visible.width =
bound(OUTER_SB_WIDTH(dsp), LispWindowRequestedWidth,
min(dsp->Display.width, (WidthOfScreen(Xscreen) - OUTER_SB_WIDTH(dsp))));
dsp->Vissible.height =
dsp->Visible.height =
bound(OUTER_SB_WIDTH(dsp), LispWindowRequestedHeight,
min(dsp->Display.height, (HeightOfScreen(Xscreen) - OUTER_SB_WIDTH(dsp))));

36
src/xlspwin.c
View File

@ -90,17 +90,17 @@ void Create_LispWindow(DspInterface dsp)
IT = Icon_Title;
GravSize = (int)(dsp->ScrollBarWidth / 2) - (dsp->InternalBorderWidth);
Col2 = dsp->Vissible.width;
Row2 = dsp->Vissible.height;
Col3 = dsp->Vissible.width + (int)(OUTER_SB_WIDTH(dsp) / 2);
Row3 = dsp->Vissible.height + (int)(OUTER_SB_WIDTH(dsp) / 2);
Col2 = dsp->Visible.width;
Row2 = dsp->Visible.height;
Col3 = dsp->Visible.width + (int)(OUTER_SB_WIDTH(dsp) / 2);
Row3 = dsp->Visible.height + (int)(OUTER_SB_WIDTH(dsp) / 2);
screen = ScreenOfDisplay(dsp->display_id, DefaultScreen(dsp->display_id));
dsp->LispWindow = XCreateSimpleWindow(
dsp->display_id, RootWindowOfScreen(screen), LispWindowRequestedX, /* Default upper left */
LispWindowRequestedY, /* Default upper left */
dsp->Vissible.width + OUTER_SB_WIDTH(dsp), /* Default width */
dsp->Vissible.height + OUTER_SB_WIDTH(dsp), /* Default height */
dsp->Visible.width + OUTER_SB_WIDTH(dsp), /* Default width */
dsp->Visible.height + OUTER_SB_WIDTH(dsp), /* Default height */
0, /* Default border */
BlackPixelOfScreen(screen), WhitePixelOfScreen(screen));
@ -149,7 +149,7 @@ void Create_LispWindow(DspInterface dsp)
init_Xcursor(dsp->display_id, dsp->LispWindow);
dsp->DisplayWindow = XCreateSimpleWindow(dsp->display_id, dsp->LispWindow, 0, 0,
dsp->Vissible.width, dsp->Vissible.height, 0,
dsp->Visible.width, dsp->Visible.height, 0,
BlackPixelOfScreen(screen), WhitePixelOfScreen(screen));
XChangeWindowAttributes(dsp->display_id, dsp->DisplayWindow,
CWBitGravity | CWOverrideRedirect | CWBackingStore,
@ -199,14 +199,14 @@ void Create_LispWindow(DspInterface dsp)
dsp->VerScrollBar = XCreateSimpleWindow(dsp->display_id, dsp->LispWindow, Col2,
0 - dsp->InternalBorderWidth, /* y */
dsp->ScrollBarWidth, /* width */
dsp->Vissible.height, dsp->InternalBorderWidth,
dsp->Visible.height, dsp->InternalBorderWidth,
BlackPixelOfScreen(screen), WhitePixelOfScreen(screen));
DefineCursor(dsp->display_id, dsp->VerScrollBar, &VertScrollCursor);
XMapWindow(dsp->display_id, dsp->VerScrollBar);
dsp->HorScrollBar = XCreateSimpleWindow(dsp->display_id, dsp->LispWindow,
0 - dsp->InternalBorderWidth, Row2, /* y */
dsp->Vissible.width, /* width */
dsp->Visible.width, /* width */
dsp->ScrollBarWidth, dsp->InternalBorderWidth,
BlackPixelOfScreen(screen), WhitePixelOfScreen(screen));
DefineCursor(dsp->display_id, dsp->HorScrollBar, &HorizScrollCursor);
@ -216,9 +216,9 @@ void Create_LispWindow(DspInterface dsp)
dsp->VerScrollButton = XCreateSimpleWindow(
dsp->display_id, dsp->VerScrollBar, 0 - dsp->InternalBorderWidth, /* x */
(int)((dsp->Vissible.y * dsp->Vissible.height) / dsp->Display.height), /* y */
(int)((dsp->Visible.y * dsp->Visible.height) / dsp->Display.height), /* y */
dsp->ScrollBarWidth, /* width */
(int)((dsp->Vissible.height * dsp->Vissible.height) / dsp->Display.height) + 1,
(int)((dsp->Visible.height * dsp->Visible.height) / dsp->Display.height) + 1,
dsp->InternalBorderWidth, BlackPixelOfScreen(screen), WhitePixelOfScreen(screen));
XChangeWindowAttributes(dsp->display_id, dsp->VerScrollButton, CWOverrideRedirect,
&Lisp_SetWinAttributes);
@ -228,9 +228,9 @@ void Create_LispWindow(DspInterface dsp)
dsp->HorScrollButton = XCreateSimpleWindow(
dsp->display_id, dsp->HorScrollBar,
(int)((dsp->Vissible.x * dsp->Vissible.width) / dsp->Display.width),
(int)((dsp->Visible.x * dsp->Visible.width) / dsp->Display.width),
0 - dsp->InternalBorderWidth, /* y */
(int)((dsp->Vissible.width * dsp->Vissible.width) / dsp->Display.width) + 1,
(int)((dsp->Visible.width * dsp->Visible.width) / dsp->Display.width) + 1,
dsp->ScrollBarWidth, dsp->InternalBorderWidth, BlackPixelOfScreen(screen),
WhitePixelOfScreen(screen));
XChangeWindowAttributes(dsp->display_id, dsp->HorScrollButton, CWOverrideRedirect,
@ -285,7 +285,7 @@ void lisp_Xvideocolor(int flag)
{
XLOCK;
XCopyArea(currentdsp->display_id, currentdsp->DisplayWindow, currentdsp->DisplayWindow,
currentdsp->Copy_GC, 0, 0, currentdsp->Vissible.width, currentdsp->Vissible.height, 0,
currentdsp->Copy_GC, 0, 0, currentdsp->Visible.width, currentdsp->Visible.height, 0,
0);
/* Cursor */
@ -307,11 +307,11 @@ void set_Xmouseposition(int x, int y)
TPRINT(("set_Xmouseposition(%d,%d)\n", x, y));
dest_x = (x & 0xFFFF) + Current_Hot_X - currentdsp->Vissible.x;
dest_y = (y & 0xFFFF) + Current_Hot_Y - currentdsp->Vissible.y;
dest_x = (x & 0xFFFF) + Current_Hot_X - currentdsp->Visible.x;
dest_y = (y & 0xFFFF) + Current_Hot_Y - currentdsp->Visible.y;
if ((dest_x >= 0) && (dest_x <= currentdsp->Vissible.width) && (dest_y >= 0) &&
(dest_y <= currentdsp->Vissible.height)) {
if ((dest_x >= 0) && (dest_x <= currentdsp->Visible.width) && (dest_y >= 0) &&
(dest_y <= currentdsp->Visible.height)) {
XLOCK;
XWarpPointer(currentdsp->display_id, (Window)NULL, currentdsp->DisplayWindow, 0, 0, 0, 0,
dest_x, dest_y);

24
src/xscroll.c
View File

@ -34,33 +34,33 @@ int ScrollPitch = SCROLL_PITCH;
void Scroll(DspInterface dsp, int newX, int newY)
{
/* Limit the newX and newY values. */
dsp->Vissible.x = bound(0, newX, dsp->Display.width - dsp->Vissible.width);
dsp->Vissible.y = bound(0, newY, dsp->Display.height - dsp->Vissible.height);
dsp->Visible.x = bound(0, newX, dsp->Display.width - dsp->Visible.width);
dsp->Visible.y = bound(0, newY, dsp->Display.height - dsp->Visible.height);
newX = (int)((dsp->Vissible.x * dsp->Vissible.width) / dsp->Display.width);
newY = (int)((dsp->Vissible.y * dsp->Vissible.height) / dsp->Display.height);
newX = (int)((dsp->Visible.x * dsp->Visible.width) / dsp->Display.width);
newY = (int)((dsp->Visible.y * dsp->Visible.height) / dsp->Display.height);
XMoveWindow(dsp->display_id, dsp->HorScrollButton, newX, -dsp->InternalBorderWidth);
XMoveWindow(dsp->display_id, dsp->VerScrollButton, -dsp->InternalBorderWidth, newY);
(dsp->bitblt_to_screen)(dsp, 0, dsp->Vissible.x, dsp->Vissible.y, dsp->Vissible.width,
dsp->Vissible.height);
(dsp->bitblt_to_screen)(dsp, 0, dsp->Visible.x, dsp->Visible.y, dsp->Visible.width,
dsp->Visible.height);
} /* end Scroll */
void JumpScrollVer(DspInterface dsp, int y)
{ Scroll(dsp, dsp->Vissible.x, (int)((dsp->Display.width * y) / dsp->Vissible.height)); }
{ Scroll(dsp, dsp->Visible.x, (int)((dsp->Display.width * y) / dsp->Visible.height)); }
void JumpScrollHor(DspInterface dsp, int x)
{ Scroll(dsp, (int)((dsp->Display.width * x) / dsp->Vissible.width), dsp->Vissible.y); }
{ Scroll(dsp, (int)((dsp->Display.width * x) / dsp->Visible.width), dsp->Visible.y); }
void ScrollLeft(DspInterface dsp)
{ Scroll(dsp, dsp->Vissible.x - ScrollPitch, dsp->Vissible.y); }
{ Scroll(dsp, dsp->Visible.x - ScrollPitch, dsp->Visible.y); }
void ScrollRight(DspInterface dsp)
{ Scroll(dsp, dsp->Vissible.x + ScrollPitch, dsp->Vissible.y); }
{ Scroll(dsp, dsp->Visible.x + ScrollPitch, dsp->Visible.y); }
void ScrollUp(DspInterface dsp)
{ Scroll(dsp, dsp->Vissible.x, dsp->Vissible.y - ScrollPitch); }
{ Scroll(dsp, dsp->Visible.x, dsp->Visible.y - ScrollPitch); }
void ScrollDown(DspInterface dsp)
{ Scroll(dsp, dsp->Vissible.x, dsp->Vissible.y + ScrollPitch); }
{ Scroll(dsp, dsp->Visible.x, dsp->Visible.y + ScrollPitch); }

40
src/xwinman.c
View File

@ -89,52 +89,52 @@ void lisp_Xconfigure(DspInterface dsp, int x, int y, int lspWinWidth, int lspWin
{
int GravSize, Col2, Row2, Col3, Row3;
/* The Vissible width and height changes when */
/* The Visible width and height changes when */
/* we configure the window. Make them */
/* stay within bounds. */
dsp->Vissible.width =
dsp->Visible.width =
bound(OUTER_SB_WIDTH(dsp) + 2, lspWinWidth, dsp->Display.width + OUTER_SB_WIDTH(dsp)) -
OUTER_SB_WIDTH(dsp);
dsp->Vissible.height =
dsp->Visible.height =
bound(OUTER_SB_WIDTH(dsp) + 2, lspWinHeight, dsp->Display.height + OUTER_SB_WIDTH(dsp)) -
OUTER_SB_WIDTH(dsp);
GravSize = (int)(dsp->ScrollBarWidth / 2) - (dsp->InternalBorderWidth);
Col2 = dsp->Vissible.width;
Row2 = dsp->Vissible.height;
Col3 = dsp->Vissible.width + (int)(OUTER_SB_WIDTH(dsp) / 2);
Row3 = dsp->Vissible.height + (int)(OUTER_SB_WIDTH(dsp) / 2);
Col2 = dsp->Visible.width;
Row2 = dsp->Visible.height;
Col3 = dsp->Visible.width + (int)(OUTER_SB_WIDTH(dsp) / 2);
Row3 = dsp->Visible.height + (int)(OUTER_SB_WIDTH(dsp) / 2);
XLOCK;
XMoveResizeWindow(dsp->display_id, dsp->DisplayWindow, 0, 0, dsp->Vissible.width,
dsp->Vissible.height);
XMoveResizeWindow(dsp->display_id, dsp->DisplayWindow, 0, 0, dsp->Visible.width,
dsp->Visible.height);
/* Scroll bars */
XMoveResizeWindow(dsp->display_id, dsp->VerScrollBar, Col2, 0 - dsp->InternalBorderWidth, /* y */
dsp->ScrollBarWidth, /* width */
dsp->Vissible.height); /* height */
dsp->Visible.height); /* height */
XMoveResizeWindow(dsp->display_id, dsp->HorScrollBar, 0 - dsp->InternalBorderWidth, Row2, /* y */
dsp->Vissible.width, /* width */
dsp->Visible.width, /* width */
dsp->ScrollBarWidth); /* height */
/* Scroll buttons */
XMoveResizeWindow(
dsp->display_id, dsp->HorScrollButton,
(int)((dsp->Vissible.x * dsp->Vissible.width) / dsp->Display.width), /* x */
(int)((dsp->Visible.x * dsp->Visible.width) / dsp->Display.width), /* x */
0 - dsp->InternalBorderWidth, /* y */
(int)((dsp->Vissible.width * dsp->Vissible.width) / dsp->Display.width) + 1, /* width */
(int)((dsp->Visible.width * dsp->Visible.width) / dsp->Display.width) + 1, /* width */
dsp->ScrollBarWidth); /* height */
XMoveResizeWindow(
dsp->display_id, dsp->VerScrollButton, 0 - dsp->InternalBorderWidth, /* x */
(int)((dsp->Vissible.y * dsp->Vissible.height) / dsp->Display.height), /* y */
(int)((dsp->Visible.y * dsp->Visible.height) / dsp->Display.height), /* y */
dsp->ScrollBarWidth, /* width */
(int)((dsp->Vissible.height * dsp->Vissible.height) / dsp->Display.height) + 1); /* height */
(int)((dsp->Visible.height * dsp->Visible.height) / dsp->Display.height) + 1); /* height */
/* Gravity windows */
XMoveResizeWindow(dsp->display_id, dsp->NWGrav, Col2, Row2, GravSize, GravSize);
XMoveResizeWindow(dsp->display_id, dsp->NEGrav, Col3, Row2, GravSize, GravSize);
XMoveResizeWindow(dsp->display_id, dsp->SEGrav, Col3, Row3, GravSize, GravSize);
XMoveResizeWindow(dsp->display_id, dsp->SWGrav, Col2, Row3, GravSize, GravSize);
Scroll(dsp, dsp->Vissible.x, dsp->Vissible.y);
Scroll(dsp, dsp->Visible.x, dsp->Visible.y);
XFlush(dsp->display_id);
XUNLOCK;
} /* end lisp_Xconfigure */
@ -189,9 +189,9 @@ void getXsignaldata(DspInterface dsp)
case MotionNotify:
*CLastUserActionCell68k = MiscStats->secondstmp;
*EmCursorX68K = (*((DLword *)EmMouseX68K)) =
(short)((report.xmotion.x + dsp->Vissible.x) & 0xFFFF) - Current_Hot_X;
(short)((report.xmotion.x + dsp->Visible.x) & 0xFFFF) - Current_Hot_X;
*EmCursorY68K = (*((DLword *)EmMouseY68K)) =
(short)((report.xmotion.y + dsp->Vissible.y) & 0xFFFF) - Current_Hot_Y;
(short)((report.xmotion.y + dsp->Visible.y) & 0xFFFF) - Current_Hot_Y;
DoRing();
if ((KBDEventFlg) > 0) Irq_Stk_End = Irq_Stk_Check = 0;
break;
@ -229,8 +229,8 @@ void getXsignaldata(DspInterface dsp)
case LeaveNotify: Mouse_Included = FALSE; break;
case Expose:
XLOCK;
(dsp->bitblt_to_screen)(dsp, 0, report.xexpose.x + dsp->Vissible.x,
report.xexpose.y + dsp->Vissible.y, report.xexpose.width,
(dsp->bitblt_to_screen)(dsp, 0, report.xexpose.x + dsp->Visible.x,
report.xexpose.y + dsp->Visible.y, report.xexpose.width,
report.xexpose.height);
XUNLOCK;
break;