[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/xterm.c
From: |
Jan Djärv |
Subject: |
[Emacs-diffs] Changes to emacs/src/xterm.c |
Date: |
Sat, 11 Dec 2004 13:57:19 -0500 |
Index: emacs/src/xterm.c
diff -c emacs/src/xterm.c:1.851 emacs/src/xterm.c:1.852
*** emacs/src/xterm.c:1.851 Sun Nov 21 15:48:13 2004
--- emacs/src/xterm.c Sat Dec 11 18:46:43 2004
***************
*** 8147,8166 ****
if (! ((flags & XNegative) || (flags & YNegative)))
return;
- /* Find the offsets of the outside upper-left corner of
- the inner window, with respect to the outer window.
- But do this only if we will need the results. */
- if (f->output_data.x->parent_desc != FRAME_X_DISPLAY_INFO (f)->root_window)
- /* This is to get *_pixels_outer_diff. */
- x_real_positions (f, &win_x, &win_y);
-
/* Treat negative positions as relative to the leftmost bottommost
position that fits on the screen. */
if (flags & XNegative)
f->left_pos = (FRAME_X_DISPLAY_INFO (f)->width
! - 2 * FRAME_X_OUTPUT (f)->x_pixels_outer_diff
! - FRAME_PIXEL_WIDTH (f)
! + f->left_pos);
{
int height = FRAME_PIXEL_HEIGHT (f);
--- 8147,8157 ----
if (! ((flags & XNegative) || (flags & YNegative)))
return;
/* Treat negative positions as relative to the leftmost bottommost
position that fits on the screen. */
if (flags & XNegative)
f->left_pos = (FRAME_X_DISPLAY_INFO (f)->width
! - FRAME_PIXEL_WIDTH (f) + f->left_pos);
{
int height = FRAME_PIXEL_HEIGHT (f);
***************
*** 8182,8196 ****
#endif
if (flags & YNegative)
! f->top_pos = (FRAME_X_DISPLAY_INFO (f)->height
! - FRAME_X_OUTPUT (f)->y_pixels_outer_diff
!
! /* Assume the window manager decorations are the same size
on
! three sides, i.e. left, right and bottom. This is to
! compensate for the bottom part. */
! - FRAME_X_OUTPUT (f)->x_pixels_outer_diff
! - height
! + f->top_pos);
}
/* The left_pos and top_pos
--- 8173,8179 ----
#endif
if (flags & YNegative)
! f->top_pos = (FRAME_X_DISPLAY_INFO (f)->height - height + f->top_pos);
}
/* The left_pos and top_pos
***************
*** 8306,8312 ****
FRAME_X_OUTPUT (f)->move_offset_left = expect_left - f->left_pos;
FRAME_X_OUTPUT (f)->move_offset_top = expect_top - f->top_pos;
! x_set_offset (f, expect_left, expect_top, 1);
}
else if (FRAME_X_DISPLAY_INFO (f)->wm_type == X_WMTYPE_UNKNOWN)
FRAME_X_DISPLAY_INFO (f)->wm_type = X_WMTYPE_B;
--- 8289,8297 ----
FRAME_X_OUTPUT (f)->move_offset_left = expect_left - f->left_pos;
FRAME_X_OUTPUT (f)->move_offset_top = expect_top - f->top_pos;
! f->left_pos = expect_left;
! f->top_pos = expect_top;
! x_set_offset (f, expect_left, expect_top, 0);
}
else if (FRAME_X_DISPLAY_INFO (f)->wm_type == X_WMTYPE_UNKNOWN)
FRAME_X_DISPLAY_INFO (f)->wm_type = X_WMTYPE_B;
- [Emacs-diffs] Changes to emacs/src/xterm.c,
Jan Djärv <=