Attachment 51929 Details for Bug 113637

[patch] kdebase3 patch

suse_113637.patch (text/plain), 13.12 KB, created by Lubos Lunak on 2005-10-07 17:58:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lubos Lunak

Created: 2005-10-07 17:58:45 UTC

Size: 13.12 KB

patch

obsolete

>diff -u fonts/fonts.cpp fonts/fonts.cpp
>--- kcontrol/fonts/fonts.cpp	2005-10-07 15:14:42.000000000 +0200
>+++ kcontrol/fonts/fonts.cpp	2005-10-07 19:21:56.000000000 +0200
>@@ -43,26 +43,6 @@
> #undef Unsorted
> #undef None
> 
>-static const char *aa_greyscale_xpm[]={
>-"12 12 6 1",
>-"a c #dcdcdc",
>-"b c #c3c3c3",
>-"c c #a0a0a0",
>-"d c #808080",
>-"e c #585858",
>-"f c #303030",
>-"ffeeddccbbaa",
>-"ffeeddccbbaa",
>-"ffeeddccbbaa",
>-"ffeeddccbbaa",
>-"ffeeddccbbaa",
>-"ffeeddccbbaa",
>-"ffeeddccbbaa",
>-"ffeeddccbbaa",
>-"ffeeddccbbaa",
>-"ffeeddccbbaa",
>-"ffeeddccbbaa",
>-"ffeeddccbbaa"};
> static const char *aa_rgb_xpm[]={
> "12 12 3 1",
> "a c #0000ff",
>@@ -132,8 +112,7 @@
> "aaaaaaaaaaaa",
> "aaaaaaaaaaaa"};
> 
>-static QPixmap aaPixmaps[]={ QPixmap(aa_greyscale_xpm), QPixmap(aa_rgb_xpm),
>-                             QPixmap(aa_bgr_xpm), QPixmap(aa_vrgb_xpm), QPixmap(aa_vbgr_xpm) };
>+static QPixmap aaPixmaps[]={ QPixmap(aa_rgb_xpm), QPixmap(aa_bgr_xpm), QPixmap(aa_vrgb_xpm), QPixmap(aa_vbgr_xpm) };
> 
> /**** DLL Interface ****/
> typedef KGenericFactory<KFonts, QWidget> FontFactory;
>@@ -288,7 +267,7 @@
> #endif
> }
> 
>-void FontAASettings::load()
>+bool FontAASettings::load()
> {
>   double     from, to;
> #ifdef HAVE_FONTCONFIG
>@@ -346,9 +325,11 @@
> #endif
> 
>   enableWidgets();
>+
>+  return xft.getAntiAliasing();
> }
> 
>-bool FontAASettings::save()
>+bool FontAASettings::save( bool useAA )
> {
> #ifdef HAVE_FONTCONFIG
>   KXftConfig xft(KXftConfig::ExcludeRange|KXftConfig::SubPixelType|KXftConfig::HintStyle);
>@@ -356,9 +337,10 @@
>   KXftConfig xft(KXftConfig::ExcludeRange|KXftConfig::SubPixelType);
> #endif
>   KConfig    kglobals("kdeglobals", false, false);
>-
>   kglobals.setGroup("General");
> 
>+  xft.setAntiAliasing( useAA );
>+
>   if(excludeRange->isChecked())
>     xft.setExcludeRange(excludeFrom->value(), excludeTo->value());
>   else
>@@ -635,11 +617,7 @@
> 
>    connect(cbAA, SIGNAL(clicked()), SLOT(slotUseAntiAliasing()));
> 
>-   useAA = QSettings().readBoolEntry("/qt/useXft");
>-   useAA_original = useAA;
>-
>-   cbAA->setChecked(useAA);
>-   aaSettingsButton->setEnabled(useAA);
>+   load();
> }
> 
> KFonts::~KFonts()
>@@ -658,7 +636,7 @@
>   for ( int i = 0; i < (int) fontUseList.count(); i++ )
>     fontUseList.at( i )->setDefault();
> 
>-  useAA = false;
>+  useAA = true;
>   cbAA->setChecked(useAA);
>   aaSettings->defaults();
>   emit changed(true);
>@@ -669,13 +647,10 @@
>   for ( uint i = 0; i < fontUseList.count(); i++ )
>     fontUseList.at( i )->readFont();
> 
>-  useAA = QSettings().readBoolEntry("/qt/useXft");
>-  useAA_original = useAA;
>+  useAA_original = useAA = aaSettings->load();
>   kdDebug(1208) << "AA:" << useAA << endl;
>   cbAA->setChecked(useAA);
> 
>-  aaSettings->load();
>-
>   emit changed(false);
> }
> 
>@@ -699,16 +674,11 @@
>   config->sync();
>   delete config;
> 
>-  QSettings().writeEntry("/qt/useXft", useAA);
>-
>-  if (useAA)
>-    QSettings().writeEntry("/qt/enableXft", useAA);
>-
>   KIPC::sendMessageAll(KIPC::FontChanged);
> 
>   kapp->processEvents(); // Process font change ourselves
> 
>-  if(aaSettings->save() || (useAA != useAA_original) ) {
>+  if(aaSettings->save( useAA ) || (useAA != useAA_original) ) {
>     KMessageBox::information(this,
>       i18n(
>         "<p>You have changed anti-aliasing related settings. This change will only affect newly started applications.</p>"
>diff -u fonts/kxftconfig.cpp fonts/kxftconfig.cpp
>--- kcontrol/fonts/kxftconfig.cpp	2005-10-07 15:29:19.000000000 +0200
>+++ kcontrol/fonts/kxftconfig.cpp	2005-10-07 19:26:07.000000000 +0200
>@@ -29,6 +29,8 @@
> #include <klocale.h>
> #include <klargefile.h>
> #include <qdir.h>
>+#include <qsettings.h>
>+#include <qfont.h>
> 
> #ifdef HAVE_FONTCONFIG
> #include <stdarg.h>
>@@ -254,9 +256,7 @@
> 
> static KXftConfig::SubPixel::Type strToType(const char *str)
> {
>-    if(0==strcmp(str, "\0"))
>-        return KXftConfig::SubPixel::Greyscale;
>-    else if(0==strcmp(str, "rgb"))
>+    if(0==strcmp(str, "rgb"))
>         return KXftConfig::SubPixel::Rgb;
>     else if(0==strcmp(str, "bgr")) 
>         return KXftConfig::SubPixel::Bgr;
>@@ -283,9 +283,7 @@
> #else
> static bool strToType(const char *str, KXftConfig::SubPixel::Type &type)
> {   
>-    if(0==memcmp(str, "\0", 1))
>-        type=KXftConfig::SubPixel::Greyscale;
>-    else if(0==memcmp(str, "rgb", 3))
>+    if(0==memcmp(str, "rgb", 3))
>         type=KXftConfig::SubPixel::Rgb;
>     else if(0==memcmp(str, "bgr", 3))
>         type=KXftConfig::SubPixel::Bgr;
>@@ -429,6 +427,7 @@
> #ifdef HAVE_FONTCONFIG
>     m_file=getConfigFile(system);
>     kdDebug(1208) << "Using fontconfig file:" << m_file << endl;
>+    m_antiAliasing = aliasingEnabled();
> #else
>     if(system) 
>     {
>@@ -581,6 +580,7 @@
> #ifdef HAVE_FONTCONFIG
>             if(m_required&HintStyle)
>                 newConfig.setHintStyle(m_hint.style);
>+            newConfig.setAntiAliasing(m_antiAliasing.set);
> #else
>             if(m_required&SymbolFamilies)
>             {
>@@ -626,6 +626,7 @@
>                             applySubPixelType();
>                         if(m_required&HintStyle)
>                             applyHintStyle();
>+                        applyAntiAliasing();
>                         if(m_required&ExcludeRange)
>                         {
>                             applyExcludeRange(false);
>@@ -774,21 +775,14 @@
> 
> bool KXftConfig::getSubPixelType(SubPixel::Type &type)
> {
>-    if(SubPixel::None!=m_subPixel.type && !m_subPixel.toBeRemoved)
>-    {
>-        type=m_subPixel.type;
>-        return true;
>-    }
>-    else
>-        return false;
>+    type=m_subPixel.type;
>+    return SubPixel::None!=m_subPixel.type;
> }
> 
> void KXftConfig::setSubPixelType(SubPixel::Type type)
> {
>-    if((SubPixel::None==type && SubPixel::None!=m_subPixel.type && !m_subPixel.toBeRemoved) ||
>-       (SubPixel::None!=type && (type!=m_subPixel.type || m_subPixel.toBeRemoved)) )
>+    if(type!=m_subPixel.type)
>     {
>-        m_subPixel.toBeRemoved=(SubPixel::None==type);
>         m_subPixel.type=type;
>         m_madeChanges=true;
>     }
>@@ -878,8 +872,6 @@
>         default:
>         case SubPixel::None:
>             return i18n("None");
>-        case SubPixel::Greyscale:
>-            return i18n("Grayscale");
>         case SubPixel::Rgb:
>             return i18n("RGB");
>         case SubPixel::Bgr:
>@@ -898,8 +890,6 @@
>         default:
>         case SubPixel::None:
>             return "none";
>-        case SubPixel::Greyscale:
>-            return "";
>         case SubPixel::Rgb:
>             return "rgb";
>         case SubPixel::Bgr:
>@@ -1066,6 +1056,11 @@
>                                     m_hinting.node=n;
>                                     m_hinting.set=str.lower()!="false";
>                                 }
>+                                else if(!(str=getEntry(ene, "bool", 2, "name", "antialias", "mode", "assign")).isNull())
>+                                {
>+                                    m_antiAliasing.node=n;
>+                                    m_antiAliasing.set=str.lower()!="false";
>+                                }
>                         }
>                         break;
>                     case 3:
>@@ -1270,33 +1265,22 @@
> 
> void KXftConfig::applySubPixelType()
> {
>-    if(SubPixel::None==m_subPixel.type || m_subPixel.toBeRemoved)
>-    {
>-        if(!m_subPixel.node.isNull())
>-        {
>-            m_doc.documentElement().removeChild(m_subPixel.node);
>-            m_subPixel.node.clear();
>-        }
>-    }
>-    else
>-    {
>-        QDomElement matchNode = m_doc.createElement("match"),
>-                    typeNode  = m_doc.createElement("const"),
>-                    editNode  = m_doc.createElement("edit");
>-        QDomText    typeText  = m_doc.createTextNode(toStr(m_subPixel.type));
>+    QDomElement matchNode = m_doc.createElement("match"),
>+                typeNode  = m_doc.createElement("const"),
>+                editNode  = m_doc.createElement("edit");
>+    QDomText    typeText  = m_doc.createTextNode(toStr(m_subPixel.type));
> 
>-        matchNode.setAttribute("target", "font");
>-        editNode.setAttribute("mode", "assign");
>-        editNode.setAttribute("name", "rgba");
>-        editNode.appendChild(typeNode);
>-        typeNode.appendChild(typeText);
>-        matchNode.appendChild(editNode);
>-        if(m_subPixel.node.isNull())
>-            m_doc.documentElement().appendChild(matchNode);
>-        else
>-            m_doc.documentElement().replaceChild(matchNode, m_subPixel.node);
>-        m_subPixel.node=matchNode;
>-    }
>+    matchNode.setAttribute("target", "font");
>+    editNode.setAttribute("mode", "assign");
>+    editNode.setAttribute("name", "rgba");
>+    editNode.appendChild(typeNode);
>+    typeNode.appendChild(typeText);
>+    matchNode.appendChild(editNode);
>+    if(m_subPixel.node.isNull())
>+        m_doc.documentElement().appendChild(matchNode);
>+    else
>+        m_doc.documentElement().replaceChild(matchNode, m_subPixel.node);
>+    m_subPixel.node=matchNode;
> }
> 
> void KXftConfig::applyHintStyle()
>@@ -1451,7 +1435,7 @@
> 
> void KXftConfig::outputSubPixelType(std::ofstream &f, bool ifNew)
> {
>-    if(!m_subPixel.toBeRemoved && ((ifNew && NULL==m_subPixel.end) || (!ifNew && NULL!=m_subPixel.end)) && SubPixel::None!=m_subPixel.type)
>+    if((ifNew && NULL==m_subPixel.end) || (!ifNew && NULL!=m_subPixel.end))
>         f << "match edit rgba = " << toStr(m_subPixel.type) << ';' << endl;
> }
> 
>@@ -1487,2 +1471,70 @@
> }
>+
>+#endif
>+
>+#ifdef HAVE_FONTCONFIG
>+bool KXftConfig::getAntiAliasing() const
>+{
>+    return m_antiAliasing.set;
>+}
>+
>+void KXftConfig::setAntiAliasing( bool set )
>+{
>+    m_antiAliasing.set = set;
>+    m_madeChanges = true;
>+}
>+
>+void KXftConfig::applyAntiAliasing()
>+{
>+    QDomElement matchNode = m_doc.createElement("match"),
>+                typeNode  = m_doc.createElement("bool"),
>+                editNode  = m_doc.createElement("edit");
>+    QDomText    typeText  = m_doc.createTextNode(m_antiAliasing.set ? "true" : "false");
>+
>+    matchNode.setAttribute("target", "font");
>+    editNode.setAttribute("mode", "assign");
>+    editNode.setAttribute("name", "antialias");
>+    editNode.appendChild(typeNode);
>+    typeNode.appendChild(typeText);
>+    matchNode.appendChild(editNode);
>+    if(m_antiAliasing.node.isNull())
>+        m_doc.documentElement().appendChild(matchNode);
>+    else
>+        m_doc.documentElement().replaceChild(matchNode, m_antiAliasing.node);
>+    m_antiAliasing.node=matchNode;
>+}
>+
>+// KXftConfig only parses one config file, user's .fonts.conf usually.
>+// If that one doesn't exist, then KXftConfig doesn't know if antialiasing
>+// is enabled or not. So try to find out the default value from the default font.
>+// Maybe there's a better way *shrug*.
>+bool KXftConfig::aliasingEnabled()
>+{
>+    FcPattern *pattern = FcPatternCreate();
>+    FcConfigSubstitute(0, pattern, FcMatchPattern);
>+    FcDefaultSubstitute(pattern);
>+    FcResult result;
>+    FcPattern *f = FcFontMatch( 0, pattern, &result );
>+    FcBool antialiased = FcTrue;
>+    FcPatternGetBool( f, FC_ANTIALIAS, 0, &antialiased );
>+    FcPatternDestroy( f );
>+    FcPatternDestroy( pattern );
>+    return antialiased == FcTrue;
>+}
>+
>+#else
>+
>+void KXftConfig::setAntiAliasing( bool set )
>+{
>+  QSettings().writeEntry("/qt/useXft", set);
>+  if (set)
>+    QSettings().writeEntry("/qt/enableXft", set);
>+}
>+
>+bool KXftConfig::getAntiAliasing() const
>+{
>+  return QSettings().readBoolEntry("/qt/useXft");
>+}
>+
>+
> #endif
>diff -u fonts/kxftconfig.h fonts/kxftconfig.h
>--- kcontrol/fonts/kxftconfig.h	2005-10-07 15:12:59.000000000 +0200
>+++ kcontrol/fonts/kxftconfig.h	2005-10-07 19:00:50.000000000 +0200
>@@ -89,7 +89,6 @@
>         enum Type
>         {
>             None,
>-            Greyscale,
>             Rgb,
>             Bgr,
>             Vrgb,
>@@ -150,6 +149,16 @@
> 
>         bool set;
>     };
>+
>+    struct AntiAliasing : public Item
>+    {
>+        AntiAliasing(bool s, QDomNode &n) : Item(n), set(s) {}
>+        AntiAliasing(bool s=true)         : set(s)          {}
>+
>+        void reset() { Item::reset(); set=true; }
>+
>+        bool set;
>+    };
> #endif
> 
>     public:
>@@ -190,6 +199,8 @@
>     void        clearSymbolFamilies()                { clearList(m_symbolFamilies); }
>     QStringList getSymbolFamilies()                  { return getList(m_symbolFamilies); }
> #endif
>+    void        setAntiAliasing(bool set);
>+    bool        getAntiAliasing() const;
>     bool        changed()                            { return m_madeChanges; }
>     static QString description(SubPixel::Type t);
>     static const char * toStr(SubPixel::Type t);
>@@ -215,6 +226,7 @@
> #endif
>     void        applySubPixelType();
>     void        applyHintStyle();
>+    void        applyAntiAliasing();
>     void        setHinting(bool set);
>     void        applyHinting();
>     void        applyExcludeRange(bool pixel);
>@@ -236,6 +248,8 @@
> #ifdef HAVE_FONTCONFIG
>     Hint               m_hint;
>     Hinting            m_hinting;
>+    AntiAliasing       m_antiAliasing;
>+    bool               aliasingEnabled();
> #else
>     QPtrList<ListItem> m_symbolFamilies;
> #endif
>only in patch2:
>unchanged:
>--- kcontrol/fonts/fonts.h.sav	2005-05-04 15:39:15.000000000 +0200
>+++ kcontrol/fonts/fonts.h	2005-10-07 18:35:38.000000000 +0200
>@@ -55,8 +55,8 @@ public:
> 
>     FontAASettings(QWidget *parent);
> 
>-    bool save();
>-    void load();
>+    bool save( bool useAA );
>+    bool load();
>     void defaults();
>     int getIndex(KXftConfig::SubPixel::Type spType);
>     KXftConfig::SubPixel::Type getSubPixelType();

Actions: View | Diff

Attachments on bug 113637: 47898 | 47899 | 51929