Mercurial > emacs
annotate oldXMenu/Recomp.c @ 111339:e302712538dc
Unify mouse highlight code of MSDOS and GUI sessions.
xdisp.c (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.
(show_mouse_face): Call it, 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 ||.
xmenu.c (popup_activated): Don't define on MSDOS.
dispnew.c (mirror_make_current): Set Y coordinate of the
mode-line and header-line rows.
termchar.h (struct tty_display_info): Define mouse_face_*
members not only for MSDOS. Delete stray whitespace.
<mouse_face_beg_x, mouse_face_beg_y, mouse_face_overlay>: New
struct members.
dispextern.h (DPYINFO_DEFINED) [HAVE_X_WINDOWS]: Define.
(DPYINFO_DEFINED) [HAVE_NTGUI]: Define.
(DPYINFO_DEFINED) [HAVE_NS]: Define.
(Display_Info) [!DPYINFO_DEFINED]: Define here.
(FRAME_X_DISPLAY_INFO) [HAVE_GPM]: Define.
(FRAME_X_DISPLAY_INFO): Define to NULL if not defined.
(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.
msdos.h (Display_Info): Don't define here.
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.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Sat, 30 Oct 2010 15:09:52 +0200 |
parents | 5cc91198ffb2 |
children | ef719132ddfa |
rev | line source |
---|---|
76174
fec5e03aaf59
Remove FSF copyright since file does not differ significantly from X11
Glenn Morris <rgm@gnu.org>
parents:
75348
diff
changeset
|
1 /* Copyright Massachusetts Institute of Technology 1985 */ |
fec5e03aaf59
Remove FSF copyright since file does not differ significantly from X11
Glenn Morris <rgm@gnu.org>
parents:
75348
diff
changeset
|
2 |
25858 | 3 #include "copyright.h" |
4 | |
5 | |
6 /* | |
7 * XMenu: MIT Project Athena, X Window system menu package | |
8 * | |
9 * XMenuRecompute - Recompute XMenu object dependencies. | |
10 * | |
11 * Author: Tony Della Fera, DEC | |
12 * September, 1985 | |
13 * | |
14 */ | |
15 | |
16 #include "XMenuInt.h" | |
17 | |
18 int | |
109124
5cc91198ffb2
Convert function definitions in oldXMenu to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
76174
diff
changeset
|
19 XMenuRecompute(Display *display, register XMenu *menu) |
5cc91198ffb2
Convert function definitions in oldXMenu to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
76174
diff
changeset
|
20 |
5cc91198ffb2
Convert function definitions in oldXMenu to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
76174
diff
changeset
|
21 /* Menu object to be recomputed. */ |
25858 | 22 { |
23 register XMPane *p_ptr; /* Pane pointer. */ | |
24 register XMSelect *s_ptr; /* Selection pointer. */ | |
25 | |
26 register int p_num; /* Pane serial number. */ | |
27 register int s_num; /* Selection serial number. */ | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
25858
diff
changeset
|
28 |
25858 | 29 /* |
30 * If there are no panes in the menu then return failure | |
31 * because the menu is not initialized. | |
32 */ | |
33 if (menu->p_count == 0) { | |
34 _XMErrorCode = XME_NOT_INIT; | |
35 return(XM_FAILURE); | |
36 } | |
37 | |
38 /* | |
39 * Recompute menu wide global values: pane window size, | |
40 * selection size and maximum selection count. | |
41 */ | |
42 _XMRecomputeGlobals(display, menu); | |
43 | |
44 /* | |
45 * For each pane in the menu... | |
46 */ | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
25858
diff
changeset
|
47 |
25858 | 48 p_num = 0; |
49 for ( | |
50 p_ptr = menu->p_list->next; | |
51 p_ptr != menu->p_list; | |
52 p_ptr = p_ptr->next | |
53 ){ | |
54 /* | |
55 * Recompute pane dependencies. | |
56 */ | |
57 if (_XMRecomputePane(display, menu, p_ptr, p_num) == _FAILURE) { | |
58 return(XM_FAILURE); | |
59 } | |
60 p_num++; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
25858
diff
changeset
|
61 |
25858 | 62 /* |
63 * For each selection in the pane... | |
64 */ | |
65 s_num = 0; | |
66 for ( | |
67 s_ptr = p_ptr->s_list->next; | |
68 s_ptr != p_ptr->s_list; | |
69 s_ptr = s_ptr->next | |
70 ) { | |
71 /* | |
72 * Recompute selection dependencies. | |
73 */ | |
74 if (_XMRecomputeSelection(display, menu, s_ptr, s_num) == _FAILURE) { | |
75 return(XM_FAILURE); | |
76 } | |
77 s_num++; | |
78 } | |
79 } | |
80 | |
81 /* | |
82 * Recompute menu size. | |
83 */ | |
84 if (menu->menu_style == CENTER) { | |
85 menu->width = menu->p_width + (menu->p_bdr_width << 1); | |
86 } | |
87 else { | |
88 menu->width = menu->p_width + (menu->p_bdr_width << 1) + | |
89 ((menu->p_count - 1) * menu->p_x_off); | |
90 } | |
91 menu->height = menu->p_height + (menu->p_bdr_width << 1) + | |
92 ((menu->p_count - 1) * menu->p_y_off); | |
93 | |
94 /* | |
95 * Reset the recompute flag. | |
96 */ | |
97 menu->recompute = 0; | |
98 | |
99 /* | |
100 * Return successfully. | |
101 */ | |
102 _XMErrorCode = XME_NO_ERROR; | |
103 return(XM_SUCCESS); | |
104 } | |
52401 | 105 |
106 /* arch-tag: 1fe99b82-3873-4aab-b2b3-f277c93e00d9 | |
107 (do not change this comment) */ |