view 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.

(* -*- mode: modula-2; m2-indent:3 -*- *)

IMPLEMENTATION MODULE Indent ;

(* This is (* a nested comment *) *)
// This is a single-line comment.

FROM SYSTEM IMPORT ADR, TSIZE, SIZE, WORD ;

CONST
   c1 = 2;

TYPE
   t = POINTER TO ARRAY [0..10] OF LONGINT;

VAR x: t;
    y:LONGINT;


PROCEDURE f1 (f: File) : INTEGER ;
   VAR
      fd: FileDescriptor ;
   PROCEDURE foo (a:CARDINAL) : INTEGER;
   BEGIN
   END foo;
BEGIN
   IF f#Error
   THEN
      fd := GetIndice(FileInfo, f) ;
      IF fd#NIL THEN
         RETURN( fd^.unixfd )
      ELSE
         CASE z OF
            1: do1();
          | 2: do2();
               toto(x);
          | 3: ;
          | 4: do4();
         ELSE do5();
         END ; (* CASE selection *)

      END
   END ;
   FormatError1('file %d has not been opened or is out of range\n', f) ;
   RETURN( -1 )
END f1 ;


BEGIN
   init
FINALLY
   done
END Indent.