Mirrors_UI_SDK/MiniGUI
1
0
Fork 0
mirror of https://github.com/VincentWei/MiniGUI.git synced 2026-02-06 18:31:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Vincent Wei
2018-12-11 18:02:46 +08:00
parent e4a2294ded
commit dbbd0f4da2
6 changed files with 48 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@@ -16,9 +16,9 @@ dnl Set various version strings - taken gratefully from the SDL sources
#
MINIGUI_MAJOR_VERSION=3
MINIGUI_MINOR_VERSION=2
MINIGUI_MICRO_VERSION=0
MINIGUI_MICRO_VERSION=1
MINIGUI_INTERFACE_AGE=0
MINIGUI_BINARY_AGE=0
MINIGUI_BINARY_AGE=1
MINIGUI_VERSION=$MINIGUI_MAJOR_VERSION.$MINIGUI_MINOR_VERSION.$MINIGUI_MICRO_VERSION
AC_SUBST(MINIGUI_MAJOR_VERSION)

2
etc/MiniGUI.cfg
View File

@@ -36,7 +36,7 @@ display=0
#{{ifdef _MGGAL_PCXVFB
[pc_xvfb]
defaultmode=800x600-16bpp
window_caption=XVFB-for-MiniGUI-3.0-(Gtk-Version)
window_caption=XVFB-for-MiniGUI-3.2-(Gtk-Version)
exec_file=/usr/local/bin/gvfb
#}}

4
include/endianrw.h
View File

@@ -204,7 +204,7 @@ MG_EXPORT MG_RWops* MGUI_RWFromFP(FILE *fp, int autoclose);
*
* \sa MG_RWops, MGUI_FreeRW
*/
MG_EXPORT MG_RWops* MGUI_RWFromMem(void *mem, int size);
MG_EXPORT MG_RWops* MGUI_RWFromMem(void *mem, size_t size);
/**
* \fn void MGUI_InitMemRW (MG_RWops* area, void *mem, int size)
@@ -221,7 +221,7 @@ MG_EXPORT MG_RWops* MGUI_RWFromMem(void *mem, int size);
*
* \sa MG_RWops, MGUI_FreeRW, MGUI_RWFromMem
*/
MG_EXPORT void MGUI_InitMemRW (MG_RWops* area, void *mem, int size);
MG_EXPORT void MGUI_InitMemRW (MG_RWops* area, void *mem, size_t size);
/**
* \fn MG_RWops* MGUI_AllocRW(void)

80
src/misc/endianrw.c
View File

@@ -49,121 +49,121 @@
Uint16 MGUI_ReadLE16 (MG_RWops *src)
{
Uint16 value;
Uint16 value;
MGUI_RWread(src, &value, (sizeof value), 1);
return(ArchSwapLE16(value));
MGUI_RWread(src, &value, (sizeof value), 1);
return(ArchSwapLE16(value));
}
Uint16 MGUI_ReadBE16 (MG_RWops *src)
{
Uint16 value;
Uint16 value;
MGUI_RWread(src, &value, (sizeof value), 1);
return(ArchSwapBE16(value));
MGUI_RWread(src, &value, (sizeof value), 1);
return(ArchSwapBE16(value));
}
Uint32 MGUI_ReadLE32 (MG_RWops *src)
{
Uint32 value;
Uint32 value;
MGUI_RWread(src, &value, (sizeof value), 1);
return(ArchSwapLE32(value));
MGUI_RWread(src, &value, (sizeof value), 1);
return(ArchSwapLE32(value));
}
Uint32 MGUI_ReadBE32 (MG_RWops *src)
{
Uint32 value;
Uint32 value;
MGUI_RWread(src, &value, (sizeof value), 1);
return(ArchSwapBE32(value));
MGUI_RWread(src, &value, (sizeof value), 1);
return(ArchSwapBE32(value));
}
Uint64 MGUI_ReadLE64 (MG_RWops *src)
{
Uint64 value;
Uint64 value;
MGUI_RWread(src, &value, (sizeof value), 1);
return(ArchSwapLE64(value));
MGUI_RWread(src, &value, (sizeof value), 1);
return(ArchSwapLE64(value));
}
Uint64 MGUI_ReadBE64 (MG_RWops *src)
{
Uint64 value;
Uint64 value;
MGUI_RWread(src, &value, (sizeof value), 1);
return(ArchSwapBE64(value));
MGUI_RWread(src, &value, (sizeof value), 1);
return(ArchSwapBE64(value));
}
int MGUI_WriteLE16 (MG_RWops *dst, Uint16 value)
{
value = ArchSwapLE16(value);
return(MGUI_RWwrite(dst, &value, (sizeof value), 1));
value = ArchSwapLE16(value);
return(MGUI_RWwrite(dst, &value, (sizeof value), 1));
}
int MGUI_WriteBE16 (MG_RWops *dst, Uint16 value)
{
value = ArchSwapBE16(value);
return(MGUI_RWwrite(dst, &value, (sizeof value), 1));
value = ArchSwapBE16(value);
return(MGUI_RWwrite(dst, &value, (sizeof value), 1));
}
int MGUI_WriteLE32 (MG_RWops *dst, Uint32 value)
{
value = ArchSwapLE32(value);
return(MGUI_RWwrite(dst, &value, (sizeof value), 1));
value = ArchSwapLE32(value);
return(MGUI_RWwrite(dst, &value, (sizeof value), 1));
}
int MGUI_WriteBE32 (MG_RWops *dst, Uint32 value)
{
value = ArchSwapBE32(value);
return(MGUI_RWwrite(dst, &value, (sizeof value), 1));
value = ArchSwapBE32(value);
return(MGUI_RWwrite(dst, &value, (sizeof value), 1));
}
int MGUI_WriteLE64 (MG_RWops *dst, Uint64 value)
{
value = ArchSwapLE64(value);
return(MGUI_RWwrite(dst, &value, (sizeof value), 1));
value = ArchSwapLE64(value);
return(MGUI_RWwrite(dst, &value, (sizeof value), 1));
}
int MGUI_WriteBE64 (MG_RWops *dst, Uint64 value)
{
value = ArchSwapBE64(value);
return (MGUI_RWwrite(dst, &value, (sizeof value), 1));
value = ArchSwapBE64(value);
return (MGUI_RWwrite(dst, &value, (sizeof value), 1));
}
Uint16 MGUI_ReadLE16FP (FILE *src)
{
Uint16 value;
Uint16 value;
size_t size;
size = fread (&value, (sizeof value), 1, src);
size = fread (&value, (sizeof value), 1, src);
if (size < 1)
return -1;
return (ArchSwapLE16(value));
return (ArchSwapLE16(value));
}
Uint32 MGUI_ReadLE32FP (FILE *src)
{
Uint32 value;
size_t size;
Uint32 value;
size_t size;
size = fread(&value, (sizeof value), 1, src);
if (size < 1)
return -1;
return (ArchSwapLE32(value));
return (ArchSwapLE32(value));
}
int MGUI_WriteLE16FP (FILE *dst, Uint16 value)
{
value = ArchSwapLE16(value);
return (fwrite (&value, (sizeof value), 1, dst));
value = ArchSwapLE16(value);
return (fwrite (&value, (sizeof value), 1, dst));
}
int MGUI_WriteLE32FP (FILE *dst, Uint32 value)
{
value = ArchSwapLE32(value);
return (fwrite (&value, (sizeof value), 1, dst));
value = ArchSwapLE32(value);
return (fwrite (&value, (sizeof value), 1, dst));
}

5
src/misc/rwops.c
View File

@@ -287,7 +287,7 @@ MG_RWops *MGUI_RWFromFP(FILE *fp, int autoclose)
return(rwops);
}
MG_RWops *MGUI_RWFromMem(void *mem, int size)
MG_RWops *MGUI_RWFromMem(void *mem, size_t size)
{
MG_RWops *rwops;
@@ -313,7 +313,7 @@ MG_RWops *MGUI_RWFromMem(void *mem, int size)
return(rwops);
}
void MGUI_InitMemRW (MG_RWops* area, void *mem, int size)
void MGUI_InitMemRW (MG_RWops* area, void *mem, size_t size)
{
area->seek = mem_seek;
area->read = mem_read;
@@ -362,4 +362,3 @@ int MGUI_RWgetc (MG_RWops* area)
return c;
}

2
src/newgal/pcxvfb/pcxvfb.c
View File

@@ -482,7 +482,7 @@ static int PCXVFB_VideoInit (_THIS, GAL_PixelFormat *vformat)
(struct sockaddr *)&server_address, server_len);
listen(__mg_pcxvfb_server_sockfd, 5);
client_len = sizeof(client_address);
shm_init_lock(getpid());
if ((pid = fork()) < 0) {