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

[Kim F. Storm]

Index: emacs/src/w32fns.c
diff -c emacs/src/w32fns.c:1.215 emacs/src/w32fns.c:1.216
*** emacs/src/w32fns.c:1.215    Mon Mar 31 16:16:55 2003
--- emacs/src/w32fns.c  Sat May 24 18:05:34 2003
***************
*** 655,662 ****
    ClientToScreen (FRAME_W32_WINDOW(f), &pt);
  
    /* Remember x_pixels_diff and y_pixels_diff.  */
!   f->output_data.w32->x_pixels_diff = pt.x - rect.left;
!   f->output_data.w32->y_pixels_diff = pt.y - rect.top;
  
    *xptr = pt.x;
    *yptr = pt.y;
--- 655,662 ----
    ClientToScreen (FRAME_W32_WINDOW(f), &pt);
  
    /* Remember x_pixels_diff and y_pixels_diff.  */
!   f->x_pixels_diff = pt.x - rect.left;
!   f->y_pixels_diff = pt.y - rect.top;
  
    *xptr = pt.x;
    *yptr = pt.y;
***************
*** 1769,1775 ****
  
    f->output_data.w32->border_pixel = pix;
  
!   if (FRAME_W32_WINDOW (f) != 0 && f->output_data.w32->border_width > 0)
      {
        if (FRAME_VISIBLE_P (f))
          redraw_frame (f);
--- 1769,1775 ----
  
    f->output_data.w32->border_pixel = pix;
  
!   if (FRAME_W32_WINDOW (f) != 0 && f->border_width > 0)
      {
        if (FRAME_VISIBLE_P (f))
          redraw_frame (f);
***************
*** 1918,1924 ****
        /* Adjust the frame size so that the client (text) dimensions
         remain the same.  This depends on FRAME_EXTERNAL_MENU_BAR being
         set correctly.  */
!       x_set_window_size (f, 0, FRAME_WIDTH (f), FRAME_HEIGHT (f));
        do_pending_window_change (0);
      }
    adjust_glyphs (f);
--- 1918,1924 ----
        /* Adjust the frame size so that the client (text) dimensions
         remain the same.  This depends on FRAME_EXTERNAL_MENU_BAR being
         set correctly.  */
!       x_set_window_size (f, 0, FRAME_COLS (f), FRAME_LINES (f));
        do_pending_window_change (0);
      }
    adjust_glyphs (f);
***************
*** 1956,1962 ****
  
    /* Don't resize the tool-bar to more than we have room for.  */
    root_window = FRAME_ROOT_WINDOW (f);
!   root_height = XINT (XWINDOW (root_window)->height);
    if (root_height - delta < 1)
      {
        delta = root_height - 1;
--- 1956,1962 ----
  
    /* Don't resize the tool-bar to more than we have room for.  */
    root_window = FRAME_ROOT_WINDOW (f);
!   root_height = WINDOW_TOTAL_LINES (XWINDOW (root_window));
    if (root_height - delta < 1)
      {
        delta = root_height - 1;
***************
*** 1987,1994 ****
    if (delta < 0)
      {
        int height = FRAME_INTERNAL_BORDER_WIDTH (f);
!       int width = PIXEL_WIDTH (f);
!       int y = nlines * CANON_Y_UNIT (f);
  
        BLOCK_INPUT;
        {
--- 1987,1994 ----
    if (delta < 0)
      {
        int height = FRAME_INTERNAL_BORDER_WIDTH (f);
!       int width = FRAME_PIXEL_WIDTH (f);
!       int y = nlines * FRAME_LINE_HEIGHT (f);
  
        BLOCK_INPUT;
        {
***************
*** 2134,2144 ****
  void x_set_scroll_bar_default_width (f)
       struct frame *f;
  {
!   int wid = FONT_WIDTH (f->output_data.w32->font);
  
!   FRAME_SCROLL_BAR_PIXEL_WIDTH (f) = GetSystemMetrics (SM_CXVSCROLL);
!   FRAME_SCROLL_BAR_COLS (f) = (FRAME_SCROLL_BAR_PIXEL_WIDTH (f) +
!                              wid - 1) / wid;
  }
  
  
--- 2134,2144 ----
  void x_set_scroll_bar_default_width (f)
       struct frame *f;
  {
!   int wid = FRAME_COLUMN_WIDTH (f);
  
!   FRAME_CONFIG_SCROLL_BAR_WIDTH (f) = GetSystemMetrics (SM_CXVSCROLL);
!   FRAME_CONFIG_SCROLL_BAR_COLS (f) = (FRAME_CONFIG_SCROLL_BAR_WIDTH (f) +
!                                     wid - 1) / wid;
  }
  
  
***************
*** 2231,2238 ****
    RECT rect;
  
    rect.left = rect.top = 0;
!   rect.right = PIXEL_WIDTH (f);
!   rect.bottom = PIXEL_HEIGHT (f);
  
    AdjustWindowRect (&rect, f->output_data.w32->dwStyle,
                    FRAME_EXTERNAL_MENU_BAR (f));
--- 2231,2238 ----
    RECT rect;
  
    rect.left = rect.top = 0;
!   rect.right = FRAME_PIXEL_WIDTH (f);
!   rect.bottom = FRAME_PIXEL_HEIGHT (f);
  
    AdjustWindowRect (&rect, f->output_data.w32->dwStyle,
                    FRAME_EXTERNAL_MENU_BAR (f));
***************
*** 2248,2255 ****
      = CreateWindow (EMACS_CLASS,
                    f->namebuf,
                    f->output_data.w32->dwStyle | WS_CLIPCHILDREN,
!                   f->output_data.w32->left_pos,
!                   f->output_data.w32->top_pos,
                    rect.right - rect.left,
                    rect.bottom - rect.top,
                    NULL,
--- 2248,2255 ----
      = CreateWindow (EMACS_CLASS,
                    f->namebuf,
                    f->output_data.w32->dwStyle | WS_CLIPCHILDREN,
!                   f->left_pos,
!                   f->top_pos,
                    rect.right - rect.left,
                    rect.bottom - rect.top,
                    NULL,
***************
*** 2259,2268 ****
  
    if (hwnd)
      {
!       SetWindowLong (hwnd, WND_FONTWIDTH_INDEX, FONT_WIDTH 
(f->output_data.w32->font));
!       SetWindowLong (hwnd, WND_LINEHEIGHT_INDEX, 
f->output_data.w32->line_height);
!       SetWindowLong (hwnd, WND_BORDER_INDEX, 
f->output_data.w32->internal_border_width);
!       SetWindowLong (hwnd, WND_SCROLLBAR_INDEX, 
f->output_data.w32->vertical_scroll_bar_extra);
        SetWindowLong (hwnd, WND_BACKGROUND_INDEX, FRAME_BACKGROUND_PIXEL (f));
  
        /* Enable drag-n-drop.  */
--- 2259,2268 ----
  
    if (hwnd)
      {
!       SetWindowLong (hwnd, WND_FONTWIDTH_INDEX, FRAME_COLUMN_WIDTH (f));
!       SetWindowLong (hwnd, WND_LINEHEIGHT_INDEX, FRAME_LINE_HEIGHT (f));
!       SetWindowLong (hwnd, WND_BORDER_INDEX, FRAME_INTERNAL_BORDER_WIDTH (f));
!       SetWindowLong (hwnd, WND_SCROLLBAR_INDEX, f->scroll_bar_actual_width);
        SetWindowLong (hwnd, WND_BACKGROUND_INDEX, FRAME_BACKGROUND_PIXEL (f));
  
        /* Enable drag-n-drop.  */
***************
*** 4014,4021 ****
    RECT rect;
  
    rect.left = rect.top = 0;
!   rect.right = PIXEL_WIDTH (f);
!   rect.bottom = PIXEL_HEIGHT (f);
  
    AdjustWindowRect (&rect, f->output_data.w32->dwStyle,
                    FRAME_EXTERNAL_MENU_BAR (f));
--- 4014,4021 ----
    RECT rect;
  
    rect.left = rect.top = 0;
!   rect.right = FRAME_PIXEL_WIDTH (f);
!   rect.bottom = FRAME_PIXEL_HEIGHT (f);
  
    AdjustWindowRect (&rect, f->output_data.w32->dwStyle,
                    FRAME_EXTERNAL_MENU_BAR (f));
***************
*** 4024,4031 ****
      = CreateWindow (EMACS_CLASS,
                    f->namebuf,
                    f->output_data.w32->dwStyle,
!                   f->output_data.w32->left_pos,
!                   f->output_data.w32->top_pos,
                    rect.right - rect.left,
                    rect.bottom - rect.top,
                    FRAME_W32_WINDOW (SELECTED_FRAME ()), /* owner */
--- 4024,4031 ----
      = CreateWindow (EMACS_CLASS,
                    f->namebuf,
                    f->output_data.w32->dwStyle,
!                   f->left_pos,
!                   f->top_pos,
                    rect.right - rect.left,
                    rect.bottom - rect.top,
                    FRAME_W32_WINDOW (SELECTED_FRAME ()), /* owner */
***************
*** 4035,4043 ****
  
    if (tip_window)
      {
!       SetWindowLong (tip_window, WND_FONTWIDTH_INDEX, FONT_WIDTH 
(f->output_data.w32->font));
!       SetWindowLong (tip_window, WND_LINEHEIGHT_INDEX, 
f->output_data.w32->line_height);
!       SetWindowLong (tip_window, WND_BORDER_INDEX, 
f->output_data.w32->internal_border_width);
        SetWindowLong (tip_window, WND_BACKGROUND_INDEX, FRAME_BACKGROUND_PIXEL 
(f));
  
        /* Tip frames have no scrollbars.  */
--- 4035,4043 ----
  
    if (tip_window)
      {
!       SetWindowLong (tip_window, WND_FONTWIDTH_INDEX, FRAME_COLUMN_WIDTH (f));
!       SetWindowLong (tip_window, WND_LINEHEIGHT_INDEX, FRAME_LINE_HEIGHT (f));
!       SetWindowLong (tip_window, WND_BORDER_INDEX, 
FRAME_INTERNAL_BORDER_WIDTH (f));
        SetWindowLong (tip_window, WND_BACKGROUND_INDEX, FRAME_BACKGROUND_PIXEL 
(f));
  
        /* Tip frames have no scrollbars.  */
***************
*** 4154,4160 ****
       Note that many default values are used.  */
  
    /* Normal video */
!   gc_values.font = f->output_data.w32->font;
  
    /* Cursor has cursor-color background, background-color foreground.  */
    gc_values.foreground = FRAME_BACKGROUND_PIXEL (f);
--- 4154,4160 ----
       Note that many default values are used.  */
  
    /* Normal video */
!   gc_values.font = FRAME_FONT (f);
  
    /* Cursor has cursor-color background, background-color foreground.  */
    gc_values.foreground = FRAME_BACKGROUND_PIXEL (f);
***************
*** 4286,4292 ****
    FRAME_CAN_HAVE_SCROLL_BARS (f) = 1;
  
    /* By default, make scrollbars the system standard width. */
!   f->scroll_bar_pixel_width = GetSystemMetrics (SM_CXVSCROLL);
  
    f->output_method = output_w32;
    f->output_data.w32 =
--- 4286,4292 ----
    FRAME_CAN_HAVE_SCROLL_BARS (f) = 1;
  
    /* By default, make scrollbars the system standard width. */
!   FRAME_CONFIG_SCROLL_BAR_WIDTH (f) = GetSystemMetrics (SM_CXVSCROLL);
  
    f->output_method = output_w32;
    f->output_data.w32 =
***************
*** 4466,4479 ****
    x_default_parameter (f, parms, Qscroll_bar_width, Qnil,
                       "scrollBarWidth", "ScrollBarWidth", RES_TYPE_NUMBER);
  
!   /* Dimensions, especially f->height, must be done via change_frame_size.
       Change will not be effected unless different from the current
!      f->height.  */
!   width = f->width;
!   height = f->height;
  
!   f->height = 0;
!   SET_FRAME_WIDTH (f, 0);
    change_frame_size (f, height, width, 1, 0, 0);
  
    /* Tell the server what size and position, etc, we want, and how
--- 4466,4479 ----
    x_default_parameter (f, parms, Qscroll_bar_width, Qnil,
                       "scrollBarWidth", "ScrollBarWidth", RES_TYPE_NUMBER);
  
!   /* Dimensions, especially FRAME_LINES (f), must be done via 
change_frame_size.
       Change will not be effected unless different from the current
!      FRAME_LINES (f).  */
!   width = FRAME_COLS (f);
!   height = FRAME_LINES (f);
  
!   FRAME_LINES (f) = 0;
!   SET_FRAME_COLS (f, 0);
    change_frame_size (f, height, width, 1, 0, 0);
  
    /* Tell the server what size and position, etc, we want, and how
***************
*** 6658,6685 ****
  x_pixel_width (f)
       register struct frame *f;
  {
!   return PIXEL_WIDTH (f);
  }
  
  int
  x_pixel_height (f)
       register struct frame *f;
  {
!   return PIXEL_HEIGHT (f);
  }
  
  int
  x_char_width (f)
       register struct frame *f;
  {
!   return FONT_WIDTH (f->output_data.w32->font);
  }
  
  int
  x_char_height (f)
       register struct frame *f;
  {
!   return f->output_data.w32->line_height;
  }
  
  int
--- 6658,6685 ----
  x_pixel_width (f)
       register struct frame *f;
  {
!   return FRAME_PIXEL_WIDTH (f);
  }
  
  int
  x_pixel_height (f)
       register struct frame *f;
  {
!   return FRAME_PIXEL_HEIGHT (f);
  }
  
  int
  x_char_width (f)
       register struct frame *f;
  {
!   return FRAME_COLUMN_WIDTH (f);
  }
  
  int
  x_char_height (f)
       register struct frame *f;
  {
!   return FRAME_LINE_HEIGHT (f);
  }
  
  int
***************
*** 7244,7251 ****
        int height = img->height + 2 * img->vmargin;
  
        if (NILP (pixels))
!       size = Fcons (make_float ((double) width / CANON_X_UNIT (f)),
!                     make_float ((double) height / CANON_Y_UNIT (f)));
        else
        size = Fcons (make_number (width), make_number (height));
      }
--- 7244,7251 ----
        int height = img->height + 2 * img->vmargin;
  
        if (NILP (pixels))
!       size = Fcons (make_float ((double) width / FRAME_COLUMN_WIDTH (f)),
!                     make_float ((double) height / FRAME_LINE_HEIGHT (f)));
        else
        size = Fcons (make_number (width), make_number (height));
      }
***************
*** 12731,12737 ****
    XSETFRAME (frame, f);
  
    buffer = Fget_buffer_create (build_string (" *tip*"));
!   Fset_window_buffer (FRAME_ROOT_WINDOW (f), buffer);
    old_buffer = current_buffer;
    set_buffer_internal_1 (XBUFFER (buffer));
    current_buffer->truncate_lines = Qnil;
--- 12731,12737 ----
    XSETFRAME (frame, f);
  
    buffer = Fget_buffer_create (build_string (" *tip*"));
!   Fset_window_buffer (FRAME_ROOT_WINDOW (f), buffer, Qnil);
    old_buffer = current_buffer;
    set_buffer_internal_1 (XBUFFER (buffer));
    current_buffer->truncate_lines = Qnil;
***************
*** 12858,12867 ****
    window_prompting = x_figure_window_size (f, parms, 0);
  
    /* No fringes on tip frame.  */
!   f->output_data.w32->fringes_extra = 0;
!   f->output_data.w32->fringe_cols = 0;
!   f->output_data.w32->left_fringe_width = 0;
!   f->output_data.w32->right_fringe_width = 0;
  
    BLOCK_INPUT;
    my_create_tip_window (f);
--- 12858,12866 ----
    window_prompting = x_figure_window_size (f, parms, 0);
  
    /* No fringes on tip frame.  */
!   f->fringe_cols = 0;
!   f->left_fringe_width = 0;
!   f->right_fringe_width = 0;
  
    BLOCK_INPUT;
    my_create_tip_window (f);
***************
*** 12876,12888 ****
    x_default_parameter (f, parms, Qcursor_type, Qbox,
                       "cursorType", "CursorType", RES_TYPE_SYMBOL);
  
!   /* Dimensions, especially f->height, must be done via change_frame_size.
       Change will not be effected unless different from the current
!      f->height.  */
!   width = f->width;
!   height = f->height;
!   f->height = 0;
!   SET_FRAME_WIDTH (f, 0);
    change_frame_size (f, height, width, 1, 0, 0);
  
    /* Add `tooltip' frame parameter's default value. */
--- 12875,12887 ----
    x_default_parameter (f, parms, Qcursor_type, Qbox,
                       "cursorType", "CursorType", RES_TYPE_SYMBOL);
  
!   /* Dimensions, especially FRAME_LINES (f), must be done via 
change_frame_size.
       Change will not be effected unless different from the current
!      FRAME_LINES (f).  */
!   width = FRAME_COLS (f);
!   height = FRAME_LINES (f);
!   FRAME_LINES (f) = 0;
!   SET_FRAME_COLS (f, 0);
    change_frame_size (f, height, width, 1, 0, 0);
  
    /* Add `tooltip' frame parameter's default value. */
***************
*** 13071,13078 ****
            }
  
          BLOCK_INPUT;
!         compute_tip_xy (f, parms, dx, dy, PIXEL_WIDTH (f),
!                         PIXEL_HEIGHT (f), &root_x, &root_y);
  
          /* Put tooltip in topmost group and in position.  */
          SetWindowPos (FRAME_W32_WINDOW (f), HWND_TOPMOST,
--- 13070,13077 ----
            }
  
          BLOCK_INPUT;
!         compute_tip_xy (f, parms, dx, dy, FRAME_PIXEL_WIDTH (f),
!                         FRAME_PIXEL_HEIGHT (f), &root_x, &root_y);
  
          /* Put tooltip in topmost group and in position.  */
          SetWindowPos (FRAME_W32_WINDOW (f), HWND_TOPMOST,
***************
*** 13120,13126 ****
  
    /* Set up the frame's root window.  */
    w = XWINDOW (FRAME_ROOT_WINDOW (f));
!   w->left = w->top = make_number (0);
  
    if (CONSP (Vx_max_tooltip_size)
        && INTEGERP (XCAR (Vx_max_tooltip_size))
--- 13119,13125 ----
  
    /* Set up the frame's root window.  */
    w = XWINDOW (FRAME_ROOT_WINDOW (f));
!   w->left_col = w->top_line = make_number (0);
  
    if (CONSP (Vx_max_tooltip_size)
        && INTEGERP (XCAR (Vx_max_tooltip_size))
***************
*** 13128,13143 ****
        && INTEGERP (XCDR (Vx_max_tooltip_size))
        && XINT (XCDR (Vx_max_tooltip_size)) > 0)
      {
!       w->width = XCAR (Vx_max_tooltip_size);
!       w->height = XCDR (Vx_max_tooltip_size);
      }
    else
      {
!       w->width = make_number (80);
!       w->height = make_number (40);
      }
  
!   f->window_width = XINT (w->width);
    adjust_glyphs (f);
    w->pseudo_window_p = 1;
  
--- 13127,13142 ----
        && INTEGERP (XCDR (Vx_max_tooltip_size))
        && XINT (XCDR (Vx_max_tooltip_size)) > 0)
      {
!       w->total_cols = XCAR (Vx_max_tooltip_size);
!       w->total_lines = XCDR (Vx_max_tooltip_size);
      }
    else
      {
!       w->total_cols = make_number (80);
!       w->total_lines = make_number (40);
      }
  
!   FRAME_TOTAL_COLS (f) = XINT (w->total_cols);
    adjust_glyphs (f);
    w->pseudo_window_p = 1;