Mercurial > emacs
view src/syntax.h @ 108027:2ba5d029fd5e
Gtk tool bars can be text, icons with text or just icons
* frames.texi (Tool Bars): Add tool-bar-style.
* vc-dir.el (vc-dir-tool-bar-map): Add :label on some tool bar items.
* tool-bar.el (tool-bar-setup): Add :label on some tool bar items.
* loadup.el: Load dynamic-setting.el if feature dynamic-setting
is present.
* info.el (info-tool-bar-map): Add labels.
* cus-start.el (all): Add tool-bar-style and tool-bar-max-label-size.
* cus-edit.el (custom-commands): Add labels for tool bar.
(custom-buffer-create-internal, Custom-mode): Adjust for
labels in custom-commands.
* dynamic-setting.el: Renamed from font-setting.el.
* xsettings.c: Qmonospace_font_name, Qtool_bar_style and
current_tool_bar_style are new.
(store_config_changed_event): Rename from store_font_changed_event.
(XSETTINGS_TOOL_BAR_STYLE): New define.
(SEEN_FONT, SEEN_TB_STYLE): New enum values.
(struct xsettings): Add font and tb_style, set xft stuff inside #ifdef
HAVE_XFT.
(something_changedCB): store_font_changed_event is now
store_config_changed_event
(parse_settings): Rename from parse_xft_settings. Read
non-xft xsettings outside #ifdef HAVE_XFT.
(read_settings): Renamed from read_xft_settings.
(apply_xft_settings): Take current settings as parameter. Do not
call read_(xft)_settings.
(read_and_apply_settings): New function.
(xft_settings_event): Do non-xft stuff out of HAVE_XFT. Call
read_and_apply_settings if there are settings to be read.
(init_xsettings): Renamed from init_xfd_settings.
Call read_and_apply_settings unconditionally.
(xsettings_initialize): Call init_xsettings.
(Ftool_bar_get_system_style): New function.
(syms_of_xsettings): Define Qmonospace_font_name and
Qtool_bar_style. Initialize current_tool_bar_style to nil.
defsubr Stool_bar_get_system_style. Fprovide on
dynamic-setting.
* xsettings.h (Ftool_bar_get_system_style): Declare.
* xdisp.c: Vtool_bar_style, tool_bar_max_label_size,
Qtext, Qboth, Qboth_horiz are new.
(syms_of_xdisp): Intern Qtext, Qboth, Qboth_horiz, DEFVAR
Vtool_bar_style, tool_bar_max_label_size.
* lisp.h: Extern declare Qtext, Qboth, Qboth_horiz.
* keyboard.c: QClabel is new.
(parse_tool_bar_item): Take out QClabel from tool bar items.
Try to construct a label if ther is no QClabel.
(syms_of_keyboard): Intern :label as QClabel.
* dispextern.h (tool_bar_item_idx): TOOL_BAR_ITEM_LABEL is new.
(Vtool_bar_style, tool_bar_max_label_size, DEFAULT_TOOL_BAR_LABEL_SIZE):
New.
* Makefile.in (SOME_MACHINE_LISP): font-setting.el renamed to
dynamic-setting.el.
* gtkutil.c (xg_tool_bar_menu_proxy): Handle label in tool bar item.
(xg_make_tool_item, xg_show_toolbar_item): New function.
(update_frame_tool_bar): Take label from TOOL_BAR_ITEM_LABEL.
Call xg_make_tool_item to make a tool bar item.
Call xg_show_toolbar_item. Use wtoolbar instead of x->toolbar_widget.
* xterm.c (x_draw_image_relief): Take Vtool_bar_button_margin
into account for toolbars.
author | Jan D. <jan.h.d@swipnet.se> |
---|---|
date | Wed, 21 Apr 2010 18:26:09 +0200 |
parents | 14ff9accfbd3 |
children | e16f43875a48 |
line wrap: on
line source
/* Declarations having to do with GNU Emacs syntax tables. Copyright (C) 1985, 1993, 1994, 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. This file is part of GNU Emacs. GNU Emacs is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. GNU Emacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ extern Lisp_Object Qsyntax_table_p; extern void update_syntax_table P_ ((int, int, int, Lisp_Object)); /* The standard syntax table is stored where it will automatically be used in all new buffers. */ #define Vstandard_syntax_table buffer_defaults.syntax_table /* A syntax table is a chartable whose elements are cons cells (CODE+FLAGS . MATCHING-CHAR). MATCHING-CHAR can be nil if the char is not a kind of parenthesis. The low 8 bits of CODE+FLAGS is a code, as follows: */ enum syntaxcode { Swhitespace, /* for a whitespace character */ Spunct, /* for random punctuation characters */ Sword, /* for a word constituent */ Ssymbol, /* symbol constituent but not word constituent */ Sopen, /* for a beginning delimiter */ Sclose, /* for an ending delimiter */ Squote, /* for a prefix character like Lisp ' */ Sstring, /* for a string-grouping character like Lisp " */ Smath, /* for delimiters like $ in Tex. */ Sescape, /* for a character that begins a C-style escape */ Scharquote, /* for a character that quotes the following character */ Scomment, /* for a comment-starting character */ Sendcomment, /* for a comment-ending character */ Sinherit, /* use the standard syntax table for this character */ Scomment_fence, /* Starts/ends comment which is delimited on the other side by any char with the same syntaxcode. */ Sstring_fence, /* Starts/ends string which is delimited on the other side by any char with the same syntaxcode. */ Smax /* Upper bound on codes that are meaningful */ }; /* Set the syntax entry VAL for char C in table TABLE. */ #define SET_RAW_SYNTAX_ENTRY(table, c, val) \ CHAR_TABLE_SET ((table), c, (val)) /* Set the syntax entry VAL for char-range RANGE in table TABLE. RANGE is a cons (FROM . TO) specifying the range of characters. */ #define SET_RAW_SYNTAX_ENTRY_RANGE(table, range, val) \ Fset_char_table_range ((table), (range), (val)) /* SYNTAX_ENTRY fetches the information from the entry for character C in syntax table TABLE, or from globally kept data (gl_state). Does inheritance. */ /* CURRENT_SYNTAX_TABLE gives the syntax table valid for current position, it is either the buffer's syntax table, or syntax table found in text properties. */ #ifdef SYNTAX_ENTRY_VIA_PROPERTY # define SYNTAX_ENTRY(c) \ (gl_state.use_global ? gl_state.global_code : SYNTAX_ENTRY_INT (c)) # define CURRENT_SYNTAX_TABLE gl_state.current_syntax_table #else # define SYNTAX_ENTRY SYNTAX_ENTRY_INT # define CURRENT_SYNTAX_TABLE current_buffer->syntax_table #endif #define SYNTAX_ENTRY_INT(c) CHAR_TABLE_REF (CURRENT_SYNTAX_TABLE, (c)) /* Extract the information from the entry for character C in the current syntax table. */ #ifdef __GNUC__ #define SYNTAX(c) \ ({ Lisp_Object _syntax_temp; \ _syntax_temp = SYNTAX_ENTRY (c); \ (CONSP (_syntax_temp) \ ? (enum syntaxcode) (XINT (XCAR (_syntax_temp)) & 0xff) \ : Swhitespace); }) #define SYNTAX_WITH_FLAGS(c) \ ({ Lisp_Object _syntax_temp; \ _syntax_temp = SYNTAX_ENTRY (c); \ (CONSP (_syntax_temp) \ ? XINT (XCAR (_syntax_temp)) \ : (int) Swhitespace); }) #define SYNTAX_MATCH(c) \ ({ Lisp_Object _syntax_temp; \ _syntax_temp = SYNTAX_ENTRY (c); \ (CONSP (_syntax_temp) \ ? XCDR (_syntax_temp) \ : Qnil); }) #else extern Lisp_Object syntax_temp; #define SYNTAX(c) \ (syntax_temp = SYNTAX_ENTRY ((c)), \ (CONSP (syntax_temp) \ ? (enum syntaxcode) (XINT (XCAR (syntax_temp)) & 0xff) \ : Swhitespace)) #define SYNTAX_WITH_FLAGS(c) \ (syntax_temp = SYNTAX_ENTRY ((c)), \ (CONSP (syntax_temp) \ ? XINT (XCAR (syntax_temp)) \ : (int) Swhitespace)) #define SYNTAX_MATCH(c) \ (syntax_temp = SYNTAX_ENTRY ((c)), \ (CONSP (syntax_temp) \ ? XCDR (syntax_temp) \ : Qnil)) #endif /* Then there are seven single-bit flags that have the following meanings: 1. This character is the first of a two-character comment-start sequence. 2. This character is the second of a two-character comment-start sequence. 3. This character is the first of a two-character comment-end sequence. 4. This character is the second of a two-character comment-end sequence. 5. This character is a prefix, for backward-prefix-chars. 6. see below 7. This character is part of a nestable comment sequence. Note that any two-character sequence whose first character has flag 1 and whose second character has flag 2 will be interpreted as a comment start. bit 6 is used to discriminate between two different comment styles. Languages such as C++ allow two orthogonal syntax start/end pairs and bit 6 is used to determine whether a comment-end or Scommentend ends style a or b. Comment start sequences can start style a or b. Style a is always the default. */ /* These macros extract a particular flag for a given character. */ #define SYNTAX_COMSTART_FIRST(c) ((SYNTAX_WITH_FLAGS (c) >> 16) & 1) #define SYNTAX_COMSTART_SECOND(c) ((SYNTAX_WITH_FLAGS (c) >> 17) & 1) #define SYNTAX_COMEND_FIRST(c) ((SYNTAX_WITH_FLAGS (c) >> 18) & 1) #define SYNTAX_COMEND_SECOND(c) ((SYNTAX_WITH_FLAGS (c) >> 19) & 1) #define SYNTAX_PREFIX(c) ((SYNTAX_WITH_FLAGS (c) >> 20) & 1) #define SYNTAX_COMMENT_STYLE(c) ((SYNTAX_WITH_FLAGS (c) >> 21) & 1) #define SYNTAX_COMMENT_NESTED(c) ((SYNTAX_WITH_FLAGS (c) >> 22) & 1) /* These macros extract specific flags from an integer that holds the syntax code and the flags. */ #define SYNTAX_FLAGS_COMSTART_FIRST(flags) (((flags) >> 16) & 1) #define SYNTAX_FLAGS_COMSTART_SECOND(flags) (((flags) >> 17) & 1) #define SYNTAX_FLAGS_COMEND_FIRST(flags) (((flags) >> 18) & 1) #define SYNTAX_FLAGS_COMEND_SECOND(flags) (((flags) >> 19) & 1) #define SYNTAX_FLAGS_PREFIX(flags) (((flags) >> 20) & 1) #define SYNTAX_FLAGS_COMMENT_STYLE(flags) (((flags) >> 21) & 1) #define SYNTAX_FLAGS_COMMENT_NESTED(flags) (((flags) >> 22) & 1) /* This array, indexed by a character, contains the syntax code which that character signifies (as a char). For example, (enum syntaxcode) syntax_spec_code['w'] is Sword. */ extern unsigned char syntax_spec_code[0400]; /* Indexed by syntax code, give the letter that describes it. */ extern char syntax_code_spec[16]; /* Convert the byte offset BYTEPOS into a character position, for the object recorded in gl_state with SETUP_SYNTAX_TABLE_FOR_OBJECT. The value is meant for use in the UPDATE_SYNTAX_TABLE... macros. These macros do nothing when parse_sexp_lookup_properties is 0, so we return 0 in that case, for speed. */ #define SYNTAX_TABLE_BYTE_TO_CHAR(bytepos) \ (! parse_sexp_lookup_properties \ ? 0 \ : STRINGP (gl_state.object) \ ? string_byte_to_char (gl_state.object, (bytepos)) \ : BUFFERP (gl_state.object) \ ? buf_bytepos_to_charpos (XBUFFER (gl_state.object), \ (bytepos) + BUF_BEGV_BYTE (XBUFFER (gl_state.object)) - 1) - BUF_BEGV (XBUFFER (gl_state.object)) + 1 \ : NILP (gl_state.object) \ ? BYTE_TO_CHAR ((bytepos) + BEGV_BYTE - 1) - BEGV + 1 \ : (bytepos)) /* Make syntax table state (gl_state) good for CHARPOS, assuming it is currently good for a position before CHARPOS. */ #define UPDATE_SYNTAX_TABLE_FORWARD(charpos) \ (parse_sexp_lookup_properties \ && (charpos) >= gl_state.e_property \ ? (update_syntax_table ((charpos) + gl_state.offset, 1, 0, \ gl_state.object), \ 1) \ : 0) /* Make syntax table state (gl_state) good for CHARPOS, assuming it is currently good for a position after CHARPOS. */ #define UPDATE_SYNTAX_TABLE_BACKWARD(charpos) \ (parse_sexp_lookup_properties \ && (charpos) < gl_state.b_property \ ? (update_syntax_table ((charpos) + gl_state.offset, -1, 0, \ gl_state.object), \ 1) \ : 0) /* Make syntax table good for CHARPOS. */ #define UPDATE_SYNTAX_TABLE(charpos) \ (parse_sexp_lookup_properties \ && (charpos) < gl_state.b_property \ ? (update_syntax_table ((charpos) + gl_state.offset, -1, 0, \ gl_state.object), \ 1) \ : (parse_sexp_lookup_properties \ && (charpos) >= gl_state.e_property \ ? (update_syntax_table ((charpos) + gl_state.offset, 1, 0,\ gl_state.object), \ 1) \ : 0)) /* This macro sets up the buffer-global syntax table. */ #define SETUP_BUFFER_SYNTAX_TABLE() \ do \ { \ gl_state.use_global = 0; \ gl_state.current_syntax_table = current_buffer->syntax_table; \ } while (0) /* This macro should be called with FROM at the start of forward search, or after the last position of the backward search. It makes sure that the first char is picked up with correct table, so one does not need to call UPDATE_SYNTAX_TABLE immediately after the call. Sign of COUNT gives the direction of the search. */ #define SETUP_SYNTAX_TABLE(FROM, COUNT) \ do \ { \ SETUP_BUFFER_SYNTAX_TABLE (); \ gl_state.b_property = BEGV; \ gl_state.e_property = ZV + 1; \ gl_state.object = Qnil; \ gl_state.offset = 0; \ if (parse_sexp_lookup_properties) \ if ((COUNT) > 0 || (FROM) > BEGV) \ update_syntax_table ((COUNT) > 0 ? (FROM) : (FROM) - 1, (COUNT),\ 1, Qnil); \ } \ while (0) /* Same as above, but in OBJECT. If OBJECT is nil, use current buffer. If it is t, ignore properties altogether. This is meant for regex.c to use. For buffers, regex.c passes arguments to the UPDATE_SYNTAX_TABLE macros which are relative to BEGV. So if it is a buffer, we set the offset field to BEGV. */ #define SETUP_SYNTAX_TABLE_FOR_OBJECT(OBJECT, FROM, COUNT) \ do \ { \ SETUP_BUFFER_SYNTAX_TABLE (); \ gl_state.object = (OBJECT); \ if (BUFFERP (gl_state.object)) \ { \ struct buffer *buf = XBUFFER (gl_state.object); \ gl_state.b_property = 1; \ gl_state.e_property = BUF_ZV (buf) - BUF_BEGV (buf) + 1; \ gl_state.offset = BUF_BEGV (buf) - 1; \ } \ else if (NILP (gl_state.object)) \ { \ gl_state.b_property = 1; \ gl_state.e_property = ZV - BEGV + 1; \ gl_state.offset = BEGV - 1; \ } \ else if (EQ (gl_state.object, Qt)) \ { \ gl_state.b_property = 0; \ gl_state.e_property = 1500000000; \ gl_state.offset = 0; \ } \ else \ { \ gl_state.b_property = 0; \ gl_state.e_property = 1 + SCHARS (gl_state.object); \ gl_state.offset = 0; \ } \ if (parse_sexp_lookup_properties) \ update_syntax_table (((FROM) + gl_state.offset \ + (COUNT > 0 ? 0 : -1)), \ COUNT, 1, gl_state.object); \ } \ while (0) struct gl_state_s { Lisp_Object object; /* The object we are scanning. */ int start; /* Where to stop. */ int stop; /* Where to stop. */ int use_global; /* Whether to use global_code or c_s_t. */ Lisp_Object global_code; /* Syntax code of current char. */ Lisp_Object current_syntax_table; /* Syntax table for current pos. */ Lisp_Object old_prop; /* Syntax-table prop at prev pos. */ int b_property; /* First index where c_s_t is valid. */ int e_property; /* First index where c_s_t is not valid. */ INTERVAL forward_i; /* Where to start lookup on forward */ INTERVAL backward_i; /* or backward movement. The data in c_s_t is valid between these intervals, and possibly at the intervals too, depending on: */ /* Offset for positions specified to UPDATE_SYNTAX_TABLE. */ int offset; }; extern struct gl_state_s gl_state; extern int parse_sexp_lookup_properties; extern INTERVAL interval_of P_ ((int, Lisp_Object)); extern int scan_words P_ ((int, int)); /* arch-tag: 28833cca-cd73-4741-8c85-a3111166a0e0 (do not change this comment) */