comparison src/redisplay-x.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 697ef44129c6
comparison
equal deleted inserted replaced
407:ed6218a7d4d3 408:501cfd01ee6d
284 { 284 {
285 return EOL_CURSOR_WIDTH; 285 return EOL_CURSOR_WIDTH;
286 } 286 }
287 287
288 /***************************************************************************** 288 /*****************************************************************************
289 x_output_begin 289 x_window_output_begin
290 290
291 Perform any necessary initialization prior to an update. 291 Perform any necessary initialization prior to an update.
292 ****************************************************************************/ 292 ****************************************************************************/
293 static void 293 static void
294 x_output_begin (struct device *d) 294 x_window_output_begin (struct window *w)
295 { 295 {
296 } 296 }
297 297
298 /***************************************************************************** 298 /*****************************************************************************
299 x_output_end 299 x_window_output_end
300 300
301 Perform any necessary flushing of queues when an update has completed. 301 Perform any necessary flushing of queues when an update has completed.
302 ****************************************************************************/ 302 ****************************************************************************/
303 static void 303 static void
304 x_output_end (struct device *d) 304 x_window_output_end (struct window *w)
305 { 305 {
306 XFlush (DEVICE_X_DISPLAY (d)); 306 XFlush (DEVICE_X_DISPLAY (WINDOW_XDEVICE (w)));
307 } 307 }
308 308
309 /***************************************************************************** 309 /*****************************************************************************
310 x_output_display_block 310 x_output_display_block
311 311
458 cursor_start, cursor_width, 458 cursor_start, cursor_width,
459 cursor_height, 0); 459 cursor_height, 0);
460 break; 460 break;
461 461
462 case IMAGE_WIDGET: 462 case IMAGE_WIDGET:
463 if (EQ (XIMAGE_INSTANCE_WIDGET_TYPE (instance),
464 Qlayout))
465 {
466 redisplay_output_layout (w, instance, &dbox, &dga, findex,
467 cursor_start, cursor_width,
468 cursor_height);
469 break;
470 }
463 case IMAGE_SUBWINDOW: 471 case IMAGE_SUBWINDOW:
464 redisplay_output_subwindow (w, instance, &dbox, &dga, findex, 472 redisplay_output_subwindow (w, instance, &dbox, &dga, findex,
465 cursor_start, cursor_width, 473 cursor_start, cursor_width,
466 cursor_height); 474 cursor_height);
467 break;
468
469 case IMAGE_LAYOUT:
470 redisplay_output_layout (w, instance, &dbox, &dga, findex,
471 cursor_start, cursor_width,
472 cursor_height);
473 break; 475 break;
474 476
475 case IMAGE_NOTHING: 477 case IMAGE_NOTHING:
476 /* nothing is as nothing does */ 478 /* nothing is as nothing does */
477 break; 479 break;
2091 CONSOLE_HAS_METHOD (x, divider_height); 2093 CONSOLE_HAS_METHOD (x, divider_height);
2092 CONSOLE_HAS_METHOD (x, eol_cursor_width); 2094 CONSOLE_HAS_METHOD (x, eol_cursor_width);
2093 CONSOLE_HAS_METHOD (x, output_vertical_divider); 2095 CONSOLE_HAS_METHOD (x, output_vertical_divider);
2094 CONSOLE_HAS_METHOD (x, clear_region); 2096 CONSOLE_HAS_METHOD (x, clear_region);
2095 CONSOLE_HAS_METHOD (x, clear_frame); 2097 CONSOLE_HAS_METHOD (x, clear_frame);
2096 CONSOLE_HAS_METHOD (x, output_begin); 2098 CONSOLE_HAS_METHOD (x, window_output_begin);
2097 CONSOLE_HAS_METHOD (x, output_end); 2099 CONSOLE_HAS_METHOD (x, window_output_end);
2098 CONSOLE_HAS_METHOD (x, flash); 2100 CONSOLE_HAS_METHOD (x, flash);
2099 CONSOLE_HAS_METHOD (x, ring_bell); 2101 CONSOLE_HAS_METHOD (x, ring_bell);
2100 CONSOLE_HAS_METHOD (x, bevel_area); 2102 CONSOLE_HAS_METHOD (x, bevel_area);
2101 CONSOLE_HAS_METHOD (x, output_string); 2103 CONSOLE_HAS_METHOD (x, output_string);
2102 CONSOLE_HAS_METHOD (x, output_pixmap); 2104 CONSOLE_HAS_METHOD (x, output_pixmap);