resolve: resolve requested changes

Author: leyuskckiran1510

dunstrc

@@ -323,15 +323,14 @@
     # * close_all: Close all notifications.
     # * context: Open context menu for the notification.
     # * context_all: Open context menu for all notifications.
-    # * forward_script: Script on rules section script_mouse_forward will be executed.
-    # * back_script: Script on rules section script_mouse_back will be executed.
+    # * mouse_scroll_script: Run script on rule section based on button pressed
     # These values can be strung together for each mouse event, and
     # will be executed in sequence.
     mouse_left_click = close_current
     mouse_middle_click = do_action, close_current
     mouse_right_click = close_all
-    mouse_scroll_forward = forward_script
-    mouse_scroll_backward = back_script
+    mouse_scroll_up = mouse_scroll_script
+    mouse_scroll_down = mouse_scroll_script
 
 # Experimental features that may or may not work correctly. Do not expect them
 # to have a consistent behaviour across releases.
@@ -405,8 +404,8 @@
 #    alignment
 #    hide_text
 #    override_pause_level
-#    script_mouse_back
-#    script_mouse_back
+#    script_scroll_up
+#    script_scroll_down
 #
 # Shell-like globbing will get expanded.
 #
@@ -501,6 +500,6 @@
 #
 #[volume-changer]
 #    appname = "some_volume_notifiers"
-#    script_mouse_forward = some_volum_change_up_script
-#    script_mouse_back = some_volum_change_down_script
+#    script_scroll_up = some_volum_change_up_script
+#    script_scroll_down = some_volum_change_down_script
 # vim: ft=cfg

src/input.c

@@ -105,20 +105,22 @@ void input_handle_click(unsigned int button, bool button_down, int mouse_x, int
                         continue;
                 }
 
-                if (act == MOUSE_DO_ACTION || act == MOUSE_CLOSE_CURRENT || act == MOUSE_CONTEXT || act == MOUSE_OPEN_URL || act== MOUSE_BACKWARD_SCRIPT || act == MOUSE_FORWARD_SCRIPT) {
+                if (act == MOUSE_DO_ACTION || act == MOUSE_CLOSE_CURRENT || act == MOUSE_CONTEXT || act == MOUSE_OPEN_URL || act== MOUSE_SCROLL_SCRIPT) {
                         struct notification *n = get_notification_at(mouse_y);
-
                         if (n) {
                                 if (act == MOUSE_CLOSE_CURRENT) {
                                         n->marked_for_closure = REASON_USER;
                                 } else if (act == MOUSE_DO_ACTION) {
                                         notification_do_action(n);
                                 } else if (act == MOUSE_OPEN_URL) {
                                         notification_open_url(n);
-                                } else if (act == MOUSE_FORWARD_SCRIPT){
-                                        notification_invoke_script_rule(n,MAT_FORWARD);
-                                } else if (act == MOUSE_BACKWARD_SCRIPT){
-                                        notification_invoke_script_rule(n,MAT_BACK);
+                                } else if (act == MOUSE_SCROLL_SCRIPT){
+                                        if(button==BTN_FORWARD){
+                                            notification_invoke_script_rule(n,MOUSE_ACTION_SCROLL_UP);
+                                        }
+                                        else if(button==BTN_BACK){
+                                            notification_invoke_script_rule(n,MOUSE_ACTION_SCROLL_DOWN);
+                                        }
                                 } else {
                                         notification_open_context_menu(n);
                                 }

src/notification.c

@@ -108,19 +108,19 @@ void notification_print(const struct notification *n)
                 }
                 printf("\n");
         }
-        printf("\tscript_mouse_forward_count: %d\n", n->script_mouse_forward_count);
-        if (n->script_mouse_forward_count > 0) {
+        printf("\tscript_mouse_forward_count: %d\n", n->script_scroll_up_count);
+        if (n->script_scroll_up_count > 0) {
                 printf("\tscripts_mf: ");
-                for (int i = 0; i < n->script_mouse_forward_count; i++) {
-                        printf("'%s' ", STR_NN(n->scripts_mf[i]));
+                for (int i = 0; i < n->script_scroll_up_count; i++) {
+                        printf("'%s' ", STR_NN(n->script_scroll_up[i]));
                 }
                 printf("\n");
         }
-        printf("\tscript_mouse_back_count: %d\n", n->script_mouse_back_count);
-        if (n->script_mouse_back_count > 0) {
+        printf("\tscript_mouse_back_count: %d\n", n->script_scroll_down_count);
+        if (n->script_scroll_down_count > 0) {
                 printf("\tscripts_mb: ");
-                for (int i = 0; i < n->script_mouse_back_count; i++) {
-                        printf("'%s' ", STR_NN(n->scripts_mb[i]));
+                for (int i = 0; i < n->script_scroll_down_count; i++) {
+                        printf("'%s' ", STR_NN(n->script_scroll_down[i]));
                 }
                 printf("\n");
         }
@@ -145,11 +145,11 @@ void notification_run_script(struct notification *n)
         const char *urgency = notification_urgency_to_string(n->urgency);
         int script_count = 0;
         switch(n->script_choice){
-            case MAT_FORWARD:
-                script_count = n->script_mouse_forward_count;
+            case MOUSE_ACTION_SCROLL_UP:
+                script_count = n->script_scroll_up_count;
                 break;
-            case MAT_BACK:
-                script_count = n->script_mouse_back_count;
+            case MOUSE_ACTION_SCROLL_DOWN:
+                script_count = n->script_scroll_down_count;
                 break;
             default:
                 script_count = n->script_count;
@@ -160,11 +160,11 @@ void notification_run_script(struct notification *n)
 
                 const char *script;
                 switch(n->script_choice){
-                    case MAT_FORWARD:
-                        script = n->scripts_mf[i];
+                    case MOUSE_ACTION_SCROLL_UP:
+                        script = n->script_scroll_up[i];
                         break;
-                    case MAT_BACK:
-                        script = n->scripts_mb[i];
+                    case MOUSE_ACTION_SCROLL_DOWN:
+                        script = n->script_scroll_down[i];
                         break;
                     default:
                         script = n->scripts[i];
@@ -567,7 +567,7 @@ void notification_init(struct notification *n)
                 n->colors.highlight = gradient_acquire(defcolors.highlight);
         }
         /*Script setup*/
-        n->script_choice = MAT_OTHERS;
+        n->script_choice = MOUSE_ACTION_OTHERS;
 
         /* Sanitize misc hints */
         if (n->progress < 0)

src/notification.h

@@ -19,9 +19,9 @@ enum icon_position {
 };
 
 enum mouse_action_type{
-    MAT_OTHERS=0,
-    MAT_FORWARD,
-    MAT_BACK,
+    MOUSE_ACTION_OTHERS=0,
+    MOUSE_ACTION_SCROLL_UP,
+    MOUSE_ACTION_SCROLL_DOWN,
 };
 
 enum behavior_fullscreen {
@@ -96,11 +96,11 @@ struct notification {
         char **scripts;
         int script_count;
 
-        char **scripts_mf;
-        int script_mouse_forward_count;
+        char **script_scroll_up;
+        int script_scroll_up_count;
 
-        char **scripts_mb;
-        int script_mouse_back_count;
+        char **script_scroll_down;
+        int script_scroll_down_count;
 
         struct notification_colors colors;
 

src/rules.c

@@ -133,27 +133,27 @@ void rule_apply(struct rule *r, struct notification *n, bool save)
                 n->scripts[n->script_count + 1] = NULL;
                 n->script_count++;
         }
-        if (r->script_mouse_forward) {
-                if (save && n->original->script_mouse_forward == NULL)
-                        n->original->script_mouse_forward = n->script_mouse_forward_count > 0
-                                            ? g_strdup(n->scripts_mf[0])
+        if (r->script_scroll_up) {
+                if (save && n->original->script_scroll_up == NULL)
+                        n->original->script_scroll_up = n->script_scroll_up_count > 0
+                                            ? g_strdup(n->script_scroll_up[0])
                                             : g_strdup(r->script);
 
-                n->scripts_mf = g_renew(char *, n->scripts_mf, n->script_mouse_forward_count + 2);
-                n->scripts_mf[n->script_mouse_forward_count] = g_strdup(r->script_mouse_forward);
-                n->scripts_mf[n->script_mouse_forward_count + 1] = NULL;
-                n->script_mouse_forward_count++;
+                n->script_scroll_up = g_renew(char *, n->script_scroll_up, n->script_scroll_up_count + 2);
+                n->script_scroll_up[n->script_scroll_up_count] = g_strdup(r->script_scroll_up);
+                n->script_scroll_up[n->script_scroll_up_count + 1] = NULL;
+                n->script_scroll_up_count++;
         }
-        if (r->script_mouse_back) {
-                if (save && n->original->script_mouse_back == NULL)
-                        n->original->script_mouse_back = n->script_mouse_back_count > 0
-                                            ? g_strdup(n->scripts_mb[0])
+        if (r->script_scroll_down) {
+                if (save && n->original->script_scroll_down == NULL)
+                        n->original->script_scroll_down = n->script_scroll_down_count > 0
+                                            ? g_strdup(n->script_scroll_down[0])
                                             : g_strdup(r->script);
 
-                n->scripts_mb = g_renew(char *, n->scripts_mb, n->script_mouse_back_count + 2);
-                n->scripts_mb[n->script_mouse_back_count] = g_strdup(r->script_mouse_back);
-                n->scripts_mb[n->script_mouse_back_count + 1] = NULL;
-                n->script_mouse_back_count++;
+                n->script_scroll_down = g_renew(char *, n->script_scroll_down, n->script_scroll_down_count + 2);
+                n->script_scroll_down[n->script_scroll_down_count] = g_strdup(r->script_scroll_down);
+                n->script_scroll_down[n->script_scroll_down_count + 1] = NULL;
+                n->script_scroll_down_count++;
         }
 }
 
@@ -207,8 +207,8 @@ void rule_print(const struct rule *r)
         if (r->set_category != NULL) printf("\tset_category: '%s'\n", r->set_category);
         if (r->format != NULL) printf("\tformat: '%s'\n", r->format);
         if (r->script != NULL) printf("\tscript: '%s'\n", r->script);
-        if (r->script_mouse_forward != NULL) printf("\tscript_mouse_forward: '%s'\n", r->script_mouse_forward);
-        if (r->script_mouse_back != NULL) printf("\tscript_mouse_back: '%s'\n", r->script_mouse_back);
+        if (r->script_scroll_up != NULL) printf("\tscript_scroll_up: '%s'\n", r->script_scroll_up);
+        if (r->script_scroll_down != NULL) printf("\tscript_scroll_down: '%s'\n", r->script_scroll_down);
         if (r->fullscreen != FS_NULL) printf("\tfullscreen: %s\n", enum_to_string_fullscreen(r->fullscreen));
         if (r->progress_bar_alignment != -1) printf("\tprogress_bar_alignment: %d\n", r->progress_bar_alignment);
         if (r->set_stack_tag != NULL) printf("\tset_stack_tag: %s\n", r->set_stack_tag);

src/rules.h

@@ -55,8 +55,8 @@ struct rule {
         char *set_category;
         char *format;
         char *script;
-        char *script_mouse_forward;
-        char *script_mouse_back;
+        char *script_scroll_up;
+        char *script_scroll_down;
         enum behavior_fullscreen fullscreen;
         bool enabled;
         int progress_bar_alignment;

src/settings.h

@@ -35,7 +35,7 @@ enum separator_color { SEP_FOREGROUND, SEP_AUTO, SEP_FRAME, SEP_CUSTOM };
 enum follow_mode { FOLLOW_NONE, FOLLOW_MOUSE, FOLLOW_KEYBOARD };
 enum mouse_action { MOUSE_NONE, MOUSE_DO_ACTION, MOUSE_CLOSE_CURRENT,
         MOUSE_CLOSE_ALL, MOUSE_CONTEXT, MOUSE_CONTEXT_ALL, MOUSE_OPEN_URL,
-        MOUSE_FORWARD_SCRIPT,MOUSE_BACKWARD_SCRIPT,
+        MOUSE_SCROLL_SCRIPT,
         MOUSE_ACTION_END = LIST_END /* indicates the end of a list of mouse actions */};
 #ifndef ZWLR_LAYER_SHELL_V1_LAYER_ENUM
 #define ZWLR_LAYER_SHELL_V1_LAYER_ENUM

src/settings_data.h

@@ -312,8 +312,7 @@ static const struct string_to_enum_def mouse_action_enum_data[] = {
         {"context",        MOUSE_CONTEXT },
         {"context_all",    MOUSE_CONTEXT_ALL },
         {"open_url",       MOUSE_OPEN_URL },
-        {"forward_script", MOUSE_FORWARD_SCRIPT },
-        {"back_script",    MOUSE_BACKWARD_SCRIPT },
+        {"mouse_scroll_script", MOUSE_SCROLL_SCRIPT },
         ENUM_END,
 };
 
@@ -522,26 +521,26 @@ static const struct setting allowed_settings[] = {
                 .rule_offset = offsetof(struct rule, script),
         },
         {
-                .name = "script_mouse_forward",
+                .name = "script_scroll_up",
                 .section = "*",
                 .description = "script for mouse scroll up",
                 .type = TYPE_PATH,
                 .default_value = "*",
                 .value = NULL,
                 .parser = NULL,
                 .parser_data = NULL,
-                .rule_offset = offsetof(struct rule, script_mouse_forward),
+                .rule_offset = offsetof(struct rule, script_scroll_up),
         },
         {
-                .name = "script_mouse_back",
+                .name = "script_scroll_down",
                 .section = "*",
                 .description = "script for mouse scroll down",
                 .type = TYPE_PATH,
                 .default_value = "*",
                 .value = NULL,
                 .parser = NULL,
                 .parser_data = NULL,
-                .rule_offset = offsetof(struct rule, script_mouse_back),
+                .rule_offset = offsetof(struct rule, script_scroll_down),
         },
         {
                 .name = "background",
@@ -1350,7 +1349,7 @@ static const struct setting allowed_settings[] = {
                 .section = "global",
                 .description = "Action of right click event",
                 .type = TYPE_LIST,
-                .default_value = "forward_script",
+                .default_value = "mouse_scroll_script",
                 .value = &settings.mouse_scroll_up,
                 .parser = NULL,
                 .parser_data = GINT_TO_POINTER(MOUSE_LIST),
@@ -1360,7 +1359,7 @@ static const struct setting allowed_settings[] = {
                 .section = "global",
                 .description = "Action of right click event",
                 .type = TYPE_LIST,
-                .default_value = "back_script",
+                .default_value = "mouse_scroll_script",
                 .value = &settings.mouse_scroll_down,
                 .parser = NULL,
                 .parser_data = GINT_TO_POINTER(MOUSE_LIST),