Commit Graph

136 Commits

Author SHA1 Message Date
Jonathan G Rennison
51477334be SDL2: Only pass a single rectangle to SDL_UpdateWindowSurfaceRects
This is to prevent screen tearing
2020-10-05 21:35:05 +01:00
Jonathan G Rennison
1298f49be6 SDL2: Update whole window surface if >= 80% needs updating 2020-10-05 21:06:29 +01:00
Jonathan G Rennison
0bfae346c1 Allow using the hash key in hotkeys (SDL) 2020-09-21 03:52:50 +01:00
TechGeekNZ
cf8ea74733 Update: Merge branch 'jgrpp_master_cmake' into jgrpp_cmake 2020-06-28 21:56:43 +01:00
nikolas
c9aff698d0 Fix #8104: Always add WINDOW_RESIZABLE flag to SDL2 (#8211)
This fixes a bug that can reproduced with these steps:
* Start openttd in fullscreen mode
* Turn off fullscreen mode
* Try to resize the window. The window can't be resized.
2020-06-18 08:53:06 +01:00
Jonathan G Rennison
43c538fa7d Merge branch 'master' into jgrpp
# Conflicts:
#	src/town_cmd.cpp
2020-06-05 17:07:58 +01:00
TechGeekNZ
cdd2892c49 Codechange: Realign SDL driver with SDL2 driver to ease maintenance and emphasise differences. 2020-06-04 09:05:21 +01:00
Jonathan G Rennison
f8d6e781ba Merge branch 'master' into jgrpp
# Conflicts:
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs141.vcxproj.filters
#	projects/openttd_vs142.vcxproj.filters
#	src/base_consist.h
#	src/company_base.h
#	src/newgrf_config.cpp
#	src/newgrf_config.h
#	src/openttd.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/saveload/station_sl.cpp
#	src/settings.cpp
#	src/signs_base.h
#	src/string.cpp
#	src/string_func.h
#	src/table/misc_settings.ini
#	src/table/settings.h.preamble
#	src/town_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_cmd.cpp
#	src/video/cocoa/cocoa_v.mm
#	src/video/null_v.cpp
2020-05-21 22:24:01 +01:00
Michael Lutz
37bc2f8064 Codechange: Use std::string in the driver and blitter selection code. 2020-05-21 20:02:34 +02:00
Jonathan G Rennison
197a4f2e3e fcitx: Use XLookupString instead of XLookupKeysym to fix modifier keys
See: #142
2020-05-05 23:05:50 +01:00
Jonathan G Rennison
4c59dfb6b1 Fix data race during palette animation with threaded blitters 2020-04-12 00:12:58 +01:00
Jonathan G Rennison
dd99fd646d Merge branch 'master' into jgrpp
# Conflicts:
#	src/base_station_base.h
#	src/industry.h
#	src/industry_cmd.cpp
#	src/industry_gui.cpp
#	src/lang/korean.txt
#	src/os/macosx/crashlog_osx.cpp
#	src/station_cmd.cpp
#	src/town.h
#	src/town_cmd.cpp
#	src/town_gui.cpp
2020-01-20 18:36:55 +00:00
xdavidwu
8fe38afd2b Fix: [SDL2] Correct name of the video driver in debug log
SDL_GetVideoDriver(0) returns name of first video driver included in
the library, not the driver currently used.
SDL_GetCurrentVideoDriver() does what we want here.
2020-01-15 20:16:53 +00:00
Jonathan G Rennison
cbdd9f84d8 Merge branch 'master' into jgrpp
# Conflicts:
#	src/console_gui.cpp
#	src/lang/korean.txt
#	src/video/sdl2_v.cpp
#	src/video/sdl2_v.h
#	src/window.cpp
#	src/window_gui.h
2019-11-12 18:43:10 +00:00
S. D. Cloudt
13cc8a0cee Cleanup: Removed SVN headers 2019-11-10 17:59:20 +00:00
Jonathan G Rennison
a15ace0f5b Fix #7783, Fix #7816: [SDL2] Fix input handling in edit context
In particular this fixes handling of the shift key
2019-11-10 17:58:42 +00:00
Jonathan G Rennison
46f7c6a641 Change: [SDL2] Add an "unprintable" flag to struct VkMapping
SDL_Keysym::sym is not suitable for checking whether the character
is printable or not
2019-11-10 17:58:42 +00:00
Jonathan G Rennison
d41378c00a Fix: [SDL2] Page down key not handled
SDLK_PAGEUP and SDLK_PAGEDOWN are not sequential
They must have separate entries in _vk_mapping
2019-11-10 17:58:42 +00:00
Jonathan G Rennison
3db399d7d9 Fix: [SDL2] Detection of backtick scancode
SDL_Keysym::scancode is a SDL_SCANCODE_* constant, not a raw scan code
2019-11-10 17:58:42 +00:00
Jonathan G Rennison
ca3c72438e Merge branch 'master' into jgrpp
# Conflicts:
#	Makefile.bundle.in
#	src/os/macosx/string_osx.cpp
#	src/station_cmd.cpp
2019-11-06 17:49:00 +00:00
Jonathan G Rennison
daf7cf1913 Fix: SDL2: Detection of backtick scancode
SDL_Keysym::scancode is a SDL_SCANCODE_* constant, not a raw scan code
2019-11-04 22:57:55 +00:00
Jonathan G Rennison
86953e1bef Change: SDL2: Add an "unprintable" flag to struct VkMapping
SDL_Keysym::sym is not suitable for checking whether the character
is printable or not
2019-11-04 22:56:35 +00:00
Jonathan G Rennison
ab54beb3af Fix: SDL2: Page down key: SDLK_PAGEUP and SDLK_PAGEDOWN are not sequential
They must have separate entries in _vk_mapping
2019-11-04 22:56:33 +00:00
Nikolas Nyby
4884dcacba Fix #7784: up/down/home/end key behavior in SDL2
Closes #7784.
2019-11-01 23:41:47 +01:00
Jonathan G Rennison
5bf52ab736 SDL2: Fix Home and End keys not working in text editing contexts 2019-10-25 23:26:17 +01:00
Nikolas Nyby
f13b184588 Codechange: Don't use SDL_CreateRGBSurfaceWithFormat()
This function requires libSDL 2.0.5 or higher. It looks like we don't
need to use it, and can just use the original SDL_CreateRGBSurface(),
with the masks set to 0, to trigger the default 8-bit format, which is
SDL_PIXELFORMAT_INDEX8.

Closes #7785

Note: this code path is activated by using an 8-bit blitter, like:

    ./bin/openttd -b 8bpp-simple
2019-10-25 22:23:57 +01:00
Jonathan G Rennison
299becbb2f SDL2: Fix up/down keys in console window 2019-10-20 08:26:41 +01:00
Jonathan G Rennison
67a725e813 SDL2: Handle Fcitx keypresses which do not generate an SDL_KEYDOWN 2019-10-13 14:40:12 +01:00
Jonathan G Rennison
87acac9700 SDL2: Fix handling of shift key in edit context 2019-10-12 11:20:23 +01:00
Jonathan G Rennison
29ed470e04 Fcitx: Fix edge cases around text handling and setup 2019-10-12 00:39:56 +01:00
Jonathan G Rennison
24b5cb0fdb IME: Add direct support for Fcitx IME input, with SDL2 on *nix/X11. 2019-10-11 01:25:45 +01:00
Jonathan G Rennison
34a6f3c72a Fix text input when not in edit box mode, fix backtick handling 2019-10-08 02:28:09 +01:00
Jonathan G Rennison
5d1578bb7f Fix IME positioning with SDL2 2019-10-08 01:44:18 +01:00
Jonathan G Rennison
a4c677a571 Add basic IME support to SDL2 video driver 2019-10-06 01:42:06 +01:00
Jonathan G Rennison
edfd378e93 Merge branch 'master' into jgrpp
# Conflicts:
#	source.list
#	src/blitter/32bpp_anim.cpp
#	src/linkgraph/linkgraphjob.cpp
#	src/order_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_type.h
2019-10-05 21:45:54 +01:00
nikolas
2d27e8e685 Add #6173: New SDL 2 based video and sound drivers (#7086) 2019-09-19 17:18:50 +02:00