aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFred Pierresteguy1994-02-11 13:50:53 +0000
committerFred Pierresteguy1994-02-11 13:50:53 +0000
commit363f7e15eeafcbae48b194ccd9dc92deedf93568 (patch)
tree9ccb91ee9028b99e8f7334c0a7ff9d985425a77b
parent9d7e2e3eeffa43255802ef8e8eed3ab53dff43bf (diff)
downloademacs-363f7e15eeafcbae48b194ccd9dc92deedf93568.tar.gz
emacs-363f7e15eeafcbae48b194ccd9dc92deedf93568.zip
*** empty log message ***
-rw-r--r--src/widget.c25
-rw-r--r--src/xfns.c8
2 files changed, 4 insertions, 29 deletions
diff --git a/src/widget.c b/src/widget.c
index ba46b247e2f..076039b0140 100644
--- a/src/widget.c
+++ b/src/widget.c
@@ -755,31 +755,6 @@ EmacsFrameResize (widget)
755 pixel_to_char_size (ew, ew->core.width, ew->core.height, &columns, &rows); 755 pixel_to_char_size (ew, ew->core.width, ew->core.height, &columns, &rows);
756 change_frame_size (f, rows, columns, 1, 0); 756 change_frame_size (f, rows, columns, 1, 0);
757 update_wm_hints (ew); 757 update_wm_hints (ew);
758 {
759 Window win, child;
760 int win_x, win_y;
761
762 /* Find the position of the outside upper-left corner of
763 the window, in the root coordinate system. Don't
764 refer to the parent window here; we may be processing
765 this event after the window manager has changed our
766 parent, but before we have reached the ReparentNotify. */
767 XTranslateCoordinates (x_current_display,
768
769 /* From-window, to-window. */
770 XtWindow(XtParent(ew)),
771 ROOT_WINDOW,
772
773 /* From-position, to-position. */
774 -f->display.x->widget->core.border_width,
775 -f->display.x->widget->core.border_width,
776 &win_x, &win_y,
777
778 /* Child of win. */
779 &child);
780 f->display.x->widget->core.x = win_x;
781 f->display.x->widget->core.y = win_y;
782 }
783 update_various_frame_slots (ew); 758 update_various_frame_slots (ew);
784} 759}
785 760
diff --git a/src/xfns.c b/src/xfns.c
index 4ffd39f7df4..54787673692 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1002,7 +1002,7 @@ x_set_internal_border_width (f, arg, oldval)
1002 if (FRAME_X_WINDOW (f) != 0) 1002 if (FRAME_X_WINDOW (f) != 0)
1003 { 1003 {
1004 BLOCK_INPUT; 1004 BLOCK_INPUT;
1005 x_set_window_size (f, f->width, f->height); 1005 x_set_window_size (f, 0, f->width, f->height);
1006#if 0 1006#if 0
1007 x_set_resize_hint (f); 1007 x_set_resize_hint (f);
1008#endif 1008#endif
@@ -1021,7 +1021,7 @@ x_set_visibility (f, value, oldval)
1021 XSET (frame, Lisp_Frame, f); 1021 XSET (frame, Lisp_Frame, f);
1022 1022
1023 if (NILP (value)) 1023 if (NILP (value))
1024 Fmake_frame_invisible (frame); 1024 Fmake_frame_invisible (frame, Qt);
1025 else if (EQ (value, Qicon)) 1025 else if (EQ (value, Qicon))
1026 Ficonify_frame (frame); 1026 Ficonify_frame (frame);
1027 else 1027 else
@@ -1212,7 +1212,7 @@ x_set_vertical_scroll_bars (f, arg, oldval)
1212 However, if the window hasn't been created yet, we shouldn't 1212 However, if the window hasn't been created yet, we shouldn't
1213 call x_set_window_size. */ 1213 call x_set_window_size. */
1214 if (FRAME_X_WINDOW (f)) 1214 if (FRAME_X_WINDOW (f))
1215 x_set_window_size (f, FRAME_WIDTH (f), FRAME_HEIGHT (f)); 1215 x_set_window_size (f, 0, FRAME_WIDTH (f), FRAME_HEIGHT (f));
1216 } 1216 }
1217} 1217}
1218 1218
@@ -2118,7 +2118,7 @@ be shared by the new frame.")
2118 tem0 = x_get_arg (parms, Qleft, 0, 0, number); 2118 tem0 = x_get_arg (parms, Qleft, 0, 0, number);
2119 tem1 = x_get_arg (parms, Qtop, 0, 0, number); 2119 tem1 = x_get_arg (parms, Qtop, 0, 0, number);
2120 BLOCK_INPUT; 2120 BLOCK_INPUT;
2121 x_wm_set_size_hint (f, window_prompting, XINT (tem0), XINT (tem1)); 2121 x_wm_set_size_hint (f, window_prompting, 1, XINT (tem0), XINT (tem1));
2122 UNBLOCK_INPUT; 2122 UNBLOCK_INPUT;
2123 2123
2124 tem = x_get_arg (parms, Qunsplittable, 0, 0, boolean); 2124 tem = x_get_arg (parms, Qunsplittable, 0, 0, boolean);