* 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include "gtkcssstylepropertyprivate.h"
#include "gtkstylepropertiesprivate.h"
-typedef struct {
- GtkCssSection *section;
- const GValue *value;
- const GValue *computed;
-} GtkCssLookupValue;
-
-struct _GtkCssLookup {
- GtkBitmask *missing;
- GtkCssLookupValue values[1];
-};
-
GtkCssLookup *
-_gtk_css_lookup_new (void)
+_gtk_css_lookup_new (const GtkBitmask *relevant)
{
GtkCssLookup *lookup;
guint n = _gtk_css_style_property_get_n_properties ();
lookup = g_malloc0 (sizeof (GtkCssLookup) + sizeof (GtkCssLookupValue) * n);
- lookup->missing = _gtk_bitmask_new ();
- _gtk_bitmask_invert_range (lookup->missing, 0, n);
+
+ if (relevant)
+ {
+ lookup->missing = _gtk_bitmask_copy (relevant);
+ }
+ else
+ {
+ lookup->missing = _gtk_bitmask_new ();
+ lookup->missing = _gtk_bitmask_invert_range (lookup->missing, 0, n);
+ }
return lookup;
}
g_free (lookup);
}
-const GtkBitmask *
-_gtk_css_lookup_get_missing (const GtkCssLookup *lookup)
-{
- g_return_val_if_fail (lookup != NULL, NULL);
-
- return lookup->missing;
-}
-
gboolean
_gtk_css_lookup_is_missing (const GtkCssLookup *lookup,
guint id)
_gtk_css_lookup_set (GtkCssLookup *lookup,
guint id,
GtkCssSection *section,
- const GValue *value)
+ GtkCssValue *value)
{
g_return_if_fail (lookup != NULL);
g_return_if_fail (_gtk_bitmask_get (lookup->missing, id));
g_return_if_fail (value != NULL);
- _gtk_bitmask_set (lookup->missing, id, FALSE);
+ lookup->missing = _gtk_bitmask_set (lookup->missing, id, FALSE);
lookup->values[id].value = value;
lookup->values[id].section = section;
}
_gtk_css_lookup_set_computed (GtkCssLookup *lookup,
guint id,
GtkCssSection *section,
- const GValue *value)
+ GtkCssValue *value)
{
g_return_if_fail (lookup != NULL);
g_return_if_fail (_gtk_bitmask_get (lookup->missing, id));
g_return_if_fail (value != NULL);
- _gtk_bitmask_set (lookup->missing, id, FALSE);
+ lookup->missing = _gtk_bitmask_set (lookup->missing, id, FALSE);
lookup->values[id].computed = value;
lookup->values[id].section = section;
}
* an issue, go fix it.
**/
void
-_gtk_css_lookup_resolve (GtkCssLookup *lookup,
- GtkStyleContext *context,
- GtkCssComputedValues *values)
+_gtk_css_lookup_resolve (GtkCssLookup *lookup,
+ GtkStyleProviderPrivate *provider,
+ GtkCssComputedValues *values,
+ GtkCssComputedValues *parent_values)
{
guint i, n;
g_return_if_fail (lookup != NULL);
- g_return_if_fail (GTK_IS_STYLE_CONTEXT (context));
+ g_return_if_fail (GTK_IS_STYLE_PROVIDER_PRIVATE (provider));
g_return_if_fail (GTK_IS_CSS_COMPUTED_VALUES (values));
+ g_return_if_fail (parent_values == NULL || GTK_IS_CSS_COMPUTED_VALUES (parent_values));
n = _gtk_css_style_property_get_n_properties ();
_gtk_css_computed_values_set_value (values,
i,
lookup->values[i].computed,
+ 0,
lookup->values[i].section);
- else
+ else if (lookup->values[i].value ||
+ _gtk_bitmask_get (lookup->missing, i))
_gtk_css_computed_values_compute_value (values,
- context,
+ provider,
+ parent_values,
i,
lookup->values[i].value,
lookup->values[i].section);
+ /* else not a relevant property */
}
}