Kp
7d38a9f0be
Rename MAX_AXES_PER_JOYSTICK to DXX_MAX_AXES_PER_JOYSTICK
...
Rename symbol MAX_AXES_PER_JOYSTICK to DXX_MAX_AXES_PER_JOYSTICK to show
that it is a DXX symbol, not one inherited from a library.
git grep -lzw MAX_AXES_PER_JOYSTICK -- SConstruct '*.h' '*.cpp' | xargs -0 sed -i -e 's/\<MAX_AXES_PER_JOYSTICK\>/DXX_&/g'
2016-09-25 04:52:49 +00:00
Kp
f24e9f836c
Rename MAX_JOYSTICKS to DXX_MAX_JOYSTICKS
...
Rename symbol MAX_JOYSTICKS to DXX_MAX_JOYSTICKS to show that it is a DXX
symbol, not one inherited from a library.
git grep -lzw MAX_JOYSTICKS -- SConstruct '*.h' '*.cpp' | xargs -0 sed -i -e 's/\<MAX_JOYSTICKS\>/DXX_&/g'
2016-09-25 04:52:48 +00:00
Kp
62b58e9890
Move OGL to dxxsconf.h; rename to DXX_USE_OGL
...
Rename symbol OGL to DXX_USE_OGL to show that it is a DXX
symbol, not one inherited from a library. Move it to dxxsconf.h to
shorten the command line.
This is a mostly automated transform, but the changes to SConstruct were
manual.
git grep -lzw OGL -- '*.h' '*.cpp' | xargs -0 sed -i -e 's/\(\s*#\s*if\)def\s*OGL/\1 DXX_USE_OGL/' -e 's/\(\s*#\s*if\)ndef OGL/\1 !DXX_USE_OGL/' -e 's/\(\s*#\s*if !\?\)defined(OGL)/\1DXX_USE_OGL/'
2016-09-24 18:06:11 +00:00
Kp
fcb0b4fa66
Replace SDL CD_INDRIVE with equivalent that uses C++ static_cast
...
<=gcc-5 with -Wold-style-cast warn when expansions of SDL macro
CD_INDRIVE produce an old style cast, even though the cast comes from a
system header. Undefine it and define an equivalent that uses a C++
cast, so that uses do not provoke a warning.
2016-09-04 19:10:43 +00:00
Kp
a09dce6ead
Remove char[N] overload for PHYSFSX_getRealPath
2016-08-06 19:55:25 +00:00
zico
a8ed0aaa9c
Added breaks in event.cpp to prevent unwanted events if -nomouse and/or -nojoystick is given; Added automap_apply_input() to prevent multiple inputs per frame causing multiple movement applications.
2016-05-30 13:17:42 +02:00
Kp
ae722cbb8b
Shorten maybe_send_z_move
2016-04-03 17:50:42 +00:00
Kp
27cef20eb3
Move namespace dsx handling to dsx-ns.h
2016-03-19 19:08:10 +00:00
Kp
b57f08c798
Use partial_const_range
2016-02-12 04:02:28 +00:00
Kp
16c754f3a2
Split key_toggle_repeat paths at compile time
...
Every caller passes a literal truth value. Split the implementation by
the truth value. This saves loading the value before the call and
testing it inside the call.
2016-01-09 16:38:10 +00:00
Kp
dc8c0323d8
Uninline namespace dcx
2015-12-13 18:00:49 +00:00
Kp
dbe4918f27
Use inline namespace dcx for common/arch/sdl
2015-12-05 22:57:24 +00:00
Kp
6210d1008b
Add if !OGL to SDL-only functions
2015-12-04 03:36:31 +00:00
Kp
40588aaa0a
Remove unnecessary key.cpp Installed
2015-11-26 02:56:55 +00:00
Kp
dad504cfef
Fix some -Wshadow warnings
2015-11-26 02:56:54 +00:00
Kp
2e91f1ac45
Simplify event_key_get_raw
2015-11-24 04:05:36 +00:00
Kp
bca44c3199
Make keyd_repeat static
2015-11-24 04:05:35 +00:00
Kp
a40d1efcd0
Sort joystick data smallest first
2015-11-01 21:15:40 +00:00
Kp
6111e5adbf
Allow configuring max joysticks at build time
2015-11-01 21:15:40 +00:00
Kp
37bffb75dd
Use std::tuple for storing d_physical_joystick members
...
Simplify later cleanup by hiding the members behind accessors.
2015-11-01 21:15:39 +00:00
Kp
b639ba151a
Remove unused joystick globals n_axes,n_buttons,n_hats
...
These are used only in one function. Make them local only.
2015-11-01 21:15:39 +00:00
Kp
04ee450a07
Take local references to joystick text
2015-11-01 21:15:39 +00:00
Kp
78de0ac119
Add fwd-event.h with forward declarations of event.h
2015-10-09 02:46:10 +00:00
Kp
e8a4a25639
Use template alias for window_subfunction_t
2015-10-09 02:46:10 +00:00
zico
708372a148
Included compiler-range_for.h into joy.cpp to fix compiler error of undefined range_for
2015-09-29 12:02:49 +02:00
Kp
9642a4c31d
Close SDL joystick handles at shutdown
2015-09-29 02:41:22 +00:00
Kp
e5dff6d63f
Use array<> for d_physical_joystick hat_map, button_map
2015-09-29 02:41:22 +00:00
Kp
46bbdd43af
Move Joystick.n_axes, Joystick.n_buttons into local scope
2015-09-29 02:41:22 +00:00
Kp
7821af1303
Move axis values into individual joysticks
...
SDL2 allows joysticks to come and go. This conflicts with the unified
virtual joystick.
2015-09-19 23:04:35 +00:00
Kp
21be29e0d4
Optimize out button_last_state
...
This shrinks struct Joystick and makes joy_hat_handler much shorter.
2015-09-19 23:04:34 +00:00
Kp
69e3762933
Return joystick axis values by reference
2015-09-19 23:04:34 +00:00
Kp
38dc303bf8
Simplify joy_flush
2015-09-19 23:04:34 +00:00
Kp
8185991062
Ignore excess joysticks
2015-09-13 21:02:19 +00:00
Kp
17b1943c5e
Mark various per-file structures as static
2015-08-12 03:11:46 +00:00
Kp
bc7c469ab2
Use array<> for more globals
2015-08-12 03:11:46 +00:00
Kp
9bfea35e4f
Use forward-declaration header for gr.h
2015-07-25 23:10:45 +00:00
Kp
cfdffa184f
Move similar/arch/sdl/event.cpp -> common/arch/sdl/event.cpp
2015-07-18 21:01:56 +00:00
Kp
04d9f82a50
Move similar/arch/sdl/key.cpp -> common/arch/sdl/key.cpp
2015-07-18 21:01:56 +00:00
Kp
c7542fe9fc
Move similar/arch/sdl/mouse.cpp -> common/arch/sdl/mouse.cpp
2015-07-18 21:01:56 +00:00
Kp
bbcdf9f7d2
Fix LTO -Wodr for GameCfg
2015-07-18 03:49:47 +00:00
Kp
19ed586988
SDL2: SDL_JoystickName parameter changed
2015-07-14 02:42:12 +00:00
Kp
b822f4c049
Simplify joystick setup
2015-07-14 02:42:12 +00:00
Kp
c03fe30fc2
Move similar/arch/sdl/timer.cpp -> common/arch/sdl/timer.cpp
2015-07-04 21:01:17 +00:00
Kp
6792c1bc4b
Enable -Wunused-parameter
2015-04-26 20:15:56 +00:00
Kp
1f5190bcfd
Fix resource leak closing SDL RW ops
...
Leak introduced in b3d134a6b7
("merged
physfs branch"), but this fix only applies after the conversion to RAII.
An equivalent change from SDL_FreeRW->SDL_RWclose is needed for pre-RAII
code.
Fixes: d0de0cf963
("Use unique_ptr for SDL_RWops")
2015-02-28 22:34:07 +00:00
Kp
40fd988a0f
Hide local classes in anonymous namespaces
2015-01-23 03:55:06 +00:00
Kp
f7815810e8
Use RAIIPHYSFS_File to manage PHYSFS_File
...
Fixes a few leaks on error paths.
2015-01-17 18:31:42 +00:00
Kp
68d705a85a
Use bool conversion to test PHYSFS_File pointer
2015-01-17 18:31:42 +00:00
Kp
28a31a223f
Centralize window_close calls
2015-01-17 18:31:41 +00:00
Kp
9a3796d9d1
Pass window_get_next arg by &
2015-01-17 18:31:41 +00:00
Kp
3bf1fd573c
Pass window_select arg by &
2015-01-17 18:31:41 +00:00
Kp
4984f46ef4
Pass window_set_visible arg by &
2015-01-17 18:31:41 +00:00
Kp
88bc7454f5
Pass window_is_visible arg by &
2015-01-17 18:31:41 +00:00
Kp
b2a8c4502e
Pass window_set_modal arg by &
2015-01-17 18:31:41 +00:00
Kp
e7c632b741
Pass window_is_modal arg by &
2015-01-17 18:31:40 +00:00
Kp
ee50d45e72
Pass window_send_event arg by &
2015-01-17 18:31:40 +00:00
Kp
c731558a94
Pass gr_init_sub_canvas arg by &
2015-01-17 18:31:40 +00:00
Kp
c2b7990550
Pass window_get_canvas arg by &
2015-01-17 18:31:40 +00:00
Kp
f1885ee4d4
Pass creation context to new windows
2014-12-20 04:36:09 +00:00
Bradley Bell
3daa0f63b1
Add search SDL_mixer framework paths for headers instead of using <Framework/Header.h> notation
2014-12-03 15:14:18 -08:00
Kp
ef539be1ab
Pass gr_init_bitmap_data arg by &
2014-11-30 22:09:21 +00:00
Kp
a8f853aa7a
Pass d_event arg by const&
2014-10-04 22:36:13 +00:00
Kp
8750b6a4ad
Switch d_event subclasses to C++ inheritance
2014-10-04 18:05:26 +00:00
Kp
488713fe93
Propagate for variables in common/arch/sdl/rbaudio.cpp
2014-09-26 02:42:14 +00:00
Kp
e2d6174694
Propagate for variables in common/arch/sdl/joy.cpp
2014-09-26 02:42:14 +00:00
Kp
2c8a07cfa7
Use vector<uint8_t> to manage current_music_hndlbuf
2014-09-20 23:14:03 +00:00
Kp
2f7b9a7aa7
Use C++ memory management for window
2014-09-17 02:45:23 +00:00
Kp
e77f02700a
Use unique_ptr for current_music
2014-08-27 02:52:21 +00:00
Kp
4acbb40ad7
Use enum for window event result
2014-08-07 02:47:48 +00:00
Kp
5c5eb1f1f7
Let WINDOW_SEND_EVENT return a value
2014-08-05 02:34:06 +00:00
Kp
ee32a200ea
Change window_create<void> to be non-template
2014-08-05 02:33:40 +00:00
Kp
a6dcfa2e30
Simplify audio CD discovery
2014-07-22 23:48:23 +00:00
Kp
2a8e0a78c6
Use partial_range with RBAudio
2014-07-14 02:17:40 +00:00
Kp
5339c4873a
Use assignment to clear Joystick
2014-07-04 03:43:01 +00:00
zico
ad7cb106bc
Changed custom D1X license to GPLv3
2014-06-01 19:55:23 +02:00
Kp
094dfbf3d4
Reduce header inclusions
2013-12-31 03:22:03 +00:00
Kp
073f00974a
Eliminate uses of the typedef struct X { ... } X; pattern
...
C++ does not require this pattern.
import re, fileinput
to = re.compile(r'^typedef struct ([a-z_A-Z]+)\s*{')
tc = re.compile(r'^}(.*?)\s*([a-z_A-Z]+);$')
osn = None
for line in fileinput.input(inplace=True):
m = to.match(line)
if m:
osn = m.group(1)
print 'struct %s\n{' % osn
continue
if osn:
m = tc.match(line)
if m:
csn = m.group(2)
if osn == csn:
print '}%s;' % m.group(1)
osn = None
continue
else:
osn = None
print line,
2013-12-28 22:48:07 +00:00
Kp
f0bae2c8cd
Add EVENT_WINDOW_CREATED to centralize window init/deinit logic
2013-12-20 02:51:24 +00:00
Kp
779d1b95db
Defer freeing window until after EVENT_WINDOW_CLOSED
2013-12-19 03:11:56 +00:00
Kp
cea46651fc
Check type of window handler function
2013-12-15 18:51:26 +00:00
Kp
75c229c6bf
Normalize con_printf newline usage
2013-12-07 21:13:37 +00:00
Kp
74ac85076f
Store joystick button text in one allocation
2013-12-01 22:42:47 +00:00
Kp
5354d05fbf
Store joystick axis text in one allocation
2013-12-01 22:42:47 +00:00
Kp
9b167689ba
Remove unused variable joy_num_axes
2013-11-09 05:08:37 +00:00
Kp
ce929926e8
Remove duplicate warning on excess joystick axes
2013-11-08 03:14:44 +00:00
Kp
cc90678647
Move common/arch/sdl/digi_mixer_music.c -> common/arch/sdl/digi_mixer_music.cpp
2013-09-02 23:59:31 +00:00
Kp
48c1b7a321
Fix const mismatch in digi_win32_play_midi_song
2013-08-03 20:32:48 +00:00
Kp
09b1f8fab7
Move common/arch/sdl/window.c -> common/arch/sdl/window.cpp
2013-08-03 17:45:23 +00:00
Kp
97bea01c80
Move common/arch/sdl/rbaudio.c -> common/arch/sdl/rbaudio.cpp
2013-08-03 17:45:22 +00:00
Kp
9daacbdf81
Move common/arch/sdl/joy.c -> common/arch/sdl/joy.cpp
2013-08-03 17:45:22 +00:00
Kp
a05793fd84
Mark various things static
2013-07-23 02:09:12 +00:00
Kp
4577dd3977
Merge branch 'd2x-rebirth/master' into unification/master
2013-07-21 21:34:46 +00:00
Kp
a1ba420031
Mark various parameters and variables as const
2013-07-20 23:12:24 +00:00
Kp
012d8e249b
Merge branch d1x-rebirth/master into unification/master
2013-07-19 22:32:28 +00:00
Kp
410b07d5c4
Merge branch 'd1x-rebirth/master' into unification/master
...
Conflicts:
SConstruct
2013-05-05 22:08:34 +00:00
Kp
d64f605f54
Move */arch/sdl/joy.c -> common/arch/sdl/joy.c
2013-03-17 23:01:31 +00:00
Kp
c34a25e1ed
Move */arch/sdl/digi_mixer_music.c -> common/arch/sdl/digi_mixer_music.c
2013-03-17 23:01:31 +00:00
Kp
68af7a81ba
Move */arch/sdl/rbaudio.c -> common/arch/sdl/rbaudio.c
2013-03-17 23:01:30 +00:00
Kp
eb8ebe40b9
Move */arch/sdl/window.c -> common/arch/sdl/window.c
2013-03-03 01:03:33 +00:00