summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mate-panel/main.c4
-rw-r--r--mate-panel/panel-profile.c4
-rw-r--r--mate-panel/panel-run-dialog.c5
-rw-r--r--mate-panel/panel-struts.c29
-rw-r--r--mate-panel/panel-toplevel.c98
5 files changed, 52 insertions, 88 deletions
diff --git a/mate-panel/main.c b/mate-panel/main.c
index 067ee993..af7e126b 100644
--- a/mate-panel/main.c
+++ b/mate-panel/main.c
@@ -134,7 +134,7 @@ main (int argc, char **argv)
if (run_dialog == TRUE)
{
panel_init_stock_icons_and_items ();
- panel_multiscreen_init ();
+ panel_multimonitor_init ();
panel_global_config_load ();
panel_lockdown_init ();
panel_profile_settings_load ();
@@ -158,7 +158,7 @@ main (int argc, char **argv)
}
panel_action_protocol_init ();
- panel_multiscreen_init ();
+ panel_multimonitor_init ();
panel_init_stock_icons_and_items ();
panel_global_config_load ();
diff --git a/mate-panel/panel-profile.c b/mate-panel/panel-profile.c
index 28549fd9..8acd96a9 100644
--- a/mate-panel/panel-profile.c
+++ b/mate-panel/panel-profile.c
@@ -909,7 +909,7 @@ panel_profile_find_empty_spot (GdkScreen *screen,
*monitor = 0;
*orientation = PANEL_ORIENTATION_TOP;
- filled_spots = g_new0 (int, panel_multiscreen_monitors (screen));
+ filled_spots = g_new0 (int, panel_multimonitor_monitors ());
for (li = panel_toplevel_list_toplevels (); li != NULL; li = li->next) {
PanelToplevel *toplevel = li->data;
@@ -924,7 +924,7 @@ panel_profile_find_empty_spot (GdkScreen *screen,
filled_spots[toplevel_monitor] |= panel_toplevel_get_orientation (toplevel);
}
- for (i = 0; i < panel_multiscreen_monitors (screen); i++) {
+ for (i = 0; i < panel_multimonitor_monitors (); i++) {
/* These are ordered based on "priority" of the
orientation when picking it */
if ( ! (filled_spots[i] & PANEL_ORIENTATION_TOP)) {
diff --git a/mate-panel/panel-run-dialog.c b/mate-panel/panel-run-dialog.c
index 71dac005..77e17a4f 100644
--- a/mate-panel/panel-run-dialog.c
+++ b/mate-panel/panel-run-dialog.c
@@ -1742,7 +1742,6 @@ static void
panel_run_dialog_setup_entry (PanelRunDialog *dialog,
GtkBuilder *gui)
{
- GdkScreen *screen;
int width_request;
GtkWidget *entry;
@@ -1756,10 +1755,8 @@ panel_run_dialog_setup_entry (PanelRunDialog *dialog,
gtk_combo_box_set_entry_text_column
(GTK_COMBO_BOX (dialog->combobox), 0);
- screen = gtk_window_get_screen (GTK_WINDOW (dialog->run_dialog));
-
/* 1/4 the width of the first monitor should be a good value */
- width_request = panel_multiscreen_width (screen, 0) / 4;
+ width_request = panel_multimonitor_width (0) / 4;
g_object_set (G_OBJECT (dialog->combobox),
"width_request", width_request,
NULL);
diff --git a/mate-panel/panel-struts.c b/mate-panel/panel-struts.c
index c87eda3a..8e7fc874 100644
--- a/mate-panel/panel-struts.c
+++ b/mate-panel/panel-struts.c
@@ -68,17 +68,16 @@ panel_struts_find_strut (PanelToplevel *toplevel)
}
static void
-panel_struts_get_monitor_geometry (GdkScreen *screen,
- int monitor,
+panel_struts_get_monitor_geometry (int monitor,
int *x,
int *y,
int *width,
int *height)
{
- *x = panel_multiscreen_x (screen, monitor);
- *y = panel_multiscreen_y (screen, monitor);
- *width = panel_multiscreen_width (screen, monitor);
- *height = panel_multiscreen_height (screen, monitor);
+ *x = panel_multimonitor_x (monitor);
+ *y = panel_multimonitor_y (monitor);
+ *width = panel_multimonitor_width (monitor);
+ *height = panel_multimonitor_height (monitor);
}
static PanelStrut *
@@ -201,7 +200,7 @@ panel_struts_allocate_struts (PanelToplevel *toplevel,
if (strut->screen != screen || strut->monitor != monitor)
continue;
- panel_struts_get_monitor_geometry (strut->screen, strut->monitor,
+ panel_struts_get_monitor_geometry (strut->monitor,
&monitor_x, &monitor_y,
&monitor_width, &monitor_height);
@@ -274,19 +273,17 @@ panel_struts_set_window_hint (PanelToplevel *toplevel)
screen_width = WidthOfScreen (gdk_x11_screen_get_xscreen (strut->screen)) / scale;
screen_height = HeightOfScreen (gdk_x11_screen_get_xscreen (strut->screen)) / scale;
- panel_struts_get_monitor_geometry (strut->screen,
- strut->monitor,
+ panel_struts_get_monitor_geometry (strut->monitor,
&monitor_x,
&monitor_y,
&monitor_width,
&monitor_height);
- panel_multiscreen_is_at_visible_extreme (strut->screen,
- strut->monitor,
- &leftmost,
- &rightmost,
- &topmost,
- &bottommost);
+ panel_multimonitor_is_at_visible_extreme (strut->monitor,
+ &leftmost,
+ &rightmost,
+ &topmost,
+ &bottommost);
switch (strut->orientation) {
case PANEL_ORIENTATION_TOP:
@@ -434,7 +431,7 @@ panel_struts_register_strut (PanelToplevel *toplevel,
strut->strut_start = strut_start;
strut->strut_end = strut_end;
- panel_struts_get_monitor_geometry (screen, monitor,
+ panel_struts_get_monitor_geometry (monitor,
&monitor_x, &monitor_y,
&monitor_width, &monitor_height);
diff --git a/mate-panel/panel-toplevel.c b/mate-panel/panel-toplevel.c
index 6c32f78e..556e4ed1 100644
--- a/mate-panel/panel-toplevel.c
+++ b/mate-panel/panel-toplevel.c
@@ -344,17 +344,13 @@ static GdkScreen* panel_toplevel_get_screen_geometry(PanelToplevel* toplevel, in
static void panel_toplevel_get_monitor_geometry(PanelToplevel* toplevel, GdkRectangle *geom)
{
- GdkScreen* screen;
-
g_return_if_fail(PANEL_IS_TOPLEVEL(toplevel));
g_return_if_fail(geom);
- screen = gtk_window_get_screen(GTK_WINDOW(toplevel));
-
- geom->x = panel_multiscreen_x(screen, toplevel->priv->monitor);
- geom->y = panel_multiscreen_y(screen, toplevel->priv->monitor);
- geom->width = panel_multiscreen_width(screen, toplevel->priv->monitor);
- geom->height = panel_multiscreen_height(screen, toplevel->priv->monitor);
+ geom->x = panel_multimonitor_x(toplevel->priv->monitor);
+ geom->y = panel_multimonitor_y(toplevel->priv->monitor);
+ geom->width = panel_multimonitor_width(toplevel->priv->monitor);
+ geom->height = panel_multimonitor_height(toplevel->priv->monitor);
}
static GdkCursorType panel_toplevel_grab_op_cursor(PanelToplevel* toplevel, PanelGrabOpType grab_op)
@@ -656,25 +652,22 @@ static void panel_toplevel_resize_to_pointer(PanelToplevel* toplevel, int x, int
static void panel_toplevel_calc_new_orientation(PanelToplevel* toplevel, int pointer_x, int pointer_y)
{
PanelOrientation new_orientation;
- GdkScreen *screen;
int hborder, vborder;
int monitor;
int monitor_width, monitor_height;
int new_x, new_y;
- screen = gtk_window_get_screen (GTK_WINDOW (toplevel));
-
- monitor = panel_multiscreen_get_monitor_at_point (screen, pointer_x, pointer_y);
+ monitor = panel_multimonitor_get_monitor_at_point (pointer_x, pointer_y);
if (toplevel->priv->geometry.height < toplevel->priv->geometry.width)
vborder = hborder = (3 * toplevel->priv->geometry.height) >> 1;
else
vborder = hborder = (3 * toplevel->priv->geometry.width) >> 1;
- new_x = pointer_x - panel_multiscreen_x (screen, monitor);
- new_y = pointer_y - panel_multiscreen_y (screen, monitor);
- monitor_width = panel_multiscreen_width (screen, monitor);
- monitor_height = panel_multiscreen_height (screen, monitor);
+ new_x = pointer_x - panel_multimonitor_x (monitor);
+ new_y = pointer_y - panel_multimonitor_y (monitor);
+ monitor_width = panel_multimonitor_width (monitor);
+ monitor_height = panel_multimonitor_height (monitor);
new_orientation = toplevel->priv->orientation;
@@ -734,7 +727,6 @@ static void panel_toplevel_calc_new_orientation(PanelToplevel* toplevel, int poi
static void panel_toplevel_move_to(PanelToplevel* toplevel, int new_x, int new_y)
{
- GdkScreen *screen;
PanelOrientation new_orientation;
gboolean x_centered, y_centered;
int screen_width, screen_height;
@@ -744,7 +736,7 @@ static void panel_toplevel_move_to(PanelToplevel* toplevel, int new_x, int new_y
int x, y, x_right, y_bottom;
int snap_tolerance;
- screen = panel_toplevel_get_screen_geometry (
+ panel_toplevel_get_screen_geometry (
toplevel, &screen_width, &screen_height);
width = toplevel->priv->geometry.width;
@@ -773,15 +765,15 @@ static void panel_toplevel_move_to(PanelToplevel* toplevel, int new_x, int new_y
toplevel->priv->orientation & PANEL_HORIZONTAL_MASK)
new_orientation = PANEL_ORIENTATION_BOTTOM;
- new_monitor = panel_multiscreen_get_monitor_at_point (screen, new_x, new_y);
+ new_monitor = panel_multimonitor_get_monitor_at_point (new_x, new_y);
panel_toplevel_get_monitor_geometry (toplevel, &monitor_geom);
x_centered = toplevel->priv->x_centered;
y_centered = toplevel->priv->y_centered;
- x = new_x - panel_multiscreen_x (screen, new_monitor);
- y = new_y - panel_multiscreen_y (screen, new_monitor);
+ x = new_x - panel_multimonitor_x (new_monitor);
+ y = new_y - panel_multimonitor_y (new_monitor);
if (toplevel->priv->orientation & PANEL_HORIZONTAL_MASK) {
y_centered = FALSE;
@@ -1441,7 +1433,6 @@ static inline int panel_toplevel_get_effective_auto_hide_size(PanelToplevel* top
static gboolean panel_toplevel_update_struts(PanelToplevel* toplevel, gboolean end_of_animation)
{
PanelOrientation orientation;
- GdkScreen *screen;
gboolean geometry_changed = FALSE;
int strut, strut_start, strut_end;
int x, y, width, height;
@@ -1471,13 +1462,12 @@ static gboolean panel_toplevel_update_struts(PanelToplevel* toplevel, gboolean e
}
panel_toplevel_get_monitor_geometry (toplevel, &monitor_geom);
- screen = gtk_widget_get_screen (GTK_WIDGET (toplevel));
if (end_of_animation) {
x = toplevel->priv->animation_end_x;
y = toplevel->priv->animation_end_y;
- x += panel_multiscreen_x (screen, toplevel->priv->monitor);
- y += panel_multiscreen_y (screen, toplevel->priv->monitor);
+ x += panel_multimonitor_x (toplevel->priv->monitor);
+ y += panel_multimonitor_y (toplevel->priv->monitor);
if (toplevel->priv->animation_end_width != -1)
width = toplevel->priv->animation_end_width;
else
@@ -1537,7 +1527,9 @@ static gboolean panel_toplevel_update_struts(PanelToplevel* toplevel, gboolean e
if (toplevel->priv->auto_hide && strut > 0)
strut = panel_toplevel_get_effective_auto_hide_size (toplevel);
- if (strut > 0)
+ if (strut > 0) {
+ GdkScreen *screen;
+ screen = gtk_widget_get_screen (GTK_WIDGET (toplevel));
geometry_changed = panel_struts_register_strut (toplevel,
screen,
toplevel->priv->monitor,
@@ -1546,8 +1538,10 @@ static gboolean panel_toplevel_update_struts(PanelToplevel* toplevel, gboolean e
strut_start,
strut_end,
toplevel->priv->scale);
- else
+ }
+ else {
panel_struts_unregister_strut (toplevel);
+ }
if (toplevel->priv->state == PANEL_STATE_NORMAL ||
toplevel->priv->state == PANEL_STATE_AUTO_HIDDEN ||
@@ -1990,17 +1984,14 @@ get_delta (int src,
static void
panel_toplevel_update_animating_position (PanelToplevel *toplevel)
{
- GdkScreen *screen;
GTimeVal time_val;
int deltax, deltay, deltaw = 0, deltah = 0;
int monitor_offset_x, monitor_offset_y;
g_get_current_time (&time_val);
- screen = gtk_window_get_screen (GTK_WINDOW (toplevel));
-
- monitor_offset_x = panel_multiscreen_x (screen, toplevel->priv->monitor);
- monitor_offset_y = panel_multiscreen_y (screen, toplevel->priv->monitor);
+ monitor_offset_x = panel_multimonitor_x (toplevel->priv->monitor);
+ monitor_offset_y = panel_multimonitor_y (toplevel->priv->monitor);
if (toplevel->priv->animation_end_width != -1)
deltaw = get_delta (toplevel->priv->geometry.width,
@@ -2060,9 +2051,7 @@ panel_toplevel_update_animating_position (PanelToplevel *toplevel)
static void
panel_toplevel_update_expanded_position (PanelToplevel *toplevel)
{
- GdkScreen *screen;
GdkRectangle monitor_geom;
- int screen_width, screen_height;
int x, y;
int x_right, y_bottom;
int monitor;
@@ -2070,10 +2059,6 @@ panel_toplevel_update_expanded_position (PanelToplevel *toplevel)
if (!toplevel->priv->expand)
return;
- screen = panel_toplevel_get_screen_geometry (toplevel,
- &screen_width,
- &screen_height);
-
panel_toplevel_get_monitor_geometry (toplevel, &monitor_geom);
x = -1;
@@ -2105,12 +2090,12 @@ panel_toplevel_update_expanded_position (PanelToplevel *toplevel)
break;
}
- monitor = panel_multiscreen_get_monitor_at_point (screen, x, y);
+ monitor = panel_multimonitor_get_monitor_at_point (x, y);
panel_toplevel_set_monitor_internal (toplevel, monitor, TRUE);
- x -= panel_multiscreen_x (screen, monitor);
- y -= panel_multiscreen_y (screen, monitor);
+ x -= panel_multimonitor_x (monitor);
+ y -= panel_multimonitor_y (monitor);
g_object_freeze_notify (G_OBJECT (toplevel));
@@ -2141,15 +2126,10 @@ static void
panel_toplevel_update_position (PanelToplevel *toplevel)
{
PanelBackground *background;
- GdkScreen *screen;
int x, y;
int w, h;
- int screen_width, screen_height;
GdkRectangle monitor_geom;
- screen = panel_toplevel_get_screen_geometry (
- toplevel, &screen_width, &screen_height);
-
panel_toplevel_get_monitor_geometry (toplevel, &monitor_geom);
if (toplevel->priv->animating) {
@@ -2275,8 +2255,8 @@ panel_toplevel_update_position (PanelToplevel *toplevel)
y = max_size;
}
- x += panel_multiscreen_x (screen, toplevel->priv->monitor);
- y += panel_multiscreen_y (screen, toplevel->priv->monitor);
+ x += panel_multimonitor_x (toplevel->priv->monitor);
+ y += panel_multimonitor_y (toplevel->priv->monitor);
toplevel->priv->geometry.x = x;
toplevel->priv->geometry.y = y;
@@ -3634,7 +3614,6 @@ panel_toplevel_calculate_animation_end_geometry (PanelToplevel *toplevel)
static void
panel_toplevel_start_animation (PanelToplevel *toplevel)
{
- GdkScreen *screen;
GtkRequisition requisition;
int deltax, deltay, deltaw = 0, deltah = 0;
int cur_x = -1, cur_y = -1;
@@ -3654,10 +3633,8 @@ panel_toplevel_start_animation (PanelToplevel *toplevel)
gdk_window_get_origin (gtk_widget_get_window (GTK_WIDGET (toplevel)), &cur_x, &cur_y);
- screen = gtk_widget_get_screen (GTK_WIDGET (toplevel));
-
- cur_x -= panel_multiscreen_x (screen, toplevel->priv->monitor);
- cur_y -= panel_multiscreen_y (screen, toplevel->priv->monitor);
+ cur_x -= panel_multimonitor_x (toplevel->priv->monitor);
+ cur_y -= panel_multimonitor_y (toplevel->priv->monitor);
deltax = toplevel->priv->animation_end_x - cur_x;
deltay = toplevel->priv->animation_end_y - cur_y;
@@ -5283,20 +5260,16 @@ panel_toplevel_set_monitor_internal (PanelToplevel *toplevel,
static void
panel_toplevel_update_monitor (PanelToplevel *toplevel)
{
- GdkScreen *screen;
-
- screen = gtk_window_get_screen (GTK_WINDOW (toplevel));
-
/* If we were not using the configured monitor, can we use it now? */
if ((toplevel->priv->configured_monitor != -1) &&
(toplevel->priv->configured_monitor != toplevel->priv->monitor) &&
- toplevel->priv->configured_monitor < panel_multiscreen_monitors (screen)) {
+ toplevel->priv->configured_monitor < panel_multimonitor_monitors ()) {
panel_toplevel_set_monitor_internal (toplevel,
toplevel->priv->configured_monitor,
FALSE);
/* else, can we still use the monitor we were using? */
- } else if (toplevel->priv->monitor >= panel_multiscreen_monitors (screen)) {
+ } else if (toplevel->priv->monitor >= panel_multimonitor_monitors ()) {
panel_toplevel_set_monitor_internal (toplevel,
0,
FALSE);
@@ -5307,8 +5280,6 @@ void
panel_toplevel_set_monitor (PanelToplevel *toplevel,
int monitor)
{
- GdkScreen *screen;
-
g_return_if_fail (PANEL_IS_TOPLEVEL (toplevel));
if (toplevel->priv->configured_monitor == monitor)
@@ -5318,11 +5289,10 @@ panel_toplevel_set_monitor (PanelToplevel *toplevel,
/* Only use the configured monitor if it's existing. Else, we ignore
* the non-existing monitor, and keep the old one. The main use case is
- * when logging in after having used a multiscreen environment.
+ * when logging in after having used a multimonitor environment.
* We will put the panel on the monitor 0 for this session, and it will
* move back to the right monitor next time. */
- screen = gtk_window_get_screen (GTK_WINDOW (toplevel));
- if (monitor < panel_multiscreen_monitors (screen))
+ if (monitor < panel_multimonitor_monitors ())
panel_toplevel_set_monitor_internal (toplevel, monitor, TRUE);
g_object_notify (G_OBJECT (toplevel), "monitor");
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-14 11:31:47 +0000