emacs: src/nsterm.m comparison

comparison src/nsterm.m @ 111413:d53ee71e7e89

Unify mouse-highlight code for all GUI and TTY sessions. term.c: Remove static mouse_face_* variables. All users changed. (term_show_mouse_face, term_clear_mouse_face) (fast_find_position, term_mouse_highlight): Functions deleted. (tty_draw_row_with_mouse_face): New function. (term_mouse_movement): Call note_mouse_highlight instead of term_mouse_highlight. nsterm.m (ns_update_window_begin, ns_update_window_end) (ns_update_end, x_destroy_window, ns_frame_up_to_date) (ns_dumpglyphs_box_or_relief, ns_maybe_dumpglyphs_background) (ns_dumpglyphs_image, ns_dumpglyphs_stretch) (ns_initialize_display_info, keyDown, mouseMoved, mouseExited): Replace Display_Info with Mouse_HLInfo everywhere where mouse_face_* members were accessed for mouse highlight purposes. xterm.c (x_update_window_begin, x_update_window_end) (x_update_end, XTframe_up_to_date, x_set_mouse_face_gc) (handle_one_xevent, x_free_frame_resources, x_term_init): Replace Display_Info with Mouse_HLInfo everywhere where mouse_face_* members were accessed for mouse highlight purposes. w32term.c (x_update_window_begin, x_update_window_end) (x_update_end, w32_read_socket, x_free_frame_resources) (w32_initialize_display_info): Replace Display_Info with Mouse_HLInfo everywhere where mouse_face_* members were accessed for mouse highlight purposes. xdisp.c (show_mouse_face, note_mode_line_or_margin_highlight) (note_mouse_highlight) [HAVE_WINDOW_SYSTEM]: Don't run GUI code unless the frame is on a window-system. (get_tool_bar_item, handle_tool_bar_click) (note_tool_bar_highlight, draw_glyphs, erase_phys_cursor) (show_mouse_face, clear_mouse_face, coords_in_mouse_face_p) (note_mode_line_or_margin_highlight, note_mouse_highlight) (x_clear_window_mouse_face, cancel_mouse_face, expose_frame): Replace Display_Info with Mouse_HLInfo everywhere where mouse_face_* members were accessed for mouse highlight purposes. (coords_in_mouse_face_p): Move prototype out of the HAVE_WINDOW_SYSTEM conditional. (x_y_to_hpos_vpos, frame_to_window_pixel_xy): Move out of the HAVE_WINDOW_SYSTEM block. (try_window_id) [HAVE_GPM || MSDOS]: Call x_clear_window_mouse_face. (draw_row_with_mouse_face): Implementation for HAVE_WINDOW_SYSTEM systems. Call tty_draw_row_with_mouse_face for TTY systems. (show_mouse_face): Call draw_row_with_mouse_face, instead of calling draw_glyphs directly. (show_mouse_face, clear_mouse_face, coords_in_mouse_face_p) (cursor_in_mouse_face_p, rows_from_pos_range) (mouse_face_from_buffer_pos, mouse_face_from_string_pos) (note_mode_line_or_margin_highlight, note_mouse_highlight) (x_clear_window_mouse_face, cancel_mouse_face): Move out of the HAVE_WINDOW_SYSTEM block. Ifdef away window-system specific fragments. (note_mouse_highlight): Call popup_activated for MSDOS as well. Clear mouse highlight if pointer is over glyphs whose OBJECT is an integer. (mouse_face_from_buffer_pos): Add parentheses around && within ||. (x_consider_frame_title, tool_bar_lines_needed): Move prototypes to HAVE_WINDOW_SYSTEM-only part. (get_window_cursor_type): Move inside a HAVE_WINDOW_SYSTEM-only part. Remove "#ifdef HAVE_WINDOW_SYSTEM" from body of function. (null_glyph_slice): Move declaration into HAVE_WINDOW_SYSTEM-only part. dispnew.c (mirror_make_current): Set Y coordinate of the mode-line and header-line rows. (init_display): Setup initial frame's output_data for text terminal frames. xmenu.c (popup_activated): Don't define on MSDOS, which now has its own definition on msdos.c. msdos.c (show_mouse_face, clear_mouse_face) (fast_find_position, IT_note_mode_line_highlight) (IT_note_mouse_highlight): Functions deleted. (IT_frame_up_to_date, dos_rawgetc): Call note_mouse_highlight instead of IT_note_mouse_highlight. (draw_row_with_mouse_face, popup_activated): New functions. (dos_set_window_size, draw_row_with_mouse_face, IT_update_begin) (IT_update_end, IT_frame_up_to_date, internal_terminal_init) (dos_rawgetc): Replace Display_Info with Mouse_HLInfo everywhere where mouse_face_* members were accessed for mouse highlight purposes. msdos.h (initialize_msdos_display): Add prototype. frame.h (MOUSE_HL_INFO): New macro. lisp.h (Mouse_HLInfo): New data type. xterm.h (struct x_display_info): w32term.h (struct w32_display_info): nsterm.h (struct ns_display_info): termchar.h (struct tty_display_info): Use it instead of mouse_face_* members. dispextern.h (show_mouse_face, clear_mouse_face): Update type of 1st argument. (frame_to_window_pixel_xy, note_mouse_highlight) (x_clear_window_mouse_face, cancel_mouse_face, clear_mouse_face) (show_mouse_face, cursor_in_mouse_face_p): Move prototypes out of HAVE_WINDOW_SYSTEM conditional. (draw_row_with_mouse_face): Declare prototype. (tty_draw_row_with_mouse_face): Declare prototype.

author	Eli Zaretskii <eliz@gnu.org>
date	Sat, 06 Nov 2010 10:28:31 +0200
parents	9a159fc42f11 f79bd5f589f7
children	1303259207a9

comparison

equal deleted inserted replaced

-:cc7702f421a0
+:d53ee71e7e89
 Prepare for a grouped sequence of drawing calls
 external (RIF) call; for one window, called after update_begin
 -------------------------------------------------------------------------- */
 {
 struct frame *f = XFRAME (WINDOW_FRAME (w));
-struct ns_display_info *dpyinfo = FRAME_NS_DISPLAY_INFO (f);
+Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (f);
 NSTRACE (ns_update_window_begin);
 updated_window = w;
 set_output_cursor (&w->cursor);
 BLOCK_INPUT;
-if (f == dpyinfo->mouse_face_mouse_frame)
+if (f == hlinfo->mouse_face_mouse_frame)
 {
 /* Don't do highlighting for mouse motion during the update.  */
-dpyinfo->mouse_face_defer = 1;
+hlinfo->mouse_face_defer = 1;
 /* If the frame needs to be redrawn,
 simply forget about any prior mouse highlighting.  */
 if (FRAME_GARBAGED_P (f))
-dpyinfo->mouse_face_window = Qnil;
+hlinfo->mouse_face_window = Qnil;
 /* (further code for mouse faces ifdef'd out in other terms elided) */
 }
 UNBLOCK_INPUT;
 /* --------------------------------------------------------------------------
 Finished a grouped sequence of drawing calls
 external (RIF) call; for one window called before update_end
 -------------------------------------------------------------------------- */
 {
-struct ns_display_info *dpyinfo = FRAME_NS_DISPLAY_INFO (XFRAME (w->frame));
+Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (XFRAME (w->frame));
 /* note: this fn is nearly identical in all terms */
 if (!w->pseudo_window_p)
 {
 BLOCK_INPUT;
 /* If a row with mouse-face was overwritten, arrange for
 frame_up_to_date to redisplay the mouse highlight.  */
 if (mouse_face_overwritten_p)
 {
-dpyinfo->mouse_face_beg_row = dpyinfo->mouse_face_beg_col = -1;
+hlinfo->mouse_face_beg_row = hlinfo->mouse_face_beg_col = -1;
-dpyinfo->mouse_face_end_row = dpyinfo->mouse_face_end_col = -1;
+hlinfo->mouse_face_end_row = hlinfo->mouse_face_end_col = -1;
-dpyinfo->mouse_face_window = Qnil;
+hlinfo->mouse_face_window = Qnil;
 }
 updated_window = NULL;
 NSTRACE (update_window_end);
 }
 external (RIF) call; for whole frame, called after update_window_end
 -------------------------------------------------------------------------- */
 {
 NSView *view = FRAME_NS_VIEW (f);
-/*   if (f == FRAME_NS_DISPLAY_INFO (f)->mouse_face_mouse_frame) */
+/*   if (f == MOUSE_HL_INFO (f)->mouse_face_mouse_frame) */
-FRAME_NS_DISPLAY_INFO (f)->mouse_face_defer = 0;
+MOUSE_HL_INFO (f)->mouse_face_defer = 0;
 BLOCK_INPUT;
 #ifdef NS_IMPL_GNUSTEP
 /* trigger flush only in the rectangle we tracked as being drawn */
 External: Delete the window
 -------------------------------------------------------------------------- */
 {
 NSView *view = FRAME_NS_VIEW (f);
 struct ns_display_info *dpyinfo = FRAME_NS_DISPLAY_INFO (f);
+Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (f);
 NSTRACE (x_destroy_window);
 check_ns ();
 [(EmacsView *)view setWindowClosing: YES]; /* may not have been informed */
 if (f == dpyinfo->x_focus_frame)
 dpyinfo->x_focus_frame = 0;
 if (f == dpyinfo->x_highlight_frame)
 dpyinfo->x_highlight_frame = 0;
-if (f == dpyinfo->mouse_face_mouse_frame)
+if (f == hlinfo->mouse_face_mouse_frame)
 {
-dpyinfo->mouse_face_beg_row = dpyinfo->mouse_face_beg_col = -1;
+hlinfo->mouse_face_beg_row = hlinfo->mouse_face_beg_col = -1;
-dpyinfo->mouse_face_end_row = dpyinfo->mouse_face_end_col = -1;
+hlinfo->mouse_face_end_row = hlinfo->mouse_face_end_col = -1;
-dpyinfo->mouse_face_window = Qnil;
+hlinfo->mouse_face_window = Qnil;
-dpyinfo->mouse_face_deferred_gc = 0;
+hlinfo->mouse_face_deferred_gc = 0;
-dpyinfo->mouse_face_mouse_frame = 0;
+hlinfo->mouse_face_mouse_frame = 0;
 }
 xfree (f->output_data.ns);
 [[view window] close];
 {
 NSTRACE (ns_frame_up_to_date);
 if (FRAME_NS_P (f))
 {
-struct ns_display_info *dpyinfo = FRAME_NS_DISPLAY_INFO (f);
+Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (f);
-if ((dpyinfo->mouse_face_deferred_gc||f ==dpyinfo->mouse_face_mouse_frame)
+if ((hlinfo->mouse_face_deferred_gc || f ==hlinfo->mouse_face_mouse_frame)
-/*&& dpyinfo->mouse_face_mouse_frame*/)
+/*&& hlinfo->mouse_face_mouse_frame*/)
 {
 BLOCK_INPUT;
-ns_update_begin(f);
+	  ns_update_begin(f);
-if (dpyinfo->mouse_face_mouse_frame)
+if (hlinfo->mouse_face_mouse_frame)
-note_mouse_highlight (dpyinfo->mouse_face_mouse_frame,
+note_mouse_highlight (hlinfo->mouse_face_mouse_frame,
-dpyinfo->mouse_face_mouse_x,
+hlinfo->mouse_face_mouse_x,
-dpyinfo->mouse_face_mouse_y);
+hlinfo->mouse_face_mouse_y);
-dpyinfo->mouse_face_deferred_gc = 0;
+hlinfo->mouse_face_deferred_gc = 0;
-ns_update_end(f);
+	  ns_update_end(f);
 UNBLOCK_INPUT;
 }
 }
 }
 int thickness;
 struct face *face;
 if (s->hl == DRAW_MOUSE_FACE)
 {
-face = FACE_FROM_ID
+face = FACE_FROM_ID (s->f, MOUSE_HL_INFO (s->f)->mouse_face_face_id);
-(s->f, FRAME_NS_DISPLAY_INFO (s->f)->mouse_face_face_id);
 if (!face)
 face = FACE_FROM_ID (s->f, MOUSE_FACE_ID);
 }
 else
 face = s->face;
 || s->font_not_found_p || s->extends_to_end_of_line_p || force_p)
 	{
 struct face *face;
 if (s->hl == DRAW_MOUSE_FACE)
 {
-face = FACE_FROM_ID
+face = FACE_FROM_ID (s->f,
-(s->f, FRAME_NS_DISPLAY_INFO (s->f)->mouse_face_face_id);
+				   MOUSE_HL_INFO (s->f)->mouse_face_face_id);
 if (!face)
 face = FACE_FROM_ID (s->f, MOUSE_FACE_ID);
 }
 else
 face = FACE_FROM_ID (s->f, s->first_glyph->face_id);
 /* Draw BG: if we need larger area than image itself cleared, do that,
 otherwise, since we composite the image under NS (instead of mucking
 with its background color), we must clear just the image area. */
 if (s->hl == DRAW_MOUSE_FACE)
 {
-face = FACE_FROM_ID
+face = FACE_FROM_ID (s->f, MOUSE_HL_INFO (s->f)->mouse_face_face_id);
-(s->f, FRAME_NS_DISPLAY_INFO (s->f)->mouse_face_face_id);
 if (!face)
 face = FACE_FROM_ID (s->f, MOUSE_FACE_ID);
 }
 else
 face = FACE_FROM_ID (s->f, s->first_glyph->face_id);
 ns_focus (s->f, r, n);
 if (s->hl == DRAW_MOUSE_FACE)
 {
-face = FACE_FROM_ID
+face = FACE_FROM_ID (s->f, MOUSE_HL_INFO (s->f)->mouse_face_face_id);
-(s->f, FRAME_NS_DISPLAY_INFO (s->f)->mouse_face_face_id);
 if (!face)
 face = FACE_FROM_ID (s->f, MOUSE_FACE_ID);
 }
 else
 face = FACE_FROM_ID (s->f, s->first_glyph->face_id);
 Initialize global info and storage for display.
 -------------------------------------------------------------------------- */
 {
 NSScreen *screen = [NSScreen mainScreen];
 NSWindowDepth depth = [screen depth];
+Mouse_HLInfo *hlinfo = &dpyinfo->mouse_highlight;
 dpyinfo->resx = 72.27; /* used 75.0, but this makes pt == pixel, expected */
 dpyinfo->resy = 72.27;
 dpyinfo->color_p = ![NSDeviceWhiteColorSpace isEqualToString:
 NSColorSpaceFromDepth (depth)]
 dpyinfo->color_table
 = (struct ns_color_table *)xmalloc (sizeof (struct ns_color_table));
 dpyinfo->color_table->colors = NULL;
 dpyinfo->root_window = 42; /* a placeholder.. */
-dpyinfo->mouse_face_mouse_frame = NULL;
+hlinfo->mouse_face_mouse_frame = NULL;
-dpyinfo->mouse_face_deferred_gc = 0;
+hlinfo->mouse_face_deferred_gc = 0;
-dpyinfo->mouse_face_beg_row = dpyinfo->mouse_face_beg_col = -1;
+hlinfo->mouse_face_beg_row = hlinfo->mouse_face_beg_col = -1;
-dpyinfo->mouse_face_end_row = dpyinfo->mouse_face_end_col = -1;
+hlinfo->mouse_face_end_row = hlinfo->mouse_face_end_col = -1;
-dpyinfo->mouse_face_face_id = DEFAULT_FACE_ID;
+hlinfo->mouse_face_face_id = DEFAULT_FACE_ID;
-dpyinfo->mouse_face_window = dpyinfo->mouse_face_overlay = Qnil;
+hlinfo->mouse_face_window = hlinfo->mouse_face_overlay = Qnil;
-dpyinfo->mouse_face_hidden = 0;
+hlinfo->mouse_face_hidden = 0;
-dpyinfo->mouse_face_mouse_x = dpyinfo->mouse_face_mouse_y = 0;
+hlinfo->mouse_face_mouse_x = hlinfo->mouse_face_mouse_y = 0;
-dpyinfo->mouse_face_defer = 0;
+hlinfo->mouse_face_defer = 0;
 dpyinfo->x_highlight_frame = dpyinfo->x_focus_frame = NULL;
 dpyinfo->n_fonts = 0;
 dpyinfo->smallest_font_height = 1;
 /* Keyboard handling. */
 #define NS_KEYLOG 0
 - (void)keyDown: (NSEvent *)theEvent
 {
-struct ns_display_info *dpyinfo = FRAME_NS_DISPLAY_INFO (emacsframe);
+Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (emacsframe);
 int code;
 unsigned fnKeysym = 0;
 int flags;
 static NSMutableArray *nsEvArray;
 static BOOL firstTime = YES;
 if (nsEvArray == nil)
 nsEvArray = [[NSMutableArray alloc] initWithCapacity: 1];
 [NSCursor setHiddenUntilMouseMoves: YES];
-if (dpyinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight))
+if (hlinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight))
 {
-clear_mouse_face (dpyinfo);
+clear_mouse_face (hlinfo);
-dpyinfo->mouse_face_hidden = 1;
+hlinfo->mouse_face_hidden = 1;
 }
 if (!processingCompose)
 {
 code = ([[theEvent charactersIgnoringModifiers] length] == 0) ?
 /* Tell emacs the mouse has moved. */
 - (void)mouseMoved: (NSEvent *)e
 {
-struct ns_display_info *dpyinfo = FRAME_NS_DISPLAY_INFO (emacsframe);
+Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (emacsframe);
 Lisp_Object frame;
 //  NSTRACE (mouseMoved);
 last_mouse_movement_time = EV_TIMESTAMP (e);
 last_mouse_motion_position
 = [self convertPoint: [e locationInWindow] fromView: nil];
 /* update any mouse face */
-if (dpyinfo->mouse_face_hidden)
+if (hlinfo->mouse_face_hidden)
 {
-dpyinfo->mouse_face_hidden = 0;
+hlinfo->mouse_face_hidden = 0;
-clear_mouse_face (dpyinfo);
+clear_mouse_face (hlinfo);
 }
 /* tooltip handling */
 previous_help_echo_string = help_echo_string;
 help_echo_string = Qnil;
 - (void)mouseExited: (NSEvent *)theEvent
 {
 NSPoint p = [self convertPoint: [theEvent locationInWindow] fromView: nil];
 NSRect r;
-struct ns_display_info *dpyinfo
+Mouse_HLInfo *hlinfo = emacsframe ? MOUSE_HL_INFO (emacsframe) : NULL;
-= emacsframe ? FRAME_NS_DISPLAY_INFO (emacsframe) : NULL;
 NSTRACE (mouseExited);
-if (!dpyinfo)
+if (!hlinfo)
 return;
 last_mouse_movement_time = EV_TIMESTAMP (theEvent);
-if (emacsframe == dpyinfo->mouse_face_mouse_frame)
+if (emacsframe == hlinfo->mouse_face_mouse_frame)
 {
-clear_mouse_face (dpyinfo);
+clear_mouse_face (hlinfo);
-dpyinfo->mouse_face_mouse_frame = 0;
+hlinfo->mouse_face_mouse_frame = 0;
 }
 }
 - menuDown: sender

Mercurial > emacs

comparison src/nsterm.m @ 111413:d53ee71e7e89