* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#include <config.h>
+/**
+ * SECTION:gtkcalendar
+ * @Short_description: Displays a calendar and allows the user to select a date
+ * @Title: GtkCalendar
+ *
+ * #GtkCalendar is a widget that displays a calendar, one month at a time. It
+ * can be created with gtk_calendar_new().
+ *
+ * The month and year currently displayed can be altered with
+ * gtk_calendar_select_month(). The exact day can be selected from the displayed
+ * month using gtk_calendar_select_day().
+ *
+ * To place a visual marker on a particular day, use gtk_calendar_mark_day() and
+ * to remove the marker, gtk_calendar_unmark_day(). Alternative, all marks can
+ * be cleared with gtk_calendar_clear_marks().
+ *
+ * The way in which the calendar itself is displayed can be altered using
+ * gtk_calendar_set_display_options().
+ *
+ * The selected date can be retrieved from a #GtkCalendar using
+ * gtk_calendar_get_date().
+ */
+
+#include "config.h"
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#include <windows.h>
#endif
-#include <glib/gprintf.h>
-
-#undef GTK_DISABLE_DEPRECATED
#include "gtkcalendar.h"
-#define GTK_DISABLE_DEPRECATED
-
#include "gtkdnd.h"
#include "gtkintl.h"
#include "gtkmain.h"
#include "gtkmarshalers.h"
+#include "gtktooltip.h"
#include "gtkprivate.h"
-#include "gtkintl.h"
#include "gdk/gdkkeysyms.h"
-#include "gtkalias.h"
/***************************************************************************/
/* The following date routines are taken from the lib_date package.
/* 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 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 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 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 BACKGROUND_COLOR(widget) (& (widget)->style->base[GTK_WIDGET_STATE (widget)])
-#define HIGHLIGHT_BACK_COLOR(widget) (& (widget)->style->mid[GTK_WIDGET_STATE (widget)])
+#define HEADER_FG_COLOR(widget) (& gtk_widget_get_style (widget)->fg[gtk_widget_get_state (widget)])
+#define HEADER_BG_COLOR(widget) (& gtk_widget_get_style (widget)->bg[gtk_widget_get_state (widget)])
+#define SELECTED_BG_COLOR(widget) (& gtk_widget_get_style (widget)->base[gtk_widget_has_focus (widget) ? GTK_STATE_SELECTED : GTK_STATE_ACTIVE])
+#define SELECTED_FG_COLOR(widget) (& gtk_widget_get_style (widget)->text[gtk_widget_has_focus (widget) ? GTK_STATE_SELECTED : GTK_STATE_ACTIVE])
+#define NORMAL_DAY_COLOR(widget) (& gtk_widget_get_style (widget)->text[gtk_widget_get_state (widget)])
+#define PREV_MONTH_COLOR(widget) (& gtk_widget_get_style (widget)->mid[gtk_widget_get_state (widget)])
+#define NEXT_MONTH_COLOR(widget) (& gtk_widget_get_style (widget)->mid[gtk_widget_get_state (widget)])
+#define MARKED_COLOR(widget) (& gtk_widget_get_style (widget)->text[gtk_widget_get_state (widget)])
+#define BACKGROUND_COLOR(widget) (& gtk_widget_get_style (widget)->base[gtk_widget_get_state (widget)])
+#define HIGHLIGHT_BACK_COLOR(widget) (& gtk_widget_get_style (widget)->mid[gtk_widget_get_state (widget)])
enum {
ARROW_YEAR_LEFT,
PROP_SHOW_DAY_NAMES,
PROP_NO_MONTH_CHANGE,
PROP_SHOW_WEEK_NUMBERS,
- PROP_LAST
+ PROP_SHOW_DETAILS,
+ PROP_DETAIL_WIDTH_CHARS,
+ PROP_DETAIL_HEIGHT_ROWS
};
static guint gtk_calendar_signals[LAST_SIGNAL] = { 0 };
struct _GtkCalendarPrivate
{
- GdkWindow *header_win;
- GdkWindow *day_name_win;
+ GtkCalendarDisplayOptions display_flags;
+ GtkStyle *header_style;
+ GtkStyle *label_style;
+
+ GdkColor marked_date_color[31];
GdkWindow *main_win;
- GdkWindow *week_win;
GdkWindow *arrow_win[4];
+ gchar grow_space [32];
+
+ gint month;
+ gint year;
+ gint selected_day;
+
+ gint day_month[6][7];
+ gint day[6][7];
+
+ gint num_marked_dates;
+ gint marked_date[31];
+
+ gint focus_row;
+ gint focus_col;
+
guint header_h;
guint day_name_h;
guint main_h;
- guint arrow_state[4];
- guint arrow_width;
- guint max_month_width;
- guint max_year_width;
-
+ guint arrow_state[4];
+ guint arrow_width;
+ guint max_month_width;
+ guint max_year_width;
+
guint day_width;
guint week_width;
gint drag_start_x;
gint drag_start_y;
+
+ /* Optional callback, used to display extra information for each day. */
+ GtkCalendarDetailFunc detail_func;
+ gpointer detail_func_user_data;
+ GDestroyNotify detail_func_destroy;
+
+ /* Size requistion for details provided by the hook. */
+ gint detail_height_rows;
+ gint detail_width_chars;
+ gint detail_overflow[6];
};
#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_destroy (GtkWidget *widget);
static void gtk_calendar_set_property (GObject *object,
guint prop_id,
const GValue *value,
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_get_preferred_width (GtkWidget *widget,
+ gint *minimum,
+ gint *natural);
+static void gtk_calendar_get_preferred_height (GtkWidget *widget,
+ gint *minimum,
+ gint *natural);
static void gtk_calendar_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
-static gboolean gtk_calendar_expose (GtkWidget *widget,
- GdkEventExpose *event);
+static gboolean gtk_calendar_draw (GtkWidget *widget,
+ cairo_t *cr);
static gboolean gtk_calendar_button_press (GtkWidget *widget,
GdkEventButton *event);
static gboolean gtk_calendar_button_release (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 gboolean gtk_calendar_query_tooltip (GtkWidget *widget,
+ gint x,
+ gint y,
+ gboolean keyboard_mode,
+ GtkTooltip *tooltip);
static void gtk_calendar_drag_data_get (GtkWidget *widget,
GdkDragContext *context,
guint arrow);
static void calendar_compute_days (GtkCalendar *calendar);
-
+static gint calendar_get_xsep (GtkCalendar *calendar);
+static gint calendar_get_ysep (GtkCalendar *calendar);
+static gint calendar_get_inner_border (GtkCalendar *calendar);
+
static char *default_abbreviated_dayname[7];
static char *default_monthname[12];
gtk_calendar_class_init (GtkCalendarClass *class)
{
GObjectClass *gobject_class;
- GtkObjectClass *object_class;
GtkWidgetClass *widget_class;
gobject_class = (GObjectClass*) class;
- object_class = (GtkObjectClass*) class;
widget_class = (GtkWidgetClass*) class;
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->destroy = gtk_calendar_destroy;
widget_class->realize = gtk_calendar_realize;
widget_class->unrealize = gtk_calendar_unrealize;
- widget_class->expose_event = gtk_calendar_expose;
- widget_class->size_request = gtk_calendar_size_request;
+ widget_class->draw = gtk_calendar_draw;
+ widget_class->get_preferred_width = gtk_calendar_get_preferred_width;
+ widget_class->get_preferred_height = gtk_calendar_get_preferred_height;
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->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;
widget_class->grab_notify = gtk_calendar_grab_notify;
widget_class->focus_out_event = gtk_calendar_focus_out;
+ widget_class->query_tooltip = gtk_calendar_query_tooltip;
widget_class->drag_data_get = gtk_calendar_drag_data_get;
widget_class->drag_motion = gtk_calendar_drag_motion;
widget_class->drag_drop = gtk_calendar_drag_drop;
widget_class->drag_data_received = gtk_calendar_drag_data_received;
+ /**
+ * GtkCalendar:year:
+ *
+ * The selected year.
+ * This property gets initially set to the current year.
+ */
g_object_class_install_property (gobject_class,
PROP_YEAR,
g_param_spec_int ("year",
P_("Year"),
P_("The selected year"),
- 0, G_MAXINT, 0,
+ 0, G_MAXINT >> 9, 0,
GTK_PARAM_READWRITE));
+
+ /**
+ * GtkCalendar:month:
+ *
+ * The selected month (as a number between 0 and 11).
+ * This property gets initially set to the current month.
+ */
g_object_class_install_property (gobject_class,
PROP_MONTH,
g_param_spec_int ("month",
P_("The selected month (as a number between 0 and 11)"),
0, 11, 0,
GTK_PARAM_READWRITE));
+
+ /**
+ * GtkCalendar:day:
+ *
+ * The selected day (as a number between 1 and 31, or 0
+ * to unselect the currently selected day).
+ * This property gets initially set to the current day.
+ */
g_object_class_install_property (gobject_class,
PROP_DAY,
g_param_spec_int ("day",
FALSE,
GTK_PARAM_READWRITE));
+/**
+ * GtkCalendar:detail-width-chars:
+ *
+ * Width of a detail cell, in characters.
+ * A value of 0 allows any width. See gtk_calendar_set_detail_func().
+ *
+ * Since: 2.14
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_DETAIL_WIDTH_CHARS,
+ g_param_spec_int ("detail-width-chars",
+ P_("Details Width"),
+ P_("Details width in characters"),
+ 0, 127, 0,
+ GTK_PARAM_READWRITE));
+
+/**
+ * GtkCalendar:detail-height-rows:
+ *
+ * Height of a detail cell, in rows.
+ * A value of 0 allows any width. See gtk_calendar_set_detail_func().
+ *
+ * Since: 2.14
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_DETAIL_HEIGHT_ROWS,
+ g_param_spec_int ("detail-height-rows",
+ P_("Details Height"),
+ P_("Details height in rows"),
+ 0, 127, 0,
+ GTK_PARAM_READWRITE));
+
+/**
+ * GtkCalendar:show-details:
+ *
+ * Determines whether details are shown directly in the widget, or if they are
+ * available only as tooltip. When this property is set days with details are
+ * marked.
+ *
+ * Since: 2.14
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_SHOW_DETAILS,
+ g_param_spec_boolean ("show-details",
+ P_("Show Details"),
+ P_("If TRUE, details are shown"),
+ TRUE,
+ GTK_PARAM_READWRITE));
+
+
+ /**
+ * GtkCalendar:inner-border
+ *
+ * The spacing around the day/week headers and main area.
+ */
+ gtk_widget_class_install_style_property (widget_class,
+ g_param_spec_int ("inner-border",
+ P_("Inner border"),
+ P_("Inner border space"),
+ 0, G_MAXINT, 4,
+ GTK_PARAM_READABLE));
+
+ /**
+ * GtkCalndar:vertical-separation
+ *
+ * Separation between day headers and main area.
+ */
+ gtk_widget_class_install_style_property (widget_class,
+ g_param_spec_int ("vertical-separation",
+ P_("Vertical separation"),
+ P_("Space between day headers and main area"),
+ 0, G_MAXINT, 4,
+ GTK_PARAM_READABLE));
+
+ /**
+ * GtkCalendar:horizontal-separation
+ *
+ * Separation between week headers and main area.
+ */
+ gtk_widget_class_install_style_property (widget_class,
+ g_param_spec_int ("horizontal-separation",
+ P_("Horizontal separation"),
+ P_("Space between week headers and main area"),
+ 0, G_MAXINT, 4,
+ GTK_PARAM_READABLE));
+
+ /**
+ * GtkCalendar::month-changed:
+ * @calendar: the object which received the signal.
+ *
+ * Emitted when the user clicks a button to change the selected month on a
+ * calendar.
+ */
gtk_calendar_signals[MONTH_CHANGED_SIGNAL] =
- g_signal_new (I_("month_changed"),
+ 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);
+
+ /**
+ * GtkCalendar::day-selected:
+ * @calendar: the object which received the signal.
+ *
+ * Emitted when the user selects a day.
+ */
gtk_calendar_signals[DAY_SELECTED_SIGNAL] =
- g_signal_new (I_("day_selected"),
+ 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);
+
+ /**
+ * GtkCalendar::day-selected-double-click:
+ * @calendar: the object which received the signal.
+ *
+ * Emitted when the user double-clicks a day.
+ */
gtk_calendar_signals[DAY_SELECTED_DOUBLE_CLICK_SIGNAL] =
- g_signal_new (I_("day_selected_double_click"),
+ 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);
+
+ /**
+ * GtkCalendar::prev-month:
+ * @calendar: the object which received the signal.
+ *
+ * Emitted when the user switched to the previous month.
+ */
gtk_calendar_signals[PREV_MONTH_SIGNAL] =
- g_signal_new (I_("prev_month"),
+ 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);
+
+ /**
+ * GtkCalendar::next-month:
+ * @calendar: the object which received the signal.
+ *
+ * Emitted when the user switched to the next month.
+ */
gtk_calendar_signals[NEXT_MONTH_SIGNAL] =
- g_signal_new (I_("next_month"),
+ 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);
+
+ /**
+ * GtkCalendar::prev-year:
+ * @calendar: the object which received the signal.
+ *
+ * Emitted when user switched to the previous year.
+ */
gtk_calendar_signals[PREV_YEAR_SIGNAL] =
- g_signal_new (I_("prev_year"),
+ 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);
+
+ /**
+ * GtkCalendar::next-year:
+ * @calendar: the object which received the signal.
+ *
+ * Emitted when user switched to the next year.
+ */
gtk_calendar_signals[NEXT_YEAR_SIGNAL] =
- g_signal_new (I_("next_year"),
+ g_signal_new (I_("next-year"),
G_OBJECT_CLASS_TYPE (gobject_class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GtkCalendarClass, next_year),
time_t secs;
struct tm *tm;
gint i;
- char buffer[255];
#ifdef G_OS_WIN32
wchar_t wbuffer[100];
#else
+ char buffer[255];
time_t tmp_time;
#endif
GtkCalendarPrivate *priv;
gchar *year_before;
#ifdef HAVE__NL_TIME_FIRST_WEEKDAY
- gchar *langinfo;
+ union { unsigned int word; char *string; } langinfo;
gint week_1stday = 0;
gint first_weekday = 1;
guint week_origin;
GTK_TYPE_CALENDAR,
GtkCalendarPrivate);
- GTK_WIDGET_SET_FLAGS (widget, GTK_CAN_FOCUS);
+ gtk_widget_set_can_focus (widget, TRUE);
+ gtk_widget_set_has_window (widget, FALSE);
if (!default_abbreviated_dayname[0])
for (i=0; i<7; i++)
strftime ( buffer, sizeof (buffer), "%a", gmtime (&tmp_time));
default_abbreviated_dayname[i] = g_locale_to_utf8 (buffer, -1, NULL, NULL, NULL);
#else
- if (G_WIN32_HAVE_WIDECHAR_API ())
- {
- 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);
- }
+ if (!GetLocaleInfoW (GetThreadLocale (), LOCALE_SABBREVDAYNAME1 + (i+6)%7,
+ wbuffer, G_N_ELEMENTS (wbuffer)))
+ default_abbreviated_dayname[i] = g_strdup_printf ("(%d)", i);
else
- {
- if (!GetLocaleInfoA (GetThreadLocale (),
- (LOCALE_SABBREVDAYNAME1 + (i+6)%7) | LOCALE_USE_CP_ACP,
- buffer, G_N_ELEMENTS (buffer)))
- default_abbreviated_dayname[i] = g_strdup_printf ("(%d)", i);
- else
- default_abbreviated_dayname[i] = g_locale_to_utf8 (buffer, -1, NULL, NULL, NULL);
- }
+ default_abbreviated_dayname[i] = g_utf16_to_utf8 (wbuffer, -1, NULL, NULL, NULL);
#endif
}
strftime ( buffer, sizeof (buffer), "%B", gmtime (&tmp_time));
default_monthname[i] = g_locale_to_utf8 (buffer, -1, NULL, NULL, NULL);
#else
- if (G_WIN32_HAVE_WIDECHAR_API ())
- {
- 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);
- }
+ if (!GetLocaleInfoW (GetThreadLocale (), LOCALE_SMONTHNAME1 + i,
+ wbuffer, G_N_ELEMENTS (wbuffer)))
+ default_monthname[i] = g_strdup_printf ("(%d)", i);
else
- {
- if (!GetLocaleInfoA (GetThreadLocale (),
- (LOCALE_SMONTHNAME1 + i) | LOCALE_USE_CP_ACP,
- buffer, G_N_ELEMENTS (buffer)))
- default_monthname[i] = g_strdup_printf ("(%d)", i);
- else
- default_monthname[i] = g_locale_to_utf8 (buffer, -1, NULL, NULL, NULL);
- }
+ default_monthname[i] = g_utf16_to_utf8 (wbuffer, -1, NULL, NULL, NULL);
#endif
}
/* Set defaults */
secs = time (NULL);
tm = localtime (&secs);
- calendar->month = tm->tm_mon;
- calendar->year = 1900 + tm->tm_year;
+ priv->month = tm->tm_mon;
+ priv->year = 1900 + tm->tm_year;
for (i=0;i<31;i++)
- calendar->marked_date[i] = FALSE;
- calendar->num_marked_dates = 0;
- calendar->selected_day = tm->tm_mday;
+ priv->marked_date[i] = FALSE;
+ priv->num_marked_dates = 0;
+ priv->selected_day = tm->tm_mday;
- calendar->display_flags = ( GTK_CALENDAR_SHOW_HEADING |
- GTK_CALENDAR_SHOW_DAY_NAMES );
+ priv->display_flags = (GTK_CALENDAR_SHOW_HEADING |
+ GTK_CALENDAR_SHOW_DAY_NAMES |
+ GTK_CALENDAR_SHOW_DETAILS);
- calendar->highlight_row = -1;
- calendar->highlight_col = -1;
-
- calendar->focus_row = -1;
- calendar->focus_col = -1;
+ priv->focus_row = -1;
+ priv->focus_col = -1;
priv->max_year_width = 0;
priv->max_month_width = 0;
* 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.
+ * Note that the ordering described here is logical order, which is
+ * further influenced by BIDI ordering. Thus, if you have a default
+ * text direction of RTL and specify "calendar:YM", then the year
+ * will appear to the right of the month.
*/
year_before = _("calendar:MY");
if (strcmp (year_before, "calendar:YM") == 0)
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 (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);
+ langinfo.string = nl_langinfo (_NL_TIME_FIRST_WEEKDAY);
+ first_weekday = langinfo.string[0];
+ langinfo.string = nl_langinfo (_NL_TIME_WEEK_1STDAY);
+ week_origin = langinfo.word;
if (week_origin == 19971130) /* Sunday */
week_1stday = 0;
else if (week_origin == 19971201) /* Monday */
g_warning ("Whoever translated calendar:week_start:0 did so wrongly.\n");
priv->week_start = 0;
}
+#endif
#endif
calendar_compute_days (calendar);
* Utility Functions *
****************************************/
+static void
+calendar_queue_refresh (GtkCalendar *calendar)
+{
+ GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar);
+
+ if (!(priv->detail_func) ||
+ !(priv->display_flags & GTK_CALENDAR_SHOW_DETAILS) ||
+ (priv->detail_width_chars && priv->detail_height_rows))
+ gtk_widget_queue_draw (GTK_WIDGET (calendar));
+ else
+ gtk_widget_queue_resize (GTK_WIDGET (calendar));
+}
+
static void
calendar_set_month_next (GtkCalendar *calendar)
{
gint month_len;
-
- g_return_if_fail (GTK_IS_WIDGET (calendar));
-
- if (calendar->display_flags & GTK_CALENDAR_NO_MONTH_CHANGE)
+ GtkCalendarPrivate *priv = calendar->priv;
+
+ if (priv->display_flags & GTK_CALENDAR_NO_MONTH_CHANGE)
return;
-
-
- if (calendar->month == 11)
+
+ if (priv->month == 11)
{
- calendar->month = 0;
- calendar->year++;
- }
- else
- calendar->month++;
-
+ priv->month = 0;
+ priv->year++;
+ }
+ else
+ priv->month++;
+
calendar_compute_days (calendar);
g_signal_emit (calendar,
gtk_calendar_signals[NEXT_MONTH_SIGNAL],
g_signal_emit (calendar,
gtk_calendar_signals[MONTH_CHANGED_SIGNAL],
0);
-
- month_len = month_length[leap (calendar->year)][calendar->month + 1];
-
- if (month_len < calendar->selected_day)
+
+ month_len = month_length[leap (priv->year)][priv->month + 1];
+
+ if (month_len < priv->selected_day)
{
- calendar->selected_day = 0;
+ priv->selected_day = 0;
gtk_calendar_select_day (calendar, month_len);
}
else
- gtk_calendar_select_day (calendar, calendar->selected_day);
+ gtk_calendar_select_day (calendar, priv->selected_day);
- gtk_widget_queue_draw (GTK_WIDGET (calendar));
+ calendar_queue_refresh (calendar);
}
static void
calendar_set_year_prev (GtkCalendar *calendar)
{
+ GtkCalendarPrivate *priv = calendar->priv;
gint month_len;
-
- g_return_if_fail (GTK_IS_WIDGET (calendar));
-
- calendar->year--;
+
+ priv->year--;
calendar_compute_days (calendar);
g_signal_emit (calendar,
gtk_calendar_signals[PREV_YEAR_SIGNAL],
g_signal_emit (calendar,
gtk_calendar_signals[MONTH_CHANGED_SIGNAL],
0);
-
- month_len = month_length[leap (calendar->year)][calendar->month + 1];
-
- if (month_len < calendar->selected_day)
+
+ month_len = month_length[leap (priv->year)][priv->month + 1];
+
+ if (month_len < priv->selected_day)
{
- calendar->selected_day = 0;
+ priv->selected_day = 0;
gtk_calendar_select_day (calendar, month_len);
}
else
- gtk_calendar_select_day (calendar, calendar->selected_day);
-
- gtk_widget_queue_draw (GTK_WIDGET (calendar));
+ gtk_calendar_select_day (calendar, priv->selected_day);
+
+ calendar_queue_refresh (calendar);
}
static void
calendar_set_year_next (GtkCalendar *calendar)
{
+ GtkCalendarPrivate *priv = calendar->priv;
gint month_len;
-
- g_return_if_fail (GTK_IS_WIDGET (calendar));
-
- calendar->year++;
+
+ priv->year++;
calendar_compute_days (calendar);
g_signal_emit (calendar,
gtk_calendar_signals[NEXT_YEAR_SIGNAL],
g_signal_emit (calendar,
gtk_calendar_signals[MONTH_CHANGED_SIGNAL],
0);
-
- month_len = month_length[leap (calendar->year)][calendar->month + 1];
-
- if (month_len < calendar->selected_day)
+
+ month_len = month_length[leap (priv->year)][priv->month + 1];
+
+ if (month_len < priv->selected_day)
{
- calendar->selected_day = 0;
+ priv->selected_day = 0;
gtk_calendar_select_day (calendar, month_len);
}
else
- gtk_calendar_select_day (calendar, calendar->selected_day);
-
- gtk_widget_queue_draw (GTK_WIDGET (calendar));
+ gtk_calendar_select_day (calendar, priv->selected_day);
+
+ calendar_queue_refresh (calendar);
}
static void
calendar_compute_days (GtkCalendar *calendar)
{
- GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (GTK_WIDGET (calendar));
+ GtkCalendarPrivate *priv = calendar->priv;
gint month;
gint year;
gint ndays_in_month;
gint col;
gint day;
- g_return_if_fail (GTK_IS_CALENDAR (calendar));
+ year = priv->year;
+ month = priv->month + 1;
- year = calendar->year;
- month = calendar->month + 1;
-
ndays_in_month = month_length[leap (year)][month];
-
+
first_day = day_of_week (year, month, 1);
first_day = (first_day + 7 - priv->week_start) % 7;
-
+
/* Compute days of previous month */
if (month > 1)
ndays_in_prev_month = month_length[leap (year)][month-1];
{
for (col = 0; col < first_day; col++)
{
- calendar->day[row][col] = day;
- calendar->day_month[row][col] = MONTH_PREV;
+ priv->day[row][col] = day;
+ priv->day_month[row][col] = MONTH_PREV;
day++;
}
}
col = first_day;
for (day = 1; day <= ndays_in_month; day++)
{
- calendar->day[row][col] = day;
- calendar->day_month[row][col] = MONTH_CURRENT;
-
+ priv->day[row][col] = day;
+ priv->day_month[row][col] = MONTH_CURRENT;
+
col++;
if (col == 7)
{
{
for (; col <= 6; col++)
{
- calendar->day[row][col] = day;
- calendar->day_month[row][col] = MONTH_NEXT;
+ priv->day[row][col] = day;
+ priv->day_month[row][col] = MONTH_NEXT;
day++;
}
col = 0;
calendar_select_and_focus_day (GtkCalendar *calendar,
guint day)
{
- gint old_focus_row = calendar->focus_row;
- gint old_focus_col = calendar->focus_col;
+ GtkCalendarPrivate *priv = calendar->priv;
+ gint old_focus_row = priv->focus_row;
+ gint old_focus_col = priv->focus_col;
gint row;
gint col;
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)
+ if (priv->day_month[row][col] == MONTH_CURRENT
+ && priv->day[row][col] == day)
{
- calendar->focus_row = row;
- calendar->focus_col = col;
+ priv->focus_row = row;
+ priv->focus_col = col;
}
}
static gint
calendar_row_height (GtkCalendar *calendar)
{
+ GtkCalendarPrivate *priv = calendar->priv;
+
return (GTK_CALENDAR_GET_PRIVATE (calendar)->main_h - CALENDAR_MARGIN
- - ((calendar->display_flags & GTK_CALENDAR_SHOW_DAY_NAMES)
- ? CALENDAR_YSEP : CALENDAR_MARGIN)) / 6;
+ - ((priv->display_flags & GTK_CALENDAR_SHOW_DAY_NAMES)
+ ? calendar_get_ysep (calendar) : CALENDAR_MARGIN)) / 6;
}
calendar_left_x_for_column (GtkCalendar *calendar,
gint column)
{
+ GtkCalendarPrivate *priv = calendar->priv;
gint width;
gint x_left;
-
+ gint week_width;
+ gint calendar_xsep = calendar_get_xsep (calendar);
+ GtkStyle *style;
+ gint inner_border = calendar_get_inner_border (calendar);
+
+ style = gtk_widget_get_style (GTK_WIDGET (calendar));
+
+ week_width = priv->week_width + style->xthickness + inner_border;
+
if (gtk_widget_get_direction (GTK_WIDGET (calendar)) == GTK_TEXT_DIR_RTL)
- column = 6 - column;
+ {
+ column = 6 - column;
+ week_width = 0;
+ }
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;
+ if (priv->display_flags & GTK_CALENDAR_SHOW_WEEK_NUMBERS)
+ x_left = week_width + calendar_xsep + (width + DAY_XSEP) * column;
else
- x_left = CALENDAR_MARGIN + (width + DAY_XSEP) * column;
+ x_left = week_width + CALENDAR_MARGIN + (width + DAY_XSEP) * column;
return x_left;
}
calendar_top_y_for_row (GtkCalendar *calendar,
gint row)
{
+ GtkStyle *style;
+ GtkAllocation allocation;
+ gint inner_border = calendar_get_inner_border (calendar);
+
+ gtk_widget_get_allocation (GTK_WIDGET (calendar), &allocation);
+ style = gtk_widget_get_style (GTK_WIDGET (calendar));
- return (GTK_CALENDAR_GET_PRIVATE (calendar)->main_h
+ return allocation.height
+ - style->ythickness - inner_border
- (CALENDAR_MARGIN + (6 - row)
- * calendar_row_height (calendar)));
+ * 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 event_y)
{
gint r, row;
gint height;
{
GtkWidget *widget = GTK_WIDGET (calendar);
GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar);
+ GtkAllocation allocation;
+ GtkStyle *style;
gboolean year_left;
- if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR)
+ gtk_widget_get_allocation (widget, &allocation);
+ style = gtk_widget_get_style (widget);
+
+ 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));
+ if (year_left)
+ rect->x = (allocation.width - 2 * 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
+ if (year_left)
+ rect->x = (allocation.width - 2 * style->xthickness
- 3 - priv->arrow_width);
else
- rect->x = (priv->arrow_width
- + priv->max_month_width);
+ rect->x = (priv->arrow_width + priv->max_month_width);
break;
case ARROW_YEAR_LEFT:
- if (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));
+ rect->x = (allocation.width - 2 * 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);
+ if (year_left)
+ rect->x = (priv->arrow_width + priv->max_year_width);
else
- rect->x = (widget->allocation.width - 2 * widget->style->xthickness
+ rect->x = (allocation.width - 2 * style->xthickness
- 3 - priv->arrow_width);
break;
}
+
+ rect->x += style->xthickness;
+ rect->y += style->ythickness;
}
static void
static void
calendar_set_month_prev (GtkCalendar *calendar)
{
+ GtkCalendarPrivate *priv = calendar->priv;
gint month_len;
- if (calendar->display_flags & GTK_CALENDAR_NO_MONTH_CHANGE)
+ if (priv->display_flags & GTK_CALENDAR_NO_MONTH_CHANGE)
return;
-
- if (calendar->month == 0)
+
+ if (priv->month == 0)
{
- calendar->month = 11;
- calendar->year--;
- }
- else
- calendar->month--;
-
- month_len = month_length[leap (calendar->year)][calendar->month + 1];
-
+ priv->month = 11;
+ priv->year--;
+ }
+ else
+ priv->month--;
+
+ month_len = month_length[leap (priv->year)][priv->month + 1];
+
calendar_compute_days (calendar);
g_signal_emit (calendar,
g_signal_emit (calendar,
gtk_calendar_signals[MONTH_CHANGED_SIGNAL],
0);
-
- if (month_len < calendar->selected_day)
+
+ if (month_len < priv->selected_day)
{
- calendar->selected_day = 0;
+ priv->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);
+ if (priv->selected_day < 0)
+ priv->selected_day = priv->selected_day + 1 + month_length[leap (priv->year)][priv->month + 1];
+ gtk_calendar_select_day (calendar, priv->selected_day);
}
- gtk_widget_queue_draw (GTK_WIDGET (calendar));
+ calendar_queue_refresh (calendar);
}
\f
static void
gtk_calendar_finalize (GObject *object)
{
- (* G_OBJECT_CLASS (gtk_calendar_parent_class)->finalize) (object);
+ G_OBJECT_CLASS (gtk_calendar_parent_class)->finalize (object);
}
static void
-gtk_calendar_destroy (GtkObject *object)
+gtk_calendar_destroy (GtkWidget *widget)
{
- calendar_stop_spinning (GTK_CALENDAR (object));
-
- GTK_OBJECT_CLASS (gtk_calendar_parent_class)->destroy (object);
+ GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (widget);
+
+ calendar_stop_spinning (GTK_CALENDAR (widget));
+
+ /* Call the destroy function for the extra display callback: */
+ if (priv->detail_func_destroy && priv->detail_func_user_data)
+ {
+ priv->detail_func_destroy (priv->detail_func_user_data);
+ priv->detail_func_user_data = NULL;
+ priv->detail_func_destroy = NULL;
+ }
+
+ GTK_WIDGET_CLASS (gtk_calendar_parent_class)->destroy (widget);
}
GtkCalendarDisplayOptions flag,
gboolean setting)
{
+ GtkCalendarPrivate *priv = calendar->priv;
GtkCalendarDisplayOptions flags;
- if (setting)
- flags = calendar->display_flags | flag;
+
+ if (setting)
+ flags = priv->display_flags | flag;
else
- flags = calendar->display_flags & ~flag;
- gtk_calendar_display_options (calendar, flags);
+ flags = priv->display_flags & ~flag;
+ gtk_calendar_set_display_options (calendar, flags);
}
static gboolean
calendar_get_display_option (GtkCalendar *calendar,
GtkCalendarDisplayOptions flag)
{
- return (calendar->display_flags & flag) != 0;
+ GtkCalendarPrivate *priv = calendar->priv;
+
+ return (priv->display_flags & flag) != 0;
}
static void
const GValue *value,
GParamSpec *pspec)
{
- GtkCalendar *calendar;
-
- calendar = GTK_CALENDAR (object);
+ GtkCalendar *calendar = GTK_CALENDAR (object);
+ GtkCalendarPrivate *priv = calendar->priv;
switch (prop_id)
{
case PROP_YEAR:
gtk_calendar_select_month (calendar,
- calendar->month,
+ priv->month,
g_value_get_int (value));
break;
case PROP_MONTH:
gtk_calendar_select_month (calendar,
g_value_get_int (value),
- calendar->year);
+ priv->year);
break;
case PROP_DAY:
gtk_calendar_select_day (calendar,
GTK_CALENDAR_SHOW_WEEK_NUMBERS,
g_value_get_boolean (value));
break;
+ case PROP_SHOW_DETAILS:
+ calendar_set_display_option (calendar,
+ GTK_CALENDAR_SHOW_DETAILS,
+ g_value_get_boolean (value));
+ break;
+ case PROP_DETAIL_WIDTH_CHARS:
+ gtk_calendar_set_detail_width_chars (calendar,
+ g_value_get_int (value));
+ break;
+ case PROP_DETAIL_HEIGHT_ROWS:
+ gtk_calendar_set_detail_height_rows (calendar,
+ g_value_get_int (value));
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
GValue *value,
GParamSpec *pspec)
{
- GtkCalendar *calendar;
-
- calendar = GTK_CALENDAR (object);
+ GtkCalendar *calendar = GTK_CALENDAR (object);
+ GtkCalendarPrivate *priv = calendar->priv;
switch (prop_id)
{
case PROP_YEAR:
- g_value_set_int (value, calendar->year);
+ g_value_set_int (value, priv->year);
break;
case PROP_MONTH:
- g_value_set_int (value, calendar->month);
+ g_value_set_int (value, priv->month);
break;
case PROP_DAY:
- g_value_set_int (value, calendar->selected_day);
+ g_value_set_int (value, priv->selected_day);
break;
case PROP_SHOW_HEADING:
g_value_set_boolean (value, calendar_get_display_option (calendar,
g_value_set_boolean (value, calendar_get_display_option (calendar,
GTK_CALENDAR_SHOW_WEEK_NUMBERS));
break;
+ case PROP_SHOW_DETAILS:
+ g_value_set_boolean (value, calendar_get_display_option (calendar,
+ GTK_CALENDAR_SHOW_DETAILS));
+ break;
+ case PROP_DETAIL_WIDTH_CHARS:
+ g_value_set_int (value, priv->detail_width_chars);
+ break;
+ case PROP_DETAIL_HEIGHT_ROWS:
+ g_value_set_int (value, priv->detail_height_rows);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
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))
+ GtkAllocation allocation;
+
+ if (! (priv->display_flags & GTK_CALENDAR_NO_MONTH_CHANGE)
+ && (priv->display_flags & GTK_CALENDAR_SHOW_HEADING))
{
- attributes.wclass = GDK_INPUT_OUTPUT;
+ gtk_widget_get_allocation (widget, &allocation);
+
+ attributes.wclass = GDK_INPUT_ONLY;
attributes.window_type = GDK_WINDOW_CHILD;
- attributes.visual = gtk_widget_get_visual (widget);
- attributes.colormap = gtk_widget_get_colormap (widget);
- attributes.event_mask = (gtk_widget_get_events (widget) | GDK_EXPOSURE_MASK
- | 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.event_mask = (gtk_widget_get_events (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;
for (i = 0; i < 4; i++)
{
GdkRectangle rect;
calendar_arrow_rectangle (calendar, i, &rect);
- attributes.x = rect.x;
- attributes.y = rect.y;
+ attributes.x = allocation.x + rect.x;
+ attributes.y = allocation.y + rect.y;
attributes.width = rect.width;
attributes.height = rect.height;
- priv->arrow_win[i] = gdk_window_new (priv->header_win,
+ priv->arrow_win[i] = gdk_window_new (gtk_widget_get_window (widget),
&attributes,
attributes_mask);
- if (GTK_WIDGET_IS_SENSITIVE (widget))
+ 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 (priv->arrow_win[i]);
gdk_window_set_user_data (priv->arrow_win[i], widget);
}
}
static void
-calendar_realize_header (GtkCalendar *calendar)
+calendar_unrealize_arrows (GtkCalendar *calendar)
{
- GtkWidget *widget = GTK_WIDGET (calendar);
GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar);
- GdkWindowAttr attributes;
- gint attributes_mask;
-
- /* Header window ------------------------------------- */
- if (calendar->display_flags & GTK_CALENDAR_SHOW_HEADING)
- {
- attributes.wclass = GDK_INPUT_OUTPUT;
- attributes.window_type = GDK_WINDOW_CHILD;
- attributes.visual = gtk_widget_get_visual (widget);
- attributes.colormap = gtk_widget_get_colormap (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;
- attributes.y = widget->style->ythickness;
- 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 (priv->header_win,
- HEADER_BG_COLOR (GTK_WIDGET (calendar)));
- gdk_window_show (priv->header_win);
- gdk_window_set_user_data (priv->header_win, widget);
-
- }
- else
+ gint i;
+
+ for (i = 0; i < 4; i++)
{
- priv->header_win = NULL;
+ 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;
+ }
}
- calendar_realize_arrows (calendar);
+
}
-static void
-calendar_realize_day_names (GtkCalendar *calendar)
+static gint
+calendar_get_inner_border (GtkCalendar *calendar)
{
- GtkWidget *widget = GTK_WIDGET (calendar);
- GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar);
- GdkWindowAttr attributes;
- gint attributes_mask;
-
- /* Day names window --------------------------------- */
- if ( calendar->display_flags & GTK_CALENDAR_SHOW_DAY_NAMES)
- {
- attributes.wclass = GDK_INPUT_OUTPUT;
- attributes.window_type = GDK_WINDOW_CHILD;
- attributes.visual = gtk_widget_get_visual (widget);
- attributes.colormap = gtk_widget_get_colormap (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 = priv->header_h + (widget->style->ythickness
- + INNER_BORDER);
- attributes.width = (widget->allocation.width
- - (widget->style->xthickness + INNER_BORDER)
- * 2);
- 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 (priv->day_name_win);
- gdk_window_set_user_data (priv->day_name_win, widget);
- }
- else
- {
- priv->day_name_win = NULL;
- }
+ gint inner_border;
+
+ gtk_widget_style_get (GTK_WIDGET (calendar),
+ "inner-border", &inner_border,
+ NULL);
+
+ return inner_border;
}
-static void
-calendar_realize_week_numbers (GtkCalendar *calendar)
+static gint
+calendar_get_xsep (GtkCalendar *calendar)
{
- GtkWidget *widget = GTK_WIDGET (calendar);
- GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar);
- GdkWindowAttr attributes;
- gint attributes_mask;
-
- /* Week number window -------------------------------- */
- if (calendar->display_flags & GTK_CALENDAR_SHOW_WEEK_NUMBERS)
- {
- attributes.wclass = GDK_INPUT_OUTPUT;
- attributes.window_type = GDK_WINDOW_CHILD;
- attributes.visual = gtk_widget_get_visual (widget);
- attributes.colormap = gtk_widget_get_colormap (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 = (priv->header_h + priv->day_name_h
- + (widget->style->ythickness + INNER_BORDER));
- 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 (priv->week_win);
- gdk_window_set_user_data (priv->week_win, widget);
- }
- else
- {
- priv->week_win = NULL;
- }
+ gint xsep;
+
+ gtk_widget_style_get (GTK_WIDGET (calendar),
+ "horizontal-separation", &xsep,
+ NULL);
+
+ return xsep;
+}
+
+static gint
+calendar_get_ysep (GtkCalendar *calendar)
+{
+ gint ysep;
+
+ gtk_widget_style_get (GTK_WIDGET (calendar),
+ "vertical-separation", &ysep,
+ NULL);
+
+ return ysep;
}
static void
gtk_calendar_realize (GtkWidget *widget)
{
- GtkCalendar *calendar = GTK_CALENDAR (widget);
GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (widget);
GdkWindowAttr attributes;
gint attributes_mask;
+ gint inner_border = calendar_get_inner_border (GTK_CALENDAR (widget));
+ GtkStyle *style;
+ GtkAllocation allocation;
- GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
-
- attributes.x = widget->allocation.x;
- attributes.y = widget->allocation.y;
- attributes.width = widget->allocation.width;
- attributes.height = widget->allocation.height;
- attributes.wclass = GDK_INPUT_OUTPUT;
+ style = gtk_widget_get_style (widget);
+ gtk_widget_get_allocation (widget, &allocation);
+
+ GTK_WIDGET_CLASS (gtk_calendar_parent_class)->realize (widget);
+
+ attributes.wclass = GDK_INPUT_ONLY;
attributes.window_type = GDK_WINDOW_CHILD;
- attributes.event_mask = (gtk_widget_get_events (widget)
- | GDK_EXPOSURE_MASK |GDK_KEY_PRESS_MASK | GDK_SCROLL_MASK);
- attributes.visual = gtk_widget_get_visual (widget);
- attributes.colormap = gtk_widget_get_colormap (widget);
-
- attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
- widget->window = gdk_window_new (widget->parent->window,
- &attributes, attributes_mask);
-
- widget->style = gtk_style_attach (widget->style, widget->window);
-
- /* Header window ------------------------------------- */
- calendar_realize_header (calendar);
- /* Day names window --------------------------------- */
- calendar_realize_day_names (calendar);
- /* Week number window -------------------------------- */
- 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);
-
- 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 = 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 (priv->main_win);
+ 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 (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR)
+ attributes.x = priv->week_width + style->ythickness + inner_border;
+ else
+ attributes.x = style->ythickness + inner_border;
+
+ attributes.y = priv->header_h + priv->day_name_h + style->ythickness + inner_border;
+ attributes.width = allocation.width - attributes.x - (style->xthickness + inner_border);
+
+ if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
+ attributes.width -= priv->week_width;
+
+ attributes.height = priv->main_h;
+ attributes_mask = GDK_WA_X | GDK_WA_Y;
+
+ attributes.x += allocation.x;
+ attributes.y += allocation.y;
+
+ priv->main_win = gdk_window_new (gtk_widget_get_window (widget),
+ &attributes, attributes_mask);
+ 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);
+
+ calendar_realize_arrows (GTK_CALENDAR (widget));
}
static void
gtk_calendar_unrealize (GtkWidget *widget)
{
GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (widget);
- gint i;
-
- if (priv->header_win)
+
+ calendar_unrealize_arrows (GTK_CALENDAR (widget));
+
+ if (priv->main_win)
{
- 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;
+ gdk_window_set_user_data (priv->main_win, NULL);
+ gdk_window_destroy (priv->main_win);
+ priv->main_win = NULL;
}
-
- if (priv->week_win)
+
+ GTK_WIDGET_CLASS (gtk_calendar_parent_class)->unrealize (widget);
+}
+
+static gchar*
+gtk_calendar_get_detail (GtkCalendar *calendar,
+ gint row,
+ gint column)
+{
+ GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar);
+ gint year, month;
+
+ if (priv->detail_func == NULL)
+ return NULL;
+
+ year = priv->year;
+ month = priv->month + priv->day_month[row][column] - MONTH_CURRENT;
+
+ if (month < 0)
{
- gdk_window_set_user_data (priv->week_win, NULL);
- gdk_window_destroy (priv->week_win);
- priv->week_win = NULL;
+ month += 12;
+ year -= 1;
}
-
- if (priv->main_win)
+ else if (month > 11)
{
- gdk_window_set_user_data (priv->main_win, NULL);
- gdk_window_destroy (priv->main_win);
- priv->main_win = NULL;
+ month -= 12;
+ year += 1;
}
- if (priv->day_name_win)
+
+ return priv->detail_func (calendar,
+ year, month,
+ priv->day[row][column],
+ priv->detail_func_user_data);
+}
+
+static gboolean
+gtk_calendar_query_tooltip (GtkWidget *widget,
+ gint x,
+ gint y,
+ gboolean keyboard_mode,
+ GtkTooltip *tooltip)
+{
+ GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (widget);
+ GtkCalendar *calendar = GTK_CALENDAR (widget);
+ gchar *detail = NULL;
+ GdkRectangle day_rect;
+ gint row, col;
+
+ col = calendar_column_from_x (calendar, x);
+ row = calendar_row_from_y (calendar, y);
+
+ if (col != -1 && row != -1 &&
+ (0 != (priv->detail_overflow[row] & (1 << col)) ||
+ 0 == (priv->display_flags & GTK_CALENDAR_SHOW_DETAILS)))
{
- gdk_window_set_user_data (priv->day_name_win, NULL);
- gdk_window_destroy (priv->day_name_win);
- priv->day_name_win = NULL;
+ detail = gtk_calendar_get_detail (calendar, row, col);
+ calendar_day_rectangle (calendar, row, col, &day_rect);
}
-
- if (GTK_WIDGET_CLASS (gtk_calendar_parent_class)->unrealize)
- (* GTK_WIDGET_CLASS (gtk_calendar_parent_class)->unrealize) (widget);
+
+ if (detail)
+ {
+ gtk_tooltip_set_tip_area (tooltip, &day_rect);
+ gtk_tooltip_set_markup (tooltip, detail);
+
+ g_free (detail);
+
+ return TRUE;
+ }
+
+ if (GTK_WIDGET_CLASS (gtk_calendar_parent_class)->query_tooltip)
+ return GTK_WIDGET_CLASS (gtk_calendar_parent_class)->query_tooltip (widget, x, y, keyboard_mode, tooltip);
+
+ return FALSE;
}
\f
{
GtkCalendar *calendar = GTK_CALENDAR (widget);
GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (widget);
+ GtkStyle *style;
PangoLayout *layout;
PangoRectangle logical_rect;
gint height;
- gint i;
+ gint i, r, c;
gint calendar_margin = CALENDAR_MARGIN;
gint header_width, main_width;
gint max_header_height = 0;
gint focus_width;
gint focus_padding;
-
+ gint max_detail_height;
+ gint inner_border = calendar_get_inner_border (calendar);
+ gint calendar_ysep = calendar_get_ysep (calendar);
+ gint calendar_xsep = calendar_get_xsep (calendar);
+
gtk_widget_style_get (GTK_WIDGET (widget),
"focus-line-width", &focus_width,
"focus-padding", &focus_padding,
/* Header width */
- if (calendar->display_flags & GTK_CALENDAR_SHOW_HEADING)
+ if (priv->display_flags & GTK_CALENDAR_SHOW_HEADING)
{
priv->max_month_width = 0;
for (i = 0; i < 12; i++)
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.
+ * Translate it to the widest year text
*
* If you don't understand this, leave it as "2000"
*/
- pango_layout_set_text (layout, Q_("year measurement template|2000"), -1);
+ pango_layout_set_text (layout, C_("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);
priv->max_year_width = 0;
}
- if (calendar->display_flags & GTK_CALENDAR_NO_MONTH_CHANGE)
+ if (priv->display_flags & GTK_CALENDAR_NO_MONTH_CHANGE)
header_width = (priv->max_month_width
+ priv->max_year_width
+ 3 * 3);
for (i = 0; i < 9; i++)
{
gchar buffer[32];
- g_snprintf (buffer, sizeof (buffer), Q_("calendar:day:digits|%d"), i * 11);
+ g_snprintf (buffer, sizeof (buffer), C_("calendar:day:digits", "%d"), i * 11);
pango_layout_set_text (layout, buffer, -1);
pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
priv->min_day_width = MAX (priv->min_day_width,
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" */
- 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)
+ if (priv->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);
+ pango_layout_line_get_pixel_extents (pango_layout_get_lines_readonly (layout)->data, NULL, &logical_rect);
priv->min_day_width = MAX (priv->min_day_width, logical_rect.width);
priv->max_label_char_ascent = MAX (priv->max_label_char_ascent,
}
priv->max_week_char_width = 0;
- if (calendar->display_flags & GTK_CALENDAR_SHOW_WEEK_NUMBERS)
+ if (priv->display_flags & GTK_CALENDAR_SHOW_WEEK_NUMBERS)
for (i = 0; i < 9; i++)
{
gchar buffer[32];
- g_snprintf (buffer, sizeof (buffer), Q_("calendar:week:digits|%d"), i * 11);
+ g_snprintf (buffer, sizeof (buffer), C_("calendar:week:digits", "%d"), i * 11);
pango_layout_set_text (layout, buffer, -1);
pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
priv->max_week_char_width = MAX (priv->max_week_char_width,
logical_rect.width / 2);
}
+ /* Calculate detail extents. Do this as late as possible since
+ * pango_layout_set_markup is called which alters font settings. */
+ max_detail_height = 0;
+
+ if (priv->detail_func && (priv->display_flags & GTK_CALENDAR_SHOW_DETAILS))
+ {
+ gchar *markup, *tail;
+
+ if (priv->detail_width_chars || priv->detail_height_rows)
+ {
+ gint rows = MAX (1, priv->detail_height_rows) - 1;
+ gsize len = priv->detail_width_chars + rows + 16;
+
+ markup = tail = g_alloca (len);
+
+ memcpy (tail, "<small>", 7);
+ tail += 7;
+
+ memset (tail, 'm', priv->detail_width_chars);
+ tail += priv->detail_width_chars;
+
+ memset (tail, '\n', rows);
+ tail += rows;
+
+ memcpy (tail, "</small>", 9);
+ tail += 9;
+
+ g_assert (len == (tail - markup));
+
+ pango_layout_set_markup (layout, markup, -1);
+ pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
+
+ if (priv->detail_width_chars)
+ priv->min_day_width = MAX (priv->min_day_width, logical_rect.width);
+ if (priv->detail_height_rows)
+ max_detail_height = MAX (max_detail_height, logical_rect.height);
+ }
+
+ if (!priv->detail_width_chars || !priv->detail_height_rows)
+ for (r = 0; r < 6; r++)
+ for (c = 0; c < 7; c++)
+ {
+ gchar *detail = gtk_calendar_get_detail (calendar, r, c);
+
+ if (detail)
+ {
+ markup = g_strconcat ("<small>", detail, "</small>", NULL);
+ pango_layout_set_markup (layout, markup, -1);
+
+ if (priv->detail_width_chars)
+ {
+ pango_layout_set_wrap (layout, PANGO_WRAP_WORD_CHAR);
+ pango_layout_set_width (layout, PANGO_SCALE * priv->min_day_width);
+ }
+
+ pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
+
+ if (!priv->detail_width_chars)
+ priv->min_day_width = MAX (priv->min_day_width, logical_rect.width);
+ if (!priv->detail_height_rows)
+ max_detail_height = MAX (max_detail_height, logical_rect.height);
+
+ g_free (markup);
+ g_free (detail);
+ }
+ }
+ }
+
+ /* We add one to max_day_char_width to be able to make the marked day "bold" */
+ priv->max_day_char_width = priv->min_day_width / 2 + 1;
+
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
+ ? priv->max_week_char_width * 2 + (focus_padding + focus_width) * 2 + calendar_xsep * 2
: 0));
-
-
- requisition->width = MAX (header_width, main_width + INNER_BORDER * 2) + widget->style->xthickness * 2;
-
+
+ style = gtk_widget_get_style (widget);
+
+ requisition->width = MAX (header_width, main_width + inner_border * 2) + style->xthickness * 2;
+
/*
* Calculate the requisition height for the widget.
*/
- if (calendar->display_flags & GTK_CALENDAR_SHOW_HEADING)
+ if (priv->display_flags & GTK_CALENDAR_SHOW_HEADING)
{
- priv->header_h = (max_header_height + CALENDAR_YSEP * 2);
+ priv->header_h = (max_header_height + calendar_ysep * 2);
}
else
{
priv->header_h = 0;
}
- if (calendar->display_flags & GTK_CALENDAR_SHOW_DAY_NAMES)
+ if (priv->display_flags & GTK_CALENDAR_SHOW_DAY_NAMES)
{
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;
+ calendar_margin = calendar_ysep;
}
else
{
priv->main_h = (CALENDAR_MARGIN + calendar_margin
+ 6 * (priv->max_day_char_ascent
- + priv->max_day_char_descent
+ + priv->max_day_char_descent
+ + max_detail_height
+ 2 * (focus_padding + focus_width))
+ DAY_YSEP * 5);
-
- height = (priv->header_h + priv->day_name_h
- + priv->main_h);
-
- requisition->height = height + (widget->style->ythickness + INNER_BORDER) * 2;
+
+ height = priv->header_h + priv->day_name_h + priv->main_h;
+
+ requisition->height = height + (style->ythickness + inner_border) * 2;
g_object_unref (layout);
}
+static void
+gtk_calendar_get_preferred_width (GtkWidget *widget,
+ gint *minimum,
+ gint *natural)
+{
+ GtkRequisition requisition;
+
+ gtk_calendar_size_request (widget, &requisition);
+
+ *minimum = *natural = requisition.width;
+}
+
+static void
+gtk_calendar_get_preferred_height (GtkWidget *widget,
+ gint *minimum,
+ gint *natural)
+{
+ GtkRequisition requisition;
+
+ gtk_calendar_size_request (widget, &requisition);
+
+ *minimum = *natural = requisition.height;
+}
+
static void
gtk_calendar_size_allocate (GtkWidget *widget,
GtkAllocation *allocation)
{
GtkCalendar *calendar = GTK_CALENDAR (widget);
GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (widget);
- gint xthickness = widget->style->xthickness;
- gint ythickness = widget->style->xthickness;
+ GtkStyle *style;
+ gint xthickness, ythickness;
guint i;
-
- widget->allocation = *allocation;
-
- if (calendar->display_flags & GTK_CALENDAR_SHOW_WEEK_NUMBERS)
+ gint inner_border = calendar_get_inner_border (calendar);
+ gint calendar_xsep = calendar_get_xsep (calendar);
+
+ style = gtk_widget_get_style (widget);
+ xthickness = style->xthickness;
+ ythickness = style->xthickness;
+
+ gtk_widget_set_allocation (widget, allocation);
+
+ if (priv->display_flags & GTK_CALENDAR_SHOW_WEEK_NUMBERS)
{
priv->day_width = (priv->min_day_width
- * ((allocation->width - (xthickness + INNER_BORDER) * 2
- - (CALENDAR_MARGIN * 2) - (DAY_XSEP * 6) - CALENDAR_XSEP * 2))
+ * ((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);
+ 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
{
priv->day_width = (allocation->width
- - (xthickness + INNER_BORDER) * 2
+ - (xthickness + inner_border) * 2
- (CALENDAR_MARGIN * 2)
- (DAY_XSEP * 6))/7;
priv->week_width = 0;
}
- if (GTK_WIDGET_REALIZED (widget))
+ if (gtk_widget_get_realized (widget))
{
- gdk_window_move_resize (widget->window,
- allocation->x, allocation->y,
- allocation->width, allocation->height);
- if (priv->header_win)
- gdk_window_move_resize (priv->header_win,
- xthickness, ythickness,
- allocation->width - 2 * xthickness, priv->header_h);
+ if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR)
+ gdk_window_move_resize (priv->main_win,
+ priv->week_width + xthickness + inner_border,
+ priv->header_h + priv->day_name_h
+ + (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
+ + style->ythickness + inner_border,
+ allocation->width - priv->week_width
+ - (xthickness + inner_border) * 2,
+ priv->main_h);
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 (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)
- {
- 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);
- }
+ {
+ if (priv->arrow_win[i])
+ {
+ GdkRectangle rect;
+ calendar_arrow_rectangle (calendar, i, &rect);
+
+ gdk_window_move_resize (priv->arrow_win[i],
+ allocation->x + rect.x,
+ allocation->y + rect.y,
+ rect.width, rect.height);
+ }
+ }
}
}
****************************************/
static void
-calendar_paint_header (GtkCalendar *calendar)
+calendar_paint_header (GtkCalendar *calendar, cairo_t *cr)
{
GtkWidget *widget = GTK_WIDGET (calendar);
GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar);
- cairo_t *cr;
+ GtkAllocation allocation;
+ GtkStyle *style;
char buffer[255];
- int x, y;
+ gint x, y;
gint header_width;
gint max_month_width;
gint max_year_width;
struct tm *tm;
gchar *str;
- if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR)
+ style = gtk_widget_get_style (widget);
+
+ cairo_save (cr);
+ cairo_translate (cr, style->xthickness, style->ythickness);
+
+ 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;
-
+ gtk_widget_get_allocation (widget, &allocation);
+
+ header_width = allocation.width - 2 * 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);
+
+ gdk_cairo_set_source_color (cr, HEADER_BG_COLOR (widget));
+ cairo_rectangle (cr, 0, 0, header_width, priv->header_h);
+ cairo_fill (cr);
+
+ gtk_paint_shadow (style, cr,
+ GTK_STATE_NORMAL, GTK_SHADOW_OUT,
+ 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;
+ tm->tm_year = priv->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".
+ * Also look for the msgid "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.
+ * msgid.
+ *
+ * "%Y" is appropriate for most locales.
*/
- strftime (buffer, sizeof (buffer), Q_("calendar year format|%Y"), tm);
+ strftime (buffer, sizeof (buffer), C_("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);
/* Draw year and its arrows */
- if (calendar->display_flags & GTK_CALENDAR_NO_MONTH_CHANGE)
+ if (priv->display_flags & GTK_CALENDAR_NO_MONTH_CHANGE)
if (year_left)
x = 3 + (max_year_width - logical_rect.width)/2;
else
pango_cairo_show_layout (cr, layout);
/* Draw month */
- g_snprintf (buffer, sizeof (buffer), "%s", default_monthname[calendar->month]);
+ g_snprintf (buffer, sizeof (buffer), "%s", default_monthname[priv->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 (priv->display_flags & GTK_CALENDAR_NO_MONTH_CHANGE)
if (year_left)
x = header_width - (3 + max_month_width
- (max_month_width - logical_rect.width)/2);
pango_cairo_show_layout (cr, layout);
g_object_unref (layout);
- cairo_destroy (cr);
+
+ cairo_restore (cr);
}
static void
-calendar_paint_day_names (GtkCalendar *calendar)
+calendar_paint_day_names (GtkCalendar *calendar,
+ cairo_t *cr)
{
GtkWidget *widget = GTK_WIDGET (calendar);
GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar);
- cairo_t *cr;
+ GtkStyle *style;
+ GtkAllocation allocation;
char buffer[255];
int day,i;
int day_width, cal_width;
PangoRectangle logical_rect;
gint focus_padding;
gint focus_width;
-
- cr = gdk_cairo_create (priv->day_name_win);
-
+ gint calendar_ysep = calendar_get_ysep (calendar);
+ gint calendar_xsep = calendar_get_xsep (calendar);
+ gint inner_border = calendar_get_inner_border (calendar);
+
+ style = gtk_widget_get_style (widget);
+
+ cairo_save (cr);
+
+ cairo_translate (cr,
+ style->xthickness + inner_border,
+ priv->header_h + style->ythickness + inner_border);
+
gtk_widget_style_get (GTK_WIDGET (widget),
"focus-line-width", &focus_width,
"focus-padding", &focus_padding,
NULL);
-
+
+ gtk_widget_get_allocation (widget, &allocation);
+
day_width = priv->day_width;
- cal_width = widget->allocation.width;
+ cal_width = allocation.width - (style->xthickness + inner_border) * 2;
day_wid_sep = day_width + DAY_XSEP;
/*
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);
+ 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)
+
+ if (priv->display_flags & GTK_CALENDAR_SHOW_WEEK_NUMBERS)
{
- cairo_rectangle (cr,
+ cairo_rectangle (cr,
CALENDAR_MARGIN,
- priv->day_name_h - CALENDAR_YSEP,
- priv->week_width - CALENDAR_YSEP - CALENDAR_MARGIN,
- CALENDAR_YSEP);
+ priv->day_name_h - calendar_ysep,
+ priv->week_width - calendar_ysep - CALENDAR_MARGIN,
+ calendar_ysep);
cairo_fill (cr);
}
-
+
/*
* Write the labels
*/
cairo_move_to (cr,
(CALENDAR_MARGIN +
+ (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR ?
- (priv->week_width + (priv->week_width ? CALENDAR_XSEP : 0))
+ (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 (layout);
- cairo_destroy (cr);
+
+ cairo_restore (cr);
}
static void
-calendar_paint_week_numbers (GtkCalendar *calendar)
+calendar_paint_week_numbers (GtkCalendar *calendar,
+ cairo_t *cr)
{
GtkWidget *widget = GTK_WIDGET (calendar);
GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar);
- cairo_t *cr;
- gint row, week = 0, year;
- gint x_loc;
+ GtkStyle *style;
+ guint week = 0, year;
+ gint row, x_loc, y_loc;
+ gint day_height;
char buffer[32];
- gint y_loc, day_height;
PangoLayout *layout;
PangoRectangle logical_rect;
gint focus_padding;
gint focus_width;
-
- cr = gdk_cairo_create (priv->week_win);
-
+ gint calendar_xsep = calendar_get_xsep (calendar);
+ gint inner_border = calendar_get_inner_border (calendar);
+ gint x, y;
+
+ style = gtk_widget_get_style (widget);
+
+ cairo_save (cr);
+
+ y = priv->header_h + priv->day_name_h + (style->ythickness + inner_border);
+ if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR)
+ x = style->xthickness + inner_border;
+ else
+ x = gtk_widget_get_allocated_width (widget) - priv->week_width - (style->xthickness + inner_border);
+
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_cairo_set_source_color (cr, SELECTED_BG_COLOR (widget));
- if (priv->day_name_win)
- cairo_rectangle (cr,
- CALENDAR_MARGIN,
- 0,
+ if (priv->display_flags & GTK_CALENDAR_SHOW_DAY_NAMES)
+ cairo_rectangle (cr,
+ x + CALENDAR_MARGIN,
+ y,
priv->week_width - CALENDAR_MARGIN,
priv->main_h - CALENDAR_MARGIN);
else
cairo_rectangle (cr,
- CALENDAR_MARGIN,
- CALENDAR_MARGIN,
+ x + CALENDAR_MARGIN,
+ y + CALENDAR_MARGIN,
priv->week_width - CALENDAR_MARGIN,
priv->main_h - 2 * CALENDAR_MARGIN);
cairo_fill (cr);
-
+
/*
* Write the labels
*/
-
+
layout = gtk_widget_create_pango_layout (widget, NULL);
-
+
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 = priv->year;
+ if (priv->day[row][6] < 15 && row > 3 && priv->month == 11)
year++;
- result = week_of_year (&week, &year,
- ((calendar->day[row][6] < 15 && row > 3 ? 1 : 0)
- + calendar->month) % 12 + 1, calendar->day[row][6]);
+ result = week_of_year (&week, &year,
+ ((priv->day[row][6] < 15 && row > 3 ? 1 : 0)
+ + priv->month) % 12 + 1, priv->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.
+ * translate to "%d" otherwise.
*
* Note that translating this doesn't guarantee that you get localized
- * digits. That needs support from your system and locale definition
+ * digits. That needs support from your system and locale definition
* too.
*/
- g_snprintf (buffer, sizeof (buffer), Q_("calendar:week:digits|%d"), week);
+ g_snprintf (buffer, sizeof (buffer), C_("calendar:week:digits", "%d"), week);
pango_layout_set_text (layout, buffer, -1);
pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
y_loc = calendar_top_y_for_row (calendar, row) + (day_height - logical_rect.height) / 2;
- x_loc = (priv->week_width
- - logical_rect.width
- - CALENDAR_XSEP - focus_padding - focus_width);
+ x_loc = x + (priv->week_width
+ - logical_rect.width
+ - calendar_xsep - focus_padding - focus_width);
cairo_move_to (cr, x_loc, y_loc);
pango_cairo_show_layout (cr, layout);
}
g_object_unref (layout);
- cairo_destroy (cr);
+
+ cairo_restore (cr);
}
static void
calendar_invalidate_day_num (GtkCalendar *calendar,
gint day)
{
+ GtkCalendarPrivate *priv = calendar->priv;
gint r, c, row, col;
row = -1;
col = -1;
for (r = 0; r < 6; r++)
for (c = 0; c < 7; c++)
- if (calendar->day_month[r][c] == MONTH_CURRENT &&
- calendar->day[r][c] == day)
+ if (priv->day_month[r][c] == MONTH_CURRENT &&
+ priv->day[r][c] == day)
{
row = r;
col = c;
gint row,
gint col)
{
- GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar);
+ GdkRectangle day_rect;
+ GtkAllocation allocation;
- 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);
- }
+ gtk_widget_get_allocation (GTK_WIDGET (calendar), &allocation);
+ calendar_day_rectangle (calendar, row, col, &day_rect);
+ gtk_widget_queue_draw_area (GTK_WIDGET (calendar),
+ allocation.x + day_rect.x,
+ allocation.y + day_rect.y,
+ day_rect.width, day_rect.height);
+}
+
+static gboolean
+is_color_attribute (PangoAttribute *attribute,
+ gpointer data)
+{
+ return (attribute->klass->type == PANGO_ATTR_FOREGROUND ||
+ attribute->klass->type == PANGO_ATTR_BACKGROUND);
}
static void
calendar_paint_day (GtkCalendar *calendar,
- gint row,
- gint col)
+ cairo_t *cr,
+ gint row,
+ gint col)
{
GtkWidget *widget = GTK_WIDGET (calendar);
GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar);
- cairo_t *cr;
+ GtkStyle *style;
GdkColor *text_color;
+ gchar *detail;
gchar buffer[32];
gint day;
gint x_loc, y_loc;
PangoLayout *layout;
PangoRectangle logical_rect;
-
+ gboolean overflow = FALSE;
+ gboolean show_details;
+
g_return_if_fail (row < 6);
g_return_if_fail (col < 7);
- cr = gdk_cairo_create (priv->main_win);
+ style = gtk_widget_get_style (widget);
- day = calendar->day[row][col];
+ day = priv->day[row][col];
+ show_details = (priv->display_flags & GTK_CALENDAR_SHOW_DETAILS);
calendar_day_rectangle (calendar, row, col, &day_rect);
- if (calendar->day_month[row][col] == MONTH_PREV)
+ if (priv->day_month[row][col] == MONTH_PREV)
{
text_color = PREV_MONTH_COLOR (widget);
}
- else if (calendar->day_month[row][col] == MONTH_NEXT)
+ else if (priv->day_month[row][col] == MONTH_NEXT)
{
text_color = NEXT_MONTH_COLOR (widget);
}
else
{
-#if 0
- if (calendar->highlight_row == row && calendar->highlight_col == col)
- {
- cairo_set_source_color (cr, HIGHLIGHT_BG_COLOR (widget));
- gdk_cairo_rectangle (cr, &day_rect);
- cairo_fill (cr);
- }
-#endif
- if (calendar->selected_day == day)
+ if (priv->selected_day == day)
{
gdk_cairo_set_source_color (cr, SELECTED_BG_COLOR (widget));
gdk_cairo_rectangle (cr, &day_rect);
cairo_fill (cr);
}
- if (calendar->selected_day == day)
+ if (priv->selected_day == day)
text_color = SELECTED_FG_COLOR (widget);
- else if (calendar->marked_date[day-1])
+ else if (priv->marked_date[day-1])
text_color = MARKED_COLOR (widget);
else
text_color = NORMAL_DAY_COLOR (widget);
* 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.
+ * translate to "%d" otherwise.
*
* Note that translating this doesn't guarantee that you get localized
- * digits. That needs support from your system and locale definition
+ * digits. That needs support from your system and locale definition
* too.
*/
- g_snprintf (buffer, sizeof (buffer), Q_("calendar:day:digits|%d"), day);
+ g_snprintf (buffer, sizeof (buffer), C_("calendar:day:digits", "%d"), day);
+
+ /* Get extra information to show, if any: */
+
+ detail = gtk_calendar_get_detail (calendar, row, col);
+
layout = gtk_widget_create_pango_layout (widget, buffer);
+ pango_layout_set_alignment (layout, PANGO_ALIGN_CENTER);
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 = day_rect.y + (day_rect.height - logical_rect.height) / 2;
-
+ x_loc = day_rect.x + (day_rect.width - logical_rect.width) / 2;
+ y_loc = day_rect.y;
+
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)
+
+ if (priv->day_month[row][col] == MONTH_CURRENT &&
+ (priv->marked_date[day-1] || (detail && !show_details)))
{
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)
+ y_loc += priv->max_day_char_descent;
+
+ if (priv->detail_func && show_details)
+ {
+ cairo_save (cr);
+
+ if (priv->selected_day == day)
+ gdk_cairo_set_source_color (cr, &style->text[GTK_STATE_ACTIVE]);
+ else if (priv->day_month[row][col] == MONTH_CURRENT)
+ gdk_cairo_set_source_color (cr, &style->base[GTK_STATE_ACTIVE]);
+ else
+ gdk_cairo_set_source_color (cr, &style->base[GTK_STATE_INSENSITIVE]);
+
+ cairo_set_line_width (cr, 1);
+ cairo_move_to (cr, day_rect.x + 2, y_loc + 0.5);
+ cairo_line_to (cr, day_rect.x + day_rect.width - 2, y_loc + 0.5);
+ cairo_stroke (cr);
+
+ cairo_restore (cr);
+
+ y_loc += 2;
+ }
+
+ if (detail && show_details)
+ {
+ gchar *markup = g_strconcat ("<small>", detail, "</small>", NULL);
+ pango_layout_set_markup (layout, markup, -1);
+ g_free (markup);
+
+ if (day == priv->selected_day)
+ {
+ /* Stripping colors as they conflict with selection marking. */
+
+ PangoAttrList *attrs = pango_layout_get_attributes (layout);
+ PangoAttrList *colors = NULL;
+
+ if (attrs)
+ colors = pango_attr_list_filter (attrs, is_color_attribute, NULL);
+ if (colors)
+ pango_attr_list_unref (colors);
+ }
+
+ pango_layout_set_wrap (layout, PANGO_WRAP_WORD_CHAR);
+ pango_layout_set_width (layout, PANGO_SCALE * day_rect.width);
+
+ if (priv->detail_height_rows)
+ {
+ gint dy = day_rect.height - (y_loc - day_rect.y);
+ pango_layout_set_height (layout, PANGO_SCALE * dy);
+ pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_END);
+ }
+
+ cairo_move_to (cr, day_rect.x, y_loc);
+ pango_cairo_show_layout (cr, layout);
+ }
+
+ if (gtk_widget_has_focus (widget)
+ && priv->focus_row == row && priv->focus_col == col)
{
GtkStateType state;
- if (calendar->selected_day == day)
- state = GTK_WIDGET_HAS_FOCUS (widget) ? GTK_STATE_SELECTED : GTK_STATE_ACTIVE;
+ if (priv->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",
+
+ gtk_paint_focus (style, cr,
+ state, widget, "calendar-day",
day_rect.x, day_rect.y,
day_rect.width, day_rect.height);
}
+ if (overflow)
+ priv->detail_overflow[row] |= (1 << col);
+ else
+ priv->detail_overflow[row] &= ~(1 << col);
+
g_object_unref (layout);
- cairo_destroy (cr);
+ g_free (detail);
}
static void
-calendar_paint_main (GtkCalendar *calendar)
+calendar_paint_main (GtkCalendar *calendar,
+ cairo_t *cr)
{
gint row, col;
+ cairo_save (cr);
+
for (col = 0; col < 7; col++)
for (row = 0; row < 6; row++)
- calendar_paint_day (calendar, row, col);
+ calendar_paint_day (calendar, cr, row, col);
+
+ cairo_restore (cr);
}
static void
guint arrow)
{
GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar);
- GdkWindow *window;
-
- window = priv->arrow_win[arrow];
- if (window)
- gdk_window_invalidate_rect (window, NULL, FALSE);
+
+ if (priv->display_flags & GTK_CALENDAR_SHOW_HEADING &&
+ priv->arrow_win[arrow])
+ {
+ GdkRectangle rect;
+ GtkAllocation allocation;
+
+ calendar_arrow_rectangle (calendar, arrow, &rect);
+ gtk_widget_get_allocation (GTK_WIDGET (calendar), &allocation);
+ gtk_widget_queue_draw_area (GTK_WIDGET (calendar),
+ allocation.x + rect.x,
+ allocation.y + rect.y,
+ rect.width, rect.height);
+ }
}
static void
calendar_paint_arrow (GtkCalendar *calendar,
- guint arrow)
+ cairo_t *cr,
+ guint arrow)
{
GtkWidget *widget = GTK_WIDGET (calendar);
GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (widget);
- GdkWindow *window;
-
- window = priv->arrow_win[arrow];
- if (window)
- {
- cairo_t *cr = gdk_cairo_create (window);
- gint width, height;
- gint state;
-
- state = priv->arrow_state[arrow];
+ GtkStyle *style;
+ gint state;
+ GdkRectangle rect;
- 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 - 2, height/2 - 4, 8, 8);
- }
+ if (!priv->arrow_win[arrow])
+ return;
+
+ calendar_arrow_rectangle (calendar, arrow, &rect);
+
+ cairo_save (cr);
+
+ style = gtk_widget_get_style (widget);
+ state = priv->arrow_state[arrow];
+
+ cairo_rectangle (cr, rect.x, rect.y, rect.width, rect.height);
+ gdk_cairo_set_source_color (cr, &style->bg[state]);
+ cairo_fill (cr);
+
+ if (arrow == ARROW_MONTH_LEFT || arrow == ARROW_YEAR_LEFT)
+ gtk_paint_arrow (style, cr, state,
+ GTK_SHADOW_OUT, widget, "calendar",
+ GTK_ARROW_LEFT, TRUE,
+ rect.x + (rect.width - 8) / 2,
+ rect.y + (rect.height - 8) / 2,
+ 8, 8);
+ else
+ gtk_paint_arrow (style, cr, state,
+ GTK_SHADOW_OUT, widget, "calendar",
+ GTK_ARROW_RIGHT, TRUE,
+ rect.x + (rect.width - 8) / 2,
+ rect.y + (rect.height - 8) / 2,
+ 8, 8);
+
+ cairo_restore (cr);
}
static gboolean
-gtk_calendar_expose (GtkWidget *widget,
- GdkEventExpose *event)
+gtk_calendar_draw (GtkWidget *widget,
+ cairo_t *cr)
{
GtkCalendar *calendar = GTK_CALENDAR (widget);
GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (widget);
int i;
- if (GTK_WIDGET_DRAWABLE (widget))
+ if (gtk_cairo_should_draw_window (cr, gtk_widget_get_window (widget)))
{
- if (event->window == priv->main_win)
- calendar_paint_main (calendar);
-
- if (event->window == priv->header_win)
- calendar_paint_header (calendar);
+ gdk_cairo_set_source_color (cr, BACKGROUND_COLOR (widget));
+ cairo_rectangle (cr,
+ 0, 0,
+ gtk_widget_get_allocated_width (widget),
+ gtk_widget_get_allocated_height (widget));
+ cairo_fill (cr);
+ gtk_paint_shadow (gtk_widget_get_style (widget), cr,
+ gtk_widget_get_state (widget), GTK_SHADOW_IN,
+ widget, "calendar",
+ 0, 0,
+ gtk_widget_get_allocated_width (widget),
+ gtk_widget_get_allocated_height (widget));
+ }
+
+ calendar_paint_main (calendar, cr);
+ if (priv->display_flags & GTK_CALENDAR_SHOW_HEADING)
+ {
+ calendar_paint_header (calendar, cr);
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)
- {
- 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);
- }
+ calendar_paint_arrow (calendar, cr, i);
}
-
+
+ if (priv->display_flags & GTK_CALENDAR_SHOW_DAY_NAMES)
+ calendar_paint_day_names (calendar, cr);
+
+ if (priv->display_flags & GTK_CALENDAR_SHOW_WEEK_NUMBERS)
+ calendar_paint_week_numbers (calendar, cr);
+
return FALSE;
}
-\f
+
/****************************************
* Mouse handling *
****************************************/
GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar);
gboolean retval = FALSE;
- GDK_THREADS_ENTER ();
-
if (priv->timer)
{
calendar_arrow_action (calendar, priv->click_child);
g_object_get (settings, "gtk-timeout-repeat", &timeout, NULL);
priv->need_timer = FALSE;
- priv->timer = g_timeout_add (timeout,
- (GSourceFunc) calendar_timer,
- (gpointer) calendar);
+ priv->timer = gdk_threads_add_timeout_full (G_PRIORITY_DEFAULT_IDLE,
+ timeout * SCROLL_DELAY_FACTOR,
+ (GSourceFunc) calendar_timer,
+ (gpointer) calendar, NULL);
}
else
retval = TRUE;
}
- GDK_THREADS_LEAVE ();
-
return retval;
}
g_object_get (settings, "gtk-timeout-initial", &timeout, NULL);
priv->need_timer = TRUE;
- priv->timer = g_timeout_add (timeout,
- calendar_timer,
- calendar);
+ priv->timer = gdk_threads_add_timeout_full (G_PRIORITY_DEFAULT_IDLE,
+ timeout,
+ (GSourceFunc) calendar_timer,
+ (gpointer) calendar, NULL);
}
}
}
static void
-calendar_main_button_press (GtkCalendar *calendar,
- GdkEventButton *event)
+calendar_main_button_press (GtkCalendar *calendar,
+ GdkEventButton *event)
{
GtkWidget *widget = GTK_WIDGET (calendar);
GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar);
gint x, y;
+ gint win_x, win_y;
gint row, col;
gint day_month;
gint day;
-
+ GtkAllocation allocation;
+
x = (gint) (event->x);
y = (gint) (event->y);
-
- row = calendar_row_from_y (calendar, y);
- col = calendar_column_from_x (calendar, x);
+
+ gdk_window_get_position (priv->main_win, &win_x, &win_y);
+ gtk_widget_get_allocation (widget, &allocation);
+
+ row = calendar_row_from_y (calendar, y + win_y - allocation.y);
+ col = calendar_column_from_x (calendar, x + win_x - allocation.x);
/* If row or column isn't found, just return. */
if (row == -1 || col == -1)
return;
-
- day_month = calendar->day_month[row][col];
+
+ day_month = priv->day_month[row][col];
if (event->type == GDK_BUTTON_PRESS)
- {
- 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;
- }
+ {
+ day = priv->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);
}
{
priv->in_drag = 0;
if (day_month == MONTH_CURRENT)
- g_signal_emit (calendar,
- gtk_calendar_signals[DAY_SELECTED_DOUBLE_CLICK_SIGNAL],
- 0);
+ g_signal_emit (calendar,
+ gtk_calendar_signals[DAY_SELECTED_DOUBLE_CLICK_SIGNAL],
+ 0);
}
}
static gboolean
-gtk_calendar_button_press (GtkWidget *widget,
- GdkEventButton *event)
+gtk_calendar_button_press (GtkWidget *widget,
+ GdkEventButton *event)
{
GtkCalendar *calendar = GTK_CALENDAR (widget);
GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (widget);
gint arrow = -1;
-
+
if (event->window == priv->main_win)
calendar_main_button_press (calendar, event);
- if (!GTK_WIDGET_HAS_FOCUS (widget))
+ if (!gtk_widget_has_focus (widget))
gtk_widget_grab_focus (widget);
for (arrow = ARROW_YEAR_LEFT; arrow <= ARROW_MONTH_RIGHT; arrow++)
{
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);
+ calendar_arrow_action (calendar, arrow);
}
return TRUE;
GtkCalendar *calendar = GTK_CALENDAR (widget);
GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (widget);
- if (event->button == 1)
+ if (event->button == 1)
{
calendar_stop_spinning (calendar);
gtk_calendar_motion_notify (GtkWidget *widget,
GdkEventMotion *event)
{
- 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;
-
+
event_x = (gint) (event->x);
event_y = (gint) (event->y);
-
- if (event->window == priv->main_win)
+
+ if (priv->in_drag)
{
-
- if (priv->in_drag)
- {
- if (gtk_drag_check_threshold (widget,
- priv->drag_start_x, priv->drag_start_y,
- event->x, event->y))
- {
- 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);
+ if (gtk_drag_check_threshold (widget,
+ priv->drag_start_x, priv->drag_start_y,
+ event->x, event->y))
+ {
+ 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);
-
- 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 != 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);
- }
- }
+ priv->in_drag = 0;
+ gtk_target_list_unref (target_list);
+ gtk_drag_set_icon_default (context);
+ }
}
+
return TRUE;
}
}
static gboolean
-gtk_calendar_leave_notify (GtkWidget *widget,
+gtk_calendar_leave_notify (GtkWidget *widget,
GdkEventCrossing *event)
{
GtkCalendar *calendar = GTK_CALENDAR (widget);
GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (widget);
- gint row;
- gint col;
-
- 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)
- calendar_invalidate_day (calendar, row, col);
- }
-
+
if (event->window == priv->arrow_win[ARROW_MONTH_LEFT])
{
priv->arrow_state[ARROW_MONTH_LEFT] = GTK_STATE_NORMAL;
if (event->direction == GDK_SCROLL_UP)
{
- if (!GTK_WIDGET_HAS_FOCUS (widget))
+ if (!gtk_widget_has_focus (widget))
gtk_widget_grab_focus (widget);
calendar_set_month_prev (calendar);
}
else if (event->direction == GDK_SCROLL_DOWN)
{
- if (!GTK_WIDGET_HAS_FOCUS (widget))
+ if (!gtk_widget_has_focus (widget))
gtk_widget_grab_focus (widget);
calendar_set_month_next (calendar);
}
move_focus (GtkCalendar *calendar,
gint direction)
{
+ GtkCalendarPrivate *priv = calendar->priv;
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)
+ if (priv->focus_col > 0)
+ priv->focus_col--;
+ else if (priv->focus_row > 0)
{
- calendar->focus_col = 6;
- calendar->focus_row--;
+ priv->focus_col = 6;
+ priv->focus_row--;
}
+
+ if (priv->focus_col < 0)
+ priv->focus_col = 6;
+ if (priv->focus_row < 0)
+ priv->focus_row = 5;
}
else
{
- if (calendar->focus_col < 6)
- calendar->focus_col++;
- else if (calendar->focus_row < 5)
+ if (priv->focus_col < 6)
+ priv->focus_col++;
+ else if (priv->focus_row < 5)
{
- calendar->focus_col = 0;
- calendar->focus_row++;
+ priv->focus_col = 0;
+ priv->focus_row++;
}
+
+ if (priv->focus_col < 0)
+ priv->focus_col = 0;
+ if (priv->focus_row < 0)
+ priv->focus_row = 0;
}
}
gtk_calendar_key_press (GtkWidget *widget,
GdkEventKey *event)
{
- GtkCalendar *calendar;
+ GtkCalendar *calendar = GTK_CALENDAR (widget);
+ GtkCalendarPrivate *priv = calendar->priv;
gint return_val;
gint old_focus_row;
gint old_focus_col;
gint row, col, day;
-
- calendar = GTK_CALENDAR (widget);
+
return_val = FALSE;
-
- old_focus_row = calendar->focus_row;
- old_focus_col = calendar->focus_col;
+
+ old_focus_row = priv->focus_row;
+ old_focus_col = priv->focus_col;
switch (event->keyval)
{
- case GDK_KP_Left:
- case GDK_Left:
+ case GDK_KEY_KP_Left:
+ case GDK_KEY_Left:
return_val = TRUE;
if (event->state & GDK_CONTROL_MASK)
calendar_set_month_prev (calendar);
{
move_focus (calendar, -1);
calendar_invalidate_day (calendar, old_focus_row, old_focus_col);
- calendar_invalidate_day (calendar, calendar->focus_row,
- calendar->focus_col);
+ calendar_invalidate_day (calendar, priv->focus_row,
+ priv->focus_col);
}
break;
- case GDK_KP_Right:
- case GDK_Right:
+ case GDK_KEY_KP_Right:
+ case GDK_KEY_Right:
return_val = TRUE;
if (event->state & GDK_CONTROL_MASK)
calendar_set_month_next (calendar);
{
move_focus (calendar, 1);
calendar_invalidate_day (calendar, old_focus_row, old_focus_col);
- calendar_invalidate_day (calendar, calendar->focus_row,
- calendar->focus_col);
+ calendar_invalidate_day (calendar, priv->focus_row,
+ priv->focus_col);
}
break;
- case GDK_KP_Up:
- case GDK_Up:
+ case GDK_KEY_KP_Up:
+ case GDK_KEY_Up:
return_val = TRUE;
if (event->state & GDK_CONTROL_MASK)
calendar_set_year_prev (calendar);
else
{
- if (calendar->focus_row > 0)
- calendar->focus_row--;
+ if (priv->focus_row > 0)
+ priv->focus_row--;
+ if (priv->focus_row < 0)
+ priv->focus_row = 5;
+ if (priv->focus_col < 0)
+ priv->focus_col = 6;
calendar_invalidate_day (calendar, old_focus_row, old_focus_col);
- calendar_invalidate_day (calendar, calendar->focus_row,
- calendar->focus_col);
+ calendar_invalidate_day (calendar, priv->focus_row,
+ priv->focus_col);
}
break;
- case GDK_KP_Down:
- case GDK_Down:
+ case GDK_KEY_KP_Down:
+ case GDK_KEY_Down:
return_val = TRUE;
if (event->state & GDK_CONTROL_MASK)
calendar_set_year_next (calendar);
else
{
- if (calendar->focus_row < 5)
- calendar->focus_row++;
+ if (priv->focus_row < 5)
+ priv->focus_row++;
+ if (priv->focus_col < 0)
+ priv->focus_col = 0;
calendar_invalidate_day (calendar, old_focus_row, old_focus_col);
- calendar_invalidate_day (calendar, calendar->focus_row,
- calendar->focus_col);
+ calendar_invalidate_day (calendar, priv->focus_row,
+ priv->focus_col);
}
break;
- case GDK_KP_Space:
- case GDK_space:
- row = calendar->focus_row;
- col = calendar->focus_col;
+ case GDK_KEY_KP_Space:
+ case GDK_KEY_space:
+ row = priv->focus_row;
+ col = priv->focus_col;
if (row > -1 && col > -1)
{
return_val = TRUE;
- day = calendar->day[row][col];
- if (calendar->day_month[row][col] == MONTH_PREV)
+ day = priv->day[row][col];
+ if (priv->day_month[row][col] == MONTH_PREV)
calendar_set_month_prev (calendar);
- else if (calendar->day_month[row][col] == MONTH_NEXT)
+ else if (priv->day_month[row][col] == MONTH_NEXT)
calendar_set_month_next (calendar);
calendar_select_and_focus_day (calendar, day);
* Misc widget methods *
****************************************/
-static void
-calendar_set_background (GtkWidget *widget)
-{
- GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (widget);
- gint i;
-
- if (GTK_WIDGET_REALIZED (widget))
- {
- for (i = 0; i < 4; i++)
- {
- if (priv->arrow_win[i])
- gdk_window_set_background (priv->arrow_win[i],
- HEADER_BG_COLOR (widget));
- }
- if (priv->header_win)
- gdk_window_set_background (priv->header_win,
- HEADER_BG_COLOR (widget));
- if (priv->day_name_win)
- gdk_window_set_background (priv->day_name_win,
- BACKGROUND_COLOR (widget));
- if (priv->week_win)
- gdk_window_set_background (priv->week_win,
- BACKGROUND_COLOR (widget));
- if (priv->main_win)
- gdk_window_set_background (priv->main_win,
- BACKGROUND_COLOR (widget));
- if (widget->window)
- gdk_window_set_background (widget->window,
- BACKGROUND_COLOR (widget));
- }
-}
-
-static void
-gtk_calendar_style_set (GtkWidget *widget,
- GtkStyle *previous_style)
-{
- if (previous_style && GTK_WIDGET_REALIZED (widget))
- calendar_set_background (widget);
-}
-
static void
gtk_calendar_state_changed (GtkWidget *widget,
GtkStateType previous_state)
GtkCalendar *calendar = GTK_CALENDAR (widget);
GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (widget);
int i;
-
- if (!GTK_WIDGET_IS_SENSITIVE (widget))
+
+ if (!gtk_widget_is_sensitive (widget))
{
priv->in_drag = 0;
- calendar_stop_spinning (calendar);
+ calendar_stop_spinning (calendar);
}
for (i = 0; i < 4; i++)
- if (GTK_WIDGET_IS_SENSITIVE (widget))
+ if (gtk_widget_is_sensitive (widget))
priv->arrow_state[i] = GTK_STATE_NORMAL;
- else
+ else
priv->arrow_state[i] = GTK_STATE_INSENSITIVE;
-
- calendar_set_background (widget);
}
static void
GdkEventFocus *event)
{
GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (widget);
+ GtkCalendar *calendar = GTK_CALENDAR (widget);
- gtk_widget_queue_draw (widget);
+ calendar_queue_refresh (calendar);
+ calendar_stop_spinning (calendar);
- calendar_stop_spinning (GTK_CALENDAR (widget));
-
- priv->in_drag = 0;
+ priv->in_drag = 0;
return FALSE;
}
guint time)
{
GtkCalendar *calendar = GTK_CALENDAR (widget);
+ GtkCalendarPrivate *priv = calendar->priv;
GDate *date;
gchar str[128];
gsize len;
- date = g_date_new_dmy (calendar->selected_day, calendar->month + 1, calendar->year);
+ date = g_date_new_dmy (priv->selected_day, priv->month + 1, priv->year);
len = g_date_strftime (str, 127, "%x", date);
gtk_selection_data_set_text (selection_data, str, len);
guint time)
{
GtkCalendar *calendar = GTK_CALENDAR (widget);
+ GtkCalendarPrivate *priv = calendar->priv;
guint day, month, year;
gchar *str;
GDate *date;
* supposed to call drag_status, not actually paste in the
* data.
*/
- str = gtk_selection_data_get_text (selection_data);
+ str = (gchar*) gtk_selection_data_get_text (selection_data);
+
if (str)
{
date = g_date_new ();
}
date = g_date_new ();
- str = gtk_selection_data_get_text (selection_data);
+ str = (gchar*) gtk_selection_data_get_text (selection_data);
if (str)
{
g_date_set_parse (date, str);
g_object_freeze_notify (G_OBJECT (calendar));
- if (!(calendar->display_flags & GTK_CALENDAR_NO_MONTH_CHANGE)
- && (calendar->display_flags & GTK_CALENDAR_SHOW_HEADING))
+ if (!(priv->display_flags & GTK_CALENDAR_NO_MONTH_CHANGE)
+ && (priv->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));
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
{
g_return_val_if_fail (GTK_IS_CALENDAR (calendar), 0);
- return calendar->display_flags;
+ return calendar->priv->display_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;
+ old_flags = priv->display_flags;
- if (GTK_WIDGET_REALIZED (widget))
+ if (gtk_widget_get_realized (widget))
{
- if ((flags ^ calendar->display_flags) & GTK_CALENDAR_NO_MONTH_CHANGE)
+ if ((flags ^ priv->display_flags) & GTK_CALENDAR_NO_MONTH_CHANGE)
{
resize ++;
if (! (flags & GTK_CALENDAR_NO_MONTH_CHANGE)
- && (priv->header_win))
+ && (priv->display_flags & GTK_CALENDAR_SHOW_HEADING))
{
- calendar->display_flags &= ~GTK_CALENDAR_NO_MONTH_CHANGE;
+ priv->display_flags &= ~GTK_CALENDAR_NO_MONTH_CHANGE;
calendar_realize_arrows (calendar);
}
else
{
- 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;
- }
- }
+ calendar_unrealize_arrows (calendar);
}
}
- if ((flags ^ calendar->display_flags) & GTK_CALENDAR_SHOW_HEADING)
+ if ((flags ^ priv->display_flags) & GTK_CALENDAR_SHOW_HEADING)
{
resize++;
if (flags & GTK_CALENDAR_SHOW_HEADING)
- {
- calendar->display_flags |= GTK_CALENDAR_SHOW_HEADING;
- calendar_realize_header (calendar);
- }
+ {
+ priv->display_flags |= GTK_CALENDAR_SHOW_HEADING;
+ calendar_realize_arrows (calendar);
+ }
else
{
- 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;
+ calendar_unrealize_arrows (calendar);
}
}
- if ((flags ^ calendar->display_flags) & GTK_CALENDAR_SHOW_DAY_NAMES)
+ if ((flags ^ priv->display_flags) & GTK_CALENDAR_SHOW_DAY_NAMES)
{
resize++;
if (flags & GTK_CALENDAR_SHOW_DAY_NAMES)
- {
- calendar->display_flags |= GTK_CALENDAR_SHOW_DAY_NAMES;
- calendar_realize_day_names (calendar);
- }
- else
- {
- gdk_window_set_user_data (priv->day_name_win, NULL);
- gdk_window_destroy (priv->day_name_win);
- priv->day_name_win = NULL;
- }
+ priv->display_flags |= GTK_CALENDAR_SHOW_DAY_NAMES;
}
- 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;
- calendar_realize_week_numbers (calendar);
- }
- else
- {
- gdk_window_set_user_data (priv->week_win, NULL);
- gdk_window_destroy (priv->week_win);
- priv->week_win = NULL;
- }
- }
+ if ((flags ^ priv->display_flags) & GTK_CALENDAR_SHOW_WEEK_NUMBERS)
+ {
+ resize++;
- 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 (flags & GTK_CALENDAR_SHOW_WEEK_NUMBERS)
+ priv->display_flags |= GTK_CALENDAR_SHOW_WEEK_NUMBERS;
+ }
+
+ if ((flags ^ priv->display_flags) & GTK_CALENDAR_SHOW_DETAILS)
+ resize++;
+
+ priv->display_flags = flags;
if (resize)
gtk_widget_queue_resize (GTK_WIDGET (calendar));
-
- }
+ }
else
- calendar->display_flags = flags;
-
+ priv->display_flags = flags;
+
g_object_freeze_notify (G_OBJECT (calendar));
- if ((old_flags ^ calendar->display_flags) & GTK_CALENDAR_SHOW_HEADING)
+ if ((old_flags ^ priv->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)
+ if ((old_flags ^ priv->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)
+ if ((old_flags ^ priv->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)
+ if ((old_flags ^ priv->display_flags) & GTK_CALENDAR_SHOW_WEEK_NUMBERS)
g_object_notify (G_OBJECT (calendar), "show-week-numbers");
g_object_thaw_notify (G_OBJECT (calendar));
}
* @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
+void
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;
-
+ GtkCalendarPrivate *priv;
+
+ g_return_if_fail (GTK_IS_CALENDAR (calendar));
+ g_return_if_fail (month <= 11);
+
+ priv = calendar->priv;
+
+ priv->month = month;
+ priv->year = year;
+
calendar_compute_days (calendar);
-
- gtk_widget_queue_draw (GTK_WIDGET (calendar));
+ calendar_queue_refresh (calendar);
g_object_freeze_notify (G_OBJECT (calendar));
g_object_notify (G_OBJECT (calendar), "month");
g_signal_emit (calendar,
gtk_calendar_signals[MONTH_CHANGED_SIGNAL],
0);
- return TRUE;
}
/**
gtk_calendar_select_day (GtkCalendar *calendar,
guint day)
{
+ GtkCalendarPrivate *priv;
+
g_return_if_fail (GTK_IS_CALENDAR (calendar));
g_return_if_fail (day <= 31);
-
+
+ priv = calendar->priv;
+
/* Deselect the old day */
- if (calendar->selected_day > 0)
+ if (priv->selected_day > 0)
{
gint selected_day;
- selected_day = calendar->selected_day;
- calendar->selected_day = 0;
- if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (calendar)))
+ selected_day = priv->selected_day;
+ priv->selected_day = 0;
+ if (gtk_widget_is_drawable (GTK_WIDGET (calendar)))
calendar_invalidate_day_num (calendar, selected_day);
}
- calendar->selected_day = day;
+ priv->selected_day = day;
/* Select the new day */
if (day != 0)
{
- if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (calendar)))
+ if (gtk_widget_is_drawable (GTK_WIDGET (calendar)))
calendar_invalidate_day_num (calendar, day);
}
void
gtk_calendar_clear_marks (GtkCalendar *calendar)
{
+ GtkCalendarPrivate *priv;
guint day;
-
+
g_return_if_fail (GTK_IS_CALENDAR (calendar));
-
+
+ priv = calendar->priv;
+
for (day = 0; day < 31; day++)
{
- calendar->marked_date[day] = FALSE;
+ priv->marked_date[day] = FALSE;
}
- calendar->num_marked_dates = 0;
-
- gtk_widget_queue_draw (GTK_WIDGET (calendar));
+ priv->num_marked_dates = 0;
+ calendar_queue_refresh (calendar);
}
/**
* gtk_calendar_mark_day:
- * @calendar: a #GtkCalendar
+ * @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
+ */
+void
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)
+ GtkCalendarPrivate *priv;
+
+ g_return_if_fail (GTK_IS_CALENDAR (calendar));
+
+ priv = calendar->priv;
+
+ if (day >= 1 && day <= 31 && !priv->marked_date[day-1])
{
- calendar->marked_date[day - 1] = TRUE;
- calendar->num_marked_dates++;
+ priv->marked_date[day - 1] = TRUE;
+ priv->num_marked_dates++;
calendar_invalidate_day_num (calendar, day);
}
-
- return TRUE;
+}
+
+/**
+ * gtk_calendar_get_day_is_marked:
+ * @calendar: a #GtkCalendar
+ * @day: the day number between 1 and 31.
+ *
+ * Returns if the @day of the @calendar is already marked.
+ *
+ * Returns: whether the day is marked.
+ *
+ * Since: 3.0
+ */
+gboolean
+gtk_calendar_get_day_is_marked (GtkCalendar *calendar,
+ guint day)
+{
+ GtkCalendarPrivate *priv;
+
+ g_return_val_if_fail (GTK_IS_CALENDAR (calendar), FALSE);
+
+ priv = calendar->priv;
+
+ if (day >= 1 && day <= 31)
+ return priv->marked_date[day - 1];
+
+ return FALSE;
}
/**
* 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
+ */
+void
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)
+ GtkCalendarPrivate *priv;
+
+ g_return_if_fail (GTK_IS_CALENDAR (calendar));
+
+ priv = calendar->priv;
+
+ if (day >= 1 && day <= 31 && priv->marked_date[day-1])
{
- calendar->marked_date[day - 1] = FALSE;
- calendar->num_marked_dates--;
+ priv->marked_date[day - 1] = FALSE;
+ priv->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
+ * @year: (allow-none): location to store the year number, or %NULL
+ * @month: (allow-none): location to store the month number (between 0 and 11), or %NULL
+ * @day: (allow-none): location to store the day number (between 1 and 31), or %NULL
*
* Obtains the selected date from a #GtkCalendar.
**/
guint *month,
guint *day)
{
+ GtkCalendarPrivate *priv;
+
g_return_if_fail (GTK_IS_CALENDAR (calendar));
-
+
+ priv = calendar->priv;
+
if (year)
- *year = calendar->year;
-
+ *year = priv->year;
+
if (month)
- *month = calendar->month;
-
+ *month = priv->month;
+
if (day)
- *day = calendar->selected_day;
+ *day = priv->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().
+ * gtk_calendar_set_detail_func:
+ * @calendar: a #GtkCalendar.
+ * @func: a function providing details for each day.
+ * @data: data to pass to @func invokations.
+ * @destroy: a function for releasing @data.
*
- * Deprecated: 2.8:
- **/
+ * Installs a function which provides Pango markup with detail information
+ * for each day. Examples for such details are holidays or appointments. That
+ * information is shown below each day when #GtkCalendar:show-details is set.
+ * A tooltip containing with full detail information is provided, if the entire
+ * text should not fit into the details area, or if #GtkCalendar:show-details
+ * is not set.
+ *
+ * The size of the details area can be restricted by setting the
+ * #GtkCalendar:detail-width-chars and #GtkCalendar:detail-height-rows
+ * properties.
+ *
+ * Since: 2.14
+ */
void
-gtk_calendar_freeze (GtkCalendar *calendar)
+gtk_calendar_set_detail_func (GtkCalendar *calendar,
+ GtkCalendarDetailFunc func,
+ gpointer data,
+ GDestroyNotify destroy)
{
+ GtkCalendarPrivate *priv;
+
g_return_if_fail (GTK_IS_CALENDAR (calendar));
+
+ priv = GTK_CALENDAR_GET_PRIVATE (calendar);
+
+ if (priv->detail_func_destroy)
+ priv->detail_func_destroy (priv->detail_func_user_data);
+
+ priv->detail_func = func;
+ priv->detail_func_user_data = data;
+ priv->detail_func_destroy = destroy;
+
+ gtk_widget_set_has_tooltip (GTK_WIDGET (calendar),
+ NULL != priv->detail_func);
+ gtk_widget_queue_resize (GTK_WIDGET (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.
+ * gtk_calendar_set_detail_width_chars:
+ * @calendar: a #GtkCalendar.
+ * @chars: detail width in characters.
*
- * Deprecated: 2.8:
- **/
+ * Updates the width of detail cells.
+ * See #GtkCalendar:detail-width-chars.
+ *
+ * Since: 2.14
+ */
+void
+gtk_calendar_set_detail_width_chars (GtkCalendar *calendar,
+ gint chars)
+{
+ GtkCalendarPrivate *priv;
+
+ g_return_if_fail (GTK_IS_CALENDAR (calendar));
+
+ priv = GTK_CALENDAR_GET_PRIVATE (calendar);
+
+ if (chars != priv->detail_width_chars)
+ {
+ priv->detail_width_chars = chars;
+ g_object_notify (G_OBJECT (calendar), "detail-width-chars");
+ gtk_widget_queue_resize_no_redraw (GTK_WIDGET (calendar));
+ }
+}
+
+/**
+ * gtk_calendar_set_detail_height_rows:
+ * @calendar: a #GtkCalendar.
+ * @rows: detail height in rows.
+ *
+ * Updates the height of detail cells.
+ * See #GtkCalendar:detail-height-rows.
+ *
+ * Since: 2.14
+ */
void
-gtk_calendar_thaw (GtkCalendar *calendar)
+gtk_calendar_set_detail_height_rows (GtkCalendar *calendar,
+ gint rows)
{
+ GtkCalendarPrivate *priv;
+
g_return_if_fail (GTK_IS_CALENDAR (calendar));
+
+ priv = GTK_CALENDAR_GET_PRIVATE (calendar);
+
+ if (rows != priv->detail_height_rows)
+ {
+ priv->detail_height_rows = rows;
+ g_object_notify (G_OBJECT (calendar), "detail-height-rows");
+ gtk_widget_queue_resize_no_redraw (GTK_WIDGET (calendar));
+ }
+}
+
+/**
+ * gtk_calendar_get_detail_width_chars:
+ * @calendar: a #GtkCalendar.
+ *
+ * Queries the width of detail cells, in characters.
+ * See #GtkCalendar:detail-width-chars.
+ *
+ * Since: 2.14
+ *
+ * Return value: The width of detail cells, in characters.
+ */
+gint
+gtk_calendar_get_detail_width_chars (GtkCalendar *calendar)
+{
+ g_return_val_if_fail (GTK_IS_CALENDAR (calendar), 0);
+ return GTK_CALENDAR_GET_PRIVATE (calendar)->detail_width_chars;
}
-#define __GTK_CALENDAR_C__
-#include "gtkaliasdef.c"
+/**
+ * gtk_calendar_get_detail_height_rows:
+ * @calendar: a #GtkCalendar.
+ *
+ * Queries the height of detail cells, in rows.
+ * See #GtkCalendar:detail-width-chars.
+ *
+ * Since: 2.14
+ *
+ * Return value: The height of detail cells, in rows.
+ */
+gint
+gtk_calendar_get_detail_height_rows (GtkCalendar *calendar)
+{
+ g_return_val_if_fail (GTK_IS_CALENDAR (calendar), 0);
+ return GTK_CALENDAR_GET_PRIVATE (calendar)->detail_height_rows;
+}
projects / ~andy / gtk / blobdiff