diff options
| author | Miles Bader <miles@gnu.org> | 2007-10-11 16:24:58 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-10-11 16:24:58 +0000 |
| commit | c73bd236f75b742ad4642ec94798987ae6e3e1e8 (patch) | |
| tree | ef5edc8db557fc1d25a17c379e4ae63a38b3ba5c /src/w32term.h | |
| parent | ecb21060d5c1752d41d7a742be565c59b5fcb855 (diff) | |
| parent | 58ade22bf16a9ec2ff0aee6c59d8db4d1703e94f (diff) | |
| download | emacs-c73bd236f75b742ad4642ec94798987ae6e3e1e8.tar.gz | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 866-879)
- Merge multi-tty branch
- Update from CVS
- Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-257
Diffstat (limited to 'src/w32term.h')
| -rw-r--r-- | src/w32term.h | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/w32term.h b/src/w32term.h index cea3110ff8f..f5aff57622e 100644 --- a/src/w32term.h +++ b/src/w32term.h @@ -100,6 +100,9 @@ struct w32_display_info /* Chain of all w32_display_info structures. */ struct w32_display_info *next; + /* The generic display parameters corresponding to this w32 display. */ + struct terminal *terminal; + /* This is a cons cell of the form (NAME . FONT-LIST-CACHE). The same cons cell also appears in x_display_name_list. */ Lisp_Object name_list_element; @@ -274,8 +277,10 @@ extern Lisp_Object x_get_font_repertory P_ ((struct frame *, diffs between X and w32 code. */ struct x_output { +#if 0 /* These are also defined in struct frame. Use that instead. */ PIX_TYPE background_pixel; PIX_TYPE foreground_pixel; +#endif /* Keep track of focus. May be EXPLICIT if we received a FocusIn for this frame, or IMPLICIT if we received an EnterNotify. @@ -411,8 +416,6 @@ extern struct w32_output w32term_display; #define FRAME_W32_WINDOW(f) ((f)->output_data.w32->window_desc) #define FRAME_X_WINDOW(f) ((f)->output_data.w32->window_desc) -#define FRAME_FOREGROUND_PIXEL(f) ((f)->output_data.x->foreground_pixel) -#define FRAME_BACKGROUND_PIXEL(f) ((f)->output_data.x->background_pixel) #define FRAME_FONT(f) ((f)->output_data.w32->font) #define FRAME_FONTSET(f) ((f)->output_data.w32->fontset) #define FRAME_BASELINE_OFFSET(f) ((f)->output_data.w32->baseline_offset) @@ -600,10 +603,10 @@ do { \ } while (0) #define w32_clear_rect(f,hdc,lprect) \ -w32_fill_rect (f,hdc,f->output_data.x->background_pixel,lprect) + w32_fill_rect (f, hdc, FRAME_BACKGROUND_PIXEL (f), lprect) #define w32_clear_area(f,hdc,px,py,nx,ny) \ -w32_fill_area (f,hdc,f->output_data.x->background_pixel,px,py,nx,ny) + w32_fill_area (f, hdc, FRAME_BACKGROUND_PIXEL (f), px, py, nx, ny) extern struct font_info *w32_load_font (); extern void w32_unload_font (); @@ -619,6 +622,9 @@ extern void w32_unload_font (); #define WM_XBUTTONDOWN (WM_MOUSEWHEEL + 1) #define WM_XBUTTONUP (WM_MOUSEWHEEL + 2) #endif /* WM_XBUTTONDOWN */ +#ifndef WM_MOUSEHWHEEL +#define WM_MOUSEHWHEEL (WM_MOUSEWHEEL + 4) +#endif /* WM_MOUSEHWHEEL */ #define WM_EMACS_START (WM_USER + 1) #define WM_EMACS_KILL (WM_EMACS_START + 0) @@ -698,6 +704,9 @@ extern void wait_for_sync (); extern BOOL parse_button (); +extern void w32_sys_ring_bell (struct frame *f); +extern void x_delete_display (struct w32_display_info *dpyinfo); + /* Keypad command key support. W32 doesn't have virtual keys defined for the function keys on the keypad (they are mapped to the standard fuction keys), so we define our own. */ |