]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtkcalendar.c
Replace a lot of idle and timeout calls by the new gdk_threads api.
[~andy/gtk] / gtk / gtkcalendar.c
index e5276ccc26851bbb1fd07cbe09775e47d3e3aae7..5e9f6cada83959c48dcac6073820172925580058 100644 (file)
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * GTK Calendar Widget
- * Copyright (C) 1998 Cesar Miquel, Shawn T. Amundson and Mattias Grรถnlund
+ * Copyright (C) 1998 Cesar Miquel, Shawn T. Amundson and Mattias Groenlund
  * 
  * lib_date routines
  * Copyright (c) 1995, 1996, 1997, 1998 by Steffen Beyer
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#include "config.h"
+#include <config.h>
 
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
+#ifdef HAVE__NL_TIME_FIRST_WEEKDAY
+#include <langinfo.h>
+#endif
 #include <string.h>
 #include <stdlib.h>
 #include <time.h>
-#include <stdio.h>
+
+#include <glib.h>
+
+#ifdef G_OS_WIN32
+#include <windows.h>
+#endif
+
+#undef GTK_DISABLE_DEPRECATED
 #include "gtkcalendar.h"
+
+#include "gtkdnd.h"
+#include "gtkintl.h"
+#include "gtkmain.h"
+#include "gtkmarshalers.h"
+#include "gtkprivate.h"
 #include "gdk/gdkkeysyms.h"
+#include "gtkalias.h"
 
 /***************************************************************************/
-/* The following date routines are taken from the lib_date package.  Keep
- * them seperate in case we want to update them if a newer lib_date comes
- * out with fixes.  */
-
-typedef         unsigned   int     N_int;
-typedef         unsigned   long    N_long;
-typedef         signed     long    Z_long;
-typedef enum { false = FALSE , true = TRUE } boolean;
-
-#define and        &&      /* logical (boolean) operators: lower case */
-#define or         ||
+/* The following date routines are taken from the lib_date package. 
+ * They have been minimally edited to avoid conflict with types defined
+ * in win32 headers.
+ */
 
-static const N_int month_length[2][13] =
+static const guint month_length[2][13] =
 {
   { 0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 },
   { 0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }
 };
 
-static const N_int days_in_months[2][14] =
+static const guint days_in_months[2][14] =
 {
   { 0, 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365 },
   { 0, 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366 }
 };
 
-static Z_long  calc_days(N_int year, N_int mm, N_int dd);
-static N_int   day_of_week(N_int year, N_int mm, N_int dd);
-static Z_long  dates_difference(N_int year1, N_int mm1, N_int dd1,
-                               N_int year2, N_int mm2, N_int dd2);
-static N_int   weeks_in_year(N_int year);
+static glong  calc_days(guint year, guint mm, guint dd);
+static guint  day_of_week(guint year, guint mm, guint dd);
+static glong  dates_difference(guint year1, guint mm1, guint dd1,
+                              guint year2, guint mm2, guint dd2);
+static guint  weeks_in_year(guint year);
 
-static boolean 
-leap(N_int year)
+static gboolean 
+leap (guint year)
 {
-  return((((year % 4) == 0) and ((year % 100) != 0)) or ((year % 400) == 0));
+  return((((year % 4) == 0) && ((year % 100) != 0)) || ((year % 400) == 0));
 }
 
-static N_int 
-day_of_week(N_int year, N_int mm, N_int dd)
+static guint 
+day_of_week (guint year, guint mm, guint dd)
 {
-  Z_long  days;
+  glong  days;
   
   days = calc_days(year, mm, dd);
   if (days > 0L)
@@ -90,53 +100,53 @@ day_of_week(N_int year, N_int mm, N_int dd)
       days %= 7L;
       days++;
     }
-  return( (N_int) days );
+  return( (guint) days );
 }
 
-static N_int weeks_in_year(N_int year)
+static guint weeks_in_year(guint year)
 {
-  return(52 + ((day_of_week(year,1,1)==4) or (day_of_week(year,12,31)==4)));
+  return(52 + ((day_of_week(year,1,1)==4) || (day_of_week(year,12,31)==4)));
 }
 
-static boolean 
-check_date(N_int year, N_int mm, N_int dd)
+static gboolean 
+check_date(guint year, guint mm, guint dd)
 {
-  if (year < 1) return(false);
-  if ((mm < 1) or (mm > 12)) return(false);
-  if ((dd < 1) or (dd > month_length[leap(year)][mm])) return(false);
-  return(true);
+  if (year < 1) return FALSE;
+  if ((mm < 1) || (mm > 12)) return FALSE;
+  if ((dd < 1) || (dd > month_length[leap(year)][mm])) return FALSE;
+  return TRUE;
 }
 
-static N_int 
-week_number(N_int year, N_int mm, N_int dd)
+static guint 
+week_number(guint year, guint mm, guint dd)
 {
-  N_int first;
+  guint first;
   
   first = day_of_week(year,1,1) - 1;
-  return( (N_int) ( (dates_difference(year,1,1, year,mm,dd) + first) / 7L ) +
+  return( (guint) ( (dates_difference(year,1,1, year,mm,dd) + first) / 7L ) +
          (first < 4) );
 }
 
-static Z_long 
-year_to_days(N_int year)
+static glong 
+year_to_days(guint year)
 {
   return( year * 365L + (year / 4) - (year / 100) + (year / 400) );
 }
 
 
-static Z_long 
-calc_days(N_int year, N_int mm, N_int dd)
+static glong 
+calc_days(guint year, guint mm, guint dd)
 {
-  boolean lp;
+  gboolean lp;
   
   if (year < 1) return(0L);
-  if ((mm < 1) or (mm > 12)) return(0L);
-  if ((dd < 1) or (dd > month_length[(lp = leap(year))][mm])) return(0L);
+  if ((mm < 1) || (mm > 12)) return(0L);
+  if ((dd < 1) || (dd > month_length[(lp = leap(year))][mm])) return(0L);
   return( year_to_days(--year) + days_in_months[lp][mm] + dd );
 }
 
-static boolean 
-week_of_year(N_int *week, N_int *year, N_int mm, N_int dd)
+static gboolean 
+week_of_year(guint *week, guint *year, guint mm, guint dd)
 {
   if (check_date(*year,mm,dd))
     {
@@ -148,41 +158,43 @@ week_of_year(N_int *week, N_int *year, N_int mm, N_int dd)
          *week = 1;
          (*year)++;
        }
-      return(true);
+      return TRUE;
     }
-  return(false);
+  return FALSE;
 }
 
-static Z_long 
-dates_difference(N_int year1, N_int mm1, N_int dd1,
-                N_int year2, N_int mm2, N_int dd2)
+static glong 
+dates_difference(guint year1, guint mm1, guint dd1,
+                guint year2, guint mm2, guint dd2)
 {
   return( calc_days(year2, mm2, dd2) - calc_days(year1, mm1, dd1) );
 }
 
 /*** END OF lib_date routines ********************************************/
 
+/* Spacing around day/week headers and main area, inside those windows */
 #define CALENDAR_MARGIN                 0
+/* Spacing around day/week headers and main area, outside those windows */
+#define INNER_BORDER            4
+/* Separation between day headers and main area */
 #define CALENDAR_YSEP           4
+/* Separation between week headers and main area */
 #define CALENDAR_XSEP           4
-#define INNER_BORDER            4
 
-#define DAY_XPAD                2
-#define DAY_YPAD                2
 #define DAY_XSEP                0 /* not really good for small calendar */
 #define DAY_YSEP                0 /* not really good for small calendar */
 
+#define SCROLL_DELAY_FACTOR      5
+
 /* Color usage */
 #define HEADER_FG_COLOR(widget)                 (& (widget)->style->fg[GTK_WIDGET_STATE (widget)])
 #define HEADER_BG_COLOR(widget)                 (& (widget)->style->bg[GTK_WIDGET_STATE (widget)])
-#define DAY_NAME_COLOR(widget)          (& (widget)->style->base[GTK_STATE_SELECTED])
+#define SELECTED_BG_COLOR(widget)       (& (widget)->style->base[GTK_WIDGET_HAS_FOCUS (widget) ? GTK_STATE_SELECTED : GTK_STATE_ACTIVE])
+#define SELECTED_FG_COLOR(widget)       (& (widget)->style->text[GTK_WIDGET_HAS_FOCUS (widget) ? GTK_STATE_SELECTED : GTK_STATE_ACTIVE])
 #define NORMAL_DAY_COLOR(widget)        (& (widget)->style->fg[GTK_WIDGET_STATE (widget)])
-#define SELECTION_FOCUS_COLOR(widget)   (& (widget)->style->fg[GTK_WIDGET_STATE (widget)])
-#define SELECTION_NO_FOCUS_COLOR(widget) (& (widget)->style->mid[GTK_WIDGET_STATE (widget)])
 #define PREV_MONTH_COLOR(widget)        (& (widget)->style->mid[GTK_WIDGET_STATE (widget)])
 #define NEXT_MONTH_COLOR(widget)        (& (widget)->style->mid[GTK_WIDGET_STATE (widget)])
 #define MARKED_COLOR(widget)            (& (widget)->style->fg[GTK_WIDGET_STATE (widget)])
-#define FOREGROUND_COLOR(widget)        (& (widget)->style->fg[GTK_WIDGET_STATE (widget)])
 #define BACKGROUND_COLOR(widget)        (& (widget)->style->base[GTK_WIDGET_STATE (widget)])
 #define HIGHLIGHT_BACK_COLOR(widget)    (& (widget)->style->mid[GTK_WIDGET_STATE (widget)])
 
@@ -210,12 +222,22 @@ enum {
   LAST_SIGNAL
 };
 
-static gint gtk_calendar_signals[LAST_SIGNAL] = { 0 };
+enum
+{
+  PROP_0,
+  PROP_YEAR,
+  PROP_MONTH,
+  PROP_DAY,
+  PROP_SHOW_HEADING,
+  PROP_SHOW_DAY_NAMES,
+  PROP_NO_MONTH_CHANGE,
+  PROP_SHOW_WEEK_NUMBERS,
+  PROP_LAST
+};
 
-static GtkWidgetClass *parent_class = NULL;
+static guint gtk_calendar_signals[LAST_SIGNAL] = { 0 };
 
-typedef struct _GtkCalendarPrivateData GtkCalendarPrivateData;
-struct _GtkCalendarPrivateData
+struct _GtkCalendarPrivate
 {
   GdkWindow *header_win;
   GdkWindow *day_name_win;
@@ -243,105 +265,127 @@ struct _GtkCalendarPrivateData
   guint max_label_char_descent;
   guint max_week_char_width;
   
-  guint freeze_count;
-
   /* flags */
-  guint dirty_header : 1;
-  guint dirty_day_names : 1;
-  guint dirty_main : 1;
-  guint dirty_week : 1;
-};
+  guint year_before : 1;
+
+  guint need_timer  : 1;
+
+  guint in_drag : 1;
+  guint drag_highlight : 1;
 
-#define GTK_CALENDAR_PRIVATE_DATA(widget)  (((GtkCalendarPrivateData*)(GTK_CALENDAR (widget)->private_data)))
-
-typedef void (*GtkCalendarSignalDate) (GtkObject *object, guint arg1, guint arg2, guint arg3, gpointer data);
-
-static void gtk_calendar_class_init    (GtkCalendarClass *class);
-static void gtk_calendar_init          (GtkCalendar *calendar);
-static void gtk_calendar_destroy       (GtkObject *calendar);
-static void gtk_calendar_realize       (GtkWidget *widget);
-static void gtk_calendar_unrealize     (GtkWidget *widget);
-static void gtk_calendar_size_request  (GtkWidget *widget,
-                                        GtkRequisition *requisition);
-static void gtk_calendar_size_allocate (GtkWidget *widget,
-                                        GtkAllocation *allocation);
-static gint gtk_calendar_expose                (GtkWidget *widget,
-                                        GdkEventExpose *event);
-static gint gtk_calendar_button_press  (GtkWidget *widget,
-                                        GdkEventButton *event);
-static void gtk_calendar_main_button   (GtkWidget *widget,
-                                        GdkEventButton *event);
-static gint gtk_calendar_motion_notify (GtkWidget *widget,
-                                        GdkEventMotion *event);
-static gint gtk_calendar_enter_notify  (GtkWidget *widget,
-                                        GdkEventCrossing *event);
-static gint gtk_calendar_leave_notify  (GtkWidget *widget,
-                                        GdkEventCrossing *event);
-static gint gtk_calendar_key_press     (GtkWidget         *widget,
-                                        GdkEventKey       *event);
-static void gtk_calendar_state_changed (GtkWidget *widget,
-                                        GtkStateType previous_state);
-static void gtk_calendar_style_set     (GtkWidget *widget,
-                                        GtkStyle  *previous_style);
-static void gtk_calendar_paint_header      (GtkWidget *widget);
-static void gtk_calendar_paint_day_names    (GtkWidget *widget);
-static void gtk_calendar_paint_week_numbers (GtkWidget *widget);
-static void gtk_calendar_paint_main        (GtkWidget *widget);
-
-
-static void gtk_calendar_paint_arrow   (GtkWidget    *widget,
-                                        guint         arrow);
-static void gtk_calendar_paint_day_num (GtkWidget    *widget,
-                                        gint          day);
-static void gtk_calendar_paint_day     (GtkWidget    *widget,
-                                        gint          row,
-                                        gint          col);
-static void gtk_calendar_compute_days  (GtkCalendar  *calendar);
-static gint left_x_for_column          (GtkCalendar  *calendar,
-                                        gint          column);
-static gint top_y_for_row              (GtkCalendar  *calendar,
-                                        gint          row);
+  guint32 timer;
+  gint click_child;
 
+  gint week_start;
+
+  gint drag_start_x;
+  gint drag_start_y;
+};
+
+#define GTK_CALENDAR_GET_PRIVATE(widget)  (GTK_CALENDAR (widget)->priv)
+
+static void gtk_calendar_finalize     (GObject      *calendar);
+static void gtk_calendar_destroy      (GtkObject    *calendar);
+static void gtk_calendar_set_property (GObject      *object,
+                                      guint         prop_id,
+                                      const GValue *value,
+                                      GParamSpec   *pspec);
+static void gtk_calendar_get_property (GObject      *object,
+                                      guint         prop_id,
+                                      GValue       *value,
+                                      GParamSpec   *pspec);
+
+static void     gtk_calendar_realize        (GtkWidget        *widget);
+static void     gtk_calendar_unrealize      (GtkWidget        *widget);
+static void     gtk_calendar_size_request   (GtkWidget        *widget,
+                                            GtkRequisition   *requisition);
+static void     gtk_calendar_size_allocate  (GtkWidget        *widget,
+                                            GtkAllocation    *allocation);
+static gboolean gtk_calendar_expose         (GtkWidget        *widget,
+                                            GdkEventExpose   *event);
+static gboolean gtk_calendar_button_press   (GtkWidget        *widget,
+                                            GdkEventButton   *event);
+static gboolean gtk_calendar_button_release (GtkWidget        *widget,
+                                            GdkEventButton   *event);
+static gboolean gtk_calendar_motion_notify  (GtkWidget        *widget,
+                                            GdkEventMotion   *event);
+static gboolean gtk_calendar_enter_notify   (GtkWidget        *widget,
+                                            GdkEventCrossing *event);
+static gboolean gtk_calendar_leave_notify   (GtkWidget        *widget,
+                                            GdkEventCrossing *event);
+static gboolean gtk_calendar_scroll         (GtkWidget        *widget,
+                                            GdkEventScroll   *event);
+static gboolean gtk_calendar_key_press      (GtkWidget        *widget,
+                                            GdkEventKey      *event);
+static gboolean gtk_calendar_focus_out      (GtkWidget        *widget,
+                                            GdkEventFocus    *event);
+static void     gtk_calendar_grab_notify    (GtkWidget        *widget,
+                                            gboolean          was_grabbed);
+static void     gtk_calendar_state_changed  (GtkWidget        *widget,
+                                            GtkStateType      previous_state);
+static void     gtk_calendar_style_set      (GtkWidget        *widget,
+                                            GtkStyle         *previous_style);
+
+static void     gtk_calendar_drag_data_get      (GtkWidget        *widget,
+                                                GdkDragContext   *context,
+                                                GtkSelectionData *selection_data,
+                                                guint             info,
+                                                guint             time);
+static void     gtk_calendar_drag_data_received (GtkWidget        *widget,
+                                                GdkDragContext   *context,
+                                                gint              x,
+                                                gint              y,
+                                                GtkSelectionData *selection_data,
+                                                guint             info,
+                                                guint             time);
+static gboolean gtk_calendar_drag_motion        (GtkWidget        *widget,
+                                                GdkDragContext   *context,
+                                                gint              x,
+                                                gint              y,
+                                                guint             time);
+static void     gtk_calendar_drag_leave         (GtkWidget        *widget,
+                                                GdkDragContext   *context,
+                                                guint             time);
+static gboolean gtk_calendar_drag_drop          (GtkWidget        *widget,
+                                                GdkDragContext   *context,
+                                                gint              x,
+                                                gint              y,
+                                                guint             time);
+
+static void calendar_start_spinning (GtkCalendar *calendar,
+                                    gint         click_child);
+static void calendar_stop_spinning  (GtkCalendar *calendar);
+
+static void calendar_invalidate_day     (GtkCalendar *widget,
+                                        gint       row,
+                                        gint       col);
+static void calendar_invalidate_day_num (GtkCalendar *widget,
+                                        gint       day);
+static void calendar_invalidate_arrow   (GtkCalendar *widget,
+                                        guint      arrow);
+
+static void calendar_compute_days      (GtkCalendar *calendar);
+     
 static char    *default_abbreviated_dayname[7];
 static char    *default_monthname[12];
 
-GtkType
-gtk_calendar_get_type (void)
-{
-  static GtkType calendar_type = 0;
-  
-  if (!calendar_type)
-    {
-      static const GTypeInfo calendar_info =
-      {
-       sizeof (GtkCalendarClass),
-       NULL,           /* base_init */
-       NULL,           /* base_finalize */
-       (GClassInitFunc) gtk_calendar_class_init,
-       NULL,           /* class_finalize */
-       NULL,           /* class_data */
-       sizeof (GtkCalendar),
-       16,             /* n_preallocs */
-       (GInstanceInitFunc) gtk_calendar_init,
-      };
-
-      calendar_type = g_type_register_static (GTK_TYPE_WIDGET, "GtkCalendar", &calendar_info, 0);
-    }
-  
-  return calendar_type;
-}
+G_DEFINE_TYPE (GtkCalendar, gtk_calendar, GTK_TYPE_WIDGET)
 
 static void
 gtk_calendar_class_init (GtkCalendarClass *class)
 {
-  GtkObjectClass *object_class;
+  GObjectClass   *gobject_class;
+  GtkObjectClass   *object_class;
   GtkWidgetClass *widget_class;
-  
-  object_class = (GtkObjectClass*) class;
+
+  gobject_class = (GObjectClass*)  class;
+  object_class = (GtkObjectClass*)  class;
   widget_class = (GtkWidgetClass*) class;
   
-  parent_class = gtk_type_class (GTK_TYPE_WIDGET);
-  
+  gobject_class->set_property = gtk_calendar_set_property;
+  gobject_class->get_property = gtk_calendar_get_property;
+  gobject_class->finalize = gtk_calendar_finalize;
+
   object_class->destroy = gtk_calendar_destroy;
 
   widget_class->realize = gtk_calendar_realize;
@@ -350,89 +394,224 @@ gtk_calendar_class_init (GtkCalendarClass *class)
   widget_class->size_request = gtk_calendar_size_request;
   widget_class->size_allocate = gtk_calendar_size_allocate;
   widget_class->button_press_event = gtk_calendar_button_press;
+  widget_class->button_release_event = gtk_calendar_button_release;
   widget_class->motion_notify_event = gtk_calendar_motion_notify;
   widget_class->enter_notify_event = gtk_calendar_enter_notify;
   widget_class->leave_notify_event = gtk_calendar_leave_notify;
   widget_class->key_press_event = gtk_calendar_key_press;
+  widget_class->scroll_event = gtk_calendar_scroll;
   widget_class->style_set = gtk_calendar_style_set;
   widget_class->state_changed = gtk_calendar_state_changed;
-  
-  class->month_changed = NULL;
-  class->day_selected = NULL;
-  class->day_selected_double_click = NULL;
-  class->prev_month = NULL;
-  class->next_month = NULL;
-  class->prev_year = NULL;
-  class->next_year = NULL;
+  widget_class->grab_notify = gtk_calendar_grab_notify;
+  widget_class->focus_out_event = gtk_calendar_focus_out;
+
+  widget_class->drag_data_get = gtk_calendar_drag_data_get;
+  widget_class->drag_motion = gtk_calendar_drag_motion;
+  widget_class->drag_leave = gtk_calendar_drag_leave;
+  widget_class->drag_drop = gtk_calendar_drag_drop;
+  widget_class->drag_data_received = gtk_calendar_drag_data_received;
+  
+  g_object_class_install_property (gobject_class,
+                                   PROP_YEAR,
+                                   g_param_spec_int ("year",
+                                                    P_("Year"),
+                                                    P_("The selected year"),
+                                                    0, G_MAXINT, 0,
+                                                    GTK_PARAM_READWRITE));
+  g_object_class_install_property (gobject_class,
+                                   PROP_MONTH,
+                                   g_param_spec_int ("month",
+                                                    P_("Month"),
+                                                    P_("The selected month (as a number between 0 and 11)"),
+                                                    0, 11, 0,
+                                                    GTK_PARAM_READWRITE));
+  g_object_class_install_property (gobject_class,
+                                   PROP_DAY,
+                                   g_param_spec_int ("day",
+                                                    P_("Day"),
+                                                    P_("The selected day (as a number between 1 and 31, or 0 to unselect the currently selected day)"),
+                                                    0, 31, 0,
+                                                    GTK_PARAM_READWRITE));
+
+/**
+ * GtkCalendar:show-heading:
+ *
+ * Determines whether a heading is displayed.
+ *
+ * Since: 2.4
+ */
+  g_object_class_install_property (gobject_class,
+                                   PROP_SHOW_HEADING,
+                                   g_param_spec_boolean ("show-heading",
+                                                        P_("Show Heading"),
+                                                        P_("If TRUE, a heading is displayed"),
+                                                        TRUE,
+                                                        GTK_PARAM_READWRITE));
+
+/**
+ * GtkCalendar:show-day-names:
+ *
+ * Determines whether day names are displayed.
+ *
+ * Since: 2.4
+ */
+  g_object_class_install_property (gobject_class,
+                                   PROP_SHOW_DAY_NAMES,
+                                   g_param_spec_boolean ("show-day-names",
+                                                        P_("Show Day Names"),
+                                                        P_("If TRUE, day names are displayed"),
+                                                        TRUE,
+                                                        GTK_PARAM_READWRITE));
+/**
+ * GtkCalendar:no-month-change:
+ *
+ * Determines whether the selected month can be changed.
+ *
+ * Since: 2.4
+ */
+  g_object_class_install_property (gobject_class,
+                                   PROP_NO_MONTH_CHANGE,
+                                   g_param_spec_boolean ("no-month-change",
+                                                        P_("No Month Change"),
+                                                        P_("If TRUE, the selected month cannot be changed"),
+                                                        FALSE,
+                                                        GTK_PARAM_READWRITE));
+
+/**
+ * GtkCalendar:show-week-numbers:
+ *
+ * Determines whether week numbers are displayed.
+ *
+ * Since: 2.4
+ */
+  g_object_class_install_property (gobject_class,
+                                   PROP_SHOW_WEEK_NUMBERS,
+                                   g_param_spec_boolean ("show-week-numbers",
+                                                        P_("Show Week Numbers"),
+                                                        P_("If TRUE, week numbers are displayed"),
+                                                        FALSE,
+                                                        GTK_PARAM_READWRITE));
 
   gtk_calendar_signals[MONTH_CHANGED_SIGNAL] =
-    gtk_signal_new ("month_changed",
-                   GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class),
-                   GTK_SIGNAL_OFFSET (GtkCalendarClass, month_changed),
-                   gtk_signal_default_marshaller, GTK_TYPE_NONE, 0);
+    g_signal_new (I_("month_changed"),
+                 G_OBJECT_CLASS_TYPE (gobject_class),
+                 G_SIGNAL_RUN_FIRST,
+                 G_STRUCT_OFFSET (GtkCalendarClass, month_changed),
+                 NULL, NULL,
+                 _gtk_marshal_VOID__VOID,
+                 G_TYPE_NONE, 0);
   gtk_calendar_signals[DAY_SELECTED_SIGNAL] =
-    gtk_signal_new ("day_selected",
-                   GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class),
-                   GTK_SIGNAL_OFFSET (GtkCalendarClass, day_selected),
-                   gtk_signal_default_marshaller, GTK_TYPE_NONE, 0);
+    g_signal_new (I_("day_selected"),
+                 G_OBJECT_CLASS_TYPE (gobject_class),
+                 G_SIGNAL_RUN_FIRST,
+                 G_STRUCT_OFFSET (GtkCalendarClass, day_selected),
+                 NULL, NULL,
+                 _gtk_marshal_VOID__VOID,
+                 G_TYPE_NONE, 0);
   gtk_calendar_signals[DAY_SELECTED_DOUBLE_CLICK_SIGNAL] =
-    gtk_signal_new ("day_selected_double_click",
-                   GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class),
-                   GTK_SIGNAL_OFFSET (GtkCalendarClass, day_selected_double_click),
-                   gtk_signal_default_marshaller, GTK_TYPE_NONE, 0);
+    g_signal_new (I_("day_selected_double_click"),
+                 G_OBJECT_CLASS_TYPE (gobject_class),
+                 G_SIGNAL_RUN_FIRST,
+                 G_STRUCT_OFFSET (GtkCalendarClass, day_selected_double_click),
+                 NULL, NULL,
+                 _gtk_marshal_VOID__VOID,
+                 G_TYPE_NONE, 0);
   gtk_calendar_signals[PREV_MONTH_SIGNAL] =
-    gtk_signal_new ("prev_month",
-                   GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class),
-                   GTK_SIGNAL_OFFSET (GtkCalendarClass, prev_month),
-                   gtk_signal_default_marshaller, GTK_TYPE_NONE, 0);
+    g_signal_new (I_("prev_month"),
+                 G_OBJECT_CLASS_TYPE (gobject_class),
+                 G_SIGNAL_RUN_FIRST,
+                 G_STRUCT_OFFSET (GtkCalendarClass, prev_month),
+                 NULL, NULL,
+                 _gtk_marshal_VOID__VOID,
+                 G_TYPE_NONE, 0);
   gtk_calendar_signals[NEXT_MONTH_SIGNAL] =
-    gtk_signal_new ("next_month",
-                   GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class),
-                   GTK_SIGNAL_OFFSET (GtkCalendarClass, next_month),
-                   gtk_signal_default_marshaller, GTK_TYPE_NONE, 0);
+    g_signal_new (I_("next_month"),
+                 G_OBJECT_CLASS_TYPE (gobject_class),
+                 G_SIGNAL_RUN_FIRST,
+                 G_STRUCT_OFFSET (GtkCalendarClass, next_month),
+                 NULL, NULL,
+                 _gtk_marshal_VOID__VOID,
+                 G_TYPE_NONE, 0);
   gtk_calendar_signals[PREV_YEAR_SIGNAL] =
-    gtk_signal_new ("prev_year",
-                   GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class),
-                   GTK_SIGNAL_OFFSET (GtkCalendarClass, prev_year),
-                   gtk_signal_default_marshaller, GTK_TYPE_NONE, 0);
+    g_signal_new (I_("prev_year"),
+                 G_OBJECT_CLASS_TYPE (gobject_class),
+                 G_SIGNAL_RUN_FIRST,
+                 G_STRUCT_OFFSET (GtkCalendarClass, prev_year),
+                 NULL, NULL,
+                 _gtk_marshal_VOID__VOID,
+                 G_TYPE_NONE, 0);
   gtk_calendar_signals[NEXT_YEAR_SIGNAL] =
-    gtk_signal_new ("next_year",
-                   GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class),
-                   GTK_SIGNAL_OFFSET (GtkCalendarClass, next_year),
-                   gtk_signal_default_marshaller, GTK_TYPE_NONE, 0);
+    g_signal_new (I_("next_year"),
+                 G_OBJECT_CLASS_TYPE (gobject_class),
+                 G_SIGNAL_RUN_FIRST,
+                 G_STRUCT_OFFSET (GtkCalendarClass, next_year),
+                 NULL, NULL,
+                 _gtk_marshal_VOID__VOID,
+                 G_TYPE_NONE, 0);
+  
+  g_type_class_add_private (gobject_class, sizeof (GtkCalendarPrivate));
 }
 
 static void
 gtk_calendar_init (GtkCalendar *calendar)
 {
+  GtkWidget *widget = GTK_WIDGET (calendar);
   time_t secs;
   struct tm *tm;
   gint i;
+#ifdef G_OS_WIN32
+  wchar_t wbuffer[100];
+#else
   char buffer[255];
   time_t tmp_time;
-  GtkWidget *widget;
-  GtkCalendarPrivateData *private_data;
-  
-  widget = GTK_WIDGET (calendar);
+#endif
+  GtkCalendarPrivate *priv;
+  gchar *year_before;
+#ifdef HAVE__NL_TIME_FIRST_WEEKDAY
+  gchar *langinfo;
+  gint week_1stday = 0;
+  gint first_weekday = 1;
+  guint week_origin;
+#else
+  gchar *week_start;
+#endif
+
+  priv = calendar->priv = G_TYPE_INSTANCE_GET_PRIVATE (calendar,
+                                                      GTK_TYPE_CALENDAR,
+                                                      GtkCalendarPrivate);
+
   GTK_WIDGET_SET_FLAGS (widget, GTK_CAN_FOCUS);
   
-  calendar->private_data = (gpointer) g_malloc (sizeof (GtkCalendarPrivateData));
-  private_data = GTK_CALENDAR_PRIVATE_DATA (calendar);
-
   if (!default_abbreviated_dayname[0])
     for (i=0; i<7; i++)
       {
+#ifndef G_OS_WIN32
        tmp_time= (i+3)*86400;
        strftime ( buffer, sizeof (buffer), "%a", gmtime (&tmp_time));
        default_abbreviated_dayname[i] = g_locale_to_utf8 (buffer, -1, NULL, NULL, NULL);
+#else
+       if (!GetLocaleInfoW (GetThreadLocale (), LOCALE_SABBREVDAYNAME1 + (i+6)%7,
+                            wbuffer, G_N_ELEMENTS (wbuffer)))
+         default_abbreviated_dayname[i] = g_strdup_printf ("(%d)", i);
+       else
+         default_abbreviated_dayname[i] = g_utf16_to_utf8 (wbuffer, -1, NULL, NULL, NULL);
+#endif
       }
   
   if (!default_monthname[0])
     for (i=0; i<12; i++)
       {
+#ifndef G_OS_WIN32
        tmp_time=i*2764800;
        strftime ( buffer, sizeof (buffer), "%B", gmtime (&tmp_time));
        default_monthname[i] = g_locale_to_utf8 (buffer, -1, NULL, NULL, NULL);
+#else
+       if (!GetLocaleInfoW (GetThreadLocale (), LOCALE_SMONTHNAME1 + i,
+                            wbuffer, G_N_ELEMENTS (wbuffer)))
+         default_monthname[i] = g_strdup_printf ("(%d)", i);
+       else
+         default_monthname[i] = g_utf16_to_utf8 (wbuffer, -1, NULL, NULL, NULL);
+#endif
       }
   
   /* Set defaults */
@@ -440,7 +619,7 @@ gtk_calendar_init (GtkCalendar *calendar)
   tm = localtime (&secs);
   calendar->month = tm->tm_mon;
   calendar->year  = 1900 + tm->tm_year;
-  
+
   for (i=0;i<31;i++)
     calendar->marked_date[i] = FALSE;
   calendar->num_marked_dates = 0;
@@ -454,217 +633,103 @@ gtk_calendar_init (GtkCalendar *calendar)
   
   calendar->focus_row = -1;
   calendar->focus_col = -1;
-  calendar->xor_gc = NULL;
 
-  private_data->max_year_width = 0;
-  private_data->max_month_width = 0;
-  private_data->max_day_char_width = 0;
-  private_data->max_week_char_width = 0;
+  priv->max_year_width = 0;
+  priv->max_month_width = 0;
+  priv->max_day_char_width = 0;
+  priv->max_week_char_width = 0;
 
-  private_data->max_day_char_ascent = 0;
-  private_data->max_day_char_descent = 0;
-  private_data->max_label_char_ascent = 0;
-  private_data->max_label_char_descent = 0;
+  priv->max_day_char_ascent = 0;
+  priv->max_day_char_descent = 0;
+  priv->max_label_char_ascent = 0;
+  priv->max_label_char_descent = 0;
 
-  private_data->arrow_width = 10;
-
-  private_data->freeze_count = 0;
-  
-  private_data->dirty_header = 0;
-  private_data->dirty_day_names = 0;
-  private_data->dirty_week = 0;
-  private_data->dirty_main = 0;
-}
+  priv->arrow_width = 10;
 
-GtkWidget*
-gtk_calendar_new (void)
-{
-  return GTK_WIDGET (gtk_type_new (GTK_TYPE_CALENDAR));
-}
+  priv->need_timer = 0;
+  priv->timer = 0;
+  priv->click_child = -1;
 
-/* column_from_x: returns the column 0-6 that the
- * x pixel of the xwindow is in */
-static gint
-column_from_x (GtkCalendar *calendar,
-              gint         event_x)
-{
-  gint c, column;
-  gint x_left, x_right;
-  
-  column = -1;
-  
-  for (c = 0; c < 7; c++)
-    {
-      x_left = left_x_for_column (calendar, c);
-      x_right = x_left + GTK_CALENDAR_PRIVATE_DATA (calendar)->day_width;
-      
-      if (event_x >= x_left && event_x < x_right)
-       {
-         column = c;
-         break;
-       }
-    }
-  
-  return column;
-}
+  priv->in_drag = 0;
+  priv->drag_highlight = 0;
 
-static gint
-row_height (GtkCalendar *calendar)
-{
-  return (GTK_CALENDAR_PRIVATE_DATA (calendar)->main_h - CALENDAR_MARGIN
-         - ((calendar->display_flags & GTK_CALENDAR_SHOW_DAY_NAMES)
-            ? CALENDAR_YSEP : CALENDAR_MARGIN)) / 6;
-}
+  gtk_drag_dest_set (widget, 0, NULL, 0, GDK_ACTION_COPY);
+  gtk_drag_dest_add_text_targets (widget);
 
+  priv->year_before = 0;
 
-/* row_from_y: returns the row 0-5 that the
- * y pixel of the xwindow is in */
-static gint
-row_from_y (GtkCalendar *calendar,
-           gint         event_y)
-{
-  gint r, row;
-  gint height;
-  gint y_top, y_bottom;
-  
-  height = row_height (calendar);
-  row = -1;
-  
-  for (r = 0; r < 6; r++)
-    {
-      y_top = top_y_for_row (calendar, r);
-      y_bottom = y_top + height;
+  /* Translate to calendar:YM if you want years to be displayed
+   * before months; otherwise translate to calendar:MY.
+   * Do *not* translate it to anything else, if it
+   * it isn't calendar:YM or calendar:MY it will not work.
+   *
+   * Note that this flipping is in top of the text direction flipping,
+   * so if you have a default text direction of RTL and YM, then
+   * the year will appear on the right.
+   */
+  year_before = _("calendar:MY");
+  if (strcmp (year_before, "calendar:YM") == 0)
+    priv->year_before = 1;
+  else if (strcmp (year_before, "calendar:MY") != 0)
+    g_warning ("Whoever translated calendar:MY did so wrongly.\n");
+
+#ifdef G_OS_WIN32
+  priv->week_start = 0;
+  week_start = NULL;
+
+  if (GetLocaleInfoW (GetThreadLocale (), LOCALE_IFIRSTDAYOFWEEK,
+                     wbuffer, G_N_ELEMENTS (wbuffer)))
+    week_start = g_utf16_to_utf8 (wbuffer, -1, NULL, NULL, NULL);
       
-      if (event_y >= y_top && event_y < y_bottom)
-       {
-         row = r;
-         break;
-       }
-    }
-  
-  return row;
-}
-
-/* left_x_for_column: returns the x coordinate
- * for the left of the column */
-static gint
-left_x_for_column (GtkCalendar *calendar,
-                  gint         column)
-{
-  gint width;
-  gint x_left;
-  
-  if (gtk_widget_get_direction (GTK_WIDGET (calendar)) == GTK_TEXT_DIR_RTL)
-    column = 6 - column;
-
-  width = GTK_CALENDAR_PRIVATE_DATA (calendar)->day_width;
-  if (calendar->display_flags & GTK_CALENDAR_SHOW_WEEK_NUMBERS)
-    x_left =  DAY_XSEP + (width + DAY_XSEP) * column;
+  if (week_start != NULL)
+    {
+      priv->week_start = (week_start[0] - '0' + 1) % 7;
+      g_free(week_start);
+    }
+#else
+#ifdef HAVE__NL_TIME_FIRST_WEEKDAY
+  langinfo = nl_langinfo (_NL_TIME_FIRST_WEEKDAY);
+  first_weekday = langinfo[0];
+  langinfo = nl_langinfo (_NL_TIME_WEEK_1STDAY);
+  week_origin = GPOINTER_TO_INT (langinfo);
+  if (week_origin == 19971130) /* Sunday */
+    week_1stday = 0;
+  else if (week_origin == 19971201) /* Monday */
+    week_1stday = 1;
   else
-    x_left = CALENDAR_MARGIN + (width + DAY_XSEP) * column;
-  
-  return x_left;
-}
-
-/* top_y_for_row: returns the y coordinate
- * for the top of the row */
-static gint
-top_y_for_row (GtkCalendar *calendar,
-              gint         row)
-{
-  
-  return (GTK_CALENDAR_PRIVATE_DATA (calendar)->main_h 
-         - (CALENDAR_MARGIN + (6 - row)
-            * row_height (calendar)));
-}
-
-/* This function should be done by the toolkit, but we don't like the
- * GTK arrows because they don't look good on this widget */
-static void
-draw_arrow_right (GdkWindow *window,
-                 GdkGC     *gc,
-                 gint       x,
-                 gint       y,
-                 gint       size)
-{
-  gint i;
-  
-  for (i = 0; i <= size / 2; i++)
-    {
-      gdk_draw_line (window, gc,
-                    x + i,
-                    y + i,
-                    x + i,
-                    y + size - i);
-    }
-}
-
-/* This function should be done by the toolkit, but we don't like the
- * GTK arrows because they don't look good on this widget */
-static void
-draw_arrow_left (GdkWindow *window,
-                GdkGC     *gc,
-                gint       x,
-                gint       y,
-                gint       size)
-{
-  gint i;
-  
-  for (i = 0; i <= size / 2; i++)
-    {
-      gdk_draw_line (window, gc,
-                    x + size/2 - i,
-                    y + i,
-                    x + size/2 - i,
-                    y + size - i);
-    }
-}
-
-static void
-gtk_calendar_set_month_prev (GtkCalendar *calendar)
-{
-  gint month_len;
-  
-  if (calendar->display_flags & GTK_CALENDAR_NO_MONTH_CHANGE)
-    return;
-  
-  if (calendar->month == 0)
-    {
-      calendar->month = 11;
-      calendar->year--;
-    } 
+    g_warning ("Unknown value of _NL_TIME_WEEK_1STDAY.\n");
+
+  priv->week_start = (week_1stday + first_weekday - 1) % 7;
+#else
+  /* Translate to calendar:week_start:0 if you want Sunday to be the
+   * first day of the week to calendar:week_start:1 if you want Monday
+   * to be the first day of the week, and so on.
+   */  
+  week_start = _("calendar:week_start:0");
+
+  if (strncmp (week_start, "calendar:week_start:", 20) == 0)
+    priv->week_start = *(week_start + 20) - '0';
   else 
-    calendar->month--;
-  
-  month_len = month_length[leap (calendar->year)][calendar->month + 1];
+    priv->week_start = -1;
   
-  gtk_calendar_freeze (calendar);
-  gtk_calendar_compute_days (calendar);
-  
-  gtk_signal_emit (GTK_OBJECT (calendar),
-                  gtk_calendar_signals[PREV_MONTH_SIGNAL]);
-  gtk_signal_emit (GTK_OBJECT (calendar),
-                  gtk_calendar_signals[MONTH_CHANGED_SIGNAL]);
-  
-  if (month_len < calendar->selected_day)
-    {
-      calendar->selected_day = 0;
-      gtk_calendar_select_day (calendar, month_len);
-    }
-  else
+  if (priv->week_start < 0 || priv->week_start > 6)
     {
-      if (calendar->selected_day < 0)
-       calendar->selected_day = calendar->selected_day + 1 + month_length[leap (calendar->year)][calendar->month + 1];
-      gtk_calendar_select_day (calendar, calendar->selected_day);
+      g_warning ("Whoever translated calendar:week_start:0 did so wrongly.\n");
+      priv->week_start = 0;
     }
+#endif
+#endif
 
-  gtk_widget_queue_draw (GTK_WIDGET (calendar));
-  gtk_calendar_thaw (calendar);
+  calendar_compute_days (calendar);
 }
 
+\f
+/****************************************
+ *          Utility Functions           *
+ ****************************************/
 
 static void
-gtk_calendar_set_month_next (GtkCalendar *calendar)
+calendar_set_month_next (GtkCalendar *calendar)
 {
   gint month_len;
   
@@ -682,12 +747,13 @@ gtk_calendar_set_month_next (GtkCalendar *calendar)
   else 
     calendar->month++;
   
-  gtk_calendar_freeze (calendar);
-  gtk_calendar_compute_days (calendar);
-  gtk_signal_emit (GTK_OBJECT (calendar),
-                  gtk_calendar_signals[NEXT_MONTH_SIGNAL]);
-  gtk_signal_emit (GTK_OBJECT (calendar),
-                  gtk_calendar_signals[MONTH_CHANGED_SIGNAL]);
+  calendar_compute_days (calendar);
+  g_signal_emit (calendar,
+                gtk_calendar_signals[NEXT_MONTH_SIGNAL],
+                0);
+  g_signal_emit (calendar,
+                gtk_calendar_signals[MONTH_CHANGED_SIGNAL],
+                0);
   
   month_len = month_length[leap (calendar->year)][calendar->month + 1];
   
@@ -700,23 +766,23 @@ gtk_calendar_set_month_next (GtkCalendar *calendar)
     gtk_calendar_select_day (calendar, calendar->selected_day);
 
   gtk_widget_queue_draw (GTK_WIDGET (calendar));
-  gtk_calendar_thaw (calendar);
 }
 
 static void
-gtk_calendar_set_year_prev (GtkCalendar *calendar)
+calendar_set_year_prev (GtkCalendar *calendar)
 {
   gint month_len;
   
   g_return_if_fail (GTK_IS_WIDGET (calendar));
   
   calendar->year--;
-  gtk_calendar_freeze (calendar);
-  gtk_calendar_compute_days (calendar);
-  gtk_signal_emit (GTK_OBJECT (calendar),
-                  gtk_calendar_signals[PREV_YEAR_SIGNAL]);
-  gtk_signal_emit (GTK_OBJECT (calendar),
-                  gtk_calendar_signals[MONTH_CHANGED_SIGNAL]);
+  calendar_compute_days (calendar);
+  g_signal_emit (calendar,
+                gtk_calendar_signals[PREV_YEAR_SIGNAL],
+                0);
+  g_signal_emit (calendar,
+                gtk_calendar_signals[MONTH_CHANGED_SIGNAL],
+                0);
   
   month_len = month_length[leap (calendar->year)][calendar->month + 1];
   
@@ -729,27 +795,23 @@ gtk_calendar_set_year_prev (GtkCalendar *calendar)
     gtk_calendar_select_day (calendar, calendar->selected_day);
   
   gtk_widget_queue_draw (GTK_WIDGET (calendar));
-  gtk_calendar_thaw (calendar);
 }
 
 static void
-gtk_calendar_set_year_next (GtkCalendar *calendar)
+calendar_set_year_next (GtkCalendar *calendar)
 {
   gint month_len;
-  GtkWidget *widget;
   
   g_return_if_fail (GTK_IS_WIDGET (calendar));
   
-  widget = GTK_WIDGET (calendar);
-  
-  gtk_calendar_freeze (calendar);
-  
   calendar->year++;
-  gtk_calendar_compute_days (calendar);
-  gtk_signal_emit (GTK_OBJECT (calendar),
-                  gtk_calendar_signals[NEXT_YEAR_SIGNAL]);
-  gtk_signal_emit (GTK_OBJECT (calendar),
-                  gtk_calendar_signals[MONTH_CHANGED_SIGNAL]);
+  calendar_compute_days (calendar);
+  g_signal_emit (calendar,
+                gtk_calendar_signals[NEXT_YEAR_SIGNAL],
+                0);
+  g_signal_emit (calendar,
+                gtk_calendar_signals[MONTH_CHANGED_SIGNAL],
+                0);
   
   month_len = month_length[leap (calendar->year)][calendar->month + 1];
   
@@ -762,70 +824,465 @@ gtk_calendar_set_year_next (GtkCalendar *calendar)
     gtk_calendar_select_day (calendar, calendar->selected_day);
   
   gtk_widget_queue_draw (GTK_WIDGET (calendar));
-  gtk_calendar_thaw (calendar);
 }
 
 static void
-gtk_calendar_main_button (GtkWidget     *widget,
-                         GdkEventButton *event)
+calendar_compute_days (GtkCalendar *calendar)
 {
-  GtkCalendar *calendar;
-  gint x, y;
-  gint row, col;
-  gint day_month;
-  gint old_focus_row, old_focus_col;
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (GTK_WIDGET (calendar));
+  gint month;
+  gint year;
+  gint ndays_in_month;
+  gint ndays_in_prev_month;
+  gint first_day;
+  gint row;
+  gint col;
+  gint day;
+
+  g_return_if_fail (GTK_IS_CALENDAR (calendar));
+
+  year = calendar->year;
+  month = calendar->month + 1;
   
-  calendar = GTK_CALENDAR (widget);
+  ndays_in_month = month_length[leap (year)][month];
   
-  x = (gint) (event->x);
-  y = (gint) (event->y);
+  first_day = day_of_week (year, month, 1);
+  first_day = (first_day + 7 - priv->week_start) % 7;
   
-  row = row_from_y (calendar, y);
-  col = column_from_x (calendar, x);
-
-  /* If row or column isn't found, just return. */
-  if (row == -1 || col == -1)
-    return;
+  /* Compute days of previous month */
+  if (month > 1)
+    ndays_in_prev_month = month_length[leap (year)][month-1];
+  else
+    ndays_in_prev_month = month_length[leap (year)][12];
+  day = ndays_in_prev_month - first_day + 1;
   
-  day_month = calendar->day_month[row][col];
+  row = 0;
+  if (first_day > 0)
+    {
+      for (col = 0; col < first_day; col++)
+       {
+         calendar->day[row][col] = day;
+         calendar->day_month[row][col] = MONTH_PREV;
+         day++;
+       }
+    }
   
-  if (day_month == MONTH_CURRENT)
+  /* Compute days of current month */
+  col = first_day;
+  for (day = 1; day <= ndays_in_month; day++)
     {
-      if (event->type == GDK_2BUTTON_PRESS)
-       gtk_signal_emit (GTK_OBJECT (calendar),
-                        gtk_calendar_signals[DAY_SELECTED_DOUBLE_CLICK_SIGNAL]);
-      else
+      calendar->day[row][col] = day;
+      calendar->day_month[row][col] = MONTH_CURRENT;
+      
+      col++;
+      if (col == 7)
+       {
+         row++;
+         col = 0;
+       }
+    }
+  
+  /* Compute days of next month */
+  day = 1;
+  for (; row <= 5; row++)
+    {
+      for (; col <= 6; col++)
        {
-         if (!GTK_WIDGET_HAS_FOCUS (widget))
-           gtk_widget_grab_focus (widget);
-         old_focus_row = calendar->focus_row;
-         old_focus_col = calendar->focus_col;
-         calendar->focus_row = row;
-         calendar->focus_col = col;
-         gtk_calendar_paint_day (widget, old_focus_row, old_focus_col);
-         gtk_calendar_select_day (calendar, calendar->day[row][col]);
+         calendar->day[row][col] = day;
+         calendar->day_month[row][col] = MONTH_NEXT;
+         day++;
        }
+      col = 0;
     }
-  else if (day_month == MONTH_PREV)
-    gtk_calendar_set_month_prev (calendar);
-  else if (day_month == MONTH_NEXT)
-    gtk_calendar_set_month_next (calendar);
 }
 
 static void
-gtk_calendar_realize_arrows (GtkWidget *widget)
+calendar_select_and_focus_day (GtkCalendar *calendar,
+                              guint        day)
 {
-  GtkCalendar *calendar;
-  GtkCalendarPrivateData *private_data;
-  GdkWindowAttr attributes;
-  gint attributes_mask;
-  gint i;
-  
-  g_return_if_fail (GTK_IS_CALENDAR (widget));
+  gint old_focus_row = calendar->focus_row;
+  gint old_focus_col = calendar->focus_col;
+  gint row;
+  gint col;
   
-  calendar = GTK_CALENDAR (widget);
-  private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
+  for (row = 0; row < 6; row ++)
+    for (col = 0; col < 7; col++)
+      {
+       if (calendar->day_month[row][col] == MONTH_CURRENT 
+           && calendar->day[row][col] == day)
+         {
+           calendar->focus_row = row;
+           calendar->focus_col = col;
+         }
+      }
+
+  if (old_focus_row != -1 && old_focus_col != -1)
+    calendar_invalidate_day (calendar, old_focus_row, old_focus_col);
+  
+  gtk_calendar_select_day (calendar, day);
+}
+
+\f
+/****************************************
+ *     Layout computation utilities     *
+ ****************************************/
+
+static gint
+calendar_row_height (GtkCalendar *calendar)
+{
+  return (GTK_CALENDAR_GET_PRIVATE (calendar)->main_h - CALENDAR_MARGIN
+         - ((calendar->display_flags & GTK_CALENDAR_SHOW_DAY_NAMES)
+            ? CALENDAR_YSEP : CALENDAR_MARGIN)) / 6;
+}
+
+
+/* calendar_left_x_for_column: returns the x coordinate
+ * for the left of the column */
+static gint
+calendar_left_x_for_column (GtkCalendar *calendar,
+                           gint         column)
+{
+  gint width;
+  gint x_left;
+  
+  if (gtk_widget_get_direction (GTK_WIDGET (calendar)) == GTK_TEXT_DIR_RTL)
+    column = 6 - column;
+
+  width = GTK_CALENDAR_GET_PRIVATE (calendar)->day_width;
+  if (calendar->display_flags & GTK_CALENDAR_SHOW_WEEK_NUMBERS)
+    x_left = CALENDAR_XSEP + (width + DAY_XSEP) * column;
+  else
+    x_left = CALENDAR_MARGIN + (width + DAY_XSEP) * column;
+  
+  return x_left;
+}
+
+/* column_from_x: returns the column 0-6 that the
+ * x pixel of the xwindow is in */
+static gint
+calendar_column_from_x (GtkCalendar *calendar,
+                       gint         event_x)
+{
+  gint c, column;
+  gint x_left, x_right;
+  
+  column = -1;
+  
+  for (c = 0; c < 7; c++)
+    {
+      x_left = calendar_left_x_for_column (calendar, c);
+      x_right = x_left + GTK_CALENDAR_GET_PRIVATE (calendar)->day_width;
+      
+      if (event_x >= x_left && event_x < x_right)
+       {
+         column = c;
+         break;
+       }
+    }
+  
+  return column;
+}
+
+/* calendar_top_y_for_row: returns the y coordinate
+ * for the top of the row */
+static gint
+calendar_top_y_for_row (GtkCalendar *calendar,
+                       gint         row)
+{
+  
+  return (GTK_CALENDAR_GET_PRIVATE (calendar)->main_h 
+         - (CALENDAR_MARGIN + (6 - row)
+            * calendar_row_height (calendar)));
+}
+
+/* row_from_y: returns the row 0-5 that the
+ * y pixel of the xwindow is in */
+static gint
+calendar_row_from_y (GtkCalendar *calendar,
+                    gint         event_y)
+{
+  gint r, row;
+  gint height;
+  gint y_top, y_bottom;
+  
+  height = calendar_row_height (calendar);
+  row = -1;
+  
+  for (r = 0; r < 6; r++)
+    {
+      y_top = calendar_top_y_for_row (calendar, r);
+      y_bottom = y_top + height;
+      
+      if (event_y >= y_top && event_y < y_bottom)
+       {
+         row = r;
+         break;
+       }
+    }
+  
+  return row;
+}
+
+static void
+calendar_arrow_rectangle (GtkCalendar  *calendar,
+                         guint         arrow,
+                         GdkRectangle *rect)
+{
+  GtkWidget *widget = GTK_WIDGET (calendar);
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar);
+  gboolean year_left;
+
+  if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR) 
+    year_left = priv->year_before;
+  else
+    year_left = !priv->year_before;
+    
+  rect->y = 3;
+  rect->width = priv->arrow_width;
+  rect->height = priv->header_h - 7;
+  
+  switch (arrow)
+    {
+    case ARROW_MONTH_LEFT:
+      if (year_left) 
+       rect->x = (widget->allocation.width - 2 * widget->style->xthickness
+                  - (3 + 2*priv->arrow_width 
+                     + priv->max_month_width));
+      else
+       rect->x = 3;
+      break;
+    case ARROW_MONTH_RIGHT:
+      if (year_left) 
+       rect->x = (widget->allocation.width - 2 * widget->style->xthickness 
+                  - 3 - priv->arrow_width);
+      else
+       rect->x = (priv->arrow_width 
+                  + priv->max_month_width);
+      break;
+    case ARROW_YEAR_LEFT:
+      if (year_left) 
+       rect->x = 3;
+      else
+       rect->x = (widget->allocation.width - 2 * widget->style->xthickness
+                  - (3 + 2*priv->arrow_width 
+                     + priv->max_year_width));
+      break;
+    case ARROW_YEAR_RIGHT:
+      if (year_left) 
+       rect->x = (priv->arrow_width 
+                  + priv->max_year_width);
+      else
+       rect->x = (widget->allocation.width - 2 * widget->style->xthickness 
+                  - 3 - priv->arrow_width);
+      break;
+    }
+}
+
+static void
+calendar_day_rectangle (GtkCalendar  *calendar,
+                       gint          row,
+                       gint          col,
+                       GdkRectangle *rect)
+{
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar);
+
+  rect->x = calendar_left_x_for_column (calendar, col);
+  rect->y = calendar_top_y_for_row (calendar, row);
+  rect->height = calendar_row_height (calendar);
+  rect->width = priv->day_width;
+}
+
+static void
+calendar_set_month_prev (GtkCalendar *calendar)
+{
+  gint month_len;
+  
+  if (calendar->display_flags & GTK_CALENDAR_NO_MONTH_CHANGE)
+    return;
+  
+  if (calendar->month == 0)
+    {
+      calendar->month = 11;
+      calendar->year--;
+    } 
+  else 
+    calendar->month--;
+  
+  month_len = month_length[leap (calendar->year)][calendar->month + 1];
+  
+  calendar_compute_days (calendar);
+  
+  g_signal_emit (calendar,
+                gtk_calendar_signals[PREV_MONTH_SIGNAL],
+                0);
+  g_signal_emit (calendar,
+                gtk_calendar_signals[MONTH_CHANGED_SIGNAL],
+                0);
+  
+  if (month_len < calendar->selected_day)
+    {
+      calendar->selected_day = 0;
+      gtk_calendar_select_day (calendar, month_len);
+    }
+  else
+    {
+      if (calendar->selected_day < 0)
+       calendar->selected_day = calendar->selected_day + 1 + month_length[leap (calendar->year)][calendar->month + 1];
+      gtk_calendar_select_day (calendar, calendar->selected_day);
+    }
+
+  gtk_widget_queue_draw (GTK_WIDGET (calendar));
+}
+
+\f
+/****************************************
+ *           Basic object methods       *
+ ****************************************/
+
+static void
+gtk_calendar_finalize (GObject *object)
+{
+  (* G_OBJECT_CLASS (gtk_calendar_parent_class)->finalize) (object);
+}
+
+static void
+gtk_calendar_destroy (GtkObject *object)
+{
+  calendar_stop_spinning (GTK_CALENDAR (object));
+  
+  GTK_OBJECT_CLASS (gtk_calendar_parent_class)->destroy (object);
+}
+
+
+static void
+calendar_set_display_option (GtkCalendar              *calendar,
+                            GtkCalendarDisplayOptions flag,
+                            gboolean                  setting)
+{
+  GtkCalendarDisplayOptions flags;
+  if (setting) 
+    flags = calendar->display_flags | flag;
+  else
+    flags = calendar->display_flags & ~flag; 
+  gtk_calendar_display_options (calendar, flags);
+}
+
+static gboolean
+calendar_get_display_option (GtkCalendar              *calendar,
+                            GtkCalendarDisplayOptions flag)
+{
+  return (calendar->display_flags & flag) != 0;
+}
+
+static void 
+gtk_calendar_set_property (GObject      *object,
+                          guint         prop_id,
+                          const GValue *value,
+                          GParamSpec   *pspec)
+{
+  GtkCalendar *calendar;
+
+  calendar = GTK_CALENDAR (object);
+
+  switch (prop_id) 
+    {
+    case PROP_YEAR:
+      gtk_calendar_select_month (calendar,
+                                calendar->month,
+                                g_value_get_int (value));
+      break;
+    case PROP_MONTH:
+      gtk_calendar_select_month (calendar,
+                                g_value_get_int (value),
+                                calendar->year);
+      break;
+    case PROP_DAY:
+      gtk_calendar_select_day (calendar,
+                              g_value_get_int (value));
+      break;
+    case PROP_SHOW_HEADING:
+      calendar_set_display_option (calendar,
+                                  GTK_CALENDAR_SHOW_HEADING,
+                                  g_value_get_boolean (value));
+      break;
+    case PROP_SHOW_DAY_NAMES:
+      calendar_set_display_option (calendar,
+                                  GTK_CALENDAR_SHOW_DAY_NAMES,
+                                  g_value_get_boolean (value));
+      break;
+    case PROP_NO_MONTH_CHANGE:
+      calendar_set_display_option (calendar,
+                                  GTK_CALENDAR_NO_MONTH_CHANGE,
+                                  g_value_get_boolean (value));
+      break;
+    case PROP_SHOW_WEEK_NUMBERS:
+      calendar_set_display_option (calendar,
+                                  GTK_CALENDAR_SHOW_WEEK_NUMBERS,
+                                  g_value_get_boolean (value));
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void 
+gtk_calendar_get_property (GObject      *object,
+                          guint         prop_id,
+                          GValue       *value,
+                          GParamSpec   *pspec)
+{
+  GtkCalendar *calendar;
+
+  calendar = GTK_CALENDAR (object);
+
+  switch (prop_id) 
+    {
+    case PROP_YEAR:
+      g_value_set_int (value, calendar->year);
+      break;
+    case PROP_MONTH:
+      g_value_set_int (value, calendar->month);
+      break;
+    case PROP_DAY:
+      g_value_set_int (value, calendar->selected_day);
+      break;
+    case PROP_SHOW_HEADING:
+      g_value_set_boolean (value, calendar_get_display_option (calendar,
+                                                              GTK_CALENDAR_SHOW_HEADING));
+      break;
+    case PROP_SHOW_DAY_NAMES:
+      g_value_set_boolean (value, calendar_get_display_option (calendar,
+                                                              GTK_CALENDAR_SHOW_DAY_NAMES));
+      break;
+    case PROP_NO_MONTH_CHANGE:
+      g_value_set_boolean (value, calendar_get_display_option (calendar,
+                                                              GTK_CALENDAR_NO_MONTH_CHANGE));
+      break;
+    case PROP_SHOW_WEEK_NUMBERS:
+      g_value_set_boolean (value, calendar_get_display_option (calendar,
+                                                              GTK_CALENDAR_SHOW_WEEK_NUMBERS));
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+\f
+/****************************************
+ *             Realization              *
+ ****************************************/
 
+static void
+calendar_realize_arrows (GtkCalendar *calendar)
+{
+  GtkWidget *widget = GTK_WIDGET (calendar);
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar);
+  GdkWindowAttr attributes;
+  gint attributes_mask;
+  gint i;
+  
   /* Arrow windows ------------------------------------- */
   if (! (calendar->display_flags & GTK_CALENDAR_NO_MONTH_CHANGE)
       && (calendar->display_flags & GTK_CALENDAR_SHOW_HEADING))
@@ -838,60 +1295,43 @@ gtk_calendar_realize_arrows (GtkWidget *widget)
                               | GDK_BUTTON_PRESS_MASK  | GDK_BUTTON_RELEASE_MASK
                               | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK);
       attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
-      attributes.y = 3;
-      attributes.width = private_data->arrow_width;
-      attributes.height = private_data->header_h - 7;
       for (i = 0; i < 4; i++)
        {
-         switch (i)
-           {
-           case ARROW_MONTH_LEFT:
-             attributes.x = 3;
-             break;
-           case ARROW_MONTH_RIGHT:
-             attributes.x = (private_data->arrow_width 
-                             + private_data->max_month_width);
-             break;
-           case ARROW_YEAR_LEFT:
-             attributes.x = (widget->allocation.width - 4
-                             - (3 + 2*private_data->arrow_width 
-                                + private_data->max_year_width));
-             break;
-           case ARROW_YEAR_RIGHT:
-             attributes.x = (widget->allocation.width - 4 
-                             - 3 - private_data->arrow_width);
-             break;
-           }
-         private_data->arrow_win[i] = gdk_window_new (private_data->header_win,
-                                                      &attributes, 
-                                                      attributes_mask);
-         private_data->arrow_state[i] = GTK_STATE_NORMAL;
-         gdk_window_set_background (private_data->arrow_win[i],
+         GdkRectangle rect;
+         calendar_arrow_rectangle (calendar, i, &rect);
+         
+         attributes.x = rect.x;
+         attributes.y = rect.y;
+         attributes.width = rect.width;
+         attributes.height = rect.height;
+         priv->arrow_win[i] = gdk_window_new (priv->header_win,
+                                              &attributes, 
+                                              attributes_mask);
+         if (GTK_WIDGET_IS_SENSITIVE (widget))
+           priv->arrow_state[i] = GTK_STATE_NORMAL;
+         else 
+           priv->arrow_state[i] = GTK_STATE_INSENSITIVE;
+         gdk_window_set_background (priv->arrow_win[i],
                                     HEADER_BG_COLOR (GTK_WIDGET (calendar)));
-         gdk_window_show (private_data->arrow_win[i]);
-         gdk_window_set_user_data (private_data->arrow_win[i], widget);
+         gdk_window_show (priv->arrow_win[i]);
+         gdk_window_set_user_data (priv->arrow_win[i], widget);
        }
     }
   else
     {
       for (i = 0; i < 4; i++)
-       private_data->arrow_win[i] = NULL;
+       priv->arrow_win[i] = NULL;
     }
 }
 
 static void
-gtk_calendar_realize_header (GtkWidget *widget)
+calendar_realize_header (GtkCalendar *calendar)
 {
-  GtkCalendar *calendar;
-  GtkCalendarPrivateData *private_data;
+  GtkWidget *widget = GTK_WIDGET (calendar);
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar);
   GdkWindowAttr attributes;
   gint attributes_mask;
   
-  g_return_if_fail (GTK_IS_CALENDAR (widget));
-  
-  calendar = GTK_CALENDAR (widget);
-  private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
-
   /* Header window ------------------------------------- */
   if (calendar->display_flags & GTK_CALENDAR_SHOW_HEADING)
     {
@@ -903,37 +1343,32 @@ gtk_calendar_realize_header (GtkWidget *widget)
       attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
       attributes.x = widget->style->xthickness;
       attributes.y = widget->style->ythickness;
-      attributes.width = widget->allocation.width - 4;
-      attributes.height = private_data->header_h;
-      private_data->header_win = gdk_window_new (widget->window,
-                                            &attributes, attributes_mask);
+      attributes.width = widget->allocation.width - 2 * attributes.x;
+      attributes.height = priv->header_h - 2 * attributes.y;
+      priv->header_win = gdk_window_new (widget->window,
+                                        &attributes, attributes_mask);
       
-      gdk_window_set_background (private_data->header_win,
+      gdk_window_set_background (priv->header_win,
                                 HEADER_BG_COLOR (GTK_WIDGET (calendar)));
-      gdk_window_show (private_data->header_win);
-      gdk_window_set_user_data (private_data->header_win, widget);
+      gdk_window_show (priv->header_win);
+      gdk_window_set_user_data (priv->header_win, widget);
       
     }
   else
     {
-      private_data->header_win = NULL;
+      priv->header_win = NULL;
     }
-  gtk_calendar_realize_arrows (widget);
+  calendar_realize_arrows (calendar);
 }
 
 static void
-gtk_calendar_realize_day_names (GtkWidget *widget)
+calendar_realize_day_names (GtkCalendar *calendar)
 {
-  GtkCalendar *calendar;
-  GtkCalendarPrivateData *private_data;
+  GtkWidget *widget = GTK_WIDGET (calendar);
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar);
   GdkWindowAttr attributes;
   gint attributes_mask;
   
-  g_return_if_fail (GTK_IS_CALENDAR (widget));
-  
-  calendar = GTK_CALENDAR (widget);
-  private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
-
   /* Day names window --------------------------------- */
   if ( calendar->display_flags & GTK_CALENDAR_SHOW_DAY_NAMES)
     {
@@ -944,39 +1379,34 @@ gtk_calendar_realize_day_names (GtkWidget *widget)
       attributes.event_mask = gtk_widget_get_events (widget) | GDK_EXPOSURE_MASK;
       attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
       attributes.x = (widget->style->xthickness + INNER_BORDER);
-      attributes.y = private_data->header_h + (widget->style->ythickness 
+      attributes.y = priv->header_h + (widget->style->ythickness 
                                           + INNER_BORDER);
       attributes.width = (widget->allocation.width 
                          - (widget->style->xthickness + INNER_BORDER) 
                          * 2);
-      attributes.height = private_data->day_name_h;
-      private_data->day_name_win = gdk_window_new (widget->window,
-                                                  &attributes, 
-                                                  attributes_mask);
-      gdk_window_set_background (private_data->day_name_win, 
+      attributes.height = priv->day_name_h;
+      priv->day_name_win = gdk_window_new (widget->window,
+                                          &attributes, 
+                                          attributes_mask);
+      gdk_window_set_background (priv->day_name_win, 
                                 BACKGROUND_COLOR ( GTK_WIDGET ( calendar)));
-      gdk_window_show (private_data->day_name_win);
-      gdk_window_set_user_data (private_data->day_name_win, widget);
+      gdk_window_show (priv->day_name_win);
+      gdk_window_set_user_data (priv->day_name_win, widget);
     }
   else
     {
-      private_data->day_name_win = NULL;
+      priv->day_name_win = NULL;
     }
 }
 
 static void
-gtk_calendar_realize_week_numbers (GtkWidget *widget)
+calendar_realize_week_numbers (GtkCalendar *calendar)
 {
-  GtkCalendar *calendar;
-  GtkCalendarPrivateData *private_data;
+  GtkWidget *widget = GTK_WIDGET (calendar);
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar);
   GdkWindowAttr attributes;
   gint attributes_mask;
   
-  g_return_if_fail (GTK_IS_CALENDAR (widget));
-  
-  calendar = GTK_CALENDAR (widget);
-  private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
-
   /* Week number window -------------------------------- */
   if (calendar->display_flags & GTK_CALENDAR_SHOW_WEEK_NUMBERS)
     {
@@ -988,39 +1418,32 @@ gtk_calendar_realize_week_numbers (GtkWidget *widget)
       
       attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
       attributes.x = widget->style->xthickness + INNER_BORDER;
-      attributes.y = (private_data->header_h + private_data->day_name_h 
+      attributes.y = (priv->header_h + priv->day_name_h 
                      + (widget->style->ythickness + INNER_BORDER));
-      attributes.width = private_data->week_width;
-      attributes.height = private_data->main_h;
-      private_data->week_win = gdk_window_new (widget->window,
-                                              &attributes, attributes_mask);
-      gdk_window_set_background (private_data->week_win,  
+      attributes.width = priv->week_width;
+      attributes.height = priv->main_h;
+      priv->week_win = gdk_window_new (widget->window,
+                                      &attributes, attributes_mask);
+      gdk_window_set_background (priv->week_win,  
                                 BACKGROUND_COLOR (GTK_WIDGET (calendar)));
-      gdk_window_show (private_data->week_win);
-      gdk_window_set_user_data (private_data->week_win, widget);
+      gdk_window_show (priv->week_win);
+      gdk_window_set_user_data (priv->week_win, widget);
     } 
   else
     {
-      private_data->week_win = NULL;
+      priv->week_win = NULL;
     }
 }
 
 static void
 gtk_calendar_realize (GtkWidget *widget)
 {
-  GtkCalendar *calendar;
-  GtkCalendarPrivateData *private_data;
+  GtkCalendar *calendar = GTK_CALENDAR (widget);
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (widget);
   GdkWindowAttr attributes;
   gint attributes_mask;
-  GdkGCValues values;
 
-  g_return_if_fail (GTK_IS_CALENDAR (widget));
-  
-  calendar = GTK_CALENDAR (widget);
-  private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
-  
   GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
-  gtk_calendar_compute_days (calendar);
   
   attributes.x = widget->allocation.x;
   attributes.y = widget->allocation.y;
@@ -1029,7 +1452,7 @@ gtk_calendar_realize (GtkWidget *widget)
   attributes.wclass = GDK_INPUT_OUTPUT;
   attributes.window_type = GDK_WINDOW_CHILD;
   attributes.event_mask =  (gtk_widget_get_events (widget) 
-                           | GDK_EXPOSURE_MASK |GDK_KEY_PRESS_MASK);
+                           | GDK_EXPOSURE_MASK |GDK_KEY_PRESS_MASK | GDK_SCROLL_MASK);
   attributes.visual = gtk_widget_get_visual (widget);
   attributes.colormap = gtk_widget_get_colormap (widget);
   
@@ -1040,121 +1463,105 @@ gtk_calendar_realize (GtkWidget *widget)
   widget->style = gtk_style_attach (widget->style, widget->window);
   
   /* Header window ------------------------------------- */
-  gtk_calendar_realize_header (widget);
+  calendar_realize_header (calendar);
   /* Day names window --------------------------------- */
-  gtk_calendar_realize_day_names (widget);
+  calendar_realize_day_names (calendar);
   /* Week number window -------------------------------- */
-  gtk_calendar_realize_week_numbers (widget);
+  calendar_realize_week_numbers (calendar);
   /* Main Window --------------------------------------         */
   attributes.event_mask =  (gtk_widget_get_events (widget) | GDK_EXPOSURE_MASK
                            | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                            | GDK_POINTER_MOTION_MASK | GDK_LEAVE_NOTIFY_MASK);
   
-  if (calendar->display_flags & GTK_CALENDAR_SHOW_WEEK_NUMBERS)
-    attributes.x = private_data->week_width;
-  else
-    attributes.x = 0;
-  attributes.x += (widget->style->xthickness + INNER_BORDER);
-  attributes.y = (private_data->header_h + private_data->day_name_h 
+  attributes.x = priv->week_width + (widget->style->ythickness + INNER_BORDER);
+  attributes.y = (priv->header_h + priv->day_name_h 
                  + (widget->style->ythickness + INNER_BORDER));
   attributes.width = (widget->allocation.width - attributes.x 
                      - (widget->style->xthickness + INNER_BORDER));
-  attributes.height = private_data->main_h;
-  private_data->main_win = gdk_window_new (widget->window,
-                                          &attributes, attributes_mask);
-  gdk_window_set_background (private_data->main_win, 
+  attributes.height = priv->main_h;
+  priv->main_win = gdk_window_new (widget->window,
+                                  &attributes, attributes_mask);
+  gdk_window_set_background (priv->main_win, 
                             BACKGROUND_COLOR ( GTK_WIDGET ( calendar)));
-  gdk_window_show (private_data->main_win);
-  gdk_window_set_user_data (private_data->main_win, widget);
+  gdk_window_show (priv->main_win);
+  gdk_window_set_user_data (priv->main_win, widget);
   gdk_window_set_background (widget->window, BACKGROUND_COLOR (widget));
   gdk_window_show (widget->window);
   gdk_window_set_user_data (widget->window, widget);
-  
-  /* Set widgets gc */
-  calendar->gc = gdk_gc_new (widget->window);
-
-  values.foreground = widget->style->white;
-  values.function = GDK_XOR;
-  calendar->xor_gc = gdk_gc_new_with_values (widget->window,
-                                            &values,
-                                            GDK_GC_FOREGROUND |
-                                            GDK_GC_FUNCTION);
 }
 
 static void
 gtk_calendar_unrealize (GtkWidget *widget)
 {
-  GtkCalendar *calendar;
-  GtkCalendarPrivateData *private_data;
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (widget);
   gint i;
   
-  g_return_if_fail (GTK_IS_CALENDAR (widget));
-  
-  calendar = GTK_CALENDAR (widget);
-  private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
-  
-  if (private_data->header_win)
+  if (priv->header_win)
     {
       for (i = 0; i < 4; i++)
        {
-         if (private_data->arrow_win[i])
+         if (priv->arrow_win[i])
            {
-             gdk_window_set_user_data (private_data->arrow_win[i], NULL);
-             gdk_window_destroy (private_data->arrow_win[i]);
-             private_data->arrow_win[i] = NULL;
+             gdk_window_set_user_data (priv->arrow_win[i], NULL);
+             gdk_window_destroy (priv->arrow_win[i]);
+             priv->arrow_win[i] = NULL;
            }
        }
-      gdk_window_set_user_data (private_data->header_win, NULL);
-      gdk_window_destroy (private_data->header_win);
-      private_data->header_win = NULL;
+      gdk_window_set_user_data (priv->header_win, NULL);
+      gdk_window_destroy (priv->header_win);
+      priv->header_win = NULL;
     }
   
-  if (private_data->week_win)
+  if (priv->week_win)
     {
-      gdk_window_set_user_data (private_data->week_win, NULL);
-      gdk_window_destroy (private_data->week_win);
-      private_data->week_win = NULL;      
+      gdk_window_set_user_data (priv->week_win, NULL);
+      gdk_window_destroy (priv->week_win);
+      priv->week_win = NULL;      
     }
   
-  if (private_data->main_win)
+  if (priv->main_win)
     {
-      gdk_window_set_user_data (private_data->main_win, NULL);
-      gdk_window_destroy (private_data->main_win);
-      private_data->main_win = NULL;      
+      gdk_window_set_user_data (priv->main_win, NULL);
+      gdk_window_destroy (priv->main_win);
+      priv->main_win = NULL;      
     }
-  if (private_data->day_name_win)
+  if (priv->day_name_win)
     {
-      gdk_window_set_user_data (private_data->day_name_win, NULL);
-      gdk_window_destroy (private_data->day_name_win);
-      private_data->day_name_win = NULL;      
+      gdk_window_set_user_data (priv->day_name_win, NULL);
+      gdk_window_destroy (priv->day_name_win);
+      priv->day_name_win = NULL;      
     }
-  if (calendar->xor_gc)
-    gdk_gc_unref (calendar->xor_gc);
-  if (calendar->gc)
-    gdk_gc_unref (calendar->gc);
   
-  if (GTK_WIDGET_CLASS (parent_class)->unrealize)
-    (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
+  if (GTK_WIDGET_CLASS (gtk_calendar_parent_class)->unrealize)
+    (* GTK_WIDGET_CLASS (gtk_calendar_parent_class)->unrealize) (widget);
 }
 
+\f
+/****************************************
+ *       Size Request and Allocate      *
+ ****************************************/
+
 static void
 gtk_calendar_size_request (GtkWidget     *widget,
                           GtkRequisition *requisition)
 {
-  GtkCalendar *calendar;
-  GtkCalendarPrivateData *private_data;
+  GtkCalendar *calendar = GTK_CALENDAR (widget);
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (widget);
   PangoLayout *layout;
   PangoRectangle logical_rect;
 
   gint height;
   gint i;
-  gchar buffer[255];
   gint calendar_margin = CALENDAR_MARGIN;
   gint header_width, main_width;
   gint max_header_height = 0;
+  gint focus_width;
+  gint focus_padding;
   
-  calendar = GTK_CALENDAR (widget);
-  private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
+  gtk_widget_style_get (GTK_WIDGET (widget),
+                       "focus-line-width", &focus_width,
+                       "focus-padding", &focus_padding,
+                       NULL);
 
   layout = gtk_widget_create_pango_layout (widget, NULL);
   
@@ -1166,92 +1573,104 @@ gtk_calendar_size_request (GtkWidget     *widget,
   
   if (calendar->display_flags & GTK_CALENDAR_SHOW_HEADING)
     {
-      private_data->max_month_width = 0;
+      priv->max_month_width = 0;
       for (i = 0; i < 12; i++)
        {
          pango_layout_set_text (layout, default_monthname[i], -1);
          pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
-         private_data->max_month_width = MAX (private_data->max_month_width,
+         priv->max_month_width = MAX (priv->max_month_width,
                                               logical_rect.width + 8);
          max_header_height = MAX (max_header_height, logical_rect.height); 
        }
-      private_data->max_year_width = 0;
-      for (i=0; i<10; i++)
-       {
-         sprintf (buffer, "%d%d%d%d", i,i,i,i);
-         pango_layout_set_text (layout, buffer, -1);     
-         pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
-         private_data->max_year_width = MAX (private_data->max_year_width,
-                                             logical_rect.width + 8);
-         max_header_height = MAX (max_header_height, logical_rect.height); 
-       }
+
+      priv->max_year_width = 0;
+      /* Translators:  This is a text measurement template.
+       * Translate it to the widest year text. 
+       * 
+       * Don't include the prefix "year measurement template|" 
+       * in the translation.
+       *
+       * If you don't understand this, leave it as "2000"
+       */
+      pango_layout_set_text (layout, Q_("year measurement template|2000"), -1);          
+      pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
+      priv->max_year_width = MAX (priv->max_year_width,
+                                 logical_rect.width + 8);
+      max_header_height = MAX (max_header_height, logical_rect.height); 
     } 
   else 
     {
-      private_data->max_month_width = 0;
-      private_data->max_year_width = 0;
+      priv->max_month_width = 0;
+      priv->max_year_width = 0;
     }
   
   if (calendar->display_flags & GTK_CALENDAR_NO_MONTH_CHANGE)
-    header_width = (private_data->max_month_width 
-                   + private_data->max_year_width
+    header_width = (priv->max_month_width 
+                   + priv->max_year_width
                    + 3 * 3);
   else
-    header_width = (private_data->max_month_width 
-                   + private_data->max_year_width
-                   + 4 * private_data->arrow_width + 3 * 3);
+    header_width = (priv->max_month_width 
+                   + priv->max_year_width
+                   + 4 * priv->arrow_width + 3 * 3);
 
   /* Mainwindow labels width */
   
-  private_data->max_day_char_width = 0;
-  private_data->min_day_width = 0;
+  priv->max_day_char_width = 0;
+  priv->max_day_char_ascent = 0;
+  priv->max_day_char_descent = 0;
+  priv->min_day_width = 0;
+
   for (i = 0; i < 9; i++)
     {
-      sprintf (buffer, "%d%d", i, i);
+      gchar buffer[32];
+      g_snprintf (buffer, sizeof (buffer), Q_("calendar:day:digits|%d"), i * 11);
       pango_layout_set_text (layout, buffer, -1);        
       pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
-      private_data->min_day_width = MAX (private_data->min_day_width,
+      priv->min_day_width = MAX (priv->min_day_width,
                                         logical_rect.width);
 
-      private_data->max_day_char_ascent = MAX (private_data->max_label_char_ascent,
+      priv->max_day_char_ascent = MAX (priv->max_day_char_ascent,
                                               PANGO_ASCENT (logical_rect));
-      private_data->max_day_char_descent = MAX (private_data->max_label_char_descent, 
+      priv->max_day_char_descent = MAX (priv->max_day_char_descent, 
                                                PANGO_DESCENT (logical_rect));
     }
   /* We add one to max_day_char_width to be able to make the marked day "bold" */
-  private_data->max_day_char_width = private_data->min_day_width / 2 + 1;
+  priv->max_day_char_width = priv->min_day_width / 2 + 1;
   
+  priv->max_label_char_ascent = 0;
+  priv->max_label_char_descent = 0;
   if (calendar->display_flags & GTK_CALENDAR_SHOW_DAY_NAMES)
     for (i = 0; i < 7; i++)
       {
        pango_layout_set_text (layout, default_abbreviated_dayname[i], -1);
        pango_layout_line_get_pixel_extents (pango_layout_get_lines (layout)->data, NULL, &logical_rect);
 
-       private_data->min_day_width = MAX (private_data->min_day_width, logical_rect.width);
-       private_data->max_label_char_ascent = MAX (private_data->max_label_char_ascent,
+       priv->min_day_width = MAX (priv->min_day_width, logical_rect.width);
+       priv->max_label_char_ascent = MAX (priv->max_label_char_ascent,
                                                   PANGO_ASCENT (logical_rect));
-       private_data->max_label_char_descent = MAX (private_data->max_label_char_descent, 
+       priv->max_label_char_descent = MAX (priv->max_label_char_descent, 
                                                    PANGO_DESCENT (logical_rect));
       }
   
-  private_data->max_week_char_width = 0;
+  priv->max_week_char_width = 0;
   if (calendar->display_flags & GTK_CALENDAR_SHOW_WEEK_NUMBERS)
     for (i = 0; i < 9; i++)
       {
-       sprintf (buffer, "%d%d", i, i);
+       gchar buffer[32];
+       g_snprintf (buffer, sizeof (buffer), Q_("calendar:week:digits|%d"), i * 11);
        pango_layout_set_text (layout, buffer, -1);       
        pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
-       private_data->max_week_char_width = MAX (private_data->max_week_char_width,
-                                                logical_rect.width / 2);
+       priv->max_week_char_width = MAX (priv->max_week_char_width,
+                                          logical_rect.width / 2);
       }
   
-  main_width = (7 * (private_data->min_day_width + DAY_XPAD * 2) + (DAY_XSEP * 6) + CALENDAR_MARGIN * 2
-               + (private_data->max_week_char_width
-                  ? private_data->max_week_char_width * 2 + DAY_XPAD * 2 + CALENDAR_XSEP * 2
+  main_width = (7 * (priv->min_day_width + (focus_padding + focus_width) * 2) + (DAY_XSEP * 6) + CALENDAR_MARGIN * 2
+               + (priv->max_week_char_width
+                  ? priv->max_week_char_width * 2 + (focus_padding + focus_width) * 2 + CALENDAR_XSEP * 2
                   : 0));
   
   
-  requisition->width = MAX (header_width+4, main_width + (widget->style->xthickness + INNER_BORDER) *2);
+  requisition->width = MAX (header_width, main_width + INNER_BORDER * 2) + widget->style->xthickness * 2;
   
   /*
    * Calculate the requisition height for the widget.
@@ -1259,85 +1678,68 @@ gtk_calendar_size_request (GtkWidget      *widget,
   
   if (calendar->display_flags & GTK_CALENDAR_SHOW_HEADING)
     {
-      private_data->header_h = (max_header_height + CALENDAR_YSEP * 2);
+      priv->header_h = (max_header_height + CALENDAR_YSEP * 2);
     }
   else
     {
-      private_data->header_h = 0;
+      priv->header_h = 0;
     }
   
   if (calendar->display_flags & GTK_CALENDAR_SHOW_DAY_NAMES)
     {
-      private_data->day_name_h = (private_data->max_label_char_ascent
-                                 + private_data->max_label_char_descent
-                                 + 2 * DAY_YPAD + calendar_margin);
+      priv->day_name_h = (priv->max_label_char_ascent
+                                 + priv->max_label_char_descent
+                                 + 2 * (focus_padding + focus_width) + calendar_margin);
       calendar_margin = CALENDAR_YSEP;
     } 
   else
     {
-      private_data->day_name_h = 0;
+      priv->day_name_h = 0;
     }
 
-  private_data->main_h = (CALENDAR_MARGIN + calendar_margin
-                         + 6 * (private_data->max_day_char_ascent
-                                + private_data->max_day_char_descent 
-                                + DAY_YPAD * 2)
+  priv->main_h = (CALENDAR_MARGIN + calendar_margin
+                         + 6 * (priv->max_day_char_ascent
+                                + priv->max_day_char_descent 
+                                + 2 * (focus_padding + focus_width))
                          + DAY_YSEP * 5);
   
-  /* 
-   * If we display weeknumbers we need some extra space 
-   */
-  
-  if (calendar->display_flags & GTK_CALENDAR_SHOW_WEEK_NUMBERS)
-    {
-      private_data->main_h = MAX (private_data->main_h,
-                                 (CALENDAR_MARGIN + calendar_margin
-                                  + 6 * (private_data->max_day_char_ascent 
-                                         + private_data->max_day_char_descent 
-                                         + DAY_YPAD * 2)
-                                  + DAY_YSEP * 5));
-    }
-  
-  height = (private_data->header_h + private_data->day_name_h 
-           + private_data->main_h);
+  height = (priv->header_h + priv->day_name_h 
+           + priv->main_h);
   
   requisition->height = height + (widget->style->ythickness + INNER_BORDER) * 2;
 
-  g_object_unref (G_OBJECT (layout));
+  g_object_unref (layout);
 }
 
 static void
 gtk_calendar_size_allocate (GtkWidget    *widget,
                            GtkAllocation *allocation)
 {
-  GtkCalendar *calendar;
-  GtkCalendarPrivateData *private_data;
-  
-  g_return_if_fail (GTK_IS_CALENDAR (widget));
-  g_return_if_fail (allocation != NULL);
+  GtkCalendar *calendar = GTK_CALENDAR (widget);
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (widget);
+  gint xthickness = widget->style->xthickness;
+  gint ythickness = widget->style->xthickness;
+  guint i;
   
   widget->allocation = *allocation;
-  
-  calendar = GTK_CALENDAR (widget);
-  private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
-  
+    
   if (calendar->display_flags & GTK_CALENDAR_SHOW_WEEK_NUMBERS)
     {
-      private_data->day_width = (private_data->min_day_width
-                            * ((allocation->width - (widget->style->xthickness + INNER_BORDER) * 2
-                                - (CALENDAR_MARGIN * 2) -  (DAY_XSEP * 7) - CALENDAR_XSEP * 2))
-                            / (7 * private_data->min_day_width + private_data->max_week_char_width * 2));
-      private_data->week_width = ((allocation->width - (widget->style->xthickness + INNER_BORDER) * 2
-                              - (CALENDAR_MARGIN * 2) - (DAY_XSEP * 7) - CALENDAR_XSEP * 2 )
-                             - private_data->day_width * 7 + CALENDAR_MARGIN + CALENDAR_XSEP);
+      priv->day_width = (priv->min_day_width
+                        * ((allocation->width - (xthickness + INNER_BORDER) * 2
+                            - (CALENDAR_MARGIN * 2) -  (DAY_XSEP * 6) - CALENDAR_XSEP * 2))
+                        / (7 * priv->min_day_width + priv->max_week_char_width * 2));
+      priv->week_width = ((allocation->width - (xthickness + INNER_BORDER) * 2
+                          - (CALENDAR_MARGIN * 2) - (DAY_XSEP * 6) - CALENDAR_XSEP * 2 )
+                         - priv->day_width * 7 + CALENDAR_MARGIN + CALENDAR_XSEP);
     } 
   else 
     {
-      private_data->day_width = (allocation->width
-                            - (widget->style->xthickness + INNER_BORDER) * 2
-                            - (CALENDAR_MARGIN * 2)
-                            - (DAY_XSEP * 7))/7;
-      private_data->week_width = 0;
+      priv->day_width = (allocation->width
+                        - (xthickness + INNER_BORDER) * 2
+                        - (CALENDAR_MARGIN * 2)
+                        - (DAY_XSEP * 6))/7;
+      priv->week_width = 0;
     }
   
   if (GTK_WIDGET_REALIZED (widget))
@@ -1345,325 +1747,301 @@ gtk_calendar_size_allocate (GtkWidget   *widget,
       gdk_window_move_resize (widget->window,
                              allocation->x, allocation->y,
                              allocation->width, allocation->height);
-      if (private_data->header_win)
-       gdk_window_move_resize (private_data->header_win,
-                               2, 2,
-                               allocation->width-4, private_data->header_h);
-      if (private_data->arrow_win[ARROW_MONTH_LEFT])
-       gdk_window_move_resize (private_data->arrow_win[ARROW_MONTH_LEFT],
-                               3, 3,
-                               private_data->arrow_width,
-                               private_data->header_h - 7);
-      if (private_data->arrow_win[ARROW_MONTH_RIGHT])
-       gdk_window_move_resize (private_data->arrow_win[ARROW_MONTH_RIGHT],
-                               (private_data->arrow_width 
-                                + private_data->max_month_width), 
-                               3,
-                               private_data->arrow_width,
-                               private_data->header_h - 7);
-      if (private_data->arrow_win[ARROW_YEAR_LEFT])
-       gdk_window_move_resize (private_data->arrow_win[ARROW_YEAR_LEFT],
-                               (allocation->width - 4
-                                - (3 + 2*private_data->arrow_width 
-                                   + private_data->max_year_width)),
-                               3,
-                               private_data->arrow_width,
-                               private_data->header_h - 7);
-      if (private_data->arrow_win[ARROW_YEAR_RIGHT])
-       gdk_window_move_resize (private_data->arrow_win[ARROW_YEAR_RIGHT],
-                               (allocation->width - 4 
-                                - 3 - private_data->arrow_width), 
-                               3,
-                               private_data->arrow_width,
-                               private_data->header_h - 7);
-      if (private_data->day_name_win)
-       gdk_window_move_resize (private_data->day_name_win,
-                               widget->style->xthickness + INNER_BORDER,
-                               private_data->header_h + (widget->style->ythickness + INNER_BORDER),
-                               allocation->width - (widget->style->xthickness + INNER_BORDER) * 2,
-                               private_data->day_name_h);
-      if (private_data->week_win)
-       gdk_window_move_resize (private_data->week_win,
-                               (widget->style->xthickness + INNER_BORDER),
-                               private_data->header_h + private_data->day_name_h
-                               + (widget->style->ythickness + INNER_BORDER),
-                               private_data->week_width,
-                               private_data->main_h);
-      gdk_window_move_resize (private_data->main_win,
-                             (private_data->week_width ? private_data->week_width + CALENDAR_XSEP :0) 
-                             + (widget->style->xthickness + INNER_BORDER),
-                             private_data->header_h + private_data->day_name_h
-                             + (widget->style->ythickness + INNER_BORDER),
-                             allocation->width 
-                             - (private_data->week_width ? private_data->week_width + CALENDAR_XSEP :0) 
-                             - (widget->style->xthickness + INNER_BORDER) * 2,
-                             private_data->main_h);
-    }
-}
+      if (priv->header_win)
+       gdk_window_move_resize (priv->header_win,
+                               xthickness, ythickness,
+                               allocation->width - 2 * xthickness, priv->header_h);
 
-static gboolean
-gtk_calendar_expose (GtkWidget     *widget,
-                    GdkEventExpose *event)
-{
-  GtkCalendar *calendar;
-  GtkCalendarPrivateData *private_data;
-
-  g_return_val_if_fail (widget != NULL, FALSE);
-  g_return_val_if_fail (GTK_IS_CALENDAR (widget), FALSE);
-  g_return_val_if_fail (event != NULL, FALSE);
-  
-  calendar = GTK_CALENDAR (widget);
-  private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
-  
-  if (GTK_WIDGET_DRAWABLE (widget))
-    {
-      if (event->window == private_data->main_win)
-       gtk_calendar_paint_main (widget);
-      
-      if (event->window == private_data->header_win)
-       gtk_calendar_paint_header (widget);
-      
-      if (event->window == private_data->day_name_win)
-       gtk_calendar_paint_day_names (widget);
+      for (i = 0 ; i < 4 ; i++)
+       {
+         if (priv->arrow_win[i])
+           {
+             GdkRectangle rect;
+             calendar_arrow_rectangle (calendar, i, &rect);
+         
+             gdk_window_move_resize (priv->arrow_win[i],
+                                     rect.x, rect.y, rect.width, rect.height);
+           }
+       }
       
-      if (event->window == private_data->week_win)
-       gtk_calendar_paint_week_numbers (widget);
-      if (event->window == widget->window)
+      if (priv->day_name_win)
+       gdk_window_move_resize (priv->day_name_win,
+                               xthickness + INNER_BORDER,
+                               priv->header_h + (widget->style->ythickness + INNER_BORDER),
+                               allocation->width - (xthickness + INNER_BORDER) * 2,
+                               priv->day_name_h);
+      if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR) 
        {
-         gtk_paint_shadow (widget->style, widget->window, GTK_WIDGET_STATE (widget),
-                           GTK_SHADOW_IN, NULL, widget, "calendar",
-                           0, 0, widget->allocation.width, widget->allocation.height);
+         if (priv->week_win)
+           gdk_window_move_resize (priv->week_win,
+                                   (xthickness + INNER_BORDER),
+                                   priv->header_h + priv->day_name_h
+                                   + (widget->style->ythickness + INNER_BORDER),
+                                   priv->week_width,
+                                   priv->main_h);
+         gdk_window_move_resize (priv->main_win,
+                                 priv->week_width + (xthickness + INNER_BORDER),
+                                 priv->header_h + priv->day_name_h
+                                 + (widget->style->ythickness + INNER_BORDER),
+                                 allocation->width 
+                                 - priv->week_width 
+                                 - (xthickness + INNER_BORDER) * 2,
+                                 priv->main_h);
+       }
+      else 
+       {
+         gdk_window_move_resize (priv->main_win,
+                                 (xthickness + INNER_BORDER),
+                                 priv->header_h + priv->day_name_h
+                                 + (widget->style->ythickness + INNER_BORDER),
+                                 allocation->width 
+                                 - priv->week_width 
+                                 - (xthickness + INNER_BORDER) * 2,
+                                 priv->main_h);
+         if (priv->week_win)
+           gdk_window_move_resize (priv->week_win,
+                                   allocation->width 
+                                   - priv->week_width 
+                                   - (xthickness + INNER_BORDER),
+                                   priv->header_h + priv->day_name_h
+                                   + (widget->style->ythickness + INNER_BORDER),
+                                   priv->week_width,
+                                   priv->main_h);
        }
     }
-  
-  return FALSE;
 }
 
+\f
+/****************************************
+ *              Repainting              *
+ ****************************************/
+
 static void
-gtk_calendar_paint_header (GtkWidget *widget)
+calendar_paint_header (GtkCalendar *calendar)
 {
-  GtkCalendar *calendar;
-  GdkGC *gc;
+  GtkWidget *widget = GTK_WIDGET (calendar);
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar);
+  cairo_t *cr;
   char buffer[255];
   int x, y;
-  gint header_width, cal_height;
+  gint header_width;
   gint max_month_width;
   gint max_year_width;
-  GtkCalendarPrivateData *private_data;
   PangoLayout *layout;
   PangoRectangle logical_rect;
+  gboolean year_left;
+  time_t tmp_time;
+  struct tm *tm;
+  gchar *str;
 
-  calendar = GTK_CALENDAR (widget);
-  private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
-
-  if (private_data->freeze_count)
-    {
-      private_data->dirty_header = 1;
-      return;
-    }
-  private_data->dirty_header = 0;
-  gc = calendar->gc;
-  
-  /* Clear window */
-  gdk_window_clear (private_data->header_win);
-  
-  header_width = widget->allocation.width - 4;
-  cal_height = widget->allocation.height;
-  
-  max_month_width = private_data->max_month_width;
-  max_year_width = private_data->max_year_width;
-  
-  gdk_gc_set_foreground (gc, BACKGROUND_COLOR (GTK_WIDGET (calendar)));
-  gtk_draw_shadow (widget->style, private_data->header_win,
-                  GTK_STATE_NORMAL, GTK_SHADOW_OUT,
-                  0, 0, header_width, private_data->header_h);
-  
+  if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR) 
+    year_left = priv->year_before;
+  else
+    year_left = !priv->year_before;
+
+  cr = gdk_cairo_create (priv->header_win);
+  
+  header_width = widget->allocation.width - 2 * widget->style->xthickness;
+  
+  max_month_width = priv->max_month_width;
+  max_year_width = priv->max_year_width;
+  
+  gtk_paint_shadow (widget->style, priv->header_win,
+                   GTK_STATE_NORMAL, GTK_SHADOW_OUT,
+                   NULL, widget, "calendar",
+                   0, 0, header_width, priv->header_h);
+
+  tmp_time = 1;  /* Jan 1 1970, 00:00:01 UTC */
+  tm = gmtime (&tmp_time);
+  tm->tm_year = calendar->year - 1900;
+
+  /* Translators: This dictates how the year is displayed in
+   * gtkcalendar widget.  See strftime() manual for the format.
+   * Use only ASCII in the translation.
+   *
+   * Also look for the msgid "year measurement template|2000".  
+   * Translate that entry to a year with the widest output of this
+   * msgid. 
+   * 
+   * Don't include the prefix "calendar year format|" in the 
+   * translation. "%Y" is appropriate for most locales.
+   */
+  strftime (buffer, sizeof (buffer), Q_("calendar year format|%Y"), tm);
+  str = g_locale_to_utf8 (buffer, -1, NULL, NULL, NULL);
+  layout = gtk_widget_create_pango_layout (widget, str);
+  g_free (str);
   
-  sprintf (buffer, "%d", calendar->year);
-  layout = gtk_widget_create_pango_layout (widget, buffer);
   pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
   
   /* Draw title */
-  y = (private_data->header_h - logical_rect.height) / 2;
+  y = (priv->header_h - logical_rect.height) / 2;
   
   /* Draw year and its arrows */
   
   if (calendar->display_flags & GTK_CALENDAR_NO_MONTH_CHANGE)
-    x = header_width - (3 + max_year_width
-                       - (max_year_width - logical_rect.width)/2);
+    if (year_left)
+      x = 3 + (max_year_width - logical_rect.width)/2;
+    else
+      x = header_width - (3 + max_year_width
+                         - (max_year_width - logical_rect.width)/2);
   else
-    x = header_width - (3 + private_data->arrow_width + max_year_width
-                       - (max_year_width - logical_rect.width)/2);
-    
+    if (year_left)
+      x = 3 + priv->arrow_width + (max_year_width - logical_rect.width)/2;
+    else
+      x = header_width - (3 + priv->arrow_width + max_year_width
+                         - (max_year_width - logical_rect.width)/2);
   
-  gdk_gc_set_foreground (gc, HEADER_FG_COLOR (GTK_WIDGET (calendar)));
-  gdk_draw_layout (private_data->header_win, gc, x, y, layout);
+
+  gdk_cairo_set_source_color (cr, HEADER_FG_COLOR (GTK_WIDGET (calendar)));
+  cairo_move_to (cr, x, y);
+  pango_cairo_show_layout (cr, layout);
   
   /* Draw month */
-  sprintf (buffer, "%s", default_monthname[calendar->month]);
+  g_snprintf (buffer, sizeof (buffer), "%s", default_monthname[calendar->month]);
   pango_layout_set_text (layout, buffer, -1);
   pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
 
   if (calendar->display_flags & GTK_CALENDAR_NO_MONTH_CHANGE)
+    if (year_left)
+      x = header_width - (3 + max_month_width
+                         - (max_month_width - logical_rect.width)/2);      
+    else
     x = 3 + (max_month_width - logical_rect.width) / 2;
   else
-    x = 3 + private_data->arrow_width + (max_month_width - logical_rect.width)/2;
+    if (year_left)
+      x = header_width - (3 + priv->arrow_width + max_month_width
+                         - (max_month_width - logical_rect.width)/2);
+    else
+    x = 3 + priv->arrow_width + (max_month_width - logical_rect.width)/2;
 
-  gdk_draw_layout (private_data->header_win, gc, x, y, layout);
-  
-  gdk_gc_set_foreground (gc, BACKGROUND_COLOR (GTK_WIDGET (calendar)));
-  
-  gtk_calendar_paint_arrow (widget, ARROW_MONTH_LEFT);
-  gtk_calendar_paint_arrow (widget, ARROW_MONTH_RIGHT);
-  gtk_calendar_paint_arrow (widget, ARROW_YEAR_LEFT);
-  gtk_calendar_paint_arrow (widget, ARROW_YEAR_RIGHT);
+  cairo_move_to (cr, x, y);
+  pango_cairo_show_layout (cr, layout);
 
-  g_object_unref (G_OBJECT (layout));
+  g_object_unref (layout);
+  cairo_destroy (cr);
 }
 
 static void
-gtk_calendar_paint_day_names (GtkWidget *widget)
+calendar_paint_day_names (GtkCalendar *calendar)
 {
-  GtkCalendar *calendar;
-  GdkGC *gc;
+  GtkWidget *widget = GTK_WIDGET (calendar);
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar);
+  cairo_t *cr;
   char buffer[255];
   int day,i;
   int day_width, cal_width;
-  gint cal_height;
   int day_wid_sep;
   PangoLayout *layout;
   PangoRectangle logical_rect;
-  GtkCalendarPrivateData *private_data;
-
-  g_return_if_fail (GTK_IS_CALENDAR (widget));
-  calendar = GTK_CALENDAR (widget);
-  private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
-  gc = calendar->gc;
-  
-  /*
-   * Handle freeze/thaw functionality
-   */
-  
-  if (private_data->freeze_count)
-    {
-      private_data->dirty_day_names = 1;
-      return;
-    }
-  private_data->dirty_day_names = 0;
+  gint focus_padding;
+  gint focus_width;
   
-  /*
-   * Clear the window
-   */
+  cr = gdk_cairo_create (priv->day_name_win);
   
-  gdk_window_clear (private_data->day_name_win);
+  gtk_widget_style_get (GTK_WIDGET (widget),
+                       "focus-line-width", &focus_width,
+                       "focus-padding", &focus_padding,
+                       NULL);
   
-  day_width = private_data->day_width;
+  day_width = priv->day_width;
   cal_width = widget->allocation.width;
-  cal_height = widget->allocation.height;
   day_wid_sep = day_width + DAY_XSEP;
   
   /*
    * Draw rectangles as inverted background for the labels.
    */
-  
-  gdk_gc_set_foreground (gc, &widget->style->base[GTK_STATE_SELECTED]);
-  gdk_draw_rectangle (private_data->day_name_win, gc, TRUE,
-                     CALENDAR_MARGIN, CALENDAR_MARGIN,
-                     cal_width-CALENDAR_MARGIN * 2,
-                     private_data->day_name_h - CALENDAR_MARGIN);
+
+  gdk_cairo_set_source_color (cr, SELECTED_BG_COLOR (widget));
+  cairo_rectangle (cr,
+                  CALENDAR_MARGIN, CALENDAR_MARGIN,
+                  cal_width-CALENDAR_MARGIN * 2,
+                  priv->day_name_h - CALENDAR_MARGIN);
+  cairo_fill (cr);
   
   if (calendar->display_flags & GTK_CALENDAR_SHOW_WEEK_NUMBERS)
-    gdk_draw_rectangle (private_data->day_name_win, gc, TRUE,
-                       CALENDAR_MARGIN,
-                       private_data->day_name_h - CALENDAR_YSEP,
-                       private_data->week_width - CALENDAR_YSEP - CALENDAR_MARGIN,
-                       CALENDAR_YSEP);
+    {
+      cairo_rectangle (cr, 
+                      CALENDAR_MARGIN,
+                      priv->day_name_h - CALENDAR_YSEP,
+                      priv->week_width - CALENDAR_YSEP - CALENDAR_MARGIN,
+                      CALENDAR_YSEP);
+      cairo_fill (cr);
+    }
   
   /*
    * Write the labels
    */
 
   layout = gtk_widget_create_pango_layout (widget, NULL);
-  
-  gdk_gc_set_foreground (gc, &widget->style->text[GTK_STATE_SELECTED]);
+
+  gdk_cairo_set_source_color (cr, SELECTED_FG_COLOR (widget));
   for (i = 0; i < 7; i++)
     {
       if (gtk_widget_get_direction (GTK_WIDGET (calendar)) == GTK_TEXT_DIR_RTL)
        day = 6 - i;
       else
        day = i;
-      if (calendar->display_flags & GTK_CALENDAR_WEEK_START_MONDAY)
-       day= (day+1)%7;
-      sprintf (buffer, "%s", default_abbreviated_dayname[day]);
+      day = (day + priv->week_start) % 7;
+      g_snprintf (buffer, sizeof (buffer), "%s", default_abbreviated_dayname[day]);
 
       pango_layout_set_text (layout, buffer, -1);
       pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
 
-      gdk_draw_layout (private_data->day_name_win, gc, 
-                      ((private_data->week_width ? CALENDAR_XSEP : CALENDAR_MARGIN)
-                       + day_wid_sep * i
-                       + private_data->week_width
-                       + (day_width - logical_rect.width)/2),
-                      CALENDAR_MARGIN + DAY_YPAD + logical_rect.y,
-                      layout);
+      cairo_move_to (cr, 
+                    (CALENDAR_MARGIN +
+                     + (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR ?
+                        (priv->week_width + (priv->week_width ? CALENDAR_XSEP : 0))
+                        : 0)
+                     + day_wid_sep * i
+                     + (day_width - logical_rect.width)/2),
+                    CALENDAR_MARGIN + focus_width + focus_padding + logical_rect.y);
+      pango_cairo_show_layout (cr, layout);
     }
   
-  g_object_unref (G_OBJECT (layout));
+  g_object_unref (layout);
+  cairo_destroy (cr);
 }
 
 static void
-gtk_calendar_paint_week_numbers (GtkWidget *widget)
+calendar_paint_week_numbers (GtkCalendar *calendar)
 {
-  GtkCalendar *calendar;
-  GdkGC *gc;
+  GtkWidget *widget = GTK_WIDGET (calendar);
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar);
+  cairo_t *cr;
   gint row, week = 0, year;
   gint x_loc;
-  char buffer[3];
+  char buffer[32];
   gint y_loc, day_height;
-  GtkCalendarPrivateData *private_data;
   PangoLayout *layout;
   PangoRectangle logical_rect;
+  gint focus_padding;
+  gint focus_width;
   
-  g_return_if_fail (GTK_IS_CALENDAR (widget));
-  g_return_if_fail (widget->window != NULL);
-  calendar = GTK_CALENDAR (widget);
-  private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
-  gc = calendar->gc;
-  
-  /*
-   * Handle freeze/thaw functionality
-   */
-  
-  if (private_data->freeze_count)
-    {
-      private_data->dirty_week = 1;
-      return;
-    }
-  private_data->dirty_week = 0;
-  
-  /*
-   * Clear the window
-   */
+  cr = gdk_cairo_create (priv->week_win);
   
-  gdk_window_clear (private_data->week_win);
+  gtk_widget_style_get (GTK_WIDGET (widget),
+                       "focus-line-width", &focus_width,
+                       "focus-padding", &focus_padding,
+                       NULL);
   
   /*
    * Draw a rectangle as inverted background for the labels.
    */
-  
-  gdk_gc_set_foreground (gc, &widget->style->base[GTK_STATE_SELECTED]);
-  if (private_data->day_name_win)
-    gdk_draw_rectangle (private_data->week_win, gc, TRUE,
-                       CALENDAR_MARGIN,
-                       0,
-                       private_data->week_width - CALENDAR_MARGIN - CALENDAR_XSEP,
-                       private_data->main_h - CALENDAR_MARGIN);
+
+  gdk_cairo_set_source_color (cr, SELECTED_BG_COLOR (widget));
+  if (priv->day_name_win)
+    cairo_rectangle (cr, 
+                    CALENDAR_MARGIN,
+                    0,
+                    priv->week_width - CALENDAR_MARGIN,
+                    priv->main_h - CALENDAR_MARGIN);
   else
-    gdk_draw_rectangle (private_data->week_win, gc, TRUE,
-                       CALENDAR_MARGIN,
-                       CALENDAR_MARGIN,
-                       private_data->week_width - CALENDAR_MARGIN - CALENDAR_XSEP,
-                       private_data->main_h - 2 * CALENDAR_MARGIN);
+    cairo_rectangle (cr,
+                    CALENDAR_MARGIN,
+                    CALENDAR_MARGIN,
+                    priv->week_width - CALENDAR_MARGIN,
+                    priv->main_h - 2 * CALENDAR_MARGIN);
+  cairo_fill (cr);
   
   /*
    * Write the labels
@@ -1671,45 +2049,56 @@ gtk_calendar_paint_week_numbers (GtkWidget *widget)
   
   layout = gtk_widget_create_pango_layout (widget, NULL);
   
-  gdk_gc_set_foreground (gc, &widget->style->text[GTK_STATE_SELECTED]);
-  day_height = row_height (calendar);
+  gdk_cairo_set_source_color (cr, SELECTED_FG_COLOR (widget));
+  day_height = calendar_row_height (calendar);
   for (row = 0; row < 6; row++)
     {
+      gboolean result;
+      
       year = calendar->year;
       if (calendar->day[row][6] < 15 && row > 3 && calendar->month == 11)
        year++;
 
-      g_return_if_fail (week_of_year (&week, &year,            
-                                     ((calendar->day[row][6] < 15 && row > 3 ? 1 : 0)
-                                      + calendar->month) % 12 + 1, calendar->day[row][6]));
-
-      sprintf (buffer, "%d", week);
+      result = week_of_year (&week, &year,             
+                            ((calendar->day[row][6] < 15 && row > 3 ? 1 : 0)
+                             + calendar->month) % 12 + 1, calendar->day[row][6]);
+      g_return_if_fail (result);
+
+      /* Translators: this defines whether the week numbers should use
+       * localized digits or the ones used in English (0123...).
+       *
+       * Translate to "%Id" if you want to use localized digits, or
+       * translate to "%d" otherwise.  Don't include the
+       * "calendar:week:digits|" part in the translation.
+       *
+       * Note that translating this doesn't guarantee that you get localized
+       * digits.  That needs support from your system and locale definition
+       * too.
+       */
+      g_snprintf (buffer, sizeof (buffer), Q_("calendar:week:digits|%d"), week);
       pango_layout_set_text (layout, buffer, -1);
       pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
 
-      y_loc = top_y_for_row (calendar, row) + (day_height - logical_rect.height) / 2;
+      y_loc = calendar_top_y_for_row (calendar, row) + (day_height - logical_rect.height) / 2;
 
-      x_loc = (private_data->week_width
+      x_loc = (priv->week_width
               - logical_rect.width
-              - CALENDAR_XSEP - DAY_XPAD);
+              - CALENDAR_XSEP - focus_padding - focus_width);
 
-      gdk_draw_layout (private_data->week_win, gc, x_loc, y_loc, layout);
+      cairo_move_to (cr, x_loc, y_loc);
+      pango_cairo_show_layout (cr, layout);
     }
   
-  g_object_unref (G_OBJECT (layout));
+  g_object_unref (layout);
+  cairo_destroy (cr);
 }
 
 static void
-gtk_calendar_paint_day_num (GtkWidget *widget,
-                           gint       day)
+calendar_invalidate_day_num (GtkCalendar *calendar,
+                            gint         day)
 {
-  GtkCalendar *calendar;
   gint r, c, row, col;
   
-  g_return_if_fail (GTK_IS_CALENDAR (widget));
-  
-  calendar = GTK_CALENDAR (widget);
-  
   row = -1;
   col = -1;
   for (r = 0; r < 6; r++)
@@ -1724,572 +2113,493 @@ gtk_calendar_paint_day_num (GtkWidget *widget,
   g_return_if_fail (row != -1);
   g_return_if_fail (col != -1);
   
-  gtk_calendar_paint_day (widget, row, col);
+  calendar_invalidate_day (calendar, row, col);
 }
 
 static void
-gtk_calendar_paint_day (GtkWidget *widget,
-                       gint       row,
-                       gint       col)
+calendar_invalidate_day (GtkCalendar *calendar,
+                        gint         row,
+                        gint         col)
 {
-  GtkCalendar *calendar;
-  GdkGC *gc;
-  gchar buffer[255];
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar);
+
+  if (priv->main_win)
+    {
+      GdkRectangle day_rect;
+      
+      calendar_day_rectangle (calendar, row, col, &day_rect);
+      gdk_window_invalidate_rect (priv->main_win, &day_rect, FALSE);
+    }
+}
+
+static void
+calendar_paint_day (GtkCalendar *calendar,
+                   gint             row,
+                   gint             col)
+{
+  GtkWidget *widget = GTK_WIDGET (calendar);
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar);
+  cairo_t *cr;
+  GdkColor *text_color;
+  gchar buffer[32];
   gint day;
-  gint day_height;
-  gint x_left;
-  gint x_loc;
-  gint y_top;
-  gint y_loc;
-  gint day_xspace;
-  GtkCalendarPrivateData *private_data;
+  gint x_loc, y_loc;
+  GdkRectangle day_rect;
+
   PangoLayout *layout;
   PangoRectangle logical_rect;
   
-  g_return_if_fail (GTK_IS_CALENDAR (widget));
   g_return_if_fail (row < 6);
   g_return_if_fail (col < 7);
-  calendar = GTK_CALENDAR (widget);
-  private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
 
-  /*
-   * Handle freeze/thaw functionality
-   */
-  
-  if (private_data->freeze_count)
-    {
-      private_data->dirty_main = 1;
-      return;
-    }
-  
-  day_height = row_height (calendar);
-  
-  day_xspace = private_data->day_width - private_data->max_day_char_width*2;
-  
+  cr = gdk_cairo_create (priv->main_win);
+
   day = calendar->day[row][col];
-  
-  x_left = left_x_for_column (calendar, col);
-  x_loc = x_left + private_data->day_width / 2 + private_data->max_day_char_width;
-  
-  y_top = top_y_for_row (calendar, row);
-  
-  gdk_window_clear_area (private_data->main_win, x_left, y_top,
-                        private_data->day_width, day_height);
-  
-  gc = calendar->gc;
+
+  calendar_day_rectangle (calendar, row, col, &day_rect);
   
   if (calendar->day_month[row][col] == MONTH_PREV)
     {
-      gdk_gc_set_foreground (gc, PREV_MONTH_COLOR (GTK_WIDGET (calendar)));
+      text_color = PREV_MONTH_COLOR (widget);
     } 
   else if (calendar->day_month[row][col] == MONTH_NEXT)
     {
-      gdk_gc_set_foreground (gc, NEXT_MONTH_COLOR (GTK_WIDGET (calendar)));
+      text_color =  NEXT_MONTH_COLOR (widget);
     } 
   else 
     {
-      /*
+#if 0      
       if (calendar->highlight_row == row && calendar->highlight_col == col)
        {
-         gdk_gc_set_foreground (gc, HIGHLIGHT_BACK_COLOR (GTK_WIDGET (calendar)));
-         gdk_draw_rectangle (private_data->main_win, gc, TRUE, x_left, y_top,
-                             private_data->day_width, day_height);
+         cairo_set_source_color (cr, HIGHLIGHT_BG_COLOR (widget));
+         gdk_cairo_rectangle (cr, &day_rect);
+         cairo_fill (cr);
        }
-      */
+#endif     
       if (calendar->selected_day == day)
        {
-         gdk_gc_set_foreground (gc, & (GTK_WIDGET (calendar)->style->base[GTK_STATE_SELECTED]));
-         gdk_draw_rectangle (private_data->main_win, gc, TRUE, x_left, y_top,
-                             private_data->day_width, day_height);
+         gdk_cairo_set_source_color (cr, SELECTED_BG_COLOR (widget));
+         gdk_cairo_rectangle (cr, &day_rect);
+         cairo_fill (cr);
        }
-      
-      if (calendar->marked_date[day-1])
-       gdk_gc_set_foreground (gc, MARKED_COLOR  (GTK_WIDGET (calendar)));
-      else
-       gdk_gc_set_foreground (gc, NORMAL_DAY_COLOR (GTK_WIDGET (calendar)));
-  
       if (calendar->selected_day == day)
-       gdk_gc_set_foreground (gc, & (GTK_WIDGET (calendar)->style->text[GTK_STATE_SELECTED]));
+       text_color = SELECTED_FG_COLOR (widget);
+      else if (calendar->marked_date[day-1])
+       text_color = MARKED_COLOR (widget);
       else
-       gdk_gc_set_foreground (gc, & (GTK_WIDGET (calendar)->style->fg[GTK_WIDGET_STATE (calendar)]));
-    }
-    
-
-  sprintf (buffer, "%d", day);
+       text_color = NORMAL_DAY_COLOR (widget);
+    }
+
+  /* Translators: this defines whether the day numbers should use
+   * localized digits or the ones used in English (0123...).
+   *
+   * Translate to "%Id" if you want to use localized digits, or
+   * translate to "%d" otherwise.  Don't include the "calendar:day:digits|"
+   * part in the translation.
+   *
+   * Note that translating this doesn't guarantee that you get localized
+   * digits.  That needs support from your system and locale definition
+   * too.
+   */
+  g_snprintf (buffer, sizeof (buffer), Q_("calendar:day:digits|%d"), day);
   layout = gtk_widget_create_pango_layout (widget, buffer);
   pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
   
+  x_loc = day_rect.x + day_rect.width / 2 + priv->max_day_char_width;
   x_loc -= logical_rect.width;
-
-  y_loc = y_top + (day_height - logical_rect.height) / 2;
-  gdk_draw_layout (private_data->main_win, gc,
-                  x_loc, y_loc, layout);
+  y_loc = day_rect.y + (day_rect.height - logical_rect.height) / 2;
+  
+  gdk_cairo_set_source_color (cr, text_color);
+  cairo_move_to (cr, x_loc, y_loc);
+  pango_cairo_show_layout (cr, layout);
+    
   if (calendar->marked_date[day-1]
       && calendar->day_month[row][col] == MONTH_CURRENT)
-    gdk_draw_layout (private_data->main_win, gc,
-                    x_loc-1, y_loc, layout);
+    {
+      cairo_move_to (cr, x_loc - 1, y_loc);
+      pango_cairo_show_layout (cr, layout);
+    }
 
   if (GTK_WIDGET_HAS_FOCUS (calendar) 
       && calendar->focus_row == row && calendar->focus_col == col)
     {
-      gdk_draw_rectangle (private_data->main_win, calendar->xor_gc, 
-                         FALSE, x_left, y_top,
-                         private_data->day_width-1, day_height-1);
+      GtkStateType state;
+
+      if (calendar->selected_day == day)
+       state = GTK_WIDGET_HAS_FOCUS (widget) ? GTK_STATE_SELECTED : GTK_STATE_ACTIVE;
+      else
+       state = GTK_STATE_NORMAL;
+      
+      gtk_paint_focus (widget->style, 
+                      priv->main_win,
+                      state,
+#if 0
+                      (calendar->selected_day == day) 
+                         ? GTK_STATE_SELECTED : GTK_STATE_NORMAL, 
+#endif
+                      NULL, widget, "calendar-day",
+                      day_rect.x,     day_rect.y, 
+                      day_rect.width, day_rect.height);
     }
 
-  g_object_unref (G_OBJECT (layout));
+  g_object_unref (layout);
+  cairo_destroy (cr);
 }
 
-
 static void
-gtk_calendar_paint_main (GtkWidget *widget)
+calendar_paint_main (GtkCalendar *calendar)
 {
-  GtkCalendar *calendar;
-  GtkCalendarPrivateData *private_data;
   gint row, col;
   
-  g_return_if_fail (GTK_IS_CALENDAR (widget));
-  g_return_if_fail (widget->window != NULL);
-  
-  calendar = GTK_CALENDAR (widget);
-  private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
-
-  if (private_data->freeze_count)
-    {
-      private_data->dirty_main = 1;
-      return;
-    }
-  private_data->dirty_main = 0;
-  gdk_window_clear (private_data->main_win);
-  
-  /* gtk_calendar_compute_days (calendar); */ /* REMOVE later */
-  
   for (col = 0; col < 7; col++)
     for (row = 0; row < 6; row++)
-      gtk_calendar_paint_day (widget, row, col);
+      calendar_paint_day (calendar, row, col);
 }
 
 static void
-gtk_calendar_compute_days (GtkCalendar *calendar)
+calendar_invalidate_arrow (GtkCalendar *calendar,
+                          guint        arrow)
 {
-  gint month;
-  gint year;
-  gint ndays_in_month;
-  gint ndays_in_prev_month;
-  gint first_day;
-  gint row;
-  gint col;
-  gint day;
-  
-  g_return_if_fail (GTK_IS_CALENDAR (calendar));
-  
-  year = calendar->year;
-  month = calendar->month + 1;
-  
-  ndays_in_month = month_length[leap (year)][month];
-  
-  first_day = day_of_week (year, month, 1);
-  
-  if (calendar->display_flags & GTK_CALENDAR_WEEK_START_MONDAY)
-    first_day--;
-  else
-    first_day %= 7;
-  
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar);
+  GdkWindow *window;
   
-  /* Compute days of previous month */
-  if (month > 1)
-    ndays_in_prev_month = month_length[leap (year)][month-1];
-  else
-    ndays_in_prev_month = month_length[leap (year)][12];
-  day = ndays_in_prev_month - first_day + 1;
+  window = priv->arrow_win[arrow];
+  if (window)
+    gdk_window_invalidate_rect (window, NULL, FALSE);
+}
+
+static void
+calendar_paint_arrow (GtkCalendar *calendar,
+                     guint            arrow)
+{
+  GtkWidget *widget = GTK_WIDGET (calendar);
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (widget);
+  GdkWindow *window;
   
-  row = 0;
-  if (first_day > 0)
+  window = priv->arrow_win[arrow];
+  if (window)
     {
-      for (col = 0; col < first_day; col++)
-       {
-         calendar->day[row][col] = day;
-         calendar->day_month[row][col] = MONTH_PREV;
-         day++;
-       }
+      cairo_t *cr = gdk_cairo_create (window);
+      gint width, height;
+      gint state;
+       
+      state = priv->arrow_state[arrow];
+
+      gdk_cairo_set_source_color (cr, &widget->style->bg[state]);
+      cairo_paint (cr);
+      cairo_destroy (cr);
+      
+      gdk_drawable_get_size (window, &width, &height);
+      if (arrow == ARROW_MONTH_LEFT || arrow == ARROW_YEAR_LEFT)
+       gtk_paint_arrow (widget->style, window, state, 
+                        GTK_SHADOW_OUT, NULL, widget, "calendar",
+                        GTK_ARROW_LEFT, TRUE, 
+                        width/2 - 3, height/2 - 4, 8, 8);
+      else 
+       gtk_paint_arrow (widget->style, window, state, 
+                        GTK_SHADOW_OUT, NULL, widget, "calendar",
+                        GTK_ARROW_RIGHT, TRUE, 
+                        width/2 - 4, height/2 - 4, 8, 8);
     }
-  
-  /* Compute days of current month */
-  col = first_day;
-  for (day = 1; day <= ndays_in_month; day++)
+}
+
+static gboolean
+gtk_calendar_expose (GtkWidget     *widget,
+                    GdkEventExpose *event)
+{
+  GtkCalendar *calendar = GTK_CALENDAR (widget);
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (widget);
+  int i;
+
+  if (GTK_WIDGET_DRAWABLE (widget))
     {
-      calendar->day[row][col] = day;
-      calendar->day_month[row][col] = MONTH_CURRENT;
+      if (event->window == priv->main_win)
+       calendar_paint_main (calendar);
       
-      col++;
-      if (col == 7)
+      if (event->window == priv->header_win)
+       calendar_paint_header (calendar);
+
+      for (i = 0; i < 4; i++)
+       if (event->window == priv->arrow_win[i])
+         calendar_paint_arrow (calendar, i);
+      
+      if (event->window == priv->day_name_win)
+       calendar_paint_day_names (calendar);
+      
+      if (event->window == priv->week_win)
+       calendar_paint_week_numbers (calendar);
+      if (event->window == widget->window)
        {
-         row++;
-         col = 0;
+         gtk_paint_shadow (widget->style, widget->window, GTK_WIDGET_STATE (widget),
+                           GTK_SHADOW_IN, NULL, widget, "calendar",
+                           0, 0, widget->allocation.width, widget->allocation.height);
        }
     }
   
-  /* Compute days of next month */
-  day = 1;
-  for (; row <= 5; row++)
+  return FALSE;
+}
+
+\f
+/****************************************
+ *           Mouse handling             *
+ ****************************************/
+
+static void
+calendar_arrow_action (GtkCalendar *calendar,
+                      guint        arrow)
+{
+  switch (arrow)
     {
-      for (; col <= 6; col++)
+    case ARROW_YEAR_LEFT:
+      calendar_set_year_prev (calendar);
+      break;
+    case ARROW_YEAR_RIGHT:
+      calendar_set_year_next (calendar);
+      break;
+    case ARROW_MONTH_LEFT:
+      calendar_set_month_prev (calendar);
+      break;
+    case ARROW_MONTH_RIGHT:
+      calendar_set_month_next (calendar);
+      break;
+    default:;
+      /* do nothing */
+    }
+}
+
+static gboolean
+calendar_timer (gpointer data)
+{
+  GtkCalendar *calendar = data;
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar);
+  gboolean retval = FALSE;
+  
+  if (priv->timer)
+    {
+      calendar_arrow_action (calendar, priv->click_child);
+
+      if (priv->need_timer)
        {
-         calendar->day[row][col] = day;
-         calendar->day_month[row][col] = MONTH_NEXT;
-         day++;
+          GtkSettings *settings;
+          guint        timeout;
+
+          settings = gtk_widget_get_settings (GTK_WIDGET (calendar));
+          g_object_get (settings, "gtk-timeout-repeat", &timeout, NULL);
+
+         priv->need_timer = FALSE;
+         priv->timer = gdk_threads_add_timeout_full (G_PRIORITY_DEFAULT_IDLE,
+                                           timeout * SCROLL_DELAY_FACTOR,
+                                           (GSourceFunc) calendar_timer,
+                                           (gpointer) calendar, NULL);
        }
-      col = 0;
+      else 
+       retval = TRUE;
     }
-}
 
-/* ----------------------------------------------------------------------
-   NAME:       gtk_calendar_display_options
-   DESCRIPTION:        Set display options (whether to display the
-   heading and the month headings)
-   
-   flags is can be an XOR of:
-   GTK_CALENDAR_SHOW_HEADING
-   GTK_CALENDAR_SHOW_DAY_NAMES
-   GTK_CALENDAR_NO_MONTH_CHANGE
-   GTK_CALENDAR_SHOW_WEEK_NUMBERS
-   GTK_CALENDAR_WEEK_START_MONDAY
-   ---------------------------------------------------------------------- */
+  return retval;
+}
 
-void
-gtk_calendar_display_options (GtkCalendar             *calendar,
-                             GtkCalendarDisplayOptions flags)
+static void
+calendar_start_spinning (GtkCalendar *calendar,
+                        gint         click_child)
 {
-  GtkCalendarPrivateData *private_data;
-  gint resize = 0;
-  GtkWidget *widget;
-  gint i;
-  
-  g_return_if_fail (GTK_IS_CALENDAR (calendar));
-  
-  widget = GTK_WIDGET (calendar);
-  private_data = GTK_CALENDAR_PRIVATE_DATA (calendar);
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar);
+
+  priv->click_child = click_child;
   
-  if (GTK_WIDGET_REALIZED (widget))
+  if (!priv->timer)
     {
-      if ((flags ^ calendar->display_flags) & GTK_CALENDAR_NO_MONTH_CHANGE)
-       {
-         resize ++;
-         if (! (flags & GTK_CALENDAR_NO_MONTH_CHANGE)
-             && (private_data->header_win))
-           {
-             calendar->display_flags &= ~GTK_CALENDAR_NO_MONTH_CHANGE;
-             gtk_calendar_realize_arrows (widget);
-           }
-         else
-           {
-             for (i = 0; i < 4; i++)
-               {
-                 if (private_data->arrow_win[i])
-                   {
-                     gdk_window_set_user_data (private_data->arrow_win[i], 
-                                               NULL);
-                     gdk_window_destroy (private_data->arrow_win[i]);
-                     private_data->arrow_win[i] = NULL;
-                   }
-               }
-           }
-       }
-      
-      if ((flags ^ calendar->display_flags) & GTK_CALENDAR_SHOW_HEADING)
-       {
-         resize++;
-         
-         if (flags & GTK_CALENDAR_SHOW_HEADING)
-           {
-             calendar->display_flags |= GTK_CALENDAR_SHOW_HEADING;
-             gtk_calendar_realize_header (widget);
-           }
-         else
-           {
-             for (i = 0; i < 4; i++)
-               {
-                 if (private_data->arrow_win[i])
-                   {
-                     gdk_window_set_user_data (private_data->arrow_win[i], 
-                                               NULL);
-                     gdk_window_destroy (private_data->arrow_win[i]);
-                     private_data->arrow_win[i] = NULL;
-                   }
-               }
-             gdk_window_set_user_data (private_data->header_win, NULL);
-             gdk_window_destroy (private_data->header_win);
-             private_data->header_win = NULL;
-           }
-       }
-      
-      
-      if ((flags ^ calendar->display_flags) & GTK_CALENDAR_SHOW_DAY_NAMES)
-       {
-         resize++;
-         
-         if (flags & GTK_CALENDAR_SHOW_DAY_NAMES)
-           {
-             calendar->display_flags |= GTK_CALENDAR_SHOW_DAY_NAMES;
-             gtk_calendar_realize_day_names (widget);
-           }
-         else
-           {
-             gdk_window_set_user_data (private_data->day_name_win, NULL);
-             gdk_window_destroy (private_data->day_name_win);
-             private_data->day_name_win = NULL;
-           }
-       }
-      
-      if ((flags ^ calendar->display_flags) & GTK_CALENDAR_SHOW_WEEK_NUMBERS)
-       {
-         resize++;
-         
-         if (flags & GTK_CALENDAR_SHOW_WEEK_NUMBERS)
-           {
-             calendar->display_flags |= GTK_CALENDAR_SHOW_WEEK_NUMBERS;
-             gtk_calendar_realize_week_numbers (widget);
-           }
-         else
-           {
-             gdk_window_set_user_data (private_data->week_win, NULL);
-             gdk_window_destroy (private_data->week_win);
-             private_data->week_win = NULL;
-           }
-       }
-      
-      if ((flags ^ calendar->display_flags) & GTK_CALENDAR_WEEK_START_MONDAY)
-       {
-         if (calendar->display_flags & GTK_CALENDAR_WEEK_START_MONDAY)
-           calendar->display_flags &= ~GTK_CALENDAR_WEEK_START_MONDAY;
-         else
-           calendar->display_flags |= GTK_CALENDAR_WEEK_START_MONDAY;
-         
-         gtk_calendar_compute_days (calendar);
-         gtk_calendar_paint_main (GTK_WIDGET (calendar));
-         if (private_data->day_name_win)
-           gtk_calendar_paint_day_names (GTK_WIDGET (calendar));
-       }
-      
-      calendar->display_flags = flags;
-      if (resize)
-       gtk_widget_queue_resize (GTK_WIDGET (calendar));
-      
-    } 
-  else
-    calendar->display_flags = flags;
-  
-}
+      GtkSettings *settings;
+      guint        timeout;
 
-gboolean
-gtk_calendar_select_month (GtkCalendar *calendar,
-                          guint        month,
-                          guint        year)
-{
-  g_return_val_if_fail (calendar != NULL, FALSE);
-  g_return_val_if_fail (GTK_IS_CALENDAR (calendar), FALSE);
-  g_return_val_if_fail (month <= 11, FALSE);
-  
-  calendar->month = month;
-  calendar->year  = year;
-  
-  gtk_calendar_compute_days (calendar);
-  
-  gtk_widget_queue_draw (GTK_WIDGET (calendar));
-  gtk_signal_emit (GTK_OBJECT (calendar),
-                  gtk_calendar_signals[MONTH_CHANGED_SIGNAL]);
-  return TRUE;
+      settings = gtk_widget_get_settings (GTK_WIDGET (calendar));
+      g_object_get (settings, "gtk-timeout-initial", &timeout, NULL);
+
+      priv->need_timer = TRUE;
+      priv->timer = gdk_threads_add_timeout_full (G_PRIORITY_DEFAULT_IDLE,
+                                       timeout,
+                                       (GSourceFunc) calendar_timer,
+                                       (gpointer) calendar, NULL);
+    }
 }
 
-void
-gtk_calendar_select_day (GtkCalendar *calendar,
-                        guint        day)
+static void
+calendar_stop_spinning (GtkCalendar *calendar)
 {
-  g_return_if_fail (GTK_IS_CALENDAR (calendar));
-  g_return_if_fail (day <= 31);
-  
-  /* gtk_calendar_compute_days (calendar); */
-  
-  /* Deselect the old day */
-  if (calendar->selected_day > 0)
-    {
-      gint selected_day;
-      
-      selected_day = calendar->selected_day;
-      calendar->selected_day = 0;
-      if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (calendar)))
-       gtk_calendar_paint_day_num (GTK_WIDGET (calendar), selected_day);
-    }
-  
-  calendar->selected_day = day;
-  
-  /* Deselect the new day */
-  if (day != 0)
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar);
+
+  if (priv->timer)
     {
-      if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (calendar)))
-       gtk_calendar_paint_day_num (GTK_WIDGET (calendar), day);
+      g_source_remove (priv->timer);
+      priv->timer = 0;
+      priv->need_timer = FALSE;
     }
-  
-  gtk_signal_emit (GTK_OBJECT (calendar),
-                  gtk_calendar_signals[DAY_SELECTED_SIGNAL]);
 }
 
-void
-gtk_calendar_clear_marks (GtkCalendar *calendar)
+static void
+calendar_main_button_press (GtkCalendar           *calendar,
+                           GdkEventButton *event)
 {
-  guint day;
+  GtkWidget *widget = GTK_WIDGET (calendar);
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar);
+  gint x, y;
+  gint row, col;
+  gint day_month;
+  gint day;
   
-  g_return_if_fail (GTK_IS_CALENDAR (calendar));
+  x = (gint) (event->x);
+  y = (gint) (event->y);
   
-  for (day = 0; day < 31; day++)
-    {
-      calendar->marked_date[day] = FALSE;
-    }
-  calendar->num_marked_dates = 0;
-  if (GTK_WIDGET_DRAWABLE (calendar))
-    {
-      gtk_calendar_paint_main (GTK_WIDGET (calendar));
-    }
-}
+  row = calendar_row_from_y (calendar, y);
+  col = calendar_column_from_x (calendar, x);
 
-gboolean
-gtk_calendar_mark_day (GtkCalendar *calendar,
-                      guint        day)
-{
-  g_return_val_if_fail (calendar != NULL, FALSE);
-  g_return_val_if_fail (GTK_IS_CALENDAR (calendar), FALSE);
+  /* If row or column isn't found, just return. */
+  if (row == -1 || col == -1)
+    return;
   
-  if (day >= 1 && day <= 31 && calendar->marked_date[day-1] == FALSE)
+  day_month = calendar->day_month[row][col];
+
+  if (event->type == GDK_BUTTON_PRESS)
     {
-      calendar->marked_date[day - 1] = TRUE;
-      calendar->num_marked_dates++;
+      day = calendar->day[row][col];
+      
+      if (day_month == MONTH_PREV)
+       calendar_set_month_prev (calendar);
+      else if (day_month == MONTH_NEXT)
+       calendar_set_month_next (calendar);
+      
+      if (!GTK_WIDGET_HAS_FOCUS (widget))
+       gtk_widget_grab_focus (widget);
+         
+      if (event->button == 1) 
+       {
+         priv->in_drag = 1;
+         priv->drag_start_x = x;
+         priv->drag_start_y = y;
+       }
+
+      calendar_select_and_focus_day (calendar, day);
     }
-  if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (calendar)))
+  else if (event->type == GDK_2BUTTON_PRESS)
     {
-      gtk_calendar_paint_main (GTK_WIDGET (calendar));
+      priv->in_drag = 0;
+      if (day_month == MONTH_CURRENT)
+       g_signal_emit (calendar,
+                      gtk_calendar_signals[DAY_SELECTED_DOUBLE_CLICK_SIGNAL],
+                      0);
     }
-  
-  return TRUE;
 }
 
-gboolean
-gtk_calendar_unmark_day (GtkCalendar *calendar,
-                        guint        day)
+static gboolean
+gtk_calendar_button_press (GtkWidget     *widget,
+                          GdkEventButton *event)
 {
-  g_return_val_if_fail (calendar != NULL, FALSE);
-  g_return_val_if_fail (GTK_IS_CALENDAR (calendar), FALSE);
-  
-  if (day >= 1 && day <= 31 && calendar->marked_date[day-1] == TRUE)
-    {
-      calendar->marked_date[day - 1] = FALSE;
-      calendar->num_marked_dates--;
-    }
+  GtkCalendar *calendar = GTK_CALENDAR (widget);
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (widget);
+  gint arrow = -1;
   
-  if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (calendar)))
+  if (event->window == priv->main_win)
+    calendar_main_button_press (calendar, event);
+
+  if (!GTK_WIDGET_HAS_FOCUS (widget))
+    gtk_widget_grab_focus (widget);
+
+  for (arrow = ARROW_YEAR_LEFT; arrow <= ARROW_MONTH_RIGHT; arrow++)
     {
-      gtk_calendar_paint_main (GTK_WIDGET (calendar));
+      if (event->window == priv->arrow_win[arrow])
+       {
+         
+         /* only call the action on single click, not double */
+         if (event->type == GDK_BUTTON_PRESS)
+           {
+             if (event->button == 1)
+               calendar_start_spinning (calendar, arrow);
+
+             calendar_arrow_action (calendar, arrow);        
+           }
+
+         return TRUE;
+       }
     }
-  
-  return TRUE;
-}
 
-void
-gtk_calendar_get_date (GtkCalendar *calendar,
-                      guint       *year,
-                      guint       *month,
-                      guint       *day)
-{
-  g_return_if_fail (GTK_IS_CALENDAR (calendar));
-  
-  if (year)
-    *year = calendar->year;
-  
-  if (month)
-    *month = calendar->month;
-  
-  if (day)
-    *day = calendar->selected_day;
+  return FALSE;
 }
 
 static gboolean
-gtk_calendar_button_press (GtkWidget     *widget,
-                          GdkEventButton *event)
+gtk_calendar_button_release (GtkWidget   *widget,
+                            GdkEventButton *event)
 {
-  GtkCalendar *calendar;
-  GtkCalendarPrivateData *private_data;
-  gint x, y;
-  void (* action_func) (GtkCalendar *);
-  
-  g_return_val_if_fail (widget != NULL, FALSE);
-  g_return_val_if_fail (GTK_IS_CALENDAR (widget), FALSE);
-  g_return_val_if_fail (event != NULL, FALSE);
-  
-  calendar = GTK_CALENDAR (widget);
-  private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
-  
-  x = (gint) (event->x);
-  y = (gint) (event->y);
-  
-  if (event->window == private_data->main_win)
-    gtk_calendar_main_button (widget, event);
+  GtkCalendar *calendar = GTK_CALENDAR (widget);
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (widget);
 
-  action_func = NULL;  
+  if (event->button == 1) 
+    {
+      calendar_stop_spinning (calendar);
 
-  if (event->window == private_data->arrow_win[ARROW_MONTH_LEFT])
-    action_func = gtk_calendar_set_month_prev;
-  else if (event->window == private_data->arrow_win[ARROW_MONTH_RIGHT])
-    action_func = gtk_calendar_set_month_next;
-  else if (event->window == private_data->arrow_win[ARROW_YEAR_LEFT])
-    action_func = gtk_calendar_set_year_prev;
-  else if (event->window == private_data->arrow_win[ARROW_YEAR_RIGHT])
-    action_func = gtk_calendar_set_year_next;
+      if (priv->in_drag)
+       priv->in_drag = 0;
+    }
 
-  /* only call the action on single click, not double */
-  if (action_func && event->type == GDK_BUTTON_PRESS)
-    (* action_func) (calendar);
-  
-  return action_func != NULL;
+  return TRUE;
 }
 
 static gboolean
 gtk_calendar_motion_notify (GtkWidget     *widget,
                            GdkEventMotion *event)
 {
-  GtkCalendar *calendar;
-  GtkCalendarPrivateData *private_data;
+  GtkCalendar *calendar = GTK_CALENDAR (widget);
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (widget);
   gint event_x, event_y;
   gint row, col;
   gint old_row, old_col;
   
-  calendar = GTK_CALENDAR (widget);
-  private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
   event_x = (gint) (event->x);
   event_y = (gint) (event->y);
   
-  if (event->window == private_data->main_win)
+  if (event->window == priv->main_win)
     {
       
-      row = row_from_y (calendar, event_y);
-      col = column_from_x (calendar, event_x);
-      
-      if (row != calendar->highlight_row || calendar->highlight_col != col)
+      if (priv->in_drag) 
        {
-         old_row = calendar->highlight_row;
-         old_col = calendar->highlight_col;
-         if (old_row > -1 && old_col > -1)
+         if (gtk_drag_check_threshold (widget,
+                                       priv->drag_start_x, priv->drag_start_y,
+                                       event->x, event->y))
            {
-             calendar->highlight_row = -1;
-             calendar->highlight_col = -1;
-             gtk_calendar_paint_day (widget, old_row, old_col);
-           }
+             GdkDragContext *context;
+             GtkTargetList *target_list = gtk_target_list_new (NULL, 0);
+             gtk_target_list_add_text_targets (target_list, 0);
+             context = gtk_drag_begin (widget, target_list, GDK_ACTION_COPY,
+                                       1, (GdkEvent *)event);
+
          
-         calendar->highlight_row = row;
-         calendar->highlight_col = col;
+             priv->in_drag = 0;
+             
+             gtk_target_list_unref (target_list);
+             gtk_drag_set_icon_default (context);
+           }
+       }
+      else 
+       {
+         row = calendar_row_from_y (calendar, event_y);
+         col = calendar_column_from_x (calendar, event_x);
          
-         if (row > -1 && col > -1)
-           gtk_calendar_paint_day (widget, row, col);
+         if (row != calendar->highlight_row || calendar->highlight_col != col)
+           {
+             old_row = calendar->highlight_row;
+             old_col = calendar->highlight_col;
+             if (old_row > -1 && old_col > -1)
+               {
+                 calendar->highlight_row = -1;
+                 calendar->highlight_col = -1;
+                 calendar_invalidate_day (calendar, old_row, old_col);
+               }
+             
+             calendar->highlight_row = row;
+             calendar->highlight_col = col;
+             
+             if (row > -1 && col > -1)
+               calendar_invalidate_day (calendar, row, col);
+           }
        }
     }
   return TRUE;
@@ -2299,37 +2609,31 @@ static gboolean
 gtk_calendar_enter_notify (GtkWidget       *widget,
                           GdkEventCrossing *event)
 {
-  GtkCalendar *calendar;
-  GtkCalendarPrivateData *private_data;
-  
-  g_return_val_if_fail (widget != NULL, FALSE);
-  g_return_val_if_fail (event != NULL, FALSE);
-  
-  calendar = GTK_CALENDAR (widget);
-  private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
+  GtkCalendar *calendar = GTK_CALENDAR (widget);
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (widget);
   
-  if (event->window == private_data->arrow_win[ARROW_MONTH_LEFT])
+  if (event->window == priv->arrow_win[ARROW_MONTH_LEFT])
     {
-      private_data->arrow_state[ARROW_MONTH_LEFT] = GTK_STATE_PRELIGHT;
-      gtk_calendar_paint_arrow (widget, ARROW_MONTH_LEFT);
+      priv->arrow_state[ARROW_MONTH_LEFT] = GTK_STATE_PRELIGHT;
+      calendar_invalidate_arrow (calendar, ARROW_MONTH_LEFT);
     }
   
-  if (event->window == private_data->arrow_win[ARROW_MONTH_RIGHT])
+  if (event->window == priv->arrow_win[ARROW_MONTH_RIGHT])
     {
-      private_data->arrow_state[ARROW_MONTH_RIGHT] = GTK_STATE_PRELIGHT;
-      gtk_calendar_paint_arrow (widget, ARROW_MONTH_RIGHT);
+      priv->arrow_state[ARROW_MONTH_RIGHT] = GTK_STATE_PRELIGHT;
+      calendar_invalidate_arrow (calendar, ARROW_MONTH_RIGHT);
     }
   
-  if (event->window == private_data->arrow_win[ARROW_YEAR_LEFT])
+  if (event->window == priv->arrow_win[ARROW_YEAR_LEFT])
     {
-      private_data->arrow_state[ARROW_YEAR_LEFT] = GTK_STATE_PRELIGHT;
-      gtk_calendar_paint_arrow (widget, ARROW_YEAR_LEFT);
+      priv->arrow_state[ARROW_YEAR_LEFT] = GTK_STATE_PRELIGHT;
+      calendar_invalidate_arrow (calendar, ARROW_YEAR_LEFT);
     }
   
-  if (event->window == private_data->arrow_win[ARROW_YEAR_RIGHT])
+  if (event->window == priv->arrow_win[ARROW_YEAR_RIGHT])
     {
-      private_data->arrow_state[ARROW_YEAR_RIGHT] = GTK_STATE_PRELIGHT;
-      gtk_calendar_paint_arrow (widget, ARROW_YEAR_RIGHT);
+      priv->arrow_state[ARROW_YEAR_RIGHT] = GTK_STATE_PRELIGHT;
+      calendar_invalidate_arrow (calendar, ARROW_YEAR_RIGHT);
     }
   
   return TRUE;
@@ -2339,167 +2643,230 @@ static gboolean
 gtk_calendar_leave_notify (GtkWidget       *widget,
                           GdkEventCrossing *event)
 {
-  GtkCalendar *calendar;
-  GtkCalendarPrivateData *private_data;
+  GtkCalendar *calendar = GTK_CALENDAR (widget);
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (widget);
   gint row;
   gint col;
   
-  g_return_val_if_fail (widget != NULL, FALSE);
-  g_return_val_if_fail (event != NULL, FALSE);
-  
-  calendar = GTK_CALENDAR (widget);
-  private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
-  
-  if (event->window == private_data->main_win)
+  if (event->window == priv->main_win)
     {
       row = calendar->highlight_row;
       col = calendar->highlight_col;
       calendar->highlight_row = -1;
       calendar->highlight_col = -1;
       if (row > -1 && col > -1)
-       gtk_calendar_paint_day (widget, row, col);
+       calendar_invalidate_day (calendar, row, col);
     }
   
-  if (event->window == private_data->arrow_win[ARROW_MONTH_LEFT])
+  if (event->window == priv->arrow_win[ARROW_MONTH_LEFT])
     {
-      private_data->arrow_state[ARROW_MONTH_LEFT] = GTK_STATE_NORMAL;
-      gtk_calendar_paint_arrow (widget, ARROW_MONTH_LEFT);
+      priv->arrow_state[ARROW_MONTH_LEFT] = GTK_STATE_NORMAL;
+      calendar_invalidate_arrow (calendar, ARROW_MONTH_LEFT);
     }
   
-  if (event->window == private_data->arrow_win[ARROW_MONTH_RIGHT])
+  if (event->window == priv->arrow_win[ARROW_MONTH_RIGHT])
     {
-      private_data->arrow_state[ARROW_MONTH_RIGHT] = GTK_STATE_NORMAL;
-      gtk_calendar_paint_arrow (widget, ARROW_MONTH_RIGHT);
+      priv->arrow_state[ARROW_MONTH_RIGHT] = GTK_STATE_NORMAL;
+      calendar_invalidate_arrow (calendar, ARROW_MONTH_RIGHT);
     }
   
-  if (event->window == private_data->arrow_win[ARROW_YEAR_LEFT])
+  if (event->window == priv->arrow_win[ARROW_YEAR_LEFT])
     {
-      private_data->arrow_state[ARROW_YEAR_LEFT] = GTK_STATE_NORMAL;
-      gtk_calendar_paint_arrow (widget, ARROW_YEAR_LEFT);
+      priv->arrow_state[ARROW_YEAR_LEFT] = GTK_STATE_NORMAL;
+      calendar_invalidate_arrow (calendar, ARROW_YEAR_LEFT);
     }
   
-  if (event->window == private_data->arrow_win[ARROW_YEAR_RIGHT])
+  if (event->window == priv->arrow_win[ARROW_YEAR_RIGHT])
     {
-      private_data->arrow_state[ARROW_YEAR_RIGHT] = GTK_STATE_NORMAL;
-      gtk_calendar_paint_arrow (widget, ARROW_YEAR_RIGHT);
+      priv->arrow_state[ARROW_YEAR_RIGHT] = GTK_STATE_NORMAL;
+      calendar_invalidate_arrow (calendar, ARROW_YEAR_RIGHT);
     }
   
   return TRUE;
 }
 
-static void
-gtk_calendar_paint_arrow (GtkWidget *widget,
-                         guint      arrow)
+static gboolean
+gtk_calendar_scroll (GtkWidget      *widget,
+                    GdkEventScroll *event)
 {
-  GtkCalendarPrivateData *private_data;
-  GdkWindow *window;
-  GdkGC *gc;
-  GtkCalendar *calendar;
-  gint state;
-  gint width, height;
-  
-  g_return_if_fail (widget != NULL);
-  
-  calendar = GTK_CALENDAR (widget);
-  private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
+  GtkCalendar *calendar = GTK_CALENDAR (widget);
 
-  if (private_data->freeze_count)
+  if (event->direction == GDK_SCROLL_UP) 
     {
-      private_data->dirty_header = 1;
-      return;
+      if (!GTK_WIDGET_HAS_FOCUS (widget))
+       gtk_widget_grab_focus (widget);
+      calendar_set_month_prev (calendar);
     }
-  window = private_data->arrow_win[arrow];
-  if (window)
+  else if (event->direction == GDK_SCROLL_DOWN) 
     {
-      state = private_data->arrow_state[arrow];
-      gc = calendar->gc;
-      
-      gdk_window_clear (window);
-      gdk_window_set_background (window, &(widget)->style->bg[state]);
-      gdk_window_get_size (window, &width, &height);
-      gdk_window_clear_area (window,
-                            0,0,
-                            width,height);
-      
-      gdk_gc_set_foreground (gc, & (widget)->style->fg[state]);
-      
-      if (arrow == ARROW_MONTH_LEFT || arrow == ARROW_YEAR_LEFT)
-       draw_arrow_left (window, gc, width/2 - 3, height/2 - 4, 8);
-      else 
-       draw_arrow_right (window, gc, width/2 - 2, height/2 - 4, 8);
-      return;
+      if (!GTK_WIDGET_HAS_FOCUS (widget))
+       gtk_widget_grab_focus (widget);
+      calendar_set_month_next (calendar);
     }
+  else
+    return FALSE;
+
+  return TRUE;
 }
 
-void
-gtk_calendar_freeze (GtkCalendar *calendar)
+\f
+/****************************************
+ *             Key handling              *
+ ****************************************/
+
+static void 
+move_focus (GtkCalendar *calendar, 
+           gint         direction)
 {
-  g_return_if_fail (GTK_IS_CALENDAR (calendar));
-  
-  GTK_CALENDAR_PRIVATE_DATA (calendar)->freeze_count++;
+  GtkTextDirection text_dir = gtk_widget_get_direction (GTK_WIDGET (calendar));
+
+  if ((text_dir == GTK_TEXT_DIR_LTR && direction == -1) ||
+      (text_dir == GTK_TEXT_DIR_RTL && direction == 1)) 
+    {
+      if (calendar->focus_col > 0)
+         calendar->focus_col--;
+      else if (calendar->focus_row > 0)
+       {
+         calendar->focus_col = 6;
+         calendar->focus_row--;
+       }
+    }
+  else 
+    {
+      if (calendar->focus_col < 6)
+       calendar->focus_col++;
+      else if (calendar->focus_row < 5)
+       {
+         calendar->focus_col = 0;
+         calendar->focus_row++;
+       }
+    }
 }
 
-void
-gtk_calendar_thaw (GtkCalendar *calendar)
+static gboolean
+gtk_calendar_key_press (GtkWidget   *widget,
+                       GdkEventKey *event)
 {
-  GtkCalendarPrivateData *private_data;
-
-  g_return_if_fail (GTK_IS_CALENDAR (calendar));
+  GtkCalendar *calendar;
+  gint return_val;
+  gint old_focus_row;
+  gint old_focus_col;
+  gint row, col, day;
   
-  private_data = GTK_CALENDAR_PRIVATE_DATA (calendar);
+  calendar = GTK_CALENDAR (widget);
+  return_val = FALSE;
   
-  if (private_data->freeze_count)
-    if (!(--private_data->freeze_count))
-      {
-       if (private_data->dirty_header)
-         if (GTK_WIDGET_DRAWABLE (calendar))
-           gtk_calendar_paint_header (GTK_WIDGET (calendar));
-       
-       if (private_data->dirty_day_names)
-         if (GTK_WIDGET_DRAWABLE (calendar))
-           gtk_calendar_paint_day_names (GTK_WIDGET (calendar));
-       
-       if (private_data->dirty_week)
-         if (GTK_WIDGET_DRAWABLE (calendar))
-           gtk_calendar_paint_week_numbers (GTK_WIDGET (calendar));
-       
-       if (private_data->dirty_main)
-         if (GTK_WIDGET_DRAWABLE (calendar))
-           gtk_calendar_paint_main (GTK_WIDGET (calendar));
-      }
+  old_focus_row = calendar->focus_row;
+  old_focus_col = calendar->focus_col;
+
+  switch (event->keyval)
+    {
+    case GDK_KP_Left:
+    case GDK_Left:
+      return_val = TRUE;
+      if (event->state & GDK_CONTROL_MASK)
+       calendar_set_month_prev (calendar);
+      else
+       {
+         move_focus (calendar, -1);
+         calendar_invalidate_day (calendar, old_focus_row, old_focus_col);
+         calendar_invalidate_day (calendar, calendar->focus_row,
+                                  calendar->focus_col);
+       }
+      break;
+    case GDK_KP_Right:
+    case GDK_Right:
+      return_val = TRUE;
+      if (event->state & GDK_CONTROL_MASK)
+       calendar_set_month_next (calendar);
+      else
+       {
+         move_focus (calendar, 1);
+         calendar_invalidate_day (calendar, old_focus_row, old_focus_col);
+         calendar_invalidate_day (calendar, calendar->focus_row,
+                                  calendar->focus_col);
+       }
+      break;
+    case GDK_KP_Up:
+    case GDK_Up:
+      return_val = TRUE;
+      if (event->state & GDK_CONTROL_MASK)
+       calendar_set_year_prev (calendar);
+      else
+       {
+         if (calendar->focus_row > 0)
+           calendar->focus_row--;
+         calendar_invalidate_day (calendar, old_focus_row, old_focus_col);
+         calendar_invalidate_day (calendar, calendar->focus_row,
+                                  calendar->focus_col);
+       }
+      break;
+    case GDK_KP_Down:
+    case GDK_Down:
+      return_val = TRUE;
+      if (event->state & GDK_CONTROL_MASK)
+       calendar_set_year_next (calendar);
+      else
+       {
+         if (calendar->focus_row < 5)
+           calendar->focus_row++;
+         calendar_invalidate_day (calendar, old_focus_row, old_focus_col);
+         calendar_invalidate_day (calendar, calendar->focus_row,
+                                  calendar->focus_col);
+       }
+      break;
+    case GDK_KP_Space:
+    case GDK_space:
+      row = calendar->focus_row;
+      col = calendar->focus_col;
+      
+      if (row > -1 && col > -1)
+       {
+         return_val = TRUE;
+
+          day = calendar->day[row][col];
+         if (calendar->day_month[row][col] == MONTH_PREV)
+           calendar_set_month_prev (calendar);
+         else if (calendar->day_month[row][col] == MONTH_NEXT)
+           calendar_set_month_next (calendar);
+
+         calendar_select_and_focus_day (calendar, day);
+       }
+    }  
+  
+  return return_val;
 }
 
+\f
+/****************************************
+ *           Misc widget methods        *
+ ****************************************/
+
 static void
-gtk_calendar_set_background (GtkWidget *widget)
+calendar_set_background (GtkWidget *widget)
 {
-  GtkCalendar *calendar;
-  GtkCalendarPrivateData *private_data;
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (widget);
   gint i;
   
-  g_return_if_fail (GTK_IS_CALENDAR (widget));
-  
-  calendar = GTK_CALENDAR (widget);
-  private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
-
   if (GTK_WIDGET_REALIZED (widget))
     {
       for (i = 0; i < 4; i++)
        {
-         if (private_data->arrow_win[i])
-           gdk_window_set_background (private_data->arrow_win[i], 
+         if (priv->arrow_win[i])
+           gdk_window_set_background (priv->arrow_win[i], 
                                       HEADER_BG_COLOR (widget));
        }
-      if (private_data->header_win)
-       gdk_window_set_background (private_data->header_win, 
+      if (priv->header_win)
+       gdk_window_set_background (priv->header_win, 
                                   HEADER_BG_COLOR (widget));
-      if (private_data->day_name_win)
-       gdk_window_set_background (private_data->day_name_win, 
+      if (priv->day_name_win)
+       gdk_window_set_background (priv->day_name_win, 
                                   BACKGROUND_COLOR (widget));
-      if (private_data->week_win)
-       gdk_window_set_background (private_data->week_win,
+      if (priv->week_win)
+       gdk_window_set_background (priv->week_win,
                                   BACKGROUND_COLOR (widget));
-      if (private_data->main_win)
-       gdk_window_set_background (private_data->main_win,
+      if (priv->main_win)
+       gdk_window_set_background (priv->main_win,
                                   BACKGROUND_COLOR (widget));
       if (widget->window)
        gdk_window_set_background (widget->window,
@@ -2511,170 +2878,631 @@ static void
 gtk_calendar_style_set (GtkWidget *widget,
                        GtkStyle  *previous_style)
 {
-  g_return_if_fail (GTK_IS_CALENDAR (widget));
-  
   if (previous_style && GTK_WIDGET_REALIZED (widget))
-    gtk_calendar_set_background(widget);
+    calendar_set_background (widget);
 }
 
 static void
 gtk_calendar_state_changed (GtkWidget     *widget,
                            GtkStateType    previous_state)
 {
-  g_return_if_fail (GTK_IS_CALENDAR (widget));
+  GtkCalendar *calendar = GTK_CALENDAR (widget);
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (widget);
+  int i;
   
-  gtk_calendar_set_background (widget);
+  if (!GTK_WIDGET_IS_SENSITIVE (widget))
+    {
+      priv->in_drag = 0;
+      calendar_stop_spinning (calendar);    
+    }
+
+  for (i = 0; i < 4; i++)
+    if (GTK_WIDGET_IS_SENSITIVE (widget))
+      priv->arrow_state[i] = GTK_STATE_NORMAL;
+    else 
+      priv->arrow_state[i] = GTK_STATE_INSENSITIVE;
+  
+  calendar_set_background (widget);
 }
 
 static void
-gtk_calendar_destroy (GtkObject *object)
+gtk_calendar_grab_notify (GtkWidget *widget,
+                         gboolean   was_grabbed)
 {
-  GtkCalendarPrivateData *private_data;
-  private_data = GTK_CALENDAR_PRIVATE_DATA (object);
-  g_free (private_data);
-  if (GTK_OBJECT_CLASS (parent_class)->destroy)
-    (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+  if (!was_grabbed)
+    calendar_stop_spinning (GTK_CALENDAR (widget));
 }
 
 static gboolean
-gtk_calendar_key_press (GtkWidget   *widget,
-                       GdkEventKey *event)
+gtk_calendar_focus_out (GtkWidget     *widget,
+                       GdkEventFocus *event)
 {
-  GtkCalendar *calendar;
-  gint return_val;
-  gint old_focus_row;
-  gint old_focus_col;
-  gint row, col, day;
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (widget);
 
-  g_return_val_if_fail (widget != NULL, FALSE);
-  g_return_val_if_fail (GTK_IS_CALENDAR (widget), FALSE);
-  g_return_val_if_fail (event != NULL, FALSE);
+  gtk_widget_queue_draw (widget);
+
+  calendar_stop_spinning (GTK_CALENDAR (widget));
   
-  calendar = GTK_CALENDAR (widget);
-  return_val = FALSE;
+  priv->in_drag = 0; 
+
+  return FALSE;
+}
+
+\f
+/****************************************
+ *          Drag and Drop               *
+ ****************************************/
+
+static void
+gtk_calendar_drag_data_get (GtkWidget        *widget,
+                           GdkDragContext   *context,
+                           GtkSelectionData *selection_data,
+                           guint             info,
+                           guint             time)
+{
+  GtkCalendar *calendar = GTK_CALENDAR (widget);
+  GDate *date;
+  gchar str[128];
+  gsize len;
+
+  date = g_date_new_dmy (calendar->selected_day, calendar->month + 1, calendar->year);
+  len = g_date_strftime (str, 127, "%x", date);
+  gtk_selection_data_set_text (selection_data, str, len);
   
-  old_focus_row = calendar->focus_row;
-  old_focus_col = calendar->focus_col;
+  g_free (date);
+}
 
-  switch (event->keyval)
+/* Get/set whether drag_motion requested the drag data and
+ * drag_data_received should thus not actually insert the data,
+ * since the data doesn't result from a drop.
+ */
+static void
+set_status_pending (GdkDragContext *context,
+                    GdkDragAction   suggested_action)
+{
+  g_object_set_data (G_OBJECT (context),
+                     I_("gtk-calendar-status-pending"),
+                     GINT_TO_POINTER (suggested_action));
+}
+
+static GdkDragAction
+get_status_pending (GdkDragContext *context)
+{
+  return GPOINTER_TO_INT (g_object_get_data (G_OBJECT (context),
+                                             "gtk-calendar-status-pending"));
+}
+
+static void
+gtk_calendar_drag_leave (GtkWidget      *widget,
+                        GdkDragContext *context,
+                        guint           time)
+{
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (widget);
+
+  priv->drag_highlight = 0;
+  gtk_drag_unhighlight (widget);
+  
+}
+
+static gboolean
+gtk_calendar_drag_motion (GtkWidget      *widget,
+                         GdkDragContext *context,
+                         gint            x,
+                         gint            y,
+                         guint           time)
+{
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (widget);
+  GdkAtom target;
+  
+  if (!priv->drag_highlight) 
     {
-    case GDK_KP_Left:
-    case GDK_Left:
-      return_val = TRUE;
-      if (event->state & GDK_CONTROL_MASK)
+      priv->drag_highlight = 1;
+      gtk_drag_highlight (widget);
+    }
+  
+  target = gtk_drag_dest_find_target (widget, context, NULL);
+  if (target == GDK_NONE || context->suggested_action == 0)
+    gdk_drag_status (context, 0, time);
+  else
+    {
+      set_status_pending (context, context->suggested_action);
+      gtk_drag_get_data (widget, context, target, time);
+    }
+  
+  return TRUE;
+}
+
+static gboolean
+gtk_calendar_drag_drop (GtkWidget      *widget,
+                       GdkDragContext *context,
+                       gint            x,
+                       gint            y,
+                       guint           time)
+{
+  GdkAtom target;
+
+  target = gtk_drag_dest_find_target (widget, context, NULL);  
+  if (target != GDK_NONE)
+    {
+      gtk_drag_get_data (widget, context, 
+                        target, 
+                        time);
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static void
+gtk_calendar_drag_data_received (GtkWidget        *widget,
+                                GdkDragContext   *context,
+                                gint              x,
+                                gint              y,
+                                GtkSelectionData *selection_data,
+                                guint             info,
+                                guint             time)
+{
+  GtkCalendar *calendar = GTK_CALENDAR (widget);
+  guint day, month, year;
+  gchar *str;
+  GDate *date;
+  GdkDragAction suggested_action;
+
+  suggested_action = get_status_pending (context);
+
+  if (suggested_action) 
+    {
+      set_status_pending (context, 0);
+     
+      /* We are getting this data due to a request in drag_motion,
+       * rather than due to a request in drag_drop, so we are just
+       * supposed to call drag_status, not actually paste in the
+       * data.
+       */
+      str = gtk_selection_data_get_text (selection_data);
+      if (str) 
        {
-         gtk_calendar_set_month_prev (calendar);
+         date = g_date_new ();
+         g_date_set_parse (date, str);
+         if (!g_date_valid (date)) 
+             suggested_action = 0;
+         g_date_free (date);
+         g_free (str);
        }
       else
+       suggested_action = 0;
+
+      gdk_drag_status (context, suggested_action, time);
+
+      return;
+    }
+
+  date = g_date_new ();
+  str = gtk_selection_data_get_text (selection_data);
+  if (str) 
+    {
+      g_date_set_parse (date, str);
+      g_free (str);
+    }
+  
+  if (!g_date_valid (date)) 
+    {
+      g_warning ("Received invalid date data\n");
+      g_date_free (date);      
+      gtk_drag_finish (context, FALSE, FALSE, time);
+      return;
+    }
+
+  day = g_date_get_day (date);
+  month = g_date_get_month (date);
+  year = g_date_get_year (date);
+  g_date_free (date);  
+
+  gtk_drag_finish (context, TRUE, FALSE, time);
+
+  
+  g_object_freeze_notify (G_OBJECT (calendar));
+  if (!(calendar->display_flags & GTK_CALENDAR_NO_MONTH_CHANGE)
+      && (calendar->display_flags & GTK_CALENDAR_SHOW_HEADING))
+    gtk_calendar_select_month (calendar, month - 1, year);
+  gtk_calendar_select_day (calendar, day);
+  g_object_thaw_notify (G_OBJECT (calendar));  
+}
+
+\f
+/****************************************
+ *              Public API              *
+ ****************************************/
+
+/**
+ * gtk_calendar_new:
+ * 
+ * Creates a new calendar, with the current date being selected. 
+ * 
+ * Return value: a newly #GtkCalendar widget
+ **/
+GtkWidget*
+gtk_calendar_new (void)
+{
+  return g_object_new (GTK_TYPE_CALENDAR, NULL);
+}
+
+/**
+ * gtk_calendar_display_options:
+ * @calendar: a #GtkCalendar.
+ * @flags: the display options to set.
+ *
+ * Sets display options (whether to display the heading and the month headings).
+ * 
+ * Deprecated: 2.4: Use gtk_calendar_set_display_options() instead
+ **/
+void
+gtk_calendar_display_options (GtkCalendar             *calendar,
+                             GtkCalendarDisplayOptions flags)
+{
+  gtk_calendar_set_display_options (calendar, flags);
+}
+
+/**
+ * gtk_calendar_get_display_options:
+ * @calendar: a #GtkCalendar
+ * 
+ * Returns the current display options of @calendar. 
+ * 
+ * Return value: the display options.
+ *
+ * Since: 2.4
+ **/
+GtkCalendarDisplayOptions 
+gtk_calendar_get_display_options (GtkCalendar         *calendar)
+{
+  g_return_val_if_fail (GTK_IS_CALENDAR (calendar), 0);
+
+  return calendar->display_flags;
+}
+
+/**
+ * gtk_calendar_set_display_options:
+ * @calendar: a #GtkCalendar
+ * @flags: the display options to set
+ * 
+ * Sets display options (whether to display the heading and the month  
+ * headings).
+ *
+ * Since: 2.4
+ **/
+void
+gtk_calendar_set_display_options (GtkCalendar         *calendar,
+                                 GtkCalendarDisplayOptions flags)
+{
+  GtkWidget *widget = GTK_WIDGET (calendar);
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar);
+  gint resize = 0;
+  gint i;
+  GtkCalendarDisplayOptions old_flags;
+  
+  g_return_if_fail (GTK_IS_CALENDAR (calendar));
+  
+  old_flags = calendar->display_flags;
+  
+  if (GTK_WIDGET_REALIZED (widget))
+    {
+      if ((flags ^ calendar->display_flags) & GTK_CALENDAR_NO_MONTH_CHANGE)
        {
-         if (calendar->focus_col > 0)
+         resize ++;
+         if (! (flags & GTK_CALENDAR_NO_MONTH_CHANGE)
+             && (priv->header_win))
            {
-             calendar->focus_col--;
+             calendar->display_flags &= ~GTK_CALENDAR_NO_MONTH_CHANGE;
+             calendar_realize_arrows (calendar);
            }
-         else if (calendar->focus_row > 0)
+         else
            {
-             calendar->focus_col = 6;
-             calendar->focus_row--;
+             for (i = 0; i < 4; i++)
+               {
+                 if (priv->arrow_win[i])
+                   {
+                     gdk_window_set_user_data (priv->arrow_win[i], 
+                                               NULL);
+                     gdk_window_destroy (priv->arrow_win[i]);
+                     priv->arrow_win[i] = NULL;
+                   }
+               }
            }
-         gtk_calendar_paint_day (widget, old_focus_row, old_focus_col);
-         gtk_calendar_paint_day (widget, calendar->focus_row,
-                                 calendar->focus_col);
-       }
-      break;
-    case GDK_KP_Right:
-    case GDK_Right:
-      return_val = TRUE;
-      if (event->state & GDK_CONTROL_MASK)
-       {
-       gtk_calendar_set_month_next (calendar);
        }
-      else
+      
+      if ((flags ^ calendar->display_flags) & GTK_CALENDAR_SHOW_HEADING)
        {
-         if (calendar->focus_col < 6)
+         resize++;
+         
+         if (flags & GTK_CALENDAR_SHOW_HEADING)
            {
-             calendar->focus_col++;
+             calendar->display_flags |= GTK_CALENDAR_SHOW_HEADING;
+             calendar_realize_header (calendar);
            }
-         else if (calendar->focus_row < 5)
+         else
            {
-             calendar->focus_col = 0;
-             calendar->focus_row++;
+             for (i = 0; i < 4; i++)
+               {
+                 if (priv->arrow_win[i])
+                   {
+                     gdk_window_set_user_data (priv->arrow_win[i], 
+                                               NULL);
+                     gdk_window_destroy (priv->arrow_win[i]);
+                     priv->arrow_win[i] = NULL;
+                   }
+               }
+             gdk_window_set_user_data (priv->header_win, NULL);
+             gdk_window_destroy (priv->header_win);
+             priv->header_win = NULL;
            }
-         gtk_calendar_paint_day (widget, old_focus_row, old_focus_col);
-         gtk_calendar_paint_day (widget, calendar->focus_row,
-                                 calendar->focus_col);
        }
-      break;
-    case GDK_KP_Up:
-    case GDK_Up:
-      return_val = TRUE;
-      if (event->state & GDK_CONTROL_MASK)
-       {
-         gtk_calendar_set_year_prev (calendar);
-       }
-      else
+      
+      
+      if ((flags ^ calendar->display_flags) & GTK_CALENDAR_SHOW_DAY_NAMES)
        {
-         if (calendar->focus_row > 0)
+         resize++;
+         
+         if (flags & GTK_CALENDAR_SHOW_DAY_NAMES)
            {
-             calendar->focus_row--;
+             calendar->display_flags |= GTK_CALENDAR_SHOW_DAY_NAMES;
+             calendar_realize_day_names (calendar);
            }
-         gtk_calendar_paint_day (widget, old_focus_row, old_focus_col);
-         gtk_calendar_paint_day (widget, calendar->focus_row,
-                                 calendar->focus_col);
-       }
-      break;
-    case GDK_KP_Down:
-    case GDK_Down:
-      return_val = TRUE;
-      if (event->state & GDK_CONTROL_MASK)
-       {
-         gtk_calendar_set_year_next (calendar);
-       }
-      else
-       {
-         if (calendar->focus_row < 5)
+         else
            {
-             calendar->focus_row++;
+             gdk_window_set_user_data (priv->day_name_win, NULL);
+             gdk_window_destroy (priv->day_name_win);
+             priv->day_name_win = NULL;
            }
-         gtk_calendar_paint_day (widget, old_focus_row, old_focus_col);
-         gtk_calendar_paint_day (widget, calendar->focus_row,
-                                 calendar->focus_col);
        }
-      break;
-    case GDK_KP_Space:
-    case GDK_space:
-      row = calendar->focus_row;
-      col = calendar->focus_col;
-      day = calendar->day[row][col];
       
-      if (row > -1 && col > -1)
+      if ((flags ^ calendar->display_flags) & GTK_CALENDAR_SHOW_WEEK_NUMBERS)
        {
-         return_val = TRUE;
-         gtk_calendar_freeze (calendar);         
-
-         if (calendar->day_month[row][col] == MONTH_PREV)
+         resize++;
+         
+         if (flags & GTK_CALENDAR_SHOW_WEEK_NUMBERS)
            {
-             gtk_calendar_set_month_prev (calendar);
+             calendar->display_flags |= GTK_CALENDAR_SHOW_WEEK_NUMBERS;
+             calendar_realize_week_numbers (calendar);
            }
-         else if (calendar->day_month[row][col] == MONTH_NEXT)
+         else
            {
-             gtk_calendar_set_month_next (calendar);
+             gdk_window_set_user_data (priv->week_win, NULL);
+             gdk_window_destroy (priv->week_win);
+             priv->week_win = NULL;
            }
-
-         gtk_calendar_select_day (calendar, day);
-         
-         for (row = 0; row < 6; row ++)
-           for (col = 0; col < 7; col++)
-             {
-               if (calendar->day_month[row][col] == MONTH_CURRENT 
-                   && calendar->day[row][col] == day)
-                 {
-                   calendar->focus_row = row;
-                   calendar->focus_col = col;
-                 }
-             }
-         gtk_calendar_thaw (calendar);   
        }
-    }  
+
+      if ((flags ^ calendar->display_flags) & GTK_CALENDAR_WEEK_START_MONDAY)
+       g_warning ("GTK_CALENDAR_WEEK_START_MONDAY is ignored; the first day of the week is determined from the locale");
+      
+      calendar->display_flags = flags;
+      if (resize)
+       gtk_widget_queue_resize (GTK_WIDGET (calendar));
+      
+    } 
+  else
+    calendar->display_flags = flags;
   
-  return return_val;
+  g_object_freeze_notify (G_OBJECT (calendar));
+  if ((old_flags ^ calendar->display_flags) & GTK_CALENDAR_SHOW_HEADING)
+    g_object_notify (G_OBJECT (calendar), "show-heading");
+  if ((old_flags ^ calendar->display_flags) & GTK_CALENDAR_SHOW_DAY_NAMES)
+    g_object_notify (G_OBJECT (calendar), "show-day-names");
+  if ((old_flags ^ calendar->display_flags) & GTK_CALENDAR_NO_MONTH_CHANGE)
+    g_object_notify (G_OBJECT (calendar), "no-month-change");
+  if ((old_flags ^ calendar->display_flags) & GTK_CALENDAR_SHOW_WEEK_NUMBERS)
+    g_object_notify (G_OBJECT (calendar), "show-week-numbers");
+  g_object_thaw_notify (G_OBJECT (calendar));
+}
+
+/**
+ * gtk_calendar_select_month:
+ * @calendar: a #GtkCalendar
+ * @month: a month number between 0 and 11.
+ * @year: the year the month is in.
+ * 
+ * Shifts the calendar to a different month.
+ * 
+ * Return value: %TRUE, always
+ **/
+gboolean
+gtk_calendar_select_month (GtkCalendar *calendar,
+                          guint        month,
+                          guint        year)
+{
+  g_return_val_if_fail (GTK_IS_CALENDAR (calendar), FALSE);
+  g_return_val_if_fail (month <= 11, FALSE);
+  
+  calendar->month = month;
+  calendar->year  = year;
+  
+  calendar_compute_days (calendar);
+  
+  gtk_widget_queue_draw (GTK_WIDGET (calendar));
+
+  g_object_freeze_notify (G_OBJECT (calendar));
+  g_object_notify (G_OBJECT (calendar), "month");
+  g_object_notify (G_OBJECT (calendar), "year");
+  g_object_thaw_notify (G_OBJECT (calendar));
+
+  g_signal_emit (calendar,
+                gtk_calendar_signals[MONTH_CHANGED_SIGNAL],
+                0);
+  return TRUE;
+}
+
+/**
+ * gtk_calendar_select_day:
+ * @calendar: a #GtkCalendar.
+ * @day: the day number between 1 and 31, or 0 to unselect 
+ *   the currently selected day.
+ * 
+ * Selects a day from the current month.
+ **/
+void
+gtk_calendar_select_day (GtkCalendar *calendar,
+                        guint        day)
+{
+  g_return_if_fail (GTK_IS_CALENDAR (calendar));
+  g_return_if_fail (day <= 31);
+  
+  /* Deselect the old day */
+  if (calendar->selected_day > 0)
+    {
+      gint selected_day;
+      
+      selected_day = calendar->selected_day;
+      calendar->selected_day = 0;
+      if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (calendar)))
+       calendar_invalidate_day_num (calendar, selected_day);
+    }
+  
+  calendar->selected_day = day;
+  
+  /* Select the new day */
+  if (day != 0)
+    {
+      if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (calendar)))
+       calendar_invalidate_day_num (calendar, day);
+    }
+  
+  g_object_notify (G_OBJECT (calendar), "day");
+
+  g_signal_emit (calendar,
+                gtk_calendar_signals[DAY_SELECTED_SIGNAL],
+                0);
+}
+
+/**
+ * gtk_calendar_clear_marks:
+ * @calendar: a #GtkCalendar
+ * 
+ * Remove all visual markers.
+ **/
+void
+gtk_calendar_clear_marks (GtkCalendar *calendar)
+{
+  guint day;
+  
+  g_return_if_fail (GTK_IS_CALENDAR (calendar));
+  
+  for (day = 0; day < 31; day++)
+    {
+      calendar->marked_date[day] = FALSE;
+    }
+
+  calendar->num_marked_dates = 0;
+
+  gtk_widget_queue_draw (GTK_WIDGET (calendar));
+}
+
+/**
+ * gtk_calendar_mark_day:
+ * @calendar: a #GtkCalendar 
+ * @day: the day number to mark between 1 and 31.
+ * 
+ * Places a visual marker on a particular day.
+ * 
+ * Return value: %TRUE, always
+ **/
+gboolean
+gtk_calendar_mark_day (GtkCalendar *calendar,
+                      guint        day)
+{
+  g_return_val_if_fail (GTK_IS_CALENDAR (calendar), FALSE);
+  
+  if (day >= 1 && day <= 31 && calendar->marked_date[day-1] == FALSE)
+    {
+      calendar->marked_date[day - 1] = TRUE;
+      calendar->num_marked_dates++;
+      calendar_invalidate_day_num (calendar, day);
+    }
+  
+  return TRUE;
+}
+
+/**
+ * gtk_calendar_unmark_day:
+ * @calendar: a #GtkCalendar.
+ * @day: the day number to unmark between 1 and 31.
+ * 
+ * Removes the visual marker from a particular day.
+ * 
+ * Return value: %TRUE, always
+ **/
+gboolean
+gtk_calendar_unmark_day (GtkCalendar *calendar,
+                        guint        day)
+{
+  g_return_val_if_fail (GTK_IS_CALENDAR (calendar), FALSE);
+  
+  if (day >= 1 && day <= 31 && calendar->marked_date[day-1] == TRUE)
+    {
+      calendar->marked_date[day - 1] = FALSE;
+      calendar->num_marked_dates--;
+      calendar_invalidate_day_num (calendar, day);
+    }
+  
+  return TRUE;
 }
+
+/**
+ * gtk_calendar_get_date:
+ * @calendar: a #GtkCalendar
+ * @year: location to store the year number, or %NULL
+ * @month: location to store the month number (between 0 and 11), or %NULL
+ * @day: location to store the day number (between 1 and 31), or %NULL
+ * 
+ * Obtains the selected date from a #GtkCalendar.
+ **/
+void
+gtk_calendar_get_date (GtkCalendar *calendar,
+                      guint       *year,
+                      guint       *month,
+                      guint       *day)
+{
+  g_return_if_fail (GTK_IS_CALENDAR (calendar));
+  
+  if (year)
+    *year = calendar->year;
+  
+  if (month)
+    *month = calendar->month;
+  
+  if (day)
+    *day = calendar->selected_day;
+}
+
+/**
+ * gtk_calendar_freeze:
+ * @calendar: a #GtkCalendar
+ * 
+ * Does nothing. Previously locked the display of the calendar until
+ * it was thawed with gtk_calendar_thaw().
+ *
+ * Deprecated: 2.8: 
+ **/
+void
+gtk_calendar_freeze (GtkCalendar *calendar)
+{
+  g_return_if_fail (GTK_IS_CALENDAR (calendar));
+}
+
+/**
+ * gtk_calendar_thaw:
+ * @calendar: a #GtkCalendar
+ * 
+ * Does nothing. Previously defrosted a calendar; all the changes made
+ * since the last gtk_calendar_freeze() were displayed.
+ *
+ * Deprecated: 2.8: 
+ **/
+void
+gtk_calendar_thaw (GtkCalendar *calendar)
+{
+  g_return_if_fail (GTK_IS_CALENDAR (calendar));
+}
+
+#define __GTK_CALENDAR_C__
+#include "gtkaliasdef.c"