Commit 8b3ce9a9 authored by Adrian Robert's avatar Adrian Robert
Browse files

nsterm.m (ns_draw_window_cursor): Respect cursor_type for nonactive windows. ...

nsterm.m (ns_draw_window_cursor): Respect cursor_type for nonactive windows.  (ns_init_paths): Append path separator to INFOPATH variable.  (ns_use_system_highlight_color): Drop, unused.
parent 54f00c65
...@@ -182,7 +182,6 @@ the Function modifer (laptops). May be any of the modifier lisp symbols. */ ...@@ -182,7 +182,6 @@ the Function modifer (laptops). May be any of the modifier lisp symbols. */
Lisp_Object ns_use_qd_smoothing; Lisp_Object ns_use_qd_smoothing;
/* Used to pick up AppleHighlightColor on OS X */ /* Used to pick up AppleHighlightColor on OS X */
Lisp_Object ns_use_system_highlight_color;
NSString *ns_selection_color; NSString *ns_selection_color;
/* Confirm on exit. */ /* Confirm on exit. */
...@@ -415,7 +414,9 @@ the Function modifer (laptops). May be any of the modifier lisp symbols. */ ...@@ -415,7 +414,9 @@ the Function modifer (laptops). May be any of the modifier lisp symbols. */
resourcePath = [resourceDir stringByAppendingPathComponent: @"info"]; resourcePath = [resourceDir stringByAppendingPathComponent: @"info"];
if ([fileManager fileExistsAtPath: resourcePath isDirectory: &isDir]) if ([fileManager fileExistsAtPath: resourcePath isDirectory: &isDir])
if (isDir) if (isDir)
setenv ("INFOPATH", [resourcePath UTF8String], 1); setenv ("INFOPATH", [[resourcePath stringByAppendingString: @":"]
UTF8String], 1);
/* Note, extra colon needed to cause merge w/later user additions. */
} }
} }
...@@ -2359,7 +2360,7 @@ External call (RIF): draw cursor ...@@ -2359,7 +2360,7 @@ External call (RIF): draw cursor
int fx, fy, h; int fx, fy, h;
struct frame *f = WINDOW_XFRAME (w); struct frame *f = WINDOW_XFRAME (w);
struct glyph *phys_cursor_glyph; struct glyph *phys_cursor_glyph;
int overspill, cursorToDraw; int overspill;
NSTRACE (dumpcursor); 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); //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);
...@@ -2415,8 +2416,7 @@ External call (RIF): draw cursor ...@@ -2415,8 +2416,7 @@ External call (RIF): draw cursor
NSDisableScreenUpdates (); NSDisableScreenUpdates ();
#endif #endif
cursorToDraw = active_p ? cursor_type : HOLLOW_BOX_CURSOR; switch (cursor_type)
switch (cursorToDraw)
{ {
case NO_CURSOR: case NO_CURSOR:
break; break;
...@@ -2444,7 +2444,7 @@ External call (RIF): draw cursor ...@@ -2444,7 +2444,7 @@ External call (RIF): draw cursor
ns_unfocus (f); ns_unfocus (f);
/* draw the character under the cursor */ /* draw the character under the cursor */
if (cursorToDraw != NO_CURSOR) if (cursor_type != NO_CURSOR)
draw_phys_cursor_glyph (w, glyph_row, DRAW_CURSOR); draw_phys_cursor_glyph (w, glyph_row, DRAW_CURSOR);
#ifdef NS_IMPL_COCOA #ifdef NS_IMPL_COCOA
...@@ -3051,7 +3051,7 @@ overwriting cursor (usually when cursor on a tab) */ ...@@ -3051,7 +3051,7 @@ overwriting cursor (usually when cursor on a tab) */
if (s->for_overlaps || (s->cmp_from > 0 if (s->for_overlaps || (s->cmp_from > 0
&& ! s->first_glyph->u.cmp.automatic)) && ! s->first_glyph->u.cmp.automatic))
s->background_filled_p = 1; s->background_filled_p = 1;
else /* 1 */ else
ns_maybe_dumpglyphs_background ns_maybe_dumpglyphs_background
(s, s->first_glyph->type == COMPOSITE_GLYPH); (s, s->first_glyph->type == COMPOSITE_GLYPH);
...@@ -3594,7 +3594,6 @@ Convert modifier code (see lisp.h) to lisp symbol ...@@ -3594,7 +3594,6 @@ Convert modifier code (see lisp.h) to lisp symbol
ns_antialias_text = Qt; ns_antialias_text = Qt;
ns_antialias_threshold = 10.0; /* not exposed to lisp side */ ns_antialias_threshold = 10.0; /* not exposed to lisp side */
ns_use_qd_smoothing = Qnil; ns_use_qd_smoothing = Qnil;
ns_use_system_highlight_color = Qt;
ns_confirm_quit = Qnil; ns_confirm_quit = Qnil;
} }
...@@ -6309,10 +6308,6 @@ Convert an X font name (XLFD) to an NS font name. ...@@ -6309,10 +6308,6 @@ Convert an X font name (XLFD) to an NS font name.
DEFVAR_LISP ("ns-use-qd-smoothing", &ns_use_qd_smoothing, DEFVAR_LISP ("ns-use-qd-smoothing", &ns_use_qd_smoothing,
"Whether to render text using QuickDraw (less heavy) antialiasing. Only has an effect on OS X Panther and above. Default is nil (use Quartz smoothing)."); "Whether to render text using QuickDraw (less heavy) antialiasing. Only has an effect on OS X Panther and above. Default is nil (use Quartz smoothing).");
DEFVAR_LISP ("ns-use-system-highlight-color",
&ns_use_system_highlight_color,
"Whether to use the system default (on OS X only) for the highlight color. Nil means to use standard emacs (prior to version 21) 'grey'.");
DEFVAR_LISP ("ns-confirm-quit", &ns_confirm_quit, DEFVAR_LISP ("ns-confirm-quit", &ns_confirm_quit,
"Whether to confirm application quit using dialog."); "Whether to confirm application quit using dialog.");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment