/* NeXT/Open/GNUstep / MacOSX communication module.
- Copyright (C) 1989, 1993, 1994, 2005, 2006, 2008, 2009, 2010
+ Copyright (C) 1989, 1993-1994, 2005-2006, 2008-2011
Free Software Foundation, Inc.
This file is part of GNU Emacs.
0x1B, 0x1B /* escape */
};
-
-/* Lisp communications */
-Lisp_Object ns_input_file, ns_input_font, ns_input_fontsize, ns_input_line;
-Lisp_Object ns_input_color, ns_input_text, ns_working_text;
-Lisp_Object ns_input_spi_name, ns_input_spi_arg;
-Lisp_Object Vx_toolkit_scroll_bars;
static Lisp_Object Qmodifier_value;
Lisp_Object Qalt, Qcontrol, Qhyper, Qmeta, Qsuper, Qnone;
extern Lisp_Object Qcursor_color, Qcursor_type, Qns, Qleft;
-/* Specifies which emacs modifier should be generated when NS receives
- the Alternate modifier. May be Qnone or any of the modifier lisp symbols. */
-Lisp_Object ns_alternate_modifier;
-
-/* Specifies which emacs modifier should be generated when NS receives
- the right Alternate modifier. Has same values as ns_alternate_modifier plus
- the value Qleft which means whatever value ns_alternate_modifier has. */
-Lisp_Object ns_right_alternate_modifier;
-
-/* Specifies which emacs modifier should be generated when NS receives
- the Command modifier. May be any of the modifier lisp symbols. */
-Lisp_Object ns_command_modifier;
-
-/* Specifies which emacs modifier should be generated when NS receives
- the Control modifier. May be any of the modifier lisp symbols. */
-Lisp_Object ns_control_modifier;
-
-/* Specifies which emacs modifier should be generated when NS receives
- the Function modifier (laptops). May be any of the modifier lisp symbols. */
-Lisp_Object ns_function_modifier;
-
-/* Control via default 'GSFontAntiAlias' on OS X and GNUstep. */
-Lisp_Object ns_antialias_text;
+static Lisp_Object QUTF8_STRING;
/* On OS X picks up the default NSGlobalDomain AppleAntiAliasingThreshold,
the maximum font size to NOT antialias. On GNUstep there is currently
/* Used to pick up AppleHighlightColor on OS X */
NSString *ns_selection_color;
-/* Confirm on exit. */
-Lisp_Object ns_confirm_quit;
-
NSArray *ns_send_types =0, *ns_return_types =0, *ns_drag_types =0;
NSString *ns_app_name = @"Emacs"; /* default changed later */
/* display update */
NSPoint last_mouse_motion_position;
static NSRect last_mouse_glyph;
-static unsigned long last_mouse_movement_time = 0;
+static Time last_mouse_movement_time = 0;
static Lisp_Object last_mouse_motion_frame;
static EmacsScroller *last_mouse_scroll_bar = nil;
static struct frame *ns_updating_frame;
static BOOL ns_fake_keydown = NO;
int ns_tmp_flags; /* FIXME */
struct nsfont_info *ns_tmp_font; /* FIXME */
+static BOOL ns_menu_bar_is_hidden = NO;
/*static int debug_lock = 0; */
/* event loop */
*ns_pending_service_args;
static BOOL inNsSelect = 0;
-/* Convert modifiers in a NeXTSTEP event to emacs style modifiers. */
+/* Convert modifiers in a NeXTstep event to emacs style modifiers. */
#define NS_FUNCTION_KEY_MASK 0x800000
+#define NSLeftControlKeyMask (0x000001 | NSControlKeyMask)
+#define NSRightControlKeyMask (0x002000 | NSControlKeyMask)
+#define NSLeftCommandKeyMask (0x000008 | NSCommandKeyMask)
+#define NSRightCommandKeyMask (0x000010 | NSCommandKeyMask)
+#define NSLeftAlternateKeyMask (0x000020 | NSAlternateKeyMask)
#define NSRightAlternateKeyMask (0x000040 | NSAlternateKeyMask)
#define EV_MODIFIERS(e) \
((([e modifierFlags] & NSHelpKeyMask) ? \
parse_solitary_modifier (ns_alternate_modifier) : 0) \
| (([e modifierFlags] & NSShiftKeyMask) ? \
shift_modifier : 0) \
+ | (!EQ (ns_right_control_modifier, Qleft) && \
+ (([e modifierFlags] & NSRightControlKeyMask) \
+ == NSRightControlKeyMask) ? \
+ parse_solitary_modifier (ns_right_control_modifier) : 0) \
| (([e modifierFlags] & NSControlKeyMask) ? \
parse_solitary_modifier (ns_control_modifier) : 0) \
| (([e modifierFlags] & NS_FUNCTION_KEY_MASK) ? \
parse_solitary_modifier (ns_function_modifier) : 0) \
+ | (!EQ (ns_right_command_modifier, Qleft) && \
+ (([e modifierFlags] & NSRightCommandKeyMask) \
+ == NSRightCommandKeyMask) ? \
+ parse_solitary_modifier (ns_right_command_modifier) : 0) \
| (([e modifierFlags] & NSCommandKeyMask) ? \
parse_solitary_modifier (ns_command_modifier):0))
static void ns_judge_scroll_bars (struct frame *f);
void x_set_frame_alpha (struct frame *f);
-/* unused variables needed for compatibility reasons */
-int x_use_underline_position_properties, x_underline_at_descent_line;
/* FIXME: figure out what to do with underline_minimum_offset. */
}
+//
+// Window constraining
+// -------------------
+//
+// To ensure that the windows are not placed under the menu bar, they
+// are typically moved by the call-back constrainFrameRect. However,
+// by overriding it, it's possible to inhibit this, leaving the window
+// in it's original position.
+//
+// It's possible to hide the menu bar. However, technically, it's only
+// possible to hide it when the application is active. To ensure that
+// this work properly, the menu bar and window constraining are
+// deferred until the application becomes active.
+//
+// Even though it's not possible to manually move a window above the
+// top of the screen, it is allowed if it's done programmatically,
+// when the menu is hidden. This allows the editable area to cover the
+// full screen height.
+//
+// Test cases
+// ----------
+//
+// Use the following extra files:
+//
+// init.el:
+// ;; Hide menu and place frame slightly above the top of the screen.
+// (setq ns-auto-hide-menu-bar t)
+// (set-frame-position (selected-frame) 0 -20)
+//
+// Test 1:
+//
+// emacs -Q -l init.el
+//
+// Result: No menu bar, and the title bar should be above the screen.
+//
+// Test 2:
+//
+// emacs -Q
+//
+// Result: Menu bar visible, frame placed immediately below the menu.
+//
+
+static void
+ns_constrain_all_frames (void)
+{
+ Lisp_Object tail, frame;
+
+ FOR_EACH_FRAME (tail, frame)
+ {
+ struct frame *f = XFRAME (frame);
+ if (FRAME_NS_P (f))
+ {
+ NSView *view = FRAME_NS_VIEW (f);
+ /* This no-op will trigger the default window placing
+ * constriant system. */
+ f->output_data.ns->dont_constrain = 0;
+ [[view window] setFrameOrigin:[[view window] frame].origin];
+ }
+ }
+}
+
+
+/* True, if the menu bar should be hidden. */
+
+static BOOL
+ns_menu_bar_should_be_hidden (void)
+{
+ return !NILP (ns_auto_hide_menu_bar)
+ && [NSApp respondsToSelector:@selector(setPresentationOptions:)];
+}
+
+
+/* Show or hide the menu bar, based on user setting. */
+
+static void
+ns_update_auto_hide_menu_bar (void)
+{
+#ifndef MAC_OS_X_VERSION_10_6
+#define MAC_OS_X_VERSION_10_6 1060
+#endif
+#ifdef NS_IMPL_COCOA
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
+ BLOCK_INPUT;
+
+ NSTRACE (ns_update_auto_hide_menu_bar);
+
+ if (NSApp != nil
+ && [NSApp isActive]
+ && [NSApp respondsToSelector:@selector(setPresentationOptions:)])
+ {
+ // Note, "setPresentationOptions" triggers an error unless the
+ // application is active.
+ BOOL menu_bar_should_be_hidden = ns_menu_bar_should_be_hidden ();
+
+ if (menu_bar_should_be_hidden != ns_menu_bar_is_hidden)
+ {
+ NSApplicationPresentationOptions options
+ = NSApplicationPresentationAutoHideDock;
+
+ if (menu_bar_should_be_hidden)
+ options |= NSApplicationPresentationAutoHideMenuBar;
+
+ [NSApp setPresentationOptions: options];
+
+ ns_menu_bar_is_hidden = menu_bar_should_be_hidden;
+
+ if (!ns_menu_bar_is_hidden)
+ {
+ ns_constrain_all_frames ();
+ }
+ }
+ }
+
+ UNBLOCK_INPUT;
+#endif
+#endif
+}
+
+
static void
ns_update_begin (struct frame *f)
/* --------------------------------------------------------------------------
NSView *view = FRAME_NS_VIEW (f);
NSTRACE (ns_update_begin);
+ ns_update_auto_hide_menu_bar ();
+
ns_updating_frame = f;
[view lockFocus];
External: Position the window
-------------------------------------------------------------------------- */
{
- NSScreen *screen;
NSView *view = FRAME_NS_VIEW (f);
+ NSArray *screens = [NSScreen screens];
+ NSScreen *fscreen = [screens objectAtIndex: 0];
+ NSScreen *screen = [[view window] screen];
NSTRACE (x_set_offset);
f->left_pos = xoff;
f->top_pos = yoff;
+
+ if (view != nil && screen && fscreen)
+ {
+ f->left_pos = f->size_hint_flags & XNegative
+ ? [screen visibleFrame].size.width + f->left_pos - FRAME_PIXEL_WIDTH (f)
+ : f->left_pos;
+ /* We use visibleFrame here to take menu bar into account.
+ Ideally we should also adjust left/top with visibleFrame.origin. */
+
+ f->top_pos = f->size_hint_flags & YNegative
+ ? ([screen visibleFrame].size.height + f->top_pos
+ - FRAME_PIXEL_HEIGHT (f) - FRAME_NS_TITLEBAR_HEIGHT (f)
+ - FRAME_TOOLBAR_HEIGHT (f))
+ : f->top_pos;
#ifdef NS_IMPL_GNUSTEP
- if (xoff < 100)
- f->left_pos = 100; /* don't overlap menu */
+ if (f->left_pos < 100)
+ f->left_pos = 100; /* don't overlap menu */
#endif
+ /* Constrain the setFrameTopLeftPoint so we don't move behind the
+ menu bar. */
+ f->output_data.ns->dont_constrain = 0;
+ [[view window] setFrameTopLeftPoint:
+ NSMakePoint (SCREENMAXBOUND (f->left_pos),
+ SCREENMAXBOUND ([fscreen frame].size.height
+ - NS_TOP_POS (f)))];
+ f->size_hint_flags &= ~(XNegative|YNegative);
+ }
- if (view != nil && (screen = [[view window] screen]))
- [[view window] setFrameTopLeftPoint:
- NSMakePoint (SCREENMAXBOUND (f->left_pos),
- SCREENMAXBOUND ([screen frame].size.height
- - NS_TOP_POS (f)))];
UNBLOCK_INPUT;
}
/* --------------------------------------------------------------------------
Adjust window pixel size based on given character grid size
Impl is a bit more complex than other terms, need to do some
- internal clipping and also pay attention to screen constraints.
+ internal clipping.
-------------------------------------------------------------------------- */
{
EmacsView *view = FRAME_NS_VIEW (f);
EmacsToolbar *toolbar = [view toolbar];
NSWindow *window = [view window];
- NSScreen *screen = [window screen];
NSRect wr = [window frame];
int tb = FRAME_EXTERNAL_TOOL_BAR (f);
int pixelwidth, pixelheight;
FRAME_TOOLBAR_HEIGHT (f) = 0;
wr.size.width = pixelwidth + f->border_width;
- wr.size.height = pixelheight + FRAME_NS_TITLEBAR_HEIGHT (f)
+ wr.size.height = pixelheight + FRAME_NS_TITLEBAR_HEIGHT (f)
+ FRAME_TOOLBAR_HEIGHT (f);
- /* constrain to screen if we can */
- if (screen)
- {
- NSSize sz = [screen visibleFrame].size;
- NSSize ez = { wr.size.width - sz.width, wr.size.height - sz.height };
- if (ez.width > 0)
- {
- int cr = ez.width / FRAME_COLUMN_WIDTH (f) + 1;
- cols -= cr;
- oldCols = cols;
- wr.size.width -= cr * FRAME_COLUMN_WIDTH (f);
- pixelwidth -= cr * FRAME_COLUMN_WIDTH (f);
- }
- if (ez.height > 0)
- {
- int rr = ez.height / FRAME_LINE_HEIGHT (f) + 1;
- rows -= rr;
- oldRows = rows;
- wr.size.height -= rr * FRAME_LINE_HEIGHT (f);
- pixelheight -= rr * FRAME_LINE_HEIGHT (f);
- }
- wr.origin.x = f->left_pos;
- wr.origin.y = [screen frame].size.height - NS_TOP_POS (f)
- - wr.size.height;
- }
+ /* Do not try to constrain to this screen. We may have multiple
+ screens, and want Emacs to span those. Constraining to screen
+ prevents that, and that is not nice to the user. */
+ if (f->output_data.ns->zooming)
+ f->output_data.ns->zooming = 0;
+ else
+ wr.origin.y += FRAME_PIXEL_HEIGHT (f) - pixelheight;
[view setRows: rows andColumns: cols];
[window setFrame: wr display: YES];
static void
ns_mouse_position (struct frame **fp, int insist, Lisp_Object *bar_window,
enum scroll_bar_part *part, Lisp_Object *x, Lisp_Object *y,
- unsigned long *time)
+ Time *time)
/* --------------------------------------------------------------------------
External (hook): inform emacs about mouse position and hit parts.
If a scrollbar is being dragged, set bar_window, part, x, y, time.
int x, int y, int cursor_type, int cursor_width,
int on_p, int active_p)
/* --------------------------------------------------------------------------
- External call (RIF): draw cursor
- (modeled after x_draw_window_cursor
- FIXME: cursor_width is effectively bogus -- it sometimes gets set
- in xdisp.c set_frame_cursor_types, sometimes left uninitialized;
- DON'T USE IT (no other terms do)
+ External call (RIF): draw cursor.
+ Note that CURSOR_WIDTH is meaningful only for (h)bar cursors.
-------------------------------------------------------------------------- */
{
NSRect r, s;
- int fx, fy, h;
+ int fx, fy, h, cursor_height;
struct frame *f = WINDOW_XFRAME (w);
struct glyph *phys_cursor_glyph;
int overspill;
struct glyph *cursor_glyph;
+ struct face *face;
+ NSColor *hollow_color = FRAME_BACKGROUND_COLOR (f);
/* If cursor is out of bounds, don't draw garbage. This can happen
in mini-buffer windows when switching between echo area glyphs
and mini-buffer. */
NSTRACE (dumpcursor);
-//fprintf(stderr, "drawcursor (%d,%d) activep = %d\tonp = %d\tc_type = %d\twidth = %d\n",x,y, active_p,on_p,cursor_type,cursor_width);
if (!on_p)
- return;
+ return;
w->phys_cursor_type = cursor_type;
w->phys_cursor_on_p = on_p;
return;
}
+ /* We draw the cursor (with NSRectFill), then draw the glyph on top
+ (other terminals do it the other way round). We must set
+ w->phys_cursor_width to the cursor width. For bar cursors, that
+ is CURSOR_WIDTH; for box cursors, it is the glyph width. */
get_phys_cursor_geometry (w, glyph_row, phys_cursor_glyph, &fx, &fy, &h);
+ /* The above get_phys_cursor_geometry call set w->phys_cursor_width
+ to the glyph width; replace with CURSOR_WIDTH for (V)BAR cursors. */
+ if (cursor_type == BAR_CURSOR)
+ {
+ if (cursor_width < 1)
+ cursor_width = max (FRAME_CURSOR_WIDTH (f), 1);
+ w->phys_cursor_width = cursor_width;
+ }
+ /* If we have an HBAR, "cursor_width" MAY specify height. */
+ else if (cursor_type == HBAR_CURSOR)
+ {
+ cursor_height = (cursor_width < 1) ? lrint (0.25 * h) : cursor_width;
+ fy += h - cursor_height;
+ h = cursor_height;
+ }
+
r.origin.x = fx, r.origin.y = fy;
r.size.height = h;
r.size.width = w->phys_cursor_width;
/* FIXME: if we overwrite the internal border area, it does not get erased;
fix by truncating cursor, but better would be to erase properly */
overspill = r.origin.x + r.size.width -
- WINDOW_TEXT_TO_FRAME_PIXEL_X (w, WINDOW_BOX_RIGHT_EDGE_X (w)
+ WINDOW_TEXT_TO_FRAME_PIXEL_X (w, WINDOW_BOX_RIGHT_EDGE_X (w)
- WINDOW_TOTAL_FRINGE_WIDTH (w) - FRAME_INTERNAL_BORDER_WIDTH (f));
if (overspill > 0)
r.size.width -= overspill;
/* TODO: only needed in rare cases with last-resort font in HELLO..
should we do this more efficiently? */
ns_clip_to_row (w, glyph_row, -1, NO); /* do ns_focus(f, &r, 1); if remove */
- [FRAME_CURSOR_COLOR (f) set];
+
+
+ face = FACE_FROM_ID (f, phys_cursor_glyph->face_id);
+ if (face && NS_FACE_BACKGROUND (face)
+ == ns_index_color (FRAME_CURSOR_COLOR (f), f))
+ {
+ [ns_lookup_indexed_color (NS_FACE_FOREGROUND (face), f) set];
+ hollow_color = FRAME_CURSOR_COLOR (f);
+ }
+ else
+ [FRAME_CURSOR_COLOR (f) set];
#ifdef NS_IMPL_COCOA
/* TODO: This makes drawing of cursor plus that of phys_cursor_glyph
break;
case HOLLOW_BOX_CURSOR:
NSRectFill (r);
- [FRAME_BACKGROUND_COLOR (f) set];
+ [hollow_color set];
NSRectFill (NSInsetRect (r, 1, 1));
[FRAME_CURSOR_COLOR (f) set];
break;
case HBAR_CURSOR:
- s = r;
- s.origin.y += lrint (0.75 * s.size.height);
- s.size.height = lrint (s.size.height * 0.25);
- NSRectFill (s);
+ NSRectFill (r);
break;
case BAR_CURSOR:
s = r;
- s.size.width = min (cursor_width, 2); //FIXME(see above)
-
/* If the character under cursor is R2L, draw the bar cursor
on the right of its glyph, rather than on the left. */
cursor_glyph = get_phys_cursor_glyph (w);
else
face = FACE_FROM_ID (s->f, s->first_glyph->face_id);
- [ns_lookup_indexed_color (NS_FACE_BACKGROUND (face), s->f) set];
+ if (s->hl == DRAW_CURSOR)
+ [FRAME_CURSOR_COLOR (s->f) set];
+ else
+ [ns_lookup_indexed_color (NS_FACE_BACKGROUND (face), s->f) set];
if (bg_height > s->slice.height || s->img->hmargin || s->img->vmargin
|| s->img->mask || s->img->pixmap == 0 || s->width != s->background_width)
s->slice.x == 0,
s->slice.x + s->slice.width == s->img->width, s);
}
+
+ /* If there is no mask, the background won't be seen,
+ so draw a rectangle on the image for the cursor.
+ Do this for all images, getting trancparency right is not reliable. */
+ if (s->hl == DRAW_CURSOR)
+ {
+ int thickness = abs (s->img->relief);
+ if (thickness == 0) thickness = 1;
+ ns_draw_box (br, thickness, FRAME_CURSOR_COLOR (s->f), 1, 1);
+ }
}
if (ns_tmp_font == NULL)
ns_tmp_font = (struct nsfont_info *)FRAME_FONT (s->f);
+ if (s->hl == DRAW_CURSOR && s->w->phys_cursor_type == FILLED_BOX_CURSOR)
+ {
+ unsigned long tmp = NS_FACE_BACKGROUND (s->face);
+ NS_FACE_BACKGROUND (s->face) = NS_FACE_FOREGROUND (s->face);
+ NS_FACE_FOREGROUND (s->face) = tmp;
+ }
+
ns_tmp_font->font.driver->draw
(s, 0, s->nchars, s->x, s->y,
(ns_tmp_flags == NS_DUMPGLYPH_NORMAL && !s->background_filled_p)
|| ns_tmp_flags == NS_DUMPGLYPH_MOUSEFACE);
+ if (s->hl == DRAW_CURSOR && s->w->phys_cursor_type == FILLED_BOX_CURSOR)
+ {
+ unsigned long tmp = NS_FACE_BACKGROUND (s->face);
+ NS_FACE_BACKGROUND (s->face) = NS_FACE_FOREGROUND (s->face);
+ NS_FACE_FOREGROUND (s->face) = tmp;
+ }
+
ns_unfocus (s->f);
break;
else
ns_maybe_dumpglyphs_background
(s, s->first_glyph->type == COMPOSITE_GLYPH);
- /* ... */
+ /* ... */
/* Not yet implemented. */
- /* ... */
+ /* ... */
ns_unfocus (s->f);
break;
terminal->kboard = (KBOARD *) xmalloc (sizeof (KBOARD));
init_kboard (terminal->kboard);
- terminal->kboard->Vwindow_system = Qns;
+ KVAR (terminal->kboard, Vwindow_system) = Qns;
terminal->kboard->next_kboard = all_kboards;
all_kboards = terminal->kboard;
/* Don't let the initial kboard remain current longer than necessary.
strncpy (terminal->name, SDATA (display_name), SBYTES (display_name));
terminal->name[SBYTES (display_name)] = 0;
- UNBLOCK_INPUT;
+ UNBLOCK_INPUT;
if (!inhibit_x_resources)
{
stringForKey: @"AppleHighlightColor"];
if (ns_selection_color == nil)
ns_selection_color = NS_SELECTION_COLOR_DEFAULT;
-
+
{
NSColorList *cl = [NSColorList colorListNamed: @"Emacs"];
keyEquivalent: @"q"
atIndex: 9];
- item = [mainMenu insertItemWithTitle: ns_app_name
+ item = [mainMenu insertItemWithTitle: ns_app_name
action: @selector (menuDown:)
keyEquivalent: @""
atIndex: 0];
}
-extern Lisp_Object Vauto_save_list_file_name;
void
ns_term_shutdown (int sig)
{
+ [[NSUserDefaults standardUserDefaults] synchronize];
+
/* code not reached in emacs.c after this is called by shut_down_emacs: */
if (STRINGP (Vauto_save_list_file_name))
unlink (SDATA (Vauto_save_list_file_name));
-appShouldTerminate
Cancel -> Nothing else
Accept ->
-
+
-terminate
KEY_NS_POWER_OFF, (save-buffers-kill-emacs)
ns_term_shutdown()
- (void) terminate: (id)sender
{
struct frame *emacsframe = SELECTED_FRAME ();
-
+
if (!emacs_event)
return;
-
+
emacs_event->kind = NS_NONKEY_EVENT;
emacs_event->code = KEY_NS_POWER_OFF;
emacs_event->arg = Qt; /* mark as non-key event */
}
- (void)applicationDidBecomeActive: (NSNotification *)notification
{
+ NSTRACE (applicationDidBecomeActive);
+
//ns_app_active=YES;
+
+ ns_update_auto_hide_menu_bar ();
+ // No constrining takes place when the application is not active.
+ ns_constrain_all_frames ();
}
- (void)applicationDidResignActive: (NSNotification *)notification
{
int flags;
static NSMutableArray *nsEvArray;
static BOOL firstTime = YES;
+ int left_is_none;
NSTRACE (keyDown);
if (flags & NSShiftKeyMask)
emacs_event->modifiers |= shift_modifier;
- if (flags & NSCommandKeyMask)
+ if ((flags & NSRightCommandKeyMask) == NSRightCommandKeyMask)
+ emacs_event->modifiers |= parse_solitary_modifier
+ (EQ (ns_right_command_modifier, Qleft)
+ ? ns_command_modifier
+ : ns_right_command_modifier);
+
+ if ((flags & NSLeftCommandKeyMask) == NSLeftCommandKeyMask)
{
- emacs_event->modifiers |= parse_solitary_modifier (ns_command_modifier);
+ emacs_event->modifiers |= parse_solitary_modifier
+ (ns_command_modifier);
+
/* if super (default), take input manager's word so things like
dvorak / qwerty layout work */
if (EQ (ns_command_modifier, Qsuper)
}
}
- if (flags & NSControlKeyMask)
- emacs_event->modifiers |=
- parse_solitary_modifier (ns_control_modifier);
+ if ((flags & NSRightControlKeyMask) == NSRightControlKeyMask)
+ emacs_event->modifiers |= parse_solitary_modifier
+ (EQ (ns_right_control_modifier, Qleft)
+ ? ns_control_modifier
+ : ns_right_control_modifier);
+
+ if ((flags & NSLeftControlKeyMask) == NSLeftControlKeyMask)
+ emacs_event->modifiers |= parse_solitary_modifier
+ (ns_control_modifier);
if (flags & NS_FUNCTION_KEY_MASK && !fnKeysym)
emacs_event->modifiers |=
parse_solitary_modifier (ns_function_modifier);
- if (!EQ (ns_right_alternate_modifier, Qleft)
- && ((flags & NSRightAlternateKeyMask) == NSRightAlternateKeyMask))
- {
- emacs_event->modifiers |= parse_solitary_modifier
- (ns_right_alternate_modifier);
- }
- else if (flags & NSAlternateKeyMask) /* default = meta */
+ left_is_none = NILP (ns_alternate_modifier)
+ || EQ (ns_alternate_modifier, Qnone);
+
+ if ((flags & NSRightAlternateKeyMask) == NSRightAlternateKeyMask)
{
- if ((NILP (ns_alternate_modifier) || EQ (ns_alternate_modifier, Qnone))
+ if ((NILP (ns_right_alternate_modifier)
+ || EQ (ns_right_alternate_modifier, Qnone)
+ || (EQ (ns_right_alternate_modifier, Qleft) && left_is_none))
&& !fnKeysym)
{ /* accept pre-interp alt comb */
if ([[theEvent characters] length] > 0)
if (emacs_event->modifiers == shift_modifier)
emacs_event->modifiers = 0;
}
+ else
+ emacs_event->modifiers |= parse_solitary_modifier
+ (EQ (ns_right_alternate_modifier, Qleft)
+ ? ns_alternate_modifier
+ : ns_right_alternate_modifier);
+ }
+
+ if ((flags & NSLeftAlternateKeyMask) == NSLeftAlternateKeyMask) /* default = meta */
+ {
+ if (left_is_none && !fnKeysym)
+ { /* accept pre-interp alt comb */
+ if ([[theEvent characters] length] > 0)
+ code = [[theEvent characters] characterAtIndex: 0];
+ /*HACK: clear lone shift modifier to stop next if from firing */
+ if (emacs_event->modifiers == shift_modifier)
+ emacs_event->modifiers = 0;
+ }
else
emacs_event->modifiers |=
parse_solitary_modifier (ns_alternate_modifier);
/* if it was a function key or had modifiers, pass it directly to emacs */
if (fnKeysym || (emacs_event->modifiers
+ && (emacs_event->modifiers != shift_modifier)
&& [[theEvent charactersIgnoringModifiers] length] > 0))
/*[[theEvent characters] length] */
{
#endif
if (cols < MINWIDTH)
cols = MINWIDTH;
- frameSize.width = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (emacsframe, cols);
rows = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (emacsframe, frameSize.height
#ifdef NS_IMPL_GNUSTEP
#endif
if (rows < MINHEIGHT)
rows = MINHEIGHT;
- frameSize.height = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (emacsframe, rows)
- + FRAME_NS_TITLEBAR_HEIGHT (emacsframe)
- + FRAME_TOOLBAR_HEIGHT (emacsframe);
#ifdef NS_IMPL_COCOA
{
/* this sets window title to have size in it; the wm does this under GS */
a "windowDidResize" which calls x_set_window_size). */
#ifndef NS_IMPL_GNUSTEP
if (cols > 0 && rows > 0)
- x_set_window_size (emacsframe, 0, cols, rows);
+ x_set_window_size (emacsframe, 0, cols, rows);
#endif
ns_send_appdefined (-1);
/*fprintf (stderr,"init with %d, %d\n",f->text_cols, f->text_lines); */
+ ns_userRect = NSMakeRect (0, 0, 0, 0);
r = NSMakeRect (0, 0, FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, f->text_cols),
FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, f->text_lines));
[self initWithFrame: r];
[self allocateGState];
+ [NSApp registerServicesMenuSendTypes: ns_send_types
+ returnTypes: ns_return_types];
+
ns_window_num++;
return self;
}
{
NSWindow *win = [self window];
NSRect r = [win frame];
- NSScreen *screen = [win screen];
+ NSArray *screens = [NSScreen screens];
+ NSScreen *screen = [screens objectAtIndex: 0];
NSTRACE (windowDidMove);
location so set_window_size moves the frame. */
- (BOOL)windowShouldZoom: (NSWindow *)sender toFrame: (NSRect)newFrame
{
- NSTRACE (windowShouldZoom);
- emacsframe->left_pos = (int)newFrame.origin.x;
- emacsframe->top_pos = [[sender screen] frame].size.height
- - (newFrame.origin.y+newFrame.size.height);
+ emacsframe->output_data.ns->zooming = 1;
return YES;
}
defaultFrame:(NSRect)defaultFrame
{
NSRect result = [sender frame];
- static NSRect ns_userRect = { 0, 0, 0, 0 };
NSTRACE (windowWillUseStandardFrame);
> FRAME_COLUMN_WIDTH (emacsframe))
result = defaultFrame; /* second click */
else
- result = ns_userRect.size.height ? ns_userRect : result; /* restore */
+ {
+ /* restore */
+ result = ns_userRect.size.height ? ns_userRect : result;
+ ns_userRect = NSMakeRect (0, 0, 0, 0);
+ }
}
[self windowWillResize: sender toSize: result.size];
/*
drawRect: may be called (at least in OS X 10.5) for invisible
- views as well for some reason. Thus, do not infer visibility
+ views as well for some reason. Thus, do not infer visibility
here.
emacsframe->async_visible = 1;
}
-- validRequestorForSendType: (NSString *)typeSent
- returnType: (NSString *)typeReturned
+- (id) validRequestorForSendType: (NSString *)typeSent
+ returnType: (NSString *)typeReturned
{
NSTRACE (validRequestorForSendType);
- if ([ns_send_types indexOfObjectIdenticalTo: typeSent] != NSNotFound &&
- [ns_return_types indexOfObjectIdenticalTo: typeSent] != NSNotFound)
- return self;
+ if (typeSent != nil && [ns_send_types indexOfObject: typeSent] != NSNotFound
+ && (typeReturned == nil
+ || [ns_return_types indexOfObject: typeSent] != NSNotFound))
+ {
+ if (! NILP (ns_get_local_selection (QPRIMARY, QUTF8_STRING)))
+ return self;
+ }
return [super validRequestorForSendType: typeSent
returnType: typeReturned];
- (BOOL) writeSelectionToPasteboard: (NSPasteboard *)pb types: (NSArray *)types
{
- /* supposed to write for as many of types as we are able */
- return NO;
+ NSArray *typesDeclared;
+ Lisp_Object val;
+
+ /* We only support NSStringPboardType */
+ if ([types containsObject:NSStringPboardType] == NO) {
+ return NO;
+ }
+
+ val = ns_get_local_selection (QPRIMARY, QUTF8_STRING);
+ if (CONSP (val) && SYMBOLP (XCAR (val)))
+ {
+ val = XCDR (val);
+ if (CONSP (val) && NILP (XCDR (val)))
+ val = XCAR (val);
+ }
+ if (! STRINGP (val))
+ return NO;
+
+ typesDeclared = [NSArray arrayWithObject:NSStringPboardType];
+ [pb declareTypes:typesDeclared owner:nil];
+ ns_string_to_pasteboard (pb, val);
+ return YES;
}
@implementation EmacsWindow
+/* If we have multiple monitors, one above the other, we don't want to
+ restrict the height to just one monitor. So we override this. */
+- (NSRect)constrainFrameRect:(NSRect)frameRect toScreen:(NSScreen *)screen
+{
+ /* When making the frame visible for the first time, we want to
+ constrain. Other times not. */
+ struct frame *f = ((EmacsView *)[self delegate])->emacsframe;
+ NSTRACE (constrainFrameRect);
+
+ if (f->output_data.ns->dont_constrain
+ || ns_menu_bar_should_be_hidden ())
+ return frameRect;
+
+ f->output_data.ns->dont_constrain = 1;
+ return [super constrainFrameRect:frameRect toScreen:screen];
+}
+
+
/* called only on resize clicks by special case in EmacsApp-sendEvent */
- (void)mouseDown: (NSEvent *)theEvent
{
return;
vettedSize = [[self delegate] windowWillResize: self toSize: size];
- if (vettedSize.width != size.width || vettedSize.height != size.height)
- {
- [[NSNotificationCenter defaultCenter]
+ [[NSNotificationCenter defaultCenter]
postNotificationName: NSWindowDidResizeNotification
object: self];
- }
}
else
[super mouseDragged: theEvent];
win = nwin;
condemned = NO;
pixel_height = NSHeight (r);
+ if (pixel_height == 0) pixel_height = 1;
min_portion = 20 / pixel_height;
frame = XFRAME (XWINDOW (win)->frame);
NSTRACE (EmacsScroller_setFrame);
/* BLOCK_INPUT; */
pixel_height = NSHeight (newRect);
+ if (pixel_height == 0) pixel_height = 1;
min_portion = 20 / pixel_height;
[super setFrame: newRect];
[self display];
DEFSYM (Qsuper, "super");
DEFSYM (Qcontrol, "control");
DEFSYM (Qnone, "none");
+ DEFSYM (QUTF8_STRING, "UTF8_STRING");
+
Fput (Qalt, Qmodifier_value, make_number (alt_modifier));
Fput (Qhyper, Qmodifier_value, make_number (hyper_modifier));
Fput (Qmeta, Qmodifier_value, make_number (meta_modifier));
Fput (Qsuper, Qmodifier_value, make_number (super_modifier));
Fput (Qcontrol, Qmodifier_value, make_number (ctrl_modifier));
- DEFVAR_LISP ("ns-input-file", &ns_input_file,
+ DEFVAR_LISP ("ns-input-file", ns_input_file,
"The file specified in the last NS event.");
ns_input_file =Qnil;
- DEFVAR_LISP ("ns-input-text", &ns_input_text,
+ DEFVAR_LISP ("ns-input-text", ns_input_text,
"The data received in the last NS text drag event.");
ns_input_text =Qnil;
- DEFVAR_LISP ("ns-working-text", &ns_working_text,
+ DEFVAR_LISP ("ns-working-text", ns_working_text,
"String for visualizing working composition sequence.");
ns_working_text =Qnil;
- DEFVAR_LISP ("ns-input-font", &ns_input_font,
+ DEFVAR_LISP ("ns-input-font", ns_input_font,
"The font specified in the last NS event.");
ns_input_font =Qnil;
- DEFVAR_LISP ("ns-input-fontsize", &ns_input_fontsize,
+ DEFVAR_LISP ("ns-input-fontsize", ns_input_fontsize,
"The fontsize specified in the last NS event.");
ns_input_fontsize =Qnil;
- DEFVAR_LISP ("ns-input-line", &ns_input_line,
+ DEFVAR_LISP ("ns-input-line", ns_input_line,
"The line specified in the last NS event.");
ns_input_line =Qnil;
- DEFVAR_LISP ("ns-input-color", &ns_input_color,
+ DEFVAR_LISP ("ns-input-color", ns_input_color,
"The color specified in the last NS event.");
ns_input_color =Qnil;
- DEFVAR_LISP ("ns-input-spi-name", &ns_input_spi_name,
+ DEFVAR_LISP ("ns-input-spi-name", ns_input_spi_name,
"The service name specified in the last NS event.");
ns_input_spi_name =Qnil;
- DEFVAR_LISP ("ns-input-spi-arg", &ns_input_spi_arg,
+ DEFVAR_LISP ("ns-input-spi-arg", ns_input_spi_arg,
"The service argument specified in the last NS event.");
ns_input_spi_arg =Qnil;
- DEFVAR_LISP ("ns-alternate-modifier", &ns_alternate_modifier,
+ DEFVAR_LISP ("ns-alternate-modifier", ns_alternate_modifier,
"This variable describes the behavior of the alternate or option key.\n\
Set to control, meta, alt, super, or hyper means it is taken to be that key.\n\
Set to none means that the alternate / option key is not interpreted by Emacs\n\
at all, allowing it to be used at a lower level for accented character entry.");
ns_alternate_modifier = Qmeta;
- DEFVAR_LISP ("ns-right-alternate-modifier", &ns_right_alternate_modifier,
+ DEFVAR_LISP ("ns-right-alternate-modifier", ns_right_alternate_modifier,
"This variable describes the behavior of the right alternate or option key.\n\
Set to control, meta, alt, super, or hyper means it is taken to be that key.\n\
Set to left means be the same key as `ns-alternate-modifier'.\n\
at all, allowing it to be used at a lower level for accented character entry.");
ns_right_alternate_modifier = Qleft;
- DEFVAR_LISP ("ns-command-modifier", &ns_command_modifier,
+ DEFVAR_LISP ("ns-command-modifier", ns_command_modifier,
"This variable describes the behavior of the command key.\n\
Set to control, meta, alt, super, or hyper means it is taken to be that key.");
ns_command_modifier = Qsuper;
- DEFVAR_LISP ("ns-control-modifier", &ns_control_modifier,
+ DEFVAR_LISP ("ns-right-command-modifier", ns_right_command_modifier,
+ "This variable describes the behavior of the right command key.\n\
+Set to control, meta, alt, super, or hyper means it is taken to be that key.\n\
+Set to left means be the same key as `ns-command-modifier'.\n\
+Set to none means that the command / option key is not interpreted by Emacs\n\
+at all, allowing it to be used at a lower level for accented character entry.");
+ ns_right_command_modifier = Qleft;
+
+ DEFVAR_LISP ("ns-control-modifier", ns_control_modifier,
"This variable describes the behavior of the control key.\n\
Set to control, meta, alt, super, or hyper means it is taken to be that key.");
ns_control_modifier = Qcontrol;
- DEFVAR_LISP ("ns-function-modifier", &ns_function_modifier,
+ DEFVAR_LISP ("ns-right-control-modifier", ns_right_control_modifier,
+ "This variable describes the behavior of the right control key.\n\
+Set to control, meta, alt, super, or hyper means it is taken to be that key.\n\
+Set to left means be the same key as `ns-control-modifier'.\n\
+Set to none means that the control / option key is not interpreted by Emacs\n\
+at all, allowing it to be used at a lower level for accented character entry.");
+ ns_right_control_modifier = Qleft;
+
+ DEFVAR_LISP ("ns-function-modifier", ns_function_modifier,
"This variable describes the behavior of the function key (on laptops).\n\
Set to control, meta, alt, super, or hyper means it is taken to be that key.\n\
Set to none means that the function key is not interpreted by Emacs at all,\n\
allowing it to be used at a lower level for accented character entry.");
ns_function_modifier = Qnone;
- DEFVAR_LISP ("ns-antialias-text", &ns_antialias_text,
+ DEFVAR_LISP ("ns-antialias-text", ns_antialias_text,
"Non-nil (the default) means to render text antialiased. Only has an effect on OS X Panther and above.");
ns_antialias_text = Qt;
- DEFVAR_LISP ("ns-confirm-quit", &ns_confirm_quit,
+ DEFVAR_LISP ("ns-confirm-quit", ns_confirm_quit,
"Whether to confirm application quit using dialog.");
ns_confirm_quit = Qnil;
staticpro (&last_mouse_motion_frame);
last_mouse_motion_frame = Qnil;
+ DEFVAR_LISP ("ns-auto-hide-menu-bar", ns_auto_hide_menu_bar,
+ doc: /* Non-nil means that the menu bar is hidden, but appears when the mouse is near.
+Only works on OSX 10.6 or later. */);
+ ns_auto_hide_menu_bar = Qnil;
+
/* TODO: move to common code */
- DEFVAR_LISP ("x-toolkit-scroll-bars", &Vx_toolkit_scroll_bars,
+ DEFVAR_LISP ("x-toolkit-scroll-bars", Vx_toolkit_scroll_bars,
doc: /* If not nil, Emacs uses toolkit scroll bars. */);
#ifdef USE_TOOLKIT_SCROLL_BARS
Vx_toolkit_scroll_bars = Qt;
/* these are unsupported but we need the declarations to avoid whining
messages from cus-start.el */
DEFVAR_BOOL ("x-use-underline-position-properties",
- &x_use_underline_position_properties,
+ x_use_underline_position_properties,
doc: /* NOT SUPPORTED UNDER NS.
*Non-nil means make use of UNDERLINE_POSITION font properties.
A value of nil means ignore them. If you encounter fonts with bogus
x_use_underline_position_properties = 0;
DEFVAR_BOOL ("x-underline-at-descent-line",
- &x_underline_at_descent_line,
+ x_underline_at_descent_line,
doc: /* NOT SUPPORTED UNDER NS.
*Non-nil means to draw the underline at the same place as the descent line.
A value of nil means to draw the underline according to the value of the
/* Tell emacs about this window system. */
Fprovide (intern ("ns"), Qnil);
}
-
-
-// arch-tag: 6eaa8f7d-a69b-4e1c-b43d-ab31defbe0d2