* 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-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/.
+ */
+
+#include "config.h"
+
+#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
+#endif
#include <string.h>
#include <stdlib.h>
#include <time.h>
#define and && /* logical (boolean) operators: lower case */
#define or ||
-static N_int month_length[2][13] =
+static const N_int month_length[2][13] =
{
{ 0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 },
{ 0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }
};
-static N_int days_in_months[2][14] =
+static const N_int days_in_months[2][14] =
{
{ 0, 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365 },
{ 0, 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366 }
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
/* Color usage */
#define HEADER_FG_COLOR(widget) (& (widget)->style->fg[GTK_WIDGET_STATE (widget)])
#define HEADER_BG_COLOR(widget) (& (widget)->style->bg[GTK_WIDGET_STATE (widget)])
-#define DAY_NAME_COLOR(widget) (& (widget)->style->dark[GTK_WIDGET_STATE (widget)])
+#define DAY_NAME_COLOR(widget) (& (widget)->style->bg[GTK_STATE_SELECTED])
#define NORMAL_DAY_COLOR(widget) (& (widget)->style->fg[GTK_WIDGET_STATE (widget)])
#define SELECTION_FOCUS_COLOR(widget) (& (widget)->style->fg[GTK_WIDGET_STATE (widget)])
#define SELECTION_NO_FOCUS_COLOR(widget) (& (widget)->style->mid[GTK_WIDGET_STATE (widget)])
#define 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,
MONTH_NEXT
};
-static GtkWidgetClass *parent_class = NULL;
-
enum {
MONTH_CHANGED_SIGNAL,
DAY_SELECTED_SIGNAL,
static gint gtk_calendar_signals[LAST_SIGNAL] = { 0 };
+static GtkWidgetClass *parent_class = NULL;
+
+typedef struct _GtkCalendarPrivateData GtkCalendarPrivateData;
+struct _GtkCalendarPrivateData
+{
+ GdkWindow *header_win;
+ GdkWindow *day_name_win;
+ GdkWindow *main_win;
+ GdkWindow *week_win;
+ GdkWindow *arrow_win[4];
+
+ 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 day_width;
+ guint week_width;
+
+ guint min_day_width;
+ guint max_day_char_width;
+ guint max_day_char_ascent;
+ guint max_day_char_descent;
+ guint max_label_char_ascent;
+ guint max_label_char_descent;
+ guint max_week_char_width;
+
+ guint freeze_count;
+
+ /* flags */
+ guint dirty_header : 1;
+ guint dirty_day_names : 1;
+ guint dirty_main : 1;
+ guint dirty_week : 1;
+};
+
+#define GTK_CALENDAR_PRIVATE_DATA(widget) (((GtkCalendarPrivateData*)(GTK_CALENDAR (widget)->private_data)))
+
typedef void (*GtkCalendarSignalDate) (GtkObject *object, guint arg1, guint arg2, guint arg3, gpointer data);
static void gtk_calendar_class_init (GtkCalendarClass *class);
static void gtk_calendar_init (GtkCalendar *calendar);
+static void gtk_calendar_destroy (GtkObject *calendar);
static void gtk_calendar_realize (GtkWidget *widget);
static void gtk_calendar_unrealize (GtkWidget *widget);
static void gtk_calendar_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)
{
- 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
char buffer[255];
time_t tmp_time;
GtkWidget *widget;
+ GtkCalendarPrivateData *private_data;
widget = GTK_WIDGET (calendar);
GTK_WIDGET_SET_FLAGS (widget, GTK_CAN_FOCUS);
+ calendar->private_data = (gpointer) g_malloc (sizeof (GtkCalendarPrivateData));
+ private_data = GTK_CALENDAR_PRIVATE_DATA (calendar);
+
if (!default_abbreviated_dayname[0])
for (i=0; i<7; i++)
{
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->arrow_width = 10;
-
- /* Create cursor */
- /* calendar->cross = gdk_cursor_new (GDK_PLUS); */
+ calendar->display_flags = ( GTK_CALENDAR_SHOW_HEADING |
+ GTK_CALENDAR_SHOW_DAY_NAMES );
calendar->highlight_row = -1;
calendar->highlight_col = -1;
+ calendar->focus_row = -1;
+ calendar->focus_col = -1;
+ calendar->xor_gc = NULL;
+
+ private_data->max_year_width = 0;
+ private_data->max_month_width = 0;
+ private_data->max_day_char_width = 0;
+ private_data->max_week_char_width = 0;
+
+ private_data->max_day_char_ascent = 0;
+ private_data->max_day_char_descent = 0;
+ private_data->max_label_char_ascent = 0;
+ private_data->max_label_char_descent = 0;
+
+ private_data->arrow_width = 10;
+
+ private_data->freeze_count = 0;
- calendar->max_day_char_width=0;
- calendar->max_week_char_width=0;
- calendar->dirty_header = 0;
- calendar->dirty_day_names = 0;
- calendar->dirty_week = 0;
- calendar->dirty_main = 0;
- calendar->frozen = 0;
+ private_data->dirty_header = 0;
+ private_data->dirty_day_names = 0;
+ private_data->dirty_week = 0;
+ private_data->dirty_main = 0;
}
GtkWidget*
for (c = 0; c < 7; c++)
{
x_left = left_x_for_column (calendar, c);
- x_right = x_left + calendar->day_width;
+ 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;
static gint
row_height (GtkCalendar *calendar)
{
- return (calendar->main_h - CALENDAR_MARGIN
+ return (GTK_CALENDAR_PRIVATE_DATA (calendar)->main_h - CALENDAR_MARGIN
- ((calendar->display_flags & GTK_CALENDAR_SHOW_DAY_NAMES)
? CALENDAR_YSEP : CALENDAR_MARGIN)) / 6;
}
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;
- width = calendar->day_width;
+ 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;
else
gint row)
{
- return calendar->main_h - (CALENDAR_MARGIN + (6 - row) *
- row_height (calendar));
+ return (GTK_CALENDAR_PRIVATE_DATA (calendar)->main_h
+ - (CALENDAR_MARGIN + (6 - row)
+ * row_height (calendar)));
}
/* This function should be done by the toolkit, but we don't like the
{
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);
gint x, y;
gint row, col;
gint day_month;
+ gint old_focus_row, old_focus_col;
calendar = GTK_CALENDAR (widget);
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];
{
if (!GTK_WIDGET_HAS_FOCUS (widget))
gtk_widget_grab_focus (widget);
+ old_focus_row = calendar->focus_row;
+ old_focus_col = calendar->focus_col;
+ calendar->focus_row = row;
+ calendar->focus_col = col;
+ gtk_calendar_paint_day (widget, old_focus_row, old_focus_col);
gtk_calendar_select_day (calendar, calendar->day[row][col]);
}
}
gtk_calendar_realize_arrows (GtkWidget *widget)
{
GtkCalendar *calendar;
+ GtkCalendarPrivateData *private_data;
GdkWindowAttr attributes;
gint attributes_mask;
gint i;
- 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);
+
/* Arrow windows ------------------------------------- */
if (! (calendar->display_flags & GTK_CALENDAR_NO_MONTH_CHANGE)
&& (calendar->display_flags & GTK_CALENDAR_SHOW_HEADING))
| GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK);
attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
attributes.y = 3;
- attributes.width = calendar->arrow_width;
- attributes.height = calendar->header_h - 7;
+ attributes.width = private_data->arrow_width;
+ attributes.height = private_data->header_h - 7;
for (i = 0; i < 4; i++)
{
switch (i)
attributes.x = 3;
break;
case ARROW_MONTH_RIGHT:
- attributes.x = calendar->arrow_width + calendar->max_month_width;
+ attributes.x = (private_data->arrow_width
+ + private_data->max_month_width);
break;
case ARROW_YEAR_LEFT:
- attributes.x = (widget->allocation.width
- - (3 + 2*calendar->arrow_width + calendar->max_year_width));
+ attributes.x = (widget->allocation.width - 4
+ - (3 + 2*private_data->arrow_width
+ + private_data->max_year_width));
break;
case ARROW_YEAR_RIGHT:
- attributes.x = widget->allocation.width - 3 - calendar->arrow_width;
+ attributes.x = (widget->allocation.width - 4
+ - 3 - private_data->arrow_width);
break;
}
- calendar->arrow_win[i] = gdk_window_new (calendar->header_win,
- &attributes, attributes_mask);
- calendar->arrow_state[i] = GTK_STATE_NORMAL;
- gdk_window_set_background (calendar->arrow_win[i],
+ private_data->arrow_win[i] = gdk_window_new (private_data->header_win,
+ &attributes,
+ attributes_mask);
+ private_data->arrow_state[i] = GTK_STATE_NORMAL;
+ gdk_window_set_background (private_data->arrow_win[i],
HEADER_BG_COLOR (GTK_WIDGET (calendar)));
- gdk_window_show (calendar->arrow_win[i]);
- gdk_window_set_user_data (calendar->arrow_win[i], widget);
+ gdk_window_show (private_data->arrow_win[i]);
+ gdk_window_set_user_data (private_data->arrow_win[i], widget);
}
}
else
- for (i = 0; i < 4; i++)
- calendar->arrow_win[i] = NULL;
+ {
+ for (i = 0; i < 4; i++)
+ private_data->arrow_win[i] = NULL;
+ }
}
static void
gtk_calendar_realize_header (GtkWidget *widget)
{
GtkCalendar *calendar;
+ GtkCalendarPrivateData *private_data;
GdkWindowAttr attributes;
gint attributes_mask;
- 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);
+
/* Header window ------------------------------------- */
if (calendar->display_flags & GTK_CALENDAR_SHOW_HEADING)
{
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 = 0;
- attributes.y = 0;
- attributes.width = widget->allocation.width;
- attributes.height = calendar->header_h;
- calendar->header_win = gdk_window_new (widget->window,
+ attributes.x = 2;
+ attributes.y = 2;
+ attributes.width = widget->allocation.width - 4;
+ attributes.height = private_data->header_h;
+ private_data->header_win = gdk_window_new (widget->window,
&attributes, attributes_mask);
- gdk_window_set_background (calendar->header_win,
+ gdk_window_set_background (private_data->header_win,
HEADER_BG_COLOR (GTK_WIDGET (calendar)));
- gdk_window_show (calendar->header_win);
- gdk_window_set_user_data (calendar->header_win, widget);
+ gdk_window_show (private_data->header_win);
+ gdk_window_set_user_data (private_data->header_win, widget);
}
else
- calendar->header_win = NULL;
-
+ {
+ private_data->header_win = NULL;
+ }
gtk_calendar_realize_arrows (widget);
}
gtk_calendar_realize_day_names (GtkWidget *widget)
{
GtkCalendar *calendar;
+ GtkCalendarPrivateData *private_data;
GdkWindowAttr attributes;
gint attributes_mask;
- 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);
+
/* Day names window --------------------------------- */
if ( calendar->display_flags & GTK_CALENDAR_SHOW_DAY_NAMES)
{
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 = calendar->header_h + (widget->style->klass->ythickness + INNER_BORDER);
- attributes.width = widget->allocation.width - (widget->style->klass->xthickness + INNER_BORDER) *2;
- attributes.height = calendar->day_name_h;
- calendar->day_name_win = gdk_window_new (widget->window,
- &attributes, attributes_mask);
- gdk_window_set_background (calendar->day_name_win, BACKGROUND_COLOR ( GTK_WIDGET ( calendar)));
- gdk_window_show (calendar->day_name_win);
- gdk_window_set_user_data (calendar->day_name_win, widget);
+ 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->xthickness + INNER_BORDER)
+ * 2);
+ attributes.height = private_data->day_name_h;
+ private_data->day_name_win = gdk_window_new (widget->window,
+ &attributes,
+ attributes_mask);
+ gdk_window_set_background (private_data->day_name_win,
+ BACKGROUND_COLOR ( GTK_WIDGET ( calendar)));
+ gdk_window_show (private_data->day_name_win);
+ gdk_window_set_user_data (private_data->day_name_win, widget);
}
else
- calendar->day_name_win = NULL;
+ {
+ private_data->day_name_win = NULL;
+ }
}
static void
gtk_calendar_realize_week_numbers (GtkWidget *widget)
{
GtkCalendar *calendar;
+ GtkCalendarPrivateData *private_data;
GdkWindowAttr attributes;
gint attributes_mask;
- 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);
+
/* Week number window -------------------------------- */
if (calendar->display_flags & GTK_CALENDAR_SHOW_WEEK_NUMBERS)
{
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 = (calendar->header_h + calendar->day_name_h
- + (widget->style->klass->ythickness + INNER_BORDER));
- attributes.width = calendar->week_width;
- attributes.height = calendar->main_h;
- calendar->week_win = gdk_window_new (widget->window,
- &attributes, attributes_mask);
- gdk_window_set_background (calendar->week_win, BACKGROUND_COLOR (GTK_WIDGET (calendar)));
- gdk_window_show (calendar->week_win);
- gdk_window_set_user_data (calendar->week_win, widget);
+ attributes.x = + (widget->style->xthickness + INNER_BORDER);
+ attributes.y = (private_data->header_h + private_data->day_name_h
+ + (widget->style->ythickness + INNER_BORDER));
+ attributes.width = private_data->week_width;
+ attributes.height = private_data->main_h;
+ private_data->week_win = gdk_window_new (widget->window,
+ &attributes, attributes_mask);
+ gdk_window_set_background (private_data->week_win,
+ BACKGROUND_COLOR (GTK_WIDGET (calendar)));
+ gdk_window_show (private_data->week_win);
+ gdk_window_set_user_data (private_data->week_win, widget);
}
else
- calendar->week_win = NULL;
+ {
+ private_data->week_win = NULL;
+ }
}
static void
gtk_calendar_realize (GtkWidget *widget)
{
GtkCalendar *calendar;
+ GtkCalendarPrivateData *private_data;
GdkWindowAttr attributes;
gint attributes_mask;
-
- g_return_if_fail (widget != NULL);
+ GdkGCValues values;
+
g_return_if_fail (GTK_IS_CALENDAR (widget));
calendar = GTK_CALENDAR (widget);
+ private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
gtk_calendar_compute_days (calendar);
| GDK_POINTER_MOTION_MASK | GDK_LEAVE_NOTIFY_MASK);
if (calendar->display_flags & GTK_CALENDAR_SHOW_WEEK_NUMBERS)
- attributes.x = calendar->week_width;
+ attributes.x = private_data->week_width;
else
attributes.x = 0;
- attributes.x += (widget->style->klass->xthickness + INNER_BORDER);
- attributes.y = calendar->header_h + calendar->day_name_h + (widget->style->klass->ythickness + INNER_BORDER);
- attributes.width = widget->allocation.width - attributes.x - (widget->style->klass->xthickness + INNER_BORDER);
- attributes.height = calendar->main_h;
- calendar->main_win = gdk_window_new (widget->window,
- &attributes, attributes_mask);
- gdk_window_set_background (calendar->main_win, BACKGROUND_COLOR ( GTK_WIDGET ( calendar)));
- gdk_window_show (calendar->main_win);
- gdk_window_set_user_data (calendar->main_win, widget);
+ attributes.x += (widget->style->xthickness + INNER_BORDER);
+ attributes.y = (private_data->header_h + private_data->day_name_h
+ + (widget->style->ythickness + INNER_BORDER));
+ attributes.width = (widget->allocation.width - attributes.x
+ - (widget->style->xthickness + INNER_BORDER));
+ attributes.height = private_data->main_h;
+ private_data->main_win = gdk_window_new (widget->window,
+ &attributes, attributes_mask);
+ gdk_window_set_background (private_data->main_win,
+ BACKGROUND_COLOR ( GTK_WIDGET ( calendar)));
+ gdk_window_show (private_data->main_win);
+ gdk_window_set_user_data (private_data->main_win, widget);
gdk_window_set_background (widget->window, BACKGROUND_COLOR (widget));
gdk_window_show (widget->window);
gdk_window_set_user_data (widget->window, widget);
/* Set widgets gc */
calendar->gc = gdk_gc_new (widget->window);
+
+ values.foreground = widget->style->white;
+ values.function = GDK_XOR;
+ calendar->xor_gc = gdk_gc_new_with_values (widget->window,
+ &values,
+ GDK_GC_FOREGROUND |
+ GDK_GC_FUNCTION);
}
static void
gtk_calendar_unrealize (GtkWidget *widget)
{
GtkCalendar *calendar;
+ GtkCalendarPrivateData *private_data;
gint i;
- 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);
- if (calendar->header_win)
+ if (private_data->header_win)
{
- for (i=0; i<4; i++)
- if (calendar->arrow_win[i])
- {
- gdk_window_set_user_data (calendar->arrow_win[i], NULL);
- gdk_window_destroy (calendar->arrow_win[i]);
- calendar->arrow_win[i] = NULL;
- }
- gdk_window_set_user_data (calendar->header_win, NULL);
- gdk_window_destroy (calendar->header_win);
- calendar->header_win = NULL;
+ for (i = 0; i < 4; i++)
+ {
+ if (private_data->arrow_win[i])
+ {
+ gdk_window_set_user_data (private_data->arrow_win[i], NULL);
+ gdk_window_destroy (private_data->arrow_win[i]);
+ private_data->arrow_win[i] = NULL;
+ }
+ }
+ gdk_window_set_user_data (private_data->header_win, NULL);
+ gdk_window_destroy (private_data->header_win);
+ private_data->header_win = NULL;
}
- if (calendar->week_win)
+ if (private_data->week_win)
{
- gdk_window_set_user_data (calendar->week_win, NULL);
- gdk_window_destroy (calendar->week_win);
- calendar->week_win = NULL;
+ gdk_window_set_user_data (private_data->week_win, NULL);
+ gdk_window_destroy (private_data->week_win);
+ private_data->week_win = NULL;
}
- if (calendar->main_win)
+ if (private_data->main_win)
+ {
+ gdk_window_set_user_data (private_data->main_win, NULL);
+ gdk_window_destroy (private_data->main_win);
+ private_data->main_win = NULL;
+ }
+ if (private_data->day_name_win)
{
- gdk_window_set_user_data (calendar->main_win, NULL);
- gdk_window_destroy (calendar->main_win);
- calendar->main_win = NULL;
+ 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);
GtkRequisition *requisition)
{
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.
if (calendar->display_flags & GTK_CALENDAR_SHOW_HEADING)
{
- calendar->max_month_width = 0;
+ private_data->max_month_width = 0;
for (i = 0; i < 12; i++)
- calendar->max_month_width = MAX (calendar->max_month_width,
- gdk_string_measure (HEADER_FONT (widget),
- default_monthname[i]) + 8);
-
- calendar->max_year_width = 0;
+ {
+ 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,
+ 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);
- calendar->max_year_width = MAX (calendar->max_year_width,
- gdk_string_measure (HEADER_FONT (widget),
- buffer) + 8);
+ pango_layout_set_text (layout, buffer, -1);
+ pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
+ private_data->max_year_width = MAX (private_data->max_year_width,
+ logical_rect.width + 8);
+ max_header_height = MAX (max_header_height, logical_rect.height);
}
}
else
{
- calendar->max_month_width = 0;
- calendar->max_year_width = 0;
+ private_data->max_month_width = 0;
+ private_data->max_year_width = 0;
}
if (calendar->display_flags & GTK_CALENDAR_NO_MONTH_CHANGE)
- header_width = (calendar->max_month_width + calendar->max_year_width
+ header_width = (private_data->max_month_width
+ + private_data->max_year_width
+ 3 * 3);
else
- header_width = (calendar->max_month_width + calendar->max_year_width
- + 4 * calendar->arrow_width + 3 * 3);
-
+ header_width = (private_data->max_month_width
+ + private_data->max_year_width
+ + 4 * private_data->arrow_width + 3 * 3);
+
/* Mainwindow labels width */
- calendar->max_day_char_width = 0;
+ private_data->max_day_char_width = 0;
for (i = 0; i < 9; i++)
{
sprintf (buffer, "%d%d", i, i);
- calendar->min_day_width = MAX (calendar->max_day_char_width,
- gdk_string_measure (DAY_FONT (widget),
- buffer));
+ 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,
+ 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" */
- calendar->max_day_char_width = calendar->min_day_width / 2 +1;
+ 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);
- calendar->min_day_width = MAX (calendar->min_day_width, width);
- calendar->max_label_char_ascent = MAX (calendar->max_label_char_ascent,
- ascent);
- calendar->max_label_char_descent = MAX (calendar->max_label_char_descent
- , descent);
+ 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,
+ PANGO_DESCENT (logical_rect));
}
- calendar->max_week_char_width = 0;
+ private_data->max_week_char_width = 0;
if (calendar->display_flags & GTK_CALENDAR_SHOW_WEEK_NUMBERS)
for (i = 0; i < 9; i++)
{
sprintf (buffer, "%d%d", i, i);
- calendar->max_week_char_width = MAX (calendar->max_week_char_width,
- gdk_string_measure (LABEL_FONT (widget), buffer) / 2);
+ pango_layout_set_text (layout, buffer, -1);
+ pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
+ private_data->max_week_char_width = MAX (private_data->max_week_char_width,
+ logical_rect.width / 2);
}
- main_width = (7 * (calendar->min_day_width + DAY_XPAD * 2) + (DAY_XSEP * 6) + CALENDAR_MARGIN * 2
- + (calendar->max_week_char_width
- ? calendar->max_week_char_width * 2 + DAY_XPAD * 2 + CALENDAR_XSEP * 2
+ main_width = (7 * (private_data->min_day_width + DAY_XPAD * 2) + (DAY_XSEP * 6) + CALENDAR_MARGIN * 2
+ + (private_data->max_week_char_width
+ ? private_data->max_week_char_width * 2 + DAY_XPAD * 2 + CALENDAR_XSEP * 2
: 0));
- requisition->width = MAX (header_width, 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)
- calendar->header_h = (HEADER_FONT (widget)->ascent + HEADER_FONT (widget)->descent
- + CALENDAR_YSEP * 2);
+ {
+ private_data->header_h = (max_header_height + CALENDAR_YSEP * 2);
+ }
else
- calendar->header_h = 0;
-
+ {
+ private_data->header_h = 0;
+ }
if (calendar->display_flags & GTK_CALENDAR_SHOW_DAY_NAMES)
{
- calendar->day_name_h = (calendar->max_label_char_ascent
- + calendar->max_label_char_descent
- + 2 * DAY_YPAD + calendar_margin);
+ private_data->day_name_h = (private_data->max_label_char_ascent
+ + private_data->max_label_char_descent
+ + 2 * DAY_YPAD + calendar_margin);
calendar_margin = CALENDAR_YSEP;
}
else
- calendar->day_name_h = 0;
-
- gdk_text_extents (DAY_FONT (widget),
- "0123456789",
- 10,
- &lbearing,
- &rbearing,
- &width,
- &calendar->max_day_char_ascent,
- &calendar->max_day_char_descent);
-
- calendar->main_h = (CALENDAR_MARGIN + calendar_margin
- + 6 * (calendar->max_day_char_ascent
- + calendar->max_day_char_descent + DAY_YPAD * 2)
- + DAY_YSEP * 5);
+ {
+ private_data->day_name_h = 0;
+ }
+
+ private_data->main_h = (CALENDAR_MARGIN + calendar_margin
+ + 6 * (private_data->max_day_char_ascent
+ + private_data->max_day_char_descent
+ + DAY_YPAD * 2)
+ + DAY_YSEP * 5);
/*
* If we display weeknumbers we need some extra space
*/
if (calendar->display_flags & GTK_CALENDAR_SHOW_WEEK_NUMBERS)
- calendar->main_h = MAX (calendar->main_h,
- (CALENDAR_MARGIN + calendar_margin
- + 6 * (calendar->max_day_char_ascent
- + calendar->max_day_char_descent
- + DAY_YPAD * 2)
- + DAY_YSEP * 5));
+ {
+ private_data->main_h = MAX (private_data->main_h,
+ (CALENDAR_MARGIN + calendar_margin
+ + 6 * (private_data->max_day_char_ascent
+ + private_data->max_day_char_descent
+ + DAY_YPAD * 2)
+ + DAY_YSEP * 5));
+ }
- height = calendar->header_h + calendar->day_name_h + calendar->main_h;
+ 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
GtkAllocation *allocation)
{
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);
widget->allocation = *allocation;
calendar = GTK_CALENDAR (widget);
+ private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
if (calendar->display_flags & GTK_CALENDAR_SHOW_WEEK_NUMBERS)
{
- calendar->day_width = (calendar->min_day_width
- * ((allocation->width - (widget->style->klass->xthickness + INNER_BORDER) * 2
+ private_data->day_width = (private_data->min_day_width
+ * ((allocation->width - (widget->style->xthickness + INNER_BORDER) * 2
- (CALENDAR_MARGIN * 2) - (DAY_XSEP * 7) - CALENDAR_XSEP * 2))
- / (7 * calendar->min_day_width + calendar->max_week_char_width * 2));
- calendar->week_width = ((allocation->width - (widget->style->klass->xthickness + INNER_BORDER) * 2
+ / (7 * private_data->min_day_width + private_data->max_week_char_width * 2));
+ private_data->week_width = ((allocation->width - (widget->style->xthickness + INNER_BORDER) * 2
- (CALENDAR_MARGIN * 2) - (DAY_XSEP * 7) - CALENDAR_XSEP * 2 )
- - calendar->day_width * 7 + CALENDAR_MARGIN + CALENDAR_XSEP);
+ - private_data->day_width * 7 + CALENDAR_MARGIN + CALENDAR_XSEP);
}
else
{
- calendar->day_width = (allocation->width
- - (widget->style->klass->xthickness + INNER_BORDER) * 2
+ private_data->day_width = (allocation->width
+ - (widget->style->xthickness + INNER_BORDER) * 2
- (CALENDAR_MARGIN * 2)
- (DAY_XSEP * 7))/7;
- calendar->week_width = 0;
+ private_data->week_width = 0;
}
if (GTK_WIDGET_REALIZED (widget))
gdk_window_move_resize (widget->window,
allocation->x, allocation->y,
allocation->width, allocation->height);
- if (calendar->header_win)
- gdk_window_move_resize (calendar->header_win,
- 0, 0,
- allocation->width, calendar->header_h);
- if (calendar->arrow_win[ARROW_MONTH_LEFT])
- gdk_window_move_resize (calendar->arrow_win[ARROW_MONTH_LEFT],
+ if (private_data->header_win)
+ gdk_window_move_resize (private_data->header_win,
+ 2, 2,
+ allocation->width-4, private_data->header_h);
+ if (private_data->arrow_win[ARROW_MONTH_LEFT])
+ gdk_window_move_resize (private_data->arrow_win[ARROW_MONTH_LEFT],
3, 3,
- calendar->arrow_width,
- calendar->header_h - 7);
- if (calendar->arrow_win[ARROW_MONTH_RIGHT])
- gdk_window_move_resize (calendar->arrow_win[ARROW_MONTH_RIGHT],
- calendar->arrow_width + calendar->max_month_width, 3,
- calendar->arrow_width,
- calendar->header_h - 7);
- if (calendar->arrow_win[ARROW_YEAR_LEFT])
- gdk_window_move_resize (calendar->arrow_win[ARROW_YEAR_LEFT],
- allocation->width
- - (3 + 2*calendar->arrow_width + calendar->max_year_width),
+ private_data->arrow_width,
+ private_data->header_h - 7);
+ if (private_data->arrow_win[ARROW_MONTH_RIGHT])
+ gdk_window_move_resize (private_data->arrow_win[ARROW_MONTH_RIGHT],
+ (private_data->arrow_width
+ + private_data->max_month_width),
+ 3,
+ private_data->arrow_width,
+ private_data->header_h - 7);
+ if (private_data->arrow_win[ARROW_YEAR_LEFT])
+ gdk_window_move_resize (private_data->arrow_win[ARROW_YEAR_LEFT],
+ (allocation->width - 4
+ - (3 + 2*private_data->arrow_width
+ + private_data->max_year_width)),
3,
- calendar->arrow_width,
- calendar->header_h - 7);
- if (calendar->arrow_win[ARROW_YEAR_RIGHT])
- gdk_window_move_resize (calendar->arrow_win[ARROW_YEAR_RIGHT],
- allocation->width - 3 - calendar->arrow_width, 3,
- calendar->arrow_width,
- calendar->header_h - 7);
- if (calendar->day_name_win)
- gdk_window_move_resize (calendar->day_name_win,
- (widget->style->klass->xthickness + INNER_BORDER),
- calendar->header_h + (widget->style->klass->ythickness + INNER_BORDER),
- allocation->width - (widget->style->klass->xthickness + INNER_BORDER) * 2,
- calendar->day_name_h);
- if (calendar->week_win)
- gdk_window_move_resize (calendar->week_win,
- (widget->style->klass->xthickness + INNER_BORDER),
- calendar->header_h + calendar->day_name_h
- + (widget->style->klass->ythickness + INNER_BORDER),
- calendar->week_width,
- calendar->main_h);
- gdk_window_move_resize (calendar->main_win,
- (calendar->week_width ? calendar->week_width + CALENDAR_XSEP :0)
- + (widget->style->klass->xthickness + INNER_BORDER),
- calendar->header_h + calendar->day_name_h
- + (widget->style->klass->ythickness + INNER_BORDER),
+ private_data->arrow_width,
+ private_data->header_h - 7);
+ if (private_data->arrow_win[ARROW_YEAR_RIGHT])
+ gdk_window_move_resize (private_data->arrow_win[ARROW_YEAR_RIGHT],
+ (allocation->width - 4
+ - 3 - private_data->arrow_width),
+ 3,
+ private_data->arrow_width,
+ private_data->header_h - 7);
+ if (private_data->day_name_win)
+ gdk_window_move_resize (private_data->day_name_win,
+ widget->style->xthickness + INNER_BORDER,
+ private_data->header_h + (widget->style->ythickness + INNER_BORDER),
+ allocation->width - (widget->style->xthickness + INNER_BORDER) * 2,
+ private_data->day_name_h);
+ if (private_data->week_win)
+ gdk_window_move_resize (private_data->week_win,
+ (widget->style->xthickness + INNER_BORDER),
+ private_data->header_h + private_data->day_name_h
+ + (widget->style->ythickness + INNER_BORDER),
+ private_data->week_width,
+ private_data->main_h);
+ gdk_window_move_resize (private_data->main_win,
+ (private_data->week_width ? private_data->week_width + CALENDAR_XSEP :0)
+ + (widget->style->xthickness + INNER_BORDER),
+ private_data->header_h + private_data->day_name_h
+ + (widget->style->ythickness + INNER_BORDER),
allocation->width
- - (calendar->week_width ? calendar->week_width + CALENDAR_XSEP :0)
- - (widget->style->klass->xthickness + INNER_BORDER) * 2,
- calendar->main_h);
+ - (private_data->week_width ? private_data->week_width + CALENDAR_XSEP :0)
+ - (widget->style->xthickness + INNER_BORDER) * 2,
+ private_data->main_h);
}
}
static void
gtk_calendar_draw_focus (GtkWidget *widget)
{
+ GtkCalendar *calendar;
+ GtkCalendarPrivateData *private_data;
gint width, height;
gint x, y;
- GtkCalendar *calendar;
- 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);
if (GTK_WIDGET_DRAWABLE (widget))
{
gdk_window_get_size (widget->window, &width, &height);
gdk_window_clear (widget->window);
- if (calendar->display_flags & GTK_CALENDAR_SHOW_HEADING)
- {
- y += calendar->header_h;
- height -= calendar->header_h;
- }
-
- if (GTK_WIDGET_HAS_FOCUS (widget))
- {
- x += 1;
- y += 1;
- width -= 2;
- height -= 2;
- }
- else
- {
- gdk_draw_rectangle (widget->window,
- widget->style->base_gc[GTK_WIDGET_STATE (widget)],
- FALSE, x + 2, y + 2, width - 5, height - 5);
- }
+ gdk_draw_rectangle (widget->window,
+ widget->style->base_gc[GTK_WIDGET_STATE (widget)],
+ FALSE, x + 2, y + 2, width - 5, height - 5);
gtk_draw_shadow (widget->style, widget->window,
GTK_STATE_NORMAL, GTK_SHADOW_IN,
x, y, width, height);
- if (GTK_WIDGET_HAS_FOCUS (widget))
- {
- gdk_window_get_size (widget->window, &width, &height);
- gdk_draw_rectangle (widget->window, widget->style->fg_gc[GTK_STATE_NORMAL],
- FALSE, 0, 0, width - 1, height - 1);
- }
}
}
-static gint
+static gboolean
gtk_calendar_expose (GtkWidget *widget,
GdkEventExpose *event)
{
GtkCalendar *calendar;
-
+ GtkCalendarPrivateData *private_data;
+
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_CALENDAR (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
calendar = GTK_CALENDAR (widget);
+ private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
if (GTK_WIDGET_DRAWABLE (widget))
{
- if (event->window == calendar->main_win)
+ if (event->window == private_data->main_win)
gtk_calendar_paint_main (widget);
- if (event->window == calendar->header_win)
+ if (event->window == private_data->header_win)
gtk_calendar_paint_header (widget);
- if (event->window == calendar->day_name_win)
+ if (event->window == private_data->day_name_win)
gtk_calendar_paint_day_names (widget);
- if (event->window == calendar->week_win)
+ 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;
-
- g_return_if_fail (widget != NULL);
- g_return_if_fail (widget->window != NULL);
+ GtkCalendarPrivateData *private_data;
+
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 (calendar->main_win != NULL)
+ if (private_data->main_win != NULL)
gtk_calendar_paint_main (widget);
- if (calendar->header_win != NULL)
+ if (private_data->header_win != NULL)
gtk_calendar_paint_header (widget);
- if (calendar->day_name_win != NULL)
+ if (private_data->day_name_win != NULL)
gtk_calendar_paint_day_names (widget);
- if (calendar->week_win != NULL)
+ 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;
- gint cal_width, cal_height;
- gint str_width;
+ int x, y;
+ gint header_width, cal_height;
gint max_month_width;
gint max_year_width;
-
+ GtkCalendarPrivateData *private_data;
+ PangoLayout *layout;
+ PangoRectangle logical_rect;
+
calendar = GTK_CALENDAR (widget);
- if (calendar->frozen)
+ private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
+
+ if (private_data->freeze_count)
{
- calendar->dirty_header = 1;
+ private_data->dirty_header = 1;
return;
}
- calendar->dirty_header = 0;
+ private_data->dirty_header = 0;
gc = calendar->gc;
/* Clear window */
- gdk_window_clear (calendar->header_win);
+ gdk_window_clear (private_data->header_win);
- cal_width = widget->allocation.width;
+ header_width = widget->allocation.width - 4;
cal_height = widget->allocation.height;
- max_month_width = calendar->max_month_width;
- max_year_width = calendar->max_year_width;
+ max_month_width = private_data->max_month_width;
+ max_year_width = private_data->max_year_width;
gdk_gc_set_foreground (gc, BACKGROUND_COLOR (GTK_WIDGET (calendar)));
- gtk_draw_shadow (widget->style, calendar->header_win,
+ gtk_draw_shadow (widget->style, private_data->header_win,
GTK_STATE_NORMAL, GTK_SHADOW_OUT,
- 0, 0, cal_width, calendar->header_h);
+ 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 = calendar->header_h - (calendar->header_h - HEADER_FONT (widget)->ascent
- + HEADER_FONT (widget)->descent) / 2;
- y_arrow = (calendar->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 (calendar->header_win, HEADER_FONT (widget), gc,
- cal_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 (calendar->header_win, HEADER_FONT (widget), gc,
- cal_width - (3 + calendar->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 (calendar->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 (calendar->header_win, HEADER_FONT (widget), gc,
- 3 + calendar->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;
-
- g_return_if_fail (widget != NULL);
+ PangoLayout *layout;
+ PangoRectangle logical_rect;
+ GtkCalendarPrivateData *private_data;
+
g_return_if_fail (GTK_IS_CALENDAR (widget));
calendar = GTK_CALENDAR (widget);
+ private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
gc = calendar->gc;
/*
* Handle freeze/thaw functionality
*/
- if (calendar->frozen)
+ if (private_data->freeze_count)
{
- calendar->dirty_day_names = 1;
+ private_data->dirty_day_names = 1;
return;
}
- calendar->dirty_day_names = 0;
+ private_data->dirty_day_names = 0;
/*
* Clear the window
*/
- gdk_window_clear (calendar->day_name_win);
+ gdk_window_clear (private_data->day_name_win);
- day_width = calendar->day_width;
+ day_width = private_data->day_width;
cal_width = widget->allocation.width;
cal_height = widget->allocation.height;
day_wid_sep = day_width + DAY_XSEP;
* Draw rectangles as inverted background for the labels.
*/
- gdk_gc_set_foreground (gc, DAY_NAME_COLOR (GTK_WIDGET (calendar)));
- gdk_gc_set_background (gc, DAY_NAME_COLOR (GTK_WIDGET (calendar)));
- gdk_draw_rectangle (calendar->day_name_win, gc, TRUE,
+ gdk_gc_set_foreground (gc, &widget->style->bg[GTK_STATE_SELECTED]);
+ gdk_draw_rectangle (private_data->day_name_win, gc, TRUE,
CALENDAR_MARGIN, CALENDAR_MARGIN,
cal_width-CALENDAR_MARGIN * 2,
- calendar->day_name_h - CALENDAR_MARGIN);
-
+ private_data->day_name_h - CALENDAR_MARGIN);
if (calendar->display_flags & GTK_CALENDAR_SHOW_WEEK_NUMBERS)
- gdk_draw_rectangle (calendar->day_name_win, gc, TRUE,
+ gdk_draw_rectangle (private_data->day_name_win, gc, TRUE,
CALENDAR_MARGIN,
- calendar->day_name_h - CALENDAR_YSEP,
- calendar->week_width - CALENDAR_YSEP - CALENDAR_MARGIN,
+ private_data->day_name_h - CALENDAR_YSEP,
+ private_data->week_width - CALENDAR_YSEP - CALENDAR_MARGIN,
CALENDAR_YSEP);
/*
* Write the labels
*/
+
+ layout = gtk_widget_create_pango_layout (widget, NULL);
- gdk_gc_set_foreground (gc, BACKGROUND_COLOR ( GTK_WIDGET (calendar)));
+ 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 (calendar->day_name_win, LABEL_FONT (widget),
- gc,
- ((calendar->week_width ? CALENDAR_XSEP : CALENDAR_MARGIN)
+
+ 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
- + calendar->week_width
- + (day_width - str_width)/2),
- CALENDAR_MARGIN + DAY_YPAD
- + calendar->max_label_char_ascent, buffer);
+ + private_data->week_width
+ + (day_width - logical_rect.width)/2),
+ CALENDAR_MARGIN + DAY_YPAD + logical_rect.y,
+ layout);
}
+
+ g_object_unref (G_OBJECT (layout));
}
static void
{
GtkCalendar *calendar;
GdkGC *gc;
- gint row, week, year;
+ 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;
/*
* Handle freeze/thaw functionality
*/
- if (calendar->frozen)
+ if (private_data->freeze_count)
{
- calendar->dirty_week = 1;
+ private_data->dirty_week = 1;
return;
}
- calendar->dirty_week = 0;
+ private_data->dirty_week = 0;
/*
* Clear the window
*/
- gdk_window_clear (calendar->week_win);
+ gdk_window_clear (private_data->week_win);
/*
* Draw a rectangle as inverted background for the labels.
*/
- gdk_gc_set_foreground (gc, DAY_NAME_COLOR (GTK_WIDGET (calendar)));
- gdk_gc_set_background (gc, DAY_NAME_COLOR (GTK_WIDGET (calendar)));
- if (calendar->day_name_win)
- gdk_draw_rectangle (calendar->week_win, gc, TRUE,
+ gdk_gc_set_foreground (gc, &widget->style->bg[GTK_STATE_SELECTED]);
+ if (private_data->day_name_win)
+ gdk_draw_rectangle (private_data->week_win, gc, TRUE,
CALENDAR_MARGIN,
0,
- calendar->week_width - CALENDAR_MARGIN - CALENDAR_XSEP,
- calendar->main_h - CALENDAR_MARGIN);
+ private_data->week_width - CALENDAR_MARGIN - CALENDAR_XSEP,
+ private_data->main_h - CALENDAR_MARGIN);
else
- gdk_draw_rectangle (calendar->week_win, gc, TRUE,
+ gdk_draw_rectangle (private_data->week_win, gc, TRUE,
CALENDAR_MARGIN,
CALENDAR_MARGIN,
- calendar->week_width - CALENDAR_MARGIN - CALENDAR_XSEP,
- calendar->main_h - 2 * CALENDAR_MARGIN);
+ private_data->week_width - CALENDAR_MARGIN - CALENDAR_XSEP,
+ private_data->main_h - 2 * CALENDAR_MARGIN);
/*
* Write the labels
*/
- gdk_gc_set_foreground (gc, BACKGROUND_COLOR (GTK_WIDGET (calendar)));
+ 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= (calendar->week_width - (calendar->week_width - CALENDAR_XSEP
- - DAY_XPAD * 2 - CALENDAR_MARGIN ) / 2
- - calendar->max_week_char_width
- - CALENDAR_XSEP - DAY_XPAD);
-
- if (week > 9)
- {
- sprintf (buffer, "%d", week/10);
- gdk_draw_string (calendar->week_win, LABEL_FONT (widget), gc,
- x_loc, y_baseline , buffer);
- }
-
- sprintf (buffer, "%d", week%10);
- gdk_draw_string (calendar->week_win, LABEL_FONT (widget), gc,
- x_loc + calendar->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);
calendar = GTK_CALENDAR (widget);
-
+ private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
+
/*
* Handle freeze/thaw functionality
*/
- if (calendar->frozen)
+ if (private_data->freeze_count)
{
- calendar->dirty_main = 1;
+ private_data->dirty_main = 1;
return;
}
day_height = row_height (calendar);
- day_xspace = calendar->day_width - calendar->max_day_char_width*2;
+ day_xspace = private_data->day_width - private_data->max_day_char_width*2;
day = calendar->day[row][col];
x_left = left_x_for_column (calendar, col);
- x_loc = x_left + calendar->day_width / 2 + calendar->max_day_char_width;
+ 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 + calendar->max_day_char_ascent)/2;
- gdk_window_clear_area (calendar->main_win, x_left, y_top,
- calendar->day_width, day_height);
+ gdk_window_clear_area (private_data->main_win, x_left, y_top,
+ private_data->day_width, day_height);
gc = calendar->gc;
}
else
{
+ /*
if (calendar->highlight_row == row && calendar->highlight_col == col)
{
gdk_gc_set_foreground (gc, HIGHLIGHT_BACK_COLOR (GTK_WIDGET (calendar)));
- gdk_draw_rectangle (calendar->main_win, gc, TRUE, x_left, y_top,
- calendar->day_width, day_height);
+ gdk_draw_rectangle (private_data->main_win, gc, TRUE, x_left, y_top,
+ private_data->day_width, day_height);
}
-
+ */
if (calendar->selected_day == day)
{
- if (GTK_WIDGET_HAS_FOCUS (widget))
- gdk_gc_set_foreground (gc, SELECTION_FOCUS_COLOR (GTK_WIDGET (calendar)));
- else
- gdk_gc_set_foreground (gc, SELECTION_NO_FOCUS_COLOR (GTK_WIDGET (calendar)));
- gdk_draw_rectangle (calendar->main_win, gc, FALSE, x_left, y_top,
- calendar->day_width-1, day_height-1);
+ gdk_gc_set_foreground (gc, & (GTK_WIDGET (calendar)->style->bg[GTK_STATE_SELECTED]));
+ gdk_draw_rectangle (private_data->main_win, gc, TRUE, x_left, y_top,
+ private_data->day_width, day_height);
}
if (calendar->marked_date[day-1])
gdk_gc_set_foreground (gc, MARKED_COLOR (GTK_WIDGET (calendar)));
else
gdk_gc_set_foreground (gc, NORMAL_DAY_COLOR (GTK_WIDGET (calendar)));
- }
+ if (calendar->selected_day == day)
+ gdk_gc_set_foreground (gc, & (GTK_WIDGET (calendar)->style->fg[GTK_STATE_SELECTED]));
+ else
+ gdk_gc_set_foreground (gc, & (GTK_WIDGET (calendar)->style->fg[GTK_WIDGET_STATE (calendar)]));
+ }
+
+
sprintf (buffer, "%d", day);
- x_loc -= gdk_string_measure (DAY_FONT (widget), buffer);
- sprintf (buffer, "%d", day);
- gdk_draw_string (calendar->main_win,
- DAY_FONT (widget), gc,
- x_loc, y_baseline, buffer);
- if (calendar->marked_date[day-1])
- gdk_draw_string (calendar->main_win,
- DAY_FONT (widget), gc,
- x_loc-1, 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_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)
+ {
+ gdk_draw_rectangle (private_data->main_win, calendar->xor_gc,
+ FALSE, x_left, y_top,
+ private_data->day_width-1, day_height-1);
+ }
+
+ g_object_unref (G_OBJECT (layout));
}
gtk_calendar_paint_main (GtkWidget *widget)
{
GtkCalendar *calendar;
+ 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);
- if (calendar->frozen)
+ private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
+
+ if (private_data->freeze_count)
{
- calendar->dirty_main = 1;
+ private_data->dirty_main = 1;
return;
}
- calendar->dirty_main = 0;
- gdk_window_clear (calendar->main_win);
+ private_data->dirty_main = 0;
+ gdk_window_clear (private_data->main_win);
/* gtk_calendar_compute_days (calendar); */ /* REMOVE later */
gint col;
gint day;
- g_return_if_fail (calendar != NULL);
g_return_if_fail (GTK_IS_CALENDAR (calendar));
year = calendar->year;
gtk_calendar_display_options (GtkCalendar *calendar,
GtkCalendarDisplayOptions flags)
{
+ GtkCalendarPrivateData *private_data;
gint resize = 0;
GtkWidget *widget;
gint i;
- g_return_if_fail (calendar != NULL);
g_return_if_fail (GTK_IS_CALENDAR (calendar));
widget = GTK_WIDGET (calendar);
+ private_data = GTK_CALENDAR_PRIVATE_DATA (calendar);
if (GTK_WIDGET_REALIZED (widget))
{
{
resize ++;
if (! (flags & GTK_CALENDAR_NO_MONTH_CHANGE)
- && (calendar->header_win))
+ && (private_data->header_win))
{
calendar->display_flags &= ~GTK_CALENDAR_NO_MONTH_CHANGE;
gtk_calendar_realize_arrows (widget);
}
else
{
- for (i=0; i<4; i++)
- if (calendar->arrow_win[i])
- {
- gdk_window_set_user_data (calendar->arrow_win[i], NULL);
- gdk_window_destroy (calendar->arrow_win[i]);
- calendar->arrow_win[i] = NULL;
- }
+ for (i = 0; i < 4; i++)
+ {
+ if (private_data->arrow_win[i])
+ {
+ gdk_window_set_user_data (private_data->arrow_win[i],
+ NULL);
+ gdk_window_destroy (private_data->arrow_win[i]);
+ private_data->arrow_win[i] = NULL;
+ }
+ }
}
}
}
else
{
- for (i=0; i<4; i++)
- if (calendar->arrow_win[i])
- {
- gdk_window_set_user_data (calendar->arrow_win[i], NULL);
- gdk_window_destroy (calendar->arrow_win[i]);
- calendar->arrow_win[i] = NULL;
- }
- gdk_window_set_user_data (calendar->header_win, NULL);
- gdk_window_destroy (calendar->header_win);
- calendar->header_win = NULL;
+ for (i = 0; i < 4; i++)
+ {
+ if (private_data->arrow_win[i])
+ {
+ gdk_window_set_user_data (private_data->arrow_win[i],
+ NULL);
+ gdk_window_destroy (private_data->arrow_win[i]);
+ private_data->arrow_win[i] = NULL;
+ }
+ }
+ gdk_window_set_user_data (private_data->header_win, NULL);
+ gdk_window_destroy (private_data->header_win);
+ private_data->header_win = NULL;
}
}
}
else
{
- gdk_window_set_user_data (calendar->day_name_win, NULL);
- gdk_window_destroy (calendar->day_name_win);
- calendar->day_name_win = NULL;
+ 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;
}
}
}
else
{
- gdk_window_set_user_data (calendar->week_win, NULL);
- gdk_window_destroy (calendar->week_win);
- calendar->week_win = NULL;
+ gdk_window_set_user_data (private_data->week_win, NULL);
+ gdk_window_destroy (private_data->week_win);
+ private_data->week_win = NULL;
}
}
gtk_calendar_compute_days (calendar);
gtk_calendar_paint_main (GTK_WIDGET (calendar));
- if (calendar->day_name_win)
+ if (private_data->day_name_win)
gtk_calendar_paint_day_names (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);
g_return_val_if_fail (event != NULL, FALSE);
calendar = GTK_CALENDAR (widget);
+ private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
x = (gint) (event->x);
y = (gint) (event->y);
- if (event->window == calendar->arrow_win[ARROW_MONTH_LEFT])
- gtk_calendar_set_month_prev (calendar);
-
- if (event->window == calendar->arrow_win[ARROW_MONTH_RIGHT])
- gtk_calendar_set_month_next (calendar);
-
- if (event->window == calendar->arrow_win[ARROW_YEAR_LEFT])
- gtk_calendar_set_year_prev (calendar);
-
- if (event->window == calendar->arrow_win[ARROW_YEAR_RIGHT])
- gtk_calendar_set_year_next (calendar);
-
- if (event->window == calendar->main_win)
+ if (event->window == private_data->main_win)
gtk_calendar_main_button (widget, event);
+
+ action_func = NULL;
+
+ if (event->window == private_data->arrow_win[ARROW_MONTH_LEFT])
+ action_func = gtk_calendar_set_month_prev;
+ else if (event->window == private_data->arrow_win[ARROW_MONTH_RIGHT])
+ action_func = gtk_calendar_set_month_next;
+ else if (event->window == private_data->arrow_win[ARROW_YEAR_LEFT])
+ action_func = gtk_calendar_set_year_prev;
+ else if (event->window == private_data->arrow_win[ARROW_YEAR_RIGHT])
+ action_func = gtk_calendar_set_year_next;
+
+ /* 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)
{
GtkCalendar *calendar;
+ GtkCalendarPrivateData *private_data;
gint event_x, event_y;
gint row, col;
gint old_row, old_col;
- calendar = (GtkCalendar*) widget;
+ calendar = GTK_CALENDAR (widget);
+ private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
event_x = (gint) (event->x);
event_y = (gint) (event->y);
- if (event->window == calendar->main_win)
+ if (event->window == private_data->main_win)
{
row = row_from_y (calendar, event_y);
return TRUE;
}
-static gint
+static gboolean
gtk_calendar_enter_notify (GtkWidget *widget,
GdkEventCrossing *event)
{
GtkCalendar *calendar;
+ GtkCalendarPrivateData *private_data;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (event != NULL, FALSE);
calendar = GTK_CALENDAR (widget);
+ private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
- if (event->window == calendar->arrow_win[ARROW_MONTH_LEFT])
+ if (event->window == private_data->arrow_win[ARROW_MONTH_LEFT])
{
- calendar->arrow_state[ARROW_MONTH_LEFT] = GTK_STATE_PRELIGHT;
+ private_data->arrow_state[ARROW_MONTH_LEFT] = GTK_STATE_PRELIGHT;
gtk_calendar_paint_arrow (widget, ARROW_MONTH_LEFT);
}
- if (event->window == calendar->arrow_win[ARROW_MONTH_RIGHT])
+ if (event->window == private_data->arrow_win[ARROW_MONTH_RIGHT])
{
- calendar->arrow_state[ARROW_MONTH_RIGHT] = GTK_STATE_PRELIGHT;
+ private_data->arrow_state[ARROW_MONTH_RIGHT] = GTK_STATE_PRELIGHT;
gtk_calendar_paint_arrow (widget, ARROW_MONTH_RIGHT);
}
- if (event->window == calendar->arrow_win[ARROW_YEAR_LEFT])
+ if (event->window == private_data->arrow_win[ARROW_YEAR_LEFT])
{
- calendar->arrow_state[ARROW_YEAR_LEFT] = GTK_STATE_PRELIGHT;
+ private_data->arrow_state[ARROW_YEAR_LEFT] = GTK_STATE_PRELIGHT;
gtk_calendar_paint_arrow (widget, ARROW_YEAR_LEFT);
}
- if (event->window == calendar->arrow_win[ARROW_YEAR_RIGHT])
+ if (event->window == private_data->arrow_win[ARROW_YEAR_RIGHT])
{
- calendar->arrow_state[ARROW_YEAR_RIGHT] = GTK_STATE_PRELIGHT;
+ private_data->arrow_state[ARROW_YEAR_RIGHT] = GTK_STATE_PRELIGHT;
gtk_calendar_paint_arrow (widget, ARROW_YEAR_RIGHT);
}
return TRUE;
}
-static gint
+static gboolean
gtk_calendar_leave_notify (GtkWidget *widget,
GdkEventCrossing *event)
{
GtkCalendar *calendar;
+ GtkCalendarPrivateData *private_data;
gint row;
gint col;
g_return_val_if_fail (event != NULL, FALSE);
calendar = GTK_CALENDAR (widget);
+ private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
- if (event->window == calendar->main_win)
+ if (event->window == private_data->main_win)
{
row = calendar->highlight_row;
col = calendar->highlight_col;
gtk_calendar_paint_day (widget, row, col);
}
- if (event->window == calendar->arrow_win[ARROW_MONTH_LEFT])
+ if (event->window == private_data->arrow_win[ARROW_MONTH_LEFT])
{
- calendar->arrow_state[ARROW_MONTH_LEFT] = GTK_STATE_NORMAL;
+ private_data->arrow_state[ARROW_MONTH_LEFT] = GTK_STATE_NORMAL;
gtk_calendar_paint_arrow (widget, ARROW_MONTH_LEFT);
}
- if (event->window == calendar->arrow_win[ARROW_MONTH_RIGHT])
+ if (event->window == private_data->arrow_win[ARROW_MONTH_RIGHT])
{
- calendar->arrow_state[ARROW_MONTH_RIGHT] = GTK_STATE_NORMAL;
+ private_data->arrow_state[ARROW_MONTH_RIGHT] = GTK_STATE_NORMAL;
gtk_calendar_paint_arrow (widget, ARROW_MONTH_RIGHT);
}
- if (event->window == calendar->arrow_win[ARROW_YEAR_LEFT])
+ if (event->window == private_data->arrow_win[ARROW_YEAR_LEFT])
{
- calendar->arrow_state[ARROW_YEAR_LEFT] = GTK_STATE_NORMAL;
+ private_data->arrow_state[ARROW_YEAR_LEFT] = GTK_STATE_NORMAL;
gtk_calendar_paint_arrow (widget, ARROW_YEAR_LEFT);
}
- if (event->window == calendar->arrow_win[ARROW_YEAR_RIGHT])
+ if (event->window == private_data->arrow_win[ARROW_YEAR_RIGHT])
{
- calendar->arrow_state[ARROW_YEAR_RIGHT] = GTK_STATE_NORMAL;
+ private_data->arrow_state[ARROW_YEAR_RIGHT] = GTK_STATE_NORMAL;
gtk_calendar_paint_arrow (widget, ARROW_YEAR_RIGHT);
}
gtk_calendar_paint_arrow (GtkWidget *widget,
guint arrow)
{
+ GtkCalendarPrivateData *private_data;
GdkWindow *window;
GdkGC *gc;
GtkCalendar *calendar;
g_return_if_fail (widget != NULL);
calendar = GTK_CALENDAR (widget);
- if (calendar->frozen)
+ private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
+
+ if (private_data->freeze_count)
{
- calendar->dirty_header = 1;
+ private_data->dirty_header = 1;
return;
}
- window = calendar->arrow_win[arrow];
+ window = private_data->arrow_win[arrow];
if (window)
{
- state = calendar->arrow_state[arrow];
+ state = private_data->arrow_state[arrow];
gc = calendar->gc;
gdk_window_clear (window);
void
gtk_calendar_freeze (GtkCalendar *calendar)
{
- g_return_if_fail (calendar != NULL);
g_return_if_fail (GTK_IS_CALENDAR (calendar));
- calendar->frozen++;
+ GTK_CALENDAR_PRIVATE_DATA (calendar)->freeze_count++;
}
void
gtk_calendar_thaw (GtkCalendar *calendar)
{
- g_return_if_fail (calendar != NULL);
+ GtkCalendarPrivateData *private_data;
+
g_return_if_fail (GTK_IS_CALENDAR (calendar));
- if (calendar->frozen)
- {
- calendar->frozen--;
- if (calendar->frozen)
- return;
-
- if (calendar->dirty_header)
- if (GTK_WIDGET_DRAWABLE (calendar))
- gtk_calendar_paint_header (GTK_WIDGET (calendar));
-
- if (calendar->dirty_day_names)
- if (GTK_WIDGET_DRAWABLE (calendar))
- gtk_calendar_paint_day_names (GTK_WIDGET (calendar));
-
- if (calendar->dirty_week)
- if (GTK_WIDGET_DRAWABLE (calendar))
- gtk_calendar_paint_week_numbers (GTK_WIDGET (calendar));
-
- if (calendar->dirty_main)
- if (GTK_WIDGET_DRAWABLE (calendar))
- gtk_calendar_paint_main (GTK_WIDGET (calendar));
- }
+ private_data = GTK_CALENDAR_PRIVATE_DATA (calendar);
+
+ if (private_data->freeze_count)
+ if (!(--private_data->freeze_count))
+ {
+ if (private_data->dirty_header)
+ if (GTK_WIDGET_DRAWABLE (calendar))
+ gtk_calendar_paint_header (GTK_WIDGET (calendar));
+
+ if (private_data->dirty_day_names)
+ if (GTK_WIDGET_DRAWABLE (calendar))
+ gtk_calendar_paint_day_names (GTK_WIDGET (calendar));
+
+ if (private_data->dirty_week)
+ if (GTK_WIDGET_DRAWABLE (calendar))
+ gtk_calendar_paint_week_numbers (GTK_WIDGET (calendar));
+
+ if (private_data->dirty_main)
+ if (GTK_WIDGET_DRAWABLE (calendar))
+ gtk_calendar_paint_main (GTK_WIDGET (calendar));
+ }
}
static void
gtk_calendar_set_background (GtkWidget *widget)
{
GtkCalendar *calendar;
+ GtkCalendarPrivateData *private_data;
gint i;
- 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);
+
if (GTK_WIDGET_REALIZED (widget))
{
- calendar = GTK_CALENDAR (widget);
- for (i=0; i<4; i++)
- if (calendar->arrow_win[i])
- gdk_window_set_background (calendar->arrow_win[i], HEADER_BG_COLOR (widget));
- if (calendar->header_win)
- gdk_window_set_background (calendar->header_win, HEADER_BG_COLOR (widget));
- if (calendar->day_name_win)
- gdk_window_set_background (calendar->day_name_win, BACKGROUND_COLOR (widget));
- if (calendar->week_win)
- gdk_window_set_background (calendar->week_win, BACKGROUND_COLOR (widget));
- if (calendar->main_win)
- gdk_window_set_background (calendar->main_win, BACKGROUND_COLOR (widget));
+ for (i = 0; i < 4; i++)
+ {
+ if (private_data->arrow_win[i])
+ gdk_window_set_background (private_data->arrow_win[i],
+ HEADER_BG_COLOR (widget));
+ }
+ if (private_data->header_win)
+ gdk_window_set_background (private_data->header_win,
+ HEADER_BG_COLOR (widget));
+ if (private_data->day_name_win)
+ gdk_window_set_background (private_data->day_name_win,
+ BACKGROUND_COLOR (widget));
+ if (private_data->week_win)
+ gdk_window_set_background (private_data->week_win,
+ BACKGROUND_COLOR (widget));
+ if (private_data->main_win)
+ gdk_window_set_background (private_data->main_win,
+ BACKGROUND_COLOR (widget));
if (widget->window)
- gdk_window_set_background (widget->window, BACKGROUND_COLOR (widget));
+ gdk_window_set_background (widget->window,
+ BACKGROUND_COLOR (widget));
}
- if (GTK_WIDGET_DRAWABLE (widget))
- gdk_window_clear (widget->window);
}
static void
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)
+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_SET_FLAGS (widget, GTK_HAS_FOCUS);
- gtk_widget_draw_focus (widget);
- gtk_calendar_paint_day_num (widget, calendar->selected_day);
-#undef USE_XIM
-#ifdef USE_XIM
- if (GTK_EDITABLE(widget)->ic)
- gdk_im_begin (GTK_EDITABLE(widget)->ic, GTK_ENTRY(widget)->text_area);
-#endif
-
- 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
-gtk_calendar_focus_out (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_UNSET_FLAGS (widget, GTK_HAS_FOCUS);
- gtk_widget_draw_focus (widget);
- gtk_calendar_paint_day_num (widget, calendar->selected_day);
-#ifdef USE_XIM
- gdk_im_end ();
-#endif
-
- return FALSE;
-}
-
-static gint
+static gboolean
gtk_calendar_key_press (GtkWidget *widget,
GdkEventKey *event)
{
GtkCalendar *calendar;
gint return_val;
-
+ gint old_focus_row;
+ gint old_focus_col;
+ gint row, col, day;
+
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);
return_val = FALSE;
+ old_focus_row = calendar->focus_row;
+ old_focus_col = calendar->focus_col;
+
switch (event->keyval)
{
+ case GDK_KP_Left:
case GDK_Left:
return_val = TRUE;
if (event->state & GDK_CONTROL_MASK)
- gtk_calendar_set_month_prev (calendar);
+ {
+ gtk_calendar_set_month_prev (calendar);
+ }
else
{
- if (calendar->selected_day == 1)
+ if (calendar->focus_col > 0)
{
- if (calendar->display_flags & GTK_CALENDAR_NO_MONTH_CHANGE)
- {
- gtk_calendar_select_day (calendar, month_length[leap (calendar->year)][calendar->month + 1]);
- }
- else
- {
- calendar->selected_day = -1;
- gtk_calendar_set_month_prev (calendar);
- }
+ calendar->focus_col--;
}
- else
- gtk_calendar_select_day (calendar, calendar->selected_day - 1);
+ else if (calendar->focus_row > 0)
+ {
+ calendar->focus_col = 6;
+ calendar->focus_row--;
+ }
+ gtk_calendar_paint_day (widget, old_focus_row, old_focus_col);
+ gtk_calendar_paint_day (widget, calendar->focus_row,
+ calendar->focus_col);
}
break;
+ case GDK_KP_Right:
case GDK_Right:
return_val = TRUE;
if (event->state & GDK_CONTROL_MASK)
+ {
gtk_calendar_set_month_next (calendar);
+ }
else
{
- if (calendar->selected_day == month_length[leap (calendar->year)][calendar->month + 1])
+ if (calendar->focus_col < 6)
{
- if (calendar->display_flags & GTK_CALENDAR_NO_MONTH_CHANGE)
- {
- gtk_calendar_select_day (calendar, 1);
- }
- else
- {
- calendar->selected_day = 1;
- gtk_calendar_set_month_next (calendar);
- }
+ calendar->focus_col++;
}
- else
- gtk_calendar_select_day (calendar, calendar->selected_day + 1);
+ else if (calendar->focus_row < 5)
+ {
+ calendar->focus_col = 0;
+ calendar->focus_row++;
+ }
+ gtk_calendar_paint_day (widget, old_focus_row, old_focus_col);
+ gtk_calendar_paint_day (widget, calendar->focus_row,
+ calendar->focus_col);
}
break;
+ case GDK_KP_Up:
case GDK_Up:
return_val = TRUE;
if (event->state & GDK_CONTROL_MASK)
- gtk_calendar_set_year_prev (calendar);
+ {
+ gtk_calendar_set_year_prev (calendar);
+ }
else
{
- gint overlap;
- overlap = calendar->selected_day - 7;
- if (overlap < 1)
+ if (calendar->focus_row > 0)
{
- if (calendar->display_flags & GTK_CALENDAR_NO_MONTH_CHANGE)
- {
- gint month_len;
- month_len = month_length[leap (calendar->year)][calendar->month + 1];
- gtk_calendar_select_day (calendar, month_len - (month_len - (month_len / 7) * 7 - overlap)%7);
- }
- else
- {
- calendar->selected_day = overlap - 1;
- gtk_calendar_set_month_prev (calendar);
- }
+ calendar->focus_row--;
}
- else
- gtk_calendar_select_day (calendar, calendar->selected_day - 7);
+ gtk_calendar_paint_day (widget, old_focus_row, old_focus_col);
+ gtk_calendar_paint_day (widget, calendar->focus_row,
+ calendar->focus_col);
}
break;
+ case GDK_KP_Down:
case GDK_Down:
return_val = TRUE;
if (event->state & GDK_CONTROL_MASK)
- gtk_calendar_set_year_next (calendar);
+ {
+ gtk_calendar_set_year_next (calendar);
+ }
else
{
- gint month_len;
- gint overlap;
- month_len = month_length[leap (calendar->year)][calendar->month + 1];
- overlap = (calendar->selected_day + 7 - month_len);
- if (overlap > 0)
+ if (calendar->focus_row < 5)
{
- if (calendar->display_flags & GTK_CALENDAR_NO_MONTH_CHANGE)
- {
- gtk_calendar_select_day (calendar, (month_len - 1 - (month_len / 7) * 7
- + overlap) % 7 + 1);
- }
- else
- {
- calendar->selected_day = overlap;
- gtk_calendar_set_month_next (calendar);
- }
+ calendar->focus_row++;
}
- else
- gtk_calendar_select_day (calendar, calendar->selected_day + 7);
+ gtk_calendar_paint_day (widget, old_focus_row, old_focus_col);
+ gtk_calendar_paint_day (widget, calendar->focus_row,
+ calendar->focus_col);
}
break;
+ case GDK_KP_Space:
+ case GDK_space:
+ row = calendar->focus_row;
+ col = calendar->focus_col;
+ day = calendar->day[row][col];
+
+ if (row > -1 && col > -1)
+ {
+ return_val = TRUE;
+ gtk_calendar_freeze (calendar);
+
+ if (calendar->day_month[row][col] == MONTH_PREV)
+ {
+ gtk_calendar_set_month_prev (calendar);
+ }
+ else if (calendar->day_month[row][col] == MONTH_NEXT)
+ {
+ gtk_calendar_set_month_next (calendar);
+ }
+
+ gtk_calendar_select_day (calendar, day);
+
+ for (row = 0; row < 6; row ++)
+ for (col = 0; col < 7; col++)
+ {
+ if (calendar->day_month[row][col] == MONTH_CURRENT
+ && calendar->day[row][col] == day)
+ {
+ calendar->focus_row = row;
+ calendar->focus_col = col;
+ }
+ }
+ gtk_calendar_thaw (calendar);
+ }
}
return return_val;
projects / ~andy / gtk / blobdiff