comparison src/redisplay-gtk.c @ 5118:e0db3c197671 ben-lisp-object

merge up to latest default branch, doesn't compile yet
author Ben Wing <ben@xemacs.org>
date Sat, 26 Dec 2009 21:18:49 -0600
parents 2b84dd8eb906
children a4322ac49e37
comparison
equal deleted inserted replaced
5117:3742ea8250b5 5118:e0db3c197671
291 gtk_output_display_block (struct window *w, struct display_line *dl, int block, 291 gtk_output_display_block (struct window *w, struct display_line *dl, int block,
292 int start, int end, int start_pixpos, int cursor_start, 292 int start, int end, int start_pixpos, int cursor_start,
293 int cursor_width, int cursor_height) 293 int cursor_width, int cursor_height)
294 { 294 {
295 struct frame *f = XFRAME (w->frame); 295 struct frame *f = XFRAME (w->frame);
296 Ichar_dynarr *buf = Dynarr_new (Ichar); 296 Ichar_dynarr *buf;
297 Lisp_Object window; 297 Lisp_Object window;
298 298
299 struct display_block *db = Dynarr_atp (dl->display_blocks, block); 299 struct display_block *db = Dynarr_atp (dl->display_blocks, block);
300 rune_dynarr *rba = db->runes; 300 rune_dynarr *rba = db->runes;
301 struct rune *rb; 301 struct rune *rb;
323 charset = ichar_charset (rb->object.chr.ch); 323 charset = ichar_charset (rb->object.chr.ch);
324 } 324 }
325 325
326 if (end < 0) 326 if (end < 0)
327 end = Dynarr_length (rba); 327 end = Dynarr_length (rba);
328 Dynarr_reset (buf); 328 buf = Dynarr_new (Ichar);
329 329
330 while (elt < end) 330 while (elt < end)
331 { 331 {
332 rb = Dynarr_atp (rba, elt); 332 rb = Dynarr_atp (rba, elt);
333 333
1174 gtk_output_vertical_divider 1174 gtk_output_vertical_divider
1175 1175
1176 Draw a vertical divider down the right side of the given window. 1176 Draw a vertical divider down the right side of the given window.
1177 ****************************************************************************/ 1177 ****************************************************************************/
1178 static void 1178 static void
1179 gtk_output_vertical_divider (struct window *w, int clear) 1179 gtk_output_vertical_divider (struct window *w, int UNUSED(clear))
1180 { 1180 {
1181 struct frame *f = XFRAME (w->frame); 1181 struct frame *f = XFRAME (w->frame);
1182 struct device *d = XDEVICE (f->device); 1182 struct device *d = XDEVICE (f->device);
1183 GdkWindow *x_win = GET_GTK_WIDGET_WINDOW (FRAME_GTK_TEXT_WIDGET (f)); 1183 GdkWindow *x_win = GET_GTK_WIDGET_WINDOW (FRAME_GTK_TEXT_WIDGET (f));
1184 GdkGC *background_gc; 1184 GdkGC *background_gc;