comparison src/xfns.c @ 28144:71ebba3566ec

(X_I18N_INHIBITED): Don't define. (create_frame_xic): Remove conditional compilation on X_I18N_INHIBITED. (x_kill_gs_process, x_window): Use FRAME_X_VISUAL.
author Gerd Moellmann <gerd@gnu.org>
date Tue, 14 Mar 2000 21:16:36 +0000
parents 244f283b3d03
children 56a776500341
comparison
equal deleted inserted replaced
28143:210942d0dc07 28144:71ebba3566ec
47 #ifdef HAVE_X_WINDOWS 47 #ifdef HAVE_X_WINDOWS
48 48
49 #include <ctype.h> 49 #include <ctype.h>
50 #include <sys/types.h> 50 #include <sys/types.h>
51 #include <sys/stat.h> 51 #include <sys/stat.h>
52
53 /* On some systems, the character-composition stuff is broken in X11R5. */
54
55 #if defined (HAVE_X11R5) && ! defined (HAVE_X11R6)
56 #ifdef X11R5_INHIBIT_I18N
57 #define X_I18N_INHIBITED
58 #endif
59 #endif
60 52
61 #ifndef VMS 53 #ifndef VMS
62 #if 1 /* Used to be #ifdef EMACS_BITMAP_FILES, but this should always work. */ 54 #if 1 /* Used to be #ifdef EMACS_BITMAP_FILES, but this should always work. */
63 #include "bitmaps/gray.xbm" 55 #include "bitmaps/gray.xbm"
64 #else 56 #else
3073 3065
3074 void 3066 void
3075 create_frame_xic (f) 3067 create_frame_xic (f)
3076 struct frame *f; 3068 struct frame *f;
3077 { 3069 {
3078 #ifndef X_I18N_INHIBITED
3079 XIM xim; 3070 XIM xim;
3080 XIC xic = NULL; 3071 XIC xic = NULL;
3081 XFontSet xfs = NULL; 3072 XFontSet xfs = NULL;
3082 static XIMStyle xic_style; 3073 static XIMStyle xic_style;
3083 3074
3166 } 3157 }
3167 3158
3168 FRAME_XIC (f) = xic; 3159 FRAME_XIC (f) = xic;
3169 FRAME_XIC_STYLE (f) = xic_style; 3160 FRAME_XIC_STYLE (f) = xic_style;
3170 FRAME_XIC_FONTSET (f) = xfs; 3161 FRAME_XIC_FONTSET (f) = xfs;
3171 #else /* X_I18N_INHIBITED */
3172 FRAME_XIC (f) = NULL;
3173 FRAME_XIC_STYLE (f) = 0;
3174 FRAME_XIC_FONTSET (f) = NULL;
3175 #endif /* X_I18N_INHIBITED */
3176 } 3162 }
3177 3163
3178 3164
3179 /* Destroy XIC and free XIC fontset of frame F, if any. */ 3165 /* Destroy XIC and free XIC fontset of frame F, if any. */
3180 3166
3549 f->output_data.x->top_pos, 3535 f->output_data.x->top_pos,
3550 PIXEL_WIDTH (f), PIXEL_HEIGHT (f), 3536 PIXEL_WIDTH (f), PIXEL_HEIGHT (f),
3551 f->output_data.x->border_width, 3537 f->output_data.x->border_width,
3552 CopyFromParent, /* depth */ 3538 CopyFromParent, /* depth */
3553 InputOutput, /* class */ 3539 InputOutput, /* class */
3554 FRAME_X_DISPLAY_INFO (f)->visual, 3540 FRAME_X_VISUAL (f),
3555 attribute_mask, &attributes); 3541 attribute_mask, &attributes);
3556 3542
3557 #ifdef HAVE_X_I18N 3543 #ifdef HAVE_X_I18N
3558 create_frame_xic (f); 3544 create_frame_xic (f);
3559 if (FRAME_XIC (f)) 3545 if (FRAME_XIC (f))
9051 img->data.lisp_val = Qnil; 9037 img->data.lisp_val = Qnil;
9052 9038
9053 /* On displays with a mutable colormap, figure out the colors 9039 /* On displays with a mutable colormap, figure out the colors
9054 allocated for the image by looking at the pixels of an XImage for 9040 allocated for the image by looking at the pixels of an XImage for
9055 img->pixmap. */ 9041 img->pixmap. */
9056 class = FRAME_X_DISPLAY_INFO (f)->visual->class; 9042 class = FRAME_X_VISUAL (f)->class;
9057 if (class != StaticColor && class != StaticGray && class != TrueColor) 9043 if (class != StaticColor && class != StaticGray && class != TrueColor)
9058 { 9044 {
9059 XImage *ximg; 9045 XImage *ximg;
9060 9046
9061 BLOCK_INPUT; 9047 BLOCK_INPUT;