Beginnings of a GUI.
This commit is contained in:
parent
ac784077f0
commit
463911e5b3
92
fonts/source_code_pro/LICENSE.txt
Normal file
92
fonts/source_code_pro/LICENSE.txt
Normal file
|
@ -0,0 +1,92 @@
|
||||||
|
Copyright 2010, 2012 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe Systems Incorporated in the United States and/or other countries.
|
||||||
|
This Font Software is licensed under the SIL Open Font License, Version 1.1.
|
||||||
|
This license is copied below, and is also available with a FAQ at:
|
||||||
|
http://scripts.sil.org/OFL
|
||||||
|
|
||||||
|
|
||||||
|
-----------------------------------------------------------
|
||||||
|
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
|
||||||
|
-----------------------------------------------------------
|
||||||
|
|
||||||
|
PREAMBLE
|
||||||
|
The goals of the Open Font License (OFL) are to stimulate worldwide
|
||||||
|
development of collaborative font projects, to support the font creation
|
||||||
|
efforts of academic and linguistic communities, and to provide a free and
|
||||||
|
open framework in which fonts may be shared and improved in partnership
|
||||||
|
with others.
|
||||||
|
|
||||||
|
The OFL allows the licensed fonts to be used, studied, modified and
|
||||||
|
redistributed freely as long as they are not sold by themselves. The
|
||||||
|
fonts, including any derivative works, can be bundled, embedded,
|
||||||
|
redistributed and/or sold with any software provided that any reserved
|
||||||
|
names are not used by derivative works. The fonts and derivatives,
|
||||||
|
however, cannot be released under any other type of license. The
|
||||||
|
requirement for fonts to remain under this license does not apply
|
||||||
|
to any document created using the fonts or their derivatives.
|
||||||
|
|
||||||
|
DEFINITIONS
|
||||||
|
"Font Software" refers to the set of files released by the Copyright
|
||||||
|
Holder(s) under this license and clearly marked as such. This may
|
||||||
|
include source files, build scripts and documentation.
|
||||||
|
|
||||||
|
"Reserved Font Name" refers to any names specified as such after the
|
||||||
|
copyright statement(s).
|
||||||
|
|
||||||
|
"Original Version" refers to the collection of Font Software components as
|
||||||
|
distributed by the Copyright Holder(s).
|
||||||
|
|
||||||
|
"Modified Version" refers to any derivative made by adding to, deleting,
|
||||||
|
or substituting -- in part or in whole -- any of the components of the
|
||||||
|
Original Version, by changing formats or by porting the Font Software to a
|
||||||
|
new environment.
|
||||||
|
|
||||||
|
"Author" refers to any designer, engineer, programmer, technical
|
||||||
|
writer or other person who contributed to the Font Software.
|
||||||
|
|
||||||
|
PERMISSION & CONDITIONS
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining
|
||||||
|
a copy of the Font Software, to use, study, copy, merge, embed, modify,
|
||||||
|
redistribute, and sell modified and unmodified copies of the Font
|
||||||
|
Software, subject to the following conditions:
|
||||||
|
|
||||||
|
1) Neither the Font Software nor any of its individual components,
|
||||||
|
in Original or Modified Versions, may be sold by itself.
|
||||||
|
|
||||||
|
2) Original or Modified Versions of the Font Software may be bundled,
|
||||||
|
redistributed and/or sold with any software, provided that each copy
|
||||||
|
contains the above copyright notice and this license. These can be
|
||||||
|
included either as stand-alone text files, human-readable headers or
|
||||||
|
in the appropriate machine-readable metadata fields within text or
|
||||||
|
binary files as long as those fields can be easily viewed by the user.
|
||||||
|
|
||||||
|
3) No Modified Version of the Font Software may use the Reserved Font
|
||||||
|
Name(s) unless explicit written permission is granted by the corresponding
|
||||||
|
Copyright Holder. This restriction only applies to the primary font name as
|
||||||
|
presented to the users.
|
||||||
|
|
||||||
|
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
|
||||||
|
Software shall not be used to promote, endorse or advertise any
|
||||||
|
Modified Version, except to acknowledge the contribution(s) of the
|
||||||
|
Copyright Holder(s) and the Author(s) or with their explicit written
|
||||||
|
permission.
|
||||||
|
|
||||||
|
5) The Font Software, modified or unmodified, in part or in whole,
|
||||||
|
must be distributed entirely under this license, and must not be
|
||||||
|
distributed under any other license. The requirement for fonts to
|
||||||
|
remain under this license does not apply to any document created
|
||||||
|
using the Font Software.
|
||||||
|
|
||||||
|
TERMINATION
|
||||||
|
This license becomes null and void if any of the above conditions are
|
||||||
|
not met.
|
||||||
|
|
||||||
|
DISCLAIMER
|
||||||
|
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||||
|
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
|
||||||
|
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
|
||||||
|
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
|
||||||
|
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||||
|
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
|
||||||
|
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||||
|
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
|
||||||
|
OTHER DEALINGS IN THE FONT SOFTWARE.
|
BIN
fonts/source_code_pro/SourceCodePro-Bold.ttf
Normal file
BIN
fonts/source_code_pro/SourceCodePro-Bold.ttf
Normal file
Binary file not shown.
BIN
fonts/source_code_pro/SourceCodePro-Regular.ttf
Normal file
BIN
fonts/source_code_pro/SourceCodePro-Regular.ttf
Normal file
Binary file not shown.
BIN
fonts/source_code_pro/SourceCodePro-Semibold.ttf
Normal file
BIN
fonts/source_code_pro/SourceCodePro-Semibold.ttf
Normal file
Binary file not shown.
70
src/gui/mod.rs
Normal file
70
src/gui/mod.rs
Normal file
|
@ -0,0 +1,70 @@
|
||||||
|
use sdl2;
|
||||||
|
|
||||||
|
use font::Font;
|
||||||
|
use editor::Editor;
|
||||||
|
|
||||||
|
|
||||||
|
pub struct GUI {
|
||||||
|
renderer: sdl2::render::Renderer,
|
||||||
|
font: Font,
|
||||||
|
editor: Editor,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl GUI {
|
||||||
|
pub fn new() -> GUI {
|
||||||
|
let mut font = Font::new_from_file(&Path::new("./fonts/source_code_pro/SourceCodePro-Regular.ttf"), 14);
|
||||||
|
|
||||||
|
// Get the window and renderer for sdl
|
||||||
|
let window = sdl2::video::Window::new("Led Editor", sdl2::video::WindowPos::PosCentered, sdl2::video::WindowPos::PosCentered, 800, 600, sdl2::video::OPENGL | sdl2::video::RESIZABLE).unwrap();
|
||||||
|
let renderer = sdl2::render::Renderer::from_window(window, sdl2::render::RenderDriverIndex::Auto, sdl2::render::ACCELERATED).unwrap();
|
||||||
|
|
||||||
|
let mut editor = Editor::new();
|
||||||
|
editor.update_dim(renderer.get_output_size().unwrap().1 as usize, renderer.get_output_size().unwrap().0 as usize);
|
||||||
|
|
||||||
|
GUI {
|
||||||
|
renderer: renderer,
|
||||||
|
font: font,
|
||||||
|
editor: editor,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
pub fn new_from_editor(ed: Editor) -> GUI {
|
||||||
|
let mut font = Font::new_from_file(&Path::new("./fonts/source_code_pro/SourceCodePro-Regular.ttf"), 14);
|
||||||
|
|
||||||
|
// Get the window and renderer for sdl
|
||||||
|
let window = sdl2::video::Window::new("Led Editor", sdl2::video::WindowPos::PosCentered, sdl2::video::WindowPos::PosCentered, 800, 600, sdl2::video::OPENGL | sdl2::video::RESIZABLE).unwrap();
|
||||||
|
let renderer = sdl2::render::Renderer::from_window(window, sdl2::render::RenderDriverIndex::Auto, sdl2::render::ACCELERATED).unwrap();
|
||||||
|
|
||||||
|
let mut editor = ed;
|
||||||
|
editor.update_dim(renderer.get_output_size().unwrap().1 as usize, renderer.get_output_size().unwrap().0 as usize);
|
||||||
|
|
||||||
|
GUI {
|
||||||
|
renderer: renderer,
|
||||||
|
font: font,
|
||||||
|
editor: editor,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn main_ui_loop(&mut self) {
|
||||||
|
loop {
|
||||||
|
if let Ok(e) = sdl2::event::wait_event() {
|
||||||
|
match e {
|
||||||
|
sdl2::event::Event::Quit(_) => break,
|
||||||
|
sdl2::event::Event::KeyDown(_, _, key, _, _, _) => {
|
||||||
|
if key == sdl2::keycode::KeyCode::Escape {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
},
|
||||||
|
sdl2::event::Event::Window(_, _, sdl2::event::WindowEventId::Exposed, _, _) => {
|
||||||
|
let _ = self.renderer.set_draw_color(sdl2::pixels::Color::RGB(240, 240, 240));
|
||||||
|
let _ = self.renderer.clear();
|
||||||
|
self.font.draw_text("Hi there! (How's it going???) { let b = 42; }", (0, 0, 0), 50, 50, &self.renderer);
|
||||||
|
self.renderer.present();
|
||||||
|
}
|
||||||
|
_ => {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
20
src/main.rs
20
src/main.rs
|
@ -10,6 +10,7 @@ use std::path::Path;
|
||||||
use docopt::Docopt;
|
use docopt::Docopt;
|
||||||
use editor::Editor;
|
use editor::Editor;
|
||||||
use term_ui::TermUI;
|
use term_ui::TermUI;
|
||||||
|
use gui::GUI;
|
||||||
|
|
||||||
mod string_utils;
|
mod string_utils;
|
||||||
mod buffer;
|
mod buffer;
|
||||||
|
@ -17,16 +18,18 @@ mod files;
|
||||||
mod editor;
|
mod editor;
|
||||||
mod term_ui;
|
mod term_ui;
|
||||||
mod font;
|
mod font;
|
||||||
|
mod gui;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Usage documentation string
|
// Usage documentation string
|
||||||
static USAGE: &'static str = "
|
static USAGE: &'static str = "
|
||||||
Usage: led [<file>]
|
Usage: led [options] [<file>]
|
||||||
led --help
|
led --help
|
||||||
|
|
||||||
Options:
|
Options:
|
||||||
|
-g, --gui Use a graphical user interface instead of a console UI
|
||||||
-h, --help Show this message
|
-h, --help Show this message
|
||||||
";
|
";
|
||||||
|
|
||||||
|
@ -35,6 +38,7 @@ Options:
|
||||||
#[derive(RustcDecodable, Show)]
|
#[derive(RustcDecodable, Show)]
|
||||||
struct Args {
|
struct Args {
|
||||||
arg_file: Option<String>,
|
arg_file: Option<String>,
|
||||||
|
flag_gui: bool,
|
||||||
flag_help: bool,
|
flag_help: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -54,8 +58,18 @@ fn main() {
|
||||||
};
|
};
|
||||||
|
|
||||||
// Initialize and start UI
|
// Initialize and start UI
|
||||||
let mut ui = TermUI::new_from_editor(editor);
|
if args.flag_gui {
|
||||||
ui.main_ui_loop();
|
// GUI
|
||||||
|
sdl2::init(sdl2::INIT_VIDEO);
|
||||||
|
let mut ui = GUI::new_from_editor(editor);
|
||||||
|
ui.main_ui_loop();
|
||||||
|
sdl2::quit();
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
// Console UI
|
||||||
|
let mut ui = TermUI::new_from_editor(editor);
|
||||||
|
ui.main_ui_loop();
|
||||||
|
}
|
||||||
|
|
||||||
//println!("{}", editor.buffer.root.tree_height);
|
//println!("{}", editor.buffer.root.tree_height);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user