diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-01-09 09:36:10 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-01-09 09:36:10 -0800 |
| commit | 35cf62d95cdcd5323dcea4a5385942c342ff1d9c (patch) | |
| tree | 90358cbb033a126c4d48793a80fd804b7baaca24 /src/xterm.c | |
| parent | 59815c02506eb39b61e672528ed03885749ba529 (diff) | |
| parent | 7655cb66d86564e792b825f1a0e1a4de7d6e6db5 (diff) | |
| download | emacs-35cf62d95cdcd5323dcea4a5385942c342ff1d9c.tar.gz | |
Merge from trunk.
Diffstat (limited to 'src/xterm.c')
| -rw-r--r-- | src/xterm.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/xterm.c b/src/xterm.c index 4bc12c06b34..2a2ae105e2e 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -1,6 +1,6 @@ /* X Communication module for terminals which understand the X protocol. -Copyright (C) 1989, 1993-2011 Free Software Foundation, Inc. +Copyright (C) 1989, 1993-2012 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -5150,7 +5150,7 @@ x_scroll_bar_remove (struct scroll_bar *bar) XDestroyWindow (FRAME_X_DISPLAY (f), bar->x_window); #endif - /* Disassociate this scroll bar from its window. */ + /* Dissociate this scroll bar from its window. */ XWINDOW (bar->window)->vertical_scroll_bar = Qnil; UNBLOCK_INPUT; @@ -8981,6 +8981,18 @@ x_lower_frame (struct frame *f) } } +/* Request focus with XEmbed */ + +void +xembed_request_focus (FRAME_PTR f) +{ + /* See XEmbed Protocol Specification at + http://freedesktop.org/wiki/Specifications/xembed-spec */ + if (f->async_visible) + xembed_send_message (f, CurrentTime, + XEMBED_REQUEST_FOCUS, 0, 0, 0); +} + /* Activate frame with Extended Window Manager Hints */ void |