screen.c mods

Mon Feb  1 00:43:15 1999  Timur Bakeyev <mc@bat.ru>

	* screen.c (to_buffer): Code of the function rewritten, as a side
	effect added J_CENTER (who needs this?). Also, justification flags
	got twins with _FIT suffix, which tries to fit name in the field with-
	out truncation (uses name_trunc()). This unifies behaviour of CList
	variants and text-bases widgets.

	* screen.c: Remove HAVE_GNOME wrappers around string_file_[name|owner|
	group]() - not necessary, to_buffer() doing this work.

src/ChangeLog

@@ -1,3 +1,14 @@
+Mon Feb  1 00:43:15 1999  Timur Bakeyev <mc@bat.ru>
+
+	* screen.c (to_buffer): Code of the function rewritten, as a side
+	effect added J_CENTER (who needs this?). Also, justification flags
+	got twins with _FIT suffix, which tries to fit name in the field with-
+	out truncation (uses name_trunc()). This unifies behaviour of CList
+	variants and text-bases widgets.
+	
+	* screen.c: Remove HAVE_GNOME wrappers around string_file_[name|owner|
+	group]() - not necessary, to_buffer() doing this work.
+
 Sun Jan 31 19:49:00 1999  Norbert Warmuth  <nwarmuth@privat.circular.de>
 
 	* hotlist.c (add_new_entry_input, add_new_group_input): Make the

src/panel.h

@@ -30,10 +30,18 @@ enum panel_display_enum {
     frame_half			/* half screen frame */
 };
 
-#define is_view_special(x) ((x == view_info) || (x == view_quick))
+#define is_view_special(x) (((x) == view_info) || ((x) == view_quick))
 
-#define J_LEFT  0
+#define J_LEFT 		1
-#define J_RIGHT 1
+#define J_RIGHT		2
+#define J_CENTER	3
+
+#define IS_FIT(x)	((x) & 0x0004)
+#define HIDE_FIT(x)	((x) & 0x0003)
+
+#define J_LEFT_FIT	5
+#define J_RIGHT_FIT	6
+#define J_CENTER_FIT	7
 
 #define NORMAL		0
 #define SELECTED	1

src/screen.c

@@ -210,7 +210,59 @@ file_entry_color (file_entry *fe)
     return (NORMAL_COLOR);
 }
 
+/* String representations of various file attributes */
+/* name */
+char *
+string_file_name (file_entry *fe, int len)
+{
+	return fe->fname;
+}
+
+/* size */
+char *
+string_file_size (file_entry *fe, int len)
+{
+    static char buffer [BUF_TINY];
+    int i;
+
+#ifdef HAVE_ST_RDEV
+    if (S_ISBLK (fe->buf.st_mode) || S_ISCHR (fe->buf.st_mode))
+        g_snprintf (buffer, sizeof (buffer), "%3d,%3d", 
+		    (int) ((fe->buf.st_rdev >> 8) & 0xff), 
+		    (int) (fe->buf.st_rdev & 0xff));
+    else
+#endif 
+    {   
+        g_snprintf (buffer, sizeof (buffer), "%lu", (unsigned long) fe->buf.st_size);
+        if (len && (i = strlen (buffer)) > len) {
+            if (i - 2 > len) {
+                if (i - 5 > len)
+                    g_snprintf (buffer, sizeof (buffer), "%luG", (unsigned long) ((fe->buf.st_size) >> 30));
+                else
+                    g_snprintf (buffer, sizeof (buffer), "%luM", (unsigned long) ((fe->buf.st_size) >> 20));
+            } else
+                g_snprintf (buffer, sizeof (buffer), "%luK", (unsigned long) ((fe->buf.st_size) >> 10));
+        }
+    }
+    return buffer;
+}
+
+/* bsize */
+char *
+string_file_size_brief (file_entry *fe, int len)
+{
+    static char buffer [BUF_TINY];
+
+    if (S_ISDIR (fe->buf.st_mode)){
+       strcpy (buffer, (strcmp (fe->fname, "..") ? "SUB-DIR" : "UP--DIR"));
+       return buffer;
+    }
+
+    return string_file_size (fe, len);
+}
+
 /* This functions return a string representation of a file entry */
+/* type */
 char *
 string_file_type (file_entry *fe, int len)
 {
@@ -241,146 +293,35 @@ string_file_type (file_entry *fe, int len)
     return buffer;
 }
 
-char *
+/* mtime */
-string_file_size_brief (file_entry *fe, int len)
-{
-    static char buffer [8];
-
-    if (S_ISDIR (fe->buf.st_mode)){
-       strcpy (buffer, (strcmp (fe->fname, "..") ? "SUB-DIR" : "UP--DIR"));
-       return buffer;
-    }
-
-    return string_file_size (fe, len);
-}
-
-char *
-string_file_permission (file_entry *fe, int len)
-{
-    return string_perm (fe->buf.st_mode);
-}
-
-char *
-string_file_nlinks (file_entry *fe, int len)
-{
-    static char buffer [BUF_TINY];
-
-    g_snprintf (buffer, sizeof (buffer), "%16d", fe->buf.st_nlink);
-    return buffer;
-}
-
-char *
-string_file_size (file_entry *fe, int len)
-{
-    static char buffer [BUF_TINY];
-    int i;
-
-#ifdef HAVE_ST_RDEV
-    if (S_ISBLK (fe->buf.st_mode) || S_ISCHR (fe->buf.st_mode))
-        g_snprintf (buffer, sizeof (buffer), "%3d,%3d", 
-		    (int) ((fe->buf.st_rdev >> 8) & 0xff), 
-		    (int) (fe->buf.st_rdev & 0xff));
-    else
-#endif 
-    {   
-        g_snprintf (buffer, sizeof (buffer), "%lu", (unsigned long) fe->buf.st_size);
-        if (len && (i = strlen (buffer)) > len) {
-            if (i - 2 > len) {
-                if (i - 5 > len)
-                    g_snprintf (buffer, sizeof (buffer), "%luG", (unsigned long) ((fe->buf.st_size) >> 30));
-                else
-                    g_snprintf (buffer, sizeof (buffer), "%luM", (unsigned long) ((fe->buf.st_size) >> 20));
-            } else
-                g_snprintf (buffer, sizeof (buffer), "%luK", (unsigned long) ((fe->buf.st_size) >> 10));
-        }
-    }
-    return buffer;
-}
-
 char *
 string_file_mtime (file_entry *fe, int len)
 {
     return file_date (fe->buf.st_mtime);
 }
 
+/* atime */
 char *
 string_file_atime (file_entry *fe, int len)
 {
     return file_date (fe->buf.st_atime);
 }
 
+/* ctime */
 char *
 string_file_ctime (file_entry *fe, int len)
 {
     return file_date (fe->buf.st_ctime);
 }
 
-#ifdef HAVE_GNOME
+/* perm */
-/* In GNOME, the CList truncates the names */
 char *
-string_file_owner (file_entry *fe, int len)
+string_file_permission (file_entry *fe, int len)
 {
-    return get_owner (fe->buf.st_uid);
+    return string_perm (fe->buf.st_mode);
-}
-
-char *
-string_file_group (file_entry *fe, int len)
-{
-    return get_group (fe->buf.st_gid);
-}
-
-char *
-string_file_name (file_entry *fe, int len)
-{
-	return fe->fname;
-}
-#else
-char *
-string_file_owner (file_entry *fe, int len)
-{
-    if (len)
-	return name_trunc (get_owner (fe->buf.st_uid), len);
-    else
-	return get_owner (fe->buf.st_uid);
-}
-
-char *
-string_file_group (file_entry *fe, int len)
-{
-    if (len)
-	return name_trunc (get_group (fe->buf.st_gid), len);
-    else
-	return get_group (fe->buf.st_gid);
-}
-
-char *
-string_file_name (file_entry *fe, int len)
-{
-    if (len)
-        return name_trunc (fe->fname, len);
-    else
-	return fe->fname;
-}
-#endif
-
-char *
-string_space (file_entry *fe, int len)
-{
-    return " ";
-}
-
-char *
-string_dot (file_entry *fe, int len)
-{
-    return ".";
-}
-
-char *
-string_marked (file_entry *fe, int len)
-{
-    return fe->f.marked ? "*" : " ";
 }
 
+/* mode */
 char *
 string_file_perm_octal (file_entry *fe, int len)
 {
@@ -390,15 +331,37 @@ string_file_perm_octal (file_entry *fe, int len)
     return buffer;
 }
 
+/* nlink */
+char *
+string_file_nlinks (file_entry *fe, int len)
+{
+    static char buffer [BUF_TINY];
+
+    g_snprintf (buffer, sizeof (buffer), "%16d", fe->buf.st_nlink);
+    return buffer;
+}
+
+/* inode */
 char *
 string_inode (file_entry *fe, int len)
 {
     static char buffer [10];
 
-    g_snprintf (buffer, sizeof (buffer), "%ld", (long) fe->buf.st_ino);
+    g_snprintf (buffer, sizeof (buffer), "%lu", (unsigned long) fe->buf.st_ino);
     return buffer;
 }
 
+/* nuid */
+char *
+string_file_nuid (file_entry *fe, int len)
+{
+    static char buffer [10];
+
+    g_snprintf (buffer, sizeof (buffer), "%d", fe->buf.st_uid);
+    return buffer;
+}
+
+/* ngid */
 char *
 string_file_ngid (file_entry *fe, int len)
 {
@@ -408,13 +371,39 @@ string_file_ngid (file_entry *fe, int len)
     return buffer;
 }
 
+/* owner */
 char *
-string_file_nuid (file_entry *fe, int len)
+string_file_owner (file_entry *fe, int len)
 {
-    static char buffer [10];
+    return get_owner (fe->buf.st_uid);
+}
 
-    g_snprintf (buffer, sizeof (buffer), "%d", fe->buf.st_uid);
+/* group */
-    return buffer;
+char *
+string_file_group (file_entry *fe, int len)
+{
+    return get_group (fe->buf.st_gid);
+}
+
+/* mark */
+char *
+string_marked (file_entry *fe, int len)
+{
+    return fe->f.marked ? "*" : " ";
+}
+
+/* space */
+char *
+string_space (file_entry *fe, int len)
+{
+    return " ";
+}
+
+/* dot */
+char *
+string_dot (file_entry *fe, int len)
+{
+    return ".";
 }
 
 #ifdef HAVE_GNOME
@@ -433,53 +422,60 @@ static struct {
     char *(*string_fn)(file_entry *, int);
     sortfn *sort_routine;
 } formats [] = {
-{ "name",  12, 1, J_LEFT,  N_("Name"),       1, string_file_name,       (sortfn *) sort_name },
+{ "name",  12, 1, J_LEFT_FIT,	N_("Name"),	1, string_file_name,	   (sortfn *) sort_name },
-{ "size",  7,  0, J_RIGHT, N_("Size"),       1, string_file_size,       (sortfn *) sort_size },
+{ "size",  7,  0, J_RIGHT,	N_("Size"),	1, string_file_size,	   (sortfn *) sort_size },
-{ "type",  GT, 0, J_LEFT,     "",            1, string_file_type,       (sortfn *) sort_type },
+{ "bsize", 7,  0, J_RIGHT,	N_("Size"),	1, string_file_size_brief, (sortfn *) sort_size },
-{ "mtime", 12, 0, J_RIGHT, N_("MTime"),      1, string_file_mtime,      (sortfn *) sort_time },
+{ "type",  GT, 0, J_LEFT,	"",		1, string_file_type,	   (sortfn *) sort_type },
-{ "bsize", 7,  0, J_RIGHT, N_("Size"),       1, string_file_size_brief, (sortfn *) sort_size },
+{ "mtime", 12, 0, J_RIGHT,	N_("MTime"),	1, string_file_mtime,	   (sortfn *) sort_time },
-{ "perm",  10, 0, J_LEFT,  N_("Permission"), 1, string_file_permission, NULL },
+{ "atime", 12, 0, J_RIGHT,	N_("ATime"),	1, string_file_atime,	   (sortfn *) sort_atime },
-{ "mode",  6,  0, J_RIGHT, N_("Perm"),       1, string_file_perm_octal, NULL },
+{ "ctime", 12, 0, J_RIGHT,	N_("CTime"),	1, string_file_ctime,	   (sortfn *) sort_ctime },
-{ "|",     1,  0, J_RIGHT, N_("|"),          0, 0,                      NULL },
+{ "perm",  10, 0, J_LEFT,	N_("Permission"),1,string_file_permission, NULL },
-{ "nlink", 2,  0, J_RIGHT, N_("Nl"),         1, string_file_nlinks,     (sortfn *) sort_links },
+{ "mode",  6,  0, J_RIGHT,	N_("Perm"),	1, string_file_perm_octal, NULL },
-{ "ngid",  5,  0, J_RIGHT, N_("GID"),        1, string_file_ngid,       (sortfn *) sort_ngid },
+{ "nlink", 2,  0, J_RIGHT,	N_("Nl"),	1, string_file_nlinks,	   (sortfn *) sort_links },
-{ "nuid",  5,  0, J_RIGHT, N_("UID"),        1, string_file_nuid,       (sortfn *) sort_nuid },
+{ "inode", 5,  0, J_RIGHT,	N_("Inode"),	1, string_inode,	   (sortfn *) sort_inode },
-{ "owner", 8,  0, J_LEFT,  N_("Owner"),      1, string_file_owner,      (sortfn *) sort_owner },
+{ "nuid",  5,  0, J_RIGHT,	N_("UID"),	1, string_file_nuid,	   (sortfn *) sort_nuid },
-{ "group", 8,  0, J_LEFT,  N_("Group"),      1, string_file_group,      (sortfn *) sort_group },
+{ "ngid",  5,  0, J_RIGHT,	N_("GID"),	1, string_file_ngid,	   (sortfn *) sort_ngid },
-{ "atime", 12, 0, J_RIGHT, N_("ATime"),      1, string_file_atime,      (sortfn *) sort_atime },
+{ "owner", 8,  0, J_LEFT_FIT,	N_("Owner"),	1, string_file_owner,	   (sortfn *) sort_owner },
-{ "ctime", 12, 0, J_RIGHT, N_("CTime"),      1, string_file_ctime,      (sortfn *) sort_ctime },
+{ "group", 8,  0, J_LEFT_FIT,	N_("Group"),	1, string_file_group,	   (sortfn *) sort_group },
-{ "space", 1,  0, J_RIGHT,    " ",          0, string_space,           NULL },
+{ "mark",  1,  0, J_RIGHT,	" ",		1, string_marked,	   NULL },
-{ "dot",   1,  0, J_RIGHT,    " ",          0, string_dot,             NULL },
+{ "|",     1,  0, J_RIGHT,	" ",		0, NULL,		   NULL },
-{ "mark",  1,  0, J_RIGHT,    " ",          1, string_marked,          NULL },
+{ "space", 1,  0, J_RIGHT,	" ",		0, string_space,	   NULL },
-{ "inode", 5,  0, J_RIGHT, N_("Inode"),      1, string_inode,           (sortfn *) sort_inode },
+{ "dot",   1,  0, J_RIGHT,	" ",		0, string_dot,		   NULL },
 };
 
 static char *
 to_buffer (char *dest, int just_mode, int len, char *txt)
 {
     int txtlen = strlen (txt);
-    int still;
+    int still, over;
     
-    if (txtlen > len){
+    memset (dest, ' ', len);
-	if (just_mode != J_LEFT)
+
-	    txt += txtlen - len;
+    still = (over=(txtlen > len)) ? (txtlen - len) : (len - txtlen);
-	txtlen = len;
+    
+    switch (HIDE_FIT(just_mode)){
+        case J_LEFT:
+	    still = 0;
+	    break;
+	case J_CENTER:
+	    still /= 2;
+	    break;
+	case J_RIGHT:
+	default:
+	    break;
     }    
-    still = len - txtlen;
+
-    if (just_mode == J_LEFT){
+    if (over){
-	strncpy (dest, txt, txtlen);
+	if (IS_FIT(just_mode))
-	dest += txtlen;
+	    strcpy (dest, name_trunc(txt, len));
-	while (still--)
+	else
-	    *dest++ = ' ';
+	    strncpy (dest, txt+still, len);
-	*dest = 0;
+    } else 
-    } else {
+	strncpy (dest+still, txt, txtlen);
-	while (still--)
+    
-	    *dest++ = ' ';
+    dest[len] = NULL;
-	strncpy (dest, txt, len);
+    
-	dest += txtlen;
+    return (dest + len);
-	*dest = 0;
-    }
-    return dest;
 }
 
 int
@@ -548,10 +544,6 @@ format_file (char *dest, WPanel *panel, int file_index, int width, int attr, int
 	    if (length == width)
 		    break;
 #else
-            /* What shall we do? Will we color each line according to
-	     * the file type? Any suggestions to mc@timur.kazan.su
-	     */
-	    
             attrset (color);
  
             if (permission_mode && !strcmp(format->id, "perm"))
@@ -563,7 +555,6 @@ format_file (char *dest, WPanel *panel, int file_index, int width, int attr, int
 #endif
 	} else {
 #ifndef HAVE_X
-            /* I'm preffer the view without this 3 lines, try to kill it :-) */
             if (attr == SELECTED || attr == MARKED_SELECTED)
                 attrset (SELECTED_COLOR);
             else
@@ -594,7 +585,7 @@ repaint_file (WPanel *panel, int file_index, int mv, int attr, int isstatus)
 {
     int    second_column = 0;
     int	   width, offset;
-    char   buffer [255];
+    char   buffer [BUF_MEDIUM];
 
     offset = 0;
     if (!isstatus && panel->split){