view src/toolbar-msw.c @ 826:6728e641994e

[xemacs-hg @ 2002-05-05 11:30:15 by ben] syntax cache, 8-bit-format, lots of code cleanup README.packages: Update info about --package-path. i.c: Create an inheritable event and pass it on to XEmacs, so that ^C can be handled properly. Intercept ^C and signal the event. "Stop Build" in VC++ now works. bytecomp-runtime.el: Doc string changes. compat.el: Some attempts to redo this to make it truly useful and fix the "multiple versions interacting with each other" problem. Not yet done. Currently doesn't work. files.el: Use with-obsolete-variable to avoid warnings in new revert-buffer code. xemacs.mak: Split up CFLAGS into a version without flags specifying the C library. The problem seems to be that minitar depends on zlib, which depends specifically on libc.lib, not on any of the other C libraries. Unless you compile with libc.lib, you get errors -- specifically, no _errno in the other libraries, which must make it something other than an int. (#### But this doesn't seem to obtain in XEmacs, which also uses zlib, and can be linked with any of the C libraries. Maybe zlib is used differently and doesn't need errno, or maybe XEmacs provides an int errno; ... I don't understand. Makefile.in.in: Fix so that packages are around when testing. abbrev.c, alloc.c, buffer.c, buffer.h, bytecode.c, callint.c, casefiddle.c, casetab.c, casetab.h, charset.h, chartab.c, chartab.h, cmds.c, console-msw.h, console-stream.c, console-x.c, console.c, console.h, data.c, device-msw.c, device.c, device.h, dialog-msw.c, dialog-x.c, dired-msw.c, dired.c, doc.c, doprnt.c, dumper.c, editfns.c, elhash.c, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, events.h, extents.c, extents.h, faces.c, file-coding.c, file-coding.h, fileio.c, fns.c, font-lock.c, frame-gtk.c, frame-msw.c, frame-x.c, frame.c, frame.h, glade.c, glyphs-gtk.c, glyphs-msw.c, glyphs-msw.h, glyphs-x.c, glyphs.c, glyphs.h, gui-msw.c, gui-x.c, gui.h, gutter.h, hash.h, indent.c, insdel.c, intl-win32.c, intl.c, keymap.c, lisp-disunion.h, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, marker.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, mule-ccl.c, mule-charset.c, mule-coding.c, mule-wnnfns.c, nas.c, objects-msw.c, objects-x.c, opaque.c, postgresql.c, print.c, process-nt.c, process-unix.c, process.c, process.h, profile.c, rangetab.c, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-x.c, redisplay.c, redisplay.h, regex.c, regex.h, scrollbar-msw.c, search.c, select-x.c, specifier.c, specifier.h, symbols.c, symsinit.h, syntax.c, syntax.h, syswindows.h, tests.c, text.c, text.h, tooltalk.c, ui-byhand.c, ui-gtk.c, unicode.c, win32.c, window.c: Another big Ben patch. -- FUNCTIONALITY CHANGES: add partial support for 8-bit-fixed, 16-bit-fixed, and 32-bit-fixed formats. not quite done yet. (in particular, needs functions to actually convert the buffer.) NOTE: lots of changes to regex.c here. also, many new *_fmt() inline funs that take an Internal_Format argument. redo syntax cache code. make the cache per-buffer; keep the cache valid across calls to functions that use it. also keep it valid across insertions/deletions and extent changes, as much as is possible. eliminate the junky regex-reentrancy code by passing in the relevant lisp info to the regex routines as local vars. add general mechanism in extents code for signalling extent changes. fix numerous problems with the case-table implementation; yoshiki never properly transferred many algorithms from old-style to new-style case tables. redo char tables to support a default argument, so that mapping only occurs over changed args. change many chartab functions to accept Lisp_Object instead of Lisp_Char_Table *. comment out the code in font-lock.c by default, because font-lock.el no longer uses it. we should consider eliminating it entirely. Don't output bell as ^G in console-stream when not a TTY. add -mswindows-termination-handle to interface with i.c, so we can properly kill a build. add more error-checking to buffer/string macros. add some additional buffer_or_string_() funs. -- INTERFACE CHANGES AFFECTING MORE CODE: switch the arguments of write_c_string and friends to be consistent with write_fmt_string, which must have printcharfun first. change BI_* macros to BYTE_* for increased clarity; similarly for bi_* local vars. change VOID_TO_LISP to be a one-argument function. eliminate no-longer-needed CVOID_TO_LISP. -- char/string macro changes: rename MAKE_CHAR() to make_emchar() for slightly less confusion with make_char(). (The former generates an Emchar, the latter a Lisp object. Conceivably we should rename make_char() -> wrap_char() and similarly for make_int(), make_float().) Similar changes for other *CHAR* macros -- we now consistently use names with `emchar' whenever we are working with Emchars. Any remaining name with just `char' always refers to a Lisp object. rename macros with XSTRING_* to string_* except for those that reference actual fields in the Lisp_String object, following conventions used elsewhere. rename set_string_{data,length} macros (the only ones to work with a Lisp_String_* instead of a Lisp_Object) to set_lispstringp_* to make the difference clear. try to be consistent about caps vs. lowercase in macro/inline-fun names for chars and such, which wasn't the case before. we now reserve caps either for XFOO_ macros that reference object fields (e.g. XSTRING_DATA) or for things that have non-function semantics, e.g. directly modifying an arg (BREAKUP_EMCHAR) or evaluating an arg (any arg) more than once. otherwise, use lowercase. here is a summary of most of the macros/inline funs changed by all of the above changes: BYTE_*_P -> byte_*_p XSTRING_BYTE -> string_byte set_string_data/length -> set_lispstringp_data/length XSTRING_CHAR_LENGTH -> string_char_length XSTRING_CHAR -> string_emchar INTBYTE_FIRST_BYTE_P -> intbyte_first_byte_p INTBYTE_LEADING_BYTE_P -> intbyte_leading_byte_p charptr_copy_char -> charptr_copy_emchar LEADING_BYTE_* -> leading_byte_* CHAR_* -> EMCHAR_* *_CHAR_* -> *_EMCHAR_* *_CHAR -> *_EMCHAR CHARSET_BY_ -> charset_by_* BYTE_SHIFT_JIS* -> byte_shift_jis* BYTE_BIG5* -> byte_big5* REP_BYTES_BY_FIRST_BYTE -> rep_bytes_by_first_byte char_to_unicode -> emchar_to_unicode valid_char_p -> valid_emchar_p Change intbyte_strcmp -> qxestrcmp_c (duplicated functionality). -- INTERFACE CHANGES AFFECTING LESS CODE: use DECLARE_INLINE_HEADER in various places. remove '#ifdef emacs' from XEmacs-only files. eliminate CHAR_TABLE_VALUE(), which duplicated the functionality of get_char_table(). add BUFFER_TEXT_LOOP to simplify iterations over buffer text. define typedefs for signed and unsigned types of fixed sizes (INT_32_BIT, UINT_32_BIT, etc.). create ALIGN_FOR_TYPE as a higher-level interface onto ALIGN_SIZE; fix code to use it. add charptr_emchar_len to return the text length of the character pointed to by a ptr; use it in place of charcount_to_bytecount(..., 1). add emchar_len to return the text length of a given character. add types Bytexpos and Charxpos to generalize Bytebpos/Bytecount and Charbpos/Charcount, in code (particularly, the extents code and redisplay code) that works with either kind of index. rename redisplay struct params with names such as `charbpos' to e.g. `charpos' when they are e.g. a Charxpos, not a Charbpos. eliminate xxDEFUN in place of DEFUN; no longer necessary with changes awhile back to doc.c. split up big ugly combined list of EXFUNs in lisp.h on a file-by-file basis, since other prototypes are similarly split. rewrite some "*_UNSAFE" macros as inline funs and eliminate the _UNSAFE suffix. move most string code from lisp.h to text.h; the string code and text.h code is now intertwined in such a fashion that they need to be in the same place and partially interleaved. (you can't create forward references for inline funs) automated/lisp-tests.el, automated/symbol-tests.el, automated/test-harness.el: Fix test harness to output FAIL messages to stderr when in batch mode. Fix up some problems in lisp-tests/symbol-tests that were causing spurious failures.
author ben
date Sun, 05 May 2002 11:33:57 +0000
parents a5954632b187
children 79c6ff3eef26
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 <andyp@parallax.co.uk>, 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.h"
#include "gui.h"
#include "toolbar.h"
#include "window.h"

#include "console-msw.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 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 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);
			      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);
			  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);
			  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);
	  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);

      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 x, int y, int width,
				   int 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 *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);
  else if (f->top_toolbar_was_visible)
    mswindows_clear_toolbar (f, TOP_TOOLBAR, 0);

  if (FRAME_REAL_BOTTOM_TOOLBAR_VISIBLE (f))
    mswindows_output_toolbar (f, BOTTOM_TOOLBAR);
  else if (f->bottom_toolbar_was_visible)
    mswindows_clear_toolbar (f, BOTTOM_TOOLBAR, 0);

  if (FRAME_REAL_LEFT_TOOLBAR_VISIBLE (f))
    mswindows_output_toolbar (f, LEFT_TOOLBAR);
  else if (f->left_toolbar_was_visible)
    mswindows_clear_toolbar (f, LEFT_TOOLBAR, 0);

  if (FRAME_REAL_RIGHT_TOOLBAR_VISIBLE (f))
    mswindows_output_toolbar (f, RIGHT_TOOLBAR);
  else if (f->right_toolbar_was_visible)
    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
}

/* map toolbar hwnd to pos */
static int
mswindows_find_toolbar_pos (struct frame *f, HWND ctrl)
{
  int id = GetDlgCtrlID (ctrl);
  return id ? id - TOOLBAR_ID_BIAS : -1;
}

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 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, initialize_frame_toolbars);
  CONSOLE_HAS_METHOD (mswindows, free_frame_toolbars);
  CONSOLE_HAS_METHOD (mswindows, redraw_exposed_toolbars);
  CONSOLE_HAS_METHOD (mswindows, redraw_frame_toolbars);
}