WIP Compositor #52

roblabla · 2018-12-03T20:02:13Z

Implement a compositor, named vi.
The clock uses it.
It's broken.

Fixes #40

todo · 2018-12-03T20:02:36Z

Safety. We need to guarantee that, while this slice exists, the

https://github.com/roblabla42/KFS/blob/3d0f9b0284ddf1dcd86d2bb9a35330c28e117d66/vi/src/main.rs#L84-L94

This comment was generated by todo based on a `TODO` comment in `3d0f9b0` in #52. cc @roblabla.

todo · 2018-12-03T20:02:37Z

Alpha blend!

https://github.com/roblabla42/KFS/blob/3d0f9b0284ddf1dcd86d2bb9a35330c28e117d66/vi/src/main.rs#L105-L115

This comment was generated by todo based on a `TODO` comment in `3d0f9b0` in #52. cc @roblabla.

todo · 2018-12-06T15:24:52Z

Vi: Implement alpha blending

Vi currently does not do alpha blending at all. In the interest of pretty transparent window, this needs fixing!

https://github.com/roblabla42/KFS/blob/1b914d65646351f62d521f34f11bd9bc9baee98e/vi/src/main.rs#L105-L115

This comment was generated by todo based on a `TODO` comment in `1b914d6` in #52. cc @roblabla.

todo · 2018-12-07T01:51:01Z

Re-enable test_threads

Test threads has been disabled when VBELoggers were removed, as they would need the ability to get the terminal via an argument somehow.

https://github.com/roblabla42/KFS/blob/c6cff39103bfea0951dfb7917ad6192fd7b14e5e/shell/src/main.rs#L98-L104

This comment was generated by todo based on a `TODO` comment in `c6cff39` in #52. cc @roblabla.

roblabla · 2018-12-07T01:51:35Z

So, this works. It's slow though. Very, very slow.

todo · 2018-12-07T17:38:22Z

Safety of the vi::draw IPC method

When calling vi::draw, vi reads from the shared memory. There is no borrow-checking mechanism in place to ensure that the other process does not mutate it while this happens. Maybe we should have some kind of cross-process mutex? How to implement this properly?

https://github.com/roblabla42/KFS/blob/8ad277ff0eac490ba222d1e02dcd3fc7ac1fa8c1/vi/src/main.rs#L86-L96

This comment was generated by todo based on a `TODO` comment in `8ad277f` in #52. cc @roblabla.

todo · 2018-12-07T17:38:23Z

Vi: Heavy flickering.

When drawing the whole screen, we can see some extreme amount of flickering on the screen. We should look into better compositing algorithms, maybe we don't need to redraw the whole screen all the time? And also, look into VSYNC.

https://github.com/roblabla42/KFS/blob/8ad277ff0eac490ba222d1e02dcd3fc7ac1fa8c1/vi/src/main.rs#L149-L159

This comment was generated by todo based on a `TODO` comment in `8ad277f` in #52. cc @roblabla.

Orycterope · 2018-12-08T00:03:00Z

Closes #40

vi/src/main.rs

vi/src/vbe.rs

libuser/src/window.rs

libuser/src/terminal.rs

todo · 2018-12-10T20:14:17Z

Terminal - Get window size from vi

Terminal defines a fullscreen size as 1280 * 800, but should really get it from vi instead.

https://github.com/roblabla42/KFS/blob/437d3291fc9b7343f0ff511c6b50d0e227e6c5b8/libuser/src/terminal.rs#L70-L80

This comment was generated by todo based on a `TODO` comment in `437d329` in #52. cc @roblabla.

- Implement a compositor, named vi. - The clock uses it. - It's broken.

- VBELogger::new() now takes a WindowSize, allowing multiple patterns for creating windows. - Bugfix: BPP should be 32, not 4.

- Move clock::vbe to libuser::window and libuser::terminal - Remove clock::logger

- Lock framebuffer once at the start of the loop - Copy framebuffer verbatim, don't attempt interpreting pixels - Better TODOs - Remove closed buffers from the global.

- Dropping a ClientSession now sends the Close message - On the server, handle the Close message by removing the associated Object - Implement Drop on vi::IBuffer - Bugfix: use the correct type if we pass a token in new_request/new_response

The old behavior was weird: it would only crop left/top to 0. Now we ensure the returned output is cropped to the given width/height as well.

- VBE's framebuffer is now an array of VBEColor - Asserts that x/y is in framebuffer range - Lock framebuffer once per draw to avoid deadlocks. - Documentation improvements.

- Document various undocumented parts. - Panic in get_px_offset if out of bound - Work around a weird assumption that we have more than 1 line available. - framebuffer is now an array of color.

Draw happens in a backbuffer, which gets memcpy'd into the framebuffer. This fixes the flickering issue.

Use the generic method to get the pixel offset in the framebuffer.

roblabla · 2018-12-12T13:43:35Z

@Orycterope Fixed everything. It's ready for review again.

Orycterope · 2018-12-12T14:40:31Z

vi/src/main.rs

+        let dtop = min(max(self.top, 0) as u32, framebuffer_height);
+        let dleft = min(max(self.left, 0) as u32, framebuffer_width);
+        let dwidth = min(framebuffer_height - dtop, self.height);
+        let dheight = min(framebuffer_width - dleft, self.width);


If window is far to the left:

let self.left = -500; let self.width = 4; let dleft = min(max(-500, 0) as u32, framebuffer_width); // = 0, this is fine let dwidth = min(framebuffer_width - 0, 4); // = 4. Wrong.

The window was completely out of the screen, but this would draw a 4 px window at the left of the screen.

libuser/src/window.rs

vi/src/vbe.rs

vi/src/main.rs

- More pedantic tests. - Also, some oryctalgorithm.

Orycterope

Finally

roblabla force-pushed the compositor branch from 1b914d6 to c6cff39 Compare December 7, 2018 01:50

Orycterope requested changes Dec 8, 2018

View reviewed changes

roblabla added 18 commits December 12, 2018 13:39

WIP Compositor

95389ee

- Implement a compositor, named vi. - The clock uses it. - It's broken.

Better TODO

543dd06

Better Logger window creation API.

f7b5e3b

- VBELogger::new() now takes a WindowSize, allowing multiple patterns for creating windows. - Bugfix: BPP should be 32, not 4.

Vi: Remove debug prints killing performance.

2776fc3

Move window creation and font rendering to libuser

04db191

- Move clock::vbe to libuser::window and libuser::terminal - Remove clock::logger

Shell: use libuser window/terminal abstraction.

3c08d7f

Vi: Fixes color and small perf boost

6a412a5

- Lock framebuffer once at the start of the loop - Copy framebuffer verbatim, don't attempt interpreting pixels - Better TODOs - Remove closed buffers from the global.

kernel: Remove useless debugs

ddbde2b

Vi: Remove useless logger code from vbe.

070f5a1

Implement closing a ClientSession

a27bc97

- Dropping a ClientSession now sends the Close message - On the server, handle the Close message by removing the associated Object - Implement Drop on vi::IBuffer - Bugfix: use the correct type if we pass a token in new_request/new_response

Shell: remove waiting, because we're so slow anyways...

febc274

Object macro: Fix bug in meta handling.

204d76a

Vi: get_real_bounds now crops to the given width/height.

595d0ad

The old behavior was weird: it would only crop left/top to 0. Now we ensure the returned output is cropped to the given width/height as well.

Document Vi.

33952ee

Vi: VBE Improvements

3f6c371

- VBE's framebuffer is now an array of VBEColor - Asserts that x/y is in framebuffer range - Lock framebuffer once per draw to avoid deadlocks. - Documentation improvements.

Libuser: better window

5c4ccee

- Document various undocumented parts. - Panic in get_px_offset if out of bound - Work around a weird assumption that we have more than 1 line available. - framebuffer is now an array of color.

Vi: Fix flickering.

23e729b

Draw happens in a backbuffer, which gets memcpy'd into the framebuffer. This fixes the flickering issue.

Shell: Fix panic when showing gifs.

8609094

Use the generic method to get the pixel offset in the framebuffer.

roblabla force-pushed the compositor branch from f04c1cc to 8609094 Compare December 12, 2018 13:40

Orycterope requested changes Dec 12, 2018

View reviewed changes

roblabla added 3 commits December 12, 2018 16:52

Fix get_real_bounds, and test it.

075c1bc

Rename get_fb to get_buffer.

a200bda

Document Framebuffer::new_buffer.

4298452

Orycterope requested changes Dec 12, 2018

View reviewed changes

vi/src/main.rs Outdated Show resolved Hide resolved

Fix get_real_bounds when window is far to the left.

42d48b2

- More pedantic tests. - Also, some oryctalgorithm.

Orycterope approved these changes Dec 12, 2018

View reviewed changes

Orycterope merged commit c849a50 into sunriseos:master Dec 12, 2018

This was referenced Dec 12, 2018

Terminal - Get window size from vi #79

Closed

Re-enable test_threads #80

Closed

Safety of the vi::draw IPC method #81

Closed

Vi: Implement alpha blending #82

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

WIP Compositor #52

WIP Compositor #52

roblabla commented Dec 3, 2018 •

edited

Loading

todo bot commented Dec 3, 2018

todo bot commented Dec 3, 2018

todo bot commented Dec 6, 2018

todo bot commented Dec 7, 2018

roblabla commented Dec 7, 2018

todo bot commented Dec 7, 2018

todo bot commented Dec 7, 2018

Orycterope commented Dec 8, 2018

todo bot commented Dec 10, 2018

roblabla commented Dec 12, 2018

Orycterope Dec 12, 2018

Orycterope left a comment

WIP Compositor #52

WIP Compositor #52

Conversation

roblabla commented Dec 3, 2018 • edited Loading

todo bot commented Dec 3, 2018

Safety. We need to guarantee that, while this slice exists, the

This comment was generated by todo based on a TODO comment in 3d0f9b0 in #52. cc @roblabla.

todo bot commented Dec 3, 2018

Alpha blend!

This comment was generated by todo based on a TODO comment in 3d0f9b0 in #52. cc @roblabla.

todo bot commented Dec 6, 2018

Vi: Implement alpha blending

This comment was generated by todo based on a TODO comment in 1b914d6 in #52. cc @roblabla.

todo bot commented Dec 7, 2018

Re-enable test_threads

This comment was generated by todo based on a TODO comment in c6cff39 in #52. cc @roblabla.

roblabla commented Dec 7, 2018

todo bot commented Dec 7, 2018

Safety of the vi::draw IPC method

This comment was generated by todo based on a TODO comment in 8ad277f in #52. cc @roblabla.

todo bot commented Dec 7, 2018

Vi: Heavy flickering.

This comment was generated by todo based on a TODO comment in 8ad277f in #52. cc @roblabla.

Orycterope commented Dec 8, 2018

todo bot commented Dec 10, 2018

Terminal - Get window size from vi

This comment was generated by todo based on a TODO comment in 437d329 in #52. cc @roblabla.

roblabla commented Dec 12, 2018

Orycterope Dec 12, 2018

Choose a reason for hiding this comment

Orycterope left a comment

Choose a reason for hiding this comment

roblabla commented Dec 3, 2018 •

edited

Loading

This comment was generated by todo based on a `TODO` comment in `3d0f9b0` in #52. cc @roblabla.

This comment was generated by todo based on a `TODO` comment in `3d0f9b0` in #52. cc @roblabla.

This comment was generated by todo based on a `TODO` comment in `1b914d6` in #52. cc @roblabla.

This comment was generated by todo based on a `TODO` comment in `c6cff39` in #52. cc @roblabla.

This comment was generated by todo based on a `TODO` comment in `8ad277f` in #52. cc @roblabla.

This comment was generated by todo based on a `TODO` comment in `8ad277f` in #52. cc @roblabla.

This comment was generated by todo based on a `TODO` comment in `437d329` in #52. cc @roblabla.