summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Davenport <qball@blame.services>2022-11-17 17:41:43 +0100
committerDave Davenport <qball@blame.services>2022-11-17 17:41:43 +0100
commit9dc80f8f7317ed1df6775bb63815d686a88fb2a4 (patch)
tree97d5bc3e409c2495ec767417ea2724cabc4c0884
parentff08041483ef67b4643ba3766b43bc0e9d2d9ff4 (diff)
small updates
-rw-r--r--source/keyb.c46
1 files changed, 25 insertions, 21 deletions
diff --git a/source/keyb.c b/source/keyb.c
index c035c672..4ae01753 100644
--- a/source/keyb.c
+++ b/source/keyb.c
@@ -24,12 +24,12 @@
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
*/
-#include <config.h>
+#include "config.h"
#include "rofi.h"
#include "xrmoptions.h"
#include <glib.h>
+#include <nkutils-bindings.h>
#include <string.h>
-#include "nkutils-bindings.h"
typedef struct {
guint id;
@@ -373,7 +373,7 @@ static const gchar *mouse_default_bindings[] = {
[MOUSE_DCLICK_UP] = "!MouseDPrimary",
};
-void abe_list_all_bindings(gboolean is_term ) {
+void abe_list_all_bindings(gboolean is_term) {
int length = 0;
for (gsize i = 0; i < G_N_ELEMENTS(rofi_bindings); ++i) {
@@ -384,9 +384,10 @@ void abe_list_all_bindings(gboolean is_term ) {
for (gsize i = 0; i < G_N_ELEMENTS(rofi_bindings); ++i) {
ActionBindingEntry *b = &rofi_bindings[i];
if (is_term) {
- printf("%s%*s%s - %s\n", color_bold,length, b->name, color_reset,b->binding);
+ printf("%s%*s%s - %s\n", color_bold, length, b->name, color_reset,
+ b->binding);
} else {
- printf("%*s - %s\n", length, b->name, b->binding);
+ printf("%*s - %s\n", length, b->name, b->binding);
}
}
}
@@ -440,22 +441,25 @@ gboolean parse_keys_abe(NkBindings *bindings) {
if (!nk_bindings_add_binding(bindings, b->scope, entry,
binding_check_action, binding_trigger_action,
GUINT_TO_POINTER(b->id), NULL, &error)) {
- if ( error->code == NK_BINDINGS_ERROR_ALREADY_REGISTERED && error->domain == NK_BINDINGS_ERROR){
- char *str = g_markup_printf_escaped(
- "Failed to set binding <i>%s</i> for: <i>%s (%s)</i>:\n\t<span "
- "size=\"smaller\" style=\"italic\">Binding `%s` is already bound.\n"
- "\tExecute <b>rofi -list-keybindings</b> to get the current list of configured bindings.</span>\n",
- b->binding, b->comment, b->name, entry);
- g_string_append(error_msg, str);
- g_free(str);
- } else {
- char *str = g_markup_printf_escaped(
- "Failed to set binding <i>%s</i> for: <i>%s (%s)</i>:\n\t<span "
- "size=\"smaller\" style=\"italic\">%s</span>\n",
- b->binding, b->comment, b->name, error->message);
- g_string_append(error_msg, str);
- g_free(str);
- }
+ if (error->code == NK_BINDINGS_ERROR_ALREADY_REGISTERED &&
+ error->domain == NK_BINDINGS_ERROR) {
+ char *str = g_markup_printf_escaped(
+ "Failed to set binding <i>%s</i> for: <i>%s (%s)</i>:\n\t<span "
+ "size=\"smaller\" style=\"italic\">Binding `%s` is already "
+ "bound.\n"
+ "\tExecute <b>rofi -list-keybindings</b> to get the current list "
+ "of configured bindings.</span>\n",
+ b->binding, b->comment, b->name, entry);
+ g_string_append(error_msg, str);
+ g_free(str);
+ } else {
+ char *str = g_markup_printf_escaped(
+ "Failed to set binding <i>%s</i> for: <i>%s (%s)</i>:\n\t<span "
+ "size=\"smaller\" style=\"italic\">%s</span>\n",
+ b->binding, b->comment, b->name, error->message);
+ g_string_append(error_msg, str);
+ g_free(str);
+ }
g_clear_error(&error);
}
}