[vte] widget: Move some methods to VteTerminalPrivate
- From: Christian Persch <chpe src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vte] widget: Move some methods to VteTerminalPrivate
- Date: Thu, 14 Jan 2016 16:10:34 +0000 (UTC)
commit 74cf496f899a5fb7f8900d1e15f1ec7852dc6f89
Author: Christian Persch <chpe gnome org>
Date: Thu Jan 14 17:05:33 2016 +0100
widget: Move some methods to VteTerminalPrivate
src/vtegtk.cc | 186 +++++++++++++++++++++++++++------------------------
src/vtegtk.hh | 10 +++
src/vteinternal.hh | 12 ++++
src/vteseq.cc | 124 ++++++++++++++++++-----------------
4 files changed, 183 insertions(+), 149 deletions(-)
---
diff --git a/src/vtegtk.cc b/src/vtegtk.cc
index 6f8dbcf..324e49d 100644
--- a/src/vtegtk.cc
+++ b/src/vtegtk.cc
@@ -885,14 +885,15 @@ vte_terminal_class_init(VteTerminalClass *klass)
*
* Emitted at the child application's request.
*/
- g_signal_new(I_("deiconify-window"),
- G_OBJECT_CLASS_TYPE(klass),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(VteTerminalClass, deiconify_window),
- NULL,
- NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
+ signals[SIGNAL_DEICONIFY_WINDOW] =
+ g_signal_new(I_("deiconify-window"),
+ G_OBJECT_CLASS_TYPE(klass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET(VteTerminalClass, deiconify_window),
+ NULL,
+ NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
/**
* VteTerminal::iconify-window:
@@ -900,14 +901,15 @@ vte_terminal_class_init(VteTerminalClass *klass)
*
* Emitted at the child application's request.
*/
- g_signal_new(I_("iconify-window"),
- G_OBJECT_CLASS_TYPE(klass),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(VteTerminalClass, iconify_window),
- NULL,
- NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
+ signals[SIGNAL_ICONIFY_WINDOW] =
+ g_signal_new(I_("iconify-window"),
+ G_OBJECT_CLASS_TYPE(klass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET(VteTerminalClass, iconify_window),
+ NULL,
+ NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
/**
* VteTerminal::raise-window:
@@ -915,14 +917,15 @@ vte_terminal_class_init(VteTerminalClass *klass)
*
* Emitted at the child application's request.
*/
- g_signal_new(I_("raise-window"),
- G_OBJECT_CLASS_TYPE(klass),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(VteTerminalClass, raise_window),
- NULL,
- NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
+ signals[SIGNAL_RAISE_WINDOW] =
+ g_signal_new(I_("raise-window"),
+ G_OBJECT_CLASS_TYPE(klass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET(VteTerminalClass, raise_window),
+ NULL,
+ NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
/**
* VteTerminal::lower-window:
@@ -930,14 +933,15 @@ vte_terminal_class_init(VteTerminalClass *klass)
*
* Emitted at the child application's request.
*/
- g_signal_new(I_("lower-window"),
- G_OBJECT_CLASS_TYPE(klass),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(VteTerminalClass, lower_window),
- NULL,
- NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
+ signals[SIGNAL_LOWER_WINDOW] =
+ g_signal_new(I_("lower-window"),
+ G_OBJECT_CLASS_TYPE(klass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET(VteTerminalClass, lower_window),
+ NULL,
+ NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
/**
* VteTerminal::refresh-window:
@@ -945,14 +949,15 @@ vte_terminal_class_init(VteTerminalClass *klass)
*
* Emitted at the child application's request.
*/
- g_signal_new(I_("refresh-window"),
- G_OBJECT_CLASS_TYPE(klass),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(VteTerminalClass, refresh_window),
- NULL,
- NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
+ signals[SIGNAL_REFRESH_WINDOW] =
+ g_signal_new(I_("refresh-window"),
+ G_OBJECT_CLASS_TYPE(klass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET(VteTerminalClass, refresh_window),
+ NULL,
+ NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
/**
* VteTerminal::restore-window:
@@ -960,14 +965,15 @@ vte_terminal_class_init(VteTerminalClass *klass)
*
* Emitted at the child application's request.
*/
- g_signal_new(I_("restore-window"),
- G_OBJECT_CLASS_TYPE(klass),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(VteTerminalClass, restore_window),
- NULL,
- NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
+ signals[SIGNAL_RESTORE_WINDOW] =
+ g_signal_new(I_("restore-window"),
+ G_OBJECT_CLASS_TYPE(klass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET(VteTerminalClass, restore_window),
+ NULL,
+ NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
/**
* VteTerminal::maximize-window:
@@ -975,14 +981,15 @@ vte_terminal_class_init(VteTerminalClass *klass)
*
* Emitted at the child application's request.
*/
- g_signal_new(I_("maximize-window"),
- G_OBJECT_CLASS_TYPE(klass),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(VteTerminalClass, maximize_window),
- NULL,
- NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
+ signals[SIGNAL_MAXIMIZE_WINDOW] =
+ g_signal_new(I_("maximize-window"),
+ G_OBJECT_CLASS_TYPE(klass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET(VteTerminalClass, maximize_window),
+ NULL,
+ NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
/**
* VteTerminal::resize-window:
@@ -992,14 +999,15 @@ vte_terminal_class_init(VteTerminalClass *klass)
*
* Emitted at the child application's request.
*/
- g_signal_new(I_("resize-window"),
- G_OBJECT_CLASS_TYPE(klass),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(VteTerminalClass, resize_window),
- NULL,
- NULL,
- _vte_marshal_VOID__UINT_UINT,
- G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT);
+ signals[SIGNAL_RESIZE_WINDOW] =
+ g_signal_new(I_("resize-window"),
+ G_OBJECT_CLASS_TYPE(klass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET(VteTerminalClass, resize_window),
+ NULL,
+ NULL,
+ _vte_marshal_VOID__UINT_UINT,
+ G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT);
/**
* VteTerminal::move-window:
@@ -1009,14 +1017,15 @@ vte_terminal_class_init(VteTerminalClass *klass)
*
* Emitted at the child application's request.
*/
- g_signal_new(I_("move-window"),
- G_OBJECT_CLASS_TYPE(klass),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(VteTerminalClass, move_window),
- NULL,
- NULL,
- _vte_marshal_VOID__UINT_UINT,
- G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT);
+ signals[SIGNAL_MOVE_WINDOW] =
+ g_signal_new(I_("move-window"),
+ G_OBJECT_CLASS_TYPE(klass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET(VteTerminalClass, move_window),
+ NULL,
+ NULL,
+ _vte_marshal_VOID__UINT_UINT,
+ G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT);
/**
* VteTerminal::increase-font-size:
@@ -1025,14 +1034,14 @@ vte_terminal_class_init(VteTerminalClass *klass)
* Emitted when the user hits the '+' key while holding the Control key.
*/
signals[SIGNAL_INCREASE_FONT_SIZE] =
- g_signal_new(I_("increase-font-size"),
- G_OBJECT_CLASS_TYPE(klass),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(VteTerminalClass, increase_font_size),
- NULL,
- NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
+ g_signal_new(I_("increase-font-size"),
+ G_OBJECT_CLASS_TYPE(klass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET(VteTerminalClass, increase_font_size),
+ NULL,
+ NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
/**
* VteTerminal::decrease-font-size:
@@ -1162,14 +1171,15 @@ vte_terminal_class_init(VteTerminalClass *klass)
* This signal is emitted when the a child sends a bell request to the
* terminal.
*/
- g_signal_new(I_("bell"),
- G_OBJECT_CLASS_TYPE(klass),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(VteTerminalClass, bell),
- NULL,
- NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
+ signals[SIGNAL_BELL] =
+ g_signal_new(I_("bell"),
+ G_OBJECT_CLASS_TYPE(klass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET(VteTerminalClass, bell),
+ NULL,
+ NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
/**
* VteTerminal:allow-bold:
diff --git a/src/vtegtk.hh b/src/vtegtk.hh
index cab0743..5fd8c11 100644
--- a/src/vtegtk.hh
+++ b/src/vtegtk.hh
@@ -26,6 +26,7 @@
#pragma once
enum {
+ SIGNAL_BELL,
SIGNAL_CHAR_SIZE_CHANGED,
SIGNAL_CHILD_EXITED,
SIGNAL_COMMIT,
@@ -34,10 +35,19 @@ enum {
SIGNAL_CURRENT_FILE_URI_CHANGED,
SIGNAL_CURSOR_MOVED,
SIGNAL_DECREASE_FONT_SIZE,
+ SIGNAL_DEICONIFY_WINDOW,
SIGNAL_ENCODING_CHANGED,
SIGNAL_EOF,
SIGNAL_ICON_TITLE_CHANGED,
+ SIGNAL_ICONIFY_WINDOW,
SIGNAL_INCREASE_FONT_SIZE,
+ SIGNAL_LOWER_WINDOW,
+ SIGNAL_MAXIMIZE_WINDOW,
+ SIGNAL_MOVE_WINDOW,
+ SIGNAL_RAISE_WINDOW,
+ SIGNAL_REFRESH_WINDOW,
+ SIGNAL_RESIZE_WINDOW,
+ SIGNAL_RESTORE_WINDOW,
SIGNAL_SELECTION_CHANGED,
SIGNAL_TEXT_DELETED,
SIGNAL_TEXT_INSERTED,
diff --git a/src/vteinternal.hh b/src/vteinternal.hh
index b792f91..6732b6c 100644
--- a/src/vteinternal.hh
+++ b/src/vteinternal.hh
@@ -895,6 +895,18 @@ public:
int height);
void emit_increase_font_size();
void emit_decrease_font_size();
+ void emit_bell();
+ void emit_deiconify_window();
+ void emit_iconify_window();
+ void emit_raise_window();
+ void emit_lower_window();
+ void emit_maximize_window();
+ void emit_refresh_window();
+ void emit_restore_window();
+ void emit_move_window(guint x,
+ guint y);
+ void emit_resize_window(guint columns,
+ guint rows);
void clear_tabstop(int column); // FIXMEchpe vte::grid::column_t ?
bool get_tabstop(int column);
diff --git a/src/vteseq.cc b/src/vteseq.cc
index 30a57b2..b594f29 100644
--- a/src/vteseq.cc
+++ b/src/vteseq.cc
@@ -28,6 +28,8 @@
#include <vte/vte.h>
#include "vte-private.h"
+#include "vteinternal.hh"
+#include "vtegtk.hh"
#define BEL "\007"
#define ST _VTE_CAP_ST
@@ -114,86 +116,87 @@ vte_ucs4_to_utf8 (VteTerminal *terminal, const guchar *in)
return out;
}
+/* Emit a "bell" signal. */
+void
+VteTerminalPrivate::emit_bell()
+{
+ _vte_debug_print(VTE_DEBUG_SIGNALS, "Emitting `bell'.\n");
+ g_signal_emit(m_terminal, signals[SIGNAL_BELL], 0);
+}
+
+
/* Emit a "deiconify-window" signal. */
-static void
-vte_terminal_emit_deiconify_window(VteTerminal *terminal)
+void
+VteTerminalPrivate::emit_deiconify_window()
{
- _vte_debug_print(VTE_DEBUG_SIGNALS,
- "Emitting `deiconify-window'.\n");
- g_signal_emit_by_name(terminal, "deiconify-window");
+ _vte_debug_print(VTE_DEBUG_SIGNALS, "Emitting `deiconify-window'.\n");
+ g_signal_emit(m_terminal, signals[SIGNAL_DEICONIFY_WINDOW], 0);
}
/* Emit a "iconify-window" signal. */
-static void
-vte_terminal_emit_iconify_window(VteTerminal *terminal)
+void
+VteTerminalPrivate::emit_iconify_window()
{
- _vte_debug_print(VTE_DEBUG_SIGNALS,
- "Emitting `iconify-window'.\n");
- g_signal_emit_by_name(terminal, "iconify-window");
+ _vte_debug_print(VTE_DEBUG_SIGNALS, "Emitting `iconify-window'.\n");
+ g_signal_emit(m_terminal, signals[SIGNAL_ICONIFY_WINDOW], 0);
}
/* Emit a "raise-window" signal. */
-static void
-vte_terminal_emit_raise_window(VteTerminal *terminal)
+void
+VteTerminalPrivate::emit_raise_window()
{
- _vte_debug_print(VTE_DEBUG_SIGNALS,
- "Emitting `raise-window'.\n");
- g_signal_emit_by_name(terminal, "raise-window");
+ _vte_debug_print(VTE_DEBUG_SIGNALS, "Emitting `raise-window'.\n");
+ g_signal_emit(m_terminal, signals[SIGNAL_RAISE_WINDOW], 0);
}
/* Emit a "lower-window" signal. */
-static void
-vte_terminal_emit_lower_window(VteTerminal *terminal)
+void
+VteTerminalPrivate::emit_lower_window()
{
- _vte_debug_print(VTE_DEBUG_SIGNALS,
- "Emitting `lower-window'.\n");
- g_signal_emit_by_name(terminal, "lower-window");
+ _vte_debug_print(VTE_DEBUG_SIGNALS, "Emitting `lower-window'.\n");
+ g_signal_emit(m_terminal, signals[SIGNAL_LOWER_WINDOW], 0);
}
/* Emit a "maximize-window" signal. */
-static void
-vte_terminal_emit_maximize_window(VteTerminal *terminal)
+void
+VteTerminalPrivate::emit_maximize_window()
{
- _vte_debug_print(VTE_DEBUG_SIGNALS,
- "Emitting `maximize-window'.\n");
- g_signal_emit_by_name(terminal, "maximize-window");
+ _vte_debug_print(VTE_DEBUG_SIGNALS, "Emitting `maximize-window'.\n");
+ g_signal_emit(m_terminal, signals[SIGNAL_MAXIMIZE_WINDOW], 0);
}
/* Emit a "refresh-window" signal. */
-static void
-vte_terminal_emit_refresh_window(VteTerminal *terminal)
+void
+VteTerminalPrivate::emit_refresh_window()
{
- _vte_debug_print(VTE_DEBUG_SIGNALS,
- "Emitting `refresh-window'.\n");
- g_signal_emit_by_name(terminal, "refresh-window");
+ _vte_debug_print(VTE_DEBUG_SIGNALS, "Emitting `refresh-window'.\n");
+ g_signal_emit(m_terminal, signals[SIGNAL_REFRESH_WINDOW], 0);
}
/* Emit a "restore-window" signal. */
-static void
-vte_terminal_emit_restore_window(VteTerminal *terminal)
+void
+VteTerminalPrivate::emit_restore_window()
{
- _vte_debug_print(VTE_DEBUG_SIGNALS,
- "Emitting `restore-window'.\n");
- g_signal_emit_by_name(terminal, "restore-window");
+ _vte_debug_print(VTE_DEBUG_SIGNALS, "Emitting `restore-window'.\n");
+ g_signal_emit(m_terminal, signals[SIGNAL_RESTORE_WINDOW], 0);
}
/* Emit a "move-window" signal. (Pixels.) */
-static void
-vte_terminal_emit_move_window(VteTerminal *terminal, guint x, guint y)
+void
+VteTerminalPrivate::emit_move_window(guint x,
+ guint y)
{
- _vte_debug_print(VTE_DEBUG_SIGNALS,
- "Emitting `move-window'.\n");
- g_signal_emit_by_name(terminal, "move-window", x, y);
+ _vte_debug_print(VTE_DEBUG_SIGNALS, "Emitting `move-window'.\n");
+ g_signal_emit(m_terminal, signals[SIGNAL_MOVE_WINDOW], 0, x, y);
}
/* Emit a "resize-window" signal. (Grid size.) */
-static void
-vte_terminal_emit_resize_window(VteTerminal *terminal,
- guint columns, guint rows)
+void
+VteTerminalPrivate::emit_resize_window(guint columns,
+ guint rows)
{
- _vte_debug_print(VTE_DEBUG_SIGNALS,
- "Emitting `resize-window'.\n");
- g_signal_emit_by_name(terminal, "resize-window", columns, rows);
+ _vte_debug_print(VTE_DEBUG_SIGNALS, "Emitting `resize-window'.\n");
+ g_signal_emit(m_terminal, signals[SIGNAL_RESIZE_WINDOW], 0, columns, rows);
}
@@ -860,7 +863,7 @@ vte_sequence_handler_decset_internal(VteTerminal *terminal,
case 3:
/* 3: DECCOLM set/reset to 132/80 columns mode, clear screen and cursor home */
if (terminal->pvt->deccolm_mode) {
- vte_terminal_emit_resize_window(terminal,
+ terminal->pvt->emit_resize_window(
set ? 132 : 80,
terminal->pvt->row_count);
_vte_terminal_clear_screen(terminal);
@@ -981,7 +984,7 @@ static void
vte_sequence_handler_bell (VteTerminal *terminal, GValueArray *params)
{
terminal->pvt->beep();
- g_signal_emit_by_name(terminal, "bell");
+ terminal->pvt->emit_bell();
}
/* Backtab. */
@@ -1626,7 +1629,7 @@ vte_sequence_handler_change_color_internal (VteTerminal *terminal, GValueArray *
/* emit the refresh as the palette has changed and previous
* renders need to be updated. */
- vte_terminal_emit_refresh_window (terminal);
+ terminal->pvt->emit_refresh_window();
}
}
@@ -2885,20 +2888,19 @@ vte_sequence_handler_window_manipulation (VteTerminal *terminal, GValueArray *pa
case 1:
_vte_debug_print(VTE_DEBUG_PARSE,
"Deiconifying window.\n");
- vte_terminal_emit_deiconify_window(terminal);
+ terminal->pvt->emit_deiconify_window();
break;
case 2:
_vte_debug_print(VTE_DEBUG_PARSE,
"Iconifying window.\n");
- vte_terminal_emit_iconify_window(terminal);
+ terminal->pvt->emit_iconify_window();
break;
case 3:
if ((arg1 != -1) && (arg2 != -1)) {
_vte_debug_print(VTE_DEBUG_PARSE,
"Moving window to "
"%ld,%ld.\n", arg1, arg2);
- vte_terminal_emit_move_window(terminal,
- arg1, arg2);
+ terminal->pvt->emit_move_window(arg1, arg2);
}
break;
case 4:
@@ -2909,24 +2911,24 @@ vte_sequence_handler_window_manipulation (VteTerminal *terminal, GValueArray *pa
arg2, arg1,
arg2 / terminal->pvt->char_width,
arg1 / terminal->pvt->char_height);
- vte_terminal_emit_resize_window(terminal,
+ terminal->pvt->emit_resize_window(
arg2 / terminal->pvt->char_width,
arg1 / terminal->pvt->char_height);
}
break;
case 5:
_vte_debug_print(VTE_DEBUG_PARSE, "Raising window.\n");
- vte_terminal_emit_raise_window(terminal);
+ terminal->pvt->emit_raise_window();
break;
case 6:
_vte_debug_print(VTE_DEBUG_PARSE, "Lowering window.\n");
- vte_terminal_emit_lower_window(terminal);
+ terminal->pvt->emit_lower_window();
break;
case 7:
_vte_debug_print(VTE_DEBUG_PARSE,
"Refreshing window.\n");
terminal->pvt->invalidate_all();
- vte_terminal_emit_refresh_window(terminal);
+ terminal->pvt->emit_refresh_window();
break;
case 8:
if ((arg1 != -1) && (arg2 != -1)) {
@@ -2934,7 +2936,7 @@ vte_sequence_handler_window_manipulation (VteTerminal *terminal, GValueArray *pa
"Resizing window "
"(to %ld columns, %ld rows).\n",
arg2, arg1);
- vte_terminal_emit_resize_window(terminal, arg2, arg1);
+ terminal->pvt->emit_resize_window(arg2, arg1);
}
break;
case 9:
@@ -2942,12 +2944,12 @@ vte_sequence_handler_window_manipulation (VteTerminal *terminal, GValueArray *pa
case 0:
_vte_debug_print(VTE_DEBUG_PARSE,
"Restoring window.\n");
- vte_terminal_emit_restore_window(terminal);
+ terminal->pvt->emit_restore_window();
break;
case 1:
_vte_debug_print(VTE_DEBUG_PARSE,
"Maximizing window.\n");
- vte_terminal_emit_maximize_window(terminal);
+ terminal->pvt->emit_maximize_window();
break;
default:
break;
@@ -3047,7 +3049,7 @@ vte_sequence_handler_window_manipulation (VteTerminal *terminal, GValueArray *pa
param);
/* Resize to the specified number of
* rows. */
- vte_terminal_emit_resize_window(terminal,
+ terminal->pvt->emit_resize_window(
terminal->pvt->column_count,
param);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
