Ticket #2229: mc-skip_useless_display_updates.patch

actions_cmd.c

@@ -242 +242 @@
 
 /* --------------------------------------------------------------------------------------------- */
 
-static cb_ret_t
+static int
 mcview_execute_cmd (mcview_t * view, unsigned long command)
 {
     int res = MSG_HANDLED;
@@ -297 +297 @@
         view->dirty++;
         break;
     case CK_ViewMoveToBol:
-        mcview_moveto_bol (view);
+        return mcview_moveto_bol (view);
         break;
     case CK_ViewMoveToEol:
         mcview_moveto_eol (view);
         break;
     case CK_ViewMoveLeft:
-        mcview_move_left (view, 1);
-        break;
+        return mcview_move_left (view, 1);
     case CK_ViewMoveRight:
         mcview_move_right (view, 1);
         break;
     case CK_ViewMoveLeft10:
         if (!view->hex_mode)
-            mcview_move_left (view, 10);
-        break;
+            return mcview_move_left (view, 10);
+        return -MSG_HANDLED;
     case CK_ViewMoveRight10:
         if (!view->hex_mode)
             mcview_move_right (view, 10);
@@ -323 +322 @@
         mcview_display_toggle_ruler (view);
         break;
     case CK_ViewMoveUp:
-        mcview_move_up (view, 1);
-        break;
+        return mcview_move_up (view, 1);
     case CK_ViewMoveDown:
         mcview_move_down (view, 1);
         break;
     case CK_ViewMoveHalfPgUp:
-        mcview_move_up (view, (view->data_area.height + 1) / 2);
-        break;
+        return mcview_move_up (view, (view->data_area.height + 1) / 2);
     case CK_ViewMoveHalfPgDn:
         mcview_move_down (view, (view->data_area.height + 1) / 2);
         break;
     case CK_ViewMovePgUp:
-        mcview_move_up (view, view->data_area.height);
-        break;
+        return mcview_move_up (view, view->data_area.height);
     case CK_ViewMovePgDn:
         mcview_move_down (view, view->data_area.height);
         break;
     case CK_ViewMoveTop:
-        mcview_moveto_top (view);
-        break;
+        return mcview_moveto_top (view);
     case CK_ViewMoveBottom:
         mcview_moveto_bottom (view);
         break;
     case CK_ShowCommandLine:
         view_other_cmd ();
-        break;
+        return -MSG_HANDLED;
         /*
            // Unlike Ctrl-O, run a new shell if the subshell is not running
            case '!':
@@ -376 +371 @@
     case CK_ViewQuit:
         if (!mcview_is_in_panel (view))
             dlg_stop (view->widget.owner);
-        break;
+        return -MSG_HANDLED;
     default:
         res = MSG_NOT_HANDLED;
     }
@@ -384 +379 @@
 }
 
 /* Both views */
-static cb_ret_t
+static int
 mcview_handle_key (mcview_t * view, int key)
 {
     unsigned long command;
+    int res;
 
     key = convert_from_input_c (key);
 
@@ -402 +398 @@
     }
 
     command = lookup_keymap_command (view->plain_map, key);
-    if ((command != CK_Ignore_Key) && (mcview_execute_cmd (view, command) == MSG_HANDLED))
-        return MSG_HANDLED;
+    if (command != CK_Ignore_Key)
+    {
+        res = mcview_execute_cmd (view, command);
+        if (res != MSG_NOT_HANDLED)
+            return res;
+    }
 
 #ifdef MC_ENABLE_DEBUGGING_CODE
     if (c == 't')
@@ -450 +450 @@
 mcview_callback (Widget * w, widget_msg_t msg, int parm)
 {
     mcview_t *view = (mcview_t *) w;
-    cb_ret_t i;
+    int i;
 
     mcview_compute_areas (view);
     mcview_update_bytes_per_line (view);
@@ -475 +475 @@
 
     case WIDGET_KEY:
         i = mcview_handle_key (view, parm);
-        mcview_update (view);
-        return i;
+        if (i != MSG_NOT_HANDLED && i != -MSG_HANDLED)
+            mcview_update (view);
+        if (i != MSG_NOT_HANDLED)
+            return MSG_HANDLED;
+        return MSG_NOT_HANDLED;
 
     case WIDGET_COMMAND:
         i = mcview_execute_cmd (view, parm);

datasource.c

@@ -136 +136 @@
 {
     assert (view->datasource == DS_FILE);
 
-    mcview_file_load_data (view, byte_index);
-    if (mcview_already_loaded (view->ds_file_offset, byte_index, view->ds_file_datalen))
+    if (mcview_file_load_data (view, byte_index))
         return (char *) (view->ds_file_data + (byte_index - view->ds_file_offset));
     return NULL;
 }
@@ -259 +258 @@
 /* --------------------------------------------------------------------------------------------- */
 
 /*static */
-void
+gboolean
 mcview_file_load_data (mcview_t * view, off_t byte_index)
 {
     off_t blockoffset;
@@ -269 +268 @@
     assert (view->datasource == DS_FILE);
 
     if (mcview_already_loaded (view->ds_file_offset, byte_index, view->ds_file_datalen))
-        return;
+        return TRUE;
 
     if (byte_index >= view->ds_file_filesize)
-        return;
+        return FALSE;
 
     blockoffset = mcview_offset_rounddown (byte_index, view->ds_file_datasize);
     if (mc_lseek (view->ds_file_fd, blockoffset, SEEK_SET) == -1)
@@ -300 +299 @@
     {
         view->ds_file_datalen = bytes_read;
     }
-    return;
+    return TRUE;
 
   error:
     view->ds_file_datalen = 0;
+    return FALSE;
 }
 
 /* --------------------------------------------------------------------------------------------- */

display.c

@@ -183 +183 @@
 {
     static int dirt_limit = 1;
 
+    /* don't update viewer in inactive dialog */
+    if (view->widget.owner->state != DLG_ACTIVE)
+        return;
+
     if (view->dpy_bbar_dirty)
     {
         view->dpy_bbar_dirty = FALSE;

inlines.h

@@ -80 +80 @@
 {
     assert (view->datasource == DS_FILE);
 
-    mcview_file_load_data (view, byte_index);
-    if (mcview_already_loaded (view->ds_file_offset, byte_index, view->ds_file_datalen))
+    if (mcview_file_load_data (view, byte_index))
     {
         if (retval)
             *retval = view->ds_file_data[byte_index - view->ds_file_offset];

internal.h

@@ -242 +242 @@
 gboolean mcview_get_byte_string (mcview_t *, off_t, int *);
 gboolean mcview_get_byte_none (mcview_t *, off_t, int *);
 void mcview_set_byte (mcview_t *, off_t, byte);
-void mcview_file_load_data (mcview_t *, off_t);
+gboolean mcview_file_load_data (mcview_t *, off_t);
 void mcview_close_datasource (mcview_t *);
 void mcview_set_datasource_file (mcview_t *, int, const struct stat *);
 gboolean mcview_load_command_output (mcview_t *, const char *);
@@ -296 +296 @@
 gboolean mcview_unlock_file (mcview_t * view);
 
 /* move.c */
-void mcview_move_up (mcview_t *, off_t);
+int mcview_move_up (mcview_t *, off_t);
 void mcview_move_down (mcview_t *, off_t);
-void mcview_move_left (mcview_t *, off_t);
+int mcview_move_left (mcview_t *, off_t);
 void mcview_move_right (mcview_t *, off_t);
 void mcview_scroll_to_cursor (mcview_t *);
-void mcview_moveto_top (mcview_t *);
+int mcview_moveto_top (mcview_t *);
 void mcview_moveto_bottom (mcview_t *);
-void mcview_moveto_bol (mcview_t *);
+int mcview_moveto_bol (mcview_t *);
 void mcview_moveto_eol (mcview_t *);
 void mcview_moveto_offset (mcview_t *, off_t);
 void mcview_moveto (mcview_t *, off_t, off_t);

move.c

@@ -85 +85 @@
 
 /* --------------------------------------------------------------------------------------------- */
 
-void
+int
 mcview_move_up (mcview_t * view, off_t lines)
 {
-    off_t new_offset;
+    off_t new_offset, i;
 
     if (view->hex_mode)
     {
+        i = MSG_HANDLED;        /* in this mode actual linecount doesn't matter */
         off_t bytes = lines * view->bytes_per_line;
         if (view->hex_cursor >= bytes)
         {
@@ -106 +107 @@
     }
     else
     {
-        off_t i;
 
         for (i = 0; i < lines; i++)
         {
@@ -147 +147 @@
             }
         }
     }
+    if (i == 0) return -MSG_HANDLED;
     mcview_movement_fixups (view, TRUE);
+    return i;
 }
 
 /* --------------------------------------------------------------------------------------------- */
@@ -220 +222 @@
 
 /* --------------------------------------------------------------------------------------------- */
 
-void
+int
 mcview_move_left (mcview_t * view, off_t columns)
 {
+    int ret;
+    ret = -MSG_HANDLED;
+
     if (view->hex_mode)
     {
+        ret = MSG_HANDLED;
         off_t old_cursor = view->hex_cursor;
         assert (columns == 1);
         if (view->hexview_in_text || !view->hexedit_lownibble)
@@ -239 +245 @@
     else
     {
         if (view->dpy_text_column >= columns)
+        {
             view->dpy_text_column -= columns;
-        else
+            ret = columns;
+        }
+        else {
+            if (view->dpy_text_column > 0)
+                ret = view->dpy_text_column;
             view->dpy_text_column = 0;
+        }
     }
     mcview_movement_fixups (view, FALSE);
+    return ret;
 }
 
 /* --------------------------------------------------------------------------------------------- */
@@ -295 +308 @@
 
 /* --------------------------------------------------------------------------------------------- */
 
-void
+int
 mcview_moveto_top (mcview_t * view)
 {
+    int ret;
+    ret = -MSG_HANDLED;
+
+    if (view->dpy_start > 0 || view->hex_cursor > 0 || view->dpy_text_column > 0)
+        ret = MSG_HANDLED;
+        
     view->dpy_start = 0;
     view->hex_cursor = 0;
     view->dpy_text_column = 0;
     mcview_movement_fixups (view, TRUE);
+    return ret;
 }
 
 /* --------------------------------------------------------------------------------------------- */
@@ -334 +354 @@
 
 /* --------------------------------------------------------------------------------------------- */
 
-void
+int
 mcview_moveto_bol (mcview_t * view)
 {
+    int ret;
+    ret = -MSG_HANDLED;
     if (view->hex_mode)
     {
+        ret = MSG_HANDLED;
         view->hex_cursor -= view->hex_cursor % view->bytes_per_line;
     }
     else if (!view->text_wrap_mode)
     {
+        /* this doesn't seem to do anything, according to this file header this is always the beginning of current line */
         view->dpy_start = mcview_bol (view, view->dpy_start, 0);
     }
+    if (view->dpy_text_column > 0)
+        ret = view->dpy_text_column;
     view->dpy_text_column = 0;
     mcview_movement_fixups (view, TRUE);
+    return ret;
 }
 
 /* --------------------------------------------------------------------------------------------- */