interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

uiDateTimePicker Use 'uipriv' convention

This commit is contained in:
cody271 2018-05-05 21:28:19 -07:00
parent edd4127f8e
commit f3d0fee21a
2 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
darwin/datetimepicker.m
View File

@ -8,7 +8,7 @@ struct uiDateTimePicker {
void *onChangedData; void *onChangedData;
}; };
@interface datePickerDelegateClass : NSObject <NSDatePickerCellDelegate> { @interface uiprivDatePickerDelegateClass : NSObject <NSDatePickerCellDelegate> {
struct mapTable *pickers; struct mapTable *pickers;
} }
- (void)datePickerCell:(NSDatePickerCell *)aDatePickerCell validateProposedDateValue:(NSDate **)proposedDateValue timeInterval:(NSTimeInterval *)proposedTimeInterval; - (void)datePickerCell:(NSDatePickerCell *)aDatePickerCell validateProposedDateValue:(NSDate **)proposedDateValue timeInterval:(NSTimeInterval *)proposedTimeInterval;
@ -17,7 +17,7 @@ struct uiDateTimePicker {
- (void)unregisterPicker:(uiDateTimePicker *)b; - (void)unregisterPicker:(uiDateTimePicker *)b;
@end @end
@implementation datePickerDelegateClass @implementation uiprivDatePickerDelegateClass
- (id)init - (id)init
{ {
@ -69,7 +69,7 @@ struct uiDateTimePicker {
@end @end
static datePickerDelegateClass *datePickerDelegate = nil; static uiprivDatePickerDelegateClass *datePickerDelegate = nil;
uiDarwinControlAllDefaults(uiDateTimePicker, dp) uiDarwinControlAllDefaults(uiDateTimePicker, dp)
@ -125,7 +125,7 @@ static uiDateTimePicker *finishNewDateTimePicker(NSDatePickerElementFlags elemen
uiDarwinSetControlFont(d->dp, NSRegularControlSize); uiDarwinSetControlFont(d->dp, NSRegularControlSize);
if (datePickerDelegate == nil) { if (datePickerDelegate == nil) {
datePickerDelegate = [[datePickerDelegateClass new] autorelease]; datePickerDelegate = [[uiprivDatePickerDelegateClass new] autorelease];
[delegates addObject:datePickerDelegate]; [delegates addObject:datePickerDelegate];
} }
[datePickerDelegate registerPicker:d]; [datePickerDelegate registerPicker:d];

102
unix/datetimepicker.c
View File

@ -4,17 +4,17 @@
// LONGTERM imitate gnome-calendar's day/month/year entries above the calendar // LONGTERM imitate gnome-calendar's day/month/year entries above the calendar
// LONGTERM allow entering a 24-hour hour in the hour spinbutton and adjust accordingly // LONGTERM allow entering a 24-hour hour in the hour spinbutton and adjust accordingly
#define dateTimePickerWidgetType (dateTimePickerWidget_get_type()) #define uiprivDateTimePickerWidgetType (uiprivDateTimePickerWidget_get_type())
#define dateTimePickerWidget(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), dateTimePickerWidgetType, dateTimePickerWidget)) #define uiprivDateTimePickerWidget(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), uiprivDateTimePickerWidgetType, uiprivDateTimePickerWidget))
#define isDateTimePickerWidget(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), dateTimePickerWidgetType)) #define isDateTimePickerWidget(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), uiprivDateTimePickerWidgetType))
#define dateTimePickerWidgetClass(class) (G_TYPE_CHECK_CLASS_CAST((class), dateTimePickerWidgetType, dateTimePickerWidgetClass)) #define uiprivDateTimePickerWidgetClass(class) (G_TYPE_CHECK_CLASS_CAST((class), uiprivDateTimePickerWidgetType, uiprivDateTimePickerWidgetClass))
#define isDateTimePickerWidgetClass(class) (G_TYPE_CHECK_CLASS_TYPE((class), dateTimePickerWidget)) #define isDateTimePickerWidgetClass(class) (G_TYPE_CHECK_CLASS_TYPE((class), uiprivDateTimePickerWidget))
#define getDateTimePickerWidgetClass(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), dateTimePickerWidgetType, dateTimePickerWidgetClass)) #define getDateTimePickerWidgetClass(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), uiprivDateTimePickerWidgetType, uiprivDateTimePickerWidgetClass))
typedef struct dateTimePickerWidget dateTimePickerWidget; typedef struct uiprivDateTimePickerWidget uiprivDateTimePickerWidget;
typedef struct dateTimePickerWidgetClass dateTimePickerWidgetClass; typedef struct uiprivDateTimePickerWidgetClass uiprivDateTimePickerWidgetClass;
struct dateTimePickerWidget { struct uiprivDateTimePickerWidget {
GtkToggleButton parent_instance; GtkToggleButton parent_instance;
gulong toggledSignal; gulong toggledSignal;
@ -40,11 +40,11 @@ struct dateTimePickerWidget {
GdkDevice *mouse; GdkDevice *mouse;
}; };
struct dateTimePickerWidgetClass { struct uiprivDateTimePickerWidgetClass {
GtkToggleButtonClass parent_class; GtkToggleButtonClass parent_class;
}; };
G_DEFINE_TYPE(dateTimePickerWidget, dateTimePickerWidget, GTK_TYPE_TOGGLE_BUTTON) G_DEFINE_TYPE(uiprivDateTimePickerWidget, uiprivDateTimePickerWidget, GTK_TYPE_TOGGLE_BUTTON)
static int realSpinValue(GtkSpinButton *spinButton) static int realSpinValue(GtkSpinButton *spinButton)
{ {
@ -64,7 +64,7 @@ static void setRealSpinValue(GtkSpinButton *spinButton, int value, gulong block)
g_signal_handler_unblock(spinButton, block); g_signal_handler_unblock(spinButton, block);
} }
static GDateTime *selected(dateTimePickerWidget *d) static GDateTime *selected(uiprivDateTimePickerWidget *d)
{ {
// choose a day for which all times are likely to be valid for the default date in case we're only dealing with time // choose a day for which all times are likely to be valid for the default date in case we're only dealing with time
guint year = 1970, month = 1, day = 1; guint year = 1970, month = 1, day = 1;
@ -84,7 +84,7 @@ static GDateTime *selected(dateTimePickerWidget *d)
return g_date_time_new_local(year, month, day, hour, minute, second); return g_date_time_new_local(year, month, day, hour, minute, second);
} }
static void setLabel(dateTimePickerWidget *d) static void setLabel(uiprivDateTimePickerWidget *d)
{ {
GDateTime *dt; GDateTime *dt;
char *fmt; char *fmt;
@ -111,14 +111,14 @@ static void setLabel(dateTimePickerWidget *d)
static int changedSignal; static int changedSignal;
static void dateTimeChanged(dateTimePickerWidget *d) static void dateTimeChanged(uiprivDateTimePickerWidget *d)
{ {
g_signal_emit(d, changedSignal, 0); g_signal_emit(d, changedSignal, 0);
setLabel(d); setLabel(d);
} }
// we don't want ::toggled to be sent again // we don't want ::toggled to be sent again
static void setActive(dateTimePickerWidget *d, gboolean active) static void setActive(uiprivDateTimePickerWidget *d, gboolean active)
{ {
g_signal_handler_block(d, d->toggledSignal); g_signal_handler_block(d, d->toggledSignal);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(d), active); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(d), active);
@ -126,7 +126,7 @@ static void setActive(dateTimePickerWidget *d, gboolean active)
} }
// like startGrab() below, a lot of this is in the order that GtkComboBox does it // like startGrab() below, a lot of this is in the order that GtkComboBox does it
static void endGrab(dateTimePickerWidget *d) static void endGrab(uiprivDateTimePickerWidget *d)
{ {
if (d->keyboard != NULL) if (d->keyboard != NULL)
gdk_device_ungrab(d->keyboard, GDK_CURRENT_TIME); gdk_device_ungrab(d->keyboard, GDK_CURRENT_TIME);
@ -136,7 +136,7 @@ static void endGrab(dateTimePickerWidget *d)
d->mouse = NULL; d->mouse = NULL;
} }
static void hidePopup(dateTimePickerWidget *d) static void hidePopup(uiprivDateTimePickerWidget *d)
{ {
endGrab(d); endGrab(d);
gtk_widget_hide(d->window); gtk_widget_hide(d->window);
@ -144,7 +144,7 @@ static void hidePopup(dateTimePickerWidget *d)
} }
// this consolidates a good chunk of what GtkComboBox does // this consolidates a good chunk of what GtkComboBox does
static gboolean startGrab(dateTimePickerWidget *d) static gboolean startGrab(uiprivDateTimePickerWidget *d)
{ {
GdkDevice *dev; GdkDevice *dev;
guint32 time; guint32 time;
@ -199,7 +199,7 @@ static gboolean startGrab(dateTimePickerWidget *d)
} }
// based on gtk_combo_box_list_position() in the GTK+ source code // based on gtk_combo_box_list_position() in the GTK+ source code
static void allocationToScreen(dateTimePickerWidget *d, gint *x, gint *y) static void allocationToScreen(uiprivDateTimePickerWidget *d, gint *x, gint *y)
{ {
GdkWindow *window; GdkWindow *window;
GtkAllocation a; GtkAllocation a;
@ -239,7 +239,7 @@ static void allocationToScreen(dateTimePickerWidget *d, gint *x, gint *y)
*y = otherY; *y = otherY;
} }
static void showPopup(dateTimePickerWidget *d) static void showPopup(uiprivDateTimePickerWidget *d)
{ {
GtkWidget *toplevel; GtkWidget *toplevel;
gint x, y; gint x, y;
@ -261,7 +261,7 @@ static void showPopup(dateTimePickerWidget *d)
static void onToggled(GtkToggleButton *b, gpointer data) static void onToggled(GtkToggleButton *b, gpointer data)
{ {
dateTimePickerWidget *d = dateTimePickerWidget(b); uiprivDateTimePickerWidget *d = uiprivDateTimePickerWidget(b);
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(d))) if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(d)))
showPopup(d); showPopup(d);
@ -271,7 +271,7 @@ static void onToggled(GtkToggleButton *b, gpointer data)
static gboolean grabBroken(GtkWidget *w, GdkEventGrabBroken *e, gpointer data) static gboolean grabBroken(GtkWidget *w, GdkEventGrabBroken *e, gpointer data)
{ {
dateTimePickerWidget *d = dateTimePickerWidget(data); uiprivDateTimePickerWidget *d = uiprivDateTimePickerWidget(data);
hidePopup(d); hidePopup(d);
return TRUE; // this is what GtkComboBox does return TRUE; // this is what GtkComboBox does
@ -279,7 +279,7 @@ static gboolean grabBroken(GtkWidget *w, GdkEventGrabBroken *e, gpointer data)
static gboolean buttonReleased(GtkWidget *w, GdkEventButton *e, gpointer data) static gboolean buttonReleased(GtkWidget *w, GdkEventButton *e, gpointer data)
{ {
dateTimePickerWidget *d = dateTimePickerWidget(data); uiprivDateTimePickerWidget *d = uiprivDateTimePickerWidget(data);
int winx, winy; int winx, winy;
GtkAllocation wina; GtkAllocation wina;
gboolean in; gboolean in;
@ -384,12 +384,12 @@ static gboolean ampmSpinboxOutput(GtkSpinButton *sb, gpointer data)
static void spinboxChanged(GtkSpinButton *sb, gpointer data) static void spinboxChanged(GtkSpinButton *sb, gpointer data)
{ {
dateTimePickerWidget *d = dateTimePickerWidget(data); uiprivDateTimePickerWidget *d = uiprivDateTimePickerWidget(data);
dateTimeChanged(d); dateTimeChanged(d);
} }
static GtkWidget *newSpinbox(dateTimePickerWidget *d, int min, int max, gint (*input)(GtkSpinButton *, gpointer, gpointer), gboolean (*output)(GtkSpinButton *, gpointer), gulong *block) static GtkWidget *newSpinbox(uiprivDateTimePickerWidget *d, int min, int max, gint (*input)(GtkSpinButton *, gpointer, gpointer), gboolean (*output)(GtkSpinButton *, gpointer), gulong *block)
{ {
GtkWidget *sb; GtkWidget *sb;
@ -407,24 +407,24 @@ static GtkWidget *newSpinbox(dateTimePickerWidget *d, int min, int max, gint (*i
static void dateChanged(GtkCalendar *c, gpointer data) static void dateChanged(GtkCalendar *c, gpointer data)
{ {
dateTimePickerWidget *d = dateTimePickerWidget(data); uiprivDateTimePickerWidget *d = uiprivDateTimePickerWidget(data);
dateTimeChanged(d); dateTimeChanged(d);
} }
static void setDateOnly(dateTimePickerWidget *d) static void setDateOnly(uiprivDateTimePickerWidget *d)
{ {
d->hasTime = FALSE; d->hasTime = FALSE;
gtk_container_remove(GTK_CONTAINER(d->box), d->timebox); gtk_container_remove(GTK_CONTAINER(d->box), d->timebox);
} }
static void setTimeOnly(dateTimePickerWidget *d) static void setTimeOnly(uiprivDateTimePickerWidget *d)
{ {
d->hasDate = FALSE; d->hasDate = FALSE;
gtk_container_remove(GTK_CONTAINER(d->box), d->calendar); gtk_container_remove(GTK_CONTAINER(d->box), d->calendar);
} }
static void dateTimePickerWidget_setTime(dateTimePickerWidget *d, GDateTime *dt) static void uiprivDateTimePickerWidget_setTime(uiprivDateTimePickerWidget *d, GDateTime *dt)
{ {
gint year, month, day; gint year, month, day;
gint hour; gint hour;
@ -453,7 +453,7 @@ static void dateTimePickerWidget_setTime(dateTimePickerWidget *d, GDateTime *dt)
g_date_time_unref(dt); g_date_time_unref(dt);
} }
static void dateTimePickerWidget_init(dateTimePickerWidget *d) static void uiprivDateTimePickerWidget_init(uiprivDateTimePickerWidget *d)
{ {
d->window = gtk_window_new(GTK_WINDOW_POPUP); d->window = gtk_window_new(GTK_WINDOW_POPUP);
gtk_window_set_resizable(GTK_WINDOW(d->window), FALSE); gtk_window_set_resizable(GTK_WINDOW(d->window), FALSE);
@ -518,29 +518,29 @@ static void dateTimePickerWidget_init(dateTimePickerWidget *d)
d->hasDate = TRUE; d->hasDate = TRUE;
// set the current date/time // set the current date/time
dateTimePickerWidget_setTime(d, g_date_time_new_now_local()); uiprivDateTimePickerWidget_setTime(d, g_date_time_new_now_local());
} }
static void dateTimePickerWidget_dispose(GObject *obj) static void uiprivDateTimePickerWidget_dispose(GObject *obj)
{ {
dateTimePickerWidget *d = dateTimePickerWidget(obj); uiprivDateTimePickerWidget *d = uiprivDateTimePickerWidget(obj);
if (d->window != NULL) { if (d->window != NULL) {
gtk_widget_destroy(d->window); gtk_widget_destroy(d->window);
d->window = NULL; d->window = NULL;
} }
G_OBJECT_CLASS(dateTimePickerWidget_parent_class)->dispose(obj); G_OBJECT_CLASS(uiprivDateTimePickerWidget_parent_class)->dispose(obj);
} }
static void dateTimePickerWidget_finalize(GObject *obj) static void uiprivDateTimePickerWidget_finalize(GObject *obj)
{ {
G_OBJECT_CLASS(dateTimePickerWidget_parent_class)->finalize(obj); G_OBJECT_CLASS(uiprivDateTimePickerWidget_parent_class)->finalize(obj);
} }
static void dateTimePickerWidget_class_init(dateTimePickerWidgetClass *class) static void uiprivDateTimePickerWidget_class_init(uiprivDateTimePickerWidgetClass *class)
{ {
G_OBJECT_CLASS(class)->dispose = dateTimePickerWidget_dispose; G_OBJECT_CLASS(class)->dispose = uiprivDateTimePickerWidget_dispose;
G_OBJECT_CLASS(class)->finalize = dateTimePickerWidget_finalize; G_OBJECT_CLASS(class)->finalize = uiprivDateTimePickerWidget_finalize;
changedSignal = g_signal_new("changed", changedSignal = g_signal_new("changed",
G_TYPE_FROM_CLASS(class), G_TYPE_FROM_CLASS(class),
@ -554,7 +554,7 @@ static void dateTimePickerWidget_class_init(dateTimePickerWidgetClass *class)
struct uiDateTimePicker { struct uiDateTimePicker {
uiUnixControl c; uiUnixControl c;
GtkWidget *widget; GtkWidget *widget;
dateTimePickerWidget *d; uiprivDateTimePickerWidget *d;
void (*onChanged)(uiDateTimePicker *, void *); void (*onChanged)(uiDateTimePicker *, void *);
void *onChangedData; void *onChangedData;
}; };
@ -588,7 +588,7 @@ void uiDateTimePickerSetTime(uiDateTimePicker *d, const struct tm *time)
memcpy(&tmbuf, time, sizeof(struct tm)); memcpy(&tmbuf, time, sizeof(struct tm));
t = mktime(&tmbuf); t = mktime(&tmbuf);
dateTimePickerWidget_setTime(d->d, g_date_time_new_from_unix_local(t)); uiprivDateTimePickerWidget_setTime(d->d, g_date_time_new_from_unix_local(t));
dateTimeChanged(d->d); dateTimeChanged(d->d);
} }
@ -598,7 +598,7 @@ void uiDateTimePickerOnChanged(uiDateTimePicker *d, void (*f)(uiDateTimePicker *
d->onChangedData = data; d->onChangedData = data;
} }
static void onChanged(dateTimePickerWidget *d, gpointer data) static void onChanged(uiprivDateTimePickerWidget *d, gpointer data)
{ {
uiDateTimePicker *c; uiDateTimePicker *c;
@ -610,8 +610,8 @@ static GtkWidget *newDTP(void)
{ {
GtkWidget *w; GtkWidget *w;
w = GTK_WIDGET(g_object_new(dateTimePickerWidgetType, "label", "", NULL)); w = GTK_WIDGET(g_object_new(uiprivDateTimePickerWidgetType, "label", "", NULL));
setLabel(dateTimePickerWidget(w)); setLabel(uiprivDateTimePickerWidget(w));
return w; return w;
} }
@ -619,9 +619,9 @@ static GtkWidget *newDP(void)
{ {
GtkWidget *w; GtkWidget *w;
w = GTK_WIDGET(g_object_new(dateTimePickerWidgetType, "label", "", NULL)); w = GTK_WIDGET(g_object_new(uiprivDateTimePickerWidgetType, "label", "", NULL));
setDateOnly(dateTimePickerWidget(w)); setDateOnly(uiprivDateTimePickerWidget(w));
setLabel(dateTimePickerWidget(w)); setLabel(uiprivDateTimePickerWidget(w));
return w; return w;
} }
@ -629,9 +629,9 @@ static GtkWidget *newTP(void)
{ {
GtkWidget *w; GtkWidget *w;
w = GTK_WIDGET(g_object_new(dateTimePickerWidgetType, "label", "", NULL)); w = GTK_WIDGET(g_object_new(uiprivDateTimePickerWidgetType, "label", "", NULL));
setTimeOnly(dateTimePickerWidget(w)); setTimeOnly(uiprivDateTimePickerWidget(w));
setLabel(dateTimePickerWidget(w)); setLabel(uiprivDateTimePickerWidget(w));
return w; return w;
} }
@ -642,7 +642,7 @@ uiDateTimePicker *finishNewDateTimePicker(GtkWidget *(*fn)(void))
uiUnixNewControl(uiDateTimePicker, d); uiUnixNewControl(uiDateTimePicker, d);
d->widget = (*fn)(); d->widget = (*fn)();
d->d = dateTimePickerWidget(d->widget); d->d = uiprivDateTimePickerWidget(d->widget);
g_signal_connect(d->widget, "changed", G_CALLBACK(onChanged), d); g_signal_connect(d->widget, "changed", G_CALLBACK(onChanged), d);
uiDateTimePickerOnChanged(d, defaultOnChanged, NULL); uiDateTimePickerOnChanged(d, defaultOnChanged, NULL);