diff options
| -rw-r--r-- | mate-panel/panel-struts.c | 784 | ||||
| -rw-r--r-- | mate-panel/panel-struts.h | 24 |
2 files changed, 404 insertions, 404 deletions
diff --git a/mate-panel/panel-struts.c b/mate-panel/panel-struts.c index f371f9b3..2035c647 100644 --- a/mate-panel/panel-struts.c +++ b/mate-panel/panel-struts.c @@ -18,7 +18,7 @@ * 02110-1301, USA. * Authors: - * Mark McLoughlin <[email protected]> + * Mark McLoughlin <[email protected]> */ #include <config.h> @@ -36,21 +36,21 @@ typedef struct { - PanelToplevel *toplevel; + PanelToplevel *toplevel; - GdkScreen *screen; - int monitor; + GdkScreen *screen; + int monitor; - PanelOrientation orientation; - GdkRectangle geometry; - int strut_size; - int strut_start; - int strut_end; + PanelOrientation orientation; + GdkRectangle geometry; + int strut_size; + int strut_start; + int strut_end; - GdkRectangle allocated_geometry; - int allocated_strut_size; - int allocated_strut_start; - int allocated_strut_end; + GdkRectangle allocated_geometry; + int allocated_strut_size; + int allocated_strut_start; + int allocated_strut_end; } PanelStrut; @@ -60,309 +60,309 @@ static GSList *panel_struts_list = NULL; static inline PanelStrut * panel_struts_find_strut (PanelToplevel *toplevel) { - GSList *l; + GSList *l; - for (l = panel_struts_list; l; l = l->next) { - PanelStrut *strut = l->data; + for (l = panel_struts_list; l; l = l->next) { + PanelStrut *strut = l->data; - if (strut->toplevel == toplevel) - break; - } + if (strut->toplevel == toplevel) + break; + } - return l ? l->data : NULL; + return l ? l->data : NULL; } static void panel_struts_get_monitor_geometry (int monitor, - int *x, - int *y, - int *width, - int *height) + int *x, + int *y, + int *width, + int *height) { - *x = panel_multimonitor_x (monitor); - *y = panel_multimonitor_y (monitor); - *width = panel_multimonitor_width (monitor); - *height = panel_multimonitor_height (monitor); + *x = panel_multimonitor_x (monitor); + *y = panel_multimonitor_y (monitor); + *width = panel_multimonitor_width (monitor); + *height = panel_multimonitor_height (monitor); } static PanelStrut * panel_struts_intersect (GSList *struts, - GdkRectangle *geometry, - int skip) + GdkRectangle *geometry, + int skip) { - GSList *l; - int i; + GSList *l; + int i; - i = 0; - for (l = struts; l; l = l->next) { - PanelStrut *strut = l->data; - int x1, y1, x2, y2; + i = 0; + for (l = struts; l; l = l->next) { + PanelStrut *strut = l->data; + int x1, y1, x2, y2; - x1 = MAX (strut->allocated_geometry.x, geometry->x); - y1 = MAX (strut->allocated_geometry.y, geometry->y); + x1 = MAX (strut->allocated_geometry.x, geometry->x); + y1 = MAX (strut->allocated_geometry.y, geometry->y); - x2 = MIN (strut->allocated_geometry.x + strut->allocated_geometry.width, - geometry->x + geometry->width); - y2 = MIN (strut->allocated_geometry.y + strut->allocated_geometry.height, - geometry->y + geometry->height); + x2 = MIN (strut->allocated_geometry.x + strut->allocated_geometry.width, + geometry->x + geometry->width); + y2 = MIN (strut->allocated_geometry.y + strut->allocated_geometry.height, + geometry->y + geometry->height); - if (x2 - x1 > 0 && y2 - y1 > 0 && ++i > skip) - break; - } + if (x2 - x1 > 0 && y2 - y1 > 0 && ++i > skip) + break; + } - return l ? l->data : NULL; + return l ? l->data : NULL; } static int panel_struts_allocation_overlapped (PanelStrut *strut, - PanelStrut *overlap, - GdkRectangle *geometry, - gboolean *moved_down, - int skip) + PanelStrut *overlap, + GdkRectangle *geometry, + gboolean *moved_down, + int skip) { - int overlap_x1, overlap_y1, overlap_x2, overlap_y2; - - overlap_x1 = overlap->allocated_geometry.x; - overlap_y1 = overlap->allocated_geometry.y; - overlap_x2 = overlap->allocated_geometry.x + overlap->allocated_geometry.width; - overlap_y2 = overlap->allocated_geometry.y + overlap->allocated_geometry.height; - - if (strut->orientation == overlap->orientation) { - int old_x, old_y; - - old_x = geometry->x; - old_y = geometry->y; - - switch (strut->orientation) { - case PANEL_ORIENTATION_TOP: - geometry->y = overlap_y2; - strut->allocated_strut_size += geometry->y - old_y; - break; - case PANEL_ORIENTATION_BOTTOM: - geometry->y = overlap_y1 - geometry->height; - strut->allocated_strut_size += old_y - geometry->y; - break; - case PANEL_ORIENTATION_LEFT: - geometry->x = overlap_x2; - strut->allocated_strut_size += geometry->x - old_x; - break; - case PANEL_ORIENTATION_RIGHT: - geometry->x = overlap_x1 - geometry->width; - strut->allocated_strut_size += old_x - geometry->x; - break; - default: - g_assert_not_reached (); - break; - } - } else { - if (strut->orientation & PANEL_HORIZONTAL_MASK || - overlap->orientation & PANEL_VERTICAL_MASK) - return ++skip; - - switch (overlap->orientation) { - case PANEL_ORIENTATION_TOP: - geometry->y = overlap_y2; - *moved_down = TRUE; - break; - case PANEL_ORIENTATION_BOTTOM: - if (!*moved_down) - geometry->y = overlap_y1 - geometry->height; - else if (overlap_y1 > geometry->y) - geometry->height = overlap_y1 - geometry->y; - else - return ++skip; - break; - default: - g_assert_not_reached (); - break; - } - - strut->allocated_strut_start = geometry->y; - strut->allocated_strut_end = geometry->y + geometry->height - 1; - } - - return skip; + int overlap_x1, overlap_y1, overlap_x2, overlap_y2; + + overlap_x1 = overlap->allocated_geometry.x; + overlap_y1 = overlap->allocated_geometry.y; + overlap_x2 = overlap->allocated_geometry.x + overlap->allocated_geometry.width; + overlap_y2 = overlap->allocated_geometry.y + overlap->allocated_geometry.height; + + if (strut->orientation == overlap->orientation) { + int old_x, old_y; + + old_x = geometry->x; + old_y = geometry->y; + + switch (strut->orientation) { + case PANEL_ORIENTATION_TOP: + geometry->y = overlap_y2; + strut->allocated_strut_size += geometry->y - old_y; + break; + case PANEL_ORIENTATION_BOTTOM: + geometry->y = overlap_y1 - geometry->height; + strut->allocated_strut_size += old_y - geometry->y; + break; + case PANEL_ORIENTATION_LEFT: + geometry->x = overlap_x2; + strut->allocated_strut_size += geometry->x - old_x; + break; + case PANEL_ORIENTATION_RIGHT: + geometry->x = overlap_x1 - geometry->width; + strut->allocated_strut_size += old_x - geometry->x; + break; + default: + g_assert_not_reached (); + break; + } + } else { + if (strut->orientation & PANEL_HORIZONTAL_MASK || + overlap->orientation & PANEL_VERTICAL_MASK) + return ++skip; + + switch (overlap->orientation) { + case PANEL_ORIENTATION_TOP: + geometry->y = overlap_y2; + *moved_down = TRUE; + break; + case PANEL_ORIENTATION_BOTTOM: + if (!*moved_down) + geometry->y = overlap_y1 - geometry->height; + else if (overlap_y1 > geometry->y) + geometry->height = overlap_y1 - geometry->y; + else + return ++skip; + break; + default: + g_assert_not_reached (); + break; + } + + strut->allocated_strut_start = geometry->y; + strut->allocated_strut_end = geometry->y + geometry->height - 1; + } + + return skip; } static gboolean panel_struts_allocate_struts (PanelToplevel *toplevel, - GdkScreen *screen, - int monitor) + GdkScreen *screen, + int monitor) { - GSList *allocated = NULL; - GSList *l; - gboolean toplevel_changed = FALSE; - - for (l = panel_struts_list; l; l = l->next) { - PanelStrut *strut = l->data; - PanelStrut *overlap; - GdkRectangle geometry; - int monitor_x, monitor_y; - int monitor_width, monitor_height; - gboolean moved_down; - int skip; - - if (strut->screen != screen || strut->monitor != monitor) - continue; - - panel_struts_get_monitor_geometry (strut->monitor, - &monitor_x, &monitor_y, - &monitor_width, &monitor_height); - - strut->allocated_strut_size = strut->strut_size; - strut->allocated_strut_start = strut->strut_start; - strut->allocated_strut_end = strut->strut_end; - - geometry = strut->geometry; - - moved_down = FALSE; - skip = 0; - while ((overlap = panel_struts_intersect (allocated, &geometry, skip))) - skip = panel_struts_allocation_overlapped ( - strut, overlap, &geometry, &moved_down, skip); - - if (strut->orientation & PANEL_VERTICAL_MASK) { - if (geometry.y < monitor_y) { - geometry.height = geometry.y + geometry.height - monitor_y; - geometry.y = monitor_y; - } - - if (geometry.y + geometry.height > monitor_y + monitor_height) - geometry.height = monitor_y + monitor_height - geometry.y; - } - - if (strut->allocated_geometry.x != geometry.x || - strut->allocated_geometry.y != geometry.y || - strut->allocated_geometry.width != geometry.width || - strut->allocated_geometry.height != geometry.height) { - strut->allocated_geometry = geometry; - - if (strut->toplevel == toplevel) - toplevel_changed = TRUE; - else - gtk_widget_queue_resize (GTK_WIDGET (strut->toplevel)); - } - - allocated = g_slist_append (allocated, strut); - } - - g_slist_free (allocated); - - return toplevel_changed; + GSList *allocated = NULL; + GSList *l; + gboolean toplevel_changed = FALSE; + + for (l = panel_struts_list; l; l = l->next) { + PanelStrut *strut = l->data; + PanelStrut *overlap; + GdkRectangle geometry; + int monitor_x, monitor_y; + int monitor_width, monitor_height; + gboolean moved_down; + int skip; + + if (strut->screen != screen || strut->monitor != monitor) + continue; + + panel_struts_get_monitor_geometry (strut->monitor, + &monitor_x, &monitor_y, + &monitor_width, &monitor_height); + + strut->allocated_strut_size = strut->strut_size; + strut->allocated_strut_start = strut->strut_start; + strut->allocated_strut_end = strut->strut_end; + + geometry = strut->geometry; + + moved_down = FALSE; + skip = 0; + while ((overlap = panel_struts_intersect (allocated, &geometry, skip))) + skip = panel_struts_allocation_overlapped ( + strut, overlap, &geometry, &moved_down, skip); + + if (strut->orientation & PANEL_VERTICAL_MASK) { + if (geometry.y < monitor_y) { + geometry.height = geometry.y + geometry.height - monitor_y; + geometry.y = monitor_y; + } + + if (geometry.y + geometry.height > monitor_y + monitor_height) + geometry.height = monitor_y + monitor_height - geometry.y; + } + + if (strut->allocated_geometry.x != geometry.x || + strut->allocated_geometry.y != geometry.y || + strut->allocated_geometry.width != geometry.width || + strut->allocated_geometry.height != geometry.height) { + strut->allocated_geometry = geometry; + + if (strut->toplevel == toplevel) + toplevel_changed = TRUE; + else + gtk_widget_queue_resize (GTK_WIDGET (strut->toplevel)); + } + + allocated = g_slist_append (allocated, strut); + } + + g_slist_free (allocated); + + return toplevel_changed; } void panel_struts_set_window_hint (PanelToplevel *toplevel) { - GtkWidget *widget; - PanelStrut *strut; - int strut_size; - int monitor_x, monitor_y, monitor_width, monitor_height; - int screen_width, screen_height; - int leftmost, rightmost, topmost, bottommost; - int scale; - - widget = GTK_WIDGET (toplevel); - - g_return_if_fail (GDK_IS_X11_DISPLAY (gtk_widget_get_display (widget))); - - if (!gtk_widget_get_realized (widget)) - return; - - if (!(strut = panel_struts_find_strut (toplevel))) { - panel_struts_unset_window_hint (toplevel); - return; - } - - scale = gtk_widget_get_scale_factor (widget); - strut_size = strut->allocated_strut_size; - - 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->monitor, - &monitor_x, - &monitor_y, - &monitor_width, - &monitor_height); - - panel_multimonitor_is_at_visible_extreme (strut->monitor, - &leftmost, - &rightmost, - &topmost, - &bottommost); - - switch (strut->orientation) { - case PANEL_ORIENTATION_TOP: - if (monitor_y > 0) - strut_size += monitor_y; - if (!topmost) strut_size = 0; - break; - case PANEL_ORIENTATION_BOTTOM: - if (monitor_y + monitor_height < screen_height) - strut_size += screen_height - (monitor_y + monitor_height); - if (!bottommost) strut_size = 0; - break; - case PANEL_ORIENTATION_LEFT: - if (leftmost && monitor_x > 0) - strut_size += monitor_x; - if (!leftmost) strut_size = 0; - break; - case PANEL_ORIENTATION_RIGHT: - if (monitor_x + monitor_width < screen_width) - strut_size += screen_width - (monitor_x + monitor_width); - if (!rightmost) strut_size = 0; - break; - default: - g_assert_not_reached (); - break; - } - - panel_xutils_set_strut (gtk_widget_get_window (widget), - strut->orientation, - strut_size, - strut->allocated_strut_start * scale, - strut->allocated_strut_end * scale); + GtkWidget *widget; + PanelStrut *strut; + int strut_size; + int monitor_x, monitor_y, monitor_width, monitor_height; + int screen_width, screen_height; + int leftmost, rightmost, topmost, bottommost; + int scale; + + widget = GTK_WIDGET (toplevel); + + g_return_if_fail (GDK_IS_X11_DISPLAY (gtk_widget_get_display (widget))); + + if (!gtk_widget_get_realized (widget)) + return; + + if (!(strut = panel_struts_find_strut (toplevel))) { + panel_struts_unset_window_hint (toplevel); + return; + } + + scale = gtk_widget_get_scale_factor (widget); + strut_size = strut->allocated_strut_size; + + 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->monitor, + &monitor_x, + &monitor_y, + &monitor_width, + &monitor_height); + + panel_multimonitor_is_at_visible_extreme (strut->monitor, + &leftmost, + &rightmost, + &topmost, + &bottommost); + + switch (strut->orientation) { + case PANEL_ORIENTATION_TOP: + if (monitor_y > 0) + strut_size += monitor_y; + if (!topmost) strut_size = 0; + break; + case PANEL_ORIENTATION_BOTTOM: + if (monitor_y + monitor_height < screen_height) + strut_size += screen_height - (monitor_y + monitor_height); + if (!bottommost) strut_size = 0; + break; + case PANEL_ORIENTATION_LEFT: + if (leftmost && monitor_x > 0) + strut_size += monitor_x; + if (!leftmost) strut_size = 0; + break; + case PANEL_ORIENTATION_RIGHT: + if (monitor_x + monitor_width < screen_width) + strut_size += screen_width - (monitor_x + monitor_width); + if (!rightmost) strut_size = 0; + break; + default: + g_assert_not_reached (); + break; + } + + panel_xutils_set_strut (gtk_widget_get_window (widget), + strut->orientation, + strut_size, + strut->allocated_strut_start * scale, + strut->allocated_strut_end * scale); } void panel_struts_unset_window_hint (PanelToplevel *toplevel) { - g_return_if_fail (GDK_IS_X11_DISPLAY (gtk_widget_get_display (GTK_WIDGET (toplevel)))); + g_return_if_fail (GDK_IS_X11_DISPLAY (gtk_widget_get_display (GTK_WIDGET (toplevel)))); - if (!gtk_widget_get_realized (GTK_WIDGET (toplevel))) - return; + if (!gtk_widget_get_realized (GTK_WIDGET (toplevel))) + return; - panel_xutils_set_strut (gtk_widget_get_window (GTK_WIDGET (toplevel)), 0, 0, 0, 0); + panel_xutils_set_strut (gtk_widget_get_window (GTK_WIDGET (toplevel)), 0, 0, 0, 0); } static inline int orientation_to_order (PanelOrientation orientation) { - switch (orientation) { - case PANEL_ORIENTATION_TOP: - return 1; - case PANEL_ORIENTATION_BOTTOM: - return 2; - case PANEL_ORIENTATION_LEFT: - return 3; - case PANEL_ORIENTATION_RIGHT: - return 4; - default: - g_assert_not_reached (); - return -1; - } + switch (orientation) { + case PANEL_ORIENTATION_TOP: + return 1; + case PANEL_ORIENTATION_BOTTOM: + return 2; + case PANEL_ORIENTATION_LEFT: + return 3; + case PANEL_ORIENTATION_RIGHT: + return 4; + default: + g_assert_not_reached (); + return -1; + } } static inline int get_toplevel_depth (PanelToplevel *toplevel) { - int depth = 0; + int depth = 0; - while ((toplevel = panel_toplevel_get_attach_toplevel (toplevel))) - depth++; + while ((toplevel = panel_toplevel_get_attach_toplevel (toplevel))) + depth++; - return depth; + return depth; } /* Sort in order of @@ -375,165 +375,165 @@ get_toplevel_depth (PanelToplevel *toplevel) */ static int panel_struts_compare (const PanelStrut *s1, - const PanelStrut *s2) + const PanelStrut *s2) { - int s1_depth; - int s2_depth; + int s1_depth; + int s2_depth; - if (s1->screen != s2->screen) - return gdk_x11_screen_get_screen_number (s1->screen) - - gdk_x11_screen_get_screen_number (s2->screen); + if (s1->screen != s2->screen) + return gdk_x11_screen_get_screen_number (s1->screen) - + gdk_x11_screen_get_screen_number (s2->screen); - if (s1->monitor != s2->monitor) - return s1->monitor - s2->monitor; + if (s1->monitor != s2->monitor) + return s1->monitor - s2->monitor; - s1_depth = get_toplevel_depth (s1->toplevel); - s2_depth = get_toplevel_depth (s2->toplevel); - if (s1_depth != s2_depth) - return s2_depth - s1_depth; + s1_depth = get_toplevel_depth (s1->toplevel); + s2_depth = get_toplevel_depth (s2->toplevel); + if (s1_depth != s2_depth) + return s2_depth - s1_depth; - if (s1->orientation != s2->orientation) - return orientation_to_order (s1->orientation) - - orientation_to_order (s2->orientation); + if (s1->orientation != s2->orientation) + return orientation_to_order (s1->orientation) - + orientation_to_order (s2->orientation); - if (s1->strut_start != s2->strut_start) - return s1->strut_start - s2->strut_start; + if (s1->strut_start != s2->strut_start) + return s1->strut_start - s2->strut_start; - if (s1->strut_end != s2->strut_end) - return s2->strut_end - s1->strut_end; + if (s1->strut_end != s2->strut_end) + return s2->strut_end - s1->strut_end; - return 0; + return 0; } gboolean panel_struts_register_strut (PanelToplevel *toplevel, - GdkScreen *screen, - int monitor, - PanelOrientation orientation, - int strut_size, - int strut_start, - int strut_end, - gint scale) + GdkScreen *screen, + int monitor, + PanelOrientation orientation, + int strut_size, + int strut_start, + int strut_end, + gint scale) { - PanelStrut *strut; - gboolean new_strut = FALSE; - int monitor_x, monitor_y, monitor_width, monitor_height; - - g_return_val_if_fail (GDK_IS_X11_DISPLAY (gtk_widget_get_display (GTK_WIDGET (toplevel))), FALSE); - - if (!(strut = panel_struts_find_strut (toplevel))) { - strut = g_new0 (PanelStrut, 1); - new_strut = TRUE; - - } else if (strut->toplevel == toplevel && - strut->orientation == orientation && - strut->screen == screen && - strut->monitor == monitor && - strut->strut_size == strut_size && - strut->strut_start == strut_start && - strut->strut_end == strut_end) - return FALSE; - - strut->toplevel = toplevel; - strut->orientation = orientation; - strut->screen = screen; - strut->monitor = monitor; - strut->strut_size = strut_size; - strut->strut_start = strut_start; - strut->strut_end = strut_end; - - panel_struts_get_monitor_geometry (monitor, - &monitor_x, &monitor_y, - &monitor_width, &monitor_height); - - switch (strut->orientation) { - case PANEL_ORIENTATION_TOP: - strut->geometry.x = strut->strut_start; - strut->geometry.y = monitor_y; - strut->geometry.width = strut->strut_end - strut->strut_start + 1; - strut->geometry.height = strut->strut_size / scale; - if (scale > 1) - strut->geometry.width -= (strut->strut_size / scale); - break; - case PANEL_ORIENTATION_BOTTOM: - strut->geometry.x = strut->strut_start; - strut->geometry.y = monitor_y + monitor_height - strut->strut_size; - strut->geometry.width = strut->strut_end - strut->strut_start + 1; - strut->geometry.height = strut->strut_size / scale; - if (scale > 1) - strut->geometry.width -= (strut->strut_size / scale); - break; - case PANEL_ORIENTATION_LEFT: - strut->geometry.x = monitor_x; - strut->geometry.y = strut->strut_start; - strut->geometry.width = strut->strut_size / scale; - strut->geometry.height = strut->strut_end - strut->strut_start + 1; - if (scale > 1) - strut->geometry.height -= (strut->strut_size / scale); - break; - case PANEL_ORIENTATION_RIGHT: - strut->geometry.x = monitor_x + monitor_width - strut->strut_size; - strut->geometry.y = strut->strut_start; - strut->geometry.width = strut->strut_size / scale; - strut->geometry.height = strut->strut_end - strut->strut_start + 1; - if (scale > 1) - strut->geometry.height -= (strut->strut_size / scale); - break; - } - - if (new_strut) - panel_struts_list = g_slist_append (panel_struts_list, strut); - - panel_struts_list = g_slist_sort (panel_struts_list, - (GCompareFunc) panel_struts_compare); - - return panel_struts_allocate_struts (toplevel, screen, monitor); + PanelStrut *strut; + gboolean new_strut = FALSE; + int monitor_x, monitor_y, monitor_width, monitor_height; + + g_return_val_if_fail (GDK_IS_X11_DISPLAY (gtk_widget_get_display (GTK_WIDGET (toplevel))), FALSE); + + if (!(strut = panel_struts_find_strut (toplevel))) { + strut = g_new0 (PanelStrut, 1); + new_strut = TRUE; + + } else if (strut->toplevel == toplevel && + strut->orientation == orientation && + strut->screen == screen && + strut->monitor == monitor && + strut->strut_size == strut_size && + strut->strut_start == strut_start && + strut->strut_end == strut_end) + return FALSE; + + strut->toplevel = toplevel; + strut->orientation = orientation; + strut->screen = screen; + strut->monitor = monitor; + strut->strut_size = strut_size; + strut->strut_start = strut_start; + strut->strut_end = strut_end; + + panel_struts_get_monitor_geometry (monitor, + &monitor_x, &monitor_y, + &monitor_width, &monitor_height); + + switch (strut->orientation) { + case PANEL_ORIENTATION_TOP: + strut->geometry.x = strut->strut_start; + strut->geometry.y = monitor_y; + strut->geometry.width = strut->strut_end - strut->strut_start + 1; + strut->geometry.height = strut->strut_size / scale; + if (scale > 1) + strut->geometry.width -= (strut->strut_size / scale); + break; + case PANEL_ORIENTATION_BOTTOM: + strut->geometry.x = strut->strut_start; + strut->geometry.y = monitor_y + monitor_height - strut->strut_size; + strut->geometry.width = strut->strut_end - strut->strut_start + 1; + strut->geometry.height = strut->strut_size / scale; + if (scale > 1) + strut->geometry.width -= (strut->strut_size / scale); + break; + case PANEL_ORIENTATION_LEFT: + strut->geometry.x = monitor_x; + strut->geometry.y = strut->strut_start; + strut->geometry.width = strut->strut_size / scale; + strut->geometry.height = strut->strut_end - strut->strut_start + 1; + if (scale > 1) + strut->geometry.height -= (strut->strut_size / scale); + break; + case PANEL_ORIENTATION_RIGHT: + strut->geometry.x = monitor_x + monitor_width - strut->strut_size; + strut->geometry.y = strut->strut_start; + strut->geometry.width = strut->strut_size / scale; + strut->geometry.height = strut->strut_end - strut->strut_start + 1; + if (scale > 1) + strut->geometry.height -= (strut->strut_size / scale); + break; + } + + if (new_strut) + panel_struts_list = g_slist_append (panel_struts_list, strut); + + panel_struts_list = g_slist_sort (panel_struts_list, + (GCompareFunc) panel_struts_compare); + + return panel_struts_allocate_struts (toplevel, screen, monitor); } void panel_struts_unregister_strut (PanelToplevel *toplevel) { - PanelStrut *strut; - GdkScreen *screen; - int monitor; + PanelStrut *strut; + GdkScreen *screen; + int monitor; - g_return_if_fail (GDK_IS_X11_DISPLAY (gtk_widget_get_display (GTK_WIDGET (toplevel)))); + g_return_if_fail (GDK_IS_X11_DISPLAY (gtk_widget_get_display (GTK_WIDGET (toplevel)))); - if (!(strut = panel_struts_find_strut (toplevel))) - return; + if (!(strut = panel_struts_find_strut (toplevel))) + return; - screen = strut->screen; - monitor = strut->monitor; + screen = strut->screen; + monitor = strut->monitor; - panel_struts_list = g_slist_remove (panel_struts_list, strut); - g_free (strut); + panel_struts_list = g_slist_remove (panel_struts_list, strut); + g_free (strut); - panel_struts_allocate_struts (toplevel, screen, monitor); + panel_struts_allocate_struts (toplevel, screen, monitor); } gboolean panel_struts_update_toplevel_geometry (PanelToplevel *toplevel, - int *x, - int *y, - int *width, - int *height) + int *x, + int *y, + int *width, + int *height) { - PanelStrut *strut; + PanelStrut *strut; - g_return_val_if_fail (GDK_IS_X11_DISPLAY (gtk_widget_get_display (GTK_WIDGET (toplevel))), FALSE); - g_return_val_if_fail (x != NULL, FALSE); - g_return_val_if_fail (y != NULL, FALSE); + g_return_val_if_fail (GDK_IS_X11_DISPLAY (gtk_widget_get_display (GTK_WIDGET (toplevel))), FALSE); + g_return_val_if_fail (x != NULL, FALSE); + g_return_val_if_fail (y != NULL, FALSE); - if (!(strut = panel_struts_find_strut (toplevel))) - return FALSE; + if (!(strut = panel_struts_find_strut (toplevel))) + return FALSE; - *x += strut->allocated_geometry.x - strut->geometry.x; - *y += strut->allocated_geometry.y - strut->geometry.y; + *x += strut->allocated_geometry.x - strut->geometry.x; + *y += strut->allocated_geometry.y - strut->geometry.y; - if (width != NULL && *width != -1) - *width += strut->allocated_geometry.width - strut->geometry.width; - if (height != NULL && *height != -1) - *height += strut->allocated_geometry.height - strut->geometry.height; + if (width != NULL && *width != -1) + *width += strut->allocated_geometry.width - strut->geometry.width; + if (height != NULL && *height != -1) + *height += strut->allocated_geometry.height - strut->geometry.height; - return TRUE; + return TRUE; } diff --git a/mate-panel/panel-struts.h b/mate-panel/panel-struts.h index 01003ec2..0b5e781c 100644 --- a/mate-panel/panel-struts.h +++ b/mate-panel/panel-struts.h @@ -17,7 +17,7 @@ * 02110-1301, USA. * Authors: - * Mark McLoughlin <[email protected]> + * Mark McLoughlin <[email protected]> */ #ifndef __PANEL_STRUTS_H__ @@ -37,13 +37,13 @@ extern "C" { #endif gboolean panel_struts_register_strut (PanelToplevel *toplevel, - GdkScreen *screen, - int monitor, - PanelOrientation orientation, - int strut_size, - int strut_start, - int strut_end, - gint scale); + GdkScreen *screen, + int monitor, + PanelOrientation orientation, + int strut_size, + int strut_start, + int strut_end, + gint scale); void panel_struts_unregister_strut (PanelToplevel *toplevel); @@ -51,10 +51,10 @@ void panel_struts_set_window_hint (PanelToplevel *toplevel); void panel_struts_unset_window_hint (PanelToplevel *toplevel); gboolean panel_struts_update_toplevel_geometry (PanelToplevel *toplevel, - int *x, - int *y, - int *w, - int *h); + int *x, + int *y, + int *w, + int *h); #ifdef __cplusplus } |