-/* This file is part of
-* ======================================================
-*
-* LyX, The Document Processor
-*
-* Copyright 1999-2001 The LyX Team.
-*
-* ======================================================*/
+/**
+ * \file Menubar_pimpl.C
+ * Copyright 1999-2001 The LyX Team.
+ * See the file COPYING.
+ *
+ * \author Lars Gullik Bjønnes, larsbj@lyx.org
+ */
#include <config.h>
using std::vector;
using std::max;
using std::min;
+using std::for_each;
typedef vector<int>::size_type size_type;
// Some constants
int const MENU_LABEL_SIZE = FL_NORMAL_SIZE;
+int const MENU_LABEL_STYLE = FL_NORMAL_STYLE;
int const mheight = 30;
int const mbheight= 22;
// where to place the menubar?
int const yloc = (mheight - mbheight)/2; //air + bw;
int const mbadd = 20; // menu button add (to width)
-// Some space between buttons on the menubar
+// Some space between buttons on the menubar
int const air = 2;
char const * menu_tabstop = "aa";
char const * default_tabstop = "aaaaaaaa";
// We do not want to mix position values in a menu (like the index of
// a submenu) with the action numbers which convey actual information.
// Therefore we offset all the action values by an arbitrary large
-// constant.
+// constant.
int const action_offset = 1000;
// This is used a few times below.
inline
-int string_width(string const & str)
+int string_width(string const & str)
{
- return fl_get_string_widthTAB(FL_NORMAL_STYLE, MENU_LABEL_SIZE,
+ return fl_get_string_widthTAB(MENU_LABEL_STYLE, MENU_LABEL_SIZE,
str.c_str(),
static_cast<int>(str.length()));
}
} // namespace anon
-//Defined later, used in makeMenubar().
-extern "C"
-void C_Menubar_Pimpl_MenuCallback(FL_OBJECT * ob, long button);
+extern "C" {
+
+ //Defined later, used in makeMenubar().
+ static
+ void C_Menubar_Pimpl_MenuCallback(FL_OBJECT * ob, long button)
+ {
+ Menubar::Pimpl::MenuCallback(ob, button);
+ }
+
+}
-Menubar::Pimpl::Pimpl(LyXView * view, MenuBackend const & mb)
+Menubar::Pimpl::Pimpl(LyXView * view, MenuBackend const & mb)
: owner_(view), menubackend_(&mb), current_group_(0)
{
for (MenuBackend::const_iterator menu = menubackend_->begin();
- menu != menubackend_->end() ; ++menu) {
+ menu != menubackend_->end() ; ++menu) {
if (menu->menubar()) {
FL_OBJECT * group = fl_bgn_group();
makeMenubar(*menu);
void Menubar::Pimpl::makeMenubar(Menu const & menu)
{
- FL_FORM * form = static_cast<XFormsView *>(owner_)->getForm();
+ FL_FORM * form = static_cast<XFormsView *>(owner_)->getForm();
int moffset = 0;
// Create menu frame if there is non yet.
FL_OBJECT * frame = fl_add_frame(FL_UP_FRAME, 0, 0,
form->w, mheight, "");
fl_set_object_resize(frame, FL_RESIZE_ALL);
- fl_set_object_gravity(frame, NorthWestGravity,
+ fl_set_object_gravity(frame, NorthWestGravity,
NorthEastGravity);
Menu::const_iterator i = menu.begin();
FL_OBJECT * obj;
if (i->kind() != MenuItem::Submenu) {
lyxerr << "ERROR: Menubar::Pimpl::createMenubar:"
- " only submenus can appear in a menubar";
- break;
+ " only submenus can appear in a menubar"
+ << endl;
+ continue;
}
string const label = i->label();
string const shortcut = "#" + i->shortcut();
obj = fl_add_button(FL_MENU_BUTTON,
air + moffset, yloc,
width + mbadd,
- mbheight,
+ mbheight,
label.c_str());
fl_set_object_boxtype(obj, FL_FLAT_BOX);
fl_set_object_color(obj, FL_MCOL, FL_MCOL);
fl_set_object_lsize(obj, MENU_LABEL_SIZE);
- fl_set_object_lstyle(obj, FL_NORMAL_STYLE);
+ fl_set_object_lstyle(obj, MENU_LABEL_STYLE);
fl_set_object_resize(obj, FL_RESIZE_ALL);
- fl_set_object_gravity(obj, NorthWestGravity,
+ fl_set_object_gravity(obj, NorthWestGravity,
NorthWestGravity);
moffset += obj->w + air;
fl_set_object_shortcut(obj, shortcut.c_str(), 1);
}
-void Menubar::Pimpl::set(string const & menu_name)
+void Menubar::Pimpl::set(string const & menu_name)
{
- lyxerr[Debug::GUI] << "Entering Menubar::Pimpl::set "
+ lyxerr[Debug::GUI] << "Entering Menubar::Pimpl::set "
<< "for menu `" << menu_name << "'" << endl;
if (menu_name != current_menu_name_) {
<< current_group_ << endl;
fl_hide_object(current_group_);
}
-
+
lyxerr[Debug::GUI] << " showing group "
<< mbit->second << endl;
fl_show_object(mbit->second);
} else
lyxerr [Debug::GUI] << "Menubar::Pimpl::set: Nothing to do."
<< endl;
-}
+}
void Menubar::Pimpl::openByName(string const & name)
#endif
}
-} // namespace anon
void add_toc2(int menu, string const & extra_label,
}
}
+} // namespace anon
+
void Menubar::Pimpl::add_toc(int menu, string const & extra_label,
vector<int> & smn, Window win)
if (cit->first == "TOC") continue;
// All the rest is for floats
- int menu2 = get_new_submenu(smn, win);
+ int menu_first_sub = get_new_submenu(smn, win);
+ int menu_current = menu_first_sub;
Buffer::SingleList::const_iterator ccit = cit->second.begin();
Buffer::SingleList::const_iterator eend = cit->second.end();
+ size_type count = 0;
for (; ccit != eend; ++ccit) {
+ ++count;
+ if (count > max_number_of_items) {
+ int menu_tmp = get_new_submenu(smn, win);
+ string label = _("More");
+ label += "...%m";
+ fl_addtopup(menu_current, label.c_str(), menu_tmp);
+ count = 1;
+ menu_current = menu_tmp;
+ }
int const action =
lyxaction
.getPseudoAction(LFUN_GOTO_PARAGRAPH,
string label = fixlabel(ccit->str);
label = limit_string_length(label);
label += "%x" + tostr(action + action_offset);
- fl_addtopup(menu2, label.c_str());
+ fl_addtopup(menu_current, label.c_str());
}
string const m = floatList[cit->first]->second.name() + "%m";
- fl_addtopup(menu, m.c_str(), menu2);
+ fl_addtopup(menu, m.c_str(), menu_first_sub);
}
-
-
+
+
// Handle normal TOC
cit = toc_list.find("TOC");
if (cit == end) {
}
-int Menubar::Pimpl::create_submenu(Window win, LyXView * view,
- string const & menu_name,
- vector<int> & smn)
+int Menubar::Pimpl::create_submenu(Window win, LyXView * view,
+ string const & menu_name,
+ vector<int> & smn)
{
- if (!menubackend_->hasMenu(menu_name)){
- lyxerr << "ERROR:create_submenu: Unknown menu `"
+ if (!menubackend_->hasMenu(menu_name)) {
+ lyxerr << "ERROR:create_submenu: Unknown menu `"
<< menu_name << "'" << endl;
return -1;
}
int const menu = get_new_submenu(smn, win);
fl_setpup_softedge(menu, true);
fl_setpup_bw(menu, -1);
- lyxerr[Debug::GUI] << "Adding menu " << menu
+ lyxerr[Debug::GUI] << "Adding menu " << menu
<< " in deletion list" << endl;
// Compute the size of the largest label (because xforms is
}
}
}
- lyxerr[Debug::GUI] << "max_width=" << max_width
- << ", widest_label=`" << widest_label
+ lyxerr[Debug::GUI] << "max_width=" << max_width
+ << ", widest_label=`" << widest_label
<< "'" << endl;
// Compute where to put separators
if (i->kind() == MenuItem::Separator)
*last = "%l";
else if (!i->optional() ||
- !(view->getLyXFunc()->getStatus(i->action())
- & func_status::Disabled))
+ !(view->getLyXFunc()->getStatus(i->action()).disabled()))
last = it;
it = extra_labels.begin();
switch (item.kind()) {
case MenuItem::Command: {
- func_status::value_type flag =
- view->getLyXFunc()->getStatus(item.action());
-
+ FuncStatus const flag =
+ view->getLyXFunc()->getStatus(item.action());
// handle optional entries.
- if (item.optional()
- && (flag & func_status::Disabled)) {
- lyxerr[Debug::GUI]
- << "Skipping optional item "
- << item.label() << endl;
+ if (item.optional()
+ && (flag.disabled())) {
+ lyxerr[Debug::GUI]
+ << "Skipping optional item "
+ << item.label() << endl;
break;
}
// Get the keys bound to this action, but keep only the
// first one later
- string const accel = toplevel_keymap->findbinding(item.action());
+ string const accel = toplevel_keymap->findbinding(kb_action(item.action()));
// Build the menu label from all the info
string label = item.label();
if (!accel.empty()) {
// Try to be clever and add just enough
// tabs to align shortcuts.
- do
+ do
label += '\t';
while (string_width(label) < max_width + 5);
label += accel.substr(1,accel.find(']') - 1);
}
label += "%x" + tostr(item.action() + action_offset)
+ extra_label;
-
+
// Modify the entry using the function status
string pupmode;
- if (flag & (func_status::Disabled
- | func_status::Unknown))
- pupmode += "%i";
- if (flag & func_status::ToggleOn)
+ if (flag.onoff(true))
pupmode += "%B";
- if (flag & func_status::ToggleOff)
+ if (flag.onoff(false))
pupmode += "%b";
+ if (flag.disabled() || flag.unknown())
+ pupmode += "%i";
label += pupmode;
// Finally the menu shortcut
if (!shortcut.empty()) {
shortcut += lowercase(shortcut[0]);
label += "%h";
- fl_addtopup(menu, label.c_str(),
+ fl_addtopup(menu, label.c_str(),
shortcut.c_str());
} else
fl_addtopup(menu, label.c_str());
-
- lyxerr[Debug::GUI] << "Command: \""
+
+ lyxerr[Debug::GUI] << "Command: \""
<< lyxaction.getActionName(item.action())
<< "\", binding \"" << accel
- << "\", shortcut \"" << shortcut
+ << "\", shortcut \"" << shortcut
<< "\"" << endl;
break;
}
case MenuItem::Submenu: {
- int submenu = create_submenu(win, view,
+ int submenu = create_submenu(win, view,
item.submenu(), smn);
if (submenu == -1)
return -1;
add_toc(menu, extra_label, smn, win);
break;
- case MenuItem::Documents:
- case MenuItem::Lastfiles:
+ case MenuItem::Documents:
+ case MenuItem::Lastfiles:
case MenuItem::ViewFormats:
case MenuItem::UpdateFormats:
case MenuItem::ExportFormats:
}
-extern "C"
-void C_Menubar_Pimpl_MenuCallback(FL_OBJECT * ob, long button)
-{
- Menubar::Pimpl::MenuCallback(ob, button);
-}
-
-
void Menubar::Pimpl::MenuCallback(FL_OBJECT * ob, long button)
{
ItemInfo * iteminfo = static_cast<ItemInfo *>(ob->u_vdata);
-// lyxerr << "MenuCallback: ItemInfo address=" << iteminfo
-// << "Val=(pimpl_=" << iteminfo->pimpl_
-// << ", item_=" << iteminfo->item_
-// << ", obj_=" << iteminfo->obj_ << ")" <<endl;
+// lyxerr << "MenuCallback: ItemInfo address=" << iteminfo
+// << "Val=(pimpl_=" << iteminfo->pimpl_
+// << ", item_=" << iteminfo->item_
+// << ", obj_=" << iteminfo->obj_ << ")" <<endl;
LyXView * view = iteminfo->pimpl_->owner_;
MenuItem const * item = iteminfo->item_.get();
- /* get the splash out of the way. It would be nicer
- * to only have this code at the start, but xforms
- * makes it too ugly to do
- */
- view->getDialogs()->destroySplash();
-
if (button == 1) {
// set the pseudo menu-button
fl_set_object_boxtype(ob, FL_DOWN_BOX);
// Paranoia check
lyx::Assert(item->kind() == MenuItem::Submenu);
-
+
// set tabstop length
fl_set_tabstop(menu_tabstop);
vector<int> submenus;
int menu = iteminfo->pimpl_->
- create_submenu(FL_ObjWin(ob), view,
+ create_submenu(FL_ObjWin(ob), view,
item->submenu(), submenus);
if (menu != -1) {
// place popup
fl_setpup_position(static_cast<XFormsView *>(view)->getForm()->x + ob->x,
- static_cast<XFormsView *>(view)->getForm()->y + ob->y + ob->h + 10);
+ static_cast<XFormsView *>(view)->getForm()->y + ob->y + ob->h + 10);
int choice = fl_dopup(menu);
-
+
if (button == 1) {
// set the pseudo menu-button back
fl_set_object_boxtype(ob, FL_FLAT_BOX);
// If the action value is too low, then it is not a
// valid action, but something else.
if (choice >= action_offset + 1) {
- view->getLyXFunc()->dispatch(choice - action_offset);
+ view->getLyXFunc()->verboseDispatch(choice - action_offset, true);
} else {
lyxerr[Debug::GUI]
<< "MenuCallback: ignoring bogus action "
} else {
lyxerr << "Error in MenuCallback" << endl;
}
-
- std::for_each(submenus.begin(), submenus.end(), fl_freepup);
+
+ for_each(submenus.begin(), submenus.end(), fl_freepup);
// restore tabstop length
fl_set_tabstop(default_tabstop);
projects / lyx.git / blobdiff