mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-08 20:50:52 -08:00
Code Issues Projects Releases Wiki Activity
88246 commits 243 branches 194 tags 713 MiB
Commit graph

159 commits

Author SHA1 Message Date
Jason Rumney
8b7d0a16b2 * w32term.c (x_query_colors, x_query_color): New functions. 
* image.c (x_to_xcolors, png_load): Eliminate W32 specific code.
(svg_load_image): Cast returned pointers from dynamically loaded
functions.  Eliminate W32 specific code.
 2009-01-03 11:16:32 +00:00
Jason Rumney
df23bf081e (Qgobject): New symbol. 
(syms_of_image): Initialize it.
(init_svg_functions): Load some functions from gobject library.
 2009-01-02 12:10:06 +00:00
Adrian Robert
5a06864fb6 Fix bug #1362. * image.c (x_clear_image_1): Do not free background under HAVE_NS, it is not an indexed color. * nsterm.m (free_indexed_color): Add argument checking. * nsfns.m: Move config.h to before system includes (advised by Dan N.). 2008-11-25 02:45:39 +00:00
Adrian Robert
46b0ebed94 * image.c (x_clear_image_1): Under NS, call ns_free_indexed_color with correct arguments. 2008-10-03 18:23:43 +00:00
Jason Rumney
5827950329 (enum tiff_keyword_index, tiff_format): Add :index keyword. 
(fn_TIFFSetDirectory): New library function used.
(init_tiff_functions) [HAVE_NTGUI]: Initialize it.
(tiff_load): Use :index to select among multiple images.  Set count
property when multiple images exist.
(gif_format): Use :index, not :image.
 2008-08-23 03:48:06 +00:00
Dan Nicolaescu
9e2a264775 Remove support for Mac Carbon. 
* mactoolbox.c:
* macterm.h:
* macterm.c:
* macselect.c:
* macmenu.c:
* macgui.h:
* macfns.c:
* mac.c: Remove file.
* s/darwin.h:
* m/intel386.h:
* xfaces.c:
* xdisp.c:
* window.c:
* tparam.c:
* termhooks.h:
* termcap.c:
* term.c:
* syssignal.h:
* sysselect.h:
* sysdep.c:
* process.c:
* lread.c:
* lisp.h:
* keyboard.c:
* image.c:
* fringe.c:
* frame.h:
* frame.c:
* fontset.c:
* font.h:
* font.c:
* fns.c:
* fileio.c:
* emacs.c:
* dispnew.c:
* dispextern.h:
* config.in:
* atimer.c:
* Makefile.in: Remove code for Carbon

* erc.el: Remove code for Carbon.

Remove support for Mac Carbon.
* term/mac-win.el: Remove file
* international/mule-cmds.el:
* version.el:
* startup.el:
* simple.el:
* mwheel.el:
* mouse.el:
* loadup.el:
* isearch.el:
* info.el:
* frame.el:
* faces.el:
* disp-table.el:
* cus-start.el:
* cus-face.el:
* cus-edit.el:
* Makefile.in: Remove code for Carbon.

Remove support for Mac Carbon.
* makefile.w32-in:
* emacsclient.c: Remove code for Carbon.

* PROBLEMS:
* MACHINES: Remove mentions of Mac Carbon.

* ns-emacs.texi:
* faq.texi: Remove mentions of Mac Carbon.

* os.texi:
* frames.texi:
* display.texi: Remove mentions of Mac Carbon.

* xresources.texi: Remove mentions of Mac Carbon.

* make-tarball.txt:
* admin.el:
* FOR-RELEASE:
* CPP-DEFINES: Remove mentions of Mac Carbon.

Remove support for Mac Carbon.
* mac: Remove directory.
* make-dist:
* configure.in:
* README:
* Makefile.in:
* INSTALL:  Remove code for Carbon.
* configure: Regenerate.
 2008-07-27 18:24:48 +00:00
Miles Bader
7ad8fe5e28 Merge from emacs--rel--22 
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1356
 2008-07-26 09:13:26 +00:00
Chong Yidong
9d7112edd6 (x_from_xcolors): Don't initialize pixmap (silence compiler). 2008-07-25 17:11:42 +00:00
Chong Yidong
e025c9c2fd (svg_load_image): Use rsvg_handle_get_dimensions to check that image 
size is valid.  Use g_object_unref instead of deprecated
rsvg_handle_free to free rsvg handle.
 2008-07-25 17:06:23 +00:00
Chong Yidong
b2996e5783 (svg_load_image): Fix last change. 2008-07-25 14:04:02 +00:00
Chong Yidong
6f79c90b19 (svg_load_image): Check for failure in return value of 
rsvg_handle_get_pixbuf.  Free rsvg handle when done.
 2008-07-25 05:51:24 +00:00
Dan Nicolaescu
9e50ff0c16 * term/ns-win.el: Rename ns- functions/variables to the 
corresponding x- versions.
(x-select-text, x-cut-buffer-or-selection-value)
(x-disown-selection-internal, x-get-selection-internal)
(x-own-selection-internal, x-defined-colors, xw-defined-colors)
(x-display-mm-width, x-display-mm-height)
(x-display-backing-store, x-display-save-under)
(x-display-visual-class, x-display-screens, x-focus-frame): Remove
defaliases.

* image.c:
* nsfns.m:
* nsselect.m:
* nsterm.h:
* nsterm.m: Rename ns prefixed functions/variables to the
corresponding x versions.  Update references.
 2008-07-21 17:48:37 +00:00
YAMAMOTO Mitsuharu
1802dc0c33 (mac_create_cg_image_from_image, image_load_image_io) 
[USE_MAC_IMAGE_IO]: Remove conditionals for kCGBitmapByteOrder32Host.
 2008-07-21 04:20:37 +00:00
Adrian Robert
6fb5f7dad5 change most cases of PENDING to TODO, some to FIXME or XXX 2008-07-17 13:50:30 +00:00
Adrian Robert
edfda78355 merging Emacs.app (NeXTstep port) 2008-07-15 18:15:18 +00:00
YAMAMOTO Mitsuharu
7321dc0ca8 (png_load): Use correct bit-depth for setting background color. 2008-07-07 09:31:49 +00:00
Jason Rumney
0513110744 * dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp. 
* dosfns.c, fileio.c, font.c, fontset.c, image.c, macfns.c:
* macterm.c, process.c, w32.c, w32fns.c, w32proc.c, xfaces.c:
* xfns.c, xfont.c: Callers changed.
 2008-05-22 14:54:27 +00:00
Glenn Morris
9ec0b715e2 Switch to recommended form of GPLv3 permissions notice. 2008-05-14 07:50:26 +00:00
Kenichi Handa
3dcc8b84aa (image_ascent): Don't include "charset.h". Include 
"character.h" and "font.h".
 2008-05-14 01:39:03 +00:00
Chong Yidong
c4f13f44fb (png_load): Use correct bit-depth for setting background color. 2008-05-09 02:37:31 +00:00
Miles Bader
f67e15be8d Merge from emacs--rel--22 
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1142
 2008-05-04 19:46:16 +00:00
YAMAMOTO Mitsuharu
4c75652929 [USE_MAC_IMAGE_IO] (image_load_image_io): 
Create bitmap context in native byte order.
 2008-05-04 00:31:59 +00:00
YAMAMOTO Mitsuharu
2ff0845e68 (PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]: 
New definitions for Image I/O support.
(XGetImage, XPutPixel, XGetPixel, XDestroyImage)
(mac_create_cg_image_from_image, x_create_x_image_and_pixmap)
[USE_MAC_IMAGE_IO]: Add implementations for Image I/O support.
(mac_data_provider_release_data, image_load_image_io)
[USE_MAC_IMAGE_IO]: New functions.
(CGImageCreateWithPNGDataProviderProcType) [MAC_OSX]: Remove typedef.
(MyCGImageCreateWithPNGDataProvider) [MAC_OSX]: Remove variable.
(init_image_func_pointer) [MAC_OSX]: Remove function.
(image_load_quartz2d) [MAC_OSX]: Check availability of
CGImageCreateWithPNGDataProvider at compile time.
Use lowercase `false' for boolean constant.
(png_load, jpeg_load, tiff_load, gif_load) [USE_MAC_IMAGE_IO]:
Use image_load_image_io.
(png_load) [!USE_MAC_IMAGE_IO && MAC_OSX]:
Don't check MyCGImageCreateWithPNGDataProvider.
(init_image) [MAC_OSX && TARGET_API_MAC_CARBON]:
Don't call init_image_func_pointer.
 2008-05-02 09:39:01 +00:00
Miles Bader
5bc6ddff00 Merge from emacs--rel--22 
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1107
 2008-04-05 23:01:26 +00:00
Jason Rumney
b9c89e11fb (pbm_load): Allow color values up to 65535. 
Throw an error if max_color_idx is outside the supported range.
Report an error when image size is invalid.
Read two bytes at a time when raw images have max_color_idx above 255.
 2008-03-28 14:59:22 +00:00
Stefan Monnier
a2bc5bdd7d Allow fine-grained image-cache flushing. 
* dispextern.h (struct image): Add `dependencies' field.
(clear_image_caches): Change arg to Lisp_Object.
* image.c (make_image): Initialize `dependencies' field.
(clear_image_cache): Change arg to allow fine-grained flushing.
Perform the flush even if image-cache-eviction-delay is nil.
(clear_image_caches): Change arg to Lisp_Object.
(Fclear_image_cache): Expand meaning of the argument.
(mark_image): Mark `dependencies' field.
* xfaces.c (clear_face_cache): Adapt arg to call to clear_image_caches.
(lface_hash): Use XHASH rather than XFASTINT.
(face_at_buffer_position): Fix int -> EMACS_INT position.
* xdisp.c (next_overlay_change): Fix int -> EMACS_INT position.
(select_frame_for_redisplay): Remove code duplication.
(redisplay_internal): Adapt arg to call to clear_image_caches.
 2008-02-24 13:36:39 +00:00
Stefan Monnier
6087292e62 Include termhooks.h to find the image_cache slot in terminal objects. 2008-02-22 17:45:11 +00:00
Stefan Monnier
354884c46e Consolidate the image_cache to the terminal struct. 
* termhooks.h (P_): Remove redundant def.
(struct terminal): New field `image_cache'.
* frame.h (FRAME_IMAGE_CACHE): New macro.  Use it everywhere in place
of FRAME_X_IMAGE_CACHE.
* xterm.h (struct x_display_info): Remove image_cache field.
(FRAME_X_IMAGE_CACHE): Remove.  Use FRAME_IMAGE_CACHE instead.
* w32term.h (struct w32_display_info): Remove image_cache field.
(FRAME_X_IMAGE_CACHE): Remove.  Use FRAME_IMAGE_CACHE instead.
* macterm.h (struct mac_display_info): Remove image_cache field.
(FRAME_X_IMAGE_CACHE): Remove.  Use FRAME_IMAGE_CACHE instead.
* xterm.c (x_term_init):
* w32term.c (w32_term_init):
* macterm.c (mac_term_init): Set the image_cache in the terminal.
* dispextern.h (clear_image_cache, forall_images_in_image_cache):
Remove declarations.
(clear_image_caches, mark_image_cache): New declarations.
* xfaces.c (clear_face_cache):
* xdisp.c (redisplay_internal): Use clear_image_caches.
* image.c (clear_image_cache): Don't check that a frame is on
a window-system before checking if it shares the same cache.
(clear_image_caches): New function.
(Fclear_image_cache): Use it.
(mark_image): Move from allo.c.
(mark_image_cache): Move from alloc.c and forall_images_in_image_cache.
* alloc.c (mark_image, mark_image_cache): Move to image.c.
(mark_object): Don't call mark_image_cache for frames.
(mark_terminals): Call mark_image_cache.
 2008-02-22 17:42:09 +00:00
Miles Bader
59ce725a3b Merge from emacs--rel--22 
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-987
 2008-01-08 20:46:54 +00:00
Glenn Morris
8cabe764e9 Add 2008 to copyright years. 2008-01-08 04:37:27 +00:00
Miles Bader
e5e76c0431 Merge from emacs--rel--22 
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-943
 2007-12-06 00:46:18 +00:00
Jason Rumney
44b1dc2e97 (xbm_load) [WINDOWSNT]: Shuffle the bits of directly specified XBMs. 2007-12-02 16:18:47 +00:00
Stefan Monnier
e047f44883 Rewrite abbrev.c in Elisp. 
* image.c (Qcount): Don't declare as extern.
(syms_of_image): Initialize and staticpro `Qcount'.
* puresize.h (BASE_PURESIZE): Increase for the new abbrev.el functions.
* emacs.c (main): Don't call syms_of_abbrev.
* Makefile.in (obj): Remove abbrev.o.
(abbrev.o): Remove.
* abbrev.c: Remove.

Rewrite abbrev.c in Elisp.
* abbrev.el (abbrev-mode): Move custom group from cus-edit.el.
(abbrev-table-get, abbrev-table-put, abbrev-get)
(abbrev-put, make-abbrev-table, abbrev-table-p, clear-abbrev-table)
(define-abbrev, abbrev--check-chars, define-global-abbrev)
(define-mode-abbrev, abbrev--active-tables, abbrev-symbol)
(abbrev-expansion, abbrev--before-point, expand-abbrev)
(unexpand-abbrev, abbrev--write, abbrev--describe)
(insert-abbrev-table-description, define-abbrev-table):
New funs, largely transcribed from abbrev.c.
(abbrev-with-wrapper-hook): New macro.
(abbrev-table-name-list, global-abbrev-table)
(abbrev-minor-mode-table-alist, fundamental-mode-abbrev-table)
(abbrevs-changed, abbrev-all-caps, abbrev-start-location)
(abbrev-start-location-buffer, last-abbrev, last-abbrev-text)
(last-abbrev-location, pre-abbrev-expand-hook, abbrev-expand-function):
New vars, largely transcribed from abbrev.c.
* cus-edit.el (abbrev-mode): Remove.  Move to abbrev.el.
* cus-start.el: Remove abbrev-all-caps and pre-abbrev-expand-hook.
* loadup.el: Load "abbrev.el" before "lisp-mode.el".
 2007-10-28 02:41:00 +00:00
Eli Zaretskii
1ea40aa2f3 Replace abs' with eabs'. 2007-10-13 12:48:57 +00:00
Miles Bader
5a1539f385 Add missing change from rel-22 branch to src/image.c 
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-877
 2007-10-09 10:28:47 +00:00
Richard M. Stallman
65342ae385 (free_bitmap_record): Renamed from Free_Bitmap_Record. 2007-10-09 01:40:05 +00:00
Juanma Barranquero
4024ec3a26 (syms_of_image) <image-types>: Fix typo in docstring. 2007-10-05 09:00:38 +00:00
Juanma Barranquero
bbe6f2aa11 (syms_of_image) <image-types>: Fix typo in docstring. 2007-10-04 16:57:53 +00:00
Richard M. Stallman
867a0d72ea (our_memory_buffer): Renamed from omfib_buffer. 2007-09-21 23:08:01 +00:00
Glenn Morris
aca946f32e (our_memory_fill_input_buffer) <buffer>: Move to file scope and rename 
to omfib_buffer for clarity.
(gif_load) <interlace_start, interlace_increment>: Move to file scope.
 2007-09-14 07:44:58 +00:00
Glenn Morris
a99dc82bd8 (our_memory_fill_input_buffer) <buffer>: Move to file scope and rename 
to omfib_buffer for clarity.
(gif_load) <interlace_start, interlace_increment>: Move to file scope.
 2007-09-14 07:44:49 +00:00
Thien-Thi Nguyen
315912fb92 (gif_load): Fix bug: Handle nonexistent colormap. 2007-09-06 20:28:40 +00:00
Thien-Thi Nguyen
1ab2cd4392 (gif_load): Fix bug: Handle nonexistent colormap. 2007-09-06 20:25:18 +00:00
Glenn Morris
050b82f6f5 Comment. 2007-08-30 05:08:24 +00:00
Stefan Monnier
917ac1a9ba (png_load): Comment-out var only used in commented-out code. 2007-08-29 21:47:11 +00:00
Juanma Barranquero
747c316eac (syms_of_image) <image-library-alist, cross-disabled-images>: Doc fixes. 2007-08-28 11:39:26 +00:00
Miles Bader
62fb5e25f4 Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 857-862)

   - Update from CVS
   - Merge from emacs--rel--22
   - Update from CVS: lisp/emacs-lisp/avl-tree.el: New file.

 * emacs--rel--22  (patch 97-100)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 246-247)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-38
 2007-08-27 09:21:49 +00:00
Juanma Barranquero
3046a84b5e (syms_of_image) <image-library-alist, cross-disabled-images>: Doc fixes. 2007-08-24 13:46:24 +00:00
Jason Rumney
5fc9fdeb31 [HAVE_NTGUI]: Define dynamic loaded functions. 
(Qgdk_pixbuf, Qglib) [HAVE_NTGUI]: New symbols.
(syms_of_image) [HAVE_NTGUI]: Intern and staticpro them.
(init_svg_functions) [HAVE_NTGUI]: New function.
(fn_g_type_init, fn_g_object_unref, fn_g_error_free): New #defines.
(svg_load_image): Use them.
(svg_load_image) [HAVE_NTGUI]: Implement background.
 2007-08-24 00:28:53 +00:00
YAMAMOTO Mitsuharu
c21e615131 (svg_load_image): Blend with specified background if exists. 
Use IMAGE_BACKGROUND.  Add Mac OS Support.
 2007-08-23 08:44:57 +00:00