/* The emacs frame widget.
- Copyright (C) 1992, 1993 Free Software Foundation, Inc.
+ Copyright (C) 1992, 1993, 2000 Free Software Foundation, Inc.
This file is part of GNU Emacs.
#include "lisp.h"
#include "xterm.h"
+#include "keyboard.h"
#include "frame.h"
#include "window.h"
#include <X11/ShellP.h>
#include "../lwlib/lwlib.h"
-#define max(a, b) ((a) > (b) ? (a) : (b))
+#include <signal.h>
+#include "syssignal.h"
/* This sucks: this is the first default that x-faces.el tries. This won't
be used unless neither the "Emacs.EmacsFrame" resource nor the
(the menubar and the parent of the menubar and all that sort of thing
are managed by lwlib.)
- The EmacsShell widget is simply a replacement for the Shell widget
+ The EmacsShell widget is simply a replacement for the Shell widget
which is able to deal with using an externally-supplied window instead
of always creating its own. It is not actually emacs specific, and
should possibly have class "Shell" instead of "EmacsShell" to simplify
/* Hairily merged geometry */
unsigned int w = ew->emacs_frame.frame->width;
unsigned int h = ew->emacs_frame.frame->height;
-
+
Widget wmshell = get_wm_shell ((Widget) ew);
/* Each Emacs shell is now independent and top-level. */
-
+
if (! XtIsSubclass (wmshell, shellWidgetClass)) abort ();
- /* We don't need this for the moment. The geometry is computed in
+ /* We don't need this for the moment. The geometry is computed in
xfns.c. */
#if 0
/* If the EmacsFrame doesn't have a geometry but the shell does,
treat that as the geometry of the frame. (Is this bogus?
I'm not sure.) */
if (ew->emacs_frame.geometry == 0)
- XtVaGetValues (wmshell, XtNgeometry, &ew->emacs_frame.geometry, 0);
+ XtVaGetValues (wmshell, XtNgeometry, &ew->emacs_frame.geometry, NULL);
/* If the Shell is iconic, then the EmacsFrame is iconic. (Is
this bogus? I'm not sure.) */
if (!ew->emacs_frame.iconic)
- XtVaGetValues (wmshell, XtNiconic, &ew->emacs_frame.iconic, 0);
-
-
+ XtVaGetValues (wmshell, XtNiconic, &ew->emacs_frame.iconic, NULL);
+
+
{
char *geom = 0;
- XtVaGetValues (app_shell, XtNgeometry, &geom, 0);
+ XtVaGetValues (app_shell, XtNgeometry, &geom, NULL);
if (geom)
app_flags = XParseGeometry (geom, &app_x, &app_y, &app_w, &app_h);
}
-
+
if (ew->emacs_frame.geometry)
frame_flags = XParseGeometry (ew->emacs_frame.geometry,
&frame_x, &frame_y,
&frame_w, &frame_h);
-
+
if (first_frame_p)
{
/* If this is the first frame created:
/* If the AppShell is iconic, then the EmacsFrame is iconic. */
if (!ew->emacs_frame.iconic)
- XtVaGetValues (app_shell, XtNiconic, &ew->emacs_frame.iconic, 0);
+ XtVaGetValues (app_shell, XtNiconic, &ew->emacs_frame.iconic, NULL);
first_frame_p = False;
}
: (FRAME_SCROLL_BAR_COLS (frame)
* FONT_WIDTH (frame->output_data.x->font)));
- frame->output_data.x->flags_areas_extra
- = FRAME_FLAGS_AREA_WIDTH (frame);
+ compute_fringe_widths (frame, 0);
+#if 0 /* This can run Lisp code, and it is dangerous to give
+ out the frame to Lisp code before it officially exists.
+ This is handled in Fx_create_frame so not needed here. */
change_frame_size (frame, h, w, 1, 0, 0);
+#endif
char_to_pixel_size (ew, w, h, &pixel_width, &pixel_height);
ew->core.width = pixel_width;
ew->core.height = pixel_height;
len = strlen (shell_position) + 1;
tem = (char *) xmalloc (len);
strncpy (tem, shell_position, len);
- XtVaSetValues (wmshell, XtNgeometry, tem, 0);
+ XtVaSetValues (wmshell, XtNgeometry, tem, NULL);
}
else if (flags & (WidthValue | HeightValue))
{
len = strlen (shell_position) + 1;
tem = (char *) xmalloc (len);
strncpy (tem, shell_position, len);
- XtVaSetValues (wmshell, XtNgeometry, tem, 0);
+ XtVaSetValues (wmshell, XtNgeometry, tem, NULL);
}
/* If the geometry spec we're using has W/H components, mark the size
/* Also assign the iconic status of the frame to the Shell, so that
the WM sees it. */
- XtVaSetValues (wmshell, XtNiconic, ew->emacs_frame.iconic, 0);
+ XtVaSetValues (wmshell, XtNiconic, ew->emacs_frame.iconic, NULL);
#endif /* 0 */
}
}
&char_width, &char_height);
char_to_pixel_size (ew, char_width, char_height,
&rounded_width, &rounded_height);
- get_default_char_pixel_size (ew, &cw, &ch);
+ get_default_char_pixel_size (ew, &cw, &ch);
base_width = (wmshell->core.width - ew->core.width
+ (rounded_width - (char_width * cw)));
/* ((WMShellWidget) wmshell)->wm.size_hints.flags |= USSize;*/
XtVaSetValues (wmshell,
- XtNbaseWidth, base_width,
- XtNbaseHeight, base_height,
- XtNwidthInc, cw,
- XtNheightInc, ch,
- XtNminWidth, base_width + min_cols * cw,
- XtNminHeight, base_height + min_rows * ch,
- 0);
+ XtNbaseWidth, (XtArgVal) base_width,
+ XtNbaseHeight, (XtArgVal) base_height,
+ XtNwidthInc, (XtArgVal) cw,
+ XtNheightInc, (XtArgVal) ch,
+ XtNminWidth, (XtArgVal) (base_width + min_cols * cw),
+ XtNminHeight, (XtArgVal) (base_height + min_rows * ch),
+ NULL);
}
#if 0
ew->core.border_pixel = x->border_pixel;
}
-static void
+static void
EmacsFrameInitialize (request, new, dum1, dum2)
Widget request;
Widget new;
face_res.default_addr = 0;
XtGetSubresources ((Widget) ew, (XtPointer) &f, "default", "Face",
&face_res, 1, NULL, 0);
-
+
if (f)
ew->emacs_frame.font = f;
else if (! ew->emacs_frame.font)
#endif
update_from_various_frame_slots (ew);
- set_frame_size (ew);
+ set_frame_size (ew);
/*create_frame_gcs (ew);
setup_frame_gcs (ew);
update_various_frame_slots (ew); */
{
EmacsFrame ew = (EmacsFrame)widget;
- attrs->event_mask = (STANDARD_EVENT_SET | PropertyChangeMask
- | SubstructureNotifyMask | SubstructureRedirectMask);
+ /* This used to contain SubstructureRedirectMask, but this turns out
+ to be a problem with XIM on Solaris, and events from that mask
+ don't seem to be used. Let's check that. */
+ attrs->event_mask = (STANDARD_EVENT_SET
+ | PropertyChangeMask
+ | SubstructureNotifyMask);
*mask |= CWEventMask;
XtCreateWindow (widget, InputOutput, (Visual *)CopyFromParent, *mask,
attrs);
- update_wm_hints (ew);
+ update_wm_hints (ew);
}
extern void free_frame_faces (/* struct frame * */);
if (! s->output_data.x->normal_gc) abort ();
BLOCK_INPUT;
- /* need to be careful that the face-freeing code doesn't free these too */
- XFreeGC (XtDisplay (widget), s->output_data.x->normal_gc);
- XFreeGC (XtDisplay (widget), s->output_data.x->reverse_gc);
- XFreeGC (XtDisplay (widget), s->output_data.x->cursor_gc);
+ x_free_gcs (s);
if (s->output_data.x->white_relief.gc)
XFreeGC (XtDisplay (widget), s->output_data.x->white_relief.gc);
if (s->output_data.x->black_relief.gc)
pixel_to_char_size (ew, ew->core.width, ew->core.height, &columns, &rows);
change_frame_size (f, rows, columns, 0, 1, 0);
- update_wm_hints (ew);
+ update_wm_hints (ew);
update_various_frame_slots (ew);
cancel_mouse_face (f);
int char_width, char_height;
Dimension pixel_width;
Dimension pixel_height;
-
+
has_to_recompute_gcs = (cur->emacs_frame.font != new->emacs_frame.font
|| (cur->emacs_frame.foreground_pixel
!= new->emacs_frame.foreground_pixel)
|| (cur->core.background_pixel
!= new->core.background_pixel)
);
-
+
has_to_recompute_size = (cur->emacs_frame.font != new->emacs_frame.font
&& cur->core.width == new->core.width
&& cur->core.height == new->core.height);
setup_frame_gcs (new);
needs_a_refresh = True;
}
-
+
if (has_to_recompute_size)
{
pixel_width = new->core.width;
if (cur->emacs_frame.iconic != new->emacs_frame.iconic)
{
Widget wmshell = get_wm_shell ((Widget) cur);
- XtVaSetValues (wmshell, XtNiconic, new->emacs_frame.iconic, 0);
+ XtVaSetValues (wmshell, XtNiconic,
+ (XtArgVal) new->emacs_frame.iconic, NULL);
}
return needs_a_refresh;
EmacsFrame ew = (EmacsFrame) widget;
Dimension pixel_width, pixel_height;
struct frame *f = ew->emacs_frame.frame;
- Arg al[10];
- int ac = 0;
-
+
if (columns < 3) columns = 3; /* no way buddy */
check_frame_size (f, &rows, &columns);
? 0
: (FRAME_SCROLL_BAR_COLS (f) * FONT_WIDTH (f->output_data.x->font)));
- f->output_data.x->flags_areas_extra
- = FRAME_FLAGS_AREA_WIDTH (f);
+ compute_fringe_widths (f, 0);
char_to_pixel_size (ew, columns, rows, &pixel_width, &pixel_height);
int old_left = f->output_data.x->widget->core.x;
int old_top = f->output_data.x->widget->core.y;
+ /* Input is blocked here, and Xt waits for some event to
+ occur. */
+
lw_refigure_widget (f->output_data.x->column_widget, False);
update_hints_inhibit = 1;
- ac = 0;
- XtSetArg (al[ac], XtNheight, pixel_height); ac++;
- XtSetArg (al[ac], XtNwidth, pixel_width); ac++;
- XtSetValues ((Widget) ew, al, ac);
-
- ac = 0;
- XtSetArg (al[ac], XtNheight, column_widget_height + hdelta); ac++;
- XtSetArg (al[ac], XtNwidth, column_widget_width + wdelta); ac++;
- XtSetValues (f->output_data.x->column_widget, al, ac);
-
- ac = 0;
- XtSetArg (al[ac], XtNheight, outer_widget_height + hdelta); ac++;
- XtSetArg (al[ac], XtNwidth, outer_widget_width + wdelta); ac++;
- XtSetValues (f->output_data.x->widget, al, ac);
+ /* Xt waits for a ConfigureNotify event from the window manager
+ in EmacsFrameSetCharSize when the shell widget is resized.
+ For some window managers like fvwm2 2.2.5 and KDE 2.1 this
+ event doesn't arrive for an unknown reason and Emacs hangs in
+ Xt when the default font is changed. Tell Xt not to wait,
+ depending on the value of the frame parameter
+ `wait-for-wm'. */
+ XtVaSetValues (f->output_data.x->widget,
+ XtNwaitForWm, (XtArgVal) f->output_data.x->wait_for_wm,
+ NULL);
+
+ /* Workaround: When a SIGIO or SIGALRM occurs while Xt is
+ waiting for a ConfigureNotify event (see above), this leads
+ to Xt waiting indefinitely instead of using its default
+ timeout (5 seconds). */
+ turn_on_atimers (0);
+#ifdef SIGIO
+ sigblock (sigmask (SIGIO));
+#endif
+
+ /* Do parents first, otherwise LessTif's geometry management
+ enters an infinite loop (as of 2000-01-15). This is fixed in
+ later versions of LessTif (as of 2001-03-13); I'll leave it
+ as is because I think it can't do any harm. */
+ /* In April 2002, simon.marshall@misys.com reports the problem
+ seems not to occur any longer. */
+ XtVaSetValues (f->output_data.x->widget,
+ XtNheight, (XtArgVal) (outer_widget_height + hdelta),
+ XtNwidth, (XtArgVal) (outer_widget_width + wdelta),
+ NULL);
+ XtVaSetValues (f->output_data.x->column_widget,
+ XtNheight, (XtArgVal) (column_widget_height + hdelta),
+ XtNwidth, (XtArgVal) column_widget_width + wdelta,
+ NULL);
+ XtVaSetValues ((Widget) ew,
+ XtNheight, (XtArgVal) pixel_height,
+ XtNwidth, (XtArgVal) pixel_width,
+ NULL);
+#ifdef SIGIO
+ sigunblock (sigmask (SIGIO));
+#endif
+ turn_on_atimers (1);
lw_refigure_widget (f->output_data.x->column_widget, True);