From 98fff1773613dbbca54a2e71a394ce0de6d66f24 Mon Sep 17 00:00:00 2001 From: Joshua DeSeno Date: Tue, 7 Oct 2014 09:35:52 +0900 Subject: [PATCH] Uppercase bit flags names Fix attribute formatting --- src/demo/video.rs | 6 +++--- src/sdl2/joystick.rs | 18 +++++++++--------- src/sdl2/keyboard.rs | 26 +++++++++++++------------- src/sdl2/lib.rs | 5 +---- src/sdl2/messagebox.rs | 6 +++--- src/sdl2/mouse.rs | 10 +++++----- src/sdl2/render.rs | 8 ++++---- src/sdl2/sdl.rs | 18 +++++++++--------- src/sdl2/surface.rs | 8 ++++---- src/sdl2/video.rs | 26 +++++++++++++------------- 10 files changed, 64 insertions(+), 67 deletions(-) diff --git a/src/demo/video.rs b/src/demo/video.rs index be2c3a16..22e60d77 100644 --- a/src/demo/video.rs +++ b/src/demo/video.rs @@ -1,14 +1,14 @@ use sdl2; pub fn main() { - sdl2::init(sdl2::InitVideo); + sdl2::init(sdl2::INIT_VIDEO); - let window = match sdl2::video::Window::new("rust-sdl2 demo: Video", sdl2::video::PosCentered, sdl2::video::PosCentered, 800, 600, sdl2::video::OpenGL) { + let window = match sdl2::video::Window::new("rust-sdl2 demo: Video", sdl2::video::PosCentered, sdl2::video::PosCentered, 800, 600, sdl2::video::OPENGL) { Ok(window) => window, Err(err) => fail!(format!("failed to create window: {}", err)) }; - let renderer = match sdl2::render::Renderer::from_window(window, sdl2::render::DriverAuto, sdl2::render::Accelerated) { + let renderer = match sdl2::render::Renderer::from_window(window, sdl2::render::DriverAuto, sdl2::render::ACCELERATED) { Ok(renderer) => renderer, Err(err) => fail!(format!("failed to create renderer: {}", err)) }; diff --git a/src/sdl2/joystick.rs b/src/sdl2/joystick.rs index 61373a32..366e80a7 100644 --- a/src/sdl2/joystick.rs +++ b/src/sdl2/joystick.rs @@ -47,14 +47,14 @@ pub mod ll { bitflags! { flags HatState: u8 { - static CenteredHatState = 0, - static UpHatState = 0x01, - static RightHatState = 0x02, - static DownHatState = 0x04, - static LeftHatState = 0x08, - static RightUpHatState = 0x02 | 0x01, // RightHatState | UpHatState - static RightDownHatState = 0x02 | 0x04, // RightHatState | DownHatState, - static LeftUpHatState = 0x08 | 0x01, // LeftHatState | UpHatState, - static LeftDownHatState = 0x08 | 0x04 // LeftHatState | DownHatState + static CENTEREDHATSTATE = 0, + static UPHATSTATE = 0x01, + static RIGHTHATSTATE = 0x02, + static DOWNHATSTATE = 0x04, + static LEFTHATSTATE = 0x08, + static RIGHTUPHATSTATE = 0x02 | 0x01, // RightHatState | UpHatState + static RIGHTDOWNHATSTATE = 0x02 | 0x04, // RightHatState | DownHatState, + static LEFTUPHATSTATE = 0x08 | 0x01, // LeftHatState | UpHatState, + static LEFTDOWNHATSTATE = 0x08 | 0x04 // LeftHatState | DownHatState } } diff --git a/src/sdl2/keyboard.rs b/src/sdl2/keyboard.rs index ad548bbf..a4cca8b8 100644 --- a/src/sdl2/keyboard.rs +++ b/src/sdl2/keyboard.rs @@ -52,19 +52,19 @@ pub mod ll { bitflags! { flags Mod: u32 { - static NoMod = 0x0000, - static LShiftMod = 0x0001, - static RShiftMod = 0x0002, - static LCtrlMod = 0x0040, - static RCtrlMod = 0x0080, - static LAltMod = 0x0100, - static RAltMod = 0x0200, - static LGuiMod = 0x0400, - static RGuiMod = 0x0800, - static NumMod = 0x1000, - static CapsMod = 0x2000, - static ModeMod = 0x4000, - static ReservedMod = 0x8000 + static NOMOD = 0x0000, + static LSHIFTMOD = 0x0001, + static RSHIFTMOD = 0x0002, + static LCTRLMOD = 0x0040, + static RCTRLMOD = 0x0080, + static LALTMOD = 0x0100, + static RALTMOD = 0x0200, + static LGUIMOD = 0x0400, + static RGUIMOD = 0x0800, + static NUMMOD = 0x1000, + static CAPSMOD = 0x2000, + static MODEMOD = 0x4000, + static RESERVEDMOD = 0x8000 } } diff --git a/src/sdl2/lib.rs b/src/sdl2/lib.rs index 105a6dbc..3b02a199 100644 --- a/src/sdl2/lib.rs +++ b/src/sdl2/lib.rs @@ -4,10 +4,7 @@ #![desc = "SDL2 bindings"] #![license = "MIT"] -#![feature(default_type_params - , globs - , macro_rules - , unsafe_destructor)] +#![feature(default_type_params, globs, macro_rules, unsafe_destructor)] extern crate libc; extern crate collections; diff --git a/src/sdl2/messagebox.rs b/src/sdl2/messagebox.rs index 07e84b34..c8c775a6 100644 --- a/src/sdl2/messagebox.rs +++ b/src/sdl2/messagebox.rs @@ -20,9 +20,9 @@ pub mod ll { bitflags! { flags MessageBoxFlag: u32 { - static MessageBoxError = ll::SDL_MESSAGEBOX_ERROR as u32, - static MessageBoxWarning = ll::SDL_MESSAGEBOX_WARNING as u32, - static MessageBoxInformation = ll::SDL_MESSAGEBOX_INFORMATION as u32 + static MESSAGEBOX_ERROR = ll::SDL_MESSAGEBOX_ERROR as u32, + static MESSAGEBOX_WARNING = ll::SDL_MESSAGEBOX_WARNING as u32, + static MESSAGEBOX_INFORMATION = ll::SDL_MESSAGEBOX_INFORMATION as u32 } } diff --git a/src/sdl2/mouse.rs b/src/sdl2/mouse.rs index a24fd14d..93ef8faf 100644 --- a/src/sdl2/mouse.rs +++ b/src/sdl2/mouse.rs @@ -147,11 +147,11 @@ pub enum Mouse { bitflags! { flags MouseState: u32 { - static LeftMouseState = 0x01, - static MiddleMouseState = 0x02, - static RightMouseState = 0x04, - static X1MouseState = 0x08, - static X2MouseState = 0x10 + static LEFTMOUSESTATE = 0x01, + static MIDDLEMOUSESTATE = 0x02, + static RIGHTMOUSESTATE = 0x04, + static X1MOUSESTATE = 0x08, + static X2MOUSESTATE = 0x10 } } diff --git a/src/sdl2/render.rs b/src/sdl2/render.rs index 97dc1ca9..e3f9f756 100644 --- a/src/sdl2/render.rs +++ b/src/sdl2/render.rs @@ -154,10 +154,10 @@ pub enum TextureAccess { bitflags! { flags RendererFlags: u32 { - static Software = ll::SDL_RENDERER_SOFTWARE as u32, - static Accelerated = ll::SDL_RENDERER_ACCELERATED as u32, - static PresentVSync = ll::SDL_RENDERER_PRESENTVSYNC as u32, - static TargetTexture = ll::SDL_RENDERER_TARGETTEXTURE as u32 + static SOFTWARE = ll::SDL_RENDERER_SOFTWARE as u32, + static ACCELERATED = ll::SDL_RENDERER_ACCELERATED as u32, + static PRESENTVSYNC = ll::SDL_RENDERER_PRESENTVSYNC as u32, + static TARGETTEXTURE = ll::SDL_RENDERER_TARGETTEXTURE as u32 } } diff --git a/src/sdl2/sdl.rs b/src/sdl2/sdl.rs index 1356d2fc..6fd41e02 100644 --- a/src/sdl2/sdl.rs +++ b/src/sdl2/sdl.rs @@ -62,15 +62,15 @@ pub mod ll { bitflags! { flags InitFlag: u32 { - static InitTimer = ll::SDL_INIT_TIMER, - static InitAudio = ll::SDL_INIT_AUDIO, - static InitVideo = ll::SDL_INIT_VIDEO, - static InitJoystick = ll::SDL_INIT_JOYSTICK, - static InitHaptic = ll::SDL_INIT_HAPTIC, - static InitGameController = ll::SDL_INIT_GAMECONTROLLER, - static InitEvents = ll::SDL_INIT_EVENTS, - static InitNoParachute = ll::SDL_INIT_NOPARACHUTE, - static InitEverything = ll::SDL_INIT_EVERYTHING + static INIT_TIMER = ll::SDL_INIT_TIMER, + static INIT_AUDIO = ll::SDL_INIT_AUDIO, + static INIT_VIDEO = ll::SDL_INIT_VIDEO, + static INIT_JOYSTICK = ll::SDL_INIT_JOYSTICK, + static INIT_HAPTIC = ll::SDL_INIT_HAPTIC, + static INIT_GAME_CONTROLLER = ll::SDL_INIT_GAMECONTROLLER, + static INIT_EVENTS = ll::SDL_INIT_EVENTS, + static INIT_NOPARACHUTE = ll::SDL_INIT_NOPARACHUTE, + static INIT_EVERYTHING = ll::SDL_INIT_EVERYTHING } } diff --git a/src/sdl2/surface.rs b/src/sdl2/surface.rs index f59bf09f..b15dcaa5 100644 --- a/src/sdl2/surface.rs +++ b/src/sdl2/surface.rs @@ -82,10 +82,10 @@ pub mod ll { bitflags! { flags SurfaceFlag: u32 { - static SWSurface = ll::SDL_SWSURFACE as u32, - static PreAlloc = ll::SDL_PREALLOC as u32, - static RLEAccel = ll::SDL_RLEACCEL as u32, - static DontFree = ll::SDL_DONTFREE as u32 + static SWSURFACE = ll::SDL_SWSURFACE as u32, + static PREALLOC = ll::SDL_PREALLOC as u32, + static RLEACCEL = ll::SDL_RLEACCEL as u32, + static DONTFREE = ll::SDL_DONTFREE as u32 } } diff --git a/src/sdl2/video.rs b/src/sdl2/video.rs index 43420ee8..39700670 100644 --- a/src/sdl2/video.rs +++ b/src/sdl2/video.rs @@ -262,19 +262,19 @@ impl DisplayMode { bitflags! { flags WindowFlags: u32 { - static Fullscreen = ll::SDL_WINDOW_FULLSCREEN as u32, - static OpenGL = ll::SDL_WINDOW_OPENGL as u32, - static Shown = ll::SDL_WINDOW_SHOWN as u32, - static Hidden = ll::SDL_WINDOW_HIDDEN as u32, - static Borderless = ll::SDL_WINDOW_BORDERLESS as u32, - static Resizable = ll::SDL_WINDOW_RESIZABLE as u32, - static Minimized = ll::SDL_WINDOW_MINIMIZED as u32, - static Maximized = ll::SDL_WINDOW_MAXIMIZED as u32, - static InputGrabbed = ll::SDL_WINDOW_INPUT_GRABBED as u32, - static InputFocus = ll::SDL_WINDOW_INPUT_FOCUS as u32, - static MouseFocus = ll::SDL_WINDOW_MOUSE_FOCUS as u32, - static FullscreenDesktop = ll::SDL_WINDOW_FULLSCREEN_DESKTOP as u32, - static Foreign = ll::SDL_WINDOW_FOREIGN as u32 + static FULLSCREEN = ll::SDL_WINDOW_FULLSCREEN as u32, + static OPENGL = ll::SDL_WINDOW_OPENGL as u32, + static SHOWN = ll::SDL_WINDOW_SHOWN as u32, + static HIDDEN = ll::SDL_WINDOW_HIDDEN as u32, + static BORDERLESS = ll::SDL_WINDOW_BORDERLESS as u32, + static RESIZABLE = ll::SDL_WINDOW_RESIZABLE as u32, + static MINIMIZED = ll::SDL_WINDOW_MINIMIZED as u32, + static MAXIMIZED = ll::SDL_WINDOW_MAXIMIZED as u32, + static INPUT_GRABBED = ll::SDL_WINDOW_INPUT_GRABBED as u32, + static INPUT_FOCUS = ll::SDL_WINDOW_INPUT_FOCUS as u32, + static MOUSE_FOCUS = ll::SDL_WINDOW_MOUSE_FOCUS as u32, + static FULLSCREEN_DESKTOP = ll::SDL_WINDOW_FULLSCREEN_DESKTOP as u32, + static FOREIGN = ll::SDL_WINDOW_FOREIGN as u32 } }