1. 25 Jul, 2014 1 commit
    • Dmitry Antipov's avatar
      Move hourglass machinery to RIF. · 88cd403c
      Dmitry Antipov authored
      * dispextern.h (struct redisplay_interface): New members
      show_hourglass and hide_hourglass.  Indent comments.
      (show_hourglass, hide_hourglass): Remove prototypes.
      * nsterm.m (show_hourgass, hide_hourglass): Refactor to ...
      (ns_show_hourglass, ns_hide_hourglass): ... new no-ops.
      (ns_redisplay_interface): Add them.
      * w32fns.c (show_hourglass, hide_hourglass): Refactor to ...
      * w32term.c (w32_show_hourglass, w32_hide_hourglass): ... these.
      (w32_arrow_cursor): New function to hack around non-GUI frames.
      (w32_redisplay_interface): Add new functions.
      * w32term.h (w32_arror_cursor): Add prototype.
      * xdisp.c (show_hourglass): New function, refactored out from
      platform-dependend code.
      (cancel_hourglass): Now call to RIF function.
      * xfns.c (show_hourglass, hide_hourglass): Refactor to ...
      * xterm.c (x_show_hourglass, x_hide_hourglass): ... these.
      (x_redisplay_interface): Add new functions.
      88cd403c
  2. 28 May, 2014 1 commit
    • Dmitry Antipov's avatar
      Refactor mouse positioning stuff to avoid code duplication. · 2b511374
      Dmitry Antipov authored
      * frame.h (frame_char_to_pixel_position): New function.
      (x_set_mouse_position): Rename to...
      (frame_set_mouse_position): ...new function.
      (frame_set_mouse_pixel_position): Add prototype.
      * nsterm.m, w32term.c, xterm.c (x_set_mouse_pixel_position):
      Rename to frame_set_mouse_pixel_position.
      * frame.c (Fset_mouse_pixel_position, Fset_mouse_position):
      Adjust users.
      * xterm.h, w32term.h ( x_set_mouse_position)
      (x_set_mouse_pixel_position): Remove prototypes.
      2b511374
  3. 04 Feb, 2014 2 commits
    • Eli Zaretskii's avatar
      Fix bug #16636 with simple dialogs on MS-Windows. · e139a33c
      Eli Zaretskii authored
       src/w32menu.c (w32_popup_dialog): Don't condition the whole function
       on HAVE_DIALOGS.  If the dialog is "simple", pop up a message box
       to show it; otherwise return 'unsupported--w32-dialog' to signal
       to the caller that emulation with menus is necessary.  This
       resurrects code inadvertently deleted by the 2013-10-08 commit.
       (syms_of_w32menu): DEFSYM Qunsupported__w32_dialog.
       src/w32term.h (w32_popup_dialog): Prototype is no longer conditioned
       by HAVE_DIALOGS.
       src/menu.c (Fx_popup_dialog): Don't condition the call to
       w32_popup_dialog on HAVE_DIALOGS.  If w32_popup_dialog returns a
       special symbol 'unsupported--w32-dialog', emulate the dialog with
       a menu by calling x-popup-menu.
       src/menu.h (Qunsupported__w32_dialog): New extern variable.
      e139a33c
    • Martin Rudalics's avatar
      Improve window dividers code. · 764ec9e5
      Martin Rudalics authored
      * faces.el (window-divider): New default value.  Rewrite
      doc-string.
      (window-divider-first-pixel, window-divider-last-pixel): New
      faces.
      * dispextern.h (face_id): Add WINDOW_DIVIDER_FIRST_PIXEL_FACE_ID
      and WINDOW_DIVIDER_LAST_PIXEL_FACE_ID.
      * w32term.c (w32_draw_window_divider): Handle first and last
      pixels specially.
      * w32term.h (w32_fill_area_abs): New function.
      * xdisp.c (x_draw_right_divider): Don't draw over bottom
      divider.
      * xfaces.c (realize_basic_faces): Handle new face ids.
      * xfns.c (Fx_create_frame): Call x_default_parameter for right
      and bottom divider width.
      * xterm.c (x_draw_window_divider): Handle first and last pixels
      specially.
      764ec9e5
  4. 01 Jan, 2014 1 commit
  5. 21 Dec, 2013 1 commit
    • YAMAMOTO Mitsuharu's avatar
      Remove fringe background extension code on W32. · 5b2b60f0
      YAMAMOTO Mitsuharu authored
      * w32term.h (struct scroll_bar): Remove member `fringe_extended_p'.
      
      * w32term.c (w32_draw_fringe_bitmap, x_scroll_run): Remove code for
      fringe background extension.
      (x_scroll_bar_create): Remove variables `sb_left' and `sb_width',
      because they are now always the same as `left' and `width',
      respectively.  Remove code for the case that `width' and
      `sb_width' are different.
      5b2b60f0
  6. 20 Dec, 2013 1 commit
    • Martin Rudalics's avatar
      Some more fixes for pixelwise resizing. · c44de18d
      Martin Rudalics authored
      Remove scroll_bar_actual_width from frames.
      * frame.h (struct frame): Remove scroll_bar_actual_width slot.
      * frame.c (Fscroll_bar_width): Return scroll bar area width.
      (x_figure_window_size):
      * nsterm.m (x_set_window_size):
      * widget.c (set_frame_size):
      * w32term.c (x_set_window_size):
      * xterm.c (x_set_window_size, x_set_window_size_1): Don't set
      scroll_bar_actual_width.
      
      Convert scroll_bar members to integers on Windows.
      * w32term.h (struct scroll_bar): Convert top, left, width,
      height, start, end and dragging to integers.
      * w32fns.c (w32_createscrollbar): Remove XINT conversions for
      scroll_bar members.
      * w32term.c (w32_set_scroll_bar_thumb)
      (w32_scroll_bar_handle_click): Remove XINT conversions for
      scroll_bar members.  Treat bar->dragging as integer.
      (x_scroll_bar_create): Call ALLOCATE_PSEUDOVECTOR with "top" as
      first element.  Remove XINT conversions for scroll_bar members.
      (w32_set_vertical_scroll_bar, x_scroll_bar_report_motion):
      Remove XINT conversions for scroll_bar members.
      
      Fix assignment for new window total sizes.
      * window.c (Fwindow_resize_apply_total): Assign values for
      minibuffer window.
      * window.el (window--pixel-to-size): Remove function.
      (window--pixel-to-total-1, window--pixel-to-total): Fix
      calculation of new total sizes.
      c44de18d
  7. 02 Dec, 2013 1 commit
  8. 30 Nov, 2013 1 commit
    • Martin Rudalics's avatar
      Support resizing frames and windows pixelwise. · 880e6158
      Martin Rudalics authored
      * 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.
      880e6158
  9. 28 Nov, 2013 1 commit
    • Eli Zaretskii's avatar
      Fix bug #15933 with crashes in file-notify-tests on MS-Windows. · 9c099ca7
      Eli Zaretskii authored
       Support w32 file notifications in batch mode.
       src/w32proc.c (sys_select): Don't wait on interrupt_handle if it is
       invalid (which happens in batch mode).  If non-interactive, call
       handle_file_notifications to store file notification events in the
       input queue.
       src/w32notify.c (send_notifications): Handle FRAME_INITIAL frames as
       well.
       src/w32inevt.c (handle_file_notifications): Now external, not
       static.
       src/w32term.h (handle_file_notifications): Provide prototype.
       src/emacs.c (main) [HAVE_W32NOTIFY]: When non-interactive, call
       init_crit, since init_display, which does that otherwise, is not
       called.
      9c099ca7
  10. 29 Oct, 2013 1 commit
    • Dmitry Antipov's avatar
      * xterm.h (struct x_output): For 'black_relief' and 'white_relief' · 0085b9be
      Dmitry Antipov authored
      fields, drop 'allocated_p' member and use -1 for uninitialized value.
      * w32term.h (struct w32_output): Similarly but do not use -1 because...
      * xfaces.c (unload_color) [HAVE_X_WINDOWS]: ...this function is a no-op
      on MS-Windows anyway.
      (free_face_colors): Define only if HAVE_X_WINDOWS and...
      (free_realized_face): ...adjust user.
      * xfns.c (Fx_create_frame, x_create_tip_frame): Initialize black and
      white relief pixels to -1.
      * xterm.c (x_setup_relief_color, x_free_frame_resources): Adjust users.
      * w32term.c (w32_setup_relief_color, x_free_frame_resources): Likewise.
      * dispextern.h (unload_color): Move prototype under HAVE_X_WINDOWS.
      0085b9be
  11. 18 Oct, 2013 1 commit
    • Dmitry Antipov's avatar
      Remove port-specific display name lists to avoid extra · d141d701
      Dmitry Antipov authored
      complexity and data duplication with display info lists.
      * xterm.h (x_display_name_list): Remove declaration.
      * xterm.c (x_display_name_list): Remove.
      (x_term_init, x_delete_display, syms_of_xterm): Adjust users.
      * xfns.c (x_display_info_for_name, Fx_display_list):
      Likewise.  Use x_display_list where appropriate.
      * w32term.h (w32_display_name_list): Remove declaration.
      * w32term.c (w32_display_name_list): Remove.
      (w32_initialize_display_info, x_delete_display, syms_of_w32term):
      Adjust users.
      * w32fns.c (x_display_info_for_name, Fx_display_list):
      Likewise.  Use x_display_list where appropriate.
      * nsterm.h (ns_display_name_list): Remove declaration.
      * nsterm.m (ns_display_name_list): Remove.
      (ns_term_init, syms_of_nsterm): Adjust users.
      * nsfns.m (ns_display_info_for_name, Fx_display_list):
      Likewise.  Use x_display_list where appropriate.
      * termhooks.h (TERMINAL_FONT_CACHE): New macro.
      * alloc.c (toplevel) [HAVE_WINDOW_SYSTEM]: Include TERM_HEADER.
      (mark_terminals): Mark per-terminal font cache.
      d141d701
  12. 29 Sep, 2013 1 commit
  13. 19 Sep, 2013 1 commit
    • Dmitry Antipov's avatar
      * xterm.h (struct x_display_info): New members last_mouse_glyph_frame, · ced135eb
      Dmitry Antipov authored
      last_mouse_scroll_bar, last_mouse_glyph and last_mouse_movement_time,
      going to replace static variables below.  Adjust comments.
      * xterm.c (last_mouse_glyph, last_mouse_glyph_frame)
      (last_mouse_scroll_bar, last_mouse_movement_time): Remove.
      (note_mouse_movement, XTmouse_position, x_scroll_bar_note_movement)
      (x_scroll_bar_report_motion, handle_one_xevent, syms_of_xterm):
      Related users changed.
      * w32term.h (struct w32_display_info): New members last_mouse_glyph_frame,
      last_mouse_scroll_bar, last_mouse_scroll_bar_pos, last_mouse_glyph and
      last_mouse_movement_time, going to replace static variables below.
      Adjust comments.
      * w32term.c (last_mouse_glyph_frame, last_mouse_scroll_bar)
      (last_mouse_scroll_bar_pos, last_mouse_glyph, last_mouse_movement_time):
      Remove.
      (note_mouse_movement, w32_mouse_position, w32_scroll_bar_handle_click)
      (x_scroll_bar_report_motion, syms_of_w32term): Related users changed.
      * nsterm.h (struct ns_display_info): New members last_mouse_glyph,
      last_mouse_movement_time and last_mouse_scroll_bar, going to replace
      static variables below.
      * nsterm.m (last_mouse_glyph, last_mouse_movement_time)
      (last_mouse_scroll_bar): Remove.
      (note_mouse_movement, ns_mouse_position, mouseMoved, mouseEntered)
      (mouseExited): Related users changed.
      ced135eb
  14. 18 Sep, 2013 3 commits
    • Dmitry Antipov's avatar
      * frame.c (x_redo_mouse_highlight): New function · 18da0d8a
      Dmitry Antipov authored
      to factor out common code used in W32 and X ports.
      * dispextern.h (x_redo_mouse_highlight): Add prototype.
      * xterm.h (struct x_display_info):
      * w32term.h (struct w32_display_info):
      * nsterm.h (struct ns_display_info): New members
      last_mouse_motion_frame, last_mouse_motion_x and
      last_mouse_motion_y, going to replace static variables below.
      * xterm.c (last_mouse_motion_event, last_mouse_motion_frame)
      (redo_mouse_highlight): Remove.
      (note_mouse_movement, syms_of_xterm): Adjust user.
      (handle_one_xevent): Likewise.  Use x_redo_mouse_highlight.
      * w32term.c (last_mouse_motion_event, last_mouse_motion_frame)
      (redo_mouse_highlight): Remove.
      (note_mouse_movement, syms_of_w32term): Adjust user.
      (w32_read_socket): Likewise.  Use x_redo_mouse_highlight.
      * nsterm.m (last_mouse_motion_position, last_mouse_motion_frame):
      Remove.
      (note_mouse_movement, mouseMoved, syms_of_nsterm):
      * nsfns.m (compute_tip_xy): Adjust user.
      18da0d8a
    • Eli Zaretskii's avatar
      28a16449
    • Dmitry Antipov's avatar
      * frame.c (x_mouse_grabbed): New function. · 7a0c745a
      Dmitry Antipov authored
      * dispextern.h (x_mouse_grabbed): Add prototype.
      (last_mouse_frame): Remove declaration.
      * xterm.h (struct x_display_info):
      * w32term.h (struct w32_display_info):
      * nsterm.h (struct ns_display_info): New member
      last_mouse_frame, going to replace...
      * xdisp.c (last_mouse_frame): ...global variable.
      (note_tool_bar_highlight):
      * w32term.c (w32_mouse_position, w32_read_socket):
      * xterm.c (XTmouse_position, handle_one_xevent):
      Use x_mouse_grabbed.
      * nsterm.m (ns_mouse_position, mouseDown): Adjust user.
      7a0c745a
  15. 17 Sep, 2013 1 commit
    • Dmitry Antipov's avatar
      * xterm.h (struct x_display_info): New member · baed3603
      Dmitry Antipov authored
      x_pending_autoraise_frame, going to replace...
      * xterm.c (pending_autoraise_frame): ...static variable.
      (x_new_focus_frame, XTread_socket): Adjust users.
      * w32term.h (struct w32_display_info): New member
      w32_pending_autoraise_frame, going to replace...
      * w32term.c (pending_autoraise_frame): ...global variable.
      (x_new_focus_frame, w32_read_socket): Adjust users.
      baed3603
  16. 15 Sep, 2013 3 commits
  17. 13 Sep, 2013 2 commits
    • Dmitry Antipov's avatar
      Unify Fx_focus_frame between all ports. · fcd42c11
      Dmitry Antipov authored
      * src/frame.h (x_focus_frame): New prototype.
      * src/xfns.c (Fx_focus_frame): Remove.
      (syms_of_xfns): Do not defsubr it.
      (x_focus_frame): X implementation.
      * src/nsfns.m (Fx_focus_frame): Remove.
      (syms_of_nsfns): Do not defsubr it.
      (x_focus_frame): NS implementation.
      * src/w32term.c (Fx_focus_frame): Remove.
      (x_focus_on_frame): Rename to...
      (x_focus_frame): W32 implementation.
      * src/w32term.h (x_focus_on_frame): Remove prototype.
      * src/w32fns.c (Fx_focus_frame): Remove.
      (syms_of_w32fns): Do not defsubr it.
      * src/frame.c (Fx_focus_frame): Define here.
      (syms_of_frame): Defsubr here.
      * src/gtkutil.c (xg_tool_bar_callback): Use x_focus_frame.
      * lisp/frame.el (x-focus-frame): Mark as declared in frame.c.
      fcd42c11
    • Dmitry Antipov's avatar
      Unify FRAME_window_system_DISPLAY_INFO macros between all ports. · aad3612f
      Dmitry Antipov authored
      All of them are replaced with FRAME_DISPLAY_INFO, defined in
      each port to reference the port-specific window system data.
      * msdos.h (FRAME_X_DISPLAY_INFO): Remove.
      (FRAME_DISPLAY_INFO): Define.
      * w32term.h (FRAME_W32_DISPLAY_INFO, FRAME_X_DISPLAY_INFO): Remove.
      (FRAME_DISPLAY_INFO): Define.  Adjust users.
      * xterm.h (FRAME_X_DISPLAY_INFO): Remove.
      (FRAME_DISPLAY_INFO): Define.  Adjust users.
      * frame.h (FRAME_RES_X, FRAME_RES_Y): Unify.
      * font.c, frame.c, gtkutil.c, image.c, menu.c, msdos.c, nsfns.m:
      * nsfont.m, nsterm.m, w32fns.c, w32font.c, w32menu.c, w32term.c:
      * w32xfns.c, widget.c, xdisp.c, xfaces.c, xfns.c, xfont.c, xmenu.c:
      * xselect.c, xterm.c: All related users changed.
      aad3612f
  18. 09 Sep, 2013 1 commit
  19. 13 Aug, 2013 2 commits
    • Eli Zaretskii's avatar
      Fix the Windows build broken by 2013-08-13T15:29:25Z!dmantipov@yandex.ru. · 2fa611b7
      Eli Zaretskii authored
       src/window.c (Fwindow_margins): Return nil when there's no marginal
       area, as per the documented API.
       src/w32term.c (x_scroll_bar_create): Use ALLOCATE_PSEUDOVECTOR, not
       Fmake_vector, as scroll bar's struct members are not all Lisp
       objects now.  This avoids crashes in GC.
       src/w32term.h (struct scroll_bar): Convert fringe_extended_p to a
       bool, so its address could be taken.
      2fa611b7
    • Dmitry Antipov's avatar
      * window.h (WINDOW_FRINGE_EXTENDED_P): New macro. · c8ae93b0
      Dmitry Antipov authored
      * nsterm.m (ns_set_vertical_scroll_bar): Use it.  Use convenient
      bool instead of BOOL.
      * w32term.h (struct scroll_bar): Convert fringe_extended_p
      from Lisp_Object to bitfield.  Adjust comment.
      * w32term.c (x_scroll_bar_create): Adjust user.
      Use WINDOW_FRINGE_EXTENDED_P and bool for boolean.
      * xterm.c (XTset_vertical_scroll_bar): Likewise.
      Use bool for boolean.
      * xterm.h (struct scroll_bar): Prefer commonly used `unsigned'
      to `unsigned int' when defining a bitfield.
      c8ae93b0
  20. 03 Aug, 2013 1 commit
    • Dmitry Antipov's avatar
      Drop FRAME_PTR typedef. · a10c8269
      Dmitry Antipov authored
      * composite.c, font.c, font.h, fontset.c, fontset.h, frame.c, frame.h:
      * ftfont.c, ftxfont.c, gtkutil.c, gtkutil.h, image.c, keyboard.c:
      * menu.c, menu.h, msdos.c, nsfns.m, nsfont.m, nsmenu.m, nsterm.h:
      * nsterm.m, scroll.c, term.c, w32fns.c, w32font.c, w32font.h:
      * w32inevt.c, w32inevt.h, w32menu.c, w32notify.c, w32term.c, w32term.h:
      * w32uniscribe.c, w32xfns.c, widget.c, window.c, xdisp.c, xfaces.c:
      * xfns.c, xfont.c, xftfont.c, xmenu.c, xselect.c, xterm.c:
      All related users changed.
      a10c8269
  21. 31 Jul, 2013 1 commit
    • Dmitry Antipov's avatar
      Drop unnecessary functions that deals with frame pixel size. · f435830e
      Dmitry Antipov authored
      * frame.h, msdos.h, w32term.h, xterm.h (x_pixel_width)
      (x_pixel_height): Drop prototypes.
      * msdos.c, nsfns.m, w32fns.c, xfns.c (x_pixel_width)
      (x_pixel_height): Drop implementations.
      * frame.c (Fframe_pixel_height): Use FRAME_PIXEL_HEIGHT
      which should be always valid for window frame.
      (Frame_pixel_width): Likewise with FRAME_PIXEL_WIDTH.
      * w32menu.c (Fx_popup_dialog):
      * xmenu.c (Fx_popup_dialog): Likewise for both.
      f435830e
  22. 20 Jun, 2013 1 commit
    • Eli Zaretskii's avatar
      Yet another attempt at fixing bugs #14602, 14630, 14669. · b932cad7
      Eli Zaretskii authored
       src/w32fns.c (w32_wnd_proc): Don't compute the header line and mode
       line dimensions here, to avoid race conditions with the main
       thread.
       src/w32term.c (w32_draw_window_cursor): Compute the header line and
       mode line dimensions here.
       <w32_system_caret_window, w32_system_caret_hdr_height>:
       <w32_system_caret_mode_height>: New variables.
       src/w32term.h: Declare them.
      b932cad7
  23. 03 Jun, 2013 1 commit
    • Eli Zaretskii's avatar
      Fix crashes in a text-mode session on Windows. · 9337e206
      Eli Zaretskii authored
       src/w32console.c (initialize_w32_display): Return the dimensions of
       the console window via 2 additional arguments, not via the current
       frame.  This avoids crashes due to overrunning the bounds of
       frame's decode_mode_spec_buffer, which is not resized following
       the change of the frame dimensions from the initial 10x10.
       src/w32term.h (w32_initialize_display_info): Adjust prototype.
       src/term.c (init_tty): Take dimensions of the frame from the values
       returned by initialize_w32_display.
      9337e206
  24. 14 Apr, 2013 1 commit
    • Erik Charlebois's avatar
      * src/w32fns.c (w32_fullscreen_rect): New function to compute the · 1f635a07
      Erik Charlebois authored
      window rectangle for the given fullscreen mode.
      (w32_wnd_proc): When in a fullscreen mode, WM_WINDOWPOSCHANGING
      no longer tunes the window size.  This keeps the window's edges
      flush with the screen and allows the taskbar to hide itself in
      fullboth.
      * src/w32term.c (w32fullscreen_hook): fullboth now shows without
      window decorations and uses the entire screen.
      1f635a07
  25. 07 Apr, 2013 1 commit
    • Dmitry Antipov's avatar
      Get rid of some platform-specific functions examining window · 7452b7bd
      Dmitry Antipov authored
      system and its capabilities.  This is a partial rework of the
      2013-04-05 change.
      * lisp.h (have_menus_p): Remove prototype.  This function is
      replaced with platform-independent window_system_available.
      (check_window_system): Move to...
      * frame.h (decode_window_system_frame, window_system_available):
      ...here, add new prototypes.
      * frame.c (window_system_available, decode_window_system_frame):
      New functions.
      (check_window_system): Platform-independent now.
      * xterm.h (x_in_use): Remove declaration.
      (check_x_frame):
      * w32term.h (check_x_frame):
      * nsterm.h (check_x_frame): Remove prototypes.  This function
      is replaced with platform-independent decode_window_system_frame.
      * msdos.c (have_menus_p): Remove.
      * nsfns.m (check_window_system, have_menus_p, check_ns_frame):
      Remove platform-specific functions.  Use check_window_system,
      decode_window_system_frame and check_ns_display_info where
      appropriate.  Minor style and comment tweaks.
      * w32fns.c (w32_in_us...
      7452b7bd
  26. 05 Apr, 2013 1 commit
    • Dmitry Antipov's avatar
      Consistently use platform-specific function to detect window system. · 73931ad1
      Dmitry Antipov authored
      * lisp.h (check_window_system): New prototype.  This function is
      going to replace check_x, check_w32 and check_ns.
      (have_menus_p): Mention msdos.c in comment.
      * fontset.c (check_window_system_func): Remove.  Adjust all users.
      * fontset.h (check_window_system_func): Remove prototype.
      * nsterm.h (check_ns):
      * xterm.h (check_x):
      * w32term.h (check_w32): Likewise.
      * menu.c (Fx_popup_menu): Use check_window_system.
      * msdos.c (check_window_system): Define for MS-DOS.
      * nsfns.m (check_window_system): Define for NS.  Adjust all users.
      * w32fns.c (check_window_system): Likewise for MS-Windows.
      * xfns.c (check_window_system): Likewise for X.
      * font.c, frame.c, nsmenu.m, nsselect.m, nsterm.m, w32menu.c:
      * xfaces.c, xmenu.c: Use check_window_system where appropriate.
      73931ad1
  27. 23 Mar, 2013 1 commit
    • Eli Zaretskii's avatar
      Fix fullscreen resizing of multiple frames on MS-Windows. · cdc0d0bd
      Eli Zaretskii authored
       src/w32term.h (struct w32_output): New members normal_width,
       normal_height, normal_top, normal_left, and prev_fsmode.
       (FRAME_NORMAL_WIDTH, FRAME_NORMAL_HEIGHT, FRAME_NORMAL_TOP)
       (FRAME_NORMAL_LEFT, FRAME_PREV_FSMODE): New macros to access these
       members of a frame.
       src/w32term.c (w32fullscreen_hook): Use FRAME_NORMAL_WIDTH,
       FRAME_NORMAL_HEIGHT, and FRAME_PREV_FSMODE, instead of static
       variables, to save and restore frame dimensions.  Use
       FRAME_NORMAL_LEFT and FRAME_NORMAL_TOP to restore frame position
       after returning from a 'fullscreen' configuration.  use
       SendMessage instead of PostMessage to send the SC_RESTORE message,
       to avoid races between the main thread and the input thread.
      cdc0d0bd
  28. 10 Mar, 2013 1 commit
    • Daniel Colascione's avatar
      2013-03-10 Daniel Colascione <dancol@dancol.org> · 819e2da9
      Daniel Colascione authored
      	* w32term.h (GUISTR, GUI_ENCODE_FILE, GUI_ENCODE_SYSTEM, GUI_FN)
      	(GUI_SDATA, guichar_t): Macros to abstract out differences between
      	NTGUI_UNICODE and !NTGUI_UNICODE builds, some moved out of
      	w32fns.c.
      
      	* w32term.c (construct_drag_n_drop): Use the above macros to make
      	drag-and-drop work for non-ASCII filenames in cygw32 builds.
      
      	* w32fns.c (x_set_name, x_set_title): Use the above macros to
      	properly display non-ASCII frame titles in cygw32 builds.
      
      	* w32fns.c (Fw32_shell_execute): Use the above macros to properly
      	call ShellExecute in cygw32 builds.
      
      	* w32fn.c (Fx_file_dialog): Use the above macros to simplify the
      	common file dialog code.
      
      	* w32fns.c (Ffile_system_info): Remove from cygw32 builds, which
      	can just use du like other systems.
      
      	* coding.c (from_unicode_buffer): Declare.
      	* coding.c (from_unicode_buffer): Implement.
      819e2da9
  29. 01 Jan, 2013 1 commit
  30. 06 Dec, 2012 1 commit
    • Dmitry Antipov's avatar
      * frame.h (x_char_width, x_char_height): Remove prototypes. · 1700db3c
      Dmitry Antipov authored
      * w32term.h (x_char_width, x_char_height): Likewise.
      * xfns.c (x_char_width, x_char_height): Remove.
      * w32fns.c (x_char_width, x_char_height): Likewise.
      * nsfns.c (x_char_width, x_char_height): Likewise.
      * frame.c (Fframe_char_width): Use FRAME_COLUMN_WIDTH for
      all window frames.
      (Fframe_char_height): Likewise with FRAME_LINE_HEIGHT.
      * keyboard.c (command_loop_1): Remove prototype.
      (command_loop_2, top_level_1): Add static to match prototype.
      1700db3c
  31. 23 Nov, 2012 1 commit
    • Dmitry Antipov's avatar
      * frame.h (struct frame): Remove display_preempted member · f418b22e
      Dmitry Antipov authored
      since all users are dead long ago.
      * nsterm.h (struct x_output): Use the only dummy member.
      * w32menu.c (pending_menu_activation): Remove since not
      really used.
      (set_frame_menubar): Adjust user.
      * w32term.h (struct x_output): Drop outdated #if 0 code.
      (struct w32_output): Use bitfields for explicit_parent,
      asked_for_visible and menubar_active members.  Drop
      unused pending_menu_activation member.
      * xterm.h (struct x_output): Drop outdated #if 0 code.
      Use bitfields for explicit_parent, asked_for_visible,
      has_been_visible and net_wm_state_hidden_seen members.
      f418b22e
  32. 19 Nov, 2012 1 commit
    • Eli Zaretskii's avatar
      More fixes for bug #12878 with MS-Windows MSVC build. · 88c4a13c
      Eli Zaretskii authored
       src/xdisp.c (start_hourglass) [HAVE_NTGUI]: Don't mix declaration of
       w32_note_current_window with code.  (Backport from trunk.)
       src/w32.c (FILE_DEVICE_FILE_SYSTEM, METHOD_BUFFERED)
       (FILE_ANY_ACCESS, CTL_CODE, FSCTL_GET_REPARSE_POINT) [_MSC_VER]:
       Define for the MSVC compiler.
       src/w32term.h (EnumSystemLocalesW) [_MSC_VER]: Add a missing
       semi-colon.
      
       nt/inc/stdint.h (PTRDIFF_MIN) [!__GNUC__]: Define for MSVC.
      88c4a13c
  33. 17 Nov, 2012 1 commit
    • Eli Zaretskii's avatar
      Fix bug #12878 with compilation failure with Visual C++ 11.0. · d8715cdf
      Eli Zaretskii authored
       src/w32select.c: Include w32common.h before w32term.h, so that
       windows.h gets included before w32term.h uses some of its
       features, see below.
       src/w32term.h (LOCALE_ENUMPROCA, LOCALE_ENUMPROCW) [_MSC_VER]: New
       typedefs.
       (EnumSystemLocalesA, EnumSystemLocalesW) [_MSC_VER]: New
       prototypes.
       (EnumSystemLocales) [_MSC_VER]: Define if undefined.
      d8715cdf