Removed /mouse command

src/command/command.c

@@ -817,14 +817,6 @@ static struct cmd_t command_defs[] =
           "goodbye : Show a message in the title when exiting profanity.",
           NULL  } } },
 
-    { "/mouse",
-        cmd_mouse, parse_args, 1, 1, &cons_mouse_setting,
-        { "/mouse on|off", "Use profanity mouse handling.",
-        { "/mouse on|off",
-          "-------------",
-          "This feature is experimental, default is 'off'.",
-          NULL } } },
-
     { "/alias",
         cmd_alias, parse_args_with_freetext, 1, 3, NULL,
         { "/alias add|remove|list [name value]", "Add your own command aliases.",
@@ -1987,8 +1979,8 @@ _cmd_complete_parameters(ProfWin *window, const char * const input)
 
     // autocomplete boolean settings
     gchar *boolean_choices[] = { "/beep", "/intype", "/states", "/outtype",
-        "/flash", "/splash", "/chlog", "/grlog", "/mouse", "/history",
+        "/flash", "/splash", "/chlog", "/grlog", "/history", "/vercheck",
-        "/vercheck", "/privileges", "/presence", "/wrap", "/winstidy", "/carbons", "/encwarn" };
+        "/privileges", "/presence", "/wrap", "/winstidy", "/carbons", "/encwarn" };
 
     for (i = 0; i < ARRAY_SIZE(boolean_choices); i++) {
         result = autocomplete_param_with_func(input, boolean_choices[i], prefs_autocomplete_boolean_choice);

src/command/commands.c

@@ -840,9 +840,9 @@ cmd_help(ProfWin *window, gchar **args, struct cmd_help_t help)
     } else if (strcmp(args[0], "settings") == 0) {
         gchar *filter[] = { "/account", "/autoaway", "/autoping", "/autoconnect", "/beep",
             "/carbons", "/chlog", "/flash", "/gone", "/grlog", "/history", "/intype",
-            "/log", "/mouse", "/notify", "/outtype", "/prefs", "/priority",
+            "/log", "/notify", "/outtype", "/prefs", "/priority", "/reconnect", "/roster",
-            "/reconnect", "/roster", "/splash", "/states", "/statuses", "/theme",
+            "/splash", "/states", "/statuses", "/theme", "/titlebar", "/vercheck",
-            "/titlebar", "/vercheck", "/privileges", "/occupants", "/presence", "/wrap", "/winstidy" };
+            "/privileges", "/occupants", "/presence", "/wrap", "/winstidy" };
         _cmd_show_filtered_help("Settings commands", filter, ARRAY_SIZE(filter));
 
     } else if (strcmp(args[0], "navigation") == 0) {
@@ -4079,13 +4079,6 @@ cmd_grlog(ProfWin *window, gchar **args, struct cmd_help_t help)
     return result;
 }
 
-gboolean
-cmd_mouse(ProfWin *window, gchar **args, struct cmd_help_t help)
-{
-    return _cmd_set_boolean_preference(args[0], help,
-        "Mouse handling", PREF_MOUSE);
-}
-
 gboolean
 cmd_history(ProfWin *window, gchar **args, struct cmd_help_t help)
 {

src/command/commands.h

@@ -99,7 +99,6 @@ gboolean cmd_invites(ProfWin *window, gchar **args, struct cmd_help_t help);
 gboolean cmd_join(ProfWin *window, gchar **args, struct cmd_help_t help);
 gboolean cmd_leave(ProfWin *window, gchar **args, struct cmd_help_t help);
 gboolean cmd_log(ProfWin *window, gchar **args, struct cmd_help_t help);
-gboolean cmd_mouse(ProfWin *window, gchar **args, struct cmd_help_t help);
 gboolean cmd_msg(ProfWin *window, gchar **args, struct cmd_help_t help);
 gboolean cmd_nick(ProfWin *window, gchar **args, struct cmd_help_t help);
 gboolean cmd_notify(ProfWin *window, gchar **args, struct cmd_help_t help);

src/config/preferences.c

@@ -506,7 +506,6 @@ _get_group(preference_t pref)
         case PREF_FLASH:
         case PREF_INTYPE:
         case PREF_HISTORY:
-        case PREF_MOUSE:
         case PREF_OCCUPANTS:
         case PREF_OCCUPANTS_JID:
         case PREF_STATUSES:
@@ -599,8 +598,6 @@ _get_key(preference_t pref)
             return "receipts.send";
         case PREF_RECEIPTS_REQUEST:
             return "receipts.request";
-        case PREF_MOUSE:
-            return "mouse";
         case PREF_OCCUPANTS:
             return "occupants";
         case PREF_OCCUPANTS_JID:

src/config/preferences.h

@@ -57,7 +57,6 @@ typedef enum {
     PREF_CARBONS,
     PREF_RECEIPTS_SEND,
     PREF_RECEIPTS_REQUEST,
-    PREF_MOUSE,
     PREF_OCCUPANTS,
     PREF_OCCUPANTS_SIZE,
     PREF_OCCUPANTS_JID,

src/ui/console.c

@@ -981,15 +981,6 @@ cons_vercheck_setting(void)
         cons_show("Version checking (/vercheck)  : OFF");
 }
 
-void
-cons_mouse_setting(void)
-{
-    if (prefs_get_boolean(PREF_MOUSE))
-        cons_show("Mouse handling (/mouse)       : ON");
-    else
-        cons_show("Mouse handling (/mouse)       : OFF");
-}
-
 void
 cons_statuses_setting(void)
 {
@@ -1066,7 +1057,6 @@ cons_show_ui_prefs(void)
     cons_time_setting();
     cons_resource_setting();
     cons_vercheck_setting();
-    cons_mouse_setting();
     cons_statuses_setting();
     cons_occupants_setting();
     cons_roster_setting();

src/ui/core.c

@@ -101,10 +101,6 @@ ui_init(void)
     cbreak();
     noecho();
     keypad(stdscr, TRUE);
-    if (prefs_get_boolean(PREF_MOUSE)) {
-        mousemask(ALL_MOUSE_EVENTS, NULL);
-        mouseinterval(5);
-    }
     ui_load_colours();
     refresh();
     create_title_bar();

src/ui/inputwin.c

@@ -286,7 +286,7 @@ _inp_printable(const wint_t ch)
     bytes[utf_len] = '\0';
     gunichar unichar = g_utf8_get_char(bytes);
 
-    return g_unichar_isprint(unichar) && (ch != KEY_MOUSE);
+    return g_unichar_isprint(unichar);
 }
 
 static int

src/ui/ui.h

@@ -297,7 +297,6 @@ void cons_presence_setting(void);
 void cons_wrap_setting(void);
 void cons_winstidy_setting(void);
 void cons_time_setting(void);
-void cons_mouse_setting(void);
 void cons_statuses_setting(void);
 void cons_titlebar_setting(void);
 void cons_notify_setting(void);

src/ui/window.c

@@ -499,53 +499,6 @@ win_resize(ProfWin *window)
     win_redraw(window);
 }
 
-void
-win_mouse(ProfWin *window, const wint_t ch, const int result)
-{
-    int rows = getmaxy(stdscr);
-    int y = getcury(window->layout->win);
-
-    int page_space = rows - 4;
-    int *page_start = &(window->layout->y_pos);
-
-    if (prefs_get_boolean(PREF_MOUSE)) {
-        MEVENT mouse_event;
-
-        if (ch == KEY_MOUSE) {
-            if (getmouse(&mouse_event) == OK) {
-
-#ifdef PLATFORM_CYGWIN
-                if (mouse_event.bstate & BUTTON5_PRESSED) { // mouse wheel down
-#else
-                if (mouse_event.bstate & BUTTON2_PRESSED) { // mouse wheel down
-#endif
-                    *page_start += 4;
-
-                    // only got half a screen, show full screen
-                    if ((y - (*page_start)) < page_space)
-                        *page_start = y - page_space;
-
-                    // went past end, show full screen
-                    else if (*page_start >= y)
-                        *page_start = y - page_space;
-
-                    window->layout->paged = 1;
-                    win_update_virtual(window);
-                } else if (mouse_event.bstate & BUTTON4_PRESSED) { // mouse wheel up
-                    *page_start -= 4;
-
-                    // went past beginning, show first page
-                    if (*page_start < 0)
-                        *page_start = 0;
-
-                    window->layout->paged = 1;
-                    win_update_virtual(window);
-                }
-            }
-        }
-    }
-}
-
 void
 win_update_virtual(ProfWin *window)
 {

src/ui/window.h

@@ -68,7 +68,6 @@ void win_redraw(ProfWin *window);
 int win_roster_cols(void);
 int win_occpuants_cols(void);
 void win_printline_nowrap(WINDOW *win, char *msg);
-void win_mouse(ProfWin *current, const wint_t ch, const int result);
 void win_mark_received(ProfWin *window, const char * const id);
 
 gboolean win_has_active_subwin(ProfWin *window);