github/amiga-stuff
1
0
Fork 0
mirror of https://github.com/weiju/amiga-stuff synced 2025-11-19 16:01:31 +00:00
Code Releases Wiki Activity

IFFView and requesters update

Browse Source 
IFFView
 - screen height updated to PAL

requesters

 - added buttons and slider
This commit is contained in:
Wei-ju Wu
2016-01-13 21:02:08 -08:00
parent 595440ee0f
commit c4bcf8a6d4
3 changed files with 99 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
30years/iffview/iffview.c
View File

@ -153,7 +153,7 @@ void setup_menu()
struct Image image = { 0, 0, 0, 0, 0, NULL, 0, 0, NULL}; struct Image image = { 0, 0, 0, 0, 0, NULL, 0, 0, NULL};
struct NewScreen newscreen = { struct NewScreen newscreen = {
0, 0, 320, 200, 5, 0, 0, 320, 256, 5,
0, 1, // pens 0, 1, // pens
0, // view modes 0, // view modes
CUSTOMSCREEN, // type CUSTOMSCREEN, // type

140
requesters/filereq.c
View File

@ -7,6 +7,10 @@
#include "filereq.h" #include "filereq.h"
#define REQWIN_WIDTH 260
#define REQWIN_HEIGHT 180
#define REQ_X 10
#define REQ_Y 16
#define REQ_WIDTH 240 #define REQ_WIDTH 240
#define REQ_HEIGHT 175 #define REQ_HEIGHT 175
#define TOPAZ_BASELINE 8 #define TOPAZ_BASELINE 8
@ -14,20 +18,39 @@
#define BUTTON_Y 135 #define BUTTON_Y 135
#define BUTTON_HEIGHT 18 #define BUTTON_HEIGHT 18
#define BUTTON_TEXT_XOFFSET 14 #define BUTTON_TEXT_XOFFSET 5
#define OK_BUTTON_X 20 #define BUTTON_TEXT_YOFFSET (TOPAZ_BASELINE - 3)
#define CANCEL_BUTTON_X 160
#define OK_BUTTON_WIDTH 40
#define CANCEL_BUTTON_WIDTH 60
#define DRAWER_GADGET_X 80 #define OK_BUTTON_X 0
#define DRAWER_GADGET_Y 95 #define OK_BUTTON_WIDTH 40
#define FILE_GADGET_X 80 #define DRIVES_BUTTON_X 46
#define DRIVES_BUTTON_WIDTH 58
#define PARENT_BUTTON_X 110
#define PARENT_BUTTON_WIDTH 58
#define CANCEL_BUTTON_X 174
#define CANCEL_BUTTON_WIDTH 58
#define DRAWER_GADGET_X 60
#define DRAWER_GADGET_Y 98
#define FILE_GADGET_X DRAWER_GADGET_X
#define FILE_GADGET_Y 115 #define FILE_GADGET_Y 115
#define PATH_GADGET_WIDTH 120 #define PATH_GADGET_WIDTH 160
#define STR_LABEL_XOFFSET -70 #define STR_LABEL_XOFFSET -60
#define STR_LABEL_YOFFSET 2 #define STR_LABEL_YOFFSET 2
#define FILE_LIST_WIDTH 224
#define FILE_LIST_HEIGHT 86
#define LIST_VSLIDER_X FILE_LIST_WIDTH
#define LIST_VSLIDER_Y 0
#define LIST_VSLIDER_WIDTH 12
#define LIST_VSLIDER_HEIGHT 70
#define REQ_OK_BUTTON_ID 101
#define REQ_DRIVES_BUTTON_ID 102
#define REQ_PARENT_BUTTON_ID 103
#define REQ_CANCEL_BUTTON_ID 104
static struct Requester requester; static struct Requester requester;
static BOOL req_opened = FALSE; static BOOL req_opened = FALSE;
static struct Window *req_window; static struct Window *req_window;
@ -36,29 +59,43 @@ static struct IntuiText drawer_str_label = {1, 0, JAM2, STR_LABEL_XOFFSET, STR_
"Drawer", NULL}; "Drawer", NULL};
static struct IntuiText file_str_label = {1, 0, JAM2, STR_LABEL_XOFFSET, STR_LABEL_YOFFSET, NULL, static struct IntuiText file_str_label = {1, 0, JAM2, STR_LABEL_XOFFSET, STR_LABEL_YOFFSET, NULL,
"File", NULL}; "File", NULL};
static struct IntuiText ok_button_label = {1, 0, JAM2, 10, TOPAZ_BASELINE - 4, NULL, "Ok", NULL}; static struct IntuiText parent_button_label = {1, 0, JAM2, BUTTON_TEXT_XOFFSET, BUTTON_TEXT_YOFFSET, NULL, "Parent", NULL};
static struct IntuiText cancel_button_label = {1, 0, JAM2, 10, TOPAZ_BASELINE - 4, NULL, static struct IntuiText drives_button_label = {1, 0, JAM2, BUTTON_TEXT_XOFFSET, BUTTON_TEXT_YOFFSET, NULL, "Drives", NULL};
static struct IntuiText ok_button_label = {1, 0, JAM2, BUTTON_TEXT_XOFFSET, BUTTON_TEXT_YOFFSET, NULL, "Open", NULL};
static struct IntuiText cancel_button_label = {1, 0, JAM2, BUTTON_TEXT_XOFFSET, BUTTON_TEXT_YOFFSET, NULL,
"Cancel", NULL}; "Cancel", NULL};
static WORD gadget_border_points[3][10] = { static WORD ok_border_points[] = {0, 0, OK_BUTTON_WIDTH, 0, OK_BUTTON_WIDTH, BUTTON_HEIGHT, 0,
{0, 0, OK_BUTTON_WIDTH, 0, OK_BUTTON_WIDTH, BUTTON_HEIGHT, 0, BUTTON_HEIGHT, 0, 0}, BUTTON_HEIGHT, 0, 0};
{0, 0, CANCEL_BUTTON_WIDTH, 0, CANCEL_BUTTON_WIDTH, BUTTON_HEIGHT, 0, BUTTON_HEIGHT, 0, 0}, static WORD drives_border_points[] = {0, 0, DRIVES_BUTTON_WIDTH, 0, DRIVES_BUTTON_WIDTH,
/* the -2 is the margin to set to avoid that the string gadget will overdraw the BUTTON_HEIGHT, 0, BUTTON_HEIGHT, 0, 0};
borders */
{-2, -2, PATH_GADGET_WIDTH, -2, PATH_GADGET_WIDTH, 10, -2, 10, -2, -2}
};
static struct Border ok_button_border = {0, 0, 1, 0, JAM1, 5, gadget_border_points[0], NULL}; static WORD cancel_border_points[] = {0, 0, CANCEL_BUTTON_WIDTH, 0, CANCEL_BUTTON_WIDTH,
static struct Border cancel_button_border = {0, 0, 1, 0, JAM1, 5, gadget_border_points[1], NULL}; BUTTON_HEIGHT, 0, BUTTON_HEIGHT, 0, 0};
static struct Border str_gadget_border = {0, 0, 1, 0, JAM1, 5, gadget_border_points[2], NULL}; static WORD list_border_points[] = {0, 0, FILE_LIST_WIDTH, 0, FILE_LIST_WIDTH,
FILE_LIST_HEIGHT, 0, FILE_LIST_HEIGHT, 0, 0};
/* the -2 is the margin to set to avoid that the string gadget will overdraw the
borders */
static WORD string_border_points[] = {-2, -2, PATH_GADGET_WIDTH, -2, PATH_GADGET_WIDTH,
10, -2, 10, -2, -2};
static struct Border ok_button_border = {0, 0, 1, 0, JAM1, 5, ok_border_points, NULL};
static struct Border drives_button_border = {0, 0, 1, 0, JAM1, 5, cancel_border_points, NULL};
static struct Border parent_button_border = {0, 0, 1, 0, JAM1, 5, cancel_border_points, NULL};
static struct Border cancel_button_border = {0, 0, 1, 0, JAM1, 5, cancel_border_points, NULL};
static struct Border str_gadget_border = {0, 0, 1, 0, JAM1, 5, string_border_points, NULL};
static struct Border file_list_border = {0, 0, 1, 0, JAM1, 5, list_border_points, NULL};
static UBYTE buffer1[82], undobuffer1[82]; static UBYTE buffer1[82], undobuffer1[82];
static struct StringInfo strinfo1 = {buffer1, undobuffer1, 0, 80, 0, 0, 0, 0, 0, 0, NULL, 0, NULL}; static struct StringInfo strinfo1 = {buffer1, undobuffer1, 0, 80, 0, 0, 0, 0, 0, 0, NULL, 0, NULL};
static UBYTE buffer2[82], undobuffer2[82]; static UBYTE buffer2[82], undobuffer2[82];
static struct StringInfo strinfo2 = {buffer2, undobuffer2, 0, 80, 0, 0, 0, 0, 0, 0, NULL, 0, NULL}; static struct StringInfo strinfo2 = {buffer2, undobuffer2, 0, 80, 0, 0, 0, 0, 0, 0, NULL, 0, NULL};
#define REQWIN_WIDTH 260 static struct Image slider_image;
#define REQWIN_HEIGHT 180 static struct PropInfo propinfo = {AUTOKNOB | FREEVERT, 0, 0, MAXBODY, MAXBODY,
0, 0, 0, 0, 0, 0};
#define WIN_TITLE "Open File..." #define WIN_TITLE "Open File..."
static struct NewWindow newwin = { static struct NewWindow newwin = {
@ -72,24 +109,43 @@ static struct NewWindow newwin = {
WBENCHSCREEN WBENCHSCREEN
}; };
static struct Gadget list_vslider = {NULL, LIST_VSLIDER_X, LIST_VSLIDER_Y,
LIST_VSLIDER_WIDTH, LIST_VSLIDER_HEIGHT,
GFLG_GADGHCOMP, GACT_RELVERIFY, GTYP_PROPGADGET,
&slider_image, NULL, NULL, 0, &propinfo, 112, NULL};
static struct Gadget file_text = {&list_vslider, FILE_GADGET_X, FILE_GADGET_Y, PATH_GADGET_WIDTH, 10,
GFLG_GADGHCOMP, GACT_RELVERIFY, GTYP_STRGADGET, &str_gadget_border,
NULL, &file_str_label, 0, &strinfo2, 111, NULL};
static struct Gadget dir_text = {&file_text, DRAWER_GADGET_X, DRAWER_GADGET_Y, PATH_GADGET_WIDTH, 10,
GFLG_GADGHCOMP, GACT_RELVERIFY, GTYP_STRGADGET, &str_gadget_border,
NULL, &drawer_str_label, 0, &strinfo1, 110, NULL};
/* /*
Note: Cancel does not specify the GACT_ENDGADGET flag, it seems that Note: Cancel does not specify the GACT_ENDGADGET flag, it seems that
IDCMP_REQCLEAR is not fired when Intuition closes the requester automatically IDCMP_REQCLEAR is not fired when Intuition closes the requester automatically
*/ */
static struct Gadget gadgets[] = { static struct Gadget cancel_button = {&dir_text, CANCEL_BUTTON_X, BUTTON_Y, CANCEL_BUTTON_WIDTH,
{&gadgets[1], OK_BUTTON_X, BUTTON_Y, OK_BUTTON_WIDTH, BUTTON_HEIGHT, GFLG_GADGHCOMP, BUTTON_HEIGHT, GFLG_GADGHCOMP, GACT_RELVERIFY,
GACT_RELVERIFY, GTYP_BOOLGADGET | GTYP_REQGADGET, &ok_button_border, NULL, GTYP_BOOLGADGET | GTYP_REQGADGET, &cancel_button_border, NULL,
&ok_button_label, 0, NULL, REQ_OK_BUTTON_ID, NULL}, &cancel_button_label, 0, NULL, REQ_CANCEL_BUTTON_ID, NULL};
{&gadgets[2], CANCEL_BUTTON_X, BUTTON_Y, CANCEL_BUTTON_WIDTH, BUTTON_HEIGHT, GFLG_GADGHCOMP,
GACT_RELVERIFY, GTYP_BOOLGADGET | GTYP_REQGADGET, &cancel_button_border, NULL, static struct Gadget parent_button = {&cancel_button, PARENT_BUTTON_X, BUTTON_Y, PARENT_BUTTON_WIDTH,
&cancel_button_label, 0, NULL, REQ_CANCEL_BUTTON_ID, NULL}, BUTTON_HEIGHT,
{&gadgets[3], DRAWER_GADGET_X, DRAWER_GADGET_Y, PATH_GADGET_WIDTH, 10, GFLG_GADGHCOMP, GACT_RELVERIFY, GTYP_BOOLGADGET | GTYP_REQGADGET,
GFLG_GADGHCOMP, GACT_RELVERIFY, GTYP_STRGADGET, &str_gadget_border, NULL, &parent_button_border, NULL, &parent_button_label, 0, NULL,
&drawer_str_label, 0, &strinfo1, 103, NULL}, REQ_PARENT_BUTTON_ID, NULL};
{NULL, FILE_GADGET_X, FILE_GADGET_Y, PATH_GADGET_WIDTH, 10,
GFLG_GADGHCOMP, GACT_RELVERIFY, GTYP_STRGADGET, &str_gadget_border, NULL, static struct Gadget drives_button = {&parent_button, DRIVES_BUTTON_X, BUTTON_Y, DRIVES_BUTTON_WIDTH,
&file_str_label, 0, &strinfo2, 104, NULL}, BUTTON_HEIGHT,
}; GFLG_GADGHCOMP, GACT_RELVERIFY, GTYP_BOOLGADGET | GTYP_REQGADGET,
&drives_button_border, NULL, &drives_button_label, 0, NULL,
REQ_DRIVES_BUTTON_ID, NULL};
static struct Gadget ok_button = {&drives_button, OK_BUTTON_X, BUTTON_Y, OK_BUTTON_WIDTH, BUTTON_HEIGHT,
GFLG_GADGHCOMP, GACT_RELVERIFY, GTYP_BOOLGADGET | GTYP_REQGADGET,
&ok_button_border, NULL, &ok_button_label, 0, NULL,
REQ_OK_BUTTON_ID, NULL};
#define PATHBUFFER_SIZE 200 #define PATHBUFFER_SIZE 200
static char dirname[PATHBUFFER_SIZE + 1]; static char dirname[PATHBUFFER_SIZE + 1];
@ -151,14 +207,14 @@ void open_file(struct Window *window)
BOOL result; BOOL result;
if (req_window = OpenWindow(&newwin)) { if (req_window = OpenWindow(&newwin)) {
InitRequester(&requester); InitRequester(&requester);
requester.LeftEdge = 20; requester.LeftEdge = REQ_X;
requester.TopEdge = 20; requester.TopEdge = REQ_Y;
requester.Width = REQ_WIDTH; requester.Width = REQ_WIDTH;
requester.Height = REQ_HEIGHT; requester.Height = REQ_HEIGHT;
requester.Flags = SIMPLEREQ; requester.Flags = SIMPLEREQ;
requester.BackFill = 0; requester.BackFill = 0;
requester.ReqGadget = &gadgets[0]; requester.ReqGadget = &ok_button;
requester.ReqBorder = NULL; requester.ReqBorder = &file_list_border;
requester.ReqText = NULL; requester.ReqText = NULL;
/* scan current directory */ /* scan current directory */

2
requesters/filereq.h
View File

@ -4,7 +4,5 @@
extern void open_file(struct Window *window); extern void open_file(struct Window *window);
#define REQ_OK_BUTTON_ID 101
#define REQ_CANCEL_BUTTON_ID 102
#endif /* __FILEREQ_H__ */ #endif /* __FILEREQ_H__ */