Keyboard shortcuts for track construction #5200

JoelTroch · 2017-02-09T21:53:53Z

This PR add some keyboard shortcuts for track construction (especially for custom designs). I tried my best to optimize and have a clean code as much as possible.

Related issue: #1730

marijnvdwerf · 2017-02-09T21:56:27Z

src/openrct2/interface/keyboard_shortcut.c

+	if (gScreenFlags & SCREEN_FLAGS_TITLE_DEMO)
+		return;
+
+	rct_window * w = window_find_by_class(WC_RIDE_CONSTRUCTION);


I'd rather see this code in the construction window file.

(Reason being that the widgets[9] etc is difficult to maintain)

You mean move the whole code to src/openrct2/windows/ride_construction.c ?

JoelTroch · 2017-02-10T14:21:30Z

I have refactored the "turn left" keyboard shortcut, can you please tell me if it's better that way ? If it's good then I'll do the same for the rest

marijnvdwerf · 2017-02-10T15:33:59Z

src/openrct2/ride/track.h

@@ -537,4 +537,6 @@ void game_command_remove_track(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *ed
 void game_command_set_maze_track(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp);
 void game_command_set_brakes_speed(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp);

+void window_ride_construction_keyboard_shortcut_turn_left();


This should be in window.h

marijnvdwerf · 2017-02-10T15:34:38Z

src/openrct2/windows/ride_construction.c

+		return;
+	}
+
+	switch (_currentTrackCurve) {


Indentation of the switch cases is inconsistent.

marijnvdwerf · 2017-02-10T15:38:37Z

Made a few style-related comments.

@IntelOrca Can you go over window_ride_construction_keyboard_shortcut_turn_left implementation-wise?

JoelTroch · 2017-02-10T15:57:07Z

Methods declaration moved from track.h to window.h and fixed the bad coding style for switch statements.

I'm doing the rest while waiting for @IntelOrca 's review implementation-wise.

Nubbie · 2017-02-12T17:57:28Z

Maybe could squash them all together in the end and insert a 'Fix: XXXX'? :p

JoelTroch · 2017-02-12T20:41:22Z

@Nubbie Commits have been squashed ^^

Broxzier · 2017-02-17T11:35:42Z

My laptop has a Numpad that I have disabled most of the time, with some of the keys having double meaning (8/up, 4/left, 6/right, 2/down, 7/home, 9/page up, 1/end, 3/page down), but this doesn't take into account whether I have Numpad enabled or disabled. With Numpad enabled I expect Num 9 to act only as Num 9, and with Numpad disabled I expect it to act only act as the page up key (in my case of course).

JoelTroch · 2017-02-17T13:59:56Z

If I understood correctly, you want "Keypad 8" (I'm using the term "Keypad" because that's how SDL2 call them) and "Page Up" to act the same ?

Broxzier · 2017-02-17T14:11:24Z

@JoelTroch No, exactly the opposite.

In other applications when I have Numpad disabled (Numlock off), Keypad 9 acts like Page Up, and when Numpad is enabled, it acts as "Keypad 9" (In a text editor, it would either scroll up, or write down the "9").
In OpenRCT2 however, it always acts as if Numpad is disabled, and zooms out when I press "Keypad 9", even when Numpad is enabled.

This issue has probably been here before this PR too, I just only found out about it now.

marijnvdwerf · 2017-02-17T14:12:38Z

This issue should probably get solved by #3908. Unfortunately that PR is rather stuck.

JoelTroch · 2017-02-17T14:17:33Z

@Broxzier I see what you mean, I have the same layout as you.

After a very quick Google search, it might be related to Unicode input but someone more expert with input stuff should confirm or deny my sentence.

janisozaur · 2017-02-27T22:15:02Z

What's the status of this?

JoelTroch · 2017-02-27T22:27:21Z

It can be merged whenever the main OpenRCT2 developers desire to do so.

About the issue mentioned by @Broxzier , this isn't in the scope of this PR but @marijnvdwerf mentioned that #3908 could fix it if it's rebased and free of merge conflicts.

janisozaur · 2017-02-27T22:42:46Z

@JoelTroch can you rebase?

JoelTroch · 2017-02-27T23:15:43Z

@janisozaur Done ^^

Gymnasiast · 2017-02-28T09:47:19Z

contributors.md

@@ -55,6 +55,7 @@ Includes all git commit authors. Aliases are GitHub user names.
 * Niels NTG Poldervaart (Niels-NTG) - Misc.
 * (zaxcav) - Improvements to original pathfinding algorithm.
 * Hielke Morsink (Broxzier) - Tile inspector, misc.
+* Joël Troch (Shepard62FR) - Keyboard shortcuts for ride construction.


Your Github username is JoelTroch, not Shepard62FR.

Gymnasiast · 2017-02-28T09:49:54Z

distribution/changelog.txt

@@ -1,5 +1,6 @@
 0.0.7 (in development)
 ------------------------------------------------------------------------
+- Feature: [#1730] Add keyboard shortcuts for track construction.


- Feature: [#1730] Keyboard shortcuts for track construction.

JoelTroch · 2017-02-28T09:56:49Z

Requested changes applied

janisozaur · 2017-03-02T22:13:48Z

@Gymnasiast I looked briefly at the code and it looked simple enough for me not to expect any bugs in there. There was still a misindented line or two there. I trust your judgement.

JoelTroch · 2017-03-02T22:22:35Z

@janisozaur I fixed one of the misaligned line, let me know if there are more.

UPDATE : Removed trailing whitespaces

marijnvdwerf reviewed Feb 9, 2017

View reviewed changes

JoelTroch force-pushed the keyboard-track-construct branch from ca74879 to 28a33e6 Compare February 10, 2017 14:19

marijnvdwerf reviewed Feb 10, 2017

View reviewed changes

JoelTroch force-pushed the keyboard-track-construct branch from 7f76a96 to 0b4b372 Compare February 12, 2017 20:40

JoelTroch force-pushed the keyboard-track-construct branch 2 times, most recently from 9c3d4d3 to 952e34f Compare February 15, 2017 23:30

JoelTroch force-pushed the keyboard-track-construct branch from 952e34f to e5b7cba Compare February 17, 2017 15:57

JoelTroch force-pushed the keyboard-track-construct branch from e5b7cba to fe93ae6 Compare February 25, 2017 15:31

janisozaur added pending rebase PR needs to be rebased. pending review testing required PR needs to be tested before it is merged. labels Feb 27, 2017

JoelTroch force-pushed the keyboard-track-construct branch from fe93ae6 to 47ef32e Compare February 27, 2017 23:14

janisozaur removed the pending rebase PR needs to be rebased. label Feb 28, 2017

JoelTroch force-pushed the keyboard-track-construct branch from 47ef32e to e944b0d Compare February 28, 2017 09:41

Gymnasiast requested changes Feb 28, 2017

View reviewed changes

JoelTroch force-pushed the keyboard-track-construct branch from e944b0d to b77b137 Compare February 28, 2017 09:56

Gymnasiast approved these changes Feb 28, 2017

View reviewed changes

JoelTroch force-pushed the keyboard-track-construct branch 2 times, most recently from 1fcbde5 to e4c01f4 Compare March 2, 2017 22:09

JoelTroch force-pushed the keyboard-track-construct branch from e4c01f4 to d3e3240 Compare March 2, 2017 22:21

Fix #1730: Add keyboard shortcuts for track construction

bb89ebb

JoelTroch force-pushed the keyboard-track-construct branch from d3e3240 to bb89ebb Compare March 2, 2017 22:27

Gymnasiast merged commit 8167ff9 into OpenRCT2:develop Mar 3, 2017

This was referenced Mar 3, 2017

Strings 6018-6029 OpenRCT2/Localisation#1021

Closed

Keyboard shortcuts window isn't large enough (for some languages) #5271

Closed

JoelTroch deleted the keyboard-track-construct branch April 2, 2020 06:51

JoelTroch mentioned this pull request Aug 18, 2021

fr-FR: stepping down as maintainer OpenRCT2/Localisation#2211

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Keyboard shortcuts for track construction #5200

Keyboard shortcuts for track construction #5200

JoelTroch commented Feb 9, 2017

marijnvdwerf Feb 9, 2017

marijnvdwerf Feb 9, 2017

JoelTroch Feb 9, 2017

JoelTroch commented Feb 10, 2017

marijnvdwerf Feb 10, 2017

marijnvdwerf Feb 10, 2017

marijnvdwerf commented Feb 10, 2017

JoelTroch commented Feb 10, 2017

Nubbie commented Feb 12, 2017

JoelTroch commented Feb 12, 2017

Broxzier commented Feb 17, 2017

JoelTroch commented Feb 17, 2017

Broxzier commented Feb 17, 2017

marijnvdwerf commented Feb 17, 2017

JoelTroch commented Feb 17, 2017

janisozaur commented Feb 27, 2017

JoelTroch commented Feb 27, 2017

janisozaur commented Feb 27, 2017

JoelTroch commented Feb 27, 2017

Gymnasiast Feb 28, 2017

Gymnasiast Feb 28, 2017

JoelTroch commented Feb 28, 2017

janisozaur commented Mar 2, 2017

JoelTroch commented Mar 2, 2017 •

edited

Loading

Keyboard shortcuts for track construction #5200

Keyboard shortcuts for track construction #5200

Conversation

JoelTroch commented Feb 9, 2017

marijnvdwerf Feb 9, 2017

Choose a reason for hiding this comment

marijnvdwerf Feb 9, 2017

Choose a reason for hiding this comment

JoelTroch Feb 9, 2017

Choose a reason for hiding this comment

JoelTroch commented Feb 10, 2017

marijnvdwerf Feb 10, 2017

Choose a reason for hiding this comment

marijnvdwerf Feb 10, 2017

Choose a reason for hiding this comment

marijnvdwerf commented Feb 10, 2017

JoelTroch commented Feb 10, 2017

Nubbie commented Feb 12, 2017

JoelTroch commented Feb 12, 2017

Broxzier commented Feb 17, 2017

JoelTroch commented Feb 17, 2017

Broxzier commented Feb 17, 2017

marijnvdwerf commented Feb 17, 2017

JoelTroch commented Feb 17, 2017

janisozaur commented Feb 27, 2017

JoelTroch commented Feb 27, 2017

janisozaur commented Feb 27, 2017

JoelTroch commented Feb 27, 2017

Gymnasiast Feb 28, 2017

Choose a reason for hiding this comment

Gymnasiast Feb 28, 2017

Choose a reason for hiding this comment

JoelTroch commented Feb 28, 2017

janisozaur commented Mar 2, 2017

JoelTroch commented Mar 2, 2017 • edited Loading

JoelTroch commented Mar 2, 2017 •

edited

Loading