Commit 0abf3e71 authored by YAMAMOTO Mitsuharu's avatar YAMAMOTO Mitsuharu
Browse files

(Fx_create_frame): Add debugging code.

(Fx_show_tip): Set frame pixel width and height.
parent 5f8080a9
...@@ -1745,8 +1745,7 @@ x_set_tool_bar_lines (f, value, oldval) ...@@ -1745,8 +1745,7 @@ x_set_tool_bar_lines (f, value, oldval)
int y = nlines * FRAME_LINE_HEIGHT (f); int y = nlines * FRAME_LINE_HEIGHT (f);
BLOCK_INPUT; BLOCK_INPUT;
XClearArea (FRAME_MAC_DISPLAY (f), FRAME_MAC_WINDOW (f), mac_clear_area (f, 0, y, width, height);
0, y, width, height, 0);
UNBLOCK_INPUT; UNBLOCK_INPUT;
if (WINDOWP (f->tool_bar_window)) if (WINDOWP (f->tool_bar_window))
...@@ -2439,7 +2438,7 @@ This function is an internal primitive--use `make-frame' instead. */) ...@@ -2439,7 +2438,7 @@ This function is an internal primitive--use `make-frame' instead. */)
frame = Qnil; frame = Qnil;
GCPRO4 (parms, parent, name, frame); GCPRO4 (parms, parent, name, frame);
tem = mac_get_arg (parms, Qminibuffer, "minibuffer", "Minibuffer", tem = mac_get_arg (parms, Qminibuffer, "minibuffer", "Minibuffer",
RES_TYPE_SYMBOL); RES_TYPE_SYMBOL);
if (EQ (tem, Qnone) || NILP (tem)) if (EQ (tem, Qnone) || NILP (tem))
f = make_frame_without_minibuffer (Qnil, kb, display); f = make_frame_without_minibuffer (Qnil, kb, display);
else if (EQ (tem, Qonly)) else if (EQ (tem, Qonly))
...@@ -2480,7 +2479,11 @@ This function is an internal primitive--use `make-frame' instead. */) ...@@ -2480,7 +2479,11 @@ This function is an internal primitive--use `make-frame' instead. */)
if (! STRINGP (f->icon_name)) if (! STRINGP (f->icon_name))
f->icon_name = Qnil; f->icon_name = Qnil;
/* FRAME_W32_DISPLAY_INFO (f) = dpyinfo; */ /* FRAME_MAC_DISPLAY_INFO (f) = dpyinfo; */
#if GLYPH_DEBUG
image_cache_refcount = FRAME_X_IMAGE_CACHE (f)->refcount;
dpyinfo_refcount = dpyinfo->reference_count;
#endif /* GLYPH_DEBUG */
#ifdef MULTI_KBOARD #ifdef MULTI_KBOARD
FRAME_KBOARD (f) = kb; FRAME_KBOARD (f) = kb;
#endif #endif
...@@ -2606,9 +2609,10 @@ This function is an internal primitive--use `make-frame' instead. */) ...@@ -2606,9 +2609,10 @@ This function is an internal primitive--use `make-frame' instead. */)
x_default_parameter (f, parms, Qmenu_bar_lines, make_number (1), x_default_parameter (f, parms, Qmenu_bar_lines, make_number (1),
"menuBar", "MenuBar", RES_TYPE_NUMBER); "menuBar", "MenuBar", RES_TYPE_NUMBER);
x_default_parameter (f, parms, Qtool_bar_lines, make_number (1), x_default_parameter (f, parms, Qtool_bar_lines, make_number (1),
"toolBar", "ToolBar", RES_TYPE_NUMBER); "toolBar", "ToolBar", RES_TYPE_NUMBER);
x_default_parameter (f, parms, Qbuffer_predicate, Qnil, x_default_parameter (f, parms, Qbuffer_predicate, Qnil,
"bufferPredicate", "BufferPredicate", RES_TYPE_SYMBOL); "bufferPredicate", "BufferPredicate",
RES_TYPE_SYMBOL);
x_default_parameter (f, parms, Qtitle, Qnil, x_default_parameter (f, parms, Qtitle, Qnil,
"title", "Title", RES_TYPE_STRING); "title", "Title", RES_TYPE_STRING);
x_default_parameter (f, parms, Qfullscreen, Qnil, x_default_parameter (f, parms, Qfullscreen, Qnil,
...@@ -3593,7 +3597,7 @@ x_create_tip_frame (dpyinfo, parms, text) ...@@ -3593,7 +3597,7 @@ x_create_tip_frame (dpyinfo, parms, text)
FRAME_FONTSET (f) = -1; FRAME_FONTSET (f) = -1;
f->icon_name = Qnil; f->icon_name = Qnil;
/* FRAME_X_DISPLAY_INFO (f) = dpyinfo; */
#if GLYPH_DEBUG #if GLYPH_DEBUG
image_cache_refcount = FRAME_X_IMAGE_CACHE (f)->refcount; image_cache_refcount = FRAME_X_IMAGE_CACHE (f)->refcount;
dpyinfo_refcount = dpyinfo->reference_count; dpyinfo_refcount = dpyinfo->reference_count;
...@@ -4047,6 +4051,9 @@ Text larger than the specified size is clipped. */) ...@@ -4047,6 +4051,9 @@ Text larger than the specified size is clipped. */)
BringToFront (FRAME_MAC_WINDOW (f)); BringToFront (FRAME_MAC_WINDOW (f));
UNBLOCK_INPUT; UNBLOCK_INPUT;
FRAME_PIXEL_WIDTH (f) = width;
FRAME_PIXEL_HEIGHT (f) = height;
/* Draw into the window. */ /* Draw into the window. */
w->must_be_updated_p = 1; w->must_be_updated_p = 1;
update_single_window (w, 1); update_single_window (w, 1);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment