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

Register with application.library.

Browse Source 
Icon appears on AmiDock - ToFront, Open Prefs and (Force) Quit commands work.
Open (and maybe Print) Document could potentially be added.
Not sure if AppIcon-style drag'n'drop works with application.library-registered apps
by default (once Open supported).

svn path=/trunk/netsurf/; revision=9599
This commit is contained in:
Chris Young 2009-09-28 18:00:40 +00:00
parent a80a4968bd
commit abf51104fe
1 changed files with 70 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
amiga/gui.c
View File

@ -78,6 +78,8 @@
#include "amiga/gui_options.h"
#include "amiga/bitmap.h"
#include "amiga/print.h"
#include <libraries/application.h>
#include <proto/application.h>
#include "amiga/stringview/stringview.h"
#include "amiga/stringview/urlhistory.h"
@ -118,6 +120,8 @@ struct Library *PopupMenuBase = NULL;
struct PopupMenuIFace *IPopupMenu = NULL;
struct Library *KeymapBase = NULL;
struct KeymapIFace *IKeymap = NULL;
struct Library *ApplicationBase=NULL;
struct ApplicationIFace *IApplication=NULL;
Class *urlStringClass;
@ -126,6 +130,9 @@ ULONG throbber_width,throbber_height,throbber_frames,throbber_update_interval;
BOOL rmbtrapped;
BOOL locked_screen = FALSE;
BOOL screen_closed = FALSE;
uint32 ami_appid;
struct MsgPort *applibport = NULL;
ULONG applibsig = 0;
extern colour scroll_widget_fg_colour;
extern colour scroll_widget_bg_colour;
@ -276,6 +283,11 @@ void gui_init(int argc, char** argv)
IKeymap = (struct KeymapIFace *)GetInterface(KeymapBase,"main",1,NULL);
}
if(ApplicationBase = OpenLibrary("application.library",50))
{
IApplication = (struct ApplicationIFace *)GetInterface(ApplicationBase,"application",1,NULL);
}
urlStringClass = MakeStringClass();
ami_clipboard_init();
@ -682,6 +694,21 @@ void gui_init2(int argc, char** argv)
return;
}
if(IApplication)
{
ami_appid = RegisterApplication(messages_get("NetSurf"),
REGAPP_URLIdentifier, "netsurf-browser.org",
REGAPP_WBStartup, (struct WBStartup *)argv,
// REGAPP_NoIcon, TRUE,
// REGAPP_AppIconInfo,(ULONG)&aii,
REGAPP_HasPrefsWindow,TRUE,
REGAPP_UniqueApplication,TRUE,
TAG_DONE);
GetApplicationAttrs(ami_appid, APPATTR_Port, (ULONG)&applibport, TAG_DONE);
applibsig = (1L << applibport->mp_SigBit);
}
if(!bw) bw = browser_window_create(option_homepage_url, 0, 0, true,false);
if(locked_screen) UnlockPubScreen(NULL,scrn);
@ -1406,6 +1433,34 @@ void ami_handle_appmsg(void)
}
}
void ami_handle_applib(void)
{
struct ApplicationMsg *applibmsg;
while((applibmsg=(struct ApplicationMsg *)GetMsg(applibport)))
{
switch (applibmsg->type)
{
case APPLIBMT_ToFront:
ScreenToFront(scrn);
WindowToFront(curbw->window->shared->win);
ActivateWindow(curbw->window->shared->win);
break;
case APPLIBMT_OpenPrefs:
ScreenToFront(scrn);
ami_gui_opts_open();
break;
case APPLIBMT_Quit:
case APPLIBMT_ForceQuit:
ami_quit_netsurf();
break;
}
ReplyMsg((struct Message *)applibmsg);
}
}
void ami_get_msg(void)
{
ULONG winsignal = 1L << sport->mp_SigBit;
@ -1415,7 +1470,7 @@ void ami_get_msg(void)
struct Message *timermsg = NULL;
struct MsgPort *printmsgport = ami_print_get_msgport();
ULONG printsig = 1L << printmsgport->mp_SigBit;
ULONG signalmask = winsignal | appsig | schedulesig | rxsig | printsig;
ULONG signalmask = winsignal | appsig | schedulesig | rxsig | printsig | applibsig;
signal = Wait(signalmask);
@ -1431,6 +1486,10 @@ void ami_get_msg(void)
{
ami_arexx_handle();
}
else if(signal & applibsig)
{
ami_handle_applib();
}
else if(signal & printsig)
{
while(GetMsg(printmsgport)); //ReplyMsg
@ -1568,6 +1627,9 @@ void gui_quit(void)
hubbub_finalise(myrealloc,NULL);
if(IApplication && ami_appid)
UnregisterApplication(ami_appid, NULL);
ami_arexx_cleanup();
ami_free_layers(&browserglob);
@ -1612,11 +1674,14 @@ void gui_quit(void)
ami_openurl_close();
FreeStringClass(urlStringClass);
if(IPopupMenu) DropInterface((struct Interface *)IPopupMenu);
if(PopupMenuBase) CloseLibrary(PopupMenuBase);
if(IApplication) DropInterface((struct Interface *)IApplication);
if(ApplicationBase) CloseLibrary(ApplicationBase);
if(IKeymap) DropInterface((struct Interface *)IKeymap);
if(KeymapBase) CloseLibrary(KeymapBase);
if(IPopupMenu) DropInterface((struct Interface *)IPopupMenu);
if(PopupMenuBase) CloseLibrary(PopupMenuBase);
if(IKeymap) DropInterface((struct Interface *)IKeymap);
if(KeymapBase) CloseLibrary(KeymapBase);
if(ITimer)
{