Remove yet more unnecessary fish_pager.cpp specific code from the new pager

This commit is contained in:
ridiculousfish 2014-01-24 16:58:22 -08:00
parent 5849cd3a2e
commit 4ffd2380c3

View file

@ -3,66 +3,8 @@
#include "pager.h" #include "pager.h"
#include "highlight.h" #include "highlight.h"
#include "input_common.h" #include "input_common.h"
#if 1
#include <stdlib.h>
#include <stdio.h>
#include <wchar.h>
#include <unistd.h>
#include <termios.h>
#include <string.h>
#include <map>
#include <algorithm>
#include <sys/types.h>
#include <sys/stat.h>
#ifdef HAVE_SYS_IOCTL_H
#include <sys/ioctl.h>
#endif
#include <sys/time.h>
#include <sys/wait.h>
#include <dirent.h>
#include <fcntl.h>
#include <locale.h>
#if HAVE_NCURSES_H
#include <ncurses.h>
#else
#include <curses.h>
#endif
#if HAVE_TERM_H
#include <term.h>
#elif HAVE_NCURSES_TERM_H
#include <ncurses/term.h>
#endif
#include <signal.h>
#ifdef HAVE_GETOPT_H
#include <getopt.h>
#endif
#include <errno.h>
#include <vector> #include <vector>
#include <map>
#include "fallback.h"
#include "util.h"
#include "wutil.h"
#include "common.h"
#include "complete.h"
#include "output.h"
#include "input_common.h"
#include "env_universal.h"
#include "print_help.h"
#include "highlight.h"
#endif
#define PAGER_SELECTION_NONE ((size_t)(-1)) #define PAGER_SELECTION_NONE ((size_t)(-1))
@ -70,16 +12,6 @@ typedef pager_t::comp_t comp_t;
typedef std::vector<completion_t> completion_list_t; typedef std::vector<completion_t> completion_list_t;
typedef std::vector<comp_t> comp_info_list_t; typedef std::vector<comp_t> comp_info_list_t;
enum
{
LINE_UP = R_NULL+1,
LINE_DOWN,
PAGE_UP,
PAGE_DOWN
}
;
/** The minimum width (in characters) the terminal may have for fish_pager to not refuse showing the completions */ /** The minimum width (in characters) the terminal may have for fish_pager to not refuse showing the completions */
#define PAGER_MIN_WIDTH 16 #define PAGER_MIN_WIDTH 16