Mercurial > emacs
view src/nsgui.h @ 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 | 376148b31b5e |
line wrap: on
line source
/* Definitions and headers for communication on the NeXT/Open/GNUstep API. Copyright (C) 1995, 2005, 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/>. */ #ifndef __NSGUI_H__ #define __NSGUI_H__ /* this gets included from a couple of the plain (non-NS) .c files */ #ifdef __OBJC__ #ifdef NS_IMPL_COCOA #ifdef Z #warning "Z is defined. If you get a later parse error in a header, check that buffer.h or other files #define-ing Z are not included." #endif /* Z */ #define Cursor FooFoo #undef init_process #endif /* NS_IMPL_COCOA */ #import <AppKit/AppKit.h> #ifdef NS_IMPL_COCOA #undef Cursor #define init_process emacs_init_process #endif /* NS_IMPL_COCOA */ #import <Foundation/NSDistantObject.h> #ifdef NS_IMPL_COCOA #include <AvailabilityMacros.h> #endif /* NS_IMPL_COCOA */ #endif /* __OBJC__ */ /* menu-related */ #define free_widget_value(wv) xfree (wv) #define malloc_widget_value() ((widget_value *) memset (xmalloc \ (sizeof (widget_value)), 0, sizeof (widget_value))) /* Emulate XCharStruct. */ typedef struct _XCharStruct { int rbearing; int lbearing; int width; int ascent; int descent; } XCharStruct; /* Fake tructure from Xlib.h to represent two-byte characters. */ #ifndef __OBJC__ typedef unsigned short unichar; #endif typedef unichar XChar2b; #define STORE_XCHAR2B(chp, b1, b2) \ (*(chp) = ((XChar2b)((((b1) & 0x00ff) << 8) | ((b2) & 0x00ff)))) #define XCHAR2B_BYTE1(chp) \ (((*chp) & 0xff00) >> 8) #define XCHAR2B_BYTE2(chp) \ ((*chp) & 0x00ff) /* XXX: xfaces requires these structures, but the question is are we forced to use them? */ typedef struct _XGCValues { unsigned long foreground; unsigned long background; #ifdef __OBJC__ struct ns_font *font; #else void *font; #endif } XGCValues; typedef XGCValues * GC; #define GCForeground 0x01 #define GCBackground 0x02 #define GCFont 0x03 #ifdef __OBJC__ typedef id Pixmap; #else typedef void *Pixmap; #endif #ifdef __OBJC__ typedef NSCursor * Cursor; #else typedef void *Cursor; #endif #define No_Cursor (0) #ifdef __OBJC__ typedef NSColor * Color; #else typedef void * Color; #endif typedef int Window; typedef int Display; /* Xism */ typedef Lisp_Object XrmDatabase; /* some sort of attempt to normalize rectangle handling.. seems a bit much for what is accomplished */ typedef struct { int x, y; unsigned width, height; } XRectangle; #ifndef __OBJC__ #if defined(__LP64__) && __LP64__ typedef double CGFloat; #else typedef float CGFloat; #endif typedef struct _NSPoint { CGFloat x, y; } NSPoint; typedef struct _NSSize { CGFloat width, height; } NSSize; typedef struct _NSRect { NSPoint origin; NSSize size; } NSRect; #endif /* NOT OBJC */ #define NativeRectangle NSRect #define CONVERT_TO_XRECT(xr, nr) \ ((xr).x = (nr).origin.x, \ (xr).y = (nr).origin.y, \ (xr).width = (nr).size.width, \ (xr).height = (nr).size.height) #define CONVERT_FROM_XRECT(xr, nr) \ ((nr).origin.x = (xr).x, \ (nr).origin.y = (xr).y, \ (nr).size.width = (xr).width, \ (nr).size.height = (xr).height) #define STORE_NATIVE_RECT(nr, px, py, pwidth, pheight) \ ((nr).origin.x = (px), \ (nr).origin.y = (py), \ (nr).size.width = (pwidth), \ (nr).size.height = (pheight)) /* This stuff needed by frame.c. */ #define ForgetGravity 0 #define NorthWestGravity 1 #define NorthGravity 2 #define NorthEastGravity 3 #define WestGravity 4 #define CenterGravity 5 #define EastGravity 6 #define SouthWestGravity 7 #define SouthGravity 8 #define SouthEastGravity 9 #define StaticGravity 10 #define NoValue 0x0000 #define XValue 0x0001 #define YValue 0x0002 #define WidthValue 0x0004 #define HeightValue 0x0008 #define AllValues 0x000F #define XNegative 0x0010 #define YNegative 0x0020 #define USPosition (1L << 0) /* user specified x, y */ #define USSize (1L << 1) /* user specified width, height */ #define PPosition (1L << 2) /* program specified position */ #define PSize (1L << 3) /* program specified size */ #define PMinSize (1L << 4) /* program specified minimum size */ #define PMaxSize (1L << 5) /* program specified maximum size */ #define PResizeInc (1L << 6) /* program specified resize increments */ #define PAspect (1L << 7) /* program specified min, max aspect ratios */ #define PBaseSize (1L << 8) /* program specified base for incrementing */ #define PWinGravity (1L << 9) /* program specified window gravity */ #endif /* __NSGUI_H__ */ /* arch-tag: b2af3275-62c3-45b4-9335-4c9635c67e55 (do not change this comment) */