mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

remove stale DOM span/transclusion code

This commit is contained in:
shaver%netscape.com 1998-10-19 20:45:03 +00:00
Родитель d944e84304
Коммит df4a7696b4
22 изменённых файлов: 20 добавлений и 37006 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

113
lib/layout/Makefile
Просмотреть файл

@ -1,113 +0,0 @@
#!gmake
#
# The contents of this file are subject to the Netscape Public License
# Version 1.0 (the "NPL"); you may not use this file except in
# compliance with the NPL. You may obtain a copy of the NPL at
# http://www.mozilla.org/NPL/
#
# Software distributed under the NPL is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
# for the specific language governing rights and limitations under the
# NPL.
#
# The Initial Developer of this code under the NPL is Netscape
# Communications Corporation. Portions created by Netscape are
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
# Reserved.
DEPTH = ../..
MODULE = lay
LIBRARY_NAME = lay
include $(DEPTH)/config/config.mk
EXPORTS = laylayer.h layout.h lo_funcs.h
# XXX Perignon hack
ifdef DOM
EXPORTS += laydom.h laystyle.h
endif
CSRCS = bullet.c \
clipline.c \
layarena.c \
layblock.c \
laybuiltin.c \
laycell.c \
laycols.c \
laydisp.c \
layembed.c \
layfind.c \
layform.c \
laygrid.c \
layhrule.c \
layinfo.c \
laylist.c \
laymap.c \
layobj.c \
layscrip.c \
layspace.c \
layspan.c \
laystyle.c \
laysub.c \
ptinpoly.c \
laymocha.c \
layjava.c \
laylayer.c \
layrelay.c \
laytrav.c \
layfree.c \
layimage.c \
layout.c \
laysel.c \
laytable.c \
laytags.c \
laytext.c \
layutil.c \
$(NULL)
ifdef DOM
CSRCS +=laydom.c
endif
REQUIRES = parse style js layer applet nspr security dbm img util jtools edtplug java hook pref libfont lay rdf network htmldlgs privacy mocha oji ojiimpl xpcom mailto
ifdef DOM
REQUIRES += dom
endif
ifdef MOZ_EDITOR
CSRCS += layedit.c \
$(NULL)
CPPSRCS = streams.cpp \
fsfile.cpp \
editor.cpp \
edtbuf.cpp \
edtcmd.cpp \
edtele.cpp \
edtjava.cpp \
edtlist.cpp \
edtsave.cpp \
edtutil.cpp \
$(NULL)
endif
include $(DEPTH)/config/rules.mk
ifdef DOM
DEFINES += -DDOM=1
endif
ifneq ($(OS_ARCH),OS2)
$(OBJDIR)/laymocha.o: laymocha.c
@$(MAKE_OBJDIR)
$(CC) -o $@ -c $(CFLAGS) -I$(DEPTH)/mocha/include $<
else
$(OBJDIR)/laymocha.o: laymocha.c
@$(MAKE_OBJDIR)
$(CC) -Fo$@ -c $(CFLAGS) -I$(DEPTH)/mocha/include $<
endif
$(LIBRARY): $(OBJS)

1
lib/layout/Makefile.in
Просмотреть файл

@ -52,7 +52,6 @@ CSRCS = bullet.c \
layobj.c \
layscrip.c \
layspace.c \
layspan.c \
laystyle.c \
laysub.c \
ptinpoly.c \

3313
lib/layout/layblock.c
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

974
lib/layout/laymocha.c
Просмотреть файл

@ -1,974 +0,0 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
*
* The contents of this file are subject to the Netscape Public License
* Version 1.0 (the "NPL"); you may not use this file except in
* compliance with the NPL. You may obtain a copy of the NPL at
* http://www.mozilla.org/NPL/
*
* Software distributed under the NPL is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
* for the specific language governing rights and limitations under the
* NPL.
*
* The Initial Developer of this code under the NPL is Netscape
* Communications Corporation. Portions created by Netscape are
* Copyright (C) 1998 Netscape Communications Corporation. All Rights
* Reserved.
*/
#include "xp.h"
/*
* Mocha layout interface.
*/
#include "lo_ele.h"
#include "layout.h"
#include "laylayer.h"
#include "pa_parse.h"
#include "libevent.h"
#if defined (JAVA)
#include "jsjava.h"
#elif defined (OJI)
#include "jsjava.h"
#include "jvmmgr.h"
#endif
#include "layers.h"
PRIVATE
lo_TopState *
lo_GetTopState(MWContext *context)
{
int32 doc_id;
lo_TopState *top_state;
if (!context)
return NULL ;
doc_id = XP_DOCID(context);
top_state = lo_FetchTopState(doc_id);
if (top_state != NULL && top_state->doc_state == NULL)
return NULL;
return top_state;
}
lo_TopState *
lo_GetMochaTopState(MWContext *context)
{
lo_TopState *top_state;
top_state = lo_GetTopState(context);
if (top_state == NULL)
return NULL;
return top_state;
}
lo_FormData *
LO_GetFormDataByID(MWContext *context, int32 layer_id, intn form_id)
{
lo_TopState *top_state;
lo_FormData *form;
lo_DocLists *doc_lists;
top_state = lo_GetTopState(context);
if (top_state == NULL)
return NULL;
doc_lists = lo_GetDocListsById(top_state->doc_state, layer_id);
if (!doc_lists)
return NULL;
for (form = doc_lists->form_list; form != NULL; form = form->next) {
if (form->id == form_id)
return form;
}
return NULL;
}
/*
* This can only safely be called while holding the JS_Lock
*/
uint
LO_EnumerateForms(MWContext *context, int32 layer_id)
{
lo_TopState *top_state;
lo_FormData *form;
lo_DocLists *doc_lists;
top_state = lo_GetMochaTopState(context);
if (top_state == NULL)
return 0;
doc_lists = lo_GetDocListsById(top_state->doc_state, layer_id);
if (!doc_lists)
return 0;
/* Try to reflect all forms in case someone is enumerating. */
for (form = doc_lists->form_list; form != NULL; form = form->next) {
if (form->mocha_object == NULL)
LM_ReflectForm(context, form, NULL, layer_id, 0);
}
return doc_lists->current_form_num;
}
/*
* Note that index is zero-based from the first form, and if in the second
* form, is one more than the index of the last element in the first form.
* So we subtract form's first element index before subscripting.
*/
LO_FormElementStruct *
LO_GetFormElementByIndex(lo_FormData *form, int32 index)
{
LO_Element **ele_list;
LO_FormElementStruct *form_element;
if (form->form_elements == NULL)
return NULL;
PA_LOCK(ele_list, LO_Element **, form->form_elements);
form_element = (LO_FormElementStruct *)ele_list[0];
index -= form_element->element_index;
if ((uint32)index < (uint32)form->form_ele_cnt)
form_element = (LO_FormElementStruct *)ele_list[index];
else
form_element = NULL;
PA_UNLOCK(form->form_elements);
if (form_element == NULL || form_element->element_data == NULL)
return NULL;
return form_element;
}
/*
* This can only safely be called while holding the JS_Lock
*/
uint
LO_EnumerateFormElements(MWContext *context, lo_FormData *form)
{
LO_Element **ele_list;
LO_FormElementStruct *form_element;
uint i;
/* Try to reflect all elements in case someone is enumerating. */
PA_LOCK(ele_list, LO_Element **, form->form_elements);
for (i = 0; i < (uint)form->form_ele_cnt; i++) {
form_element = (LO_FormElementStruct *)ele_list[i];
if (form_element->mocha_object == NULL)
LM_ReflectFormElement(context, form_element->layer_id,
form->id, form_element->element_index, NULL);
}
PA_UNLOCK(form->form_elements);
return form->form_ele_cnt;
}
void
lo_BeginReflectForm(MWContext *context, lo_DocState *doc_state, PA_Tag *tag,
lo_FormData *form)
{
int32 layer_id;
if(!PA_HasMocha(tag))
return;
layer_id = lo_CurrentLayerId(doc_state);
ET_ReflectObject(context, (void *) form, tag, layer_id,
form->id, LM_FORMS);
ET_SetActiveForm(context, form);
}
LO_ImageStruct *
LO_GetImageByIndex(MWContext *context, int32 layer_id, intn index)
{
lo_TopState *top_state;
LO_ImageStruct *image;
lo_DocLists *doc_lists;
top_state = lo_GetTopState(context);
if (top_state == NULL)
return NULL;
doc_lists = lo_GetDocListsById(top_state->doc_state, layer_id);
if (!doc_lists)
return NULL;
for (image = doc_lists->image_list; image != NULL;
image = image->next_image) {
if (image && image->seq_num == index)
return image;
}
return NULL;
}
uint
LO_EnumerateImages(MWContext *context, int32 layer_id)
{
lo_TopState *top_state;
uint image_num;
LO_ImageStruct *img;
lo_DocLists *doc_lists;
top_state = lo_GetMochaTopState(context);
if (top_state == NULL)
return 0;
doc_lists = lo_GetDocListsById(top_state->doc_state, layer_id);
if (!doc_lists)
return 0;
/*
* Try to reflect all images in case someone is enumerating.
* If its already on the image_list then it already has a valid
* seq_num
*/
image_num = 0;
for (img = doc_lists->image_list; img; img = img->next_image) {
if (img->mocha_object == NULL)
LM_ReflectImage(context, img, NULL, layer_id, img->seq_num);
image_num++;
}
return image_num;
}
void
lo_EndReflectForm(MWContext *context, lo_FormData *form_data)
{
ET_SetActiveForm(context, NULL);
}
void
lo_ReflectImage(MWContext *context, lo_DocState *doc_state, PA_Tag *tag,
LO_ImageStruct *image, Bool blocked, int32 layer_id)
{
lo_DocLists *doc_lists;
/* Reflect only IMG tags, not form INPUT tags of TYPE=IMAGE */
if (tag->type != P_IMAGE && tag->type != P_NEW_IMAGE)
return;
/* Has this image already been reflected ? */
if ((image->image_attr->attrmask & LO_ATTR_ON_IMAGE_LIST)) {
if (! blocked) {
/* Flush any image events that were sent when the image
was blocked */
ET_SendImageEvent(context, image, LM_IMGUNBLOCK);
}
return;
} else {
/* Add image to global list of images for this document. */
doc_lists = lo_GetDocListsById(doc_state, layer_id);
if (!doc_lists)
return;
image->image_attr->attrmask |= LO_ATTR_ON_IMAGE_LIST;
image->seq_num = doc_lists->image_list_count++;
/*
* If we're in table relayout, we replace the old image
* in the image list. Note that we also look to see if
* the corresponding mocha object has already been allocated.
* If so, we copy it. If not, it will be set when the
* the JS thread gets around to it (the mocha reflection
* code gets the image by index, so it will get the right
* one.
*/
if (doc_state->in_relayout) {
LO_ImageStruct *cur_image, *prev_image;
prev_image = NULL;
for (cur_image = doc_lists->image_list; cur_image != NULL;
prev_image=cur_image, cur_image=cur_image->next_image) {
if (cur_image->seq_num == image->seq_num) {
/* Copy over the mocha object (it might not exist) */
image->mocha_object = cur_image->mocha_object;
/* Replace the old image with the new one */
image->next_image = cur_image->next_image;
if (prev_image == NULL)
doc_lists->image_list = image;
else
prev_image->next_image = image;
if (doc_lists->last_image == cur_image)
doc_lists->last_image = image;
/* Note that the old image is recycled by the table code */
break;
}
}
return;
}
/* Add it to the end of the list */
else {
if (doc_lists->last_image)
doc_lists->last_image->next_image = image;
else
doc_lists->image_list = image;
doc_lists->last_image = image;
}
}
/* The image is reflected into a Javascript object lazily:
Immediate reflection only occurs if there are Javascript-only
attributes in the IMG tag */
if(!PA_HasMocha(tag))
return;
ET_ReflectObject(context, (LO_Element *) image, tag, layer_id,
image->seq_num, LM_IMAGES);
/* Since the image is unblocked, there is no need to buffer
any JavaScript image events. Deliver them as they're generated. */
if (! blocked)
ET_SendImageEvent(context, image, LM_IMGUNBLOCK);
}
void
lo_ReflectFormElement(MWContext *context, lo_DocState *doc_state, PA_Tag *tag,
LO_FormElementStruct *form_element)
{
lo_DocLists *doc_lists;
/* Don't reflect form elements twice, it makes arrays out of them! */
if (doc_state->in_relayout)
return;
/* don't do squat if we don't have any mocha */
if (!PA_HasMocha(tag))
return;
doc_lists = lo_GetDocListsById(doc_state, form_element->layer_id);
if (!doc_lists)
return;
/* reflect the form element */
ET_ReflectFormElement(context, doc_lists->form_list, form_element, tag);
}
void
lo_ReflectNamedAnchor(MWContext *context, lo_DocState *doc_state, PA_Tag *tag,
lo_NameList *name_rec, int32 layer_id)
{
lo_DocLists *doc_lists;
if (!doc_state->in_relayout) {
doc_lists = lo_GetDocListsById(doc_state, layer_id);
if (!doc_lists)
return;
name_rec->index = doc_lists->anchor_count++;
if(!PA_HasMocha(tag))
return;
ET_ReflectObject(context, (void *) name_rec, tag,
layer_id, name_rec->index, LM_NAMEDANCHORS);
}
}
lo_NameList *
LO_GetNamedAnchorByIndex(MWContext *context, int32 layer_id, uint index)
{
lo_TopState *top_state;
lo_NameList *name_rec, *nptr;
lo_DocLists *doc_lists;
top_state = lo_GetTopState(context);
if (top_state == NULL)
return NULL;
doc_lists = lo_GetDocListsById(top_state->doc_state, layer_id);
if (!doc_lists)
return NULL;
/* The list is not guaranteed to be in reverse-source order when nested
tables are involved, so search for matching index instead. */
name_rec = NULL;
for (nptr = doc_lists->name_list; nptr != NULL; nptr = nptr->next) {
if (nptr->index == index) {
name_rec = nptr;
break;
}
}
return name_rec;
}
uint
LO_EnumerateNamedAnchors(MWContext *context, int32 layer_id)
{
lo_TopState *top_state;
lo_NameList *name_rec;
uint count;
lo_DocLists *doc_lists;
top_state = lo_GetTopState(context);
if (top_state == NULL)
return 0;
doc_lists = lo_GetDocListsById(top_state->doc_state, layer_id);
if (!doc_lists)
return 0;
count = 0;
for (name_rec = doc_lists->name_list; name_rec != NULL;
name_rec = name_rec->next) {
if (name_rec->mocha_object == NULL)
LM_ReflectNamedAnchor(context, (void *) name_rec, NULL,
layer_id, name_rec->index);
count++;
}
return count;
}
#ifdef DOM
void
lo_ReflectSpan(MWContext *context, lo_DocState *doc_state, PA_Tag *tag,
lo_NameList *name_rec, int32 layer_id)
{
lo_DocLists *doc_lists;
if (!doc_state->in_relayout) {
doc_lists = lo_GetDocListsById(doc_state, layer_id);
if (!doc_lists)
return;
name_rec->index = doc_lists->span_count++;
if(!PA_HasMocha(tag))
return;
ET_ReflectObject(context, (void *) name_rec, tag,
layer_id, name_rec->index, LM_SPANS);
}
}
lo_NameList *
LO_GetSpanByIndex(MWContext *context, int32 layer_id, uint index)
{
lo_TopState *top_state;
lo_NameList *name_rec, *nptr;
lo_DocLists *doc_lists;
top_state = lo_GetTopState(context);
if (top_state == NULL)
return NULL;
doc_lists = lo_GetDocListsById(top_state->doc_state, layer_id);
if (!doc_lists)
return NULL;
/* The list is not guaranteed to be in reverse-source order when nested
tables are involved, so search for matching index instead. */
name_rec = NULL;
for (nptr = doc_lists->span_list; nptr != NULL; nptr = nptr->next) {
if (nptr->index == index) {
name_rec = nptr;
break;
}
}
return name_rec;
}
uint
LO_EnumerateSpans(MWContext *context, int32 layer_id)
{
lo_TopState *top_state;
lo_NameList *name_rec;
uint count;
lo_DocLists *doc_lists;
top_state = lo_GetTopState(context);
if (top_state == NULL)
return 0;
doc_lists = lo_GetDocListsById(top_state->doc_state, layer_id);
if (!doc_lists)
return 0;
count = 0;
for (name_rec = doc_lists->span_list; name_rec != NULL;
name_rec = name_rec->next) {
if (name_rec->mocha_object == NULL)
LM_ReflectSpan(context, (void *) name_rec, NULL,
layer_id, name_rec->index);
count++;
}
return count;
}
#endif
void
lo_ReflectLink(MWContext *context, lo_DocState *doc_state, PA_Tag *tag,
LO_AnchorData *anchor_data, int32 layer_id, uint index)
{
/* if this tag has any mocha, reflect it now */
if(!PA_HasMocha(tag))
return;
ET_ReflectObject(context, anchor_data, tag, layer_id, index, LM_LINKS);
}
LO_AnchorData *
LO_GetLinkByIndex(MWContext *context, int32 layer_id, uint index)
{
lo_TopState *top_state;
LO_AnchorData **anchor_array;
LO_AnchorData *anchor_data;
lo_DocLists *doc_lists;
top_state = lo_GetTopState(context);
if (top_state == NULL)
return NULL;
doc_lists = lo_GetDocListsById(top_state->doc_state, layer_id);
if (!doc_lists)
return NULL;
if (index >= (uint)doc_lists->url_list_len)
return NULL;
XP_LOCK_BLOCK(anchor_array, LO_AnchorData **, doc_lists->url_list);
anchor_data = anchor_array[index];
XP_UNLOCK_BLOCK(doc_lists->url_list);
return anchor_data;
}
uint
LO_EnumerateLinks(MWContext *context, int32 layer_id)
{
lo_TopState *top_state;
uint count, index;
LO_AnchorData **anchor_array;
LO_AnchorData *anchor_data;
lo_DocLists *doc_lists;
top_state = lo_GetMochaTopState(context);
if (top_state == NULL)
return 0;
doc_lists = lo_GetDocListsById(top_state->doc_state, layer_id);
if (!doc_lists)
return 0;
/* Try to reflect all links in case someone is enumerating. */
count = (uint)doc_lists->url_list_len;
XP_LOCK_BLOCK(anchor_array, LO_AnchorData **, doc_lists->url_list);
for (index = 0; index < count; index++) {
anchor_data = anchor_array[index];
if (anchor_data->mocha_object == NULL)
LM_ReflectLink(context, anchor_data, NULL, layer_id, index);
}
XP_UNLOCK_BLOCK(doc_lists->url_list);
return count;
}
#if defined(JAVA) || defined (OJI)
LO_JavaAppStruct *
LO_GetAppletByIndex(MWContext *context, int32 layer_id, uint index)
{
lo_TopState *top_state;
LO_JavaAppStruct *applet;
int i, count;
lo_DocLists *doc_lists;
#ifdef OJI
if (!JVM_IsLiveConnectEnabled())
return NULL;
#else
/* XXX */
if (!JSJ_IsEnabled())
return NULL;
#endif
top_state = lo_GetTopState(context);
if (top_state == NULL)
return NULL;
doc_lists = lo_GetDocListsById(top_state->doc_state, layer_id);
if (!doc_lists)
return NULL;
/* count 'em */
count = 0;
applet = doc_lists->applet_list;
while (applet) {
applet = applet->nextApplet;
count++;
}
/* reverse order... */
applet = doc_lists->applet_list;
for (i = count-1; i >= 0; i--) {
if ((uint)i == index)
return applet;
applet = applet->nextApplet;
}
return NULL;
}
uint
LO_EnumerateApplets(MWContext *context, int32 layer_id)
{
lo_TopState *top_state;
int count, index;
LO_JavaAppStruct *applet;
lo_DocLists *doc_lists;
#ifdef OJI
if (!JVM_IsLiveConnectEnabled())
return 0;
#else
/* XXX */
if (!JSJ_IsEnabled())
return 0;
#endif
top_state = lo_GetMochaTopState(context);
if (top_state == NULL)
return 0;
doc_lists = lo_GetDocListsById(top_state->doc_state, layer_id);
if (!doc_lists)
return 0;
/* count 'em */
count = 0;
applet = doc_lists->applet_list;
while (applet) {
applet = applet->nextApplet;
count++;
}
/* reflect all applets in reverse order */
applet = doc_lists->applet_list;
for (index = count-1; index >= 0; index--) {
if (applet->objTag.mocha_object == NULL)
LM_ReflectApplet(context, (void *) applet, NULL, layer_id, index);
applet = applet->nextApplet;
}
return count;
}
LO_EmbedStruct *
LO_GetEmbedByIndex(MWContext *context, int32 layer_id, uint index)
{
lo_TopState *top_state;
LO_EmbedStruct *embed;
int i, count;
lo_DocLists *doc_lists;
#ifdef OJI
if (!JVM_IsLiveConnectEnabled())
return NULL;
#else
/* XXX */
if (!JSJ_IsEnabled())
return NULL;
#endif
top_state = lo_GetTopState(context);
if (top_state == NULL)
return NULL;
doc_lists = lo_GetDocListsById(top_state->doc_state, layer_id);
if (!doc_lists)
return NULL;
/* count 'em */
count = 0;
embed = doc_lists->embed_list;
while (embed) {
embed = embed->nextEmbed;
count++;
}
/* reverse order... */
embed = doc_lists->embed_list;
for (i = count-1; i >= 0; i--) {
if ((uint)i == index)
return embed;
embed = embed->nextEmbed;
}
return NULL;
}
uint
LO_EnumerateEmbeds(MWContext *context, int32 layer_id)
{
lo_TopState *top_state;
int count, index;
LO_EmbedStruct *embed;
lo_DocLists *doc_lists;
#ifdef OJI
if (!JVM_IsLiveConnectEnabled())
return 0;
#else
/* XXX */
if (!JSJ_IsEnabled())
return 0;
#endif
top_state = lo_GetMochaTopState(context);
if (top_state == NULL)
return 0;
doc_lists = lo_GetDocListsById(top_state->doc_state, layer_id);
if (!doc_lists)
return 0;
/* count 'em */
count = 0;
embed = doc_lists->embed_list;
while (embed) {
embed = embed->nextEmbed;
count++;
}
/* reflect all embeds in reverse order */
embed = doc_lists->embed_list;
for (index = count-1; index >= 0; index--) {
if (embed->objTag.mocha_object == NULL)
LM_ReflectEmbed(context, (void *) embed, NULL, layer_id, index);
embed = embed->nextEmbed;
}
return count;
}
#endif /* JAVA || OJI */
LO_BuiltinStruct *
LO_GetBuiltinByIndex(MWContext *context, int32 layer_id, uint index)
{
lo_TopState *top_state;
LO_BuiltinStruct *builtin;
int i, count;
lo_DocLists *doc_lists;
top_state = lo_GetTopState(context);
if (top_state == NULL)
return NULL;
doc_lists = lo_GetDocListsById(top_state->doc_state, layer_id);
if (!doc_lists)
return NULL;
/* count 'em */
count = 0;
builtin = doc_lists->builtin_list;
while (builtin) {
builtin = builtin->nextBuiltin;
count++;
}
/* reverse order... */
builtin = doc_lists->builtin_list;
for (i = count-1; i >= 0; i--) {
if ((uint)i == index)
return builtin;
builtin = builtin->nextBuiltin;
}
return NULL;
}
/* XXX lo_DocState should use a colors[LO_NCOLORS] array to shrink code here
and in layout.c.
*/
void
LO_GetDocumentColor(MWContext *context, int type, LO_Color *color)
{
lo_TopState *top_state;
lo_DocState *doc_state;
top_state = lo_GetTopState(context);
if (top_state == NULL)
return;
doc_state = top_state->doc_state;
switch (type) {
case LO_COLOR_BG:
*color = doc_state->text_bg;
break;
case LO_COLOR_FG:
*color = doc_state->text_fg;
break;
case LO_COLOR_LINK:
*color = doc_state->anchor_color;
break;
case LO_COLOR_VLINK:
*color = doc_state->visited_anchor_color;
break;
case LO_COLOR_ALINK:
*color = doc_state->active_anchor_color;
break;
default:
break;
}
}
void
LO_SetDocumentColor(MWContext *context, int type, LO_Color *color)
{
lo_TopState *top_state;
lo_DocState *doc_state;
top_state = lo_GetTopState(context);
if (top_state == NULL)
return;
doc_state = top_state->doc_state;
if (color == NULL)
color = &lo_master_colors[type];
switch (type) {
case LO_COLOR_BG:
doc_state->text_bg = *color;
top_state->doc_specified_bg = TRUE;
LO_SetDocBgColor(context, color);
break;
case LO_COLOR_FG:
/* Note: The color will be changed only if no one else
has called this function before */
lo_ChangeBodyTextFGColor(context, doc_state, color);
break;
case LO_COLOR_LINK:
doc_state->anchor_color = *color;
break;
case LO_COLOR_VLINK:
doc_state->visited_anchor_color = *color;
break;
case LO_COLOR_ALINK:
doc_state->active_anchor_color = *color;
break;
default:;
}
}
XP_Bool
lo_ProcessContextEventHandlers(MWContext *context, lo_DocState *doc_state,
PA_Tag *tag)
{
PA_Block onload, onunload, onfocus, onblur, onhelp, onmouseover, onmouseout,
ondragdrop, onmove, onresize, id;
lo_TopState *top_state;
char *all = 0;
XP_Bool ret;
ret = FALSE;
onload = lo_FetchParamValue(context, tag, PARAM_ONLOAD);
onunload = lo_FetchParamValue(context, tag, PARAM_ONUNLOAD);
onfocus = lo_FetchParamValue(context, tag, PARAM_ONFOCUS);
onblur = lo_FetchParamValue(context, tag, PARAM_ONBLUR);
onhelp = lo_FetchParamValue(context, tag, PARAM_ONHELP);
onmouseover = lo_FetchParamValue(context, tag, PARAM_ONMOUSEOVER);
onmouseout = lo_FetchParamValue(context, tag, PARAM_ONMOUSEOUT);
ondragdrop = lo_FetchParamValue(context, tag, PARAM_ONDRAGDROP);
onmove = lo_FetchParamValue(context, tag, PARAM_ONMOVE);
onresize = lo_FetchParamValue(context, tag, PARAM_ONRESIZE);
if (onload == NULL && onunload == NULL && onfocus == NULL && onblur == NULL
&& onhelp == NULL && onmouseover == NULL && onmouseout == NULL && ondragdrop == NULL
&& onmove == NULL && onresize == NULL)
{
return ret;
}
ret = TRUE;
id = lo_FetchParamValue(context, tag, PARAM_ID);
all = NULL;
StrAllocCopy(all, (char *) tag->data);
top_state = doc_state->top_state;
/*
* If we're in a layer, pass along the tag to the layer reflection
* function so that the event handlers get attached to the layer.
*/
if (lo_InsideLayer(doc_state)) {
int32 cur_layer_id = lo_CurrentLayerId(doc_state);
CL_Layer *layer = LO_GetLayerFromId(context, cur_layer_id);
CL_Layer *parent = CL_GetLayerParent(layer);
int32 parent_layer_id = LO_GetIdFromLayer(context, parent);
ET_ReflectObject(context, NULL, tag, parent_layer_id, cur_layer_id,
LM_LAYERS);
}
else {
ET_ReflectWindow(context, onload, onunload, onfocus, onblur, onhelp, onmouseover,
onmouseout, ondragdrop, onmove, onresize,
id, all, tag->type != P_GRID, tag->newline_count);
if (onload != NULL && tag->type == P_BODY)
top_state->mocha_has_onload = TRUE;
if (onunload != NULL && tag->type == P_BODY)
top_state->mocha_has_onunload = TRUE;
if (tag->type == P_GRID) {
top_state->savedData.OnUnload = onunload;
top_state->savedData.OnFocus = onfocus;
top_state->savedData.OnBlur = onblur;
top_state->savedData.OnLoad = onload;
top_state->savedData.OnHelp = onhelp;
top_state->savedData.OnMouseOver = onmouseover;
top_state->savedData.OnMouseOut = onmouseout;
top_state->savedData.OnDragDrop = ondragdrop;
top_state->savedData.OnMove = onmove;
top_state->savedData.OnResize = onresize;
}
}
return ret;
}
void
lo_RestoreContextEventHandlers(MWContext *context, lo_DocState *doc_state,
PA_Tag *tag, SHIST_SavedData *saved_data)
{
PA_Block onload, onunload, onfocus, onblur, onhelp, onmouseover, onmouseout, ondragdrop,
onmove, onresize;
lo_TopState *top_state;
onload = saved_data->OnLoad;
onunload = saved_data->OnUnload;
onfocus = saved_data->OnFocus;
onblur = saved_data->OnBlur;
onhelp = saved_data->OnHelp;
onmouseover = saved_data->OnMouseOver;
onmouseout = saved_data->OnMouseOut;
ondragdrop = saved_data->OnDragDrop;
onmove = saved_data->OnMove;
onresize = saved_data->OnResize;
if (onload == NULL && onunload == NULL && onfocus == NULL && onblur == NULL
&& onhelp == NULL && onmouseover == NULL && onmouseout == NULL && ondragdrop == NULL
&& onmove == NULL && onresize == NULL)
return;
top_state = doc_state->top_state;
/* XXX - could these be signed? */
ET_ReflectWindow(context, onload, onunload, onfocus, onblur, onhelp, onmouseover,
onmouseout, ondragdrop, onmove, onresize,
NULL, NULL, FALSE, tag->newline_count);
if (onload != NULL && tag->type == P_BODY)
top_state->mocha_has_onload = TRUE;
if (onunload != NULL && tag->type == P_BODY)
top_state->mocha_has_onunload = TRUE;
top_state->savedData.OnUnload = onunload;
top_state->savedData.OnFocus = onfocus;
top_state->savedData.OnBlur = onblur;
top_state->savedData.OnLoad = onload;
top_state->savedData.OnHelp = onhelp;
top_state->savedData.OnMouseOver = onmouseover;
top_state->savedData.OnMouseOut = onmouseout;
top_state->savedData.OnDragDrop = ondragdrop;
top_state->savedData.OnMove = onmove;
top_state->savedData.OnResize = onresize;
}

7861
lib/layout/layout.c
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

1761
lib/layout/layout.h
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

1914
lib/layout/layrelay.c
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

0
lib/layout/layspan.c
Просмотреть файл

8097
lib/layout/laytable.c
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

66
lib/layout/laytags.c
Просмотреть файл

@ -1367,63 +1367,6 @@ lo_process_header_tag(MWContext *context, lo_DocState *state, PA_Tag *tag, int t
}
}
static void
lo_process_span_tag(MWContext *context, lo_DocState *state, PA_Tag *tag)
{
LO_SpanStruct *span;
PA_Block buff;
lo_DocLists *doc_lists;
doc_lists = lo_GetCurrentDocLists(state);
span = (LO_SpanStruct*)lo_NewElement(context, state, LO_SPAN, NULL, 0);
XP_ASSERT(span);
if (!span) return;
span->lo_any.type = LO_SPAN;
span->lo_any.ele_id = NEXT_ELEMENT;
span->is_end = tag->is_end;
span->lo_any.x = state->x;
span->lo_any.y = state->y;
span->lo_any.x_offset = 0;
span->lo_any.y_offset = 0;
span->lo_any.width = 0;
span->lo_any.height = 0;
span->lo_any.line_height = 0;
#ifdef DOM
span->name_rec = NULL;
if (tag->is_end == FALSE)
{
/* get the span's ID. */
buff = lo_FetchParamValue(context, tag, PARAM_ID);
if (buff != NULL)
{
state->in_span = TRUE;
state->current_span = buff;
if (lo_SetNamedSpan(state, buff))
{
lo_BindNamedSpanToElement(state, buff, NULL);
lo_ReflectSpan(context, state, tag,
doc_lists->span_list,
lo_CurrentLayerId(state));
span->name_rec = doc_lists->span_list;
}
PA_UNLOCK(buff);
}
lo_AppendToLineList(context, state, (LO_Element*)span, 0);
state->in_span = TRUE;
}
else
{
state->in_span = FALSE;
lo_AppendToLineList(context, state, (LO_Element*)span, 0);
}
#endif
}
static void
lo_process_div_tag(MWContext *context, lo_DocState *state, PA_Tag *tag)
{
@ -4397,12 +4340,6 @@ lo_IsEmptyTag(TagType type)
|| type == P_EMBED
|| type == P_KEYGEN
|| type == P_JAVA_APPLET
#ifndef DOM
|| type == P_LIST_ITEM /* not really empty! */
|| type == P_DESC_TITLE
|| type == P_NSDT
|| type == P_DESC_TEXT
#endif
|| type == P_BASEFONT
|| type == P_AREA
|| type == P_BASE)
@ -7548,9 +7485,6 @@ XP_TRACE(("lo_LayoutTag(%d)\n", tag->type));
*/
case P_SPAN:
{
#ifdef DOM
lo_process_span_tag(context, state, tag);
#endif
break;
}

8735
lib/layout/laytext.c
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

3914
lib/layout/layutil.c
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

2
lib/libmocha/Makefile
Просмотреть файл

@ -57,10 +57,8 @@ CSRCS = et_mocha.c \
lm_nav.c \
lm_plgin.c \
lm_screen.c \
lm_span.c \
lm_supdt.c \
lm_taint.c \
lm_trans.c \
lm_tree.c \
lm_trggr.c \
lm_url.c \

2
lib/libmocha/Makefile.in
Просмотреть файл

@ -60,10 +60,8 @@ CSRCS = et_mocha.c \
lm_nav.c \
lm_plgin.c \
lm_screen.c \
lm_span.c \
lm_supdt.c \
lm_taint.c \
lm_trans.c \
lm_tree.c \
lm_trggr.c \
lm_url.c \

9
lib/libmocha/et_mocha.c
Просмотреть файл

@ -908,15 +908,6 @@ et_reflect_handler(Reflect_Event * e)
case LM_LAYERS:
LM_ReflectLayer(e->ce.context, e->index, e->layer_id, e->pa_tag);
break;
#ifdef DOM
case LM_SPANS:
LM_ReflectSpan(e->ce.context, e->lo_ele, e->pa_tag,
e->layer_id, e->index);
break;
case LM_TRANSCLUSIONS:
LM_ReflectTransclusion(e->ce.context, e->lo_ele, e->layer_id, e->index);
break;
#endif
default:
XP_ASSERT(0);
break;

151
lib/libmocha/et_moz.c
Просмотреть файл

@ -3063,157 +3063,8 @@ ET_PostSignedAppletPrivileges
et_PostEvent(&event->ce, FALSE);
}
#ifdef DOM
/****************************************************************************/
typedef struct {
ETEvent ce;
lo_NameList *name_rec;
ETSpanOp op;
void *param_ptr;
int32 param_val;
} MozillaEvent_TweakSpan;
PR_STATIC_CALLBACK(int)
et_HandleEvent_TweakSpan(MozillaEvent_TweakSpan* e)
{
Bool ret = TRUE;
/* check that the doc_id is valid */
if(XP_DOCID(e->ce.context) != e->ce.doc_id)
return FALSE;
switch(e->op) {
case SP_SetColor:
LO_SetSpanColor(e->ce.context, e->name_rec, (LO_Color*)e->param_ptr);
/* This call to reflow is just a temp hack */
LO_RelayoutFromElement(e->ce.context, e->name_rec->element);
if (e->param_ptr)
XP_FREE((void*)e->param_ptr);
break;
case SP_SetBackground:
LO_SetSpanBackground(e->ce.context, e->name_rec, (LO_Color*)e->param_ptr);
/* This call to reflow is just a temp hack */
LO_RelayoutFromElement(e->ce.context, e->name_rec->element);
if (e->param_ptr)
XP_FREE((void*)e->param_ptr);
break;
case SP_SetFontFamily:
LO_SetSpanFontFamily(e->ce.context, e->name_rec, (char*)e->param_ptr);
LO_RelayoutFromElement(e->ce.context, e->name_rec->element);
break;
case SP_SetFontWeight:
LO_SetSpanFontWeight(e->ce.context, e->name_rec, (char*)e->param_ptr);
LO_RelayoutFromElement(e->ce.context, e->name_rec->element);
break;
case SP_SetFontSize:
LO_SetSpanFontSize(e->ce.context, e->name_rec, e->param_val);
LO_RelayoutFromElement(e->ce.context, e->name_rec->element);
break;
case SP_SetFontSlant:
LO_SetSpanFontSlant(e->ce.context, e->name_rec, (char*)e->param_ptr);
LO_RelayoutFromElement(e->ce.context, e->name_rec->element);
break;
default:
XP_ASSERT(0);
}
return (int)ret;
}
PR_STATIC_CALLBACK(void)
et_DestroyEvent_TweakSpan(MozillaEvent_TweakSpan * event)
{
XP_FREE(event);
}
/*
* These need to be synchronous so that if we set this and then
* immediately look at it we get the correct (new) value
*/
int
ET_TweakSpan(MWContext * context, void *name_rec, void *param_ptr,
int32 param_val, ETSpanOp op, int32 doc_id)
{
MozillaEvent_TweakSpan * event;
event = PR_NEW(MozillaEvent_TweakSpan);
if (event == NULL)
return 0;
PR_InitEvent(&event->ce.event, context,
(PRHandleEventProc)et_HandleEvent_TweakSpan,
(PRDestroyEventProc)et_DestroyEvent_TweakSpan);
event->ce.context = context;
event->ce.doc_id = doc_id;
event->op = op;
event->name_rec = name_rec;
event->param_ptr = param_ptr;
event->param_val = param_val;
return (int)et_PostEvent(&event->ce, TRUE);
}
/* Tweak XML Transclusion stuff starts here */
typedef struct {
ETEvent ce;
ETTransclusionOp op;
void *param_ptr;
int32 param_val;
void *xmlFile;
} MozillaEvent_TweakTransclusion;
PR_STATIC_CALLBACK(int)
et_HandleEvent_TweakTransclusion(MozillaEvent_TweakTransclusion* e)
{
Bool ret = TRUE;
/* check that the doc_id is valid */
if(XP_DOCID(e->ce.context) != e->ce.doc_id)
return FALSE;
switch(e->op) {
case TR_SetHref:
XMLSetTransclusionProperty(e->xmlFile, e->param_val, "href", e->param_ptr);
if (e->param_ptr)
XP_FREE((void*)e->param_ptr);
break;
default:
XP_ASSERT(0);
}
return (int)ret;
}
PR_STATIC_CALLBACK(void)
et_DestroyEvent_TweakTransclusion(MozillaEvent_TweakTransclusion * event)
{
XP_FREE(event);
}
int
ET_TweakTransclusion(MWContext * context, void *xmlFile, void *param_ptr,
int32 param_val, ETTransclusionOp op, int32 doc_id)
{
MozillaEvent_TweakTransclusion * event;
event = PR_NEW(MozillaEvent_TweakTransclusion);
if (event == NULL)
return 0;
PR_InitEvent(&event->ce.event, context,
(PRHandleEventProc)et_HandleEvent_TweakTransclusion,
(PRDestroyEventProc)et_DestroyEvent_TweakTransclusion);
event->ce.context = context;
event->ce.doc_id = doc_id;
event->op = op;
event->param_ptr = param_ptr;
event->param_val = param_val;
event->xmlFile = xmlFile;
return (int)et_PostEvent(&event->ce, FALSE);
}
#if DOM
/* Signal reflow from DOM alteration */
typedef struct {
ETEvent ce;

79
lib/libmocha/lm_doc.c
Просмотреть файл

@ -85,27 +85,25 @@ enum doc_slot {
DOC_ANCHORS = -5,
DOC_APPLETS = -6,
DOC_EMBEDS = -7,
DOC_SPANS = -8, /* Added for HTML SPAN DOM stuff */
DOC_TRANSCLUSIONS = -9, /* Added for XML Transclusion DOM stuff */
DOC_DOCELEMENT = -10, /* Added for W3C DOM stuff */
DOC_TITLE = -11,
DOC_URL = -12,
DOC_REFERRER = -13,
DOC_LAST_MODIFIED = -14,
DOC_COOKIE = -15,
DOC_DOMAIN = -16,
DOC_DOCELEMENT = -8, /* Added for W3C DOM stuff */
DOC_TITLE = -9,
DOC_URL = -10,
DOC_REFERRER = -11,
DOC_LAST_MODIFIED = -12,
DOC_COOKIE = -13,
DOC_DOMAIN = -14,
/* slots below this line are not secured */
DOC_IMAGES = -17,
DOC_LAYERS = -18,
DOC_LOADED_DATE = -19,
DOC_BG_COLOR = -20,
DOC_FG_COLOR = -21,
DOC_LINK_COLOR = -22,
DOC_VLINK_COLOR = -23,
DOC_ALINK_COLOR = -24,
DOC_WIDTH = -25,
DOC_HEIGHT = -26,
DOC_BUILTINS = -27
DOC_IMAGES = -15,
DOC_LAYERS = -16,
DOC_LOADED_DATE = -17,
DOC_BG_COLOR = -18,
DOC_FG_COLOR = -19,
DOC_LINK_COLOR = -20,
DOC_VLINK_COLOR = -21,
DOC_ALINK_COLOR = -22,
DOC_WIDTH = -23,
DOC_HEIGHT = -24,
DOC_BUILTINS = -25
};
#endif
@ -123,8 +121,6 @@ static JSPropertySpec doc_props[] = {
{lm_images_str, DOC_IMAGES, JSPROP_ENUMERATE|JSPROP_READONLY},
{lm_layers_str, DOC_LAYERS, JSPROP_ENUMERATE|JSPROP_READONLY},
#ifdef DOM
{lm_spans_str, DOC_SPANS, JSPROP_ENUMERATE|JSPROP_READONLY},
{lm_transclusions_str, DOC_TRANSCLUSIONS, JSPROP_ENUMERATE|JSPROP_READONLY},
{"documentElement",DOC_DOCELEMENT, JSPROP_ENUMERATE|JSPROP_READONLY},
#endif
{"title", DOC_TITLE, JSPROP_ENUMERATE|JSPROP_READONLY},
@ -305,35 +301,7 @@ doc_getProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
return JS_TRUE;
#ifdef DOM
case DOC_SPANS:
*vp = OBJECT_TO_JSVAL(lm_GetSpanArray(decoder, obj));
active_layer_id = LM_GetActiveLayer(context);
LM_SetActiveLayer(context, doc->layer_id);
(void) LO_EnumerateSpans(context,doc->layer_id);
LM_SetActiveLayer(context, active_layer_id);
LO_UnlockLayout();
return JS_TRUE;
case DOC_TRANSCLUSIONS:
/* We are assuming that by the time any JS sees document.transclusions[]
all the transclusions have been reflected into JS. So
there is no need for the call to XMLEnumerateTransclusions that
reflects all Transclusions into JS.
*/
*vp = OBJECT_TO_JSVAL(lm_GetTransclusionArray(decoder, obj));
active_layer_id = LM_GetActiveLayer(context);
LM_SetActiveLayer(context, doc->layer_id);
/*
(void) XMLEnumerateTransclusions(context,doc->layer_id);
*/
LM_SetActiveLayer(context, active_layer_id);
LO_UnlockLayout();
return JS_TRUE;
case DOC_DOCELEMENT:
#ifdef DEBUG_shaver
fprintf(stderr, "getting document.documentElement\n");
#endif
*vp = OBJECT_TO_JSVAL(lm_DOMGetDocumentElement(decoder, obj));
LO_UnlockLayout();
return JS_TRUE;
@ -1700,12 +1668,7 @@ lm_DefineDocument(MochaDecoder *decoder, int32 layer_id)
!JS_AddNamedRoot(cx, &doc->applets, lm_applets_str) ||
!JS_AddNamedRoot(cx, &doc->embeds, lm_embeds_str) ||
!JS_AddNamedRoot(cx, &doc->images, lm_images_str) ||
!JS_AddNamedRoot(cx, &doc->layers, lm_layers_str)
#ifdef DOM
|| !JS_AddNamedRoot(cx, &doc->spans, lm_spans_str)
|| !JS_AddNamedRoot(cx, &doc->transclusions, lm_transclusions_str)
#endif
) {
!JS_AddNamedRoot(cx, &doc->layers, lm_layers_str)) {
/* doc_finalize will clean up the rest. */
return NULL;
}
@ -1791,10 +1754,6 @@ lm_CleanUpDocumentRoots(MochaDecoder *decoder, JSObject *obj)
doc->embeds = NULL;
doc->images = NULL;
doc->layers = NULL;
#ifdef DOM
doc->spans = NULL;
doc->transclusions = NULL;
#endif
}
/*

9
lib/libmocha/lm_init.c
Просмотреть файл

@ -102,10 +102,6 @@ char lm_applets_str[] = "applets";
char lm_embeds_str[] = "embeds";
char lm_images_str[] = "images";
char lm_layers_str[] = "layers";
#ifdef DOM
char lm_spans_str[] = "spans";
char lm_transclusions_str[] = "transclusions";
#endif
char lm_builtins_str[] = "trees";
char lm_location_str[] = "location";
char lm_navigator_str[] = "navigator";
@ -1212,11 +1208,6 @@ LM_PutMochaDecoder(MochaDecoder *decoder)
CLEAR(decoder->rect_prototype);
CLEAR(decoder->url_prototype);
#ifdef DOM
CLEAR(decoder->span_prototype);
CLEAR(decoder->transclusion_prototype);
#endif
/* Clear window sub-object refs. */
if (decoder->document)
lm_CleanUpDocumentRoots(decoder, decoder->document);

8
lib/libmocha/lm_input.c
Просмотреть файл

@ -2383,14 +2383,6 @@ lm_InputEvent(MWContext *context, LO_Element *element, JSEvent *pEvent,
case LO_TEXT:
anchor = element->lo_text.text ? element->lo_text.anchor_href : 0;
obj = anchor ? anchor->mocha_object : 0;
#ifdef DOM
/* If this layout element is within a span, set the mocha object to
the containing SPAN's mocha object */
if (LO_IsWithinSpan( element ))
{
obj = LO_GetMochaObjectOfParentSpan( element );
}
#endif
if (!obj) {
if (!LM_EventCaptureCheck(context, pEvent->type) || !anchor) {
LO_UnlockLayout();

0
lib/libmocha/lm_span.c
Просмотреть файл

0
lib/libmocha/lm_trans.c
Просмотреть файл

17
lib/libmocha/lm_win.c
Просмотреть файл

@ -3194,10 +3194,6 @@ lm_NewWindow(MWContext *context)
HOLD(decoder->option_prototype);
HOLD(decoder->rect_prototype);
HOLD(decoder->url_prototype);
#ifdef DOM
HOLD(decoder->span_prototype);
HOLD(decoder->transclusion_prototype);
#endif
/* Drop window sub-object refs. */
HOLD(decoder->document);
@ -3256,11 +3252,6 @@ lm_DestroyWindow(MochaDecoder *decoder)
DROP(decoder->option_prototype);
DROP(decoder->rect_prototype);
DROP(decoder->url_prototype);
#ifdef DOM
DROP(decoder->span_prototype);
DROP(decoder->transclusion_prototype);
#endif
/* Drop window sub-object refs. */
DROP(decoder->document);
@ -3397,10 +3388,7 @@ lm_DefineWindowProps(JSContext *cx, MochaDecoder *decoder)
lm_InitImageClass(decoder) &&
lm_InitAnchorClass(decoder) &&
#ifdef DOM
/* the order of lm_DOMInit* is significant -- be careful */
lm_DOMInit(decoder) &&
lm_InitSpanClass(decoder) &&
lm_InitTransclusionClass(decoder) &&
#endif
lm_InitBuiltinClass(decoder) &&
lm_InitInputClasses(decoder) &&
@ -3496,11 +3484,6 @@ lm_FreeWindowContent(MochaDecoder *decoder, JSBool fromDiscard)
#endif
CLEAR(decoder->pkcs11);
#ifdef DOM
CLEAR(decoder->span_prototype);
CLEAR(decoder->transclusion_prototype);
#endif
/* Drop ad-hoc GC roots, but not opener -- it survives unloads. */
CLEAR(decoder->event_receiver);