Mercurial > emacs
comparison src/macterm.h @ 83556:07774e5c3ff5
Merged from emacs@sv.gnu.org
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-619
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-620
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-621
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-622
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-623
Remove RCS keywords
* emacs@sv.gnu.org/emacs--devo--0--patch-624
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-625
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-626
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-627
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-628
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-629
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-630
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-631
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-632
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-633
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-634
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-635
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-636
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-637
Remove RCS keywords
* emacs@sv.gnu.org/emacs--devo--0--patch-638
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-639
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-640
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-641
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-642
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-643
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-644
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-645
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-646
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-647
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-648
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-649
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-197
Merge from emacs--devo--0
* emacs@sv.gnu.org/gnus--rel--5.10--patch-198
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-199
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-200
Merge from emacs--devo--0
* emacs@sv.gnu.org/gnus--rel--5.10--patch-201
Update from CVS: lisp/nnweb.el (nnweb-google-parse-1): Update parser.
* emacs@sv.gnu.org/gnus--rel--5.10--patch-202
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-596
author | Karoly Lorentey <karoly@lorentey.hu> |
---|---|
date | Sat, 24 Feb 2007 19:26:54 +0000 |
parents | b8d9a391daf3 2bb3bf56c28d |
children | 738ce3540ffb |
comparison
equal
deleted
inserted
replaced
83555:053bf1a38bfa | 83556:07774e5c3ff5 |
---|---|
202 one for each element of x_display_list and in the same order. | 202 one for each element of x_display_list and in the same order. |
203 NAME is the name of the frame. | 203 NAME is the name of the frame. |
204 FONT-LIST-CACHE records previous values returned by x-list-fonts. */ | 204 FONT-LIST-CACHE records previous values returned by x-list-fonts. */ |
205 extern Lisp_Object x_display_name_list; | 205 extern Lisp_Object x_display_name_list; |
206 | 206 |
207 extern struct x_display_info *x_display_info_for_display P_ ((Display *)); | |
208 extern struct x_display_info *x_display_info_for_name P_ ((Lisp_Object)); | 207 extern struct x_display_info *x_display_info_for_name P_ ((Lisp_Object)); |
209 | 208 |
210 extern struct mac_display_info *mac_term_init P_ ((Lisp_Object, char *, char *)); | 209 extern struct mac_display_info *mac_term_init P_ ((Lisp_Object, char *, char *)); |
211 | 210 |
212 extern Lisp_Object x_list_fonts P_ ((struct frame *, Lisp_Object, int, int)); | 211 extern Lisp_Object x_list_fonts P_ ((struct frame *, Lisp_Object, int, int)); |
399 Lisp_Object window; | 398 Lisp_Object window; |
400 | 399 |
401 /* The next and previous in the chain of scroll bars in this frame. */ | 400 /* The next and previous in the chain of scroll bars in this frame. */ |
402 Lisp_Object next, prev; | 401 Lisp_Object next, prev; |
403 | 402 |
404 /* The Mac control handle of this scroll bar. Since this is a full | 403 /* The Mac control handle of this scroll bar. Since this is a |
405 32-bit quantity, we store it split into two 32-bit values. */ | 404 pointer value, we store it split into two Lisp integers. */ |
406 Lisp_Object control_handle_low, control_handle_high; | 405 Lisp_Object control_handle_low, control_handle_high; |
407 | 406 |
408 /* The position and size of the scroll bar in pixels, relative to the | 407 /* The position and size of the scroll bar in pixels, relative to the |
409 frame. */ | 408 frame. */ |
410 Lisp_Object top, left, width, height; | 409 Lisp_Object top, left, width, height; |
422 different co-ordinate system. */ | 421 different co-ordinate system. */ |
423 Lisp_Object start, end; | 422 Lisp_Object start, end; |
424 | 423 |
425 /* If the scroll bar handle is currently being dragged by the user, | 424 /* If the scroll bar handle is currently being dragged by the user, |
426 this is the number of pixels from the top of the handle to the | 425 this is the number of pixels from the top of the handle to the |
427 place where the user grabbed it. If the handle isn't currently | 426 place where the user grabbed it. If the handle is pressed but |
427 not dragged yet, this is a negative integer whose absolute value | |
428 is the number of pixels plus 1. If the handle isn't currently | |
428 being dragged, this is Qnil. */ | 429 being dragged, this is Qnil. */ |
429 Lisp_Object dragging; | 430 Lisp_Object dragging; |
430 | 431 |
431 #ifdef USE_TOOLKIT_SCROLL_BARS | 432 #ifdef USE_TOOLKIT_SCROLL_BARS |
432 /* The position and size of the scroll bar handle track area in | 433 /* The position and size of the scroll bar handle track area in |
433 pixels, relative to the frame. */ | 434 pixels, relative to the frame. */ |
434 Lisp_Object track_top, track_height; | 435 Lisp_Object track_top, track_height; |
436 | |
437 /* Minimum length of the scroll bar handle, in pixels. */ | |
438 Lisp_Object min_handle; | |
435 #endif | 439 #endif |
436 }; | 440 }; |
437 | 441 |
438 /* The number of elements a vector holding a struct scroll_bar needs. */ | 442 /* The number of elements a vector holding a struct scroll_bar needs. */ |
439 #define SCROLL_BAR_VEC_SIZE \ | 443 #define SCROLL_BAR_VEC_SIZE \ |
443 | 447 |
444 /* Turning a lisp vector value into a pointer to a struct scroll_bar. */ | 448 /* Turning a lisp vector value into a pointer to a struct scroll_bar. */ |
445 #define XSCROLL_BAR(vec) ((struct scroll_bar *) XVECTOR (vec)) | 449 #define XSCROLL_BAR(vec) ((struct scroll_bar *) XVECTOR (vec)) |
446 | 450 |
447 | 451 |
448 /* Building a 32-bit C integer from two 16-bit lisp integers. */ | 452 /* Building a C long integer from two lisp integers. */ |
449 #define SCROLL_BAR_PACK(low, high) (XINT (high) << 16 | XINT (low)) | 453 #define SCROLL_BAR_PACK(low, high) (XINT (high) << 16 | XINT (low)) |
450 | 454 |
451 /* Setting two lisp integers to the low and high words of a 32-bit C int. */ | 455 /* Setting two lisp integers to two parts of a C unsigned long. */ |
452 #define SCROLL_BAR_UNPACK(low, high, int32) \ | 456 #define SCROLL_BAR_UNPACK(low, high, ulong) \ |
453 (XSETINT ((low), (int32) & 0xffff), \ | 457 (XSETINT ((low), (ulong) & 0xffff), \ |
454 XSETINT ((high), ((int32) >> 16) & 0xffff)) | 458 XSETINT ((high), (ulong) >> 16)) |
455 | 459 |
456 | 460 |
457 /* Extract the Mac control handle of the scroll bar from a struct | 461 /* Extract the Mac control handle of the scroll bar from a struct |
458 scroll_bar. */ | 462 scroll_bar. */ |
459 #define SCROLL_BAR_CONTROL_HANDLE(ptr) \ | 463 #define SCROLL_BAR_CONTROL_HANDLE(ptr) \ |
460 ((ControlHandle) SCROLL_BAR_PACK ((ptr)->control_handle_low, \ | 464 ((ControlHandle) SCROLL_BAR_PACK ((ptr)->control_handle_low, \ |
461 (ptr)->control_handle_high)) | 465 (ptr)->control_handle_high)) |
462 | 466 |
463 /* Store a Mac control handle in a struct scroll_bar. */ | 467 /* Store a Mac control handle in a struct scroll_bar. */ |
464 #define SET_SCROLL_BAR_CONTROL_HANDLE(ptr, id) \ | 468 #define SET_SCROLL_BAR_CONTROL_HANDLE(ptr, handle) \ |
465 (SCROLL_BAR_UNPACK ((ptr)->control_handle_low, \ | 469 (SCROLL_BAR_UNPACK ((ptr)->control_handle_low, \ |
466 (ptr)->control_handle_high, (int) id)) | 470 (ptr)->control_handle_high, (unsigned long) (handle))) |
467 | 471 |
468 /* Return the inside width of a vertical scroll bar, given the outside | 472 /* Return the inside width of a vertical scroll bar, given the outside |
469 width. */ | 473 width. */ |
470 #define VERTICAL_SCROLL_BAR_INSIDE_WIDTH(f, width) \ | 474 #define VERTICAL_SCROLL_BAR_INSIDE_WIDTH(f, width) \ |
471 ((width) \ | 475 ((width) \ |