*** konsole/konsole/konsole_wcwidth.cpp.ORG	2007-11-21 18:28:55.000000000 +0900
--- konsole/konsole/konsole_wcwidth.cpp	2007-11-21 19:58:12.000000000 +0900
***************
*** 65,71 ****
   * in ISO 10646.
   */
  
! int konsole_wcwidth(Q_UINT16 ucs)
  {
    /* sorted list of non-overlapping intervals of non-spacing characters */
    static const struct interval combining[] = {
--- 65,72 ----
   * in ISO 10646.
   */
  
! static int __konsole_wcwidth(Q_UINT16);
! static int __konsole_wcwidth(Q_UINT16 ucs)
  {
    /* sorted list of non-overlapping intervals of non-spacing characters */
    static const struct interval combining[] = {
***************
*** 131,137 ****
        (ucs >= 0x20000 && ucs <= 0x2ffff) */));
  }
  
! #if 0
  /*
   * The following function is the same as konsole_wcwidth(), except that
   * spacing characters in the East Asian Ambiguous (A) category as
--- 132,138 ----
        (ucs >= 0x20000 && ucs <= 0x2ffff) */));
  }
  
! #if 1
  /*
   * The following function is the same as konsole_wcwidth(), except that
   * spacing characters in the East Asian Ambiguous (A) category as
***************
*** 140,146 ****
   * encodings who want to migrate to UCS. It is not otherwise
   * recommended for general use.
   */
! int konsole_wcwidth_cjk(Q_UINT16 ucs)
  {
    /* sorted list of non-overlapping intervals of East Asian Ambiguous
     * characters */
--- 141,147 ----
   * encodings who want to migrate to UCS. It is not otherwise
   * recommended for general use.
   */
! int konsole_wcwidth(Q_UINT16 ucs)
  {
    /* sorted list of non-overlapping intervals of East Asian Ambiguous
     * characters */
***************
*** 202,208 ****
  	       sizeof(ambiguous) / sizeof(struct interval) - 1))
      return 2;
  
!   return konsole_wcwidth(ucs);
  }
  #endif
  
--- 203,209 ----
  	       sizeof(ambiguous) / sizeof(struct interval) - 1))
      return 2;
  
!   return __konsole_wcwidth(ucs);
  }
  #endif
  
*** konsole/konsole/TEWidget.cpp.ORG	2007-11-21 18:28:36.000000000 +0900
--- konsole/konsole/TEWidget.cpp	2007-11-21 23:40:50.097000000 +0900
***************
*** 647,656 ****
      QString tmpStr = str.simplifyWhiteSpace();
      if ( m_isIMEdit && !tmpStr.isEmpty() ) { // imput method edit area background color
        QRect tmpRect = rect;
!       if ( str != m_imPreeditText ) {  // ugly hack
!         tmpRect.setLeft( tmpRect.left() + font_w );
!         tmpRect.setWidth( tmpRect.width() + font_w );
!       }
  
        paint.fillRect( tmpRect, Qt::darkCyan );  // currently use hard code color
      }
--- 647,656 ----
      QString tmpStr = str.simplifyWhiteSpace();
      if ( m_isIMEdit && !tmpStr.isEmpty() ) { // imput method edit area background color
        QRect tmpRect = rect;
! //      if ( str != m_imPreeditText ) {  // ugly hack
! //        tmpRect.setLeft( tmpRect.left() + font_w );
! //        tmpRect.setWidth( tmpRect.width() + font_w );
! //      }
  
        paint.fillRect( tmpRect, Qt::darkCyan );  // currently use hard code color
      }
***************
*** 662,671 ****
        int h = font_h;
  
        QRect tmpRect = QRect( x, y, w, h );
!       if ( str != m_imPreeditText ) {  // ugly hack
!         tmpRect.setLeft( tmpRect.left() + font_w );
!         tmpRect.setWidth( tmpRect.width() + font_w );
!       }
  
        paint.fillRect( tmpRect, Qt::darkGray );   // currently use hard code color
      }
--- 662,671 ----
        int h = font_h;
  
        QRect tmpRect = QRect( x, y, w, h );
! //      if ( str != m_imPreeditText ) {  // ugly hack
! //        tmpRect.setLeft( tmpRect.left() + font_w );
! //        tmpRect.setWidth( tmpRect.width() + font_w );
! //      }
  
        paint.fillRect( tmpRect, Qt::darkGray );   // currently use hard code color
      }
***************
*** 876,882 ****
            if (ext[x+len].f != cf || ext[x+len].b != cb || ext[x+len].r != cr ||
                !dirtyMask[x+len] || isLineChar(c) != lineDraw || (ext[x+len+1].c == 0) != doubleWidth)
              break;
! 
            disstrU[p++] = c; //fontMap(c);
          }
  
--- 876,884 ----
            if (ext[x+len].f != cf || ext[x+len].b != cb || ext[x+len].r != cr ||
                !dirtyMask[x+len] || isLineChar(c) != lineDraw || (ext[x+len+1].c == 0) != doubleWidth)
              break;
! 	  // Moreover, we never cross the boundary of the preedit area
!           if (m_imStart < m_imEnd && (x + 1) == m_imStart) 
! 		break;
            disstrU[p++] = c; //fontMap(c);
          }
  
***************
*** 884,889 ****
--- 886,892 ----
  
          // for XIM on the spot input style
          m_isIMEdit = m_isIMSel = false;
+ #if	0
          if ( m_imStartLine == y ) {
            if ( ( m_imStart < m_imEnd ) && ( x >= m_imStart-1 ) && ( x + int( unistr.length() ) <= m_imEnd ) )
              m_isIMEdit = true;
***************
*** 898,903 ****
--- 901,920 ----
            if ( ( m_imSelStart < m_imSelEnd ) )
              m_isIMSel = true;
  	}
+ #else
+ 	if (m_imStart < m_imEnd && y >= m_imStartLine)
+ 	{
+ 		int realsx, realex;
+ 		realsx = x + (y - m_imStartLine) * cols;
+ 		realex = realsx + int(unistr.length());
+           	if (!(realex <= m_imStart || realsx >= m_imEnd))
+ 		{
+ 		    m_isIMEdit = true;
+                     if (m_imSelStart < m_imSelEnd)
+ 			    m_isIMSel = true;
+ 		}
+ 	}
+ #endif
  
          bool save_fixed_font = fixed_font;
          if (lineDraw)

*** konsole/konsole/konsole_wcwidth.cpp.ORG	2007-11-22 09:18:07.000000000 +0900
--- konsole/konsole/konsole_wcwidth.cpp	2007-11-22 05:19:17.000000000 +0900
***************
*** 65,71 ****
   * in ISO 10646.
   */
  
! int konsole_wcwidth(Q_UINT16 ucs)
  {
    /* sorted list of non-overlapping intervals of non-spacing characters */
    static const struct interval combining[] = {
--- 65,72 ----
   * in ISO 10646.
   */
  
! static int __konsole_wcwidth(Q_UINT16);
! static int __konsole_wcwidth(Q_UINT16 ucs)
  {
    /* sorted list of non-overlapping intervals of non-spacing characters */
    static const struct interval combining[] = {
***************
*** 131,137 ****
        (ucs >= 0x20000 && ucs <= 0x2ffff) */));
  }
  
! #if 0
  /*
   * The following function is the same as konsole_wcwidth(), except that
   * spacing characters in the East Asian Ambiguous (A) category as
--- 132,138 ----
        (ucs >= 0x20000 && ucs <= 0x2ffff) */));
  }
  
! #if 1
  /*
   * The following function is the same as konsole_wcwidth(), except that
   * spacing characters in the East Asian Ambiguous (A) category as
***************
*** 140,146 ****
   * encodings who want to migrate to UCS. It is not otherwise
   * recommended for general use.
   */
! int konsole_wcwidth_cjk(Q_UINT16 ucs)
  {
    /* sorted list of non-overlapping intervals of East Asian Ambiguous
     * characters */
--- 141,147 ----
   * encodings who want to migrate to UCS. It is not otherwise
   * recommended for general use.
   */
! int konsole_wcwidth(Q_UINT16 ucs)
  {
    /* sorted list of non-overlapping intervals of East Asian Ambiguous
     * characters */
***************
*** 202,208 ****
  	       sizeof(ambiguous) / sizeof(struct interval) - 1))
      return 2;
  
!   return konsole_wcwidth(ucs);
  }
  #endif
  
--- 203,209 ----
  	       sizeof(ambiguous) / sizeof(struct interval) - 1))
      return 2;
  
!   return __konsole_wcwidth(ucs);
  }
  #endif
  
*** konsole/konsole/TEWidget.cpp.ORG	2007-11-22 09:18:21.000000000 +0900
--- konsole/konsole/TEWidget.cpp	2007-11-22 09:28:19.000000000 +0900
***************
*** 647,656 ****
      QString tmpStr = str.simplifyWhiteSpace();
      if ( m_isIMEdit && !tmpStr.isEmpty() ) { // imput method edit area background color
        QRect tmpRect = rect;
!       if ( str != m_imPreeditText ) {  // ugly hack
!         tmpRect.setLeft( tmpRect.left() + font_w );
!         tmpRect.setWidth( tmpRect.width() + font_w );
!       }
  
        paint.fillRect( tmpRect, Qt::darkCyan );  // currently use hard code color
      }
--- 647,656 ----
      QString tmpStr = str.simplifyWhiteSpace();
      if ( m_isIMEdit && !tmpStr.isEmpty() ) { // imput method edit area background color
        QRect tmpRect = rect;
! //      if ( str != m_imPreeditText ) {  // ugly hack
! //        tmpRect.setLeft( tmpRect.left() + font_w );
! //        tmpRect.setWidth( tmpRect.width() + font_w );
! //      }
  
        paint.fillRect( tmpRect, Qt::darkCyan );  // currently use hard code color
      }
***************
*** 660,673 ****
        int y = rect.top();
        int w = font_w * (m_imSelEnd - m_imSelStart);
        int h = font_h;
  
!       QRect tmpRect = QRect( x, y, w, h );
!       if ( str != m_imPreeditText ) {  // ugly hack
!         tmpRect.setLeft( tmpRect.left() + font_w );
!         tmpRect.setWidth( tmpRect.width() + font_w );
        }
- 
-       paint.fillRect( tmpRect, Qt::darkGray );   // currently use hard code color
      }
    }
  
--- 660,675 ----
        int y = rect.top();
        int w = font_w * (m_imSelEnd - m_imSelStart);
        int h = font_h;
+       if (x + w <= rect.left() + rect.width())
+       {
+       	QRect tmpRect = QRect( x, y, w, h );
+ //      if ( str != m_imPreeditText ) {  // ugly hack
+ //        tmpRect.setLeft( tmpRect.left() + font_w );
+ //        tmpRect.setWidth( tmpRect.width() + font_w );
+ //      }
  
!        paint.fillRect( tmpRect, Qt::darkGray );   // currently use hard code color
        }
      }
    }
  
***************
*** 791,796 ****
--- 793,806 ----
      // fprintf(stderr, "x/y = %d/%d\txpos/ypos = %d/%d\n", curx, cury, xpos, ypos);
      m_cursorLine = cury;
      m_cursorCol = curx;
+     if (m_imStart == m_imEnd)
+     {
+ //
+ //  Ok, now event queue being flushed
+ //
+ 	m_imEnd = m_imStart = 0;
+ 	m_imStartLine = 0;
+     }
  }
  
  /*!
***************
*** 837,849 ****
      // Two extra so that we don't have to have to care about start and end conditions
      for (x = 0; x < cols; x++)
      {
! 	if ( ( (m_imPreeditLength > 0) && ( ( m_imStartLine == y )
! 	      && ( ( m_imStart < m_imEnd ) && ( ( x > m_imStart ) ) && ( x < m_imEnd ) )
!               || ( ( m_imSelStart < m_imSelEnd ) && ( ( x > m_imSelStart ) ) ) ) )
!             || ext[x] != lcl[x])
!       {
!          dirtyMask[x] = dirtyMask[x+1] = dirtyMask[x+2] = 1;
!       }
      }
      dirtyMask++; // Position correctly
  
--- 847,863 ----
      // Two extra so that we don't have to have to care about start and end conditions
      for (x = 0; x < cols; x++)
      {
!         if (ext[x] != lcl[x])
!         {
! 		 dirtyMask[x] = dirtyMask[x+1] = dirtyMask[x+2] = 1;
! 	}
! 	else if (m_imStart < m_imEnd && y >= m_imStartLine)
!         {
! 		int pos;
!                 pos = (y - m_imStartLine) * cols + x;
!                 if (m_imStart < pos && pos < m_imEnd) 
! 		        dirtyMask[x] = dirtyMask[x+1] = dirtyMask[x+2] = 1;
!         }
      }
      dirtyMask++; // Position correctly
  
***************
*** 869,874 ****
--- 883,893 ----
          int lln = cols - x;
          for (len = 1; len < lln; len++)
          {
+ 	  // We never cross the boundary of the preedit area
+           if (m_imStart < m_imEnd && 
+ 	      (((x + len) == m_imStart) || (x + len) == m_imEnd))
+ 			break;
+ 
            c = ext[x+len].c;
            if (!c)
              continue; // Skip trailing part of multi-col chars.
***************
*** 884,889 ****
--- 903,909 ----
  
          // for XIM on the spot input style
          m_isIMEdit = m_isIMSel = false;
+ #if	0
          if ( m_imStartLine == y ) {
            if ( ( m_imStart < m_imEnd ) && ( x >= m_imStart-1 ) && ( x + int( unistr.length() ) <= m_imEnd ) )
              m_isIMEdit = true;
***************
*** 898,903 ****
--- 918,939 ----
            if ( ( m_imSelStart < m_imSelEnd ) )
              m_isIMSel = true;
  	}
+ #else
+ 	if (m_imStart < m_imEnd && y >= m_imStartLine)
+ 	{
+ 		int realsx, realex;
+ 		realsx = x + (y - m_imStartLine) * cols;
+ 		realex = realsx + string_width(unistr);
+ 		//realex = realsx + int(unistr.length());
+           	if (!(realex <= m_imStart || realsx >= m_imEnd))
+ 		{
+ 		    m_isIMEdit = true;
+                     if (m_imSelStart < m_imSelEnd && 
+           	        (!(realex <= m_imSelStart || realsx >= m_imSelEnd)))
+ 			    m_isIMSel = true;
+ 		}
+ 	}
+ #endif
  
          bool save_fixed_font = fixed_font;
          if (lineDraw)
***************
*** 1921,1931 ****
  
  void TEWidget::imStartEvent( QIMEvent */*e*/ )
  {
!   m_imStart = m_cursorCol;
!   m_imStartLine = m_cursorLine;
    m_imPreeditLength = 0;
  
!   m_imEnd = m_imSelStart = m_imSelEnd = 0;
    m_isIMEdit = m_isIMSel = false;
  }
  
--- 1957,1975 ----
  
  void TEWidget::imStartEvent( QIMEvent */*e*/ )
  {
!  //
!  // m_imStart == 0 && m_imStartLine == 0 mean that the event queue
!  // is empty, thus we can trust the cursor position.
!  //
!   if (m_imStart == 0 && m_imStartLine == 0)
!   {
! 	  m_imStart = m_cursorCol;
! 	  m_imStartLine = m_cursorLine;
!   }
    m_imPreeditLength = 0;
  
!   m_imEnd = m_imStart;
!   m_imSelStart = m_imSelEnd = 0;
    m_isIMEdit = m_isIMSel = false;
  }
  
***************
*** 1944,1949 ****
--- 1988,1995 ----
    tmpStr = e->text().mid( e->cursorPos(), e->selectionLength() );
    m_imSelEnd = m_imSelStart + string_width( tmpStr );
    m_imPreeditLength = e->text().length();
+   if (e->cursorPos() < m_imPreeditLength && m_imSelStart == m_imSelEnd)
+ 		m_imSelEnd = m_imSelStart + 1;
    m_imPreeditText = e->text();
    text += e->text();
  
***************
*** 1956,1983 ****
  void TEWidget::imEndEvent( QIMEvent *e )
  {
    QString text = QString::null;
    if ( m_imPreeditLength > 0 ) {
        text.fill( '\010', m_imPreeditLength );
    }
  
!   m_imEnd = m_imSelStart = m_imSelEnd = 0;
    text += e->text();
    if ( text.length() > 0 ) {
      QKeyEvent ke( QEvent::KeyPress, 0, -1, 0, text );
      emit keyPressedSignal( &ke );
    }
  
    QPoint tL  = contentsRect().topLeft();
    int tLx = tL.x();
    int tLy = tL.y();
! 
!   QRect repaintRect = QRect( bX+tLx, bY+tLy+font_h*m_imStartLine,
                               contentsRect().width(), contentsRect().height() );
!   m_imStart = 0;
!   m_imPreeditLength = 0;
! 
!   m_isIMEdit = m_isIMSel = false;
!   repaint( repaintRect, true );
  }
  
  // Override any Ctrl+<key> accelerator when pressed with the keyboard
--- 2002,2049 ----
  void TEWidget::imEndEvent( QIMEvent *e )
  {
    QString text = QString::null;
+   int prevstart, prevlen;
    if ( m_imPreeditLength > 0 ) {
        text.fill( '\010', m_imPreeditLength );
    }
  
! //
! // Calculte the true cursor position for the next im_imStart
! // in case of the non empty event queue.
! //
!   prevstart = m_imStart;
!   prevlen = m_imEnd - m_imStart + 2;
!   if (prevlen < 2)
! 	prevlen = 2;
!   m_imStart += string_width(e->text());
!   m_imEnd = m_imStart;
!   m_imSelStart = m_imSelEnd = 0;
!   
    text += e->text();
    if ( text.length() > 0 ) {
      QKeyEvent ke( QEvent::KeyPress, 0, -1, 0, text );
      emit keyPressedSignal( &ke );
    }
  
+   m_imPreeditLength = 0;
+   m_isIMEdit = m_isIMSel = false;
+ 
    QPoint tL  = contentsRect().topLeft();
    int tLx = tL.x();
    int tLy = tL.y();
!   if (prevlen + prevstart <= this->columns)	// This is wrong!
!   {
! 	QRect repaintRect = QRect( bX+tLx + font_w * prevstart, 
! 			     bY+tLy+font_h*m_imStartLine,
!                              font_w * prevlen, font_h);
!   	repaint( repaintRect, true );
!   }
!   else
!   {
!   	QRect repaintRect = QRect( bX+tLx, bY+tLy+font_h*m_imStartLine,
                               contentsRect().width(), contentsRect().height() );
!   	repaint( repaintRect, true );
!   }
  }
  
  // Override any Ctrl+<key> accelerator when pressed with the keyboard

*** konsole/konsole/TEWidget.cpp.ORG	2007-11-21 18:28:36.000000000 +0900
--- konsole/konsole/TEWidget.cpp	2007-11-23 03:50:03.667000000 +0900
***************
*** 373,381 ****
  ,rimY(1)
  ,m_imPreeditText(QString::null)
  ,m_imPreeditLength(0)
! ,m_imStart(0)
  ,m_imStartLine(0)
! ,m_imEnd(0)
  ,m_imSelStart(0)
  ,m_imSelEnd(0)
  ,m_cursorLine(0)
--- 373,381 ----
  ,rimY(1)
  ,m_imPreeditText(QString::null)
  ,m_imPreeditLength(0)
! ,m_imStart(-1)
  ,m_imStartLine(0)
! ,m_imEnd(-1)
  ,m_imSelStart(0)
  ,m_imSelEnd(0)
  ,m_cursorLine(0)
***************
*** 644,673 ****
            paint.fillRect(rect, bColor);
      }
  
!     QString tmpStr = str.simplifyWhiteSpace();
!     if ( m_isIMEdit && !tmpStr.isEmpty() ) { // imput method edit area background color
!       QRect tmpRect = rect;
!       if ( str != m_imPreeditText ) {  // ugly hack
!         tmpRect.setLeft( tmpRect.left() + font_w );
!         tmpRect.setWidth( tmpRect.width() + font_w );
!       }
! 
!       paint.fillRect( tmpRect, Qt::darkCyan );  // currently use hard code color
!     }
  
!     if ( m_isIMSel && !tmpStr.isEmpty() ) { // imput method selection background color
!       int x = rect.left() + ( font_w * (m_imSelStart - m_imStart) );
!       int y = rect.top();
!       int w = font_w * (m_imSelEnd - m_imSelStart);
!       int h = font_h;
! 
!       QRect tmpRect = QRect( x, y, w, h );
!       if ( str != m_imPreeditText ) {  // ugly hack
!         tmpRect.setLeft( tmpRect.left() + font_w );
!         tmpRect.setWidth( tmpRect.width() + font_w );
        }
- 
-       paint.fillRect( tmpRect, Qt::darkGray );   // currently use hard code color
      }
    }
  
--- 644,663 ----
            paint.fillRect(rect, bColor);
      }
  
!     if (m_isIMEdit && str.length() > 0)
!       paint.fillRect(rect, Qt::darkCyan );  // currently use hard code color
  
!     if ( m_isIMSel && str.length() > 0) 
!     { // imput method selection background color
!       if (m_imSelEnd - m_imSelStart == 1) //  The fake cursor case
!       {
!       	   QRect tmpRect = QRect(rect.left(), rect.top(), font_w,  font_h);
!            paint.fillRect( tmpRect, Qt::darkGray );   
!       }
!       else
!       {
!            paint.fillRect(rect, Qt::darkGray );   // currently use hard code color
        }
      }
    }
  
***************
*** 791,796 ****
--- 781,792 ----
      // fprintf(stderr, "x/y = %d/%d\txpos/ypos = %d/%d\n", curx, cury, xpos, ypos);
      m_cursorLine = cury;
      m_cursorCol = curx;
+     // OK, now the event queue is going to be flushed.
+     if (m_imStart == m_imEnd)
+     {
+ 	m_imEnd = m_imStart = -1;
+ 	m_imStartLine = 0;
+     }
  }
  
  /*!
***************
*** 825,830 ****
--- 821,842 ----
    char *dirtyMask = (char *) malloc(cols+2);
  
  //{ static int cnt = 0; printf("setImage %d\n",cnt++); }
+   int imstart = -1, imend = 0;
+   int imselstart = -1, imselend = 0;
+   int abspos = 0;
+   if (m_imStart < m_imEnd)
+   {
+ 	int xpos = cols * m_imStartLine;
+ 	imstart = xpos + m_imStart;
+ 	imend = xpos + m_imEnd;
+         if (m_imSelStart < m_imSelEnd)
+ 	{
+ 		imselstart = xpos + m_imSelStart;
+ 		imselend = xpos + m_imSelEnd;
+ 	}
+   }
+ 	
+ 
    for (y = 0; y < lins; y++)
    {
      const ca*       lcl = &image[y*this->columns];
***************
*** 834,854 ****
      // mark surrounding neighbours dirty, in case the character exceeds
      // its cell boundaries
      memset(dirtyMask, 0, cols+2);
      // Two extra so that we don't have to have to care about start and end conditions
!     for (x = 0; x < cols; x++)
      {
! 	if ( ( (m_imPreeditLength > 0) && ( ( m_imStartLine == y )
! 	      && ( ( m_imStart < m_imEnd ) && ( ( x > m_imStart ) ) && ( x < m_imEnd ) )
!               || ( ( m_imSelStart < m_imSelEnd ) && ( ( x > m_imSelStart ) ) ) ) )
!             || ext[x] != lcl[x])
!       {
!          dirtyMask[x] = dirtyMask[x+1] = dirtyMask[x+2] = 1;
!       }
      }
      dirtyMask++; // Position correctly
  
      if (!resizing) // not while resizing, we're expecting a paintEvent
!     for (x = 0; x < cols; x++)
      {
        hasBlinker |= (ext[x].r & RE_BLINK);
        // Start drawing if this character or the next one differs.
--- 846,886 ----
      // mark surrounding neighbours dirty, in case the character exceeds
      // its cell boundaries
      memset(dirtyMask, 0, cols+2);
+ 
+     // Ajust the end positions of the input area for wrapping cases.
+     abspos = y * cols;
+     int xpos = abspos + cols - 1;
+     if (imstart >= 0 && ext[cols - 1].c == '>' &&
+         imstart <= xpos && xpos < imend)
+     {
+ 		imend ++;
+         	if (imselstart >= 0)
+                 {
+ 			if (xpos <= imselstart)
+ 				imselstart ++;
+ 		        if (xpos < imselend)
+ 				imselend ++;
+ 		}
+     }
+    
      // Two extra so that we don't have to have to care about start and end conditions
!     for (x = 0; x < cols; x++, abspos ++)
      {
!         if (ext[x] != lcl[x])
!         {
! 		 dirtyMask[x] = dirtyMask[x+1] = dirtyMask[x+2] = 1;
! 	}
! 	else if (imstart >= 0)
!         {
!                 if (imstart < abspos && abspos < imend) 
! 		        dirtyMask[x] = dirtyMask[x+1] = dirtyMask[x+2] = 1;
!         }
      }
      dirtyMask++; // Position correctly
  
+     abspos = y * cols;
      if (!resizing) // not while resizing, we're expecting a paintEvent
!     for (x = 0; x < cols; x++, abspos ++)
      {
        hasBlinker |= (ext[x].r & RE_BLINK);
        // Start drawing if this character or the next one differs.
***************
*** 873,878 ****
--- 905,922 ----
            if (!c)
              continue; // Skip trailing part of multi-col chars.
  
+ 	  // We never cross the boundary of the preedit area
+           if (imstart >= 0)
+ 	  { 
+ 		if (abspos + len == imstart || abspos + len == imend)
+ 			break;
+ 		  // We also never cross the boundary of the selection area,
+ 		  // however, we should remark the case of a fake cursor.
+ 		  if (imselstart >= 0 &&
+ 		      (abspos + len == imselstart || abspos + len == imselend))
+ 			break;
+           }
+ 
            if (ext[x+len].f != cf || ext[x+len].b != cb || ext[x+len].r != cr ||
                !dirtyMask[x+len] || isLineChar(c) != lineDraw || (ext[x+len+1].c == 0) != doubleWidth)
              break;
***************
*** 884,889 ****
--- 928,934 ----
  
          // for XIM on the spot input style
          m_isIMEdit = m_isIMSel = false;
+ #if	0
          if ( m_imStartLine == y ) {
            if ( ( m_imStart < m_imEnd ) && ( x >= m_imStart-1 ) && ( x + int( unistr.length() ) <= m_imEnd ) )
              m_isIMEdit = true;
***************
*** 898,903 ****
--- 943,961 ----
            if ( ( m_imSelStart < m_imSelEnd ) )
              m_isIMSel = true;
  	}
+ #else
+ 	// Check the segment cotaining a part of the input area.
+ 	if (imstart >= 0)
+ 	{
+           	if (imstart <= abspos  && abspos < imend)
+ 		{
+ 		    m_isIMEdit = true;
+                     if (imselstart >= 0 &&
+           	        imselstart <= abspos && abspos < imselend)
+ 			    m_isIMSel = true;
+ 		}
+ 	}
+ #endif
  
          bool save_fixed_font = fixed_font;
          if (lineDraw)
***************
*** 909,914 ****
--- 967,973 ----
                      unistr, &ext[x], pm != NULL, true);
          fixed_font = save_fixed_font;
          x += len - 1;
+         abspos += len - 1;
        }
      }
  
***************
*** 1921,1931 ****
  
  void TEWidget::imStartEvent( QIMEvent */*e*/ )
  {
!   m_imStart = m_cursorCol;
!   m_imStartLine = m_cursorLine;
    m_imPreeditLength = 0;
  
!   m_imEnd = m_imSelStart = m_imSelEnd = 0;
    m_isIMEdit = m_isIMSel = false;
  }
  
--- 1980,1998 ----
  
  void TEWidget::imStartEvent( QIMEvent */*e*/ )
  {
!  //
!  // m_imStart == -1 && m_imStartLine == 0 mean that the event queue
!  // is empty, thus we can trust the cursor position.
!  //
!   if (m_imStart == -1 && m_imStartLine == 0)
!   {
! 	  m_imStart = m_cursorCol;
! 	  m_imStartLine = m_cursorLine;
!   }
    m_imPreeditLength = 0;
  
!   m_imEnd = m_imStart;
!   m_imSelStart = m_imSelEnd = 0;
    m_isIMEdit = m_isIMSel = false;
  }
  
***************
*** 1944,1949 ****
--- 2011,2018 ----
    tmpStr = e->text().mid( e->cursorPos(), e->selectionLength() );
    m_imSelEnd = m_imSelStart + string_width( tmpStr );
    m_imPreeditLength = e->text().length();
+   if (e->cursorPos() < m_imPreeditLength && m_imSelStart == m_imSelEnd)
+ 		m_imSelEnd = m_imSelStart + 1;
    m_imPreeditText = e->text();
    text += e->text();
  
***************
*** 1951,1983 ****
      QKeyEvent ke( QEvent::KeyPress, 0, -1, 0, text );
      emit keyPressedSignal( &ke );
    }
  }
  
  void TEWidget::imEndEvent( QIMEvent *e )
  {
    QString text = QString::null;
    if ( m_imPreeditLength > 0 ) {
        text.fill( '\010', m_imPreeditLength );
    }
  
!   m_imEnd = m_imSelStart = m_imSelEnd = 0;
    text += e->text();
    if ( text.length() > 0 ) {
      QKeyEvent ke( QEvent::KeyPress, 0, -1, 0, text );
      emit keyPressedSignal( &ke );
    }
  
    QPoint tL  = contentsRect().topLeft();
    int tLx = tL.x();
    int tLy = tL.y();
! 
!   QRect repaintRect = QRect( bX+tLx, bY+tLy+font_h*m_imStartLine,
                               contentsRect().width(), contentsRect().height() );
!   m_imStart = 0;
!   m_imPreeditLength = 0;
! 
!   m_isIMEdit = m_isIMSel = false;
!   repaint( repaintRect, true );
  }
  
  // Override any Ctrl+<key> accelerator when pressed with the keyboard
--- 2020,2094 ----
      QKeyEvent ke( QEvent::KeyPress, 0, -1, 0, text );
      emit keyPressedSignal( &ke );
    }
+ 
+ #if	0
+   printf("%d %d %d %d %d: %d %d \n", 
+          m_imStart, m_imEnd, m_imPreeditLength, m_imSelStart, m_imSelEnd,
+ 	 e->cursorPos(), e->selectionLength());
+ #endif
  }
  
  void TEWidget::imEndEvent( QIMEvent *e )
  {
    QString text = QString::null;
+   int prevstart, prevlen;
    if ( m_imPreeditLength > 0 ) {
        text.fill( '\010', m_imPreeditLength );
    }
  
! //
! // Calculte the true cursor position for the next im_start 
! // in case of the non empty event queue
! //
!   prevstart = m_imStart;
!   prevlen = m_imEnd - m_imStart + 2;
!   if (prevlen < 2)
! 	prevlen = 2;
! 
!   uint i, cols = this->columns;	/* XXX: A bad assumption!! */
!   int xres, xlen, xpos = m_imStart; 
! #if	1
!   for (i = 0; i < e->text().length(); i ++)
!   {
! 	xlen = konsole_wcwidth(e->text()[i].unicode());
! 	xres = cols - (xpos % cols);
! 	if (xres < xlen)
! 		xpos += xres;
! 	xpos += xlen;
!   }
! #else
!   xpos += string_width(e->text());
! #endif
!   m_imStart = (xpos % cols);
!   m_imEnd = m_imStart;
!   m_imStartLine += (xpos / cols);
!   m_imSelStart = m_imSelEnd = 0;
!   
    text += e->text();
    if ( text.length() > 0 ) {
      QKeyEvent ke( QEvent::KeyPress, 0, -1, 0, text );
      emit keyPressedSignal( &ke );
    }
  
+   m_imPreeditLength = 0;
+   m_isIMEdit = m_isIMSel = false;
+ 
    QPoint tL  = contentsRect().topLeft();
    int tLx = tL.x();
    int tLy = tL.y();
!   if (prevlen + prevstart <= cols)	// This is wrong!
!   {
! 	QRect repaintRect = QRect( bX+tLx + font_w * prevstart, 
! 			     bY+tLy+font_h*m_imStartLine,
!                              font_w * prevlen, font_h);
!   	repaint( repaintRect, true );
!   }
!   else
!   {
!   	QRect repaintRect = QRect( bX+tLx, bY+tLy+font_h*m_imStartLine,
                               contentsRect().width(), contentsRect().height() );
!   	repaint( repaintRect, true );
!   }
  }
  
  // Override any Ctrl+<key> accelerator when pressed with the keyboard
*** konsole/konsole/konsole_wcwidth.cpp.ORG	2007-11-21 18:28:55.000000000 +0900
--- konsole/konsole/konsole_wcwidth.cpp	2007-11-23 02:53:39.507000000 +0900
***************
*** 65,71 ****
   * in ISO 10646.
   */
  
! int konsole_wcwidth(Q_UINT16 ucs)
  {
    /* sorted list of non-overlapping intervals of non-spacing characters */
    static const struct interval combining[] = {
--- 65,72 ----
   * in ISO 10646.
   */
  
! static int __konsole_wcwidth(Q_UINT16);
! static int __konsole_wcwidth(Q_UINT16 ucs)
  {
    /* sorted list of non-overlapping intervals of non-spacing characters */
    static const struct interval combining[] = {
***************
*** 131,137 ****
        (ucs >= 0x20000 && ucs <= 0x2ffff) */));
  }
  
! #if 0
  /*
   * The following function is the same as konsole_wcwidth(), except that
   * spacing characters in the East Asian Ambiguous (A) category as
--- 132,138 ----
        (ucs >= 0x20000 && ucs <= 0x2ffff) */));
  }
  
! #if 1
  /*
   * The following function is the same as konsole_wcwidth(), except that
   * spacing characters in the East Asian Ambiguous (A) category as
***************
*** 140,146 ****
   * encodings who want to migrate to UCS. It is not otherwise
   * recommended for general use.
   */
! int konsole_wcwidth_cjk(Q_UINT16 ucs)
  {
    /* sorted list of non-overlapping intervals of East Asian Ambiguous
     * characters */
--- 141,147 ----
   * encodings who want to migrate to UCS. It is not otherwise
   * recommended for general use.
   */
! int konsole_wcwidth(Q_UINT16 ucs)
  {
    /* sorted list of non-overlapping intervals of East Asian Ambiguous
     * characters */
***************
*** 184,190 ****
      { 0x226E, 0x226F }, { 0x2282, 0x2283 }, { 0x2286, 0x2287 },
      { 0x2295, 0x2295 }, { 0x2299, 0x2299 }, { 0x22A5, 0x22A5 },
      { 0x22BF, 0x22BF }, { 0x2312, 0x2312 }, { 0x2460, 0x24BF },
!     { 0x24D0, 0x24E9 }, { 0x2500, 0x254B }, { 0x2550, 0x2574 },
      { 0x2580, 0x258F }, { 0x2592, 0x2595 }, { 0x25A0, 0x25A1 },
      { 0x25A3, 0x25A9 }, { 0x25B2, 0x25B3 }, { 0x25B6, 0x25B7 },
      { 0x25BC, 0x25BD }, { 0x25C0, 0x25C1 }, { 0x25C6, 0x25C8 },
--- 185,195 ----
      { 0x226E, 0x226F }, { 0x2282, 0x2283 }, { 0x2286, 0x2287 },
      { 0x2295, 0x2295 }, { 0x2299, 0x2299 }, { 0x22A5, 0x22A5 },
      { 0x22BF, 0x22BF }, { 0x2312, 0x2312 }, { 0x2460, 0x24BF },
!     { 0x24D0, 0x24E9 }, 
! #if	0	// Graphic line chars 
!     { 0x2500, 0x254B }, 
! #endif
!     { 0x2550, 0x2574 },
      { 0x2580, 0x258F }, { 0x2592, 0x2595 }, { 0x25A0, 0x25A1 },
      { 0x25A3, 0x25A9 }, { 0x25B2, 0x25B3 }, { 0x25B6, 0x25B7 },
      { 0x25BC, 0x25BD }, { 0x25C0, 0x25C1 }, { 0x25C6, 0x25C8 },
***************
*** 202,208 ****
  	       sizeof(ambiguous) / sizeof(struct interval) - 1))
      return 2;
  
!   return konsole_wcwidth(ucs);
  }
  #endif
  
--- 207,213 ----
  	       sizeof(ambiguous) / sizeof(struct interval) - 1))
      return 2;
  
!   return __konsole_wcwidth(ucs);
  }
  #endif
  

*** konsole/konsole/TEWidget.cpp.ORG	2007-11-21 18:28:36.000000000 +0900
--- konsole/konsole/TEWidget.cpp	2007-11-28 01:30:19.677000000 +0900
***************
*** 373,383 ****
  ,rimY(1)
  ,m_imPreeditText(QString::null)
  ,m_imPreeditLength(0)
! ,m_imStart(0)
  ,m_imStartLine(0)
! ,m_imEnd(0)
! ,m_imSelStart(0)
! ,m_imSelEnd(0)
  ,m_cursorLine(0)
  ,m_cursorCol(0)
  ,m_isIMEdit(false)
--- 373,383 ----
  ,rimY(1)
  ,m_imPreeditText(QString::null)
  ,m_imPreeditLength(0)
! ,m_imStart(-1)
  ,m_imStartLine(0)
! ,m_imEnd(-1)
! ,m_imSelStart(-1)
! ,m_imSelEnd(-1)
  ,m_cursorLine(0)
  ,m_cursorCol(0)
  ,m_isIMEdit(false)
***************
*** 643,674 ****
          } else
            paint.fillRect(rect, bColor);
      }
- 
-     QString tmpStr = str.simplifyWhiteSpace();
-     if ( m_isIMEdit && !tmpStr.isEmpty() ) { // imput method edit area background color
-       QRect tmpRect = rect;
-       if ( str != m_imPreeditText ) {  // ugly hack
-         tmpRect.setLeft( tmpRect.left() + font_w );
-         tmpRect.setWidth( tmpRect.width() + font_w );
-       }
- 
-       paint.fillRect( tmpRect, Qt::darkCyan );  // currently use hard code color
-     }
- 
-     if ( m_isIMSel && !tmpStr.isEmpty() ) { // imput method selection background color
-       int x = rect.left() + ( font_w * (m_imSelStart - m_imStart) );
-       int y = rect.top();
-       int w = font_w * (m_imSelEnd - m_imSelStart);
-       int h = font_h;
- 
-       QRect tmpRect = QRect( x, y, w, h );
-       if ( str != m_imPreeditText ) {  // ugly hack
-         tmpRect.setLeft( tmpRect.left() + font_w );
-         tmpRect.setWidth( tmpRect.width() + font_w );
-       }
- 
-       paint.fillRect( tmpRect, Qt::darkGray );   // currently use hard code color
-     }
    }
  
    // Paint cursor
--- 643,648 ----
***************
*** 791,796 ****
--- 765,774 ----
      // fprintf(stderr, "x/y = %d/%d\txpos/ypos = %d/%d\n", curx, cury, xpos, ypos);
      m_cursorLine = cury;
      m_cursorCol = curx;
+ 
+     // OK, now the event queue is going to be flushed.
+     if (m_imStart == m_imEnd && m_imSelStart < 0)
+ 	m_imEnd = m_imStart = -1;
  }
  
  /*!
***************
*** 798,804 ****
  
      The size of the new image may or may not match the size of the widget.
  */
! 
  void TEWidget::setImage(const ca* const newimg, int lines, int columns)
  {
    if (!image)
--- 776,803 ----
  
      The size of the new image may or may not match the size of the widget.
  */
! static bool __check_preedit(const int& cols, const int& lins,
! 	const int& imstartline, const int& imstart, const int& imend,
! 	const int& cx, const int& cy)
! {
! 	
! 	if (imstartline >= lins)
! 		return false;
! 	if (imend <= (lins - imstartline) * cols || cy <= lins - 2)
! 	{
! 	        int abspos = (cy - imstartline) * cols + cx;
! 		return (imstart  <= abspos && abspos < imend);
! 	}
! 	if (imend >= ((lins - imstartline) + 1) * cols)
! 		return true;
! 	//
! 	// Here the current conditions are cy == lins - 1 and
! 	// (lins - imstartline) * cols < imend < (lins - imstartline + 1) * cols
! 	//
! 	int selp = (imstartline == lins - 1) ? (imstart % cols) : 0;
! 	return (cx >= selp || cx < (imend % cols));
! }
! 	
  void TEWidget::setImage(const ca* const newimg, int lines, int columns)
  {
    if (!image)
***************
*** 834,849 ****
      // mark surrounding neighbours dirty, in case the character exceeds
      // its cell boundaries
      memset(dirtyMask, 0, cols+2);
      // Two extra so that we don't have to have to care about start and end conditions
!     for (x = 0; x < cols; x++)
!     {
! 	if ( ( (m_imPreeditLength > 0) && ( ( m_imStartLine == y )
! 	      && ( ( m_imStart < m_imEnd ) && ( ( x > m_imStart ) ) && ( x < m_imEnd ) )
!               || ( ( m_imSelStart < m_imSelEnd ) && ( ( x > m_imSelStart ) ) ) ) )
!             || ext[x] != lcl[x])
!       {
!          dirtyMask[x] = dirtyMask[x+1] = dirtyMask[x+2] = 1;
!       }
      }
      dirtyMask++; // Position correctly
  
--- 833,843 ----
      // mark surrounding neighbours dirty, in case the character exceeds
      // its cell boundaries
      memset(dirtyMask, 0, cols+2);
+ 
      // Two extra so that we don't have to have to care about start and end conditions
!     for (x = 0; x < cols; x++) {
!         if (ext[x] != lcl[x])
! 		 dirtyMask[x] = dirtyMask[x+1] = dirtyMask[x+2] = 1;
      }
      dirtyMask++; // Position correctly
  
***************
*** 857,862 ****
--- 851,859 ----
        if (dirtyMask[x])
        {
          Q_UINT16 c = ext[x+0].c;
+ 	if (m_imEnd > m_imStart && __check_preedit(cols, lins, 
+ 		m_imStartLine, m_imStart, m_imEnd, x, y) == true)
+ 		continue;
          if ( !c )
              continue;
          int p = 0;
***************
*** 873,878 ****
--- 870,879 ----
            if (!c)
              continue; // Skip trailing part of multi-col chars.
  
+ 	  if (m_imEnd > m_imStart && __check_preedit(cols, lins, 
+ 		m_imStartLine, m_imStart, m_imEnd, x + len, y) == true)
+ 		break;
+ 
            if (ext[x+len].f != cf || ext[x+len].b != cb || ext[x+len].r != cr ||
                !dirtyMask[x+len] || isLineChar(c) != lineDraw || (ext[x+len+1].c == 0) != doubleWidth)
              break;
***************
*** 882,904 ****
  
          QString unistr(disstrU, p);
  
-         // for XIM on the spot input style
-         m_isIMEdit = m_isIMSel = false;
-         if ( m_imStartLine == y ) {
-           if ( ( m_imStart < m_imEnd ) && ( x >= m_imStart-1 ) && ( x + int( unistr.length() ) <= m_imEnd ) )
-             m_isIMEdit = true;
- 
-           if ( ( m_imSelStart < m_imSelEnd ) && ( x >= m_imStart-1 ) && ( x + int( unistr.length() ) <= m_imEnd ) )
-             m_isIMSel = true;
- 	}
-         else if ( m_imStartLine < y ) {  // for word worp
-           if ( ( m_imStart < m_imEnd ) )
-             m_isIMEdit = true;
- 
-           if ( ( m_imSelStart < m_imSelEnd ) )
-             m_isIMSel = true;
- 	}
- 
          bool save_fixed_font = fixed_font;
          if (lineDraw)
             fixed_font = false;
--- 883,888 ----
***************
*** 1921,1983 ****
  
  void TEWidget::imStartEvent( QIMEvent */*e*/ )
  {
!   m_imStart = m_cursorCol;
!   m_imStartLine = m_cursorLine;
    m_imPreeditLength = 0;
  
!   m_imEnd = m_imSelStart = m_imSelEnd = 0;
    m_isIMEdit = m_isIMSel = false;
  }
  
  void TEWidget::imComposeEvent( QIMEvent *e )
  {
!   QString text = QString::null;
!   if ( m_imPreeditLength > 0 ) {
!     text.fill( '\010', m_imPreeditLength );
    }
  
!   m_imEnd = m_imStart + string_width( e->text() );
  
!   QString tmpStr = e->text().left( e->cursorPos() );
!   m_imSelStart = m_imStart + string_width( tmpStr );
  
-   tmpStr = e->text().mid( e->cursorPos(), e->selectionLength() );
-   m_imSelEnd = m_imSelStart + string_width( tmpStr );
-   m_imPreeditLength = e->text().length();
    m_imPreeditText = e->text();
!   text += e->text();
  
!   if ( text.length() > 0 ) {
!     QKeyEvent ke( QEvent::KeyPress, 0, -1, 0, text );
!     emit keyPressedSignal( &ke );
!   }
  }
  
  void TEWidget::imEndEvent( QIMEvent *e )
  {
-   QString text = QString::null;
-   if ( m_imPreeditLength > 0 ) {
-       text.fill( '\010', m_imPreeditLength );
-   }
  
!   m_imEnd = m_imSelStart = m_imSelEnd = 0;
!   text += e->text();
!   if ( text.length() > 0 ) {
!     QKeyEvent ke( QEvent::KeyPress, 0, -1, 0, text );
!     emit keyPressedSignal( &ke );
    }
! 
    QPoint tL  = contentsRect().topLeft();
    int tLx = tL.x();
    int tLy = tL.y();
  
!   QRect repaintRect = QRect( bX+tLx, bY+tLy+font_h*m_imStartLine,
!                              contentsRect().width(), contentsRect().height() );
!   m_imStart = 0;
!   m_imPreeditLength = 0;
  
    m_isIMEdit = m_isIMSel = false;
!   repaint( repaintRect, true );
  }
  
  // Override any Ctrl+<key> accelerator when pressed with the keyboard
--- 1905,2207 ----
  
  void TEWidget::imStartEvent( QIMEvent */*e*/ )
  {
! //#define	IM_EVENT_DEBUG 0
! #ifdef	IM_EVENT_DEBUG
!   printf("Start: %d %d %d %d %d \n", 
!          m_imStart, m_imEnd, m_imPreeditLength, m_imSelStart, m_imSelEnd);
! #endif
! 
!  //
!  // The m_imStart < 0  means that the event queue
!  // is empty, thus we can trust the cursor position.
!  // Moreover m_imStart == m_imEnd implies that
!  // we have any preedit string currently or commited that already.
!  //
    m_imPreeditLength = 0;
+   m_imEnd = m_imStart;
  
!  //
!  // The m_imSelStart >= 0 means the IM state is now proceeding
!  // from "changed callbacks" to "end callback"
!  //
!   m_imSelStart = m_imSelEnd = -1;
    m_isIMEdit = m_isIMSel = false;
  }
  
  void TEWidget::imComposeEvent( QIMEvent *e )
  {
! 
!   if (m_imStart < 0)
!   {
! 	  m_imEnd = m_imStart = (m_cursorCol % columns);
! 	  m_imStartLine = m_cursorLine;
!           m_imSelStart = m_imSelEnd = 0;
! #ifdef	IM_EVENT_DEBUG
!   printf("DelayStart(C): %d %d %d %d %d \n", 
!           m_imStart, m_imEnd, m_imPreeditLength, m_imSelStart, m_imSelEnd);
! #endif
!   }
! 
!   // Sanity check
!   if (m_imStart >= columns || m_imStartLine >= lines)
!   {
! 	printf("Changed: Strange m_imStart %d(%d) m_imStartLine %d(%d)\n",
! 		m_imStart, columns, m_imStartLine, lines);
! 	return;
!   }
!   // Setup the preedit region.
!   int oimEnd = m_imEnd;
!   m_imEnd = m_imStart;
!   m_imSelEnd = m_imSelStart;
! 
!   QPainter paint;
!   setUpdatesEnabled(false);
!   paint.begin( this );
!   QPoint tL  = contentsRect().topLeft();
!   int tLx = tL.x();
!   int tLy = tL.y();
!   QRect tmpRect;
! 
!   ca data[(columns + 2) * sizeof(ca)];
!   ca dft(' ',cacol(CO_DFT,DEFAULT_FORE_COLOR),
! 	     cacol(CO_DFT,DEFAULT_BACK_COLOR),DEFAULT_RENDITION);
! 
!   int wcwidth = 1, i, x, xpos;
!   for (i = 0, x = m_imStart, xpos = 0; i < e->text().length(); )
!   {
!      	int p = 0;
!         int redraw_p = -1, redraw_x = -1;
!      	QChar disstrU[columns + 2];
! 
!         wcwidth = konsole_wcwidth(e->text()[i].unicode());
!      	for ( ; x < columns && i < e->text().length(); i++)
!      	{
!             Q_UINT16 c, tmpwcwidth;
! 
! 	    c = e->text()[i].unicode();
!             tmpwcwidth = konsole_wcwidth(c);
! 	    if (wcwidth != tmpwcwidth)
! 		break;
! 	    
! 	    // Check a selection start point.
! 	    if (i == e->cursorPos())
! 	    {
! 		m_imSelStart = xpos + x;
! 		m_imSelEnd = m_imSelStart + lines * columns;	/* XXX */
! 	    }
! #define	FAST_REDRAW "yes"
! #ifdef	FAST_REDRAW
! 	    if (redraw_x == -1)
! 	    {
! 		if ((e->cursorPos() < e->text().length() 
! 		     /* && i >= e->cursorPos()*/) ||
! 		    (i >= m_imPreeditLength || m_imPreeditText[i].unicode() != c))
! 	        {
! 		 	redraw_p = p; redraw_x = x;
! 	        }
!             }
! #else	/* !FAST_REDRAW */
! 	    if (redraw_x == -1)
! 	    {
! 		redraw_p = p; redraw_x = x;
! 	    }
! #endif	/* !FAST_REDRAW */
! 
!             data[x] = dft;
! 	    data[x++].c = c;
! 	    m_imEnd ++;
!             if (tmpwcwidth == 2)
!             {
! 		// Check the wrapping.
! 		if (x >= columns)
! 		{
! 		        disstrU[p ++] = data[x-1].c = ' ';
! 			break;
! 		}
! 		data[x] = dft;
! 		data[x++].c = 0;
! 	        m_imEnd ++;
! 	    }
! 
! 	    disstrU[p ++] = c;
! 
! 	    // Check a selection end point.
! 	    if ((i + 1) == e->cursorPos() + QMAX(1, e->selectionLength()))
! 		m_imSelEnd = xpos + x;
!      	}
! 
! 	int xlen;
! 	int y = QMIN(lines - 1, (m_imStartLine + (xpos/columns)));
! 
! #define	FONT_GAPS 0
! 	if (redraw_x >= 0 && x - redraw_x > 0)
! 	{
! 		tmpRect = QRect(bX + tLx + font_w * redraw_x,
! 			        bY + tLy + font_h * y, 
! 			        font_w * (x - redraw_x)+ FONT_GAPS, font_h);
! 		erase(tmpRect);
! 	}
! 
!      	if (redraw_p >= 0 && p - redraw_p > 0)
!      	{ 
! 		xlen = QMIN(x - redraw_x, m_imEnd - redraw_x - xpos);
! 		tmpRect = QRect(bX + tLx + font_w * redraw_x,
! 		                bY + tLy + font_h * y, font_w * xlen, font_h);
!                 paint.fillRect(tmpRect, Qt::darkCyan);   
! 
! 		if (m_imSelStart < m_imSelEnd &&
! 		   !(xpos + redraw_x >  m_imSelEnd ||
! 		     xpos + x <= m_imSelStart))
! 		{
! 			int sels = redraw_x;
! 			if (xpos + redraw_x <= m_imSelStart &&
! 			    m_imSelStart < xpos + x)
! 				sels = (m_imSelStart % columns);
! 			xlen = QMIN(x - sels,
! 				    m_imSelEnd - xpos - sels);
! 		        tmpRect = QRect(bX + tLx + font_w * sels,
! 		                        bY + tLy + font_h * y, 
! 					font_w * xlen, font_h);
!                         paint.fillRect(tmpRect, Qt::darkGray);   
! 		}
! 
!      		QString unistr(&disstrU[redraw_p], p - redraw_p);
! 		if (wcwidth == 2)
! 		{
!      			drawTextFixed(paint, bX + tLx + font_w * redraw_x,
! 		   		bY + tLy + font_h * y, unistr, &data[redraw_x]);
! 		}
! 		else
! 		{
!   			int a = font_a + m_lineSpacing / 2;
!       			paint.drawText(bX + tLx + font_w * redraw_x,
! 			        bY + tLy + font_h * y + a,
! 				unistr, -1, 
! 				bidiEnabled ? QPainter::Auto : QPainter::LTR );
! 		}
!      	}
! 
! 	if (x == columns)
! 	{
! 		x = 0;
! 		xpos += columns;
! 	}
    }
  
!   for ( ; xpos + x < oimEnd; x = 0, xpos += columns)
!   {
! 	int xlen = QMIN(columns - x, oimEnd - x - xpos);
! 	int y = QMIN(lines - 1, (m_imStartLine + (xpos/columns)));
  
!         tmpRect = QRect(bX + tLx + font_w * x,
! 		        bY + tLy + font_h * y, font_w * xlen, font_h);
!   	paintContents(paint, tmpRect, backgroundPixmap() != 0);
!   }
! 	 
!   drawFrame(&paint);
!   paint.end();
!   setUpdatesEnabled(true);
  
    m_imPreeditText = e->text();
!   m_imPreeditLength = m_imPreeditText.length();
  
! #ifdef	IM_EVENT_DEBUG
!   printf("Compose: %d %d %d %d %d: %d %d %d \n", 
!          m_imStart, m_imEnd, m_imPreeditLength, m_imSelStart, m_imSelEnd,
! 	 e->text().length(), e->cursorPos(), e->selectionLength());
! #endif
  }
  
  void TEWidget::imEndEvent( QIMEvent *e )
  {
  
!   if (m_imStart < 0)
!   {
! 	  m_imEnd = m_imStart = (m_cursorCol % columns);
! 	  m_imStartLine = m_cursorLine;
!           m_imSelStart = m_imSelEnd = 0;
! #ifdef	IM_EVENT_DEBUG
!   printf("DelayStart(E): %d %d %d %d %d \n", 
!          m_imStart, m_imEnd, m_imPreeditLength, m_imSelStart, m_imSelEnd);
! #endif
!   }
!   
!   // Sanity check
!   if (m_imStart >= columns || m_imStartLine >= lines)
!   {
! 	printf("Commit: Strange m_imStart %d(%d) m_imStartLine %d(%d)\n",
! 		m_imStart, columns, m_imStartLine, lines);
! 	return;
    }
!   
!   // Clear all preedit strings.
!   QPainter paint;
!   setUpdatesEnabled(false);
!   paint.begin( this );
    QPoint tL  = contentsRect().topLeft();
    int tLx = tL.x();
    int tLy = tL.y();
+   int cpos, cline, xlen;
  
!   for (cpos = m_imStart, cline = m_imStartLine;
!        cpos < m_imEnd; cline += 1, cpos += xlen)
!   {
! 	int spos, y;
! 
! 	y = QMIN(lines - 1, cline);
! 	if (cpos == m_imStart)
! 	{
! 		xlen = QMIN(columns - cpos, m_imEnd - cpos);
! 		spos = m_imStart;
! 	}
! 	else
!         {
! 	        xlen = QMIN(columns, m_imEnd - cpos);
! 		spos = 0;
! 	}
! 
! 	QRect tmpRect = QRect(bX + tLx + font_w * spos,
! 			bY + tLy + font_h * y, font_w * xlen, font_h);
! 	paintContents(paint, tmpRect, backgroundPixmap() != 0);
!   }
!   drawFrame(&paint);
!   paint.end();
!   setUpdatesEnabled(true);
! 
!   // Calculte the true cursor position for the next im_start 
!   // in case of the non empty event queue
!   int i, xpos;
! 
!   for (i = 0, xpos = m_imStart; i < (int) e->text().length(); i ++)
!   {
! 	int xres = columns - (xpos % columns);
! 	xlen = konsole_wcwidth(e->text()[i].unicode());
! 	if (xres < xlen)
! 		xpos += xres;
! 	xpos += xlen;
!   }
! 
!   // All informations are cleared here.
!   m_imStart = (xpos % columns);
!   m_imEnd = m_imStart;
!   m_imSelStart = m_imSelEnd = -1;
  
    m_isIMEdit = m_isIMSel = false;
!   m_imStartLine += (xpos / columns);
!   m_imPreeditLength = 0;
!   m_imPreeditText = QString::null;
!   
!   // Emit key events.
!   if (e->text().length() > 0 ) {
!       QKeyEvent ke( QEvent::KeyPress, 0, -1, 0, e->text());
!       emit keyPressedSignal( &ke );
!   }
! 
! #ifdef	IM_EVENT_DEBUG
!   printf("End: %d %d %d %d %d: %d %d %d \n", 
!          m_imStart, m_imEnd, m_imPreeditLength, m_imSelStart, m_imSelEnd,
! 	 e->text().length(), e->cursorPos(), e->selectionLength());
! #endif
  }
  
  // Override any Ctrl+<key> accelerator when pressed with the keyboard
*** konsole/konsole/konsole_wcwidth.cpp.ORG	2007-11-21 18:28:55.000000000 +0900
--- konsole/konsole/konsole_wcwidth.cpp	2007-11-23 02:53:39.507000000 +0900
***************
*** 65,71 ****
   * in ISO 10646.
   */
  
! int konsole_wcwidth(Q_UINT16 ucs)
  {
    /* sorted list of non-overlapping intervals of non-spacing characters */
    static const struct interval combining[] = {
--- 65,72 ----
   * in ISO 10646.
   */
  
! static int __konsole_wcwidth(Q_UINT16);
! static int __konsole_wcwidth(Q_UINT16 ucs)
  {
    /* sorted list of non-overlapping intervals of non-spacing characters */
    static const struct interval combining[] = {
***************
*** 131,137 ****
        (ucs >= 0x20000 && ucs <= 0x2ffff) */));
  }
  
! #if 0
  /*
   * The following function is the same as konsole_wcwidth(), except that
   * spacing characters in the East Asian Ambiguous (A) category as
--- 132,138 ----
        (ucs >= 0x20000 && ucs <= 0x2ffff) */));
  }
  
! #if 1
  /*
   * The following function is the same as konsole_wcwidth(), except that
   * spacing characters in the East Asian Ambiguous (A) category as
***************
*** 140,146 ****
   * encodings who want to migrate to UCS. It is not otherwise
   * recommended for general use.
   */
! int konsole_wcwidth_cjk(Q_UINT16 ucs)
  {
    /* sorted list of non-overlapping intervals of East Asian Ambiguous
     * characters */
--- 141,147 ----
   * encodings who want to migrate to UCS. It is not otherwise
   * recommended for general use.
   */
! int konsole_wcwidth(Q_UINT16 ucs)
  {
    /* sorted list of non-overlapping intervals of East Asian Ambiguous
     * characters */
***************
*** 184,190 ****
      { 0x226E, 0x226F }, { 0x2282, 0x2283 }, { 0x2286, 0x2287 },
      { 0x2295, 0x2295 }, { 0x2299, 0x2299 }, { 0x22A5, 0x22A5 },
      { 0x22BF, 0x22BF }, { 0x2312, 0x2312 }, { 0x2460, 0x24BF },
!     { 0x24D0, 0x24E9 }, { 0x2500, 0x254B }, { 0x2550, 0x2574 },
      { 0x2580, 0x258F }, { 0x2592, 0x2595 }, { 0x25A0, 0x25A1 },
      { 0x25A3, 0x25A9 }, { 0x25B2, 0x25B3 }, { 0x25B6, 0x25B7 },
      { 0x25BC, 0x25BD }, { 0x25C0, 0x25C1 }, { 0x25C6, 0x25C8 },
--- 185,195 ----
      { 0x226E, 0x226F }, { 0x2282, 0x2283 }, { 0x2286, 0x2287 },
      { 0x2295, 0x2295 }, { 0x2299, 0x2299 }, { 0x22A5, 0x22A5 },
      { 0x22BF, 0x22BF }, { 0x2312, 0x2312 }, { 0x2460, 0x24BF },
!     { 0x24D0, 0x24E9 }, 
! #if	0	// Graphic line chars 
!     { 0x2500, 0x254B }, 
! #endif
!     { 0x2550, 0x2574 },
      { 0x2580, 0x258F }, { 0x2592, 0x2595 }, { 0x25A0, 0x25A1 },
      { 0x25A3, 0x25A9 }, { 0x25B2, 0x25B3 }, { 0x25B6, 0x25B7 },
      { 0x25BC, 0x25BD }, { 0x25C0, 0x25C1 }, { 0x25C6, 0x25C8 },
***************
*** 202,208 ****
  	       sizeof(ambiguous) / sizeof(struct interval) - 1))
      return 2;
  
!   return konsole_wcwidth(ucs);
  }
  #endif
  
--- 207,213 ----
  	       sizeof(ambiguous) / sizeof(struct interval) - 1))
      return 2;
  
!   return __konsole_wcwidth(ucs);
  }
  #endif
  

*** konsole/konsole/TEWidget.cpp.ORG	2007-11-22 09:46:40.000000000 +0900
--- konsole/konsole/TEWidget.cpp	2007-11-30 16:42:17.000000000 +0900
***************
*** 329,334 ****
--- 329,337 ----
  /*                         Constructor / Destructor                          */
  /*                                                                           */
  /* ------------------------------------------------------------------------- */
+ #define	m_isIMForceRedraw m_isIMSel
+ #define	m_imCursorPos m_imPreeditLength
+ #define	m_imSelLen m_imStartLine
  
  TEWidget::TEWidget(QWidget *parent, const char *name)
  :QFrame(parent,name,WNoAutoErase)
***************
*** 372,387 ****
  ,rimX(1)
  ,rimY(1)
  ,m_imPreeditText(QString::null)
! ,m_imPreeditLength(0)
! ,m_imStart(0)
! ,m_imStartLine(0)
! ,m_imEnd(0)
  ,m_imSelStart(0)
  ,m_imSelEnd(0)
  ,m_cursorLine(0)
  ,m_cursorCol(0)
  ,m_isIMEdit(false)
! ,m_isIMSel(false)
  ,blend_color(qRgba(0,0,0,0xff))
  {
    // The offsets are not yet calculated.
--- 375,390 ----
  ,rimX(1)
  ,rimY(1)
  ,m_imPreeditText(QString::null)
! ,m_imPreeditLength(0)	// NOT USED! rename => m_imCursorPos
! ,m_imStart(-1)
! ,m_imStartLine(0)	// NOT USED! rename => m_imSelLen
! ,m_imEnd(-1)
  ,m_imSelStart(0)
  ,m_imSelEnd(0)
  ,m_cursorLine(0)
  ,m_cursorCol(0)
  ,m_isIMEdit(false)
! ,m_isIMSel(false)	// NOT USED! rename => m_isIMForceRedraw
  ,blend_color(qRgba(0,0,0,0xff))
  {
    // The offsets are not yet calculated.
***************
*** 643,674 ****
          } else
            paint.fillRect(rect, bColor);
      }
- 
-     QString tmpStr = str.simplifyWhiteSpace();
-     if ( m_isIMEdit && !tmpStr.isEmpty() ) { // imput method edit area background color
-       QRect tmpRect = rect;
-       if ( str != m_imPreeditText ) {  // ugly hack
-         tmpRect.setLeft( tmpRect.left() + font_w );
-         tmpRect.setWidth( tmpRect.width() + font_w );
-       }
- 
-       paint.fillRect( tmpRect, Qt::darkCyan );  // currently use hard code color
-     }
- 
-     if ( m_isIMSel && !tmpStr.isEmpty() ) { // imput method selection background color
-       int x = rect.left() + ( font_w * (m_imSelStart - m_imStart) );
-       int y = rect.top();
-       int w = font_w * (m_imSelEnd - m_imSelStart);
-       int h = font_h;
- 
-       QRect tmpRect = QRect( x, y, w, h );
-       if ( str != m_imPreeditText ) {  // ugly hack
-         tmpRect.setLeft( tmpRect.left() + font_w );
-         tmpRect.setWidth( tmpRect.width() + font_w );
-       }
- 
-       paint.fillRect( tmpRect, Qt::darkGray );   // currently use hard code color
-     }
    }
  
    // Paint cursor
--- 646,651 ----
***************
*** 791,796 ****
--- 768,780 ----
      // fprintf(stderr, "x/y = %d/%d\txpos/ypos = %d/%d\n", curx, cury, xpos, ypos);
      m_cursorLine = cury;
      m_cursorCol = curx;
+ 
+     // OK, now the event queue is going to be flushed.
+     if (m_imStart == m_imEnd)
+ 	m_imEnd = m_imStart = -1;
+     else if (m_isIMEdit == true && 
+ 	     m_imStart != m_cursorLine * columns + m_cursorCol)
+ 	  imComposeEvent(NULL);
  }
  
  /*!
***************
*** 798,804 ****
  
      The size of the new image may or may not match the size of the widget.
  */
! 
  void TEWidget::setImage(const ca* const newimg, int lines, int columns)
  {
    if (!image)
--- 782,808 ----
  
      The size of the new image may or may not match the size of the widget.
  */
! static bool __check_preedit(const int& cols, const int& lins,
! 	const int& imstart, const int& imend, const int& cx, const int& cy)
! {
! 	
! 	if (imstart/cols >= lins)
! 		return false;
! 	if (imend <= lins * cols || cy <= lins - 2)
! 	{
! 	        int abspos = cy * cols + cx;
! 		return (imstart  <= abspos && abspos < imend);
! 	}
! 	if (imend >= (lins + 1) * cols)
! 		return true;
! 	//
! 	// Here the current conditions are cy == lins - 1 and
! 	// lins * cols < imend < (lins + 1) * cols
! 	//
! 	int selp = (imstart/cols == lins - 1) ? (imstart % cols) : 0;
! 	return (cx >= selp || cx < (imend % cols));
! }
! 	
  void TEWidget::setImage(const ca* const newimg, int lines, int columns)
  {
    if (!image)
***************
*** 834,849 ****
      // mark surrounding neighbours dirty, in case the character exceeds
      // its cell boundaries
      memset(dirtyMask, 0, cols+2);
      // Two extra so that we don't have to have to care about start and end conditions
!     for (x = 0; x < cols; x++)
!     {
! 	if ( ( (m_imPreeditLength > 0) && ( ( m_imStartLine == y )
! 	      && ( ( m_imStart < m_imEnd ) && ( ( x > m_imStart ) ) && ( x < m_imEnd ) )
!               || ( ( m_imSelStart < m_imSelEnd ) && ( ( x > m_imSelStart ) ) ) ) )
!             || ext[x] != lcl[x])
!       {
!          dirtyMask[x] = dirtyMask[x+1] = dirtyMask[x+2] = 1;
!       }
      }
      dirtyMask++; // Position correctly
  
--- 838,848 ----
      // mark surrounding neighbours dirty, in case the character exceeds
      // its cell boundaries
      memset(dirtyMask, 0, cols+2);
+ 
      // Two extra so that we don't have to have to care about start and end conditions
!     for (x = 0; x < cols; x++) {
!         if (ext[x] != lcl[x])
! 		 dirtyMask[x] = dirtyMask[x+1] = dirtyMask[x+2] = 1;
      }
      dirtyMask++; // Position correctly
  
***************
*** 857,862 ****
--- 856,865 ----
        if (dirtyMask[x])
        {
          Q_UINT16 c = ext[x+0].c;
+ 	if (m_isIMEdit == true &&
+ 	    m_imEnd > m_imStart && __check_preedit(cols, lins, 
+ 	    m_imStart, m_imEnd, x, y) == true)
+ 		continue;
          if ( !c )
              continue;
          int p = 0;
***************
*** 873,878 ****
--- 876,886 ----
            if (!c)
              continue; // Skip trailing part of multi-col chars.
  
+ 	  if (m_isIMEdit == true && 
+ 	      m_imEnd > m_imStart && __check_preedit(cols, lins, 
+ 	      m_imStart, m_imEnd, x + len, y) == true)
+ 		break;
+ 
            if (ext[x+len].f != cf || ext[x+len].b != cb || ext[x+len].r != cr ||
                !dirtyMask[x+len] || isLineChar(c) != lineDraw || (ext[x+len+1].c == 0) != doubleWidth)
              break;
***************
*** 882,904 ****
  
          QString unistr(disstrU, p);
  
-         // for XIM on the spot input style
-         m_isIMEdit = m_isIMSel = false;
-         if ( m_imStartLine == y ) {
-           if ( ( m_imStart < m_imEnd ) && ( x >= m_imStart-1 ) && ( x + int( unistr.length() ) <= m_imEnd ) )
-             m_isIMEdit = true;
- 
-           if ( ( m_imSelStart < m_imSelEnd ) && ( x >= m_imStart-1 ) && ( x + int( unistr.length() ) <= m_imEnd ) )
-             m_isIMSel = true;
- 	}
-         else if ( m_imStartLine < y ) {  // for word worp
-           if ( ( m_imStart < m_imEnd ) )
-             m_isIMEdit = true;
- 
-           if ( ( m_imSelStart < m_imSelEnd ) )
-             m_isIMSel = true;
- 	}
- 
          bool save_fixed_font = fixed_font;
          if (lineDraw)
             fixed_font = false;
--- 890,895 ----
***************
*** 981,987 ****
      between the old and the new image. Instead, the internal
      image is used and the painting bound by the PaintEvent box.
  */
- 
  void TEWidget::paintEvent( QPaintEvent* pe )
  {
    const QPixmap* pm = backgroundPixmap();
--- 972,977 ----
***************
*** 1045,1050 ****
--- 1035,1046 ----
  
    paint.end();
    setUpdatesEnabled(true);
+ 
+   if (m_isIMEdit == true && /* m_isIMForceRedraw == true &&*/ m_imStart < m_imEnd)
+   {
+ 	  m_isIMForceRedraw = true;
+ 	  imComposeEvent(NULL);
+   }
  }
  
  void TEWidget::print(QPainter &paint, bool friendly, bool exact)
***************
*** 1105,1110 ****
--- 1101,1110 ----
      {
        int len = 1;
        int p = 0;
+       if (m_isIMEdit == true &&
+ 	  m_imEnd > m_imStart && __check_preedit(columns, lines, 
+ 	  m_imStart, m_imEnd, x, y) == true)
+ 		continue;
        c = image[loc(x,y)].c;
        if (c)
           disstrU[p++] = c; //fontMap(c);
***************
*** 1120,1125 ****
--- 1120,1129 ----
               (image[loc(x+len,y)+1].c == 0) == doubleWidth &&
               isLineChar( c = image[loc(x+len,y)].c) == lineDraw) // Assignment!
        {
+ 	if (m_isIMEdit == true && 
+ 	    m_imEnd > m_imStart && __check_preedit(columns, lines, 
+ 	    m_imStart, m_imEnd, x + len, y) == true)
+ 		break;
          if (c)
            disstrU[p++] = c; //fontMap(c);
          if (doubleWidth) // assert((image[loc(x+len,y)+1].c == 0)), see above if condition
***************
*** 1159,1165 ****
  void TEWidget::blinkCursorEvent()
  {
    cursorBlinking = !cursorBlinking;
!   repaint(cursorRect, true);
  }
  
  /* ------------------------------------------------------------------------- */
--- 1163,1170 ----
  void TEWidget::blinkCursorEvent()
  {
    cursorBlinking = !cursorBlinking;
!   if (m_isIMEdit == false)
! 	  repaint(cursorRect, true);
  }
  
  /* ------------------------------------------------------------------------- */
***************
*** 1735,1748 ****
  
  void TEWidget::focusInEvent( QFocusEvent * )
  {
!   repaint(cursorRect, true);  // *do* erase area, to get rid of the
                                // hollow cursor rectangle.
  }
  
  
  void TEWidget::focusOutEvent( QFocusEvent * )
  {
!   repaint(cursorRect, true);  // don't erase area
  }
  
  bool TEWidget::focusNextPrevChild( bool next )
--- 1740,1766 ----
  
  void TEWidget::focusInEvent( QFocusEvent * )
  {
! 
!   m_isIMForceRedraw = true;
!   if (m_isIMEdit == false)
!   {
! 	  repaint(cursorRect, true);  // *do* erase area, to get rid of the
                                // hollow cursor rectangle.
+   }
+   else
+   {
+ 	if (m_imStart < m_imEnd)
+ 		  imComposeEvent(NULL);
+   }
  }
  
  
  void TEWidget::focusOutEvent( QFocusEvent * )
  {
! 
!   m_isIMForceRedraw = true;
!   if (m_isIMEdit == false)
!   	repaint(cursorRect, true);  // don't erase area
  }
  
  bool TEWidget::focusNextPrevChild( bool next )
***************
*** 1921,1983 ****
  
  void TEWidget::imStartEvent( QIMEvent */*e*/ )
  {
!   m_imStart = m_cursorCol;
!   m_imStartLine = m_cursorLine;
!   m_imPreeditLength = 0;
! 
!   m_imEnd = m_imSelStart = m_imSelEnd = 0;
!   m_isIMEdit = m_isIMSel = false;
  }
  
  void TEWidget::imComposeEvent( QIMEvent *e )
  {
-   QString text = QString::null;
-   if ( m_imPreeditLength > 0 ) {
-     text.fill( '\010', m_imPreeditLength );
-   }
  
!   m_imEnd = m_imStart + string_width( e->text() );
  
!   QString tmpStr = e->text().left( e->cursorPos() );
!   m_imSelStart = m_imStart + string_width( tmpStr );
  
!   tmpStr = e->text().mid( e->cursorPos(), e->selectionLength() );
!   m_imSelEnd = m_imSelStart + string_width( tmpStr );
!   m_imPreeditLength = e->text().length();
!   m_imPreeditText = e->text();
!   text += e->text();
  
!   if ( text.length() > 0 ) {
!     QKeyEvent ke( QEvent::KeyPress, 0, -1, 0, text );
!     emit keyPressedSignal( &ke );
    }
- }
  
! void TEWidget::imEndEvent( QIMEvent *e )
! {
!   QString text = QString::null;
!   if ( m_imPreeditLength > 0 ) {
!       text.fill( '\010', m_imPreeditLength );
!   }
  
!   m_imEnd = m_imSelStart = m_imSelEnd = 0;
!   text += e->text();
!   if ( text.length() > 0 ) {
!     QKeyEvent ke( QEvent::KeyPress, 0, -1, 0, text );
!     emit keyPressedSignal( &ke );
    }
  
!   QPoint tL  = contentsRect().topLeft();
!   int tLx = tL.x();
!   int tLy = tL.y();
  
!   QRect repaintRect = QRect( bX+tLx, bY+tLy+font_h*m_imStartLine,
!                              contentsRect().width(), contentsRect().height() );
!   m_imStart = 0;
!   m_imPreeditLength = 0;
  
!   m_isIMEdit = m_isIMSel = false;
!   repaint( repaintRect, true );
  }
  
  // Override any Ctrl+<key> accelerator when pressed with the keyboard
--- 1939,2348 ----
  
  void TEWidget::imStartEvent( QIMEvent */*e*/ )
  {
! //#define	IM_EVENT_DEBUG 0
! #ifdef	IM_EVENT_DEBUG
!   printf("Start: %d %d %d %d \n", 
!          m_imStart, m_imEnd, m_imSelStart, m_imSelEnd);
! #endif
! 
!  // Sometimes SCIM skips to send the XIM_END, buggy enough!
!  if (m_imStart < m_imEnd)
! 	imEndEvent(NULL);
!  
!  // The m_imStart < 0  means that the event queue
!  // is empty, thus we can trust the cursor position.
!  // Moreover m_imStart == m_imEnd implies that
!  // we have no preedit string currently or commited that already.
!  //
!   m_imEnd = m_imStart;
!   m_imSelStart = m_imSelEnd = 0;
!   m_isIMEdit = m_isIMForceRedraw = false;
!   m_imCursorPos = 0;
!   m_imSelLen = 0;
  }
  
  void TEWidget::imComposeEvent( QIMEvent *e )
  {
  
!   if (m_imStart < 0)
!   {
! 	  m_imEnd = m_imStart = m_cursorCol + m_cursorLine * columns;
!           m_imSelStart = m_imSelEnd = 0;
! #ifdef	IM_EVENT_DEBUG
!   printf("DelayStart(C): %d %d %d %d \n", 
!           m_imStart, m_imEnd, m_imSelStart, m_imSelEnd);
! #endif
!   }
! 
!   // Sanity check
!   if (image == NULL)
! 	return;
!  
!   // In the case of refresh.
!   QString NText;
!   int CursorPos, SelLen; 
!   if (e == NULL)
!   {
! 	NText = m_imPreeditText;
!    	CursorPos = m_imCursorPos;
! 	SelLen = m_imSelLen;
!   }
!   else
!   {
! 	// Do not believe the behavior of IM!
! 	NText = e->text();
! 	CursorPos = QMAX(0, QMIN(e->cursorPos(), (int) NText.length()));
! 	SelLen = QMAX(e->selectionLength(), 0);
!    }
!  
!   // Setup the painter.
!   QPainter paint;
!   setUpdatesEnabled(false);
!   paint.begin( this );
!   QPoint tL  = contentsRect().topLeft();
!   int tLx = tL.x();
!   int tLy = tL.y();
!   QRect tmpRect;
  
!   // If the cursor position has been changed, then try to
!   // relocate the preedit area.
!   if (e == NULL && m_imEnd > m_imStart &&
!       m_imStart != m_cursorCol + m_cursorLine * columns)
!   {
!   	int cpos, xpos, xlen;
! 
! 	m_isIMEdit = false;	// Should be turned off!!
!   	cpos = m_imStart;
!   	xpos = (m_imStart%columns);
!   	xlen = QMIN(columns - xpos, m_imEnd - cpos);
!   	while (cpos < m_imEnd)
!   	{
! 		int y = QMIN(lines - 1, cpos/columns);
! 		tmpRect = QRect(bX + tLx + font_w * xpos,
! 			bY + tLy + font_h * y, font_w * xlen, font_h);
! 		paintContents(paint, tmpRect, backgroundPixmap() != 0);
!         	cpos += xlen;
! 		xlen = QMIN(columns, m_imEnd - cpos);
! 		xpos = 0;
!   	}
! 
! 	m_isIMEdit = true;
! 	m_isIMForceRedraw = true;
! 	m_imStart = m_imEnd = m_cursorCol + m_cursorLine * columns;
!   }
! 
!   // Let us begin to draw the preedit area!
!   int oimEnd = m_imEnd;
!   m_imEnd = m_imStart;
!   m_imSelEnd = m_imSelStart;
! 
!   ca data[(columns + 2) * sizeof(ca)];
!   ca dft(' ',cacol(CO_DFT,DEFAULT_FORE_COLOR),
! 	     cacol(CO_DFT,DEFAULT_BACK_COLOR),DEFAULT_RENDITION);
! 
!   int wcwidth = 1, i, x, xpos;
! #define	FAST_REDRAW "yes"
! #ifdef	FAST_REDRAW
!   int minselstart = (CursorPos < (int) NText.length()) ? CursorPos : NText.length();
!   if (m_imCursorPos < (int) m_imPreeditText.length() && minselstart > m_imCursorPos)
! 	minselstart = m_imCursorPos;
! #endif /* FAST_REDRAW */
! 
!   for (i = 0, x = (m_imStart % columns), 
!        xpos = m_imStart - (m_imStart % columns); 
!        i < (int) NText.length(); )
!   {
!      	int p = 0;
!         int redraw_p = -1, redraw_x = -1;
!      	QChar disstrU[columns + 2];
! 
!         wcwidth = konsole_wcwidth(NText[i].unicode());
!      	for ( ; x < columns && i < (int) NText.length(); i++)
!      	{
!             Q_UINT16 c;
! 	    int tmpwcwidth;
! 
! 	    c = NText[i].unicode();
!             tmpwcwidth = konsole_wcwidth(c);
! 	    if (wcwidth != tmpwcwidth)
! 		break;
! 	    
! 	    // Check a selection start point.
! 	    if (i == CursorPos)
! 	    {
! 		m_imSelStart = xpos + x;
! 		m_imSelEnd = m_imSelStart + lines * columns;	/* XXX */
! 	    }
! #ifdef	FAST_REDRAW
! 	    if (redraw_x == -1 &&
! 		(m_isIMForceRedraw == true || i >= minselstart ||
! 		 (i >= (int) m_imPreeditText.length() || 
! 		  m_imPreeditText[i].unicode() != c)))
! 	    {
! 	 	redraw_p = p; redraw_x = x;
!             }
! #else	/* !FAST_REDRAW */
! 	    if (redraw_x == -1)
! 	    {
! 		redraw_p = p; redraw_x = x;
! 	    }
! #endif	/* !FAST_REDRAW */
! 
!             data[x] = dft;
! 	    data[x++].c = c;
! 	    m_imEnd ++;
!             if (tmpwcwidth == 2)
!             {
! 		// Check the wrapping.
! 		if (x >= columns)
! 		{
! 		        disstrU[p ++] = data[x-1].c = ' ';
! 			break;
! 		}
! 		data[x] = dft;
! 		data[x++].c = 0;
! 	        m_imEnd ++;
! 	    }
! 
! 	    disstrU[p ++] = c;
! 
! 	    // Check a selection end point.
! 	    if ((i + 1) == CursorPos + QMAX(1, SelLen))
! 		m_imSelEnd = xpos + x;
!      	}
! 
! 	int y = QMIN(lines - 1, (xpos/columns));
! 	
! 	// Check if the boundary of the preedit area is located at
! 	// the middle of a wide character in the underlying screen.
! 	if (i == (int) NText.length() && i > 0)  // The last segment.
! 	{
! 		const ca*  img = &image[y*columns];
! 		if (img[x].c == 0 && img[x-1].c != 0 && x < columns && x > 0)
! 		{
! 			if (redraw_x < 0)
! 			{
! 				redraw_x = x; redraw_p = p;
! 			}
! 			data[x] = dft;
! 			disstrU[p ++] = data[x ++].c = ' ';
! 			m_imEnd ++;
! 		}
! 	}
  
! 	// Render the screen.
! 	if (redraw_x >= 0 && x - redraw_x > 0)
! 	{
! 	    // The fake cursor
! 	    int fcursorlen = 0;
! 	    if (xpos + redraw_x == m_imStart && p > 0)	// The first segment.
!             	if (konsole_wcwidth(disstrU[0]) == 1)
! 			fcursorlen = 1;
! 
! 	    const ca *attr = &image[y*columns + redraw_x];
!             QColor fColor = attr->f.color(color_table);
!   	    QColor bColor = attr->b.color(color_table);
! 
! 	    m_isIMEdit = true;
! 
! 	    tmpRect = QRect(bX + tLx + font_w * redraw_x,
! 		           bY + tLy + font_h * y, 
! 			   font_w * (x - redraw_x), font_h);
! #define	IM_UNDERLINE
! #ifdef	IM_UNDERLINE
!             if (attr->isTransparent(color_table))
! 		   erase(tmpRect);
! 	    else
!             {
! #endif	/* IM_UNERLINE */
! 
!                    paint.fillRect(tmpRect, Qt::darkCyan);   
! 
! #ifdef	IM_UNDERLINE
!           	   paint.fillRect(tmpRect, bColor);
!             }
! #endif	/* IM_UNERLINE */
!                
!             if (redraw_p >= 0 && p - redraw_p > 0)
!             {
! 		if (m_imSelStart < m_imSelEnd &&
! 		   !(xpos + redraw_x >  m_imSelEnd ||
! 		     xpos + x <= m_imSelStart))
! 		{
! 			int xlen, sels = redraw_x;
! 			if (xpos + redraw_x <= m_imSelStart &&
! 			    m_imSelStart < xpos + x)
! 				sels = (m_imSelStart % columns);
! 			xlen = QMIN(x - sels,
! 				    m_imSelEnd - xpos - sels);
! 		        tmpRect = QRect(bX + tLx + font_w * sels,
! 		                        bY + tLy + font_h * y, 
! 					font_w * xlen, font_h);
!                         paint.fillRect(tmpRect, Qt::darkGray);   
! 		}
! 
!        		paint.setPen(fColor);
!      		QString unistr(&disstrU[redraw_p], p - redraw_p);
! 		int a = font_a + m_lineSpacing / 2;
! 		if (wcwidth == 2)
! 		{
!      			drawTextFixed(paint, bX + tLx + font_w * redraw_x,
! 		   		bY + tLy + font_h * y, unistr, &data[redraw_x]);
! 		}
! 		else
! 		{
!       			paint.drawText(bX + tLx + font_w * redraw_x,
! 			        bY + tLy + font_h * y + a,
! 				unistr, -1, 
! 				bidiEnabled ? QPainter::Auto : QPainter::LTR );
! 		}
! 
! #ifdef	IM_UNDERLINE
! 	        if (x - fcursorlen - redraw_x > 0)
!                 {
! 	        	// Draw an underline.
!       	        	paint.drawLine(bX + tLx + font_w * (redraw_x + fcursorlen), 
! 		     		bY + tLy + font_h * y + a + 1,
!                      		bX + tLx + font_w * (x - fcursorlen) - 1,
! 		     		bY + tLy + font_h * y + a + 1);
! 		}
! #endif	/* IM_UNDERLINE */
! 
! 	        if (fcursorlen > 0)
! 	        {
! 	         	tmpRect = QRect(bX + tLx + font_w * redraw_x,
! 		           bY + tLy + font_h * y /* + a */, 
! 			   font_w * fcursorlen, font_h /* - 2 * a */);
!           	 	paint.fillRect(tmpRect, fColor);
!        			paint.setPen(bColor);
!      		        QString tmpstr(&disstrU[0], 1);
!       			paint.drawText(bX + tLx + font_w * redraw_x,
! 			        bY + tLy + font_h * y + a, tmpstr, -1, 
! 				bidiEnabled ? QPainter::Auto : QPainter::LTR );
!        			paint.setPen(fColor);
!                 }
! 	    }
!        }
  
!        if (x == columns)
!        {
! 	     x = 0;
! 	     xpos += columns;
!        }
    }
  
!   for ( ; xpos + x < oimEnd; x = 0, xpos += columns)
!   {
! 	int xlen = QMIN(columns - x, oimEnd - x - xpos);
! 	int y = QMIN(lines - 1, (xpos/columns));
  
!         tmpRect = QRect(bX + tLx + font_w * x,
! 		        bY + tLy + font_h * y, font_w * xlen, font_h);
!   	paintContents(paint, tmpRect, backgroundPixmap() != 0);
    }
+ 	 
+   drawFrame(&paint);
+   paint.end();
+   setUpdatesEnabled(true);
  
!   m_imPreeditText = NText;
!   m_imCursorPos = CursorPos;
!   m_imSelLen = SelLen;
!   m_isIMForceRedraw = false;
! 
! #ifdef	IM_EVENT_DEBUG
!   const char *s = (e == NULL) ? "refresh" : "normal";
!   printf("Compose(%s): %d %d %d %d: %d %d %d \n", s,
!          m_imStart, m_imEnd, m_imSelStart, m_imSelEnd,
! 	 NText.length(), CursorPos, SelLen);
! #endif
! }
  
! void TEWidget::imEndEvent( QIMEvent *e )
! {
  
!   // In the case of SCIM buggy behavior
!   QString NText = QString::null;
!   if (e != NULL)
! 	NText = e->text();
! 
!   if (m_imStart < 0)
!   {
! 	  m_imEnd = m_imStart = m_cursorCol + m_cursorLine * columns;
!           m_imSelStart = m_imSelEnd = 0;
! #ifdef	IM_EVENT_DEBUG
!   printf("DelayStart(E): %d %d %d %d \n", 
!          m_imStart, m_imEnd, m_imSelStart, m_imSelEnd);
! #endif
!   }
!   
!   // Before call paintContents(), we should turn m_isIMEdit off.
!   m_isIMEdit = m_isIMForceRedraw = false;
!   m_imCursorPos = 0;
!   m_imSelLen = 0;
!   
!   // Sanity check
!   if (image != NULL && m_imStart < m_imEnd)
!   {	// Clear all preedit strings.
!   	QPainter paint;
!   	setUpdatesEnabled(false);
!   	paint.begin( this );
!   	QPoint tL  = contentsRect().topLeft();
!  	int tLx = tL.x();
! 	int tLy = tL.y();
!   	int cpos, xpos, xlen;
! 
!   	cpos = m_imStart;
!   	xpos = (m_imStart%columns);
!   	xlen = QMIN(columns - xpos, m_imEnd - cpos);
!   	while (cpos < m_imEnd)
!   	{
! 		int y = QMIN(lines - 1, cpos/columns);
! 		QRect tmpRect = QRect(bX + tLx + font_w * xpos,
! 			bY + tLy + font_h * y, font_w * xlen, font_h);
! 		paintContents(paint, tmpRect, backgroundPixmap() != 0);
!         	cpos += xlen;
! 		xlen = QMIN(columns, m_imEnd - cpos);
! 		xpos = 0;
!   	}
!   	drawFrame(&paint);
!   	paint.end();
!   	setUpdatesEnabled(true);
!   }
! 
!   // Calculte the true cursor position for the next im_start 
!   // in case of the non empty event queue
!   int i, xpos, xlen;
!   for (i = 0, xpos = m_imStart; i < (int) NText.length(); i ++)
!   {
! 	int xres = columns - (xpos % columns);
! 	xlen = konsole_wcwidth(NText[i].unicode());
! 	if (xres < xlen)
! 		xpos += xres;
! 	xpos += xlen;
!   }
! 
!   // All informations are cleared here.
!   m_imStart = xpos;
!   m_imEnd = m_imStart;
!   m_imSelStart = m_imSelEnd = 0;
!   m_imPreeditText = QString::null;
!   
!   // Emit key events.
!   if (NText.length() > 0 ) {
!       QKeyEvent ke(QEvent::KeyPress, 0, -1, 0, NText);
!       emit keyPressedSignal( &ke );
!   }
! 
! #ifdef	IM_EVENT_DEBUG
!   if (e == NULL)
!   	printf("End(Buggy): %d %d %d %d\n", 
!          	m_imStart, m_imEnd, m_imSelStart, m_imSelEnd);
!   else
!   	printf("End: %d %d %d %d: %d %d %d \n", 
!          	m_imStart, m_imEnd, m_imSelStart, m_imSelEnd,
! 	 e->text().length(), e->cursorPos(), e->selectionLength());
! #endif
  }
  
  // Override any Ctrl+<key> accelerator when pressed with the keyboard
*** konsole/konsole/konsole_wcwidth.cpp.ORG	2007-11-22 09:47:00.000000000 +0900
--- konsole/konsole/konsole_wcwidth.cpp	2007-11-26 12:45:24.000000000 +0900
***************
*** 65,71 ****
   * in ISO 10646.
   */
  
! int konsole_wcwidth(Q_UINT16 ucs)
  {
    /* sorted list of non-overlapping intervals of non-spacing characters */
    static const struct interval combining[] = {
--- 65,72 ----
   * in ISO 10646.
   */
  
! static int __konsole_wcwidth(Q_UINT16);
! static int __konsole_wcwidth(Q_UINT16 ucs)
  {
    /* sorted list of non-overlapping intervals of non-spacing characters */
    static const struct interval combining[] = {
***************
*** 131,137 ****
        (ucs >= 0x20000 && ucs <= 0x2ffff) */));
  }
  
! #if 0
  /*
   * The following function is the same as konsole_wcwidth(), except that
   * spacing characters in the East Asian Ambiguous (A) category as
--- 132,138 ----
        (ucs >= 0x20000 && ucs <= 0x2ffff) */));
  }
  
! #if 1
  /*
   * The following function is the same as konsole_wcwidth(), except that
   * spacing characters in the East Asian Ambiguous (A) category as
***************
*** 140,146 ****
   * encodings who want to migrate to UCS. It is not otherwise
   * recommended for general use.
   */
! int konsole_wcwidth_cjk(Q_UINT16 ucs)
  {
    /* sorted list of non-overlapping intervals of East Asian Ambiguous
     * characters */
--- 141,147 ----
   * encodings who want to migrate to UCS. It is not otherwise
   * recommended for general use.
   */
! int konsole_wcwidth(Q_UINT16 ucs)
  {
    /* sorted list of non-overlapping intervals of East Asian Ambiguous
     * characters */
***************
*** 184,190 ****
      { 0x226E, 0x226F }, { 0x2282, 0x2283 }, { 0x2286, 0x2287 },
      { 0x2295, 0x2295 }, { 0x2299, 0x2299 }, { 0x22A5, 0x22A5 },
      { 0x22BF, 0x22BF }, { 0x2312, 0x2312 }, { 0x2460, 0x24BF },
!     { 0x24D0, 0x24E9 }, { 0x2500, 0x254B }, { 0x2550, 0x2574 },
      { 0x2580, 0x258F }, { 0x2592, 0x2595 }, { 0x25A0, 0x25A1 },
      { 0x25A3, 0x25A9 }, { 0x25B2, 0x25B3 }, { 0x25B6, 0x25B7 },
      { 0x25BC, 0x25BD }, { 0x25C0, 0x25C1 }, { 0x25C6, 0x25C8 },
--- 185,195 ----
      { 0x226E, 0x226F }, { 0x2282, 0x2283 }, { 0x2286, 0x2287 },
      { 0x2295, 0x2295 }, { 0x2299, 0x2299 }, { 0x22A5, 0x22A5 },
      { 0x22BF, 0x22BF }, { 0x2312, 0x2312 }, { 0x2460, 0x24BF },
!     { 0x24D0, 0x24E9 }, 
! #if	0	// Graphic line chars 
!     { 0x2500, 0x254B }, 
! #endif
!     { 0x2550, 0x2574 },
      { 0x2580, 0x258F }, { 0x2592, 0x2595 }, { 0x25A0, 0x25A1 },
      { 0x25A3, 0x25A9 }, { 0x25B2, 0x25B3 }, { 0x25B6, 0x25B7 },
      { 0x25BC, 0x25BD }, { 0x25C0, 0x25C1 }, { 0x25C6, 0x25C8 },
***************
*** 202,208 ****
  	       sizeof(ambiguous) / sizeof(struct interval) - 1))
      return 2;
  
!   return konsole_wcwidth(ucs);
  }
  #endif
  
--- 207,213 ----
  	       sizeof(ambiguous) / sizeof(struct interval) - 1))
      return 2;
  
!   return __konsole_wcwidth(ucs);
  }
  #endif
  

*** konsole/konsole/TEWidget.cpp.ORG	2007-11-22 09:46:40.000000000 +0900
--- konsole/konsole/TEWidget.cpp	2007-12-05 14:19:45.000000000 +0900
***************
*** 329,334 ****
--- 329,337 ----
  /*                         Constructor / Destructor                          */
  /*                                                                           */
  /* ------------------------------------------------------------------------- */
+ #define	m_isIMForceRedraw m_isIMSel
+ #define	m_imCursorPos m_imPreeditLength
+ #define	m_imSelLen m_imStartLine
  
  TEWidget::TEWidget(QWidget *parent, const char *name)
  :QFrame(parent,name,WNoAutoErase)
***************
*** 372,387 ****
  ,rimX(1)
  ,rimY(1)
  ,m_imPreeditText(QString::null)
! ,m_imPreeditLength(0)
! ,m_imStart(0)
! ,m_imStartLine(0)
! ,m_imEnd(0)
  ,m_imSelStart(0)
  ,m_imSelEnd(0)
  ,m_cursorLine(0)
  ,m_cursorCol(0)
  ,m_isIMEdit(false)
! ,m_isIMSel(false)
  ,blend_color(qRgba(0,0,0,0xff))
  {
    // The offsets are not yet calculated.
--- 375,390 ----
  ,rimX(1)
  ,rimY(1)
  ,m_imPreeditText(QString::null)
! ,m_imPreeditLength(0)	// NOT USED! rename => m_imCursorPos
! ,m_imStart(-1)
! ,m_imStartLine(0)	// NOT USED! rename => m_imSelLen
! ,m_imEnd(-1)
  ,m_imSelStart(0)
  ,m_imSelEnd(0)
  ,m_cursorLine(0)
  ,m_cursorCol(0)
  ,m_isIMEdit(false)
! ,m_isIMSel(false)	// NOT USED! rename => m_isIMForceRedraw
  ,blend_color(qRgba(0,0,0,0xff))
  {
    // The offsets are not yet calculated.
***************
*** 543,549 ****
      if (toDraw & Int22)
          paint.drawPoint(cx, cy);
      if (toDraw & Int23)
!         paint.drawPoint(cx+1, cy);
  
      if (toDraw & Int31)
          paint.drawPoint(cx-1, cy+1);
--- 546,552 ----
      if (toDraw & Int22)
          paint.drawPoint(cx, cy);
      if (toDraw & Int23)
!         
  
      if (toDraw & Int31)
          paint.drawPoint(cx-1, cy+1);
***************
*** 643,674 ****
          } else
            paint.fillRect(rect, bColor);
      }
- 
-     QString tmpStr = str.simplifyWhiteSpace();
-     if ( m_isIMEdit && !tmpStr.isEmpty() ) { // imput method edit area background color
-       QRect tmpRect = rect;
-       if ( str != m_imPreeditText ) {  // ugly hack
-         tmpRect.setLeft( tmpRect.left() + font_w );
-         tmpRect.setWidth( tmpRect.width() + font_w );
-       }
- 
-       paint.fillRect( tmpRect, Qt::darkCyan );  // currently use hard code color
-     }
- 
-     if ( m_isIMSel && !tmpStr.isEmpty() ) { // imput method selection background color
-       int x = rect.left() + ( font_w * (m_imSelStart - m_imStart) );
-       int y = rect.top();
-       int w = font_w * (m_imSelEnd - m_imSelStart);
-       int h = font_h;
- 
-       QRect tmpRect = QRect( x, y, w, h );
-       if ( str != m_imPreeditText ) {  // ugly hack
-         tmpRect.setLeft( tmpRect.left() + font_w );
-         tmpRect.setWidth( tmpRect.width() + font_w );
-       }
- 
-       paint.fillRect( tmpRect, Qt::darkGray );   // currently use hard code color
-     }
    }
  
    // Paint cursor
--- 646,651 ----
***************
*** 791,796 ****
--- 768,780 ----
      // fprintf(stderr, "x/y = %d/%d\txpos/ypos = %d/%d\n", curx, cury, xpos, ypos);
      m_cursorLine = cury;
      m_cursorCol = curx;
+ 
+     // OK, now the event queue is going to be flushed.
+     if (m_imStart == m_imEnd)
+ 	m_imEnd = m_imStart = -1;
+     else if (m_isIMEdit == true && 
+ 	     m_imStart != m_cursorLine * columns + m_cursorCol)
+ 	  imComposeEvent(NULL);
  }
  
  /*!
***************
*** 798,804 ****
  
      The size of the new image may or may not match the size of the widget.
  */
! 
  void TEWidget::setImage(const ca* const newimg, int lines, int columns)
  {
    if (!image)
--- 782,808 ----
  
      The size of the new image may or may not match the size of the widget.
  */
! static bool __check_preedit(const int& cols, const int& lins,
! 	const int& imstart, const int& imend, const int& cx, const int& cy)
! {
! 	
! 	if (imstart/cols >= lins)
! 		return false;
! 	if (imend <= lins * cols || cy <= lins - 2)
! 	{
! 	        int abspos = cy * cols + cx;
! 		return (imstart  <= abspos && abspos < imend);
! 	}
! 	if (imend >= (lins + 1) * cols)
! 		return true;
! 	//
! 	// Here the current conditions are cy == lins - 1 and
! 	// lins * cols < imend < (lins + 1) * cols
! 	//
! 	int selp = (imstart/cols == lins - 1) ? (imstart % cols) : 0;
! 	return (cx >= selp || cx < (imend % cols));
! }
! 	
  void TEWidget::setImage(const ca* const newimg, int lines, int columns)
  {
    if (!image)
***************
*** 834,849 ****
      // mark surrounding neighbours dirty, in case the character exceeds
      // its cell boundaries
      memset(dirtyMask, 0, cols+2);
      // Two extra so that we don't have to have to care about start and end conditions
!     for (x = 0; x < cols; x++)
!     {
! 	if ( ( (m_imPreeditLength > 0) && ( ( m_imStartLine == y )
! 	      && ( ( m_imStart < m_imEnd ) && ( ( x > m_imStart ) ) && ( x < m_imEnd ) )
!               || ( ( m_imSelStart < m_imSelEnd ) && ( ( x > m_imSelStart ) ) ) ) )
!             || ext[x] != lcl[x])
!       {
!          dirtyMask[x] = dirtyMask[x+1] = dirtyMask[x+2] = 1;
!       }
      }
      dirtyMask++; // Position correctly
  
--- 838,848 ----
      // mark surrounding neighbours dirty, in case the character exceeds
      // its cell boundaries
      memset(dirtyMask, 0, cols+2);
+ 
      // Two extra so that we don't have to have to care about start and end conditions
!     for (x = 0; x < cols; x++) {
!         if (ext[x] != lcl[x])
! 		 dirtyMask[x] = dirtyMask[x+1] = dirtyMask[x+2] = 1;
      }
      dirtyMask++; // Position correctly
  
***************
*** 857,862 ****
--- 856,865 ----
        if (dirtyMask[x])
        {
          Q_UINT16 c = ext[x+0].c;
+ 	if (m_isIMEdit == true &&
+ 	    m_imEnd > m_imStart && __check_preedit(cols, lins, 
+ 	    m_imStart, m_imEnd, x, y) == true)
+ 		continue;
          if ( !c )
              continue;
          int p = 0;
***************
*** 873,878 ****
--- 876,886 ----
            if (!c)
              continue; // Skip trailing part of multi-col chars.
  
+ 	  if (m_isIMEdit == true && 
+ 	      m_imEnd > m_imStart && __check_preedit(cols, lins, 
+ 	      m_imStart, m_imEnd, x + len, y) == true)
+ 		break;
+ 
            if (ext[x+len].f != cf || ext[x+len].b != cb || ext[x+len].r != cr ||
                !dirtyMask[x+len] || isLineChar(c) != lineDraw || (ext[x+len+1].c == 0) != doubleWidth)
              break;
***************
*** 882,904 ****
  
          QString unistr(disstrU, p);
  
-         // for XIM on the spot input style
-         m_isIMEdit = m_isIMSel = false;
-         if ( m_imStartLine == y ) {
-           if ( ( m_imStart < m_imEnd ) && ( x >= m_imStart-1 ) && ( x + int( unistr.length() ) <= m_imEnd ) )
-             m_isIMEdit = true;
- 
-           if ( ( m_imSelStart < m_imSelEnd ) && ( x >= m_imStart-1 ) && ( x + int( unistr.length() ) <= m_imEnd ) )
-             m_isIMSel = true;
- 	}
-         else if ( m_imStartLine < y ) {  // for word worp
-           if ( ( m_imStart < m_imEnd ) )
-             m_isIMEdit = true;
- 
-           if ( ( m_imSelStart < m_imSelEnd ) )
-             m_isIMSel = true;
- 	}
- 
          bool save_fixed_font = fixed_font;
          if (lineDraw)
             fixed_font = false;
--- 890,895 ----
***************
*** 981,987 ****
      between the old and the new image. Instead, the internal
      image is used and the painting bound by the PaintEvent box.
  */
- 
  void TEWidget::paintEvent( QPaintEvent* pe )
  {
    const QPixmap* pm = backgroundPixmap();
--- 972,977 ----
***************
*** 1045,1050 ****
--- 1035,1046 ----
  
    paint.end();
    setUpdatesEnabled(true);
+ 
+   if (m_isIMEdit == true && /* m_isIMForceRedraw == true &&*/ m_imStart < m_imEnd)
+   {
+ 	  m_isIMForceRedraw = true;
+ 	  imComposeEvent(NULL);
+   }
  }
  
  void TEWidget::print(QPainter &paint, bool friendly, bool exact)
***************
*** 1105,1110 ****
--- 1101,1110 ----
      {
        int len = 1;
        int p = 0;
+       if (m_isIMEdit == true &&
+ 	  m_imEnd > m_imStart && __check_preedit(columns, lines, 
+ 	  m_imStart, m_imEnd, x, y) == true)
+ 		continue;
        c = image[loc(x,y)].c;
        if (c)
           disstrU[p++] = c; //fontMap(c);
***************
*** 1120,1125 ****
--- 1120,1129 ----
               (image[loc(x+len,y)+1].c == 0) == doubleWidth &&
               isLineChar( c = image[loc(x+len,y)].c) == lineDraw) // Assignment!
        {
+ 	if (m_isIMEdit == true && 
+ 	    m_imEnd > m_imStart && __check_preedit(columns, lines, 
+ 	    m_imStart, m_imEnd, x + len, y) == true)
+ 		break;
          if (c)
            disstrU[p++] = c; //fontMap(c);
          if (doubleWidth) // assert((image[loc(x+len,y)+1].c == 0)), see above if condition
***************
*** 1159,1165 ****
  void TEWidget::blinkCursorEvent()
  {
    cursorBlinking = !cursorBlinking;
!   repaint(cursorRect, true);
  }
  
  /* ------------------------------------------------------------------------- */
--- 1163,1170 ----
  void TEWidget::blinkCursorEvent()
  {
    cursorBlinking = !cursorBlinking;
!   if (m_isIMEdit == false)
! 	  repaint(cursorRect, true);
  }
  
  /* ------------------------------------------------------------------------- */
***************
*** 1735,1748 ****
  
  void TEWidget::focusInEvent( QFocusEvent * )
  {
!   repaint(cursorRect, true);  // *do* erase area, to get rid of the
                                // hollow cursor rectangle.
  }
  
  
  void TEWidget::focusOutEvent( QFocusEvent * )
  {
!   repaint(cursorRect, true);  // don't erase area
  }
  
  bool TEWidget::focusNextPrevChild( bool next )
--- 1740,1766 ----
  
  void TEWidget::focusInEvent( QFocusEvent * )
  {
! 
!   m_isIMForceRedraw = true;
!   if (m_isIMEdit == false)
!   {
! 	  repaint(cursorRect, true);  // *do* erase area, to get rid of the
                                // hollow cursor rectangle.
+   }
+   else
+   {
+ 	if (m_imStart < m_imEnd)
+ 		  imComposeEvent(NULL);
+   }
  }
  
  
  void TEWidget::focusOutEvent( QFocusEvent * )
  {
! 
!   m_isIMForceRedraw = true;
!   if (m_isIMEdit == false)
!   	repaint(cursorRect, true);  // don't erase area
  }
  
  bool TEWidget::focusNextPrevChild( bool next )
***************
*** 1921,1983 ****
  
  void TEWidget::imStartEvent( QIMEvent */*e*/ )
  {
!   m_imStart = m_cursorCol;
!   m_imStartLine = m_cursorLine;
!   m_imPreeditLength = 0;
! 
!   m_imEnd = m_imSelStart = m_imSelEnd = 0;
!   m_isIMEdit = m_isIMSel = false;
  }
  
  void TEWidget::imComposeEvent( QIMEvent *e )
  {
-   QString text = QString::null;
-   if ( m_imPreeditLength > 0 ) {
-     text.fill( '\010', m_imPreeditLength );
-   }
  
!   m_imEnd = m_imStart + string_width( e->text() );
  
!   QString tmpStr = e->text().left( e->cursorPos() );
!   m_imSelStart = m_imStart + string_width( tmpStr );
  
!   tmpStr = e->text().mid( e->cursorPos(), e->selectionLength() );
!   m_imSelEnd = m_imSelStart + string_width( tmpStr );
!   m_imPreeditLength = e->text().length();
!   m_imPreeditText = e->text();
!   text += e->text();
  
!   if ( text.length() > 0 ) {
!     QKeyEvent ke( QEvent::KeyPress, 0, -1, 0, text );
!     emit keyPressedSignal( &ke );
    }
- }
  
! void TEWidget::imEndEvent( QIMEvent *e )
! {
!   QString text = QString::null;
!   if ( m_imPreeditLength > 0 ) {
!       text.fill( '\010', m_imPreeditLength );
!   }
  
!   m_imEnd = m_imSelStart = m_imSelEnd = 0;
!   text += e->text();
!   if ( text.length() > 0 ) {
!     QKeyEvent ke( QEvent::KeyPress, 0, -1, 0, text );
!     emit keyPressedSignal( &ke );
    }
  
!   QPoint tL  = contentsRect().topLeft();
!   int tLx = tL.x();
!   int tLy = tL.y();
  
!   QRect repaintRect = QRect( bX+tLx, bY+tLy+font_h*m_imStartLine,
!                              contentsRect().width(), contentsRect().height() );
!   m_imStart = 0;
!   m_imPreeditLength = 0;
  
!   m_isIMEdit = m_isIMSel = false;
!   repaint( repaintRect, true );
  }
  
  // Override any Ctrl+<key> accelerator when pressed with the keyboard
--- 1939,2343 ----
  
  void TEWidget::imStartEvent( QIMEvent */*e*/ )
  {
! //#define	IM_EVENT_DEBUG 0
! #ifdef	IM_EVENT_DEBUG
!   printf("Start: %d %d %d %d \n", 
!          m_imStart, m_imEnd, m_imSelStart, m_imSelEnd);
! #endif
! 
!  // Sometimes SCIM skips to send the XIM_END, buggy enough!
!  if (m_imStart < m_imEnd)
! 	imEndEvent(NULL);
!  
!  // The m_imStart < 0  means that the event queue
!  // is empty, thus we can trust the cursor position.
!  // Moreover m_imStart == m_imEnd implies that
!  // we have no preedit string currently or commited that already.
!  //
!   m_imEnd = m_imStart;
!   m_imSelStart = m_imSelEnd = 0;
!   m_isIMEdit = m_isIMForceRedraw = false;
!   m_imCursorPos = 0;
!   m_imSelLen = 0;
  }
  
  void TEWidget::imComposeEvent( QIMEvent *e )
  {
  
!   if (m_imStart < 0)
!   {
! 	  m_imEnd = m_imStart = m_cursorCol + m_cursorLine * columns;
!           m_imSelStart = m_imSelEnd = 0;
! #ifdef	IM_EVENT_DEBUG
!   printf("DelayStart(C): %d %d %d %d \n", 
!           m_imStart, m_imEnd, m_imSelStart, m_imSelEnd);
! #endif
!   }
! 
!   // Sanity check
!   if (image == NULL)
! 	return;
!  
!   // In the case of refresh.
!   QString NText;
!   int CursorPos, SelLen; 
!   if (e == NULL)
!   {
! 	NText = m_imPreeditText;
!    	CursorPos = m_imCursorPos;
! 	SelLen = m_imSelLen;
!   }
!   else
!   {
! 	// Do not believe the behavior of IM!
! 	NText = e->text();
! 	CursorPos = QMAX(0, QMIN(e->cursorPos(), (int) NText.length()));
! 	SelLen = QMAX(e->selectionLength(), 0);
!    }
!  
!   // Setup the painter.
!   QPainter paint;
!   setUpdatesEnabled(false);
!   paint.begin( this );
!   QPoint tL  = contentsRect().topLeft();
!   int tLx = tL.x();
!   int tLy = tL.y();
!   QRect tmpRect;
  
!   // If the cursor position has been changed, then try to
!   // relocate the preedit area.
!   if (e == NULL && m_imEnd > m_imStart &&
!       m_imStart != m_cursorCol + m_cursorLine * columns)
!   {
!   	int cpos, xpos, xlen;
! 
! 	m_isIMEdit = false;	// Should be turned off!!
!   	cpos = m_imStart;
!   	xpos = (m_imStart%columns);
!   	xlen = QMIN(columns - xpos, m_imEnd - cpos);
!   	while (cpos < m_imEnd)
!   	{
! 		int y = QMIN(lines - 1, cpos/columns);
! 		tmpRect = QRect(bX + tLx + font_w * xpos,
! 			bY + tLy + font_h * y, font_w * xlen, font_h);
! 		paintContents(paint, tmpRect, backgroundPixmap() != 0);
!         	cpos += xlen;
! 		xlen = QMIN(columns, m_imEnd - cpos);
! 		xpos = 0;
!   	}
! 
! 	m_isIMEdit = true;
! 	m_isIMForceRedraw = true;
! 	m_imStart = m_imEnd = m_cursorCol + m_cursorLine * columns;
!   }
! 
!   // Let us begin to draw the preedit area!
!   int oimEnd = m_imEnd;
!   m_imEnd = m_imStart;
!   m_imSelEnd = m_imSelStart;
! 
!   ca data[(columns + 2) * sizeof(ca)];
!   ca dft(' ',cacol(CO_DFT,DEFAULT_FORE_COLOR),
! 	     cacol(CO_DFT,DEFAULT_BACK_COLOR),DEFAULT_RENDITION);
! 
!   int wcwidth = 1, i, x, xpos;
! #define	FAST_REDRAW "yes"
! #ifdef	FAST_REDRAW
!   int minselstart = (CursorPos < (int) NText.length()) ? CursorPos : NText.length();
!   if (m_imCursorPos < (int) m_imPreeditText.length() && minselstart > m_imCursorPos)
! 	minselstart = m_imCursorPos;
! #endif /* FAST_REDRAW */
! 
!   for (i = 0, x = (m_imStart % columns), 
!        xpos = m_imStart - (m_imStart % columns); 
!        i < (int) NText.length(); )
!   {
!      	int p = 0;
!         int redraw_p = -1, redraw_x = -1;
!      	QChar disstrU[columns + 2];
! 
!         wcwidth = konsole_wcwidth(NText[i].unicode());
!      	for ( ; x < columns && i < (int) NText.length(); i++)
!      	{
!             Q_UINT16 c;
! 	    int tmpwcwidth;
! 
! 	    c = NText[i].unicode();
!             tmpwcwidth = konsole_wcwidth(c);
! 	    if (wcwidth != tmpwcwidth)
! 		break;
! 	    
! 	    // Check a selection start point.
! 	    if (i == CursorPos)
! 	    {
! 		m_imSelStart = xpos + x;
! 		m_imSelEnd = m_imSelStart + lines * columns;	/* XXX */
! 	    }
! #ifdef	FAST_REDRAW
! 	    if (redraw_x == -1 &&
! 		(m_isIMForceRedraw == true || i >= minselstart ||
! 		 (i >= (int) m_imPreeditText.length() || 
! 		  m_imPreeditText[i].unicode() != c)))
! 	    {
! 	 	redraw_p = p; redraw_x = x;
!             }
! #else	/* !FAST_REDRAW */
! 	    if (redraw_x == -1)
! 	    {
! 		redraw_p = p; redraw_x = x;
! 	    }
! #endif	/* !FAST_REDRAW */
! 
!             data[x] = dft;
! 	    data[x++].c = c;
! 	    m_imEnd ++;
!             if (tmpwcwidth == 2)
!             {
! 		// Check the wrapping.
! 		if (x >= columns)
! 		{
! 		        disstrU[p ++] = data[x-1].c = ' ';
! 			break;
! 		}
! 		data[x] = dft;
! 		data[x++].c = 0;
! 	        m_imEnd ++;
! 	    }
! 
! 	    disstrU[p ++] = c;
! 
! 	    // Check a selection end point.
! 	    if ((i + 1) == CursorPos + QMAX(1, SelLen))
! 		m_imSelEnd = xpos + x;
!      	}
! 
! 	int y = QMIN(lines - 1, (xpos/columns));
! 	
! 	// Check if the boundary of the preedit area is located at
! 	// the middle of a wide character in the underlying screen.
! 	if (i == (int) NText.length() && i > 0)  // The last segment.
! 	{
! 		const ca*  img = &image[y*columns];
! 		if (img[x].c == 0 && img[x-1].c != 0 && x < columns && x > 0)
! 		{
! 			if (redraw_x < 0)
! 			{
! 				redraw_x = x; redraw_p = p;
! 			}
! 			data[x] = dft;
! 			disstrU[p ++] = data[x ++].c = ' ';
! 			m_imEnd ++;
! 		}
! 	}
  
! 	// Render the screen.
! 	if (redraw_x >= 0 && x - redraw_x > 0)
! 	{
! 	    // The fake cursor
! 	    int fcursorlen = 0;
! 	    if (xpos + redraw_x == m_imStart && p > 0)	// The first segment.
!             	if (konsole_wcwidth(disstrU[0]) == 1)
! 			fcursorlen = 1;
! 
! 	    const ca *attr = &image[y*columns + redraw_x];
!             QColor fColor = attr->f.color(color_table);
!   	    QColor bColor = attr->b.color(color_table);
! 
! 	    m_isIMEdit = true;
! 
! 	    tmpRect = QRect(bX + tLx + font_w * redraw_x,
! 		           bY + tLy + font_h * y, 
! 			   font_w * (x - redraw_x), font_h);
! #define	IM_UNDERLINE
! #ifdef	IM_UNDERLINE
!             if (attr->isTransparent(color_table))
! 		   erase(tmpRect);
! 	    else
!           	   paint.fillRect(tmpRect, bColor);
! #else	/* IM_UNERLINE */
! 	   paint.fillRect(tmpRect, Qt::darkCyan);   
! #endif	/* IM_UNDERLINE */           
! 
!             if (redraw_p >= 0 && p - redraw_p > 0)
!             {
! 		if (m_imSelStart < m_imSelEnd &&
! 		   !(xpos + redraw_x >  m_imSelEnd ||
! 		     xpos + x <= m_imSelStart))
! 		{
! 			int xlen, sels = redraw_x;
! 			if (xpos + redraw_x <= m_imSelStart &&
! 			    m_imSelStart < xpos + x)
! 				sels = (m_imSelStart % columns);
! 			xlen = QMIN(x - sels,
! 				    m_imSelEnd - xpos - sels);
! 		        tmpRect = QRect(bX + tLx + font_w * sels,
! 		                        bY + tLy + font_h * y, 
! 					font_w * xlen, font_h);
!                         paint.fillRect(tmpRect, Qt::darkGray);   
! 		}
! 
!        		paint.setPen(fColor);
!      		QString unistr(&disstrU[redraw_p], p - redraw_p);
! 		int a = font_a + m_lineSpacing / 2;
! 		if (wcwidth == 2)
! 		{
!      			drawTextFixed(paint, bX + tLx + font_w * redraw_x,
! 		   		bY + tLy + font_h * y, unistr, &data[redraw_x]);
! 		}
! 		else
! 		{
!       			paint.drawText(bX + tLx + font_w * redraw_x,
! 			        bY + tLy + font_h * y + a,
! 				unistr, -1, 
! 				bidiEnabled ? QPainter::Auto : QPainter::LTR );
! 		}
! 
! #ifdef	IM_UNDERLINE
! 	        if (x - fcursorlen - redraw_x > 0)
!                 {
! 	        	// Draw an underline.
!       	        	paint.drawLine(bX + tLx + font_w * (redraw_x + fcursorlen), 
! 		     		bY + tLy + font_h * y + a + 1,
!                      		bX + tLx + font_w * (x - fcursorlen) - 1,
! 		     		bY + tLy + font_h * y + a + 1);
! 		}
! #endif	/* IM_UNDERLINE */
! 
! 	        if (fcursorlen > 0)
! 	        {
! 	         	tmpRect = QRect(bX + tLx + font_w * redraw_x,
! 		           bY + tLy + font_h * y /* + a */, 
! 			   font_w * fcursorlen, font_h /* - 2 * a */);
!           	 	paint.fillRect(tmpRect, fColor);
!        			paint.setPen(bColor);
!      		        QString tmpstr(&disstrU[0], 1);
!       			paint.drawText(bX + tLx + font_w * redraw_x,
! 			        bY + tLy + font_h * y + a, tmpstr, -1, 
! 				bidiEnabled ? QPainter::Auto : QPainter::LTR );
!        			paint.setPen(fColor);
!                 }
! 	    }
!        }
  
!        if (x == columns)
!        {
! 	     x = 0;
! 	     xpos += columns;
!        }
    }
  
!   for ( ; xpos + x < oimEnd; x = 0, xpos += columns)
!   {
! 	int xlen = QMIN(columns - x, oimEnd - x - xpos);
! 	int y = QMIN(lines - 1, (xpos/columns));
  
!         tmpRect = QRect(bX + tLx + font_w * x,
! 		        bY + tLy + font_h * y, font_w * xlen, font_h);
!   	paintContents(paint, tmpRect, backgroundPixmap() != 0);
    }
+ 	 
+   drawFrame(&paint);
+   paint.end();
+   setUpdatesEnabled(true);
  
!   m_imPreeditText = NText;
!   m_imCursorPos = CursorPos;
!   m_imSelLen = SelLen;
!   m_isIMForceRedraw = false;
! 
! #ifdef	IM_EVENT_DEBUG
!   const char *s = (e == NULL) ? "refresh" : "normal";
!   printf("Compose(%s): %d %d %d %d: %d %d %d \n", s,
!          m_imStart, m_imEnd, m_imSelStart, m_imSelEnd,
! 	 NText.length(), CursorPos, SelLen);
! #endif
! }
  
! void TEWidget::imEndEvent( QIMEvent *e )
! {
  
!   // In the case of SCIM buggy behavior
!   QString NText = QString::null;
!   if (e != NULL)
! 	NText = e->text();
! 
!   if (m_imStart < 0)
!   {
! 	  m_imEnd = m_imStart = m_cursorCol + m_cursorLine * columns;
!           m_imSelStart = m_imSelEnd = 0;
! #ifdef	IM_EVENT_DEBUG
!   printf("DelayStart(E): %d %d %d %d \n", 
!          m_imStart, m_imEnd, m_imSelStart, m_imSelEnd);
! #endif
!   }
!   
!   // Before call paintContents(), we should turn m_isIMEdit off.
!   m_isIMEdit = m_isIMForceRedraw = false;
!   m_imCursorPos = 0;
!   m_imSelLen = 0;
!   
!   // Sanity check
!   if (image != NULL && m_imStart < m_imEnd)
!   {	// Clear all preedit strings.
!   	QPainter paint;
!   	setUpdatesEnabled(false);
!   	paint.begin( this );
!   	QPoint tL  = contentsRect().topLeft();
!  	int tLx = tL.x();
! 	int tLy = tL.y();
!   	int cpos, xpos, xlen;
! 
!   	cpos = m_imStart;
!   	xpos = (m_imStart%columns);
!   	xlen = QMIN(columns - xpos, m_imEnd - cpos);
!   	while (cpos < m_imEnd)
!   	{
! 		int y = QMIN(lines - 1, cpos/columns);
! 		QRect tmpRect = QRect(bX + tLx + font_w * xpos,
! 			bY + tLy + font_h * y, font_w * xlen, font_h);
! 		paintContents(paint, tmpRect, backgroundPixmap() != 0);
!         	cpos += xlen;
! 		xlen = QMIN(columns, m_imEnd - cpos);
! 		xpos = 0;
!   	}
!   	drawFrame(&paint);
!   	paint.end();
!   	setUpdatesEnabled(true);
!   }
! 
!   // Calculte the true cursor position for the next im_start 
!   // in case of the non empty event queue
!   int i, xpos, xlen;
!   for (i = 0, xpos = m_imStart; i < (int) NText.length(); i ++)
!   {
! 	int xres = columns - (xpos % columns);
! 	xlen = konsole_wcwidth(NText[i].unicode());
! 	if (xres < xlen)
! 		xpos += xres;
! 	xpos += xlen;
!   }
! 
!   // All informations are cleared here.
!   m_imStart = xpos;
!   m_imEnd = m_imStart;
!   m_imSelStart = m_imSelEnd = 0;
!   m_imPreeditText = QString::null;
!   
!   // Emit key events.
!   if (NText.length() > 0 ) {
!       QKeyEvent ke(QEvent::KeyPress, 0, -1, 0, NText);
!       emit keyPressedSignal( &ke );
!   }
! 
! #ifdef	IM_EVENT_DEBUG
!   if (e == NULL)
!   	printf("End(Buggy): %d %d %d %d\n", 
!          	m_imStart, m_imEnd, m_imSelStart, m_imSelEnd);
!   else
!   	printf("End: %d %d %d %d: %d %d %d \n", 
!          	m_imStart, m_imEnd, m_imSelStart, m_imSelEnd,
! 	 e->text().length(), e->cursorPos(), e->selectionLength());
! #endif
  }
  
  // Override any Ctrl+<key> accelerator when pressed with the keyboard
*** konsole/konsole/konsole_wcwidth.cpp.ORG	2007-11-22 09:47:00.000000000 +0900
--- konsole/konsole/konsole_wcwidth.cpp	2007-12-02 22:43:38.000000000 +0900
***************
*** 65,71 ****
   * in ISO 10646.
   */
  
! int konsole_wcwidth(Q_UINT16 ucs)
  {
    /* sorted list of non-overlapping intervals of non-spacing characters */
    static const struct interval combining[] = {
--- 65,72 ----
   * in ISO 10646.
   */
  
! static int __konsole_wcwidth(Q_UINT16);
! static int __konsole_wcwidth(Q_UINT16 ucs)
  {
    /* sorted list of non-overlapping intervals of non-spacing characters */
    static const struct interval combining[] = {
***************
*** 131,137 ****
        (ucs >= 0x20000 && ucs <= 0x2ffff) */));
  }
  
! #if 0
  /*
   * The following function is the same as konsole_wcwidth(), except that
   * spacing characters in the East Asian Ambiguous (A) category as
--- 132,138 ----
        (ucs >= 0x20000 && ucs <= 0x2ffff) */));
  }
  
! #if 1
  /*
   * The following function is the same as konsole_wcwidth(), except that
   * spacing characters in the East Asian Ambiguous (A) category as
***************
*** 140,146 ****
   * encodings who want to migrate to UCS. It is not otherwise
   * recommended for general use.
   */
! int konsole_wcwidth_cjk(Q_UINT16 ucs)
  {
    /* sorted list of non-overlapping intervals of East Asian Ambiguous
     * characters */
--- 141,147 ----
   * encodings who want to migrate to UCS. It is not otherwise
   * recommended for general use.
   */
! int konsole_wcwidth(Q_UINT16 ucs)
  {
    /* sorted list of non-overlapping intervals of East Asian Ambiguous
     * characters */
***************
*** 184,191 ****
      { 0x226E, 0x226F }, { 0x2282, 0x2283 }, { 0x2286, 0x2287 },
      { 0x2295, 0x2295 }, { 0x2299, 0x2299 }, { 0x22A5, 0x22A5 },
      { 0x22BF, 0x22BF }, { 0x2312, 0x2312 }, { 0x2460, 0x24BF },
!     { 0x24D0, 0x24E9 }, { 0x2500, 0x254B }, { 0x2550, 0x2574 },
!     { 0x2580, 0x258F }, { 0x2592, 0x2595 }, { 0x25A0, 0x25A1 },
      { 0x25A3, 0x25A9 }, { 0x25B2, 0x25B3 }, { 0x25B6, 0x25B7 },
      { 0x25BC, 0x25BD }, { 0x25C0, 0x25C1 }, { 0x25C6, 0x25C8 },
      { 0x25CB, 0x25CB }, { 0x25CE, 0x25D1 }, { 0x25E2, 0x25E5 },
--- 185,200 ----
      { 0x226E, 0x226F }, { 0x2282, 0x2283 }, { 0x2286, 0x2287 },
      { 0x2295, 0x2295 }, { 0x2299, 0x2299 }, { 0x22A5, 0x22A5 },
      { 0x22BF, 0x22BF }, { 0x2312, 0x2312 }, { 0x2460, 0x24BF },
!     { 0x24D0, 0x24E9 }, 
! #if	0	// Graphic line chars 
!     { 0x2500, 0x254B }, 
! #endif
!     { 0x2550, 0x2574 },
!     { 0x2580, 0x258F }, 
! #if	0	// Meshed square
!     { 0x2592, 0x2595 }, 
! #endif
!     { 0x25A0, 0x25A1 },
      { 0x25A3, 0x25A9 }, { 0x25B2, 0x25B3 }, { 0x25B6, 0x25B7 },
      { 0x25BC, 0x25BD }, { 0x25C0, 0x25C1 }, { 0x25C6, 0x25C8 },
      { 0x25CB, 0x25CB }, { 0x25CE, 0x25D1 }, { 0x25E2, 0x25E5 },
***************
*** 202,208 ****
  	       sizeof(ambiguous) / sizeof(struct interval) - 1))
      return 2;
  
!   return konsole_wcwidth(ucs);
  }
  #endif
  
--- 211,217 ----
  	       sizeof(ambiguous) / sizeof(struct interval) - 1))
      return 2;
  
!   return __konsole_wcwidth(ucs);
  }
  #endif
  

*** konsole/konsole/TEWidget.cpp.ORG	2007-11-22 09:46:40.000000000 +0900
--- konsole/konsole/TEWidget.cpp	2007-12-05 15:39:36.000000000 +0900
***************
*** 329,334 ****
--- 329,337 ----
  /*                         Constructor / Destructor                          */
  /*                                                                           */
  /* ------------------------------------------------------------------------- */
+ #define	m_isIMForceRedraw m_isIMSel
+ #define	m_imCursorPos m_imPreeditLength
+ #define	m_imSelLen m_imStartLine
  
  TEWidget::TEWidget(QWidget *parent, const char *name)
  :QFrame(parent,name,WNoAutoErase)
***************
*** 372,387 ****
  ,rimX(1)
  ,rimY(1)
  ,m_imPreeditText(QString::null)
! ,m_imPreeditLength(0)
! ,m_imStart(0)
! ,m_imStartLine(0)
! ,m_imEnd(0)
  ,m_imSelStart(0)
  ,m_imSelEnd(0)
  ,m_cursorLine(0)
  ,m_cursorCol(0)
  ,m_isIMEdit(false)
! ,m_isIMSel(false)
  ,blend_color(qRgba(0,0,0,0xff))
  {
    // The offsets are not yet calculated.
--- 375,390 ----
  ,rimX(1)
  ,rimY(1)
  ,m_imPreeditText(QString::null)
! ,m_imPreeditLength(0)	// NOT USED! rename => m_imCursorPos
! ,m_imStart(-1)
! ,m_imStartLine(0)	// NOT USED! rename => m_imSelLen
! ,m_imEnd(-1)
  ,m_imSelStart(0)
  ,m_imSelEnd(0)
  ,m_cursorLine(0)
  ,m_cursorCol(0)
  ,m_isIMEdit(false)
! ,m_isIMSel(false)	// NOT USED! rename => m_isIMForceRedraw
  ,blend_color(qRgba(0,0,0,0xff))
  {
    // The offsets are not yet calculated.
***************
*** 643,674 ****
          } else
            paint.fillRect(rect, bColor);
      }
- 
-     QString tmpStr = str.simplifyWhiteSpace();
-     if ( m_isIMEdit && !tmpStr.isEmpty() ) { // imput method edit area background color
-       QRect tmpRect = rect;
-       if ( str != m_imPreeditText ) {  // ugly hack
-         tmpRect.setLeft( tmpRect.left() + font_w );
-         tmpRect.setWidth( tmpRect.width() + font_w );
-       }
- 
-       paint.fillRect( tmpRect, Qt::darkCyan );  // currently use hard code color
-     }
- 
-     if ( m_isIMSel && !tmpStr.isEmpty() ) { // imput method selection background color
-       int x = rect.left() + ( font_w * (m_imSelStart - m_imStart) );
-       int y = rect.top();
-       int w = font_w * (m_imSelEnd - m_imSelStart);
-       int h = font_h;
- 
-       QRect tmpRect = QRect( x, y, w, h );
-       if ( str != m_imPreeditText ) {  // ugly hack
-         tmpRect.setLeft( tmpRect.left() + font_w );
-         tmpRect.setWidth( tmpRect.width() + font_w );
-       }
- 
-       paint.fillRect( tmpRect, Qt::darkGray );   // currently use hard code color
-     }
    }
  
    // Paint cursor
--- 646,651 ----
***************
*** 791,796 ****
--- 768,780 ----
      // fprintf(stderr, "x/y = %d/%d\txpos/ypos = %d/%d\n", curx, cury, xpos, ypos);
      m_cursorLine = cury;
      m_cursorCol = curx;
+ 
+     // OK, now the event queue is going to be flushed.
+     if (m_imStart == m_imEnd)
+ 	m_imEnd = m_imStart = -1;
+     else if (m_isIMEdit == true && 
+ 	     m_imStart != m_cursorLine * columns + m_cursorCol)
+ 	  imComposeEvent(NULL);
  }
  
  /*!
***************
*** 798,804 ****
  
      The size of the new image may or may not match the size of the widget.
  */
! 
  void TEWidget::setImage(const ca* const newimg, int lines, int columns)
  {
    if (!image)
--- 782,808 ----
  
      The size of the new image may or may not match the size of the widget.
  */
! static bool __check_preedit(const int& cols, const int& lins,
! 	const int& imstart, const int& imend, const int& cx, const int& cy)
! {
! 	
! 	if (imstart/cols >= lins)
! 		return false;
! 	if (imend <= lins * cols || cy <= lins - 2)
! 	{
! 	        int abspos = cy * cols + cx;
! 		return (imstart  <= abspos && abspos < imend);
! 	}
! 	if (imend >= (lins + 1) * cols)
! 		return true;
! 	//
! 	// Here the current conditions are cy == lins - 1 and
! 	// lins * cols < imend < (lins + 1) * cols
! 	//
! 	int selp = (imstart/cols == lins - 1) ? (imstart % cols) : 0;
! 	return (cx >= selp || cx < (imend % cols));
! }
! 	
  void TEWidget::setImage(const ca* const newimg, int lines, int columns)
  {
    if (!image)
***************
*** 834,849 ****
      // mark surrounding neighbours dirty, in case the character exceeds
      // its cell boundaries
      memset(dirtyMask, 0, cols+2);
      // Two extra so that we don't have to have to care about start and end conditions
!     for (x = 0; x < cols; x++)
!     {
! 	if ( ( (m_imPreeditLength > 0) && ( ( m_imStartLine == y )
! 	      && ( ( m_imStart < m_imEnd ) && ( ( x > m_imStart ) ) && ( x < m_imEnd ) )
!               || ( ( m_imSelStart < m_imSelEnd ) && ( ( x > m_imSelStart ) ) ) ) )
!             || ext[x] != lcl[x])
!       {
!          dirtyMask[x] = dirtyMask[x+1] = dirtyMask[x+2] = 1;
!       }
      }
      dirtyMask++; // Position correctly
  
--- 838,848 ----
      // mark surrounding neighbours dirty, in case the character exceeds
      // its cell boundaries
      memset(dirtyMask, 0, cols+2);
+ 
      // Two extra so that we don't have to have to care about start and end conditions
!     for (x = 0; x < cols; x++) {
!         if (ext[x] != lcl[x])
! 		 dirtyMask[x] = dirtyMask[x+1] = dirtyMask[x+2] = 1;
      }
      dirtyMask++; // Position correctly
  
***************
*** 857,862 ****
--- 856,865 ----
        if (dirtyMask[x])
        {
          Q_UINT16 c = ext[x+0].c;
+ 	if (m_isIMEdit == true &&
+ 	    m_imEnd > m_imStart && __check_preedit(cols, lins, 
+ 	    m_imStart, m_imEnd, x, y) == true)
+ 		continue;
          if ( !c )
              continue;
          int p = 0;
***************
*** 873,878 ****
--- 876,886 ----
            if (!c)
              continue; // Skip trailing part of multi-col chars.
  
+ 	  if (m_isIMEdit == true && 
+ 	      m_imEnd > m_imStart && __check_preedit(cols, lins, 
+ 	      m_imStart, m_imEnd, x + len, y) == true)
+ 		break;
+ 
            if (ext[x+len].f != cf || ext[x+len].b != cb || ext[x+len].r != cr ||
                !dirtyMask[x+len] || isLineChar(c) != lineDraw || (ext[x+len+1].c == 0) != doubleWidth)
              break;
***************
*** 882,904 ****
  
          QString unistr(disstrU, p);
  
-         // for XIM on the spot input style
-         m_isIMEdit = m_isIMSel = false;
-         if ( m_imStartLine == y ) {
-           if ( ( m_imStart < m_imEnd ) && ( x >= m_imStart-1 ) && ( x + int( unistr.length() ) <= m_imEnd ) )
-             m_isIMEdit = true;
- 
-           if ( ( m_imSelStart < m_imSelEnd ) && ( x >= m_imStart-1 ) && ( x + int( unistr.length() ) <= m_imEnd ) )
-             m_isIMSel = true;
- 	}
-         else if ( m_imStartLine < y ) {  // for word worp
-           if ( ( m_imStart < m_imEnd ) )
-             m_isIMEdit = true;
- 
-           if ( ( m_imSelStart < m_imSelEnd ) )
-             m_isIMSel = true;
- 	}
- 
          bool save_fixed_font = fixed_font;
          if (lineDraw)
             fixed_font = false;
--- 890,895 ----
***************
*** 981,987 ****
      between the old and the new image. Instead, the internal
      image is used and the painting bound by the PaintEvent box.
  */
- 
  void TEWidget::paintEvent( QPaintEvent* pe )
  {
    const QPixmap* pm = backgroundPixmap();
--- 972,977 ----
***************
*** 1045,1050 ****
--- 1035,1046 ----
  
    paint.end();
    setUpdatesEnabled(true);
+ 
+   if (m_isIMEdit == true && /* m_isIMForceRedraw == true &&*/ m_imStart < m_imEnd)
+   {
+ 	  m_isIMForceRedraw = true;
+ 	  imComposeEvent(NULL);
+   }
  }
  
  void TEWidget::print(QPainter &paint, bool friendly, bool exact)
***************
*** 1105,1110 ****
--- 1101,1110 ----
      {
        int len = 1;
        int p = 0;
+       if (m_isIMEdit == true &&
+ 	  m_imEnd > m_imStart && __check_preedit(columns, lines, 
+ 	  m_imStart, m_imEnd, x, y) == true)
+ 		continue;
        c = image[loc(x,y)].c;
        if (c)
           disstrU[p++] = c; //fontMap(c);
***************
*** 1120,1125 ****
--- 1120,1129 ----
               (image[loc(x+len,y)+1].c == 0) == doubleWidth &&
               isLineChar( c = image[loc(x+len,y)].c) == lineDraw) // Assignment!
        {
+ 	if (m_isIMEdit == true && 
+ 	    m_imEnd > m_imStart && __check_preedit(columns, lines, 
+ 	    m_imStart, m_imEnd, x + len, y) == true)
+ 		break;
          if (c)
            disstrU[p++] = c; //fontMap(c);
          if (doubleWidth) // assert((image[loc(x+len,y)+1].c == 0)), see above if condition
***************
*** 1159,1165 ****
  void TEWidget::blinkCursorEvent()
  {
    cursorBlinking = !cursorBlinking;
!   repaint(cursorRect, true);
  }
  
  /* ------------------------------------------------------------------------- */
--- 1163,1170 ----
  void TEWidget::blinkCursorEvent()
  {
    cursorBlinking = !cursorBlinking;
!   if (m_isIMEdit == false)
! 	  repaint(cursorRect, true);
  }
  
  /* ------------------------------------------------------------------------- */
***************
*** 1735,1748 ****
  
  void TEWidget::focusInEvent( QFocusEvent * )
  {
!   repaint(cursorRect, true);  // *do* erase area, to get rid of the
                                // hollow cursor rectangle.
  }
  
  
  void TEWidget::focusOutEvent( QFocusEvent * )
  {
!   repaint(cursorRect, true);  // don't erase area
  }
  
  bool TEWidget::focusNextPrevChild( bool next )
--- 1740,1766 ----
  
  void TEWidget::focusInEvent( QFocusEvent * )
  {
! 
!   m_isIMForceRedraw = true;
!   if (m_isIMEdit == false)
!   {
! 	  repaint(cursorRect, true);  // *do* erase area, to get rid of the
                                // hollow cursor rectangle.
+   }
+   else
+   {
+ 	if (m_imStart < m_imEnd)
+ 		  imComposeEvent(NULL);
+   }
  }
  
  
  void TEWidget::focusOutEvent( QFocusEvent * )
  {
! 
!   m_isIMForceRedraw = true;
!   if (m_isIMEdit == false)
!   	repaint(cursorRect, true);  // don't erase area
  }
  
  bool TEWidget::focusNextPrevChild( bool next )
***************
*** 1921,1983 ****
  
  void TEWidget::imStartEvent( QIMEvent */*e*/ )
  {
!   m_imStart = m_cursorCol;
!   m_imStartLine = m_cursorLine;
!   m_imPreeditLength = 0;
! 
!   m_imEnd = m_imSelStart = m_imSelEnd = 0;
!   m_isIMEdit = m_isIMSel = false;
  }
  
  void TEWidget::imComposeEvent( QIMEvent *e )
  {
-   QString text = QString::null;
-   if ( m_imPreeditLength > 0 ) {
-     text.fill( '\010', m_imPreeditLength );
-   }
  
!   m_imEnd = m_imStart + string_width( e->text() );
  
!   QString tmpStr = e->text().left( e->cursorPos() );
!   m_imSelStart = m_imStart + string_width( tmpStr );
  
!   tmpStr = e->text().mid( e->cursorPos(), e->selectionLength() );
!   m_imSelEnd = m_imSelStart + string_width( tmpStr );
!   m_imPreeditLength = e->text().length();
!   m_imPreeditText = e->text();
!   text += e->text();
  
!   if ( text.length() > 0 ) {
!     QKeyEvent ke( QEvent::KeyPress, 0, -1, 0, text );
!     emit keyPressedSignal( &ke );
    }
- }
  
! void TEWidget::imEndEvent( QIMEvent *e )
! {
!   QString text = QString::null;
!   if ( m_imPreeditLength > 0 ) {
!       text.fill( '\010', m_imPreeditLength );
!   }
  
!   m_imEnd = m_imSelStart = m_imSelEnd = 0;
!   text += e->text();
!   if ( text.length() > 0 ) {
!     QKeyEvent ke( QEvent::KeyPress, 0, -1, 0, text );
!     emit keyPressedSignal( &ke );
    }
  
!   QPoint tL  = contentsRect().topLeft();
!   int tLx = tL.x();
!   int tLy = tL.y();
  
!   QRect repaintRect = QRect( bX+tLx, bY+tLy+font_h*m_imStartLine,
!                              contentsRect().width(), contentsRect().height() );
!   m_imStart = 0;
!   m_imPreeditLength = 0;
  
!   m_isIMEdit = m_isIMSel = false;
!   repaint( repaintRect, true );
  }
  
  // Override any Ctrl+<key> accelerator when pressed with the keyboard
--- 1939,2343 ----
  
  void TEWidget::imStartEvent( QIMEvent */*e*/ )
  {
! //#define	IM_EVENT_DEBUG 0
! #ifdef	IM_EVENT_DEBUG
!   printf("Start: %d %d %d %d \n", 
!          m_imStart, m_imEnd, m_imSelStart, m_imSelEnd);
! #endif
! 
!  // Sometimes SCIM skips to send the XIM_END, buggy enough!
!  if (m_imStart < m_imEnd)
! 	imEndEvent(NULL);
!  
!  // The m_imStart < 0  means that the event queue
!  // is empty, thus we can trust the cursor position.
!  // Moreover m_imStart == m_imEnd implies that
!  // we have no preedit string currently or commited that already.
!  //
!   m_imEnd = m_imStart;
!   m_imSelStart = m_imSelEnd = 0;
!   m_isIMEdit = m_isIMForceRedraw = false;
!   m_imCursorPos = 0;
!   m_imSelLen = 0;
  }
  
  void TEWidget::imComposeEvent( QIMEvent *e )
  {
  
!   if (m_imStart < 0)
!   {
! 	  m_imEnd = m_imStart = m_cursorCol + m_cursorLine * columns;
!           m_imSelStart = m_imSelEnd = 0;
! #ifdef	IM_EVENT_DEBUG
!   printf("DelayStart(C): %d %d %d %d \n", 
!           m_imStart, m_imEnd, m_imSelStart, m_imSelEnd);
! #endif
!   }
! 
!   // Sanity check
!   if (image == NULL)
! 	return;
!  
!   // In the case of refresh.
!   QString NText;
!   int CursorPos, SelLen; 
!   if (e == NULL)
!   {
! 	NText = m_imPreeditText;
!    	CursorPos = m_imCursorPos;
! 	SelLen = m_imSelLen;
!   }
!   else
!   {
! 	// Do not believe the behavior of IM!
! 	NText = e->text();
! 	CursorPos = QMAX(0, QMIN(e->cursorPos(), (int) NText.length()));
! 	SelLen = QMAX(e->selectionLength(), 0);
!    }
!  
!   // Setup the painter.
!   QPainter paint;
!   setUpdatesEnabled(false);
!   paint.begin( this );
!   QPoint tL  = contentsRect().topLeft();
!   int tLx = tL.x();
!   int tLy = tL.y();
!   QRect tmpRect;
  
!   // If the cursor position has been changed, then try to
!   // relocate the preedit area.
!   if (e == NULL && m_imEnd > m_imStart &&
!       m_imStart != m_cursorCol + m_cursorLine * columns)
!   {
!   	int cpos, xpos, xlen;
! 
! 	m_isIMEdit = false;	// Should be turned off!!
!   	cpos = m_imStart;
!   	xpos = (m_imStart%columns);
!   	xlen = QMIN(columns - xpos, m_imEnd - cpos);
!   	while (cpos < m_imEnd)
!   	{
! 		int y = QMIN(lines - 1, cpos/columns);
! 		tmpRect = QRect(bX + tLx + font_w * xpos,
! 			bY + tLy + font_h * y, font_w * xlen, font_h);
! 		paintContents(paint, tmpRect, backgroundPixmap() != 0);
!         	cpos += xlen;
! 		xlen = QMIN(columns, m_imEnd - cpos);
! 		xpos = 0;
!   	}
! 
! 	m_isIMEdit = true;
! 	m_isIMForceRedraw = true;
! 	m_imStart = m_imEnd = m_cursorCol + m_cursorLine * columns;
!   }
! 
!   // Let us begin to draw the preedit area!
!   int oimEnd = m_imEnd;
!   m_imEnd = m_imStart;
!   m_imSelEnd = m_imSelStart;
! 
!   ca data[(columns + 2) * sizeof(ca)];
!   ca dft(' ',cacol(CO_DFT,DEFAULT_FORE_COLOR),
! 	     cacol(CO_DFT,DEFAULT_BACK_COLOR),DEFAULT_RENDITION);
! 
!   int wcwidth = 1, i, x, xpos;
! #define	FAST_REDRAW "yes"
! #ifdef	FAST_REDRAW
!   int minselstart = (CursorPos < (int) NText.length()) ? CursorPos : NText.length();
!   if (m_imCursorPos < (int) m_imPreeditText.length() && minselstart > m_imCursorPos)
! 	minselstart = m_imCursorPos;
! #endif /* FAST_REDRAW */
! 
!   for (i = 0, x = (m_imStart % columns), 
!        xpos = m_imStart - (m_imStart % columns); 
!        i < (int) NText.length(); )
!   {
!      	int p = 0;
!         int redraw_p = -1, redraw_x = -1;
!      	QChar disstrU[columns + 2];
! 
!         wcwidth = konsole_wcwidth(NText[i].unicode());
!      	for ( ; x < columns && i < (int) NText.length(); i++)
!      	{
!             Q_UINT16 c;
! 	    int tmpwcwidth;
! 
! 	    c = NText[i].unicode();
!             tmpwcwidth = konsole_wcwidth(c);
! 	    if (wcwidth != tmpwcwidth)
! 		break;
! 	    
! 	    // Check a selection start point.
! 	    if (i == CursorPos)
! 	    {
! 		m_imSelStart = xpos + x;
! 		m_imSelEnd = m_imSelStart + lines * columns;	/* XXX */
! 	    }
! #ifdef	FAST_REDRAW
! 	    if (redraw_x == -1 &&
! 		(m_isIMForceRedraw == true || i >= minselstart ||
! 		 (i >= (int) m_imPreeditText.length() || 
! 		  m_imPreeditText[i].unicode() != c)))
! 	    {
! 	 	redraw_p = p; redraw_x = x;
!             }
! #else	/* !FAST_REDRAW */
! 	    if (redraw_x == -1)
! 	    {
! 		redraw_p = p; redraw_x = x;
! 	    }
! #endif	/* !FAST_REDRAW */
! 
!             data[x] = dft;
! 	    data[x++].c = c;
! 	    m_imEnd ++;
!             if (tmpwcwidth == 2)
!             {
! 		// Check the wrapping.
! 		if (x >= columns)
! 		{
! 		        disstrU[p ++] = data[x-1].c = ' ';
! 			break;
! 		}
! 		data[x] = dft;
! 		data[x++].c = 0;
! 	        m_imEnd ++;
! 	    }
! 
! 	    disstrU[p ++] = c;
! 
! 	    // Check a selection end point.
! 	    if ((i + 1) == CursorPos + QMAX(1, SelLen))
! 		m_imSelEnd = xpos + x;
!      	}
! 
! 	int y = QMIN(lines - 1, (xpos/columns));
! 	
! 	// Check if the boundary of the preedit area is located at
! 	// the middle of a wide character in the underlying screen.
! 	if (i == (int) NText.length() && i > 0)  // The last segment.
! 	{
! 		const ca*  img = &image[y*columns];
! 		if (img[x].c == 0 && img[x-1].c != 0 && x < columns && x > 0)
! 		{
! 			if (redraw_x < 0)
! 			{
! 				redraw_x = x; redraw_p = p;
! 			}
! 			data[x] = dft;
! 			disstrU[p ++] = data[x ++].c = ' ';
! 			m_imEnd ++;
! 		}
! 	}
  
! 	// Render the screen.
! 	if (redraw_x >= 0 && x - redraw_x > 0)
! 	{
! 	    // The fake cursor
! 	    int fcursorlen = 0;
! 	    if (xpos + redraw_x == m_imStart && p > 0)	// The first segment.
!             	if (konsole_wcwidth(disstrU[0]) == 1)
! 			fcursorlen = 1;
! 
! 	    const ca *attr = &image[y*columns + redraw_x];
!             QColor fColor = attr->f.color(color_table);
!   	    QColor bColor = attr->b.color(color_table);
! 
! 	    m_isIMEdit = true;
! 
! 	    tmpRect = QRect(bX + tLx + font_w * redraw_x,
! 		           bY + tLy + font_h * y, 
! 			   font_w * (x - redraw_x), font_h);
! #define	IM_UNDERLINE
! #ifdef	IM_UNDERLINE
!             if (attr->isTransparent(color_table))
! 		   erase(tmpRect);
! 	    else
!           	   paint.fillRect(tmpRect, bColor);
! #else	/* IM_UNERLINE */
! 	   paint.fillRect(tmpRect, Qt::darkCyan);   
! #endif	/* IM_UNDERLINE */           
! 
!             if (redraw_p >= 0 && p - redraw_p > 0)
!             {
! 		if (m_imSelStart < m_imSelEnd &&
! 		   !(xpos + redraw_x >  m_imSelEnd ||
! 		     xpos + x <= m_imSelStart))
! 		{
! 			int xlen, sels = redraw_x;
! 			if (xpos + redraw_x <= m_imSelStart &&
! 			    m_imSelStart < xpos + x)
! 				sels = (m_imSelStart % columns);
! 			xlen = QMIN(x - sels,
! 				    m_imSelEnd - xpos - sels);
! 		        tmpRect = QRect(bX + tLx + font_w * sels,
! 		                        bY + tLy + font_h * y, 
! 					font_w * xlen, font_h);
!                         paint.fillRect(tmpRect, Qt::darkGray);   
! 		}
! 
!        		paint.setPen(fColor);
!      		QString unistr(&disstrU[redraw_p], p - redraw_p);
! 		int a = font_a + m_lineSpacing / 2;
! 		if (wcwidth == 2)
! 		{
!      			drawTextFixed(paint, bX + tLx + font_w * redraw_x,
! 		   		bY + tLy + font_h * y, unistr, &data[redraw_x]);
! 		}
! 		else
! 		{
!       			paint.drawText(bX + tLx + font_w * redraw_x,
! 			        bY + tLy + font_h * y + a,
! 				unistr, -1, 
! 				bidiEnabled ? QPainter::Auto : QPainter::LTR );
! 		}
! 
! #ifdef	IM_UNDERLINE
! 	        if (x - fcursorlen - redraw_x > 0)
!                 {
! 	        	// Draw an underline.
!       	        	paint.drawLine(bX + tLx + font_w * (redraw_x + fcursorlen), 
! 		     		bY + tLy + font_h * y + a + 1,
!                      		bX + tLx + font_w * (x - fcursorlen) - 1,
! 		     		bY + tLy + font_h * y + a + 1);
! 		}
! #endif	/* IM_UNDERLINE */
! 
! 	        if (fcursorlen > 0)
! 	        {
! 	         	tmpRect = QRect(bX + tLx + font_w * redraw_x,
! 		           bY + tLy + font_h * y /* + a */, 
! 			   font_w * fcursorlen, font_h /* - 2 * a */);
!           	 	paint.fillRect(tmpRect, fColor);
!        			paint.setPen(bColor);
!      		        QString tmpstr(&disstrU[0], 1);
!       			paint.drawText(bX + tLx + font_w * redraw_x,
! 			        bY + tLy + font_h * y + a, tmpstr, -1, 
! 				bidiEnabled ? QPainter::Auto : QPainter::LTR );
!        			paint.setPen(fColor);
!                 }
! 	    }
!        }
  
!        if (x == columns)
!        {
! 	     x = 0;
! 	     xpos += columns;
!        }
    }
  
!   for ( ; xpos + x < oimEnd; x = 0, xpos += columns)
!   {
! 	int xlen = QMIN(columns - x, oimEnd - x - xpos);
! 	int y = QMIN(lines - 1, (xpos/columns));
  
!         tmpRect = QRect(bX + tLx + font_w * x,
! 		        bY + tLy + font_h * y, font_w * xlen, font_h);
!   	paintContents(paint, tmpRect, backgroundPixmap() != 0);
    }
+ 	 
+   drawFrame(&paint);
+   paint.end();
+   setUpdatesEnabled(true);
  
!   m_imPreeditText = NText;
!   m_imCursorPos = CursorPos;
!   m_imSelLen = SelLen;
!   m_isIMForceRedraw = false;
! 
! #ifdef	IM_EVENT_DEBUG
!   const char *s = (e == NULL) ? "refresh" : "normal";
!   printf("Compose(%s): %d %d %d %d: %d %d %d \n", s,
!          m_imStart, m_imEnd, m_imSelStart, m_imSelEnd,
! 	 NText.length(), CursorPos, SelLen);
! #endif
! }
  
! void TEWidget::imEndEvent( QIMEvent *e )
! {
  
!   // In the case of SCIM buggy behavior
!   QString NText = QString::null;
!   if (e != NULL)
! 	NText = e->text();
! 
!   if (m_imStart < 0)
!   {
! 	  m_imEnd = m_imStart = m_cursorCol + m_cursorLine * columns;
!           m_imSelStart = m_imSelEnd = 0;
! #ifdef	IM_EVENT_DEBUG
!   printf("DelayStart(E): %d %d %d %d \n", 
!          m_imStart, m_imEnd, m_imSelStart, m_imSelEnd);
! #endif
!   }
!   
!   // Before call paintContents(), we should turn m_isIMEdit off.
!   m_isIMEdit = m_isIMForceRedraw = false;
!   m_imCursorPos = 0;
!   m_imSelLen = 0;
!   
!   // Sanity check
!   if (image != NULL && m_imStart < m_imEnd)
!   {	// Clear all preedit strings.
!   	QPainter paint;
!   	setUpdatesEnabled(false);
!   	paint.begin( this );
!   	QPoint tL  = contentsRect().topLeft();
!  	int tLx = tL.x();
! 	int tLy = tL.y();
!   	int cpos, xpos, xlen;
! 
!   	cpos = m_imStart;
!   	xpos = (m_imStart%columns);
!   	xlen = QMIN(columns - xpos, m_imEnd - cpos);
!   	while (cpos < m_imEnd)
!   	{
! 		int y = QMIN(lines - 1, cpos/columns);
! 		QRect tmpRect = QRect(bX + tLx + font_w * xpos,
! 			bY + tLy + font_h * y, font_w * xlen, font_h);
! 		paintContents(paint, tmpRect, backgroundPixmap() != 0);
!         	cpos += xlen;
! 		xlen = QMIN(columns, m_imEnd - cpos);
! 		xpos = 0;
!   	}
!   	drawFrame(&paint);
!   	paint.end();
!   	setUpdatesEnabled(true);
!   }
! 
!   // Calculte the true cursor position for the next im_start 
!   // in case of the non empty event queue
!   int i, xpos, xlen;
!   for (i = 0, xpos = m_imStart; i < (int) NText.length(); i ++)
!   {
! 	int xres = columns - (xpos % columns);
! 	xlen = konsole_wcwidth(NText[i].unicode());
! 	if (xres < xlen)
! 		xpos += xres;
! 	xpos += xlen;
!   }
! 
!   // All informations are cleared here.
!   m_imStart = xpos;
!   m_imEnd = m_imStart;
!   m_imSelStart = m_imSelEnd = 0;
!   m_imPreeditText = QString::null;
!   
!   // Emit key events.
!   if (NText.length() > 0 ) {
!       QKeyEvent ke(QEvent::KeyPress, 0, -1, 0, NText);
!       emit keyPressedSignal( &ke );
!   }
! 
! #ifdef	IM_EVENT_DEBUG
!   if (e == NULL)
!   	printf("End(Buggy): %d %d %d %d\n", 
!          	m_imStart, m_imEnd, m_imSelStart, m_imSelEnd);
!   else
!   	printf("End: %d %d %d %d: %d %d %d \n", 
!          	m_imStart, m_imEnd, m_imSelStart, m_imSelEnd,
! 	 e->text().length(), e->cursorPos(), e->selectionLength());
! #endif
  }
  
  // Override any Ctrl+<key> accelerator when pressed with the keyboard
*** konsole/konsole/konsole_wcwidth.cpp.ORG	2007-11-22 09:47:00.000000000 +0900
--- konsole/konsole/konsole_wcwidth.cpp	2007-12-02 22:43:38.000000000 +0900
***************
*** 65,71 ****
   * in ISO 10646.
   */
  
! int konsole_wcwidth(Q_UINT16 ucs)
  {
    /* sorted list of non-overlapping intervals of non-spacing characters */
    static const struct interval combining[] = {
--- 65,72 ----
   * in ISO 10646.
   */
  
! static int __konsole_wcwidth(Q_UINT16);
! static int __konsole_wcwidth(Q_UINT16 ucs)
  {
    /* sorted list of non-overlapping intervals of non-spacing characters */
    static const struct interval combining[] = {
***************
*** 131,137 ****
        (ucs >= 0x20000 && ucs <= 0x2ffff) */));
  }
  
! #if 0
  /*
   * The following function is the same as konsole_wcwidth(), except that
   * spacing characters in the East Asian Ambiguous (A) category as
--- 132,138 ----
        (ucs >= 0x20000 && ucs <= 0x2ffff) */));
  }
  
! #if 1
  /*
   * The following function is the same as konsole_wcwidth(), except that
   * spacing characters in the East Asian Ambiguous (A) category as
***************
*** 140,146 ****
   * encodings who want to migrate to UCS. It is not otherwise
   * recommended for general use.
   */
! int konsole_wcwidth_cjk(Q_UINT16 ucs)
  {
    /* sorted list of non-overlapping intervals of East Asian Ambiguous
     * characters */
--- 141,147 ----
   * encodings who want to migrate to UCS. It is not otherwise
   * recommended for general use.
   */
! int konsole_wcwidth(Q_UINT16 ucs)
  {
    /* sorted list of non-overlapping intervals of East Asian Ambiguous
     * characters */
***************
*** 184,191 ****
      { 0x226E, 0x226F }, { 0x2282, 0x2283 }, { 0x2286, 0x2287 },
      { 0x2295, 0x2295 }, { 0x2299, 0x2299 }, { 0x22A5, 0x22A5 },
      { 0x22BF, 0x22BF }, { 0x2312, 0x2312 }, { 0x2460, 0x24BF },
!     { 0x24D0, 0x24E9 }, { 0x2500, 0x254B }, { 0x2550, 0x2574 },
!     { 0x2580, 0x258F }, { 0x2592, 0x2595 }, { 0x25A0, 0x25A1 },
      { 0x25A3, 0x25A9 }, { 0x25B2, 0x25B3 }, { 0x25B6, 0x25B7 },
      { 0x25BC, 0x25BD }, { 0x25C0, 0x25C1 }, { 0x25C6, 0x25C8 },
      { 0x25CB, 0x25CB }, { 0x25CE, 0x25D1 }, { 0x25E2, 0x25E5 },
--- 185,200 ----
      { 0x226E, 0x226F }, { 0x2282, 0x2283 }, { 0x2286, 0x2287 },
      { 0x2295, 0x2295 }, { 0x2299, 0x2299 }, { 0x22A5, 0x22A5 },
      { 0x22BF, 0x22BF }, { 0x2312, 0x2312 }, { 0x2460, 0x24BF },
!     { 0x24D0, 0x24E9 }, 
! #if	0	// Graphic line chars 
!     { 0x2500, 0x254B }, 
! #endif
!     { 0x2550, 0x2574 },
!     { 0x2580, 0x258F }, 
! #if	0	// Meshed square
!     { 0x2592, 0x2595 }, 
! #endif
!     { 0x25A0, 0x25A1 },
      { 0x25A3, 0x25A9 }, { 0x25B2, 0x25B3 }, { 0x25B6, 0x25B7 },
      { 0x25BC, 0x25BD }, { 0x25C0, 0x25C1 }, { 0x25C6, 0x25C8 },
      { 0x25CB, 0x25CB }, { 0x25CE, 0x25D1 }, { 0x25E2, 0x25E5 },
***************
*** 202,208 ****
  	       sizeof(ambiguous) / sizeof(struct interval) - 1))
      return 2;
  
!   return konsole_wcwidth(ucs);
  }
  #endif
  
--- 211,217 ----
  	       sizeof(ambiguous) / sizeof(struct interval) - 1))
      return 2;
  
!   return __konsole_wcwidth(ucs);
  }
  #endif