diff --git a/doc/variables.xml b/doc/variables.xml index 0617f874..45dc09bb 100644 --- a/doc/variables.xml +++ b/doc/variables.xml @@ -2130,6 +2130,33 @@ Kernel version + + + + + + + An indicator for Capital Lock key. + + + + + + + + + An indicator for Number Lock key. + + + + + + + + + An indicator for Scrolling Lock key. + + diff --git a/src/core.cc b/src/core.cc index 07a6e719..5a623db8 100644 --- a/src/core.cc +++ b/src/core.cc @@ -830,9 +830,9 @@ struct text_object *construct_text_object(char *s, const char *arg, long line, obj->callbacks.free = &gen_free_opaque; #ifdef BUILD_X11 - END OBJ(num_led, 0) obj->callbacks.print = &print_num_led; - END OBJ(caps_led, 0) obj->callbacks.print = &print_caps_led; - END OBJ(scroll_led, 0) obj->callbacks.print = &print_scroll_led; + END OBJ(key_num_lock, 0) obj->callbacks.print = &print_key_num_lock; + END OBJ(key_caps_lock, 0) obj->callbacks.print = &print_key_caps_lock; + END OBJ(key_scroll_lock, 0) obj->callbacks.print = &print_key_scroll_lock; END OBJ(keyboard_layout, 0) obj->callbacks.print = &print_keyboard_layout; END OBJ(mouse_speed, 0) obj->callbacks.print = &print_mouse_speed; #endif /* BUILD_X11 */ diff --git a/src/x11.cc b/src/x11.cc index e90bb738..ceaac078 100644 --- a/src/x11.cc +++ b/src/x11.cc @@ -1266,17 +1266,17 @@ void print_kdb_led(const int keybit, char *p, unsigned int p_max_size) { XGetKeyboardControl(display, &x); snprintf(p, p_max_size, "%s", (x.led_mask & keybit ? "On" : "Off")); } -void print_caps_led(struct text_object *obj, char *p, unsigned int p_max_size) { +void print_key_caps_lock(struct text_object *obj, char *p, unsigned int p_max_size) { (void)obj; print_kdb_led(1, p, p_max_size); } -void print_num_led(struct text_object *obj, char *p, unsigned int p_max_size) { +void print_key_num_lock(struct text_object *obj, char *p, unsigned int p_max_size) { (void)obj; print_kdb_led(2, p, p_max_size); } -void print_scroll_led(struct text_object *obj, char *p, +void print_key_scroll_lock(struct text_object *obj, char *p, unsigned int p_max_size) { (void)obj; print_kdb_led(4, p, p_max_size); diff --git a/src/x11.h b/src/x11.h index c50498f8..61cca816 100644 --- a/src/x11.h +++ b/src/x11.h @@ -116,9 +116,9 @@ void print_desktop_number(struct text_object *, char *, unsigned int); void print_desktop_name(struct text_object *, char *, unsigned int); /* Num lock, Scroll lock, Caps Lock */ -void print_num_led(struct text_object *, char *, unsigned int); -void print_caps_led(struct text_object *, char *, unsigned int); -void print_scroll_led(struct text_object *, char *, unsigned int); +void print_key_num_lock(struct text_object *, char *, unsigned int); +void print_key_caps_lock(struct text_object *, char *, unsigned int); +void print_key_scroll_lock(struct text_object *, char *, unsigned int); /* Keyboard layout and mouse speed in percentage */ void print_keyboard_layout(struct text_object *, char *, unsigned int);