aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Cargo.lock17
-rw-r--r--components/compositing/Cargo.toml3
-rw-r--r--components/compositing/lib.rs1
-rw-r--r--ports/android/glut_app/Cargo.lock16
-rw-r--r--ports/android/glut_app/Cargo.toml3
-rw-r--r--ports/android/glut_app/lib.rs1
-rw-r--r--ports/android/glut_app/window.rs17
-rw-r--r--ports/cef/Cargo.lock16
-rw-r--r--ports/glfw/Cargo.toml3
-rw-r--r--ports/glfw/lib.rs1
-rw-r--r--ports/glfw/window.rs17
-rw-r--r--ports/glutin/Cargo.toml3
-rw-r--r--ports/glutin/lib.rs3
-rw-r--r--ports/glutin/window.rs21
14 files changed, 5 insertions, 117 deletions
diff --git a/Cargo.lock b/Cargo.lock
index d728d9e48b1..1f51a18936f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -17,15 +17,6 @@ dependencies = [
]
[[package]]
-name = "alert"
-version = "0.1.0"
-source = "git+https://github.com/servo/rust-alert#9bd18fc406683bae448bc6f5d546872970af252e"
-dependencies = [
- "cocoa 0.1.1 (git+https://github.com/servo/rust-cocoa)",
- "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)",
-]
-
-[[package]]
name = "android_glue"
version = "0.0.1"
source = "git+https://github.com/tomaka/android-rs-glue#fe9acb5bd465da1df4561e2bd4ebcc6d305134a4"
@@ -72,11 +63,6 @@ version = "0.1.1"
source = "git+https://github.com/DavidPartouche/rust-cocoa#0a951a6cdd5f1a175b929754c134f9443b105642"
[[package]]
-name = "cocoa"
-version = "0.1.1"
-source = "git+https://github.com/servo/rust-cocoa#f926323d306401df33f528c9aeca8e582cad063b"
-
-[[package]]
name = "compile_msg"
version = "0.1.1"
source = "git+https://github.com/huonw/compile_msg#f526abe54b49642bc1e969e6c2af1411798b6776"
@@ -85,7 +71,6 @@ source = "git+https://github.com/huonw/compile_msg#f526abe54b49642bc1e969e6c2af1
name = "compositing"
version = "0.0.1"
dependencies = [
- "alert 0.1.0 (git+https://github.com/servo/rust-alert)",
"azure 0.1.0 (git+https://github.com/servo/rust-azure)",
"core_graphics 0.1.0 (git+https://github.com/servo/rust-core-graphics)",
"core_text 0.1.0 (git+https://github.com/servo/rust-core-text)",
@@ -294,7 +279,6 @@ source = "git+https://github.com/servo/glfw?ref=cargo-3.0.4#765dace7e4125b87c764
name = "glfw_app"
version = "0.0.1"
dependencies = [
- "alert 0.1.0 (git+https://github.com/servo/rust-alert)",
"cgl 0.0.1 (git+https://github.com/servo/rust-cgl)",
"compositing 0.0.1",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
@@ -322,7 +306,6 @@ dependencies = [
name = "glutin_app"
version = "0.0.1"
dependencies = [
- "alert 0.1.0 (git+https://github.com/servo/rust-alert)",
"cgl 0.0.1 (git+https://github.com/servo/rust-cgl)",
"compositing 0.0.1",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
diff --git a/components/compositing/Cargo.toml b/components/compositing/Cargo.toml
index 47f732d9c0d..d24be54918e 100644
--- a/components/compositing/Cargo.toml
+++ b/components/compositing/Cargo.toml
@@ -31,9 +31,6 @@ path = "../devtools"
[dependencies.devtools_traits]
path = "../devtools_traits"
-[dependencies.alert]
-git = "https://github.com/servo/rust-alert"
-
[dependencies.azure]
git = "https://github.com/servo/rust-azure"
diff --git a/components/compositing/lib.rs b/components/compositing/lib.rs
index ecb25528c6e..4e906b83133 100644
--- a/components/compositing/lib.rs
+++ b/components/compositing/lib.rs
@@ -13,7 +13,6 @@
#[phase(plugin, link)]
extern crate log;
-extern crate alert;
extern crate azure;
extern crate devtools_traits;
extern crate geom;
diff --git a/ports/android/glut_app/Cargo.lock b/ports/android/glut_app/Cargo.lock
index 4fbe533bd7d..94074c2d8f2 100644
--- a/ports/android/glut_app/Cargo.lock
+++ b/ports/android/glut_app/Cargo.lock
@@ -2,7 +2,6 @@
name = "glut_app"
version = "0.0.1"
dependencies = [
- "alert 0.1.0 (git+https://github.com/servo/rust-alert)",
"compositing 0.0.1",
"egl 0.1.0 (git+https://github.com/servo/rust-egl)",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
@@ -14,15 +13,6 @@ dependencies = [
]
[[package]]
-name = "alert"
-version = "0.1.0"
-source = "git+https://github.com/servo/rust-alert#9bd18fc406683bae448bc6f5d546872970af252e"
-dependencies = [
- "cocoa 0.1.1 (git+https://github.com/servo/rust-cocoa)",
- "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)",
-]
-
-[[package]]
name = "azure"
version = "0.1.0"
source = "git+https://github.com/servo/rust-azure#612ffc4fbf80c1bd5faae4b86dfc539dda06fb0c"
@@ -56,15 +46,9 @@ dependencies = [
]
[[package]]
-name = "cocoa"
-version = "0.1.1"
-source = "git+https://github.com/servo/rust-cocoa#f926323d306401df33f528c9aeca8e582cad063b"
-
-[[package]]
name = "compositing"
version = "0.0.1"
dependencies = [
- "alert 0.1.0 (git+https://github.com/servo/rust-alert)",
"azure 0.1.0 (git+https://github.com/servo/rust-azure)",
"core_graphics 0.1.0 (git+https://github.com/servo/rust-core-graphics)",
"core_text 0.1.0 (git+https://github.com/servo/rust-core-text)",
diff --git a/ports/android/glut_app/Cargo.toml b/ports/android/glut_app/Cargo.toml
index ed9cc080fce..1fdad3d343e 100644
--- a/ports/android/glut_app/Cargo.toml
+++ b/ports/android/glut_app/Cargo.toml
@@ -8,9 +8,6 @@ name = "glut_app"
path = "lib.rs"
crate-type = ["dylib"]
-[dependencies.alert]
-git = "https://github.com/servo/rust-alert"
-
[dependencies.compositing]
path = "../../../components/compositing"
diff --git a/ports/android/glut_app/lib.rs b/ports/android/glut_app/lib.rs
index 66c16b292cd..2efb83c8d24 100644
--- a/ports/android/glut_app/lib.rs
+++ b/ports/android/glut_app/lib.rs
@@ -9,7 +9,6 @@
#![deny(unused_imports)]
#![deny(unused_variables)]
-extern crate alert;
extern crate compositing;
extern crate egl;
extern crate geom;
diff --git a/ports/android/glut_app/window.rs b/ports/android/glut_app/window.rs
index 48da4eb08c0..3f440c69913 100644
--- a/ports/android/glut_app/window.rs
+++ b/ports/android/glut_app/window.rs
@@ -6,12 +6,11 @@
use compositing::compositor_task::{mod, CompositorProxy, CompositorReceiver};
use compositing::windowing::{WindowEvent, WindowMethods};
-use compositing::windowing::{IdleWindowEvent, ResizeWindowEvent, LoadUrlWindowEvent, MouseWindowEventClass};
+use compositing::windowing::{IdleWindowEvent, ResizeWindowEvent, MouseWindowEventClass};
use compositing::windowing::{ScrollWindowEvent, ZoomWindowEvent, NavigationWindowEvent, FinishedWindowEvent};
use compositing::windowing::{MouseWindowClickEvent, MouseWindowMouseDownEvent, MouseWindowMouseUpEvent};
use compositing::windowing::{Forward, Back};
-use alert::{Alert, AlertMethods};
use libc::{c_int, c_uchar};
use std::cell::{Cell, RefCell};
use std::rc::Rc;
@@ -238,7 +237,6 @@ impl Window {
debug!("got key: {}", key);
let modifiers = glut::get_modifiers();
match key {
- 42 => self.load_url(),
43 => self.event_queue.borrow_mut().push(ZoomWindowEvent(1.1)),
45 => self.event_queue.borrow_mut().push(ZoomWindowEvent(0.909090909)),
56 => self.event_queue.borrow_mut().push(ScrollWindowEvent(TypedPoint2D(0.0f32, 5.0f32),
@@ -284,19 +282,6 @@ impl Window {
};
self.event_queue.borrow_mut().push(MouseWindowEventClass(event));
}
-
- /// Helper function to pop up an alert box prompting the user to load a URL.
- fn load_url(&self) {
- let mut alert: Alert = AlertMethods::new("Navigate to:");
- alert.add_prompt();
- alert.run();
- let value = alert.prompt_value();
- if "" == value.as_slice() { // To avoid crashing on Linux.
- self.event_queue.borrow_mut().push(LoadUrlWindowEvent("http://purple.com/".to_string()))
- } else {
- self.event_queue.borrow_mut().push(LoadUrlWindowEvent(value.clone()))
- }
- }
}
struct GlutCompositorProxy {
diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock
index 2e2a3d3f161..c655d647248 100644
--- a/ports/cef/Cargo.lock
+++ b/ports/cef/Cargo.lock
@@ -24,15 +24,6 @@ dependencies = [
]
[[package]]
-name = "alert"
-version = "0.1.0"
-source = "git+https://github.com/servo/rust-alert#9bd18fc406683bae448bc6f5d546872970af252e"
-dependencies = [
- "cocoa 0.1.1 (git+https://github.com/servo/rust-cocoa)",
- "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)",
-]
-
-[[package]]
name = "azure"
version = "0.1.0"
source = "git+https://github.com/servo/rust-azure#612ffc4fbf80c1bd5faae4b86dfc539dda06fb0c"
@@ -66,15 +57,9 @@ dependencies = [
]
[[package]]
-name = "cocoa"
-version = "0.1.1"
-source = "git+https://github.com/servo/rust-cocoa#f926323d306401df33f528c9aeca8e582cad063b"
-
-[[package]]
name = "compositing"
version = "0.0.1"
dependencies = [
- "alert 0.1.0 (git+https://github.com/servo/rust-alert)",
"azure 0.1.0 (git+https://github.com/servo/rust-azure)",
"core_graphics 0.1.0 (git+https://github.com/servo/rust-core-graphics)",
"core_text 0.1.0 (git+https://github.com/servo/rust-core-text)",
@@ -283,7 +268,6 @@ source = "git+https://github.com/servo/glfw?ref=cargo-3.0.4#765dace7e4125b87c764
name = "glfw_app"
version = "0.0.1"
dependencies = [
- "alert 0.1.0 (git+https://github.com/servo/rust-alert)",
"cgl 0.0.1 (git+https://github.com/servo/rust-cgl)",
"compositing 0.0.1",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
diff --git a/ports/glfw/Cargo.toml b/ports/glfw/Cargo.toml
index 5c32ba229e8..4ecd611c198 100644
--- a/ports/glfw/Cargo.toml
+++ b/ports/glfw/Cargo.toml
@@ -7,9 +7,6 @@ authors = ["The Servo Project Developers"]
name = "glfw_app"
path = "lib.rs"
-[dependencies.alert]
-git = "https://github.com/servo/rust-alert"
-
[dependencies.compositing]
path = "../../components/compositing"
diff --git a/ports/glfw/lib.rs b/ports/glfw/lib.rs
index 9741072db2f..077bd6562e9 100644
--- a/ports/glfw/lib.rs
+++ b/ports/glfw/lib.rs
@@ -8,7 +8,6 @@
#![feature(macro_rules)]
#![deny(unused_imports, unused_variables)]
-extern crate alert;
#[cfg(target_os="macos")]
extern crate cgl;
extern crate compositing;
diff --git a/ports/glfw/window.rs b/ports/glfw/window.rs
index b24eef7754a..e6cdb396dbf 100644
--- a/ports/glfw/window.rs
+++ b/ports/glfw/window.rs
@@ -6,10 +6,9 @@
use NestedEventLoopListener;
-use alert::{Alert, AlertMethods};
use compositing::compositor_task::{mod, CompositorProxy, CompositorReceiver};
use compositing::windowing::{Forward, Back};
-use compositing::windowing::{IdleWindowEvent, ResizeWindowEvent, LoadUrlWindowEvent};
+use compositing::windowing::{IdleWindowEvent, ResizeWindowEvent};
use compositing::windowing::{KeyEvent, MouseWindowClickEvent, MouseWindowMouseDownEvent};
use compositing::windowing::{MouseWindowEventClass, MouseWindowMoveEventClass};
use compositing::windowing::{MouseWindowMouseUpEvent, RefreshWindowEvent};
@@ -326,7 +325,6 @@ impl Window {
fn handle_key(&self, key: glfw::Key, mods: glfw::Modifiers) {
match key {
glfw::KeyEscape => self.glfw_window.set_should_close(true),
- glfw::KeyL if mods.contains(glfw::Control) => self.load_url(), // Ctrl+L
glfw::KeyEqual if mods.contains(glfw::Control) => { // Ctrl-+
self.event_queue.borrow_mut().push(ZoomWindowEvent(1.1));
}
@@ -383,19 +381,6 @@ impl Window {
};
self.event_queue.borrow_mut().push(MouseWindowEventClass(event));
}
-
- /// Helper function to pop up an alert box prompting the user to load a URL.
- fn load_url(&self) {
- let mut alert: Alert = AlertMethods::new("Navigate to:");
- alert.add_prompt();
- alert.run();
- let value = alert.prompt_value();
- if "" == value.as_slice() { // To avoid crashing on Linux.
- self.event_queue.borrow_mut().push(LoadUrlWindowEvent("http://purple.com/".to_string()))
- } else {
- self.event_queue.borrow_mut().push(LoadUrlWindowEvent(value.clone()))
- }
- }
}
struct GlfwCompositorProxy {
diff --git a/ports/glutin/Cargo.toml b/ports/glutin/Cargo.toml
index 12698526eb9..26149522424 100644
--- a/ports/glutin/Cargo.toml
+++ b/ports/glutin/Cargo.toml
@@ -7,9 +7,6 @@ authors = ["The Servo Project Developers"]
name = "glutin_app"
path = "lib.rs"
-[dependencies.alert]
-git = "https://github.com/servo/rust-alert"
-
[dependencies.compositing]
path = "../../components/compositing"
diff --git a/ports/glutin/lib.rs b/ports/glutin/lib.rs
index 8fc28a8debc..91a12589292 100644
--- a/ports/glutin/lib.rs
+++ b/ports/glutin/lib.rs
@@ -6,9 +6,8 @@
#![license = "MPL"]
#![feature(macro_rules)]
-#![deny(unused_imports, unused_variable)]
+#![deny(unused_imports, unused_variables)]
-extern crate alert;
#[cfg(target_os="macos")]
extern crate cgl;
extern crate compositing;
diff --git a/ports/glutin/window.rs b/ports/glutin/window.rs
index bb58b76587c..34b54b4b316 100644
--- a/ports/glutin/window.rs
+++ b/ports/glutin/window.rs
@@ -2,12 +2,11 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-//! A windowing implementation using GLFW.
+//! A windowing implementation using glutin.
-use alert::{Alert, AlertMethods};
use compositing::compositor_task::{mod, CompositorProxy, CompositorReceiver};
use compositing::windowing::{WindowEvent, WindowMethods};
-use compositing::windowing::{IdleWindowEvent, ResizeWindowEvent, LoadUrlWindowEvent};
+use compositing::windowing::{IdleWindowEvent, ResizeWindowEvent};
use compositing::windowing::{MouseWindowEventClass, MouseWindowMoveEventClass, ScrollWindowEvent};
use compositing::windowing::{ZoomWindowEvent, PinchZoomWindowEvent, NavigationWindowEvent};
use compositing::windowing::{FinishedWindowEvent, QuitWindowEvent, MouseWindowClickEvent};
@@ -339,9 +338,6 @@ impl Window {
fn handle_key(&self, key: glutin::VirtualKeyCode) -> bool {
match key {
glutin::Escape => return true,
- glutin::L if self.ctrl_pressed() => {
- self.load_url(); // Ctrl+L
- }
glutin::Equals if self.ctrl_pressed() => { // Ctrl-+
self.event_queue.borrow_mut().push(ZoomWindowEvent(1.1));
}
@@ -398,19 +394,6 @@ impl Window {
self.event_queue.borrow_mut().push(MouseWindowEventClass(event));
}
- /// Helper function to pop up an alert box prompting the user to load a URL.
- fn load_url(&self) {
- let mut alert: Alert = AlertMethods::new("Navigate to:");
- alert.add_prompt();
- alert.run();
- let value = alert.prompt_value();
- if "" == value.as_slice() { // To avoid crashing on Linux.
- self.event_queue.borrow_mut().push(LoadUrlWindowEvent("http://purple.com/".to_string()))
- } else {
- self.event_queue.borrow_mut().push(LoadUrlWindowEvent(value.clone()))
- }
- }
-
pub unsafe fn set_nested_event_loop_listener(
&self,
_listener: *mut NestedEventLoopListener + 'static) {
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-27 16:31:15 +0000