diary

commit 2386cd37d14bca199fefaed9994236f50a2c8f8e
parent 8a20e1fdf2a4162df9576e56a19206094efa42c3
Author: Andreas Gruhler <agruhl@gmx.ch>
Date:   Sun, 28 Nov 2021 11:09:35 +0100

feature(double-click): edit cmd

Diffstat:
M
src/diary.c
 | 
90
++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------

1 file changed, 55 insertions(+), 35 deletions(-)
diff --git a/src/diary.c b/src/diary.c
@@ -695,43 +695,63 @@ int main(int argc, char** argv) {
                     // when left mouse button pressed
                     fprintf(stderr, "Button event: %i\n", event.bstate);
                     click_in_calwin = wenclose(cal, event.y, event.x);
-                    if(click_in_calwin && event.bstate & (BUTTON1_PRESSED|BUTTON1_CLICKED)) {
-                        int cy, cx;
-                        getyx(cal, cy, cx);
-                        int pad_cy = cy - pad_pos + 1;
-                        int pad_cx = cx + ASIDE_WIDTH;
-
-                        fprintf(stderr, "event.x %i\n", event.x);
-                        fprintf(stderr, "pad_cx %i\n", pad_cx);
-                        fprintf(stderr, "event.y %i\n", event.y);
-                        fprintf(stderr, "pad_cy %i\n", pad_cy);
-
-                        int diff_weeks = abs(pad_cy - event.y);
-                        fprintf(stderr, "Diff weeks: %i\n", diff_weeks);
-                        int diff_wdays = abs((pad_cx - event.x) / 3);
-                        fprintf(stderr, "Diff wdays: %i\n", diff_wdays);
-
-                        int diff_days = 0;
-                        if (pad_cy > event.y) {
-                            // current position cy is more recent, jump backward by diff_days
-                            diff_days -= diff_weeks * 7;
-                        } else {
-                            // new y event is more recent, jump forward by diff_days
-                            diff_days = diff_weeks * 7;
-                        }
+                    if (click_in_calwin) {
+                        if(event.bstate & (BUTTON1_PRESSED|BUTTON1_CLICKED)) {
+                            // regular left-mouse button click or tap on a touchpad:
+                            //   BUTTON1_PRESSED detects touch events (touch pads)
+                            //   BUTTON1_CLICKED detects click events (mouse)
+                            int cy, cx;
+                            getyx(cal, cy, cx);
+                            int pad_cy = cy - pad_pos + 1;
+                            int pad_cx = cx + ASIDE_WIDTH;
+
+                            fprintf(stderr, "event.x %i\n", event.x);
+                            fprintf(stderr, "pad_cx %i\n", pad_cx);
+                            fprintf(stderr, "event.y %i\n", event.y);
+                            fprintf(stderr, "pad_cy %i\n", pad_cy);
+
+                            int diff_weeks = abs(pad_cy - event.y);
+                            fprintf(stderr, "Diff weeks: %i\n", diff_weeks);
+                            int diff_wdays = abs((pad_cx - event.x) / 3);
+                            fprintf(stderr, "Diff wdays: %i\n", diff_wdays);
+
+                            int diff_days = 0;
+                            if (pad_cy > event.y) {
+                                // current position cy is more recent, jump backward by diff_days
+                                diff_days -= diff_weeks * 7;
+                            } else {
+                                // new y event is more recent, jump forward by diff_days
+                                diff_days = diff_weeks * 7;
+                            }
 
-                        if (cx > event.x) {
-                            // jump backwards, mouse click was before current position
-                            diff_days -= diff_wdays;
-                        } else {
-                            // jump forward, mouse click was after current position
-                            diff_days += diff_wdays;
+                            if (cx > event.x) {
+                                // jump backwards, mouse click was before current position
+                                diff_days -= diff_wdays;
+                            } else {
+                                // jump forward, mouse click was after current position
+                                diff_days += diff_wdays;
+                            }
+                            fprintf(stderr, "Diff days: %i\n", diff_days);
+
+                            curs_date.tm_mday += diff_days;
+                            time_t new_date = mktime(&curs_date);
+                            mv_valid = go_to(cal, aside, new_date, &pad_pos, &curs_date, &cal_start, &cal_end);
+
+                            if (event.bstate & (BUTTON1_DOUBLE_CLICKED)) {
+                                // unset previous click events
+                                event.bstate &= ~BUTTON1_DOUBLE_CLICKED;
+                                event.bstate &= ~BUTTON1_PRESSED;
+                                event.bstate &= ~BUTTON1_CLICKED;
+                                // simulate edit char to enter edit mode
+                                ungetch('e');
+                            }
+                        }
+                        if (event.bstate & (BUTTON1_DOUBLE_CLICKED)) {
+                            // double-click left-mouse button or double tap on a touchpad
+                            // simulate single-click to select the new date
+                            event.bstate |= BUTTON1_PRESSED;
+                            ungetmouse(&event);
                         }
-                        fprintf(stderr, "Diff days: %i\n", diff_days);
-
-                        curs_date.tm_mday += diff_days;
-                        time_t new_date = mktime(&curs_date);
-                        mv_valid = go_to(cal, aside, new_date, &pad_pos, &curs_date, &cal_start, &cal_end);
                     }
                 } else if (event.bstate & BUTTON5_PRESSED) {
                     fprintf(stderr, "Mouse up/down\n");