/[emacs]/emacs/src/w32term.c
ViewVC logotype

Diff of /emacs/src/w32term.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.165 by kfstorm, Fri Aug 30 12:03:28 2002 UTC revision 1.166 by kfstorm, Fri Aug 30 13:19:45 2002 UTC
# Line 6001  static void Line 6001  static void
6001  x_frame_rehighlight (dpyinfo)  x_frame_rehighlight (dpyinfo)
6002       struct w32_display_info *dpyinfo;       struct w32_display_info *dpyinfo;
6003  {  {
6004    struct frame *old_highlight = dpyinfo->w32_highlight_frame;    struct frame *old_highlight = dpyinfo->x_highlight_frame;
6005    
6006    if (dpyinfo->w32_focus_frame)    if (dpyinfo->w32_focus_frame)
6007      {      {
6008        dpyinfo->w32_highlight_frame        dpyinfo->x_highlight_frame
6009          = ((GC_FRAMEP (FRAME_FOCUS_FRAME (dpyinfo->w32_focus_frame)))          = ((GC_FRAMEP (FRAME_FOCUS_FRAME (dpyinfo->w32_focus_frame)))
6010             ? XFRAME (FRAME_FOCUS_FRAME (dpyinfo->w32_focus_frame))             ? XFRAME (FRAME_FOCUS_FRAME (dpyinfo->w32_focus_frame))
6011             : dpyinfo->w32_focus_frame);             : dpyinfo->w32_focus_frame);
6012        if (! FRAME_LIVE_P (dpyinfo->w32_highlight_frame))        if (! FRAME_LIVE_P (dpyinfo->x_highlight_frame))
6013          {          {
6014            FRAME_FOCUS_FRAME (dpyinfo->w32_focus_frame) = Qnil;            FRAME_FOCUS_FRAME (dpyinfo->w32_focus_frame) = Qnil;
6015            dpyinfo->w32_highlight_frame = dpyinfo->w32_focus_frame;            dpyinfo->x_highlight_frame = dpyinfo->w32_focus_frame;
6016          }          }
6017      }      }
6018    else    else
6019      dpyinfo->w32_highlight_frame = 0;      dpyinfo->x_highlight_frame = 0;
6020    
6021    if (dpyinfo->w32_highlight_frame != old_highlight)    if (dpyinfo->x_highlight_frame != old_highlight)
6022      {      {
6023        if (old_highlight)        if (old_highlight)
6024          frame_unhighlight (old_highlight);          frame_unhighlight (old_highlight);
6025        if (dpyinfo->w32_highlight_frame)        if (dpyinfo->x_highlight_frame)
6026          frame_highlight (dpyinfo->w32_highlight_frame);          frame_highlight (dpyinfo->x_highlight_frame);
6027      }      }
6028  }  }
6029    
# Line 10757  x_make_frame_invisible (f) Line 10757  x_make_frame_invisible (f)
10757       struct frame *f;       struct frame *f;
10758  {  {
10759    /* Don't keep the highlight on an invisible frame.  */    /* Don't keep the highlight on an invisible frame.  */
10760    if (FRAME_W32_DISPLAY_INFO (f)->w32_highlight_frame == f)    if (FRAME_W32_DISPLAY_INFO (f)->x_highlight_frame == f)
10761      FRAME_W32_DISPLAY_INFO (f)->w32_highlight_frame = 0;      FRAME_W32_DISPLAY_INFO (f)->x_highlight_frame = 0;
10762        
10763    BLOCK_INPUT;    BLOCK_INPUT;
10764        
# Line 10786  x_iconify_frame (f) Line 10786  x_iconify_frame (f)
10786    Lisp_Object type;    Lisp_Object type;
10787    
10788    /* Don't keep the highlight on an invisible frame.  */    /* Don't keep the highlight on an invisible frame.  */
10789    if (FRAME_W32_DISPLAY_INFO (f)->w32_highlight_frame == f)    if (FRAME_W32_DISPLAY_INFO (f)->x_highlight_frame == f)
10790      FRAME_W32_DISPLAY_INFO (f)->w32_highlight_frame = 0;      FRAME_W32_DISPLAY_INFO (f)->x_highlight_frame = 0;
10791    
10792    if (f->async_iconified)    if (f->async_iconified)
10793      return;      return;
# Line 10841  x_free_frame_resources (f) Line 10841  x_free_frame_resources (f)
10841      dpyinfo->w32_focus_frame = 0;      dpyinfo->w32_focus_frame = 0;
10842    if (f == dpyinfo->w32_focus_event_frame)    if (f == dpyinfo->w32_focus_event_frame)
10843      dpyinfo->w32_focus_event_frame = 0;      dpyinfo->w32_focus_event_frame = 0;
10844    if (f == dpyinfo->w32_highlight_frame)    if (f == dpyinfo->x_highlight_frame)
10845      dpyinfo->w32_highlight_frame = 0;      dpyinfo->x_highlight_frame = 0;
10846    
10847    if (f == dpyinfo->mouse_face_mouse_frame)    if (f == dpyinfo->mouse_face_mouse_frame)
10848      {      {

Legend:
Removed from v.1.165  
changed lines
  Added in v.1.166

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26