aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorYAMAMOTO Mitsuharu2005-10-16 02:22:35 +0000
committerYAMAMOTO Mitsuharu2005-10-16 02:22:35 +0000
commit0abf3e71f3208b0568d1d2c12a2b05cbb387c23e (patch)
tree30b720f9d4cd053938a26a831b413a7ec14e852f /src
parent5f8080a9e2d67e10fd38914ebcd93bddc648eafe (diff)
downloademacs-0abf3e71f3208b0568d1d2c12a2b05cbb387c23e.tar.gz
emacs-0abf3e71f3208b0568d1d2c12a2b05cbb387c23e.zip
(Fx_create_frame): Add debugging code.
(Fx_show_tip): Set frame pixel width and height.
Diffstat (limited to 'src')
-rw-r--r--src/macfns.c21
1 files changed, 14 insertions, 7 deletions
diff --git a/src/macfns.c b/src/macfns.c
index f0d07a9fe55..64e20af4a47 100644
--- a/src/macfns.c
+++ b/src/macfns.c
@@ -1745,8 +1745,7 @@ x_set_tool_bar_lines (f, value, oldval)
1745 int y = nlines * FRAME_LINE_HEIGHT (f); 1745 int y = nlines * FRAME_LINE_HEIGHT (f);
1746 1746
1747 BLOCK_INPUT; 1747 BLOCK_INPUT;
1748 XClearArea (FRAME_MAC_DISPLAY (f), FRAME_MAC_WINDOW (f), 1748 mac_clear_area (f, 0, y, width, height);
1749 0, y, width, height, 0);
1750 UNBLOCK_INPUT; 1749 UNBLOCK_INPUT;
1751 1750
1752 if (WINDOWP (f->tool_bar_window)) 1751 if (WINDOWP (f->tool_bar_window))
@@ -2439,7 +2438,7 @@ This function is an internal primitive--use `make-frame' instead. */)
2439 frame = Qnil; 2438 frame = Qnil;
2440 GCPRO4 (parms, parent, name, frame); 2439 GCPRO4 (parms, parent, name, frame);
2441 tem = mac_get_arg (parms, Qminibuffer, "minibuffer", "Minibuffer", 2440 tem = mac_get_arg (parms, Qminibuffer, "minibuffer", "Minibuffer",
2442 RES_TYPE_SYMBOL); 2441 RES_TYPE_SYMBOL);
2443 if (EQ (tem, Qnone) || NILP (tem)) 2442 if (EQ (tem, Qnone) || NILP (tem))
2444 f = make_frame_without_minibuffer (Qnil, kb, display); 2443 f = make_frame_without_minibuffer (Qnil, kb, display);
2445 else if (EQ (tem, Qonly)) 2444 else if (EQ (tem, Qonly))
@@ -2480,7 +2479,11 @@ This function is an internal primitive--use `make-frame' instead. */)
2480 if (! STRINGP (f->icon_name)) 2479 if (! STRINGP (f->icon_name))
2481 f->icon_name = Qnil; 2480 f->icon_name = Qnil;
2482 2481
2483/* FRAME_W32_DISPLAY_INFO (f) = dpyinfo; */ 2482/* FRAME_MAC_DISPLAY_INFO (f) = dpyinfo; */
2483#if GLYPH_DEBUG
2484 image_cache_refcount = FRAME_X_IMAGE_CACHE (f)->refcount;
2485 dpyinfo_refcount = dpyinfo->reference_count;
2486#endif /* GLYPH_DEBUG */
2484#ifdef MULTI_KBOARD 2487#ifdef MULTI_KBOARD
2485 FRAME_KBOARD (f) = kb; 2488 FRAME_KBOARD (f) = kb;
2486#endif 2489#endif
@@ -2606,9 +2609,10 @@ This function is an internal primitive--use `make-frame' instead. */)
2606 x_default_parameter (f, parms, Qmenu_bar_lines, make_number (1), 2609 x_default_parameter (f, parms, Qmenu_bar_lines, make_number (1),
2607 "menuBar", "MenuBar", RES_TYPE_NUMBER); 2610 "menuBar", "MenuBar", RES_TYPE_NUMBER);
2608 x_default_parameter (f, parms, Qtool_bar_lines, make_number (1), 2611 x_default_parameter (f, parms, Qtool_bar_lines, make_number (1),
2609 "toolBar", "ToolBar", RES_TYPE_NUMBER); 2612 "toolBar", "ToolBar", RES_TYPE_NUMBER);
2610 x_default_parameter (f, parms, Qbuffer_predicate, Qnil, 2613 x_default_parameter (f, parms, Qbuffer_predicate, Qnil,
2611 "bufferPredicate", "BufferPredicate", RES_TYPE_SYMBOL); 2614 "bufferPredicate", "BufferPredicate",
2615 RES_TYPE_SYMBOL);
2612 x_default_parameter (f, parms, Qtitle, Qnil, 2616 x_default_parameter (f, parms, Qtitle, Qnil,
2613 "title", "Title", RES_TYPE_STRING); 2617 "title", "Title", RES_TYPE_STRING);
2614 x_default_parameter (f, parms, Qfullscreen, Qnil, 2618 x_default_parameter (f, parms, Qfullscreen, Qnil,
@@ -3593,7 +3597,7 @@ x_create_tip_frame (dpyinfo, parms, text)
3593 3597
3594 FRAME_FONTSET (f) = -1; 3598 FRAME_FONTSET (f) = -1;
3595 f->icon_name = Qnil; 3599 f->icon_name = Qnil;
3596 3600/* FRAME_X_DISPLAY_INFO (f) = dpyinfo; */
3597#if GLYPH_DEBUG 3601#if GLYPH_DEBUG
3598 image_cache_refcount = FRAME_X_IMAGE_CACHE (f)->refcount; 3602 image_cache_refcount = FRAME_X_IMAGE_CACHE (f)->refcount;
3599 dpyinfo_refcount = dpyinfo->reference_count; 3603 dpyinfo_refcount = dpyinfo->reference_count;
@@ -4047,6 +4051,9 @@ Text larger than the specified size is clipped. */)
4047 BringToFront (FRAME_MAC_WINDOW (f)); 4051 BringToFront (FRAME_MAC_WINDOW (f));
4048 UNBLOCK_INPUT; 4052 UNBLOCK_INPUT;
4049 4053
4054 FRAME_PIXEL_WIDTH (f) = width;
4055 FRAME_PIXEL_HEIGHT (f) = height;
4056
4050 /* Draw into the window. */ 4057 /* Draw into the window. */
4051 w->must_be_updated_p = 1; 4058 w->must_be_updated_p = 1;
4052 update_single_window (w, 1); 4059 update_single_window (w, 1);