TnSb/wofi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added sorting to contains mode based on whether or not the result starts with your search

Browse Source
This commit is contained in:
Scoopta 2020-02-02 13:54:34 -08:00
parent 05cbe1f20a
commit b266a82b4b
1 changed files with 54 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/wofi.c
View File

@ -744,26 +744,7 @@ static gboolean do_filter(GtkFlowBoxChild* row, gpointer data) {
} }
} }
static gint do_sort(GtkFlowBoxChild* child1, GtkFlowBoxChild* child2, gpointer data) { static gint fuzzy_sort(const gchar* text1, const gchar* text2) {
(void) data;
GtkWidget* box1 = gtk_bin_get_child(GTK_BIN(child1));
GtkWidget* box2 = gtk_bin_get_child(GTK_BIN(child2));
if(GTK_IS_EXPANDER(box1)) {
box1 = gtk_expander_get_label_widget(GTK_EXPANDER(box1));
}
if(GTK_IS_EXPANDER(box2)) {
box2 = gtk_expander_get_label_widget(GTK_EXPANDER(box2));
}
const gchar* text1 = wofi_property_box_get_property(WOFI_PROPERTY_BOX(box1), "filter");
const gchar* text2 = wofi_property_box_get_property(WOFI_PROPERTY_BOX(box2), "filter");
if(filter == NULL || strcmp(filter, "") == 0) {
return 0;
}
if(text1 == NULL || text2 == NULL) {
return 0;
}
char* _filter = strdup(filter); char* _filter = strdup(filter);
size_t len = strlen(_filter); size_t len = strlen(_filter);
@ -802,6 +783,58 @@ static gint do_sort(GtkFlowBoxChild* child1, GtkFlowBoxChild* child2, gpointer d
return dist1 - dist2; return dist1 - dist2;
} }
static gint contains_sort(const gchar* text1, const gchar* text2) {
size_t filter_len = strlen(filter);
bool tx1, tx2;
if(insensitive) {
tx1 = strncasecmp(text1, filter, filter_len) == 0;
tx2 = strncasecmp(text2, filter, filter_len) == 0;
} else {
tx1 = strncmp(text1, filter, filter_len) == 0;
tx2 = strncmp(text2, filter, filter_len) == 0;
}
if(tx1 && tx2) {
return 0;
} else if(tx1) {
return -1;
} else if(tx2) {
return 1;
} else {
return 0;
}
}
static gint do_sort(GtkFlowBoxChild* child1, GtkFlowBoxChild* child2, gpointer data) {
(void) data;
GtkWidget* box1 = gtk_bin_get_child(GTK_BIN(child1));
GtkWidget* box2 = gtk_bin_get_child(GTK_BIN(child2));
if(GTK_IS_EXPANDER(box1)) {
box1 = gtk_expander_get_label_widget(GTK_EXPANDER(box1));
}
if(GTK_IS_EXPANDER(box2)) {
box2 = gtk_expander_get_label_widget(GTK_EXPANDER(box2));
}
const gchar* text1 = wofi_property_box_get_property(WOFI_PROPERTY_BOX(box1), "filter");
const gchar* text2 = wofi_property_box_get_property(WOFI_PROPERTY_BOX(box2), "filter");
if(filter == NULL || strcmp(filter, "") == 0) {
return 0;
}
if(text1 == NULL || text2 == NULL) {
return 0;
}
switch(matching) {
case MATCHING_MODE_CONTAINS:
return contains_sort(text1, text2);
case MATCHING_MODE_FUZZY:
return fuzzy_sort(text1, text2);
default:
return 0;
}
}
static gboolean key_press(GtkWidget* widget, GdkEvent* event, gpointer data) { static gboolean key_press(GtkWidget* widget, GdkEvent* event, gpointer data) {
(void) widget; (void) widget;
(void) data; (void) data;
@ -1075,6 +1108,7 @@ void wofi_init(struct map* _config) {
switch(matching) { switch(matching) {
case MATCHING_MODE_CONTAINS: case MATCHING_MODE_CONTAINS:
gtk_flow_box_set_filter_func(GTK_FLOW_BOX(inner_box), do_filter, NULL, NULL); gtk_flow_box_set_filter_func(GTK_FLOW_BOX(inner_box), do_filter, NULL, NULL);
gtk_flow_box_set_sort_func(GTK_FLOW_BOX(inner_box), do_sort, NULL, NULL);
break; break;
case MATCHING_MODE_FUZZY: case MATCHING_MODE_FUZZY:
gtk_flow_box_set_sort_func(GTK_FLOW_BOX(inner_box), do_sort, NULL, NULL); gtk_flow_box_set_sort_func(GTK_FLOW_BOX(inner_box), do_sort, NULL, NULL);