* Copyright (c) 1995, 1996, 1997, 1998 by Steffen Beyer
*
* This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
+ * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
/*
- * Modified by the GTK+ Team and others 1997-1999. See the AUTHORS
+ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
* file for a list of people on the GTK+ Team. See the ChangeLog
* files for a list of changes. These files are distributed with
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
return( calc_days(year2, mm2, dd2) - calc_days(year1, mm1, dd1) );
}
-/** END OF lib_date routines ************************************************/
+/*** END OF lib_date routines ********************************************/
#define CALENDAR_MARGIN 0
#define CALENDAR_YSEP 4
#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_FONT(widget) ((widget)->style->font)
-#define LABEL_FONT(widget) ((widget)->style->font)
-#define DAY_FONT(widget) ((widget)->style->font)
-
enum {
ARROW_YEAR_LEFT,
ARROW_YEAR_RIGHT,
static void gtk_calendar_class_init (GtkCalendarClass *class);
static void gtk_calendar_init (GtkCalendar *calendar);
+static void gtk_calendar_destroy (GtkObject *calendar);
static void gtk_calendar_realize (GtkWidget *widget);
static void gtk_calendar_unrealize (GtkWidget *widget);
static void gtk_calendar_draw_focus (GtkWidget *widget);
GdkEventCrossing *event);
static gint gtk_calendar_key_press (GtkWidget *widget,
GdkEventKey *event);
-static gint gtk_calendar_focus_in (GtkWidget *widget,
- GdkEventFocus *event);
-static gint gtk_calendar_focus_out (GtkWidget *widget,
- GdkEventFocus *event);
static void gtk_calendar_state_changed (GtkWidget *widget,
GtkStateType previous_state);
static void gtk_calendar_style_set (GtkWidget *widget,
static void gtk_calendar_paint_day (GtkWidget *widget,
gint row,
gint col);
-static void gtk_calendar_draw (GtkWidget *widget,
- GdkRectangle *area);
static void gtk_calendar_compute_days (GtkCalendar *calendar);
static gint left_x_for_column (GtkCalendar *calendar,
gint column);
if (!calendar_type)
{
- static const GtkTypeInfo calendar_info =
+ static const GTypeInfo calendar_info =
{
- "GtkCalendar",
- sizeof (GtkCalendar),
sizeof (GtkCalendarClass),
- (GtkClassInitFunc) gtk_calendar_class_init,
- (GtkObjectInitFunc) gtk_calendar_init,
- (GtkArgSetFunc) NULL,
- (GtkArgGetFunc) NULL,
+ NULL, /* base_init */
+ NULL, /* base_finalize */
+ (GClassInitFunc) gtk_calendar_class_init,
+ NULL, /* class_finalize */
+ NULL, /* class_data */
+ sizeof (GtkCalendar),
+ 16, /* n_preallocs */
+ (GInstanceInitFunc) gtk_calendar_init,
};
-
- calendar_type = gtk_type_unique (GTK_TYPE_WIDGET, &calendar_info);
+
+ calendar_type = g_type_register_static (GTK_TYPE_WIDGET, "GtkCalendar", &calendar_info, 0);
}
return calendar_type;
parent_class = gtk_type_class (GTK_TYPE_WIDGET);
+ object_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->draw = gtk_calendar_draw;
- widget_class->draw_focus = gtk_calendar_draw_focus;
widget_class->size_request = gtk_calendar_size_request;
widget_class->size_allocate = gtk_calendar_size_allocate;
widget_class->button_press_event = gtk_calendar_button_press;
widget_class->enter_notify_event = gtk_calendar_enter_notify;
widget_class->leave_notify_event = gtk_calendar_leave_notify;
widget_class->key_press_event = gtk_calendar_key_press;
- widget_class->focus_in_event = gtk_calendar_focus_in;
- widget_class->focus_out_event = gtk_calendar_focus_out;
widget_class->style_set = gtk_calendar_style_set;
widget_class->state_changed = gtk_calendar_state_changed;
+ class->month_changed = NULL;
+ class->day_selected = NULL;
+ class->day_selected_double_click = NULL;
+ class->prev_month = NULL;
+ class->next_month = NULL;
+ class->prev_year = NULL;
+ class->next_year = NULL;
+
gtk_calendar_signals[MONTH_CHANGED_SIGNAL] =
gtk_signal_new ("month_changed",
- GTK_RUN_FIRST, object_class->type,
+ GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkCalendarClass, month_changed),
gtk_signal_default_marshaller, GTK_TYPE_NONE, 0);
gtk_calendar_signals[DAY_SELECTED_SIGNAL] =
gtk_signal_new ("day_selected",
- GTK_RUN_FIRST, object_class->type,
+ GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkCalendarClass, day_selected),
gtk_signal_default_marshaller, GTK_TYPE_NONE, 0);
gtk_calendar_signals[DAY_SELECTED_DOUBLE_CLICK_SIGNAL] =
gtk_signal_new ("day_selected_double_click",
- GTK_RUN_FIRST, object_class->type,
+ GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkCalendarClass, day_selected_double_click),
gtk_signal_default_marshaller, GTK_TYPE_NONE, 0);
gtk_calendar_signals[PREV_MONTH_SIGNAL] =
gtk_signal_new ("prev_month",
- GTK_RUN_FIRST, object_class->type,
+ GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkCalendarClass, prev_month),
gtk_signal_default_marshaller, GTK_TYPE_NONE, 0);
gtk_calendar_signals[NEXT_MONTH_SIGNAL] =
gtk_signal_new ("next_month",
- GTK_RUN_FIRST, object_class->type,
+ GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkCalendarClass, next_month),
gtk_signal_default_marshaller, GTK_TYPE_NONE, 0);
gtk_calendar_signals[PREV_YEAR_SIGNAL] =
gtk_signal_new ("prev_year",
- GTK_RUN_FIRST, object_class->type,
+ GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkCalendarClass, prev_year),
gtk_signal_default_marshaller, GTK_TYPE_NONE, 0);
gtk_calendar_signals[NEXT_YEAR_SIGNAL] =
gtk_signal_new ("next_year",
- GTK_RUN_FIRST, object_class->type,
+ GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkCalendarClass, next_year),
gtk_signal_default_marshaller, GTK_TYPE_NONE, 0);
-
- gtk_object_class_add_signals (object_class, gtk_calendar_signals, LAST_SIGNAL);
-
- class->month_changed = NULL;
- class->day_selected = NULL;
- class->day_selected_double_click = NULL;
- class->prev_month = NULL;
- class->next_month = NULL;
- class->prev_year = NULL;
- class->next_year = NULL;
}
static void
widget = GTK_WIDGET (calendar);
GTK_WIDGET_SET_FLAGS (widget, GTK_CAN_FOCUS);
- calendar->private_data = (gpointer) malloc (sizeof (GtkCalendarPrivateData));
+ calendar->private_data = (gpointer) g_malloc (sizeof (GtkCalendarPrivateData));
private_data = GTK_CALENDAR_PRIVATE_DATA (calendar);
if (!default_abbreviated_dayname[0])
{
tmp_time= (i+3)*86400;
strftime ( buffer, sizeof (buffer), "%a", gmtime (&tmp_time));
- default_abbreviated_dayname[i] = g_strdup (buffer);
+ default_abbreviated_dayname[i] = g_locale_to_utf8 (buffer, -1, NULL, NULL, NULL);
}
if (!default_monthname[0])
{
tmp_time=i*2764800;
strftime ( buffer, sizeof (buffer), "%B", gmtime (&tmp_time));
- default_monthname[i] = g_strdup (buffer);
+ default_monthname[i] = g_locale_to_utf8 (buffer, -1, NULL, NULL, NULL);
}
/* Set defaults */
for (i=0;i<31;i++)
calendar->marked_date[i] = FALSE;
- calendar->selected_day = 1;
+ calendar->num_marked_dates = 0;
+ calendar->selected_day = tm->tm_mday;
calendar->display_flags = ( GTK_CALENDAR_SHOW_HEADING |
GTK_CALENDAR_SHOW_DAY_NAMES );
x_left = left_x_for_column (calendar, c);
x_right = x_left + GTK_CALENDAR_PRIVATE_DATA (calendar)->day_width;
- if (event_x > x_left && event_x < x_right)
+ if (event_x >= x_left && event_x < x_right)
{
column = c;
break;
y_top = top_y_for_row (calendar, r);
y_bottom = y_top + height;
- if (event_y > y_top && event_y < y_bottom)
+ if (event_y >= y_top && event_y < y_bottom)
{
row = r;
break;
gint width;
gint x_left;
+ if (gtk_widget_get_direction (GTK_WIDGET (calendar)) == GTK_TEXT_DIR_RTL)
+ column = 6 - column;
+
width = GTK_CALENDAR_PRIVATE_DATA (calendar)->day_width;
if (calendar->display_flags & GTK_CALENDAR_SHOW_WEEK_NUMBERS)
x_left = DAY_XSEP + (width + DAY_XSEP) * column;
{
if (calendar->selected_day < 0)
calendar->selected_day = calendar->selected_day + 1 + month_length[leap (calendar->year)][calendar->month + 1];
- else
- gtk_calendar_select_day (calendar, calendar->selected_day);
+ gtk_calendar_select_day (calendar, calendar->selected_day);
}
- gtk_calendar_select_day (calendar, calendar->selected_day);
gtk_calendar_paint (GTK_WIDGET (calendar), NULL);
gtk_calendar_thaw (calendar);
}
{
gint month_len;
- g_return_if_fail (calendar != NULL);
g_return_if_fail (GTK_IS_WIDGET (calendar));
if (calendar->display_flags & GTK_CALENDAR_NO_MONTH_CHANGE)
{
gint month_len;
- g_return_if_fail (calendar != NULL);
g_return_if_fail (GTK_IS_WIDGET (calendar));
calendar->year--;
gint month_len;
GtkWidget *widget;
- g_return_if_fail (calendar != NULL);
g_return_if_fail (GTK_IS_WIDGET (calendar));
widget = GTK_WIDGET (calendar);
row = row_from_y (calendar, y);
col = column_from_x (calendar, x);
+
+ /* If row or column isn't found, just return. */
+ if (row == -1 || col == -1)
+ return;
day_month = calendar->day_month[row][col];
gint attributes_mask;
gint i;
- g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_CALENDAR (widget));
calendar = GTK_CALENDAR (widget);
GdkWindowAttr attributes;
gint attributes_mask;
- g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_CALENDAR (widget));
calendar = GTK_CALENDAR (widget);
GdkWindowAttr attributes;
gint attributes_mask;
- g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_CALENDAR (widget));
calendar = GTK_CALENDAR (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->klass->xthickness + INNER_BORDER);
- attributes.y = private_data->header_h + (widget->style->klass->ythickness
+ attributes.x = (widget->style->xthickness + INNER_BORDER);
+ attributes.y = private_data->header_h + (widget->style->ythickness
+ INNER_BORDER);
attributes.width = (widget->allocation.width
- - (widget->style->klass->xthickness + INNER_BORDER)
+ - (widget->style->xthickness + INNER_BORDER)
* 2);
attributes.height = private_data->day_name_h;
private_data->day_name_win = gdk_window_new (widget->window,
GdkWindowAttr attributes;
gint attributes_mask;
- g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_CALENDAR (widget));
calendar = GTK_CALENDAR (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->klass->xthickness + INNER_BORDER);
+ attributes.x = + (widget->style->xthickness + INNER_BORDER);
attributes.y = (private_data->header_h + private_data->day_name_h
- + (widget->style->klass->ythickness + INNER_BORDER));
+ + (widget->style->ythickness + INNER_BORDER));
attributes.width = private_data->week_width;
attributes.height = private_data->main_h;
private_data->week_win = gdk_window_new (widget->window,
gint attributes_mask;
GdkGCValues values;
- g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_CALENDAR (widget));
calendar = GTK_CALENDAR (widget);
attributes.x = private_data->week_width;
else
attributes.x = 0;
- attributes.x += (widget->style->klass->xthickness + INNER_BORDER);
+ attributes.x += (widget->style->xthickness + INNER_BORDER);
attributes.y = (private_data->header_h + private_data->day_name_h
- + (widget->style->klass->ythickness + INNER_BORDER));
+ + (widget->style->ythickness + INNER_BORDER));
attributes.width = (widget->allocation.width - attributes.x
- - (widget->style->klass->xthickness + INNER_BORDER));
+ - (widget->style->xthickness + INNER_BORDER));
attributes.height = private_data->main_h;
private_data->main_win = gdk_window_new (widget->window,
&attributes, attributes_mask);
GtkCalendarPrivateData *private_data;
gint i;
- g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_CALENDAR (widget));
calendar = GTK_CALENDAR (widget);
gdk_window_destroy (private_data->main_win);
private_data->main_win = NULL;
}
+ if (private_data->day_name_win)
+ {
+ gdk_window_set_user_data (private_data->day_name_win, NULL);
+ gdk_window_destroy (private_data->day_name_win);
+ private_data->day_name_win = NULL;
+ }
+ if (calendar->xor_gc)
+ gdk_gc_unref (calendar->xor_gc);
+ if (calendar->gc)
+ gdk_gc_unref (calendar->gc);
if (GTK_WIDGET_CLASS (parent_class)->unrealize)
(* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
{
GtkCalendar *calendar;
GtkCalendarPrivateData *private_data;
+ PangoLayout *layout;
+ PangoRectangle logical_rect;
gint height;
gint i;
gchar buffer[255];
gint calendar_margin = CALENDAR_MARGIN;
gint header_width, main_width;
- gint lbearing;
- gint rbearing;
- gint ascent;
- gint descent;
- gint width;
+ gint max_header_height = 0;
calendar = GTK_CALENDAR (widget);
private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
+
+ layout = gtk_widget_create_pango_layout (widget, NULL);
/*
* Calculate the requisition width for the widget.
private_data->max_month_width = 0;
for (i = 0; i < 12; i++)
{
+ pango_layout_set_text (layout, default_monthname[i], -1);
+ pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
private_data->max_month_width = MAX (private_data->max_month_width,
- gdk_string_measure (HEADER_FONT (widget),
- default_monthname[i]) + 8);
+ logical_rect.width + 8);
+ max_header_height = MAX (max_header_height, logical_rect.height);
}
private_data->max_year_width = 0;
for (i=0; i<10; i++)
{
sprintf (buffer, "%d%d%d%d", i,i,i,i);
+ pango_layout_set_text (layout, buffer, -1);
+ pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
private_data->max_year_width = MAX (private_data->max_year_width,
- gdk_string_measure (HEADER_FONT (widget),
- buffer) + 8);
+ logical_rect.width + 8);
+ max_header_height = MAX (max_header_height, logical_rect.height);
}
}
else
for (i = 0; i < 9; i++)
{
sprintf (buffer, "%d%d", i, i);
+ pango_layout_set_text (layout, buffer, -1);
+ pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
private_data->min_day_width = MAX (private_data->max_day_char_width,
- gdk_string_measure (DAY_FONT (widget),
- buffer));
+ logical_rect.width);
+
+ private_data->max_day_char_ascent = MAX (private_data->max_label_char_ascent,
+ PANGO_ASCENT (logical_rect));
+ private_data->max_day_char_descent = MAX (private_data->max_label_char_descent,
+ PANGO_DESCENT (logical_rect));
}
/* We add one to max_day_char_width to be able to make the marked day "bold" */
private_data->max_day_char_width = private_data->min_day_width / 2 +1;
if (calendar->display_flags & GTK_CALENDAR_SHOW_DAY_NAMES)
for (i = 0; i < 7; i++)
{
- gdk_text_extents (LABEL_FONT (widget),
- default_abbreviated_dayname[i],
- strlen(default_abbreviated_dayname[i]),
- &lbearing,
- &rbearing,
- &width,
- &ascent,
- &descent);
- private_data->min_day_width = MAX (private_data->min_day_width, width);
- private_data->max_label_char_ascent = MAX (private_data->max_label_char_ascent,
- ascent);
+ pango_layout_set_text (layout, default_abbreviated_dayname[i], -1);
+ pango_layout_line_get_pixel_extents (pango_layout_get_lines (layout)->data, NULL, &logical_rect);
+
+ private_data->min_day_width = MAX (private_data->min_day_width, logical_rect.width);
+ private_data->max_label_char_ascent = MAX (private_data->max_label_char_ascent,
+ PANGO_ASCENT (logical_rect));
private_data->max_label_char_descent = MAX (private_data->max_label_char_descent,
- descent);
+ PANGO_DESCENT (logical_rect));
}
private_data->max_week_char_width = 0;
for (i = 0; i < 9; i++)
{
sprintf (buffer, "%d%d", i, i);
+ pango_layout_set_text (layout, buffer, -1);
+ pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
private_data->max_week_char_width = MAX (private_data->max_week_char_width,
- gdk_string_measure (LABEL_FONT (widget), buffer) / 2);
+ logical_rect.width / 2);
}
main_width = (7 * (private_data->min_day_width + DAY_XPAD * 2) + (DAY_XSEP * 6) + CALENDAR_MARGIN * 2
: 0));
- requisition->width = MAX (header_width+4, main_width + (widget->style->klass->xthickness + INNER_BORDER) *2);
+ requisition->width = MAX (header_width+4, main_width + (widget->style->xthickness + INNER_BORDER) *2);
/*
* Calculate the requisition height for the widget.
if (calendar->display_flags & GTK_CALENDAR_SHOW_HEADING)
{
- private_data->header_h = (HEADER_FONT (widget)->ascent
- + HEADER_FONT (widget)->descent
- + CALENDAR_YSEP * 2);
+ private_data->header_h = (max_header_height + CALENDAR_YSEP * 2);
}
else
{
private_data->day_name_h = 0;
}
- gdk_text_extents (DAY_FONT (widget),
- "0123456789",
- 10,
- &lbearing,
- &rbearing,
- &width,
- &private_data->max_day_char_ascent,
- &private_data->max_day_char_descent);
-
private_data->main_h = (CALENDAR_MARGIN + calendar_margin
+ 6 * (private_data->max_day_char_ascent
+ private_data->max_day_char_descent
height = (private_data->header_h + private_data->day_name_h
+ private_data->main_h);
- requisition->height = height + (widget->style->klass->ythickness + INNER_BORDER) * 2;
+ requisition->height = height + (widget->style->ythickness + INNER_BORDER) * 2;
+
+ g_object_unref (G_OBJECT (layout));
}
static void
GtkCalendar *calendar;
GtkCalendarPrivateData *private_data;
- g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_CALENDAR (widget));
g_return_if_fail (allocation != NULL);
if (calendar->display_flags & GTK_CALENDAR_SHOW_WEEK_NUMBERS)
{
private_data->day_width = (private_data->min_day_width
- * ((allocation->width - (widget->style->klass->xthickness + INNER_BORDER) * 2
+ * ((allocation->width - (widget->style->xthickness + INNER_BORDER) * 2
- (CALENDAR_MARGIN * 2) - (DAY_XSEP * 7) - CALENDAR_XSEP * 2))
/ (7 * private_data->min_day_width + private_data->max_week_char_width * 2));
- private_data->week_width = ((allocation->width - (widget->style->klass->xthickness + INNER_BORDER) * 2
+ private_data->week_width = ((allocation->width - (widget->style->xthickness + INNER_BORDER) * 2
- (CALENDAR_MARGIN * 2) - (DAY_XSEP * 7) - CALENDAR_XSEP * 2 )
- private_data->day_width * 7 + CALENDAR_MARGIN + CALENDAR_XSEP);
}
else
{
private_data->day_width = (allocation->width
- - (widget->style->klass->xthickness + INNER_BORDER) * 2
+ - (widget->style->xthickness + INNER_BORDER) * 2
- (CALENDAR_MARGIN * 2)
- (DAY_XSEP * 7))/7;
private_data->week_width = 0;
private_data->header_h - 7);
if (private_data->day_name_win)
gdk_window_move_resize (private_data->day_name_win,
- widget->style->klass->xthickness + INNER_BORDER,
- private_data->header_h + (widget->style->klass->ythickness + INNER_BORDER),
- allocation->width - (widget->style->klass->xthickness + INNER_BORDER) * 2,
+ widget->style->xthickness + INNER_BORDER,
+ private_data->header_h + (widget->style->ythickness + INNER_BORDER),
+ allocation->width - (widget->style->xthickness + INNER_BORDER) * 2,
private_data->day_name_h);
if (private_data->week_win)
gdk_window_move_resize (private_data->week_win,
- (widget->style->klass->xthickness + INNER_BORDER),
+ (widget->style->xthickness + INNER_BORDER),
private_data->header_h + private_data->day_name_h
- + (widget->style->klass->ythickness + INNER_BORDER),
+ + (widget->style->ythickness + INNER_BORDER),
private_data->week_width,
private_data->main_h);
gdk_window_move_resize (private_data->main_win,
(private_data->week_width ? private_data->week_width + CALENDAR_XSEP :0)
- + (widget->style->klass->xthickness + INNER_BORDER),
+ + (widget->style->xthickness + INNER_BORDER),
private_data->header_h + private_data->day_name_h
- + (widget->style->klass->ythickness + INNER_BORDER),
+ + (widget->style->ythickness + INNER_BORDER),
allocation->width
- (private_data->week_width ? private_data->week_width + CALENDAR_XSEP :0)
- - (widget->style->klass->xthickness + INNER_BORDER) * 2,
+ - (widget->style->xthickness + INNER_BORDER) * 2,
private_data->main_h);
}
}
gint width, height;
gint x, y;
- g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_CALENDAR (widget));
calendar = GTK_CALENDAR (widget);
}
}
-static gint
+static gboolean
gtk_calendar_expose (GtkWidget *widget,
GdkEventExpose *event)
{
if (event->window == private_data->week_win)
gtk_calendar_paint_week_numbers (widget);
if (event->window == widget->window)
- gtk_widget_draw_focus (widget);
+ gtk_calendar_draw_focus (widget);
}
return FALSE;
}
-static void
-gtk_calendar_draw (GtkWidget *widget,
- GdkRectangle *area)
-{
- g_return_if_fail (widget != NULL);
- g_return_if_fail (GTK_IS_CALENDAR (widget));
- g_return_if_fail (area != NULL);
-
- if (GTK_WIDGET_DRAWABLE (widget))
- gtk_calendar_paint (widget, area);
-
-}
-
static void
gtk_calendar_paint (GtkWidget *widget,
GdkRectangle *area)
GtkCalendar *calendar;
GtkCalendarPrivateData *private_data;
- g_return_if_fail (widget != NULL);
- g_return_if_fail (widget->window != NULL);
g_return_if_fail (GTK_IS_CALENDAR (widget));
+ g_return_if_fail (widget->window != NULL);
calendar = GTK_CALENDAR (widget);
private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
if (private_data->week_win != NULL)
gtk_calendar_paint_week_numbers (widget);
- gtk_widget_draw_focus (widget);
+ gtk_calendar_draw_focus (widget);
}
static void
GtkCalendar *calendar;
GdkGC *gc;
char buffer[255];
- int y, y_arrow;
+ int x, y;
gint header_width, cal_height;
- gint str_width;
gint max_month_width;
gint max_year_width;
GtkCalendarPrivateData *private_data;
+ PangoLayout *layout;
+ PangoRectangle logical_rect;
calendar = GTK_CALENDAR (widget);
private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
0, 0, header_width, private_data->header_h);
+ sprintf (buffer, "%d", calendar->year);
+ layout = gtk_widget_create_pango_layout (widget, buffer);
+ pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
+
/* Draw title */
- y = private_data->header_h - (private_data->header_h
- - HEADER_FONT (widget)->ascent
- + HEADER_FONT (widget)->descent) / 2;
- y_arrow = (private_data->header_h - 9) / 2;
+ y = (private_data->header_h - logical_rect.height) / 2;
/* Draw year and its arrows */
- sprintf (buffer, "%d", calendar->year);
- str_width = gdk_string_measure (HEADER_FONT (widget), buffer);
- gdk_gc_set_foreground (gc, HEADER_FG_COLOR (GTK_WIDGET (calendar)));
+
if (calendar->display_flags & GTK_CALENDAR_NO_MONTH_CHANGE)
- gdk_draw_string (private_data->header_win, HEADER_FONT (widget), gc,
- header_width - (3 + max_year_width
- - (max_year_width - str_width)/2),
- y, buffer);
+ x = header_width - (3 + max_year_width
+ - (max_year_width - logical_rect.width)/2);
else
- gdk_draw_string (private_data->header_win, HEADER_FONT (widget), gc,
- header_width - (3 + private_data->arrow_width + max_year_width
- - (max_year_width - str_width)/2),
- y, buffer);
+ x = header_width - (3 + private_data->arrow_width + max_year_width
+ - (max_year_width - logical_rect.width)/2);
+
+
+ gdk_gc_set_foreground (gc, HEADER_FG_COLOR (GTK_WIDGET (calendar)));
+ gdk_draw_layout (private_data->header_win, gc, x, y, layout);
/* Draw month */
sprintf (buffer, "%s", default_monthname[calendar->month]);
- str_width = gdk_string_measure (HEADER_FONT (widget), buffer);
+ 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)
- gdk_draw_string (private_data->header_win, HEADER_FONT (widget), gc,
- 3 + (max_month_width - str_width) / 2,
- y, buffer);
+ x = 3 + (max_month_width - logical_rect.width) / 2;
else
- gdk_draw_string (private_data->header_win, HEADER_FONT (widget), gc,
- 3 + private_data->arrow_width + (max_month_width - str_width)/2,
- y, buffer);
-
- y += CALENDAR_YSEP + HEADER_FONT (widget)->descent;
+ x = 3 + private_data->arrow_width + (max_month_width - logical_rect.width)/2;
+
+ gdk_draw_layout (private_data->header_win, gc, x, y, layout);
gdk_gc_set_foreground (gc, BACKGROUND_COLOR (GTK_WIDGET (calendar)));
gtk_calendar_paint_arrow (widget, ARROW_MONTH_RIGHT);
gtk_calendar_paint_arrow (widget, ARROW_YEAR_LEFT);
gtk_calendar_paint_arrow (widget, ARROW_YEAR_RIGHT);
-
+
+ g_object_unref (G_OBJECT (layout));
}
static void
int day_width, cal_width;
gint cal_height;
int day_wid_sep;
- int str_width;
+ PangoLayout *layout;
+ PangoRectangle logical_rect;
GtkCalendarPrivateData *private_data;
- g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_CALENDAR (widget));
calendar = GTK_CALENDAR (widget);
private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
/*
* Write the labels
*/
+
+ layout = gtk_widget_create_pango_layout (widget, NULL);
+
gdk_gc_set_foreground (gc, &widget->style->fg[GTK_STATE_SELECTED]);
for (i = 0; i < 7; i++)
{
- day=i;
+ if (gtk_widget_get_direction (GTK_WIDGET (calendar)) == GTK_TEXT_DIR_RTL)
+ day = 6 - i;
+ else
+ day = i;
if (calendar->display_flags & GTK_CALENDAR_WEEK_START_MONDAY)
day= (day+1)%7;
sprintf (buffer, "%s", default_abbreviated_dayname[day]);
- str_width = gdk_string_measure (LABEL_FONT (widget), buffer);
- gdk_draw_string (private_data->day_name_win, LABEL_FONT (widget),
- gc,
+
+ pango_layout_set_text (layout, buffer, -1);
+ pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
+
+ gdk_draw_layout (private_data->day_name_win, gc,
((private_data->week_width ? CALENDAR_XSEP : CALENDAR_MARGIN)
+ day_wid_sep * i
+ private_data->week_width
- + (day_width - str_width)/2),
- CALENDAR_MARGIN + DAY_YPAD
- + private_data->max_label_char_ascent, buffer);
+ + (day_width - logical_rect.width)/2),
+ CALENDAR_MARGIN + DAY_YPAD + logical_rect.y,
+ layout);
}
+
+ g_object_unref (G_OBJECT (layout));
}
static void
gint row, week = 0, year;
gint x_loc;
char buffer[3];
- gint y_baseline, day_height;
+ gint y_loc, day_height;
GtkCalendarPrivateData *private_data;
+ PangoLayout *layout;
+ PangoRectangle logical_rect;
- g_return_if_fail (widget != NULL);
- g_return_if_fail (widget->window != NULL);
g_return_if_fail (GTK_IS_CALENDAR (widget));
+ g_return_if_fail (widget->window != NULL);
calendar = GTK_CALENDAR (widget);
private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
gc = calendar->gc;
* Write the labels
*/
+ layout = gtk_widget_create_pango_layout (widget, NULL);
+
gdk_gc_set_foreground (gc, &widget->style->fg[GTK_STATE_SELECTED]);
day_height = row_height (calendar);
for (row = 0; row < 6; row++)
year = calendar->year;
if (calendar->day[row][6] < 15 && row > 3 && calendar->month == 11)
year++;
- y_baseline = (top_y_for_row (calendar, row)
- + (day_height + LABEL_FONT (widget)->ascent
- - LABEL_FONT (widget)->descent)/2);
+
g_return_if_fail (week_of_year (&week, &year,
((calendar->day[row][6] < 15 && row > 3 ? 1 : 0)
+ calendar->month) % 12 + 1, calendar->day[row][6]));
- x_loc= (private_data->week_width - (private_data->week_width - CALENDAR_XSEP
- - DAY_XPAD * 2 - CALENDAR_MARGIN ) / 2
- - private_data->max_week_char_width
- - CALENDAR_XSEP - DAY_XPAD);
-
- if (week > 9)
- {
- sprintf (buffer, "%d", week/10);
- gdk_draw_string (private_data->week_win, LABEL_FONT (widget), gc,
- x_loc, y_baseline , buffer);
- }
-
- sprintf (buffer, "%d", week%10);
- gdk_draw_string (private_data->week_win, LABEL_FONT (widget), gc,
- x_loc + private_data->max_week_char_width, y_baseline , buffer);
+
+ sprintf (buffer, "%d", week);
+ pango_layout_set_text (layout, buffer, -1);
+ pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
+
+ y_loc = top_y_for_row (calendar, row) + (day_height - logical_rect.height) / 2;
+
+ x_loc = (private_data->week_width
+ - logical_rect.width
+ - CALENDAR_XSEP - DAY_XPAD);
+
+ gdk_draw_layout (private_data->week_win, gc, x_loc, y_loc, layout);
}
+
+ g_object_unref (G_OBJECT (layout));
}
static void
GtkCalendar *calendar;
gint r, c, row, col;
- g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_CALENDAR (widget));
calendar = GTK_CALENDAR (widget);
gint x_left;
gint x_loc;
gint y_top;
- gint y_baseline;
+ gint y_loc;
gint day_xspace;
GtkCalendarPrivateData *private_data;
+ PangoLayout *layout;
+ PangoRectangle logical_rect;
- g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_CALENDAR (widget));
g_return_if_fail (row < 6);
g_return_if_fail (col < 7);
x_loc = x_left + private_data->day_width / 2 + private_data->max_day_char_width;
y_top = top_y_for_row (calendar, row);
- y_baseline = y_top + (day_height + private_data->max_day_char_ascent)/2;
gdk_window_clear_area (private_data->main_win, x_left, y_top,
private_data->day_width, day_height);
sprintf (buffer, "%d", day);
- x_loc -= gdk_string_measure (DAY_FONT (widget), buffer);
- sprintf (buffer, "%d", day);
- gdk_draw_string (private_data->main_win,
- DAY_FONT (widget), gc,
- x_loc, y_baseline, buffer);
+ layout = gtk_widget_create_pango_layout (widget, buffer);
+ pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
+
+ x_loc -= logical_rect.width;
+
+ y_loc = y_top + (day_height - logical_rect.height) / 2;
+ gdk_draw_layout (private_data->main_win, gc,
+ x_loc, y_loc, layout);
if (calendar->marked_date[day-1]
&& calendar->day_month[row][col] == MONTH_CURRENT)
- gdk_draw_string (private_data->main_win,
- DAY_FONT (widget), gc,
- x_loc-1, y_baseline, buffer);
+ gdk_draw_layout (private_data->main_win, gc,
+ x_loc-1, y_loc, layout);
if (GTK_WIDGET_HAS_FOCUS (calendar)
&& calendar->focus_row == row && calendar->focus_col == col)
private_data->day_width-1, day_height-1);
}
+ g_object_unref (G_OBJECT (layout));
}
GtkCalendarPrivateData *private_data;
gint row, col;
- g_return_if_fail (widget != NULL);
- g_return_if_fail (widget->window != NULL);
g_return_if_fail (GTK_IS_CALENDAR (widget));
+ g_return_if_fail (widget->window != NULL);
calendar = GTK_CALENDAR (widget);
private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
gint col;
gint day;
- g_return_if_fail (calendar != NULL);
g_return_if_fail (GTK_IS_CALENDAR (calendar));
year = calendar->year;
GtkWidget *widget;
gint i;
- g_return_if_fail (calendar != NULL);
g_return_if_fail (GTK_IS_CALENDAR (calendar));
widget = GTK_WIDGET (calendar);
}
-gint
+gboolean
gtk_calendar_select_month (GtkCalendar *calendar,
guint month,
guint year)
gtk_calendar_select_day (GtkCalendar *calendar,
guint day)
{
- g_return_if_fail (calendar != NULL);
g_return_if_fail (GTK_IS_CALENDAR (calendar));
g_return_if_fail (day <= 31);
{
guint day;
- g_return_if_fail (calendar != NULL);
g_return_if_fail (GTK_IS_CALENDAR (calendar));
for (day = 0; day < 31; day++)
{
calendar->marked_date[day] = FALSE;
}
-
+
+ calendar->num_marked_dates = 0;
+
if (GTK_WIDGET_DRAWABLE (calendar))
{
gtk_calendar_paint_main (GTK_WIDGET (calendar));
}
}
-gint
+gboolean
gtk_calendar_mark_day (GtkCalendar *calendar,
guint day)
{
g_return_val_if_fail (calendar != NULL, FALSE);
g_return_val_if_fail (GTK_IS_CALENDAR (calendar), FALSE);
- if (day >= 1 && day <= 31)
- calendar->marked_date[day - 1] = TRUE;
-
+ if (day >= 1 && day <= 31 && calendar->marked_date[day-1] == FALSE)
+ {
+ calendar->marked_date[day - 1] = TRUE;
+ calendar->num_marked_dates++;
+ }
if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (calendar)))
{
gtk_calendar_paint_main (GTK_WIDGET (calendar));
return TRUE;
}
-gint
+gboolean
gtk_calendar_unmark_day (GtkCalendar *calendar,
guint day)
{
g_return_val_if_fail (calendar != NULL, FALSE);
g_return_val_if_fail (GTK_IS_CALENDAR (calendar), FALSE);
- if (day >= 1 && day <= 31)
- calendar->marked_date[day - 1] = FALSE;
+ if (day >= 1 && day <= 31 && calendar->marked_date[day-1] == TRUE)
+ {
+ calendar->marked_date[day - 1] = FALSE;
+ calendar->num_marked_dates--;
+ }
if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (calendar)))
{
guint *month,
guint *day)
{
- g_return_if_fail (calendar != NULL);
g_return_if_fail (GTK_IS_CALENDAR (calendar));
if (year)
*day = calendar->selected_day;
}
-static gint
+static gboolean
gtk_calendar_button_press (GtkWidget *widget,
GdkEventButton *event)
{
GtkCalendar *calendar;
GtkCalendarPrivateData *private_data;
gint x, y;
+ void (* action_func) (GtkCalendar *);
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_CALENDAR (widget), FALSE);
if (event->window == private_data->main_win)
gtk_calendar_main_button (widget, event);
-
- if (event->type != GDK_BUTTON_PRESS)
- return FALSE; /* Double-clicks? Triple-clicks? No thanks! */
+
+ action_func = NULL;
if (event->window == private_data->arrow_win[ARROW_MONTH_LEFT])
- gtk_calendar_set_month_prev (calendar);
-
- if (event->window == private_data->arrow_win[ARROW_MONTH_RIGHT])
- gtk_calendar_set_month_next (calendar);
-
- if (event->window == private_data->arrow_win[ARROW_YEAR_LEFT])
- gtk_calendar_set_year_prev (calendar);
-
- if (event->window == private_data->arrow_win[ARROW_YEAR_RIGHT])
- gtk_calendar_set_year_next (calendar);
+ action_func = gtk_calendar_set_month_prev;
+ else if (event->window == private_data->arrow_win[ARROW_MONTH_RIGHT])
+ action_func = gtk_calendar_set_month_next;
+ else if (event->window == private_data->arrow_win[ARROW_YEAR_LEFT])
+ action_func = gtk_calendar_set_year_prev;
+ else if (event->window == private_data->arrow_win[ARROW_YEAR_RIGHT])
+ action_func = gtk_calendar_set_year_next;
+
+ /* only call the action on single click, not double */
+ if (action_func && event->type == GDK_BUTTON_PRESS)
+ (* action_func) (calendar);
- return FALSE;
+ return action_func != NULL;
}
-static gint
+static gboolean
gtk_calendar_motion_notify (GtkWidget *widget,
GdkEventMotion *event)
{
return TRUE;
}
-static gint
+static gboolean
gtk_calendar_enter_notify (GtkWidget *widget,
GdkEventCrossing *event)
{
return TRUE;
}
-static gint
+static gboolean
gtk_calendar_leave_notify (GtkWidget *widget,
GdkEventCrossing *event)
{
void
gtk_calendar_freeze (GtkCalendar *calendar)
{
- g_return_if_fail (calendar != NULL);
g_return_if_fail (GTK_IS_CALENDAR (calendar));
GTK_CALENDAR_PRIVATE_DATA (calendar)->freeze_count++;
{
GtkCalendarPrivateData *private_data;
- g_return_if_fail (calendar != NULL);
g_return_if_fail (GTK_IS_CALENDAR (calendar));
private_data = GTK_CALENDAR_PRIVATE_DATA (calendar);
GtkCalendarPrivateData *private_data;
gint i;
- g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_CALENDAR (widget));
calendar = GTK_CALENDAR (widget);
gtk_calendar_style_set (GtkWidget *widget,
GtkStyle *previous_style)
{
- g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_CALENDAR (widget));
if (previous_style && GTK_WIDGET_REALIZED (widget))
gtk_calendar_state_changed (GtkWidget *widget,
GtkStateType previous_state)
{
- g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_CALENDAR (widget));
gtk_calendar_set_background (widget);
}
-static gint
-gtk_calendar_focus_in (GtkWidget *widget,
- GdkEventFocus *event)
-{
- GtkCalendar *calendar;
-
- g_return_val_if_fail (widget != NULL, FALSE);
- g_return_val_if_fail (GTK_IS_CALENDAR (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
-
- calendar = GTK_CALENDAR (widget);
-
- GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_FOCUS);
- gtk_widget_draw_focus (widget);
- gtk_calendar_paint_day (widget, calendar->focus_row, calendar->focus_col);
-
- return FALSE;
-}
-
-static gint
-gtk_calendar_focus_out (GtkWidget *widget,
- GdkEventFocus *event)
+static void
+gtk_calendar_destroy (GtkObject *object)
{
- GtkCalendar *calendar;
-
- g_return_val_if_fail (widget != NULL, FALSE);
- g_return_val_if_fail (GTK_IS_CALENDAR (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
-
- calendar = GTK_CALENDAR (widget);
-
- GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_FOCUS);
- gtk_widget_draw_focus (widget);
- gtk_calendar_paint_day (widget, calendar->focus_row, calendar->focus_col);
-
- return FALSE;
+ GtkCalendarPrivateData *private_data;
+ private_data = GTK_CALENDAR_PRIVATE_DATA (object);
+ g_free (private_data);
+ if (GTK_OBJECT_CLASS (parent_class)->destroy)
+ (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
}
-static gint
+static gboolean
gtk_calendar_key_press (GtkWidget *widget,
GdkEventKey *event)
{
switch (event->keyval)
{
+ case GDK_KP_Left:
case GDK_Left:
return_val = TRUE;
if (event->state & GDK_CONTROL_MASK)
calendar->focus_col);
}
break;
+ case GDK_KP_Right:
case GDK_Right:
return_val = TRUE;
if (event->state & GDK_CONTROL_MASK)
calendar->focus_col);
}
break;
+ case GDK_KP_Up:
case GDK_Up:
return_val = TRUE;
if (event->state & GDK_CONTROL_MASK)
calendar->focus_col);
}
break;
+ case GDK_KP_Down:
case GDK_Down:
return_val = TRUE;
if (event->state & GDK_CONTROL_MASK)
calendar->focus_col);
}
break;
+ case GDK_KP_Space:
case GDK_space:
row = calendar->focus_row;
col = calendar->focus_col;
if (row > -1 && col > -1)
{
+ return_val = TRUE;
gtk_calendar_freeze (calendar);
if (calendar->day_month[row][col] == MONTH_PREV)
projects / ~andy / gtk / blobdiff