[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master cb45114 26/35: Make it safe to have non-xwidget views in xwidget-
From: |
Lars Ingebrigtsen |
Subject: |
master cb45114 26/35: Make it safe to have non-xwidget views in xwidget-view-list |
Date: |
Sat, 6 Nov 2021 22:01:59 -0400 (EDT) |
branch: master
commit cb45114363b91964eeded4bdd18fbb85fbbb225f
Author: Po Lu <luangruo@yahoo.com>
Commit: Lars Ingebrigtsen <larsi@gnus.org>
Make it safe to have non-xwidget views in xwidget-view-list
* src/xwidget.c (define_cursors, offscreen_damage_event): Check
XWIDGET_VIEW_P before XXWIDGET_VIEW.
---
src/xwidget.c | 24 +++++++++++++++---------
1 file changed, 15 insertions(+), 9 deletions(-)
diff --git a/src/xwidget.c b/src/xwidget.c
index 9d1fe68..36e8cab 100644
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@ -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 ();
- master 3e64039 09/35: Handle crossing events on xwidget windows correctly, (continued)
- master 3e64039 09/35: Handle crossing events on xwidget windows correctly, Lars Ingebrigtsen, 2021/11/06
- master 650e5e8 14/35: Fix xwidget scrolling, Lars Ingebrigtsen, 2021/11/06
- master 49ed706 15/35: Select window when clicking on an xwidget view, Lars Ingebrigtsen, 2021/11/06
- master d97718c 17/35: Add a menu to xwidget-webkit, Lars Ingebrigtsen, 2021/11/06
- master f1fbf87 20/35: Make the WebKit inspector available, Lars Ingebrigtsen, 2021/11/06
- master 7269bdd 21/35: Improve detail of load-changed xwidget events, Lars Ingebrigtsen, 2021/11/06
- master 32ec485 16/35: Redisplay xwidget view windows instead of just setting their size, Lars Ingebrigtsen, 2021/11/06
- master cd7158e 18/35: Add new tool-bar items to xwidget-webkit, Lars Ingebrigtsen, 2021/11/06
- master 8729ae2 19/35: Add xwidget-webkit-copy-selection-as-kill to the menu bar, Lars Ingebrigtsen, 2021/11/06
- master 1cc19d0 23/35: Add support for cursors in xwidget views, Lars Ingebrigtsen, 2021/11/06
- master cb45114 26/35: Make it safe to have non-xwidget views in xwidget-view-list,
Lars Ingebrigtsen <=
- master 286467a 27/35: Add functions for performing searches on xwidgets, Lars Ingebrigtsen, 2021/11/06
- master 0be966f 30/35: Make "open in new window" from an xwidget's context menu work, Lars Ingebrigtsen, 2021/11/06
- master 686ce50 31/35: Rationalize creation decisions, Lars Ingebrigtsen, 2021/11/06
- master 3e04f1f 33/35: Fix web inspector, Lars Ingebrigtsen, 2021/11/06
- master 969ce9d 34/35: Improve xwidget isearch visuals, Lars Ingebrigtsen, 2021/11/06
- master cd1f02e 25/35: Make xwidgets print nicer, Lars Ingebrigtsen, 2021/11/06
- master eabd735 32/35: Default to creating new related sessions, Lars Ingebrigtsen, 2021/11/06
- master 5b7ab89 35/35: Fix build on nextstep, Lars Ingebrigtsen, 2021/11/06