gnome-terminal r3217 - trunk/src

[chpe svn gnome org]

Author: chpe
Date: Wed Nov 26 15:04:56 2008
New Revision: 3217
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=3217&view=rev

Log:
Bug 561937 â remove no-aa-without-render setting

Modified:
   trunk/src/gnome-terminal.schemas.in
   trunk/src/terminal-profile.c
   trunk/src/terminal-profile.h
   trunk/src/terminal-screen.c

Modified: trunk/src/gnome-terminal.schemas.in
==============================================================================
--- trunk/src/gnome-terminal.schemas.in	(original)
+++ trunk/src/gnome-terminal.schemas.in	Wed Nov 26 15:04:56 2008
@@ -594,21 +594,6 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/gnome-terminal/profiles/Default/no_aa_without_render</key>
-      <applyto>/apps/gnome-terminal/profiles/Default/no_aa_without_render</applyto>
-      <owner>gnome-terminal</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-         <short>Whether to disable anti-aliasing without the X RENDER extension</short>
-         <long>
-	  If true, font anti-aliasing will be disabled when running without the X RENDER
-	  extension, which gives a considerable performance improvement in these situations.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
       <key>/schemas/apps/gnome-terminal/profiles/Default/use_system_font</key>
       <applyto>/apps/gnome-terminal/profiles/Default/use_system_font</applyto>
       <owner>gnome-terminal</owner>

Modified: trunk/src/terminal-profile.c
==============================================================================
--- trunk/src/terminal-profile.c	(original)
+++ trunk/src/terminal-profile.c	Wed Nov 26 15:04:56 2008
@@ -69,7 +69,6 @@
   PROP_FOREGROUND_COLOR,
   PROP_LOGIN_SHELL,
   PROP_NAME,
-  PROP_NO_AA_WITHOUT_RENDER,
   PROP_PALETTE,
   PROP_SCROLL_BACKGROUND,
   PROP_SCROLLBACK_LINES,
@@ -104,7 +103,6 @@
 #define KEY_FONT "font"
 #define KEY_FOREGROUND_COLOR "foreground_color"
 #define KEY_LOGIN_SHELL "login_shell"
-#define KEY_NO_AA_WITHOUT_RENDER "no_aa_without_render" 
 #define KEY_PALETTE "palette"
 #define KEY_SCROLL_BACKGROUND "scroll_background"
 #define KEY_SCROLLBACK_LINES "scrollback_lines"
@@ -140,7 +138,6 @@
 #define DEFAULT_FOREGROUND_COLOR      ("#000000")
 #define DEFAULT_LOGIN_SHELL           (FALSE)
 #define DEFAULT_NAME                  (NULL)
-#define DEFAULT_NO_AA_WITHOUT_RENDER  (TRUE)
 #define DEFAULT_PALETTE               (terminal_palettes[TERMINAL_PALETTE_TANGO])
 #define DEFAULT_SCROLL_BACKGROUND     (TRUE)
 #define DEFAULT_SCROLLBACK_LINES      (512)
@@ -1263,7 +1260,6 @@
   TERMINAL_PROFILE_PROPERTY_BOOLEAN (ALLOW_BOLD, DEFAULT_ALLOW_BOLD, KEY_ALLOW_BOLD);
   TERMINAL_PROFILE_PROPERTY_BOOLEAN (DEFAULT_SHOW_MENUBAR, DEFAULT_DEFAULT_SHOW_MENUBAR, KEY_DEFAULT_SHOW_MENUBAR);
   TERMINAL_PROFILE_PROPERTY_BOOLEAN (LOGIN_SHELL, DEFAULT_LOGIN_SHELL, KEY_LOGIN_SHELL);
-  TERMINAL_PROFILE_PROPERTY_BOOLEAN (NO_AA_WITHOUT_RENDER, DEFAULT_NO_AA_WITHOUT_RENDER, KEY_NO_AA_WITHOUT_RENDER);
   TERMINAL_PROFILE_PROPERTY_BOOLEAN (SCROLL_BACKGROUND, DEFAULT_SCROLL_BACKGROUND, KEY_SCROLL_BACKGROUND);
   TERMINAL_PROFILE_PROPERTY_BOOLEAN (SCROLL_ON_KEYSTROKE, DEFAULT_SCROLL_ON_KEYSTROKE, KEY_SCROLL_ON_KEYSTROKE);
   TERMINAL_PROFILE_PROPERTY_BOOLEAN (SCROLL_ON_OUTPUT, DEFAULT_SCROLL_ON_OUTPUT, KEY_SCROLL_ON_OUTPUT);

Modified: trunk/src/terminal-profile.h
==============================================================================
--- trunk/src/terminal-profile.h	(original)
+++ trunk/src/terminal-profile.h	Wed Nov 26 15:04:56 2008
@@ -82,7 +82,6 @@
 #define TERMINAL_PROFILE_FOREGROUND_COLOR       "foreground-color"
 #define TERMINAL_PROFILE_LOGIN_SHELL            "login-shell"
 #define TERMINAL_PROFILE_NAME                   "name"
-#define TERMINAL_PROFILE_NO_AA_WITHOUT_RENDER   "no-aa-without-render"
 #define TERMINAL_PROFILE_PALETTE                "palette"
 #define TERMINAL_PROFILE_SCROLL_BACKGROUND      "scroll-background"
 #define TERMINAL_PROFILE_SCROLLBACK_LINES       "scrollback-lines"

Modified: trunk/src/terminal-screen.c
==============================================================================
--- trunk/src/terminal-screen.c	(original)
+++ trunk/src/terminal-screen.c	Wed Nov 26 15:04:56 2008
@@ -875,8 +875,7 @@
   if (GTK_WIDGET_REALIZED (screen) &&
       (!prop_name ||
        prop_name == I_(TERMINAL_PROFILE_USE_SYSTEM_FONT) ||
-       prop_name == I_(TERMINAL_PROFILE_FONT) ||
-       prop_name == I_(TERMINAL_PROFILE_NO_AA_WITHOUT_RENDER)))
+       prop_name == I_(TERMINAL_PROFILE_FONT)))
     terminal_screen_change_font (screen);
 
   if (!prop_name ||
@@ -1033,7 +1032,6 @@
   TerminalScreenPrivate *priv = screen->priv;
   TerminalProfile *profile;
   PangoFontDescription *desc;
-  gboolean no_aa_without_render;
 
   profile = priv->profile;
   
@@ -1047,9 +1045,8 @@
 				   priv->font_scale *
 				   pango_font_description_get_size (desc));
 
-  no_aa_without_render = terminal_profile_get_property_boolean (profile, TERMINAL_PROFILE_NO_AA_WITHOUT_RENDER);
-  vte_terminal_set_font_full (VTE_TERMINAL (screen), desc,
-                              no_aa_without_render ? VTE_ANTI_ALIAS_USE_DEFAULT : VTE_ANTI_ALIAS_FORCE_ENABLE);
+  vte_terminal_set_font (VTE_TERMINAL (screen), desc);
+
   pango_font_description_free (desc);
 }