[Emacs-diffs] Changes to emacs/src/xterm.c

[Jan Djärv]

Index: emacs/src/xterm.c
diff -c emacs/src/xterm.c:1.770 emacs/src/xterm.c:1.771
*** emacs/src/xterm.c:1.770     Tue Feb  4 09:03:17 2003
--- emacs/src/xterm.c   Fri Feb  7 11:38:53 2003
***************
*** 12432,12446 ****
      text.encoding = XA_STRING;
      text.format = 8;
      text.nitems = strlen (icon_name);
! #ifdef USE_X_TOOLKIT
!     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 */
    }
  #else /* not HAVE_X11R4 */
!   XSetIconName (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), icon_name);
  #endif /* not HAVE_X11R4 */
  
    if (f->output_data.x->icon_bitmap > 0)
--- 12432,12441 ----
      text.encoding = XA_STRING;
      text.format = 8;
      text.nitems = strlen (icon_name);
!     XSetWMIconName (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), &text);
    }
  #else /* not HAVE_X11R4 */
!   XSetIconName (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), icon_name);
  #endif /* not HAVE_X11R4 */
  
    if (f->output_data.x->icon_bitmap > 0)
***************
*** 13624,13634 ****
    if (f->async_visible)
      {
        BLOCK_INPUT;
! #ifdef USE_X_TOOLKIT
!       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 */
        XFlush (FRAME_X_DISPLAY (f));
        UNBLOCK_INPUT;
      }
--- 13619,13625 ----
    if (f->async_visible)
      {
        BLOCK_INPUT;
!       XRaiseWindow (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f));
        XFlush (FRAME_X_DISPLAY (f));
        UNBLOCK_INPUT;
      }
***************
*** 13643,13653 ****
    if (f->async_visible)
      {
        BLOCK_INPUT;
! #ifdef USE_X_TOOLKIT
!       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 */
        XFlush (FRAME_X_DISPLAY (f));
        UNBLOCK_INPUT;
      }
--- 13634,13640 ----
    if (f->async_visible)
      {
        BLOCK_INPUT;
!       XLowerWindow (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f));
        XFlush (FRAME_X_DISPLAY (f));
        UNBLOCK_INPUT;
      }
***************
*** 13837,13848 ****
  {
    Window window;
  
- #ifdef USE_X_TOOLKIT
    /* Use the frame's outermost window, not the one we normally draw on.  */
!   window = XtWindow (f->output_data.x->widget);
! #else /* not USE_X_TOOLKIT */
!   window = FRAME_X_WINDOW (f);
! #endif /* not USE_X_TOOLKIT */
  
    /* Don't keep the highlight on an invisible frame.  */
    if (FRAME_X_DISPLAY_INFO (f)->x_highlight_frame == f)
--- 13824,13831 ----
  {
    Window window;
  
    /* Use the frame's outermost window, not the one we normally draw on.  */
!   window = FRAME_OUTER_WINDOW (f);
  
    /* Don't keep the highlight on an invisible frame.  */
    if (FRAME_X_DISPLAY_INFO (f)->x_highlight_frame == f)
***************
*** 14413,14423 ****
       struct frame *f;
       int icon_x, icon_y;
  {
! #ifdef USE_X_TOOLKIT
!   Window window = XtWindow (f->output_data.x->widget);
! #else
!   Window window = FRAME_X_WINDOW (f);
! #endif
  
    f->output_data.x->wm_hints.flags |= IconPositionHint;
    f->output_data.x->wm_hints.icon_x = icon_x;
--- 14396,14402 ----
       struct frame *f;
       int icon_x, icon_y;
  {
!   Window window = FRAME_OUTER_WINDOW (f);
  
    f->output_data.x->wm_hints.flags |= IconPositionHint;
    f->output_data.x->wm_hints.icon_x = icon_x;