Mousewheel menu patch

[noccy]

This patch enables mousewheel scrolling over the construction, research and build menus. The code has been optimized and all the previous display glitches have been sorted.

The directions of the scrolling (currently down goes to the next page and up the previous) can easily be swapped, and with the pageswapping functions implemented as kf_-functions, adding keyboard shortcuts for them would be an easy task :)

[noccy]

The patch also fixes a tab rendering issue where more tabs would be drawn than needed. I noticed this as the last page were rendered with 7 tabs when only 1 were needed. So, bug fixed! :)

[noccy]

Scrollwheel menu patch

[Zarel]

ENDORSE WHOLEHEARTEDLY.

(Disclaimer: Not an actual endorsement; I haven't actually tested this patch yet nor reviewed it.)

[KukY]

Do you by any case have this for trunk?

[Zarel]

KukY: Apply to 2.3-branch, merge into trunk.

[KukY]

Replying to Zarel:

KukY: Apply to 2.3-branch, merge into trunk.

Even if I knew how to do that, I don't have 2.3 source on my PC.

[Zarel]

You don't know how to get 2.3 source on your PC? o_O It's the same way you get trunk; just replace "/trunk/" with "/branches/2.3/"

As for merging: ​http://google.com/search?q=svn+merge

[KukY]

I know how to get 2.3 source on my PC, but I wouldn't like to spend an additional hour getting it from SVN.

[noccy]

You can apply it to the 2.3.4 tarball, should be a quicker download :) I have an older version for trunk, but it doesn't contain all the bugfixes that are in the 2.3 patch, so I can't really recommend it for testing.

[KukY]

Replying to noccy:

You can apply it to the 2.3.4 tarball, should be a quicker download :) I have an older version for trunk, but it doesn't contain all the bugfixes that are in the 2.3 patch, so I can't really recommend it for testing.

I'm on Windows, so I can't compile the tarball. Could you by any way make a patch for trunk?

[Zarel]

Replying to KukY:

I'm on Windows, so I can't compile the tarball. Could you by any way make a patch for trunk?

...um, a tarball is effectively identical to an SVN checkout. If you can compile an SVN checkout, you can extract a tarball and compile that. :|

[KukY]

Replying to Zarel:

...um, a tarball is effectively identical to an SVN checkout. If you can compile an SVN checkout, you can extract a tarball and compile that. :|

Last time I checked, the tarball doesn't include MSVC files.

[KukY]

Very well, I got 2.3 source to my PC, but i still can't apply the patch!

[noccy]

go to the root of the extracted tarball (the folder that has src in it) and type:

patch -p0 < wz-2.3-new-scrollpatch-proper.diff

[KukY]

I don't have the tarball, I have the source from SVN.

And did I mention I'm on Windows? That looks pretty Linux-ish to me...

[noccy]

Replying to KukY:

I don't have the tarball, I have the source from SVN.

Then cd into it and do the command.

And did I mention I'm on Windows? That looks pretty Linux-ish to me...

Yeah, the patch command is available in ​msys / mingw so make sure that it's available on your systems search path.

[KukY]

I'm using MSVC, not MinGW.

[noccy]

Replying to KukY:

I'm using MSVC, not MinGW.

Then you are going to have to find a compatible patch tool :p Perhaps something at ​this page. Can't really help you any more than that.

[KukY]

I have software to apply the patches. But it says that lines from the patch don't match the lines in the file.

[noccy]

They do except for fuzzy matches as the code is changing. Gnu patch tells me it matched it a few lines above where it was found. But just increase the fuzzyness i.e. how many lines around the target line are searched for the matching text.

noccy@noccy-laptop:~/Development/src/warzone2100-2.3-svn$ patch -p0 < wz-2.3-new-scrollpatch-proper.diff 
patching file src/display.c
patching file src/keybind.c
Hunk #1 succeeded at 2819 (offset -173 lines).
patching file src/keybind.h
Hunk #1 succeeded at 247 (offset -1 lines).
patching file src/hci.c
Hunk #1 succeeded at 7279 (offset -10 lines).
patching file src/hci.h
Hunk #1 succeeded at 455 (offset -3 lines).
patching file lib/widget/form.c
noccy@noccy-laptop:~/Development/src/warzone2100-2.3-svn$ 
}}}}

[KukY]

I applied the patch manually. I'll test the feature now.

[KukY]

Yay, it works! And I like it.

I'll attach a patch for current code.

[KukY]

The patch updated for current code.

[buginator <buginator@…>]

(In [e979b6ad620f27e746f119fefd1f613bbb61b8a4]) Commit patch from ticket:2110 "Mousewheel menu patch" Author: noccy Thanks for the patch!

Format and additional changes by me.

Close ticket:2110

[buginator <buginator@…>]

In [e979b6ad620f27e746f119fefd1f613bbb61b8a4]:

Commit patch from ticket:2110 "Mousewheel menu patch"
Author: noccy
Thanks for the patch!

Format and additional changes by me.

Close ticket:2110

[buginator <buginator@…>]

(In [d0217d5d4e49c048b522bbc503395b9828cfd7e6]) Commit patch from ticket:2110 "Mousewheel menu patch" Author: noccy Thanks for the patch!

Format and additional changes by me.

Close ticket:2110 (cherry picked from commit e979b6ad620f27e746f119fefd1f613bbb61b8a4)

Conflicts:

src/keybind.c src/keybind.h

[buginator <buginator@…>]

In [d0217d5d4e49c048b522bbc503395b9828cfd7e6]:

Commit patch from ticket:2110 "Mousewheel menu patch"
Author: noccy
Thanks for the patch!

Format and additional changes by me.

Close ticket:2110
(cherry picked from commit e979b6ad620f27e746f119fefd1f613bbb61b8a4)

Conflicts:

src/keybind.c
src/keybind.h

[buginator <buginator@…>]

In [d0217d5d4e49c048b522bbc503395b9828cfd7e6]:

Commit patch from ticket:2110 "Mousewheel menu patch"
Author: noccy
Thanks for the patch!

Format and additional changes by me.

Close ticket:2110
(cherry picked from commit e979b6ad620f27e746f119fefd1f613bbb61b8a4)

Conflicts:

src/keybind.c
src/keybind.h

[buginator]

Commit patch from ticket:2110 "Mousewheel menu patch" Author: noccy Thanks for the patch!

Format and additional changes by me.

Close ticket:2110 (cherry picked from commit e979b6ad620f27e746f119fefd1f613bbb61b8a4)

Conflicts:

src/keybind.c src/keybind.h

Changeset: d0217d5d4e49c048b522bbc503395b9828cfd7e6

[buginator]

Mouse wheel scrolling in research and build menus.

Cherry-picked from the 3.0 branch, plus compilation fix.

Commit patch from ticket:2110 "Mousewheel menu patch" Author: noccy Thanks for the patch!

Format and additional changes by me.

Close ticket:2110 (cherry picked from commit e979b6ad620f27e746f119fefd1f613bbb61b8a4)

Fix missing declaration from e979b6ad620f27e746f119fefd1f613bbb61b8a4 (cherry picked from commit 55cf2a4f85dac4570aca592e165a4041c8cd0940)

• Changeset: 6a41d3f59f962800b2e0e3eba7e696f48dc46b36
• URL: ​https://github.com/Warzone2100/warzone2100/commit/6a41d3f59f962800b2e0e3eba7e696f48dc46b36