Commit 93318cbd authored by Jan Djärv's avatar Jan Djärv

bug #5736: Allow X-resource menuBar to take on/off as documented.

* frame.c (x_get_arg): Handle RES_TYPE_BOOLEAN_NUMBER (bug #5736).

* xfns.c (Fx_create_frame): Make menuBar a RES_TYPE_BOOLEAN_NUMBER.

* dispextern.h (resource_types): RES_TYPE_BOOLEAN_NUMBER is new.

* xresources.texi (Table of Resources): Clarify toolBar number
for Gtk+.

* frames.texi (Menu Bars): menuBarLines => menuBar (bug#5736).
parent 4102856c
2010-03-20 Jan Djärv <jan.h.d@swipnet.se>
* xresources.texi (Table of Resources): Clarify toolBar number
for Gtk+.
* frames.texi (Menu Bars): menuBarLines => menuBar (bug#5736).
2010-03-21 Chong Yidong <cyd@stupidchicken.com> 2010-03-21 Chong Yidong <cyd@stupidchicken.com>
* dired.texi (Dired Updating): Document dired-auto-revert-buffer. * dired.texi (Dired Updating): Document dired-auto-revert-buffer.
...@@ -18,6 +25,7 @@ ...@@ -18,6 +25,7 @@
* xresources.texi (Table of Resources): * xresources.texi (Table of Resources):
* mule.texi (Defining Fontsets, Charsets): Update xrefs. * mule.texi (Defining Fontsets, Charsets): Update xrefs.
>>>>>>> MERGE-SOURCE
2010-03-06 Chong Yidong <cyd@stupidchicken.com> 2010-03-06 Chong Yidong <cyd@stupidchicken.com>
* custom.texi (Init Examples): Add xref to Locals. * custom.texi (Init Examples): Add xref to Locals.
......
...@@ -1224,7 +1224,7 @@ menu-bar-mode} or by customizing the variable @code{menu-bar-mode}. ...@@ -1224,7 +1224,7 @@ menu-bar-mode} or by customizing the variable @code{menu-bar-mode}.
With no argument, this command toggles Menu Bar mode, a With no argument, this command toggles Menu Bar mode, a
minor mode. With an argument, the command turns Menu Bar mode on if the minor mode. With an argument, the command turns Menu Bar mode on if the
argument is positive, off if the argument is not positive. You can use argument is positive, off if the argument is not positive. You can use
the X resource @samp{menuBarLines} to control the initial setting of the X resource @samp{menuBar} to control the initial setting of
Menu Bar mode. @xref{Resources}. Menu Bar mode. @xref{Resources}.
@kindex C-Mouse-3 @r{(when menu bar is disabled)} @kindex C-Mouse-3 @r{(when menu bar is disabled)}
......
...@@ -307,12 +307,14 @@ Name to display in the title bar of the initial Emacs frame. ...@@ -307,12 +307,14 @@ Name to display in the title bar of the initial Emacs frame.
@item @code{toolBar} (class @code{ToolBar}) @item @code{toolBar} (class @code{ToolBar})
@cindex tool bar @cindex tool bar
Number of lines to reserve for the tool bar. A zero value suppresses Number of lines to reserve for the tool bar. A zero value suppresses
the tool bar. If the value is non-zero and the tool bar. For the Emacs tool bar (i.e. not Gtk+), if the value is
@code{auto-resize-tool-bars} is non-@code{nil}, the tool bar's size non-zero and @code{auto-resize-tool-bars} is non-@code{nil}, the tool bar's
will be changed automatically so that all tool bar items are visible. size will be changed automatically so that all tool bar items are visible.
If the value of @code{auto-resize-tool-bars} is @code{grow-only}, If the value of @code{auto-resize-tool-bars} is @code{grow-only},
the tool bar expands automatically, but does not contract automatically. the tool bar expands automatically, but does not contract automatically.
To contract the tool bar, you must redraw the frame by entering @kbd{C-l}. To contract the tool bar, you must redraw the frame by entering @kbd{C-l}.
For the Gtk+ tool bar, any non-zero value means on and
@code{auto-resize-tool-bars} has no effect.
@item @code{useXIM} (class @code{UseXIM}) @item @code{useXIM} (class @code{UseXIM})
@cindex XIM @cindex XIM
......
2010-03-20 Jan Djärv <jan.h.d@swipnet.se>
* frame.c (x_get_arg): Handle RES_TYPE_BOOLEAN_NUMBER (bug #5736).
* xfns.c (Fx_create_frame): Make menuBar a RES_TYPE_BOOLEAN_NUMBER.
* dispextern.h (resource_types): RES_TYPE_BOOLEAN_NUMBER is new.
2010-03-20 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> 2010-03-20 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* xfns.c (Fx_create_frame) [USE_LUCID]: Add BLOCK_INPUT around * xfns.c (Fx_create_frame) [USE_LUCID]: Add BLOCK_INPUT around
......
...@@ -3122,7 +3122,8 @@ enum resource_types ...@@ -3122,7 +3122,8 @@ enum resource_types
RES_TYPE_FLOAT, RES_TYPE_FLOAT,
RES_TYPE_BOOLEAN, RES_TYPE_BOOLEAN,
RES_TYPE_STRING, RES_TYPE_STRING,
RES_TYPE_SYMBOL RES_TYPE_SYMBOL,
RES_TYPE_BOOLEAN_NUMBER
}; };
extern Lisp_Object x_get_arg P_ ((Display_Info *, Lisp_Object, extern Lisp_Object x_get_arg P_ ((Display_Info *, Lisp_Object,
......
...@@ -4005,6 +4005,13 @@ x_get_arg (dpyinfo, alist, param, attribute, class, type) ...@@ -4005,6 +4005,13 @@ x_get_arg (dpyinfo, alist, param, attribute, class, type)
case RES_TYPE_NUMBER: case RES_TYPE_NUMBER:
return make_number (atoi (SDATA (tem))); return make_number (atoi (SDATA (tem)));
case RES_TYPE_BOOLEAN_NUMBER:
if (!strcmp (SDATA (tem), "on")
|| !strcmp (SDATA (tem), "true"))
return make_number (1);
return make_number (atoi (SDATA (tem)));
break;
case RES_TYPE_FLOAT: case RES_TYPE_FLOAT:
return make_float (atof (SDATA (tem))); return make_float (atof (SDATA (tem)));
......
...@@ -3418,7 +3418,7 @@ This function is an internal primitive--use `make-frame' instead. */) ...@@ -3418,7 +3418,7 @@ This function is an internal primitive--use `make-frame' instead. */)
init_frame_faces (f); init_frame_faces (f);
x_default_parameter (f, parms, Qmenu_bar_lines, make_number (1), x_default_parameter (f, parms, Qmenu_bar_lines, make_number (1),
"menuBar", "MenuBar", RES_TYPE_NUMBER); "menuBar", "MenuBar", RES_TYPE_BOOLEAN_NUMBER);
x_default_parameter (f, parms, Qtool_bar_lines, make_number (1), x_default_parameter (f, parms, Qtool_bar_lines, make_number (1),
"toolBar", "ToolBar", RES_TYPE_NUMBER); "toolBar", "ToolBar", RES_TYPE_NUMBER);
x_default_parameter (f, parms, Qbuffer_predicate, Qnil, x_default_parameter (f, parms, Qbuffer_predicate, Qnil,
......
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