diff options
Diffstat (limited to 'amiga')
| -rw-r--r-- | amiga/bitmap.c | 4 | ||||
| -rwxr-xr-x | amiga/clipboard.c | 2 | ||||
| -rwxr-xr-x | amiga/gui.c | 53 | ||||
| -rwxr-xr-x | amiga/hotlist.c | 2 | ||||
| -rwxr-xr-x | amiga/login.c | 2 | ||||
| -rwxr-xr-x | amiga/object.c | 4 | ||||
| -rwxr-xr-x | amiga/schedule.c | 11 | ||||
| -rwxr-xr-x | amiga/tree.c | 4 |
8 files changed, 44 insertions, 38 deletions
diff --git a/amiga/bitmap.c b/amiga/bitmap.c index 543f0f118..372d241a0 100644 --- a/amiga/bitmap.c +++ b/amiga/bitmap.c @@ -34,10 +34,10 @@ void *bitmap_create(int width, int height, unsigned int state) { struct bitmap *bitmap; - bitmap = AllocVec(sizeof(struct bitmap),MEMF_CLEAR); + bitmap = AllocVec(sizeof(struct bitmap),MEMF_PRIVATE | MEMF_CLEAR); if(bitmap) { - bitmap->pixdata = AllocVec(width*height*4*2,MEMF_CLEAR); + bitmap->pixdata = AllocVec(width*height*4*2,MEMF_PRIVATE | MEMF_CLEAR); bitmap->width = width; bitmap->height = height; } diff --git a/amiga/clipboard.c b/amiga/clipboard.c index c31c5ea05..cf6c14975 100755 --- a/amiga/clipboard.c +++ b/amiga/clipboard.c @@ -63,7 +63,7 @@ void gui_paste_from_clipboard(struct gui_window *g, int x, int y) ULONG rlen=0,error; struct CSet cset; char *clip; - STRPTR readbuf = AllocVec(1024,MEMF_CLEAR); + STRPTR readbuf = AllocVec(1024,MEMF_PRIVATE | MEMF_CLEAR); cset.CodeSet = 0; diff --git a/amiga/gui.c b/amiga/gui.c index 51a48b7b3..fc66a0086 100755 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -138,7 +138,7 @@ char *ptrs[AMI_LASTPOINTER+1] = { "Resources/Pointers/Progress", "Resources/Pointers/Blank"}; -void ami_update_throbber(struct gui_window_2 *g); +void ami_update_throbber(struct gui_window_2 *g,bool redraw); void ami_update_buttons(struct gui_window_2 *); void ami_scroller_hook(struct Hook *,Object *,struct IntuiMessage *); uint32 ami_popup_hook(struct Hook *hook,Object *item,APTR reserved); @@ -368,7 +368,7 @@ void gui_init(int argc, char** argv) NULL,RGBFB_A8R8G8B8)) { struct RenderInfo ri; - UBYTE *throbber_tempmem = AllocVec(throbber_bmh->bmh_Width*throbber_height*4,MEMF_CLEAR); + UBYTE *throbber_tempmem = AllocVec(throbber_bmh->bmh_Width*throbber_height*4,MEMF_PRIVATE | MEMF_CLEAR); throbber_rp.BitMap = throbber; ri.Memory = throbber_tempmem; ri.BytesPerRow = 4*throbber_bmh->bmh_Width; @@ -747,6 +747,8 @@ void ami_handle_msg(void) switch(node->Type) { case AMINS_WINDOW: + ami_update_throbber(gwin,true); + // fall through case AMINS_FRAME: GetAttr(SPACE_AreaBox,gwin->gadgets[GID_BROWSER],(ULONG *)&bbox); browser_window_reformat(gwin->bw,bbox->Width,bbox->Height); @@ -787,7 +789,7 @@ void ami_handle_msg(void) ami_do_redraw(gwin); if(gwin->throbber_frame) - ami_update_throbber(gwin); + ami_update_throbber(gwin,false); if(node->Type == AMINS_WINDOW) { @@ -834,7 +836,7 @@ void ami_handle_appmsg(void) if(appwinargs = appmsg->am_ArgList) { - if(filename = AllocVec(1024,MEMF_CLEAR)) + if(filename = AllocVec(1024,MEMF_PRIVATE | MEMF_CLEAR)) { if(appwinargs->wa_Lock) { @@ -968,6 +970,7 @@ void gui_multitask(void) ami_handle_msg(); ami_handle_appmsg(); + ami_arexx_handle(); } void gui_poll(bool active) @@ -1208,7 +1211,7 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw, } - gwin = AllocVec(sizeof(struct gui_window),MEMF_CLEAR); + gwin = AllocVec(sizeof(struct gui_window),MEMF_PRIVATE | MEMF_CLEAR); if(!gwin) { @@ -1253,7 +1256,7 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw, return gwin; } - gwin->shared = AllocVec(sizeof(struct gui_window_2),MEMF_CLEAR); + gwin->shared = AllocVec(sizeof(struct gui_window_2),MEMF_PRIVATE | MEMF_CLEAR); if(!gwin->shared) { @@ -1580,8 +1583,8 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw, gwin->shared->layerinfo = NewLayerInfo(); gwin->shared->rp.Layer = CreateUpfrontLayer(gwin->shared->layerinfo,gwin->shared->bm,0,0,scrn->Width-1,scrn->Height-1,0,NULL); - gwin->shared->areabuf = AllocVec(100,MEMF_CLEAR); - gwin->shared->rp.AreaInfo = AllocVec(sizeof(struct AreaInfo),MEMF_CLEAR); + gwin->shared->areabuf = AllocVec(100,MEMF_PRIVATE | MEMF_CLEAR); + gwin->shared->rp.AreaInfo = AllocVec(sizeof(struct AreaInfo),MEMF_PRIVATE | MEMF_CLEAR); if((!gwin->shared->areabuf) || (!gwin->shared->rp.AreaInfo)) { @@ -1591,8 +1594,8 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw, } InitArea(gwin->shared->rp.AreaInfo,gwin->shared->areabuf,100/5); - gwin->shared->rp.TmpRas = AllocVec(sizeof(struct TmpRas),MEMF_CLEAR); - gwin->shared->tmprasbuf = AllocVec(scrn->Width*scrn->Height,MEMF_CLEAR); + gwin->shared->rp.TmpRas = AllocVec(sizeof(struct TmpRas),MEMF_PRIVATE | MEMF_CLEAR); + gwin->shared->tmprasbuf = AllocVec(scrn->Width*scrn->Height,MEMF_PRIVATE | MEMF_CLEAR); if((!gwin->shared->tmprasbuf) || (!gwin->shared->rp.TmpRas)) { @@ -2159,10 +2162,10 @@ void ami_init_mouse_pointers(void) if(ptrfile = Open(ptrs[i],MODE_OLDFILE)) { int mx,my; - UBYTE *pprefsbuf = AllocVec(1061,MEMF_CLEAR); + UBYTE *pprefsbuf = AllocVec(1061,MEMF_PRIVATE | MEMF_CLEAR); Read(ptrfile,pprefsbuf,1061); - mouseptrbm[i]=AllocVec(sizeof(struct BitMap),MEMF_CLEAR); + mouseptrbm[i]=AllocVec(sizeof(struct BitMap),MEMF_PRIVATE | MEMF_CLEAR); InitBitMap(mouseptrbm[i],2,32,32); mouseptrbm[i]->Planes[0] = AllocRaster(32,32); mouseptrbm[i]->Planes[1] = AllocRaster(32,32); @@ -2233,25 +2236,29 @@ void gui_window_stop_throbber(struct gui_window *g) g->shared->throbber_frame = 0; } -void ami_update_throbber(struct gui_window_2 *g) +void ami_update_throbber(struct gui_window_2 *g,bool redraw) { struct IBox *bbox; if(!g->gadgets[GID_THROBBER]) return; - if(g->throbber_update_count < 1000) + if(!redraw) { - g->throbber_update_count++; - return; - } + if(g->throbber_update_count < 1000) + { + g->throbber_update_count++; + return; + } - g->throbber_update_count = 0; + g->throbber_update_count = 0; - GetAttr(SPACE_AreaBox,g->gadgets[GID_THROBBER],(ULONG *)&bbox); + g->throbber_frame++; + if(g->throbber_frame > (throbber_frames-1)) + g->throbber_frame=1; + + } - g->throbber_frame++; - if(g->throbber_frame > (throbber_frames-1)) - g->throbber_frame=1; + GetAttr(SPACE_AreaBox,g->gadgets[GID_THROBBER],(ULONG *)&bbox); BltBitMapRastPort(throbber,throbber_width*g->throbber_frame,0,g->win->RPort,bbox->Left,bbox->Top,throbber_width,throbber_height,0x0C0); } @@ -2346,7 +2353,7 @@ struct gui_download_window *gui_download_window_create(const char *url, } else return NULL; - dw = AllocVec(sizeof(struct gui_download_window),MEMF_CLEAR); + dw = AllocVec(sizeof(struct gui_download_window),MEMF_PRIVATE | MEMF_CLEAR); dw->size = total_size; dw->downloaded = 0; diff --git a/amiga/hotlist.c b/amiga/hotlist.c index 9a3267790..a5ca71e7b 100755 --- a/amiga/hotlist.c +++ b/amiga/hotlist.c @@ -84,7 +84,7 @@ void ami_hotlist_init(struct tree **hotlist) int i; const struct url_data *data; - *hotlist = AllocVec(sizeof(struct tree),MEMF_CLEAR); + *hotlist = AllocVec(sizeof(struct tree),MEMF_PRIVATE | MEMF_CLEAR); hotlist_tree = *hotlist; if (!hotlist_tree) { diff --git a/amiga/login.c b/amiga/login.c index c9ae8394a..a5dc35871 100755 --- a/amiga/login.c +++ b/amiga/login.c @@ -42,7 +42,7 @@ void gui_401login_open(struct browser_window *bw, struct content *c, const char *realm) { - struct gui_login_window *lw = AllocVec(sizeof(struct gui_login_window),MEMF_CLEAR); + struct gui_login_window *lw = AllocVec(sizeof(struct gui_login_window),MEMF_PRIVATE | MEMF_CLEAR); char *host; url_host(c->url, &host); diff --git a/amiga/object.c b/amiga/object.c index 4dbf2c056..f3b5374e2 100755 --- a/amiga/object.c +++ b/amiga/object.c @@ -27,7 +27,7 @@ struct MinList *NewObjList(void) struct MinList *objlist; - objlist = (struct MinList *)AllocVec(sizeof(struct MinList),MEMF_CLEAR); + objlist = (struct MinList *)AllocVec(sizeof(struct MinList),MEMF_PRIVATE | MEMF_CLEAR); NewMinList(objlist); @@ -39,7 +39,7 @@ struct nsObject *AddObject(struct MinList *objlist,ULONG otype) { struct nsObject *dtzo; - dtzo = (struct nsObject *)AllocVec(sizeof(struct nsObject),MEMF_CLEAR); + dtzo = (struct nsObject *)AllocVec(sizeof(struct nsObject),MEMF_PRIVATE | MEMF_CLEAR); AddTail((struct List *)objlist,(struct Node *)dtzo); diff --git a/amiga/schedule.c b/amiga/schedule.c index e7a5e9f95..f088aa908 100755 --- a/amiga/schedule.c +++ b/amiga/schedule.c @@ -42,7 +42,7 @@ void schedule(int t, void (*callback)(void *p), void *p) if(!obj) return; obj->objstruct_size = sizeof(struct nscallback); - obj->objstruct = AllocVec(obj->objstruct_size,MEMF_CLEAR); + obj->objstruct = AllocVec(obj->objstruct_size,MEMF_PRIVATE | MEMF_CLEAR); if(!obj->objstruct) { DelObject(obj); @@ -63,7 +63,7 @@ void schedule(int t, void (*callback)(void *p), void *p) GetSysTime(&tv); AddTime(&nscb->tv,&tv); // now contains time when event occurs #ifdef AMI_SCHEDULER_USES_TIMER - if(nscb->treq = AllocVec(sizeof(struct timerequest),MEMF_CLEAR)) + if(nscb->treq = AllocVec(sizeof(struct timerequest),MEMF_PRIVATE | MEMF_CLEAR)) { *nscb->treq = *tioreq; nscb->treq->tr_node.io_Command=TR_ADDREQUEST; @@ -95,10 +95,8 @@ void schedule_remove(void (*callback)(void *p), void *p) node = (struct nsObject *)GetHead((struct List *)schedule_list); - do + while(nnode=(struct nsObject *)GetSucc((struct Node *)node)) { - nnode=(struct nsObject *)GetSucc((struct Node *)node); - nscb = node->objstruct; if(!nscb) continue; @@ -107,7 +105,8 @@ void schedule_remove(void (*callback)(void *p), void *p) ami_remove_timer_event(nscb); DelObject(node); } - } while(node=nnode); + node=nnode; + } } /** diff --git a/amiga/tree.c b/amiga/tree.c index 5780a4af3..d499a96cc 100755 --- a/amiga/tree.c +++ b/amiga/tree.c @@ -201,8 +201,8 @@ void ami_open_tree(struct tree *tree,int type) return; } - twin = AllocVec(sizeof(struct treeview_window),MEMF_CLEAR); - twin->listbrowser_list = AllocVec(sizeof(struct List),MEMF_CLEAR); + twin = AllocVec(sizeof(struct treeview_window),MEMF_PRIVATE | MEMF_CLEAR); + twin->listbrowser_list = AllocVec(sizeof(struct List),MEMF_PRIVATE | MEMF_CLEAR); static struct ColumnInfo columninfo[] = { |