Merge branch 'raphamorim:main' into main

docs/docs/releases.md

@@ -14,6 +14,7 @@ language: 'en'
 - Default navigation on MacOS is now `NativeTab` with `window.decorations = "transparent"`.
 - Default navigation on Linux/BSD/Windows is now BottomTab.
 - Fix font emoji width.
+- Fix MacOS tabbing when spawned from a new window.
 
 ## 0.1.13
 

docs/src/components/MentionsSection/index.js

@@ -8,36 +8,37 @@ import styles from './styles.module.css';
 
 /**
  * @typedef {Object} MentionCardProps
- * @property {string} tweetUrl
+ * @property {string} url
  * @property {string} username
+ * @property {string} source
  * @property {import('react').ReactNode} quote
  *
  * @param {MentionCardProps} props
  */
 function MentionCard(props) {
-  const { tweetUrl, username, quote } = props;
+  const { url, username, quote, source } = props;
 
   return (
     <figure className={styles.mentionCard}>
       <div className={styles.mentionCardTop}>
         <img
           width={40}
           height={40}
-          src={`https://unavatar.io/twitter/${username}`}
+          src={source}
           decoding="async"
           loading="lazy"
           alt=""
           className={styles.mentionCardAvatar}
         />
         <figcaption>
           <cite>
-            <a href={tweetUrl} className={styles.mentionCardUsername}>
+            <a href={url} className={styles.mentionCardUsername}>
               @{username}
             </a>
           </cite>
         </figcaption>
       </div>
-      <blockquote cite={tweetUrl} className={styles.mentionCardQuote}>
+      <blockquote cite={url} className={styles.mentionCardQuote}>
         {quote}
       </blockquote>
     </figure>
@@ -67,7 +68,7 @@ export default function MentionsSection() {
         {COLUMNS.map((column, i) => (
           <div className="col col--4" key={i}>
             {column.map((mention) => (
-              <MentionCard key={mention.tweetUrl} {...mention} />
+              <MentionCard key={mention.url} {...mention} />
             ))}
           </div>
         ))}

docs/src/data/features.js

@@ -6,6 +6,7 @@ import Image from '@site/static/assets/feature-icons/image.svg';
 import Lightning from '@site/static/assets/feature-icons/lightning.svg';
 import Palette from '@site/static/assets/feature-icons/palette.svg';
 import FontLigatures from '@site/static/assets/feature-icons/font-ligatures.svg';
+import Splits from '@site/static/assets/feature-icons/splits.svg';
 
 /**
  * @satisfies {import('@site/src/components/FeaturesSection/index').FeatureCardProps[]}
@@ -45,7 +46,7 @@ const FEATURES = [
     Icon: Image,
     description: (
       <Translate id="home.features.images-in-terminal.description">
-        The Rio can display images within the terminal using Sixel and iTerm2
+        Display images within the terminal using Sixel and iTerm2
         image protocol.
       </Translate>
     ),
@@ -71,11 +72,23 @@ const FEATURES = [
     Icon: FontLigatures,
     description: (
       <Translate id="home.features.font-ligatures.description">
-        Rio provide font ligatures support as a way to improve readability of
+        Font ligatures support as a way to improve readability of
         common expressions or operators.
       </Translate>
     ),
   },
+  {
+    title: translate({
+      message: 'Splits',
+      id: 'home.features.font-ligatures.title',
+    }),
+    Icon: Splits,
+    description: (
+      <Translate id="home.features.font-ligatures.description">
+        Support to split and manage terminal screens in any platform that you would want to. 
+      </Translate>
+    ),
+  },
 ];
 
 export default FEATURES;

docs/src/data/mentions.js

@@ -3,8 +3,9 @@
 /** @satisfies {import('@site/src/components/MentionsSection/index').MentionCardProps[]} */
 const MENTIONS = [
   {
-    tweetUrl: 'https://twitter.com/jaijams/status/1716815864975270005',
+    url: 'https://twitter.com/jaijams/status/1716815864975270005',
     username: 'jaijams',
+    source: '/rio/assets/mentions/jaijams.jpg',
     quote: (
       <>
         I have been using the Rio terminal (https://raphamorim.io/rio/) for 6
@@ -14,8 +15,19 @@ const MENTIONS = [
     ),
   },
   {
-    tweetUrl: 'https://twitter.com/mcsmonte/status/1660949303089586177',
+    url: '',
+    username: 'simonnyberg',
+    source: '/rio/assets/mentions/simonnyberg.png',
+    quote: (
+      <>
+        Rio has become my standard terminal emulator for some time and it works well in professional use. Raphael is doing a great work and is awesome at listening to feedback to the community for new and improved features.
+      </>
+    ),
+  },
+  {
+    url: 'https://twitter.com/mcsmonte/status/1660949303089586177',
     username: 'mcsmonte',
+    source: '/rio/assets/mentions/mcsmonte.jpg',
     quote: (
       <>
         This week I'm testing rio, a rust based terminal and I need to say: It's
@@ -26,18 +38,21 @@ const MENTIONS = [
     ),
   },
   {
-    tweetUrl: 'https://twitter.com/moeyua13/status/1665983183526195200',
+    url: 'https://twitter.com/moeyua13/status/1665983183526195200',
     username: 'moeyua13',
+    source: 'https://unavatar.io/x/moeyua13',
     quote: <>I really love this terminal</>,
   },
   {
-    tweetUrl: 'https://twitter.com/peterlazar1993/status/1689965895408402432',
+    url: 'https://twitter.com/peterlazar1993/status/1689965895408402432',
     username: 'peterlazar1993',
+    source: 'https://unavatar.io/x/peterlazar1993',
     quote: <>I've been dailydriving Rio, it's 🔥</>,
   },
   {
-    tweetUrl: 'https://twitter.com/EduRonqui/status/1717288090820055297',
+    url: 'https://twitter.com/EduRonqui/status/1717288090820055297',
     username: 'EduRonqui',
+    source: 'https://unavatar.io/x/EduRonqui',
     quote: (
       <>
         It’s a tiny one but this release features my first ever contribution to
@@ -47,15 +62,46 @@ const MENTIONS = [
     ),
   },
   {
-    tweetUrl: 'https://twitter.com/EduRonqui/status/1730619921632022997',
+    url: 'https://x.com/ferfabricio/status/1789425980357886355',
     username: 'ferfabricio',
+    source: '/rio/assets/mentions/ferfabricio.jpg',
     quote: (
       <>
         Eu comecei a usar o Rio term faz uns dias e ta sendo uma experiência
         muito bacana! parabéns @raphamorims
       </>
     ),
   },
+  {
+    url: '#',
+    username: 'Jader Gomes',
+    source: '/rio/assets/mentions/jadergomes.jpg',
+    quote: (
+      <>
+        Have been using Rio for few weeks and enjoying the experience so far. I love the colors and the visual around it.
+      </>
+    ),
+  },
+  {
+    url: '#',
+    username: 'Daria Edlund',
+    source: '/rio/assets/mentions/dariaedlund.png',
+    quote: (
+      <>
+        Installed Rio recently and am impressed how smooth and fast this terminal is. Already set up as my default go-to terminal! Looking forward to the continued development and what is to come. Keep up the awesome job Raphael!
+      </>
+    ),
+  },
+  {
+    url: 'https://x.com/avelinorun/',
+    username: 'Thiago Avelino',
+    source: '/rio/assets/mentions/avelinorun.jpg',
+    quote: (
+      <>
+        It is a privilege to be invited to beta test Rio! It has brought me closer to the code of the project, and I have learned a lot about how to develop a terminal emulator.
+      </>
+    ),
+  },
 ];
 
 export default MENTIONS;

frontends/rioterm/src/application.rs

@@ -1,7 +1,6 @@
 use crate::event::{ClickState, EventPayload, EventProxy, RioEvent, RioEventType};
 use crate::ime::Preedit;
-use crate::router::{RouteWindow, Router};
-use crate::routes::RoutePath;
+use crate::router::{routes::RoutePath, Router};
 use crate::scheduler::{Scheduler, TimerId, Topic};
 use crate::screen::touch::on_touch;
 use crate::watcher::configuration_file_updates;
@@ -116,17 +115,12 @@ impl ApplicationHandler<EventPayload> for Application {
             return;
         }
 
-        let mut window = RouteWindow::new(
+        self.router.create_window(
             event_loop,
-            &self.event_proxy,
+            self.event_proxy.clone(),
             &self.config,
-            &self.router.font_library,
             None,
-            &self.router.clipboard,
-        )
-        .unwrap();
-        window.is_focused = true;
-        self.router.create_route_from_window(window);
+        );
 
         tracing::info!("Initialisation complete");
     }
@@ -447,7 +441,7 @@ impl ApplicationHandler<EventPayload> for Application {
                         event_loop,
                         self.event_proxy.clone(),
                         &self.config,
-                        Some(route.window.winit_window.tabbing_identifier()),
+                        Some(&route.window.winit_window.tabbing_identifier()),
                         None,
                     );
 
@@ -578,7 +572,7 @@ impl ApplicationHandler<EventPayload> for Application {
                     active_event_loop,
                     self.event_proxy.clone(),
                     config,
-                    tab_id.clone(),
+                    tab_id.as_deref(),
                     Some(url),
                 );
             }

frontends/rioterm/src/main.rs

@@ -17,7 +17,6 @@ mod panic;
 mod platform;
 mod renderer;
 mod router;
-mod routes;
 mod scheduler;
 mod screen;
 mod watcher;