From: Masatake YAMATO Date: Mon, 23 May 2005 11:19:17 +0000 (+0000) Subject: Supprot mouse-face on mode-line. X-Git-Tag: ttn-vms-21-2-B4~42 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=359e4563cad1b8add855a43ef77b7bb5cb3f9f1d;p=emacs.git Supprot mouse-face on mode-line. 2005-05-23 Masatake YAMATO * xdisp.c (note_mode_line_or_margin_highlight): Added code for mouse-face. Change the type of the first argument from `window' to `List_Object'. (note_mouse_highlight): Call note_mode_line_or_margin_highlight with window instead of w. 2005-05-23 Masatake YAMATO * bindings.el (mode-line-major-mode-keymap): Bind [mode-line down-mouse-1] to `mouse-major-mode-menu'. * faces.el (mode-line-highlight): New face. * ruler-mode.el (ruler-mode-ruler): Use mode-line-highlight as mouse-face. * bindings.el (top-level, help-echo, mode-line-modified) (mode-line-mule-info, mode-line-eol-desc): Use mode-line-highlight as mouse-face. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9eefd8afc2e..da684c69ede 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,17 @@ +2005-05-23 Masatake YAMATO + + * bindings.el (mode-line-major-mode-keymap): Bind + [mode-line down-mouse-1] to `mouse-major-mode-menu'. + + * faces.el (mode-line-highlight): New face. + + * ruler-mode.el (ruler-mode-ruler): Use mode-line-highlight + as mouse-face. + + * bindings.el (top-level, help-echo, mode-line-modified) + (mode-line-mule-info, mode-line-eol-desc): Use mode-line-highlight + as mouse-face. + 2005-05-23 Juanma Barranquero * progmodes/cc-engine.el (c-guess-basic-syntax): diff --git a/lisp/bindings.el b/lisp/bindings.el index 396e1e49216..4781f8dfa59 100644 --- a/lisp/bindings.el +++ b/lisp/bindings.el @@ -165,7 +165,8 @@ corresponding to the mode line clicked." (eval-when-compile (let ((map (make-sparse-keymap))) (define-key map [mode-line mouse-3] 'mode-line-change-eol) - map)))) + map)) + 'mouse-face 'mode-line-highlight)) (push (cons eol (cons mnemonic desc)) mode-line-eol-desc-cache) desc))) @@ -177,7 +178,8 @@ corresponding to the mode line clicked." "Input method: " current-input-method ". mouse-2: disable, mouse-3: describe") - local-map ,mode-line-input-method-map)) + local-map ,mode-line-input-method-map + mouse-face mode-line-highlight)) ,(propertize "%z" 'help-echo @@ -191,6 +193,7 @@ corresponding to the mode line clicked." " buffer; mouse-3: describe coding system") (concat "Unibyte " (symbol-name buffer-file-coding-system) " buffer"))))) + 'mouse-face 'mode-line-highlight 'local-map mode-line-coding-system-map) (:eval (mode-line-eol-desc))) "Mode-line control for displaying information of multilingual environment. @@ -235,7 +238,8 @@ Normally nil in most modes, since there is no process to display.") "Not r"))))) 'local-map (purecopy (make-mode-line-mouse-map 'mouse-3 - #'mode-line-toggle-read-only))) + #'mode-line-toggle-read-only)) + 'mouse-face 'mode-line-highlight) (propertize "%1+" 'help-echo (purecopy (lambda (window object point) @@ -246,7 +250,8 @@ Normally nil in most modes, since there is no process to display.") "M" "Not m"))))) 'local-map (purecopy (make-mode-line-mouse-map - 'mouse-3 #'mode-line-toggle-modified)))) + 'mouse-3 #'mode-line-toggle-modified)) + 'mouse-face 'mode-line-highlight)) "Mode-line control for displaying whether current buffer is modified.") (make-variable-buffer-local 'mode-line-modified) @@ -262,6 +267,7 @@ buffer size, the line number and the column number.") (defvar mode-line-major-mode-keymap (let ((map (make-sparse-keymap))) + (define-key map [mode-line down-mouse-1] 'mouse-major-mode-menu) (define-key map [mode-line mouse-2] 'describe-mode) (define-key map [mode-line down-mouse-3] 'mode-line-mode-menu-1) map) "\ @@ -303,13 +309,16 @@ Keymap to display on minor modes.") (list (propertize "%[(" 'help-echo help-echo) `(:propertize ("" mode-name) - help-echo "mouse-2: help for current major mode" + help-echo "mouse-1: major-mode-menu mouse-2: help for current major mode" + mouse-face mode-line-highlight local-map ,mode-line-major-mode-keymap) '("" mode-line-process) `(:propertize ("" minor-mode-alist) + mouse-face mode-line-highlight help-echo "mouse-2: help for minor modes, mouse-3: minor mode menu" local-map ,mode-line-minor-mode-keymap) (propertize "%n" 'help-echo "mouse-2: widen" + 'mouse-face 'mode-line-highlight 'local-map (make-mode-line-mouse-map 'mouse-2 #'mode-line-widen)) (propertize ")%]--" 'help-echo help-echo))) @@ -465,6 +474,7 @@ text properties for face, help-echo, and local-map to it." 'face 'Buffer-menu-buffer-face 'help-echo (purecopy "mouse-1: previous buffer, mouse-3: next buffer") + 'mouse-face 'mode-line-highlight 'local-map mode-line-buffer-identification-keymap))) (setq-default mode-line-buffer-identification diff --git a/lisp/ruler-mode.el b/lisp/ruler-mode.el index 928b5baabec..46a28ce5069 100644 --- a/lisp/ruler-mode.el +++ b/lisp/ruler-mode.el @@ -697,6 +697,9 @@ Optional argument PROPS specifies other text properties to apply." (put-text-property i (1+ i) 'face 'ruler-mode-goal-column-face ruler) + (put-text-property + i (1+ i) 'mouse-face 'mode-line-highlight + ruler) (put-text-property i (1+ i) 'help-echo ruler-mode-goal-column-help-echo ruler)) @@ -706,6 +709,9 @@ Optional argument PROPS specifies other text properties to apply." (put-text-property i (1+ i) 'face 'ruler-mode-comment-column-face ruler) + (put-text-property + i (1+ i) 'mouse-face 'mode-line-highlight + ruler) (put-text-property i (1+ i) 'help-echo ruler-mode-comment-column-help-echo ruler)) @@ -715,6 +721,9 @@ Optional argument PROPS specifies other text properties to apply." (put-text-property i (1+ i) 'face 'ruler-mode-fill-column-face ruler) + (put-text-property + i (1+ i) 'mouse-face 'mode-line-highlight + ruler) (put-text-property i (1+ i) 'help-echo ruler-mode-fill-column-help-echo ruler)) diff --git a/src/ChangeLog b/src/ChangeLog index 0e4e571e852..2b8bf5bdb92 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2005-05-23 Masatake YAMATO + + * xdisp.c (note_mode_line_or_margin_highlight): Added code + for mouse-face. Change the type of the first argument from `window' + to `List_Object'. + (note_mouse_highlight): Call note_mode_line_or_margin_highlight with + window instead of w. + 2005-05-22 Andreas Schwab * process.c (send_process): Move misplaced volatile. diff --git a/src/xdisp.c b/src/xdisp.c index 5297b1235e9..8a9c1d267af 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -21236,11 +21236,12 @@ define_frame_cursor1 (f, cursor, pointer) position relative to the start of the mode line. */ static void -note_mode_line_or_margin_highlight (w, x, y, area) - struct window *w; +note_mode_line_or_margin_highlight (window, x, y, area) + Lisp_Object window; int x, y; enum window_part area; { + struct window *w = XWINDOW (window); struct frame *f = XFRAME (w->frame); Display_Info *dpyinfo = FRAME_X_DISPLAY_INFO (f); Cursor cursor = FRAME_X_OUTPUT (f)->nontext_cursor; @@ -21249,9 +21250,38 @@ note_mode_line_or_margin_highlight (w, x, y, area) Lisp_Object string, object = Qnil; Lisp_Object pos, help; + Lisp_Object mouse_face; + int original_x_pixel = x; + struct glyph * glyph = NULL; + struct glyph_row *row; + if (area == ON_MODE_LINE || area == ON_HEADER_LINE) - string = mode_line_string (w, area, &x, &y, &charpos, - &object, &dx, &dy, &width, &height); + { + int x0; + struct glyph *end; + + string = mode_line_string (w, area, &x, &y, &charpos, + &object, &dx, &dy, &width, &height); + + row = (area == ON_MODE_LINE)? + MATRIX_MODE_LINE_ROW (w->current_matrix): + MATRIX_HEADER_LINE_ROW(w->current_matrix); + + /* Find glyph */ + if (row->mode_line_p && row->enabled_p) + { + glyph = row->glyphs[TEXT_AREA]; + end = glyph + row->used[TEXT_AREA]; + + for (x0 = original_x_pixel; + glyph < end && x0 >= glyph->pixel_width; + ++glyph) + x0 -= glyph->pixel_width; + + if (glyph >= end) + glyph = NULL; + } + } else { x -= WINDOW_LEFT_SCROLL_BAR_AREA_WIDTH (w); @@ -21329,6 +21359,91 @@ note_mode_line_or_margin_highlight (w, x, y, area) if (!KEYMAPP (map)) cursor = dpyinfo->vertical_scroll_bar_cursor; } + + /* Change the mouse face according to what is under X/Y. */ + mouse_face = Fget_text_property (pos, Qmouse_face, string); + if (!NILP (mouse_face) + && ((area == ON_MODE_LINE) || (area == ON_HEADER_LINE)) + && glyph) + { + Lisp_Object b, e; + + struct glyph * tmp_glyph; + + int gpos; + int gseq_length; + int total_pixel_width; + int ignore; + + if (clear_mouse_face (dpyinfo)) + cursor = No_Cursor; + + /* Calculate the position(glyph position: GPOS) of GLYPH in + displayed string. GPOS is different from CHARPOS. + + CHARPOS is the position of glyph in internal string + object. A mode line string format has structures which + is converted to a flatten by emacs lisp interpreter. + The internal string is an element of the structures. + The displayed string is the flatten string. */ + for (tmp_glyph = glyph - 1, gpos = 0; + tmp_glyph >= row->glyphs[TEXT_AREA]; + tmp_glyph--, gpos++) + { + if (tmp_glyph->object != glyph->object) + break; + } + + /* Calculate the lenght(glyph sequence length: GSEQ_LENGTH) of + displayed string holding GLYPH. + + GSEQ_LENGTH is different from SCHARS (STRING). + SCHARS (STRING) returns the length of the internal string. */ + for (tmp_glyph = glyph, gseq_length = gpos; + tmp_glyph < glyph + row->used[TEXT_AREA]; + tmp_glyph++, gseq_length++) + { + if (tmp_glyph->object != glyph->object) + break; + } + + b = Fprevious_single_property_change(make_number (charpos + 1), + Qmouse_face, string, Qnil); + e = Fnext_single_property_change (pos, Qmouse_face, string, Qnil); + + if (NILP (b)) + b = make_number (0); + + if (NILP (e)) + e = make_number(gseq_length); + + total_pixel_width = 0; + for (tmp_glyph = glyph - (gpos - XINT(b)); tmp_glyph != glyph; tmp_glyph++) + total_pixel_width += tmp_glyph->pixel_width; + + dpyinfo->mouse_face_beg_col = (x - gpos) + XINT(b); + dpyinfo->mouse_face_beg_row = (area == ON_MODE_LINE)? + (w->current_matrix)->nrows - 1: + 0; + + dpyinfo->mouse_face_beg_x = original_x_pixel - (total_pixel_width + dx); + dpyinfo->mouse_face_beg_y = 0; + + dpyinfo->mouse_face_end_col = (x - gpos) + XINT(e); + dpyinfo->mouse_face_end_row = dpyinfo->mouse_face_beg_row; + + dpyinfo->mouse_face_end_x = 0; + dpyinfo->mouse_face_end_y = 0; + + dpyinfo->mouse_face_past_end = 0; + dpyinfo->mouse_face_window = window; + + dpyinfo->mouse_face_face_id = face_at_string_position(w, string, + charpos, + 0, 0, 0, &ignore, + glyph->face_id, 1); + show_mouse_face (dpyinfo, DRAW_MOUSE_FACE); + } } define_frame_cursor1 (f, cursor, pointer); @@ -21409,7 +21524,7 @@ note_mouse_highlight (f, x, y) if (part == ON_MODE_LINE || part == ON_HEADER_LINE || part == ON_LEFT_MARGIN || part == ON_RIGHT_MARGIN) { - note_mode_line_or_margin_highlight (w, x, y, part); + note_mode_line_or_margin_highlight (window, x, y, part); return; }