Changeset 3568

Show
Ignore:
Timestamp:
12/02/04 03:24:23 (4 years ago)
Author:
horiguti
Message:

* mw32term.c (mw32_get_ime_font_property): Unblock the input
if the current thread has blocked it.

Dead lock caused by W32_BLOCK_INPUT when using IME. Lock gotten by
main thread in update_frame() blocks message thread in
mw32_expose_frame(). Temporaliry unblock the input around
SEND_MSGTHREAD_INFORM_MESSAGE() in mw32_get_ime_font_property().

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/2.1/src/ChangeLog.Meadow

    r3560 r3568  
     12004-12-02  Kyotaro HORIGUCHI  <horiguti@meadowy.org> 
     2 
     3        * mw32term.c (mw32_get_ime_font_property): Unblock the input 
     4        if the current thread has blocked it. 
     5 
    162004-11-28  Shuichi KITAGUCHI  <kit@meadowy.org> 
    27 

  • branches/2.1/src/mw32term.c

    r3542 r3568  
    84388438        lf.lfHeight = (int) (XFLOATINT (height) * FRAME_LINE_HEIGHT (f)); 
    84398439    } 
    8440   SEND_MSGTHREAD_INFORM_MESSAGE (WM_EMACS_MODIFY_IME_FONT_PROP, 
    8441                                  (WPARAM) lf.lfHeight , 0); 
     8440  if (W32_SELF_INPUT_BLOCKED_P) 
     8441    { 
     8442      W32_UNBLOCK_INPUT; 
     8443      SEND_MSGTHREAD_INFORM_MESSAGE (WM_EMACS_MODIFY_IME_FONT_PROP, 
     8444                                     (WPARAM) lf.lfHeight , 0); 
     8445      W32_BLOCK_INPUT; 
     8446    } 
     8447  else 
     8448    { 
     8449      SEND_MSGTHREAD_INFORM_MESSAGE (WM_EMACS_MODIFY_IME_FONT_PROP, 
     8450                                     (WPARAM) lf.lfHeight , 0); 
     8451    } 
    84428452} 
    84438453