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).

4 files changed, 18 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index cf9d0fd9bea..2609125f9fe 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+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>
 
         * xfns.c (Fx_create_frame) [USE_LUCID]: Add BLOCK_INPUT around
diff --git a/src/dispextern.h b/src/dispextern.h
index 01ba3f54181..22d44fc9083 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -3122,7 +3122,8 @@ enum resource_types
   RES_TYPE_FLOAT,
   RES_TYPE_BOOLEAN,
   RES_TYPE_STRING,
-  RES_TYPE_SYMBOL
+  RES_TYPE_SYMBOL,
+  RES_TYPE_BOOLEAN_NUMBER
 };
 
 extern Lisp_Object x_get_arg P_ ((Display_Info *, Lisp_Object,
diff --git a/src/frame.c b/src/frame.c
index f05f9f751da..5915c00bca1 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -4005,6 +4005,13 @@ x_get_arg (dpyinfo, alist, param, attribute, class, type)
             case RES_TYPE_NUMBER:
               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:
               return make_float (atof (SDATA (tem)));
 
diff --git a/src/xfns.c b/src/xfns.c
index b11a7a5e91a..6d041708eec 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3418,7 +3418,7 @@ This function is an internal primitive--use `make-frame' instead.  */)
   init_frame_faces (f);
 
   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),
                        "toolBar", "ToolBar", RES_TYPE_NUMBER);
   x_default_parameter (f, parms, Qbuffer_predicate, Qnil,