Re: [hatari-devel] Hatari screen dialog regression

[Andreas Grabher <andreas_g86@xxxxxxxxxx>]

> Am 21.08.2025 um 15:35 schrieb Eero Tamminen <oak@xxxxxxxxxxxxxx>:
> 
> Hi,
> 
> On 21.8.2025 9.27, Thomas Huth wrote:
>> Am Sat, 16 Aug 2025 07:01:35 +0200
>> schrieb Andreas Grabher <andreas_g86@xxxxxxxxxx>:
>>> Does the fact that 2.6.1 has been released mean, that my patch (which I made on your request) is ignored?
>> The patch looks fine to me! Eero, do you have any objections? Otherwise,
>> I'll commit it.
> 
> Before it's applied, I'd like to know which parts of Hatari are:
> - Used as-is
> - Modified
> - Ignored
> 
> In Previous, so that I can document both upstream[1] and downstream[2] project considerations in Hatari "coding.txt".  Andreas?
> 


All files not mentioned below are either ignored or highly modified and not synced. Only .c files mentioned. Corresponding .h files have same status.


Identical or only minor differences:
configure
cmake (dir) except for config-cmake.h due to Previous’ different components
src/cfgopts.c
src/cpu (dir) except for memory.c and hatari-glue.c, which are highly modified
src/debug (dir) except for console.c, natfeats.c, profilecpu.c, profiledsp.c symbols.c, symbols-common.c (ignored or highly modified) and debugcpu.c (modified - Hatari specific code removed)
src/falcon (dir) directory renamed to dsp; crossbar.c, microphone.c, nvram.c and videl.c ignored
src/file.c
src/gui-osx/paths.m
src/gui-sdl/CMakeLists.txt
src/gui-sdl/dlgAlert.c
src/gui-sdl/dlgFileSelect.c
src/gui-sdl/font10x16.bmp
src/gui-sdl/font10x16.h
src/gui-sdl/font5x8.bmp
src/gui-sdl/font5x8.h
src/gui-sdl/sdlgui.c
src/gui-win (dir)
src/paths.c (just some renaming Hatari -> Previous of externally visible strings/paths)
src/str.c (identical down to Str_UnEscape, rest is ignored)
src/unzip.c
src/zip.c


Modified:
CMakeLists.txt (Previous has additional components and still some C++ code, although I translated most of it to C recently)
src/change.c (Previous has different options)
src/CMakeLists.txt (same as CMakeLists.txt)
src/configuration.c (same as src/change.c)
src/dialog.c (Previous adds dialogs that prompt user for files not found)
src/gui-sdl/dlgKeyboard.c (shortcut selection mostly identical, other things differ heavily)
src/gui-sdl/dlgMain.c (different dialogs, but same structure)
src/shortcut.c (different shortcuts, but same logic)
src/statusbar.c (different indicators, but mostly same logic)

> 
> Andreas, how you're developing Previous and keeping track of Hatari if you're not using Git?
> 
> Git would make it much easier to manage changes on top of Hatari code, without that code needing to be split into separate files.
> 
> As long as your changes are not within couple of lines of Hatari changes, updating to new Hatari version would be just:
> * Updating your tracking branch for upstream Hatari, e.g.:
>  git checkout upstream && git pull
> * Rebasing your own changes on top of the updated Hatari sources:
>  git checkout main && git rebase upstream
> 
> (Pull will always succeed, but rebase operation can ask resolve of conflicts if branches have different changes to same place in code.)

I download the diffs and add them using patch. Most commits are not relevant for Previous. So I pre-select what I need.
> 
> 
> 	- Eero
>