blankie
/
st
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move window urgency handling entirely into x.c 

This allows us to make xseturgency internal.

Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
This commit is contained in:
Devin J. Pohly 2017-10-10 12:01:18 -05:00
parent d5275012b4
commit 626b0ae40c
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.def.h
View File

@ -60,7 +60,7 @@ unsigned int cursorthickness = 2;
* bell volume. It must be a value between -100 and 100. Use 0 for disabling
* it
*/
static int bellvolume = 0;
int bellvolume = 0;
/* default TERM value */
char termname[] = "st-256color";

5
st.c
View File

@ -2176,10 +2176,7 @@ tcontrolcode(uchar ascii)
/* backwards compatibility to xterm */
strhandle();
} else {
if (!(win.state & WIN_FOCUSED))
xseturgency(1);
if (bellvolume)
xbell(bellvolume);
xbell();
}
break;
case '\033': /* ESC */

1
st.h
View File

@ -246,6 +246,7 @@ extern int allowaltscreen;
extern unsigned int xfps;
extern unsigned int actionfps;
extern unsigned int cursorthickness;
extern int bellvolume;
extern unsigned int blinktimeout;
extern char termname[];
extern const char *colorname[];

3
win.h
View File

@ -8,7 +8,7 @@
void draw(void);
void drawregion(int, int, int, int);
void xbell(int);
void xbell(void);
void xclipcopy(void);
void xclippaste(void);
void xhints(void);
@ -16,7 +16,6 @@ void xloadcols(void);
int xsetcolorname(int, const char *);
void xsettitle(char *);
void xsetpointermotion(int);
void xseturgency(int);
void xresize(int, int);
void xselpaste(void);
void xsetsel(char *, Time);

8
x.c
View File

@ -94,6 +94,7 @@ static void xloadfonts(char *, double);
static void xunloadfont(Font *);
static void xunloadfonts(void);
static void xsetenv(void);
static void xseturgency(int);
static void expose(XEvent *);
static void visibility(XEvent *);
@ -1521,9 +1522,12 @@ xseturgency(int add)
}
void
xbell(int vol)
xbell(void)
{
XkbBell(xw.dpy, xw.win, vol, (Atom)NULL);
if (!(win.state & WIN_FOCUSED))
xseturgency(1);
if (bellvolume)
XkbBell(xw.dpy, xw.win, bellvolume, (Atom)NULL);
}
void