Mercurial > emacs

comparison src/xterm.c @ 83222:ae7fab96922c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged in changes from CVS trunk. Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-626 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-627 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-628 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-629 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-630 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-631 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-632 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-633 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-634 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-635 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-636 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-637 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-638 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-54 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-55 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-56 Update from CVS: Add lisp/legacy-gnus-agent.el * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-57 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-58 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-262
author Karoly Lorentey <lorentey@elte.hu>
date Mon, 25 Oct 2004 18:17:28 +0000
parents e86fc76a45e4 ead4249849ac
children 7a0245dd1848
comparison
equal deleted inserted replaced
83221:0fc4928cc48e 83222:ae7fab96922c
2817 colors or something like that, then they should be notified. */ 2817 colors or something like that, then they should be notified. */
2818 x_scroll_bar_clear (f); 2818 x_scroll_bar_clear (f);
2819 2819
2820 XFlush (FRAME_X_DISPLAY (f)); 2820 XFlush (FRAME_X_DISPLAY (f));
2821 2821
2822 #ifdef USE_GTK
2823 xg_frame_cleared (f);
2824 #endif
2825
2826 UNBLOCK_INPUT; 2822 UNBLOCK_INPUT;
2827 } 2823 }
2828 2824
2829 2825
2830 2826
4863 xg_update_scrollbar_pos (f, 4859 xg_update_scrollbar_pos (f,
4864 SCROLL_BAR_X_WINDOW (bar), 4860 SCROLL_BAR_X_WINDOW (bar),
4865 top, 4861 top,
4866 left + VERTICAL_SCROLL_BAR_WIDTH_TRIM, 4862 left + VERTICAL_SCROLL_BAR_WIDTH_TRIM,
4867 width - VERTICAL_SCROLL_BAR_WIDTH_TRIM * 2, 4863 width - VERTICAL_SCROLL_BAR_WIDTH_TRIM * 2,
4868 max (height, 1), 4864 max (height, 1));
4869 left,
4870 width);
4871 xg_show_scroll_bar (SCROLL_BAR_X_WINDOW (bar)); 4865 xg_show_scroll_bar (SCROLL_BAR_X_WINDOW (bar));
4872 #else /* not USE_GTK */ 4866 #else /* not USE_GTK */
4873 Widget scroll_bar = SCROLL_BAR_X_WIDGET (FRAME_X_DISPLAY (f), bar); 4867 Widget scroll_bar = SCROLL_BAR_X_WIDGET (FRAME_X_DISPLAY (f), bar);
4874 XtConfigureWidget (scroll_bar, 4868 XtConfigureWidget (scroll_bar,
4875 left + VERTICAL_SCROLL_BAR_WIDTH_TRIM, 4869 left + VERTICAL_SCROLL_BAR_WIDTH_TRIM,
5109 if (height != XINT (bar->height)) 5103 if (height != XINT (bar->height))
5110 mask |= CWHeight; 5104 mask |= CWHeight;
5111 5105
5112 #ifdef USE_TOOLKIT_SCROLL_BARS 5106 #ifdef USE_TOOLKIT_SCROLL_BARS
5113 5107
5114 #ifdef USE_GTK
5115 if (mask)
5116 xg_update_scrollbar_pos (f,
5117 SCROLL_BAR_X_WINDOW (bar),
5118 top,
5119 sb_left + VERTICAL_SCROLL_BAR_WIDTH_TRIM,
5120 sb_width - VERTICAL_SCROLL_BAR_WIDTH_TRIM * 2,
5121 max (height, 1),
5122 left,
5123 width);
5124 #else /* not USE_GTK */
5125
5126 /* Move/size the scroll bar widget. */ 5108 /* Move/size the scroll bar widget. */
5127 if (mask) 5109 if (mask)
5128 { 5110 {
5129 /* Since toolkit scroll bars are smaller than the space reserved 5111 /* Since toolkit scroll bars are smaller than the space reserved
5130 for them on the frame, we have to clear "under" them. */ 5112 for them on the frame, we have to clear "under" them. */
5131 if (width > 0 && height > 0) 5113 if (width > 0 && height > 0)
5132 x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), 5114 x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
5133 left, top, width, height, False); 5115 left, top, width, height, False);
5116 #ifdef USE_GTK
5117 xg_update_scrollbar_pos (f,
5118 SCROLL_BAR_X_WINDOW (bar),
5119 top,
5120 sb_left + VERTICAL_SCROLL_BAR_WIDTH_TRIM,
5121 sb_width - VERTICAL_SCROLL_BAR_WIDTH_TRIM *2,
5122 max (height, 1));
5123 #else /* not USE_GTK */
5134 XtConfigureWidget (SCROLL_BAR_X_WIDGET (FRAME_X_DISPLAY (f), bar), 5124 XtConfigureWidget (SCROLL_BAR_X_WIDGET (FRAME_X_DISPLAY (f), bar),
5135 sb_left + VERTICAL_SCROLL_BAR_WIDTH_TRIM, 5125 sb_left + VERTICAL_SCROLL_BAR_WIDTH_TRIM,
5136 top, 5126 top,
5137 sb_width - VERTICAL_SCROLL_BAR_WIDTH_TRIM * 2, 5127 sb_width - VERTICAL_SCROLL_BAR_WIDTH_TRIM * 2,
5138 max (height, 1), 0); 5128 max (height, 1), 0);
5129 #endif /* not USE_GTK */
5139 } 5130 }
5140 #endif /* not USE_GTK */
5141 #else /* not USE_TOOLKIT_SCROLL_BARS */ 5131 #else /* not USE_TOOLKIT_SCROLL_BARS */
5142 5132
5143 /* Clear areas not covered by the scroll bar because of 5133 /* Clear areas not covered by the scroll bar because of
5144 VERTICAL_SCROLL_BAR_WIDTH_TRIM. */ 5134 VERTICAL_SCROLL_BAR_WIDTH_TRIM. */
5145 if (VERTICAL_SCROLL_BAR_WIDTH_TRIM) 5135 if (VERTICAL_SCROLL_BAR_WIDTH_TRIM)
8029 { 8019 {
8030 struct frame *f = XFRAME (frame); 8020 struct frame *f = XFRAME (frame);
8031 if (FRAME_X_P (f) && FRAME_X_DISPLAY_INFO (f) == dpyinfo) 8021 if (FRAME_X_P (f) && FRAME_X_DISPLAY_INFO (f) == dpyinfo)
8032 { 8022 {
8033 FRAME_XIC (f) = NULL; 8023 FRAME_XIC (f) = NULL;
8034 if (FRAME_XIC_FONTSET (f)) 8024 xic_free_xfontset (f);
8035 {
8036 XFreeFontSet (FRAME_X_DISPLAY (f), FRAME_XIC_FONTSET (f));
8037 FRAME_XIC_FONTSET (f) = NULL;
8038 }
8039 } 8025 }
8040 } 8026 }
8041 8027
8042 /* No need to call XCloseIM. */ 8028 /* No need to call XCloseIM. */
8043 dpyinfo->xim = NULL; 8029 dpyinfo->xim = NULL;