Mercurial > emacs

comparison src/xterm.h @ 27501:ea054e85f0e2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(struct x_display_info) [HAVE_X_I18N]: Add members `xim' and `xim_styles'. (struct x_output) [HAVE_X_I18N]: Remove member `xim', add `xic_style' and `xic_xfs'. (FRAME_MENUBAR_HEIGHT, FRAME_X_XIM, FRAME_X_XIM_STYLES) (FRAME_XIC_STYLE, FRAME_XIC_FONTSET): New macros. (FRAME_XIM): Removed.
author Gerd Moellmann <gerd@gnu.org>
date Sat, 29 Jan 2000 23:17:15 +0000
parents 0020f5359d09
children 8cc3bff16c28
comparison
equal deleted inserted replaced
27500:d33b4becc3ca 27501:ea054e85f0e2
342 /* The gray pixmap. */ 342 /* The gray pixmap. */
343 Pixmap gray; 343 Pixmap gray;
344 344
345 /* Cache of images. */ 345 /* Cache of images. */
346 struct image_cache *image_cache; 346 struct image_cache *image_cache;
347
348 #ifdef HAVE_X_I18N
349 /* XIM (X Input method). */
350 XIM xim;
351 XIMStyles *xim_styles;
352 #endif
347 }; 353 };
348 354
349 /* This is a chain of structures for all the X displays currently in use. */ 355 /* This is a chain of structures for all the X displays currently in use. */
350 extern struct x_display_info *x_display_list; 356 extern struct x_display_info *x_display_list;
351 357
545 551
546 /* Nonzero if this frame was ever previously visible. */ 552 /* Nonzero if this frame was ever previously visible. */
547 char has_been_visible; 553 char has_been_visible;
548 554
549 #ifdef HAVE_X_I18N 555 #ifdef HAVE_X_I18N
550 /* Input method. */
551 XIM xim;
552 /* Input context (currently, this means Compose key handler setup). */ 556 /* Input context (currently, this means Compose key handler setup). */
553 XIC xic; 557 XIC xic;
558 XIMStyle xic_style;
559 XFontSet xic_xfs;
554 #endif 560 #endif
555 561
556 /* Relief GCs, colors etc. */ 562 /* Relief GCs, colors etc. */
557 struct relief 563 struct relief
558 { 564 {
578 #endif 584 #endif
579 585
580 #define FRAME_FONT(f) ((f)->output_data.x->font) 586 #define FRAME_FONT(f) ((f)->output_data.x->font)
581 #define FRAME_FONTSET(f) ((f)->output_data.x->fontset) 587 #define FRAME_FONTSET(f) ((f)->output_data.x->fontset)
582 #define FRAME_INTERNAL_BORDER_WIDTH(f) ((f)->output_data.x->internal_border_width) 588 #define FRAME_INTERNAL_BORDER_WIDTH(f) ((f)->output_data.x->internal_border_width)
589 #define FRAME_MENUBAR_HEIGHT(f) ((f)->output_data.x->menubar_height)
583 #define FRAME_LINE_HEIGHT(f) ((f)->output_data.x->line_height) 590 #define FRAME_LINE_HEIGHT(f) ((f)->output_data.x->line_height)
584 591
585 /* Width of the default font of frame F. Must be defined by each 592 /* Width of the default font of frame F. Must be defined by each
586 terminal specific header. */ 593 terminal specific header. */
587 #define FRAME_DEFAULT_FONT_WIDTH(F) FONT_WIDTH (FRAME_FONT (F)) 594 #define FRAME_DEFAULT_FONT_WIDTH(F) FONT_WIDTH (FRAME_FONT (F))
602 #define PIXEL_WIDTH(f) ((f)->output_data.x->pixel_width) 609 #define PIXEL_WIDTH(f) ((f)->output_data.x->pixel_width)
603 #define PIXEL_HEIGHT(f) ((f)->output_data.x->pixel_height) 610 #define PIXEL_HEIGHT(f) ((f)->output_data.x->pixel_height)
604 611
605 #define FRAME_DESIRED_CURSOR(f) ((f)->output_data.x->desired_cursor) 612 #define FRAME_DESIRED_CURSOR(f) ((f)->output_data.x->desired_cursor)
606 613
607 #define FRAME_XIM(f) ((f)->output_data.x->xim)
608 #define FRAME_XIC(f) ((f)->output_data.x->xic) 614 #define FRAME_XIC(f) ((f)->output_data.x->xic)
615 #define FRAME_X_XIM(f) (FRAME_X_DISPLAY_INFO (f)->xim)
616 #define FRAME_X_XIM_STYLES(f) (FRAME_X_DISPLAY_INFO (f)->xim_styles)
617 #define FRAME_XIC_STYLE(f) ((f)->output_data.x->xic_style)
618 #define FRAME_XIC_FONTSET(f) ((f)->output_data.x->xic_xfs)
609 619
610 /* Value is the smallest width of any character in any font on frame F. */ 620 /* Value is the smallest width of any character in any font on frame F. */
611 621
612 #define FRAME_SMALLEST_CHAR_WIDTH(F) \ 622 #define FRAME_SMALLEST_CHAR_WIDTH(F) \
613 FRAME_X_DISPLAY_INFO(F)->smallest_char_width 623 FRAME_X_DISPLAY_INFO(F)->smallest_char_width
990 extern void x_report_frame_params P_ ((struct frame *, Lisp_Object *)); 1000 extern void x_report_frame_params P_ ((struct frame *, Lisp_Object *));
991 extern int defined_color P_ ((struct frame *, char *, XColor *, int)); 1001 extern int defined_color P_ ((struct frame *, char *, XColor *, int));
992 extern void x_set_border_pixel P_ ((struct frame *, int)); 1002 extern void x_set_border_pixel P_ ((struct frame *, int));
993 extern void x_set_menu_bar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object)); 1003 extern void x_set_menu_bar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object));
994 extern void x_implicitly_set_name P_ ((struct frame *, Lisp_Object, Lisp_Object)); 1004 extern void x_implicitly_set_name P_ ((struct frame *, Lisp_Object, Lisp_Object));
1005 extern void create_frame_xic P_ ((struct frame *));
1006 extern void destroy_frame_xic P_ ((struct frame *));
1007 extern void xic_set_preeditarea P_ ((struct window *, int, int));
1008 extern void xic_set_statusarea P_ ((struct frame *));
1009 extern void xic_set_xfontset P_ ((struct frame *, char *));
995 extern int x_pixel_width P_ ((struct frame *)); 1010 extern int x_pixel_width P_ ((struct frame *));
996 extern int x_pixel_height P_ ((struct frame *)); 1011 extern int x_pixel_height P_ ((struct frame *));
997 extern int x_char_width P_ ((struct frame *)); 1012 extern int x_char_width P_ ((struct frame *));
998 extern int x_char_height P_ ((struct frame *)); 1013 extern int x_char_height P_ ((struct frame *));
999 extern int x_screen_planes P_ ((struct frame *)); 1014 extern int x_screen_planes P_ ((struct frame *));