Changeset f7cf6c2

Timestamp:

Apr 28, 2010, 2:27:58 PM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.7, release-1.8, release-1.9

Children:

f92acd7

Parents:

263320f

git-author:

David Benjamin <davidben@mit.edu> (04/28/10 13:39:29)

git-committer:

David Benjamin <davidben@mit.edu> (04/28/10 14:27:58)

Message:

Allow scheduling of relayouts as well as resizes

Files:

• global.c (modified) (3 diffs)
• owl.c (modified) (1 diff)
• owl.h (modified) (1 diff)

global.c

@@ -57 +57 @@
   g->curmsg_vert_offset=0;
   g->resizepending=0;
+  g->relayoutpending = 0;
   g->direction=OWL_DIRECTION_DOWNWARDS;
   g->zaway=0;
@@ -394 +395 @@
 }
 
+void owl_global_set_relayout_pending(owl_global *g) {
+  g->relayoutpending = 1;
+}
+
 const char *owl_global_get_homedir(const owl_global *g) {
   if (g->homedir) return(g->homedir);
@@ -504 +509 @@
 
   owl_function_debugmsg("New size is %i lines, %i cols.", g->lines, g->cols);
-  owl_global_relayout(g);
+  owl_global_set_relayout_pending(g);
 }
 
 void owl_global_relayout(owl_global *g) {
+  if (!g->relayoutpending) return;
+  g->relayoutpending = 0;
+
   owl_function_debugmsg("Relayouting...");
 

owl.c

@@ -618 +618 @@
     /* if a resize has been scheduled, deal with it */
     owl_global_resize(&g, 0, 0);
-
-    /* these are here in case a resize changes the windows */
+    /* also handle relayouts */
+    owl_global_relayout(&g);
+
+    /* these are here in case a relayout changes the windows */
     sepwin=owl_global_get_curs_sepwin(&g);
     typwin=owl_global_get_curs_typwin(&g);

owl.h

@@ -569 +569 @@
   int rightshift;
   volatile sig_atomic_t resizepending;
+  int relayoutpending;
   int recwinlines;
   char *thishost;