summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd
diff options
context:
space:
mode:
Diffstat (limited to 'src/osd')
-rw-r--r--src/osd/sdl/sdlfile.c22
-rw-r--r--src/osd/sdl/sdlmain.c34
-rw-r--r--src/osd/sdl/sdlptty_macosx.c2
-rw-r--r--src/osd/sdl/sdlptty_unix.c2
-rw-r--r--src/osd/sdl/sdlsocket.c14
5 files changed, 37 insertions, 37 deletions
diff --git a/src/osd/sdl/sdlfile.c b/src/osd/sdl/sdlfile.c
index 0bf35e9d3cd..3326c474746 100644
--- a/src/osd/sdl/sdlfile.c
+++ b/src/osd/sdl/sdlfile.c
@@ -137,7 +137,7 @@ file_error osd_open(const char *path, UINT32 openflags, osd_file **file, UINT64
}
(*file)->type = SDLFILE_FILE;
-
+
// convert the path into something compatible
dst = (*file)->filename;
for (src = path; *src != 0; src++)
@@ -275,7 +275,7 @@ error:
file_error osd_read(osd_file *file, void *buffer, UINT64 offset, UINT32 count, UINT32 *actual)
{
ssize_t result;
-
+
switch (file->type)
{
case SDLFILE_FILE:
@@ -299,15 +299,15 @@ file_error osd_read(osd_file *file, void *buffer, UINT64 offset, UINT32 count, U
return FILERR_NONE;
break;
-
+
case SDLFILE_SOCKET:
return sdl_read_socket(file, buffer, offset, count, actual);
break;
-
+
case SDLFILE_PTTY:
return sdl_read_ptty(file, buffer, offset, count, actual);
break;
-
+
default:
return FILERR_FAILURE;
}
@@ -338,21 +338,21 @@ file_error osd_write(osd_file *file, const void *buffer, UINT64 offset, UINT32 c
#else
#error Unknown SDL SUBARCH!
#endif
- return error_to_file_error(errno);
+ return error_to_file_error(errno);
if (actual != NULL)
*actual = result;
return FILERR_NONE;
break;
-
+
case SDLFILE_SOCKET:
return sdl_write_socket(file, buffer, offset, count, actual);
break;
-
+
case SDLFILE_PTTY:
return sdl_write_ptty(file, buffer, offset, count, actual);
break;
-
+
default:
return FILERR_FAILURE;
}
@@ -377,11 +377,11 @@ file_error osd_close(osd_file *file)
case SDLFILE_SOCKET:
return sdl_close_socket(file);
break;
-
+
case SDLFILE_PTTY:
return sdl_close_ptty(file);
break;
-
+
default:
return FILERR_FAILURE;
}
diff --git a/src/osd/sdl/sdlmain.c b/src/osd/sdl/sdlmain.c
index 651178db9ac..ce0c0725746 100644
--- a/src/osd/sdl/sdlmain.c
+++ b/src/osd/sdl/sdlmain.c
@@ -643,7 +643,7 @@ osd_font sdl_osd_interface::font_open(const char *_name, int &height)
CTFontRef ct_font = NULL;
CTFontDescriptorRef font_descriptor;
CGAffineTransform affine_transform = CGAffineTransformIdentity;
-
+
astring name(_name);
if (name == "default")
@@ -652,19 +652,19 @@ osd_font sdl_osd_interface::font_open(const char *_name, int &height)
}
font_name = CFStringCreateWithCString( NULL, _name, kCFStringEncodingUTF8 );
-
+
if( font_name != NULL )
{
font_descriptor = CTFontDescriptorCreateWithNameAndSize( font_name, POINT_SIZE );
-
+
if( font_descriptor != NULL )
{
ct_font = CTFontCreateWithFontDescriptor( font_descriptor, POINT_SIZE, &affine_transform );
-
+
CFRelease( font_descriptor );
}
}
-
+
CFRelease( font_name );
if (!ct_font)
@@ -678,7 +678,7 @@ osd_font sdl_osd_interface::font_open(const char *_name, int &height)
CFStringGetCString ( real_name, real_name_c_string, 255, kCFStringEncodingUTF8 );
mame_printf_verbose("Matching font: %s\n", real_name_c_string);
CFRelease( real_name );
-
+
CGFloat line_height = 0.0;
line_height += CTFontGetAscent(ct_font);
line_height += CTFontGetDescent(ct_font);
@@ -696,7 +696,7 @@ osd_font sdl_osd_interface::font_open(const char *_name, int &height)
void sdl_osd_interface::font_close(osd_font font)
{
CTFontRef ct_font = (CTFontRef)font;
-
+
if( ct_font != NULL )
{
CFRelease( ct_font );
@@ -720,7 +720,7 @@ bitmap_t *sdl_osd_interface::font_get_bitmap(osd_font font, unicode_char chnum,
const CFIndex count = 1;
CGRect bounding_rect, success_rect;
CGContextRef context_ref;
-
+
if( chnum == ' ' )
{
uni_char = 'n';
@@ -743,7 +743,7 @@ bitmap_t *sdl_osd_interface::font_get_bitmap(osd_font font, unicode_char chnum,
bitmap_width = ceilf(bounding_rect.size.width * EXTRA_WIDTH);
bitmap_width = bitmap_width == 0 ? 1 : bitmap_width;
-
+
bitmap_height = ceilf( (CTFontGetAscent(ct_font) + CTFontGetDescent(ct_font) + CTFontGetLeading(ct_font)) * EXTRA_HEIGHT);
xoffs = yoffs = 0;
@@ -752,14 +752,14 @@ bitmap_t *sdl_osd_interface::font_get_bitmap(osd_font font, unicode_char chnum,
size_t bits_per_component;
CGColorSpaceRef color_space;
CGBitmapInfo bitmap_info = kCGBitmapByteOrder32Host | kCGImageAlphaPremultipliedFirst;
-
+
color_space = CGColorSpaceCreateDeviceRGB();
bits_per_component = 8;
bitmap = auto_alloc(&machine(), bitmap_t(bitmap_width, bitmap_height, BITMAP_FORMAT_ARGB32));
-
+
context_ref = CGBitmapContextCreate( bitmap->base, bitmap_width, bitmap_height, bits_per_component, bitmap->rowpixels*4, color_space, bitmap_info );
-
+
if( context_ref != NULL )
{
CGFontRef font_ref;
@@ -821,7 +821,7 @@ osd_font sdl_osd_interface::font_open(const char *_name, int &height)
config = FcConfigGetCurrent();
pat = FcPatternCreate();
os = FcObjectSetCreate();
- FcPatternAddString(pat, FC_FAMILY, (const FcChar8 *)name.cstr());
+ FcPatternAddString(pat, FC_FAMILY, (const FcChar8 *)name.cstr());
// try and get a font with the requested styles baked-in
if (bold)
@@ -869,7 +869,7 @@ osd_font sdl_osd_interface::font_open(const char *_name, int &height)
bakedstyles = true;
break;
}
- }
+ }
// didn't get a font above? try again with no baked-in styles
if (!font)
@@ -878,7 +878,7 @@ osd_font sdl_osd_interface::font_open(const char *_name, int &height)
FcFontSetDestroy(fontset);
pat = FcPatternCreate();
- FcPatternAddString(pat, FC_FAMILY, (const FcChar8 *)name.cstr());
+ FcPatternAddString(pat, FC_FAMILY, (const FcChar8 *)name.cstr());
FcPatternAddString(pat, FC_STYLE, (const FcChar8 *)"Regular");
FcPatternAddString(pat, FC_FONTFORMAT, (const FcChar8 *)"TrueType");
fontset = FcFontList(config, pat, os);
@@ -966,7 +966,7 @@ bitmap_t *sdl_osd_interface::font_get_bitmap(osd_font font, unicode_char chnum,
UINT16 ustr[16];
ttffont = (TTF_Font *)font;
-
+
memset(ustr,0,sizeof(ustr));
ustr[0] = (UINT16)chnum;
drawsurf = TTF_RenderUNICODE_Solid(ttffont, ustr, fcol);
@@ -982,7 +982,7 @@ bitmap_t *sdl_osd_interface::font_get_bitmap(osd_font font, unicode_char chnum,
{
UINT32 *dstrow = BITMAP_ADDR32(bitmap, y, 0);
UINT8 *srcrow = (UINT8 *)drawsurf->pixels;
-
+
srcrow += (y * drawsurf->pitch);
for (int x = 0; x < drawsurf->w; x++)
diff --git a/src/osd/sdl/sdlptty_macosx.c b/src/osd/sdl/sdlptty_macosx.c
index 91de069c231..93a70b3c3f5 100644
--- a/src/osd/sdl/sdlptty_macosx.c
+++ b/src/osd/sdl/sdlptty_macosx.c
@@ -62,7 +62,7 @@ file_error sdl_read_ptty(osd_file *file, void *buffer, UINT64 offset, UINT32 cou
file_error sdl_write_ptty(osd_file *file, const void *buffer, UINT64 offset, UINT32 count, UINT32 *actual)
{
- UINT32 result;
+ UINT32 result;
result = write(file->handle, buffer, count);
if (result < 0)
diff --git a/src/osd/sdl/sdlptty_unix.c b/src/osd/sdl/sdlptty_unix.c
index a54c9f5f139..cfb50bd9ab7 100644
--- a/src/osd/sdl/sdlptty_unix.c
+++ b/src/osd/sdl/sdlptty_unix.c
@@ -72,7 +72,7 @@ file_error sdl_read_ptty(osd_file *file, void *buffer, UINT64 offset, UINT32 cou
file_error sdl_write_ptty(osd_file *file, const void *buffer, UINT64 offset, UINT32 count, UINT32 *actual)
{
- UINT32 result;
+ UINT32 result;
result = write(file->handle, buffer, count);
if (result < 0)
diff --git a/src/osd/sdl/sdlsocket.c b/src/osd/sdl/sdlsocket.c
index 645a9a1e2cf..4d8fc591740 100644
--- a/src/osd/sdl/sdlsocket.c
+++ b/src/osd/sdl/sdlsocket.c
@@ -36,11 +36,11 @@ file_error sdl_open_socket(const char *path, UINT32 openflags, osd_file **file,
struct sockaddr_in sai;
int flag = 1;
int port;
-
+
sscanf( path+strlen(sdlfile_socket_identifier), ":%255[^:]:%d", hostname, &port );
-
+
printf("Connecting to server '%s' on port '%d'\n", hostname, port);
-
+
if (((*file)->handle = socket(AF_INET, SOCK_STREAM, 0)) == -1)
{
return FILERR_ACCESS_DENIED;
@@ -62,9 +62,9 @@ file_error sdl_open_socket(const char *path, UINT32 openflags, osd_file **file,
{
return FILERR_ACCESS_DENIED;
}
-
+
*filesize = 0;
-#endif
+#endif
return FILERR_NONE;
}
@@ -111,7 +111,7 @@ file_error sdl_read_socket(osd_file *file, void *buffer, UINT64 offset, UINT32 c
file_error sdl_write_socket(osd_file *file, const void *buffer, UINT64 offset, UINT32 count, UINT32 *actual)
{
#ifndef SDLMAME_WIN32
- UINT32 result;
+ UINT32 result;
result = write(file->handle, buffer, count);
@@ -133,6 +133,6 @@ file_error sdl_close_socket(osd_file *file)
#ifndef SDLMAME_WIN32
close(file->handle);
osd_free(file);
-#endif
+#endif
return FILERR_NONE;
}