wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-12-24 05:42:03 +03:00
Code Issues Projects Releases Wiki Activity

x11: maintain the image buffer across paint calls

Browse Source
This commit is contained in:
Wez Furlong 2019-08-09 14:53:29 -07:00
parent ff0d079737
commit 95cc66e9c0
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
window/src/os/x11/connection.rs
View File

@ -128,7 +128,7 @@ impl Connection {
let mut events = Events::with_capacity(8);
poll.register(self, tok_xcb, Ready::readable(), PollOpt::level())?;
let paint_interval = Duration::from_millis(50);
let paint_interval = Duration::from_millis(25);
let mut last_interval = Instant::now();
while !*self.should_terminate.borrow() {
@ -298,7 +298,6 @@ impl Connection {
}
/// Run through all of the windows and cause them to paint if they need it.
/// This happens ~50ms or so.
fn do_paint(&self) {
for window in self.windows.borrow().values() {
window.paint_if_needed().unwrap();

28
window/src/os/x11/window.rs
View File

@ -63,6 +63,7 @@ struct WindowInner {
height: u16,
expose: VecDeque<Rect>,
paint_all: bool,
buffer_image: BufferImage,
}
impl Drop for WindowInner {
@ -129,6 +130,19 @@ impl WindowInner {
self.paint_all = false;
self.expose.clear();
self.expose.push_back(window_dimensions);
} else if self.expose.is_empty() {
return Ok(());
}
let (buf_width, buf_height) = self.buffer_image.image_dimensions();
if buf_width != self.width.into() || buf_height != self.height.into() {
// Window was resized, so we need to update our buffer
self.buffer_image = BufferImage::new(
&self.conn,
self.window_id,
self.width as usize,
self.height as usize,
);
}
for rect in self.expose.drain(..) {
@ -145,20 +159,13 @@ impl WindowInner {
eprintln!("paint {:?}", rect);
let mut buffer = BufferImage::new(
&self.conn,
self.window_id,
self.width as usize,
self.height as usize,
);
let mut context = X11GraphicsContext {
buffer: &mut buffer,
buffer: &mut self.buffer_image,
};
self.callbacks.paint(&mut context);
match &buffer {
match &self.buffer_image {
BufferImage::Shared(ref im) => {
self.window_context.copy_area(
im,
@ -386,6 +393,8 @@ impl Window {
let window_context = Context::new(&conn, &window_id);
let buffer_image = BufferImage::new(&conn, window_id, width, height);
Arc::new(Mutex::new(WindowInner {
window_id,
conn: Arc::clone(&conn),
@ -395,6 +404,7 @@ impl Window {
height: height.try_into()?,
expose: VecDeque::new(),
paint_all: true,
buffer_image,
}))
};