procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

2002-06-17 Andrew Choi <akochoi@shaw.ca>

Browse source 
* 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.
This commit is contained in:
Andrew Choi 2002-06-18 05:33:25 +00:00
parent 566da2e7e0
commit 2d97ff8cf6
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/ChangeLog
View file

@ -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.

10
src/macterm.c
View file

@ -970,12 +970,16 @@ mac_scroll_area (display, w, gc, src_x, src_y, width, height, dest_x, dest_y)
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 @@ do_window_update (WindowPtr win)
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 @@ void make_mac_frame (struct frame *f)
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;