Changeset 4197

Show
Ignore:
Timestamp:
2007年04月04日 20時46分45秒 (1 year ago)
Author:
miyoshi
Message:

(compute_tip_xy): Sync up with Emacs CVS HEAD.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/ChangeLog.Meadow

    r4196 r4197  
     12007-04-04  MIYOSHI Masanori  <miyoshi@meadowy.org> 
     2 
     3        * mw32fns.c (compute_tip_xy): Sync up with Emacs CVS HEAD. 
     4 
    152007-03-21  MIYOSHI Masanori  <miyoshi@meadowy.org> 
    26 

  • trunk/src/mw32fns.c

    r4192 r4197  
    42714271  if (INTEGERP (top)) 
    42724272    *root_y = XINT (top); 
    4273   else if (*root_y + XINT (dy) - height < 0) 
    4274     *root_y -= XINT (dy); 
     4273  else if (*root_y + XINT (dy) <= 0) 
     4274    *root_y = 0; /* Can happen for negative dy */ 
     4275  else if (*root_y + XINT (dy) + height <= FRAME_MW32_DISPLAY_INFO (f)->height) 
     4276    /* It fits below the pointer */ 
     4277      *root_y += XINT (dy); 
     4278  else if (height + XINT (dy) <= *root_y) 
     4279    /* It fits above the pointer.  */ 
     4280    *root_y -= height + XINT (dy); 
    42754281  else 
    4276     { 
    4277       *root_y -= height; 
    4278       *root_y += XINT (dy); 
    4279     } 
     4282    /* Put it on the top.  */ 
     4283    *root_y = 0; 
    42804284 
    42814285  if (INTEGERP (left)) 
    42824286    *root_x = XINT (left); 
     4287  else if (*root_x + XINT (dx) <= 0) 
     4288    *root_x = 0; /* Can happen for negative dx */ 
    42834289  else if (*root_x + XINT (dx) + width <= FRAME_MW32_DISPLAY_INFO (f)->width) 
    42844290    /* It fits to the right of the pointer.  */