Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-30 00:01:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Ender: make toolbars update as cursor or selection is moved.

Browse Source
This commit is contained in:
akkana%netscape.com 1998-08-25 23:10:27 +00:00
parent ba073c0f69
commit efe89d97b4
5 changed files with 137 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cmd/xfe/editor.c
View File

@ -6373,19 +6373,22 @@ fe_EditorGrabFocus(MWContext* context, XEvent *event)
}
else
{
#ifdef ENDER
/* See if we're in an HTML textarea -- if so, we need to fiddle
* with toolbars to indicate which area has focus.
*/
if (EDITOR_CONTEXT_DATA(context)->embedded)
XFE_EmbeddedEditorViewFocus(context);
#endif /* ENDER */
edElement = 0;
}
crossedCellBoundary = FALSE;
}
EDT_StartSelection(context, x, y);
#ifdef ENDER
/* See if we're in an HTML textarea -- if so, we need to
* fiddle with toolbars to indicate which area has focus.
* This has to happen *after* EDT_StartSelection
* so the EditorView knows where the cursor has moved.
*/
if (EDITOR_CONTEXT_DATA(context)->embedded)
XFE_EmbeddedEditorViewFocus(context);
#endif /* ENDER */
}
/* We never call fe_EditorSelectionBegin(), as far as I can tell. ...Akk */

7
cmd/xfe/src/BrowserFrame.cpp
View File

@ -275,7 +275,7 @@ static ToolbarSpec editor_style_toolbar_spec[] = {
{ xfeCmdToggleCharacterStyleBold, TOGGLEBUTTON, &ed_bold_group },
{ xfeCmdToggleCharacterStyleItalic, TOGGLEBUTTON, &ed_italic_group },
{ xfeCmdToggleCharacterStyleUnderline, TOGGLEBUTTON, &ed_underline_group },
{ xfeCmdClearAllStyles, PUSHBUTTON , &ed_clear_group },
// { xfeCmdClearAllStyles, PUSHBUTTON , &ed_clear_group },
TOOLBAR_SEPARATOR,
{ xfeCmdInsertBulletedList, TOGGLEBUTTON, &ed_bullet_group },
@ -451,9 +451,8 @@ XFE_BrowserFrame::showEditorToolbar(XFE_View* view)
if (view)
m_editorStyleToolbar->setCommandDispatcher(view);
m_editorStyleToolbar->update();
// XXX Need to find a way to reset the toolbar to reflect
// what's selected in the current view. This doesn't do it:
//m_editorStyleToolbar->updateCommand(0);
// Update the toolbar to reflect the current view and cursor location:
m_editorStyleToolbar->updateCommand(0);
m_editorStyleToolbar->show();
}
}

139
cmd/xfe/src/EditorToolbar.cpp
View File

@ -22,7 +22,7 @@
* EditorToolbar.cpp --- Toolbar for Editor and HTML Mail Compose.
*
* Created: David Williams <djw@netscape.com>, Feb-7-1997
* RCSID: "$Id: EditorToolbar.cpp,v 3.3 1998/08/21 23:02:19 akkana%netscape.com Exp $"
* RCSID: "$Id: EditorToolbar.cpp,v 3.4 1998/08/25 23:10:26 akkana%netscape.com Exp $"
*
*----------------------------------------------------------------------------
*/
@ -291,11 +291,17 @@ void XFE_ActionMenuItem::doCommand(XFE_CommandInfo* info)
}
void
XFE_EditorToolbarPushButton::update()
XFE_EditorToolbarPushButton::update(XFE_Component* dispatcher)
{
XFE_CommandInfo e_info(XFE_COMMAND_BUTTON_ACTIVATE, m_widget);
Boolean sensitive = False;
//
// Do we have a command dispatcher?
//
if (dispatcher == 0)
dispatcher = getParentFrame();
//
// Do we have a command handler?
//
@ -303,7 +309,12 @@ XFE_EditorToolbarPushButton::update()
m_cmd_handler = getCommand(m_cmd_id);
if (m_cmd_handler != NULL)
sensitive = m_cmd_handler->isEnabled(getParentFrame(), &e_info);
{
if (dispatcher->isClassOf("Frame"))
sensitive = m_cmd_handler->isEnabled((XFE_Frame*)dispatcher, &e_info);
else if (dispatcher->isClassOf("View"))
sensitive = m_cmd_handler->isEnabled((XFE_View*)dispatcher, &e_info);
}
XtVaSetValues(m_widget, XtNsensitive, sensitive, 0);
}
@ -392,13 +403,18 @@ tb_valuechanged_cb(Widget widget, XtPointer closure, XtPointer cb_d)
}
void
XFE_EditorToolbarToggleButton::update()
XFE_EditorToolbarToggleButton::update(XFE_Component* dispatcher)
{
XFE_CommandInfo e_info(XFE_COMMAND_BUTTON_ACTIVATE, m_widget);
Boolean sensitive = False;
Boolean selected = False;
Boolean determinate = True;
XFE_Frame* frame = getParentFrame();
//
// Do we have a command dispatcher?
//
if (dispatcher == 0)
dispatcher = getParentFrame();
//
// Do we have a command handler?
@ -406,11 +422,23 @@ XFE_EditorToolbarToggleButton::update()
if (!m_cmd_handler)
m_cmd_handler = getCommand(m_cmd_id);
if (m_cmd_handler != NULL) {
sensitive = m_cmd_handler->isEnabled(frame, &e_info);
selected = m_cmd_handler->isSelected(frame, &e_info);
determinate = m_cmd_handler->isDeterminate(frame, &e_info);
}
if (m_cmd_handler != NULL)
{
if (dispatcher->isClassOf("Frame"))
{
sensitive = m_cmd_handler->isEnabled((XFE_Frame*)dispatcher, &e_info);
selected = m_cmd_handler->isSelected((XFE_Frame*)dispatcher, &e_info);
determinate = m_cmd_handler->isDeterminate((XFE_Frame*)dispatcher,
&e_info);
}
else if (dispatcher->isClassOf("View"))
{
sensitive = m_cmd_handler->isEnabled((XFE_View*)dispatcher, &e_info);
selected = m_cmd_handler->isSelected((XFE_View*)dispatcher, &e_info);
determinate = m_cmd_handler->isDeterminate((XFE_View*)dispatcher,
&e_info);
}
}
XtVaSetValues(m_widget,
XtNsensitive, sensitive,
@ -472,7 +500,7 @@ public:
XFE_ComboList(Widget parent,
ToolbarSpec* spec,
XFE_Component* tb);
virtual void update() = 0;
virtual void update(XFE_Component* dispatcher = 0) = 0;
virtual void itemSelected(unsigned index) = 0;
void selectItem(int index);
void addItems(XFE_CommandParameters* list);
@ -596,7 +624,7 @@ public:
ToolbarSpec* spec,
XFE_Component* tb);
void itemSelected(unsigned index);
void update();
void update(XFE_Component* dispatcher = 0);
protected:
XFE_CommandParameters* m_params;
@ -637,21 +665,35 @@ XFE_SmartComboList::itemSelected(unsigned index)
}
void
XFE_SmartComboList::update()
XFE_SmartComboList::update(XFE_Component* dispatcher)
{
XFE_Frame* frame = getParentFrame();
int index = -1;
//
// Do we have a command dispatcher?
//
if (dispatcher == 0)
dispatcher = getParentFrame();
//
// Do we have a command handler?
//
if (!m_cmd_handler)
m_cmd_handler = getCommand();
if (m_cmd_handler != NULL) {
if (!m_params) {
m_params = m_cmd_handler->getParameters(frame);
addItems(m_params);
if (dispatcher->isClassOf("Frame"))
m_params = m_cmd_handler->getParameters((XFE_Frame*)dispatcher);
else if (dispatcher->isClassOf("View"))
m_params = m_cmd_handler->getParameters((XFE_View*)dispatcher);
addItems(m_params);
}
index = m_cmd_handler->getParameterIndex(frame);
if (dispatcher->isClassOf("Frame"))
index = m_cmd_handler->getParameterIndex((XFE_Frame*)dispatcher);
else if (dispatcher->isClassOf("View"))
index = m_cmd_handler->getParameterIndex((XFE_View*)dispatcher);
}
selectItem(index);
@ -732,21 +774,34 @@ public:
XFE_Component* tb);
void doIndex(unsigned index);
void updateDisplayed(int index);
void update();
void update(XFE_Component* dispatcher = 0);
XP_Bool showsUpdate() { return TRUE; };
};
void
XFE_AlignmentMenu::update()
XFE_AlignmentMenu::update(XFE_Component* dispatcher)
{
XFE_Frame* frame = getParentFrame();
int index = -1;
//
// Do we have a command dispatcher?
//
if (dispatcher == 0)
dispatcher = getParentFrame();
//
// Do we have a command handler?
//
if (!m_cmd_handler)
m_cmd_handler = getParentFrame()->getCommand(m_cmd_id);
if (m_cmd_handler != NULL)
index = m_cmd_handler->getParameterIndex(frame);
{
if (dispatcher->isClassOf("Frame"))
index = m_cmd_handler->getParameterIndex((XFE_Frame*)dispatcher);
else if (dispatcher->isClassOf("View"))
index = m_cmd_handler->getParameterIndex((XFE_View*)dispatcher);
}
updateDisplayed(index);
}
@ -846,7 +901,7 @@ public:
ToolbarSpec* spec,
XFE_Component* tb);
void setValue(LO_Color* color);
void update();
void update(XFE_Component* dispatcher = 0);
protected:
void instanciateMenu();
Widget m_arrow;
@ -1220,12 +1275,23 @@ XFE_ColorMenu::XFE_ColorMenu(Widget parent,
}
void
XFE_ColorMenu::update()
XFE_ColorMenu::update(XFE_Component* dispatcher)
{
XFE_Frame* frame = getParentFrame();
MWContext* context = frame->getContext();
LO_Color color;
//
// Do we have a command dispatcher?
//
if (dispatcher == 0)
dispatcher = getParentFrame();
MWContext* context;
if (dispatcher->isClassOf("Frame"))
context = ((XFE_Frame*)dispatcher)->getContext();
else if (dispatcher->isClassOf("View"))
context = ((XFE_View*)dispatcher)->getContext();
//
// Do we have a command handler?
//
if (!m_cmd_handler)
m_cmd_handler = getParentFrame()->getCommand(m_cmd_id);
@ -1234,7 +1300,14 @@ XFE_ColorMenu::update()
Pixel pixel;
if (m_cmd_handler->isDeterminate(frame, 0)) { /* is it defined */
Boolean is_determinate = FALSE;
if (dispatcher->isClassOf("Frame"))
is_determinate = m_cmd_handler->isDeterminate((XFE_Frame*)dispatcher, 0);
else if (dispatcher->isClassOf("View"))
is_determinate = m_cmd_handler->isDeterminate((XFE_View*)dispatcher, 0);
LO_Color color;
if (is_determinate) { /* is it defined */
fe_EditorColorGet(context, &color);
pixel = fe_GetPixel(context, color.red, color.green, color.blue);
} else {
@ -1356,12 +1429,12 @@ XFE_EditorToolbar::findButton(const char* /*name*/,
}
static void
update_children(Widget parent, CommandType cmd)
update_children(Widget parent, CommandType cmd, XFE_Component* dispatcher)
{
Widget* children;
int nchildren;
int i;
XtVaGetValues(parent,
XmNchildren, &children,
XmNnumChildren, &nchildren,
@ -1373,12 +1446,11 @@ update_children(Widget parent, CommandType cmd)
if (!menu_item)
continue;
if ((cmd == 0 || menu_item->getCmdId() == cmd)
&&
menu_item->showsUpdate()) {
menu_item->update();
menu_item->update(dispatcher);
}
}
}
@ -1389,7 +1461,7 @@ XFE_EditorToolbar::updateCommand(CommandType cmd)
if (!XtIsManaged(m_widget))
return;
update_children(m_rowcol, cmd);
update_children(m_rowcol, cmd, m_cmdDispatcher);
}
void
@ -1401,7 +1473,8 @@ XFE_EditorToolbar::update()
void
XFE_EditorToolbar::show()
{
update_children(m_rowcol, 0); // skip the updateCommand() managed check.
update_children(m_rowcol, 0, m_cmdDispatcher);
// skip the updateCommand() managed check.
XFE_ToolboxItem::show();
}

8
cmd/xfe/src/EditorToolbar.h
View File

@ -22,7 +22,7 @@
* EditorToolbar.h --- Toolbar for Editor and HTML Mail Compose.
*
* Created: David Williams <djw@netscape.com>, Feb-7-1997
* RCSID: "$Id: EditorToolbar.h,v 3.3 1998/08/13 21:50:59 akkana%netscape.com Exp $"
* RCSID: "$Id: EditorToolbar.h,v 3.4 1998/08/25 23:10:26 akkana%netscape.com Exp $"
*
*----------------------------------------------------------------------------
*/
@ -73,7 +73,7 @@ class XFE_AbstractMenuItem : public XFE_Component
{
public:
// methods
virtual void update() { };
virtual void update(XFE_Component* /*dispatcher*/ = 0) { };
virtual CommandType getCmdId() = 0;
virtual XP_Bool showsUpdate() { return TRUE; };
};
@ -155,7 +155,7 @@ public:
XFE_EditorToolbarPushButton(Widget parent,
ToolbarSpec* spec,
XFE_Component* tb);
void update();
void update(XFE_Component* dispatcher=0);
};
class XFE_EditorToolbarToggleButton : public XFE_EditorToolbarItem
@ -165,7 +165,7 @@ public:
ToolbarSpec* spec,
XFE_Component* tb);
void update();
void update(XFE_Component* dispatcher=0);
};
class XFE_EditorToolbarRadioButton : public XFE_EditorToolbarToggleButton

20
cmd/xfe/src/EmbeddedEditorView.cpp
View File

@ -49,6 +49,7 @@ int fe_add_to_all_MWContext_list(MWContext *context);
int fe_remove_from_all_MWContext_list(MWContext *context);
void fe_find_scrollbar_sizes(MWContext *context);
void fe_get_final_context_resources(MWContext *context);
void XFE_EmbeddedEditorViewFocus(MWContext* context);
}
@ -68,6 +69,8 @@ XFE_EmbeddedEditorView::XFE_EmbeddedEditorView(XFE_Component *toplevel_component
XFE_EmbeddedEditorView::~XFE_EmbeddedEditorView()
{
XFE_EmbeddedEditorViewFocus(0);
XFE_View *parent_view = getParent();
if (parent_view)
@ -180,7 +183,7 @@ XFE_CreateEmbeddedEditor(Widget parent, int32 cols, int32 rows,
eev->getURL(url);
// Show the editor toolbars in the containing Frame:
// XXX NOTE! This needs to be redone when we support
// XXX NOTE! This will need to be redone when we support
// an embedded editor inside an EditorFrame.
XFE_BrowserFrame* bf = (XFE_BrowserFrame*)frame;
if (bf)
@ -193,26 +196,31 @@ extern "C" void
XFE_EmbeddedEditorViewFocus(MWContext* context)
{
static Widget currentFrame = 0;
if (currentFrame)
XtVaSetValues(currentFrame, XmNshadowType, XmSHADOW_ETCHED_IN, 0);
if (context == 0)
{
currentFrame = 0;
return;
}
XFE_Frame *frame = fe_getFrameFromContext(context);
XFE_EmbeddedEditorView* eev = 0;
XP_ASSERT(frame);
XFE_EmbeddedEditorView* eev = 0;
if (frame)
eev = (XFE_EmbeddedEditorView*)frame->widgetToView(CONTEXT_DATA(context)->drawing_area);
XP_ASSERT(eev);
if (!eev)
return;
if (currentFrame)
XtVaSetValues(currentFrame, XmNshadowType, XmSHADOW_ETCHED_IN, 0);
Widget embedFrame = XtParent(XtParent(CONTEXT_DATA(context)->drawing_area));
XtVaSetValues(embedFrame, XmNshadowType, XmSHADOW_IN, 0);
currentFrame = embedFrame;
XFE_BrowserFrame* bf = (XFE_BrowserFrame*)frame;
if (bf)
{
bf->showEditorToolbar(eev);
}
}
extern "C" MWContext *