github/amiga-stuff
1
0
Fork 0
mirror of https://github.com/weiju/amiga-stuff synced 2026-09-12 03:30:36 +00:00
Code Releases Wiki Activity

tweak requester behavior, ilbm module

Browse Source 
- requester: scan current directory
 - ilbm: read into IFFData structure and return
This commit is contained in:
Wei-ju Wu
2016-01-09 19:29:12 -08:00
parent b599d82d62
commit 2ff7b6c237
3 changed files with 88 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
30years/iffview/filereq.c
+54 -15
View File
@@ -1,34 +1,41 @@
#include <intuition/intuition.h>
#include <clib/intuition_protos.h>
#include <clib/dos_protos.h>
#ifdef __VBCC__
#include <clib/alib_stdio_protos.h>
#endif
#include "filereq.h"
#define REQ_TEXT_XOFFSET 10
#define BUTTON_TEXT_XOFFSET 14
#define REQ_WIDTH 200
#define REQ_HEIGHT 100
#define REQ_WIDTH 240
#define REQ_HEIGHT 170
#define TOPAZ_BASELINE 8
#define BUTTON_HEIGHT 24
#define OK_BUTTON_X 20
#define OK_BUTTON_WIDTH 40
#define BUTTON_Y 140
#define BUTTON_HEIGHT 18
#define BUTTON_TEXT_XOFFSET 14
#define OK_BUTTON_X 20
#define CANCEL_BUTTON_X 160
#define OK_BUTTON_WIDTH 40
#define CANCEL_BUTTON_WIDTH 60
#define PATH_GADGET_WIDTH 100
#define STR_GADGET_X 90
#define STR_GADGET_Y 120
#define PATH_GADGET_WIDTH 100
struct Requester requester;
struct IntuiText labels[] = {
{1, 0, JAM2, REQ_TEXT_XOFFSET, TOPAZ_BASELINE, NULL, "Enter file path", NULL},
{1, 0, JAM2, 10, TOPAZ_BASELINE, NULL, "Ok", NULL},
{1, 0, JAM2, 10, TOPAZ_BASELINE, NULL, "Cancel", NULL} /* TOPAZ_BASELINE is 8 */
{1, 0, JAM2, REQ_TEXT_XOFFSET, STR_GADGET_Y, NULL, "Enter file path", NULL},
{1, 0, JAM2, 10, TOPAZ_BASELINE - 4, NULL, "Ok", NULL},
{1, 0, JAM2, 10, TOPAZ_BASELINE - 4, NULL, "Cancel", NULL} /* TOPAZ_BASELINE is 8 */
};
WORD gadget_border_points[3][10] = {
{0, 0, OK_BUTTON_WIDTH, 0, OK_BUTTON_WIDTH, BUTTON_HEIGHT, 0, BUTTON_HEIGHT, 0, 0},
{0, 0, CANCEL_BUTTON_WIDTH, 0, CANCEL_BUTTON_WIDTH, BUTTON_HEIGHT, 0, BUTTON_HEIGHT, 0, 0},
/* the -2 is the margin to set to avoid that the string gadget will overdraw the
borders */
{-2, -2, PATH_GADGET_WIDTH, -2, PATH_GADGET_WIDTH, 10, -2, 10, -2, -2}
};
struct Border gadget_borders[] = {
@@ -50,18 +57,32 @@ struct StringInfo strinfo = {buffer, undobuffer, 0, 80, 0, 0, 0, 0, 0, 0, NULL,
IDCMP_REQCLEAR is not fired when Intuition closes the requester automatically
*/
struct Gadget gadgets[] = {
{&gadgets[1], OK_BUTTON_X, 50, OK_BUTTON_WIDTH, BUTTON_HEIGHT, GFLG_GADGHCOMP,
{&gadgets[1], OK_BUTTON_X, BUTTON_Y, OK_BUTTON_WIDTH, BUTTON_HEIGHT, GFLG_GADGHCOMP,
GACT_RELVERIFY, GTYP_BOOLGADGET | GTYP_REQGADGET, &gadget_borders[0], NULL,
&labels[1], 0, NULL, REQ_OK_BUTTON_ID, NULL},
{&gadgets[2], 80, 50, CANCEL_BUTTON_WIDTH, BUTTON_HEIGHT, GFLG_GADGHCOMP,
{&gadgets[2], CANCEL_BUTTON_X, BUTTON_Y, CANCEL_BUTTON_WIDTH, BUTTON_HEIGHT, GFLG_GADGHCOMP,
GACT_RELVERIFY, GTYP_BOOLGADGET | GTYP_REQGADGET, &gadget_borders[1], NULL,
&labels[2], 0, NULL, REQ_CANCEL_BUTTON_ID, NULL},
{NULL, OK_BUTTON_X, 20, PATH_GADGET_WIDTH, 10,
{NULL, STR_GADGET_X, STR_GADGET_Y, PATH_GADGET_WIDTH, 10,
GFLG_GADGHCOMP, GACT_RELVERIFY, GTYP_STRGADGET, &gadget_borders[2], NULL,
&labels[3], 0, &strinfo, 103, NULL},
};
BOOL initialized = 0;
#define PATHBUFFER_SIZE 32
char dirname[PATHBUFFER_SIZE + 1];
BPTR flock;
LONG error;
struct FileInfoBlock fileinfo;
void print_fileinfo(struct FileInfoBlock *fileinfo)
{
if (fileinfo->fib_DirEntryType > 0) {
printf("dir: '%s'\n", fileinfo->fib_FileName);
} else {
printf("file: '%s'\n", fileinfo->fib_FileName);
}
}
struct Requester *open_file(struct Window *window)
{
@@ -77,6 +98,24 @@ struct Requester *open_file(struct Window *window)
requester.ReqGadget = &gadgets[0];
requester.ReqBorder = &req_border;
requester.ReqText = &labels[0];
/* scan current directory */
puts("scanning directory...");
GetCurrentDirName(dirname, PATHBUFFER_SIZE);
printf("current dir: '%s'\n", dirname);
flock = Lock(dirname, SHARED_LOCK);
if (Examine(flock, &fileinfo)) {
while (ExNext(flock, &fileinfo)) {
print_fileinfo(&fileinfo);
}
error = IoErr();
if (error != ERROR_NO_MORE_ENTRIES) {
/* an error occurred */
puts("unknown I/O error, TODO handle");
}
}
UnLock(flock);
initialized = 1;
}
result = Request(&requester, window);
30years/iffview/ilbm.c
+26 -5
View File
@@ -130,13 +130,14 @@ UBYTE *read_BODY(FILE *fp, int datasize, BitMapHeader *bmheader)
#define skip_chunk(fp, datasize) fseek(fp, datasize, SEEK_CUR)
void read_chunks(FILE *fp, int filesize, int total_read)
IFFData *read_chunks(FILE *fp, int filesize, int total_read)
{
char id[5], buffer[CHUNK_HEADER_SIZE];
int i, bytes_read, datasize;
BitMapHeader *bmheader = NULL;
ColorRegister *colors = NULL;
UBYTE *imgdata = NULL;
IFFData *result = malloc(sizeof(IFFData));
while (total_read < filesize) {
@@ -169,17 +170,24 @@ void read_chunks(FILE *fp, int filesize, int total_read)
}
total_read += datasize + CHUNK_HEADER_SIZE;
}
printf("total read: %d\n", total_read);
/*
if (imgdata) free(imgdata);
if (colors) free(colors);
if (bmheader) free(bmheader);
if (bmheader) free(bmheader);*/
result->imgdata = imgdata;
result->colors = colors;
result->bmheader = bmheader;
return result;
}
void parse_file(const char *path)
IFFData *parse_file(const char *path)
{
FILE *fp;
char buffer[IFF_HEADER_SIZE];
size_t bytes_read;
ULONG filesize, total_read = 0;
IFFData *result = NULL;
fp = fopen(path, "rb");
@@ -199,22 +207,35 @@ void parse_file(const char *path)
#ifdef DEBUG
printf("IFF/ILBM file, file size: %d\n", (int) filesize);
#endif
read_chunks(fp, filesize, total_read);
result = read_chunks(fp, filesize, total_read);
} else {
puts("not an IFF ILBM file");
}
} else {
puts("not an IFF file");
}
return result;
}
void free_iffdata(IFFData *data)
{
if (data) {
if (data->colors) free(data->colors);
if (data->bmheader) free(data->bmheader);
if (data->imgdata) free(data->imgdata);
free(data);
}
}
#ifdef STANDALONE
int main(int argc, char **argv)
{
if (argc <= 1) {
puts("usage: ilbm <image-file>");
} else {
parse_file(argv[1]);
IFFData *data = parse_file(argv[1]);
free_iffdata(data);
}
}
#endif
30years/iffview/ilbm.h
+8
View File
@@ -77,4 +77,12 @@ typedef struct {
UBYTE low, high;
} CRange;
typedef struct _IFFData {
BitMapHeader *bmheader;
ColorRegister *colors;
UBYTE *imgdata;
} IFFData;
extern IFFData *parse_file(const char *path);
extern void free_iffdata(IFFData *data);
#endif /* __ILBM_H__ */