Changeset fe67f1f

Timestamp:

Apr 18, 2004, 11:55:42 AM (20 years ago)

Author:

James M. Kretchmar <kretch@mit.edu>

Branches:

master, barnowl_perlaim, debian, owl, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

818a073

Parents:

7fad773

Message:

Do OLC formatting for anything coming from olc.matisse
Improvements to popup size algorithm (from gildea)

Files:

• ChangeLog (modified) (1 diff)
• owl.h (modified) (1 diff)
• popwin.c (modified) (1 diff)
• util.c (modified) (1 diff)
• zephyr.c (modified) (2 diffs)

ChangeLog

@@ -1 +1 @@
 $Id$
 
+2.1.8-pre-1
+        Do OLC formatting for anything coming from olc.matisse
+        Improvements to popup size algorithm (from gildea)
+        
 2.1.7
         The colorclass command is added, to make colorization easy

owl.h

@@ -59 +59 @@
 static const char owl_h_fileIdent[] = "$Id$";
 
-#define OWL_VERSION         2.1.7
-#define OWL_VERSION_STRING "2.1.7"
+#define OWL_VERSION         2.1.8-pre-1
+#define OWL_VERSION_STRING "2.1.8-pre-1"
 
 /* Feature that is being tested to redirect stderr through a pipe. 

popwin.c

@@ -19 +19 @@
   glines=owl_global_get_lines(&g);
   gcols=owl_global_get_cols(&g);
-  if (glines > 24) {
-    pw->lines=glines/2;
-    startline=glines/4;
-  } else {
-    pw->lines=(glines*3)/4;
-    startline=glines/8;
-  }
 
-  pw->cols=(gcols*15)/16;
-  startcol=gcols/32;
-  if (pw->cols > 100) {
-    pw->cols=100;
-    startcol=(gcols-100)/2;
-  }
+  pw->lines = owl_util_min(glines,24)*3/4 + owl_util_max(glines-24,0)/2;
+  startline = (glines-pw->lines)/2;
+
+  pw->cols = owl_util_min(gcols,100)*15/16 + owl_util_max(gcols-100,0)/2;
+  startcol = (gcols-pw->cols)/2;
 
   pw->borderwin=newwin(pw->lines, pw->cols, startline, startcol);

util.c

@@ -725 +725 @@
 }
 
+int owl_util_max(int a, int b)
+{
+  if (a>b) return(a);
+  return(b);
+}
+
+int owl_util_min(int a, int b)
+{
+  if (a<b) return(a);
+  return(b);
+}
+
 /**************************************************************************/
 /************************* REGRESSION TESTS *******************************/

zephyr.c

@@ -351 +351 @@
 
   /* deal with MIT Athena OLC messages */
-  if (!strcasecmp(n->z_class, "olc") &&
-      !strcasecmp(n->z_sender, "olc.matisse@ATHENA.MIT.EDU")) {
+  if (!strcasecmp(n->z_sender, "olc.matisse@ATHENA.MIT.EDU")) {
     return(owl_zephyr_get_field(n, 1));
   }
@@ -372 +371 @@
 
   /* No zsig for OLC messages */
-  if (!strcasecmp(n->z_class, "olc") &&
-      !strcasecmp(n->z_sender, "olc.matisse@ATHENA.MIT.EDU")) {
+  if (!strcasecmp(n->z_sender, "olc.matisse@ATHENA.MIT.EDU")) {
     return("");
   }