update doc

BUILD.md

@@ -202,14 +202,14 @@ Libraries used by DOSBox-X
 
 The following libraries are used by DOSBox-X:
 
-* SDL 1.2.x or SDL 2.0.x
+* SDL 1.2.x or SDL 2.x (in-tree)
 
     The Simple DirectMedia Library available at https://www.libsdl.org
 
     The SDL1 library distributed with DOSBox-X had been heavily modified
     from the original to support for example native OS menus.
 
-    Note that only version 1.2.x (SDL1 version) and version 2.0.x
+    Note that only version 1.2.x (SDL1 version) and version 2.x
     (SDL2 version) are currently supported.
 
     License: LGPLv2+
@@ -224,7 +224,7 @@ The following libraries are used by DOSBox-X:
 
     License: Public Domain
 
-* Libpng (optional)
+* Libpng (in-tree; optional)
 
     Needed for the screenshots.
 
@@ -234,7 +234,7 @@ The following libraries are used by DOSBox-X:
 
     License: zlib/libpng
 
-* Zlib
+* Zlib (in-tree)
 
     Needed by libpng, and for save-state and CHD support.
 
@@ -244,7 +244,7 @@ The following libraries are used by DOSBox-X:
 
     License: zlib
 
-* FreeType (optional)
+* FreeType (in-tree; optional)
 
     Needed for TrueType font (TTF) output and printing support.
 
@@ -278,15 +278,15 @@ The following libraries are used by DOSBox-X:
 
     License: Modified 4-clause BSD license
 
-* SDL_Net (optional)
+* SDL_Net (in-tree; optional)
 
     For Modem/IPX support.
 
     Get it from https://www.libsdl.org/projects/SDL_net/release-1.2.html
 
     License: LGPLv2+
 
-* SDL_Sound (optional)
+* SDL_Sound (in-tree; optional)
 
     For compressed audio on diskimages (cue sheets) support.
 

CHANGELOG

@@ -19,15 +19,16 @@
     the IDE CD-ROM device. (rderooy & psyraven)
   - Fixed problem when inputting characters with call
     INT21/AH=3Fh in PC-98 mode. (nanshiki)
-  - Fixed hang on zip-mounted drives. (tbr)
+  - Fixed hang on zip-mounted drives and minor bug on
+    the DOS file-read code. (tbr)
   - Fixed file copying problem with Windows 9x install
     at the end of the DOS-based Setup. (Wengier)
   - Fixed command like "IF NOT EXIST D:\NUL ..." not
     working if the drive does not exist. (Wengier)
   - Fixed that pasting text from clipboard via mouse
     may not work properly in some cases. (Wengier)
   - Fixed the mouse scrolling wheel not working with
-    "CTMOUSE /O" in guest DOS. (Wengier)
+    CTMOUSE 2.1's "CTMOUSE /O" in guest DOS. (Wengier)
   - Fixed window transparency setting not working in
     macOS SDL1 build. (Wengier)
   - Fixed macOS small display issue with the in-tree

src/gui/sdlmain.cpp

@@ -5085,7 +5085,7 @@ void SetIMPosition() {
         last_ticks = GetTicks();
         im_x = x;
         im_y = y;
-#if defined(LINUX)
+#if defined(LINUX) || defined(MACOSX)
         y++;
 #endif
         uint8_t height = IS_PC98_ARCH?16:real_readb(BIOSMEM_SEG, BIOSMEM_CHAR_HEIGHT);

vs/sdl2/src/video/cocoa/SDL_cocoawindow.m

@@ -1647,7 +1647,7 @@ - (BOOL)acceptsFirstMouse:(NSEvent *)theEvent
         /* Hack to fix origin on Mac OS X 10.4
            This is no longer needed as of Mac OS X 10.15, according to bug 4822.
          */
-        if (floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_14) {
+        if (floor(NSAppKitVersionNumber) <= 1671) { // NSAppKitVersionNumber10_14 = 1671
             NSRect screenRect = [[nswindow screen] frame];
             if (screenRect.size.height >= 1.0f) {
                 rect.origin.y += (screenRect.size.height - rect.size.height);