Mercurial > vim
comparison src/gui_mac.c @ 19:a81bc802c17c v7.0011
updated for version 7.0011
author | vimboss |
---|---|
date | Mon, 19 Jul 2004 20:55:54 +0000 |
parents | 24d5189d3956 |
children | 404aac550f35 |
comparison
equal
deleted
inserted
replaced
18:293621502c4d | 19:a81bc802c17c |
---|---|
4249 clip_mch_request_selection(cbd) | 4249 clip_mch_request_selection(cbd) |
4250 VimClipboard *cbd; | 4250 VimClipboard *cbd; |
4251 { | 4251 { |
4252 | 4252 |
4253 Handle textOfClip; | 4253 Handle textOfClip; |
4254 int flavor = 0; | |
4254 #ifdef USE_CARBONIZED | 4255 #ifdef USE_CARBONIZED |
4255 Size scrapSize; | 4256 Size scrapSize; |
4256 ScrapFlavorFlags scrapFlags; | 4257 ScrapFlavorFlags scrapFlags; |
4257 ScrapRef scrap = nil; | 4258 ScrapRef scrap = nil; |
4258 OSStatus error; | 4259 OSStatus error; |
4259 int flavor; | |
4260 #else | 4260 #else |
4261 long scrapOffset; | 4261 long scrapOffset; |
4262 long scrapSize; | 4262 long scrapSize; |
4263 #endif | 4263 #endif |
4264 int type; | 4264 int type; |
4269 #ifdef USE_CARBONIZED | 4269 #ifdef USE_CARBONIZED |
4270 error = GetCurrentScrap(&scrap); | 4270 error = GetCurrentScrap(&scrap); |
4271 if (error != noErr) | 4271 if (error != noErr) |
4272 return; | 4272 return; |
4273 | 4273 |
4274 flavor = 0; | |
4275 error = GetScrapFlavorFlags(scrap, VIMSCRAPFLAVOR, &scrapFlags); | 4274 error = GetScrapFlavorFlags(scrap, VIMSCRAPFLAVOR, &scrapFlags); |
4276 if (error == noErr) | 4275 if (error == noErr) |
4277 { | 4276 { |
4278 error = GetScrapFlavorSize(scrap, VIMSCRAPFLAVOR, &scrapSize); | 4277 error = GetScrapFlavorSize(scrap, VIMSCRAPFLAVOR, &scrapSize); |
4279 if (error == noErr && scrapSize > 1) | 4278 if (error == noErr && scrapSize > 1) |
4313 flavor ? VIMSCRAPFLAVOR : kScrapFlavorTypeText, | 4312 flavor ? VIMSCRAPFLAVOR : kScrapFlavorTypeText, |
4314 &scrapSize, *textOfClip); | 4313 &scrapSize, *textOfClip); |
4315 #else | 4314 #else |
4316 scrapSize = GetScrap(textOfClip, 'TEXT', &scrapOffset); | 4315 scrapSize = GetScrap(textOfClip, 'TEXT', &scrapOffset); |
4317 #endif | 4316 #endif |
4317 scrapSize -= flavor; | |
4318 | 4318 |
4319 if (flavor) | 4319 if (flavor) |
4320 type = **textOfClip; | 4320 type = **textOfClip; |
4321 else | 4321 else |
4322 type = (strchr(*textOfClip, '\r') != NULL) ? MLINE : MCHAR; | 4322 type = (strchr(*textOfClip, '\r') != NULL) ? MLINE : MCHAR; |
4323 | 4323 |
4324 tempclip = lalloc(scrapSize+1, TRUE); | 4324 tempclip = lalloc(scrapSize + 1, TRUE); |
4325 STRNCPY(tempclip, *textOfClip + flavor, scrapSize - flavor); | 4325 STRNCPY(tempclip, *textOfClip + flavor, scrapSize); |
4326 tempclip[scrapSize - flavor] = 0; | 4326 tempclip[scrapSize] = 0; |
4327 | 4327 |
4328 searchCR = (char *)tempclip; | 4328 searchCR = (char *)tempclip; |
4329 while (searchCR != NULL) | 4329 while (searchCR != NULL) |
4330 { | 4330 { |
4331 searchCR = strchr(searchCR, '\r'); | 4331 searchCR = strchr(searchCR, '\r'); |