sync up with GuiLite

Author: idea4good

ExternalWindow/X11/xWindow.c

@@ -4,6 +4,10 @@
 #include <sys/shm.h>
 #include <errno.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <pthread.h>
+#include <sys/select.h> 
+#include <string.h>
 
 int WINDOW_WIDTH = 256;
 int WINDOW_HEIGHT = 256;
@@ -48,7 +52,7 @@ void parseArgument(int argc, char **argv)
         {
             printf("ipcrm -M 1\nand restart.\n");
         }
-        printf("shmget failed");
+        printf("shmget failed shmid:%d",shmid);
     }
 
     GuiLiteFb = shmat(shmid, 0, 0);

Hello3D/BuildLinux/HelloCube

@@ -45,7 +45,7 @@ int main(int argc, char** argv)
 	system("./.sync_build.sh Hello3D");
 
 	int color_bytes = 2;
-	int screen_width = 240;
+	int screen_width = 480;
 	int screen_height = 320;
 
 	FRAMEBUFFER_MODE fb_mode = FB_NULL_MODE;

Hello3D/BuildLinux/main.cpp

@@ -13,7 +13,7 @@
 extern "C" void startHello3D(void* phy_fb, int width, int height, int color_bytes, struct EXTERNAL_GFX_OP* gfx_op);
 extern void* getUiOfHello3D(int* width, int* height, bool force_update);
 
-#define UI_WIDTH 240
+#define UI_WIDTH 480
 #define UI_HEIGHT 320
 class GuiLiteThread: public QThread
 {

Hello3D/BuildMFC/Hello3DDlg.cpp

@@ -47,16 +47,18 @@
     - `chmod 777 *`
 2. Run locally(e.g, Ubuntu):
     - Run with framebuffer: `sudo ./Hello3D /dev/fb0`    /dev/fb0: The path of framebuffer device file.
-    - Run inside X Window: `sudo ./xWindow 240 320 | ./Hello3D shared-fb`
+    - Run inside X Window:
+        1. `sudo su`
+        2. `sudo ./xWindow 480 320 | ./Hello3D shared-fb`
 
 ## Cross compiler & Run on target:
 1. install compiler:
     - For ARM32: `sudo apt-get install g++-arm-linux-gnueabi gcc-arm-linux-gnueabi`
     - For ARM64: `sudo apt-get install g++-aarch64-linux-gnu gcc-aarch64-linux-gnu`
 2. Cross compile:
     - `cd Hello3D`
-    - For ARM32: `cmake -D CMAKE_C_COMPILER="/usr/bin/arm-linux-gnueabi-gcc" -D CMAKE_CXX_COMPILER="/usr/bin/arm-linux-gnueabi-g++" . && make`
-    - For ARM64: `cmake -D CMAKE_C_COMPILER="/usr/bin/aarch64-linux-gnu-gcc" -D CMAKE_CXX_COMPILER="/usr/bin/aarch64-linux-gnu-g++" . && make`
+    - For ARM32: `cmake -D CMAKE_C_COMPILER="/usr/bin/arm-linux-gnueabi-gcc" -D CMAKE_CXX_COMPILER="/usr/bin/arm-linux-gnueabi-g++" -D TARGET_ARCH="ARM" . && make`
+    - For ARM64: `cmake -D CMAKE_C_COMPILER="/usr/bin/aarch64-linux-gnu-gcc" -D CMAKE_CXX_COMPILER="/usr/bin/aarch64-linux-gnu-g++" -D TARGET_ARCH="ARM" . && make`
 3. Run on target Linux device:
     - Copy BuildLinux/Hello3D to target Linux device
     - `chmod 777 Hello3D`

Hello3D/BuildQt/mainwindow.cpp

@@ -12,9 +12,9 @@ void c_bitmap::draw_bitmap(c_surface* surface, int z_order, const BITMAP_INFO *p
 		lower_fb = surface->m_frame_layers[z_order - 1].fb;
 	}
 	unsigned int mask_rgb_16 = GL_RGB_32_to_16(mask_rgb);
-	int xsize = pBitmap->XSize;
-	int ysize = pBitmap->YSize;
-	const unsigned short* pData = (const unsigned short*)pBitmap->pData;
+	int xsize = pBitmap->width;
+	int ysize = pBitmap->height;
+	const unsigned short* pData = (const unsigned short*)pBitmap->pixel_color_array;
 	for (int j = 0; j < ysize; j++)
 	{
 		for (int i = 0; i < xsize; i++)
@@ -36,7 +36,7 @@ void c_bitmap::draw_bitmap(c_surface* surface, int z_order, const BITMAP_INFO *p
 }
 void c_bitmap::draw_bitmap(c_surface* surface, int z_order, const BITMAP_INFO* pBitmap, int x, int y, int src_x, int src_y, int width, int height, unsigned int mask_rgb)
 {
-	if (0 == pBitmap || (src_x + width > pBitmap->XSize) || (src_y + height > pBitmap->YSize))
+	if (0 == pBitmap || (src_x + width > pBitmap->width) || (src_y + height > pBitmap->height))
 	{
 		return;
 	}
@@ -47,10 +47,10 @@ void c_bitmap::draw_bitmap(c_surface* surface, int z_order, const BITMAP_INFO* p
 		lower_fb = surface->m_frame_layers[z_order - 1].fb;
 	}
 	unsigned int mask_rgb_16 = GL_RGB_32_to_16(mask_rgb);
-	const unsigned short* pData = (const unsigned short*)pBitmap->pData;
+	const unsigned short* pData = (const unsigned short*)pBitmap->pixel_color_array;
 	for (int j = 0; j < height; j++)
 	{
-		const unsigned short* p = &pData[src_x + (src_y + j) * pBitmap->XSize];
+		const unsigned short* p = &pData[src_x + (src_y + j) * pBitmap->width];
 		for (int i = 0; i < width; i++)
 		{
 			unsigned int rgb = *p++;
@@ -177,6 +177,7 @@ c_display::c_display(void* phy_fb, unsigned int display_width, unsigned int disp
 	m_phy_fb = phy_fb;
 	m_phy_read_index = m_phy_write_index = 0;
 	memset(m_surface_group, 0, sizeof(m_surface_group));
+	m_surface_index = 0;
 	m_surface_cnt = surface_cnt;
 	ASSERT(m_surface_cnt <= SURFACE_CNT_MAX);
 
@@ -185,33 +186,16 @@ c_display::c_display(void* phy_fb, unsigned int display_width, unsigned int disp
 		m_surface_group[i] = phy_fb ? new c_surface(this, surface_width, surface_height, color_bytes) : new c_surface_no_fb(this, surface_width, surface_height, color_bytes, gfx_op);
 	}
 }
-c_surface* c_display::alloc_surface(void* usr, Z_ORDER_LEVEL max_zorder)
+c_surface* c_display::alloc_surface(Z_ORDER_LEVEL max_zorder)
 {
-	int i = 0;
-	ASSERT(max_zorder < Z_ORDER_LEVEL_MAX);
-	while (i < m_surface_cnt)
-	{
-		if (m_surface_group[i]->m_usr == usr)
-		{
-			//repeat register
-			ASSERT(false);
-			return m_surface_group[i];
-		}
-		i++;
-	}
-	i = 0;
-	while (i < m_surface_cnt)
+	if(max_zorder >= Z_ORDER_LEVEL_MAX || m_surface_index >= m_surface_cnt)
 	{
-		if (m_surface_group[i]->m_usr == 0)
-		{	
-			m_surface_group[i]->set_surface(usr, max_zorder);
-			return m_surface_group[i];
-		}
-		i++;
+		ASSERT(false);
+		return 0;
 	}
-	//no surface for use
-	ASSERT(false);
-	return 0;
+	int i = m_surface_index++;
+	m_surface_group[i]->set_surface(max_zorder);
+	return m_surface_group[i];
 }
 int c_display::merge_surface(c_surface* s0, c_surface* s1, int x0, int x1, int y0, int y1, int offset)
 {
@@ -392,14 +376,13 @@ c_surface::c_surface(c_display* display,  unsigned int width, unsigned int heigh
 	m_display = display;
 	m_phy_fb = display->m_phy_fb;
 	m_phy_write_index = &display->m_phy_write_index;
-	m_fb = m_usr = 0;
+	m_fb = 0;
 	m_top_zorder = m_max_zorder = Z_ORDER_LEVEL_0;
 	m_is_active = false;
 	m_frame_layers[Z_ORDER_LEVEL_0].visible_rect = c_rect(0, 0, m_width, m_height);
 }
-void c_surface::set_surface(void* wnd_root, Z_ORDER_LEVEL max_z_order)
+void c_surface::set_surface(Z_ORDER_LEVEL max_z_order)
 {
-	m_usr = wnd_root;
 	m_max_zorder = max_z_order;
 	if (m_display->m_surface_cnt > 1)
 	{
@@ -479,6 +462,10 @@ void c_surface::draw_pixel_on_fb(int x, int y, unsigned int rgb)
 }
 void c_surface::fill_rect(int x0, int y0, int x1, int y1, unsigned int rgb, unsigned int z_order)
 {
+	x0 = (x0 < 0) ? 0 : x0;
+	y0 = (y0 < 0) ? 0 : y0;
+	x1 = (x1 > (m_width - 1)) ? (m_width - 1) : x1;
+	y1 = (y1 > (m_height - 1)) ? (m_height - 1) : y1;
 	rgb = GL_ROUND_RGB_32(rgb);
 	if (z_order == m_max_zorder)
 	{
@@ -507,11 +494,6 @@ void c_surface::fill_rect(int x0, int y0, int x1, int y1, unsigned int rgb, unsi
 }
 void c_surface::fill_rect_on_fb(int x0, int y0, int x1, int y1, unsigned int rgb)
 {
-	if (x0 < 0 || y0 < 0 || x1 < 0 || y1 < 0 ||
-		x0 >= m_width || x1 >= m_width || y0 >= m_height || y1 >= m_height)
-	{
-		ASSERT(false);
-	}
 	int display_width = m_display->get_width();
 	int display_height = m_display->get_height();
 	if (m_color_bytes == 4)
@@ -561,7 +543,6 @@ void c_surface::fill_rect_on_fb(int x0, int y0, int x1, int y1, unsigned int rgb
 			}
 		}
 	}
-	
 }
 unsigned int c_surface::get_pixel(int x, int y, unsigned int z_order)
 {
@@ -1161,29 +1142,6 @@ void c_wnd::wnd2screen(c_rect &rect) const
 	int b = (t + rect.Height() - 1);
 	rect.SetRect(l, t, r, b);
 }
-void c_wnd::screen2wnd(short &x, short &y) const
-{
-	c_wnd *parent = m_parent;
-	c_rect rect;
-	x -= m_wnd_rect.m_left;
-	y -= m_wnd_rect.m_top;
-	while ( 0 != parent )
-	{
-		parent->get_wnd_rect(rect);
-		x -= rect.m_left;
-		y -= rect.m_top;
-		parent = parent->m_parent;
-	}
-}
-void c_wnd::screen2wnd(c_rect &rect) const
-{
-	short l = rect.m_left;
-	short t = rect.m_top;
-	screen2wnd(l, t);
-	short r = l + rect.Width() - 1;
-	short b = t + rect.Height() - 1;
-	rect.SetRect(l, t, r, b);
-}
 c_wnd* c_wnd::set_child_focus(c_wnd * focus_child)
 {
 	ASSERT(0 != focus_child);
@@ -1403,13 +1361,13 @@ bool c_wnd::on_key(KEY_TYPE key)
 	}
 	return true;
 }
-void c_wnd::notify_parent(unsigned int msg_id, unsigned int ctrl_id, int param)
+void c_wnd::notify_parent(unsigned int msg_id, int param)
 {
 	if (!m_parent)
 	{
 		return;
 	}
-	const GL_MSG_ENTRY* entry = m_parent->FindMsgEntry(m_parent->GetMSgEntries(), MSG_TYPE_WND, msg_id, ctrl_id);
+	const GL_MSG_ENTRY* entry = m_parent->FindMsgEntry(m_parent->GetMSgEntries(), MSG_TYPE_WND, msg_id, m_resource_id);
 	if (0 == entry)
 	{
 		return;
@@ -1425,10 +1383,10 @@ void c_wnd::notify_parent(unsigned int msg_id, unsigned int ctrl_id, int param)
 		(m_parent->*msg_funcs.func_vvl)(param);
 		break;
 	case MSG_CALLBACK_VWV:
-		(m_parent->*msg_funcs.func_vwv)(ctrl_id);
+		(m_parent->*msg_funcs.func_vwv)(m_resource_id);
 		break;
 	case MSG_CALLBACK_VWL:
-		(m_parent->*msg_funcs.func_vwl)(ctrl_id, param);
+		(m_parent->*msg_funcs.func_vwl)(m_resource_id, param);
 		break;
 	default:
 		ASSERT(false);
@@ -1568,7 +1526,7 @@ int c_word::draw_single_char(c_surface* surface, int z_order, unsigned int utf8_
 		const LATTICE* p_lattice = get_lattice(font, utf8_code);
 		if (p_lattice)
 		{
-			draw_lattice(surface, z_order, x, y, p_lattice->width, font->height, p_lattice->p_data, font_color, bg_color);
+			draw_lattice(surface, z_order, x, y, p_lattice->width, font->height, p_lattice->pixel_gray_array, font_color, bg_color);
 			return p_lattice->width;
 		}
 	}
@@ -2130,15 +2088,15 @@ bool c_button::on_touch(int x, int y, TOUCH_ACTION action)
 	{
 		m_status = STATUS_FOCUSED;
 		on_paint();
-		notify_parent(GL_BN_CLICKED, get_id(), 0);
+		notify_parent(GL_BN_CLICKED, 0);
 	}
 	return true;
 }
 bool c_button::on_key(KEY_TYPE key)
 {
 	if (key == KEY_ENTER)
 	{
-		notify_parent(GL_BN_CLICKED, get_id(), 0);
+		notify_parent(GL_BN_CLICKED, 0);
 		return false;// Do not handle KEY_ENTER by other wnd.
 	}
 	return true;// Handle KEY_FOWARD/KEY_BACKWARD by parent wnd.
@@ -2829,12 +2787,12 @@ void c_keyboard::on_caps_clicked(unsigned int ctrl_id)
 void c_keyboard::on_enter_clicked(unsigned int ctrl_id)
 {
 	memset(m_str, 0, sizeof(m_str));
-    notify_parent(KEYBORAD_CLICK, get_id(), CLICK_ENTER);
+    notify_parent(KEYBORAD_CLICK, CLICK_ENTER);
 }
 void c_keyboard::on_esc_clicked(unsigned int ctrl_id)
 {
 	memset(m_str, 0, sizeof(m_str));
-	notify_parent(KEYBORAD_CLICK, get_id(), CLICK_ESC);
+	notify_parent(KEYBORAD_CLICK, CLICK_ESC);
 }
 void c_keyboard::on_del_clicked(unsigned int ctrl_id)
 {
@@ -2843,7 +2801,7 @@ void c_keyboard::on_del_clicked(unsigned int ctrl_id)
 		return;
 	}
 	m_str[--m_str_len] = 0;
-	notify_parent(KEYBORAD_CLICK, get_id(), CLICK_CHAR);
+	notify_parent(KEYBORAD_CLICK, CLICK_CHAR);
 }
 void c_keyboard::on_char_clicked(unsigned int ctrl_id)
 {//ctrl_id = char ascii code.
@@ -2866,7 +2824,7 @@ void c_keyboard::on_char_clicked(unsigned int ctrl_id)
 	ASSERT(false);
 InputChar:
 	m_str[m_str_len++] = ctrl_id;
-	notify_parent(KEYBORAD_CLICK, get_id(), CLICK_CHAR);
+	notify_parent(KEYBORAD_CLICK, CLICK_CHAR);
 }
 void c_keyboard::on_paint()
 {
@@ -3042,7 +3000,7 @@ void c_list_box::on_touch_down(int x, int y)
 		{
 			m_status = STATUS_FOCUSED;
 			on_paint();
-			notify_parent(GL_LIST_CONFIRM, get_id(), m_selected_item);
+			notify_parent(GL_LIST_CONFIRM, m_selected_item);
 		}        
 	}
 }
@@ -3065,7 +3023,7 @@ void c_list_box::on_touch_up(int x, int y)
 			m_status = STATUS_FOCUSED;
 			select_item((y - m_list_wnd_rect.m_top) / ITEM_HEIGHT);
 			on_paint();
-			notify_parent(GL_LIST_CONFIRM, get_id(), m_selected_item);
+			notify_parent(GL_LIST_CONFIRM, m_selected_item);
 		}
 		else
 		{
@@ -3180,7 +3138,7 @@ int c_slide_group::add_slide(c_wnd* slide, unsigned short resource_id, short x,
 		return -1;
 	}
 	c_surface* old_surface = get_surface();
-	c_surface* new_surface = old_surface->get_display()->alloc_surface(slide,max_zorder);
+	c_surface* new_surface = old_surface->get_display()->alloc_surface(max_zorder);
 	new_surface->set_active(false);
 	set_surface(new_surface);
 	slide->connect(this, resource_id ,0 , x, y, width, height, p_child_tree);
@@ -3219,7 +3177,7 @@ int c_slide_group::add_clone_silde(c_wnd* slide, unsigned short resource_id, sho
 		return -1;
 	}
 	c_surface* old_surface = get_surface();
-	c_surface* new_surface = old_surface->get_display()->alloc_surface(slide,max_zorder);
+	c_surface* new_surface = old_surface->get_display()->alloc_surface(max_zorder);
 	new_surface->set_active(false);
 	set_surface(new_surface);
 	c_wnd* page_tmp = slide->connect_clone(this,resource_id,0,x,y,width,height,p_child_tree);
@@ -3338,7 +3296,7 @@ void c_spin_box::on_touch_up(int x, int y)
 		m_value = m_cur_value;
 		m_status = STATUS_FOCUSED;
 		on_paint();
-		notify_parent(GL_SPIN_CONFIRM, get_id(), m_value);
+		notify_parent(GL_SPIN_CONFIRM, m_value);
 	}
 }
 void c_spin_box::on_focus()
@@ -3354,9 +3312,9 @@ void c_spin_box::on_kill_focus()
 }
 void c_spin_box::show_arrow_button()
 {
-	m_bt_up.connect(this, ID_BT_ARROW_UP, "\xe2\x96\xb2"/*▲*/, 0, m_wnd_rect.Height(), m_bt_up_rect.Width(),m_bt_up_rect.Height());
+	m_bt_up.connect(this, ID_BT_ARROW_UP, "\xe2\x96\xb2"/*unicode of up arrow*/, 0, m_wnd_rect.Height(), m_bt_up_rect.Width(),m_bt_up_rect.Height());
 	m_bt_up.show_window();
-	m_bt_down.connect(this, ID_BT_ARROW_DOWN, "\xe2\x96\xbc"/*▼*/, m_bt_up_rect.Width(), m_wnd_rect.Height(), m_bt_down_rect.Width(),m_bt_down_rect.Height());
+	m_bt_down.connect(this, ID_BT_ARROW_DOWN, "\xe2\x96\xbc"/*unicode of down arrow*/, m_bt_up_rect.Width(), m_wnd_rect.Height(), m_bt_down_rect.Width(),m_bt_down_rect.Height());
 	m_bt_down.show_window();
 	m_attr = (WND_ATTRIBUTION)(ATTR_VISIBLE | ATTR_FOCUS | ATTR_MODAL);
 }
@@ -3418,7 +3376,7 @@ void c_spin_box::on_arrow_up_bt_click(unsigned int ctr_id)
 		return;
 	}
 	m_cur_value += m_step;
-	notify_parent(GL_SPIN_CHANGE, get_id(), m_cur_value);
+	notify_parent(GL_SPIN_CHANGE, m_cur_value);
 	on_paint();
 }
 void c_spin_box::on_arrow_down_bt_click(unsigned int ctr_id)
@@ -3428,7 +3386,7 @@ void c_spin_box::on_arrow_down_bt_click(unsigned int ctr_id)
 		return;
 	}
 	m_cur_value -= m_step;
-	notify_parent(GL_SPIN_CHANGE, get_id(), m_cur_value);
+	notify_parent(GL_SPIN_CHANGE, m_cur_value);
 	on_paint();
 }
 void c_table::set_item(int row, int col, char* str, unsigned int color)