751 Commits

Author SHA1 Message Date
Alex/AT
06dd860abf Merge branch 'master' of https://github.com/joncampbell123/dosbox-x into xbrz
# Resolved conflicts:
#	src/gui/sdlmain.cpp
2018-06-28 21:06:13 +03:00
Alex/AT
49eae51949 - Add forgotten conditional, we don't need this code for non-xBRZ runs 2018-06-28 19:11:58 +03:00
Alex/AT
b0b406d8e5 - OUTPUT: Fix aspect ratio correction for Direct3D and OpenGL output modes, fix default window sizing for aspect correction, fix 'jumpy' behavior during window resizing with aspect ratio correction
- OUTPUT: Offload aspect ratio correction for Direct3D and OpenGL output modes from render code (these modes do it themselves)
- xBRZ: Also offload it when xBRZ scaler is enabled (xBRZ does not like line duplication and can do correction itself)
- OUTPUT: Store source aspect ratio translation parameters under 'sdl' structure, this may be used eventually for non-square pixel monitors aspect ratio correction
- xBRZ: Make sure xBRZ scaler honors aspect ratio correction flag in 'surface' mode of operation and controls aspect ratio correction offload when enabling/disabling itself
- xBRZ: Factor out scaling factor setup into its own function
- xBRZ: Fix up duplicated code path breaking 'surface' output
- MAIN: Split 'overlay' mode defaulting from primary 'if' set, making it simply choosing D3D/OGL/surface before primary 'if' goes
- DOC: README.xbrz
- DOC: clarify that SDL structure is initialized to zero in code comment, initialize defaults after memset()
2018-06-28 18:58:15 +03:00
Jonathan Campbell
ded9792844 Limit some code to Win32 only in Aybe synced mouse code so compilation in Linux works again 2018-06-27 20:26:57 -07:00
Aybe
93d4d06aff Notification is played on mouse click and lost focus. 2018-06-28 04:38:27 +02:00
Aybe
d9b7329f6f Beep is now the default notification. 2018-06-28 04:29:18 +02:00
Aybe
75db2a5001 Forgot to add notification call. 2018-06-28 04:29:07 +02:00
Aybe
ae1557f09a Moved notification to own method. 2018-06-28 04:22:58 +02:00
Aybe
354ac196ca Implemented autolock feedback. 2018-06-28 03:42:08 +02:00
Aybe
bf447aa215 Setting autolock to false by default !!! 2018-06-28 03:41:44 +02:00
Aybe
5152c6bb4b No more two cursors visible at the same time ...
but regular one still visible when mouse is not in use, because it was really poor UX as user couldn't know where mouse is beside moving away from window, i.e. to reach the menu bar.
2018-06-28 01:52:41 +02:00
Aybe
9b8b3b6543 Added a guard. 2018-06-28 00:58:18 +02:00
Aybe
6ad364c20f Implemented mouse detection when outside window.
This fixes too fast away moves to still be registered.
2018-06-27 23:51:34 +02:00
Aybe
feeddf0671 Now conditionally compiles 2018-06-27 01:29:00 +02:00
Aybe
d37fc2450b Synced movement is now implicit when not autolocked. 2018-06-26 21:09:30 +02:00
Aybe
e1ca1d85f7 Removing synced from config (automatic now) 2018-06-26 21:04:48 +02:00
Jonathan Campbell
0ba25f2771 Merge branch 'develop' into xbrz 2018-06-26 07:42:06 -07:00
Jonathan Campbell
78d5807046 Always show cursor (Aybe debug) only if synced=true 2018-06-26 07:31:25 -07:00
Jonathan Campbell
5033bb9826 synced=false default 2018-06-26 07:29:55 -07:00
Aybe
569641c2d8 DEBUG always show cursor TODO remove 2018-06-26 05:46:59 +02:00
Aybe
12350322f5 Added 'synced' to [sdl] and exposed it 2018-06-26 05:46:07 +02:00
Jonathan Campbell
eea85d1881 IBM PC/AT BIOS starup hack for EGA/VGA modes 2018-06-20 01:22:52 -07:00
Jonathan Campbell
b4ccfbab14 track if custom BIOS loaded. If custom BIOS, then RESET signal handler should not carry out reset vector handling 2018-06-20 01:02:46 -07:00
Jonathan Campbell
ce3514b02b Add code to BOOT command to support booting and running a ROM BIOS image 2018-06-19 23:05:32 -07:00
Aybe
e0ad5141ea Invoke num lock helper when window is activated. 2018-06-16 04:15:57 +02:00
Aybe
eab3c1b130 Set flag for BIOS initialization. 2018-06-16 04:14:45 +02:00
Aybe
c6893afdd3 Remove toggler at initialization. 2018-06-16 04:14:14 +02:00
Aybe
0cbe7a7d39 Added missing parenthesis. 2018-06-15 22:21:53 +02:00
Aybe
1e80498419
Merge branch 'xbrz' into xbrz 2018-06-15 22:12:40 +02:00
Aybe
42b4fb1e23 Fixed code that was called when no devices were present 2018-06-14 20:36:35 +02:00
Jonathan Campbell
dfe655d3aa correct OpenGL call param 2018-06-03 13:06:49 -07:00
Jonathan Campbell
070909b956 ptrop self test 2018-06-03 12:19:58 -07:00
Jonathan Campbell
e3f7f26fd5 ptrop move into header 2018-06-03 12:17:44 -07:00
Jonathan Campbell
a1421eaf34 ptr align ops 2018-06-03 12:16:44 -07:00
Jonathan Campbell
3cee8815c0 -Wsign-conversion fixup 2018-06-03 09:40:23 -07:00
Jonathan Campbell
8cf1c36c74 -Wsign-conversion fixup 2018-06-03 02:39:03 -07:00
Alex/AT
9298d7494e [+] xBRZ: add Direct3D and OpenGL output support (improves performance offloading final 'fit to screen' scaling step to GPU, also, Direct3D shaders can be combined with xBRZ now allowing to have more fun)
[+] xBRZ: add scaling factor options (max / fixed)
[+] xBRZ: add pitch change routine (used to fit xBRZ result into D3D texture)
[*] xBRZ: move all of the sdlmain configuration and global volatiles for xBRZ into sdl.xBRZ structure, cleaning up the mess
[*] xBRZ: split xBRZ scale render routine into separate procedure
[*] xBRZ: fix render structure (missing element)
[*] xBRZ: disable doublescanning if xBRZ enabled (breaks scaling)
[-] xBRZ: remove surface format checking, no point in it,  format conversion will have to be added if necessary somewhere
2018-06-02 16:35:48 +03:00
Aybe
969f31bef3 Fixed non-existing method (this is likely incorrect but at least builds) 2018-06-01 20:38:51 +02:00
Alex/AT
64a78e246c [+] xBRZ scaler integration 2018-06-01 20:02:42 +03:00
Jonathan Campbell
1335ac8ce6 more 2018-05-30 18:42:04 -07:00
Jonathan Campbell
bde1591609 namespace it 2018-05-30 18:36:40 -07:00
Jonathan Campbell
70da538a09 bitlength constexpr 2018-05-30 18:28:25 -07:00
Jonathan Campbell
a7f9e9239f more 2018-05-30 18:05:04 -07:00
Jonathan Campbell
8e038b07d5 more 2018-05-30 18:03:32 -07:00
Jonathan Campbell
8929cca70b change to negation to shut up VS2017 about integer overflow 2018-05-30 17:18:17 -07:00
Jonathan Campbell
347dd59e2d try this 2018-05-30 17:17:08 -07:00
Jonathan Campbell
de74e69926 take that 2018-05-30 17:15:47 -07:00
Jonathan Campbell
fa73308193 more 2018-05-30 17:06:30 -07:00
Jonathan Campbell
e8e63b3522 more 2018-05-30 16:38:49 -07:00
Jonathan Campbell
929a87b2c0 more 2018-05-30 16:32:49 -07:00