Mercurial > emacs
comparison src/w32term.c @ 91085:880960b70474
Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-283
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sun, 11 Nov 2007 00:56:44 +0000 |
parents | 4bc33ffdda1a fbeab07144ff |
children | bbf4813494da |
comparison
equal
deleted
inserted
replaced
91084:a4347a111894 | 91085:880960b70474 |
---|---|
2767 static void | 2767 static void |
2768 x_draw_stretch_glyph_string (s) | 2768 x_draw_stretch_glyph_string (s) |
2769 struct glyph_string *s; | 2769 struct glyph_string *s; |
2770 { | 2770 { |
2771 xassert (s->first_glyph->type == STRETCH_GLYPH); | 2771 xassert (s->first_glyph->type == STRETCH_GLYPH); |
2772 s->stippled_p = s->face->stipple != 0; | |
2773 | 2772 |
2774 if (s->hl == DRAW_CURSOR | 2773 if (s->hl == DRAW_CURSOR |
2775 && !x_stretch_cursor_p) | 2774 && !x_stretch_cursor_p) |
2776 { | 2775 { |
2777 /* If `x-stretch-block-cursor' is nil, don't draw a block cursor | 2776 /* If `x-stretch-block-cursor' is nil, don't draw a block cursor |
4424 struct input_event *emacs_event; | 4423 struct input_event *emacs_event; |
4425 { | 4424 { |
4426 if (! WINDOWP (bar->window)) | 4425 if (! WINDOWP (bar->window)) |
4427 abort (); | 4426 abort (); |
4428 | 4427 |
4429 emacs_event->kind = W32_SCROLL_BAR_CLICK_EVENT; | 4428 emacs_event->kind = SCROLL_BAR_CLICK_EVENT; |
4430 emacs_event->code = 0; | 4429 emacs_event->code = 0; |
4431 /* not really meaningful to distinguish up/down */ | 4430 /* not really meaningful to distinguish up/down */ |
4432 emacs_event->modifiers = msg->dwModifiers; | 4431 emacs_event->modifiers = msg->dwModifiers; |
4433 emacs_event->frame_or_window = bar->window; | 4432 emacs_event->frame_or_window = bar->window; |
4434 emacs_event->arg = Qnil; | 4433 emacs_event->arg = Qnil; |
4791 XSETFRAME (inev.frame_or_window, f); | 4790 XSETFRAME (inev.frame_or_window, f); |
4792 inev.timestamp = msg.msg.time; | 4791 inev.timestamp = msg.msg.time; |
4793 } | 4792 } |
4794 break; | 4793 break; |
4795 | 4794 |
4795 case WM_APPCOMMAND: | |
4796 f = x_window_to_frame (dpyinfo, msg.msg.hwnd); | |
4797 | |
4798 if (f && !f->iconified) | |
4799 { | |
4800 if (!dpyinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight) | |
4801 && !EQ (f->tool_bar_window, dpyinfo->mouse_face_window)) | |
4802 { | |
4803 clear_mouse_face (dpyinfo); | |
4804 dpyinfo->mouse_face_hidden = 1; | |
4805 } | |
4806 | |
4807 if (temp_index == sizeof temp_buffer / sizeof (short)) | |
4808 temp_index = 0; | |
4809 temp_buffer[temp_index++] = msg.msg.wParam; | |
4810 inev.kind = MULTIMEDIA_KEY_EVENT; | |
4811 inev.code = GET_APPCOMMAND_LPARAM(msg.msg.lParam); | |
4812 inev.modifiers = msg.dwModifiers; | |
4813 XSETFRAME (inev.frame_or_window, f); | |
4814 inev.timestamp = msg.msg.time; | |
4815 } | |
4816 break; | |
4817 | |
4796 case WM_MOUSEMOVE: | 4818 case WM_MOUSEMOVE: |
4797 /* Ignore non-movement. */ | 4819 /* Ignore non-movement. */ |
4798 { | 4820 { |
4799 int x = LOWORD (msg.msg.lParam); | 4821 int x = LOWORD (msg.msg.lParam); |
4800 int y = HIWORD (msg.msg.lParam); | 4822 int y = HIWORD (msg.msg.lParam); |