Mercurial > hg > xemacs-beta
view src/native-gtk-toolbar.c @ 3767:6b2ef948e140
[xemacs-hg @ 2006-12-29 18:09:38 by aidan]
etc/ChangeLog addition:
2006-12-21 Aidan Kehoe <kehoea@parhasard.net>
* unicode/unicode-consortium/8859-7.TXT:
Update the mapping to the 2003 version of ISO 8859-7.
lisp/ChangeLog addition:
2006-12-21 Aidan Kehoe <kehoea@parhasard.net>
* mule/cyrillic.el:
* mule/cyrillic.el (iso-8859-5):
* mule/cyrillic.el (cyrillic-koi8-r-encode-table):
Add syntax, case support for Cyrillic; make some parentheses more
Lispy.
* mule/european.el:
Content moved to latin.el, file deleted.
* mule/general-late.el:
If Unicode tables are to be loaded at dump time, do it here, not
in loadup.el.
* mule/greek.el:
Add syntax, case support for Greek.
* mule/latin.el:
Move the content of european.el here. Change the case table
mappings to use hexadecimal codes, to make cross reference to the
standards easier. In all cases, take character syntax from similar
characters in Latin-1 , rather than deciding separately what
syntax they should take. Add (incomplete) support for case with
Turkish. Remove description of the character sets used from the
language environments' doc strings, since now that we create
variant language environments on the fly, such descriptions will
often be inaccurate. Set the native-coding-system language info
property while setting the other coding-system properties of the
language.
* mule/misc-lang.el (ipa):
Remove the language environment. The International Phonetic
_Alphabet_ is not a language, it's inane to have a corresponding
language environment in XEmacs.
* mule/mule-cmds.el (create-variant-language-environment):
Also modify the coding-priority when creating a new language
environment; document that.
* mule/mule-cmds.el (get-language-environment-from-locale):
Recognise that the 'native-coding-system language-info property
can be a list, interpret it correctly when it is one.
2006-12-21 Aidan Kehoe <kehoea@parhasard.net>
* coding.el (coding-system-category):
Use the new 'unicode-type property for finding what sort of
Unicode coding system subtype a coding system is, instead of the
overshadowed 'type property.
* dumped-lisp.el (preloaded-file-list):
mule/european.el has been removed.
* loadup.el (really-early-error-handler):
Unicode tables loaded at dump time are now in
mule/general-late.el.
* simple.el (count-lines):
Add some backslashes to to parentheses in docstrings to help
fontification along.
* simple.el (what-cursor-position):
Wrap a line to fit in 80 characters.
* unicode.el:
Use the 'unicode-type property, not 'type, for setting the Unicode
coding-system subtype.
src/ChangeLog addition:
2006-12-21 Aidan Kehoe <kehoea@parhasard.net>
* file-coding.c:
Update the make-coding-system docstring to reflect unicode-type
* general-slots.h:
New symbol, unicode-type, since 'type was being overridden when
accessing a coding system's Unicode subtype.
* intl-win32.c:
Backslash a few parentheses, to help fontification along.
* intl-win32.c (complex_vars_of_intl_win32):
Use the 'unicode-type symbol, not 'type, when creating the
Microsoft Unicode coding system.
* unicode.c (unicode_putprop):
* unicode.c (unicode_getprop):
* unicode.c (unicode_print):
Using 'type as the property name when working out what Unicode
subtype a given coding system is was broken, since there's a
general coding system property called 'type. Change the former to
use 'unicode-type instead.
author | aidan |
---|---|
date | Fri, 29 Dec 2006 18:09:51 +0000 |
parents | 3d8143fc88e1 |
children | d372b17f63ce 8b2f75cecb89 |
line wrap: on
line source
/* toolbar implementation -- GTK interface. Copyright (C) 2000 Aaron Lehmann 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 2, 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; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Not in FSF. */ #include <config.h> #include "lisp.h" #include "console-gtk.h" #include "glyphs-gtk.h" #include "objects-gtk.h" #include "faces.h" #include "frame.h" #include "toolbar.h" #include "window.h" #define SET_TOOLBAR_WAS_VISIBLE_FLAG(frame, pos, flag) \ do { \ switch (pos) \ { \ case TOP_TOOLBAR: \ (frame)->top_toolbar_was_visible = flag; \ break; \ case BOTTOM_TOOLBAR: \ (frame)->bottom_toolbar_was_visible = flag; \ break; \ case LEFT_TOOLBAR: \ (frame)->left_toolbar_was_visible = flag; \ break; \ case RIGHT_TOOLBAR: \ (frame)->right_toolbar_was_visible = flag; \ break; \ default: \ ABORT (); \ } \ } while (0) static void gtk_clear_toolbar (struct frame *f, enum toolbar_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 toolbar_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_TOOLBAR) || (pos == BOTTOM_TOOLBAR)) ? 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 toolbar_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) { if (FRAME_REAL_TOP_TOOLBAR_VISIBLE (f)) gtk_output_toolbar (f, TOP_TOOLBAR); else if (f->top_toolbar_was_visible) gtk_clear_toolbar (f, TOP_TOOLBAR); if (FRAME_REAL_BOTTOM_TOOLBAR_VISIBLE (f)) gtk_output_toolbar (f, BOTTOM_TOOLBAR); else if (f->bottom_toolbar_was_visible) gtk_clear_toolbar (f, LEFT_TOOLBAR); if (FRAME_REAL_LEFT_TOOLBAR_VISIBLE (f)) gtk_output_toolbar (f, LEFT_TOOLBAR); else if (f->left_toolbar_was_visible) gtk_clear_toolbar (f, LEFT_TOOLBAR); if (FRAME_REAL_RIGHT_TOOLBAR_VISIBLE (f)) gtk_output_toolbar (f, RIGHT_TOOLBAR); else if (f->right_toolbar_was_visible) gtk_clear_toolbar (f, RIGHT_TOOLBAR); } 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); }