github/amiga-stuff
1
0
Fork 0
mirror of https://github.com/weiju/amiga-stuff synced 2025-11-23 10:39:58 +00:00
Code Releases Wiki Activity

startup and file requester change

Browse Source 
- hardware startup: added copper macros
 - file requester: add blocking requester for parent window
This commit is contained in:
Wei-ju Wu
2016-02-05 20:52:36 -08:00
parent a20c596b9c
commit b4ed097fad
4 changed files with 64 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
requesters/filereq.c
View File

@ -1,10 +1,12 @@
#include <string.h>
#include <intuition/intuition.h>
#include <graphics/clip.h>
#include <dos/dosextens.h>
#include <clib/exec_protos.h>
#include <clib/intuition_protos.h>
#include <clib/graphics_protos.h>
#include <clib/layers_protos.h>
#include <clib/dos_protos.h>
#include <clib/alib_stdio_protos.h>
@ -87,6 +89,9 @@ enum {
LIST_UP_ID, LIST_DOWN_ID
} GadgetIDs;
// This requester's purpose is simply to block the parent window's input
static struct Requester block_requester;
static struct Requester requester;
static BOOL req_opened = FALSE;
static struct Window *req_window;
@ -149,7 +154,7 @@ static struct PropInfo propinfo = {AUTOKNOB | FREEVERT, 0, 0, MAXBODY, MAXBODY,
static struct NewWindow newwin = {
0, 0, 0, REQWIN_HEIGHT, 0, 1,
IDCMP_GADGETUP | IDCMP_MOUSEBUTTONS | IDCMP_MOUSEMOVE,
WFLG_CLOSEGADGET | WFLG_SMART_REFRESH | WFLG_ACTIVATE | WFLG_DRAGBAR | WFLG_DEPTHGADGET | WFLG_NOCAREREFRESH,
WFLG_CLOSEGADGET | WFLG_ACTIVATE | WFLG_DRAGBAR | WFLG_DEPTHGADGET | WFLG_SIMPLE_REFRESH | WFLG_NOCAREREFRESH,
NULL, NULL, WIN_TITLE,
NULL, NULL,
0, REQWIN_HEIGHT,
@ -275,9 +280,11 @@ int vertpot2entry(int vertpot)
static void render_list_backbuffer()
{
LockLayer(0L, requester.ReqLayer);
ClipBlit(&filelist_rastport, 0, 0, requester.ReqLayer->rp,
FILE_LIST_BM_MARGIN, FILE_LIST_BM_MARGIN, filelist_bm_width, filelist_bm_height,
0xc0);
UnlockLayer(requester.ReqLayer);
}
static void draw_selection(struct RastPort *src_rp, int view_index)
@ -317,7 +324,6 @@ static void draw_list()
// layer's rastport, because it is rendered on top of the
// parent window and obscures the content
struct RastPort *src_rp = &filelist_rastport;
struct RastPort *dst_rp = requester.ReqLayer->rp;
// make sure drawing is clipped, otherwise it will
// draw somewhere else into memory
@ -589,7 +595,7 @@ void init_sizes(struct Window *window, struct Requester *requester)
requester->ReqText = NULL;
}
void open_file(struct Window *window)
static void open_request_window(struct Window *window)
{
InitRequester(&requester);
init_sizes(window, &requester);
@ -622,3 +628,22 @@ void open_file(struct Window *window)
puts("OpenWindow() failed !!!");
}
}
void open_file(struct Window *window)
{
InitRequester(&block_requester);
// note that the Request() call fails, when everything is set to 0,
// contrary to the docs.
block_requester.Width = 1;
block_requester.Height = 1;
block_requester.LeftEdge = REQ_HMARGIN;
block_requester.TopEdge = REQ_VMARGIN;
if (Request(&block_requester, window)) {
printf("top request opened\n");
open_request_window(window);
EndRequest(&block_requester, window);
} else {
printf("top request failed\n");
}
}

4
requesters/main.c
View File

@ -48,8 +48,8 @@
static struct NewWindow newwin = {
WIN_LEFT, WIN_TOP, WIN_WIDTH, WIN_HEIGHT, 0, 1,
IDCMP_CLOSEWINDOW | IDCMP_MENUPICK | IDCMP_GADGETUP | IDCMP_REQCLEAR,
WINDOWCLOSE | SMART_REFRESH | ACTIVATE | WINDOWSIZING | WINDOWDRAG | WINDOWDEPTH,
IDCMP_CLOSEWINDOW | IDCMP_MENUPICK | IDCMP_GADGETUP,
WFLG_CLOSEGADGET | WFLG_SIMPLE_REFRESH | WFLG_ACTIVATE | WFLG_SIZEGADGET | WFLG_DRAGBAR | WFLG_DEPTHGADGET | WFLG_NOCAREREFRESH,
NULL, NULL, WIN_TITLE,
NULL, NULL,
WIN_MIN_WIDTH, WIN_MIN_HEIGHT,