[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r103576: * nsterm.m (ns_draw_window_c
From: |
Adrian Robert |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r103576: * nsterm.m (ns_draw_window_cursor): Fix handling of 'cursor_width' parameter for hbar cursors. Based on a patch by Ben Key <address@hidden>. |
Date: |
Mon, 07 Mar 2011 11:00:11 +0200 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 103576
committer: Adrian Robert <address@hidden>
branch nick: trunk
timestamp: Mon 2011-03-07 11:00:11 +0200
message:
* nsterm.m (ns_draw_window_cursor): Fix handling of 'cursor_width' parameter
for hbar cursors. Based on a patch by Ben Key <address@hidden>.
modified:
src/ChangeLog
src/nsterm.m
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2011-03-06 23:19:25 +0000
+++ b/src/ChangeLog 2011-03-07 09:00:11 +0000
@@ -1,3 +1,9 @@
+2011-03-07 Adrian Robert <address@hidden>
+
+ * nsterm.m (ns_draw_window_cursor): Fix handling of "cursor_width"
+ parameter for hbar cursors. Based on a patch by Ben Key
+ <address@hidden>.
+
2011-03-06 Chong Yidong <address@hidden>
* xdisp.c (redisplay_window): Revert incorrect logic in 2011-03-06
=== modified file 'src/nsterm.m'
--- a/src/nsterm.m 2011-03-05 23:55:43 +0000
+++ b/src/nsterm.m 2011-03-07 09:00:11 +0000
@@ -2235,7 +2235,7 @@
--------------------------------------------------------------------------
*/
{
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;
@@ -2279,13 +2279,20 @@
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 bar cursors. */
- if (cursor_type == BAR_CURSOR || cursor_type == HBAR_CURSOR)
+ 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;
@@ -2337,10 +2344,7 @@
[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;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r103576: * nsterm.m (ns_draw_window_cursor): Fix handling of 'cursor_width' parameter for hbar cursors. Based on a patch by Ben Key <address@hidden>.,
Adrian Robert <=