Merge pull request #4389 from maron2000/fixmouse

Fix mouse column limit on text mode (issue #4353)
joncampbell123 · Jul 30, 2023 · 1be510b · 1be510b
2 parents 4753f7a + b702690
commit 1be510b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -53,6 +53,7 @@ Next
   - Fix disassembly for far jmp/call decoding (cimarronm)
   - Fix memory limits on expand-down segment descriptors (cimarronm)
   - Bump tinyfiledialog to ver 3.13.3 (maron2000)
+  - Fix mouse column limit on text mode (issue #4353) (maron2000)
 2023.05.01
   - IMGMAKE will choose LBA partition types for 2GB or larger disk
     images, but the user can also use -chs and -lba options to override

diff --git a/src/ints/mouse.cpp b/src/ints/mouse.cpp
@@ -1288,6 +1288,9 @@ void Mouse_AfterNewVideoMode(bool setmode) {
             Bitu rows = IS_EGAVGA_ARCH?real_readb(BIOSMEM_SEG,BIOSMEM_NB_ROWS):24;
             if ((rows == 0) || (rows > 250)) rows = 25 - 1;
             mouse.max_y = 8*(rows+1) - 1;
+            uint16_t cols = real_readb(BIOSMEM_SEG, BIOSMEM_NB_COLS);
+            if((cols == 0) || (cols > 250)) cols = 80;
+            mouse.max_x = cols * 8 - 1;
         }
         break;
     }