Skip to content

GitLab

Commit b2b2b038 authored by Rob Lougher's avatar Rob Lougher
Browse files

Fixed a couple of data aborts, made all gadgets not quit if tasks are still... 

Fixed a couple of data aborts, made all gadgets not quit if tasks are still using them and freed all memory when they do quit.
parent a4e3ae7c
Hide whitespace changes
Inline Side-by-side
Showing with 176 additions and 117 deletions
c/MemMan
View file @ b2b2b038
......@@ -36,7 +36,7 @@
#include "MemCheck:MemCheck.h"
#endif
#define HNDL_GRW_BY 4
#define HNDL_GRW_BY 1000
#define INITIAL_SIZE 4096
#define BLOCK_GAP 512
#define SHRINK_GAP BLOCK_GAP + BLOCK_GAP / 2
......@@ -306,7 +306,7 @@ _kernel_oserror *shrink_block(Handle *handle, int pos, int size)
area_end -= diff;
handle->free = BLOCK_GAP;
update_handles(handle, diff);
update_handles(handle, -diff);
/* Attempt to shrink the area */
......@@ -331,22 +331,22 @@ _kernel_oserror *shrink_block(Handle *handle, int pos, int size)
}
#endif
#if 0
void print_info(void)
void print_info(FILE *out)
{
int i;
printf("HEAP INFORMATION\n----------------\n\n");
printf("Area no: %d\nArea free: %d\n\n", area_no, area_free);
fprintf(out, "\nHEAP INFORMATION\n----------------\n\n");
fprintf(out, "Area no: %d\nArea free: %d\n\n", area_no, area_free);
for(i = 0; i < hndl_list_sze; i++)
if(handle_list[i].base != NULL)
{
printf("Handle no: %d\n", i);
printf("\tbase address: %d\n", (int) handle_list[i].base);
printf("\tsize : %d\n", handle_list[i].size);
printf("\tfree : %d\n", handle_list[i].free);
fprintf(out, "Handle no: %d\n", i);
fprintf(out, "\tbase address: %d\n", (int) handle_list[i].base);
fprintf(out, "\tsize : %d\n", handle_list[i].size);
fprintf(out, "\tfree : %d\n", handle_list[i].free);
}
}
#endif
c/ScrollList
View file @ b2b2b038
......@@ -403,6 +403,16 @@ static void _redraw(PrivateScrollList *sdata,
return;
}
int scrolllist_active(void)
{
return scrolllist_list != NULL;
}
_kernel_oserror *scrolllist_die(void)
{
return NULL;
}
/* scrolllist_add ---------------------------------------------------------
*/
_kernel_oserror *
......
c/Scrollbar
View file @ b2b2b038
......@@ -209,6 +209,11 @@ static _kernel_oserror *scrollbar_show(PrivateScrollbar *sdata)
return NULL;
}
int scrollbar_active(void)
{
return scrollbar_list != NULL;
}
/* scrollbar_die -----------------------------------------------------------
* Need to remove all scrollbar windows
*/
......
c/TextArea
View file @ b2b2b038
......@@ -59,6 +59,8 @@
#include "myswis.h"
#include "utils.h"
extern void print_info(FILE *);
#ifdef MemCheck_MEMCHECK
#include "MemCheck:MemCheck.h"
#endif
......@@ -158,8 +160,14 @@ _kernel_oserror *textarea_init(void)
return NULL;
}
int textarea_active(void)
{
return text_area_list != NULL;
}
_kernel_oserror *textarea_die(void)
{
release_memory();
return NULL;
......@@ -300,6 +308,7 @@ static _kernel_oserror *handle_drag(void)
xcoord = block.x - state.visible_area.xmin + state.xscroll;
ycoord = state.visible_area.ymax - state.yscroll - block.y;
char_block(dragging->text, xcoord, ycoord, &new_line, &index, &xpos, &ypos);
if(((old_line = dragging->text->sel_stop_line) == new_line) &&
......@@ -332,6 +341,14 @@ static _kernel_oserror *_show(PrivateTextArea *tdata)
BBox new;
int text_xmax, text_ymax, xextent, yextent, new_y, new_x;
#ifndef DAYTONA_BUILD
if(tdata->state & TextArea_Scrollbar_Horizontal)
tdata->box.ymin += SCROLLBAR_SIZE;
if(tdata->state & TextArea_Scrollbar_Vertical)
tdata->box.xmax -= SCROLLBAR_SIZE;
#endif
work_to_screen_handle(&show_block.visible_area, &tdata->box,
tdata->wimpw);
......@@ -803,6 +820,9 @@ static void _redraw(WimpRedrawWindowRequestEvent *event, PrivateTextArea *tdata)
return;
}
FILE *debug = NULL;
/* textarea_add -----------------------------------------------------------
*/
_kernel_oserror *
......@@ -811,7 +831,6 @@ textarea_add(TextArea *tdata, int wimpw, ObjectId parent_id,
{
PrivateTextArea *tb;
_kernel_oserror *e;
Scrollbar sdata;
tb = (PrivateTextArea *) mem_allocate(sizeof(PrivateTextArea));
if (!tb)
......@@ -825,18 +844,12 @@ textarea_add(TextArea *tdata, int wimpw, ObjectId parent_id,
#ifndef DAYTONA_BUILD
if(tdata->hdr.flags & TextArea_Scrollbar_Horizontal)
{
tb->box.ymin += SCROLLBAR_SIZE;
((WindowTemplate *)text_area_window.body)->window.flags |= WimpWindow_HScroll;
}
else
((WindowTemplate *)text_area_window.body)->window.flags &= ~WimpWindow_HScroll;
if(tdata->hdr.flags & TextArea_Scrollbar_Vertical)
{
tb->box.xmax -= SCROLLBAR_SIZE;
((WindowTemplate *)text_area_window.body)->window.flags |= WimpWindow_VScroll;
}
else
((WindowTemplate *)text_area_window.body)->window.flags &= ~WimpWindow_VScroll;
#endif
......@@ -853,7 +866,6 @@ textarea_add(TextArea *tdata, int wimpw, ObjectId parent_id,
*data = (int *) tb;
// tb->event = tdata->event ? tdata->event : TextArea_StateChanged;
tb->state = tdata->hdr.flags;
tb->parent_id = parent_id;
tb->component_id = tdata->hdr.component_id;
......@@ -873,6 +885,8 @@ textarea_add(TextArea *tdata, int wimpw, ObjectId parent_id,
if(tb->state & TextArea_WordWrap)
{
int width = tb->box.xmax - tb->box.xmin - 10;
if(tb->state & TextArea_Scrollbar_Vertical)
width -= SCROLLBAR_SIZE;
_swix(Font_Converttopoints,_IN(1)|_IN(2)|_OUT(1), width > 0 ? width : 0, 0,
&tb->text->margin);
......@@ -883,24 +897,17 @@ textarea_add(TextArea *tdata, int wimpw, ObjectId parent_id,
if(tdata->text)
{
int f, l, d;
if(!debug) debug = fopen("adfs::rlougher.$.debug5", "w");
insert_text(tb->text, tdata->text, &f, &l, &d);
dump_object(debug, tb->text);
}
*icons = my_icons;
add_redraw_handler(tb);
if (tdata->hdr.flags & TextArea_Scrollbar_Horizontal)
{
if (tdata->hdr.flags & TextArea_Scrollbar_Vertical)
sdata.hdr.box.xmax -= SCROLLBAR_SIZE;
}
if (tdata->hdr.flags & TextArea_Scrollbar_Vertical)
{
if (tdata->hdr.flags & TextArea_Scrollbar_Horizontal)
sdata.hdr.box.ymin += SCROLLBAR_SIZE;
}
add_task_interest(GLib_ToolboxEvents, filter_toolbox_events,
TextGadgets_Filter);
add_task_interest(GLib_WimpEvents, filter_wimp_events,
......@@ -1004,6 +1011,7 @@ static _kernel_oserror *textarea_mclick(PrivateTextArea *tdata,
close_insertion(text);
create_insertion(text, index);
set_caret(win, text, xpos, ypos, 1);
}
return NULL;
......@@ -1421,6 +1429,8 @@ _kernel_oserror *textarea_remove(PrivateTextArea *handle)
#ifdef MemCheck_MEMCHECK
MemCheck_UnRegisterMiscBlock(handle);
#endif
delete_text(handle->text);
mem_free(handle);
return NULL;
......
c/TextGadget
View file @ b2b2b038
......@@ -51,7 +51,6 @@
#endif
#define IGNORE(a) a=a
unsigned int redrawing_window = 0;
int filter_toolbox_events[] =
......@@ -194,10 +193,14 @@ _kernel_oserror *TextGadgets_final(int fatal, int podule, void *pw)
IGNORE(podule);
IGNORE(pw);
if(textarea_active() || scrolllist_active() || scrollbar_active())
return (_kernel_oserror *) " Gadget tasks active";
deregister_gadget_type(0, TextArea_Type, TextGadgets_TextArea);
deregister_gadget_type(0, ScrollList_Type, TextGadgets_ScrollList);
deregister_gadget_type(0, Scrollbar_Type, TextGadgets_Scrollbar);
scrolllist_die();
scrollbar_die();
textarea_die();
......
c/TextMan
View file @ b2b2b038
......@@ -24,6 +24,7 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <assert.h>
#include "kernel.h"
#include "swis.h"
......@@ -60,7 +61,7 @@ _kernel_oserror *create_text(int size, int font_handle, Text **t_pntr)
/* Create the memory block to hold the text data */
if((err = create_block(size, &handle)) != NULL)
if((err = create_block(size + 1, &handle)) != NULL)
return err;
if((text = malloc(sizeof(Text))) == NULL)
......@@ -69,18 +70,20 @@ _kernel_oserror *create_text(int size, int font_handle, Text **t_pntr)
return (_kernel_oserror*)" Out of memory.";
}
text->insert_line = 0;
text->insert_delta = 0;
text->insert_pos = 0;
*(handle->base) = '\0';
text->insert_line = 0;
text->insert_delta = 0;
text->insert_pos = 0;
text->insert_gap_end = 0;
text->no_of_lines = 1;
text->lne_tbl_sze = 0;
text->line_table = NULL;
text->xmax_table = NULL;
text->sel_stop_pos = -1;
text->sel_stop_line = 0;
text->xmax = 0;
text->xmax_line = 0;
text->no_of_lines = 1;
text->lne_tbl_sze = 0;
text->line_table = NULL;
text->xmax_table = NULL;
text->sel_stop_pos = -1;
text->sel_stop_line = 0;
text->xmax = 0;
text->xmax_line = 0;
/* Create the line table for the text */
......@@ -92,15 +95,15 @@ _kernel_oserror *create_text(int size, int font_handle, Text **t_pntr)
}
text->line_table[0] = -1;
text->xmax_table[0] = 0;
text->text_data = handle;
set_font(text, font_handle);
*t_pntr = text;
return NULL;
return set_font(text, font_handle);
}
void set_font(Text *text, int font_handle)
_kernel_oserror *set_font(Text *text, int font_handle)
{
int min, max;
......@@ -114,16 +117,19 @@ void set_font(Text *text, int font_handle)
0xfffffff, 0, &text->space);
if(get_text_size(text) > 0)
compose_text(text);
return compose_text(text);
return NULL;
}
//static void delete_text(Text *text)
//{
// delete_block(text->text_data);
// free(text->line_table);
// free(text);
//}
void delete_text(Text *text)
{
delete_block(text->text_data);
free(text->line_table);
free(text->xmax_table);
free(text);
}
static void update_lines(Text *text)
......@@ -170,6 +176,8 @@ _kernel_oserror *create_insertion(Text *text, int pos)
if((err = extend_block(text->text_data, pos, INSERTION_GAP)) != NULL)
return err;
*(text->text_data->base + pos) = '\0';
text->insert_pos = pos;
text->insert_gap_end = pos + INSERTION_GAP;
text->insert_delta = 0;
......@@ -189,7 +197,6 @@ void close_insertion(Text *text)
update_lines(text);
}
static int line_len(Text *text, int line_no)
{
int xpoints;
......@@ -235,23 +242,28 @@ static int line_len(Text *text, int line_no)
return xpoints;
}
static _kernel_oserror *new_line(Scan *scan, int pos, char *start, char *end)
static _kernel_oserror *new_line(Scan *scan, int pos, char *end, char *start)
{
scan->new_lines[scan->line_no++] = pos;
if(scan->line_no == scan->max_line)
if((scan->new_lines = realloc(scan->new_lines, (scan->max_line +=
((end - start + 1) / 20 + 5)) * sizeof(int))) == NULL)
return (_kernel_oserror *)" Out of memory";
{
int extra = (end - start + 1) / 20 + 5;
if((scan->new_lines = realloc(scan->new_lines,
(scan->max_line += extra) * sizeof(int))) == NULL)
return (_kernel_oserror *)" Out of memory";
}
return NULL;
}
static _kernel_oserror *scan_text(Text *text, char *start_pntr, char *end, char *con, Scan *scan)
{
int tab_stop = text->tab_stop;
char *char_pntr = start_pntr;
int xpoints, xp;
int margin = text->margin;
_kernel_oserror *e;
int tab_stop = text->tab_stop;
char *char_pntr = start_pntr;
int xpoints, xp;
int margin = text->margin;
while(char_pntr <= end)
{
......@@ -268,7 +280,8 @@ static _kernel_oserror *scan_text(Text *text, char *start_pntr, char *end, char
{
if(scan->split_pos != NULL)
{
new_line(scan, scan->split_pos - con - 1, end, char_pntr);
if((e = new_line(scan, scan->split_pos - con - 1, end, char_pntr)) != NULL)
return e;
scan->x_pos -= scan->split_xpoint;
}
......@@ -279,7 +292,9 @@ static _kernel_oserror *scan_text(Text *text, char *start_pntr, char *end, char
margin - scan->x_pos, 0, char_pntr - start_pntr,
&start_pntr, &xp);
new_line(scan, (scan->split_pos = start_pntr) - con - 1, end, char_pntr);
if((e = new_line(scan, (scan->split_pos = start_pntr) - con - 1, end,
char_pntr)) != NULL)
return e;
scan->x_pos = 0;
xpoints -= xp;
}
......@@ -301,7 +316,8 @@ static _kernel_oserror *scan_text(Text *text, char *start_pntr, char *end, char
else
if((old_line_no == scan->line_no) | (scan->split_pos != char_pntr))
{
new_line(scan, char_pntr - con, end, char_pntr);
if((e = new_line(scan, char_pntr - con, end, char_pntr)) != NULL)
return e;
scan->x_pos = 0;
}
......@@ -329,7 +345,8 @@ static _kernel_oserror *scan_text(Text *text, char *start_pntr, char *end, char
{
if(scan->split_pos != NULL)
{
new_line(scan, scan->split_pos - con - 1, end, start_pntr);
if((e = new_line(scan, scan->split_pos - con - 1, end, start_pntr)) != NULL)
return e;
scan->x_pos -= scan->split_xpoint;
}
......@@ -340,7 +357,8 @@ static _kernel_oserror *scan_text(Text *text, char *start_pntr, char *end, char
margin - scan->x_pos, 0, end - start_pntr + 1,
&start_pntr, &xp);
new_line(scan, start_pntr - con - 1, end, start_pntr);
if((e = new_line(scan, start_pntr - con - 1, end, start_pntr)) != NULL)
return e;
scan->x_pos = 0;
xpoints -= xp;
}
......@@ -352,19 +370,18 @@ static _kernel_oserror *scan_text(Text *text, char *start_pntr, char *end, char
return NULL;
}
_kernel_oserror *compose_text(Text *text)
{
_kernel_oserror *err;
char *end, *base = text->text_data->base;
int insert_pos = text->insert_pos;
Scan scan;
int i;
char *end, *base = text->text_data->base;
int insert_pos = text->insert_pos;
Scan scan;
int i;
if(text->insert_gap_end > insert_pos)
close_insertion(text);
end = base + text->text_data->size - 1;
end = base + text->text_data->size - 2;
scan.max_line = (end - base + 1) / 20 + 5;
scan.new_lines = malloc((scan.max_line + 1) * sizeof(int));
......@@ -373,9 +390,10 @@ _kernel_oserror *compose_text(Text *text)
scan.x_pos = 0;
scan.split_pos = NULL;
scan_text(text, base, end, base, &scan);
if((err = scan_text(text, base, end, base, &scan)) != NULL)
return err;
if(*end != '\n')
if((end < base) || (*end != '\n'))
scan.new_lines[scan.line_no++] = end - base;
if(scan.line_no > text->lne_tbl_sze)
......@@ -427,7 +445,7 @@ char *expand_tabs(char *str, int *len)
*len += no_tabs * 3;
pos2 = new_str = malloc(*len + 1);
for(pos = str; *pos2++ = *pos;)
for(pos = str; (*pos2++ = *pos) != NULL;)
if(*pos++ == '\t')
pos2 += 3;
......@@ -448,7 +466,6 @@ _kernel_oserror *replace_text(Text *text, int from, int ex_to, const char *s,
int first_line, last_line, last_line_end, first_line_start;
char *base = text->text_data->base;
int line_delta;
int i;
char *end, *con;
int old_xmax;
int gap_size = text->insert_gap_end - insert_pos;
......@@ -459,6 +476,7 @@ _kernel_oserror *replace_text(Text *text, int from, int ex_to, const char *s,
char *start;
int ld = 0, ln = 0;
int step_back = FALSE;
int i;
if((ex_to == -1) || (to > line_end(text, text->no_of_lines - 1)))
to = line_end(text, text->no_of_lines - 1);
......@@ -529,7 +547,8 @@ _kernel_oserror *replace_text(Text *text, int from, int ex_to, const char *s,
if((first_line <= insert_line) && (last_line >= insert_line))
{
end = base + text->insert_pos - 1;
scan_text(text, start = base + first_line_start, end, base, &scan);
if((err = scan_text(text, start = base + first_line_start, end, base, &scan)) != NULL)
return err;
con = base + gap_size + text->insert_delta;
old_end = end + gap_size;
......@@ -544,7 +563,8 @@ _kernel_oserror *replace_text(Text *text, int from, int ex_to, const char *s,
}
end = line_end(text, last_line) + base + gap_size + delta;
scan_text(text, old_end + 1, end, con, &scan);
if((err = scan_text(text, old_end + 1, end, con, &scan)) != NULL)
return err;
}
else
{
......@@ -560,7 +580,8 @@ _kernel_oserror *replace_text(Text *text, int from, int ex_to, const char *s,
end = base + last_line_end + delta + gap_size;
con = base + gap_size + text->insert_delta;
}
scan_text(text, start, end, con, &scan);
if((err = scan_text(text, start, end, con, &scan)) != NULL)
return err;
}
if((++last_line < text->no_of_lines) && ((*end != '\n') || (start > end)))
{
......@@ -571,7 +592,8 @@ _kernel_oserror *replace_text(Text *text, int from, int ex_to, const char *s,
if(last_line == text->insert_line)
{
end = base + text->insert_pos - 1;
scan_text(text, old_end + 1, end, con, &scan);
if((err = scan_text(text, old_end + 1, end, con, &scan)) != NULL)
return err;
con = base + gap_size + text->insert_delta;
ld = scan.line_no - (last_line - first_line);
......@@ -588,7 +610,8 @@ _kernel_oserror *replace_text(Text *text, int from, int ex_to, const char *s,
}
end = line_end(text, last_line) + base + delta;
if(last_line++ >= text->insert_line) end += gap_size;
scan_text(text, old_end + 1, end, con, &scan);
if((err = scan_text(text, old_end + 1, end, con, &scan)) != NULL)
return err;
} while((*end != '\n') && (last_line < text->no_of_lines) &&
((scan.line_no == old_line_no) ||
......@@ -654,7 +677,6 @@ _kernel_oserror *replace_text(Text *text, int from, int ex_to, const char *s,
text->no_of_lines += line_delta;
old_xmax = text->xmax;
for(i = first_line; i < (first_line + scan.line_no); i++)
......@@ -689,7 +711,6 @@ _kernel_oserror *replace_text(Text *text, int from, int ex_to, const char *s,
if(s != str)
free(str);
return NULL;
}
......@@ -697,30 +718,26 @@ _kernel_oserror *insert_text(Text *text, char *s,
int *first_line_p, int *last_line_p, int *line_delta)
{
_kernel_oserror *err;
int left = text->insert_gap_end - text->insert_pos;
int str_size;
char *str = expand_tabs((char *) s, &str_size);
char *start;
char *end;
char *con;
char *char_pntr;
int i;
int old_xmax;
char *base = text->text_data->base;
int gap_size;
int ld, ln;
int first_line = text->insert_line;
int last_line = first_line;
char *old_end;
Scan scan;
int old_split = 0;
int old_line_no;
int left = text->insert_gap_end - text->insert_pos;
int str_size;
char *str = expand_tabs((char *) s, &str_size);
char *start, *end, *con, *char_pntr;
int i, old_xmax;
char *base = text->text_data->base;
int gap_size;
int ld, ln;
int first_line = text->insert_line;
int last_line = first_line;
char *old_end;
Scan scan;
int old_split = 0;
int old_line_no;
scan.new_lines = malloc(10 * sizeof(int));
scan.max_line = 9;
scan.line_no = 0;
if(left < str_size)
if(left <= str_size)
{
left -= str_size + INSERTION_GAP;
if((err = extend_block(text->text_data, text->insert_pos, -left))
......@@ -736,6 +753,8 @@ _kernel_oserror *insert_text(Text *text, char *s,
text->insert_pos += str_size;
gap_size = text->insert_gap_end - text->insert_pos;
*(base + text->insert_pos) = '\0';
start = base + line_start(text, first_line);
scan.x_pos = 0;
......@@ -752,7 +771,8 @@ _kernel_oserror *insert_text(Text *text, char *s,
}
end = base + text->insert_pos - 1;
scan_text(text, start, end, base, &scan);
if((err = scan_text(text, start, end, base, &scan)) != NULL)
return err;
con = base + gap_size + text->insert_delta;
old_end = end + gap_size;
......@@ -767,8 +787,8 @@ _kernel_oserror *insert_text(Text *text, char *s,
}
end = line_end(text, last_line++) + base + gap_size;
scan_text(text, old_end + 1, end, con, &scan);
old_line_no = scan.line_no;
if((err = scan_text(text, old_end + 1, end, con, &scan)) != NULL)
return err;
if((*end != '\n') && (last_line < text->no_of_lines))
{
......@@ -776,7 +796,9 @@ _kernel_oserror *insert_text(Text *text, char *s,
old_end = end;
end = line_end(text, last_line++) + base + gap_size;
scan_text(text, old_end + 1, end, con, &scan);
old_line_no = scan.line_no;
if((err = scan_text(text, old_end + 1, end, con, &scan)) != NULL)
return err;
} while((*end != '\n') && (last_line < text->no_of_lines) &&
((scan.line_no == old_line_no) ||
......@@ -795,18 +817,28 @@ _kernel_oserror *insert_text(Text *text, char *s,
*line_delta = scan.line_no - (last_line - first_line);
*last_line_p = last_line - 1;
left = text->lne_tbl_sze - text->no_of_lines - *line_delta;
if(left < 0)
grow_lines_by(text, -left);
for(i = text->no_of_lines - 1; i >= last_line; i--)
if(*line_delta < 0)
for(i = last_line; i < text->no_of_lines; i++)
{
text->line_table[i + *line_delta] = text->line_table[i];
text->xmax_table[i + *line_delta] = text->xmax_table[i];
}
else
{
text->line_table[i + *line_delta] = text->line_table[i];
text->xmax_table[i + *line_delta] = text->xmax_table[i];
int free = text->lne_tbl_sze - text->no_of_lines - *line_delta;
if((free < 0) && ((err = grow_lines_by(text, -free)) != NULL))
return err;
for(i = text->no_of_lines - 1; i >= last_line; i--)
{
text->line_table[i + *line_delta] = text->line_table[i];
text->xmax_table[i + *line_delta] = text->xmax_table[i];
}
}
for(i = 0; i < scan.line_no; i++)
for(i = 0; i < scan.line_no; i++)
text->line_table[first_line + i] = scan.new_lines[i];
free(scan.new_lines);
free(scan.new_lines);
*first_line_p = first_line;
text->insert_line += ld;
......@@ -846,7 +878,6 @@ _kernel_oserror *insert_text(Text *text, char *s,
if(s != str)
free(str);
return NULL;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment