mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-23 12:56:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2591_editor_bottom_line_click'

Browse Source 
* 2591_editor_bottom_line_click:
  Allow create WEdit window with any sizes and in any location.
  Draw status line at the top of screen not at the top of editor widget.
  Ticket #2591: mouse clicks ignored on the bottom line of editor.
This commit is contained in:
Andrew Borodin 2011-08-24 09:52:16 +04:00
commit c4af1f250c
4 changed files with 194 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/editor/edit-impl.h
View File

@ -60,7 +60,7 @@
#define REDRAW_COMPLETELY (1 << 8)
#define EDIT_TEXT_HORIZONTAL_OFFSET 0
#define EDIT_TEXT_VERTICAL_OFFSET 1
#define EDIT_TEXT_VERTICAL_OFFSET 0
#define EDIT_RIGHT_EXTREME option_edit_right_extreme
#define EDIT_LEFT_EXTREME option_edit_left_extreme
@ -265,7 +265,7 @@ long edit_write_stream (WEdit * edit, FILE * f);
char *edit_get_write_filter (const char *writename, const char *filename);
int edit_save_confirm_cmd (WEdit * edit);
int edit_save_as_cmd (WEdit * edit);
WEdit *edit_init (WEdit * edit, int lines, int columns, const char *filename, long line);
WEdit *edit_init (WEdit * edit, int y, int x, int lines, int cols, const char *filename, long line);
int edit_clean (WEdit * edit);
gboolean edit_ok_to_exit (WEdit * edit);
int edit_renew (WEdit * edit);

40
src/editor/edit.c
View File

@ -2101,19 +2101,17 @@ edit_insert_file (WEdit * edit, const char *filename)
*/
WEdit *
edit_init (WEdit * edit, int lines, int columns, const char *filename, long line)
edit_init (WEdit * edit, int y, int x, int lines, int cols, const char *filename, long line)
{
int to_free = 0;
gboolean to_free = FALSE;
option_auto_syntax = 1; /* Resetting to auto on every invokation */
if (option_line_state)
{
option_line_state_width = LINE_STATE_WIDTH;
}
else
{
option_line_state_width = 0;
}
if (!edit)
if (edit == NULL)
{
#ifdef ENABLE_NLS
/*
@ -2144,19 +2142,25 @@ edit_init (WEdit * edit, int lines, int columns, const char *filename, long line
#endif /* ENABLE_NLS */
edit = g_malloc0 (sizeof (WEdit));
edit->search = NULL;
to_free = 1;
to_free = TRUE;
}
edit_purge_widget (edit);
edit->widget.y = y;
edit->widget.x = x;
edit->widget.lines = lines;
edit->over_col = 0;
edit->widget.cols = columns;
edit->widget.cols = cols;
edit->stat1.st_mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH;
edit->stat1.st_uid = getuid ();
edit->stat1.st_gid = getgid ();
edit->stat1.st_mtime = 0;
edit->over_col = 0;
edit->bracket = -1;
edit->force |= REDRAW_PAGE;
edit_set_filename (edit, filename);
edit->undo_stack_size = START_STACK_SIZE;
edit->undo_stack_size_mask = START_STACK_SIZE - 1;
edit->undo_stack = g_malloc0 ((edit->undo_stack_size + 10) * sizeof (long));
@ -2174,7 +2178,7 @@ edit_init (WEdit * edit, int lines, int columns, const char *filename, long line
/* edit_load_file already gives an error message */
if (to_free)
g_free (edit);
return 0;
return NULL;
}
edit->loading_done = 1;
@ -2188,9 +2192,7 @@ edit_init (WEdit * edit, int lines, int columns, const char *filename, long line
/* load saved cursor position */
if ((line == 0) && option_save_position)
{
edit_load_position (edit);
}
else
{
if (line <= 0)
@ -2257,11 +2259,13 @@ edit_clean (WEdit * edit)
int
edit_renew (WEdit * edit)
{
int y = edit->widget.y;
int x = edit->widget.x;
int lines = edit->widget.lines;
int columns = edit->widget.cols;
edit_clean (edit);
return (edit_init (edit, lines, columns, "", 0) != NULL);
return (edit_init (edit, y, x, lines, columns, "", 0) != NULL);
}
/* --------------------------------------------------------------------------------------------- */
@ -2276,12 +2280,14 @@ int
edit_reload (WEdit * edit, const char *filename)
{
WEdit *e;
int y = edit->widget.y;
int x = edit->widget.x;
int lines = edit->widget.lines;
int columns = edit->widget.cols;
e = g_malloc0 (sizeof (WEdit));
e->widget = edit->widget;
if (!edit_init (e, lines, columns, filename, 0))
if (edit_init (e, y, x, lines, columns, filename, 0) == NULL)
{
g_free (e);
return 0;
@ -2304,12 +2310,14 @@ int
edit_reload_line (WEdit * edit, const char *filename, long line)
{
WEdit *e;
int y = edit->widget.y;
int x = edit->widget.x;
int lines = edit->widget.lines;
int columns = edit->widget.cols;
e = g_malloc0 (sizeof (WEdit));
e->widget = edit->widget;
if (!edit_init (e, lines, columns, filename, line))
if (edit_init (e, y, x, lines, columns, filename, line) == NULL)
{
g_free (e);
return 0;

180
src/editor/editdraw.c
View File

@ -80,6 +80,8 @@ int visible_tabs = 1, visible_tws = 1;
#define key_pending(x) (!is_idle())
#define EDITOR_MINIMUM_TERMINAL_WIDTH 30
/*** file scope type declarations ****************************************************************/
@ -150,7 +152,8 @@ status_string (WEdit * edit, char *s, int w)
edit->curs_line + 1,
edit->total_lines + 1, edit->curs1, edit->last_byte, byte_str,
#ifdef HAVE_CHARSET
mc_global.source_codepage >= 0 ? get_codepage_id (mc_global.source_codepage) : ""
mc_global.source_codepage >=
0 ? get_codepage_id (mc_global.source_codepage) : ""
#else
""
#endif
@ -168,7 +171,8 @@ status_string (WEdit * edit, char *s, int w)
edit->curs_line + 1,
edit->total_lines + 1, edit->curs1, edit->last_byte, byte_str,
#ifdef HAVE_CHARSET
mc_global.source_codepage >= 0 ? get_codepage_id (mc_global.source_codepage) : ""
mc_global.source_codepage >=
0 ? get_codepage_id (mc_global.source_codepage) : ""
#else
""
#endif
@ -197,35 +201,49 @@ print_to_widget (WEdit * edit, long row, int start_col, int start_col_real,
int y = row + EDIT_TEXT_VERTICAL_OFFSET;
int cols_to_skip = abs (x);
int i;
int wrap_start;
int len;
tty_setcolor (EDITOR_NORMAL_COLOR);
if (bookmarked != 0)
tty_setcolor (bookmarked);
if (!show_right_margin)
{
tty_draw_hline (edit->widget.y + y, edit->widget.x + x1, ' ', end_col + 1 - start_col);
}
else if (edit->start_col < option_word_wrap_line_length)
{
tty_draw_hline (edit->widget.y + y,
edit->widget.x + x1, ' ', option_word_wrap_line_length - edit->start_col);
len = end_col + 1 - start_col;
wrap_start = option_word_wrap_line_length + edit->start_col;
if (len > 0 && edit->widget.y + y >= 0)
{
if (!show_right_margin || wrap_start > end_col)
tty_draw_hline (edit->widget.y + y, edit->widget.x + x1, ' ', len);
else if (wrap_start < 0)
{
tty_setcolor (EDITOR_RIGHT_MARGIN_COLOR);
tty_draw_hline (edit->widget.y + y,
edit->widget.x + x1 + option_word_wrap_line_length + edit->start_col,
' ', end_col + 1 - start_col);
tty_draw_hline (edit->widget.y + y, edit->widget.x + x1, ' ', len);
}
else
{
if (wrap_start > 0)
tty_draw_hline (edit->widget.y + y, edit->widget.x + x1, ' ', wrap_start);
len -= wrap_start;
if (len > 0)
{
tty_setcolor (EDITOR_RIGHT_MARGIN_COLOR);
tty_draw_hline (edit->widget.y + y, edit->widget.x + x1 + wrap_start, ' ', len);
}
}
}
if (option_line_state)
{
tty_setcolor (LINE_STATE_COLOR);
for (i = 0; i < LINE_STATE_WIDTH; i++)
{
edit_move (x1 + i + FONT_OFFSET_X - option_line_state_width, y + FONT_OFFSET_Y);
if (status[i] == '\0')
status[i] = ' ';
tty_setcolor (LINE_STATE_COLOR);
edit_move (x1 + FONT_OFFSET_X - option_line_state_width, y + FONT_OFFSET_Y);
tty_print_string (status);
tty_print_char (status[i]);
}
}
edit_move (x1 + FONT_OFFSET_X, y + FONT_OFFSET_Y);
@ -318,9 +336,9 @@ edit_draw_this_line (WEdit * edit, long b, long row, long start_col, long end_co
int utf8lag = 0;
unsigned int cur_line = 0;
int book_mark = 0;
char line_stat[LINE_STATE_WIDTH + 1];
char line_stat[LINE_STATE_WIDTH + 1] = "\0";
if (row > edit->widget.lines - EDIT_TEXT_VERTICAL_OFFSET)
if (row > edit->widget.lines - 1 - EDIT_TEXT_VERTICAL_OFFSET)
return;
if (book_mark_query_color (edit, edit->start_line + row, BOOK_MARK_COLOR))
@ -591,10 +609,10 @@ edit_draw_this_line (WEdit * edit, long b, long row, long start_col, long end_co
/* --------------------------------------------------------------------------------------------- */
static inline void
edit_draw_this_char (WEdit * edit, long curs, long row)
edit_draw_this_char (WEdit * edit, long curs, long row, long start_column, long end_column)
{
int b = edit_bol (edit, curs);
edit_draw_this_line (edit, b, row, 0, edit->widget.cols - 1);
edit_draw_this_line (edit, b, row, start_column, end_column);
}
/* --------------------------------------------------------------------------------------------- */
@ -603,27 +621,69 @@ edit_draw_this_char (WEdit * edit, long curs, long row)
static inline void
render_edit_text (WEdit * edit, long start_row, long start_column, long end_row, long end_column)
{
long row = 0, curs_row;
static long prev_curs_row = 0;
static long prev_curs = 0;
Widget *w = (Widget *) edit;
Dlg_head *h = w->owner;
long row = 0, curs_row;
int force = edit->force;
long b;
int y1, x1, y2, x2;
int last_line;
int last_column;
/* draw only visible region */
last_line = h->y + h->lines - 1;
y1 = w->y;
if (y1 > last_line - 1 /* buttonbar */ )
return;
last_column = h->x + h->cols - 1;
x1 = w->x;
if (x1 > last_column)
return;
y2 = w->y + w->lines - 1;
if (y2 < h->y + 1 /* menubar */ )
return;
x2 = w->x + w->cols - 1;
if (x2 < h->x)
return;
if ((force & REDRAW_IN_BOUNDS) == 0)
{
/* !REDRAW_IN_BOUNDS means to ignore bounds and redraw whole rows */
/* draw only visible region */
if (y2 <= last_line - 1 /* buttonbar */ )
end_row = w->lines - 1;
else if (y1 >= h->y + 1 /* menubar */ )
end_row = h->lines - 1 - y1 - 1;
else
end_row = start_row + h->lines - 1 - 1;
if (x2 <= last_column)
end_column = w->cols - 1;
else if (x1 >= h->x)
end_column = h->cols - 1 - x1;
else
end_column = start_column + h->cols - 1;
}
/*
* If the position of the page has not moved then we can draw the cursor
* character only. This will prevent line flicker when using arrow keys.
*/
if ((!(force & REDRAW_CHAR_ONLY)) || (force & REDRAW_PAGE))
if ((force & REDRAW_CHAR_ONLY) == 0 || (force & REDRAW_PAGE) != 0)
{
if (!(force & REDRAW_IN_BOUNDS))
{ /* !REDRAW_IN_BOUNDS means to ignore bounds and redraw whole rows */
start_row = 0;
end_row = edit->widget.lines - 1;
start_column = 0;
end_column = edit->widget.cols - 1;
}
if (force & REDRAW_PAGE)
if ((force & REDRAW_PAGE) != 0)
{
row = start_row;
b = edit_move_forward (edit, edit->start_display, start_row, 0);
@ -640,11 +700,10 @@ render_edit_text (WEdit * edit, long start_row, long start_column, long end_row,
{
curs_row = edit->curs_row;
if (force & REDRAW_BEFORE_CURSOR)
{
if (start_row < curs_row)
if ((force & REDRAW_BEFORE_CURSOR) != 0 && start_row < curs_row)
{
long upto = curs_row - 1 <= end_row ? curs_row - 1 : end_row;
row = start_row;
b = edit->start_display;
while (row <= upto)
@ -655,7 +714,7 @@ render_edit_text (WEdit * edit, long start_row, long start_column, long end_row,
b = edit_move_forward (edit, b, 1, 0);
}
}
}
/* if (force & REDRAW_LINE) ---> default */
b = edit_bol (edit, edit->curs1);
if (curs_row >= start_row && curs_row <= end_row)
@ -664,9 +723,8 @@ render_edit_text (WEdit * edit, long start_row, long start_column, long end_row,
return;
edit_draw_this_line (edit, b, curs_row, start_column, end_column);
}
if (force & REDRAW_AFTER_CURSOR)
{
if (end_row > curs_row)
if ((force & REDRAW_AFTER_CURSOR) != 0 && end_row > curs_row)
{
row = curs_row + 1 < start_row ? start_row : curs_row + 1;
b = edit_move_forward (edit, b, 1, 0);
@ -679,8 +737,8 @@ render_edit_text (WEdit * edit, long start_row, long start_column, long end_row,
row++;
}
}
}
if (force & REDRAW_LINE_ABOVE && curs_row >= 1)
if ((force & REDRAW_LINE_ABOVE) != 0 && curs_row >= 1)
{
row = curs_row - 1;
b = edit_move_backward (edit, edit_bol (edit, edit->curs1), 1);
@ -691,7 +749,8 @@ render_edit_text (WEdit * edit, long start_row, long start_column, long end_row,
edit_draw_this_line (edit, b, row, start_column, end_column);
}
}
if (force & REDRAW_LINE_BELOW && row < edit->widget.lines - 1)
if ((force & REDRAW_LINE_BELOW) != 0 && row < edit->widget.lines - 1)
{
row = curs_row + 1;
b = edit_bol (edit, edit->curs1);
@ -705,18 +764,16 @@ render_edit_text (WEdit * edit, long start_row, long start_column, long end_row,
}
}
}
else
else if (prev_curs_row < edit->curs_row)
{
if (prev_curs_row < edit->curs_row)
{ /* with the new text highlighting, we must draw from the top down */
edit_draw_this_char (edit, prev_curs, prev_curs_row);
edit_draw_this_char (edit, edit->curs1, edit->curs_row);
/* with the new text highlighting, we must draw from the top down */
edit_draw_this_char (edit, prev_curs, prev_curs_row, start_column, end_column);
edit_draw_this_char (edit, edit->curs1, edit->curs_row, start_column, end_column);
}
else
{
edit_draw_this_char (edit, edit->curs1, edit->curs_row);
edit_draw_this_char (edit, prev_curs, prev_curs_row);
}
edit_draw_this_char (edit, edit->curs1, edit->curs_row, start_column, end_column);
edit_draw_this_char (edit, prev_curs, prev_curs_row, start_column, end_column);
}
edit->force = 0;
@ -749,13 +806,13 @@ edit_render (WEdit * edit, int page, int row_start, int col_start, int row_end,
/*** public functions ****************************************************************************/
/* --------------------------------------------------------------------------------------------- */
/** Draw the status line at the top of the widget. The size of the filename
/** Draw the status line at the top of the screen. The size of the filename
* field varies depending on the width of the screen and the length of
* the filename. */
void
edit_status (WEdit * edit)
{
const int w = edit->widget.cols;
const int w = edit->widget.owner->cols;
const size_t status_size = w + 1;
char *const status = g_malloc (status_size);
int status_len;
@ -783,19 +840,18 @@ edit_status (WEdit * edit)
fname = str_trunc (fname, fname_len);
}
widget_move (edit, 0, 0);
dlg_move (edit->widget.owner, 0, 0);
tty_setcolor (STATUSBAR_COLOR);
printwstr (fname, fname_len + gap);
printwstr (status, w - (fname_len + gap));
if (simple_statusbar && edit->widget.cols > 30)
if (simple_statusbar && w > EDITOR_MINIMUM_TERMINAL_WIDTH)
{
size_t percent;
size_t percent = 100;
if (edit->total_lines + 1 != 0)
percent = (edit->curs_line + 1) * 100 / (edit->total_lines + 1);
else
percent = 100;
widget_move (edit, 0, edit->widget.cols - 5);
dlg_move (edit->widget.owner, 0, w - 5);
tty_printf (" %3d%%", percent);
}
@ -815,7 +871,7 @@ edit_scroll_screen_over_cursor (WEdit * edit)
return;
edit->widget.cols -= EDIT_TEXT_HORIZONTAL_OFFSET + option_line_state_width;
edit->widget.lines -= EDIT_TEXT_VERTICAL_OFFSET - 1;
edit->widget.lines -= EDIT_TEXT_VERTICAL_OFFSET;
r_extreme = EDIT_RIGHT_EXTREME;
l_extreme = EDIT_LEFT_EXTREME;
@ -829,14 +885,20 @@ edit_scroll_screen_over_cursor (WEdit * edit)
if (b_extreme + t_extreme + 1 > edit->widget.lines)
{
int n;
n = b_extreme + t_extreme;
if (n == 0)
n = 1;
b_extreme = (b_extreme * (edit->widget.lines - 1)) / n;
t_extreme = (t_extreme * (edit->widget.lines - 1)) / n;
}
if (l_extreme + r_extreme + 1 > edit->widget.cols)
{
int n;
n = l_extreme + t_extreme;
if (n == 0)
n = 1;
l_extreme = (l_extreme * (edit->widget.cols - 1)) / n;
r_extreme = (r_extreme * (edit->widget.cols - 1)) / n;
}
@ -857,7 +919,7 @@ edit_scroll_screen_over_cursor (WEdit * edit)
edit_scroll_upward (edit, outby);
edit_update_curs_row (edit);
edit->widget.lines += EDIT_TEXT_VERTICAL_OFFSET - 1;
edit->widget.lines += EDIT_TEXT_VERTICAL_OFFSET;
edit->widget.cols += EDIT_TEXT_HORIZONTAL_OFFSET + option_line_state_width;
}

59
src/editor/editwidget.c
View File

@ -43,6 +43,8 @@
#include "lib/tty/tty.h" /* LINES, COLS */
#include "lib/tty/key.h" /* is_idle() */
#include "lib/tty/color.h" /* tty_setcolor() */
#include "lib/skin.h" /* EDITOR_NORMAL_COLOR */
#include "lib/strutil.h" /* str_term_trim() */
#include "lib/util.h" /* concat_dir_and_file() */
#include "lib/widget.h"
@ -115,22 +117,12 @@ edit_event (Gpm_Event * event, void *data)
if (!(event->type & (GPM_DOWN | GPM_DRAG | GPM_UP)))
return MOU_NORMAL;
/* rest of the upper frame, the menu is invisible - call menu */
if ((event->type & GPM_DOWN) && (event->y == 1))
{
WMenuBar *menubar;
menubar = find_menubar (edit->widget.owner);
return menubar->widget.mouse (event, menubar);
}
edit_update_curs_row (edit);
edit_update_curs_col (edit);
/* Outside editor window */
if (event->y <= 1 || event->x <= 0
|| event->x > edit->widget.cols || event->y > edit->widget.lines + 1)
if (event->y < 1 || event->x < 1
|| event->x > edit->widget.cols || event->y > edit->widget.lines)
return MOU_NORMAL;
/* Double click */
@ -166,7 +158,9 @@ edit_event (Gpm_Event * event, void *data)
if (event->type & (GPM_DOWN | GPM_UP))
edit_push_key_press (edit);
if (option_cursor_beyond_eol)
if (!option_cursor_beyond_eol)
edit->prev_col = event->x - edit->start_col - option_line_state_width - 1;
else
{
long line_len = edit_move_forward3 (edit, edit_bol (edit, edit->curs1), 0,
edit_eol (edit, edit->curs1));
@ -182,15 +176,12 @@ edit_event (Gpm_Event * event, void *data)
edit->prev_col = event->x - option_line_state_width - edit->start_col - 1;
}
}
else
{
edit->prev_col = event->x - edit->start_col - option_line_state_width - 1;
}
if (--event->y > (edit->curs_row + 1))
edit_move_down (edit, event->y - (edit->curs_row + 1), 0);
else if (event->y < (edit->curs_row + 1))
edit_move_up (edit, (edit->curs_row + 1) - event->y, 0);
--event->y;
if (event->y > edit->curs_row)
edit_move_down (edit, event->y - edit->curs_row, 0);
else if (event->y < edit->curs_row)
edit_move_up (edit, edit->curs_row - event->y, 0);
else
edit_move_to_prev_col (edit, edit_bol (edit, edit->curs1));
@ -265,11 +256,20 @@ edit_dialog_callback (Dlg_head * h, Widget * sender, dlg_msg_t msg, int parm, vo
edit_set_buttonbar (edit, buttonbar);
return MSG_HANDLED;
case DLG_DRAW:
/* don't use common_dialog_repaint() -- we don't need a frame */
tty_setcolor (EDITOR_NORMAL_COLOR);
dlg_erase (h);
return MSG_HANDLED;
case DLG_RESIZE:
widget_set_size (&edit->widget, 0, 0, LINES - 1, COLS);
widget_set_size (&buttonbar->widget, LINES - 1, 0, 1, COLS);
widget_set_size (&menubar->widget, 0, 0, 1, COLS);
/* dlg_set_size() is surplus for this case */
h->lines = LINES;
h->cols = COLS;
widget_set_size (&buttonbar->widget, h->lines - 1, h->x, 1, h->cols);
widget_set_size (&menubar->widget, h->y, h->x, 1, h->cols);
menubar_arrange (menubar);
widget_set_size (&edit->widget, h->y + 1, h->x, h->lines - 2, h->cols);
return MSG_HANDLED;
case DLG_ACTION:
@ -301,8 +301,6 @@ edit_callback (Widget * w, widget_msg_t msg, int parm)
{
case WIDGET_DRAW:
e->force |= REDRAW_COMPLETELY;
e->widget.lines = LINES - 2;
e->widget.cols = COLS;
/* fallthrough */
case WIDGET_FOCUS:
@ -334,7 +332,7 @@ edit_callback (Widget * w, widget_msg_t msg, int parm)
return edit_command_execute (e, parm);
case WIDGET_CURSOR:
widget_move (&e->widget, e->curs_row + EDIT_TEXT_VERTICAL_OFFSET,
widget_move (w, e->curs_row + EDIT_TEXT_VERTICAL_OFFSET,
e->curs_col + e->start_col + e->over_col +
EDIT_TEXT_HORIZONTAL_OFFSET + option_line_state_width);
return MSG_HANDLED;
@ -375,7 +373,7 @@ edit_file (const char *_file, int line)
g_free (dir);
}
wedit = edit_init (NULL, LINES - 2, COLS, _file, line);
wedit = edit_init (NULL, 1, 0, LINES - 2, COLS, _file, line);
if (wedit == NULL)
return 0;
@ -392,8 +390,9 @@ edit_file (const char *_file, int line)
add_widget (edit_dlg, menubar);
edit_init_menu (menubar);
init_widget (&(wedit->widget), 0, 0, LINES - 1, COLS, edit_callback, edit_event);
widget_want_cursor (wedit->widget, 1);
init_widget (&wedit->widget, wedit->widget.y, wedit->widget.x,
wedit->widget.lines, wedit->widget.cols, edit_callback, edit_event);
widget_want_cursor (wedit->widget, TRUE);
add_widget (edit_dlg, wedit);