diff options
| author | Jan Djärv <[email protected]> | 2010-03-22 08:26:56 +0100 |
|---|---|---|
| committer | Jan Djärv <[email protected]> | 2010-03-22 08:26:56 +0100 |
| commit | 93318cbd4081abd95958485429b6fc497089b26e (patch) | |
| tree | c68359bb38469a82c4a63d25e342a21cc41ae968 /src | |
| parent | 4102856c09db692ac87c8214618134826c02fd51 (diff) | |
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).
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 8 | ||||
| -rw-r--r-- | src/dispextern.h | 3 | ||||
| -rw-r--r-- | src/frame.c | 7 | ||||
| -rw-r--r-- | src/xfns.c | 2 |
4 files changed, 18 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index cf9d0fd9be..2609125f9f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2010-03-20 Jan Djärv <[email protected]> + + * 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 <[email protected]> * xfns.c (Fx_create_frame) [USE_LUCID]: Add BLOCK_INPUT around diff --git a/src/dispextern.h b/src/dispextern.h index 01ba3f5418..22d44fc908 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 f05f9f751d..5915c00bca 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 b11a7a5e91..6d041708ee 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, |