Commit graph

213 commits

Author SHA1 Message Date
Dan Cross
fa325e9b42 Trivial changes: whitespace and modes.
Remote whitespace at the ends of lines.
Remove blank lines from the ends of files.
Change modes on source files so that they
are not executable.

Signed-off-by: Dan Cross <cross@gajendra.net>
2020-01-10 14:54:30 +00:00
Neven Sajko
d6f8c236b8 acme: do not pass null pointers where disallowed
The C standards disallow passing null pointers to memmove and memcmp.

Change-Id: I1c88c2adbc32a23ef742f206038b8f7c4e0540c7
2020-01-02 21:47:07 +01:00
Russ Cox
0b349f6f34 acme: report close failure during Put 2019-12-19 14:51:49 -05:00
Russ Cox
7a241631b2 acme: accept expanded URLs in look
Just as look expands a click in /etc/passwd to the full name
(provided that file exists), it now expands a click in https://9fans.net/
to the full URL (provided the prefix is http:// or https://).
Probably more adjustment is needed.
2019-06-10 16:01:10 -04:00
Russ Cox
161742770e acme: delete trailing spaces during Put in autoindent mode
Autoident mode is the leading cause of trailing spaces on lines.
Remove them during Put to make various picky tools happier.
The changes during Put are added as a separate entry to the
file history, so that the first Undo after Put restores the spaces.
2019-05-17 23:18:06 -04:00
Russ Cox
3197719090 acme: do not trim spaces during Put
The commit that introduced this was pushed accidentally.
It is not a good idea to do this.
(It breaks programs that think that a clean window
means the body matches the on-disk file.)
2019-04-19 22:24:53 -04:00
Martin Kühl
dfac95269a acme: Update tag after receiving menu/nomenu control event (#251) 2019-04-05 14:45:56 -04:00
Russ Cox
43f1873709 acme: drop trailing spaces during Put of auto-indent window
Auto-indent mode leaves trailing spaces on blank lines
as you type past them, so silently elide them from the
window content as it gets written back to disk.

Another option would be to remove them from the
window entirely during Put, but they're actually nice
to have while editing, and to date Put has never
modified the window content.
2019-02-01 13:20:46 -05:00
Russ Cox
43b0d532bd acme: add 32x32 boxcursor
The only difference from the upscaled 16x16
is a one-pixel adjustment in the offset position,
but this at least exercises setcursor2.
2018-11-15 20:52:18 -05:00
Fazlul Shahriar
76b9347a5f acme: avoid division by zero when resizing col (#189)
To reproduce, create a column with at least two windows and resize
acme to have almost zero height.
2018-11-13 23:11:31 -05:00
Martin Kühl
a82a8b6368 acme: Apply each -/+ only once (#156)
When plumbing an address like `3-`, Acme selects line 1,
and similarly `3+` selects line 5.
The same problem can be observed for character addresses (`#123+`)
but _not_ for ones like `+`, `.+` or `/foo/+`:
The problem only occurs when a number is followed by a direction (`-`/`+`).

Following along with the example `3-` through `address` (in addr.c):
We read `3` into `c` and match the `case` on line 239.
The `while` loop on line 242ff reads additional digits into `c`
and puts the first non-digit back by decrementing the index `q`.
Then we find the range for line 3 on line 251 and continue.

On the next iteration, we set `prevc` to the last `c`,
but since that part read ahead _into `c`_,
`c` is currently the _next_ character we will read, `-`,
and now `prevc` is too.

Then in the case block (line 210) the condition on line 211 holds
and Acme believes that it has read two `-` in sequence
and modifies the range to account for the “first” `-`.
The “second” `-` gets applied after the loop is done, on line 292.

So the general problem is:
While reading numbers, Acme reads the next character after the number into `c`.
It decrements the counter to ensure it will read it again on the next iteration,
but it still uses it to update `prevc`.

This change solves the problem by reading digits into `nc` instead.
This variable is used to similar effect in the block for directions (line 212)
and fills the role of “local `c` that we can safely use to read ahead” nicely.
2018-09-19 23:19:36 +10:00
Xiao-Yong Jin
7ca1c90109 acme: fix some memory leaks 2018-03-27 15:03:12 +02:00
Russ Cox
3d6e5cb56a acme: preserve window position and selection during Get
Before, executing Get in a file rewound the window offset and
selection to the start of the file.

After this CL, Get preserves the window offset and selection,
where preserve is defined as "the same line number and rune
offset within the line". So if the window started at line 10
before and the selection was line 13 chars 5-7, then that
will still be true after Get, provided the new content is large
enough.

This should help the common situation of plumbing a
compiler error, realizing the window is out of date,
clicking Get, and then losing the positioning from the
plumb operation.
2017-11-02 12:01:14 -04:00
Russ Cox
ff9d331db4 acme: free buf in checksha1
Thanks to Lorenzo Beretta for noticing.
2017-10-14 19:51:10 -04:00
Russ Cox
67dbeee5fe acme: check file content before declaring file "modified since last read"
Bad remote file systems can change mtime unexpectedly,
and then there is the problem that git rebase and similar
operations like to change the files and then change them back,
modifying the mtimes but not the content.

Avoid spurious Put errors on both of those by checking file
content.

(False positive "modified since last read" make the real ones
difficult to notice.)
2017-10-10 13:51:24 -04:00
Russ Cox
b15fd97627 acme: implement Cmd-Shift-Z for Redo on Mac
Change-Id: Ie9332ed473609bd6ca156be0843dc5411cbf7b93
Reviewed-on: https://plan9port-review.googlesource.com/2941
Reviewed-by: Russ Cox <rsc@swtch.com>
2017-07-16 02:24:41 +00:00
Russ Cox
310ae03327 all: fix or silence all INSTALL warnings on macOS
Should be a clean build now.

Change-Id: Id3460371cb5e8d4071f8faa9c2aec870d213a067
Reviewed-on: https://plan9port-review.googlesource.com/2781
Reviewed-by: Russ Cox <rsc@swtch.com>
2017-01-06 21:37:31 +00:00
Sergiusz Urbaniak
fdf6ef3337 acme: add focus change to log
Currently new, put and del events are being logged.
This patch adds a focus event to the log
whenever the user changes the focus to another window.

This lets programs react to files being edited in acme
without the need of being restarted.

Change-Id: Idf35c0d7dbfca30e79724dc9f49e44c6a4eb6a1e
Reviewed-on: https://plan9port-review.googlesource.com/1140
Reviewed-by: Russ Cox <rsc@google.com>
2015-06-03 15:31:21 +00:00
Russ Cox
fff818fe87 libdraw, libframe, acme: fix, guard against inverted range in textsetselect
Credit to Roi Martin <jroi.martin@gmail.com> for noticing that
libdraw was being passed a negative string length and for finding the
sequence of keystrokes that make acme do it reproducibly.

Change-Id: If3f3d04a25c506175f740d3e887d5d83b5cd1bfe
Reviewed-on: https://plan9port-review.googlesource.com/1092
Reviewed-by: Russ Cox <rsc@swtch.com>
2014-12-02 01:18:40 +00:00
Russ Cox
50ababbd55 acme: fix bufread crash due to typing-point scrolling
Acme tracks the most recent typing insertion point and
the home and end keys stop there on their way
up to the top or down to the bottom of the file.
That point should be iq1, and it should be adjusted
properly so that it's always between 0 and t->file->b.nc inclusive.
(This is all code from an external contributor, years old at this
point but new since Plan 9.)

Somehow, sometimes iq1 ends up a little beyond b.nc,
and when passed to textbacknl it crashes acme in bufread.
I can't see how that can happen but if it does, avoid the crash.

It's tempting to pull the insertion point code out entirely
but this is a little less invasive and should fix things for now.

TBR=rsc
https://codereview.appspot.com/107730043
2014-06-03 00:16:48 -04:00
Russ Cox
6400c9f20c acme: increase timer resolution to 10ms
We ran for a long time with 10ms kernel resolution,
so 10ms user space resolution here should be fine.
Some systems actually provide 1ms sleeps, which
makes this polling use a bit more cpu than we'd like.
Since the timers are for user-visible things, 10ms should
still be far from noticeable.

Reduces acme's cpu usage on Macs when plumber is missing
(and plumbproc is sleeping waiting for it to appear).

LGTM=aram, r
R=r, aram
https://codereview.appspot.com/99570043
2014-06-03 00:09:29 -04:00
Russ Cox
113ea95f7b undo CL 69070045 / 8539a916d98a
This breaks ^C in win windows, as expected.
People use ^C, win expects and handles ^C,
so I don't think we can just take it away.

I've noticed that it is broken but assumed my ssh
was screwed up.

If you want to make WindowsKey+C,X,V do the
operations, by analogy with command+C,X,V
on Mac, that's fine with me.

««« original CL description
acme: copy/cut/paste with ctl+c,x,v

LGTM=rsc
R=rsc
CC=plan9port.codebot
https://codereview.appspot.com/69070045

»»»

TBR=rsc
CC=burns.ethan, r
https://codereview.appspot.com/96410045
2014-05-19 09:39:34 -04:00
Russ Cox
45f8ba5414 acme: fix two flush bugs in new log file
TBR=rsc
https://codereview.appspot.com/95010048
2014-05-05 22:28:03 -04:00
Russ Cox
4a3fb87264 acme: add log file in acme root directory
Reading /mnt/acme/log reports a log of window create,
put, and delete events, as they happen. It blocks until the
next event is available.

Example log output:

8 new /Users/rsc/foo.go
8 put /Users/rsc/foo.go
8 del /Users/rsc/foo.go

This lets acme-aware programs react to file writes, for example
compiling code, running a test, or updating an import block.

TBR=r
R=r
https://codereview.appspot.com/89560044
2014-04-30 12:14:29 -04:00
Russ Cox
833216fef8 acme: add comment for aligned writes
TBR=r
https://codereview.appspot.com/89510044
2014-04-19 13:44:06 -04:00
Russ Cox
1d2c3c3945 acme: use buffered i/o to write file
Bakul Shah has observed corrupted files being written
when acme writes over osxfuse to sshfs to a remote file system.
In one example we examined, acme is writing an 0xf03-byte
file in two system calls, first an 0x806-byte write and then a 0x6fd-byte
write. (0x806 is BUFSIZE/sizeof(Rune); this file has no multibyte UTF-8.)

What actually ends up happening is that an 0x806-byte file is written:

        0x000-0x6fd contains what should be 0x806-0xf03
        0x6fd-0x7fa contains zeros
        0x7fa-0x806 contains what should be 0x7fa-0x806 (correct!)

The theory is that fuse or sshfs or perhaps the remote file server is
mishandling the unaligned writes. acme does not seem to be at fault.

Using bio here will make the writes align to 8K boundaries,
avoiding the bugs in whatever underlying piece is broken.

TBR=r
https://codereview.appspot.com/89550043
2014-04-19 10:09:22 -04:00
Russ Cox
d213189122 acme: fix Get of dir in nameless window (thanks Colton Lewis)
TBR=r
https://codereview.appspot.com/89390043
2014-04-18 14:03:46 -04:00
Ethan Burns
4030a6c905 acme: copy/cut/paste with ctl+c,x,v
LGTM=rsc
R=rsc
CC=plan9port.codebot
https://codereview.appspot.com/69070045
2014-03-13 18:48:41 -04:00
Russ Cox
219cf22d68 acme, sam: handle >1GB files correctly
TBR=rsc
https://codereview.appspot.com/74060043
2014-03-13 18:46:28 -04:00
Rob Pike
5a69e405fc acme: scroll a directory window when navigating if:
- the cursor is on the last line
        - the navigation would put the cursor over the tag of the following text

R=rsc
CC=smckean83
https://codereview.appspot.com/15280045
2013-10-22 16:47:48 -07:00
Marius Eriksen
fea86f0639 acme: execute commands with / using shell
This allows commands in bin subdirectories.

R=rsc
CC=plan9port.codebot
https://codereview.appspot.com/13254044
2013-09-06 16:23:49 -04:00
Akshat Kumar
7603066e73 acme Mail: add Search command
Introduces the Search command for mailboxes.
Arguments passed are treated as one space-
separated string, passed on to mailfs' IMAP
search interface.

R=rsc, david.ducolombier
CC=plan9port.codebot
https://codereview.appspot.com/13238044
2013-09-06 16:19:57 -04:00
Akshat Kumar
951fef52c9 mailfs: allow spaces in box name
Mail services (such as Google Mail) will often have
directories with names that contain spaces. Acme
does not support spaces in window names. So, replace
spaces in mail directory names with the Unicode
character for visible space.

The code is a bit of an over-approximation and
generally non-optimal.

R=rsc, david.ducolombier, 0intro
CC=plan9port.codebot
https://codereview.appspot.com/13010048
2013-09-06 16:10:26 -04:00
Russ Cox
2bc9a13faf acme: allow :6 in 5-line file
R=rsc
https://codereview.appspot.com/12162043
2013-07-31 09:15:30 -04:00
Russ Cox
c96d832508 acme: retina scaling for scroll bars, button
R=rsc
http://codereview.appspot.com/6854094
2012-11-26 00:33:05 -05:00
Marius Eriksen
2589c5c6ee acme: set $samfile (same as $%) during execution
R=rsc
CC=plan9port.codebot
http://codereview.appspot.com/6854092
2012-11-25 22:56:08 -05:00
Russ Cox
9ca6e21f3d acme: use threadspawnd to avoid changing "." of current process
R=rsc
http://codereview.appspot.com/6736060
2012-10-22 12:32:31 -04:00
Marius Eriksen
81c2c5e775 acme: add $acmeshell to control execution shell
R=rsc
CC=plan9port.codebot
http://codereview.appspot.com/6614056
2012-10-21 16:52:08 -04:00
Russ Cox
220c15d2b7 fix gcc 4.7 warnings (thanks Tuncer Ayaz)
R=rsc
http://codereview.appspot.com/6744053
2012-10-20 13:36:52 -04:00
Erik Quanstrom
5b6028903d acme: correct writes of runes on auspicious byte boundaries
R=rsc, r
CC=plan9port.codebot
http://codereview.appspot.com/6586067
2012-10-05 16:42:25 -04:00
Russ Cox
37f8ed2410 acme: mouse movement for Del
If the mouse was in the tag of the old window,
it was most likely pointing at Del. If bringing up a
new window from below and not moving the mouse
somewhere else, adjust it so that it ends up pointing
at Del in the replacement window's tag too.
This makes it easy to Del a sequence of windows in
a column, from top to bottom.

http://www.youtube.com/watch?v=ET8w6RT6u5M

R=r
http://codereview.appspot.com/6558047
2012-09-23 22:01:56 -04:00
David Jeannot
258cfab2fe acme: claim input focus earlier
R=rsc
CC=plan9port.codebot
http://codereview.appspot.com/5505091
2012-01-16 17:05:39 -05:00
Sean McKean
81c30b5a75 acme: fix arrow near end of text
R=rsc
CC=plan9port.codebot
http://codereview.appspot.com/5399050
2011-11-17 14:46:14 -05:00
David Jeannot
a287dbab23 devdraw: draft cocoa support
R=rsc
CC=plan9port.codebot
http://codereview.appspot.com/4974060
2011-09-06 10:10:43 -04:00
Russ Cox
da7e3a5d39 acme: fix iq1 adjust bug
R=rsc
http://codereview.appspot.com/4816066
2011-08-02 07:57:48 -04:00
Russ Cox
76864eb6cd acme: scrolling fixes + new home/end
Home and End previously navigated between
two different window locations: the top and
the bottom of the text.  Now they include a
third waypoint: the location where typing last
happened.  Thus, in a win window, typing
	ls -l
	<home>
scrolls to the beginning of the ls -l output.
A second <home> continues to the top of the file.

Makes Send scroll always, along with writes by
external programs to +Errors.

R=r
CC=mccoyst
http://codereview.appspot.com/4830051
2011-08-02 07:44:11 -04:00
Russ Cox
67afaf385a acme: allow :?regexp for backward search
Fixes issue 80.

R=rsc
http://codereview.appspot.com/4662088
2011-07-10 20:35:23 -04:00
Russ Cox
ff4512ee90 acme: fix out of order address crash
R=rsc
http://codereview.appspot.com/4690042
2011-07-10 20:32:01 -04:00
David du Colombier
363062eab4 acme Mail: drop noscroll
R=rsc
CC=plan9port.codebot
http://codereview.appspot.com/4539098
2011-06-01 18:12:12 -04:00
Russ Cox
ba31ab3044 9term, acme: autoscroll
Ignore scroll/noscroll window setting.
Instead, scroll when the write begins in
or immediately after the displayed window content.

In the new scrolling discipline, executing
"Noscroll" is replaced by typing Page Up or
using the mouse to scroll higher in the buffer,
and executing "Scroll" is replaced by typing End
or using the mouse to scroll to the bottom of
the buffer.

R=r, r2
http://codereview.appspot.com/4433060
2011-04-27 13:18:07 -04:00