mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-02 11:21:42 +00:00
Code Issues Releases Activity

* xmenu.c (xdialog_show): Remove prototype, rename to

Browse Source 
x_dialog_show, remove 2nd arg because it's always zero
and simplify accordingly.
(xw_popup_dialog): Adjust user.
* w32menu.c (w32_dialog_show): Adjust prototype, remove
2nd arg because it's always zero and simplify accordingly.
(w32_popup_dialog): Adjust user.
This commit is contained in:
Dmitry Antipov 2014-05-29 21:16:00 +04:00
parent bd5b233d48
commit f1b447932d
3 changed files with 24 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ChangeLog
View File

@ -1,3 +1,13 @@
2014-05-29 Dmitry Antipov <dmantipov@yandex.ru>
* xmenu.c (xdialog_show): Remove prototype, rename to
x_dialog_show, remove 2nd arg because it's always zero
and simplify accordingly.
(xw_popup_dialog): Adjust user.
* w32menu.c (w32_dialog_show): Adjust prototype, remove
2nd arg because it's always zero and simplify accordingly.
(w32_popup_dialog): Adjust user.
2014-05-29 Eli Zaretskii <eliz@gnu.org>
* w32heap.c (report_temacs_memory_usage): New function.

34
src/w32menu.c
View File

@ -103,7 +103,7 @@ Lisp_Object Qdebug_on_next_call, Qunsupported__w32_dialog;
void set_frame_menubar (struct frame *, bool, bool);
#ifdef HAVE_DIALOGS
static Lisp_Object w32_dialog_show (struct frame *, int, Lisp_Object, char**);
static Lisp_Object w32_dialog_show (struct frame *, Lisp_Object, Lisp_Object, char **);
#else
static int is_simple_dialog (Lisp_Object);
static Lisp_Object simple_dialog_show (struct frame *, Lisp_Object, Lisp_Object);
@ -141,7 +141,7 @@ w32_popup_dialog (struct frame *f, Lisp_Object header, Lisp_Object contents)
/* Display them in a dialog box. */
block_input ();
selection = w32_dialog_show (f, 0, title, header, &error_name);
selection = w32_dialog_show (f, title, header, &error_name);
unblock_input ();
discard_menu_items ();
@ -904,9 +904,8 @@ static char * button_names [] = {
"button6", "button7", "button8", "button9", "button10" };
static Lisp_Object
w32_dialog_show (struct frame *f, int keymaps,
Lisp_Object title, Lisp_Object header,
char **error)
w32_dialog_show (struct frame *f, Lisp_Object title,
Lisp_Object header, char **error)
{
int i, nb_buttons = 0;
char dialog_name[6];
@ -930,16 +929,13 @@ w32_dialog_show (struct frame *f, int keymaps,
/* Create a tree of widget_value objects
representing the text label and buttons. */
{
Lisp_Object pane_name, prefix;
Lisp_Object pane_name;
char *pane_string;
pane_name = AREF (menu_items, MENU_ITEMS_PANE_NAME);
prefix = AREF (menu_items, MENU_ITEMS_PANE_PREFIX);
pane_string = (NILP (pane_name)
? "" : SSDATA (pane_name));
prev_wv = xmalloc_widget_value ();
prev_wv->value = pane_string;
if (keymaps && !NILP (prefix))
prev_wv->name++;
prev_wv->enabled = 1;
prev_wv->name = "message";
prev_wv->help = Qnil;
@ -1052,32 +1048,18 @@ w32_dialog_show (struct frame *f, int keymaps,
the proper value. */
if (menu_item_selection != 0)
{
Lisp_Object prefix;
prefix = Qnil;
i = 0;
while (i < menu_items_used)
{
Lisp_Object entry;
if (EQ (AREF (menu_items, i), Qt))
{
prefix = AREF (menu_items, i + MENU_ITEMS_PANE_PREFIX);
i += MENU_ITEMS_PANE_LENGTH;
}
i += MENU_ITEMS_PANE_LENGTH;
else
{
entry = AREF (menu_items, i + MENU_ITEMS_ITEM_VALUE);
entry = AREF (menu_items, i + MENU_ITEMS_ITEM_VALUE);
if (menu_item_selection == i)
{
if (keymaps != 0)
{
entry = Fcons (entry, Qnil);
if (!NILP (prefix))
entry = Fcons (prefix, entry);
}
return entry;
}
return entry;
i += MENU_ITEMS_ITEM_LENGTH;
}
}

38
src/xmenu.c
View File

@ -110,11 +110,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
static Lisp_Object Qdebug_on_next_call;
#if defined (USE_X_TOOLKIT) || defined (USE_GTK)
static Lisp_Object xdialog_show (struct frame *, bool, Lisp_Object, Lisp_Object,
const char **);
#endif
/* Flag which when set indicates a dialog or menu has been posted by
Xt on behalf of one of the widget sets. */
static int popup_activated_flag;
@ -1839,11 +1834,8 @@ static const char * button_names [] = {
"button6", "button7", "button8", "button9", "button10" };
static Lisp_Object
xdialog_show (struct frame *f,
bool keymaps,
Lisp_Object title,
Lisp_Object header,
const char **error_name)
x_dialog_show (struct frame *f, Lisp_Object title,
Lisp_Object header, const char **error_name)
{
int i, nb_buttons=0;
char dialog_name[6];
@ -1870,16 +1862,13 @@ xdialog_show (struct frame *f,
/* Create a tree of widget_value objects
representing the text label and buttons. */
{
Lisp_Object pane_name, prefix;
Lisp_Object pane_name;
const char *pane_string;
pane_name = AREF (menu_items, MENU_ITEMS_PANE_NAME);
prefix = AREF (menu_items, MENU_ITEMS_PANE_PREFIX);
pane_string = (NILP (pane_name)
? "" : SSDATA (pane_name));
prev_wv = xmalloc_widget_value ();
prev_wv->value = (char *) pane_string;
if (keymaps && !NILP (prefix))
prev_wv->name++;
prev_wv->enabled = 1;
prev_wv->name = "message";
prev_wv->help = Qnil;
@ -1982,20 +1971,13 @@ xdialog_show (struct frame *f,
the proper value. */
if (menu_item_selection != 0)
{
Lisp_Object prefix;
prefix = Qnil;
i = 0;
while (i < menu_items_used)
{
Lisp_Object entry;
if (EQ (AREF (menu_items, i), Qt))
{
prefix
= AREF (menu_items, i + MENU_ITEMS_PANE_PREFIX);
i += MENU_ITEMS_PANE_LENGTH;
}
i += MENU_ITEMS_PANE_LENGTH;
else if (EQ (AREF (menu_items, i), Qquote))
{
/* This is the boundary between left-side elts and
@ -2007,15 +1989,7 @@ xdialog_show (struct frame *f,
entry
= AREF (menu_items, i + MENU_ITEMS_ITEM_VALUE);
if (menu_item_selection == aref_addr (menu_items, i))
{
if (keymaps != 0)
{
entry = list1 (entry);
if (!NILP (prefix))
entry = Fcons (prefix, entry);
}
return entry;
}
return entry;
i += MENU_ITEMS_ITEM_LENGTH;
}
}
@ -2052,7 +2026,7 @@ xw_popup_dialog (struct frame *f, Lisp_Object header, Lisp_Object contents)
/* Display them in a dialog box. */
block_input ();
selection = xdialog_show (f, 0, title, header, &error_name);
selection = x_dialog_show (f, title, header, &error_name);
unblock_input ();
unbind_to (specpdl_count, Qnil);