Mercurial > emacs
comparison src/w32term.c @ 83221:0fc4928cc48e
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-616
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-617
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-618
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-619
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-620
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-621
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-622
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-623
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-624
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-625
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-51
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-52
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-53
Merge from emacs--cvs-trunk--0
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-261
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Tue, 19 Oct 2004 17:00:02 +0000 |
parents | 4f2f1522636c 9f3d14375fe1 |
children | ae7fab96922c |
comparison
equal
deleted
inserted
replaced
83220:fe1db7935e1a | 83221:0fc4928cc48e |
---|---|
1205 ExtTextOutW (s->hdc, x, y, 0, NULL, chars, nchars, NULL); | 1205 ExtTextOutW (s->hdc, x, y, 0, NULL, chars, nchars, NULL); |
1206 else | 1206 else |
1207 ExtTextOutA (s->hdc, x, y, 0, NULL, (char *) chars, | 1207 ExtTextOutA (s->hdc, x, y, 0, NULL, (char *) chars, |
1208 nchars * charset_dim, NULL); | 1208 nchars * charset_dim, NULL); |
1209 } | 1209 } |
1210 | |
1211 | 1210 |
1212 | 1211 |
1213 static void x_set_glyph_string_clipping P_ ((struct glyph_string *)); | 1212 static void x_set_glyph_string_clipping P_ ((struct glyph_string *)); |
1214 static void x_set_glyph_string_gc P_ ((struct glyph_string *)); | 1213 static void x_set_glyph_string_gc P_ ((struct glyph_string *)); |
1215 static void x_draw_glyph_string_background P_ ((struct glyph_string *, | 1214 static void x_draw_glyph_string_background P_ ((struct glyph_string *, |
2059 | 2058 |
2060 RestoreDC (s->hdc ,-1); | 2059 RestoreDC (s->hdc ,-1); |
2061 } | 2060 } |
2062 | 2061 |
2063 | 2062 |
2064 | |
2065 /* Draw a relief around the image glyph string S. */ | 2063 /* Draw a relief around the image glyph string S. */ |
2066 | 2064 |
2067 static void | 2065 static void |
2068 x_draw_image_relief (s) | 2066 x_draw_image_relief (s) |
2069 struct glyph_string *s; | 2067 struct glyph_string *s; |
2809 the correct value of w32_focus_frame. */ | 2807 the correct value of w32_focus_frame. */ |
2810 dpyinfo->w32_focus_frame = frame; | 2808 dpyinfo->w32_focus_frame = frame; |
2811 | 2809 |
2812 if (old_focus && old_focus->auto_lower) | 2810 if (old_focus && old_focus->auto_lower) |
2813 x_lower_frame (old_focus); | 2811 x_lower_frame (old_focus); |
2814 | |
2815 | |
2816 | |
2817 | |
2818 | |
2819 | |
2820 | |
2821 | |
2822 | 2812 |
2823 if (dpyinfo->w32_focus_frame && dpyinfo->w32_focus_frame->auto_raise) | 2813 if (dpyinfo->w32_focus_frame && dpyinfo->w32_focus_frame->auto_raise) |
2824 pending_autoraise_frame = dpyinfo->w32_focus_frame; | 2814 pending_autoraise_frame = dpyinfo->w32_focus_frame; |
2825 else | 2815 else |
2826 pending_autoraise_frame = 0; | 2816 pending_autoraise_frame = 0; |
4686 dpyinfo->w32_focus_event_frame = f; | 4676 dpyinfo->w32_focus_event_frame = f; |
4687 | 4677 |
4688 if (f) | 4678 if (f) |
4689 x_new_focus_frame (dpyinfo, f); | 4679 x_new_focus_frame (dpyinfo, f); |
4690 | 4680 |
4691 | |
4692 dpyinfo->grabbed = 0; | 4681 dpyinfo->grabbed = 0; |
4693 check_visibility = 1; | 4682 check_visibility = 1; |
4694 break; | 4683 break; |
4695 | 4684 |
4696 case WM_KILLFOCUS: | 4685 case WM_KILLFOCUS: |
4902 } | 4891 } |
4903 | 4892 |
4904 UNBLOCK_INPUT; | 4893 UNBLOCK_INPUT; |
4905 return count; | 4894 return count; |
4906 } | 4895 } |
4907 | |
4908 | 4896 |
4909 | 4897 |
4910 | 4898 |
4911 /*********************************************************************** | 4899 /*********************************************************************** |
4912 Text Cursor | 4900 Text Cursor |