[Xfce4-commits] [apps/xfce4-terminal] 01/02: Hide font and zoom level to window priv struct
noreply at xfce.org
noreply at xfce.org
Wed Jul 19 19:44:28 CEST 2017
This is an automated email from the git hooks/post-receive script.
f 2 4 0 4 p u s h e d a c o m m i t t o b r a n c h m a s t e r
in repository apps/xfce4-terminal.
commit c7bf7d67fb8ceaa07303b32e463ce6a8bfa55c04
Author: Igor <f2404 at yandex.ru>
Date: Wed Jul 19 13:44:01 2017 -0400
Hide font and zoom level to window priv struct
---
terminal/terminal-app.c | 13 +++----
terminal/terminal-screen.c | 9 ++---
terminal/terminal-window.c | 87 +++++++++++++++++++++++++++++++++++++---------
terminal/terminal-window.h | 13 +++++--
4 files changed, 91 insertions(+), 31 deletions(-)
diff --git a/terminal/terminal-app.c b/terminal/terminal-app.c
index 65bb260..eac92d0 100644
--- a/terminal/terminal-app.c
+++ b/terminal/terminal-app.c
@@ -436,9 +436,9 @@ terminal_app_new_window (TerminalWindow *window,
win_attr->display = g_strdup (gdk_display_get_name (gdk_screen_get_display (screen)));
tab_attr = win_attr->tabs->data;
tab_attr->directory = g_strdup (working_directory);
- if (window->font)
- win_attr->font = g_strdup (window->font);
- win_attr->zoom = window->zoom;
+ if (terminal_window_get_font (window))
+ win_attr->font = g_strdup (terminal_window_get_font (window));
+ win_attr->zoom = terminal_window_get_zoom_level (window);
/* check if we should try to inherit the parent geometry */
g_object_get (G_OBJECT (app->preferences), "misc-inherit-geometry", &inherit_geometry, NULL);
@@ -788,11 +788,8 @@ terminal_app_open_window (TerminalApp *app,
if (!reuse_window)
{
if (attr->font)
- {
- g_free (TERMINAL_WINDOW (window)->font);
- TERMINAL_WINDOW (window)->font = g_strdup (attr->font);
- }
- TERMINAL_WINDOW (window)->zoom = attr->zoom;
+ terminal_window_set_font (TERMINAL_WINDOW (window), attr->font);
+ terminal_window_set_zoom_level (TERMINAL_WINDOW (window), attr->zoom);
}
if (!attr->drop_down)
diff --git a/terminal/terminal-screen.c b/terminal/terminal-screen.c
index d09830d..09e0a1a 100644
--- a/terminal/terminal-screen.c
+++ b/terminal/terminal-screen.c
@@ -2416,14 +2416,15 @@ terminal_screen_update_font (TerminalScreen *screen)
if (TERMINAL_IS_WINDOW (toplevel))
{
- if (TERMINAL_WINDOW (toplevel)->font)
+ if (terminal_window_get_font (TERMINAL_WINDOW (toplevel)))
{
g_free (font_name);
- font_name = g_strdup (TERMINAL_WINDOW (toplevel)->font);
+ font_name = g_strdup (terminal_window_get_font (TERMINAL_WINDOW (toplevel)));
}
- if (TERMINAL_WINDOW (toplevel)->zoom != TERMINAL_ZOOM_LEVEL_DEFAULT)
- font_name = terminal_screen_zoom_font (screen, font_name, TERMINAL_WINDOW (toplevel)->zoom);
+ if (terminal_window_get_zoom_level (TERMINAL_WINDOW (toplevel)) != TERMINAL_ZOOM_LEVEL_DEFAULT)
+ font_name = terminal_screen_zoom_font (screen, font_name,
+ terminal_window_get_zoom_level (TERMINAL_WINDOW (toplevel)));
}
if (gtk_widget_get_realized (GTK_WIDGET (screen)))
diff --git a/terminal/terminal-window.c b/terminal/terminal-window.c
index d2be474..5e8eed3 100644
--- a/terminal/terminal-window.c
+++ b/terminal/terminal-window.c
@@ -296,7 +296,10 @@ struct _TerminalWindowPrivate
GQueue *closed_tabs_list;
+ gchar *font;
+
TerminalVisibility scrollbar_visibility;
+ TerminalZoomLevel zoom;
};
static guint window_signals[LAST_SIGNAL];
@@ -423,8 +426,8 @@ terminal_window_init (TerminalWindow *window)
window->priv->preferences = terminal_preferences_get ();
- window->font = NULL;
- window->zoom = TERMINAL_ZOOM_LEVEL_DEFAULT;
+ window->priv->font = NULL;
+ window->priv->zoom = TERMINAL_ZOOM_LEVEL_DEFAULT;
window->priv->closed_tabs_list = g_queue_new ();
/* try to set the rgba colormap so vte can use real transparency */
@@ -562,7 +565,7 @@ terminal_window_finalize (GObject *object)
g_object_unref (G_OBJECT (window->priv->encoding_action));
g_slist_free (window->priv->tabs_menu_actions);
- g_free (window->font);
+ g_free (window->priv->font);
g_queue_foreach (window->priv->closed_tabs_list, (GFunc) terminal_window_tab_info_free, NULL);
g_queue_free (window->priv->closed_tabs_list);
@@ -1778,9 +1781,9 @@ terminal_window_action_zoom_in (GtkAction *action,
{
terminal_return_if_fail (window->priv->active != NULL);
- if (window->zoom < TERMINAL_ZOOM_LEVEL_MAXIMUM)
+ if (window->priv->zoom < TERMINAL_ZOOM_LEVEL_MAXIMUM)
{
- ++window->zoom;
+ ++window->priv->zoom;
terminal_window_zoom_update_screens (window);
}
}
@@ -1793,9 +1796,9 @@ terminal_window_action_zoom_out (GtkAction *action,
{
terminal_return_if_fail (window->priv->active != NULL);
- if (window->zoom > TERMINAL_ZOOM_LEVEL_MINIMUM)
+ if (window->priv->zoom > TERMINAL_ZOOM_LEVEL_MINIMUM)
{
- --window->zoom;
+ --window->priv->zoom;
terminal_window_zoom_update_screens (window);
}
}
@@ -1808,9 +1811,9 @@ terminal_window_action_zoom_reset (GtkAction *action,
{
terminal_return_if_fail (window->priv->active != NULL);
- if (window->zoom != TERMINAL_ZOOM_LEVEL_DEFAULT)
+ if (window->priv->zoom != TERMINAL_ZOOM_LEVEL_DEFAULT)
{
- window->zoom = TERMINAL_ZOOM_LEVEL_DEFAULT;
+ window->priv->zoom = TERMINAL_ZOOM_LEVEL_DEFAULT;
terminal_window_zoom_update_screens (window);
}
}
@@ -2208,13 +2211,13 @@ terminal_window_zoom_update_screens (TerminalWindow *window)
/* update zoom actions */
action = terminal_window_get_action (window, "zoom-in");
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
- if (window->zoom == TERMINAL_ZOOM_LEVEL_MAXIMUM)
+ if (window->priv->zoom == TERMINAL_ZOOM_LEVEL_MAXIMUM)
gtk_action_set_sensitive (action, FALSE);
else if (!gtk_action_is_sensitive (action))
gtk_action_set_sensitive (action, TRUE);
action = terminal_window_get_action (window, "zoom-out");
- if (window->zoom == TERMINAL_ZOOM_LEVEL_MINIMUM)
+ if (window->priv->zoom == TERMINAL_ZOOM_LEVEL_MINIMUM)
gtk_action_set_sensitive (action, FALSE);
else if (!gtk_action_is_sensitive (action))
gtk_action_set_sensitive (action, TRUE);
@@ -2397,7 +2400,7 @@ terminal_window_add (TerminalWindow *window,
terminal_screen_update_scrolling_bar (screen);
/* update screen font from window */
- if (window->font || window->zoom != TERMINAL_ZOOM_LEVEL_DEFAULT)
+ if (window->priv->font || window->priv->zoom != TERMINAL_ZOOM_LEVEL_DEFAULT)
terminal_screen_update_font (screen);
/* show the terminal screen */
@@ -2531,10 +2534,10 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
result = g_slist_prepend (result, g_strdup ("--hide-toolbar"));
G_GNUC_END_IGNORE_DEPRECATIONS
- if (window->zoom != TERMINAL_ZOOM_LEVEL_DEFAULT)
- result = g_slist_prepend (result, g_strdup_printf ("--zoom=%d", window->zoom));
- if (window->font != NULL)
- result = g_slist_prepend (result, g_strdup_printf ("--font=%s", window->font));
+ if (window->priv->zoom != TERMINAL_ZOOM_LEVEL_DEFAULT)
+ result = g_slist_prepend (result, g_strdup_printf ("--zoom=%d", window->priv->zoom));
+ if (window->priv->font != NULL)
+ result = g_slist_prepend (result, g_strdup_printf ("--font=%s", window->priv->font));
/* set restart commands of the tabs */
children = gtk_container_get_children (GTK_CONTAINER (window->priv->notebook));
@@ -2644,6 +2647,33 @@ G_GNUC_END_IGNORE_DEPRECATIONS
/**
+ * terminal_window_get_font:
+ * @window : A #TerminalWindow.
+ **/
+const gchar*
+terminal_window_get_font (TerminalWindow *window)
+{
+ return window->priv->font;
+}
+
+
+
+/**
+ * terminal_window_set_font:
+ * @window : A #TerminalWindow.
+ **/
+void
+terminal_window_set_font (TerminalWindow *window,
+ const gchar *font)
+{
+ terminal_return_if_fail (font != NULL);
+ g_free (window->priv->font);
+ window->priv->font = g_strdup (font);
+}
+
+
+
+/**
* terminal_window_get_scrollbar_visibility:
* @window : A #TerminalWindow.
**/
@@ -2670,6 +2700,31 @@ terminal_window_set_scrollbar_visibility (TerminalWindow *window,
/**
+ * terminal_window_get_zoom_level:
+ * @window : A #TerminalWindow.
+ **/
+TerminalZoomLevel
+terminal_window_get_zoom_level (TerminalWindow *window)
+{
+ return window->priv->zoom;
+}
+
+
+
+/**
+ * terminal_window_set_zoom_level:
+ * @window : A #TerminalWindow.
+ **/
+void
+terminal_window_set_zoom_level (TerminalWindow *window,
+ TerminalZoomLevel zoom)
+{
+ window->priv->zoom = zoom;
+}
+
+
+
+/**
* terminal_window_get_menubar_height:
* @window : A #TerminalWindow.
**/
diff --git a/terminal/terminal-window.h b/terminal/terminal-window.h
index 0498ee1..ced5f61 100644
--- a/terminal/terminal-window.h
+++ b/terminal/terminal-window.h
@@ -48,9 +48,6 @@ typedef struct
/* if this is a TerminalWindowDropdown */
guint drop_down : 1;
-
- gchar *font;
- TerminalZoomLevel zoom;
} TerminalWindow;
GType terminal_window_get_type (void) G_GNUC_CONST;
@@ -87,11 +84,21 @@ GtkWidget *terminal_window_get_preferences_dialog (TerminalWindow
GtkAction *terminal_window_get_action (TerminalWindow *window,
const gchar *action_name);
+const gchar *terminal_window_get_font (TerminalWindow *window);
+
+void terminal_window_set_font (TerminalWindow *window,
+ const gchar *font);
+
TerminalVisibility terminal_window_get_scrollbar_visibility (TerminalWindow *window);
void terminal_window_set_scrollbar_visibility (TerminalWindow *window,
TerminalVisibility scrollbar);
+TerminalZoomLevel terminal_window_get_zoom_level (TerminalWindow *window);
+
+void terminal_window_set_zoom_level (TerminalWindow *window,
+ TerminalZoomLevel zoom);
+
gint terminal_window_get_menubar_height (TerminalWindow *window);
gint terminal_window_get_toolbar_height (TerminalWindow *window);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list