jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2878 from Perelandric/rename_fixes

Browse source 
Some fixes from the recent `T` renaming
This commit is contained in:
Andreas Rumpf 2015-06-07 10:46:35 +02:00
commit faed57dff0
5 changed files with 58 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/pure/fsmonitor.nim
View file

@ -108,7 +108,7 @@ proc del*(monitor: FSMonitor, wd: cint) =
proc getEvent(m: FSMonitor, fd: cint): seq[MonitorEvent] = proc getEvent(m: FSMonitor, fd: cint): seq[MonitorEvent] =
result = @[] result = @[]
let size = (sizeof(TINotifyEvent)+2000)*MaxEvents let size = (sizeof(INotifyEvent)+2000)*MaxEvents
var buffer = newString(size) var buffer = newString(size)
let le = read(fd, addr(buffer[0]), size) let le = read(fd, addr(buffer[0]), size)
@ -117,7 +117,7 @@ proc getEvent(m: FSMonitor, fd: cint): seq[MonitorEvent] =
var i = 0 var i = 0
while i < le: while i < le:
var event = cast[ptr TINotifyEvent](addr(buffer[i])) var event = cast[ptr INotifyEvent](addr(buffer[i]))
var mev: MonitorEvent var mev: MonitorEvent
mev.wd = event.wd mev.wd = event.wd
if event.len.int != 0: if event.len.int != 0:
@ -129,7 +129,7 @@ proc getEvent(m: FSMonitor, fd: cint): seq[MonitorEvent] =
if (event.mask.int and IN_MOVED_FROM) != 0: if (event.mask.int and IN_MOVED_FROM) != 0:
# Moved from event, add to m's collection # Moved from event, add to m's collection
movedFrom.add(event.cookie.cint, (mev.wd, mev.name)) movedFrom.add(event.cookie.cint, (mev.wd, mev.name))
inc(i, sizeof(TINotifyEvent) + event.len.int) inc(i, sizeof(INotifyEvent) + event.len.int)
continue continue
elif (event.mask.int and IN_MOVED_TO) != 0: elif (event.mask.int and IN_MOVED_TO) != 0:
mev.kind = MonitorMoved mev.kind = MonitorMoved
@ -159,7 +159,7 @@ proc getEvent(m: FSMonitor, fd: cint): seq[MonitorEvent] =
mev.fullname = "" mev.fullname = ""
result.add(mev) result.add(mev)
inc(i, sizeof(TINotifyEvent) + event.len.int) inc(i, sizeof(INotifyEvent) + event.len.int)
# If movedFrom events have not been matched with a moveTo. File has # If movedFrom events have not been matched with a moveTo. File has
# been moved to an unwatched location, emit a MonitorDelete. # been moved to an unwatched location, emit a MonitorDelete.

2
lib/wrappers/libffi/libffi.nim
View file

@ -60,7 +60,7 @@ else:
type type
Arg* = int Arg* = int
SArg* = int SArg* = int
{deprecated: [TArg: Arg, TSArg: SArg].} {.deprecated: [TArg: Arg, TSArg: SArg].}
when defined(windows) and defined(x86): when defined(windows) and defined(x86):
type type

44
lib/wrappers/readline/readline.nim
View file

@ -29,7 +29,7 @@ elif defined(macosx):
else: else:
const const
readlineDll* = "libreadline.so.6(|.0)" readlineDll* = "libreadline.so.6(|.0)"
# mangle "'TCommandFunc'" TCommandFunc # mangle "'CommandFunc'" CommandFunc
# mangle TvcpFunc TvcpFunc # mangle TvcpFunc TvcpFunc
import rltypedefs import rltypedefs
@ -80,7 +80,7 @@ const
type type
KEYMAP_ENTRY*{.pure, final.} = object KEYMAP_ENTRY*{.pure, final.} = object
typ*: char typ*: char
function*: TCommandFunc function*: CommandFunc
{.deprecated: [TKEYMAP_ENTRY: KEYMAP_ENTRY].} {.deprecated: [TKEYMAP_ENTRY: KEYMAP_ENTRY].}
@ -243,7 +243,7 @@ when not defined(macosx):
type type
FUNMAP*{.pure, final.} = object FUNMAP*{.pure, final.} = object
name*: cstring name*: cstring
function*: TCommandFunc function*: CommandFunc
{.deprecated: [TFUNMAP: FUNMAP].} {.deprecated: [TFUNMAP: FUNMAP].}
@ -610,31 +610,31 @@ proc discard_argument*(): cint{.cdecl, importc: "rl_discard_argument",
dynlib: readlineDll.} dynlib: readlineDll.}
# Utility functions to bind keys to readline commands. # Utility functions to bind keys to readline commands.
proc add_defun*(a2: cstring, a3: TCommandFunc, a4: cint): cint{.cdecl, proc add_defun*(a2: cstring, a3: CommandFunc, a4: cint): cint{.cdecl,
importc: "rl_add_defun", dynlib: readlineDll.} importc: "rl_add_defun", dynlib: readlineDll.}
proc bind_key*(a2: cint, a3: TCommandFunc): cint{.cdecl, proc bind_key*(a2: cint, a3: CommandFunc): cint{.cdecl,
importc: "rl_bind_key", dynlib: readlineDll.} importc: "rl_bind_key", dynlib: readlineDll.}
proc bind_key_in_map*(a2: cint, a3: TCommandFunc, a4: PKeymap): cint{.cdecl, proc bind_key_in_map*(a2: cint, a3: CommandFunc, a4: PKeymap): cint{.cdecl,
importc: "rl_bind_key_in_map", dynlib: readlineDll.} importc: "rl_bind_key_in_map", dynlib: readlineDll.}
proc unbind_key*(a2: cint): cint{.cdecl, importc: "rl_unbind_key", proc unbind_key*(a2: cint): cint{.cdecl, importc: "rl_unbind_key",
dynlib: readlineDll.} dynlib: readlineDll.}
proc unbind_key_in_map*(a2: cint, a3: PKeymap): cint{.cdecl, proc unbind_key_in_map*(a2: cint, a3: PKeymap): cint{.cdecl,
importc: "rl_unbind_key_in_map", dynlib: readlineDll.} importc: "rl_unbind_key_in_map", dynlib: readlineDll.}
proc bind_key_if_unbound*(a2: cint, a3: TCommandFunc): cint{.cdecl, proc bind_key_if_unbound*(a2: cint, a3: CommandFunc): cint{.cdecl,
importc: "rl_bind_key_if_unbound", dynlib: readlineDll.} importc: "rl_bind_key_if_unbound", dynlib: readlineDll.}
proc bind_key_if_unbound_in_map*(a2: cint, a3: TCommandFunc, a4: PKeymap): cint{. proc bind_key_if_unbound_in_map*(a2: cint, a3: CommandFunc, a4: PKeymap): cint{.
cdecl, importc: "rl_bind_key_if_unbound_in_map", dynlib: readlineDll.} cdecl, importc: "rl_bind_key_if_unbound_in_map", dynlib: readlineDll.}
proc unbind_function_in_map*(a2: TCommandFunc, a3: PKeymap): cint{.cdecl, proc unbind_function_in_map*(a2: CommandFunc, a3: PKeymap): cint{.cdecl,
importc: "rl_unbind_function_in_map", dynlib: readlineDll.} importc: "rl_unbind_function_in_map", dynlib: readlineDll.}
proc unbind_command_in_map*(a2: cstring, a3: PKeymap): cint{.cdecl, proc unbind_command_in_map*(a2: cstring, a3: PKeymap): cint{.cdecl,
importc: "rl_unbind_command_in_map", dynlib: readlineDll.} importc: "rl_unbind_command_in_map", dynlib: readlineDll.}
proc bind_keyseq*(a2: cstring, a3: TCommandFunc): cint{.cdecl, proc bind_keyseq*(a2: cstring, a3: CommandFunc): cint{.cdecl,
importc: "rl_bind_keyseq", dynlib: readlineDll.} importc: "rl_bind_keyseq", dynlib: readlineDll.}
proc bind_keyseq_in_map*(a2: cstring, a3: TCommandFunc, a4: PKeymap): cint{. proc bind_keyseq_in_map*(a2: cstring, a3: CommandFunc, a4: PKeymap): cint{.
cdecl, importc: "rl_bind_keyseq_in_map", dynlib: readlineDll.} cdecl, importc: "rl_bind_keyseq_in_map", dynlib: readlineDll.}
proc bind_keyseq_if_unbound*(a2: cstring, a3: TCommandFunc): cint{.cdecl, proc bind_keyseq_if_unbound*(a2: cstring, a3: CommandFunc): cint{.cdecl,
importc: "rl_bind_keyseq_if_unbound", dynlib: readlineDll.} importc: "rl_bind_keyseq_if_unbound", dynlib: readlineDll.}
proc bind_keyseq_if_unbound_in_map*(a2: cstring, a3: TCommandFunc, proc bind_keyseq_if_unbound_in_map*(a2: cstring, a3: CommandFunc,
a4: PKeymap): cint{.cdecl, a4: PKeymap): cint{.cdecl,
importc: "rl_bind_keyseq_if_unbound_in_map", dynlib: readlineDll.} importc: "rl_bind_keyseq_if_unbound_in_map", dynlib: readlineDll.}
proc generic_bind*(a2: cint, a3: cstring, a4: cstring, a5: PKeymap): cint{. proc generic_bind*(a2: cint, a3: cstring, a4: cstring, a5: PKeymap): cint{.
@ -645,7 +645,7 @@ proc variable_bind*(a2: cstring, a3: cstring): cint{.cdecl,
importc: "rl_variable_bind", dynlib: readlineDll.} importc: "rl_variable_bind", dynlib: readlineDll.}
# Backwards compatibility, use rl_bind_keyseq_in_map instead. # Backwards compatibility, use rl_bind_keyseq_in_map instead.
proc set_key*(a2: cstring, a3: TCommandFunc, a4: PKeymap): cint{.cdecl, proc set_key*(a2: cstring, a3: CommandFunc, a4: PKeymap): cint{.cdecl,
importc: "rl_set_key", dynlib: readlineDll.} importc: "rl_set_key", dynlib: readlineDll.}
# Backwards compatibility, use rl_generic_bind instead. # Backwards compatibility, use rl_generic_bind instead.
@ -657,15 +657,15 @@ proc translate_keyseq*(a2: cstring, a3: cstring, a4: ptr cint): cint{.cdecl,
importc: "rl_translate_keyseq", dynlib: readlineDll.} importc: "rl_translate_keyseq", dynlib: readlineDll.}
proc untranslate_keyseq*(a2: cint): cstring{.cdecl, proc untranslate_keyseq*(a2: cint): cstring{.cdecl,
importc: "rl_untranslate_keyseq", dynlib: readlineDll.} importc: "rl_untranslate_keyseq", dynlib: readlineDll.}
proc named_function*(a2: cstring): TCommandFunc{.cdecl, proc named_function*(a2: cstring): CommandFunc{.cdecl,
importc: "rl_named_function", dynlib: readlineDll.} importc: "rl_named_function", dynlib: readlineDll.}
proc function_of_keyseq*(a2: cstring, a3: PKeymap, a4: ptr cint): TCommandFunc{. proc function_of_keyseq*(a2: cstring, a3: PKeymap, a4: ptr cint): CommandFunc{.
cdecl, importc: "rl_function_of_keyseq", dynlib: readlineDll.} cdecl, importc: "rl_function_of_keyseq", dynlib: readlineDll.}
proc list_funmap_names*(){.cdecl, importc: "rl_list_funmap_names", proc list_funmap_names*(){.cdecl, importc: "rl_list_funmap_names",
dynlib: readlineDll.} dynlib: readlineDll.}
proc invoking_keyseqs_in_map*(a2: TCommandFunc, a3: PKeymap): cstringArray{. proc invoking_keyseqs_in_map*(a2: CommandFunc, a3: PKeymap): cstringArray{.
cdecl, importc: "rl_invoking_keyseqs_in_map", dynlib: readlineDll.} cdecl, importc: "rl_invoking_keyseqs_in_map", dynlib: readlineDll.}
proc invoking_keyseqs*(a2: TCommandFunc): cstringArray{.cdecl, proc invoking_keyseqs*(a2: CommandFunc): cstringArray{.cdecl,
importc: "rl_invoking_keyseqs", dynlib: readlineDll.} importc: "rl_invoking_keyseqs", dynlib: readlineDll.}
proc function_dumper*(a2: cint){.cdecl, importc: "rl_function_dumper", proc function_dumper*(a2: cint){.cdecl, importc: "rl_function_dumper",
dynlib: readlineDll.} dynlib: readlineDll.}
@ -688,7 +688,7 @@ proc get_keymap_name_from_edit_mode*(): cstring{.cdecl,
importc: "rl_get_keymap_name_from_edit_mode", dynlib: readlineDll.} importc: "rl_get_keymap_name_from_edit_mode", dynlib: readlineDll.}
# Functions for manipulating the funmap, which maps command names to functions. # Functions for manipulating the funmap, which maps command names to functions.
proc add_funmap_entry*(a2: cstring, a3: TCommandFunc): cint{.cdecl, proc add_funmap_entry*(a2: cstring, a3: CommandFunc): cint{.cdecl,
importc: "rl_add_funmap_entry", dynlib: readlineDll.} importc: "rl_add_funmap_entry", dynlib: readlineDll.}
proc funmap_names*(): cstringArray{.cdecl, importc: "rl_funmap_names", proc funmap_names*(): cstringArray{.cdecl, importc: "rl_funmap_names",
dynlib: readlineDll.} dynlib: readlineDll.}
@ -828,7 +828,7 @@ proc username_completion_function*(a2: cstring, a3: cint): cstring{.cdecl,
importc: "rl_username_completion_function", dynlib: readlineDll.} importc: "rl_username_completion_function", dynlib: readlineDll.}
proc filename_completion_function*(a2: cstring, a3: cint): cstring{.cdecl, proc filename_completion_function*(a2: cstring, a3: cint): cstring{.cdecl,
importc: "rl_filename_completion_function", dynlib: readlineDll.} importc: "rl_filename_completion_function", dynlib: readlineDll.}
proc completion_mode*(a2: TCommandFunc): cint{.cdecl, proc completion_mode*(a2: CommandFunc): cint{.cdecl,
importc: "rl_completion_mode", dynlib: readlineDll.} importc: "rl_completion_mode", dynlib: readlineDll.}
# **************************************************************** # ****************************************************************
# #
@ -883,7 +883,7 @@ when false:
# The current value of the numeric argument specified by the user. # The current value of the numeric argument specified by the user.
var numeric_arg*{.importc: "rl_numeric_arg", dynlib: readlineDll.}: cint var numeric_arg*{.importc: "rl_numeric_arg", dynlib: readlineDll.}: cint
# The address of the last command function Readline executed. # The address of the last command function Readline executed.
var last_func*{.importc: "rl_last_func", dynlib: readlineDll.}: TCommandFunc var last_func*{.importc: "rl_last_func", dynlib: readlineDll.}: CommandFunc
# The name of the terminal to use. # The name of the terminal to use.
var terminal_name*{.importc: "rl_terminal_name", dynlib: readlineDll.}: cstring var terminal_name*{.importc: "rl_terminal_name", dynlib: readlineDll.}: cstring
# The input and output streams. # The input and output streams.
@ -1186,7 +1186,7 @@ type
rlstate*: cint rlstate*: cint
done*: cint done*: cint
kmap*: PKeymap # input state kmap*: PKeymap # input state
lastfunc*: TCommandFunc lastfunc*: CommandFunc
insmode*: cint insmode*: cint
edmode*: cint edmode*: cint
kseqlen*: cint kseqlen*: cint

56
lib/wrappers/sdl/sdl.nim
View file

@ -775,7 +775,7 @@ type
Arg*{.final.} = object Arg*{.final.} = object
buf*: array[0..ERR_MAX_STRLEN - 1, int8] buf*: array[0..ERR_MAX_STRLEN - 1, int8]
Perror* = ptr Terror Perror* = ptr Error
Error*{.final.} = object # This is a numeric value corresponding to the current error Error*{.final.} = object # This is a numeric value corresponding to the current error
# SDL_rwops.h types # SDL_rwops.h types
# This is the read/write operation structure -- very basic # This is the read/write operation structure -- very basic
@ -814,7 +814,7 @@ type
theType*: cint theType*: cint
mem*: Mem mem*: Mem
RWops* = RWops # SDL_timer.h types # SDL_timer.h types
# Function prototype for the timer callback function # Function prototype for the timer callback function
TimerCallback* = proc (interval: int32): int32{.cdecl.} TimerCallback* = proc (interval: int32): int32{.cdecl.}
NewTimerCallback* = proc (interval: int32, param: pointer): int32{.cdecl.} NewTimerCallback* = proc (interval: int32, param: pointer): int32{.cdecl.}
@ -950,8 +950,8 @@ type
EventAction* = enum # Application visibility event structure EventAction* = enum # Application visibility event structure
ADDEVENT, PEEKEVENT, GETEVENT ADDEVENT, PEEKEVENT, GETEVENT
PActiveEvent* = ptr ActiveEvent PActiveEvent* = ptr TActiveEvent
ActiveEvent*{.final.} = object # SDL_ACTIVEEVENT TActiveEvent*{.final.} = object # SDL_ACTIVEEVENT
# Keyboard event structure # Keyboard event structure
kind*: EventKind kind*: EventKind
gain*: byte # Whether given states were gained or lost (1/0) gain*: byte # Whether given states were gained or lost (1/0)
@ -1032,8 +1032,8 @@ type
w*: cint # New width w*: cint # New width
h*: cint # New height h*: cint # New height
PUserEvent* = ptr UserEvent PUserEvent* = ptr TUserEvent
UserEvent*{.final.} = object # SDL_USEREVENT through SDL_NUMEVENTS-1 TUserEvent*{.final.} = object # SDL_USEREVENT through SDL_NUMEVENTS-1
kind*: EventKind kind*: EventKind
code*: cint # User defined event code code*: cint # User defined event code
data1*: pointer # User defined data pointer data1*: pointer # User defined data pointer
@ -1044,7 +1044,7 @@ type
TWrite: Write, TBool: Bool, TUInt8Array: UInt8Array, TWrite: Write, TBool: Bool, TUInt8Array: UInt8Array,
TGrabMode: GrabMode, Terrorcode: Errorcode, TStdio: Stdio, TGrabMode: GrabMode, Terrorcode: Errorcode, TStdio: Stdio,
TMem: Mem, TSeek: Seek, TRead: Read, TClose: Close, TMem: Mem, TSeek: Seek, TRead: Read, TClose: Close,
TTimerCallback: TimerCallback, TNewTimerCallback: NewTimerCallabck, TTimerCallback: TimerCallback, TNewTimerCallback: NewTimerCallback,
TTimerID: TimerID, TAudioSpecCallback: AudioSpecCallback, TTimerID: TimerID, TAudioSpecCallback: AudioSpecCallback,
TAudioSpec: AudioSpec, TAudioCVTFilter: AudioCVTFilter, TAudioSpec: AudioSpec, TAudioCVTFilter: AudioCVTFilter,
TAudioCVTFilterArray: AudioCVTFilterArray, TAudioCVT: AudioCVT, TAudioCVTFilterArray: AudioCVTFilterArray, TAudioCVT: AudioCVT,
@ -1053,16 +1053,19 @@ type
TJoystick: Joystick, TJoyAxisEvent: JoyAxisEvent, TRWops: RWops, TJoystick: Joystick, TJoyAxisEvent: JoyAxisEvent, TRWops: RWops,
TJoyBallEvent: JoyBallEvent, TJoyHatEvent: JoyHatEvent, TJoyBallEvent: JoyBallEvent, TJoyHatEvent: JoyHatEvent,
TJoyButtonEvent: JoyButtonEvent, TBallDelta: BallDelta, TJoyButtonEvent: JoyButtonEvent, TBallDelta: BallDelta,
Tversion: Version, TMod: Mod, TActiveEvent: ActiveEvent, Tversion: Version, TMod: Mod,
# TActiveEvent: ActiveEvent, # Naming conflict when we drop the `T`
TMouseMotionEvent: MouseMotionEvent, TMouseButtonEvent: MouseButtonEvent, TMouseMotionEvent: MouseMotionEvent, TMouseButtonEvent: MouseButtonEvent,
TResizeEvent: ResizeEvent, TUserEvent: UserEvent].} TResizeEvent: ResizeEvent,
# TUserEvent: UserEvent # Naming conflict when we drop the `T`
].}
when defined(Unix): when defined(Unix):
type #These are the various supported subsystems under UNIX type #These are the various supported subsystems under UNIX
SysWm* = enum SysWm* = enum
SYSWM_X11 SYSWM_X11
{.deprecated: [TSysWm: SysWm].} {.deprecated: [TSysWm: SysWm].}
when defined(WINDOWS): when defined(WINDOWS):
type type
PSysWMmsg* = ptr SysWMmsg PSysWMmsg* = ptr SysWMmsg
SysWMmsg*{.final.} = object SysWMmsg*{.final.} = object
@ -1136,8 +1139,8 @@ else:
{.deprecated: [TSysWMinfo: SysWMinfo].} {.deprecated: [TSysWMinfo: SysWMinfo].}
type type
PSysWMEvent* = ptr SysWMEvent PSysWMEvent* = ptr TSysWMEvent
SysWMEvent*{.final.} = object TSysWMEvent*{.final.} = object
kind*: EventKind kind*: EventKind
msg*: PSysWMmsg msg*: PSysWMmsg
@ -1172,12 +1175,12 @@ type
PColorArray* = ptr ColorArray PColorArray* = ptr ColorArray
ColorArray* = array[0..65000, Color] ColorArray* = array[0..65000, Color]
PPalette* = ptr TPalette PPalette* = ptr Palette
Palette*{.final.} = object # Everything in the pixel format structure is read-only Palette*{.final.} = object # Everything in the pixel format structure is read-only
ncolors*: int ncolors*: int
colors*: PColorArray colors*: PColorArray
PPixelFormat* = ptr TPixelFormat PPixelFormat* = ptr PixelFormat
PixelFormat*{.final.} = object # The structure passed to the low level blit functions PixelFormat*{.final.} = object # The structure passed to the low level blit functions
palette*: PPalette palette*: PPalette
bitsPerPixel*: byte bitsPerPixel*: byte
@ -1254,10 +1257,10 @@ type
hwOverlay*: int32 # This will be set to 1 if the overlay is hardware accelerated. hwOverlay*: int32 # This will be set to 1 if the overlay is hardware accelerated.
GLAttr* = enum GLAttr* = enum
GL_RED_SIZE, GL_GREEN_SIZE, GL_BLUE_SIZE, GL_ALPHA_SIZE, GL_BUFFER_SIZE, GL_RED_SIZE, GL_GREEN_SIZE, GL_BLUE_SIZE, GL_ALPHA_SIZE, GL_BUFFER_SIZE,
GL_DOUBLEBUFFER, GL_DEPTH_SIZE, GL_STENCIL_SIZE, GL_ACCUM_RED_SIZE, GL_DOUBLEBUFFER, GL_DEPTH_SIZE, GL_STENCIL_SIZE, GL_ACCUM_RED_SIZE,
GL_ACCUM_GREEN_SIZE, GL_ACCUM_BLUE_SIZE, GL_ACCUM_ALPHA_SIZE, GL_STEREO, GL_ACCUM_GREEN_SIZE, GL_ACCUM_BLUE_SIZE, GL_ACCUM_ALPHA_SIZE, GL_STEREO,
GL_MULTISAMPLEBUFFERS, GL_MULTISAMPLESAMPLES, GL_ACCELERATED_VISUAL, GL_MULTISAMPLEBUFFERS, GL_MULTISAMPLESAMPLES, GL_ACCELERATED_VISUAL,
GL_SWAP_CONTROL GL_SWAP_CONTROL
PCursor* = ptr Cursor PCursor* = ptr Cursor
Cursor*{.final.} = object # SDL_mutex.h types Cursor*{.final.} = object # SDL_mutex.h types
@ -1269,7 +1272,8 @@ type
wmCursor*: pointer # Window-manager cursor wmCursor*: pointer # Window-manager cursor
{.deprecated: [TRect: Rect, TSurface: Surface, TEvent: Event, TColor: Color, {.deprecated: [TRect: Rect, TSurface: Surface, TEvent: Event, TColor: Color,
TEventFilter: EventFilter, TColorArray: ColorArray, TEventFilter: EventFilter, TColorArray: ColorArray,
TSysWMEvent: SysWMEvent, TExposeEvent: ExposeEvent, # TSysWMEvent: SysWMEvent, # Naming conflict when we drop the `T`
TExposeEvent: ExposeEvent,
TQuitEvent: QuitEvent, TPalette: Palette, TPixelFormat: PixelFormat, TQuitEvent: QuitEvent, TPalette: Palette, TPixelFormat: PixelFormat,
TBlitInfo: BlitInfo, TBlit: Blit, TVideoInfo: VideoInfo, TBlitInfo: BlitInfo, TBlit: Blit, TVideoInfo: VideoInfo,
TOverlay: Overlay, TGLAttr: GLAttr, TCursor: Cursor].} TOverlay: Overlay, TGLAttr: GLAttr, TCursor: Cursor].}
@ -1285,11 +1289,11 @@ type
Cond*{.final.} = object # SDL_thread.h types Cond*{.final.} = object # SDL_thread.h types
{.deprecated: [TCond: Cond, TSem: Sem, TMutex: Mutex, Tsemaphore: Semaphore].} {.deprecated: [TCond: Cond, TSem: Sem, TMutex: Mutex, Tsemaphore: Semaphore].}
when defined(WINDOWS): when defined(WINDOWS):
type type
SYS_ThreadHandle* = Handle SYS_ThreadHandle* = Handle
{.deprecated: [TSYS_ThreadHandle: SYS_ThreadHandle].} {.deprecated: [TSYS_ThreadHandle: SYS_ThreadHandle].}
when defined(Unix): when defined(Unix):
type type
SYS_ThreadHandle* = pointer SYS_ThreadHandle* = pointer
{.deprecated: [TSYS_ThreadHandle: SYS_ThreadHandle].} {.deprecated: [TSYS_ThreadHandle: SYS_ThreadHandle].}
@ -1300,7 +1304,7 @@ type # This is the system-independent thread info struc
threadid*: int32 threadid*: int32
handle*: SYS_ThreadHandle handle*: SYS_ThreadHandle
status*: int status*: int
errbuf*: Terror errbuf*: Error
data*: pointer data*: pointer
PKeyStateArr* = ptr KeyStateArr PKeyStateArr* = ptr KeyStateArr
@ -2211,7 +2215,7 @@ proc glLoadLibrary*(filename: cstring): int{.cdecl,
proc glGetProcAddress*(procname: cstring): pointer{.cdecl, proc glGetProcAddress*(procname: cstring): pointer{.cdecl,
importc: "SDL_GL_GetProcAddress", dynlib: LibName.} importc: "SDL_GL_GetProcAddress", dynlib: LibName.}
# Set an attribute of the OpenGL subsystem before intialization. # Set an attribute of the OpenGL subsystem before intialization.
proc glSetAttribute*(attr: TGLAttr, value: int): int{.cdecl, proc glSetAttribute*(attr: GLAttr, value: int): int{.cdecl,
importc: "SDL_GL_SetAttribute", dynlib: LibName.} importc: "SDL_GL_SetAttribute", dynlib: LibName.}
# Get an attribute of the OpenGL subsystem from the windowing # Get an attribute of the OpenGL subsystem from the windowing
# interface, such as glX. This is of course different from getting # interface, such as glX. This is of course different from getting
@ -2220,7 +2224,7 @@ proc glSetAttribute*(attr: TGLAttr, value: int): int{.cdecl,
# #
# Developers should track the values they pass into SDL_GL_SetAttribute # Developers should track the values they pass into SDL_GL_SetAttribute
# themselves if they want to retrieve these values. # themselves if they want to retrieve these values.
proc glGetAttribute*(attr: TGLAttr, value: var int): int{.cdecl, proc glGetAttribute*(attr: GLAttr, value: var int): int{.cdecl,
importc: "SDL_GL_GetAttribute", dynlib: LibName.} importc: "SDL_GL_GetAttribute", dynlib: LibName.}
# Swap the OpenGL buffers, if double-buffering is supported. # Swap the OpenGL buffers, if double-buffering is supported.
proc glSwapBuffers*(){.cdecl, importc: "SDL_GL_SwapBuffers", dynlib: LibName.} proc glSwapBuffers*(){.cdecl, importc: "SDL_GL_SwapBuffers", dynlib: LibName.}
@ -2267,7 +2271,7 @@ proc wmToggleFullScreen*(surface: PSurface): int{.cdecl,
# Grabbing means that the mouse is confined to the application window, # Grabbing means that the mouse is confined to the application window,
# and nearly all keyboard input is passed directly to the application, # and nearly all keyboard input is passed directly to the application,
# and not interpreted by a window manager, if any. # and not interpreted by a window manager, if any.
proc wmGrabInput*(mode: TGrabMode): GrabMode{.cdecl, proc wmGrabInput*(mode: GrabMode): GrabMode{.cdecl,
importc: "SDL_WM_GrabInput", dynlib: LibName.} importc: "SDL_WM_GrabInput", dynlib: LibName.}
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# mouse-routines # mouse-routines

2
tools/niminst/niminst.nim
View file

@ -538,7 +538,7 @@ when haveZipLib:
var n = "$#.zip" % proj var n = "$#.zip" % proj
if c.outdir.len == 0: n = "build" / n if c.outdir.len == 0: n = "build" / n
else: n = c.outdir / n else: n = c.outdir / n
var z: TZipArchive var z: ZipArchive
if open(z, n, fmWrite): if open(z, n, fmWrite):
addFile(z, proj / buildBatFile32, "build" / buildBatFile32) addFile(z, proj / buildBatFile32, "build" / buildBatFile32)
addFile(z, proj / buildBatFile64, "build" / buildBatFile64) addFile(z, proj / buildBatFile64, "build" / buildBatFile64)