mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-27 16:51:06 -07:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into feature/pgtk

Browse source
This commit is contained in:
Po Lu 2021-12-01 21:50:02 +08:00
commit 658085d069
11 changed files with 161 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

64
admin/update_autogen
View file

@ -64,7 +64,6 @@ Options:
-q: be quiet; only give error messages, not status messages.
-A: only update autotools files, copying into specified dir.
-H: also update ChangeLog.${changelog_n}
-I: also update info/dir.
-L: also update ldefs-boot.el.
-C: start from a clean state. Slower, but more correct.
EOF
@ -81,7 +80,6 @@ clean=
autogendir= # was "autogen"
ldefs_flag=1
lboot_flag=
info_flag=
changelog_flag=
## Parameters.
@ -129,8 +127,6 @@ while getopts ":hcfqA:HCIL" option ; do
(H) changelog_flag=1 ;;
(I) info_flag=1 ;;
(L) lboot_flag=1 ;;
(\?) die "Bad option -$OPTARG" ;;
@ -172,7 +168,7 @@ status ()
echo "Checking input file status..."
## The lisp portion could be more permissive, eg only care about .el files.
modified=$(status ${autogendir:+$sources} ${ldefs_flag:+lisp} ${info_flag:+doc}) || die
modified=$(status ${autogendir:+$sources} ${ldefs_flag:+lisp}) || die
[ "$modified" ] && {
echo "Locally modified: $modified"
@ -235,61 +231,6 @@ commit ()
} # function commit
## No longer used since info/dir is now generated at install time if needed,
## and is not in the repository any more.
info_dir ()
{
local basefile=build-aux/dir_top outfile=info/dir
echo "Regenerating info/dir..."
## Header contains non-printing characters, so this is more
## reliable than using echo.
rm -f $outfile
cp $basefile $outfile
local topic file dircat
## FIXME inefficient looping.
for topic in "Texinfo documentation system" "Emacs" "GNU Emacs Lisp" \
"Emacs editing modes" "Emacs network features" "Emacs misc features" \
"Emacs lisp libraries"; do
cat - <<EOF >> $outfile
$topic
EOF
## Bit faster than doc/*/*.texi.
for file in doc/emacs/emacs.texi doc/lispintro/*.texi \
doc/lispref/elisp.texi doc/misc/*.texi; do
## FIXME do not ignore w32 if OS is w32.
case $file in
*-xtra.texi|*efaq-w32.texi) continue ;;
esac
dircat=$(sed -n -e 's/@value{emacsname}/Emacs/' -e 's/^@dircategory //p' $file)
## TODO warn about unknown topics (check-info in top-level
## Makefile does this).
[ "$dircat" = "$topic" ] || continue
sed -n -e 's/@value{emacsname}/Emacs/' \
-e 's/@acronym{\([A-Z]*\)}/\1/' \
-e '/^@direntry/,/^@end direntry/ s/^\([^@]\)/\1/p' \
$file >> $outfile
done
done
local modified
modified=$(status $outfile) || die
commit "info/dir" $modified || die "commit error"
} # function info_dir
[ "$autogendir" ] && {
cp $genfiles $autogendir/
@ -306,9 +247,6 @@ EOF
} # $autogendir
[ "$info_flag" ] && info_dir
[ "$ldefs_flag" ] || exit 0

20
doc/lispref/commands.texi
View file

@ -2001,19 +2001,19 @@ These kinds of event are generated by moving a mouse wheel. The
Events}), specifying the position of the mouse cursor when the event
occurred.
@var{clicks}, if present, is the number of times in quick succession
the wheel has been moved. @xref{Repeat Events}. @var{lines}, if
@var{clicks}, if present, is the number of times that the wheel was
moved in quick succession. @xref{Repeat Events}. @var{lines}, if
present and not @code{nil}, is the number of screen lines that should
be scrolled. @var{pixel-delta}, if present, is a pair of the form
@w{@code{(@var{x} . @var{y})}}, where @var{x} and @var{y} are the
number of pixels to scroll by in each axis.
be scrolled. @var{pixel-delta}, if present, is a cons cell of the
form @w{@code{(@var{x} . @var{y})}}, where @var{x} and @var{y} are the
numbers of pixels by which to scroll in each axis, a.k.a.@:
@dfn{pixelwise deltas}.
@cindex pixel-resolution wheel events
You can use @var{x} and @var{y} to determine how much the mouse wheel
has actually moved at pixel resolution.
For example, the pixelwise deltas could be used to scroll the display
at pixel resolution, exactly according to the user's turning the mouse
You can use these @var{x} and @var{y} pixelwise deltas to determine
how much the mouse wheel has actually moved at pixel resolution. For
example, the pixelwise deltas could be used to scroll the display at
pixel resolution, exactly according to the user's turning the mouse
wheel.
@vindex mouse-wheel-up-event

10
etc/NEWS
View file

@ -366,6 +366,16 @@ the common "utm_" trackers from URLs.
** Gnus
---
*** Gnus now uses a variable-pitch font in the headers by default.
To get the monospace font back, you can put something like the
following in your .gnus file:
(set-face-attribute 'gnus-header nil :inherit 'unspecified)
---
*** The default value of 'gnus-treat-fold-headers' is now 'head'.
---
*** New face 'gnus-header'.
All other 'gnus-header-*' faces inherit from this face now.

18
lisp/gnus/gnus-art.el
View file

@ -769,7 +769,7 @@ Obsolete; use the face `gnus-signature' for customizations instead."
:group 'gnus-article-signature)
(defface gnus-header
'((t nil))
'((t :inherit variable-pitch))
"Base face used for all Gnus header faces.
All the other `gnus-header-' faces inherit from this face."
:version "29.1"
@ -1383,11 +1383,11 @@ This variable has no effect if `gnus-treat-unfold-headers' is nil."
(const :tag "all" t)
(regexp)))
(defcustom gnus-treat-fold-headers nil
(defcustom gnus-treat-fold-headers 'head
"Fold headers.
Valid values are nil, t, `head', `first', `last', an integer or a
predicate. See Info node `(gnus)Customizing Articles'."
:version "22.1"
:version "29.1"
:group 'gnus-article-treat
:link '(custom-manual "(gnus)Customizing Articles")
:type gnus-article-treat-custom)
@ -2212,6 +2212,13 @@ unfolded."
(replace-match " " t t))))
(goto-char (point-max)))))))
(defun gnus--variable-pitch-p (face)
(or (eq face 'variable-pitch)
(let ((parent (face-attribute face :inherit)))
(if (eq parent 'unspecified)
nil
(seq-some #'gnus--variable-pitch-p (ensure-list parent))))))
(defun gnus-article-treat-fold-headers ()
"Fold message headers."
(interactive nil gnus-article-mode gnus-summary-mode)
@ -2219,7 +2226,10 @@ unfolded."
(while (not (eobp))
(save-restriction
(mail-header-narrow-to-field)
(mail-header-fold-field)
(if (not (gnus--variable-pitch-p (get-text-property (point) 'face)))
(mail-header-fold-field)
(forward-char 1)
(pixel-fill-region (point) (point-max) (pixel-fill-width)))
(goto-char (point-max))))))
(defun gnus-treat-smiley ()

16
lisp/textmodes/pixel-fill.el
View file

@ -77,20 +77,28 @@ prefix on subsequent lines."
(goto-char start)
(let ((indentation
(car (window-text-pixel-size nil (line-beginning-position)
(point)))))
(point))))
(newline-end nil))
(when (> indentation pixel-width)
(error "The indentation (%s) is wider than the fill width (%s)"
indentation pixel-width))
(save-restriction
(narrow-to-region start end)
(goto-char start)
(goto-char (point-max))
(when (looking-back "\n[ \t]*" (point-min))
(setq newline-end t))
(goto-char (point-min))
;; First replace all whitespace with space.
(while (re-search-forward "[ \t\n]+" nil t)
(if (= (match-beginning 0) start)
(if (or (= (match-beginning 0) start)
(= (match-end 0) end))
(delete-region (match-beginning 0) (match-end 0))
(replace-match " ")))
(goto-char start)
(pixel-fill--fill-line pixel-width indentation)))))
(pixel-fill--fill-line pixel-width indentation)
(goto-char (point-max))
(when newline-end
(insert "\n"))))))
(defun pixel-fill--goto-pixel (width)
(vertical-motion (cons (/ width (frame-char-width)) 0)))

6
src/haikuterm.c
View file

@ -3024,7 +3024,7 @@ haiku_read_socket (struct terminal *terminal, struct input_event *hold_quit)
if (fabsf (py) >= FRAME_LINE_HEIGHT (f)
|| fabsf (px) >= FRAME_COLUMN_WIDTH (f)
|| !x_coalesce_scroll_events)
|| !mwheel_coalesce_scroll_events)
{
inev.kind = (fabsf (px) > fabsf (py)
? HORIZ_WHEEL_EVENT
@ -3565,10 +3565,6 @@ syms_of_haikuterm (void)
doc: /* SKIP: real doc in xterm.c. */);
Vx_toolkit_scroll_bars = Qt;
DEFVAR_BOOL ("x-coalesce-scroll-events", x_coalesce_scroll_events,
doc: /* SKIP: real doc in xterm.c. */);
x_coalesce_scroll_events = true;
DEFVAR_BOOL ("haiku-debug-on-fatal-error", haiku_debug_on_fatal_error,
doc: /* If non-nil, Emacs will launch the system debugger upon a fatal error. */);
haiku_debug_on_fatal_error = 1;

6
src/keyboard.c
View file

@ -12580,6 +12580,12 @@ other similar functions ignore input events in `while-no-input-ignore-events'.
This flag may eventually be removed once this behavior is deemed safe. */);
input_pending_p_filter_events = true;
DEFVAR_BOOL ("mwheel-coalesce-scroll-events", mwheel_coalesce_scroll_events,
doc: /* Non-nil means send a wheel event only for scrolling at least one screen line.
Otherwise, a wheel event will be sent every time the mouse wheel is
moved. */);
mwheel_coalesce_scroll_events = true;
pdumper_do_now_and_after_load (syms_of_keyboard_for_pdumper);
}

14
src/nsterm.m
View file

@ -6606,7 +6606,7 @@ not_in_argv (NSString *arg)
* reset the total delta for the direction we're NOT
* scrolling so that small movements don't add up. */
if (abs (totalDeltaX) > abs (totalDeltaY)
&& (!x_coalesce_scroll_events
&& (!mwheel_coalesce_scroll_events
|| abs (totalDeltaX) > lineHeight))
{
horizontal = YES;
@ -6614,14 +6614,14 @@ not_in_argv (NSString *arg)
lines = abs (totalDeltaX / lineHeight);
x = totalDeltaX;
if (!x_coalesce_scroll_events)
if (!mwheel_coalesce_scroll_events)
totalDeltaX = 0;
else
totalDeltaX = totalDeltaX % lineHeight;
totalDeltaY = 0;
}
else if (abs (totalDeltaY) >= abs (totalDeltaX)
&& (!x_coalesce_scroll_events
&& (!mwheel_coalesce_scroll_events
|| abs (totalDeltaY) > lineHeight))
{
horizontal = NO;
@ -6629,7 +6629,7 @@ not_in_argv (NSString *arg)
lines = abs (totalDeltaY / lineHeight);
y = totalDeltaY;
if (!x_coalesce_scroll_events)
if (!mwheel_coalesce_scroll_events)
totalDeltaY = 0;
else
totalDeltaY = totalDeltaY % lineHeight;
@ -6662,7 +6662,7 @@ not_in_argv (NSString *arg)
y = [theEvent scrollingDeltaY];
}
if (lines == 0 && x_coalesce_scroll_events)
if (lines == 0 && mwheel_coalesce_scroll_events)
return;
if (NUMBERP (Vns_scroll_event_delta_factor))
@ -10037,10 +10037,6 @@ This variable is ignored on macOS < 10.7 and GNUstep. Default is t. */);
doc: /* SKIP: real doc in xterm.c. */);
x_underline_at_descent_line = 0;
DEFVAR_BOOL ("x-coalesce-scroll-events", x_coalesce_scroll_events,
doc: /* SKIP: real doc in xterm.c. */);
x_coalesce_scroll_events = true;
DEFSYM (Qx_underline_at_descent_line, "x-underline-at-descent-line");
DEFVAR_LISP ("ns-scroll-event-delta-factor", Vns_scroll_event_delta_factor,

7
src/w32fns.c
View file

@ -5173,6 +5173,13 @@ w32_wnd_proc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
my_post_msg (&wmsg, hwnd, msg, wParam, lParam);
goto dflt;
case WM_SETTINGCHANGE:
/* Inform the Lisp thread that some system-wide setting has
changed, so if Emacs is interested in some of them, it could
update its internal values. */
my_post_msg (&wmsg, hwnd, msg, wParam, lParam);
goto dflt;
case WM_SETFOCUS:
dpyinfo->faked_key = 0;
reset_modifiers ();

99
src/w32term.c
View file

@ -164,6 +164,10 @@ int last_scroll_bar_drag_pos;
/* Keyboard code page - may be changed by language-change events. */
int w32_keyboard_codepage;
/* The number of screen lines to scroll for the default mouse-wheel
scroll amount, given by WHEEL_DELTA. */
static UINT w32_wheel_scroll_lines;
#ifdef CYGWIN
int w32_message_fd = -1;
#endif /* CYGWIN */
@ -271,6 +275,19 @@ XGetGCValues (void *ignore, XGCValues *gc,
}
#endif
static void
w32_get_mouse_wheel_vertical_delta (void)
{
if (os_subtype != OS_SUBTYPE_NT)
return;
UINT scroll_lines;
BOOL ret = SystemParametersInfo (SPI_GETWHEELSCROLLLINES, 0,
&scroll_lines, 0);
if (ret)
w32_wheel_scroll_lines = scroll_lines;
}
static void
w32_set_clip_rectangle (HDC hdc, RECT *rect)
{
@ -3203,32 +3220,94 @@ w32_construct_mouse_wheel (struct input_event *result, W32Msg *msg,
{
POINT p;
int delta;
static int sum_delta_y = 0;
result->kind = msg->msg.message == WM_MOUSEHWHEEL ? HORIZ_WHEEL_EVENT
: WHEEL_EVENT;
result->code = 0;
result->timestamp = msg->msg.time;
result->arg = Qnil;
/* A WHEEL_DELTA positive value indicates that the wheel was rotated
forward, away from the user (up); a negative value indicates that
the wheel was rotated backward, toward the user (down). */
delta = GET_WHEEL_DELTA_WPARAM (msg->msg.wParam);
if (delta == 0)
{
result->kind = NO_EVENT;
return Qnil;
}
/* With multiple monitors, we can legitimately get negative
coordinates, so cast to short to interpret them correctly. */
p.x = (short) LOWORD (msg->msg.lParam);
p.y = (short) HIWORD (msg->msg.lParam);
if (eabs (delta) < WHEEL_DELTA)
{
/* This is high-precision mouse wheel, which sends
fine-resolution wheel events. Produce a wheel event only if
the conditions for sending such an event are fulfilled. */
int scroll_unit = max (w32_wheel_scroll_lines, 1), nlines;
double value_to_report;
/* w32_wheel_scroll_lines == INT_MAX means the user asked for
"entire page" to be the scroll unit. We interpret that as
the height of the window under the mouse pointer. */
if (w32_wheel_scroll_lines == INT_MAX)
{
Lisp_Object window = window_from_coordinates (f, p.x, p.y, NULL,
false, false);
if (!WINDOWP (window))
{
result->kind = NO_EVENT;
return Qnil;
}
scroll_unit = XWINDOW (window)->pixel_height;
if (scroll_unit < 1) /* paranoia */
scroll_unit = 1;
}
/* If mwheel-coalesce-scroll-events is non-nil, report a wheel event
only when we have accumulated enough delta's for WHEEL_DELTA. */
if (mwheel_coalesce_scroll_events)
{
/* If the user changed the direction, reset the accumulated
deltas. */
if ((delta > 0) != (sum_delta_y > 0))
sum_delta_y = 0;
sum_delta_y += delta;
/* https://docs.microsoft.com/en-us/previous-versions/ms997498(v=msdn.10) */
if (eabs (sum_delta_y) < WHEEL_DELTA)
{
result->kind = NO_EVENT;
return Qnil;
}
value_to_report =
((double)FRAME_LINE_HEIGHT (f) * scroll_unit)
/ ((double)WHEEL_DELTA / sum_delta_y);
sum_delta_y = 0;
}
else
value_to_report =
((double)FRAME_LINE_HEIGHT (f) * scroll_unit)
/ ((double)WHEEL_DELTA / delta);
nlines = value_to_report / FRAME_LINE_HEIGHT (f) + 0.5;
result->arg = list3 (make_fixnum (nlines),
make_float (0.0),
make_float (value_to_report));
}
/* The up and down modifiers indicate if the wheel was rotated up or
down based on WHEEL_DELTA value. */
result->modifiers = (msg->dwModifiers
| ((delta < 0 ) ? down_modifier : up_modifier));
/* With multiple monitors, we can legitimately get negative
coordinates, so cast to short to interpret them correctly. */
p.x = (short) LOWORD (msg->msg.lParam);
p.y = (short) HIWORD (msg->msg.lParam);
/* For the case that F's w32 window is not msg->msg.hwnd. */
ScreenToClient (FRAME_W32_WINDOW (f), &p);
XSETINT (result->x, p.x);
XSETINT (result->y, p.y);
XSETFRAME (result->frame_or_window, f);
result->arg = Qnil;
return Qnil;
}
@ -4905,6 +4984,14 @@ w32_read_socket (struct terminal *terminal,
}
break;
case WM_SETTINGCHANGE:
/* We are only interested in changes of the number of lines
to scroll when the vertical mouse wheel is moved. This
is only supported on NT. */
if (msg.msg.wParam == SPI_SETWHEELSCROLLLINES)
w32_get_mouse_wheel_vertical_delta ();
break;
case WM_KEYDOWN:
case WM_SYSKEYDOWN:
f = w32_window_to_frame (dpyinfo, msg.msg.hwnd);
@ -7522,6 +7609,8 @@ w32_initialize (void)
horizontal_scroll_bar_left_border = horizontal_scroll_bar_right_border
= GetSystemMetrics (SM_CYHSCROLL);
}
w32_get_mouse_wheel_vertical_delta ();
}
void

9
src/xterm.c
View file

@ -10024,7 +10024,7 @@ handle_one_xevent (struct x_display_info *dpyinfo,
val->emacs_value += delta;
if (x_coalesce_scroll_events
if (mwheel_coalesce_scroll_events
&& (fabs (val->emacs_value) < 1))
continue;
@ -15214,13 +15214,6 @@ consuming frame position adjustments. In newer versions of GTK, Emacs
always uses gtk_window_move and ignores the value of this variable. */);
x_gtk_use_window_move = true;
DEFVAR_BOOL ("x-coalesce-scroll-events", x_coalesce_scroll_events,
doc: /* Non-nil means send a wheel event only for scrolling at least one screen line.
Otherwise, a wheel event will be sent every time the mouse wheel is
moved. This option is only effective when Emacs is built with XInput
2, with Haiku windowing support, or with NS. */);
x_coalesce_scroll_events = true;
DEFVAR_LISP ("x-scroll-event-delta-factor", Vx_scroll_event_delta_factor,
doc: /* A scale to apply to pixel deltas reported in scroll events.
This option is only effective when Emacs is built with XInput 2