mirror of
https://github.com/brl/mutter.git
synced 2025-07-05 18:39:52 +00:00
Add multi-screen support. Also add patch by Erwann Chenede to make
2002-05-08 Anders Carlsson <andersca@gnu.org> * configure.in: * src/display.c: (meta_display_open): * src/fixedtip.c: (meta_fixed_tip_show): * src/fixedtip.h: * src/frames.c: (meta_frames_new), (show_tip_now): * src/frames.h: * src/menu.c: (meta_window_menu_new): * src/ui.c: (meta_ui_new): Add multi-screen support. Also add patch by Erwann Chenede to make tooltips appear on the correct screen.
This commit is contained in:

committed by
Anders Carlsson

parent
3f7203a3a4
commit
0494b044d5
25
src/frames.c
25
src/frames.c
@ -400,9 +400,22 @@ meta_frames_calc_geometry (MetaFrames *frames,
|
||||
}
|
||||
|
||||
MetaFrames*
|
||||
meta_frames_new (void)
|
||||
meta_frames_new (int screen_number)
|
||||
{
|
||||
return g_object_new (META_TYPE_FRAMES, NULL);
|
||||
#ifdef HAVE_GTK_MULTIHEAD
|
||||
GdkScreen *screen;
|
||||
|
||||
screen = gdk_display_get_screen (gdk_get_default_display (),
|
||||
screen_number);
|
||||
|
||||
return g_object_new (META_TYPE_FRAMES,
|
||||
"screen", screen,
|
||||
NULL);
|
||||
#else
|
||||
return g_object_new (META_TYPE_FRAMES,
|
||||
NULL);
|
||||
#endif
|
||||
|
||||
}
|
||||
|
||||
void
|
||||
@ -706,6 +719,7 @@ show_tip_now (MetaFrames *frames)
|
||||
MetaFrameGeometry fgeom;
|
||||
GdkRectangle *rect;
|
||||
int dx, dy;
|
||||
int screen_number;
|
||||
|
||||
meta_frames_calc_geometry (frames, frame, &fgeom);
|
||||
|
||||
@ -714,8 +728,13 @@ show_tip_now (MetaFrames *frames)
|
||||
/* get conversion delta for root-to-frame coords */
|
||||
dx = root_x - x;
|
||||
dy = root_y - y;
|
||||
|
||||
#ifdef HAVE_GTK_MULTIHEAD
|
||||
screen_number = gdk_screen_get_number (gtk_widget_get_screen (GTK_WIDGET (frames)));
|
||||
#else
|
||||
screen_number = XScreenNumberOfScreen (DefaultScreen (gdk_display));
|
||||
#endif
|
||||
meta_fixed_tip_show (gdk_display,
|
||||
screen_number,
|
||||
rect->x + dx,
|
||||
rect->y + rect->height + 2 + dy,
|
||||
tiptext);
|
||||
|
Reference in New Issue
Block a user