Mercurial > emacs
diff src/xmenu.c @ 51212:332134065648
Make (some) trivial substitutions for renamed and
new macros in dispextern.h, frame.h and window.h.
author | Kim F. Storm <storm@cua.dk> |
---|---|
date | Sat, 24 May 2003 22:09:50 +0000 |
parents | 20b3d6c3c7e5 |
children | e518bae63784 |
line wrap: on
line diff
--- a/src/xmenu.c Sat May 24 22:09:34 2003 +0000 +++ b/src/xmenu.c Sat May 24 22:09:50 2003 +0000 @@ -709,10 +709,8 @@ /* 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); + *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,10 +859,8 @@ 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)); + 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,8 +1775,8 @@ 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; + 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,8 +2310,8 @@ 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); + 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,8 +2398,8 @@ 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); + 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,8 +3116,8 @@ #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; + x += f->left_pos; + y += f->top_pos; /* Create all the necessary panes and their items. */ i = 0;