[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/xfaces.c [lexbind]
|
From: |
Miles Bader |
|
Subject: |
[Emacs-diffs] Changes to emacs/src/xfaces.c [lexbind] |
|
Date: |
Tue, 14 Oct 2003 19:23:33 -0400 |
Index: emacs/src/xfaces.c
diff -c emacs/src/xfaces.c:1.255.2.1 emacs/src/xfaces.c:1.255.2.2
*** emacs/src/xfaces.c:1.255.2.1 Fri Apr 4 01:21:08 2003
--- emacs/src/xfaces.c Tue Oct 14 19:22:49 2003
***************
*** 228,237 ****
#define check_x check_w32
#define x_list_fonts w32_list_fonts
#define GCGraphicsExposures 0
- /* For historic reasons, FONT_WIDTH refers to average width on W32,
- not maximum as on X. Redefine here. */
- #undef FONT_WIDTH
- #define FONT_WIDTH FONT_MAX_WIDTH
#endif /* WINDOWSNT */
#ifdef MAC_OS
--- 228,233 ----
***************
*** 368,373 ****
--- 364,373 ----
Lisp_Object Vface_ignored_fonts;
+ /* Alist of font name patterns vs the rescaling factor. */
+
+ Lisp_Object Vface_font_rescale_alist;
+
/* Maximum number of fonts to consider in font_list. If not an
integer > 0, DEFAULT_FONT_LIST_LIMIT is used instead. */
***************
*** 1211,1240 ****
/***********************************************************************
- Minimum font bounds
- ***********************************************************************/
-
- #ifdef HAVE_WINDOW_SYSTEM
-
- /* Update the line_height of frame F. Return non-zero if line height
- changes. */
-
- int
- frame_update_line_height (f)
- struct frame *f;
- {
- int line_height, changed_p;
-
- line_height = FONT_HEIGHT (FRAME_FONT (f));
- changed_p = line_height != FRAME_LINE_HEIGHT (f);
- FRAME_LINE_HEIGHT (f) = line_height;
- return changed_p;
- }
-
- #endif /* HAVE_WINDOW_SYSTEM */
-
-
- /***********************************************************************
Fonts
***********************************************************************/
--- 1211,1216 ----
***************
*** 1935,1940 ****
--- 1911,1921 ----
split_font_name for which these are. */
int numeric[XLFD_LAST];
+ /* If the original name matches one of Vface_font_rescale_alist,
+ the value is the corresponding rescale ratio. Otherwise, the
+ value is 1.0. */
+ double rescale_ratio;
+
/* Lower value mean higher priority. */
int registry_priority;
};
***************
*** 2265,2270 ****
--- 2246,2270 ----
}
+ /* Return a rescaling ratio of a font of NAME. */
+
+ static double
+ font_rescale_ratio (name)
+ char *name;
+ {
+ Lisp_Object tail, elt;
+
+ for (tail = Vface_font_rescale_alist; CONSP (tail); tail = XCDR (tail))
+ {
+ elt = XCAR (tail);
+ if (STRINGP (XCAR (elt)) && FLOATP (XCDR (elt))
+ && fast_c_string_match_ignore_case (XCAR (elt), name) >= 0)
+ return XFLOAT_DATA (XCDR (elt));
+ }
+ return 1.0;
+ }
+
+
/* Split XLFD font name FONT->name destructively into NUL-terminated,
lower-case fields in FONT->fields. NUMERIC_P non-zero means
compute numeric values for fields XLFD_POINT_SIZE, XLFD_SWIDTH,
***************
*** 2281,2286 ****
--- 2281,2291 ----
{
int i = 0;
int success_p;
+ double rescale_ratio;
+
+ if (numeric_p)
+ /* This must be done before splitting the font name. */
+ rescale_ratio = font_rescale_ratio (font->name);
if (*font->name == '-')
{
***************
*** 2340,2345 ****
--- 2345,2351 ----
font->numeric[XLFD_WEIGHT] = xlfd_numeric_weight (font);
font->numeric[XLFD_SWIDTH] = xlfd_numeric_swidth (font);
font->numeric[XLFD_AVGWIDTH] = atoi (font->fields[XLFD_AVGWIDTH]);
+ font->rescale_ratio = rescale_ratio;
}
/* Initialize it to zero. It will be overridden by font_list while
***************
*** 2930,2939 ****
? NULL
: FACE_FROM_ID (f, face_id));
if (face && face->font)
size = FONT_WIDTH (face->font);
else
! size = FONT_WIDTH (FRAME_FONT (f));
if (!NILP (width))
size *= XINT (width);
--- 2936,2952 ----
? NULL
: FACE_FROM_ID (f, face_id));
+ #ifdef WINDOWSNT
+ /* For historic reasons, FONT_WIDTH refers to average width on W32,
+ not maximum as on X. Redefine here. */
+ #undef FONT_WIDTH
+ #define FONT_WIDTH FONT_MAX_WIDTH
+ #endif
+
if (face && face->font)
size = FONT_WIDTH (face->font);
else
! size = FONT_WIDTH (FRAME_FONT (f)); /* FRAME_COLUMN_WIDTH (f) */
if (!NILP (width))
size *= XINT (width);
***************
*** 4123,4142 ****
struct frame *f;
Lisp_Object tmp;
- CHECK_STRING (value);
if (EQ (frame, Qt))
f = SELECTED_FRAME ();
else
f = check_x_frame (frame);
! /* VALUE may be a fontset name or an alias of fontset. In
! such a case, use the base fontset name. */
! tmp = Fquery_fontset (value, Qnil);
! if (!NILP (tmp))
! value = tmp;
! if (!set_lface_from_font_name (f, lface, value, 1, 1))
! signal_error ("Invalid font or fontset name", value);
font_attr_p = 1;
}
--- 4136,4159 ----
struct frame *f;
Lisp_Object tmp;
if (EQ (frame, Qt))
f = SELECTED_FRAME ();
else
f = check_x_frame (frame);
! if (!UNSPECIFIEDP (value))
! {
! CHECK_STRING (value);
! /* VALUE may be a fontset name or an alias of fontset. In
! such a case, use the base fontset name. */
! tmp = Fquery_fontset (value, Qnil);
! if (!NILP (tmp))
! value = tmp;
!
! if (!set_lface_from_font_name (f, lface, value, 1, 1))
! signal_error ("Invalid font or fontset name", value);
! }
font_attr_p = 1;
}
***************
*** 4323,4328 ****
--- 4340,4346 ----
xfree (font);
}
+ f->default_face_done_p = 0;
Fmodify_frame_parameters (frame, Fcons (Fcons (Qfont, font_name),
Qnil));
}
}
***************
*** 4405,4412 ****
Lisp_Object resource, class, frame;
{
Lisp_Object value = Qnil;
- #ifndef WINDOWSNT
- #ifndef MAC_OS
CHECK_STRING (resource);
CHECK_STRING (class);
CHECK_LIVE_FRAME (frame);
--- 4423,4428 ----
***************
*** 4414,4421 ****
value = display_x_get_resource (FRAME_X_DISPLAY_INFO (XFRAME (frame)),
resource, class, Qnil, Qnil);
UNBLOCK_INPUT;
- #endif /* not MAC_OS */
- #endif /* not WINDOWSNT */
return value;
}
--- 4430,4435 ----
***************
*** 5987,5998 ****
if (compare_pt_p || xlfd_idx != XLFD_POINT_SIZE)
{
! int delta1 = abs (values[i] - font1->numeric[xlfd_idx]);
! int delta2 = abs (values[i] - font2->numeric[xlfd_idx]);
- if (xlfd_idx == XLFD_POINT_SIZE
- && abs (delta1 - delta2) < FONT_POINT_SIZE_QUANTUM)
- continue;
if (delta1 > delta2)
return 0;
else if (delta1 < delta2)
--- 6001,6023 ----
if (compare_pt_p || xlfd_idx != XLFD_POINT_SIZE)
{
! int delta1, delta2;
!
! if (xlfd_idx == XLFD_POINT_SIZE)
! {
! delta1 = abs (values[i] - (font1->numeric[xlfd_idx]
! / font1->rescale_ratio));
! delta2 = abs (values[i] - (font2->numeric[xlfd_idx]
! / font2->rescale_ratio));
! if (abs (delta1 - delta2) < FONT_POINT_SIZE_QUANTUM)
! continue;
! }
! else
! {
! delta1 = abs (values[i] - font1->numeric[xlfd_idx]);
! delta2 = abs (values[i] - font2->numeric[xlfd_idx]);
! }
if (delta1 > delta2)
return 0;
else if (delta1 < delta2)
***************
*** 6020,6025 ****
--- 6045,6062 ----
return 1;
}
+ if (! compare_pt_p)
+ {
+ /* We prefer a real scalable font; i.e. not what autoscaled. */
+ int auto_scaled_1 = (font1->numeric[XLFD_POINT_SIZE] == 0
+ && font1->numeric[XLFD_RESY] > 0);
+ int auto_scaled_2 = (font2->numeric[XLFD_POINT_SIZE] == 0
+ && font2->numeric[XLFD_RESY] > 0);
+
+ if (auto_scaled_1 != auto_scaled_2)
+ return auto_scaled_2;
+ }
+
return font1->registry_priority < font2->registry_priority;
}
***************
*** 6057,6063 ****
struct font_name *font;
int specified_pt;
{
! char point_size[20], pixel_size[20];
int pixel_value;
double resy = FRAME_X_DISPLAY_INFO (f)->resy;
double pt;
--- 6094,6100 ----
struct font_name *font;
int specified_pt;
{
! char pixel_size[20];
int pixel_value;
double resy = FRAME_X_DISPLAY_INFO (f)->resy;
double pt;
***************
*** 6075,6085 ****
pt = specified_pt;
pixel_value = resy / (PT_PER_INCH * 10.0) * pt;
}
! /* Set point size of the font. */
! sprintf (point_size, "%d", (int) pt);
! font->fields[XLFD_POINT_SIZE] = point_size;
! font->numeric[XLFD_POINT_SIZE] = pt;
/* Set pixel size. */
sprintf (pixel_size, "%d", pixel_value);
--- 6112,6130 ----
pt = specified_pt;
pixel_value = resy / (PT_PER_INCH * 10.0) * pt;
}
+ /* We may need a font of the different size. */
+ pixel_value *= font->rescale_ratio;
! /* We should keep POINT_SIZE 0. Otherwise, X server can't open a
! font of the specified PIXEL_SIZE. */
! #if 0
! { /* Set point size of the font. */
! char point_size[20];
! sprintf (point_size, "%d", (int) pt);
! font->fields[XLFD_POINT_SIZE] = point_size;
! font->numeric[XLFD_POINT_SIZE] = pt;
! }
! #endif
/* Set pixel size. */
sprintf (pixel_size, "%d", pixel_value);
***************
*** 6244,6250 ****
|| better_font_p (specified, fonts + i, best, 0, 0)
|| (!non_scalable_has_exact_height_p
&& !better_font_p (specified, best, fonts + i, 0, 0)))
! best = fonts + i;
}
if (needs_overstrike)
--- 6289,6298 ----
|| better_font_p (specified, fonts + i, best, 0, 0)
|| (!non_scalable_has_exact_height_p
&& !better_font_p (specified, best, fonts + i, 0, 0)))
! {
! non_scalable_has_exact_height_p = 1;
! best = fonts + i;
! }
}
if (needs_overstrike)
***************
*** 6391,6397 ****
/* Try any family with the given registry. */
if (nfonts == 0)
! nfonts = font_list (f, Qnil, Qnil, registry, fonts);
return nfonts;
}
--- 6439,6445 ----
/* Try any family with the given registry. */
if (nfonts == 0)
! nfonts = try_alternative_families (f, Qnil, registry, fonts);
return nfonts;
}
***************
*** 6540,6550 ****
/* If the `default' face is not yet known, create it. */
lface = lface_from_face_name (f, Qdefault, 0);
if (NILP (lface))
! {
! Lisp_Object frame;
! XSETFRAME (frame, f);
! lface = Finternal_make_lisp_face (Qdefault, frame);
! }
#ifdef HAVE_WINDOW_SYSTEM
if (FRAME_WINDOW_P (f))
--- 6588,6599 ----
/* If the `default' face is not yet known, create it. */
lface = lface_from_face_name (f, Qdefault, 0);
if (NILP (lface))
! {
! Lisp_Object frame;
! XSETFRAME (frame, f);
! lface = Finternal_make_lisp_face (Qdefault, frame);
! }
!
#ifdef HAVE_WINDOW_SYSTEM
if (FRAME_WINDOW_P (f))
***************
*** 6553,6559 ****
frame_font = Fassq (Qfont, f->param_alist);
xassert (CONSP (frame_font) && STRINGP (XCDR (frame_font)));
frame_font = XCDR (frame_font);
! set_lface_from_font_name (f, lface, frame_font, 1, 1);
}
#endif /* HAVE_WINDOW_SYSTEM */
--- 6602,6610 ----
frame_font = Fassq (Qfont, f->param_alist);
xassert (CONSP (frame_font) && STRINGP (XCDR (frame_font)));
frame_font = XCDR (frame_font);
! set_lface_from_font_name (f, lface, frame_font,
! f->default_face_done_p, 1);
! f->default_face_done_p = 1;
}
#endif /* HAVE_WINDOW_SYSTEM */
***************
*** 7674,7679 ****
--- 7725,7739 ----
ignore. */);
Vface_ignored_fonts = Qnil;
+ DEFVAR_LISP ("face-font-rescale-alist", &Vface_font_rescale_alist,
+ doc: /* Alist of fonts vs the rescaling factors.
+ Each element is a cons (FONT-NAME-PATTERN . RESCALE-RATIO), where
+ FONT-NAME-PATTERN is a regular expression matching a font name, and
+ RESCALE-RATIO is a floating point number to specify how much larger
+ \(or smaller) font we should use. For instance, if a face requests
+ a font of 10 point, we actually use a font of 10 * RESCALE-RATIO point. */);
+ Vface_font_rescale_alist = Qnil;
+
#ifdef HAVE_WINDOW_SYSTEM
defsubr (&Sbitmap_spec_p);
defsubr (&Sx_list_fonts);
***************
*** 7682,7684 ****
--- 7742,7747 ----
defsubr (&Sx_font_family_list);
#endif /* HAVE_WINDOW_SYSTEM */
}
+
+ /* arch-tag: 8a0f7598-5517-408d-9ab3-1da6fcd4c749
+ (do not change this comment) */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/src/xfaces.c [lexbind],
Miles Bader <=