7.3.382

   1 To: vim_dev@googlegroups.com
   2 Subject: Patch 7.3.382
   3 Fcc: outbox
   4 From: Bram Moolenaar <Bram@moolenaar.net>
   5 Mime-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8 ------------
   9
  10 Patch 7.3.382 (after 7.3.376)
  11 Problem:    IME characters are inserted twice.
  12 Solution:   Do not call DefWindowProc() if the event was handled. (Yasuhiro
  13             Matsumoto)
  14 Files:      src/gui_w32.c
  15
  16
  17 *** ../vim-7.3.381/src/gui_w32.c        2011-12-14 15:23:53.000000000 +0100
  18 --- src/gui_w32.c       2011-12-15 21:50:51.000000000 +0100
  19 ***************
  20 *** 798,804 ****
  21                 if (pt.y < rect.top)
  22                 {
  23                     show_tabline_popup_menu();
  24 !                   return 0;
  25                 }
  26             }
  27             return MyWindowProc(hwnd, uMsg, wParam, lParam);
  28 --- 798,804 ----
  29                 if (pt.y < rect.top)
  30                 {
  31                     show_tabline_popup_menu();
  32 !                   return 0L;
  33                 }
  34             }
  35             return MyWindowProc(hwnd, uMsg, wParam, lParam);
  36 ***************
  37 *** 828,834 ****
  38 --- 828,837 ----
  39
  40       case WM_ENDSESSION:
  41         if (wParam)     /* system only really goes down when wParam is TRUE */
  42 +       {
  43             _OnEndSession();
  44 +           return 0L;
  45 +       }
  46         break;
  47
  48       case WM_CHAR:
  49 ***************
  50 *** 866,872 ****
  51          * are received, mouse pointer remains hidden. */
  52         return MyWindowProc(hwnd, uMsg, wParam, lParam);
  53   #else
  54 !       return 0;
  55   #endif
  56
  57       case WM_SIZING:   /* HANDLE_MSG doesn't seem to handle this one */
  58 --- 869,875 ----
  59          * are received, mouse pointer remains hidden. */
  60         return MyWindowProc(hwnd, uMsg, wParam, lParam);
  61   #else
  62 !       return 0L;
  63   #endif
  64
  65       case WM_SIZING:   /* HANDLE_MSG doesn't seem to handle this one */
  66 ***************
  67 *** 874,880 ****
  68
  69       case WM_MOUSEWHEEL:
  70         _OnMouseWheel(hwnd, HIWORD(wParam));
  71 !       break;
  72
  73         /* Notification for change in SystemParametersInfo() */
  74       case WM_SETTINGCHANGE:
  75 --- 877,883 ----
  76
  77       case WM_MOUSEWHEEL:
  78         _OnMouseWheel(hwnd, HIWORD(wParam));
  79 !       return 0L;
  80
  81         /* Notification for change in SystemParametersInfo() */
  82       case WM_SETTINGCHANGE:
  83 ***************
  84 *** 987,999 ****
  85 --- 990,1008 ----
  86             case TCN_SELCHANGE:
  87                 if (gui_mch_showing_tabline()
  88                                   && ((LPNMHDR)lParam)->hwndFrom == s_tabhwnd)
  89 +               {
  90                     send_tabline_event(TabCtrl_GetCurSel(s_tabhwnd) + 1);
  91 +                   return 0L;
  92 +               }
  93                 break;
  94
  95             case NM_RCLICK:
  96                 if (gui_mch_showing_tabline()
  97                         && ((LPNMHDR)lParam)->hwndFrom == s_tabhwnd)
  98 +               {
  99                     show_tabline_popup_menu();
 100 +                   return 0L;
 101 +               }
 102                 break;
 103   # endif
 104             default:
 105 ***************
 106 *** 1037,1042 ****
 107 --- 1046,1052 ----
 108                 out_flush();
 109                 did_menu_tip = TRUE;
 110             }
 111 +           return 0L;
 112         }
 113         break;
 114   #endif
 115 ***************
 116 *** 1079,1096 ****
 117       case WM_IME_NOTIFY:
 118         if (!_OnImeNotify(hwnd, (DWORD)wParam, (DWORD)lParam))
 119             return MyWindowProc(hwnd, uMsg, wParam, lParam);
 120 !       break;
 121       case WM_IME_COMPOSITION:
 122         if (!_OnImeComposition(hwnd, wParam, lParam))
 123             return MyWindowProc(hwnd, uMsg, wParam, lParam);
 124 !       break;
 125   #endif
 126
 127       default:
 128         if (uMsg == msh_msgmousewheel && msh_msgmousewheel != 0)
 129         {   /* handle MSH_MOUSEWHEEL messages for Intellimouse */
 130             _OnMouseWheel(hwnd, HIWORD(wParam));
 131 !           break;
 132         }
 133   #ifdef MSWIN_FIND_REPLACE
 134         else if (uMsg == s_findrep_msg && s_findrep_msg != 0)
 135 --- 1089,1107 ----
 136       case WM_IME_NOTIFY:
 137         if (!_OnImeNotify(hwnd, (DWORD)wParam, (DWORD)lParam))
 138             return MyWindowProc(hwnd, uMsg, wParam, lParam);
 139 !       return 1L;
 140 !
 141       case WM_IME_COMPOSITION:
 142         if (!_OnImeComposition(hwnd, wParam, lParam))
 143             return MyWindowProc(hwnd, uMsg, wParam, lParam);
 144 !       return 1L;
 145   #endif
 146
 147       default:
 148         if (uMsg == msh_msgmousewheel && msh_msgmousewheel != 0)
 149         {   /* handle MSH_MOUSEWHEEL messages for Intellimouse */
 150             _OnMouseWheel(hwnd, HIWORD(wParam));
 151 !           return 0L;
 152         }
 153   #ifdef MSWIN_FIND_REPLACE
 154         else if (uMsg == s_findrep_msg && s_findrep_msg != 0)
 155 *** ../vim-7.3.381/src/version.c        2011-12-14 20:51:19.000000000 +0100
 156 --- src/version.c       2011-12-15 21:48:49.000000000 +0100
 157 ***************
 158 *** 716,717 ****
 159 --- 716,719 ----
 160   {   /* Add new patch number below this line */
 161 + /**/
 162 +     382,
 163   /**/
 164
 165 --
 166 Even got a Datapoint 3600(?) with a DD50 connector instead of the
 167 usual DB25...  what a nightmare trying to figure out the pinout
 168 for *that* with no spex...
 169
 170  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
 171 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
 172 \\\  an exciting new programming language -- http://www.Zimbu.org        ///
 173  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///