# HG changeset patch # User IBBoard # Date 1460231407 -3600 # Node ID 4940e3f37640389979563c7dfa5e9fa5b824e8ef # Parent a48477723cfe9e11a6cd0d5882b3022fd756ee97 Remove some unused files diff -r a48477723cfe -r 4940e3f37640 Makefile.am --- a/Makefile.am Sat Apr 09 20:21:23 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,17 +0,0 @@ -SUBDIRS = metacity-1 gtk-3.0 - -if GTK2_ENGINE -SUBDIRS += gtk-2.0 -endif - -THEME_NAME=Adwaita -THEME_IN_FILES=index.theme.in - -%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache - -themedir = $(datadir)/themes/$(THEME_NAME) - -theme_DATA = index.theme - -DISTCLEANFILES = index.theme -EXTRA_DIST = index.theme.in index.theme diff -r a48477723cfe -r 4940e3f37640 gtk-2.0/Makefile.am --- a/gtk-2.0/Makefile.am Sat Apr 09 20:21:23 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,161 +0,0 @@ -enginedir = $(libdir)/gtk-2.0/$(GTK2_VERSION)/engines -engine_LTLIBRARIES = libadwaita.la - -libadwaita_la_CFLAGS = $(GTK2_ENGINE_CFLAGS) -libadwaita_la_SOURCES = adwaita_engine.c -libadwaita_la_LDFLAGS = -module -avoid-version -no-undefined -libadwaita_la_LIBADD = $(GTK2_ENGINE_LIBS) - -themedir = $(datadir)/themes/Adwaita/gtk-2.0 -theme_DATA = gtkrc - -asset_dirs = "Arrows" "Buttons" "Check-Radio" "Entry" "Expanders" \ - "Handles" "Lines" "Menu-Menubar" "Others" "ProgressBar" \ - "Range" "Scrollbars" "Shadows" "Spin" "Tabs" "Toolbar" -asset_data = \ - Arrows/arrow-down.png \ - Arrows/arrow-down-insens.png \ - Arrows/arrow-down-prelight.png \ - Arrows/arrow-down-small.png \ - Arrows/arrow-down-small-insens.png \ - Arrows/arrow-down-small-prelight.png \ - Arrows/arrow-left.png \ - Arrows/arrow-left-insens.png \ - Arrows/arrow-left-prelight.png \ - Arrows/arrow-right.png \ - Arrows/arrow-right-insens.png \ - Arrows/arrow-right-prelight.png \ - Arrows/arrow-up.png \ - Arrows/arrow-up-insens.png \ - Arrows/arrow-up-prelight.png \ - Arrows/arrow-up-small.png \ - Arrows/arrow-up-small-insens.png \ - Arrows/arrow-up-small-prelight.png \ - Arrows/menu-arrow.png \ - Arrows/menu-arrow-prelight.png \ - Buttons/button-default.png \ - Buttons/button-insensitive.png \ - Buttons/button-prelight.png \ - Buttons/button-pressed.png \ - Buttons/button-default-nohilight.png \ - Buttons/button-insensitive-nohilight.png \ - Buttons/button-prelight-nohilight.png \ - Buttons/button-pressed-nohilight.png \ - Check-Radio/checkbox-checked.png \ - Check-Radio/checkbox-unchecked.png \ - Check-Radio/checkbox-checked-insensitive.png \ - Check-Radio/checkbox-unchecked-insensitive.png \ - Check-Radio/menucheck.png \ - Check-Radio/menucheck_prelight.png \ - Check-Radio/menuoption.png \ - Check-Radio/menuoption_prelight.png \ - Check-Radio/option-checked.png \ - Check-Radio/option-unchecked.png \ - Check-Radio/option-checked-insensitive.png \ - Check-Radio/option-unchecked-insensitive.png \ - Entry/combo-entry-border-bg.png \ - Entry/combo-entry-border-rtl-bg.png \ - Entry/combo-entry-border-active-bg.png \ - Entry/combo-entry-border-active-rtl-bg.png \ - Entry/combo-entry-border-disabled-bg.png \ - Entry/combo-entry-border-disabled-rtl-bg.png \ - Entry/combo-entry-border-notebook.png \ - Entry/combo-entry-border-rtl-notebook.png \ - Entry/combo-entry-border-active-notebook.png \ - Entry/combo-entry-border-active-rtl-notebook.png \ - Entry/combo-entry-border-disabled-notebook.png \ - Entry/combo-entry-border-disabled-rtl-notebook.png \ - Entry/combo-entry-button.png \ - Entry/combo-entry-button-rtl.png \ - Entry/combo-entry-button-active.png \ - Entry/combo-entry-button-active-rtl.png \ - Entry/combo-entry-button-disabled.png \ - Entry/combo-entry-button-disabled-rtl.png \ - Entry/entry-border-fill.png \ - Entry/entry-border-fill-plain.png \ - Entry/entry-border-fill-solid.png \ - Entry/entry-border-bg.png \ - Entry/entry-border-active-bg.png \ - Entry/entry-border-bg-solid.png \ - Entry/entry-border-active-bg-solid.png \ - Entry/entry-border-disabled-bg.png \ - Entry/entry-border-notebook.png \ - Entry/entry-border-active-notebook.png \ - Entry/entry-border-disabled-notebook.png \ - Entry/entry-border-bg-solid-spin.png \ - Entry/entry-border-active-bg-solid-spin.png \ - Entry/notebook-entry-border-active-bg.png \ - Entry/notebook-entry-border-bg.png \ - Entry/notebook-entry-border-disabled-bg.png \ - Expanders/minus.png \ - Expanders/plus.png \ - Handles/handle-h.png \ - Handles/handle-v.png \ - Lines/line-h.png \ - Lines/line-v.png \ - Lines/menu_line_h.png \ - Menu-Menubar/menubar_button.png \ - Menu-Menubar/menubar.png \ - Others/focus.png \ - Others/null.png \ - Others/tree_header.png \ - ProgressBar/progressbar.png \ - ProgressBar/progressbar_v.png \ - ProgressBar/trough-progressbar.png \ - ProgressBar/trough-progressbar_v.png \ - Range/slider-horiz.png \ - Range/slider-horiz-prelight.png \ - Range/slider-vert.png \ - Range/slider-vert-prelight.png \ - Range/trough-horizontal.png \ - Range/trough-vertical.png \ - Scrollbars/slider-horiz-active.png \ - Scrollbars/slider-horiz.png \ - Scrollbars/slider-vert-active.png \ - Scrollbars/slider-vert.png \ - Scrollbars/slider-horiz-insens.png \ - Scrollbars/slider-horiz-prelight.png \ - Scrollbars/slider-vert-insens.png \ - Scrollbars/slider-vert-prelight.png \ - Scrollbars/trough-scrollbar-horiz.png \ - Scrollbars/trough-scrollbar-vert.png \ - Shadows/frame.png \ - Shadows/frame-gap-start.png \ - Shadows/frame-gap-end.png \ - Spin/down-background.png \ - Spin/up-background.png \ - Spin/down-background-disable.png \ - Spin/up-background-disable.png \ - Spin/down-background-rtl.png \ - Spin/up-background-rtl.png \ - Spin/down-background-disable-rtl.png \ - Spin/up-background-disable-rtl.png \ - Tabs/notebook-gap-horiz.png \ - Tabs/notebook-gap-vert.png \ - Tabs/notebook.png \ - Tabs/tab-bottom.png \ - Tabs/tab-left.png \ - Tabs/tab-right.png \ - Tabs/tab-top.png \ - Tabs/tab-bottom-active.png \ - Tabs/tab-left-active.png \ - Tabs/tab-right-active.png \ - Tabs/tab-top-active.png \ - Toolbar/inline-toolbar.png - -install-data-local: - for dir in $(asset_dirs); do \ - for file in `cd $(srcdir)/$$dir && find . -maxdepth 1 \( -name "*.png" \)`; do \ - $(mkdir_p) $(DESTDIR)$(datadir)/themes/Adwaita/gtk-2.0/$$dir; \ - $(install_sh_DATA) $(srcdir)/$$dir/$$file $(DESTDIR)$(themedir)/$$dir/$$file; \ - done; \ - done - -uninstall-local: - for dir in $(asset_dirs); do \ - for file in `cd $(srcdir)/$$dir && find . -maxdepth 1 \( -name "*.png" \)`; do \ - rm -f $(DESTDIR)$(datadir)/themes/Adwaita/gtk-2.0/$$dir/$$file; \ - done; \ - done - -EXTRA_DIST = $(theme_DATA) $(asset_data) diff -r a48477723cfe -r 4940e3f37640 gtk-2.0/adwaita_engine.c --- a/gtk-2.0/adwaita_engine.c Sat Apr 09 20:21:23 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,265 +0,0 @@ -/* Adwaita - a GTK+ engine - * - * Copyright (C) 2012 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * Authors: Cosimo Cecchi - */ - -#include -#include -#include - -#ifdef GDK_WINDOWING_X11 -#include -#endif - -/***************************************/ -/* Register & Initialize Drawing Style */ -/***************************************/ -#define ADWAITA_TYPE_STYLE (adwaita_style_get_type ()) -#define ADWAITA_STYLE(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), ADWAITA_TYPE_STYLE, AdwaitaStyle)) -#define ADWAITA_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADWAITA_TYPE_STYLE, AdwaitaStyleClass)) -#define ADWAITA_IS_STYLE(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), ADWAITA_TYPE_STYLE)) -#define ADWAITA_IS_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADWAITA_TYPE_STYLE)) -#define ADWAITA_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADWAITA_TYPE_STYLE, AdwaitaStyleClass)) - -typedef struct -{ - GtkStyle parent_instance; -} AdwaitaStyle; - -typedef struct -{ - GtkStyleClass parent_class; -} AdwaitaStyleClass; - -G_DEFINE_DYNAMIC_TYPE (AdwaitaStyle, adwaita_style, GTK_TYPE_STYLE) - -static void -do_toplevel_hack (GtkWidget *widget, - const gchar *widget_name) -{ - gboolean tried_hack; - - tried_hack = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget), "adwaita-toplevel-hack")); - - if (!tried_hack) - { - g_object_set_data (G_OBJECT (widget), - "adwaita-toplevel-hack", GINT_TO_POINTER (1)); - gtk_widget_set_name (widget, widget_name); - } -} - -static gboolean -wm_is_fallback (void) -{ -#ifdef GDK_WINDOWING_X11 - const gchar *name; - name = gdk_x11_screen_get_window_manager_name (gdk_screen_get_default ()); - return g_strcmp0 (name, "GNOME Shell") != 0; -#else - return TRUE; -#endif -} - -static cairo_t * -drawable_to_cairo (GdkDrawable *window, - GdkRectangle *area) -{ - cairo_t *cr; - - g_return_val_if_fail (window != NULL, NULL); - - cr = (cairo_t*) gdk_cairo_create (window); - cairo_set_line_width (cr, 1.0); - cairo_set_line_cap (cr, CAIRO_LINE_CAP_SQUARE); - cairo_set_line_join (cr, CAIRO_LINE_JOIN_MITER); - - if (area) - { - cairo_rectangle (cr, area->x, area->y, area->width, area->height); - cairo_clip_preserve (cr); - cairo_new_path (cr); - } - - return cr; -} - -static void -adwaita_draw_box (GtkStyle * style, - GdkWindow * window, - GtkStateType state_type, - GtkShadowType shadow_type, - GdkRectangle * area, - GtkWidget * widget, - const gchar * detail, - gint x, - gint y, - gint width, - gint height) -{ - if (GTK_IS_MENU (widget) && - g_strcmp0 (detail, "menu") == 0 && - wm_is_fallback ()) - { - cairo_t *cr = drawable_to_cairo (window, area); - cairo_pattern_t *pattern = cairo_pattern_create_linear (x, y, x, y + height); - gdouble stop_1, stop_2, stop_3; - - stop_1 = MIN (1.0, 6.0 / (gdouble) height); - stop_2 = MAX (stop_1, 0.33); - stop_3 = MAX (stop_2, 0.66); - - cairo_pattern_add_color_stop_rgba (pattern, 0.0, 0.66, 0.66, 0.66, 0.0); - cairo_pattern_add_color_stop_rgba (pattern, stop_1, 0.66, 0.66, 0.66, 0.25); - cairo_pattern_add_color_stop_rgba (pattern, stop_2, 0.66, 0.66, 0.66, 0.80); - cairo_pattern_add_color_stop_rgba (pattern, stop_3, 0.66, 0.66, 0.66, 1.0); - cairo_pattern_add_color_stop_rgba (pattern, 1.0, 0.66, 0.66, 0.66, 1.0); - cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT); - - cairo_set_source (cr, pattern); - cairo_rectangle (cr, x, y, width, height); - cairo_stroke (cr); - - cairo_destroy (cr); - cairo_pattern_destroy (pattern); - } - else - { - GTK_STYLE_CLASS (adwaita_style_parent_class)->draw_box (style, window, state_type, shadow_type, - area, widget, detail, - x, y, width, height); - } -} - -void -adwaita_draw_flat_box (GtkStyle *style, - GdkWindow *window, - GtkStateType state_type, - GtkShadowType shadow_type, - GdkRectangle *area, - GtkWidget *widget, - const gchar *detail, - gint x, - gint y, - gint width, - gint height) -{ - const gchar *app_name; - - GTK_STYLE_CLASS (adwaita_style_parent_class)->draw_flat_box (style, window, state_type, shadow_type, - area, widget, detail, - x, y, width, height); - - /* HACK: this is totally awful, but I don't see a better way to "tag" the OO.o hierarchy */ - if (!GTK_IS_WINDOW (widget) || - (gtk_window_get_window_type (GTK_WINDOW (widget)) != GTK_WINDOW_TOPLEVEL)) - return; - - app_name = g_get_application_name (); - if (g_str_has_prefix (app_name, "OpenOffice.org")) - do_toplevel_hack (widget, "openoffice-toplevel"); - else if (g_str_has_prefix (app_name, "LibreOffice")) - do_toplevel_hack (widget, "libreoffice-toplevel"); -} - -static void -adwaita_style_init (AdwaitaStyle *style) -{ -} - -static void -adwaita_style_class_init (AdwaitaStyleClass * klass) -{ - GtkStyleClass *style_class = GTK_STYLE_CLASS (klass); - - style_class->draw_box = adwaita_draw_box; - style_class->draw_flat_box = adwaita_draw_flat_box; -} - -static void -adwaita_style_class_finalize (AdwaitaStyleClass * klass) -{ -} - -/**********************************/ -/* Register & Initialize RC Style */ -/**********************************/ -#define ADWAITA_TYPE_RC_STYLE (adwaita_rc_style_get_type ()) -#define ADWAITA_RC_STYLE(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), ADWAITA_TYPE_RC_STYLE, AdwaitaRcStyle)) -#define ADWAITA_RC_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADWAITA_TYPE_RC_STYLE, AdwaitaRcStyleClass)) -#define ADWAITA_IS_RC_STYLE(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), ADWAITA_TYPE_RC_STYLE)) -#define ADWAITA_IS_RC_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADWAITA_TYPE_RC_STYLE)) -#define ADWAITA_RC_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADWAITA_TYPE_RC_STYLE, AdwaitaRcStyleClass)) - -typedef struct -{ - GtkRcStyle parent_instance; -} AdwaitaRcStyle; - -typedef struct -{ - GtkRcStyleClass parent_class; -} AdwaitaRcStyleClass; - -G_DEFINE_DYNAMIC_TYPE (AdwaitaRcStyle, adwaita_rc_style, GTK_TYPE_RC_STYLE) - -static GtkStyle * -adwaita_rc_style_create_style (GtkRcStyle *rc_style) -{ - return g_object_new (ADWAITA_TYPE_STYLE, NULL); -} - -static void -adwaita_rc_style_init (AdwaitaRcStyle *rc_style) -{ -} - -static void -adwaita_rc_style_class_init (AdwaitaRcStyleClass * klass) -{ - GtkRcStyleClass *rc_class = GTK_RC_STYLE_CLASS (klass); - - rc_class->create_style = adwaita_rc_style_create_style; -} - -static void -adwaita_rc_style_class_finalize (AdwaitaRcStyleClass * klass) -{ -} - -/**************** - * Engine Hooks * - ****************/ -void -theme_init (GTypeModule * module) -{ - adwaita_rc_style_register_type (module); - adwaita_style_register_type (module); -} - -void -theme_exit (void) -{ -} - -GtkRcStyle * -theme_create_rc_style (void) -{ - return g_object_new (ADWAITA_TYPE_RC_STYLE, NULL); -} diff -r a48477723cfe -r 4940e3f37640 index.theme.in --- a/index.theme.in Sat Apr 09 20:21:23 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ -[X-GNOME-Metatheme] -_Name=Adwaita -Type=X-GNOME-Metatheme -_Comment=There is only one -Encoding=UTF-8 -GtkTheme=Adwaita -MetacityTheme=Adwaita -IconTheme=Adwaita -CursorTheme=Adwaita -CursorSize=24 diff -r a48477723cfe -r 4940e3f37640 metacity-1/Makefile.am --- a/metacity-1/Makefile.am Sat Apr 09 20:21:23 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -themedir = $(datadir)/themes/Adwaita/metacity-1 -theme_DATA = metacity-theme-3.xml - -EXTRA_DIST = $(theme_DATA)