xemacs-beta: src/glyphs-msw.c comparison

comparison src/glyphs-msw.c @ 438:84b14dcb0985 r21-2-27

Import from CVS: tag r21-2-27

author	cvs
date	Mon, 13 Aug 2007 11:32:25 +0200
parents	9d177e8d4150
children	8de8e3f6228a

comparison

equal deleted inserted replaced

-:e2a4e8b94b82
+:84b14dcb0985
 /* mswindows-specific glyph objects.
-Copyright (C) 1998, 1999 Andy Piper.
+Copyright (C) 1998, 1999, 2000 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
 static void set_mono_pixel ( unsigned char* bits,
 			     int bpline, int height,
 			     int x, int y, int white )
 {
-int index;
+int i;
 unsigned char    bitnum;
 /* Find the byte on which this scanline begins */
-index = (height - y - 1) * bpline;
+i = (height - y - 1) * bpline;
 /* Find the byte containing this pixel */
-index += (x >> 3);
+i += (x >> 3);
 /* Which bit is it? */
 bitnum = (unsigned char)( 7 - (x % 8) );
 if( white )         /* Turn it on */
-bits[index] |= (1<<bitnum);
+bits[i] |= (1<<bitnum);
 else         /* Turn it off */
-bits[index] &= ~(1<<bitnum);
+bits[i] &= ~(1<<bitnum);
 }
 static void
 mswindows_initialize_image_instance_mask (struct Lisp_Image_Instance* image,
 					  struct frame* f)
 &&
 !resource_name_to_resource (data, IMAGE_BITMAP))
 signal_simple_error ("invalid resource identifier", data);
 }
-void
-check_valid_string_or_int (Lisp_Object data)
-{
-if (!INTP (data))
-CHECK_STRING (data);
-else
-CHECK_INT (data);
-}
 /**********************************************************************
 *                             XBM                                    *
 **********************************************************************/
 #ifndef HAVE_X_WINDOWS
 /* $XConsortium: RdBitF.c,v 1.10 94/04/17 20:16:13 kaleb Exp $ */
 from left to right, little-endian within a byte.  0 = white, 1 =
 black.  It must be converted to the following format: Widths are
 padded to a multiple of 16.  Scan lines are stored in increasing
 byte order from left to right, big-endian within a byte.  0 =
 black, 1 = white.  */
-HBITMAP
+static HBITMAP
 xbm_create_bitmap_from_data (HDC hdc, char *data,
 			     unsigned int width, unsigned int height,
 			     int mask, COLORREF fg, COLORREF bg)
 {
 int old_width = (width + 7)/8;
 redisplay_output_subwindow */
 static void
 mswindows_map_subwindow (struct Lisp_Image_Instance *p, int x, int y,
 			 struct display_glyph_area* dga)
 {
+SetFocus (GetParent (IMAGE_INSTANCE_MSWINDOWS_CLIPWINDOW (p)));
 /* move the window before mapping it ... */
 SetWindowPos (IMAGE_INSTANCE_MSWINDOWS_CLIPWINDOW (p),
 		NULL,
 		x, y, dga->width, dga->height,
 		SWP_NOZORDER
 /* when you click on a widget you may activate another widget this
 needs to be checked and all appropriate widgets updated */
 static void
 mswindows_update_subwindow (struct Lisp_Image_Instance *p)
 {
+/* Now do widget specific updates. */
 if (IMAGE_INSTANCE_TYPE (p) == IMAGE_WIDGET)
 {
 /* buttons checked or otherwise */
 if ( EQ (IMAGE_INSTANCE_WIDGET_TYPE (p), Qbutton))
 	{
 /* set the widget font from the widget face */
 SendMessage (WIDGET_INSTANCE_MSWINDOWS_HANDLE (p),
 		   WM_SETFONT,
 		   (WPARAM)FONT_INSTANCE_MSWINDOWS_HFONT
-		   (XFONT_INSTANCE (widget_face_font_info
+		   (XFONT_INSTANCE (query_string_font
-				    (IMAGE_INSTANCE_SUBWINDOW_FRAME (p),
+				    (IMAGE_INSTANCE_WIDGET_TEXT (p),
 				     IMAGE_INSTANCE_WIDGET_FACE (p),
-				     0, 0))),
+				     IMAGE_INSTANCE_SUBWINDOW_FRAME (p)))),
 		   MAKELPARAM (TRUE, 0));
 }
 }
 /* register widgets into our hastable so that we can cope with the
 if (!NILP (pgui->callback))
 {
 id = mswindows_register_widget_instance (image_instance, domain);
 }
-/* have to set the type this late in case there is no device
-instantiation for a widget */
-IMAGE_INSTANCE_TYPE (ii) = IMAGE_WIDGET;
 if (!NILP (IMAGE_INSTANCE_WIDGET_TEXT (ii)))
 GET_C_STRING_OS_DATA_ALLOCA (IMAGE_INSTANCE_WIDGET_TEXT (ii), nm);
 /* allocate space for the clip window and then allocate the clip window */
 ii->data = xnew_and_zero (struct mswindows_subwindow_data);
 if ((IMAGE_INSTANCE_MSWINDOWS_CLIPWINDOW (ii)
 = CreateWindowEx(
-			0,		/* EX flags */
+			WS_EX_CONTROLPARENT,	/* EX flags */
 			XEMACS_CONTROL_CLASS,
 			0,		/* text */
 			WS_CLIPCHILDREN | WS_CLIPSIBLINGS | WS_CHILD,
 			0,         /* starting x position */
 			0,         /* starting y position */
 IMAGE_INSTANCE_SUBWINDOW_ID (ii) = wnd;
 SetWindowLong (wnd, GWL_USERDATA, (LONG)LISP_TO_VOID(image_instance));
 /* set the widget font from the widget face */
 SendMessage (wnd, WM_SETFONT,
 	       (WPARAM)FONT_INSTANCE_MSWINDOWS_HFONT
-	       (XFONT_INSTANCE (widget_face_font_info
+	       (XFONT_INSTANCE (query_string_font
-				(domain,
+				(IMAGE_INSTANCE_WIDGET_TEXT (ii),
 				 IMAGE_INSTANCE_WIDGET_FACE (ii),
-				 0, 0))),
+				 domain))),
 	       MAKELPARAM (TRUE, 0));
 }
 /* Instantiate a button widget. Unfortunately instantiated widgets are
 particular to a frame since they need to have a parent. It's not
 like images where you just select the image into the context you
-want to display it in and BitBlt it. So images instances can have a
+want to display it in and BitBlt it. So image instances can have a
 many-to-one relationship with things you see, whereas widgets can
 only be one-to-one (i.e. per frame) */
 static void
 mswindows_button_instantiate (Lisp_Object image_instance, Lisp_Object instantiator,
 			      Lisp_Object pointer_fg, Lisp_Object pointer_bg,
 			      int dest_mask, Lisp_Object domain)
 {
 /* this function can call lisp */
 struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
 HWND wnd;
-int flags = BS_NOTIFY;
+int flags = WS_TABSTOP;/* BS_NOTIFY #### is needed to get exotic feedback
+			    only. Since we seem to want nothing beyond BN_CLICK,
+			    the style is perhaps not necessary -- kkm */
 Lisp_Object style;
 Lisp_Object gui = IMAGE_INSTANCE_WIDGET_ITEM (ii);
 struct Lisp_Gui_Item* pgui = XGUI_ITEM (gui);
 Lisp_Object glyph = find_keyword_in_vector (instantiator, Q_image);
-if (!gui_item_active_p (gui))
-flags |= WS_DISABLED;
 if (!NILP (glyph))
 {
 if (!IMAGE_INSTANCEP (glyph))
 	glyph = glyph_image_instance (glyph, domain, ERROR_ME, 1);
 	  BS_BITMAP : BS_ICON;
 }
 style = pgui->style;
+/* #### consider using the default face for radio and toggle
+buttons. */
 if (EQ (style, Qradio))
 {
 flags |= BS_RADIOBUTTON;
 }
 else if (EQ (style, Qtoggle))
 {
 flags |= BS_AUTOCHECKBOX;
 }
 else
-flags |= BS_DEFPUSHBUTTON;
+{
+flags |= BS_DEFPUSHBUTTON;
+}
 mswindows_widget_instantiate (image_instance, instantiator, pointer_fg,
-				pointer_bg, dest_mask, domain, "BUTTON", flags,
+				pointer_bg, dest_mask, domain, "BUTTON",
-				WS_EX_CONTROLPARENT);
+				flags, 0);
 wnd = WIDGET_INSTANCE_MSWINDOWS_HANDLE (ii);
 /* set the checked state */
 if (gui_item_selected_p (gui))
 SendMessage (wnd, BM_SETCHECK, (WPARAM)BST_CHECKED, 0);
 if (!NILP (glyph) && IMAGE_INSTANCEP (glyph))
 {
 SendMessage (wnd, BM_SETIMAGE,
 		   (WPARAM) (XIMAGE_INSTANCE_MSWINDOWS_BITMAP (glyph) ?
 			     IMAGE_BITMAP : IMAGE_ICON),
-		   (LPARAM) (XIMAGE_INSTANCE_MSWINDOWS_BITMAP (glyph) ?
+		   (XIMAGE_INSTANCE_MSWINDOWS_BITMAP (glyph) ?
-			     XIMAGE_INSTANCE_MSWINDOWS_BITMAP (glyph) :
+		    (LPARAM) XIMAGE_INSTANCE_MSWINDOWS_BITMAP (glyph) :
-			     XIMAGE_INSTANCE_MSWINDOWS_ICON (glyph)));
+		    (LPARAM) XIMAGE_INSTANCE_MSWINDOWS_ICON (glyph)));
 }
 }
 /* instantiate an edit control */
 static void
 			    int dest_mask, Lisp_Object domain)
 {
 mswindows_widget_instantiate (image_instance, instantiator, pointer_fg,
 				pointer_bg, dest_mask, domain, "EDIT",
 				ES_LEFT | ES_AUTOHSCROLL | WS_TABSTOP
-				| WS_BORDER,
+				| WS_BORDER, WS_EX_CLIENTEDGE);
-				WS_EX_CLIENTEDGE | WS_EX_CONTROLPARENT);
 }
 /* instantiate a progress gauge */
 static void
 mswindows_progress_gauge_instantiate (Lisp_Object image_instance, Lisp_Object instantiator,
 {
 HWND wnd;
 struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
 mswindows_widget_instantiate (image_instance, instantiator, pointer_fg,
 				pointer_bg, dest_mask, domain, PROGRESS_CLASS,
-				WS_TABSTOP | WS_BORDER | PBS_SMOOTH,
+				WS_BORDER | PBS_SMOOTH, WS_EX_CLIENTEDGE);
-				WS_EX_CLIENTEDGE | WS_EX_CONTROLPARENT);
 wnd = WIDGET_INSTANCE_MSWINDOWS_HANDLE (ii);
 /* set the colors */
 #ifdef PBS_SETBKCOLOR
 SendMessage (wnd, PBS_SETBKCOLOR, 0,
 	       (LPARAM) (COLOR_INSTANCE_MSWINDOWS_COLOR
 struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
 mswindows_widget_instantiate (image_instance, instantiator, pointer_fg,
 				pointer_bg, dest_mask, domain, WC_TREEVIEW,
 				WS_TABSTOP | WS_BORDER | PBS_SMOOTH
 				| TVS_HASLINES | TVS_HASBUTTONS,
-				WS_EX_CLIENTEDGE | WS_EX_CONTROLPARENT);
+				WS_EX_CLIENTEDGE);
 wnd = WIDGET_INSTANCE_MSWINDOWS_HANDLE (ii);
 /* define a root */
 parent = add_tree_item (image_instance, wnd, NULL,
 }
 /* instantiate a tab control */
 static TC_ITEM* add_tab_item (Lisp_Object image_instance,
 			     HWND wnd, Lisp_Object item,
-			     Lisp_Object domain, int index)
+			     Lisp_Object domain, int i)
 {
 TC_ITEM tvitem, *ret;
 tvitem.mask = TCIF_TEXT;
 }
 tvitem.cchTextMax = strlen (tvitem.pszText);
 if ((ret = (TC_ITEM*)SendMessage (wnd, TCM_INSERTITEM,
-				    index, (LPARAM)&tvitem)) < 0)
+				    i, (LPARAM)&tvitem)) < 0)
 signal_simple_error ("error adding tab entry", item);
 return ret;
 }
 			   Lisp_Object pointer_fg, Lisp_Object pointer_bg,
 			   int dest_mask, Lisp_Object domain)
 {
 Lisp_Object rest;
 HWND wnd;
-int index = 0;
+int i = 0;
 struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
+Lisp_Object orient = find_keyword_in_vector (instantiator, Q_orientation);
+unsigned int flags = WS_TABSTOP;
+if (EQ (orient, Qleft) || EQ (orient, Qright))
+{
+flags |= TCS_VERTICAL | TCS_MULTILINE;
+}
+if (EQ (orient, Qright) || EQ (orient, Qbottom))
+{
+flags |= TCS_BOTTOM;
+}
 mswindows_widget_instantiate (image_instance, instantiator, pointer_fg,
 				pointer_bg, dest_mask, domain, WC_TABCONTROL,
 				/* borders don't suit tabs so well */
-				WS_TABSTOP,
+				flags, 0);
-				WS_EX_CONTROLPARENT);
 wnd = WIDGET_INSTANCE_MSWINDOWS_HANDLE (ii);
 /* add items to the tab */
 LIST_LOOP (rest, XCDR (IMAGE_INSTANCE_WIDGET_ITEMS (ii)))
 {
-add_tab_item (image_instance, wnd, XCAR (rest), domain, index);
+add_tab_item (image_instance, wnd, XCAR (rest), domain, i);
-index++;
+i++;
 }
 }
 /* set the properties of a tab control */
 static Lisp_Object
 struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
 if (EQ (prop, Q_items))
 {
 HWND wnd = WIDGET_INSTANCE_MSWINDOWS_HANDLE (ii);
-int index = 0;
+int i = 0;
 Lisp_Object rest;
 check_valid_item_list_1 (val);
 /* delete the pre-existing items */
 SendMessage (wnd, TCM_DELETEALLITEMS, 0, 0);
 /* add items to the tab */
 LIST_LOOP (rest, XCDR (IMAGE_INSTANCE_WIDGET_ITEMS (ii)))
 	{
 	  add_tab_item (image_instance, wnd, XCAR (rest),
-			IMAGE_INSTANCE_SUBWINDOW_FRAME (ii), index);
+			IMAGE_INSTANCE_SUBWINDOW_FRAME (ii), i);
-	  index++;
+	  i++;
 	}
 return Qt;
 }
 return Qunbound;
 				 Lisp_Object pointer_fg, Lisp_Object pointer_bg,
 				 int dest_mask, Lisp_Object domain)
 {
 mswindows_widget_instantiate (image_instance, instantiator, pointer_fg,
 				pointer_bg, dest_mask, domain, "SCROLLBAR",
-				0,
+				WS_TABSTOP, WS_EX_CLIENTEDGE);
-				WS_EX_CLIENTEDGE );
 }
 /* instantiate a combo control */
 static void
 mswindows_combo_box_instantiate (Lisp_Object image_instance, Lisp_Object instantiator,
 struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
 HANDLE wnd;
 Lisp_Object rest;
 Lisp_Object data = Fplist_get (find_keyword_in_vector (instantiator, Q_properties),
 				 Q_items, Qnil);
-int len;
+int len, height;
-GET_LIST_LENGTH (data, len);
 /* Maybe ought to generalise this more but it may be very windows
 specific. In windows the window height of a combo box is the
 height when the combo box is open. Thus we need to set the height
 before creating the window and then reset it to a single line
 after the window is created so that redisplay does the right
 thing. */
-widget_instantiate_1 (image_instance, instantiator, pointer_fg,
+widget_instantiate (image_instance, instantiator, pointer_fg,
-			pointer_bg, dest_mask, domain, len + 1, 0, 0);
+		      pointer_bg, dest_mask, domain);
+/* We now have everything right apart from the height. */
+default_face_font_info (domain, 0, 0, &height, 0, 0);
+GET_LIST_LENGTH (data, len);
+height = (height + WIDGET_BORDER_HEIGHT * 2 ) * len;
+IMAGE_INSTANCE_HEIGHT (ii) = height;
+/* Now create the widget. */
 mswindows_widget_instantiate (image_instance, instantiator, pointer_fg,
 				pointer_bg, dest_mask, domain, "COMBOBOX",
 				WS_BORDER | WS_TABSTOP | CBS_DROPDOWN
 				| CBS_AUTOHSCROLL
 				| CBS_HASSTRINGS | WS_VSCROLL,
-				WS_EX_CLIENTEDGE | WS_EX_CONTROLPARENT);
+				WS_EX_CLIENTEDGE);
-/* reset the height */
+/* Reset the height. layout will probably do this safely, but better make sure. */
-widget_text_to_pixel_conversion (domain,
+image_instance_layout (image_instance,
-				   IMAGE_INSTANCE_WIDGET_FACE (ii), 1, 0,
+			 IMAGE_UNSPECIFIED_GEOMETRY,
-				   &IMAGE_INSTANCE_SUBWINDOW_HEIGHT (ii), 0);
+			 IMAGE_UNSPECIFIED_GEOMETRY,
+			 domain);
 wnd = WIDGET_INSTANCE_MSWINDOWS_HANDLE (ii);
 /* add items to the combo box */
 SendMessage (wnd, CB_RESETCONTENT, 0, 0);
 LIST_LOOP (rest, Fplist_get (IMAGE_INSTANCE_WIDGET_PROPS (ii), Q_items, Qnil))
 {
 Extbyte* lparam=0;
 CHECK_STRING (val);
 GET_C_STRING_OS_DATA_ALLOCA (val, lparam);
 SendMessage (WIDGET_INSTANCE_MSWINDOWS_HANDLE (ii),
 		   WM_SETTEXT, 0, (LPARAM)lparam);
-return Qt;
+/* We don't return Qt here so that other widget methods can be
+called afterwards. */
 }
 return Qunbound;
 }
 /* set the properties of a progres guage */
 }
 return Qunbound;
 }
 LRESULT WINAPI
-mswindows_control_wnd_proc (HWND hwnd, UINT message,
+mswindows_control_wnd_proc (HWND hwnd, UINT msg,
 			    WPARAM wParam, LPARAM lParam)
 {
-switch (message)
+switch (msg)
 {
 case WM_NOTIFY:
 case WM_COMMAND:
 case WM_CTLCOLORBTN:
 case WM_CTLCOLORLISTBOX:
 case WM_CTLCOLOREDIT:
 case WM_CTLCOLORSTATIC:
 case WM_CTLCOLORSCROLLBAR:
-return mswindows_wnd_proc (GetParent (hwnd), message, wParam, lParam);
+return mswindows_wnd_proc (GetParent (hwnd), msg, wParam, lParam);
 default:
-return DefWindowProc (hwnd, message, wParam, lParam);
+return DefWindowProc (hwnd, msg, wParam, lParam);
 }
 }
 #endif /* HAVE_WIDGETS */

Mercurial > hg > xemacs-beta

comparison src/glyphs-msw.c @ 438:84b14dcb0985 r21-2-27