emacs: src/macterm.c comparison

comparison src/macterm.c @ 71504:2b4e59cd1121

(Qeql): Add extern. (x_set_mouse_pixel_position) [MAC_OSX]: Use CGWarpMouseCursorPosition. (fm_style_face_attributes_alist) [USE_ATSUI]: New variable. (syms_of_macterm) [USE_ATSUI]: Initialize and staticpro it. Change keys of Vmac_atsu_font_table from strings to numbers. (fm_style_to_face_attributes) [USE_ATSUI]: New function. (init_font_name_table) [USE_ATSUI]: Use it. (saved_ts_script_language_on_focus) [USE_MAC_TSM]: New variable. (syms_of_macterm) [USE_MAC_TSM]: Initialize and staticpro it. [USE_MAC_TSM] (mac_tsm_resume): Restore script and language codes only when saved_ts_script_language_on_focus coincides with Vmac_ts_script_language_on_focus. [USE_MAC_TSM] (mac_tsm_suspend): Save value of Vmac_ts_script_language_on_focus to saved_ts_script_language_on_focus. (XTread_socket) [USE_MAC_TSM]: Add Mac OS Classic support. [USE_MAC_TSM] (mac_handle_text_input_event, init_tsm): Likewise.

author	YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
date	Wed, 28 Jun 2006 08:31:32 +0000
parents	4df3a065ee9b
children	a6c0f6b0c790 b19aaf4ab0ee 138ce2701550

comparison

equal deleted inserted replaced

-:fa67beba36e1
+:2b4e59cd1121
 #else
 static int input_signal_count;
 #endif
 extern Lisp_Object Vsystem_name;
+extern Lisp_Object Qeql;
 /* A mask of extra modifier bits to put into every keyboard char.  */
 extern EMACS_INT extra_keyboard_modifiers;
 void
 x_set_mouse_pixel_position (f, pix_x, pix_y)
 struct frame *f;
 int pix_x, pix_y;
 {
-#if 0 /* MAC_TODO: CursorDeviceMoveTo is non-Carbon */
+#ifdef MAC_OSX
+Point p;
+CGPoint point;
+BLOCK_INPUT;
+SetPortWindowPort (FRAME_MAC_WINDOW (f));
+p.h = pix_x;
+p.v = pix_y;
+LocalToGlobal (&p);
+point.x = p.h;
+point.y = p.v;
+CGWarpMouseCursorPosition (point);
+UNBLOCK_INPUT;
+#else
+#if 0 /* MAC_TODO: LMSetMouseLocation and CursorDeviceMoveTo are non-Carbon */
 BLOCK_INPUT;
 XWarpPointer (FRAME_X_DISPLAY (f), None, FRAME_X_WINDOW (f),
 		0, 0, 0, 0, pix_x, pix_y);
 UNBLOCK_INPUT;
+#endif
 #endif
 }
 /* focus shifting, raising and lowering.  */
 for Mac OS Classic is created.  */
 static Lisp_Object fm_font_family_alist;
 #if USE_ATSUI
 /* Hash table linking font family names to ATSU font IDs.  */
 static Lisp_Object atsu_font_id_hash;
+/* Alist linking Font Manager style to face attributes.  */
+static Lisp_Object fm_style_face_attributes_alist;
 static Lisp_Object Vmac_atsu_font_table;
 extern Lisp_Object QCfamily, QCweight, QCslant, Qnormal, Qbold, Qitalic;
 #endif
 /* Alist linking character set strings to Mac text encoding and Emacs
 add_font_name_table_entry (mac_to_x_fontname (name, 0, bold, charset));
 add_font_name_table_entry (mac_to_x_fontname (name, 0, italic | bold,
 						    charset));
 }
 }
+#if USE_ATSUI
+static Lisp_Object
+fm_style_to_face_attributes (fm_style)
+FMFontStyle fm_style;
+{
+Lisp_Object tem;
+fm_style &= (bold | italic);
+tem = assq_no_quit (make_number (fm_style),
+		      fm_style_face_attributes_alist);
+if (!NILP (tem))
+return XCDR (tem);
+tem = list4 (QCweight, fm_style & bold ? Qbold : Qnormal,
+	       QCslant, fm_style & italic ? Qitalic : Qnormal);
+fm_style_face_attributes_alist =
+Fcons (Fcons (make_number (fm_style), tem),
+	   fm_style_face_attributes_alist);
+return tem;
+}
+#endif
 /* Sets up the table font_name_table to contain the list of all fonts
 in the system the first time the table is used so that the Resource
 Manager need not be accessed every time this information is
 needed.  */
 		FMFontStyle style = normal;
 		decode_mac_font_name (name, name_len + 1, Qnil);
 		family = make_unibyte_string (name, name_len);
 		FMGetFontFamilyInstanceFromFont (font_ids[i], &ff, &style);
-		Fputhash (make_unibyte_string ((char *)(font_ids + i),
+		Fputhash ((font_ids[i] > MOST_POSITIVE_FIXNUM
-					       sizeof (ATSUFontID)),
+			   ? make_float (font_ids[i])
+			   : make_number (font_ids[i])),
 			  Fcons (QCfamily,
-				 list5 (family,
+				 Fcons (family,
-					QCweight,
+					fm_style_to_face_attributes (style))),
-					style & bold ? Qbold : Qnormal,
-					QCslant,
-					style & italic ? Qitalic : Qnormal)),
 			  Vmac_atsu_font_table);
 		if (*name != '.'
 		    && hash_lookup (h, family, &hash_code) < 0)
 		  {
 		    add_mac_font_name (name, 0, normal, "iso10646-1");
 static Lisp_Object Qtext_input;
 static Lisp_Object Qupdate_active_input_area, Qunicode_for_key_event;
 static Lisp_Object Vmac_ts_active_input_overlay;
 extern Lisp_Object Qbefore_string;
 static Lisp_Object Vmac_ts_script_language_on_focus;
+static Lisp_Object saved_ts_script_language_on_focus;
 static ScriptLanguageRecord saved_ts_language;
 static Component saved_ts_component;
 #endif
 #endif
 extern int mac_ready_for_apple_events;
 err = ActivateTSMDocument (tsm_document_id);
 if (err == noErr)
 {
-if (EQ (Vmac_ts_script_language_on_focus, Qt))
+if (EQ (Vmac_ts_script_language_on_focus, Qt)
+	  && EQ (saved_ts_script_language_on_focus, Qt))
 	slptr = &saved_ts_language;
 else if (CONSP (Vmac_ts_script_language_on_focus)
 	       && INTEGERP (XCAR (Vmac_ts_script_language_on_focus))
-	       && INTEGERP (XCDR (Vmac_ts_script_language_on_focus)))
+	       && INTEGERP (XCDR (Vmac_ts_script_language_on_focus))
+	       && CONSP (saved_ts_script_language_on_focus)
+	       && EQ (XCAR (saved_ts_script_language_on_focus),
+		      XCAR (Vmac_ts_script_language_on_focus))
+	       && EQ (XCDR (saved_ts_script_language_on_focus),
+		      XCDR (Vmac_ts_script_language_on_focus)))
 	{
 	  slrec.fScript = XINT (XCAR (Vmac_ts_script_language_on_focus));
 	  slrec.fLanguage = XINT (XCDR (Vmac_ts_script_language_on_focus));
 	  slptr = &slrec;
 	}
 static OSStatus
 mac_tsm_suspend ()
 {
 OSStatus err;
 ScriptLanguageRecord slrec, *slptr = NULL;
+saved_ts_script_language_on_focus = Vmac_ts_script_language_on_focus;
 if (EQ (Vmac_ts_script_language_on_focus, Qt))
 {
 err = GetTextServiceLanguage (&saved_ts_language);
 if (err == noErr)
 static EventParamType types_uaia[] =
 {typeComponentInstance,
 typeLongInteger,
 typeIntlWritingCode,
 typeLongInteger,
+#ifdef MAC_OSX
 typeUnicodeText,
+#else
+typeChar,
+#endif
 typeTextRangeArray,
 typeTextRangeArray,
 typeOffsetArray,
 typeTextRange,
 typeUInt32,
 			       typeUInt32, NULL,
 			       sizeof (UInt32), NULL, &modifiers);
 #endif
 	    mapped_modifiers &= modifiers;
-#if USE_CARBON_EVENTS && defined (MAC_OSX)
+#if USE_CARBON_EVENTS && (defined (MAC_OSX) || USE_MAC_TSM)
 	    /* When using Carbon Events, we need to pass raw keyboard
 	       events to the TSM ourselves.  If TSM handles it, it
 	       will pass back noErr, otherwise it will pass back
 	       "eventNotHandledErr" and we can process it
 	       normally.  */
 #if USE_MAC_TSM
 static void
 init_tsm ()
 {
+#ifdef MAC_OSX
 static InterfaceTypeList types = {kUnicodeDocument};
+#else
+static InterfaceTypeList types = {kTextService};
+#endif
 NewTSMDocument (sizeof (types) / sizeof (types[0]), types,
 		  &tsm_document_id, 0);
 }
 #endif
 fm_font_family_alist = Qnil;
 #if USE_ATSUI
 staticpro (&atsu_font_id_hash);
 atsu_font_id_hash = Qnil;
+staticpro (&fm_style_face_attributes_alist);
+fm_style_face_attributes_alist = Qnil;
+#endif
+#if USE_MAC_TSM
+staticpro (&saved_ts_script_language_on_focus);
+saved_ts_script_language_on_focus = Qnil;
 #endif
 /* We don't yet support this, but defining this here avoids whining
 from cus-start.el and other places, like "M-x set-variable".  */
 DEFVAR_BOOL ("x-use-underline-position-properties",
 Fcons (list3 (build_string ("mac-roman"),
 		  make_number (smRoman), Qnil), Qnil);
 #if USE_ATSUI
 DEFVAR_LISP ("mac-atsu-font-table", &Vmac_atsu_font_table,
-doc: /* Hash table of ATSU font IDs vs plist of attributes and values.
+doc: /* Hash table of ATSU font IDs vs plist of attributes and values.  */);
-Each font ID is represented as a four-byte string in native byte
-order.  */);
 Vmac_atsu_font_table =
-make_hash_table (Qequal, make_number (DEFAULT_HASH_SIZE),
+make_hash_table (Qeql, make_number (DEFAULT_HASH_SIZE),
 		     make_float (DEFAULT_REHASH_SIZE),
 		     make_float (DEFAULT_REHASH_THRESHOLD),
 		     Qnil, Qnil, Qnil);
 #endif
 #if USE_MAC_TSM

Mercurial > emacs

comparison src/macterm.c @ 71504:2b4e59cd1121