Full-height, full-width, and maximized windows now cover the entire screen (except the menu bar), including the part where the system dock is placed. The system zoom animation is no longer used. Made NonMaximized->FullWidth->FullHeight->NonMaximized restore the original size. * nsterm.m (ns_menu_bar_height): New function, return height of the menu bar, or 0 when it's hidden. * nsterm.m (constrain_frame_rect): New function for constraining a frame. * nsterm.m (ns_constrain_all_frames): Set frame size explicitly rather than relying on the system doing it for us by writing back the current frame size. * nsterm.m (windowWillUseStandardFrame): Register non-maximized width or height as new user size. When entering full width or height, the other size component is taken from the user size. * nsterm.m (fullscreenState): New method for accessing the fullscreen state. * nsterm.m (constrainFrameRect): Restrict frame to be placed under the menu bar, if present. The old version, sometimes, restricted the height of a frame to the screen, this version never does this. * nsterm.m (zoom): Perform zoom by setting the frame to the full size of the screen (minus the menu bar). The default system function, with the zoom animation, is no longer used, as the final frame size doesn't cover the entire screen. Rework how to constrain resizing to the character grid. The old system used "resizeIncrements" in NSWindows. However, once a frame was resized so that it was not aligned to the text grid, it remained unaligned even after a resize. In addition, it conflicted when resizing a fullheight window. * nsterm.m (windowWillResize): Restrict frame size to text grid, unless when pixelwise frame resizing is enabled. * nsterm.m (updateFrameSize, initFrameFromEmacs) (toggleFullScreen, handleFS): Don't set resizeIncrements. Redesign the NS trace system. The call structure is represented using indentations and vertical lines. The NSTRACE macro accepts printf-style arguments. New macros for printing various information. * nsterm.h (NSTRACE_ENABLED): Macro to enable trace system. * nsterm.h (NSTRACE, NSTRACE_WHEN, NSTRACE_UNLESS): Macros to start a new block (typically a function), accept printf-style arguments. * nsterm.h (NSTRACE_MSG): Macro for extra information, accepts printf-style arguments. * nsterm.h (NSTRACE_what): Macros for printing various types. * nsterm.h (NSTRACE_FMT_what): Macro with printf format string snippets. * nsterm.h (NSTRACE_ARG_what): Macros for passing printf-style arguments, corresponds to NSTRACE_FMT_what. * nsterm.h (NSTRACE_RETURN): Macro to print return value, accept printf-style arguments. * nsterm.h (NSTRACE_RETURN_what): Macros to print return value for various types. * nsterm.m: Remove old NSTRACE macro. * nsterm.m (nstrace_num): Trace counter. * nsterm.m (nstrace_depth): Current call depth. * nsterm.m (nstrace_leave): NSTRACE support function, called when the local variable "nstrace_enabled" goes out of scope using the "cleanup" extension. * nsterm.m (ns_print_fullscreen_type_name): NSTRACE_FSTYPE support function. * nsterm.m (constrain_frame_rect, ns_constrain_all_frames) (ns_update_auto_hide_menu_bar, ns_update_begin) (ns_update_window_begin, update_window_end, ns_update_end) (ns_focus, ns_unfocus, ns_ring_bell, ns_frame_raise_lower) (ns_frame_rehighlight, x_make_frame_visible) (x_make_frame_invisible, x_iconify_frame, x_free_frame_resources) (x_destroy_window, x_set_offset, x_set_window_size) (ns_fullscreen_hook, ns_lisp_to_color, ns_color_to_lisp) (ns_defined_color, frame_set_mouse_pixel_position) (note_mouse_movement, ns_mouse_position, ns_frame_up_to_date) (ns_define_frame_cursor, x_get_keysym_name, ns_redraw_scroll_bars) (ns_clear_frame, ns_clear_frame_area, ns_scroll_run) (ns_after_update_window_line, ns_shift_glyphs_for_insert) (dumpcursor, ns_draw_vertical_window_border) (ns_draw_window_divider, ns_draw_relief) (ns_dumpglyphs_box_or_relief, ns_maybe_dumpglyphs_background) (ns_dumpglyphs_image, ns_draw_glyph_string, ns_send_appdefined) (ns_read_socket, ns_select, ns_set_vertical_scroll_bar) (ns_set_horizontal_scroll_bar, ns_condemn_scroll_bars) (ns_redeem_scroll_bar, ns_judge_scroll_bars, ns_delete_terminal) (ns_create_terminal, ns_term_init, sendEvent) (applicationDidFinishLaunching, applicationDidBecomeActive) (timeout_handler, fd_handler, EmacsView_dealloc, changeFont) (acceptsFirstResponder, resetCursorRects, keyDown, mouseDown) (deltaIsZero, rightMouseDown, otherMouseDown, mouseUp) (rightMouseUp, otherMouseUp, scrollWheel, mouseMoved) (mouse_autoselect_window, in_window, mouseDragged) (rightMouseDragged, otherMouseDragged, windowShouldClose) (updateFrameSize, windowWillResize, windowDidResize) (windowDidBecomeKey, windowDidResignKey, windowWillMiniaturize) (initFrameFromEmacs, windowDidMove, windowDidDeminiaturize) (windowDidExpose, windowDidMiniaturize, windowWillEnterFullScreen) (windowDidEnterFullScreen, windowWillExitFullScreen) (windowDidExitFullScreen, toggleFullScreen, handleFS, setFSValue) (mouseEntered, mouseExited, menuDown, toolbarClicked, drawRect) (draggingEntered, performDragOperation, validRequestorForSendType) (setMiniwindowImage, constrainFrameRect, performZoom, zoom) (EmacsScroller_initFrame, EmacsScroller_setFrame) (EmacsScroller_dealloc, condemn, reprieve, judge) (resetCursorRects, setPosition, EmacsScroller_mouseDown) (EmacsScroller_mouseDragged, syms_of_nsterm): Use new trace system. * nsfns.m: Remove old NSTRACE macro. * nsfns.m (x_set_icon_name, ns_set_name, x_explicitly_set_name) (x_implicitly_set_name, x_set_title, ns_set_name_as_filename) (ns_implicitly_set_icon_type, x_set_icon_type): Use new trace system. * nsimage.m: Remove old NSTRACE macro. * nsimage.m (ns_image_from_XBM, ns_image_for_XPM) (ns_image_from_bitmap_file, ns_load_image): Use new trace system. * nsmenu.m: Remove old NSTRACE macro. * nsmenu.m (ns_update_menubar, ns_menu_show, ns_popup_dialog): Use new trace system.
446 lines
12 KiB
Objective-C
446 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"
|
|
#include "coding.h"
|
|
|
|
|
|
|
|
/* ==========================================================================
|
|
|
|
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,
|
|
unsigned long fg, unsigned long bg)
|
|
{
|
|
NSTRACE ("ns_image_from_XBM");
|
|
return [[EmacsImage alloc] initFromXBM: bits
|
|
width: width height: height
|
|
fg: fg bg: bg];
|
|
}
|
|
|
|
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);
|
|
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;
|
|
found = ENCODE_FILE (found);
|
|
|
|
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. */
|
|
#ifdef NS_IMPL_COCOA
|
|
#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6
|
|
[image setScalesWhenResized: YES];
|
|
#endif
|
|
#endif
|
|
[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
|
|
fg: (unsigned long)fg bg: (unsigned long)bg
|
|
{
|
|
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];
|
|
|
|
if (fg == 0 && bg == 0)
|
|
bg = 0xffffff;
|
|
|
|
{
|
|
/* pull bits out to set the (bytewise) alpha mask */
|
|
int i, j, k;
|
|
unsigned char *s = bits;
|
|
unsigned char *rr = planes[0];
|
|
unsigned char *gg = planes[1];
|
|
unsigned char *bb = planes[2];
|
|
unsigned char *alpha = planes[3];
|
|
unsigned char fgr = (fg >> 16) & 0xff;
|
|
unsigned char fgg = (fg >> 8) & 0xff;
|
|
unsigned char fgb = fg & 0xff;
|
|
unsigned char bgr = (bg >> 16) & 0xff;
|
|
unsigned char bgg = (bg >> 8) & 0xff;
|
|
unsigned char bgb = bg & 0xff;
|
|
unsigned char c;
|
|
|
|
int idx = 0;
|
|
for (j = 0; j < h; ++j)
|
|
for (i = 0; i < w; )
|
|
{
|
|
c = *s++;
|
|
for (k = 0; i < w && k < 8; ++k, ++i)
|
|
{
|
|
*alpha++ = 0xff;
|
|
if (c & 1)
|
|
{
|
|
*rr++ = fgr;
|
|
*gg++ = fgg;
|
|
*bb++ = fgb;
|
|
}
|
|
else
|
|
{
|
|
*rr++ = bgr;
|
|
*gg++ = bgg;
|
|
*bb++ = bgb;
|
|
}
|
|
idx++;
|
|
c >>= 1;
|
|
}
|
|
}
|
|
}
|
|
|
|
xbm_fg = fg;
|
|
[self addRepresentation: bmRep];
|
|
return self;
|
|
}
|
|
|
|
/* Set color for a bitmap image. */
|
|
- 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];
|
|
|
|
{
|
|
int i, len = s.width*s.height;
|
|
int rr = r * 0xff, gg = g * 0xff, bb = b * 0xff;
|
|
unsigned char fgr = (xbm_fg >> 16) & 0xff;
|
|
unsigned char fgg = (xbm_fg >> 8) & 0xff;
|
|
unsigned char fgb = xbm_fg & 0xff;
|
|
|
|
for (i = 0; i < len; ++i)
|
|
if (planes[0][i] == fgr && planes[1][i] == fgg && planes[2][i] == fgb)
|
|
{
|
|
planes[0][i] = rr;
|
|
planes[1][i] = gg;
|
|
planes[2][i] = bb;
|
|
}
|
|
xbm_fg = ((rr << 16) & 0xff) + ((gg << 8) & 0xff) + (bb & 0xff);
|
|
}
|
|
|
|
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. */
|
|
#ifdef NS_IMPL_COCOA
|
|
#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6
|
|
[self setScalesWhenResized: YES];
|
|
#endif
|
|
#endif
|
|
[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
|