To: vim-dev@vim.org

Subject: Patch 7.1.275

Fcc: outbox

From: Bram Moolenaar <Bram@moolenaar.net>

Mime-Version: 1.0

Content-Type: text/plain; charset=ISO-8859-1

Content-Transfer-Encoding: 8bit

------------

Patch 7.1.275 (extra)

Problem:    Mac: ATSUI and 'antialias' don't work properly together.

Solution:   Fix this and the input method. (Jjgod Jiang)

Files:	    src/vim.h, src/gui_mac.c

*** ../vim-7.1.274/src/vim.h	Wed Feb 20 12:22:59 2008

--- src/vim.h	Wed Mar 12 13:18:58 2008

***************

*** 461,468 ****

  /*

   * Check input method control.

   */

! #if defined(FEAT_XIM) || \

!     (defined(FEAT_GUI) && (defined(FEAT_MBYTE_IME) || defined(GLOBAL_IME)))

  # define USE_IM_CONTROL

  #endif

--- 461,469 ----

  /*

   * Check input method control.

   */

! #if defined(FEAT_XIM) \

!     || (defined(FEAT_GUI) && (defined(FEAT_MBYTE_IME) || defined(GLOBAL_IME))) \

!     || defined(FEAT_GUI_MAC)

  # define USE_IM_CONTROL

  #endif

*** ../vim-7.1.274/src/gui_mac.c	Sat Sep 29 13:15:29 2007

--- src/gui_mac.c	Wed Mar 12 13:40:57 2008

***************

*** 59,65 ****

--- 59,91 ----

  #ifdef MACOS_CONVERT

  # define USE_CARBONKEYHANDLER

+ 

+ static int im_is_active = FALSE;

+ #if 0

+ static int im_start_row = 0;

+ static int im_start_col = 0;

+ #endif

+ 

+ #define NR_ELEMS(x)	(sizeof(x) / sizeof(x[0]))

+ 

+ static TSMDocumentID gTSMDocument;

+ 

+ static void im_on_window_switch(int active);

  static EventHandlerUPP keyEventHandlerUPP = NULL;

+ static EventHandlerUPP winEventHandlerUPP = NULL;

+ 

+ static pascal OSStatus gui_mac_handle_window_activate(

+ 	EventHandlerCallRef nextHandler, EventRef theEvent, void *data);

+ 

+ static pascal OSStatus gui_mac_handle_text_input(

+ 	EventHandlerCallRef nextHandler, EventRef theEvent, void *data);

+ 

+ static pascal OSStatus gui_mac_update_input_area(

+ 	EventHandlerCallRef nextHandler, EventRef theEvent);

+ 

+ static pascal OSStatus gui_mac_unicode_key_event(

+ 	EventHandlerCallRef nextHandler, EventRef theEvent);

+ 

  #endif

***************

*** 137,143 ****

--- 166,176 ----

  #ifdef MACOS_CONVERT

  # define USE_ATSUI_DRAWING

+ int	    p_macatsui_last;

  ATSUStyle   gFontStyle;

+ # ifdef FEAT_MBYTE

+ ATSUStyle   gWideFontStyle;

+ # endif

  Boolean	    gIsFontFallbackSet;

  #endif

***************

*** 265,270 ****

--- 298,308 ----

  static WindowRef drawer = NULL; // TODO: put into gui.h

  #endif

+ #ifdef USE_ATSUI_DRAWING

+ static void gui_mac_set_font_attributes(GuiFont font);

+ static void gui_mac_dispose_atsui_style(void);

+ #endif

+ 

  /*

   * ------------------------------------------------------------

   * Conversion Utility

***************

*** 1935,1946 ****

      /* Dim scrollbars */

      if (whichWindow == gui.VimWindow)

      {

!         ControlRef rootControl;

!         GetRootControl(gui.VimWindow, &rootControl);

!         if ((event->modifiers) & activeFlag)

!             ActivateControl(rootControl);

!         else

!             DeactivateControl(rootControl);

      }

      /* Activate */

--- 1973,1984 ----

      /* Dim scrollbars */

      if (whichWindow == gui.VimWindow)

      {

! 	ControlRef rootControl;

! 	GetRootControl(gui.VimWindow, &rootControl);

! 	if ((event->modifiers) & activeFlag)

! 	    ActivateControl(rootControl);

! 	else

! 	    DeactivateControl(rootControl);

      }

      /* Activate */

***************

*** 1976,1990 ****

   * Handle the key

   */

  #ifdef USE_CARBONKEYHANDLER

! static int dialog_busy = FALSE;	    /* TRUE when gui_mch_dialog() wants the keys */

  # define INLINE_KEY_BUFFER_SIZE 80

      static pascal OSStatus

! gui_mac_doKeyEventCarbon(

  	EventHandlerCallRef nextHandler,

! 	EventRef theEvent,

! 	void *data)

  {

      /* Multibyte-friendly key event handler */

      OSStatus	err = -1;

--- 2014,2100 ----

   * Handle the key

   */

  #ifdef USE_CARBONKEYHANDLER

+     static pascal OSStatus

+ gui_mac_handle_window_activate(

+ 	EventHandlerCallRef nextHandler,

+ 	EventRef	    theEvent,

+ 	void		    *data)

+ {

+     UInt32 eventClass = GetEventClass(theEvent);

+     UInt32 eventKind  = GetEventKind(theEvent);

+ 

+     if (eventClass == kEventClassWindow)

+     {

+ 	switch (eventKind)

+ 	{

+ 	    case kEventWindowActivated:

+ #if defined(USE_IM_CONTROL)

+ 		im_on_window_switch(TRUE);

+ #endif

+ 		return noErr;

+ 

+ 	    case kEventWindowDeactivated:

+ #if defined(USE_IM_CONTROL)

+ 		im_on_window_switch(FALSE);

+ #endif

+ 		return noErr;

+ 	}

+     }

+ 

+     return eventNotHandledErr;

+ }

+ 

+     static pascal OSStatus

+ gui_mac_handle_text_input(

+ 	EventHandlerCallRef nextHandler,

+ 	EventRef	    theEvent,

+ 	void		    *data)

+ {

+     UInt32 eventClass = GetEventClass(theEvent);

+     UInt32 eventKind  = GetEventKind(theEvent);

+ 

+     if (eventClass != kEventClassTextInput)

+ 	return eventNotHandledErr;

!     if ((kEventTextInputUpdateActiveInputArea != eventKind) &&

! 	(kEventTextInputUnicodeForKeyEvent    != eventKind) &&

! 	(kEventTextInputOffsetToPos	      != eventKind) &&

! 	(kEventTextInputPosToOffset	      != eventKind) &&

! 	(kEventTextInputGetSelectedText       != eventKind))

! 	      return eventNotHandledErr;

! 

!     switch (eventKind)

!     {

!     case kEventTextInputUpdateActiveInputArea:

! 	return gui_mac_update_input_area(nextHandler, theEvent);

!     case kEventTextInputUnicodeForKeyEvent:

! 	return gui_mac_unicode_key_event(nextHandler, theEvent);

! 

!     case kEventTextInputOffsetToPos:

!     case kEventTextInputPosToOffset:

!     case kEventTextInputGetSelectedText:

! 	break;

!     }

! 

!     return eventNotHandledErr;

! }

! 

!     static pascal

! OSStatus gui_mac_update_input_area(

! 	EventHandlerCallRef nextHandler,

! 	EventRef	    theEvent)

! {

!     return eventNotHandledErr;

! }

! 

! static int dialog_busy = FALSE;	    /* TRUE when gui_mch_dialog() wants the

! 				       keys */

  # define INLINE_KEY_BUFFER_SIZE 80

      static pascal OSStatus

! gui_mac_unicode_key_event(

  	EventHandlerCallRef nextHandler,

! 	EventRef	    theEvent)

  {

      /* Multibyte-friendly key event handler */

      OSStatus	err = -1;

***************

*** 2000,2006 ****

      char_u	*to = NULL;

      Boolean	isSpecial = FALSE;

      int		i;

!     EventRef keyEvent;

      /* Mask the mouse (as per user setting) */

      if (p_mh)

--- 2110,2116 ----

      char_u	*to = NULL;

      Boolean	isSpecial = FALSE;

      int		i;

!     EventRef	keyEvent;

      /* Mask the mouse (as per user setting) */

      if (p_mh)

***************

*** 2008,2046 ****

      /* Don't use the keys when the dialog wants them. */

      if (dialog_busy)

!         return eventNotHandledErr;

      if (noErr != GetEventParameter(theEvent, kEventParamTextInputSendText,

!                 typeUnicodeText, NULL, 0, &actualSize, NULL))

!         return eventNotHandledErr;

      text = (UniChar *)alloc(actualSize);

      if (!text)

!         return eventNotHandledErr;

      err = GetEventParameter(theEvent, kEventParamTextInputSendText,

!             typeUnicodeText, NULL, actualSize, NULL, text);

      require_noerr(err, done);

      err = GetEventParameter(theEvent, kEventParamTextInputSendKeyboardEvent,

!             typeEventRef, NULL, sizeof(EventRef), NULL, &keyEvent);

      require_noerr(err, done);

      err = GetEventParameter(keyEvent, kEventParamKeyModifiers,

!             typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers);

      require_noerr(err, done);

      err = GetEventParameter(keyEvent, kEventParamKeyCode,

!             typeUInt32, NULL, sizeof(UInt32), NULL, &key_sym);

      require_noerr(err, done);

      err = GetEventParameter(keyEvent, kEventParamKeyMacCharCodes,

!             typeChar, NULL, sizeof(char), NULL, &charcode);

      require_noerr(err, done);

  #ifndef USE_CMD_KEY

      if (modifiers & cmdKey)

!         goto done;  /* Let system handle Cmd+... */

  #endif

      key_char = charcode;

--- 2118,2156 ----

      /* Don't use the keys when the dialog wants them. */

      if (dialog_busy)

! 	return eventNotHandledErr;

      if (noErr != GetEventParameter(theEvent, kEventParamTextInputSendText,

! 		typeUnicodeText, NULL, 0, &actualSize, NULL))

! 	return eventNotHandledErr;

      text = (UniChar *)alloc(actualSize);

      if (!text)

! 	return eventNotHandledErr;

      err = GetEventParameter(theEvent, kEventParamTextInputSendText,

! 	    typeUnicodeText, NULL, actualSize, NULL, text);

      require_noerr(err, done);

      err = GetEventParameter(theEvent, kEventParamTextInputSendKeyboardEvent,

! 	    typeEventRef, NULL, sizeof(EventRef), NULL, &keyEvent);

      require_noerr(err, done);

      err = GetEventParameter(keyEvent, kEventParamKeyModifiers,

! 	    typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers);

      require_noerr(err, done);

      err = GetEventParameter(keyEvent, kEventParamKeyCode,

! 	    typeUInt32, NULL, sizeof(UInt32), NULL, &key_sym);

      require_noerr(err, done);

      err = GetEventParameter(keyEvent, kEventParamKeyMacCharCodes,

! 	    typeChar, NULL, sizeof(char), NULL, &charcode);

      require_noerr(err, done);

  #ifndef USE_CMD_KEY

      if (modifiers & cmdKey)

! 	goto done;  /* Let system handle Cmd+... */

  #endif

      key_char = charcode;

***************

*** 2048,2131 ****

      /* Find the special key (eg., for cursor keys) */

      if (actualSize <= sizeof(UniChar) &&

!             ((text[0] < 0x20) || (text[0] == 0x7f)))

      {

!         for (i = 0; special_keys[i].key_sym != (KeySym)0; ++i)

!             if (special_keys[i].key_sym == key_sym)

!             {

!                 key_char = TO_SPECIAL(special_keys[i].vim_code0,

!                         special_keys[i].vim_code1);

!                 key_char = simplify_key(key_char,

!                         (int *)&vimModifiers);

!                 isSpecial = TRUE;

!                 break;

!             }

      }

      /* Intercept CMD-. and CTRL-c */

      if (((modifiers & controlKey) && key_char == 'c') ||

!             ((modifiers & cmdKey) && key_char == '.'))

!         got_int = TRUE;

      if (!isSpecial)

      {

!         /* remove SHIFT for keys that are already shifted, e.g.,

!          * '(' and '*' */

!         if (key_char < 0x100 && !isalpha(key_char) && isprint(key_char))

!             vimModifiers &= ~MOD_MASK_SHIFT;

! 

!         /* remove CTRL from keys that already have it */

!         if (key_char < 0x20)

!             vimModifiers &= ~MOD_MASK_CTRL;

! 

!         /* don't process unicode characters here */

!         if (!IS_SPECIAL(key_char))

!         {

!             /* Following code to simplify and consolidate vimModifiers

!              * taken liberally from gui_w48.c */

!             key_char = simplify_key(key_char, (int *)&vimModifiers);

! 

!             /* Interpret META, include SHIFT, etc. */

!             key_char = extract_modifiers(key_char, (int *)&vimModifiers);

!             if (key_char == CSI)

!                 key_char = K_CSI;

! 

!             if (IS_SPECIAL(key_char))

!                 isSpecial = TRUE;

!         }

      }

      if (vimModifiers)

      {

!         result[len++] = CSI;

!         result[len++] = KS_MODIFIER;

!         result[len++] = vimModifiers;

      }

      if (isSpecial && IS_SPECIAL(key_char))

      {

!         result[len++] = CSI;

!         result[len++] = K_SECOND(key_char);

!         result[len++] = K_THIRD(key_char);

      }

      else

      {

!         encLen = actualSize;

!         to = mac_utf16_to_enc(text, actualSize, &encLen);

!         if (to)

!         {

!             /* This is basically add_to_input_buf_csi() */

!             for (i = 0; i < encLen && len < (INLINE_KEY_BUFFER_SIZE-1); ++i)

!             {

!                 result[len++] = to[i];

!                 if (to[i] == CSI)

!                 {

!                     result[len++] = KS_EXTRA;

!                     result[len++] = (int)KE_CSI;

!                 }

!             }

!             vim_free(to);

!         }

      }

      add_to_input_buf(result, len);

--- 2158,2241 ----

      /* Find the special key (eg., for cursor keys) */

      if (actualSize <= sizeof(UniChar) &&

! 	    ((text[0] < 0x20) || (text[0] == 0x7f)))

      {

! 	for (i = 0; special_keys[i].key_sym != (KeySym)0; ++i)

! 	    if (special_keys[i].key_sym == key_sym)

! 	    {

! 		key_char = TO_SPECIAL(special_keys[i].vim_code0,

! 			special_keys[i].vim_code1);

! 		key_char = simplify_key(key_char,

! 			(int *)&vimModifiers);

! 		isSpecial = TRUE;

! 		break;

! 	    }

      }

      /* Intercept CMD-. and CTRL-c */

      if (((modifiers & controlKey) && key_char == 'c') ||

! 	    ((modifiers & cmdKey) && key_char == '.'))

! 	got_int = TRUE;

      if (!isSpecial)

      {

! 	/* remove SHIFT for keys that are already shifted, e.g.,

! 	 * '(' and '*' */

! 	if (key_char < 0x100 && !isalpha(key_char) && isprint(key_char))

! 	    vimModifiers &= ~MOD_MASK_SHIFT;

! 

! 	/* remove CTRL from keys that already have it */

! 	if (key_char < 0x20)

! 	    vimModifiers &= ~MOD_MASK_CTRL;

! 

! 	/* don't process unicode characters here */

! 	if (!IS_SPECIAL(key_char))

! 	{

! 	    /* Following code to simplify and consolidate vimModifiers

! 	     * taken liberally from gui_w48.c */

! 	    key_char = simplify_key(key_char, (int *)&vimModifiers);

! 

! 	    /* Interpret META, include SHIFT, etc. */

! 	    key_char = extract_modifiers(key_char, (int *)&vimModifiers);

! 	    if (key_char == CSI)

! 		key_char = K_CSI;

! 

! 	    if (IS_SPECIAL(key_char))

! 		isSpecial = TRUE;

! 	}

      }

      if (vimModifiers)

      {

! 	result[len++] = CSI;

! 	result[len++] = KS_MODIFIER;

! 	result[len++] = vimModifiers;

      }

      if (isSpecial && IS_SPECIAL(key_char))

      {

! 	result[len++] = CSI;

! 	result[len++] = K_SECOND(key_char);

! 	result[len++] = K_THIRD(key_char);

      }

      else

      {

! 	encLen = actualSize;

! 	to = mac_utf16_to_enc(text, actualSize, &encLen);

! 	if (to)

! 	{

! 	    /* This is basically add_to_input_buf_csi() */

! 	    for (i = 0; i < encLen && len < (INLINE_KEY_BUFFER_SIZE-1); ++i)

! 	    {

! 		result[len++] = to[i];

! 		if (to[i] == CSI)

! 		{

! 		    result[len++] = KS_EXTRA;

! 		    result[len++] = (int)KE_CSI;

! 		}

! 	    }

! 	    vim_free(to);

! 	}

      }

      add_to_input_buf(result, len);

***************

*** 2135,2144 ****

      vim_free(text);

      if (err == noErr)

      {

!         /* Fake event to wake up WNE (required to get

!          * key repeat working */

!         PostEvent(keyUp, 0);

!         return noErr;

      }

      return eventNotHandledErr;

--- 2245,2254 ----

      vim_free(text);

      if (err == noErr)

      {

! 	/* Fake event to wake up WNE (required to get

! 	 * key repeat working */

! 	PostEvent(keyUp, 0);

! 	return noErr;

      }

      return eventNotHandledErr;

***************

*** 2334,2340 ****

      /* prevent that the vim window size changes if it's activated by a

         click into the tab pane */

      if (whichWindow == drawer)

!         return;

  #endif

      switch (thePart)

--- 2444,2450 ----

      /* prevent that the vim window size changes if it's activated by a

         click into the tab pane */

      if (whichWindow == drawer)

! 	return;

  #endif

      switch (thePart)

***************

*** 2569,2579 ****

      if (IsShowContextualMenuClick(event))

      {

  # if 0

!         gui_mac_handle_contextual_menu(event);

  # else

!         gui_mac_doMouseDownEvent(event);

  # endif

!         return;

      }

      /* Handle normal event */

--- 2679,2689 ----

      if (IsShowContextualMenuClick(event))

      {

  # if 0

! 	gui_mac_handle_contextual_menu(event);

  # else

! 	gui_mac_doMouseDownEvent(event);

  # endif

! 	return;

      }

      /* Handle normal event */

***************

*** 2832,2838 ****

  # else

      /* OSErr GetApplicationBundleFSSpec(FSSpecPtr theFSSpecPtr)

       * of TN2015

-      * This technic remove the ../Contents/MacOS/etc part

       */

      (void)GetCurrentProcess(&psn;;

      /* if (err != noErr) return err; */

--- 2942,2947 ----

***************

*** 2933,2942 ****

      /* TODO: Move most of this stuff toward gui_mch_init */

      Rect	windRect;

      MenuHandle	pomme;

-     EventTypeSpec   eventTypeSpec;

      EventHandlerRef mouseWheelHandlerRef;

  #ifdef USE_CARBONKEYHANDLER

!     EventHandlerRef keyEventHandlerRef;

  #endif

      ControlRef rootControl;

--- 3042,3050 ----

      /* TODO: Move most of this stuff toward gui_mch_init */

      Rect	windRect;

      MenuHandle	pomme;

      EventHandlerRef mouseWheelHandlerRef;

  #ifdef USE_CARBONKEYHANDLER

!     EventTypeSpec   eventTypeSpec;

  #endif

      ControlRef rootControl;

***************

*** 3042,3057 ****

      }

  #ifdef USE_CARBONKEYHANDLER

!     eventTypeSpec.eventClass = kEventClassTextInput;

!     eventTypeSpec.eventKind = kEventUnicodeForKeyEvent;

!     keyEventHandlerUPP = NewEventHandlerUPP(gui_mac_doKeyEventCarbon);

!     if (noErr != InstallApplicationEventHandler(keyEventHandlerUPP, 1,

! 		&eventTypeSpec, NULL, &keyEventHandlerRef))

      {

- 	keyEventHandlerRef = NULL;

  	DisposeEventHandlerUPP(keyEventHandlerUPP);

  	keyEventHandlerUPP = NULL;

      }

  #endif

  /*

--- 3150,3196 ----

      }

  #ifdef USE_CARBONKEYHANDLER

!     InterfaceTypeList supportedServices = { kUnicodeDocument };

!     NewTSMDocument(1, supportedServices, &gTSMDocument, 0);

! 

!     /* We don't support inline input yet, use input window by default */

!     UseInputWindow(gTSMDocument, TRUE);

! 

!     /* Should we activate the document by default? */

!     // ActivateTSMDocument(gTSMDocument);

! 

!     EventTypeSpec textEventTypes[] = {

! 	{ kEventClassTextInput, kEventTextInputUpdateActiveInputArea },

! 	{ kEventClassTextInput, kEventTextInputUnicodeForKeyEvent },

! 	{ kEventClassTextInput, kEventTextInputPosToOffset },

! 	{ kEventClassTextInput, kEventTextInputOffsetToPos },

!     };

! 

!     keyEventHandlerUPP = NewEventHandlerUPP(gui_mac_handle_text_input);

!     if (noErr != InstallApplicationEventHandler(keyEventHandlerUPP,

! 						NR_ELEMS(textEventTypes),

! 						textEventTypes, NULL, NULL))

      {

  	DisposeEventHandlerUPP(keyEventHandlerUPP);

  	keyEventHandlerUPP = NULL;

      }

+ 

+     EventTypeSpec windowEventTypes[] = {

+ 	{ kEventClassWindow, kEventWindowActivated },

+ 	{ kEventClassWindow, kEventWindowDeactivated },

+     };

+ 

+     /* Install window event handler to support TSMDocument activate and

+      * deactivate */

+     winEventHandlerUPP = NewEventHandlerUPP(gui_mac_handle_window_activate);

+     if (noErr != InstallWindowEventHandler(gui.VimWindow,

+ 					   winEventHandlerUPP,

+ 					   NR_ELEMS(windowEventTypes),

+ 					   windowEventTypes, NULL, NULL))

+     {

+ 	DisposeEventHandlerUPP(winEventHandlerUPP);

+ 	winEventHandlerUPP = NULL;

+     }

  #endif

  /*

***************

*** 3107,3112 ****

--- 3246,3264 ----

      return OK;

  }

+ #ifdef USE_ATSUI_DRAWING

+     static void

+ gui_mac_dispose_atsui_style(void)

+ {

+     if (p_macatsui && gFontStyle)

+ 	ATSUDisposeStyle(gFontStyle);

+ #ifdef FEAT_MBYTE

+     if (p_macatsui && gWideFontStyle)

+ 	ATSUDisposeStyle(gWideFontStyle);

+ #endif

+ }

+ #endif

+ 

      void

  gui_mch_exit(int rc)

  {

***************

*** 3122,3129 ****

  	DisposeEventHandlerUPP(mouseWheelHandlerUPP);

  #ifdef USE_ATSUI_DRAWING

!     if (p_macatsui && gFontStyle)

! 	ATSUDisposeStyle(gFontStyle);

  #endif

      /* Exit to shell? */

--- 3274,3286 ----

  	DisposeEventHandlerUPP(mouseWheelHandlerUPP);

  #ifdef USE_ATSUI_DRAWING

!     gui_mac_dispose_atsui_style();

! #endif

! 

! #ifdef USE_CARBONKEYHANDLER

!     FixTSMDocument(gTSMDocument);

!     DeactivateTSMDocument(gTSMDocument);

!     DeleteTSMDocument(gTSMDocument);

  #endif

      /* Exit to shell? */

***************

*** 3263,3268 ****

--- 3420,3445 ----

      return selected_font;