Mercurial > emacs

comparison src/image.c @ 90384:c156f6a9e7b5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-56 Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 204-225) - Update from CVS - Sync from erc--emacs--0 - Merge from gnus--rel--5.10 - Improve tq.el. - Update from CVS: src/puresize.h (PURESIZE_RATIO): Reduce to 10/6. * gnus--rel--5.10 (patch 81-85) - Update from CVS - Merge from emacs--devo--0
author Miles Bader <miles@gnu.org>
date Mon, 17 Apr 2006 08:41:12 +0000
parents 65ca8fb66a0d 609c61a0071d
children 72dea2ff0142
comparison
equal deleted inserted replaced
90383:ab20fb198dda 90384:c156f6a9e7b5
4377 { 4377 {
4378 color = strtok (NULL, " \t"); 4378 color = strtok (NULL, " \t");
4379 if (color == NULL) 4379 if (color == NULL)
4380 goto failure; 4380 goto failure;
4381 4381
4382 while (str = strtok (NULL, " \t")) 4382 while ((str = strtok (NULL, " \t")) != NULL)
4383 { 4383 {
4384 next_key = xpm_str_to_color_key (str); 4384 next_key = xpm_str_to_color_key (str);
4385 if (next_key >= 0) 4385 if (next_key >= 0)
4386 break; 4386 break;
4387 color[strlen (color)] = ' '; 4387 color[strlen (color)] = ' ';
4405 if (!NILP (color_symbols) && !NILP (symbol_color)) 4405 if (!NILP (color_symbols) && !NILP (symbol_color))
4406 { 4406 {
4407 Lisp_Object specified_color = Fassoc (symbol_color, color_symbols); 4407 Lisp_Object specified_color = Fassoc (symbol_color, color_symbols);
4408 4408
4409 if (CONSP (specified_color) && STRINGP (XCDR (specified_color))) 4409 if (CONSP (specified_color) && STRINGP (XCDR (specified_color)))
4410 if (xstricmp (SDATA (XCDR (specified_color)), "None") == 0) 4410 {
4411 color_val = Qt; 4411 if (xstricmp (SDATA (XCDR (specified_color)), "None") == 0)
4412 else if (x_defined_color (f, SDATA (XCDR (specified_color)), 4412 color_val = Qt;
4413 &cdef, 0)) 4413 else if (x_defined_color (f, SDATA (XCDR (specified_color)),
4414 color_val = make_number (cdef.pixel); 4414 &cdef, 0))
4415 color_val = make_number (cdef.pixel);
4416 }
4415 } 4417 }
4416 if (NILP (color_val) && max_key > 0) 4418 if (NILP (color_val) && max_key > 0)
4417 if (xstricmp (max_color, "None") == 0) 4419 {
4418 color_val = Qt; 4420 if (xstricmp (max_color, "None") == 0)
4419 else if (x_defined_color (f, max_color, &cdef, 0)) 4421 color_val = Qt;
4420 color_val = make_number (cdef.pixel); 4422 else if (x_defined_color (f, max_color, &cdef, 0))
4423 color_val = make_number (cdef.pixel);
4424 }
4421 if (!NILP (color_val)) 4425 if (!NILP (color_val))
4422 (*put_color_table) (color_table, beg, chars_per_pixel, color_val); 4426 (*put_color_table) (color_table, beg, chars_per_pixel, color_val);
4423 4427
4424 expect (','); 4428 expect (',');
4425 } 4429 }
7844 XColor color; 7848 XColor color;
7845 RGBColor bg_color; 7849 RGBColor bg_color;
7846 int width, height; 7850 int width, height;
7847 XImagePtr ximg; 7851 XImagePtr ximg;
7848 TimeValue time; 7852 TimeValue time;
7849 struct gcpro gcpro1;
7850 int ino; 7853 int ino;
7851 CGrafPtr old_port; 7854 CGrafPtr old_port;
7852 GDHandle old_gdh; 7855 GDHandle old_gdh;
7853 7856
7854 specified_file = image_spec_value (img->spec, QCfile, NULL); 7857 specified_file = image_spec_value (img->spec, QCfile, NULL);