Mercurial > emacs
view src/w32reg.c @ 107998:531d454c3a99
Implement GUI display of R2L lines, fix TTY display of R2L lines.
xdisp.c [HAVE_WINDOW_SYSTEM]: Add prototype for
append_stretch_glyph.
(set_cursor_from_row) <cursor_x>: Remove unused variable. Fix
off-by-one error in computing x at end of text in the row.
(append_stretch_glyph): In reversed row, prepend the glyph rather
than append it. Set resolved_level and bidi_type of the glyph.
(extend_face_to_end_of_line): If the row is reversed, prepend a
stretch glyph whose width is such that the rightmost glyph will be
drawn at the right margin of the window. Fix off-by-one error on
TTY frames in testing whether a line needs face extension. Fix
face extension at ZV. If this is the last glyph row, use
DEFAULT_FACE_ID, to avoid painting the rest of the window with the
region face.
(set_cursor_from_row, display_line): Use
MATRIX_ROW_CONTINUATION_LINE_P instead of testing value of
row->continuation_lines_width.
(next_element_from_buffer): Don't call bidi_paragraph_init if we
are at ZV. Fixes a crash when reseated to ZV by
try_window_reusing_current_matrix.
(display_and_set_cursor, erase_phys_cursor): Handle negative HPOS,
which happens with R2L glyph rows. Fixes a crash when inserting a
character at end of an R2L line.
(set_cursor_from_row): Don't be fooled by truncated rows: don't
treat them as having zero-width characters. Improve comments.
Don't reverse pos_before and pos_after for reversed glyph rows.
Set cursor.x to negative value when the cursor might be on the
left fringe.
(IT_OVERFLOW_NEWLINE_INTO_FRINGE): For R2L lines, consider the
left fringe, not the right one.
(notice_overwritten_cursor, draw_phys_cursor_glyph)
(erase_phys_cursor): For reversed cursor_row, support cursor on
the left fringe.
fringe.c (update_window_fringes): For R2L rows, swap the bitmaps
of continuation indicators on the fringes.
(draw_fringe_bitmap): For reversed glyph rows, allow cursor on the
left fringe.
w32term.c (w32_draw_window_cursor): For reversed glyph rows,
draw cursor on the left fringe.
xterm.c (x_draw_window_cursor): For reversed glyph rows, draw
cursor on the left fringe.
dispnew.c (update_text_area): Handle reversed desired rows when
the cursor is on the left fringe.
(set_window_cursor_after_update): Limit cursor's hpos by -1 from
below, not by 0, for when the cursor is on the left fringe.
xdisp.c (unproduce_glyphs): New function.
(display_line): Use it when produced glyphs are discarded from R2L
glyph rows.
(append_composite_glyph): In R2L rows, prepend the glyph rather
than appending it.
term.c (append_composite_glyph): In R2L rows, prepend the glyph
rather than append it. Set up the resolved_level and bidi_type
attributes of the appended glyph.
(produce_special_glyphs): Mirror the backslash continuation
character in R2L lines.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Tue, 20 Apr 2010 16:31:28 +0300 |
parents | 1d1d5d9bd884 |
children | e27859da5624 376148b31b5e |
line wrap: on
line source
/* Emulate the X Resource Manager through the registry. Copyright (C) 1990, 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. This file is part of GNU Emacs. GNU Emacs is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. GNU Emacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ /* Written by Kevin Gallo */ #include <config.h> #include <setjmp.h> #include "lisp.h" #include "w32term.h" #include "blockinput.h" #include <stdio.h> #include <string.h> #define REG_ROOT "SOFTWARE\\GNU\\Emacs" /* Default system colors from the Display Control Panel settings. */ #define SYSTEM_DEFAULT_RESOURCES \ "emacs.foreground:SystemWindowText\0" \ "emacs.background:SystemWindow\0" \ "emacs.tooltip.attributeForeground:SystemInfoText\0" \ "emacs.tooltip.attributeBackground:SystemInfoWindow\0" \ "emacs.tool-bar.attributeForeground:SystemButtonText\0" \ "emacs.tool-bar.attributeBackground:SystemButtonFace\0" \ "emacs.menu.attributeForeground:SystemMenuText\0" \ "emacs.menu.attributeBackground:SystemMenu\0" \ "emacs.scroll-bar.attributeForeground:SystemScrollbar\0" /* Other possibilities for default faces: region: Could use SystemHilight, but interferes with our ability to see most syntax highlighting through the region face. modeline: Could use System(In)ActiveTitle, gradient versions (not supported on 95 and NT), but modeline is more like a status bar really (which don't appear to be configurable in Windows). highlight: Could use SystemHotTrackingColor, but it is not supported on Windows 95 or NT, and other apps only seem to use it for menus anyway. */ static char * w32_get_rdb_resource (rdb, resource) char *rdb; char *resource; { char *value = rdb; int len = strlen (resource); while (*value) { /* Comparison is case-insensitive because registry searches are too. */ if ((strnicmp (value, resource, len) == 0) && (value[len] == ':')) return xstrdup (&value[len + 1]); value = strchr (value, '\0') + 1; } return NULL; } static LPBYTE w32_get_string_resource (name, class, dwexptype) char *name, *class; DWORD dwexptype; { LPBYTE lpvalue = NULL; HKEY hrootkey = NULL; DWORD dwType; DWORD cbData; BOOL ok = FALSE; HKEY hive = HKEY_CURRENT_USER; trykey: BLOCK_INPUT; /* Check both the current user and the local machine to see if we have any resources */ if (RegOpenKeyEx (hive, REG_ROOT, 0, KEY_READ, &hrootkey) == ERROR_SUCCESS) { char *keyname; if (RegQueryValueEx (hrootkey, name, NULL, &dwType, NULL, &cbData) == ERROR_SUCCESS && dwType == dwexptype) { keyname = name; } else if (RegQueryValueEx (hrootkey, class, NULL, &dwType, NULL, &cbData) == ERROR_SUCCESS && dwType == dwexptype) { keyname = class; } else { keyname = NULL; } ok = (keyname && (lpvalue = (LPBYTE) xmalloc (cbData)) != NULL && RegQueryValueEx (hrootkey, keyname, NULL, NULL, lpvalue, &cbData) == ERROR_SUCCESS); RegCloseKey (hrootkey); } UNBLOCK_INPUT; if (!ok) { if (lpvalue) { xfree (lpvalue); lpvalue = NULL; } if (hive == HKEY_CURRENT_USER) { hive = HKEY_LOCAL_MACHINE; goto trykey; } /* Check if there are Windows specific defaults defined. */ return w32_get_rdb_resource (SYSTEM_DEFAULT_RESOURCES, name); } return (lpvalue); } /* Retrieve the string resource specified by NAME with CLASS from database RDB. */ char * x_get_string_resource (rdb, name, class) XrmDatabase rdb; char *name, *class; { if (rdb) { char *resource; if (resource = w32_get_rdb_resource (rdb, name)) return resource; if (resource = w32_get_rdb_resource (rdb, class)) return resource; } if (inhibit_x_resources) /* --quick was passed, so this is a no-op. */ return NULL; return (w32_get_string_resource (name, class, REG_SZ)); } /* arch-tag: 755fce25-42d7-4acb-874f-2fb42336823d (do not change this comment) */