Fix crates.io publishing restrictions

This works around the problem that crates pushed to crates.io cannot
reference files outside of their crate directory.

9 files changed, 187 insertions, 14 deletions

diff --git a/alacritty/Cargo.toml b/alacritty/Cargo.toml
index 7a3a043e..eab8f227 100644
--- a/alacritty/Cargo.toml
+++ b/alacritty/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.6.0-dev"
 authors = ["Christian Duerr <contact@christianduerr.com>", "Joe Wilm <joe@jwilm.com>"]
 license = "Apache-2.0"
 description = "GPU-accelerated terminal emulator"
-readme = "../README.md"
+readme = "README.md"
 homepage = "https://github.com/alacritty/alacritty"
 edition = "2018"
 
diff --git a/alacritty/README.md b/alacritty/README.md
new file mode 120000
index 00000000..32d46ee8
--- /dev/null
+++ b/alacritty/README.md
@@ -0,0 +1 @@
+../README.md
\ No newline at end of file
diff --git a/alacritty/alacritty.ico b/alacritty/alacritty.ico
new file mode 120000
index 00000000..55cd1859
--- /dev/null
+++ b/alacritty/alacritty.ico
@@ -0,0 +1 @@
+../extra/windows/alacritty.ico
\ No newline at end of file
diff --git a/alacritty/res/rect.f.glsl b/alacritty/res/rect.f.glsl
new file mode 100644
index 00000000..12e40469
--- /dev/null
+++ b/alacritty/res/rect.f.glsl
@@ -0,0 +1,23 @@
+// Copyright 2016 Joe Wilm, The Alacritty Project Contributors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+#version 330 core
+
+uniform vec4 color;
+
+out vec4 FragColor;
+
+void main()
+{
+    FragColor = color;
+}
diff --git a/alacritty/res/rect.v.glsl b/alacritty/res/rect.v.glsl
new file mode 100644
index 00000000..8baa74ff
--- /dev/null
+++ b/alacritty/res/rect.v.glsl
@@ -0,0 +1,20 @@
+// Copyright 2016 Joe Wilm, The Alacritty Project Contributors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+#version 330 core
+layout (location = 0) in vec2 aPos;
+
+void main()
+{
+    gl_Position = vec4(aPos.x, aPos.y, 0.0, 1.0);
+}
diff --git a/alacritty/res/text.f.glsl b/alacritty/res/text.f.glsl
new file mode 100644
index 00000000..cf477eb0
--- /dev/null
+++ b/alacritty/res/text.f.glsl
@@ -0,0 +1,53 @@
+// Copyright 2016 Joe Wilm, The Alacritty Project Contributors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+#version 330 core
+in vec2 TexCoords;
+flat in vec3 fg;
+flat in vec4 bg;
+flat in int colored;
+uniform int backgroundPass;
+
+layout(location = 0, index = 0) out vec4 color;
+layout(location = 0, index = 1) out vec4 alphaMask;
+
+uniform sampler2D mask;
+
+void main()
+{
+    if (backgroundPass != 0) {
+        if (bg.a == 0.0)
+            discard;
+
+        alphaMask = vec4(1.0);
+        color = vec4(bg.rgb, 1.0);
+    } else {
+        if (colored != 0) {
+            // Color glyphs, like emojis.
+            vec4 glyphColor = texture(mask, TexCoords);
+            alphaMask = vec4(glyphColor.a);
+
+            // Revert alpha premultiplication.
+            if (glyphColor.a != 0) {
+                glyphColor.rgb = vec3(glyphColor.rgb / glyphColor.a);
+            }
+
+            color = vec4(glyphColor.rgb, 1.0);
+        } else {
+            // Regular text glyphs.
+            vec3 textColor = texture(mask, TexCoords).rgb;
+            alphaMask = vec4(textColor, textColor.r);
+            color = vec4(fg, 1.0);
+        }
+    }
+}
diff --git a/alacritty/res/text.v.glsl b/alacritty/res/text.v.glsl
new file mode 100644
index 00000000..8978c111
--- /dev/null
+++ b/alacritty/res/text.v.glsl
@@ -0,0 +1,79 @@
+// Copyright 2016 Joe Wilm, The Alacritty Project Contributors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+#version 330 core
+// Cell properties.
+layout (location = 0) in vec2 gridCoords;
+
+// Glyph properties.
+layout (location = 1) in vec4 glyph;
+
+// uv mapping.
+layout (location = 2) in vec4 uv;
+
+// Text fg color.
+layout (location = 3) in vec3 textColor;
+
+// Background color.
+layout (location = 4) in vec4 backgroundColor;
+
+// Set to 1 if the glyph colors should be kept.
+layout (location = 5) in int coloredGlyph;
+
+out vec2 TexCoords;
+flat out vec3 fg;
+flat out vec4 bg;
+flat out int colored;
+
+// Terminal properties
+uniform vec2 cellDim;
+uniform vec4 projection;
+
+uniform int backgroundPass;
+
+
+void main()
+{
+    vec2 projectionOffset = projection.xy;
+    vec2 projectionScale = projection.zw;
+
+    // Compute vertex corner position
+    vec2 position;
+    position.x = (gl_VertexID == 0 || gl_VertexID == 1) ? 1. : 0.;
+    position.y = (gl_VertexID == 0 || gl_VertexID == 3) ? 0. : 1.;
+
+    // Position of cell from top-left
+    vec2 cellPosition = cellDim * gridCoords;
+
+    if (backgroundPass != 0) {
+        vec2 finalPosition = cellPosition + cellDim * position;
+        gl_Position = vec4(projectionOffset + projectionScale * finalPosition, 0.0, 1.0);
+
+        TexCoords = vec2(0, 0);
+    } else {
+        vec2 glyphSize = glyph.zw;
+        vec2 glyphOffset = glyph.xy;
+        glyphOffset.y = cellDim.y - glyphOffset.y;
+
+        vec2 finalPosition = cellPosition + glyphSize * position + glyphOffset;
+        gl_Position = vec4(projectionOffset + projectionScale * finalPosition, 0.0, 1.0);
+
+        vec2 uvOffset = uv.xy;
+        vec2 uvSize = uv.zw;
+        TexCoords = uvOffset + position * uvSize;
+    }
+
+    bg = vec4(backgroundColor.rgb / 255.0, backgroundColor.a);
+    fg = textColor / vec3(255.0, 255.0, 255.0);
+    colored = coloredGlyph;
+}
diff --git a/alacritty/src/renderer/mod.rs b/alacritty/src/renderer/mod.rs
index 58d43406..79df6b34 100644
--- a/alacritty/src/renderer/mod.rs
+++ b/alacritty/src/renderer/mod.rs
@@ -35,20 +35,16 @@ use crate::renderer::rects::RenderRect;
 pub mod rects;
 
 // Shader paths for live reload.
-static TEXT_SHADER_F_PATH: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/../res/text.f.glsl");
-static TEXT_SHADER_V_PATH: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/../res/text.v.glsl");
-static RECT_SHADER_F_PATH: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/../res/rect.f.glsl");
-static RECT_SHADER_V_PATH: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/../res/rect.v.glsl");
+static TEXT_SHADER_F_PATH: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/res/text.f.glsl");
+static TEXT_SHADER_V_PATH: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/res/text.v.glsl");
+static RECT_SHADER_F_PATH: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/res/rect.f.glsl");
+static RECT_SHADER_V_PATH: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/res/rect.v.glsl");
 
 // Shader source which is used when live-shader-reload feature is disable.
-static TEXT_SHADER_F: &str =
-    include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/../res/text.f.glsl"));
-static TEXT_SHADER_V: &str =
-    include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/../res/text.v.glsl"));
-static RECT_SHADER_F: &str =
-    include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/../res/rect.f.glsl"));
-static RECT_SHADER_V: &str =
-    include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/../res/rect.v.glsl"));
+static TEXT_SHADER_F: &str = include_str!("../../res/text.f.glsl");
+static TEXT_SHADER_V: &str = include_str!("../../res/text.v.glsl");
+static RECT_SHADER_F: &str = include_str!("../../res/rect.f.glsl");
+static RECT_SHADER_V: &str = include_str!("../../res/rect.v.glsl");
 
 /// `LoadGlyph` allows for copying a rasterized glyph into graphics memory.
 pub trait LoadGlyph {
diff --git a/alacritty/src/window.rs b/alacritty/src/window.rs
index 6659a9e0..172d5acc 100644
--- a/alacritty/src/window.rs
+++ b/alacritty/src/window.rs
@@ -42,7 +42,7 @@ use crate::gl;
 
 // It's required to be in this directory due to the `windows.rc` file.
 #[cfg(not(any(target_os = "macos", windows)))]
-static WINDOW_ICON: &[u8] = include_bytes!("../../extra/windows/alacritty.ico");
+static WINDOW_ICON: &[u8] = include_bytes!("../alacritty.ico");
 
 // This should match the definition of IDI_ICON from `windows.rc`.
 #[cfg(windows)]