[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/src ChangeLog nsterm.m
From: |
Adrian Robert |
Subject: |
[Emacs-diffs] emacs/src ChangeLog nsterm.m |
Date: |
Wed, 21 Jan 2009 17:05:47 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Adrian Robert <arobert> 09/01/21 17:05:47
Modified files:
src : ChangeLog nsterm.m
Log message:
* nsterm.m: (x_set_frame_alpha): Add prototype. (ns_fake_keydown,
EmacsView-keyUp:): New variable and function to handle Ctrl-tab.
(ns_get_color): Use unsigned long long for scanned hex string value.
(ns_term_shutdown): Abort on non SIGTERM signals.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7288&r2=1.7289
http://cvs.savannah.gnu.org/viewcvs/emacs/src/nsterm.m?cvsroot=emacs&r1=1.42&r2=1.43
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7288
retrieving revision 1.7289
diff -u -b -r1.7288 -r1.7289
--- ChangeLog 21 Jan 2009 16:34:24 -0000 1.7288
+++ ChangeLog 21 Jan 2009 17:05:45 -0000 1.7289
@@ -1,7 +1,11 @@
2009-01-21 Adrian Robert <address@hidden>
* nsmenu.m (NSMENUPROFILE): Change #if style.
-
+ * nsterm.m: (x_set_frame_alpha): Add prototype.
+ (ns_fake_keydown, EmacsView-keyUp:): New variable and function to
+ handle Ctrl-tab.
+ (ns_get_color): Use unsigned long long for scanned hex string value.
+ (ns_term_shutdown): Abort on non SIGTERM signals.
2009-01-19 Chong Yidong <address@hidden>
Index: nsterm.m
===================================================================
RCS file: /sources/emacs/emacs/src/nsterm.m,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- nsterm.m 8 Jan 2009 03:15:53 -0000 1.42
+++ nsterm.m 21 Jan 2009 17:05:47 -0000 1.43
@@ -212,6 +212,7 @@
static NSRect uRect;
static BOOL gsaved = NO;
BOOL ns_in_resize = NO;
+static BOOL ns_fake_keydown = NO;
int ns_tmp_flags; /* FIXME */
struct nsfont_info *ns_tmp_font; /* FIXME */
/*static int debug_lock = 0; */
@@ -302,6 +303,7 @@
/* TODO: get rid of need for these forward declarations */
static void ns_condemn_scroll_bars (struct frame *f);
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;
@@ -1419,7 +1421,7 @@
/* Direct colors (hex values) */
if (hex)
{
- unsigned long color = 0;
+ unsigned long long color = 0;
if (sscanf (hex, "%x", &color))
{
float f1, f2, f3, f4;
@@ -3986,8 +3988,15 @@
if (STRINGP (Vauto_save_list_file_name))
unlink (SDATA (Vauto_save_list_file_name));
+ if (sig == 0 || sig == SIGTERM)
+ {
ns_shutdown_properly = YES;
[NSApp terminate: NSApp];
+ }
+ else // force a stack trace to happen
+ {
+ abort();
+ }
}
@@ -4374,6 +4383,7 @@
}
+
/*****************************************************************************/
/* Keyboard handling. */
#define NS_KEYLOG 0
@@ -4390,7 +4400,9 @@
NSTRACE (keyDown);
/* Rhapsody and OS X give up and down events for the arrow keys */
- if ([theEvent type] != NSKeyDown)
+ if (ns_fake_keydown == YES)
+ ns_fake_keydown = NO;
+ else if ([theEvent type] != NSKeyDown)
return;
if (!emacs_event)
@@ -4485,10 +4497,12 @@
}
if (flags & NSControlKeyMask)
- emacs_event->modifiers |= parse_solitary_modifier
(ns_control_modifier);
+ 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);
+ emacs_event->modifiers |=
+ parse_solitary_modifier (ns_function_modifier);
if (flags & NSAlternateKeyMask) /* default = meta */
{
@@ -4501,10 +4515,13 @@
emacs_event->modifiers = 0;
}
else
- emacs_event->modifiers |= parse_solitary_modifier
(ns_alternate_modifier);
+ emacs_event->modifiers |=
+ parse_solitary_modifier (ns_alternate_modifier);
}
-/*fprintf (stderr,"code =%x\tfnKey =%x\tflags = %x\tmods =
%x\n",code,fnKeysym,flags,emacs_event->modifiers); */
+ if (NS_KEYLOG)
+ fprintf (stderr, "keyDown: code =%x\tfnKey =%x\tflags = %x\tmods = %x\n",
+ code, fnKeysym, flags, emacs_event->modifiers);
/* if it was a function key or had modifiers, pass it directly to emacs
*/
if (fnKeysym || (emacs_event->modifiers
@@ -4534,7 +4551,7 @@
firstTime = NO;
if (NS_KEYLOG && !processingCompose)
- fprintf (stderr, "Begin compose sequence.\n");
+ fprintf (stderr, "keyDown: Begin compose sequence.\n");
processingCompose = YES;
[nsEvArray addObject: theEvent];
@@ -4543,6 +4560,26 @@
}
+#ifdef NS_IMPL_COCOA
+/* Needed to pick up Ctrl-tab and possibly other events that OS X has
+ decided not to send key-down for.
+ See http://osdir.com/ml/editors.vim.mac/2007-10/msg00141.html
+ If it matches one of these, send it on to keyDown. */
+-(void)keyUp: (NSEvent *)theEvent
+{
+ int flags = [theEvent modifierFlags];
+ int code = [theEvent keyCode];
+ if (code == 0x30 && (flags & NSControlKeyMask) && !(flags &
NSCommandKeyMask))
+ {
+ if (NS_KEYLOG)
+ fprintf (stderr, "keyUp: passed test");
+ ns_fake_keydown = YES;
+ [self keyDown: theEvent];
+ }
+}
+#endif
+
+
/* <NSTextInput> implementation (called through super interpretKeyEvents:]). */
@@ -4553,7 +4590,8 @@
int len = [(NSString *)aString length];
int i;
-if (NS_KEYLOG) NSLog (@"insertText '%@'\tlen = %d", aString, len);
+ if (NS_KEYLOG)
+ NSLog (@"insertText '%@'\tlen = %d", aString, len);
processingCompose = NO;
if (!emacs_event)
@@ -4654,13 +4692,15 @@
{
NSRange rng = workingText != nil
? NSMakeRange (0, [workingText length]) : NSMakeRange (NSNotFound, 0);
-if (NS_KEYLOG) NSLog (@"markedRange request");
+ if (NS_KEYLOG)
+ NSLog (@"markedRange request");
return rng;
}
- (void)unmarkText
{
-if (NS_KEYLOG) NSLog (@"unmark (accept) text");
+ if (NS_KEYLOG)
+ NSLog (@"unmark (accept) text");
[self deleteWorkingText];
processingCompose = NO;
}
@@ -4671,7 +4711,8 @@
NSRect rect;
NSPoint pt;
struct window *win = XWINDOW (FRAME_SELECTED_WINDOW (emacsframe));
-if (NS_KEYLOG) NSLog (@"firstRectForCharRange request");
+ if (NS_KEYLOG)
+ NSLog (@"firstRectForCharRange request");
rect.size.width = theRange.length * FRAME_COLUMN_WIDTH (emacsframe);
rect.size.height = FRAME_LINE_HEIGHT (emacsframe);
@@ -4694,8 +4735,8 @@
- (void)doCommandBySelector: (SEL)aSelector
{
- if (NS_KEYLOG) NSLog (@"Do command by selector: %@",
- NSStringFromSelector (aSelector));
+ if (NS_KEYLOG)
+ NSLog (@"doCommandBySelector: %@", NSStringFromSelector (aSelector));
if (aSelector == @selector (deleteBackward:))
{
@@ -4719,13 +4760,15 @@
- (NSRange)selectedRange
{
-if (NS_KEYLOG) NSLog (@"selectedRange request");
+ if (NS_KEYLOG)
+ NSLog (@"selectedRange request");
return NSMakeRange (NSNotFound, 0);
}
- (unsigned int)characterIndexForPoint: (NSPoint)thePoint
{
-if (NS_KEYLOG) NSLog (@"characterIndexForPoint request");
+ if (NS_KEYLOG)
+ NSLog (@"characterIndexForPoint request");
return 0;
}
@@ -4733,7 +4776,8 @@
{
static NSAttributedString *str = nil;
if (str == nil) str = [NSAttributedString new];
-if (NS_KEYLOG) NSLog (@"attributedSubstringFromRange request");
+ if (NS_KEYLOG)
+ NSLog (@"attributedSubstringFromRange request");
return str;
}
- [Emacs-diffs] emacs/src ChangeLog nsterm.m,
Adrian Robert <=