Attachment #189719 for bug #225165

View | Details | Raw Unified | Return to bug 225165
Collapse All | Expand All




      <default>'narrow'</default>
      <summary>Whether ambiguous-width characters are narrow or wide when using UTF-8 encoding</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>
      <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>
  </schema>

  <!-- Keybinding settings -->




                   "active-id",
                   G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);

  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"),
                   "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);

  /* Finished! */

  terminal_util_bind_mnemonic_label_sensitivity (editor);

  terminal_util_dialog_focus_widget (editor, widget_name);

Lines 23-28 Link Here

(-)src/profile-preferences.ui (+47 lines)
23	<property name="step_increment">1</property>	23	<property name="step_increment">1</property>
24	<property name="page_increment">100</property>	24	<property name="page_increment">100</property>
25	</object>	25	</object>
		26	<object class="GtkAdjustment" id="background-transparent-adjustment">
		27	<property name="upper">100</property>
		28	<property name="step_increment">1</property>
		29	<property name="page_increment">10</property>
		30	</object>
26	<object class="GtkListStore" id="cjk-ambiguous-width-model">	31	<object class="GtkListStore" id="cjk-ambiguous-width-model">
27	<columns>	32	<columns>
28	<!-- column-name gchararray -->	33	<!-- column-name gchararray -->
Lines 1036-1041 Link Here
1036	<property name="position">1</property>	1041	<property name="position">1</property>
1037	</packing>	1042	</packing>
1038	</child>	1043	</child>
		1044	<child>
		1045	<object class="GtkBox" id="use-transparent-background-box">
		1046	<property name="visible">True</property>
		1047	<property name="can_focus">False</property>
		1048	<property name="orientation">horizontal</property>
		1049	<property name="spacing">12</property>
		1050	<child>
		1051	<object class="GtkCheckButton" id="use-transparent-background">
		1052	<property name="label" translatable="yes">Transparent background</property>
		1053	<property name="visible">True</property>
		1054	<property name="can_focus">True</property>
		1055	<property name="receives_default">False</property>
		1056	<property name="use_underline">True</property>
		1057	<property name="xalign">0</property>
		1058	<property name="draw_indicator">True</property>
		1059	</object>
		1060	<packing>
		1061	<property name="expand">False</property>
		1062	<property name="fill">False</property>
		1063	<property name="position">0</property>
		1064	</packing>
		1065	</child>
		1066	<child>
		1067	<object class="GtkScale" id="background-transparent-scale">
		1068	<property name="visible">True</property>
		1069	<property name="can_focus">True</property>
		1070	<property name="adjustment">background-transparent-adjustment</property>
		1071	<property name="draw_value">False</property>
		1072	</object>
		1073	<packing>
		1074	<property name="expand">True</property>
		1075	<property name="fill">True</property>
		1076	<property name="position">1</property>
		1077	</packing>
		1078	</child>
		1079	</object>
		1080	<packing>
		1081	<property name="expand">True</property>
		1082	<property name="fill">True</property>
		1083	<property name="position">2</property>
		1084	</packing>
		1085	</child>
1039	</object>	1086	</object>
1040	</child>	1087	</child>
1041	</object>	1088	</object>

Lines 69-74 G_BEGIN_DECLS Link Here

(-)src/terminal-schemas.h (+3 lines)
69	#define TERMINAL_PROFILE_VISIBLE_NAME_KEY "visible-name"	69	#define TERMINAL_PROFILE_VISIBLE_NAME_KEY "visible-name"
70	#define TERMINAL_PROFILE_WORD_CHAR_EXCEPTIONS_KEY "word-char-exceptions"	70	#define TERMINAL_PROFILE_WORD_CHAR_EXCEPTIONS_KEY "word-char-exceptions"
71		71
		72	#define TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND "use-transparent-background"
		73	#define TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT "background-transparency-percent"
		74
72	#define TERMINAL_SETTING_CONFIRM_CLOSE_KEY "confirm-close"	75	#define TERMINAL_SETTING_CONFIRM_CLOSE_KEY "confirm-close"
73	#define TERMINAL_SETTING_DEFAULT_SHOW_MENUBAR_KEY "default-show-menubar"	76	#define TERMINAL_SETTING_DEFAULT_SHOW_MENUBAR_KEY "default-show-menubar"
74	#define TERMINAL_SETTING_ENABLE_MENU_BAR_ACCEL_KEY "menu-accelerator-enabled"	77	#define TERMINAL_SETTING_ENABLE_MENU_BAR_ACCEL_KEY "menu-accelerator-enabled"

Lines 829-835 terminal_screen_profile_changed_cb (GSettings *profile, Link Here

(-)src/terminal-screen.c (-1 / +21 lines)
829	prop_name == I_(TERMINAL_PROFILE_HIGHLIGHT_COLORS_SET_KEY) \|\|	829	prop_name == I_(TERMINAL_PROFILE_HIGHLIGHT_COLORS_SET_KEY) \|\|
830	prop_name == I_(TERMINAL_PROFILE_HIGHLIGHT_BACKGROUND_COLOR_KEY) \|\|	830	prop_name == I_(TERMINAL_PROFILE_HIGHLIGHT_BACKGROUND_COLOR_KEY) \|\|
831	prop_name == I_(TERMINAL_PROFILE_HIGHLIGHT_FOREGROUND_COLOR_KEY) \|\|	831	prop_name == I_(TERMINAL_PROFILE_HIGHLIGHT_FOREGROUND_COLOR_KEY) \|\|
832	prop_name == I_(TERMINAL_PROFILE_PALETTE_KEY))	832	prop_name == I_(TERMINAL_PROFILE_PALETTE_KEY) \|\|
		833	prop_name == I_(TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND) \|\|
		834	prop_name == I_(TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT))
833	update_color_scheme (screen);	835	update_color_scheme (screen);
834		836
835	if (!prop_name \|\| prop_name == I_(TERMINAL_PROFILE_AUDIBLE_BELL_KEY))	837	if (!prop_name \|\| prop_name == I_(TERMINAL_PROFILE_AUDIBLE_BELL_KEY))
Lines 899-904 update_color_scheme (TerminalScreen *screen) Link Here
899	GdkRGBA cursor_bgp = NULL, cursor_fgp = NULL;	901	GdkRGBA cursor_bgp = NULL, cursor_fgp = NULL;
900	GdkRGBA highlight_bgp = NULL, highlight_fgp = NULL;	902	GdkRGBA highlight_bgp = NULL, highlight_fgp = NULL;
901	GtkStyleContext *context;	903	GtkStyleContext *context;
		904	GtkWidget *toplevel;
		905	gboolean transparent;
902	gboolean use_theme_colors;	906	gboolean use_theme_colors;
903		907
904	context = gtk_widget_get_style_context (widget);	908	context = gtk_widget_get_style_context (widget);
Lines 940-945 update_color_scheme (TerminalScreen *screen) Link Here
940	}	944	}
941		945
942	colors = terminal_g_settings_get_rgba_palette (priv->profile, TERMINAL_PROFILE_PALETTE_KEY, &n_colors);	946	colors = terminal_g_settings_get_rgba_palette (priv->profile, TERMINAL_PROFILE_PALETTE_KEY, &n_colors);
		947
		948	transparent = g_settings_get_boolean (profile, TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND);
		949	if (transparent)
		950	{
		951	gint transparency_percent;
		952
		953	transparency_percent = g_settings_get_int (profile, TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT);
		954	bg.alpha = (100 - transparency_percent) / 100.0;
		955	}
		956	else
		957	bg.alpha = 1.0;
		958
943	vte_terminal_set_colors (VTE_TERMINAL (screen), &fg, &bg,	959	vte_terminal_set_colors (VTE_TERMINAL (screen), &fg, &bg,
944	colors, n_colors);	960	colors, n_colors);
945	vte_terminal_set_color_bold (VTE_TERMINAL (screen), boldp);	961	vte_terminal_set_color_bold (VTE_TERMINAL (screen), boldp);
Lines 947-952 update_color_scheme (TerminalScreen *screen) Link Here
947	vte_terminal_set_color_cursor_foreground (VTE_TERMINAL (screen), cursor_fgp);	963	vte_terminal_set_color_cursor_foreground (VTE_TERMINAL (screen), cursor_fgp);
948	vte_terminal_set_color_highlight (VTE_TERMINAL (screen), highlight_bgp);	964	vte_terminal_set_color_highlight (VTE_TERMINAL (screen), highlight_bgp);
949	vte_terminal_set_color_highlight_foreground (VTE_TERMINAL (screen), highlight_fgp);	965	vte_terminal_set_color_highlight_foreground (VTE_TERMINAL (screen), highlight_fgp);
		966
		967	toplevel = gtk_widget_get_toplevel (GTK_WIDGET (screen));
		968	if (toplevel != NULL && gtk_widget_is_toplevel (toplevel))
		969	gtk_widget_set_app_paintable (toplevel, transparent);
950	}	970	}
951		971
952	static void	972	static void

Lines 2621-2626 terminal_window_init (TerminalWindow *window) Link Here

(-)src/terminal-window.c (-2 / +7 lines)
2621	TerminalWindowPrivate *priv;	2621	TerminalWindowPrivate *priv;
2622	TerminalApp *app;	2622	TerminalApp *app;
2623	TerminalSettingsList *profiles_list;	2623	TerminalSettingsList *profiles_list;
		2624	GdkScreen *screen;
		2625	GdkVisual *visual;
2624	GSettings *gtk_debug_settings;	2626	GSettings *gtk_debug_settings;
2625	GtkActionGroup *action_group;	2627	GtkActionGroup *action_group;
2626	GtkAction *action;	2628	GtkAction *action;
Lines 2637-2642 terminal_window_init (TerminalWindow *window) Link Here
2637		2639
2638	gtk_widget_init_template (GTK_WIDGET (window));	2640	gtk_widget_init_template (GTK_WIDGET (window));
2639		2641
		2642	screen = gtk_widget_get_screen (GTK_WIDGET (window));
		2643	visual = gdk_screen_get_rgba_visual (screen);
		2644	if (visual != NULL)
		2645	gtk_widget_set_visual (GTK_WIDGET (window), visual);
		2646
2640	uuid_generate (u);	2647	uuid_generate (u);
2641	uuid_unparse (u, uuidstr);	2648	uuid_unparse (u, uuidstr);
2642	priv->uuid = g_strdup (uuidstr);	2649	priv->uuid = g_strdup (uuidstr);
2643	-
2644	--
2645	src/terminal-window.c \| 21 +++++++++++++++++++++	2650	src/terminal-window.c \| 21 +++++++++++++++++++++
2646	1 file changed, 21 insertions(+)	2651	1 file changed, 21 insertions(+)




}

static gboolean
terminal_window_draw (GtkWidget *widget,
                      cairo_t   *cr)
{
  if (gtk_widget_get_app_paintable (widget))
    {
      GtkStyleContext *context;
      int width;
      int height;

      context = gtk_widget_get_style_context (widget);
      width = gtk_widget_get_allocated_width (widget);
      height = gtk_widget_get_allocated_height (widget);
      gtk_render_background (context, cr, 0, 0, width, height);
      gtk_render_frame (context, cr, 0, 0, width, height);
    }

  return GTK_WIDGET_CLASS (terminal_window_parent_class)->draw (widget, cr);
}

static gboolean
terminal_window_state_event (GtkWidget            *widget,
                             GdkEventWindowState  *event)
{


  widget_class->show = terminal_window_show;
  widget_class->realize = terminal_window_realize;
  widget_class->draw = terminal_window_draw;
  widget_class->window_state_event = terminal_window_state_event;
  widget_class->screen_changed = terminal_window_screen_changed;
  widget_class->style_updated = terminal_window_style_updated;
- 
terminals in Wayland
--
src/terminal-screen.c | 40 +++++++++++++++++++++++++++++++++++++---
src/terminal-window.c | 18 ++++++++++++------
2 files changed, 49 insertions(+), 9 deletions(-)

Lines 139-144 static void terminal_screen_system_font_changed_cb (GSettings *, Link Here

(-)src/terminal-screen.c (-3 / +37 lines)
139	static gboolean terminal_screen_popup_menu (GtkWidget *widget);	139	static gboolean terminal_screen_popup_menu (GtkWidget *widget);
140	static gboolean terminal_screen_button_press (GtkWidget *widget,	140	static gboolean terminal_screen_button_press (GtkWidget *widget,
141	GdkEventButton *event);	141	GdkEventButton *event);
		142	static void terminal_screen_hierarchy_changed (GtkWidget *widget,
		143	GtkWidget *previous_toplevel);
142	static gboolean terminal_screen_do_exec (TerminalScreen *screen,	144	static gboolean terminal_screen_do_exec (TerminalScreen *screen,
143	FDSetupData *data,	145	FDSetupData *data,
144	GError **error);	146	GError **error);
Lines 484-489 terminal_screen_class_init (TerminalScreenClass *klass) Link Here
484	widget_class->drag_data_received = terminal_screen_drag_data_received;	486	widget_class->drag_data_received = terminal_screen_drag_data_received;
485	widget_class->button_press_event = terminal_screen_button_press;	487	widget_class->button_press_event = terminal_screen_button_press;
486	widget_class->popup_menu = terminal_screen_popup_menu;	488	widget_class->popup_menu = terminal_screen_popup_menu;
		489	widget_class->hierarchy_changed = terminal_screen_hierarchy_changed;
487		490
488	terminal_class->child_exited = terminal_screen_child_exited;	491	terminal_class->child_exited = terminal_screen_child_exited;
489		492
Lines 887-892 terminal_screen_profile_changed_cb (GSettings *profile, Link Here
887	}	890	}
888		891
889	static void	892	static void
		893	update_toplevel_transparency (TerminalScreen *screen)
		894	{
		895	GtkWidget *widget = GTK_WIDGET (screen);
		896	TerminalScreenPrivate *priv = screen->priv;
		897	GSettings *profile = priv->profile;
		898	GtkWidget *toplevel;
		899
		900	toplevel = gtk_widget_get_toplevel (widget);
		901	if (toplevel != NULL && gtk_widget_is_toplevel (toplevel))
		902	{
		903	gboolean transparent;
		904
		905	transparent = g_settings_get_boolean (profile, TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND);
		906	if (gtk_widget_get_app_paintable (toplevel) != transparent)
		907	{
		908	gtk_widget_set_app_paintable (toplevel, transparent);
		909
		910	/* The opaque region of the toplevel isn't updated until the toplevel is allocated;
		911	* set_app_paintable() doesn't force an allocation, so do that manually.
		912	*/
		913	gtk_widget_queue_resize (toplevel);
		914	}
		915	}
		916	}
		917
		918	static void
890	update_color_scheme (TerminalScreen *screen)	919	update_color_scheme (TerminalScreen *screen)
891	{	920	{
892	GtkWidget *widget = GTK_WIDGET (screen);	921	GtkWidget *widget = GTK_WIDGET (screen);
Lines 964-972 update_color_scheme (TerminalScreen *screen) Link Here
964	vte_terminal_set_color_highlight (VTE_TERMINAL (screen), highlight_bgp);	993	vte_terminal_set_color_highlight (VTE_TERMINAL (screen), highlight_bgp);
965	vte_terminal_set_color_highlight_foreground (VTE_TERMINAL (screen), highlight_fgp);	994	vte_terminal_set_color_highlight_foreground (VTE_TERMINAL (screen), highlight_fgp);
966		995
967	toplevel = gtk_widget_get_toplevel (GTK_WIDGET (screen));	996	update_toplevel_transparency (screen);
968	if (toplevel != NULL && gtk_widget_is_toplevel (toplevel))
969	gtk_widget_set_app_paintable (toplevel, transparent);
970	}	997	}
971		998
972	static void	999	static void
Lines 1585-1590 terminal_screen_do_popup (TerminalScreen *screen, Link Here
1585	terminal_screen_popup_info_unref (info);	1612	terminal_screen_popup_info_unref (info);
1586	}	1613	}
1587		1614
		1615	static void
		1616	terminal_screen_hierarchy_changed (GtkWidget *widget,
		1617	GtkWidget *previous_toplevel)
		1618	{
		1619	update_toplevel_transparency (TERMINAL_SCREEN (widget));
		1620	}
		1621
1588	static gboolean	1622	static gboolean
1589	terminal_screen_button_press (GtkWidget *widget,	1623	terminal_screen_button_press (GtkWidget *widget,
1590	GdkEventButton *event)	1624	GdkEventButton *event)

Lines 2300-2314 terminal_window_draw (GtkWidget *widget, Link Here

(-)src/terminal-window.c (-8 / +12 lines)
2300	{	2300	{
2301	if (gtk_widget_get_app_paintable (widget))	2301	if (gtk_widget_get_app_paintable (widget))
2302	{	2302	{
		2303	GtkAllocation child_allocation;
2303	GtkStyleContext *context;	2304	GtkStyleContext *context;
2304	int width;	2305	GtkWidget *child;
2305	int height;	2306
		2307	/* Get the child allocation, so we don't overwrite window borders */
		2308	child = gtk_bin_get_child (GTK_BIN (widget));
		2309	gtk_widget_get_allocation (child, &child_allocation);
2306		2310
2307	context = gtk_widget_get_style_context (widget);	2311	context = gtk_widget_get_style_context (widget);
2308	width = gtk_widget_get_allocated_width (widget);	2312	gtk_render_background (context, cr,
2309	height = gtk_widget_get_allocated_height (widget);	2313	child_allocation.x, child_allocation.y,
2310	gtk_render_background (context, cr, 0, 0, width, height);	2314	child_allocation.width, child_allocation.height);
2311	gtk_render_frame (context, cr, 0, 0, width, height);	2315	gtk_render_frame (context, cr,
		2316	child_allocation.x, child_allocation.y,
		2317	child_allocation.width, child_allocation.height);
2312	}	2318	}
2313		2319
2314	return GTK_WIDGET_CLASS (terminal_window_parent_class)->draw (widget, cr);	2320	return GTK_WIDGET_CLASS (terminal_window_parent_class)->draw (widget, cr);
2315	-
2316	--
2317	src/terminal-screen.c \| 1 -	2321	src/terminal-screen.c \| 1 -
2318	1 file changed, 1 deletion(-)	2322	1 file changed, 1 deletion(-)




  GdkRGBA *cursor_bgp = NULL, *cursor_fgp = NULL;
  GdkRGBA *highlight_bgp = NULL, *highlight_fgp = NULL;
  GtkStyleContext *context;
  GtkWidget *toplevel;
  gboolean transparent;
  gboolean use_theme_colors;

terminal_screen_notification_received (VteTerminal *terminal,
                                       const char  *summary,
                                       const char  *body)
{
  TerminalScreen *screen = TERMINAL_SCREEN (terminal);
  TerminalScreenPrivate *priv = screen->priv;
  TerminalWindow *window;

  if (G_UNLIKELY (!priv->shell_prompt_shown))
    {
      priv->shell_prompt_shown = TRUE;
      return;
    }

  window = terminal_screen_get_window (screen);
  if (window == NULL)
    return;

  if (gtk_window_is_active (GTK_WINDOW (window)))
    {
      GtkWidget *mdi_container;
      TerminalScreenContainer *screen_container;

      if (screen == terminal_window_get_active (window))
        return;

      screen_container = terminal_screen_container_get_from_screen (screen);
      if (screen_container == NULL)
        return;

      mdi_container = terminal_window_get_mdi_container (window);
      /* FIXME: add interface method to retrieve tab label */
      if (GTK_IS_NOTEBOOK (mdi_container))
        {
          GtkWidget *tab_label;

          tab_label = gtk_notebook_get_tab_label (GTK_NOTEBOOK (mdi_container), GTK_WIDGET (screen_container));
          terminal_tab_label_set_bold (TERMINAL_TAB_LABEL (tab_label), TRUE);
          terminal_tab_label_set_icon (TERMINAL_TAB_LABEL (tab_label), "dialog-information-symbolic", summary);
        }
    }
  else
    {
      gs_unref_object GNotification *notification = NULL;
      TerminalApp *app;
      gs_free char *detailed_action = NULL;

      notification = g_notification_new (summary);
      g_notification_set_body (notification, body);
      detailed_action = g_strdup_printf ("app.activate-tab::%s", priv->uuid);
      g_notification_set_default_action (notification, detailed_action);

      app = terminal_app_get ();
      g_application_send_notification (G_APPLICATION (app), priv->uuid, notification);
    }
}

static void
terminal_screen_drag_data_received (GtkWidget        *widget,
                                    GdkDragContext   *context,
                                    gint              x,

Return to bug 225165

Lines 370-375 Link Here

(-)src/org.gnome.Terminal.gschema.xml (+10 lines)
370	<default>'narrow'</default>	370	<default>'narrow'</default>
371	<summary>Whether ambiguous-width characters are narrow or wide when using UTF-8 encoding</summary>	371	<summary>Whether ambiguous-width characters are narrow or wide when using UTF-8 encoding</summary>
372	</key>	372	</key>
		373	<key name="use-transparent-background" type="b">
		374	<default>false</default>
		375	<summary>Whether to use a transparent background</summary>
		376	</key>
		377	<key name="background-transparency-percent" type="i">
		378	<default>50</default>
		379	<range min="0" max="100"/>
		380	<summary>Adjust the amount of transparency</summary>
		381	<description>A value between 0 and 100, where 0 is opaque and 100 is fully transparent.</description>
		382	</key>
373	</schema>	383	</schema>
374		384
375	<!-- Keybinding settings -->	385	<!-- Keybinding settings -->

Lines 1215-1221 terminal_profile_edit (GSettings *profile, Link Here

(-)src/profile-editor.c (+11 lines)
1215	"active-id",	1215	"active-id",
1216	G_SETTINGS_BIND_GET \| G_SETTINGS_BIND_SET);	1216	G_SETTINGS_BIND_GET \| G_SETTINGS_BIND_SET);
1217		1217
		1218	g_settings_bind (profile, TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND,
		1219	gtk_builder_get_object (builder, "use-transparent-background"),
		1220	"active", G_SETTINGS_BIND_GET \| G_SETTINGS_BIND_SET);
		1221	g_settings_bind (profile, TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND,
		1222	gtk_builder_get_object (builder, "background-transparent-scale"),
		1223	"sensitive", G_SETTINGS_BIND_GET \| G_SETTINGS_BIND_NO_SENSITIVITY);
		1224	g_settings_bind (profile, TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT,
		1225	gtk_builder_get_object (builder, "background-transparent-adjustment"),
		1226	"value", G_SETTINGS_BIND_GET \| G_SETTINGS_BIND_SET);
		1227
1218	/* Finished! */	1228	/* Finished! */
		1229
1219	terminal_util_bind_mnemonic_label_sensitivity (editor);	1230	terminal_util_bind_mnemonic_label_sensitivity (editor);
1220		1231
1221	terminal_util_dialog_focus_widget (editor, widget_name);	1232	terminal_util_dialog_focus_widget (editor, widget_name);

Lines 2295-2300 terminal_window_realize (GtkWidget *widget) Link Here

(-)src/terminal-window.c (-2 / +21 lines)
2295	}	2295	}
2296		2296
2297	static gboolean	2297	static gboolean
		2298	terminal_window_draw (GtkWidget *widget,
		2299	cairo_t *cr)
		2300	{
		2301	if (gtk_widget_get_app_paintable (widget))
		2302	{
		2303	GtkStyleContext *context;
		2304	int width;
		2305	int height;
		2306
		2307	context = gtk_widget_get_style_context (widget);
		2308	width = gtk_widget_get_allocated_width (widget);
		2309	height = gtk_widget_get_allocated_height (widget);
		2310	gtk_render_background (context, cr, 0, 0, width, height);
		2311	gtk_render_frame (context, cr, 0, 0, width, height);
		2312	}
		2313
		2314	return GTK_WIDGET_CLASS (terminal_window_parent_class)->draw (widget, cr);
		2315	}
		2316
		2317	static gboolean
2298	terminal_window_state_event (GtkWidget *widget,	2318	terminal_window_state_event (GtkWidget *widget,
2299	GdkEventWindowState *event)	2319	GdkEventWindowState *event)
2300	{	2320	{
Lines 2832-2837 terminal_window_class_init (TerminalWindowClass *klass) Link Here
2832		2852
2833	widget_class->show = terminal_window_show;	2853	widget_class->show = terminal_window_show;
2834	widget_class->realize = terminal_window_realize;	2854	widget_class->realize = terminal_window_realize;
		2855	widget_class->draw = terminal_window_draw;
2835	widget_class->window_state_event = terminal_window_state_event;	2856	widget_class->window_state_event = terminal_window_state_event;
2836	widget_class->screen_changed = terminal_window_screen_changed;	2857	widget_class->screen_changed = terminal_window_screen_changed;
2837	widget_class->style_updated = terminal_window_style_updated;	2858	widget_class->style_updated = terminal_window_style_updated;
2838	-
2839	terminals in Wayland	2859	terminals in Wayland
2840	--
2841	src/terminal-screen.c \| 40 +++++++++++++++++++++++++++++++++++++---	2860	src/terminal-screen.c \| 40 +++++++++++++++++++++++++++++++++++++---
2842	src/terminal-window.c \| 18 ++++++++++++------	2861	src/terminal-window.c \| 18 ++++++++++++------
2843	2 files changed, 49 insertions(+), 9 deletions(-)	2862	2 files changed, 49 insertions(+), 9 deletions(-)

Lines 930-936 update_color_scheme (TerminalScreen *screen) Link Here

(-)src/terminal-screen.c (-2 / +58 lines)
930	GdkRGBA cursor_bgp = NULL, cursor_fgp = NULL;	930	GdkRGBA cursor_bgp = NULL, cursor_fgp = NULL;
931	GdkRGBA highlight_bgp = NULL, highlight_fgp = NULL;	931	GdkRGBA highlight_bgp = NULL, highlight_fgp = NULL;
932	GtkStyleContext *context;	932	GtkStyleContext *context;
933	GtkWidget *toplevel;
934	gboolean transparent;	933	gboolean transparent;
935	gboolean use_theme_colors;	934	gboolean use_theme_colors;
936		935
937	-	936	terminal_screen_notification_received (VteTerminal *terminal,
		937	const char *summary,
		938	const char *body)
		939	{
		940	TerminalScreen *screen = TERMINAL_SCREEN (terminal);
		941	TerminalScreenPrivate *priv = screen->priv;
		942	TerminalWindow *window;
		943
		944	if (G_UNLIKELY (!priv->shell_prompt_shown))
		945	{
		946	priv->shell_prompt_shown = TRUE;
		947	return;
		948	}
		949
		950	window = terminal_screen_get_window (screen);
		951	if (window == NULL)
		952	return;
		953
		954	if (gtk_window_is_active (GTK_WINDOW (window)))
		955	{
		956	GtkWidget *mdi_container;
		957	TerminalScreenContainer *screen_container;
		958
		959	if (screen == terminal_window_get_active (window))
		960	return;
		961
		962	screen_container = terminal_screen_container_get_from_screen (screen);
		963	if (screen_container == NULL)
		964	return;
		965
		966	mdi_container = terminal_window_get_mdi_container (window);
		967	/* FIXME: add interface method to retrieve tab label */
		968	if (GTK_IS_NOTEBOOK (mdi_container))
		969	{
		970	GtkWidget *tab_label;
		971
		972	tab_label = gtk_notebook_get_tab_label (GTK_NOTEBOOK (mdi_container), GTK_WIDGET (screen_container));
		973	terminal_tab_label_set_bold (TERMINAL_TAB_LABEL (tab_label), TRUE);
		974	terminal_tab_label_set_icon (TERMINAL_TAB_LABEL (tab_label), "dialog-information-symbolic", summary);
		975	}
		976	}
		977	else
		978	{
		979	gs_unref_object GNotification *notification = NULL;
		980	TerminalApp *app;
		981	gs_free char *detailed_action = NULL;
		982
		983	notification = g_notification_new (summary);
		984	g_notification_set_body (notification, body);
		985	detailed_action = g_strdup_printf ("app.activate-tab::%s", priv->uuid);
		986	g_notification_set_default_action (notification, detailed_action);
		987
		988	app = terminal_app_get ();
		989	g_application_send_notification (G_APPLICATION (app), priv->uuid, notification);
		990	}
		991	}
		992
		993	static void
938	terminal_screen_drag_data_received (GtkWidget *widget,	994	terminal_screen_drag_data_received (GtkWidget *widget,
939	GdkDragContext *context,	995	GdkDragContext *context,
940	gint x,	996	gint x,