Mercurial > emacs

comparison src/macterm.h @ 81159:d7bcc159ccc6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(struct scroll_bar): Rename member control_handle_low and control_handle_high to control_ref_low and control_ref_high. All uses changed. (SCROLL_BAR_CONTROL_REF, SET_SCROLL_BAR_CONTROL_REF): Rename from SCROLL_BAR_CONTROL_HANDLE and SET_SCROLL_BAR_CONTROL_HANDLE, respectively. All uses changed. (XCreatePixmap, XCreatePixmapFromBitmapData, XSetWindowBackground) (install_window_handler, remove_window_handler): Replace WindowPtr with WindowRef in externs.
author YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
date Wed, 06 Jun 2007 08:33:22 +0000
parents 2ebc26a83cc7
children a45c50c85284
comparison
equal deleted inserted replaced
81158:c6b1c2b2e312 81159:d7bcc159ccc6
404 Lisp_Object window; 404 Lisp_Object window;
405 405
406 /* The next and previous in the chain of scroll bars in this frame. */ 406 /* The next and previous in the chain of scroll bars in this frame. */
407 Lisp_Object next, prev; 407 Lisp_Object next, prev;
408 408
409 /* The Mac control handle of this scroll bar. Since this is a 409 /* The Mac control reference of this scroll bar. Since this is a
410 pointer value, we store it split into two Lisp integers. */ 410 pointer value, we store it split into two Lisp integers. */
411 Lisp_Object control_handle_low, control_handle_high; 411 Lisp_Object control_ref_low, control_ref_high;
412 412
413 /* The position and size of the scroll bar in pixels, relative to the 413 /* The position and size of the scroll bar in pixels, relative to the
414 frame. */ 414 frame. */
415 Lisp_Object top, left, width, height; 415 Lisp_Object top, left, width, height;
416 416
464 XSETINT ((high), (ulong) >> 16)) 464 XSETINT ((high), (ulong) >> 16))
465 465
466 466
467 /* Extract the Mac control handle of the scroll bar from a struct 467 /* Extract the Mac control handle of the scroll bar from a struct
468 scroll_bar. */ 468 scroll_bar. */
469 #define SCROLL_BAR_CONTROL_HANDLE(ptr) \ 469 #define SCROLL_BAR_CONTROL_REF(ptr) \
470 ((ControlHandle) SCROLL_BAR_PACK ((ptr)->control_handle_low, \ 470 ((ControlRef) SCROLL_BAR_PACK ((ptr)->control_ref_low, \
471 (ptr)->control_handle_high)) 471 (ptr)->control_ref_high))
472 472
473 /* Store a Mac control handle in a struct scroll_bar. */ 473 /* Store a Mac control handle in a struct scroll_bar. */
474 #define SET_SCROLL_BAR_CONTROL_HANDLE(ptr, handle) \ 474 #define SET_SCROLL_BAR_CONTROL_REF(ptr, ref) \
475 (SCROLL_BAR_UNPACK ((ptr)->control_handle_low, \ 475 (SCROLL_BAR_UNPACK ((ptr)->control_ref_low, \
476 (ptr)->control_handle_high, (unsigned long) (handle))) 476 (ptr)->control_ref_high, (unsigned long) (ref)))
477 477
478 /* Return the inside width of a vertical scroll bar, given the outside 478 /* Return the inside width of a vertical scroll bar, given the outside
479 width. */ 479 width. */
480 #define VERTICAL_SCROLL_BAR_INSIDE_WIDTH(f, width) \ 480 #define VERTICAL_SCROLL_BAR_INSIDE_WIDTH(f, width) \
481 ((width) \ 481 ((width) \
613 extern void x_free_frame_resources P_ ((struct frame *)); 613 extern void x_free_frame_resources P_ ((struct frame *));
614 extern void x_destroy_window P_ ((struct frame *)); 614 extern void x_destroy_window P_ ((struct frame *));
615 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));
616 extern void x_delete_display P_ ((struct x_display_info *)); 616 extern void x_delete_display P_ ((struct x_display_info *));
617 extern void mac_initialize P_ ((void)); 617 extern void mac_initialize P_ ((void));
618 extern Pixmap XCreatePixmap P_ ((Display *, WindowPtr, unsigned int, 618 extern Pixmap XCreatePixmap P_ ((Display *, WindowRef, unsigned int,
619 unsigned int, unsigned int)); 619 unsigned int, unsigned int));
620 extern Pixmap XCreatePixmapFromBitmapData P_ ((Display *, WindowPtr, char *, 620 extern Pixmap XCreatePixmapFromBitmapData P_ ((Display *, WindowRef, char *,
621 unsigned int, unsigned int, 621 unsigned int, unsigned int,
622 unsigned long, unsigned long, 622 unsigned long, unsigned long,
623 unsigned int)); 623 unsigned int));
624 extern void XFreePixmap P_ ((Display *, Pixmap)); 624 extern void XFreePixmap P_ ((Display *, Pixmap));
625 extern GC XCreateGC P_ ((Display *, void *, unsigned long, XGCValues *)); 625 extern GC XCreateGC P_ ((Display *, void *, unsigned long, XGCValues *));
626 extern void XFreeGC P_ ((Display *, GC)); 626 extern void XFreeGC P_ ((Display *, GC));
627 extern void XSetForeground P_ ((Display *, GC, unsigned long)); 627 extern void XSetForeground P_ ((Display *, GC, unsigned long));
628 extern void XSetBackground P_ ((Display *, GC, unsigned long)); 628 extern void XSetBackground P_ ((Display *, GC, unsigned long));
629 extern void XSetWindowBackground P_ ((Display *, WindowPtr, unsigned long)); 629 extern void XSetWindowBackground P_ ((Display *, WindowRef, unsigned long));
630 extern void XDrawLine P_ ((Display *, Pixmap, GC, int, int, int, int)); 630 extern void XDrawLine P_ ((Display *, Pixmap, GC, int, int, int, int));
631 extern void mac_clear_area P_ ((struct frame *, int, int, 631 extern void mac_clear_area P_ ((struct frame *, int, int,
632 unsigned int, unsigned int)); 632 unsigned int, unsigned int));
633 extern void mac_unload_font P_ ((struct mac_display_info *, XFontStruct *)); 633 extern void mac_unload_font P_ ((struct mac_display_info *, XFontStruct *));
634 extern int mac_font_panel_visible_p P_ ((void)); 634 extern int mac_font_panel_visible_p P_ ((void));
635 extern OSStatus mac_show_hide_font_panel P_ ((void)); 635 extern OSStatus mac_show_hide_font_panel P_ ((void));
636 extern OSStatus mac_set_font_info_for_selection P_ ((struct frame *, int, int)); 636 extern OSStatus mac_set_font_info_for_selection P_ ((struct frame *, int, int));
637 extern OSStatus install_window_handler P_ ((WindowPtr)); 637 extern OSStatus install_window_handler P_ ((WindowRef));
638 extern void remove_window_handler P_ ((WindowPtr)); 638 extern void remove_window_handler P_ ((WindowRef));
639 extern OSStatus mac_post_mouse_moved_event P_ ((void)); 639 extern OSStatus mac_post_mouse_moved_event P_ ((void));
640 #if !TARGET_API_MAC_CARBON 640 #if !TARGET_API_MAC_CARBON
641 extern void do_apple_menu P_ ((SInt16)); 641 extern void do_apple_menu P_ ((SInt16));
642 #endif 642 #endif
643 #if USE_CG_DRAWING 643 #if USE_CG_DRAWING