ratatui_ruby 0.9.1 → 0.10.1

data/examples/widget_rich_text/app.rb

@@ -10,11 +10,13 @@ require "ratatui_ruby"
 
 # Rich Text Example
 # Demonstrates the Span and Line objects for styling individual words
-# within a block of text.
+# within a block of text. Also demonstrates Line alignment methods.
 class WidgetRichText
   def initialize
     @scroll_pos = 0
     @color_index = 0
+    @alignment_index = 0
+    @alignments = [:left, :center, :right]
   end
 
   def run
@@ -46,40 +48,17 @@ class WidgetRichText
 
   private def simple_text_line_example
     # Example 1: A line with mixed styles
+    # Create a base line with spans, then apply alignment using the fluent methods
+    alignment = @alignments[@alignment_index]
+    aligned_line = case alignment
+                   when :left then base_line.left_aligned
+                   when :center then base_line.centered
+                   when :right then base_line.right_aligned
+    end
+
     @tui.paragraph(
       text: [
-        @tui.text_line(
-          spans: [
-            @tui.text_span(
-              content: "Normal text, ",
-              style: nil
-            ),
-            @tui.text_span(
-              content: "Bold Text",
-              style: @tui.style(modifiers: [:bold])
-            ),
-            @tui.text_span(
-              content: ", ",
-              style: nil
-            ),
-            @tui.text_span(
-              content: "Italic Text",
-              style: @tui.style(modifiers: [:italic])
-            ),
-            @tui.text_span(
-              content: ", ",
-              style: nil
-            ),
-            @tui.text_span(
-              content: "Red Text",
-              style: @tui.style(fg: :red)
-            ),
-            @tui.text_span(
-              content: ".",
-              style: nil
-            ),
-          ]
-        ),
+        aligned_line,
         @tui.text_line(spans: []),
         @tui.text_line(
           spans: [
@@ -87,11 +66,18 @@ class WidgetRichText
             @tui.text_span(content: "Color #{@color_index}", style: @tui.style(fg: @color_index)),
             @tui.text_span(content: " (Use "),
             @tui.text_span(content: "↑ ↓", style: @tui.style(modifiers: [:bold])),
-            @tui.text_span(content: " for +/- 1,", style: nil),
-            @tui.text_span(content: "→ ←", style: @tui.style(modifiers: [:bold])),
+            @tui.text_span(content: " for +/- 1, ", style: nil),
+            @tui.text_span(content: "← →", style: @tui.style(modifiers: [:bold])),
             @tui.text_span(content: " for +/- 10)", style: nil),
           ]
         ),
+        @tui.text_line(spans: []),
+        @tui.text_line(
+          spans: [
+            @tui.text_span(content: "A", style: @tui.style(modifiers: [:bold, :underlined])),
+            @tui.text_span(content: ": Alignment (#{alignment})", style: nil),
+          ]
+        ),
       ],
       block: @tui.block(
         title: "Simple Rich Text",
@@ -100,8 +86,33 @@ class WidgetRichText
     )
   end
 
+  private def base_line
+    # Demonstrates creating a styled line with various modifiers and colors
+    # Including: underline_color (distinct from fg) and remove_modifiers (to override inherited styles)
+    @tui.text_line(
+      spans: [
+        @tui.text_span(content: "Normal, ", style: nil),
+        @tui.text_span(content: "Bold", style: @tui.style(modifiers: [:bold])),
+        @tui.text_span(content: ", ", style: nil),
+        @tui.text_span(content: "Italic", style: @tui.style(modifiers: [:italic])),
+        @tui.text_span(content: ", ", style: nil),
+        @tui.text_span(content: "Red", style: @tui.style(fg: :red)),
+        @tui.text_span(content: ", ", style: nil),
+        # New: underline_color - underline in a different color than text
+        @tui.text_span(
+          content: "Red Underline",
+          style: @tui.style(fg: :white, modifiers: [:underlined], underline_color: :red)
+        ),
+        @tui.text_span(content: ".", style: nil),
+      ]
+    )
+  end
+
   private def complex_example
     # Example 2: Multiple lines with different styles
+    # Includes Symbols::Shade constants for density gradients
+    shade = RatatuiRuby::Symbols::Shade
+
     @tui.paragraph(
       text: [
         @tui.text_line(
@@ -126,15 +137,27 @@ class WidgetRichText
           ]
         ),
         @tui.text_line(spans: []),
+        # Demonstrate Symbols::Shade constants for density gradients
+        @tui.text_line(
+          spans: [
+            @tui.text_span(content: "Shade: ", style: @tui.style(fg: :cyan)),
+            @tui.text_span(content: shade::EMPTY * 4, style: nil),
+            @tui.text_span(content: shade::LIGHT * 4, style: @tui.style(fg: :dark_gray)),
+            @tui.text_span(content: shade::MEDIUM * 4, style: @tui.style(fg: :gray)),
+            @tui.text_span(content: shade::DARK * 4, style: @tui.style(fg: :white)),
+            @tui.text_span(content: shade::FULL * 4, style: @tui.style(fg: :white)),
+          ]
+        ),
+        @tui.text_line(spans: []),
         @tui.text_line(
           spans: [
             @tui.text_span(content: "Press ", style: nil),
             @tui.text_span(content: "Q", style: @tui.style(modifiers: [:bold])),
             @tui.text_span(content: " to quit, ", style: nil),
             @tui.text_span(content: "↑ ↓", style: @tui.style(modifiers: [:bold])),
-            @tui.text_span(content: " to adjust color by 1, ", style: nil),
+            @tui.text_span(content: ": color by 1, ", style: nil),
             @tui.text_span(content: "← →", style: @tui.style(modifiers: [:bold])),
-            @tui.text_span(content: " to adjust color by 10.", style: nil),
+            @tui.text_span(content: ": color by 10.", style: nil),
           ]
         ),
       ],
@@ -157,6 +180,8 @@ class WidgetRichText
       @color_index = (@color_index + 1) % 256
     elsif event.down?
       @color_index = (@color_index - 1) % 256
+    elsif event == "a"
+      @alignment_index = (@alignment_index + 1) % @alignments.size
     end
 
     nil

data/examples/widget_style_colors/app.rb

@@ -8,6 +8,15 @@
 $LOAD_PATH.unshift File.expand_path("../../lib", __dir__)
 require "ratatui_ruby"
 
+# Demonstrates terminal color rendering and the Color module.
+#
+# Terminal apps need vibrant colors. Specifying colors as symbols or
+# calculated hex strings works but limits expressiveness.
+#
+# This demo shows the Color module's constructors for creating colors
+# from HSL values or hex integers, producing a full-spectrum gradient.
+#
+# Use it to understand color representation and the Color.hsl/Color.hex APIs.
 class WidgetStyleColors
   def initialize
     @width = 80
@@ -35,12 +44,19 @@ class WidgetStyleColors
         hue = (col.to_f / @width) * 360.0
         lightness = 50.0 - ((row.to_f / @height) * 50.0)
 
-        rgb = hsl_to_rgb(hue, 100.0, lightness)
-        hex = rgb_to_hex(rgb)
+        # Use Color.hsl for top half, Color.hsluv for bottom half
+        # HSLuv provides perceptually uniform colors (same visual brightness)
+        hex = if row < @height / 2
+          RatatuiRuby::Style::Color.hsl(hue, 100.0, lightness)
+        else
+          # HSLuv: perceptually uniform - all colors appear equal brightness
+          RatatuiRuby::Style::Color.hsluv(hue, 100.0, lightness)
+        end
 
+        # Demonstrate Style.with for concise inline styling
         span = tui.text_span(
           content: " ",
-          style: tui.style(bg: hex)
+          style: RatatuiRuby::Style::Style.with(bg: hex)
         )
         spans << span
       end
@@ -48,57 +64,20 @@ class WidgetStyleColors
       lines << tui.text_line(spans:)
     end
 
+    # Also demonstrate Color.hex for the border
+    border_color = RatatuiRuby::Style::Color.hex(0xFFD700) # Gold
+
     tui.paragraph(
       text: lines,
       block: tui.block(
-        title: "Hex Color Gradient (Press 'q' or Ctrl+C to exit)",
+        title: "HSL (top) vs HSLuv (bottom) - Style.with demo (Press 'q' to exit)",
         borders: [:all],
-        border_type: :rounded
+        border_type: :rounded,
+        # Using Style.with for concise border styling
+        border_style: RatatuiRuby::Style::Style.with(fg: border_color)
       )
     )
   end
-
-  private def hsl_to_rgb(hue, saturation, lightness)
-    h = hue / 360.0
-    s = saturation / 100.0
-    l = lightness / 100.0
-
-    if s == 0
-      r = g = b = l
-    else
-      q = (l < 0.5) ? l * (1 + s) : l + s - (l * s)
-      p = (2 * l) - q
-
-      r = hue_to_rgb(p, q, h + (1.0 / 3.0))
-      g = hue_to_rgb(p, q, h)
-      b = hue_to_rgb(p, q, h - (1.0 / 3.0))
-    end
-
-    [
-      (r * 255).round,
-      (g * 255).round,
-      (b * 255).round,
-    ]
-  end
-
-  private def hue_to_rgb(p, q, t)
-    t += 1 while t < 0
-    t -= 1 while t > 1
-
-    if t < 1.0 / 6.0
-      p + ((q - p) * 6 * t)
-    elsif t < 1.0 / 2.0
-      q
-    elsif t < 2.0 / 3.0
-      p + ((q - p) * ((2.0 / 3.0) - t) * 6)
-    else
-      p
-    end
-  end
-
-  private def rgb_to_hex(rgb)
-    "##{rgb.map { |c| c.to_s(16).upcase.rjust(2, '0') }.join}"
-  end
 end
 
 WidgetStyleColors.new.run if __FILE__ == $PROGRAM_NAME

data/examples/widget_table/app.rb

@@ -55,6 +55,7 @@ class WidgetTable
     @show_cell_highlight = true
     @offset_mode_index = 0
     @flex_mode_index = 0
+    @strikethrough_pids = Set.new # Track which rows have strikethrough
   end
 
   def run
@@ -78,28 +79,38 @@ class WidgetTable
       { name: "Blue on White", style: @tui.style(fg: :blue, bg: :white) },
       { name: "Magenta", style: @tui.style(fg: :magenta, modifiers: [:bold]) },
     ]
-    @column_highlight_style = @tui.style(fg: :magenta)
+    @column_highlight_style = @tui.style(fg: :red)
     @cell_highlight_style = @tui.style(fg: :white, bg: :red, modifiers: [:bold])
     @hotkey_style = @tui.style(modifiers: [:bold, :underlined])
   end
 
   private def render(frame)
     # v0.7.0: Create table rows using table_row and table_cell for per-cell styling
-    rows = PROCESSES.map do |p|
+    rows = PROCESSES.each_with_index.map do |p, i|
       cpu_style = case p[:cpu]
                   when 0...10 then @tui.style(fg: :green)
                   when 10...30 then @tui.style(fg: :yellow)
                   else @tui.style(fg: :red, modifiers: [:bold])
       end
-      @tui.table_row(
+      row = @tui.table_row(
         cells: [
           p[:pid].to_s,
           p[:name],
           @tui.table_cell(content: "#{p[:cpu]}%", style: cpu_style),
         ],
-        # Apply alternating row backgrounds for readability
-        style: p[:pid].even? ? @tui.style(bg: :dark_gray) : nil
+        # Apply alternating row backgrounds for readability (using basic ANSI colors for compatibility)
+        style: i.even? ? @tui.style(bg: :white, fg: :black) : nil
       )
+
+      # Row#enable_strikethrough: Apply strikethrough to "tamped" (de-emphasized) processes.
+      # Note: Strikethrough (SGR 9) is not supported by all terminals. macOS Terminal.app
+      # notably lacks support, while Kitty, iTerm2, Alacritty, and WezTerm render it.
+      # We add :dim as a fallback so the effect is visible even without strikethrough.
+      if @strikethrough_pids.include?(p[:pid])
+        row.enable_strikethrough.with(style: (row.style || @tui.style).with(modifiers: ((row.style&.modifiers || []) + [:crossed_out, :dim]).uniq))
+      else
+        row
+      end
     end
 
     # Define column widths
@@ -170,6 +181,8 @@ class WidgetTable
               @tui.text_span(content: ": Style (#{current_style_entry[:name]})  "),
               @tui.text_span(content: "p", style: @hotkey_style),
               @tui.text_span(content: ": Spacing (#{current_spacing_entry[:name]})  "),
+              @tui.text_span(content: "t", style: @hotkey_style),
+              @tui.text_span(content: ": Tamp Row"),
             ]),
             # Line 3: More Controls
             @tui.text_line(spans: [
@@ -237,6 +250,16 @@ class WidgetTable
       @highlight_spacing_index = (@highlight_spacing_index + 1) % HIGHLIGHT_SPACINGS.length
     in type: :key, code: "x"
       @selected_index = @selected_index.nil? ? 0 : nil
+    in type: :key, code: "t"
+      # Toggle strikethrough for selected row (demonstrates Row#enable_strikethrough)
+      if @selected_index
+        pid = PROCESSES[@selected_index][:pid]
+        if @strikethrough_pids.include?(pid)
+          @strikethrough_pids.delete(pid)
+        else
+          @strikethrough_pids.add(pid)
+        end
+      end
     in type: :key, code: "c"
       @show_column_highlight = !@show_column_highlight
     in type: :key, code: "z"

data/examples/widget_text_width/app.rb

@@ -51,10 +51,11 @@ class WidgetTextWidth
     sample = @text_samples[@selected_index]
     measured_width = @tui.text_width(sample[:text])
 
-    # v0.7.0: Text::Line#width instance method for rich text measurement
-    styled_line = @tui.text_line(spans: [
-      @tui.text_span(content: sample[:text], style: @tui.style(fg: :cyan)),
-    ])
+    # v0.7.0: Text::Span#width and Text::Line#width instance methods for rich text measurement
+    styled_span = @tui.text_span(content: sample[:text], style: @tui.style(fg: :cyan))
+    span_width = styled_span.width
+
+    styled_line = @tui.text_line(spans: [styled_span])
     line_width = styled_line.width
 
     # Build content text with newlines
@@ -62,6 +63,7 @@ class WidgetTextWidth
     content << "Sample: #{sample[:text]}"
     content << ""
     content << "Display Width (text_width): #{measured_width} cells"
+    content << "Display Width (span.width): #{span_width} cells"
     content << "Display Width (line.width): #{line_width} cells"
     content << "Character Count: #{sample[:text].length}"
     content << ""

data/ext/ratatui_ruby/Cargo.lock

@@ -23,6 +23,15 @@ version = "1.0.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61"
 
+[[package]]
+name = "approx"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6"
+dependencies = [
+ "num-traits",
+]
+
 [[package]]
 name = "atomic"
 version = "0.6.1"
@@ -106,6 +115,12 @@ version = "3.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5dd9dc738b7a8311c7ade152424974d8115f2cdad61e8dab8dac9f2362298510"
 
+[[package]]
+name = "by_address"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64fa3c856b712db6612c019f14756e64e4bcea13337a6b33b696333a9eaa2d06"
+
 [[package]]
 name = "bytemuck"
 version = "1.24.0"
@@ -364,6 +379,12 @@ dependencies = [
  "regex",
 ]
 
+[[package]]
+name = "fast-srgb8"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1"
+
 [[package]]
 name = "filedescriptor"
 version = "0.8.3"
@@ -756,6 +777,30 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "palette"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cbf71184cc5ecc2e4e1baccdb21026c20e5fc3dcf63028a086131b3ab00b6e6"
+dependencies = [
+ "approx",
+ "fast-srgb8",
+ "palette_derive",
+ "phf",
+]
+
+[[package]]
+name = "palette_derive"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5030daf005bface118c096f510ffb781fc28f9ab6a32ab224d8631be6851d30"
+dependencies = [
+ "by_address",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.111",
+]
+
 [[package]]
 name = "parking_lot"
 version = "0.12.5"
@@ -932,6 +977,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d1ce67fb8ba4446454d1c8dbaeda0557ff5e94d39d5e5ed7f10a65eb4c8266bc"
 dependencies = [
  "instability",
+ "palette",
  "ratatui-core",
  "ratatui-crossterm",
  "ratatui-macros",
@@ -952,6 +998,7 @@ dependencies = [
  "itertools 0.14.0",
  "kasuari",
  "lru",
+ "palette",
  "strum",
  "thiserror 2.0.17",
  "unicode-segmentation",
@@ -1012,7 +1059,7 @@ dependencies = [
 
 [[package]]
 name = "ratatui_ruby"
-version = "0.9.1"
+version = "0.10.1"
 dependencies = [
  "bumpalo",
  "lazy_static",

data/ext/ratatui_ruby/Cargo.toml

@@ -3,7 +3,7 @@
 
 [package]
 name = "ratatui_ruby"
-version = "0.9.1"
+version = "0.10.1"
 edition = "2021"
 
 [lib]
@@ -11,9 +11,13 @@ crate-type = ["cdylib", "staticlib"]
 
 [dependencies]
 magnus = "0.8.2"
-ratatui = { version = "0.30", features = ["widget-calendar", "layout-cache", "unstable-rendered-line-info"] }
+ratatui = { version = "0.30", features = ["widget-calendar", "layout-cache", "unstable-rendered-line-info", "palette"] }
 unicode-width = "0.1"
 
 bumpalo = "3.16"
 lazy_static = "1.4"
 time = { version = "0.3", features = ["macros"] }
+
+[profile.release]
+debug = true
+strip = false

data/ext/ratatui_ruby/src/color.rs

@@ -0,0 +1,82 @@
+// SPDX-FileCopyrightText: 2026 Kerrick Long <me@kerricklong.com>
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+//! Color conversion functions exposed to Ruby.
+//!
+//! These functions wrap Ratatui's color conversion methods that require the `palette` feature.
+
+use magnus::{Error, Ruby};
+use ratatui::palette::{Hsl, Hsluv};
+use ratatui::style::Color;
+
+/// Formats an RGB color as a hex string.
+fn rgb_to_hex(red: u8, green: u8, blue: u8) -> String {
+    format!("#{red:02x}{green:02x}{blue:02x}")
+}
+
+/// Convert HSL values to a hex color string.
+///
+/// # Arguments
+/// * `hue` - Hue in degrees (0-360, wraps)
+/// * `saturation` - Saturation as percentage (0-100)
+/// * `lightness` - Lightness as percentage (0-100)
+///
+/// # Returns
+/// A hex color string like "#rrggbb"
+pub fn from_hsl(_ruby: &Ruby, hue: f32, saturation: f32, lightness: f32) -> String {
+    // Normalize: h wraps, s and l are percentages (0-100) that need to be 0-1
+    let hsl = Hsl::new(hue, saturation / 100.0, lightness / 100.0);
+    let color = Color::from_hsl(hsl);
+
+    match color {
+        Color::Rgb(red, green, blue) => rgb_to_hex(red, green, blue),
+        _ => "#000000".to_string(),
+    }
+}
+
+/// Convert `HSLuv` values to a hex color string.
+///
+/// `HSLuv` is a perceptually uniform color space where colors at the same
+/// lightness appear equally bright regardless of hue.
+///
+/// # Arguments
+/// * `hue` - Hue in degrees (-180 to 360, wraps)
+/// * `saturation` - Saturation as percentage (0-100)
+/// * `lightness` - Lightness as percentage (0-100)
+///
+/// # Returns
+/// A hex color string like "#rrggbb"
+pub fn from_hsluv(_ruby: &Ruby, hue: f32, saturation: f32, lightness: f32) -> String {
+    // Hsluv expects h in degrees, s and l as percentages (0-100)
+    let hsluv = Hsluv::new(hue, saturation, lightness);
+    let color = Color::from_hsluv(hsluv);
+
+    match color {
+        Color::Rgb(red, green, blue) => rgb_to_hex(red, green, blue),
+        _ => "#000000".to_string(),
+    }
+}
+
+/// Convert a u32 to a hex color string.
+///
+/// # Arguments
+/// * `val` - A u32 in the format 0x00RRGGBB
+///
+/// # Returns
+/// A hex color string like "#rrggbb"
+pub fn from_u32(_ruby: &Ruby, val: u32) -> String {
+    let color = Color::from_u32(val);
+
+    match color {
+        Color::Rgb(red, green, blue) => rgb_to_hex(red, green, blue),
+        _ => "#000000".to_string(),
+    }
+}
+
+/// Register color module functions in the `RatatuiRuby` module.
+pub fn register(_ruby: &Ruby, module: magnus::RModule) -> Result<(), Error> {
+    module.define_module_function("_color_from_hsl", magnus::function!(from_hsl, 3))?;
+    module.define_module_function("_color_from_hsluv", magnus::function!(from_hsluv, 3))?;
+    module.define_module_function("_color_from_u32", magnus::function!(from_u32, 1))?;
+    Ok(())
+}

data/ext/ratatui_ruby/src/errors.rs

@@ -0,0 +1,28 @@
+// SPDX-FileCopyrightText: 2026 Kerrick Long <me@kerricklong.com>
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+use magnus::{prelude::*, Error, Value};
+
+/// Creates a `TypeError` with context showing the actual value received.
+///
+/// Calls `inspect` on the Ruby value and includes it in the error message.
+/// Long inspect strings (>200 chars) are truncated.
+///
+/// # Example error message
+/// ```text
+/// expected array for rows, got {:title=>"Processes", :header=>["Name", ...]}
+/// ```
+pub fn type_error_with_context(ruby: &magnus::Ruby, expected: &str, got: Value) -> Error {
+    let inspect: String = got
+        .funcall("inspect", ())
+        .unwrap_or_else(|_| "<uninspectable>".to_string());
+    let truncated = if inspect.len() > 200 {
+        format!("{}...", &inspect[..200])
+    } else {
+        inspect
+    };
+    Error::new(
+        ruby.exception_type_error(),
+        format!("{expected}, got {truncated}"),
+    )
+}

data/ext/ratatui_ruby/src/events.rs

@@ -30,25 +30,26 @@ pub fn inject_test_event(event_type: String, data: magnus::RHash) -> Result<(),
 
 /// Parses a `snake_case` string to `MediaKeyCode`.
 ///
-/// Accepts both the new `media_`-prefixed codes (canonical) and the legacy
-/// unprefixed codes for backward compatibility with existing tests.
+/// Parses a `snake_case` string to `MediaKeyCode`.
+///
+/// Only accepts the `media_`-prefixed codes (canonical). Legacy unprefixed codes are no longer supported.
 fn parse_media_key(s: &str) -> Option<ratatui::crossterm::event::MediaKeyCode> {
     use ratatui::crossterm::event::MediaKeyCode;
     match s {
         // New canonical codes (media_ prefix)
-        "media_play" | "play" => Some(MediaKeyCode::Play),
+        "media_play" => Some(MediaKeyCode::Play),
         "media_pause" => Some(MediaKeyCode::Pause),
-        "media_play_pause" | "play_pause" => Some(MediaKeyCode::PlayPause),
-        "media_reverse" | "reverse" => Some(MediaKeyCode::Reverse),
-        "media_stop" | "stop" => Some(MediaKeyCode::Stop),
-        "media_fast_forward" | "fast_forward" => Some(MediaKeyCode::FastForward),
-        "media_rewind" | "rewind" => Some(MediaKeyCode::Rewind),
-        "media_track_next" | "track_next" => Some(MediaKeyCode::TrackNext),
-        "media_track_previous" | "track_previous" => Some(MediaKeyCode::TrackPrevious),
-        "media_record" | "record" => Some(MediaKeyCode::Record),
-        "media_lower_volume" | "lower_volume" => Some(MediaKeyCode::LowerVolume),
-        "media_raise_volume" | "raise_volume" => Some(MediaKeyCode::RaiseVolume),
-        "media_mute_volume" | "mute_volume" => Some(MediaKeyCode::MuteVolume),
+        "media_play_pause" => Some(MediaKeyCode::PlayPause),
+        "media_reverse" => Some(MediaKeyCode::Reverse),
+        "media_stop" => Some(MediaKeyCode::Stop),
+        "media_fast_forward" => Some(MediaKeyCode::FastForward),
+        "media_rewind" => Some(MediaKeyCode::Rewind),
+        "media_track_next" => Some(MediaKeyCode::TrackNext),
+        "media_track_previous" => Some(MediaKeyCode::TrackPrevious),
+        "media_record" => Some(MediaKeyCode::Record),
+        "media_lower_volume" => Some(MediaKeyCode::LowerVolume),
+        "media_raise_volume" => Some(MediaKeyCode::RaiseVolume),
+        "media_mute_volume" => Some(MediaKeyCode::MuteVolume),
         _ => None,
     }
 }