Attachment 89475 Details for Bug 155250

[patch] kdebase3 patch

kwin-firefox-focus.diff (text/plain), 6.17 KB, created by Lubos Lunak on 2006-06-14 21:00:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lubos Lunak

Created: 2006-06-14 21:00:39 UTC

Size: 6.17 KB

patch

obsolete

>--- kwin/kcmkwin/kwinrules/main.cpp.sav	2006-01-04 14:58:48.000000000 +0100
>+++ kwin/kcmkwin/kwinrules/main.cpp	2006-02-06 21:32:31.000000000 +0100
>@@ -50,6 +50,11 @@
> static void saveRules( const QValueList< Rules* >& rules )
>     {
>     KConfig cfg( "kwinrulesrc" );
>+    QStringList groups = cfg.groupList();
>+    for( QStringList::ConstIterator it = groups.begin();
>+         it != groups.end();
>+         ++it )
>+        cfg.deleteGroup( *it );
>     cfg.setGroup( "General" );
>     cfg.writeEntry( "count", rules.count());
>     int i = 1;
>--- kwin/kcmkwin/kwinrules/ruleslist.cpp.sav	2006-01-04 14:58:48.000000000 +0100
>+++ kwin/kcmkwin/kwinrules/ruleslist.cpp	2006-02-06 21:32:31.000000000 +0100
>@@ -172,6 +172,11 @@
> void KCMRulesList::save()
>     {
>     KConfig cfg( "kwinrulesrc" );
>+    QStringList groups = cfg.groupList();
>+    for( QStringList::ConstIterator it = groups.begin();
>+         it != groups.end();
>+         ++it )
>+        cfg.deleteGroup( *it );
>     cfg.setGroup( "General" );
>     cfg.writeEntry( "count", rules.count());
>     int i = 1;
>--- kwin/data/Makefile.am.sav	2005-05-04 17:02:44.000000000 +0200
>+++ kwin/data/Makefile.am	2006-02-06 21:32:25.000000000 +0100
>@@ -1,11 +1,14 @@
>-kconf_PROGRAMS = kwin_update_window_settings
>+kconf_PROGRAMS = kwin_update_window_settings kwin_update_default_rules
> kconfdir = $(libdir)/kconf_update_bin
> 
> kwin_update_window_settings_SOURCES = update_window_settings.cpp
>-
> kwin_update_window_settings_LDADD   = $(LIB_KDECORE) $(KDE_RPATH)
> kwin_update_window_settings_LDFLAGS = $(all_libraries)
> 
>+kwin_update_default_rules_SOURCES = update_default_rules.cpp
>+kwin_update_default_rules_LDADD   = $(LIB_KDECORE) $(KDE_RPATH)
>+kwin_update_default_rules_LDFLAGS = $(all_libraries)
>+
> INCLUDES = $(all_includes)
> 
> METASOURCES = AUTO
>@@ -14,7 +17,9 @@
> sound_DATA = pop.wav
> 
> update_DATA = kwin.upd kwinsticky.upd kwiniconify.upd kwin3_plugin.upd kwin_focus1.upd \
>-        kwinupdatewindowsettings.upd kwin_focus2.upd
>+        kwinupdatewindowsettings.upd kwin_focus2.upd kwin_fsp_workarounds_1.upd
> update_SCRIPTS = pluginlibFix.pl kwin3_plugin.pl kwin_focus1.sh kwin_focus2.sh
>-
> updatedir = $(kde_datadir)/kconf_update
>+
>+kwin_default_rules_DATA = fsp_workarounds_1
>+kwin_default_rulesdir = $(kde_datadir)/kwin/default_rules
>--- kwin/data/update_default_rules.cpp.sav	2006-02-06 21:32:25.000000000 +0100
>+++ kwin/data/update_default_rules.cpp	2006-02-06 21:32:25.000000000 +0100
>@@ -0,0 +1,56 @@
>+/*****************************************************************
>+ KWin - the KDE window manager
>+ This file is part of the KDE project.
>+
>+Copyright (C) 2005 Lubos Lunak <l.lunak@kde.org>
>+
>+You can Freely distribute this program under the GNU General Public
>+License. See the file "COPYING" for the exact licensing terms.
>+******************************************************************/
>+
>+// read addtional window rules and add them to kwinrulesrc
>+
>+#include <dcopclient.h>
>+#include <kconfig.h>
>+#include <kdebug.h>
>+#include <kinstance.h>
>+#include <kstandarddirs.h>
>+
>+int main( int argc, char* argv[] )
>+    {
>+    if( argc != 2 )
>+        return 1;
>+    KInstance inst( "kwin_update_default_rules" );
>+    QString file = locate( "data", QString( "kwin/default_rules/" ) + argv[ 1 ] );
>+    if( file.isEmpty())
>+        {
>+        kdWarning() << "File " << argv[ 1 ] << " not found!" << endl;
>+        return 1;
>+        }
>+    KConfig src_cfg( file );
>+    KConfig dest_cfg( "kwinrulesrc" );
>+    src_cfg.setGroup( "General" );
>+    dest_cfg.setGroup( "General" );
>+    int count = src_cfg.readNumEntry( "count", 0 );
>+    int pos = dest_cfg.readNumEntry( "count", 0 );
>+    for( int group = 1;
>+         group <= count;
>+         ++group )
>+        {
>+        QMap< QString, QString > entries = src_cfg.entryMap( QString::number( group ));
>+        ++pos;
>+        dest_cfg.deleteGroup( QString::number( pos ));
>+        dest_cfg.setGroup( QString::number( pos ));
>+        for( QMap< QString, QString >::ConstIterator it = entries.begin();
>+             it != entries.end();
>+             ++it )
>+            dest_cfg.writeEntry( it.key(), *it );
>+        }
>+    dest_cfg.setGroup( "General" );
>+    dest_cfg.writeEntry( "count", pos );
>+    src_cfg.sync();
>+    dest_cfg.sync();
>+    DCOPClient client;
>+    client.attach();
>+    client.send("kwin*", "", "reconfigure()", "");
>+    }
>--- kwin/data/fsp_workarounds_1.sav	2006-02-06 21:32:25.000000000 +0100
>+++ kwin/data/fsp_workarounds_1	2006-02-06 21:32:25.000000000 +0100
>@@ -0,0 +1,42 @@
>+[1]
>+description=(Default) Disable focus stealing prevention for OopenOffice.org 2.0
>+fsplevel=0
>+fsplevelrule=2
>+wmclass=vclsalframe openoffice.org 2.0
>+wmclasscomplete=true
>+wmclassmatch=1
>+
>+[2]
>+description=(Default) Disable focus stealing prevention for Mozilla
>+fsplevel=0
>+fsplevelrule=2
>+wmclass=mozilla-bin
>+wmclasscomplete=false
>+wmclassmatch=1
>+
>+[3]
>+description=(Default) Disable focus stealing prevention for Firefox
>+fsplevel=0
>+fsplevelrule=2
>+wmclass=firefox-bin
>+wmclasscomplete=false
>+wmclassmatch=1
>+
>+[4]
>+description=(Default) Disable focus stealing prevention for Thunderbird
>+fsplevel=0
>+fsplevelrule=2
>+wmclass=thunderbird-bin
>+wmclasscomplete=false
>+wmclassmatch=1
>+
>+[5]
>+description=(Default) Disable focus stealing prevention for XV
>+fsplevel=0
>+fsplevelrule=2
>+wmclass=^xv .*
>+wmclasscomplete=true
>+wmclassmatch=3
>+
>+[General]
>+count=5
>--- kwin/data/kwin_fsp_workarounds_1.upd.sav	2006-02-06 21:32:25.000000000 +0100
>+++ kwin/data/kwin_fsp_workarounds_1.upd	2006-02-06 21:32:25.000000000 +0100
>@@ -0,0 +1,8 @@
>+Id=kde351
>+# the file is intentionally a dummy, as the binary will update kwinrulesrc,
>+# file kwinrules_update will just remember it has been done
>+File=kwinrules_update
>+Group=Dummy
>+Options=overwrite
>+ScriptArguments=fsp_workarounds_1
>+Script=kwin_update_default_rules
>--- kwin/rules.cpp.sav	2005-11-16 14:04:02.000000000 +0100
>+++ kwin/rules.cpp	2006-02-06 21:32:31.000000000 +0100
>@@ -973,6 +973,11 @@
>     {
>     rulesUpdatedTimer.stop();
>     KConfig cfg( "kwinrulesrc" );
>+    QStringList groups = cfg.groupList();
>+    for( QStringList::ConstIterator it = groups.begin();
>+         it != groups.end();
>+         ++it )
>+        cfg.deleteGroup( *it );
>     cfg.setGroup( "General" );
>     cfg.writeEntry( "count", rules.count());
>     int i = 1;

Actions: View | Diff

Attachments on bug 155250: 71349 | 89475