mirror of
https://github.com/brl/mutter.git
synced 2024-11-25 09:30:45 -05:00
only create the resize popup if width_inc or height_inc are > 1
2002-10-18 Havoc Pennington <hp@redhat.com> * src/window.c (meta_window_refresh_resize_popup): only create the resize popup if width_inc or height_inc are > 1 * src/resizepopup.c: Clear out all the weird tickmark cruft, saves us about 2.5K of binary size, whee (meta_ui_resize_popup_new): take display/screen arguments and make multihead-safe #94349
This commit is contained in:
Havoc Pennington
Havoc Pennington
parent
eb647577c3
commit
915c2db3b9
10
ChangeLog
10
ChangeLog
@ -1,3 +1,13 @@
|
|||||||
|
2002-10-18 Havoc Pennington <hp@redhat.com>
|
||||||
|
|
||||||
|
* src/window.c (meta_window_refresh_resize_popup): only create the
|
||||||
|
resize popup if width_inc or height_inc are > 1
|
||||||
|
|
||||||
|
* src/resizepopup.c: Clear out all the weird tickmark cruft,
|
||||||
|
saves us about 2.5K of binary size, whee
|
||||||
|
(meta_ui_resize_popup_new): take display/screen arguments and make
|
||||||
|
multihead-safe #94349
|
||||||
|
|
||||||
2002-10-18 Havoc Pennington <hp@redhat.com>
|
2002-10-18 Havoc Pennington <hp@redhat.com>
|
||||||
|
|
||||||
* src/keybindings.c (do_choose_window): don't start the cycle
|
* src/keybindings.c (do_choose_window): don't start the cycle
|
||||||
|
|||||||
@ -26,24 +26,18 @@
|
|||||||
#include <gtk/gtklabel.h>
|
#include <gtk/gtklabel.h>
|
||||||
#include <gtk/gtkframe.h>
|
#include <gtk/gtkframe.h>
|
||||||
#include <gtk/gtkmain.h>
|
#include <gtk/gtkmain.h>
|
||||||
|
#include <gdk/gdkx.h>
|
||||||
|
|
||||||
struct _MetaResizePopup
|
struct _MetaResizePopup
|
||||||
{
|
{
|
||||||
GtkWidget *size_window;
|
GtkWidget *size_window;
|
||||||
GtkWidget *size_label;
|
GtkWidget *size_label;
|
||||||
|
Display *display;
|
||||||
GSList *vertical_tick_windows;
|
int screen_number;
|
||||||
GSList *horizontal_tick_windows;
|
|
||||||
|
|
||||||
GtkWidget *vertical_size_window;
|
|
||||||
GtkWidget *horizontal_size_window;
|
|
||||||
|
|
||||||
int vertical_size;
|
int vertical_size;
|
||||||
int horizontal_size;
|
int horizontal_size;
|
||||||
|
|
||||||
gboolean need_vertical_feedback;
|
|
||||||
gboolean need_horizontal_feedback;
|
|
||||||
|
|
||||||
gboolean showing;
|
gboolean showing;
|
||||||
|
|
||||||
int resize_gravity;
|
int resize_gravity;
|
||||||
@ -64,51 +58,20 @@ struct _MetaResizePopup
|
|||||||
};
|
};
|
||||||
|
|
||||||
MetaResizePopup*
|
MetaResizePopup*
|
||||||
meta_ui_resize_popup_new (void)
|
meta_ui_resize_popup_new (Display *display,
|
||||||
|
int screen_number)
|
||||||
{
|
{
|
||||||
MetaResizePopup *popup;
|
MetaResizePopup *popup;
|
||||||
|
|
||||||
popup = g_new0 (MetaResizePopup, 1);
|
popup = g_new0 (MetaResizePopup, 1);
|
||||||
|
|
||||||
popup->resize_gravity = -1;
|
popup->resize_gravity = -1;
|
||||||
|
popup->display = display;
|
||||||
|
popup->screen_number = screen_number;
|
||||||
|
|
||||||
return popup;
|
return popup;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
|
||||||
clear_tick_labels (MetaResizePopup *popup)
|
|
||||||
{
|
|
||||||
if (popup->vertical_size_window)
|
|
||||||
{
|
|
||||||
gtk_widget_destroy (popup->vertical_size_window);
|
|
||||||
popup->vertical_size_window = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (popup->horizontal_size_window)
|
|
||||||
{
|
|
||||||
gtk_widget_destroy (popup->horizontal_size_window);
|
|
||||||
popup->horizontal_size_window = NULL;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
clear_tick_windows (MetaResizePopup *popup)
|
|
||||||
{
|
|
||||||
g_slist_foreach (popup->vertical_tick_windows,
|
|
||||||
(GFunc) gtk_widget_destroy,
|
|
||||||
NULL);
|
|
||||||
|
|
||||||
g_slist_free (popup->vertical_tick_windows);
|
|
||||||
popup->vertical_tick_windows = NULL;
|
|
||||||
|
|
||||||
g_slist_foreach (popup->horizontal_tick_windows,
|
|
||||||
(GFunc) gtk_widget_destroy,
|
|
||||||
NULL);
|
|
||||||
|
|
||||||
g_slist_free (popup->horizontal_tick_windows);
|
|
||||||
popup->horizontal_tick_windows = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
void
|
||||||
meta_ui_resize_popup_free (MetaResizePopup *popup)
|
meta_ui_resize_popup_free (MetaResizePopup *popup)
|
||||||
{
|
{
|
||||||
@ -117,9 +80,6 @@ meta_ui_resize_popup_free (MetaResizePopup *popup)
|
|||||||
if (popup->size_window)
|
if (popup->size_window)
|
||||||
gtk_widget_destroy (popup->size_window);
|
gtk_widget_destroy (popup->size_window);
|
||||||
|
|
||||||
clear_tick_windows (popup);
|
|
||||||
clear_tick_labels (popup);
|
|
||||||
|
|
||||||
g_free (popup);
|
g_free (popup);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -131,10 +91,12 @@ ensure_size_window (MetaResizePopup *popup)
|
|||||||
if (popup->size_window)
|
if (popup->size_window)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (!(popup->need_vertical_feedback || popup->need_horizontal_feedback))
|
|
||||||
return;
|
|
||||||
|
|
||||||
popup->size_window = gtk_window_new (GTK_WINDOW_POPUP);
|
popup->size_window = gtk_window_new (GTK_WINDOW_POPUP);
|
||||||
|
#ifdef HAVE_GTK_MULTIHEAD
|
||||||
|
gtk_window_set_screen (GTK_WINDOW (popup->size_window),
|
||||||
|
gdk_display_get_screen (gdk_x11_lookup_xdisplay (popup->display),
|
||||||
|
popup->screen_number));
|
||||||
|
#endif
|
||||||
|
|
||||||
/* never shrink the size window */
|
/* never shrink the size window */
|
||||||
gtk_window_set_resizable (GTK_WINDOW (popup->size_window),
|
gtk_window_set_resizable (GTK_WINDOW (popup->size_window),
|
||||||
@ -160,9 +122,6 @@ update_size_window (MetaResizePopup *popup)
|
|||||||
int x, y;
|
int x, y;
|
||||||
int width, height;
|
int width, height;
|
||||||
|
|
||||||
if (!(popup->need_vertical_feedback || popup->need_horizontal_feedback))
|
|
||||||
return;
|
|
||||||
|
|
||||||
g_return_if_fail (popup->size_window != NULL);
|
g_return_if_fail (popup->size_window != NULL);
|
||||||
|
|
||||||
str = g_strdup_printf (_("%d x %d"),
|
str = g_strdup_printf (_("%d x %d"),
|
||||||
@ -200,19 +159,6 @@ sync_showing (MetaResizePopup *popup)
|
|||||||
if (popup->size_window)
|
if (popup->size_window)
|
||||||
gtk_widget_show (popup->size_window);
|
gtk_widget_show (popup->size_window);
|
||||||
|
|
||||||
if (popup->vertical_size_window)
|
|
||||||
gtk_widget_show (popup->vertical_size_window);
|
|
||||||
|
|
||||||
if (popup->horizontal_size_window)
|
|
||||||
gtk_widget_show (popup->horizontal_size_window);
|
|
||||||
|
|
||||||
g_slist_foreach (popup->horizontal_tick_windows,
|
|
||||||
(GFunc) gtk_widget_show,
|
|
||||||
NULL);
|
|
||||||
g_slist_foreach (popup->vertical_tick_windows,
|
|
||||||
(GFunc) gtk_widget_show,
|
|
||||||
NULL);
|
|
||||||
|
|
||||||
if (popup->size_window && GTK_WIDGET_REALIZED (popup->size_window))
|
if (popup->size_window && GTK_WIDGET_REALIZED (popup->size_window))
|
||||||
gdk_window_raise (popup->size_window->window);
|
gdk_window_raise (popup->size_window->window);
|
||||||
}
|
}
|
||||||
@ -220,594 +166,6 @@ sync_showing (MetaResizePopup *popup)
|
|||||||
{
|
{
|
||||||
if (popup->size_window)
|
if (popup->size_window)
|
||||||
gtk_widget_hide (popup->size_window);
|
gtk_widget_hide (popup->size_window);
|
||||||
|
|
||||||
if (popup->vertical_size_window)
|
|
||||||
gtk_widget_hide (popup->vertical_size_window);
|
|
||||||
|
|
||||||
if (popup->horizontal_size_window)
|
|
||||||
gtk_widget_hide (popup->horizontal_size_window);
|
|
||||||
|
|
||||||
g_slist_foreach (popup->horizontal_tick_windows,
|
|
||||||
(GFunc) gtk_widget_hide,
|
|
||||||
NULL);
|
|
||||||
g_slist_foreach (popup->vertical_tick_windows,
|
|
||||||
(GFunc) gtk_widget_hide,
|
|
||||||
NULL);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static GtkWidget*
|
|
||||||
create_size_window (const char *str)
|
|
||||||
{
|
|
||||||
PangoContext *context;
|
|
||||||
PangoLayout *layout;
|
|
||||||
GdkGC *gc;
|
|
||||||
GdkBitmap *bitmap;
|
|
||||||
PangoRectangle rect;
|
|
||||||
GdkColor color;
|
|
||||||
GtkWidget *window;
|
|
||||||
int w, h;
|
|
||||||
|
|
||||||
window = gtk_window_new (GTK_WINDOW_POPUP);
|
|
||||||
gtk_widget_set_app_paintable (window, TRUE);
|
|
||||||
gtk_window_set_resizable (GTK_WINDOW (window),
|
|
||||||
FALSE);
|
|
||||||
|
|
||||||
context = gdk_pango_context_get ();
|
|
||||||
|
|
||||||
#if 0
|
|
||||||
/* bitmaps have no meaningful cmap */
|
|
||||||
gdk_pango_context_set_colormap (context,
|
|
||||||
gtk_widget_get_colormap (widget));
|
|
||||||
#endif
|
|
||||||
pango_context_set_base_dir (context,
|
|
||||||
gtk_widget_get_direction (window) == GTK_TEXT_DIR_LTR ?
|
|
||||||
PANGO_DIRECTION_LTR : PANGO_DIRECTION_RTL);
|
|
||||||
pango_context_set_font_description (context,
|
|
||||||
window->style->font_desc);
|
|
||||||
pango_context_set_language (context, gtk_get_default_language ());
|
|
||||||
|
|
||||||
layout = pango_layout_new (context);
|
|
||||||
pango_layout_set_text (layout, str, -1);
|
|
||||||
|
|
||||||
g_object_unref (G_OBJECT (context));
|
|
||||||
|
|
||||||
pango_layout_get_pixel_extents (layout, NULL, &rect);
|
|
||||||
|
|
||||||
w = rect.width;
|
|
||||||
h = rect.height;
|
|
||||||
gtk_widget_set_size_request (window, w, h);
|
|
||||||
|
|
||||||
bitmap = gdk_pixmap_new (NULL, w, h, 1);
|
|
||||||
gc = gdk_gc_new (bitmap);
|
|
||||||
color.pixel = 0;
|
|
||||||
gdk_gc_set_foreground (gc, &color);
|
|
||||||
gdk_draw_rectangle (bitmap, gc, TRUE, 0, 0, w, h);
|
|
||||||
color.pixel = 1;
|
|
||||||
gdk_gc_set_foreground (gc, &color);
|
|
||||||
gdk_draw_layout (bitmap, gc, 0, 0, layout);
|
|
||||||
|
|
||||||
gtk_widget_shape_combine_mask (window,
|
|
||||||
bitmap, 0, 0);
|
|
||||||
|
|
||||||
g_object_unref (G_OBJECT (bitmap));
|
|
||||||
g_object_unref (G_OBJECT (gc));
|
|
||||||
g_object_unref (G_OBJECT (layout));
|
|
||||||
|
|
||||||
/* After setting the size */
|
|
||||||
gtk_widget_realize (window);
|
|
||||||
gdk_window_set_background (window->window,
|
|
||||||
&window->style->black);
|
|
||||||
|
|
||||||
return window;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
place_vertical_size_window (MetaResizePopup *popup,
|
|
||||||
int x,
|
|
||||||
int y,
|
|
||||||
double align)
|
|
||||||
{
|
|
||||||
int w, h;
|
|
||||||
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (popup->vertical_size_window == NULL)
|
|
||||||
{
|
|
||||||
char *str;
|
|
||||||
|
|
||||||
str = g_strdup_printf ("%d", popup->vertical_size);
|
|
||||||
|
|
||||||
popup->vertical_size_window = create_size_window (str);
|
|
||||||
|
|
||||||
g_free (str);
|
|
||||||
}
|
|
||||||
|
|
||||||
gtk_window_get_size (GTK_WINDOW (popup->vertical_size_window),
|
|
||||||
&w, &h);
|
|
||||||
|
|
||||||
gtk_window_move (GTK_WINDOW (popup->vertical_size_window),
|
|
||||||
x - w * align,
|
|
||||||
y - h / 2);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
place_horizontal_size_window (MetaResizePopup *popup,
|
|
||||||
int x,
|
|
||||||
int y,
|
|
||||||
double align)
|
|
||||||
{
|
|
||||||
int w, h;
|
|
||||||
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (popup->horizontal_size_window == NULL)
|
|
||||||
{
|
|
||||||
char *str;
|
|
||||||
|
|
||||||
str = g_strdup_printf ("%d", popup->horizontal_size);
|
|
||||||
|
|
||||||
popup->horizontal_size_window = create_size_window (str);
|
|
||||||
|
|
||||||
g_free (str);
|
|
||||||
}
|
|
||||||
|
|
||||||
gtk_window_get_size (GTK_WINDOW (popup->horizontal_size_window),
|
|
||||||
&w, &h);
|
|
||||||
|
|
||||||
gtk_window_move (GTK_WINDOW (popup->horizontal_size_window),
|
|
||||||
x - w / 2,
|
|
||||||
y - h * align);
|
|
||||||
}
|
|
||||||
|
|
||||||
static gboolean
|
|
||||||
tick_window_expose (GtkWidget *widget,
|
|
||||||
GdkEventExpose *event,
|
|
||||||
gpointer data)
|
|
||||||
{
|
|
||||||
int w, h;
|
|
||||||
|
|
||||||
gdk_window_get_size (widget->window, &w, &h);
|
|
||||||
|
|
||||||
#if 0
|
|
||||||
gdk_draw_rectangle (widget->window,
|
|
||||||
widget->style->white_gc,
|
|
||||||
FALSE,
|
|
||||||
0, 0,
|
|
||||||
w - 1,
|
|
||||||
h - 1);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
return FALSE;
|
|
||||||
}
|
|
||||||
|
|
||||||
static GtkWidget*
|
|
||||||
create_tick (int w,
|
|
||||||
int h)
|
|
||||||
{
|
|
||||||
GtkWidget *window;
|
|
||||||
|
|
||||||
window = gtk_window_new (GTK_WINDOW_POPUP);
|
|
||||||
gtk_widget_set_app_paintable (window, TRUE);
|
|
||||||
|
|
||||||
gtk_widget_set_size_request (window, w, h);
|
|
||||||
|
|
||||||
gtk_widget_realize (window);
|
|
||||||
gdk_window_set_background (window->window,
|
|
||||||
&window->style->black);
|
|
||||||
|
|
||||||
g_signal_connect (G_OBJECT (window), "expose_event",
|
|
||||||
G_CALLBACK (tick_window_expose), NULL);
|
|
||||||
|
|
||||||
return window;
|
|
||||||
}
|
|
||||||
|
|
||||||
#define TICK_WIDTH 1
|
|
||||||
#define TICK_LENGTH 7
|
|
||||||
|
|
||||||
static void
|
|
||||||
add_vertical_tick (MetaResizePopup *popup,
|
|
||||||
int x,
|
|
||||||
int y)
|
|
||||||
{
|
|
||||||
GtkWidget *window;
|
|
||||||
|
|
||||||
/* Create a tick for the vertical resize column of
|
|
||||||
* tick marks.
|
|
||||||
*/
|
|
||||||
|
|
||||||
window = create_tick (TICK_LENGTH, TICK_WIDTH);
|
|
||||||
|
|
||||||
gtk_window_move (GTK_WINDOW (window),
|
|
||||||
x, y);
|
|
||||||
|
|
||||||
popup->vertical_tick_windows =
|
|
||||||
g_slist_prepend (popup->vertical_tick_windows,
|
|
||||||
window);
|
|
||||||
|
|
||||||
/* create GdkWindow */
|
|
||||||
gtk_widget_realize (window);
|
|
||||||
|
|
||||||
/* Be sure the size window is above it */
|
|
||||||
if (popup->size_window && GTK_WIDGET_REALIZED (popup->size_window))
|
|
||||||
gdk_window_raise (popup->size_window->window);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
add_horizontal_tick (MetaResizePopup *popup,
|
|
||||||
int x,
|
|
||||||
int y)
|
|
||||||
{
|
|
||||||
GtkWidget *window;
|
|
||||||
|
|
||||||
/* Create a tick for the vertical resize column of
|
|
||||||
* tick marks.
|
|
||||||
*/
|
|
||||||
|
|
||||||
window = create_tick (TICK_WIDTH, TICK_LENGTH);
|
|
||||||
|
|
||||||
gtk_window_move (GTK_WINDOW (window),
|
|
||||||
x, y);
|
|
||||||
|
|
||||||
popup->horizontal_tick_windows =
|
|
||||||
g_slist_prepend (popup->horizontal_tick_windows,
|
|
||||||
window);
|
|
||||||
|
|
||||||
/* create GdkWindow */
|
|
||||||
gtk_widget_realize (window);
|
|
||||||
|
|
||||||
/* Be sure the size window is above it */
|
|
||||||
if (popup->size_window && GTK_WIDGET_REALIZED (popup->size_window))
|
|
||||||
gdk_window_raise (popup->size_window->window);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
ensure_tick_windows (MetaResizePopup *popup)
|
|
||||||
{
|
|
||||||
int x, y;
|
|
||||||
int max_x, max_y;
|
|
||||||
|
|
||||||
if (popup->resize_gravity < 0)
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (popup->horizontal_tick_windows != NULL ||
|
|
||||||
popup->vertical_tick_windows != NULL)
|
|
||||||
return;
|
|
||||||
|
|
||||||
/* FIXME the current implementation sucks too much to enable. */
|
|
||||||
return;
|
|
||||||
|
|
||||||
max_x = gdk_screen_width ();
|
|
||||||
max_y = gdk_screen_height ();
|
|
||||||
|
|
||||||
if (popup->need_vertical_feedback)
|
|
||||||
{
|
|
||||||
y = popup->tick_origin_y;
|
|
||||||
|
|
||||||
switch (popup->resize_gravity)
|
|
||||||
{
|
|
||||||
case NorthEastGravity:
|
|
||||||
case EastGravity:
|
|
||||||
case SouthEastGravity:
|
|
||||||
/* Vertical tick column on the fixed East side */
|
|
||||||
x = popup->x + popup->width + popup->frame_right;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case NorthWestGravity:
|
|
||||||
case WestGravity:
|
|
||||||
case SouthWestGravity:
|
|
||||||
/* Vertical ticks on the fixed West side */
|
|
||||||
x = popup->x - TICK_LENGTH - popup->frame_left;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case NorthGravity:
|
|
||||||
case SouthGravity:
|
|
||||||
case CenterGravity:
|
|
||||||
/* Center the vertical ticks */
|
|
||||||
x = popup->x + (popup->width - TICK_LENGTH) / 2;
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
/* gcc warnings */
|
|
||||||
x = 0;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
switch (popup->resize_gravity)
|
|
||||||
{
|
|
||||||
case SouthGravity:
|
|
||||||
case SouthEastGravity:
|
|
||||||
case SouthWestGravity:
|
|
||||||
while (y > 0)
|
|
||||||
{
|
|
||||||
add_vertical_tick (popup, x, y);
|
|
||||||
y -= popup->height_inc;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
case NorthGravity:
|
|
||||||
case NorthEastGravity:
|
|
||||||
case NorthWestGravity:
|
|
||||||
while (y < max_y)
|
|
||||||
{
|
|
||||||
add_vertical_tick (popup, x, y);
|
|
||||||
y += popup->height_inc;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (popup->need_horizontal_feedback)
|
|
||||||
{
|
|
||||||
x = popup->tick_origin_x;
|
|
||||||
|
|
||||||
switch (popup->resize_gravity)
|
|
||||||
{
|
|
||||||
case SouthWestGravity:
|
|
||||||
case SouthGravity:
|
|
||||||
case SouthEastGravity:
|
|
||||||
/* Horizontal tick column on the fixed South side */
|
|
||||||
y = popup->y + popup->height + popup->frame_bottom;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case NorthWestGravity:
|
|
||||||
case NorthGravity:
|
|
||||||
case NorthEastGravity:
|
|
||||||
/* Horizontal ticks on the fixed North side */
|
|
||||||
y = popup->y - TICK_LENGTH - popup->frame_top;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case EastGravity:
|
|
||||||
case WestGravity:
|
|
||||||
case CenterGravity:
|
|
||||||
/* Center the horizontal ticks */
|
|
||||||
y = popup->y + (popup->height - TICK_LENGTH) / 2;
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
/* gcc warnings */
|
|
||||||
y = 0;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
switch (popup->resize_gravity)
|
|
||||||
{
|
|
||||||
case EastGravity:
|
|
||||||
case SouthEastGravity:
|
|
||||||
case NorthEastGravity:
|
|
||||||
while (x > 0)
|
|
||||||
{
|
|
||||||
add_horizontal_tick (popup, x, y);
|
|
||||||
x -= popup->width_inc;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
case WestGravity:
|
|
||||||
case SouthWestGravity:
|
|
||||||
case NorthWestGravity:
|
|
||||||
while (x < max_x)
|
|
||||||
{
|
|
||||||
add_horizontal_tick (popup, x, y);
|
|
||||||
x += popup->width_inc;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
update_tick_labels (MetaResizePopup *popup)
|
|
||||||
{
|
|
||||||
int x, y;
|
|
||||||
int left_edge, right_edge, top_edge, bottom_edge;
|
|
||||||
|
|
||||||
if (popup->resize_gravity < 0)
|
|
||||||
return;
|
|
||||||
|
|
||||||
left_edge = popup->x - popup->frame_left;
|
|
||||||
right_edge = popup->x + popup->width + popup->frame_right;
|
|
||||||
top_edge = popup->y - popup->frame_top;
|
|
||||||
bottom_edge = popup->y + popup->height + popup->frame_bottom;
|
|
||||||
|
|
||||||
if (popup->need_vertical_feedback)
|
|
||||||
{
|
|
||||||
int size_x, size_y;
|
|
||||||
double size_align;
|
|
||||||
|
|
||||||
switch (popup->resize_gravity)
|
|
||||||
{
|
|
||||||
case NorthEastGravity:
|
|
||||||
case EastGravity:
|
|
||||||
case SouthEastGravity:
|
|
||||||
x = popup->x + popup->width + popup->frame_right;
|
|
||||||
size_x = x + TICK_LENGTH;
|
|
||||||
size_align = 0.0;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case NorthWestGravity:
|
|
||||||
case WestGravity:
|
|
||||||
case SouthWestGravity:
|
|
||||||
x = popup->x - TICK_LENGTH - popup->frame_left;
|
|
||||||
size_x = x - TICK_LENGTH;
|
|
||||||
size_align = 1.0;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case NorthGravity:
|
|
||||||
case SouthGravity:
|
|
||||||
case CenterGravity:
|
|
||||||
x = popup->x + (popup->width - TICK_LENGTH) / 2;
|
|
||||||
size_x = x - TICK_LENGTH / 2 - 1;
|
|
||||||
size_align = 1.0;
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
/* gcc warnings */
|
|
||||||
x = 0;
|
|
||||||
size_x = 0;
|
|
||||||
size_align = 0.5;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
switch (popup->resize_gravity)
|
|
||||||
{
|
|
||||||
case SouthGravity:
|
|
||||||
case SouthEastGravity:
|
|
||||||
case SouthWestGravity:
|
|
||||||
size_y = top_edge;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case NorthGravity:
|
|
||||||
case NorthEastGravity:
|
|
||||||
case NorthWestGravity:
|
|
||||||
size_y = bottom_edge;
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
size_y = 0;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
place_vertical_size_window (popup, size_x, size_y, size_align);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (popup->need_horizontal_feedback)
|
|
||||||
{
|
|
||||||
int size_x, size_y;
|
|
||||||
double size_align;
|
|
||||||
|
|
||||||
switch (popup->resize_gravity)
|
|
||||||
{
|
|
||||||
case SouthWestGravity:
|
|
||||||
case SouthGravity:
|
|
||||||
case SouthEastGravity:
|
|
||||||
y = popup->y + popup->height + popup->frame_bottom;
|
|
||||||
size_y = y + TICK_LENGTH;
|
|
||||||
size_align = 0.0;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case NorthWestGravity:
|
|
||||||
case NorthGravity:
|
|
||||||
case NorthEastGravity:
|
|
||||||
y = popup->y - TICK_LENGTH - popup->frame_top;
|
|
||||||
size_y = y - TICK_LENGTH;
|
|
||||||
size_align = 1.0;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case EastGravity:
|
|
||||||
case WestGravity:
|
|
||||||
case CenterGravity:
|
|
||||||
y = popup->y + (popup->height - TICK_LENGTH) / 2;
|
|
||||||
size_y = y - TICK_LENGTH / 2 - 1;
|
|
||||||
size_align = 1.0;
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
/* gcc warnings */
|
|
||||||
y = 0;
|
|
||||||
size_y = 0;
|
|
||||||
size_align = 0.5;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
switch (popup->resize_gravity)
|
|
||||||
{
|
|
||||||
case WestGravity:
|
|
||||||
case NorthWestGravity:
|
|
||||||
case SouthWestGravity:
|
|
||||||
size_x = right_edge;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case EastGravity:
|
|
||||||
case NorthEastGravity:
|
|
||||||
case SouthEastGravity:
|
|
||||||
size_x = left_edge;
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
size_x = 0;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
place_horizontal_size_window (popup, size_x, size_y, size_align);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
get_tick_origin (int resize_gravity,
|
|
||||||
int x,
|
|
||||||
int y,
|
|
||||||
int width,
|
|
||||||
int height,
|
|
||||||
int min_width,
|
|
||||||
int min_height,
|
|
||||||
int frame_left,
|
|
||||||
int frame_right,
|
|
||||||
int frame_top,
|
|
||||||
int frame_bottom,
|
|
||||||
int *origin_x,
|
|
||||||
int *origin_y)
|
|
||||||
{
|
|
||||||
*origin_x = 0;
|
|
||||||
*origin_y = 0;
|
|
||||||
|
|
||||||
switch (resize_gravity)
|
|
||||||
{
|
|
||||||
/* If client is staying fixed on the east during resize, then we
|
|
||||||
* have to move the west edge. Which means ticks originate
|
|
||||||
* on the east.
|
|
||||||
*/
|
|
||||||
case NorthEastGravity:
|
|
||||||
case EastGravity:
|
|
||||||
case SouthEastGravity:
|
|
||||||
*origin_x = x + width - min_width - frame_right + TICK_WIDTH / 2;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case NorthWestGravity:
|
|
||||||
case WestGravity:
|
|
||||||
case SouthWestGravity:
|
|
||||||
*origin_x = x + min_width + frame_left - TICK_WIDTH / 2 - 1;
|
|
||||||
break;
|
|
||||||
|
|
||||||
/* centered horizontally */
|
|
||||||
case NorthGravity:
|
|
||||||
case SouthGravity:
|
|
||||||
case CenterGravity:
|
|
||||||
/* Not going to draw horizontal ticks */
|
|
||||||
*origin_x = 0;
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
switch (resize_gravity)
|
|
||||||
{
|
|
||||||
/* If client is staying fixed on the south during resize,
|
|
||||||
* we have to move the north edge, so ticks originate on the
|
|
||||||
* south.
|
|
||||||
*/
|
|
||||||
case SouthGravity:
|
|
||||||
case SouthEastGravity:
|
|
||||||
case SouthWestGravity:
|
|
||||||
*origin_y = y + height - frame_top - min_height + TICK_WIDTH / 2;
|
|
||||||
break;
|
|
||||||
|
|
||||||
/* staying fixed on the north */
|
|
||||||
case NorthGravity:
|
|
||||||
case NorthEastGravity:
|
|
||||||
case NorthWestGravity:
|
|
||||||
*origin_y = y + min_height + frame_bottom - TICK_WIDTH / 2 - 1;
|
|
||||||
break;
|
|
||||||
|
|
||||||
/* centered vertically */
|
|
||||||
case EastGravity:
|
|
||||||
case WestGravity:
|
|
||||||
case CenterGravity:
|
|
||||||
*origin_y = 0;
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -830,53 +188,11 @@ meta_ui_resize_popup_set (MetaResizePopup *popup,
|
|||||||
int frame_bottom)
|
int frame_bottom)
|
||||||
{
|
{
|
||||||
gboolean need_update_size;
|
gboolean need_update_size;
|
||||||
gboolean need_update_ticks;
|
|
||||||
gboolean need_update_tick_labels;
|
|
||||||
int tick_x, tick_y;
|
|
||||||
int display_w, display_h;
|
int display_w, display_h;
|
||||||
gboolean need_vertical, need_horizontal;
|
|
||||||
|
|
||||||
g_return_if_fail (popup != NULL);
|
g_return_if_fail (popup != NULL);
|
||||||
|
|
||||||
need_update_size = FALSE;
|
need_update_size = FALSE;
|
||||||
need_update_ticks = FALSE;
|
|
||||||
need_update_tick_labels = FALSE;
|
|
||||||
|
|
||||||
switch (popup->resize_gravity)
|
|
||||||
{
|
|
||||||
case SouthGravity:
|
|
||||||
case SouthEastGravity:
|
|
||||||
case SouthWestGravity:
|
|
||||||
case NorthGravity:
|
|
||||||
case NorthEastGravity:
|
|
||||||
case NorthWestGravity:
|
|
||||||
need_vertical = TRUE;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
need_vertical = FALSE;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (height_inc <= (TICK_WIDTH + 1))
|
|
||||||
need_vertical = FALSE;
|
|
||||||
|
|
||||||
switch (popup->resize_gravity)
|
|
||||||
{
|
|
||||||
case EastGravity:
|
|
||||||
case SouthEastGravity:
|
|
||||||
case NorthEastGravity:
|
|
||||||
case WestGravity:
|
|
||||||
case SouthWestGravity:
|
|
||||||
case NorthWestGravity:
|
|
||||||
need_horizontal = TRUE;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
need_horizontal = FALSE;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (popup->width_inc <= (TICK_WIDTH + 1))
|
|
||||||
need_horizontal = FALSE;
|
|
||||||
|
|
||||||
display_w = width - base_width;
|
display_w = width - base_width;
|
||||||
if (width_inc > 0)
|
if (width_inc > 0)
|
||||||
@ -894,33 +210,6 @@ meta_ui_resize_popup_set (MetaResizePopup *popup,
|
|||||||
display_h != popup->vertical_size)
|
display_h != popup->vertical_size)
|
||||||
need_update_size = TRUE;
|
need_update_size = TRUE;
|
||||||
|
|
||||||
get_tick_origin (resize_gravity, x, y, width, height,
|
|
||||||
min_width, min_height,
|
|
||||||
frame_left, frame_right,
|
|
||||||
frame_top, frame_bottom,
|
|
||||||
&tick_x, &tick_y);
|
|
||||||
|
|
||||||
if (popup->tick_origin_x != tick_x ||
|
|
||||||
popup->tick_origin_y != tick_y ||
|
|
||||||
popup->frame_left != frame_left ||
|
|
||||||
popup->frame_right != frame_right ||
|
|
||||||
popup->frame_top != frame_top ||
|
|
||||||
popup->frame_bottom != frame_bottom)
|
|
||||||
need_update_ticks = TRUE;
|
|
||||||
|
|
||||||
if (need_update_ticks ||
|
|
||||||
display_w != popup->horizontal_size ||
|
|
||||||
display_h != popup->vertical_size)
|
|
||||||
need_update_tick_labels = TRUE;
|
|
||||||
|
|
||||||
if (need_horizontal != popup->need_horizontal_feedback ||
|
|
||||||
need_vertical != popup->need_vertical_feedback)
|
|
||||||
{
|
|
||||||
need_update_size = TRUE;
|
|
||||||
need_update_ticks = TRUE;
|
|
||||||
need_update_tick_labels = TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
popup->resize_gravity = resize_gravity;
|
popup->resize_gravity = resize_gravity;
|
||||||
popup->x = x;
|
popup->x = x;
|
||||||
popup->y = y;
|
popup->y = y;
|
||||||
@ -930,28 +219,12 @@ meta_ui_resize_popup_set (MetaResizePopup *popup,
|
|||||||
popup->min_height = min_height;
|
popup->min_height = min_height;
|
||||||
popup->width_inc = width_inc;
|
popup->width_inc = width_inc;
|
||||||
popup->height_inc = height_inc;
|
popup->height_inc = height_inc;
|
||||||
popup->tick_origin_x = tick_x;
|
|
||||||
popup->tick_origin_y = tick_y;
|
|
||||||
popup->frame_left = frame_left;
|
popup->frame_left = frame_left;
|
||||||
popup->frame_right = frame_right;
|
popup->frame_right = frame_right;
|
||||||
popup->frame_top = frame_top;
|
popup->frame_top = frame_top;
|
||||||
popup->frame_bottom = frame_bottom;
|
popup->frame_bottom = frame_bottom;
|
||||||
popup->vertical_size = display_h;
|
popup->vertical_size = display_h;
|
||||||
popup->horizontal_size = display_w;
|
popup->horizontal_size = display_w;
|
||||||
popup->need_vertical_feedback = need_vertical;
|
|
||||||
popup->need_horizontal_feedback = need_horizontal;
|
|
||||||
|
|
||||||
if (need_update_tick_labels)
|
|
||||||
{
|
|
||||||
clear_tick_labels (popup);
|
|
||||||
update_tick_labels (popup);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (need_update_ticks)
|
|
||||||
{
|
|
||||||
clear_tick_windows (popup);
|
|
||||||
ensure_tick_windows (popup);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (need_update_size)
|
if (need_update_size)
|
||||||
{
|
{
|
||||||
@ -976,7 +249,6 @@ meta_ui_resize_popup_set_showing (MetaResizePopup *popup,
|
|||||||
if (popup->showing)
|
if (popup->showing)
|
||||||
{
|
{
|
||||||
ensure_size_window (popup);
|
ensure_size_window (popup);
|
||||||
ensure_tick_windows (popup);
|
|
||||||
update_size_window (popup);
|
update_size_window (popup);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -28,7 +28,8 @@
|
|||||||
#include <glib.h>
|
#include <glib.h>
|
||||||
#include <gdk-pixbuf/gdk-pixbuf.h>
|
#include <gdk-pixbuf/gdk-pixbuf.h>
|
||||||
|
|
||||||
MetaResizePopup* meta_ui_resize_popup_new (void);
|
MetaResizePopup* meta_ui_resize_popup_new (Display *display,
|
||||||
|
int screen_number);
|
||||||
void meta_ui_resize_popup_free (MetaResizePopup *popup);
|
void meta_ui_resize_popup_free (MetaResizePopup *popup);
|
||||||
void meta_ui_resize_popup_set (MetaResizePopup *popup,
|
void meta_ui_resize_popup_set (MetaResizePopup *popup,
|
||||||
int resize_gravity,
|
int resize_gravity,
|
||||||
|
|||||||
@ -6392,8 +6392,11 @@ meta_window_refresh_resize_popup (MetaWindow *window)
|
|||||||
|
|
||||||
if (window->display->grab_resize_popup == NULL)
|
if (window->display->grab_resize_popup == NULL)
|
||||||
{
|
{
|
||||||
/* FIXME only create it if width_inc > 1 or height_inc > 1 */
|
if (window->size_hints.width_inc > 1 ||
|
||||||
window->display->grab_resize_popup = meta_ui_resize_popup_new ();
|
window->size_hints.height_inc > 1)
|
||||||
|
window->display->grab_resize_popup =
|
||||||
|
meta_ui_resize_popup_new (window->display->xdisplay,
|
||||||
|
window->screen->number);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (window->display->grab_resize_popup != NULL)
|
if (window->display->grab_resize_popup != NULL)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user