Author: chris_y Date: Sat Oct 30 06:20:53 2010 New Revision: 10922 URL: http://source.netsurf-browser.org?rev=10922&view=rev Log: Move drag icon stuff to own file; fix warnings Modified: trunk/netsurf/amiga/Makefile.target trunk/netsurf/amiga/bitmap.c trunk/netsurf/amiga/bitmap.h trunk/netsurf/amiga/clipboard.c trunk/netsurf/amiga/download.c trunk/netsurf/amiga/download.h trunk/netsurf/amiga/gui.c trunk/netsurf/amiga/gui.h trunk/netsurf/amiga/gui_options.c trunk/netsurf/amiga/menu.c trunk/netsurf/amiga/theme.c trunk/netsurf/amiga/tree.c Modified: trunk/netsurf/amiga/Makefile.target URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/Makefile.target?rev... ============================================================================== --- trunk/netsurf/amiga/Makefile.target (original) +++ trunk/netsurf/amiga/Makefile.target Sat Oct 30 06:20:53 2010 @@ -38,7 +38,7 @@ plotters.c object.c menu.c save_pdf.c arexx.c version.c \ cookies.c context_menu.c clipboard.c save_complete.c \ fetch_mailto.c search.c history_local.c download.c iff_dr2d.c \ - sslcert.c gui_options.c print.c theme.c \ + sslcert.c gui_options.c print.c theme.c drag.c \ stringview/stringview.c stringview/urlhistory.c S_AMIGA := $(addprefix amiga/,$(S_AMIGA)) Modified: trunk/netsurf/amiga/bitmap.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/bitmap.c?rev=10922&... ============================================================================== --- trunk/netsurf/amiga/bitmap.c (original) +++ trunk/netsurf/amiga/bitmap.c Sat Oct 30 06:20:53 2010 @@ -17,7 +17,6 @@ */ #include "assert.h" -#include "image/bitmap.h" #include "amiga/bitmap.h" #include <proto/exec.h> #include <proto/picasso96api.h> Modified: trunk/netsurf/amiga/bitmap.h URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/bitmap.h?rev=10922&... ============================================================================== --- trunk/netsurf/amiga/bitmap.h (original) +++ trunk/netsurf/amiga/bitmap.h Sat Oct 30 06:20:53 2010 @@ -18,6 +18,8 @@ #ifndef AMIGA_BITMAP_H #define AMIGA_BITMAP_H +#include "image/bitmap.h" + #include <exec/types.h> #include <proto/graphics.h> #include <intuition/classusr.h> Modified: trunk/netsurf/amiga/clipboard.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/clipboard.c?rev=109... ============================================================================== --- trunk/netsurf/amiga/clipboard.c (original) +++ trunk/netsurf/amiga/clipboard.c Sat Oct 30 06:20:53 2010 @@ -28,6 +28,7 @@ #include "amiga/bitmap.h" #include "amiga/iff_dr2d.h" #include "amiga/menu.h" +#include "amiga/drag.h" #include <proto/iffparse.h> #include <proto/intuition.h> Modified: trunk/netsurf/amiga/download.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/download.c?rev=1092... ============================================================================== --- trunk/netsurf/amiga/download.c (original) +++ trunk/netsurf/amiga/download.c Sat Oct 30 06:20:53 2010 @@ -41,6 +41,8 @@ #include "desktop/selection.h" #include "desktop/save_complete.h" +#include "image/ico.h" + #include "utils/errors.h" #include "utils/log.h" #include "utils/messages.h" @@ -55,11 +57,6 @@ #include <gadgets/layout.h> #include <reaction/reaction_macros.h> - -struct Window *drag_icon = NULL; -ULONG drag_icon_width; -ULONG drag_icon_height; -BOOL drag_in_progress = FALSE; struct gui_download_window *gui_download_window_create(download_context *ctx, struct gui_window *gui) @@ -329,255 +326,6 @@ } } -void gui_drag_save_object(gui_save_type type, hlcache_handle *c, - struct gui_window *g) -{ - char *filetype; - - if(strcmp(option_use_pubscreen,"Workbench")) return; - - switch(type) - { - case GUI_SAVE_OBJECT_ORIG: // object - case GUI_SAVE_SOURCE: - filetype = ami_content_type_to_file_type(content_get_type(c)); - break; - case GUI_SAVE_COMPLETE: - filetype = "drawer"; - break; - case GUI_SAVE_OBJECT_NATIVE: -#ifdef WITH_NS_SVG - if(content_get_type(c) == CONTENT_SVG) - { - filetype = "dr2d"; - } - else -#endif - { - filetype = "ilbm"; - } - break; - } - - ami_drag_icon_show(g->shared->win, filetype); - - drag_save_data = c; - drag_save_gui = g; - drag_save = type; -} - -void gui_drag_save_selection(struct selection *s, struct gui_window *g) -{ - ami_drag_icon_show(g->shared->win, "ascii"); - - ami_autoscroll = TRUE; - drag_save_data = s; - drag_save = GUI_SAVE_TEXT_SELECTION; -} - -void ami_drag_save(struct Window *win) -{ - ULONG which = WBO_NONE,type; - char path[1025],dpath[1025]; - char *source_data; - ULONG source_size; - - ami_drag_icon_close(NULL); - ami_autoscroll = FALSE; - - if(strcmp(option_use_pubscreen,"Workbench") == 0) - { - which = WhichWorkbenchObject(NULL,scrn->MouseX,scrn->MouseY, - WBOBJA_Type,&type, - WBOBJA_FullPath,&path, - WBOBJA_FullPathSize,1024, - WBOBJA_DrawerPath,&dpath, - WBOBJA_DrawerPathSize,1024, - TAG_DONE); - } - - if((which == WBO_DRAWER) || ((which == WBO_ICON) && (type > WBDRAWER))) - { - strcpy(path,dpath); - } - else if(which == WBO_NONE) - { - if(drag_save == GUI_SAVE_TEXT_SELECTION) - ami_drag_selection((struct selection *)drag_save_data); - else DisplayBeep(scrn); - - drag_save = 0; - drag_save_data = NULL; - return; - } - - if(path[0] == '\0') - { - DisplayBeep(scrn); - drag_save = 0; - drag_save_data = NULL; - return; - } - - ami_update_pointer(win,GUI_POINTER_WAIT); - - switch(drag_save) - { - case GUI_SAVE_OBJECT_ORIG: // object - case GUI_SAVE_SOURCE: - { - struct hlcache_handle *c = drag_save_data; - BPTR fh = 0; - AddPart(path, content_get_title(c), 1024); - - if(fh = FOpen(path,MODE_NEWFILE,0)) - { - if((source_data = content_get_source_data(c, &source_size))) - FWrite(fh, source_data, 1, source_size); - - FClose(fh); - SetComment(path, content_get_url(c)); - } - } - break; - - case GUI_SAVE_TEXT_SELECTION: // selection - AddPart(path,"netsurf_text_file",1024); - selection_save_text((struct selection *)drag_save_data,path); - break; - - case GUI_SAVE_COMPLETE: - { - struct hlcache_handle *c = drag_save_data; - BPTR lock = 0; - - AddPart(path, content_get_title(c), 1024); - if(lock = CreateDir(path)) - { - UnLock(lock); - save_complete(c,path); - SetComment(path, content_get_url(c)); - } - ami_superimpose_favicon(path, - drag_save_gui->favicon, NULL); - } - break; - - case GUI_SAVE_OBJECT_NATIVE: - { - hlcache_handle *c = drag_save_data; - struct bitmap *bm; - - AddPart(path, content_get_title(c), 1024); - if(bm = content_get_bitmap(c)) - { - bm->url = content_get_url(c); - bm->title = content_get_title(c); - bitmap_save(bm, path, 0); - } -#ifdef WITH_NS_SVG - else if(content_get_type(c) == CONTENT_SVG) - { - ami_save_svg(c, path); - } -#endif - } - break; - - default: - LOG(("Unsupported drag save operation %ld",drag_save)); - break; - } - - drag_save = 0; - drag_save_data = NULL; - ami_update_pointer(win,GUI_POINTER_DEFAULT); -} - -void ami_drag_icon_show(struct Window *win, char *type) -{ - struct DiskObject *dobj = NULL; - ULONG *icondata1; - ULONG width, height; - long format = 0; - int err = 0; - int deftype = WBPROJECT; - - drag_in_progress = TRUE; - - if(option_drag_save_icons == false) - { - ami_update_pointer(win, AMI_GUI_POINTER_DRAG); - return; - } - else - { - ami_update_pointer(win, GUI_POINTER_DEFAULT); - } - - if(!strcmp(type, "drawer")) deftype = WBDRAWER; - - dobj = GetIconTags(NULL, ICONGETA_GetDefaultName, type, - ICONGETA_GetDefaultType, deftype, - TAG_DONE); - - err = IconControl(dobj, - ICONCTRLA_GetWidth,&width, - ICONCTRLA_GetHeight,&height, - TAG_DONE); - - drag_icon_width = width; - drag_icon_height = height; - - drag_icon = OpenWindowTags(NULL, - WA_Left, scrn->MouseX - (width/2), - WA_Top, scrn->MouseY - (height/2), - WA_Width, width, - WA_Height, height, - WA_PubScreen, scrn, - WA_Borderless, TRUE, - WA_ToolBox, TRUE, - WA_StayTop, TRUE, - WA_Opaqueness, 128, - WA_OverrideOpaqueness, TRUE, - TAG_DONE); - -/* probably need layouticon and drawinfo stuff too */ - - DrawIconState(drag_icon->RPort, dobj, NULL, 0, 0, IDS_NORMAL, - ICONDRAWA_Frameless, TRUE, - ICONDRAWA_Borderless, TRUE, - TAG_DONE); -} - -void ami_drag_icon_move(void) -{ - if(drag_icon == NULL) return; - - ChangeWindowBox(drag_icon, scrn->MouseX - (drag_icon_width / 2), - scrn->MouseY - (drag_icon_height / 2), - drag_icon_width, drag_icon_height); -} - -/** - * Close the drag icon (invisible) window if it is open - * - * \param win pointer to window to clear drag pointer - */ - -void ami_drag_icon_close(struct Window *win) -{ - if(drag_icon) CloseWindow(drag_icon); - if(win) ami_update_pointer(win, GUI_POINTER_DEFAULT); - drag_icon = NULL; - drag_in_progress = FALSE; -} - -BOOL ami_drag_in_progress(void) -{ - return drag_in_progress; -} - void ami_superimpose_favicon(STRPTR path, struct hlcache_handle *icon, STRPTR type) { struct DiskObject *dobj = NULL; Modified: trunk/netsurf/amiga/download.h URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/download.h?rev=1092... ============================================================================== --- trunk/netsurf/amiga/download.h (original) +++ trunk/netsurf/amiga/download.h Sat Oct 30 06:20:53 2010 @@ -42,19 +42,8 @@ char fname[1024]; }; -int drag_save; -void *drag_save_data; -struct gui_window *drag_save_gui; - void ami_download_window_abort(struct gui_download_window *dw); BOOL ami_download_window_event(struct gui_download_window *dw); -void ami_drag_save(struct Window *win); -void ami_drag_icon_show(struct Window *win, char *type); -void ami_drag_icon_close(struct Window *win); -void ami_drag_icon_move(void); -BOOL ami_drag_in_progress(void); void ami_free_download_list(struct List *dllist); void ami_superimpose_favicon(STRPTR path, struct hlcache_handle *icon, STRPTR type); - -const char *ami_content_type_to_file_type(content_type type); #endif Modified: trunk/netsurf/amiga/gui.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/gui.c?rev=10922&... ============================================================================== --- trunk/netsurf/amiga/gui.c (original) +++ trunk/netsurf/amiga/gui.c Sat Oct 30 06:20:53 2010 @@ -27,6 +27,7 @@ #include "desktop/searchweb.h" #include "desktop/selection.h" #include "desktop/textinput.h" +#include "image/ico.h" #include "render/form.h" #include "utils/messages.h" #include "utils/utf8.h" @@ -40,6 +41,7 @@ #include "amiga/context_menu.h" #include "amiga/cookies.h" #include "amiga/download.h" +#include "amiga/drag.h" #include "amiga/fetch_mailto.h" #include "amiga/font.h" #include "amiga/gui.h" @@ -72,7 +74,6 @@ #include <proto/graphics.h> #include <proto/intuition.h> #include <proto/keymap.h> -#include <proto/layers.h> #include <proto/locale.h> #include <proto/Picasso96API.h> #include <proto/timer.h> @@ -3887,40 +3888,3 @@ } return text_box; } - -struct gui_window_2 *ami_find_gwin_by_id(struct Window *win) -{ - struct nsObject *node, *nnode; - struct gui_window_2 *gwin; - - if(!IsMinListEmpty(window_list)) - { - node = (struct nsObject *)GetHead((struct List *)window_list); - - do - { - nnode=(struct nsObject *)GetSucc((struct Node *)node); - - if(node->Type == AMINS_WINDOW) // or frame? - { - gwin = node->objstruct; - if(win == gwin->win) return gwin; - } - } while(node = nnode); - } - return NULL; -} - -struct gui_window_2 *ami_window_at_pointer(void) -{ - struct Layer *layer; - - LockLayerInfo(&scrn->LayerInfo); - - layer = WhichLayer(&scrn->LayerInfo, scrn->MouseX, scrn->MouseY); - - UnlockLayerInfo(&scrn->LayerInfo); - - if(layer) return ami_find_gwin_by_id(layer->Window); - else return NULL; -} Modified: trunk/netsurf/amiga/gui.h URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/gui.h?rev=10922&... ============================================================================== --- trunk/netsurf/amiga/gui.h (original) +++ trunk/netsurf/amiga/gui.h Sat Oct 30 06:20:53 2010 @@ -132,7 +132,6 @@ STRPTR ami_locale_langs(void); int ami_key_to_nskey(ULONG keycode, struct InputEvent *ie); struct box *ami_text_box_at_point(struct gui_window_2 *gwin, ULONG *x, ULONG *y); -struct gui_window_2 *ami_window_at_pointer(void); struct TextFont *origrpfont; struct MinList *window_list; Modified: trunk/netsurf/amiga/gui_options.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/gui_options.c?rev=1... ============================================================================== --- trunk/netsurf/amiga/gui_options.c (original) +++ trunk/netsurf/amiga/gui_options.c Sat Oct 30 06:20:53 2010 @@ -27,6 +27,7 @@ #include <intuition/classusr.h> #include "amiga/object.h" +#include "amiga/font.h" #include "amiga/gui.h" #include "amiga/gui_options.h" #include "utils/messages.h" Modified: trunk/netsurf/amiga/menu.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/menu.c?rev=10922&am... ============================================================================== --- trunk/netsurf/amiga/menu.c (original) +++ trunk/netsurf/amiga/menu.c Sat Oct 30 06:20:53 2010 @@ -41,6 +41,7 @@ #include "amiga/iff_dr2d.h" #include "amiga/clipboard.h" #include "amiga/gui_options.h" +#include "amiga/theme.h" #include "desktop/tree_url_node.h" #include <classes/window.h> #include <proto/intuition.h> Modified: trunk/netsurf/amiga/theme.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/theme.c?rev=10922&a... ============================================================================== --- trunk/netsurf/amiga/theme.c (original) +++ trunk/netsurf/amiga/theme.c Sat Oct 30 06:20:53 2010 @@ -33,7 +33,7 @@ #include <intuition/pointerclass.h> #include <workbench/icon.h> -#include "amiga/download.h" +#include "amiga/drag.h" #include "amiga/options.h" #include "amiga/theme.h" #include "utils/messages.h" Modified: trunk/netsurf/amiga/tree.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/tree.c?rev=10922&am... ============================================================================== --- trunk/netsurf/amiga/tree.c (original) +++ trunk/netsurf/amiga/tree.c Sat Oct 30 06:20:53 2010 @@ -50,7 +50,7 @@ #include "desktop/history_global_core.h" #include "desktop/hotlist.h" #include "amiga/sslcert.h" -#include "amiga/download.h" /* drag icon stuff */ +#include "amiga/drag.h" /* drag icon stuff */ #include "amiga/theme.h" /* pointers */ #include "utils/utils.h"