fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-05-02 03:48:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix keyboard indicators

Browse source
This commit is contained in:
David Reveman 2006-05-05 09:43:55 +00:00
parent 54bf65fcbd
commit 2fb8f16e8b
2 changed files with 31 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2006-05-05 David Reveman <davidr@novell.com>
* hw/xgl/glx/xglx.c (xglxKbdCtrl): No need to go through more than
the first 4 leds.
(xglxKeybdProc): Turn off automatic indicator changes and make
sure audible bell is turned on.
2006-04-26 David Reveman <davidr@novell.com>
* hw/xgl/glx/xglx.c: Fix SetCursorPosition, events were not generated

28
hw/xgl/glx/xglx.c
View file

@ -1078,11 +1078,10 @@ xglxKbdCtrl (DeviceIntPtr pDev,
valueMask = KBLed | KBLedMode;
for (i = 1; i <= 32; i++)
for (i = 0; i < 5; i++)
{
values.led = i;
values.led_mode = (ctrl->leds & (1 << (i - 1))) ? LedModeOn :
LedModeOff;
values.led = i + 1;
values.led_mode = (ctrl->leds & (1 << i)) ? LedModeOn : LedModeOff;
XChangeKeyboardControl (xdisplay, valueMask, &values);
}
@ -1234,6 +1233,27 @@ xglxKeybdProc (DeviceIntPtr pDevice,
XkbFreeKeyboard (desc, 0, False);
}
if (ret)
{
desc = XkbAllocKeyboard ();
if (desc)
{
XkbGetIndicatorMap (xdisplay, XkbAllIndicatorsMask, desc);
for (i = 0; i < XkbNumIndicators; i++)
if (desc->indicators->phys_indicators & (1 << i))
desc->indicators->maps[i].flags = XkbIM_NoAutomatic;
XkbSetIndicatorMap (xdisplay, ~0, desc);
XkbFreeKeyboard (desc, 0, True);
}
XkbChangeEnabledControls (xdisplay,
XkbUseCoreKbd,
XkbAudibleBellMask,
XkbAudibleBellMask);
}
}
#endif