[Emacs-diffs] Changes to emacs/src/macfns.c

[YAMAMOTO Mitsuharu]

Index: emacs/src/macfns.c
diff -c emacs/src/macfns.c:1.68 emacs/src/macfns.c:1.69
*** emacs/src/macfns.c:1.68     Sat Oct  1 11:09:09 2005
--- emacs/src/macfns.c  Sun Oct 16 02:22:35 2005
***************
*** 1745,1752 ****
        int y = nlines * FRAME_LINE_HEIGHT (f);
  
        BLOCK_INPUT;
!       XClearArea (FRAME_MAC_DISPLAY (f), FRAME_MAC_WINDOW (f),
!                   0, y, width, height, 0);
        UNBLOCK_INPUT;
  
        if (WINDOWP (f->tool_bar_window))
--- 1745,1751 ----
        int y = nlines * FRAME_LINE_HEIGHT (f);
  
        BLOCK_INPUT;
!       mac_clear_area (f, 0, y, width, height);
        UNBLOCK_INPUT;
  
        if (WINDOWP (f->tool_bar_window))
***************
*** 2439,2445 ****
    frame = Qnil;
    GCPRO4 (parms, parent, name, frame);
    tem = mac_get_arg (parms, Qminibuffer, "minibuffer", "Minibuffer",
!                      RES_TYPE_SYMBOL);
    if (EQ (tem, Qnone) || NILP (tem))
      f = make_frame_without_minibuffer (Qnil, kb, display);
    else if (EQ (tem, Qonly))
--- 2438,2444 ----
    frame = Qnil;
    GCPRO4 (parms, parent, name, frame);
    tem = mac_get_arg (parms, Qminibuffer, "minibuffer", "Minibuffer",
!                    RES_TYPE_SYMBOL);
    if (EQ (tem, Qnone) || NILP (tem))
      f = make_frame_without_minibuffer (Qnil, kb, display);
    else if (EQ (tem, Qonly))
***************
*** 2480,2486 ****
    if (! STRINGP (f->icon_name))
      f->icon_name = Qnil;
  
! /*  FRAME_W32_DISPLAY_INFO (f) = dpyinfo; */
  #ifdef MULTI_KBOARD
    FRAME_KBOARD (f) = kb;
  #endif
--- 2479,2489 ----
    if (! STRINGP (f->icon_name))
      f->icon_name = Qnil;
  
! /*   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
    FRAME_KBOARD (f) = kb;
  #endif
***************
*** 2606,2614 ****
    x_default_parameter (f, parms, Qmenu_bar_lines, make_number (1),
                       "menuBar", "MenuBar", RES_TYPE_NUMBER);
    x_default_parameter (f, parms, Qtool_bar_lines, make_number (1),
!                        "toolBar", "ToolBar", RES_TYPE_NUMBER);
    x_default_parameter (f, parms, Qbuffer_predicate, Qnil,
!                      "bufferPredicate", "BufferPredicate", RES_TYPE_SYMBOL);
    x_default_parameter (f, parms, Qtitle, Qnil,
                       "title", "Title", RES_TYPE_STRING);
    x_default_parameter (f, parms, Qfullscreen, Qnil,
--- 2609,2618 ----
    x_default_parameter (f, parms, Qmenu_bar_lines, make_number (1),
                       "menuBar", "MenuBar", RES_TYPE_NUMBER);
    x_default_parameter (f, parms, Qtool_bar_lines, make_number (1),
!                      "toolBar", "ToolBar", RES_TYPE_NUMBER);
    x_default_parameter (f, parms, Qbuffer_predicate, Qnil,
!                      "bufferPredicate", "BufferPredicate",
!                      RES_TYPE_SYMBOL);
    x_default_parameter (f, parms, Qtitle, Qnil,
                       "title", "Title", RES_TYPE_STRING);
    x_default_parameter (f, parms, Qfullscreen, Qnil,
***************
*** 3593,3599 ****
  
    FRAME_FONTSET (f)  = -1;
    f->icon_name = Qnil;
! 
  #if GLYPH_DEBUG
    image_cache_refcount = FRAME_X_IMAGE_CACHE (f)->refcount;
    dpyinfo_refcount = dpyinfo->reference_count;
--- 3597,3603 ----
  
    FRAME_FONTSET (f)  = -1;
    f->icon_name = Qnil;
! /*   FRAME_X_DISPLAY_INFO (f) = dpyinfo; */
  #if GLYPH_DEBUG
    image_cache_refcount = FRAME_X_IMAGE_CACHE (f)->refcount;
    dpyinfo_refcount = dpyinfo->reference_count;
***************
*** 4046,4051 ****
--- 4050,4058 ----
    ShowWindow (FRAME_MAC_WINDOW (f));
    BringToFront (FRAME_MAC_WINDOW (f));
    UNBLOCK_INPUT;
+ 
+   FRAME_PIXEL_WIDTH (f) = width;
+   FRAME_PIXEL_HEIGHT (f) = height;
  
    /* Draw into the window.  */
    w->must_be_updated_p = 1;