emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] trunk r115301: Support resizing frames and windows pixelwi


From: Martin Rudalics
Subject: [Emacs-diffs] trunk r115301: Support resizing frames and windows pixelwise.
Date: Sat, 30 Nov 2013 09:26:16 +0000
User-agent: Bazaar (2.6b2)

------------------------------------------------------------
revno: 115301
revision-id: address@hidden
parent: address@hidden
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Sat 2013-11-30 10:25:31 +0100
message:
  Support resizing frames and windows pixelwise.
  
  * dispextern.h (enum window_part): Add ON_SCROLL_BAR,
  ON_RIGHT_DIVIDER and ON_BOTTOM_DIVIDER.
  (struct glyph_matrix): Replace window_left_col and
  window_top_line by window_pixel_left and window_pixel_top.
  (WINDOW_WANTS_MODELINE_P, WINDOW_WANTS_HEADER_LINE_P): Minor
  rewrite.
  (enum face_id): Add WINDOW_DIVIDER_FACE_ID.
  (draw_window_divider, move_it_to, x_draw_right_divider)
  (x_draw_bottom_divider, change_frame_size): Add or fix
  declarations.
  * dispnew.c (change_frame_size_1): Change prototype.
  (adjust_glyph_matrix, required_matrix_width)
  (adjust_frame_glyphs_for_window_redisplay): Use pixel
  values instead of lines and columns.
  (marginal_area_string): Use WINDOW_FRINGES_WIDTH instead of
  WINDOW_TOTAL_FRINGE_WIDTH.
  (handle_window_change_signal, do_pending_window_change)
  (init_display): Adjusts calls of change_frame_size.
  (change_frame_size, change_frame_size_1): Handle pixelwise
  changes.
  * frame.c (Qright_divider_width, Qbottom_divider_width): New
  Lisp objects.
  (set_menu_bar_lines_1, set_menu_bar_lines, make_frame)
  (make_terminal_frame, Fmake_terminal_frame, Fframe_parameters)
  (x_set_internal_border_width, x_set_vertical_scroll_bars)
  (x_set_scroll_bar_width, x_figure_window_size): Handle pixel
  values.
  (set_frame_param): New function.
  (Fframe_text_cols, Fframe_text_lines, Fframe_total_cols)
  (Fframe_text_width, Fframe_text_height, Fscroll_bar_width)
  (Ffringe_width, Fborder_width, Fright_divider_width)
  (Fbottom_divider_width): New functions, defsubr them.
  (Fset_frame_height, Fset_frame_width, Fset_frame_size): New
  argument pixelwise.
  (struct frame_parm_table): New members Qright_divider_width and
  Qbottom_divider_width.
  (x_set_frame_parameters): Handle parameters for pixelwise sizes.
  (x_report_frame_params): Handle Qright_divider_width and
  Qbottom_divider_width.
  (x_set_right_divider_width, x_set_bottom_divider_width): New
  functions.
  (frame_resize_pixelwise): New option.
  * frame.h (struct frame): Add tool_bar_height, menu_bar_height,
  new_pixelwise, right_divider_width and bottom_divider_width;
  remove total_lines; rename text_lines, text_cols, new_text_lines
  and new_text_cols to text_height, text_width, new_height and
  new_width respectively.
  (FRAME_LINES, FRAME_COLS): Rename to FRAME_TEXT_HEIGHT and
  FRAME_TEXT_WIDTH respectively.
  (FRAME_MENU_BAR_HEIGHT, FRAME_TOOL_BAR_HEIGHT)
  (FRAME_RIGHT_DIVIDER_WIDTH, FRAME_BOTTOM_DIVIDER_WIDTH)
  (FRAME_TEXT_TO_PIXEL_WIDTH, FRAME_PIXEL_TO_TEXT_WIDTH): New
  macros.
  (FRAME_TOP_MARGIN_HEIGHT, FRAME_LEFT_SCROLL_BAR_AREA_WIDTH)
  (FRAME_RIGHT_SCROLL_BAR_AREA_WIDTH, FRAME_SCROLL_BAR_AREA_WIDTH)
  (SET_FRAME_COLS, SET_FRAME_WIDTH, SET_FRAME_HEIGHT)
  (FRAME_TEXT_COLS_TO_PIXEL_WIDTH, FRAME_PIXEL_WIDTH_TO_TEXT_COLS)
  (FRAME_TEXT_COLS_TO_PIXEL_WIDTH): Rewrite macros.
  (FRAME_TOTAL_COLS_ARG): Remove macro.
  * fringe.c (draw_fringe_bitmap_1): Handle right divder.
  * gtkutil.c (xg_frame_resized, xg_frame_set_char_size)
  (x_wm_set_size_hint): Handle frame pixel sizes.
  * indent.c (compute_motion, Fcompute_motion): Call
  window_body_width instead of window_body_cols.
  * keyboard.c (Qright_divider, Qbottom_divider): New symbols.
  (make_lispy_position): Handle right and bottom dividers.
  (Fsuspend_emacs): Pixelize call of change_frame_size.
  * keyboard.h: Extern Qright_divider, Qbottom_divider.
  * lisp.h: Extern set_frame_param.
  * nsfns.m (x_set_tool_bar_lines): Pixelize call of
  x_set_window_size.
  (Fx_create_frame): Add entry for vertical_drag_cursor.  Pixelize
  call of change_frame_size.
  * nsterm.h (struct ns_output): Add vertical_drag_cursor.
  * nsterm.m (ns_update_window_end): Optionally draw right
  divider.
  (x_set_window_size): Add argument pixelwise.  Call
  check_frame_size and change_frame_size with pixelwise zero.
  (ns_draw_window_divider): New function.
  (ns_redisplay_interface): Add ns_draw_window_divider.
  (updateFrameSize:): Call change_frame_size with pixelwise zero.
  (x_new_font): Call x_set_window_size with pixelwise zero.
  * print.c (print_object): For a window print its sequence
  number again.
  * term.c (Fresume_tty): Pixelize call of change_frame_size.
  * w32fns.c (x_set_mouse_color): Handle vertical drag cursor.
  (x_set_menu_bar_lines, x_set_tool_bar_lines): Calculate pixelwise.
  (w32_createwindow): Use scroll bar area width.
  (w32_wnd_proc): Handle bottom divider width.  For
  WM_WINDOWPOSCHANGING return zero if we resize pixelwise.
  (Fx_create_frame): Default divider width parameters.  Caclulate
  sizes pixelwise.  Add vertical drag cursor support.
  (x_create_tip_frame): Default divider widths to zero.  Pixelize
  call to change_frame_size.
  (Fx_show_tip): Add handling of divider widths.  Pixelize window
  position and sizes.
  (Fw32_frame_rect): New function.
  (frame_parm_handler w32_frame_parm_handlers): Add divider
  widths.
  (Vx_window_vertical_drag_shape): Add variable.
  * w32inevt.c (resize_event, maybe_generate_resize_event):
  Pixelize change_frame_size calls.
  * w32menu.c (set_frame_menubar): Pixelize x_set_window_size
  call.
  * w32term.c (w32_draw_window_divider): New function.
  (x_update_window_end): Handle right divider.
  (w32_draw_fringe_bitmap, x_scroll_run)
  (w32_set_vertical_scroll_bar): Pixelize scrollbar widths.
  (w32_read_socket): Handle SIZE_MAXIMIZED separately.  Calculate
  new frame sizes pixelwise.
  (x_new_font): Pixelize call to x_set_window_size.
  (x_check_fullscreen): Pixelize call to change_frame_size.
  (x_set_window_size_1, x_set_window_size): New argument
  pixelwise.  Calculate pixelwise.
  (x_wm_set_size_hint): Use scroll bar area width.
  (w32_redisplay_interface): Add w32_draw_window_divider.
  * w32term.h (struct w32_output): Add vertical drag cursor.
  * widget.c (set_frame_size, update_wm_hints)
  (EmacsFrameResize, EmacsFrameSetValues): Pixelize calls of
  change_frame_size.
  (EmacsFrameSetCharSize): Pixelize call of x_set_window_size.
  * window.c (sequence_number): Restore.
  (Fwindow_pixel_width, Fwindow_pixel_height)
  (Fwindow_mode_line_height, Fwindow_header_line_height)
  (window_pixel_to_total, Frun_window_scroll_functions)
  (Fset_window_new_pixel, window_resize_apply_total)
  (Fwindow_resize_apply_total): New functions.
  (window_body_height, window_body_width): Rename from
  window_body_lines.  New argument PIXELWISE.  Calculate
  pixelwise.
  (Fwindow_body_height, Fwindow_body_width): New argument
  PIXELWISE.
  (coordinates_in_window, window_relative_x_coord): Use window's
  pixel width instead of total width.
  (replace_window, recombine_windows): Initialize pixel values.
  (resize_root_window, resize_frame_windows, grow_mini_window)
  (shrink_mini_window): New argument PIXELWISE.  Calculate
  pixelwise.
  (Fdelete_other_windows_internal, adjust_window_margins)
  (window_resize_check, window_resize_apply)
  (Fdelete_window_internal, Fresize_mini_window_internal)
  (Fwindow_text_width, Fwindow_text_height): Calculate pixelwise.
  (check_frame_size): Rename arguments.  New argument PIXELWISE.
  Calculate pixelwise.
  (set_window_buffer): Make samebuf bool.  Run configuration change
  hook only if buffer changed.
  (Fset_window_buffer): Rewrite doc-string.
  (make_window): Initialize new_pixel slot.
  (Fwindow_resize_apply): Check pixel size of root window.
  (Fsplit_window_internal): Call 2nd argument pixel_size.
  Calculate pixelwise.
  (Fscroll_left, Fscroll_right): Call window_body_width instead of
  window_body_cols.
  (save_window_data): New slots frame_text_width,
  frame_text_height, frame_menu_bar_height, frame_tool_bar_height.
  (saved_window): New slots pixel_left, pixel_top, pixel_height,
  pixel_width.
  (Fcurrent_window_configuration, Fset_window_configuration)
  (save_window_save, compare_window_configurations): Handle new
  slots in save_window_data and saved_window.
  (Fset_window_scroll_bars): Fix doc-string.
  (window_resize_pixelwise): New variable.
  (coordinates_in_window, Fcoordinates_in_window_p): Handle
  dividers.
  (make_parent_window): Adjust sequence_number.
  (Fwindow_right_divider_width, Fwindow_bottom_divider_width): New
  functions.
  * window.h (struct window): New members new_pixel, pixel_left,
  pixel_top, pixel_width, pixel_height.  Restore sequence_number.
  (wset_new_pixel): New function.
  (WINDOW_PIXEL_WIDTH, WINDOW_PIXEL_HEIGHT)
  (MIN_SAFE_WINDOW_PIXEL_WIDTH, MIN_SAFE_WINDOW_PIXEL_HEIGHT)
  (WINDOW_LEFT_PIXEL_EDGE, WINDOW_RIGHT_PIXEL_EDGE)
  (WINDOW_TOP_PIXEL_EDGE, WINDOW_BOTTOM_PIXEL_EDGE)
  (WINDOW_BOTTOMMOST_P, WINDOW_BOX_LEFT_PIXEL_EDGE)
  (WINDOW_BOX_RIGHT_PIXEL_EDGE, WINDOW_MARGINS_COLS)
  (WINDOW_MARGINS_WIDTH, WINDOW_RIGHT_DIVIDER_WIDTH)
  (WINDOW_BOTTOM_DIVIDER_WIDTH): New macros.
  (WINDOW_TOTAL_FRINGE_WIDTH): Rename to WINDOW_FRINGES_WIDTH.
  (WINDOW_TOTAL_WIDTH, WINDOW_TOTAL_HEIGHT): Remove macros.
  (WINDOW_RIGHT_EDGE_X, WINDOW_LEFT_EDGE_X, WINDOW_TOP_EDGE_Y)
  (WINDOW_BOTTOM_EDGE_Y, WINDOW_FULL_WIDTH_P, WINDOW_LEFTMOST_P)
  (WINDOW_RIGHTMOST_P, WINDOW_BOX_LEFT_EDGE_X)
  (WINDOW_BOX_RIGHT_EDGE_X, WINDOW_FRINGE_COLS)
  (WINDOW_BOX_HEIGHT_NO_MODE_LINE, WINDOW_BOX_TEXT_HEIGHT):
  Rewrite.
  (resize_frame_windows, grow_mini_window, shrink_mini_window)
  (window_body_width, check_frame_size): Adapt external declarations.
  * xdisp.c (last_max_ascent): New integer.
  (window_text_bottom_y): Handle bottom divider.
  (window_box_width, window_box_height): Calculate pixelwise.
  (get_glyph_string_clip_rects): Handle right divider.
  (remember_mouse_glyph): When windows are resized pixelwise
  proceed with width and height set to 1.
  (init_iterator): Use WINDOW_PIXEL_WIDTH instead of
  WINDOW_TOTAL_WIDTH.
  (move_it_to): Calculate and return maximum x position
  encountered.
  (Fwindow_text_pixel_size): New function.
  (resize_mini_window, update_tool_bar): Calculate pixelwise.
  (tool_bar_lines_needed): Rename to tool_bar_height.  Calculate
  pixelwise.
  (Ftool_bar_lines_needed): Rename to Ftool_bar_height.  Calculate
  pixelwise.
  (redisplay_tool_bar): Calculate pixelwise.
  (redisplay_window): Calculate pixelwise.  Handle dividers.
  (draw_glyphs, x_clear_end_of_line, note_mouse_highlight)
  (x_draw_vertical_border): Handle dividers.
  (define_frame_cursor1): Handle vertical drag cursor.
  (x_draw_right_divider, x_draw_bottom_divider): New functions.
  (expose_window): Calculate pixelwise.  Handle dividers.
  (init_xdisp): Initialize pixel values.
  * xfaces.c (Qwindow_divider): New face.
  (realize_basic_faces): Realize it.
  * xfns.c (x_set_mouse_color): Handle vertical_drag_cursor.
  (x_set_menu_bar_lines, x_set_tool_bar_lines): Calculate pixelwise.
  (x_set_scroll_bar_default_width): Default actual width to 16.
  (Fx_create_frame): Set sizes pixelwise.
  (x_create_tip_frame): Default divider widths to zero.  Pixelize
  call of change_frame_size.
  (Fx_show_tip): Handle divider widths.  Initial pixel position
  and sizes.
  (frame_parm_handler x_frame_parm_handlers): Add divider widths.
  (Vx_window_vertical_drag_shape): New option.
  * xmenu.c (free_frame_menubar): Pixelize call of
  x_set_window_size.
  * xterm.c (x_draw_window_divider): New function.
  (x_update_window_end): Optionally draw right divider.
  (x_draw_fringe_bitmap, x_scroll_run, x_scroll_bar_create)
  (XTset_vertical_scroll_bar): Use scroll bar pixel width.
  (handle_one_xevent, x_new_font): Calculate pixelwise.
  (x_set_window_size_1, x_set_window_size): New argument
  pixelwise.  Calculate pixelwise.
  (x_wm_set_size_hint): Pixelize call of check_frame_size.
  (struct x_redisplay_interface): Add x_draw_window_divider.
  * xterm.h (struct x_output): Add vertical_drag_cursor.
  
  * cus-start.el (frame-resize-pixelwise)
  (window-resize-pixelwise): New entries.
  * emacs-lisp/debug.el (debug): Use window-total-height instead
  of window-total-size.
  * frame.el (tool-bar-lines-needed): Defalias to tool-bar-height.
  * help.el (describe-bindings-internal): Call help-buffer
  (temp-buffer-max-width): New option.
  (resize-temp-buffer-window, help-window-setup)
  (with-help-window): Rewrite.
  * mouse.el (mouse-drag-line): Rewrite.  Add key bindings for
  dragging dividers.
  * window.el (frame-char-size, window-min-pixel-height)
  (window-safe-min-pixel-height, window-safe-min-pixel-width)
  (window-min-pixel-width, window-safe-min-pixel-size)
  (window-combination-p, window-safe-min-size)
  (window-resizable-p, window--size-to-pixel)
  (window--pixel-to-size, window--resize-apply-p): New functions.
  (window-safe-min-height): Fix doc-string.
  (window-size, window-min-size, window--min-size-1)
  (window-sizable, window-sizable-p, window--min-delta-1)
  (window-min-delta, window--max-delta-1, window-max-delta)
  (window--resizable, window--resizable-p, window-resizable)
  (window-full-height-p, window-full-width-p, window-at-side-p)
  (window--in-direction-2, window-in-direction)
  (window--resize-reset-1, window--resize-mini-window)
  (window-resize, window-resize-no-error)
  (window--resize-child-windows-normal)
  (window--resize-child-windows, window--resize-siblings)
  (window--resize-this-window, window--resize-root-window)
  (window--resize-root-window-vertically)
  (adjust-window-trailing-edge, enlarge-window, shrink-window)
  (maximize-window, minimize-window, delete-window)
  (quit-restore-window, window-split-min-size, split-window)
  (balance-windows-2, balance-windows)
  (balance-windows-area-adjust, balance-windows-area)
  (window--state-get-1, window-state-get, window--state-put-1)
  (window--state-put-2, window-state-put)
  (display-buffer-record-window, window--display-buffer): Make
  functions handle pixelwise sizing of windows.
  (display-buffer--action-function-custom-type)
  (display-buffer-fallback-action): Add
  display-buffer-in-previous-window.
  (display-buffer-use-some-window): Resize window to height it had
  before.
  (fit-window-to-buffer-horizontally): New option.
  (fit-frame-to-buffer): Describe new values.
  (fit-frame-to-buffer-bottom-margin): Replace with
  fit-frame-to-buffer-margins.
  (window--sanitize-margin): New function.
  (fit-frame-to-buffer, fit-window-to-buffer): Rewrite completely
  using window-text-pixel-size.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/cus-start.el              
cusstart.el-20091113204419-o5vbwnq5f7feedwu-1100
  lisp/emacs-lisp/debug.el       debug.el-20091113204419-o5vbwnq5f7feedwu-398
  lisp/frame.el                  frame.el-20091113204419-o5vbwnq5f7feedwu-275
  lisp/help.el                   help.el-20091113204419-o5vbwnq5f7feedwu-280
  lisp/mouse.el                  mouse.el-20091113204419-o5vbwnq5f7feedwu-123
  lisp/window.el                 window.el-20091113204419-o5vbwnq5f7feedwu-94
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/dispextern.h               
dispextern.h-20091113204419-o5vbwnq5f7feedwu-218
  src/dispnew.c                  dispnew.c-20091113204419-o5vbwnq5f7feedwu-258
  src/frame.c                    frame.c-20091113204419-o5vbwnq5f7feedwu-243
  src/frame.h                    frame.h-20091113204419-o5vbwnq5f7feedwu-229
  src/fringe.c                   fringe.c-20091113204419-o5vbwnq5f7feedwu-2965
  src/gtkutil.c                  gtkutil.c-20091113204419-o5vbwnq5f7feedwu-2527
  src/indent.c                   indent.c-20091113204419-o5vbwnq5f7feedwu-181
  src/keyboard.c                 keyboard.c-20091113204419-o5vbwnq5f7feedwu-449
  src/keyboard.h                 keyboard.h-20091113204419-o5vbwnq5f7feedwu-450
  src/lisp.h                     lisp.h-20091113204419-o5vbwnq5f7feedwu-253
  src/nsfns.m                    nsfns.m-20091113204419-o5vbwnq5f7feedwu-8741
  src/nsterm.h                   nsterm.h-20091113204419-o5vbwnq5f7feedwu-8746
  src/nsterm.m                   nsterm.m-20091113204419-o5vbwnq5f7feedwu-8747
  src/print.c                    print.c-20091113204419-o5vbwnq5f7feedwu-262
  src/term.c                     term.c-20091113204419-o5vbwnq5f7feedwu-220
  src/w32fns.c                   w32fns.c-20091113204419-o5vbwnq5f7feedwu-945
  src/w32inevt.c                 w32inevt.c-20091113204419-o5vbwnq5f7feedwu-813
  src/w32menu.c                  w32menu.c-20091113204419-o5vbwnq5f7feedwu-947
  src/w32term.c                  w32term.c-20091113204419-o5vbwnq5f7feedwu-950
  src/w32term.h                  w32term.h-20091113204419-o5vbwnq5f7feedwu-954
  src/widget.c                   widget.c-20091113204419-o5vbwnq5f7feedwu-676
  src/window.c                   window.c-20091113204419-o5vbwnq5f7feedwu-231
  src/window.h                   window.h-20091113204419-o5vbwnq5f7feedwu-271
  src/xdisp.c                    xdisp.c-20091113204419-o5vbwnq5f7feedwu-240
  src/xfaces.c                   xfaces.c-20091113204419-o5vbwnq5f7feedwu-560
  src/xfns.c                     xfns.c-20091113204419-o5vbwnq5f7feedwu-274
  src/xmenu.c                    xmenu.c-20091113204419-o5vbwnq5f7feedwu-161
  src/xterm.c                    xterm.c-20091113204419-o5vbwnq5f7feedwu-244
  src/xterm.h                    xterm.h-20091113204419-o5vbwnq5f7feedwu-228
Diff too large for email (10621 lines, the limit is 10000).

reply via email to

[Prev in Thread] Current Thread [Next in Thread]