Mercurial > hg > xemacs-beta

comparison src/redisplay-msw.c @ 245:51092a27c943 r20-5b21

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-5b21
author cvs
date Mon, 13 Aug 2007 10:17:54 +0200
parents 41f2f0e326e9
children 83b3d10dcba9
comparison
equal deleted inserted replaced
244:78d4f1140794 245:51092a27c943
218 if (!NILP (fg) && !COLOR_INSTANCEP (fg)) 218 if (!NILP (fg) && !COLOR_INSTANCEP (fg))
219 { 219 {
220 fprintf (stderr, "Help! mswindows_update_gc got a bogus fg value! fg = "); 220 fprintf (stderr, "Help! mswindows_update_gc got a bogus fg value! fg = ");
221 debug_print (fg); 221 debug_print (fg);
222 fg = Qnil; 222 fg = Qnil;
223 } 223 }
224
225 if (!NILP (bg) && !COLOR_INSTANCEP (bg))
226 {
227 fprintf (stderr, "Help! mswindows_update_gc got a bogus fg value! bg = ");
228 debug_print (bg);
229 bg = Qnil;
230 }
224 231
225 if (!NILP (fg)) 232 if (!NILP (fg))
226 SetTextColor (hdc, COLOR_INSTANCE_MSWINDOWS_COLOR (XCOLOR_INSTANCE (fg))); 233 SetTextColor (hdc, COLOR_INSTANCE_MSWINDOWS_COLOR (XCOLOR_INSTANCE (fg)));
227 234
228 if (!NILP (bg)) 235 if (!NILP (bg))
411 mswindows_output_string (struct window *w, struct display_line *dl, 418 mswindows_output_string (struct window *w, struct display_line *dl,
412 Emchar_dynarr *buf, int xpos, int xoffset, int clip_start, 419 Emchar_dynarr *buf, int xpos, int xoffset, int clip_start,
413 int width, face_index findex) 420 int width, face_index findex)
414 { 421 {
415 struct frame *f = XFRAME (w->frame); 422 struct frame *f = XFRAME (w->frame);
416 struct device *d = XDEVICE (f->device); 423 /* struct device *d = XDEVICE (f->device);*/
417 Lisp_Object window = Qnil; 424 Lisp_Object window = Qnil;
418 HDC hdc; 425 HDC hdc;
419 int clip_end; 426 int clip_end;
420 Lisp_Object bg_pmap; 427 Lisp_Object bg_pmap;
421 int len = Dynarr_length (buf); 428 int len = Dynarr_length (buf);
455 bg_pmap = Qnil; 462 bg_pmap = Qnil;
456 463
457 for (i = 0; i < nruns; i++) 464 for (i = 0; i < nruns; i++)
458 { 465 {
459 Lisp_Object font = FACE_CACHEL_FONT (cachel, runs[i].charset); 466 Lisp_Object font = FACE_CACHEL_FONT (cachel, runs[i].charset);
460 struct Lisp_Font_Instance *fi = XFONT_INSTANCE (font); 467 /* struct Lisp_Font_Instance *fi = XFONT_INSTANCE (font);*/
461 int this_width; 468 int this_width;
462 RECT rect = { clip_start, dl->ypos - dl->ascent, 469 RECT rect = { clip_start, dl->ypos - dl->ascent,
463 clip_end, dl->ypos + dl->descent - dl->clip }; 470 clip_end, dl->ypos + dl->descent - dl->clip };
464 471
465 if (EQ (font, Vthe_null_font_instance)) 472 if (EQ (font, Vthe_null_font_instance))
693 } 700 }
694 701
695 702
696 /***************************************************************************** 703 /*****************************************************************************
697 #### Display methods 704 #### Display methods
698 /***************************************************************************** 705 *****************************************************************************/
699 706
700 /***************************************************************************** 707 /*****************************************************************************
701 mswindows_divider_width 708 mswindows_divider_width
702 709
703 Return the width of the vertical divider. 710 Return the width of the vertical divider.