From: Max Kellermann Date: Mon, 22 Sep 2008 08:38:58 +0000 (+0200) Subject: code style, indent with tabs IX X-Git-Tag: v0.12_alpha1~186 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=fdb5dfccf904731fc8494946fe79416661207ff3;p=ncmpc.git code style, indent with tabs IX Follow the same code style als MPD itself. --- diff --git a/src/options.c b/src/options.c index 1ac3195..e92cebb 100644 --- a/src/options.c +++ b/src/options.c @@ -1,6 +1,4 @@ -/* - * $Id$ - * +/* * (c) 2004 by Kalle Wallin * * This program is free software; you can redistribute it and/or modify @@ -49,181 +47,179 @@ typedef void (*option_callback_fn_t)(int c, const char *arg); options_t options; static arg_opt_t option_table[] = { - { '?', "help", NULL, "Show this help message" }, - { 'V', "version", NULL, "Display version information" }, - { 'c', "colors", NULL, "Enable colors" }, - { 'C', "no-colors", NULL, "Disable colors" }, + { '?', "help", NULL, "Show this help message" }, + { 'V', "version", NULL, "Display version information" }, + { 'c', "colors", NULL, "Enable colors" }, + { 'C', "no-colors", NULL, "Disable colors" }, #ifdef HAVE_GETMOUSE - { 'm', "mouse", NULL, "Enable mouse" }, - { 'M', "no-mouse", NULL, "Disable mouse" }, + { 'm', "mouse", NULL, "Enable mouse" }, + { 'M', "no-mouse", NULL, "Disable mouse" }, #endif - { 'e', "exit", NULL, "Exit on connection errors" }, - { 'p', "port", "PORT", "Connect to server on port [" DEFAULT_PORT_STR "]" }, - { 'h', "host", "HOST", "Connect to server on host [" DEFAULT_HOST "]" }, - { 'P', "password","PASSWORD", "Connect with password" }, - { 'f', "config", "FILE", "Read configuration from file" }, - { 'k', "key-file","FILE", "Read configuration from file" }, - { 'S', "no-splash", NULL, "Don't show the splash screen" }, + { 'e', "exit", NULL, "Exit on connection errors" }, + { 'p', "port", "PORT", "Connect to server on port [" DEFAULT_PORT_STR "]" }, + { 'h', "host", "HOST", "Connect to server on host [" DEFAULT_HOST "]" }, + { 'P', "password","PASSWORD", "Connect with password" }, + { 'f', "config", "FILE", "Read configuration from file" }, + { 'k', "key-file","FILE", "Read configuration from file" }, + { 'S', "no-splash", NULL, "Don't show the splash screen" }, #ifndef NDEBUG - { 'K', "dump-keys", NULL, "Dump key bindings to stdout" }, - { 'D', "debug", NULL, "Enable debug output on stderr" }, + { 'K', "dump-keys", NULL, "Dump key bindings to stdout" }, + { 'D', "debug", NULL, "Enable debug output on stderr" }, #endif - { 0, NULL, NULL, NULL }, + { 0, NULL, NULL, NULL }, }; static arg_opt_t * lookup_option(int s, char *l) { - int i; - - i=0; - while( option_table[i].descrition ) - { - if( l && strcmp(l, option_table[i].longopt) == 0 ) - return &option_table[i];; - if( s && s==option_table[i].shortopt ) - return &option_table[i];; - i++; - } - return NULL; + int i; + + i=0; + while (option_table[i].descrition) { + if (l && strcmp(l, option_table[i].longopt) == 0) + return &option_table[i];; + if (s && s == option_table[i].shortopt) + return &option_table[i];; + i++; + } + + return NULL; } static void option_error(int error, const char *option, const char *arg) { - switch(error) - { - case ERROR_UNKNOWN_OPTION: - fprintf(stderr, PACKAGE ": invalid option %s\n", option); - break; - case ERROR_BAD_ARGUMENT: - fprintf(stderr, PACKAGE ": bad argument: %s\n", option); - break; - case ERROR_GOT_ARGUMENT: - fprintf(stderr, PACKAGE ": invalid option %s=%s\n", option, arg); - break; - case ERROR_MISSING_ARGUMENT: - fprintf(stderr, PACKAGE ": missing value for %s option\n", option); - break; - default: - fprintf(stderr, PACKAGE ": internal error %d\n", error); - break; - } - exit(EXIT_FAILURE); + switch (error) { + case ERROR_UNKNOWN_OPTION: + fprintf(stderr, PACKAGE ": invalid option %s\n", option); + break; + case ERROR_BAD_ARGUMENT: + fprintf(stderr, PACKAGE ": bad argument: %s\n", option); + break; + case ERROR_GOT_ARGUMENT: + fprintf(stderr, PACKAGE ": invalid option %s=%s\n", option, arg); + break; + case ERROR_MISSING_ARGUMENT: + fprintf(stderr, PACKAGE ": missing value for %s option\n", option); + break; + default: + fprintf(stderr, PACKAGE ": internal error %d\n", error); + break; + } + + exit(EXIT_FAILURE); } -static void +static void display_help(void) { - int i = 0; - - printf("Usage: %s [OPTION]...\n", PACKAGE); - while( option_table[i].descrition ) - { - char tmp[MAX_LONGOPT_LENGTH]; - - if( option_table[i].argument ) - g_snprintf(tmp, MAX_LONGOPT_LENGTH, "%s=%s", - option_table[i].longopt, - option_table[i].argument); - else - g_strlcpy(tmp, option_table[i].longopt, 64); - - printf(" -%c, --%-20s %s\n", - option_table[i].shortopt, - tmp, - option_table[i].descrition); - i++; - } + int i = 0; + + printf("Usage: %s [OPTION]...\n", PACKAGE); + while (option_table[i].descrition) { + char tmp[MAX_LONGOPT_LENGTH]; + + if (option_table[i].argument) + g_snprintf(tmp, MAX_LONGOPT_LENGTH, "%s=%s", + option_table[i].longopt, + option_table[i].argument); + else + g_strlcpy(tmp, option_table[i].longopt, 64); + + printf(" -%c, --%-20s %s\n", + option_table[i].shortopt, + tmp, + option_table[i].descrition); + i++; + } } -static void +static void handle_option(int c, const char *arg) { - D("option callback -%c %s\n", c, arg); - switch(c) - { - case '?': /* --help */ - display_help(); - exit(EXIT_SUCCESS); - case 'V': /* --version */ - printf("%s version: %s\n", PACKAGE, VERSION); - printf("build options:"); + D("option callback -%c %s\n", c, arg); + switch (c) { + case '?': /* --help */ + display_help(); + exit(EXIT_SUCCESS); + case 'V': /* --version */ + printf("%s version: %s\n", PACKAGE, VERSION); + printf("build options:"); #ifndef NDEBUG - printf(" debug"); + printf(" debug"); #endif #ifdef ENABLE_NLS - printf(" nls"); + printf(" nls"); #endif #ifdef HAVE_GETMOUSE - printf(" getmouse"); + printf(" getmouse"); #endif #ifdef ENABLE_ARTIST_SCREEN - printf(" artist-screen"); + printf(" artist-screen"); #endif #ifdef ENABLE_SEARCH_SCREEN - printf(" search-screen"); + printf(" search-screen"); #endif #ifdef ENABLE_KEYDEF_SCREEN - printf(" key-screen"); + printf(" key-screen"); #endif - printf("\n"); - exit(EXIT_SUCCESS); - case 'c': /* --colors */ - options.enable_colors = TRUE; - break; - case 'C': /* --no-colors */ - options.enable_colors = FALSE; - break; - case 'm': /* --mouse */ - options.enable_mouse = TRUE; - break; - case 'M': /* --no-mouse */ - options.enable_mouse = FALSE; - break; - case 'e': /* --exit */ - options.reconnect = FALSE; - break; - case 'p': /* --port */ - options.port = atoi(arg); - break; - case 'h': /* --host */ - if( options.host ) - g_free(options.host); - options.host = g_strdup(arg); - break; - case 'P': /* --password */ - if( options.password ) - g_free(options.password); - options.password = locale_to_utf8(arg); - break; - case 'f': /* --config */ - if( options.config_file ) - g_free(options.config_file); - options.config_file = g_strdup(arg); - break; - case 'k': /* --key-file */ - if( options.key_file ) - g_free(options.key_file); - options.key_file = g_strdup(arg); - break; - case 'S': /* --key-file */ - /* the splash screen was removed */ - break; + printf("\n"); + exit(EXIT_SUCCESS); + case 'c': /* --colors */ + options.enable_colors = TRUE; + break; + case 'C': /* --no-colors */ + options.enable_colors = FALSE; + break; + case 'm': /* --mouse */ + options.enable_mouse = TRUE; + break; + case 'M': /* --no-mouse */ + options.enable_mouse = FALSE; + break; + case 'e': /* --exit */ + options.reconnect = FALSE; + break; + case 'p': /* --port */ + options.port = atoi(arg); + break; + case 'h': /* --host */ + if( options.host ) + g_free(options.host); + options.host = g_strdup(arg); + break; + case 'P': /* --password */ + if( options.password ) + g_free(options.password); + options.password = locale_to_utf8(arg); + break; + case 'f': /* --config */ + if( options.config_file ) + g_free(options.config_file); + options.config_file = g_strdup(arg); + break; + case 'k': /* --key-file */ + if( options.key_file ) + g_free(options.key_file); + options.key_file = g_strdup(arg); + break; + case 'S': /* --key-file */ + /* the splash screen was removed */ + break; #ifndef NDEBUG - case 'K': /* --dump-keys */ - read_configuration(&options); - write_key_bindings(stdout, KEYDEF_WRITE_ALL | KEYDEF_COMMENT_ALL); - exit(EXIT_SUCCESS); - break; - case 'D': /* --debug */ - options.debug = TRUE; - break; + case 'K': /* --dump-keys */ + read_configuration(&options); + write_key_bindings(stdout, KEYDEF_WRITE_ALL | KEYDEF_COMMENT_ALL); + exit(EXIT_SUCCESS); + break; + case 'D': /* --debug */ + options.debug = TRUE; + break; #endif - default: - fprintf(stderr,"Unknown Option %c = %s\n", c, arg); - break; - } + default: + fprintf(stderr,"Unknown Option %c = %s\n", c, arg); + break; + } } options_t * @@ -276,23 +272,23 @@ options_parse(int argc, const char *argv[]) for(j=1; jargument ) + if (opt && opt->argument) option_error(ERROR_MISSING_ARGUMENT, opt->longopt, opt->argument); /* check if the option exists */ - if( (opt=lookup_option(arg[j], NULL))==NULL ) + if ((opt=lookup_option(arg[j], NULL)) == NULL) option_error(ERROR_UNKNOWN_OPTION, arg, NULL); /* if no option argument is needed execute callback */ - if( opt->argument==NULL ) { + if (opt->argument == NULL) { option_cb (opt->shortopt, NULL); opt = NULL; } } } else { /* is this a option argument? */ - if( opt && opt->argument) { + if (opt && opt->argument) { option_cb (opt->shortopt, arg); opt = NULL; } else @@ -301,9 +297,9 @@ options_parse(int argc, const char *argv[]) i++; } - if( opt && opt->argument==NULL) + if (opt && opt->argument == NULL) option_cb (opt->shortopt, NULL); - else if( opt && opt->argument ) + else if (opt && opt->argument) option_error(ERROR_MISSING_ARGUMENT, opt->longopt, opt->argument); return &options; @@ -318,12 +314,12 @@ options_init( void ) memset(&options, 0, sizeof(options_t)); /* get initial values for host and password from MPD_HOST (enviroment) */ - if ((value=g_getenv(MPD_HOST_ENV))) + if ((value = g_getenv(MPD_HOST_ENV))) options.host = g_strdup(value); else options.host = g_strdup(DEFAULT_HOST); - if ((tmp=g_strstr_len(options.host, strlen(options.host), "@"))) { + if ((tmp = g_strstr_len(options.host, strlen(options.host), "@"))) { char *oldhost = options.host; *tmp = '\0'; options.password = locale_to_utf8(oldhost); @@ -332,7 +328,7 @@ options_init( void ) } /* get initial values for port from MPD_PORT (enviroment) */ - if ((value=g_getenv(MPD_PORT_ENV))) + if ((value = g_getenv(MPD_PORT_ENV))) options.port = atoi(value); else options.port = DEFAULT_PORT; diff --git a/src/screen_utils.c b/src/screen_utils.c index 21da92e..301c791 100644 --- a/src/screen_utils.c +++ b/src/screen_utils.c @@ -38,40 +38,40 @@ void screen_bell(void) { - if( options.audible_bell ) - beep(); - if( options.visible_bell ) - flash(); + if (options.audible_bell) + beep(); + if (options.visible_bell) + flash(); } int screen_getch(WINDOW *w, const char *prompt) { - int key = -1; - int prompt_len = strlen(prompt); + int key = -1; + int prompt_len = strlen(prompt); - colors_use(w, COLOR_STATUS_ALERT); - wclear(w); - wmove(w, 0, 0); - waddstr(w, prompt); - wmove(w, 0, prompt_len); - - echo(); - curs_set(1); + colors_use(w, COLOR_STATUS_ALERT); + wclear(w); + wmove(w, 0, 0); + waddstr(w, prompt); + wmove(w, 0, prompt_len); - while( (key=my_wgetch(w)) == ERR ) - ; + echo(); + curs_set(1); + + while ((key=my_wgetch(w)) == ERR) + ; #ifdef HAVE_GETMOUSE - /* ignore mouse events */ - if( key==KEY_MOUSE ) - return screen_getch(w, prompt); + /* ignore mouse events */ + if (key == KEY_MOUSE) + return screen_getch(w, prompt); #endif - noecho(); - curs_set(0); + noecho(); + curs_set(0); - return key; + return key; } char * @@ -81,54 +81,58 @@ screen_readln(WINDOW *w, GList **history, GCompletion *gcmp) { - char *line = NULL; - - wmove(w, 0,0); - curs_set(1); - colors_use(w, COLOR_STATUS_ALERT); - line = wreadln(w, prompt, value, COLS, history, gcmp); - curs_set(0); - return line; + char *line = NULL; + + wmove(w, 0,0); + curs_set(1); + colors_use(w, COLOR_STATUS_ALERT); + line = wreadln(w, prompt, value, COLS, history, gcmp); + curs_set(0); + return line; } char * screen_getstr(WINDOW *w, const char *prompt) { - return screen_readln(w, prompt, NULL, NULL, NULL); + return screen_readln(w, prompt, NULL, NULL, NULL); } static char * screen_read_password(WINDOW *w, const char *prompt) { - if(w == NULL) - { - int rows, cols; - getmaxyx(stdscr, rows, cols); - /* create window for input */ - w = newwin(1, cols, rows-1, 0); - leaveok(w, FALSE); - keypad(w, TRUE); - } - wmove(w, 0,0); - curs_set(1); - colors_use(w, COLOR_STATUS_ALERT); - if(prompt == NULL) - return wreadln_masked(w, _("Password: "), NULL, COLS, NULL, NULL); - else - return wreadln_masked(w, prompt, NULL, COLS, NULL, NULL); - curs_set(0); + if (w == NULL) { + int rows, cols; + getmaxyx(stdscr, rows, cols); + /* create window for input */ + w = newwin(1, cols, rows-1, 0); + leaveok(w, FALSE); + keypad(w, TRUE); + } + + wmove(w, 0,0); + curs_set(1); + colors_use(w, COLOR_STATUS_ALERT); + + if (prompt == NULL) + return wreadln_masked(w, _("Password: "), NULL, COLS, NULL, NULL); + else + return wreadln_masked(w, prompt, NULL, COLS, NULL, NULL); + + curs_set(0); } - + static gint _screen_auth(struct mpdclient *c, gint recursion) { - mpd_clearError(c->connection); - if(recursion > 2) return 1; - mpd_sendPasswordCommand(c->connection, screen_read_password(NULL, NULL)); - mpd_finishCommand(c->connection); - mpdclient_update(c); - if( c->connection->errorCode == MPD_ACK_ERROR_PASSWORD ) return _screen_auth(c, ++recursion); - return 0; + mpd_clearError(c->connection); + if (recursion > 2) + return 1; + mpd_sendPasswordCommand(c->connection, screen_read_password(NULL, NULL)); + mpd_finishCommand(c->connection); + mpdclient_update(c); + if (c->connection->errorCode == MPD_ACK_ERROR_PASSWORD) + return _screen_auth(c, ++recursion); + return 0; } gint @@ -141,9 +145,9 @@ screen_auth(struct mpdclient *c) } /* query user for a string and find it in a list window */ -int +int screen_find(screen_t *screen, - list_window_t *lw, + list_window_t *lw, int rows, command_t findcmd, list_window_callback_fn_t callback_fn, @@ -159,117 +163,109 @@ screen_find(screen_t *screen, reversed = 1; } - switch(findcmd) - { - case CMD_LIST_FIND: - case CMD_LIST_RFIND: - if( screen->findbuf ) - { - g_free(screen->findbuf); - screen->findbuf=NULL; - } - /* continue... */ - case CMD_LIST_FIND_NEXT: - case CMD_LIST_RFIND_NEXT: - if( !screen->findbuf ) - screen->findbuf=screen_readln(screen->status_window.w, - prompt, - value, - &screen->find_history, - NULL); - if( !screen->findbuf || !screen->findbuf[0] ) - return 1; - if( reversed ) - retval = list_window_rfind(lw, - callback_fn, - callback_data, - screen->findbuf, - options.find_wrap, - rows); - else - retval = list_window_find(lw, - callback_fn, - callback_data, - screen->findbuf, - options.find_wrap); - if( retval == 0 ) - { - lw->repaint = 1; - } - else - { - screen_status_printf(_("Unable to find \'%s\'"), screen->findbuf); - screen_bell(); + switch (findcmd) { + case CMD_LIST_FIND: + case CMD_LIST_RFIND: + if (screen->findbuf) { + g_free(screen->findbuf); + screen->findbuf=NULL; + } + /* continue... */ + + case CMD_LIST_FIND_NEXT: + case CMD_LIST_RFIND_NEXT: + if (!screen->findbuf) + screen->findbuf=screen_readln(screen->status_window.w, + prompt, + value, + &screen->find_history, + NULL); + + if (!screen->findbuf || !screen->findbuf[0]) + return 1; + + if (reversed) + retval = list_window_rfind(lw, + callback_fn, + callback_data, + screen->findbuf, + options.find_wrap, + rows); + else + retval = list_window_find(lw, + callback_fn, + callback_data, + screen->findbuf, + options.find_wrap); + + if (retval == 0) + lw->repaint = 1; + else { + screen_status_printf(_("Unable to find \'%s\'"), screen->findbuf); + screen_bell(); + } + return 1; + default: + break; } - return 1; - default: - break; - } - return 0; + return 0; } void screen_display_completion_list(screen_t *screen, GList *list) { - static GList *prev_list = NULL; - static gint prev_length = 0; - static gint offset = 0; - WINDOW *w = screen->main_window.w; - gint length, y=0; - - length = g_list_length(list); - if( list==prev_list && length==prev_length ) - { - offset += screen->main_window.rows; - if( offset>=length ) - offset=0; - } - else - { - prev_list = list; - prev_length = length; - offset = 0; - } - - colors_use(w, COLOR_STATUS_ALERT); - while( ymain_window.rows ) - { - GList *item = g_list_nth(list, y+offset); - - wmove(w, y++, 0); - wclrtoeol(w); - if( item ) - { - gchar *tmp = g_strdup(item->data); - waddstr(w, basename(tmp)); - g_free(tmp); + static GList *prev_list = NULL; + static gint prev_length = 0; + static gint offset = 0; + WINDOW *w = screen->main_window.w; + gint length, y=0; + + length = g_list_length(list); + if (list == prev_list && length == prev_length) { + offset += screen->main_window.rows; + if (offset >= length) + offset = 0; + } else { + prev_list = list; + prev_length = length; + offset = 0; } - } - wrefresh(w); - doupdate(); - colors_use(w, COLOR_LIST); + + colors_use(w, COLOR_STATUS_ALERT); + while (y < screen->main_window.rows) { + GList *item = g_list_nth(list, y+offset); + + wmove(w, y++, 0); + wclrtoeol(w); + if (item) { + gchar *tmp = g_strdup(item->data); + waddstr(w, basename(tmp)); + g_free(tmp); + } + } + + wrefresh(w); + doupdate(); + colors_use(w, COLOR_LIST); } void set_xterm_title(const char *format, ...) { - /* the current xterm title exists under the WM_NAME property */ - /* and can be retreived with xprop -id $WINDOWID */ - - if( options.enable_xterm_title ) - { - if( g_getenv("WINDOWID") ) - { - char *msg; - va_list ap; - - va_start(ap,format); - msg = g_strdup_vprintf(format,ap); - va_end(ap); - printf("%c]0;%s%c", '\033', msg, '\007'); - g_free(msg); + /* the current xterm title exists under the WM_NAME property */ + /* and can be retreived with xprop -id $WINDOWID */ + + if (options.enable_xterm_title) { + if (g_getenv("WINDOWID")) { + char *msg; + va_list ap; + + va_start(ap,format); + msg = g_strdup_vprintf(format,ap); + va_end(ap); + printf("%c]0;%s%c", '\033', msg, '\007'); + g_free(msg); + } else + options.enable_xterm_title = FALSE; } - else - options.enable_xterm_title = FALSE; - } }