reduce the size of clip_info event.

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@306 bbd45198-f89e-11dd-88c7-29a3b14d5316

5 files changed, 189 insertions, 165 deletions

diff --git a/rtgui/common/rtgui_system.c b/rtgui/common/rtgui_system.c
index e07ba74e9c..d56c1220f0 100644
--- a/rtgui/common/rtgui_system.c
+++ b/rtgui/common/rtgui_system.c
@@ -659,167 +659,3 @@ void rtgui_free(void* ptr)
 	rt_free(ptr);
 }
 
-#if 0
-/*
- * read/write lock implementation
- */
-struct rtgui_rwlock* rtgui_rwlock_create()
-{
-    struct rtgui_rwlock* rwlock;
-
-    rwlock = rtgui_malloc(sizeof(struct rtgui_rwlock));
-    if (rwlock != RT_NULL)
-    {
-        rwlock->stat = RTGUI_RWLOCK_UNLOCK;
-        rwlock->reader_count = 0;
-
-        rt_sem_init(&(rwlock->rd_lock), "rwr", 0, RT_IPC_FLAG_FIFO);
-        rt_sem_init(&(rwlock->wr_lock), "rww", 0, RT_IPC_FLAG_FIFO);
-    }
-
-    return rwlock;
-}
-
-rt_err_t rtgui_rwlock_delete(struct rtgui_rwlock* rwlock)
-{
-    RT_ASSERT(rwlock != RT_NULL);
-
-    rt_sem_detach(&(rwlock->rd_lock));
-    rt_sem_detach(&(rwlock->wr_lock));
-
-    rtgui_free(rwlock);
-
-	return RT_EOK;
-}
-
-rt_err_t rtgui_rwlock_read_take(struct rtgui_rwlock* rwlock, rt_int32_t timeout)
-{
-    rt_err_t result;
-    rt_ubase_t level;
-
-    RT_ASSERT(rwlock != RT_NULL);
-    level = rt_hw_interrupt_disable();
-    switch (rwlock->stat)
-    {
-        case RTGUI_RWLOCK_UNLOCK:
-            break;
-
-        case RTGUI_RWLOCK_READING:
-            if (rwlock->wr_lock.parent.suspend_thread_count > 0)
-            {
-                /* suspend read thread */
-                result = rt_sem_take(&rwlock->rd_lock, timeout);
-                if (result != RT_EOK)
-                {
-                    rt_hw_interrupt_enable(level);
-                    return result;
-                }
-            }
-            break;
-
-        case RTGUI_RWLOCK_WRITTING:
-            /* suspend read thread */
-            result = rt_sem_take(&(rwlock->rd_lock), timeout);
-            if (result != RT_EOK)
-            {
-                rt_hw_interrupt_enable(level);
-                return result;
-            }
-            break;
-    }
-
-    /* get rwlock */
-    rwlock->reader_count ++;
-    rwlock->stat = RTGUI_RWLOCK_READING;
-
-    rt_hw_interrupt_enable(level);
-}
-
-rt_err_t rtgui_rwlock_write_take(struct rtgui_rwlock* rwlock, rt_int32_t timeout)
-{
-    rt_err_t result;
-    rt_ubase_t level;
-
-    RT_ASSERT(rwlock != RT_NULL);
-
-    level = rt_hw_interrupt_disable();
-	rwlock->stat = RTGUI_RWLOCK_WRITTING;
-	result = rt_sem_take(&(rwlock->wr_lock), timeout);
-
-	if (result != RT_EOK)
-	{
-		if (rwlock->wr_lock.parent.suspend_thread_count == 0)
-		{
-			if (rwlock->reader_count > 0)
-				rwlock->stat = RTGUI_RWLOCK_READING;
-		}
-	}
-    rt_hw_interrupt_enable(level);
-
-	return result;
-}
-
-rt_err_t rtgui_rwlock_read_release(struct rtgui_rwlock* rwlock)
-{
-    rt_ubase_t level;
-
-    RT_ASSERT(rwlock != RT_NULL);
-
-    level = rt_hw_interrupt_disable();
-    switch (rwlock->stat)
-    {
-    case RTGUI_RWLOCK_UNLOCK:
-        ASSERT(0);
-        break;
-
-    case RTGUI_RWLOCK_READING:
-        rwlock->reader_count --;
-        if (rwlock->reader_count == 0)
-            rwlock->stat = RTGUI_RWLOCK_UNLOCK;
-        break;
-
-    case RTGUI_RWLOCK_WRITTING:
-        rwlock->reader_count --;
-
-        if (rwlock->reader_count == 0)
-        {
-            /* resume write */
-            rt_sem_release(&(rwlock->wr_lock));
-        }
-        break;
-    }
-    rt_hw_interrupt_enable(level);
-}
-
-rt_err_t rtgui_rwlock_write_release(struct rtgui_rwlock* rwlock)
-{
-    rt_err_t result;
-    rt_ubase_t level;
-
-    RT_ASSERT(rwlock != RT_NULL);
-
-    level = rt_hw_interrupt_disable();
-	result = rt_sem_release(&(rwlock->wr_lock));
-
-	if ((result == RT_EOK) && (rwlock->wr_lock.parent.suspend_thread_count == 0))
-	{
-		rt_uint32_t index, reader_thread_count;
-
-		reader_thread_count = rwlock->rd_lock.parent.suspend_thread_count;
-		if (reader_thread_count > 0)
-		{
-			rwlock->stat = RTGUI_RWLOCK_READING;
-
-			/* resume all reader thread */
-			for (index = 0; index < reader_thread_count; index ++)
-			{
-				rt_sem_release(&(rwlock->rd_lock));
-			}
-		}
-		else rwlock->stat = RTGUI_RWLOCK_UNLOCK;
-	}
-	rt_hw_interrupt_enable(level);
-
-	return result;
-}
-#endif
diff --git a/rtgui/include/rtgui/rtgui_system.h b/rtgui/include/rtgui/rtgui_system.h
index a1368f118f..8c5bef7cc7 100644
--- a/rtgui/include/rtgui/rtgui_system.h
+++ b/rtgui/include/rtgui/rtgui_system.h
@@ -78,3 +78,4 @@ void* rtgui_malloc(rt_size_t size);
 void rtgui_free(void* ptr);

 

 #endif

+

diff --git a/rtgui/server/topwin.c b/rtgui/server/topwin.c
index 6f2c723010..af6b0971b9 100644
--- a/rtgui/server/topwin.c
+++ b/rtgui/server/topwin.c
@@ -25,6 +25,7 @@ struct rtgui_topwin* rtgui_server_focus_topwin = RT_NULL;
 
 static struct rtgui_list_node _rtgui_topwin_show_list;
 static struct rtgui_list_node _rtgui_topwin_hide_list;
+static struct rt_semaphore _rtgui_topwin_lock;
 
 static void rtgui_topwin_update_clip(void);
 static void rtgui_topwin_redraw(struct rtgui_rect* rect);
@@ -37,6 +38,9 @@ void rtgui_topwin_init()
 	/* init window list */
 	rtgui_list_init(&_rtgui_topwin_show_list);
 	rtgui_list_init(&_rtgui_topwin_hide_list);
+
+	rt_sem_init(&_rtgui_topwin_lock, 
+		"topwin", 1, RT_IPC_FLAG_FIFO);
 }
 
 static struct rtgui_topwin*
@@ -263,6 +267,60 @@ void rtgui_topwin_deactivate_win(struct rtgui_topwin* win)
 }
 
 /* raise window to front */
+#ifdef RTGUI_USING_SMALL_SIZE
+void rtgui_topwin_raise(struct rtgui_win* wid, rt_thread_t sender)
+{
+	struct rtgui_topwin* topwin;
+
+	/* find the topwin node */
+	topwin = rtgui_topwin_search_in_list(wid, &_rtgui_topwin_show_list);
+	if (topwin)
+	{
+		rt_int32_t count;
+		struct rtgui_list_node* node;
+		struct rtgui_event_clip_info eclip;
+
+		/* the window is already placed in front */
+		if (&(topwin->list) == _rtgui_topwin_show_list.next)
+		{
+			rtgui_server_focus_topwin = RT_NULL;
+			rtgui_topwin_activate_win(topwin);
+		    return ;
+		}
+
+		/* remove node from list */
+		rtgui_list_remove(&_rtgui_topwin_show_list, &(topwin->list));
+		/* add to front */
+		rtgui_list_insert(&_rtgui_topwin_show_list, &(topwin->list));
+
+		/* send clip info event */
+		count = 0;
+		for (node = _rtgui_topwin_show_list.next;
+			node != &(topwin->list);
+			node  = node->next)
+		{
+			struct rtgui_topwin* wnd = rtgui_list_entry(node, struct rtgui_topwin, list);
+
+			eclip.num_rect = count;
+			eclip.wid = wnd->wid;
+
+			count ++;
+
+			/* send to destination window */
+			rtgui_thread_send(wnd->tid, &(eclip.parent), sizeof(struct rtgui_event_clip_info));
+
+			/* reset clip info in title */
+			rtgui_toplevel_handle_clip(RTGUI_TOPLEVEL(wnd->title), &eclip);
+			rtgui_toplevel_update_clip(RTGUI_TOPLEVEL(wnd->title));
+			rtgui_region_subtract_rect(&(RTGUI_WIDGET(wnd->title)->clip),
+				&(RTGUI_WIDGET(wnd->title)->clip),
+				&(wnd->extent));
+		}
+
+		rtgui_topwin_activate_win(topwin);
+	}
+}
+#else
 void rtgui_topwin_raise(struct rtgui_win* wid, rt_thread_t sender)
 {
 	struct rtgui_topwin* topwin;
@@ -350,6 +408,7 @@ void rtgui_topwin_raise(struct rtgui_win* wid, rt_thread_t sender)
 		rtgui_topwin_activate_win(topwin);
 	}
 }
+#endif
 
 /* show a window */
 void rtgui_topwin_show(struct rtgui_event_win* event)
@@ -407,6 +466,32 @@ void rtgui_topwin_show(struct rtgui_event_win* event)
 }
 
 /* send clip info to panel */
+#ifdef RTGUI_USING_SMALL_SIZE
+void rtgui_topwin_update_clip_to_panel(struct rtgui_panel* panel)
+{
+	rt_uint32_t count;
+	rt_thread_t tid;
+	struct rtgui_list_node* node;
+	struct rtgui_event_clip_info eclip;
+
+	/* get topwin count  */
+	count = 0;
+	node = _rtgui_topwin_show_list.next;
+	while (node != RT_NULL)
+	{
+		count ++;
+		node = node->next;
+	}
+
+	/* send clip info event to panel */
+	RTGUI_EVENT_CLIP_INFO_INIT(&eclip);
+	eclip.num_rect = count; eclip.wid = RT_NULL;
+
+	/* send to the activated thread of panel */
+	tid = rtgui_panel_get_active_thread(panel);
+	rtgui_thread_send(tid, &eclip.parent, sizeof(struct rtgui_event_clip_info));
+}
+#else
 void rtgui_topwin_update_clip_to_panel(struct rtgui_panel* panel)
 {
 	rt_uint32_t count;
@@ -455,6 +540,7 @@ void rtgui_topwin_update_clip_to_panel(struct rtgui_panel* panel)
 	/* release clip info event */
 	rtgui_free(eclip);
 }
+#endif
 
 /* hide a window */
 void rtgui_topwin_hide(struct rtgui_event_win* event)
@@ -648,6 +734,60 @@ struct rtgui_topwin* rtgui_topwin_get_wnd(int x, int y)
 }
 
 extern struct rtgui_list_node _rtgui_panel_list;
+#ifdef RTGUI_USING_SMALL_SIZE
+static void rtgui_topwin_update_clip()
+{
+	rt_int32_t count = 0;
+	struct rtgui_event_clip_info eclip;
+	struct rtgui_list_node* node = _rtgui_topwin_show_list.next;
+
+	rtgui_list_foreach(node, &_rtgui_topwin_show_list)
+	{
+		struct rtgui_topwin* wnd;
+		wnd = rtgui_list_entry(node, struct rtgui_topwin, list);
+
+		eclip.num_rect = count;
+		eclip.wid = wnd->wid;
+
+		count ++;
+
+		/* send to destination window */
+		rtgui_thread_send(wnd->tid, &(eclip.parent), sizeof(struct rtgui_event_clip_info));
+
+		/* update clip in win title */
+		if (wnd->title != RT_NULL)
+		{
+			/* reset clip info */
+			rtgui_toplevel_handle_clip(RTGUI_TOPLEVEL(wnd->title), &eclip);
+			rtgui_toplevel_update_clip(RTGUI_TOPLEVEL(wnd->title));
+			rtgui_region_subtract_rect(&(RTGUI_WIDGET(wnd->title)->clip),
+				&(RTGUI_WIDGET(wnd->title)->clip),
+				&(wnd->extent));
+		}
+	}
+
+	/* send clip info to each panel */
+	eclip.wid = RT_NULL;
+	eclip.num_rect = count;
+
+	rtgui_list_foreach(node, &(_rtgui_panel_list))
+	{
+		struct rtgui_panel* panel;
+		struct rtgui_list_node* panel_node;
+
+		panel = rtgui_list_entry(node, struct rtgui_panel, sibling);
+
+		rtgui_list_foreach(panel_node, &(panel->thread_list))
+		{
+			struct rtgui_panel_thread* thread;
+			thread = rtgui_list_entry(panel_node, struct rtgui_panel_thread, list);
+
+			/* send clip info to panel */
+			rtgui_thread_send(thread->tid, &(eclip.parent),	sizeof(struct rtgui_event_clip_info));
+		}
+	}
+}
+#else
 static void rtgui_topwin_update_clip()
 {
 	rt_int32_t count = 0;
@@ -719,6 +859,7 @@ static void rtgui_topwin_update_clip()
 	/* release clip info event */
 	rtgui_free(eclip);
 }
+#endif
 
 static void rtgui_topwin_redraw(struct rtgui_rect* rect)
 {
@@ -834,6 +975,7 @@ void rtgui_topwin_append_monitor_rect(struct rtgui_win* wid, rtgui_rect_t* rect)
 	rtgui_mouse_monitor_append(&(win->monitor_list), rect);
 }
 
+#ifdef RTGUI_USING_SMALL_SIZE
 void rtgui_topwin_remove_monitor_rect(struct rtgui_win* wid, rtgui_rect_t* rect)
 {
 	struct rtgui_topwin* win;
@@ -851,7 +993,41 @@ void rtgui_topwin_remove_monitor_rect(struct rtgui_win* wid, rtgui_rect_t* rect)
 	/* remove rect from top window monitor rect list */
 	rtgui_mouse_monitor_remove(&(win->monitor_list), rect);
 }
+#endif
 
+/**
+ * get clip information for topwin
+ * wid, the self window id. If wid = NULL, get whole topwin clip information.
+ *
+ * @return the clip rect information
+ */
+void rtgui_topwin_get_clipinfo(struct rtgui_rect* rect_list, rt_int32_t count)
+{
+	struct rtgui_rect* rect;
+	struct rtgui_topwin* topwin;
+	struct rtgui_list_node* node;
+
+	if ((rect_list == RT_NULL) || (count == 0)) return ;
+
+	/* set to the header of list */
+	rect = rect_list;
+
+	rt_sem_take(&_rtgui_topwin_lock, RT_WAITING_FOREVER);
+	/* get all of topwin rect list */
+	rtgui_list_foreach(node, &_rtgui_topwin_show_list)
+	{
+		topwin = rtgui_list_entry(node, struct rtgui_topwin, list);
+
+		*rect = topwin->extent;
+		rect  ++;
+		count --;
+		if (count < 0) break;
+	}
+	rt_sem_release(&_rtgui_topwin_lock);
+}
+
+#ifdef RT_USING_FINSH
+#include <finsh.h>
 void rtgui_topwin_dump()
 {
 	struct rtgui_list_node* node;
@@ -871,3 +1047,6 @@ void rtgui_topwin_dump()
 		}
 	}
 }
+FINSH_FUNCTION_EXPORT(rtgui_topwin_dump, dump topwindow list);
+#endif
+
diff --git a/rtgui/server/topwin.h b/rtgui/server/topwin.h
index af5d72b3b8..8bfe394235 100644
--- a/rtgui/server/topwin.h
+++ b/rtgui/server/topwin.h
@@ -53,4 +53,7 @@ void rtgui_topwin_title_onmouse(struct rtgui_topwin* win, struct rtgui_event_mou
 void rtgui_topwin_append_monitor_rect(struct rtgui_win* wid, rtgui_rect_t* rect);
 void rtgui_topwin_remove_monitor_rect(struct rtgui_win* wid, rtgui_rect_t* rect);
 
+void rtgui_topwin_get_clipinfo(struct rtgui_rect* rect_list, rt_int32_t count);
+
 #endif
+
diff --git a/rtgui/widgets/toplevel.c b/rtgui/widgets/toplevel.c
index 953ee506c5..96285e6005 100644
--- a/rtgui/widgets/toplevel.c
+++ b/rtgui/widgets/toplevel.c
@@ -116,7 +116,7 @@ rt_bool_t rtgui_toplevel_event_handler(rtgui_widget_t* widget, rtgui_event_t* ev
 }
 
 void rtgui_toplevel_handle_clip(struct rtgui_toplevel* top,
-									   struct rtgui_event_clip_info* info)
+	struct rtgui_event_clip_info* info)
 {
 	RT_ASSERT(top != RT_NULL);
 	RT_ASSERT(info != RT_NULL);
@@ -136,8 +136,13 @@ void rtgui_toplevel_handle_clip(struct rtgui_toplevel* top,
 		info->num_rect);
 	top->external_clip_size = info->num_rect;
 
+#ifdef RTGUI_USING_SMALL_SIZE
+	/* get rect list from topwin list */
+	rtgui_topwin_get_clipinfo(top->external_clip_rect, top->external_clip_size);
+#else
 	/* copy rect array */
 	rt_memcpy(top->external_clip_rect, (void*)(info + 1), sizeof(rtgui_rect_t) * info->num_rect);
+#endif
 }
 
 #include <rtgui/driver.h> /* to get screen rect */