--- a/libgui/qterminal/libqterminal/unix/Screen.h	Thu Jan 01 18:47:36 2015 -0800
+++ b/libgui/qterminal/libqterminal/unix/Screen.h	Tue Jan 20 08:26:57 2015 -0500
@@ -56,21 +56,21 @@
     characters from the program currently running in the terminal.
     From this stream it creates an image of characters which is ultimately
     rendered by the display widget ( TerminalDisplay ).  Some types of emulation
-    may have more than one screen image. 
+    may have more than one screen image.
 
     getImage() is used to retrieve the currently visible image
     which is then used by the display widget to draw the output from the
-    terminal. 
+    terminal.
 
     The number of lines of output history which are kept in addition to the current
-    screen image depends on the history scroll being used to store the output.  
+    screen image depends on the history scroll being used to store the output.
     The scroll is specified using setScroll()
     The output history can be retrieved using writeToStream()
 
-    The screen image has a selection associated with it, specified using 
+    The screen image has a selection associated with it, specified using
     setSelectionStart() and setSelectionEnd().  The selected text can be retrieved
     using selectedText().  When getImage() is used to retrieve the the visible image,
-    characters which are part of the selection have their colours inverted.   
+    characters which are part of the selection have their colours inverted.
 */
 class Screen
 {
@@ -79,9 +79,9 @@
     Screen(int lines, int columns);
     ~Screen();
 
-    // VT100/2 Operations 
+    // VT100/2 Operations
     // Cursor Movement
-    
+
     /** Move the cursor up by @p n lines. */
     void cursorUp    (int n);
     /** Move the cursor down by @p n lines. */
@@ -99,28 +99,28 @@
     /**
      * Sets the margins for scrolling the screen.
      *
-     * @param topLine The top line of the new scrolling margin. 
-     * @param bottomLine The bottom line of the new scrolling margin. 
+     * @param topLine The top line of the new scrolling margin.
+     * @param bottomLine The bottom line of the new scrolling margin.
      */
     void setMargins  (int topLine , int bottomLine);
-    /** Returns the top line of the scrolling region. */ 
+    /** Returns the top line of the scrolling region. */
     int topMargin() const;
     /** Returns the bottom line of the scrolling region. */
     int bottomMargin() const;
 
-    /** 
+    /**
      * Resets the scrolling margins back to the top and bottom lines
      * of the screen.
      */
     void setDefaultMargins();
-    
-    /** 
-     * Moves the cursor down one line, if the MODE_NewLine mode 
+
+    /**
+     * Moves the cursor down one line, if the MODE_NewLine mode
      * flag is enabled then the cursor is returned to the leftmost
      * column first.
      *
      * Equivalent to NextLine() if the MODE_NewLine flag is set
-     * or index() otherwise. 
+     * or index() otherwise.
      */
     void NewLine     ();
     /**
@@ -129,7 +129,7 @@
      */
     void NextLine    ();
 
-    /** 
+    /**
      * Move the cursor down one line.  If the cursor is on the bottom
      * line of the scrolling region (as returned by bottomMargin()) the
      * scrolling region is scrolled up by one line instead.
@@ -141,12 +141,12 @@
      * region is scrolled down by one line instead.
      */
     void reverseIndex();
-    
-    /** 
-     * Scroll the scrolling region of the screen up by @p n lines. 
-     * The scrolling region is initially the whole screen, but can be changed 
+
+    /**
+     * Scroll the scrolling region of the screen up by @p n lines.
+     * The scrolling region is initially the whole screen, but can be changed
      * using setMargins()
-     */ 
+     */
     void scrollUp(int n);
     /**
      * Scroll the scrolling region of the screen down by @p n lines.
@@ -154,47 +154,47 @@
      * using setMargins()
      */
     void scrollDown(int n);
-    
-    /** 
-     * Moves the cursor to the beginning of the current line. 
+
+    /**
+     * Moves the cursor to the beginning of the current line.
      * Equivalent to setCursorX(0)
      */
     void Return      ();
-    /** 
+    /**
      * Moves the cursor one column to the left and erases the character
      * at the new cursor position.
      */
     void BackSpace   ();
-    /** 
+    /**
      * Moves the cursor @p n tab-stops to the right.
      */
     void Tabulate    (int n = 1);
-    /** 
-     * Moves the cursor @p n tab-stops to the left. 
+    /**
+     * Moves the cursor @p n tab-stops to the left.
      */
     void backTabulate(int n);
-    
+
     // Editing
-    
-    /** 
-     * Erase @p n characters beginning from the current cursor position. 
+
+    /**
+     * Erase @p n characters beginning from the current cursor position.
      * This is equivalent to over-writing @p n characters starting with the current
      * cursor position with spaces.
-     * If @p n is 0 then one character is erased. 
+     * If @p n is 0 then one character is erased.
      */
     void eraseChars  (int n);
-    /** 
-     * Delete @p n characters beginning from the current cursor position. 
-     * If @p n is 0 then one character is deleted. 
+    /**
+     * Delete @p n characters beginning from the current cursor position.
+     * If @p n is 0 then one character is deleted.
      */
     void deleteChars (int n);
     /**
      * Insert @p n blank characters beginning from the current cursor position.
-     * The position of the cursor is not altered.  
+     * The position of the cursor is not altered.
      * If @p n is 0 then one character is inserted.
      */
     void insertChars (int n);
-    /** 
+    /**
      * Removes @p n lines beginning from the current cursor position.
      * The position of the cursor is not altered.
      * If @p n is 0 then one line is removed.
@@ -208,14 +208,14 @@
     void insertLines (int n);
     /** Clears all the tab stops. */
     void clearTabStops();
-    /**  Sets or removes a tab stop at the cursor's current column. */ 
+    /**  Sets or removes a tab stop at the cursor's current column. */
     void changeTabStop(bool set);
-   
+
     /** Resets (clears) the specified screen @p mode. */
     void resetMode   (int mode);
     /** Sets (enables) the specified screen @p mode. */
     void setMode     (int mode);
-    /** 
+    /**
      * Saves the state of the specified screen @p mode.  It can be restored
      * using restoreMode()
      */
@@ -224,19 +224,19 @@
     void restoreMode (int mode);
     /** Returns whether the specified screen @p mode is enabled or not .*/
     bool getMode     (int mode) const;
-   
-    /** 
-     * Saves the current position and appearence (text color and style) of the cursor. 
-     * It can be restored by calling restoreCursor() 
-     */ 
+
+    /**
+     * Saves the current position and appearence (text color and style) of the cursor.
+     * It can be restored by calling restoreCursor()
+     */
     void saveCursor  ();
     /** Restores the position and appearence of the cursor.  See saveCursor() */
     void restoreCursor();
-   
-    /** Clear the whole screen, moving the current screen contents into the history first. */ 
+
+    /** Clear the whole screen, moving the current screen contents into the history first. */
     void clearEntireScreen();
-    /** 
-     * Clear the area of the screen from the current cursor position to the end of 
+    /**
+     * Clear the area of the screen from the current cursor position to the end of
      * the screen.
      */
     void clearToEndOfScreen();
@@ -251,16 +251,16 @@
     void clearToEndOfLine();
     /** Clears from the current cursor position to the beginning of the line. */
     void clearToBeginOfLine();
-    
+
     /** Fills the entire screen with the letter 'E' */
     void helpAlign   ();
-       
-    /** 
-     * Enables the given @p rendition flag.  Rendition flags control the appearence 
+
+    /**
+     * Enables the given @p rendition flag.  Rendition flags control the appearence
      * of characters on the screen.
      *
      * @see Character::rendition
-     */  
+     */
     void setRendition  (int rendition);
     /**
      * Disables the given @p rendition flag.  Rendition flags control the appearence
@@ -269,8 +269,8 @@
      * @see Character::rendition
      */
     void resetRendition(int rendition);
-    
-    /** 
+
+    /**
      * Sets the cursor's foreground color.
      * @param space The color space used by the @p color argument
      * @param color The new foreground color.  The meaning of this depends on
@@ -288,22 +288,22 @@
      * @see CharacterColor
      */
     void setBackColor  (int space, int color);
-    /** 
-     * Resets the cursor's color back to the default and sets the 
+    /**
+     * Resets the cursor's color back to the default and sets the
      * character's rendition flags back to the default settings.
      */
     void setDefaultRendition();
-    
+
     /** Returns the column which the cursor is positioned at. */
     int  getCursorX() const;
     /** Returns the line which the cursor is positioned on. */
     int  getCursorY() const;
-   
-	/** TODO Document me */ 
+
+	/** TODO Document me */
 	void clear();
-    /** 
+    /**
      * Sets the position of the cursor to the 'home' position at the top-left
-     * corner of the screen (0,0) 
+     * corner of the screen (0,0)
      */
     void home();
     /**
@@ -320,29 +320,29 @@
      * <li>New line mode is disabled.  TODO Document me</li>
      * </ul>
      *
-     * If @p clearScreen is true then the screen contents are erased entirely, 
+     * If @p clearScreen is true then the screen contents are erased entirely,
      * otherwise they are unaltered.
      */
     void reset(bool clearScreen = true);
-   
-    /** 
-     * Displays a new character at the current cursor position. 
-     * 
+
+    /**
+     * Displays a new character at the current cursor position.
+     *
      * If the cursor is currently positioned at the right-edge of the screen and
-     * line wrapping is enabled then the character is added at the start of a new 
+     * line wrapping is enabled then the character is added at the start of a new
      * line below the current one.
      *
-     * If the MODE_Insert screen mode is currently enabled then the character 
-     * is inserted at the current cursor position, otherwise it will replace the 
-     * character already at the current cursor position.  
-     */ 
+     * If the MODE_Insert screen mode is currently enabled then the character
+     * is inserted at the current cursor position, otherwise it will replace the
+     * character already at the current cursor position.
+     */
     void ShowCharacter(unsigned short c);
-    
+
     // Do composition with last shown character FIXME: Not implemented yet for KDE 4
     void compose(const QString& compose);
-    
-    /** 
-     * Resizes the image to a new fixed size of @p new_lines by @p new_columns.  
+
+    /**
+     * Resizes the image to a new fixed size of @p new_lines by @p new_columns.
      * In the case that @p new_columns is smaller than the current number of columns,
      * existing lines are not truncated.  This prevents characters from being lost
      * if the terminal display is resized smaller and then larger again.
@@ -351,9 +351,9 @@
      *  truncated when making the screen image smaller)
      */
     void resizeImage(int new_lines, int new_columns);
-    
+
     /**
-     * Returns the current screen image.  
+     * Returns the current screen image.
      * The result is an array of Characters of size [getLines()][getColumns()] which
      * must be freed by the caller after use.
      *
@@ -364,9 +364,9 @@
      */
     void getImage( Character* dest , int size , int startLine , int endLine ) const;
 
-    /** 
+    /**
      * Returns the additional attributes associated with lines in the image.
-     * The most important attribute is LINE_WRAPPED which specifies that the 
+     * The most important attribute is LINE_WRAPPED which specifies that the
      * line is wrapped,
      * other attributes control the size of characters in the line.
      */
@@ -379,21 +379,21 @@
     int  getColumns() { return columns; }
     /** Return the number of lines in the history buffer. */
     int  getHistLines ();
-    /** 
-     * Sets the type of storage used to keep lines in the history. 
-     * If @p copyPreviousScroll is true then the contents of the previous 
+    /**
+     * Sets the type of storage used to keep lines in the history.
+     * If @p copyPreviousScroll is true then the contents of the previous
      * history buffer are copied into the new scroll.
      */
     void setScroll(const HistoryType& , bool copyPreviousScroll = true);
     /** Returns the type of storage used to keep lines in the history. */
     const HistoryType& getScroll();
-    /** 
+    /**
      * Returns true if this screen keeps lines that are scrolled off the screen
      * in a history buffer.
      */
     bool hasScroll();
 
-    /** 
+    /**
      * Sets the start of the selection.
      *
      * @param column The column index of the first character in the selection.
@@ -401,21 +401,21 @@
      * @param columnmode True if the selection is in column mode.
      */
     void setSelectionStart(const int column, const int line, const bool columnmode);
-    
+
     /**
      * Sets the end of the current selection.
      *
      * @param column The column index of the last character in the selection.
-     * @param line The line index of the last character in the selection. 
-     */ 
+     * @param line The line index of the last character in the selection.
+     */
     void setSelectionEnd(const int column, const int line);
-   
+
     /**
      * Retrieves the start of the selection or the cursor position if there
      * is no selection.
      */
     void getSelectionStart(int& column , int& line);
-    
+
     /**
      * Retrieves the end of the selection or the cursor position if there
      * is no selection.
@@ -427,19 +427,19 @@
 
     void setBusySelecting(bool busy) { sel_busy = busy; }
 
-    /** 
+    /**
  	 * 	Returns true if the character at (@p column, @p line) is part of the
- 	 *  current selection. 
- 	 */ 
+ 	 *  current selection.
+ 	 */
     bool isSelected(const int column,const int line) const;
 
-    /** 
-     * Convenience method.  Returns the currently selected text. 
-     * @param preserveLineBreaks Specifies whether new line characters should 
+    /**
+     * Convenience method.  Returns the currently selected text.
+     * @param preserveLineBreaks Specifies whether new line characters should
      * be inserted into the returned text at the end of each terminal line.
      */
     QString selectedText(bool preserveLineBreaks);
-	    
+	
 	/**
 	 * Copies part of the output to a stream.
 	 *
@@ -449,7 +449,7 @@
 	 */
 	void writeToStream(TerminalCharacterDecoder* decoder, int from, int to);
 
-    /** 
+    /**
      * Sets the selection to line @p no in the history and returns
      * the text of that line from the history buffer.
      */
@@ -459,11 +459,11 @@
 	 * Copies the selected characters, set using @see setSelBeginXY and @see setSelExtentXY
 	 * into a stream.
 	 *
-	 * @param decoder A decoder which converts terminal characters into text.  
-	 * PlainTextDecoder is the most commonly used decoder which coverts characters 
+	 * @param decoder A decoder which converts terminal characters into text.
+	 * PlainTextDecoder is the most commonly used decoder which coverts characters
 	 * into plain text with no formatting.
-     * @param preserveLineBreaks Specifies whether new line characters should 
-     * be inserted into the returned text at the end of each terminal line. 
+     * @param preserveLineBreaks Specifies whether new line characters should
+     * be inserted into the returned text at the end of each terminal line.
 	 */
 	void writeSelectionToStream(TerminalCharacterDecoder* decoder , bool
                                 preserveLineBreaks = true);
@@ -471,16 +471,16 @@
     /** TODO Document me */
     void checkSelection(int from, int to);
 
-	/** 
+	/**
 	 * Sets or clears an attribute of the current line.
-	 * 
+	 *
 	 * @param property The attribute to set or clear
 	 * Possible properties are:
 	 * LINE_WRAPPED:	 Specifies that the line is wrapped.
 	 * LINE_DOUBLEWIDTH: Specifies that the characters in the current line should be double the normal width.
 	 * LINE_DOUBLEHEIGHT:Specifies that the characters in the current line should be double the normal height.
      *                   Double-height lines are formed of two lines containing the same characters,
-     *                   with both having the LINE_DOUBLEHEIGHT attribute.  This allows other parts of the 
+     *                   with both having the LINE_DOUBLEHEIGHT attribute.  This allows other parts of the
      *                   code to work on the assumption that all lines are the same height.
 	 *
 	 * @param enable true to apply the attribute to the current line or false to remove it
@@ -488,24 +488,24 @@
 	void setLineProperty(LineProperty property , bool enable);
 
 
-    /** 
+    /**
      * Returns the number of lines that the image has been scrolled up or down by,
      * since the last call to resetScrolledLines().
      *
      * a positive return value indicates that the image has been scrolled up,
-     * a negative return value indicates that the image has been scrolled down. 
+     * a negative return value indicates that the image has been scrolled down.
      */
     int scrolledLines() const;
 
     /**
      * Returns the region of the image which was last scrolled.
      *
-     * This is the area of the image from the top margin to the 
+     * This is the area of the image from the top margin to the
      * bottom margin when the last scroll occurred.
      */
     QRect lastScrolledRegion() const;
 
-    /** 
+    /**
      * Resets the count of the number of lines that the image has been scrolled up or down by,
      * see scrolledLines()
      */
@@ -518,7 +518,7 @@
      *
      * If the history is not unlimited then it will drop
      * the oldest lines of output if new lines are added when
-     * it is full.  
+     * it is full.
      */
     int droppedLines() const;
 
@@ -528,25 +528,25 @@
      */
     void resetDroppedLines();
 
-	/** 
+	/**
  	 * Fills the buffer @p dest with @p count instances of the default (ie. blank)
  	 * Character style.
  	 */
 	static void fillWithDefaultChar(Character* dest, int count);
 
-private: 
+private:
 
-	//copies a line of text from the screen or history into a stream using a 
+	//copies a line of text from the screen or history into a stream using a
 	//specified character decoder
-	//line - the line number to copy, from 0 (the earliest line in the history) up to 
+	//line - the line number to copy, from 0 (the earliest line in the history) up to
 	//		 hist->getLines() + lines - 1
 	//start - the first column on the line to copy
 	//count - the number of characters on the line to copy
 	//decoder - a decoder which coverts terminal characters (an Character array) into text
     //appendNewLine - if true a new line character (\n) is appended to the end of the line
-	void copyLineToStream(int line, 
-                          int start, 
-                          int count, 
+	void copyLineToStream(int line,
+                          int start,
+                          int count,
                           TerminalCharacterDecoder* decoder,
                           bool appendNewLine,
                           bool preserveLineBreaks);
@@ -560,7 +560,7 @@
     //the parameters are specified as offsets from the start of the screen image.
     //the loc(x,y) macro can be used to generate these values from a column,line pair.
     void moveImage(int dest, int sourceBegin, int sourceEnd);
-    
+
     void scrollUp(int from, int i);
     void scrollDown(int from, int i);
 
@@ -593,11 +593,11 @@
 
     int _droppedLines;
 
-    QVarLengthArray<LineProperty,64> lineProperties;    
+    QVarLengthArray<LineProperty,64> lineProperties;
 	
     // history buffer ---------------
     HistoryScroll *hist;
-    
+
     // cursor location
     int cuX;
     int cuY;
@@ -632,7 +632,7 @@
 
     //
     // save cursor, rendition & states ------------
-    // 
+    //
 
     // cursor location
     int sa_cuX;
@@ -642,7 +642,7 @@
     quint8 sa_cu_re;
     CharacterColor sa_cu_fg;
     CharacterColor sa_cu_bg;
-    
+
     // last position where we added a character
     int lastPos;