[wiki-app] Updates from Symbio

1. Fixed a problem that some search result was left on the screen when displaying the "type a word" message 2. Fixed the problem of inverting the links at simulator 3. Enable the continuous deletion when holding the backspace key Signed-off-by: Christopher Hall <hsw@openmoko.com>
wikireader · Jun 18, 2010 · f552a0d · f552a0d
1 parent 92cd140
commit f552a0d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/wiki-app/glyph.c b/wiki-app/glyph.c
@@ -221,12 +221,12 @@ int render_string_and_clear(const int font, int start_x,
 	{
 		if (clear_start_x < start_x)
 			guilib_clear_area(clear_start_x, clear_start_y, start_x - 1,
-				clear_end_y < start_x + height ? clear_end_y : start_x + height - 1);
+				clear_end_y < start_y + height ? clear_end_y : start_y + height - 1);
 		if (clear_end_x >= width)
 			guilib_clear_area(width, clear_start_y, clear_end_x,
-				clear_end_y < start_x + height ? clear_end_y : start_x + height - 1);
+				clear_end_y < start_y + height ? clear_end_y : start_y + height - 1);
 		if (clear_end_y >= start_y + height)
-			clear_start_y = start_x + height;
+			clear_start_y = start_y + height;
 		else
 			clear_start_x = -1;
 	}

diff --git a/wiki-app/lcd_buf_draw.c b/wiki-app/lcd_buf_draw.c
@@ -2208,6 +2208,7 @@ void invert_link_area(int article_link_number)
 	if (start_y >= 0 || end_y < LCD_HEIGHT_LINES)
 	{
 		// guilib_invert_area will only invert (x, y) within LCD range
+		guilib_fb_lock();
 		guilib_invert_area(start_x, start_y, end_x, end_y);
 		guilib_invert_area(start_x, start_y, start_x, start_y);
 		guilib_invert_area(start_x, end_y, start_x, end_y);

diff --git a/wiki-app/wikilib.c b/wiki-app/wikilib.c
@@ -1370,7 +1370,6 @@ int wikilib_run(void)
 			sleep = 0;
 		}
 
-#ifdef INCLUDED_FROM_KERNEL
 		time_now = get_time_ticks();
 		if(display_mode == DISPLAY_MODE_INDEX)
 		{
@@ -1423,8 +1422,6 @@ int wikilib_run(void)
 			}
 		}
 
-#endif
-
 		if (!more_events && display_mode == DISPLAY_MODE_INDEX && fetch_search_result(0, 0, 0))
 		{
 			sleep = 0;
@@ -1475,6 +1472,9 @@ int wikilib_run(void)
 			last_event_time = get_time_ticks();
 			break;
 		case WL_INPUT_EV_TYPE_TOUCH:
+#ifndef INCLUDED_FROM_KERNEL
+			ev.touch_event.ticks = get_time_ticks();
+#endif
 			handle_touch(&ev);
 			last_event_time = ev.touch_event.ticks;
 			break;