Make dimension values and calc values just number values

1 files changed, 0 insertions, 376 deletions

diff --git a/gtk/gtkcssdimensionvalue.c b/gtk/gtkcssdimensionvalue.c
index 10effe22d7..385661b029 100644
--- a/gtk/gtkcssdimensionvalue.c
+++ b/gtk/gtkcssdimensionvalue.c
@@ -19,370 +19,6 @@
 
 #include "gtkcssdimensionvalueprivate.h"
 
-#include "gtkcssenumvalueprivate.h"
-#include "gtkstylepropertyprivate.h"
-
-#include "fallback-c89.c"
-
-struct _GtkCssValue {
-  GTK_CSS_VALUE_BASE
-  GtkCssUnit unit;
-  double value;
-};
-
-static void
-gtk_css_value_dimension_free (GtkCssValue *value)
-{
-  g_slice_free (GtkCssValue, value);
-}
-
-static double
-get_base_font_size_px (guint             property_id,
-                       GtkStyleProvider *provider,
-                       GtkCssStyle      *style,
-                       GtkCssStyle      *parent_style)
-{
-  if (property_id == GTK_CSS_PROPERTY_FONT_SIZE)
-    {
-      if (parent_style)
-        return _gtk_css_number_value_get (parent_style->core->font_size, 100);
-      else
-        return gtk_css_font_size_get_default_px (provider, style);
-    }
-
-  return _gtk_css_number_value_get (style->core->font_size, 100);
-}
-
-static double
-get_dpi (GtkCssStyle *style)
-{
-  return _gtk_css_number_value_get (style->core->dpi, 96);
-}
-
-static GtkCssValue *
-gtk_css_value_dimension_compute (GtkCssValue      *number,
-                                 guint             property_id,
-                                 GtkStyleProvider *provider,
-                                 GtkCssStyle      *style,
-                                 GtkCssStyle      *parent_style)
-{
-  switch (number->unit)
-    {
-    case GTK_CSS_PERCENT:
-      /* percentages for font sizes are computed, other percentages aren't */
-      if (property_id == GTK_CSS_PROPERTY_FONT_SIZE)
-        return gtk_css_dimension_value_new (number->value / 100.0 * 
-                                            get_base_font_size_px (property_id, provider, style, parent_style),
-                                            GTK_CSS_PX);
-      G_GNUC_FALLTHROUGH;
-    case GTK_CSS_NUMBER:
-    case GTK_CSS_PX:
-    case GTK_CSS_DEG:
-    case GTK_CSS_S:
-      return _gtk_css_value_ref (number);
-    case GTK_CSS_PT:
-      return gtk_css_dimension_value_new (number->value * get_dpi (style) / 72.0,
-                                          GTK_CSS_PX);
-    case GTK_CSS_PC:
-      return gtk_css_dimension_value_new (number->value * get_dpi (style) / 72.0 * 12.0,
-                                          GTK_CSS_PX);
-    case GTK_CSS_IN:
-      return gtk_css_dimension_value_new (number->value * get_dpi (style),
-                                          GTK_CSS_PX);
-    case GTK_CSS_CM:
-      return gtk_css_dimension_value_new (number->value * get_dpi (style) * 0.39370078740157477,
-                                          GTK_CSS_PX);
-    case GTK_CSS_MM:
-      return gtk_css_dimension_value_new (number->value * get_dpi (style) * 0.039370078740157477,
-                                          GTK_CSS_PX);
-    case GTK_CSS_EM:
-      return gtk_css_dimension_value_new (number->value *
-                                          get_base_font_size_px (property_id, provider, style, parent_style),
-                                          GTK_CSS_PX);
-    case GTK_CSS_EX:
-      /* for now we pretend ex is half of em */
-      return gtk_css_dimension_value_new (number->value * 0.5 *
-                                          get_base_font_size_px (property_id, provider, style, parent_style),
-                                          GTK_CSS_PX);
-    case GTK_CSS_REM:
-      return gtk_css_dimension_value_new (number->value *
-                                          gtk_css_font_size_get_default_px (provider, style),
-                                          GTK_CSS_PX);
-    case GTK_CSS_RAD:
-      return gtk_css_dimension_value_new (number->value * 360.0 / (2 * G_PI),
-                                          GTK_CSS_DEG);
-    case GTK_CSS_GRAD:
-      return gtk_css_dimension_value_new (number->value * 360.0 / 400.0,
-                                          GTK_CSS_DEG);
-    case GTK_CSS_TURN:
-      return gtk_css_dimension_value_new (number->value * 360.0,
-                                          GTK_CSS_DEG);
-    case GTK_CSS_MS:
-      return gtk_css_dimension_value_new (number->value / 1000.0,
-                                          GTK_CSS_S);
-    default:
-      g_assert_not_reached();
-    }
-}
-
-static gboolean
-gtk_css_value_dimension_equal (const GtkCssValue *number1,
-                            const GtkCssValue *number2)
-{
-  return number1->unit == number2->unit &&
-         number1->value == number2->value;
-}
-
-static void
-gtk_css_value_dimension_print (const GtkCssValue *number,
-                            GString           *string)
-{
-  char buf[G_ASCII_DTOSTR_BUF_SIZE];
-
-  const char *names[] = {
-    /* [GTK_CSS_NUMBER] = */ "",
-    /* [GTK_CSS_PERCENT] = */ "%",
-    /* [GTK_CSS_PX] = */ "px",
-    /* [GTK_CSS_PT] = */ "pt",
-    /* [GTK_CSS_EM] = */ "em",
-    /* [GTK_CSS_EX] = */ "ex",
-    /* [GTK_CSS_REM] = */ "rem",
-    /* [GTK_CSS_PC] = */ "pc",
-    /* [GTK_CSS_IN] = */ "in",
-    /* [GTK_CSS_CM] = */ "cm",
-    /* [GTK_CSS_MM] = */ "mm",
-    /* [GTK_CSS_RAD] = */ "rad",
-    /* [GTK_CSS_DEG] = */ "deg",
-    /* [GTK_CSS_GRAD] = */ "grad",
-    /* [GTK_CSS_TURN] = */ "turn",
-    /* [GTK_CSS_S] = */ "s",
-    /* [GTK_CSS_MS] = */ "ms",
-  };
-
-  if (isinf (number->value))
-    g_string_append (string, "infinite");
-  else
-    {
-      g_ascii_dtostr (buf, sizeof (buf), number->value);
-      g_string_append (string, buf);
-      if (number->value != 0.0)
-        g_string_append (string, names[number->unit]);
-    }
-}
-
-static double
-gtk_css_value_dimension_get (const GtkCssValue *value,
-                             double             one_hundred_percent)
-{
-  if (value->unit == GTK_CSS_PERCENT)
-    return value->value * one_hundred_percent / 100;
-  else
-    return value->value;
-}
-
-static GtkCssDimension
-gtk_css_value_dimension_get_dimension (const GtkCssValue *value)
-{
-  return gtk_css_unit_get_dimension (value->unit);
-}
-
-static gboolean
-gtk_css_value_dimension_has_percent (const GtkCssValue *value)
-{
-  return gtk_css_unit_get_dimension (value->unit) == GTK_CSS_DIMENSION_PERCENTAGE;
-}
-
-static GtkCssValue *
-gtk_css_value_dimension_multiply (GtkCssValue *value,
-                                  double       factor)
-{
-  return gtk_css_dimension_value_new (value->value * factor, value->unit);
-}
-
-static GtkCssValue *
-gtk_css_value_dimension_try_add (GtkCssValue *value1,
-                                 GtkCssValue *value2)
-{
-  if (value1->unit != value2->unit)
-    return NULL;
-
-  if (value1->value == 0)
-    return _gtk_css_value_ref (value2);
-
-  if (value2->value == 0)
-    return _gtk_css_value_ref (value1);
-
-  return gtk_css_dimension_value_new (value1->value + value2->value, value1->unit);
-}
-
-static gint
-gtk_css_value_dimension_get_calc_term_order (const GtkCssValue *value)
-{
-  /* note: the order is alphabetic */
-  guint order_per_unit[] = {
-    /* [GTK_CSS_NUMBER] = */ 0,
-    /* [GTK_CSS_PERCENT] = */ 16,
-    /* [GTK_CSS_PX] = */ 11,
-    /* [GTK_CSS_PT] = */ 10,
-    /* [GTK_CSS_EM] = */ 3,
-    /* [GTK_CSS_EX] = */ 4,
-    /* [GTK_CSS_REM] = */ 13,
-    /* [GTK_CSS_PC] = */ 9,
-    /* [GTK_CSS_IN] = */ 6,
-    /* [GTK_CSS_CM] = */ 1,
-    /* [GTK_CSS_MM] = */ 7,
-    /* [GTK_CSS_RAD] = */ 12,
-    /* [GTK_CSS_DEG] = */ 2,
-    /* [GTK_CSS_GRAD] = */ 5,
-    /* [GTK_CSS_TURN] = */ 15,
-    /* [GTK_CSS_S] = */ 14,
-    /* [GTK_CSS_MS] = */ 8
-  };
-
-  return 1000 + order_per_unit[value->unit];
-}
-
-static GtkCssValue *
-gtk_css_value_dimension_transition (GtkCssValue *start,
-                                    GtkCssValue *end,
-                                    guint        property_id,
-                                    double       progress)
-{
-  if (start->unit == end->unit)
-    return gtk_css_dimension_value_new (start->value + (end->value - start->value) * progress, start->unit);
-
-  return gtk_css_number_value_transition (start, end, property_id, progress);
-}
-
-static const GtkCssNumberValueClass GTK_CSS_VALUE_DIMENSION = {
-  {
-    "GtkCssDimensionValue",
-    gtk_css_value_dimension_free,
-    gtk_css_value_dimension_compute,
-    gtk_css_value_dimension_equal,
-    gtk_css_value_dimension_transition,
-    NULL,
-    NULL,
-    gtk_css_value_dimension_print
-  },
-  gtk_css_value_dimension_get,
-  gtk_css_value_dimension_get_dimension,
-  gtk_css_value_dimension_has_percent,
-  gtk_css_value_dimension_multiply,
-  gtk_css_value_dimension_try_add,
-  gtk_css_value_dimension_get_calc_term_order
-};
-
-GtkCssValue *
-gtk_css_dimension_value_new (double     value,
-                             GtkCssUnit unit)
-{
-  static GtkCssValue number_singletons[] = {
-    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, TRUE, GTK_CSS_NUMBER, 0 },
-    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, TRUE, GTK_CSS_NUMBER, 1 },
-    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, TRUE, GTK_CSS_NUMBER, 96 }, /* DPI default */
-  };
-  static GtkCssValue px_singletons[] = {
-    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, TRUE, GTK_CSS_PX, 0 },
-    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, TRUE, GTK_CSS_PX, 1 },
-    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, TRUE, GTK_CSS_PX, 2 },
-    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, TRUE, GTK_CSS_PX, 3 },
-    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, TRUE, GTK_CSS_PX, 4 },
-    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, TRUE, GTK_CSS_PX, 8 },
-    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, TRUE, GTK_CSS_PX, 16 }, /* Icon size default */
-    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, TRUE, GTK_CSS_PX, 32 },
-    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, TRUE, GTK_CSS_PX, 64 },
-  };
-  static GtkCssValue percent_singletons[] = {
-    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, TRUE, GTK_CSS_PERCENT, 0 },
-    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, FALSE, GTK_CSS_PERCENT, 50 },
-    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, FALSE, GTK_CSS_PERCENT, 100 },
-  };
-  static GtkCssValue second_singletons[] = {
-    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, TRUE, GTK_CSS_S, 0 },
-    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, TRUE, GTK_CSS_S, 1 },
-  };
-  static GtkCssValue deg_singletons[] = {
-    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, TRUE, GTK_CSS_DEG, 0   },
-    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, TRUE, GTK_CSS_DEG, 90  },
-    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, TRUE, GTK_CSS_DEG, 180 },
-    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, TRUE, GTK_CSS_DEG, 270 },
-  };
-  GtkCssValue *result;
-
-  switch ((guint)unit)
-    {
-    case GTK_CSS_NUMBER:
-      if (value == 0 || value == 1)
-        return _gtk_css_value_ref (&number_singletons[(int) value]);
-
-      if (value == 96)
-        return _gtk_css_value_ref (&number_singletons[2]);
-
-      break;
-
-    case GTK_CSS_PX:
-      if (value == 0 ||
-          value == 1 ||
-          value == 2 ||
-          value == 3 ||
-          value == 4)
-        return _gtk_css_value_ref (&px_singletons[(int) value]);
-      if (value == 8)
-        return _gtk_css_value_ref (&px_singletons[5]);
-      if (value == 16)
-        return _gtk_css_value_ref (&px_singletons[6]);
-      if (value == 32)
-        return _gtk_css_value_ref (&px_singletons[7]);
-      if (value == 64)
-        return _gtk_css_value_ref (&px_singletons[8]);
-
-      break;
-
-    case GTK_CSS_PERCENT:
-      if (value == 0)
-        return _gtk_css_value_ref (&percent_singletons[0]);
-      if (value == 50)
-        return _gtk_css_value_ref (&percent_singletons[1]);
-      if (value == 100)
-        return _gtk_css_value_ref (&percent_singletons[2]);
-
-      break;
-
-    case GTK_CSS_S:
-      if (value == 0 || value == 1)
-        return _gtk_css_value_ref (&second_singletons[(int)value]);
-
-      break;
-
-    case GTK_CSS_DEG:
-      if (value == 0)
-        return _gtk_css_value_ref (&deg_singletons[0]);
-      if (value == 90)
-        return _gtk_css_value_ref (&deg_singletons[1]);
-      if (value == 180)
-        return _gtk_css_value_ref (&deg_singletons[2]);
-      if (value == 270)
-        return _gtk_css_value_ref (&deg_singletons[3]);
-
-      break;
-
-    default:
-      ;
-    }
-
-  result = _gtk_css_value_new (GtkCssValue, &GTK_CSS_VALUE_DIMENSION.value_class);
-  result->unit = unit;
-  result->value = value;
-  result->is_computed = value == 0 ||
-                        unit == GTK_CSS_NUMBER ||
-                        unit == GTK_CSS_PX ||
-                        unit == GTK_CSS_DEG ||
-                        unit == GTK_CSS_S;
-
-  return result;
-}
-
 GtkCssValue *
 gtk_css_dimension_value_parse (GtkCssParser           *parser,
                                GtkCssNumberParseFlags  flags)
@@ -495,15 +131,3 @@ gtk_css_dimension_value_parse (GtkCssParser           *parser,
 
   return result;
 }
-
-gboolean
-gtk_css_dimension_value_is_zero (const GtkCssValue *value)
-{
-  if (!value)
-    return TRUE;
-
-  if (value->class != &GTK_CSS_VALUE_DIMENSION.value_class)
-    return FALSE;
-
-  return value->value == 0;
-}