mirror of https://github.com/MidnightCommander/mc
* hotlist.c [HAVE_X]: Don't use ctrl_pressed().
* widget.c [HAVE_X]: Likewise. * main.c [HAVE_X]: Likewise. Don't call init_key() and init_key_input_fd(). * setup.c [HAVE_X]: Remove some variables that make no sence for the GNOME edition. Eliminate save_panel_types(). * view.c [!PORT_WANTS_VIEW]: Eliminate view_mode_callback().
This commit is contained in:
Pavel Roskin
parent
b66d2fec72
commit
429c5fcd58
|
|
@ -1,5 +1,13 @@
|
|||
2001-06-01 Pavel Roskin <proski@gnu.org>
|
||||
|
||||
* hotlist.c [HAVE_X]: Don't use ctrl_pressed().
|
||||
* widget.c [HAVE_X]: Likewise.
|
||||
* main.c [HAVE_X]: Likewise. Don't call init_key() and
|
||||
init_key_input_fd().
|
||||
* setup.c [HAVE_X]: Remove some variables that make no sence
|
||||
for the GNOME edition. Eliminate save_panel_types().
|
||||
* view.c [!PORT_WANTS_VIEW]: Eliminate view_mode_callback().
|
||||
|
||||
* view.c [HAVE_X]: Define is_idle() to 1. Warning fix.
|
||||
|
||||
* file.c (copy_file_file): Initialize src_uid, src_gid, src_mode
|
||||
|
|
|
|||
|
|
@ -411,8 +411,10 @@ static int hotlist_callback (Dlg_head * h, int Par, int Msg)
|
|||
case DLG_UNHANDLED_KEY:
|
||||
switch (Par) {
|
||||
case '\n':
|
||||
#ifndef HAVE_X
|
||||
if (ctrl_pressed())
|
||||
goto l1;
|
||||
#endif
|
||||
case KEY_ENTER:
|
||||
case KEY_RIGHT:
|
||||
if (hotlist_button_callback (B_ENTER, 0)) {
|
||||
|
|
|
|||
20
src/main.c
20
src/main.c
|
|
@ -2000,11 +2000,13 @@ midnight_callback (struct Dlg_head *h, int id, int msg)
|
|||
if (id == '\t')
|
||||
free_completions (input_w (cmdline));
|
||||
|
||||
#ifndef HAVE_X
|
||||
/* On Linux, we can tell the difference */
|
||||
if (id == '\n' && ctrl_pressed ()){
|
||||
copy_prog_name ();
|
||||
return MSG_HANDLED;
|
||||
}
|
||||
#endif /* HAVE_X */
|
||||
|
||||
if (id == '\n' && input_w (cmdline)->buffer [0]){
|
||||
send_message_to (h, (Widget *) cmdline, WIDGET_KEY, id);
|
||||
|
|
@ -3041,20 +3043,18 @@ main (int argc, char *argv [])
|
|||
#ifndef HAVE_X
|
||||
#ifdef HAVE_SLANG
|
||||
SLtt_Ignore_Beep = 1;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/* NOTE: This has to be called before slang_init or whatever routine
|
||||
calls any define_sequence */
|
||||
init_key ();
|
||||
|
||||
#if defined (HAVE_TEXTMODE_X11_SUPPORT) && !defined (HAVE_X)
|
||||
#ifdef HAVE_TEXTMODE_X11_SUPPORT
|
||||
init_textmode_x11_support ();
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_GNOME
|
||||
handle_args (argc, argv);
|
||||
#endif
|
||||
#endif /* HAVE_X */
|
||||
|
||||
/* Used to report the last working directory at program end */
|
||||
if (print_last_wd){
|
||||
|
|
@ -3099,19 +3099,23 @@ main (int argc, char *argv [])
|
|||
|
||||
compatibility_move_mc_files ();
|
||||
|
||||
# ifdef HAVE_X
|
||||
#ifdef HAVE_X
|
||||
/* We need this, since ncurses endwin () doesn't restore the signals */
|
||||
/* Very strange comment given that ifdef HAVE_X stands here since
|
||||
revision 1.1 - Pavel Roskin */
|
||||
save_stop_handler ();
|
||||
# endif
|
||||
|
||||
#else /* !HAVE_X */
|
||||
|
||||
/* Must be done before init_subshell, to set up the terminal size: */
|
||||
/* FIXME: Should be removed and LINES and COLS computed on subshell */
|
||||
# ifdef HAVE_SLANG
|
||||
#ifdef HAVE_SLANG
|
||||
slang_init ();
|
||||
# endif
|
||||
#endif
|
||||
/* NOTE: This call has to be after slang_init. It's the small part from
|
||||
the previous init_key which had to be moved after the call of slang_init */
|
||||
init_key_input_fd ();
|
||||
#endif /* !HAVE_X */
|
||||
|
||||
load_setup ();
|
||||
|
||||
|
|
|
|||
|
|
@ -191,11 +191,13 @@ static const struct {
|
|||
{ "confirm_execute", &confirm_execute },
|
||||
{ "confirm_exit", &confirm_exit },
|
||||
{ "safe_delete", &know_not_what_am_i_doing },
|
||||
#ifndef HAVE_X
|
||||
{ "mouse_repeat_rate", &mou_auto_repeat },
|
||||
{ "double_click_speed", &double_click_speed },
|
||||
{ "eight_bit_clean", &eight_bit_clean },
|
||||
{ "full_eight_bits", &full_eight_bits },
|
||||
{ "use_8th_bit_as_meta", &use_8th_bit_as_meta },
|
||||
#endif
|
||||
{ "confirm_view_dir", &confirm_view_dir },
|
||||
{ "mouse_move_pages", &mouse_move_pages },
|
||||
{ "mouse_move_pages_viewer", &mouse_move_pages_viewer },
|
||||
|
|
@ -204,8 +206,8 @@ static const struct {
|
|||
{ "advanced_chown", &advanced_chfns },
|
||||
{ "drop_menus", &drop_menus },
|
||||
{ "wrap_mode", &global_wrap_mode},
|
||||
#ifndef HAVE_X
|
||||
{ "old_esc_mode", &old_esc_mode },
|
||||
#ifndef HAVE_GNOME
|
||||
{ "cd_symlinks", &cd_symlinks },
|
||||
#endif
|
||||
{ "show_all_if_ambiguous", &show_all_if_ambiguous },
|
||||
|
|
@ -372,6 +374,7 @@ save_configure (void)
|
|||
g_free (profile);
|
||||
}
|
||||
|
||||
#ifndef PORT_HAS_SAVE_PANEL_TYPES
|
||||
static void
|
||||
panel_save_type (char *section, int type)
|
||||
{
|
||||
|
|
@ -385,7 +388,6 @@ panel_save_type (char *section, int type)
|
|||
}
|
||||
}
|
||||
|
||||
#ifndef PORT_HAS_SAVE_PANEL_TYPES
|
||||
void
|
||||
save_panel_types ()
|
||||
{
|
||||
|
|
@ -662,6 +664,7 @@ void done_setup (void)
|
|||
/* directory_history_free (); */
|
||||
}
|
||||
|
||||
#ifndef HAVE_X
|
||||
static void
|
||||
load_keys_from_section (char *terminal, char *profile_name)
|
||||
{
|
||||
|
|
@ -705,3 +708,4 @@ void load_key_defs (void)
|
|||
free_profile_name (libfile);
|
||||
g_free (libfile);
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -2368,13 +2368,13 @@ real_view_event (Gpm_Event *event, void *x)
|
|||
/* }}} */
|
||||
/* {{{ Window creation, destruction and a driver stub for real view */
|
||||
|
||||
#ifndef PORT_WANTS_VIEW
|
||||
static int
|
||||
view_mode_callback (struct Dlg_head *h, int id, int msg)
|
||||
{
|
||||
return default_dlg_callback (h, id, msg);
|
||||
}
|
||||
|
||||
#ifndef PORT_WANTS_VIEW
|
||||
void
|
||||
view_adjust_size (Dlg_head *h)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1290,7 +1290,7 @@ backward_word (WInput *in)
|
|||
in->point = p - in->buffer;
|
||||
}
|
||||
|
||||
#ifdef __linux__
|
||||
#if defined(__linux__) && !defined(HAVE_X)
|
||||
static void
|
||||
key_left (WInput *in)
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue