(fix_submap_inheritance, get_keyelt, store_in_keymap,

[bpt/emacs.git] / src / widget.c

diff --git a/src/widget.c b/src/widget.c
index c2c6bea..31edf1e 100644 (file)
--- a/src/widget.c
+++ b/src/widget.c
@@ -642,7 +642,7 @@ update_various_frame_slots (ew)
      EmacsFrame ew;
 {
   struct x_output *x = ew->emacs_frame.frame->output_data.x;
-  x->pixel_height = ew->core.height;
+  x->pixel_height = ew->core.height + x->menubar_height;
   x->pixel_width = ew->core.width;
   x->internal_border_width = ew->emacs_frame.internal_border_width;
 
@@ -653,7 +653,7 @@ update_from_various_frame_slots (ew)
      EmacsFrame ew;
 {
   struct x_output *x = ew->emacs_frame.frame->output_data.x;
-  ew->core.height = x->pixel_height;
+  ew->core.height = x->pixel_height - x->menubar_height;
   ew->core.width = x->pixel_width;
   ew->core.background_pixel = x->background_pixel;
   ew->emacs_frame.internal_border_width = x->internal_border_width;
@@ -732,13 +732,8 @@ EmacsFrameRealize (widget, mask, attrs)
 {
   EmacsFrame ew = (EmacsFrame)widget;
 
-  attrs->event_mask = (KeyPressMask | ExposureMask | ButtonPressMask |
-                      ButtonReleaseMask | StructureNotifyMask |
-                      FocusChangeMask | PointerMotionHintMask |
-                      PointerMotionMask | LeaveWindowMask | EnterWindowMask |
-                      VisibilityChangeMask | PropertyChangeMask |
-                      StructureNotifyMask | SubstructureNotifyMask |
-                      SubstructureRedirectMask);
+  attrs->event_mask = (STANDARD_EVENT_SET | PropertyChangeMask
+                      | SubstructureNotifyMask | SubstructureRedirectMask);
   *mask |= CWEventMask;
   XtCreateWindow (widget, InputOutput, (Visual *)CopyFromParent, *mask,
                  attrs);
@@ -781,9 +776,11 @@ EmacsFrameResize (widget)
   int rows;
 
   pixel_to_char_size (ew, ew->core.width, ew->core.height, &columns, &rows);
-  change_frame_size (f, rows, columns, 1, 0);
+  change_frame_size (f, rows, columns, 0, 1);
   update_wm_hints (ew); 
   update_various_frame_slots (ew);
+
+  cancel_mouse_face (f);
 }
 
 static Boolean
@@ -849,7 +846,7 @@ EmacsFrameSetValues (cur_widget, req_widget, new_widget, dum1, dum2)
   /* #### This doesn't work, I haven't been able to find ANY kludge that
      will let (x-create-frame '((iconic . t))) work.  It seems that changes
      to wm_shell's iconic slot have no effect after it has been realized,
-     and calling XIconifyWindow doesn't work either (even thought the window
+     and calling XIconifyWindow doesn't work either (even though the window
      has been created.)  Perhaps there is some property we could smash
      directly, but I'm sick of this for now.
    */
@@ -956,6 +953,8 @@ EmacsFrameSetCharSize (widget, columns, rows)
       update_hints_inhibit = 0;
       update_wm_hints (ew);
 
+      do_pending_window_change ();
+
       /* These seem to get clobbered.  I don't know why. - rms.  */
       f->output_data.x->widget->core.x = old_left;
       f->output_data.x->widget->core.y = old_top;
@@ -967,3 +966,13 @@ EmacsFrameSetCharSize (widget, columns, rows)
      we have to make sure to do it here.  */
   SET_FRAME_GARBAGED (f);
 }
+\f
+widget_store_internal_border (widget)
+     Widget widget;
+{
+  EmacsFrame ew = (EmacsFrame) widget;
+  FRAME_PTR f = ew->emacs_frame.frame;
+
+  ew->emacs_frame.internal_border_width
+    = f->output_data.x->internal_border_width;
+}