mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-02-24 03:04:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

Moved input_map, listbox_map and dialog_map variables to 'lib' subdirectory.

Browse Source 
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
This commit is contained in:
Slava Zanko 2011-02-16 17:19:48 +02:00
parent 0f93e313df
commit 3634716374
9 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/widget/dialog.c
View File

@ -42,7 +42,6 @@
#include "src/help.h" /* interactive_display() */
#include "src/filemanager/layout.h"
#include "src/execute.h" /* suspend_cmd() */
#include "src/keybind-defaults.h"
/*** global variables ****************************************************************************/
@ -64,6 +63,8 @@ int fast_refresh = 0;
/* left click outside of dialog closes it */
int mouse_close_dialog = 0;
const global_keymap_t *dialog_map;
/*** file scope macro definitions ****************************************************************/
/*** file scope type declarations ****************************************************************/

3
lib/widget/dialog.h
View File

@ -31,6 +31,7 @@
#include "lib/global.h"
#include "lib/hook.h" /* hook_t */
#include "lib/keybind.h" /* global_keymap_t */
/*** defined constants ***************************************************************************/
@ -162,6 +163,8 @@ extern hook_t *idle_hook;
extern int fast_refresh;
extern int mouse_close_dialog;
extern const global_keymap_t *dialog_map;
/*** declarations of public functions ************************************************************/
/* draw box in window */

3
lib/widget/input.c
View File

@ -55,12 +55,13 @@
#include "src/main.h" /* home_dir */
#include "src/filemanager/midnight.h" /* current_panel */
#include "src/clipboard.h" /* copy_file_to_ext_clip, paste_to_file_from_ext_clip */
#include "src/keybind-defaults.h" /* input_map */
/*** global variables ****************************************************************************/
int quote = 0;
const global_keymap_t *input_map;
/*** file scope macro definitions ****************************************************************/
#define LARGE_HISTORY_BUTTON 1

4
lib/widget/input.h
View File

@ -6,6 +6,8 @@
#ifndef MC__WIDGET_INPUT_H
#define MC__WIDGET_INPUT_H
#include "lib/keybind.h" /* global_keymap_t */
/*** typedefs(not structures) and defined constants **********************************************/
/* For history load-save functions */
@ -68,6 +70,8 @@ typedef struct
extern int quote;
extern const global_keymap_t *input_map;
/*** declarations of public functions ************************************************************/
WInput *input_new (int y, int x, const int *input_colors,

9
lib/widget/listbox.c
View File

@ -44,11 +44,10 @@
#include "lib/keybind.h" /* global_keymap_t */
#include "lib/widget.h"
/* TODO: these includes should be removed! */
#include "src/keybind-defaults.h" /* listbox_map */
/*** global variables ****************************************************************************/
const global_keymap_t *listbox_map;
/*** file scope macro definitions ****************************************************************/
/*** file scope type declarations ****************************************************************/
@ -122,8 +121,8 @@ listbox_draw (WListbox * l, gboolean focused)
const gboolean disabled = (((Widget *) l)->options & W_DISABLED) != 0;
const int normalc = disabled ? DISABLED_COLOR : h->color[DLG_COLOR_NORMAL];
int selc =
disabled ? DISABLED_COLOR : focused ? h->color[DLG_COLOR_HOT_FOCUS] : h->
color[DLG_COLOR_FOCUS];
disabled ? DISABLED_COLOR : focused ? h->
color[DLG_COLOR_HOT_FOCUS] : h->color[DLG_COLOR_FOCUS];
GList *le;
int pos;

4
lib/widget/listbox.h
View File

@ -6,6 +6,8 @@
#ifndef MC__WIDGET_LISTBOX_H
#define MC__WIDGET_LISTBOX_H
#include "lib/keybind.h" /* global_keymap_t */
/*** typedefs(not structures) and defined constants **********************************************/
/*** enums ***************************************************************************************/
@ -53,6 +55,8 @@ typedef struct WListbox
/*** global variables defined in .c file *********************************************************/
extern const global_keymap_t *listbox_map;
/*** declarations of public functions ************************************************************/
WListbox *listbox_new (int y, int x, int height, int width, gboolean deletable, lcback_fn callback);

1
src/keybind-defaults.c
View File

@ -57,6 +57,7 @@ const global_keymap_t *input_map = NULL;
const global_keymap_t *listbox_map = NULL;
const global_keymap_t *tree_map = NULL;
const global_keymap_t *help_map = NULL;
#ifdef USE_INTERNAL_EDIT
const global_keymap_t *editor_map = NULL;
const global_keymap_t *editor_x_map = NULL;

1
src/keybind-defaults.h
View File

@ -40,6 +40,7 @@ extern const global_keymap_t *input_map;
extern const global_keymap_t *listbox_map;
extern const global_keymap_t *tree_map;
extern const global_keymap_t *help_map;
#ifdef USE_INTERNAL_EDIT
extern const global_keymap_t *editor_map;
extern const global_keymap_t *editor_x_map;

4
src/setup.c
View File

@ -35,6 +35,8 @@
#include "lib/mcconfig.h"
#include "lib/fileloc.h"
#include "lib/timefmt.h"
#include "lib/util.h"
#include "lib/widget.h"
#include "lib/vfs/vfs.h"
@ -45,8 +47,6 @@
#include "src/vfs/fish/fish.h"
#endif
#include "lib/util.h"
#include "lib/widget.h"
#ifdef HAVE_CHARSET
#include "lib/charsets.h"
#endif