HASHIMOTO Taiichi
taiic****@users*****
2006年 3月 13日 (月) 17:07:09 JST
Index: inline_patch/ChangeLog diff -u inline_patch/ChangeLog:1.19 inline_patch/ChangeLog:1.20 --- inline_patch/ChangeLog:1.19 Mon Mar 13 13:27:25 2006 +++ inline_patch/ChangeLog Mon Mar 13 17:07:09 2006 @@ -1,5 +1,10 @@ 2006-03-13 HASHIMOTO Taiichi <taiic****@cl*****> + * mac-im.el: cursor-type, cursor-color‚̃fƒtƒHƒ‹ƒg’l‚ðŽ©“®Ý’è‚·‚é + ‚悤‚É•ÏX + +2006-03-13 HASHIMOTO Taiichi <taiic****@cl*****> + * mac-im.el: AquaSKK‚Å“ü—Í‚Å‚«‚È‚¢–â‘è‚ð‰ðŒˆ 2006-03-10 HASHIMOTO Taiichi <taiic****@cl*****> @@ -8,8 +13,8 @@ mac-get-current-key-script * macim.c: ŠÖ”‚̒ljÁ mac-get-current-key-script, mac-get-last-key-script - Input method ‚̃ŠƒZƒbƒg‚̃^ƒCƒ~ƒ“ƒO‚Ì•ÏX - * macterm.c: Input method ‚̃ŠƒZƒbƒg‚̃^ƒCƒ~ƒ“ƒO‚Ì•ÏX + TSM‚̃ŠƒZƒbƒg‚̃^ƒCƒ~ƒ“ƒO‚Ì•ÏX + * macterm.c: TSM‚̃ŠƒZƒbƒg‚̃^ƒCƒ~ƒ“ƒO‚Ì•ÏX 2006-01-19 HASHIMOTO Taiichi <taiic****@cl*****> Index: inline_patch/emacs-inline.patch diff -u inline_patch/emacs-inline.patch:1.22 inline_patch/emacs-inline.patch:1.23 --- inline_patch/emacs-inline.patch:1.22 Mon Mar 13 13:27:25 2006 +++ inline_patch/emacs-inline.patch Mon Mar 13 17:07:09 2006 @@ -1,6 +1,6 @@ diff -prN -x '*.orig' ../emacs-20060313-0/lisp/loadup.el lisp/loadup.el -*** ../emacs-20060313-0/lisp/loadup.el Mon Mar 13 09:25:31 2006 ---- lisp/loadup.el Mon Mar 13 09:26:43 2006 +*** ../emacs-20060313-0/lisp/loadup.el Mon Mar 13 13:37:39 2006 +--- lisp/loadup.el Mon Mar 13 13:38:13 2006 *************** *** 206,211 **** --- 206,214 ---- @@ -15,10 +15,10 @@ (load "vc-hooks") diff -prN -x '*.orig' ../emacs-20060313-0/lisp/term/mac-im.el lisp/term/mac-im.el *** ../emacs-20060313-0/lisp/term/mac-im.el Thu Jan 1 09:00:00 1970 ---- lisp/term/mac-im.el Mon Mar 13 10:50:46 2006 +--- lisp/term/mac-im.el Mon Mar 13 16:53:16 2006 *************** *** 0 **** ---- 1,337 ---- +--- 1,333 ---- + ;; mac-im.el --- Input Method for Mac OS X -*-coding: iso-2022-7bit;-*- + + ;; Copyright (C) 2005, 2006 HASHIMOTO Taiichi <taiic****@mac*****> @@ -236,8 +236,11 @@ + (defun mac-input-method-update (lang) + "Funtion to update parameters of a input method." + (let ((title (cdr (mac-get-input-method-parameter lang 'title))) -+ (ctype (cdr (mac-get-input-method-parameter lang 'cursor-type))) -+ (ccolor (cdr (mac-get-input-method-parameter lang 'cursor-color)))) ++ (ctype (or (cdr (mac-get-input-method-parameter lang 'cursor-type)) ++ (cdr (assq 'cursor-type default-frame-alist)) ++ default-cursor-type)) ++ (ccolor (or (cdr (mac-get-input-method-parameter lang 'cursor-color)) ++ (cdr (assq 'cursor-color default-frame-alist))))) + (setq current-input-method-title title) + (if ctype (setq cursor-type ctype)) + (if ccolor (set-cursor-color ccolor)) @@ -300,16 +303,8 @@ + ;; + (defun mac-setup-inline-input-method () + (interactive) -+ -+ (let* ((params (frame-parameters)) -+ (color (or (cdr (assq 'cursor-color default-frame-alist)) -+ (cdr (assq 'cursor-color params)))) -+ (type (or (cdr (assq 'cursor-type default-frame-alist)) -+ (cdr (assq 'cursor-type params))))) -+ (mac-set-input-method-parameter 0 'cursor-color color) -+ (mac-set-input-method-parameter 0 'cursor-type type) -+ (mac-set-inline-input-method t) -+ (setq default-input-method "MacOSX"))) ++ (mac-set-inline-input-method t) ++ (setq default-input-method "MacOSX")) + + + ;; @@ -356,9 +351,10 @@ + [mac-input-method] 'mac-input-method-isearch-edit-string) + (define-key special-event-map + [mac-change-input-method] 'mac-handle-input-method-change) ++ diff -prN -x '*.orig' ../emacs-20060313-0/src/Makefile.in src/Makefile.in -*** ../emacs-20060313-0/src/Makefile.in Mon Mar 13 09:25:40 2006 ---- src/Makefile.in Mon Mar 13 09:26:43 2006 +*** ../emacs-20060313-0/src/Makefile.in Mon Mar 13 13:37:44 2006 +--- src/Makefile.in Mon Mar 13 13:38:13 2006 *************** CYGWIN_OBJ = sheap.o *** 568,574 **** @@ -407,8 +403,8 @@ ${emacsapp}Contents/Resources/English.lproj: diff -prN -x '*.orig' ../emacs-20060313-0/src/keyboard.c src/keyboard.c -*** ../emacs-20060313-0/src/keyboard.c Mon Mar 13 09:25:40 2006 ---- src/keyboard.c Mon Mar 13 09:26:43 2006 +*** ../emacs-20060313-0/src/keyboard.c Mon Mar 13 13:37:44 2006 +--- src/keyboard.c Mon Mar 13 13:38:13 2006 *************** Lisp_Object Qmouse_click; *** 528,533 **** --- 528,537 ---- @@ -464,10 +460,10 @@ diff -prN -x '*.orig' ../emacs-20060313-0/src/macim.c src/macim.c *** ../emacs-20060313-0/src/macim.c Thu Jan 1 09:00:00 1970 ---- src/macim.c Mon Mar 13 09:26:43 2006 +--- src/macim.c Mon Mar 13 16:00:35 2006 *************** *** 0 **** ---- 1,455 ---- +--- 1,453 ---- + /* Implementation of Inline Input Method for MacOS X. + Copyright (C) 2004, 2005, 2006 Taiichi Hashimoto <taiic****@mac*****>. + @@ -779,7 +775,7 @@ + UInt32 src_nbytes = 0, array_nbytes = 0, fixed_nbytes = 0; + unsigned char *src = NULL; + TextRangeArray *array = NULL; -+ Lisp_Object argv[1024], triple[3]; ++ Lisp_Object argv[1024]; + int argc = 0, i = 0; + + GetEventParameter (event, kEventParamTextInputSendText, @@ -824,12 +820,10 @@ + + for (i = 0; i < array->fNumOfRanges && argc < 1024; i++) + { -+ triple[0] = make_number (array->fRange[i].fHiliteStyle); -+ triple[1] = make_number (array->fRange[i].fStart); -+ triple[2] = make_number (array->fRange[i].fEnd); -+ argv[argc++] = list3 (make_number (array->fRange[i].fHiliteStyle), -+ make_number (array->fRange[i].fStart), -+ make_number (array->fRange[i].fEnd)); ++ argv[argc++] = ++ list3 (make_number (array->fRange[i].fHiliteStyle), ++ make_number (array->fRange[i].fStart), ++ make_number (array->fRange[i].fEnd)); + } + } + if (src) xfree(src); @@ -907,8 +901,8 @@ + + DEFVAR_LISP ("mac-use-inline-input-method", &Vmac_use_inline_input_method, + doc: /* If non-nil, users use inline input method on MacOSX. */); -+ Vmac_use_inline_input_method = Qnil; -+ //Fmac_set_inline_input_method (Vmac_use_inline_input_method); ++ Vmac_use_inline_input_method = Qt; ++ Fmac_set_inline_input_method (Vmac_use_inline_input_method); + + DEFVAR_LISP ("mac-ignore-shortcuts", &Vmac_ignore_shortcuts, + doc: /* The list of pairs of a xkeysym and modifiers @@ -924,8 +918,8 @@ + #endif + diff -prN -x '*.orig' ../emacs-20060313-0/src/macterm.c src/macterm.c -*** ../emacs-20060313-0/src/macterm.c Mon Mar 13 09:25:40 2006 ---- src/macterm.c Mon Mar 13 13:24:58 2006 +*** ../emacs-20060313-0/src/macterm.c Mon Mar 13 13:37:44 2006 +--- src/macterm.c Mon Mar 13 13:38:13 2006 *************** XTread_socket (sd, expected, hold_quit) *** 10298,10303 **** --- 10298,10304 ---- @@ -999,8 +993,8 @@ init_command_handler (); diff -prN -x '*.orig' ../emacs-20060313-0/src/termhooks.h src/termhooks.h -*** ../emacs-20060313-0/src/termhooks.h Mon Mar 13 09:25:40 2006 ---- src/termhooks.h Mon Mar 13 09:26:43 2006 +*** ../emacs-20060313-0/src/termhooks.h Mon Mar 13 13:37:45 2006 +--- src/termhooks.h Mon Mar 13 13:38:13 2006 *************** enum event_kind *** 260,265 **** --- 260,271 ----
