From 0fd4d0c99d31b69356c289d3bb1dcd791b898028 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 25 Sep 2008 17:40:28 +0200 Subject: code style, indent with tabs X Follow the same code style als MPD itself. --- src/screen_keydef.c | 308 +++++++++++++++++++++++++--------------------------- 1 file changed, 150 insertions(+), 158 deletions(-) (limited to 'src/screen_keydef.c') diff --git a/src/screen_keydef.c b/src/screen_keydef.c index 9d573976a..3dda0ec72 100644 --- a/src/screen_keydef.c +++ b/src/screen_keydef.c @@ -1,6 +1,4 @@ -/* - * $Id$ - * +/* * (c) 2004 by Kalle Wallin * * This program is free software; you can redistribute it and/or modify @@ -59,128 +57,126 @@ static unsigned subcmd_addpos = 0; static int keybindings_changed(void) { - command_definition_t *orginal_cmds = get_command_definitions(); - size_t size = command_list_length*sizeof(command_definition_t); - - return memcmp(orginal_cmds, cmds, size); + command_definition_t *orginal_cmds = get_command_definitions(); + size_t size = command_list_length * sizeof(command_definition_t); + + return memcmp(orginal_cmds, cmds, size); } static void apply_keys(void) { - if( keybindings_changed() ) - { - command_definition_t *orginal_cmds = get_command_definitions(); - size_t size = command_list_length*sizeof(command_definition_t); - - memcpy(orginal_cmds, cmds, size); - screen_status_printf(_("You have new key bindings!")); - } - else - screen_status_printf(_("Keybindings unchanged.")); + if (keybindings_changed()) { + command_definition_t *orginal_cmds = get_command_definitions(); + size_t size = command_list_length * sizeof(command_definition_t); + + memcpy(orginal_cmds, cmds, size); + screen_status_printf(_("You have new key bindings!")); + } else + screen_status_printf(_("Keybindings unchanged.")); } static int save_keys(void) { - FILE *f; - char *filename; - - if( check_user_conf_dir() ) - { - screen_status_printf(_("Error: Unable to create direcory ~/.ncmpc - %s"), - strerror(errno)); - screen_bell(); - return -1; - } - - filename = get_user_key_binding_filename(); - - if( (f=fopen(filename,"w")) == NULL ) - { - screen_status_printf(_("Error: %s - %s"), filename, strerror(errno)); - screen_bell(); - g_free(filename); - return -1; - } - if( write_key_bindings(f, KEYDEF_WRITE_HEADER) ) - screen_status_printf(_("Error: %s - %s"), filename, strerror(errno)); - else - screen_status_printf(_("Wrote %s"), filename); - - g_free(filename); - return fclose(f); + FILE *f; + char *filename; + + if (check_user_conf_dir()) { + screen_status_printf(_("Error: Unable to create direcory ~/.ncmpc - %s"), + strerror(errno)); + screen_bell(); + return -1; + } + + filename = get_user_key_binding_filename(); + + if ((f = fopen(filename,"w")) == NULL) { + screen_status_printf(_("Error: %s - %s"), filename, strerror(errno)); + screen_bell(); + g_free(filename); + return -1; + } + + if (write_key_bindings(f, KEYDEF_WRITE_HEADER)) + screen_status_printf(_("Error: %s - %s"), filename, strerror(errno)); + else + screen_status_printf(_("Wrote %s"), filename); + + g_free(filename); + return fclose(f); } static void check_subcmd_length(void) { - subcmd_length = 0; - while( subcmd_length0 ) - subcmd_length ++; - - if( subcmd_length 0) + ++subcmd_length; + + if (subcmd_length < MAX_COMMAND_KEYS) { + subcmd_addpos = subcmd_length; + subcmd_length++; + } else + subcmd_addpos = 0; + subcmd_length += STATIC_SUB_ITEMS; } static void delete_key(int cmd_index, int key_index) { - int i = key_index+1; - - screen_status_printf(_("Deleted")); - while( iclear = 1; - lw->repaint = 1; - /* update key conflict flags */ - check_key_bindings(cmds, NULL, 0); + int i = key_index+1; + + screen_status_printf(_("Deleted")); + while (i < MAX_COMMAND_KEYS && cmds[cmd_index].keys[i]) + cmds[cmd_index].keys[key_index++] = cmds[cmd_index].keys[i++]; + cmds[cmd_index].keys[key_index] = 0; + cmds[cmd_index].flags |= COMMAND_KEY_MODIFIED; + check_subcmd_length(); + lw->clear = 1; + lw->repaint = 1; + /* update key conflict flags */ + check_key_bindings(cmds, NULL, 0); } static void assign_new_key(WINDOW *w, int cmd_index, int key_index) { - int key; - char *buf; - command_t cmd; - - buf = g_strdup_printf(_("Enter new key for %s: "), cmds[cmd_index].name); - key = screen_getch(w, buf); - g_free(buf); - if( key==KEY_RESIZE ) - screen_resize(); - if( key==ERR ) - { - screen_status_printf(_("Aborted!")); - return; - } - cmd = find_key_command(key, cmds); - if( cmd!=CMD_NONE && cmd!= cmds[cmd_index].command ) - { - screen_status_printf(_("Error: key %s is already used for %s"), - key2str(key), - get_key_command_name(cmd)); - screen_bell(); - return; - } - cmds[cmd_index].keys[key_index] = key; - cmds[cmd_index].flags |= COMMAND_KEY_MODIFIED; - - screen_status_printf(_("Assigned %s to %s"), - key2str(key),cmds[cmd_index].name); - check_subcmd_length(); - lw->repaint = 1; - /* update key conflict flags */ - check_key_bindings(cmds, NULL, 0); + int key; + char *buf; + command_t cmd; + + buf = g_strdup_printf(_("Enter new key for %s: "), cmds[cmd_index].name); + key = screen_getch(w, buf); + g_free(buf); + + if (key == KEY_RESIZE) + screen_resize(); + + if (key==ERR) { + screen_status_printf(_("Aborted!")); + return; + } + + cmd = find_key_command(key, cmds); + if (cmd != CMD_NONE && cmd != cmds[cmd_index].command) { + screen_status_printf(_("Error: key %s is already used for %s"), + key2str(key), + get_key_command_name(cmd)); + screen_bell(); + return; + } + + cmds[cmd_index].keys[key_index] = key; + cmds[cmd_index].flags |= COMMAND_KEY_MODIFIED; + + screen_status_printf(_("Assigned %s to %s"), + key2str(key),cmds[cmd_index].name); + check_subcmd_length(); + lw->repaint = 1; + /* update key conflict flags */ + check_key_bindings(cmds, NULL, 0); } static const char * @@ -217,91 +213,87 @@ list_callback(unsigned idx, int *highlight, mpd_unused void *data) return NULL; } -static void +static void keydef_init(WINDOW *w, int cols, int rows) { - lw = list_window_init(w, cols, rows); + lw = list_window_init(w, cols, rows); } static void keydef_resize(int cols, int rows) { - lw->cols = cols; - lw->rows = rows; + lw->cols = cols; + lw->rows = rows; } -static void +static void keydef_exit(void) { - list_window_free(lw); - if( cmds ) - g_free(cmds); - cmds = NULL; - lw = NULL; + list_window_free(lw); + if (cmds) + g_free(cmds); + cmds = NULL; + lw = NULL; } -static void +static void keydef_open(mpd_unused screen_t *screen, mpd_unused mpdclient_t *c) { - if( cmds == NULL ) - { - command_definition_t *current_cmds = get_command_definitions(); - size_t cmds_size; - - command_list_length = 0; - while( current_cmds[command_list_length].name ) - command_list_length++; - - cmds_size = (command_list_length+1)*sizeof(command_definition_t); - cmds = g_malloc0(cmds_size); - memcpy(cmds, current_cmds, cmds_size); - command_list_length += STATIC_ITEMS; - screen_status_printf(_("Welcome to the key editor!")); - } - - subcmd = -1; - list_window_check_selected(lw, LIST_LENGTH()); + if (cmds == NULL) { + command_definition_t *current_cmds = get_command_definitions(); + size_t cmds_size; + + command_list_length = 0; + while (current_cmds[command_list_length].name) + command_list_length++; + + cmds_size = (command_list_length+1) * sizeof(command_definition_t); + cmds = g_malloc0(cmds_size); + memcpy(cmds, current_cmds, cmds_size); + command_list_length += STATIC_ITEMS; + screen_status_printf(_("Welcome to the key editor!")); + } + + subcmd = -1; + list_window_check_selected(lw, LIST_LENGTH()); } -static void +static void keydef_close(void) { - if( cmds && !keybindings_changed() ) - { - g_free(cmds); - cmds = NULL; - } - else - screen_status_printf(_("Note: Did you forget to \'Apply\' your changes?")); + if (cmds && !keybindings_changed()) { + g_free(cmds); + cmds = NULL; + } else + screen_status_printf(_("Note: Did you forget to \'Apply\' your changes?")); } static const char * keydef_title(char *str, size_t size) { - if( subcmd<0 ) - return _("Edit key bindings"); - - g_snprintf(str, size, _("Edit keys for %s"), cmds[subcmd].name); - return str; + if (subcmd < 0) + return _("Edit key bindings"); + + g_snprintf(str, size, _("Edit keys for %s"), cmds[subcmd].name); + return str; } -static void +static void keydef_paint(mpd_unused screen_t *screen, mpd_unused mpdclient_t *c) { - lw->clear = 1; - list_window_paint(lw, list_callback, NULL); - wrefresh(lw->w); + lw->clear = 1; + list_window_paint(lw, list_callback, NULL); + wrefresh(lw->w); } -static void +static void keydef_update(mpd_unused screen_t *screen, mpd_unused mpdclient_t *c) -{ - if( lw->repaint ) - { - list_window_paint(lw, list_callback, NULL); - wrefresh(lw->w); - lw->repaint = 0; - } +{ + if (lw->repaint) { + list_window_paint(lw, list_callback, NULL); + wrefresh(lw->w); + lw->repaint = 0; + } } static int @@ -314,10 +306,10 @@ keydef_cmd(screen_t *screen, mpd_unused mpdclient_t *c, command_t cmd) switch(cmd) { case CMD_PLAY: - if( subcmd<0 ) { - if( lw->selected == LIST_ITEM_APPLY() ) + if (subcmd < 0) { + if (lw->selected == LIST_ITEM_APPLY()) apply_keys(); - else if( lw->selected == LIST_ITEM_SAVE() ) { + else if (lw->selected == LIST_ITEM_SAVE()) { apply_keys(); save_keys(); } else { @@ -332,7 +324,7 @@ keydef_cmd(screen_t *screen, mpd_unused mpdclient_t *c, command_t cmd) } else assign_new_key(screen->status_window.w, subcmd, - lw->selected-STATIC_SUB_ITEMS); + lw->selected - STATIC_SUB_ITEMS); } lw->repaint = 1; lw->clear = 1; -- cgit v1.2.3