Mercurial > hg > xemacs-beta
comparison src/redisplay-msw.c @ 408:501cfd01ee6d r21-2-34
Import from CVS: tag r21-2-34
author | cvs |
---|---|
date | Mon, 13 Aug 2007 11:18:11 +0200 |
parents | b8cc9ab3f761 |
children | de805c49cfc1 |
comparison
equal
deleted
inserted
replaced
407:ed6218a7d4d3 | 408:501cfd01ee6d |
---|---|
955 { | 955 { |
956 return MSWINDOWS_EOL_CURSOR_WIDTH; | 956 return MSWINDOWS_EOL_CURSOR_WIDTH; |
957 } | 957 } |
958 | 958 |
959 /***************************************************************************** | 959 /***************************************************************************** |
960 mswindows_output_begin | 960 mswindows_frame_output_begin |
961 | 961 |
962 Perform any necessary initialization prior to an update. | 962 Perform any necessary initialization prior to an update. |
963 ****************************************************************************/ | 963 ****************************************************************************/ |
964 static void | 964 static void |
965 mswindows_output_begin (struct device *d) | 965 mswindows_frame_output_begin (struct frame *f) |
966 { | 966 { |
967 } | 967 } |
968 | 968 |
969 /***************************************************************************** | 969 /***************************************************************************** |
970 mswindows_output_end | 970 mswindows_frame_output_end |
971 | 971 |
972 Perform any necessary flushing of queues when an update has completed. | 972 Perform any necessary flushing of queues when an update has completed. |
973 ****************************************************************************/ | 973 ****************************************************************************/ |
974 static void | 974 static void |
975 mswindows_output_end (struct device *d) | 975 mswindows_frame_output_end (struct frame *f) |
976 { | 976 { |
977 HDWP hdwp = FRAME_MSWINDOWS_DATA (f)->hdwp; | |
978 | |
979 if (hdwp != 0) | |
980 { | |
981 EndDeferWindowPos (hdwp); | |
982 FRAME_MSWINDOWS_DATA (f)->hdwp = 0; | |
983 } | |
984 | |
977 GdiFlush(); | 985 GdiFlush(); |
978 } | 986 } |
979 | 987 |
980 static int | 988 static int |
981 mswindows_flash (struct device *d) | 989 mswindows_flash (struct device *d) |
1155 if (rb->cursor_type == CURSOR_ON) | 1163 if (rb->cursor_type == CURSOR_ON) |
1156 mswindows_output_cursor (w, dl, xpos, cursor_width, | 1164 mswindows_output_cursor (w, dl, xpos, cursor_width, |
1157 findex, 0, 1); | 1165 findex, 0, 1); |
1158 break; | 1166 break; |
1159 | 1167 |
1168 case IMAGE_WIDGET: | |
1169 if (EQ (XIMAGE_INSTANCE_WIDGET_TYPE (instance), | |
1170 Qlayout)) | |
1171 { | |
1172 redisplay_output_layout (w, instance, &dbox, &dga, findex, | |
1173 cursor_start, cursor_width, | |
1174 cursor_height); | |
1175 if (rb->cursor_type == CURSOR_ON) | |
1176 mswindows_output_cursor (w, dl, xpos, cursor_width, | |
1177 findex, 0, 1); | |
1178 break; | |
1179 } | |
1160 case IMAGE_SUBWINDOW: | 1180 case IMAGE_SUBWINDOW: |
1161 case IMAGE_WIDGET: | |
1162 redisplay_output_subwindow (w, instance, &dbox, &dga, findex, | 1181 redisplay_output_subwindow (w, instance, &dbox, &dga, findex, |
1163 cursor_start, cursor_width, | 1182 cursor_start, cursor_width, |
1164 cursor_height); | 1183 cursor_height); |
1165 if (rb->cursor_type == CURSOR_ON) | |
1166 mswindows_output_cursor (w, dl, xpos, cursor_width, | |
1167 findex, 0, 1); | |
1168 break; | |
1169 | |
1170 case IMAGE_LAYOUT: | |
1171 redisplay_output_layout (w, instance, &dbox, &dga, findex, | |
1172 cursor_start, cursor_width, | |
1173 cursor_height); | |
1174 if (rb->cursor_type == CURSOR_ON) | 1184 if (rb->cursor_type == CURSOR_ON) |
1175 mswindows_output_cursor (w, dl, xpos, cursor_width, | 1185 mswindows_output_cursor (w, dl, xpos, cursor_width, |
1176 findex, 0, 1); | 1186 findex, 0, 1); |
1177 break; | 1187 break; |
1178 | 1188 |
1356 CONSOLE_HAS_METHOD (mswindows, divider_height); | 1366 CONSOLE_HAS_METHOD (mswindows, divider_height); |
1357 CONSOLE_HAS_METHOD (mswindows, eol_cursor_width); | 1367 CONSOLE_HAS_METHOD (mswindows, eol_cursor_width); |
1358 CONSOLE_HAS_METHOD (mswindows, output_vertical_divider); | 1368 CONSOLE_HAS_METHOD (mswindows, output_vertical_divider); |
1359 CONSOLE_HAS_METHOD (mswindows, clear_region); | 1369 CONSOLE_HAS_METHOD (mswindows, clear_region); |
1360 CONSOLE_HAS_METHOD (mswindows, clear_frame); | 1370 CONSOLE_HAS_METHOD (mswindows, clear_frame); |
1361 CONSOLE_HAS_METHOD (mswindows, output_begin); | 1371 CONSOLE_HAS_METHOD (mswindows, frame_output_begin); |
1362 CONSOLE_HAS_METHOD (mswindows, output_end); | 1372 CONSOLE_HAS_METHOD (mswindows, frame_output_end); |
1363 CONSOLE_HAS_METHOD (mswindows, flash); | 1373 CONSOLE_HAS_METHOD (mswindows, flash); |
1364 CONSOLE_HAS_METHOD (mswindows, ring_bell); | 1374 CONSOLE_HAS_METHOD (mswindows, ring_bell); |
1365 CONSOLE_HAS_METHOD (mswindows, bevel_area); | 1375 CONSOLE_HAS_METHOD (mswindows, bevel_area); |
1366 CONSOLE_HAS_METHOD (mswindows, output_string); | 1376 CONSOLE_HAS_METHOD (mswindows, output_string); |
1367 CONSOLE_HAS_METHOD (mswindows, output_pixmap); | 1377 CONSOLE_HAS_METHOD (mswindows, output_pixmap); |
1372 CONSOLE_INHERITS_METHOD (msprinter, mswindows, divider_height); | 1382 CONSOLE_INHERITS_METHOD (msprinter, mswindows, divider_height); |
1373 CONSOLE_INHERITS_METHOD (msprinter, mswindows, eol_cursor_width); | 1383 CONSOLE_INHERITS_METHOD (msprinter, mswindows, eol_cursor_width); |
1374 CONSOLE_INHERITS_METHOD (msprinter, mswindows, output_vertical_divider); | 1384 CONSOLE_INHERITS_METHOD (msprinter, mswindows, output_vertical_divider); |
1375 CONSOLE_INHERITS_METHOD (msprinter, mswindows, clear_region); | 1385 CONSOLE_INHERITS_METHOD (msprinter, mswindows, clear_region); |
1376 CONSOLE_INHERITS_METHOD (msprinter, mswindows, clear_frame); | 1386 CONSOLE_INHERITS_METHOD (msprinter, mswindows, clear_frame); |
1377 CONSOLE_INHERITS_METHOD (msprinter, mswindows, output_begin); | 1387 CONSOLE_INHERITS_METHOD (msprinter, mswindows, frame_output_begin); |
1378 CONSOLE_INHERITS_METHOD (msprinter, mswindows, output_end); | 1388 CONSOLE_INHERITS_METHOD (msprinter, mswindows, frame_output_end); |
1379 CONSOLE_INHERITS_METHOD (msprinter, mswindows, bevel_area); | 1389 CONSOLE_INHERITS_METHOD (msprinter, mswindows, bevel_area); |
1380 CONSOLE_INHERITS_METHOD (msprinter, mswindows, output_string); | 1390 CONSOLE_INHERITS_METHOD (msprinter, mswindows, output_string); |
1381 CONSOLE_INHERITS_METHOD (msprinter, mswindows, output_pixmap); | 1391 CONSOLE_INHERITS_METHOD (msprinter, mswindows, output_pixmap); |
1382 } | 1392 } |