From b57ff238aafa837cbeb9902b9f2604a42afe9e62 Mon Sep 17 00:00:00 2001 From: mazze Date: Sun, 22 Jan 2012 07:51:54 +0000 Subject: [PATCH] Tabs => space git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@43689 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- workbench/utilities/More/global.h | 22 +- workbench/utilities/More/locale.c | 10 +- workbench/utilities/More/misc.c | 118 +-- workbench/utilities/More/more.c | 1760 ++++++++++++++++++------------------ workbench/utilities/More/req.c | 376 ++++---- workbench/utilities/More/version.h | 8 +- 6 files changed, 1146 insertions(+), 1148 deletions(-) diff --git a/workbench/utilities/More/global.h b/workbench/utilities/More/global.h index 5cf2babd70..dd3a4e62e6 100644 --- a/workbench/utilities/More/global.h +++ b/workbench/utilities/More/global.h @@ -5,17 +5,17 @@ /****************************************************************************************/ -extern struct IntuitionBase *IntuitionBase; -extern struct GfxBase *GfxBase; -extern struct Library *GadToolsBase; -extern struct Screen *scr; -extern struct DrawInfo *dri; -extern APTR vi; -extern struct Menu *menus; -extern struct Window *win; - -extern ULONG gotomask, findmask; -extern UBYTE filenamebuffer[300]; +extern struct IntuitionBase *IntuitionBase; +extern struct GfxBase *GfxBase; +extern struct Library *GadToolsBase; +extern struct Screen *scr; +extern struct DrawInfo *dri; +extern APTR vi; +extern struct Menu *menus; +extern struct Window *win; + +extern ULONG gotomask, findmask; +extern UBYTE filenamebuffer[300]; /****************************************************************************************/ diff --git a/workbench/utilities/More/locale.c b/workbench/utilities/More/locale.c index 10a34a4a4d..450b30e4d1 100644 --- a/workbench/utilities/More/locale.c +++ b/workbench/utilities/More/locale.c @@ -17,11 +17,11 @@ /*********************************************************************************************/ #ifdef __MORPHOS__ -struct Library *LocaleBase; +struct Library *LocaleBase; #else -struct LocaleBase *LocaleBase; +struct LocaleBase *LocaleBase; #endif -struct Catalog *catalog; +struct Catalog *catalog; /*********************************************************************************************/ @@ -30,8 +30,8 @@ void InitLocale(STRPTR catname, ULONG version) LocaleBase = (struct LocaleBase *)OpenLibrary("locale.library", 39); if (LocaleBase) { - catalog = OpenCatalog(NULL, catname, OC_Version, version, - TAG_DONE); + catalog = OpenCatalog(NULL, catname, OC_Version, version, + TAG_DONE); } } diff --git a/workbench/utilities/More/misc.c b/workbench/utilities/More/misc.c index 968ec157a8..1aea59ee5b 100644 --- a/workbench/utilities/More/misc.c +++ b/workbench/utilities/More/misc.c @@ -32,21 +32,21 @@ struct Library *AslBase; static struct NewMenu nm[] = { - {NM_TITLE, (STRPTR)MSG_MEN_PROJECT }, - {NM_ITEM, (STRPTR)MSG_MEN_PROJECT_OPEN }, - {NM_ITEM, NM_BARLABEL }, - {NM_ITEM, (STRPTR)MSG_MEN_PROJECT_SAVEAS }, - {NM_ITEM, NM_BARLABEL }, - {NM_ITEM, (STRPTR)MSG_MEN_PROJECT_PRINT }, - {NM_ITEM, (STRPTR)MSG_MEN_PROJECT_ABOUT }, - {NM_ITEM, NM_BARLABEL }, - {NM_ITEM, (STRPTR)MSG_MEN_PROJECT_QUIT }, - {NM_TITLE, (STRPTR)MSG_MEN_NAVIGATION }, - {NM_ITEM, (STRPTR)MSG_MEN_NAVIGATION_FIND }, - {NM_ITEM, (STRPTR)MSG_MEN_NAVIGATION_FIND_NEXT }, - {NM_ITEM, (STRPTR)MSG_MEN_NAVIGATION_FIND_PREV }, - {NM_ITEM, NM_BARLABEL }, - {NM_ITEM, (STRPTR)MSG_MEN_NAVIGATION_JUMP }, + {NM_TITLE, (STRPTR)MSG_MEN_PROJECT }, + {NM_ITEM, (STRPTR)MSG_MEN_PROJECT_OPEN }, + {NM_ITEM, NM_BARLABEL }, + {NM_ITEM, (STRPTR)MSG_MEN_PROJECT_SAVEAS }, + {NM_ITEM, NM_BARLABEL }, + {NM_ITEM, (STRPTR)MSG_MEN_PROJECT_PRINT }, + {NM_ITEM, (STRPTR)MSG_MEN_PROJECT_ABOUT }, + {NM_ITEM, NM_BARLABEL }, + {NM_ITEM, (STRPTR)MSG_MEN_PROJECT_QUIT }, + {NM_TITLE, (STRPTR)MSG_MEN_NAVIGATION }, + {NM_ITEM, (STRPTR)MSG_MEN_NAVIGATION_FIND }, + {NM_ITEM, (STRPTR)MSG_MEN_NAVIGATION_FIND_NEXT }, + {NM_ITEM, (STRPTR)MSG_MEN_NAVIGATION_FIND_PREV }, + {NM_ITEM, NM_BARLABEL }, + {NM_ITEM, (STRPTR)MSG_MEN_NAVIGATION_JUMP }, {NM_END} }; @@ -59,21 +59,21 @@ void InitMenus(void) for(actnm = nm; actnm->nm_Type != NM_END; actnm++) { if (actnm->nm_Label != NM_BARLABEL) - { - ULONG id = (IPTR)actnm->nm_Label; - CONST_STRPTR str = MSG(id); - - if (actnm->nm_Type == NM_TITLE) - { - actnm->nm_Label = str; - } else { - actnm->nm_Label = str + 2; - if (str[0] != ' ') actnm->nm_CommKey = str; - } - actnm->nm_UserData = (APTR)(IPTR)id; - - } /* if (actnm->nm_Label != NM_BARLABEL) */ - + { + ULONG id = (IPTR)actnm->nm_Label; + CONST_STRPTR str = MSG(id); + + if (actnm->nm_Type == NM_TITLE) + { + actnm->nm_Label = str; + } else { + actnm->nm_Label = str + 2; + if (str[0] != ' ') actnm->nm_CommKey = str; + } + actnm->nm_UserData = (APTR)(IPTR)id; + + } /* if (actnm->nm_Label != NM_BARLABEL) */ + } /* for(actnm = nm; nm->nm_Type != NM_END; nm++) */ } @@ -103,21 +103,21 @@ void KillMenus(void) STRPTR GetFile(BOOL open) { - static UBYTE pathbuffer[300]; - static UBYTE filebuffer[300]; + static UBYTE pathbuffer[300]; + static UBYTE filebuffer[300]; struct FileRequester *req; - STRPTR retval = NULL; + STRPTR retval = NULL; AslBase = OpenLibrary("asl.library", 39); if (AslBase) { filebuffer[299] = 0; - pathbuffer[299] = 0; - + pathbuffer[299] = 0; + strncpy(filebuffer, FilePart(filenamebuffer), 299); - strncpy(pathbuffer, filenamebuffer, 299); - *(FilePart(pathbuffer)) = 0; - + strncpy(pathbuffer, filenamebuffer, 299); + *(FilePart(pathbuffer)) = 0; + req = AllocAslRequestTags(ASL_FileRequest, ASLFR_TitleText , open ? (IPTR)MSG(MSG_ASL_OPEN_TITLE) : (IPTR)MSG(MSG_ASL_SAVE_TITLE) , @@ -129,23 +129,23 @@ STRPTR GetFile(BOOL open) ASLFR_InitialDrawer , (IPTR)pathbuffer , ASLFR_InitialFile , (IPTR)filebuffer , TAG_DONE); - if (req) - { - if (AslRequest(req, NULL)) - { - strncpy(filebuffer, req->fr_Drawer, 299); - AddPart(filebuffer, req->fr_File, 299); - - retval = filebuffer; - - } /* if (AslRequest(req, NULL) */ - - FreeAslRequest(req); - - } /* if (req) */ - - CloseLibrary(AslBase); - + if (req) + { + if (AslRequest(req, NULL)) + { + strncpy(filebuffer, req->fr_Drawer, 299); + AddPart(filebuffer, req->fr_File, 299); + + retval = filebuffer; + + } /* if (AslRequest(req, NULL) */ + + FreeAslRequest(req); + + } /* if (req) */ + + CloseLibrary(AslBase); + } /* if (AslBase) */ return retval; @@ -164,10 +164,10 @@ void About(void) es.es_GadgetFormat = MSG(MSG_CONTINUE); EasyRequest(win, &es, NULL, (IPTR)VERSION, - (IPTR)REVISION, - (IPTR)DATESTR, - (IPTR)"2005-2009", - (IPTR)"AROS Development Team"); + (IPTR)REVISION, + (IPTR)DATESTR, + (IPTR)"2005-2009", + (IPTR)"AROS Development Team"); } diff --git a/workbench/utilities/More/more.c b/workbench/utilities/More/more.c index a244c04771..20b0d020c6 100644 --- a/workbench/utilities/More/more.c +++ b/workbench/utilities/More/more.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2009, The AROS Development Team. All rights reserved. + Copyright © 1995-2012, The AROS Development Team. All rights reserved. $Id$ */ @@ -101,56 +101,56 @@ struct LineNode /****************************************************************************************/ -struct IntuitionBase *IntuitionBase; -struct GfxBase *GfxBase; -struct Library *GadToolsBase; -struct Screen *scr; -struct DrawInfo *dri; -APTR vi; -struct Menu *menus; -struct Window *win; +struct IntuitionBase *IntuitionBase; +struct GfxBase *GfxBase; +struct Library *GadToolsBase; +struct Screen *scr; +struct DrawInfo *dri; +APTR vi; +struct Menu *menus; +struct Window *win; struct MsgPort *msgport; struct AppWindow *appwindow; -ULONG gotomask, findmask; -UBYTE filenamebuffer[300]; +ULONG gotomask, findmask; +UBYTE filenamebuffer[300]; /****************************************************************************************/ -static struct RastPort *rp; -static struct RDArgs *MyArgs; +static struct RastPort *rp; +static struct RDArgs *MyArgs; -static struct Gadget *gad[NUM_GADGETS], *firstgadget, *activearrowgad; -static struct Image *img[NUM_GADGETS]; +static struct Gadget *gad[NUM_GADGETS], *firstgadget, *activearrowgad; +static struct Image *img[NUM_GADGETS]; -static struct LineNode *linearray; +static struct LineNode *linearray; -static UBYTE *filebuffer; +static UBYTE *filebuffer; -static char *filename, *fillename_dest, s[256], *searchtext; +static char *filename, *fillename_dest, s[256], *searchtext; -static BPTR fh; +static BPTR fh; -static UWORD tabsize = DEFAULT_TABSIZE; +static UWORD tabsize = DEFAULT_TABSIZE; -static WORD fontwidth, fontheight, borderleft, bordertop; -static WORD shinepen, shadowpen, bgpen, textpen; -static WORD borderright, borderbottom, visiblex, visibley; -static WORD fontbaseline, textstartx, textstarty, textendx, textendy; -static WORD textwidth, textheight, viewstartx, viewstarty; -static WORD winwidth, winheight; +static WORD fontwidth, fontheight, borderleft, bordertop; +static WORD shinepen, shadowpen, bgpen, textpen; +static WORD borderright, borderbottom, visiblex, visibley; +static WORD fontbaseline, textstartx, textstarty, textendx, textendy; +static WORD textwidth, textheight, viewstartx, viewstarty; +static WORD winwidth, winheight; -static ULONG winmask, msgmask; -static LONG filelen, num_lines, max_textlen; -static LONG search_startline, found_line = -1; -static WORD arrowticker; +static ULONG winmask, msgmask; +static LONG filelen, num_lines, max_textlen; +static LONG search_startline, found_line = -1; +static WORD arrowticker; -static BOOL in_main_loop; +static BOOL in_main_loop; -static IPTR Args[NUM_ARGS]; +static IPTR Args[NUM_ARGS]; -static BPTR oldlock = (BPTR)-1; -static BPTR parentlock = (BPTR)-1; +static BPTR oldlock = (BPTR)-1; +static BPTR parentlock = (BPTR)-1; /*********************************************************************************************/ @@ -176,14 +176,14 @@ VOID Cleanup(CONST_STRPTR msg) if (msg) { if (IntuitionBase && !((struct Process *)FindTask(NULL))->pr_CLI) - { - ShowMessage("More", msg, MSG(MSG_OK)); - } else { - Printf("More: %s\n", msg); - } - rc = RETURN_WARN; + { + ShowMessage("More", msg, MSG(MSG_OK)); + } else { + Printf("More: %s\n", msg); + } + rc = RETURN_WARN; } else { - rc = RETURN_OK; + rc = RETURN_OK; } CleanupRequesters(); @@ -201,21 +201,21 @@ VOID Cleanup(CONST_STRPTR msg) if (win) { - for(i = 0; i < NUM_GADGETS;i++) - { - if (gad[i]) RemoveGadget(win, gad[i]); - } + for(i = 0; i < NUM_GADGETS;i++) + { + if (gad[i]) RemoveGadget(win, gad[i]); + } - CloseWindow(win); + CloseWindow(win); } for(i = 0; i < NUM_GADGETS;i++) { - if (gad[i]) DisposeObject(gad[i]); + if (gad[i]) DisposeObject(gad[i]); } for(i = 0; i < NUM_IMAGES;i++) { - if (img[i]) DisposeObject(img[i]); + if (img[i]) DisposeObject(img[i]); } if (vi) FreeVisualInfo(vi); @@ -236,9 +236,7 @@ VOID Cleanup(CONST_STRPTR msg) if (MyArgs) FreeArgs(MyArgs); CleanupLocale(); - /* Abnormal exit? */ - if (rc != 0) - longjmp(exit_buf, rc); + longjmp(exit_buf, rc); } /****************************************************************************************/ @@ -260,26 +258,26 @@ static void GetArguments(int argc, char **argv) { if (argc) { - if (!(MyArgs = ReadArgs(ARG_TEMPLATE, Args, 0))) - { - DosError(); - } + if (!(MyArgs = ReadArgs(ARG_TEMPLATE, Args, 0))) + { + DosError(); + } - filename = (char *)Args[ARG_FILE]; + filename = (char *)Args[ARG_FILE]; } else { - struct WBStartup *startup = (struct WBStartup *) argv; - if (startup->sm_NumArgs > 1) - { - parentlock = startup->sm_ArgList[1].wa_Lock; - filename = startup->sm_ArgList[1].wa_Name; - if ((parentlock == BNULL) || (filename == NULL)) - Cleanup(NULL); - - oldlock = CurrentDir(parentlock); - } - + struct WBStartup *startup = (struct WBStartup *) argv; + if (startup->sm_NumArgs > 1) + { + parentlock = startup->sm_ArgList[1].wa_Lock; + filename = startup->sm_ArgList[1].wa_Name; + if ((parentlock == BNULL) || (filename == NULL)) + Cleanup(NULL); + + oldlock = CurrentDir(parentlock); + } + } if (!filename) filename = GetFile(TRUE); if (!filename) Cleanup(NULL); @@ -294,21 +292,21 @@ static void OpenLibs(void) { if (!(IntuitionBase = (struct IntuitionBase *)OpenLibrary("intuition.library", 39))) { - __sprintf(s, MSG(MSG_CANT_OPEN_LIB), "intuition.library", 39); - Cleanup(s); + __sprintf(s, MSG(MSG_CANT_OPEN_LIB), "intuition.library", 39); + Cleanup(s); } if (!(GfxBase = (struct GfxBase *)OpenLibrary("graphics.library", 39))) { - __sprintf(s, MSG(MSG_CANT_OPEN_LIB), "graphics.library", 39); - Cleanup(s); - } + __sprintf(s, MSG(MSG_CANT_OPEN_LIB), "graphics.library", 39); + Cleanup(s); + } if (!(GadToolsBase = OpenLibrary("gadtools.library", 39))) { - __sprintf(s, MSG(MSG_CANT_OPEN_LIB), "gadtools.library", 39); - Cleanup(s); - } + __sprintf(s, MSG(MSG_CANT_OPEN_LIB), "gadtools.library", 39); + Cleanup(s); + } } /****************************************************************************************/ @@ -320,12 +318,12 @@ static UWORD CalcTextLen(char *text) while((c = *text++)) { - if (c == '\t') - { - rc += tabsize; - } else { - rc++; - } + if (c == '\t') + { + rc += tabsize; + } else { + rc++; + } } if (rc > MAX_TEXTLINELEN) rc = MAX_TEXTLINELEN; @@ -337,56 +335,56 @@ static UWORD CalcTextLen(char *text) static BOOL OpenFile(void) { - struct LineNode *new_linearray; - UBYTE *new_filebuffer; - LONG new_filelen; - LONG new_num_lines; + struct LineNode *new_linearray; + UBYTE *new_filebuffer; + LONG new_filelen; + LONG new_num_lines; - struct LineNode *linepos; - UBYTE *filepos; - LONG flen, act_line; + struct LineNode *linepos; + UBYTE *filepos; + LONG flen, act_line; BOOL seekable; if (!(fh = Open(filename, MODE_OLDFILE))) { - DosError(); - return FALSE; + DosError(); + return FALSE; } if (Seek(fh, 0, OFFSET_END) >= 0) { - new_filelen = Seek(fh, 0, OFFSET_BEGINNING); + new_filelen = Seek(fh, 0, OFFSET_BEGINNING); seekable = TRUE; } else { - new_filelen = 0x10000; + new_filelen = 0x10000; seekable = FALSE; } if (new_filelen < 0) { Close(fh); fh = 0; - DosError(); - return FALSE; + DosError(); + return FALSE; } if (!(new_filebuffer = AllocVec(new_filelen + 1, MEMF_PUBLIC))) { Close(fh); fh = 0; - if (in_main_loop) - { - ShowMessage("More", MSG(MSG_NO_MEM), MSG(MSG_OK)); - return FALSE; - } - Cleanup(MSG(MSG_NO_MEM)); + if (in_main_loop) + { + ShowMessage("More", MSG(MSG_NO_MEM), MSG(MSG_OK)); + return FALSE; + } + Cleanup(MSG(MSG_NO_MEM)); } if ((flen=Read(fh, new_filebuffer, new_filelen)) != new_filelen && seekable) { FreeVec(new_filebuffer); Close(fh); fh = 0; - DosError(); - return FALSE; + DosError(); + return FALSE; } new_filelen = flen; @@ -400,18 +398,18 @@ static BOOL OpenFile(void) while(flen--) { - if (*filepos++ == '\n') new_num_lines++; + if (*filepos++ == '\n') new_num_lines++; } new_linearray = AllocVec(new_num_lines * sizeof(struct LineNode), MEMF_PUBLIC | MEMF_CLEAR); if (!new_linearray) { FreeVec(new_filebuffer); - if (in_main_loop) - { - ShowMessage("More", MSG(MSG_NO_MEM), MSG(MSG_OK)); - return FALSE; - } + if (in_main_loop) + { + ShowMessage("More", MSG(MSG_NO_MEM), MSG(MSG_OK)); + return FALSE; + } Cleanup(MSG(MSG_NO_MEM)); } @@ -422,19 +420,19 @@ static BOOL OpenFile(void) max_textlen = 0; while(act_line <= new_num_lines) { - linepos->text = (char *)filepos; + linepos->text = (char *)filepos; - while ((*filepos != '\n') && (*filepos != '\0')) - { - linepos->stringlen++; filepos++; - } + while ((*filepos != '\n') && (*filepos != '\0')) + { + linepos->stringlen++; filepos++; + } - *filepos++ = '\0'; + *filepos++ = '\0'; - linepos->textlen = CalcTextLen(linepos->text); - if (linepos->textlen > max_textlen) max_textlen = linepos->textlen; + linepos->textlen = CalcTextLen(linepos->text); + if (linepos->textlen > max_textlen) max_textlen = linepos->textlen; - linepos++; act_line++; + linepos++; act_line++; } if (filebuffer) FreeVec(filebuffer); @@ -454,12 +452,12 @@ static void GetVisual(void) { if (!(scr = LockPubScreen(0))) { - Cleanup(MSG(MSG_CANT_LOCK_SCR)); + Cleanup(MSG(MSG_CANT_LOCK_SCR)); } if (!(dri = GetScreenDrawInfo(scr))) { - Cleanup(MSG(MSG_CANT_GET_DRI)); + Cleanup(MSG(MSG_CANT_GET_DRI)); } if (!(vi = GetVisualInfoA(scr, 0))) @@ -479,11 +477,11 @@ static void MakeGadgets(void) { static WORD img2which[] = { - UPIMAGE, - DOWNIMAGE, - LEFTIMAGE, - RIGHTIMAGE, - SIZEIMAGE + UPIMAGE, + DOWNIMAGE, + LEFTIMAGE, + RIGHTIMAGE, + SIZEIMAGE }; IPTR imagew[NUM_IMAGES], imageh[NUM_IMAGES]; @@ -491,14 +489,14 @@ static void MakeGadgets(void) for(i = 0;i < NUM_IMAGES;i++) { - img[i] = NewObject(0, SYSICLASS, SYSIA_DrawInfo , (Tag) dri, - SYSIA_Which , (Tag) img2which[i], - TAG_DONE); + img[i] = NewObject(0, SYSICLASS, SYSIA_DrawInfo , (Tag) dri, + SYSIA_Which , (Tag) img2which[i], + TAG_DONE); - if (!img[i]) Cleanup(MSG(MSG_CANT_CREATE_SYSIMAGE)); + if (!img[i]) Cleanup(MSG(MSG_CANT_CREATE_SYSIMAGE)); - GetAttr(IA_Width, (Object *)img[i], &imagew[i]); - GetAttr(IA_Height, (Object *)img[i], &imageh[i]); + GetAttr(IA_Width, (Object *)img[i], &imagew[i]); + GetAttr(IA_Height, (Object *)img[i], &imageh[i]); } btop = scr->WBorTop + dri->dri_Font->tf_YSize + 1; @@ -507,80 +505,80 @@ static void MakeGadgets(void) h_offset = imageh[IMG_LEFTARROW] / 4; firstgadget = - gad[GAD_UPARROW] = NewObject(0, BUTTONGCLASS, GA_Image , (Tag)img[IMG_UPARROW] , - GA_RelRight , -imagew[IMG_UPARROW] + 1 , - GA_RelBottom , -imageh[IMG_DOWNARROW] - imageh[IMG_UPARROW] - imageh[IMG_SIZE] + 1 , - GA_ID , GAD_UPARROW , - GA_RightBorder, TRUE , - GA_Immediate , TRUE , - GA_RelVerify , TRUE , - TAG_DONE); - - gad[GAD_DOWNARROW] = NewObject(0, BUTTONGCLASS, GA_Image , (Tag)img[IMG_DOWNARROW] , - GA_RelRight , -imagew[IMG_UPARROW] + 1 , - GA_RelBottom , -imageh[IMG_UPARROW] - imageh[IMG_SIZE] + 1 , - GA_ID , GAD_DOWNARROW , - GA_RightBorder , TRUE , - GA_Previous , (Tag)gad[GAD_UPARROW] , - GA_Immediate , TRUE , - GA_RelVerify , TRUE , - TAG_DONE); - - gad[GAD_VERTSCROLL] = NewObject(0, PROPGCLASS, GA_Top , btop + 1 , - GA_RelRight , -imagew[IMG_DOWNARROW] + v_offset + 1 , - GA_Width , imagew[IMG_DOWNARROW] - v_offset * 2 , - GA_RelHeight , -imageh[IMG_DOWNARROW] - imageh[IMG_UPARROW] - imageh[IMG_SIZE] - btop -2 , - GA_ID , GAD_VERTSCROLL , - GA_Previous , (Tag)gad[GAD_DOWNARROW] , - GA_RightBorder , TRUE , - GA_RelVerify , TRUE , - GA_Immediate , TRUE , - PGA_NewLook , TRUE , - PGA_Borderless , TRUE , - PGA_Total , 100 , - PGA_Visible , 100 , - PGA_Freedom , FREEVERT , - TAG_DONE); - - gad[GAD_RIGHTARROW] = NewObject(0, BUTTONGCLASS, GA_Image , (Tag)img[IMG_RIGHTARROW] , - GA_RelRight , -imagew[IMG_SIZE] - imagew[IMG_RIGHTARROW] + 1, - GA_RelBottom , -imageh[IMG_RIGHTARROW] + 1 , - GA_ID , GAD_RIGHTARROW , - GA_BottomBorder , TRUE , - GA_Previous , (Tag)gad[GAD_VERTSCROLL] , - GA_Immediate , TRUE , - GA_RelVerify , TRUE , - TAG_DONE); - - gad[GAD_LEFTARROW] = NewObject(0, BUTTONGCLASS, GA_Image , (Tag)img[IMG_LEFTARROW] , - GA_RelRight , -imagew[IMG_SIZE] - imagew[IMG_RIGHTARROW] - imagew[IMG_LEFTARROW] + 1, - GA_RelBottom , -imageh[IMG_RIGHTARROW] + 1 , - GA_ID , GAD_LEFTARROW , - GA_BottomBorder , TRUE , - GA_Previous , (Tag)gad[GAD_RIGHTARROW] , - GA_Immediate , TRUE , - GA_RelVerify , TRUE , - TAG_DONE); - - gad[GAD_HORIZSCROLL] = NewObject(0, PROPGCLASS, GA_Left , scr->WBorLeft, - GA_RelBottom , -imageh[IMG_LEFTARROW] + h_offset + 1 , - GA_RelWidth , -imagew[IMG_LEFTARROW] - imagew[IMG_RIGHTARROW] - imagew[IMG_SIZE] - scr->WBorRight - 2, - GA_Height , imageh[IMG_LEFTARROW] - (h_offset * 2) , - GA_ID , GAD_HORIZSCROLL , - GA_Previous , (Tag)gad[GAD_LEFTARROW] , - GA_BottomBorder , TRUE , - GA_RelVerify , TRUE , - GA_Immediate , TRUE , - PGA_NewLook , TRUE , - PGA_Borderless , TRUE , - PGA_Total , 100 , - PGA_Visible , 100 , - PGA_Freedom , FREEHORIZ , - TAG_DONE); + gad[GAD_UPARROW] = NewObject(0, BUTTONGCLASS, GA_Image , (Tag)img[IMG_UPARROW] , + GA_RelRight , -imagew[IMG_UPARROW] + 1 , + GA_RelBottom , -imageh[IMG_DOWNARROW] - imageh[IMG_UPARROW] - imageh[IMG_SIZE] + 1 , + GA_ID , GAD_UPARROW , + GA_RightBorder, TRUE , + GA_Immediate , TRUE , + GA_RelVerify , TRUE , + TAG_DONE); + + gad[GAD_DOWNARROW] = NewObject(0, BUTTONGCLASS, GA_Image , (Tag)img[IMG_DOWNARROW] , + GA_RelRight , -imagew[IMG_UPARROW] + 1 , + GA_RelBottom , -imageh[IMG_UPARROW] - imageh[IMG_SIZE] + 1 , + GA_ID , GAD_DOWNARROW , + GA_RightBorder , TRUE , + GA_Previous , (Tag)gad[GAD_UPARROW] , + GA_Immediate , TRUE , + GA_RelVerify , TRUE , + TAG_DONE); + + gad[GAD_VERTSCROLL] = NewObject(0, PROPGCLASS, GA_Top , btop + 1 , + GA_RelRight , -imagew[IMG_DOWNARROW] + v_offset + 1 , + GA_Width , imagew[IMG_DOWNARROW] - v_offset * 2 , + GA_RelHeight , -imageh[IMG_DOWNARROW] - imageh[IMG_UPARROW] - imageh[IMG_SIZE] - btop -2 , + GA_ID , GAD_VERTSCROLL , + GA_Previous , (Tag)gad[GAD_DOWNARROW] , + GA_RightBorder , TRUE , + GA_RelVerify , TRUE , + GA_Immediate , TRUE , + PGA_NewLook , TRUE , + PGA_Borderless , TRUE , + PGA_Total , 100 , + PGA_Visible , 100 , + PGA_Freedom , FREEVERT , + TAG_DONE); + + gad[GAD_RIGHTARROW] = NewObject(0, BUTTONGCLASS, GA_Image , (Tag)img[IMG_RIGHTARROW] , + GA_RelRight , -imagew[IMG_SIZE] - imagew[IMG_RIGHTARROW] + 1, + GA_RelBottom , -imageh[IMG_RIGHTARROW] + 1 , + GA_ID , GAD_RIGHTARROW , + GA_BottomBorder , TRUE , + GA_Previous , (Tag)gad[GAD_VERTSCROLL] , + GA_Immediate , TRUE , + GA_RelVerify , TRUE , + TAG_DONE); + + gad[GAD_LEFTARROW] = NewObject(0, BUTTONGCLASS, GA_Image , (Tag)img[IMG_LEFTARROW] , + GA_RelRight , -imagew[IMG_SIZE] - imagew[IMG_RIGHTARROW] - imagew[IMG_LEFTARROW] + 1, + GA_RelBottom , -imageh[IMG_RIGHTARROW] + 1 , + GA_ID , GAD_LEFTARROW , + GA_BottomBorder , TRUE , + GA_Previous , (Tag)gad[GAD_RIGHTARROW] , + GA_Immediate , TRUE , + GA_RelVerify , TRUE , + TAG_DONE); + + gad[GAD_HORIZSCROLL] = NewObject(0, PROPGCLASS, GA_Left , scr->WBorLeft, + GA_RelBottom , -imageh[IMG_LEFTARROW] + h_offset + 1 , + GA_RelWidth , -imagew[IMG_LEFTARROW] - imagew[IMG_RIGHTARROW] - imagew[IMG_SIZE] - scr->WBorRight - 2, + GA_Height , imageh[IMG_LEFTARROW] - (h_offset * 2) , + GA_ID , GAD_HORIZSCROLL , + GA_Previous , (Tag)gad[GAD_LEFTARROW] , + GA_BottomBorder , TRUE , + GA_RelVerify , TRUE , + GA_Immediate , TRUE , + PGA_NewLook , TRUE , + PGA_Borderless , TRUE , + PGA_Total , 100 , + PGA_Visible , 100 , + PGA_Freedom , FREEHORIZ , + TAG_DONE); for(i = 0;i < NUM_GADGETS;i++) { - if (!gad[i]) Cleanup(MSG(MSG_CANT_CREATE_GADGET)); + if (!gad[i]) Cleanup(MSG(MSG_CANT_CREATE_GADGET)); } } @@ -589,10 +587,10 @@ static void MakeGadgets(void) static void CalcVisible(void) { visiblex = (win->Width - borderleft - borderright - - INNER_SPACING_X * 2) / fontwidth; + INNER_SPACING_X * 2) / fontwidth; visibley = (win->Height - bordertop - borderbottom - - INNER_SPACING_Y * 2) / fontheight; + INNER_SPACING_Y * 2) / fontheight; if (visiblex < 1) visiblex = 1; if (visibley < 1) visibley = 1; @@ -601,7 +599,7 @@ static void CalcVisible(void) textendy = textstarty + visibley * fontheight - 1; textwidth = textendx - textstartx + 1; - textheight = textendy - textstarty + 1; + textheight = textendy - textstarty + 1; } /****************************************************************************************/ @@ -612,8 +610,8 @@ static void MySetAPen(struct RastPort *rp, LONG reg) if (reg != oldreg) { - oldreg = reg; - SetAPen(rp, reg); + oldreg = reg; + SetAPen(rp, reg); } } @@ -625,8 +623,8 @@ static void MySetBPen(struct RastPort *rp, LONG reg) if (reg != oldreg) { - oldreg = reg; - SetBPen(rp, reg); + oldreg = reg; + SetBPen(rp, reg); } } @@ -649,74 +647,74 @@ static void DrawTextLine(WORD viewline, WORD columns, BOOL clearright) if (columns != 0) { - clearright = FALSE; /* because already cleared by ScrollRaster */ + clearright = FALSE; /* because already cleared by ScrollRaster */ } if ((viewline >= 0) && (viewline < visibley) && - (realline >= 0) && (realline < num_lines)) + (realline >= 0) && (realline < num_lines)) { - inverted = linearray[realline].invert; - - text = linearray[realline].text; - textlen = linearray[realline].textlen; - - stringpos = tempstring; - - while((c = *text++) && (i < textlen)) - { - if (c == '\t') - { - for(t = 0; (t < tabsize) && (i < textlen);t++) - { - *stringpos++ = ' '; - i++; - } - } else { - *stringpos++ = c; - i++; - } - } /* while((c = *text++) && (i < textlen)) */ - - stringpos = tempstring + viewstartx; - i -= viewstartx; - - if (i < 0) - { - i = 0; - } else { - if (i > visiblex) i = visiblex; - - x = textstartx; - if (columns < 0) - { - if (i > (-columns)) i = (-columns); - } else if (columns > 0) { - x = textstartx + (visiblex - columns) * fontwidth; - stringpos += (visiblex - columns); - i -= (visiblex - columns); - } - - if (i > 0) - { - MySetAPen(rp, textpen); - MySetBPen(rp, inverted ? shinepen : bgpen); - - Move(rp, x, - textstarty + (viewline * fontheight) + fontbaseline); - - Text(rp, stringpos, i); - } - } + inverted = linearray[realline].invert; + + text = linearray[realline].text; + textlen = linearray[realline].textlen; + + stringpos = tempstring; + + while((c = *text++) && (i < textlen)) + { + if (c == '\t') + { + for(t = 0; (t < tabsize) && (i < textlen);t++) + { + *stringpos++ = ' '; + i++; + } + } else { + *stringpos++ = c; + i++; + } + } /* while((c = *text++) && (i < textlen)) */ + + stringpos = tempstring + viewstartx; + i -= viewstartx; + + if (i < 0) + { + i = 0; + } else { + if (i > visiblex) i = visiblex; + + x = textstartx; + if (columns < 0) + { + if (i > (-columns)) i = (-columns); + } else if (columns > 0) { + x = textstartx + (visiblex - columns) * fontwidth; + stringpos += (visiblex - columns); + i -= (visiblex - columns); + } + + if (i > 0) + { + MySetAPen(rp, textpen); + MySetBPen(rp, inverted ? shinepen : bgpen); + + Move(rp, x, + textstarty + (viewline * fontheight) + fontbaseline); + + Text(rp, stringpos, i); + } + } } /* if ((realline >= 0) && (realline < num_lines)) */ if ((i < visiblex) && clearright) { - MySetAPen(rp, bgpen); - RectFill(rp, textstartx + (i * fontwidth), - textstarty + (viewline * fontheight), - textendx, - textstarty + (viewline * fontheight) + fontheight - 1); + MySetAPen(rp, bgpen); + RectFill(rp, textstartx + (i * fontwidth), + textstarty + (viewline * fontheight), + textendx, + textstarty + (viewline * fontheight) + fontheight - 1); } } @@ -728,7 +726,7 @@ static void DrawAllText(void) for(y = 0;y < visibley;y++) { - DrawTextLine(y, 0, TRUE); + DrawTextLine(y, 0, TRUE); } } @@ -737,13 +735,13 @@ static void DrawAllText(void) static void SetWinTitle(void) { static UBYTE wintitle[256]; - BPTR lock; + BPTR lock; strcpy(s, filename); if ((lock = Lock(filename, SHARED_LOCK))) { - NameFromLock(lock, s, 255); - UnLock(lock); + NameFromLock(lock, s, 255); + UnLock(lock); } __sprintf(wintitle, MSG(MSG_WIN_TITLE), s, num_lines, filelen); @@ -763,15 +761,15 @@ static void HandleFileChange(void) viewstartx = viewstarty = 0; - SetGadgetAttrs(gad[GAD_HORIZSCROLL], win, 0, PGA_Top , viewstartx , - PGA_Visible, visiblex , - PGA_Total , max_textlen , - TAG_DONE); + SetGadgetAttrs(gad[GAD_HORIZSCROLL], win, 0, PGA_Top , viewstartx , + PGA_Visible, visiblex , + PGA_Total , max_textlen , + TAG_DONE); - SetGadgetAttrs(gad[GAD_VERTSCROLL], win, 0, PGA_Top , viewstarty , - PGA_Visible , visibley , - PGA_Total , num_lines , - TAG_DONE); + SetGadgetAttrs(gad[GAD_VERTSCROLL], win, 0, PGA_Top , viewstarty , + PGA_Visible , visibley , + PGA_Total , num_lines , + TAG_DONE); DrawAllText(); } @@ -779,43 +777,43 @@ static void HandleFileChange(void) /****************************************************************************************/ static void MakeWin(void) -{ - if (!(win = OpenWindowTags(NULL, WA_PubScreen , (IPTR)scr , - WA_Left , 0 , - WA_Top , scr->BarHeight + 1 , - WA_Width , 640 , - WA_Height , 480 , - WA_AutoAdjust , TRUE , - USE_SIMPLEREFRESH ? +{ + if (!(win = OpenWindowTags(NULL, WA_PubScreen , (IPTR)scr , + WA_Left , 0 , + WA_Top , scr->BarHeight + 1 , + WA_Width , 640 , + WA_Height , 480 , + WA_AutoAdjust , TRUE , + USE_SIMPLEREFRESH ? WA_SimpleRefresh : - TAG_IGNORE , TRUE , - WA_CloseGadget , TRUE , - WA_DepthGadget , TRUE , - WA_DragBar , TRUE , - WA_SizeGadget , TRUE , - WA_SizeBBottom , TRUE , - WA_SizeBRight , TRUE , - WA_Activate , TRUE , - WA_Gadgets , (IPTR)firstgadget , - WA_MinWidth , 100 , - WA_MinHeight , 100 , - WA_MaxWidth , scr->Width , - WA_MaxHeight , scr->Height , - WA_ReportMouse , TRUE , - WA_NewLookMenus , TRUE , - WA_IDCMP , IDCMP_CLOSEWINDOW | - IDCMP_NEWSIZE | - IDCMP_GADGETDOWN | - IDCMP_GADGETUP | - IDCMP_MOUSEMOVE | - IDCMP_VANILLAKEY | - IDCMP_INTUITICKS | + TAG_IGNORE , TRUE , + WA_CloseGadget , TRUE , + WA_DepthGadget , TRUE , + WA_DragBar , TRUE , + WA_SizeGadget , TRUE , + WA_SizeBBottom , TRUE , + WA_SizeBRight , TRUE , + WA_Activate , TRUE , + WA_Gadgets , (IPTR)firstgadget , + WA_MinWidth , 100 , + WA_MinHeight , 100 , + WA_MaxWidth , scr->Width , + WA_MaxHeight , scr->Height , + WA_ReportMouse , TRUE , + WA_NewLookMenus , TRUE , + WA_IDCMP , IDCMP_CLOSEWINDOW | + IDCMP_NEWSIZE | + IDCMP_GADGETDOWN | + IDCMP_GADGETUP | + IDCMP_MOUSEMOVE | + IDCMP_VANILLAKEY | + IDCMP_INTUITICKS | (USE_SIMPLEREFRESH != 0) * IDCMP_REFRESHWINDOW | - IDCMP_RAWKEY | - IDCMP_MENUPICK , - TAG_DONE))) + IDCMP_RAWKEY | + IDCMP_MENUPICK , + TAG_DONE))) { - Cleanup(MSG(MSG_CANT_CREATE_WIN)); + Cleanup(MSG(MSG_CANT_CREATE_WIN)); } SetWinTitle(); @@ -857,15 +855,15 @@ static void MakeWin(void) CalcVisible(); - SetGadgetAttrs(gad[GAD_HORIZSCROLL], win, 0, PGA_Top , 0 , - PGA_Total , max_textlen , - PGA_Visible , visiblex , - TAG_DONE); + SetGadgetAttrs(gad[GAD_HORIZSCROLL], win, 0, PGA_Top , 0 , + PGA_Total , max_textlen , + PGA_Visible , visiblex , + TAG_DONE); - SetGadgetAttrs(gad[GAD_VERTSCROLL], win, 0, PGA_Top , 0 , - PGA_Total , num_lines , - PGA_Visible , visibley , - TAG_DONE); + SetGadgetAttrs(gad[GAD_VERTSCROLL], win, 0, PGA_Top , 0 , + PGA_Total , num_lines , + PGA_Visible , visibley , + TAG_DONE); DrawAllText(); @@ -885,46 +883,46 @@ static void NewWinSize(void) if ((viewstartx + visiblex) > max_textlen) { - viewstartx = max_textlen - visiblex; - if (viewstartx < 0) viewstartx = 0; + viewstartx = max_textlen - visiblex; + if (viewstartx < 0) viewstartx = 0; } if ((viewstarty + visibley) > num_lines) { - viewstarty = num_lines - visibley; - if (viewstarty < 0) viewstarty = 0; + viewstarty = num_lines - visibley; + if (viewstarty < 0) viewstarty = 0; } - SetGadgetAttrs(gad[GAD_HORIZSCROLL], win, 0, PGA_Top , viewstartx , - PGA_Visible , visiblex , - TAG_DONE); + SetGadgetAttrs(gad[GAD_HORIZSCROLL], win, 0, PGA_Top , viewstartx , + PGA_Visible , visiblex , + TAG_DONE); - SetGadgetAttrs(gad[GAD_VERTSCROLL], win, 0, PGA_Top , viewstarty , - PGA_Visible , visibley , - TAG_DONE); + SetGadgetAttrs(gad[GAD_VERTSCROLL], win, 0, PGA_Top , viewstarty , + PGA_Visible , visibley , + TAG_DONE); if (new_winwidth < winwidth) { - MySetAPen(rp, bgpen); - RectFill(rp, textendx + 1, - bordertop + INNER_SPACING_Y, - new_winwidth - borderright - 1, - new_winheight - borderbottom - 1); + MySetAPen(rp, bgpen); + RectFill(rp, textendx + 1, + bordertop + INNER_SPACING_Y, + new_winwidth - borderright - 1, + new_winheight - borderbottom - 1); } if (new_winheight < winheight) { - MySetAPen(rp, bgpen); - RectFill(rp, borderleft + INNER_SPACING_X, - textendy + 1, - new_winwidth - borderright - 1, - new_winheight - borderbottom - 1); + MySetAPen(rp, bgpen); + RectFill(rp, borderleft + INNER_SPACING_X, + textendy + 1, + new_winwidth - borderright - 1, + new_winheight - borderbottom - 1); } if ((new_winwidth > winwidth) || - (new_winheight > winheight)) + (new_winheight > winheight)) { - DrawAllText(); + DrawAllText(); } winwidth = new_winwidth; @@ -965,184 +963,184 @@ static void ScrollTo(WORD gadid, LONG top, BOOL refreshprop) switch(gadid) { - case GAD_VERTSCROLL: - if (top + visibley > num_lines) - { - top = num_lines - visibley; - } - if (top < 0) top = 0; - - if (top != viewstarty ) - { - dy = top - viewstarty; - viewstarty = top; - - if (refreshprop) - { - SetGadgetAttrs(gad[gadid], win, 0, PGA_Top , viewstarty, - TAG_DONE); - } - - if (abs(dy) >= visibley) - { - DrawAllText(); - } else { - if (dy > 0) - { - - #ifdef USE_SIMPLEREFRESH - ScrollRaster(rp, - 0, - fontheight * dy, - textstartx, - textstarty, - textendx, - textendy); - - if (rp->Layer->Flags & LAYERREFRESH) - { - HandleRefresh(); - } - #else - ClipBlit(rp, textstartx, - textstarty + dy * fontheight, - rp, textstartx, - textstarty, - textwidth, - textheight - dy * fontheight, - 192); - #endif - - for (y = visibley - dy;y < visibley;y++) - { - DrawTextLine(y, 0, TRUE); - } - } else { - dy = -dy; - - #ifdef USE_SIMPLEREFRESH - ScrollRaster(rp, - 0, - -fontheight * dy, - textstartx, - textstarty, - textendx, - textendy); - - if (rp->Layer->Flags & LAYERREFRESH) - { - HandleRefresh(); - } - - #else - ClipBlit(rp, textstartx, - textstarty, - rp, textstartx, - textstarty + dy * fontheight, - textwidth, - textheight - dy * fontheight, - 192); - #endif - for (y = 0;y < dy;y++) - { - DrawTextLine(y, 0, TRUE); - } - } - } - - } /* if (top != viewstarty ) */ - break; - - case GAD_HORIZSCROLL: - if (top + visiblex > max_textlen) - { - top = max_textlen - visiblex; - } - if (top < 0) top = 0; - - if (top != viewstartx ) - { - dx = top - viewstartx; - viewstartx = top; - - if (refreshprop) - { - SetGadgetAttrs(gad[gadid], win, 0, PGA_Top , viewstartx, - TAG_DONE); - } - - if (abs(dx) >= visiblex) - { - DrawAllText(); - } else { - if (dx > 0) - { - - #ifdef USE_SIMPLEREFRESH - ScrollRaster(rp, - fontwidth * dx, - 0, - textstartx, - textstarty, - textendx, - textendy); - - if (rp->Layer->Flags & LAYERREFRESH) - { - HandleRefresh(); - } - #else - ClipBlit(rp, textstartx + dx * fontwidth, - textstarty, - rp, textstartx, - textstarty, - textwidth - dx * fontwidth, - textheight, - 192); - #endif - for (y = 0;y < visibley;y++) - { - DrawTextLine(y, dx, TRUE); - } - - } else { - dx = -dx; - - #ifdef USE_SIMPLEREFRESH - ScrollRaster(rp, - -fontwidth * dx, - 0, - textstartx, - textstarty, - textendx, - textendy); - - if (rp->Layer->Flags & LAYERREFRESH) - { - HandleRefresh(); - } - - #else - ClipBlit(rp, textstartx, - textstarty, - rp, textstartx + dx * fontwidth, - textstarty, - textwidth - dx * fontwidth, - textheight, - 192); - #endif - for (y = 0;y < visibley;y++) - { - DrawTextLine(y, -dx, TRUE); - } - } - } - - } /* if (top != viewstartx ) */ - break; + case GAD_VERTSCROLL: + if (top + visibley > num_lines) + { + top = num_lines - visibley; + } + if (top < 0) top = 0; + + if (top != viewstarty ) + { + dy = top - viewstarty; + viewstarty = top; + + if (refreshprop) + { + SetGadgetAttrs(gad[gadid], win, 0, PGA_Top , viewstarty, + TAG_DONE); + } + + if (abs(dy) >= visibley) + { + DrawAllText(); + } else { + if (dy > 0) + { + + #ifdef USE_SIMPLEREFRESH + ScrollRaster(rp, + 0, + fontheight * dy, + textstartx, + textstarty, + textendx, + textendy); + + if (rp->Layer->Flags & LAYERREFRESH) + { + HandleRefresh(); + } + #else + ClipBlit(rp, textstartx, + textstarty + dy * fontheight, + rp, textstartx, + textstarty, + textwidth, + textheight - dy * fontheight, + 192); + #endif + + for (y = visibley - dy;y < visibley;y++) + { + DrawTextLine(y, 0, TRUE); + } + } else { + dy = -dy; + + #ifdef USE_SIMPLEREFRESH + ScrollRaster(rp, + 0, + -fontheight * dy, + textstartx, + textstarty, + textendx, + textendy); + + if (rp->Layer->Flags & LAYERREFRESH) + { + HandleRefresh(); + } + + #else + ClipBlit(rp, textstartx, + textstarty, + rp, textstartx, + textstarty + dy * fontheight, + textwidth, + textheight - dy * fontheight, + 192); + #endif + for (y = 0;y < dy;y++) + { + DrawTextLine(y, 0, TRUE); + } + } + } + + } /* if (top != viewstarty ) */ + break; + + case GAD_HORIZSCROLL: + if (top + visiblex > max_textlen) + { + top = max_textlen - visiblex; + } + if (top < 0) top = 0; + + if (top != viewstartx ) + { + dx = top - viewstartx; + viewstartx = top; + + if (refreshprop) + { + SetGadgetAttrs(gad[gadid], win, 0, PGA_Top , viewstartx, + TAG_DONE); + } + + if (abs(dx) >= visiblex) + { + DrawAllText(); + } else { + if (dx > 0) + { + + #ifdef USE_SIMPLEREFRESH + ScrollRaster(rp, + fontwidth * dx, + 0, + textstartx, + textstarty, + textendx, + textendy); + + if (rp->Layer->Flags & LAYERREFRESH) + { + HandleRefresh(); + } + #else + ClipBlit(rp, textstartx + dx * fontwidth, + textstarty, + rp, textstartx, + textstarty, + textwidth - dx * fontwidth, + textheight, + 192); + #endif + for (y = 0;y < visibley;y++) + { + DrawTextLine(y, dx, TRUE); + } + + } else { + dx = -dx; + + #ifdef USE_SIMPLEREFRESH + ScrollRaster(rp, + -fontwidth * dx, + 0, + textstartx, + textstarty, + textendx, + textendy); + + if (rp->Layer->Flags & LAYERREFRESH) + { + HandleRefresh(); + } + + #else + ClipBlit(rp, textstartx, + textstarty, + rp, textstartx + dx * fontwidth, + textstarty, + textwidth - dx * fontwidth, + textheight, + 192); + #endif + for (y = 0;y < visibley;y++) + { + DrawTextLine(y, -dx, TRUE); + } + } + } + + } /* if (top != viewstartx ) */ + break; } /* switch(gadid) */ - + } /****************************************************************************************/ @@ -1155,30 +1153,30 @@ static void HandleScrollGadget(WORD gadid) while (!ok) { - WaitPort(win->UserPort); - while ((msg = (struct IntuiMessage *)GetMsg(win->UserPort))) - { - switch (msg->Class) - { - case IDCMP_GADGETUP: - ok=TRUE; - /* fall through */ - - case IDCMP_MOUSEMOVE: - GetAttr(PGA_Top, (Object *)gad[gadid], &top); - ScrollTo(gadid, top, FALSE); - break; + WaitPort(win->UserPort); + while ((msg = (struct IntuiMessage *)GetMsg(win->UserPort))) + { + switch (msg->Class) + { + case IDCMP_GADGETUP: + ok=TRUE; + /* fall through */ + + case IDCMP_MOUSEMOVE: + GetAttr(PGA_Top, (Object *)gad[gadid], &top); + ScrollTo(gadid, top, FALSE); + break; #ifdef USE_SIMPLEREFRESH - case IDCMP_REFRESHWINDOW: - HandleRefresh(); - break; + case IDCMP_REFRESHWINDOW: + HandleRefresh(); + break; #endif - } /* switch (msg->Class) */ - ReplyMsg((struct Message *)msg); + } /* switch (msg->Class) */ + ReplyMsg((struct Message *)msg); - } /* while ((msg = (struct IntuiMessage *)GetMsg(win->UserPort))) */ + } /* while ((msg = (struct IntuiMessage *)GetMsg(win->UserPort))) */ } /* while (!ok) */ } @@ -1196,17 +1194,17 @@ static BOOL FindString(struct LineNode *ln, char *search, LONG searchlen) while(textlen >= 0) { - for(i = 0;i < searchlen;i++) - { - if (ToUpper(text[i]) != ToUpper(search[i])) break; - } - - if (i == searchlen) - { - rc = TRUE; - break; - } - text++;textlen--; + for(i = 0;i < searchlen;i++) + { + if (ToUpper(text[i]) != ToUpper(search[i])) break; + } + + if (i == searchlen) + { + rc = TRUE; + break; + } + text++;textlen--; } return rc; @@ -1227,51 +1225,51 @@ static void DoSearch(WORD kind) line = search_startline; if (kind == SEARCH_NEXT && line < num_lines - 1) - line++; + line++; else if (kind == SEARCH_PREV && line > 0) - line--; + line--; if (kind == SEARCH_NEW) { - line = 0; - kind = SEARCH_NEXT; + line = 0; + kind = SEARCH_NEXT; } while(!done) { - if (FindString(&linearray[line], searchtext, searchlen)) - { - done = TRUE; - if (found_line >= 0) - { - linearray[found_line].invert = FALSE; - DrawTextLine(found_line - viewstarty, 0, TRUE); - } - - ScrollTo(GAD_VERTSCROLL, line - visibley / 2, TRUE); - - found_line = line; - search_startline = line; - linearray[found_line].invert = TRUE; - DrawTextLine(found_line - viewstarty, 0, TRUE); - } - - if (kind == SEARCH_NEXT) - { - line++; - if (line >= num_lines) - { - done = TRUE; - DisplayBeep(NULL); - } - } else { - line--; - if (line < 0) - { - done = TRUE; - DisplayBeep(NULL); - } - } + if (FindString(&linearray[line], searchtext, searchlen)) + { + done = TRUE; + if (found_line >= 0) + { + linearray[found_line].invert = FALSE; + DrawTextLine(found_line - viewstarty, 0, TRUE); + } + + ScrollTo(GAD_VERTSCROLL, line - visibley / 2, TRUE); + + found_line = line; + search_startline = line; + linearray[found_line].invert = TRUE; + DrawTextLine(found_line - viewstarty, 0, TRUE); + } + + if (kind == SEARCH_NEXT) + { + line++; + if (line >= num_lines) + { + done = TRUE; + DisplayBeep(NULL); + } + } else { + line--; + if (line < 0) + { + done = TRUE; + DisplayBeep(NULL); + } + } } /* while(!done) */ @@ -1282,11 +1280,11 @@ static void DoSearch(WORD kind) static BOOL HandleWin(void) { struct IntuiMessage *msg; - struct MenuItem *item; - WORD gadid, delta; - UWORD men, code; - UBYTE key; - BOOL pagescroll, maxscroll, quitme = FALSE; + struct MenuItem *item; + WORD gadid, delta; + UWORD men, code; + UBYTE key; + BOOL pagescroll, maxscroll, quitme = FALSE; TEXT editorvarbuffer[300]; struct AppMessage *appmsg; //struct WBArg *argptr; @@ -1314,285 +1312,285 @@ static BOOL HandleWin(void) while ((msg = (struct IntuiMessage *)GetMsg(win->UserPort))) { - switch(msg->Class) - { - case IDCMP_CLOSEWINDOW: - quitme = TRUE; - break; + switch(msg->Class) + { + case IDCMP_CLOSEWINDOW: + quitme = TRUE; + break; - case IDCMP_NEWSIZE: - NewWinSize(); - break; + case IDCMP_NEWSIZE: + NewWinSize(); + break; #ifdef USE_SIMPLEREFRESH - case IDCMP_REFRESHWINDOW: - HandleRefresh(); - break; + case IDCMP_REFRESHWINDOW: + HandleRefresh(); + break; #endif - case IDCMP_GADGETDOWN: - gadid = ((struct Gadget *)msg->IAddress)->GadgetID; - arrowticker = 3; - - switch(gadid) - { - case GAD_HORIZSCROLL: - case GAD_VERTSCROLL: - HandleScrollGadget(gadid); - break; - - case GAD_UPARROW: - activearrowgad = (struct Gadget *)msg->IAddress; - ScrollTo(GAD_VERTSCROLL, viewstarty - 1, TRUE); - break; - - case GAD_DOWNARROW: - activearrowgad = (struct Gadget *)msg->IAddress; - ScrollTo(GAD_VERTSCROLL, viewstarty + 1, TRUE); - break; - - case GAD_LEFTARROW: - activearrowgad = (struct Gadget *)msg->IAddress; - ScrollTo(GAD_HORIZSCROLL, viewstartx - 1, TRUE); - break; - - case GAD_RIGHTARROW: - activearrowgad = (struct Gadget *)msg->IAddress; - ScrollTo(GAD_HORIZSCROLL, viewstartx + 1, TRUE); - break; - }; - break; - - case IDCMP_INTUITICKS: - if (activearrowgad) - { - if (arrowticker) - { - arrowticker--; - } - else if (activearrowgad->Flags & GFLG_SELECTED) - { - switch(activearrowgad->GadgetID) - { - case GAD_UPARROW: - ScrollTo(GAD_VERTSCROLL, viewstarty - 1, TRUE); - break; - - case GAD_DOWNARROW: - ScrollTo(GAD_VERTSCROLL, viewstarty + 1, TRUE); - break; - - case GAD_LEFTARROW: - ScrollTo(GAD_HORIZSCROLL, viewstartx - 1, TRUE); - break; - - case GAD_RIGHTARROW: - ScrollTo(GAD_HORIZSCROLL, viewstartx + 1, TRUE); - break; - } - } - } - break; - - case IDCMP_GADGETUP: - activearrowgad = NULL; - break; - - case IDCMP_VANILLAKEY: - key = ToUpper(msg->Code); - if (key == 27) - { - quitme = TRUE; - } - else if (key == 8 || (key == ' ' && (0 != (msg->Qualifier & (IEQUALIFIER_LSHIFT | IEQUALIFIER_RSHIFT))))) - { - ScrollTo(GAD_VERTSCROLL, viewstarty - (visibley - 1), TRUE); - } - else if (key == ' ') - { - ScrollTo(GAD_VERTSCROLL, viewstarty + visibley - 1, TRUE); - } - else if (key == 13) - { - ScrollTo(GAD_VERTSCROLL, viewstarty + 1, TRUE); - } - else if (strchr(MSG(MSG_SHORTCUT_TOP), key)) - { - ScrollTo(GAD_VERTSCROLL, 0, TRUE); - } - else if (strchr(MSG(MSG_SHORTCUT_BOTTOM), key)) - { - ScrollTo(GAD_VERTSCROLL, num_lines, TRUE); - } - else if (strchr(MSG(MSG_SHORTCUT_JUMP), key)) - { - Make_Goto_Requester(); - } - else if (strchr(MSG(MSG_SHORTCUT_FIND), key)) - { - Make_Find_Requester(); - } - else if (strchr(MSG(MSG_SHORTCUT_NEXT), key)) - { - DoSearch(SEARCH_NEXT); - } - else if (strchr(MSG(MSG_SHORTCUT_PREV), key)) - { - DoSearch(SEARCH_PREV); - } - else if (strchr(MSG(MSG_SHORTCUT_EDITOR), key)) - { + case IDCMP_GADGETDOWN: + gadid = ((struct Gadget *)msg->IAddress)->GadgetID; + arrowticker = 3; + + switch(gadid) + { + case GAD_HORIZSCROLL: + case GAD_VERTSCROLL: + HandleScrollGadget(gadid); + break; + + case GAD_UPARROW: + activearrowgad = (struct Gadget *)msg->IAddress; + ScrollTo(GAD_VERTSCROLL, viewstarty - 1, TRUE); + break; + + case GAD_DOWNARROW: + activearrowgad = (struct Gadget *)msg->IAddress; + ScrollTo(GAD_VERTSCROLL, viewstarty + 1, TRUE); + break; + + case GAD_LEFTARROW: + activearrowgad = (struct Gadget *)msg->IAddress; + ScrollTo(GAD_HORIZSCROLL, viewstartx - 1, TRUE); + break; + + case GAD_RIGHTARROW: + activearrowgad = (struct Gadget *)msg->IAddress; + ScrollTo(GAD_HORIZSCROLL, viewstartx + 1, TRUE); + break; + }; + break; + + case IDCMP_INTUITICKS: + if (activearrowgad) + { + if (arrowticker) + { + arrowticker--; + } + else if (activearrowgad->Flags & GFLG_SELECTED) + { + switch(activearrowgad->GadgetID) + { + case GAD_UPARROW: + ScrollTo(GAD_VERTSCROLL, viewstarty - 1, TRUE); + break; + + case GAD_DOWNARROW: + ScrollTo(GAD_VERTSCROLL, viewstarty + 1, TRUE); + break; + + case GAD_LEFTARROW: + ScrollTo(GAD_HORIZSCROLL, viewstartx - 1, TRUE); + break; + + case GAD_RIGHTARROW: + ScrollTo(GAD_HORIZSCROLL, viewstartx + 1, TRUE); + break; + } + } + } + break; + + case IDCMP_GADGETUP: + activearrowgad = NULL; + break; + + case IDCMP_VANILLAKEY: + key = ToUpper(msg->Code); + if (key == 27) + { + quitme = TRUE; + } + else if (key == 8 || (key == ' ' && (0 != (msg->Qualifier & (IEQUALIFIER_LSHIFT | IEQUALIFIER_RSHIFT))))) + { + ScrollTo(GAD_VERTSCROLL, viewstarty - (visibley - 1), TRUE); + } + else if (key == ' ') + { + ScrollTo(GAD_VERTSCROLL, viewstarty + visibley - 1, TRUE); + } + else if (key == 13) + { + ScrollTo(GAD_VERTSCROLL, viewstarty + 1, TRUE); + } + else if (strchr(MSG(MSG_SHORTCUT_TOP), key)) + { + ScrollTo(GAD_VERTSCROLL, 0, TRUE); + } + else if (strchr(MSG(MSG_SHORTCUT_BOTTOM), key)) + { + ScrollTo(GAD_VERTSCROLL, num_lines, TRUE); + } + else if (strchr(MSG(MSG_SHORTCUT_JUMP), key)) + { + Make_Goto_Requester(); + } + else if (strchr(MSG(MSG_SHORTCUT_FIND), key)) + { + Make_Find_Requester(); + } + else if (strchr(MSG(MSG_SHORTCUT_NEXT), key)) + { + DoSearch(SEARCH_NEXT); + } + else if (strchr(MSG(MSG_SHORTCUT_PREV), key)) + { + DoSearch(SEARCH_PREV); + } + else if (strchr(MSG(MSG_SHORTCUT_EDITOR), key)) + { if ( (GetVar("editor", editorvarbuffer, 299, GVF_GLOBAL_ONLY)) != -1L ) { __sprintf(s, "Run QUIET \"%s\" \"%s\"", editorvarbuffer, filenamebuffer ); - if (SystemTags(s, TAG_END)) - DisplayBeep(NULL); + if (SystemTags(s, TAG_END)) + DisplayBeep(NULL); } } - break; - - case IDCMP_RAWKEY: - pagescroll = (0 != (msg->Qualifier & (IEQUALIFIER_LSHIFT | IEQUALIFIER_RSHIFT))); - maxscroll = (0 != (msg->Qualifier & (IEQUALIFIER_LALT | IEQUALIFIER_RALT | IEQUALIFIER_CONTROL))); - - code = msg->Code; delta = 1; - - switch(code) - { - case RAWKEY_NM_WHEEL_UP: - code = CURSORUP; - delta = 3; - break; - - case RAWKEY_NM_WHEEL_DOWN: - code = CURSORDOWN; - delta = 3; - break; - - case RAWKEY_NM_WHEEL_LEFT: - code = CURSORLEFT; - delta = 3; - break; - - case RAWKEY_NM_WHEEL_RIGHT: - code = CURSORRIGHT; - delta = 3; - break; - } - - switch(code) - { - case CURSORUP: - ScrollTo(GAD_VERTSCROLL, - maxscroll ? 0 : viewstarty - (pagescroll ? visibley - 1 : delta), - TRUE); - break; - - case CURSORDOWN: - ScrollTo(GAD_VERTSCROLL, - maxscroll ? num_lines : viewstarty + (pagescroll ? visibley - 1 : delta), - TRUE); - break; - - case CURSORLEFT: - ScrollTo(GAD_HORIZSCROLL, - maxscroll ? 0 : viewstartx - (pagescroll ? visiblex - 1 : delta), - TRUE); - break; - - case CURSORRIGHT: - ScrollTo(GAD_HORIZSCROLL, - maxscroll ? max_textlen : viewstartx + (pagescroll ? visiblex - 1 : delta), - TRUE); - break; - - case RAWKEY_HOME: - ScrollTo(GAD_VERTSCROLL, 0, TRUE); - break; - - case RAWKEY_END: - ScrollTo(GAD_VERTSCROLL, num_lines, TRUE); - break; - - case RAWKEY_PAGEUP: - ScrollTo(GAD_VERTSCROLL, viewstarty - (visibley - 1), TRUE); - break; - - case RAWKEY_PAGEDOWN: - ScrollTo(GAD_VERTSCROLL, viewstarty + (visibley - 1), TRUE); - break; - - } /* switch(msg->Code) */ - break; - - case IDCMP_MENUPICK: - men = msg->Code; - while(men != MENUNULL) - { - if ((item = ItemAddress(menus, men))) - { - switch((IPTR)GTMENUITEM_USERDATA(item)) - { - case MSG_MEN_PROJECT_SAVEAS: - fillename_dest = GetFile(FALSE); - if (!fillename_dest) - break; - - case MSG_MEN_PROJECT_PRINT: - __sprintf(s, "Run >NIL: Type \"%s\" TO \"%s\"", filenamebuffer, fillename_dest ? fillename_dest : "PRT:"); - if (System(s, TAG_END)) - DisplayBeep(NULL); - fillename_dest = NULL; - break; - - case MSG_MEN_PROJECT_ABOUT: - About(); - break; - - case MSG_MEN_PROJECT_QUIT: - quitme = TRUE; - break; - - case MSG_MEN_PROJECT_OPEN: - if ((filename = GetFile(TRUE))) - { - if (OpenFile()) - { - HandleFileChange(); - } /* if (OpenFile()) */ - - } /* if ((filename = GetFile())) */ - - break; - - case MSG_MEN_NAVIGATION_FIND: - Make_Find_Requester(); - break; - - case MSG_MEN_NAVIGATION_FIND_NEXT: - DoSearch(SEARCH_NEXT); - break; - - case MSG_MEN_NAVIGATION_FIND_PREV: - DoSearch(SEARCH_PREV); - break; - - case MSG_MEN_NAVIGATION_JUMP: - Make_Goto_Requester(); - break; - - } /* switch(GTMENUITEM_USERDATA(item)) */ - - men = item->NextSelect; - } else { - men = MENUNULL; - } - - } /* while(men != MENUNULL) */ - break; - - } /* switch(msg->Class) */ - - ReplyMsg((struct Message *)msg); + break; + + case IDCMP_RAWKEY: + pagescroll = (0 != (msg->Qualifier & (IEQUALIFIER_LSHIFT | IEQUALIFIER_RSHIFT))); + maxscroll = (0 != (msg->Qualifier & (IEQUALIFIER_LALT | IEQUALIFIER_RALT | IEQUALIFIER_CONTROL))); + + code = msg->Code; delta = 1; + + switch(code) + { + case RAWKEY_NM_WHEEL_UP: + code = CURSORUP; + delta = 3; + break; + + case RAWKEY_NM_WHEEL_DOWN: + code = CURSORDOWN; + delta = 3; + break; + + case RAWKEY_NM_WHEEL_LEFT: + code = CURSORLEFT; + delta = 3; + break; + + case RAWKEY_NM_WHEEL_RIGHT: + code = CURSORRIGHT; + delta = 3; + break; + } + + switch(code) + { + case CURSORUP: + ScrollTo(GAD_VERTSCROLL, + maxscroll ? 0 : viewstarty - (pagescroll ? visibley - 1 : delta), + TRUE); + break; + + case CURSORDOWN: + ScrollTo(GAD_VERTSCROLL, + maxscroll ? num_lines : viewstarty + (pagescroll ? visibley - 1 : delta), + TRUE); + break; + + case CURSORLEFT: + ScrollTo(GAD_HORIZSCROLL, + maxscroll ? 0 : viewstartx - (pagescroll ? visiblex - 1 : delta), + TRUE); + break; + + case CURSORRIGHT: + ScrollTo(GAD_HORIZSCROLL, + maxscroll ? max_textlen : viewstartx + (pagescroll ? visiblex - 1 : delta), + TRUE); + break; + + case RAWKEY_HOME: + ScrollTo(GAD_VERTSCROLL, 0, TRUE); + break; + + case RAWKEY_END: + ScrollTo(GAD_VERTSCROLL, num_lines, TRUE); + break; + + case RAWKEY_PAGEUP: + ScrollTo(GAD_VERTSCROLL, viewstarty - (visibley - 1), TRUE); + break; + + case RAWKEY_PAGEDOWN: + ScrollTo(GAD_VERTSCROLL, viewstarty + (visibley - 1), TRUE); + break; + + } /* switch(msg->Code) */ + break; + + case IDCMP_MENUPICK: + men = msg->Code; + while(men != MENUNULL) + { + if ((item = ItemAddress(menus, men))) + { + switch((IPTR)GTMENUITEM_USERDATA(item)) + { + case MSG_MEN_PROJECT_SAVEAS: + fillename_dest = GetFile(FALSE); + if (!fillename_dest) + break; + + case MSG_MEN_PROJECT_PRINT: + __sprintf(s, "Run >NIL: Type \"%s\" TO \"%s\"", filenamebuffer, fillename_dest ? fillename_dest : "PRT:"); + if (System(s, TAG_END)) + DisplayBeep(NULL); + fillename_dest = NULL; + break; + + case MSG_MEN_PROJECT_ABOUT: + About(); + break; + + case MSG_MEN_PROJECT_QUIT: + quitme = TRUE; + break; + + case MSG_MEN_PROJECT_OPEN: + if ((filename = GetFile(TRUE))) + { + if (OpenFile()) + { + HandleFileChange(); + } /* if (OpenFile()) */ + + } /* if ((filename = GetFile())) */ + + break; + + case MSG_MEN_NAVIGATION_FIND: + Make_Find_Requester(); + break; + + case MSG_MEN_NAVIGATION_FIND_NEXT: + DoSearch(SEARCH_NEXT); + break; + + case MSG_MEN_NAVIGATION_FIND_PREV: + DoSearch(SEARCH_PREV); + break; + + case MSG_MEN_NAVIGATION_JUMP: + Make_Goto_Requester(); + break; + + } /* switch(GTMENUITEM_USERDATA(item)) */ + + men = item->NextSelect; + } else { + men = MENUNULL; + } + + } /* while(men != MENUNULL) */ + break; + + } /* switch(msg->Class) */ + + ReplyMsg((struct Message *)msg); } /* while ((msg = (struct IntuiMessage *)GetMsg(win->UserPort))) */ @@ -1614,26 +1612,26 @@ static void HandleAll(void) while(!quitme) { - sigs = Wait(msgmask | winmask | gotomask | findmask); - - if ( (sigs & winmask) || (sigs & msgmask) ) - quitme = HandleWin(); - - if (sigs & gotomask) - { - if (Handle_Goto_Requester(&line)) - { - ScrollTo(GAD_VERTSCROLL, line - 1, TRUE); - } - } - - if (sigs & findmask) - { - if ((search_kind = Handle_Find_Requester(&searchtext))) - { - DoSearch(search_kind); - } - } + sigs = Wait(msgmask | winmask | gotomask | findmask); + + if ( (sigs & winmask) || (sigs & msgmask) ) + quitme = HandleWin(); + + if (sigs & gotomask) + { + if (Handle_Goto_Requester(&line)) + { + ScrollTo(GAD_VERTSCROLL, line - 1, TRUE); + } + } + + if (sigs & findmask) + { + if ((search_kind = Handle_Find_Requester(&searchtext))) + { + DoSearch(search_kind); + } + } } /* while(!quitme) */ } diff --git a/workbench/utilities/More/req.c b/workbench/utilities/More/req.c index 2099356579..7b9424fc20 100644 --- a/workbench/utilities/More/req.c +++ b/workbench/utilities/More/req.c @@ -52,13 +52,13 @@ enum {GAD_GOTO_STRING = 1, /****************************************************************************************/ -static struct RastPort temprp; -static struct Window *gotowin, *findwin; -static struct Gadget *gotogad, *findgad, *gad, *gotogadlist, *findgadlist; +static struct RastPort temprp; +static struct Window *gotowin, *findwin; +static struct Gadget *gotogad, *findgad, *gad, *gotogadlist, *findgadlist; static struct NewGadget ng; -static WORD fontwidth, fontheight; +static WORD fontwidth, fontheight; -static char searchtext[256]; +static char searchtext[256]; /****************************************************************************************/ @@ -100,10 +100,10 @@ void Make_Goto_Requester(void) gadheight = fontheight + GAD_EXTRA_HEIGHT; winheight = scr->WBorTop + fontheight + 1 + - scr->WBorBottom + - BORDER_SPACING_Y * 2 + - gadheight * 2 + - GAD_SPACING_Y; + scr->WBorBottom + + BORDER_SPACING_Y * 2 + + gadheight * 2 + + GAD_SPACING_Y; gadwidth = TextLength(&temprp, MSG(MSG_OK), strlen(MSG(MSG_OK))); w = TextLength(&temprp, MSG(MSG_CANCEL), strlen(MSG(MSG_CANCEL))); @@ -114,9 +114,9 @@ void Make_Goto_Requester(void) strwidth = gadwidth * 2 + GAD_SPACING_X; winwidth = scr->WBorLeft + - scr->WBorRight + - BORDER_SPACING_X * 2 + - strwidth; + scr->WBorRight + + BORDER_SPACING_X * 2 + + strwidth; ng.ng_LeftEdge = scr->WBorLeft + BORDER_SPACING_X; ng.ng_TopEdge = scr->WBorTop + fontheight + 1 + BORDER_SPACING_Y; @@ -126,8 +126,8 @@ void Make_Goto_Requester(void) ng.ng_Flags = PLACETEXT_IN; gotogad = CreateGadget(INTEGER_KIND, gad, &ng, GTIN_MaxChars, 8, - STRINGA_Justification, GACT_STRINGCENTER, - TAG_DONE); + STRINGA_Justification, GACT_STRINGCENTER, + TAG_DONE); ng.ng_TopEdge += gadheight + GAD_SPACING_Y; ng.ng_Width = gadwidth; @@ -144,37 +144,37 @@ void Make_Goto_Requester(void) if (!gad) { - FreeGadgets(gotogadlist); - gotogadlist = 0; + FreeGadgets(gotogadlist); + gotogadlist = 0; } else { - gotowin = OpenWindowTags(0, WA_CustomScreen, (IPTR)scr, - WA_Left, scr->MouseX - (winwidth / 2), - WA_Top, scr->MouseY - (winheight / 2), - WA_Width, winwidth, - WA_Height, winheight, - WA_AutoAdjust, TRUE, - WA_Title, (IPTR)MSG(MSG_JUMP_TITLE), - WA_CloseGadget, TRUE, - WA_DepthGadget, TRUE, - WA_DragBar, TRUE, - WA_Activate, TRUE, - WA_SimpleRefresh, TRUE, - WA_IDCMP, IDCMP_CLOSEWINDOW | - IDCMP_REFRESHWINDOW | - IDCMP_VANILLAKEY | - BUTTONIDCMP | - INTEGERIDCMP, - WA_Gadgets, (IPTR)gotogadlist, - TAG_DONE); - - if (!gotowin) - { - FreeGadgets(gotogadlist);gotogadlist = 0; - } else { - gotomask = 1L << gotowin->UserPort->mp_SigBit; - GT_RefreshWindow(gotowin, 0); - ActivateGadget(gotogad, gotowin, 0); - } + gotowin = OpenWindowTags(0, WA_CustomScreen, (IPTR)scr, + WA_Left, scr->MouseX - (winwidth / 2), + WA_Top, scr->MouseY - (winheight / 2), + WA_Width, winwidth, + WA_Height, winheight, + WA_AutoAdjust, TRUE, + WA_Title, (IPTR)MSG(MSG_JUMP_TITLE), + WA_CloseGadget, TRUE, + WA_DepthGadget, TRUE, + WA_DragBar, TRUE, + WA_Activate, TRUE, + WA_SimpleRefresh, TRUE, + WA_IDCMP, IDCMP_CLOSEWINDOW | + IDCMP_REFRESHWINDOW | + IDCMP_VANILLAKEY | + BUTTONIDCMP | + INTEGERIDCMP, + WA_Gadgets, (IPTR)gotogadlist, + TAG_DONE); + + if (!gotowin) + { + FreeGadgets(gotogadlist);gotogadlist = 0; + } else { + gotomask = 1L << gotowin->UserPort->mp_SigBit; + GT_RefreshWindow(gotowin, 0); + ActivateGadget(gotogad, gotowin, 0); + } } } @@ -188,51 +188,51 @@ BOOL Handle_Goto_Requester(LONG *line) while ((msg = GT_GetIMsg(gotowin->UserPort))) { - switch (msg->Class) - { - case IDCMP_REFRESHWINDOW: - GT_BeginRefresh(gotowin); - GT_EndRefresh(gotowin, TRUE); - break; - - case IDCMP_CLOSEWINDOW: - killreq = TRUE; - break; - - case IDCMP_GADGETUP: - switch (((struct Gadget *)msg->IAddress)->GadgetID) - { - case GAD_GOTO_CANCEL: - killreq = TRUE; - break; - - case GAD_GOTO_STRING: - case GAD_GOTO_OK: - GT_GetGadgetAttrs(gotogad, gotowin, 0, GTIN_Number, (IPTR)&l, - TAG_DONE); - rc = TRUE; - break; - - } /* switch (((struct Gadget *)msg->IAddress)->GadgetID) */ - break; - - case IDCMP_VANILLAKEY: - switch(ToUpper(msg->Code)) - { - case 27: - killreq = TRUE; - break; - - case 9: - case 'G': - ActivateGadget(gotogad, gotowin, 0); - break; - - } /* switch(msg->Code) */ - break; - - } /* switch (msg->Class) */ - GT_ReplyIMsg(msg); + switch (msg->Class) + { + case IDCMP_REFRESHWINDOW: + GT_BeginRefresh(gotowin); + GT_EndRefresh(gotowin, TRUE); + break; + + case IDCMP_CLOSEWINDOW: + killreq = TRUE; + break; + + case IDCMP_GADGETUP: + switch (((struct Gadget *)msg->IAddress)->GadgetID) + { + case GAD_GOTO_CANCEL: + killreq = TRUE; + break; + + case GAD_GOTO_STRING: + case GAD_GOTO_OK: + GT_GetGadgetAttrs(gotogad, gotowin, 0, GTIN_Number, (IPTR)&l, + TAG_DONE); + rc = TRUE; + break; + + } /* switch (((struct Gadget *)msg->IAddress)->GadgetID) */ + break; + + case IDCMP_VANILLAKEY: + switch(ToUpper(msg->Code)) + { + case 27: + killreq = TRUE; + break; + + case 9: + case 'G': + ActivateGadget(gotogad, gotowin, 0); + break; + + } /* switch(msg->Code) */ + break; + + } /* switch (msg->Class) */ + GT_ReplyIMsg(msg); } /* while ((msg = GT_GetIMsg(gotowin))) */ @@ -249,12 +249,12 @@ void Kill_Goto_Requester(void) { if (gotowin) { - CloseWindow(gotowin);gotowin = 0;gotomask = 0; + CloseWindow(gotowin);gotowin = 0;gotomask = 0; } if (gotogadlist) { - FreeGadgets(gotogadlist);gotogadlist = 0; + FreeGadgets(gotogadlist);gotogadlist = 0; } } @@ -272,10 +272,10 @@ void Make_Find_Requester(void) gadheight = fontheight + GAD_EXTRA_HEIGHT; winheight = scr->WBorTop + fontheight + 1 + - scr->WBorBottom + - BORDER_SPACING_Y * 2 + - gadheight * 2 + - GAD_SPACING_Y; + scr->WBorBottom + + BORDER_SPACING_Y * 2 + + gadheight * 2 + + GAD_SPACING_Y; gadwidth = TextLength(&temprp, MSG(MSG_OK), strlen(MSG(MSG_OK))); w = TextLength(&temprp, MSG(MSG_CANCEL), strlen(MSG(MSG_CANCEL))); @@ -288,9 +288,9 @@ void Make_Find_Requester(void) if (strwidth < 250) strwidth = 250; winwidth = scr->WBorLeft + - scr->WBorRight + - BORDER_SPACING_X * 2 + - strwidth; + scr->WBorRight + + BORDER_SPACING_X * 2 + + strwidth; ng.ng_LeftEdge = scr->WBorLeft + BORDER_SPACING_X; ng.ng_TopEdge = scr->WBorTop + fontheight + 1 + BORDER_SPACING_Y; @@ -300,7 +300,7 @@ void Make_Find_Requester(void) ng.ng_Flags = PLACETEXT_IN; findgad = CreateGadget(STRING_KIND, gad, &ng, GTST_MaxChars, 256, - TAG_DONE); + TAG_DONE); ng.ng_TopEdge += gadheight + GAD_SPACING_Y; ng.ng_Width = gadwidth; @@ -317,37 +317,37 @@ void Make_Find_Requester(void) if (!gad) { - FreeGadgets(findgadlist); - findgadlist = 0; + FreeGadgets(findgadlist); + findgadlist = 0; } else { - findwin = OpenWindowTags(0, WA_CustomScreen, (IPTR)scr, - WA_Left, scr->MouseX - (winwidth / 2), - WA_Top, scr->MouseY - (winheight / 2), - WA_Width, winwidth, - WA_Height, winheight, - WA_AutoAdjust, TRUE, - WA_Title, (IPTR)MSG(MSG_FIND_TITLE), - WA_CloseGadget, TRUE, - WA_DepthGadget, TRUE, - WA_DragBar, TRUE, - WA_Activate, TRUE, - WA_SimpleRefresh, TRUE, - WA_IDCMP, IDCMP_CLOSEWINDOW | - IDCMP_REFRESHWINDOW | - IDCMP_VANILLAKEY | - BUTTONIDCMP | - INTEGERIDCMP, - WA_Gadgets, (IPTR)findgadlist, - TAG_DONE); - - if (!findwin) - { - FreeGadgets(findgadlist);findgadlist = 0; - } else { - findmask = 1L << findwin->UserPort->mp_SigBit; - GT_RefreshWindow(findwin, 0); - ActivateGadget(findgad, findwin, 0); - } + findwin = OpenWindowTags(0, WA_CustomScreen, (IPTR)scr, + WA_Left, scr->MouseX - (winwidth / 2), + WA_Top, scr->MouseY - (winheight / 2), + WA_Width, winwidth, + WA_Height, winheight, + WA_AutoAdjust, TRUE, + WA_Title, (IPTR)MSG(MSG_FIND_TITLE), + WA_CloseGadget, TRUE, + WA_DepthGadget, TRUE, + WA_DragBar, TRUE, + WA_Activate, TRUE, + WA_SimpleRefresh, TRUE, + WA_IDCMP, IDCMP_CLOSEWINDOW | + IDCMP_REFRESHWINDOW | + IDCMP_VANILLAKEY | + BUTTONIDCMP | + INTEGERIDCMP, + WA_Gadgets, (IPTR)findgadlist, + TAG_DONE); + + if (!findwin) + { + FreeGadgets(findgadlist);findgadlist = 0; + } else { + findmask = 1L << findwin->UserPort->mp_SigBit; + GT_RefreshWindow(findwin, 0); + ActivateGadget(findgad, findwin, 0); + } } } @@ -361,63 +361,63 @@ WORD Handle_Find_Requester(char **text) while ((msg = GT_GetIMsg(findwin->UserPort))) { - switch (msg->Class) - { - case IDCMP_REFRESHWINDOW: - GT_BeginRefresh(findwin); - GT_EndRefresh(findwin, TRUE); - break; - - case IDCMP_CLOSEWINDOW: - killreq = TRUE; - break; - - case IDCMP_GADGETUP: - switch (((struct Gadget *)msg->IAddress)->GadgetID) - { - case GAD_FIND_CANCEL: - killreq = TRUE; - break; - - case GAD_FIND_TEXT: - case GAD_FIND_OK: - GT_GetGadgetAttrs(findgad, findwin, 0, GTST_String, (IPTR)&sp, - TAG_DONE); - strcpy(searchtext, sp); - - rc = TRUE; - break; - - } /* switch (((struct Gadget *)msg->IAddress)->GadgetID) */ - break; - - case IDCMP_VANILLAKEY: - switch(ToUpper(msg->Code)) - { - case 27: - killreq = TRUE; - break; - - case 9: - case 'S': - case 'F': - ActivateGadget(findgad, findwin, 0); - break; - - case 13: - case 'N': - rc = SEARCH_NEXT; - break; - - case 'P': - rc = SEARCH_PREV; - break; - - } /* switch(msg->Code) */ - break; - - } /* switch (msg->Class) */ - GT_ReplyIMsg(msg); + switch (msg->Class) + { + case IDCMP_REFRESHWINDOW: + GT_BeginRefresh(findwin); + GT_EndRefresh(findwin, TRUE); + break; + + case IDCMP_CLOSEWINDOW: + killreq = TRUE; + break; + + case IDCMP_GADGETUP: + switch (((struct Gadget *)msg->IAddress)->GadgetID) + { + case GAD_FIND_CANCEL: + killreq = TRUE; + break; + + case GAD_FIND_TEXT: + case GAD_FIND_OK: + GT_GetGadgetAttrs(findgad, findwin, 0, GTST_String, (IPTR)&sp, + TAG_DONE); + strcpy(searchtext, sp); + + rc = TRUE; + break; + + } /* switch (((struct Gadget *)msg->IAddress)->GadgetID) */ + break; + + case IDCMP_VANILLAKEY: + switch(ToUpper(msg->Code)) + { + case 27: + killreq = TRUE; + break; + + case 9: + case 'S': + case 'F': + ActivateGadget(findgad, findwin, 0); + break; + + case 13: + case 'N': + rc = SEARCH_NEXT; + break; + + case 'P': + rc = SEARCH_PREV; + break; + + } /* switch(msg->Code) */ + break; + + } /* switch (msg->Class) */ + GT_ReplyIMsg(msg); } /* while ((msg = GT_GetIMsg(findwin))) */ @@ -434,12 +434,12 @@ void Kill_Find_Requester(void) { if (findwin) { - CloseWindow(findwin);findwin = 0;findmask = 0; + CloseWindow(findwin);findwin = 0;findmask = 0; } if (findgadlist) { - FreeGadgets(findgadlist);findgadlist = 0; + FreeGadgets(findgadlist);findgadlist = 0; } } diff --git a/workbench/utilities/More/version.h b/workbench/utilities/More/version.h index 17eff2d80b..852fa603a6 100644 --- a/workbench/utilities/More/version.h +++ b/workbench/utilities/More/version.h @@ -7,7 +7,7 @@ */ -#define VERSION 1 -#define REVISION 4 -#define DATESTR "20.10.2009" -#define VERSIONSTR "$VER: More 1.4 (" DATESTR ")" +#define VERSION 1 +#define REVISION 4 +#define DATESTR "20.10.2009" +#define VERSIONSTR "$VER: More 1.4 (" DATESTR ")" -- 2.11.4.GIT