aboutsummaryrefslogtreecommitdiffstats
path: root/src/xfns.c
diff options
context:
space:
mode:
authorRichard M. Stallman <[email protected]>1994-04-17 19:31:31 +0000
committerRichard M. Stallman <[email protected]>1994-04-17 19:31:31 +0000
commit2365c027610b1f1f16c61e8c78dba61e19a83448 (patch)
treeeea735ae4221c0972fa4f90974c27cffff825f36 /src/xfns.c
parentdc05a16bad76f364242cbb4c3452d8d556a7288f (diff)
(Fx_create_frame): Delete excess args to x_wm_set_size_hint.
Set win_gravity field. (x_window, both versions): Don't call x_calc_absolute_position.
Diffstat (limited to 'src/xfns.c')
-rw-r--r--src/xfns.c24
1 files changed, 18 insertions, 6 deletions
diff --git a/src/xfns.c b/src/xfns.c
index 319a97abb0..c095259b7e 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1890,8 +1890,6 @@ x_window (f)
XSetWindowAttributes attributes;
unsigned long attribute_mask;
- x_calc_absolute_position (f);
-
attributes.background_pixel = f->display.x->background_pixel;
attributes.border_pixel = f->display.x->border_pixel;
attributes.bit_gravity = StaticGravity;
@@ -2082,7 +2080,7 @@ be shared by the new frame.")
{
#ifdef HAVE_X11
struct frame *f;
- Lisp_Object frame, tem, tem0, tem1;
+ Lisp_Object frame, tem;
Lisp_Object name;
int minibuffer_only = 0;
long window_prompting = 0;
@@ -2204,6 +2202,22 @@ be shared by the new frame.")
f->display.x->parent_desc = ROOT_WINDOW;
window_prompting = x_figure_window_size (f, parms);
+ switch (((f->display.x->left_pos < 0) << 1) + (f->display.x->top_pos < 0))
+ {
+ case 0:
+ f->display.x->win_gravity = NorthWestGravity;
+ break;
+ case 1:
+ f->display.x->win_gravity = SouthWestGravity;
+ break;
+ case 2:
+ f->display.x->win_gravity = NorthEastGravity;
+ break;
+ case 3:
+ f->display.x->win_gravity = SouthEastGravity;
+ break;
+ }
+
#ifdef USE_X_TOOLKIT
x_window (f, window_prompting, minibuffer_only);
#else
@@ -2235,10 +2249,8 @@ be shared by the new frame.")
/* With the toolkit, the geometry management is done in x_window. */
#ifndef USE_X_TOOLKIT
- tem0 = x_get_arg (parms, Qleft, 0, 0, number);
- tem1 = x_get_arg (parms, Qtop, 0, 0, number);
BLOCK_INPUT;
- x_wm_set_size_hint (f, window_prompting, 1, XINT (tem0), XINT (tem1));
+ x_wm_set_size_hint (f, window_prompting, 1);
UNBLOCK_INPUT;
#endif /* USE_X_TOOLKIT */