encounter/rust-sdl2
0
0
Fork 0
mirror of https://github.com/encounter/rust-sdl2.git synced 2026-07-10 21:18:41 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update to bitflags 1.* from 0.7

Browse Source
This commit is contained in:
Drew Pirrone-Brusse
2018-12-21 13:37:06 +01:00
committed by Cobrand
parent 9a03451308
commit 8f27656a6a
13 changed files with 73 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.toml
+1 -1
View File
@@ -16,7 +16,7 @@ name = "sdl2"
path = "src/sdl2/lib.rs"
[dependencies]
bitflags = "0.7"
bitflags = "^1"
libc = "^0.2"
rand = "^0.5"
lazy_static = "^1"
examples/cursor.rs
+2 -2
View File
@@ -3,7 +3,7 @@ extern crate sdl2;
use std::env;
use std::path::Path;
use sdl2::event::Event;
use sdl2::image::{LoadSurface, INIT_PNG, INIT_JPG};
use sdl2::image::{LoadSurface, InitFlag};
use sdl2::keyboard::Keycode;
use sdl2::mouse::Cursor;
use sdl2::pixels::Color;
@@ -14,7 +14,7 @@ pub fn run(png: &Path) {
let sdl_context = sdl2::init().unwrap();
let video_subsystem = sdl_context.video().unwrap();
let _image_context = sdl2::image::init(INIT_PNG | INIT_JPG).unwrap();
let _image_context = sdl2::image::init(InitFlag::PNG | InitFlag::JPG).unwrap();
let window = video_subsystem.window("rust-sdl2 demo: Cursor", 800, 600)
.position_centered()
.build()
examples/image-demo.rs
+2 -2
View File
@@ -2,7 +2,7 @@ extern crate sdl2;
use std::env;
use std::path::Path;
use sdl2::image::{LoadTexture, INIT_PNG, INIT_JPG};
use sdl2::image::{LoadTexture, InitFlag};
use sdl2::event::Event;
use sdl2::keyboard::Keycode;
@@ -10,7 +10,7 @@ pub fn run(png: &Path) {
let sdl_context = sdl2::init().unwrap();
let video_subsystem = sdl_context.video().unwrap();
let _image_context = sdl2::image::init(INIT_PNG | INIT_JPG).unwrap();
let _image_context = sdl2::image::init(InitFlag::PNG | InitFlag::JPG).unwrap();
let window = video_subsystem.window("rust-sdl2 demo: Video", 800, 600)
.position_centered()
.build()
examples/message-box.rs
+5 -5
View File
@@ -27,7 +27,7 @@ pub fn main() {
match event {
Event::Quit {..} | Event::KeyDown { keycode: Some(Keycode::Escape), .. } => {
let res =
show_simple_message_box(MESSAGEBOX_ERROR,
show_simple_message_box(MessageBoxFlag::ERROR,
"Some title",
"Some information inside the window",
canvas.window());
@@ -47,22 +47,22 @@ pub fn main() {
}
let buttons : Vec<_> = vec![
ButtonData {
flags:MESSAGEBOX_BUTTON_RETURNKEY_DEFAULT,
flags:MessageBoxButtonFlag::RETURNKEY_DEFAULT,
button_id:1,
text:"Ok"
},
ButtonData {
flags:MESSAGEBOX_BUTTON_NOTHING,
flags:MessageBoxButtonFlag::NOTHING,
button_id:2,
text:"No"
},
ButtonData {
flags:MESSAGEBOX_BUTTON_ESCAPEKEY_DEFAULT,
flags:MessageBoxButtonFlag::ESCAPEKEY_DEFAULT,
button_id:3,
text:"Cancel"
},
];
let res = show_message_box(MESSAGEBOX_WARNING,
let res = show_message_box(MessageBoxFlag::WARNING,
buttons.as_slice(),
"Some warning",
"You forget to do something, do it anyway ?",
examples/mixer-demo.rs
+2 -3
View File
@@ -4,8 +4,7 @@ extern crate sdl2;
use std::env;
use std::path::Path;
use sdl2::mixer::{DEFAULT_CHANNELS, INIT_MP3, INIT_FLAC, INIT_MOD,
INIT_OGG, AUDIO_S16LSB};
use sdl2::mixer::{InitFlag, DEFAULT_CHANNELS, AUDIO_S16LSB};
fn main() {
@@ -33,7 +32,7 @@ fn demo(music_file: &Path, sound_file: Option<&Path>) {
let chunk_size = 1_024;
sdl2::mixer::open_audio(frequency, format, channels, chunk_size).unwrap();
let _mixer_context = sdl2::mixer::init(
INIT_MP3 | INIT_FLAC | INIT_MOD | INIT_OGG
InitFlag::MP3 | InitFlag::FLAC | InitFlag::MOD | InitFlag::OGG
).unwrap();
// Number of mixing channels available for sound effect `Chunk`s to play
examples/resource-manager.rs
+2 -2
View File
@@ -1,7 +1,7 @@
extern crate sdl2;
use sdl2::event::Event;
use sdl2::image::{LoadTexture, INIT_PNG, INIT_JPG};
use sdl2::image::{LoadTexture, InitFlag};
use sdl2::keyboard::Keycode;
use sdl2::pixels::Color;
use sdl2::render::{TextureCreator, Texture};
@@ -25,7 +25,7 @@ fn main() {
let sdl_context = sdl2::init().unwrap();
let video_subsystem = sdl_context.video().unwrap();
let font_context = sdl2::ttf::init().unwrap();
let _image_context = sdl2::image::init(INIT_PNG | INIT_JPG).unwrap();
let _image_context = sdl2::image::init(InitFlag::PNG | InitFlag::JPG).unwrap();
let window = video_subsystem
.window("rust-sdl2 resource-manager demo", 800, 600)
.position_centered()
examples/ttf-demo.rs
+2 -2
View File
@@ -59,8 +59,8 @@ fn run(font_path: &Path) {
// Load a font
let mut font = ttf_context.load_font(font_path, 128).unwrap();
font.set_style(sdl2::ttf::STYLE_BOLD);
font.set_style(sdl2::ttf::FontStyle::BOLD);
// render a surface, and convert it to a texture bound to the canvas
let surface = font.render("Hello Rust!")
.blended(Color::RGBA(255, 0, 0, 255)).unwrap();
src/sdl2/image/mod.rs
+9 -9
View File
@@ -33,27 +33,27 @@ use sys;
/// InitFlags are passed to init() to control which subsystem
/// functionality to load.
bitflags! {
pub flags InitFlag : u32 {
const INIT_JPG = sys::image::IMG_InitFlags_IMG_INIT_JPG as u32,
const INIT_PNG = sys::image::IMG_InitFlags_IMG_INIT_PNG as u32,
const INIT_TIF = sys::image::IMG_InitFlags_IMG_INIT_TIF as u32,
const INIT_WEBP = sys::image::IMG_InitFlags_IMG_INIT_WEBP as u32
pub struct InitFlag : u32 {
const JPG = sys::image::IMG_InitFlags_IMG_INIT_JPG as u32;
const PNG = sys::image::IMG_InitFlags_IMG_INIT_PNG as u32;
const TIF = sys::image::IMG_InitFlags_IMG_INIT_TIF as u32;
const WEBP = sys::image::IMG_InitFlags_IMG_INIT_WEBP as u32;
}
}
// This is used for error message for init
impl ::std::fmt::Display for InitFlag {
fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
if self.contains(INIT_JPG) {
if self.contains(InitFlag::JPG) {
try!(f.write_str("INIT_JPG "));
}
if self.contains(INIT_PNG) {
if self.contains(InitFlag::PNG) {
try!(f.write_str("INIT_PNG "));
}
if self.contains(INIT_TIF) {
if self.contains(InitFlag::TIF) {
try!(f.write_str("INIT_TIF "));
}
if self.contains(INIT_WEBP) {
if self.contains(InitFlag::WEBP) {
try!(f.write_str("INIT_WEBP "));
}
Ok(())
src/sdl2/keyboard/mod.rs
+14 -14
View File
@@ -11,20 +11,20 @@ pub use self::keycode::Keycode;
pub use self::scancode::Scancode;
bitflags! {
pub flags Mod: u16 {
const NOMOD = 0x0000,
const LSHIFTMOD = 0x0001,
const RSHIFTMOD = 0x0002,
const LCTRLMOD = 0x0040,
const RCTRLMOD = 0x0080,
const LALTMOD = 0x0100,
const RALTMOD = 0x0200,
const LGUIMOD = 0x0400,
const RGUIMOD = 0x0800,
const NUMMOD = 0x1000,
const CAPSMOD = 0x2000,
const MODEMOD = 0x4000,
const RESERVEDMOD = 0x8000
pub struct Mod: u16 {
const NOMOD = 0x0000;
const LSHIFTMOD = 0x0001;
const RSHIFTMOD = 0x0002;
const LCTRLMOD = 0x0040;
const RCTRLMOD = 0x0080;
const LALTMOD = 0x0100;
const RALTMOD = 0x0200;
const LGUIMOD = 0x0400;
const RGUIMOD = 0x0800;
const NUMMOD = 0x1000;
const CAPSMOD = 0x2000;
const MODEMOD = 0x4000;
const RESERVEDMOD = 0x8000;
}
}
src/sdl2/messagebox.rs
+13 -13
View File
@@ -10,23 +10,23 @@ use get_error;
use sys;
bitflags! {
pub flags MessageBoxFlag: u32 {
const MESSAGEBOX_ERROR =
sys::SDL_MessageBoxFlags::SDL_MESSAGEBOX_ERROR as u32,
const MESSAGEBOX_WARNING =
sys::SDL_MessageBoxFlags::SDL_MESSAGEBOX_WARNING as u32,
const MESSAGEBOX_INFORMATION =
sys::SDL_MessageBoxFlags::SDL_MESSAGEBOX_INFORMATION as u32
pub struct MessageBoxFlag: u32 {
const ERROR =
sys::SDL_MessageBoxFlags::SDL_MESSAGEBOX_ERROR as u32;
const WARNING =
sys::SDL_MessageBoxFlags::SDL_MESSAGEBOX_WARNING as u32;
const INFORMATION =
sys::SDL_MessageBoxFlags::SDL_MESSAGEBOX_INFORMATION as u32;
}
}
bitflags! {
pub flags MessageBoxButtonFlag: u32 {
const MESSAGEBOX_BUTTON_ESCAPEKEY_DEFAULT =
sys::SDL_MessageBoxButtonFlags::SDL_MESSAGEBOX_BUTTON_ESCAPEKEY_DEFAULT as u32,
const MESSAGEBOX_BUTTON_RETURNKEY_DEFAULT =
sys::SDL_MessageBoxButtonFlags::SDL_MESSAGEBOX_BUTTON_RETURNKEY_DEFAULT as u32,
const MESSAGEBOX_BUTTON_NOTHING = 0
pub struct MessageBoxButtonFlag: u32 {
const ESCAPEKEY_DEFAULT =
sys::SDL_MessageBoxButtonFlags::SDL_MESSAGEBOX_BUTTON_ESCAPEKEY_DEFAULT as u32;
const RETURNKEY_DEFAULT =
sys::SDL_MessageBoxButtonFlags::SDL_MESSAGEBOX_BUTTON_RETURNKEY_DEFAULT as u32;
const NOTHING = 0;
}
}
src/sdl2/mixer/mod.rs
+14 -12
View File
@@ -95,30 +95,32 @@ pub fn get_linked_version() -> Version {
unsafe { Version::from_ll(*sys::mixer::Mix_Linked_Version()) }
}
bitflags!(pub flags InitFlag : u32 {
const INIT_FLAC = sys::mixer::MIX_InitFlags_MIX_INIT_FLAC as u32,
const INIT_MOD = sys::mixer::MIX_InitFlags_MIX_INIT_MOD as u32,
const INIT_MP3 = sys::mixer::MIX_InitFlags_MIX_INIT_MP3 as u32,
const INIT_OGG = sys::mixer::MIX_InitFlags_MIX_INIT_OGG as u32,
const INIT_MID = sys::mixer::MIX_InitFlags_MIX_INIT_MID as u32
});
bitflags!(
pub struct InitFlag : u32 {
const FLAC = sys::mixer::MIX_InitFlags_MIX_INIT_FLAC as u32;
const MOD = sys::mixer::MIX_InitFlags_MIX_INIT_MOD as u32;
const MP3 = sys::mixer::MIX_InitFlags_MIX_INIT_MP3 as u32;
const OGG = sys::mixer::MIX_InitFlags_MIX_INIT_OGG as u32;
const MID = sys::mixer::MIX_InitFlags_MIX_INIT_MID as u32;
}
);
impl ToString for InitFlag {
fn to_string(&self) -> String {
let mut string = "".to_string();
if self.contains(INIT_FLAC) {
if self.contains(InitFlag::FLAC) {
string = string + &"INIT_FLAC ".to_string();
}
if self.contains(INIT_MOD) {
if self.contains(InitFlag::MOD) {
string = string + &"INIT_MOD ".to_string();
}
if self.contains(INIT_MP3) {
if self.contains(InitFlag::MP3) {
string = string + &"INIT_MP3 ".to_string();
}
if self.contains(INIT_OGG) {
if self.contains(InitFlag::OGG) {
string = string + &"INIT_OGG ".to_string();
}
if self.contains(INIT_MID) {
if self.contains(InitFlag::MID) {
string = string + &"INIT_MID ".to_string();
}
string
src/sdl2/ttf/font.rs
+6 -6
View File
@@ -16,12 +16,12 @@ use ::rwops::RWops;
// Absolute paths are a workaround for https://github.com/rust-lang-nursery/bitflags/issues/39 .
bitflags! {
/// The styling of a font.
pub flags FontStyle: i32 {
const STYLE_NORMAL = sys::ttf::TTF_STYLE_NORMAL as i32,
const STYLE_BOLD = sys::ttf::TTF_STYLE_BOLD as i32,
const STYLE_ITALIC = sys::ttf::TTF_STYLE_ITALIC as i32,
const STYLE_UNDERLINE = sys::ttf::TTF_STYLE_UNDERLINE as i32,
const STYLE_STRIKETHROUGH = sys::ttf::TTF_STYLE_STRIKETHROUGH as i32,
pub struct FontStyle: i32 {
const NORMAL = sys::ttf::TTF_STYLE_NORMAL as i32;
const BOLD = sys::ttf::TTF_STYLE_BOLD as i32;
const ITALIC = sys::ttf::TTF_STYLE_ITALIC as i32;
const UNDERLINE = sys::ttf::TTF_STYLE_UNDERLINE as i32;
const STRIKETHROUGH = sys::ttf::TTF_STYLE_STRIKETHROUGH as i32;
}
}
src/sdl2/ttf/mod.rs
+1 -1
View File
@@ -28,5 +28,5 @@ pub use self::context::{
};
pub use self::font::{
Font, FontStyle, Hinting, GlyphMetrics, PartialRendering, FontError,
FontResult, STYLE_NORMAL, STYLE_BOLD, STYLE_ITALIC, STYLE_UNDERLINE, STYLE_STRIKETHROUGH
FontResult
};