xemacs-beta: lwlib/xlwmenu.c comparison

comparison lwlib/xlwmenu.c @ 442:abe6d1db359e r21-2-36

Import from CVS: tag r21-2-36

author	cvs
date	Mon, 13 Aug 2007 11:35:02 +0200
parents	a5df635868b2
children	1ccc32a20af4

comparison

equal deleted inserted replaced

-:72a7cfa4a488
+:abe6d1db359e
 #ifdef USE_DEBUG_MALLOC
 #include <dmalloc.h>
 #endif
-/* simple, naieve integer maximum */
+/* simple, naive integer maximum */
 #ifndef max
 #define max(a,b) ((a)>(b)?(a):(b))
 #endif
 static char
 XtRString, (XtPointer) "-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-1"},
 #else
 {XtNfont,  XtCFont, XtRFontStruct, sizeof(XFontStruct *),
 offset(menu.font), XtRString, (XtPointer) "XtDefaultFont"},
 # ifdef USE_XFONTSET
+/* #### Consider using the same method as for Motif; see the comment in
+XlwMenuInitialize(). */
 {XtNfontSet,  XtCFontSet, XtRFontSet, sizeof(XFontSet),
 offset(menu.font_set), XtRString, (XtPointer) "XtDefaultFontSet"},
 # endif
 #endif
 {XtNforeground, XtCForeground, XtRPixel, sizeof(Pixel),
 # endif /* USE_XFONTSET */
 #endif
 }
 static void
-massage_resource_name (CONST char *in, char *out)
+massage_resource_name (const char *in, char *out)
 {
 /* Turn a random string into something suitable for using as a resource.
 For example:
 "Kill Buffer"		->	"killBuffer"
 #endif
 Boolean firstp = True;
 while (*in)
 {
-char ch = massaged_resource_char[(unsigned char) *in++];
+if (*in == '%' && *(in + 1) == '_')
-if (ch)
+	in += 2;
+else
 	{
-	  int int_ch = (int) (unsigned char) ch;
+	  char ch;
-	  *out++ = firstp ? tolower (int_ch) : toupper (int_ch);
-	  firstp = False;
+	  if (*in == '%' && *(in + 1) == '%')
-	  while ((ch = massaged_resource_char[(unsigned char) *in++]) != '\0')
+	    in++;
-	    *out++ = ch;
+	  ch = massaged_resource_char[(unsigned char) *in++];
-	  if (!*(in-1))		/* Overshot the NULL byte? */
+	  if (ch)
-	    break;
+	    {
+	      int int_ch = (int) (unsigned char) ch;
+	      *out++ = firstp ? tolower (int_ch) : toupper (int_ch);
+	      firstp = False;
+	      while ((ch = massaged_resource_char[(unsigned char) *in++])
+		     != '\0')
+		*out++ = ch;
+	      if (!*(in-1))		/* Overshot the NULL byte? */
+		break;
+	    }
 	}
 }
 *out = 0;
 #ifdef PRINT_XLWMENU_RESOURCE_CONVERSIONS
 {
 { "labelString", "LabelString", XtRString, sizeof(String),
 0, XtRImmediate, 0 }
 };
-/*
+/* This function searches STRING for parameter inserts of the form:
-*    This function looks through string searching for parameter
+%[padding]1
-*    inserts of the form:
+padding is either space (' ') or dash ('-') meaning
-*    %[padding]1
+padding to the left or right of the inserted parameter.
-*    padding is space (' ') or dash ('-') characters meaning
+In essence, all %1 strings are replaced by VALUE in the return value.
-*    padding to the left or right of the inserted parameter.
+The caller is expected to free the return value using XtFree().
-*    In essence all %1 strings are replaced by value in the return
+%% means insert one % (like printf).
-*    value (which the caller is expected to free).
+%1 means insert VALUE.
-*    %% means insert one % (like printf).
+%-1 means insert VALUE followed by one space. The latter is
-*    %1 means insert value.
+not inserted if VALUE is a zero length string.
-*    %-1 means insert value followed by one space. The latter is
+*/
-*    not inserted if value is a zero length string.
-*/
 static char*
-parameterize_string (CONST char *string, CONST char *value)
+parameterize_string (const char *string, const char *value)
 {
-char *percent;
+const char *percent;
 char *result;
 unsigned int done = 0;
 unsigned int ntimes;
 if (!string)
 {
 result = XtMalloc(1);
 result[0] = '\0';
-return (result);
+return result;
 }
 if (!value)
 value = "";
-for (ntimes = 1, result = (char *) string; (percent = strchr(result, '%'));
+for (ntimes = 1, percent = string;
+(percent = strchr (percent, '%'));
 ntimes++)
-result = &percent[1];
+percent++;
 result = XtMalloc ((ntimes * strlen(value)) + strlen(string) + 4);
 result[0] = '\0';
-while ((percent = strchr(string, '%')))
+while ((percent = strchr (string, '%')))
 {
 unsigned int left_pad;
 unsigned int right_pad;
-char *p;
+const char *p;
 if (percent[1] == '%')
 	{	/* it's a real % */
 	  strncat (result, string, 1 + percent - string); /* incl % */
 	  string = &percent[2];	/* after the second '%' */
 return (XmString) val->toolkit_data;
 }
 /* Unused */
 #if 0
-/* These two routines should be a seperate file..djw */
+/* These two routines should be a separate file..djw */
 static char *
 xlw_create_localized_string (Widget w,
 			     char *name,
 			     char **args,
 			     unsigned int nargs)
 else if (val->call_data) /* push button */
 return BUTTON_TYPE;
 else
 return TEXT_TYPE;
 #else
 else
 abort();
 return UNSPECIFIED_TYPE; /* Not reached */
 #endif
 }
 		    height, label_tab, binding_tab);
 }
 static struct _shadow_names
 {
-CONST char *      name;
+const char *      name;
 shadow_type type;
 } shadow_names[] =
 {
 /* Motif */
 { "singleLine", SHADOW_SINGLE_LINE },
 for (i = last_same + 1; i < new_depth; i++)
 old_stack [i] = new_stack [i];
 mw->menu.old_depth = new_depth;
-/* refresh the last seletion */
+/* refresh the last selection */
 selection_position.x = 0;
 selection_position.y = 0;
 display_menu (mw, last_same, new_selection == old_selection,
 		&selection_position, NULL, NULL, old_selection, new_selection);
 xgcv.fill_style = FillOpaqueStippled;
 xgcv.foreground = mw->menu.top_shadow_color;
 xgcv.background = mw->core.background_pixel;
 /*  xgcv.stipple = mw->menu.top_shadow_pixmap; gtb */
-#ifdef NEED_MOTIF
 if (mw->menu.top_shadow_pixmap &&
 mw->menu.top_shadow_pixmap != XmUNSPECIFIED_PIXMAP)
 xgcv.stipple = mw->menu.top_shadow_pixmap;
 else
 xgcv.stipple = 0;
-#else
-xgcv.stipple = mw->menu.top_shadow_pixmap;
-#endif /* NEED_MOTIF */
 pm = (xgcv.stipple ? GCStipple|GCFillStyle : 0);
 mw->menu.shadow_top_gc =
 XtGetGC((Widget)mw, GCForeground|GCBackground|pm, &xgcv);
 xgcv.foreground = mw->menu.bottom_shadow_color;
 /*  xgcv.stipple = mw->menu.bottom_shadow_pixmap; gtb */
-#ifdef NEED_MOTIF
 if (mw->menu.bottom_shadow_pixmap &&
 mw->menu.bottom_shadow_pixmap != XmUNSPECIFIED_PIXMAP)
 xgcv.stipple = mw->menu.bottom_shadow_pixmap;
 else
 xgcv.stipple = 0;
-#else
-xgcv.stipple = mw->menu.bottom_shadow_pixmap;
-#endif /* NEED_MOTIF */
 pm = (xgcv.stipple ? GCStipple|GCFillStyle : 0);
 mw->menu.shadow_bottom_gc =
 XtGetGC ((Widget)mw, GCForeground|GCBackground|pm, &xgcv);
 }
 mw->menu.gray_pixmap =
 XCreatePixmapFromBitmapData (display, window, (char *) gray_bits,
 				 gray_width, gray_height, 1, 0, 1);
 #ifdef NEED_MOTIF
+/* #### Even if it's a kludge!!!, we should consider doing the same for
+X Font Sets. */
 /* The menu.font_list slot came from the *fontList resource (Motif standard.)
 The menu.font_list_2 slot came from the *font resource, for backward
 compatibility with older versions of this code, and consistency with the
-rest of emacs.  If both font and fontList are specified, we use font.
+rest of emacs.  If both font and fontList are specified, we use fontList.
 If only one is specified, we use that.  If neither are specified, we
 use the "fallback" value.  What a kludge!!!
 Note that this has the bug that a more general wildcard like "*fontList:"
 will override a more specific resource like "Emacs*menubar.font:".  But

Mercurial > hg > xemacs-beta

comparison lwlib/xlwmenu.c @ 442:abe6d1db359e r21-2-36