Mercurial > emacs
comparison src/xterm.h @ 111449:132f2dfd549f
Merge from emacs-23
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Tue, 09 Nov 2010 15:07:10 -0500 |
| parents | 2186ab0af4a5 ee70db35f80f |
| children | 4f757d8e8ed7 |
comparison
equal
deleted
inserted
replaced
| 111448:321fbae3e04d | 111449:132f2dfd549f |
|---|---|
| 335 Atom *net_supported_atoms; | 335 Atom *net_supported_atoms; |
| 336 int nr_net_supported_atoms; | 336 int nr_net_supported_atoms; |
| 337 Window net_supported_window; | 337 Window net_supported_window; |
| 338 Atom Xatom_net_window_type, Xatom_net_window_type_tooltip; | 338 Atom Xatom_net_window_type, Xatom_net_window_type_tooltip; |
| 339 | 339 |
| 340 /* Atoms dealing with maximization and fullscreen */ | 340 /* Atoms dealing with EWMH (i.e. _NET_...) */ |
| 341 Atom Xatom_net_wm_state, Xatom_net_wm_state_fullscreen_atom, | 341 Atom Xatom_net_wm_state, Xatom_net_wm_state_fullscreen_atom, |
| 342 Xatom_net_wm_state_maximized_horz, Xatom_net_wm_state_maximized_vert, | 342 Xatom_net_wm_state_maximized_horz, Xatom_net_wm_state_maximized_vert, |
| 343 Xatom_net_wm_state_sticky; | 343 Xatom_net_wm_state_sticky, Xatom_net_frame_extents; |
| 344 | 344 |
| 345 /* XSettings atoms and windows. */ | 345 /* XSettings atoms and windows. */ |
| 346 Atom Xatom_xsettings_sel, Xatom_xsettings_prop, Xatom_xsettings_mgr; | 346 Atom Xatom_xsettings_sel, Xatom_xsettings_prop, Xatom_xsettings_mgr; |
| 347 Window xsettings_window; | 347 Window xsettings_window; |
| 348 | 348 |