rpms/kdebase/F-10 kdebase-4.2.1-konsole-selection.patch, NONE, 1.1 kdebase.spec, 1.359, 1.360

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/kdebase/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31411

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-4.2.1-konsole-selection.patch 
Log Message:
apply patch to fix regression in konsole, double-click selection works again


kdebase-4.2.1-konsole-selection.patch:

--- NEW FILE kdebase-4.2.1-konsole-selection.patch ---
diff -up kdebase-4.2.1/apps/konsole/src/TerminalDisplay.cpp.orig kdebase-4.2.1/apps/konsole/src/TerminalDisplay.cpp
--- kdebase-4.2.1/apps/konsole/src/TerminalDisplay.cpp.orig	2009-03-04 20:55:02.000000000 +0100
+++ kdebase-4.2.1/apps/konsole/src/TerminalDisplay.cpp	2009-03-04 20:57:11.000000000 +0100
@@ -2155,11 +2155,12 @@ void TerminalDisplay::mouseDoubleClickEv
   _wordSelectionMode = true;
 
   // find word boundaries...
+  QChar selClass = charClass(_image[i].character);
   {
      // find the start of the word
      int x = bgnSel.x();
      while ( ((x>0) || (bgnSel.y()>0 && (_lineProperties[bgnSel.y()-1] & LINE_WRAPPED) )) 
-                     && !isCharBoundary(_image[i-1].character) )
+                     && charClass(_image[i-1].character) == selClass )
      {  
        i--; 
        if (x>0) 
@@ -2178,7 +2179,7 @@ void TerminalDisplay::mouseDoubleClickEv
      i = loc( endSel.x(), endSel.y() );
      x = endSel.x();
      while( ((x<_usedColumns-1) || (endSel.y()<_usedLines-1 && (_lineProperties[endSel.y()] & LINE_WRAPPED) )) 
-                     && !isCharBoundary(_image[i+1].character) )
+                     && charClass(_image[i+1].character) == selClass )
      { 
          i++; 
          if (x<_usedColumns-1) 
@@ -2332,16 +2333,6 @@ bool TerminalDisplay::focusNextPrevChild
   return QWidget::focusNextPrevChild( next );
 }
 
-// Returns true upon a word boundary
-// TODO determine if the below charClass() is actually required
-bool TerminalDisplay::isCharBoundary(QChar qch) const
-{
-    if ( _wordCharacters.contains(qch, Qt::CaseInsensitive) ) return true;
-    if ( qch.isSpace() ) return true;
-
-    return false;
-}
-
 QChar TerminalDisplay::charClass(QChar qch) const
 {
     if ( qch.isSpace() ) return ' ';
diff -up kdebase-4.2.1/apps/konsole/src/TerminalDisplay.h.orig kdebase-4.2.1/apps/konsole/src/TerminalDisplay.h
--- kdebase-4.2.1/apps/konsole/src/TerminalDisplay.h.orig	2009-03-04 20:57:23.000000000 +0100
+++ kdebase-4.2.1/apps/konsole/src/TerminalDisplay.h	2009-03-04 20:57:40.000000000 +0100
@@ -563,9 +563,6 @@ protected:
     //     - Other characters (returns the input character)
     QChar charClass(QChar ch) const;
 
-    // Returns true upon a word boundary
-    bool isCharBoundary(QChar ch) const;
-
     void clearImage();
 
     void mouseTripleClickEvent(QMouseEvent* ev);


Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-10/kdebase.spec,v
retrieving revision 1.359
retrieving revision 1.360
diff -u -r1.359 -r1.360
--- kdebase.spec	3 Mar 2009 11:22:47 -0000	1.359
+++ kdebase.spec	4 Mar 2009 20:59:56 -0000	1.360
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Core Files
 Version: 4.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase
@@ -29,6 +29,7 @@
 Patch2:   kdebase-4.2.1-home-icon.patch
 
 ## upstream patches
+Patch100:   kdebase-4.2.1-konsole-selection.patch
 
 %ifnarch s390 s390x
 Requires: eject
@@ -125,6 +126,8 @@
 %patch1 -p1 -b .konsole-session
 %patch2 -p1 -b .home-icon
 
+%patch100 -p1 -b .konsole
+
 # fix incorrect assumption that we're building in a combined kdebase tree
 sed -i -e 's/EXISTS "${kdebase_SOURCE_DIR}"/0/g' apps/CMakeLists.txt
 
@@ -305,6 +308,9 @@
 
 
 %changelog
+* Wed Mar 04 2009 Than Ngo <than at redhat.com> - 4.2.1-2
+- apply patch to fix regression in konsole, double-click selection works again
+
 * Fri Feb 27 2009 Than Ngo <than at redhat.com> - 4.2.1-1
 - 4.2.1