aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan Djärv2014-09-10 19:02:42 +0200
committerJan Djärv2014-09-10 19:02:42 +0200
commit8c2dd4db877092815908396b1ce9043260de776f (patch)
treeda2c10c7704daddb8a0e132e6c54e641c0d5d371 /src
parentc9c0610d077a6a31f2c2aa06f201936034837184 (diff)
downloademacs-8c2dd4db877092815908396b1ce9043260de776f.tar.gz
emacs-8c2dd4db877092815908396b1ce9043260de776f.zip
Detect iconified under Compiz/Unity
* xterm.c (handle_one_xevent): Detect iconified by looking at _NET_WM_STATE_HIDDEN.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/xterm.c8
2 files changed, 13 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index ed9c3e71a55..b87498a9d9b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12014-09-10 Jan Djärv <jan.h.d@swipnet.se>
2
3 * xterm.c (handle_one_xevent): Detect iconified by looking at
4 _NET_WM_STATE_HIDDEN.
5
12014-09-10 Paul Eggert <eggert@cs.ucla.edu> 62014-09-10 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 * lisp.h (DEFINE_GDB_SYMBOL_ENUM): Remove. 8 * lisp.h (DEFINE_GDB_SYMBOL_ENUM): Remove.
diff --git a/src/xterm.c b/src/xterm.c
index 6ff33785a38..b9988e53cba 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -6860,6 +6860,14 @@ handle_one_xevent (struct x_display_info *dpyinfo,
6860 inev.ie.kind = DEICONIFY_EVENT; 6860 inev.ie.kind = DEICONIFY_EVENT;
6861 XSETFRAME (inev.ie.frame_or_window, f); 6861 XSETFRAME (inev.ie.frame_or_window, f);
6862 } 6862 }
6863 else if (! FRAME_ICONIFIED_P (f)
6864 && f->output_data.x->net_wm_state_hidden_seen)
6865 {
6866 SET_FRAME_VISIBLE (f, 0);
6867 SET_FRAME_ICONIFIED (f, 1);
6868 inev.ie.kind = ICONIFY_EVENT;
6869 XSETFRAME (inev.ie.frame_or_window, f);
6870 }
6863 6871
6864 x_handle_property_notify (&event->xproperty); 6872 x_handle_property_notify (&event->xproperty);
6865 xft_settings_event (dpyinfo, event); 6873 xft_settings_event (dpyinfo, event);