1 files changed, 13 insertions, 11 deletions

diff --git a/alacritty/src/event.rs b/alacritty/src/event.rs
index 4b1fe892..d03c4390 100644
--- a/alacritty/src/event.rs
+++ b/alacritty/src/event.rs
@@ -356,7 +356,7 @@ impl<N: Notify + OnResize> Processor<N> {
                     return;
                 },
                 // Process events
-                GlutinEvent::EventsCleared => {
+                GlutinEvent::RedrawEventsCleared => {
                     *control_flow = ControlFlow::Wait;
 
                     if event_queue.is_empty() {
@@ -478,6 +478,7 @@ impl<N: Notify + OnResize> Processor<N> {
                 Event::MouseCursorDirty => processor.reset_mouse_cursor(),
                 Event::Exit => (),
             },
+            GlutinEvent::RedrawRequested(_) => processor.ctx.terminal.dirty = true,
             GlutinEvent::WindowEvent { event, window_id, .. } => {
                 use glutin::event::WindowEvent::*;
                 match event {
@@ -508,24 +509,24 @@ impl<N: Notify + OnResize> Processor<N> {
                         }
                     },
                     ReceivedCharacter(c) => processor.received_char(c),
-                    MouseInput { state, button, modifiers, .. } => {
+                    MouseInput { state, button, .. } => {
                         if !cfg!(target_os = "macos") || processor.ctx.terminal.is_focused {
                             processor.ctx.window.set_mouse_visible(true);
-                            processor.mouse_input(state, button, modifiers);
+                            processor.mouse_input(state, button);
                             processor.ctx.terminal.dirty = true;
                         }
                     },
-                    CursorMoved { position: lpos, modifiers, .. } => {
+                    CursorMoved { position: lpos, .. } => {
                         let (x, y) = lpos.to_physical(processor.ctx.size_info.dpr).into();
                         let x: i32 = limit(x, 0, processor.ctx.size_info.width as i32);
                         let y: i32 = limit(y, 0, processor.ctx.size_info.height as i32);
 
                         processor.ctx.window.set_mouse_visible(true);
-                        processor.mouse_moved(x as usize, y as usize, modifiers);
+                        processor.mouse_moved(x as usize, y as usize);
                     },
-                    MouseWheel { delta, phase, modifiers, .. } => {
+                    MouseWheel { delta, phase, .. } => {
                         processor.ctx.window.set_mouse_visible(true);
-                        processor.mouse_wheel_input(delta, phase, modifiers);
+                        processor.mouse_wheel_input(delta, phase);
                     },
                     Focused(is_focused) => {
                         if window_id == processor.ctx.window.window_id() {
@@ -565,7 +566,6 @@ impl<N: Notify + OnResize> Processor<N> {
                         processor.ctx.terminal.dirty = true;
                         processor.ctx.size_info.dpr = dpr;
                     },
-                    RedrawRequested => processor.ctx.terminal.dirty = true,
                     CursorLeft { .. } => {
                         processor.ctx.mouse.inside_grid = false;
 
@@ -578,6 +578,7 @@ impl<N: Notify + OnResize> Processor<N> {
                     | AxisMotion { .. }
                     | HoveredFileCancelled
                     | Destroyed
+                    | ThemeChanged(_)
                     | HoveredFile(_)
                     | Touch(_)
                     | Moved(_) => (),
@@ -585,13 +586,14 @@ impl<N: Notify + OnResize> Processor<N> {
             },
             GlutinEvent::DeviceEvent { event, .. } => {
                 use glutin::event::DeviceEvent::*;
-                if let ModifiersChanged { modifiers } = event {
+                if let ModifiersChanged(modifiers) = event {
                     processor.modifiers_input(modifiers);
                 }
             },
             GlutinEvent::Suspended { .. }
             | GlutinEvent::NewEvents { .. }
-            | GlutinEvent::EventsCleared
+            | GlutinEvent::MainEventsCleared
+            | GlutinEvent::RedrawEventsCleared
             | GlutinEvent::Resumed
             | GlutinEvent::LoopDestroyed => (),
         }
@@ -624,7 +626,7 @@ impl<N: Notify + OnResize> Processor<N> {
             },
             GlutinEvent::Suspended { .. }
             | GlutinEvent::NewEvents { .. }
-            | GlutinEvent::EventsCleared
+            | GlutinEvent::MainEventsCleared
             | GlutinEvent::LoopDestroyed => true,
             _ => false,
         }