[gnome-terminal/f20] Restore transparency
Debarshi Ray
rishi at fedoraproject.org
Thu May 15 12:55:33 UTC 2014
commit 8f9d8450bb05502a5f606a32a52ce3666e06acea
Author: Debarshi Ray <debarshir at gnome.org>
Date: Thu May 15 14:44:31 2014 +0200
Restore transparency
gnome-terminal.spec | 8 +-
restore-transparency.patch | 287 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 294 insertions(+), 1 deletions(-)
---
diff --git a/gnome-terminal.spec b/gnome-terminal.spec
index b07f873..5f3d1bf 100644
--- a/gnome-terminal.spec
+++ b/gnome-terminal.spec
@@ -8,13 +8,15 @@
Summary: Terminal emulator for GNOME
Name: gnome-terminal
Version: 3.10.2
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv3+ and GFDL
Group: User Interface/Desktops
URL: http://www.gnome.org/
#VCS: git:git://git.gnome.org/gnome-terminal
Source0: http://download.gnome.org/sources/gnome-terminal/3.10/gnome-terminal-%{version}.tar.xz
+Patch0: restore-transparency.patch
+
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: GConf2-devel
BuildRequires: gtk3-devel >= %{gtk3_version}
@@ -47,6 +49,7 @@ option to the right-click context menu in Nautilus.
%prep
%setup -q
+%patch0 -p1
%build
%configure --disable-static --with-gtk=3.0 --with-nautilus-extension
@@ -85,6 +88,9 @@ fi
%{_libdir}/nautilus/extensions-3.0/libterminal-nautilus.so
%changelog
+* Thu May 15 2014 Debarshi Ray <rishi at fedoraproject.org> - 3.10.2-2
+- Restore transparency
+
* Tue Nov 12 2013 Richard Hughes <rhughes at redhat.com> - 3.10.2-1
- Update to 3.10.2
diff --git a/restore-transparency.patch b/restore-transparency.patch
new file mode 100644
index 0000000..5c0ec6b
--- /dev/null
+++ b/restore-transparency.patch
@@ -0,0 +1,287 @@
+From 1b8ae2c844ed19cec73c9b7b0f909bfcda5e29a7 Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <debarshir at gnome.org>
+Date: Mon, 12 May 2014 14:57:18 +0200
+Subject: [PATCH 1/2] Restore transparency
+
+The transparency settings were removed as a side effect of
+2bff4b63ed3ceef6055e35563e9b0b33ad57349d
+
+This restores them and you will need a compositing window manager to
+use it. The background image setting, also known as faux transparency,
+was not restored.
+---
+ src/org.gnome.Terminal.gschema.xml.in | 9 ++++
+ src/profile-editor.c | 10 ++++
+ src/profile-preferences.ui | 92 +++++++++++++++++++++++++++++++++++
+ src/terminal-schemas.h | 3 ++
+ src/terminal-screen.c | 23 ++++++++-
+ src/terminal-window.c | 7 +++
+ 6 files changed, 143 insertions(+), 1 deletion(-)
+
+diff --git a/src/org.gnome.Terminal.gschema.xml.in b/src/org.gnome.Terminal.gschema.xml.in
+index 878762d..5170090 100644
+--- a/src/org.gnome.Terminal.gschema.xml.in
++++ b/src/org.gnome.Terminal.gschema.xml.in
+@@ -329,6 +329,15 @@
+ <default>'current'</default>
+ <_summary>Which encoding to use</_summary>
+ </key>
++ <key name="use-transparent-background" type="b">
++ <default>false</default>
++ <summary>Whether to use a transparent background</summary>
++ </key>
++ <key name="background-transparency-percent" type="i">
++ <default>50</default>
++ <summary>Adjust the amount of transparency</summary>
++ <description>A value between 0 and 100, where 0 is opaque and 100 is fully transparent.</description>
++ </key>
+ </schema>
+
+ <!-- Keybinding settings -->
+diff --git a/src/profile-editor.c b/src/profile-editor.c
+index 787066b..24c3a2c 100644
+--- a/src/profile-editor.c
++++ b/src/profile-editor.c
+@@ -992,6 +992,16 @@ terminal_profile_edit (GSettings *profile,
+ "sensitive",
+ FALSE);
+
++ g_settings_bind (profile, TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND,
++ gtk_builder_get_object (builder, "use-transparent-background"),
++ "active", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
++ g_settings_bind (profile, TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND,
++ gtk_builder_get_object (builder, "background-transparent-scale-box"),
++ "sensitive", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_NO_SENSITIVITY);
++ g_settings_bind (profile, TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT,
++ gtk_builder_get_object (builder, "background-transparent-adjustment"),
++ "value", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
++
+ terminal_util_bind_mnemonic_label_sensitivity (editor);
+
+ terminal_util_dialog_focus_widget (editor, widget_name);
+diff --git a/src/profile-preferences.ui b/src/profile-preferences.ui
+index 646a389..695695b 100644
+--- a/src/profile-preferences.ui
++++ b/src/profile-preferences.ui
+@@ -22,6 +22,11 @@
+ <property name="step_increment">1</property>
+ <property name="page_increment">100</property>
+ </object>
++ <object class="GtkAdjustment" id="background-transparent-adjustment">
++ <property name="upper">100</property>
++ <property name="step_increment">1</property>
++ <property name="page_increment">10</property>
++ </object>
+ <object class="GtkListStore" id="model1">
+ <columns>
+ <!-- column-name gchararray -->
+@@ -1258,6 +1263,93 @@
+ <property name="position">2</property>
+ </packing>
+ </child>
++ <child>
++ <object class="GtkBox" id="use-transparent-background-box">
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="orientation">horizontal</property>
++ <property name="spacing">12</property>
++ <child>
++ <object class="GtkCheckButton" id="use-transparent-background">
++ <property name="label" translatable="yes">Use t_ransparent background</property>
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="receives_default">False</property>
++ <property name="use_underline">True</property>
++ <property name="xalign">0</property>
++ <property name="draw_indicator">True</property>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkBox" id="background-transparent-scale-box">
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="orientation">horizontal</property>
++ <property name="spacing">6</property>
++ <child>
++ <object class="GtkLabel" id="background-transparent-min-label">
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="xalign">0.5</property>
++ <property name="label" translatable="yes">none</property>
++ <style>
++ <class name="dim-label"/>
++ </style>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkScale" id="background-transparent-scale">
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="adjustment">background-transparent-adjustment</property>
++ <property name="draw_value">False</property>
++ </object>
++ <packing>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
++ <property name="position">1</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkLabel" id="background-transparent-max-label">
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="xalign">0.5</property>
++ <property name="label" translatable="yes">full</property>
++ <style>
++ <class name="dim-label"/>
++ </style>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">2</property>
++ </packing>
++ </child>
++ </object>
++ <packing>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
++ <property name="position">1</property>
++ </packing>
++ </child>
++ </object>
++ <packing>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
++ <property name="position">3</property>
++ </packing>
++ </child>
+ </object>
+ </child>
+ </object>
+diff --git a/src/terminal-schemas.h b/src/terminal-schemas.h
+index 45051c8..818442f 100644
+--- a/src/terminal-schemas.h
++++ b/src/terminal-schemas.h
+@@ -65,6 +65,9 @@ G_BEGIN_DECLS
+ #define TERMINAL_PROFILE_VISIBLE_NAME_KEY "visible-name"
+ #define TERMINAL_PROFILE_WORD_CHARS_KEY "word-chars"
+
++#define TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND "use-transparent-background"
++#define TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT "background-transparency-percent"
++
+ #define TERMINAL_SETTING_CONFIRM_CLOSE_KEY "confirm-close"
+ #define TERMINAL_SETTING_DEFAULT_SHOW_MENUBAR_KEY "default-show-menubar"
+ #define TERMINAL_SETTING_ENABLE_MENU_BAR_ACCEL_KEY "menu-accelerator-enabled"
+diff --git a/src/terminal-screen.c b/src/terminal-screen.c
+index decf61e..03b18ed 100644
+--- a/src/terminal-screen.c
++++ b/src/terminal-screen.c
+@@ -902,7 +902,9 @@ terminal_screen_profile_changed_cb (GSettings *profile,
+ prop_name == I_(TERMINAL_PROFILE_BACKGROUND_COLOR_KEY) ||
+ prop_name == I_(TERMINAL_PROFILE_BOLD_COLOR_SAME_AS_FG_KEY) ||
+ prop_name == I_(TERMINAL_PROFILE_BOLD_COLOR_KEY) ||
+- prop_name == I_(TERMINAL_PROFILE_PALETTE_KEY))
++ prop_name == I_(TERMINAL_PROFILE_PALETTE_KEY) ||
++ prop_name == I_(TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND) ||
++ prop_name == I_(TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT))
+ update_color_scheme (screen);
+
+ if (!prop_name || prop_name == I_(TERMINAL_PROFILE_AUDIBLE_BELL_KEY))
+@@ -963,6 +965,9 @@ update_color_scheme (TerminalScreen *screen)
+ GdkRGBA fg, bg, bold, theme_fg, theme_bg;
+ GdkRGBA *boldp;
+ GtkStyleContext *context;
++ GtkWidget *toplevel;
++ gboolean transparent;
++ guint16 opacity;
+
+ context = gtk_widget_get_style_context (widget);
+ gtk_style_context_get_color (context, GTK_STATE_FLAG_NORMAL, &theme_fg);
+@@ -987,6 +992,22 @@ update_color_scheme (TerminalScreen *screen)
+ colors, n_colors);
+ vte_terminal_set_color_bold_rgba (VTE_TERMINAL (screen), boldp);
+ g_free (colors);
++
++ transparent = g_settings_get_boolean (profile, TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND);
++ if (transparent)
++ {
++ gint transparency_percent;
++
++ transparency_percent = g_settings_get_int (profile, TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT);
++ opacity = (guint16) (G_MAXUINT16 * (100 - transparency_percent) / 100.0);
++ }
++ else
++ opacity = G_MAXUINT16;
++
++ vte_terminal_set_opacity (VTE_TERMINAL (screen), opacity);
++ toplevel = gtk_widget_get_toplevel (GTK_WIDGET (screen));
++ if (toplevel != NULL && gtk_widget_is_toplevel (toplevel))
++ gtk_widget_set_app_paintable (toplevel, transparent);
+ }
+
+ void
+diff --git a/src/terminal-window.c b/src/terminal-window.c
+index 3984712..8aa08d9 100644
+--- a/src/terminal-window.c
++++ b/src/terminal-window.c
+@@ -1804,6 +1804,8 @@ terminal_window_init (TerminalWindow *window)
+ TerminalWindowPrivate *priv;
+ TerminalApp *app;
+ TerminalSettingsList *profiles_list;
++ GdkScreen *screen;
++ GdkVisual *visual;
+ GtkActionGroup *action_group;
+ GtkAction *action;
+ GtkUIManager *manager;
+@@ -1815,6 +1817,11 @@ terminal_window_init (TerminalWindow *window)
+
+ priv = window->priv = G_TYPE_INSTANCE_GET_PRIVATE (window, TERMINAL_TYPE_WINDOW, TerminalWindowPrivate);
+
++ screen = gtk_widget_get_screen (GTK_WIDGET (window));
++ visual = gdk_screen_get_rgba_visual (screen);
++ if (visual != NULL)
++ gtk_widget_set_visual (GTK_WIDGET (window), visual);
++
+ g_signal_connect (G_OBJECT (window), "delete_event",
+ G_CALLBACK(terminal_window_delete_event),
+ NULL);
+--
+1.9.0
+
+
+From 3e1d80a58a53b38d7505e0b86c8fc1e034833720 Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <debarshir at gnome.org>
+Date: Thu, 15 May 2014 11:57:31 +0200
+Subject: [PATCH 2/2] schemas: Specify the range for
+ background-transparency-percent
+
+---
+ src/org.gnome.Terminal.gschema.xml.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/org.gnome.Terminal.gschema.xml.in b/src/org.gnome.Terminal.gschema.xml.in
+index 5170090..79da8e5 100644
+--- a/src/org.gnome.Terminal.gschema.xml.in
++++ b/src/org.gnome.Terminal.gschema.xml.in
+@@ -335,6 +335,7 @@
+ </key>
+ <key name="background-transparency-percent" type="i">
+ <default>50</default>
++ <range min="0" max="100"/>
+ <summary>Adjust the amount of transparency</summary>
+ <description>A value between 0 and 100, where 0 is opaque and 100 is fully transparent.</description>
+ </key>
+--
+1.9.0
+
More information about the scm-commits
mailing list