From 0c19ad0b8256d32665567e0aab5c246d80f7f497 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Tue, 19 Oct 2021 19:36:31 +0300 Subject: [PATCH 54/54] gtk3x: Replace GDK_MOD1_MASK with GDK_ALT_MASK It's renamed in gtk-3.98.3 See osdn #43078 Signed-off-by: Marko Lindqvist --- client/gui-gtk-4.0/editgui.c | 2 +- client/gui-gtk-4.0/gtkcompat.h | 2 ++ client/gui-gtk-4.0/mapctrl.c | 6 +++--- client/gui-gtk-4.0/menu.c | 4 ++-- client/gui-gtk-4.0/wldlg.c | 4 ++-- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/client/gui-gtk-4.0/editgui.c b/client/gui-gtk-4.0/editgui.c index 9fc12d34b7..353ee1ca09 100644 --- a/client/gui-gtk-4.0/editgui.c +++ b/client/gui-gtk-4.0/editgui.c @@ -907,7 +907,7 @@ static int convert_modifiers(int gdk_event_state) if (gdk_event_state & GDK_CONTROL_MASK) { modifiers |= EKM_CTRL; } - if (gdk_event_state & GDK_MOD1_MASK) { + if (gdk_event_state & GDK_ALT_MASK) { modifiers |= EKM_ALT; } diff --git a/client/gui-gtk-4.0/gtkcompat.h b/client/gui-gtk-4.0/gtkcompat.h index 4e17fe0964..6486f81b5c 100644 --- a/client/gui-gtk-4.0/gtkcompat.h +++ b/client/gui-gtk-4.0/gtkcompat.h @@ -47,6 +47,8 @@ GdkScrollDirection gdk_scroll_event_get_direction(GdkEvent *ev); #if !GTK_CHECK_VERSION(3,98,3) /* Compatibility mode */ +#define GDK_ALT_MASK GDK_MOD1_MASK + void gtk_scrolled_window_set_has_frame(GtkScrolledWindow *wnd, bool shadow); #endif /* GTK version < 3.98.3 */ diff --git a/client/gui-gtk-4.0/mapctrl.c b/client/gui-gtk-4.0/mapctrl.c index 22bc4618fa..b0ad38c0a2 100644 --- a/client/gui-gtk-4.0/mapctrl.c +++ b/client/gui-gtk-4.0/mapctrl.c @@ -220,7 +220,7 @@ gboolean butt_down_mapcanvas(GtkWidget *w, GdkEvent *ev, gpointer data) } else if (ptile && (state & GDK_SHIFT_MASK)) { /* + LMB: Append focus unit. */ action_button_pressed(e_x, e_y, SELECT_APPEND); - } else if (ptile && (state & GDK_MOD1_MASK)) { + } else if (ptile && (state & GDK_ALT_MASK)) { /* + LMB: popit (same as middle-click) */ /* FIXME: we need a general mechanism for letting freeciv work with * 1- or 2-button mice. */ @@ -253,10 +253,10 @@ gboolean butt_down_mapcanvas(GtkWidget *w, GdkEvent *ev, gpointer data) /* + + RMB : insert city or tile chat link. */ /* + + + RMB : insert unit chat link. */ - if (ptile && (state & GDK_MOD1_MASK) + if (ptile && (state & GDK_ALT_MASK) && (state & GDK_CONTROL_MASK)) { inputline_make_chat_link(ptile, (state & GDK_SHIFT_MASK) != 0); - } else if ((state & GDK_SHIFT_MASK) && (state & GDK_MOD1_MASK)) { + } else if ((state & GDK_SHIFT_MASK) && (state & GDK_ALT_MASK)) { /* + + RMB : Show/hide workers. */ key_city_overlay(e_x, e_y); } else if ((state & GDK_SHIFT_MASK) && (state & GDK_CONTROL_MASK) diff --git a/client/gui-gtk-4.0/menu.c b/client/gui-gtk-4.0/menu.c index b7ba971690..2baf9e0ba7 100644 --- a/client/gui-gtk-4.0/menu.c +++ b/client/gui-gtk-4.0/menu.c @@ -271,7 +271,7 @@ static struct menu_entry_info menu_entries[] = { "SAVE_OPTIONS", N_("Save Options _Now"), 0, 0, G_CALLBACK(save_options_callback), MGROUP_SAFE }, { "RELOAD_TILESET", N_("_Reload Tileset"), - GDK_KEY_r, GDK_MOD1_MASK | GDK_CONTROL_MASK, + GDK_KEY_r, GDK_ALT_MASK | GDK_CONTROL_MASK, G_CALLBACK(reload_tileset_callback), MGROUP_SAFE }, { "GAME_SAVE", N_("_Save Game"), GDK_KEY_s, GDK_CONTROL_MASK, G_CALLBACK(save_game_callback), MGROUP_SAFE }, @@ -416,7 +416,7 @@ static struct menu_entry_info menu_entries[] = G_CALLBACK(show_focus_unit_callback), MGROUP_SAFE }, { "SHOW_FOG_OF_WAR", N_("Fog of _War"), 0, 0, G_CALLBACK(show_fog_of_war_callback), MGROUP_SAFE }, - { "FULL_SCREEN", N_("_Fullscreen"), GDK_KEY_Return, GDK_MOD1_MASK, + { "FULL_SCREEN", N_("_Fullscreen"), GDK_KEY_Return, GDK_ALT_MASK, G_CALLBACK(full_screen_callback), MGROUP_SAFE }, { "RECALC_BORDERS", N_("Recalculate _Borders"), 0, 0, diff --git a/client/gui-gtk-4.0/wldlg.c b/client/gui-gtk-4.0/wldlg.c index 4508339292..94a66fb40a 100644 --- a/client/gui-gtk-4.0/wldlg.c +++ b/client/gui-gtk-4.0/wldlg.c @@ -851,11 +851,11 @@ static gboolean dst_key_press_callback(GtkWidget *w, GdkEvent *ev, } return TRUE; - } else if ((state & GDK_MOD1_MASK) && keyval == GDK_KEY_Up) { + } else if ((state & GDK_ALT_MASK) && keyval == GDK_KEY_Up) { queue_bubble_up(ptr); return TRUE; - } else if ((state & GDK_MOD1_MASK) && keyval == GDK_KEY_Down) { + } else if ((state & GDK_ALT_MASK) && keyval == GDK_KEY_Down) { queue_bubble_down(ptr); return TRUE; -- 2.33.0