annotate etc/schema/xhtml-bform.rnc @ 111512:4f757d8e8ed7

Apply XAtom revork patches from Julien Danjou. * xsettings.c (init_xsettings): Use already fetch atoms. * xsmfns.c (create_client_leader_window): Use SM_CLIENT_ID atom from dpyinfo. * xselect.c (Fx_send_client_event): Split and create x_send_client_event. * lisp.h: Do not EXFUN Fx_send_client_event. * xterm.c (x_set_frame_alpha): Use _NET_WM_WINDOW_OPACITY atom from dpyinfo. (wm_supports): Use atoms from dpyinfo. (do_ewmh_fullscreen): Use atoms from dpyinfo. (x_ewmh_activate_frame): Use atoms from dpyinfo. (xembed_set_info): Use atoms from dpyinfo. (x_term_init): Fetch _XEMBED_INFO, _NET_SUPPORTED, _NET_SUPPORTING_WM_CHECK, _NET_WM_WINDOW_OPACITY and _NET_ACTIVE_WINDOW, XSETTINGS atoms. Get all atoms in one round-trip. (set_wm_state): Use x_send_client_event rather than Fx_send_client_event, using Atom directly. (x_ewmh_activate_frame): Ditto. (x_set_sticky): Pass atoms to set_wm_state. (do_ewmh_fullscreen): Ditto. * xterm.h (x_display_info): Add Xatom_net_supported, Xatom_net_supporting_wm_check, Xatom_net_active_window, Xatom_net_wm_window_opacity, Xatom_XEMBED_INFO, SM_CLIENT_ID. * xfns.c (Fx_show_tip): Fix typo in docstring.
author Jan D. <jan.h.d@swipnet.se>
date Fri, 12 Nov 2010 10:31:44 +0100
parents 9e48c9dc543f
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
87294
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1 # Simplified Forms Module
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
3 form =
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
4 element form {
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
5 form.attlist,
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
6 # Don't use Block.model, because this gets redefined by the
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
7 # legacy module.
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
8 Block.class+
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
9 }
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
10 form.attlist =
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
11 Common.attrib,
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
12 attribute action { URI.datatype },
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
13 attribute method { "get" | "post" }?,
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
14 attribute enctype { ContentType.datatype }?
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
15 label = element label { label.attlist, Inline.model }
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
16 label.attlist =
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
17 Common.attrib,
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
18 attribute for { IDREF.datatype }?,
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
19 attribute accesskey { Character.datatype }?
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
20 input = element input { input.attlist }
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
21 input.attlist =
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
22 Common.attrib,
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
23 attribute type { InputType.class }?,
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
24 attribute name { text }?,
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
25 attribute value { text }?,
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
26 attribute checked { "checked" }?,
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
27 attribute size { text }?,
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
28 attribute maxlength { Number.datatype }?,
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
29 attribute src { URI.datatype }?,
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
30 attribute accesskey { Character.datatype }?
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
31 InputType.class =
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
32 "text"
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
33 | "password"
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
34 | "checkbox"
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
35 | "radio"
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
36 | "submit"
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
37 | "reset"
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
38 | "hidden"
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
39 select = element select { select.attlist, option+ }
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
40 select.attlist =
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
41 Common.attrib,
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
42 attribute name { text }?,
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
43 attribute size { Number.datatype }?,
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
44 attribute multiple { "multiple" }?
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
45 option =
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
46 element option {
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
47 Common.attrib,
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
48 attribute selected { "selected" }?,
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
49 attribute value { text }?,
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
50 text
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
51 }
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
52 textarea = element textarea { textarea.attlist }
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
53 textarea.attlist =
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
54 Common.attrib,
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
55 attribute name { text }?,
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
56 attribute rows { Number.datatype },
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
57 attribute cols { Number.datatype },
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
58 attribute accesskey { Character.datatype }?,
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
59 text
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
60 Form.class = form
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
61 Formctrl.class = input | label | select | textarea
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
62 Block.class |= Form.class
9e48c9dc543f Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
63 Inline.class |= Formctrl.class