vim: src/os_macosx.m annotate

annotate src/os_macosx.m @ 23213:477f1b4c6826 v8.2.2152

patch 8.2.2152: screenpos() does not include the WinBar offset Commit: https://github.com/vim/vim/commit/8dd46e72cfb13b8de793c808ee009c45e881903a Author: Bram Moolenaar <Bram@vim.org> Date: Thu Dec 17 21:35:29 2020 +0100 patch 8.2.2152: screenpos() does not include the WinBar offset Problem: screenpos() does not include the WinBar offset. Solution: Use W_WINROW() instead of directly using w_window. (closes https://github.com/vim/vim/issues/7487)

author	Bram Moolenaar <Bram@vim.org>
date	Thu, 17 Dec 2020 21:45:04 +0100
parents	c346db463a59
children	b90bca860b5a

rev	line source
10042 4aead6a9b7a9 commit https://github.com/vim/vim/commit/edf3f97ae2af024708ebb4ac614227327033ca47 Christian Brabandt <cb@256bit.org> parents: 7860 diff changeset	1 /* vi:set ts=8 sts=4 sw=4 noet:
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2 *
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3 * VIM - Vi IMproved by Bram Moolenaar
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	4 *
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	5 * Do ":help uganda" in Vim to read copying and usage conditions.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	6 * Do ":help credits" in Vim to see a list of people who contributed.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	7 * See README.txt for an overview of the Vim source code.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	8 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	9
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	10 /*
12716 351cf7c67bbe patch 8.0.1236: Mac features are confusing Christian Brabandt <cb@256bit.org> parents: 10042 diff changeset	11 * os_macosx.m -- Mac specific things for Mac OS X.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	12 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	13
13420 f80abb797a32 patch 8.0.1584: using C99 in Mac file gives compiler warning messages Christian Brabandt <cb@256bit.org> parents: 12877 diff changeset	14 /* Suppress compiler warnings to non-C89 code. */
f80abb797a32 patch 8.0.1584: using C99 in Mac file gives compiler warning messages Christian Brabandt <cb@256bit.org> parents: 12877 diff changeset	15 #if defined(__clang__) && defined(__STRICT_ANSI__)
f80abb797a32 patch 8.0.1584: using C99 in Mac file gives compiler warning messages Christian Brabandt <cb@256bit.org> parents: 12877 diff changeset	16 # pragma clang diagnostic push
f80abb797a32 patch 8.0.1584: using C99 in Mac file gives compiler warning messages Christian Brabandt <cb@256bit.org> parents: 12877 diff changeset	17 # pragma clang diagnostic ignored "-Wc99-extensions"
f80abb797a32 patch 8.0.1584: using C99 in Mac file gives compiler warning messages Christian Brabandt <cb@256bit.org> parents: 12877 diff changeset	18 # pragma clang diagnostic push
f80abb797a32 patch 8.0.1584: using C99 in Mac file gives compiler warning messages Christian Brabandt <cb@256bit.org> parents: 12877 diff changeset	19 # pragma clang diagnostic ignored "-Wdeclaration-after-statement"
f80abb797a32 patch 8.0.1584: using C99 in Mac file gives compiler warning messages Christian Brabandt <cb@256bit.org> parents: 12877 diff changeset	20 #endif
f80abb797a32 patch 8.0.1584: using C99 in Mac file gives compiler warning messages Christian Brabandt <cb@256bit.org> parents: 12877 diff changeset	21
2598 10ce04af8c5b updated for version 7.3.021 Bram Moolenaar <bram@vim.org> parents: 2567 diff changeset	22 /* Avoid a conflict for the definition of Boolean between Mac header files and
10ce04af8c5b updated for version 7.3.021 Bram Moolenaar <bram@vim.org> parents: 2567 diff changeset	23 * X11 header files. */
10ce04af8c5b updated for version 7.3.021 Bram Moolenaar <bram@vim.org> parents: 2567 diff changeset	24 #define NO_X11_INCLUDES
10ce04af8c5b updated for version 7.3.021 Bram Moolenaar <bram@vim.org> parents: 2567 diff changeset	25
2309 543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	26 #include "vim.h"
12716 351cf7c67bbe patch 8.0.1236: Mac features are confusing Christian Brabandt <cb@256bit.org> parents: 10042 diff changeset	27 #import <AppKit/AppKit.h>
2309 543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	28
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	29
2565 4b7929dad28a Fix building the Mac version with GUI. Bram Moolenaar <bram@vim.org> parents: 2315 diff changeset	30 /*
4b7929dad28a Fix building the Mac version with GUI. Bram Moolenaar <bram@vim.org> parents: 2315 diff changeset	31 * Clipboard support for the console.
4b7929dad28a Fix building the Mac version with GUI. Bram Moolenaar <bram@vim.org> parents: 2315 diff changeset	32 */
21785 c346db463a59 patch 8.2.1442: outdated references to the Mac Carbon GUI Bram Moolenaar <Bram@vim.org> parents: 21749 diff changeset	33 #if defined(FEAT_CLIPBOARD)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	34
2315 2e6dbc2fccd4 Remove obsolete Mac code. Bram Moolenaar <bram@vim.org> parents: 2314 diff changeset	35 /* Used to identify clipboard data copied from Vim. */
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	36
2315 2e6dbc2fccd4 Remove obsolete Mac code. Bram Moolenaar <bram@vim.org> parents: 2314 diff changeset	37 NSString *VimPboardType = @"VimPboardType";
2309 543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	38
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	39 void
17067 d0438b4b0acf patch 8.1.1533: GUI build fails on Mac Bram Moolenaar <Bram@vim.org> parents: 15607 diff changeset	40 clip_mch_lose_selection(Clipboard_T *cbd UNUSED)
2309 543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	41 {
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	42 }
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	43
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	44
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	45 int
17067 d0438b4b0acf patch 8.1.1533: GUI build fails on Mac Bram Moolenaar <Bram@vim.org> parents: 15607 diff changeset	46 clip_mch_own_selection(Clipboard_T *cbd UNUSED)
2309 543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	47 {
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	48 /* This is called whenever there is a new selection and 'guioptions'
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	49 * contains the "a" flag (automatically copy selection). Return TRUE, else
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	50 * the "a" flag does nothing. Note that there is no concept of "ownership"
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	51 * of the clipboard in Mac OS X.
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	52 */
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	53 return TRUE;
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	54 }
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	55
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	56
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	57 void
17067 d0438b4b0acf patch 8.1.1533: GUI build fails on Mac Bram Moolenaar <Bram@vim.org> parents: 15607 diff changeset	58 clip_mch_request_selection(Clipboard_T *cbd)
2309 543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	59 {
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	60 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	61
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	62 NSPasteboard *pb = [NSPasteboard generalPasteboard];
14911 73162bc0b21f patch 8.1.0467: cannot build with Mac OS X 10.5 Bram Moolenaar <Bram@vim.org> parents: 14091 diff changeset	63 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
14091 616dc84228b7 patch 8.1.0063: Mac: NSStringPboardType is deprecated Christian Brabandt <cb@256bit.org> parents: 13420 diff changeset	64 NSArray *supportedTypes = [NSArray arrayWithObjects:VimPboardType,
616dc84228b7 patch 8.1.0063: Mac: NSStringPboardType is deprecated Christian Brabandt <cb@256bit.org> parents: 13420 diff changeset	65 NSPasteboardTypeString, nil];
616dc84228b7 patch 8.1.0063: Mac: NSStringPboardType is deprecated Christian Brabandt <cb@256bit.org> parents: 13420 diff changeset	66 #else
2309 543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	67 NSArray *supportedTypes = [NSArray arrayWithObjects:VimPboardType,
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	68 NSStringPboardType, nil];
14091 616dc84228b7 patch 8.1.0063: Mac: NSStringPboardType is deprecated Christian Brabandt <cb@256bit.org> parents: 13420 diff changeset	69 #endif
2309 543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	70 NSString *bestType = [pb availableTypeFromArray:supportedTypes];
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	71 if (!bestType) goto releasepool;
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	72
2909 b65a26a2aa09 updated for version 7.3.227 Bram Moolenaar <bram@vim.org> parents: 2891 diff changeset	73 int motion_type = MAUTO;
2309 543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	74 NSString *string = nil;
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	75
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	76 if ([bestType isEqual:VimPboardType])
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	77 {
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	78 /* This type should consist of an array with two objects:
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	79 * 1. motion type (NSNumber)
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	80 * 2. text (NSString)
14091 616dc84228b7 patch 8.1.0063: Mac: NSStringPboardType is deprecated Christian Brabandt <cb@256bit.org> parents: 13420 diff changeset	81 * If this is not the case we fall back on using NSPasteboardTypeString.
2309 543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	82 */
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	83 id plist = [pb propertyListForType:VimPboardType];
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	84 if ([plist isKindOfClass:[NSArray class]] && [plist count] == 2)
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	85 {
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	86 id obj = [plist objectAtIndex:1];
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	87 if ([obj isKindOfClass:[NSString class]])
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	88 {
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	89 motion_type = [[plist objectAtIndex:0] intValue];
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	90 string = obj;
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	91 }
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	92 }
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	93 }
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	94
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	95 if (!string)
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	96 {
14091 616dc84228b7 patch 8.1.0063: Mac: NSStringPboardType is deprecated Christian Brabandt <cb@256bit.org> parents: 13420 diff changeset	97 /* Use NSPasteboardTypeString. The motion type is detected automatically.
2309 543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	98 */
14911 73162bc0b21f patch 8.1.0467: cannot build with Mac OS X 10.5 Bram Moolenaar <Bram@vim.org> parents: 14091 diff changeset	99 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
14091 616dc84228b7 patch 8.1.0063: Mac: NSStringPboardType is deprecated Christian Brabandt <cb@256bit.org> parents: 13420 diff changeset	100 NSMutableString *mstring =
616dc84228b7 patch 8.1.0063: Mac: NSStringPboardType is deprecated Christian Brabandt <cb@256bit.org> parents: 13420 diff changeset	101 [[pb stringForType:NSPasteboardTypeString] mutableCopy];
616dc84228b7 patch 8.1.0063: Mac: NSStringPboardType is deprecated Christian Brabandt <cb@256bit.org> parents: 13420 diff changeset	102 #else
2309 543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	103 NSMutableString *mstring =
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	104 [[pb stringForType:NSStringPboardType] mutableCopy];
14091 616dc84228b7 patch 8.1.0063: Mac: NSStringPboardType is deprecated Christian Brabandt <cb@256bit.org> parents: 13420 diff changeset	105 #endif
2309 543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	106 if (!mstring) goto releasepool;
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	107
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	108 /* Replace unrecognized end-of-line sequences with \x0a (line feed). */
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	109 NSRange range = { 0, [mstring length] };
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	110 unsigned n = [mstring replaceOccurrencesOfString:@"\x0d\x0a"
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	111 withString:@"\x0a" options:0
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	112 range:range];
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	113 if (0 == n)
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	114 {
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	115 n = [mstring replaceOccurrencesOfString:@"\x0d" withString:@"\x0a"
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	116 options:0 range:range];
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	117 }
2310 3e4574a4b627 Fix a few compiler warnings. Bram Moolenaar <bram@vim.org> parents: 2309 diff changeset	118
2309 543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	119 string = mstring;
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	120 }
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	121
2909 b65a26a2aa09 updated for version 7.3.227 Bram Moolenaar <bram@vim.org> parents: 2891 diff changeset	122 /* Default to MAUTO, uses MCHAR or MLINE depending on trailing NL. */
2309 543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	123 if (!(MCHAR == motion_type \|\| MLINE == motion_type \|\| MBLOCK == motion_type
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	124 \|\| MAUTO == motion_type))
2909 b65a26a2aa09 updated for version 7.3.227 Bram Moolenaar <bram@vim.org> parents: 2891 diff changeset	125 motion_type = MAUTO;
2309 543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	126
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	127 char_u str = (char_u)[string UTF8String];
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	128 int len = [string lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	129
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	130 if (input_conv.vc_type != CONV_NONE)
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	131 str = string_convert(&input_conv, str, &len);
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	132
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	133 if (str)
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	134 clip_yank_selection(motion_type, str, len, cbd);
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	135
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	136 if (input_conv.vc_type != CONV_NONE)
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	137 vim_free(str);
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	138
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	139 releasepool:
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	140 [pool release];
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	141 }
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	142
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	143
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	144 /*
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	145 * Send the current selection to the clipboard.
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	146 */
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	147 void
17067 d0438b4b0acf patch 8.1.1533: GUI build fails on Mac Bram Moolenaar <Bram@vim.org> parents: 15607 diff changeset	148 clip_mch_set_selection(Clipboard_T *cbd)
2309 543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	149 {
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	150 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	151
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	152 /* If the '' register isn't already filled in, fill it in now. /
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	153 cbd->owned = TRUE;
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	154 clip_get_selection(cbd);
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	155 cbd->owned = FALSE;
2310 3e4574a4b627 Fix a few compiler warnings. Bram Moolenaar <bram@vim.org> parents: 2309 diff changeset	156
2309 543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	157 /* Get the text to put on the pasteboard. */
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	158 long_u llen = 0; char_u *str = 0;
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	159 int motion_type = clip_convert_selection(&str, &llen, cbd);
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	160 if (motion_type < 0)
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	161 goto releasepool;
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	162
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	163 /* TODO: Avoid overflow. */
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	164 int len = (int)llen;
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	165 if (output_conv.vc_type != CONV_NONE)
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	166 {
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	167 char_u *conv_str = string_convert(&output_conv, str, &len);
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	168 if (conv_str)
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	169 {
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	170 vim_free(str);
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	171 str = conv_str;
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	172 }
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	173 }
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	174
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	175 if (len > 0)
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	176 {
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	177 NSString *string = [[NSString alloc]
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	178 initWithBytes:str length:len encoding:NSUTF8StringEncoding];
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	179
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	180 /* See clip_mch_request_selection() for info on pasteboard types. */
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	181 NSPasteboard *pb = [NSPasteboard generalPasteboard];
14911 73162bc0b21f patch 8.1.0467: cannot build with Mac OS X 10.5 Bram Moolenaar <Bram@vim.org> parents: 14091 diff changeset	182 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
14091 616dc84228b7 patch 8.1.0063: Mac: NSStringPboardType is deprecated Christian Brabandt <cb@256bit.org> parents: 13420 diff changeset	183 NSArray *supportedTypes = [NSArray arrayWithObjects:VimPboardType,
616dc84228b7 patch 8.1.0063: Mac: NSStringPboardType is deprecated Christian Brabandt <cb@256bit.org> parents: 13420 diff changeset	184 NSPasteboardTypeString, nil];
616dc84228b7 patch 8.1.0063: Mac: NSStringPboardType is deprecated Christian Brabandt <cb@256bit.org> parents: 13420 diff changeset	185 #else
2309 543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	186 NSArray *supportedTypes = [NSArray arrayWithObjects:VimPboardType,
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	187 NSStringPboardType, nil];
14091 616dc84228b7 patch 8.1.0063: Mac: NSStringPboardType is deprecated Christian Brabandt <cb@256bit.org> parents: 13420 diff changeset	188 #endif
2309 543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	189 [pb declareTypes:supportedTypes owner:nil];
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	190
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	191 NSNumber *motion = [NSNumber numberWithInt:motion_type];
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	192 NSArray *plist = [NSArray arrayWithObjects:motion, string, nil];
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	193 [pb setPropertyList:plist forType:VimPboardType];
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	194
14911 73162bc0b21f patch 8.1.0467: cannot build with Mac OS X 10.5 Bram Moolenaar <Bram@vim.org> parents: 14091 diff changeset	195 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
14091 616dc84228b7 patch 8.1.0063: Mac: NSStringPboardType is deprecated Christian Brabandt <cb@256bit.org> parents: 13420 diff changeset	196 [pb setString:string forType:NSPasteboardTypeString];
616dc84228b7 patch 8.1.0063: Mac: NSStringPboardType is deprecated Christian Brabandt <cb@256bit.org> parents: 13420 diff changeset	197 #else
2309 543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	198 [pb setString:string forType:NSStringPboardType];
14091 616dc84228b7 patch 8.1.0063: Mac: NSStringPboardType is deprecated Christian Brabandt <cb@256bit.org> parents: 13420 diff changeset	199 #endif
2310 3e4574a4b627 Fix a few compiler warnings. Bram Moolenaar <bram@vim.org> parents: 2309 diff changeset	200
2309 543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	201 [string release];
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	202 }
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	203
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	204 vim_free(str);
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	205 releasepool:
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	206 [pool release];
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	207 }
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	208
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler) Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	209 #endif /* FEAT_CLIPBOARD */
13420 f80abb797a32 patch 8.0.1584: using C99 in Mac file gives compiler warning messages Christian Brabandt <cb@256bit.org> parents: 12877 diff changeset	210
f80abb797a32 patch 8.0.1584: using C99 in Mac file gives compiler warning messages Christian Brabandt <cb@256bit.org> parents: 12877 diff changeset	211 /* Lift the compiler warning suppression. */
f80abb797a32 patch 8.0.1584: using C99 in Mac file gives compiler warning messages Christian Brabandt <cb@256bit.org> parents: 12877 diff changeset	212 #if defined(__clang__) && defined(__STRICT_ANSI__)
f80abb797a32 patch 8.0.1584: using C99 in Mac file gives compiler warning messages Christian Brabandt <cb@256bit.org> parents: 12877 diff changeset	213 # pragma clang diagnostic pop
f80abb797a32 patch 8.0.1584: using C99 in Mac file gives compiler warning messages Christian Brabandt <cb@256bit.org> parents: 12877 diff changeset	214 # pragma clang diagnostic pop
f80abb797a32 patch 8.0.1584: using C99 in Mac file gives compiler warning messages Christian Brabandt <cb@256bit.org> parents: 12877 diff changeset	215 #endif

Mercurial > vim

annotate src/os_macosx.m @ 23213:477f1b4c6826 v8.2.2152