Merge branch 'master' into add-wayland-clipboard-support

* Propose a tip for vague error message with xclip missing

* misc: update copyright year to 2023

---------

Co-authored-by: LhAlant <>

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019-2022 Aloxaf
+Copyright (c) 2019-2023 Aloxaf
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -9,7 +9,7 @@ Silicon is an alternative to [Carbon](https://github.com/dawnlabs/carbon) implem
 
 It can render your source code into a beautiful image.
 
-<img width="66%" src="http://storage.aloxaf.cn/silicon.png?v=2">
+<img width="66%" src="example/example.png">
 
 ## Why Silicon
 

example/example.rs

@@ -0,0 +1,10 @@
+fn factorial(n: u64) -> u64 {
+    match n {
+        0 => 1,
+        _ => n * factorial(n - 1),
+    }
+}
+
+fn main() {
+    println!("10! = {}", factorial(10));
+}

example/example.sh

@@ -0,0 +1 @@
+silicon example.rs -o example.png

src/bin/silicon/main.rs

@@ -59,10 +59,9 @@ pub fn dump_image_to_clipboard(image: &DynamicImage) -> Result<(), Error> {
                     temp.path().to_str().unwrap(),
                 ])
                 .status()
-                .map_err(|e| format_err!("Failed to copy image to clipboard: {}", e))?;
+                .map_err(|e| format_err!("Failed to copy image to clipboard: {} (Tip: do you have xclip installed ?)", e))?;
         }
     };
-
     Ok(())
 }
 

src/utils.rs

@@ -269,31 +269,48 @@ pub(crate) fn copy_alpha(src: &RgbaImage, dst: &mut RgbaImage, x: u32, y: u32) {
 pub(crate) fn round_corner(image: &mut DynamicImage, radius: u32) {
     // draw a circle with given foreground on given background
     // then split it into four pieces and paste them to the four corner of the image
+    //
+    // the circle is drawn on a bigger image to avoid the aliasing
+    // later it will be scaled to the correct size
+    // we add +1 (to the radius) to make sure that there is also space for the border to mitigate artefacts when scaling
+    // note that the +1 isn't added to the radius when drawing the circle
     let mut circle =
-        RgbaImage::from_pixel(radius * 2 + 1, radius * 2 + 1, Rgba([255, 255, 255, 0]));
+        RgbaImage::from_pixel((radius + 1) * 4, (radius + 1) * 4, Rgba([255, 255, 255, 0]));
 
     let width = image.width();
     let height = image.height();
 
+    // use the bottom right pixel to get the color of the foreground
     let foreground = image.get_pixel(width - 1, height - 1);
 
-    // TODO: need a blur on edge
     draw_filled_circle_mut(
         &mut circle,
-        (radius as i32, radius as i32),
-        radius as i32,
+        (((radius + 1) * 2) as i32, ((radius + 1) * 2) as i32),
+        radius as i32 * 2,
         foreground,
     );
 
-    let part = crop_imm(&circle, 0, 0, radius, radius);
+    // scale down the circle to the correct size
+    let circle = resize(
+        &circle,
+        (radius + 1) * 2,
+        (radius + 1) * 2,
+        FilterType::Triangle,
+    );
+
+    // top left
+    let part = crop_imm(&circle, 1, 1, radius, radius);
     image.copy_from(&*part, 0, 0).unwrap();
 
-    let part = crop_imm(&circle, radius + 1, 0, radius, radius);
+    // top right
+    let part = crop_imm(&circle, radius + 1, 1, radius, radius - 1);
     image.copy_from(&*part, width - radius, 0).unwrap();
 
-    let part = crop_imm(&circle, 0, radius + 1, radius, radius);
+    // bottom left
+    let part = crop_imm(&circle, 1, radius + 1, radius, radius);
     image.copy_from(&*part, 0, height - radius).unwrap();
 
+    // bottom right
     let part = crop_imm(&circle, radius + 1, radius + 1, radius, radius);
     image
         .copy_from(&*part, width - radius, height - radius)