Mercurial > emacs

comparison src/image.c @ 83510:2d2f6f096f6e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged from emacs@sv.gnu.org Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-216 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-217 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-218 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-219 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-220 Improve tq.el. * emacs@sv.gnu.org/emacs--devo--0--patch-221 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-222 Update from CVS: src/puresize.h (PURESIZE_RATIO): Reduce to 10/6. * emacs@sv.gnu.org/emacs--devo--0--patch-223 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-224 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-225 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-226 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-227 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-228 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-229 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-230 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-231 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-232 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-233 Update from CVS: lisp/progmodes/python.el (python-mode): Fix typo. * emacs@sv.gnu.org/gnus--rel--5.10--patch-84 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-85 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-86 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-550
author Karoly Lorentey <lorentey@elte.hu>
date Wed, 19 Apr 2006 16:23:46 +0000
parents 81f2d90dee68 2c4ba2c48153
children 966a40e7fb54
comparison
equal deleted inserted replaced
83509:24cf4bf418dc 83510:2d2f6f096f6e
199 199
200 ((unsigned long *) (base_addr + y * row_bytes))[x] = 0xff000000 | pixel; 200 ((unsigned long *) (base_addr + y * row_bytes))[x] = 0xff000000 | pixel;
201 } 201 }
202 else 202 else
203 #endif 203 #endif
204 if (depth == 1) 204 if (depth == 1)
205 { 205 {
206 char *base_addr = GetPixBaseAddr (pixmap); 206 char *base_addr = GetPixBaseAddr (pixmap);
207 short row_bytes = GetPixRowBytes (pixmap); 207 short row_bytes = GetPixRowBytes (pixmap);
208 208
209 if (pixel == PIX_MASK_DRAW) 209 if (pixel == PIX_MASK_DRAW)
442 #endif 442 #endif
443 443
444 id = x_allocate_bitmap_record (f); 444 id = x_allocate_bitmap_record (f);
445 #ifdef MAC_OS 445 #ifdef MAC_OS
446 dpyinfo->bitmaps[id - 1].bitmap_data = (char *) xmalloc (height * width); 446 dpyinfo->bitmaps[id - 1].bitmap_data = (char *) xmalloc (height * width);
447 if (! dpyinfo->bitmaps[id - 1].bitmap_data)
448 return -1;
449 bcopy (bits, dpyinfo->bitmaps[id - 1].bitmap_data, height * width); 447 bcopy (bits, dpyinfo->bitmaps[id - 1].bitmap_data, height * width);
450 #endif /* MAC_OS */ 448 #endif /* MAC_OS */
451 449
452 dpyinfo->bitmaps[id - 1].file = NULL; 450 dpyinfo->bitmaps[id - 1].file = NULL;
453 dpyinfo->bitmaps[id - 1].height = height; 451 dpyinfo->bitmaps[id - 1].height = height;
4379 { 4377 {
4380 color = strtok (NULL, " \t"); 4378 color = strtok (NULL, " \t");
4381 if (color == NULL) 4379 if (color == NULL)
4382 goto failure; 4380 goto failure;
4383 4381
4384 while (str = strtok (NULL, " \t")) 4382 while ((str = strtok (NULL, " \t")) != NULL)
4385 { 4383 {
4386 next_key = xpm_str_to_color_key (str); 4384 next_key = xpm_str_to_color_key (str);
4387 if (next_key >= 0) 4385 if (next_key >= 0)
4388 break; 4386 break;
4389 color[strlen (color)] = ' '; 4387 color[strlen (color)] = ' ';
4407 if (!NILP (color_symbols) && !NILP (symbol_color)) 4405 if (!NILP (color_symbols) && !NILP (symbol_color))
4408 { 4406 {
4409 Lisp_Object specified_color = Fassoc (symbol_color, color_symbols); 4407 Lisp_Object specified_color = Fassoc (symbol_color, color_symbols);
4410 4408
4411 if (CONSP (specified_color) && STRINGP (XCDR (specified_color))) 4409 if (CONSP (specified_color) && STRINGP (XCDR (specified_color)))
4412 if (xstricmp (SDATA (XCDR (specified_color)), "None") == 0) 4410 {
4413 color_val = Qt; 4411 if (xstricmp (SDATA (XCDR (specified_color)), "None") == 0)
4414 else if (x_defined_color (f, SDATA (XCDR (specified_color)), 4412 color_val = Qt;
4415 &cdef, 0)) 4413 else if (x_defined_color (f, SDATA (XCDR (specified_color)),
4416 color_val = make_number (cdef.pixel); 4414 &cdef, 0))
4415 color_val = make_number (cdef.pixel);
4416 }
4417 } 4417 }
4418 if (NILP (color_val) && max_key > 0) 4418 if (NILP (color_val) && max_key > 0)
4419 if (xstricmp (max_color, "None") == 0) 4419 {
4420 color_val = Qt; 4420 if (xstricmp (max_color, "None") == 0)
4421 else if (x_defined_color (f, max_color, &cdef, 0)) 4421 color_val = Qt;
4422 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 }
4423 if (!NILP (color_val)) 4425 if (!NILP (color_val))
4424 (*put_color_table) (color_table, beg, chars_per_pixel, color_val); 4426 (*put_color_table) (color_table, beg, chars_per_pixel, color_val);
4425 4427
4426 expect (','); 4428 expect (',');
4427 } 4429 }
7846 XColor color; 7848 XColor color;
7847 RGBColor bg_color; 7849 RGBColor bg_color;
7848 int width, height; 7850 int width, height;
7849 XImagePtr ximg; 7851 XImagePtr ximg;
7850 TimeValue time; 7852 TimeValue time;
7851 struct gcpro gcpro1;
7852 int ino; 7853 int ino;
7853 CGrafPtr old_port; 7854 CGrafPtr old_port;
7854 GDHandle old_gdh; 7855 GDHandle old_gdh;
7855 7856
7856 specified_file = image_spec_value (img->spec, QCfile, NULL); 7857 specified_file = image_spec_value (img->spec, QCfile, NULL);