From 1b88cd5ee8510e90e69f885bfd730ce57621781c Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 4 May 2024 03:11:49 +0200 Subject: Adding upstream version 3:4.8.31. Signed-off-by: Daniel Baumann --- lib/widget/Makefile.in | 2 +- lib/widget/background.c | 2 +- lib/widget/button.c | 2 +- lib/widget/buttonbar.c | 2 +- lib/widget/check.c | 2 +- lib/widget/dialog-switch.c | 2 +- lib/widget/dialog.c | 21 ++++++++++++++------- lib/widget/frame.c | 2 +- lib/widget/gauge.c | 2 +- lib/widget/group.c | 2 +- lib/widget/groupbox.c | 2 +- lib/widget/history.c | 2 +- lib/widget/hline.c | 2 +- lib/widget/input.c | 2 +- lib/widget/input_complete.c | 7 ++----- lib/widget/label.c | 2 +- lib/widget/listbox-window.c | 2 +- lib/widget/listbox.c | 2 +- lib/widget/menu.c | 33 ++++++++++++++++++++------------- lib/widget/mouse.c | 2 +- lib/widget/quick.c | 2 +- lib/widget/radio.c | 2 +- lib/widget/rect.c | 2 +- lib/widget/widget-common.c | 2 +- lib/widget/wtools.c | 2 +- 25 files changed, 58 insertions(+), 47 deletions(-) (limited to 'lib/widget') diff --git a/lib/widget/Makefile.in b/lib/widget/Makefile.in index 9353dec..85b2493 100644 --- a/lib/widget/Makefile.in +++ b/lib/widget/Makefile.in @@ -134,7 +134,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/lib/widget/background.c b/lib/widget/background.c index 1965dee..afea825 100644 --- a/lib/widget/background.c +++ b/lib/widget/background.c @@ -1,7 +1,7 @@ /* Widgets for the Midnight Commander - Copyright (C) 2020-2023 + Copyright (C) 2020-2024 The Free Software Foundation, Inc. Authors: diff --git a/lib/widget/button.c b/lib/widget/button.c index 9f0bfa5..2cdaafc 100644 --- a/lib/widget/button.c +++ b/lib/widget/button.c @@ -1,7 +1,7 @@ /* Widgets for the Midnight Commander - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Authors: diff --git a/lib/widget/buttonbar.c b/lib/widget/buttonbar.c index 4522000..24e4f75 100644 --- a/lib/widget/buttonbar.c +++ b/lib/widget/buttonbar.c @@ -1,7 +1,7 @@ /* Widgets for the Midnight Commander - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Authors: diff --git a/lib/widget/check.c b/lib/widget/check.c index 63c55e3..b77573e 100644 --- a/lib/widget/check.c +++ b/lib/widget/check.c @@ -1,7 +1,7 @@ /* Widgets for the Midnight Commander - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Authors: diff --git a/lib/widget/dialog-switch.c b/lib/widget/dialog-switch.c index 959cbf9..74aedff 100644 --- a/lib/widget/dialog-switch.c +++ b/lib/widget/dialog-switch.c @@ -3,7 +3,7 @@ Original idea and code: Oleg "Olegarch" Konovalov - Copyright (C) 2009-2023 + Copyright (C) 2009-2024 Free Software Foundation, Inc. Written by: diff --git a/lib/widget/dialog.c b/lib/widget/dialog.c index 3ab2191..2596857 100644 --- a/lib/widget/dialog.c +++ b/lib/widget/dialog.c @@ -1,7 +1,7 @@ /* Dialog box features module for the Midnight Commander - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. This file is part of the Midnight Commander. @@ -83,7 +83,7 @@ dlg_default_get_colors (const Widget * w) /* --------------------------------------------------------------------------------------------- */ /** - * Read histories from the ${XDG_CACHE_HOME}/mc/history file + * Read histories from the ${XDG_DATA_HOME}/mc/history file */ static void dlg_read_history (WDialog * h) @@ -122,6 +122,16 @@ refresh_cmd (void) /* --------------------------------------------------------------------------------------------- */ +static void +dlg_help (const WDialog * h) +{ + ev_help_t event_data = { NULL, h->help_ctx }; + + mc_event_raise (MCEVENT_GROUP_CORE, "help", &event_data); +} + +/* --------------------------------------------------------------------------------------------- */ + static cb_ret_t dlg_execute_cmd (WDialog * h, long command) { @@ -152,10 +162,7 @@ dlg_execute_cmd (WDialog * h, long command) break; case CK_Help: - { - ev_help_t event_data = { NULL, h->help_ctx }; - mc_event_raise (MCEVENT_GROUP_CORE, "help", &event_data); - } + dlg_help (h); break; case CK_Suspend: @@ -571,7 +578,7 @@ dlg_run (WDialog * h) /* --------------------------------------------------------------------------------------------- */ /** - * Write history to the ${XDG_CACHE_HOME}/mc/history file + * Write history to the ${XDG_DATA_HOME}/mc/history file */ void dlg_save_history (WDialog * h) diff --git a/lib/widget/frame.c b/lib/widget/frame.c index 31127ab..127649e 100644 --- a/lib/widget/frame.c +++ b/lib/widget/frame.c @@ -1,7 +1,7 @@ /* Widgets for the Midnight Commander - Copyright (C) 2020-2023 + Copyright (C) 2020-2024 The Free Software Foundation, Inc. Authors: diff --git a/lib/widget/gauge.c b/lib/widget/gauge.c index 5eebb11..14b5fa8 100644 --- a/lib/widget/gauge.c +++ b/lib/widget/gauge.c @@ -1,7 +1,7 @@ /* Widgets for the Midnight Commander - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Authors: diff --git a/lib/widget/group.c b/lib/widget/group.c index eb6ba1e..f1a170c 100644 --- a/lib/widget/group.c +++ b/lib/widget/group.c @@ -1,7 +1,7 @@ /* Widget group features module for the Midnight Commander - Copyright (C) 2020-2023 + Copyright (C) 2020-2024 The Free Software Foundation, Inc. Written by: diff --git a/lib/widget/groupbox.c b/lib/widget/groupbox.c index 49cf7b0..4f6a021 100644 --- a/lib/widget/groupbox.c +++ b/lib/widget/groupbox.c @@ -1,7 +1,7 @@ /* Widgets for the Midnight Commander - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Authors: diff --git a/lib/widget/history.c b/lib/widget/history.c index 8197db8..7076d13 100644 --- a/lib/widget/history.c +++ b/lib/widget/history.c @@ -1,7 +1,7 @@ /* Widgets for the Midnight Commander - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Authors: diff --git a/lib/widget/hline.c b/lib/widget/hline.c index 73e261a..0f77a84 100644 --- a/lib/widget/hline.c +++ b/lib/widget/hline.c @@ -1,7 +1,7 @@ /* Widgets for the Midnight Commander - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Authors: diff --git a/lib/widget/input.c b/lib/widget/input.c index 3a67b49..a7ad7f5 100644 --- a/lib/widget/input.c +++ b/lib/widget/input.c @@ -1,7 +1,7 @@ /* Widgets for the Midnight Commander - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Authors: diff --git a/lib/widget/input_complete.c b/lib/widget/input_complete.c index 94a4c3b..bc44115 100644 --- a/lib/widget/input_complete.c +++ b/lib/widget/input_complete.c @@ -2,7 +2,7 @@ Input line filename/username/hostname/variable/command completion. (Let mc type for you...) - Copyright (C) 1995-2023 + Copyright (C) 1995-2024 Free Software Foundation, Inc. Written by: @@ -98,7 +98,6 @@ static char **hosts = NULL; static char **hosts_p = NULL; static int hosts_alloclen = 0; -static int complete_height, complete_width; static WInput *input; static int min_end; static int start = 0; @@ -1275,11 +1274,9 @@ complete_engine (WInput * in, int what_to_do) input = in; min_end = end; - complete_height = h; - complete_width = w; complete_dlg = - dlg_create (TRUE, y, x, complete_height, complete_width, WPOS_KEEP_DEFAULT, TRUE, + dlg_create (TRUE, y, x, h, w, WPOS_KEEP_DEFAULT, TRUE, dialog_colors, complete_callback, NULL, "[Completion]", NULL); complete_list = listbox_new (1, 1, h - 2, w - 2, FALSE, NULL); group_add_widget (GROUP (complete_dlg), complete_list); diff --git a/lib/widget/label.c b/lib/widget/label.c index 5a04a0f..4cde190 100644 --- a/lib/widget/label.c +++ b/lib/widget/label.c @@ -1,7 +1,7 @@ /* Widgets for the Midnight Commander - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Authors: diff --git a/lib/widget/listbox-window.c b/lib/widget/listbox-window.c index 47d7f8b..7cad872 100644 --- a/lib/widget/listbox-window.c +++ b/lib/widget/listbox-window.c @@ -1,7 +1,7 @@ /* Widget based utility functions. - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Authors: diff --git a/lib/widget/listbox.c b/lib/widget/listbox.c index 9f25487..76f07ad 100644 --- a/lib/widget/listbox.c +++ b/lib/widget/listbox.c @@ -1,7 +1,7 @@ /* Widgets for the Midnight Commander - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Authors: diff --git a/lib/widget/menu.c b/lib/widget/menu.c index 4a30c02..b27c4c3 100644 --- a/lib/widget/menu.c +++ b/lib/widget/menu.c @@ -1,7 +1,7 @@ /* Pulldown menu code - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Written by: @@ -530,6 +530,24 @@ menubar_try_exec_menu (WMenuBar * menubar, int hotkey) /* --------------------------------------------------------------------------------------------- */ +static void +menubar_help (const WMenuBar * menubar) +{ + ev_help_t event_data; + + event_data.filename = NULL; + + if (menubar->is_dropped) + event_data.node = MENU (g_list_nth_data (menubar->menu, menubar->current))->help_node; + else + event_data.node = "[Menu Bar]"; + + mc_event_raise (MCEVENT_GROUP_CORE, "help", &event_data); + menubar_draw (menubar); +} + +/* --------------------------------------------------------------------------------------------- */ + static cb_ret_t menubar_execute_cmd (WMenuBar * menubar, long command) { @@ -538,18 +556,7 @@ menubar_execute_cmd (WMenuBar * menubar, long command) switch (command) { case CK_Help: - { - ev_help_t event_data = { NULL, NULL }; - - if (menubar->is_dropped) - event_data.node = - MENU (g_list_nth_data (menubar->menu, menubar->current))->help_node; - else - event_data.node = "[Menu Bar]"; - - mc_event_raise (MCEVENT_GROUP_CORE, "help", &event_data); - menubar_draw (menubar); - } + menubar_help (menubar); break; case CK_Left: diff --git a/lib/widget/mouse.c b/lib/widget/mouse.c index 15ad5f5..2183903 100644 --- a/lib/widget/mouse.c +++ b/lib/widget/mouse.c @@ -1,7 +1,7 @@ /* Widgets for the Midnight Commander - Copyright (C) 2016-2023 + Copyright (C) 2016-2024 Free Software Foundation, Inc. Authors: diff --git a/lib/widget/quick.c b/lib/widget/quick.c index 35f5d68..3a6d165 100644 --- a/lib/widget/quick.c +++ b/lib/widget/quick.c @@ -1,7 +1,7 @@ /* Widget based utility functions. - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Authors: diff --git a/lib/widget/radio.c b/lib/widget/radio.c index 8fb52d8..94463f6 100644 --- a/lib/widget/radio.c +++ b/lib/widget/radio.c @@ -1,7 +1,7 @@ /* Widgets for the Midnight Commander - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Authors: diff --git a/lib/widget/rect.c b/lib/widget/rect.c index 34ae8b0..8c2d464 100644 --- a/lib/widget/rect.c +++ b/lib/widget/rect.c @@ -1,6 +1,6 @@ /* Rectangular class for Midnight Commander widgets - Copyright (C) 2020-2023 + Copyright (C) 2020-2024 The Free Software Foundation, Inc. Written by: diff --git a/lib/widget/widget-common.c b/lib/widget/widget-common.c index 821b7b3..459de10 100644 --- a/lib/widget/widget-common.c +++ b/lib/widget/widget-common.c @@ -1,7 +1,7 @@ /* Widgets for the Midnight Commander - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Authors: diff --git a/lib/widget/wtools.c b/lib/widget/wtools.c index a4af4b5..d1df8da 100644 --- a/lib/widget/wtools.c +++ b/lib/widget/wtools.c @@ -1,7 +1,7 @@ /* Widget based utility functions. - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Authors: -- cgit v1.2.3