
There is now a preference option that determines whether windows should be opened on the same monitor as before. It should be disabled when the machine gets monitors plugged/unplugged dynamically ("laptop") and enabled when there is a static multi-monitor setup ("wokstation"). This is merely the current simplistic policy on top of the newly added underlying infrastructure: - pass integer monitor numbers around in all places where we already pass around a GdkScreen. Pass the "current" monitor to these changed APIs, where "current" is either the monitor where the action-triggering widget is, or if that is unavailable the monitor where the mouse is. - add gimp_widget_get_monitor() in order to easily get to the monitor, just like gtk_widget_get_screen(). - add screen and monitor parameters in some places that were missed before. - in sessionrc, save all window positions relative to the window's monitor, and save the monitor separately, if it's not the screen's primary monitor. - when restoring window positions, use the stored monitor when the new prefs options says so (use the screen's primary monitor if there is no stored monitor), otherwise use current monitor that is now passed around.
93 lines
2.8 KiB
C
93 lines
2.8 KiB
C
/* GIMP - The GNU Image Manipulation Program
|
|
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
|
|
*
|
|
* gimpwindowstrategy.c
|
|
* Copyright (C) 2011 Martin Nordholts <martinn@src.gnome.org>
|
|
*
|
|
* This program is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include <gtk/gtk.h>
|
|
|
|
#include "widgets-types.h"
|
|
|
|
#include "gimpwindowstrategy.h"
|
|
|
|
|
|
static void gimp_window_strategy_iface_base_init (GimpWindowStrategyInterface *strategy_iface);
|
|
|
|
|
|
GType
|
|
gimp_window_strategy_interface_get_type (void)
|
|
{
|
|
static GType iface_type = 0;
|
|
|
|
if (! iface_type)
|
|
{
|
|
const GTypeInfo iface_info =
|
|
{
|
|
sizeof (GimpWindowStrategyInterface),
|
|
(GBaseInitFunc) gimp_window_strategy_iface_base_init,
|
|
(GBaseFinalizeFunc) NULL,
|
|
};
|
|
|
|
iface_type = g_type_register_static (G_TYPE_INTERFACE,
|
|
"GimpWindowStrategyInterface",
|
|
&iface_info,
|
|
0);
|
|
}
|
|
|
|
return iface_type;
|
|
}
|
|
|
|
static void
|
|
gimp_window_strategy_iface_base_init (GimpWindowStrategyInterface *strategy_iface)
|
|
{
|
|
static gboolean initialized = FALSE;
|
|
|
|
if (initialized)
|
|
return;
|
|
|
|
initialized = TRUE;
|
|
|
|
strategy_iface->show_dockable_dialog = NULL;
|
|
}
|
|
|
|
GtkWidget *
|
|
gimp_window_strategy_show_dockable_dialog (GimpWindowStrategy *strategy,
|
|
Gimp *gimp,
|
|
GimpDialogFactory *factory,
|
|
GdkScreen *screen,
|
|
gint monitor,
|
|
const gchar *identifiers)
|
|
{
|
|
GimpWindowStrategyInterface *iface;
|
|
|
|
g_return_val_if_fail (GIMP_IS_WINDOW_STRATEGY (strategy), NULL);
|
|
|
|
iface = GIMP_WINDOW_STRATEGY_GET_INTERFACE (strategy);
|
|
|
|
if (iface->show_dockable_dialog)
|
|
return iface->show_dockable_dialog (strategy,
|
|
gimp,
|
|
factory,
|
|
screen,
|
|
monitor,
|
|
identifiers);
|
|
|
|
return NULL;
|
|
}
|