mirror of
https://github.com/X11Libre/xserver.git
synced 2026-09-21 20:26:45 +00:00
Merge branch 'master' into XACE-SELINUX
Conflicts: hw/xnest/Pixmap.c include/dix.h
This commit is contained in:
commit
2d17f47cc7
46 changed files with 92 additions and 977 deletions
|
|
@ -405,7 +405,8 @@ XID winID = 0;
|
|||
|
||||
if ((force||(xkbi->desc->ctrls->enabled_ctrls&XkbAudibleBellMask))&&
|
||||
(!eventOnly)) {
|
||||
(*kbd->kbdfeed->BellProc)(percent,kbd,(pointer)pCtrl,class);
|
||||
if (kbd->kbdfeed->BellProc)
|
||||
(*kbd->kbdfeed->BellProc)(percent,kbd,(pointer)pCtrl,class);
|
||||
}
|
||||
interest = kbd->xkb_interest;
|
||||
if ((!interest)||(force))
|
||||
|
|
|
|||
Loading…
Reference in a new issue