correct panel spelling

diff --git a/fm.c b/fm.c
index 38e0425bf79124b95c353c930bc96c83cd882d11..9fca2f90d657f26d5c6942230d86b44dc8f992ed 100644 (file)
--- a/fm.c
+++ b/fm.c
@@ -17,7 +17,7 @@
 
 /* global constants */
 
-#define MAXPANES 2
+#define MAXPANELS 2
 #define MAXFILTER 32
 #define MAXFNAME 64
 #define MAXSTATUS 128
@@ -26,9 +26,9 @@
 char *progname = NULL;
 char *version = "0.1";
 
-char *dirname[MAXPANES] = {0};
+char *dirname[MAXPANELS] = {0};
 int height = 0;
-int pane = 0;
+int panel = 0;
 int xoffset = 1;
 int yoffset = 2;
 int width = 0;
@@ -36,7 +36,7 @@ int width = 0;
 char *help =
     "alt Menu functions\n"
     "ret Enter directory\n"
-    "tab Change pane\n"
+    "tab Change panel\n"
     "<I> Page up\n"
     "<K> Page down\n"
     "<i> Move up\n"
@@ -92,11 +92,11 @@ int main (int argc, char *argv[])
                 VERBOSE (ERROR, fprintf (stderr, "%s: no directory name\n", progname));
                 return usage (1);
             }
-            if (dirname[pane] == NULL) {
-                free (dirname[pane]);
+            if (dirname[panel] == NULL) {
+                free (dirname[panel]);
             }
-            dirname[pane] = strdup (arg);
-            pane = (pane + 1) % MAXPANES;
+            dirname[panel] = strdup (arg);
+            panel = (panel + 1) % MAXPANELS;
             break;
         case 'v':
             arg = (arg[2]) ? arg + 2 : (--argc > 0) ? *(++argv) : NULL;
@@ -127,7 +127,7 @@ int main (int argc, char *argv[])
             return usage (c != 'h');
         }
     }
-    for (i = 0; i < MAXPANES; i++) {
+    for (i = 0; i < MAXPANELS; i++) {
         if (dirname[i] == NULL) {
             dirname[i] = strdup (".");
         }
@@ -157,11 +157,11 @@ int main (int argc, char *argv[])
     winmenu->yoffset = 0;
     winmenu->ysize = 1;
 
-    /* init pane windows */
-    window_t *windir[MAXPANES] = {0};
-    for (i = 0; i < MAXPANES; i++) {
+    /* init panel windows */
+    window_t *windir[MAXPANELS] = {0};
+    for (i = 0; i < MAXPANELS; i++) {
         windir[i] = allocwindow ();
-        windir[i]->active = (pane == i);
+        windir[i]->active = (panel == i);
         windir[i]->xoffset = xoffset + width / 2 * i;
         windir[i]->xsize = width / 2 - 2 * xoffset;
         windir[i]->yoffset = yoffset;
@@ -176,8 +176,8 @@ int main (int argc, char *argv[])
     winscreen->ysize = height - 2 * yoffset;
 
     /* init status windows */
-    window_t *winelem[MAXPANES] = {0};
-    for (i = 0; i < MAXPANES; i++) {
+    window_t *winelem[MAXPANELS] = {0};
+    for (i = 0; i < MAXPANELS; i++) {
         winelem[i] = allocwindow ();
         winelem[i]->xoffset = xoffset + width / 2 * i;
         winelem[i]->xsize = width / 2 - 2 * xoffset;
@@ -186,11 +186,11 @@ int main (int argc, char *argv[])
     }
 
     int index_menu = 0;
-    int index[MAXPANES] = {0};
-    int index_x[MAXPANES] = {0};
-    int index_y[MAXPANES] = {0};
-    list_t *list[MAXPANES] = {0};
-    int page[MAXPANES] = {0};
+    int index[MAXPANELS] = {0};
+    int index_x[MAXPANELS] = {0};
+    int index_y[MAXPANELS] = {0};
+    list_t *list[MAXPANELS] = {0};
+    int page[MAXPANELS] = {0};
 
     /* event loop */
     int stop = 0;
@@ -201,14 +201,14 @@ int main (int argc, char *argv[])
 
         menuwindow (winmenu, menu, &index_menu);
 
-        /* display panes */
-        for (i = 0; i < MAXPANES; i++) {
+        /* display panels */
+        for (i = 0; i < MAXPANELS; i++) {
             if (list[i] == NULL) {
                 list[i] = exploredir (dirname[i]);
                 if (list[i] == NULL) {
                     endwin ();
                     int _i;
-                    for (_i = 0; _i < MAXPANES; _i++) {
+                    for (_i = 0; _i < MAXPANELS; _i++) {
                         free (dirname[_i]);
                         freelist (list[_i]);
                         freewindow (windir[_i]);
@@ -218,7 +218,7 @@ int main (int argc, char *argv[])
                 }
             }
 
-            /* display pane */
+            /* display panel */
             displaywindow (windir[i], list[i], page[i], &index_x[i], &index_y[i]);
 
             /* display info */
@@ -235,70 +235,70 @@ int main (int argc, char *argv[])
         switch (ch) {
         case '\n':
         case '\r':
-            if ((list[pane]->tab + windir[pane]->index)->type == type_dir_e) {
-                elem_t *elem = list[pane]->tab + windir[pane]->index;
-                char *_dirname = newfilename (dirname[pane], elem->name);
-                free (dirname[pane]);
-                dirname[pane] = _dirname;
-                index_x[pane] = 0;
-                index_y[pane] = 0;
-                freelist (list[pane]);
-                list[pane] = NULL;
-                page[pane] = 0;
+            if ((list[panel]->tab + windir[panel]->index)->type == type_dir_e) {
+                elem_t *elem = list[panel]->tab + windir[panel]->index;
+                char *_dirname = newfilename (dirname[panel], elem->name);
+                free (dirname[panel]);
+                dirname[panel] = _dirname;
+                index_x[panel] = 0;
+                index_y[panel] = 0;
+                freelist (list[panel]);
+                list[panel] = NULL;
+                page[panel] = 0;
             }
             break;
         case '\t':
-            windir[pane]->active = 0;
-            pane = (pane + 1) % MAXPANES;
-            windir[pane]->active = 1;
+            windir[panel]->active = 0;
+            panel = (panel + 1) % MAXPANELS;
+            windir[panel]->active = 1;
             break;
         case KEY_PPAGE:
         case KEY_SLEFT:
         case 'I':
-            if (page[pane] > 0) {
-                page[pane]--;
+            if (page[panel] > 0) {
+                page[panel]--;
             }
             break;
         case KEY_NPAGE:
         case KEY_SRIGHT:
         case 'K':
-            if (page[pane]+ windir[pane]->ysize < (list[pane]->nb + windir[pane]->nbcols - 1) / windir[pane]->nbcols) {
-                page[pane]++;
+            if (page[panel]+ windir[panel]->ysize < (list[panel]->nb + windir[panel]->nbcols - 1) / windir[panel]->nbcols) {
+                page[panel]++;
             }
             break;
         case KEY_UP:
         case 'i':
-            if (index_y[pane]> 0) {
-                index_y[pane]--;
-            } else if (page[pane]> 0) {
-                page[pane]--;
+            if (index_y[panel]> 0) {
+                index_y[panel]--;
+            } else if (page[panel]> 0) {
+                page[panel]--;
             }
             break;
         case KEY_LEFT:
         case 'j':
-            if (index_x[pane]> 0) {
-                index_x[pane]--;
+            if (index_x[panel]> 0) {
+                index_x[panel]--;
             }
             break;
         case KEY_DOWN:
         case 'k':
-            if (index_y[pane]< min (windir[pane]->ysize, (list[pane]->nb + windir[pane]->nbcols - 1) / windir[pane]->nbcols) - 1) {
-                index_y[pane]++;
-            } else if (page[pane]+ windir[pane]->ysize < (list[pane]->nb + windir[pane]->nbcols - 1) / windir[pane]->nbcols) {
-                page[pane]++;
+            if (index_y[panel]< min (windir[panel]->ysize, (list[panel]->nb + windir[panel]->nbcols - 1) / windir[panel]->nbcols) - 1) {
+                index_y[panel]++;
+            } else if (page[panel]+ windir[panel]->ysize < (list[panel]->nb + windir[panel]->nbcols - 1) / windir[panel]->nbcols) {
+                page[panel]++;
             }
             break;
         case KEY_RIGHT:
         case 'l':
-            if (index_x[pane]< min (windir[pane]->nbcols, list[pane]->nb) - 1) {
-                index_x[pane]++;
+            if (index_x[panel]< min (windir[panel]->nbcols, list[panel]->nb) - 1) {
+                index_x[panel]++;
             }
             break;
         case 'o':
-            index[pane]++;
+            index[panel]++;
             break;
         case 'u':
-            index[pane]--;
+            index[panel]--;
             break;
 #ifndef PDCURSES
         case KEY_ESC:
@@ -313,7 +313,7 @@ int main (int argc, char *argv[])
             case ALT_F: /* filter */
                 string = getwindow ("Set filter", winscreen, MAXFILTER / 2, MAXFILTER, NULL);
                 if (string) {
-                    filterlist (list[pane], string);
+                    filterlist (list[panel], string);
                     free (string);
                 }
                 break;
@@ -336,8 +336,8 @@ int main (int argc, char *argv[])
                         msgwindow ("Can't create directory", winscreen, 0);
                         getch ();
                     }
-                    freelist (list[pane]);
-                    list[pane] = NULL;
+                    freelist (list[panel]);
+                    list[panel] = NULL;
                     free (string);
                 }
                 break;
@@ -347,7 +347,7 @@ int main (int argc, char *argv[])
                 }
                 break;
             case ALT_R: /* rename */
-                current = list[pane]->tab + windir[pane]->index;
+                current = list[panel]->tab + windir[panel]->index;
                 len = (strlen (current->name) > MAXFNAME * 80 / 100) ? 2 * MAXFNAME + 1: MAXFNAME + 1;
                 string = getwindow ("Rename", winscreen, MAXFNAME / 2, len, current->name);
                 if (string) {
@@ -358,13 +358,13 @@ int main (int argc, char *argv[])
                         getch ();
                         free (buf);
                     }
-                    freelist (list[pane]);
-                    list[pane] = NULL;
+                    freelist (list[panel]);
+                    list[panel] = NULL;
                     free (string);
                 }
                 break;
             case ALT_S: /* select */
-                current = list[pane]->tab + windir[pane]->index;
+                current = list[panel]->tab + windir[panel]->index;
                 current->selected = (current->selected) ? 0 : 1;
                 break;
             case ALT_V: /* view */
@@ -378,7 +378,7 @@ int main (int argc, char *argv[])
 
     endwin ();
 
-    for (i = 0; i < MAXPANES; i++) {
+    for (i = 0; i < MAXPANELS; i++) {
         free (dirname[i]);
         freelist (list[i]);
         freewindow (windir[i]);