mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-02-09 01:05:39 -08:00
Fixes Bug#15880. This patch also makes Q constants (e.g., Qnil) constant addresses from the C point of view. * make-docfile.c: Revamp to generate table of symbols, too. Include <stdbool.h>. (xstrdup): New function. (main): Don't process the same file twice. (SYMBOL): New constant in enum global_type. (struct symbol): Turn 'value' member into a union, either v.value for int or v.svalue for string. All uses changed. (add_global): New arg svalue, which overrides value, so that globals can have a string value. (close_emacs_global): New arg num_symbols; all uses changed. Output lispsym decl. (write_globals): Output symbol globals too. Output more ATTRIBUTE_CONST, now that Qnil etc. are C constants. Output defsym_name table. (scan_c_file): Move most of guts into ... (scan_c_stream): ... new function. Scan for DEFSYMs and record symbols found. Don't read past EOF if file doesn't end in newline. * alloc.c, bidi.c, buffer.c, bytecode.c, callint.c, casefiddle: * casetab.c, category.c, ccl.c, charset.c, chartab.c, cmds.c, coding.c: * composite.c, data.c, dbusbind.c, decompress.c, dired.c, dispnew.c: * doc.c, editfns.c, emacs.c, eval.c, fileio.c, fns.c, font.c, fontset.c: * frame.c, fringe.c, ftfont.c, ftxfont.c, gfilenotify.c, gnutls.c: * image.c, inotify.c, insdel.c, keyboard.c, keymap.c, lread.c: * macfont.m, macros.c, minibuf.c, nsfns.m, nsfont.m, nsimage.m: * nsmenu.m, nsselect.m, nsterm.m, print.c, process.c, profiler.c: * search.c, sound.c, syntax.c, term.c, terminal.c, textprop.c, undo.c: * window.c, xdisp.c, xfaces.c, xfns.c, xftfont.c, xmenu.c, xml.c: * xselect.c, xsettings.c, xterm.c: Remove Q vars that represent symbols (e.g., Qnil, Qt, Qemacs). These names are now defined automatically by make-docfile. * alloc.c (init_symbol): New function. (Fmake_symbol): Use it. (c_symbol_p): New function. (valid_lisp_object_p, purecopy): Use it. * alloc.c (marked_pinned_symbols): Use make_lisp_symbol instead of make_lisp_ptr. (garbage_collect_1): Mark lispsym symbols. (CHECK_ALLOCATED_AND_LIVE_SYMBOL): New macro. (mark_object): Use it. (sweep_symbols): Sweep lispsym symbols. (symbol_uses_obj): New function. (which_symbols): Use it. Work for lispsym symbols, too. (init_alloc_once): Initialize Vpurify_flag here; no need to wait, since Qt's address is already known now. (syms_of_alloc): Add lispsym count to symbols_consed. * buffer.c (init_buffer_once): Compare to Qnil, not to make_number (0), when testing whether storage is all bits zero. * dispextern (struct image_type): * font.c (font_property_table): * frame.c (struct frame_parm_table, frame_parms): * keyboard.c (scroll_bar_parts, struct event_head): * xdisp.c (struct props): Use XSYMBOL_INIT (Qfoo) and struct Lisp_Symbol * rather than &Qfoo and Lisp_Object *, since Qfoo is no longer an object whose address can be taken. All uses changed. * eval.c (run_hook): New function. Most uses of Frun_hooks changed to use it, so that they no longer need to take the address of a Lisp sym. (syms_of_eval): Don't use DEFSYM on Vrun_hooks, as it's a variable. * frame.c (syms_of_frame): Add defsyms for the frame_parms table. * keyboard.c (syms_of_keyboard): Don't DEFSYM Qmenu_bar here. DEFSYM Qdeactivate_mark before the corresponding var. * keymap.c (syms_of_keymap): Use DEFSYM for Qmenu_bar and Qmode_line instead of interning their symbols; this avoids duplicates. (LISP_INITIALLY, TAG_PTR) (DEFINE_LISP_SYMBOL_BEGIN, DEFINE_LISP_SYMBOL_END, XSYMBOL_INIT): New macros. (LISP_INITIALLY_ZERO): Use it. (enum symbol_interned, enum symbol_redirect, struct Lisp_Symbol) (EXFUN, DEFUN_ARGS_MANY, DEFUN_ARGS_UNEVALLED, DEFUN_ARGS_*): Move decls up, to avoid forward uses. Include globals.h earlier, too. (make_lisp_symbol): New function. (XSETSYMBOL): Use it. (DEFSYM): Now just a placeholder for make-docfile. * lread.c (DEFINE_SYMBOLS): Define, for globals.h. (intern_sym): New function, with body taken from old intern_driver. (intern_driver): Use it. Last arg is now Lisp integer, not ptrdiff_t. All uses changed. (define_symbol): New function. (init_obarray): Define the C symbols taken from lispsym. Use plain DEFSYM for Qt and Qnil. * syntax.c (init_syntax_once): No need to worry about Qchar_table_extra_slots.
447 lines
12 KiB
Objective-C
447 lines
12 KiB
Objective-C
/* Image support for the NeXT/Open/GNUstep and MacOSX window system.
|
|
Copyright (C) 1989, 1992-1994, 2005-2006, 2008-2015 Free Software
|
|
Foundation, Inc.
|
|
|
|
This file is part of GNU Emacs.
|
|
|
|
GNU Emacs is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
GNU Emacs is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
/*
|
|
Originally by Carl Edman
|
|
Updated by Christian Limpach (chris@nice.ch)
|
|
OpenStep/Rhapsody port by Scott Bender (sbender@harmony-ds.com)
|
|
MacOSX/Aqua port by Christophe de Dinechin (descubes@earthlink.net)
|
|
GNUstep port and post-20 update by Adrian Robert (arobert@cogsci.ucsd.edu)
|
|
*/
|
|
|
|
/* This should be the first include, as it may set up #defines affecting
|
|
interpretation of even the system includes. */
|
|
#include <config.h>
|
|
|
|
#include "lisp.h"
|
|
#include "dispextern.h"
|
|
#include "nsterm.h"
|
|
#include "frame.h"
|
|
|
|
/* call tracing */
|
|
#if 0
|
|
int image_trace_num = 0;
|
|
#define NSTRACE(x) fprintf (stderr, "%s:%d: [%d] " #x "\n", \
|
|
__FILE__, __LINE__, ++image_trace_num)
|
|
#else
|
|
#define NSTRACE(x)
|
|
#endif
|
|
|
|
|
|
/* ==========================================================================
|
|
|
|
C interface. This allows easy calling from C files. We could just
|
|
compile everything as Objective-C, but that might mean slower
|
|
compilation and possible difficulties on some platforms..
|
|
|
|
========================================================================== */
|
|
|
|
void *
|
|
ns_image_from_XBM (unsigned char *bits, int width, int height)
|
|
{
|
|
NSTRACE (ns_image_from_XBM);
|
|
return [[EmacsImage alloc] initFromXBM: bits
|
|
width: width height: height
|
|
flip: YES];
|
|
}
|
|
|
|
void *
|
|
ns_image_for_XPM (int width, int height, int depth)
|
|
{
|
|
NSTRACE (ns_image_for_XPM);
|
|
return [[EmacsImage alloc] initForXPMWithDepth: depth
|
|
width: width height: height];
|
|
}
|
|
|
|
void *
|
|
ns_image_from_file (Lisp_Object file)
|
|
{
|
|
NSTRACE (ns_image_from_bitmap_file);
|
|
return [EmacsImage allocInitFromFile: file];
|
|
}
|
|
|
|
bool
|
|
ns_load_image (struct frame *f, struct image *img,
|
|
Lisp_Object spec_file, Lisp_Object spec_data)
|
|
{
|
|
EmacsImage *eImg = nil;
|
|
NSSize size;
|
|
|
|
NSTRACE (ns_load_image);
|
|
|
|
if (STRINGP (spec_file))
|
|
{
|
|
eImg = [EmacsImage allocInitFromFile: spec_file];
|
|
}
|
|
else if (STRINGP (spec_data))
|
|
{
|
|
NSData *data;
|
|
|
|
data = [NSData dataWithBytes: SSDATA (spec_data)
|
|
length: SBYTES (spec_data)];
|
|
eImg = [[EmacsImage alloc] initWithData: data];
|
|
[eImg setPixmapData];
|
|
}
|
|
|
|
if (eImg == nil)
|
|
{
|
|
add_to_log ("Unable to load image %s", img->spec, Qnil);
|
|
return 0;
|
|
}
|
|
|
|
size = [eImg size];
|
|
img->width = size.width;
|
|
img->height = size.height;
|
|
|
|
/* 4) set img->pixmap = emacsimage */
|
|
img->pixmap = eImg;
|
|
return 1;
|
|
}
|
|
|
|
|
|
int
|
|
ns_image_width (void *img)
|
|
{
|
|
return [(id)img size].width;
|
|
}
|
|
|
|
int
|
|
ns_image_height (void *img)
|
|
{
|
|
return [(id)img size].height;
|
|
}
|
|
|
|
unsigned long
|
|
ns_get_pixel (void *img, int x, int y)
|
|
{
|
|
return [(EmacsImage *)img getPixelAtX: x Y: y];
|
|
}
|
|
|
|
void
|
|
ns_put_pixel (void *img, int x, int y, unsigned long argb)
|
|
{
|
|
unsigned char alpha = (argb >> 24) & 0xFF;
|
|
if (alpha == 0)
|
|
alpha = 0xFF;
|
|
[(EmacsImage *)img setPixelAtX: x Y: y toRed: (argb >> 16) & 0xFF
|
|
green: (argb >> 8) & 0xFF blue: (argb & 0xFF) alpha: alpha];
|
|
}
|
|
|
|
void
|
|
ns_set_alpha (void *img, int x, int y, unsigned char a)
|
|
{
|
|
[(EmacsImage *)img setAlphaAtX: x Y: y to: a];
|
|
}
|
|
|
|
|
|
/* ==========================================================================
|
|
|
|
Class supporting bitmaps and images of various sorts.
|
|
|
|
========================================================================== */
|
|
|
|
@implementation EmacsImage
|
|
|
|
+ allocInitFromFile: (Lisp_Object)file
|
|
{
|
|
NSImageRep *imgRep;
|
|
Lisp_Object found;
|
|
EmacsImage *image;
|
|
|
|
/* Search bitmap-file-path for the file, if appropriate. */
|
|
found = x_find_image_file (file);
|
|
if (!STRINGP (found))
|
|
return nil;
|
|
|
|
image = [[EmacsImage alloc] initByReferencingFile:
|
|
[NSString stringWithUTF8String: SSDATA (found)]];
|
|
|
|
image->bmRep = nil;
|
|
#ifdef NS_IMPL_COCOA
|
|
imgRep = [NSBitmapImageRep imageRepWithData:[image TIFFRepresentation]];
|
|
#else
|
|
imgRep = [image bestRepresentationForDevice: nil];
|
|
#endif
|
|
if (imgRep == nil)
|
|
{
|
|
[image release];
|
|
return nil;
|
|
}
|
|
|
|
/* The next two lines cause the DPI of the image to be ignored.
|
|
This seems to be the behavior users expect. */
|
|
[image setScalesWhenResized: YES];
|
|
[image setSize: NSMakeSize([imgRep pixelsWide], [imgRep pixelsHigh])];
|
|
|
|
[image setName: [NSString stringWithUTF8String: SSDATA (file)]];
|
|
|
|
return image;
|
|
}
|
|
|
|
|
|
- (void)dealloc
|
|
{
|
|
[stippleMask release];
|
|
[bmRep release];
|
|
[super dealloc];
|
|
}
|
|
|
|
|
|
- initFromXBM: (unsigned char *)bits width: (int)w height: (int)h
|
|
flip: (BOOL)flip
|
|
{
|
|
return [self initFromSkipXBM: bits width: w height: h flip: flip length: 0];
|
|
}
|
|
|
|
|
|
- initFromSkipXBM: (unsigned char *)bits width: (int)w height: (int)h
|
|
flip: (BOOL)flip length: (int)length;
|
|
{
|
|
int bpr = (w + 7) / 8;
|
|
unsigned char *planes[5];
|
|
|
|
[self initWithSize: NSMakeSize (w, h)];
|
|
|
|
bmRep = [[NSBitmapImageRep alloc] initWithBitmapDataPlanes: NULL
|
|
pixelsWide: w pixelsHigh: h
|
|
bitsPerSample: 8 samplesPerPixel: 4
|
|
hasAlpha: YES isPlanar: YES
|
|
colorSpaceName: NSCalibratedRGBColorSpace
|
|
bytesPerRow: w bitsPerPixel: 0];
|
|
|
|
[bmRep getBitmapDataPlanes: planes];
|
|
{
|
|
/* pull bits out to set the (bytewise) alpha mask */
|
|
int i, j, k;
|
|
unsigned char *s = bits;
|
|
unsigned char *alpha = planes[3];
|
|
unsigned char swt[16] = {0, 8, 4, 12, 2, 10, 6, 14, 1, 9, 5, 13,
|
|
3, 11, 7, 15};
|
|
unsigned char c, bitPat;
|
|
|
|
for (j = 0; j < h; j++)
|
|
for (i = 0; i < bpr; i++)
|
|
{
|
|
if (length)
|
|
{
|
|
unsigned char s1, s2;
|
|
while (*s++ != 'x' && s < bits + length);
|
|
if (s >= bits + length)
|
|
{
|
|
[bmRep release];
|
|
bmRep = nil;
|
|
return nil;
|
|
}
|
|
#define hexchar(x) ('0' <= (x) && (x) <= '9' ? (x) - '0' : (x) - 'a' + 10)
|
|
s1 = *s++;
|
|
s2 = *s++;
|
|
c = hexchar (s1) * 0x10 + hexchar (s2);
|
|
}
|
|
else
|
|
c = *s++;
|
|
|
|
bitPat = flip ? swt[c >> 4] | (swt[c & 0xf] << 4) : c ^ 255;
|
|
for (k =0; k<8; k++)
|
|
{
|
|
*alpha++ = (bitPat & 0x80) ? 0xff : 0;
|
|
bitPat <<= 1;
|
|
}
|
|
}
|
|
}
|
|
|
|
[self addRepresentation: bmRep];
|
|
|
|
memset (planes[0], 0, w*h);
|
|
memset (planes[1], 0, w*h);
|
|
memset (planes[2], 0, w*h);
|
|
[self setXBMColor: [NSColor blackColor]];
|
|
return self;
|
|
}
|
|
|
|
|
|
/* Set color for a bitmap image (see initFromSkipXBM). Note that the alpha
|
|
is used as a mask, so we just memset the entire array. */
|
|
- setXBMColor: (NSColor *)color
|
|
{
|
|
NSSize s = [self size];
|
|
unsigned char *planes[5];
|
|
EmacsCGFloat r, g, b, a;
|
|
NSColor *rgbColor;
|
|
|
|
if (bmRep == nil || color == nil)
|
|
return self;
|
|
|
|
if ([color colorSpaceName] != NSCalibratedRGBColorSpace)
|
|
rgbColor = [color colorUsingColorSpaceName: NSCalibratedRGBColorSpace];
|
|
else
|
|
rgbColor = color;
|
|
|
|
[rgbColor getRed: &r green: &g blue: &b alpha: &a];
|
|
|
|
[bmRep getBitmapDataPlanes: planes];
|
|
|
|
/* we used to just do this, but Cocoa seems to have a bug when rendering
|
|
an alpha-masked image onto a dark background where it bloats the mask */
|
|
/* memset (planes[0..2], r, g, b*0xff, len); */
|
|
{
|
|
int i, len = s.width*s.height;
|
|
int rr = r * 0xff, gg = g * 0xff, bb = b * 0xff;
|
|
for (i =0; i<len; i++)
|
|
if (planes[3][i] != 0)
|
|
{
|
|
planes[0][i] = rr;
|
|
planes[1][i] = gg;
|
|
planes[2][i] = bb;
|
|
}
|
|
}
|
|
|
|
return self;
|
|
}
|
|
|
|
|
|
- initForXPMWithDepth: (int)depth width: (int)width height: (int)height
|
|
{
|
|
NSSize s = {width, height};
|
|
int i;
|
|
|
|
[self initWithSize: s];
|
|
|
|
bmRep = [[NSBitmapImageRep alloc] initWithBitmapDataPlanes: NULL
|
|
pixelsWide: width pixelsHigh: height
|
|
/* keep things simple for now */
|
|
bitsPerSample: 8 samplesPerPixel: 4 /*RGB+A*/
|
|
hasAlpha: YES isPlanar: YES
|
|
colorSpaceName: NSCalibratedRGBColorSpace
|
|
bytesPerRow: width bitsPerPixel: 0];
|
|
|
|
[bmRep getBitmapDataPlanes: pixmapData];
|
|
for (i =0; i<4; i++)
|
|
memset (pixmapData[i], 0, width*height);
|
|
[self addRepresentation: bmRep];
|
|
return self;
|
|
}
|
|
|
|
|
|
/* attempt to pull out pixmap data from a BitmapImageRep; returns NO if fails */
|
|
- (void) setPixmapData
|
|
{
|
|
NSEnumerator *reps;
|
|
NSImageRep *rep;
|
|
|
|
reps = [[self representations] objectEnumerator];
|
|
while ((rep = (NSImageRep *) [reps nextObject]))
|
|
{
|
|
if ([rep respondsToSelector: @selector (getBitmapDataPlanes:)])
|
|
{
|
|
NSBitmapImageRep *bmr = (NSBitmapImageRep *) rep;
|
|
|
|
if ([bmr numberOfPlanes] >= 3)
|
|
[bmr getBitmapDataPlanes: pixmapData];
|
|
|
|
/* The next two lines cause the DPI of the image to be ignored.
|
|
This seems to be the behavior users expect. */
|
|
[self setScalesWhenResized: YES];
|
|
[self setSize: NSMakeSize([bmr pixelsWide], [bmr pixelsHigh])];
|
|
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
/* note; this and next work only for image created with initForXPMWithDepth,
|
|
initFromSkipXBM, or where setPixmapData was called successfully */
|
|
/* return ARGB */
|
|
- (unsigned long) getPixelAtX: (int)x Y: (int)y
|
|
{
|
|
if (bmRep == nil)
|
|
return 0;
|
|
|
|
/* this method is faster but won't work for bitmaps */
|
|
if (pixmapData[0] != NULL)
|
|
{
|
|
int loc = x + y * [self size].width;
|
|
return (pixmapData[3][loc] << 24) /* alpha */
|
|
| (pixmapData[0][loc] << 16) | (pixmapData[1][loc] << 8)
|
|
| (pixmapData[2][loc]);
|
|
}
|
|
else
|
|
{
|
|
NSColor *color = [bmRep colorAtX: x y: y];
|
|
EmacsCGFloat r, g, b, a;
|
|
[color getRed: &r green: &g blue: &b alpha: &a];
|
|
return ((int)(a * 255.0) << 24)
|
|
| ((int)(r * 255.0) << 16) | ((int)(g * 255.0) << 8)
|
|
| ((int)(b * 255.0));
|
|
|
|
}
|
|
}
|
|
|
|
- (void) setPixelAtX: (int)x Y: (int)y toRed: (unsigned char)r
|
|
green: (unsigned char)g blue: (unsigned char)b
|
|
alpha:(unsigned char)a;
|
|
{
|
|
if (bmRep == nil)
|
|
return;
|
|
|
|
if (pixmapData[0] != NULL)
|
|
{
|
|
int loc = x + y * [self size].width;
|
|
pixmapData[0][loc] = r;
|
|
pixmapData[1][loc] = g;
|
|
pixmapData[2][loc] = b;
|
|
pixmapData[3][loc] = a;
|
|
}
|
|
else
|
|
{
|
|
[bmRep setColor:
|
|
[NSColor colorWithCalibratedRed: (r/255.0) green: (g/255.0)
|
|
blue: (b/255.0) alpha: (a/255.0)]
|
|
atX: x y: y];
|
|
}
|
|
}
|
|
|
|
- (void) setAlphaAtX: (int) x Y: (int) y to: (unsigned char) a
|
|
{
|
|
if (bmRep == nil)
|
|
return;
|
|
|
|
if (pixmapData[0] != NULL)
|
|
{
|
|
int loc = x + y * [self size].width;
|
|
|
|
pixmapData[3][loc] = a;
|
|
}
|
|
else
|
|
{
|
|
NSColor *color = [bmRep colorAtX: x y: y];
|
|
color = [color colorWithAlphaComponent: (a / 255.0)];
|
|
[bmRep setColor: color atX: x y: y];
|
|
}
|
|
}
|
|
|
|
/* returns a pattern color, which is cached here */
|
|
- (NSColor *)stippleMask
|
|
{
|
|
if (stippleMask == nil)
|
|
stippleMask = [[NSColor colorWithPatternImage: self] retain];
|
|
return stippleMask;
|
|
}
|
|
|
|
@end
|