[src/trunk]: src/usr.sbin/wsmoused Fix selection code [and remove trailing sp...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/56f5b571cf36
branches:  trunk
changeset: 533593:56f5b571cf36
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Jul 04 20:50:29 2002 +0000

description:
Fix selection code [and remove trailing spaces] from Julio Merino.

diffstat:

 usr.sbin/wsmoused/events.c    |   6 +++---
 usr.sbin/wsmoused/selection.c |  38 ++++++++++++++++++++++----------------
 usr.sbin/wsmoused/wsmoused.c  |   8 ++++----
 3 files changed, 29 insertions(+), 23 deletions(-)

diffs (200 lines):

diff -r 5a1ef756a575 -r 56f5b571cf36 usr.sbin/wsmoused/events.c
--- a/usr.sbin/wsmoused/events.c        Thu Jul 04 20:22:50 2002 +0000
+++ b/usr.sbin/wsmoused/events.c        Thu Jul 04 20:50:29 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: events.c,v 1.2 2002/07/02 12:41:26 christos Exp $ */
+/* $NetBSD: events.c,v 1.3 2002/07/04 20:50:29 christos Exp $ */
 
 /*
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 #include <sys/cdefs.h>
 
 #ifndef lint
-__RCSID("$NetBSD: events.c,v 1.2 2002/07/02 12:41:26 christos Exp $");
+__RCSID("$NetBSD: events.c,v 1.3 2002/07/04 20:50:29 christos Exp $");
 #endif /* not lint */
 
 #include <sys/ioctl.h>
@@ -40,7 +40,7 @@
 #include <sys/types.h>
 #include <sys/tty.h>
 #include <dev/wscons/wsconsio.h>
- 
+
 #include <err.h>
 #include <errno.h>
 #include <stdio.h>
diff -r 5a1ef756a575 -r 56f5b571cf36 usr.sbin/wsmoused/selection.c
--- a/usr.sbin/wsmoused/selection.c     Thu Jul 04 20:22:50 2002 +0000
+++ b/usr.sbin/wsmoused/selection.c     Thu Jul 04 20:50:29 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: selection.c,v 1.1 2002/06/26 23:13:08 christos Exp $ */
+/* $NetBSD: selection.c,v 1.2 2002/07/04 20:50:29 christos Exp $ */
 
 /*
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 #include <sys/cdefs.h>
 
 #ifndef lint
-__RCSID("$NetBSD: selection.c,v 1.1 2002/06/26 23:13:08 christos Exp $");
+__RCSID("$NetBSD: selection.c,v 1.2 2002/07/04 20:50:29 christos Exp $");
 #endif /* not lint */
 
 #include <sys/ioctl.h>
@@ -40,7 +40,7 @@
 #include <sys/types.h>
 #include <sys/tty.h>
 #include <dev/wscons/wsconsio.h>
- 
+
 #include <ctype.h>
 #include <fcntl.h>
 #include <err.h>
@@ -78,11 +78,16 @@
        return ptr;
 }
 
-static void
+/*
+ * Copies a region of a line inside the buffer pointed by ptr. We use
+ * a double pointer because we modify the pointer. When the function
+ * finishes, ptr points to the end of the buffer.
+ */
+static char *
 fill_buf(char *ptr, struct mouse *m, size_t row, size_t col, size_t end)
 {
        struct wsdisplay_char ch;
-       ch.row = sel.start_row;
+       ch.row = row;
        for (ch.col = col; ch.col < end; ch.col++) {
                if (ioctl(m->tty_fd, WSDISPLAYIO_GETWSCHAR, &ch) == -1) {
                        warn("ioctl(WSDISPLAYIO_GETWSCHAR) failed");
@@ -91,6 +96,7 @@
                        *ptr++ = ch.letter;
                }
        }
+       return ptr;
 }
 
 
@@ -135,31 +141,31 @@
                else {
                        if (sel.end_col > l)
                                sel.end_col = l;
-                       ptr = str = alloc_sel( sel.end_col - sel.start_col + 1);
+                       ptr = str = alloc_sel(sel.end_col - sel.start_col + 1);
                        if (ptr == NULL)
                                return;
-                       
-                       fill_buf(ptr, m, sel.start_row, sel.start_col,
+
+                       ptr = fill_buf(ptr, m, sel.start_row, sel.start_col,
                            sel.end_col);
                        *ptr = '\0';
                }
        } else {
                /* Selection is multiple rows */
-               ptr = str =  alloc_sel(sel.abs_end - sel.abs_start + 1);
+               ptr = str = alloc_sel(sel.abs_end - sel.abs_start + 1);
                if (ptr == NULL)
                        return;
 
                /* Calculate and copy first line */
                l = row_length(m, sel.start_row);
                if (sel.start_col < l) {
-                       fill_buf(ptr, m, sel.start_row, sel.start_col, l);
+                       ptr = fill_buf(ptr, m, sel.start_row, sel.start_col, l);
                        *ptr++ = '\r';
                }
 
                /* Copy mid lines if there are any */
                if ((sel.end_row - sel.start_row) > 1) {
                        for (r = sel.start_row + 1; r <= sel.end_row - 1; r++) {
-                               fill_buf(ptr, m, r, 0, row_length(m, r));
+                               ptr = fill_buf(ptr, m, r, 0, row_length(m, r));
                                *ptr++ = '\r';
                        }
                }
@@ -168,7 +174,7 @@
                l = row_length(m, sel.end_row);
                if (sel.end_col < l)
                        l = sel.end_col;
-               fill_buf(ptr, m, sel.end_row, 0, l);
+               ptr = fill_buf(ptr, m, sel.end_row, 0, l);
                *ptr = '\0';
        }
 
@@ -176,7 +182,7 @@
                free(sel.text);
                sel.text = NULL;
        }
-       
+
        if (str != NULL) {
                sel.text = str;
                sel.text_size = ptr - str;
@@ -203,7 +209,7 @@
                free(sel.text);
                sel.text = NULL;
        }
-       
+
        sel.start_row = m->row;
        sel.start_col = m->col;
        mouse_sel_calculate(m);
@@ -276,7 +282,7 @@
 mouse_sel_show(struct mouse *m)
 {
        size_t i;
-       
+
        mouse_sel_calculate(m);
        for (i = sel.abs_start; i <= sel.abs_end; i++)
                char_invert(m, 0, i);
@@ -290,7 +296,7 @@
 mouse_sel_paste(struct mouse *m)
 {
        size_t i;
-       
+
        if (sel.text == NULL)
                return;
        for (i = 0; i < sel.text_size; i++)
diff -r 5a1ef756a575 -r 56f5b571cf36 usr.sbin/wsmoused/wsmoused.c
--- a/usr.sbin/wsmoused/wsmoused.c      Thu Jul 04 20:22:50 2002 +0000
+++ b/usr.sbin/wsmoused/wsmoused.c      Thu Jul 04 20:50:29 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: wsmoused.c,v 1.3 2002/06/27 22:58:54 wiz Exp $ */
+/* $NetBSD: wsmoused.c,v 1.4 2002/07/04 20:50:29 christos Exp $ */
 
 /*
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 #include <sys/cdefs.h>
 
 #ifndef lint
-__RCSID("$NetBSD: wsmoused.c,v 1.3 2002/06/27 22:58:54 wiz Exp $");
+__RCSID("$NetBSD: wsmoused.c,v 1.4 2002/07/04 20:50:29 christos Exp $");
 #endif /* not lint */
 
 #include <sys/ioctl.h>
@@ -150,7 +150,7 @@
                        res = poll(fds, 1, INFTIM);
                else
                        res = poll(fds, 2, 300);
-                       
+
                if (res < 0)
                        warn("failed to read from devices");
 
@@ -202,7 +202,7 @@
        ioctl(mouse.stat_fd, WSDISPLAYIO_GETACTIVESCREEN, &i);
        mouse.tty_fd = -1;
        mouse_open_tty(&mouse, i);
-       
+
        /* Check if the kernel has character functions */
        ch.row = ch.col = 0;
        if (ioctl(mouse.tty_fd, WSDISPLAYIO_GETWSCHAR, &ch) < 0)