comparison src/xmenu.c @ 49651:05ebf4266798

xterm.c (x_make_frame_visible): Call gtk_window_deiconify. xmenu.c (menu_position_func): Adjust menu popup position so that the menu is fully visible.

49650:31ba10b86927

/* Used when position a popup menu.  See menu_position_func and
   create_and_show_popup_menu below.  */
struct next_popup_x_y
{
  int x;
  int y;
};

/* The menu position function to use if we are not putting a popup

   MENU is the menu to pop up.
   X and Y shall on exit contain x/y where the menu shall pop up.
   PUSH_IN is not documented in the GTK manual.
   USER_DATA is any data passed in when calling gtk_menu_popup.
   Here it points to a struct next_popup_x_y where the coordinates
   to store in *X and *Y are.

   Here only X and Y are used.  */
static void
menu_position_func (menu, x, y, push_in, user_data)
     GtkMenu *menu;
     gint *x;
     gint *y;
     gboolean *push_in;
     gpointer user_data;
{
  *x = ((struct next_popup_x_y*)user_data)->x;
  *y = ((struct next_popup_x_y*)user_data)->y;
}

static void
popup_selection_callback (widget, client_data)
     GtkWidget *widget;

      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;
    }

  /* Display the menu.  */
  gtk_widget_show_all (menu);
  gtk_menu_popup (GTK_MENU (menu), 0, 0, pos_func, &popup_x_y, i, 0);

49651:05ebf4266798

/* Used when position a popup menu.  See menu_position_func and
   create_and_show_popup_menu below.  */
struct next_popup_x_y
{
  FRAME_PTR f;
  int x;
  int y;
};

/* The menu position function to use if we are not putting a popup

   MENU is the menu to pop up.
   X and Y shall on exit contain x/y where the menu shall pop up.
   PUSH_IN is not documented in the GTK manual.
   USER_DATA is any data passed in when calling gtk_menu_popup.
   Here it points to a struct next_popup_x_y where the coordinates
   to store in *X and *Y are as well as the frame for the popup.

   Here only X and Y are used.  */
static void
menu_position_func (menu, x, y, push_in, user_data)
     GtkMenu *menu;
     gint *x;
     gint *y;
     gboolean *push_in;
     gpointer user_data;
{
  struct next_popup_x_y* data = (struct next_popup_x_y*)user_data;
  GtkRequisition req;
  int disp_width = FRAME_X_DISPLAY_INFO (data->f)->width;
  int disp_height = FRAME_X_DISPLAY_INFO (data->f)->height;
  
  *x = data->x;
  *y = data->y;

  /* Check if there is room for the menu.  If not, adjust x/y so that
     the menu is fully visible.  */
  gtk_widget_size_request (GTK_WIDGET (menu), &req);
  if (data->x + req.width > disp_width)
    *x -= data->x + req.width - disp_width;
  if (data->y + req.height > disp_height)
    *y -= data->y + req.height - disp_height;
}

static void
popup_selection_callback (widget, client_data)
     GtkWidget *widget;

      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;
      popup_x_y.f = f;
    }

  /* Display the menu.  */
  gtk_widget_show_all (menu);
  gtk_menu_popup (GTK_MENU (menu), 0, 0, pos_func, &popup_x_y, i, 0);