From c3f75f9499812664a783edcff7ed4015a6a65863 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tero=20H=C3=A4nninen?= Date: Sat, 11 Oct 2014 18:55:17 +0300 Subject: [PATCH] Update to nightly: static -> const --- src/sdl2/audio.rs | 78 +++++++++++++++++------------------ src/sdl2/controller.rs | 58 +++++++++++++------------- src/sdl2/event.rs | 94 +++++++++++++++++++++--------------------- src/sdl2/joystick.rs | 18 ++++---- src/sdl2/keyboard.rs | 26 ++++++------ src/sdl2/messagebox.rs | 6 +-- src/sdl2/mouse.rs | 42 +++++++++---------- src/sdl2/pixels.rs | 72 ++++++++++++++++---------------- src/sdl2/render.rs | 8 ++-- src/sdl2/sdl.rs | 48 ++++++++++----------- src/sdl2/surface.rs | 16 +++---- src/sdl2/video.rs | 26 ++++++------ 12 files changed, 246 insertions(+), 246 deletions(-) diff --git a/src/sdl2/audio.rs b/src/sdl2/audio.rs index 1cce928f54d..9be6eaa70a3 100644 --- a/src/sdl2/audio.rs +++ b/src/sdl2/audio.rs @@ -20,24 +20,24 @@ pub mod ll { // assume LSB pub type SDL_AudioFormat = uint16_t; - pub static AUDIO_U8 : SDL_AudioFormat = 0x0008; - pub static AUDIO_S8 : SDL_AudioFormat = 0x8008; - pub static AUDIO_U16LSB : SDL_AudioFormat = 0x0010; - pub static AUDIO_S16LSB : SDL_AudioFormat = 0x8010; - pub static AUDIO_U16MSB : SDL_AudioFormat = 0x1010; - pub static AUDIO_S16MSB : SDL_AudioFormat = 0x9010; - pub static AUDIO_U16 : SDL_AudioFormat = AUDIO_U16LSB; - pub static AUDIO_S16 : SDL_AudioFormat = AUDIO_S16LSB; - pub static AUDIO_S32LSB : SDL_AudioFormat = 0x8020; - pub static AUDIO_S32MSB : SDL_AudioFormat = 0x9020; - pub static AUDIO_S32 : SDL_AudioFormat = AUDIO_S32LSB; - pub static AUDIO_F32LSB : SDL_AudioFormat = 0x8120; - pub static AUDIO_F32MSB : SDL_AudioFormat = 0x9120; - pub static AUDIO_F32 : SDL_AudioFormat = AUDIO_F32LSB; - pub static AUDIO_U16SYS : SDL_AudioFormat = AUDIO_U16LSB; - pub static AUDIO_S16SYS : SDL_AudioFormat = AUDIO_S16LSB; - pub static AUDIO_S32SYS : SDL_AudioFormat = AUDIO_S32LSB; - pub static AUDIO_F32SYS : SDL_AudioFormat = AUDIO_F32LSB; + pub const AUDIO_U8 : SDL_AudioFormat = 0x0008; + pub const AUDIO_S8 : SDL_AudioFormat = 0x8008; + pub const AUDIO_U16LSB : SDL_AudioFormat = 0x0010; + pub const AUDIO_S16LSB : SDL_AudioFormat = 0x8010; + pub const AUDIO_U16MSB : SDL_AudioFormat = 0x1010; + pub const AUDIO_S16MSB : SDL_AudioFormat = 0x9010; + pub const AUDIO_U16 : SDL_AudioFormat = AUDIO_U16LSB; + pub const AUDIO_S16 : SDL_AudioFormat = AUDIO_S16LSB; + pub const AUDIO_S32LSB : SDL_AudioFormat = 0x8020; + pub const AUDIO_S32MSB : SDL_AudioFormat = 0x9020; + pub const AUDIO_S32 : SDL_AudioFormat = AUDIO_S32LSB; + pub const AUDIO_F32LSB : SDL_AudioFormat = 0x8120; + pub const AUDIO_F32MSB : SDL_AudioFormat = 0x9120; + pub const AUDIO_F32 : SDL_AudioFormat = AUDIO_F32LSB; + pub const AUDIO_U16SYS : SDL_AudioFormat = AUDIO_U16LSB; + pub const AUDIO_S16SYS : SDL_AudioFormat = AUDIO_S16LSB; + pub const AUDIO_S32SYS : SDL_AudioFormat = AUDIO_S32LSB; + pub const AUDIO_F32SYS : SDL_AudioFormat = AUDIO_F32LSB; pub type SDL_AudioCallback = ::std::option::Option c_int; pub fn SDL_GetAudioDriver(index: c_int) -> *const c_char; @@ -125,24 +125,24 @@ pub mod ll { pub type AudioFormat = ll::SDL_AudioFormat; -pub static AUDIOU8 : AudioFormat = ll::AUDIO_U8; -pub static AUDIOS8 : AudioFormat = ll::AUDIO_S8; -pub static AUDIOU16LSB : AudioFormat = ll::AUDIO_U16LSB; -pub static AUDIOS16LSB : AudioFormat = ll::AUDIO_S16LSB; -pub static AUDIOU16MSB : AudioFormat = ll::AUDIO_U16MSB; -pub static AUDIOS16MSB : AudioFormat = ll::AUDIO_S16MSB; -pub static AUDIOU16 : AudioFormat = ll::AUDIO_U16; -pub static AUDIOS16 : AudioFormat = ll::AUDIO_S16; -pub static AUDIOS32LSB : AudioFormat = ll::AUDIO_S32LSB; -pub static AUDIOS32MSB : AudioFormat = ll::AUDIO_S32MSB; -pub static AUDIOS32 : AudioFormat = ll::AUDIO_S32; -pub static AUDIOF32LSB : AudioFormat = ll::AUDIO_F32LSB; -pub static AUDIOF32MSB : AudioFormat = ll::AUDIO_F32MSB; -pub static AUDIOF32 : AudioFormat = ll::AUDIO_F32; -pub static AUDIOU16SYS : AudioFormat = ll::AUDIO_U16SYS; -pub static AUDIOS16SYS : AudioFormat = ll::AUDIO_S16SYS; -pub static AUDIOS32SYS : AudioFormat = ll::AUDIO_S32SYS; -pub static AUDIOF32SYS : AudioFormat = ll::AUDIO_F32SYS; +pub const AUDIOU8 : AudioFormat = ll::AUDIO_U8; +pub const AUDIOS8 : AudioFormat = ll::AUDIO_S8; +pub const AUDIOU16LSB : AudioFormat = ll::AUDIO_U16LSB; +pub const AUDIOS16LSB : AudioFormat = ll::AUDIO_S16LSB; +pub const AUDIOU16MSB : AudioFormat = ll::AUDIO_U16MSB; +pub const AUDIOS16MSB : AudioFormat = ll::AUDIO_S16MSB; +pub const AUDIOU16 : AudioFormat = ll::AUDIO_U16; +pub const AUDIOS16 : AudioFormat = ll::AUDIO_S16; +pub const AUDIOS32LSB : AudioFormat = ll::AUDIO_S32LSB; +pub const AUDIOS32MSB : AudioFormat = ll::AUDIO_S32MSB; +pub const AUDIOS32 : AudioFormat = ll::AUDIO_S32; +pub const AUDIOF32LSB : AudioFormat = ll::AUDIO_F32LSB; +pub const AUDIOF32MSB : AudioFormat = ll::AUDIO_F32MSB; +pub const AUDIOF32 : AudioFormat = ll::AUDIO_F32; +pub const AUDIOU16SYS : AudioFormat = ll::AUDIO_U16SYS; +pub const AUDIOS16SYS : AudioFormat = ll::AUDIO_S16SYS; +pub const AUDIOS32SYS : AudioFormat = ll::AUDIO_S32SYS; +pub const AUDIOF32SYS : AudioFormat = ll::AUDIO_F32SYS; #[repr(C)] #[deriving(Clone, PartialEq, Hash, Show, FromPrimitive)] diff --git a/src/sdl2/controller.rs b/src/sdl2/controller.rs index 96cc8a602b5..6fbc2f91341 100644 --- a/src/sdl2/controller.rs +++ b/src/sdl2/controller.rs @@ -10,10 +10,10 @@ pub mod ll { pub type SDL_GameController = c_void; pub type SDL_GameControllerBindType = c_uint; - pub static SDL_CONTROLLER_BINDTYPE_NONE: SDL_GameControllerBindType = 0; - pub static SDL_CONTROLLER_BINDTYPE_BUTTON: SDL_GameControllerBindType = 1; - pub static SDL_CONTROLLER_BINDTYPE_AXIS: SDL_GameControllerBindType = 2; - pub static SDL_CONTROLLER_BINDTYPE_HAT: SDL_GameControllerBindType = 3; + pub const SDL_CONTROLLER_BINDTYPE_NONE: SDL_GameControllerBindType = 0; + pub const SDL_CONTROLLER_BINDTYPE_BUTTON: SDL_GameControllerBindType = 1; + pub const SDL_CONTROLLER_BINDTYPE_AXIS: SDL_GameControllerBindType = 2; + pub const SDL_CONTROLLER_BINDTYPE_HAT: SDL_GameControllerBindType = 3; #[allow(dead_code, non_snake_case)] #[repr(C)] @@ -47,33 +47,33 @@ pub mod ll { } pub type SDL_GameControllerAxis = c_int; - pub static SDL_CONTROLLER_AXIS_INVALID: SDL_GameControllerAxis = -1; - pub static SDL_CONTROLLER_AXIS_LEFTX: SDL_GameControllerAxis = 0; - pub static SDL_CONTROLLER_AXIS_LEFTY: SDL_GameControllerAxis = 1; - pub static SDL_CONTROLLER_AXIS_RIGHTX: SDL_GameControllerAxis = 2; - pub static SDL_CONTROLLER_AXIS_RIGHTY: SDL_GameControllerAxis = 3; - pub static SDL_CONTROLLER_AXIS_TRIGGERLEFT: SDL_GameControllerAxis = 4; - pub static SDL_CONTROLLER_AXIS_TRIGGERRIGHT: SDL_GameControllerAxis = 5; - pub static SDL_CONTROLLER_AXIS_MAX: SDL_GameControllerAxis = 6; + pub const SDL_CONTROLLER_AXIS_INVALID: SDL_GameControllerAxis = -1; + pub const SDL_CONTROLLER_AXIS_LEFTX: SDL_GameControllerAxis = 0; + pub const SDL_CONTROLLER_AXIS_LEFTY: SDL_GameControllerAxis = 1; + pub const SDL_CONTROLLER_AXIS_RIGHTX: SDL_GameControllerAxis = 2; + pub const SDL_CONTROLLER_AXIS_RIGHTY: SDL_GameControllerAxis = 3; + pub const SDL_CONTROLLER_AXIS_TRIGGERLEFT: SDL_GameControllerAxis = 4; + pub const SDL_CONTROLLER_AXIS_TRIGGERRIGHT: SDL_GameControllerAxis = 5; + pub const SDL_CONTROLLER_AXIS_MAX: SDL_GameControllerAxis = 6; pub type SDL_GameControllerButton = c_int; - pub static SDL_CONTROLLER_BUTTON_INVALID: SDL_GameControllerButton = -1; - pub static SDL_CONTROLLER_BUTTON_A: SDL_GameControllerButton = 0; - pub static SDL_CONTROLLER_BUTTON_B: SDL_GameControllerButton = 1; - pub static SDL_CONTROLLER_BUTTON_X: SDL_GameControllerButton = 2; - pub static SDL_CONTROLLER_BUTTON_Y: SDL_GameControllerButton = 3; - pub static SDL_CONTROLLER_BUTTON_BACK: SDL_GameControllerButton = 4; - pub static SDL_CONTROLLER_BUTTON_GUIDE: SDL_GameControllerButton = 5; - pub static SDL_CONTROLLER_BUTTON_START: SDL_GameControllerButton = 6; - pub static SDL_CONTROLLER_BUTTON_LEFTSTICK: SDL_GameControllerButton = 7; - pub static SDL_CONTROLLER_BUTTON_RIGHTSTICK: SDL_GameControllerButton = 8; - pub static SDL_CONTROLLER_BUTTON_LEFTSHOULDER: SDL_GameControllerButton = 9; - pub static SDL_CONTROLLER_BUTTON_RIGHTSHOULDER: SDL_GameControllerButton = 10; - pub static SDL_CONTROLLER_BUTTON_DPAD_UP: SDL_GameControllerButton = 11; - pub static SDL_CONTROLLER_BUTTON_DPAD_DOWN: SDL_GameControllerButton = 12; - pub static SDL_CONTROLLER_BUTTON_DPAD_LEFT: SDL_GameControllerButton = 13; - pub static SDL_CONTROLLER_BUTTON_DPAD_RIGHT: SDL_GameControllerButton = 14; - pub static SDL_CONTROLLER_BUTTON_MAX: SDL_GameControllerButton = 15; + pub const SDL_CONTROLLER_BUTTON_INVALID: SDL_GameControllerButton = -1; + pub const SDL_CONTROLLER_BUTTON_A: SDL_GameControllerButton = 0; + pub const SDL_CONTROLLER_BUTTON_B: SDL_GameControllerButton = 1; + pub const SDL_CONTROLLER_BUTTON_X: SDL_GameControllerButton = 2; + pub const SDL_CONTROLLER_BUTTON_Y: SDL_GameControllerButton = 3; + pub const SDL_CONTROLLER_BUTTON_BACK: SDL_GameControllerButton = 4; + pub const SDL_CONTROLLER_BUTTON_GUIDE: SDL_GameControllerButton = 5; + pub const SDL_CONTROLLER_BUTTON_START: SDL_GameControllerButton = 6; + pub const SDL_CONTROLLER_BUTTON_LEFTSTICK: SDL_GameControllerButton = 7; + pub const SDL_CONTROLLER_BUTTON_RIGHTSTICK: SDL_GameControllerButton = 8; + pub const SDL_CONTROLLER_BUTTON_LEFTSHOULDER: SDL_GameControllerButton = 9; + pub const SDL_CONTROLLER_BUTTON_RIGHTSHOULDER: SDL_GameControllerButton = 10; + pub const SDL_CONTROLLER_BUTTON_DPAD_UP: SDL_GameControllerButton = 11; + pub const SDL_CONTROLLER_BUTTON_DPAD_DOWN: SDL_GameControllerButton = 12; + pub const SDL_CONTROLLER_BUTTON_DPAD_LEFT: SDL_GameControllerButton = 13; + pub const SDL_CONTROLLER_BUTTON_DPAD_RIGHT: SDL_GameControllerButton = 14; + pub const SDL_CONTROLLER_BUTTON_MAX: SDL_GameControllerButton = 15; extern "C" { pub fn SDL_GameControllerAddMapping(mappingString: *const c_char) -> c_int; diff --git a/src/sdl2/event.rs b/src/sdl2/event.rs index 7384ed1e7b5..1bbb73f4956 100644 --- a/src/sdl2/event.rs +++ b/src/sdl2/event.rs @@ -37,54 +37,54 @@ pub mod ll { // SDL_events.h pub type SDL_EventState = uint8_t; - pub static SDL_DISABLE: SDL_EventState = 0; - pub static SDL_ENABLE: SDL_EventState = 1; - pub static SDL_QUERY: SDL_EventState = -1; + pub const SDL_DISABLE: SDL_EventState = 0; + pub const SDL_ENABLE: SDL_EventState = 1; + pub const SDL_QUERY: SDL_EventState = -1; pub type SDL_SysWMmsg = c_void; pub type SDL_EventType = c_uint; - pub static SDL_FIRSTEVENT: SDL_EventType = 0; - pub static SDL_QUIT: SDL_EventType = 256; - pub static SDL_APP_TERMINATING: SDL_EventType = 257; - pub static SDL_APP_LOWMEMORY: SDL_EventType = 258; - pub static SDL_APP_WILLENTERBACKGROUND: SDL_EventType = 259; - pub static SDL_APP_DIDENTERBACKGROUND: SDL_EventType = 260; - pub static SDL_APP_WILLENTERFOREGROUND: SDL_EventType = 261; - pub static SDL_APP_DIDENTERFOREGROUND: SDL_EventType = 262; - pub static SDL_WINDOWEVENT: SDL_EventType = 512; - pub static SDL_SYSWMEVENT: SDL_EventType = 513; - pub static SDL_KEYDOWN: SDL_EventType = 768; - pub static SDL_KEYUP: SDL_EventType = 769; - pub static SDL_TEXTEDITING: SDL_EventType = 770; - pub static SDL_TEXTINPUT: SDL_EventType = 771; - pub static SDL_MOUSEMOTION: SDL_EventType = 1024; - pub static SDL_MOUSEBUTTONDOWN: SDL_EventType = 1025; - pub static SDL_MOUSEBUTTONUP: SDL_EventType = 1026; - pub static SDL_MOUSEWHEEL: SDL_EventType = 1027; - pub static SDL_JOYAXISMOTION: SDL_EventType = 1536; - pub static SDL_JOYBALLMOTION: SDL_EventType = 1537; - pub static SDL_JOYHATMOTION: SDL_EventType = 1538; - pub static SDL_JOYBUTTONDOWN: SDL_EventType = 1539; - pub static SDL_JOYBUTTONUP: SDL_EventType = 1540; - pub static SDL_JOYDEVICEADDED: SDL_EventType = 1541; - pub static SDL_JOYDEVICEREMOVED: SDL_EventType = 1542; - pub static SDL_CONTROLLERAXISMOTION: SDL_EventType = 1616; - pub static SDL_CONTROLLERBUTTONDOWN: SDL_EventType = 1617; - pub static SDL_CONTROLLERBUTTONUP: SDL_EventType = 1618; - pub static SDL_CONTROLLERDEVICEADDED: SDL_EventType = 1619; - pub static SDL_CONTROLLERDEVICEREMOVED: SDL_EventType = 1620; - pub static SDL_CONTROLLERDEVICEREMAPPED: SDL_EventType = 1621; - pub static SDL_FINGERDOWN: SDL_EventType = 1792; - pub static SDL_FINGERUP: SDL_EventType = 1793; - pub static SDL_FINGERMOTION: SDL_EventType = 1794; - pub static SDL_DOLLARGESTURE: SDL_EventType = 2048; - pub static SDL_DOLLARRECORD: SDL_EventType = 2049; - pub static SDL_MULTIGESTURE: SDL_EventType = 2050; - pub static SDL_CLIPBOARDUPDATE: SDL_EventType = 2304; - pub static SDL_DROPFILE: SDL_EventType = 4096; - pub static SDL_USEREVENT: SDL_EventType = 32768; - pub static SDL_LASTEVENT: SDL_EventType = 65535; + pub const SDL_FIRSTEVENT: SDL_EventType = 0; + pub const SDL_QUIT: SDL_EventType = 256; + pub const SDL_APP_TERMINATING: SDL_EventType = 257; + pub const SDL_APP_LOWMEMORY: SDL_EventType = 258; + pub const SDL_APP_WILLENTERBACKGROUND: SDL_EventType = 259; + pub const SDL_APP_DIDENTERBACKGROUND: SDL_EventType = 260; + pub const SDL_APP_WILLENTERFOREGROUND: SDL_EventType = 261; + pub const SDL_APP_DIDENTERFOREGROUND: SDL_EventType = 262; + pub const SDL_WINDOWEVENT: SDL_EventType = 512; + pub const SDL_SYSWMEVENT: SDL_EventType = 513; + pub const SDL_KEYDOWN: SDL_EventType = 768; + pub const SDL_KEYUP: SDL_EventType = 769; + pub const SDL_TEXTEDITING: SDL_EventType = 770; + pub const SDL_TEXTINPUT: SDL_EventType = 771; + pub const SDL_MOUSEMOTION: SDL_EventType = 1024; + pub const SDL_MOUSEBUTTONDOWN: SDL_EventType = 1025; + pub const SDL_MOUSEBUTTONUP: SDL_EventType = 1026; + pub const SDL_MOUSEWHEEL: SDL_EventType = 1027; + pub const SDL_JOYAXISMOTION: SDL_EventType = 1536; + pub const SDL_JOYBALLMOTION: SDL_EventType = 1537; + pub const SDL_JOYHATMOTION: SDL_EventType = 1538; + pub const SDL_JOYBUTTONDOWN: SDL_EventType = 1539; + pub const SDL_JOYBUTTONUP: SDL_EventType = 1540; + pub const SDL_JOYDEVICEADDED: SDL_EventType = 1541; + pub const SDL_JOYDEVICEREMOVED: SDL_EventType = 1542; + pub const SDL_CONTROLLERAXISMOTION: SDL_EventType = 1616; + pub const SDL_CONTROLLERBUTTONDOWN: SDL_EventType = 1617; + pub const SDL_CONTROLLERBUTTONUP: SDL_EventType = 1618; + pub const SDL_CONTROLLERDEVICEADDED: SDL_EventType = 1619; + pub const SDL_CONTROLLERDEVICEREMOVED: SDL_EventType = 1620; + pub const SDL_CONTROLLERDEVICEREMAPPED: SDL_EventType = 1621; + pub const SDL_FINGERDOWN: SDL_EventType = 1792; + pub const SDL_FINGERUP: SDL_EventType = 1793; + pub const SDL_FINGERMOTION: SDL_EventType = 1794; + pub const SDL_DOLLARGESTURE: SDL_EventType = 2048; + pub const SDL_DOLLARRECORD: SDL_EventType = 2049; + pub const SDL_MULTIGESTURE: SDL_EventType = 2050; + pub const SDL_CLIPBOARDUPDATE: SDL_EventType = 2304; + pub const SDL_DROPFILE: SDL_EventType = 4096; + pub const SDL_USEREVENT: SDL_EventType = 32768; + pub const SDL_LASTEVENT: SDL_EventType = 65535; pub struct SDL_CommonEvent { pub _type: uint32_t, @@ -412,9 +412,9 @@ pub mod ll { } pub type SDL_eventaction = c_uint; - pub static SDL_ADDEVENT: SDL_eventaction = 0; - pub static SDL_PEEKEVENT: SDL_eventaction = 1; - pub static SDL_GETEVENT: SDL_eventaction = 2; + pub const SDL_ADDEVENT: SDL_eventaction = 0; + pub const SDL_PEEKEVENT: SDL_eventaction = 1; + pub const SDL_GETEVENT: SDL_eventaction = 2; pub type SDL_EventFilter = extern "C" fn(userdata: *const c_void, event: *const SDL_Event) -> c_int; diff --git a/src/sdl2/joystick.rs b/src/sdl2/joystick.rs index 366e80a783b..9e65f4b6dd4 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 + const CENTEREDHATSTATE = 0, + const UPHATSTATE = 0x01, + const RIGHTHATSTATE = 0x02, + const DOWNHATSTATE = 0x04, + const LEFTHATSTATE = 0x08, + const RIGHTUPHATSTATE = 0x02 | 0x01, // RightHatState | UpHatState + const RIGHTDOWNHATSTATE = 0x02 | 0x04, // RightHatState | DownHatState, + const LEFTUPHATSTATE = 0x08 | 0x01, // LeftHatState | UpHatState, + const LEFTDOWNHATSTATE = 0x08 | 0x04 // LeftHatState | DownHatState } } diff --git a/src/sdl2/keyboard.rs b/src/sdl2/keyboard.rs index a4cca8b851e..00433c513c8 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 + 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 } } diff --git a/src/sdl2/messagebox.rs b/src/sdl2/messagebox.rs index c8c775a66bd..e20a4f41e9f 100644 --- a/src/sdl2/messagebox.rs +++ b/src/sdl2/messagebox.rs @@ -20,9 +20,9 @@ pub mod ll { bitflags! { flags MessageBoxFlag: 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 + const MESSAGEBOX_ERROR = ll::SDL_MESSAGEBOX_ERROR as u32, + const MESSAGEBOX_WARNING = ll::SDL_MESSAGEBOX_WARNING as u32, + const MESSAGEBOX_INFORMATION = ll::SDL_MESSAGEBOX_INFORMATION as u32 } } diff --git a/src/sdl2/mouse.rs b/src/sdl2/mouse.rs index 93ef8fafa0b..0362d496fa7 100644 --- a/src/sdl2/mouse.rs +++ b/src/sdl2/mouse.rs @@ -15,24 +15,24 @@ pub mod ll { pub type SDL_Cursor = c_void; pub type SDL_SystemCursor = c_uint; - pub static SDL_SYSTEM_CURSOR_ARROW: SDL_SystemCursor = 0; - pub static SDL_SYSTEM_CURSOR_IBEAM: SDL_SystemCursor = 1; - pub static SDL_SYSTEM_CURSOR_WAIT: SDL_SystemCursor = 2; - pub static SDL_SYSTEM_CURSOR_CROSSHAIR: SDL_SystemCursor = 3; - pub static SDL_SYSTEM_CURSOR_WAITARROW: SDL_SystemCursor = 4; - pub static SDL_SYSTEM_CURSOR_SIZENWSE: SDL_SystemCursor = 5; - pub static SDL_SYSTEM_CURSOR_SIZENESW: SDL_SystemCursor = 6; - pub static SDL_SYSTEM_CURSOR_SIZEWE: SDL_SystemCursor = 7; - pub static SDL_SYSTEM_CURSOR_SIZENS: SDL_SystemCursor = 8; - pub static SDL_SYSTEM_CURSOR_SIZEALL: SDL_SystemCursor = 9; - pub static SDL_SYSTEM_CURSOR_NO: SDL_SystemCursor = 10; - pub static SDL_SYSTEM_CURSOR_HAND: SDL_SystemCursor = 11; - pub static SDL_NUM_SYSTEM_CURSORS: SDL_SystemCursor = 12; + pub const SDL_SYSTEM_CURSOR_ARROW: SDL_SystemCursor = 0; + pub const SDL_SYSTEM_CURSOR_IBEAM: SDL_SystemCursor = 1; + pub const SDL_SYSTEM_CURSOR_WAIT: SDL_SystemCursor = 2; + pub const SDL_SYSTEM_CURSOR_CROSSHAIR: SDL_SystemCursor = 3; + pub const SDL_SYSTEM_CURSOR_WAITARROW: SDL_SystemCursor = 4; + pub const SDL_SYSTEM_CURSOR_SIZENWSE: SDL_SystemCursor = 5; + pub const SDL_SYSTEM_CURSOR_SIZENESW: SDL_SystemCursor = 6; + pub const SDL_SYSTEM_CURSOR_SIZEWE: SDL_SystemCursor = 7; + pub const SDL_SYSTEM_CURSOR_SIZENS: SDL_SystemCursor = 8; + pub const SDL_SYSTEM_CURSOR_SIZEALL: SDL_SystemCursor = 9; + pub const SDL_SYSTEM_CURSOR_NO: SDL_SystemCursor = 10; + pub const SDL_SYSTEM_CURSOR_HAND: SDL_SystemCursor = 11; + pub const SDL_NUM_SYSTEM_CURSORS: SDL_SystemCursor = 12; pub type SDL_MouseState = c_int; - pub static SDL_DISABLE: SDL_MouseState = 0; - pub static SDL_ENABLE: SDL_MouseState = 1; - pub static SDL_QUERY: SDL_MouseState = -1; + pub const SDL_DISABLE: SDL_MouseState = 0; + pub const SDL_ENABLE: SDL_MouseState = 1; + pub const SDL_QUERY: SDL_MouseState = -1; extern "C" { pub fn SDL_GetMouseFocus() -> *const SDL_Window; @@ -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 + const LEFTMOUSESTATE = 0x01, + const MIDDLEMOUSESTATE = 0x02, + const RIGHTMOUSESTATE = 0x04, + const X1MOUSESTATE = 0x08, + const X2MOUSESTATE = 0x10 } } diff --git a/src/sdl2/pixels.rs b/src/sdl2/pixels.rs index f453418ba0d..386dbff85bd 100644 --- a/src/sdl2/pixels.rs +++ b/src/sdl2/pixels.rs @@ -46,42 +46,42 @@ pub mod ll { } pub type SDL_PixelFormatFlag = uint32_t; - pub static SDL_PIXELFORMAT_UNKNOWN: SDL_PixelFormatFlag = 0x0; - pub static SDL_PIXELFORMAT_INDEX1LSB: SDL_PixelFormatFlag = 0x11100100; - pub static SDL_PIXELFORMAT_INDEX1MSB: SDL_PixelFormatFlag = 0x11200100; - pub static SDL_PIXELFORMAT_INDEX4LSB: SDL_PixelFormatFlag = 0x12100400; - pub static SDL_PIXELFORMAT_INDEX4MSB: SDL_PixelFormatFlag = 0x12200400; - pub static SDL_PIXELFORMAT_INDEX8: SDL_PixelFormatFlag = 0x13000801; - pub static SDL_PIXELFORMAT_RGB332: SDL_PixelFormatFlag = 0x14110801; - pub static SDL_PIXELFORMAT_RGB444: SDL_PixelFormatFlag = 0x15120c02; - pub static SDL_PIXELFORMAT_RGB555: SDL_PixelFormatFlag = 0x15130f02; - pub static SDL_PIXELFORMAT_BGR555: SDL_PixelFormatFlag = 0x15530f02; - pub static SDL_PIXELFORMAT_ARGB4444: SDL_PixelFormatFlag = 0x15321002; - pub static SDL_PIXELFORMAT_RGBA4444: SDL_PixelFormatFlag = 0x15421002; - pub static SDL_PIXELFORMAT_ABGR4444: SDL_PixelFormatFlag = 0x15721002; - pub static SDL_PIXELFORMAT_BGRA4444: SDL_PixelFormatFlag = 0x15821002; - pub static SDL_PIXELFORMAT_ARGB1555: SDL_PixelFormatFlag = 0x15331002; - pub static SDL_PIXELFORMAT_RGBA5551: SDL_PixelFormatFlag = 0x15441002; - pub static SDL_PIXELFORMAT_ABGR1555: SDL_PixelFormatFlag = 0x15731002; - pub static SDL_PIXELFORMAT_BGRA5551: SDL_PixelFormatFlag = 0x15841002; - pub static SDL_PIXELFORMAT_RGB565: SDL_PixelFormatFlag = 0x15151002; - pub static SDL_PIXELFORMAT_BGR565: SDL_PixelFormatFlag = 0x15551002; - pub static SDL_PIXELFORMAT_RGB24: SDL_PixelFormatFlag = 0x17101803; - pub static SDL_PIXELFORMAT_BGR24: SDL_PixelFormatFlag = 0x17401803; - pub static SDL_PIXELFORMAT_RGB888: SDL_PixelFormatFlag = 0x16161804; - pub static SDL_PIXELFORMAT_RGBX8888: SDL_PixelFormatFlag = 0x16261804; - pub static SDL_PIXELFORMAT_BGR888: SDL_PixelFormatFlag = 0x16561804; - pub static SDL_PIXELFORMAT_BGRX8888: SDL_PixelFormatFlag = 0x16661804; - pub static SDL_PIXELFORMAT_ARGB8888: SDL_PixelFormatFlag = 0x16362004; - pub static SDL_PIXELFORMAT_RGBA8888: SDL_PixelFormatFlag = 0x16462004; - pub static SDL_PIXELFORMAT_ABGR8888: SDL_PixelFormatFlag = 0x16762004; - pub static SDL_PIXELFORMAT_BGRA8888: SDL_PixelFormatFlag = 0x16862004; - pub static SDL_PIXELFORMAT_ARGB2101010: SDL_PixelFormatFlag = 0x16372004; - pub static SDL_PIXELFORMAT_YV12: SDL_PixelFormatFlag = 0x32315659; - pub static SDL_PIXELFORMAT_IYUV: SDL_PixelFormatFlag = 0x56555949; - pub static SDL_PIXELFORMAT_YUY2: SDL_PixelFormatFlag = 0x32595559; - pub static SDL_PIXELFORMAT_UYVY: SDL_PixelFormatFlag = 0x59565955; - pub static SDL_PIXELFORMAT_YVYU: SDL_PixelFormatFlag = 0x55595659; + pub const SDL_PIXELFORMAT_UNKNOWN: SDL_PixelFormatFlag = 0x0; + pub const SDL_PIXELFORMAT_INDEX1LSB: SDL_PixelFormatFlag = 0x11100100; + pub const SDL_PIXELFORMAT_INDEX1MSB: SDL_PixelFormatFlag = 0x11200100; + pub const SDL_PIXELFORMAT_INDEX4LSB: SDL_PixelFormatFlag = 0x12100400; + pub const SDL_PIXELFORMAT_INDEX4MSB: SDL_PixelFormatFlag = 0x12200400; + pub const SDL_PIXELFORMAT_INDEX8: SDL_PixelFormatFlag = 0x13000801; + pub const SDL_PIXELFORMAT_RGB332: SDL_PixelFormatFlag = 0x14110801; + pub const SDL_PIXELFORMAT_RGB444: SDL_PixelFormatFlag = 0x15120c02; + pub const SDL_PIXELFORMAT_RGB555: SDL_PixelFormatFlag = 0x15130f02; + pub const SDL_PIXELFORMAT_BGR555: SDL_PixelFormatFlag = 0x15530f02; + pub const SDL_PIXELFORMAT_ARGB4444: SDL_PixelFormatFlag = 0x15321002; + pub const SDL_PIXELFORMAT_RGBA4444: SDL_PixelFormatFlag = 0x15421002; + pub const SDL_PIXELFORMAT_ABGR4444: SDL_PixelFormatFlag = 0x15721002; + pub const SDL_PIXELFORMAT_BGRA4444: SDL_PixelFormatFlag = 0x15821002; + pub const SDL_PIXELFORMAT_ARGB1555: SDL_PixelFormatFlag = 0x15331002; + pub const SDL_PIXELFORMAT_RGBA5551: SDL_PixelFormatFlag = 0x15441002; + pub const SDL_PIXELFORMAT_ABGR1555: SDL_PixelFormatFlag = 0x15731002; + pub const SDL_PIXELFORMAT_BGRA5551: SDL_PixelFormatFlag = 0x15841002; + pub const SDL_PIXELFORMAT_RGB565: SDL_PixelFormatFlag = 0x15151002; + pub const SDL_PIXELFORMAT_BGR565: SDL_PixelFormatFlag = 0x15551002; + pub const SDL_PIXELFORMAT_RGB24: SDL_PixelFormatFlag = 0x17101803; + pub const SDL_PIXELFORMAT_BGR24: SDL_PixelFormatFlag = 0x17401803; + pub const SDL_PIXELFORMAT_RGB888: SDL_PixelFormatFlag = 0x16161804; + pub const SDL_PIXELFORMAT_RGBX8888: SDL_PixelFormatFlag = 0x16261804; + pub const SDL_PIXELFORMAT_BGR888: SDL_PixelFormatFlag = 0x16561804; + pub const SDL_PIXELFORMAT_BGRX8888: SDL_PixelFormatFlag = 0x16661804; + pub const SDL_PIXELFORMAT_ARGB8888: SDL_PixelFormatFlag = 0x16362004; + pub const SDL_PIXELFORMAT_RGBA8888: SDL_PixelFormatFlag = 0x16462004; + pub const SDL_PIXELFORMAT_ABGR8888: SDL_PixelFormatFlag = 0x16762004; + pub const SDL_PIXELFORMAT_BGRA8888: SDL_PixelFormatFlag = 0x16862004; + pub const SDL_PIXELFORMAT_ARGB2101010: SDL_PixelFormatFlag = 0x16372004; + pub const SDL_PIXELFORMAT_YV12: SDL_PixelFormatFlag = 0x32315659; + pub const SDL_PIXELFORMAT_IYUV: SDL_PixelFormatFlag = 0x56555949; + pub const SDL_PIXELFORMAT_YUY2: SDL_PixelFormatFlag = 0x32595559; + pub const SDL_PIXELFORMAT_UYVY: SDL_PixelFormatFlag = 0x59565955; + pub const SDL_PIXELFORMAT_YVYU: SDL_PixelFormatFlag = 0x55595659; extern "C" { pub fn SDL_GetRGB(pixel: uint32_t, format: *const SDL_PixelFormat, r: *const uint8_t, g: *const uint8_t, b: *const uint8_t); diff --git a/src/sdl2/render.rs b/src/sdl2/render.rs index e3f9f756764..56bbccd341c 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 + const SOFTWARE = ll::SDL_RENDERER_SOFTWARE as u32, + const ACCELERATED = ll::SDL_RENDERER_ACCELERATED as u32, + const PRESENTVSYNC = ll::SDL_RENDERER_PRESENTVSYNC as u32, + const TARGETTEXTURE = ll::SDL_RENDERER_TARGETTEXTURE as u32 } } diff --git a/src/sdl2/sdl.rs b/src/sdl2/sdl.rs index 6fd41e02c54..22ba00ad64a 100644 --- a/src/sdl2/sdl.rs +++ b/src/sdl2/sdl.rs @@ -23,23 +23,23 @@ pub mod ll { use libc::{c_int, c_uint, c_char, uint32_t}; pub type SDL_errorcode = c_uint; - pub static SDL_ENOMEM: SDL_errorcode = 0; - pub static SDL_EFREAD: SDL_errorcode = 1; - pub static SDL_EFWRITE: SDL_errorcode = 2; - pub static SDL_EFSEEK: SDL_errorcode = 3; - pub static SDL_UNSUPPORTED: SDL_errorcode = 4; - pub static SDL_LASTERROR: SDL_errorcode = 5; + pub const SDL_ENOMEM: SDL_errorcode = 0; + pub const SDL_EFREAD: SDL_errorcode = 1; + pub const SDL_EFWRITE: SDL_errorcode = 2; + pub const SDL_EFSEEK: SDL_errorcode = 3; + pub const SDL_UNSUPPORTED: SDL_errorcode = 4; + pub const SDL_LASTERROR: SDL_errorcode = 5; pub type SDL_InitFlag = uint32_t; - pub static SDL_INIT_TIMER: SDL_InitFlag = 0x00000001; - pub static SDL_INIT_AUDIO: SDL_InitFlag = 0x00000010; - pub static SDL_INIT_VIDEO: SDL_InitFlag = 0x00000020; - pub static SDL_INIT_JOYSTICK: SDL_InitFlag = 0x00000200; - pub static SDL_INIT_HAPTIC: SDL_InitFlag = 0x00001000; - pub static SDL_INIT_GAMECONTROLLER: SDL_InitFlag = 0x00002000; - pub static SDL_INIT_EVENTS: SDL_InitFlag = 0x00004000; - pub static SDL_INIT_NOPARACHUTE: SDL_InitFlag = 0x00100000; - pub static SDL_INIT_EVERYTHING: SDL_InitFlag = 0x0000FFFF; + pub const SDL_INIT_TIMER: SDL_InitFlag = 0x00000001; + pub const SDL_INIT_AUDIO: SDL_InitFlag = 0x00000010; + pub const SDL_INIT_VIDEO: SDL_InitFlag = 0x00000020; + pub const SDL_INIT_JOYSTICK: SDL_InitFlag = 0x00000200; + pub const SDL_INIT_HAPTIC: SDL_InitFlag = 0x00001000; + pub const SDL_INIT_GAMECONTROLLER: SDL_InitFlag = 0x00002000; + pub const SDL_INIT_EVENTS: SDL_InitFlag = 0x00004000; + pub const SDL_INIT_NOPARACHUTE: SDL_InitFlag = 0x00100000; + pub const SDL_INIT_EVERYTHING: SDL_InitFlag = 0x0000FFFF; //SDL_error.h extern "C" { @@ -62,15 +62,15 @@ pub mod ll { bitflags! { flags InitFlag: u32 { - 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 + const INIT_TIMER = ll::SDL_INIT_TIMER, + const INIT_AUDIO = ll::SDL_INIT_AUDIO, + const INIT_VIDEO = ll::SDL_INIT_VIDEO, + const INIT_JOYSTICK = ll::SDL_INIT_JOYSTICK, + const INIT_HAPTIC = ll::SDL_INIT_HAPTIC, + const INIT_GAME_CONTROLLER = ll::SDL_INIT_GAMECONTROLLER, + const INIT_EVENTS = ll::SDL_INIT_EVENTS, + const INIT_NOPARACHUTE = ll::SDL_INIT_NOPARACHUTE, + const INIT_EVERYTHING = ll::SDL_INIT_EVERYTHING } } diff --git a/src/sdl2/surface.rs b/src/sdl2/surface.rs index b15dcaa5caa..cba77c552d7 100644 --- a/src/sdl2/surface.rs +++ b/src/sdl2/surface.rs @@ -22,10 +22,10 @@ pub mod ll { pub type SDL_SurfaceFlag = c_int; - pub static SDL_SWSURFACE: SDL_SurfaceFlag = 0; - pub static SDL_PREALLOC: SDL_SurfaceFlag = 0x00000001; - pub static SDL_RLEACCEL: SDL_SurfaceFlag = 0x00000002; - pub static SDL_DONTFREE: SDL_SurfaceFlag = 0x00000004; + pub const SDL_SWSURFACE: SDL_SurfaceFlag = 0; + pub const SDL_PREALLOC: SDL_SurfaceFlag = 0x00000001; + pub const SDL_RLEACCEL: SDL_SurfaceFlag = 0x00000002; + pub const SDL_DONTFREE: SDL_SurfaceFlag = 0x00000004; //SDL_surface.h #[repr(C)] @@ -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 + const SWSURFACE = ll::SDL_SWSURFACE as u32, + const PREALLOC = ll::SDL_PREALLOC as u32, + const RLEACCEL = ll::SDL_RLEACCEL as u32, + const DONTFREE = ll::SDL_DONTFREE as u32 } } diff --git a/src/sdl2/video.rs b/src/sdl2/video.rs index 3970067067d..1e2aa34b91d 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 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 + const FULLSCREEN = ll::SDL_WINDOW_FULLSCREEN as u32, + const OPENGL = ll::SDL_WINDOW_OPENGL as u32, + const SHOWN = ll::SDL_WINDOW_SHOWN as u32, + const HIDDEN = ll::SDL_WINDOW_HIDDEN as u32, + const BORDERLESS = ll::SDL_WINDOW_BORDERLESS as u32, + const RESIZABLE = ll::SDL_WINDOW_RESIZABLE as u32, + const MINIMIZED = ll::SDL_WINDOW_MINIMIZED as u32, + const MAXIMIZED = ll::SDL_WINDOW_MAXIMIZED as u32, + const INPUT_GRABBED = ll::SDL_WINDOW_INPUT_GRABBED as u32, + const INPUT_FOCUS = ll::SDL_WINDOW_INPUT_FOCUS as u32, + const MOUSE_FOCUS = ll::SDL_WINDOW_MOUSE_FOCUS as u32, + const FULLSCREEN_DESKTOP = ll::SDL_WINDOW_FULLSCREEN_DESKTOP as u32, + const FOREIGN = ll::SDL_WINDOW_FOREIGN as u32 } }