nyje/medit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

r1174@localhost: muntyan | 2005-11-28 23:42:54 -0600

Browse Source 
Undoublescored everything back
This commit is contained in:
Yevgen Muntyan 2005-11-29 17:29:29 +00:00
parent a2ebfb5949
commit 214e0bf75f
6 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
moo/mooterm/mooterm-draw.c
View File

@ -709,7 +709,7 @@ term_draw_range_simple (MooTerm *term,
else
bg = term->priv->fg[COLOR_NORMAL];
if (start >= __moo_term_line_width (line))
if (start >= _moo_term_line_width (line))
{
gdk_draw_rectangle (term->priv->back_pixmap,
bg,
@ -721,20 +721,20 @@ term_draw_range_simple (MooTerm *term,
return;
}
else if (start + len > __moo_term_line_width (line))
else if (start + len > _moo_term_line_width (line))
{
gdk_draw_rectangle (term->priv->back_pixmap,
bg,
TRUE,
__moo_term_line_width (line) * CHAR_WIDTH(term),
_moo_term_line_width (line) * CHAR_WIDTH(term),
y,
(start + len - __moo_term_line_width (line)) * CHAR_WIDTH(term),
(start + len - _moo_term_line_width (line)) * CHAR_WIDTH(term),
CHAR_HEIGHT(term));
len = __moo_term_line_width (line) - start;
len = _moo_term_line_width (line) - start;
}
g_assert (start + len <= __moo_term_line_width (line));
g_assert (start + len <= _moo_term_line_width (line));
while (len)
{
@ -771,7 +771,7 @@ term_draw_cells (MooTerm *term,
MooTermLine *line = buf_line (term->priv->buffer, abs_row);
g_assert (len != 0);
g_assert (start + len <= __moo_term_line_width (line));
g_assert (start + len <= _moo_term_line_width (line));
buf_len = _moo_term_line_get_chars (line, buf, start, len);
g_return_if_fail (buf_len != 0);
@ -850,7 +850,7 @@ term_draw_cursor (MooTerm *term)
guint column = term->priv->cursor_col;
MooTermLine *line = buf_line (term->priv->buffer, abs_row);
if (__moo_term_line_width (line) > column)
if (_moo_term_line_width (line) > column)
{
return term_draw_cells (term, abs_row, column, 1,
_moo_term_line_get_attr (line, column),

30
moo/mooterm/mooterm-text.c
View File

@ -1198,7 +1198,7 @@ static gunichar
iter_get_char (const MooTermIter *iter)
{
MooTermLine *line = buf_line (iter->term->priv->buffer, iter->row);
return __moo_term_line_get_char (line, iter->col);
return _moo_term_line_get_char (line, iter->col);
}
@ -1226,8 +1226,8 @@ segment_get_text (Segment *segment)
line = buf_line (buf, ITER_ROW(&start));
for (j = ITER_COL(&start);
j < ITER_COL(&end) && j < (int) __moo_term_line_len (line); ++j)
g_string_append_unichar (text, __moo_term_line_get_char (line, j));
j < ITER_COL(&end) && j < (int) _moo_term_line_len (line); ++j)
g_string_append_unichar (text, _moo_term_line_get_char (line, j));
}
else
{
@ -1235,10 +1235,10 @@ segment_get_text (Segment *segment)
{
line = buf_line (buf, ITER_ROW(&start));
for (j = ITER_COL(&start); j < (int) __moo_term_line_len (line); ++j)
g_string_append_unichar (text, __moo_term_line_get_char (line, j));
for (j = ITER_COL(&start); j < (int) _moo_term_line_len (line); ++j)
g_string_append_unichar (text, _moo_term_line_get_char (line, j));
if (!__moo_term_line_wrapped (line))
if (!_moo_term_line_wrapped (line))
g_string_append_c (text, '\n');
}
@ -1246,10 +1246,10 @@ segment_get_text (Segment *segment)
{
line = buf_line (buf, i);
for (j = 0; j < (int) __moo_term_line_len (line); ++j)
g_string_append_unichar (text, __moo_term_line_get_char (line, j));
for (j = 0; j < (int) _moo_term_line_len (line); ++j)
g_string_append_unichar (text, _moo_term_line_get_char (line, j));
if (!__moo_term_line_wrapped (line))
if (!_moo_term_line_wrapped (line))
g_string_append_c (text, '\n');
}
@ -1258,7 +1258,7 @@ segment_get_text (Segment *segment)
line = buf_line (buf, ITER_ROW(&end));
for (j = 0; j < ITER_COL(&start); ++j)
g_string_append_unichar (text, __moo_term_line_get_char (line, j));
g_string_append_unichar (text, _moo_term_line_get_char (line, j));
}
}
@ -1349,7 +1349,7 @@ moo_term_get_iter_at_line_offset (MooTerm *term,
line = buf_line (term->priv->buffer, line_no);
if (offset > __moo_term_line_width (line))
if (offset > _moo_term_line_width (line))
return FALSE;
FILL_ITER (iter, term, line_no, offset);
@ -1412,7 +1412,7 @@ moo_term_apply_tag (MooTerm *term,
{
line = buf_line (buf, ITER_ROW (start));
_moo_term_line_apply_tag (line, tag, ITER_COL (start),
__moo_term_line_width (line) - ITER_COL (start));
_moo_term_line_width (line) - ITER_COL (start));
line = buf_line (buf, ITER_ROW (end));
_moo_term_line_apply_tag (line, tag, 0, ITER_COL (end));
if (ITER_ROW (start) + 1 < ITER_ROW (end))
@ -1421,7 +1421,7 @@ moo_term_apply_tag (MooTerm *term,
{
line = buf_line (buf, i);
_moo_term_line_apply_tag (line, tag, 0,
__moo_term_line_width (line));
_moo_term_line_width (line));
}
}
}
@ -1461,7 +1461,7 @@ moo_term_remove_tag (MooTerm *term,
{
line = buf_line (buf, ITER_ROW (start));
_moo_term_line_remove_tag (line, tag, ITER_COL (start),
__moo_term_line_width (line) - ITER_COL (start));
_moo_term_line_width (line) - ITER_COL (start));
line = buf_line (buf, ITER_ROW (end));
_moo_term_line_remove_tag (line, tag, 0, ITER_COL (end));
if (ITER_ROW (start) + 1 < ITER_ROW (end))
@ -1470,7 +1470,7 @@ moo_term_remove_tag (MooTerm *term,
{
line = buf_line (buf, i);
_moo_term_line_remove_tag (line, tag, 0,
__moo_term_line_width (line));
_moo_term_line_width (line));
}
}
}

10
moo/mooterm/mootermbuffer.c
View File

@ -636,7 +636,7 @@ static void buf_print_unichar_real (MooTermBuffer *buf,
}
line = buf_screen_line (buf, cursor_row);
g_assert (__moo_term_line_width (line) == width);
g_assert (_moo_term_line_width (line) == width);
if (buf_get_mode (MODE_IRM))
{
@ -660,7 +660,7 @@ static void buf_print_unichar_real (MooTermBuffer *buf,
if (buf_get_mode (MODE_DECAWM))
{
__moo_term_line_set_wrapped (line);
_moo_term_line_set_wrapped (line);
_moo_term_buffer_new_line (buf);
}
}
@ -1323,7 +1323,7 @@ _moo_term_buffer_delete_char (MooTermBuffer *buf,
}
line = buf_screen_line (buf, cursor_row);
g_assert (__moo_term_line_width (line) == buf_screen_width (buf));
g_assert (_moo_term_line_width (line) == buf_screen_width (buf));
_moo_term_line_delete_range (line, cursor_col, n, buf->priv->current_attr);
buf_changed_add_range(buf, cursor_row, cursor_col,
buf_screen_width (buf) - cursor_col);
@ -1452,7 +1452,7 @@ _moo_term_buffer_insert_char (MooTermBuffer *buf,
}
line = buf_screen_line (buf, cursor_row);
g_assert (__moo_term_line_width (line) == buf_screen_width (buf));
g_assert (_moo_term_line_width (line) == buf_screen_width (buf));
_moo_term_line_insert_unichar (line, cursor_col, 0, n,
buf->priv->current_attr);
@ -1742,7 +1742,7 @@ _moo_term_buffer_decaln (MooTermBuffer *buf)
for (i = 0; i < height; ++i)
{
MooTermLine *line = buf_screen_line (buf, i);
g_assert (__moo_term_line_width (line) == width);
g_assert (_moo_term_line_width (line) == width);
_moo_term_line_set_unichar (line, 0, MOO_TERM_DECALN_CHAR, width,
buf->priv->current_attr);
}

26
moo/mooterm/mootermline-private.h
View File

@ -115,22 +115,22 @@ gboolean _moo_term_line_wrapped_chk__ (MooTermLine *line);
#define MOO_TERM_LINE_WIDTH__(line__) ((line__)->width)
#define MOO_TERM_LINE_WRAPPED__(line__) ((line__)->wrapped != 0)
#define __moo_term_line_set_wrapped(line__) (line__)->wrapped = TRUE
#define _moo_term_line_set_wrapped(line__) (line__)->wrapped = TRUE
#if 1
#define __moo_term_line_get_cell(line__,index__) (_moo_term_line_get_cell_chk__(line__, index__))
#define __moo_term_line_get_char(line__,index__) (_moo_term_line_get_char_chk__(line__, index__))
#define __moo_term_line_get_tags(line__,index__) (_moo_term_line_get_tags_chk__(line__, index__))
#define __moo_term_line_len(line__) (_moo_term_line_len_chk__(line__))
#define __moo_term_line_width(line__) (_moo_term_line_width_chk__(line__))
#define __moo_term_line_wrapped(line__) (_moo_term_line_wrapped_chk__(line__))
#define _moo_term_line_get_cell(line__,index__) (_moo_term_line_get_cell_chk__(line__, index__))
#define _moo_term_line_get_char(line__,index__) (_moo_term_line_get_char_chk__(line__, index__))
#define _moo_term_line_get_tags(line__,index__) (_moo_term_line_get_tags_chk__(line__, index__))
#define _moo_term_line_len(line__) (_moo_term_line_len_chk__(line__))
#define _moo_term_line_width(line__) (_moo_term_line_width_chk__(line__))
#define _moo_term_line_wrapped(line__) (_moo_term_line_wrapped_chk__(line__))
#else
#define __moo_term_line_get_cell(line__,index__) (MOO_TERM_LINE_CELL__ (line__,index__))
#define __moo_term_line_get_char(line__,index__) (MOO_TERM_LINE_CHAR__ (line__,index__))
#define __moo_term_line_get_tags(line__,index__) (MOO_TERM_LINE_TAGS__ (line__,index__))
#define __moo_term_line_len(line__) (MOO_TERM_LINE_LEN__ (line__))
#define __moo_term_line_width(line__) (MOO_TERM_LINE_WIDTH__ (line__))
#define __moo_term_line_wrapped(line__) (MOO_TERM_LINE_WRAPPED__ (line__))
#define _moo_term_line_get_cell(line__,index__) (MOO_TERM_LINE_CELL__ (line__,index__))
#define _moo_term_line_get_char(line__,index__) (MOO_TERM_LINE_CHAR__ (line__,index__))
#define _moo_term_line_get_tags(line__,index__) (MOO_TERM_LINE_TAGS__ (line__,index__))
#define _moo_term_line_len(line__) (MOO_TERM_LINE_LEN__ (line__))
#define _moo_term_line_width(line__) (MOO_TERM_LINE_WIDTH__ (line__))
#define _moo_term_line_wrapped(line__) (MOO_TERM_LINE_WRAPPED__ (line__))
#endif

2
moo/mooterm/mootermline.c
View File

@ -385,7 +385,7 @@ _moo_term_line_get_chars (MooTermLine *line,
for (i = first; i < first + len; ++i)
{
gunichar c = __moo_term_line_get_char (line, i);
gunichar c = _moo_term_line_get_char (line, i);
guint l = g_unichar_to_utf8 (c, buf);
buf += l;
res += l;

2
moo/mooterm/mootermtag.c
View File

@ -269,7 +269,7 @@ moo_term_delete_tag (MooTerm *term,
{
MooTermLine *line = l->data;
_moo_term_line_remove_tag (line, tag, 0,
__moo_term_line_width (line));
_moo_term_line_width (line));
}
if (tag->name)