Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-23 21:37:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make it safe to have non-xwidget views in xwidget-view-list

Browse source 
* src/xwidget.c (define_cursors, offscreen_damage_event): Check
XWIDGET_VIEW_P before XXWIDGET_VIEW.
This commit is contained in:
Po Lu 2021-11-06 14:01:56 +08:00 committed by Lars Ingebrigtsen
parent cd1f02e1e3
commit cb45114363
1 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/xwidget.c
View file

@ -609,13 +609,16 @@ define_cursors (struct xwidget *xw, WebKitHitTestResult *res)
for (Lisp_Object tem = Vxwidget_view_list; CONSP (tem);
tem = XCDR (tem))
{
xvw = XXWIDGET_VIEW (XCAR (tem));
if (XXWIDGET (xvw->model) == xw)
if (XWIDGET_VIEW_P (XCAR (tem)))
{
xvw->cursor = cursor_for_hit (xw->hit_result, xvw->frame);
if (xvw->wdesc != None)
XDefineCursor (xvw->dpy, xvw->wdesc, xvw->cursor);
xvw = XXWIDGET_VIEW (XCAR (tem));
if (XXWIDGET (xvw->model) == xw)
{
xvw->cursor = cursor_for_hit (xw->hit_result, xvw->frame);
if (xvw->wdesc != None)
XDefineCursor (xvw->dpy, xvw->wdesc, xvw->cursor);
}
}
}
}
@ -849,10 +852,13 @@ offscreen_damage_event (GtkWidget *widget, GdkEvent *event,
for (Lisp_Object tail = Vxwidget_view_list; CONSP (tail);
tail = XCDR (tail))
{
struct xwidget_view *view = XXWIDGET_VIEW (XCAR (tail));
if (XWIDGET_VIEW_P (XCAR (tail)))
{
struct xwidget_view *view = XXWIDGET_VIEW (XCAR (tail));
if (view->wdesc && XXWIDGET (view->model) == xwidget)
xv_do_draw (view, XXWIDGET (view->model));
if (view->wdesc && XXWIDGET (view->model) == xwidget)
xv_do_draw (view, XXWIDGET (view->model));
}
}
unblock_input ();