Mercurial > emacs
comparison src/macterm.h @ 47139:9cedf65c8ff2
(enum text_cursor_kinds): Removed.
(struct output_mac) <current_cursor, desired_cursor, cursor_width>
<blink_off_cursor, blink_off_cursor_width>: Members removed.
(FRAME_DESIRED_CURSOR): Macro removed.
author | Kim F. Storm <storm@cua.dk> |
---|---|
date | Fri, 30 Aug 2002 12:02:32 +0000 |
parents | 01b93e5e53a7 |
children | 23a1cea22d13 |
comparison
equal
deleted
inserted
replaced
47138:4a0541418bc5 | 47139:9cedf65c8ff2 |
---|---|
39 #define FONT_HEIGHT(f) ((f)->ascent + (f)->descent) | 39 #define FONT_HEIGHT(f) ((f)->ascent + (f)->descent) |
40 #define FONT_BASE(f) ((f)->ascent) | 40 #define FONT_BASE(f) ((f)->ascent) |
41 #define FONT_DESCENT(f) ((f)->descent) | 41 #define FONT_DESCENT(f) ((f)->descent) |
42 | 42 |
43 #define FONT_MAX_WIDTH(f) FONT_WIDTH(f) /* fix later */ | 43 #define FONT_MAX_WIDTH(f) FONT_WIDTH(f) /* fix later */ |
44 | |
45 enum text_cursor_kinds { | |
46 NO_CURSOR = -1, | |
47 FILLED_BOX_CURSOR, | |
48 HOLLOW_BOX_CURSOR, | |
49 BAR_CURSOR | |
50 }; | |
51 | 44 |
52 /* Structure recording bitmaps and reference count. | 45 /* Structure recording bitmaps and reference count. |
53 If REFCOUNT is 0 then this record is free to be reused. */ | 46 If REFCOUNT is 0 then this record is free to be reused. */ |
54 | 47 |
55 struct mac_bitmap_record | 48 struct mac_bitmap_record |
351 /* Flag to set when the window needs to be completely repainted. */ | 344 /* Flag to set when the window needs to be completely repainted. */ |
352 int needs_exposure; | 345 int needs_exposure; |
353 | 346 |
354 #endif | 347 #endif |
355 | 348 |
356 /* What kind of text cursor is drawn in this window right now? | |
357 (If there is no cursor (phys_cursor_x < 0), then this means nothing.) */ | |
358 enum text_cursor_kinds current_cursor; | |
359 | |
360 /* What kind of text cursor should we draw in the future? | |
361 This should always be filled_box_cursor or bar_cursor. */ | |
362 enum text_cursor_kinds desired_cursor; | |
363 | |
364 /* Width of bar cursor (if we are using that). */ | |
365 int cursor_width; | |
366 | |
367 #if 0 | 349 #if 0 |
368 DWORD dwStyle; | 350 DWORD dwStyle; |
369 #endif | 351 #endif |
370 | 352 |
371 /* The size of the extra width currently allotted for vertical | 353 /* The size of the extra width currently allotted for vertical |
449 #define FRAME_MAC_FONT_TABLE(f) (FRAME_MAC_DISPLAY_INFO (f)->font_table) | 431 #define FRAME_MAC_FONT_TABLE(f) (FRAME_MAC_DISPLAY_INFO (f)->font_table) |
450 | 432 |
451 /* These two really ought to be called FRAME_PIXEL_{WIDTH,HEIGHT}. */ | 433 /* These two really ought to be called FRAME_PIXEL_{WIDTH,HEIGHT}. */ |
452 #define PIXEL_WIDTH(f) ((f)->output_data.mac->pixel_width) | 434 #define PIXEL_WIDTH(f) ((f)->output_data.mac->pixel_width) |
453 #define PIXEL_HEIGHT(f) ((f)->output_data.mac->pixel_height) | 435 #define PIXEL_HEIGHT(f) ((f)->output_data.mac->pixel_height) |
454 | |
455 #define FRAME_DESIRED_CURSOR(f) ((f)->output_data.mac->desired_cursor) | |
456 | 436 |
457 /* Value is the smallest width of any character in any font on frame F. */ | 437 /* Value is the smallest width of any character in any font on frame F. */ |
458 | 438 |
459 #define FRAME_SMALLEST_CHAR_WIDTH(F) \ | 439 #define FRAME_SMALLEST_CHAR_WIDTH(F) \ |
460 FRAME_MAC_DISPLAY_INFO(F)->smallest_char_width | 440 FRAME_MAC_DISPLAY_INFO(F)->smallest_char_width |