[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/xmenu.c
From: |
Kim F. Storm |
Subject: |
[Emacs-diffs] Changes to emacs/src/xmenu.c |
Date: |
Sat, 24 May 2003 18:09:50 -0400 |
Index: emacs/src/xmenu.c
diff -c emacs/src/xmenu.c:1.246 emacs/src/xmenu.c:1.247
*** emacs/src/xmenu.c:1.246 Sat May 10 12:14:35 2003
--- emacs/src/xmenu.c Sat May 24 18:09:50 2003
***************
*** 709,718 ****
/* xmenu_show expects window coordinates, not root window
coordinates. Translate. */
! *x -= f->output_data.x->left_pos
! + FRAME_OUTER_TO_INNER_DIFF_X (f);
! *y -= f->output_data.x->top_pos
! + FRAME_OUTER_TO_INNER_DIFF_Y (f);
}
#endif /* HAVE_X_WINDOWS */
--- 709,716 ----
/* xmenu_show expects window coordinates, not root window
coordinates. Translate. */
! *x -= f->left_pos + FRAME_OUTER_TO_INNER_DIFF_X (f);
! *y -= f->top_pos + FRAME_OUTER_TO_INNER_DIFF_Y (f);
}
#endif /* HAVE_X_WINDOWS */
***************
*** 861,870 ****
CHECK_LIVE_WINDOW (window);
f = XFRAME (WINDOW_FRAME (XWINDOW (window)));
! xpos = (FONT_WIDTH (FRAME_FONT (f))
! * XFASTINT (XWINDOW (window)->left));
! ypos = (FRAME_LINE_HEIGHT (f)
! * XFASTINT (XWINDOW (window)->top));
}
else
/* ??? Not really clean; should be CHECK_WINDOW_OR_FRAME,
--- 859,866 ----
CHECK_LIVE_WINDOW (window);
f = XFRAME (WINDOW_FRAME (XWINDOW (window)));
! xpos = WINDOW_LEFT_EDGE_X (XWINDOW (window));
! ypos = WINDOW_TOP_EDGE_Y (XWINDOW (window));
}
else
/* ??? Not really clean; should be CHECK_WINDOW_OR_FRAME,
***************
*** 1779,1786 ****
BLOCK_INPUT;
/* Save the size of the frame because the pane widget doesn't accept
to resize itself. So force it. */
! columns = f->width;
! rows = f->height;
/* Do the voodoo which means "I'm changing lots of things, don't try
to refigure sizes until I'm done." */
--- 1775,1782 ----
BLOCK_INPUT;
/* Save the size of the frame because the pane widget doesn't accept
to resize itself. So force it. */
! columns = FRAME_COLS (f);
! rows = FRAME_LINES (f);
/* Do the voodoo which means "I'm changing lots of things, don't try
to refigure sizes until I'm done." */
***************
*** 2314,2321 ****
pos_func = menu_position_func;
/* Adjust coordinates to be root-window-relative. */
! x += f->output_data.x->left_pos + FRAME_OUTER_TO_INNER_DIFF_X (f);
! y += f->output_data.x->top_pos + FRAME_OUTER_TO_INNER_DIFF_Y (f);
popup_x_y.x = x;
popup_x_y.y = y;
--- 2310,2317 ----
pos_func = menu_position_func;
/* Adjust coordinates to be root-window-relative. */
! x += f->left_pos + FRAME_OUTER_TO_INNER_DIFF_X (f);
! y += f->top_pos + FRAME_OUTER_TO_INNER_DIFF_Y (f);
popup_x_y.x = x;
popup_x_y.y = y;
***************
*** 2402,2409 ****
dummy.y = y;
/* Adjust coordinates to be root-window-relative. */
! x += f->output_data.x->left_pos + FRAME_OUTER_TO_INNER_DIFF_X (f);
! y += f->output_data.x->top_pos + FRAME_OUTER_TO_INNER_DIFF_Y (f);
dummy.x_root = x;
dummy.y_root = y;
--- 2398,2405 ----
dummy.y = y;
/* Adjust coordinates to be root-window-relative. */
! x += f->left_pos + FRAME_OUTER_TO_INNER_DIFF_X (f);
! y += f->top_pos + FRAME_OUTER_TO_INNER_DIFF_Y (f);
dummy.x_root = x;
dummy.y_root = y;
***************
*** 3120,3127 ****
#endif /* HAVE_X_WINDOWS */
/* Adjust coordinates to be root-window-relative. */
! x += f->output_data.x->left_pos;
! y += f->output_data.x->top_pos;
/* Create all the necessary panes and their items. */
i = 0;
--- 3116,3123 ----
#endif /* HAVE_X_WINDOWS */
/* Adjust coordinates to be root-window-relative. */
! x += f->left_pos;
! y += f->top_pos;
/* Create all the necessary panes and their items. */
i = 0;