Mercurial > hg > xemacs-beta
view src/toolbar-msw.c @ 4952:19a72041c5ed
Mule-izing, various fixes related to char * arguments
-------------------- ChangeLog entries follow: --------------------
modules/ChangeLog addition:
2010-01-26 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c:
* postgresql/postgresql.c (CHECK_LIVE_CONNECTION):
* postgresql/postgresql.c (print_pgresult):
* postgresql/postgresql.c (Fpq_conn_defaults):
* postgresql/postgresql.c (Fpq_connectdb):
* postgresql/postgresql.c (Fpq_connect_start):
* postgresql/postgresql.c (Fpq_result_status):
* postgresql/postgresql.c (Fpq_res_status):
Mule-ize large parts of it.
2010-01-26 Ben Wing <ben@xemacs.org>
* ldap/eldap.c (print_ldap):
* ldap/eldap.c (allocate_ldap):
Use write_ascstring().
src/ChangeLog addition:
2010-01-26 Ben Wing <ben@xemacs.org>
* alloc.c:
* alloc.c (build_ascstring):
* alloc.c (build_msg_cistring):
* alloc.c (staticpro_1):
* alloc.c (staticpro_name):
* alloc.c (staticpro_nodump_1):
* alloc.c (staticpro_nodump_name):
* alloc.c (unstaticpro_nodump_1):
* alloc.c (mcpro_1):
* alloc.c (mcpro_name):
* alloc.c (object_memory_usage_stats):
* alloc.c (common_init_alloc_early):
* alloc.c (init_alloc_once_early):
* buffer.c (print_buffer):
* buffer.c (vars_of_buffer):
* buffer.c (common_init_complex_vars_of_buffer):
* buffer.c (init_initial_directory):
* bytecode.c (invalid_byte_code):
* bytecode.c (print_compiled_function):
* bytecode.c (mark_compiled_function):
* chartab.c (print_table_entry):
* chartab.c (print_char_table):
* config.h.in:
* console-gtk.c:
* console-gtk.c (gtk_device_to_console_connection):
* console-gtk.c (gtk_semi_canonicalize_console_connection):
* console-gtk.c (gtk_canonicalize_console_connection):
* console-gtk.c (gtk_semi_canonicalize_device_connection):
* console-gtk.c (gtk_canonicalize_device_connection):
* console-stream.c (stream_init_frame_1):
* console-stream.c (vars_of_console_stream):
* console-stream.c (init_console_stream):
* console-x.c (x_semi_canonicalize_console_connection):
* console-x.c (x_semi_canonicalize_device_connection):
* console-x.c (x_canonicalize_device_connection):
* console-x.h:
* data.c (eq_with_ebola_notice):
* data.c (Fsubr_interactive):
* data.c (Fnumber_to_string):
* data.c (digit_to_number):
* device-gtk.c (gtk_init_device):
* device-msw.c (print_devmode):
* device-x.c (x_event_name):
* dialog-msw.c (handle_directory_dialog_box):
* dialog-msw.c (handle_file_dialog_box):
* dialog-msw.c (vars_of_dialog_mswindows):
* doc.c (weird_doc):
* doc.c (Fsnarf_documentation):
* doc.c (vars_of_doc):
* dumper.c (pdump):
* dynarr.c:
* dynarr.c (Dynarr_realloc):
* editfns.c (Fuser_real_login_name):
* editfns.c (get_home_directory):
* elhash.c (print_hash_table_data):
* elhash.c (print_hash_table):
* emacs.c (main_1):
* emacs.c (vars_of_emacs):
* emodules.c:
* emodules.c (_emodules_list):
* emodules.c (Fload_module):
* emodules.c (Funload_module):
* emodules.c (Flist_modules):
* emodules.c (find_make_module):
* emodules.c (attempt_module_delete):
* emodules.c (emodules_load):
* emodules.c (emodules_doc_subr):
* emodules.c (emodules_doc_sym):
* emodules.c (syms_of_module):
* emodules.c (vars_of_module):
* emodules.h:
* eval.c (print_subr):
* eval.c (signal_call_debugger):
* eval.c (build_error_data):
* eval.c (signal_error):
* eval.c (maybe_signal_error):
* eval.c (signal_continuable_error):
* eval.c (maybe_signal_continuable_error):
* eval.c (signal_error_2):
* eval.c (maybe_signal_error_2):
* eval.c (signal_continuable_error_2):
* eval.c (maybe_signal_continuable_error_2):
* eval.c (signal_ferror):
* eval.c (maybe_signal_ferror):
* eval.c (signal_continuable_ferror):
* eval.c (maybe_signal_continuable_ferror):
* eval.c (signal_ferror_with_frob):
* eval.c (maybe_signal_ferror_with_frob):
* eval.c (signal_continuable_ferror_with_frob):
* eval.c (maybe_signal_continuable_ferror_with_frob):
* eval.c (syntax_error):
* eval.c (syntax_error_2):
* eval.c (maybe_syntax_error):
* eval.c (sferror):
* eval.c (sferror_2):
* eval.c (maybe_sferror):
* eval.c (invalid_argument):
* eval.c (invalid_argument_2):
* eval.c (maybe_invalid_argument):
* eval.c (invalid_constant):
* eval.c (invalid_constant_2):
* eval.c (maybe_invalid_constant):
* eval.c (invalid_operation):
* eval.c (invalid_operation_2):
* eval.c (maybe_invalid_operation):
* eval.c (invalid_change):
* eval.c (invalid_change_2):
* eval.c (maybe_invalid_change):
* eval.c (invalid_state):
* eval.c (invalid_state_2):
* eval.c (maybe_invalid_state):
* eval.c (wtaerror):
* eval.c (stack_overflow):
* eval.c (out_of_memory):
* eval.c (print_multiple_value):
* eval.c (issue_call_trapping_problems_warning):
* eval.c (backtrace_specials):
* eval.c (backtrace_unevalled_args):
* eval.c (Fbacktrace):
* eval.c (warn_when_safe):
* event-Xt.c (modwarn):
* event-Xt.c (modbarf):
* event-Xt.c (check_modifier):
* event-Xt.c (store_modifier):
* event-Xt.c (emacs_Xt_format_magic_event):
* event-Xt.c (describe_event):
* event-gtk.c (dragndrop_data_received):
* event-gtk.c (store_modifier):
* event-gtk.c (gtk_reset_modifier_mapping):
* event-msw.c (dde_eval_string):
* event-msw.c (Fdde_alloc_advise_item):
* event-msw.c (mswindows_dde_callback):
* event-msw.c (FROB):
* event-msw.c (emacs_mswindows_format_magic_event):
* event-stream.c (external_debugging_print_event):
* event-stream.c (execute_help_form):
* event-stream.c (vars_of_event_stream):
* events.c (print_event_1):
* events.c (print_event):
* events.c (event_equal):
* extents.c (print_extent_1):
* extents.c (print_extent):
* extents.c (vars_of_extents):
* faces.c (print_face):
* faces.c (complex_vars_of_faces):
* file-coding.c:
* file-coding.c (print_coding_system):
* file-coding.c (print_coding_system_in_print_method):
* file-coding.c (default_query_method):
* file-coding.c (find_coding_system):
* file-coding.c (make_coding_system_1):
* file-coding.c (chain_print):
* file-coding.c (undecided_print):
* file-coding.c (gzip_print):
* file-coding.c (vars_of_file_coding):
* file-coding.c (complex_vars_of_file_coding):
* fileio.c:
* fileio.c (report_file_type_error):
* fileio.c (report_error_with_errno):
* fileio.c (report_file_error):
* fileio.c (barf_or_query_if_file_exists):
* fileio.c (vars_of_fileio):
* floatfns.c (matherr):
* fns.c (print_bit_vector):
* fns.c (Fmapconcat):
* fns.c (add_suffix_to_symbol):
* fns.c (add_prefix_to_symbol):
* frame-gtk.c:
* frame-gtk.c (Fgtk_window_id):
* frame-x.c (def):
* frame-x.c (x_cde_transfer_callback):
* frame.c:
* frame.c (Fmake_frame):
* gc.c (show_gc_cursor_and_message):
* gc.c (vars_of_gc):
* glyphs-eimage.c (png_instantiate):
* glyphs-eimage.c (tiff_instantiate):
* glyphs-gtk.c (gtk_print_image_instance):
* glyphs-msw.c (mswindows_print_image_instance):
* glyphs-x.c (x_print_image_instance):
* glyphs-x.c (update_widget_face):
* glyphs.c (make_string_from_file):
* glyphs.c (print_image_instance):
* glyphs.c (signal_image_error):
* glyphs.c (signal_image_error_2):
* glyphs.c (signal_double_image_error):
* glyphs.c (signal_double_image_error_2):
* glyphs.c (xbm_mask_file_munging):
* glyphs.c (pixmap_to_lisp_data):
* glyphs.h:
* gui.c (gui_item_display_flush_left):
* hpplay.c (player_error_internal):
* hpplay.c (myHandler):
* intl-win32.c:
* intl-win32.c (langcode_to_lang):
* intl-win32.c (sublangcode_to_lang):
* intl-win32.c (Fmswindows_get_locale_info):
* intl-win32.c (lcid_to_locale_mule_or_no):
* intl-win32.c (mswindows_multibyte_to_unicode_print):
* intl-win32.c (complex_vars_of_intl_win32):
* keymap.c:
* keymap.c (print_keymap):
* keymap.c (ensure_meta_prefix_char_keymapp):
* keymap.c (Fkey_description):
* keymap.c (Ftext_char_description):
* lisp.h:
* lisp.h (struct):
* lisp.h (DECLARE_INLINE_HEADER):
* lread.c (Fload_internal):
* lread.c (locate_file):
* lread.c (read_escape):
* lread.c (read_raw_string):
* lread.c (read1):
* lread.c (read_list):
* lread.c (read_compiled_function):
* lread.c (init_lread):
* lrecord.h:
* marker.c (print_marker):
* marker.c (marker_equal):
* menubar-msw.c (displayable_menu_item):
* menubar-x.c (command_builder_operate_menu_accelerator):
* menubar.c (vars_of_menubar):
* minibuf.c (reinit_complex_vars_of_minibuf):
* minibuf.c (complex_vars_of_minibuf):
* mule-charset.c (Fmake_charset):
* mule-charset.c (complex_vars_of_mule_charset):
* mule-coding.c (iso2022_print):
* mule-coding.c (fixed_width_query):
* number.c (bignum_print):
* number.c (ratio_print):
* number.c (bigfloat_print):
* number.c (bigfloat_finalize):
* objects-msw.c:
* objects-msw.c (mswindows_color_to_string):
* objects-msw.c (mswindows_color_list):
* objects-tty.c:
* objects-tty.c (tty_font_list):
* objects-tty.c (tty_find_charset_font):
* objects-xlike-inc.c (xft_find_charset_font):
* objects-xlike-inc.c (endif):
* print.c:
* print.c (write_istring):
* print.c (write_ascstring):
* print.c (Fterpri):
* print.c (Fprint):
* print.c (print_error_message):
* print.c (print_vector_internal):
* print.c (print_cons):
* print.c (print_string):
* print.c (printing_unreadable_object):
* print.c (print_internal):
* print.c (print_float):
* print.c (print_symbol):
* process-nt.c (mswindows_report_winsock_error):
* process-nt.c (nt_canonicalize_host_name):
* process-unix.c (unix_canonicalize_host_name):
* process.c (print_process):
* process.c (report_process_error):
* process.c (report_network_error):
* process.c (make_process_internal):
* process.c (Fstart_process_internal):
* process.c (status_message):
* process.c (putenv_internal):
* process.c (vars_of_process):
* process.h:
* profile.c (vars_of_profile):
* rangetab.c (print_range_table):
* realpath.c (vars_of_realpath):
* redisplay.c (vars_of_redisplay):
* search.c (wordify):
* search.c (Freplace_match):
* sheap.c (sheap_adjust_h):
* sound.c (report_sound_error):
* sound.c (Fplay_sound_file):
* specifier.c (print_specifier):
* symbols.c (Fsubr_name):
* symbols.c (do_symval_forwarding):
* symbols.c (set_default_buffer_slot_variable):
* symbols.c (set_default_console_slot_variable):
* symbols.c (store_symval_forwarding):
* symbols.c (default_value):
* symbols.c (defsymbol_massage_name_1):
* symbols.c (defsymbol_massage_name_nodump):
* symbols.c (defsymbol_massage_name):
* symbols.c (defsymbol_massage_multiword_predicate_nodump):
* symbols.c (defsymbol_massage_multiword_predicate):
* symbols.c (defsymbol_nodump):
* symbols.c (defsymbol):
* symbols.c (defkeyword):
* symbols.c (defkeyword_massage_name):
* symbols.c (check_module_subr):
* symbols.c (deferror_1):
* symbols.c (deferror):
* symbols.c (deferror_massage_name):
* symbols.c (deferror_massage_name_and_message):
* symbols.c (defvar_magic):
* symeval.h:
* symeval.h (DEFVAR_SYMVAL_FWD):
* sysdep.c:
* sysdep.c (init_system_name):
* sysdll.c:
* sysdll.c (MAYBE_PREPEND_UNDERSCORE):
* sysdll.c (dll_function):
* sysdll.c (dll_variable):
* sysdll.c (dll_error):
* sysdll.c (dll_open):
* sysdll.c (dll_close):
* sysdll.c (image_for_address):
* sysdll.c (my_find_image):
* sysdll.c (search_linked_libs):
* sysdll.h:
* sysfile.h:
* sysfile.h (DEFAULT_DIRECTORY_FALLBACK):
* syswindows.h:
* tests.c (DFC_CHECK_LENGTH):
* tests.c (DFC_CHECK_CONTENT):
* tests.c (Ftest_hash_tables):
* text.c (vars_of_text):
* text.h:
* tooltalk.c (tt_opnum_string):
* tooltalk.c (tt_message_arg_ival_string):
* tooltalk.c (Ftooltalk_default_procid):
* tooltalk.c (Ftooltalk_default_session):
* tooltalk.c (init_tooltalk):
* tooltalk.c (vars_of_tooltalk):
* ui-gtk.c (Fdll_load):
* ui-gtk.c (type_to_marshaller_type):
* ui-gtk.c (Fgtk_import_function_internal):
* ui-gtk.c (emacs_gtk_object_printer):
* ui-gtk.c (emacs_gtk_boxed_printer):
* unicode.c (unicode_to_ichar):
* unicode.c (unicode_print):
* unicode.c (unicode_query):
* unicode.c (vars_of_unicode):
* unicode.c (complex_vars_of_unicode):
* win32.c:
* win32.c (mswindows_report_process_error):
* window.c (print_window):
* xemacs.def.in.in:
BASIC IDEA: Further fixing up uses of char * and CIbyte *
to reflect their actual semantics; Mule-izing some code;
redoing of the not-yet-working code to handle message translation.
Clean up code to handle message-translation (not yet working).
Create separate versions of build_msg_string() for working with
Ibyte *, CIbyte *, and Ascbyte * arguments. Assert that Ascbyte *
arguments are pure-ASCII. Make build_msg_string() be the same
as build_msg_ascstring(). Create same three versions of GETTEXT()
and DEFER_GETTEXT(). Also create build_defer_string() and
variants for the equivalent of DEFER_GETTEXT() when building a
string. Remove old CGETTEXT(). Clean up code where GETTEXT(),
DEFER_GETTEXT(), build_msg_string(), etc. was being called and
introduce some new calls to build_msg_string(), etc. Remove
GETTEXT() from calls to weird_doc() -- we assume that the
message snarfer knows about weird_doc(). Remove uses of
DEFER_GETTEXT() from error messages in sysdep.c and instead use
special comments /* @@@begin-snarf@@@ */ and /* @@@end-snarf@@@ */
that the message snarfer presumably knows about.
Create build_ascstring() and use it in many instances in place
of build_string(). The purpose of having Ascbyte * variants is
to make the code more self-documenting in terms of what sort of
semantics is expected for char * strings. In fact in the process
of looking for uses of build_string(), much improperly Mule-ized
was discovered.
Mule-ize a lot of code as described in previous paragraph,
e.g. in sysdep.c.
Make the error functions take Ascbyte * strings and fix up a
couple of places where non-pure-ASCII strings were being passed in
(file-coding.c, mule-coding.c, unicode.c). (It's debatable whether
we really need to make the error functions work this way. It
helps catch places where code is written in a way that message
translation won't work, but we may well never implement message
translation.)
Make staticpro() and friends take Ascbyte * strings instead of
raw char * strings. Create a const_Ascbyte_ptr dynarr type
to describe what's held by staticpro_names[] and friends,
create pdump descriptions for const_Ascbyte_ptr dynarrs, and
use them in place of specially-crafted staticpro descriptions.
Mule-ize certain other functions (e.g. x_event_name) by correcting
raw use of char * to Ascbyte *, Rawbyte * or another such type,
and raw use of char[] buffers to another type (usually Ascbyte[]).
Change many uses of write_c_string() to write_msg_string(),
write_ascstring(), etc.
Mule-ize emodules.c, emodules.h, sysdll.h.
Fix some un-Mule-ized code in intl-win32.c.
A comment in event-Xt.c and the limitations of the message
snarfer (make-msgfile or whatever) is presumably incorrect --
it should be smart enough to handle function calls spread over
more than one line. Clean up code in event-Xt.c that was
written awkwardly for this reason.
In config.h.in, instead of NEED_ERROR_CHECK_TYPES_INLINES,
create a more general XEMACS_DEFS_NEEDS_INLINE_DECLS to
indicate when inlined functions need to be declared in
xemacs.defs.in.in, and make use of it in xemacs.defs.in.in.
We need to do this because postgresql.c now calls qxestrdup(),
which is an inline function.
Make nconc2() and other such functions MODULE_API and put
them in xemacs.defs.in.in since postgresql.c now uses them.
Clean up indentation in lread.c and a few other places.
In text.h, document ASSERT_ASCTEXT_ASCII() and
ASSERT_ASCTEXT_ASCII_LEN(), group together the stand-in
encodings and add some more for DLL symbols, function and
variable names, etc.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Tue, 26 Jan 2010 23:22:30 -0600 |
| parents | 3d8143fc88e1 |
| children | 16112448d484 |
line wrap: on
line source
/* toolbar implementation -- mswindows interface. Copyright (C) 1995 Board of Trustees, University of Illinois. Copyright (C) 1995 Sun Microsystems, Inc. Copyright (C) 1995, 1996, 2002 Ben Wing. Copyright (C) 1996 Chuck Thompson. Copyright (C) 1998 Andy Piper. 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. */ /* This implementation by Andy Piper <andy@xemacs.org>, with bits borrowed from toolbar-x.c */ /* Synched up with: Not in FSF. */ /* This file essentially Mule-ized (except perhaps some Unicode splitting). 5-2000. (??? Needs a once-over.) */ #define NEED_MSWINDOWS_COMMCTRL #include <config.h> #include "lisp.h" #include "device.h" #include "elhash.h" #include "faces.h" #include "frame-impl.h" #include "gui.h" #include "toolbar.h" #include "window.h" #include "console-msw-impl.h" #include "glyphs-msw.h" /* #include "objects-msw.h" */ #define TOOLBAR_ITEM_ID_MIN 0x4000 #define TOOLBAR_ITEM_ID_MAX 0x7FFF #define TOOLBAR_ITEM_ID_BITS(x) (((x) & 0x3FFF) | 0x4000) #define TOOLBAR_ID_BIAS 16 #define TOOLBAR_HANDLE(f,p) \ GetDlgItem(FRAME_MSWINDOWS_HANDLE(f), TOOLBAR_ID_BIAS + p) #define MSWINDOWS_BUTTON_SHADOW_THICKNESS 2 #define MSWINDOWS_BLANK_SIZE 5 #define MSWINDOWS_MINIMUM_TOOLBAR_SIZE 8 static void mswindows_move_toolbar (struct frame *f, enum toolbar_pos pos); #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 int allocate_toolbar_item_id (struct frame *f, struct toolbar_button *button, enum toolbar_pos UNUSED (pos)) { /* hmm what do we generate an id based on */ int id = TOOLBAR_ITEM_ID_BITS (internal_hash (button->callback, 0)); while (!NILP (Fgethash (make_int (id), FRAME_MSWINDOWS_TOOLBAR_HASH_TABLE (f), Qnil))) { id = TOOLBAR_ITEM_ID_BITS (id + 1); } return id; } static void mswindows_clear_toolbar (struct frame *f, enum toolbar_pos pos, int UNUSED (thickness_change)) { HIMAGELIST ilist = NULL; int i; HWND toolbarwnd = TOOLBAR_HANDLE (f, pos); if (toolbarwnd) { TBBUTTON info; /* Delete the buttons and remove the command from the hash table */ i = qxeSendMessage (toolbarwnd, TB_BUTTONCOUNT, 0, 0); for (i--; i >= 0; i--) { qxeSendMessage (toolbarwnd, TB_GETBUTTON, (WPARAM) i, (LPARAM) &info); Fremhash (make_int (info.idCommand), FRAME_MSWINDOWS_TOOLBAR_HASH_TABLE (f)); qxeSendMessage (toolbarwnd, TB_DELETEBUTTON, (WPARAM) i, 0); } /* finally get rid of the image list assuming it clears up its bitmaps */ qxeSendMessage (toolbarwnd, TB_GETIMAGELIST, 0, (LONG) &ilist); if (ilist) { ImageList_Destroy(ilist); } qxeSendMessage (toolbarwnd, TB_SETIMAGELIST, 0, (LPARAM)NULL); ShowWindow(toolbarwnd, SW_HIDE); } FRAME_MSWINDOWS_TOOLBAR_CHECKSUM (f, pos) = 0; SET_TOOLBAR_WAS_VISIBLE_FLAG (f, pos, 0); } static void mswindows_output_toolbar (struct frame *f, enum toolbar_pos pos) { int x, y, bar_width, bar_height, vert; int width=-1, height=-1, bmwidth=0, bmheight=0, maxbmwidth, maxbmheight; int style_3d=0; int border_width = FRAME_REAL_TOOLBAR_BORDER_WIDTH (f, pos); Lisp_Object button, glyph, instance; Lisp_Object window = FRAME_LAST_NONMINIBUF_WINDOW (f); int nbuttons=0; int shadow_thickness = 2; /* get this from somewhere else? */ int window_frame_width = 3; int padding = (border_width + shadow_thickness) * 2; unsigned int checksum=0; struct window *w = XWINDOW (window); TBBUTTON *button_tbl, *tbbutton; HIMAGELIST ilist=NULL; HWND toolbarwnd=NULL; get_toolbar_coords (f, pos, &x, &y, &bar_width, &bar_height, &vert, 0); /* ediff bogusly sets the height to 2 for some obscure X-specific reason. This ensures that we only try and output a toolbar for sensible sizes */ if (bar_width < MSWINDOWS_MINIMUM_TOOLBAR_SIZE || bar_height < MSWINDOWS_MINIMUM_TOOLBAR_SIZE) { return; } if (x==1) x=0; toolbarwnd = TOOLBAR_HANDLE (f,pos); /* set button sizes based on bar size */ if (vert) { if (style_3d) { width = height = bar_width - (window_frame_width + shadow_thickness) * 2; } else width = height = bar_width; maxbmwidth = maxbmheight = width - padding; } else { if (style_3d) { height = width = bar_height - (window_frame_width + shadow_thickness) * 2; } else width = height = bar_height; maxbmwidth = maxbmheight = width - padding; } 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 = HASH5 (checksum, internal_hash (get_toolbar_button_glyph(w, tb), 0), internal_hash (tb->callback, 0), width, LISP_HASH (w->toolbar_buttons_captioned_p)); button = tb->next; nbuttons++; } /* only rebuild if something has changed */ if (!toolbarwnd || FRAME_MSWINDOWS_TOOLBAR_CHECKSUM(f,pos)!=checksum) { /* remove the old one */ mswindows_clear_toolbar (f, pos, 0); FRAME_MSWINDOWS_TOOLBAR_CHECKSUM (f, pos)=checksum; /* build up the data required by win32 fns. */ button_tbl = xnew_array_and_zero (TBBUTTON, nbuttons); button = FRAME_TOOLBAR_BUTTONS (f, pos); tbbutton = button_tbl; while (!NILP (button)) { struct toolbar_button *tb = XTOOLBAR_BUTTON (button); HBITMAP bitmap=NULL, mask=NULL; bitmap=mask=NULL; if (tb->blank) tbbutton->fsStyle = TBSTYLE_SEP; else { tbbutton->idCommand = allocate_toolbar_item_id (f, tb, pos); /* currently we output the toolbar again with disabled buttons it might be good to use the ms disabled code instead but that means another image list, so we'll stick with the emacs model. */ tbbutton->fsState = tb->enabled ? TBSTATE_ENABLED : TBSTATE_INDETERMINATE; tbbutton->fsStyle = TBSTYLE_BUTTON; tbbutton->dwData=0; tbbutton->iString=0; /* mess with the button image */ glyph = get_toolbar_button_glyph (w, tb); if (GLYPHP (glyph)) instance = glyph_image_instance (glyph, window, ERROR_ME_DEBUG_WARN, 1); else instance = Qnil; if (IMAGE_INSTANCEP (instance)) { Lisp_Image_Instance *p = XIMAGE_INSTANCE (instance); if (IMAGE_INSTANCE_PIXMAP_TYPE_P (p)) { /* we are going to honor the toolbar settings and resize the bitmaps accordingly if they are too big. If they are too small we leave them and pad the difference - unless a different size crops up in the middle, at which point we *have* to resize since the ImageList won't cope. */ if ((bmwidth && IMAGE_INSTANCE_PIXMAP_WIDTH (p) != bmwidth) || (bmheight && IMAGE_INSTANCE_PIXMAP_HEIGHT (p) != bmheight) || IMAGE_INSTANCE_PIXMAP_WIDTH (p) > maxbmwidth || IMAGE_INSTANCE_PIXMAP_HEIGHT (p) > maxbmheight) { if (!bmheight) bmheight = min (maxbmheight, IMAGE_INSTANCE_PIXMAP_HEIGHT (p)); if (!bmwidth) bmwidth = min (maxbmwidth, IMAGE_INSTANCE_PIXMAP_WIDTH (p)); if (! (bitmap = mswindows_create_resized_bitmap (p, f, bmwidth, bmheight))) { xfree (button_tbl, TBBUTTON *); if (ilist) ImageList_Destroy (ilist); gui_error ("Couldn't resize pixmap", instance); } /* we don't care if the mask fails */ mask = mswindows_create_resized_mask (p, f, bmwidth, bmheight); } else { if (!bmwidth) bmwidth = IMAGE_INSTANCE_PIXMAP_WIDTH (p); if (!bmheight) bmheight = IMAGE_INSTANCE_PIXMAP_HEIGHT (p); } /* need to build an image list for the bitmaps */ if (!ilist && !(ilist = ImageList_Create ( bmwidth, bmheight, (IMAGE_INSTANCE_MSWINDOWS_MASK (p) ? ILC_MASK : 0) | ILC_COLOR24, nbuttons, nbuttons * 2 ))) { xfree (button_tbl, TBBUTTON *); gui_error ("Couldn't create image list", instance); } /* make the mask actually do something */ ImageList_SetBkColor (ilist, CLR_NONE); /* add a bitmap to the list */ if ((tbbutton->iBitmap = ImageList_Add (ilist, bitmap ? bitmap : IMAGE_INSTANCE_MSWINDOWS_BITMAP (p), mask ? mask : IMAGE_INSTANCE_MSWINDOWS_MASK (p))) < 0) { xfree (button_tbl, TBBUTTON *); if (ilist) ImageList_Destroy (ilist); gui_error ("couldn't add image to image list", instance); } /* we're done with these now */ DeleteObject (bitmap); DeleteObject (mask); } } Fputhash (make_int (tbbutton->idCommand), button, FRAME_MSWINDOWS_TOOLBAR_HASH_TABLE (f)); } /* now fix up the button size */ tb->x = x; tb->y = y; tb->vertical = vert; tb->border_width = border_width; tb->width = width + MSWINDOWS_BUTTON_SHADOW_THICKNESS * 2; tb->height = height + MSWINDOWS_BUTTON_SHADOW_THICKNESS * 2; if (tb->blank) { if (vert) tb->height = MSWINDOWS_BLANK_SIZE; else tb->width = MSWINDOWS_BLANK_SIZE; } if (vert) y += tb->height; else x += tb->width; /* move on to the next button */ tbbutton++; button = tb->next; } button = FRAME_TOOLBAR_BUTTONS (f, pos); /* create the toolbar window? */ if (!toolbarwnd && (toolbarwnd = qxeCreateWindowEx (WS_EX_WINDOWEDGE, XETEXT (TOOLBARCLASSNAME), NULL, WS_CHILD | (style_3d ? WS_DLGFRAME : 0) | TBSTYLE_TOOLTIPS | CCS_NORESIZE | CCS_NOPARENTALIGN | CCS_NODIVIDER | CCS_ADJUSTABLE, x, y, bar_width, bar_height, FRAME_MSWINDOWS_HANDLE (f), (HMENU)(TOOLBAR_ID_BIAS + pos), NULL, NULL))==NULL) { xfree (button_tbl, TBBUTTON *); ImageList_Destroy (ilist); gui_error ("couldn't create toolbar", Qunbound); } /* finally populate with images */ if (qxeSendMessage (toolbarwnd, TB_BUTTONSTRUCTSIZE, (WPARAM)sizeof(TBBUTTON), (LPARAM)0) == -1) { mswindows_clear_toolbar (f, pos, 0); gui_error ("couldn't set button structure size", Qunbound); } if (vert) height = min (bmheight + padding, height); else width = min (bmwidth + padding, width); /* pad the buttons */ qxeSendMessage (toolbarwnd, TB_SETPADDING, 0, MAKELPARAM (width - bmwidth, height - bmheight)); /* set the size of buttons */ qxeSendMessage (toolbarwnd, TB_SETBUTTONSIZE, 0, (LPARAM) MAKELONG (width, height)); /* set the size of bitmaps */ qxeSendMessage (toolbarwnd, TB_SETBITMAPSIZE, 0, (LPARAM) MAKELONG (bmwidth, bmheight)); /* tell it we've done it */ qxeSendMessage (toolbarwnd, TB_AUTOSIZE, 0, 0); /* finally populate with images */ if (!qxeSendMessage (toolbarwnd, TB_ADDBUTTONS, (WPARAM) nbuttons, (LPARAM) button_tbl)) { mswindows_clear_toolbar (f, pos, 0); gui_error ("couldn't add button list to toolbar", Qunbound); } /* vertical toolbars need more rows */ if (vert) { RECT tmp; qxeSendMessage (toolbarwnd, TB_SETROWS, MAKEWPARAM (nbuttons, FALSE), (LPARAM) &tmp); } else { RECT tmp; qxeSendMessage (toolbarwnd, TB_SETROWS, MAKEWPARAM(1, FALSE), (LPARAM)&tmp); } /* finally populate with images */ if (qxeSendMessage (toolbarwnd, TB_SETIMAGELIST, 0, (LPARAM)ilist) < 0 || qxeSendMessage (toolbarwnd, TB_SETDISABLEDIMAGELIST, 0, (LPARAM)ilist) < 0) { mswindows_clear_toolbar (f, pos, 0); gui_error ("couldn't add image list to toolbar", Qunbound); } /* now display the window */ ShowWindow (toolbarwnd, SW_SHOW); /* no idea why this is necessary but initial display will not happen otherwise. */ mswindows_move_toolbar (f, pos); if (button_tbl) xfree (button_tbl, TBBUTTON *); SET_TOOLBAR_WAS_VISIBLE_FLAG (f, pos, 1); } } static void mswindows_move_toolbar (struct frame *f, enum toolbar_pos pos) { int bar_x, bar_y, bar_width, bar_height, vert; HWND toolbarwnd = TOOLBAR_HANDLE(f,pos); if (toolbarwnd) { get_toolbar_coords (f, pos, &bar_x, &bar_y, &bar_width, &bar_height, &vert, 1); /* #### This terrible mangling with coordinates perhaps arises from different treatment of toolbar positions by Windows and by XEmacs. */ switch (pos) { case TOP_TOOLBAR: bar_x--; bar_y-=2; bar_width+=3; bar_height+=3; break; case LEFT_TOOLBAR: bar_x--; bar_y-=2; bar_height++; bar_width++; break; case BOTTOM_TOOLBAR: bar_y-=2; bar_width+=4; bar_height+=4; break; case RIGHT_TOOLBAR: bar_y-=2; bar_x++; bar_width++; bar_height++; break; } SetWindowPos (toolbarwnd, NULL, bar_x, bar_y, bar_width, bar_height, SWP_NOZORDER); } } static void mswindows_redraw_exposed_toolbars (struct frame *f, int UNUSED (x), int UNUSED (y), int UNUSED (width), int UNUSED (height)) { assert (FRAME_MSWINDOWS_P (f)); if (FRAME_REAL_TOP_TOOLBAR_VISIBLE (f)) mswindows_move_toolbar (f, TOP_TOOLBAR); if (FRAME_REAL_BOTTOM_TOOLBAR_VISIBLE (f)) mswindows_move_toolbar (f, BOTTOM_TOOLBAR); if (FRAME_REAL_LEFT_TOOLBAR_VISIBLE (f)) mswindows_move_toolbar (f, LEFT_TOOLBAR); if (FRAME_REAL_RIGHT_TOOLBAR_VISIBLE (f)) mswindows_move_toolbar (f, RIGHT_TOOLBAR); } static void mswindows_redraw_frame_toolbars (struct frame *f) { mswindows_redraw_exposed_toolbars (f, 0, 0, FRAME_PIXWIDTH (f), FRAME_PIXHEIGHT (f)); } static void mswindows_initialize_frame_toolbars (struct frame *UNUSED (f)) { } static void mswindows_output_frame_toolbars (struct frame *f) { assert (FRAME_MSWINDOWS_P (f)); if (FRAME_REAL_TOP_TOOLBAR_VISIBLE (f)) mswindows_output_toolbar (f, TOP_TOOLBAR); if (FRAME_REAL_BOTTOM_TOOLBAR_VISIBLE (f)) mswindows_output_toolbar (f, BOTTOM_TOOLBAR); if (FRAME_REAL_LEFT_TOOLBAR_VISIBLE (f)) mswindows_output_toolbar (f, LEFT_TOOLBAR); if (FRAME_REAL_RIGHT_TOOLBAR_VISIBLE (f)) mswindows_output_toolbar (f, RIGHT_TOOLBAR); } static void mswindows_clear_frame_toolbars (struct frame *f) { assert (FRAME_MSWINDOWS_P (f)); if (f->top_toolbar_was_visible && !FRAME_REAL_TOP_TOOLBAR_VISIBLE (f)) mswindows_clear_toolbar (f, TOP_TOOLBAR, 0); if (f->bottom_toolbar_was_visible && !FRAME_REAL_BOTTOM_TOOLBAR_VISIBLE (f)) mswindows_clear_toolbar (f, BOTTOM_TOOLBAR, 0); if (f->left_toolbar_was_visible && !FRAME_REAL_LEFT_TOOLBAR_VISIBLE (f)) mswindows_clear_toolbar (f, LEFT_TOOLBAR, 0); if (f->right_toolbar_was_visible && !FRAME_REAL_RIGHT_TOOLBAR_VISIBLE (f)) mswindows_clear_toolbar (f, RIGHT_TOOLBAR, 0); } static void mswindows_free_frame_toolbars (struct frame *f) { HWND twnd=NULL; #define DELETE_TOOLBAR(pos) \ mswindows_clear_toolbar(f, pos, 0); \ if ((twnd=GetDlgItem(FRAME_MSWINDOWS_HANDLE(f), \ TOOLBAR_ID_BIAS + pos))) \ DestroyWindow(twnd) DELETE_TOOLBAR(TOP_TOOLBAR); DELETE_TOOLBAR(BOTTOM_TOOLBAR); DELETE_TOOLBAR(LEFT_TOOLBAR); DELETE_TOOLBAR(RIGHT_TOOLBAR); #undef DELETE_TOOLBAR } Lisp_Object mswindows_get_toolbar_button_text (struct frame *f, int command_id) { Lisp_Object button = Fgethash (make_int (command_id), FRAME_MSWINDOWS_TOOLBAR_HASH_TABLE (f), Qnil); if (!NILP (button)) { struct toolbar_button *tb = XTOOLBAR_BUTTON (button); return tb->help_string; } return Qnil; } /* * Return value is Qt if we have dispatched the command, * or Qnil if id has not been mapped to a callback. * Window procedure may try other targets to route the * command if we return nil */ Lisp_Object mswindows_handle_toolbar_wm_command (struct frame *f, HWND UNUSED (ctrl), WORD id) { /* Try to map the command id through the proper hash table */ Lisp_Object button, data, fn, arg, frame; button = Fgethash (make_int (id), FRAME_MSWINDOWS_TOOLBAR_HASH_TABLE (f), Qnil); if (NILP (button)) return Qnil; data = XTOOLBAR_BUTTON (button)->callback; /* #### ? */ if (UNBOUNDP (data)) return Qnil; /* Ok, this is our one. Enqueue it. */ get_gui_callback (data, &fn, &arg); frame = wrap_frame (f); mswindows_enqueue_misc_user_event (frame, fn, arg); return Qt; } /************************************************************************/ /* initialization */ /************************************************************************/ void console_type_create_toolbar_mswindows (void) { CONSOLE_HAS_METHOD (mswindows, output_frame_toolbars); CONSOLE_HAS_METHOD (mswindows, clear_frame_toolbars); CONSOLE_HAS_METHOD (mswindows, initialize_frame_toolbars); CONSOLE_HAS_METHOD (mswindows, free_frame_toolbars); CONSOLE_HAS_METHOD (mswindows, redraw_exposed_toolbars); CONSOLE_HAS_METHOD (mswindows, redraw_frame_toolbars); }