[WIP] Feature/combi bang anywhere #1124
Conversation
There was a problem hiding this comment.
I was writing a review of your changes when I just ended rewriting all of this slightly differently.
I am even considering removing half of the code as it seems unnecessary to me, but I need to check.
For the record, even if we don’t merge your PR, I didn’t spot any big issue with it. I wrote a few comments so you can improve it a bit, would you feel like it.
source/dialogs/combi.c
Outdated
| unsigned offset = 0; | ||
| for ( unsigned i = 0; i < pd->num_switchers; i++ ) { | ||
| if ( pd->switchers[i].disable ) { | ||
| offset += pd->lengths[i]; | ||
| } |
There was a problem hiding this comment.
I don’t see offset actually used anywhere?
There was a problem hiding this comment.
This was in fact a leftover from when I first started working on it. In fact, all the previous code that was there to handle the bang seems superfluous. And actually not correct if there are multiple matching modes.
source/dialogs/combi.c
Outdated
| static void split_bang( const char *input, char **bang, char **rest ) { | ||
| // Splits string input into a part containing the bang and the part containing the rest, | ||
| // saved in the pointers bang and rest. | ||
| if ( input != NULL) { |
There was a problem hiding this comment.
An early return would be nicer here. Let bang be NULL if there is none, doesn’t saves much, but having an empty string is hardly needed at all here. (g_free, just as free is a no-op on NULL.)
Not sure on the exact policy concerning rofi, but it’s usually considered safe to use a goto in those cases.
You put *bang = NULL; early, to always set it (it’s cheap anyway, won’t hurt if you overwrite it) and use goto end; in the condition. The label being put just before the g_strdup(input).
There was a problem hiding this comment.
I prefer to avoid the use of goto.
There was a problem hiding this comment.
Setting *bang = NULL means I need to do checks afterward, so for now, I left it as an empty string. I did however rework the function with a lot of early returns.
There was a problem hiding this comment.
Sure, you change strlen(bang) > 0 to bang != NULL, it’s that big of a change, is it? :-)
There was a problem hiding this comment.
Fair enough, changed that now. Code got slightly more complicated because I found a bug: I was only looking for the first '!', while in fact, the first one could be part of a matching token, so now, we’re looking for the first one that is preceded by a space.
source/dialogs/combi.c
Outdated
| char *sob = g_utf8_strchr ( input, -1, '!' ); | ||
| char *prev_char = g_utf8_find_prev_char( input, sob ); | ||
|
|
||
| if (sob != NULL && (prev_char == NULL || ( config.combi_bang_anywhere && prev_char[0] == ' ' ))) { |
There was a problem hiding this comment.
Here we could reverse the condition with an early return, but it’ll turn a bit ugly, though I’d consider it anyway, would it be my code.
However, keeping the condition would need a twist: use g_unichar_isspace(g_utf8_get_char(prev_char)), it is safer.
Rule of thumb: use g_unichar_* functions to manipulate any character, use g_utf8_* to manipulate any string.
source/dialogs/combi.c
Outdated
| // Splits string input into a part containing the bang and the part containing the rest, | ||
| // saved in the pointers bang and rest. | ||
| if ( input != NULL) { | ||
| char *sob = g_utf8_strchr ( input, -1, '!' ); |
There was a problem hiding this comment.
Same here, it wouldn’t be bad to have a check for sob being NULL using goto end; for an early return.
This PR adds the ability to use the bang matching anywhere in combi mode as described here.
Same as the other PR below:
I tried using uncrustify but a) got an error (
unknown option 'align_number_left'), and b) noticed that it changed a bunch of other files, so left it like this for now.It's basically done, but I added WIP because I’m not super familiar with C (would like some code review, it’s pretty short) and I’d still have to write the documentation for it.