[vte/vte-next: 206/223] Rename
- From: Christian Persch <chpe src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vte/vte-next: 206/223] Rename
- Date: Wed, 22 Jun 2011 21:05:54 +0000 (UTC)
commit 2ee6916a6e4528beb992d49c2e968f3ce7c6f06d
Author: Christian Persch <chpe gnome org>
Date: Sun Jun 19 23:06:17 2011 +0200
Rename
doc/reference/vte-docs.xml | 2 +-
doc/reference/vte-sections.txt | 94 +-
doc/reference/vte.types | 10 +-
src/Makefile.am | 2 +-
src/palette.c | 4 +-
src/pty.c | 4 +-
src/reflect.c | 8 +-
src/ring.c | 2 +-
src/vte-private.h | 32 +-
src/vte.c | 1968 ++++++++++++++++++++--------------------
src/vte.h | 156 +---
src/vteaccess.c | 662 +++++++-------
src/vteaccess.h | 52 +-
src/vteapp.c | 128 ++--
src/vteint.h | 12 +-
src/vtepalettecss.h | 522 ++++++------
src/vtepalettedefs.h | 526 ++++++------
src/vteseq.c | 10 +-
src/vteview.h | 179 ++++
19 files changed, 2202 insertions(+), 2171 deletions(-)
---
diff --git a/doc/reference/vte-docs.xml b/doc/reference/vte-docs.xml
index 67276bd..4d24eca 100644
--- a/doc/reference/vte-docs.xml
+++ b/doc/reference/vte-docs.xml
@@ -56,7 +56,7 @@
<xi:include href="xml/vte-buffer.xml"/>
</chapter>
<chapter>
- <xi:include href="xml/vte-terminal.xml"/>
+ <xi:include href="xml/vte-view.xml"/>
</chapter>
<chapter>
<xi:include href="xml/vte-pty.xml"/>
diff --git a/doc/reference/vte-sections.txt b/doc/reference/vte-sections.txt
index d4a49a8..7b1c8d3 100644
--- a/doc/reference/vte-sections.txt
+++ b/doc/reference/vte-sections.txt
@@ -1,47 +1,47 @@
<SECTION>
<FILE>vte-terminal</FILE>
-<TITLE>VteTerminal</TITLE>
-VteTerminal
+<TITLE>VteView</TITLE>
+VteView
VteCursorBlinkMode
VteCursorShape
VteEffect
VteEraseBinding
VteWriteFlags
VteSelectionFunc
-vte_terminal_new
-vte_terminal_set_buffer
-vte_terminal_get_buffer
-vte_terminal_im_append_menuitems
-vte_terminal_select_all
-vte_terminal_unselect_all
-vte_terminal_copy_clipboard
-vte_terminal_paste_clipboard
-vte_terminal_set_font_scale
-vte_terminal_get_font_scale
-vte_terminal_set_audible_bell
-vte_terminal_get_audible_bell
-vte_terminal_set_visible_bell
-vte_terminal_get_visible_bell
-vte_terminal_set_scroll_on_output
-vte_terminal_set_scroll_on_keystroke
-vte_terminal_get_has_selection
-vte_terminal_get_selection_bounds
-vte_terminal_set_word_chars
-vte_terminal_set_mouse_autohide
-vte_terminal_get_mouse_autohide
-vte_terminal_match_add_gregex
-vte_terminal_match_remove
-vte_terminal_match_remove_all
-vte_terminal_match_check
-vte_terminal_match_set_cursor
-vte_terminal_match_set_cursor_type
-vte_terminal_match_set_cursor_name
-vte_terminal_search_find_next
-vte_terminal_search_find_previous
-vte_terminal_search_get_gregex
-vte_terminal_search_get_wrap_around
-vte_terminal_search_set_gregex
-vte_terminal_search_set_wrap_around
+vte_view_new
+vte_view_set_buffer
+vte_view_get_buffer
+vte_view_im_append_menuitems
+vte_view_select_all
+vte_view_unselect_all
+vte_view_copy_clipboard
+vte_view_paste_clipboard
+vte_view_set_font_scale
+vte_view_get_font_scale
+vte_view_set_audible_bell
+vte_view_get_audible_bell
+vte_view_set_visible_bell
+vte_view_get_visible_bell
+vte_view_set_scroll_on_output
+vte_view_set_scroll_on_keystroke
+vte_view_get_has_selection
+vte_view_get_selection_bounds
+vte_view_set_word_chars
+vte_view_set_mouse_autohide
+vte_view_get_mouse_autohide
+vte_view_match_add_gregex
+vte_view_match_remove
+vte_view_match_remove_all
+vte_view_match_check
+vte_view_match_set_cursor
+vte_view_match_set_cursor_type
+vte_view_match_set_cursor_name
+vte_view_search_find_next
+vte_view_search_find_previous
+vte_view_search_get_gregex
+vte_view_search_get_wrap_around
+vte_view_search_set_gregex
+vte_view_search_set_wrap_around
<SUBSECTION>
VTE_STYLE_CLASS_TERMINAL
@@ -61,22 +61,22 @@ VTE_TYPE_ERASE_BINDING
vte_erase_binding_get_type
VTE_TYPE_WRITE_FLAGS
vte_write_flags_get_type
-VTE_TYPE_TERMINAL
-vte_terminal_get_type
-VTE_IS_TERMINAL
-VTE_TERMINAL
-VTE_TERMINAL_GET_CLASS
-VTE_IS_TERMINAL_CLASS
-VTE_TERMINAL_CLASS
+VTE_TYPE_VIEW
+vte_view_get_type
+VTE_IS_VIEW
+VTE_VIEW
+VTE_VIEW_GET_CLASS
+VTE_IS_VIEW_CLASS
+VTE_VIEW_CLASS
<SUBSECTION Binding Accessors>
-vte_terminal_get_char_height
-vte_terminal_get_char_width
+vte_view_get_char_height
+vte_view_get_char_width
<SUBSECTION Private>
VteCharAttributes
-VteTerminalPrivate
-VteTerminalClassPrivate
+VteViewPrivate
+VteViewClassPrivate
</SECTION>
<SECTION>
diff --git a/doc/reference/vte.types b/doc/reference/vte.types
index b7c73a0..6188278 100644
--- a/doc/reference/vte.types
+++ b/doc/reference/vte.types
@@ -8,11 +8,11 @@
#include "vtetypebuiltins.h"
vte_pty_get_type
-vte_terminal_get_type
+vte_view_get_type
vte_pty_error_get_type
vte_pty_flags_get_type
-vte_terminal_cursor_blink_mode_get_type
-vte_terminal_cursor_shape_get_type
-vte_terminal_erase_binding_get_type
-vte_terminal_write_flags_get_type
+vte_view_cursor_blink_mode_get_type
+vte_view_cursor_shape_get_type
+vte_view_erase_binding_get_type
+vte_view_write_flags_get_type
diff --git a/src/Makefile.am b/src/Makefile.am
index 2827ff2..5d9382d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,7 +5,7 @@ EXTRA_DIST = iso2022.txt palette.c
# The library
headerdir = $(includedir)/vte-$(VTE_API_VERSION)/vte
-header_HEADERS = vte.h vtebuffer.h vteenums.h vtepty.h vtetypebuiltins.h vteversion.h
+header_HEADERS = vte.h vtebuffer.h vteenums.h vtepty.h vtetypebuiltins.h vteversion.h vteview.h
lib_LTLIBRARIES = libvte VTE_LIBRARY_SUFFIX_U@.la
diff --git a/src/palette.c b/src/palette.c
index 519fa72..a990819 100644
--- a/src/palette.c
+++ b/src/palette.c
@@ -95,7 +95,7 @@ write_style_property (const char *property_name,
color_string = gdk_rgba_to_string (color);
g_print ("/**\n"
- " * VteTerminal:%s:\n"
+ " * VteView:%s:\n"
" *\n"
" * %s\n"
" *\n"
@@ -126,7 +126,7 @@ write_css_property (const char *property_name,
return;
color_string = gdk_rgba_to_string (color);
- g_print ("\"-VteTerminal-%s: %s;\\n\"\n",
+ g_print ("\"-VteView-%s: %s;\\n\"\n",
property_name,
color_string);
g_free (color_string);
diff --git a/src/pty.c b/src/pty.c
index a5ebfe1..ac51983 100644
--- a/src/pty.c
+++ b/src/pty.c
@@ -418,7 +418,7 @@ __vte_pty_merge_environ (char **envp, const char *term_value)
* Uses g_spawn_async() to spawn the command in @argv. The child's environment will
* be the parent environment with the variables in @envv set afterwards.
*
- * Enforces the vte_terminal_watch_child() requirements by adding
+ * Enforces the vte_view_watch_child() requirements by adding
* %G_SPAWN_DO_NOT_REAP_CHILD to @spawn_flags.
*
* Note that the %G_SPAWN_LEAVE_DESCRIPTORS_OPEN flag is not supported;
@@ -732,7 +732,7 @@ _vte_pty_getpt(GError **error)
}
/* Set it to blocking. */
- /* FIXMEchpe: why?? vte_terminal_set_pty does the inverse... */
+ /* FIXMEchpe: why?? vte_view_set_pty does the inverse... */
flags = rv & ~(O_NONBLOCK);
rv = fcntl(fd, F_SETFL, flags);
if (rv < 0) {
diff --git a/src/reflect.c b/src/reflect.c
index 2664d07..7a7f175 100644
--- a/src/reflect.c
+++ b/src/reflect.c
@@ -53,15 +53,15 @@ terminal_adjustment_text_view(GtkWidget *terminal)
#endif
#ifdef USE_VTE
/*
- * Implementation for a VteTerminal widget.
+ * Implementation for a VteView widget.
*/
static void
terminal_init_vte(GtkWidget **terminal)
{
VteBuffer *buffer;
- *terminal = vte_terminal_new();
- buffer = vte_terminal_get_buffer(VTE_TERMINAL(*terminal));
+ *terminal = vte_view_new();
+ buffer = vte_view_get_buffer(VTE_VIEW(*terminal));
g_signal_connect(buffer, "eof",
G_CALLBACK(gtk_main_quit), NULL);
g_signal_connect(buffer, "child-exited",
@@ -74,7 +74,7 @@ terminal_shell_vte(GtkWidget *terminal)
argv[0] = vte_get_user_shell ();
argv[1] = NULL;
- vte_terminal_fork_command_full(VTE_TERMINAL(terminal),
+ vte_view_fork_command_full(VTE_VIEW(terminal),
VTE_PTY_DEFAULT,
g_get_home_dir() ? g_get_home_dir() : NULL,
argv,
diff --git a/src/ring.c b/src/ring.c
index e54ab23..fea86aa 100644
--- a/src/ring.c
+++ b/src/ring.c
@@ -590,7 +590,7 @@ _vte_ring_write_row (VteRing *ring,
* _vte_ring_write_contents_sync:
* @ring: a #VteRing
* @stream: a #GOutputStream to write to
- * @flags: a set of #VteTerminalWriteFlags
+ * @flags: a set of #VteViewWriteFlags
* @cancellable: optional #GCancellable object, %NULL to ignore
* @error: a #GError location to store the error occuring, or %NULL to ignore
*
diff --git a/src/vte-private.h b/src/vte-private.h
index fc58090..3b0c205 100644
--- a/src/vte-private.h
+++ b/src/vte-private.h
@@ -159,8 +159,8 @@ struct _VteBufferClassPrivate {
};
struct _VteBufferPrivate {
- /* The VteTerminal that's displaying this buffer */
- VteTerminal *terminal;
+ /* The VteView that's displaying this buffer */
+ VteView *terminal;
/* Metric and sizing data: dimensions of the window */
glong row_count;
@@ -171,7 +171,7 @@ struct _VteBufferPrivate {
struct _vte_matcher *matcher; /* control sequence matcher */
const char *termcap_path; /* path to termcap file */
const char *emulation; /* terminal type to emulate */
- struct vte_terminal_flags { /* boolean termcap flags */
+ struct vte_view_flags { /* boolean termcap flags */
gboolean am;
gboolean bw;
gboolean LP;
@@ -296,7 +296,7 @@ struct _VteBufferPrivate {
};
-struct _VteTerminalPrivate {
+struct _VteViewPrivate {
VteBuffer *buffer;
VteBufferPrivate *buffer_pvt;
@@ -442,39 +442,39 @@ struct _VteTerminalPrivate {
};
-struct _VteTerminalClassPrivate {
+struct _VteViewClassPrivate {
GtkStyleProvider *style_provider;
};
-void _vte_terminal_set_pointer_visible(VteTerminal *terminal, gboolean visible);
-void _vte_invalidate_all(VteTerminal *terminal);
-void _vte_invalidate_cells(VteTerminal *terminal,
+void _vte_view_set_pointer_visible(VteView *terminal, gboolean visible);
+void _vte_invalidate_all(VteView *terminal);
+void _vte_invalidate_cells(VteView *terminal,
glong column_start, gint column_count,
glong row_start, gint row_count);
-void _vte_invalidate_cell(VteTerminal *terminal, glong col, glong row);
-void _vte_invalidate_cursor_once(VteTerminal *terminal, gboolean periodic);
-void _vte_terminal_adjust_adjustments(VteTerminal *terminal);
-void _vte_terminal_scroll_region(VteTerminal *terminal,
+void _vte_invalidate_cell(VteView *terminal, glong col, glong row);
+void _vte_invalidate_cursor_once(VteView *terminal, gboolean periodic);
+void _vte_view_adjust_adjustments(VteView *terminal);
+void _vte_view_scroll_region(VteView *terminal,
long row, glong count, glong delta);
-gboolean _vte_terminal_xy_to_grid(VteTerminal *terminal,
+gboolean _vte_view_xy_to_grid(VteView *terminal,
long x,
long y,
long *col,
long *row);
-gboolean _vte_terminal_size_to_grid_size(VteTerminal *terminal,
+gboolean _vte_view_size_to_grid_size(VteView *terminal,
long w,
long h,
long *cols,
long *rows);
-void _vte_terminal_set_effect_color(VteTerminal *terminal,
+void _vte_view_set_effect_color(VteView *terminal,
int entry,
const GdkRGBA *rgba,
VteEffect effect,
gboolean override);
-gboolean _vte_terminal_is_word_char(VteTerminal *terminal, gunichar c);
+gboolean _vte_view_is_word_char(VteView *terminal, gunichar c);
/* private VteBuffer methods */
diff --git a/src/vte.c b/src/vte.c
index a8e1837..b7da64c 100644
--- a/src/vte.c
+++ b/src/vte.c
@@ -18,10 +18,10 @@
*/
/**
- * SECTION: vte-terminal
+ * SECTION: vte-view
* @short_description: A terminal widget implementation
*
- * A VteTerminal is a terminal emulator implemented as a GTK+ widget.
+ * A VteView is a terminal emulator implemented as a GTK+ widget.
*/
#include <config.h>
@@ -71,11 +71,11 @@ typedef gunichar wint_t;
#define CAIRO_GOBJECT_TYPE_PATTERN (g_type_from_name("CairoPattern"))
-static void vte_terminal_emit_copy_clipboard(VteTerminal *terminal);
-static void vte_terminal_emit_paste_clipboard(VteTerminal *terminal);
-static void vte_terminal_emit_copy_primary(VteTerminal *terminal);
-static void vte_terminal_emit_paste_primary(VteTerminal *terminal);
-static void vte_terminal_set_visibility (VteTerminal *terminal, GdkVisibilityState state);
+static void vte_view_emit_copy_clipboard(VteView *terminal);
+static void vte_view_emit_paste_clipboard(VteView *terminal);
+static void vte_view_emit_copy_primary(VteView *terminal);
+static void vte_view_emit_paste_primary(VteView *terminal);
+static void vte_view_set_visibility (VteView *terminal, GdkVisibilityState state);
static void vte_buffer_set_termcap(VteBuffer *buffer, const char *path,
gboolean reset);
static gboolean vte_buffer_io_read(GIOChannel *channel,
@@ -84,17 +84,17 @@ static gboolean vte_buffer_io_read(GIOChannel *channel,
static gboolean vte_buffer_io_write(GIOChannel *channel,
GIOCondition condition,
VteBuffer *buffer);
-static void vte_terminal_match_hilite_clear(VteTerminal *terminal);
-static void vte_terminal_match_hilite_hide(VteTerminal *terminal);
-static void vte_terminal_match_hilite_show(VteTerminal *terminal, long x, long y);
-static void vte_terminal_match_hilite_update(VteTerminal *terminal, long x, long y);
-static void vte_terminal_match_contents_clear(VteTerminal *terminal);
-static gboolean vte_terminal_background_update(VteTerminal *data);
-static void vte_terminal_queue_background_update(VteTerminal *terminal);
-static void vte_terminal_emit_pending_signals(VteTerminal *terminal);
-static gboolean vte_terminal_cell_is_selected(VteBuffer *buffer,
+static void vte_view_match_hilite_clear(VteView *terminal);
+static void vte_view_match_hilite_hide(VteView *terminal);
+static void vte_view_match_hilite_show(VteView *terminal, long x, long y);
+static void vte_view_match_hilite_update(VteView *terminal, long x, long y);
+static void vte_view_match_contents_clear(VteView *terminal);
+static gboolean vte_view_background_update(VteView *data);
+static void vte_view_queue_background_update(VteView *terminal);
+static void vte_view_emit_pending_signals(VteView *terminal);
+static gboolean vte_view_cell_is_selected(VteBuffer *buffer,
glong col, glong row,
- VteTerminal *terminal);
+ VteView *terminal);
static char *vte_buffer_get_text_range_maybe_wrapped(VteBuffer *buffer,
glong start_row,
glong start_col,
@@ -111,19 +111,19 @@ static char *vte_buffer_get_text_maybe_wrapped(VteBuffer *buffer,
gpointer data,
GArray *attributes,
gboolean include_trailing_spaces);
-static void vte_terminal_stop_processing (VteTerminal *terminal);
-
-static inline gboolean vte_terminal_is_processing (VteTerminal *terminal);
-static inline void vte_terminal_start_processing (VteTerminal *terminal);
-static void vte_terminal_add_process_timeout (VteTerminal *terminal);
-static void add_update_timeout (VteTerminal *terminal);
-static void remove_update_timeout (VteTerminal *terminal);
-static void reset_update_regions (VteTerminal *terminal);
-static void vte_terminal_set_cursor_blinks_internal(VteTerminal *terminal, gboolean blink);
-static void _vte_check_cursor_blink(VteTerminal *terminal);
-static void vte_terminal_set_font(VteTerminal *terminal, PangoFontDescription *desc /* adopted */);
-static void vte_terminal_beep(VteTerminal *terminal, VteBellType bell_type);
-static void vte_terminal_buffer_contents_changed(VteTerminal *terminal);
+static void vte_view_stop_processing (VteView *terminal);
+
+static inline gboolean vte_view_is_processing (VteView *terminal);
+static inline void vte_view_start_processing (VteView *terminal);
+static void vte_view_add_process_timeout (VteView *terminal);
+static void add_update_timeout (VteView *terminal);
+static void remove_update_timeout (VteView *terminal);
+static void reset_update_regions (VteView *terminal);
+static void vte_view_set_cursor_blinks_internal(VteView *terminal, gboolean blink);
+static void _vte_check_cursor_blink(VteView *terminal);
+static void vte_view_set_font(VteView *terminal, PangoFontDescription *desc /* adopted */);
+static void vte_view_beep(VteView *terminal, VteBellType bell_type);
+static void vte_view_buffer_contents_changed(VteView *terminal);
static void vte_buffer_process_incoming(VteBuffer *buffer);
static gboolean process_timeout (gpointer data);
@@ -297,15 +297,15 @@ _vte_incoming_chunks_reverse(struct _vte_incoming_chunk *chunk)
}
#ifdef VTE_DEBUG
-G_DEFINE_TYPE_WITH_CODE(VteTerminal, vte_terminal, GTK_TYPE_WIDGET,
- g_type_add_class_private (g_define_type_id, sizeof (VteTerminalClassPrivate));
+G_DEFINE_TYPE_WITH_CODE(VteView, vte_view, GTK_TYPE_WIDGET,
+ g_type_add_class_private (g_define_type_id, sizeof (VteViewClassPrivate));
G_IMPLEMENT_INTERFACE(GTK_TYPE_SCROLLABLE, NULL)
if (_vte_debug_on(VTE_DEBUG_LIFECYCLE)) {
- g_printerr("vte_terminal_get_type()\n");
+ g_printerr("vte_view_get_type()\n");
})
#else
-G_DEFINE_TYPE_WITH_CODE(VteTerminal, vte_terminal, GTK_TYPE_WIDGET,
- g_type_add_class_private (g_define_type_id, sizeof (VteTerminalClassPrivate));
+G_DEFINE_TYPE_WITH_CODE(VteView, vte_view, GTK_TYPE_WIDGET,
+ g_type_add_class_private (g_define_type_id, sizeof (VteViewClassPrivate));
G_IMPLEMENT_INTERFACE(GTK_TYPE_SCROLLABLE, NULL))
#endif
@@ -374,7 +374,7 @@ _vte_screen_set_default_attributes(VteScreen *screen)
/* Cause certain cells to be repainted. */
void
-_vte_invalidate_cells(VteTerminal *terminal,
+_vte_invalidate_cells(VteView *terminal,
glong column_start, gint column_count,
glong row_start, gint row_count)
{
@@ -475,7 +475,7 @@ _vte_invalidate_cells(VteTerminal *terminal,
}
static void
-_vte_invalidate_region (VteTerminal *terminal,
+_vte_invalidate_region (VteView *terminal,
glong scolumn, glong ecolumn,
glong srow, glong erow,
gboolean block)
@@ -503,12 +503,12 @@ _vte_invalidate_region (VteTerminal *terminal,
/* Redraw the entire visible portion of the window. */
void
-_vte_invalidate_all(VteTerminal *terminal)
+_vte_invalidate_all(VteView *terminal)
{
cairo_rectangle_int_t rect;
GtkAllocation allocation;
- g_assert(VTE_IS_TERMINAL(terminal));
+ g_assert(VTE_IS_VIEW(terminal));
if (!gtk_widget_get_realized(&terminal->widget)) {
return;
@@ -543,7 +543,7 @@ _vte_invalidate_all(VteTerminal *terminal)
/* Scroll a rectangular region up or down by a fixed number of lines,
* negative = up, positive = down. */
void
-_vte_terminal_scroll_region (VteTerminal *terminal,
+_vte_view_scroll_region (VteView *terminal,
long row, glong count, glong delta)
{
VteBuffer *buffer;
@@ -661,9 +661,9 @@ vte_buffer_find_end_column(VteBuffer *buffer,
/* Determine the width of the portion of the preedit string which lies
* to the left of the cursor, or the entire string, in columns. */
static gssize
-vte_terminal_preedit_width(VteTerminal *terminal, gboolean left_only)
+vte_view_preedit_width(VteView *terminal, gboolean left_only)
{
- VteTerminalPrivate *pvt = terminal->pvt;
+ VteViewPrivate *pvt = terminal->pvt;
VteBuffer *buffer = terminal->pvt->buffer;
gunichar c;
int i;
@@ -689,9 +689,9 @@ vte_terminal_preedit_width(VteTerminal *terminal, gboolean left_only)
/* Determine the length of the portion of the preedit string which lies
* to the left of the cursor, or the entire string, in gunichars. */
static gssize
-vte_terminal_preedit_length(VteTerminal *terminal, gboolean left_only)
+vte_view_preedit_length(VteView *terminal, gboolean left_only)
{
- VteTerminalPrivate *pvt = terminal->pvt;
+ VteViewPrivate *pvt = terminal->pvt;
int i = 0;
const char *preedit = NULL;
@@ -711,7 +711,7 @@ vte_terminal_preedit_length(VteTerminal *terminal, gboolean left_only)
/* Cause the cell to be redrawn. */
void
-_vte_invalidate_cell(VteTerminal *terminal, glong col, glong row)
+_vte_invalidate_cell(VteView *terminal, glong col, glong row)
{
VteBuffer *buffer;
const VteRowData *row_data;
@@ -757,7 +757,7 @@ _vte_invalidate_cell(VteTerminal *terminal, glong col, glong row)
/* Cause the cursor to be redrawn. */
void
-_vte_invalidate_cursor_once(VteTerminal *terminal, gboolean periodic)
+_vte_invalidate_cursor_once(VteView *terminal, gboolean periodic)
{
VteBuffer *buffer;
VteScreen *screen;
@@ -782,7 +782,7 @@ _vte_invalidate_cursor_once(VteTerminal *terminal, gboolean periodic)
buffer = terminal->pvt->buffer;
if (buffer->pvt->cursor_visible) {
- preedit_width = vte_terminal_preedit_width(terminal, FALSE);
+ preedit_width = vte_view_preedit_width(terminal, FALSE);
screen = buffer->pvt->screen;
row = screen->cursor_current.row;
@@ -817,9 +817,9 @@ _vte_invalidate_cursor_once(VteTerminal *terminal, gboolean periodic)
/* Invalidate the cursor repeatedly. */
static gboolean
-vte_invalidate_cursor_periodic (VteTerminal *terminal)
+vte_invalidate_cursor_periodic (VteView *terminal)
{
- VteTerminalPrivate *pvt = terminal->pvt;
+ VteViewPrivate *pvt = terminal->pvt;
pvt->cursor_blink_state = !pvt->cursor_blink_state;
pvt->cursor_blink_time += pvt->cursor_blink_cycle;
@@ -844,12 +844,12 @@ vte_invalidate_cursor_periodic (VteTerminal *terminal)
}
static void
-vte_terminal_buffer_contents_changed(VteTerminal *terminal)
+vte_view_buffer_contents_changed(VteView *terminal)
{
/* Update dingus match set. */
- vte_terminal_match_contents_clear(terminal);
+ vte_view_match_contents_clear(terminal);
if (terminal->pvt->mouse_cursor_visible) {
- vte_terminal_match_hilite_update(terminal,
+ vte_view_match_hilite_update(terminal,
terminal->pvt->mouse_last_x,
terminal->pvt->mouse_last_y);
}
@@ -857,7 +857,7 @@ vte_terminal_buffer_contents_changed(VteTerminal *terminal)
/* Emit a "selection_changed" signal. */
static void
-vte_terminal_emit_selection_changed(VteTerminal *terminal)
+vte_view_emit_selection_changed(VteView *terminal)
{
_vte_debug_print(VTE_DEBUG_SIGNALS,
"Emitting `selection-changed'.\n");
@@ -953,7 +953,7 @@ vte_buffer_emit_cursor_moved(VteBuffer *buffer)
}
static void
-vte_terminal_queue_cursor_moved(VteTerminal *terminal)
+vte_view_queue_cursor_moved(VteView *terminal)
{
VteBuffer *buffer;
@@ -990,7 +990,7 @@ vte_buffer_queue_eof(VteBuffer *buffer)
/* Emit a "char-size-changed" signal. */
static void
-vte_terminal_emit_char_size_changed(VteTerminal *terminal,
+vte_view_emit_char_size_changed(VteView *terminal,
guint width, guint height)
{
_vte_debug_print(VTE_DEBUG_SIGNALS,
@@ -1011,7 +1011,7 @@ _vte_buffer_emit_status_line_changed(VteBuffer *buffer)
/* Emit an "increase-font-size" signal. */
static void
-vte_terminal_emit_increase_font_size(VteTerminal *terminal)
+vte_view_emit_increase_font_size(VteView *terminal)
{
_vte_debug_print(VTE_DEBUG_SIGNALS,
"Emitting `increase-font-size'.\n");
@@ -1020,7 +1020,7 @@ vte_terminal_emit_increase_font_size(VteTerminal *terminal)
/* Emit a "decrease-font-size" signal. */
static void
-vte_terminal_emit_decrease_font_size(VteTerminal *terminal)
+vte_view_emit_decrease_font_size(VteView *terminal)
{
_vte_debug_print(VTE_DEBUG_SIGNALS,
"Emitting `decrease-font-size'.\n");
@@ -1073,7 +1073,7 @@ _vte_buffer_emit_bell(VteBuffer *buffer, VteBellType bell_type)
/* Emit a "text-scrolled" signal. */
static void
-vte_terminal_emit_text_scrolled(VteTerminal *terminal, gint delta)
+vte_view_emit_text_scrolled(VteView *terminal, gint delta)
{
VteBuffer *buffer = terminal->pvt->buffer;
@@ -1169,68 +1169,68 @@ _vte_buffer_emit_resize_window(VteBuffer *buffer,
}
static void
-vte_terminal_emit_copy_clipboard(VteTerminal *terminal)
+vte_view_emit_copy_clipboard(VteView *terminal)
{
g_signal_emit (terminal, signals[TERMINAL_COPY_CLIPBOARD], 0);
}
static void
-vte_terminal_emit_paste_clipboard(VteTerminal *terminal)
+vte_view_emit_paste_clipboard(VteView *terminal)
{
g_signal_emit (terminal, signals[TERMINAL_PASTE_CLIPBOARD], 0);
}
static void
-vte_terminal_emit_copy_primary(VteTerminal *terminal)
+vte_view_emit_copy_primary(VteView *terminal)
{
g_signal_emit (terminal, signals[TERMINAL_COPY_PRIMARY], 0);
}
static void
-vte_terminal_emit_paste_primary(VteTerminal *terminal)
+vte_view_emit_paste_primary(VteView *terminal)
{
g_signal_emit (terminal, signals[TERMINAL_PASTE_PRIMARY], 0);
}
static void
-vte_terminal_real_copy_clipboard(VteTerminal *terminal)
+vte_view_real_copy_clipboard(VteView *terminal)
{
_vte_debug_print(VTE_DEBUG_SELECTION, "Copying to CLIPBOARD.\n");
- vte_terminal_copy_clipboard(terminal,
+ vte_view_copy_clipboard(terminal,
gtk_widget_get_clipboard(&terminal->widget,
GDK_SELECTION_CLIPBOARD));
}
static void
-vte_terminal_real_paste_clipboard(VteTerminal *terminal)
+vte_view_real_paste_clipboard(VteView *terminal)
{
_vte_debug_print(VTE_DEBUG_SELECTION, "Pasting CLIPBOARD.\n");
- vte_terminal_paste_clipboard(terminal,
+ vte_view_paste_clipboard(terminal,
gtk_widget_get_clipboard(&terminal->widget,
GDK_SELECTION_CLIPBOARD));
}
static void
-vte_terminal_real_copy_primary(VteTerminal *terminal)
+vte_view_real_copy_primary(VteView *terminal)
{
_vte_debug_print(VTE_DEBUG_SELECTION, "Copying to PRIMARY.\n");
- vte_terminal_copy_clipboard(terminal,
+ vte_view_copy_clipboard(terminal,
gtk_widget_get_clipboard(&terminal->widget,
GDK_SELECTION_PRIMARY));
}
static void
-vte_terminal_real_paste_primary(VteTerminal *terminal)
+vte_view_real_paste_primary(VteView *terminal)
{
_vte_debug_print(VTE_DEBUG_SELECTION, "Pasting PRIMARY.\n");
- vte_terminal_paste_clipboard(terminal,
+ vte_view_paste_clipboard(terminal,
gtk_widget_get_clipboard(&terminal->widget,
GDK_SELECTION_PRIMARY));
}
/* Deselect anything which is selected and refresh the screen if needed. */
static void
-vte_terminal_deselect_all(VteTerminal *terminal)
+vte_view_deselect_all(VteView *terminal)
{
if (terminal->pvt->has_selection) {
gint sx, sy, ex, ey;
@@ -1242,7 +1242,7 @@ vte_terminal_deselect_all(VteTerminal *terminal)
/* Don't free the current selection, as we need to keep
* hold of it for async copying from the clipboard. */
- vte_terminal_emit_selection_changed(terminal);
+ vte_view_emit_selection_changed(terminal);
sx = terminal->pvt->selection_start.col;
sy = terminal->pvt->selection_start.row;
@@ -1331,9 +1331,9 @@ vte_buffer_set_default_tabstops(VteBuffer *buffer)
/* Clear the cache of the screen contents we keep. */
static void
-vte_terminal_match_contents_clear(VteTerminal *terminal)
+vte_view_match_contents_clear(VteView *terminal)
{
- g_assert(VTE_IS_TERMINAL(terminal));
+ g_assert(VTE_IS_VIEW(terminal));
if (terminal->pvt->match_contents != NULL) {
g_free(terminal->pvt->match_contents);
terminal->pvt->match_contents = NULL;
@@ -1342,7 +1342,7 @@ vte_terminal_match_contents_clear(VteTerminal *terminal)
g_array_free(terminal->pvt->match_attributes, TRUE);
terminal->pvt->match_attributes = NULL;
}
- vte_terminal_match_hilite_clear(terminal);
+ vte_view_match_hilite_clear(terminal);
}
/* Refresh the cache of the screen contents we keep. */
@@ -1353,10 +1353,10 @@ always_selected(VteBuffer *buffer, glong column, glong row, gpointer data)
}
static void
-vte_terminal_match_contents_refresh(VteTerminal *terminal)
+vte_view_match_contents_refresh(VteView *terminal)
{
GArray *array;
- vte_terminal_match_contents_clear(terminal);
+ vte_view_match_contents_clear(terminal);
array = g_array_new(FALSE, TRUE, sizeof(struct _VteCharAttributes));
terminal->pvt->match_contents = vte_buffer_get_text(terminal->pvt->buffer,
always_selected,
@@ -1399,7 +1399,7 @@ regex_match_clear (struct vte_match_regex *regex)
}
static void
-vte_terminal_set_cursor_from_regex_match(VteTerminal *terminal, struct vte_match_regex *regex)
+vte_view_set_cursor_from_regex_match(VteView *terminal, struct vte_match_regex *regex)
{
GdkCursor *cursor = NULL;
@@ -1430,8 +1430,8 @@ vte_terminal_set_cursor_from_regex_match(VteTerminal *terminal, struct vte_match
}
/**
- * vte_terminal_match_remove_all:
- * @terminal: a #VteTerminal
+ * vte_view_match_remove_all:
+ * @terminal: a #VteView
*
* Clears the list of regular expressions the terminal uses to highlight text
* when the user moves the mouse cursor.
@@ -1439,11 +1439,11 @@ vte_terminal_set_cursor_from_regex_match(VteTerminal *terminal, struct vte_match
* Since: 0.30
*/
void
-vte_terminal_match_remove_all(VteTerminal *terminal)
+vte_view_match_remove_all(VteView *terminal)
{
struct vte_match_regex *regex;
guint i;
- g_return_if_fail(VTE_IS_TERMINAL(terminal));
+ g_return_if_fail(VTE_IS_VIEW(terminal));
for (i = 0; i < terminal->pvt->match_regexes->len; i++) {
regex = &g_array_index(terminal->pvt->match_regexes,
struct vte_match_regex,
@@ -1454,12 +1454,12 @@ vte_terminal_match_remove_all(VteTerminal *terminal)
}
}
g_array_set_size(terminal->pvt->match_regexes, 0);
- vte_terminal_match_hilite_clear(terminal);
+ vte_view_match_hilite_clear(terminal);
}
/**
- * vte_terminal_match_remove:
- * @terminal: a #VteTerminal
+ * vte_view_match_remove:
+ * @terminal: a #VteView
* @tag: the tag of the regex to remove
*
* Removes the regular expression which is associated with the given @tag from
@@ -1467,10 +1467,10 @@ vte_terminal_match_remove_all(VteTerminal *terminal)
* moves the mouse cursor over matching text.
*/
void
-vte_terminal_match_remove(VteTerminal *terminal, int tag)
+vte_view_match_remove(VteView *terminal, int tag)
{
struct vte_match_regex *regex;
- g_return_if_fail(VTE_IS_TERMINAL(terminal));
+ g_return_if_fail(VTE_IS_VIEW(terminal));
if (terminal->pvt->match_regexes->len > (guint)tag) {
/* The tag is an index, so find the corresponding struct. */
regex = &g_array_index(terminal->pvt->match_regexes,
@@ -1483,11 +1483,11 @@ vte_terminal_match_remove(VteTerminal *terminal, int tag)
/* Remove this item and leave a hole in its place. */
regex_match_clear (regex);
}
- vte_terminal_match_hilite_clear(terminal);
+ vte_view_match_hilite_clear(terminal);
}
static GdkCursor *
-vte_terminal_cursor_new(VteTerminal *terminal, GdkCursorType cursor_type)
+vte_view_cursor_new(VteView *terminal, GdkCursorType cursor_type)
{
GdkDisplay *display;
GdkCursor *cursor;
@@ -1498,8 +1498,8 @@ vte_terminal_cursor_new(VteTerminal *terminal, GdkCursorType cursor_type)
}
/**
- * vte_terminal_match_add_gregex:
- * @terminal: a #VteTerminal
+ * vte_view_match_add_gregex:
+ * @terminal: a #VteView
* @regex: a #GRegex
* @flags: the #GRegexMatchFlags to use when matching the regex
*
@@ -1512,13 +1512,13 @@ vte_terminal_cursor_new(VteTerminal *terminal, GdkCursorType cursor_type)
* Since: 0.17.1
*/
int
-vte_terminal_match_add_gregex(VteTerminal *terminal, GRegex *regex, GRegexMatchFlags flags)
+vte_view_match_add_gregex(VteView *terminal, GRegex *regex, GRegexMatchFlags flags)
{
- VteTerminalPrivate *pvt;
+ VteViewPrivate *pvt;
struct vte_match_regex new_regex_match, *regex_match;
guint ret, len;
- g_return_val_if_fail(VTE_IS_TERMINAL(terminal), -1);
+ g_return_val_if_fail(VTE_IS_VIEW(terminal), -1);
g_return_val_if_fail(regex != NULL, -1);
pvt = terminal->pvt;
@@ -1554,8 +1554,8 @@ vte_terminal_match_add_gregex(VteTerminal *terminal, GRegex *regex, GRegexMatchF
}
/**
- * vte_terminal_match_set_cursor:
- * @terminal: a #VteTerminal
+ * vte_view_match_set_cursor:
+ * @terminal: a #VteView
* @tag: the tag of the regex which should use the specified cursor
* @cursor: (allow-none): the #GdkCursor which the terminal should use when the pattern is
* highlighted, or %NULL to use the standard cursor
@@ -1567,10 +1567,10 @@ vte_terminal_match_add_gregex(VteTerminal *terminal, GRegex *regex, GRegexMatchF
*
*/
void
-vte_terminal_match_set_cursor(VteTerminal *terminal, int tag, GdkCursor *cursor)
+vte_view_match_set_cursor(VteView *terminal, int tag, GdkCursor *cursor)
{
struct vte_match_regex *regex;
- g_return_if_fail(VTE_IS_TERMINAL(terminal));
+ g_return_if_fail(VTE_IS_VIEW(terminal));
g_return_if_fail((guint) tag < terminal->pvt->match_regexes->len);
regex = &g_array_index(terminal->pvt->match_regexes,
struct vte_match_regex,
@@ -1578,12 +1578,12 @@ vte_terminal_match_set_cursor(VteTerminal *terminal, int tag, GdkCursor *cursor)
regex_match_clear_cursor(regex);
regex->cursor_mode = VTE_REGEX_CURSOR_GDKCURSOR;
regex->cursor.cursor = cursor ? gdk_cursor_ref(cursor) : NULL;
- vte_terminal_match_hilite_clear(terminal);
+ vte_view_match_hilite_clear(terminal);
}
/**
- * vte_terminal_match_set_cursor_type:
- * @terminal: a #VteTerminal
+ * vte_view_match_set_cursor_type:
+ * @terminal: a #VteView
* @tag: the tag of the regex which should use the specified cursor
* @cursor_type: a #GdkCursorType
*
@@ -1594,11 +1594,11 @@ vte_terminal_match_set_cursor(VteTerminal *terminal, int tag, GdkCursor *cursor)
*
*/
void
-vte_terminal_match_set_cursor_type(VteTerminal *terminal,
+vte_view_match_set_cursor_type(VteView *terminal,
int tag, GdkCursorType cursor_type)
{
struct vte_match_regex *regex;
- g_return_if_fail(VTE_IS_TERMINAL(terminal));
+ g_return_if_fail(VTE_IS_VIEW(terminal));
g_return_if_fail((guint) tag < terminal->pvt->match_regexes->len);
regex = &g_array_index(terminal->pvt->match_regexes,
struct vte_match_regex,
@@ -1606,12 +1606,12 @@ vte_terminal_match_set_cursor_type(VteTerminal *terminal,
regex_match_clear_cursor(regex);
regex->cursor_mode = VTE_REGEX_CURSOR_GDKCURSORTYPE;
regex->cursor.cursor_type = cursor_type;
- vte_terminal_match_hilite_clear(terminal);
+ vte_view_match_hilite_clear(terminal);
}
/**
- * vte_terminal_match_set_cursor_name:
- * @terminal: a #VteTerminal
+ * vte_view_match_set_cursor_name:
+ * @terminal: a #VteView
* @tag: the tag of the regex which should use the specified cursor
* @cursor_name: the name of the cursor
*
@@ -1622,11 +1622,11 @@ vte_terminal_match_set_cursor_type(VteTerminal *terminal,
*
*/
void
-vte_terminal_match_set_cursor_name(VteTerminal *terminal,
+vte_view_match_set_cursor_name(VteView *terminal,
int tag, const char *cursor_name)
{
struct vte_match_regex *regex;
- g_return_if_fail(VTE_IS_TERMINAL(terminal));
+ g_return_if_fail(VTE_IS_VIEW(terminal));
g_return_if_fail(cursor_name != NULL);
g_return_if_fail((guint) tag < terminal->pvt->match_regexes->len);
regex = &g_array_index(terminal->pvt->match_regexes,
@@ -1635,14 +1635,14 @@ vte_terminal_match_set_cursor_name(VteTerminal *terminal,
regex_match_clear_cursor(regex);
regex->cursor_mode = VTE_REGEX_CURSOR_NAME;
regex->cursor.cursor_name = g_strdup (cursor_name);
- vte_terminal_match_hilite_clear(terminal);
+ vte_view_match_hilite_clear(terminal);
}
/* Check if a given cell on the screen contains part of a matched string. If
* it does, return the string, and store the match tag in the optional tag
* argument. */
static char *
-vte_terminal_match_check_internal_gregex(VteTerminal *terminal,
+vte_view_match_check_internal_gregex(VteView *terminal,
long column, glong row,
int *tag, int *start, int *end)
{
@@ -1821,7 +1821,7 @@ vte_terminal_match_check_internal_gregex(VteTerminal *terminal,
if (end != NULL) {
*end = sattr + rm_eo - 1;
}
- vte_terminal_set_cursor_from_regex_match(terminal, regex);
+ vte_view_set_cursor_from_regex_match(terminal, regex);
result = g_match_info_fetch(match_info, 0);
line[eattr] = eol;
@@ -1860,19 +1860,19 @@ vte_terminal_match_check_internal_gregex(VteTerminal *terminal,
}
static char *
-vte_terminal_match_check_internal(VteTerminal *terminal,
+vte_view_match_check_internal(VteView *terminal,
long column, glong row,
int *tag, int *start, int *end)
{
if (terminal->pvt->match_contents == NULL) {
- vte_terminal_match_contents_refresh(terminal);
+ vte_view_match_contents_refresh(terminal);
}
- return vte_terminal_match_check_internal_gregex(terminal, column, row, tag, start, end);
+ return vte_view_match_check_internal_gregex(terminal, column, row, tag, start, end);
}
static gboolean
-rowcol_inside_match (VteTerminal *terminal, glong row, glong col)
+rowcol_inside_match (VteView *terminal, glong row, glong col)
{
if (terminal->pvt->match_start.row == terminal->pvt->match_end.row) {
return row == terminal->pvt->match_start.row &&
@@ -1894,33 +1894,33 @@ rowcol_inside_match (VteTerminal *terminal, glong row, glong col)
}
/**
- * vte_terminal_match_check:
- * @terminal: a #VteTerminal
+ * vte_view_match_check:
+ * @terminal: a #VteView
* @column: the text column
* @row: the text row
* @tag: (out) (allow-none): a location to store the tag, or %NULL
*
* Checks if the text in and around the specified position matches any of the
- * regular expressions previously set using vte_terminal_match_add(). If a
+ * regular expressions previously set using vte_view_match_add(). If a
* match exists, the text string is returned and if @tag is not %NULL, the number
* associated with the matched regular expression will be stored in @tag.
*
* If more than one regular expression has been set with
- * vte_terminal_match_add(), then expressions are checked in the order in
+ * vte_view_match_add(), then expressions are checked in the order in
* which they were added.
*
* Returns: (transfer full): a newly allocated string which matches one of the previously
* set regular expressions
*/
char *
-vte_terminal_match_check(VteTerminal *terminal, glong column, glong row,
+vte_view_match_check(VteView *terminal, glong column, glong row,
int *tag)
{
VteBuffer *buffer;
long delta;
char *ret;
- g_return_val_if_fail(VTE_IS_TERMINAL(terminal), NULL);
+ g_return_val_if_fail(VTE_IS_VIEW(terminal), NULL);
buffer = terminal->pvt->buffer;
if (buffer == NULL)
@@ -1938,7 +1938,7 @@ vte_terminal_match_check(VteTerminal *terminal, glong column, glong row,
g_strdup (terminal->pvt->match) :
NULL;
} else {
- ret = vte_terminal_match_check_internal(terminal,
+ ret = vte_view_match_check_internal(terminal,
column, row + delta,
tag, NULL, NULL);
}
@@ -1950,7 +1950,7 @@ vte_terminal_match_check(VteTerminal *terminal, glong column, glong row,
/* Emit an adjustment changed signal on our adjustment object. */
static void
-vte_terminal_emit_adjustment_changed(VteTerminal *terminal)
+vte_view_emit_adjustment_changed(VteView *terminal)
{
VteBuffer *buffer = terminal->pvt->buffer;
VteScreen *screen = buffer->pvt->screen;
@@ -2013,14 +2013,14 @@ vte_terminal_emit_adjustment_changed(VteTerminal *terminal)
/* Queue an adjustment-changed signal to be delivered when convenient. */
static inline void
-vte_terminal_queue_adjustment_changed(VteTerminal *terminal)
+vte_view_queue_adjustment_changed(VteView *terminal)
{
terminal->pvt->adjustment_changed_pending = TRUE;
add_update_timeout (terminal);
}
static void
-vte_terminal_queue_adjustment_value_changed(VteTerminal *terminal, glong v)
+vte_view_queue_adjustment_value_changed(VteView *terminal, glong v)
{
VteBuffer *buffer = terminal->pvt->buffer;
VteScreen *screen = buffer->pvt->screen;
@@ -2033,7 +2033,7 @@ vte_terminal_queue_adjustment_value_changed(VteTerminal *terminal, glong v)
}
static void
-vte_terminal_queue_adjustment_value_changed_clamped(VteTerminal *terminal, glong v)
+vte_view_queue_adjustment_value_changed_clamped(VteView *terminal, glong v)
{
VteBuffer *buffer;
gdouble lower, upper;
@@ -2044,12 +2044,12 @@ vte_terminal_queue_adjustment_value_changed_clamped(VteTerminal *terminal, glong
buffer = terminal->pvt->buffer;
v = CLAMP(v, lower, MAX (lower, upper - buffer->pvt->row_count));
- vte_terminal_queue_adjustment_value_changed (terminal, v);
+ vte_view_queue_adjustment_value_changed (terminal, v);
}
void
-_vte_terminal_adjust_adjustments(VteTerminal *terminal)
+_vte_view_adjust_adjustments(VteView *terminal)
{
VteBuffer *buffer = terminal->pvt->buffer;
VteScreen *screen = buffer->pvt->screen;
@@ -2058,7 +2058,7 @@ _vte_terminal_adjust_adjustments(VteTerminal *terminal)
g_assert(screen != NULL);
g_assert(screen->row_data != NULL);
- vte_terminal_queue_adjustment_changed(terminal);
+ vte_view_queue_adjustment_changed(terminal);
/* The lower value should be the first row in the buffer. */
delta = _vte_ring_delta(screen->row_data);
@@ -2070,7 +2070,7 @@ _vte_terminal_adjust_adjustments(VteTerminal *terminal)
screen->insert_delta);
if (screen->scroll_delta > screen->insert_delta) {
- vte_terminal_queue_adjustment_value_changed(terminal,
+ vte_view_queue_adjustment_value_changed(terminal,
screen->insert_delta);
}
}
@@ -2078,7 +2078,7 @@ _vte_terminal_adjust_adjustments(VteTerminal *terminal)
/* Update the adjustment field of the widget. This function should be called
* whenever we add rows to or remove rows from the history or switch screens. */
static void
-_vte_terminal_adjust_adjustments_full (VteTerminal *terminal)
+_vte_view_adjust_adjustments_full (VteView *terminal)
{
VteBuffer *buffer;
VteScreen *screen;
@@ -2091,7 +2091,7 @@ _vte_terminal_adjust_adjustments_full (VteTerminal *terminal)
g_assert(screen != NULL);
g_assert(screen->row_data != NULL);
- _vte_terminal_adjust_adjustments(terminal);
+ _vte_view_adjust_adjustments(terminal);
g_object_freeze_notify(G_OBJECT(terminal->pvt->vadjustment));
@@ -2139,7 +2139,7 @@ _vte_terminal_adjust_adjustments_full (VteTerminal *terminal)
/* Scroll a fixed number of lines up or down in the current screen. */
static void
-vte_terminal_scroll_lines(VteTerminal *terminal, gint lines)
+vte_view_scroll_lines(VteView *terminal, gint lines)
{
VteBuffer *buffer = terminal->pvt->buffer;
glong destination;
@@ -2148,37 +2148,37 @@ vte_terminal_scroll_lines(VteTerminal *terminal, gint lines)
destination = buffer->pvt->screen->scroll_delta;
destination += lines;
/* Tell the scrollbar to adjust itself. */
- vte_terminal_queue_adjustment_value_changed_clamped (terminal, destination);
+ vte_view_queue_adjustment_value_changed_clamped (terminal, destination);
}
/* Scroll a fixed number of pages up or down, in the current screen. */
static void
-vte_terminal_scroll_pages(VteTerminal *terminal, gint pages)
+vte_view_scroll_pages(VteView *terminal, gint pages)
{
VteBuffer *buffer;
buffer = terminal->pvt->buffer;
- vte_terminal_scroll_lines(terminal, pages * buffer->pvt->row_count);
+ vte_view_scroll_lines(terminal, pages * buffer->pvt->row_count);
}
/* Scroll so that the scroll delta is the minimum value. */
static void
-vte_terminal_maybe_scroll_to_top(VteTerminal *terminal)
+vte_view_maybe_scroll_to_top(VteView *terminal)
{
VteBuffer *buffer;
buffer = terminal->pvt->buffer;
- vte_terminal_queue_adjustment_value_changed (terminal,
+ vte_view_queue_adjustment_value_changed (terminal,
_vte_ring_delta(buffer->pvt->screen->row_data));
}
static void
-vte_terminal_maybe_scroll_to_bottom(VteTerminal *terminal)
+vte_view_maybe_scroll_to_bottom(VteView *terminal)
{
VteBuffer *buffer = terminal->pvt->buffer;
glong delta;
delta = buffer->pvt->screen->insert_delta;
- vte_terminal_queue_adjustment_value_changed (terminal, delta);
+ vte_view_queue_adjustment_value_changed (terminal, delta);
_vte_debug_print(VTE_DEBUG_ADJ,
"Snapping to bottom of screen\n");
}
@@ -2380,7 +2380,7 @@ vte_buffer_update_insert_delta(VteBuffer *buffer)
/* Show or hide the pointer. */
void
-_vte_terminal_set_pointer_visible(VteTerminal *terminal, gboolean visible)
+_vte_view_set_pointer_visible(VteView *terminal, gboolean visible)
{
GdkWindow *window;
struct vte_match_regex *regex = NULL;
@@ -2402,7 +2402,7 @@ _vte_terminal_set_pointer_visible(VteTerminal *terminal, gboolean visible)
regex = &g_array_index(terminal->pvt->match_regexes,
struct vte_match_regex,
terminal->pvt->match_tag);
- vte_terminal_set_cursor_from_regex_match(terminal, regex);
+ vte_view_set_cursor_from_regex_match(terminal, regex);
} else {
_vte_debug_print(VTE_DEBUG_CURSOR,
"Setting default mouse cursor.\n");
@@ -2416,34 +2416,34 @@ _vte_terminal_set_pointer_visible(VteTerminal *terminal, gboolean visible)
}
/**
- * vte_terminal_new:
+ * vte_view_new:
*
* Creates a new terminal widget.
*
- * Returns: (transfer full) (type Vte.Terminal): a new #VteTerminal object
+ * Returns: (transfer full) (type Vte.Terminal): a new #VteView object
*/
GtkWidget *
-vte_terminal_new(void)
+vte_view_new(void)
{
- return g_object_new(VTE_TYPE_TERMINAL, NULL);
+ return g_object_new(VTE_TYPE_VIEW, NULL);
}
/**
- * vte_terminal_set_buffer:
- * @terminal: a #VteTerminal
+ * vte_view_set_buffer:
+ * @terminal: a #VteView
* @buffer: (allow-none): a #VteBuffer, or %NULL
*
* Sets @buffer as @terminal's buffer.
*/
void
-vte_terminal_set_buffer(VteTerminal *terminal,
+vte_view_set_buffer(VteView *terminal,
VteBuffer *buffer)
{
- VteTerminalPrivate *pvt;
+ VteViewPrivate *pvt;
VteBuffer *old_buffer;
GObject *object;
- g_return_if_fail(VTE_IS_TERMINAL(terminal));
+ g_return_if_fail(VTE_IS_VIEW(terminal));
g_return_if_fail(buffer == NULL || VTE_IS_BUFFER(buffer));
pvt = terminal->pvt;
@@ -2456,8 +2456,8 @@ vte_terminal_set_buffer(VteTerminal *terminal,
old_buffer = pvt->buffer;
if (old_buffer) {
- g_signal_handlers_disconnect_by_func(old_buffer, G_CALLBACK(vte_terminal_beep), terminal);
- g_signal_handlers_disconnect_by_func(old_buffer, G_CALLBACK(vte_terminal_buffer_contents_changed), terminal);
+ g_signal_handlers_disconnect_by_func(old_buffer, G_CALLBACK(vte_view_beep), terminal);
+ g_signal_handlers_disconnect_by_func(old_buffer, G_CALLBACK(vte_view_buffer_contents_changed), terminal);
/* defer unref until after "buffer-changed" signal emission */
}
@@ -2466,8 +2466,8 @@ vte_terminal_set_buffer(VteTerminal *terminal,
if (buffer) {
g_object_ref(buffer);
- g_signal_connect_swapped(buffer, "bell", G_CALLBACK(vte_terminal_beep), terminal);
- g_signal_connect_swapped(buffer, "contents-changed", G_CALLBACK(vte_terminal_buffer_contents_changed), terminal);
+ g_signal_connect_swapped(buffer, "bell", G_CALLBACK(vte_view_beep), terminal);
+ g_signal_connect_swapped(buffer, "contents-changed", G_CALLBACK(vte_view_buffer_contents_changed), terminal);
}
g_object_notify(object, "buffer");
@@ -2481,24 +2481,24 @@ vte_terminal_set_buffer(VteTerminal *terminal,
}
/**
- * vte_terminal_get_buffer:
- * @terminal: a #VteTerminal
+ * vte_view_get_buffer:
+ * @terminal: a #VteView
*
* Returns: (transfer none): the terminal's buffer
*
* Since: 0.30
*/
VteBuffer *
-vte_terminal_get_buffer(VteTerminal *terminal)
+vte_view_get_buffer(VteView *terminal)
{
- g_return_val_if_fail(VTE_IS_TERMINAL(terminal), NULL);
+ g_return_val_if_fail(VTE_IS_VIEW(terminal), NULL);
return terminal->pvt->buffer;
}
/* Set up a palette entry with a more-or-less match for the requested color. */
static void
-vte_terminal_set_color_internal(VteTerminal *terminal,
+vte_view_set_color_internal(VteView *terminal,
int entry,
const GdkRGBA *proposed,
gboolean override)
@@ -2530,7 +2530,7 @@ vte_terminal_set_color_internal(VteTerminal *terminal,
/* If we're setting the background color, set the background color
* on the widget as well. */
if (entry == VTE_DEF_BG) {
- vte_terminal_queue_background_update(terminal);
+ vte_view_queue_background_update(terminal);
}
/* and redraw */
@@ -2541,7 +2541,7 @@ vte_terminal_set_color_internal(VteTerminal *terminal,
}
static void
-vte_terminal_generate_bold(const GdkRGBA *foreground,
+vte_view_generate_bold(const GdkRGBA *foreground,
const GdkRGBA *background,
double factor,
GdkRGBA *bold)
@@ -3254,7 +3254,7 @@ vte_buffer_spawn_sync(VteBuffer *buffer,
/* Handle an EOF from the client. */
static void
-vte_terminal_eof(GIOChannel *channel, VteTerminal *terminal)
+vte_view_eof(GIOChannel *channel, VteView *terminal)
{
GObject *object = G_OBJECT(terminal);
@@ -3270,9 +3270,9 @@ vte_terminal_eof(GIOChannel *channel, VteTerminal *terminal)
/* Reset the input method context. */
static void
-vte_terminal_im_reset(VteTerminal *terminal)
+vte_view_im_reset(VteView *terminal)
{
- VteTerminalPrivate *pvt = terminal->pvt;
+ VteViewPrivate *pvt = terminal->pvt;
if (gtk_widget_get_realized (&terminal->widget)) {
gtk_im_context_reset(pvt->im_context);
@@ -3343,7 +3343,7 @@ vte_buffer_emit_pending_text_signals(VteBuffer *buffer, GQuark quark)
static void
vte_buffer_process_incoming(VteBuffer *buffer)
{
- VteTerminal *terminal;
+ VteView *terminal;
VteScreen *screen;
VteVisualPosition cursor;
gboolean cursor_visible;
@@ -3667,7 +3667,7 @@ next_match:
* we're currently at the bottom of the buffer. */
vte_buffer_update_insert_delta(buffer);
if (terminal->pvt->scroll_on_output || bottom) {
- vte_terminal_maybe_scroll_to_bottom(terminal);
+ vte_view_maybe_scroll_to_bottom(terminal);
}
/* Deselect the current selection if its contents are changed
* by this insertion. */
@@ -3679,12 +3679,12 @@ next_match:
0,
terminal->pvt->selection_end.row,
buffer->pvt->column_count,
- (VteSelectionFunc)vte_terminal_cell_is_selected,
+ (VteSelectionFunc)vte_view_cell_is_selected,
terminal /* user data */,
NULL);
if ((selection == NULL) || (terminal->pvt->selection == NULL) ||
(strcmp(selection, terminal->pvt->selection) != 0)) {
- vte_terminal_deselect_all(terminal);
+ vte_view_deselect_all(terminal);
}
g_free(selection);
}
@@ -3695,7 +3695,7 @@ next_match:
_vte_buffer_queue_contents_changed(buffer);
}
- vte_terminal_emit_pending_signals (terminal);
+ vte_view_emit_pending_signals (terminal);
if (invalidated_text) {
/* Clip off any part of the box which isn't already on-screen. */
@@ -3722,7 +3722,7 @@ next_match:
_vte_invalidate_cursor_once(terminal, FALSE);
_vte_check_cursor_blink(terminal);
/* Signal that the cursor moved. */
- vte_terminal_queue_cursor_moved(terminal);
+ vte_view_queue_cursor_moved(terminal);
} else if (cursor_visible != buffer->pvt->cursor_visible) {
_vte_invalidate_cell(terminal, cursor.col, cursor.row);
_vte_check_cursor_blink(terminal);
@@ -3790,7 +3790,7 @@ vte_buffer_io_read(GIOChannel *channel,
GIOCondition condition,
VteBuffer *buffer)
{
- VteTerminal *terminal = buffer->pvt->terminal;
+ VteView *terminal = buffer->pvt->terminal;
int err = 0;
gboolean eof, again = TRUE;
@@ -3863,9 +3863,9 @@ out:
if (chunks != NULL) {
_vte_buffer_feed_chunks (buffer, chunks);
}
- if (!vte_terminal_is_processing (terminal)) {
+ if (!vte_view_is_processing (terminal)) {
GDK_THREADS_ENTER ();
- vte_terminal_add_process_timeout (terminal);
+ vte_view_add_process_timeout (terminal);
GDK_THREADS_LEAVE ();
}
buffer->pvt->pty_input_active = len != 0;
@@ -3898,12 +3898,12 @@ out:
/* If we detected an eof condition, signal one. */
if (eof) {
/* potential deadlock ... */
- if (!vte_terminal_is_processing (terminal)) {
+ if (!vte_view_is_processing (terminal)) {
GDK_THREADS_ENTER ();
- vte_terminal_eof (channel, terminal);
+ vte_view_eof (channel, terminal);
GDK_THREADS_LEAVE ();
} else {
- vte_terminal_eof (channel, terminal);
+ vte_view_eof (channel, terminal);
}
again = FALSE;
@@ -3960,7 +3960,7 @@ vte_buffer_feed(VteBuffer *buffer,
chunk = get_chunk ();
_vte_buffer_feed_chunks (buffer, chunk);
} while (1);
- vte_terminal_start_processing (buffer->pvt->terminal);
+ vte_view_start_processing (buffer->pvt->terminal);
}
}
@@ -3970,7 +3970,7 @@ vte_buffer_io_write(GIOChannel *channel,
GIOCondition condition,
VteBuffer *buffer)
{
- VteTerminal *terminal = buffer->pvt->terminal;
+ VteView *terminal = buffer->pvt->terminal;
gssize count;
int fd;
gboolean leave_open;
@@ -4203,7 +4203,7 @@ vte_buffer_feed_child_using_modes(VteBuffer *buffer,
/* Send text from the input method to the child. */
static void
-vte_terminal_im_commit(GtkIMContext *im_context, gchar *text, VteTerminal *terminal)
+vte_view_im_commit(GtkIMContext *im_context, gchar *text, VteView *terminal)
{
_vte_debug_print(VTE_DEBUG_EVENTS,
"Input method committed `%s'.\n", text);
@@ -4211,13 +4211,13 @@ vte_terminal_im_commit(GtkIMContext *im_context, gchar *text, VteTerminal *termi
/* Committed text was committed because the user pressed a key, so
* we need to obey the scroll-on-keystroke setting. */
if (terminal->pvt->scroll_on_keystroke) {
- vte_terminal_maybe_scroll_to_bottom(terminal);
+ vte_view_maybe_scroll_to_bottom(terminal);
}
}
/* We've started pre-editing. */
static void
-vte_terminal_im_preedit_start(GtkIMContext *im_context, VteTerminal *terminal)
+vte_view_im_preedit_start(GtkIMContext *im_context, VteView *terminal)
{
_vte_debug_print(VTE_DEBUG_EVENTS,
"Input method pre-edit started.\n");
@@ -4226,7 +4226,7 @@ vte_terminal_im_preedit_start(GtkIMContext *im_context, VteTerminal *terminal)
/* We've stopped pre-editing. */
static void
-vte_terminal_im_preedit_end(GtkIMContext *im_context, VteTerminal *terminal)
+vte_view_im_preedit_end(GtkIMContext *im_context, VteView *terminal)
{
_vte_debug_print(VTE_DEBUG_EVENTS,
"Input method pre-edit ended.\n");
@@ -4235,9 +4235,9 @@ vte_terminal_im_preedit_end(GtkIMContext *im_context, VteTerminal *terminal)
/* The pre-edit string changed. */
static void
-vte_terminal_im_preedit_changed(GtkIMContext *im_context, VteTerminal *terminal)
+vte_view_im_preedit_changed(GtkIMContext *im_context, VteView *terminal)
{
- VteTerminalPrivate *pvt = terminal->pvt;
+ VteViewPrivate *pvt = terminal->pvt;
gchar *str;
PangoAttrList *attrs;
gint cursor;
@@ -4265,9 +4265,9 @@ vte_terminal_im_preedit_changed(GtkIMContext *im_context, VteTerminal *terminal)
}
static void
-vte_terminal_set_padding(VteTerminal *terminal)
+vte_view_set_padding(VteView *terminal)
{
- VteTerminalPrivate *pvt = terminal->pvt;
+ VteViewPrivate *pvt = terminal->pvt;
GtkWidget *widget = GTK_WIDGET(terminal);
GtkBorder padding;
@@ -4289,8 +4289,8 @@ vte_terminal_set_padding(VteTerminal *terminal)
}
/*
- * _vte_terminal_set_effect_color:
- * @terminal: a #VteTerminal
+ * _vte_view_set_effect_color:
+ * @terminal: a #VteView
* @entry: the entry in the colour palette
* @rgba:
* @effect:
@@ -4303,13 +4303,13 @@ vte_terminal_set_padding(VteTerminal *terminal)
* and @override is %FALSE, does nothing.
*/
void
-_vte_terminal_set_effect_color(VteTerminal *terminal,
+_vte_view_set_effect_color(VteView *terminal,
int entry,
const GdkRGBA *rgba,
VteEffect effect,
gboolean override)
{
- VteTerminalPrivate *pvt = terminal->pvt;
+ VteViewPrivate *pvt = terminal->pvt;
gboolean has_override, color_set;
has_override = VTE_PALETTE_HAS_OVERRIDE(pvt->palette_set, entry);
@@ -4322,7 +4322,7 @@ _vte_terminal_set_effect_color(VteTerminal *terminal,
g_assert (rgba != NULL);
- vte_terminal_set_color_internal(terminal, entry, rgba, override);
+ vte_view_set_color_internal(terminal, entry, rgba, override);
color_set = (effect == VTE_EFFECT_COLOR);
switch (entry) {
@@ -4339,8 +4339,8 @@ _vte_terminal_set_effect_color(VteTerminal *terminal,
}
/*
- * vte_terminal_set_mixed_color:
- * @terminal: a #VteTerminal
+ * vte_view_set_mixed_color:
+ * @terminal: a #VteView
* @entry: the entry in the colour palette
* @color: (allow-none): the new dim color or %NULL
* @factor:
@@ -4351,7 +4351,7 @@ _vte_terminal_set_effect_color(VteTerminal *terminal,
* background color.
*/
static void
-vte_terminal_set_mixed_color(VteTerminal *terminal,
+vte_view_set_mixed_color(VteView *terminal,
int entry,
const GdkRGBA *rgba,
gdouble factor,
@@ -4360,14 +4360,14 @@ vte_terminal_set_mixed_color(VteTerminal *terminal,
GdkRGBA mixed;
if (rgba == NULL) {
- vte_terminal_generate_bold(&terminal->pvt->palette[VTE_DEF_FG],
+ vte_view_generate_bold(&terminal->pvt->palette[VTE_DEF_FG],
&terminal->pvt->palette[VTE_DEF_BG],
factor,
&mixed);
rgba = &mixed;
}
- vte_terminal_set_color_internal(terminal, entry, rgba, override);
+ vte_view_set_color_internal(terminal, entry, rgba, override);
}
/*
@@ -4416,7 +4416,7 @@ static const char color_names[8][8] = {
};
static void
-vte_terminal_update_style_colors(VteTerminal *terminal,
+vte_view_update_style_colors(VteView *terminal,
gboolean override)
{
GtkStyleContext *context;
@@ -4432,22 +4432,22 @@ vte_terminal_update_style_colors(VteTerminal *terminal,
* may be defined in terms of these.
*/
color = _vte_style_context_get_color(context, "foreground-color", &rgba);
- vte_terminal_set_color_internal(terminal, VTE_DEF_FG, color, FALSE);
+ vte_view_set_color_internal(terminal, VTE_DEF_FG, color, FALSE);
color = _vte_style_context_get_color(context, "background-color", &rgba);
- vte_terminal_set_color_internal(terminal, VTE_DEF_BG, color, FALSE);
+ vte_view_set_color_internal(terminal, VTE_DEF_BG, color, FALSE);
/* The 256 colour palette */
for (i = 0; i < 8; ++i) {
g_snprintf (name, sizeof (name), "%s-color", color_names[i]);
color = _vte_style_context_get_color(context, name, &rgba);
- vte_terminal_set_color_internal(terminal, VTE_COLOR_PLAIN_OFFSET + i,
+ vte_view_set_color_internal(terminal, VTE_COLOR_PLAIN_OFFSET + i,
color, override);
}
for (i = 0; i < 8; ++i) {
g_snprintf (name, sizeof (name), "bright-%s-color", color_names[i]);
color = _vte_style_context_get_color(context, name, &rgba);
- vte_terminal_set_color_internal(terminal, VTE_COLOR_BRIGHT_OFFSET + i,
+ vte_view_set_color_internal(terminal, VTE_COLOR_BRIGHT_OFFSET + i,
color, override);
}
for (i = 0; i < 216; ++i) {
@@ -4458,23 +4458,23 @@ vte_terminal_update_style_colors(VteTerminal *terminal,
b = i % 6 + 1;
g_snprintf (name, sizeof (name), "color-6-cube-%d-%d-%d-color", r, g, b);
color = _vte_style_context_get_color(context, name, &rgba);
- vte_terminal_set_color_internal(terminal, VTE_COLOR_COLORCUBE_OFFSET + i,
+ vte_view_set_color_internal(terminal, VTE_COLOR_COLORCUBE_OFFSET + i,
color, override);
}
for (i = 0; i < 24; ++i) {
g_snprintf (name, sizeof (name), "shade-24-shades-%d-color", i + 1);
color = _vte_style_context_get_color(context, name, &rgba);
- vte_terminal_set_color_internal(terminal, VTE_COLOR_SHADES_OFFSET + i,
+ vte_view_set_color_internal(terminal, VTE_COLOR_SHADES_OFFSET + i,
color, override);
}
/* Now the extra colours */
color = _vte_style_context_get_color(context, "bold-foreground-color", &rgba);
- vte_terminal_set_mixed_color(terminal, VTE_BOLD_FG, color, 1.8, override);
+ vte_view_set_mixed_color(terminal, VTE_BOLD_FG, color, 1.8, override);
color = _vte_style_context_get_color(context, "dim-foreground-color", &rgba);
- vte_terminal_set_mixed_color(terminal, VTE_DIM_FG, color, 0.5, override);
+ vte_view_set_mixed_color(terminal, VTE_DIM_FG, color, 0.5, override);
gtk_widget_style_get(&terminal->widget,
"cursor-effect", &cursor_effect,
@@ -4483,19 +4483,19 @@ vte_terminal_update_style_colors(VteTerminal *terminal,
NULL);
color = _vte_style_context_get_color(context, "cursor-background-color", &rgba);
- _vte_terminal_set_effect_color(terminal, VTE_CUR_BG, color, cursor_effect, override);
+ _vte_view_set_effect_color(terminal, VTE_CUR_BG, color, cursor_effect, override);
color = _vte_style_context_get_color(context, "reverse-background-color", &rgba);
- _vte_terminal_set_effect_color(terminal, VTE_REV_BG, color, reverse_effect, override);
+ _vte_view_set_effect_color(terminal, VTE_REV_BG, color, reverse_effect, override);
color = _vte_style_context_get_color(context, "selection-background-color", &rgba);
- _vte_terminal_set_effect_color(terminal, VTE_DEF_HL, color, selection_effect, override);
+ _vte_view_set_effect_color(terminal, VTE_DEF_HL, color, selection_effect, override);
}
static void
-vte_terminal_update_cursor_style(VteTerminal *terminal)
+vte_view_update_cursor_style(VteView *terminal)
{
- VteTerminalPrivate *pvt = terminal->pvt;
+ VteViewPrivate *pvt = terminal->pvt;
GtkWidget *widget = &terminal->widget;
float aspect;
int cursor_shape, blink_mode;
@@ -4524,7 +4524,7 @@ vte_terminal_update_cursor_style(VteTerminal *terminal)
break;
}
- vte_terminal_set_cursor_blinks_internal(terminal, blinks);
+ vte_view_set_cursor_blinks_internal(terminal, blinks);
}
if ((VteCursorShape)cursor_shape != pvt->cursor_shape) {
@@ -4539,9 +4539,9 @@ vte_terminal_update_cursor_style(VteTerminal *terminal)
}
static void
-vte_terminal_update_background_style(VteTerminal *terminal)
+vte_view_update_background_style(VteView *terminal)
{
- VteTerminalPrivate *pvt = terminal->pvt;
+ VteViewPrivate *pvt = terminal->pvt;
cairo_pattern_t *pattern;
gtk_widget_style_get(&terminal->widget, "background-pattern", &pattern, NULL);
@@ -4562,21 +4562,21 @@ vte_terminal_update_background_style(VteTerminal *terminal)
}
pvt->bg_pattern = pattern /* adopted */;
- vte_terminal_queue_background_update(terminal);
+ vte_view_queue_background_update(terminal);
}
static void
-vte_terminal_update_style(VteTerminal *terminal)
+vte_view_update_style(VteView *terminal)
{
- VteTerminalPrivate *pvt = terminal->pvt;
+ VteViewPrivate *pvt = terminal->pvt;
GtkWidget *widget = &terminal->widget;
gboolean allow_bold, scroll_background, reverse;
PangoFontDescription *font_desc;
- vte_terminal_set_padding(terminal);
- vte_terminal_update_style_colors(terminal, FALSE);
- vte_terminal_update_cursor_style(terminal);
- vte_terminal_update_background_style(terminal);
+ vte_view_set_padding(terminal);
+ vte_view_update_style_colors(terminal, FALSE);
+ vte_view_update_cursor_style(terminal);
+ vte_view_update_background_style(terminal);
gtk_widget_style_get(widget,
"allow-bold", &allow_bold,
@@ -4585,7 +4585,7 @@ vte_terminal_update_style(VteTerminal *terminal)
"reverse", &reverse,
NULL);
- vte_terminal_set_font(terminal, font_desc /* adopted */);
+ vte_view_set_font(terminal, font_desc /* adopted */);
if (allow_bold != pvt->allow_bold) {
pvt->allow_bold = allow_bold;
@@ -4600,20 +4600,20 @@ vte_terminal_update_style(VteTerminal *terminal)
if (scroll_background != pvt->scroll_background) {
pvt->scroll_background = scroll_background;
- vte_terminal_queue_background_update(terminal);
+ vte_view_queue_background_update(terminal);
}
}
static void
-vte_terminal_style_updated(GtkWidget *widget)
+vte_view_style_updated(GtkWidget *widget)
{
- GTK_WIDGET_CLASS (vte_terminal_parent_class)->style_updated (widget);
+ GTK_WIDGET_CLASS (vte_view_parent_class)->style_updated (widget);
- vte_terminal_update_style(VTE_TERMINAL(widget));
+ vte_view_update_style(VTE_VIEW(widget));
}
static void
-add_cursor_timeout (VteTerminal *terminal)
+add_cursor_timeout (VteView *terminal)
{
if (terminal->pvt->cursor_blink_tag)
return; /* already added */
@@ -4627,7 +4627,7 @@ add_cursor_timeout (VteTerminal *terminal)
}
static void
-remove_cursor_timeout (VteTerminal *terminal)
+remove_cursor_timeout (VteView *terminal)
{
if (terminal->pvt->cursor_blink_tag == 0)
return; /* already removed */
@@ -4638,7 +4638,7 @@ remove_cursor_timeout (VteTerminal *terminal)
/* Activates / disactivates the cursor blink timer to reduce wakeups */
static void
-_vte_check_cursor_blink(VteTerminal *terminal)
+_vte_check_cursor_blink(VteView *terminal)
{
VteBuffer *buffer = terminal->pvt->buffer;
@@ -4651,17 +4651,17 @@ _vte_check_cursor_blink(VteTerminal *terminal)
}
static void
-vte_terminal_audible_beep(VteTerminal *terminal)
+vte_view_audible_beep(VteView *terminal)
{
GdkDisplay *display;
- g_assert(VTE_IS_TERMINAL(terminal));
+ g_assert(VTE_IS_VIEW(terminal));
display = gtk_widget_get_display(&terminal->widget);
gdk_display_beep(display);
}
static void
-vte_terminal_visible_beep(VteTerminal *terminal)
+vte_view_visible_beep(VteView *terminal)
{
GtkWidget *widget = &terminal->widget;
GtkAllocation allocation;
@@ -4693,14 +4693,14 @@ vte_terminal_visible_beep(VteTerminal *terminal)
}
static void
-vte_terminal_beep(VteTerminal *terminal,
+vte_view_beep(VteView *terminal,
VteBellType bell_type)
{
if (bell_type == VTE_BELL_AUDIBLE && terminal->pvt->audible_bell) {
- vte_terminal_audible_beep (terminal);
+ vte_view_audible_beep (terminal);
}
if (bell_type == VTE_BELL_VISUAL && terminal->pvt->visible_bell) {
- vte_terminal_visible_beep (terminal);
+ vte_view_visible_beep (terminal);
}
}
@@ -4736,7 +4736,7 @@ vte_translate_ctrlkey (GdkEventKey *event)
}
static void
-vte_terminal_read_modifiers (VteTerminal *terminal,
+vte_view_read_modifiers (VteView *terminal,
GdkEvent *event)
{
GdkModifierType modifiers;
@@ -4752,9 +4752,9 @@ vte_terminal_read_modifiers (VteTerminal *terminal,
/* Read and handle a keypress event. */
static gint
-vte_terminal_key_press(GtkWidget *widget, GdkEventKey *event)
+vte_view_key_press(GtkWidget *widget, GdkEventKey *event)
{
- VteTerminal *terminal = VTE_TERMINAL(widget);
+ VteView *terminal = VTE_VIEW(widget);
VteBuffer *buffer;
GdkModifierType modifiers;
struct _vte_termcap *termcap;
@@ -4773,8 +4773,8 @@ vte_terminal_key_press(GtkWidget *widget, GdkEventKey *event)
/* First, check if GtkWidget's behavior already does something with
* this key. */
- if (GTK_WIDGET_CLASS(vte_terminal_parent_class)->key_press_event) {
- if ((GTK_WIDGET_CLASS(vte_terminal_parent_class))->key_press_event(widget,
+ if (GTK_WIDGET_CLASS(vte_view_parent_class)->key_press_event) {
+ if ((GTK_WIDGET_CLASS(vte_view_parent_class))->key_press_event(widget,
event)) {
return TRUE;
}
@@ -4789,7 +4789,7 @@ vte_terminal_key_press(GtkWidget *widget, GdkEventKey *event)
if (event->type == GDK_KEY_PRESS) {
/* Store a copy of the key. */
keyval = event->keyval;
- vte_terminal_read_modifiers (terminal, (GdkEvent*) event);
+ vte_view_read_modifiers (terminal, (GdkEvent*) event);
/* If we're in margin bell mode and on the border of the
* margin, bell. */
@@ -4813,7 +4813,7 @@ vte_terminal_key_press(GtkWidget *widget, GdkEventKey *event)
/* Unless it's a modifier key, hide the pointer. */
if (!modifier) {
- _vte_terminal_set_pointer_visible(terminal, FALSE);
+ _vte_view_set_pointer_visible(terminal, FALSE);
}
_vte_debug_print(VTE_DEBUG_EVENTS,
@@ -4966,16 +4966,16 @@ vte_terminal_key_press(GtkWidget *widget, GdkEventKey *event)
case GDK_KEY_Insert:
if (modifiers & GDK_SHIFT_MASK) {
if (modifiers & GDK_CONTROL_MASK) {
- vte_terminal_emit_paste_clipboard(terminal);
+ vte_view_emit_paste_clipboard(terminal);
handled = TRUE;
suppress_meta_esc = TRUE;
} else {
- vte_terminal_emit_paste_primary(terminal);
+ vte_view_emit_paste_primary(terminal);
handled = TRUE;
suppress_meta_esc = TRUE;
}
} else if (modifiers & GDK_CONTROL_MASK) {
- vte_terminal_emit_copy_clipboard(terminal);
+ vte_view_emit_copy_clipboard(terminal);
handled = TRUE;
suppress_meta_esc = TRUE;
}
@@ -4985,7 +4985,7 @@ vte_terminal_key_press(GtkWidget *widget, GdkEventKey *event)
case GDK_KEY_Up:
if (modifiers & GDK_CONTROL_MASK
&& modifiers & GDK_SHIFT_MASK) {
- vte_terminal_scroll_lines(terminal, -1);
+ vte_view_scroll_lines(terminal, -1);
scrolled = TRUE;
handled = TRUE;
suppress_meta_esc = TRUE;
@@ -4995,7 +4995,7 @@ vte_terminal_key_press(GtkWidget *widget, GdkEventKey *event)
case GDK_KEY_Down:
if (modifiers & GDK_CONTROL_MASK
&& modifiers & GDK_SHIFT_MASK) {
- vte_terminal_scroll_lines(terminal, 1);
+ vte_view_scroll_lines(terminal, 1);
scrolled = TRUE;
handled = TRUE;
suppress_meta_esc = TRUE;
@@ -5004,7 +5004,7 @@ vte_terminal_key_press(GtkWidget *widget, GdkEventKey *event)
case GDK_KEY_KP_Page_Up:
case GDK_KEY_Page_Up:
if (modifiers & GDK_SHIFT_MASK) {
- vte_terminal_scroll_pages(terminal, -1);
+ vte_view_scroll_pages(terminal, -1);
scrolled = TRUE;
handled = TRUE;
suppress_meta_esc = TRUE;
@@ -5013,7 +5013,7 @@ vte_terminal_key_press(GtkWidget *widget, GdkEventKey *event)
case GDK_KEY_KP_Page_Down:
case GDK_KEY_Page_Down:
if (modifiers & GDK_SHIFT_MASK) {
- vte_terminal_scroll_pages(terminal, 1);
+ vte_view_scroll_pages(terminal, 1);
scrolled = TRUE;
handled = TRUE;
suppress_meta_esc = TRUE;
@@ -5022,7 +5022,7 @@ vte_terminal_key_press(GtkWidget *widget, GdkEventKey *event)
case GDK_KEY_KP_Home:
case GDK_KEY_Home:
if (modifiers & GDK_SHIFT_MASK) {
- vte_terminal_maybe_scroll_to_top(terminal);
+ vte_view_maybe_scroll_to_top(terminal);
scrolled = TRUE;
handled = TRUE;
}
@@ -5030,7 +5030,7 @@ vte_terminal_key_press(GtkWidget *widget, GdkEventKey *event)
case GDK_KEY_KP_End:
case GDK_KEY_End:
if (modifiers & GDK_SHIFT_MASK) {
- vte_terminal_maybe_scroll_to_bottom(terminal);
+ vte_view_maybe_scroll_to_bottom(terminal);
scrolled = TRUE;
handled = TRUE;
}
@@ -5042,12 +5042,12 @@ vte_terminal_key_press(GtkWidget *widget, GdkEventKey *event)
(GDK_SHIFT_MASK | GDK_CONTROL_MASK)) {
switch (keyval) {
case GDK_KEY_KP_Add:
- vte_terminal_emit_increase_font_size(terminal);
+ vte_view_emit_increase_font_size(terminal);
handled = TRUE;
suppress_meta_esc = TRUE;
break;
case GDK_KEY_KP_Subtract:
- vte_terminal_emit_decrease_font_size(terminal);
+ vte_view_emit_decrease_font_size(terminal);
handled = TRUE;
suppress_meta_esc = TRUE;
break;
@@ -5166,7 +5166,7 @@ vte_terminal_key_press(GtkWidget *widget, GdkEventKey *event)
/* Keep the cursor on-screen. */
if (!scrolled && !modifier &&
terminal->pvt->scroll_on_keystroke) {
- vte_terminal_maybe_scroll_to_bottom(terminal);
+ vte_view_maybe_scroll_to_bottom(terminal);
}
return TRUE;
}
@@ -5174,12 +5174,12 @@ vte_terminal_key_press(GtkWidget *widget, GdkEventKey *event)
}
static gboolean
-vte_terminal_key_release(GtkWidget *widget, GdkEventKey *event)
+vte_view_key_release(GtkWidget *widget, GdkEventKey *event)
{
- VteTerminal *terminal = VTE_TERMINAL(widget);
+ VteView *terminal = VTE_VIEW(widget);
VteBuffer *buffer;
- vte_terminal_read_modifiers (terminal, (GdkEvent*) event);
+ vte_view_read_modifiers (terminal, (GdkEvent*) event);
buffer = terminal->pvt->buffer;
if (buffer == NULL)
@@ -5190,17 +5190,17 @@ vte_terminal_key_release(GtkWidget *widget, GdkEventKey *event)
}
/*
- * __vte_terminal_is_word_char:
- * @terminal: a #VteTerminal
+ * __vte_view_is_word_char:
+ * @terminal: a #VteView
* @c: a candidate Unicode code point
*
* Checks if a particular character is considered to be part of a word or not,
- * based on the values last passed to vte_terminal_set_word_chars().
+ * based on the values last passed to vte_view_set_word_chars().
*
* Returns: %TRUE if the character is considered to be part of a word
*/
gboolean
-_vte_terminal_is_word_char(VteTerminal *terminal, gunichar c)
+_vte_view_is_word_char(VteView *terminal, gunichar c)
{
guint i;
VteWordCharRange *range;
@@ -5230,14 +5230,14 @@ _vte_terminal_is_word_char(VteTerminal *terminal, gunichar c)
/* Check if the characters in the two given locations are in the same class
* (word vs. non-word characters). */
static gboolean
-vte_same_class(VteTerminal *terminal, glong acol, glong arow,
+vte_same_class(VteView *terminal, glong acol, glong arow,
glong bcol, glong brow)
{
VteBuffer *buffer = terminal->pvt->buffer;
const VteCell *pcell = NULL;
gboolean word_char;
if ((pcell = vte_screen_find_charcell(buffer->pvt->screen, acol, arow)) != NULL && pcell->c != 0) {
- word_char = _vte_terminal_is_word_char(terminal, _vte_unistr_get_base (pcell->c));
+ word_char = _vte_view_is_word_char(terminal, _vte_unistr_get_base (pcell->c));
/* Lets not group non-wordchars together (bug #25290) */
if (!word_char)
@@ -5247,7 +5247,7 @@ vte_same_class(VteTerminal *terminal, glong acol, glong arow,
if (pcell == NULL || pcell->c == 0) {
return FALSE;
}
- if (word_char != _vte_terminal_is_word_char(terminal, _vte_unistr_get_base (pcell->c))) {
+ if (word_char != _vte_view_is_word_char(terminal, _vte_unistr_get_base (pcell->c))) {
return FALSE;
}
return TRUE;
@@ -5327,7 +5327,7 @@ vte_cell_is_between(glong col, glong row,
/* Check if a cell is selected or not. */
static gboolean
-vte_terminal_cell_is_selected(VteBuffer *buffer, glong col, glong row, VteTerminal *terminal)
+vte_view_cell_is_selected(VteBuffer *buffer, glong col, glong row, VteView *terminal)
{
VteVisualPosition ss, se;
@@ -5357,9 +5357,9 @@ vte_terminal_cell_is_selected(VteBuffer *buffer, glong col, glong row, VteTermin
/* Once we get text data, actually paste it in. */
static void
-vte_terminal_paste_cb(GtkClipboard *clipboard, const gchar *text, gpointer data)
+vte_view_paste_cb(GtkClipboard *clipboard, const gchar *text, gpointer data)
{
- VteTerminal *terminal = data;
+ VteView *terminal = data;
VteBuffer *buffer;
gchar *paste, *p;
long length;
@@ -5397,7 +5397,7 @@ vte_terminal_paste_cb(GtkClipboard *clipboard, const gchar *text, gpointer data)
}
/**
- * _vte_terminal_xy_to_grid:
+ * _vte_view_xy_to_grid:
* @x: the X coordinate
* @y: the Y coordinate
* @col: return location to store the column
@@ -5408,14 +5408,14 @@ vte_terminal_paste_cb(GtkClipboard *clipboard, const gchar *text, gpointer data)
* If the coordinates are outside the grid, returns %FALSE.
*/
gboolean
-_vte_terminal_xy_to_grid(VteTerminal *terminal,
+_vte_view_xy_to_grid(VteView *terminal,
long x,
long y,
long *col,
long *row)
{
VteBuffer *buffer;
- VteTerminalPrivate *pvt = terminal->pvt;
+ VteViewPrivate *pvt = terminal->pvt;
long c, r;
buffer = terminal->pvt->buffer;
@@ -5436,7 +5436,7 @@ _vte_terminal_xy_to_grid(VteTerminal *terminal,
}
/**
- * _vte_terminal_size_to_grid_size
+ * _vte_view_size_to_grid_size
* @w: the width in px
* @h: the height in px
* @col: return location to store the column count
@@ -5448,13 +5448,13 @@ _vte_terminal_xy_to_grid(VteTerminal *terminal,
* one column or row (i.e due to padding), returns %FALSE.
*/
gboolean
-_vte_terminal_size_to_grid_size(VteTerminal *terminal,
+_vte_view_size_to_grid_size(VteView *terminal,
long w,
long h,
long *cols,
long *rows)
{
- VteTerminalPrivate *pvt = terminal->pvt;
+ VteViewPrivate *pvt = terminal->pvt;
long n_cols, n_rows;
n_cols = (w - pvt->padding.left - pvt->padding.right) / pvt->char_width;
@@ -5469,7 +5469,7 @@ _vte_terminal_size_to_grid_size(VteTerminal *terminal,
}
static void
-vte_terminal_get_mouse_tracking_info (VteTerminal *terminal,
+vte_view_get_mouse_tracking_info (VteView *terminal,
int button,
long col,
long row,
@@ -5528,14 +5528,14 @@ vte_terminal_get_mouse_tracking_info (VteTerminal *terminal,
}
/*
- * vte_terminal_send_mouse_button_internal:
+ * vte_view_send_mouse_button_internal:
* @terminal:
* @button: the mouse button, or 0 for keyboard
* @x: the event X coordinate
* @y: the event Y coordinate
*/
static void
-vte_terminal_send_mouse_button_internal(VteTerminal *terminal,
+vte_view_send_mouse_button_internal(VteView *terminal,
int button,
long x,
long y)
@@ -5545,10 +5545,10 @@ vte_terminal_send_mouse_button_internal(VteTerminal *terminal,
gint len;
long col, row;
- if (!_vte_terminal_xy_to_grid(terminal, x, y, &col, &row))
+ if (!_vte_view_xy_to_grid(terminal, x, y, &col, &row))
return;
- vte_terminal_get_mouse_tracking_info (terminal,
+ vte_view_get_mouse_tracking_info (terminal,
button, col, row,
&cb, &cx, &cy);
@@ -5559,10 +5559,10 @@ vte_terminal_send_mouse_button_internal(VteTerminal *terminal,
/* Send a mouse button click/release notification. */
static void
-vte_terminal_maybe_send_mouse_button(VteTerminal *terminal,
+vte_view_maybe_send_mouse_button(VteView *terminal,
GdkEventButton *event)
{
- vte_terminal_read_modifiers (terminal, (GdkEvent*) event);
+ vte_view_read_modifiers (terminal, (GdkEvent*) event);
switch (event->type) {
case GDK_BUTTON_PRESS:
@@ -5581,21 +5581,21 @@ vte_terminal_maybe_send_mouse_button(VteTerminal *terminal,
break;
}
- vte_terminal_send_mouse_button_internal(terminal,
+ vte_view_send_mouse_button_internal(terminal,
(event->type == GDK_BUTTON_PRESS) ? event->button : 0,
event->x, event->y);
}
/* Send a mouse motion notification. */
static void
-vte_terminal_maybe_send_mouse_drag(VteTerminal *terminal, GdkEventMotion *event)
+vte_view_maybe_send_mouse_drag(VteView *terminal, GdkEventMotion *event)
{
unsigned char cb, cx, cy;
char buf[LINE_MAX];
gint len;
long col, row;
- (void) _vte_terminal_xy_to_grid(terminal, event->x, event->y, &col, &row);
+ (void) _vte_view_xy_to_grid(terminal, event->x, event->y, &col, &row);
/* First determine if we even want to send notification. */
switch (event->type) {
@@ -5620,7 +5620,7 @@ vte_terminal_maybe_send_mouse_drag(VteTerminal *terminal, GdkEventMotion *event)
break;
}
- vte_terminal_get_mouse_tracking_info (terminal,
+ vte_view_get_mouse_tracking_info (terminal,
terminal->pvt->mouse_last_button, col, row,
&cb, &cx, &cy);
cb += 32; /* for movement */
@@ -5632,7 +5632,7 @@ vte_terminal_maybe_send_mouse_drag(VteTerminal *terminal, GdkEventMotion *event)
/* Clear all match hilites. */
static void
-vte_terminal_match_hilite_clear(VteTerminal *terminal)
+vte_view_match_hilite_clear(VteView *terminal)
{
long srow, scolumn, erow, ecolumn;
srow = terminal->pvt->match_start.row;
@@ -5659,7 +5659,7 @@ vte_terminal_match_hilite_clear(VteTerminal *terminal)
}
static gboolean
-cursor_inside_match (VteTerminal *terminal, long x, long y)
+cursor_inside_match (VteView *terminal, long x, long y)
{
VteBuffer *buffer = terminal->pvt->buffer;
gint width = terminal->pvt->char_width;
@@ -5686,7 +5686,7 @@ cursor_inside_match (VteTerminal *terminal, long x, long y)
}
static void
-vte_terminal_match_hilite_show(VteTerminal *terminal, long x, long y)
+vte_view_match_hilite_show(VteView *terminal, long x, long y)
{
if(terminal->pvt->match != NULL && !terminal->pvt->show_match){
if (cursor_inside_match (terminal, x, y)) {
@@ -5701,7 +5701,7 @@ vte_terminal_match_hilite_show(VteTerminal *terminal, long x, long y)
}
}
static void
-vte_terminal_match_hilite_hide(VteTerminal *terminal)
+vte_view_match_hilite_hide(VteView *terminal)
{
if(terminal->pvt->match != NULL && terminal->pvt->show_match){
_vte_invalidate_region (terminal,
@@ -5716,7 +5716,7 @@ vte_terminal_match_hilite_hide(VteTerminal *terminal)
static void
-vte_terminal_match_hilite_update(VteTerminal *terminal, long x, long y)
+vte_view_match_hilite_update(VteView *terminal, long x, long y)
{
VteBuffer *buffer;
int start, end, width, height;
@@ -5740,7 +5740,7 @@ vte_terminal_match_hilite_update(VteTerminal *terminal, long x, long y)
x / width,
y / height + delta);
- match = vte_terminal_match_check_internal(terminal,
+ match = vte_view_match_check_internal(terminal,
x / width,
y / height + delta,
&terminal->pvt->match_tag,
@@ -5813,7 +5813,7 @@ vte_terminal_match_hilite_update(VteTerminal *terminal, long x, long y)
}
/* Update the hilited text if the pointer has moved to a new character cell. */
static void
-vte_terminal_match_hilite(VteTerminal *terminal, long x, long y)
+vte_view_match_hilite(VteView *terminal, long x, long y)
{
int width, height;
GtkAllocation allocation;
@@ -5842,28 +5842,28 @@ vte_terminal_match_hilite(VteTerminal *terminal, long x, long y)
return;
}
- vte_terminal_match_hilite_update(terminal, x, y);
+ vte_view_match_hilite_update(terminal, x, y);
}
/* Note that the clipboard has cleared. */
static void
-vte_terminal_clear_cb(GtkClipboard *clipboard, gpointer owner)
+vte_view_clear_cb(GtkClipboard *clipboard, gpointer owner)
{
- VteTerminal *terminal;
+ VteView *terminal;
terminal = owner;
if (terminal->pvt->has_selection) {
_vte_debug_print(VTE_DEBUG_SELECTION, "Lost selection.\n");
- vte_terminal_deselect_all(terminal);
+ vte_view_deselect_all(terminal);
}
}
/* Supply the selected text to the clipboard. */
static void
-vte_terminal_copy_cb(GtkClipboard *clipboard, GtkSelectionData *data,
+vte_view_copy_cb(GtkClipboard *clipboard, GtkSelectionData *data,
guint info, gpointer owner)
{
- VteTerminal *terminal;
+ VteView *terminal;
terminal = owner;
if (terminal->pvt->selection != NULL) {
_VTE_DEBUG_IF(VTE_DEBUG_SELECTION) {
@@ -5942,7 +5942,7 @@ vte_buffer_get_text_range_maybe_wrapped(VteBuffer *buffer,
GArray *attributes,
gboolean include_trailing_spaces)
{
- VteTerminal *terminal;
+ VteView *terminal;
glong col, row, last_empty, last_emptycol, last_nonempty, last_nonemptycol;
VteScreen *screen;
const VteCell *pcell = NULL;
@@ -6184,21 +6184,21 @@ vte_buffer_get_cursor_position(VteBuffer *buffer,
}
/**
- * vte_terminal_copy_clipboard:
- * @terminal: a #VteTerminal
+ * vte_view_copy_clipboard:
+ * @terminal: a #VteView
* @clipboard: a #GtkClipboard
*
* Copies the selected text in @terminal to @clipboard.
*/
void
-vte_terminal_copy_clipboard(VteTerminal *terminal,
+vte_view_copy_clipboard(VteView *terminal,
GtkClipboard *clipboard)
{
static GtkTargetEntry *targets = NULL;
static gint n_targets = 0;
VteBuffer *buffer;
- g_return_if_fail(VTE_IS_TERMINAL(terminal));
+ g_return_if_fail(VTE_IS_VIEW(terminal));
g_return_if_fail(GTK_IS_CLIPBOARD(clipboard));
buffer = terminal->pvt->buffer;
@@ -6213,7 +6213,7 @@ vte_terminal_copy_clipboard(VteTerminal *terminal,
0,
terminal->pvt->selection_end.row,
buffer->pvt->column_count,
- (VteSelectionFunc)vte_terminal_cell_is_selected,
+ (VteSelectionFunc)vte_view_cell_is_selected,
terminal /* user data */,
NULL);
terminal->pvt->has_selection = TRUE;
@@ -6234,15 +6234,15 @@ vte_terminal_copy_clipboard(VteTerminal *terminal,
gtk_clipboard_set_with_owner(clipboard,
targets,
n_targets,
- vte_terminal_copy_cb,
- vte_terminal_clear_cb,
+ vte_view_copy_cb,
+ vte_view_clear_cb,
G_OBJECT(terminal));
gtk_clipboard_set_can_store(clipboard, NULL, 0);
}
}
static void
-vte_terminal_invalidate_selection (VteTerminal *terminal)
+vte_view_invalidate_selection (VteView *terminal)
{
_vte_invalidate_region (terminal,
terminal->pvt->selection_start.col,
@@ -6255,7 +6255,7 @@ vte_terminal_invalidate_selection (VteTerminal *terminal)
/* Start selection at the location of the event. */
static void
-vte_terminal_start_selection(VteTerminal *terminal, GdkEventButton *event,
+vte_view_start_selection(VteView *terminal, GdkEventButton *event,
enum vte_selection_type selection_type)
{
VteBuffer *buffer;
@@ -6308,15 +6308,15 @@ vte_terminal_start_selection(VteTerminal *terminal, GdkEventButton *event,
}
static gboolean
-_vte_terminal_maybe_end_selection (VteTerminal *terminal)
+_vte_view_maybe_end_selection (VteView *terminal)
{
if (terminal->pvt->selecting) {
/* Copy only if something was selected. */
if (terminal->pvt->has_selection &&
!terminal->pvt->selecting_restart &&
terminal->pvt->selecting_had_delta) {
- vte_terminal_emit_copy_primary(terminal);
- vte_terminal_emit_selection_changed(terminal);
+ vte_view_emit_copy_primary(terminal);
+ vte_view_emit_selection_changed(terminal);
}
terminal->pvt->selecting = FALSE;
@@ -6339,7 +6339,7 @@ math_div (long a, long b)
/* Helper */
static void
-vte_terminal_extend_selection_expand (VteTerminal *terminal)
+vte_view_extend_selection_expand (VteView *terminal)
{
VteBuffer *buffer;
long i, j;
@@ -6543,7 +6543,7 @@ vte_terminal_extend_selection_expand (VteTerminal *terminal)
/* Extend selection to include the given event coordinates. */
static void
-vte_terminal_extend_selection(VteTerminal *terminal, long x, long y,
+vte_view_extend_selection(VteView *terminal, long x, long y,
gboolean always_grow, gboolean force)
{
VteBuffer *buffer;
@@ -6586,7 +6586,7 @@ vte_terminal_extend_selection(VteTerminal *terminal, long x, long y,
/* If we're restarting on a drag, then mark this as the start of
* the selected block. */
if (terminal->pvt->selecting_restart) {
- vte_terminal_deselect_all(terminal);
+ vte_view_deselect_all(terminal);
invalidate_selected = TRUE;
_vte_debug_print(VTE_DEBUG_SELECTION,
"Selection delayed start at (%ld,%ld).\n",
@@ -6612,7 +6612,7 @@ vte_terminal_extend_selection(VteTerminal *terminal, long x, long y,
/* We don't support always_grow in block mode */
if (always_grow)
- vte_terminal_invalidate_selection (terminal);
+ vte_view_invalidate_selection (terminal);
if (origin->y <= last->y) {
/* The origin point is "before" the last point. */
@@ -6694,7 +6694,7 @@ vte_terminal_extend_selection(VteTerminal *terminal, long x, long y,
ec->col = math_div (end->x - residual, width);
- vte_terminal_extend_selection_expand (terminal);
+ vte_view_extend_selection_expand (terminal);
if (!invalidate_selected && !force &&
0 == memcmp (sc, so, sizeof (*sc)) &&
@@ -6778,7 +6778,7 @@ vte_terminal_extend_selection(VteTerminal *terminal, long x, long y,
if (invalidate_selected || !had_selection) {
_vte_debug_print(VTE_DEBUG_SELECTION, "Invalidating selection.");
- vte_terminal_invalidate_selection (terminal);
+ vte_view_invalidate_selection (terminal);
}
_vte_debug_print(VTE_DEBUG_SELECTION,
@@ -6788,24 +6788,24 @@ vte_terminal_extend_selection(VteTerminal *terminal, long x, long y,
}
/**
- * vte_terminal_select_all:
- * @terminal: a #VteTerminal
+ * vte_view_select_all:
+ * @terminal: a #VteView
*
* Selects all text within the terminal (including the scrollback buffer).
*
* Since: 0.16
*/
void
-vte_terminal_select_all (VteTerminal *terminal)
+vte_view_select_all (VteView *terminal)
{
VteBuffer *buffer;
- g_return_if_fail (VTE_IS_TERMINAL (terminal));
+ g_return_if_fail (VTE_IS_VIEW (terminal));
buffer = terminal->pvt->buffer;
if (buffer == NULL)
return;
- vte_terminal_deselect_all (terminal);
+ vte_view_deselect_all (terminal);
terminal->pvt->has_selection = TRUE;
terminal->pvt->selecting_had_delta = TRUE;
@@ -6818,30 +6818,30 @@ vte_terminal_select_all (VteTerminal *terminal)
_vte_debug_print(VTE_DEBUG_SELECTION, "Selecting *all* text.\n");
- vte_terminal_emit_copy_primary(terminal);
- vte_terminal_emit_selection_changed (terminal);
+ vte_view_emit_copy_primary(terminal);
+ vte_view_emit_selection_changed (terminal);
_vte_invalidate_all (terminal);
}
/**
- * vte_terminal_unselect_all:
- * @terminal: a #VteTerminal
+ * vte_view_unselect_all:
+ * @terminal: a #VteView
*
* Clears the current selection.
*/
void
-vte_terminal_unselect_all(VteTerminal *terminal)
+vte_view_unselect_all(VteView *terminal)
{
- g_return_if_fail (VTE_IS_TERMINAL (terminal));
+ g_return_if_fail (VTE_IS_VIEW (terminal));
_vte_debug_print(VTE_DEBUG_SELECTION, "Clearing selection.\n");
- vte_terminal_deselect_all (terminal);
+ vte_view_deselect_all (terminal);
}
/* Autoscroll a bit. */
static gboolean
-vte_terminal_autoscroll(VteTerminal *terminal)
+vte_view_autoscroll(VteView *terminal)
{
VteBuffer *buffer;
gboolean extend = FALSE;
@@ -6855,7 +6855,7 @@ vte_terminal_autoscroll(VteTerminal *terminal)
if (terminal->pvt->vadjustment) {
/* Try to scroll up by one line. */
adj = buffer->pvt->screen->scroll_delta - 1;
- vte_terminal_queue_adjustment_value_changed_clamped (terminal, adj);
+ vte_view_queue_adjustment_value_changed_clamped (terminal, adj);
extend = TRUE;
}
_vte_debug_print(VTE_DEBUG_EVENTS, "Autoscrolling down.\n");
@@ -6865,7 +6865,7 @@ vte_terminal_autoscroll(VteTerminal *terminal)
if (terminal->pvt->vadjustment) {
/* Try to scroll up by one line. */
adj = buffer->pvt->screen->scroll_delta + 1;
- vte_terminal_queue_adjustment_value_changed_clamped (terminal, adj);
+ vte_view_queue_adjustment_value_changed_clamped (terminal, adj);
extend = TRUE;
}
_vte_debug_print(VTE_DEBUG_EVENTS, "Autoscrolling up.\n");
@@ -6886,7 +6886,7 @@ vte_terminal_autoscroll(VteTerminal *terminal)
x = buffer->pvt->column_count * terminal->pvt->char_width;
}
/* Extend selection to cover the newly-scrolled area. */
- vte_terminal_extend_selection(terminal, x, y, FALSE, TRUE);
+ vte_view_extend_selection(terminal, x, y, FALSE, TRUE);
} else {
/* Stop autoscrolling. */
terminal->pvt->mouse_autoscroll_tag = 0;
@@ -6896,7 +6896,7 @@ vte_terminal_autoscroll(VteTerminal *terminal)
/* Start autoscroll. */
static void
-vte_terminal_start_autoscroll(VteTerminal *terminal)
+vte_view_start_autoscroll(VteView *terminal)
{
VteBuffer *buffer;
@@ -6906,7 +6906,7 @@ vte_terminal_start_autoscroll(VteTerminal *terminal)
terminal->pvt->mouse_autoscroll_tag =
g_timeout_add_full(G_PRIORITY_LOW,
666 / buffer->pvt->row_count,
- (GSourceFunc)vte_terminal_autoscroll,
+ (GSourceFunc)vte_view_autoscroll,
terminal,
NULL);
}
@@ -6914,7 +6914,7 @@ vte_terminal_start_autoscroll(VteTerminal *terminal)
/* Stop autoscroll. */
static void
-vte_terminal_stop_autoscroll(VteTerminal *terminal)
+vte_view_stop_autoscroll(VteView *terminal)
{
if (terminal->pvt->mouse_autoscroll_tag != 0) {
g_source_remove(terminal->pvt->mouse_autoscroll_tag);
@@ -6924,10 +6924,10 @@ vte_terminal_stop_autoscroll(VteTerminal *terminal)
/* Read and handle a motion event. */
static gboolean
-vte_terminal_motion_notify(GtkWidget *widget, GdkEventMotion *event)
+vte_view_motion_notify(GtkWidget *widget, GdkEventMotion *event)
{
- VteTerminal *terminal = VTE_TERMINAL(widget);
- VteTerminalPrivate *pvt = terminal->pvt;
+ VteView *terminal = VTE_VIEW(widget);
+ VteViewPrivate *pvt = terminal->pvt;
VteBuffer *buffer;
int width, height;
long x, y;
@@ -6938,7 +6938,7 @@ vte_terminal_motion_notify(GtkWidget *widget, GdkEventMotion *event)
if (buffer == NULL)
return FALSE;
- (void) _vte_terminal_xy_to_grid(terminal, event->x, event->y, &cell_x, &cell_y);
+ (void) _vte_view_xy_to_grid(terminal, event->x, event->y, &cell_x, &cell_y);
x = event->x - terminal->pvt->padding.left;
y = event->y - terminal->pvt->padding.top;
width = terminal->pvt->char_width;
@@ -6949,15 +6949,15 @@ vte_terminal_motion_notify(GtkWidget *widget, GdkEventMotion *event)
(long)event->x, (long)event->y,
cell_x, cell_y + buffer->pvt->screen->scroll_delta);
- vte_terminal_read_modifiers (terminal, (GdkEvent*) event);
+ vte_view_read_modifiers (terminal, (GdkEvent*) event);
if (terminal->pvt->mouse_last_button) {
- vte_terminal_match_hilite_hide (terminal);
+ vte_view_match_hilite_hide (terminal);
} else {
/* Hilite any matches. */
- vte_terminal_match_hilite(terminal, x, y);
+ vte_view_match_hilite(terminal, x, y);
/* Show the cursor. */
- _vte_terminal_set_pointer_visible(terminal, TRUE);
+ _vte_view_set_pointer_visible(terminal, TRUE);
}
switch (event->type) {
@@ -6967,7 +6967,7 @@ vte_terminal_motion_notify(GtkWidget *widget, GdkEventMotion *event)
!terminal->pvt->mouse_tracking_mode))
{
_vte_debug_print(VTE_DEBUG_EVENTS, "Mousing drag 1.\n");
- vte_terminal_extend_selection(terminal,
+ vte_view_extend_selection(terminal,
x, y, FALSE, FALSE);
/* Start scrolling if we need to. */
@@ -6976,17 +6976,17 @@ vte_terminal_motion_notify(GtkWidget *widget, GdkEventMotion *event)
terminal->pvt->padding.top)
{
/* Give mouse wigglers something. */
- vte_terminal_autoscroll(terminal);
+ vte_view_autoscroll(terminal);
/* Start a timed autoscroll if we're not doing it
* already. */
- vte_terminal_start_autoscroll(terminal);
+ vte_view_start_autoscroll(terminal);
}
handled = TRUE;
}
if (!handled)
- vte_terminal_maybe_send_mouse_drag(terminal, event);
+ vte_view_maybe_send_mouse_drag(terminal, event);
break;
default:
break;
@@ -7003,10 +7003,10 @@ vte_terminal_motion_notify(GtkWidget *widget, GdkEventMotion *event)
/* Read and handle a pointing device buttonpress event. */
static gint
-vte_terminal_button_press(GtkWidget *widget, GdkEventButton *event)
+vte_view_button_press(GtkWidget *widget, GdkEventButton *event)
{
- VteTerminal *terminal = VTE_TERMINAL(widget);
- VteTerminalPrivate *pvt = terminal->pvt;
+ VteView *terminal = VTE_VIEW(widget);
+ VteViewPrivate *pvt = terminal->pvt;
VteBuffer *buffer;
long height, width, delta;
gboolean handled = FALSE;
@@ -7026,14 +7026,14 @@ vte_terminal_button_press(GtkWidget *widget, GdkEventButton *event)
width = terminal->pvt->char_width;
delta = buffer->pvt->screen->scroll_delta;
- vte_terminal_match_hilite(terminal, x, y);
+ vte_view_match_hilite(terminal, x, y);
- _vte_terminal_set_pointer_visible(terminal, TRUE);
+ _vte_view_set_pointer_visible(terminal, TRUE);
- vte_terminal_read_modifiers (terminal, (GdkEvent*) event);
+ vte_view_read_modifiers (terminal, (GdkEvent*) event);
/* Convert the event coordinates to cell coordinates. */
- (void) _vte_terminal_xy_to_grid(terminal, event->x, event->y, &cell_x, &cell_y);
+ (void) _vte_view_xy_to_grid(terminal, event->x, event->y, &cell_x, &cell_y);
cellx = x / width;
celly = y / height + delta;
@@ -7065,7 +7065,7 @@ vte_terminal_button_press(GtkWidget *widget, GdkEventButton *event)
if ((terminal->pvt->modifiers & GDK_SHIFT_MASK) &&
(terminal->pvt->has_selection ||
terminal->pvt->selecting_restart) &&
- !vte_terminal_cell_is_selected(buffer,
+ !vte_view_cell_is_selected(buffer,
cellx,
celly,
terminal)) {
@@ -7075,14 +7075,14 @@ vte_terminal_button_press(GtkWidget *widget, GdkEventButton *event)
}
}
if (start_selecting) {
- vte_terminal_deselect_all(terminal);
- vte_terminal_start_selection(terminal,
+ vte_view_deselect_all(terminal);
+ vte_view_start_selection(terminal,
event,
selection_type_char);
handled = TRUE;
}
if (extend_selecting) {
- vte_terminal_extend_selection(terminal,
+ vte_view_extend_selection(terminal,
x, y,
!terminal->pvt->selecting_restart, TRUE);
/* The whole selection code needs to be
@@ -7097,7 +7097,7 @@ vte_terminal_button_press(GtkWidget *widget, GdkEventButton *event)
case 2:
if ((terminal->pvt->modifiers & GDK_SHIFT_MASK) ||
!terminal->pvt->mouse_tracking_mode) {
- vte_terminal_emit_paste_primary(terminal);
+ vte_view_emit_paste_primary(terminal);
handled = TRUE;
}
break;
@@ -7108,7 +7108,7 @@ vte_terminal_button_press(GtkWidget *widget, GdkEventButton *event)
/* If we haven't done anything yet, try sending the mouse
* event to the app. */
if (handled == FALSE) {
- vte_terminal_maybe_send_mouse_button(terminal, event);
+ vte_view_maybe_send_mouse_button(terminal, event);
handled = TRUE;
}
break;
@@ -7121,10 +7121,10 @@ vte_terminal_button_press(GtkWidget *widget, GdkEventButton *event)
case 1:
if ((terminal->pvt->modifiers & GDK_SHIFT_MASK) ||
!terminal->pvt->mouse_tracking_mode) {
- vte_terminal_start_selection(terminal,
+ vte_view_start_selection(terminal,
event,
selection_type_word);
- vte_terminal_extend_selection(terminal,
+ vte_view_extend_selection(terminal,
x, y, FALSE, TRUE);
}
break;
@@ -7143,10 +7143,10 @@ vte_terminal_button_press(GtkWidget *widget, GdkEventButton *event)
case 1:
if ((terminal->pvt->modifiers & GDK_SHIFT_MASK) ||
!terminal->pvt->mouse_tracking_mode) {
- vte_terminal_start_selection(terminal,
+ vte_view_start_selection(terminal,
event,
selection_type_line);
- vte_terminal_extend_selection(terminal,
+ vte_view_extend_selection(terminal,
x, y, FALSE, TRUE);
}
break;
@@ -7171,10 +7171,10 @@ vte_terminal_button_press(GtkWidget *widget, GdkEventButton *event)
/* Read and handle a pointing device buttonrelease event. */
static gint
-vte_terminal_button_release(GtkWidget *widget, GdkEventButton *event)
+vte_view_button_release(GtkWidget *widget, GdkEventButton *event)
{
- VteTerminal *terminal = VTE_TERMINAL(widget);
- VteTerminalPrivate *pvt = terminal->pvt;
+ VteView *terminal = VTE_VIEW(widget);
+ VteViewPrivate *pvt = terminal->pvt;
VteBuffer *buffer;
gboolean handled = FALSE;
long cell_x, cell_y;
@@ -7184,17 +7184,17 @@ vte_terminal_button_release(GtkWidget *widget, GdkEventButton *event)
if (buffer == NULL)
return FALSE;
- (void) _vte_terminal_xy_to_grid(terminal, event->x, event->y, &cell_x, &cell_y);
+ (void) _vte_view_xy_to_grid(terminal, event->x, event->y, &cell_x, &cell_y);
x = event->x - terminal->pvt->padding.left;
y = event->y - terminal->pvt->padding.top;
- vte_terminal_match_hilite(terminal, x, y);
+ vte_view_match_hilite(terminal, x, y);
- _vte_terminal_set_pointer_visible(terminal, TRUE);
+ _vte_view_set_pointer_visible(terminal, TRUE);
- vte_terminal_stop_autoscroll(terminal);
+ vte_view_stop_autoscroll(terminal);
- vte_terminal_read_modifiers (terminal, (GdkEvent*) event);
+ vte_view_read_modifiers (terminal, (GdkEvent*) event);
switch (event->type) {
case GDK_BUTTON_RELEASE:
@@ -7207,7 +7207,7 @@ vte_terminal_button_release(GtkWidget *widget, GdkEventButton *event)
* copy the selected text. */
if ((terminal->pvt->modifiers & GDK_SHIFT_MASK) ||
!terminal->pvt->mouse_tracking_mode)
- handled = _vte_terminal_maybe_end_selection (terminal);
+ handled = _vte_view_maybe_end_selection (terminal);
break;
case 2:
if ((terminal->pvt->modifiers & GDK_SHIFT_MASK) ||
@@ -7220,7 +7220,7 @@ vte_terminal_button_release(GtkWidget *widget, GdkEventButton *event)
break;
}
if (!handled) {
- vte_terminal_maybe_send_mouse_button(terminal, event);
+ vte_view_maybe_send_mouse_button(terminal, event);
handled = TRUE;
}
break;
@@ -7240,17 +7240,17 @@ vte_terminal_button_release(GtkWidget *widget, GdkEventButton *event)
/* Handle receiving or losing focus. */
static gboolean
-vte_terminal_focus_in(GtkWidget *widget, GdkEventFocus *event)
+vte_view_focus_in(GtkWidget *widget, GdkEventFocus *event)
{
- VteTerminal *terminal = VTE_TERMINAL(widget);
- VteTerminalPrivate *pvt = terminal->pvt;
+ VteView *terminal = VTE_VIEW(widget);
+ VteViewPrivate *pvt = terminal->pvt;
_vte_debug_print(VTE_DEBUG_EVENTS, "Focus in.\n");
gtk_widget_grab_focus (widget);
/* Read the keyboard modifiers, though they're probably garbage. */
- vte_terminal_read_modifiers (terminal, (GdkEvent*) event);
+ vte_view_read_modifiers (terminal, (GdkEvent*) event);
/* We only have an IM context when we're realized, and there's not much
* point to painting the cursor if we don't have a window. */
@@ -7262,26 +7262,26 @@ vte_terminal_focus_in(GtkWidget *widget, GdkEventFocus *event)
gtk_im_context_focus_in(pvt->im_context);
_vte_invalidate_cursor_once(terminal, FALSE);
- _vte_terminal_set_pointer_visible(terminal, TRUE);
+ _vte_view_set_pointer_visible(terminal, TRUE);
}
return FALSE;
}
static gboolean
-vte_terminal_focus_out(GtkWidget *widget, GdkEventFocus *event)
+vte_view_focus_out(GtkWidget *widget, GdkEventFocus *event)
{
- VteTerminal *terminal = VTE_TERMINAL(widget);
- VteTerminalPrivate *pvt = terminal->pvt;
+ VteView *terminal = VTE_VIEW(widget);
+ VteViewPrivate *pvt = terminal->pvt;
_vte_debug_print(VTE_DEBUG_EVENTS, "Focus out.\n");
/* Read the keyboard modifiers, though they're probably garbage. */
- vte_terminal_read_modifiers (terminal, (GdkEvent*) event);
+ vte_view_read_modifiers (terminal, (GdkEvent*) event);
/* We only have an IM context when we're realized, and there's not much
* point to painting ourselves if we don't have a window. */
if (gtk_widget_get_realized (widget)) {
- _vte_terminal_maybe_end_selection (terminal);
+ _vte_view_maybe_end_selection (terminal);
gtk_im_context_focus_out(pvt->im_context);
_vte_invalidate_cursor_once(terminal, FALSE);
@@ -7289,7 +7289,7 @@ vte_terminal_focus_out(GtkWidget *widget, GdkEventFocus *event)
/* XXX Do we want to hide the match just because the terminal
* lost keyboard focus, but the pointer *is* still within our
* area top? */
- vte_terminal_match_hilite_hide (terminal);
+ vte_view_match_hilite_hide (terminal);
/* Mark the cursor as invisible to disable hilite updating */
terminal->pvt->mouse_cursor_visible = FALSE;
}
@@ -7301,33 +7301,33 @@ vte_terminal_focus_out(GtkWidget *widget, GdkEventFocus *event)
}
static gboolean
-vte_terminal_enter(GtkWidget *widget, GdkEventCrossing *event)
+vte_view_enter(GtkWidget *widget, GdkEventCrossing *event)
{
gboolean ret = FALSE;
_vte_debug_print(VTE_DEBUG_EVENTS, "Enter.\n");
- if (GTK_WIDGET_CLASS (vte_terminal_parent_class)->enter_notify_event) {
- ret = GTK_WIDGET_CLASS (vte_terminal_parent_class)->enter_notify_event (widget, event);
+ if (GTK_WIDGET_CLASS (vte_view_parent_class)->enter_notify_event) {
+ ret = GTK_WIDGET_CLASS (vte_view_parent_class)->enter_notify_event (widget, event);
}
if (gtk_widget_get_realized (widget)) {
- VteTerminal *terminal = VTE_TERMINAL (widget);
+ VteView *terminal = VTE_VIEW (widget);
/* Hilite any matches. */
- vte_terminal_match_hilite_show(terminal,
+ vte_view_match_hilite_show(terminal,
event->x - terminal->pvt->padding.left,
event->y - terminal->pvt->padding.top);
}
return ret;
}
static gboolean
-vte_terminal_leave(GtkWidget *widget, GdkEventCrossing *event)
+vte_view_leave(GtkWidget *widget, GdkEventCrossing *event)
{
gboolean ret = FALSE;
_vte_debug_print(VTE_DEBUG_EVENTS, "Leave.\n");
- if (GTK_WIDGET_CLASS (vte_terminal_parent_class)->leave_notify_event) {
- ret = GTK_WIDGET_CLASS (vte_terminal_parent_class)->leave_notify_event (widget, event);
+ if (GTK_WIDGET_CLASS (vte_view_parent_class)->leave_notify_event) {
+ ret = GTK_WIDGET_CLASS (vte_view_parent_class)->leave_notify_event (widget, event);
}
if (gtk_widget_get_realized (widget)) {
- VteTerminal *terminal = VTE_TERMINAL (widget);
- vte_terminal_match_hilite_hide (terminal);
+ VteView *terminal = VTE_VIEW (widget);
+ vte_view_match_hilite_hide (terminal);
/* Mark the cursor as invisible to disable hilite updating,
* whilst the cursor is absent (otherwise we copy the entire
* buffer after each update for nothing...)
@@ -7351,7 +7351,7 @@ visibility_state_str(GdkVisibilityState state)
}
static void
-vte_terminal_set_visibility (VteTerminal *terminal, GdkVisibilityState state)
+vte_view_set_visibility (VteView *terminal, GdkVisibilityState state)
{
_vte_debug_print(VTE_DEBUG_MISC, "change visibility: %s -> %s.\n",
visibility_state_str(terminal->pvt->visibility_state),
@@ -7386,22 +7386,22 @@ vte_terminal_set_visibility (VteTerminal *terminal, GdkVisibilityState state)
}
static gboolean
-vte_terminal_visibility_notify(GtkWidget *widget, GdkEventVisibility *event)
+vte_view_visibility_notify(GtkWidget *widget, GdkEventVisibility *event)
{
- VteTerminal *terminal;
- terminal = VTE_TERMINAL(widget);
+ VteView *terminal;
+ terminal = VTE_VIEW(widget);
_vte_debug_print(VTE_DEBUG_EVENTS, "Visibility (%s -> %s).\n",
visibility_state_str(terminal->pvt->visibility_state),
visibility_state_str(event->state));
- vte_terminal_set_visibility(terminal, event->state);
+ vte_view_set_visibility(terminal, event->state);
return FALSE;
}
/* Apply the changed metrics, and queue a resize if need be. */
static void
-vte_terminal_apply_metrics(VteTerminal *terminal,
+vte_view_apply_metrics(VteView *terminal,
gint width, gint height, gint ascent, gint descent)
{
gboolean resize = FALSE, cresize = FALSE;
@@ -7442,7 +7442,7 @@ vte_terminal_apply_metrics(VteTerminal *terminal,
}
/* Emit a signal that the font changed. */
if (cresize) {
- vte_terminal_emit_char_size_changed(terminal,
+ vte_view_emit_char_size_changed(terminal,
terminal->pvt->char_width,
terminal->pvt->char_height);
}
@@ -7452,7 +7452,7 @@ vte_terminal_apply_metrics(VteTerminal *terminal,
static void
-vte_terminal_ensure_font (VteTerminal *terminal)
+vte_view_ensure_font (VteView *terminal)
{
if (terminal->pvt->draw != NULL) {
if (terminal->pvt->fontdirty) {
@@ -7463,16 +7463,16 @@ vte_terminal_ensure_font (VteTerminal *terminal)
terminal->pvt->fontdesc);
_vte_draw_get_text_metrics (terminal->pvt->draw,
&width, &height, &ascent);
- vte_terminal_apply_metrics(terminal,
+ vte_view_apply_metrics(terminal,
width, height, ascent, height - ascent);
}
}
}
static void
-vte_terminal_update_font(VteTerminal *terminal)
+vte_view_update_font(VteView *terminal)
{
- VteTerminalPrivate *pvt = terminal->pvt;
+ VteViewPrivate *pvt = terminal->pvt;
PangoFontDescription *desc;
gdouble size;
@@ -7495,13 +7495,13 @@ vte_terminal_update_font(VteTerminal *terminal)
/* Set the drawing font. */
if (gtk_widget_get_realized (&terminal->widget)) {
- vte_terminal_ensure_font (terminal);
+ vte_view_ensure_font (terminal);
}
}
/*
- * _vte_terminal_set_font:
- * @terminal: a #VteTerminal
+ * _vte_view_set_font:
+ * @terminal: a #VteView
* @font_desc: (allow-none): a #PangoFontDescription for the desired font, or %NULL
*
* Sets the font used for rendering all text displayed by the terminal,
@@ -7511,10 +7511,10 @@ vte_terminal_update_font(VteTerminal *terminal)
* and columns.
*/
static void
-vte_terminal_set_font(VteTerminal *terminal,
+vte_view_set_font(VteView *terminal,
PangoFontDescription *desc /* adopted */)
{
- VteTerminalPrivate *pvt = terminal->pvt;
+ VteViewPrivate *pvt = terminal->pvt;
/* Create an owned font description. */
_VTE_DEBUG_IF(VTE_DEBUG_MISC | VTE_DEBUG_STYLE) {
@@ -7539,12 +7539,12 @@ vte_terminal_set_font(VteTerminal *terminal,
}
pvt->unscaled_font_desc = desc /* adopted */;
- vte_terminal_update_font(terminal);
+ vte_view_update_font(terminal);
}
/**
- * vte_terminal_set_font_scale:
- * @terminal: a #VteTerminal
+ * vte_view_set_font_scale:
+ * @terminal: a #VteView
* @scale: the font scale
*
* Sets the terminal's font scale to @scale.
@@ -7552,30 +7552,30 @@ vte_terminal_set_font(VteTerminal *terminal,
* Since: 0.30
*/
void
-vte_terminal_set_font_scale(VteTerminal *terminal,
+vte_view_set_font_scale(VteView *terminal,
gdouble scale)
{
- g_return_if_fail(VTE_IS_TERMINAL(terminal));
+ g_return_if_fail(VTE_IS_VIEW(terminal));
terminal->pvt->font_scale = CLAMP(scale, VTE_SCALE_MIN, VTE_SCALE_MAX);
- vte_terminal_update_font(terminal);
+ vte_view_update_font(terminal);
g_object_notify(G_OBJECT(terminal), "font-scale");
}
/**
- * vte_terminal_get_font_scale:
- * @terminal: a #VteTerminal
+ * vte_view_get_font_scale:
+ * @terminal: a #VteView
*
* Returns: the terminal's font scale
*
* Since: 0.30
*/
gdouble
-vte_terminal_get_font_scale(VteTerminal *terminal)
+vte_view_get_font_scale(VteView *terminal)
{
- g_return_val_if_fail(VTE_IS_TERMINAL(terminal), 1.);
+ g_return_val_if_fail(VTE_IS_VIEW(terminal), 1.);
return terminal->pvt->font_scale;
}
@@ -7614,7 +7614,7 @@ vte_buffer_refresh_size(VteBuffer *buffer)
void
vte_buffer_set_size(VteBuffer *buffer, glong columns, glong rows)
{
- VteTerminal *terminal;
+ VteView *terminal;
glong old_columns, old_rows;
g_return_if_fail(VTE_IS_BUFFER(buffer));
@@ -7651,7 +7651,7 @@ vte_buffer_set_size(VteBuffer *buffer, glong columns, glong rows)
if (buffer->pvt->row_count < visible_rows) {
glong delta = visible_rows - buffer->pvt->row_count;
screen->insert_delta += delta;
- vte_terminal_queue_adjustment_value_changed (
+ vte_view_queue_adjustment_value_changed (
terminal,
screen->scroll_delta + delta);
}
@@ -7663,7 +7663,7 @@ vte_buffer_set_size(VteBuffer *buffer, glong columns, glong rows)
/* Redraw the widget. */
static void
-vte_terminal_handle_scroll(VteTerminal *terminal)
+vte_view_handle_scroll(VteView *terminal)
{
VteBuffer *buffer;
long dy, adj;
@@ -7691,9 +7691,9 @@ vte_terminal_handle_scroll(VteTerminal *terminal)
if (dy != 0) {
_vte_debug_print(VTE_DEBUG_ADJ,
"Scrolling by %ld\n", dy);
- _vte_terminal_scroll_region(terminal, screen->scroll_delta,
+ _vte_view_scroll_region(terminal, screen->scroll_delta,
buffer->pvt->row_count, -dy);
- vte_terminal_emit_text_scrolled(terminal, dy);
+ vte_view_emit_text_scrolled(terminal, dy);
_vte_buffer_queue_contents_changed(buffer);
} else {
_vte_debug_print(VTE_DEBUG_ADJ, "Not scrolling\n");
@@ -7701,10 +7701,10 @@ vte_terminal_handle_scroll(VteTerminal *terminal)
}
static void
-vte_terminal_set_hadjustment(VteTerminal *terminal,
+vte_view_set_hadjustment(VteView *terminal,
GtkAdjustment *adjustment)
{
- VteTerminalPrivate *pvt = terminal->pvt;
+ VteViewPrivate *pvt = terminal->pvt;
if (adjustment == pvt->hadjustment)
return;
@@ -7716,7 +7716,7 @@ vte_terminal_set_hadjustment(VteTerminal *terminal,
}
static void
-vte_terminal_set_vadjustment(VteTerminal *terminal,
+vte_view_set_vadjustment(VteView *terminal,
GtkAdjustment *adjustment)
{
if (adjustment != NULL && adjustment == terminal->pvt->vadjustment)
@@ -7735,7 +7735,7 @@ vte_terminal_set_vadjustment(VteTerminal *terminal,
if (terminal->pvt->vadjustment != NULL) {
/* Disconnect our signal handlers from this object. */
g_signal_handlers_disconnect_by_func(terminal->pvt->vadjustment,
- vte_terminal_handle_scroll,
+ vte_view_handle_scroll,
terminal);
g_object_unref(terminal->pvt->vadjustment);
}
@@ -7746,7 +7746,7 @@ vte_terminal_set_vadjustment(VteTerminal *terminal,
/* We care about the offset, not the top or bottom. */
g_signal_connect_swapped(terminal->pvt->vadjustment,
"value-changed",
- G_CALLBACK(vte_terminal_handle_scroll),
+ G_CALLBACK(vte_view_handle_scroll),
terminal);
}
@@ -7834,8 +7834,8 @@ vte_buffer_set_emulation(VteBuffer *buffer, const char *emulation)
/**
* vte_get_default_emulation:
*
- * Returns the default emulation, which is used in #VteTerminal if the
- * terminal type passed to vte_terminal_set_emulation() is %NULL.
+ * Returns the default emulation, which is used in #VteView if the
+ * terminal type passed to vte_view_set_emulation() is %NULL.
*
* Returns: (transfer none) (type utf8): an interned string containing the name
* of the default terminal type the widget attempts to emulate
@@ -7941,7 +7941,7 @@ vte_buffer_set_termcap(VteBuffer *buffer,
}
static void
-_vte_terminal_codeset_changed_cb(struct _vte_iso2022_state *state, gpointer p)
+_vte_view_codeset_changed_cb(struct _vte_iso2022_state *state, gpointer p)
{
vte_buffer_set_encoding(VTE_BUFFER(p), _vte_iso2022_state_get_codeset(state));
}
@@ -7950,16 +7950,16 @@ _vte_terminal_codeset_changed_cb(struct _vte_iso2022_state *state, gpointer p)
* We need to create a new psuedo-terminal pair, read in the termcap file, and
* set ourselves up to do the interpretation of sequences. */
static void
-vte_terminal_init(VteTerminal *terminal)
+vte_view_init(VteView *terminal)
{
- VteTerminalPrivate *pvt;
+ VteViewPrivate *pvt;
GtkStyleContext *context;
VteBuffer *buffer;
- _vte_debug_print(VTE_DEBUG_LIFECYCLE, "vte_terminal_init()\n");
+ _vte_debug_print(VTE_DEBUG_LIFECYCLE, "vte_view_init()\n");
/* Initialize private data. */
- pvt = terminal->pvt = G_TYPE_INSTANCE_GET_PRIVATE (terminal, VTE_TYPE_TERMINAL, VteTerminalPrivate);
+ pvt = terminal->pvt = G_TYPE_INSTANCE_GET_PRIVATE (terminal, VTE_TYPE_VIEW, VteViewPrivate);
/* --- */
@@ -7977,8 +7977,8 @@ vte_terminal_init(VteTerminal *terminal)
pvt->hscroll_policy = GTK_SCROLL_NATURAL;
pvt->vscroll_policy = GTK_SCROLL_NATURAL;
- vte_terminal_set_hadjustment(terminal, NULL);
- vte_terminal_set_vadjustment(terminal, NULL);
+ vte_view_set_hadjustment(terminal, NULL);
+ vte_view_set_vadjustment(terminal, NULL);
/* Set up dummy metrics, value != 0 to avoid division by 0 */
terminal->pvt->char_width = 1;
@@ -7994,7 +7994,7 @@ vte_terminal_init(VteTerminal *terminal)
pvt->scroll_on_keystroke = TRUE;
/* Selection info. */
- vte_terminal_set_word_chars(terminal, NULL);
+ vte_view_set_word_chars(terminal, NULL);
/* Miscellaneous options. */
pvt->audible_bell = TRUE;
@@ -8018,7 +8018,7 @@ vte_terminal_init(VteTerminal *terminal)
pvt->match_regexes = g_array_new(FALSE, TRUE,
sizeof(struct vte_match_regex));
pvt->match_tag = -1;
- vte_terminal_match_hilite_clear(terminal);
+ vte_view_match_hilite_clear(terminal);
/* Rendering data. Try everything. */
pvt->draw = _vte_draw_new();
@@ -8044,31 +8044,31 @@ vte_terminal_init(VteTerminal *terminal)
context = gtk_widget_get_style_context (&terminal->widget);
gtk_style_context_add_provider (context,
- VTE_TERMINAL_GET_CLASS (terminal)->priv->style_provider,
+ VTE_VIEW_GET_CLASS (terminal)->priv->style_provider,
GTK_STYLE_PROVIDER_PRIORITY_FALLBACK);
gtk_style_context_add_class (context, VTE_STYLE_CLASS_TERMINAL);
- vte_terminal_update_style (terminal);
+ vte_view_update_style (terminal);
buffer = vte_buffer_new();
- vte_terminal_set_buffer(terminal, buffer);
+ vte_view_set_buffer(terminal, buffer);
buffer->pvt->terminal = terminal;
g_object_unref(buffer);
}
/* Tell GTK+ how much space we need. */
static void
-vte_terminal_get_preferred_width(GtkWidget *widget,
+vte_view_get_preferred_width(GtkWidget *widget,
int *minimum_width,
int *natural_width)
{
- VteTerminal *terminal = VTE_TERMINAL(widget);
+ VteView *terminal = VTE_VIEW(widget);
VteBuffer *buffer;
glong column_count;
- _vte_debug_print(VTE_DEBUG_LIFECYCLE, "vte_terminal_get_preferred_width()\n");
+ _vte_debug_print(VTE_DEBUG_LIFECYCLE, "vte_view_get_preferred_width()\n");
- vte_terminal_ensure_font (terminal);
+ vte_view_ensure_font (terminal);
buffer = terminal->pvt->buffer;
if (buffer) {
@@ -8094,17 +8094,17 @@ vte_terminal_get_preferred_width(GtkWidget *widget,
}
static void
-vte_terminal_get_preferred_height(GtkWidget *widget,
+vte_view_get_preferred_height(GtkWidget *widget,
int *minimum_height,
int *natural_height)
{
- VteTerminal *terminal = VTE_TERMINAL(widget);
+ VteView *terminal = VTE_VIEW(widget);
VteBuffer *buffer;
glong row_count;
- _vte_debug_print(VTE_DEBUG_LIFECYCLE, "vte_terminal_get_preferred_height()\n");
+ _vte_debug_print(VTE_DEBUG_LIFECYCLE, "vte_view_get_preferred_height()\n");
- vte_terminal_ensure_font (terminal);
+ vte_view_ensure_font (terminal);
buffer = terminal->pvt->buffer;
if (buffer) {
@@ -8131,16 +8131,16 @@ vte_terminal_get_preferred_height(GtkWidget *widget,
/* Accept a given size from GTK+. */
static void
-vte_terminal_size_allocate(GtkWidget *widget, GtkAllocation *allocation)
+vte_view_size_allocate(GtkWidget *widget, GtkAllocation *allocation)
{
- VteTerminal *terminal = VTE_TERMINAL(widget);
+ VteView *terminal = VTE_VIEW(widget);
VteBuffer *buffer;
glong width, height;
GtkAllocation current_allocation;
gboolean repaint, update_scrollback;
_vte_debug_print(VTE_DEBUG_LIFECYCLE,
- "vte_terminal_size_allocate()\n");
+ "vte_view_size_allocate()\n");
width = (allocation->width - (terminal->pvt->padding.left + terminal->pvt->padding.right)) /
terminal->pvt->char_width;
@@ -8218,14 +8218,14 @@ vte_terminal_size_allocate(GtkWidget *widget, GtkAllocation *allocation)
/* The window is being destroyed. */
static void
-vte_terminal_unrealize(GtkWidget *widget)
+vte_view_unrealize(GtkWidget *widget)
{
GdkWindow *window;
- VteTerminal *terminal = VTE_TERMINAL(widget);
+ VteView *terminal = VTE_VIEW(widget);
VteBuffer *buffer;
- VteTerminalPrivate *pvt = terminal->pvt;
+ VteViewPrivate *pvt = terminal->pvt;
- _vte_debug_print(VTE_DEBUG_LIFECYCLE, "vte_terminal_unrealize()\n");
+ _vte_debug_print(VTE_DEBUG_LIFECYCLE, "vte_view_unrealize()\n");
buffer = terminal->pvt->buffer;
@@ -8240,14 +8240,14 @@ vte_terminal_unrealize(GtkWidget *widget)
gdk_cursor_unref(terminal->pvt->mouse_inviso_cursor);
terminal->pvt->mouse_inviso_cursor = NULL;
- vte_terminal_match_hilite_clear(terminal);
+ vte_view_match_hilite_clear(terminal);
/* Shut down input methods. */
if (pvt->im_context != NULL) {
g_signal_handlers_disconnect_by_func (pvt->im_context,
- vte_terminal_im_preedit_changed,
+ vte_view_im_preedit_changed,
terminal);
- vte_terminal_im_reset(terminal);
+ vte_view_im_reset(terminal);
gtk_im_context_set_client_window(pvt->im_context, NULL);
g_object_unref(pvt->im_context);
pvt->im_context = NULL;
@@ -8306,11 +8306,11 @@ vte_terminal_unrealize(GtkWidget *widget)
}
static void
-vte_terminal_sync_settings (GtkSettings *settings,
+vte_view_sync_settings (GtkSettings *settings,
GParamSpec *pspec,
- VteTerminal *terminal)
+ VteView *terminal)
{
- VteTerminalPrivate *pvt = terminal->pvt;
+ VteViewPrivate *pvt = terminal->pvt;
gboolean blink;
int blink_time = 1000;
int blink_timeout = G_MAXINT;
@@ -8329,14 +8329,14 @@ vte_terminal_sync_settings (GtkSettings *settings,
pvt->cursor_blink_timeout = blink_timeout;
if (pvt->cursor_blink_mode == VTE_CURSOR_BLINK_SYSTEM)
- vte_terminal_set_cursor_blinks_internal(terminal, blink);
+ vte_view_set_cursor_blinks_internal(terminal, blink);
}
static void
-vte_terminal_screen_changed (GtkWidget *widget,
+vte_view_screen_changed (GtkWidget *widget,
GdkScreen *previous_screen)
{
- VteTerminal *terminal = VTE_TERMINAL (widget);
+ VteView *terminal = VTE_VIEW (widget);
GdkScreen *screen;
GtkSettings *settings;
@@ -8349,29 +8349,29 @@ vte_terminal_screen_changed (GtkWidget *widget,
widget);
}
- if (GTK_WIDGET_CLASS (vte_terminal_parent_class)->screen_changed) {
- GTK_WIDGET_CLASS (vte_terminal_parent_class)->screen_changed (widget, previous_screen);
+ if (GTK_WIDGET_CLASS (vte_view_parent_class)->screen_changed) {
+ GTK_WIDGET_CLASS (vte_view_parent_class)->screen_changed (widget, previous_screen);
}
if (screen == previous_screen || screen == NULL)
return;
settings = gtk_widget_get_settings (widget);
- vte_terminal_sync_settings (settings, NULL, terminal);
+ vte_view_sync_settings (settings, NULL, terminal);
g_signal_connect (settings, "notify::gtk-cursor-blink",
- G_CALLBACK (vte_terminal_sync_settings), widget);
+ G_CALLBACK (vte_view_sync_settings), widget);
g_signal_connect (settings, "notify::gtk-cursor-blink-time",
- G_CALLBACK (vte_terminal_sync_settings), widget);
+ G_CALLBACK (vte_view_sync_settings), widget);
g_signal_connect (settings, "notify::gtk-cursor-blink-timeout",
- G_CALLBACK (vte_terminal_sync_settings), widget);
+ G_CALLBACK (vte_view_sync_settings), widget);
}
/* Perform final cleanups for the widget before it's freed. */
static void
-vte_terminal_finalize(GObject *object)
+vte_view_finalize(GObject *object)
{
- VteTerminal *terminal = VTE_TERMINAL (object);
- VteTerminalPrivate *pvt = terminal->pvt;
+ VteView *terminal = VTE_VIEW (object);
+ VteViewPrivate *pvt = terminal->pvt;
VteBuffer *buffer = pvt->buffer;
GtkWidget *widget = &terminal->widget;
GtkClipboard *clipboard;
@@ -8379,7 +8379,7 @@ vte_terminal_finalize(GObject *object)
struct vte_match_regex *regex;
guint i;
- _vte_debug_print(VTE_DEBUG_LIFECYCLE, "vte_terminal_finalize()\n");
+ _vte_debug_print(VTE_DEBUG_LIFECYCLE, "vte_view_finalize()\n");
/* Free the draw structure. */
if (terminal->pvt->draw != NULL) {
@@ -8427,7 +8427,7 @@ vte_terminal_finalize(GObject *object)
g_array_free (terminal->pvt->search_attrs, TRUE);
/* Disconnect from autoscroll requests. */
- vte_terminal_stop_autoscroll(terminal);
+ vte_view_stop_autoscroll(terminal);
/* Cancel pending adjustment change notifications. */
terminal->pvt->adjustment_changed_pending = FALSE;
@@ -8450,7 +8450,7 @@ vte_terminal_finalize(GObject *object)
}
/* Stop processing input. */
- vte_terminal_stop_processing (terminal);
+ vte_view_stop_processing (terminal);
remove_update_timeout (terminal);
@@ -8464,24 +8464,24 @@ vte_terminal_finalize(GObject *object)
0, 0, NULL, NULL,
terminal);
- vte_terminal_set_buffer(terminal, NULL);
+ vte_view_set_buffer(terminal, NULL);
/* Call the inherited finalize() method. */
- G_OBJECT_CLASS(vte_terminal_parent_class)->finalize(object);
+ G_OBJECT_CLASS(vte_view_parent_class)->finalize(object);
}
/* Handle realizing the widget. Most of this is copy-paste from GGAD. */
static void
-vte_terminal_realize(GtkWidget *widget)
+vte_view_realize(GtkWidget *widget)
{
- VteTerminal *terminal = VTE_TERMINAL(widget);
- VteTerminalPrivate *pvt = terminal->pvt;
+ VteView *terminal = VTE_VIEW(widget);
+ VteViewPrivate *pvt = terminal->pvt;
GdkWindow *window;
GdkWindowAttr attributes;
GtkAllocation allocation;
guint attributes_mask = 0;
- _vte_debug_print(VTE_DEBUG_LIFECYCLE, "vte_terminal_realize()\n");
+ _vte_debug_print(VTE_DEBUG_LIFECYCLE, "vte_view_realize()\n");
gtk_widget_get_allocation (widget, &allocation);
@@ -8493,9 +8493,9 @@ vte_terminal_realize(GtkWidget *widget)
/* Create the stock cursors. */
terminal->pvt->mouse_cursor_visible = TRUE;
terminal->pvt->mouse_default_cursor =
- vte_terminal_cursor_new(terminal, VTE_DEFAULT_CURSOR);
+ vte_view_cursor_new(terminal, VTE_DEFAULT_CURSOR);
terminal->pvt->mouse_mousing_cursor =
- vte_terminal_cursor_new(terminal, VTE_MOUSING_CURSOR);
+ vte_view_cursor_new(terminal, VTE_MOUSING_CURSOR);
/* Create a GDK window for the widget. */
attributes.window_type = GDK_WINDOW_CHILD;
@@ -8536,7 +8536,7 @@ vte_terminal_realize(GtkWidget *widget)
/* Set up input method support. FIXME: do we need to handle the
* "retrieve-surrounding" and "delete-surrounding" events? */
if (pvt->im_context != NULL) {
- vte_terminal_im_reset(terminal);
+ vte_view_im_reset(terminal);
g_object_unref(pvt->im_context);
pvt->im_context = NULL;
}
@@ -8544,15 +8544,15 @@ vte_terminal_realize(GtkWidget *widget)
pvt->im_context = gtk_im_multicontext_new();
gtk_im_context_set_client_window (pvt->im_context, window);
g_signal_connect(pvt->im_context, "commit",
- G_CALLBACK(vte_terminal_im_commit), terminal);
+ G_CALLBACK(vte_view_im_commit), terminal);
g_signal_connect(pvt->im_context, "preedit-start",
- G_CALLBACK(vte_terminal_im_preedit_start),
+ G_CALLBACK(vte_view_im_preedit_start),
terminal);
g_signal_connect(pvt->im_context, "preedit-changed",
- G_CALLBACK(vte_terminal_im_preedit_changed),
+ G_CALLBACK(vte_view_im_preedit_changed),
terminal);
g_signal_connect(pvt->im_context, "preedit-end",
- G_CALLBACK(vte_terminal_im_preedit_end),
+ G_CALLBACK(vte_view_im_preedit_end),
terminal);
gtk_im_context_set_use_preedit(pvt->im_context, TRUE);
@@ -8562,10 +8562,10 @@ vte_terminal_realize(GtkWidget *widget)
/* Create our invisible cursor. */
terminal->pvt->mouse_inviso_cursor = gdk_cursor_new_for_display(gtk_widget_get_display(widget), GDK_BLANK_CURSOR);
- vte_terminal_ensure_font (terminal);
+ vte_view_ensure_font (terminal);
/* Set up the background, *now*. */
- vte_terminal_background_update(terminal);
+ vte_view_background_update(terminal);
}
static inline void
@@ -8576,7 +8576,7 @@ swap (guint *a, guint *b)
}
static void
-vte_terminal_determine_colors_internal(VteTerminal *terminal,
+vte_view_determine_colors_internal(VteView *terminal,
const VteCell *cell,
gboolean selected,
gboolean cursor,
@@ -8658,23 +8658,23 @@ vte_terminal_determine_colors_internal(VteTerminal *terminal,
}
static inline void
-vte_terminal_determine_colors (VteTerminal *terminal,
+vte_view_determine_colors (VteView *terminal,
const VteCell *cell,
gboolean highlight,
guint *fore, guint *back)
{
- return vte_terminal_determine_colors_internal (terminal, cell,
+ return vte_view_determine_colors_internal (terminal, cell,
highlight, FALSE,
fore, back);
}
static inline void
-vte_terminal_determine_cursor_colors (VteTerminal *terminal,
+vte_view_determine_cursor_colors (VteView *terminal,
const VteCell *cell,
gboolean highlight,
guint *fore, guint *back)
{
- return vte_terminal_determine_colors_internal (terminal, cell,
+ return vte_view_determine_colors_internal (terminal, cell,
highlight, TRUE,
fore, back);
}
@@ -8721,14 +8721,14 @@ vte_unichar_is_local_graphic(vteunistr c)
return FALSE;
}
static gboolean
-vte_terminal_unichar_is_local_graphic(VteTerminal *terminal, vteunistr c, gboolean bold)
+vte_view_unichar_is_local_graphic(VteView *terminal, vteunistr c, gboolean bold)
{
return vte_unichar_is_local_graphic (c) &&
!_vte_draw_has_char (terminal->pvt->draw, c, bold);
}
static void
-vte_terminal_fill_rectangle(VteTerminal *terminal,
+vte_view_fill_rectangle(VteView *terminal,
const GdkRGBA *color,
gint x,
gint y,
@@ -8743,20 +8743,20 @@ vte_terminal_fill_rectangle(VteTerminal *terminal,
}
static void
-vte_terminal_draw_line(VteTerminal *terminal,
+vte_view_draw_line(VteView *terminal,
const GdkRGBA *color,
gint x,
gint y,
gint xp,
gint yp)
{
- vte_terminal_fill_rectangle(terminal, color,
+ vte_view_fill_rectangle(terminal, color,
x, y,
MAX(VTE_LINE_WIDTH, xp - x + 1), MAX(VTE_LINE_WIDTH, yp - y + 1));
}
static void
-vte_terminal_draw_rectangle(VteTerminal *terminal,
+vte_view_draw_rectangle(VteView *terminal,
const GdkRGBA *color,
gint x,
gint y,
@@ -8771,18 +8771,18 @@ vte_terminal_draw_rectangle(VteTerminal *terminal,
}
static void
-vte_terminal_draw_point(VteTerminal *terminal,
+vte_view_draw_point(VteView *terminal,
const GdkRGBA *color,
gint x,
gint y)
{
- vte_terminal_fill_rectangle(terminal, color, x, y, 1, 1);
+ vte_view_fill_rectangle(terminal, color, x, y, 1, 1);
}
/* Draw the graphic representation of a line-drawing or special graphics
* character. */
static gboolean
-vte_terminal_draw_graphic(VteTerminal *terminal, vteunistr c,
+vte_view_draw_graphic(VteView *terminal, vteunistr c,
guint fore, guint back, gboolean draw_default_bg,
gint x, gint y,
gint column_width, gint columns, gint row_height,
@@ -8803,7 +8803,7 @@ vte_terminal_draw_graphic(VteTerminal *terminal, vteunistr c,
ycenter = (y + ybottom) / 2;
if ((back != VTE_DEF_BG) || draw_default_bg) {
- vte_terminal_fill_rectangle(terminal,
+ vte_view_fill_rectangle(terminal,
&terminal->pvt->palette[back],
x, y,
column_width * columns, row_height);
@@ -8824,17 +8824,17 @@ vte_terminal_draw_graphic(VteTerminal *terminal, vteunistr c,
xright--;
ybottom--;
/* != */
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
(x + xcenter) / 2 - 1, ycenter,
(xright + xcenter) / 2 + 1, ycenter);
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
(x + xcenter) / 2 - 1,
(ybottom + ycenter) / 2,
(xright + xcenter) / 2 + 1,
(ybottom + ycenter) / 2);
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
xright - 1, y + 1,
x + 1, ybottom - 1);
@@ -8845,23 +8845,23 @@ vte_terminal_draw_graphic(VteTerminal *terminal, vteunistr c,
xright--;
ybottom--;
/* A "delete" symbol I saw somewhere. */
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
x, ycenter,
xcenter, y);
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
xcenter, y,
xright - 1, ycenter);
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
xright - 1, ycenter,
xright - 1, ybottom - 1);
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
xright - 1, ybottom - 1,
x, ybottom - 1);
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
x, ybottom - 1,
x, ycenter);
@@ -8872,35 +8872,35 @@ vte_terminal_draw_graphic(VteTerminal *terminal, vteunistr c,
xright--;
ybottom--;
/* British pound. An "L" with a hyphen. */
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
(x + xcenter) / 2,
(y + ycenter) / 2,
(x + xcenter) / 2,
(ycenter + ybottom) / 2);
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
(x + xcenter) / 2,
(ycenter + ybottom) / 2,
(xcenter + xright) / 2,
(ycenter + ybottom) / 2);
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
x, ycenter,
xcenter + 1, ycenter);
break;
case 0x00b0: /* f */
/* litle circle */
- vte_terminal_draw_point(terminal,
+ vte_view_draw_point(terminal,
&terminal->pvt->palette[fore],
xcenter - 1, ycenter);
- vte_terminal_draw_point(terminal,
+ vte_view_draw_point(terminal,
&terminal->pvt->palette[fore],
xcenter + 1, ycenter);
- vte_terminal_draw_point(terminal,
+ vte_view_draw_point(terminal,
&terminal->pvt->palette[fore],
xcenter, ycenter - 1);
- vte_terminal_draw_point(terminal,
+ vte_view_draw_point(terminal,
&terminal->pvt->palette[fore],
xcenter, ycenter + 1);
break;
@@ -8910,19 +8910,19 @@ vte_terminal_draw_graphic(VteTerminal *terminal, vteunistr c,
xright--;
ybottom--;
/* +/- */
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
xcenter,
(y + ycenter) / 2,
xcenter,
(ycenter + ybottom) / 2);
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
(x + xcenter) / 2,
ycenter,
(xcenter + xright) / 2,
ycenter);
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
(x + xcenter) / 2,
(ycenter + ybottom) / 2,
@@ -8935,7 +8935,7 @@ vte_terminal_draw_graphic(VteTerminal *terminal, vteunistr c,
xright--;
ybottom--;
/* short hyphen? */
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
xcenter - 1, ycenter,
xcenter + 1, ycenter);
@@ -8945,19 +8945,19 @@ vte_terminal_draw_graphic(VteTerminal *terminal, vteunistr c,
ycenter--;
xright--;
ybottom--;
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
(x + xcenter) / 2 - 1,
(y + ycenter) / 2,
(xright + xcenter) / 2 + 1,
(y + ycenter) / 2);
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
(x + xcenter) / 2,
(y + ycenter) / 2,
(x + xcenter) / 2,
(ybottom + ycenter) / 2);
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
(xright + xcenter) / 2,
(y + ycenter) / 2,
@@ -8975,15 +8975,15 @@ vte_terminal_draw_graphic(VteTerminal *terminal, vteunistr c,
xright--;
ybottom--;
/* <= */
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
xright - 1, y,
x, (y + ycenter) / 2);
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
x, (y + ycenter) / 2,
xright - 1, ycenter);
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
x, ycenter,
xright - 1, (ycenter + ybottom) / 2);
@@ -8994,35 +8994,35 @@ vte_terminal_draw_graphic(VteTerminal *terminal, vteunistr c,
xright--;
ybottom--;
/* >= */
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
x, y,
xright - 1, (y + ycenter) / 2);
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
xright - 1, (y + ycenter) / 2,
x, ycenter);
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
xright - 1, ycenter,
x, (ycenter + ybottom) / 2);
break;
case 0x23ba: /* o */
- vte_terminal_fill_rectangle(terminal,
+ vte_view_fill_rectangle(terminal,
&terminal->pvt->palette[fore],
x, y,
column_width * columns,
VTE_LINE_WIDTH);
break;
case 0x23bb: /* p */
- vte_terminal_fill_rectangle(terminal,
+ vte_view_fill_rectangle(terminal,
&terminal->pvt->palette[fore],
x, (y + ycenter) / 2,
column_width * columns,
VTE_LINE_WIDTH);
break;
case 0x23bc: /* r */
- vte_terminal_fill_rectangle(terminal,
+ vte_view_fill_rectangle(terminal,
&terminal->pvt->palette[fore],
x,
(ycenter + ybottom) / 2,
@@ -9030,7 +9030,7 @@ vte_terminal_draw_graphic(VteTerminal *terminal, vteunistr c,
VTE_LINE_WIDTH);
break;
case 0x23bd: /* s */
- vte_terminal_fill_rectangle(terminal,
+ vte_view_fill_rectangle(terminal,
&terminal->pvt->palette[fore],
x,
ybottom - 1,
@@ -9043,24 +9043,24 @@ vte_terminal_draw_graphic(VteTerminal *terminal, vteunistr c,
xright--;
ybottom--;
/* H */
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
x, y,
x, ycenter);
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
xcenter, y,
xcenter, ycenter);
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
x, (y + ycenter) / 2,
xcenter, (y + ycenter) / 2);
/* T */
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
xcenter, ycenter,
xright - 1, ycenter);
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
(xcenter + xright) / 2, ycenter,
(xcenter + xright) / 2, ybottom - 1);
@@ -9071,24 +9071,24 @@ vte_terminal_draw_graphic(VteTerminal *terminal, vteunistr c,
xright--;
ybottom--;
/* L */
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
x, y,
x, ycenter);
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
x, ycenter,
xcenter, ycenter);
/* F */
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
xcenter, ycenter,
xcenter, ybottom - 1);
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
xcenter, ycenter,
xright - 1, ycenter);
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
xcenter, (ycenter + ybottom) / 2,
xright - 1, (ycenter + ybottom) / 2);
@@ -9099,20 +9099,20 @@ vte_terminal_draw_graphic(VteTerminal *terminal, vteunistr c,
xright--;
ybottom--;
/* V */
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
x, y,
(x + xcenter) / 2, ycenter);
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
(x + xcenter) / 2, ycenter,
xcenter, y);
/* T */
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
xcenter, ycenter,
xright - 1, ycenter);
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
(xcenter + xright) / 2, ycenter,
(xcenter + xright) / 2, ybottom - 1);
@@ -9123,28 +9123,28 @@ vte_terminal_draw_graphic(VteTerminal *terminal, vteunistr c,
xright--;
ybottom--;
/* F */
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
x, y,
x, ycenter);
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
x, y,
xcenter, y);
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
x, (y + ycenter) / 2,
xcenter, (y + ycenter) / 2);
/* F */
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
xcenter, ycenter,
xcenter, ybottom - 1);
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
xcenter, ycenter,
xright - 1, ycenter);
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
xcenter, (ycenter + ybottom) / 2,
xright - 1, (ycenter + ybottom) / 2);
@@ -9155,36 +9155,36 @@ vte_terminal_draw_graphic(VteTerminal *terminal, vteunistr c,
xright--;
ybottom--;
/* C */
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
x, y,
x, ycenter);
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
x, y,
xcenter, y);
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
x, ycenter,
xcenter, ycenter);
/* R */
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
xcenter, ycenter,
xcenter, ybottom - 1);
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
xcenter, ycenter,
xright - 1, ycenter);
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
xright - 1, ycenter,
xright - 1, (ycenter + ybottom) / 2);
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
xright - 1, (ycenter + ybottom) / 2,
xcenter, (ycenter + ybottom) / 2);
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
xcenter, (ycenter + ybottom) / 2,
xright - 1, ybottom - 1);
@@ -9195,30 +9195,30 @@ vte_terminal_draw_graphic(VteTerminal *terminal, vteunistr c,
xright--;
ybottom--;
/* N */
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
x, y,
x, ycenter);
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
x, y,
xcenter, ycenter);
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
xcenter, y,
xcenter, ycenter);
/* L */
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
xcenter, ycenter,
xcenter, ybottom - 1);
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
xcenter, ybottom - 1,
xright - 1, ybottom - 1);
break;
case 0x2500: /* q */
- vte_terminal_fill_rectangle(terminal,
+ vte_view_fill_rectangle(terminal,
&terminal->pvt->palette[fore],
x,
ycenter,
@@ -9226,7 +9226,7 @@ vte_terminal_draw_graphic(VteTerminal *terminal, vteunistr c,
VTE_LINE_WIDTH);
break;
case 0x2501:
- vte_terminal_fill_rectangle(terminal,
+ vte_view_fill_rectangle(terminal,
&terminal->pvt->palette[fore],
x,
ycenter,
@@ -9234,7 +9234,7 @@ vte_terminal_draw_graphic(VteTerminal *terminal, vteunistr c,
VTE_LINE_WIDTH * 2);
break;
case 0x2502: /* x */
- vte_terminal_fill_rectangle(terminal,
+ vte_view_fill_rectangle(terminal,
&terminal->pvt->palette[fore],
xcenter,
y,
@@ -9242,7 +9242,7 @@ vte_terminal_draw_graphic(VteTerminal *terminal, vteunistr c,
row_height);
break;
case 0x2503:
- vte_terminal_fill_rectangle(terminal,
+ vte_view_fill_rectangle(terminal,
&terminal->pvt->palette[fore],
xcenter,
y,
@@ -9250,13 +9250,13 @@ vte_terminal_draw_graphic(VteTerminal *terminal, vteunistr c,
row_height);
break;
case 0x250c: /* l */
- vte_terminal_fill_rectangle(terminal,
+ vte_view_fill_rectangle(terminal,
&terminal->pvt->palette[fore],
xcenter,
ycenter,
xright - xcenter,
VTE_LINE_WIDTH);
- vte_terminal_fill_rectangle(terminal,
+ vte_view_fill_rectangle(terminal,
&terminal->pvt->palette[fore],
xcenter,
ycenter,
@@ -9264,13 +9264,13 @@ vte_terminal_draw_graphic(VteTerminal *terminal, vteunistr c,
ybottom - ycenter);
break;
case 0x250f:
- vte_terminal_fill_rectangle(terminal,
+ vte_view_fill_rectangle(terminal,
&terminal->pvt->palette[fore],
xcenter,
ycenter,
xright - xcenter,
VTE_LINE_WIDTH * 2);
- vte_terminal_fill_rectangle(terminal,
+ vte_view_fill_rectangle(terminal,
&terminal->pvt->palette[fore],
xcenter,
ycenter,
@@ -9278,13 +9278,13 @@ vte_terminal_draw_graphic(VteTerminal *terminal, vteunistr c,
ybottom - ycenter);
break;
case 0x2510: /* k */
- vte_terminal_fill_rectangle(terminal,
+ vte_view_fill_rectangle(terminal,
&terminal->pvt->palette[fore],
x,
ycenter,
xcenter - x + VTE_LINE_WIDTH,
VTE_LINE_WIDTH);
- vte_terminal_fill_rectangle(terminal,
+ vte_view_fill_rectangle(terminal,
&terminal->pvt->palette[fore],
xcenter,
ycenter,
@@ -9292,13 +9292,13 @@ vte_terminal_draw_graphic(VteTerminal *terminal, vteunistr c,
ybottom - ycenter);
break;
case 0x2513:
- vte_terminal_fill_rectangle(terminal,
+ vte_view_fill_rectangle(terminal,
&terminal->pvt->palette[fore],
x,
ycenter,
xcenter - x + VTE_LINE_WIDTH * 2,
VTE_LINE_WIDTH * 2);
- vte_terminal_fill_rectangle(terminal,
+ vte_view_fill_rectangle(terminal,
&terminal->pvt->palette[fore],
xcenter,
ycenter,
@@ -9306,13 +9306,13 @@ vte_terminal_draw_graphic(VteTerminal *terminal, vteunistr c,
ybottom - ycenter);
break;
case 0x2514: /* m */
- vte_terminal_fill_rectangle(terminal,
+ vte_view_fill_rectangle(terminal,
&terminal->pvt->palette[fore],
xcenter,
ycenter,
xright - xcenter,
VTE_LINE_WIDTH);
- vte_terminal_fill_rectangle(terminal,
+ vte_view_fill_rectangle(terminal,
&terminal->pvt->palette[fore],
xcenter,
y,
@@ -9320,13 +9320,13 @@ vte_terminal_draw_graphic(VteTerminal *terminal, vteunistr c,
ycenter - y + VTE_LINE_WIDTH);
break;
case 0x2517:
- vte_terminal_fill_rectangle(terminal,
+ vte_view_fill_rectangle(terminal,
&terminal->pvt->palette[fore],
xcenter,
ycenter,
xright - xcenter,
VTE_LINE_WIDTH * 2);
- vte_terminal_fill_rectangle(terminal,
+ vte_view_fill_rectangle(terminal,
&terminal->pvt->palette[fore],
xcenter,
y,
@@ -9334,13 +9334,13 @@ vte_terminal_draw_graphic(VteTerminal *terminal, vteunistr c,
ycenter - y + VTE_LINE_WIDTH * 2);
break;
case 0x2518: /* j */
- vte_terminal_fill_rectangle(terminal,
+ vte_view_fill_rectangle(terminal,
&terminal->pvt->palette[fore],
x,
ycenter,
xcenter - x + VTE_LINE_WIDTH,
VTE_LINE_WIDTH);
- vte_terminal_fill_rectangle(terminal,
+ vte_view_fill_rectangle(terminal,
&terminal->pvt->palette[fore],
xcenter,
y,
@@ -9348,13 +9348,13 @@ vte_terminal_draw_graphic(VteTerminal *terminal, vteunistr c,
ycenter - y + VTE_LINE_WIDTH);
break;
case 0x251b:
- vte_terminal_fill_rectangle(terminal,
+ vte_view_fill_rectangle(terminal,
&terminal->pvt->palette[fore],
x,
ycenter,
xcenter - x + VTE_LINE_WIDTH * 2,
VTE_LINE_WIDTH * 2);
- vte_terminal_fill_rectangle(terminal,
+ vte_view_fill_rectangle(terminal,
&terminal->pvt->palette[fore],
xcenter,
y,
@@ -9362,13 +9362,13 @@ vte_terminal_draw_graphic(VteTerminal *terminal, vteunistr c,
ycenter - y + VTE_LINE_WIDTH * 2);
break;
case 0x251c: /* t */
- vte_terminal_fill_rectangle(terminal,
+ vte_view_fill_rectangle(terminal,
&terminal->pvt->palette[fore],
xcenter,
y,
VTE_LINE_WIDTH,
row_height);
- vte_terminal_fill_rectangle(terminal,
+ vte_view_fill_rectangle(terminal,
&terminal->pvt->palette[fore],
xcenter,
ycenter,
@@ -9376,13 +9376,13 @@ vte_terminal_draw_graphic(VteTerminal *terminal, vteunistr c,
VTE_LINE_WIDTH);
break;
case 0x2523:
- vte_terminal_fill_rectangle(terminal,
+ vte_view_fill_rectangle(terminal,
&terminal->pvt->palette[fore],
xcenter,
y,
VTE_LINE_WIDTH * 2,
row_height);
- vte_terminal_fill_rectangle(terminal,
+ vte_view_fill_rectangle(terminal,
&terminal->pvt->palette[fore],
xcenter,
ycenter,
@@ -9390,13 +9390,13 @@ vte_terminal_draw_graphic(VteTerminal *terminal, vteunistr c,
VTE_LINE_WIDTH * 2);
break;
case 0x2524: /* u */
- vte_terminal_fill_rectangle(terminal,
+ vte_view_fill_rectangle(terminal,
&terminal->pvt->palette[fore],
xcenter,
y,
VTE_LINE_WIDTH,
row_height);
- vte_terminal_fill_rectangle(terminal,
+ vte_view_fill_rectangle(terminal,
&terminal->pvt->palette[fore],
x,
ycenter,
@@ -9404,13 +9404,13 @@ vte_terminal_draw_graphic(VteTerminal *terminal, vteunistr c,
VTE_LINE_WIDTH);
break;
case 0x252b:
- vte_terminal_fill_rectangle(terminal,
+ vte_view_fill_rectangle(terminal,
&terminal->pvt->palette[fore],
xcenter,
y,
VTE_LINE_WIDTH * 2,
row_height);
- vte_terminal_fill_rectangle(terminal,
+ vte_view_fill_rectangle(terminal,
&terminal->pvt->palette[fore],
x,
ycenter,
@@ -9418,13 +9418,13 @@ vte_terminal_draw_graphic(VteTerminal *terminal, vteunistr c,
VTE_LINE_WIDTH * 2);
break;
case 0x252c: /* w */
- vte_terminal_fill_rectangle(terminal,
+ vte_view_fill_rectangle(terminal,
&terminal->pvt->palette[fore],
xcenter,
ycenter,
VTE_LINE_WIDTH,
ybottom - ycenter);
- vte_terminal_fill_rectangle(terminal,
+ vte_view_fill_rectangle(terminal,
&terminal->pvt->palette[fore],
x,
ycenter,
@@ -9432,13 +9432,13 @@ vte_terminal_draw_graphic(VteTerminal *terminal, vteunistr c,
VTE_LINE_WIDTH);
break;
case 0x2533:
- vte_terminal_fill_rectangle(terminal,
+ vte_view_fill_rectangle(terminal,
&terminal->pvt->palette[fore],
xcenter,
ycenter,
VTE_LINE_WIDTH * 2,
ybottom - ycenter);
- vte_terminal_fill_rectangle(terminal,
+ vte_view_fill_rectangle(terminal,
&terminal->pvt->palette[fore],
x,
ycenter,
@@ -9446,13 +9446,13 @@ vte_terminal_draw_graphic(VteTerminal *terminal, vteunistr c,
VTE_LINE_WIDTH * 2);
break;
case 0x2534: /* v */
- vte_terminal_fill_rectangle(terminal,
+ vte_view_fill_rectangle(terminal,
&terminal->pvt->palette[fore],
xcenter,
y,
VTE_LINE_WIDTH,
ycenter - y + VTE_LINE_WIDTH);
- vte_terminal_fill_rectangle(terminal,
+ vte_view_fill_rectangle(terminal,
&terminal->pvt->palette[fore],
x,
ycenter,
@@ -9460,13 +9460,13 @@ vte_terminal_draw_graphic(VteTerminal *terminal, vteunistr c,
VTE_LINE_WIDTH);
break;
case 0x253c: /* n */
- vte_terminal_fill_rectangle(terminal,
+ vte_view_fill_rectangle(terminal,
&terminal->pvt->palette[fore],
xcenter,
y,
VTE_LINE_WIDTH,
row_height);
- vte_terminal_fill_rectangle(terminal,
+ vte_view_fill_rectangle(terminal,
&terminal->pvt->palette[fore],
x,
ycenter,
@@ -9474,13 +9474,13 @@ vte_terminal_draw_graphic(VteTerminal *terminal, vteunistr c,
VTE_LINE_WIDTH);
break;
case 0x254b:
- vte_terminal_fill_rectangle(terminal,
+ vte_view_fill_rectangle(terminal,
&terminal->pvt->palette[fore],
xcenter,
y,
VTE_LINE_WIDTH * 2,
row_height);
- vte_terminal_fill_rectangle(terminal,
+ vte_view_fill_rectangle(terminal,
&terminal->pvt->palette[fore],
x,
ycenter,
@@ -9492,7 +9492,7 @@ vte_terminal_draw_graphic(VteTerminal *terminal, vteunistr c,
gint j, draw = ((i - x) & 1) == 0;
for (j = y; j < ybottom; j++) {
if (draw) {
- vte_terminal_draw_point(terminal,
+ vte_view_draw_point(terminal,
&terminal->pvt->palette[fore],
i, j);
}
@@ -9501,35 +9501,35 @@ vte_terminal_draw_graphic(VteTerminal *terminal, vteunistr c,
}
break;
case 0x25ae: /* solid rectangle */
- vte_terminal_fill_rectangle(terminal,
+ vte_view_fill_rectangle(terminal,
&terminal->pvt->palette[fore],
x, y,
xright - x, ybottom - y);
break;
case 0x25c6:
/* diamond */
- vte_terminal_draw_point(terminal,
+ vte_view_draw_point(terminal,
&terminal->pvt->palette[fore],
xcenter - 2, ycenter);
- vte_terminal_draw_point(terminal,
+ vte_view_draw_point(terminal,
&terminal->pvt->palette[fore],
xcenter + 2, ycenter);
- vte_terminal_draw_point(terminal,
+ vte_view_draw_point(terminal,
&terminal->pvt->palette[fore],
xcenter, ycenter - 2);
- vte_terminal_draw_point(terminal,
+ vte_view_draw_point(terminal,
&terminal->pvt->palette[fore],
xcenter, ycenter + 2);
- vte_terminal_draw_point(terminal,
+ vte_view_draw_point(terminal,
&terminal->pvt->palette[fore],
xcenter - 1, ycenter - 1);
- vte_terminal_draw_point(terminal,
+ vte_view_draw_point(terminal,
&terminal->pvt->palette[fore],
xcenter - 1, ycenter + 1);
- vte_terminal_draw_point(terminal,
+ vte_view_draw_point(terminal,
&terminal->pvt->palette[fore],
xcenter + 1, ycenter - 1);
- vte_terminal_draw_point(terminal,
+ vte_view_draw_point(terminal,
&terminal->pvt->palette[fore],
xcenter + 1, ycenter + 1);
break;
@@ -9542,7 +9542,7 @@ vte_terminal_draw_graphic(VteTerminal *terminal, vteunistr c,
/* Draw a string of characters with similar attributes. */
static void
-vte_terminal_draw_cells(VteTerminal *terminal,
+vte_view_draw_cells(VteView *terminal,
struct _vte_draw_text_request *items, gssize n,
guint fore, guint back, gboolean clear,
gboolean draw_default_bg,
@@ -9614,7 +9614,7 @@ vte_terminal_draw_cells(VteTerminal *terminal,
columns += items[i].columns;
}
if (underline) {
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
x,
y + terminal->pvt->underline_position,
@@ -9622,7 +9622,7 @@ vte_terminal_draw_cells(VteTerminal *terminal,
y + terminal->pvt->underline_position + terminal->pvt->line_thickness - 1);
}
if (strikethrough) {
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
x,
y + terminal->pvt->strikethrough_position,
@@ -9630,7 +9630,7 @@ vte_terminal_draw_cells(VteTerminal *terminal,
y + terminal->pvt->strikethrough_position + terminal->pvt->line_thickness - 1);
}
if (hilite) {
- vte_terminal_draw_line(terminal,
+ vte_view_draw_line(terminal,
&terminal->pvt->palette[fore],
x,
y + row_height - 1,
@@ -9638,7 +9638,7 @@ vte_terminal_draw_cells(VteTerminal *terminal,
y + row_height - 1);
}
if (boxed) {
- vte_terminal_draw_rectangle(terminal,
+ vte_view_draw_rectangle(terminal,
&terminal->pvt->palette[fore],
x, y,
MAX(0, (columns * column_width)),
@@ -9650,7 +9650,7 @@ vte_terminal_draw_cells(VteTerminal *terminal,
/* Try to map a GdkRGBA to a palette entry and return its index. */
static guint
-_vte_terminal_map_pango_color(VteTerminal *terminal, const PangoColor *pcolor)
+_vte_view_map_pango_color(VteView *terminal, const PangoColor *pcolor)
{
double distance[G_N_ELEMENTS(terminal->pvt->palette)];
guint i, ret;
@@ -9703,7 +9703,7 @@ _vte_terminal_map_pango_color(VteTerminal *terminal, const PangoColor *pcolor)
* fix things. Do this here, so that if we suddenly get red-on-black, we'll do
* the right thing. */
static void
-_vte_terminal_fudge_pango_colors(VteTerminal *terminal, GSList *attributes,
+_vte_view_fudge_pango_colors(VteView *terminal, GSList *attributes,
VteCell *cells, gssize n)
{
VteBuffer *buffer = terminal->pvt->buffer;
@@ -9775,7 +9775,7 @@ _vte_terminal_fudge_pango_colors(VteTerminal *terminal, GSList *attributes,
/* Apply the attribute given in the PangoAttribute to the list of cells. */
static void
-_vte_terminal_apply_pango_attr(VteTerminal *terminal, PangoAttribute *attr,
+_vte_view_apply_pango_attr(VteView *terminal, PangoAttribute *attr,
VteCell *cells, guint n_cells)
{
guint i, ival;
@@ -9786,7 +9786,7 @@ _vte_terminal_apply_pango_attr(VteTerminal *terminal, PangoAttribute *attr,
case PANGO_ATTR_FOREGROUND:
case PANGO_ATTR_BACKGROUND:
attrcolor = (PangoAttrColor*) attr;
- ival = _vte_terminal_map_pango_color(terminal,
+ ival = _vte_view_map_pango_color(terminal,
&attrcolor->color);
for (i = attr->start_index;
i < attr->end_index && i < n_cells;
@@ -9837,12 +9837,12 @@ _vte_terminal_apply_pango_attr(VteTerminal *terminal, PangoAttribute *attr,
* typically means that the cell array should have the same length as the
* string (byte-wise) which the attributes describe. */
static void
-_vte_terminal_pango_attribute_destroy(gpointer attr, gpointer data)
+_vte_view_pango_attribute_destroy(gpointer attr, gpointer data)
{
pango_attribute_destroy(attr);
}
static void
-_vte_terminal_translate_pango_cells(VteTerminal *terminal, PangoAttrList *attrs,
+_vte_view_translate_pango_cells(VteView *terminal, PangoAttrList *attrs,
VteCell *cells, guint n_cells)
{
VteBuffer *buffer = terminal->pvt->buffer;
@@ -9864,20 +9864,20 @@ _vte_terminal_translate_pango_cells(VteTerminal *terminal, PangoAttrList *attrs,
listiter != NULL;
listiter = g_slist_next(listiter)) {
attr = listiter->data;
- _vte_terminal_apply_pango_attr(terminal,
+ _vte_view_apply_pango_attr(terminal,
attr,
cells,
n_cells);
}
attr = list->data;
- _vte_terminal_fudge_pango_colors(terminal,
+ _vte_view_fudge_pango_colors(terminal,
list,
cells +
attr->start_index,
attr->end_index -
attr->start_index);
g_slist_foreach(list,
- _vte_terminal_pango_attribute_destroy,
+ _vte_view_pango_attribute_destroy,
NULL);
g_slist_free(list);
}
@@ -9890,7 +9890,7 @@ _vte_terminal_translate_pango_cells(VteTerminal *terminal, PangoAttrList *attrs,
* attribute string is indexed by byte in the UTF-8 representation of the string
* of characters. Because we draw a character at a time, this is slower. */
static void
-vte_terminal_draw_cells_with_attributes(VteTerminal *terminal,
+vte_view_draw_cells_with_attributes(VteView *terminal,
struct _vte_draw_text_request *items,
gssize n,
PangoAttrList *attrs,
@@ -9909,10 +9909,10 @@ vte_terminal_draw_cells_with_attributes(VteTerminal *terminal,
cell_count += g_unichar_to_utf8(items[i].c, scratch_buf);
}
cells = g_new(VteCell, cell_count);
- _vte_terminal_translate_pango_cells(terminal, attrs, cells, cell_count);
+ _vte_view_translate_pango_cells(terminal, attrs, cells, cell_count);
for (i = 0, j = 0; i < n; i++) {
- vte_terminal_determine_colors(terminal, &cells[j], FALSE, &fore, &back);
- vte_terminal_draw_cells(terminal, items + i, 1,
+ vte_view_determine_colors(terminal, &cells[j], FALSE, &fore, &back);
+ vte_view_draw_cells(terminal, items + i, 1,
fore,
back,
TRUE, draw_default_bg,
@@ -9930,7 +9930,7 @@ vte_terminal_draw_cells_with_attributes(VteTerminal *terminal,
* of multiple-draw APIs by finding runs of characters with identical
* attributes and bundling them together. */
static void
-vte_terminal_draw_rows(VteTerminal *terminal,
+vte_view_draw_rows(VteView *terminal,
VteScreen *screen,
gint start_row, gint row_count,
gint start_column, gint column_count,
@@ -9974,8 +9974,8 @@ vte_terminal_draw_rows(VteTerminal *terminal,
/* Get the character cell's contents. */
cell = _vte_row_data_get (row_data, i);
/* Find the colors for this cell. */
- selected = vte_terminal_cell_is_selected(terminal->pvt->buffer, i, row, terminal);
- vte_terminal_determine_colors(terminal, cell, selected, &fore, &back);
+ selected = vte_view_cell_is_selected(terminal->pvt->buffer, i, row, terminal);
+ vte_view_determine_colors(terminal, cell, selected, &fore, &back);
bold = cell && cell->attr.bold;
j = i + (cell ? cell->attr.columns : 1);
@@ -9993,8 +9993,8 @@ vte_terminal_draw_rows(VteTerminal *terminal,
/* Resolve attributes to colors where possible and
* compare visual attributes to the first character
* in this chunk. */
- selected = vte_terminal_cell_is_selected(terminal->pvt->buffer, j, row, terminal);
- vte_terminal_determine_colors(terminal, cell, selected, &nfore, &nback);
+ selected = vte_view_cell_is_selected(terminal->pvt->buffer, j, row, terminal);
+ vte_view_determine_colors(terminal, cell, selected, &nfore, &nback);
if (nback != back) {
break;
}
@@ -10016,16 +10016,16 @@ vte_terminal_draw_rows(VteTerminal *terminal,
} while (i < end_column);
} else {
do {
- selected = vte_terminal_cell_is_selected(terminal->pvt->buffer, i, row, terminal);
+ selected = vte_view_cell_is_selected(terminal->pvt->buffer, i, row, terminal);
j = i + 1;
while (j < end_column){
- nselected = vte_terminal_cell_is_selected(terminal->pvt->buffer, j, row, terminal);
+ nselected = vte_view_cell_is_selected(terminal->pvt->buffer, j, row, terminal);
if (nselected != selected) {
break;
}
j++;
}
- vte_terminal_determine_colors(terminal, NULL, selected, &fore, &back);
+ vte_view_determine_colors(terminal, NULL, selected, &fore, &back);
if (back != VTE_DEF_BG) {
_vte_draw_fill_rectangle (terminal->pvt->draw,
x + i *column_width,
@@ -10083,8 +10083,8 @@ vte_terminal_draw_rows(VteTerminal *terminal,
}
}
/* Find the colors for this cell. */
- selected = vte_terminal_cell_is_selected(terminal->pvt->buffer, i, row, terminal);
- vte_terminal_determine_colors(terminal, cell, selected, &fore, &back);
+ selected = vte_view_cell_is_selected(terminal->pvt->buffer, i, row, terminal);
+ vte_view_determine_colors(terminal, cell, selected, &fore, &back);
underline = cell->attr.underline;
strikethrough = cell->attr.strikethrough;
bold = cell->attr.bold;
@@ -10106,8 +10106,8 @@ vte_terminal_draw_rows(VteTerminal *terminal,
j = i + items[0].columns;
/* If this is a graphics character, draw it locally. */
- if (vte_terminal_unichar_is_local_graphic(terminal, cell->c, cell->attr.bold)) {
- if (vte_terminal_draw_graphic(terminal,
+ if (vte_view_unichar_is_local_graphic(terminal, cell->c, cell->attr.bold)) {
+ if (vte_view_draw_graphic(terminal,
items[0].c,
fore, back,
FALSE,
@@ -10152,11 +10152,11 @@ vte_terminal_draw_rows(VteTerminal *terminal,
/* Resolve attributes to colors where possible and
* compare visual attributes to the first character
* in this chunk. */
- selected = vte_terminal_cell_is_selected(terminal->pvt->buffer, j, row, terminal);
- vte_terminal_determine_colors(terminal, cell, selected, &nfore, &nback);
+ selected = vte_view_cell_is_selected(terminal->pvt->buffer, j, row, terminal);
+ vte_view_determine_colors(terminal, cell, selected, &nfore, &nback);
/* Graphic characters must be drawn individually. */
- if (vte_terminal_unichar_is_local_graphic(terminal, cell->c, cell->attr.bold)) {
- if (vte_terminal_draw_graphic(terminal,
+ if (vte_view_unichar_is_local_graphic(terminal, cell->c, cell->attr.bold)) {
+ if (vte_view_draw_graphic(terminal,
cell->c,
nfore, nback,
FALSE,
@@ -10238,7 +10238,7 @@ fg_next_row:
} while (TRUE);
fg_draw:
/* Draw the cells. */
- vte_terminal_draw_cells(terminal,
+ vte_view_draw_cells(terminal,
items,
item_count,
fore, back, FALSE, FALSE,
@@ -10262,7 +10262,7 @@ fg_out:
}
static void
-vte_terminal_expand_region (VteTerminal *terminal, cairo_region_t *region, const cairo_rectangle_int_t *area)
+vte_view_expand_region (VteView *terminal, cairo_region_t *region, const cairo_rectangle_int_t *area)
{
VteBuffer *buffer;
VteScreen *screen;
@@ -10302,7 +10302,7 @@ vte_terminal_expand_region (VteTerminal *terminal, cairo_region_t *region, const
cairo_region_union_rectangle(region, &rect);
_vte_debug_print (VTE_DEBUG_UPDATES,
- "vte_terminal_expand_region"
+ "vte_view_expand_region"
" (%d,%d)x(%d,%d) pixels,"
" (%d,%d)x(%d,%d) cells"
" [(%d,%d)x(%d,%d) pixels]\n",
@@ -10312,7 +10312,7 @@ vte_terminal_expand_region (VteTerminal *terminal, cairo_region_t *region, const
}
static void
-vte_terminal_paint_area (VteTerminal *terminal, const cairo_rectangle_int_t *area)
+vte_view_paint_area (VteView *terminal, const cairo_rectangle_int_t *area)
{
VteBuffer *buffer;
VteScreen *screen;
@@ -10340,7 +10340,7 @@ vte_terminal_paint_area (VteTerminal *terminal, const cairo_rectangle_int_t *are
return;
}
_vte_debug_print (VTE_DEBUG_UPDATES,
- "vte_terminal_paint_area"
+ "vte_view_paint_area"
" (%d,%d)x(%d,%d) pixels,"
" (%d,%d)x(%d,%d) cells"
" [(%d,%d)x(%d,%d) pixels]\n",
@@ -10354,7 +10354,7 @@ vte_terminal_paint_area (VteTerminal *terminal, const cairo_rectangle_int_t *are
/* Now we're ready to draw the text. Iterate over the rows we
* need to draw. */
delta = screen->scroll_delta;
- vte_terminal_draw_rows(terminal,
+ vte_view_draw_rows(terminal,
screen,
row + delta, row_stop - row,
col, col_stop - col,
@@ -10365,7 +10365,7 @@ vte_terminal_paint_area (VteTerminal *terminal, const cairo_rectangle_int_t *are
}
static void
-vte_terminal_paint_cursor(VteTerminal *terminal)
+vte_view_paint_cursor(VteView *terminal)
{
VteBuffer *buffer;
VteScreen *screen;
@@ -10420,9 +10420,9 @@ vte_terminal_paint_cursor(VteTerminal *terminal)
cursor_width = MAX(cursor_width, cw);
}
- selected = vte_terminal_cell_is_selected(buffer, col, drow, terminal);
+ selected = vte_view_cell_is_selected(buffer, col, drow, terminal);
- vte_terminal_determine_cursor_colors(terminal, cell, selected, &fore, &back);
+ vte_view_determine_cursor_colors(terminal, cell, selected, &fore, &back);
x = item.x;
y = item.y;
@@ -10435,7 +10435,7 @@ vte_terminal_paint_cursor(VteTerminal *terminal)
stem_width = (int) (((float) height) * terminal->pvt->cursor_aspect_ratio + 0.5);
stem_width = CLAMP (stem_width, VTE_LINE_WIDTH, cursor_width);
- vte_terminal_fill_rectangle(terminal, &terminal->pvt->palette[back],
+ vte_view_fill_rectangle(terminal, &terminal->pvt->palette[back],
x, y, stem_width, height);
break;
}
@@ -10446,7 +10446,7 @@ vte_terminal_paint_cursor(VteTerminal *terminal)
line_height = (int) (((float) width) * terminal->pvt->cursor_aspect_ratio + 0.5);
line_height = CLAMP (line_height, VTE_LINE_WIDTH, height);
- vte_terminal_fill_rectangle(terminal, &terminal->pvt->palette[back],
+ vte_view_fill_rectangle(terminal, &terminal->pvt->palette[back],
x, y + height - line_height,
cursor_width, line_height);
break;
@@ -10456,13 +10456,13 @@ vte_terminal_paint_cursor(VteTerminal *terminal)
if (focus) {
/* just reverse the character under the cursor */
- vte_terminal_fill_rectangle (terminal,
+ vte_view_fill_rectangle (terminal,
&terminal->pvt->palette[back],
x, y,
cursor_width, height);
- if (!vte_terminal_unichar_is_local_graphic(terminal, item.c, cell ? cell->attr.bold : FALSE) ||
- !vte_terminal_draw_graphic(terminal,
+ if (!vte_view_unichar_is_local_graphic(terminal, item.c, cell ? cell->attr.bold : FALSE) ||
+ !vte_view_draw_graphic(terminal,
item.c,
fore, back,
TRUE,
@@ -10482,7 +10482,7 @@ vte_terminal_paint_cursor(VteTerminal *terminal)
TRUE);
}
if (cell && cell->c != 0 && cell->c != ' ') {
- vte_terminal_draw_cells(terminal,
+ vte_view_draw_cells(terminal,
&item, 1,
fore, back, TRUE, FALSE,
cell->attr.bold,
@@ -10498,7 +10498,7 @@ vte_terminal_paint_cursor(VteTerminal *terminal)
} else {
/* draw a box around the character */
- vte_terminal_draw_rectangle (terminal,
+ vte_view_draw_rectangle (terminal,
&terminal->pvt->palette[back],
x - VTE_LINE_WIDTH,
y - VTE_LINE_WIDTH,
@@ -10511,9 +10511,9 @@ vte_terminal_paint_cursor(VteTerminal *terminal)
}
static void
-vte_terminal_paint_im_preedit_string(VteTerminal *terminal)
+vte_view_paint_im_preedit_string(VteView *terminal)
{
- VteTerminalPrivate *pvt = terminal->pvt;
+ VteViewPrivate *pvt = terminal->pvt;
VteBuffer *buffer;
VteScreen *screen;
int row, drow, col, columns;
@@ -10538,8 +10538,8 @@ vte_terminal_paint_im_preedit_string(VteTerminal *terminal)
row = screen->cursor_current.row - delta;
/* Find out how many columns the pre-edit string takes up. */
- columns = vte_terminal_preedit_width(terminal, FALSE);
- len = vte_terminal_preedit_length(terminal, FALSE);
+ columns = vte_view_preedit_width(terminal, FALSE);
+ len = vte_view_preedit_length(terminal, FALSE);
/* If the pre-edit string won't fit on the screen if we start
* drawing it at the cursor's position, move it left. */
@@ -10572,7 +10572,7 @@ vte_terminal_paint_im_preedit_string(VteTerminal *terminal)
&terminal->pvt->palette[VTE_DEF_BG]);
fore = screen->defaults.attr.fore;
back = screen->defaults.attr.back;
- vte_terminal_draw_cells_with_attributes(terminal,
+ vte_view_draw_cells_with_attributes(terminal,
items, len,
pvt->im_preedit_attrs,
TRUE,
@@ -10580,7 +10580,7 @@ vte_terminal_paint_im_preedit_string(VteTerminal *terminal)
preedit_cursor = pvt->im_preedit_cursor;
if (preedit_cursor >= 0 && preedit_cursor < len) {
/* Cursored letter in reverse. */
- vte_terminal_draw_cells(terminal,
+ vte_view_draw_cells(terminal,
&items[preedit_cursor], 1,
back, fore, TRUE, TRUE,
FALSE,
@@ -10637,10 +10637,10 @@ vte_cairo_get_clip_region (cairo_t *cr)
}
static gboolean
-vte_terminal_draw(GtkWidget *widget,
+vte_view_draw(GtkWidget *widget,
cairo_t *cr)
{
- VteTerminal *terminal = VTE_TERMINAL (widget);
+ VteView *terminal = VTE_VIEW (widget);
VteBuffer *buffer;
cairo_rectangle_int_t clip_rect;
cairo_region_t *region;
@@ -10649,7 +10649,7 @@ vte_terminal_draw(GtkWidget *widget,
if (!gdk_cairo_get_clip_rectangle (cr, &clip_rect))
return FALSE;
- _vte_debug_print(VTE_DEBUG_LIFECYCLE, "vte_terminal_draw()\n");
+ _vte_debug_print(VTE_DEBUG_LIFECYCLE, "vte_view_draw()\n");
_vte_debug_print(VTE_DEBUG_WORK, "=");
region = vte_cairo_get_clip_region (cr);
@@ -10657,7 +10657,7 @@ vte_terminal_draw(GtkWidget *widget,
return FALSE;
_VTE_DEBUG_IF (VTE_DEBUG_UPDATES) {
- g_printerr ("vte_terminal_draw (%d,%d)x(%d,%d) pixels\n",
+ g_printerr ("vte_view_draw (%d,%d)x(%d,%d) pixels\n",
clip_rect.x, clip_rect.y,
clip_rect.width, clip_rect.height);
}
@@ -10705,7 +10705,7 @@ vte_terminal_draw(GtkWidget *widget,
cairo_region_t *rr = cairo_region_create ();
/* convert pixels into whole cells */
for (n = 0; n < n_rectangles; n++) {
- vte_terminal_expand_region (terminal, rr, rectangles + n);
+ vte_view_expand_region (terminal, rr, rectangles + n);
}
g_free (rectangles);
@@ -10719,14 +10719,14 @@ vte_terminal_draw(GtkWidget *widget,
/* and now paint them */
for (n = 0; n < n_rectangles; n++) {
- vte_terminal_paint_area (terminal, rectangles + n);
+ vte_view_paint_area (terminal, rectangles + n);
}
g_free (rectangles);
}
- vte_terminal_paint_cursor(terminal);
+ vte_view_paint_cursor(terminal);
- vte_terminal_paint_im_preedit_string(terminal);
+ vte_view_paint_im_preedit_string(terminal);
done_drawing:
@@ -10742,9 +10742,9 @@ vte_terminal_draw(GtkWidget *widget,
/* Handle a scroll event. */
static gboolean
-vte_terminal_scroll(GtkWidget *widget, GdkEventScroll *event)
+vte_view_scroll(GtkWidget *widget, GdkEventScroll *event)
{
- VteTerminal *terminal = VTE_TERMINAL(widget);
+ VteView *terminal = VTE_VIEW(widget);
VteBuffer *buffer;
GtkAdjustment *adj;
gdouble v;
@@ -10752,7 +10752,7 @@ vte_terminal_scroll(GtkWidget *widget, GdkEventScroll *event)
buffer = terminal->pvt->buffer;
- vte_terminal_read_modifiers (terminal, (GdkEvent*) event);
+ vte_view_read_modifiers (terminal, (GdkEvent*) event);
_VTE_DEBUG_IF(VTE_DEBUG_EVENTS)
switch (event->direction) {
@@ -10782,7 +10782,7 @@ vte_terminal_scroll(GtkWidget *widget, GdkEventScroll *event)
}
if (button != 0) {
/* Encode the parameters and send them to the app. */
- vte_terminal_send_mouse_button_internal(terminal,
+ vte_view_send_mouse_button_internal(terminal,
button,
event->x,
event->y);
@@ -10837,7 +10837,7 @@ vte_terminal_scroll(GtkWidget *widget, GdkEventScroll *event)
} else {
/* Perform a history scroll. */
v += buffer->pvt->screen->scroll_delta;
- vte_terminal_queue_adjustment_value_changed_clamped (terminal, v);
+ vte_view_queue_adjustment_value_changed_clamped (terminal, v);
}
return TRUE;
@@ -10846,12 +10846,12 @@ vte_terminal_scroll(GtkWidget *widget, GdkEventScroll *event)
/* Create a new accessible object associated with ourselves, and return
* it to the caller. */
static AtkObject *
-vte_terminal_get_accessible(GtkWidget *widget)
+vte_view_get_accessible(GtkWidget *widget)
{
- VteTerminal *terminal;
+ VteView *terminal;
static gboolean first_time = TRUE;
- terminal = VTE_TERMINAL(widget);
+ terminal = VTE_VIEW(widget);
if (first_time) {
AtkObjectFactory *factory;
@@ -10862,9 +10862,9 @@ vte_terminal_get_accessible(GtkWidget *widget)
/*
* Figure out whether accessibility is enabled by looking at the
* type of the accessible object which would be created for
- * the parent type of VteTerminal.
+ * the parent type of VteView.
*/
- derived_type = g_type_parent (VTE_TYPE_TERMINAL);
+ derived_type = g_type_parent (VTE_TYPE_VIEW);
registry = atk_get_default_registry ();
factory = atk_registry_get_factory (registry,
@@ -10873,28 +10873,28 @@ vte_terminal_get_accessible(GtkWidget *widget)
derived_atk_type = atk_object_factory_get_accessible_type (factory);
if (g_type_is_a (derived_atk_type, GTK_TYPE_ACCESSIBLE)) {
atk_registry_set_factory_type (registry,
- VTE_TYPE_TERMINAL,
- _vte_terminal_accessible_factory_get_type ());
+ VTE_TYPE_VIEW,
+ _vte_view_accessible_factory_get_type ());
}
first_time = FALSE;
}
- return GTK_WIDGET_CLASS (vte_terminal_parent_class)->get_accessible (widget);
+ return GTK_WIDGET_CLASS (vte_view_parent_class)->get_accessible (widget);
}
static void
-vte_terminal_get_property (GObject *object,
+vte_view_get_property (GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec)
{
- VteTerminal *terminal = VTE_TERMINAL (object);
- VteTerminalPrivate *pvt = terminal->pvt;
+ VteView *terminal = VTE_VIEW (object);
+ VteViewPrivate *pvt = terminal->pvt;
switch (prop_id)
{
case PROP_BUFFER:
- g_value_set_object (value, vte_terminal_get_buffer(terminal));
+ g_value_set_object (value, vte_view_get_buffer(terminal));
break;
case PROP_HADJUSTMENT:
g_value_set_object (value, pvt->hadjustment);
@@ -10909,10 +10909,10 @@ vte_terminal_get_property (GObject *object,
g_value_set_enum (value, pvt->vscroll_policy);
break;
case PROP_AUDIBLE_BELL:
- g_value_set_boolean (value, vte_terminal_get_audible_bell (terminal));
+ g_value_set_boolean (value, vte_view_get_audible_bell (terminal));
break;
case PROP_MOUSE_POINTER_AUTOHIDE:
- g_value_set_boolean (value, vte_terminal_get_mouse_autohide (terminal));
+ g_value_set_boolean (value, vte_view_get_mouse_autohide (terminal));
break;
case PROP_SCROLL_ON_KEYSTROKE:
g_value_set_boolean (value, pvt->scroll_on_keystroke);
@@ -10924,10 +10924,10 @@ vte_terminal_get_property (GObject *object,
g_value_set_string (value, NULL /* FIXME */);
break;
case PROP_VISIBLE_BELL:
- g_value_set_boolean (value, vte_terminal_get_visible_bell (terminal));
+ g_value_set_boolean (value, vte_view_get_visible_bell (terminal));
break;
case PROP_FONT_SCALE:
- g_value_set_double (value, vte_terminal_get_font_scale (terminal));
+ g_value_set_double (value, vte_view_get_font_scale (terminal));
break;
default:
@@ -10937,21 +10937,21 @@ vte_terminal_get_property (GObject *object,
}
static void
-vte_terminal_set_property (GObject *object,
+vte_view_set_property (GObject *object,
guint prop_id,
const GValue *value,
GParamSpec *pspec)
{
- VteTerminal *terminal = VTE_TERMINAL (object);
- VteTerminalPrivate *pvt = terminal->pvt;
+ VteView *terminal = VTE_VIEW (object);
+ VteViewPrivate *pvt = terminal->pvt;
switch (prop_id)
{
case PROP_HADJUSTMENT:
- vte_terminal_set_hadjustment (terminal, g_value_get_object (value));
+ vte_view_set_hadjustment (terminal, g_value_get_object (value));
break;
case PROP_VADJUSTMENT:
- vte_terminal_set_vadjustment (terminal, g_value_get_object (value));
+ vte_view_set_vadjustment (terminal, g_value_get_object (value));
break;
case PROP_HSCROLL_POLICY:
pvt->hscroll_policy = g_value_get_enum (value);
@@ -10962,25 +10962,25 @@ vte_terminal_set_property (GObject *object,
gtk_widget_queue_resize_no_redraw (GTK_WIDGET (terminal));
break;
case PROP_AUDIBLE_BELL:
- vte_terminal_set_audible_bell (terminal, g_value_get_boolean (value));
+ vte_view_set_audible_bell (terminal, g_value_get_boolean (value));
break;
case PROP_MOUSE_POINTER_AUTOHIDE:
- vte_terminal_set_mouse_autohide (terminal, g_value_get_boolean (value));
+ vte_view_set_mouse_autohide (terminal, g_value_get_boolean (value));
break;
case PROP_SCROLL_ON_KEYSTROKE:
- vte_terminal_set_scroll_on_keystroke(terminal, g_value_get_boolean (value));
+ vte_view_set_scroll_on_keystroke(terminal, g_value_get_boolean (value));
break;
case PROP_SCROLL_ON_OUTPUT:
- vte_terminal_set_scroll_on_output (terminal, g_value_get_boolean (value));
+ vte_view_set_scroll_on_output (terminal, g_value_get_boolean (value));
break;
case PROP_WORD_CHARS:
- vte_terminal_set_word_chars (terminal, g_value_get_string (value));
+ vte_view_set_word_chars (terminal, g_value_get_string (value));
break;
case PROP_VISIBLE_BELL:
- vte_terminal_set_visible_bell (terminal, g_value_get_boolean (value));
+ vte_view_set_visible_bell (terminal, g_value_get_boolean (value));
break;
case PROP_FONT_SCALE:
- vte_terminal_set_font_scale (terminal, g_value_get_double (value));
+ vte_view_set_font_scale (terminal, g_value_get_double (value));
break;
/* Not writable */
@@ -10996,7 +10996,7 @@ vte_terminal_set_property (GObject *object,
/* Initialize methods. */
static void
-vte_terminal_class_init(VteTerminalClass *klass)
+vte_view_class_init(VteViewClass *klass)
{
GObjectClass *gobject_class;
GtkWidgetClass *widget_class;
@@ -11006,21 +11006,21 @@ vte_terminal_class_init(VteTerminalClass *klass)
{
_vte_debug_init();
_vte_debug_print(VTE_DEBUG_LIFECYCLE,
- "vte_terminal_class_init()\n");
+ "vte_view_class_init()\n");
/* print out the legend */
_vte_debug_print(VTE_DEBUG_WORK,
"Debugging work flow (top input to bottom output):\n"
- " . _vte_terminal_process_incoming\n"
+ " . _vte_view_process_incoming\n"
" < start process_timeout\n"
" {[ start update_timeout [ => rate limited\n"
" T start of terminal in update_timeout\n"
- " ( start _vte_terminal_process_incoming\n"
+ " ( start _vte_view_process_incoming\n"
" ? _vte_invalidate_cells (call)\n"
" ! _vte_invalidate_cells (dirty)\n"
" * _vte_invalidate_all\n"
- " ) end _vte_terminal_process_incoming\n"
+ " ) end _vte_view_process_incoming\n"
" - gdk_window_process_updates\n"
- " = vte_terminal_draw\n"
+ " = vte_view_draw\n"
" ]} end update_timeout\n"
" > end process_timeout\n");
}
@@ -11031,35 +11031,35 @@ vte_terminal_class_init(VteTerminalClass *klass)
bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
#endif
- g_type_class_add_private(klass, sizeof (VteTerminalPrivate));
+ g_type_class_add_private(klass, sizeof (VteViewPrivate));
gobject_class = G_OBJECT_CLASS(klass);
widget_class = GTK_WIDGET_CLASS(klass);
/* Override some of the default handlers. */
- gobject_class->finalize = vte_terminal_finalize;
- gobject_class->get_property = vte_terminal_get_property;
- gobject_class->set_property = vte_terminal_set_property;
- widget_class->realize = vte_terminal_realize;
- widget_class->scroll_event = vte_terminal_scroll;
- widget_class->draw = vte_terminal_draw;
- widget_class->key_press_event = vte_terminal_key_press;
- widget_class->key_release_event = vte_terminal_key_release;
- widget_class->button_press_event = vte_terminal_button_press;
- widget_class->button_release_event = vte_terminal_button_release;
- widget_class->motion_notify_event = vte_terminal_motion_notify;
- widget_class->enter_notify_event = vte_terminal_enter;
- widget_class->leave_notify_event = vte_terminal_leave;
- widget_class->focus_in_event = vte_terminal_focus_in;
- widget_class->focus_out_event = vte_terminal_focus_out;
- widget_class->visibility_notify_event = vte_terminal_visibility_notify;
- widget_class->unrealize = vte_terminal_unrealize;
- widget_class->style_updated = vte_terminal_style_updated;
- widget_class->get_preferred_width = vte_terminal_get_preferred_width;
- widget_class->get_preferred_height = vte_terminal_get_preferred_height;
- widget_class->size_allocate = vte_terminal_size_allocate;
- widget_class->get_accessible = vte_terminal_get_accessible;
- widget_class->screen_changed = vte_terminal_screen_changed;
+ gobject_class->finalize = vte_view_finalize;
+ gobject_class->get_property = vte_view_get_property;
+ gobject_class->set_property = vte_view_set_property;
+ widget_class->realize = vte_view_realize;
+ widget_class->scroll_event = vte_view_scroll;
+ widget_class->draw = vte_view_draw;
+ widget_class->key_press_event = vte_view_key_press;
+ widget_class->key_release_event = vte_view_key_release;
+ widget_class->button_press_event = vte_view_button_press;
+ widget_class->button_release_event = vte_view_button_release;
+ widget_class->motion_notify_event = vte_view_motion_notify;
+ widget_class->enter_notify_event = vte_view_enter;
+ widget_class->leave_notify_event = vte_view_leave;
+ widget_class->focus_in_event = vte_view_focus_in;
+ widget_class->focus_out_event = vte_view_focus_out;
+ widget_class->visibility_notify_event = vte_view_visibility_notify;
+ widget_class->unrealize = vte_view_unrealize;
+ widget_class->style_updated = vte_view_style_updated;
+ widget_class->get_preferred_width = vte_view_get_preferred_width;
+ widget_class->get_preferred_height = vte_view_get_preferred_height;
+ widget_class->size_allocate = vte_view_size_allocate;
+ widget_class->get_accessible = vte_view_get_accessible;
+ widget_class->screen_changed = vte_view_screen_changed;
/* Initialize default handlers. */
klass->char_size_changed = NULL;
@@ -11070,10 +11070,10 @@ vte_terminal_class_init(VteTerminalClass *klass)
klass->text_scrolled = NULL;
- klass->copy_clipboard = vte_terminal_real_copy_clipboard;
- klass->paste_clipboard = vte_terminal_real_paste_clipboard;
- klass->copy_primary = vte_terminal_real_copy_primary;
- klass->paste_primary = vte_terminal_real_paste_primary;
+ klass->copy_clipboard = vte_view_real_copy_clipboard;
+ klass->paste_clipboard = vte_view_real_paste_clipboard;
+ klass->copy_primary = vte_view_real_copy_primary;
+ klass->paste_primary = vte_view_real_paste_primary;
/* GtkScrollable interface properties */
g_object_class_override_property (gobject_class, PROP_HADJUSTMENT, "hadjustment");
@@ -11084,7 +11084,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
/* Register some signals of our own. */
/**
- * VteTerminal::buffer-changed:
+ * VteView::buffer-changed:
* @terminal: the object which received the signal
* @previous_buffer: the previous buffer, or %NULL if there was none
*
@@ -11094,7 +11094,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
g_signal_new(I_("buffer-changed"),
G_OBJECT_CLASS_TYPE(klass),
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(VteTerminalClass, buffer_changed),
+ G_STRUCT_OFFSET(VteViewClass, buffer_changed),
NULL,
NULL,
g_cclosure_marshal_VOID__OBJECT,
@@ -11102,7 +11102,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
1, G_TYPE_OBJECT);
/**
- * VteTerminal::char-size-changed:
+ * VteView::char-size-changed:
* @vteterminal: the object which received the signal
* @width: the new character cell width
* @height: the new character cell height
@@ -11113,14 +11113,14 @@ vte_terminal_class_init(VteTerminalClass *klass)
g_signal_new(I_("char-size-changed"),
G_OBJECT_CLASS_TYPE(klass),
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(VteTerminalClass, char_size_changed),
+ G_STRUCT_OFFSET(VteViewClass, char_size_changed),
NULL,
NULL,
_vte_marshal_VOID__UINT_UINT,
G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT);
/**
- * VteTerminal::selection-changed:
+ * VteView::selection-changed:
* @vteterminal: the object which received the signal
*
* Emitted whenever the contents of terminal's selection changes.
@@ -11128,14 +11128,14 @@ vte_terminal_class_init(VteTerminalClass *klass)
g_signal_new (I_("selection-changed"),
G_OBJECT_CLASS_TYPE(klass),
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(VteTerminalClass, selection_changed),
+ G_STRUCT_OFFSET(VteViewClass, selection_changed),
NULL,
NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
/**
- * VteTerminal::increase-font-size:
+ * VteView::increase-font-size:
* @vteterminal: the object which received the signal
*
* Emitted when the user hits the '+' key while holding the Control key.
@@ -11143,14 +11143,14 @@ vte_terminal_class_init(VteTerminalClass *klass)
g_signal_new(I_("increase-font-size"),
G_OBJECT_CLASS_TYPE(klass),
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(VteTerminalClass, increase_font_size),
+ G_STRUCT_OFFSET(VteViewClass, increase_font_size),
NULL,
NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
/**
- * VteTerminal::decrease-font-size:
+ * VteView::decrease-font-size:
* @vteterminal: the object which received the signal
*
* Emitted when the user hits the '-' key while holding the Control key.
@@ -11158,14 +11158,14 @@ vte_terminal_class_init(VteTerminalClass *klass)
g_signal_new(I_("decrease-font-size"),
G_OBJECT_CLASS_TYPE(klass),
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(VteTerminalClass, decrease_font_size),
+ G_STRUCT_OFFSET(VteViewClass, decrease_font_size),
NULL,
NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
/**
- * VteTerminal::text-scrolled:
+ * VteView::text-scrolled:
* @vteterminal: the object which received the signal
* @delta: the number of lines scrolled
*
@@ -11176,14 +11176,14 @@ vte_terminal_class_init(VteTerminalClass *klass)
g_signal_new(I_("text-scrolled"),
G_OBJECT_CLASS_TYPE(klass),
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(VteTerminalClass, text_scrolled),
+ G_STRUCT_OFFSET(VteViewClass, text_scrolled),
NULL,
NULL,
g_cclosure_marshal_VOID__INT,
G_TYPE_NONE, 1, G_TYPE_INT);
/**
- * VteTerminal::copy-clipboard:
+ * VteView::copy-clipboard:
* @vteterminal: the object which received the signal
*
* A keybinding signal that is emitted to copy the selection to the
@@ -11193,14 +11193,14 @@ vte_terminal_class_init(VteTerminalClass *klass)
g_signal_new(I_("copy-clipboard"),
G_OBJECT_CLASS_TYPE(klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
- G_STRUCT_OFFSET(VteTerminalClass, copy_clipboard),
+ G_STRUCT_OFFSET(VteViewClass, copy_clipboard),
NULL,
NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
/**
- * VteTerminal::paste-clipboard:
+ * VteView::paste-clipboard:
* @vteterminal: the object which received the signal
*
* A keybinding signal that is emitted to paste the data from the
@@ -11210,14 +11210,14 @@ vte_terminal_class_init(VteTerminalClass *klass)
g_signal_new(I_("paste-clipboard"),
G_OBJECT_CLASS_TYPE(klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
- G_STRUCT_OFFSET(VteTerminalClass, paste_clipboard),
+ G_STRUCT_OFFSET(VteViewClass, paste_clipboard),
NULL,
NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
/**
- * VteTerminal::copy-primary:
+ * VteView::copy-primary:
* @vteterminal: the object which received the signal
*
* A keybinding signal that is emitted to copy the selection to the
@@ -11227,14 +11227,14 @@ vte_terminal_class_init(VteTerminalClass *klass)
g_signal_new(I_("copy-primary"),
G_OBJECT_CLASS_TYPE(klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
- G_STRUCT_OFFSET(VteTerminalClass, copy_primary),
+ G_STRUCT_OFFSET(VteViewClass, copy_primary),
NULL,
NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
/**
- * VteTerminal::paste-primary:
+ * VteView::paste-primary:
* @vteterminal: the object which received the signal
*
* A keybinding signal that is emitted to paste the data from the
@@ -11244,14 +11244,14 @@ vte_terminal_class_init(VteTerminalClass *klass)
g_signal_new(I_("paste-primary"),
G_OBJECT_CLASS_TYPE(klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
- G_STRUCT_OFFSET(VteTerminalClass, paste_primary),
+ G_STRUCT_OFFSET(VteViewClass, paste_primary),
NULL,
NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
/**
- * VteTerminal:buffer:
+ * VteView:buffer:
*
* The terminal's buffer.
*
@@ -11265,7 +11265,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:audible-bell:
+ * VteView:audible-bell:
*
* Controls whether or not the terminal will beep when the child outputs the
* "bl" sequence.
@@ -11280,7 +11280,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:font-scale:
+ * VteView:font-scale:
*
* The terminal's font scale.
*
@@ -11296,7 +11296,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:pointer-autohide:
+ * VteView:pointer-autohide:
*
* Controls the value of the terminal's mouse autohide setting. When autohiding
* is enabled, the mouse cursor will be hidden when the user presses a key and
@@ -11312,7 +11312,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:scroll-on-keystroke:
+ * VteView:scroll-on-keystroke:
*
* Controls whether or not the terminal will forcibly scroll to the bottom of
* the viewable history when the user presses a key. Modifier keys do not
@@ -11328,7 +11328,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:scroll-on-output:
+ * VteView:scroll-on-output:
*
* Controls whether or not the terminal will forcibly scroll to the bottom of
* the viewable history when the new data is received from the child.
@@ -11343,7 +11343,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:word-chars:
+ * VteView:word-chars:
*
* When the user double-clicks to start selection, the terminal will extend
* the selection on word boundaries. It will treat characters the word-chars
@@ -11363,7 +11363,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:visible-bell:
+ * VteView:visible-bell:
*
* Controls whether the terminal will present a visible bell to the
* user when the child outputs the "bl" sequence. The terminal
@@ -11381,7 +11381,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
/* Style properties */
/**
- * VteTerminal:allow-bold:
+ * VteView:allow-bold:
*
* Controls whether or not the terminal will attempt to draw bold text.
* This may happen either by using a bold font variant, or by
@@ -11396,7 +11396,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:background-pattern:
+ * VteView:background-pattern:
*
* A #cairo_pattern_t to use as background.
* Must not have extends %CAIRO_EXTEND_NONE.
@@ -11410,7 +11410,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:cursor-blink-mode:
+ * VteView:cursor-blink-mode:
*
* Sets whether or not the cursor will blink. Using %VTE_CURSOR_BLINK_SYSTEM
* will use the #GtkSettings::gtk-cursor-blink setting.
@@ -11425,7 +11425,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:cursor-shape:
+ * VteView:cursor-shape:
*
* Controls the shape of the cursor.
*
@@ -11439,7 +11439,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:font:
+ * VteView:font:
*
* Specifies the font used for rendering all text displayed by the terminal.
* Must be a monospaced font!
@@ -11453,7 +11453,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:scroll-background:
+ * VteView:scroll-background:
*
* Controls whether or not the terminal will scroll the background image (if
* one is set) when the text in the window must be scrolled.
@@ -11468,7 +11468,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
/**
- * VteTerminal:reverse:
+ * VteView:reverse:
*
* In reverse mode, the terminal draws everything with foreground and
* background colours reversed.
@@ -11491,12 +11491,12 @@ vte_terminal_class_init(VteTerminalClass *klass)
#include "vtepalettedefs.h"
/**
- * VteTerminal:cursor-effect:
+ * VteView:cursor-effect:
*
* Controls how the terminal will draw the cursor.
*
* If set to %VTE_EFFECT_COLOR, the cursor is drawn
- * with the background color from the #VteTerminal:cursor-background-color
+ * with the background color from the #VteView:cursor-background-color
* style property.
*
* Since: 0.30
@@ -11509,12 +11509,12 @@ vte_terminal_class_init(VteTerminalClass *klass)
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:reverse-effect:
+ * VteView:reverse-effect:
*
* Controls how the terminal will draw reversed text.
*
* If set to %VTE_EFFECT_COLOR, reversed text is drawn
- * with the background color from the #VteTerminal:reverse-background-color
+ * with the background color from the #VteView:reverse-background-color
* style property.
*
* Since: 0.30
@@ -11527,12 +11527,12 @@ vte_terminal_class_init(VteTerminalClass *klass)
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:selection-effect:
+ * VteView:selection-effect:
*
* Controls how the terminal will draw selected text.
*
* If set to %VTE_EFFECT_COLOR, selected text is drawn
- * with the background color from the #VteTerminal:selection-background-color
+ * with the background color from the #VteView:selection-background-color
* style property.
*
* Since: 0.30
@@ -11554,36 +11554,36 @@ vte_terminal_class_init(VteTerminalClass *klass)
process_timer = g_timer_new ();
- klass->priv = G_TYPE_CLASS_GET_PRIVATE (klass, VTE_TYPE_TERMINAL, VteTerminalClassPrivate);
+ klass->priv = G_TYPE_CLASS_GET_PRIVATE (klass, VTE_TYPE_VIEW, VteViewClassPrivate);
klass->priv->style_provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ());
gtk_css_provider_load_from_data (GTK_CSS_PROVIDER (klass->priv->style_provider),
- "VteTerminal {\n"
+ "VteView {\n"
"padding: 1 1 1 1;\n"
- "-VteTerminal-allow-bold: true;\n"
- "-VteTerminal-cursor-blink-mode: system;\n"
- "-VteTerminal-cursor-shape: block;\n"
- "-VteTerminal-font: Monospace 10;\n"
- "-VteTerminal-scroll-background: false;\n"
+ "-VteView-allow-bold: true;\n"
+ "-VteView-cursor-blink-mode: system;\n"
+ "-VteView-cursor-shape: block;\n"
+ "-VteView-font: Monospace 10;\n"
+ "-VteView-scroll-background: false;\n"
#include "vtepalettecss.h"
"}\n",
-1, NULL);
}
/**
- * vte_terminal_set_audible_bell:
- * @terminal: a #VteTerminal
+ * vte_view_set_audible_bell:
+ * @terminal: a #VteView
* @is_audible: %TRUE if the terminal should beep
*
* Controls whether or not the terminal will beep when the child outputs the
* "bl" sequence.
*/
void
-vte_terminal_set_audible_bell(VteTerminal *terminal, gboolean is_audible)
+vte_view_set_audible_bell(VteView *terminal, gboolean is_audible)
{
- VteTerminalPrivate *pvt;
+ VteViewPrivate *pvt;
- g_return_if_fail(VTE_IS_TERMINAL(terminal));
+ g_return_if_fail(VTE_IS_VIEW(terminal));
pvt = terminal->pvt;
@@ -11597,8 +11597,8 @@ vte_terminal_set_audible_bell(VteTerminal *terminal, gboolean is_audible)
}
/**
- * vte_terminal_get_audible_bell:
- * @terminal: a #VteTerminal
+ * vte_view_get_audible_bell:
+ * @terminal: a #VteView
*
* Checks whether or not the terminal will beep when the child outputs the
* "bl" sequence.
@@ -11606,15 +11606,15 @@ vte_terminal_set_audible_bell(VteTerminal *terminal, gboolean is_audible)
* Returns: %TRUE if audible bell is enabled, %FALSE if not
*/
gboolean
-vte_terminal_get_audible_bell(VteTerminal *terminal)
+vte_view_get_audible_bell(VteView *terminal)
{
- g_return_val_if_fail(VTE_IS_TERMINAL(terminal), FALSE);
+ g_return_val_if_fail(VTE_IS_VIEW(terminal), FALSE);
return terminal->pvt->audible_bell;
}
/**
- * vte_terminal_set_visible_bell:
- * @terminal: a #VteTerminal
+ * vte_view_set_visible_bell:
+ * @terminal: a #VteView
* @is_visible: whether the terminal should flash on bell
*
* Controls whether or not the terminal will present a visible bell to the
@@ -11623,11 +11623,11 @@ vte_terminal_get_audible_bell(VteTerminal *terminal)
*
*/
void
-vte_terminal_set_visible_bell(VteTerminal *terminal, gboolean is_visible)
+vte_view_set_visible_bell(VteView *terminal, gboolean is_visible)
{
- VteTerminalPrivate *pvt;
+ VteViewPrivate *pvt;
- g_return_if_fail(VTE_IS_TERMINAL(terminal));
+ g_return_if_fail(VTE_IS_VIEW(terminal));
pvt = terminal->pvt;
@@ -11641,8 +11641,8 @@ vte_terminal_set_visible_bell(VteTerminal *terminal, gboolean is_visible)
}
/**
- * vte_terminal_get_visible_bell:
- * @terminal: a #VteTerminal
+ * vte_view_get_visible_bell:
+ * @terminal: a #VteView
*
* Checks whether or not the terminal will present a visible bell to the
* user when the child outputs the "bl" sequence. The terminal
@@ -11651,30 +11651,30 @@ vte_terminal_set_visible_bell(VteTerminal *terminal, gboolean is_visible)
* Returns: %TRUE if visible bell is enabled, %FALSE if not
*/
gboolean
-vte_terminal_get_visible_bell(VteTerminal *terminal)
+vte_view_get_visible_bell(VteView *terminal)
{
- g_return_val_if_fail(VTE_IS_TERMINAL(terminal), FALSE);
+ g_return_val_if_fail(VTE_IS_VIEW(terminal), FALSE);
return terminal->pvt->visible_bell;
}
/**
- * vte_terminal_set_scroll_on_output:
- * @terminal: a #VteTerminal
+ * vte_view_set_scroll_on_output:
+ * @terminal: a #VteView
* @scroll: whether the terminal should scroll on output
*
* Controls whether or not the terminal will forcibly scroll to the bottom of
* the viewable history when the new data is received from the child.
*/
void
-vte_terminal_set_scroll_on_output(VteTerminal *terminal, gboolean scroll)
+vte_view_set_scroll_on_output(VteView *terminal, gboolean scroll)
{
- g_return_if_fail(VTE_IS_TERMINAL(terminal));
+ g_return_if_fail(VTE_IS_VIEW(terminal));
terminal->pvt->scroll_on_output = scroll;
}
/**
- * vte_terminal_set_scroll_on_keystroke:
- * @terminal: a #VteTerminal
+ * vte_view_set_scroll_on_keystroke:
+ * @terminal: a #VteView
* @scroll: whether the terminal should scroll on keystrokes
*
* Controls whether or not the terminal will forcibly scroll to the bottom of
@@ -11682,11 +11682,11 @@ vte_terminal_set_scroll_on_output(VteTerminal *terminal, gboolean scroll)
* trigger this behavior.
*/
void
-vte_terminal_set_scroll_on_keystroke(VteTerminal *terminal, gboolean scroll)
+vte_view_set_scroll_on_keystroke(VteView *terminal, gboolean scroll)
{
- VteTerminalPrivate *pvt;
+ VteViewPrivate *pvt;
- g_return_if_fail(VTE_IS_TERMINAL(terminal));
+ g_return_if_fail(VTE_IS_VIEW(terminal));
pvt = terminal->pvt;
@@ -11700,8 +11700,8 @@ vte_terminal_set_scroll_on_keystroke(VteTerminal *terminal, gboolean scroll)
}
/**
- * vte_terminal_paste_clipboard:
- * @terminal: a #VteTerminal
+ * vte_view_paste_clipboard:
+ * @terminal: a #VteView
* @clipboard: a #GtkClipboard
*
* Sends the contents of @clipboard to the terminal's child.
@@ -11709,23 +11709,23 @@ vte_terminal_set_scroll_on_keystroke(VteTerminal *terminal, gboolean scroll)
* terminal's current encoding.
*/
void
-vte_terminal_paste_clipboard(VteTerminal *terminal,
+vte_view_paste_clipboard(VteView *terminal,
GtkClipboard *clipboard)
{
- g_return_if_fail(VTE_IS_TERMINAL(terminal));
+ g_return_if_fail(VTE_IS_VIEW(terminal));
g_return_if_fail(GTK_IS_CLIPBOARD(clipboard));
_vte_debug_print(VTE_DEBUG_SELECTION,
"Requesting clipboard contents.\n");
gtk_clipboard_request_text(clipboard,
- vte_terminal_paste_cb,
+ vte_view_paste_cb,
terminal);
/* FIXMEchpe! this crashes if the terminal is destroyed before the paste is received! */
}
/**
- * vte_terminal_im_append_menuitems:
- * @terminal: a #VteTerminal
+ * vte_view_im_append_menuitems:
+ * @terminal: a #VteView
* @menushell: a GtkMenuShell
*
* Appends menu items for various input methods to the given menu. The
@@ -11733,10 +11733,10 @@ vte_terminal_paste_clipboard(VteTerminal *terminal,
* the terminal.
*/
void
-vte_terminal_im_append_menuitems(VteTerminal *terminal, GtkMenuShell *menushell)
+vte_view_im_append_menuitems(VteView *terminal, GtkMenuShell *menushell)
{
GtkIMMulticontext *context;
- g_return_if_fail(VTE_IS_TERMINAL(terminal));
+ g_return_if_fail(VTE_IS_VIEW(terminal));
g_return_if_fail (gtk_widget_get_realized (&terminal->widget));
g_return_if_fail(GTK_IS_MENU_SHELL(menushell));
context = GTK_IM_MULTICONTEXT(terminal->pvt->im_context);
@@ -11745,7 +11745,7 @@ vte_terminal_im_append_menuitems(VteTerminal *terminal, GtkMenuShell *menushell)
/* Set up whatever background we wanted. */
static gboolean
-vte_terminal_background_update(VteTerminal *terminal)
+vte_view_background_update(VteView *terminal)
{
/* If we're not realized yet, don't worry about it, because we get
* called when we realize. */
@@ -11776,7 +11776,7 @@ vte_terminal_background_update(VteTerminal *terminal)
* opaque move tables to screw us, we don't end up with an insane backlog
* of updates after the user finishes moving us. */
static void
-vte_terminal_queue_background_update(VteTerminal *terminal)
+vte_view_queue_background_update(VteView *terminal)
{
_vte_debug_print(VTE_DEBUG_EVENTS,
"Queued background update.\n");
@@ -11786,8 +11786,8 @@ vte_terminal_queue_background_update(VteTerminal *terminal)
}
/**
- * vte_terminal_get_has_selection:
- * @terminal: a #VteTerminal
+ * vte_view_get_has_selection:
+ * @terminal: a #VteView
*
* Checks if the terminal currently contains selected text. Note that this
* is different from determining if the terminal is the owner of any
@@ -11796,15 +11796,15 @@ vte_terminal_queue_background_update(VteTerminal *terminal)
* Returns: %TRUE if part of the text in the terminal is selected.
*/
gboolean
-vte_terminal_get_has_selection(VteTerminal *terminal)
+vte_view_get_has_selection(VteView *terminal)
{
- g_return_val_if_fail(VTE_IS_TERMINAL(terminal), FALSE);
+ g_return_val_if_fail(VTE_IS_VIEW(terminal), FALSE);
return terminal->pvt->has_selection;
}
/**
- * vte_terminal_get_selection_bounds:
- * @terminal: a #VteTerminal
+ * vte_view_get_selection_bounds:
+ * @terminal: a #VteView
* @start: (allow-none): a #VteBufferIter, or %NULL
* @end: (allow-none): a #VteBufferIter, or %NULL
*
@@ -11814,14 +11814,14 @@ vte_terminal_get_has_selection(VteTerminal *terminal)
* Returns: %TRUE if there is text selected in @terminal
*/
gboolean
-vte_terminal_get_selection_bounds(VteTerminal *terminal,
+vte_view_get_selection_bounds(VteView *terminal,
VteBufferIter *start,
VteBufferIter *end)
{
- VteTerminalPrivate *pvt;
+ VteViewPrivate *pvt;
VteBufferIterReal *real_start, *real_end;
- g_return_val_if_fail(VTE_IS_TERMINAL(terminal), FALSE);
+ g_return_val_if_fail(VTE_IS_VIEW(terminal), FALSE);
pvt = terminal->pvt;
if (pvt->buffer == NULL)
@@ -11845,9 +11845,9 @@ vte_terminal_get_selection_bounds(VteTerminal *terminal,
}
static void
-vte_terminal_set_cursor_blinks_internal(VteTerminal *terminal, gboolean blink)
+vte_view_set_cursor_blinks_internal(VteView *terminal, gboolean blink)
{
- VteTerminalPrivate *pvt = terminal->pvt;
+ VteViewPrivate *pvt = terminal->pvt;
blink = !!blink;
if (pvt->cursor_blinks == blink)
@@ -11933,8 +11933,8 @@ vte_buffer_set_scrollback_lines(VteBuffer *buffer,
/* Adjust the scrollbars to the new locations. */
if (buffer->pvt->terminal) {
- vte_terminal_queue_adjustment_value_changed (buffer->pvt->terminal, scroll_delta);
- _vte_terminal_adjust_adjustments_full (buffer->pvt->terminal);
+ vte_view_queue_adjustment_value_changed (buffer->pvt->terminal, scroll_delta);
+ _vte_view_adjust_adjustments_full (buffer->pvt->terminal);
}
g_object_notify(object, "scrollback-lines");
@@ -11943,8 +11943,8 @@ vte_buffer_set_scrollback_lines(VteBuffer *buffer,
}
/**
- * vte_terminal_set_word_chars:
- * @terminal: a #VteTerminal
+ * vte_view_set_word_chars:
+ * @terminal: a #VteView
* @spec: a specification
*
* When the user double-clicks to start selection, the terminal will extend
@@ -11956,14 +11956,14 @@ vte_buffer_set_scrollback_lines(VteBuffer *buffer,
* treat all graphic non-punctuation non-space characters as word characters.
*/
void
-vte_terminal_set_word_chars(VteTerminal *terminal, const char *spec)
+vte_view_set_word_chars(VteView *terminal, const char *spec)
{
VteBuffer *buffer;
gunichar *wbuf;
glong len, i;
VteWordCharRange range;
- g_return_if_fail(VTE_IS_TERMINAL(terminal));
+ g_return_if_fail(VTE_IS_VIEW(terminal));
buffer = terminal->pvt->buffer;
@@ -12079,21 +12079,21 @@ vte_buffer_set_delete_binding(VteBuffer *buffer,
}
/**
- * vte_terminal_set_mouse_autohide:
- * @terminal: a #VteTerminal
+ * vte_view_set_mouse_autohide:
+ * @terminal: a #VteView
* @setting: whether the mouse pointer should autohide
*
* Changes the value of the terminal's mouse autohide setting. When autohiding
* is enabled, the mouse cursor will be hidden when the user presses a key and
* shown when the user moves the mouse. This setting can be read using
- * vte_terminal_get_mouse_autohide().
+ * vte_view_get_mouse_autohide().
*/
void
-vte_terminal_set_mouse_autohide(VteTerminal *terminal, gboolean setting)
+vte_view_set_mouse_autohide(VteView *terminal, gboolean setting)
{
- VteTerminalPrivate *pvt;
+ VteViewPrivate *pvt;
- g_return_if_fail(VTE_IS_TERMINAL(terminal));
+ g_return_if_fail(VTE_IS_VIEW(terminal));
pvt = terminal->pvt;
@@ -12107,20 +12107,20 @@ vte_terminal_set_mouse_autohide(VteTerminal *terminal, gboolean setting)
}
/**
- * vte_terminal_get_mouse_autohide:
- * @terminal: a #VteTerminal
+ * vte_view_get_mouse_autohide:
+ * @terminal: a #VteView
*
* Determines the value of the terminal's mouse autohide setting. When
* autohiding is enabled, the mouse cursor will be hidden when the user presses
* a key and shown when the user moves the mouse. This setting can be changed
- * using vte_terminal_set_mouse_autohide().
+ * using vte_view_set_mouse_autohide().
*
* Returns: %TRUE if autohiding is enabled, %FALSE if not
*/
gboolean
-vte_terminal_get_mouse_autohide(VteTerminal *terminal)
+vte_view_get_mouse_autohide(VteView *terminal)
{
- g_return_val_if_fail(VTE_IS_TERMINAL(terminal), FALSE);
+ g_return_val_if_fail(VTE_IS_VIEW(terminal), FALSE);
return terminal->pvt->mouse_autohide;
}
@@ -12142,7 +12142,7 @@ vte_buffer_reset(VteBuffer *buffer,
gboolean clear_history)
{
VteBufferPrivate *pvt;
- VteTerminal *terminal;
+ VteView *terminal;
g_return_if_fail(VTE_IS_BUFFER(buffer));
@@ -12152,7 +12152,7 @@ vte_buffer_reset(VteBuffer *buffer,
g_object_freeze_notify(G_OBJECT(buffer));
/* Stop processing any of the data we've got backed up. */
- vte_terminal_stop_processing (terminal);
+ vte_view_stop_processing (terminal);
/* Clear the input and output buffers. */
_vte_incoming_chunks_release (pvt->incoming);
@@ -12162,7 +12162,7 @@ vte_buffer_reset(VteBuffer *buffer,
/* Reset charset substitution state. */
_vte_iso2022_state_free(pvt->iso2022);
pvt->iso2022 = _vte_iso2022_state_new(NULL,
- &_vte_terminal_codeset_changed_cb,
+ &_vte_view_codeset_changed_cb,
buffer);
_vte_iso2022_state_set_codeset(pvt->iso2022,
pvt->encoding);
@@ -12187,7 +12187,7 @@ vte_buffer_reset(VteBuffer *buffer,
pvt->dec_saved = g_hash_table_new(NULL, NULL);
}
/* Reset the color palette. */
- vte_terminal_update_style_colors(terminal, TRUE);
+ vte_view_update_style_colors(terminal, TRUE);
/* Reset the default attributes. Reset the alternate attribute because
* it's not a real attribute, but we need to treat it as one here. */
_vte_screen_set_default_attributes(&pvt->alternate_screen);
@@ -12214,7 +12214,7 @@ vte_buffer_reset(VteBuffer *buffer,
pvt->alternate_screen.cursor_current.col = 0;
pvt->alternate_screen.scroll_delta = 0;
pvt->alternate_screen.insert_delta = 0;
- _vte_terminal_adjust_adjustments_full (terminal);
+ _vte_view_adjust_adjustments_full (terminal);
}
/* Clear the status lines. */
pvt->normal_screen.status_line = FALSE;
@@ -12256,7 +12256,7 @@ vte_buffer_reset(VteBuffer *buffer,
vte_buffer_set_encoding(buffer, NULL);
g_assert(pvt->encoding != NULL);
/* Reset selection. */
- vte_terminal_deselect_all(terminal);
+ vte_view_deselect_all(terminal);
terminal->pvt->has_selection = FALSE;
terminal->pvt->selecting = FALSE;
terminal->pvt->selecting_restart = FALSE;
@@ -12283,7 +12283,7 @@ vte_buffer_reset(VteBuffer *buffer,
/* Clear modifiers. */
terminal->pvt->modifiers = 0;
/* Cause everything to be redrawn (or cleared). */
- vte_terminal_maybe_scroll_to_bottom(terminal);
+ vte_view_maybe_scroll_to_bottom(terminal);
_vte_invalidate_all(terminal);
g_object_thaw_notify(G_OBJECT(buffer));
@@ -12309,30 +12309,30 @@ vte_buffer_get_status_line(VteBuffer *buffer)
}
/**
- * vte_terminal_get_char_width:
- * @terminal: a #VteTerminal
+ * vte_view_get_char_width:
+ * @terminal: a #VteView
*
* Returns: the width of a character cell
*/
glong
-vte_terminal_get_char_width(VteTerminal *terminal)
+vte_view_get_char_width(VteView *terminal)
{
- g_return_val_if_fail(VTE_IS_TERMINAL(terminal), -1);
- vte_terminal_ensure_font (terminal);
+ g_return_val_if_fail(VTE_IS_VIEW(terminal), -1);
+ vte_view_ensure_font (terminal);
return terminal->pvt->char_width;
}
/**
- * vte_terminal_get_char_height:
- * @terminal: a #VteTerminal
+ * vte_view_get_char_height:
+ * @terminal: a #VteView
*
* Returns: the height of a character cell
*/
glong
-vte_terminal_get_char_height(VteTerminal *terminal)
+vte_view_get_char_height(VteView *terminal)
{
- g_return_val_if_fail(VTE_IS_TERMINAL(terminal), -1);
- vte_terminal_ensure_font (terminal);
+ g_return_val_if_fail(VTE_IS_VIEW(terminal), -1);
+ vte_view_ensure_font (terminal);
return terminal->pvt->char_height;
}
@@ -12390,7 +12390,7 @@ vte_buffer_get_icon_title(VteBuffer *buffer)
/**
* vte_buffer_set_pty:
- * @terminal: a #VteTerminal
+ * @terminal: a #VteView
* @pty: (allow-none): a #VtePty, or %NULL
*
* Sets @pty as the PTY to use in @buffer.
@@ -12401,7 +12401,7 @@ vte_buffer_set_pty(VteBuffer *buffer,
VtePty *pty)
{
VteBufferPrivate *pvt;
- VteTerminal *terminal;
+ VteView *terminal;
GObject *object;
long flags;
int pty_master;
@@ -12439,7 +12439,7 @@ vte_buffer_set_pty(VteBuffer *buffer,
pvt->input_bytes = 0;
}
g_array_set_size(pvt->pending, 0);
- vte_terminal_stop_processing (terminal);
+ vte_view_stop_processing (terminal);
/* Clear the outgoing buffer as well. */
_vte_byte_array_clear(pvt->outgoing);
@@ -12499,7 +12499,7 @@ vte_buffer_set_pty(VteBuffer *buffer,
VtePty *
vte_buffer_get_pty(VteBuffer *buffer)
{
- g_return_val_if_fail (VTE_IS_TERMINAL (buffer), NULL);
+ g_return_val_if_fail (VTE_IS_VIEW (buffer), NULL);
return buffer->pvt->pty;
}
@@ -12507,11 +12507,11 @@ vte_buffer_get_pty(VteBuffer *buffer)
/* We need this bit of glue to ensure that accessible objects will always
* get signals. */
void
-_vte_terminal_accessible_ref(VteTerminal *terminal)
+_vte_view_accessible_ref(VteView *terminal)
{
VteBuffer *buffer;
- g_return_if_fail(VTE_IS_TERMINAL(terminal));
+ g_return_if_fail(VTE_IS_VIEW(terminal));
buffer = terminal->pvt->buffer;
if (buffer == NULL)
@@ -12521,19 +12521,19 @@ _vte_terminal_accessible_ref(VteTerminal *terminal)
}
char *
-_vte_terminal_get_selection(VteTerminal *terminal)
+_vte_view_get_selection(VteView *terminal)
{
- g_return_val_if_fail(VTE_IS_TERMINAL(terminal), NULL);
+ g_return_val_if_fail(VTE_IS_VIEW(terminal), NULL);
return g_strdup (terminal->pvt->selection);
}
void
-_vte_terminal_get_start_selection(VteTerminal *terminal, long *col, long *row)
+_vte_view_get_start_selection(VteView *terminal, long *col, long *row)
{
VteVisualPosition ss;
- g_return_if_fail(VTE_IS_TERMINAL(terminal));
+ g_return_if_fail(VTE_IS_VIEW(terminal));
ss = terminal->pvt->selection_start;
@@ -12547,11 +12547,11 @@ _vte_terminal_get_start_selection(VteTerminal *terminal, long *col, long *row)
}
void
-_vte_terminal_get_end_selection(VteTerminal *terminal, long *col, long *row)
+_vte_view_get_end_selection(VteView *terminal, long *col, long *row)
{
VteVisualPosition se;
- g_return_if_fail(VTE_IS_TERMINAL(terminal));
+ g_return_if_fail(VTE_IS_VIEW(terminal));
se = terminal->pvt->selection_end;
@@ -12565,14 +12565,14 @@ _vte_terminal_get_end_selection(VteTerminal *terminal, long *col, long *row)
}
void
-_vte_terminal_select_text(VteTerminal *terminal,
+_vte_view_select_text(VteView *terminal,
long start_col, long start_row,
long end_col, long end_row,
int start_offset, int end_offset)
{
- g_return_if_fail(VTE_IS_TERMINAL(terminal));
+ g_return_if_fail(VTE_IS_VIEW(terminal));
- vte_terminal_deselect_all (terminal);
+ vte_view_deselect_all (terminal);
terminal->pvt->selection_type = selection_type_char;
terminal->pvt->selecting_had_delta = TRUE;
@@ -12580,8 +12580,8 @@ _vte_terminal_select_text(VteTerminal *terminal,
terminal->pvt->selection_start.row = start_row;
terminal->pvt->selection_end.col = end_col;
terminal->pvt->selection_end.row = end_row;
- vte_terminal_emit_copy_primary(terminal);
- vte_terminal_emit_selection_changed(terminal);
+ vte_view_emit_copy_primary(terminal);
+ vte_view_emit_selection_changed(terminal);
_vte_invalidate_region (terminal,
MIN (start_col, end_col), MAX (start_col, end_col),
@@ -12591,20 +12591,20 @@ _vte_terminal_select_text(VteTerminal *terminal,
}
void
-_vte_terminal_remove_selection(VteTerminal *terminal)
+_vte_view_remove_selection(VteView *terminal)
{
- vte_terminal_deselect_all (terminal);
+ vte_view_deselect_all (terminal);
}
static void
-_vte_terminal_select_empty_at(VteTerminal *terminal,
+_vte_view_select_empty_at(VteView *terminal,
long col, long row)
{
- _vte_terminal_select_text(terminal, col, row, col - 1, row, 0, 0);
+ _vte_view_select_text(terminal, col, row, col - 1, row, 0, 0);
}
static void
-add_update_timeout (VteTerminal *terminal)
+add_update_timeout (VteView *terminal)
{
if (update_timeout_tag == 0) {
_vte_debug_print (VTE_DEBUG_TIMEOUT,
@@ -12631,7 +12631,7 @@ add_update_timeout (VteTerminal *terminal)
}
static void
-reset_update_regions (VteTerminal *terminal)
+reset_update_regions (VteView *terminal)
{
if (terminal->pvt->update_regions != NULL) {
g_slist_foreach (terminal->pvt->update_regions,
@@ -12646,7 +12646,7 @@ reset_update_regions (VteTerminal *terminal)
}
static void
-remove_from_active_list (VteTerminal *terminal)
+remove_from_active_list (VteView *terminal)
{
if (terminal->pvt->active != NULL
&& terminal->pvt->update_regions == NULL) {
@@ -12675,14 +12675,14 @@ remove_from_active_list (VteTerminal *terminal)
}
}
static void
-remove_update_timeout (VteTerminal *terminal)
+remove_update_timeout (VteView *terminal)
{
reset_update_regions (terminal);
remove_from_active_list (terminal);
}
static void
-vte_terminal_add_process_timeout (VteTerminal *terminal)
+vte_view_add_process_timeout (VteView *terminal)
{
_vte_debug_print(VTE_DEBUG_TIMEOUT,
"Adding terminal to active list\n");
@@ -12698,26 +12698,26 @@ vte_terminal_add_process_timeout (VteTerminal *terminal)
}
}
static inline gboolean
-vte_terminal_is_processing (VteTerminal *terminal)
+vte_view_is_processing (VteView *terminal)
{
return terminal->pvt->active != NULL;
}
static inline void
-vte_terminal_start_processing (VteTerminal *terminal)
+vte_view_start_processing (VteView *terminal)
{
- if (!vte_terminal_is_processing (terminal)) {
- vte_terminal_add_process_timeout (terminal);
+ if (!vte_view_is_processing (terminal)) {
+ vte_view_add_process_timeout (terminal);
}
}
static void
-vte_terminal_stop_processing (VteTerminal *terminal)
+vte_view_stop_processing (VteView *terminal)
{
remove_from_active_list (terminal);
}
static inline gboolean
-need_processing (VteTerminal *terminal)
+need_processing (VteView *terminal)
{
VteBuffer *buffer = terminal->pvt->buffer;
return _vte_incoming_chunks_length (buffer->pvt->incoming) != 0;
@@ -12742,7 +12742,7 @@ vte_buffer_emit_window_title_changed(VteBuffer *buffer)
}
static void
-vte_terminal_emit_pending_signals(VteTerminal *terminal)
+vte_view_emit_pending_signals(VteView *terminal)
{
VteBuffer *buffer;
GObject *object, *buffer_object;
@@ -12757,7 +12757,7 @@ vte_terminal_emit_pending_signals(VteTerminal *terminal)
g_object_freeze_notify(object);
g_object_freeze_notify(buffer_object);
- vte_terminal_emit_adjustment_changed (terminal);
+ vte_view_emit_adjustment_changed (terminal);
if (buffer->pvt->screen->status_line_changed) {
_vte_buffer_emit_status_line_changed (buffer);
@@ -12795,7 +12795,7 @@ vte_terminal_emit_pending_signals(VteTerminal *terminal)
g_object_thaw_notify(object);
}
-static void time_process_incoming (VteTerminal *terminal)
+static void time_process_incoming (VteView *terminal)
{
VteBuffer *buffer = terminal->pvt->buffer;
gdouble elapsed;
@@ -12828,7 +12828,7 @@ process_timeout (gpointer data)
g_list_length (active_terminals));
for (l = active_terminals; l != NULL; l = next) {
- VteTerminal *terminal = l->data;
+ VteView *terminal = l->data;
VteBuffer *buffer = terminal->pvt->buffer;
gboolean active = FALSE;
@@ -12855,7 +12855,7 @@ process_timeout (gpointer data)
}
buffer->pvt->input_bytes = 0;
} else
- vte_terminal_emit_pending_signals (terminal);
+ vte_view_emit_pending_signals (terminal);
if (!active && terminal->pvt->update_regions == NULL) {
if (terminal->pvt->active != NULL) {
_vte_debug_print(VTE_DEBUG_TIMEOUT,
@@ -12898,7 +12898,7 @@ process_timeout (gpointer data)
static gboolean
-update_regions (VteTerminal *terminal)
+update_regions (VteView *terminal)
{
GSList *l;
cairo_region_t *region;
@@ -12956,7 +12956,7 @@ update_repeat_timeout (gpointer data)
g_list_length (active_terminals));
for (l = active_terminals; l != NULL; l = next) {
- VteTerminal *terminal = l->data;
+ VteView *terminal = l->data;
VteBuffer *buffer = terminal->pvt->buffer;
next = g_list_next (l);
@@ -12974,9 +12974,9 @@ update_repeat_timeout (gpointer data)
_vte_buffer_enable_input_source (buffer);
}
if (terminal->pvt->bg_update_pending) {
- vte_terminal_background_update (terminal);
+ vte_view_background_update (terminal);
}
- vte_terminal_emit_adjustment_changed (terminal);
+ vte_view_emit_adjustment_changed (terminal);
if (need_processing (terminal)) {
if (VTE_MAX_PROCESS_TIME) {
time_process_incoming (terminal);
@@ -12985,7 +12985,7 @@ update_repeat_timeout (gpointer data)
}
buffer->pvt->input_bytes = 0;
} else
- vte_terminal_emit_pending_signals (terminal);
+ vte_view_emit_pending_signals (terminal);
again = update_regions (terminal);
if (!again) {
@@ -13061,7 +13061,7 @@ update_timeout (gpointer data)
}
for (l = active_terminals; l != NULL; l = next) {
- VteTerminal *terminal = l->data;
+ VteView *terminal = l->data;
VteBuffer *buffer = terminal->pvt->buffer;
next = g_list_next (l);
@@ -13079,9 +13079,9 @@ update_timeout (gpointer data)
_vte_buffer_enable_input_source (buffer);
}
if (terminal->pvt->bg_update_pending) {
- vte_terminal_background_update (terminal);
+ vte_view_background_update (terminal);
}
- vte_terminal_emit_adjustment_changed (terminal);
+ vte_view_emit_adjustment_changed (terminal);
if (need_processing (terminal)) {
if (VTE_MAX_PROCESS_TIME) {
time_process_incoming (terminal);
@@ -13090,7 +13090,7 @@ update_timeout (gpointer data)
}
buffer->pvt->input_bytes = 0;
} else
- vte_terminal_emit_pending_signals (terminal);
+ vte_view_emit_pending_signals (terminal);
redraw |= update_regions (terminal);
}
@@ -13162,8 +13162,8 @@ vte_buffer_write_contents_sync (VteBuffer *buffer,
/* TODO Add properties & signals */
/**
- * vte_terminal_search_set_gregex:
- * @terminal: a #VteTerminal
+ * vte_view_search_set_gregex:
+ * @terminal: a #VteView
* @regex: (allow-none): a #GRegex, or %NULL
* @flags: flags from #GRegexMatchFlags
*
@@ -13172,11 +13172,11 @@ vte_buffer_write_contents_sync (VteBuffer *buffer,
* Since: 0.26
*/
void
-vte_terminal_search_set_gregex (VteTerminal *terminal,
+vte_view_search_set_gregex (VteView *terminal,
GRegex *regex,
GRegexMatchFlags flags)
{
- g_return_if_fail(VTE_IS_TERMINAL(terminal));
+ g_return_if_fail(VTE_IS_VIEW(terminal));
if (terminal->pvt->search_regex == regex)
return;
@@ -13195,24 +13195,24 @@ vte_terminal_search_set_gregex (VteTerminal *terminal,
}
/**
- * vte_terminal_search_get_gregex:
- * @terminal: a #VteTerminal
+ * vte_view_search_get_gregex:
+ * @terminal: a #VteView
*
* Returns: (transfer none): the search #GRegex regex set in @terminal, or %NULL
*
* Since: 0.26
*/
GRegex *
-vte_terminal_search_get_gregex (VteTerminal *terminal)
+vte_view_search_get_gregex (VteView *terminal)
{
- g_return_val_if_fail(VTE_IS_TERMINAL(terminal), NULL);
+ g_return_val_if_fail(VTE_IS_VIEW(terminal), NULL);
return terminal->pvt->search_regex;
}
/**
- * vte_terminal_search_set_wrap_around:
- * @terminal: a #VteTerminal
+ * vte_view_search_set_wrap_around:
+ * @terminal: a #VteView
* @wrap_around: whether search should wrap
*
* Sets whether search should wrap around to the beginning of the
@@ -13221,37 +13221,37 @@ vte_terminal_search_get_gregex (VteTerminal *terminal)
* Since: 0.26
*/
void
-vte_terminal_search_set_wrap_around (VteTerminal *terminal,
+vte_view_search_set_wrap_around (VteView *terminal,
gboolean wrap_around)
{
- g_return_if_fail(VTE_IS_TERMINAL(terminal));
+ g_return_if_fail(VTE_IS_VIEW(terminal));
terminal->pvt->search_wrap_around = !!wrap_around;
}
/**
- * vte_terminal_search_get_wrap_around:
- * @terminal: a #VteTerminal
+ * vte_view_search_get_wrap_around:
+ * @terminal: a #VteView
*
* Returns: whether searching will wrap around
*
* Since: 0.26
*/
gboolean
-vte_terminal_search_get_wrap_around (VteTerminal *terminal)
+vte_view_search_get_wrap_around (VteView *terminal)
{
- g_return_val_if_fail(VTE_IS_TERMINAL(terminal), FALSE);
+ g_return_val_if_fail(VTE_IS_VIEW(terminal), FALSE);
return terminal->pvt->search_wrap_around;
}
static gboolean
-vte_terminal_search_rows (VteTerminal *terminal,
+vte_view_search_rows (VteView *terminal,
long start_row,
long end_row,
gboolean backward)
{
- VteTerminalPrivate *pvt;
+ VteViewPrivate *pvt;
VteBuffer *buffer;
char *row_text;
GMatchInfo *match_info;
@@ -13308,23 +13308,23 @@ vte_terminal_search_rows (VteTerminal *terminal,
g_free (row_text);
g_match_info_free (match_info);
- _vte_terminal_select_text (terminal, start_col, start_row, end_col, end_row, 0, 0);
+ _vte_view_select_text (terminal, start_col, start_row, end_col, end_row, 0, 0);
/* Quite possibly the math here should not access adjustment directly... */
value = gtk_adjustment_get_value(terminal->pvt->vadjustment);
page_size = gtk_adjustment_get_page_size(terminal->pvt->vadjustment);
if (backward) {
if (end_row < value || end_row >= value + page_size)
- vte_terminal_queue_adjustment_value_changed_clamped (terminal, end_row - page_size + 1);
+ vte_view_queue_adjustment_value_changed_clamped (terminal, end_row - page_size + 1);
} else {
if (start_row < value || start_row >= value + page_size)
- vte_terminal_queue_adjustment_value_changed_clamped (terminal, start_row);
+ vte_view_queue_adjustment_value_changed_clamped (terminal, start_row);
}
return TRUE;
}
static gboolean
-vte_terminal_search_rows_iter (VteTerminal *terminal,
+vte_view_search_rows_iter (VteView *terminal,
long start_row,
long end_row,
gboolean backward)
@@ -13343,7 +13343,7 @@ vte_terminal_search_rows_iter (VteTerminal *terminal,
row = _vte_screen_find_row_data(buffer->pvt->screen, iter_start_row);
} while (row && row->attr.soft_wrapped);
- if (vte_terminal_search_rows (terminal, iter_start_row, iter_end_row, backward))
+ if (vte_view_search_rows (terminal, iter_start_row, iter_end_row, backward))
return TRUE;
}
} else {
@@ -13356,7 +13356,7 @@ vte_terminal_search_rows_iter (VteTerminal *terminal,
iter_end_row++;
} while (row && row->attr.soft_wrapped);
- if (vte_terminal_search_rows (terminal, iter_start_row, iter_end_row, backward))
+ if (vte_view_search_rows (terminal, iter_start_row, iter_end_row, backward))
return TRUE;
}
}
@@ -13365,16 +13365,16 @@ vte_terminal_search_rows_iter (VteTerminal *terminal,
}
static gboolean
-vte_terminal_search_find (VteTerminal *terminal,
+vte_view_search_find (VteView *terminal,
gboolean backward)
{
- VteTerminalPrivate *pvt;
+ VteViewPrivate *pvt;
VteBuffer *buffer;
VteScreen *screen;
long buffer_start_row, buffer_end_row;
long last_start_row, last_end_row;
- g_return_val_if_fail(VTE_IS_TERMINAL(terminal), FALSE);
+ g_return_val_if_fail(VTE_IS_VIEW(terminal), FALSE);
buffer = terminal->pvt->buffer;
if (buffer == NULL)
@@ -13407,34 +13407,34 @@ vte_terminal_search_find (VteTerminal *terminal,
/* If search fails, we make an empty selection at the last searched
* position... */
if (backward) {
- if (vte_terminal_search_rows_iter (terminal, buffer_start_row, last_start_row, backward))
+ if (vte_view_search_rows_iter (terminal, buffer_start_row, last_start_row, backward))
return TRUE;
if (pvt->search_wrap_around &&
- vte_terminal_search_rows_iter (terminal, last_end_row, buffer_end_row, backward))
+ vte_view_search_rows_iter (terminal, last_end_row, buffer_end_row, backward))
return TRUE;
if (pvt->has_selection) {
if (pvt->search_wrap_around)
- _vte_terminal_select_empty_at (terminal,
+ _vte_view_select_empty_at (terminal,
pvt->selection_start.col,
pvt->selection_start.row);
else
- _vte_terminal_select_empty_at (terminal,
+ _vte_view_select_empty_at (terminal,
-1,
buffer_start_row - 1);
}
} else {
- if (vte_terminal_search_rows_iter (terminal, last_end_row, buffer_end_row, backward))
+ if (vte_view_search_rows_iter (terminal, last_end_row, buffer_end_row, backward))
return TRUE;
if (pvt->search_wrap_around &&
- vte_terminal_search_rows_iter (terminal, buffer_start_row, last_start_row, backward))
+ vte_view_search_rows_iter (terminal, buffer_start_row, last_start_row, backward))
return TRUE;
if (pvt->has_selection) {
if (pvt->search_wrap_around)
- _vte_terminal_select_empty_at (terminal,
+ _vte_view_select_empty_at (terminal,
pvt->selection_end.col + 1,
pvt->selection_end.row);
else
- _vte_terminal_select_empty_at (terminal,
+ _vte_view_select_empty_at (terminal,
-1,
buffer_end_row);
}
@@ -13444,37 +13444,37 @@ vte_terminal_search_find (VteTerminal *terminal,
}
/**
- * vte_terminal_search_find_previous:
- * @terminal: a #VteTerminal
+ * vte_view_search_find_previous:
+ * @terminal: a #VteView
*
* Searches the previous string matching the search regex set with
- * vte_terminal_search_set_gregex().
+ * vte_view_search_set_gregex().
*
* Returns: %TRUE if a match was found
*
* Since: 0.26
*/
gboolean
-vte_terminal_search_find_previous (VteTerminal *terminal)
+vte_view_search_find_previous (VteView *terminal)
{
- return vte_terminal_search_find (terminal, TRUE);
+ return vte_view_search_find (terminal, TRUE);
}
/**
- * vte_terminal_search_find_next:
- * @terminal: a #VteTerminal
+ * vte_view_search_find_next:
+ * @terminal: a #VteView
*
* Searches the next string matching the search regex set with
- * vte_terminal_search_set_gregex().
+ * vte_view_search_set_gregex().
*
* Returns: %TRUE if a match was found
*
* Since: 0.26
*/
gboolean
-vte_terminal_search_find_next (VteTerminal *terminal)
+vte_view_search_find_next (VteView *terminal)
{
- return vte_terminal_search_find (terminal, FALSE);
+ return vte_view_search_find (terminal, FALSE);
}
/* *********
@@ -13499,7 +13499,7 @@ _vte_buffer_view_adjust_adjustments(VteBuffer *buffer)
if (pvt->terminal == NULL)
return;
- _vte_terminal_adjust_adjustments(pvt->terminal);
+ _vte_view_adjust_adjustments(pvt->terminal);
}
void
@@ -13539,7 +13539,7 @@ _vte_buffer_view_scroll_region(VteBuffer *buffer,
if (pvt->terminal == NULL)
return;
- _vte_terminal_scroll_region(pvt->terminal, row, count, delta);
+ _vte_view_scroll_region(pvt->terminal, row, count, delta);
}
#ifdef VTE_DEBUG
@@ -13548,7 +13548,7 @@ G_DEFINE_TYPE_WITH_CODE(VteBuffer, vte_buffer, G_TYPE_OBJECT,
_vte_debug_print(VTE_DEBUG_LIFECYCLE, "vte_buffer_get_type()\n");
)
#else
-G_DEFINE_TYPE_WITH_CODE(VteBuffer, vte_buffer, VTE_TYPE_TERMINAL,
+G_DEFINE_TYPE_WITH_CODE(VteBuffer, vte_buffer, VTE_TYPE_VIEW,
g_type_add_class_private (g_define_type_id, sizeof (VteBufferClassPrivate));
)
#endif
@@ -13579,7 +13579,7 @@ vte_buffer_init(VteBuffer *buffer)
/* Set up I/O encodings. */
pvt->iso2022 = _vte_iso2022_state_new(pvt->encoding,
- &_vte_terminal_codeset_changed_cb,
+ &_vte_view_codeset_changed_cb,
buffer);
pvt->incoming = NULL;
pvt->pending = g_array_new(FALSE, TRUE, sizeof(gunichar));
@@ -13609,7 +13609,7 @@ vte_buffer_init(VteBuffer *buffer)
pvt->pty_pid = -1;
pvt->cursor_visible = TRUE;
- pvt->scrollback_lines = -1; /* force update in vte_terminal_set_scrollback_lines */
+ pvt->scrollback_lines = -1; /* force update in vte_view_set_scrollback_lines */
vte_buffer_set_scrollback_lines(buffer, VTE_SCROLLBACK_INIT);
/* Miscellaneous options. */
@@ -13667,7 +13667,7 @@ vte_buffer_finalize(GObject *object)
}
/* Stop processing input. */
- // vte_terminal_stop_processing (terminal);
+ // vte_view_stop_processing (terminal);
/* Discard any pending data. */
_vte_incoming_chunks_release (buffer->pvt->incoming);
@@ -13877,7 +13877,7 @@ vte_buffer_class_init(VteBufferClass *klass)
2, G_TYPE_STRING, G_TYPE_UINT);
/**
- * VteTerminal::emulation-changed:
+ * VteView::emulation-changed:
* @vteterminal: the object which received the signal
*
* Emitted whenever the terminal's emulation changes, only possible at
@@ -13894,7 +13894,7 @@ vte_buffer_class_init(VteBufferClass *klass)
G_TYPE_NONE, 0);
/**
- * VteTerminal::encoding-changed:
+ * VteView::encoding-changed:
* @vteterminal: the object which received the signal
*
* Emitted whenever the terminal's current encoding has changed, either
diff --git a/src/vte.h b/src/vte.h
index e75cb83..b13fe03 100644
--- a/src/vte.h
+++ b/src/vte.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#ifndef vte_vte_h_included
-#define vte_vte_h_included
+#ifndef __VTE_H__
+#define __VTE_H__
#include <glib.h>
#include <gio/gio.h>
@@ -29,7 +29,7 @@
#include "vteenums.h"
#include "vtepty.h"
#include "vtebuffer.h"
-
+#include "vteview.h"
#include "vtetypebuiltins.h"
#include "vteversion.h"
@@ -37,158 +37,10 @@
G_BEGIN_DECLS
-#define VTE_TYPE_TERMINAL (vte_terminal_get_type())
-#define VTE_TERMINAL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), VTE_TYPE_TERMINAL, VteTerminal))
-#define VTE_TERMINAL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), VTE_TYPE_TERMINAL, VteTerminalClass))
-#define VTE_IS_TERMINAL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), VTE_TYPE_TERMINAL))
-#define VTE_IS_TERMINAL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), VTE_TYPE_TERMINAL))
-#define VTE_TERMINAL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), VTE_TYPE_TERMINAL, VteTerminalClass))
-
-typedef struct _VteTerminal VteTerminal;
-typedef struct _VteTerminalPrivate VteTerminalPrivate;
-typedef struct _VteTerminalClass VteTerminalClass;
-typedef struct _VteTerminalClassPrivate VteTerminalClassPrivate;
-
-typedef struct _VteTerminalRealPrivate VteTerminalRealPrivate;
-
-/**
- * VteTerminal:
- */
-struct _VteTerminal {
- GtkWidget widget;
-
- /*< private >*/
- VteTerminalPrivate *pvt;
-};
-
-/**
- * VteTerminalClass:
- *
- * All of these fields should be considered read-only, except for derived classes.
- */
-struct _VteTerminalClass {
- /*< public > */
- /* Inherited parent class. */
- GtkWidgetClass parent_class;
-
- /*< protected > */
- void (*buffer_changed)(VteTerminal *terminal, VteBuffer *previous_buffer);
- void (*char_size_changed)(VteTerminal* terminal, guint char_width, guint char_height);
- void (*selection_changed)(VteTerminal* terminal);
-
- /* FIXMEchpe: should these return gboolean and have defaul thandlers
- * settings the "scale" property?
- */
- void (*increase_font_size)(VteTerminal* terminal);
- void (*decrease_font_size)(VteTerminal* terminal);
-
- void (*text_scrolled)(VteTerminal* terminal, gint delta);
-
- void (*copy_clipboard)(VteTerminal* terminal);
- void (*paste_clipboard)(VteTerminal* terminal);
- void (*copy_primary)(VteTerminal* terminal);
- void (*paste_primary)(VteTerminal* terminal);
-
- /* Padding for future expansion. */
- gpointer padding[16];
-
- VteTerminalClassPrivate *priv;
-};
-
-/**
- * VTE_STYLE_CLASS_TERMINAL:
- *
- * A CSS class to match terminals.
- *
- * Since: 0.30
- */
-#define VTE_STYLE_CLASS_TERMINAL "terminal"
-
-/* The widget's type. */
-GType vte_terminal_get_type(void);
-
-GtkWidget *vte_terminal_new(void);
-
-void vte_terminal_set_buffer(VteTerminal *terminal, VteBuffer *buffer);
-VteBuffer *vte_terminal_get_buffer(VteTerminal *terminal);
-
-/* Copy currently-selected text to the clipboard, or from the clipboard to
- * the terminal. */
-void vte_terminal_copy_clipboard(VteTerminal *terminal, GtkClipboard *clipboard);
-void vte_terminal_paste_clipboard(VteTerminal *terminal, GtkClipboard *clipboard);
-
-void vte_terminal_select_all(VteTerminal *terminal);
-void vte_terminal_unselect_all(VteTerminal *terminal);
-
-void vte_terminal_set_font_scale(VteTerminal *terminal,
- gdouble scale);
-gdouble vte_terminal_get_font_scale(VteTerminal *terminal);
-
-/* Set various on-off settings. */
-void vte_terminal_set_audible_bell(VteTerminal *terminal, gboolean is_audible);
-gboolean vte_terminal_get_audible_bell(VteTerminal *terminal);
-void vte_terminal_set_visible_bell(VteTerminal *terminal, gboolean is_visible);
-gboolean vte_terminal_get_visible_bell(VteTerminal *terminal);
-void vte_terminal_set_scroll_on_output(VteTerminal *terminal, gboolean scroll);
-void vte_terminal_set_scroll_on_keystroke(VteTerminal *terminal,
- gboolean scroll);
-
-/* Append the input method menu items to a given shell. */
-void vte_terminal_im_append_menuitems(VteTerminal *terminal,
- GtkMenuShell *menushell);
-
-/* Check if the terminal is the current selection owner. */
-gboolean vte_terminal_get_has_selection(VteTerminal *terminal);
-gboolean vte_terminal_get_selection_bounds(VteTerminal *terminal,
- VteBufferIter *start,
- VteBufferIter *end);
-
-/* Set the list of word chars, optionally using hyphens to specify ranges
- * (to get a hyphen, place it first), and check if a character is in the
- * range. */
-void vte_terminal_set_word_chars(VteTerminal *terminal, const char *spec);
-
-/* Manipulate the autohide setting. */
-void vte_terminal_set_mouse_autohide(VteTerminal *terminal, gboolean setting);
-gboolean vte_terminal_get_mouse_autohide(VteTerminal *terminal);
-
-/* Add a matching expression, returning the tag the widget assigns to that
- * expression. */
-int vte_terminal_match_add_gregex(VteTerminal *terminal, GRegex *regex, GRegexMatchFlags flags);
-/* Set the cursor to be used when the pointer is over a given match. */
-void vte_terminal_match_set_cursor(VteTerminal *terminal, int tag,
- GdkCursor *cursor);
-void vte_terminal_match_set_cursor_type(VteTerminal *terminal,
- int tag, GdkCursorType cursor_type);
-void vte_terminal_match_set_cursor_name(VteTerminal *terminal,
- int tag, const char *cursor_name);
-void vte_terminal_match_remove(VteTerminal *terminal, int tag);
-void vte_terminal_match_remove_all(VteTerminal *terminal);
-
-/* Check if a given cell on the screen contains part of a matched string. If
- * it does, return the string, and store the match tag in the optional tag
- * argument. */
-char *vte_terminal_match_check(VteTerminal *terminal,
- glong column, glong row,
- int *tag);
-
-void vte_terminal_search_set_gregex (VteTerminal *terminal,
- GRegex *regex,
- GRegexMatchFlags flags);
-GRegex *vte_terminal_search_get_gregex (VteTerminal *terminal);
-void vte_terminal_search_set_wrap_around (VteTerminal *terminal,
- gboolean wrap_around);
-gboolean vte_terminal_search_get_wrap_around (VteTerminal *terminal);
-gboolean vte_terminal_search_find_previous (VteTerminal *terminal);
-gboolean vte_terminal_search_find_next (VteTerminal *terminal);
-
const char *vte_get_default_emulation(void);
char *vte_get_user_shell (void);
-glong vte_terminal_get_char_width(VteTerminal *terminal);
-glong vte_terminal_get_char_height(VteTerminal *terminal);
-
G_END_DECLS
-#endif
+#endif /* __VTE_H__ */
diff --git a/src/vteaccess.c b/src/vteaccess.c
index 48c5e9e..80c4c4f 100644
--- a/src/vteaccess.c
+++ b/src/vteaccess.c
@@ -18,9 +18,9 @@
/**
* SECTION: vte-access
- * @short_description: Accessibility peer of #VteTerminal
+ * @short_description: Accessibility peer of #VteView
*
- * The accessibility peer of a #VteTerminal, implementing GNOME's accessibility
+ * The accessibility peer of a #VteView, implementing GNOME's accessibility
* framework.
*/
@@ -45,9 +45,9 @@ enum {
LAST_ACTION
};
-#define VTE_TERMINAL_ACCESSIBLE_PRIVATE_DATA "VteTerminalAccessiblePrivateData"
+#define VTE_VIEW_ACCESSIBLE_PRIVATE_DATA "VteViewAccessiblePrivateData"
-typedef struct _VteTerminalAccessiblePrivate {
+typedef struct _VteViewAccessiblePrivate {
gboolean snapshot_contents_invalid; /* This data is stale. */
gboolean snapshot_caret_invalid; /* This data is stale. */
GString *snapshot_text; /* Pointer to UTF-8 text. */
@@ -57,7 +57,7 @@ typedef struct _VteTerminalAccessiblePrivate {
gint snapshot_caret; /* Location of the cursor (in characters). */
char *action_descriptions[LAST_ACTION];
-} VteTerminalAccessiblePrivate;
+} VteViewAccessiblePrivate;
enum direction {
direction_previous = -1,
@@ -65,28 +65,28 @@ enum direction {
direction_next = 1
};
-static gunichar vte_terminal_accessible_get_character_at_offset(AtkText *text,
+static gunichar vte_view_accessible_get_character_at_offset(AtkText *text,
gint offset);
-static gpointer vte_terminal_accessible_parent_class;
+static gpointer vte_view_accessible_parent_class;
-G_DEFINE_TYPE(VteTerminalAccessibleFactory, _vte_terminal_accessible_factory, ATK_TYPE_OBJECT_FACTORY)
+G_DEFINE_TYPE(VteViewAccessibleFactory, _vte_view_accessible_factory, ATK_TYPE_OBJECT_FACTORY)
-static const char *vte_terminal_accessible_action_names[] = {
+static const char *vte_view_accessible_action_names[] = {
"menu",
NULL
};
-static const char *vte_terminal_accessible_action_descriptions[] = {
+static const char *vte_view_accessible_action_descriptions[] = {
"Popup context menu",
NULL
};
/* Create snapshot private data. */
-static VteTerminalAccessiblePrivate *
-vte_terminal_accessible_new_private_data(void)
+static VteViewAccessiblePrivate *
+vte_view_accessible_new_private_data(void)
{
- VteTerminalAccessiblePrivate *priv;
- priv = g_slice_new0(VteTerminalAccessiblePrivate);
+ VteViewAccessiblePrivate *priv;
+ priv = g_slice_new0(VteViewAccessiblePrivate);
priv->snapshot_text = NULL;
priv->snapshot_characters = NULL;
priv->snapshot_attributes = NULL;
@@ -99,7 +99,7 @@ vte_terminal_accessible_new_private_data(void)
/* Free snapshot private data. */
static void
-vte_terminal_accessible_free_private_data(VteTerminalAccessiblePrivate *priv)
+vte_view_accessible_free_private_data(VteViewAccessiblePrivate *priv)
{
gint i;
@@ -119,11 +119,11 @@ vte_terminal_accessible_free_private_data(VteTerminalAccessiblePrivate *priv)
for (i = 0; i < LAST_ACTION; i++) {
g_free (priv->action_descriptions[i]);
}
- g_slice_free(VteTerminalAccessiblePrivate, priv);
+ g_slice_free(VteViewAccessiblePrivate, priv);
}
static gint
-offset_from_xy (VteTerminalAccessiblePrivate *priv,
+offset_from_xy (VteViewAccessiblePrivate *priv,
gint x, gint y)
{
gint offset;
@@ -146,7 +146,7 @@ offset_from_xy (VteTerminalAccessiblePrivate *priv,
}
static void
-xy_from_offset (VteTerminalAccessiblePrivate *priv,
+xy_from_offset (VteViewAccessiblePrivate *priv,
guint offset, gint *x, gint *y)
{
guint i, linebreak;
@@ -233,22 +233,22 @@ emit_text_changed_delete(GObject *object,
}
static void
-vte_terminal_accessible_update_private_data_if_needed(AtkObject *text,
+vte_view_accessible_update_private_data_if_needed(AtkObject *text,
char **old, glong *olen)
{
- VteTerminal *terminal;
- VteTerminalAccessiblePrivate *priv;
+ VteView *terminal;
+ VteViewAccessiblePrivate *priv;
struct _VteCharAttributes attrs;
char *next, *tmp;
long row, offset, caret;
long ccol, crow;
guint i;
- g_assert(VTE_IS_TERMINAL_ACCESSIBLE(text));
+ g_assert(VTE_IS_VIEW_ACCESSIBLE(text));
/* Retrieve the private data structure. It must already exist. */
priv = g_object_get_data(G_OBJECT(text),
- VTE_TERMINAL_ACCESSIBLE_PRIVATE_DATA);
+ VTE_VIEW_ACCESSIBLE_PRIVATE_DATA);
g_assert(priv != NULL);
/* If nothing's changed, just return immediately. */
@@ -279,7 +279,7 @@ vte_terminal_accessible_update_private_data_if_needed(AtkObject *text,
}
/* Re-read the contents of the widget if the contents have changed. */
- terminal = VTE_TERMINAL(gtk_accessible_get_widget(GTK_ACCESSIBLE(text)));
+ terminal = VTE_VIEW(gtk_accessible_get_widget(GTK_ACCESSIBLE(text)));
if (priv->snapshot_contents_invalid) {
/* Free the outdated snapshot data, unless the caller
* wants it. */
@@ -329,7 +329,7 @@ vte_terminal_accessible_update_private_data_if_needed(AtkObject *text,
priv->snapshot_linebreaks = g_array_new(FALSE, FALSE, sizeof(int));
/* Get a new view of the uber-label. */
- tmp = vte_buffer_get_text_include_trailing_spaces(vte_terminal_get_buffer(terminal),
+ tmp = vte_buffer_get_text_include_trailing_spaces(vte_view_get_buffer(terminal),
all_selected,
NULL,
priv->snapshot_attributes);
@@ -381,7 +381,7 @@ vte_terminal_accessible_update_private_data_if_needed(AtkObject *text,
}
/* Update the caret position. */
- vte_buffer_get_cursor_position(vte_terminal_get_buffer(terminal), &ccol, &crow);
+ vte_buffer_get_cursor_position(vte_view_get_buffer(terminal), &ccol, &crow);
_vte_debug_print(VTE_DEBUG_ALLY,
"Cursor at (%ld, " "%ld).\n", ccol, crow);
@@ -426,22 +426,22 @@ vte_terminal_accessible_update_private_data_if_needed(AtkObject *text,
/* A signal handler to catch "text-inserted/deleted/modified" signals. */
static void
-vte_terminal_accessible_text_modified(VteBuffer *buffer, gpointer data)
+vte_view_accessible_text_modified(VteBuffer *buffer, gpointer data)
{
- VteTerminalAccessiblePrivate *priv;
+ VteViewAccessiblePrivate *priv;
char *old, *current;
glong offset, caret_offset, olen, clen;
gint old_snapshot_caret;
- g_assert(VTE_IS_TERMINAL_ACCESSIBLE(data));
+ g_assert(VTE_IS_VIEW_ACCESSIBLE(data));
priv = g_object_get_data(G_OBJECT(data),
- VTE_TERMINAL_ACCESSIBLE_PRIVATE_DATA);
+ VTE_VIEW_ACCESSIBLE_PRIVATE_DATA);
g_assert(priv != NULL);
old_snapshot_caret = priv->snapshot_caret;
priv->snapshot_contents_invalid = TRUE;
- vte_terminal_accessible_update_private_data_if_needed(ATK_OBJECT(data),
+ vte_view_accessible_update_private_data_if_needed(ATK_OBJECT(data),
&old, &olen);
g_assert(old != NULL);
@@ -530,23 +530,23 @@ vte_terminal_accessible_text_modified(VteBuffer *buffer, gpointer data)
/* A signal handler to catch "text-scrolled" signals. */
static void
-vte_terminal_accessible_text_scrolled(VteTerminal *terminal,
+vte_view_accessible_text_scrolled(VteView *terminal,
gint howmuch,
gpointer data)
{
- VteTerminalAccessiblePrivate *priv;
+ VteViewAccessiblePrivate *priv;
struct _VteCharAttributes attr;
long delta, row_count;
guint i, len;
- g_assert(VTE_IS_TERMINAL_ACCESSIBLE(data));
+ g_assert(VTE_IS_VIEW_ACCESSIBLE(data));
g_assert(howmuch != 0);
priv = g_object_get_data(G_OBJECT(data),
- VTE_TERMINAL_ACCESSIBLE_PRIVATE_DATA);
+ VTE_VIEW_ACCESSIBLE_PRIVATE_DATA);
g_assert(priv != NULL);
- row_count = vte_buffer_get_row_count(vte_terminal_get_buffer(terminal));
+ row_count = vte_buffer_get_row_count(vte_view_get_buffer(terminal));
if (((howmuch < 0) && (howmuch <= -row_count)) ||
((howmuch > 0) && (howmuch >= row_count))) {
/* All of the text was removed. */
@@ -559,7 +559,7 @@ vte_terminal_accessible_text_scrolled(VteTerminal *terminal,
}
}
priv->snapshot_contents_invalid = TRUE;
- vte_terminal_accessible_update_private_data_if_needed(ATK_OBJECT(data),
+ vte_view_accessible_update_private_data_if_needed(ATK_OBJECT(data),
NULL,
NULL);
/* All of the present text was added. */
@@ -611,7 +611,7 @@ vte_terminal_accessible_text_scrolled(VteTerminal *terminal,
/* Refresh. Note that i is now the length of the data which
* we expect to have left over. */
priv->snapshot_contents_invalid = TRUE;
- vte_terminal_accessible_update_private_data_if_needed(ATK_OBJECT(data),
+ vte_view_accessible_update_private_data_if_needed(ATK_OBJECT(data),
NULL,
NULL);
/* If we now have more text than before, the initial portion
@@ -652,7 +652,7 @@ vte_terminal_accessible_text_scrolled(VteTerminal *terminal,
inserted = TRUE;
}
priv->snapshot_contents_invalid = TRUE;
- vte_terminal_accessible_update_private_data_if_needed(ATK_OBJECT(data),
+ vte_view_accessible_update_private_data_if_needed(ATK_OBJECT(data),
NULL,
NULL);
/* Any newly-added string data is new, so note that it was
@@ -673,39 +673,39 @@ vte_terminal_accessible_text_scrolled(VteTerminal *terminal,
/* A signal handler to catch "cursor-moved" signals. */
static void
-vte_terminal_accessible_invalidate_cursor(VteBuffer *buffer, gpointer data)
+vte_view_accessible_invalidate_cursor(VteBuffer *buffer, gpointer data)
{
- VteTerminalAccessiblePrivate *priv;
+ VteViewAccessiblePrivate *priv;
- g_assert(VTE_IS_TERMINAL_ACCESSIBLE(data));
+ g_assert(VTE_IS_VIEW_ACCESSIBLE(data));
priv = g_object_get_data(G_OBJECT(data),
- VTE_TERMINAL_ACCESSIBLE_PRIVATE_DATA);
+ VTE_VIEW_ACCESSIBLE_PRIVATE_DATA);
g_assert(priv != NULL);
_vte_debug_print(VTE_DEBUG_ALLY,
"Invalidating accessibility cursor.\n");
priv->snapshot_caret_invalid = TRUE;
- vte_terminal_accessible_update_private_data_if_needed(ATK_OBJECT(data),
+ vte_view_accessible_update_private_data_if_needed(ATK_OBJECT(data),
NULL, NULL);
}
/* Handle title changes by resetting the description. */
static void
-vte_terminal_accessible_title_changed(VteTerminal *terminal, gpointer data)
+vte_view_accessible_title_changed(VteView *terminal, gpointer data)
{
- g_assert(VTE_IS_TERMINAL_ACCESSIBLE(data));
- g_assert(VTE_IS_TERMINAL(terminal));
- atk_object_set_description(ATK_OBJECT(data), vte_buffer_get_window_title(vte_terminal_get_buffer(terminal)));
+ g_assert(VTE_IS_VIEW_ACCESSIBLE(data));
+ g_assert(VTE_IS_VIEW(terminal));
+ atk_object_set_description(ATK_OBJECT(data), vte_buffer_get_window_title(vte_view_get_buffer(terminal)));
}
/* Reflect focus-in events. */
static gboolean
-vte_terminal_accessible_focus_in(VteTerminal *terminal, GdkEventFocus *event,
+vte_view_accessible_focus_in(VteView *terminal, GdkEventFocus *event,
gpointer data)
{
- g_assert(VTE_IS_TERMINAL_ACCESSIBLE(data));
- g_assert(VTE_IS_TERMINAL(terminal));
+ g_assert(VTE_IS_VIEW_ACCESSIBLE(data));
+ g_assert(VTE_IS_VIEW(terminal));
g_signal_emit_by_name(data, "focus-event", TRUE);
atk_object_notify_state_change(ATK_OBJECT(data),
ATK_STATE_FOCUSED, TRUE);
@@ -715,11 +715,11 @@ vte_terminal_accessible_focus_in(VteTerminal *terminal, GdkEventFocus *event,
/* Reflect focus-out events. */
static gboolean
-vte_terminal_accessible_focus_out(VteTerminal *terminal, GdkEventFocus *event,
+vte_view_accessible_focus_out(VteView *terminal, GdkEventFocus *event,
gpointer data)
{
- g_assert(VTE_IS_TERMINAL_ACCESSIBLE(data));
- g_assert(VTE_IS_TERMINAL(terminal));
+ g_assert(VTE_IS_VIEW_ACCESSIBLE(data));
+ g_assert(VTE_IS_VIEW(terminal));
g_signal_emit_by_name(data, "focus-event", FALSE);
atk_object_notify_state_change(ATK_OBJECT(data),
ATK_STATE_FOCUSED, FALSE);
@@ -729,14 +729,14 @@ vte_terminal_accessible_focus_out(VteTerminal *terminal, GdkEventFocus *event,
/* Reflect visibility-notify events. */
static gboolean
-vte_terminal_accessible_visibility_notify(VteTerminal *terminal,
+vte_view_accessible_visibility_notify(VteView *terminal,
GdkEventVisibility *event,
gpointer data)
{
GtkWidget *widget;
gboolean visible;
- g_assert(VTE_IS_TERMINAL_ACCESSIBLE(data));
- g_assert(VTE_IS_TERMINAL(terminal));
+ g_assert(VTE_IS_VIEW_ACCESSIBLE(data));
+ g_assert(VTE_IS_VIEW(terminal));
visible = event->state != GDK_VISIBILITY_FULLY_OBSCURED;
/* The VISIBLE state indicates that this widget is "visible". */
atk_object_notify_state_change(ATK_OBJECT(data),
@@ -763,63 +763,63 @@ vte_terminal_accessible_visibility_notify(VteTerminal *terminal,
}
static void
-vte_terminal_accessible_selection_changed (VteTerminal *terminal,
+vte_view_accessible_selection_changed (VteView *terminal,
gpointer data)
{
- g_assert(VTE_IS_TERMINAL_ACCESSIBLE(data));
- g_assert(VTE_IS_TERMINAL(terminal));
+ g_assert(VTE_IS_VIEW_ACCESSIBLE(data));
+ g_assert(VTE_IS_VIEW(terminal));
g_signal_emit_by_name (data, "text_selection_changed");
}
static void
-vte_terminal_initialize (AtkObject *obj, gpointer data)
+vte_view_initialize (AtkObject *obj, gpointer data)
{
- VteTerminal *terminal;
+ VteView *terminal;
VteBuffer *buffer;
AtkObject *parent;
const char *window_title;
- ATK_OBJECT_CLASS (vte_terminal_accessible_parent_class)->initialize (obj, data);
+ ATK_OBJECT_CLASS (vte_view_accessible_parent_class)->initialize (obj, data);
- terminal = VTE_TERMINAL (data);
- buffer = vte_terminal_get_buffer(terminal);
+ terminal = VTE_VIEW (data);
+ buffer = vte_view_get_buffer(terminal);
- _vte_terminal_accessible_ref(terminal);
+ _vte_view_accessible_ref(terminal);
g_object_set_data(G_OBJECT(obj),
- VTE_TERMINAL_ACCESSIBLE_PRIVATE_DATA,
- vte_terminal_accessible_new_private_data());
+ VTE_VIEW_ACCESSIBLE_PRIVATE_DATA,
+ vte_view_accessible_new_private_data());
g_signal_connect(buffer, "text-inserted",
- G_CALLBACK(vte_terminal_accessible_text_modified),
+ G_CALLBACK(vte_view_accessible_text_modified),
obj);
g_signal_connect(buffer, "text-deleted",
- G_CALLBACK(vte_terminal_accessible_text_modified),
+ G_CALLBACK(vte_view_accessible_text_modified),
obj);
g_signal_connect(buffer, "text-modified",
- G_CALLBACK(vte_terminal_accessible_text_modified),
+ G_CALLBACK(vte_view_accessible_text_modified),
obj);
g_signal_connect(terminal, "text-scrolled",
- G_CALLBACK(vte_terminal_accessible_text_scrolled),
+ G_CALLBACK(vte_view_accessible_text_scrolled),
obj);
g_signal_connect(buffer, "cursor-moved",
- G_CALLBACK(vte_terminal_accessible_invalidate_cursor),
+ G_CALLBACK(vte_view_accessible_invalidate_cursor),
obj);
g_signal_connect(terminal, "window-title-changed",
- G_CALLBACK(vte_terminal_accessible_title_changed),
+ G_CALLBACK(vte_view_accessible_title_changed),
obj);
g_signal_connect(terminal, "focus-in-event",
- G_CALLBACK(vte_terminal_accessible_focus_in),
+ G_CALLBACK(vte_view_accessible_focus_in),
obj);
g_signal_connect(terminal, "focus-out-event",
- G_CALLBACK(vte_terminal_accessible_focus_out),
+ G_CALLBACK(vte_view_accessible_focus_out),
obj);
g_signal_connect(terminal, "visibility-notify-event",
- G_CALLBACK(vte_terminal_accessible_visibility_notify),
+ G_CALLBACK(vte_view_accessible_visibility_notify),
obj);
g_signal_connect(terminal, "selection-changed",
- G_CALLBACK(vte_terminal_accessible_selection_changed),
+ G_CALLBACK(vte_view_accessible_selection_changed),
obj);
if (GTK_IS_WIDGET(gtk_widget_get_parent(GTK_WIDGET(terminal)))) {
@@ -830,7 +830,7 @@ vte_terminal_initialize (AtkObject *obj, gpointer data)
}
atk_object_set_name(obj, "Terminal");
- window_title = vte_buffer_get_window_title(vte_terminal_get_buffer(terminal));
+ window_title = vte_buffer_get_window_title(vte_view_get_buffer(terminal));
atk_object_set_description(obj, window_title ? window_title : "");
atk_object_notify_state_change(obj,
@@ -843,22 +843,22 @@ vte_terminal_initialize (AtkObject *obj, gpointer data)
}
/*
- * _vte_terminal_accessible_new:
- * @terminal: a #VteTerminal
+ * _vte_view_accessible_new:
+ * @terminal: a #VteView
*
* Creates a new accessibility peer for the terminal widget.
*
* Returns: the new #AtkObject
*/
AtkObject *
-_vte_terminal_accessible_new(VteTerminal *terminal)
+_vte_view_accessible_new(VteView *terminal)
{
AtkObject *accessible;
GObject *object;
- g_return_val_if_fail(VTE_IS_TERMINAL(terminal), NULL);
+ g_return_val_if_fail(VTE_IS_VIEW(terminal), NULL);
- object = g_object_new(VTE_TYPE_TERMINAL_ACCESSIBLE, NULL);
+ object = g_object_new(VTE_TYPE_VIEW_ACCESSIBLE, NULL);
accessible = ATK_OBJECT (object);
atk_object_initialize(accessible, terminal);
@@ -866,15 +866,15 @@ _vte_terminal_accessible_new(VteTerminal *terminal)
}
static void
-vte_terminal_accessible_finalize(GObject *object)
+vte_view_accessible_finalize(GObject *object)
{
- VteTerminalAccessiblePrivate *priv;
+ VteViewAccessiblePrivate *priv;
GtkAccessible *accessible = NULL;
GtkWidget *widget;
_vte_debug_print(VTE_DEBUG_ALLY, "Finalizing accessible peer.\n");
- g_assert(VTE_IS_TERMINAL_ACCESSIBLE(object));
+ g_assert(VTE_IS_VIEW_ACCESSIBLE(object));
accessible = GTK_ACCESSIBLE(object);
widget = gtk_accessible_get_widget (accessible);
@@ -885,61 +885,61 @@ vte_terminal_accessible_finalize(GObject *object)
G_SIGNAL_MATCH_FUNC |
G_SIGNAL_MATCH_DATA,
0, 0, NULL,
- vte_terminal_accessible_text_modified,
+ vte_view_accessible_text_modified,
object);
g_signal_handlers_disconnect_matched(widget,
G_SIGNAL_MATCH_FUNC |
G_SIGNAL_MATCH_DATA,
0, 0, NULL,
- vte_terminal_accessible_text_scrolled,
+ vte_view_accessible_text_scrolled,
object);
g_signal_handlers_disconnect_matched(widget,
G_SIGNAL_MATCH_FUNC |
G_SIGNAL_MATCH_DATA,
0, 0, NULL,
- vte_terminal_accessible_invalidate_cursor,
+ vte_view_accessible_invalidate_cursor,
object);
g_signal_handlers_disconnect_matched(widget,
G_SIGNAL_MATCH_FUNC |
G_SIGNAL_MATCH_DATA,
0, 0, NULL,
- vte_terminal_accessible_title_changed,
+ vte_view_accessible_title_changed,
object);
g_signal_handlers_disconnect_matched(widget,
G_SIGNAL_MATCH_FUNC |
G_SIGNAL_MATCH_DATA,
0, 0, NULL,
- vte_terminal_accessible_focus_in,
+ vte_view_accessible_focus_in,
object);
g_signal_handlers_disconnect_matched(widget,
G_SIGNAL_MATCH_FUNC |
G_SIGNAL_MATCH_DATA,
0, 0, NULL,
- vte_terminal_accessible_focus_out,
+ vte_view_accessible_focus_out,
object);
g_signal_handlers_disconnect_matched(widget,
G_SIGNAL_MATCH_FUNC |
G_SIGNAL_MATCH_DATA,
0, 0, NULL,
- vte_terminal_accessible_visibility_notify,
+ vte_view_accessible_visibility_notify,
object);
}
priv = g_object_get_data(object,
- VTE_TERMINAL_ACCESSIBLE_PRIVATE_DATA);
+ VTE_VIEW_ACCESSIBLE_PRIVATE_DATA);
if (priv != NULL) {
- vte_terminal_accessible_free_private_data(priv);
+ vte_view_accessible_free_private_data(priv);
g_object_set_data(object,
- VTE_TERMINAL_ACCESSIBLE_PRIVATE_DATA,
+ VTE_VIEW_ACCESSIBLE_PRIVATE_DATA,
NULL);
}
- G_OBJECT_CLASS(vte_terminal_accessible_parent_class)->finalize(object);
+ G_OBJECT_CLASS(vte_view_accessible_parent_class)->finalize(object);
}
static gchar *
-vte_terminal_accessible_get_text(AtkText *text,
+vte_view_accessible_get_text(AtkText *text,
gint start_offset, gint end_offset)
{
- VteTerminalAccessiblePrivate *priv;
+ VteViewAccessiblePrivate *priv;
int start, end;
gchar *ret;
@@ -954,11 +954,11 @@ vte_terminal_accessible_get_text(AtkText *text,
g_assert((start_offset >= 0) && (end_offset >= -1));
- vte_terminal_accessible_update_private_data_if_needed(ATK_OBJECT(text),
+ vte_view_accessible_update_private_data_if_needed(ATK_OBJECT(text),
NULL, NULL);
priv = g_object_get_data(G_OBJECT(text),
- VTE_TERMINAL_ACCESSIBLE_PRIVATE_DATA);
+ VTE_VIEW_ACCESSIBLE_PRIVATE_DATA);
_vte_debug_print(VTE_DEBUG_ALLY,
"Getting text from %d to %d of %d.\n",
start_offset, end_offset,
@@ -995,24 +995,24 @@ vte_terminal_accessible_get_text(AtkText *text,
* not bytes, plus that saves us from having to deal with parts of multibyte
* characters, which are icky.) */
static gchar *
-vte_terminal_accessible_get_text_somewhere(AtkText *text,
+vte_view_accessible_get_text_somewhere(AtkText *text,
gint offset,
AtkTextBoundary boundary_type,
enum direction direction,
gint *start_offset,
gint *end_offset)
{
- VteTerminalAccessiblePrivate *priv;
- VteTerminal *terminal;
+ VteViewAccessiblePrivate *priv;
+ VteView *terminal;
gunichar current, prev, next;
guint start, end, line;
- vte_terminal_accessible_update_private_data_if_needed(ATK_OBJECT(text),
+ vte_view_accessible_update_private_data_if_needed(ATK_OBJECT(text),
NULL, NULL);
priv = g_object_get_data(G_OBJECT(text),
- VTE_TERMINAL_ACCESSIBLE_PRIVATE_DATA);
- terminal = VTE_TERMINAL(gtk_accessible_get_widget (GTK_ACCESSIBLE(text)));
+ VTE_VIEW_ACCESSIBLE_PRIVATE_DATA);
+ terminal = VTE_VIEW(gtk_accessible_get_widget (GTK_ACCESSIBLE(text)));
_vte_debug_print(VTE_DEBUG_ALLY,
"Getting %s %s at %d of %d.\n",
@@ -1045,8 +1045,8 @@ vte_terminal_accessible_get_text_somewhere(AtkText *text,
case ATK_TEXT_BOUNDARY_WORD_START:
/* Back up to the previous non-word-word transition. */
while (offset > 0) {
- prev = vte_terminal_accessible_get_character_at_offset(text, offset - 1);
- if (_vte_terminal_is_word_char(terminal, prev)) {
+ prev = vte_view_accessible_get_character_at_offset(text, offset - 1);
+ if (_vte_view_is_word_char(terminal, prev)) {
offset--;
} else {
break;
@@ -1059,16 +1059,16 @@ vte_terminal_accessible_get_text_somewhere(AtkText *text,
* for the word-start before that. */
if (direction == direction_previous) {
while (offset > 0) {
- prev = vte_terminal_accessible_get_character_at_offset(text, offset - 1);
- if (!_vte_terminal_is_word_char(terminal, prev)) {
+ prev = vte_view_accessible_get_character_at_offset(text, offset - 1);
+ if (!_vte_view_is_word_char(terminal, prev)) {
offset--;
} else {
break;
}
}
while (offset > 0) {
- prev = vte_terminal_accessible_get_character_at_offset(text, offset - 1);
- if (_vte_terminal_is_word_char(terminal, prev)) {
+ prev = vte_view_accessible_get_character_at_offset(text, offset - 1);
+ if (_vte_view_is_word_char(terminal, prev)) {
offset--;
} else {
break;
@@ -1082,16 +1082,16 @@ vte_terminal_accessible_get_text_somewhere(AtkText *text,
* after that. */
if (direction == direction_next) {
while (offset < (int) priv->snapshot_characters->len) {
- next = vte_terminal_accessible_get_character_at_offset(text, offset);
- if (_vte_terminal_is_word_char(terminal, next)) {
+ next = vte_view_accessible_get_character_at_offset(text, offset);
+ if (_vte_view_is_word_char(terminal, next)) {
offset++;
} else {
break;
}
}
while (offset < (int) priv->snapshot_characters->len) {
- next = vte_terminal_accessible_get_character_at_offset(text, offset);
- if (!_vte_terminal_is_word_char(terminal, next)) {
+ next = vte_view_accessible_get_character_at_offset(text, offset);
+ if (!_vte_view_is_word_char(terminal, next)) {
offset++;
} else {
break;
@@ -1101,8 +1101,8 @@ vte_terminal_accessible_get_text_somewhere(AtkText *text,
}
/* Now find the end of this word. */
while (offset < (int) priv->snapshot_characters->len) {
- current = vte_terminal_accessible_get_character_at_offset(text, offset);
- if (_vte_terminal_is_word_char(terminal, current)) {
+ current = vte_view_accessible_get_character_at_offset(text, offset);
+ if (_vte_view_is_word_char(terminal, current)) {
offset++;
} else {
break;
@@ -1111,8 +1111,8 @@ vte_terminal_accessible_get_text_somewhere(AtkText *text,
}
/* Now find the next non-word-word transition */
while (offset < (int) priv->snapshot_characters->len) {
- next = vte_terminal_accessible_get_character_at_offset(text, offset);
- if (!_vte_terminal_is_word_char(terminal, next)) {
+ next = vte_view_accessible_get_character_at_offset(text, offset);
+ if (!_vte_view_is_word_char(terminal, next)) {
offset++;
} else {
break;
@@ -1122,11 +1122,11 @@ vte_terminal_accessible_get_text_somewhere(AtkText *text,
break;
case ATK_TEXT_BOUNDARY_WORD_END:
/* Back up to the previous word-non-word transition. */
- current = vte_terminal_accessible_get_character_at_offset(text, offset);
+ current = vte_view_accessible_get_character_at_offset(text, offset);
while (offset > 0) {
- prev = vte_terminal_accessible_get_character_at_offset(text, offset - 1);
- if (_vte_terminal_is_word_char(terminal, prev) &&
- !_vte_terminal_is_word_char(terminal, current)) {
+ prev = vte_view_accessible_get_character_at_offset(text, offset - 1);
+ if (_vte_view_is_word_char(terminal, prev) &&
+ !_vte_view_is_word_char(terminal, current)) {
break;
} else {
offset--;
@@ -1140,18 +1140,18 @@ vte_terminal_accessible_get_text_somewhere(AtkText *text,
* before that. */
if (direction == direction_previous) {
while (offset > 0) {
- prev = vte_terminal_accessible_get_character_at_offset(text, offset - 1);
- if (_vte_terminal_is_word_char(terminal, prev)) {
+ prev = vte_view_accessible_get_character_at_offset(text, offset - 1);
+ if (_vte_view_is_word_char(terminal, prev)) {
offset--;
} else {
break;
}
}
- current = vte_terminal_accessible_get_character_at_offset(text, offset);
+ current = vte_view_accessible_get_character_at_offset(text, offset);
while (offset > 0) {
- prev = vte_terminal_accessible_get_character_at_offset(text, offset - 1);
- if (_vte_terminal_is_word_char(terminal, prev) &&
- !_vte_terminal_is_word_char(terminal, current)) {
+ prev = vte_view_accessible_get_character_at_offset(text, offset - 1);
+ if (_vte_view_is_word_char(terminal, prev) &&
+ !_vte_view_is_word_char(terminal, current)) {
break;
} else {
offset--;
@@ -1166,16 +1166,16 @@ vte_terminal_accessible_get_text_somewhere(AtkText *text,
* after that. */
if (direction == direction_next) {
while (offset < (int) priv->snapshot_characters->len) {
- current = vte_terminal_accessible_get_character_at_offset(text, offset);
- if (!_vte_terminal_is_word_char(terminal, current)) {
+ current = vte_view_accessible_get_character_at_offset(text, offset);
+ if (!_vte_view_is_word_char(terminal, current)) {
offset++;
} else {
break;
}
}
while (offset < (int) priv->snapshot_characters->len) {
- current = vte_terminal_accessible_get_character_at_offset(text, offset);
- if (_vte_terminal_is_word_char(terminal, current)) {
+ current = vte_view_accessible_get_character_at_offset(text, offset);
+ if (_vte_view_is_word_char(terminal, current)) {
offset++;
} else {
break;
@@ -1185,16 +1185,16 @@ vte_terminal_accessible_get_text_somewhere(AtkText *text,
}
/* Now find the next word end. */
while (offset < (int) priv->snapshot_characters->len) {
- current = vte_terminal_accessible_get_character_at_offset(text, offset);
- if (!_vte_terminal_is_word_char(terminal, current)) {
+ current = vte_view_accessible_get_character_at_offset(text, offset);
+ if (!_vte_view_is_word_char(terminal, current)) {
offset++;
} else {
break;
}
}
while (offset < (int) priv->snapshot_characters->len) {
- current = vte_terminal_accessible_get_character_at_offset(text, offset);
- if (_vte_terminal_is_word_char(terminal, current)) {
+ current = vte_view_accessible_get_character_at_offset(text, offset);
+ if (_vte_view_is_word_char(terminal, current)) {
offset++;
} else {
break;
@@ -1243,19 +1243,19 @@ vte_terminal_accessible_get_text_somewhere(AtkText *text,
}
*start_offset = start = MIN(start, priv->snapshot_characters->len - 1);
*end_offset = end = CLAMP(end, start, priv->snapshot_characters->len);
- return vte_terminal_accessible_get_text(text, start, end);
+ return vte_view_accessible_get_text(text, start, end);
}
static gchar *
-vte_terminal_accessible_get_text_before_offset(AtkText *text, gint offset,
+vte_view_accessible_get_text_before_offset(AtkText *text, gint offset,
AtkTextBoundary boundary_type,
gint *start_offset,
gint *end_offset)
{
- g_assert(VTE_IS_TERMINAL_ACCESSIBLE(text));
- vte_terminal_accessible_update_private_data_if_needed(ATK_OBJECT(text),
+ g_assert(VTE_IS_VIEW_ACCESSIBLE(text));
+ vte_view_accessible_update_private_data_if_needed(ATK_OBJECT(text),
NULL, NULL);
- return vte_terminal_accessible_get_text_somewhere(text,
+ return vte_view_accessible_get_text_somewhere(text,
offset,
boundary_type,
-1,
@@ -1264,15 +1264,15 @@ vte_terminal_accessible_get_text_before_offset(AtkText *text, gint offset,
}
static gchar *
-vte_terminal_accessible_get_text_after_offset(AtkText *text, gint offset,
+vte_view_accessible_get_text_after_offset(AtkText *text, gint offset,
AtkTextBoundary boundary_type,
gint *start_offset,
gint *end_offset)
{
- g_assert(VTE_IS_TERMINAL_ACCESSIBLE(text));
- vte_terminal_accessible_update_private_data_if_needed(ATK_OBJECT(text),
+ g_assert(VTE_IS_VIEW_ACCESSIBLE(text));
+ vte_view_accessible_update_private_data_if_needed(ATK_OBJECT(text),
NULL, NULL);
- return vte_terminal_accessible_get_text_somewhere(text,
+ return vte_view_accessible_get_text_somewhere(text,
offset,
boundary_type,
1,
@@ -1281,15 +1281,15 @@ vte_terminal_accessible_get_text_after_offset(AtkText *text, gint offset,
}
static gchar *
-vte_terminal_accessible_get_text_at_offset(AtkText *text, gint offset,
+vte_view_accessible_get_text_at_offset(AtkText *text, gint offset,
AtkTextBoundary boundary_type,
gint *start_offset,
gint *end_offset)
{
- g_assert(VTE_IS_TERMINAL_ACCESSIBLE(text));
- vte_terminal_accessible_update_private_data_if_needed(ATK_OBJECT(text),
+ g_assert(VTE_IS_VIEW_ACCESSIBLE(text));
+ vte_view_accessible_update_private_data_if_needed(ATK_OBJECT(text),
NULL, NULL);
- return vte_terminal_accessible_get_text_somewhere(text,
+ return vte_view_accessible_get_text_somewhere(text,
offset,
boundary_type,
0,
@@ -1298,24 +1298,24 @@ vte_terminal_accessible_get_text_at_offset(AtkText *text, gint offset,
}
static gunichar
-vte_terminal_accessible_get_character_at_offset(AtkText *text, gint offset)
+vte_view_accessible_get_character_at_offset(AtkText *text, gint offset)
{
- VteTerminalAccessiblePrivate *priv;
+ VteViewAccessiblePrivate *priv;
int mapped;
char *unichar;
gunichar ret;
- vte_terminal_accessible_update_private_data_if_needed(ATK_OBJECT(text),
+ vte_view_accessible_update_private_data_if_needed(ATK_OBJECT(text),
NULL, NULL);
priv = g_object_get_data(G_OBJECT(text),
- VTE_TERMINAL_ACCESSIBLE_PRIVATE_DATA);
+ VTE_VIEW_ACCESSIBLE_PRIVATE_DATA);
g_assert(offset < (int) priv->snapshot_characters->len);
mapped = g_array_index(priv->snapshot_characters, int, offset);
- unichar = vte_terminal_accessible_get_text(text, offset, offset + 1);
+ unichar = vte_view_accessible_get_text(text, offset, offset + 1);
ret = g_utf8_get_char(unichar);
g_free(unichar);
@@ -1323,15 +1323,15 @@ vte_terminal_accessible_get_character_at_offset(AtkText *text, gint offset)
}
static gint
-vte_terminal_accessible_get_caret_offset(AtkText *text)
+vte_view_accessible_get_caret_offset(AtkText *text)
{
- VteTerminalAccessiblePrivate *priv;
+ VteViewAccessiblePrivate *priv;
- vte_terminal_accessible_update_private_data_if_needed(ATK_OBJECT(text),
+ vte_view_accessible_update_private_data_if_needed(ATK_OBJECT(text),
NULL, NULL);
priv = g_object_get_data(G_OBJECT(text),
- VTE_TERMINAL_ACCESSIBLE_PRIVATE_DATA);
+ VTE_VIEW_ACCESSIBLE_PRIVATE_DATA);
return priv->snapshot_caret;
}
@@ -1368,19 +1368,19 @@ get_attribute_set (struct _VteCharAttributes attr)
}
static AtkAttributeSet *
-vte_terminal_accessible_get_run_attributes(AtkText *text, gint offset,
+vte_view_accessible_get_run_attributes(AtkText *text, gint offset,
gint *start_offset, gint *end_offset)
{
- VteTerminalAccessiblePrivate *priv;
+ VteViewAccessiblePrivate *priv;
guint i;
struct _VteCharAttributes cur_attr;
struct _VteCharAttributes attr;
- vte_terminal_accessible_update_private_data_if_needed(ATK_OBJECT(text),
+ vte_view_accessible_update_private_data_if_needed(ATK_OBJECT(text),
NULL, NULL);
priv = g_object_get_data(G_OBJECT(text),
- VTE_TERMINAL_ACCESSIBLE_PRIVATE_DATA);
+ VTE_VIEW_ACCESSIBLE_PRIVATE_DATA);
attr = g_array_index (priv->snapshot_attributes,
struct _VteCharAttributes,
@@ -1416,34 +1416,34 @@ vte_terminal_accessible_get_run_attributes(AtkText *text, gint offset,
}
static AtkAttributeSet *
-vte_terminal_accessible_get_default_attributes(AtkText *text)
+vte_view_accessible_get_default_attributes(AtkText *text)
{
return NULL;
}
static void
-vte_terminal_accessible_get_character_extents(AtkText *text, gint offset,
+vte_view_accessible_get_character_extents(AtkText *text, gint offset,
gint *x, gint *y,
gint *width, gint *height,
AtkCoordType coords)
{
- VteTerminalAccessiblePrivate *priv;
- VteTerminal *terminal;
+ VteViewAccessiblePrivate *priv;
+ VteView *terminal;
glong char_width, char_height;
gint base_x, base_y;
- g_assert(VTE_IS_TERMINAL_ACCESSIBLE(text));
+ g_assert(VTE_IS_VIEW_ACCESSIBLE(text));
- vte_terminal_accessible_update_private_data_if_needed(ATK_OBJECT(text),
+ vte_view_accessible_update_private_data_if_needed(ATK_OBJECT(text),
NULL, NULL);
priv = g_object_get_data(G_OBJECT(text),
- VTE_TERMINAL_ACCESSIBLE_PRIVATE_DATA);
- terminal = VTE_TERMINAL (gtk_accessible_get_widget (GTK_ACCESSIBLE (text)));
+ VTE_VIEW_ACCESSIBLE_PRIVATE_DATA);
+ terminal = VTE_VIEW (gtk_accessible_get_widget (GTK_ACCESSIBLE (text)));
atk_component_get_position (ATK_COMPONENT (text), &base_x, &base_y, coords);
xy_from_offset (priv, offset, x, y);
- char_width = vte_terminal_get_char_width (terminal);
- char_height = vte_terminal_get_char_height (terminal);
+ char_width = vte_view_get_char_width (terminal);
+ char_height = vte_view_get_char_height (terminal);
*x *= char_width;
*y *= char_height;
*width = char_width;
@@ -1453,40 +1453,40 @@ vte_terminal_accessible_get_character_extents(AtkText *text, gint offset,
}
static gint
-vte_terminal_accessible_get_character_count(AtkText *text)
+vte_view_accessible_get_character_count(AtkText *text)
{
- VteTerminalAccessiblePrivate *priv;
+ VteViewAccessiblePrivate *priv;
- vte_terminal_accessible_update_private_data_if_needed(ATK_OBJECT(text),
+ vte_view_accessible_update_private_data_if_needed(ATK_OBJECT(text),
NULL, NULL);
priv = g_object_get_data(G_OBJECT(text),
- VTE_TERMINAL_ACCESSIBLE_PRIVATE_DATA);
+ VTE_VIEW_ACCESSIBLE_PRIVATE_DATA);
return priv->snapshot_attributes->len;
}
static gint
-vte_terminal_accessible_get_offset_at_point(AtkText *text,
+vte_view_accessible_get_offset_at_point(AtkText *text,
gint x, gint y,
AtkCoordType coords)
{
- VteTerminalAccessiblePrivate *priv;
- VteTerminal *terminal;
+ VteViewAccessiblePrivate *priv;
+ VteView *terminal;
glong char_width, char_height;
gint base_x, base_y;
- g_assert(VTE_IS_TERMINAL_ACCESSIBLE(text));
+ g_assert(VTE_IS_VIEW_ACCESSIBLE(text));
- vte_terminal_accessible_update_private_data_if_needed(ATK_OBJECT(text),
+ vte_view_accessible_update_private_data_if_needed(ATK_OBJECT(text),
NULL, NULL);
priv = g_object_get_data(G_OBJECT(text),
- VTE_TERMINAL_ACCESSIBLE_PRIVATE_DATA);
- terminal = VTE_TERMINAL (gtk_accessible_get_widget (GTK_ACCESSIBLE (text)));
+ VTE_VIEW_ACCESSIBLE_PRIVATE_DATA);
+ terminal = VTE_VIEW (gtk_accessible_get_widget (GTK_ACCESSIBLE (text)));
atk_component_get_position (ATK_COMPONENT (text), &base_x, &base_y, coords);
- char_width = vte_terminal_get_char_width (terminal);
- char_height = vte_terminal_get_char_height (terminal);
+ char_width = vte_view_get_char_width (terminal);
+ char_height = vte_view_get_char_height (terminal);
x -= base_x;
y -= base_y;
x /= char_width;
@@ -1495,13 +1495,13 @@ vte_terminal_accessible_get_offset_at_point(AtkText *text,
}
static gint
-vte_terminal_accessible_get_n_selections(AtkText *text)
+vte_view_accessible_get_n_selections(AtkText *text)
{
GtkWidget *widget;
- VteTerminal *terminal;
+ VteView *terminal;
- g_assert(VTE_IS_TERMINAL_ACCESSIBLE(text));
- vte_terminal_accessible_update_private_data_if_needed(ATK_OBJECT(text),
+ g_assert(VTE_IS_VIEW_ACCESSIBLE(text));
+ vte_view_accessible_update_private_data_if_needed(ATK_OBJECT(text),
NULL, NULL);
widget = gtk_accessible_get_widget (GTK_ACCESSIBLE(text));
@@ -1509,32 +1509,32 @@ vte_terminal_accessible_get_n_selections(AtkText *text)
/* State is defunct */
return -1;
}
- g_assert(VTE_IS_TERMINAL (widget));
- terminal = VTE_TERMINAL (widget);
- return (vte_terminal_get_has_selection (terminal)) ? 1 : 0;
+ g_assert(VTE_IS_VIEW (widget));
+ terminal = VTE_VIEW (widget);
+ return (vte_view_get_has_selection (terminal)) ? 1 : 0;
}
static gchar *
-vte_terminal_accessible_get_selection(AtkText *text, gint selection_number,
+vte_view_accessible_get_selection(AtkText *text, gint selection_number,
gint *start_offset, gint *end_offset)
{
GtkWidget *widget;
- VteTerminal *terminal;
- VteTerminalAccessiblePrivate *priv;
+ VteView *terminal;
+ VteViewAccessiblePrivate *priv;
VteBufferIter start, end;
long start_x, start_y, end_x, end_y;
- g_assert(VTE_IS_TERMINAL_ACCESSIBLE(text));
- vte_terminal_accessible_update_private_data_if_needed(ATK_OBJECT(text),
+ g_assert(VTE_IS_VIEW_ACCESSIBLE(text));
+ vte_view_accessible_update_private_data_if_needed(ATK_OBJECT(text),
NULL, NULL);
widget = gtk_accessible_get_widget (GTK_ACCESSIBLE(text));
if (widget == NULL) {
/* State is defunct */
return NULL;
}
- g_assert(VTE_IS_TERMINAL (widget));
- terminal = VTE_TERMINAL (widget);
- if (!vte_terminal_get_has_selection (terminal)) {
+ g_assert(VTE_IS_VIEW (widget));
+ terminal = VTE_VIEW (widget);
+ if (!vte_view_get_has_selection (terminal)) {
return NULL;
}
if (selection_number != 0) {
@@ -1542,64 +1542,64 @@ vte_terminal_accessible_get_selection(AtkText *text, gint selection_number,
}
priv = g_object_get_data(G_OBJECT(text),
- VTE_TERMINAL_ACCESSIBLE_PRIVATE_DATA);
- if (!vte_terminal_get_selection_bounds(terminal, &start, &end))
+ VTE_VIEW_ACCESSIBLE_PRIVATE_DATA);
+ if (!vte_view_get_selection_bounds(terminal, &start, &end))
return NULL;
_vte_buffer_iter_get_position(&start, &start_y, &start_x);
_vte_buffer_iter_get_position(&end, &end_y, &end_x);
*start_offset = offset_from_xy (priv, start_x, start_y);
*end_offset = offset_from_xy (priv, end_x, end_y);
- return _vte_terminal_get_selection (terminal);
+ return _vte_view_get_selection (terminal);
}
static gboolean
-vte_terminal_accessible_add_selection(AtkText *text,
+vte_view_accessible_add_selection(AtkText *text,
gint start_offset, gint end_offset)
{
GtkWidget *widget;
- VteTerminal *terminal;
- VteTerminalAccessiblePrivate *priv;
+ VteView *terminal;
+ VteViewAccessiblePrivate *priv;
gint start_x, start_y, end_x, end_y;
- g_assert(VTE_IS_TERMINAL_ACCESSIBLE(text));
- vte_terminal_accessible_update_private_data_if_needed(ATK_OBJECT(text),
+ g_assert(VTE_IS_VIEW_ACCESSIBLE(text));
+ vte_view_accessible_update_private_data_if_needed(ATK_OBJECT(text),
NULL, NULL);
widget = gtk_accessible_get_widget (GTK_ACCESSIBLE(text));
if (widget == NULL) {
/* State is defunct */
return FALSE;
}
- g_assert(VTE_IS_TERMINAL (widget));
- terminal = VTE_TERMINAL (widget);
- g_assert(!vte_terminal_get_has_selection (terminal));
+ g_assert(VTE_IS_VIEW (widget));
+ terminal = VTE_VIEW (widget);
+ g_assert(!vte_view_get_has_selection (terminal));
priv = g_object_get_data(G_OBJECT(text),
- VTE_TERMINAL_ACCESSIBLE_PRIVATE_DATA);
+ VTE_VIEW_ACCESSIBLE_PRIVATE_DATA);
xy_from_offset (priv, start_offset, &start_x, &start_y);
xy_from_offset (priv, end_offset, &end_x, &end_y);
- _vte_terminal_select_text (terminal, start_x, start_y, end_x, end_y, start_offset, end_offset);
+ _vte_view_select_text (terminal, start_x, start_y, end_x, end_y, start_offset, end_offset);
return TRUE;
}
static gboolean
-vte_terminal_accessible_remove_selection(AtkText *text,
+vte_view_accessible_remove_selection(AtkText *text,
gint selection_number)
{
GtkWidget *widget;
- VteTerminal *terminal;
+ VteView *terminal;
- g_assert(VTE_IS_TERMINAL_ACCESSIBLE(text));
- vte_terminal_accessible_update_private_data_if_needed(ATK_OBJECT(text),
+ g_assert(VTE_IS_VIEW_ACCESSIBLE(text));
+ vte_view_accessible_update_private_data_if_needed(ATK_OBJECT(text),
NULL, NULL);
widget = gtk_accessible_get_widget (GTK_ACCESSIBLE(text));
if (widget == NULL) {
/* State is defunct */
return FALSE;
}
- g_assert(VTE_IS_TERMINAL (widget));
- terminal = VTE_TERMINAL (widget);
- if (selection_number == 0 && vte_terminal_get_has_selection (terminal)) {
- _vte_terminal_remove_selection (terminal);
+ g_assert(VTE_IS_VIEW (widget));
+ terminal = VTE_VIEW (widget);
+ if (selection_number == 0 && vte_view_get_has_selection (terminal)) {
+ _vte_view_remove_selection (terminal);
return TRUE;
} else {
return FALSE;
@@ -1607,83 +1607,83 @@ vte_terminal_accessible_remove_selection(AtkText *text,
}
static gboolean
-vte_terminal_accessible_set_selection(AtkText *text, gint selection_number,
+vte_view_accessible_set_selection(AtkText *text, gint selection_number,
gint start_offset, gint end_offset)
{
GtkWidget *widget;
- VteTerminal *terminal;
+ VteView *terminal;
- g_assert(VTE_IS_TERMINAL_ACCESSIBLE(text));
- vte_terminal_accessible_update_private_data_if_needed(ATK_OBJECT(text),
+ g_assert(VTE_IS_VIEW_ACCESSIBLE(text));
+ vte_view_accessible_update_private_data_if_needed(ATK_OBJECT(text),
NULL, NULL);
widget = gtk_accessible_get_widget (GTK_ACCESSIBLE(text));
if (widget == NULL) {
/* State is defunct */
return FALSE;
}
- g_assert(VTE_IS_TERMINAL (widget));
- terminal = VTE_TERMINAL (widget);
+ g_assert(VTE_IS_VIEW (widget));
+ terminal = VTE_VIEW (widget);
if (selection_number != 0) {
return FALSE;
}
- if (vte_terminal_get_has_selection (terminal)) {
- _vte_terminal_remove_selection (terminal);
+ if (vte_view_get_has_selection (terminal)) {
+ _vte_view_remove_selection (terminal);
}
- return vte_terminal_accessible_add_selection (text, start_offset, end_offset);
+ return vte_view_accessible_add_selection (text, start_offset, end_offset);
}
static gboolean
-vte_terminal_accessible_set_caret_offset(AtkText *text, gint offset)
+vte_view_accessible_set_caret_offset(AtkText *text, gint offset)
{
- g_assert(VTE_IS_TERMINAL_ACCESSIBLE(text));
- vte_terminal_accessible_update_private_data_if_needed(ATK_OBJECT(text),
+ g_assert(VTE_IS_VIEW_ACCESSIBLE(text));
+ vte_view_accessible_update_private_data_if_needed(ATK_OBJECT(text),
NULL, NULL);
/* Whoa, very not allowed. */
return FALSE;
}
static void
-vte_terminal_accessible_text_init(gpointer iface, gpointer data)
+vte_view_accessible_text_init(gpointer iface, gpointer data)
{
AtkTextIface *text;
g_assert(G_TYPE_FROM_INTERFACE(iface) == ATK_TYPE_TEXT);
text = iface;
_vte_debug_print(VTE_DEBUG_ALLY,
"Initializing accessible peer's AtkText interface.\n");
- text->get_text = vte_terminal_accessible_get_text;
- text->get_text_after_offset = vte_terminal_accessible_get_text_after_offset;
- text->get_text_at_offset = vte_terminal_accessible_get_text_at_offset;
- text->get_character_at_offset = vte_terminal_accessible_get_character_at_offset;
- text->get_text_before_offset = vte_terminal_accessible_get_text_before_offset;
- text->get_caret_offset = vte_terminal_accessible_get_caret_offset;
- text->get_run_attributes = vte_terminal_accessible_get_run_attributes;
- text->get_default_attributes = vte_terminal_accessible_get_default_attributes;
- text->get_character_extents = vte_terminal_accessible_get_character_extents;
- text->get_character_count = vte_terminal_accessible_get_character_count;
- text->get_offset_at_point = vte_terminal_accessible_get_offset_at_point;
- text->get_n_selections = vte_terminal_accessible_get_n_selections;
- text->get_selection = vte_terminal_accessible_get_selection;
- text->add_selection = vte_terminal_accessible_add_selection;
- text->remove_selection = vte_terminal_accessible_remove_selection;
- text->set_selection = vte_terminal_accessible_set_selection;
- text->set_caret_offset = vte_terminal_accessible_set_caret_offset;
+ text->get_text = vte_view_accessible_get_text;
+ text->get_text_after_offset = vte_view_accessible_get_text_after_offset;
+ text->get_text_at_offset = vte_view_accessible_get_text_at_offset;
+ text->get_character_at_offset = vte_view_accessible_get_character_at_offset;
+ text->get_text_before_offset = vte_view_accessible_get_text_before_offset;
+ text->get_caret_offset = vte_view_accessible_get_caret_offset;
+ text->get_run_attributes = vte_view_accessible_get_run_attributes;
+ text->get_default_attributes = vte_view_accessible_get_default_attributes;
+ text->get_character_extents = vte_view_accessible_get_character_extents;
+ text->get_character_count = vte_view_accessible_get_character_count;
+ text->get_offset_at_point = vte_view_accessible_get_offset_at_point;
+ text->get_n_selections = vte_view_accessible_get_n_selections;
+ text->get_selection = vte_view_accessible_get_selection;
+ text->add_selection = vte_view_accessible_add_selection;
+ text->remove_selection = vte_view_accessible_remove_selection;
+ text->set_selection = vte_view_accessible_set_selection;
+ text->set_caret_offset = vte_view_accessible_set_caret_offset;
}
static AtkLayer
-vte_terminal_accessible_get_layer(AtkComponent *component)
+vte_view_accessible_get_layer(AtkComponent *component)
{
return ATK_LAYER_WIDGET;
}
static gint
-vte_terminal_accessible_get_mdi_zorder(AtkComponent *component)
+vte_view_accessible_get_mdi_zorder(AtkComponent *component)
{
return G_MININT;
}
static gboolean
-vte_terminal_accessible_contains(AtkComponent *component,
+vte_view_accessible_contains(AtkComponent *component,
gint x, gint y,
AtkCoordType coord_type)
{
@@ -1697,7 +1697,7 @@ vte_terminal_accessible_contains(AtkComponent *component,
}
static void
-vte_terminal_accessible_get_extents(AtkComponent *component,
+vte_view_accessible_get_extents(AtkComponent *component,
gint *x, gint *y,
gint *width, gint *height,
AtkCoordType coord_type)
@@ -1707,7 +1707,7 @@ vte_terminal_accessible_get_extents(AtkComponent *component,
}
static void
-vte_terminal_accessible_get_position(AtkComponent *component,
+vte_view_accessible_get_position(AtkComponent *component,
gint *x, gint *y,
AtkCoordType coord_type)
{
@@ -1735,7 +1735,7 @@ vte_terminal_accessible_get_position(AtkComponent *component,
}
static void
-vte_terminal_accessible_get_size(AtkComponent *component,
+vte_view_accessible_get_size(AtkComponent *component,
gint *width, gint *height)
{
GtkWidget *widget;
@@ -1757,7 +1757,7 @@ vte_terminal_accessible_get_size(AtkComponent *component,
}
static gboolean
-vte_terminal_accessible_set_extents(AtkComponent *component,
+vte_view_accessible_set_extents(AtkComponent *component,
gint x, gint y,
gint width, gint height,
AtkCoordType coord_type)
@@ -1768,7 +1768,7 @@ vte_terminal_accessible_set_extents(AtkComponent *component,
}
static gboolean
-vte_terminal_accessible_set_position(AtkComponent *component,
+vte_view_accessible_set_position(AtkComponent *component,
gint x, gint y,
AtkCoordType coord_type)
{
@@ -1777,10 +1777,10 @@ vte_terminal_accessible_set_position(AtkComponent *component,
}
static gboolean
-vte_terminal_accessible_set_size(AtkComponent *component,
+vte_view_accessible_set_size(AtkComponent *component,
gint width, gint height)
{
- VteTerminal *terminal;
+ VteView *terminal;
VteBuffer *buffer;
long columns, rows;
GtkWidget *widget;
@@ -1789,12 +1789,12 @@ vte_terminal_accessible_set_size(AtkComponent *component,
if (widget == NULL) {
return FALSE;
}
- terminal = VTE_TERMINAL(widget);
- buffer = vte_terminal_get_buffer(terminal);
+ terminal = VTE_VIEW(widget);
+ buffer = vte_view_get_buffer(terminal);
/* If the size is an exact multiple of the cell size, use that,
* otherwise round down. */
- if (!_vte_terminal_size_to_grid_size(terminal, width, height, &columns, &rows))
+ if (!_vte_view_size_to_grid_size(terminal, width, height, &columns, &rows))
return FALSE;
vte_buffer_set_size(buffer, columns, rows);
@@ -1804,7 +1804,7 @@ vte_terminal_accessible_set_size(AtkComponent *component,
static AtkObject *
-vte_terminal_accessible_ref_accessible_at_point(AtkComponent *component,
+vte_view_accessible_ref_accessible_at_point(AtkComponent *component,
gint x, gint y,
AtkCoordType coord_type)
{
@@ -1813,12 +1813,12 @@ vte_terminal_accessible_ref_accessible_at_point(AtkComponent *component,
}
static guint
-vte_terminal_accessible_add_focus_handler(AtkComponent *component,
+vte_view_accessible_add_focus_handler(AtkComponent *component,
AtkFocusHandler handler)
{
guint signal_id;
signal_id = g_signal_lookup("focus-event",
- VTE_TYPE_TERMINAL_ACCESSIBLE);
+ VTE_TYPE_VIEW_ACCESSIBLE);
if (g_signal_handler_find(component,
G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_ID,
signal_id,
@@ -1833,7 +1833,7 @@ vte_terminal_accessible_add_focus_handler(AtkComponent *component,
}
static void
-vte_terminal_accessible_remove_focus_handler(AtkComponent *component,
+vte_view_accessible_remove_focus_handler(AtkComponent *component,
guint handler_id)
{
g_assert(g_signal_handler_is_connected(component, handler_id));
@@ -1841,7 +1841,7 @@ vte_terminal_accessible_remove_focus_handler(AtkComponent *component,
}
static void
-vte_terminal_accessible_component_init(gpointer iface, gpointer data)
+vte_view_accessible_component_init(gpointer iface, gpointer data)
{
AtkComponentIface *component;
g_assert(G_TYPE_FROM_INTERFACE(iface) == ATK_TYPE_COMPONENT);
@@ -1851,24 +1851,24 @@ vte_terminal_accessible_component_init(gpointer iface, gpointer data)
"Initializing accessible peer's "
"AtkComponent interface.\n");
/* Set our virtual functions. */
- component->add_focus_handler = vte_terminal_accessible_add_focus_handler;
- component->contains = vte_terminal_accessible_contains;
- component->ref_accessible_at_point = vte_terminal_accessible_ref_accessible_at_point;
- component->get_extents = vte_terminal_accessible_get_extents;
- component->get_position = vte_terminal_accessible_get_position;
- component->get_size = vte_terminal_accessible_get_size;
- component->remove_focus_handler = vte_terminal_accessible_remove_focus_handler;
- component->set_extents = vte_terminal_accessible_set_extents;
- component->set_position = vte_terminal_accessible_set_position;
- component->set_size = vte_terminal_accessible_set_size;
- component->get_layer = vte_terminal_accessible_get_layer;
- component->get_mdi_zorder = vte_terminal_accessible_get_mdi_zorder;
+ component->add_focus_handler = vte_view_accessible_add_focus_handler;
+ component->contains = vte_view_accessible_contains;
+ component->ref_accessible_at_point = vte_view_accessible_ref_accessible_at_point;
+ component->get_extents = vte_view_accessible_get_extents;
+ component->get_position = vte_view_accessible_get_position;
+ component->get_size = vte_view_accessible_get_size;
+ component->remove_focus_handler = vte_view_accessible_remove_focus_handler;
+ component->set_extents = vte_view_accessible_set_extents;
+ component->set_position = vte_view_accessible_set_position;
+ component->set_size = vte_view_accessible_set_size;
+ component->get_layer = vte_view_accessible_get_layer;
+ component->get_mdi_zorder = vte_view_accessible_get_mdi_zorder;
}
/* AtkAction interface */
static gboolean
-vte_terminal_accessible_do_action (AtkAction *accessible, int i)
+vte_view_accessible_do_action (AtkAction *accessible, int i)
{
GtkWidget *widget;
gboolean retval = FALSE;
@@ -1885,49 +1885,49 @@ vte_terminal_accessible_do_action (AtkAction *accessible, int i)
g_signal_emit_by_name (widget, "popup_menu", &retval);
break;
default :
- g_warning ("Invalid action passed to VteTerminalAccessible::do_action");
+ g_warning ("Invalid action passed to VteViewAccessible::do_action");
return FALSE;
}
return retval;
}
static int
-vte_terminal_accessible_get_n_actions (AtkAction *accessible)
+vte_view_accessible_get_n_actions (AtkAction *accessible)
{
return LAST_ACTION;
}
static const char *
-vte_terminal_accessible_action_get_description (AtkAction *accessible, int i)
+vte_view_accessible_action_get_description (AtkAction *accessible, int i)
{
- VteTerminalAccessiblePrivate *priv;
+ VteViewAccessiblePrivate *priv;
g_return_val_if_fail (i < LAST_ACTION, NULL);
- g_return_val_if_fail(VTE_IS_TERMINAL_ACCESSIBLE(accessible), NULL);
+ g_return_val_if_fail(VTE_IS_VIEW_ACCESSIBLE(accessible), NULL);
/* Retrieve the private data structure. It must already exist. */
priv = g_object_get_data(G_OBJECT(accessible),
- VTE_TERMINAL_ACCESSIBLE_PRIVATE_DATA);
+ VTE_VIEW_ACCESSIBLE_PRIVATE_DATA);
g_return_val_if_fail(priv != NULL, NULL);
if (priv->action_descriptions[i]) {
return priv->action_descriptions[i];
} else {
- return vte_terminal_accessible_action_descriptions[i];
+ return vte_view_accessible_action_descriptions[i];
}
}
static const char *
-vte_terminal_accessible_action_get_name (AtkAction *accessible, int i)
+vte_view_accessible_action_get_name (AtkAction *accessible, int i)
{
g_return_val_if_fail (i < LAST_ACTION, NULL);
- return vte_terminal_accessible_action_names[i];
+ return vte_view_accessible_action_names[i];
}
static const char *
-vte_terminal_accessible_action_get_keybinding (AtkAction *accessible, int i)
+vte_view_accessible_action_get_keybinding (AtkAction *accessible, int i)
{
g_return_val_if_fail (i < LAST_ACTION, NULL);
@@ -1935,19 +1935,19 @@ vte_terminal_accessible_action_get_keybinding (AtkAction *accessible, int i)
}
static gboolean
-vte_terminal_accessible_action_set_description (AtkAction *accessible,
+vte_view_accessible_action_set_description (AtkAction *accessible,
int i,
const char *description)
{
- VteTerminalAccessiblePrivate *priv;
+ VteViewAccessiblePrivate *priv;
g_return_val_if_fail (i < LAST_ACTION, FALSE);
- g_return_val_if_fail(VTE_IS_TERMINAL_ACCESSIBLE(accessible), FALSE);
+ g_return_val_if_fail(VTE_IS_VIEW_ACCESSIBLE(accessible), FALSE);
/* Retrieve the private data structure. It must already exist. */
priv = g_object_get_data(G_OBJECT(accessible),
- VTE_TERMINAL_ACCESSIBLE_PRIVATE_DATA);
+ VTE_VIEW_ACCESSIBLE_PRIVATE_DATA);
g_return_val_if_fail(priv != NULL, FALSE);
if (priv->action_descriptions[i]) {
@@ -1959,7 +1959,7 @@ vte_terminal_accessible_action_set_description (AtkAction *accessible,
}
static void
-vte_terminal_accessible_action_init(gpointer iface, gpointer data)
+vte_view_accessible_action_init(gpointer iface, gpointer data)
{
AtkActionIface *action;
g_return_if_fail(G_TYPE_FROM_INTERFACE(iface) == ATK_TYPE_ACTION);
@@ -1969,30 +1969,30 @@ vte_terminal_accessible_action_init(gpointer iface, gpointer data)
"Initializing accessible peer's "
"AtkAction interface.\n");
/* Set our virtual functions. */
- action->do_action = vte_terminal_accessible_do_action;
- action->get_n_actions = vte_terminal_accessible_get_n_actions;
- action->get_description = vte_terminal_accessible_action_get_description;
- action->get_name = vte_terminal_accessible_action_get_name;
- action->get_keybinding = vte_terminal_accessible_action_get_keybinding;
- action->set_description = vte_terminal_accessible_action_set_description;
+ action->do_action = vte_view_accessible_do_action;
+ action->get_n_actions = vte_view_accessible_get_n_actions;
+ action->get_description = vte_view_accessible_action_get_description;
+ action->get_name = vte_view_accessible_action_get_name;
+ action->get_keybinding = vte_view_accessible_action_get_keybinding;
+ action->set_description = vte_view_accessible_action_set_description;
}
static void
-vte_terminal_accessible_class_init(gpointer *klass)
+vte_view_accessible_class_init(gpointer *klass)
{
GObjectClass *gobject_class;
AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
- vte_terminal_accessible_parent_class = g_type_class_peek_parent (klass);
+ vte_view_accessible_parent_class = g_type_class_peek_parent (klass);
gobject_class = G_OBJECT_CLASS(klass);
- class->initialize = vte_terminal_initialize;
+ class->initialize = vte_view_initialize;
/* Override the finalize method. */
- gobject_class->finalize = vte_terminal_accessible_finalize;
+ gobject_class->finalize = vte_view_accessible_finalize;
}
GType
-_vte_terminal_accessible_get_type(void)
+_vte_view_accessible_get_type(void)
{
static GType terminal_accessible_type = 0;
@@ -2003,17 +2003,17 @@ _vte_terminal_accessible_get_type(void)
GTypeQuery type_info;
GInterfaceInfo text = {
- vte_terminal_accessible_text_init,
+ vte_view_accessible_text_init,
NULL,
NULL,
};
GInterfaceInfo component = {
- vte_terminal_accessible_component_init,
+ vte_view_accessible_component_init,
NULL,
NULL,
};
GInterfaceInfo action = {
- vte_terminal_accessible_action_init,
+ vte_view_accessible_action_init,
NULL,
NULL,
};
@@ -2022,7 +2022,7 @@ _vte_terminal_accessible_get_type(void)
(GBaseInitFunc)NULL,
(GBaseFinalizeFunc)NULL,
- (GClassInitFunc)vte_terminal_accessible_class_init,
+ (GClassInitFunc)vte_view_accessible_class_init,
(GClassFinalizeFunc)NULL,
(gconstpointer)NULL,
@@ -2034,7 +2034,7 @@ _vte_terminal_accessible_get_type(void)
};
/* Find the Atk object used for the parent (GtkWidget) type. */
- parent_type = g_type_parent(VTE_TYPE_TERMINAL);
+ parent_type = g_type_parent(VTE_TYPE_VIEW);
factory = atk_registry_get_factory(atk_get_default_registry(),
parent_type);
parent_accessible_type = atk_object_factory_get_accessible_type(factory);
@@ -2057,7 +2057,7 @@ _vte_terminal_accessible_get_type(void)
terminal_accessible_info.instance_size = type_info.instance_size;
/* Register the class with the GObject type system. */
terminal_accessible_type = g_type_register_static(parent_accessible_type,
- "VteTerminalAccessible",
+ "VteViewAccessible",
&terminal_accessible_info,
0);
@@ -2078,8 +2078,8 @@ _vte_terminal_accessible_get_type(void)
* Atk type registry. */
registry = atk_get_default_registry();
atk_registry_set_factory_type(registry,
- VTE_TYPE_TERMINAL,
- VTE_TYPE_TERMINAL_ACCESSIBLE_FACTORY);
+ VTE_TYPE_VIEW,
+ VTE_TYPE_VIEW_ACCESSIBLE_FACTORY);
}
return terminal_accessible_type;
@@ -2087,38 +2087,38 @@ _vte_terminal_accessible_get_type(void)
/* Create an accessible peer for the object. */
static AtkObject *
-vte_terminal_accessible_factory_create_accessible(GObject *obj)
+vte_view_accessible_factory_create_accessible(GObject *obj)
{
GtkAccessible *accessible;
- VteTerminal *terminal;
+ VteView *terminal;
- g_assert(VTE_IS_TERMINAL(obj));
+ g_assert(VTE_IS_VIEW(obj));
- terminal = VTE_TERMINAL(obj);
- accessible = GTK_ACCESSIBLE(_vte_terminal_accessible_new(terminal));
+ terminal = VTE_VIEW(obj);
+ accessible = GTK_ACCESSIBLE(_vte_view_accessible_new(terminal));
g_assert(accessible != NULL);
return ATK_OBJECT(accessible);
}
static void
-_vte_terminal_accessible_factory_class_init(VteTerminalAccessibleFactoryClass *klass)
+_vte_view_accessible_factory_class_init(VteViewAccessibleFactoryClass *klass)
{
AtkObjectFactoryClass *class = ATK_OBJECT_FACTORY_CLASS(klass);
/* Override the one method we care about. */
- class->create_accessible = vte_terminal_accessible_factory_create_accessible;
+ class->create_accessible = vte_view_accessible_factory_create_accessible;
}
static void
-_vte_terminal_accessible_factory_init(VteTerminalAccessibleFactory *self)
+_vte_view_accessible_factory_init(VteViewAccessibleFactory *self)
{
/* nothing to initialise */
}
AtkObjectFactory *
-_vte_terminal_accessible_factory_new(void)
+_vte_view_accessible_factory_new(void)
{
_vte_debug_print(VTE_DEBUG_ALLY,
- "Creating a new VteTerminalAccessibleFactory.\n");
- return g_object_new(VTE_TYPE_TERMINAL_ACCESSIBLE_FACTORY, NULL);
+ "Creating a new VteViewAccessibleFactory.\n");
+ return g_object_new(VTE_TYPE_VIEW_ACCESSIBLE_FACTORY, NULL);
}
diff --git a/src/vteaccess.h b/src/vteaccess.h
index aaf057c..4838819 100644
--- a/src/vteaccess.h
+++ b/src/vteaccess.h
@@ -26,60 +26,60 @@
G_BEGIN_DECLS
-#define VTE_TYPE_TERMINAL_ACCESSIBLE (_vte_terminal_accessible_get_type ())
-#define VTE_TERMINAL_ACCESSIBLE(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), VTE_TYPE_TERMINAL_ACCESSIBLE, VteTerminalAccessible))
-#define VTE_TERMINAL_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), VTE_TYPE_TERMINAL_ACCESSIBLE, VteTerminalAccessibleClass))
-#define VTE_IS_TERMINAL_ACCESSIBLE(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), VTE_TYPE_TERMINAL_ACCESSIBLE))
-#define VTE_IS_TERMINAL_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), VTE_TYPE_TERMINAL_ACCESSIBLE))
-#define VTE_TERMINAL_ACCESSIBLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), VTE_TYPE_TERMINAL_ACCESSIBLE, VteTerminalAccessibleClass))
+#define VTE_TYPE_VIEW_ACCESSIBLE (_vte_view_accessible_get_type ())
+#define VTE_VIEW_ACCESSIBLE(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), VTE_TYPE_VIEW_ACCESSIBLE, VteViewAccessible))
+#define VTE_VIEW_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), VTE_TYPE_VIEW_ACCESSIBLE, VteViewAccessibleClass))
+#define VTE_IS_VIEW_ACCESSIBLE(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), VTE_TYPE_VIEW_ACCESSIBLE))
+#define VTE_IS_VIEW_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), VTE_TYPE_VIEW_ACCESSIBLE))
+#define VTE_VIEW_ACCESSIBLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), VTE_TYPE_VIEW_ACCESSIBLE, VteViewAccessibleClass))
-typedef struct _VteTerminalAccessible VteTerminalAccessible;
-typedef struct _VteTerminalAccessibleClass VteTerminalAccessibleClass;
+typedef struct _VteViewAccessible VteViewAccessible;
+typedef struct _VteViewAccessibleClass VteViewAccessibleClass;
/**
- * VteTerminalAccessible:
+ * VteViewAccessible:
*
- * The accessible peer for #VteTerminal.
+ * The accessible peer for #VteView.
*/
-struct _VteTerminalAccessible {
+struct _VteViewAccessible {
GtkAccessible parent;
/*< private > */
/* Unknown GailWidget implementation stuffs, exact size of which is
* worked out at run-time. */
};
-struct _VteTerminalAccessibleClass {
+struct _VteViewAccessibleClass {
GtkAccessibleClass parent_class;
/*< private > */
/* Unknown GailWidgetClass implementation stuffs, exact size of which
* is worked out at run-time. */
};
-GType _vte_terminal_accessible_get_type(void);
+GType _vte_view_accessible_get_type(void);
-AtkObject *_vte_terminal_accessible_new(VteTerminal *terminal);
+AtkObject *_vte_view_accessible_new(VteView *terminal);
-#define VTE_TYPE_TERMINAL_ACCESSIBLE_FACTORY (_vte_terminal_accessible_factory_get_type ())
-#define VTE_TERMINAL_ACCESSIBLE_FACTORY(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), VTE_TYPE_TERMINAL_ACCESSIBLE_FACTORY, VteTerminalAccessibleFactory))
-#define VTE_TERMINAL_ACCESSIBLE_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), VTE_TYPE_TERMINAL_ACCESSIBLE_FACTORY, VteTerminalAccessibleFactoryClass))
-#define VTE_IS_TERMINAL_ACCESSIBLE_FACTORY(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), VTE_TYPE_TERMINAL_ACCESSIBLE_FACTORY))
-#define VTE_IS_TERMINAL_ACCESSIBLE_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), VTE_TYPE_TERMINAL_ACCESSIBLE_FACTORY))
-#define VTE_TERMINAL_ACCESSIBLE_FACTORY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), VTE_TYPE_TERMINAL_ACCESSIBLE_FACTORY, VteTerminalAccessibleFactoryClass))
+#define VTE_TYPE_VIEW_ACCESSIBLE_FACTORY (_vte_view_accessible_factory_get_type ())
+#define VTE_VIEW_ACCESSIBLE_FACTORY(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), VTE_TYPE_VIEW_ACCESSIBLE_FACTORY, VteViewAccessibleFactory))
+#define VTE_VIEW_ACCESSIBLE_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), VTE_TYPE_VIEW_ACCESSIBLE_FACTORY, VteViewAccessibleFactoryClass))
+#define VTE_IS_VIEW_ACCESSIBLE_FACTORY(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), VTE_TYPE_VIEW_ACCESSIBLE_FACTORY))
+#define VTE_IS_VIEW_ACCESSIBLE_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), VTE_TYPE_VIEW_ACCESSIBLE_FACTORY))
+#define VTE_VIEW_ACCESSIBLE_FACTORY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), VTE_TYPE_VIEW_ACCESSIBLE_FACTORY, VteViewAccessibleFactoryClass))
-typedef struct _VteTerminalAccessibleFactory VteTerminalAccessibleFactory;
-typedef struct _VteTerminalAccessibleFactoryClass VteTerminalAccessibleFactoryClass;
+typedef struct _VteViewAccessibleFactory VteViewAccessibleFactory;
+typedef struct _VteViewAccessibleFactoryClass VteViewAccessibleFactoryClass;
-struct _VteTerminalAccessibleFactory {
+struct _VteViewAccessibleFactory {
AtkObjectFactory parent;
};
-struct _VteTerminalAccessibleFactoryClass {
+struct _VteViewAccessibleFactoryClass {
AtkObjectFactoryClass parent;
};
-GType _vte_terminal_accessible_factory_get_type(void);
+GType _vte_view_accessible_factory_get_type(void);
-AtkObjectFactory *_vte_terminal_accessible_factory_new(void);
+AtkObjectFactory *_vte_view_accessible_factory_new(void);
G_END_DECLS
diff --git a/src/vteapp.c b/src/vteapp.c
index da45298..4d9809d 100644
--- a/src/vteapp.c
+++ b/src/vteapp.c
@@ -60,15 +60,15 @@ icon_title_changed(VteBuffer *buffer, GtkWindow *window)
static void
char_size_changed(GtkWidget *widget, guint width, guint height, gpointer data)
{
- VteTerminal *terminal;
+ VteView *terminal;
GtkWindow *window;
GdkGeometry geometry;
GtkBorder padding;
g_assert(GTK_IS_WINDOW(data));
- g_assert(VTE_IS_TERMINAL(widget));
+ g_assert(VTE_IS_VIEW(widget));
- terminal = VTE_TERMINAL(widget);
+ terminal = VTE_VIEW(widget);
window = GTK_WINDOW(data);
if (!gtk_widget_get_realized (GTK_WIDGET (window)))
return;
@@ -92,16 +92,16 @@ char_size_changed(GtkWidget *widget, guint width, guint height, gpointer data)
static void
char_size_realized(GtkWidget *widget, gpointer data)
{
- VteTerminal *terminal;
+ VteView *terminal;
GtkWindow *window;
GdkGeometry geometry;
guint width, height;
GtkBorder padding;
g_assert(GTK_IS_WINDOW(data));
- g_assert(VTE_IS_TERMINAL(widget));
+ g_assert(VTE_IS_VIEW(widget));
- terminal = VTE_TERMINAL(widget);
+ terminal = VTE_VIEW(widget);
window = GTK_WINDOW(data);
if (!gtk_widget_get_realized (GTK_WIDGET(window)))
return;
@@ -109,8 +109,8 @@ char_size_realized(GtkWidget *widget, gpointer data)
gtk_style_context_get_padding(gtk_widget_get_style_context(widget),
gtk_widget_get_state_flags(widget),
&padding);
- width = vte_terminal_get_char_width (terminal);
- height = vte_terminal_get_char_height (terminal);
+ width = vte_view_get_char_width (terminal);
+ height = vte_view_get_char_height (terminal);
geometry.width_inc = width;
geometry.height_inc = height;
geometry.base_width = padding.left + padding.right;
@@ -126,7 +126,7 @@ char_size_realized(GtkWidget *widget, gpointer data)
static void
-destroy_and_quit(VteTerminal *terminal, GtkWidget *window)
+destroy_and_quit(VteView *terminal, GtkWidget *window)
{
const char *output_file = g_object_get_data (G_OBJECT (terminal), "output_file");
@@ -139,7 +139,7 @@ destroy_and_quit(VteTerminal *terminal, GtkWidget *window)
stream = G_OUTPUT_STREAM (g_file_replace (file, NULL, FALSE, G_FILE_CREATE_NONE, NULL, &error));
if (stream) {
- vte_buffer_write_contents_sync(vte_terminal_get_buffer(terminal), stream,
+ vte_buffer_write_contents_sync(vte_view_get_buffer(terminal), stream,
VTE_WRITE_FLAG_DEFAULT,
NULL, &error);
g_object_unref (stream);
@@ -159,13 +159,13 @@ destroy_and_quit(VteTerminal *terminal, GtkWidget *window)
static void
delete_event(GtkWidget *window, GdkEvent *event, gpointer terminal)
{
- destroy_and_quit(VTE_TERMINAL (terminal), window);
+ destroy_and_quit(VTE_VIEW (terminal), window);
}
static void
child_exited(VteBuffer *buffer, int status, gpointer terminal)
{
_vte_debug_print(VTE_DEBUG_MISC, "Child exited with status %x\n", status);
- destroy_and_quit(VTE_TERMINAL (terminal), gtk_widget_get_toplevel(terminal));
+ destroy_and_quit(VTE_VIEW (terminal), gtk_widget_get_toplevel(terminal));
}
static void
@@ -178,7 +178,7 @@ status_line_changed(VteBuffer *buffer, gpointer data)
static int
button_pressed(GtkWidget *widget, GdkEventButton *event, gpointer data)
{
- VteTerminal *terminal;
+ VteView *terminal;
char *match;
int tag;
GtkBorder padding;
@@ -186,14 +186,14 @@ button_pressed(GtkWidget *widget, GdkEventButton *event, gpointer data)
switch (event->button) {
case 3:
- terminal = VTE_TERMINAL(widget);
+ terminal = VTE_VIEW(widget);
gtk_style_context_get_padding(gtk_widget_get_style_context(widget),
gtk_widget_get_state_flags(widget),
&padding);
- char_width = vte_terminal_get_char_width (terminal);
- char_height = vte_terminal_get_char_height (terminal);
- match = vte_terminal_match_check(terminal,
+ char_width = vte_view_get_char_width (terminal);
+ char_height = vte_view_get_char_height (terminal);
+ match = vte_view_match_check(terminal,
(event->x - padding.left) / char_width,
(event->y - padding.top) / char_height,
&tag);
@@ -201,7 +201,7 @@ button_pressed(GtkWidget *widget, GdkEventButton *event, gpointer data)
g_print("Matched `%s' (%d).\n", match, tag);
g_free(match);
if (GPOINTER_TO_INT(data) != 0) {
- vte_terminal_match_remove(terminal, tag);
+ vte_view_match_remove(terminal, tag);
}
}
break;
@@ -284,7 +284,7 @@ refresh_window(VteBuffer *buffer, gpointer data)
GtkAllocation allocation;
cairo_rectangle_int_t rect;
- /* FIXMEchpe: VteTerminal already does invalidate-all here! */
+ /* FIXMEchpe: VteView already does invalidate-all here! */
if (GTK_IS_WIDGET(data)) {
window = gtk_widget_get_window(GTK_WIDGET(data));
if (window) {
@@ -298,7 +298,7 @@ refresh_window(VteBuffer *buffer, gpointer data)
}
static void
-resize_window(VteBuffer *buffer, guint width, guint height, VteTerminal *terminal)
+resize_window(VteBuffer *buffer, guint width, guint height, VteView *terminal)
{
GtkWidget *widget = &terminal->widget;
GtkWidget *window;
@@ -311,8 +311,8 @@ resize_window(VteBuffer *buffer, guint width, guint height, VteTerminal *termina
gtk_window_get_size(GTK_WINDOW(window), &owidth, &oheight);
/* Take into account border overhead. */
- char_width = vte_terminal_get_char_width (terminal);
- char_height = vte_terminal_get_char_height (terminal);
+ char_width = vte_view_get_char_width (terminal);
+ char_height = vte_view_get_char_height (terminal);
column_count = vte_buffer_get_column_count (buffer);
row_count = vte_buffer_get_row_count (buffer);
gtk_style_context_get_padding(gtk_widget_get_style_context(widget),
@@ -342,34 +342,34 @@ move_window(VteBuffer *buffer, guint x, guint y, gpointer data)
static void
adjust_font_size(GtkWidget *widget, gpointer data, gdouble factor)
{
- VteTerminal *terminal;
+ VteView *terminal;
VteBuffer *buffer;
gdouble scale;
glong char_width, char_height;
gint columns, rows, owidth, oheight;
/* Read the screen dimensions in cells. */
- terminal = VTE_TERMINAL(widget);
- buffer = vte_terminal_get_buffer(terminal);
+ terminal = VTE_VIEW(widget);
+ buffer = vte_view_get_buffer(terminal);
columns = vte_buffer_get_column_count(buffer);
rows = vte_buffer_get_row_count(buffer);
/* Take into account padding and border overhead. */
gtk_window_get_size(GTK_WINDOW(data), &owidth, &oheight);
- char_width = vte_terminal_get_char_width (terminal);
- char_height = vte_terminal_get_char_height (terminal);
+ char_width = vte_view_get_char_width (terminal);
+ char_height = vte_view_get_char_height (terminal);
owidth -= char_width * columns;
oheight -= char_height * rows;
- scale = vte_terminal_get_font_scale(terminal);
- vte_terminal_set_font_scale(terminal, scale * factor);
+ scale = vte_view_get_font_scale(terminal);
+ vte_view_set_font_scale(terminal, scale * factor);
/* Change the font, then resize the window so that we have the same
* number of rows and columns. */
/* This above call will have changed the char size! */
- char_width = vte_terminal_get_char_width (terminal);
- char_height = vte_terminal_get_char_height (terminal);
+ char_width = vte_view_get_char_width (terminal);
+ char_height = vte_view_get_char_height (terminal);
gtk_window_resize(GTK_WINDOW(data),
columns * char_width + owidth,
@@ -394,11 +394,11 @@ read_and_feed(GIOChannel *source, GIOCondition condition, gpointer data)
char buf[2048];
gsize size;
GIOStatus status;
- g_assert(VTE_IS_TERMINAL(data));
+ g_assert(VTE_IS_VIEW(data));
status = g_io_channel_read_chars(source, buf, sizeof(buf),
&size, NULL);
if ((status == G_IO_STATUS_NORMAL) && (size > 0)) {
- vte_buffer_feed(vte_terminal_get_buffer(VTE_TERMINAL(data)), buf, size);
+ vte_buffer_feed(vte_view_get_buffer(VTE_VIEW(data)), buf, size);
return TRUE;
}
return FALSE;
@@ -465,7 +465,7 @@ terminal_notify_cb(GObject *object,
char *value_string;
if (!pspec ||
- pspec->owner_type != VTE_TYPE_TERMINAL)
+ pspec->owner_type != VTE_TYPE_VIEW)
return;
@@ -483,15 +483,15 @@ typedef struct _VteappTerminal VteappTerminal;
typedef struct _VteappTerminalClass VteappTerminalClass;
struct _VteappTerminalClass {
- VteTerminalClass parent_class;
+ VteViewClass parent_class;
};
struct _VteappTerminal {
- VteTerminal parent_instance;
+ VteView parent_instance;
};
static GType vteapp_terminal_get_type(void);
-G_DEFINE_TYPE(VteappTerminal, vteapp_terminal, VTE_TYPE_TERMINAL)
+G_DEFINE_TYPE(VteappTerminal, vteapp_terminal, VTE_TYPE_VIEW)
static void
vteapp_terminal_class_init(VteappTerminalClass *klass)
@@ -559,7 +559,7 @@ parse_flags(GType type,
}
static void
-add_dingus (VteTerminal *terminal,
+add_dingus (VteView *terminal,
char **dingus)
{
const GdkCursorType cursors[] = { GDK_GUMBY, GDK_HAND1 };
@@ -576,9 +576,9 @@ add_dingus (VteTerminal *terminal,
continue;
}
- id = vte_terminal_match_add_gregex(terminal, regex, 0);
+ id = vte_view_match_add_gregex(terminal, regex, 0);
g_regex_unref (regex);
- vte_terminal_match_set_cursor_type(terminal, id,
+ vte_view_match_set_cursor_type(terminal, id,
cursors[i % G_N_ELEMENTS(cursors)]);
}
}
@@ -589,7 +589,7 @@ main(int argc, char **argv)
GdkScreen *screen;
GdkVisual *visual;
GtkWidget *window, *widget,*hbox = NULL, *scrollbar, *scrolled_window = NULL;
- VteTerminal *terminal;
+ VteView *terminal;
VteBuffer *buffer;
char *env_add[] = {
#ifdef VTE_DEBUG
@@ -757,7 +757,7 @@ main(int argc, char **argv)
{
"object-notifications", 'N', 0,
G_OPTION_ARG_NONE, &show_object_notifications,
- "Print VteTerminal object notifications",
+ "Print VteView object notifications",
NULL
},
{
@@ -850,44 +850,44 @@ main(int argc, char **argv)
g_string_append_c (css_string, '\n');
}
- g_string_append (css_string, "VteTerminal {\n");
+ g_string_append (css_string, "VteView {\n");
if (background) {
g_string_append_printf (css_string, "background-image: url(\"%s\");\n",
background);
g_free(background);
}
if (cursor_color_string) {
- g_string_append_printf (css_string, "-VteTerminal-cursor-background-color: %s;\n"
- "-VteTerminal-cursor-effect: color;\n",
+ g_string_append_printf (css_string, "-VteView-cursor-background-color: %s;\n"
+ "-VteView-cursor-effect: color;\n",
cursor_color_string);
g_free(cursor_color_string);
}
if (selection_background_color_string) {
- g_string_append_printf (css_string, "-VteTerminal-selection-background-color: %s;\n"
- "-VteTerminal-selection-effect: color;\n",
+ g_string_append_printf (css_string, "-VteView-selection-background-color: %s;\n"
+ "-VteView-selection-effect: color;\n",
selection_background_color_string);
g_free(selection_background_color_string);
}
if (cursor_blink_mode_string) {
- g_string_append_printf (css_string, "-VteTerminal-cursor-blink-mode: %s;\n",
+ g_string_append_printf (css_string, "-VteView-cursor-blink-mode: %s;\n",
cursor_blink_mode_string);
g_free(cursor_blink_mode_string);
}
if (cursor_shape_string) {
- g_string_append_printf (css_string, "-VteTerminal-cursor-shape: %s;\n",
+ g_string_append_printf (css_string, "-VteView-cursor-shape: %s;\n",
cursor_shape_string);
g_free(cursor_shape_string);
}
if (font) {
- g_string_append_printf (css_string, "-VteTerminal-font: %s;\n",
+ g_string_append_printf (css_string, "-VteView-font: %s;\n",
font);
g_free(font);
}
if (scroll) {
- g_string_append (css_string, "-VteTerminal-scroll-background: true;\n");
+ g_string_append (css_string, "-VteView-scroll-background: true;\n");
}
if (reverse) {
- g_string_append (css_string, "-VteTerminal-reverse: true;\n");
+ g_string_append (css_string, "-VteView-reverse: true;\n");
}
g_string_append (css_string, "}\n");
@@ -944,8 +944,8 @@ main(int argc, char **argv)
/* Create the terminal widget and add it to the scrolling shell. */
widget = vteapp_terminal_new();
- terminal = VTE_TERMINAL (widget);
- buffer = vte_terminal_get_buffer(terminal);
+ terminal = VTE_VIEW (widget);
+ buffer = vte_view_get_buffer(terminal);
if (!dbuffer) {
gtk_widget_set_double_buffered(widget, dbuffer);
}
@@ -1017,15 +1017,15 @@ main(int argc, char **argv)
}
/* Set some defaults. */
- vte_terminal_set_audible_bell(terminal, audible);
- vte_terminal_set_visible_bell(terminal, !audible);
- vte_terminal_set_scroll_on_output(terminal, FALSE);
- vte_terminal_set_scroll_on_keystroke(terminal, TRUE);
- vte_buffer_set_scrollback_lines(vte_terminal_get_buffer(terminal), lines);
- vte_terminal_set_mouse_autohide(terminal, TRUE);
+ vte_view_set_audible_bell(terminal, audible);
+ vte_view_set_visible_bell(terminal, !audible);
+ vte_view_set_scroll_on_output(terminal, FALSE);
+ vte_view_set_scroll_on_keystroke(terminal, TRUE);
+ vte_buffer_set_scrollback_lines(vte_view_get_buffer(terminal), lines);
+ vte_view_set_mouse_autohide(terminal, TRUE);
if (termcap != NULL) {
- vte_buffer_set_emulation(vte_terminal_get_buffer(terminal), termcap);
+ vte_buffer_set_emulation(vte_view_get_buffer(terminal), termcap);
}
/* Match "abcdefg". */
@@ -1037,7 +1037,7 @@ main(int argc, char **argv)
g_strfreev (dingus);
}
if (word_chars) {
- vte_terminal_set_word_chars(terminal, word_chars);
+ vte_view_set_word_chars(terminal, word_chars);
g_free(word_chars);
}
@@ -1070,7 +1070,7 @@ main(int argc, char **argv)
G_CALLBACK(take_xconsole_ownership),
NULL);
#ifdef VTE_DEBUG
- vte_buffer_feed(vte_terminal_get_buffer(terminal),
+ vte_buffer_feed(vte_view_get_buffer(terminal),
"Console log for ...\r\n",
-1);
#endif
@@ -1094,7 +1094,7 @@ main(int argc, char **argv)
GPid pid = -1;
_VTE_DEBUG_IF(VTE_DEBUG_MISC)
- vte_buffer_feed(vte_terminal_get_buffer(terminal), message, -1);
+ vte_buffer_feed(vte_view_get_buffer(terminal), message, -1);
if (command == NULL || *command == '\0')
command = vte_get_user_shell ();
diff --git a/src/vteint.h b/src/vteint.h
index fde4a80..7e64fca 100644
--- a/src/vteint.h
+++ b/src/vteint.h
@@ -24,12 +24,12 @@
G_BEGIN_DECLS
-void _vte_terminal_accessible_ref(VteTerminal *terminal);
-char* _vte_terminal_get_selection(VteTerminal *terminal);
-void _vte_terminal_get_start_selection(VteTerminal *terminal, long *x, long *y);
-void _vte_terminal_get_end_selection(VteTerminal *terminal, long *x, long *y);
-void _vte_terminal_select_text(VteTerminal *terminal, long start_x, long start_y, long end_x, long end_y, int start_offset, int end_offset);
-void _vte_terminal_remove_selection(VteTerminal *terminal);
+void _vte_view_accessible_ref(VteView *terminal);
+char* _vte_view_get_selection(VteView *terminal);
+void _vte_view_get_start_selection(VteView *terminal, long *x, long *y);
+void _vte_view_get_end_selection(VteView *terminal, long *x, long *y);
+void _vte_view_select_text(VteView *terminal, long start_x, long start_y, long end_x, long end_y, int start_offset, int end_offset);
+void _vte_view_remove_selection(VteView *terminal);
G_END_DECLS
diff --git a/src/vtepalettecss.h b/src/vtepalettecss.h
index a56ea53..8ba0d4d 100644
--- a/src/vtepalettecss.h
+++ b/src/vtepalettecss.h
@@ -2,264 +2,264 @@
* Command: ./palette --css
*/
-"-VteTerminal-black-color: rgb(0,0,0);\n"
-"-VteTerminal-red-color: rgb(191,0,0);\n"
-"-VteTerminal-green-color: rgb(0,191,0);\n"
-"-VteTerminal-yellow-color: rgb(191,191,0);\n"
-"-VteTerminal-blue-color: rgb(0,0,191);\n"
-"-VteTerminal-magenta-color: rgb(191,0,191);\n"
-"-VteTerminal-cyan-color: rgb(0,191,191);\n"
-"-VteTerminal-white-color: rgb(191,191,191);\n"
-"-VteTerminal-bright-black-color: rgb(0,0,0);\n"
-"-VteTerminal-bright-red-color: rgb(255,0,0);\n"
-"-VteTerminal-bright-green-color: rgb(0,255,0);\n"
-"-VteTerminal-bright-yellow-color: rgb(255,255,0);\n"
-"-VteTerminal-bright-blue-color: rgb(0,0,255);\n"
-"-VteTerminal-bright-magenta-color: rgb(255,0,255);\n"
-"-VteTerminal-bright-cyan-color: rgb(0,255,255);\n"
-"-VteTerminal-bright-white-color: rgb(255,255,255);\n"
-"-VteTerminal-color-6-cube-1-1-1-color: rgb(0,0,0);\n"
-"-VteTerminal-color-6-cube-1-1-2-color: rgb(0,0,95);\n"
-"-VteTerminal-color-6-cube-1-1-3-color: rgb(0,0,135);\n"
-"-VteTerminal-color-6-cube-1-1-4-color: rgb(0,0,175);\n"
-"-VteTerminal-color-6-cube-1-1-5-color: rgb(0,0,215);\n"
-"-VteTerminal-color-6-cube-1-1-6-color: rgb(0,0,255);\n"
-"-VteTerminal-color-6-cube-1-2-1-color: rgb(0,95,0);\n"
-"-VteTerminal-color-6-cube-1-2-2-color: rgb(0,95,95);\n"
-"-VteTerminal-color-6-cube-1-2-3-color: rgb(0,95,135);\n"
-"-VteTerminal-color-6-cube-1-2-4-color: rgb(0,95,175);\n"
-"-VteTerminal-color-6-cube-1-2-5-color: rgb(0,95,215);\n"
-"-VteTerminal-color-6-cube-1-2-6-color: rgb(0,95,255);\n"
-"-VteTerminal-color-6-cube-1-3-1-color: rgb(0,135,0);\n"
-"-VteTerminal-color-6-cube-1-3-2-color: rgb(0,135,95);\n"
-"-VteTerminal-color-6-cube-1-3-3-color: rgb(0,135,135);\n"
-"-VteTerminal-color-6-cube-1-3-4-color: rgb(0,135,175);\n"
-"-VteTerminal-color-6-cube-1-3-5-color: rgb(0,135,215);\n"
-"-VteTerminal-color-6-cube-1-3-6-color: rgb(0,135,255);\n"
-"-VteTerminal-color-6-cube-1-4-1-color: rgb(0,175,0);\n"
-"-VteTerminal-color-6-cube-1-4-2-color: rgb(0,175,95);\n"
-"-VteTerminal-color-6-cube-1-4-3-color: rgb(0,175,135);\n"
-"-VteTerminal-color-6-cube-1-4-4-color: rgb(0,175,175);\n"
-"-VteTerminal-color-6-cube-1-4-5-color: rgb(0,175,215);\n"
-"-VteTerminal-color-6-cube-1-4-6-color: rgb(0,175,255);\n"
-"-VteTerminal-color-6-cube-1-5-1-color: rgb(0,215,0);\n"
-"-VteTerminal-color-6-cube-1-5-2-color: rgb(0,215,95);\n"
-"-VteTerminal-color-6-cube-1-5-3-color: rgb(0,215,135);\n"
-"-VteTerminal-color-6-cube-1-5-4-color: rgb(0,215,175);\n"
-"-VteTerminal-color-6-cube-1-5-5-color: rgb(0,215,215);\n"
-"-VteTerminal-color-6-cube-1-5-6-color: rgb(0,215,255);\n"
-"-VteTerminal-color-6-cube-1-6-1-color: rgb(0,255,0);\n"
-"-VteTerminal-color-6-cube-1-6-2-color: rgb(0,255,95);\n"
-"-VteTerminal-color-6-cube-1-6-3-color: rgb(0,255,135);\n"
-"-VteTerminal-color-6-cube-1-6-4-color: rgb(0,255,175);\n"
-"-VteTerminal-color-6-cube-1-6-5-color: rgb(0,255,215);\n"
-"-VteTerminal-color-6-cube-1-6-6-color: rgb(0,255,255);\n"
-"-VteTerminal-color-6-cube-2-1-1-color: rgb(95,0,0);\n"
-"-VteTerminal-color-6-cube-2-1-2-color: rgb(95,0,95);\n"
-"-VteTerminal-color-6-cube-2-1-3-color: rgb(95,0,135);\n"
-"-VteTerminal-color-6-cube-2-1-4-color: rgb(95,0,175);\n"
-"-VteTerminal-color-6-cube-2-1-5-color: rgb(95,0,215);\n"
-"-VteTerminal-color-6-cube-2-1-6-color: rgb(95,0,255);\n"
-"-VteTerminal-color-6-cube-2-2-1-color: rgb(95,95,0);\n"
-"-VteTerminal-color-6-cube-2-2-2-color: rgb(95,95,95);\n"
-"-VteTerminal-color-6-cube-2-2-3-color: rgb(95,95,135);\n"
-"-VteTerminal-color-6-cube-2-2-4-color: rgb(95,95,175);\n"
-"-VteTerminal-color-6-cube-2-2-5-color: rgb(95,95,215);\n"
-"-VteTerminal-color-6-cube-2-2-6-color: rgb(95,95,255);\n"
-"-VteTerminal-color-6-cube-2-3-1-color: rgb(95,135,0);\n"
-"-VteTerminal-color-6-cube-2-3-2-color: rgb(95,135,95);\n"
-"-VteTerminal-color-6-cube-2-3-3-color: rgb(95,135,135);\n"
-"-VteTerminal-color-6-cube-2-3-4-color: rgb(95,135,175);\n"
-"-VteTerminal-color-6-cube-2-3-5-color: rgb(95,135,215);\n"
-"-VteTerminal-color-6-cube-2-3-6-color: rgb(95,135,255);\n"
-"-VteTerminal-color-6-cube-2-4-1-color: rgb(95,175,0);\n"
-"-VteTerminal-color-6-cube-2-4-2-color: rgb(95,175,95);\n"
-"-VteTerminal-color-6-cube-2-4-3-color: rgb(95,175,135);\n"
-"-VteTerminal-color-6-cube-2-4-4-color: rgb(95,175,175);\n"
-"-VteTerminal-color-6-cube-2-4-5-color: rgb(95,175,215);\n"
-"-VteTerminal-color-6-cube-2-4-6-color: rgb(95,175,255);\n"
-"-VteTerminal-color-6-cube-2-5-1-color: rgb(95,215,0);\n"
-"-VteTerminal-color-6-cube-2-5-2-color: rgb(95,215,95);\n"
-"-VteTerminal-color-6-cube-2-5-3-color: rgb(95,215,135);\n"
-"-VteTerminal-color-6-cube-2-5-4-color: rgb(95,215,175);\n"
-"-VteTerminal-color-6-cube-2-5-5-color: rgb(95,215,215);\n"
-"-VteTerminal-color-6-cube-2-5-6-color: rgb(95,215,255);\n"
-"-VteTerminal-color-6-cube-2-6-1-color: rgb(95,255,0);\n"
-"-VteTerminal-color-6-cube-2-6-2-color: rgb(95,255,95);\n"
-"-VteTerminal-color-6-cube-2-6-3-color: rgb(95,255,135);\n"
-"-VteTerminal-color-6-cube-2-6-4-color: rgb(95,255,175);\n"
-"-VteTerminal-color-6-cube-2-6-5-color: rgb(95,255,215);\n"
-"-VteTerminal-color-6-cube-2-6-6-color: rgb(95,255,255);\n"
-"-VteTerminal-color-6-cube-3-1-1-color: rgb(135,0,0);\n"
-"-VteTerminal-color-6-cube-3-1-2-color: rgb(135,0,95);\n"
-"-VteTerminal-color-6-cube-3-1-3-color: rgb(135,0,135);\n"
-"-VteTerminal-color-6-cube-3-1-4-color: rgb(135,0,175);\n"
-"-VteTerminal-color-6-cube-3-1-5-color: rgb(135,0,215);\n"
-"-VteTerminal-color-6-cube-3-1-6-color: rgb(135,0,255);\n"
-"-VteTerminal-color-6-cube-3-2-1-color: rgb(135,95,0);\n"
-"-VteTerminal-color-6-cube-3-2-2-color: rgb(135,95,95);\n"
-"-VteTerminal-color-6-cube-3-2-3-color: rgb(135,95,135);\n"
-"-VteTerminal-color-6-cube-3-2-4-color: rgb(135,95,175);\n"
-"-VteTerminal-color-6-cube-3-2-5-color: rgb(135,95,215);\n"
-"-VteTerminal-color-6-cube-3-2-6-color: rgb(135,95,255);\n"
-"-VteTerminal-color-6-cube-3-3-1-color: rgb(135,135,0);\n"
-"-VteTerminal-color-6-cube-3-3-2-color: rgb(135,135,95);\n"
-"-VteTerminal-color-6-cube-3-3-3-color: rgb(135,135,135);\n"
-"-VteTerminal-color-6-cube-3-3-4-color: rgb(135,135,175);\n"
-"-VteTerminal-color-6-cube-3-3-5-color: rgb(135,135,215);\n"
-"-VteTerminal-color-6-cube-3-3-6-color: rgb(135,135,255);\n"
-"-VteTerminal-color-6-cube-3-4-1-color: rgb(135,175,0);\n"
-"-VteTerminal-color-6-cube-3-4-2-color: rgb(135,175,95);\n"
-"-VteTerminal-color-6-cube-3-4-3-color: rgb(135,175,135);\n"
-"-VteTerminal-color-6-cube-3-4-4-color: rgb(135,175,175);\n"
-"-VteTerminal-color-6-cube-3-4-5-color: rgb(135,175,215);\n"
-"-VteTerminal-color-6-cube-3-4-6-color: rgb(135,175,255);\n"
-"-VteTerminal-color-6-cube-3-5-1-color: rgb(135,215,0);\n"
-"-VteTerminal-color-6-cube-3-5-2-color: rgb(135,215,95);\n"
-"-VteTerminal-color-6-cube-3-5-3-color: rgb(135,215,135);\n"
-"-VteTerminal-color-6-cube-3-5-4-color: rgb(135,215,175);\n"
-"-VteTerminal-color-6-cube-3-5-5-color: rgb(135,215,215);\n"
-"-VteTerminal-color-6-cube-3-5-6-color: rgb(135,215,255);\n"
-"-VteTerminal-color-6-cube-3-6-1-color: rgb(135,255,0);\n"
-"-VteTerminal-color-6-cube-3-6-2-color: rgb(135,255,95);\n"
-"-VteTerminal-color-6-cube-3-6-3-color: rgb(135,255,135);\n"
-"-VteTerminal-color-6-cube-3-6-4-color: rgb(135,255,175);\n"
-"-VteTerminal-color-6-cube-3-6-5-color: rgb(135,255,215);\n"
-"-VteTerminal-color-6-cube-3-6-6-color: rgb(135,255,255);\n"
-"-VteTerminal-color-6-cube-4-1-1-color: rgb(175,0,0);\n"
-"-VteTerminal-color-6-cube-4-1-2-color: rgb(175,0,95);\n"
-"-VteTerminal-color-6-cube-4-1-3-color: rgb(175,0,135);\n"
-"-VteTerminal-color-6-cube-4-1-4-color: rgb(175,0,175);\n"
-"-VteTerminal-color-6-cube-4-1-5-color: rgb(175,0,215);\n"
-"-VteTerminal-color-6-cube-4-1-6-color: rgb(175,0,255);\n"
-"-VteTerminal-color-6-cube-4-2-1-color: rgb(175,95,0);\n"
-"-VteTerminal-color-6-cube-4-2-2-color: rgb(175,95,95);\n"
-"-VteTerminal-color-6-cube-4-2-3-color: rgb(175,95,135);\n"
-"-VteTerminal-color-6-cube-4-2-4-color: rgb(175,95,175);\n"
-"-VteTerminal-color-6-cube-4-2-5-color: rgb(175,95,215);\n"
-"-VteTerminal-color-6-cube-4-2-6-color: rgb(175,95,255);\n"
-"-VteTerminal-color-6-cube-4-3-1-color: rgb(175,135,0);\n"
-"-VteTerminal-color-6-cube-4-3-2-color: rgb(175,135,95);\n"
-"-VteTerminal-color-6-cube-4-3-3-color: rgb(175,135,135);\n"
-"-VteTerminal-color-6-cube-4-3-4-color: rgb(175,135,175);\n"
-"-VteTerminal-color-6-cube-4-3-5-color: rgb(175,135,215);\n"
-"-VteTerminal-color-6-cube-4-3-6-color: rgb(175,135,255);\n"
-"-VteTerminal-color-6-cube-4-4-1-color: rgb(175,175,0);\n"
-"-VteTerminal-color-6-cube-4-4-2-color: rgb(175,175,95);\n"
-"-VteTerminal-color-6-cube-4-4-3-color: rgb(175,175,135);\n"
-"-VteTerminal-color-6-cube-4-4-4-color: rgb(175,175,175);\n"
-"-VteTerminal-color-6-cube-4-4-5-color: rgb(175,175,215);\n"
-"-VteTerminal-color-6-cube-4-4-6-color: rgb(175,175,255);\n"
-"-VteTerminal-color-6-cube-4-5-1-color: rgb(175,215,0);\n"
-"-VteTerminal-color-6-cube-4-5-2-color: rgb(175,215,95);\n"
-"-VteTerminal-color-6-cube-4-5-3-color: rgb(175,215,135);\n"
-"-VteTerminal-color-6-cube-4-5-4-color: rgb(175,215,175);\n"
-"-VteTerminal-color-6-cube-4-5-5-color: rgb(175,215,215);\n"
-"-VteTerminal-color-6-cube-4-5-6-color: rgb(175,215,255);\n"
-"-VteTerminal-color-6-cube-4-6-1-color: rgb(175,255,0);\n"
-"-VteTerminal-color-6-cube-4-6-2-color: rgb(175,255,95);\n"
-"-VteTerminal-color-6-cube-4-6-3-color: rgb(175,255,135);\n"
-"-VteTerminal-color-6-cube-4-6-4-color: rgb(175,255,175);\n"
-"-VteTerminal-color-6-cube-4-6-5-color: rgb(175,255,215);\n"
-"-VteTerminal-color-6-cube-4-6-6-color: rgb(175,255,255);\n"
-"-VteTerminal-color-6-cube-5-1-1-color: rgb(215,0,0);\n"
-"-VteTerminal-color-6-cube-5-1-2-color: rgb(215,0,95);\n"
-"-VteTerminal-color-6-cube-5-1-3-color: rgb(215,0,135);\n"
-"-VteTerminal-color-6-cube-5-1-4-color: rgb(215,0,175);\n"
-"-VteTerminal-color-6-cube-5-1-5-color: rgb(215,0,215);\n"
-"-VteTerminal-color-6-cube-5-1-6-color: rgb(215,0,255);\n"
-"-VteTerminal-color-6-cube-5-2-1-color: rgb(215,95,0);\n"
-"-VteTerminal-color-6-cube-5-2-2-color: rgb(215,95,95);\n"
-"-VteTerminal-color-6-cube-5-2-3-color: rgb(215,95,135);\n"
-"-VteTerminal-color-6-cube-5-2-4-color: rgb(215,95,175);\n"
-"-VteTerminal-color-6-cube-5-2-5-color: rgb(215,95,215);\n"
-"-VteTerminal-color-6-cube-5-2-6-color: rgb(215,95,255);\n"
-"-VteTerminal-color-6-cube-5-3-1-color: rgb(215,135,0);\n"
-"-VteTerminal-color-6-cube-5-3-2-color: rgb(215,135,95);\n"
-"-VteTerminal-color-6-cube-5-3-3-color: rgb(215,135,135);\n"
-"-VteTerminal-color-6-cube-5-3-4-color: rgb(215,135,175);\n"
-"-VteTerminal-color-6-cube-5-3-5-color: rgb(215,135,215);\n"
-"-VteTerminal-color-6-cube-5-3-6-color: rgb(215,135,255);\n"
-"-VteTerminal-color-6-cube-5-4-1-color: rgb(215,175,0);\n"
-"-VteTerminal-color-6-cube-5-4-2-color: rgb(215,175,95);\n"
-"-VteTerminal-color-6-cube-5-4-3-color: rgb(215,175,135);\n"
-"-VteTerminal-color-6-cube-5-4-4-color: rgb(215,175,175);\n"
-"-VteTerminal-color-6-cube-5-4-5-color: rgb(215,175,215);\n"
-"-VteTerminal-color-6-cube-5-4-6-color: rgb(215,175,255);\n"
-"-VteTerminal-color-6-cube-5-5-1-color: rgb(215,215,0);\n"
-"-VteTerminal-color-6-cube-5-5-2-color: rgb(215,215,95);\n"
-"-VteTerminal-color-6-cube-5-5-3-color: rgb(215,215,135);\n"
-"-VteTerminal-color-6-cube-5-5-4-color: rgb(215,215,175);\n"
-"-VteTerminal-color-6-cube-5-5-5-color: rgb(215,215,215);\n"
-"-VteTerminal-color-6-cube-5-5-6-color: rgb(215,215,255);\n"
-"-VteTerminal-color-6-cube-5-6-1-color: rgb(215,255,0);\n"
-"-VteTerminal-color-6-cube-5-6-2-color: rgb(215,255,95);\n"
-"-VteTerminal-color-6-cube-5-6-3-color: rgb(215,255,135);\n"
-"-VteTerminal-color-6-cube-5-6-4-color: rgb(215,255,175);\n"
-"-VteTerminal-color-6-cube-5-6-5-color: rgb(215,255,215);\n"
-"-VteTerminal-color-6-cube-5-6-6-color: rgb(215,255,255);\n"
-"-VteTerminal-color-6-cube-6-1-1-color: rgb(255,0,0);\n"
-"-VteTerminal-color-6-cube-6-1-2-color: rgb(255,0,95);\n"
-"-VteTerminal-color-6-cube-6-1-3-color: rgb(255,0,135);\n"
-"-VteTerminal-color-6-cube-6-1-4-color: rgb(255,0,175);\n"
-"-VteTerminal-color-6-cube-6-1-5-color: rgb(255,0,215);\n"
-"-VteTerminal-color-6-cube-6-1-6-color: rgb(255,0,255);\n"
-"-VteTerminal-color-6-cube-6-2-1-color: rgb(255,95,0);\n"
-"-VteTerminal-color-6-cube-6-2-2-color: rgb(255,95,95);\n"
-"-VteTerminal-color-6-cube-6-2-3-color: rgb(255,95,135);\n"
-"-VteTerminal-color-6-cube-6-2-4-color: rgb(255,95,175);\n"
-"-VteTerminal-color-6-cube-6-2-5-color: rgb(255,95,215);\n"
-"-VteTerminal-color-6-cube-6-2-6-color: rgb(255,95,255);\n"
-"-VteTerminal-color-6-cube-6-3-1-color: rgb(255,135,0);\n"
-"-VteTerminal-color-6-cube-6-3-2-color: rgb(255,135,95);\n"
-"-VteTerminal-color-6-cube-6-3-3-color: rgb(255,135,135);\n"
-"-VteTerminal-color-6-cube-6-3-4-color: rgb(255,135,175);\n"
-"-VteTerminal-color-6-cube-6-3-5-color: rgb(255,135,215);\n"
-"-VteTerminal-color-6-cube-6-3-6-color: rgb(255,135,255);\n"
-"-VteTerminal-color-6-cube-6-4-1-color: rgb(255,175,0);\n"
-"-VteTerminal-color-6-cube-6-4-2-color: rgb(255,175,95);\n"
-"-VteTerminal-color-6-cube-6-4-3-color: rgb(255,175,135);\n"
-"-VteTerminal-color-6-cube-6-4-4-color: rgb(255,175,175);\n"
-"-VteTerminal-color-6-cube-6-4-5-color: rgb(255,175,215);\n"
-"-VteTerminal-color-6-cube-6-4-6-color: rgb(255,175,255);\n"
-"-VteTerminal-color-6-cube-6-5-1-color: rgb(255,215,0);\n"
-"-VteTerminal-color-6-cube-6-5-2-color: rgb(255,215,95);\n"
-"-VteTerminal-color-6-cube-6-5-3-color: rgb(255,215,135);\n"
-"-VteTerminal-color-6-cube-6-5-4-color: rgb(255,215,175);\n"
-"-VteTerminal-color-6-cube-6-5-5-color: rgb(255,215,215);\n"
-"-VteTerminal-color-6-cube-6-5-6-color: rgb(255,215,255);\n"
-"-VteTerminal-color-6-cube-6-6-1-color: rgb(255,255,0);\n"
-"-VteTerminal-color-6-cube-6-6-2-color: rgb(255,255,95);\n"
-"-VteTerminal-color-6-cube-6-6-3-color: rgb(255,255,135);\n"
-"-VteTerminal-color-6-cube-6-6-4-color: rgb(255,255,175);\n"
-"-VteTerminal-color-6-cube-6-6-5-color: rgb(255,255,215);\n"
-"-VteTerminal-color-6-cube-6-6-6-color: rgb(255,255,255);\n"
-"-VteTerminal-shade-24-shades-1-color: rgb(8,8,8);\n"
-"-VteTerminal-shade-24-shades-2-color: rgb(18,18,18);\n"
-"-VteTerminal-shade-24-shades-3-color: rgb(28,28,28);\n"
-"-VteTerminal-shade-24-shades-4-color: rgb(38,38,38);\n"
-"-VteTerminal-shade-24-shades-5-color: rgb(48,48,48);\n"
-"-VteTerminal-shade-24-shades-6-color: rgb(58,58,58);\n"
-"-VteTerminal-shade-24-shades-7-color: rgb(68,68,68);\n"
-"-VteTerminal-shade-24-shades-8-color: rgb(78,78,78);\n"
-"-VteTerminal-shade-24-shades-9-color: rgb(88,88,88);\n"
-"-VteTerminal-shade-24-shades-10-color: rgb(98,98,98);\n"
-"-VteTerminal-shade-24-shades-11-color: rgb(108,108,108);\n"
-"-VteTerminal-shade-24-shades-12-color: rgb(118,118,118);\n"
-"-VteTerminal-shade-24-shades-13-color: rgb(128,128,128);\n"
-"-VteTerminal-shade-24-shades-14-color: rgb(138,138,138);\n"
-"-VteTerminal-shade-24-shades-15-color: rgb(148,148,148);\n"
-"-VteTerminal-shade-24-shades-16-color: rgb(158,158,158);\n"
-"-VteTerminal-shade-24-shades-17-color: rgb(168,168,168);\n"
-"-VteTerminal-shade-24-shades-18-color: rgb(178,178,178);\n"
-"-VteTerminal-shade-24-shades-19-color: rgb(188,188,188);\n"
-"-VteTerminal-shade-24-shades-20-color: rgb(198,198,198);\n"
-"-VteTerminal-shade-24-shades-21-color: rgb(208,208,208);\n"
-"-VteTerminal-shade-24-shades-22-color: rgb(218,218,218);\n"
-"-VteTerminal-shade-24-shades-23-color: rgb(228,228,228);\n"
-"-VteTerminal-shade-24-shades-24-color: rgb(238,238,238);\n"
-"-VteTerminal-foreground-color: rgb(191,191,191);\n"
-"-VteTerminal-background-color: rgb(0,0,0);\n"
-"-VteTerminal-selection-background-color: rgb(255,255,255);\n"
-"-VteTerminal-cursor-background-color: rgb(191,191,191);\n"
-"-VteTerminal-reverse-background-color: rgb(255,255,255);\n"
+"-VteView-black-color: rgb(0,0,0);\n"
+"-VteView-red-color: rgb(191,0,0);\n"
+"-VteView-green-color: rgb(0,191,0);\n"
+"-VteView-yellow-color: rgb(191,191,0);\n"
+"-VteView-blue-color: rgb(0,0,191);\n"
+"-VteView-magenta-color: rgb(191,0,191);\n"
+"-VteView-cyan-color: rgb(0,191,191);\n"
+"-VteView-white-color: rgb(191,191,191);\n"
+"-VteView-bright-black-color: rgb(0,0,0);\n"
+"-VteView-bright-red-color: rgb(255,0,0);\n"
+"-VteView-bright-green-color: rgb(0,255,0);\n"
+"-VteView-bright-yellow-color: rgb(255,255,0);\n"
+"-VteView-bright-blue-color: rgb(0,0,255);\n"
+"-VteView-bright-magenta-color: rgb(255,0,255);\n"
+"-VteView-bright-cyan-color: rgb(0,255,255);\n"
+"-VteView-bright-white-color: rgb(255,255,255);\n"
+"-VteView-color-6-cube-1-1-1-color: rgb(0,0,0);\n"
+"-VteView-color-6-cube-1-1-2-color: rgb(0,0,95);\n"
+"-VteView-color-6-cube-1-1-3-color: rgb(0,0,135);\n"
+"-VteView-color-6-cube-1-1-4-color: rgb(0,0,175);\n"
+"-VteView-color-6-cube-1-1-5-color: rgb(0,0,215);\n"
+"-VteView-color-6-cube-1-1-6-color: rgb(0,0,255);\n"
+"-VteView-color-6-cube-1-2-1-color: rgb(0,95,0);\n"
+"-VteView-color-6-cube-1-2-2-color: rgb(0,95,95);\n"
+"-VteView-color-6-cube-1-2-3-color: rgb(0,95,135);\n"
+"-VteView-color-6-cube-1-2-4-color: rgb(0,95,175);\n"
+"-VteView-color-6-cube-1-2-5-color: rgb(0,95,215);\n"
+"-VteView-color-6-cube-1-2-6-color: rgb(0,95,255);\n"
+"-VteView-color-6-cube-1-3-1-color: rgb(0,135,0);\n"
+"-VteView-color-6-cube-1-3-2-color: rgb(0,135,95);\n"
+"-VteView-color-6-cube-1-3-3-color: rgb(0,135,135);\n"
+"-VteView-color-6-cube-1-3-4-color: rgb(0,135,175);\n"
+"-VteView-color-6-cube-1-3-5-color: rgb(0,135,215);\n"
+"-VteView-color-6-cube-1-3-6-color: rgb(0,135,255);\n"
+"-VteView-color-6-cube-1-4-1-color: rgb(0,175,0);\n"
+"-VteView-color-6-cube-1-4-2-color: rgb(0,175,95);\n"
+"-VteView-color-6-cube-1-4-3-color: rgb(0,175,135);\n"
+"-VteView-color-6-cube-1-4-4-color: rgb(0,175,175);\n"
+"-VteView-color-6-cube-1-4-5-color: rgb(0,175,215);\n"
+"-VteView-color-6-cube-1-4-6-color: rgb(0,175,255);\n"
+"-VteView-color-6-cube-1-5-1-color: rgb(0,215,0);\n"
+"-VteView-color-6-cube-1-5-2-color: rgb(0,215,95);\n"
+"-VteView-color-6-cube-1-5-3-color: rgb(0,215,135);\n"
+"-VteView-color-6-cube-1-5-4-color: rgb(0,215,175);\n"
+"-VteView-color-6-cube-1-5-5-color: rgb(0,215,215);\n"
+"-VteView-color-6-cube-1-5-6-color: rgb(0,215,255);\n"
+"-VteView-color-6-cube-1-6-1-color: rgb(0,255,0);\n"
+"-VteView-color-6-cube-1-6-2-color: rgb(0,255,95);\n"
+"-VteView-color-6-cube-1-6-3-color: rgb(0,255,135);\n"
+"-VteView-color-6-cube-1-6-4-color: rgb(0,255,175);\n"
+"-VteView-color-6-cube-1-6-5-color: rgb(0,255,215);\n"
+"-VteView-color-6-cube-1-6-6-color: rgb(0,255,255);\n"
+"-VteView-color-6-cube-2-1-1-color: rgb(95,0,0);\n"
+"-VteView-color-6-cube-2-1-2-color: rgb(95,0,95);\n"
+"-VteView-color-6-cube-2-1-3-color: rgb(95,0,135);\n"
+"-VteView-color-6-cube-2-1-4-color: rgb(95,0,175);\n"
+"-VteView-color-6-cube-2-1-5-color: rgb(95,0,215);\n"
+"-VteView-color-6-cube-2-1-6-color: rgb(95,0,255);\n"
+"-VteView-color-6-cube-2-2-1-color: rgb(95,95,0);\n"
+"-VteView-color-6-cube-2-2-2-color: rgb(95,95,95);\n"
+"-VteView-color-6-cube-2-2-3-color: rgb(95,95,135);\n"
+"-VteView-color-6-cube-2-2-4-color: rgb(95,95,175);\n"
+"-VteView-color-6-cube-2-2-5-color: rgb(95,95,215);\n"
+"-VteView-color-6-cube-2-2-6-color: rgb(95,95,255);\n"
+"-VteView-color-6-cube-2-3-1-color: rgb(95,135,0);\n"
+"-VteView-color-6-cube-2-3-2-color: rgb(95,135,95);\n"
+"-VteView-color-6-cube-2-3-3-color: rgb(95,135,135);\n"
+"-VteView-color-6-cube-2-3-4-color: rgb(95,135,175);\n"
+"-VteView-color-6-cube-2-3-5-color: rgb(95,135,215);\n"
+"-VteView-color-6-cube-2-3-6-color: rgb(95,135,255);\n"
+"-VteView-color-6-cube-2-4-1-color: rgb(95,175,0);\n"
+"-VteView-color-6-cube-2-4-2-color: rgb(95,175,95);\n"
+"-VteView-color-6-cube-2-4-3-color: rgb(95,175,135);\n"
+"-VteView-color-6-cube-2-4-4-color: rgb(95,175,175);\n"
+"-VteView-color-6-cube-2-4-5-color: rgb(95,175,215);\n"
+"-VteView-color-6-cube-2-4-6-color: rgb(95,175,255);\n"
+"-VteView-color-6-cube-2-5-1-color: rgb(95,215,0);\n"
+"-VteView-color-6-cube-2-5-2-color: rgb(95,215,95);\n"
+"-VteView-color-6-cube-2-5-3-color: rgb(95,215,135);\n"
+"-VteView-color-6-cube-2-5-4-color: rgb(95,215,175);\n"
+"-VteView-color-6-cube-2-5-5-color: rgb(95,215,215);\n"
+"-VteView-color-6-cube-2-5-6-color: rgb(95,215,255);\n"
+"-VteView-color-6-cube-2-6-1-color: rgb(95,255,0);\n"
+"-VteView-color-6-cube-2-6-2-color: rgb(95,255,95);\n"
+"-VteView-color-6-cube-2-6-3-color: rgb(95,255,135);\n"
+"-VteView-color-6-cube-2-6-4-color: rgb(95,255,175);\n"
+"-VteView-color-6-cube-2-6-5-color: rgb(95,255,215);\n"
+"-VteView-color-6-cube-2-6-6-color: rgb(95,255,255);\n"
+"-VteView-color-6-cube-3-1-1-color: rgb(135,0,0);\n"
+"-VteView-color-6-cube-3-1-2-color: rgb(135,0,95);\n"
+"-VteView-color-6-cube-3-1-3-color: rgb(135,0,135);\n"
+"-VteView-color-6-cube-3-1-4-color: rgb(135,0,175);\n"
+"-VteView-color-6-cube-3-1-5-color: rgb(135,0,215);\n"
+"-VteView-color-6-cube-3-1-6-color: rgb(135,0,255);\n"
+"-VteView-color-6-cube-3-2-1-color: rgb(135,95,0);\n"
+"-VteView-color-6-cube-3-2-2-color: rgb(135,95,95);\n"
+"-VteView-color-6-cube-3-2-3-color: rgb(135,95,135);\n"
+"-VteView-color-6-cube-3-2-4-color: rgb(135,95,175);\n"
+"-VteView-color-6-cube-3-2-5-color: rgb(135,95,215);\n"
+"-VteView-color-6-cube-3-2-6-color: rgb(135,95,255);\n"
+"-VteView-color-6-cube-3-3-1-color: rgb(135,135,0);\n"
+"-VteView-color-6-cube-3-3-2-color: rgb(135,135,95);\n"
+"-VteView-color-6-cube-3-3-3-color: rgb(135,135,135);\n"
+"-VteView-color-6-cube-3-3-4-color: rgb(135,135,175);\n"
+"-VteView-color-6-cube-3-3-5-color: rgb(135,135,215);\n"
+"-VteView-color-6-cube-3-3-6-color: rgb(135,135,255);\n"
+"-VteView-color-6-cube-3-4-1-color: rgb(135,175,0);\n"
+"-VteView-color-6-cube-3-4-2-color: rgb(135,175,95);\n"
+"-VteView-color-6-cube-3-4-3-color: rgb(135,175,135);\n"
+"-VteView-color-6-cube-3-4-4-color: rgb(135,175,175);\n"
+"-VteView-color-6-cube-3-4-5-color: rgb(135,175,215);\n"
+"-VteView-color-6-cube-3-4-6-color: rgb(135,175,255);\n"
+"-VteView-color-6-cube-3-5-1-color: rgb(135,215,0);\n"
+"-VteView-color-6-cube-3-5-2-color: rgb(135,215,95);\n"
+"-VteView-color-6-cube-3-5-3-color: rgb(135,215,135);\n"
+"-VteView-color-6-cube-3-5-4-color: rgb(135,215,175);\n"
+"-VteView-color-6-cube-3-5-5-color: rgb(135,215,215);\n"
+"-VteView-color-6-cube-3-5-6-color: rgb(135,215,255);\n"
+"-VteView-color-6-cube-3-6-1-color: rgb(135,255,0);\n"
+"-VteView-color-6-cube-3-6-2-color: rgb(135,255,95);\n"
+"-VteView-color-6-cube-3-6-3-color: rgb(135,255,135);\n"
+"-VteView-color-6-cube-3-6-4-color: rgb(135,255,175);\n"
+"-VteView-color-6-cube-3-6-5-color: rgb(135,255,215);\n"
+"-VteView-color-6-cube-3-6-6-color: rgb(135,255,255);\n"
+"-VteView-color-6-cube-4-1-1-color: rgb(175,0,0);\n"
+"-VteView-color-6-cube-4-1-2-color: rgb(175,0,95);\n"
+"-VteView-color-6-cube-4-1-3-color: rgb(175,0,135);\n"
+"-VteView-color-6-cube-4-1-4-color: rgb(175,0,175);\n"
+"-VteView-color-6-cube-4-1-5-color: rgb(175,0,215);\n"
+"-VteView-color-6-cube-4-1-6-color: rgb(175,0,255);\n"
+"-VteView-color-6-cube-4-2-1-color: rgb(175,95,0);\n"
+"-VteView-color-6-cube-4-2-2-color: rgb(175,95,95);\n"
+"-VteView-color-6-cube-4-2-3-color: rgb(175,95,135);\n"
+"-VteView-color-6-cube-4-2-4-color: rgb(175,95,175);\n"
+"-VteView-color-6-cube-4-2-5-color: rgb(175,95,215);\n"
+"-VteView-color-6-cube-4-2-6-color: rgb(175,95,255);\n"
+"-VteView-color-6-cube-4-3-1-color: rgb(175,135,0);\n"
+"-VteView-color-6-cube-4-3-2-color: rgb(175,135,95);\n"
+"-VteView-color-6-cube-4-3-3-color: rgb(175,135,135);\n"
+"-VteView-color-6-cube-4-3-4-color: rgb(175,135,175);\n"
+"-VteView-color-6-cube-4-3-5-color: rgb(175,135,215);\n"
+"-VteView-color-6-cube-4-3-6-color: rgb(175,135,255);\n"
+"-VteView-color-6-cube-4-4-1-color: rgb(175,175,0);\n"
+"-VteView-color-6-cube-4-4-2-color: rgb(175,175,95);\n"
+"-VteView-color-6-cube-4-4-3-color: rgb(175,175,135);\n"
+"-VteView-color-6-cube-4-4-4-color: rgb(175,175,175);\n"
+"-VteView-color-6-cube-4-4-5-color: rgb(175,175,215);\n"
+"-VteView-color-6-cube-4-4-6-color: rgb(175,175,255);\n"
+"-VteView-color-6-cube-4-5-1-color: rgb(175,215,0);\n"
+"-VteView-color-6-cube-4-5-2-color: rgb(175,215,95);\n"
+"-VteView-color-6-cube-4-5-3-color: rgb(175,215,135);\n"
+"-VteView-color-6-cube-4-5-4-color: rgb(175,215,175);\n"
+"-VteView-color-6-cube-4-5-5-color: rgb(175,215,215);\n"
+"-VteView-color-6-cube-4-5-6-color: rgb(175,215,255);\n"
+"-VteView-color-6-cube-4-6-1-color: rgb(175,255,0);\n"
+"-VteView-color-6-cube-4-6-2-color: rgb(175,255,95);\n"
+"-VteView-color-6-cube-4-6-3-color: rgb(175,255,135);\n"
+"-VteView-color-6-cube-4-6-4-color: rgb(175,255,175);\n"
+"-VteView-color-6-cube-4-6-5-color: rgb(175,255,215);\n"
+"-VteView-color-6-cube-4-6-6-color: rgb(175,255,255);\n"
+"-VteView-color-6-cube-5-1-1-color: rgb(215,0,0);\n"
+"-VteView-color-6-cube-5-1-2-color: rgb(215,0,95);\n"
+"-VteView-color-6-cube-5-1-3-color: rgb(215,0,135);\n"
+"-VteView-color-6-cube-5-1-4-color: rgb(215,0,175);\n"
+"-VteView-color-6-cube-5-1-5-color: rgb(215,0,215);\n"
+"-VteView-color-6-cube-5-1-6-color: rgb(215,0,255);\n"
+"-VteView-color-6-cube-5-2-1-color: rgb(215,95,0);\n"
+"-VteView-color-6-cube-5-2-2-color: rgb(215,95,95);\n"
+"-VteView-color-6-cube-5-2-3-color: rgb(215,95,135);\n"
+"-VteView-color-6-cube-5-2-4-color: rgb(215,95,175);\n"
+"-VteView-color-6-cube-5-2-5-color: rgb(215,95,215);\n"
+"-VteView-color-6-cube-5-2-6-color: rgb(215,95,255);\n"
+"-VteView-color-6-cube-5-3-1-color: rgb(215,135,0);\n"
+"-VteView-color-6-cube-5-3-2-color: rgb(215,135,95);\n"
+"-VteView-color-6-cube-5-3-3-color: rgb(215,135,135);\n"
+"-VteView-color-6-cube-5-3-4-color: rgb(215,135,175);\n"
+"-VteView-color-6-cube-5-3-5-color: rgb(215,135,215);\n"
+"-VteView-color-6-cube-5-3-6-color: rgb(215,135,255);\n"
+"-VteView-color-6-cube-5-4-1-color: rgb(215,175,0);\n"
+"-VteView-color-6-cube-5-4-2-color: rgb(215,175,95);\n"
+"-VteView-color-6-cube-5-4-3-color: rgb(215,175,135);\n"
+"-VteView-color-6-cube-5-4-4-color: rgb(215,175,175);\n"
+"-VteView-color-6-cube-5-4-5-color: rgb(215,175,215);\n"
+"-VteView-color-6-cube-5-4-6-color: rgb(215,175,255);\n"
+"-VteView-color-6-cube-5-5-1-color: rgb(215,215,0);\n"
+"-VteView-color-6-cube-5-5-2-color: rgb(215,215,95);\n"
+"-VteView-color-6-cube-5-5-3-color: rgb(215,215,135);\n"
+"-VteView-color-6-cube-5-5-4-color: rgb(215,215,175);\n"
+"-VteView-color-6-cube-5-5-5-color: rgb(215,215,215);\n"
+"-VteView-color-6-cube-5-5-6-color: rgb(215,215,255);\n"
+"-VteView-color-6-cube-5-6-1-color: rgb(215,255,0);\n"
+"-VteView-color-6-cube-5-6-2-color: rgb(215,255,95);\n"
+"-VteView-color-6-cube-5-6-3-color: rgb(215,255,135);\n"
+"-VteView-color-6-cube-5-6-4-color: rgb(215,255,175);\n"
+"-VteView-color-6-cube-5-6-5-color: rgb(215,255,215);\n"
+"-VteView-color-6-cube-5-6-6-color: rgb(215,255,255);\n"
+"-VteView-color-6-cube-6-1-1-color: rgb(255,0,0);\n"
+"-VteView-color-6-cube-6-1-2-color: rgb(255,0,95);\n"
+"-VteView-color-6-cube-6-1-3-color: rgb(255,0,135);\n"
+"-VteView-color-6-cube-6-1-4-color: rgb(255,0,175);\n"
+"-VteView-color-6-cube-6-1-5-color: rgb(255,0,215);\n"
+"-VteView-color-6-cube-6-1-6-color: rgb(255,0,255);\n"
+"-VteView-color-6-cube-6-2-1-color: rgb(255,95,0);\n"
+"-VteView-color-6-cube-6-2-2-color: rgb(255,95,95);\n"
+"-VteView-color-6-cube-6-2-3-color: rgb(255,95,135);\n"
+"-VteView-color-6-cube-6-2-4-color: rgb(255,95,175);\n"
+"-VteView-color-6-cube-6-2-5-color: rgb(255,95,215);\n"
+"-VteView-color-6-cube-6-2-6-color: rgb(255,95,255);\n"
+"-VteView-color-6-cube-6-3-1-color: rgb(255,135,0);\n"
+"-VteView-color-6-cube-6-3-2-color: rgb(255,135,95);\n"
+"-VteView-color-6-cube-6-3-3-color: rgb(255,135,135);\n"
+"-VteView-color-6-cube-6-3-4-color: rgb(255,135,175);\n"
+"-VteView-color-6-cube-6-3-5-color: rgb(255,135,215);\n"
+"-VteView-color-6-cube-6-3-6-color: rgb(255,135,255);\n"
+"-VteView-color-6-cube-6-4-1-color: rgb(255,175,0);\n"
+"-VteView-color-6-cube-6-4-2-color: rgb(255,175,95);\n"
+"-VteView-color-6-cube-6-4-3-color: rgb(255,175,135);\n"
+"-VteView-color-6-cube-6-4-4-color: rgb(255,175,175);\n"
+"-VteView-color-6-cube-6-4-5-color: rgb(255,175,215);\n"
+"-VteView-color-6-cube-6-4-6-color: rgb(255,175,255);\n"
+"-VteView-color-6-cube-6-5-1-color: rgb(255,215,0);\n"
+"-VteView-color-6-cube-6-5-2-color: rgb(255,215,95);\n"
+"-VteView-color-6-cube-6-5-3-color: rgb(255,215,135);\n"
+"-VteView-color-6-cube-6-5-4-color: rgb(255,215,175);\n"
+"-VteView-color-6-cube-6-5-5-color: rgb(255,215,215);\n"
+"-VteView-color-6-cube-6-5-6-color: rgb(255,215,255);\n"
+"-VteView-color-6-cube-6-6-1-color: rgb(255,255,0);\n"
+"-VteView-color-6-cube-6-6-2-color: rgb(255,255,95);\n"
+"-VteView-color-6-cube-6-6-3-color: rgb(255,255,135);\n"
+"-VteView-color-6-cube-6-6-4-color: rgb(255,255,175);\n"
+"-VteView-color-6-cube-6-6-5-color: rgb(255,255,215);\n"
+"-VteView-color-6-cube-6-6-6-color: rgb(255,255,255);\n"
+"-VteView-shade-24-shades-1-color: rgb(8,8,8);\n"
+"-VteView-shade-24-shades-2-color: rgb(18,18,18);\n"
+"-VteView-shade-24-shades-3-color: rgb(28,28,28);\n"
+"-VteView-shade-24-shades-4-color: rgb(38,38,38);\n"
+"-VteView-shade-24-shades-5-color: rgb(48,48,48);\n"
+"-VteView-shade-24-shades-6-color: rgb(58,58,58);\n"
+"-VteView-shade-24-shades-7-color: rgb(68,68,68);\n"
+"-VteView-shade-24-shades-8-color: rgb(78,78,78);\n"
+"-VteView-shade-24-shades-9-color: rgb(88,88,88);\n"
+"-VteView-shade-24-shades-10-color: rgb(98,98,98);\n"
+"-VteView-shade-24-shades-11-color: rgb(108,108,108);\n"
+"-VteView-shade-24-shades-12-color: rgb(118,118,118);\n"
+"-VteView-shade-24-shades-13-color: rgb(128,128,128);\n"
+"-VteView-shade-24-shades-14-color: rgb(138,138,138);\n"
+"-VteView-shade-24-shades-15-color: rgb(148,148,148);\n"
+"-VteView-shade-24-shades-16-color: rgb(158,158,158);\n"
+"-VteView-shade-24-shades-17-color: rgb(168,168,168);\n"
+"-VteView-shade-24-shades-18-color: rgb(178,178,178);\n"
+"-VteView-shade-24-shades-19-color: rgb(188,188,188);\n"
+"-VteView-shade-24-shades-20-color: rgb(198,198,198);\n"
+"-VteView-shade-24-shades-21-color: rgb(208,208,208);\n"
+"-VteView-shade-24-shades-22-color: rgb(218,218,218);\n"
+"-VteView-shade-24-shades-23-color: rgb(228,228,228);\n"
+"-VteView-shade-24-shades-24-color: rgb(238,238,238);\n"
+"-VteView-foreground-color: rgb(191,191,191);\n"
+"-VteView-background-color: rgb(0,0,0);\n"
+"-VteView-selection-background-color: rgb(255,255,255);\n"
+"-VteView-cursor-background-color: rgb(191,191,191);\n"
+"-VteView-reverse-background-color: rgb(255,255,255);\n"
diff --git a/src/vtepalettedefs.h b/src/vtepalettedefs.h
index 88772b9..cfc3f55 100644
--- a/src/vtepalettedefs.h
+++ b/src/vtepalettedefs.h
@@ -3,7 +3,7 @@
*/
/**
- * VteTerminal:black-color:
+ * VteView:black-color:
*
* The black color in the palette.
*
@@ -14,7 +14,7 @@
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("black-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:red-color:
+ * VteView:red-color:
*
* The red color in the palette.
*
@@ -25,7 +25,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("black
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("red-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:green-color:
+ * VteView:green-color:
*
* The green color in the palette.
*
@@ -36,7 +36,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("red-c
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("green-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:yellow-color:
+ * VteView:yellow-color:
*
* The yellow color in the palette.
*
@@ -47,7 +47,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("green
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("yellow-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:blue-color:
+ * VteView:blue-color:
*
* The blue color in the palette.
*
@@ -58,7 +58,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("yello
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("blue-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:magenta-color:
+ * VteView:magenta-color:
*
* The magenta color in the palette.
*
@@ -69,7 +69,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("blue-
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("magenta-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:cyan-color:
+ * VteView:cyan-color:
*
* The cyan color in the palette.
*
@@ -80,7 +80,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("magen
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("cyan-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:white-color:
+ * VteView:white-color:
*
* The white color in the palette.
*
@@ -91,7 +91,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("cyan-
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("white-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:bright-black-color:
+ * VteView:bright-black-color:
*
* The bright black color in the palette.
*
@@ -102,7 +102,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("white
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("bright-black-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:bright-red-color:
+ * VteView:bright-red-color:
*
* The bright red color in the palette.
*
@@ -113,7 +113,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("brigh
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("bright-red-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:bright-green-color:
+ * VteView:bright-green-color:
*
* The bright green color in the palette.
*
@@ -124,7 +124,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("brigh
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("bright-green-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:bright-yellow-color:
+ * VteView:bright-yellow-color:
*
* The bright yellow color in the palette.
*
@@ -135,7 +135,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("brigh
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("bright-yellow-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:bright-blue-color:
+ * VteView:bright-blue-color:
*
* The bright blue color in the palette.
*
@@ -146,7 +146,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("brigh
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("bright-blue-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:bright-magenta-color:
+ * VteView:bright-magenta-color:
*
* The bright magenta color in the palette.
*
@@ -157,7 +157,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("brigh
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("bright-magenta-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:bright-cyan-color:
+ * VteView:bright-cyan-color:
*
* The bright cyan color in the palette.
*
@@ -168,7 +168,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("brigh
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("bright-cyan-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:bright-white-color:
+ * VteView:bright-white-color:
*
* The bright white color in the palette.
*
@@ -179,7 +179,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("brigh
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("bright-white-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-1-1-1-color:
+ * VteView:color-6-cube-1-1-1-color:
*
* The (1, 1, 1) color in the 6x6x6 color cube.
*
@@ -190,7 +190,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("brigh
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-1-1-1-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-1-1-2-color:
+ * VteView:color-6-cube-1-1-2-color:
*
* The (1, 1, 2) color in the 6x6x6 color cube.
*
@@ -201,7 +201,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-1-1-2-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-1-1-3-color:
+ * VteView:color-6-cube-1-1-3-color:
*
* The (1, 1, 3) color in the 6x6x6 color cube.
*
@@ -212,7 +212,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-1-1-3-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-1-1-4-color:
+ * VteView:color-6-cube-1-1-4-color:
*
* The (1, 1, 4) color in the 6x6x6 color cube.
*
@@ -223,7 +223,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-1-1-4-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-1-1-5-color:
+ * VteView:color-6-cube-1-1-5-color:
*
* The (1, 1, 5) color in the 6x6x6 color cube.
*
@@ -234,7 +234,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-1-1-5-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-1-1-6-color:
+ * VteView:color-6-cube-1-1-6-color:
*
* The (1, 1, 6) color in the 6x6x6 color cube.
*
@@ -245,7 +245,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-1-1-6-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-1-2-1-color:
+ * VteView:color-6-cube-1-2-1-color:
*
* The (1, 2, 1) color in the 6x6x6 color cube.
*
@@ -256,7 +256,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-1-2-1-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-1-2-2-color:
+ * VteView:color-6-cube-1-2-2-color:
*
* The (1, 2, 2) color in the 6x6x6 color cube.
*
@@ -267,7 +267,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-1-2-2-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-1-2-3-color:
+ * VteView:color-6-cube-1-2-3-color:
*
* The (1, 2, 3) color in the 6x6x6 color cube.
*
@@ -278,7 +278,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-1-2-3-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-1-2-4-color:
+ * VteView:color-6-cube-1-2-4-color:
*
* The (1, 2, 4) color in the 6x6x6 color cube.
*
@@ -289,7 +289,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-1-2-4-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-1-2-5-color:
+ * VteView:color-6-cube-1-2-5-color:
*
* The (1, 2, 5) color in the 6x6x6 color cube.
*
@@ -300,7 +300,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-1-2-5-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-1-2-6-color:
+ * VteView:color-6-cube-1-2-6-color:
*
* The (1, 2, 6) color in the 6x6x6 color cube.
*
@@ -311,7 +311,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-1-2-6-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-1-3-1-color:
+ * VteView:color-6-cube-1-3-1-color:
*
* The (1, 3, 1) color in the 6x6x6 color cube.
*
@@ -322,7 +322,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-1-3-1-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-1-3-2-color:
+ * VteView:color-6-cube-1-3-2-color:
*
* The (1, 3, 2) color in the 6x6x6 color cube.
*
@@ -333,7 +333,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-1-3-2-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-1-3-3-color:
+ * VteView:color-6-cube-1-3-3-color:
*
* The (1, 3, 3) color in the 6x6x6 color cube.
*
@@ -344,7 +344,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-1-3-3-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-1-3-4-color:
+ * VteView:color-6-cube-1-3-4-color:
*
* The (1, 3, 4) color in the 6x6x6 color cube.
*
@@ -355,7 +355,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-1-3-4-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-1-3-5-color:
+ * VteView:color-6-cube-1-3-5-color:
*
* The (1, 3, 5) color in the 6x6x6 color cube.
*
@@ -366,7 +366,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-1-3-5-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-1-3-6-color:
+ * VteView:color-6-cube-1-3-6-color:
*
* The (1, 3, 6) color in the 6x6x6 color cube.
*
@@ -377,7 +377,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-1-3-6-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-1-4-1-color:
+ * VteView:color-6-cube-1-4-1-color:
*
* The (1, 4, 1) color in the 6x6x6 color cube.
*
@@ -388,7 +388,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-1-4-1-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-1-4-2-color:
+ * VteView:color-6-cube-1-4-2-color:
*
* The (1, 4, 2) color in the 6x6x6 color cube.
*
@@ -399,7 +399,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-1-4-2-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-1-4-3-color:
+ * VteView:color-6-cube-1-4-3-color:
*
* The (1, 4, 3) color in the 6x6x6 color cube.
*
@@ -410,7 +410,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-1-4-3-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-1-4-4-color:
+ * VteView:color-6-cube-1-4-4-color:
*
* The (1, 4, 4) color in the 6x6x6 color cube.
*
@@ -421,7 +421,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-1-4-4-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-1-4-5-color:
+ * VteView:color-6-cube-1-4-5-color:
*
* The (1, 4, 5) color in the 6x6x6 color cube.
*
@@ -432,7 +432,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-1-4-5-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-1-4-6-color:
+ * VteView:color-6-cube-1-4-6-color:
*
* The (1, 4, 6) color in the 6x6x6 color cube.
*
@@ -443,7 +443,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-1-4-6-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-1-5-1-color:
+ * VteView:color-6-cube-1-5-1-color:
*
* The (1, 5, 1) color in the 6x6x6 color cube.
*
@@ -454,7 +454,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-1-5-1-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-1-5-2-color:
+ * VteView:color-6-cube-1-5-2-color:
*
* The (1, 5, 2) color in the 6x6x6 color cube.
*
@@ -465,7 +465,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-1-5-2-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-1-5-3-color:
+ * VteView:color-6-cube-1-5-3-color:
*
* The (1, 5, 3) color in the 6x6x6 color cube.
*
@@ -476,7 +476,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-1-5-3-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-1-5-4-color:
+ * VteView:color-6-cube-1-5-4-color:
*
* The (1, 5, 4) color in the 6x6x6 color cube.
*
@@ -487,7 +487,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-1-5-4-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-1-5-5-color:
+ * VteView:color-6-cube-1-5-5-color:
*
* The (1, 5, 5) color in the 6x6x6 color cube.
*
@@ -498,7 +498,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-1-5-5-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-1-5-6-color:
+ * VteView:color-6-cube-1-5-6-color:
*
* The (1, 5, 6) color in the 6x6x6 color cube.
*
@@ -509,7 +509,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-1-5-6-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-1-6-1-color:
+ * VteView:color-6-cube-1-6-1-color:
*
* The (1, 6, 1) color in the 6x6x6 color cube.
*
@@ -520,7 +520,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-1-6-1-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-1-6-2-color:
+ * VteView:color-6-cube-1-6-2-color:
*
* The (1, 6, 2) color in the 6x6x6 color cube.
*
@@ -531,7 +531,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-1-6-2-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-1-6-3-color:
+ * VteView:color-6-cube-1-6-3-color:
*
* The (1, 6, 3) color in the 6x6x6 color cube.
*
@@ -542,7 +542,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-1-6-3-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-1-6-4-color:
+ * VteView:color-6-cube-1-6-4-color:
*
* The (1, 6, 4) color in the 6x6x6 color cube.
*
@@ -553,7 +553,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-1-6-4-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-1-6-5-color:
+ * VteView:color-6-cube-1-6-5-color:
*
* The (1, 6, 5) color in the 6x6x6 color cube.
*
@@ -564,7 +564,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-1-6-5-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-1-6-6-color:
+ * VteView:color-6-cube-1-6-6-color:
*
* The (1, 6, 6) color in the 6x6x6 color cube.
*
@@ -575,7 +575,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-1-6-6-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-2-1-1-color:
+ * VteView:color-6-cube-2-1-1-color:
*
* The (2, 1, 1) color in the 6x6x6 color cube.
*
@@ -586,7 +586,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-2-1-1-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-2-1-2-color:
+ * VteView:color-6-cube-2-1-2-color:
*
* The (2, 1, 2) color in the 6x6x6 color cube.
*
@@ -597,7 +597,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-2-1-2-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-2-1-3-color:
+ * VteView:color-6-cube-2-1-3-color:
*
* The (2, 1, 3) color in the 6x6x6 color cube.
*
@@ -608,7 +608,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-2-1-3-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-2-1-4-color:
+ * VteView:color-6-cube-2-1-4-color:
*
* The (2, 1, 4) color in the 6x6x6 color cube.
*
@@ -619,7 +619,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-2-1-4-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-2-1-5-color:
+ * VteView:color-6-cube-2-1-5-color:
*
* The (2, 1, 5) color in the 6x6x6 color cube.
*
@@ -630,7 +630,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-2-1-5-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-2-1-6-color:
+ * VteView:color-6-cube-2-1-6-color:
*
* The (2, 1, 6) color in the 6x6x6 color cube.
*
@@ -641,7 +641,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-2-1-6-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-2-2-1-color:
+ * VteView:color-6-cube-2-2-1-color:
*
* The (2, 2, 1) color in the 6x6x6 color cube.
*
@@ -652,7 +652,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-2-2-1-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-2-2-2-color:
+ * VteView:color-6-cube-2-2-2-color:
*
* The (2, 2, 2) color in the 6x6x6 color cube.
*
@@ -663,7 +663,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-2-2-2-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-2-2-3-color:
+ * VteView:color-6-cube-2-2-3-color:
*
* The (2, 2, 3) color in the 6x6x6 color cube.
*
@@ -674,7 +674,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-2-2-3-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-2-2-4-color:
+ * VteView:color-6-cube-2-2-4-color:
*
* The (2, 2, 4) color in the 6x6x6 color cube.
*
@@ -685,7 +685,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-2-2-4-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-2-2-5-color:
+ * VteView:color-6-cube-2-2-5-color:
*
* The (2, 2, 5) color in the 6x6x6 color cube.
*
@@ -696,7 +696,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-2-2-5-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-2-2-6-color:
+ * VteView:color-6-cube-2-2-6-color:
*
* The (2, 2, 6) color in the 6x6x6 color cube.
*
@@ -707,7 +707,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-2-2-6-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-2-3-1-color:
+ * VteView:color-6-cube-2-3-1-color:
*
* The (2, 3, 1) color in the 6x6x6 color cube.
*
@@ -718,7 +718,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-2-3-1-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-2-3-2-color:
+ * VteView:color-6-cube-2-3-2-color:
*
* The (2, 3, 2) color in the 6x6x6 color cube.
*
@@ -729,7 +729,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-2-3-2-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-2-3-3-color:
+ * VteView:color-6-cube-2-3-3-color:
*
* The (2, 3, 3) color in the 6x6x6 color cube.
*
@@ -740,7 +740,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-2-3-3-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-2-3-4-color:
+ * VteView:color-6-cube-2-3-4-color:
*
* The (2, 3, 4) color in the 6x6x6 color cube.
*
@@ -751,7 +751,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-2-3-4-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-2-3-5-color:
+ * VteView:color-6-cube-2-3-5-color:
*
* The (2, 3, 5) color in the 6x6x6 color cube.
*
@@ -762,7 +762,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-2-3-5-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-2-3-6-color:
+ * VteView:color-6-cube-2-3-6-color:
*
* The (2, 3, 6) color in the 6x6x6 color cube.
*
@@ -773,7 +773,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-2-3-6-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-2-4-1-color:
+ * VteView:color-6-cube-2-4-1-color:
*
* The (2, 4, 1) color in the 6x6x6 color cube.
*
@@ -784,7 +784,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-2-4-1-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-2-4-2-color:
+ * VteView:color-6-cube-2-4-2-color:
*
* The (2, 4, 2) color in the 6x6x6 color cube.
*
@@ -795,7 +795,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-2-4-2-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-2-4-3-color:
+ * VteView:color-6-cube-2-4-3-color:
*
* The (2, 4, 3) color in the 6x6x6 color cube.
*
@@ -806,7 +806,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-2-4-3-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-2-4-4-color:
+ * VteView:color-6-cube-2-4-4-color:
*
* The (2, 4, 4) color in the 6x6x6 color cube.
*
@@ -817,7 +817,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-2-4-4-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-2-4-5-color:
+ * VteView:color-6-cube-2-4-5-color:
*
* The (2, 4, 5) color in the 6x6x6 color cube.
*
@@ -828,7 +828,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-2-4-5-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-2-4-6-color:
+ * VteView:color-6-cube-2-4-6-color:
*
* The (2, 4, 6) color in the 6x6x6 color cube.
*
@@ -839,7 +839,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-2-4-6-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-2-5-1-color:
+ * VteView:color-6-cube-2-5-1-color:
*
* The (2, 5, 1) color in the 6x6x6 color cube.
*
@@ -850,7 +850,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-2-5-1-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-2-5-2-color:
+ * VteView:color-6-cube-2-5-2-color:
*
* The (2, 5, 2) color in the 6x6x6 color cube.
*
@@ -861,7 +861,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-2-5-2-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-2-5-3-color:
+ * VteView:color-6-cube-2-5-3-color:
*
* The (2, 5, 3) color in the 6x6x6 color cube.
*
@@ -872,7 +872,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-2-5-3-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-2-5-4-color:
+ * VteView:color-6-cube-2-5-4-color:
*
* The (2, 5, 4) color in the 6x6x6 color cube.
*
@@ -883,7 +883,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-2-5-4-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-2-5-5-color:
+ * VteView:color-6-cube-2-5-5-color:
*
* The (2, 5, 5) color in the 6x6x6 color cube.
*
@@ -894,7 +894,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-2-5-5-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-2-5-6-color:
+ * VteView:color-6-cube-2-5-6-color:
*
* The (2, 5, 6) color in the 6x6x6 color cube.
*
@@ -905,7 +905,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-2-5-6-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-2-6-1-color:
+ * VteView:color-6-cube-2-6-1-color:
*
* The (2, 6, 1) color in the 6x6x6 color cube.
*
@@ -916,7 +916,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-2-6-1-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-2-6-2-color:
+ * VteView:color-6-cube-2-6-2-color:
*
* The (2, 6, 2) color in the 6x6x6 color cube.
*
@@ -927,7 +927,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-2-6-2-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-2-6-3-color:
+ * VteView:color-6-cube-2-6-3-color:
*
* The (2, 6, 3) color in the 6x6x6 color cube.
*
@@ -938,7 +938,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-2-6-3-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-2-6-4-color:
+ * VteView:color-6-cube-2-6-4-color:
*
* The (2, 6, 4) color in the 6x6x6 color cube.
*
@@ -949,7 +949,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-2-6-4-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-2-6-5-color:
+ * VteView:color-6-cube-2-6-5-color:
*
* The (2, 6, 5) color in the 6x6x6 color cube.
*
@@ -960,7 +960,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-2-6-5-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-2-6-6-color:
+ * VteView:color-6-cube-2-6-6-color:
*
* The (2, 6, 6) color in the 6x6x6 color cube.
*
@@ -971,7 +971,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-2-6-6-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-3-1-1-color:
+ * VteView:color-6-cube-3-1-1-color:
*
* The (3, 1, 1) color in the 6x6x6 color cube.
*
@@ -982,7 +982,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-3-1-1-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-3-1-2-color:
+ * VteView:color-6-cube-3-1-2-color:
*
* The (3, 1, 2) color in the 6x6x6 color cube.
*
@@ -993,7 +993,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-3-1-2-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-3-1-3-color:
+ * VteView:color-6-cube-3-1-3-color:
*
* The (3, 1, 3) color in the 6x6x6 color cube.
*
@@ -1004,7 +1004,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-3-1-3-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-3-1-4-color:
+ * VteView:color-6-cube-3-1-4-color:
*
* The (3, 1, 4) color in the 6x6x6 color cube.
*
@@ -1015,7 +1015,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-3-1-4-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-3-1-5-color:
+ * VteView:color-6-cube-3-1-5-color:
*
* The (3, 1, 5) color in the 6x6x6 color cube.
*
@@ -1026,7 +1026,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-3-1-5-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-3-1-6-color:
+ * VteView:color-6-cube-3-1-6-color:
*
* The (3, 1, 6) color in the 6x6x6 color cube.
*
@@ -1037,7 +1037,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-3-1-6-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-3-2-1-color:
+ * VteView:color-6-cube-3-2-1-color:
*
* The (3, 2, 1) color in the 6x6x6 color cube.
*
@@ -1048,7 +1048,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-3-2-1-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-3-2-2-color:
+ * VteView:color-6-cube-3-2-2-color:
*
* The (3, 2, 2) color in the 6x6x6 color cube.
*
@@ -1059,7 +1059,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-3-2-2-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-3-2-3-color:
+ * VteView:color-6-cube-3-2-3-color:
*
* The (3, 2, 3) color in the 6x6x6 color cube.
*
@@ -1070,7 +1070,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-3-2-3-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-3-2-4-color:
+ * VteView:color-6-cube-3-2-4-color:
*
* The (3, 2, 4) color in the 6x6x6 color cube.
*
@@ -1081,7 +1081,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-3-2-4-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-3-2-5-color:
+ * VteView:color-6-cube-3-2-5-color:
*
* The (3, 2, 5) color in the 6x6x6 color cube.
*
@@ -1092,7 +1092,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-3-2-5-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-3-2-6-color:
+ * VteView:color-6-cube-3-2-6-color:
*
* The (3, 2, 6) color in the 6x6x6 color cube.
*
@@ -1103,7 +1103,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-3-2-6-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-3-3-1-color:
+ * VteView:color-6-cube-3-3-1-color:
*
* The (3, 3, 1) color in the 6x6x6 color cube.
*
@@ -1114,7 +1114,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-3-3-1-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-3-3-2-color:
+ * VteView:color-6-cube-3-3-2-color:
*
* The (3, 3, 2) color in the 6x6x6 color cube.
*
@@ -1125,7 +1125,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-3-3-2-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-3-3-3-color:
+ * VteView:color-6-cube-3-3-3-color:
*
* The (3, 3, 3) color in the 6x6x6 color cube.
*
@@ -1136,7 +1136,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-3-3-3-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-3-3-4-color:
+ * VteView:color-6-cube-3-3-4-color:
*
* The (3, 3, 4) color in the 6x6x6 color cube.
*
@@ -1147,7 +1147,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-3-3-4-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-3-3-5-color:
+ * VteView:color-6-cube-3-3-5-color:
*
* The (3, 3, 5) color in the 6x6x6 color cube.
*
@@ -1158,7 +1158,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-3-3-5-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-3-3-6-color:
+ * VteView:color-6-cube-3-3-6-color:
*
* The (3, 3, 6) color in the 6x6x6 color cube.
*
@@ -1169,7 +1169,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-3-3-6-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-3-4-1-color:
+ * VteView:color-6-cube-3-4-1-color:
*
* The (3, 4, 1) color in the 6x6x6 color cube.
*
@@ -1180,7 +1180,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-3-4-1-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-3-4-2-color:
+ * VteView:color-6-cube-3-4-2-color:
*
* The (3, 4, 2) color in the 6x6x6 color cube.
*
@@ -1191,7 +1191,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-3-4-2-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-3-4-3-color:
+ * VteView:color-6-cube-3-4-3-color:
*
* The (3, 4, 3) color in the 6x6x6 color cube.
*
@@ -1202,7 +1202,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-3-4-3-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-3-4-4-color:
+ * VteView:color-6-cube-3-4-4-color:
*
* The (3, 4, 4) color in the 6x6x6 color cube.
*
@@ -1213,7 +1213,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-3-4-4-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-3-4-5-color:
+ * VteView:color-6-cube-3-4-5-color:
*
* The (3, 4, 5) color in the 6x6x6 color cube.
*
@@ -1224,7 +1224,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-3-4-5-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-3-4-6-color:
+ * VteView:color-6-cube-3-4-6-color:
*
* The (3, 4, 6) color in the 6x6x6 color cube.
*
@@ -1235,7 +1235,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-3-4-6-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-3-5-1-color:
+ * VteView:color-6-cube-3-5-1-color:
*
* The (3, 5, 1) color in the 6x6x6 color cube.
*
@@ -1246,7 +1246,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-3-5-1-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-3-5-2-color:
+ * VteView:color-6-cube-3-5-2-color:
*
* The (3, 5, 2) color in the 6x6x6 color cube.
*
@@ -1257,7 +1257,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-3-5-2-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-3-5-3-color:
+ * VteView:color-6-cube-3-5-3-color:
*
* The (3, 5, 3) color in the 6x6x6 color cube.
*
@@ -1268,7 +1268,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-3-5-3-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-3-5-4-color:
+ * VteView:color-6-cube-3-5-4-color:
*
* The (3, 5, 4) color in the 6x6x6 color cube.
*
@@ -1279,7 +1279,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-3-5-4-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-3-5-5-color:
+ * VteView:color-6-cube-3-5-5-color:
*
* The (3, 5, 5) color in the 6x6x6 color cube.
*
@@ -1290,7 +1290,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-3-5-5-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-3-5-6-color:
+ * VteView:color-6-cube-3-5-6-color:
*
* The (3, 5, 6) color in the 6x6x6 color cube.
*
@@ -1301,7 +1301,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-3-5-6-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-3-6-1-color:
+ * VteView:color-6-cube-3-6-1-color:
*
* The (3, 6, 1) color in the 6x6x6 color cube.
*
@@ -1312,7 +1312,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-3-6-1-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-3-6-2-color:
+ * VteView:color-6-cube-3-6-2-color:
*
* The (3, 6, 2) color in the 6x6x6 color cube.
*
@@ -1323,7 +1323,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-3-6-2-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-3-6-3-color:
+ * VteView:color-6-cube-3-6-3-color:
*
* The (3, 6, 3) color in the 6x6x6 color cube.
*
@@ -1334,7 +1334,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-3-6-3-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-3-6-4-color:
+ * VteView:color-6-cube-3-6-4-color:
*
* The (3, 6, 4) color in the 6x6x6 color cube.
*
@@ -1345,7 +1345,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-3-6-4-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-3-6-5-color:
+ * VteView:color-6-cube-3-6-5-color:
*
* The (3, 6, 5) color in the 6x6x6 color cube.
*
@@ -1356,7 +1356,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-3-6-5-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-3-6-6-color:
+ * VteView:color-6-cube-3-6-6-color:
*
* The (3, 6, 6) color in the 6x6x6 color cube.
*
@@ -1367,7 +1367,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-3-6-6-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-4-1-1-color:
+ * VteView:color-6-cube-4-1-1-color:
*
* The (4, 1, 1) color in the 6x6x6 color cube.
*
@@ -1378,7 +1378,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-4-1-1-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-4-1-2-color:
+ * VteView:color-6-cube-4-1-2-color:
*
* The (4, 1, 2) color in the 6x6x6 color cube.
*
@@ -1389,7 +1389,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-4-1-2-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-4-1-3-color:
+ * VteView:color-6-cube-4-1-3-color:
*
* The (4, 1, 3) color in the 6x6x6 color cube.
*
@@ -1400,7 +1400,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-4-1-3-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-4-1-4-color:
+ * VteView:color-6-cube-4-1-4-color:
*
* The (4, 1, 4) color in the 6x6x6 color cube.
*
@@ -1411,7 +1411,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-4-1-4-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-4-1-5-color:
+ * VteView:color-6-cube-4-1-5-color:
*
* The (4, 1, 5) color in the 6x6x6 color cube.
*
@@ -1422,7 +1422,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-4-1-5-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-4-1-6-color:
+ * VteView:color-6-cube-4-1-6-color:
*
* The (4, 1, 6) color in the 6x6x6 color cube.
*
@@ -1433,7 +1433,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-4-1-6-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-4-2-1-color:
+ * VteView:color-6-cube-4-2-1-color:
*
* The (4, 2, 1) color in the 6x6x6 color cube.
*
@@ -1444,7 +1444,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-4-2-1-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-4-2-2-color:
+ * VteView:color-6-cube-4-2-2-color:
*
* The (4, 2, 2) color in the 6x6x6 color cube.
*
@@ -1455,7 +1455,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-4-2-2-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-4-2-3-color:
+ * VteView:color-6-cube-4-2-3-color:
*
* The (4, 2, 3) color in the 6x6x6 color cube.
*
@@ -1466,7 +1466,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-4-2-3-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-4-2-4-color:
+ * VteView:color-6-cube-4-2-4-color:
*
* The (4, 2, 4) color in the 6x6x6 color cube.
*
@@ -1477,7 +1477,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-4-2-4-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-4-2-5-color:
+ * VteView:color-6-cube-4-2-5-color:
*
* The (4, 2, 5) color in the 6x6x6 color cube.
*
@@ -1488,7 +1488,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-4-2-5-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-4-2-6-color:
+ * VteView:color-6-cube-4-2-6-color:
*
* The (4, 2, 6) color in the 6x6x6 color cube.
*
@@ -1499,7 +1499,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-4-2-6-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-4-3-1-color:
+ * VteView:color-6-cube-4-3-1-color:
*
* The (4, 3, 1) color in the 6x6x6 color cube.
*
@@ -1510,7 +1510,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-4-3-1-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-4-3-2-color:
+ * VteView:color-6-cube-4-3-2-color:
*
* The (4, 3, 2) color in the 6x6x6 color cube.
*
@@ -1521,7 +1521,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-4-3-2-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-4-3-3-color:
+ * VteView:color-6-cube-4-3-3-color:
*
* The (4, 3, 3) color in the 6x6x6 color cube.
*
@@ -1532,7 +1532,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-4-3-3-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-4-3-4-color:
+ * VteView:color-6-cube-4-3-4-color:
*
* The (4, 3, 4) color in the 6x6x6 color cube.
*
@@ -1543,7 +1543,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-4-3-4-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-4-3-5-color:
+ * VteView:color-6-cube-4-3-5-color:
*
* The (4, 3, 5) color in the 6x6x6 color cube.
*
@@ -1554,7 +1554,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-4-3-5-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-4-3-6-color:
+ * VteView:color-6-cube-4-3-6-color:
*
* The (4, 3, 6) color in the 6x6x6 color cube.
*
@@ -1565,7 +1565,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-4-3-6-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-4-4-1-color:
+ * VteView:color-6-cube-4-4-1-color:
*
* The (4, 4, 1) color in the 6x6x6 color cube.
*
@@ -1576,7 +1576,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-4-4-1-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-4-4-2-color:
+ * VteView:color-6-cube-4-4-2-color:
*
* The (4, 4, 2) color in the 6x6x6 color cube.
*
@@ -1587,7 +1587,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-4-4-2-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-4-4-3-color:
+ * VteView:color-6-cube-4-4-3-color:
*
* The (4, 4, 3) color in the 6x6x6 color cube.
*
@@ -1598,7 +1598,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-4-4-3-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-4-4-4-color:
+ * VteView:color-6-cube-4-4-4-color:
*
* The (4, 4, 4) color in the 6x6x6 color cube.
*
@@ -1609,7 +1609,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-4-4-4-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-4-4-5-color:
+ * VteView:color-6-cube-4-4-5-color:
*
* The (4, 4, 5) color in the 6x6x6 color cube.
*
@@ -1620,7 +1620,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-4-4-5-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-4-4-6-color:
+ * VteView:color-6-cube-4-4-6-color:
*
* The (4, 4, 6) color in the 6x6x6 color cube.
*
@@ -1631,7 +1631,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-4-4-6-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-4-5-1-color:
+ * VteView:color-6-cube-4-5-1-color:
*
* The (4, 5, 1) color in the 6x6x6 color cube.
*
@@ -1642,7 +1642,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-4-5-1-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-4-5-2-color:
+ * VteView:color-6-cube-4-5-2-color:
*
* The (4, 5, 2) color in the 6x6x6 color cube.
*
@@ -1653,7 +1653,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-4-5-2-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-4-5-3-color:
+ * VteView:color-6-cube-4-5-3-color:
*
* The (4, 5, 3) color in the 6x6x6 color cube.
*
@@ -1664,7 +1664,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-4-5-3-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-4-5-4-color:
+ * VteView:color-6-cube-4-5-4-color:
*
* The (4, 5, 4) color in the 6x6x6 color cube.
*
@@ -1675,7 +1675,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-4-5-4-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-4-5-5-color:
+ * VteView:color-6-cube-4-5-5-color:
*
* The (4, 5, 5) color in the 6x6x6 color cube.
*
@@ -1686,7 +1686,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-4-5-5-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-4-5-6-color:
+ * VteView:color-6-cube-4-5-6-color:
*
* The (4, 5, 6) color in the 6x6x6 color cube.
*
@@ -1697,7 +1697,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-4-5-6-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-4-6-1-color:
+ * VteView:color-6-cube-4-6-1-color:
*
* The (4, 6, 1) color in the 6x6x6 color cube.
*
@@ -1708,7 +1708,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-4-6-1-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-4-6-2-color:
+ * VteView:color-6-cube-4-6-2-color:
*
* The (4, 6, 2) color in the 6x6x6 color cube.
*
@@ -1719,7 +1719,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-4-6-2-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-4-6-3-color:
+ * VteView:color-6-cube-4-6-3-color:
*
* The (4, 6, 3) color in the 6x6x6 color cube.
*
@@ -1730,7 +1730,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-4-6-3-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-4-6-4-color:
+ * VteView:color-6-cube-4-6-4-color:
*
* The (4, 6, 4) color in the 6x6x6 color cube.
*
@@ -1741,7 +1741,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-4-6-4-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-4-6-5-color:
+ * VteView:color-6-cube-4-6-5-color:
*
* The (4, 6, 5) color in the 6x6x6 color cube.
*
@@ -1752,7 +1752,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-4-6-5-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-4-6-6-color:
+ * VteView:color-6-cube-4-6-6-color:
*
* The (4, 6, 6) color in the 6x6x6 color cube.
*
@@ -1763,7 +1763,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-4-6-6-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-5-1-1-color:
+ * VteView:color-6-cube-5-1-1-color:
*
* The (5, 1, 1) color in the 6x6x6 color cube.
*
@@ -1774,7 +1774,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-5-1-1-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-5-1-2-color:
+ * VteView:color-6-cube-5-1-2-color:
*
* The (5, 1, 2) color in the 6x6x6 color cube.
*
@@ -1785,7 +1785,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-5-1-2-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-5-1-3-color:
+ * VteView:color-6-cube-5-1-3-color:
*
* The (5, 1, 3) color in the 6x6x6 color cube.
*
@@ -1796,7 +1796,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-5-1-3-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-5-1-4-color:
+ * VteView:color-6-cube-5-1-4-color:
*
* The (5, 1, 4) color in the 6x6x6 color cube.
*
@@ -1807,7 +1807,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-5-1-4-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-5-1-5-color:
+ * VteView:color-6-cube-5-1-5-color:
*
* The (5, 1, 5) color in the 6x6x6 color cube.
*
@@ -1818,7 +1818,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-5-1-5-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-5-1-6-color:
+ * VteView:color-6-cube-5-1-6-color:
*
* The (5, 1, 6) color in the 6x6x6 color cube.
*
@@ -1829,7 +1829,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-5-1-6-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-5-2-1-color:
+ * VteView:color-6-cube-5-2-1-color:
*
* The (5, 2, 1) color in the 6x6x6 color cube.
*
@@ -1840,7 +1840,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-5-2-1-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-5-2-2-color:
+ * VteView:color-6-cube-5-2-2-color:
*
* The (5, 2, 2) color in the 6x6x6 color cube.
*
@@ -1851,7 +1851,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-5-2-2-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-5-2-3-color:
+ * VteView:color-6-cube-5-2-3-color:
*
* The (5, 2, 3) color in the 6x6x6 color cube.
*
@@ -1862,7 +1862,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-5-2-3-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-5-2-4-color:
+ * VteView:color-6-cube-5-2-4-color:
*
* The (5, 2, 4) color in the 6x6x6 color cube.
*
@@ -1873,7 +1873,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-5-2-4-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-5-2-5-color:
+ * VteView:color-6-cube-5-2-5-color:
*
* The (5, 2, 5) color in the 6x6x6 color cube.
*
@@ -1884,7 +1884,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-5-2-5-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-5-2-6-color:
+ * VteView:color-6-cube-5-2-6-color:
*
* The (5, 2, 6) color in the 6x6x6 color cube.
*
@@ -1895,7 +1895,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-5-2-6-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-5-3-1-color:
+ * VteView:color-6-cube-5-3-1-color:
*
* The (5, 3, 1) color in the 6x6x6 color cube.
*
@@ -1906,7 +1906,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-5-3-1-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-5-3-2-color:
+ * VteView:color-6-cube-5-3-2-color:
*
* The (5, 3, 2) color in the 6x6x6 color cube.
*
@@ -1917,7 +1917,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-5-3-2-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-5-3-3-color:
+ * VteView:color-6-cube-5-3-3-color:
*
* The (5, 3, 3) color in the 6x6x6 color cube.
*
@@ -1928,7 +1928,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-5-3-3-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-5-3-4-color:
+ * VteView:color-6-cube-5-3-4-color:
*
* The (5, 3, 4) color in the 6x6x6 color cube.
*
@@ -1939,7 +1939,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-5-3-4-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-5-3-5-color:
+ * VteView:color-6-cube-5-3-5-color:
*
* The (5, 3, 5) color in the 6x6x6 color cube.
*
@@ -1950,7 +1950,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-5-3-5-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-5-3-6-color:
+ * VteView:color-6-cube-5-3-6-color:
*
* The (5, 3, 6) color in the 6x6x6 color cube.
*
@@ -1961,7 +1961,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-5-3-6-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-5-4-1-color:
+ * VteView:color-6-cube-5-4-1-color:
*
* The (5, 4, 1) color in the 6x6x6 color cube.
*
@@ -1972,7 +1972,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-5-4-1-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-5-4-2-color:
+ * VteView:color-6-cube-5-4-2-color:
*
* The (5, 4, 2) color in the 6x6x6 color cube.
*
@@ -1983,7 +1983,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-5-4-2-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-5-4-3-color:
+ * VteView:color-6-cube-5-4-3-color:
*
* The (5, 4, 3) color in the 6x6x6 color cube.
*
@@ -1994,7 +1994,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-5-4-3-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-5-4-4-color:
+ * VteView:color-6-cube-5-4-4-color:
*
* The (5, 4, 4) color in the 6x6x6 color cube.
*
@@ -2005,7 +2005,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-5-4-4-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-5-4-5-color:
+ * VteView:color-6-cube-5-4-5-color:
*
* The (5, 4, 5) color in the 6x6x6 color cube.
*
@@ -2016,7 +2016,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-5-4-5-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-5-4-6-color:
+ * VteView:color-6-cube-5-4-6-color:
*
* The (5, 4, 6) color in the 6x6x6 color cube.
*
@@ -2027,7 +2027,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-5-4-6-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-5-5-1-color:
+ * VteView:color-6-cube-5-5-1-color:
*
* The (5, 5, 1) color in the 6x6x6 color cube.
*
@@ -2038,7 +2038,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-5-5-1-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-5-5-2-color:
+ * VteView:color-6-cube-5-5-2-color:
*
* The (5, 5, 2) color in the 6x6x6 color cube.
*
@@ -2049,7 +2049,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-5-5-2-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-5-5-3-color:
+ * VteView:color-6-cube-5-5-3-color:
*
* The (5, 5, 3) color in the 6x6x6 color cube.
*
@@ -2060,7 +2060,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-5-5-3-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-5-5-4-color:
+ * VteView:color-6-cube-5-5-4-color:
*
* The (5, 5, 4) color in the 6x6x6 color cube.
*
@@ -2071,7 +2071,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-5-5-4-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-5-5-5-color:
+ * VteView:color-6-cube-5-5-5-color:
*
* The (5, 5, 5) color in the 6x6x6 color cube.
*
@@ -2082,7 +2082,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-5-5-5-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-5-5-6-color:
+ * VteView:color-6-cube-5-5-6-color:
*
* The (5, 5, 6) color in the 6x6x6 color cube.
*
@@ -2093,7 +2093,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-5-5-6-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-5-6-1-color:
+ * VteView:color-6-cube-5-6-1-color:
*
* The (5, 6, 1) color in the 6x6x6 color cube.
*
@@ -2104,7 +2104,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-5-6-1-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-5-6-2-color:
+ * VteView:color-6-cube-5-6-2-color:
*
* The (5, 6, 2) color in the 6x6x6 color cube.
*
@@ -2115,7 +2115,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-5-6-2-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-5-6-3-color:
+ * VteView:color-6-cube-5-6-3-color:
*
* The (5, 6, 3) color in the 6x6x6 color cube.
*
@@ -2126,7 +2126,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-5-6-3-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-5-6-4-color:
+ * VteView:color-6-cube-5-6-4-color:
*
* The (5, 6, 4) color in the 6x6x6 color cube.
*
@@ -2137,7 +2137,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-5-6-4-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-5-6-5-color:
+ * VteView:color-6-cube-5-6-5-color:
*
* The (5, 6, 5) color in the 6x6x6 color cube.
*
@@ -2148,7 +2148,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-5-6-5-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-5-6-6-color:
+ * VteView:color-6-cube-5-6-6-color:
*
* The (5, 6, 6) color in the 6x6x6 color cube.
*
@@ -2159,7 +2159,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-5-6-6-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-6-1-1-color:
+ * VteView:color-6-cube-6-1-1-color:
*
* The (6, 1, 1) color in the 6x6x6 color cube.
*
@@ -2170,7 +2170,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-6-1-1-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-6-1-2-color:
+ * VteView:color-6-cube-6-1-2-color:
*
* The (6, 1, 2) color in the 6x6x6 color cube.
*
@@ -2181,7 +2181,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-6-1-2-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-6-1-3-color:
+ * VteView:color-6-cube-6-1-3-color:
*
* The (6, 1, 3) color in the 6x6x6 color cube.
*
@@ -2192,7 +2192,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-6-1-3-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-6-1-4-color:
+ * VteView:color-6-cube-6-1-4-color:
*
* The (6, 1, 4) color in the 6x6x6 color cube.
*
@@ -2203,7 +2203,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-6-1-4-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-6-1-5-color:
+ * VteView:color-6-cube-6-1-5-color:
*
* The (6, 1, 5) color in the 6x6x6 color cube.
*
@@ -2214,7 +2214,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-6-1-5-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-6-1-6-color:
+ * VteView:color-6-cube-6-1-6-color:
*
* The (6, 1, 6) color in the 6x6x6 color cube.
*
@@ -2225,7 +2225,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-6-1-6-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-6-2-1-color:
+ * VteView:color-6-cube-6-2-1-color:
*
* The (6, 2, 1) color in the 6x6x6 color cube.
*
@@ -2236,7 +2236,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-6-2-1-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-6-2-2-color:
+ * VteView:color-6-cube-6-2-2-color:
*
* The (6, 2, 2) color in the 6x6x6 color cube.
*
@@ -2247,7 +2247,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-6-2-2-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-6-2-3-color:
+ * VteView:color-6-cube-6-2-3-color:
*
* The (6, 2, 3) color in the 6x6x6 color cube.
*
@@ -2258,7 +2258,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-6-2-3-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-6-2-4-color:
+ * VteView:color-6-cube-6-2-4-color:
*
* The (6, 2, 4) color in the 6x6x6 color cube.
*
@@ -2269,7 +2269,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-6-2-4-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-6-2-5-color:
+ * VteView:color-6-cube-6-2-5-color:
*
* The (6, 2, 5) color in the 6x6x6 color cube.
*
@@ -2280,7 +2280,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-6-2-5-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-6-2-6-color:
+ * VteView:color-6-cube-6-2-6-color:
*
* The (6, 2, 6) color in the 6x6x6 color cube.
*
@@ -2291,7 +2291,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-6-2-6-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-6-3-1-color:
+ * VteView:color-6-cube-6-3-1-color:
*
* The (6, 3, 1) color in the 6x6x6 color cube.
*
@@ -2302,7 +2302,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-6-3-1-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-6-3-2-color:
+ * VteView:color-6-cube-6-3-2-color:
*
* The (6, 3, 2) color in the 6x6x6 color cube.
*
@@ -2313,7 +2313,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-6-3-2-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-6-3-3-color:
+ * VteView:color-6-cube-6-3-3-color:
*
* The (6, 3, 3) color in the 6x6x6 color cube.
*
@@ -2324,7 +2324,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-6-3-3-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-6-3-4-color:
+ * VteView:color-6-cube-6-3-4-color:
*
* The (6, 3, 4) color in the 6x6x6 color cube.
*
@@ -2335,7 +2335,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-6-3-4-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-6-3-5-color:
+ * VteView:color-6-cube-6-3-5-color:
*
* The (6, 3, 5) color in the 6x6x6 color cube.
*
@@ -2346,7 +2346,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-6-3-5-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-6-3-6-color:
+ * VteView:color-6-cube-6-3-6-color:
*
* The (6, 3, 6) color in the 6x6x6 color cube.
*
@@ -2357,7 +2357,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-6-3-6-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-6-4-1-color:
+ * VteView:color-6-cube-6-4-1-color:
*
* The (6, 4, 1) color in the 6x6x6 color cube.
*
@@ -2368,7 +2368,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-6-4-1-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-6-4-2-color:
+ * VteView:color-6-cube-6-4-2-color:
*
* The (6, 4, 2) color in the 6x6x6 color cube.
*
@@ -2379,7 +2379,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-6-4-2-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-6-4-3-color:
+ * VteView:color-6-cube-6-4-3-color:
*
* The (6, 4, 3) color in the 6x6x6 color cube.
*
@@ -2390,7 +2390,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-6-4-3-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-6-4-4-color:
+ * VteView:color-6-cube-6-4-4-color:
*
* The (6, 4, 4) color in the 6x6x6 color cube.
*
@@ -2401,7 +2401,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-6-4-4-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-6-4-5-color:
+ * VteView:color-6-cube-6-4-5-color:
*
* The (6, 4, 5) color in the 6x6x6 color cube.
*
@@ -2412,7 +2412,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-6-4-5-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-6-4-6-color:
+ * VteView:color-6-cube-6-4-6-color:
*
* The (6, 4, 6) color in the 6x6x6 color cube.
*
@@ -2423,7 +2423,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-6-4-6-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-6-5-1-color:
+ * VteView:color-6-cube-6-5-1-color:
*
* The (6, 5, 1) color in the 6x6x6 color cube.
*
@@ -2434,7 +2434,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-6-5-1-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-6-5-2-color:
+ * VteView:color-6-cube-6-5-2-color:
*
* The (6, 5, 2) color in the 6x6x6 color cube.
*
@@ -2445,7 +2445,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-6-5-2-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-6-5-3-color:
+ * VteView:color-6-cube-6-5-3-color:
*
* The (6, 5, 3) color in the 6x6x6 color cube.
*
@@ -2456,7 +2456,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-6-5-3-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-6-5-4-color:
+ * VteView:color-6-cube-6-5-4-color:
*
* The (6, 5, 4) color in the 6x6x6 color cube.
*
@@ -2467,7 +2467,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-6-5-4-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-6-5-5-color:
+ * VteView:color-6-cube-6-5-5-color:
*
* The (6, 5, 5) color in the 6x6x6 color cube.
*
@@ -2478,7 +2478,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-6-5-5-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-6-5-6-color:
+ * VteView:color-6-cube-6-5-6-color:
*
* The (6, 5, 6) color in the 6x6x6 color cube.
*
@@ -2489,7 +2489,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-6-5-6-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-6-6-1-color:
+ * VteView:color-6-cube-6-6-1-color:
*
* The (6, 6, 1) color in the 6x6x6 color cube.
*
@@ -2500,7 +2500,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-6-6-1-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-6-6-2-color:
+ * VteView:color-6-cube-6-6-2-color:
*
* The (6, 6, 2) color in the 6x6x6 color cube.
*
@@ -2511,7 +2511,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-6-6-2-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-6-6-3-color:
+ * VteView:color-6-cube-6-6-3-color:
*
* The (6, 6, 3) color in the 6x6x6 color cube.
*
@@ -2522,7 +2522,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-6-6-3-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-6-6-4-color:
+ * VteView:color-6-cube-6-6-4-color:
*
* The (6, 6, 4) color in the 6x6x6 color cube.
*
@@ -2533,7 +2533,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-6-6-4-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-6-6-5-color:
+ * VteView:color-6-cube-6-6-5-color:
*
* The (6, 6, 5) color in the 6x6x6 color cube.
*
@@ -2544,7 +2544,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-6-6-5-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:color-6-cube-6-6-6-color:
+ * VteView:color-6-cube-6-6-6-color:
*
* The (6, 6, 6) color in the 6x6x6 color cube.
*
@@ -2555,7 +2555,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color-6-cube-6-6-6-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:shade-24-shades-1-color:
+ * VteView:shade-24-shades-1-color:
*
* The 1th shade in the palette's shade ramp.
*
@@ -2566,7 +2566,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("color
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("shade-24-shades-1-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:shade-24-shades-2-color:
+ * VteView:shade-24-shades-2-color:
*
* The 2th shade in the palette's shade ramp.
*
@@ -2577,7 +2577,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("shade
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("shade-24-shades-2-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:shade-24-shades-3-color:
+ * VteView:shade-24-shades-3-color:
*
* The 3th shade in the palette's shade ramp.
*
@@ -2588,7 +2588,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("shade
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("shade-24-shades-3-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:shade-24-shades-4-color:
+ * VteView:shade-24-shades-4-color:
*
* The 4th shade in the palette's shade ramp.
*
@@ -2599,7 +2599,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("shade
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("shade-24-shades-4-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:shade-24-shades-5-color:
+ * VteView:shade-24-shades-5-color:
*
* The 5th shade in the palette's shade ramp.
*
@@ -2610,7 +2610,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("shade
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("shade-24-shades-5-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:shade-24-shades-6-color:
+ * VteView:shade-24-shades-6-color:
*
* The 6th shade in the palette's shade ramp.
*
@@ -2621,7 +2621,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("shade
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("shade-24-shades-6-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:shade-24-shades-7-color:
+ * VteView:shade-24-shades-7-color:
*
* The 7th shade in the palette's shade ramp.
*
@@ -2632,7 +2632,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("shade
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("shade-24-shades-7-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:shade-24-shades-8-color:
+ * VteView:shade-24-shades-8-color:
*
* The 8th shade in the palette's shade ramp.
*
@@ -2643,7 +2643,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("shade
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("shade-24-shades-8-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:shade-24-shades-9-color:
+ * VteView:shade-24-shades-9-color:
*
* The 9th shade in the palette's shade ramp.
*
@@ -2654,7 +2654,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("shade
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("shade-24-shades-9-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:shade-24-shades-10-color:
+ * VteView:shade-24-shades-10-color:
*
* The 10th shade in the palette's shade ramp.
*
@@ -2665,7 +2665,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("shade
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("shade-24-shades-10-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:shade-24-shades-11-color:
+ * VteView:shade-24-shades-11-color:
*
* The 11th shade in the palette's shade ramp.
*
@@ -2676,7 +2676,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("shade
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("shade-24-shades-11-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:shade-24-shades-12-color:
+ * VteView:shade-24-shades-12-color:
*
* The 12th shade in the palette's shade ramp.
*
@@ -2687,7 +2687,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("shade
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("shade-24-shades-12-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:shade-24-shades-13-color:
+ * VteView:shade-24-shades-13-color:
*
* The 13th shade in the palette's shade ramp.
*
@@ -2698,7 +2698,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("shade
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("shade-24-shades-13-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:shade-24-shades-14-color:
+ * VteView:shade-24-shades-14-color:
*
* The 14th shade in the palette's shade ramp.
*
@@ -2709,7 +2709,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("shade
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("shade-24-shades-14-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:shade-24-shades-15-color:
+ * VteView:shade-24-shades-15-color:
*
* The 15th shade in the palette's shade ramp.
*
@@ -2720,7 +2720,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("shade
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("shade-24-shades-15-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:shade-24-shades-16-color:
+ * VteView:shade-24-shades-16-color:
*
* The 16th shade in the palette's shade ramp.
*
@@ -2731,7 +2731,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("shade
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("shade-24-shades-16-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:shade-24-shades-17-color:
+ * VteView:shade-24-shades-17-color:
*
* The 17th shade in the palette's shade ramp.
*
@@ -2742,7 +2742,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("shade
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("shade-24-shades-17-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:shade-24-shades-18-color:
+ * VteView:shade-24-shades-18-color:
*
* The 18th shade in the palette's shade ramp.
*
@@ -2753,7 +2753,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("shade
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("shade-24-shades-18-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:shade-24-shades-19-color:
+ * VteView:shade-24-shades-19-color:
*
* The 19th shade in the palette's shade ramp.
*
@@ -2764,7 +2764,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("shade
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("shade-24-shades-19-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:shade-24-shades-20-color:
+ * VteView:shade-24-shades-20-color:
*
* The 20th shade in the palette's shade ramp.
*
@@ -2775,7 +2775,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("shade
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("shade-24-shades-20-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:shade-24-shades-21-color:
+ * VteView:shade-24-shades-21-color:
*
* The 21th shade in the palette's shade ramp.
*
@@ -2786,7 +2786,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("shade
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("shade-24-shades-21-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:shade-24-shades-22-color:
+ * VteView:shade-24-shades-22-color:
*
* The 22th shade in the palette's shade ramp.
*
@@ -2797,7 +2797,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("shade
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("shade-24-shades-22-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:shade-24-shades-23-color:
+ * VteView:shade-24-shades-23-color:
*
* The 23th shade in the palette's shade ramp.
*
@@ -2808,7 +2808,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("shade
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("shade-24-shades-23-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:shade-24-shades-24-color:
+ * VteView:shade-24-shades-24-color:
*
* The 24th shade in the palette's shade ramp.
*
@@ -2819,7 +2819,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("shade
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("shade-24-shades-24-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:foreground-color:
+ * VteView:foreground-color:
*
* The foreground color.
*
@@ -2830,7 +2830,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("shade
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("foreground-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:background-color:
+ * VteView:background-color:
*
* The background color.
*
@@ -2841,7 +2841,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("foreg
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("background-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:bold-foreground-color:
+ * VteView:bold-foreground-color:
*
* The color used for bold text. If unset, the terminal will use a suitable combination of the foreground and background color.
*
@@ -2852,7 +2852,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("backg
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("bold-foreground-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:dim-foreground-color:
+ * VteView:dim-foreground-color:
*
* The color used for dim text. If unset, the terminal will use a suitable combination of the foreground and background color.
*
@@ -2863,7 +2863,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("bold-
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("dim-foreground-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:selection-background-color:
+ * VteView:selection-background-color:
*
* The selection background color. If unset, the terminal will show selected text with reversed foreground and background.
*
@@ -2874,7 +2874,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("dim-f
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("selection-background-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:cursor-background-color:
+ * VteView:cursor-background-color:
*
* The cursor background color. If unset, the terminal will show the cursor with reversed foreground and background.
*
@@ -2885,7 +2885,7 @@ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("selec
gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed ("cursor-background-color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * VteTerminal:reverse-background-color:
+ * VteView:reverse-background-color:
*
* The background color used for reversed text. If unset, the terminal will show reversed text with reversed foreground and background.
*
diff --git a/src/vteseq.c b/src/vteseq.c
index 2eaf74d..6fbb28d 100644
--- a/src/vteseq.c
+++ b/src/vteseq.c
@@ -664,7 +664,7 @@ vte_sequence_handler_decset_internal(VteBuffer *buffer,
NULL, NULL,},
};
- VteTerminal *terminal;
+ VteView *terminal;
terminal = buffer->pvt->terminal;
/* FIXMEchpe cope with NULL here !!! */
@@ -791,7 +791,7 @@ vte_sequence_handler_decset_internal(VteBuffer *buffer,
case 1002:
case 1003:
/* Make the pointer visible. */
- _vte_terminal_set_pointer_visible(buffer->pvt->terminal, TRUE);
+ _vte_view_set_pointer_visible(buffer->pvt->terminal, TRUE);
break;
case 66:
_vte_debug_print(VTE_DEBUG_KEYBOARD, set ?
@@ -1857,7 +1857,7 @@ vte_sequence_handler_sf (VteBuffer *buffer, GValueArray *params)
static void
vte_sequence_handler_SF (VteBuffer *buffer, GValueArray *params)
{
- /* XXX implement this directly in _vte_terminal_cursor_down */
+ /* XXX implement this directly in _vte_view_cursor_down */
vte_sequence_handler_multiple(buffer, params, vte_sequence_handler_sf);
}
@@ -2961,7 +2961,7 @@ vte_sequence_handler_soft_reset (VteBuffer *buffer, GValueArray *params)
static void
vte_sequence_handler_window_manipulation (VteBuffer *buffer, GValueArray *params)
{
- VteTerminal *terminal;
+ VteView *terminal;
GdkScreen *gscreen;
VteScreen *screen;
GValue *value;
@@ -3212,7 +3212,7 @@ vte_sequence_handler_change_cursor_color (VteBuffer *buffer, GValueArray *params
return;
if (vte_parse_color (name, &color))
- _vte_terminal_set_effect_color(buffer->pvt->terminal, VTE_CUR_BG, &color,
+ _vte_view_set_effect_color(buffer->pvt->terminal, VTE_CUR_BG, &color,
VTE_EFFECT_COLOR, TRUE);
else if (strcmp (name, "?") == 0) {
gchar buf[128];
diff --git a/src/vteview.h b/src/vteview.h
new file mode 100644
index 0000000..986c8c3
--- /dev/null
+++ b/src/vteview.h
@@ -0,0 +1,179 @@
+/*
+ * Copyright (C) 2001,2002,2003,2009,2010 Red Hat, Inc.
+ *
+ * This is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#if !defined (__VTE_VTE_H_INSIDE__) && !defined (VTE_COMPILATION)
+#error "Only <vte/vte.h> can be included directly."
+#endif
+
+#ifndef __VTE_VIEW_H__
+#define __VTE_VIEW_H__
+
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+#define VTE_TYPE_VIEW (vte_view_get_type())
+#define VTE_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), VTE_TYPE_VIEW, VteView))
+#define VTE_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), VTE_TYPE_VIEW, VteViewClass))
+#define VTE_IS_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), VTE_TYPE_VIEW))
+#define VTE_IS_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), VTE_TYPE_VIEW))
+#define VTE_VIEW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), VTE_TYPE_VIEW, VteViewClass))
+
+typedef struct _VteView VteView;
+typedef struct _VteViewPrivate VteViewPrivate;
+typedef struct _VteViewClass VteViewClass;
+typedef struct _VteViewClassPrivate VteViewClassPrivate;
+
+/**
+ * VteView:
+ */
+struct _VteView {
+ GtkWidget widget;
+
+ /*< private >*/
+ VteViewPrivate *pvt;
+};
+
+/**
+ * VteViewClass:
+ *
+ * All of these fields should be considered read-only, except for derived classes.
+ */
+struct _VteViewClass {
+ /*< public > */
+ /* Inherited parent class. */
+ GtkWidgetClass parent_class;
+
+ /*< private >*/
+ VteViewClassPrivate *priv;
+
+ /*< protected > */
+ void (*buffer_changed)(VteView *terminal, VteBuffer *previous_buffer);
+ void (*char_size_changed)(VteView* terminal, guint char_width, guint char_height);
+ void (*selection_changed)(VteView* terminal);
+
+ /* FIXMEchpe: should these return gboolean and have defaul thandlers
+ * settings the "scale" property?
+ */
+ void (*increase_font_size)(VteView* terminal);
+ void (*decrease_font_size)(VteView* terminal);
+
+ void (*text_scrolled)(VteView* terminal, gint delta);
+
+ void (*copy_clipboard)(VteView* terminal);
+ void (*paste_clipboard)(VteView* terminal);
+ void (*copy_primary)(VteView* terminal);
+ void (*paste_primary)(VteView* terminal);
+
+ /* Padding for future expansion. */
+ gpointer padding[16];
+};
+
+/**
+ * VTE_STYLE_CLASS_TERMINAL:
+ *
+ * A CSS class to match terminals.
+ *
+ * Since: 0.30
+ */
+#define VTE_STYLE_CLASS_TERMINAL "terminal"
+
+/* The widget's type. */
+GType vte_view_get_type(void);
+
+GtkWidget *vte_view_new(void);
+
+void vte_view_set_buffer(VteView *terminal, VteBuffer *buffer);
+VteBuffer *vte_view_get_buffer(VteView *terminal);
+
+/* Copy currently-selected text to the clipboard, or from the clipboard to
+ * the terminal. */
+void vte_view_copy_clipboard(VteView *terminal, GtkClipboard *clipboard);
+void vte_view_paste_clipboard(VteView *terminal, GtkClipboard *clipboard);
+
+void vte_view_select_all(VteView *terminal);
+void vte_view_unselect_all(VteView *terminal);
+
+void vte_view_set_font_scale(VteView *terminal,
+ gdouble scale);
+gdouble vte_view_get_font_scale(VteView *terminal);
+
+/* Set various on-off settings. */
+void vte_view_set_audible_bell(VteView *terminal, gboolean is_audible);
+gboolean vte_view_get_audible_bell(VteView *terminal);
+void vte_view_set_visible_bell(VteView *terminal, gboolean is_visible);
+gboolean vte_view_get_visible_bell(VteView *terminal);
+void vte_view_set_scroll_on_output(VteView *terminal, gboolean scroll);
+void vte_view_set_scroll_on_keystroke(VteView *terminal,
+ gboolean scroll);
+
+/* Append the input method menu items to a given shell. */
+void vte_view_im_append_menuitems(VteView *terminal,
+ GtkMenuShell *menushell);
+
+/* Check if the terminal is the current selection owner. */
+gboolean vte_view_get_has_selection(VteView *terminal);
+gboolean vte_view_get_selection_bounds(VteView *terminal,
+ VteBufferIter *start,
+ VteBufferIter *end);
+
+/* Set the list of word chars, optionally using hyphens to specify ranges
+ * (to get a hyphen, place it first), and check if a character is in the
+ * range. */
+void vte_view_set_word_chars(VteView *terminal, const char *spec);
+
+/* Manipulate the autohide setting. */
+void vte_view_set_mouse_autohide(VteView *terminal, gboolean setting);
+gboolean vte_view_get_mouse_autohide(VteView *terminal);
+
+/* Add a matching expression, returning the tag the widget assigns to that
+ * expression. */
+int vte_view_match_add_gregex(VteView *terminal, GRegex *regex, GRegexMatchFlags flags);
+/* Set the cursor to be used when the pointer is over a given match. */
+void vte_view_match_set_cursor(VteView *terminal, int tag,
+ GdkCursor *cursor);
+void vte_view_match_set_cursor_type(VteView *terminal,
+ int tag, GdkCursorType cursor_type);
+void vte_view_match_set_cursor_name(VteView *terminal,
+ int tag, const char *cursor_name);
+void vte_view_match_remove(VteView *terminal, int tag);
+void vte_view_match_remove_all(VteView *terminal);
+
+/* Check if a given cell on the screen contains part of a matched string. If
+ * it does, return the string, and store the match tag in the optional tag
+ * argument. */
+char *vte_view_match_check(VteView *terminal,
+ glong column, glong row,
+ int *tag);
+
+void vte_view_search_set_gregex (VteView *terminal,
+ GRegex *regex,
+ GRegexMatchFlags flags);
+GRegex *vte_view_search_get_gregex (VteView *terminal);
+void vte_view_search_set_wrap_around (VteView *terminal,
+ gboolean wrap_around);
+gboolean vte_view_search_get_wrap_around (VteView *terminal);
+gboolean vte_view_search_find_previous (VteView *terminal);
+gboolean vte_view_search_find_next (VteView *terminal);
+
+glong vte_view_get_char_width(VteView *terminal);
+glong vte_view_get_char_height(VteView *terminal);
+
+G_END_DECLS
+
+#endif /* __VTE_VIEW_H__ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
