Project

General

Profile

Actions
Copy link

Bug #1489

open

handle_edit_key_press() not directing Mac Meta -combinations to main key handler

Added by Marko Lindqvist 9 days ago. Updated 4 days ago.

Status:
In Progress
Priority:
Blocker
Assignee:
Dean Brown
Category:
gtk3.22-client
Target version:
3.1.6
Start date:
06/07/2025
Due date:
% Done:

0%

Estimated time:

Description

The code in question was already mentioned in https://redmine.freeciv.org/issues/1292#note-9 where my concern was dismissed, but I still (or again) think it needs changing. Otherwise Mac does not make early exit (with return FALSE) when Meta is being held.

This is a regression since 3.1.5 and 3.2.0-beta2.

Files

Download all files
editor_ctrl_keys.png (11.9 KB) editor_ctrl_keys.png Marko Lindqvist, 06/07/2025 02:42 AM
1489-S3_1+S3_2.patch (4.65 KB) 1489-S3_1+S3_2.patch Dean Brown, 06/08/2025 04:21 AM
1489-S3_3+Main.patch (11.7 KB) 1489-S3_3+Main.patch Dean Brown, 06/08/2025 04:21 AM

Related issues 1 (1 open — 0 closed)

Blocks Tasks #1309: Release 3.2.0-RC1NewMarko Lindqvist04/19/2025

Actions
Actions
Copy link
 #1

Updated by Marko Lindqvist 9 days ago

Related part of documentation from the keys spreadsheet.

Actions
Copy link
 #2

Updated by Marko Lindqvist 9 days ago

Actions
Copy link
 #3

Updated by Marko Lindqvist 9 days ago

  • Priority changed from Normal to Blocker

Marko Lindqvist wrote:

This is a regression since 3.1.5 and 3.2.0-beta2.

Setting priority accordingly.

Actions
Copy link Download all files
 #4

Updated by Dean Brown 8 days ago

Good catch. Fix in editgui.c means 2 files need the macro for platform specific menu accelerator modifier keys, so I moved it to gui_main.h

Actions
Copy link
 #5

Updated by Marko Lindqvist 6 days ago

S3_3/main patch adds a file called 1489-S3_1+S3_2.patch

1489-S3_1+S3_2.patch | 143 +++++++++++++++++++++++++++++++
...
diff --git a/1489-S3_1+S3_2.patch b/1489-S3_1+S3_2.patch
new file mode 100644
index 0000000000..fd609b4d59
--- /dev/null
+++ b/1489-S3_1+S3_2.patch
...

Actions
Copy link
 #6

Updated by Marko Lindqvist 6 days ago

Maybe also try to write more standard form commit messages, so it would be less work to rewrite them before applying them to my work tree. Currently you have just a very long subject line. Make that shorter than 70 characters, and write the longer story to the body of the message (after one empty line). Subject line should also be in imperative form, optionally prefixed by the "location" of the change, e.g., "gtk: " or "handle_edit_key_press(): "

See 'git log' for examples.

Actions
Copy link
 #7

Updated by Marko Lindqvist 4 days ago

  • Status changed from New to In Progress
  • Assignee set to Dean Brown
Actions
Copy link

Also available in: Atom PDF