Mercurial > emacs
comparison src/dispextern.h @ 111340:2186ab0af4a5
Start redesigning portable mouse highlight. Not compiled.
xdisp.c (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.
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 (DPYINFO_DEFINED): Remove definition.
(FRAME_X_DISPLAY_INFO): Remove definition.
(show_mouse_face, clear_mouse_face): Update type of 1st argument.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Sun, 31 Oct 2010 20:50:02 +0200 |
| parents | e302712538dc |
| children | b775602e70c8 |
comparison
equal
deleted
inserted
replaced
| 111339:e302712538dc | 111340:2186ab0af4a5 |
|---|---|
| 41 char pad; | 41 char pad; |
| 42 } XColor; | 42 } XColor; |
| 43 | 43 |
| 44 #endif /* HAVE_X_WINDOWS */ | 44 #endif /* HAVE_X_WINDOWS */ |
| 45 | 45 |
| 46 #ifdef MSDOS | |
| 47 #include "msdos.h" | |
| 48 #endif | |
| 49 | |
| 46 #ifdef HAVE_X_WINDOWS | 50 #ifdef HAVE_X_WINDOWS |
| 47 typedef struct x_display_info Display_Info; | 51 typedef struct x_display_info Display_Info; |
| 48 #define DPYINFO_DEFINED 1 | |
| 49 typedef XImage * XImagePtr; | 52 typedef XImage * XImagePtr; |
| 50 typedef XImagePtr XImagePtr_or_DC; | 53 typedef XImagePtr XImagePtr_or_DC; |
| 51 #define NativeRectangle XRectangle | 54 #define NativeRectangle XRectangle |
| 52 #endif | 55 #endif |
| 53 | 56 |
| 54 #ifdef HAVE_NTGUI | 57 #ifdef HAVE_NTGUI |
| 55 #include "w32gui.h" | 58 #include "w32gui.h" |
| 56 typedef struct w32_display_info Display_Info; | 59 typedef struct w32_display_info Display_Info; |
| 57 #define DPYINFO_DEFINED 1 | |
| 58 typedef XImage *XImagePtr; | 60 typedef XImage *XImagePtr; |
| 59 typedef HDC XImagePtr_or_DC; | 61 typedef HDC XImagePtr_or_DC; |
| 60 #endif | 62 #endif |
| 61 | 63 |
| 62 #ifdef HAVE_NS | 64 #ifdef HAVE_NS |
| 63 #include "nsgui.h" | 65 #include "nsgui.h" |
| 64 /* following typedef needed to accomodate the MSDOS port, believe it or not */ | 66 /* following typedef needed to accomodate the MSDOS port, believe it or not */ |
| 65 typedef struct ns_display_info Display_Info; | 67 typedef struct ns_display_info Display_Info; |
| 66 #define DPYINFO_DEFINED 1 | |
| 67 typedef Pixmap XImagePtr; | 68 typedef Pixmap XImagePtr; |
| 68 typedef XImagePtr XImagePtr_or_DC; | 69 typedef XImagePtr XImagePtr_or_DC; |
| 69 #endif | 70 #endif |
| 70 | 71 |
| 71 #ifndef DPYINFO_DEFINED | 72 #ifndef HAVE_WINDOW_SYSTEM |
| 72 typedef struct tty_display_info Display_Info; | |
| 73 typedef int Cursor; | 73 typedef int Cursor; |
| 74 #define No_Cursor (0) | 74 #define No_Cursor (0) |
| 75 #endif | |
| 76 | |
| 77 #undef DPYINFO_DEFINED | |
| 78 | |
| 79 #ifdef MSDOS | |
| 80 /* This defines FRAME_X_DISPLAY_INFO for MSDOS. */ | |
| 81 #include "msdos.h" | |
| 82 #endif | |
| 83 | |
| 84 #ifdef HAVE_GPM | |
| 85 #define FRAME_X_DISPLAY_INFO(f) gpm_tty | |
| 86 #endif | |
| 87 | |
| 88 #ifndef FRAME_X_DISPLAY_INFO | |
| 89 #define FRAME_X_DISPLAY_INFO(f) NULL | |
| 90 #endif | 75 #endif |
| 91 | 76 |
| 92 #ifndef NativeRectangle | 77 #ifndef NativeRectangle |
| 93 #define NativeRectangle int | 78 #define NativeRectangle int |
| 94 #endif | 79 #endif |