The following changes consolidate some of the gui-independent parts of the processing and drawing of "glyph strings" from xterm.c, w32term.c, and macterm.c into xdisp.c. * macterm.c: Remove consolidated defines and code. (mac_per_char_metric): New function for RIF. (mac_encode_char): Adapted to new RIF requirements. (mac_compute_glyph_string_overhangs): Adapt for RIF. (x_redisplay_interface): Add new members.