[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r99520: * nsterm.m (ns_ring_bell): Re
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r99520: * nsterm.m (ns_ring_bell): Revert last change (Bug#5569). |
Date: |
Thu, 18 Feb 2010 02:21:15 -0500 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 99520
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Thu 2010-02-18 02:21:15 -0500
message:
* nsterm.m (ns_ring_bell): Revert last change (Bug#5569).
modified:
src/ChangeLog
src/nsterm.m
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2010-02-18 06:35:21 +0000
+++ b/src/ChangeLog 2010-02-18 07:21:15 +0000
@@ -1,3 +1,7 @@
+2010-02-18 Chong Yidong <address@hidden>
+
+ * nsterm.m (ns_ring_bell): Revert last change (Bug#5569).
+
2010-02-18 Glenn Morris <address@hidden>
* callint.c (Finteractive): Doc fix.
=== modified file 'src/nsterm.m'
--- a/src/nsterm.m 2010-01-31 05:23:09 +0000
+++ b/src/nsterm.m 2010-02-18 07:21:15 +0000
@@ -808,58 +808,23 @@
view = FRAME_NS_VIEW (frame);
if (view != nil)
{
- /* Get the bounds of our NSView */
- NSRect viewBounds = [view bounds];
-
- /* Height of each line to flash. */
- int flash_height = FRAME_LINE_HEIGHT (frame);
- int width = FRAME_PIXEL_WIDTH (frame)
- - NS_SCROLL_BAR_WIDTH (frame);
-
- /* Get the GraphicsContext */
- CGContextRef ctxt = [[NSGraphicsContext currentContext]
graphicsPort];
- CGRect lowerLine, upperLine;
- lowerLine =
- CGRectMake(viewBounds.origin.x, viewBounds.origin.y,
- width + NS_SCROLL_BAR_WIDTH(frame),
- flash_height + FRAME_INTERNAL_BORDER_WIDTH (frame));
- upperLine =
- CGRectMake(viewBounds.origin.x,
- viewBounds.origin.y + viewBounds.size.height
- - (flash_height + FRAME_INTERNAL_BORDER_WIDTH (frame)),
- width,
- flash_height + FRAME_INTERNAL_BORDER_WIDTH (frame));
-
- /* Invert the colors using a difference blend. */
- CGContextSetBlendMode(ctxt, kCGBlendModeDifference);
- CGContextSetGrayFillColor(ctxt, 1, 1);
-
- /* If window is tall, flash top and bottom line. */
- if (viewBounds.size.height > 3 * FRAME_LINE_HEIGHT (frame))
- {
- CGContextFillRect(ctxt, upperLine);
- CGContextFillRect(ctxt, lowerLine);
- }
- else
- /* If it is short, flash it all. */
- CGContextFillRect(ctxt, NSRectToCGRect([view bounds]));
-
- /* Bounce Dock icon. Maybe we can allow some configuration here. */
- [NSApp requestUserAttention: NSInformationalRequest];
-
+ NSRect r, surr;
+ NSPoint dim = NSMakePoint (128, 128);
+
+ r = [view bounds];
+ r.origin.x += (r.size.width - dim.x) / 2;
+ r.origin.y += (r.size.height - dim.y) / 2;
+ r.size.width = dim.x;
+ r.size.height = dim.y;
+ surr = NSInsetRect (r, -2, -2);
+ ns_focus (frame, &surr, 1);
+ [[view window] cacheImageInRect: [view convertRect: surr
toView:nil]];
+ [ns_lookup_indexed_color (NS_FACE_FOREGROUND
+ (FRAME_DEFAULT_FACE (frame)), frame)
set];
+ NSRectFill (r);
[[view window] flushWindow];
ns_timeout (150000);
-
- /* If window is tall, flash top and bottom line. */
- if (viewBounds.size.height > 3 * FRAME_LINE_HEIGHT (frame))
- {
- CGContextFillRect(ctxt, upperLine);
- CGContextFillRect(ctxt, lowerLine);
- }
- else
- /* If it is short, flash it all. */
- CGContextFillRect(ctxt, NSRectToCGRect([view bounds]));
-
+ [[view window] restoreCachedImage];
[[view window] flushWindow];
ns_unfocus (frame);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r99520: * nsterm.m (ns_ring_bell): Revert last change (Bug#5569).,
Chong Yidong <=