Mercurial > emacs

comparison src/w32term.c @ 27937:da3a30362526

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bring up to date with xterm.c changes of 2000-02-24 and 2000-02-25.
author Jason Rumney <jasonr@gnu.org>
date Wed, 01 Mar 2000 21:09:34 +0000
parents 51d0b4b8fc6a
children 3fb90cd81d3b
comparison
equal deleted inserted replaced
27936:4c1ad68f8688 27937:da3a30362526
169 int x_stretch_cursor_p; 169 int x_stretch_cursor_p;
170 170
171 #define CP_DEFAULT 1004 171 #define CP_DEFAULT 1004
172 172
173 extern unsigned int msh_mousewheel; 173 extern unsigned int msh_mousewheel;
174 extern int inhibit_busy_cursor;
175 174
176 extern void free_frame_menubar (); 175 extern void free_frame_menubar ();
177 176
178 extern Lisp_Object Vwindow_system; 177 extern Lisp_Object Vwindow_system;
179 178
7737 XSETFRAME (bufp->frame_or_window, f); 7736 XSETFRAME (bufp->frame_or_window, f);
7738 bufp->timestamp = msg.msg.time; 7737 bufp->timestamp = msg.msg.time;
7739 bufp++; 7738 bufp++;
7740 numchars--; 7739 numchars--;
7741 count++; 7740 count++;
7742 if (display_busy_cursor_p)
7743 if (bufp->code != VK_RETURN || minibuf_level == 0)
7744 inhibit_busy_cursor = 2;
7745 } 7741 }
7746 break; 7742 break;
7747 7743
7748 case WM_SYSCHAR: 7744 case WM_SYSCHAR:
7749 case WM_CHAR: 7745 case WM_CHAR:
7760 XSETFRAME (bufp->frame_or_window, f); 7756 XSETFRAME (bufp->frame_or_window, f);
7761 bufp->timestamp = msg.msg.time; 7757 bufp->timestamp = msg.msg.time;
7762 bufp++; 7758 bufp++;
7763 numchars--; 7759 numchars--;
7764 count++; 7760 count++;
7765 if (display_busy_cursor_p)
7766 if (bufp->code != VK_RETURN || minibuf_level == 0)
7767 inhibit_busy_cursor = 2;
7768 } 7761 }
7769 break; 7762 break;
7770 7763
7771 case WM_MOUSEMOVE: 7764 case WM_MOUSEMOVE:
7772 previous_help_echo = help_echo; 7765 previous_help_echo = help_echo;
7880 if (f != 0) 7873 if (f != 0)
7881 f->mouse_moved = 0; 7874 f->mouse_moved = 0;
7882 7875
7883 if (!tool_bar_p) 7876 if (!tool_bar_p)
7884 last_tool_bar_item = -1; 7877 last_tool_bar_item = -1;
7885 if (display_busy_cursor_p)
7886 inhibit_busy_cursor = 2;
7887 } 7878 }
7888 break; 7879 break;
7889 } 7880 }
7890 7881
7891 case WM_MOUSEWHEEL: 7882 case WM_MOUSEWHEEL:
8629 else 8620 else
8630 { 8621 {
8631 if (w != XWINDOW (selected_window) 8622 if (w != XWINDOW (selected_window)
8632 || f != FRAME_W32_DISPLAY_INFO (f)->w32_highlight_frame) 8623 || f != FRAME_W32_DISPLAY_INFO (f)->w32_highlight_frame)
8633 { 8624 {
8634 if (MINI_WINDOW_P (w)) 8625 extern int cursor_in_non_selected_windows;
8626
8627 if (MINI_WINDOW_P (w) || !cursor_in_non_selected_windows)
8635 new_cursor_type = NO_CURSOR; 8628 new_cursor_type = NO_CURSOR;
8636 else 8629 else
8637 new_cursor_type = HOLLOW_BOX_CURSOR; 8630 new_cursor_type = HOLLOW_BOX_CURSOR;
8638 } 8631 }
8639 else if (w->cursor_off_p) 8632 else if (w->cursor_off_p)