Mercurial > emacs
annotate test/indent/modula2.mod @ 111560:22fafcf25a54
Cleanup of window coordinate positioning code.
Now, text area click input events measure Y from the top of the text
area, excluding the header line if any.
* src/dispnew.c (buffer_posn_from_coords): Assume that X counts from
the start of the text area.
* src/keyboard.c (make_lispy_position): For text area clicks, record Y
pixel position relative to the text area, excluding header line.
Also change X and Y to Lisp_Objects, not pointers; don't return
coordinate values via pointers. Pass ON_TEXT_AREA coordinate to
buffer_posn_from_coords counting from the start of the text area.
(Fposn_at_x_y, make_lispy_event): Callers changed.
* src/w32term.c (w32_read_socket):
* src/msdos.c (dos_rawgetc):
* src/xterm.c (handle_one_xevent): Likewise.
* src/window.c (coordinates_in_window): Change X and Y to ints rather
than pointers; don't return coordinates via pointers.
(struct check_window_data): Change X and Y from pointers to ints.
(window_from_coordinates): Remove args WX and WY; don't return
coordinates via pointers.
(Fcoordinates_in_window_p, window_from_coordinates):
(check_window_containing, Fwindow_at): Callers changed.
(window_relative_x_coord): New function.
* src/window.h (window_from_coordinates, window_relative_x_coord):
Update prototypes.
* src/xdisp.c (remember_mouse_glyph): Change window_from_coordinates
call. Use window_relative_x_coord.
(note_mouse_highlight): Change window_from_coordinates call.
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Tue, 16 Nov 2010 14:59:24 -0500 |
parents | d9d916379aff |
children |
rev | line source |
---|---|
111498
d9d916379aff
* lisp/progmodes/modula2.el: Use SMIE and skeleton.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1 (* -*- mode: modula-2; m2-indent:3 -*- *) |
d9d916379aff
* lisp/progmodes/modula2.el: Use SMIE and skeleton.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2 |
d9d916379aff
* lisp/progmodes/modula2.el: Use SMIE and skeleton.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
3 IMPLEMENTATION MODULE Indent ; |
d9d916379aff
* lisp/progmodes/modula2.el: Use SMIE and skeleton.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
4 |
d9d916379aff
* lisp/progmodes/modula2.el: Use SMIE and skeleton.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
5 (* This is (* a nested comment *) *) |
d9d916379aff
* lisp/progmodes/modula2.el: Use SMIE and skeleton.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
6 // This is a single-line comment. |
d9d916379aff
* lisp/progmodes/modula2.el: Use SMIE and skeleton.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
7 |
d9d916379aff
* lisp/progmodes/modula2.el: Use SMIE and skeleton.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
8 FROM SYSTEM IMPORT ADR, TSIZE, SIZE, WORD ; |
d9d916379aff
* lisp/progmodes/modula2.el: Use SMIE and skeleton.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
9 |
d9d916379aff
* lisp/progmodes/modula2.el: Use SMIE and skeleton.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
10 CONST |
d9d916379aff
* lisp/progmodes/modula2.el: Use SMIE and skeleton.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
11 c1 = 2; |
d9d916379aff
* lisp/progmodes/modula2.el: Use SMIE and skeleton.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
12 |
d9d916379aff
* lisp/progmodes/modula2.el: Use SMIE and skeleton.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
13 TYPE |
d9d916379aff
* lisp/progmodes/modula2.el: Use SMIE and skeleton.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
14 t = POINTER TO ARRAY [0..10] OF LONGINT; |
d9d916379aff
* lisp/progmodes/modula2.el: Use SMIE and skeleton.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
15 |
d9d916379aff
* lisp/progmodes/modula2.el: Use SMIE and skeleton.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
16 VAR x: t; |
d9d916379aff
* lisp/progmodes/modula2.el: Use SMIE and skeleton.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
17 y:LONGINT; |
d9d916379aff
* lisp/progmodes/modula2.el: Use SMIE and skeleton.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
18 |
d9d916379aff
* lisp/progmodes/modula2.el: Use SMIE and skeleton.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
19 |
d9d916379aff
* lisp/progmodes/modula2.el: Use SMIE and skeleton.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
20 PROCEDURE f1 (f: File) : INTEGER ; |
d9d916379aff
* lisp/progmodes/modula2.el: Use SMIE and skeleton.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
21 VAR |
d9d916379aff
* lisp/progmodes/modula2.el: Use SMIE and skeleton.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
22 fd: FileDescriptor ; |
d9d916379aff
* lisp/progmodes/modula2.el: Use SMIE and skeleton.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
23 PROCEDURE foo (a:CARDINAL) : INTEGER; |
d9d916379aff
* lisp/progmodes/modula2.el: Use SMIE and skeleton.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
24 BEGIN |
d9d916379aff
* lisp/progmodes/modula2.el: Use SMIE and skeleton.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
25 END foo; |
d9d916379aff
* lisp/progmodes/modula2.el: Use SMIE and skeleton.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
26 BEGIN |
d9d916379aff
* lisp/progmodes/modula2.el: Use SMIE and skeleton.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
27 IF f#Error |
d9d916379aff
* lisp/progmodes/modula2.el: Use SMIE and skeleton.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
28 THEN |
d9d916379aff
* lisp/progmodes/modula2.el: Use SMIE and skeleton.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
29 fd := GetIndice(FileInfo, f) ; |
d9d916379aff
* lisp/progmodes/modula2.el: Use SMIE and skeleton.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
30 IF fd#NIL THEN |
d9d916379aff
* lisp/progmodes/modula2.el: Use SMIE and skeleton.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
31 RETURN( fd^.unixfd ) |
d9d916379aff
* lisp/progmodes/modula2.el: Use SMIE and skeleton.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
32 ELSE |
d9d916379aff
* lisp/progmodes/modula2.el: Use SMIE and skeleton.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
33 CASE z OF |
d9d916379aff
* lisp/progmodes/modula2.el: Use SMIE and skeleton.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
34 1: do1(); |
d9d916379aff
* lisp/progmodes/modula2.el: Use SMIE and skeleton.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
35 | 2: do2(); |
d9d916379aff
* lisp/progmodes/modula2.el: Use SMIE and skeleton.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
36 toto(x); |
d9d916379aff
* lisp/progmodes/modula2.el: Use SMIE and skeleton.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
37 | 3: ; |
d9d916379aff
* lisp/progmodes/modula2.el: Use SMIE and skeleton.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
38 | 4: do4(); |
d9d916379aff
* lisp/progmodes/modula2.el: Use SMIE and skeleton.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
39 ELSE do5(); |
d9d916379aff
* lisp/progmodes/modula2.el: Use SMIE and skeleton.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
40 END ; (* CASE selection *) |
d9d916379aff
* lisp/progmodes/modula2.el: Use SMIE and skeleton.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
41 |
d9d916379aff
* lisp/progmodes/modula2.el: Use SMIE and skeleton.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
42 END |
d9d916379aff
* lisp/progmodes/modula2.el: Use SMIE and skeleton.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
43 END ; |
d9d916379aff
* lisp/progmodes/modula2.el: Use SMIE and skeleton.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
44 FormatError1('file %d has not been opened or is out of range\n', f) ; |
d9d916379aff
* lisp/progmodes/modula2.el: Use SMIE and skeleton.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
45 RETURN( -1 ) |
d9d916379aff
* lisp/progmodes/modula2.el: Use SMIE and skeleton.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
46 END f1 ; |
d9d916379aff
* lisp/progmodes/modula2.el: Use SMIE and skeleton.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
47 |
d9d916379aff
* lisp/progmodes/modula2.el: Use SMIE and skeleton.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
48 |
d9d916379aff
* lisp/progmodes/modula2.el: Use SMIE and skeleton.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
49 BEGIN |
d9d916379aff
* lisp/progmodes/modula2.el: Use SMIE and skeleton.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
50 init |
d9d916379aff
* lisp/progmodes/modula2.el: Use SMIE and skeleton.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
51 FINALLY |
d9d916379aff
* lisp/progmodes/modula2.el: Use SMIE and skeleton.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
52 done |
d9d916379aff
* lisp/progmodes/modula2.el: Use SMIE and skeleton.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
53 END Indent. |