rexy712/rexbacklight
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

changed method of processing arguments to be a bit easier to maintain

Browse Source
This commit is contained in:
Rexy712 2018-05-26 16:06:25 -07:00
parent 0df81aa5ed
commit 4fd9f43e51
3 changed files with 77 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/cmd.h
View File

@ -31,6 +31,9 @@
struct cmd_arg{ struct cmd_arg{
const char* lopt; const char* lopt;
const char* sopt; const char* sopt;
#ifdef XBACKLIGHT_COMPAT_OPTIONS
const char* xopt;
#endif
const char* desc; const char* desc;
}; };

67
src/cmd.c
View File

@ -26,29 +26,34 @@
#define NO_OPT NULL #define NO_OPT NULL
#define GET_LONG_OPT "--get" #define GET_LONG_OPT "--get"
#define GET_SHORT_OPT "-g" #define GET_SHORT_OPT "-g"
#define GET_XBACK_OPT "-get"
#define FADE_LONG_OPT "--fade" #define FADE_LONG_OPT "--fade"
#define FADE_SHORT_OPT "-f" #define FADE_SHORT_OPT "-f"
#define FADE_XBACK_OPT "-time"
#define STEPS_LONG_OPT "--steps" #define STEPS_LONG_OPT "--steps"
#define STEPS_SHORT_OPT "-s" #define STEPS_SHORT_OPT "-s"
#define STEPS_XBACK_OPT "-steps"
#define DEVICE_LONG_OPT "--device" #define DEVICE_LONG_OPT "--device"
#define DEVICE_SHORT_OPT "-d" #define DEVICE_SHORT_OPT "-d"
#define DEVICE_XBACK_OPT "-display"
#define LIST_LONG_OPT "--list" #define LIST_LONG_OPT "--list"
#define LIST_SHORT_OPT "-l" #define LIST_SHORT_OPT "-l"
#define LIST_XBACK_OPT NO_OPT
#define HELP_LONG_OPT "--help" #define HELP_LONG_OPT "--help"
#define HELP_SHORT_OPT "-h" #define HELP_SHORT_OPT "-h"
#define HELP_LONG_OPT "--help"
#define HELP_SHORT_OPT "-h"
#define VERSION_LONG_OPT "--version"
#define DEVICE_XBACK_OPT "-display"
#define HELP_XBACK_OPT "-help" #define HELP_XBACK_OPT "-help"
#define VERSION_LONG_OPT "--version"
#define VERSION_SHORT_OPT NO_OPT
#define VERSION_XBACK_OPT "-version" #define VERSION_XBACK_OPT "-version"
#define SET_LONG_OPT NO_OPT
#define SET_SHORT_OPT NO_OPT
#define SET_XBACK_OPT "-set" #define SET_XBACK_OPT "-set"
#define INC_LONG_OPT NO_OPT
#define INC_SHORT_OPT NO_OPT
#define INC_XBACK_OPT "-inc" #define INC_XBACK_OPT "-inc"
#define DEC_LONG_OPT NO_OPT
#define DEC_SHORT_OPT NO_OPT
#define DEC_XBACK_OPT "-dec" #define DEC_XBACK_OPT "-dec"
#define GET_XBACK_OPT "-get"
#define FADE_XBACK_OPT "-time"
#define STEPS_XBACK_OPT "-steps"
#define DEVICE_DESC "select which device to control" #define DEVICE_DESC "select which device to control"
#define FADE_DESC "change brightness over time interval" #define FADE_DESC "change brightness over time interval"
@ -61,28 +66,36 @@
#define INC_DESC "increase backlight device by specified value" #define INC_DESC "increase backlight device by specified value"
#define DEC_DESC "decrease backlight device by specified value" #define DEC_DESC "decrease backlight device by specified value"
#ifdef XBACKLIGHT_COMPAT_OPTIONS int strcmp_handle_null(const char* one, const char* two){
#define CHECK_SHORT_OPTION(opt, arg) assert(0) if(!one)
#define CHECK_LONG_OPTION(opt, arg) (!strcmp(opt##_XBACK_OPT, arg)) return 1;
#define CHECK_OPTION(opt, arg) (!strcmp(opt##_XBACK_OPT, arg)) if(!two)
return -1;
return strcmp(one, two);
}
#define CHECK_SHORT_OPTION(opt, arg) (!strcmp(opt##_SHORT_OPT, arg))
#define CHECK_LONG_OPTION(opt, arg) (!strcmp(opt##_LONG_OPT, arg))
#define CHECK_XBACK_OPTION(opt, arg) (!strcmp(opt##_XBACK_OPT, arg))
#ifdef XBACKLIGHT_COMPAT_OPTIONS
#define CHECK_OPTION(opt, arg) (!strcmp_handle_null(opt##_LONG_OPT, arg) || !strcmp_handle_null(opt##_SHORT_OPT, arg) || !strcmp_handle_null(opt##_XBACK_OPT, arg))
struct cmd_arg rexbacklight_args[] = { struct cmd_arg rexbacklight_args[] = {
{DEVICE_XBACK_OPT, NO_OPT, DEVICE_DESC}, {DEVICE_LONG_OPT, DEVICE_SHORT_OPT, DEVICE_XBACK_OPT, DEVICE_DESC},
{SET_XBACK_OPT, NO_OPT, SET_DESC}, {NO_OPT, NO_OPT, SET_XBACK_OPT, SET_DESC},
{INC_XBACK_OPT, NO_OPT, INC_DESC}, {NO_OPT, NO_OPT, INC_XBACK_OPT, INC_DESC},
{DEC_XBACK_OPT, NO_OPT, DEC_DESC}, {NO_OPT, NO_OPT, DEC_XBACK_OPT, DEC_DESC},
{FADE_XBACK_OPT, NO_OPT, FADE_DESC}, {FADE_LONG_OPT, FADE_SHORT_OPT, FADE_XBACK_OPT, FADE_DESC},
{STEPS_XBACK_OPT, NO_OPT, STEPS_DESC}, {STEPS_LONG_OPT, STEPS_SHORT_OPT, STEPS_XBACK_OPT, STEPS_DESC},
{GET_XBACK_OPT, NO_OPT, GET_DESC}, {GET_LONG_OPT, GET_SHORT_OPT, GET_XBACK_OPT, GET_DESC},
{HELP_XBACK_OPT, NO_OPT, HELP_DESC}, {HELP_LONG_OPT, HELP_SHORT_OPT, HELP_XBACK_OPT, HELP_DESC},
{VERSION_XBACK_OPT, NO_OPT, VERSION_DESC} {VERSION_LONG_OPT, NO_OPT, VERSION_XBACK_OPT, VERSION_DESC}
}; };
#else //XBACKLIGHT_COMPAT_OPTIONS #else //XBACKLIGHT_COMPAT_OPTIONS
#define CHECK_SHORT_OPTION(opt, arg) (!strcmp(opt##_SHORT_OPT, arg))
#define CHECK_LONG_OPTION(opt, arg) (!strcmp(opt##_LONG_OPT, arg))
#define CHECK_OPTION(opt, arg) (!strcmp(opt##_LONG_OPT, arg) || !strcmp(opt##_SHORT_OPT, arg))
#define CHECK_OPTION(opt, arg) (!strcmp_handle_null(opt##_LONG_OPT, arg) || !strcmp_handle_null(opt##_SHORT_OPT, arg))
struct cmd_arg rexbacklight_args[] = { struct cmd_arg rexbacklight_args[] = {
{DEVICE_LONG_OPT, DEVICE_SHORT_OPT, DEVICE_DESC}, {DEVICE_LONG_OPT, DEVICE_SHORT_OPT, DEVICE_DESC},
{FADE_LONG_OPT, FADE_SHORT_OPT, FADE_DESC}, {FADE_LONG_OPT, FADE_SHORT_OPT, FADE_DESC},
@ -171,12 +184,11 @@ struct arg_values process_cmd_args(int argc, char** argv){
free_cmd_args(&ret); free_cmd_args(&ret);
return (struct arg_values){.operation = OP_USAGE}; return (struct arg_values){.operation = OP_USAGE};
} }
else if(CHECK_LONG_OPTION(VERSION, argv[i])){ else if(CHECK_OPTION(VERSION, argv[i])){
free_cmd_args(&ret); free_cmd_args(&ret);
return (struct arg_values){.operation = OP_VERSION}; return (struct arg_values){.operation = OP_VERSION};
} }
#ifndef XBACKLIGHT_COMPAT_OPTIONS
else if(CHECK_OPTION(LIST, argv[i])){ else if(CHECK_OPTION(LIST, argv[i])){
free_cmd_args(&ret); free_cmd_args(&ret);
ret.operation = OP_LIST; ret.operation = OP_LIST;
@ -195,7 +207,7 @@ struct arg_values process_cmd_args(int argc, char** argv){
curr->operation = OP_SET; curr->operation = OP_SET;
curr->delta = 0; curr->delta = 0;
} }
#else //XBACKLIGHT_COMPAT_OPTIONS #ifdef XBACKLIGHT_COMPAT_OPTIONS
else if(CHECK_OPTION(SET, argv[i])){ else if(CHECK_OPTION(SET, argv[i])){
CHECK_NEXT_ARG(); CHECK_NEXT_ARG();
curr->operation = OP_SET; curr->operation = OP_SET;
@ -314,3 +326,4 @@ int process_op(struct arg_values* arg, float min, float current, float max){
return current; return current;
} }

27
src/common.c
View File

@ -43,13 +43,26 @@ _Noreturn void usage(int exit_val){
printf("Options:\n"); printf("Options:\n");
for(i = 0;i < rexbacklight_args_length;++i){ for(i = 0;i < rexbacklight_args_length;++i){
if(!rexbacklight_args[i].lopt){ int printed = 0;
printf(" %s\n", rexbacklight_args[i].sopt); if(rexbacklight_args[i].lopt){
}else if(!rexbacklight_args[i].sopt){ printf("%s", rexbacklight_args[i].lopt);
printf(" %s\n", rexbacklight_args[i].lopt); printed = 1;
}else{
printf(" %s|%s\n", rexbacklight_args[i].lopt, rexbacklight_args[i].sopt);
} }
if(rexbacklight_args[i].sopt){
if(printed)
printf("|");
else
printed = 1;
printf("%s", rexbacklight_args[i].sopt);
}
#ifdef XBACKLIGHT_COMPAT_OPTIONS
if(rexbacklight_args[i].xopt){
if(printed)
printf("|");
printf("%s", rexbacklight_args[i].xopt);
}
#endif //XBACKLIGHT_COMPAT_OPTIONS
printf("\n");
printf(" %s\n", rexbacklight_args[i].desc); printf(" %s\n", rexbacklight_args[i].desc);
} }
printf("\n"); printf("\n");
@ -57,11 +70,9 @@ _Noreturn void usage(int exit_val){
printf(" =<percentage>\n"); printf(" =<percentage>\n");
printf(" -<percentage>\n"); printf(" -<percentage>\n");
printf(" +<percentage>\n"); printf(" +<percentage>\n");
#ifndef XBACKLIGHT_COMPAT_OPTIONS
printf(" off\n"); printf(" off\n");
printf(" max\n"); printf(" max\n");
printf(" min\n"); printf(" min\n");
#endif //XBACKLIGHT_COMPAT_OPTIONS
printf("\n%s Copyright (C) 2018 rexy712\n", executable_name); printf("\n%s Copyright (C) 2018 rexy712\n", executable_name);
printf("This program comes with ABSOLUTELY NO WARRANTY.\n"); printf("This program comes with ABSOLUTELY NO WARRANTY.\n");