* m68k merges

rtl/unix/mouse.pp

@@ -224,7 +224,10 @@ begin
    exit(0);
 {$ifndef NOGPM}
   Gpm_GetSnapshot(e);
-  GetMouseY:=e.y-1;
+  if e.y>0 then
+   GetMouseY:=e.y-1
+  else
+   GetMouseY:=0;
 {$endif ndef NOGPM}
 {$endif ndef NOMOUSE}
 end;
@@ -287,8 +290,14 @@ begin
    exit;
 {$ifndef NOGPM}
   Gpm_GetEvent(e);
-  MouseEvent.x:=e.x-1;
-  MouseEvent.y:=e.y-1;
+  if e.x>0 then
+   MouseEvent.x:=e.x-1
+  else
+   MouseEvent.x:=0;
+  if e.y>0 then
+   MouseEvent.y:=e.y-1
+  else
+   MouseEvent.y:=0;
   MouseEvent.buttons:=0;
   if e.buttons and Gpm_b_left<>0 then
    inc(MouseEvent.buttons,1);
@@ -359,8 +368,14 @@ begin
   if (gpm_fs=-2) or (Select(gpm_fs+1,@fds,nil,nil,1)>0) then
    begin
      Gpm_GetSnapshot(e);
-     MouseEvent.x:=e.x-1;
-     MouseEvent.y:=e.y-1;
+     if e.x>0 then
+      MouseEvent.x:=e.x-1
+     else
+      MouseEvent.x:=0;
+     if e.y>0 then
+      MouseEvent.y:=e.y-1
+     else
+      MouseEvent.y:=0;
      MouseEvent.buttons:=0;
      if e.buttons and Gpm_b_left<>0 then
       inc(MouseEvent.buttons,1);
@@ -390,7 +405,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.2  2001-01-21 20:21:40  marco
+  Revision 1.3  2001-08-05 12:24:20  peter
+    * m68k merges
+
+  Revision 1.2  2001/01/21 20:21:40  marco
    * Rename fest II. Rtl OK
 
   Revision 1.1  2001/01/13 11:03:58  peter

rtl/unix/sysunix.inc

@@ -67,7 +67,7 @@ begin
    begin
      str(sys_getpid,hs);
      {$ifdef FreeBSD}
-      hs:='/proc/'+hs+'/file'#0; 
+      hs:='/proc/'+hs+'/file'#0;
      {$else}
       hs:='/proc/'+hs+'/exe'#0;
      {$endif}
@@ -192,8 +192,11 @@ begin
   Sys_ENOTDIR : Inoutres:=3;
     Sys_EROFS,
    Sys_EEXIST,
+   Sys_EISDIR,
    Sys_EACCES : Inoutres:=5;
   Sys_ETXTBSY : Inoutres:=162;
+  else
+    InOutRes := Integer(Errno);
   end;
 end;
 
@@ -718,7 +721,10 @@ End.
 
 {
   $Log$
-  Revision 1.15  2001-07-16 19:51:36  marco
+  Revision 1.16  2001-08-05 12:24:20  peter
+    * m68k merges
+
+  Revision 1.15  2001/07/16 19:51:36  marco
    * A small note, copied from the Solaris patch. Do_close needs errnotoiores?
 
   Revision 1.14  2001/07/15 11:57:16  peter