Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
st.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove dup of default window size.
[st.git]
/
st.c
diff --git
a/st.c
b/st.c
index
df8353a
..
4649079
100644
(file)
--- a/
st.c
+++ b/
st.c
@@
-241,6
+241,8
@@
static void (*handler[LASTEvent])(XEvent *) = {
[VisibilityNotify] = visibility,
[UnmapNotify] = unmap,
[Expose] = expose,
[VisibilityNotify] = visibility,
[UnmapNotify] = unmap,
[Expose] = expose,
+ [EnterNotify] = focus,
+ [LeaveNotify] = focus,
[FocusIn] = focus,
[FocusOut] = focus,
[MotionNotify] = bmotion,
[FocusIn] = focus,
[FocusOut] = focus,
[MotionNotify] = bmotion,
@@
-1625,8
+1627,8
@@
xinit(void) {
xloadcols();
/* window - default size */
xloadcols();
/* window - default size */
- xw.bufh = 24 * xw.ch;
- xw.bufw = 80 * xw.cw;
+ xw.bufh = term.row * xw.ch;
+ xw.bufw = term.col * xw.cw;
xw.h = xw.bufh + 2*BORDER;
xw.w = xw.bufw + 2*BORDER;
xw.h = xw.bufh + 2*BORDER;
xw.w = xw.bufw + 2*BORDER;
@@
-1635,7
+1637,8
@@
xinit(void) {
attrs.bit_gravity = NorthWestGravity;
attrs.event_mask = FocusChangeMask | KeyPressMask
| ExposureMask | VisibilityChangeMask | StructureNotifyMask
attrs.bit_gravity = NorthWestGravity;
attrs.event_mask = FocusChangeMask | KeyPressMask
| ExposureMask | VisibilityChangeMask | StructureNotifyMask
- | ButtonMotionMask | ButtonPressMask | ButtonReleaseMask;
+ | ButtonMotionMask | ButtonPressMask | ButtonReleaseMask
+ | EnterWindowMask | LeaveWindowMask;
attrs.colormap = xw.cmap;
parent = opt_embed ? strtol(opt_embed, NULL, 0) : XRootWindow(xw.dpy, xw.scr);
attrs.colormap = xw.cmap;
parent = opt_embed ? strtol(opt_embed, NULL, 0) : XRootWindow(xw.dpy, xw.scr);
@@
-1819,7
+1822,7
@@
xseturgency(int add) {
void
focus(XEvent *ev) {
void
focus(XEvent *ev) {
- if(ev->type == FocusIn) {
+ if(ev->type == FocusIn || ev->type == EnterNotify) {
xw.state |= WIN_FOCUSED;
xseturgency(0);
} else
xw.state |= WIN_FOCUSED;
xseturgency(0);
} else