/[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.805 by miles, Tue Aug 19 16:20:13 2003 UTC revision 1.806 by jhd, Thu Aug 21 19:54:47 2003 UTC
# Line 10136  x_term_init (display_name, xrm_option, r Line 10136  x_term_init (display_name, xrm_option, r
10136    if (!x_initialized)    if (!x_initialized)
10137      {      {
10138        x_initialize ();        x_initialize ();
10139        x_initialized = 1;        ++x_initialized;
10140      }      }
10141    
10142  #ifdef USE_GTK  #ifdef USE_GTK
# Line 10152  x_term_init (display_name, xrm_option, r Line 10152  x_term_init (display_name, xrm_option, r
10152      if (x_initialized > 1)      if (x_initialized > 1)
10153        return 0;        return 0;
10154    
     x_initialized++;  
   
10155      for (argc = 0; argc < NUM_ARGV; ++argc)      for (argc = 0; argc < NUM_ARGV; ++argc)
10156        argv[argc] = 0;        argv[argc] = 0;
10157    
# Line 10343  x_term_init (display_name, xrm_option, r Line 10341  x_term_init (display_name, xrm_option, r
10341    dpyinfo->height = HeightOfScreen (dpyinfo->screen);    dpyinfo->height = HeightOfScreen (dpyinfo->screen);
10342    dpyinfo->width = WidthOfScreen (dpyinfo->screen);    dpyinfo->width = WidthOfScreen (dpyinfo->screen);
10343    dpyinfo->root_window = RootWindowOfScreen (dpyinfo->screen);    dpyinfo->root_window = RootWindowOfScreen (dpyinfo->screen);
10344      dpyinfo->client_leader_window = 0;
10345    dpyinfo->grabbed = 0;    dpyinfo->grabbed = 0;
10346    dpyinfo->reference_count = 0;    dpyinfo->reference_count = 0;
10347    dpyinfo->icon_bitmap_id = -1;    dpyinfo->icon_bitmap_id = -1;
# Line 10412  x_term_init (display_name, xrm_option, r Line 10411  x_term_init (display_name, xrm_option, r
10411      = XInternAtom (dpyinfo->display, "WM_CONFIGURE_DENIED", False);      = XInternAtom (dpyinfo->display, "WM_CONFIGURE_DENIED", False);
10412    dpyinfo->Xatom_wm_window_moved    dpyinfo->Xatom_wm_window_moved
10413      = XInternAtom (dpyinfo->display, "WM_MOVED", False);      = XInternAtom (dpyinfo->display, "WM_MOVED", False);
10414      dpyinfo->Xatom_wm_client_leader
10415        = XInternAtom (dpyinfo->display, "WM_CLIENT_LEADER", False);
10416    dpyinfo->Xatom_editres    dpyinfo->Xatom_editres
10417      = XInternAtom (dpyinfo->display, "Editres", False);      = XInternAtom (dpyinfo->display, "Editres", False);
10418    dpyinfo->Xatom_CLIPBOARD    dpyinfo->Xatom_CLIPBOARD
# Line 10566  x_term_init (display_name, xrm_option, r Line 10567  x_term_init (display_name, xrm_option, r
10567  #endif  #endif
10568    }    }
10569    
10570    #ifdef HAVE_X_SM
10571      /* Only do this for the first display.  */
10572      if (x_initialized == 1)
10573        x_session_initialize (dpyinfo);
10574    #endif
10575    
10576    UNBLOCK_INPUT;    UNBLOCK_INPUT;
10577    
10578    return dpyinfo;    return dpyinfo;
# Line 10779  x_initialize () Line 10786  x_initialize ()
10786  #endif /* SIGWINCH */  #endif /* SIGWINCH */
10787    
10788    signal (SIGPIPE, x_connection_signal);    signal (SIGPIPE, x_connection_signal);
   
 #ifdef HAVE_X_SM  
   x_session_initialize ();  
 #endif  
10789  }  }
10790    
10791    

Legend:
Removed from v.1.805  
changed lines
  Added in v.1.806

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