emacs: lwlib/xlwmenu.c comparison

comparison lwlib/xlwmenu.c @ 90127:30ad2795fdab

Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-28 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 180-191) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 39-44) - Merge from emacs--cvs-trunk--0 - Update from CVS

author	Miles Bader <miles@gnu.org>
date	Sat, 19 Mar 2005 02:42:17 +0000
parents	95879cc1ed20 2610d09357c8
children	13796b0653c7

comparison

equal deleted inserted replaced

-:8ee106ee2dc8
+:30ad2795fdab
 /* Implements a lightweight menubar widget.
 Copyright (C) 1992 Lucid, Inc.
-Copyright (C) 2002 Free Software Foundation, Inc.
+Copyright (C) 2002, 2005 Free Software Foundation, Inc.
 This file is part of the Lucid Widget Library.
 The Lucid Widget Library is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License as published by
 #define offset(field) XtOffset(XlwMenuWidget, field)
 static XtResource
 xlwMenuResources[] =
 {
+#ifdef HAVE_X_I18N
+{XtNfont,  XtCFont, XtRFontSet, sizeof(XFontSet),
+offset(menu.font), XtRString, "XtDefaultFontSet"},
+#else
 {XtNfont,  XtCFont, XtRFontStruct, sizeof(XFontStruct *),
-offset(menu.font),XtRString, "XtDefaultFont"},
+offset(menu.font), XtRString, "XtDefaultFont"},
+#endif
 {XtNforeground, XtCForeground, XtRPixel, sizeof(Pixel),
 offset(menu.foreground), XtRString, "XtDefaultForeground"},
 {XtNdisabledForeground, XtCDisabledForeground, XtRPixel, sizeof(Pixel),
 offset(menu.disabled_foreground), XtRString, (XtPointer)NULL},
 {XtNbuttonForeground, XtCButtonForeground, XtRPixel, sizeof(Pixel),
 XtNumber(xlwMenuActionsList),	/* num_actions		  */
 xlwMenuResources,			/* resources		  */
 XtNumber(xlwMenuResources),		/* resource_count	  */
 NULLQUARK,				/* xrm_class		  */
 TRUE,				/* compress_motion	  */
-TRUE,				/* compress_exposure	  */
+XtExposeCompressMaximal,		/* compress_exposure	  */
 TRUE,				/* compress_enterleave    */
 FALSE,				/* visible_interest	  */
 XlwMenuDestroy,			/* destroy		  */
 XlwMenuResize,			/* resize		  */
 XlwMenuRedisplay,			/* expose		  */
 int
 string_width (mw, s)
 XlwMenuWidget mw;
 char *s;
 {
+#ifdef HAVE_X_I18N
+XRectangle ink, logical;
+XmbTextExtents (mw->menu.font, s, strlen (s), &ink, &logical);
+return logical.width;
+#else
 XCharStruct xcs;
 int drop;
 XTextExtents (mw->menu.font, s, strlen (s), &drop, &drop, &drop, &xcs);
 return xcs.width;
-}
+#endif
+}
+#ifdef HAVE_X_I18N
+#define MENU_FONT_HEIGHT(mw) \
+((mw)->menu.font_extents->max_logical_extent.height)
+#define MENU_FONT_ASCENT(mw) \
+(- (mw)->menu.font_extents->max_logical_extent.y)
+#else
+#define MENU_FONT_HEIGHT(mw) \
+((mw)->menu.font->ascent + (mw)->menu.font->descent)
+#define MENU_FONT_ASCENT(mw) ((mw)->menu.font->ascent)
+#endif
 static int
 arrow_width (mw)
 XlwMenuWidget mw;
 {
-return (mw->menu.font->ascent * 3/4) | 1;
+return (MENU_FONT_ASCENT (mw) * 3/4) | 1;
 }
 /* Return the width of toggle buttons of widget MW.  */
 static int
 toggle_button_width (mw)
 XlwMenuWidget mw;
 {
-return ((mw->menu.font->ascent + mw->menu.font->descent) * 2 / 3) | 1;
+return (MENU_FONT_HEIGHT (mw) * 2 / 3) | 1;
 }
 /* Return the width of radio buttons of widget MW.  */
 *rest_width = 0;
 *button_width = 0;
 }
 else
 {
-*height =
+*height = MENU_FONT_HEIGHT (mw)
-	mw->menu.font->ascent + mw->menu.font->descent
+	+ 2 * mw->menu.vertical_spacing + 2 * mw->menu.shadow_thickness;
-	  + 2 * mw->menu.vertical_spacing + 2 * mw->menu.shadow_thickness;
 *label_width =
 	string_width (mw, resource_widget_value (mw, val))
 	  + mw->menu.horizontal_spacing + mw->menu.shadow_thickness;
 /* alpha = atan (0.5)
 factor = (1 + sin (alpha)) / cos (alpha) */
 double factor = 1.62;
 int thickness2 = thickness * factor;
-y += (mw->menu.font->ascent + mw->menu.font->descent - height) / 2;
+y += (MENU_FONT_HEIGHT (mw) - height) / 2;
 if (down_p)
 {
 GC temp;
 temp = top_gc;
 int width, height;
 width = toggle_button_width (mw);
 height = width;
 x += mw->menu.horizontal_spacing;
-y += (mw->menu.font->ascent - height) / 2;
+y += (MENU_FONT_ASCENT (mw) - height) / 2;
 draw_shadow_rectangle (mw, window, x, y, width, height, False, selected_p);
 }
 /* Draw a radio button on widget MW, X window WINDOW.  X/Y is the
 int width, height;
 width = radio_button_width (mw);
 height = width;
 x += mw->menu.horizontal_spacing;
-y += (mw->menu.font->ascent - height) / 2;
+y += (MENU_FONT_ASCENT (mw) - height) / 2;
 draw_shadow_rhombus (mw, window, x, y, width, height, False, selected_p);
 }
 /* Draw a menu separator on widget MW, X window WINDOW.  X/Y is the
 Boolean horizontal_p;
 Boolean just_compute_p;
 {
 GC deco_gc;
 GC text_gc;
-int font_ascent = mw->menu.font->ascent;
+int font_height = MENU_FONT_HEIGHT (mw);
-int font_descent = mw->menu.font->descent;
+int font_ascent = MENU_FONT_ASCENT (mw);
 int shadow = mw->menu.shadow_thickness;
 int margin = mw->menu.margin;
 int h_spacing = mw->menu.horizontal_spacing;
 int v_spacing = mw->menu.vertical_spacing;
 int label_width;
 	    }
 	  else if (!horizontal_p && ws->button_width)
 	    x_offset += ws->button_width;
-XDrawString (XtDisplay (mw), ws->window, text_gc, x_offset,
+#ifdef HAVE_X_I18N
+XmbDrawString (XtDisplay (mw), ws->window, mw->menu.font,
+#else
+XDrawString (XtDisplay (mw), ws->window,
+#endif
+		       text_gc, x_offset,
 		       y + v_spacing + shadow + font_ascent,
 		       display_string, strlen (display_string));
 	  if (!horizontal_p)
 	    {
 			      y + v_spacing + shadow, a_w,
 			      highlighted_p);
 		}
 	      else if (val->key)
 		{
-		  XDrawString (XtDisplay (mw), ws->window, text_gc,
+#ifdef HAVE_X_I18N
+		  XmbDrawString (XtDisplay (mw), ws->window, mw->menu.font,
+#else
+		  XDrawString (XtDisplay (mw), ws->window,
+#endif
+			       text_gc,
 			       x + label_width + mw->menu.arrow_spacing,
 			       y + v_spacing + shadow + font_ascent,
 			       val->key, strlen (val->key));
 		}
 	    }
 	    {
 	      XDrawRectangle (XtDisplay (mw), ws->window,
 			      mw->menu.background_gc,
 			      x + shadow, y + shadow,
 			      label_width + h_spacing - 1,
-			      font_ascent + font_descent + 2 * v_spacing - 1);
+			      font_height + 2 * v_spacing - 1);
 	      draw_shadow_rectangle (mw, ws->window, x, y, width, height,
 				     True, False);
 	    }
 	  if (highlighted_p)
 XlwMenuWidget mw;
 {
 XGCValues xgcv;
 float scale;
+#ifndef HAVE_X_I18N
 xgcv.font = mw->menu.font->fid;
+#endif
 xgcv.foreground = mw->menu.foreground;
 xgcv.background = mw->core.background_pixel;
 mw->menu.foreground_gc = XtGetGC ((Widget)mw,
-				    GCFont | GCForeground | GCBackground,
+#ifndef HAVE_X_I18N
+				    GCFont |
+#endif
+				    GCForeground | GCBackground,
 				    &xgcv);
+#ifndef HAVE_X_I18N
 xgcv.font = mw->menu.font->fid;
+#endif
 xgcv.foreground = mw->menu.button_foreground;
 xgcv.background = mw->core.background_pixel;
 mw->menu.button_gc = XtGetGC ((Widget)mw,
-				GCFont | GCForeground | GCBackground,
+#ifndef HAVE_X_I18N
+				GCFont |
+#endif
+				GCForeground | GCBackground,
 				&xgcv);
+#ifndef HAVE_X_I18N
 xgcv.font = mw->menu.font->fid;
+#endif
 xgcv.background = mw->core.background_pixel;
 #define BRIGHTNESS(color) (((color) & 0xff) + (((color) >> 8) & 0xff) + (((color) >> 16) & 0xff))
 /* Allocate color for disabled menu-items.  */
 /* Too few colors, use stipple.  */
 xgcv.foreground = mw->menu.foreground;
 xgcv.fill_style = FillStippled;
 xgcv.stipple = mw->menu.gray_pixmap;
 mw->menu.disabled_gc = XtGetGC ((Widget)mw,
-				      (GCFont | GCForeground | GCBackground
+#ifndef HAVE_X_I18N
-				       | GCFillStyle | GCStipple), &xgcv);
+				      GCFont |
+#endif
+				      GCForeground | GCBackground
+				      | GCFillStyle | GCStipple, &xgcv);
 }
 else
 {
 /* Many colors available, use disabled pixel.  */
 xgcv.foreground = mw->menu.disabled_foreground;
 mw->menu.disabled_gc = XtGetGC ((Widget)mw,
-				      (GCFont | GCForeground | GCBackground), &xgcv);
+#ifndef HAVE_X_I18N
-}
+				      GCFont |
+#endif
+				      GCForeground | GCBackground, &xgcv);
+}
+#ifndef HAVE_X_I18N
 xgcv.font = mw->menu.font->fid;
+#endif
 xgcv.foreground = mw->menu.button_foreground;
 xgcv.background = mw->core.background_pixel;
 xgcv.fill_style = FillStippled;
 xgcv.stipple = mw->menu.gray_pixmap;
 mw->menu.inactive_button_gc = XtGetGC ((Widget)mw,
-				  (GCFont | GCForeground | GCBackground
+#ifndef HAVE_X_I18N
-				   | GCFillStyle | GCStipple), &xgcv);
+					 GCFont |
+#endif
+					 GCForeground | GCBackground
+					 | GCFillStyle | GCStipple, &xgcv);
+#ifndef HAVE_X_I18N
 xgcv.font = mw->menu.font->fid;
+#endif
 xgcv.foreground = mw->core.background_pixel;
 xgcv.background = mw->menu.foreground;
 mw->menu.background_gc = XtGetGC ((Widget)mw,
-				    GCFont | GCForeground | GCBackground,
+#ifndef HAVE_X_I18N
+				    GCFont |
+#endif
+				    GCForeground | GCBackground,
 				    &xgcv);
 }
 static void
 release_drawing_gcs (mw)
 mw->menu.gray_pixmap
 = XCreatePixmapFromBitmapData (display, window, gray_bitmap_bits,
 				   gray_bitmap_width, gray_bitmap_height,
 				   (unsigned long)1, (unsigned long)0, 1);
+#ifndef HAVE_X_I18N
 /* I don't understand why this ends up 0 sometimes,
 but it does.  This kludge works around it.
 Can anyone find a real fix?   -- rms.  */
 if (mw->menu.font == 0)
 mw->menu.font = xlwmenu_default_font;
+#else
+mw->menu.font_extents = XExtentsOfFontSet (mw->menu.font);
+#endif
 make_drawing_gcs (mw);
 make_shadow_gcs (mw);
 mw->menu.popped_up = False;
 && newmw->menu.contents->change >= VISIBLE_CHANGE)
 redisplay = True;
 if (newmw->core.background_pixel != oldmw->core.background_pixel
 || newmw->menu.foreground != oldmw->menu.foreground
-|| newmw->menu.font != oldmw->menu.font)
+#ifndef HAVE_X_I18N
+|| newmw->menu.font != oldmw->menu.font
+#endif
+)
 {
 release_drawing_gcs (newmw);
 make_drawing_gcs (newmw);
 release_shadow_gcs (newmw);
 	    /* clear windows and generate expose events */
 	    XClearArea (XtDisplay (oldmw), oldmw->menu.windows[i].window,
 			0, 0, 0, 0, True);
 	  }
 }
+#ifdef HAVE_X_I18N
+if (newmw->menu.font != oldmw->menu.font)
+{
+redisplay = True;
+newmw->menu.font_extents = XExtentsOfFontSet (newmw->menu.font);
+}
+#endif
 return redisplay;
 }
 static void

Mercurial > emacs

comparison lwlib/xlwmenu.c @ 90127:30ad2795fdab