rpms/gnome-terminal/devel gnome-terminal-2.14.1-real-transparency.patch, 1.4, 1.5 gnome-terminal.spec, 1.60, 1.61

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue May 30 01:23:42 UTC 2006


Author: krh

Update of /cvs/dist/rpms/gnome-terminal/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10241

Modified Files:
	gnome-terminal-2.14.1-real-transparency.patch 
	gnome-terminal.spec 
Log Message:
* Mon May 29 2006 Kristian Høgsberg <krh at redhat.com> - 2.15.1-2
- Update transparency patch to use gdk_screen_is_composited().


gnome-terminal-2.14.1-real-transparency.patch:
 terminal-screen.c     |   22 ++++++++++++++++------
 terminal-screen.h     |    2 ++
 terminal-widget-vte.c |    9 +++++++++
 terminal-widget.h     |    3 +++
 terminal-window.c     |   33 +++++++++++++++++++++++++++++++++
 terminal-window.h     |    2 ++
 terminal.c            |    2 ++
 7 files changed, 67 insertions(+), 6 deletions(-)

Index: gnome-terminal-2.14.1-real-transparency.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-terminal/devel/gnome-terminal-2.14.1-real-transparency.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnome-terminal-2.14.1-real-transparency.patch	25 Apr 2006 20:18:03 -0000	1.4
+++ gnome-terminal-2.14.1-real-transparency.patch	30 May 2006 01:23:38 -0000	1.5
@@ -1,5 +1,5 @@
---- ./src/terminal-screen.c.real-transparency	2006-04-25 15:02:21.000000000 -0400
-+++ ./src/terminal-screen.c	2006-04-25 15:02:21.000000000 -0400
+--- ./src/terminal-screen.c.real-transparency	2006-05-29 20:10:49.000000000 -0400
++++ ./src/terminal-screen.c	2006-05-29 20:10:49.000000000 -0400
 @@ -119,8 +119,6 @@
  
  static void terminal_screen_setup_dnd                (TerminalScreen *screen);
@@ -68,8 +68,8 @@
  
    if (screen->priv->profile)
      g_signal_emit (G_OBJECT (screen), signals[PROFILE_SET], 0);
---- ./src/terminal-screen.h.real-transparency	2006-01-20 13:05:42.000000000 -0500
-+++ ./src/terminal-screen.h	2006-04-25 15:02:21.000000000 -0400
+--- ./src/terminal-screen.h.real-transparency	2006-03-14 03:18:54.000000000 -0500
++++ ./src/terminal-screen.h	2006-05-29 20:10:49.000000000 -0400
 @@ -74,6 +74,8 @@
                                    TerminalProfile *profile);
  TerminalProfile* terminal_screen_get_profile (TerminalScreen *screen);
@@ -79,8 +79,8 @@
  void         terminal_screen_set_override_command (TerminalScreen  *screen,
                                                     char           **argv);
  const char** terminal_screen_get_override_command (TerminalScreen  *screen);
---- ./src/terminal-widget-vte.c.real-transparency	2006-01-20 13:05:42.000000000 -0500
-+++ ./src/terminal-widget-vte.c	2006-04-25 15:02:21.000000000 -0400
+--- ./src/terminal-widget-vte.c.real-transparency	2006-03-14 03:18:54.000000000 -0500
++++ ./src/terminal-widget-vte.c	2006-05-29 20:10:49.000000000 -0400
 @@ -351,6 +351,7 @@
  terminal_widget_set_background_transparent (GtkWidget *widget,
  					    gboolean   setting)
@@ -104,8 +104,8 @@
  terminal_widget_set_background_scrolls (GtkWidget *widget,
  					gboolean   setting)
  {
---- ./src/terminal-widget.h.real-transparency	2006-01-20 13:05:43.000000000 -0500
-+++ ./src/terminal-widget.h	2006-04-25 15:02:21.000000000 -0400
+--- ./src/terminal-widget.h.real-transparency	2006-03-14 03:18:54.000000000 -0500
++++ ./src/terminal-widget.h	2006-05-29 20:10:49.000000000 -0400
 @@ -90,6 +90,9 @@
  /* 0.0 = normal bg, 1.0 = all black bg, 0.5 = half darkened */
  void       terminal_widget_set_background_darkness    (GtkWidget            *widget,
@@ -116,19 +116,19 @@
  void       terminal_widget_set_background_scrolls     (GtkWidget            *widget,
                                                         gboolean              setting);
  void       terminal_widget_set_normal_gdk_font        (GtkWidget            *widget,
---- ./src/terminal-window.c.real-transparency	2006-03-04 01:21:01.000000000 -0500
-+++ ./src/terminal-window.c	2006-04-25 16:13:42.000000000 -0400
+--- ./src/terminal-window.c.real-transparency	2006-04-01 14:56:50.000000000 -0500
++++ ./src/terminal-window.c	2006-05-29 20:50:59.000000000 -0400
 @@ -85,6 +85,9 @@
     * event-driven while GTK doesn't support _NET_WM_STATE_FULLSCREEN
     */
    guint fullscreen : 1;
 +
-+  /* Compositing manager integration*/
++  /* Compositing manager integration */
 +  guint have_argb_visual : 1;
  };
  
  enum {
-@@ -750,6 +753,42 @@
+@@ -750,6 +753,34 @@
  }
  
  static void
@@ -136,18 +136,10 @@
 +{
 +  GdkScreen *screen;
 +  GdkColormap *colormap;
-+  char *atom_name;
-+  GdkAtom atom;
 +
 +  screen = gtk_widget_get_screen (GTK_WIDGET (window));
-+
-+  atom_name = g_strdup_printf ("_NET_WM_CM_S%d",
-+			       gdk_screen_get_number (screen));
-+  atom = gdk_atom_intern (atom_name, FALSE);
-+  g_free (atom_name);
-+
 +  colormap = gdk_screen_get_rgba_colormap (screen);
-+  if (colormap != NULL && gdk_selection_owner_get (atom) != None)
++  if (colormap != NULL && gdk_screen_is_composited (screen))
 +    {
 +      /* Set RGBA colormap if possible so VTE can use real alpha
 +       * channels for transparency. */
@@ -171,7 +163,7 @@
  terminal_window_init (TerminalWindow *window)
  {
    GtkWidget *mi;
-@@ -781,6 +820,8 @@
+@@ -781,6 +812,8 @@
    window->priv->use_mnemonics = TRUE;
    window->priv->using_mnemonics = FALSE;
  
@@ -180,8 +172,8 @@
    /* force gtk to construct its GtkClipboard; otherwise our UI is very slow the first time we need it */
    window->priv->clipboard = gtk_clipboard_get_for_display (gtk_widget_get_display (GTK_WIDGET (window)), GDK_NONE);
  
---- ./src/terminal-window.h.real-transparency	2005-11-20 10:06:34.000000000 -0500
-+++ ./src/terminal-window.h	2006-04-25 15:02:21.000000000 -0400
+--- ./src/terminal-window.h.real-transparency	2006-03-14 03:18:54.000000000 -0500
++++ ./src/terminal-window.h	2006-05-29 20:10:49.000000000 -0400
 @@ -98,6 +98,8 @@
  void terminal_window_set_startup_id (TerminalWindow *window,
                                       const char     *startup_id);
@@ -191,8 +183,8 @@
  G_END_DECLS
  
  #endif /* TERMINAL_WINDOW_H */
---- ./src/terminal.c.real-transparency	2006-03-04 01:10:54.000000000 -0500
-+++ ./src/terminal.c	2006-04-25 15:02:21.000000000 -0400
+--- ./src/terminal.c.real-transparency	2006-04-12 03:33:57.000000000 -0400
++++ ./src/terminal.c	2006-05-29 20:10:49.000000000 -0400
 @@ -1966,6 +1966,8 @@
      
        terminal_window_add_screen (window, screen);


Index: gnome-terminal.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-terminal/devel/gnome-terminal.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- gnome-terminal.spec	22 May 2006 16:52:22 -0000	1.60
+++ gnome-terminal.spec	30 May 2006 01:23:39 -0000	1.61
@@ -13,7 +13,7 @@
 Summary: GNOME Terminal
 Name: gnome-terminal
 Version: 2.15.1
-Release: 1
+Release: 2
 URL: http://www.gnome.org/
 Source0: gnome-terminal-%{version}.tar.bz2
 Patch0: gnome-terminal-2.12.0-inputmethod.patch
@@ -118,6 +118,9 @@
 %{_libdir}/bonobo
 
 %changelog
+* Mon May 29 2006 Kristian Høgsberg <krh at redhat.com> - 2.15.1-2
+- Update transparency patch to use gdk_screen_is_composited().
+
 * Mon May 22 2006 Matthias Clasen <mclasen at redhat.com> 2.15.1-1
 - Update to 2.15.1
 




More information about the fedora-cvs-commits mailing list