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

Diff of /emacs/src/xterm.c

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

revision 1.770 by lektu, Tue Feb 4 14:03:17 2003 UTC revision 1.771 by jhd, Fri Feb 7 16:38:53 2003 UTC
# Line 12432  x_text_icon (f, icon_name) Line 12432  x_text_icon (f, icon_name)
12432      text.encoding = XA_STRING;      text.encoding = XA_STRING;
12433      text.format = 8;      text.format = 8;
12434      text.nitems = strlen (icon_name);      text.nitems = strlen (icon_name);
12435  #ifdef USE_X_TOOLKIT      XSetWMIconName (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), &text);
     XSetWMIconName (FRAME_X_DISPLAY (f), XtWindow (f->output_data.x->widget),  
                     &text);  
 #else /* not USE_X_TOOLKIT */  
     XSetWMIconName (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), &text);  
 #endif /* not USE_X_TOOLKIT */  
12436    }    }
12437  #else /* not HAVE_X11R4 */  #else /* not HAVE_X11R4 */
12438    XSetIconName (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), icon_name);    XSetIconName (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), icon_name);
12439  #endif /* not HAVE_X11R4 */  #endif /* not HAVE_X11R4 */
12440    
12441    if (f->output_data.x->icon_bitmap > 0)    if (f->output_data.x->icon_bitmap > 0)
# Line 13624  x_raise_frame (f) Line 13619  x_raise_frame (f)
13619    if (f->async_visible)    if (f->async_visible)
13620      {      {
13621        BLOCK_INPUT;        BLOCK_INPUT;
13622  #ifdef USE_X_TOOLKIT        XRaiseWindow (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f));
       XRaiseWindow (FRAME_X_DISPLAY (f), XtWindow (f->output_data.x->widget));  
 #else /* not USE_X_TOOLKIT */  
       XRaiseWindow (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f));  
 #endif /* not USE_X_TOOLKIT */  
13623        XFlush (FRAME_X_DISPLAY (f));        XFlush (FRAME_X_DISPLAY (f));
13624        UNBLOCK_INPUT;        UNBLOCK_INPUT;
13625      }      }
# Line 13643  x_lower_frame (f) Line 13634  x_lower_frame (f)
13634    if (f->async_visible)    if (f->async_visible)
13635      {      {
13636        BLOCK_INPUT;        BLOCK_INPUT;
13637  #ifdef USE_X_TOOLKIT        XLowerWindow (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f));
       XLowerWindow (FRAME_X_DISPLAY (f), XtWindow (f->output_data.x->widget));  
 #else /* not USE_X_TOOLKIT */  
       XLowerWindow (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f));  
 #endif /* not USE_X_TOOLKIT */  
13638        XFlush (FRAME_X_DISPLAY (f));        XFlush (FRAME_X_DISPLAY (f));
13639        UNBLOCK_INPUT;        UNBLOCK_INPUT;
13640      }      }
# Line 13837  x_make_frame_invisible (f) Line 13824  x_make_frame_invisible (f)
13824  {  {
13825    Window window;    Window window;
13826    
 #ifdef USE_X_TOOLKIT  
13827    /* Use the frame's outermost window, not the one we normally draw on.  */    /* Use the frame's outermost window, not the one we normally draw on.  */
13828    window = XtWindow (f->output_data.x->widget);    window = FRAME_OUTER_WINDOW (f);
 #else /* not USE_X_TOOLKIT */  
   window = FRAME_X_WINDOW (f);  
 #endif /* not USE_X_TOOLKIT */  
13829    
13830    /* Don't keep the highlight on an invisible frame.  */    /* Don't keep the highlight on an invisible frame.  */
13831    if (FRAME_X_DISPLAY_INFO (f)->x_highlight_frame == f)    if (FRAME_X_DISPLAY_INFO (f)->x_highlight_frame == f)
# Line 14413  x_wm_set_icon_position (f, icon_x, icon_ Line 14396  x_wm_set_icon_position (f, icon_x, icon_
14396       struct frame *f;       struct frame *f;
14397       int icon_x, icon_y;       int icon_x, icon_y;
14398  {  {
14399  #ifdef USE_X_TOOLKIT    Window window = FRAME_OUTER_WINDOW (f);
   Window window = XtWindow (f->output_data.x->widget);  
 #else  
   Window window = FRAME_X_WINDOW (f);  
 #endif  
14400    
14401    f->output_data.x->wm_hints.flags |= IconPositionHint;    f->output_data.x->wm_hints.flags |= IconPositionHint;
14402    f->output_data.x->wm_hints.icon_x = icon_x;    f->output_data.x->wm_hints.icon_x = icon_x;

Legend:
Removed from v.1.770  
changed lines
  Added in v.1.771

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