Mercurial > emacs
comparison src/w32fns.c @ 110000:757182d1d4cb
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Thu, 19 Aug 2010 22:47:51 +0000 |
| parents | 22ddbf1e2954 |
| children | b1a96286ba6e |
comparison
equal
deleted
inserted
replaced
| 109999:6e14b22d0a49 | 110000:757182d1d4cb |
|---|---|
| 3107 { | 3107 { |
| 3108 COMPOSITIONFORM form; | 3108 COMPOSITIONFORM form; |
| 3109 HIMC context; | 3109 HIMC context; |
| 3110 struct window *w; | 3110 struct window *w; |
| 3111 | 3111 |
| 3112 if (!context) | |
| 3113 break; | |
| 3114 | |
| 3115 f = x_window_to_frame (dpyinfo, hwnd); | 3112 f = x_window_to_frame (dpyinfo, hwnd); |
| 3116 w = XWINDOW (FRAME_SELECTED_WINDOW (f)); | 3113 w = XWINDOW (FRAME_SELECTED_WINDOW (f)); |
| 3117 | 3114 |
| 3118 form.dwStyle = CFS_RECT; | 3115 form.dwStyle = CFS_RECT; |
| 3119 form.ptCurrentPos.x = w32_system_caret_x; | 3116 form.ptCurrentPos.x = w32_system_caret_x; |
| 3127 - WINDOW_RIGHT_FRINGE_WIDTH (w)); | 3124 - WINDOW_RIGHT_FRINGE_WIDTH (w)); |
| 3128 form.rcArea.bottom = (WINDOW_BOTTOM_EDGE_Y (w) | 3125 form.rcArea.bottom = (WINDOW_BOTTOM_EDGE_Y (w) |
| 3129 - WINDOW_MODE_LINE_HEIGHT (w)); | 3126 - WINDOW_MODE_LINE_HEIGHT (w)); |
| 3130 | 3127 |
| 3131 context = get_ime_context_fn (hwnd); | 3128 context = get_ime_context_fn (hwnd); |
| 3129 | |
| 3130 if (!context) | |
| 3131 break; | |
| 3132 | |
| 3132 set_ime_composition_window_fn (context, &form); | 3133 set_ime_composition_window_fn (context, &form); |
| 3133 release_ime_context_fn (hwnd, context); | 3134 release_ime_context_fn (hwnd, context); |
| 3134 } | 3135 } |
| 3135 break; | 3136 break; |
| 3136 | 3137 |