Fixes for input methods:

1. Increase search / reset timer options in the UI up to 5 and 3s
2. Fix - reset the search timers when a the input method text is changed
3. Fix - make spacebar behave properly (insert character) when an input method is being used

Author: pjrobertson

Quicksilver/Code-QuickStepInterface/QSSearchObjectView.h

@@ -65,6 +65,7 @@ typedef NS_ENUM(NSUInteger, QSSearchMode) {
 
 	// whether or not the string in the underlying text editor should be 'sniffed' when editing (see QSObject_StringHandling.m - sniffString for more info)
 	BOOL shouldSniff;
+	BOOL hasMarkedTextState; // tracks input method composition state
     QSAction *alternateActionCounterpart;
 
 @public

Quicksilver/Code-QuickStepInterface/QSSearchObjectView.m

@@ -75,6 +75,7 @@ - (void)awakeFromNib {
 	preferredEdge = NSMaxXEdge;
 	partialString = [[NSMutableString alloc] initWithCapacity:1];
 	[partialString setString:@""];
+	hasMarkedTextState = NO;
 
 	matchedString = nil;
 
@@ -1089,10 +1090,12 @@ - (void)keyDown:(NSEvent *)theEvent {
         return;
 
 	if ([eventCharactersIgnoringModifiers isEqualToString:@" "]) {
-        if ([theEvent type] == NSEventTypeKeyDown) {
+        if ([theEvent type] == NSEventTypeKeyDown && ![self hasMarkedText]) {
             [self insertSpace:nil];
         }
-		return;
+			if (![self hasMarkedText]) {
+					return;
+			}
 	}
 
 	// ***warning  * have downshift move to indirect object
@@ -1662,10 +1665,31 @@ - (void)setMarkedText:(id)aString selectedRange:(NSRange)selRange {
     [self setMarkedText:aString selectedRange:selRange replacementRange:NSMakeRange(0, 0)];
 }
 
-- (void)setMarkedText:(id)aString selectedRange:(NSRange)selectedRange replacementRange:(NSRange)replacementRange {}
+- (void)setMarkedText:(id)aString selectedRange:(NSRange)selectedRange replacementRange:(NSRange)replacementRange {
+	// Set marked text state for input method composition
+	hasMarkedTextState = (aString != nil && [aString length] > 0);
+
+	// Extend timers when input method is composing text
+	// This prevents the search from timing out while user is typing with input methods
+
+	// Extend search timer
+	if ([searchTimer isValid]) {
+		[searchTimer setFireDate:[NSDate dateWithTimeIntervalSinceNow:[[NSUserDefaults standardUserDefaults] floatForKey:kSearchDelay]]];
+	}
 
-- (void)unmarkText {}
-- (BOOL)hasMarkedText { return NO; }
+	// Extend reset timer
+	if ([resetTimer isValid]) {
+		CGFloat resetDelay = [[NSUserDefaults standardUserDefaults] floatForKey:kResetDelay];
+		if (resetDelay) {
+			[resetTimer setFireDate:[NSDate dateWithTimeIntervalSinceNow:resetDelay]];
+		}
+	}
+}
+
+- (void)unmarkText {
+	hasMarkedTextState = NO;
+}
+- (BOOL)hasMarkedText { return hasMarkedTextState; }
 - (NSInteger)conversationIdentifier { return (long)self; }
 
 - (NSAttributedString *)attributedSubstringFromRange:(NSRange)theRange {