diff options
| author | Kim F. Storm <storm@cua.dk> | 2003-05-24 22:09:50 +0000 |
|---|---|---|
| committer | Kim F. Storm <storm@cua.dk> | 2003-05-24 22:09:50 +0000 |
| commit | 9882535b5cf98d099a126c2bc02f956b9e5168c9 (patch) | |
| tree | ad1babe801e15abe2d801b452c3848c15eb4202c /src/xmenu.c | |
| parent | be78600073726b2f67cb1f05f60d470ae99d50d5 (diff) | |
| download | emacs-9882535b5cf98d099a126c2bc02f956b9e5168c9.tar.gz | |
Make (some) trivial substitutions for renamed and
new macros in dispextern.h, frame.h and window.h.
Diffstat (limited to 'src/xmenu.c')
| -rw-r--r-- | src/xmenu.c | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/src/xmenu.c b/src/xmenu.c index 6d402f660d0..daafad6140a 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -709,10 +709,8 @@ mouse_position_for_popup(f, x, y) /* 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 @@ cached information about equivalent key sequences. */) 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 @@ update_frame_menubar (f) 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 @@ create_and_show_popup_menu (f, first_wv, x, y, for_click) 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 @@ create_and_show_popup_menu (f, first_wv, x, y, for_click) 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 @@ xmenu_show (f, x, y, for_click, keymaps, title, error) #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; |