0.9.1 to master (#136)

* Fix F12 quitting show (#135)

* Fixing hiding dot files can result in blank screen (#133)

* Fixed issue with display width not being reset between directories (#134)

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([dfshow], [0.9.0], [https://github.com/roberthawdon/dfshow/issues])
+AC_INIT([dfshow], [0.9.1], [https://github.com/roberthawdon/dfshow/issues])
 AC_GNU_SOURCE
 AM_INIT_AUTOMAKE([subdir-objects])
 AC_PROG_CC

docs/source/conf.py

@@ -26,7 +26,7 @@
 # The short X.Y version
 version = '0.9'
 # The full version, including alpha/beta/rc tags
-release = '0.9.0'
+release = '0.9.1'
 
 
 # -- General configuration ---------------------------------------------------

src/showfunctions.c

@@ -2575,6 +2575,8 @@ void display_dir(char *pwd, results* ob){
   int origTopFileRef;
   int currentItem;
 
+  maxdisplaywidth = 0;
+
   topfileref = el[lineStart].fileRef;
 
   if (markedinfo == 2 && (CheckMarked(ob) > 0)){
@@ -2603,7 +2605,7 @@ void display_dir(char *pwd, results* ob){
   }
 
   // Replacement to "sanitizeTopFileRef" - should be simpler with the lookup table.
-  if ((selected > bottomFileRef) || ((selected < topfileref + 1))){
+  if ((selected > bottomFileRef) || ((selected < topfileref + 1)) || ((bottomFileRef - topfileref - 1) > displaysize)){
     adjustViewForSelected(selected, el, listLen, displaysize);
   }
 

src/showmenus.c

@@ -1937,29 +1937,29 @@ void directory_view_menu_inputs()
         // selected = topfileref + (displaycount - 1);
         selected = bottomFileRef;
         display_dir(currentpwd, ob);
-      } else if (*pc == 276){
-        // F12 Key
-        endwin();
-        printf("Debug Exit Triggered.\n\n");
-        printf("selected: %i\n\n", selected);
+      // } else if (*pc == 276){
+      //   // F12 Key
+      //   endwin();
+      //   printf("Debug Exit Triggered.\n\n");
+      //   printf("selected: %i\n\n", selected);
 
-        printf("topfileref: %i\n", topfileref);
-        printf("bottomFileRef: %i\n", bottomFileRef);
-        printf("DIFFERENCE: %i\n\n", bottomFileRef - topfileref);
+      //   printf("topfileref: %i\n", topfileref);
+      //   printf("bottomFileRef: %i\n", bottomFileRef);
+      //   printf("DIFFERENCE: %i\n\n", bottomFileRef - topfileref);
 
-        printf("displaysize: %i\n", displaysize);
+      //   printf("displaysize: %i\n", displaysize);
 
-        printf("\nTotal Files (objects): %i\n", totalfilecount);
-        printf("Total xattr lines: %i\n", xattrPos);
-        printf("Total lines: %i\n", (totalfilecount + xattrPos));
+      //   printf("\nTotal Files (objects): %i\n", totalfilecount);
+      //   printf("Total xattr lines: %i\n", xattrPos);
+      //   printf("Total lines: %i\n", (totalfilecount + xattrPos));
 
-        printf("\nBottom File Ref + 0: %i\n", el[lineStart + displaysize - 1].fileRef);
-        printf("Bottom File Ref + 1: %i\n", el[lineStart + displaysize].fileRef);
+      //   printf("\nBottom File Ref + 0: %i\n", el[lineStart + displaysize - 1].fileRef);
+      //   printf("Bottom File Ref + 1: %i\n", el[lineStart + displaysize].fileRef);
 
-        printf("\nlineStart: %i\n", lineStart);
+      //   printf("\nlineStart: %i\n", lineStart);
 
-        printf("\nlistLen: %i\n", listLen);
-        exit(3);
+      //   printf("\nlistLen: %i\n", listLen);
+      //   exit(3);
       }
     }
 }