comparison src/xterm.c @ 90200:f9a65d7ebd29

Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-68 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 459-473) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 86-87) - Update from CVS
author Miles Bader <miles@gnu.org>
date Thu, 07 Jul 2005 12:43:14 +0000
parents 173dee4e2611 a8fa7c632ee4
children 2d92f5c9d6ae
comparison
equal deleted inserted replaced
90199:bb71c6cf2009 90200:f9a65d7ebd29
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 15 GNU General Public License for more details.
16 16
17 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
18 along with GNU Emacs; see the file COPYING. If not, write to 18 along with GNU Emacs; see the file COPYING. If not, write to
19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, 19 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
20 Boston, MA 02111-1307, USA. */ 20 Boston, MA 02110-1301, USA. */
21 21
22 /* New display code by Gerd Moellmann <gerd@gnu.org>. */ 22 /* New display code by Gerd Moellmann <gerd@gnu.org>. */
23 /* Xt features made by Fred Pierresteguy. */ 23 /* Xt features made by Fred Pierresteguy. */
24 24
25 #include <config.h> 25 #include <config.h>
534 x_draw_vertical_window_border (w, x, y0, y1) 534 x_draw_vertical_window_border (w, x, y0, y1)
535 struct window *w; 535 struct window *w;
536 int x, y0, y1; 536 int x, y0, y1;
537 { 537 {
538 struct frame *f = XFRAME (WINDOW_FRAME (w)); 538 struct frame *f = XFRAME (WINDOW_FRAME (w));
539 struct face *face;
540
541 face = FACE_FROM_ID (f, VERTICAL_BORDER_FACE_ID);
542 if (face)
543 XSetForeground (FRAME_X_DISPLAY (f), f->output_data.x->normal_gc,
544 face->foreground);
539 545
540 XDrawLine (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), 546 XDrawLine (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
541 f->output_data.x->normal_gc, x, y0, x, y1); 547 f->output_data.x->normal_gc, x, y0, x, y1);
542 } 548 }
543 549
6285 /* If not using XIM/XIC, and a compose sequence is in progress, 6291 /* If not using XIM/XIC, and a compose sequence is in progress,
6286 we break here. Otherwise, chars_matched is always 0. */ 6292 we break here. Otherwise, chars_matched is always 0. */
6287 if (compose_status.chars_matched > 0 && nbytes == 0) 6293 if (compose_status.chars_matched > 0 && nbytes == 0)
6288 break; 6294 break;
6289 6295
6296 bzero (&compose_status, sizeof (compose_status));
6290 orig_keysym = keysym; 6297 orig_keysym = keysym;
6291 6298
6292 /* Common for all keysym input events. */ 6299 /* Common for all keysym input events. */
6293 XSETFRAME (inev.ie.frame_or_window, f); 6300 XSETFRAME (inev.ie.frame_or_window, f);
6294 inev.ie.modifiers 6301 inev.ie.modifiers