Mercurial > hg > xemacs-beta
comparison src/EmacsFrame.c @ 771:943eaba38521
[xemacs-hg @ 2002-03-13 08:51:24 by ben]
The big ben-mule-21-5 check-in!
Various files were added and deleted. See CHANGES-ben-mule.
There are still some test suite failures. No crashes, though.
Many of the failures have to do with problems in the test suite itself
rather than in the actual code. I'll be addressing these in the next
day or so -- none of the test suite failures are at all critical.
Meanwhile I'll be trying to address the biggest issues -- i.e. build
or run failures, which will almost certainly happen on various platforms.
All comments should be sent to ben@xemacs.org -- use a Cc: if necessary
when sending to mailing lists. There will be pre- and post- tags,
something like
pre-ben-mule-21-5-merge-in, and
post-ben-mule-21-5-merge-in.
author | ben |
---|---|
date | Wed, 13 Mar 2002 08:54:06 +0000 |
parents | b39c14581166 |
children | e38acbeb1cae |
comparison
equal
deleted
inserted
replaced
770:336a418893b5 | 771:943eaba38521 |
---|---|
154 | 154 |
155 { XtNinterline, XtCInterline, | 155 { XtNinterline, XtCInterline, |
156 XtRInt, sizeof (int), | 156 XtRInt, sizeof (int), |
157 offset (interline), XtRImmediate, (XtPointer)0 }, | 157 offset (interline), XtRImmediate, (XtPointer)0 }, |
158 { | 158 { |
159 #ifdef I18N4 | |
160 XtNfontSet, XtCFontSet, | |
161 XtRFontSet, sizeof (XFontSet), | |
162 #else | |
163 XtNfont, XtCFont, | 159 XtNfont, XtCFont, |
164 XtRFontStruct, sizeof (XFontStruct *), | 160 XtRFontStruct, sizeof (XFontStruct *), |
165 #endif | |
166 offset(font), XtRImmediate, (XtPointer)0 | 161 offset(font), XtRImmediate, (XtPointer)0 |
167 }, | 162 }, |
168 { XtNforeground, XtCForeground, | 163 { XtNforeground, XtCForeground, |
169 XtRPixel, sizeof (Pixel), | 164 XtRPixel, sizeof (Pixel), |
170 offset(foreground_pixel), XtRString, (XtPointer) "Black" }, | 165 offset(foreground_pixel), XtRString, (XtPointer) "Black" }, |
329 PointerMotionMask | | 324 PointerMotionMask | |
330 LeaveWindowMask | | 325 LeaveWindowMask | |
331 EnterWindowMask; | 326 EnterWindowMask; |
332 | 327 |
333 | 328 |
334 #ifdef I18N4 | |
335 /* Make sure that events wanted by the input method are selected. */ | |
336 attrs->event_mask |= input_method_event_mask; | |
337 #endif | |
338 | |
339 *mask |= CWEventMask; | 329 *mask |= CWEventMask; |
340 | 330 |
341 if (ew->emacs_frame.use_backing_store) | 331 if (ew->emacs_frame.use_backing_store) |
342 { | 332 { |
343 attrs->backing_store = Always; | 333 attrs->backing_store = Always; |
638 struct frame *f = ew->emacs_frame.frame; | 628 struct frame *f = ew->emacs_frame.frame; |
639 | 629 |
640 if (! XtIsSubclass (w, emacsFrameClass)) | 630 if (! XtIsSubclass (w, emacsFrameClass)) |
641 abort (); | 631 abort (); |
642 | 632 |
643 default_face_height_and_width (make_frame (f), &ch, &cw); | 633 default_face_height_and_width (wrap_frame (f), &ch, &cw); |
644 if (FRAME_X_TOP_LEVEL_FRAME_P (f)) | 634 if (FRAME_X_TOP_LEVEL_FRAME_P (f)) |
645 x_wm_set_cell_size (FRAME_X_SHELL_WIDGET (f), cw, ch); | 635 x_wm_set_cell_size (FRAME_X_SHELL_WIDGET (f), cw, ch); |
646 } | 636 } |
647 | 637 |
648 /* Set the size of the widget to have the number of rows and columns | 638 /* Set the size of the widget to have the number of rows and columns |