mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-20 11:12:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix several warnings in cocoa frontend

Browse Source
This commit is contained in:
Vincent Sanders 2015-06-18 10:07:46 +01:00
parent e1bbe4528b
commit 9c6b3e8c32
5 changed files with 117 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cocoa/DownloadWindowController.m
View File

@ -20,6 +20,7 @@
#import "cocoa/gui.h"
#import "utils/log.h"
#import "utils/nsurl.h"
#import "desktop/download.h"
#import "desktop/gui_download.h"

3
cocoa/apple_image.h
View File

@ -25,6 +25,9 @@
#ifdef WITH_APPLE_IMAGE
/**
* Initialise apple image handlers instead of generic core ones.
*/
nserror apple_image_init(void);
#else

127
cocoa/apple_image.m
View File

@ -26,7 +26,8 @@
#include "desktop/plotters.h"
#include "utils/utils.h"
#include "cocoa/schedule.h"
#import "cocoa/schedule.h"
#import "cocoa/bitmap.h"
typedef struct apple_image_content {
struct content base;
@ -38,17 +39,6 @@ typedef struct apple_image_content {
int *frameTimes;
} apple_image_content;
static nserror apple_image_create(const content_handler *handler,
lwc_string *imime_type, const http_parameter *params,
llcache_handle *llcache, const char *fallback_charset,
bool quirks, struct content **c);
static bool apple_image_convert(struct content *c);
static void apple_image_destroy(struct content *c);
static bool apple_image_redraw(struct content *c, struct content_redraw_data *data,
const struct rect *clip, const struct redraw_context *ctx);
static nserror apple_image_clone(const struct content *old,
struct content **newc);
static content_type apple_image_content_type(void);
static void *apple_image_get_internal(const struct content *c, void *context)
{
@ -57,55 +47,7 @@ static void *apple_image_get_internal(const struct content *c, void *context)
return ai_c->bitmap;
}
static const content_handler apple_image_content_handler = {
.create = apple_image_create,
.data_complete = apple_image_convert,
.destroy = apple_image_destroy,
.redraw = apple_image_redraw,
.clone = apple_image_clone,
.get_internal = apple_image_get_internal,
.type = apple_image_content_type,
.no_share = false
};
static nserror register_for_type( NSString *mime )
{
const char *type = [mime UTF8String];
/* nsgif has priority since it supports animated GIF */
#ifdef WITH_GIF
if (strcmp(type, "image/gif") == 0)
return NSERROR_OK;
#endif
nserror error = content_factory_register_handler( type, &apple_image_content_handler );
if (error != NSERROR_OK) return error;
return NSERROR_OK;
}
nserror apple_image_init(void)
{
NSArray *utis = [NSBitmapImageRep imageTypes];
for (NSString *uti in utis) {
NSDictionary *declaration = [(NSDictionary *)UTTypeCopyDeclaration( (CFStringRef)uti ) autorelease];
id mimeTypes = [[declaration objectForKey: (NSString *)kUTTypeTagSpecificationKey] objectForKey: (NSString *)kUTTagClassMIMEType];
if (mimeTypes == nil) continue;
if (![mimeTypes isKindOfClass: [NSArray class]]) {
mimeTypes = [NSArray arrayWithObject: mimeTypes];
}
for (NSString *mime in mimeTypes) {
nserror error = register_for_type( mime );
if (error != NSERROR_OK) return error;
}
}
return NSERROR_OK;
}
nserror apple_image_create(const content_handler *handler,
static nserror apple_image_create(const content_handler *handler,
lwc_string *imime_type, const http_parameter *params,
llcache_handle *llcache, const char *fallback_charset,
bool quirks, struct content **c)
@ -137,7 +79,7 @@ static void animate_image_cb( void *ptr )
if (ai->currentFrame >= ai->frames) ai->currentFrame = 0;
[(NSBitmapImageRep *)ai->bitmap setProperty: NSImageCurrentFrame withValue: [NSNumber numberWithUnsignedInteger: ai->currentFrame]];
bitmap_modified( ai->bitmap );
cocoa_bitmap_modified( ai->bitmap );
union content_msg_data data;
data.redraw.full_redraw = true;
@ -154,8 +96,7 @@ static void animate_image_cb( void *ptr )
/**
* Convert a CONTENT_APPLE_IMAGE for display.
*/
bool apple_image_convert(struct content *c)
static bool apple_image_convert(struct content *c)
{
apple_image_content *ai_c = (apple_image_content *)c;
unsigned long size;
@ -201,7 +142,7 @@ bool apple_image_convert(struct content *c)
}
void apple_image_destroy(struct content *c)
static void apple_image_destroy(struct content *c)
{
apple_image_content *ai_c = (apple_image_content *)c;
@ -211,7 +152,7 @@ void apple_image_destroy(struct content *c)
}
nserror apple_image_clone(const struct content *old, struct content **newc)
static nserror apple_image_clone(const struct content *old, struct content **newc)
{
apple_image_content *ai;
apple_image_content *ai_old = (apple_image_content *)old;
@ -239,7 +180,7 @@ nserror apple_image_clone(const struct content *old, struct content **newc)
return NSERROR_OK;
}
content_type apple_image_content_type(void)
static content_type apple_image_content_type(void)
{
return CONTENT_IMAGE;
}
@ -247,8 +188,7 @@ content_type apple_image_content_type(void)
/**
* Redraw a CONTENT_APPLE_IMAGE with appropriate tiling.
*/
bool apple_image_redraw(struct content *c, struct content_redraw_data *data,
static bool apple_image_redraw(struct content *c, struct content_redraw_data *data,
const struct rect *clip, const struct redraw_context *ctx)
{
apple_image_content *ai_c = (apple_image_content *)c;
@ -263,4 +203,53 @@ bool apple_image_redraw(struct content *c, struct content_redraw_data *data,
ai_c->bitmap, data->background_colour, flags);
}
static const content_handler apple_image_content_handler = {
.create = apple_image_create,
.data_complete = apple_image_convert,
.destroy = apple_image_destroy,
.redraw = apple_image_redraw,
.clone = apple_image_clone,
.get_internal = apple_image_get_internal,
.type = apple_image_content_type,
.no_share = false
};
static nserror register_for_type( NSString *mime )
{
const char *type = [mime UTF8String];
/* nsgif has priority since it supports animated GIF */
#ifdef WITH_GIF
if (strcmp(type, "image/gif") == 0)
return NSERROR_OK;
#endif
nserror error = content_factory_register_handler( type, &apple_image_content_handler );
if (error != NSERROR_OK) return error;
return NSERROR_OK;
}
/* exported interface documented in cocoa/apple_image.h */
nserror apple_image_init(void)
{
NSArray *utis = [NSBitmapImageRep imageTypes];
for (NSString *uti in utis) {
NSDictionary *declaration = [(NSDictionary *)UTTypeCopyDeclaration( (CFStringRef)uti ) autorelease];
id mimeTypes = [[declaration objectForKey: (NSString *)kUTTypeTagSpecificationKey] objectForKey: (NSString *)kUTTagClassMIMEType];
if (mimeTypes == nil) continue;
if (![mimeTypes isKindOfClass: [NSArray class]]) {
mimeTypes = [NSArray arrayWithObject: mimeTypes];
}
for (NSString *mime in mimeTypes) {
nserror error = register_for_type( mime );
if (error != NSERROR_OK) return error;
}
}
return NSERROR_OK;
}
#endif /* WITH_APPLE_IMAGE */

2
cocoa/bitmap.h
View File

@ -21,6 +21,8 @@
CGImageRef cocoa_get_cgimage( void *bitmap );
void cocoa_bitmap_modified(void *bitmap);
struct gui_bitmap_table *cocoa_bitmap_table;
#endif

28
cocoa/bitmap.m
View File

@ -44,28 +44,28 @@
static CGImageRef cocoa_prepare_bitmap( void *bitmap );
static NSMapTable *cocoa_get_bitmap_cache( void );
int bitmap_get_width(void *bitmap)
static int bitmap_get_width(void *bitmap)
{
NSCParameterAssert( NULL != bitmap );
NSBitmapImageRep *bmp = (NSBitmapImageRep *)bitmap;
return [bmp pixelsWide];
}
int bitmap_get_height(void *bitmap)
static int bitmap_get_height(void *bitmap)
{
NSCParameterAssert( NULL != bitmap );
NSBitmapImageRep *bmp = (NSBitmapImageRep *)bitmap;
return [bmp pixelsHigh];
}
bool bitmap_get_opaque(void *bitmap)
static bool bitmap_get_opaque(void *bitmap)
{
NSCParameterAssert( NULL != bitmap );
NSBitmapImageRep *bmp = (NSBitmapImageRep *)bitmap;
return [bmp isOpaque];
}
void bitmap_destroy(void *bitmap)
static void bitmap_destroy(void *bitmap)
{
NSCParameterAssert( NULL != bitmap );
@ -80,7 +80,7 @@ void bitmap_destroy(void *bitmap)
[bmp release];
}
void *bitmap_create(int width, int height, unsigned int state)
static void *bitmap_create(int width, int height, unsigned int state)
{
NSBitmapImageRep *bmp = [[NSBitmapImageRep alloc]
initWithBitmapDataPlanes: NULL
@ -98,35 +98,35 @@ void *bitmap_create(int width, int height, unsigned int state)
return bmp;
}
void bitmap_set_opaque(void *bitmap, bool opaque)
static void bitmap_set_opaque(void *bitmap, bool opaque)
{
NSCParameterAssert( NULL != bitmap );
NSBitmapImageRep *bmp = (NSBitmapImageRep *)bitmap;
[bmp setOpaque: opaque ? YES : NO];
}
unsigned char *bitmap_get_buffer(void *bitmap)
static unsigned char *bitmap_get_buffer(void *bitmap)
{
NSCParameterAssert( NULL != bitmap );
NSBitmapImageRep *bmp = (NSBitmapImageRep *)bitmap;
return [bmp bitmapData];
}
size_t bitmap_get_rowstride(void *bitmap)
static size_t bitmap_get_rowstride(void *bitmap)
{
NSCParameterAssert( NULL != bitmap );
NSBitmapImageRep *bmp = (NSBitmapImageRep *)bitmap;
return [bmp bytesPerRow];
}
size_t bitmap_get_bpp(void *bitmap)
static size_t bitmap_get_bpp(void *bitmap)
{
NSCParameterAssert( NULL != bitmap );
NSBitmapImageRep *bmp = (NSBitmapImageRep *)bitmap;
return [bmp bitsPerPixel] / 8;
}
bool bitmap_test_opaque(void *bitmap)
static bool bitmap_test_opaque(void *bitmap)
{
NSCParameterAssert( bitmap_get_bpp( bitmap ) == BYTES_PER_PIXEL );
@ -148,7 +148,7 @@ bool bitmap_test_opaque(void *bitmap)
return true;
}
bool bitmap_save(void *bitmap, const char *path, unsigned flags)
static bool bitmap_save(void *bitmap, const char *path, unsigned flags)
{
NSCParameterAssert( NULL != bitmap );
NSBitmapImageRep *bmp = (NSBitmapImageRep *)bitmap;
@ -157,7 +157,7 @@ bool bitmap_save(void *bitmap, const char *path, unsigned flags)
return [tiff writeToFile: [NSString stringWithUTF8String: path] atomically: YES];
}
void bitmap_modified(void *bitmap)
static void cocoa_bitmap_modified(void *bitmap)
{
NSMapTable *cache = cocoa_get_bitmap_cache();
CGImageRef image = NSMapGet( cache, bitmap );
@ -258,7 +258,7 @@ static nserror bitmap_render(struct bitmap *bitmap, struct hlcache_handle *conte
[NSGraphicsContext setCurrentContext: nil];
CGContextRelease( bitmapContext );
bitmap_modified( bitmap );
cocoa_bitmap_modified( bitmap );
return true;
}
@ -275,7 +275,7 @@ static struct gui_bitmap_table bitmap_table = {
.get_height = bitmap_get_height,
.get_bpp = bitmap_get_bpp,
.save = bitmap_save,
.modified = bitmap_modified,
.modified = cocoa_bitmap_modified,
.render = bitmap_render,
};