From 2ba97ae0dbd01a4f46c543ae025249e5349e0585 Mon Sep 17 00:00:00 2001 From: Sven Weidauer Date: Mon, 5 Jun 2017 11:20:56 +0200 Subject: Reformat code using clang-format. --- frontends/cocoa/desktop-tree.m | 402 ++++++++++++++++++++--------------------- 1 file changed, 199 insertions(+), 203 deletions(-) (limited to 'frontends/cocoa/desktop-tree.m') diff --git a/frontends/cocoa/desktop-tree.m b/frontends/cocoa/desktop-tree.m index 30af768a7..1015f9358 100644 --- a/frontends/cocoa/desktop-tree.m +++ b/frontends/cocoa/desktop-tree.m @@ -39,10 +39,10 @@ #import "cocoa/desktop-tree.h" struct tree { - unsigned int flags; /* Tree flags */ - tree_drag_type drag; - const struct treeview_table *callbacks; - void *client_data; /* User assigned data for the callbacks */ + unsigned int flags; /* Tree flags */ + tree_drag_type drag; + const struct treeview_table *callbacks; + void *client_data; /* User assigned data for the callbacks */ }; #include "netsurf/misc.h" @@ -57,299 +57,295 @@ struct sslcert_session_data *ssl_current_session = NULL; const char *tree_hotlist_path = NULL; static nserror treeview_test_redraw_request(struct core_window *cw, - const struct rect *r) + const struct rect *r) { - struct tree *tree = (struct tree *)cw; + struct tree *tree = (struct tree *)cw; - tree->callbacks->redraw_request(r->x0, r->y0, - r->x1 - r->x0, r->y1 - r->y0, - tree->client_data); + tree->callbacks->redraw_request(r->x0, r->y0, + r->x1 - r->x0, r->y1 - r->y0, + tree->client_data); return NSERROR_OK; } static void treeview_test_update_size(struct core_window *cw, - int width, int height) + int width, int height) { - struct tree *tree = (struct tree *)cw; + struct tree *tree = (struct tree *)cw; - tree->callbacks->resized(tree, width, height, tree->client_data); + tree->callbacks->resized(tree, width, height, tree->client_data); } static void treeview_test_scroll_visible(struct core_window *cw, - const struct rect *r) + const struct rect *r) { } static void treeview_test_get_window_dimensions(struct core_window *cw, - int *width, int *height) + int *width, int *height) { - struct tree *tree = (struct tree *)cw; + struct tree *tree = (struct tree *)cw; - tree->callbacks->get_window_dimensions(width, height, - tree->client_data); + tree->callbacks->get_window_dimensions(width, height, + tree->client_data); } static void treeview_test_drag_status(struct core_window *cw, - core_window_drag_status ds) + core_window_drag_status ds) { - struct tree *tree = (struct tree *)cw; + struct tree *tree = (struct tree *)cw; - switch (ds) { - case CORE_WINDOW_DRAG_NONE: - tree->drag = TREE_NO_DRAG; - break; + switch (ds) { + case CORE_WINDOW_DRAG_NONE: + tree->drag = TREE_NO_DRAG; + break; - case CORE_WINDOW_DRAG_SELECTION: - tree->drag = TREE_SELECT_DRAG; - break; + case CORE_WINDOW_DRAG_SELECTION: + tree->drag = TREE_SELECT_DRAG; + break; - case CORE_WINDOW_DRAG_MOVE: - tree->drag = TREE_MOVE_DRAG; - break; + case CORE_WINDOW_DRAG_MOVE: + tree->drag = TREE_MOVE_DRAG; + break; - case CORE_WINDOW_DRAG_TEXT_SELECTION: - tree->drag = TREE_TEXTAREA_DRAG; - break; + case CORE_WINDOW_DRAG_TEXT_SELECTION: + tree->drag = TREE_TEXTAREA_DRAG; + break; - default: - break; - } + default: + break; + } } struct core_window_callback_table cw_t = { - .invalidate = treeview_test_redraw_request, - .update_size = treeview_test_update_size, - .scroll_visible = treeview_test_scroll_visible, - .get_window_dimensions = treeview_test_get_window_dimensions, - .drag_status = treeview_test_drag_status + .invalidate = treeview_test_redraw_request, + .update_size = treeview_test_update_size, + .scroll_visible = treeview_test_scroll_visible, + .get_window_dimensions = treeview_test_get_window_dimensions, + .drag_status = treeview_test_drag_status }; static bool treeview_test_init(struct tree *tree) { - nserror err; - - switch (tree->flags) { - case TREE_COOKIES: - err = cookie_manager_init(&cw_t, (struct core_window *)tree); - if (err != NSERROR_OK) - guit->misc->warning("Couldn't init new cookie manager.", 0); - break; - case TREE_HISTORY: - err = global_history_init(&cw_t, (struct core_window *)tree); - if (err != NSERROR_OK) - guit->misc->warning("Couldn't init new global history.", 0); - break; - case TREE_HOTLIST: - err = hotlist_init(tree_hotlist_path, tree_hotlist_path); - if (err != NSERROR_OK) - guit->misc->warning("Couldn't init new hotlist.", 0); - err = hotlist_manager_init(&cw_t, (struct core_window *)tree); - if (err != NSERROR_OK) - guit->misc->warning("Couldn't init hotlist manager.", 0); - break; - case TREE_SSLCERT: - assert(ssl_current_session == NULL && - "Call sslcert_viewer_init directly, " - "this compat. layer can't cope with simultanious " - "sslcert viewers"); - err = sslcert_viewer_init(&cw_t, (struct core_window *)tree, - ssl_current_session); - if (err != NSERROR_OK) - guit->misc->warning("Couldn't init new sslcert viewer.", 0); - break; - } - - return true; + nserror err; + + switch (tree->flags) { + case TREE_COOKIES: + err = cookie_manager_init(&cw_t, (struct core_window *)tree); + if (err != NSERROR_OK) + guit->misc->warning("Couldn't init new cookie manager.", 0); + break; + case TREE_HISTORY: + err = global_history_init(&cw_t, (struct core_window *)tree); + if (err != NSERROR_OK) + guit->misc->warning("Couldn't init new global history.", 0); + break; + case TREE_HOTLIST: + err = hotlist_init(tree_hotlist_path, tree_hotlist_path); + if (err != NSERROR_OK) + guit->misc->warning("Couldn't init new hotlist.", 0); + err = hotlist_manager_init(&cw_t, (struct core_window *)tree); + if (err != NSERROR_OK) + guit->misc->warning("Couldn't init hotlist manager.", 0); + break; + case TREE_SSLCERT: + assert(ssl_current_session == NULL && "Call sslcert_viewer_init directly, " + "this compat. layer can't cope with simultanious " + "sslcert viewers"); + err = sslcert_viewer_init(&cw_t, (struct core_window *)tree, + ssl_current_session); + if (err != NSERROR_OK) + guit->misc->warning("Couldn't init new sslcert viewer.", 0); + break; + } + + return true; } static bool treeview_test_fini(struct tree *tree) { - nserror err; - - switch (tree->flags) { - case TREE_COOKIES: - err = cookie_manager_fini(); - if (err != NSERROR_OK) - guit->misc->warning("Couldn't finalise cookie manager.", 0); - break; - case TREE_HISTORY: - err = global_history_fini(); - if (err != NSERROR_OK) - guit->misc->warning("Couldn't finalise cookie manager.", 0); - break; - case TREE_HOTLIST: - err = hotlist_fini(); - if (err != NSERROR_OK) - guit->misc->warning("Couldn't finalise hotlist.", 0); - break; - case TREE_SSLCERT: - assert(ssl_current_session != NULL && - "Can't use sslcert window after sslcert_viewer_fini()"); - err = sslcert_viewer_fini(ssl_current_session); - ssl_current_session = NULL; - if (err != NSERROR_OK) - guit->misc->warning("Couldn't finalise sslcert viewer.", 0); - break; - } - - return true; + nserror err; + + switch (tree->flags) { + case TREE_COOKIES: + err = cookie_manager_fini(); + if (err != NSERROR_OK) + guit->misc->warning("Couldn't finalise cookie manager.", 0); + break; + case TREE_HISTORY: + err = global_history_fini(); + if (err != NSERROR_OK) + guit->misc->warning("Couldn't finalise cookie manager.", 0); + break; + case TREE_HOTLIST: + err = hotlist_fini(); + if (err != NSERROR_OK) + guit->misc->warning("Couldn't finalise hotlist.", 0); + break; + case TREE_SSLCERT: + assert(ssl_current_session != NULL && "Can't use sslcert window after sslcert_viewer_fini()"); + err = sslcert_viewer_fini(ssl_current_session); + ssl_current_session = NULL; + if (err != NSERROR_OK) + guit->misc->warning("Couldn't finalise sslcert viewer.", 0); + break; + } + + return true; } static bool treeview_test_redraw(struct tree *tree, int x, int y, - int clip_x, int clip_y, int clip_width, int clip_height, - const struct redraw_context *ctx) + int clip_x, int clip_y, int clip_width, int clip_height, + const struct redraw_context *ctx) { - struct rect clip; - - clip.x0 = clip_x; - clip.y0 = clip_y; - clip.x1 = clip_x + clip_width; - clip.y1 = clip_y + clip_height; - - switch (tree->flags) { - case TREE_SSLCERT: - if (ssl_current_session != NULL) { - sslcert_viewer_redraw(ssl_current_session, x, y, &clip, ctx); - } - return true; - case TREE_COOKIES: - cookie_manager_redraw(x, y, &clip, ctx); - return true; - case TREE_HISTORY: - global_history_redraw(x, y, &clip, ctx); - return true; - case TREE_HOTLIST: - hotlist_redraw(x, y, &clip, ctx); - return true; - } - - return false; + struct rect clip; + + clip.x0 = clip_x; + clip.y0 = clip_y; + clip.x1 = clip_x + clip_width; + clip.y1 = clip_y + clip_height; + + switch (tree->flags) { + case TREE_SSLCERT: + if (ssl_current_session != NULL) { + sslcert_viewer_redraw(ssl_current_session, x, y, &clip, ctx); + } + return true; + case TREE_COOKIES: + cookie_manager_redraw(x, y, &clip, ctx); + return true; + case TREE_HISTORY: + global_history_redraw(x, y, &clip, ctx); + return true; + case TREE_HOTLIST: + hotlist_redraw(x, y, &clip, ctx); + return true; + } + + return false; } static bool treeview_test_mouse_action(struct tree *tree, - browser_mouse_state mouse, int x, int y) + browser_mouse_state mouse, int x, int y) { - switch (tree->flags) { - case TREE_SSLCERT: - assert(ssl_current_session != NULL && - "Can't use sslcert window after sslcert_viewer_fini()"); - sslcert_viewer_mouse_action(ssl_current_session, mouse, x, y); - return true; - case TREE_COOKIES: - cookie_manager_mouse_action(mouse, x, y); - return true; - case TREE_HISTORY: - global_history_mouse_action(mouse, x, y); - return true; - case TREE_HOTLIST: - hotlist_mouse_action(mouse, x, y); - return true; - } - - return false; + switch (tree->flags) { + case TREE_SSLCERT: + assert(ssl_current_session != NULL && "Can't use sslcert window after sslcert_viewer_fini()"); + sslcert_viewer_mouse_action(ssl_current_session, mouse, x, y); + return true; + case TREE_COOKIES: + cookie_manager_mouse_action(mouse, x, y); + return true; + case TREE_HISTORY: + global_history_mouse_action(mouse, x, y); + return true; + case TREE_HOTLIST: + hotlist_mouse_action(mouse, x, y); + return true; + } + + return false; } static bool treeview_test_keypress(struct tree *tree, uint32_t key) { - switch (tree->flags) { - case TREE_SSLCERT: - assert(ssl_current_session != NULL && - "Can't use sslcert window after sslcert_viewer_fini()"); - sslcert_viewer_keypress(ssl_current_session, key); - return true; - case TREE_COOKIES: - cookie_manager_keypress(key); - return true; - case TREE_HISTORY: - global_history_keypress(key); - return true; - case TREE_HOTLIST: - hotlist_keypress(key); - return true; - } - - return false; + switch (tree->flags) { + case TREE_SSLCERT: + assert(ssl_current_session != NULL && "Can't use sslcert window after sslcert_viewer_fini()"); + sslcert_viewer_keypress(ssl_current_session, key); + return true; + case TREE_COOKIES: + cookie_manager_keypress(key); + return true; + case TREE_HISTORY: + global_history_keypress(key); + return true; + case TREE_HOTLIST: + hotlist_keypress(key); + return true; + } + + return false; } /* -------------------------------------------------------------------------- */ /** deprecated compatibility layer for new treeview modules. Do not use. */ struct tree *tree_create(unsigned int flags, - const struct treeview_table *callbacks, void *client_data) + const struct treeview_table *callbacks, void *client_data) { - struct tree *tree; + struct tree *tree; - tree = calloc(sizeof(struct tree), 1); - if (tree == NULL) { - LOG("calloc failed"); - guit->misc->warning(messages_get_errorcode(NSERROR_NOMEM), 0); - return NULL; - } + tree = calloc(sizeof(struct tree), 1); + if (tree == NULL) { + LOG("calloc failed"); + guit->misc->warning(messages_get_errorcode(NSERROR_NOMEM), 0); + return NULL; + } - tree->flags = flags; - tree->drag = TREE_NO_DRAG; - tree->callbacks = callbacks; - tree->client_data = client_data; + tree->flags = flags; + tree->drag = TREE_NO_DRAG; + tree->callbacks = callbacks; + tree->client_data = client_data; - treeview_test_init(tree); + treeview_test_init(tree); - return tree; + return tree; } /** deprecated compatibility layer for new treeview modules. Do not use. */ void tree_delete(struct tree *tree) { - treeview_test_fini(tree); - free(tree); + treeview_test_fini(tree); + free(tree); } /** deprecated compatibility layer for new treeview modules. Do not use. */ void tree_draw(struct tree *tree, int x, int y, - int clip_x, int clip_y, int clip_width, int clip_height, - const struct redraw_context *ctx) + int clip_x, int clip_y, int clip_width, int clip_height, + const struct redraw_context *ctx) { - assert(tree != NULL); + assert(tree != NULL); - treeview_test_redraw(tree, x, y, clip_x, clip_y, - clip_width, clip_height, ctx); + treeview_test_redraw(tree, x, y, clip_x, clip_y, + clip_width, clip_height, ctx); } /** deprecated compatibility layer for new treeview modules. Do not use. */ bool tree_mouse_action(struct tree *tree, browser_mouse_state mouse, int x, - int y) + int y) { - assert(tree != NULL); + assert(tree != NULL); - if (treeview_test_mouse_action(tree, mouse, x, y)) { - return true; - } + if (treeview_test_mouse_action(tree, mouse, x, y)) { + return true; + } - return false; + return false; } /** deprecated compatibility layer for new treeview modules. Do not use. */ void tree_drag_end(struct tree *tree, browser_mouse_state mouse, int x0, int y0, - int x1, int y1) + int x1, int y1) { - assert(tree != NULL); + assert(tree != NULL); - treeview_test_mouse_action(tree, BROWSER_MOUSE_HOVER, x1, y1); + treeview_test_mouse_action(tree, BROWSER_MOUSE_HOVER, x1, y1); } /** deprecated compatibility layer for new treeview modules. Do not use. */ bool tree_keypress(struct tree *tree, uint32_t key) { - if (treeview_test_keypress(tree, key)) { - return true; - } + if (treeview_test_keypress(tree, key)) { + return true; + } - return false; + return false; } /** deprecated compatibility layer for new treeview modules. Do not use. */ tree_drag_type tree_drag_status(struct tree *tree) { - assert(tree != NULL); - return tree->drag; + assert(tree != NULL); + return tree->drag; } -- cgit v1.2.3