add option: --with-targetname=px30

Version.md

@@ -1,6 +1,6 @@
-Version 5.0.6 (2021/05/20)
+Version 5.0.7 (2021/06/30)
 
-This is the first official release of MiniGUI 5.0.x, the stable version.
+This is a bugfix release of MiniGUI 5.0.x, the stable version.
 
 Other packages for MiniGUI resource, tools, components, and samples:
 

src/Makefile.am

@@ -1,28 +1,19 @@
-if MG_MINIMALGDI
-COMMON_SUBDIRS = misc kernel sysres include 
-
-COMMON_LADD =               	\
-    kernel/libkernel.la     	\
-	sysres/libsysres.la         \
-    misc/libmisc.la         	
-else
 COMMON_SUBDIRS = libc misc main kernel sysres ial control ex_ctrl font gui mybmp include textedit
 
-COMMON_LADD =               	\
-    libc/liblibc.la         	\
-    misc/libmisc.la         	\
-    control/libcontrol.la   	\
-    ex_ctrl/libexctrl.la   		\
-    font/libfont.la         	\
+COMMON_LADD =                   \
+    libc/liblibc.la             \
+    misc/libmisc.la             \
+    control/libcontrol.la       \
+    ex_ctrl/libexctrl.la           \
+    font/libfont.la             \
     font/in-core/libincore.la   \
-    ial/libial.la           	\
-    gui/libgui.la           	\
-    main/libmain.la         	\
-    mybmp/libmybmp.la       	\
-    kernel/libkernel.la     	\
+    ial/libial.la               \
+    gui/libgui.la               \
+    main/libmain.la             \
+    mybmp/libmybmp.la           \
+    kernel/libkernel.la         \
     sysres/libsysres.la         \
-	textedit/libtextedit.la
-endif
+    textedit/libtextedit.la
 
 if MGRM_STANDALONE
 LITE_LADD = standalone/libstandalone.la
@@ -45,8 +36,8 @@ SUBDIRS = $(COMMON_SUBDIRS) $(NEWGAL_SUBDIRS) $(LITE_SUBDIRS)
 
 MGSOURCES = template.c template.h
 MGLIBADD =  $(COMMON_LADD)      \
-			$(LITE_LADD)        \
-			$(NEWGAL_LADD)
+            $(LITE_LADD)        \
+            $(NEWGAL_LADD)
 MGLDFLAGS = -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
 lib_LTLIBRARIES=libminigui_@MGLIB_SUFFIX@.la

src/gui/window.c

@@ -75,9 +75,6 @@
 #ifdef _MG_ENABLE_LICENSE
 #   include "../sysres/license/c_files/04_progressbar-bk.dat.c"
 #endif
-#ifndef __TARGET_UNKNOWN__
-unsigned int g_license_processor_id;
-#endif
 
 #ifdef _MGHAVE_MENU
 /* function defined in menu module. */

src/include/license.h

@@ -54,26 +54,12 @@
 #   define MG_LOCAL /* NULL */
 #endif
 
-/*
- * Common
- */
-#if defined(_MG_ENABLE_SPLASH) || \
-    defined(_MG_ENABLE_SCREENSAVER) || \
-    defined(_MG_ENABLE_WATERMARK)
-
-#define _MG_ENABLE_LICENSE 1
-
 enum {
     SPLASH_MINIGUI,
     SPLASH_FMSOFT,
     SPLASH_FEIMAN,
     SPLASH_PROGRESSBAR,
     SPLASH_PROGRESSBAR_BK,
-#if 0
-    WATERMARK_1,
-    WATERMARK_2,
-    WATERMARK_3,
-#endif /* _MG_ENABLE_WATERMARK */
     LICENSE_BITMAP_NR
 };
 
@@ -85,14 +71,14 @@ extern MG_LOCAL BITMAP g_license_bitmaps[];
 #define g_bitmap_progressbar    g_license_bitmaps[SPLASH_PROGRESSBAR]
 #define g_bitmap_progressbar_bk g_license_bitmaps[SPLASH_PROGRESSBAR_BK]
 
+#if defined(_MG_ENABLE_SPLASH) || defined(_MG_ENABLE_SCREENSAVER)
+#   define _MG_ENABLE_LICENSE      1
 MG_LOCAL void __mg_license_create(void);
 MG_LOCAL void __mg_license_destroy(void);
-
 #else
 #   define __mg_license_create() /* NULL */
 #   define __mg_license_destroy() /* NULL */
-#endif /* endif _MG_ENABLE_SPLASH or _MG_ENABLE_SCREENSAVER or _MG_ENABLE_WATERMARK*/
-
+#endif
 
 #ifdef _MG_ENABLE_SCREENSAVER
 MG_LOCAL void __mg_screensaver_create(void);
@@ -102,9 +88,6 @@ MG_LOCAL void __mg_screensaver_destroy(void);
 #   define __mg_screensaver_destroy() /* NULL */
 #endif
 
-/*
- * Splash
- */
 #ifdef _MG_ENABLE_SPLASH
 MG_LOCAL void __mg_splash_draw_framework(void);
 MG_LOCAL void __mg_splash_progress(void);
@@ -115,96 +98,11 @@ MG_LOCAL void __mg_splash_delay(void);
 #   define __mg_splash_delay() /* NULL */
 #endif /* endif _MG_ENABLE_SPLASH */
 
-/*
- * ScreenSaver & Watermark
- */
-#if defined(_MG_ENABLE_SCREENSAVER) || defined(_MG_ENABLE_WATERMARK)
-MG_LOCAL void __mg_license_on_input(void);
-MG_LOCAL void __mg_license_on_timeout(void);
-#else
-#   define __mg_license_on_input() /* NULL */
-#   define __mg_license_on_timeout() /* NULL */
-#endif /* _MG_ENABLE_SCREENSAVER || _MG_ENABLE_WATERMARK */
-
-/*
- * Product ID
- */
-#ifdef _MG_PRODUCTID
-typedef struct _product_id {
-    /* Fixed 8-byte code, help us to locate the struct in .so file */
-    unsigned char prefix[8];
-    /* the ID of the customer */
-    int customer_id;
-    /* svn version */
-    int version;
-    /* When does we compile the .so, in seconds */
-    int compile_date;
-    /* The size of the .so file */
-    int file_size;
-    /* The check sum of the .so file */
-    unsigned char checksum[16];
-} product_id_t;
-
-#define PRODUCT_ID_PREFIX 0xca, 0x3f, 0x2b, 0x43, 0x00, 0x33, 0xb0, 0xc3
-
-MG_LOCAL int license_get_customer_id(void);
-
-#endif /* _MG_PRODUCTID */
-
-/*
- * Tools to encrypt const variables
- */
-MG_LOCAL unsigned int LICENSE_ENCRYPTED_CONST_INT(unsigned int);
-MG_LOCAL char *LICENSE_ENCRYPTED_CONST_STRING(unsigned char *, int);
-
-/*
- * Processor ID
- */
-#ifdef _MG_PRODUCTID
-#   define LICENSE_CHECK_CUSTIMER_ID() \
-        do { \
-            if (! license_get_customer_id()) { \
-                return ERR_INVALID_ARGS; \
-            } \
-        } while(0)
-#else
-#   define LICENSE_CHECK_CUSTIMER_ID() /* NULL */
-#endif
-
-#ifdef __TARGET_UNKNOWN__
-
-#   define license_get_processor_id() /* NULL */
-#   define LICENSE_SET_MESSAGE_OFFSET() /* NULL */
-#   define LICENSE_MODIFY_MESSAGE(x) /* NULL */
-
-#else /* not __TARGET_UNKNOWN__ */
-
-extern MG_LOCAL unsigned int g_license_processor_id; /* window.c */
-MG_LOCAL void license_get_processor_id (void);
-#define LICENSE_PROCESSOR_ID_NONE (0xFC1D8B2A)
-
-extern MG_LOCAL unsigned int g_license_message_offset; /* zorder.c */
-
-#if defined (_WITH_TARGET_S3C6410)
-#    define REAL_PROCESSOR_ID LICENSE_ENCRYPTED_CONST_INT(0x1AE2FDFD /* 0x36410101 */)
-#elif defined (_WITH_TARGET_S3C2440)
-#    define REAL_PROCESSOR_ID LICENSE_ENCRYPTED_CONST_INT(0x3AA4FDFD /* 0x32440101 */)
-#elif defined (_WITH_TARGET_S3C2410)
-#    define REAL_PROCESSOR_ID LICENSE_ENCRYPTED_CONST_INT(0x3AE2FDFD /* 0x32410101 */)
-#elif defined (_WITH_TARGET_HI3560A)
-#    define REAL_PROCESSOR_ID LICENSE_ENCRYPTED_CONST_INT(0xFC38C9AD /* 0x35600200 */)
-#else
-#    define REAL_PROCESSOR_ID LICENSE_PROCESSOR_ID_NONE
-#endif
-
-#define LICENSE_SET_MESSAGE_OFFSET() do {g_license_message_offset=g_license_processor_id-(REAL_PROCESSOR_ID);}while (0)
-
-#define LICENSE_MODIFY_MESSAGE(pMsg) \
-    do { \
-        pMsg->message += g_license_message_offset; \
-        pMsg->hwnd -= g_license_message_offset / 2; \
-    } while (0)
-
-#endif /* __TARGET_UNKNOWN__ */
+#define __mg_license_on_input() /* NULL */
+#define __mg_license_on_timeout() /* NULL */
+#define LICENSE_CHECK_CUSTIMER_ID() /* NULL */
+#define license_get_processor_id() /* NULL */
+#define LICENSE_SET_MESSAGE_OFFSET() /* NULL */
+#define LICENSE_MODIFY_MESSAGE(x) /* NULL */
 
 #endif /* LICENSE_H */

src/include/newgal.h

@@ -216,7 +216,10 @@ typedef struct GAL_Surface {
 
 #ifdef _MGUSE_PIXMAN
     pixman_image_t *pix_img;            /* The pixman image object for this surface */
-    void           *blit_ctxt;          /* blitting context */
+    pixman_image_t *msk_img;
+    uint16_t        pix_op;
+    uint16_t        pix_filter;
+    uint32_t        pix_alpha_bits;
 #endif
 
 #if IS_COMPOSITING_SCHEMA
@@ -818,13 +821,6 @@ static inline BOOL GAL_CheckPixmanFormats (GAL_Surface *src, GAL_Surface *dst)
     return FALSE;
 }
 
-typedef struct GAL_BlittingContext {
-    uint16_t op;
-    uint16_t filter;
-    uint32_t alpha_bits;
-    pixman_image_t *msk_img;
-} GAL_BlittingContext;
-
 int GAL_SetupBlitting (GAL_Surface *src, GAL_Surface *dst, DWORD ops);
 
 int GAL_CleanupBlitting (GAL_Surface *src, GAL_Surface *dst);

src/kernel/Makefile.am

@@ -3,17 +3,12 @@ AM_CPPFLAGS = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include
 
 noinst_LTLIBRARIES = libkernel.la
 
-if MG_MINIMALGDI
-libkernel_la_SOURCES = init-lite.c fixstr.c \
-                       blockheap.c
-else
 libkernel_la_SOURCES = timer.c init.c init-lite.c \
                        desktop-ths.c desktop-sa.c desktop-procs.c \
                        cursor.c cursor-procs.c cursor-sa.c \
                        sharedres.c message.c event.c listenfd.c \
                        blockheap.c fixstr.c slotset.c zorder.c sem-manager.c \
                        compsor-manager.c compsor-fallback.c
-endif
 
 EXTRA_DIST= desktop.c desktop-comm.c cursor-comm.c makefile.ng makefile.msvc
 

src/kernel/compsor-fallback.c

@@ -1303,7 +1303,7 @@ static void transit_to_layer (CompositorCtxt* ctxt, MG_Layer* to_layer)
         }
     }
 
-    _DBG_PRINTF ("Average time to composite the layers: %u (times: %u)\n", total_time_ms / total_times, total_times);
+    _DBG_PRINTF ("Average time to composite the layers: %ums (times: %u)\n", total_time_ms / total_times, total_times);
 }
 
 CompositorOps __mg_fallback_compositor = {

src/kernel/zorder.c

@@ -67,9 +67,6 @@
 #ifdef _MG_ENABLE_LICENSE
 #   include "../sysres/license/c_files/03_progressbar.dat.c"
 #endif
-#ifndef __TARGET_UNKNOWN__
-unsigned int g_license_message_offset;
-#endif
 
 #ifdef _MGRM_PROCESSES
 #   include "ourhdr.h"

src/libc/mgslice.c

@@ -1472,7 +1472,7 @@ void mg_slice_debug_tree_statistics (void)
                 su / bf, en, ex);
     }
     else
-        _MG_PRINTF("MGSlice: MemChecker: root=NULL\n");
+        _DBG_PRINTF("MGSlice: MemChecker: root=NULL\n");
 
     pthread_mutex_unlock (&smc_tree_mutex);
 

src/misc/Makefile.am

@@ -5,13 +5,9 @@ EXTRA_DIST= misc.c systext.c rwops.c endianrw.c nposix.c clipboard.c \
             math.c about.c error.c sockio.c rc4.c rc4.h \
             makefile.ng makefile.msvc
 
-if MG_MINIMALGDI
-libmisc_la_SOURCES = misc.c math.c rwops.c nposix.c
-else
 libmisc_la_SOURCES = misc.c systext.c rwops.c endianrw.c nposix.c clipboard.c \
                 math.c about.c license.c anon_file.c rbtree.c map.c \
                 error.c sockio.c
-endif
 
 SRC_FILES = $(libmisc_la_SOURCES)
 LIB_NAME=libmisc

src/misc/license.c

@@ -69,11 +69,7 @@
 
 #include "license.h"
 
-#undef _MG_ENABLE_WATERMARK /* XXX: Always disable watermark */
-
-#if defined(_MG_ENABLE_SPLASH) || \
-    defined(_MG_ENABLE_SCREENSAVER) || \
-    defined(_MG_ENABLE_WATERMARK)
+#if defined(_MG_ENABLE_SPLASH) || defined(_MG_ENABLE_SCREENSAVER)
 BITMAP g_license_bitmaps[LICENSE_BITMAP_NR];
 
 #ifndef _MG_LICENSE_SCREENSAVER_TIMEOUT
@@ -94,90 +90,16 @@ BITMAP g_license_bitmaps[LICENSE_BITMAP_NR];
 #define _MG_LICENSE_SPLASH_MSEC (40)
 #endif
 
-#if defined(_MG_ENABLE_SCREENSAVER) || \
-    defined(_MG_ENABLE_WATERMARK)
+#if defined(_MG_ENABLE_SCREENSAVER)
 static int  s_tick_last_input;
 static BOOL screensaver_running;
 extern int dskCreateTopZOrderNode (int cli, const RECT *rc);
 extern int dskDestroyTopZOrderNode (int cli, int idx_znode);
 extern void dskRefreshAllClient (const RECT* invrc);
 #endif
+
 #endif
 
-/***********************************************************
- * Product ID
- ***********************************************************/
-#ifdef _MG_PRODUCTID
-
-static unsigned char product_id_buffer[40] = {
-    PRODUCT_ID_PREFIX,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-};
-
-/* use this for splash display customer id by humingming 2010.8.12 */
-int license_get_customer_id(void) {
-    return ((product_id_t*)product_id_buffer)->customer_id;
-}
-
-#else
-//#   warning PRODUCT_ID_is_DISABLED
-#endif
-
-/***********************************************************
- * Watermark
- ***********************************************************/
-#ifdef _MG_ENABLE_WATERMARK
-
-#define MARGINSPACE 5
-
-typedef struct _CornerInfo{
-    POINT   pos;
-    HWND    hwnd;
-    BITMAP* bmp;
-}CornerInfo;
-
-static CornerInfo fourcorner_info[4] = {
-    {{MARGINSPACE, MARGINSPACE} },
-    {{-MARGINSPACE, MARGINSPACE} },
-    {{MARGINSPACE,  -MARGINSPACE} },
-    {{-MARGINSPACE, -MARGINSPACE} }
-};
-
-static void watermark_update(void)
-{
-    int i = 0;
-    for (i = 0; i < TABLESIZE(fourcorner_info); i++)
-        FillBoxWithBitmap (HDC_SCREEN_SYS,
-                fourcorner_info[i].pos.x, fourcorner_info[i].pos.y,
-                0, 0, fourcorner_info[i].bmp);
-}
-
-static void watermark_init(void)
-{
-    RECT rcScr = GetScreenRect();
-
-    fourcorner_info[0].bmp = &g_license_bitmaps[WATERMARK_1];
-    fourcorner_info[1].bmp = &g_license_bitmaps[WATERMARK_2];
-    fourcorner_info[2].bmp = &g_license_bitmaps[WATERMARK_3];
-    fourcorner_info[3].bmp = &g_license_bitmaps[WATERMARK_3];
-
-    /* right-top.*/
-    fourcorner_info[1].pos.x += RECTW(rcScr) - fourcorner_info[1].bmp->bmWidth;
-    /* left-bottom.*/
-    fourcorner_info[2].pos.y += RECTH(rcScr) - fourcorner_info[2].bmp->bmHeight;
-    /* right-bottom.*/
-    fourcorner_info[3].pos.x += RECTW(rcScr) - fourcorner_info[3].bmp->bmWidth;
-    fourcorner_info[3].pos.y += RECTH(rcScr) - fourcorner_info[3].bmp->bmHeight;
-}
-
-#else
-#   define watermark_update() /* NULL */
-#   define watermark_init() /* NULL */
-#endif /* _MG_ENABLE_WATERMARK */
-
 /***********************************************************
  * Screensaver
  ***********************************************************/
@@ -291,16 +213,7 @@ void __mg_splash_draw_framework (void)
     memset(text, 0, sizeof(text));
     SetRect(&rc_text, SPLASH_ID_X, SPLASH_ID_Y, SPLASH_ID_X+SPLASH_ID_W, RECTH(rcScr));
 
-#ifdef _MG_PRODUCTID
-    int customer_id = license_get_customer_id();
-    if (customer_id <= 0) {
-        sprintf(text, "SN: N/A");
-    } else {
-        sprintf(text, "SN: %d", customer_id);
-    }
-#else
     sprintf(text, "SN: N/A");
-#endif
 
     SetBkMode(HDC_SCREEN_SYS, BM_TRANSPARENT);
     DrawText(HDC_SCREEN_SYS, text, -1, &rc_text, DT_TOP | DT_RIGHT | DT_SINGLELINE);
@@ -351,133 +264,9 @@ void __mg_splash_delay (void)
 #   define splash_init() /* NULL */
 #endif /* _MG_ENABLE_SPLASH.*/
 
-/***********************************************************
- * License common
- ***********************************************************/
-static unsigned char const_trans_table[] = {
-    0x16, 0xfe, 0xaf, 0x06, 0xd6, 0x9d, 0x54, 0x98,
-    0x77, 0x36, 0xc1, 0xc7, 0x29, 0xf8, 0x64, 0x93,
-    0x2e, 0x6b, 0x2a, 0x3c, 0x12, 0x13, 0x23, 0xc9,
-    0xe2, 0xa3, 0xbd, 0xbe, 0xac, 0xdf, 0x91, 0xe5,
-    0xdc, 0x4a, 0xc0, 0xb8, 0xd3, 0x2c, 0x61, 0x60,
-    0x5b, 0x32, 0x37, 0x7e, 0xb7, 0x8e, 0x2b, 0x0b,
-    0x19, 0x50, 0x40, 0xf3, 0x5f, 0x5d, 0x0d, 0x59,
-    0x21, 0xb1, 0xf6, 0xb5, 0xe3, 0xb3, 0x94, 0xa6,
-    0x31, 0x78, 0x84, 0xcc, 0x9c, 0x1b, 0x7b, 0x2f,
-    0x46, 0xa9, 0x9b, 0xda, 0xee, 0xd0, 0xc5, 0x7f,
-    0x4f, 0xc2, 0xa0, 0x9f, 0xe8, 0xb6, 0x3e, 0xbc,
-    0xf5, 0xae, 0x1c, 0x7d, 0xca, 0xf2, 0x65, 0xe0,
-    0x5a, 0x33, 0xfc, 0x3f, 0x49, 0x6d, 0xa1, 0x83,
-    0xcb, 0x4d, 0x0f, 0xf4, 0x55, 0xec, 0x8a, 0x04,
-    0x03, 0x7c, 0x86, 0x0e, 0xe4, 0xb4, 0x30, 0x99,
-    0xa2, 0xdb, 0x43, 0x8d, 0x92, 0x11, 0xef, 0x8f,
-    0x3a, 0xfb, 0xc6, 0x74, 0x0c, 0xb2, 0x97, 0x57,
-    0x48, 0x69, 0x70, 0x15, 0x22, 0x67, 0x18, 0x24,
-    0xf0, 0x82, 0xe7, 0x44, 0x9e, 0x53, 0x26, 0x81,
-    0x1f, 0xc8, 0x63, 0x96, 0x00, 0x20, 0x4e, 0xe1,
-    0x45, 0xd2, 0x75, 0x4c, 0x1d, 0x95, 0xbf, 0x52,
-    0x05, 0xd8, 0x09, 0x1e, 0x73, 0x1a, 0xd5, 0xab,
-    0x76, 0x08, 0xaa, 0xc4, 0x85, 0xb9, 0xd7, 0x8c,
-    0x02, 0x58, 0x4b, 0x47, 0x89, 0xdd, 0x62, 0xa5,
-    0xbb, 0x51, 0x10, 0xeb, 0x80, 0x79, 0xce, 0xfa,
-    0x87, 0xf1, 0xcf, 0xfd, 0x6a, 0x07, 0x2d, 0x38,
-    0xde, 0x41, 0x90, 0xb0, 0x25, 0x5e, 0xf7, 0xe6,
-    0x42, 0x9a, 0xe9, 0xed, 0x6c, 0xc3, 0x88, 0xd1,
-    0x6f, 0xd9, 0x7a, 0x0a, 0x68, 0x3d, 0x34, 0xcd,
-    0xff, 0x28, 0x3b, 0x35, 0x01, 0xea, 0x39, 0x8b,
-    0x14, 0x27, 0x56, 0xd4, 0x17, 0x72, 0xad, 0xa4,
-    0xf9, 0x5c, 0x66, 0xa8, 0x6e, 0xba, 0xa7, 0x71,
-};
-
-static unsigned char decrypt_byte(unsigned int ch) {
-    return const_trans_table[(ch-17)%256];
-}
-
-static void decrypt_mem(void *_data, int len) {
-    unsigned char *data = (unsigned char *)_data;
-    int i;
-    for (i=0; i<len; ++i) {
-        data[i] = decrypt_byte(data[i]);
-    }
-}
-
-unsigned int LICENSE_ENCRYPTED_CONST_INT(unsigned int src){
-    decrypt_mem(&src, sizeof(src));
-    return src;
-}
-
-char *LICENSE_ENCRYPTED_CONST_STRING(unsigned char *src, int len){
-    decrypt_mem(src, len);
-    src[len] = 0;
-    return (char *)src;
-}
-
-#if defined(_MG_ENABLE_SPLASH) || \
-    defined(_MG_ENABLE_SCREENSAVER) || \
-    defined(_MG_ENABLE_WATERMARK)
-
-/* disable cryptool */
-#undef ENCRYPTED
-
-#ifdef ENCRYPTED
-#   include "../sysres/license/c_files/key.c"
-#endif
+#if defined(_MG_ENABLE_SPLASH) || defined(_MG_ENABLE_SCREENSAVER)
 
 #include "../sysres/license/c_files/_splash_inner_res.c"
-/* XXX: Other resource files are included in desktop.c event.c message.c zorder.c and window.c */
-#if 0 /* XXX: WaterMark is REMOVED */
-#ifdef _MG_ENABLE_LICENSE
-#   include "../sysres/license/c_files/05_watermark-fmsoft.dat.c"
-#   include "../sysres/license/c_files/06_watermark-minigui.dat.c"
-#   include "../sysres/license/c_files/07_watermark-evaluation.dat.c"
-#endif /* _MG_ENABLE_SPLASH */
-#endif
-
-#ifdef ENCRYPTED
-#   include "rc4.c"
-#   define FRAGMENT_SIZE 512
-static unsigned char calc_sum(int len, const unsigned char *data) {
-    unsigned char sum;
-    int i;
-
-    for (i=0, sum=0; i<len; ++i) {
-        sum -= data[i];
-    }
-
-    return sum;
-}
-
-static int decrypted_len(int len) {
-    return len - ((len-1) / FRAGMENT_SIZE + 1) * sizeof(unsigned char);
-}
-
-static int my_decrypt(RC4_KEY *key, int in_len, unsigned char *in) {
-    int out_len = 0;
-    int i;
-    unsigned char sum;
-
-    for (i=0; i<in_len; /* NULL */) {
-        int n;
-
-        RC4(key, sizeof(unsigned char), &in[i], (unsigned char *)&sum);
-        i += sizeof(unsigned char);
-
-        n = (in_len - i > FRAGMENT_SIZE - sizeof(unsigned char)) ? (FRAGMENT_SIZE - sizeof(unsigned char)) : (in_len - i);
-        RC4(key, n, &in[i], &in[out_len]);
-
-        if (calc_sum(n, &in[out_len]) != sum) {
-            assert(0);
-            return -1;
-        }
-
-        i += n;
-        out_len += n;
-    }
-
-    assert(out_len == decrypted_len(in_len));
-    return out_len;
-}
-#endif /* ENCRYPTED */
 
 void __mg_license_create(void) {
     int i;
@@ -485,26 +274,20 @@ void __mg_license_create(void) {
     for (i=0; i<LICENSE_BITMAP_NR; ++i) {
         unsigned char *data;
         int len;
-#ifdef ENCRYPTED
-        RC4_KEY rc4key;
-#endif
 
         data = (unsigned char *)malloc(__mg_splash_splash_inner_res[i].data_len);
         memcpy(data, __mg_splash_splash_inner_res[i].data, __mg_splash_splash_inner_res[i].data_len);
         len = __mg_splash_splash_inner_res[i].data_len;
 
-#ifdef ENCRYPTED
-        RC4_set_key(&rc4key, sizeof(splash_crypto_key), splash_crypto_key);
-        len = my_decrypt(&rc4key, len, data);
-#endif
-
         LoadBitmapFromMem(HDC_SCREEN_SYS, &g_license_bitmaps[i], data, len, "png");
         free(data);
     }
 
     splash_init();
 
+#ifdef _MG_ENABLE_SCREENSAVER
     watermark_init();
+#endif
 }
 
 void __mg_license_destroy (void) {
@@ -514,120 +297,5 @@ void __mg_license_destroy (void) {
     }
 }
 
-#endif /* _MG_ENABLE_SPLASH || _MG_ENABLE_SCREENSAVER || _MG_ENABLE_WATERMARK */
+#endif /* defined(_MG_ENABLE_SPLASH) || defined(_MG_ENABLE_SCREENSAVER) */
 
-#if defined(_MG_ENABLE_SCREENSAVER) || defined(_MG_ENABLE_WATERMARK)
-void __mg_license_on_input(void)
-{
-#ifdef _MGRM_PROCESSES
-    RECT rcScr = GetScreenRect();
-#endif
-
-    s_tick_last_input = GetTickCount();
-
-    if (screensaver_running == TRUE) {
-        screensaver_running = FALSE;
-
-#if defined(_MGRM_THREADS)
-        {
-            HWND activeWnd = GetActiveWindow();
-            if (activeWnd) {
-                SendNotifyMessage(activeWnd, MSG_CANCELSCREENSAVER, 0, 0);
-            } else {
-                __mg_screensaver_hide();
-                SendNotifyMessage (HWND_DESKTOP, MSG_PAINT, 0, 0);
-            }
-        }
-#else
-        __mg_screensaver_hide();
-#if defined(_MGRM_PROCESSES)
-        dskRefreshAllClient (&rcScr);
-#elif defined(_MGRM_STANDALONE)
-        SendNotifyMessage (HWND_DESKTOP, MSG_PAINT, 0, 0);
-#else
-#   error
-#endif
-
-#endif
-
-    }
-}
-
-void __mg_license_on_timeout(void)
-{
-    static unsigned int old_tick_count;
-    unsigned int current_tick_count;
-
-#ifdef _MGRM_PROCESSES
-    if (!mgIsServer) {
-        return;
-    }
-#endif
-
-    current_tick_count = GetTickCount();
-
-    if (screensaver_running == TRUE) {
-        /* screensaver is running, update the picture */
-        if ((current_tick_count - old_tick_count) > _MG_LICENSE_SCREENSAVER_UPDATE_TIME) {
-            old_tick_count = current_tick_count;
-            screensaver_update();
-        }
-    } else {
-        /* screensaver is not running, show it */
-        if ((current_tick_count - s_tick_last_input) > _MG_LICENSE_SCREENSAVER_TIMEOUT) {
-            screensaver_running = TRUE;
-            __mg_screensaver_show();
-        }
-    }
-}
-#endif /* _MG_ENABLE_SCREENSAVER || _MG_ENABLE_WATERMARK */
-
-/***********************************************************
- * Processor ID
- ***********************************************************/
-#ifndef __TARGET_UNKNOWN__
-void license_get_processor_id (void) {
-    g_license_processor_id = LICENSE_PROCESSOR_ID_NONE;
-#if defined(_WITH_TARGET_S3C6410) || defined(_WITH_TARGET_S3C2440) || defined(_WITH_TARGET_S3C2410)  \
-    || defined (_WITH_TARGET_HI3560A)
-    {
-        int fd;
-        unsigned char *addr;
-        off_t SFR_offest;
-        size_t cpuid_offest;
-        unsigned char path[8] = "\x58\x1f\x6f\xc1\x58\x76\x6f\x76" /* "/dev/mem" */;
-
-        fd = open(LICENSE_ENCRYPTED_CONST_STRING(path, sizeof(path)), O_RDWR);
-        if (fd <= 0) {
-            return;
-        }
-
-#ifdef _WITH_TARGET_S3C6410
-        SFR_offest = LICENSE_ENCRYPTED_CONST_INT(0x3CADA1AD /* 0x7E00F000 */);
-        cpuid_offest = LICENSE_ENCRYPTED_CONST_INT(0xADADFD9F /* 0x00000118 */);
-#elif _WITH_TARGET_HI3560A
-        SFR_offest = LICENSE_ENCRYPTED_CONST_INT(0xD3BCADAD /* 0x101E0000 */);
-        cpuid_offest = LICENSE_ENCRYPTED_CONST_INT(0xADAD8470 /* 0x00000EE0 */);
-#else /* 2440, 2410 */
-        SFR_offest = LICENSE_ENCRYPTED_CONST_INT(0x03ADADAD /* 0x56000000 */);
-        cpuid_offest = LICENSE_ENCRYPTED_CONST_INT(0xADADADE4 /* 0x000000B0 */);
-#endif
-
-        addr = mmap(NULL, (4<<10), PROT_READ, MAP_SHARED, fd, SFR_offest);
-
-#if _WITH_TARGET_HI3560A
-        g_license_processor_id = *(unsigned int*)(addr+cpuid_offest+12) << 24 |
-                                 *(unsigned int*)(addr+cpuid_offest+8) << 16  |
-                                 *(unsigned int*)(addr+cpuid_offest+4) << 8   |
-                                 *(unsigned int*)(addr+cpuid_offest);
-#else
-        g_license_processor_id = *(unsigned int*)(addr+cpuid_offest);
-#endif
-        munmap(addr, (4<<10));
-        close(fd);
-    }
-#else
-//#   warning PROCESSOR_ID_verfication_is_DISABLED_on_this_target
-#endif
-}
-#endif /* __TARGET_UNKNOWN__ */

src/newgal/blit.c

@@ -332,39 +332,37 @@ int GAL_CalculateBlit(GAL_Surface *surface)
 int GAL_SetupBlitting (GAL_Surface *src, GAL_Surface *dst, DWORD ops)
 {
     if (GAL_CheckPixmanFormats (src, dst)) {
-        GAL_BlittingContext* ctxt;
-        src->blit_ctxt = malloc (sizeof (GAL_BlittingContext));
-        if (src->blit_ctxt == NULL)
-            return -1;
-
-        ctxt = src->blit_ctxt;
         if ((src->flags & GAL_SRCALPHA) && src->format->alpha != GAL_ALPHA_OPAQUE) {
-            memset (&ctxt->alpha_bits, src->format->alpha, sizeof(uint32_t));
-            ctxt->msk_img = pixman_image_create_bits_no_clear (PIXMAN_a8, 1, 1,
-                    &ctxt->alpha_bits, 4);
-            if (ctxt->msk_img)
-                pixman_image_set_repeat (ctxt->msk_img, PIXMAN_REPEAT_NORMAL);
+            memset (&src->pix_alpha_bits, src->format->alpha, sizeof(uint32_t));
+            src->msk_img = pixman_image_create_bits_no_clear (PIXMAN_a8, 1, 1,
+                    &src->pix_alpha_bits, 4);
+            if (src->msk_img)
+                pixman_image_set_repeat (src->msk_img, PIXMAN_REPEAT_NORMAL);
         }
         else
-            ctxt->msk_img = NULL;
+            src->msk_img = NULL;
 
         ops &= COLOR_BLEND_FLAGS_MASK;
         if (ops == COLOR_BLEND_LEGACY) {
             if ((src->flags & GAL_SRCPIXELALPHA) && src->format->Amask && src != dst) {
-                ctxt->op = PIXMAN_OP_OVER;
+                src->pix_op = PIXMAN_OP_OVER;
             }
             else {
-                ctxt->op = PIXMAN_OP_SRC;
+                src->pix_op = PIXMAN_OP_SRC;
             }
         }
         else {
-            ctxt->op = ops;
+            src->pix_op = ops;
         }
 
-        if (ctxt->op > PIXMAN_OP_HSL_LUMINOSITY ||
-                ctxt->op < PIXMAN_OP_CLEAR) {
-            ctxt->op = PIXMAN_OP_SRC;
+        if (src->pix_op > PIXMAN_OP_HSL_LUMINOSITY ||
+                src->pix_op < PIXMAN_OP_CLEAR) {
+            src->pix_op = PIXMAN_OP_SRC;
         }
+
+        /* reset transform and filter */
+        pixman_image_set_transform (src->pix_img, NULL);
+        pixman_image_set_filter (src->pix_img, PIXMAN_FILTER_NEAREST, NULL, 0);
     }
 
     return 0;
@@ -372,12 +370,9 @@ int GAL_SetupBlitting (GAL_Surface *src, GAL_Surface *dst, DWORD ops)
 
 int GAL_CleanupBlitting (GAL_Surface *src, GAL_Surface *dst)
 {
-    if (src->blit_ctxt) {
-        GAL_BlittingContext* ctxt = src->blit_ctxt;
-        if (ctxt->msk_img)
-            pixman_image_unref (ctxt->msk_img);
-        free (src->blit_ctxt);
-        src->blit_ctxt = NULL;
+    if (src->msk_img) {
+        pixman_image_unref (src->msk_img);
+        src->msk_img = NULL;
     }
 
     return 0;
@@ -390,15 +385,8 @@ static int GAL_PixmanBlit (struct GAL_Surface *src, GAL_Rect *srcrect,
     pixman_image_t *msk_img;
     pixman_op_t op;
  
-    if (src->blit_ctxt) {
-        GAL_BlittingContext* ctxt = src->blit_ctxt;
-        msk_img = ctxt->msk_img;
-        op = (pixman_op_t)ctxt->op;
-    }
-    else {
-        msk_img = NULL;
-        op = PIXMAN_OP_SRC;
-    }
+    msk_img = src->msk_img;
+    op = (pixman_op_t)src->pix_op;
 
     _DBG_PRINTF ("srcrect: %d, %d, %dx%d; dstrect: %d, %d, %dx%d\n",
             srcrect->x, srcrect->y, srcrect->w, srcrect->h,

src/newgal/blit_N.c

@@ -1524,12 +1524,12 @@ GAL_loblit GAL_CalculateBlitN(GAL_Surface *surface, int blit_index)
         }
     } else {
         /* Now the meat, choose the blitter we want */
-            int a_need = 0;
-        if(dstfmt->Amask)
+        int a_need = 0;
+        if (dstfmt->Amask)
             a_need = srcfmt->Amask ? COPY_ALPHA : SET_ALPHA;
         table = normal_blit[srcfmt->BytesPerPixel-1];
-        for ( which=0; table[which].srcR; ++which ) {
-            if ( srcfmt->Rmask == table[which].srcR &&
+        for (which=0; table[which].srcR; ++which) {
+            if (srcfmt->Rmask == table[which].srcR &&
                  srcfmt->Gmask == table[which].srcG &&
                  srcfmt->Bmask == table[which].srcB &&
                  dstfmt->BytesPerPixel == table[which].dstbpp &&
@@ -1538,7 +1538,7 @@ GAL_loblit GAL_CalculateBlitN(GAL_Surface *surface, int blit_index)
                  dstfmt->Bmask == table[which].dstB &&
                  (a_need & table[which].alpha) == a_need &&
                  (CPU_Flags()&table[which].cpu_flags) ==
-                 table[which].cpu_flags )
+                 table[which].cpu_flags)
                 break;
         }
         sdata->aux_data = table[which].aux_data;
@@ -1547,13 +1547,6 @@ GAL_loblit GAL_CalculateBlitN(GAL_Surface *surface, int blit_index)
             blitfun = BlitNtoNCopyAlpha;
     }
 
-#ifdef DEBUG_ASM
-    if ( (blitfun == GAL_BlitNtoN) || (blitfun == GAL_BlitNto1) )
-        fprintf(stderr, "Using C blit\n");
-    else
-        fprintf(stderr, "Using optimized C blit\n");
-#endif /* DEBUG_ASM */
-
     return(blitfun);
 }
 

src/newgal/drm/drmvideo.c

@@ -796,7 +796,7 @@ static GAL_Surface* create_surface_from_buffer (_THIS,
     surface->pixels_off = 0;
 #ifdef _MGUSE_PIXMAN
     surface->pix_img = NULL;
-    surface->blit_ctxt = NULL;
+    surface->msk_img = NULL;
 #endif
 #if IS_COMPOSITING_SCHEMA
     surface->shared_header = NULL;
@@ -1094,7 +1094,12 @@ static int open_drm_device(GAL_VideoDevice *device)
 
     _DBG_PRINTF("Try to load DRM driver: %s\n", driver_name);
 
+#if defined(__TARGET_PX30__)
+    fd = drmOpen("rockchip", NULL);
+#else
     fd = drmOpen(driver_name, NULL);
+#endif
+
     if (fd < 0) {
         _ERR_PRINTF("NEWGAL>DRM: drmOpen failed\n");
         free(driver_name);

src/newgal/fbcon/fbvideo.c

@@ -62,9 +62,6 @@
 
 #include "common.h"
 #include "minigui.h"
-#ifdef _MGRM_PROCESSES
-#include "client.h"
-#endif
 #include "newgal.h"
 #include "sysvideo.h"
 #include "pixels_c.h"
@@ -73,6 +70,11 @@
 #include "fbmatrox.h"
 #include "fbneomagic.h"
 
+#ifdef _MGRM_PROCESSES
+#include "client.h"
+#include "sharedres.h"
+#endif
+
 // #define FBCON_DEBUG     1
 // #define FBACCEL_DEBUG   1
 
@@ -105,12 +107,26 @@ static void FB_WaitIdle(_THIS);
 #include "../shadow-screen.h"
 #include "debug.h"
 
+#if defined(__TARGET_R818__)
+#define FBIO_CACHE_SYNC         0x4630
+#define FBIO_ENABLE_CACHE       0x4631
+#endif
+
 static BOOL FB_SyncUpdate (_THIS)
 {
     if (IsRectEmpty (&this->hidden->dirty_rc))
         return FALSE;
 
     if (shadowScreen_BlitToReal (this) == 0) {
+#if defined(__TARGET_R818__)
+        uintptr_t args[2];
+        args[0] = (uintptr_t)this->hidden->real_screen->pixels;
+        args[0] += this->hidden->real_screen->pitch * this->hidden->dirty_rc.top;
+        args[1] = this->hidden->real_screen->pitch * RECTH(this->hidden->dirty_rc);
+        if (ioctl (console_fd, FBIO_CACHE_SYNC, args) < 0) {
+            _WRN_PRINTF ("failed to sync cache\n");
+        }
+#endif
         SetRectEmpty (&this->hidden->dirty_rc);
         return TRUE;
     }
@@ -344,6 +360,18 @@ static int FB_VideoInit(_THIS, GAL_PixelFormat *vformat)
     int i;
     const char *GAL_fbdev;
 
+#ifdef _MGSCHEMA_COMPOSITING
+    if (!mgIsServer) {
+        vformat->Amask = SHAREDRES_VIDEO_AMASK;
+        vformat->Rmask = SHAREDRES_VIDEO_RMASK;
+        vformat->Gmask = SHAREDRES_VIDEO_GMASK;
+        vformat->Bmask = SHAREDRES_VIDEO_BMASK;
+        vformat->BitsPerPixel = SHAREDRES_VIDEO_DEPTH;
+        vformat->BytesPerPixel = (SHAREDRES_VIDEO_DEPTH + 7) >> 3;
+        return 0;
+    }
+#endif
+
     /* Initialize the library */
     GAL_fbdev = getenv("FRAMEBUFFER");
     if (GAL_fbdev == NULL) {
@@ -393,6 +421,16 @@ static int FB_VideoInit(_THIS, GAL_PixelFormat *vformat)
                     (((long)finfo.smem_start)&~(getpagesize () - 1)));
     mapped_memlen = finfo.smem_len+mapped_offset;
 
+#if defined(__TARGET_R818__) && defined(_MGSCHEMA_COMPOSITING)
+    if (mgIsServer) {
+        uintptr_t args[2] = { 1, 0 };
+        if (ioctl(console_fd, FBIO_ENABLE_CACHE, args) < 0) {
+            GAL_SetError("NEWGAL/FBCON: FBIO_ENABLE_CACHE failed\n");
+            return -1;
+        }
+    }
+#endif
+
 #ifdef __uClinux__
 #  if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
     mapped_mem = mmap(NULL, mapped_memlen,
@@ -997,11 +1035,16 @@ static int FB_AllocHWSurface (_THIS, GAL_Surface *surface)
     REP_HWSURFACE reply = {0, 0, NULL};
 
 #ifdef _MGRM_PROCESSES
-    if (mgIsServer)
+    if (mgIsServer) {
         FB_RequestHWSurface (this, &request, &reply);
+    }
     else {
         REQUEST req;
 
+#ifdef _MGSCHEMA_COMPOSITING
+    if (!mgIsServer)
+        return -1;
+#endif
         req.id = REQID_HWSURFACE;
         req.data = &request;
         req.len_data = sizeof (REQ_HWSURFACE);
@@ -1032,11 +1075,18 @@ static void FB_FreeHWSurface(_THIS, GAL_Surface *surface)
     request.offset = (char*)surface->pixels - (char*)mapped_mem;
 
 #ifdef _MGRM_PROCESSES
-    if (mgIsServer)
+    if (mgIsServer) {
         FB_RequestHWSurface (this, &request, &reply);
+    }
     else {
         REQUEST req;
 
+#ifdef _MGSCHEMA_COMPOSITING
+        surface->pixels = NULL;
+        surface->hwdata = NULL;
+        return;
+#endif
+
         if (surface->hwdata == NULL) {
             surface->pixels = NULL;
             return;
@@ -1132,7 +1182,7 @@ static void FB_SavePalette(_THIS, struct fb_fix_screeninfo *finfo,
 
         /* Allocate new identity colormap */
         for (i=0; i<256; ++i) {
-                  new_entries[(0*256)+i] =
+            new_entries[(0*256)+i] =
             new_entries[(1*256)+i] =
             new_entries[(2*256)+i] = (i<<8)|i;
         }
@@ -1218,6 +1268,12 @@ static int FB_SetColors(_THIS, int firstcolor, int ncolors, GAL_Color *colors)
 */
 static void FB_VideoQuit(_THIS)
 {
+#ifdef _MGSCHEMA_COMPOSITING
+    if (!mgIsServer) {
+        return;
+    }
+#endif
+
 #ifdef _MGRM_PROCESSES
     if (mgIsServer && this->screen) {
 #else

src/newgal/stretch.c

@@ -273,44 +273,38 @@ int GAL_SetupStretchBlit (GAL_Surface *src, GAL_Rect *srcrect,
         double rotation;
         pixman_f_transform_t ftransform;
         pixman_transform_t transform;
-        GAL_BlittingContext* ctxt;
 
-        src->blit_ctxt = malloc (sizeof (GAL_BlittingContext));
-        if (src->blit_ctxt == NULL)
-            return -1;
-
-        ctxt = src->blit_ctxt;
         if ((src->flags & GAL_SRCALPHA) && src->format->alpha != GAL_ALPHA_OPAQUE) {
-            memset (&ctxt->alpha_bits, src->format->alpha, sizeof(uint32_t));
-            ctxt->msk_img = pixman_image_create_bits_no_clear (PIXMAN_a8, 1, 1,
-                    &ctxt->alpha_bits, 4);
-            if (ctxt->msk_img)
-                pixman_image_set_repeat (ctxt->msk_img, PIXMAN_REPEAT_NORMAL);
+            memset (&src->pix_alpha_bits, src->format->alpha, sizeof(uint32_t));
+            src->msk_img = pixman_image_create_bits_no_clear (PIXMAN_a8, 1, 1,
+                    &src->pix_alpha_bits, 4);
+            if (src->msk_img)
+                pixman_image_set_repeat (src->msk_img, PIXMAN_REPEAT_NORMAL);
         }
         else
-            ctxt->msk_img = NULL;
+            src->msk_img = NULL;
 
-        ctxt->filter = ops >> SCALING_FILTER_SHIFT;
-        if (ctxt->filter > PIXMAN_FILTER_CONVOLUTION) {
-            ctxt->filter = PIXMAN_FILTER_FAST;
+        src->pix_filter = ops >> SCALING_FILTER_SHIFT;
+        if (src->pix_filter > PIXMAN_FILTER_CONVOLUTION) {
+            src->pix_filter = PIXMAN_FILTER_FAST;
         }
 
         ops &= COLOR_BLEND_FLAGS_MASK;
         if (ops == COLOR_BLEND_LEGACY) {
             if ((src->flags & GAL_SRCPIXELALPHA) && src->format->Amask && src != dst) {
-                ctxt->op = PIXMAN_OP_OVER;
+                src->pix_op = PIXMAN_OP_OVER;
             }
             else {
-                ctxt->op = PIXMAN_OP_SRC;
+                src->pix_op = PIXMAN_OP_SRC;
             }
         }
         else {
-            ctxt->op = ops;
+            src->pix_op = ops;
         }
 
-        if (ctxt->op > PIXMAN_OP_HSL_LUMINOSITY ||
-                ctxt->op < PIXMAN_OP_CLEAR) {
-            ctxt->op = PIXMAN_OP_SRC;
+        if (src->pix_op > PIXMAN_OP_HSL_LUMINOSITY ||
+                src->pix_op < PIXMAN_OP_CLEAR) {
+            src->pix_op = PIXMAN_OP_SRC;
         }
 
         pixman_f_transform_init_identity (&ftransform);
@@ -350,7 +344,7 @@ int GAL_SetupStretchBlit (GAL_Surface *src, GAL_Rect *srcrect,
             pixman_image_set_filter (src_img, (pixman_filter_t)filter, NULL, 0);
         }
 #else
-        pixman_image_set_filter (src->pix_img, (pixman_filter_t)ctxt->filter, NULL, 0);
+        pixman_image_set_filter (src->pix_img, (pixman_filter_t)src->pix_filter, NULL, 0);
 #endif
     }
 
@@ -359,21 +353,15 @@ int GAL_SetupStretchBlit (GAL_Surface *src, GAL_Rect *srcrect,
 
 int GAL_CleanupStretchBlit (GAL_Surface *src, GAL_Surface *dst)
 {
-    if (src->blit_ctxt) {
-        pixman_transform_t transform;
-
-        GAL_BlittingContext* ctxt = src->blit_ctxt;
-        if (ctxt->msk_img)
-            pixman_image_unref (ctxt->msk_img);
-        free (src->blit_ctxt);
-        src->blit_ctxt = NULL;
-
-        pixman_transform_init_identity (&transform);
-        pixman_image_set_transform (src->pix_img, &transform);
-        pixman_image_set_filter (src->pix_img, PIXMAN_FILTER_FAST, NULL, 0);
-        pixman_image_set_clip_region32 (dst->pix_img, NULL);
+    if (src->msk_img) {
+        pixman_image_unref (src->msk_img);
+        src->msk_img = NULL;
     }
 
+    pixman_image_set_transform (src->pix_img, NULL);
+    pixman_image_set_filter (src->pix_img, PIXMAN_FILTER_NEAREST, NULL, 0);
+    pixman_image_set_clip_region32 (dst->pix_img, NULL);
+
     return 0;
 }
 
@@ -390,15 +378,8 @@ int GAL_StretchBlt (GAL_Surface *src, GAL_Rect *srcrect,
         return GAL_StretchBltLegacy (src, srcrect, dst, dstrect,
                 ops & COLOR_BLEND_FLAGS_MASK);
 
-    if (src->blit_ctxt) {
-        GAL_BlittingContext* ctxt = src->blit_ctxt;
-        msk_img = ctxt->msk_img;
-        op = (pixman_op_t)ctxt->op;
-    }
-    else {
-        msk_img = NULL;
-        op = PIXMAN_OP_SRC;
-    }
+    msk_img = src->msk_img;
+    op = (pixman_op_t)src->pix_op;
 
     _DBG_PRINTF ("srcrect: %d,%d, %dx%d; dstrect: %d,%d, %dx%d; cliprect: %d,%d, %dx%d\n",
             srcrect->x, srcrect->y, srcrect->w, srcrect->h,

src/newgal/surface-cursor.c

@@ -105,7 +105,7 @@ GAL_Surface * GAL_CreateCursorSurface (GAL_VideoDevice *video,
     surface->format_version = 0;
 #ifdef _MGUSE_PIXMAN
     surface->pix_img = NULL;
-    surface->blit_ctxt = NULL;
+    surface->msk_img = NULL;
 #endif
     surface->shared_header = NULL;
     surface->dirty_info = NULL;

src/newgal/surface-shared.c

@@ -138,7 +138,7 @@ GAL_Surface * GAL_CreateSharedRGBSurface (GAL_VideoDevice *video,
     surface->format_version = 0;
 #ifdef _MGUSE_PIXMAN
     surface->pix_img = NULL;
-    surface->blit_ctxt = NULL;
+    surface->msk_img = NULL;
 #endif
     surface->shared_header = NULL;
     surface->dirty_info = NULL;
@@ -278,7 +278,7 @@ error:
 
 #ifdef _MGUSE_PIXMAN
             surface->pix_img = NULL;
-            surface->blit_ctxt = NULL;
+            surface->msk_img = NULL;
 #endif
             surface->shared_header = NULL;
             surface->dirty_info = NULL;
@@ -328,7 +328,7 @@ void GAL_FreeSharedSurfaceData (GAL_Surface *surface)
     surface->pixels = NULL;
 #ifdef _MGUSE_PIXMAN
     surface->pix_img = NULL;
-    surface->blit_ctxt = NULL;
+    surface->msk_img = NULL;
 #endif
     surface->shared_header = NULL;
     surface->dirty_info = NULL;
@@ -424,7 +424,7 @@ GAL_Surface * GAL_AttachSharedRGBSurface (int fd, size_t map_size,
     surface->format_version = 0;
 #ifdef _MGUSE_PIXMAN
     surface->pix_img = NULL;
-    surface->blit_ctxt = NULL;
+    surface->msk_img = NULL;
 #endif
     GAL_SetClipRect (surface, NULL);
 
@@ -481,7 +481,7 @@ void GAL_DettachSharedSurfaceData (GAL_Surface *surface)
     surface->pixels = NULL;
 #ifdef _MGUSE_PIXMAN
     surface->pix_img = NULL;
-    surface->blit_ctxt = NULL;
+    surface->msk_img = NULL;
 #endif
     surface->shared_header = NULL;
     surface->dirty_info = NULL;

src/newgal/surface.c

@@ -144,7 +144,7 @@ GAL_Surface * GAL_CreateRGBSurface (Uint32 flags,
     surface->format_version = 0;
 #ifdef _MGUSE_PIXMAN
     surface->pix_img = NULL;
-    surface->blit_ctxt = NULL;
+    surface->msk_img = NULL;
 #endif
 #if IS_COMPOSITING_SCHEMA
     surface->shared_header = NULL;
@@ -1870,13 +1870,15 @@ void GAL_FreeSurface (GAL_Surface *surface)
 
 #ifdef _MGUSE_PIXMAN
     if (surface->pix_img) {
+        _DBG_PRINTF ("There is not cleaned up blitting pixel image: %p\n", surface->pix_img);
         pixman_image_unref (surface->pix_img);
         surface->pix_img = NULL;
-
     }
 
-    if (surface->blit_ctxt) {
-        _WRN_PRINTF ("There is not cleaned up blitting context: %p\n", surface->blit_ctxt);
+    if (surface->msk_img) {
+        _DBG_PRINTF ("There is not cleaned up blitting mask image: %p\n", surface->msk_img);
+        pixman_image_unref (surface->msk_img);
+        surface->msk_img = NULL;
     }
 #endif
 

src/newgal/video.c

@@ -1257,7 +1257,7 @@ static GAL_Surface *Slave_CreateSurface (GAL_VideoDevice *this,
     surface->format_version = 0;
 #ifdef _MGUSE_PIXMAN
     surface->pix_img = NULL;
-    surface->blit_ctxt = NULL;
+    surface->msk_img = NULL;
 #endif
 #if IS_COMPOSITING_SCHEMA
     surface->shared_header = NULL;

src/newgdi/Makefile.am

@@ -3,11 +3,6 @@ AM_CPPFLAGS += -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include
 
 noinst_LTLIBRARIES = libnewgdi.la
 
-if MG_MINIMALGDI
-SRC_FILES = gdi.c attr.c clip.c coor.c rect.c  \
-            bitmap.c pixel.c pixel_ops.c \
-            region.c polygon.c
-else
 SRC_FILES = gdi.c attr.c clip.c map.c coor.c rect.c  \
             palette.c readbmp.c icon.c screen.c bitmap.c \
             pixel.c line.c arc.c pixel_ops.c \
@@ -20,7 +15,6 @@ SRC_FILES = gdi.c attr.c clip.c map.c coor.c rect.c  \
             textruns.c \
             shape-glyphs-basic.c shape-glyphs-complex.c \
             layout.c layout-utils.c layout-ellipsize.c
-endif
 
 HDR_FILES = glyph.h drawtext.h mi.h midc.h mistruct.h miwideline.h \
             pixel_ops.h mifillarc.h mispans.h polygon.h mifpoly.h \

src/standalone/Makefile.am

@@ -2,9 +2,5 @@ AM_CPPFLAGS = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include
 
 noinst_LTLIBRARIES = libstandalone.la
 
-if MG_MINIMALGDI
-libstandalone_la_SOURCES = 
-else
 libstandalone_la_SOURCES = standalone.c
-endif
 

src/sysres/Makefile.am

@@ -2,18 +2,14 @@ AM_CPPFLAGS = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include
 
 SUBDIRS = bmp icon font cursor 
 if MG_ENABLE_SPLASH
-if	MG_ENABLE_SCREENSAVER
+if MG_ENABLE_SCREENSAVER
 SUBDIRS+=license
 endif
 endif
 
 noinst_LTLIBRARIES = libsysres.la
 
-if MG_MINIMALGDI
-libsysres_la_SOURCES = mgetc.c 
-else
 libsysres_la_SOURCES = resource.c incoreres.c mgetc.c resmgr.c resmgr.h
-endif
 
 SRC_FILES=$(libsysres_la_SOURCES)
 LIB_NAME=libsysres