comparison src/xfns.c @ 4617:807ba8bcc309

(x_set_frame_parameters): Don't die if just one of height and width was set. Likewise left and top.
author Richard M. Stallman <rms@gnu.org>
date Sat, 14 Aug 1993 07:20:08 +0000
parents 0866f021a2cc
children f7128c7ea732
comparison
equal deleted inserted replaced
4616:f2f13eeb1c2e 4617:807ba8bcc309
394 < sizeof (x_frame_parms)/sizeof (x_frame_parms[0]))) 394 < sizeof (x_frame_parms)/sizeof (x_frame_parms[0])))
395 (*x_frame_parms[XINT (param_index)].setter)(f, val, old_value); 395 (*x_frame_parms[XINT (param_index)].setter)(f, val, old_value);
396 } 396 }
397 } 397 }
398 398
399 /* Don't die if just one of these was set. */
400 if (EQ (left, Qunbound))
401 XSET (left, Lisp_Int, f->display.x->left_pos);
402 if (EQ (top, Qunbound))
403 XSET (top, Lisp_Int, f->display.x->top_pos);
404
405 /* Don't die if just one of these was set. */
406 if (EQ (width, Qunbound))
407 XSET (width, Lisp_Int, FRAME_WIDTH (f));
408 if (EQ (height, Qunbound))
409 XSET (height, Lisp_Int, FRAME_HEIGHT (f));
410
399 /* Don't set these parameters these unless they've been explicitly 411 /* Don't set these parameters these unless they've been explicitly
400 specified. The window might be mapped or resized while we're in 412 specified. The window might be mapped or resized while we're in
401 this function, and we don't want to override that unless the lisp 413 this function, and we don't want to override that unless the lisp
402 code has asked for it. 414 code has asked for it.
403 415
406 yet. */ 418 yet. */
407 { 419 {
408 Lisp_Object frame; 420 Lisp_Object frame;
409 421
410 XSET (frame, Lisp_Frame, f); 422 XSET (frame, Lisp_Frame, f);
423
411 if ((NUMBERP (width) && XINT (width) != FRAME_WIDTH (f)) 424 if ((NUMBERP (width) && XINT (width) != FRAME_WIDTH (f))
412 || (NUMBERP (height) && XINT (height) != FRAME_HEIGHT (f))) 425 || (NUMBERP (height) && XINT (height) != FRAME_HEIGHT (f)))
413 Fset_frame_size (frame, width, height); 426 Fset_frame_size (frame, width, height);
414 if ((NUMBERP (left) && XINT (left) != f->display.x->left_pos) 427 if ((NUMBERP (left) && XINT (left) != f->display.x->left_pos)
415 || (NUMBERP (top) && XINT (top) != f->display.x->top_pos)) 428 || (NUMBERP (top) && XINT (top) != f->display.x->top_pos))