comparison src/xdisp.c @ 63190:ff6c8b50eefd

* xdisp.c (note_mode_line_or_margin_highlight): Call clear_mouse_face when mouse_face is not given. Remove unnecessary tabs.
author Masatake YAMATO <jet@gyve.org>
date Fri, 10 Jun 2005 05:31:45 +0000
parents 9bde03db5726
children e5a2d6aee2eb
comparison
equal deleted inserted replaced
63189:cf4a5258f723 63190:ff6c8b50eefd
21521 int gseq_length; 21521 int gseq_length;
21522 int total_pixel_width; 21522 int total_pixel_width;
21523 int ignore; 21523 int ignore;
21524 21524
21525 int vpos, hpos; 21525 int vpos, hpos;
21526 21526
21527 b = Fprevious_single_property_change (make_number (charpos + 1), 21527 b = Fprevious_single_property_change (make_number (charpos + 1),
21528 Qmouse_face, string, Qnil); 21528 Qmouse_face, string, Qnil);
21529 if (NILP (b)) 21529 if (NILP (b))
21530 b = make_number (0); 21530 b = make_number (0);
21531 21531
21569 /* Pre calculation of re-rendering position */ 21569 /* Pre calculation of re-rendering position */
21570 vpos = (x - gpos); 21570 vpos = (x - gpos);
21571 hpos = (area == ON_MODE_LINE 21571 hpos = (area == ON_MODE_LINE
21572 ? (w->current_matrix)->nrows - 1 21572 ? (w->current_matrix)->nrows - 1
21573 : 0); 21573 : 0);
21574 21574
21575 /* If the re-rendering position is included in the last 21575 /* If the re-rendering position is included in the last
21576 re-rendering area, we should do nothing. */ 21576 re-rendering area, we should do nothing. */
21577 if ( window == dpyinfo->mouse_face_window 21577 if ( window == dpyinfo->mouse_face_window
21578 && dpyinfo->mouse_face_beg_col <= vpos 21578 && dpyinfo->mouse_face_beg_col <= vpos
21579 && vpos < dpyinfo->mouse_face_end_col 21579 && vpos < dpyinfo->mouse_face_end_col
21580 && dpyinfo->mouse_face_beg_row == hpos ) 21580 && dpyinfo->mouse_face_beg_row == hpos )
21581 return; 21581 return;
21582 21582
21583 if (clear_mouse_face (dpyinfo)) 21583 if (clear_mouse_face (dpyinfo))
21584 cursor = No_Cursor; 21584 cursor = No_Cursor;
21585 21585
21586 dpyinfo->mouse_face_beg_col = vpos; 21586 dpyinfo->mouse_face_beg_col = vpos;
21587 dpyinfo->mouse_face_beg_row = hpos; 21587 dpyinfo->mouse_face_beg_row = hpos;
21588 21588
21589 dpyinfo->mouse_face_beg_x = original_x_pixel - (total_pixel_width + dx); 21589 dpyinfo->mouse_face_beg_x = original_x_pixel - (total_pixel_width + dx);
21590 dpyinfo->mouse_face_beg_y = 0; 21590 dpyinfo->mouse_face_beg_y = 0;
21605 show_mouse_face (dpyinfo, DRAW_MOUSE_FACE); 21605 show_mouse_face (dpyinfo, DRAW_MOUSE_FACE);
21606 21606
21607 if (NILP (pointer)) 21607 if (NILP (pointer))
21608 pointer = Qhand; 21608 pointer = Qhand;
21609 } 21609 }
21610 } 21610 else if ((area == ON_MODE_LINE) || (area == ON_HEADER_LINE))
21611 21611 clear_mouse_face (dpyinfo);
21612 }
21612 define_frame_cursor1 (f, cursor, pointer); 21613 define_frame_cursor1 (f, cursor, pointer);
21613 } 21614 }
21614 21615
21615 21616
21616 /* EXPORT: 21617 /* EXPORT: