Mercurial > hg > xemacs-beta
view src/native-gtk-toolbar.c @ 5908:6174848f3e6c
Use parse_integer() in read_atom(); support bases with ratios like integers
src/ChangeLog addition:
2015-05-08 Aidan Kehoe <kehoea@parhasard.net>
* data.c (init_errors_once_early):
Move the Qunsupported_type here from numbers.c, so it's available
when the majority of our types are not supported.
* general-slots.h: Add it here, too.
* number.c: Remove the definition of Qunsupported_type from here.
* lread.c (read_atom):
Check if the first character could reflect a rational, if so, call
parse_integer(), don't check the syntax of the other
characters. This allows us to accept the non-ASCII digit
characters too.
If that worked partially, but not completely, and the next char is
a slash, try to parse as a ratio.
If that fails, try isfloat_string(), but only if the first
character could plausibly be part of a float.
Otherwise, treat as a symbol.
* lread.c (read_rational):
Rename from read_integer. Handle ratios with the same radix
specification as was used for integers.
* lread.c (read1):
Rename read_integer in this function. Support the Common Lisp
#NNNrMMM syntax for parsing a number MMM of arbitrary radix NNN.
man/ChangeLog addition:
2015-05-08 Aidan Kehoe <kehoea@parhasard.net>
* lispref/numbers.texi (Numbers):
Describe the newly-supported arbitrary-base syntax for rationals
(integers and ratios). Describe that ratios can take the same base
specification as integers, something also new.
tests/ChangeLog addition:
2015-05-08 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-reader-tests.el:
Check the arbitrary-base integer reader syntax support, just
added. Check the reader base support for ratios, just added.
Check the non-ASCII-digit support in the reader, just added.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sat, 09 May 2015 00:40:57 +0100 |
parents | 308d34e9f07d |
children |
line wrap: on
line source
/* toolbar implementation -- GTK interface. Copyright (C) 2000 Aaron Lehmann Copyright (C) 2010 Ben Wing. This file is part of XEmacs. XEmacs 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. XEmacs 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 XEmacs. If not, see <http://www.gnu.org/licenses/>. */ /* Synched up with: Not in FSF. */ #include <config.h> #include "lisp.h" #include "console-gtk.h" #include "glyphs-gtk.h" #include "fontcolor-gtk.h" #include "faces.h" #include "frame.h" #include "toolbar.h" #include "window.h" static void gtk_clear_toolbar (struct frame *f, enum edge_pos pos); static void gtk_toolbar_callback (GtkWidget *UNUSED (w), gpointer user_data) { struct toolbar_button *tb = (struct toolbar_button *) user_data; call0 (tb->callback); } static void gtk_output_toolbar (struct frame *f, enum edge_pos pos) { GtkWidget *toolbar; Lisp_Object button, window, glyph, instance; unsigned int checksum = 0; struct window *w; int x, y, bar_width, bar_height, vert; int cur_x, cur_y; window = FRAME_LAST_NONMINIBUF_WINDOW (f); w = XWINDOW (window); get_toolbar_coords (f, pos, &x, &y, &bar_width, &bar_height, &vert, 0); /* Get the toolbar and delete the old widgets in it */ button = FRAME_TOOLBAR_BUTTONS (f, pos); /* First loop over all of the buttons to determine how many there are. This loop will also make sure that all instances are instantiated so when we actually output them they will come up immediately. */ while (!NILP (button)) { struct toolbar_button *tb = XTOOLBAR_BUTTON (button); checksum = HASH4 (checksum, internal_hash (get_toolbar_button_glyph(w, tb), 0), internal_hash (tb->callback, 0), 0 /* width */); button = tb->next; } /* Only do updates if the toolbar has changed, or this is the first time we have drawn it in this position */ if (FRAME_GTK_TOOLBAR_WIDGET (f)[pos] && FRAME_GTK_TOOLBAR_CHECKSUM (f, pos) == checksum) { return; } /* Loop through buttons and add them to our toolbar. This code ignores the button dimensions as we let GTK handle that :) Attach the toolbar_button struct to the toolbar button so we know what function to use as a callback. */ { gtk_clear_toolbar (f, pos); FRAME_GTK_TOOLBAR_WIDGET (f)[pos] = toolbar = gtk_toolbar_new (((pos == TOP_EDGE) || (pos == BOTTOM_EDGE)) ? GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL, GTK_TOOLBAR_BOTH); } if (NILP (w->toolbar_buttons_captioned_p)) gtk_toolbar_set_style (toolbar, GTK_TOOLBAR_ICONS); else gtk_toolbar_set_style (toolbar, GTK_TOOLBAR_BOTH); FRAME_GTK_TOOLBAR_CHECKSUM(f, pos) = checksum; button = FRAME_TOOLBAR_BUTTONS (f, pos); cur_x = 0; cur_y = 0; while (!NILP (button)) { struct toolbar_button *tb = XTOOLBAR_BUTTON (button); if (tb->blank) { /* It is a blank space... we do not pay attention to the size, because the GTK toolbar does not allow us to specify different spacings. *sigh* */ gtk_toolbar_append_space (GTK_TOOLBAR (toolbar)); } else { /* It actually has a glyph associated with it! What WILL they think of next? */ glyph = tb->up_glyph; /* #### It is currently possible for users to trash us by directly changing the toolbar glyphs. Avoid crashing in that case. */ if (GLYPHP (glyph)) instance = glyph_image_instance (glyph, window, ERROR_ME_DEBUG_WARN, 1); else instance = Qnil; if (IMAGE_INSTANCEP(instance)) { GtkWidget *pixmapwid; GdkPixmap *pixmap; GdkBitmap *mask; char *tooltip = NULL; if (STRINGP (tb->help_string)) tooltip = XSTRING_DATA (tb->help_string); pixmap = XIMAGE_INSTANCE_GTK_PIXMAP(instance); mask = XIMAGE_INSTANCE_GTK_MASK(instance); pixmapwid = gtk_pixmap_new (pixmap, mask); gtk_widget_set_usize (pixmapwid, tb->width, tb->height); gtk_toolbar_append_item (GTK_TOOLBAR(toolbar), NULL, tooltip, NULL, pixmapwid, gtk_toolbar_callback, (gpointer) tb); } } cur_x += vert ? 0 : tb->width; cur_y += vert ? tb->height : 0; /* Who's idea was it to use a linked list for toolbar buttons? */ button = tb->next; } SET_TOOLBAR_WAS_VISIBLE_FLAG (f, pos, 1); x -= vert ? 3 : 2; y -= vert ? 2 : 3; gtk_fixed_put (GTK_FIXED (FRAME_GTK_TEXT_WIDGET (f)), FRAME_GTK_TOOLBAR_WIDGET (f)[pos],x, y); gtk_widget_show_all (FRAME_GTK_TOOLBAR_WIDGET (f)[pos]); } static void gtk_clear_toolbar (struct frame *f, enum edge_pos pos) { FRAME_GTK_TOOLBAR_CHECKSUM (f, pos) = 0; SET_TOOLBAR_WAS_VISIBLE_FLAG (f, pos, 0); if (FRAME_GTK_TOOLBAR_WIDGET(f)[pos]) gtk_widget_destroy (FRAME_GTK_TOOLBAR_WIDGET(f)[pos]); } static void gtk_output_frame_toolbars (struct frame *f) { enum edge_pos pos; EDGE_POS_LOOP (pos) { if (FRAME_REAL_TOOLBAR_VISIBLE (f, pos)) gtk_output_toolbar (f, pos); else if (f->toolbar_was_visible[pos]) gtk_clear_toolbar (f, pos); } } static void gtk_initialize_frame_toolbars (struct frame *UNUSED (f)) { stderr_out ("We should draw toolbars\n"); } /************************************************************************/ /* initialization */ /************************************************************************/ void console_type_create_toolbar_gtk (void) { CONSOLE_HAS_METHOD (gtk, output_frame_toolbars); CONSOLE_HAS_METHOD (gtk, initialize_frame_toolbars); }