Mercurial > emacs
comparison src/w32term.c @ 15035:a538ad05bce1
(w32_read_socket): Initialize frame_or_window field.
(x_make_frame_visible): Don't call SetForegroundWindow after x_set_offset.
(win32_initialize): Call AttachThreadInput at the end.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Tue, 16 Apr 1996 21:54:34 +0000 |
parents | 599a3ae1e8ea |
children | ed6ddfc0d954 |
comparison
equal
deleted
inserted
replaced
15034:fb947ec168a8 | 15035:a538ad05bce1 |
---|---|
2372 if (temp_index == sizeof temp_buffer / sizeof (short)) | 2372 if (temp_index == sizeof temp_buffer / sizeof (short)) |
2373 temp_index = 0; | 2373 temp_index = 0; |
2374 | 2374 |
2375 convert_to_key_event (&msg, keyp); | 2375 convert_to_key_event (&msg, keyp); |
2376 add = key_event (keyp, bufp); | 2376 add = key_event (keyp, bufp); |
2377 XSETFRAME (bufp->frame_or_window, f); | |
2377 if (add == -1) | 2378 if (add == -1) |
2378 { | 2379 { |
2379 /* The key pressed generated two characters, most likely | 2380 /* The key pressed generated two characters, most likely |
2380 an accent character and a key that could not be | 2381 an accent character and a key that could not be |
2381 combined with it. Prepend the message on the queue | 2382 combined with it. Prepend the message on the queue |
3332 if (! FRAME_ICONIFIED_P (f) | 3333 if (! FRAME_ICONIFIED_P (f) |
3333 && ! f->output_data.win32->asked_for_visible) | 3334 && ! f->output_data.win32->asked_for_visible) |
3334 { | 3335 { |
3335 x_set_offset (f, f->output_data.win32->left_pos, | 3336 x_set_offset (f, f->output_data.win32->left_pos, |
3336 f->output_data.win32->top_pos, 0); | 3337 f->output_data.win32->top_pos, 0); |
3337 SetForegroundWindow (FRAME_WIN32_WINDOW (f)); | |
3338 } | 3338 } |
3339 | 3339 |
3340 f->output_data.win32->asked_for_visible = 1; | 3340 f->output_data.win32->asked_for_visible = 1; |
3341 ShowWindow (FRAME_WIN32_WINDOW (f), SW_SHOW); | 3341 ShowWindow (FRAME_WIN32_WINDOW (f), SW_SHOW); |
3342 } | 3342 } |
3742 0, 0, &dwWinThreadId); | 3742 0, 0, &dwWinThreadId); |
3743 | 3743 |
3744 GetMessage (&msg, NULL, WM_EMACS_DONE, WM_EMACS_DONE); | 3744 GetMessage (&msg, NULL, WM_EMACS_DONE, WM_EMACS_DONE); |
3745 } | 3745 } |
3746 | 3746 |
3747 /* AttachThreadInput (dwWinThreadId, dwMainThreadId, TRUE); */ | 3747 AttachThreadInput (dwMainThreadId, dwWinThreadId, TRUE); |
3748 | 3748 |
3749 } | 3749 } |
3750 | 3750 |
3751 void | 3751 void |
3752 syms_of_win32term () | 3752 syms_of_win32term () |