Mercurial > emacs
changeset 45890:afcf154bf656
2002-06-17 Andrew Choi <akochoi@shaw.ca>
* macterm.c (mac_scroll_area): Set foreground and backcolor to
black and white before scrolling. Restore frame background and
foreground color after scrolling.
(do_window_update): Call XClearWindow before calling expose_frame.
(make_mac_frame): Don't set FRAME_BACKGROUND_PIXEL and
FRAME_FOREGROUND_PIXEL of frame.
| author | Andrew Choi <akochoi@shaw.ca> |
|---|---|
| date | Tue, 18 Jun 2002 05:33:25 +0000 |
| parents | 0d2a977d3d32 |
| children | e945d29fa2b5 |
| files | src/ChangeLog src/macterm.c |
| diffstat | 2 files changed, 14 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Tue Jun 18 05:20:45 2002 +0000 +++ b/src/ChangeLog Tue Jun 18 05:33:25 2002 +0000 @@ -1,5 +1,12 @@ 2002-06-17 Andrew Choi <akochoi@shaw.ca> + * macterm.c (mac_scroll_area): Set foreground and backcolor to + black and white before scrolling. Restore frame background and + foreground color after scrolling. + (do_window_update): Call XClearWindow before calling expose_frame. + (make_mac_frame): Don't set FRAME_BACKGROUND_PIXEL and + FRAME_FOREGROUND_PIXEL of frame. + * macterm.c (XTread_socket): If Vmac_command_key_is_meta is nil, test Mac command key as <ALT> key.
--- a/src/macterm.c Tue Jun 18 05:20:45 2002 +0000 +++ b/src/macterm.c Tue Jun 18 05:33:25 2002 +0000 @@ -970,12 +970,16 @@ SetRect (&dest_r, dest_x, dest_y, dest_x + width, dest_y + height); SetPort (GetWindowPort (w)); - mac_set_colors (gc); + + ForeColor (blackColor); + BackColor (whiteColor); LockPortBits (GetWindowPort (w)); pmh = GetPortPixMap (GetWindowPort (w)); CopyBits ((BitMap *) *pmh, (BitMap *) *pmh, &src_r, &dest_r, srcCopy, 0); UnlockPortBits (GetWindowPort (w)); + + mac_set_colors (gc); #else /* not TARGET_API_MAC_CARBON */ Rect src_r, dest_r; @@ -11649,6 +11653,8 @@ BeginUpdate (win); handling_window_update = 1; + XClearWindow (FRAME_MAC_DISPLAY (f), FRAME_MAC_WINDOW (f)); + expose_frame (f, 0, 0, 0, 0); handling_window_update = 0; @@ -12829,8 +12835,6 @@ FRAME_VERTICAL_SCROLL_BAR_TYPE (f) = vertical_scroll_bar_right; NewMacWindow(f); - FRAME_BACKGROUND_PIXEL (f) = 0xffffff; - FRAME_FOREGROUND_PIXEL (f) = 0; f->output_data.mac->cursor_pixel = 0; f->output_data.mac->border_pixel = 0x00ff00;