mirror of
https://github.com/MidnightCommander/mc
synced 2025-03-29 11:13:11 +03:00
* cmd.h: Fully exclude WPanel from public interfaces of cmd.c.
* cmd.c: All commands operate on current panels. (get_a_panel): Remove. * screen.c: Change to use new functions.
This commit is contained in:
Pavel Roskin
parent
85075934f1
commit
e1dc782744
@ -1,5 +1,10 @@
|
||||
2002-11-13 Pavel Roskin <proski@gnu.org>
|
||||
|
||||
* cmd.h: Fully exclude WPanel from public interfaces of cmd.c.
|
||||
* cmd.c: All commands operate on current panels.
|
||||
(get_a_panel): Remove.
|
||||
* screen.c: Change to use new functions.
|
||||
|
||||
* main.h: Don't check if panel.h was included. Use forward
|
||||
declaration of WPanel, change prototypes to use struct WPanel.
|
||||
(midnight_callback): Make static.
|
||||
|
||||
135
src/cmd.c
135
src/cmd.c
@ -39,41 +39,31 @@
|
||||
#endif
|
||||
|
||||
#include "global.h"
|
||||
#include "tty.h"
|
||||
#include "dir.h"
|
||||
#include "panel.h"
|
||||
#include "cmd.h" /* Our definitions */
|
||||
#include "view.h" /* view() */
|
||||
#include "dialog.h" /* query_dialog, message */
|
||||
#include "file.h" /* the file operations */
|
||||
#include "fileopctx.h"
|
||||
#include "find.h" /* do_find */
|
||||
#include "hotlist.h"
|
||||
#include "tree.h"
|
||||
#include "tree.h" /* tree_chdir */
|
||||
#include "subshell.h" /* use_subshell */
|
||||
#include "cons.saver.h"
|
||||
#include "dlg.h" /* required by wtools.h */
|
||||
#include "widget.h" /* required by wtools.h */
|
||||
#include "wtools.h" /* listbox */
|
||||
#include "command.h" /* for cmdline */
|
||||
#include "win.h" /* do_exit_ca_mode */
|
||||
#include "layout.h" /* get_current/other_type */
|
||||
#include "ext.h" /* regex_command */
|
||||
#include "key.h" /* get_key_code */
|
||||
#include "help.h" /* interactive_display */
|
||||
#include "boxes.h" /* cd_dialog */
|
||||
#include "color.h"
|
||||
#include "user.h"
|
||||
#include "setup.h"
|
||||
#include "profile.h"
|
||||
|
||||
#include "vfs/vfs.h"
|
||||
#define WANT_WIDGETS
|
||||
#include "main.h" /* global variables, global functions */
|
||||
#ifndef MAP_FILE
|
||||
# define MAP_FILE 0
|
||||
#endif
|
||||
|
||||
#ifdef USE_INTERNAL_EDIT
|
||||
# include "../edit/edit.h"
|
||||
#endif
|
||||
|
||||
/* If set and you don't have subshell support,then C-o will give you a shell */
|
||||
int output_starts_shell = 0;
|
||||
|
||||
@ -88,21 +78,6 @@ int is_right;
|
||||
#define MENU_PANEL_IDX (is_right ? 1 : 0)
|
||||
|
||||
|
||||
/* This is used since the parameter panel on some of the commands */
|
||||
/* defined in this file may receive a 0 parameter if they are invoked */
|
||||
/* The drop down menu */
|
||||
|
||||
static WPanel *
|
||||
get_a_panel (WPanel *panel)
|
||||
{
|
||||
if (panel)
|
||||
return panel;
|
||||
if (get_current_type () == view_listing){
|
||||
return cpanel;
|
||||
} else
|
||||
return other_panel;
|
||||
}
|
||||
|
||||
/* view_file (filename, normal, internal)
|
||||
*
|
||||
* Inputs:
|
||||
@ -321,22 +296,21 @@ void do_edit_at_line (const char *what, int start_line)
|
||||
repaint_screen ();
|
||||
}
|
||||
|
||||
void
|
||||
static void
|
||||
do_edit (const char *what)
|
||||
{
|
||||
do_edit_at_line (what, 1);
|
||||
}
|
||||
|
||||
void
|
||||
edit_cmd (WPanel *panel)
|
||||
edit_cmd (void)
|
||||
{
|
||||
panel = get_a_panel (panel);
|
||||
if (regex_command (selection (panel)->fname, "Edit", 0) == 0)
|
||||
do_edit (selection (panel)->fname);
|
||||
if (regex_command (selection (cpanel)->fname, "Edit", 0) == 0)
|
||||
do_edit (selection (cpanel)->fname);
|
||||
}
|
||||
|
||||
void
|
||||
edit_cmd_new (WPanel *panel)
|
||||
edit_cmd_new (void)
|
||||
{
|
||||
do_edit ("");
|
||||
}
|
||||
@ -382,12 +356,11 @@ void ren_cmd_local (void)
|
||||
}
|
||||
}
|
||||
|
||||
void mkdir_cmd (WPanel *panel)
|
||||
void mkdir_cmd (void)
|
||||
{
|
||||
char *tempdir;
|
||||
char *dir;
|
||||
|
||||
panel = get_a_panel (panel);
|
||||
dir = input_expand_dialog (_("Create a new Directory"), _(" Enter directory name:") , "");
|
||||
|
||||
if (!dir)
|
||||
@ -396,7 +369,7 @@ void mkdir_cmd (WPanel *panel)
|
||||
if (dir [0] && (dir [0] == '/' || dir [0] == '~'))
|
||||
tempdir = g_strdup (dir);
|
||||
else
|
||||
tempdir = concat_dir_and_file (panel->cwd, dir);
|
||||
tempdir = concat_dir_and_file (cpanel->cwd, dir);
|
||||
g_free (dir);
|
||||
|
||||
save_cwds_stat ();
|
||||
@ -426,7 +399,7 @@ void find_cmd (void)
|
||||
do_find ();
|
||||
}
|
||||
|
||||
void
|
||||
static void
|
||||
set_panel_filter_to (WPanel *p, char *allocated_filter_string)
|
||||
{
|
||||
if (p->filter){
|
||||
@ -441,7 +414,8 @@ set_panel_filter_to (WPanel *p, char *allocated_filter_string)
|
||||
}
|
||||
|
||||
/* Set a given panel filter expression */
|
||||
void set_panel_filter (WPanel *p)
|
||||
static void
|
||||
set_panel_filter (WPanel *p)
|
||||
{
|
||||
char *reg_exp;
|
||||
char *x;
|
||||
@ -482,33 +456,21 @@ void reread_cmd (void)
|
||||
repaint_screen ();
|
||||
}
|
||||
|
||||
/* Panel sorting related routines */
|
||||
void do_re_sort (WPanel *panel)
|
||||
{
|
||||
panel = get_a_panel (panel);
|
||||
panel_re_sort (panel);
|
||||
}
|
||||
|
||||
void reverse_selection_cmd_panel (WPanel *panel)
|
||||
void reverse_selection_cmd (void)
|
||||
{
|
||||
file_entry *file;
|
||||
int i;
|
||||
|
||||
for (i = 0; i < panel->count; i++){
|
||||
file = &panel->dir.list [i];
|
||||
for (i = 0; i < cpanel->count; i++){
|
||||
file = &cpanel->dir.list [i];
|
||||
if (S_ISDIR (file->buf.st_mode))
|
||||
continue;
|
||||
do_file_mark (panel, i, !file->f.marked);
|
||||
do_file_mark (cpanel, i, !file->f.marked);
|
||||
}
|
||||
paint_panel (panel);
|
||||
paint_panel (cpanel);
|
||||
}
|
||||
|
||||
void reverse_selection_cmd (void)
|
||||
{
|
||||
reverse_selection_cmd_panel (cpanel);
|
||||
}
|
||||
|
||||
void select_cmd_panel (WPanel *panel)
|
||||
void select_cmd (void)
|
||||
{
|
||||
char *reg_exp, *reg_exp_t;
|
||||
int i;
|
||||
@ -531,36 +493,31 @@ void select_cmd_panel (WPanel *panel)
|
||||
reg_exp_t [strlen(reg_exp_t) - 1] = 0;
|
||||
}
|
||||
|
||||
for (i = 0; i < panel->count; i++){
|
||||
if (!strcmp (panel->dir.list [i].fname, ".."))
|
||||
for (i = 0; i < cpanel->count; i++){
|
||||
if (!strcmp (cpanel->dir.list [i].fname, ".."))
|
||||
continue;
|
||||
if (S_ISDIR (panel->dir.list [i].buf.st_mode)){
|
||||
if (S_ISDIR (cpanel->dir.list [i].buf.st_mode)){
|
||||
if (!dirflag)
|
||||
continue;
|
||||
} else {
|
||||
if (dirflag)
|
||||
continue;
|
||||
}
|
||||
c = regexp_match (reg_exp_t, panel->dir.list [i].fname, match_file);
|
||||
c = regexp_match (reg_exp_t, cpanel->dir.list [i].fname, match_file);
|
||||
if (c == -1){
|
||||
message (1, MSG_ERROR, _(" Malformed regular expression "));
|
||||
g_free (reg_exp);
|
||||
return;
|
||||
}
|
||||
if (c){
|
||||
do_file_mark (panel, i, 1);
|
||||
do_file_mark (cpanel, i, 1);
|
||||
}
|
||||
}
|
||||
paint_panel (panel);
|
||||
paint_panel (cpanel);
|
||||
g_free (reg_exp);
|
||||
}
|
||||
|
||||
void select_cmd (void)
|
||||
{
|
||||
select_cmd_panel (cpanel);
|
||||
}
|
||||
|
||||
void unselect_cmd_panel (WPanel *panel)
|
||||
void unselect_cmd (void)
|
||||
{
|
||||
char *reg_exp, *reg_exp_t;
|
||||
int i;
|
||||
@ -582,38 +539,34 @@ void unselect_cmd_panel (WPanel *panel)
|
||||
dirflag = 1;
|
||||
reg_exp_t [strlen(reg_exp_t) - 1] = 0;
|
||||
}
|
||||
for (i = 0; i < panel->count; i++){
|
||||
if (!strcmp (panel->dir.list [i].fname, ".."))
|
||||
for (i = 0; i < cpanel->count; i++){
|
||||
if (!strcmp (cpanel->dir.list [i].fname, ".."))
|
||||
continue;
|
||||
if (S_ISDIR (panel->dir.list [i].buf.st_mode)){
|
||||
if (S_ISDIR (cpanel->dir.list [i].buf.st_mode)){
|
||||
if (!dirflag)
|
||||
continue;
|
||||
} else {
|
||||
if (dirflag)
|
||||
continue;
|
||||
}
|
||||
c = regexp_match (reg_exp_t, panel->dir.list [i].fname, match_file);
|
||||
c = regexp_match (reg_exp_t, cpanel->dir.list [i].fname, match_file);
|
||||
if (c == -1){
|
||||
message (1, MSG_ERROR, _(" Malformed regular expression "));
|
||||
g_free (reg_exp);
|
||||
return;
|
||||
}
|
||||
if (c){
|
||||
do_file_mark (panel, i, 0);
|
||||
do_file_mark (cpanel, i, 0);
|
||||
}
|
||||
}
|
||||
paint_panel (panel);
|
||||
paint_panel (cpanel);
|
||||
g_free (reg_exp);
|
||||
}
|
||||
|
||||
void unselect_cmd (void)
|
||||
{
|
||||
unselect_cmd_panel (cpanel);
|
||||
}
|
||||
|
||||
/* Check if the file exists */
|
||||
/* If not copy the default */
|
||||
int check_for_default(char *default_file, char *file)
|
||||
static int
|
||||
check_for_default(char *default_file, char *file)
|
||||
{
|
||||
struct stat s;
|
||||
off_t count = 0;
|
||||
@ -814,8 +767,6 @@ compare_dir (WPanel *panel, WPanel *other, enum CompareMode mode)
|
||||
int i, j;
|
||||
char *src_name, *dst_name;
|
||||
|
||||
panel = get_a_panel (panel);
|
||||
|
||||
/* No marks by default */
|
||||
panel->marked = 0;
|
||||
panel->total = 0;
|
||||
@ -1157,16 +1108,6 @@ void help_cmd (void)
|
||||
interactive_display (NULL, "[main]");
|
||||
}
|
||||
|
||||
void edit_panel_cmd (void)
|
||||
{
|
||||
edit_cmd (cpanel);
|
||||
}
|
||||
|
||||
void mkdir_panel_cmd (void)
|
||||
{
|
||||
mkdir_cmd (cpanel);
|
||||
}
|
||||
|
||||
/* partly taken from dcigettext.c, returns "" for default locale */
|
||||
/* value should be freed by calling function g_free() */
|
||||
char *guess_message_value (void)
|
||||
@ -1404,7 +1345,7 @@ save_setup_cmd (void)
|
||||
g_free (str);
|
||||
}
|
||||
|
||||
void
|
||||
static void
|
||||
configure_panel_listing (WPanel *p, int view_type, int use_msformat, char *user, char *status)
|
||||
{
|
||||
p->user_mini_status = use_msformat;
|
||||
@ -1452,7 +1393,7 @@ quick_cmd_no_menu (void)
|
||||
set_display_type (cpanel == left_panel ? 1 : 0, view_quick);
|
||||
}
|
||||
|
||||
void
|
||||
static void
|
||||
switch_to_listing (int panel_index)
|
||||
{
|
||||
if (get_display_type (panel_index) != view_listing)
|
||||
|
||||
26
src/cmd.h
26
src/cmd.h
@ -1,8 +1,6 @@
|
||||
#ifndef __CMD_H
|
||||
#define __CMD_H
|
||||
|
||||
#include "panel.h"
|
||||
|
||||
void netlink_cmd (void);
|
||||
void ftplink_cmd (void);
|
||||
void fishlink_cmd (void);
|
||||
@ -17,25 +15,21 @@ void view_cmd (void);
|
||||
void view_file_cmd (void);
|
||||
void view_simple_cmd (void);
|
||||
void filtered_view_cmd (void);
|
||||
void do_edit (const char *what);
|
||||
void do_edit_at_line (const char *what, int start_line);
|
||||
void edit_cmd (WPanel *panel);
|
||||
void edit_cmd_new (WPanel *panel);
|
||||
void edit_cmd (void);
|
||||
void edit_cmd_new (void);
|
||||
void copy_cmd (void);
|
||||
void ren_cmd (void);
|
||||
void copy_cmd_local (void);
|
||||
void ren_cmd_local (void);
|
||||
void free_vfs_now (void);
|
||||
void reselect_vfs (void);
|
||||
void mkdir_cmd (WPanel *panel);
|
||||
void mkdir_cmd (void);
|
||||
void delete_cmd (void);
|
||||
void find_cmd (void);
|
||||
void tree_mode_cmd (void);
|
||||
void filter_cmd (void);
|
||||
void set_panel_filter (WPanel *panel);
|
||||
void set_panel_filter_to (WPanel *p, char *allocated_filter_string);
|
||||
void reread_cmd (void);
|
||||
void do_re_sort (WPanel *panel);
|
||||
void tree_view_cmd (void);
|
||||
void ext_cmd (void);
|
||||
void menu_edit_cmd (int select);
|
||||
@ -47,39 +41,25 @@ void tree_cmd (void);
|
||||
void link_cmd (void);
|
||||
void symlink_cmd (void);
|
||||
void edit_symlink_cmd (void);
|
||||
void reverse_selection_cmd_panel (WPanel *);
|
||||
void unselect_cmd_panel (WPanel *);
|
||||
void select_cmd_panel (WPanel *);
|
||||
void reverse_selection_cmd (void);
|
||||
void unselect_cmd (void);
|
||||
void select_cmd (void);
|
||||
void swap_cmd (void);
|
||||
void view_other_cmd (void);
|
||||
void mkdir_panel_cmd (void);
|
||||
void edit_panel_cmd (void);
|
||||
void quick_cd_cmd (void);
|
||||
void save_setup_cmd (void);
|
||||
char *get_random_hint (void);
|
||||
void source_routing (void);
|
||||
void user_file_menu_cmd (void);
|
||||
char *guess_message_value (void);
|
||||
int check_for_default(char *default_file, char *file);
|
||||
|
||||
/* Display mode code */
|
||||
void info_cmd (void);
|
||||
void tree_cmd (void);
|
||||
void listing_cmd (void);
|
||||
void switch_to_listing (int panel_index);
|
||||
void quick_cmd_no_menu (void);
|
||||
void info_cmd_no_menu (void);
|
||||
void quick_view_cmd (void);
|
||||
void toggle_listing_cmd (void);
|
||||
void configure_panel_listing (WPanel * p, int view_type, int use_msformat,
|
||||
char *user, char *status);
|
||||
|
||||
#ifdef USE_INTERNAL_EDIT
|
||||
extern int edit (const char *file, int line);
|
||||
extern int edit_run;
|
||||
#endif
|
||||
|
||||
#endif /* __CMD_H */
|
||||
|
||||
18
src/screen.c
18
src/screen.c
@ -2090,13 +2090,13 @@ static const key_map panel_keymap [] = {
|
||||
{ KEY_F(16), ren_cmd_local },
|
||||
{ ALT('y'), directory_history_prev },
|
||||
{ ALT('u'), directory_history_next },
|
||||
{ ALT('+'), select_cmd_panel },
|
||||
{ KEY_KP_ADD, select_cmd_panel },
|
||||
{ ALT('\\'), unselect_cmd_panel },
|
||||
{ ALT('-'), unselect_cmd_panel },
|
||||
{ KEY_KP_SUBTRACT, unselect_cmd_panel },
|
||||
{ ALT('*'), reverse_selection_cmd_panel },
|
||||
{ KEY_KP_MULTIPLY, reverse_selection_cmd_panel },
|
||||
{ ALT('+'), select_cmd },
|
||||
{ KEY_KP_ADD, select_cmd },
|
||||
{ ALT('\\'), unselect_cmd },
|
||||
{ ALT('-'), unselect_cmd },
|
||||
{ KEY_KP_SUBTRACT, unselect_cmd },
|
||||
{ ALT('*'), reverse_selection_cmd },
|
||||
{ KEY_KP_MULTIPLY, reverse_selection_cmd },
|
||||
{ 0, 0 }
|
||||
};
|
||||
|
||||
@ -2182,10 +2182,10 @@ panel_callback (WPanel *panel, int msg, int par)
|
||||
define_label (h, 1, _("Help"), help_cmd);
|
||||
define_label (h, 2, _("Menu"), user_file_menu_cmd);
|
||||
define_label (h, 3, _("View"), view_cmd);
|
||||
define_label (h, 4, _("Edit"), edit_panel_cmd);
|
||||
define_label (h, 4, _("Edit"), edit_cmd);
|
||||
define_label (h, 5, _("Copy"), copy_cmd);
|
||||
define_label (h, 6, _("RenMov"), ren_cmd);
|
||||
define_label (h, 7, _("Mkdir"), mkdir_panel_cmd);
|
||||
define_label (h, 7, _("Mkdir"), mkdir_cmd);
|
||||
define_label (h, 8, _("Delete"), delete_cmd);
|
||||
redraw_labels (h);
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user