sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

fix shadowed variable (stupid -Wall should have that)

Browse source 
2002-01-28  Havoc Pennington  <hp@pobox.com>

	* src/theme.c (meta_texture_spec_render): fix shadowed variable
	(stupid -Wall should have that)

	* src/theme-viewer.c (main): implement a simple
	viewer for frame styles

	* src/theme.c (meta_frame_style_get_test): create partial
	frame style to test drawing
This commit is contained in:
Havoc Pennington 2002-01-28 07:30:44 +00:00 committed by Havoc Pennington
parent 838d999d86
commit f374f94644
4 changed files with 337 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
2002-01-28 Havoc Pennington <hp@pobox.com>
* src/theme.c (meta_texture_spec_render): fix shadowed variable
(stupid -Wall should have that)
* src/theme-viewer.c (main): implement a simple
viewer for frame styles
* src/theme.c (meta_frame_style_get_test): create partial
frame style to test drawing
2002-01-27 Havoc Pennington <hp@pobox.com>
* src/theme.c (meta_shape_spec_draw): implement

125
src/theme-viewer.c
View file

@ -26,15 +26,136 @@
#include <time.h>
static void run_position_expression_tests (void);
static void run_position_expression_timings (void);
static void run_position_expression_timings (void);
static int client_width = 200;
static int client_height = 200;
static void
set_widget_to_frame_size (MetaFrameStyle *style,
GtkWidget *widget)
{
int top_height, bottom_height, left_width, right_width;
meta_frame_layout_get_borders (style->layout,
widget,
15, /* FIXME */
0, /* FIXME */
&top_height,
&bottom_height,
&left_width,
&right_width);
gtk_widget_set_size_request (widget,
client_width + left_width + right_width,
client_height + top_height + bottom_height);
}
static gboolean
expose_handler (GtkWidget *widget,
GdkEventExpose *event,
gpointer data)
{
MetaFrameStyle *style;
MetaButtonState button_states[META_BUTTON_TYPE_LAST] =
{
META_BUTTON_STATE_NORMAL,
META_BUTTON_STATE_NORMAL,
META_BUTTON_STATE_NORMAL,
META_BUTTON_STATE_NORMAL
};
int top_height, bottom_height, left_width, right_width;
style = meta_frame_style_get_test ();
meta_frame_layout_get_borders (style->layout,
widget,
15, /* FIXME */
0, /* FIXME */
&top_height,
&bottom_height,
&left_width,
&right_width);
meta_frame_style_draw (style,
widget,
widget->window,
0, 0,
&event->area,
0, /* flags */
client_width, client_height,
NULL, /* FIXME */
15, /* FIXME */
button_states);
/* Draw the "client" */
gdk_draw_rectangle (widget->window,
widget->style->white_gc,
TRUE,
left_width, top_height,
client_width, client_height);
return TRUE;
}
int
main (int argc, char **argv)
{
GtkWidget *window;
GtkWidget *layout;
GtkWidget *sw;
GtkWidget *da;
GdkColor desktop_color;
bindtextdomain (GETTEXT_PACKAGE, METACITY_LOCALEDIR);
run_position_expression_tests ();
#if 0
run_position_expression_timings ();
#endif
gtk_init (&argc, &argv);
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_window_set_default_size (GTK_WINDOW (window), 270, 270);
sw = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
gtk_container_add (GTK_CONTAINER (window), sw);
layout = gtk_layout_new (NULL, NULL);
gtk_layout_set_size (GTK_LAYOUT (layout), 500, 500);
gtk_container_add (GTK_CONTAINER (sw), layout);
g_signal_connect (G_OBJECT (window), "destroy",
G_CALLBACK (gtk_main_quit), NULL);
desktop_color.red = 0x5144;
desktop_color.green = 0x75D6;
desktop_color.blue = 0xA699;
gtk_widget_modify_bg (layout, GTK_STATE_NORMAL, &desktop_color);
da = gtk_drawing_area_new ();
set_widget_to_frame_size (meta_frame_style_get_test (),
da);
g_signal_connect (G_OBJECT (da), "expose_event",
G_CALLBACK (expose_handler), NULL);
gtk_layout_put (GTK_LAYOUT (layout),
da,
5, 5);
gtk_widget_show_all (window);
gtk_main ();
return 0;
}

186
src/theme.c
View file

@ -1385,7 +1385,7 @@ meta_shape_spec_draw (const MetaShapeSpec *spec,
dash_list[0] = spec->data.line.dash_on_length;
dash_list[1] = spec->data.line.dash_off_length;
gdk_gc_set_dashes (gc, 0, dash_list, 2);
}
}
x1 = parse_x_position_unchecked (spec->data.line.x1,
x, width, height);
@ -1694,6 +1694,35 @@ meta_color_spec_free (MetaColorSpec *spec)
g_free (spec);
}
MetaColorSpec*
meta_color_spec_new_from_string (const char *str,
GError **err)
{
/* FIXME handle GTK colors, etc. */
MetaColorSpec *spec;
spec = meta_color_spec_new (META_COLOR_SPEC_BASIC);
gdk_color_parse (str, &spec->data.basic.color);
return spec;
}
MetaColorSpec*
meta_color_spec_new_gtk (MetaGtkColorComponent component,
GtkStateType state)
{
/* FIXME handle GTK colors, etc. */
MetaColorSpec *spec;
spec = meta_color_spec_new (META_COLOR_SPEC_GTK);
spec->data.gtk.component = component;
spec->data.gtk.state = state;
return spec;
}
void
meta_color_spec_render (MetaColorSpec *spec,
GtkWidget *widget,
@ -1712,18 +1741,30 @@ meta_color_spec_render (MetaColorSpec *spec,
case META_COLOR_SPEC_GTK:
switch (spec->data.gtk.component)
{
case GTK_RC_BG:
case META_GTK_COLOR_BG:
*color = widget->style->bg[spec->data.gtk.state];
break;
case GTK_RC_FG:
case META_GTK_COLOR_FG:
*color = widget->style->fg[spec->data.gtk.state];
break;
case GTK_RC_BASE:
case META_GTK_COLOR_BASE:
*color = widget->style->base[spec->data.gtk.state];
break;
case GTK_RC_TEXT:
case META_GTK_COLOR_TEXT:
*color = widget->style->text[spec->data.gtk.state];
break;
case META_GTK_COLOR_LIGHT:
*color = widget->style->light[spec->data.gtk.state];
break;
case META_GTK_COLOR_DARK:
*color = widget->style->dark[spec->data.gtk.state];
break;
case META_GTK_COLOR_MID:
*color = widget->style->mid[spec->data.gtk.state];
break;
case META_GTK_COLOR_TEXT_AA:
*color = widget->style->text_aa[spec->data.gtk.state];
break;
}
break;
@ -1911,6 +1952,8 @@ multiply_alpha (GdkPixbuf *pixbuf,
int rowstride;
int height;
int row;
g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
if (alpha == 255)
return pixbuf;
@ -2007,8 +2050,6 @@ meta_texture_spec_render (const MetaTextureSpec *spec,
case META_TEXTURE_GRADIENT:
{
GdkPixbuf *pixbuf;
g_return_val_if_fail (spec->data.gradient.gradient_spec != NULL,
NULL);
@ -2021,8 +2062,6 @@ meta_texture_spec_render (const MetaTextureSpec *spec,
case META_TEXTURE_IMAGE:
{
GdkPixbuf *pixbuf;
g_return_val_if_fail (spec->data.image.pixbuf != NULL,
NULL);
@ -2429,7 +2468,7 @@ meta_texture_spec_draw (const MetaTextureSpec *spec,
pixbuf = meta_texture_spec_render (spec, widget, mode, 255,
width, height);
if (pixbuf == NULL)
return;
@ -2634,6 +2673,8 @@ void
meta_frame_style_draw (MetaFrameStyle *style,
GtkWidget *widget,
GdkDrawable *drawable,
int x_offset,
int y_offset,
const GdkRectangle *clip,
MetaFrameFlags flags,
int client_width,
@ -2890,6 +2931,9 @@ meta_frame_style_draw (MetaFrameStyle *style,
rect.height = fgeom.height;
break;
}
rect.x += x_offset;
rect.y += y_offset;
if (clip == NULL)
combined_clip = rect;
@ -2944,6 +2988,9 @@ meta_frame_style_draw (MetaFrameStyle *style,
GdkRectangle combined_clip;
button_rect (i, &fgeom, &rect);
rect.x += x_offset;
rect.y += y_offset;
if (clip == NULL)
combined_clip = rect;
@ -2986,6 +3033,9 @@ meta_frame_style_draw (MetaFrameStyle *style,
GdkRectangle combined_clip;
button_rect (i, &fgeom, &rect);
rect.x += x_offset;
rect.y += y_offset;
if (clip == NULL)
combined_clip = rect;
@ -3133,3 +3183,119 @@ meta_theme_free (MetaTheme *theme)
g_free (theme);
}
static MetaShapeSpec*
line_spec (MetaGtkColorComponent component,
const char *x1,
const char *y1,
const char *x2,
const char *y2)
{
MetaShapeSpec *shape;
shape = meta_shape_spec_new (META_SHAPE_LINE);
shape->data.line.color_spec =
meta_color_spec_new_gtk (component, GTK_STATE_NORMAL);
shape->data.line.x1 = g_strdup (x1);
shape->data.line.x2 = g_strdup (x2);
shape->data.line.y1 = g_strdup (y1);
shape->data.line.y2 = g_strdup (y2);
shape->data.line.dash_on_length = 0;
shape->data.line.dash_off_length = 0;
shape->data.line.width = 0;
return shape;
}
#define DEFAULT_INNER_BUTTON_BORDER 3
MetaFrameStyle*
meta_frame_style_get_test (void)
{
static MetaFrameStyle *style = NULL;
static GtkBorder default_title_border = { 3, 4, 4, 3 };
static GtkBorder default_text_border = { 2, 2, 2, 2 };
static GtkBorder default_button_border = { 0, 0, 1, 1 };
static GtkBorder default_inner_button_border = {
DEFAULT_INNER_BUTTON_BORDER,
DEFAULT_INNER_BUTTON_BORDER,
DEFAULT_INNER_BUTTON_BORDER,
DEFAULT_INNER_BUTTON_BORDER
};
MetaTextureSpec *texture;
MetaShapeSpec *shape;
MetaGradientSpec *gradient;
if (style)
return style;
style = meta_frame_style_new (NULL);
style->layout = meta_frame_layout_new ();
style->layout->title_border = default_title_border;
style->layout->text_border = default_text_border;
style->layout->button_border = default_button_border;
style->layout->inner_button_border = default_inner_button_border;
style->layout->left_width = 6;
style->layout->right_width = 6;
style->layout->bottom_height = 7;
style->layout->spacer_padding = 3;
style->layout->spacer_width = 2;
style->layout->spacer_height = 11;
style->layout->right_inset = 6;
style->layout->left_inset = 6;
style->layout->button_width = 17;
style->layout->button_height = 17;
texture = meta_texture_spec_new (META_TEXTURE_GRADIENT);
style->pieces[META_FRAME_PIECE_ENTIRE_BACKGROUND] = texture;
gradient = meta_gradient_spec_new (META_GRADIENT_VERTICAL);
texture->data.gradient.gradient_spec = gradient;
gradient->color_specs =
g_slist_prepend (gradient->color_specs,
meta_color_spec_new_gtk (META_GTK_COLOR_BG,
GTK_STATE_NORMAL));
gradient->color_specs =
g_slist_prepend (gradient->color_specs,
meta_color_spec_new_gtk (META_GTK_COLOR_BG,
GTK_STATE_SELECTED));
texture = meta_texture_spec_new (META_TEXTURE_SHAPE_LIST);
style->pieces[META_FRAME_PIECE_OVERLAY] = texture;
texture->data.shape_list.shape_specs = g_new (MetaShapeSpec*, 5);
texture->data.shape_list.n_specs = 5;
shape = meta_shape_spec_new (META_SHAPE_RECTANGLE);
shape->data.rectangle.color_spec =
meta_color_spec_new_from_string ("#000000", NULL);
shape->data.rectangle.filled = FALSE;
shape->data.rectangle.x = g_strdup ("0");
shape->data.rectangle.y = g_strdup ("0");
shape->data.rectangle.width = g_strdup ("width - 1");
shape->data.rectangle.height = g_strdup ("height - 1");
texture->data.shape_list.shape_specs[0] = shape;
texture->data.shape_list.shape_specs[1] =
line_spec (META_GTK_COLOR_LIGHT,
"1", "1", "1", "height - 2");
texture->data.shape_list.shape_specs[2] =
line_spec (META_GTK_COLOR_LIGHT,
"1", "1", "width - 2", "1");
texture->data.shape_list.shape_specs[3] =
line_spec (META_GTK_COLOR_DARK,
"width - 2", "1", "width - 2", "height - 2");
texture->data.shape_list.shape_specs[4] =
line_spec (META_GTK_COLOR_DARK,
"1", "height - 2", "width - 2", "height - 2");
return style;
}

33
src/theme.h
View file

@ -115,6 +115,18 @@ typedef enum
META_COLOR_SPEC_BLEND
} MetaColorSpecType;
typedef enum
{
META_GTK_COLOR_FG,
META_GTK_COLOR_BG,
META_GTK_COLOR_LIGHT,
META_GTK_COLOR_DARK,
META_GTK_COLOR_MID,
META_GTK_COLOR_TEXT,
META_GTK_COLOR_BASE,
META_GTK_COLOR_TEXT_AA
} MetaGtkColorComponent;
struct _MetaColorSpec
{
MetaColorSpecType type;
@ -124,7 +136,7 @@ struct _MetaColorSpec
GdkColor color;
} basic;
struct {
GtkRcFlags component;
MetaGtkColorComponent component;
GtkStateType state;
} gtk;
struct {
@ -481,11 +493,16 @@ gboolean meta_parse_size_expression (const char *expr,
GError **err);
MetaColorSpec* meta_color_spec_new (MetaColorSpecType type);
void meta_color_spec_free (MetaColorSpec *spec);
void meta_color_spec_render (MetaColorSpec *spec,
GtkWidget *widget,
GdkColor *color);
MetaColorSpec* meta_color_spec_new (MetaColorSpecType type);
MetaColorSpec* meta_color_spec_new_from_string (const char *str,
GError **err);
MetaColorSpec* meta_color_spec_new_gtk (MetaGtkColorComponent component,
GtkStateType state);
void meta_color_spec_free (MetaColorSpec *spec);
void meta_color_spec_render (MetaColorSpec *spec,
GtkWidget *widget,
GdkColor *color);
MetaShapeSpec* meta_shape_spec_new (MetaShapeType type);
void meta_shape_spec_free (MetaShapeSpec *spec);
@ -539,6 +556,8 @@ void meta_frame_style_unref (MetaFrameStyle *style);
void meta_frame_style_draw (MetaFrameStyle *style,
GtkWidget *widget,
GdkDrawable *drawable,
int x_offset,
int y_offset,
const GdkRectangle *clip,
MetaFrameFlags flags,
int client_width,
@ -554,4 +573,6 @@ void meta_frame_style_set_unref (MetaFrameStyleSet *style_set);
MetaTheme* meta_theme_new (void);
void meta_theme_free (MetaTheme *theme);
MetaFrameStyle* meta_frame_style_get_test (void);
#endif