comparison src/glyphs.h @ 418:e804706bfb8c r21-2-17

Import from CVS: tag r21-2-17
author cvs
date Mon, 13 Aug 2007 11:23:13 +0200
parents 697ef44129c6
children 41dbb7a9d5f2
comparison
equal deleted inserted replaced
417:43a18b32d56e 418:e804706bfb8c
430 struct 430 struct
431 { 431 {
432 Lisp_Object face; /* foreground and background colors */ 432 Lisp_Object face; /* foreground and background colors */
433 Lisp_Object type; 433 Lisp_Object type;
434 Lisp_Object props; /* properties */ 434 Lisp_Object props; /* properties */
435 struct gui_item gui_item; 435 Lisp_Object gui_item; /* a list of gui_items */
436 } widget; /* widgets are subwindows */ 436 } widget; /* widgets are subwindows */
437 } subwindow; 437 } subwindow;
438 } u; 438 } u;
439 439
440 /* console-type- and image-type-specific data */ 440 /* console-type- and image-type-specific data */
470 470
471 #define IMAGE_INSTANCE_WIDGET_WIDTH(i) \ 471 #define IMAGE_INSTANCE_WIDGET_WIDTH(i) \
472 IMAGE_INSTANCE_SUBWINDOW_WIDTH(i) 472 IMAGE_INSTANCE_SUBWINDOW_WIDTH(i)
473 #define IMAGE_INSTANCE_WIDGET_HEIGHT(i) \ 473 #define IMAGE_INSTANCE_WIDGET_HEIGHT(i) \
474 IMAGE_INSTANCE_SUBWINDOW_HEIGHT(i) 474 IMAGE_INSTANCE_SUBWINDOW_HEIGHT(i)
475 #define IMAGE_INSTANCE_WIDGET_CALLBACK(i) \
476 ((i)->u.subwindow.widget.gui_item.callback)
477 #define IMAGE_INSTANCE_WIDGET_TYPE(i) ((i)->u.subwindow.widget.type) 475 #define IMAGE_INSTANCE_WIDGET_TYPE(i) ((i)->u.subwindow.widget.type)
478 #define IMAGE_INSTANCE_WIDGET_PROPS(i) ((i)->u.subwindow.widget.props) 476 #define IMAGE_INSTANCE_WIDGET_PROPS(i) ((i)->u.subwindow.widget.props)
479 #define IMAGE_INSTANCE_WIDGET_FACE(i) ((i)->u.subwindow.widget.face) 477 #define IMAGE_INSTANCE_WIDGET_FACE(i) ((i)->u.subwindow.widget.face)
480 #define IMAGE_INSTANCE_WIDGET_TEXT(i) ((i)->u.subwindow.widget.gui_item.name)
481 #define IMAGE_INSTANCE_WIDGET_ITEM(i) ((i)->u.subwindow.widget.gui_item) 478 #define IMAGE_INSTANCE_WIDGET_ITEM(i) ((i)->u.subwindow.widget.gui_item)
479 #define IMAGE_INSTANCE_WIDGET_SINGLE_ITEM(i) \
480 (CONSP (IMAGE_INSTANCE_WIDGET_ITEM (i)) ? \
481 XCAR (IMAGE_INSTANCE_WIDGET_ITEM (i)) : \
482 IMAGE_INSTANCE_WIDGET_ITEM (i))
483 #define IMAGE_INSTANCE_WIDGET_TEXT(i) XGUI_ITEM (IMAGE_INSTANCE_WIDGET_ITEM (i))->name
482 484
483 #define XIMAGE_INSTANCE_DEVICE(i) \ 485 #define XIMAGE_INSTANCE_DEVICE(i) \
484 IMAGE_INSTANCE_DEVICE (XIMAGE_INSTANCE (i)) 486 IMAGE_INSTANCE_DEVICE (XIMAGE_INSTANCE (i))
485 #define XIMAGE_INSTANCE_NAME(i) \ 487 #define XIMAGE_INSTANCE_NAME(i) \
486 IMAGE_INSTANCE_NAME (XIMAGE_INSTANCE (i)) 488 IMAGE_INSTANCE_NAME (XIMAGE_INSTANCE (i))
511 513
512 #define XIMAGE_INSTANCE_WIDGET_WIDTH(i) \ 514 #define XIMAGE_INSTANCE_WIDGET_WIDTH(i) \
513 IMAGE_INSTANCE_WIDGET_WIDTH (XIMAGE_INSTANCE (i)) 515 IMAGE_INSTANCE_WIDGET_WIDTH (XIMAGE_INSTANCE (i))
514 #define XIMAGE_INSTANCE_WIDGET_HEIGHT(i) \ 516 #define XIMAGE_INSTANCE_WIDGET_HEIGHT(i) \
515 IMAGE_INSTANCE_WIDGET_HEIGHT (XIMAGE_INSTANCE (i)) 517 IMAGE_INSTANCE_WIDGET_HEIGHT (XIMAGE_INSTANCE (i))
516 #define XIMAGE_INSTANCE_WIDGET_CALLBACK(i) \
517 IMAGE_INSTANCE_WIDGET_CALLBACK (XIMAGE_INSTANCE (i))
518 #define XIMAGE_INSTANCE_WIDGET_TYPE(i) \ 518 #define XIMAGE_INSTANCE_WIDGET_TYPE(i) \
519 IMAGE_INSTANCE_WIDGET_TYPE (XIMAGE_INSTANCE (i)) 519 IMAGE_INSTANCE_WIDGET_TYPE (XIMAGE_INSTANCE (i))
520 #define XIMAGE_INSTANCE_WIDGET_PROPS(i) \ 520 #define XIMAGE_INSTANCE_WIDGET_PROPS(i) \
521 IMAGE_INSTANCE_WIDGET_PROPS (XIMAGE_INSTANCE (i)) 521 IMAGE_INSTANCE_WIDGET_PROPS (XIMAGE_INSTANCE (i))
522 #define XIMAGE_INSTANCE_WIDGET_FACE(i) \ 522 #define XIMAGE_INSTANCE_WIDGET_FACE(i) \
523 IMAGE_INSTANCE_WIDGET_FACE (XIMAGE_INSTANCE (i)) 523 IMAGE_INSTANCE_WIDGET_FACE (XIMAGE_INSTANCE (i))
524 #define XIMAGE_INSTANCE_WIDGET_ITEM(i) \
525 IMAGE_INSTANCE_WIDGET_ITEM (XIMAGE_INSTANCE (i))
526 #define XIMAGE_INSTANCE_WIDGET_SINGLE_ITEM(i) \
527 IMAGE_INSTANCE_WIDGET_SINGLE_ITEM (XIMAGE_INSTANCE (i))
524 #define XIMAGE_INSTANCE_WIDGET_TEXT(i) \ 528 #define XIMAGE_INSTANCE_WIDGET_TEXT(i) \
525 IMAGE_INSTANCE_WIDGET_TEXT (XIMAGE_INSTANCE (i)) 529 IMAGE_INSTANCE_WIDGET_TEXT (XIMAGE_INSTANCE (i))
526 #define XIMAGE_INSTANCE_WIDGET_ITEM(i) \
527 IMAGE_INSTANCE_WIDGET_ITEM (XIMAGE_INSTANCE (i))
528 530
529 #define XIMAGE_INSTANCE_SUBWINDOW_WIDTH(i) \ 531 #define XIMAGE_INSTANCE_SUBWINDOW_WIDTH(i) \
530 IMAGE_INSTANCE_SUBWINDOW_WIDTH (XIMAGE_INSTANCE (i)) 532 IMAGE_INSTANCE_SUBWINDOW_WIDTH (XIMAGE_INSTANCE (i))
531 #define XIMAGE_INSTANCE_SUBWINDOW_HEIGHT(i) \ 533 #define XIMAGE_INSTANCE_SUBWINDOW_HEIGHT(i) \
532 IMAGE_INSTANCE_SUBWINDOW_HEIGHT (XIMAGE_INSTANCE (i)) 534 IMAGE_INSTANCE_SUBWINDOW_HEIGHT (XIMAGE_INSTANCE (i))
621 #define XGLYPH_FACE(g) GLYPH_FACE (XGLYPH (g)) 623 #define XGLYPH_FACE(g) GLYPH_FACE (XGLYPH (g))
622 624
623 extern Lisp_Object Qxpm, Qxface; 625 extern Lisp_Object Qxpm, Qxface;
624 extern Lisp_Object Q_data, Q_file, Q_color_symbols, Qconst_glyph_variable; 626 extern Lisp_Object Q_data, Q_file, Q_color_symbols, Qconst_glyph_variable;
625 extern Lisp_Object Qxbm, Qedit, Qgroup, Qlabel, Qcombo, Qscrollbar, Qprogress; 627 extern Lisp_Object Qxbm, Qedit, Qgroup, Qlabel, Qcombo, Qscrollbar, Qprogress;
628 extern Lisp_Object Qtree, Qtab;
626 extern Lisp_Object Q_mask_file, Q_mask_data, Q_hotspot_x, Q_hotspot_y; 629 extern Lisp_Object Q_mask_file, Q_mask_data, Q_hotspot_x, Q_hotspot_y;
627 extern Lisp_Object Q_foreground, Q_background, Q_face, Q_descriptor, Q_group; 630 extern Lisp_Object Q_foreground, Q_background, Q_face, Q_descriptor, Q_group;
628 extern Lisp_Object Q_width, Q_height, Q_pixel_width, Q_pixel_height, Q_text; 631 extern Lisp_Object Q_width, Q_height, Q_pixel_width, Q_pixel_height, Q_text;
629 extern Lisp_Object Q_items, Q_properties, Q_image, Q_percent, Qimage_conversion_error; 632 extern Lisp_Object Q_items, Q_properties, Q_image, Q_percent, Qimage_conversion_error;
630 extern Lisp_Object Vcontinuation_glyph, Vcontrol_arrow_glyph, Vhscroll_glyph; 633 extern Lisp_Object Vcontinuation_glyph, Vcontrol_arrow_glyph, Vhscroll_glyph;