qf/newtree
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/newtree synced 2024-11-22 04:01:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

apply Bruce Momjian's update to his sound/focus patch. Thankyou.

Browse source
This commit is contained in:
Bill Currie 2001-07-12 16:39:49 +00:00
parent c4fe80e9c3
commit 6714119351
1 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
source/in_x11.c
View file

@ -87,7 +87,8 @@ static float mouse_x, mouse_y;
static float old_mouse_x, old_mouse_y; static float old_mouse_x, old_mouse_y;
static int p_mouse_x, p_mouse_y; static int p_mouse_x, p_mouse_y;
static float save_volume = -1, save_bgmvolume = -1; static float save_volume, save_bgmvolume;
int saved_volume = 0;
#define KEY_MASK (KeyPressMask | KeyReleaseMask) #define KEY_MASK (KeyPressMask | KeyReleaseMask)
#define MOUSE_MASK (ButtonPressMask | ButtonReleaseMask | PointerMotionMask) #define MOUSE_MASK (ButtonPressMask | ButtonReleaseMask | PointerMotionMask)
@ -350,21 +351,30 @@ event_button (XEvent * event)
static void static void
event_focusout (XEvent * event) event_focusout (XEvent * event)
{ {
/* it is possible to receive multiple out of focus events, so only
* handle the first one.
*/
if (saved_volume == 0)
{
XAutoRepeatOn (x_disp); XAutoRepeatOn (x_disp);
save_volume = volume->value; save_volume = volume->value;
save_bgmvolume = bgmvolume->value; save_bgmvolume = bgmvolume->value;
volume->value = 0; volume->value = 0;
bgmvolume->value = 0; bgmvolume->value = 0;
saved_volume = 1;
}
} }
static void static void
event_focusin (XEvent * event) event_focusin (XEvent * event)
{ {
if (saved_volume == 1)
{
XAutoRepeatOff (x_disp); XAutoRepeatOff (x_disp);
if (save_volume != -1)
volume->value = save_volume; volume->value = save_volume;
if (save_bgmvolume != -1)
bgmvolume->value = save_bgmvolume; bgmvolume->value = save_bgmvolume;
saved_volume = 0;
}
} }
static void static void