summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/key.c4
-rw-r--r--src/window.c4
-rw-r--r--src/window.h2
-rw-r--r--src/xevent.c2
4 files changed, 6 insertions, 6 deletions
diff --git a/src/key.c b/src/key.c
index 660c344..99dfd7e 100644
--- a/src/key.c
+++ b/src/key.c
@@ -70,7 +70,7 @@ void vwm_key_released(vwm_t *vwm, Window win, XKeyReleasedEvent *keyrelease)
}
/* make the focused window the most recently used */
- if ((vwin = vwm_win_focused(vwm)))
+ if ((vwin = vwm_win_get_focused(vwm)))
vwm_win_mru(vwm, vwin);
/* make the focused desktop the most recently used */
@@ -112,7 +112,7 @@ void vwm_key_pressed(vwm_t *vwm, Window win, XKeyPressedEvent *keypress)
repeat_cnt = 0;
}
- vwin = vwm_win_focused(vwm);
+ vwin = vwm_win_get_focused(vwm);
switch (sym) {
diff --git a/src/window.c b/src/window.c
index aee4210..5827d0b 100644
--- a/src/window.c
+++ b/src/window.c
@@ -81,7 +81,7 @@ vwm_window_t * vwm_win_lookup(vwm_t *vwm, Window win)
/* return the currently focused window (considers current context...), may return NULL */
-vwm_window_t * vwm_win_focused(vwm_t *vwm)
+vwm_window_t * vwm_win_get_focused(vwm_t *vwm)
{
switch (vwm->focused_context) {
case VWM_CONTEXT_SHELF:
@@ -514,7 +514,7 @@ vwm_window_t * vwm_win_manage_xwin(vwm_t *vwm, vwm_xwindow_t *xwin)
}
/* put it on the global windows_mru list, if there's a focused window insert the new one after it */
- if (!list_empty(&vwm->windows_mru) && (focused = vwm_win_focused(vwm))) {
+ if (!list_empty(&vwm->windows_mru) && (focused = vwm_win_get_focused(vwm))) {
/* insert the vwin immediately after the focused window, so Mod1+Tab goes to the new window */
list_add(&vwin->windows_mru, &focused->windows_mru);
} else {
diff --git a/src/window.h b/src/window.h
index 7db1d13..4d75440 100644
--- a/src/window.h
+++ b/src/window.h
@@ -42,7 +42,7 @@ void vwm_win_unmap(vwm_t *vwm, vwm_window_t *vwin);
void vwm_win_map(vwm_t *vwm, vwm_window_t *vwin);
void vwm_win_mru(vwm_t *vwm, vwm_window_t *vwin);
vwm_window_t * vwm_win_lookup(vwm_t *vwm, Window win);
-vwm_window_t * vwm_win_focused(vwm_t *vwm);
+vwm_window_t * vwm_win_get_focused(vwm_t *vwm);
typedef enum _vwm_side_t {
VWM_SIDE_TOP,
diff --git a/src/xevent.c b/src/xevent.c
index 97c575b..e1b38e3 100644
--- a/src/xevent.c
+++ b/src/xevent.c
@@ -205,7 +205,7 @@ void vwm_xevent_handle_map_request(vwm_t *vwm, XMapRequestEvent *ev)
vwm_win_map(vwm, vwin);
/* XSetInputFocus() must to happen after XMapWindow(), so do it here. */
- if (vwm_win_focused(vwm) == vwin)
+ if (vwm_win_get_focused(vwm) == vwin)
XSetInputFocus(VWM_XDISPLAY(vwm), vwin->xwindow->id, RevertToPointerRoot, CurrentTime);
} else {
/* this is unexpected */
© All Rights Reserved