Mercurial > emacs
comparison src/macterm.h @ 83619:5da6a46ddbd6
* s/darwin.h (SYSTEM_PURESIZE_EXTRA): Define here.
* termhooks.h (union display_info): Add mac_display_info.
* term.c (init_tty): Only use terminal->kboard when MULTI_KBOARD
is defined.
* macterm.h (struct mac_display_info): Add terminal.
* w32term.c (w32_initialize): Make static.
* macterm.c (XTset_terminal_modes): Add a terminal parameter.
(XTreset_terminal_modes): Likewise.
(x_clear_frame): Add a frame parameter.
(note_mouse_movement): Get rif from the frame.
(mac_term_init): Initialize the terminal.
(mac_initialize): Make static and move terminal initialization ...
(mac_create_terminal): ... in this new function.
* macmenu.c: Reorder includes.
(Fx_popup_menu): Use terminal specific mouse_position_hook.
* macfns.c (x_set_mouse_color): Get rif from the frame.
(x_set_tool_bar_lines): Don't use updating_frame.
(mac_window): Add 2 new parameters for consistency with other
systems.
(Fx_create_frame): Fix doc string. Rename the parameter.
(Fx_create_frame): Set the frame parameters following what is done
in X11 and w32.
(Fx_open_connection): Remove window-system check.
(start_hourglass): Likewise.
(x_create_tip_frame): Get the keyboard from the terminal.
* w32fns.c (Fx_create_frame): Use kboard from the terminal.
* term/mac-win.el: Provide mac-win.
(mac-initialized): New variable.
(mac-initialize-window-system): New function. Move global setup
here.
(handle-args-function-alist, frame-creation-function-alist):
(window-system-initialization-alist): Add mac entries.
* loadup.el: Load mac-win on a Mac.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Sat, 19 May 2007 19:08:02 +0000 |
| parents | 738ce3540ffb |
| children | cc587bfd19ca |
comparison
equal
deleted
inserted
replaced
| 83618:fe83377d2247 | 83619:5da6a46ddbd6 |
|---|---|
| 61 | 61 |
| 62 struct mac_display_info | 62 struct mac_display_info |
| 63 { | 63 { |
| 64 /* Chain of all mac_display_info structures. */ | 64 /* Chain of all mac_display_info structures. */ |
| 65 struct mac_display_info *next; | 65 struct mac_display_info *next; |
| 66 | |
| 67 /* The generic display parameters corresponding to this X display. */ | |
| 68 struct terminal *terminal; | |
| 66 | 69 |
| 67 /* This is a cons cell of the form (NAME . FONT-LIST-CACHE). | 70 /* This is a cons cell of the form (NAME . FONT-LIST-CACHE). |
| 68 The same cons cell also appears in x_display_name_list. */ | 71 The same cons cell also appears in x_display_name_list. */ |
| 69 Lisp_Object name_list_element; | 72 Lisp_Object name_list_element; |
| 70 | 73 |
| 609 extern void x_iconify_frame P_ ((struct frame *)); | 612 extern void x_iconify_frame P_ ((struct frame *)); |
| 610 extern void x_free_frame_resources P_ ((struct frame *)); | 613 extern void x_free_frame_resources P_ ((struct frame *)); |
| 611 extern void x_destroy_window P_ ((struct frame *)); | 614 extern void x_destroy_window P_ ((struct frame *)); |
| 612 extern void x_wm_set_size_hint P_ ((struct frame *, long, int)); | 615 extern void x_wm_set_size_hint P_ ((struct frame *, long, int)); |
| 613 extern void x_delete_display P_ ((struct x_display_info *)); | 616 extern void x_delete_display P_ ((struct x_display_info *)); |
| 614 extern void mac_initialize P_ ((void)); | |
| 615 extern Pixmap XCreatePixmap P_ ((Display *, WindowPtr, unsigned int, | 617 extern Pixmap XCreatePixmap P_ ((Display *, WindowPtr, unsigned int, |
| 616 unsigned int, unsigned int)); | 618 unsigned int, unsigned int)); |
| 617 extern Pixmap XCreatePixmapFromBitmapData P_ ((Display *, WindowPtr, char *, | 619 extern Pixmap XCreatePixmapFromBitmapData P_ ((Display *, WindowPtr, char *, |
| 618 unsigned int, unsigned int, | 620 unsigned int, unsigned int, |
| 619 unsigned long, unsigned long, | 621 unsigned long, unsigned long, |