[Pkg-wmaker-commits] [wmclockmon.git] 11/31: Reset upstream code to match orig tarball; will patch with quilt.
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Wed Feb 17 10:49:48 UTC 2016
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmclockmon.git.
commit 03f66ebdc97211baa926de055efd5844fb148798
Author: Doug Torrance <dtorrance at piedmont.edu>
Date: Wed Jan 27 22:17:23 2016 -0500
Reset upstream code to match orig tarball; will patch with quilt.
---
configure.ac | 2 +-
src/main.c | 27 ++++++++++++++++
wmclockmon-cal/Makefile.in | 4 +--
wmclockmon-cal/mainwindow.c | 73 +++++++++++++++++++++---------------------
wmclockmon-config/Makefile.in | 4 +--
wmclockmon-config/dialogs.c | 2 ++
wmclockmon-config/edit.c | 1 +
wmclockmon-config/mainwindow.c | 25 ++++++++-------
8 files changed, 85 insertions(+), 53 deletions(-)
diff --git a/configure.ac b/configure.ac
index 9accaf3..06a5760 100644
--- a/configure.ac
+++ b/configure.ac
@@ -98,7 +98,7 @@ linux*)
ignore_buffers=yes
ignore_cached=yes
;;
-[k]freebsd*)
+freebsd*)
OS=freebsd
ignore_wired=yes
ignore_cached=yes
diff --git a/src/main.c b/src/main.c
index 0749d8b..1bd7e62 100644
--- a/src/main.c
+++ b/src/main.c
@@ -251,12 +251,14 @@ static void parse_arguments(int argc, char **argv);
static void print_help(char *prog);
static void time_update();
static Bool raise_alarm();
+static Bool fexist(const char *filename);
static Bool filestat(const char *filename, time_t *time, int mode);
static int my_system(char *cmd, char *opt);
void *xmalloc(size_t size);
char *xstrdup(const char *string);
static void alrm_add(Alarm **list, const char *value);
static void free_alrm(Alarm **list);
+static int nb_alrm(Alarm *list);
static Bool alarms_on(Alarm *list);
static void switch_alarms(Alarm *list);
static Bool getbool(char *value);
@@ -269,6 +271,9 @@ static void reload_alarms();
static void show_cal_file(int type);
static void show_cal();
static char *robust_home();
+static void signal_reload();
+
+
int main(int argc, char **argv) {
XEvent event;
@@ -1321,6 +1326,17 @@ static Bool raise_alarm() {
return False;
}
+
+static Bool fexist(const char *filename) {
+ FILE *file;
+
+ if ((file = fopen(filename, "r")) == NULL) return False;
+ fclose(file);
+
+ return True;
+}
+
+
static Bool filestat(const char *filename, time_t *time, int mode) {
struct stat s;
time_t t = *time;
@@ -1455,6 +1471,17 @@ static void free_alrm(Alarm **list) {
}
+static int nb_alrm(Alarm *list) {
+ Alarm *alrm = list;
+ int n = 0;
+ while (alrm) {
+ n++;
+ alrm = alrm->next;
+ }
+ return n;
+}
+
+
static Bool alarms_on(Alarm *list) {
Alarm *alrm = list;
diff --git a/wmclockmon-cal/Makefile.in b/wmclockmon-cal/Makefile.in
index 10cbc19..0ca65db 100644
--- a/wmclockmon-cal/Makefile.in
+++ b/wmclockmon-cal/Makefile.in
@@ -96,14 +96,14 @@ PROGRAMS = $(bin_PROGRAMS)
DEFS = @DEFS@ -I. -I$(srcdir) -I..
-LDFLAGS = @LDFLAGS@ `pkg-config gtk+-2.0 --libs`
+LDFLAGS = @LDFLAGS@ `gtk-config --libs`
X_CFLAGS = @X_CFLAGS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
wmclockmon_OBJECTS = main.o mainwindow.o tools.o
wmclockmon_DEPENDENCIES =
wmclockmon_LDFLAGS =
-CFLAGS = @CFLAGS@ `pkg-config gtk+-2.0 --cflags`
+CFLAGS = @CFLAGS@ `gtk-config --cflags`
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
diff --git a/wmclockmon-cal/mainwindow.c b/wmclockmon-cal/mainwindow.c
index 179f90f..d2db477 100644
--- a/wmclockmon-cal/mainwindow.c
+++ b/wmclockmon-cal/mainwindow.c
@@ -51,6 +51,7 @@ static void show_editor() {
gtk_widget_hide(calendar);
gtk_widget_hide(closewindow);
gtk_widget_grab_default(GTK_WIDGET(cancel));
+ gtk_widget_draw_default(GTK_WIDGET(cancel));
gtk_widget_grab_focus(GTK_WIDGET(edit));
gtk_widget_show(text_buttons);
gtk_widget_show(edit);
@@ -68,6 +69,7 @@ static void hide_editor() {
gtk_widget_hide(cancel);
gtk_widget_show(calendar);
gtk_widget_grab_default(GTK_WIDGET(closewindow));
+ gtk_widget_draw_default(GTK_WIDGET(closewindow));
gtk_widget_grab_focus(GTK_WIDGET(closewindow));
gtk_widget_show(closewindow);
}
@@ -91,20 +93,13 @@ static void load_file(const char *datestr) {
FILE *file;
char *filename = get_file(datestr);
- GtkTextIter iter;
- GtkTextBuffer *buf;
-
- buf = GTK_TEXT_BUFFER(gtk_text_view_get_buffer(GTK_TEXT_VIEW(edit)));
- gtk_text_buffer_get_end_iter(GTK_TEXT_BUFFER(gtk_text_view_get_buffer(GTK_TEXT_VIEW(edit))), &iter);
- gtk_text_buffer_place_cursor(GTK_TEXT_BUFFER(gtk_text_view_get_buffer(GTK_TEXT_VIEW(edit))), &iter);
-
if ((file = fopen(filename, "r")) != NULL) {
while (! feof(file)) {
char line[MAXSTRLEN + 1];
bzero(line, MAXSTRLEN + 1);
fgets(line, MAXSTRLEN, file);
if (line[0] != 0)
- gtk_text_buffer_insert(buf, &iter, line, -1);
+ gtk_text_insert(GTK_TEXT(edit), NULL, NULL, NULL, line, -1);
}
fclose(file);
}
@@ -133,7 +128,7 @@ static void toggle_buttons(int button) {
static void to_button(int button) {
- if (dateb == 0) dateb = button;
+ if (dateb == 0) dateb == button;
if (button != dateb) {
int b = dateb;
dateb = button;
@@ -143,7 +138,7 @@ static void to_button(int button) {
static void set_buttons_text() {
- unsigned int year, month, day;
+ int year, month, day;
char datestr[MAXSTRLEN + 1];
bzero(datestr, MAXSTRLEN + 1);
@@ -159,14 +154,21 @@ static void set_buttons_text() {
static void editor_flush() {
- gtk_text_buffer_set_text(GTK_TEXT_BUFFER(gtk_text_view_get_buffer(GTK_TEXT_VIEW(edit))), "", 0);
+ int cont = TRUE;
+
+ while (cont) {
+ cont = gtk_text_backward_delete(GTK_TEXT(edit), 1);
+ }
+ cont = TRUE;
+ while (cont) {
+ cont = gtk_text_forward_delete(GTK_TEXT(edit), 1);
+ }
}
static void editor_fill(int which) {
- char *dstr;
- GtkWidget *label = NULL;
- GtkTextIter iter;
+ char *filename, *dstr;
+ GtkWidget *label;
switch (which) {
case UNIQUE: label = label_u; break;
@@ -177,10 +179,11 @@ static void editor_fill(int which) {
gtk_label_get(GTK_LABEL(label), &dstr);
strcpy(daystr, dstr);
to_button(which);
+ gtk_text_freeze(GTK_TEXT(edit));
editor_flush();
load_file(daystr);
- gtk_text_buffer_get_end_iter(GTK_TEXT_BUFFER(gtk_text_view_get_buffer(GTK_TEXT_VIEW(edit))), &iter);
- gtk_text_buffer_place_cursor(GTK_TEXT_BUFFER(gtk_text_view_get_buffer(GTK_TEXT_VIEW(edit))), &iter);
+ gtk_text_set_point(GTK_TEXT(edit), gtk_text_get_length(GTK_TEXT(edit)));
+ gtk_text_thaw(GTK_TEXT(edit));
}
@@ -222,28 +225,23 @@ static void save_datas() {
char *dirname = xmalloc(len + 2);
struct stat stat_buf;
- GtkTextIter ts, te;
- gchar *tbuf;
- int tlen;
-
- tlen = gtk_text_buffer_get_char_count(GTK_TEXT_BUFFER(gtk_text_view_get_buffer(GTK_TEXT_VIEW(edit))));
- gtk_text_buffer_get_bounds(GTK_TEXT_BUFFER(gtk_text_view_get_buffer(GTK_TEXT_VIEW(edit))), &ts, &te);
-
sprintf(dirname, "%s/%s", robust_home(), DEFAULT_CONFIGDIR);
- if (tlen > 0) {
+ if (gtk_text_get_length(GTK_TEXT(edit)) > 0) {
if (! ((stat(dirname, &stat_buf) == 0) && S_ISDIR(stat_buf.st_mode)))
mkdir(dirname, 0755);
if ((stat(dirname, &stat_buf) == 0) && S_ISDIR(stat_buf.st_mode)) {
FILE *file = fopen(filename, "w");
- unsigned int year, month, day;
+ int year, month, day;
if (file) {
- tbuf = gtk_text_buffer_get_text(GTK_TEXT_BUFFER(gtk_text_view_get_buffer(GTK_TEXT_VIEW(edit))), &ts, &te, TRUE);
- fprintf(file, "%s", tbuf);
- g_free(tbuf);
- fflush(file);
- fclose(file);
+ int i;
+ for (i = 0 ; i < gtk_text_get_length(GTK_TEXT(edit)) ; i++) {
+ char t = GTK_TEXT_INDEX(GTK_TEXT(edit), i);
+ fprintf(file, "%c", t);
+ }
+ fflush(file);
+ fclose(file);
}
gtk_calendar_get_date(GTK_CALENDAR(calendar), &year, &month, &day);
gtk_calendar_mark_day(GTK_CALENDAR(calendar), day);
@@ -255,13 +253,15 @@ static void save_datas() {
static void delete_file() {
char *filename = get_file(daystr);
- unsigned int year, month, day;
+ int year, month, day;
unlink(filename);
gtk_calendar_get_date(GTK_CALENDAR(calendar), &year, &month, &day);
gtk_calendar_unmark_day(GTK_CALENDAR(calendar), day);
FREE(filename);
+ gtk_text_freeze(GTK_TEXT(edit));
editor_flush();
+ gtk_text_thaw(GTK_TEXT(edit));
}
@@ -293,7 +293,7 @@ static void mark_days() {
char startstr_u[9]; /* unique (full date) */
char startstr_y[9]; /* yearly date */
char startstr_m[9]; /* monthly date */
- unsigned int year, month, day;
+ int year, month, day;
gtk_calendar_get_date(GTK_CALENDAR(calendar), &year, &month, &day);
month++;
@@ -357,10 +357,10 @@ void create_mainwindow() {
GTK_SIGNAL_FUNC(mark_days), NULL);
gtk_widget_show(calendar);
- edit = gtk_text_view_new();
- gtk_text_view_set_editable(GTK_TEXT_VIEW(edit), TRUE);
- gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(edit), GTK_WRAP_WORD_CHAR);
-
+ edit = gtk_text_new(NULL, NULL);
+ gtk_text_set_editable(GTK_TEXT(edit), TRUE);
+ gtk_text_set_word_wrap(GTK_TEXT(edit), TRUE);
+ gtk_text_set_line_wrap(GTK_TEXT(edit), TRUE);
gtk_box_pack_start(GTK_BOX(main_vbox), edit, TRUE, TRUE, 1);
@@ -413,6 +413,7 @@ void create_mainwindow() {
gtk_box_pack_start(GTK_BOX(buttons_hbox), closewindow, TRUE, TRUE, 0);
GTK_WIDGET_SET_FLAGS(GTK_WIDGET(closewindow), GTK_CAN_DEFAULT);
gtk_widget_grab_default(GTK_WIDGET(closewindow));
+ gtk_widget_draw_default(GTK_WIDGET(closewindow));
gtk_widget_show(closewindow);
diff --git a/wmclockmon-config/Makefile.in b/wmclockmon-config/Makefile.in
index 99008e5..641c551 100644
--- a/wmclockmon-config/Makefile.in
+++ b/wmclockmon-config/Makefile.in
@@ -96,14 +96,14 @@ PROGRAMS = $(bin_PROGRAMS)
DEFS = @DEFS@ -I. -I$(srcdir) -I..
-LDFLAGS = @LDFLAGS@ `pkg-config gtk+-2.0 --libs`
+LDFLAGS = @LDFLAGS@ `gtk-config --libs`
X_CFLAGS = @X_CFLAGS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
wmclockmon_OBJECTS = actions.o dialogs.o edit.o main.o mainwindow.o tools.o
wmclockmon_DEPENDENCIES =
wmclockmon_LDFLAGS =
-CFLAGS = @CFLAGS@ `pkg-config gtk+-2.0 --cflags`
+CFLAGS = @CFLAGS@ `gtk-config --cflags`
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
diff --git a/wmclockmon-config/dialogs.c b/wmclockmon-config/dialogs.c
index 978dbe9..d497ed1 100644
--- a/wmclockmon-config/dialogs.c
+++ b/wmclockmon-config/dialogs.c
@@ -38,6 +38,7 @@ void ync_dialog(const char *title, const char *text, void *f_yes, void *f_no) {
bouton, TRUE, TRUE, 0);
GTK_WIDGET_SET_FLAGS(GTK_WIDGET(bouton), GTK_CAN_DEFAULT);
gtk_widget_grab_default(GTK_WIDGET(bouton));
+ gtk_widget_draw_default(GTK_WIDGET(bouton));
gtk_widget_show(bouton);
bouton = gtk_button_new_with_label("No");
@@ -95,6 +96,7 @@ void ok_dialog(const char *title, const char *text) {
bouton, TRUE, TRUE, 0);
GTK_WIDGET_SET_FLAGS(GTK_WIDGET(bouton), GTK_CAN_DEFAULT);
gtk_widget_grab_default(GTK_WIDGET(bouton));
+ gtk_widget_draw_default(GTK_WIDGET(bouton));
gtk_widget_show(bouton);
gtk_container_set_border_width(GTK_CONTAINER
diff --git a/wmclockmon-config/edit.c b/wmclockmon-config/edit.c
index bfb03a9..f9800c1 100644
--- a/wmclockmon-config/edit.c
+++ b/wmclockmon-config/edit.c
@@ -76,6 +76,7 @@ void edit_dialog(const char *title,
bouton, TRUE, TRUE, 0);
GTK_WIDGET_SET_FLAGS(GTK_WIDGET(bouton), GTK_CAN_DEFAULT);
gtk_widget_grab_default(GTK_WIDGET(bouton));
+ gtk_widget_draw_default(GTK_WIDGET(bouton));
gtk_widget_show(bouton);
bouton = gtk_button_new_with_label("Cancel");
diff --git a/wmclockmon-config/mainwindow.c b/wmclockmon-config/mainwindow.c
index a62d789..d1deca7 100644
--- a/wmclockmon-config/mainwindow.c
+++ b/wmclockmon-config/mainwindow.c
@@ -10,9 +10,9 @@
#include "actions.h"
-static GtkWidget *b_edit;
-static GtkWidget *b_set;
-static GtkWidget *b_remove;
+static GtkWidget *edit;
+static GtkWidget *set;
+static GtkWidget *remove;
static gint list_sel_cb (GtkCList *clist,
gint row,
@@ -20,9 +20,9 @@ static gint list_sel_cb (GtkCList *clist,
GdkEventButton *event,
void *data) {
selected_row = row;
- gtk_widget_set_sensitive(b_edit, TRUE);
- gtk_widget_set_sensitive(b_set, TRUE);
- gtk_widget_set_sensitive(b_remove, TRUE);
+ gtk_widget_set_sensitive(edit, TRUE);
+ gtk_widget_set_sensitive(set, TRUE);
+ gtk_widget_set_sensitive(remove, TRUE);
return TRUE;
}
@@ -33,9 +33,9 @@ gint list_unsel_cb (GtkCList *clist,
GdkEventButton *event,
void *data) {
selected_row = -1;
- gtk_widget_set_sensitive(b_edit, FALSE);
- gtk_widget_set_sensitive(b_set, FALSE);
- gtk_widget_set_sensitive(b_remove, FALSE);
+ gtk_widget_set_sensitive(edit, FALSE);
+ gtk_widget_set_sensitive(set, FALSE);
+ gtk_widget_set_sensitive(remove, FALSE);
return TRUE;
}
@@ -267,7 +267,7 @@ void create_mainwindow() {
gtk_table_attach_defaults(GTK_TABLE(table), bouton, 0, 1, 1, 2);
gtk_widget_set_sensitive(bouton, FALSE);
gtk_widget_show(bouton);
- b_edit = bouton;
+ edit = bouton;
bouton = gtk_button_new_with_label(" Switch On/Off ");
gtk_signal_connect(GTK_OBJECT(bouton), "clicked",
@@ -275,7 +275,7 @@ void create_mainwindow() {
gtk_table_attach_defaults(GTK_TABLE(table), bouton, 1, 2, 1, 2);
gtk_widget_set_sensitive(bouton, FALSE);
gtk_widget_show(bouton);
- b_set = bouton;
+ set = bouton;
bouton = gtk_button_new_with_label(" Remove alarm ");
gtk_signal_connect(GTK_OBJECT(bouton), "clicked",
@@ -283,7 +283,7 @@ void create_mainwindow() {
gtk_table_attach_defaults(GTK_TABLE(table), bouton, 1, 2, 0, 1);
gtk_widget_set_sensitive(bouton, FALSE);
gtk_widget_show(bouton);
- b_remove = bouton;
+ remove = bouton;
label = gtk_label_new(" Alarms ");
@@ -312,6 +312,7 @@ void create_mainwindow() {
gtk_box_pack_start(GTK_BOX(buttons_hbox), bouton, TRUE, TRUE, 0);
GTK_WIDGET_SET_FLAGS(GTK_WIDGET(bouton), GTK_CAN_DEFAULT);
gtk_widget_grab_default(GTK_WIDGET(bouton));
+ gtk_widget_draw_default(GTK_WIDGET(bouton));
gtk_widget_show(bouton);
bouton = gtk_button_new_with_label(" Cancel ");
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmclockmon.git.git
More information about the Pkg-wmaker-commits
mailing list