1
0
mirror of https://github.com/Interlisp/maiko.git synced 2026-03-01 09:30:56 +00:00
Commit Graph

28 Commits

Author SHA1 Message Date
Nick Briggs
2eae377e5f Take pixelscale into account when repositioning cursor 2021-11-17 12:27:13 -08:00
Nick Briggs
c32233b824 Speedups in texture based display path
Instead of checking "do_invert" at each pixel assignment, assign the
foreground and background colors appropriately when responding to the
(VIDEOCOLOR x) call.

Modify sdl_bitblt_to_texture() so that it does less arithmetic in the inner loop,
including using a table of masks rather than computing 1<<n on each pixel.
Modify sdl_bitblt_to_texture() so that it accesses the Lisp display region
16-bits at a time with the correct ordering for whether we are on a byte-swapped
system or not.
2021-11-15 18:38:16 -08:00
Nick Briggs
fabfca2486 When updating the window surface directly, at scale 1, avoid the intermediate buffer
Adds an sdl_blt_to_window_surface() that goes directly from the Lisp bitmap
to the window surface avoiding the intermediate copy.  This is only coded for a
scale factor of 1.  Uses the intermediate buffer if the scale is not 1.

Corrects an error where the damage rectangle was not properly reset.
2021-11-09 20:15:00 -08:00
Nick Briggs
e430513d6a Avoid intermediate buffer and bitblt Lisp screen changes directly into the texture pixels
Using SDL_LockTexture/SDL_UnlockTexture we can gain more direct access to the pixels of the
texture and update them directly from the Lisp screen bitmap.

At the same time, for both the rendering case and the display surface case,
update the pixel format used to be either the first (presumably preferred?)
format for a texture, or the surface format of the window.

Use the SDL routines to pick out the pixel value for Black and White based on the
destination it will be placed in.
2021-11-09 13:57:25 -08:00
Nick Briggs
184f02d0c1 Introduce alternative method for updating window from Lisp bitmap
If the preprocessor symbol SDLRENDERING is defined the code operates as
it previously did.  In the absence of that, we process the Lisp bitmap
into an intermediate form (as before) but then use SDL bitblt to
redraw the intermediate form on the window's surface.
2021-11-08 22:18:08 -08:00
Nick Briggs
0606015793 Move display update into separate procedure 2021-11-08 22:02:43 -08:00
Nick Briggs
d64e1d1b38 Width, but not height, must be multiple of 32 2021-11-08 21:28:06 -08:00
Nick Briggs
f59e4395b8 Bounds check indexing into intermediate screen buffer
When building with -DCMAKE_BUILD_TYPE=Debug, we assert() that the
index into the intermediate screen buffer is in bounds.
2021-11-08 20:40:30 -08:00
Nick Briggs
f7588b8c8e Keep damage notification boundaries within the current screen
On startup, bitblt calls may be made for the original screen size
and if the new screen size is smaller than that, we must ensure
that damage notifications are contained within the new screen.

Move definition of min() so we can use it in sdl_notify_damage()
2021-11-08 18:21:38 -08:00
Peter
241e5fe9a9 Cache cursors for SDL. 2021-11-08 21:10:23 +01:00
Peter
f9d1e51456 Change Pixelformat to 332 (one byte) instead of 8888 (four bytes). 2021-11-08 20:03:28 +01:00
Nick Briggs
ba6e365cc8 Fix "error: implicit declaration of function" from dspsubrs
Creates an sdldefs.h, declares a few more functions in sdl.c static,
and includes sdldefs.h in dspsubrs.c when necessary.
2021-11-07 11:26:46 -08:00
Peter
37aed57027 Add support for setting the mouse cursor. Not finished!
Currently this just allocates a new X cursor each time, should be
amended to cache the cursor, just like X does at the moment.
2021-11-07 19:37:33 +01:00
Peter
ecfd4048e0 Add support for inverting video and setting mouse position.
Use (IL:VIDEOCOLOR T/NIL) to change inversion.
2021-11-07 19:37:33 +01:00
Peter
a3fdf18edc Add mouse wheel diagnostics. 2021-11-07 19:37:33 +01:00
Peter
8a872d7d85 Only update texture on damage. 2021-11-07 19:37:33 +01:00
Peter
5413934525 Add support for key repeating. 2021-11-07 19:37:33 +01:00
Peter
784d9f61cb For now, some more extern functions declarations. 2021-11-07 19:37:33 +01:00
Peter
00c4d65aff Maybe fix cmake for SDL2. 2021-11-07 19:37:33 +01:00
Peter
bab9213120 Remove SDL2 directory from include SDL2/SDL.h. 2021-11-07 19:37:33 +01:00
Peter
ccfacb23a7 Try to make builds pass again. 2021-11-07 19:37:33 +01:00
Peter
ab94538d0c Add support for -t / -title. 2021-11-07 19:37:33 +01:00
Peter
28931acd36 Remove extra directory from includes for SDL. 2021-11-07 19:37:33 +01:00
Peter
7b7db9aac5 Refactor, only bitblt once per "frame". 2021-11-07 19:37:33 +01:00
Peter
333c132e40 Refactor, don't update texture on every bitblt. 2021-11-07 19:37:33 +01:00
Peter
87ede7cee1 Only bitblt on damage.
Also add an alternative for key handling, which does not work any better...
2021-11-07 19:37:33 +01:00
Peter
78e42b7217 Change SDL backend to accelerated renderer, support pixel scaling.
Edit main.c, init_SDL(1600, 1024, 1) means lisp display size 1600x1024, pixel scaling 1.

Try init_SDL(800, 512, 2) or even init_SDL(608, 1023, 3).
2021-11-07 19:37:33 +01:00
Peter
f58abe36ee Add prototypical SDL support.
Build with cmake. This will create a new backend (ldesdl).
- Resolution can only be set by editing the variables in sdl.c.
- Key repeat does not work.
- Still problems with keysyms that implicitly contain modifiers.
- The entire screen is bitblted onto the SDL display every frame.

Support keyboard, and work on mouse.

Kind of working...

Fix display resolution problems.
2021-10-20 10:12:04 +02:00