mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-08 04:30:45 -08:00
Code Issues Projects Releases Wiki Activity

More fixes for w32 console build

Browse source 
* src/w32term.c (w32_read_socket): Don't use FRAME_OBSCURED_P,
which was removed.
* src/frame.h (struct frame): Move !HAVE_NTGUI to its original
place.
* src/treesit.c (treesit_load_language): Shut up GCC warning.
This commit is contained in:
Eli Zaretskii 2024-10-26 12:14:21 +03:00
parent 33586db3d3
commit 4cb7f3935e
3 changed files with 5 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/frame.h
View file

@ -450,7 +450,6 @@ struct frame
bool_bf no_accept_focus : 1;
#ifdef HAVE_WINDOW_SYSTEM
# ifndef HAVE_NTGUI
/* True if this frame is a tooltip frame. */
bool_bf tooltip : 1;
@ -464,7 +463,7 @@ struct frame
/* Nonzero if we should actually display horizontal scroll bars on this frame. */
bool_bf horizontal_scroll_bars : 1;
# ifndef HAVE_NTGUI
/* True if this is an override_redirect frame. */
bool_bf override_redirect : 1;
#endif

2
src/treesit.c
View file

@ -651,7 +651,7 @@ treesit_load_language (Lisp_Object language_symbol,
/* Override the library name and C name, if appropriate. */
Lisp_Object override_name;
Lisp_Object override_c_name;
Lisp_Object override_c_name UNINIT;
bool found_override = treesit_find_override_name (language_symbol,
&override_name,
&override_c_name);

25
src/w32term.c
View file

@ -6347,14 +6347,13 @@ w32_read_socket (struct terminal *terminal,
if (FRAME_TOOLTIP_P (f))
continue;
/* Check "visible" frames and mark each as obscured or not.
/* Check "visible" frames and mark each as visible or not.
Note that visible is nonzero for unobscured and obscured
frames, but zero for hidden and iconified frames. */
if (FRAME_W32_P (f) && FRAME_VISIBLE_P (f))
{
RECT clipbox;
HDC hdc;
bool obscured;
enter_crit ();
/* Query clipping rectangle for the entire window area
@ -6368,29 +6367,11 @@ w32_read_socket (struct terminal *terminal,
ReleaseDC (FRAME_W32_WINDOW (f), hdc);
leave_crit ();
obscured = FRAME_OBSCURED_P (f);
if (clipbox.right == clipbox.left || clipbox.bottom == clipbox.top)
{
/* Frame has become completely obscured so mark as such (we
do this by setting visible to 2 so that FRAME_VISIBLE_P
is still true, but redisplay will skip it). */
SET_FRAME_VISIBLE (f, 2);
if (!obscured)
DebPrint (("frame %p (%s) obscured\n", f, SDATA (f->name)));
}
else
if (!(clipbox.right == clipbox.left
|| clipbox.bottom == clipbox.top))
{
/* Frame is not obscured, so mark it as such. */
SET_FRAME_VISIBLE (f, 1);
if (obscured)
{
SET_FRAME_GARBAGED (f);
DebPrint (("obscured frame %p (%s) found to be visible\n",
f, SDATA (f->name)));
}
}
}
}