Commit d1f535d2 authored by Jason Rumney's avatar Jason Rumney

(w32_enable_unicode_output, cleartype_active): Remove

obsolete display options.
(x_draw_glyph_string_background): Don't use old cleartype_active
workaround.
(w32_initialize): Remove cleartype_active initialization.
(syms_of_w32term): Remove w32_enable_unicode_output initialization.
parent cc3236e1
2008-07-28 Jason Rumney <jasonr@gnu.org>
* w32term.c: (w32_enable_unicode_output, cleartype_active): Remove
obsolete display options.
(x_draw_glyph_string_background): Don't use old cleartype_active
workaround.
(w32_initialize): Remove cleartype_active initialization.
(syms_of_w32term): Remove w32_enable_unicode_output initialization.
2008-07-28 Andreas Schwab <schwab@suse.de>
* lisp.h (init_weak_hash_tables, syms_of_font)
......
......@@ -86,8 +86,7 @@ static int any_help_event_p;
/* Last window where we saw the mouse. Used by mouse-autoselect-window. */
static Lisp_Object last_window;
/* Non-zero means make use of UNDERLINE_POSITION font properties.
(Not yet supported, see TODO in x_draw_glyph_string.) */
/* Non-zero means make use of UNDERLINE_POSITION font properties. */
int x_use_underline_position_properties;
/* Non-zero means to draw the underline at the same place as the descent line. */
......@@ -168,14 +167,6 @@ int w32_system_caret_x;
int w32_system_caret_y;
int w32_use_visible_system_caret;
/* Flag to enable Unicode output in case users wish to use programs
like Twinbridge on '95 rather than installed system level support
for Far East languages. */
int w32_enable_unicode_output;
/* Flag to enable Cleartype hack for font metrics. */
static int cleartype_active;
DWORD dwWindowsThreadId = 0;
HANDLE hWindowsThread = NULL;
DWORD dwMainThreadId = 0;
......@@ -1274,7 +1265,6 @@ x_draw_glyph_string_background (s, force_p)
if (FONT_HEIGHT (s->font) < s->height - 2 * box_line_width
|| s->font_not_found_p
|| s->extends_to_end_of_line_p
|| cleartype_active
|| force_p)
{
x_clear_glyph_string_rect (s, s->x, s->y + box_line_width,
......@@ -6346,9 +6336,6 @@ w32_initialize ()
/* Dynamically link to optional system components. */
{
UINT smoothing_type;
BOOL smoothing_enabled;
HANDLE user_lib = LoadLibrary ("user32.dll");
#define LOAD_PROC(lib, fn) pfn##fn = (void *) GetProcAddress (lib, #fn)
......@@ -6366,28 +6353,6 @@ w32_initialize ()
effectively form the border of the main scroll bar range. */
vertical_scroll_bar_top_border = vertical_scroll_bar_bottom_border
= GetSystemMetrics (SM_CYVSCROLL);
/* Constants that are not always defined by the system headers
since they only exist on certain versions of Windows. */
#ifndef SPI_GETFONTSMOOTHING
#define SPI_GETFONTSMOOTHING 0x4A
#endif
#ifndef SPI_GETFONTSMOOTHINGTYPE
#define SPI_GETFONTSMOOTHINGTYPE 0x0200A
#endif
#ifndef FE_FONTSMOOTHINGCLEARTYPE
#define FE_FONTSMOOTHINGCLEARTYPE 0x2
#endif
/* Determine if Cleartype is in use. Used to enable a hack in
the char metric calculations which adds extra pixels to
compensate for the "sub-pixels" that are not counted by the
system APIs. */
cleartype_active =
SystemParametersInfo (SPI_GETFONTSMOOTHING, 0, &smoothing_enabled, 0)
&& smoothing_enabled
&& SystemParametersInfo (SPI_GETFONTSMOOTHINGTYPE, 0, &smoothing_type, 0)
&& smoothing_type == FE_FONTSMOOTHINGCLEARTYPE;
}
}
......@@ -6434,15 +6399,6 @@ When nil, the right-alt and left-ctrl key combination is
interpreted normally. */);
Vw32_recognize_altgr = Qt;
DEFVAR_BOOL ("w32-enable-unicode-output",
&w32_enable_unicode_output,
doc: /* Enable the use of Unicode for text output if non-nil.
Unicode output may prevent some third party applications for displaying
Far-East Languages on Windows 95/98 from working properly.
NT uses Unicode internally anyway, so this flag will probably have no
effect on NT machines. */);
w32_enable_unicode_output = 1;
DEFVAR_BOOL ("w32-use-visible-system-caret",
&w32_use_visible_system_caret,
doc: /* Flag to make the system caret visible.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment