comparison src/macterm.h @ 81411:ddf18bd8d3c1

(struct mac_output) [USE_MAC_TOOLBAR]: New member toolbar_win_gravity. (struct scroll_bar) [MAC_OSX]: New member fringe_extended_p. (update_frame_tool_bar, free_frame_tool_bar) [USE_MAC_TOOLBAR]: Add externs.
author YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
date Thu, 14 Jun 2007 08:39:40 +0000
parents a45c50c85284
children b98604865ea0 9c01792a3ce8 3619e7770f2e
comparison
equal deleted inserted replaced
81410:26045b628846 81411:ddf18bd8d3c1
331 int internal_border_width; 331 int internal_border_width;
332 332
333 /* Hints for the size and the position of a window. */ 333 /* Hints for the size and the position of a window. */
334 XSizeHints *size_hints; 334 XSizeHints *size_hints;
335 335
336 #if USE_MAC_TOOLBAR
337 /* This variable records the gravity value of the window position if
338 the window has an external tool bar when it is created. The
339 position of the window is adjusted using this information when
340 the tool bar is first redisplayed. Once the tool bar is
341 redisplayed, it is set to 0 in order to avoid further
342 adjustment. */
343 int toolbar_win_gravity;
344 #endif
345
336 #if USE_CG_DRAWING 346 #if USE_CG_DRAWING
337 /* Quartz 2D graphics context. */ 347 /* Quartz 2D graphics context. */
338 CGContextRef cg_context; 348 CGContextRef cg_context;
339 #endif 349 #endif
340 }; 350 };
438 place where the user grabbed it. If the handle is pressed but 448 place where the user grabbed it. If the handle is pressed but
439 not dragged yet, this is a negative integer whose absolute value 449 not dragged yet, this is a negative integer whose absolute value
440 is the number of pixels plus 1. If the handle isn't currently 450 is the number of pixels plus 1. If the handle isn't currently
441 being dragged, this is Qnil. */ 451 being dragged, this is Qnil. */
442 Lisp_Object dragging; 452 Lisp_Object dragging;
453
454 #ifdef MAC_OSX
455 /* t if the background of the fringe that is adjacent to a scroll
456 bar is extended to the gap between the fringe and the bar. */
457 Lisp_Object fringe_extended_p;
458 #endif
443 459
444 #ifdef USE_TOOLKIT_SCROLL_BARS 460 #ifdef USE_TOOLKIT_SCROLL_BARS
445 /* The position and size of the scroll bar handle track area in 461 /* The position and size of the scroll bar handle track area in
446 pixels, relative to the frame. */ 462 pixels, relative to the frame. */
447 Lisp_Object track_top, track_height; 463 Lisp_Object track_top, track_height;
649 #if USE_CG_DRAWING 665 #if USE_CG_DRAWING
650 extern void mac_prepare_for_quickdraw P_ ((struct frame *)); 666 extern void mac_prepare_for_quickdraw P_ ((struct frame *));
651 #endif 667 #endif
652 extern void mac_get_window_bounds P_ ((struct frame *, Rect *, Rect *)); 668 extern void mac_get_window_bounds P_ ((struct frame *, Rect *, Rect *));
653 extern int mac_quit_char_key_p P_ ((UInt32, UInt32)); 669 extern int mac_quit_char_key_p P_ ((UInt32, UInt32));
670 #if USE_MAC_TOOLBAR
671 extern void update_frame_tool_bar P_ ((FRAME_PTR f));
672 extern void free_frame_tool_bar P_ ((FRAME_PTR f));
673 #endif
654 674
655 #define FONT_TYPE_FOR_UNIBYTE(font, ch) 0 675 #define FONT_TYPE_FOR_UNIBYTE(font, ch) 0
656 #define FONT_TYPE_FOR_MULTIBYTE(font, ch) 0 676 #define FONT_TYPE_FOR_MULTIBYTE(font, ch) 0
657 677
658 /* Defined in macselect.c */ 678 /* Defined in macselect.c */