aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-01-02 18:29:42 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-01-02 18:29:42 +0000
commite9325b958f6fb6416f77a1f0d9f8b049f6a6a46b (patch)
treea45b667986768d6aa1da47483d4b53705417b4ac
parentMerge branch 'master' into visual-focus (diff)
term: rename term_focus_{in,out} -> term_kbd_focus_{in,out}
-rw-r--r--input.c4
-rw-r--r--terminal.c4
-rw-r--r--terminal.h4
3 files changed, 6 insertions, 6 deletions
diff --git a/input.c b/input.c
index ebbcac74..9df9c5dc 100644
--- a/input.c
+++ b/input.c
@@ -90,7 +90,7 @@ keyboard_enter(void *data, struct wl_keyboard *wl_keyboard, uint32_t serial,
wayl->kbd_focus = wayl_terminal_from_surface(wayl, surface);
assert(wayl->kbd_focus != NULL);
- term_focus_in(wayl->kbd_focus);
+ term_kbd_focus_in(wayl->kbd_focus);
term_xcursor_update(wayl->kbd_focus);
}
@@ -157,7 +157,7 @@ keyboard_leave(void *data, struct wl_keyboard *wl_keyboard, uint32_t serial,
* keyboard_leave() (and keyboard_key()) without first having
* received a keyboard_enter()
*/
- term_focus_out(old_focused);
+ term_kbd_focus_out(old_focused);
term_xcursor_update(old_focused);
} else {
LOG_WARN(
diff --git a/terminal.c b/terminal.c
index a9ed686f..4e1dd201 100644
--- a/terminal.c
+++ b/terminal.c
@@ -1392,7 +1392,7 @@ term_restore_cursor(struct terminal *term)
}
void
-term_focus_in(struct terminal *term)
+term_kbd_focus_in(struct terminal *term)
{
if (term->cursor_blink.active)
cursor_blink_start_timer(term);
@@ -1404,7 +1404,7 @@ term_focus_in(struct terminal *term)
}
void
-term_focus_out(struct terminal *term)
+term_kbd_focus_out(struct terminal *term)
{
if (term->cursor_blink.active)
cursor_blink_stop_timer(term);
diff --git a/terminal.h b/terminal.h
index e4eafe77..301ebad1 100644
--- a/terminal.h
+++ b/terminal.h
@@ -378,8 +378,8 @@ void term_arm_blink_timer(struct terminal *term);
void term_restore_cursor(struct terminal *term);
-void term_focus_in(struct terminal *term);
-void term_focus_out(struct terminal *term);
+void term_kbd_focus_in(struct terminal *term);
+void term_kbd_focus_out(struct terminal *term);
void term_mouse_down(struct terminal *term, int button, int row, int col);
void term_mouse_up(struct terminal *term, int button, int row, int col);
void term_mouse_motion(struct terminal *term, int button, int row, int col);